3179 files changed, 0 insertions, 534941 deletions

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 cb0105380..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/.cvsignore b/bundles/org.eclipse.jst.ws.axis.consumption.core/.cvsignore
deleted file mode 100644
index 8dab06078..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-build.xml
-temp.folder
-wsc-axis.jar
-@dot
-src.zip
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 846a39435..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.axis.consumption.core</name>
-	<comment></comment>
-	<projects>
-		<project>org.eclipse.wst.command.env.core</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.axis.consumption.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0fd1048cf..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,57 +0,0 @@
-#Mon Jan 30 10:29:14 EST 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.jst.ws.axis.consumption.core/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 577040239..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Jan 30 10:41:39 EST 2006
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.axis.consumption.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 4e118de5f..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,26 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.axis.consumption.core; singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.jst.ws.internal.axis.consumption.core.plugin.WebServiceAxisConsumptionCorePlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.axis.consumption.core,
- org.eclipse.jst.ws.internal.axis.consumption.core.command,
- org.eclipse.jst.ws.internal.axis.consumption.core.common,
- org.eclipse.jst.ws.internal.axis.consumption.core.plugin
-Require-Bundle: org.apache.ant,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.wst.command.env.core,
- org.eclipse.jst.ws,
- org.eclipse.jst.ws.consumption,
- org.eclipse.jst.j2ee.web,
- org.apache.axis,
- org.eclipse.wst.common.modulecore,
- org.eclipse.wst.common.frameworks,
- org.eclipse.core.commands,
- org.eclipse.wst.common.environment,
- org.eclipse.wst.command.env
-Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/about.html b/bundles/org.eclipse.jst.ws.axis.consumption.core/about.html
deleted file mode 100644
index 6f6b96c4c..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/build.properties b/bundles/org.eclipse.jst.ws.axis.consumption.core/build.properties
deleted file mode 100644
index 5da312238..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-bin.includes = .,\
-               plugin.properties,\
-               plugin.xml,\
-               readme.html,\
-               META-INF/,\
-               about.html
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/plugin.properties b/bundles/org.eclipse.jst.ws.axis.consumption.core/plugin.properties
deleted file mode 100644
index 5e9ff7c46..000000000
--- 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 c911fbfbd..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/plugin.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
-     <extension point="org.eclipse.jst.ws.consumption.wsfinder">
-      <wsfinder
-            id="org.eclipse.jst.ws.internal.axis.consumption.core.wsfinder.WSFinderAxis"
-            name="org.eclipse.jst.ws.internal.axis.consumption.core.wsfinder.WSFinderAxis"
-            description="org.eclipse.jst.ws.internal.axis.consumption.core.wsfinder.WSFinderAxis"
-            class="org.eclipse.jst.ws.internal.axis.consumption.core.wsfinder.WSFinderAxis">
-      </wsfinder>
-   </extension>
-
-</plugin>
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/AxisConsumptionCore.properties b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/AxisConsumptionCore.properties
deleted file mode 100644
index 022ed2f0a..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/AxisConsumptionCore.properties
+++ /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
-###############################################################################
-
-#
-# 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
-
-#
-# Messages for Java2WSDLCommand
-#
-MSG_GENERATE_WSDL=Generating WSDL file: {0}
-MSG_ERROR_JAVA_WSDL_GENERATE=IWAB0398E Error in generating WSDL from Java: 
-
-#
-# Messages for WSDL2JavaCommand
-#
-MSG_PARSING_WSDL=Parsing WSDL file: {0}
-MSG_ERROR_WSDL_JAVA_GENERATE=IWAB0399E Error in generating Java from WSDL: 
-MSG_ERROR_MOVE_RESOURCE=IWAB0523E Error moving resource: {0}
-MSG_ERROR_CREATE_TEMP_DIR=Error creating temporary directory
-
-#
-# Messages common for all
-#
-MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET=IWAB0397E JavaWSDLParam not set
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/AxisConsumptionCoreMessages.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/AxisConsumptionCoreMessages.java
deleted file mode 100644
index c43b740c6..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/AxisConsumptionCoreMessages.java
+++ /dev/null
@@ -1,38 +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.core;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class AxisConsumptionCoreMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.jst.ws.internal.axis.consumption.core.AxisConsumptionCore";//$NON-NLS-1$
-
-	private AxisConsumptionCoreMessages() {
-		// Do not instantiate
-	}
-
-	public static String MSG_ERROR_PROJECT_URL_PARAM_NOT_SET;
-	public static String MSG_ERROR_DEPLOY_FILE_PARAM_NOT_SET;
-	public static String MSG_ERROR_AXIS_DEPLOY;
-	public static String MSG_AXIS_DEPLOY;
-	public static String MSG_GENERATE_WSDL;
-	public static String MSG_ERROR_JAVA_WSDL_GENERATE;
-	public static String MSG_PARSING_WSDL;
-	public static String MSG_ERROR_WSDL_JAVA_GENERATE;
-	public static String MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET;
-	public static String MSG_ERROR_MOVE_RESOURCE;
-	public static String MSG_ERROR_CREATE_TEMP_DIR;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, AxisConsumptionCoreMessages.class);
-	}
-}
\ No newline at end of file
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 602f83dc3..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/AxisDeployCommand.java
+++ /dev/null
@@ -1,155 +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 org.apache.axis.tools.ant.axis.AdminClientTask;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Target;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.AxisConsumptionCoreMessages;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.wst.command.internal.env.core.common.ProgressUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-/**
- * Commands are executable, undoable, redoable objects. Every Command has a name and a description.
- */
-
-public class AxisDeployCommand extends AbstractDataModelOperation
-{
-  protected static final String SERVICE_EXT = "/services/AdminService"; //$NON-NLS-1$
-
-  private JavaWSDLParameter javaWSDLParam;
-  
-  /**
-   * Constructor for AxisDeployCommand.
-   * @param String description
-   * @param String name
-   * 
-   */
-  public AxisDeployCommand()
-  {
-  }
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    IEnvironment environment = getEnvironment();
-    if (javaWSDLParam == null)
-    {     
-      return StatusUtils.errorStatus(AxisConsumptionCoreMessages.MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET);
-    }
-
-    if (javaWSDLParam.getProjectURL() == null || javaWSDLParam.getProjectURL().equals(""))
-    { //$NON-NLS-1$
-      return StatusUtils.errorStatus(AxisConsumptionCoreMessages.MSG_ERROR_PROJECT_URL_PARAM_NOT_SET);
-    }
-
-    if (javaWSDLParam.getDeploymentFiles() == null || javaWSDLParam.getDeploymentFiles().length == 0)
-    {
-      return StatusUtils.errorStatus(AxisConsumptionCoreMessages.MSG_ERROR_DEPLOY_FILE_PARAM_NOT_SET);
-    }
-
-    ProgressUtils.report(monitor, AxisConsumptionCoreMessages.MSG_AXIS_DEPLOY);
-
-    IStatus status = executeAntTask();
-    if (status.getSeverity() == Status.ERROR)
-    {
-    	environment.getStatusHandler().reportError(status);
-    }
-    
-    return status;
-  }
-
-  protected IStatus executeAntTask()
-  {
-    final class DeployTask extends AdminClientTask
-    {
-      public DeployTask()
-      {
-		super.setProject(new Project());
-		super.getProject().init();
-		super.setTaskType("axis"); //$NON-NLS-1$
-		super.setTaskName("axis-admin"); //$NON-NLS-1$
-		super.setOwningTarget(new Target());
-      }
-    }
-
-    DeployTask adminClient = new DeployTask();
-    String url = javaWSDLParam.getProjectURL() + SERVICE_EXT;
-    adminClient.setUrl(url);
-    adminClient.setXmlFile(new File(javaWSDLParam.getDeploymentFiles()[0]));
-
-    // Since the admin server may not be available right away we will try
-    // several times to execute it.
-    try
-    {
-      BuildException lastException = null;
-      
-      for( int index = 0; index < 20; index++ )
-      {
-        try
-        {
-          lastException = null;
-          adminClient.execute();
-        }
-        catch( BuildException exc )
-        {
-          lastException = exc;
-          
-          try
-          {
-            Thread.sleep( 200 );
-          }
-          catch( InterruptedException threadException  )
-          {
-          }
-        }
-        
-        // If no exception occured then we should break out of the loop.
-        if( lastException == null ) break;
-      }
-      
-      // If after many tries we still get an exception, then we will re throw it.
-      if( lastException != null ) throw lastException;
-    }
-    catch (BuildException e)
-    {
-      e.printStackTrace();
-      String message = e.getMessage();
-      if (e.getCause() != null)
-      {
-        message = e.getCause().toString();
-      }
-      
-      IStatus[] childStatus = new Status[1];
-      childStatus[0] = StatusUtils.errorStatus( message);
-      return StatusUtils.multiStatus(AxisConsumptionCoreMessages.MSG_ERROR_AXIS_DEPLOY, childStatus);
-    }
-    return Status.OK_STATUS; 
-  }
-
-  /**
-   * @param javaWSDLParam The javaWSDLParam to set.
-   */
-  public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam)
-  {
-    this.javaWSDLParam = javaWSDLParam;
-  }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/GeronimoAxisDeployCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/GeronimoAxisDeployCommand.java
deleted file mode 100644
index 55abee273..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/GeronimoAxisDeployCommand.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.core.command;
-
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-
-import org.apache.axis.AxisEngine;
-import org.apache.axis.server.AxisServer;
-import org.apache.axis.tools.ant.axis.AdminClientTask;
-import org.apache.axis.utils.ClassUtils;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Target;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.AxisConsumptionCoreMessages;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.wst.command.internal.env.core.common.ProgressUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
- * Commands are executable, undoable, redoable objects. Every Command has a name and a description.
- */
-
-public class GeronimoAxisDeployCommand extends AbstractDataModelOperation
-{
-
-  private JavaWSDLParameter javaWSDLParam;
-
-  private String projectName_;
-  private static final String AXIS_SERVER_CONFIG_FILE = "axis.ServerConfigFile";
-  
-  IFolder outputRoot;
-  
-  /**
-   * Constructor for GeronimoAxisDeployCommand.
- * @param String projectName
-   * 
-   */
-  public GeronimoAxisDeployCommand(String projectName)
-  {
-  }
-  
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-	IEnvironment environment = getEnvironment();
-    if (javaWSDLParam == null)
-    {
-      return StatusUtils.errorStatus(AxisConsumptionCoreMessages.MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET);
-    }
-
-    if (javaWSDLParam.getProjectURL() == null || javaWSDLParam.getProjectURL().equals(""))
-    { //$NON-NLS-1$
-      return StatusUtils.errorStatus(AxisConsumptionCoreMessages.MSG_ERROR_PROJECT_URL_PARAM_NOT_SET);
-    }
-
-    if (javaWSDLParam.getDeploymentFiles() == null || javaWSDLParam.getDeploymentFiles().length == 0)
-    {
-      return StatusUtils.errorStatus(
-      AxisConsumptionCoreMessages.MSG_ERROR_DEPLOY_FILE_PARAM_NOT_SET);
-    }
-
-    ProgressUtils.report(monitor, AxisConsumptionCoreMessages.MSG_AXIS_DEPLOY);
-
-    IStatus status = executeAdminTask();
-    if (status.getSeverity() == Status.ERROR)
-    {
-        environment.getStatusHandler().reportError(status);
-    }    
-    
-    status = executeAntTask();
-    if (status.getSeverity() == Status.ERROR)
-    {
-        environment.getStatusHandler().reportError(status);
-    }    
-    return status;
-  }
-  
-  protected IStatus executeAntTask()
-  {
-    final class DeployTask extends AdminClientTask
-    {
-      public DeployTask()
-      {
-        super.setProject(new Project());
-		super.getProject().init();
-		super.setTaskType("axis"); //$NON-NLS-1$
-		super.setTaskName("axis-admin"); //$NON-NLS-1$
-		super.setOwningTarget(new Target());
-      }
-    }
-
-    DeployTask adminClient = new DeployTask();
-    String url = javaWSDLParam.getProjectURL() + AxisDeployCommand.SERVICE_EXT;
-    adminClient.setUrl(url);
-    adminClient.setXmlFile(new File(javaWSDLParam.getDeploymentFiles()[0]));
-
-    // Since the admin server may not be available right away we will try
-    // several times to execute it.
-    try
-    {
-      BuildException lastException = null;
-      
-      for( int index = 0; index < 20; index++ )
-      {
-        try
-        {
-          lastException = null;
-          adminClient.execute();
-        }
-        catch( BuildException exc )
-        {
-          lastException = exc;
-          
-          try
-          {
-            Thread.sleep( 200 );
-          }
-          catch( InterruptedException threadException  )
-          {
-          }
-        }
-        
-        // If no exception occured then we should break out of the loop.
-        if( lastException == null ) break;
-      }
-      
-      // If after many tries we still get an exception, then we will re throw it.
-      if( lastException != null ) throw lastException;
-    }
-    catch (BuildException e)
-    {
-      e.printStackTrace();
-      String message = e.getMessage();
-      if (e.getCause() != null)
-      {
-        message = e.getCause().toString();
-      }
-      
-      IStatus[] childStatus = new Status[1];
-      childStatus[0] = StatusUtils.errorStatus( message);
-      return StatusUtils.multiStatus(AxisConsumptionCoreMessages.MSG_ERROR_AXIS_DEPLOY, childStatus);
-    }
-    return Status.OK_STATUS; 
-
-  }
-  
-  protected IStatus executeAdminTask(){
-    
-    IStatus status = Status.OK_STATUS;
-    // check if server-config.wsdd exists
-    IVirtualComponent component = J2EEUtils.getVirtualComponent( projectName_ );
-    outputRoot = J2EEUtils.getOutputContainerRoot( component );
-    IPath path = new Path( "WEB-INF" ).append( "server-config.wsdd" );    
-    IFile descriptorFile = outputRoot.getFile( path );
-    
-    if (!descriptorFile.exists()){
-      status = createServerConfigFile();
-      if (status.getSeverity()==Status.ERROR)
-        return status;
-    }
-    
-    // check if deploy.wsdd exists
-    String deployWSDD = javaWSDLParam.getDeploymentFiles()[0];
-    File deployFile = new File(deployWSDD);
-    if (deployFile==null || !deployFile.exists()){
-      return status;
-    }
-    
-    try {
-      // get Classpath
-      String jarsCP = new String();
-      // classes dir
-      IPath classesPath = new Path("WEB-INF").append("classes");
-      IFile classesDir = outputRoot.getFile(classesPath);
-      jarsCP = "\""+classesDir.getRawLocation().toOSString()+"\"";
-      
-      // lib JARs
-      IPath libPath = new Path("WEB-INF").append("lib");
-      IFile libEntry = outputRoot.getFile(libPath);
-      IFolder libFolder = (IFolder)ResourceUtils.findResource(libEntry.getFullPath());
-      IResource[] JARfiles = libFolder.members();
-      for (int i=0;i<JARfiles.length;i++){
-        IResource res = JARfiles[i];
-        if (res.getFileExtension().equals("jar")){
-          jarsCP = jarsCP + ";\""+ res.getRawLocation().toOSString()+"\"";
-        }
-      }
-
-      // form and run utils.Admin command
-      String adminCommand = new String("java -Daxis.ServerConfigFile="+ descriptorFile.getRawLocation().toOSString() 
-          +" -cp "+jarsCP+" org.apache.axis.utils.Admin server "+deployFile.getCanonicalPath());
-      Runtime.getRuntime().exec(adminCommand);
-
-    }
-    catch(Exception e){
-      System.setProperty(AXIS_SERVER_CONFIG_FILE,"server-conifg.wsdd");      
-      e.printStackTrace();
-      String message = e.getMessage();
-      if (e.getCause() != null)
-      {
-        message = e.getCause().toString();
-      }
-      
-      IStatus[] childStatus = new Status[1];
-      childStatus[0] = StatusUtils.errorStatus( message);
-      return StatusUtils.multiStatus(AxisConsumptionCoreMessages.MSG_ERROR_AXIS_DEPLOY, childStatus);
-    }
-    
-    return status;
-  }
-  
-  /**t
-   * Creates the initial server-config.wsdd file from a template in Axis
-   * @return
-   */
-  private IStatus createServerConfigFile(){
-    try{
-
-      // server-config.wsdd file
-      IPath             path           = new Path( "WEB-INF" ).append( "server-config.wsdd" );    
-      IFile             descriptorFile = outputRoot.getFile( path );      
-
-      // create the initial server-config.wsdd file
-      AxisEngine preEngine = new AxisServer();
-      InputStream is = ClassUtils.getResourceAsStream(preEngine.getClass(), "server-config.wsdd");
-      FileOutputStream fos = new FileOutputStream(descriptorFile.getRawLocation().toOSString());
-      ResourceUtils.copyStream(is, fos);
-      fos.close();
-      
-      return Status.OK_STATUS;
-    }
-    catch(Exception e){
-      e.printStackTrace();
-      String message = e.getMessage();
-      if (e.getCause() != null)
-      {
-        message = e.getCause().toString();
-      }
-
-      IStatus[] childStatus = new Status[1];
-      childStatus[0] = StatusUtils.errorStatus( message);
-      return StatusUtils.multiStatus(AxisConsumptionCoreMessages.MSG_ERROR_AXIS_DEPLOY, childStatus);
-
-    }
-  }
-
-  /**
-   * @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 650f9dd91..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/Java2WSDLCommand.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.core.command;
-
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.util.HashMap;
-import java.util.Iterator;
-
-import org.apache.axis.tools.ant.wsdl.Java2WsdlAntTask;
-import org.apache.axis.tools.ant.wsdl.NamespaceMapping;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Target;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.AxisConsumptionCoreMessages;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.core.plugin.WebServiceAxisConsumptionCorePlugin;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.command.internal.env.core.common.ProgressUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.ILog;
-import org.eclipse.wst.common.environment.IStatusHandler;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
- * Commands are executable, undoable, redoable objects.
- * Every Command has a name and a description.
- */
-
-public class Java2WSDLCommand extends AbstractDataModelOperation
-{
-
-	private JavaWSDLParameter javaWSDLParam_;
-	private File tempOutputWsdlFile;
-	private final String TEMP = "temp"; //$NON-NLS-1$
-	private final String WSDL_EXT = ".wsdl"; //$NON-NLS-1$
-
-	public Java2WSDLCommand() {
-	}	
-	/**
-	 * Constructor for Java2WSDLCommand.
-	 */
-	public Java2WSDLCommand(JavaWSDLParameter javaWSDLParam) {
-		super();
-		this.javaWSDLParam_ = javaWSDLParam;
-	}
-
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-	{
-		IEnvironment environment = getEnvironment();
-		IStatus status;
-		if (javaWSDLParam_ == null) {
-			status = StatusUtils.errorStatus(AxisConsumptionCoreMessages.MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET);
-			environment.getStatusHandler().reportError(status);
-			return status;
-		}
-
-		if (javaWSDLParam_.getBeanName() == null) {
-			status = StatusUtils.errorStatus(AxisConsumptionCoreMessages.MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET);
-			environment.getStatusHandler().reportError(status);
-			return status;
-		}
-
-		ProgressUtils.report(monitor, NLS.bind(AxisConsumptionCoreMessages.MSG_GENERATE_WSDL, javaWSDLParam_.getBeanName() ));
-
-		return executeAntTask(environment, monitor);
-	}
-
-	protected IStatus executeAntTask(IEnvironment environment, IProgressMonitor monitor) {
-
-		final class Emitter extends Java2WsdlAntTask {
-			public Emitter() {
-				super.setProject(new Project());
-				super.getProject().init();
-				super.setTaskType("axis"); //$NON-NLS-1$
-				super.setTaskName("axis-java2wsdl"); //$NON-NLS-1$
-				super.setOwningTarget(new Target());
-			}
-		}
-
-		IStatus status = Status.OK_STATUS;
-		Emitter emitter = new Emitter();
-		emitter.createClasspath().setPath(javaWSDLParam_.getClasspath());
-		environment.getLog().log(ILog.INFO, 5008, this, "executeAntTask", "Class Path = "+ javaWSDLParam_.getClasspath());
-		
-		emitter.setPortTypeName(javaWSDLParam_.getPortTypeName());
-		environment.getLog().log(ILog.INFO, 5009, this, "executeAntTask", "Port Type Name = "+ javaWSDLParam_.getPortTypeName());
-		
-		emitter.setServiceElementName(javaWSDLParam_.getServiceName());
-		environment.getLog().log(ILog.INFO, 5010, this, "executeAntTask", "Service Name = "+ javaWSDLParam_.getServiceName());
-		
-		emitter.setLocation(javaWSDLParam_.getUrlLocation());
-		environment.getLog().log(ILog.INFO, 5011, this, "executeAntTask", "URL Location = "+ javaWSDLParam_.getUrlLocation());
-		
-		emitter.setMethods(javaWSDLParam_.getMethodString());
-		environment.getLog().log(ILog.INFO, 5012, this, "executeAntTask", "Methods = "+ javaWSDLParam_.getMethodString());
-		
-		emitter.setStyle(javaWSDLParam_.getStyle());
-		environment.getLog().log(ILog.INFO, 5013, this, "executeAntTask", "Style = "+ javaWSDLParam_.getStyle());
-		
-		emitter.setUse(javaWSDLParam_.getUse());
-		environment.getLog().log(ILog.INFO, 5014, this, "executeAntTask", "Use = "+ javaWSDLParam_.getUse());
-				
-		// create temporary directory to use as output directory for java2wsdl
-		IPath pluginStateLoc = WebServiceAxisConsumptionCorePlugin.getInstance().getStateLocation();
-		File tempDir = new File(pluginStateLoc.toString());
-		File newTempFile = null;
-		try {
-			newTempFile = File.createTempFile(TEMP, WSDL_EXT, tempDir);
-			tempOutputWsdlFile = newTempFile;
-		} catch (Exception e) {
-			tempOutputWsdlFile = new File (pluginStateLoc.append(TEMP+WSDL_EXT).toString());
-		}
-
-		emitter.setOutput(tempOutputWsdlFile);
-		
-		environment.getLog().log(ILog.INFO, 5015, this, "executeAntTask", "WSDL Location = "+ javaWSDLParam_.getOutputWsdlLocation());
-		
-		emitter.setNamespace(javaWSDLParam_.getNamespace());
-		environment.getLog().log(ILog.INFO, 5016, this, "executeAntTask", "Name Space = "+ javaWSDLParam_.getNamespace());
-		
-		emitter.setClassName(javaWSDLParam_.getBeanName());
-		environment.getLog().log(ILog.INFO, 5017, this, "executeAntTask", "Bean name = "+ javaWSDLParam_.getBeanName());
-		
-		emitter.setImplClass(javaWSDLParam_.getBeanName());
-		
-		HashMap mappings = javaWSDLParam_.getMappings();
-		if(mappings != null){
-			Iterator keys = mappings.keySet().iterator();
-			while(keys.hasNext()){
-				String pakage = (String)keys.next();
-				String namespace = (String)mappings.get(pakage);
-				NamespaceMapping map = new NamespaceMapping();
-				map.setPackage(pakage);
-				map.setNamespace(namespace);
-				emitter.addMapping(map);		
-			}
-		}
-		
-	
-		try {
-			emitter.execute();
-			status = moveGeneratedWSDL(environment, monitor);
-		} catch (BuildException e) {
-			environment.getLog().log(ILog.ERROR, 5018, this, "executeAntTask", e);
-			status = StatusUtils.errorStatus(
-			AxisConsumptionCoreMessages.MSG_ERROR_JAVA_WSDL_GENERATE + " " //$NON-NLS-1$
-			+e.getCause().toString(), e.getCause());
-			environment.getStatusHandler().reportError(status);
-			return status;
-	} finally {
-		if (tempOutputWsdlFile.exists()) {
-			tempOutputWsdlFile.delete();
-		}
-	}
-		return status;
-
-	}
-	
-	public IStatus moveGeneratedWSDL(IEnvironment environment,
-			IProgressMonitor monitor) {
-		IStatus status = Status.OK_STATUS;
-		FileInputStream finStream = null;
-		
-		ResourceContext context = WebServicePlugin.getInstance().getResourceContext();
-		IStatusHandler statusHandler = environment.getStatusHandler();
-		
-		String outputWsdlLocation = javaWSDLParam_.getOutputWsdlLocation();
-		IPath targetPath = new Path(outputWsdlLocation);
-		try {
-			finStream = new FileInputStream(tempOutputWsdlFile);
-			if (finStream != null) {
-				FileResourceUtils.createFileAtLocation(context, targetPath.makeAbsolute(), finStream,
-						monitor, statusHandler);
-				finStream.close();
-			}
-		} catch (Exception e) {
-			status = StatusUtils.errorStatus(NLS.bind(AxisConsumptionCoreMessages.MSG_ERROR_MOVE_RESOURCE,new String[]{e.getLocalizedMessage()}), e);
-			environment.getStatusHandler().reportError(status);
-		} finally {
-			try {
-				if (finStream != null) {
-					finStream.close();
-				}
-			} catch (IOException e) {
-			}
-		}
-		return status;
-	}
-	
-	public Status undo(IEnvironment environment) {
-		return null;
-	}
-
-	public Status redo(IEnvironment environment) {
-		return null;
-	}
-
-	/**
-	 * Returns the javaWSDLParam.
-	 * @return JavaWSDLParameter
-	 */
-	public JavaWSDLParameter getJavaWSDLParam() {
-		return javaWSDLParam_;
-	}
-
-	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 9e794ca27..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/WSDL2JavaCommand.java
+++ /dev/null
@@ -1,373 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.core.command;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.axis.wsdl.toJava.Emitter;
-import org.apache.axis.wsdl.toJava.GeneratedFileInfo;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.AxisConsumptionCoreMessages;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.core.plugin.WebServiceAxisConsumptionCorePlugin;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.command.internal.env.core.common.ProgressUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.ILog;
-import org.eclipse.wst.common.environment.IStatusHandler;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-public class WSDL2JavaCommand extends AbstractDataModelOperation {
-
-	private final String DEPLOY_TYPE = "deploy"; //$NON-NLS-1$
-	private final String UNDEPLOY_TYPE = "undeploy"; //$NON-NLS-1$
-	private final String TEMP = "temp"; //$NON-NLS-1$
-	private JavaWSDLParameter javaWSDLParam;
-	private String wsdlURI;
-	private String httpBasicAuthUsername;
-	private String httpBasicAuthPassword;
-	private List deployFiles;
-	private List javaFiles;
-	private File tempOutputFile;
-
-	public WSDL2JavaCommand() {
-	}
-
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-	{
-		IEnvironment environment = getEnvironment();
-		IStatus status;
-		if (javaWSDLParam == null) {
-			status = StatusUtils.errorStatus(
-					AxisConsumptionCoreMessages.MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET);
-			environment.getStatusHandler().reportError(status);
-			return status;
-		}
-		
-		if (wsdlURI != null) //bottom up case has already has the correct WSDL on javaWSDLParam
-		{
-			javaWSDLParam.setInputWsdlLocation(wsdlURI);
-		}
-		javaWSDLParam.setHTTPUsername(httpBasicAuthUsername);
-		javaWSDLParam.setHTTPPassword(httpBasicAuthPassword);
-		
-		Emitter wsdl2Java = new Emitter();
-		if (environment.getLog().isEnabled("emitter")) {
-			wsdl2Java.setVerbose(true);
-		} else {
-			wsdl2Java.setVerbose(false);
-		}
-		boolean serverSide = javaWSDLParam.getServerSide() == JavaWSDLParameter.SERVER_SIDE_BEAN;
-		wsdl2Java.setServerSide(serverSide);
-		if (serverSide) {
-			wsdl2Java.setSkeletonWanted(javaWSDLParam.isSkeletonDeploy());
-		}
-		
-		// create temporary directory to use as output directory for wsdl2java
-		tempOutputFile = createTempDir();
-		wsdl2Java.setOutputDir(tempOutputFile.toString());
-		
-		try {
-			if (javaWSDLParam.isMetaInfOnly()) {
-				// for the case Java2WSDL-WSDL2Java
-				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			
-				if (javaWSDLParam.getMappings() != null) {
-					wsdl2Java.setNamespaceMap(javaWSDLParam.getMappings());
-				}
-			}
-			environment.getLog().log(ILog.INFO, 5019, this, "execute", "Java output = " + javaWSDLParam.getJavaOutput());
-			if (javaWSDLParam.getHTTPPassword() != null) {
-				wsdl2Java.setPassword(javaWSDLParam.getHTTPPassword());
-				environment.getLog().log(ILog.INFO, 5081, this, "execute", "password: " + javaWSDLParam.getHTTPPassword());
-			}
-			if (javaWSDLParam.getHTTPUsername() != null) {
-				wsdl2Java.setUsername(javaWSDLParam.getHTTPUsername());
-				environment.getLog().log(ILog.INFO, 5082, this, "execute", "username: " + javaWSDLParam.getHTTPUsername());
-			}
-			environment.getLog().log(ILog.INFO, 5020, this, "execute", "WSDL Location = " + javaWSDLParam.getInputWsdlLocation());
-			
-			// If timeout is not set, the default timeout for wsdl2java is 45 seconds.  
-			// The user can change the timeout value by setting 
-			// "-DAxisWsdl2JavaTimeout=<timeout_value_in_milliseconds>" as VM argument
-			// when starting the Eclipse workbench.
-			//
-			// For example, enter the following command to start the Eclipse workbench 
-			// in order to set the Axis WSDL to Java emitter timeout to 60 seconds:
-			//
-			// 		eclipse -vmargs "-DAxisWsdl2JavaTimeout=60000"
-			//
-			
-			String wsdl2JavaTimeoutProperty = System.getProperty("AxisWsdl2JavaTimeout");
-			if (wsdl2JavaTimeoutProperty != null) {
-				long timeout;
-				timeout = new Integer(wsdl2JavaTimeoutProperty).longValue();
-				wsdl2Java.setTimeout(timeout);
-				environment.getLog().log(ILog.INFO, 5091, this, "execute", "Timeout = " + timeout);
-			}
-			
-			ProgressUtils.report(monitor, NLS.bind(AxisConsumptionCoreMessages.MSG_PARSING_WSDL, javaWSDLParam.getInputWsdlLocation() ) );
-			
-
-			
-			wsdl2Java.run(javaWSDLParam.getInputWsdlLocation());
-			
-			javaFiles = wsdl2Java.getGeneratedFileNames();
-			
-			deployFiles = new ArrayList();
-			if (serverSide) {
-				// set deployment files
-				List deploymentFiles1 = wsdl2Java.getGeneratedFileInfo().findType(DEPLOY_TYPE);
-				List deploymentFiles2 = wsdl2Java.getGeneratedFileInfo().findType(UNDEPLOY_TYPE);
-				if (deploymentFiles1 != null && deploymentFiles2 != null) {
-					deploymentFiles1.addAll(deploymentFiles2);
-					for (int i = 0; i < deploymentFiles1.size(); i++) {
-						GeneratedFileInfo.Entry entry = (GeneratedFileInfo.Entry) deploymentFiles1.get(i);
-						deployFiles.add(entry.fileName);
-					}
-				}	
-				javaFiles.removeAll(deployFiles);
-			}
-			
-			status = moveGeneratedFiles(environment, monitor);
-			
-		} catch (Exception e) {
-			environment.getLog().log(ILog.ERROR, 5021, this, "execute", e);
-			status = StatusUtils.errorStatus(
-					AxisConsumptionCoreMessages.MSG_ERROR_WSDL_JAVA_GENERATE + " " //$NON-NLS-1$
-					+ e.toString(), e);
-			environment.getStatusHandler().reportError(status);
-		} finally {
-			deleteDir(tempOutputFile); 			
-		}
-		return status;	
-	}
-	  
-	public IStatus moveGeneratedFiles( IEnvironment environment, IProgressMonitor monitor ) 
-	{
-		IStatus status = Status.OK_STATUS;
-		
-		FileInputStream finStream = null;
-		
-		try {
-			String outputDir, javaOutput;
-			outputDir = removeFileProtocol(javaWSDLParam.getOutput());
-			javaOutput = removeFileProtocol(javaWSDLParam.getJavaOutput());
-			ResourceContext context = WebServicePlugin.getInstance().getResourceContext();				
-			
-			IPath outputPath = new Path (outputDir);
-			
-			String fileName;
-			IPath targetPath=null;
-			IStatusHandler statusHandler = environment.getStatusHandler();
-			String deployFile;
-			Iterator iterator;
-			
-			String tempOutputDir = tempOutputFile.toString();
-			String [] movedDeployFiles = new String [deployFiles.size()];
-			iterator = deployFiles.iterator();
-			int i = 0;
-			while (iterator.hasNext()) {
-				deployFile = (String) iterator.next();
-				File source = new File(deployFile);
-				finStream = new FileInputStream(source);
-				if (finStream != null) {
-					if (deployFile.startsWith(tempOutputDir)) {
-						fileName = deployFile.substring(tempOutputDir.length());
-						targetPath = outputPath.append(fileName).makeAbsolute();  
-						FileResourceUtils.createFileAtLocation(context,  
-								targetPath,
-								finStream,
-								monitor,
-								statusHandler);
-						movedDeployFiles[i++]= ResourceUtils.getWorkspaceRoot().getFileForLocation(targetPath).getLocation().toString();
-					}
-					finStream.close();
-				}
-			}
-			
-			javaWSDLParam.setDeploymentFiles(movedDeployFiles);
-			
-			IPath javaOutputPath = new Path (javaOutput);
-			
-			String javaFile;
-			String fullClassName = null;
-			String [] movedJavaFiles =  new String [javaFiles.size()];
-			iterator = javaFiles.iterator();
-			i = 0;
-			while (iterator.hasNext()) {
-				javaFile = (String) iterator.next();
-				File source = new File(javaFile);
-				finStream = new FileInputStream(source);
-				if (finStream != null) {
-					// for the case Java2WSDL-WSDL2Java, no need to move Java files, just delete them
-					if (!javaWSDLParam.isMetaInfOnly()) {
-						// for the case WSDL2Java, move Java files to Java output directory
-						if (javaFile.startsWith(tempOutputDir)) {
-							fullClassName = javaFile.substring(tempOutputDir.length());
-							targetPath = javaOutputPath.append(fullClassName).makeAbsolute(); 
-							FileResourceUtils.createFileAtLocation(context,  
-									targetPath,
-									finStream,
-									monitor,
-									statusHandler);
-							movedJavaFiles[i++]= ResourceUtils.getWorkspaceRoot().getFileForLocation(targetPath).getLocation().toString();
-						}
-					}
-					
-					finStream.close();
-				}
-			}
-			javaWSDLParam.setJavaFiles(movedJavaFiles);
-			
-		} catch (Exception e) {
-			status = StatusUtils.errorStatus(NLS.bind(AxisConsumptionCoreMessages.MSG_ERROR_MOVE_RESOURCE,new String[]{e.getLocalizedMessage()}), e);
-			environment.getStatusHandler().reportError(status);
-			
-		} finally {
-			if (finStream != null) {
-				try {
-					finStream.close();
-				} catch (IOException e) {
-				}
-			}			
-		}
-		
-		return status;
-	}
-
-	/**
-	 * Deletes all files and subdirectories under dir. 
-	 * Just ignore and keep going if delete is not successful
-	 * 
-	 * @param dir directory to delete
-	 */
-	public void deleteDir(File dir) {
-		if (dir.isDirectory()) {
-			String[] children = dir.list();
-			for (int i = 0; i < children.length; i++) {
-				deleteDir(new File(dir, children[i]));
-			}
-		}
-		// The directory is now empty so delete it
-		dir.delete();
-	}
-	
-	/**
-	 * Creates a temporary directory under the plugin's state location (i.e.
-	 * .metadata/.plugin directory)
-	 * 
-	 * @return File
-	 */
-	private File createTempDir() {
-		String pluginTempDir = WebServiceAxisConsumptionCorePlugin
-		.getInstance().getStateLocation().toString();
-		File tempDir = new File(pluginTempDir);
-		File newTempDir = null;
-		try {
-			newTempDir = File.createTempFile(TEMP, "", tempDir);
-			// delete the temp file and create a temp directory instead
-			if (newTempDir.delete()) {
-				if (newTempDir.mkdir()) {
-					tempDir = newTempDir;
-				}
-			}
-			return tempDir;
-		} catch (Exception e) {
-			return tempDir;
-		}
-	}
-		
-	/*
-	 * Hack: Axis doesn't like file URLs
-	 */
-	private String removeFileProtocol(String s) {
-		if (s.startsWith("file:")) {
-			String newS = s.substring(5, s.length());
-			int i = newS.indexOf(':');
-			if (i != -1) {
-				String protocol = newS.substring(0, i);
-				int j = protocol.indexOf('/');
-				int k = protocol.indexOf('\\');
-				int max = Math.max(j, k);
-				if (max != -1)
-					newS = newS.substring(max + 1, newS.length());
-			}
-			return newS;
-		}
-		return s;
-	}
-
-	public Status undo(IEnvironment environment) {
-		return null;
-	}
-
-	public Status redo(IEnvironment environment) {
-		return null;
-	}
-
-	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/JavaWSDLParamModifier.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/common/JavaWSDLParamModifier.java
deleted file mode 100644
index 8d1b149b6..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/common/JavaWSDLParamModifier.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package org.eclipse.jst.ws.internal.axis.consumption.core.common;
-
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.Properties;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.command.internal.env.core.data.BeanModifier;
-
-public class JavaWSDLParamModifier implements BeanModifier {
-
-	public void modify(Object bean, Object propertyHolder)
-	{
-		JavaWSDLParameter javaWSDLParam;
-		if (bean != null)
-		{
-			javaWSDLParam = (JavaWSDLParameter)bean;	
-		}
-		else
-		{
-			javaWSDLParam = new JavaWSDLParameter();
-		}
-		 
-		//look for each known key in the map & if there, convert the properties and set on javaWSDLParam
-		if (propertyHolder instanceof Map)
-		{	
-			Map propertyMap = (Map)propertyHolder;
-			
-			if (propertyMap.containsKey("Use"))
-			{				
-			   javaWSDLParam.setUse((String)propertyMap.get("Use"));	
-			}
-			if (propertyMap.containsKey("Style"))
-			{
-				javaWSDLParam.setStyle((String)propertyMap.get("Style"));
-			}
-			if (propertyMap.containsKey("JavaOutput"))
-			{				 
-				javaWSDLParam.setJavaOutput((String)propertyMap.get("JavaOutput"));
-			}
-			if (propertyMap.containsKey("Methods"))
-			{
-				//get Method list from the map
-				String methodList = (String)propertyMap.get("Methods");
-				
-				//tokenize the method list
-				StringTokenizer tok = new StringTokenizer(methodList, " ");
-				Hashtable methods = new Hashtable();
-				while (tok.hasMoreTokens())
-				{
-					methods.put(tok.nextToken(), new Boolean(true));
-				}				
-				javaWSDLParam.setMethods(methods);
-			}
-			if (propertyMap.containsKey("Mappings"))
-			{
-				//get name of the file that has the mappings in it from the map
-				String filename = (String)propertyMap.get("Mappings");
-				//get the list of mapping from the file
-				 HashMap mappings = readMappingsFromFile(filename);
-				 javaWSDLParam.setMappings(mappings);
-			}
-		}
-	}
-	
-	private HashMap readMappingsFromFile(String filename)
-	  {
-		HashMap hashmap = new HashMap();
-		IFile resource = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filename));
-		
-		if (resource != null )
-		{
-		  try
-		  {
-			Properties props = new Properties();
-			props.load(resource.getContents());			
-			hashmap.putAll(props);						
-		  }
-		  catch (Exception e)
-		  {
-		    // TODO Report some error here.
-		  }
-		}	
-		return hashmap;
-	  }
-}
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 3ee34ecdb..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/common/JavaWSDLParameter.java
+++ /dev/null
@@ -1,460 +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 methodString_ = ""; //$NON-NLS-1$
-	 //The string representation of the method array
-	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() {
-		if (methodString_.equals(""))
-		{		
-			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_;
-	}
-	
-	/**
-	 * Sets a comma separated string of methods	 *
-	 */
-	public void setMethodString(String methods)
-	{
-		methodString_ = methods;
-	}
-
-	/**
-	 * 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/common/NameMappingUtils.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/common/NameMappingUtils.java
deleted file mode 100644
index 061fdac56..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/common/NameMappingUtils.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.jst.ws.internal.axis.consumption.core.common;
-
-import java.util.Map;
-
-import org.apache.axis.utils.JavaUtils;
-import org.apache.axis.wsdl.toJava.Utils;
-
-public class NameMappingUtils {
-
-  private NameMappingUtils() {
-  }
-
-  public static String getPackageName(String namespace, Map ns2pkgMap)
-  {
-    if (namespace != null)
-    {
-      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)
-  {
-  	return Utils.makePackageName(namespaceURI);
-  }
-  
-  /**
-   * xmlNameToJavaClass
-   * @param xmlname
-   * @return Java class name
-   */
-  public static String xmlNameToJavaClass(String xmlname)
-  {
-  	return Utils.xmlNameToJavaClass(xmlname);
-  }
-  
-  /**
-   * getPortName
-   * @param partName
-   * @return port name used by the Axis emitter
-   */
-  public static String getPortName(String portName) 
-  {
-  	if (!JavaUtils.isJavaId(portName)) 
-        portName = xmlNameToJavaClass(portName);
-  	return portName;
-  }
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/plugin/WebServiceAxisConsumptionCorePlugin.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/plugin/WebServiceAxisConsumptionCorePlugin.java
deleted file mode 100644
index 695f7a81b..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/plugin/WebServiceAxisConsumptionCorePlugin.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.consumption.core.plugin;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.wst.common.environment.EnvironmentService;
-import org.eclipse.wst.common.environment.ILog;
-import org.osgi.framework.BundleContext;
-
-
-/**
-* 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 WebServiceAxisConsumptionCorePlugin extends Plugin
-{
-
-	/**
-	* The identifier of the descriptor of this plugin in plugin.xml.
-	*/
-	public static final String ID =
-		"org.eclipse.jst.ws.axis.consumption.core";
-
-	/**
-	* The reference to the singleton instance of this plugin.
-	*/
-	private static WebServiceAxisConsumptionCorePlugin instance_;
-	private ILog log_;
-
-	/**
-	* Constructs a runtime plugin object for this plugin.
-	* The "plugin" element in plugin.xml should include the attribute
-	* class = "org.eclipse.jst.ws.axis.consumption.core".
-	* @param descriptor The descriptor of this plugin.
-	*/
-	public WebServiceAxisConsumptionCorePlugin() {
-		super();
-		if (instance_ == null) {
-			instance_ = this;
-		}
-		log_ = EnvironmentService.getEclipseLog();
-
-	}
-
-  // This method is needed to keep the logging from blowing up.
-  public String toString()
-  {
-    return ID;  
-  }
-  
-	/**
-	* Returns the singleton instance of this plugin. Equivalent to calling
-	* (WebServiceWasConsumptionPlugin)Platform.getPlugin("org.eclipse.jst.ws.was.v5.tp");
-	* @return The WebServiceAxisConsumptionCorePlugin singleton.
-	*/
-	static public WebServiceAxisConsumptionCorePlugin getInstance() {
-		return instance_;
-	}
-
-	/**
-	* Called once by the platform when this plugin is first loaded.
-	* @throws CoreException If this plugin fails to start.
-	*/
-	public void start( BundleContext bundle ) throws CoreException {
-		log_.log(ILog.INFO, 5087, this, "start", "Starting plugin org.eclipse.jst.ws.axis.consumption.core");
-    
-    try
-    {
-		  super.start( bundle );
-    }
-    catch( Exception exc )
-    {
-      log_.log( ILog.ERROR, 5088, this, "start", exc );
-    }
-	}
-
-	/**
-	* Called once by the platform when this plugin is unloaded.
-	* @throws CoreException If this plugin fails to shutdown.
-	*/
-	public void stop( BundleContext context ) throws CoreException {
-		log_.log(ILog.INFO, 5089, this, "shutdown", "Shutting plugin org.eclipse.jst.ws.axis.consumption.core");
-    
-    try
-    {
-		  super.stop( context );
-    }
-    catch( Exception exc )
-    {
-      log_.log( ILog.ERROR, 5090, this, "stop", exc );      
-    }
-	}
-}
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 cb0105380..000000000
--- 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.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/.cvsignore b/bundles/org.eclipse.jst.ws.axis.consumption.ui/.cvsignore
deleted file mode 100644
index 36207666d..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-build.xml
-temp.folder
-wsc-axis-ui.jar
-@dot
-src.zip
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 cb0ee10ec..000000000
--- 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/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.axis.consumption.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index bdf9129cb..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,57 +0,0 @@
-#Mon Jan 30 10:34:37 EST 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.jst.ws.axis.consumption.ui/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index a2bb559df..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Jan 30 10:41:34 EST 2006
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.axis.consumption.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 0c9b92975..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,46 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.axis.consumption.ui; singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.jst.ws.internal.axis.consumption.ui.plugin.WebServiceAxisConsumptionUIPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.axis.consumption.ui,
- org.eclipse.jst.ws.internal.axis.consumption.ui.command,
- org.eclipse.jst.ws.internal.axis.consumption.ui.plugin,
- org.eclipse.jst.ws.internal.axis.consumption.ui.task,
- org.eclipse.jst.ws.internal.axis.consumption.ui.util,
- org.eclipse.jst.ws.internal.axis.consumption.ui.widgets,
- org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client,
- org.eclipse.jst.ws.internal.axis.consumption.ui.wsrt
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.resources,
- org.eclipse.emf.common,
- org.eclipse.emf.ecore,
- org.eclipse.jdt.core,
- org.eclipse.jem,
- org.eclipse.jem.util,
- org.eclipse.jem.workbench,
- org.eclipse.wst.ws.parser,
- org.eclipse.jst.ws.consumption.ui,
- org.eclipse.jst.ws,
- org.eclipse.jst.ws.axis.consumption.core,
- org.eclipse.jst.ws.ui,
- org.eclipse.jst.ws.consumption,
- org.eclipse.core.runtime.compatibility,
- org.eclipse.wst.command.env.core,
- org.eclipse.wst.command.env,
- org.eclipse.wst.command.env.ui,
- org.eclipse.wst.server.core,
- org.eclipse.wst.wsdl,
- org.eclipse.jst.j2ee,
- org.eclipse.jem.workbench,
- org.eclipse.wst.ws,
- org.eclipse.wst.common.modulecore,
- org.wsdl4j,
- org.apache.axis,
- org.eclipse.wst.common.frameworks,
- org.eclipse.wst.common.environment
-Eclipse-AutoStart: true
-Plugin-Class: org.eclipse.jst.ws.internal.axis.consumption.ui.plugin.WebServiceAxisConsumptionUIPlugin
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/about.html b/bundles/org.eclipse.jst.ws.axis.consumption.ui/about.html
deleted file mode 100644
index 6f6b96c4c..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/build.properties b/bundles/org.eclipse.jst.ws.axis.consumption.ui/build.properties
deleted file mode 100644
index c772b640e..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/
-bin.includes = .,\
-               plugin.properties,\
-               plugin.xml,\
-               META-INF/,\
-               about.html
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 3abf85f7c..000000000
--- 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
-DESC_RUNTIME_AXIS_11=Apache Axis
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 50ab9c88d..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/plugin.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-   
-	<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.ui.wsrt.AxisClientConfigWidgetFactory"/>
-    </extension> 
-          <extension
-           point="org.eclipse.wst.command.env.antDataMapping">
-        <map
-              key="ClientProjectName"
-              operation="org.eclipse.jst.ws.internal.axis.consumption.ui.command.AxisClientDefaultingCommand"
-              property="ClientProject"
-              transform="org.eclipse.jst.ws.internal.common.String2IProjectTransformer"/>
-        <map
-              key="CustomizeClientMappings"
-              operation="org.eclipse.jst.ws.internal.axis.consumption.ui.command.AxisClientDefaultingCommand"
-              property="CustomizeClientMappings"/>                                 
- 		<map
-              key="Mappings"
-              operation="org.eclipse.jst.ws.internal.axis.consumption.ui.task.DefaultsForHTTPBasicAuthCommand"
-              property="JavaWSDLParam"
-              transform="org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParamModifier"/>
- 		<map
-              key="Mappings"
-              operation="org.eclipse.jst.ws.internal.axis.consumption.ui.command.DefaultsForClientJavaWSDLCommand"
-              property="JavaWSDLParam"
-              transform="org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParamModifier"/>
- 		<map
-              key="Mappings"
-              operation="org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand"
-              property="JavaWSDLParam"
-              transform="org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParamModifier"/>
- 		<map
-              key="Mappings"
-              operation="org.eclipse.jst.ws.internal.axis.consumption.ui.task.Stub2BeanCommand"
-              property="JavaWSDLParam"
-              transform="org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParamModifier"/>
-  </extension> 
-</plugin>
\ 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/AxisConsumptionUI.properties b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/AxisConsumptionUI.properties
deleted file mode 100644
index 0e6925d90..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/AxisConsumptionUI.properties
+++ /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
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-
-MSG_ERROR_DEFAULT_BEAN=IWAB0491E Error encountered while setting up default values for Java bean
-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
-#
-MSG_ERROR_WSDL_LOCATION_NOT_SET=IWAB0501E WSDL location not set.
-
-#
-#AddJarsToProjectBuildPathTask
-#
-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
-#
-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
-#
-MSG_ERROR_REFRESH_PROJECT=IWAB0508E Unable to refresh project.
-
-#
-#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
-
-#
-# 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?
-
-
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/AxisConsumptionUIMessages.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/AxisConsumptionUIMessages.java
deleted file mode 100644
index 471a450a3..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/AxisConsumptionUIMessages.java
+++ /dev/null
@@ -1,54 +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.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class AxisConsumptionUIMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.jst.ws.internal.axis.consumption.ui.AxisConsumptionUI";//$NON-NLS-1$
-
-	private AxisConsumptionUIMessages() {
-		// Do not instantiate
-	}
-
-	public static String MSG_ERROR_DEFAULT_BEAN;
-	public static String MSG_ERROR_WSDL_NO_DEFINITION;
-	public static String MSG_ERROR_WSDL_NO_PORT;
-	public static String MSG_ERROR_WRITE_WSDL;
-	public static String MSG_ERROR_IMPORT_WSDL;
-	public static String MSG_ERROR_WSDL_LOCATION_NOT_SET;
-	public static String MSG_WARN_NO_JAVA_NATURE;
-	public static String MSG_ERROR_BAD_BUILDPATH;
-	public static String PROGRESS_INFO_COPY_AXIS_CFG;
-	public static String MSG_ERROR_FILECOPY;
-	public static String MSG_ERROR_REFRESH_PROJECT;
-	public static String TOOLTIP_PWJB_PAGE;
-	public static String TOOLTIP_PWJB_TEXT_FOLDER;
-	public static String TOOLTIP_PWJB_CHECKBOX_GENPROXY;
-	public static String PAGE_TITLE_WS_AXIS_PROXY;
-	public static String PAGE_DESC_WS_AXIS_PROXY;
-	public static String CHECKBOX_GENPROXY;
-	public static String LABEL_FOLDER_NAME;
-	public static String PAGE_TITLE_WS_BEAN2XML;
-	public static String PAGE_TITLE_WS_XML2PROXY;
-	public static String PAGE_DESC_P2N_MAPPINGS;
-	public static String LABEL_MAPPING_PAIRS;
-	public static String TABLE_COLUMN_LABEL_PACKAGE;
-	public static String TABLE_COLUMN_LABEL_NAMESPACE;
-	public static String LABEL_EXPLORE_MAPPINGS_XML2BEAN;
-	public static String TOOLTIP_N2P_SHOW_MAPPINGS;
-	public static String MSG_ERROR_XML_FILE_OVERWRITE_DISABLED;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, AxisConsumptionUIMessages.class);
-	}
-}
\ 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/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 959002a71..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientDefaultingCommand.java
+++ /dev/null
@@ -1,263 +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.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.common.WSDLParserFactory;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-/**
- * 
- * AxisClientDefaultingCommand
- *  
- */
-public class AxisClientDefaultingCommand extends AbstractDataModelOperation 
-{
-    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 boolean clientIsExistingServer_;
-	private String proxyProjectFolder_;
-	private WebServicesParser webServicesParser_;
-	public AxisClientDefaultingCommand( ) 
-	{
-	}
-
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-	{
-		IStatus status = Status.OK_STATUS;
-		
-		clientExistingServer_ = getServerFromServerLabel();
-//		if (clientExistingServer_ != null) {
-//			//TODO The following line should no longer be necessary.
-//			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
-			{
-				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/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 7c9edf127..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientInputCommand.java
+++ /dev/null
@@ -1,69 +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.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient;
-
-
-public class AxisClientInputCommand extends AbstractDataModelOperation {
-	
-	private IWebServiceClient wsc_;
-
-		private String clientProject_ = null;
-		private String wsdlURL_;
-		private String clientServer_;
-		private WebServicesParser webServicesParser_;
-	  
-		/**
-		* Default CTOR
-		*/
-		public AxisClientInputCommand() {
-		}
-		
-		public AxisClientInputCommand(IWebServiceClient wsc, IContext context, String project) {
-			wsc_ = wsc;
-			clientProject_ = project; 
-		}
-		
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-	{	    
-		wsdlURL_ = wsc_.getWebServiceClientInfo().getWsdlURL();
-		clientServer_ = wsc_.getWebServiceClientInfo().getServerInstanceId();
-		
-		return Status.OK_STATUS;
-	  }
-
-	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 1f21ce548..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientOutputCommand.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.jst.ws.internal.axis.consumption.ui.command;
-
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient;
-
-
-public class AxisClientOutputCommand extends AbstractDataModelOperation {
-	
-	private IWebServiceClient wsc_;
-	private String proxyBean_;
-	  
-		/**
-		* Default CTOR
-		*/
-		public AxisClientOutputCommand() {
-		}
-		
-		public AxisClientOutputCommand(IWebServiceClient wsc, IContext context) {
-			wsc_ = wsc;
-		}
-		
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-	{	
-		wsc_.getWebServiceClientInfo().setImplURL(proxyBean_);
-		return Status.OK_STATUS;
-	  }
-
-	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 df0689420..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/CopyClientWSDLCommand.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.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.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.AxisConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-/**
- *
- */
-public class CopyClientWSDLCommand extends AbstractDataModelOperation
-{
-  
-  private String wsdlURL_;
-  private String clientWSDLPathName_;
-  private WebServicesParser wsParser_;
-  
-  public CopyClientWSDLCommand()
-  {
-   
-  }
-  
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-	{
-		IEnvironment env = getEnvironment();
-    IStatus status = Status.OK_STATUS;
-    Definition def = wsParser_.getWSDLDefinition(wsdlURL_);
-    if(def==null)
-    {
-      status = StatusUtils.errorStatus( NLS.bind(AxisConsumptionUIMessages.MSG_ERROR_WSDL_NO_DEFINITION, new String[]{wsdlURL_}));
-      env.getStatusHandler().reportError(status);
-      return status;
-    }
-    IPath clientWSDLPath = new Path(clientWSDLPathName_);
-    IWorkspaceRoot workspaceRoot = FileResourceUtils.getWorkspaceRoot();
-    status = resolveWSDL(workspaceRoot, def, clientWSDLPath, env, monitor);
-    return status;
-  }
-
-	private IStatus resolveWSDL(
-		IWorkspaceRoot workspace,
-		Definition wsdlDef,
-		IPath wsdlPath,
-		IEnvironment env, 
-		IProgressMonitor monitor) {
-		try {
-			writeWSDLFile(workspace, wsdlDef, wsdlPath, env, monitor);
-			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 StatusUtils.errorStatus( NLS.bind(AxisConsumptionUIMessages.MSG_ERROR_IMPORT_WSDL,new String[]{importDef.getLocationURI()}));
-					}
-					IPath newPath =
-						new Path(newPathString + importDef.getLocationURI());
-					IStatus status = resolveWSDL(workspace, def, newPath, env, monitor);
-					if (status != null
-						&& status.getSeverity() == Status.ERROR) {
-						return status;
-					}
-				}
-			}
-		} catch (Exception e) {
-		    return StatusUtils.errorStatus( NLS.bind(AxisConsumptionUIMessages.MSG_ERROR_WRITE_WSDL,new String[] { wsdlPath.toString() }), e);
-		}
-		return Status.OK_STATUS;
-	}
-
-	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,
-		IEnvironment env, 
-		IProgressMonitor monitor)
-		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,
-			monitor,
-			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 93d3f54a1..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/DefaultsForClientJavaWSDLCommand.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.axis.consumption.ui.command;
-
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jst.ws.internal.axis.consumption.core.AxisConsumptionCoreMessages;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.AxisConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.PlatformUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-public class DefaultsForClientJavaWSDLCommand extends AbstractDataModelOperation {
-
-	private JavaWSDLParameter javaWSDLParam_;
-	private IProject proxyProject_;
-	private String WSDLServiceURL_;
-	private String WSDLServicePathname_;
-	
-	public DefaultsForClientJavaWSDLCommand( ) {
-	}
-	
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-	{
-		IEnvironment environment = getEnvironment();
-		IStatus status;
-		if (javaWSDLParam_ == null) {
-			status = StatusUtils.errorStatus(
-					AxisConsumptionCoreMessages.MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET);
-			environment.getStatusHandler().reportError(status);
-			return status;
-		}
-
-		javaWSDLParam_.setMetaInfOnly(false);
-		javaWSDLParam_.setServerSide(JavaWSDLParameter.SERVER_SIDE_NONE);
-		
-	    ModuleCoreNature mn = ModuleCoreNature.getModuleCoreNature(proxyProject_);
-	    if (mn!=null)
-	    {
-			IPath webModuleServerRoot = ResourceUtils.getJavaSourceLocation(proxyProject_ );
-			//String output = PlatformUtils.getPlatformURL(webModuleServerRoot);
-			String output =	ResourceUtils.findResource(webModuleServerRoot).getLocation().toString();
-//			String output = ResourceUtils.getWorkspaceRoot().getFolder(webModuleServerRoot).getLocation().toString();
-			javaWSDLParam_.setJavaOutput(output);
-
-
-			IFolder webModuleContainer = ResourceUtils.getWebComponentServerRoot(proxyProject_);
-			if (webModuleContainer !=null)
-			{
-			  IPath webModulePath = webModuleContainer.getFullPath();
-			  //output =  PlatformUtils.getPlatformURL(webModulePath);
-			  IResource res = ResourceUtils.findResource(webModulePath);
-			  if (res!=null){
-				  output = res.getLocation().toString();
-			  } 
-			  javaWSDLParam_.setOutput(output);
-			}	
-	    }
-	    else
-	    {
-	    	//Check if it's a plain old Java project
-	    	IJavaProject javaProject = null;
-	  
-	 		 javaProject = JavaCore.create(proxyProject_);    
-	 		 if (javaProject != null)
-	 		 {
-	 			IPath webModuleServerRoot = ResourceUtils.getJavaSourceLocation(proxyProject_);
-				String output =	ResourceUtils.findResource(webModuleServerRoot).getLocation().toString();
-				javaWSDLParam_.setJavaOutput(output);
-				javaWSDLParam_.setOutput(output);
-	 		 }
-	 		 else
-	 		 {
-	 			 //Not familiar with this kind of project
-	 	 		 status = StatusUtils.errorStatus( AxisConsumptionUIMessages.MSG_WARN_NO_JAVA_NATURE);	
-	 	 		 environment.getStatusHandler().reportError(status);
-	 	 		 return status;
-	 			 
-	 		 }
-	    }
-
-
-
-		if (WSDLServicePathname_ == null) {
-			
-			if (WSDLServiceURL_ == null) {
-				status = StatusUtils.errorStatus(
-						AxisConsumptionUIMessages.MSG_ERROR_WSDL_LOCATION_NOT_SET);
-				environment.getStatusHandler().reportError(status);
-				return status;
-			}
-		} else {
-			WSDLServiceURL_ = PlatformUtils.getFileFromPlatform(WSDLServicePathname_);
-		}
-
-		javaWSDLParam_.setInputWsdlLocation(WSDLServiceURL_);
-
-		return Status.OK_STATUS;
-	}
-
-	/**
-	 * 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/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 d7eb402eb..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/plugin/WebServiceAxisConsumptionUIPlugin.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.axis.consumption.ui.plugin;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.wst.common.environment.EnvironmentService;
-import org.eclipse.wst.common.environment.ILog;
-import org.osgi.framework.BundleContext;
-
-
-/**
-* 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 ILog 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() {
-		super();
-		if (instance_ == null) {
-			instance_ = this;
-		}
-		log_ = EnvironmentService.getEclipseLog();
-
-	}
-
-  // This method is needed to keep the logging from blowing up.
-  public String toString()
-  {
-    return ID;  
-  }
-  
-	/**
-	* 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 start( BundleContext bundle ) throws CoreException {
-		log_.log(ILog.INFO, 5066, this, "start", "Starting plugin org.eclipse.jst.ws.axis.consumption.ui");
-    
-    try
-    {
-		  super.start( bundle );
-    }
-    catch( Exception exc )
-    {
-      log_.log( ILog.ERROR, 5066, this, "start", exc );
-    }
-	}
-
-	/**
-	* Called once by the platform when this plugin is unloaded.
-	* @throws CoreException If this plugin fails to shutdown.
-	*/
-	public void stop( BundleContext context ) throws CoreException {
-		log_.log(ILog.INFO, 5067, this, "shutdown", "Shutting plugin org.eclipse.jst.ws.axis.consumption.ui");
-    
-    try
-    {
-		  super.stop( context );
-    }
-    catch( Exception exc )
-    {
-      log_.log( ILog.ERROR, 5066, this, "stop", exc );      
-    }
-	}
-}
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 3c87e5105..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/CheckAxisDeploymentDescriptorsTask.java
+++ /dev/null
@@ -1,81 +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.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.AxisConsumptionCoreMessages;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.AxisConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EnvironmentUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.StatusException;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public class CheckAxisDeploymentDescriptorsTask extends AbstractDataModelOperation {
-	
-	private IProject serverProject;
-    
-  public CheckAxisDeploymentDescriptorsTask( )
-  {
-  }
-	
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-	{
-		IEnvironment env = getEnvironment();
-		IStatus status = Status.OK_STATUS;
-		if(EnvironmentUtils.getResourceContext(env).isOverwriteFilesEnabled()) {
-      return status;
-		}
-
-	  IPath    filePath = null;
-      IProject project = serverProject;
-	  	  
-
-      filePath = J2EEUtils.getWebInfPath( project );
-      filePath = filePath.append("/server-config.wsdd");
-
-	  if(filePath==null || filePath.isEmpty())
-		{
-			status = StatusUtils.errorStatus( AxisConsumptionCoreMessages.MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET);
-			env.getStatusHandler().reportError(status);
-			return status;			
-		}
-
-		IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(filePath);
-		if (file.exists() && !EnvironmentUtils.getResourceContext(env).isOverwriteFilesEnabled())   {
-			status = StatusUtils.warningStatus( AxisConsumptionUIMessages.MSG_ERROR_XML_FILE_OVERWRITE_DISABLED);
-			try
-			{
-				env.getStatusHandler().report(status);
-			}
-			catch(StatusException se)
-			{
-				status = StatusUtils.errorStatus( "User aborted");
-			}
-			
-			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 768fb9161..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/CopyAxisJarCommand.java
+++ /dev/null
@@ -1,298 +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 java.util.ArrayList;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-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.ws.internal.axis.consumption.ui.AxisConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.plugin.WebServiceAxisConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.command.internal.env.core.common.ProgressUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.env.core.context.TransientResourceContext;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.common.BundleUtils;
-
-
-public class CopyAxisJarCommand extends AbstractDataModelOperation {
-
-  public static String AXIS_RUNTIME_PLUGIN_ID = "org.apache.axis"; //$NON-NLS-1$
-  public static String[] JARLIST = new String[] {
-	  "axis.jar",
-	  "commons-discovery-0.2.jar",
-	  "commons-logging-1.0.4.jar",
-	  "jaxrpc.jar",
-	  "saaj.jar",
-	  "wsdl4j-1.5.1.jar"
-  };
-  public static String PATH_TO_JARS_IN_PLUGIN = "lib/";
-
-  private IProject project;
-  private Boolean projectRestartRequired_ = Boolean.FALSE;
-  
-  /**
-   * Default CTOR;
-   */
-  public CopyAxisJarCommand( ) {
-  }
-
-  /**
-   * Execute the command
-   */
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-	{
-		IEnvironment env = getEnvironment();
-    IStatus status = Status.OK_STATUS;
-    ProgressUtils.report(monitor, AxisConsumptionUIMessages.PROGRESS_INFO_COPY_AXIS_CFG);
-    
-    if (J2EEUtils.isWebComponent(project))
-    {
-    	copyAxisJarsToProject(project, status, env, monitor);	
-    }
-    else
-    {
-    	//Check if it's a plain old Java project
- 		 if (J2EEUtils.isJavaComponent(project))
- 		 {
- 			status = addAxisJarsToBuildPath(project, env, monitor);
- 			if (status.getSeverity()==Status.ERROR)
- 			{
- 				env.getStatusHandler().reportError(status);
- 				return status;
- 			}
- 		 }
- 		 else
- 		 {
- 		   status = StatusUtils.errorStatus( AxisConsumptionUIMessages.MSG_WARN_NO_JAVA_NATURE);	
- 		   env.getStatusHandler().reportError(status);
- 		   return status;
- 		 }
-
-    }
-    
-    return status;
-
-  }
-
-  private void copyAxisJarsToProject(IProject project, IStatus status, IEnvironment env, IProgressMonitor monitor) {
-//    IPath webModulePath = ResourceUtils.getWebModuleServerRoot(project).getFullPath();
-	IPath webModulePath = J2EEUtils.getWebContentPath( project );
-    if (webModulePath == null) {
-      status = StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_PROJECT_NOT_FOUND);
-      env.getStatusHandler().reportError(status);
-      return;
-    }
-	
-	for (int i=0; i<JARLIST.length; ) {
-		copyIFile("lib/"+JARLIST[i], webModulePath, "WEB-INF/lib/"+JARLIST[i++], status, env, monitor); 
-	    if (status.getSeverity() == Status.ERROR)
-	      return;
-	}
-    return;
-  }
-
-  /**
-   *  
-   */
-  private void copyIFile(String source, IPath targetPath, String targetFile, IStatus status, IEnvironment env, IProgressMonitor monitor) {
-    IPath target = targetPath.append(new Path(targetFile));
-    ProgressUtils.report(monitor,ConsumptionMessages.PROGRESS_INFO_COPYING_FILE);
-
-    try {
-      ResourceContext context = new TransientResourceContext();
-      context.setOverwriteFilesEnabled(true);
-      context.setCreateFoldersEnabled(true);
-      context.setCheckoutFilesEnabled(true);
-      URL sourceURL = BundleUtils.getURLFromBundle( AXIS_RUNTIME_PLUGIN_ID, source );
-      IFile resource = ResourceUtils.getWorkspaceRoot().getFile(target);
-      if (!resource.exists()) {
-        IFile file = FileResourceUtils.createFile(context, target, sourceURL.openStream(), monitor, 
-            env.getStatusHandler());
-        if (projectRestartRequired_.booleanValue() == false && file.exists()) {
-          projectRestartRequired_ = Boolean.TRUE;
-        }
-
-      }
-    }
-    catch (Exception e) {
-      status = StatusUtils.errorStatus( AxisConsumptionUIMessages.MSG_ERROR_FILECOPY, e);
-      env.getStatusHandler().reportError(status);
-
-    }
-  }
-
-  public IStatus addAxisJarsToBuildPath(IProject p, IEnvironment env, IProgressMonitor monitor)
-  {
-	  String[] jarNames = new String[JARLIST.length];
-	  for (int i=0; i<JARLIST.length; i++)
-	  {
-		  StringBuffer sb = new StringBuffer();
-		  sb.append(PATH_TO_JARS_IN_PLUGIN);
-		  sb.append(JARLIST[i]);
-		  String jarName = sb.toString();
-		  jarNames[i] = jarName;
-	  }
-	  
-	  IStatus status = addJar(p, AXIS_RUNTIME_PLUGIN_ID, jarNames, env, monitor);
-	  if (status.getSeverity()==Status.ERROR)
-	  {			  
-		  return status;
-	  }
-	  return Status.OK_STATUS;
-  }
-
-  
-  private IStatus addJar(IProject webProject, String pluginId, String[] jarNames, IEnvironment env, IProgressMonitor monitor)
-  {
-
-    IStatus status = Status.OK_STATUS;
-    //
-    // Get the current classpath.
-    //
-    IJavaProject javaProject_ = null;
-    IClasspathEntry[] oldClasspath = null;
-    javaProject_ = JavaCore.create(webProject);
-    try
-    {
-      oldClasspath = javaProject_.getRawClasspath();
-    } catch (JavaModelException jme)
-    {
-      status = StatusUtils.errorStatus( AxisConsumptionUIMessages.MSG_ERROR_BAD_BUILDPATH, jme);
-      // env.getStatusHandler().reportError(status);
-      return status;
-    }
-
-    ArrayList newJarNamesList = new ArrayList();
-
-    for (int k = 0; k < jarNames.length; k++)
-    {
-      boolean found = false;
-      for (int i = 0; i < oldClasspath.length; i++)
-      {
-        found = oldClasspath[i].getPath().toString().toLowerCase().endsWith(jarNames[k].toLowerCase());
-        if (found)
-        {
-          break;
-        }
-      }
-
-      if (!found)
-      {
-        newJarNamesList.add(jarNames[k]);
-      }
-    }
-
-    if (newJarNamesList.size() > 0)
-    {
-      String[] newJarNames = (String[]) newJarNamesList.toArray(new String[] {});
-
-      IClasspathEntry[] newClasspath = new IClasspathEntry[oldClasspath.length + newJarNames.length];
-      int i = 0;
-      while (i < oldClasspath.length)
-      {
-        newClasspath[i] = oldClasspath[i];
-        i++;
-      }
-
-      try
-      {
-        int m = 0;
-        while (i < newClasspath.length)
-        {
-          newClasspath[i] = JavaCore.newLibraryEntry(getTheJarPath(pluginId, newJarNames[m]), null, null);
-          m++;
-          i++;
-        }
-      } catch (CoreException e)
-      {
-        status = StatusUtils.errorStatus( AxisConsumptionUIMessages.MSG_ERROR_BAD_BUILDPATH, e);
-        return status;
-      }
-
-      //
-      // Then update the project classpath.
-      //
-      try
-      {
-        javaProject_.setRawClasspath(newClasspath, monitor);
-      } catch (JavaModelException e)
-      {
-        status = StatusUtils.errorStatus(AxisConsumptionUIMessages.MSG_ERROR_BAD_BUILDPATH, e);
-        return status;
-      }
-    }
-
-    return status;
-
-  }
-
-		//
-		// Returns the local native pathname of the jar.
-		//
-		private IPath getTheJarPath(String pluginId, String theJar)
-			throws CoreException {
-			try {
-				if (pluginId != null) {
-					URL localURL =	Platform.asLocalURL(BundleUtils.getURLFromBundle( pluginId, 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,
-						AxisConsumptionUIMessages.MSG_ERROR_BAD_BUILDPATH,
-						e));
-			} catch (IOException e) {
-				throw new CoreException(
-					new org.eclipse.core.runtime.Status(
-						IStatus.WARNING,
-						WebServiceAxisConsumptionUIPlugin.ID,
-						0,
-						AxisConsumptionUIMessages.MSG_ERROR_BAD_BUILDPATH,
-						e));
-			}
-		}  
-  
-  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 0a6c00e75..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/DefaultsForHTTPBasicAuthCommand.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.axis.consumption.ui.task;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.consumption.ui.wsil.DialogWWWAuthentication;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WWWAuthenticationException;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServiceEntity;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-
-public class DefaultsForHTTPBasicAuthCommand extends AbstractDataModelOperation
-{
-  private WebServicesParser webServicesParser;
-  private String wsdlServiceURL;
-  private JavaWSDLParameter javaWSDLParam;
-
-  public DefaultsForHTTPBasicAuthCommand()
-  {
-    super();
-  }
-  
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-	{   
-    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 Status.OK_STATUS;
-  }
-  /**
-   * @param javaWSDLParam The javaWSDLParam to set.
-   */
-  public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
-    this.javaWSDLParam = javaWSDLParam;
-  }
-
-  /**
-   * @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 cd0bdf3b8..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/RefreshProjectCommand.java
+++ /dev/null
@@ -1,63 +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.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.AxisConsumptionUIMessages;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-
-public class RefreshProjectCommand extends AbstractDataModelOperation
-{
-	private IProject project;
-
-	public RefreshProjectCommand()
-	{
-	}
-
-	/**
-	* Execute RefreshProjectTask
-	*/
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-	{
-		IEnvironment env = getEnvironment();
-		try
-		{
-			if (project!=null)
-			project.refreshLocal(IProject.DEPTH_INFINITE, new NullProgressMonitor());
-		}
-		catch (CoreException e)
-		{
-		  IStatus status = StatusUtils.errorStatus( AxisConsumptionUIMessages.MSG_ERROR_REFRESH_PROJECT, e);
-		  env.getStatusHandler().reportError(status);
-		  return status;
-		}
-		return Status.OK_STATUS;
-	}
-
-	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 68b9a78bb..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanCommand.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.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.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.NameMappingUtils;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.AxisConsumptionUIMessages;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-public class Stub2BeanCommand extends AbstractDataModelOperation
-{
-  private WebServicesParser webServicesParser;
-  private JavaWSDLParameter javaWSDLParam_;
-  private String discoveredWsdlPortElementName;
-  private Vector portTypes_;
-  private String proxyBean_;
-  
-  private IProject clientProject_;
-  
-  public Stub2BeanCommand(){
-	  super();
-	  portTypes_ = new Vector();	  
-  }
-
-  /**
-  * Execute
-  */
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-	{
-		IEnvironment environment = getEnvironment();       
-    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)
-        {
-        }
-      }
-    }
-    
-    //Ensure the client project is either a flexible project or a Java project
-    ModuleCoreNature mn = ModuleCoreNature.getModuleCoreNature(clientProject_);
-    if (mn==null)
-    {
-        // Check if it's a plain old Java project
-    	IJavaProject javaProject = null;    	  
-		javaProject = JavaCore.create(clientProject_);    
-		if (javaProject == null)
-		{
-	 		   IStatus status = StatusUtils.errorStatus( AxisConsumptionUIMessages.MSG_WARN_NO_JAVA_NATURE);	
-	 		   environment.getStatusHandler().reportError(status);
-	 		   return status;
-		}    	
-    }
-    
-    Map pkg2nsMapping = javaWSDLParam_.getMappings();
-    Map services = def.getServices();
-    for (Iterator it = services.values().iterator(); it.hasNext();)
-    {
-      Service service = (Service)it.next();
-      String servicePkgName = NameMappingUtils.getPackageName(service.getQName().getNamespaceURI(), 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 = NameMappingUtils.getPackageName(portType.getQName().getNamespaceURI(), pkg2nsMapping);
-            String portTypeClassName = computeClassName(portTypeQName.getLocalPart());
-            stub2BeanInfo.setPackage(portTypePkgName);
-            stub2BeanInfo.setClass(portTypeClassName + "Proxy");
-            proxyBean_ = portTypePkgName+"."+portTypeClassName+"Proxy";
-            if (jndiName.equals(portTypeClassName))
-              portTypeClassName = portTypeClassName + "_PortType";
-            stub2BeanInfo.addSEI(portTypePkgName, portTypeClassName, servicePkgName, serviceClassName, jndiName, NameMappingUtils.getPortName(port.getName()));
-            try
-            {              
-              stub2BeanInfo.write( monitor, environment.getStatusHandler() );
-              if (discoveredWsdlPortElementName != null)
-              {
-                // The discovered port was processed. Ignore all other ports and services.
-                return Status.OK_STATUS;
-              }
-            }
-            catch (CoreException ce)
-            {
-            }
-            catch (IOException ioe)
-            {
-            }
-          }
-        }
-      }
-    }
-    return Status.OK_STATUS;
-  }
-
-  private String computeClassName(String className)
-  {
-	  return NameMappingUtils.xmlNameToJavaClass(className);
-  }
-
-  /**
-  * 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 a48da86fc..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanInfo.java
+++ /dev/null
@@ -1,621 +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.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.JavaCore;
-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.jst.ws.internal.common.JavaMOFUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.environment.IStatusHandler;
-
-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)
-  {
-	  package_ = 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)
-  {
-	  class_ = className;
-  }
-
-  private String toFullyQualifiedClassName(String pkgName, String className)
-  {
-    StringBuffer sb = new StringBuffer();
-    sb.append(pkgName);
-    sb.append(".");
-    sb.append(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 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 getFullyQualifiedName(JavaHelpers javaHelpers)
-  {
-    if (javaHelpers.isPrimitive())
-      return javaHelpers.getJavaName();
-    else
-      return javaHelpers.getQualifiedName();
-  }
-
-  public void write(IProgressMonitor progressMonitor, IStatusHandler 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");
-
-    ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
-    IPath sourceFolderPath = null;
-    IPath filePath = null;
-    ModuleCoreNature mn = ModuleCoreNature.getModuleCoreNature(clientProject_);
-    if (mn!=null)
-    {
-    	sourceFolderPath = ResourceUtils.getJavaSourceLocation(clientProject_);
-        IFolder sourceFolder = (IFolder)ResourceUtils.findResource(sourceFolderPath);
-        filePath = sourceFolder.getFile(new Path(sb.toString())).getFullPath();    	
-    }
-    else
-    {
-        // It's a plain old Java project
-    	JavaCore.create(clientProject_);
-
-		sourceFolderPath = ResourceUtils.getJavaSourceLocation(clientProject_);
-		IResource sourceFolderResource = ResourceUtils.findResource(sourceFolderPath);
-		if (sourceFolderResource instanceof IFolder) 
-		{
-				IFolder sourceFolder = (IFolder) sourceFolderResource;
-				filePath = sourceFolder.getFile(new Path(sb.toString())).getFullPath();
-		} else 
-		{
-			// The source must be going directly in the project
-			filePath = clientProject_.getFile(new Path(sb.toString())).getFullPath();
-		}
-		
-    }
-
-    FileResourceUtils.createFile(WebServicePlugin.getInstance().getResourceContext(), filePath, 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(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 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();
-    StringTokenizer st = new StringTokenizer(seis_.toString(), ";");
-    while (st.hasMoreTokens())
-    {
-      String sei = st.nextToken();
-      JavaClass javaClass = JavaMOFUtils.getJavaClass(getPackageName(sei), getClassName(sei), clientProject_);
-      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 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 cbbd872e7..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/ValidateWSDLCommand.java
+++ /dev/null
@@ -1,74 +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.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-
-public class ValidateWSDLCommand extends AbstractDataModelOperation
-{
-  private WebServicesParser webServicesParser;
-  private String wsdlURI;
-
-  public ValidateWSDLCommand()
-  {
-  }
-
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-	{
-		IEnvironment environment = getEnvironment();
-		if (wsdlURI != null && wsdlURI.length() > 0)
-		{
-			Definition definition = webServicesParser.getWSDLDefinition(wsdlURI);
-			if (definition != null)
-			{
-				int numServices = definition.getServices().size();
-				if (numServices < 1)
-				{
-					IStatus status = StatusUtils.errorStatus( NLS.bind(ConsumptionUIMessages.MSG_ERROR_WSDL_HAS_NO_SERVICE_ELEMENT, new Object[] {wsdlURI}), null);
-					environment.getStatusHandler().reportError(status);
-					return status;
-				}
-			}
-		}
-		return Status.OK_STATUS;
-  }
-
-  /**
-   * @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/util/ClasspathUtils.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/ClasspathUtils.java
deleted file mode 100644
index f794c782f..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/ClasspathUtils.java
+++ /dev/null
@@ -1,297 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060203   126418 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.util;
-
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
-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.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.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-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.common.componentcore.ComponentCore;
-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 DOT_JAR = ".jar"; //$NON-NLS-1$
-	private static String JAR = "jar"; //$NON-NLS-1$
-	private static String WEBINF_LIB = "/WEB-INF/lib"; //$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);
-
-		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();
-	}
-
-		
-	private String[] getClasspath(IProject project, boolean isDependent) {
-		String[] moduleClasspath = new String[0];
-		ArrayList projectClasspath = new ArrayList();
-		boolean needJavaClasspath = false;
-		
-		IVirtualComponent comp = ComponentCore.createComponent(project);
-		if (comp != null) {
-			// get the module's classpath
-			
-			if (J2EEUtils.isEARComponent(comp)) {
-				moduleClasspath = getClasspathForEARProject(project, comp.getName());
-//				 add module classpath to project classpath
-				for (int j = 0; j < moduleClasspath.length; j++) {
-					projectClasspath.add(moduleClasspath[j]);
-				}
-			} else if (J2EEUtils.isWebComponent(comp) || J2EEUtils.isJavaComponent(comp)) {
-				needJavaClasspath = true;
-				
-				IContainer outputContainer = null;
-				IResource fragmentRoot = null;
-				IPackageFragmentRoot[] pkgFragmentRoot = ResourceUtils.getJavaPackageFragmentRoots(project);
-				ArrayList webModuleClasspath = new ArrayList();
-				try {
-					for (int i = 0; i < pkgFragmentRoot.length; i++) {
-						fragmentRoot = pkgFragmentRoot[i].getCorrespondingResource();
-						if (fragmentRoot != null
-								&& (fragmentRoot.getProject().equals(project))
-								&& (fragmentRoot.getType() != IResource.FILE)) {					
-							outputContainer = J2EEProjectUtilities.getOutputContainer(project, pkgFragmentRoot[i]);
-							if (outputContainer != null) { 
-								webModuleClasspath.add(outputContainer.getLocation().toOSString());
-							}
-						}
-					}
-				} catch (JavaModelException e) {
-				}
-				
-				// add Web module classpath to project classpath
-				Iterator iter = webModuleClasspath.iterator();
-				while (iter.hasNext()) {
-					projectClasspath.add((String) iter.next());
-				}		
-			}
-			
-			if (!isDependent) {
-				if (J2EEUtils.isWebComponent(comp)) {
-					needJavaClasspath = true;
-					moduleClasspath = getWEBINFLib(project);
-					for (int j = 0; j < moduleClasspath.length; j++) {
-						projectClasspath.add(moduleClasspath[j]);
-					}
-				}
-			}
-			
-		} else {
-			needJavaClasspath = true;
-		}
-		
-		// If there are Web or Java module in the project, get the project's Java classpath
-		if (needJavaClasspath) {
-			String[] javaClasspath;
-			try {
-				IJavaProject javaProj = (IJavaProject) project.getNature(JavaCore.NATURE_ID);
-				if (javaProj != null) {
-					javaClasspath = getClasspathForJavaProject(javaProj);
-					for (int j = 0; j < javaClasspath.length; j++) {
-						projectClasspath.add(javaClasspath[j]);
-					}
-				}
-			} catch (CoreException e) {
-				// not able to get Java classpath, just ignore
-			}	
-		}
-		
-		return (String[]) projectClasspath.toArray(new String[projectClasspath.size()]);
-	}
-
-	// Need to get all modules in the project. If there's a EAR module, get the utility JARs 
-	private String[] getUtilityJarClasspath(IProject project) {
-		String[] utilityJarString = new String[0];
-		String[] moduleClasspath = new String[0];
-		ArrayList utilityJarsClasspath = new ArrayList();
-		
-		String module;
-		IVirtualComponent comp = ComponentCore.createComponent(project);
-		if (comp != null) {
-			module = comp.getName();
-			if (J2EEUtils.isEARComponent(comp)) {
-				moduleClasspath = getClasspathForEARProject(project, module);
-				for (int j = 0; j < moduleClasspath.length; j++) {
-					utilityJarsClasspath.add(moduleClasspath[j]);
-				}
-				utilityJarString = (String[]) utilityJarsClasspath.toArray(new String[utilityJarsClasspath.size()]);
-			}
-		} 
-
-		return utilityJarString;
-	}
-	
-	private String[] getClasspathForEARProject(IProject project, String module) {
-		IPath projectPath =
-			project.getProject().getLocation().addTrailingSeparator().append(module).addTrailingSeparator();
-		return getDirectoryJarFiles(projectPath);
-	}
-
-	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[] getWEBINFLib(IProject project) {
-		String[] webinfLibJars = new String[0];
-		ArrayList anArrayList = new ArrayList();
-		try {			
-					IVirtualComponent component = ComponentCore.createComponent(project);
-					if (component != null) {
-						
-						IVirtualFolder webInfLib = component.getRootFolder().getFolder(new Path(
-								WEBINF_LIB));
-						if (webInfLib != null) {
-							IVirtualResource[] resources = webInfLib.members();
-							IResource aResource = null;
-							for (int i = 0; i < resources.length; i++) {
-								aResource = resources[i].getUnderlyingResource();
-								if (JAR.equalsIgnoreCase(aResource.getFileExtension()))
-									anArrayList.add( aResource.getLocation().toOSString());
-							}
-							if (anArrayList.size() != 0)
-								webinfLibJars = (String[]) anArrayList.toArray(new String[anArrayList.size()]);
-							}
-					}
-				} catch (CoreException e) {
-				}
-		return webinfLibJars;
-	}
-
-	private String[] getClasspathForJavaProject(IJavaProject javaProject) {
-		ArrayList projectClasspath = new ArrayList();
-		try {
-			IClasspathEntry[] buildPath =
-				javaProject.getResolvedClasspath(true);
-			for (int i = 0; i < buildPath.length; i++) {
-				String[] buildPathString =
-					classpathEntry2String(
-						buildPath[i],
-						javaProject.getProject());
-				for (int j = 0; j < buildPathString.length; j++) {
-					projectClasspath.add(buildPathString[j]);
-				}
-			}
-		} catch (JavaModelException jme) {
-		}
-
-		String[] utilityJarsClasspath;
-		IProject project = javaProject.getProject();
-		IProject[] referencingProjects = project.getReferencingProjects();
-		for (int i = 0; i < referencingProjects.length; i++) {
-			utilityJarsClasspath = getUtilityJarClasspath(referencingProjects[i]);
-			for (int j = 0; j < utilityJarsClasspath.length; j++) {
-				projectClasspath.add(utilityJarsClasspath[j]);
-			}
-		}
-
-		return (String[]) projectClasspath.toArray(new String[projectClasspath.size()]);
-	}
-
-	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/ui/util/FileUtil.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/FileUtil.java
deleted file mode 100644
index 52f98d9ec..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/FileUtil.java
+++ /dev/null
@@ -1,120 +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.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);
-      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/ui/util/PlatformUtils.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/PlatformUtils.java
deleted file mode 100644
index 518496b0b..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/PlatformUtils.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.ui.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/ui/util/WSDLUtils.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/WSDLUtils.java
deleted file mode 100644
index 8f1a0dab5..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/WSDLUtils.java
+++ /dev/null
@@ -1,511 +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.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 = ".";
-
-  /**
-  * 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;
-    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));
-  }
-
-  
-  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/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 b26999ede..000000000
--- 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.internal.env.core.common.Condition;
-import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-
-
-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 ad8f74f2d..000000000
--- 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.core.runtime.IStatus;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.AxisConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.TableViewerWidget;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-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.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.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 )
-  {
-        
-    // 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 );
-    
-    Text mappingLabel = new Text( parent, SWT.READ_ONLY | SWT.WRAP );
-    mappingLabel.setText( AxisConsumptionUIMessages.LABEL_MAPPING_PAIRS );
-    mappingLabel.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
-                                               
-    List initValues = new ArrayList();
-    
-    if( mode_ == MODE_BEAN2XML || mode_ == MODE_EJB2XML) 
-    {
-		String[] columns = { AxisConsumptionUIMessages.TABLE_COLUMN_LABEL_PACKAGE,
-							AxisConsumptionUIMessages.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 = { AxisConsumptionUIMessages.TABLE_COLUMN_LABEL_NAMESPACE,
-      						AxisConsumptionUIMessages.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( parent, statusListener );
-   
-    return this;
-  }
-  
-  public IStatus 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 fd7e076db..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisProxyWidget.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.ui.AxisConsumptionUIMessages;
-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.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.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 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 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 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 )
-  {
-    UIUtils      uiUtils  = new UIUtils( pluginId_ );
-    
-	parent.setToolTipText( AxisConsumptionUIMessages.TOOLTIP_PWJB_PAGE );
-	PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId_ + "." +  INFOPOP_PWJB_PAGE);
-    
-    genProxyCheckbox_ = uiUtils.createCheckbox( parent, AxisConsumptionUIMessages.CHECKBOX_GENPROXY,
-    											AxisConsumptionUIMessages.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, AxisConsumptionUIMessages.LABEL_FOLDER_NAME,
-    									AxisConsumptionUIMessages.TOOLTIP_PWJB_TEXT_FOLDER,
-    									INFOPOP_PWJB_TEXT_FOLDER,
-    									SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-    folderText_.addListener( SWT.Modify, statusListener );
-    
-    showMappingsCheckbox_ = uiUtils.createCheckbox( parent, AxisConsumptionUIMessages.LABEL_EXPLORE_MAPPINGS_XML2BEAN,
-    									AxisConsumptionUIMessages.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/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 9d85018ec..000000000
--- 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,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.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.AxisConsumptionUIMessages;
-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.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.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.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.internal.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, "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) 
-  {
-   
-    widgetRegistry.add( "AxisClientStart", 
-        AxisConsumptionUIMessages.PAGE_TITLE_WS_AXIS_PROXY,
-        AxisConsumptionUIMessages.PAGE_DESC_WS_AXIS_PROXY,
-        new WidgetContributorFactory()
-        {
-          public WidgetContributor create()
-          {
-            return new AxisProxyWidget();
-          }
-        } );
-    
-    widgetRegistry.add( "AxisClientBeanMapping", 
-        AxisConsumptionUIMessages.PAGE_TITLE_WS_XML2PROXY,
-        AxisConsumptionUIMessages.LABEL_EXPLORE_MAPPINGS_XML2BEAN,
-        new WidgetContributorFactory()
-        {
-          public WidgetContributor create()
-          {
-            return new AxisMappingsWidget(AxisMappingsWidget.MODE_XML2PROXY );
-          }
-        } );
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactoryFactory#create()
-   */
-  public CommandFragmentFactory create() 
-  {
-    return new CommandFragmentFactory()
-           {
-             public CommandFragment create()
-             {
-               //dead code - doesn't matter what gets returned here.
-               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) 
-  {
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisClientConfigWidgetFactory.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisClientConfigWidgetFactory.java
deleted file mode 100644
index cdb7e9fbf..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/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.ui.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.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.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/ui/wsrt/AxisWebServiceClient.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisWebServiceClient.java
deleted file mode 100644
index 1970bcd74..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisWebServiceClient.java
+++ /dev/null
@@ -1,155 +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.ui.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.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.wst.command.internal.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.env.core.SimpleCommandFactory;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.eclipse.EclipseEnvironment;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.ws.internal.wsrt.AbstractWebServiceClient;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-import org.eclipse.wst.ws.internal.wsrt.ISelection;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceClientInfo;
-
-public class AxisWebServiceClient extends AbstractWebServiceClient
-{		
-
-	public AxisWebServiceClient(WebServiceClientInfo info)
-	{
-		super(info);
-		// TODO Auto-generated constructor stub
-	}
-
-	public ICommandFactory assemble(IEnvironment env, IContext ctx,
-			ISelection sel, String project, String earProject)
-	{
-		return null;
-	}
-
-	public ICommandFactory deploy(IEnvironment env, IContext ctx, ISelection sel,
-			String project, String earProject)
-	{
-		return null;
-	}
-
-	public ICommandFactory develop(IEnvironment env, IContext ctx, ISelection sel,
-			String project, String earProject)
-	{
-    EclipseEnvironment environment = (EclipseEnvironment)env;
-		registerDataMappings( environment.getCommandManager().getMappingRegistry());
-		
-		Vector commands = new Vector();
-		commands.add(new AxisClientInputCommand(this, ctx, project));
-		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 DefaultsForClientJavaWSDLCommand());
-		commands.add(new ValidateWSDLCommand());
-		commands.add(new WSDL2JavaCommand());
-		commands.add(new RefreshProjectCommand());
-		commands.add(new Stub2BeanCommand());
-		commands.add(new AxisClientOutputCommand(this,ctx));
-		commands.add(new BuildProjectCommand());
-		return new SimpleCommandFactory(commands);
-	}
-
-	public ICommandFactory install(IEnvironment env, IContext ctx, ISelection sel,
-			String project, String earProject)
-	{
-		return null;
-	}
-
-	public ICommandFactory run(IEnvironment env, IContext ctx, ISelection sel,
-			String project, String earProject)
-	{
-		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, "ClientProject", CopyAxisJarCommand.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", 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 cb0105380..000000000
--- 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.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/.cvsignore b/bundles/org.eclipse.jst.ws.axis.creation.ui/.cvsignore
deleted file mode 100644
index 921050aea..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-build.xml
-temp.folder
-wss-axis-ui.jar
-@dot
-src.zip
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 0a3d1e91a..000000000
--- 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/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.axis.creation.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 8d56f3322..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,57 +0,0 @@
-#Mon Jan 30 10:32:15 EST 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.jst.ws.axis.creation.ui/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 74dbba73c..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Jan 30 10:41:30 EST 2006
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.axis.creation.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 8bf019eb5..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,48 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.axis.creation.ui; singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.jst.ws.internal.axis.creation.ui.plugin.WebServiceAxisCreationUIPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.axis.creation.ui,
- org.eclipse.jst.ws.internal.axis.creation.ui.command,
- org.eclipse.jst.ws.internal.axis.creation.ui.plugin,
- org.eclipse.jst.ws.internal.axis.creation.ui.task,
- org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean,
- org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton,
- org.eclipse.jst.ws.internal.axis.creation.ui.wizard.beans,
- org.eclipse.jst.ws.internal.axis.creation.ui.wizard.wsdl,
- org.eclipse.jst.ws.internal.axis.creation.ui.wsrt
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.resources,
- org.eclipse.emf.ecore,
- org.eclipse.jem,
- org.eclipse.jem.workbench,
- org.eclipse.wst.ws.parser,
- org.eclipse.jst.ws,
- org.eclipse.jst.ws.consumption.ui,
- org.eclipse.jst.ws.consumption,
- org.eclipse.jst.ws.ui,
- org.eclipse.jst.ws.axis.consumption.core,
- org.eclipse.jst.ws.axis.consumption.ui,
- org.eclipse.core.runtime.compatibility,
- org.eclipse.jem.workbench,
- org.eclipse.wst.command.env.core,
- org.eclipse.wst.command.env,
- org.eclipse.wst.command.env.ui,
- org.eclipse.wst.server.core,
- org.eclipse.wst.ws,
- org.eclipse.jst.j2ee,
- org.eclipse.jst.j2ee.core,
- org.eclipse.jst.j2ee.web,
- org.wsdl4j,
- org.eclipse.jst.common.frameworks,
- org.eclipse.jem.util,
- org.eclipse.wst.common.frameworks,
- org.eclipse.wst.common.environment,
- org.eclipse.debug.core,
- org.eclipse.jdt.core
-Eclipse-AutoStart: true
-Plugin-Class: org.eclipse.jst.ws.internal.axis.creation.ui.plugin.WebServiceAxisCreationUIPlugin
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/about.html b/bundles/org.eclipse.jst.ws.axis.creation.ui/about.html
deleted file mode 100644
index 6f6b96c4c..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/build.properties b/bundles/org.eclipse.jst.ws.axis.creation.ui/build.properties
deleted file mode 100644
index 391fee07f..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-bin.includes = .,\
-               plugin.properties,\
-               plugin.xml,\
-               META-INF/,\
-               deploy.xsl,\
-               about.html
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 3fdf164ac..000000000
--- 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 9d1342e00..000000000
--- 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
-DESC_RUNTIME_AXIS_11=Apache Axis
-
-#
-#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 cc9089589..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-   
-   <!-- 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"
-    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 org.eclipse.jst.server.tomcat.55 org.eclipse.jst.server.geronimo.10"
-    class="org.eclipse.jst.ws.internal.axis.creation.ui.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.ui.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.ui.wsrt.AxisSkeletonConfigWidgetFactory"/>
-    </extension> 
-    
-    <!-- M9 extensions -->
-    <extension point="org.eclipse.jst.ws.consumption.ui.runtimes">
-      <runtime
-        id="org.eclipse.jst.ws.axis.creation.axisWebServiceRT"
-        label="%LABEL_RUNTIME_AXIS_11"/>
-    </extension>
-
-    <!-- define support for Axis Java bean bottom up and top-down support in web projects -->
-    <extension point="org.eclipse.jst.ws.consumption.ui.serviceRuntimes">
-      <serviceRuntime
-        id="org.eclipse.jst.ws.axis.creation.java"
-        serviceImplementationTypeId="org.eclipse.jst.ws.wsImpl.java"
-        runtimeId="org.eclipse.jst.ws.axis.creation.axisWebServiceRT"
-        bottomUp="true"
-        topDown="true"
-        class="org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisWebServiceRuntime">
-
-        <required-facet-version facet="jst.web" version="2.3" allow-newer="true"/>
-
-      </serviceRuntime>
-    </extension>   
-
-    <!-- define support for Axis Java clients in Java projects -->
-    <extension point="org.eclipse.jst.ws.consumption.ui.clientRuntimes">
-      <clientRuntime
-        id="org.eclipse.jst.ws.axis.consumption.java"
-        clientImplementationTypeId="org.eclipse.jst.ws.client.type.java"
-        runtimeId="org.eclipse.jst.ws.axis.creation.axisWebServiceRT"
-        class="org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisWebServiceRuntime">
-
-        <required-facet-version facet="jst.utility" version="1.0" allow-newer="true"/>
-
-      </clientRuntime>
-    </extension>    
-    
-    <!-- define support for Axis Java clients in Web projects -->
-    <extension point="org.eclipse.jst.ws.consumption.ui.clientRuntimes">
-      <clientRuntime
-        id="org.eclipse.jst.ws.axis.consumption.web"
-        clientImplementationTypeId="org.eclipse.jst.ws.client.type.java"
-        runtimeId="org.eclipse.jst.ws.axis.creation.axisWebServiceRT"
-        class="org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisWebServiceRuntime">
-
-        <required-facet-version facet="jst.web" version="2.3" allow-newer="true"/>
-
-      </clientRuntime>
-    </extension>        
-      <extension
-           point="org.eclipse.wst.command.env.antDataMapping">
-        <map
-              key="InitialSelection"
-              operation="org.eclipse.jst.ws.internal.axis.creation.ui.task.DefaultsForServerJavaWSDLCommand"
-              property="ObjectSelection"
-              transform="org.eclipse.jst.ws.internal.common.String2SelectionTransformer"/>
-        <map
-              key="JavaOutput"
-              operation="org.eclipse.jst.ws.internal.axis.consumption.core.command.Java2WSDLCommand"
-              property="JavaWSDLParam"
-              transform="org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParamModifier"/>
-        <map
-              key="Mappings"
-              operation="org.eclipse.jst.ws.internal.axis.consumption.core.command.Java2WSDLCommand"
-              property="JavaWSDLParam"
-              transform="org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParamModifier"/>
-        <map
-              key="Methods"
-              operation="org.eclipse.jst.ws.internal.axis.consumption.core.command.Java2WSDLCommand"
-              property="JavaWSDLParam"
-              transform="org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParamModifier"/>
-        <map
-              key="Style"
-              operation="org.eclipse.jst.ws.internal.axis.consumption.core.command.Java2WSDLCommand"
-              property="JavaWSDLParam"
-              transform="org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParamModifier"/>
-        <map
-              key="Use"
-              operation="org.eclipse.jst.ws.internal.axis.consumption.core.command.Java2WSDLCommand"
-              property="JavaWSDLParam"
-              transform="org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParamModifier"/>   
-       
-        <map
-              key="JavaOutput"
-              operation="org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand"
-              property="JavaWSDLParam"
-              transform="org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParamModifier"/>
-        <map
-              key="Mappings"
-              operation="org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand"
-              property="JavaWSDLParam"
-              transform="org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParamModifier"/>   
-        <map
-              key="Methods"
-              operation="org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand"
-              property="JavaWSDLParam"
-              transform="org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParamModifier"/>   
-		<map
-              key="Style"
-              operation="org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand"
-              property="JavaWSDLParam"
-              transform="org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParamModifier"/>   
-        <map
-              key="Use"
-              operation="org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand"
-              property="JavaWSDLParam"
-              transform="org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParamModifier"/>   
-  </extension> 
-
-</plugin>
\ 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/AxisCreationUI.properties b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/AxisCreationUI.properties
deleted file mode 100644
index 6193c0e23..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/AxisCreationUI.properties
+++ /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
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-
-#
-# Error messages used in this plugin
-#
-MSG_ERROR_PROJECT_URL=IWAB0514E Unable to get URL for project {0}
-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_UPDATE_AXIS_WSDD=IWAB0524E Error updating Axis deploy.wsdd file
-
-#
-#JavaToWSDLMethodCommand
-#
-MSG_ERROR_JAVA_TO_METHOD=IWAB0019E Error in getting method from Java bean.
-
-#
-#UpdateWEBXMLCommand
-#
-MSG_ERROR_UPDATE_WEB_XML=IWAB0020E Error in adding servlet in web.xml.
-
-#
-#UpdateAxisWSDDFileTask
-#
-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.
-
-#
-#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:
-
-#
-#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.
-
-#
-#WebServiceAxisBeanConfigPage
-#
-TOOLTIP_PBCF_PAGE=
-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
-
-#
-# AxisCheckCompilerLevelCommand
-#
-MSG_ERROR_COMPILER_LEVEL_NOT_COMPATIBLE=The workbench is running on Java VM version {0}, however, the compiler compliance level of \
-the project "{1}" is set to Java version {2}.  \
-Generation of a Web service from Java cannot proceed because the tools will be unable to process the class file compiled within the project.  \
-To correct the problem, take one of the following actions: \
-\n1. Open project properties, select Project Facets, and use Add/Remove Project Facet to change Java version to {0} or lower.\
-\n2. Restart the workbench on a version {2} Java VM.
-
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/AxisCreationUIMessages.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/AxisCreationUIMessages.java
deleted file mode 100644
index d464d3c84..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/AxisCreationUIMessages.java
+++ /dev/null
@@ -1,59 +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.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class AxisCreationUIMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.jst.ws.internal.axis.creation.ui.AxisCreationUI";//$NON-NLS-1$
-
-	private AxisCreationUIMessages() {
-		// Do not instantiate
-	}
-
-	public static String MSG_ERROR_PROJECT_URL;
-	public static String MSG_ERROR_CANNOT_NO_JAVA_BEAN;
-	public static String MSG_ERROR_NO_PROJECT;
-	public static String MSG_ERROR_CANNOT_LOAD_JAVA_BEAN;
-	public static String MSG_ERROR_JAVA_MOF_REFLECT_FAILED;
-	public static String MSG_ERROR_READ_BEAN;
-	public static String MSG_ERROR_UPDATE_AXIS_WSDD;
-	public static String MSG_ERROR_JAVA_TO_METHOD;
-	public static String MSG_ERROR_UPDATE_WEB_XML;
-	public static String MSG_PLUGIN_FILE_URL;
-	public static String PAGE_MSG_NO_FILE_SPECIFIED;
-	public static String PAGE_MSG_NO_METHOD_SELECTED;
-	public static String TOOLTIP_PBSC_PAGE;
-	public static String TOOLTIP_PBCF_TEXT_URI;
-	public static String TOOLTIP_PBCF_TEXT_WSDL_FOLDER;
-	public static String TOOLTIP_PBCF_TEXT_WSDL_FILE;
-	public static String LABEL_URI;
-	public static String LABEL_OUTPUT_FOLDER_NAME;
-	public static String LABEL_OUTPUT_FILE_NAME;
-	public static String PAGE_TITLE_WSBEAN_CLASS;
-	public static String PAGE_DESC_WSBEAN_CLASS;
-	public static String LABEL_EXPLORE_MAPPINGS_BEAN2XML;
-	public static String TOOLTIP_P2N_SHOW_MAPPINGS;
-	public static String TOOLTIP_PBCF_PAGE;
-	public static String TOOLTIP_PBME_TREE_METHODS;
-	public static String PAGE_TITLE_WSBEAN_CONFIG;
-	public static String PAGE_DESC_WSBEAN_CONFIG;
-	public static String LABEL_STYLE_USE;
-	public static String STYLE_RPC_LITERAL;
-	public static String STYLE_DOC_LITERAL;
-	public static String STYLE_RPC_ENCODED;
-	public static String MSG_ERROR_COMPILER_LEVEL_NOT_COMPATIBLE;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, AxisCreationUIMessages.class);
-	}
-}
\ 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/command/AxisCheckCompilerLevelCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisCheckCompilerLevelCommand.java
deleted file mode 100644
index 28363ed1b..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisCheckCompilerLevelCommand.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.jst.ws.internal.axis.creation.ui.command;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.axis.creation.ui.AxisCreationUIMessages;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
- * Check to make sure that the project containing the service bean is not at a compiler compliance setting
- * that's higher than the Java VM the workbench is launched with. 
- */
-public class AxisCheckCompilerLevelCommand extends AbstractDataModelOperation {
-
-	private String serverProject_;
-
-	/**
-	 * Default CTOR
-	 */
-	public AxisCheckCompilerLevelCommand() {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.commands.operations.IUndoableOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-	 */
-	public IStatus execute(IProgressMonitor monitor, IAdaptable adaptable) {
-		
-		IStatus status = Status.OK_STATUS;
-		String javaSpecVersion = System.getProperty("java.specification.version");
-		if (javaSpecVersion != null)
-		{
-			IProject project = ProjectUtilities.getProject(serverProject_);
-			IJavaProject javaProject = JavaCore.create(project);    
-			if (javaProject != null)
-			{
-				String projectCompilerLevel = javaProject.getOption("org.eclipse.jdt.core.compiler.compliance", false);
-				if (projectCompilerLevel == null)
-				{
-					projectCompilerLevel = (String)JavaCore.getDefaultOptions().get("org.eclipse.jdt.core.compiler.compliance");
-				}
-				if (projectCompilerLevel != null)
-				{
-					if (!compilerLevelsCompatible(javaSpecVersion, projectCompilerLevel)) {
-						status = StatusUtils.errorStatus( NLS.bind(AxisCreationUIMessages.MSG_ERROR_COMPILER_LEVEL_NOT_COMPATIBLE, new String[] {javaSpecVersion, serverProject_, projectCompilerLevel}));
-						getEnvironment().getStatusHandler().reportError(status);
-					}			
-				} 	
-			}
-		}
-		return status;
-	}
-
-	/**
-	 * Returns true if and only if the Java specification level
-	 * of the Eclipse JRE (<code>javaSpecVersion</code> is not
-	 * lower than the Java specification level of the compiler
-	 * (<code>projectCompilerLevel</code>. 
-	 * @param javaSpecVersion The Java Specification Version of the JRE.
-	 * @param projectCompilerLevel The Java project's compiler level.
-	 * @return True if the Java specification level of the project's
-	 * compiler does not exceed the Java specification level of the
-	 * JRE that Eclipse is running on, and false otherwise.
-	 */
-	private boolean compilerLevelsCompatible(String javaSpecVersion, String projectCompilerLevel) {
-		return (javaSpecVersion.compareTo(projectCompilerLevel) >= 0);
-	}
-
-	/**
-	 * Sets the project whose compiler level should be checked.
-	 * @param serverProject The project whose compiler level should be checked.
-	 */
-	public void setServerProject(String serverProject) {
-		serverProject_ = serverProject;
-	}
-}
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 956da3c2d..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisOutputCommand.java
+++ /dev/null
@@ -1,65 +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.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisWebService;
-import org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisWebServiceInfo;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-public class AxisOutputCommand extends AbstractDataModelOperation {
-
-	private AxisWebService ws_;
-	private JavaWSDLParameter javaWSDLParam_;
-
-	private String            wsdlURI_;
-	  	  
-		/**
-		* Default CTOR
-		*/
-		public AxisOutputCommand() {
-		}
-		
-		public AxisOutputCommand(AxisWebService ws) {
-			ws_ = ws;
-		}
-		
-		public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-		{
-		  	IStatus status = Status.OK_STATUS;  	
-		  	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 b5d60629b..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisRunInputCommand.java
+++ /dev/null
@@ -1,60 +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.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisWebService;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public class AxisRunInputCommand extends AbstractDataModelOperation{
-	
-	private AxisWebService ws_;
-	private JavaWSDLParameter javaWSDLParam_;
-	private String serverProject_; 
-	private String serverInstanceId_; 
-	
-	public AxisRunInputCommand() {
-	}
-	
-	public AxisRunInputCommand(AxisWebService ws, String project) {
-		ws_ = ws;
-		serverProject_ = project; 
-	}
-	
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-	{
-	 	javaWSDLParam_ = ws_.getAxisWebServiceInfo().getJavaWSDLParameter();
-	 	serverInstanceId_ = ws_.getWebServiceInfo().getServerInstanceId();
-		
-		return Status.OK_STATUS;
-	  }
-	
-	 /**
-	   * @return Returns the serverProject.
-	   */
-	  public String getServerProject()
-	  {
-		  return serverProject_;
-	  }
-	  
-	public JavaWSDLParameter getJavaWSDLParam() {
-		return javaWSDLParam_;
-	}
-
-	public String getServerInstanceId() {
-		return serverInstanceId_;
-	}	
-	
-}
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 b378b6b78..000000000
--- 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 1ea105e6f..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/BUAxisInputCommand.java
+++ /dev/null
@@ -1,83 +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.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.ws.internal.wsrt.IWebService;
-
-
-public class BUAxisInputCommand extends AbstractDataModelOperation {
-	
-	private IWebService ws_;
-	private String serverProject_; 
-	private String javaBeanName_;
-
-	  private String serviceServerTypeID_;
-	  
-		/**
-		* Default CTOR
-		*/
-		public BUAxisInputCommand() {
-		}
-		
-		public BUAxisInputCommand(IWebService ws, String project) {
-			ws_ = ws;
-			serverProject_ = project; 
-		}
-		
-		public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-		{
-	       
-		String serverInstanceId = ws_.getWebServiceInfo().getServerInstanceId();
-		String serverFactoryId = ws_.getWebServiceInfo().getServerFactoryId();
-		javaBeanName_ = ws_.getWebServiceInfo().getImplURL();
-		
-		IServer serviceExistingServer=null;
-		
-		if (serverInstanceId != null) { // server exists
-	    	serviceExistingServer = ServerCore.findServer(serverInstanceId);
-			if (serviceExistingServer != null)
-		    {
-		      serviceServerTypeID_ = serviceExistingServer.getServerType().getId();
-		    }
-	    }
-	    else
-	    {
-	    	serviceServerTypeID_ = serverFactoryId;
-	    }
-		
-		return Status.OK_STATUS;
-	  }
-	  
-		/**
-		   * @return Returns the serverProject.
-		   */
-		  public String getServerProject()
-		  {
-			  return serverProject_;
-		  }
-
-		  public String getServiceServerTypeID()
-		  {
-		    return serviceServerTypeID_;
-		  }
-
-		public String getJavaBeanName() {
-			return javaBeanName_;
-		}
-}
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 adb2718db..000000000
--- 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.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-public class ComputeAxisSkeletonBeanCommand extends AbstractDataModelOperation
-{
-  private List classNames;
-  //private String wsdlURI;
-  //private WebServicesParser webServicesParser;
-  private JavaWSDLParameter javaWSDLParameter;
-
-  public ComputeAxisSkeletonBeanCommand()
-  {
-  }
-
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-	{
-    classNames = new Vector();
-    if (javaWSDLParameter != null)
-    {
-      String beanName = javaWSDLParameter.getBeanName();
-      if (beanName != null)
-        classNames.add(beanName);
-    }
-    return Status.OK_STATUS;
-  }
-
-  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/CopyDeploymentFileCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/CopyDeploymentFileCommand.java
deleted file mode 100644
index 6b6e4b041..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/CopyDeploymentFileCommand.java
+++ /dev/null
@@ -1,135 +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.io.FileInputStream;
-import java.io.IOException;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.axis.consumption.core.AxisConsumptionCoreMessages;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.IStatusHandler;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.internal.IModulePublishHelper;
-
-/**
- * 
- * This command copies the server-config.wsdd file to it's proper location in the module.
- * 
- */
-
-public class CopyDeploymentFileCommand extends AbstractDataModelOperation
-{
-	private final String WEB_INF = "WEB-INF";
-	private final String SERVER_CONFIG = "server-config.wsdd";
-    private String projectName_;
-	private String serverInstanceId_;
-  
-  /**
-   * Constructor for CopyDeploymentFileCommand.
- * @param String description
- * @param String name
-   * 
-   */
-  public CopyDeploymentFileCommand( String projectName )
-  { 
-    projectName_   = projectName;
-  }
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-  {
-	  IStatus status = Status.OK_STATUS;
-	  IEnvironment environment = getEnvironment();
-	  
-	  FileInputStream finStream = null;
-	  try
-	  {
-		  
-		  IVirtualComponent component = J2EEUtils.getVirtualComponent( projectName_ );
-		  IServer server = ServerCore.findServer( serverInstanceId_ );
-		  IProject project = ProjectUtilities.getProject(projectName_);
-		  IModule projectModule = ServerUtil.getModule(project);
-		  
-		  if (server != null && component != null && projectModule != null) {
-			  IModulePublishHelper publishHelper = (IModulePublishHelper) 
-			  	server.loadAdapter(IModulePublishHelper.class, monitor);
-			  if (publishHelper != null) {
-				  IPath publishDirPath = publishHelper.getPublishDirectory(new IModule [] {projectModule});
-				  if (publishDirPath != null) {
-					  IPath path = new Path( WEB_INF ).append( SERVER_CONFIG );
-					  IPath serverConfigPath = publishDirPath.append(path);
-					  if (serverConfigPath != null) {
-						  IVirtualFolder rootFolder = component.getRootFolder();
-						  if (rootFolder != null) {			  
-							  IVirtualFile newLocation = rootFolder.getFile(path);
-							  IPath targetPath = newLocation.getWorkspaceRelativePath();
-							  
-							  if (targetPath != null) {
-								  finStream = new FileInputStream(serverConfigPath.toString());
-								  if (finStream != null) {
-									  IStatusHandler statusHandler = environment.getStatusHandler();
-									  ResourceContext context = WebServicePlugin.getInstance().getResourceContext();
-									  FileResourceUtils.createFile(context,  
-											  targetPath,
-											  finStream,
-											  monitor,
-											  statusHandler);
-									  finStream.close();
-								  }
-							  }
-						  }
-					  }
-				  }
-			  } 	  		  
-		  }	  
-	  }
-	  catch( Throwable e )
-	  {
-		  status = StatusUtils.errorStatus(NLS.bind(AxisConsumptionCoreMessages.MSG_ERROR_MOVE_RESOURCE, new String[]{e.getLocalizedMessage()}), e);
-		  environment.getStatusHandler().reportError(status);
-	  } finally {
-		  if (finStream != null) {
-			  try {
-				  finStream.close();
-			  } catch (IOException e) {
-			  }
-		  }			
-	  }
-	  
-	  return status;
-	  
-  }
-
-	public void setServerInstanceId(String serverInstanceId) {
-		this.serverInstanceId_ = serverInstanceId;
-	}
-}
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 682416718..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/JavaToWSDLMethodCommand.java
+++ /dev/null
@@ -1,213 +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.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.creation.ui.AxisCreationUIMessages;
-import org.eclipse.jst.ws.internal.common.JavaMOFUtils;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.ILog;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-public class JavaToWSDLMethodCommand extends AbstractDataModelOperation {
-
-	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 fbeanBaseName;
-	private JavaWSDLParameter javaWSDLParam_;
-	private IProject serviceProject_;
-
-	/**
-	* Default CTOR
-	*/
-	public JavaToWSDLMethodCommand() {
-	}
-	/**
-	* Default CTOR
-	*/
-	public JavaToWSDLMethodCommand(
-		JavaWSDLParameter javaParameter,
-		IProject serviceProject) {
-		javaWSDLParam_ = javaParameter;
-		serviceProject_ = serviceProject;
-
-	}
-
-	/**
-	* JavaToToWSDLMethod execute
-	*/
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-	{
-		IEnvironment environment = getEnvironment();
-
-		fbeanBaseName = javaWSDLParam_.getBeanName();
-		environment.getLog().log(ILog.INFO, 5070, this, "execute", "beanBaseName = "+fbeanBaseName);
-		IStatus 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('.'));
-			}
-
-			JavaClass javaClass = JavaMOFUtils.getJavaClass(qName, serviceProject_);
-			
-			if (!javaClass.isExistingType()) {
-				environment.getLog().log(ILog.ERROR, 5022, this, "execute", 
-						NLS.bind(AxisCreationUIMessages.MSG_ERROR_JAVA_MOF_REFLECT_FAILED,
-						new String[] { qName }));
-				
-				status = StatusUtils.errorStatus(
-						NLS.bind(AxisCreationUIMessages.MSG_ERROR_JAVA_MOF_REFLECT_FAILED,
-					new String[] { qName }));
-				environment.getStatusHandler().reportError(status);
-				return status;
-			}
-
-			// Get the qualified name
-			fClassName = javaClass.getQualifiedName();
-			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 Status.OK_STATUS;
-
-		} catch (Exception e) {
-			environment.getLog().log(ILog.ERROR, 5023, this, "execute", AxisCreationUIMessages.MSG_ERROR_READ_BEAN);
-		
-			status = StatusUtils.errorStatus(AxisCreationUIMessages.MSG_ERROR_JAVA_TO_METHOD, 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/PublishServerCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/PublishServerCommand.java
deleted file mode 100644
index f752283b4..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/PublishServerCommand.java
+++ /dev/null
@@ -1,51 +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.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.internal.Server;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo;
-
-public class PublishServerCommand extends AbstractDataModelOperation
-{
-  private WebServiceInfo wsInfo;
-  
-  public PublishServerCommand(WebServiceInfo wsInfo)
-  {
-    this.wsInfo = wsInfo;
-  }
-
-  public IStatus execute(IProgressMonitor monitor, IAdaptable adaptable) 
-  {
-    if (wsInfo != null)
-    {
-      String serverInstanceId = wsInfo.getServerInstanceId();
-      if (serverInstanceId != null)
-      {
-        IServer server = ServerCore.findServer(serverInstanceId);
-        if (server != null)
-        {
-        	if (((Server)server).shouldPublish()) {
-        		return server.publish(IServer.PUBLISH_INCREMENTAL, monitor);
-        	}
-        }
-      }
-    }
-    return Status.OK_STATUS;
-  }
-}
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 183223875..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/TDAxisInputCommand.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.jst.ws.internal.axis.creation.ui.command;
-
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.wsrt.IWebService;
-
-
-public class TDAxisInputCommand extends AbstractDataModelOperation {
-	
-	private IWebService ws_;
-	private String serverProject_; 
-
-	  private String serverServer_;
-      private String serviceServerTypeID_; 
-	  private String wsdlURI_;
-	  	  
-		/**
-		* Default CTOR
-		*/
-		public TDAxisInputCommand() {
-		}
-		
-		public TDAxisInputCommand(IWebService ws, String project) {
-			ws_ = ws;
-			serverProject_ = project;
-		}
-		
-		public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-		{	    
-		serverServer_ = ws_.getWebServiceInfo().getServerInstanceId();
-        serviceServerTypeID_ = ws_.getWebServiceInfo().getServerFactoryId();
-		wsdlURI_ = ws_.getWebServiceInfo().getWsdlURL();
-		
-		return Status.OK_STATUS;
-	  }
-	  
-		/**
-		   * @return Returns the serverProject.
-		   */
-		  public String getServerProject()
-		  {
-			  return serverProject_;
-		  }
-
-		  public String getServerServer()
-		  {
-		    return serverServer_;
-		  }
-          
-          public String getServiceServerTypeID()
-          {
-            return serviceServerTypeID_;
-          }          
-
-		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 0c26812b1..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/UpdateWEBXMLCommand.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.creation.ui.command;
-
-
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-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.jst.ws.internal.axis.creation.ui.AxisCreationUIMessages;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public class UpdateWEBXMLCommand extends AbstractDataModelOperation {
-
-	private IProject serverProject;
-
-  public UpdateWEBXMLCommand( )
-  {
-  }
-
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-	{
-		IEnvironment environment = getEnvironment();
-		if (serverProject != null) {
-			IStatus 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 Status.OK_STATUS;
-	}
-
-	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;
-	}
-
-	public IStatus addServlet(
-		IProject webProject,
-		ServletDescriptor servletDescriptor) {
-
-		WebArtifactEdit webEdit = null;		
-		try {
-			// 
-			WebApp webapp = null;
-      IVirtualComponent vc = ComponentCore.createComponent(webProject);
-      webEdit = WebArtifactEdit.getWebArtifactEditForWrite(vc);
-			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 Status.OK_STATUS;
-			   }
-
-			   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);					
-				  }
-			   }
-			   
-			   webEdit.save(new NullProgressMonitor());
-			}
-
-			return Status.OK_STATUS;
-		} catch (Exception e) {
-
-			return StatusUtils.errorStatus(
-					AxisCreationUIMessages.MSG_ERROR_UPDATE_WEB_XML,
-					e);
-		}
-		finally{
-			if (webEdit != null)
-				webEdit.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 17c333b38..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/plugin/WebServiceAxisCreationUIPlugin.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.plugin;
-
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.common.environment.EnvironmentService;
-import org.eclipse.wst.common.environment.ILog;
-import org.osgi.framework.BundleContext;
-
-/**
-* 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 ILog 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()
-  {
-    super();
-    if (instance_ == null)
-    {
-      instance_ = this;
-    }
-    log_ = EnvironmentService.getEclipseLog();
-
-  }
-
-  // This method is needed to keep the logging from blowing up.
-  public String toString()
-  {
-    return ID;  
-  }
-  
-  /**
-  * 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 start( BundleContext context ) throws CoreException
-  {
-  	log_.log(ILog.INFO, 5068, this, "start", "Starting plugin org.eclipse.jst.ws.axis.creation.ui");
-    
-    try
-    {
-      super.start( context );
-    }
-    catch( Exception exc )
-    {
-      log_.log( ILog.ERROR, 5068, this, "start", exc );  
-    }
-    
-    setPreferences();
-  }
-
-  /**
-  * Called once by the platform when this plugin is unloaded.
-  * @throws CoreException If this plugin fails to shutdown.
-  */
-  public void stop( BundleContext context ) throws CoreException
-  {
-  	log_.log(ILog.INFO, 5069, this, "stop", "Shutting plugin org.eclipse.jst.ws.axis.creation.ui");
-    
-    try
-    {
-      super.stop( context );
-    }
-    catch( Exception exc )
-    {
-      log_.log( ILog.ERROR, 5068, this, "start", exc );        
-    }
-  }
-
-
-  /**
-   * 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);
-  }
- 
-}
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 a58f6ce14..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/BUCheckAxisDeploymentDescriptors.java
+++ /dev/null
@@ -1,33 +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.task;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CheckAxisDeploymentDescriptorsTask;
-
-public class BUCheckAxisDeploymentDescriptors extends
-		CheckAxisDeploymentDescriptorsTask {
-	public BUCheckAxisDeploymentDescriptors() {
-	}
-
-	/*
-	 * The execute method of this command do nothing.  It is merely an anchor point for UI page
-	 * TODO Remove this class and use another command as an anchor point for the UI
-	 */
-	public IStatus execute(IProgressMonitor monitor, IAdaptable adaptable) {
-		return Status.OK_STATUS;
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/BackupSkelImplCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/BackupSkelImplCommand.java
deleted file mode 100644
index 29afb32d2..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/BackupSkelImplCommand.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.FileInputStream;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import javax.wsdl.Binding;
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.AxisConsumptionCoreMessages;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.AxisConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.PlatformUtils;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.WSDLUtils;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.IStatusHandler;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-public class BackupSkelImplCommand extends AbstractDataModelOperation
-{
-  private final String IMPL = "Impl";	//$NON-NLS-1$
-  private final String DOT = ".";	//$NON-NLS-1$
-  private final String BAK_EXT = "bak";	//$NON-NLS-1$
-  private final String JAVA = "java";	//$NON-NLS-1$
-  private WebServicesParser webServicesParser;
-  private JavaWSDLParameter javaWSDLParam;  
-
-  public BackupSkelImplCommand( ) {
-  }
-  
-  
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-  {
-	  IEnvironment environment = getEnvironment();
-	  if (javaWSDLParam == null)
-	  {
-		  IStatus status = StatusUtils.errorStatus(AxisConsumptionCoreMessages.MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET);
-		  environment.getStatusHandler().reportError(status);
-		  return status;
-	  }
-	  
-	  IStatus status = Status.OK_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();
-		  String beanPackageName = WSDLUtils.getPackageName(definition);
-		  javaWSDLParam.setBeanPackage(beanPackageName);
-		  beanName.append(beanPackageName);
-		  beanName.append(DOT);
-		  
-		  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);
-		  String beanNameString = beanName.toString();
-		  javaWSDLParam.setBeanName(beanNameString);
-		  
-		  // Check if the skeleton implementation bean already exist or not.  
-		  // If it does, then back it up as xxx.java.bak before proceeding to call the Axis emitter
-		  
-		  FileInputStream finStream = null;
-		  
-		  ResourceContext context = WebServicePlugin.getInstance().getResourceContext();
-		  IStatusHandler statusHandler = environment.getStatusHandler();
-		  
-		  String beanNamePathString = beanNameString.replace('.',IPath.SEPARATOR);
-		  IPath skelImplPath = new Path (javaWSDLParam.getJavaOutput()).append(new Path (beanNamePathString)).addFileExtension(JAVA);
-		  if (skelImplPath.toFile().exists()) {
-			  IPath targetPath = skelImplPath.addFileExtension(BAK_EXT);
-			  try {
-				  finStream = new FileInputStream(skelImplPath.toString());
-				  if (finStream != null) {
-					  FileResourceUtils.createFileAtLocation(context, targetPath.makeAbsolute(), finStream,
-							  monitor, statusHandler);
-					  finStream.close();
-				  }
-			  } catch (Exception e) {
-				  status = StatusUtils.errorStatus(NLS.bind(AxisConsumptionCoreMessages.MSG_ERROR_MOVE_RESOURCE,new String[]{e.getLocalizedMessage()}), e);
-				  environment.getStatusHandler().reportError(status);
-			  } finally {
-				  try {
-					  if (finStream != null) {
-						  finStream.close();
-					  }
-				  } catch (IOException e) {
-				  }
-			  }
-		  }
-	  } 
-	  else {
-		  status = StatusUtils.errorStatus( NLS.bind(AxisConsumptionUIMessages.MSG_ERROR_WSDL_NO_DEFINITION, new String[] {wsdlURL}));
-		  environment.getStatusHandler().reportError(status);
-	  }  
-	  
-	  return status;
-  }
-  
-
-  /**
-  * Sets the javaWSDLParam.
-  * @param javaWSDLParam The javaWSDLParam to set
-  */
-  public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
-    this.javaWSDLParam = javaWSDLParam;
-  }
-
-  /**
-   * @param webServicesParser The webServicesParser to set.
-   */
-  public void setWebServicesParser(WebServicesParser webServicesParser) {
-    this.webServicesParser = webServicesParser;
-  }
-  
-
-}
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 c3afaf985..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/DefaultsForServerJavaWSDLCommand.java
+++ /dev/null
@@ -1,263 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.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.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.axis.consumption.core.AxisConsumptionCoreMessages;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.AxisConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.ClasspathUtils;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.FileUtil;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.PlatformUtils;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.WSDLUtils;
-import org.eclipse.jst.ws.internal.axis.creation.ui.AxisCreationUIMessages;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.wsil.Utils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-public class DefaultsForServerJavaWSDLCommand extends AbstractDataModelOperation {
-
-	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_;
-    private String serviceServerTypeID_;
-	
-	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( ) 
-	{
-	}
-	
-
-	/**
-	* Execute DefaultsForJavaToWSDLTask
-	*/
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-	{
-		IEnvironment environment = getEnvironment();
-
-		IStatus status;
-		if (javaWSDLParam_ == null) {
-			status = StatusUtils.errorStatus( AxisConsumptionCoreMessages.MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET);
-			environment.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_;
-		if (javaBeanName_ != null) {
-			int index = javaBeanName_.lastIndexOf('.');
-			if (index != -1) {
-				simpleBeanName = javaBeanName_.substring(index + 1);
-			}
-		}
-		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_)) {
-      if (J2EEUtils.isWebComponent(serviceProject_)){
-				moduleServerRoot = ResourceUtils.getJavaSourceLocation(serviceProject_);
-
-				// should use ModuleCore.getSourceContainers();
-//				IContainer container = ResourceUtils.getWebModuleServerRoot(serviceProject_);
-//				if (container!=null) {
-//					moduleServerRoot = container.getFullPath();
-//				}
-				
-				modulePath = J2EEUtils.getWebContentPath(serviceProject_);
-				webinfPath = J2EEUtils.getWebInfPath( serviceProject_ );
-				
-			}
-
-		} catch (Exception e) {
-			status =  StatusUtils.errorStatus( AxisConsumptionUIMessages.MSG_ERROR_DEFAULT_BEAN, e );
-			environment.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 = StatusUtils.errorStatus( AxisConsumptionUIMessages.MSG_ERROR_WRITE_WSDL, e );
-			environment.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);
-			}
-			if (wsdlURL != null && wsdlURL.length() > 0) {
-				if (WSParser_ == null) {
-					WSParser_ = new WebServicesParserExt();
-				}
-			}
-		}
-
-		javaWSDLParam_.setStyle(JavaWSDLParameter.STYLE_WRAPPED);
-		javaWSDLParam_.setUse(JavaWSDLParameter.USE_LITERAL);
-
-		String projectURL = ServerUtils.getEncodedWebComponentURL(serviceProject_, serviceServerTypeID_);
-		if (projectURL == null) {
-			status = StatusUtils.errorStatus( AxisCreationUIMessages.MSG_ERROR_PROJECT_URL);
-			environment.getStatusHandler().reportError(status);
-			return status;
-		}
-		
-		String 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 javaOutput = ResourceUtils.getWorkspaceRoot().getFolder(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 Status.OK_STATUS;
-	}
-
-	/**
-	 * 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);
-    }
-  }
-  
-  public void setServiceServerTypeID(String id)
-  {
-    serviceServerTypeID_ = id;
-  }
-}
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 020dafb0e..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/Skeleton2WSDLCommand.java
+++ /dev/null
@@ -1,270 +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.ui.task;
-
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.Map;
-
-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.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.AxisConsumptionCoreMessages;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.AxisConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.FileUtil;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.PlatformUtils;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.WSDLUtils;
-import org.eclipse.jst.ws.internal.axis.creation.ui.AxisCreationUIMessages;
-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.command.common.CopyWSDLCommand;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-public class Skeleton2WSDLCommand extends AbstractDataModelOperation
-{
-
-  private static final String SERVICE_EXT = "/services/";	//$NON-NLS-1$
-  private static final String WSDL_EXT = "wsdl";	//$NON-NLS-1$
-  private final String WSDL_FOLDER = "wsdl"; //$NON-NLS-1$
-  private WebServicesParser webServicesParser;
-  private JavaWSDLParameter javaWSDLParam;
-  private IProject serverProject;
-  private String serviceServerTypeID_;  
-
-  public Skeleton2WSDLCommand( ) {
-  }
-
-  /**
-  * Execute Skeleton2WSDLCommand
-  */
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-	{
-		IEnvironment environment = getEnvironment();
-		if (javaWSDLParam == null)
-		{
-			IStatus status = StatusUtils.errorStatus(AxisConsumptionCoreMessages.MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET);
-			environment.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) {
-    	
-    	// beanName and beanPackageName are now set in BackupSkelImplCommand
-    	
-    	service = (Service) definition.getServices().values().iterator().next();
-    	port = (Port) service.getPorts().values().iterator().next();
-    	
-    	javaWSDLParam.setPortTypeName(WSDLUtils.getPortTypeName(definition));
-    	javaWSDLParam.setServiceName(WSDLUtils.getServiceElementName(definition));
-
-    } 
-    else {
-      IStatus status = StatusUtils.errorStatus( NLS.bind(AxisConsumptionUIMessages.MSG_ERROR_WSDL_NO_DEFINITION, new String[] {wsdlURL}));
-      environment.getStatusHandler().reportError(status);
-      return status;
-    }
-
-    // Modify WSDL endpoint
-    if (port == null) {
-      IStatus status = StatusUtils.errorStatus( NLS.bind(AxisConsumptionUIMessages.MSG_ERROR_WSDL_NO_PORT, new String[] {wsdlURL}));
-      environment.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);
-      }
-    }
-
-    // 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 = J2EEUtils.getWebContentPath( serverProject, moduleName_ );
-//			   //wsdlPath = wsdlPath.append(webProject.getWEBINFPath());
-//			 }
-//		else if (serverProject.hasNature(IEJBNatureConstants.NATURE_ID))
-//		{
-//			EJBNatureRuntime ejbProject = EJBNatureRuntime.getRuntime(serverProject);
-//			wsdlPath = wsdlPath.append(ejbProject.getMetaFolder().getProjectRelativePath().addTrailingSeparator());
-//		}		
-// TODO:  handle EJB case
-		     wsdlPath = J2EEUtils.getWebContentPath( serverProject );
-			 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);
-     copyWSDLCommand.setEnvironment(environment);
-     IStatus status = copyWSDLCommand.execute(null, null);
-     if(status!=null && status.getSeverity()==Status.ERROR) {
-       return status;
-     }
-    } 
-    catch (Exception e) {
-      IStatus status = StatusUtils.errorStatus( NLS.bind(AxisConsumptionUIMessages.MSG_ERROR_WRITE_WSDL, new String[] { wsdlLocation }), e);
-      environment.getStatusHandler().reportError(status);
-      return status;
-    }
-    return Status.OK_STATUS;
-  }
-
-  private IStatus 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);
-	  String projectURL = ServerUtils.getEncodedWebComponentURL(serverProject, serviceServerTypeID_);
-      if (projectURL == null)
-        return StatusUtils.errorStatus( NLS.bind(AxisCreationUIMessages.MSG_ERROR_PROJECT_URL, new String[] {serverProject.toString()}));
-      StringBuffer serviceURL = new StringBuffer(projectURL);
-      serviceURL.append(SERVICE_EXT).append(port.getName());
-      javaWSDLParam.setUrlLocation(serviceURL.toString());
-      soapAddress.setLocationURI(serviceURL.toString());
-    }
-    return Status.OK_STATUS;
-  }
-  
-  /**
-  * 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;
-  }
-  
-  public void setServiceServerTypeID(String id)
-  {
-    serviceServerTypeID_ = id;
-  }  
-
-}
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 28541b1e9..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/TDCheckAxisDeploymentDescriptors.java
+++ /dev/null
@@ -1,33 +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.task;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CheckAxisDeploymentDescriptorsTask;
-
-public class TDCheckAxisDeploymentDescriptors extends CheckAxisDeploymentDescriptorsTask 
-{
-  public TDCheckAxisDeploymentDescriptors() 
-  {
-  }
-  
-  /*
-	 * The execute method of this command do nothing.  It is merely an anchor point for UI page
-	 * TODO Remove this class and use another command as an anchor point for the UI
-	 */
-  public IStatus execute(IProgressMonitor monitor, IAdaptable adaptable) {
-		return Status.OK_STATUS;
-	}
-}
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 8d97532ad..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/UpdateAxisWSDDFileTask.java
+++ /dev/null
@@ -1,224 +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.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.AxisConsumptionCoreMessages;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.FileUtil;
-import org.eclipse.jst.ws.internal.axis.creation.ui.AxisCreationUIMessages;
-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.jst.ws.internal.common.ServerUtils;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.common.BundleUtils;
-
-public class UpdateAxisWSDDFileTask extends AbstractDataModelOperation {
-	
-	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 JavaWSDLParameter javaWSDLParam_;
-	private IProject serviceProject_;
-    private String serviceServerTypeID_;
-
-	public UpdateAxisWSDDFileTask() 
-	{
-	}
-	
-	/**
-	* Execute UpdateAxisWSDDFileTask
-	*/
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-	{    
-		IEnvironment environment = getEnvironment();
-	    IStatus status = Status.OK_STATUS;		
-		if (javaWSDLParam_ == null) {
-		  status = StatusUtils.errorStatus(AxisConsumptionCoreMessages.MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET);
-		  environment.getStatusHandler().reportError(status);
-		  return status;		  
-		}
-
-		IProject project = serviceProject_;
-		//String projectURL = ResourceUtils.getEncodedWebProjectURL(project);
-		String projectURL = ServerUtils.getEncodedWebComponentURL(project, serviceServerTypeID_);
-		if (projectURL == null) {
-		    status = StatusUtils.errorStatus(NLS.bind(AxisCreationUIMessages.MSG_ERROR_PROJECT_URL,new String[] {project.toString()}));
-		    environment.getStatusHandler().reportError(status);
-		    return status;		  
-		} else {
-			javaWSDLParam_.setProjectURL(projectURL);
-		}
-		String outputLocation = javaWSDLParam_.getJavaOutput();
-		if (outputLocation == null) {
-			return status;
-		}
-
-		String webContentPath =	J2EEUtils.getWebContentContainer( project ).getLocation().toString();
-		try {
-
-			if (javaWSDLParam_.getDeploymentFiles() != null
-				&& javaWSDLParam_.getDeploymentFiles().length > 0) {
-
-				String wsdd_deploy = javaWSDLParam_.getDeploymentFiles()[0];
-				IPath 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).
-        FileOutputStream wsddStream = new FileOutputStream( wsdd_deploy );
-        
-        try
-        {
-				  transformer.transform( new StreamSource(deployBackup), new StreamResult(wsddStream) );
-        }
-        finally
-        {
-          wsddStream.close();
-        }
-        
-        IPath eclipseDeployPath = findPathFromFilePath( deployPath );
-        
-        if( eclipseDeployPath != null )
-        {
-          IResource deployFile = ResourceUtils.findResource( eclipseDeployPath );
-          
-          if( deployFile != null )
-          {
-            deployFile.refreshLocal( IResource.DEPTH_ZERO, monitor );
-          }
-        }
-			}
-
-		} catch (Exception e) {
-		    String[] errorMsgStrings = new String[]{project.toString(), outputLocation.toString(), webContentPath.toString()}; 
-		    status = StatusUtils.errorStatus(NLS.bind(AxisCreationUIMessages.MSG_ERROR_UPDATE_AXIS_WSDD, errorMsgStrings), e);
-		    environment.getStatusHandler().reportError(status);
-		    return status;		  		  
-		}
-		
-		return status;
-	}
-
-  // This method attempts to convert a path that is relative to a file system to a path
-  // that is relative to the workspace.
-  private IPath findPathFromFilePath( IPath filePath )
-  {
-    IPath result = null;
-    
-    IPath installLocation = Platform.getLocation();
-    
-    if( installLocation.matchingFirstSegments( filePath ) == installLocation.segmentCount() )
-    {
-      filePath = filePath.removeFirstSegments( installLocation.segmentCount() );
-      result = filePath.setDevice( null );
-    }
-    
-    return result;
-  }
-  
-	private IPath getPluginFilePath(String pluginfileName)
-		throws CoreException {
-		try {
-
-			URL localURL =
-				Platform.asLocalURL(
-					BundleUtils.getURLFromBundle( WebServiceAxisCreationUIPlugin.ID, pluginfileName));
-			return new Path(localURL.getFile());
-		} catch (MalformedURLException e) {
-			throw new CoreException(
-				new org.eclipse.core.runtime.Status(
-					IStatus.WARNING,
-					WebServiceAxisCreationUIPlugin.ID,
-					0,
-					AxisCreationUIMessages.MSG_PLUGIN_FILE_URL,
-					e));
-		} catch (IOException e) {
-			throw new CoreException(
-				new org.eclipse.core.runtime.Status(
-					IStatus.WARNING,
-					WebServiceAxisCreationUIPlugin.ID,
-					0,
-					AxisCreationUIMessages.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;
-	}
-	*/
-    public void setServiceServerTypeID(String id)
-    {
-      serviceServerTypeID_ = id;
-    }    
-}
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 ece395c47..000000000
--- 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,187 +0,0 @@
-/*******************************************************************************
- * Copyright (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.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.creation.ui.AxisCreationUIMessages;
-import org.eclipse.jst.ws.internal.consumption.datamodel.validate.ValidationManager;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-/**
- * 
- */
-public class BUAxisDefaultingCommand extends AbstractDataModelOperation
-{
-  
-  //Provide
-  private IServer serviceExistingServer_;
-  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;
-  
- 
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-  {
-	IEnvironment environment = getEnvironment();
-    
-	//javaWSDLParam
-	javaWSDLParam_ = new JavaWSDLParameter();
-    
-	if (javaBeanName_ == null) {
-		IStatus status = StatusUtils.errorStatus(
-				AxisCreationUIMessages.MSG_ERROR_CANNOT_NO_JAVA_BEAN);
-		environment.getStatusHandler().reportError(status);
-		return status;
-	}
-    
-    //parser
-    parser_ = new WebServicesParserExt();
-    
-    //validationManager
-    validationManager_ = new ValidationManager();
-    
-    return Status.OK_STATUS;
-  }
-  
-	
-  /**
-   * @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_;
-  }
-  
-  /**
-   * @return Returns the serviceExistingServer_.
-   */
-  public IServer getServiceExistingServer()
-  {
-    return serviceExistingServer_;
-  }
-  
- 
-  public boolean getCustomizeServiceMappings()
-  {
-    return customizeServiceMappings_;
-  }
-  /**
-   * @return Returns the isWebProjectStartupRequested.
-   */
-  public Boolean getIsWebProjectStartupRequested()
-  {
-    return IsWebProjectStartupRequested;
-  }
-
-public void setJavaBeanName(String javaBeanName) {
-	this.javaBeanName_ = javaBeanName;
-}
-  
-//  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 9758e7039..000000000
--- 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.consumption.ui.ConsumptionUIMessages;
-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.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-
-public class BeanClassWidget extends SimpleWidgetDataContributor
-{
-
-  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 )
-  {
-	String       pluginId_  = "org.eclipse.jst.ws.consumption.ui";	  
-	String       thisPlugin = "org.eclipse.jst.ws.axis.creation.ui";
-    UIUtils      uiUtils  = new UIUtils( thisPlugin ); 
-    
-    parent_ = parent;
-    
-    Composite group = uiUtils.createComposite( parent, 4 );
-    
-    group.setToolTipText( ConsumptionUIMessages.TOOLTIP_PBCL_PAGE );
-    PlatformUI.getWorkbench().getHelpSystem().setHelp( group, pluginId_ + "." + INFOPOP_PBCL_PAGE );
-    
-    beanClassText_ = uiUtils.createText( group, ConsumptionUIMessages.LABEL_BEAN_CLASS_NAME,
-    		ConsumptionUIMessages.TOOLTIP_PBCL_TEXT_BEAN_CLASS,
-                                         INFOPOP_PBCL_TEXT_BEAN_CLASS,
-                                         SWT.SINGLE | SWT.BORDER);
-    
-    beanClassBrowseButton_ = uiUtils.createPushButton( group, ConsumptionUIMessages.BUTTON_BROWSE_CLASSES,
-    		ConsumptionUIMessages.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, ConsumptionUIMessages.BUTTON_BROWSE_FILES,
-    		ConsumptionUIMessages.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 e54abe807..000000000
--- 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,321 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.creation.ui.AxisCreationUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-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.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.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-
-public class BeanConfigWidget extends SimpleWidgetDataContributor 
-{
-
-  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 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 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 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 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 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 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 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 pluginId_ = "org.eclipse.jst.ws.axis.creation.ui";	  
-
-    UIUtils      uiUtils        = new UIUtils( pluginId_ );
-    UIUtils      baseConUiUtils = new UIUtils( pluginId_ );
-    
-    statusListener_ = statusListener;    
-	parent.setToolTipText( AxisCreationUIMessages.TOOLTIP_PBCF_PAGE  );
-	PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId_ + "." + INFOPOP_PBCF_PAGE );
-    
-    Composite configGroup = uiUtils.createComposite( parent, 2 );
-    
-    uriText_ = uiUtils.createText( configGroup, AxisCreationUIMessages.LABEL_URI,
-    		AxisCreationUIMessages.TOOLTIP_PBCF_TEXT_URI,
-                                   INFOPOP_PBCF_TEXT_URI,
-                                   SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-    
-    wsdlFolderText_ = uiUtils.createText( configGroup, AxisCreationUIMessages.LABEL_OUTPUT_FOLDER_NAME,
-    		AxisCreationUIMessages.TOOLTIP_PBCF_TEXT_WSDL_FOLDER,
-                                          INFOPOP_PBCF_TEXT_WSDL_FOLDER,
-                                          SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-    
-    wsdlFileText_ = uiUtils.createText( configGroup, AxisCreationUIMessages.LABEL_OUTPUT_FILE_NAME,
-    		AxisCreationUIMessages.TOOLTIP_PBCF_TEXT_WSDL_FILE,
-                                        INFOPOP_PBCF_TEXT_WSDL_FILE,
-                                        SWT.SINGLE | SWT.BORDER  );
-    wsdlFileText_.addListener( SWT.Modify, statusListener );
-    
-    uiUtils.createHorizontalSeparator( parent, 6 );
-    
-    // TODO this group has no TOOLTIP or INFOPOP.
-    Group    methodsGroup = baseConUiUtils.createGroup( parent, ConsumptionUIMessages.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, AxisCreationUIMessages.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, ConsumptionUIMessages.BUTTON_SELECT_ALL, 
-    		  ConsumptionUIMessages.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, ConsumptionUIMessages.BUTTON_DESELECT_ALL, 
-    		  ConsumptionUIMessages.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, AxisCreationUIMessages.LABEL_STYLE_USE, null, null );
-    
-    // TODO radio buttons have no TOOLTIP or INFOPOP.
-    docLiteralButton_ = uiUtils.createRadioButton( styleGroup, AxisCreationUIMessages.STYLE_DOC_LITERAL, null, null );
-    rpcLiteralButton_ = uiUtils.createRadioButton( styleGroup, AxisCreationUIMessages.STYLE_RPC_LITERAL, null, null );
-    rpcEncodedButton_ = uiUtils.createRadioButton( styleGroup, AxisCreationUIMessages.STYLE_RPC_ENCODED, null, null );
-    
-    showMappingsCheckbox_ = uiUtils.createCheckbox( parent, AxisCreationUIMessages.LABEL_EXPLORE_MAPPINGS_BEAN2XML,
-    		AxisCreationUIMessages.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() );
-	    
-	// 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);
-	
-	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 IStatus getStatus() 
-  {
-    IStatus       result   = null;
-    
-    if( wsdlFileText_.getText().equals( "" ) )
-    {
-      result = StatusUtils.errorStatus( AxisCreationUIMessages.PAGE_MSG_NO_FILE_SPECIFIED ); 
-    }
-    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 = StatusUtils.errorStatus( AxisCreationUIMessages.PAGE_MSG_NO_METHOD_SELECTED ); 
-      }
-    }
-    
-    return result;
-  }
-}
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 e3fa801bc..000000000
--- 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.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.axis.creation.ui.AxisCreationUIMessages;
-import org.eclipse.jst.ws.internal.common.JavaMOFUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.common.JavaResourceFilter;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-public class ValidateObjectSelectionCommand extends AbstractDataModelOperation
-{
-  private String JAVA_EXTENSION = ".java"; //$NON-NLS-1$
-  private String CLASS_EXTENSION = ".class"; //$NON-NLS-1$
-  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();
-  }
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-	{
-		IEnvironment environment = getEnvironment();
-    //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)
-		{
-		  IStatus errorStatus = StatusUtils.errorStatus(AxisCreationUIMessages.MSG_ERROR_CANNOT_NO_JAVA_BEAN);
-		  environment.getStatusHandler().reportError(errorStatus);
-		  return errorStatus;			
-		}
-      }
-    }    
-    
-    if (javaBeanName==null || javaBeanName.length()==0)
-    {
-      IStatus errorStatus = StatusUtils.errorStatus(AxisCreationUIMessages.MSG_ERROR_CANNOT_NO_JAVA_BEAN);
-      environment.getStatusHandler().reportError(errorStatus);
-      return errorStatus;
-    }
-    
-    //Make sure a project is selected
-    IProject serviceProject = ProjectUtilities.getProject(serviceProjectName);
-    if (serviceProject==null)
-    {
-      IStatus errorStatus = StatusUtils.errorStatus(AxisCreationUIMessages.MSG_ERROR_NO_PROJECT);
-      environment.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
-    {
-	  JavaClass javaClass = JavaMOFUtils.getJavaClass(javaBeanName, serviceProject); 
-	  if (!javaClass.isExistingType()) 
-	  {		
-		IStatus errorStatus = StatusUtils.errorStatus( NLS.bind(AxisCreationUIMessages.MSG_ERROR_CANNOT_LOAD_JAVA_BEAN, new String[] { javaBeanName, serviceProjectName }));
-		environment.getStatusHandler().reportError(errorStatus);
-		return errorStatus;
-	  }
-    } catch (CoreException ce)
-    {
-	  IStatus errorStatus = StatusUtils.errorStatus( NLS.bind(AxisCreationUIMessages.MSG_ERROR_CANNOT_LOAD_JAVA_BEAN, new String[] { javaBeanName, serviceProjectName }));
-	  environment.getStatusHandler().reportError(errorStatus);
-      return errorStatus;      
-    }
-    
-    return Status.OK_STATUS;
-  }
-  
-  /**
-   * @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 bd5cccceb..000000000
--- 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.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.consumption.common.WSDLParserFactory;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-public class AxisSkeletonDefaultingCommand extends AbstractDataModelOperation
-{
-  private IStructuredSelection initialSelection;
-  private WebServicesParser webServicesParser;
-  private String wsdlURI_;
-  private JavaWSDLParameter javaWSDLParam;
-  
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-	{
-    javaWSDLParam = new JavaWSDLParameter();
-    javaWSDLParam.setServerSide(JavaWSDLParameter.SERVER_SIDE_BEAN);
-    javaWSDLParam.setSkeletonDeploy(true);
-    javaWSDLParam.setMetaInfOnly(false);
-    javaWSDLParam.setInputWsdlLocation(wsdlURI_);
-    return Status.OK_STATUS;
-    
-  }
-  
-  public void setInitialSelection(IStructuredSelection initialSelection)
-  {
-    this.initialSelection = initialSelection;
-  }
-
-  public void setObjectSelection(IStructuredSelection 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()
-  {
-	  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()
-  {
-    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/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 07a345bec..000000000
--- 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,205 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.IPath;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.AxisConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.axis.creation.ui.AxisCreationUIMessages;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-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.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.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 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 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 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 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$
-
-
-  /* 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$
-  
-  private IProject serverProject_;
-	
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener)
-  {
-    String       pluginId        = "org.eclipse.jst.ws.axis.creation.ui";
-    
-    UIUtils      uiUtils         = new UIUtils( pluginId );
-    UIUtils      conUiUtils      = new UIUtils( pluginId );
-    UIUtils      baseConUiUtils  = new UIUtils( pluginId );
-
-  	PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId + "." +  INFOPOP_PBSC_PAGE );
-  	parent.setToolTipText( AxisCreationUIMessages.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, AxisCreationUIMessages.LABEL_OUTPUT_FOLDER_NAME,
-    		AxisCreationUIMessages.TOOLTIP_PBCF_TEXT_WSDL_FOLDER,
-                                          INFOPOP_PBCF_TEXT_WSDL_FOLDER,
-                                          SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-
-    wsdlFileText_ = uiUtils.createText( textGroup, AxisCreationUIMessages.LABEL_OUTPUT_FILE_NAME,
-    		AxisCreationUIMessages.TOOLTIP_PBCF_TEXT_WSDL_FILE,
-                                        INFOPOP_PBCF_TEXT_WSDL_FILE,
-                                        SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-
-    skeletonFolderText_ = baseConUiUtils.createCombo( textGroup, ConsumptionUIMessages.LABEL_SKELETON_ROOT_NAME,
-    		ConsumptionUIMessages.TOOLTIP_PBSC_TEXT_SKELETON_FOLDER,
-        INFOPOP_PBSC_TEXT_SKELETON_FOLDER,
-        SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-
-    uiUtils.createHorizontalSeparator( parent, 5 );
-
-    showMappingsCheckbox_ = conUiUtils.createCheckbox( parent, AxisConsumptionUIMessages.LABEL_EXPLORE_MAPPINGS_XML2BEAN,
-    													AxisConsumptionUIMessages.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() {
-
-//	  Do not base Java output directory on workspace root since the project could be not 
-//	  physically located in the workspace root, get the project specific root instead
-	  
-	  String projectSpecificRoot = serverProject_.getLocation().toString();
-	  String skeletonFolder = skeletonFolderText_.getText();
-	  String projectPathString = serverProject_.getFullPath().toString();
-	  if (skeletonFolder.startsWith(projectPathString)) {
-		  skeletonFolder = skeletonFolder.substring(projectPathString.length());
-	  }
-	  javaWSDLParam.setJavaOutput(projectSpecificRoot + skeletonFolder);
-	  return javaWSDLParam;
-  }
-
-  /**
-   * @param javaWSDLParam The javaWSDLParam to set.
-   */
-  public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
-	  this.javaWSDLParam = javaWSDLParam;
-  }
-  
-  public void setServerProject(IProject serviceProject)
-  {
-	  serverProject_ = 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 5126f46fb..000000000
--- 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,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.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.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.creation.ui.AxisCreationUIMessages;
-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.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public class SkeletonConfigWidgetDefaultingCommand extends AbstractDataModelOperation
-{
-  private String wsdlURI;
-  private IProject serverProject;
-  private JavaWSDLParameter javaWSDLParam;
-  private String serviceServerTypeID_;
-
-  public SkeletonConfigWidgetDefaultingCommand( )
-  {
-  }
-  
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-	{
-		IEnvironment environment = getEnvironment();
-		IStatus status = Status.OK_STATUS;
-		
-		String outputDir =	ResourceUtils.findResource(J2EEUtils.getWebInfPath( serverProject )).getLocation().toString();
-		javaWSDLParam.setOutput( outputDir );
-//		Do not base Java output directory on workspace root since the project could be not physically located in the workspace root
-//		javaWSDLParam.setJavaOutput(getRootURL() + getOutputJavaFolder()); 
-		String javaOutput =	ResourceUtils.findResource(getOutputJavaFolder()).getLocation().toString();
-		javaWSDLParam.setJavaOutput(javaOutput);
-
-
-	
-	String projectURL = ServerUtils.getEncodedWebComponentURL(serverProject, serviceServerTypeID_);
-	
-	if (projectURL == null) {
-	    status = StatusUtils.errorStatus(NLS.bind(AxisCreationUIMessages.MSG_ERROR_PROJECT_URL, new String[] { serverProject.toString()}));
-	    environment.getStatusHandler().reportError(status);
-	    return status;		  
-	} else {
-		javaWSDLParam.setProjectURL(projectURL);
-	}
-	
-    return Status.OK_STATUS;
-    
-  }
-  
-  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()
-  {
-	  IPath wsdlPath = J2EEUtils.getWebContentPath(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()
-  {
-    if (serverProject!=null){
-      return ResourceUtils.getJavaSourceLocation(serverProject).toString();
-    }
-    return null;
-  }
-
-  public boolean getShowMapping()
-  {
-    return false;
-  }
-  
-  public boolean isShowMapping()
-  {
-    return getShowMapping();
-  }
-  
-  public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam)
-  {
-  	this.javaWSDLParam = javaWSDLParam;
-  }
-  
-  public JavaWSDLParameter getJavaWSDLParam()
-  {
-    return javaWSDLParam;
-  }
-
-public String getServiceServerTypeID() {
-	return serviceServerTypeID_;
-}
-
-public void setServiceServerTypeID(String serviceServerTypeID) {
-	this.serviceServerTypeID_ = serviceServerTypeID;
-}
-}
\ 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 45b037db1..000000000
--- 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,221 +0,0 @@
-/*******************************************************************************
- * Copyright (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.AxisConsumptionUIMessages;
-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.AxisCreationUIMessages;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.JavaToWSDLMethodCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.DefaultsForServerJavaWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean.BeanConfigWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionWidget;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-
-
-/**
-* This is the class for the
-* Axis bottom up Java Bean scenario
-* 
-*/
-public class WSBeanAxisType implements CommandWidgetBinding
-{	
-  private String serverName_;
-  private String runtimeName_;
-  private boolean isWebModuleRequired_;
-
-
-  /**
-  * 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 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;
-  }
-
-  
-	/* (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.internal.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", CheckAxisDeploymentDescriptorsTask.class, "JavaWSDLParam", null);
-    dataRegistry.addMapping(BeanConfigWidget.class, "JavaParameter", Java2WSDLCommand.class, "JavaWSDLParam", null);       
-    dataRegistry.addMapping(BeanConfigWidget.class, "JavaParameter", WSDL2JavaCommand.class, "JavaWSDLParam", null);
-
-    //AxisMappingsWidget - as target
-    dataRegistry.addMapping(BeanConfigWidget.class, "JavaParameter", AxisMappingsWidget.class);
-    
-    //AxisMappingsWidget - as source
-
-    dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", CheckAxisDeploymentDescriptorsTask.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) 
-  {
-   
-    /*
-    widgetRegistry.add( "BeanSelection", 
-                        AxisCreationUIMessages.PAGE_TITLE_WSBEAN_CLASS,
-                        AxisCreationUIMessages.PAGE_DESC_WSBEAN_CLASS,
-                        new WidgetContributorFactory()
-                        {
-                          public WidgetContributor create()
-                          {
-                            return new BeanClassWidget();
-                          }
-                        } );
-    */
-
-    widgetRegistry.add( "BeanConfig", 
-                        AxisCreationUIMessages.PAGE_TITLE_WSBEAN_CONFIG,
-                        AxisCreationUIMessages.PAGE_DESC_WSBEAN_CONFIG,
-                        new WidgetContributorFactory()
-                        {
-                          public WidgetContributor create()
-                          {
-                            return new BeanConfigWidget();
-                          }
-                        } );
-
-
-    widgetRegistry.add( "AxisServiceBeanMapping", 
-    		AxisConsumptionUIMessages.PAGE_TITLE_WS_BEAN2XML,
-    		AxisConsumptionUIMessages.PAGE_DESC_P2N_MAPPINGS,
-                        new WidgetContributorFactory()
-                        {
-                          public WidgetContributor create()
-                          {
-                            return new AxisMappingsWidget(AxisMappingsWidget.MODE_BEAN2XML );
-                          }
-                        } );
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactoryFactory#create()
-   */
-  public CommandFragmentFactory create() 
-  {
-    return new CommandFragmentFactory()
-    {
-      public CommandFragment create()
-      {
-          //dead code - doesn't matter what gets returned here.
-    	  return new SimpleFragment();
-      }
-    };
-  }
-    
-}
-
-
-
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 83c3d9552..000000000
--- 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,213 +0,0 @@
-/*******************************************************************************
- * Copyright (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.task.BackupSkelImplCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton.AxisSkeletonDefaultingCommand;
-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.ui.ConsumptionUIMessages;
-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.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-
-/**
-* This is the class for the Axis Web service type.
-*/
-public class WSWSDLAxisType implements CommandWidgetBinding 
-{
-	private String serverName_;
-	private String runtimeName_;
-	private boolean isWebModuleRequired_;
-
-	/**
-	* 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 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;
-	}
-
-
-	/* (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.internal.env.core.data.DataMappingRegistry)
-   */
-  public void registerDataMappings(DataMappingRegistry dataRegistry) 
-  {
-    // SkeletonConfigWidget
-    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);
-
-    //  BackupSkelImplCommand     
-    dataRegistry.addMapping(SkeletonConfigWidget.class, "JavaWSDLParam", BackupSkelImplCommand.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) 
-  {
-   
-    /*
-    widgetRegistry.add( "WSDLSelection", 
-                        ConsumptionUIMessages.PAGE_TITLE_WS_SELECTION,
-                        ConsumptionUIMessages.PAGE_DESC_WS_SELECTION,
-		                new WidgetContributorFactory()
-                        {
-		                  public WidgetContributor create()
-		                  {
-		                    return new WSDLSelectionWidget();
-		                  }
-		                } );
-
-    widgetRegistry.add( "WSDLSelectionTreeWidget", 
-        ConsumptionUIMessages.PAGE_TITLE_WSDL_SELECTION,
-        ConsumptionUIMessages.PAGE_DESC_WSDL_SELECTION,
-        new WidgetContributorFactory()
-        {
-          public WidgetContributor create()
-        {
-            return new WSDLSelectionTreeWidget();
-        }
-        });
-    */
-
-    widgetRegistry.add( "SkeletonConfig", 
-                        ConsumptionUIMessages.PAGE_TITLE_WSSKEL_CONFIG,
-                        ConsumptionUIMessages.PAGE_DESC_WSSKEL_CONFIG,
-                        new WidgetContributorFactory()
-                        {
-                          public WidgetContributor create()
-                          {
-                            return new SkeletonConfigWidget();
-                          }
-                        } );
-
-    widgetRegistry.add( "AxisMappingsWidget", 
-                        ConsumptionUIMessages.PAGE_TITLE_WS_XML2BEAN,
-                        ConsumptionUIMessages.PAGE_DESC_N2P_MAPPINGS,
-                        new WidgetContributorFactory()
-                        {
-                          public WidgetContributor create()
-                          {
-                            return new AxisMappingsWidget(AxisMappingsWidget.MODE_XML2BEAN);
-                          }
-                        } );
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactoryFactory#create()
-   */
-  public CommandFragmentFactory create() 
-  {
-    return new CommandFragmentFactory()
-    {
-      public CommandFragment create()
-      {
-          //dead code - doesn't matter what gets returned here. 
-    	  return new SimpleFragment();
-      }
-    };
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisBeanConfigWidgetFactory.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisBeanConfigWidgetFactory.java
deleted file mode 100644
index 77e6b55e6..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/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.ui.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.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.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/ui/wsrt/AxisSkeletonConfigWidgetFactory.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisSkeletonConfigWidgetFactory.java
deleted file mode 100644
index 0d8b8fecc..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/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.ui.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.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.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/ui/wsrt/AxisWebService.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebService.java
deleted file mode 100644
index 11c727fba..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebService.java
+++ /dev/null
@@ -1,349 +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.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.GeronimoAxisDeployCommand;
-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.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.AxisCheckCompilerLevelCommand;
-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.CopyDeploymentFileCommand;
-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.BackupSkelImplCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.DefaultsForServerJavaWSDLCommand;
-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.BUAxisDefaultingCommand;
-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.ui.command.OpenJavaEditorCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.data.ProjectName2IProjectTransformer;
-import org.eclipse.wst.command.internal.env.common.WaitForAutoBuildCommand;
-import org.eclipse.wst.command.internal.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.env.core.SimpleCommandFactory;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.eclipse.EclipseEnvironment;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.ws.internal.wsrt.AbstractWebService;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-import org.eclipse.wst.ws.internal.wsrt.ISelection;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-public class AxisWebService extends AbstractWebService
-{
-	private AxisWebServiceInfo axisWebServiceInfo_;
-
-	public AxisWebService(WebServiceInfo info)
-	{
-		super(info);
-	}
-
-	public ICommandFactory assemble(IEnvironment env, IContext ctx,
-			ISelection sel, String project, String earProject)
-	{
-		return null;
-	}
-
-	public ICommandFactory deploy(IEnvironment env, IContext ctx, ISelection sel,
-			String project, String earProject)
-	{
-		return null;
-	}
-
-	public ICommandFactory develop(IEnvironment env, IContext ctx, ISelection sel,
-			String project, String earProject)
-	{
-		
-		Vector commands = new Vector();
-    EclipseEnvironment environment = (EclipseEnvironment)env;
-		
-		if (ctx.getScenario().getValue() == WebServiceScenario.BOTTOMUP) {
-			
-			registerBUDataMappings( environment.getCommandManager().getMappingRegistry());
-			
-			commands.add(new BUAxisInputCommand(this, project));
-			commands.add(new AxisCheckCompilerLevelCommand());
-//			commands.add(new ValidateObjectSelectionCommand());
-			commands.add(new BUAxisDefaultingCommand());
-			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 CopyAxisJarCommand());
-			commands.add(new WaitForAutoBuildCommand());
-			commands.add(new Java2WSDLCommand());
-			commands.add(new RefreshProjectCommand());
-			commands.add(new WSDL2JavaCommand());
-			commands.add(new UpdateAxisWSDDFileTask());
-			commands.add(new UpdateWEBXMLCommand());
-			commands.add(new RefreshProjectCommand());
-			commands.add(new BuildProjectCommand());
-			commands.add(new AxisOutputCommand(this));
-			
-		} else if (ctx.getScenario().getValue() == WebServiceScenario.TOPDOWN) {
-			
-			registerTDDataMappings( environment.getCommandManager().getMappingRegistry());
-			
-			commands.add(new TDAxisInputCommand(this, project));
-			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 CopyAxisJarCommand());
-			commands.add(new BackupSkelImplCommand());
-		    commands.add(new WSDL2JavaCommand());
-		    commands.add(new Skeleton2WSDLCommand());
-		    commands.add(new UpdateWEBXMLCommand());
-		    commands.add(new RefreshProjectCommand());
-		    commands.add(new BuildProjectCommand());
-			commands.add(new AxisOutputCommand(this));
-			
-		} else {
-			//TODO: Remove println and reassess this "error".
-			System.out.println("Error - WebServiceScenario should not be Client for AxisWebService");
-			return null;
-		}
-		
-		
-		return new SimpleCommandFactory(commands);
-	}
-
-	public ICommandFactory install(IEnvironment env, IContext ctx, ISelection sel,
-			String project, String earProject)
-	{
-		return null;
-	}
-
-	public ICommandFactory run(IEnvironment env, IContext ctx, ISelection sel,
-			String project, String earProject)
-	{
-		Vector commands = new Vector();
-
-		if (ctx.getScenario().getValue() == WebServiceScenario.CLIENT) {
-			//TODO: Remove println and reassess this "error".
-			System.out.println("Error - WebServiceScenario should not be Client for AxisWebService");
-			return null;
-		} else {// For BOTTOM_UP and TOP_DOWN
-			commands.add(new AxisRunInputCommand(this, project));
-			if (getWebServiceInfo().getServerFactoryId().equals("org.eclipse.jst.server.geronimo.10")) {
-				commands.add(new GeronimoAxisDeployCommand(project));
-			}
-			else {
-			    commands.add(new AxisDeployCommand());
-			}
-			commands.add( new CopyDeploymentFileCommand( project ) );
-			commands.add(new RefreshProjectCommand());
-			if (ctx.getScenario().getValue() == WebServiceScenario.TOPDOWN) {
-				commands.add(new ComputeAxisSkeletonBeanCommand());
-				commands.add(new OpenJavaEditorCommand());
-			}
-			return new SimpleCommandFactory(commands);
-		}
-	}
-	
-	public void registerBUDataMappings(DataMappingRegistry registry) 
-	  {
-		//BUAxisInputCommand
-//		registry.addMapping(BUAxisInputCommand.class, "ServiceServerTypeID", StartProjectCommand.class);
-		registry.addMapping(BUAxisInputCommand.class, "JavaBeanName", BUAxisDefaultingCommand.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 );
-	    	    
-		// AxisCheckCompilerLevelCommand
-		registry.addMapping(BUAxisInputCommand.class, "ServerProject", AxisCheckCompilerLevelCommand.class);
-		
-	    //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(BUAxisInputCommand.class, "ServiceServerTypeID", DefaultsForServerJavaWSDLCommand.class);        
-	    registry.addMapping(BUAxisDefaultingCommand.class, "JavaBeanName", DefaultsForServerJavaWSDLCommand.class);
-	    registry.addMapping(BUAxisDefaultingCommand.class, "Parser", DefaultsForServerJavaWSDLCommand.class);
-	    
-	    //JavaWSDLMethodCommand
-	    registry.addMapping(DefaultsForServerJavaWSDLCommand.class, "JavaWSDLParam", JavaToWSDLMethodCommand.class);
-	    registry.addMapping(BUAxisInputCommand.class, "ServerProject", JavaToWSDLMethodCommand.class, "ServiceProject", new StringToIProjectTransformer());
-
-	    // BUAxisCommands3 - these run after BeanConfigWidget
-    
-	    //CheckAxisDeploymentDescriptorsTask
-	    //registry.addMapping(JavaToWSDLMethodCommand.class, "JavaWSDLParam", CheckAxisDeploymentDescriptorsTask.class);
-	    registry.addMapping(BUAxisInputCommand.class, "ServerProject", BUCheckAxisDeploymentDescriptors.class, "ServerProject", new StringToIProjectTransformer());
-	    
-	    //CopyAxisJarCommand
-	    registry.addMapping(BUAxisInputCommand.class, "ServerProject", CopyAxisJarCommand.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);
-	    
-
-	    //UpdateAxisWSDDFileTask
-	    registry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", UpdateAxisWSDDFileTask.class);
-	    registry.addMapping(BUAxisInputCommand.class, "ServerProject", UpdateAxisWSDDFileTask.class, "ServiceProject", new StringToIProjectTransformer());
-        registry.addMapping(BUAxisInputCommand.class, "ServiceServerTypeID", UpdateAxisWSDDFileTask.class);
-	    
-	    //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
-		
-		// GeronimoAxisDeployCommand
-		registry.addMapping(AxisRunInputCommand.class, "JavaWSDLParam", GeronimoAxisDeployCommand.class);		
-	    
-		//AxisDeployCommand
-	    registry.addMapping(AxisRunInputCommand.class, "JavaWSDLParam", AxisDeployCommand.class);
-		
-	    // CopyDeploymentFileCommand
-	    registry.addMapping(AxisRunInputCommand.class, "ServerInstanceId", CopyDeploymentFileCommand.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(AxisSkeletonDefaultingCommand.class, "JavaWSDLParam", SkeletonConfigWidgetDefaultingCommand.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);
-	    dataRegistry.addMapping(TDAxisInputCommand.class, "ServiceServerTypeID", SkeletonConfigWidgetDefaultingCommand.class);
-	    
-	    // CheckAxisDeploymentDescriptorsTask
-	    dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", TDCheckAxisDeploymentDescriptors.class, "ServerProject", 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);
-		
-	    // CopyAxisJarCommand
-	    dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", CopyAxisJarCommand.class, "Project", projectTransformer);
-
-	    // BackupSkelImplCommand
-	    dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WebServicesParser", BackupSkelImplCommand.class);      
-	    dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "JavaWSDLParam", BackupSkelImplCommand.class);
-	    
-	    // Skeleton2WSDLCommand
-	    dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WebServicesParser", Skeleton2WSDLCommand.class);
-	    dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", Skeleton2WSDLCommand.class, "ServerProject", projectTransformer);
-        dataRegistry.addMapping(TDAxisInputCommand.class, "ServiceServerTypeID", Skeleton2WSDLCommand.class);        
-	    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);
-
-	    // GeronimoAxisDeployCommand
-	    dataRegistry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", GeronimoAxisDeployCommand.class);
-	    
-	    // AxisDeployCommand
-	    dataRegistry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", AxisDeployCommand.class);
-	    
-	    // CopyDeploymentFileCommand
-	    dataRegistry.addMapping(AxisRunInputCommand.class, "ServerInstanceId", CopyDeploymentFileCommand.class);
-
-	    
-	    // AxisOutputCommand
-	    dataRegistry.addMapping(Skeleton2WSDLCommand.class, "WsdlURI", AxisOutputCommand.class);
-		dataRegistry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", 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/ui/wsrt/AxisWebServiceInfo.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebServiceInfo.java
deleted file mode 100644
index 1e7f78be2..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/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.ui.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/ui/wsrt/AxisWebServiceRuntime.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebServiceRuntime.java
deleted file mode 100644
index bbbd10dd1..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebServiceRuntime.java
+++ /dev/null
@@ -1,34 +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.wsrt;
-
-import org.eclipse.jst.ws.internal.axis.consumption.ui.wsrt.AxisWebServiceClient;
-import org.eclipse.wst.ws.internal.wsrt.AbstractWebServiceRuntime;
-import org.eclipse.wst.ws.internal.wsrt.IWebService;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceClientInfo;
-import org.eclipse.wst.ws.internal.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 cb0105380..000000000
--- 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.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/.cvsignore b/bundles/org.eclipse.jst.ws.consumption.ui/.cvsignore
deleted file mode 100644
index 27f945a6c..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-build.xml
-temp.folder
-wsc-ui.jar
-@dot
-src.zip
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 788372810..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/.project
+++ /dev/null
@@ -1,36 +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>
-	</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/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.consumption.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 160fd76fa..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,57 +0,0 @@
-#Mon Jan 30 10:36:02 EST 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.jst.ws.consumption.ui/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index e53eddf8a..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Jan 30 10:41:20 EST 2006
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.consumption.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index d1f75f576..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,75 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.consumption.ui; singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.consumption.ui,
- org.eclipse.jst.ws.internal.consumption.ui.action,
- org.eclipse.jst.ws.internal.consumption.ui.ant,
- org.eclipse.jst.ws.internal.consumption.ui.command,
- org.eclipse.jst.ws.internal.consumption.ui.command.data,
- org.eclipse.jst.ws.internal.consumption.ui.common,
- org.eclipse.jst.ws.internal.consumption.ui.extension,
- org.eclipse.jst.ws.internal.consumption.ui.plugin,
- org.eclipse.jst.ws.internal.consumption.ui.preferences,
- org.eclipse.jst.ws.internal.consumption.ui.selection,
- org.eclipse.jst.ws.internal.consumption.ui.server,
- org.eclipse.jst.ws.internal.consumption.ui.widgets,
- org.eclipse.jst.ws.internal.consumption.ui.widgets.binding,
- org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions,
- org.eclipse.jst.ws.internal.consumption.ui.widgets.object,
- org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime,
- org.eclipse.jst.ws.internal.consumption.ui.widgets.test,
- org.eclipse.jst.ws.internal.consumption.ui.widgets.test.explorer,
- org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample,
- org.eclipse.jst.ws.internal.consumption.ui.wizard,
- org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi,
- org.eclipse.jst.ws.internal.consumption.ui.wsil,
- org.eclipse.jst.ws.internal.consumption.ui.wsrt
-Require-Bundle: org.eclipse.wst.ws.parser,
- org.eclipse.wst.command.env,
- org.eclipse.wst.command.env.ui,
- org.eclipse.wst.command.env.core,
- org.eclipse.jst.common.frameworks,
- org.eclipse.wst.ws.explorer,
- org.eclipse.jst.ws,
- org.eclipse.jst.ws.ui,
- org.eclipse.jst.ws.consumption,
- org.eclipse.jem,
- org.eclipse.jem.workbench,
- org.eclipse.emf.common,
- org.eclipse.emf.ecore,
- org.eclipse.jdt.core,
- org.eclipse.jdt.ui,
- org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.wst.ws,
- org.eclipse.jem.workbench,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.wst.server.core,
- org.eclipse.wst.server.ui,
- org.eclipse.wst.wsdl,
- org.eclipse.jst.j2ee,
- org.eclipse.jst.j2ee.core,
- org.eclipse.jst.j2ee.ejb,
- org.eclipse.jst.j2ee.web,
- org.eclipse.wst.common.emf,
- org.eclipse.wst.common.emfworkbench.integration,
- org.eclipse.wst.common.frameworks,
- org.eclipse.jst.j2ee.webservice,
- org.eclipse.jst.j2ee.webservice.ui,
- org.eclipse.wst.common.modulecore,
- org.eclipse.wst.ws.ui,
- org.wsdl4j,
- org.eclipse.jem.util,
- org.eclipse.wst.wsdl.validation,
- org.eclipse.wst.common.frameworks.ui,
- org.eclipse.wst.common.environment,
- org.eclipse.wst.common.project.facet.core,
- org.eclipse.jst.server.core,
- org.eclipse.debug.core
-Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/about.html b/bundles/org.eclipse.jst.ws.consumption.ui/about.html
deleted file mode 100644
index 6f6b96c4c..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/build.properties b/bundles/org.eclipse.jst.ws.consumption.ui/build.properties
deleted file mode 100644
index ffb8cb268..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/
-bin.includes = .,\
-               icons/,\
-               plugin.properties,\
-               plugin.xml,\
-               META-INF/,\
-               about.html
-src.includes = 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 8da3a2131..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/config_handler_wiz.gif
+++ /dev/null
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 a113c85cc..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/configure_handlers.gif
+++ /dev/null
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 eaba51f62..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/generated_sample.gif
+++ /dev/null
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 1ee05fa2e..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/newclient_webserv_wiz.gif
+++ /dev/null
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 1060dd967..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/dtool/configure_handlers.gif
+++ /dev/null
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 590d3965f..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/dtool/generated_sample.gif
+++ /dev/null
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 68b7a2651..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/wizban/webservicesclient_wiz.gif
+++ /dev/null
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 927ad5ad4..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/gen_sample_wiz.gif
+++ /dev/null
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 641fe843a..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/import_ws.gif
+++ /dev/null
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 a3061e6ff..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/import_ws_wiz.gif
+++ /dev/null
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 5b43cae7b..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/registry.gif
+++ /dev/null
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 afb6cb7d7..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/servers/existing_server_obj.gif
+++ /dev/null
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 afb6cb7d7..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/servers/servers_obj.gif
+++ /dev/null
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 53e7dbd12..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/html.gif
+++ /dev/null
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 11b34b7db..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/import_wiz_banner_wsil.gif
+++ /dev/null
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 618a946cd..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/import_wsil.gif
+++ /dev/null
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 8fb844f5b..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/wsdl.gif
+++ /dev/null
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 7c5916fb6..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/wsil.gif
+++ /dev/null
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 c15fe275c..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/plugin.properties
+++ /dev/null
@@ -1,129 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Web Services Consumption Graphical User Interface
-PLUGIN_PROVIDER=Eclipse.org
-
-FEATURE_DESCRIPTION=Web services
-
-XP_wsImpl=Web service implementations
-XP_wsClientImpl=Web service client implementations
-XP_runtimes=Web service runtimes
-XP_serviceRuntimes=Combination of a Web service runime, service implementation type, and required facets
-XP_clientRuntimes=Combination of a Web service runime, client implementation type, and required facets
-XP_tester=Web service test facilities
-
-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
-POPUP_CONFIG_CLIENT_HANDLERS=Configure Client 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 a36c4b1b8..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/plugin.xml
+++ /dev/null
@@ -1,795 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
-   <!-- The following extension point is internal and likely to be removed in a future release. -->
-   <extension-point
-      id="publicUDDIRegistryType"
-      name="%XP_PUBLIC_UDDI_REGISTRY_TYPES"/>
-
-   <!-- The following extension point is internal and likely to be removed in a future release. -->
-   <extension-point
-      id="privateUDDIRegistryType"
-      name="%XP_PRIVATE_UDDI_REGISTRY_TYPES"/>
-
-   <!-- The following extension point is internal and likely to be removed in a future release. -->
-   <extension-point
-      id="webServiceTest"
-      name="%XP_WEB_SERVICE_TEST"
-      schema="schema/webServiceTest.exsd"/>
-
-   <!-- The following extension point is internal, though likely to be made public with changes in a future release. -->
-   <extension-point
-      id="objectSelectionWidget"
-      name="%XP_OBJECT_SELECTION_WIDGET"
-      schema="schema/objectSelectionWidget.exsd"/>
-
-   <!-- 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>
-
-   <!-- 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.internal.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>
-
-   <!-- Handler extensions -->
-   <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.internal.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.internal.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.consumption.ui.preferences.ProjectTopologyPreferencePage"
-            id="org.eclipse.jst.ws.internal.consumption.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_CONFIG_CLIENT_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_CONFIG_CLIENT_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_CONFIG_CLIENT_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_CONFIG_CLIENT_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_CONFIG_CLIENT_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>
-
-   <!-- 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"
-            transformer="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.EJBSelectionTransformer"            
-            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>
-   
-   <!-- The following extension point is internal, though likely to be made public with changes in a future release. -->
-   <extension-point id="wsImpl" name="%XP_wsImpl"/>
-
-   <!-- The following extension point is internal, though likely to be made public with changes in a future release. -->
-   <extension-point id="wsClientImpl" name="%XP_wsClientImpl"/>
-
-   <!-- The following extension point is internal, though likely to be made public with changes in a future release. -->
-   <extension-point id="runtimes" name="%XP_runtimes" />
-
-   <!-- The following extension point is internal, though likely to be made public with changes in a future release. -->
-   <extension-point id="serviceRuntimes" name="%XP_serviceRuntimes" />
-
-   <!-- The following extension point is internal, though likely to be made public with changes in a future release. -->
-   <extension-point id="clientRuntimes" name="%XP_clientRuntimes" />
-
-   <!-- The following extension point is internal, though likely to be made public with changes in a future release. -->
-   <extension-point id="tester" name="%XP_tester"/>
-
-<!-- Test Extensions beginning  -->
-
-<extension point="org.eclipse.jst.ws.consumption.ui.tester">
-  <tester
-    id="org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WebServiceSampleTest"
-    label="%SAMPLE_TYPE_WEBSERVICES_ID"
-    testWSDL="no"
-    wsClientImplIds="org.eclipse.jst.ws.client.type.java"
-    moduletypes="webmodule"
-    methodsneeded="true"
-    class="org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample.GSTCWebServiceTester">
-  </tester>
-</extension>
-<extension point="org.eclipse.jst.ws.consumption.ui.tester">
-  <tester
-    id="org.eclipse.jst.ws.internal.consumption.ui.widgets.test.explorer.WebServiceExplorer"
-    label="%WSEXPLORER_ID"
-    testWSDL="yes"
-    wsClientImplIds="org.eclipse.jst.ws.client.type.java"
-    moduletypes="webmodule"
-    methodsneeded="false"
-    class="org.eclipse.jst.ws.internal.consumption.ui.widgets.test.explorer.WSEWebServiceTester">
-  </tester>
-</extension>
-
-<!-- Test Extensions end  -->
-
-<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"
-            objectSelectionWidget="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.JavaBeanSelectionWidget">
-  </webServiceImpl>
-</extension>   
-<extension point="org.eclipse.jst.ws.consumption.ui.wsClientImpl">
-  <webServiceClientImpl
-            id="org.eclipse.jst.ws.client.type.java"
-            label="Java Proxy">
-  </webServiceClientImpl>
-</extension>   
-
-   	<extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
-       <widgetFactory   
-             id="StartClientServer"
-             insertBeforeCommandId="org.eclipse.jst.ws.internal.consumption.ui.extension.PreClientRunCommand"
-             class="org.eclipse.jst.ws.internal.consumption.ui.server.StartClientWidgetFactory"/>
-    </extension>
-    
-    <extension point="org.eclipse.wst.command.env.antScenario">
-        <antScenario
-            class="org.eclipse.jst.ws.internal.consumption.ui.ant.AntClientRootCommandFragment"
-            scenarioType="client"/>
-     </extension>
-     
-     <extension
-           point="org.eclipse.wst.command.env.antDataMapping">
-        <map
-              key="InitialSelection"
-              operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime.ClientRuntimeSelectionWidgetDefaultingCommand"
-              property="InitialInitialSelection"
-              transform="org.eclipse.jst.ws.internal.common.String2SelectionTransformer"/>
-        <map
-              key="InitialSelection"
-              operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.WSDLSelectionWidgetDefaultingCommand"
-              property="InitialSelection"
-              transform="org.eclipse.jst.ws.internal.common.String2SelectionTransformer"/>
-
-        <map
-              key="Client.RuntimeId"
-              operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidgetOutputCommand"
-              property="ClientTypeRuntimeServer"
-              transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/>
-
-        <map
-              key="Client.ServerId"
-              operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidgetOutputCommand"
-              property="ClientTypeRuntimeServer"
-              transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/>
-
-        <map
-              key="Client.TypeId"
-              operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidgetOutputCommand"
-              property="ClientTypeRuntimeServer"
-              transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/>
-        <map
-              key="TestService"
-              operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionDefaultingCommand"
-              property="TestService"/>
-
-        <map
-              key="MonitorService"
-              operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionDefaultingCommand"
-              property="MonitorService"/>              
-
-        <map
-              key="Client.RuntimeId"
-              operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionDefaultingCommand"
-              property="ClientTypeRuntimeServer"
-              transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/>
-        <map
-              key="Client.ServerId"
-              operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionDefaultingCommand"
-              property="ClientTypeRuntimeServer"
-              transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/>     
-        <map
-              key="Client.TypeId"
-              operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionDefaultingCommand"
-              property="ClientTypeRuntimeServer"
-              transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/>        
-        <map
-              key="ClientProjectName"
-              operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionDefaultingCommand"
-              property="ClientProjectName"/>  
-        <map
-              key="ClientEarProjectName"
-              operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionDefaultingCommand"
-              property="ClientEarProjectName"/>         
-        <map
-              key="ClientComponentType"
-              operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionDefaultingCommand"
-              property="ClientComponentType"/>
-        <map
-              key="Client.RuntimeId"
-              operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionFragment"
-              property="ClientTypeRuntimeServer"
-              transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/>                
-        <map
-              key="Client.ServerId"
-              operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionFragment"
-              property="ClientTypeRuntimeServer"
-              transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/>                
-        <map
-              key="Client.TypeId"
-              operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionFragment"
-              property="ClientTypeRuntimeServer"
-              transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/>                
-              
-         <!-- mappings for listing options -->
-        <map
-              key="ListRuntimes"
-              operation="org.eclipse.jst.ws.internal.consumption.ui.command.ListOptionsCommand"
-              property="ListRuntimes"
-              transform="org.eclipse.wst.command.internal.env.ant.String2BooleanTransformer"
-              /> 
-
-  		<map
-              key="ListServers"
-              operation="org.eclipse.jst.ws.internal.consumption.ui.command.ListOptionsCommand"
-              property="ListServers"
-              transform="org.eclipse.wst.command.internal.env.ant.String2BooleanTransformer"
-              />  	
-      </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 ee40db453..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/schema/clientProjectType.exsd
+++ /dev/null
@@ -1,124 +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="Client Project Type"/>
-      </appInfo>
-      <documentation>
-         This extension point defines client container types.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="clientProjectType" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified identifier of the target extension point
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  an optional identifier of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  an optional name of the extension instance
-               </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>
-         &lt;b&gt;This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.&lt;/b&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;
-All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
-this distribution, and is available at &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-      </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 1ec606777..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/schema/objectSelectionWidget.exsd
+++ /dev/null
@@ -1,122 +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="Object Selection Widget"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="objectSelectionWidget" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified identifier of the target extension point
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  an optional identifier of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  an optional name of the extension instance
-               </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.internal.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>
-         &lt;b&gt;This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.&lt;/b&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;
-All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
-this distribution, and is available at &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-      </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 53bdd3c4b..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceClientType.exsd
+++ /dev/null
@@ -1,257 +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="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>
-                  a fully qualified identifier of the target extension point
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  an optional identifier of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  an optional name of the extension instance
-               </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>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         &lt;b&gt;This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.&lt;/b&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;
-All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
-this distribution, and is available at &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</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 cbdd71195..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceServerRuntimeType.exsd
+++ /dev/null
@@ -1,325 +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>
-                  a fully qualified identifier of the target extension point
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  an optional identifier of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  an optional name of the extension instance
-               </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>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         &lt;b&gt;This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.&lt;/b&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;
-All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
-this distribution, and is available at &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</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 20bf63005..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceTest.exsd
+++ /dev/null
@@ -1,138 +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>
-         This extension point defines Web service test facilities that can be plugged into the Web services wizards.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="webServiceTest" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified identifier of the target extension point
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  an optional identifier of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  an optional name of the extension instance
-               </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>
-         &lt;b&gt;This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.&lt;/b&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;
-All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
-this distribution, and is available at &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/ConsumptionUI.properties b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/ConsumptionUI.properties
deleted file mode 100644
index 2b2387b51..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/ConsumptionUI.properties
+++ /dev/null
@@ -1,567 +0,0 @@
-###############################################################################
-# Copyright (c) 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-#  yyyymmdd bug      Email and other contact information
-#  -------- -------- -----------------------------------------------------------
-#  20060204 124143   rsinha@ca.ibm.com - Rupam Kuehner
-#  20060204 124408   rsinha@ca.ibm.com - Rupam Kuehner     
-###############################################################################
-
-#
-# 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
-
-#
-# General messages.
-#
-MSG_ERROR_TASK_EXCEPTED=IWAB0234E An internal error occurred. Details: {0}
-MSG_ERROR_NO_SERVER_RUNTIME=No suitable server can be found for the {0} Web service runtime. Go to Window > Preferences. Select Server > Installed Runtimes and configure one of the following: {1}
-
-
-#
-# 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...
-
-BOTTOMUP_LABEL=Bottom up
-TOPDOWN_LABEL=Top down
-CLIENT_LABEL=Client
-COMBINED_TYPE_AND_RUNTIME_LABEL={0} {1}
-
-
-
-#
-# Wizards.
-#
-WIZARD_TITLE_WSC=Web Service Client
-
-#
-# 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
-#BUTTON_DEPLOY_WEB_PROJECT=Deploy Web service to a server type
-BUTTON_INSTALL_SERVICE_WEB_PROJECT=Install Web service on server
-BUTTON_INSTALL_CLIENT_WEB_PROJECT=Install Web service client on server (managed clients only)
-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 runtimes and deployment servers, or use the default settings.
-LABEL_RUNTIMES_LIST=Web service runtime:
-LABEL_SERVERS_LIST=Server:
-LABEL_EDIT_BUTTON=Edit...
-LABEL_SERVICE_EAR_MODULE=Service EAR module:
-LABEL_CLIENT_EAR_MODULE=Client EAR module:
-LABEL_CLIENT_MODULE=Client module:
-LABEL_SERVICE_MODULE=Service module:
-LABEL_CLIENT_PROJECT=Client project:
-LABEL_SERVICE_PROJECT=Service project:
-LABEL_CLIENT_EAR_PROJECT=Client EAR project:
-LABEL_SERVICE_EAR_PROJECT=Service EAR project:
-
-#
-# Client component type labels
-#
-LABEL_CLIENT_COMP_TYPE_WEB=Web
-LABEL_CLIENT_COMP_TYPE_EJB=EJB
-LABEL_CLIENT_COMP_TYPE_APP_CLIENT=Application Client
-LABEL_CLIENT_COMP_TYPE_CONTAINERLESS=Java
-
-
-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 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={0} does not support the {1} Web service runtime. 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_ERROR_STUB_ONLY={0} has only stub runtimes associated with it. Choose a different server or configure a non-stub runtime in the server preferences. 
-MSG_WARN_STUB_ONLY={0} has only stub runtimes associated with it so the server will not be created or started.
-
-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 {0} cannot be empty. Select a service project {0}.
-MSG_SERVICE_EAR_EMPTY=The service EAR {0} cannot be empty. Select a service EAR {0}.
-MSG_CLIENT_PROJECT_EMPTY=The client project {0} cannot be empty. Select a client project {0}.
-MSG_CLIENT_EAR_EMPTY=The client EAR {0} cannot be empty. Select a client EAR {0}.
-
-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_INVALID_PROJECT_TYPE={0} is not a {1} project. Choose a {1} project, or enter a new project name.
-MSG_MODULE=module
-MSG_MODULE_NAME_AND_PROJECT_NAME_NOT_THE_SAME=The flexible project preference is off. Therefore, project names and module names must be the same for new modules.
-
-MSG_SERVICE_RUNTIME_DOES_NOT_SUPPORT_PROJECT=The {0} Web service runtime does not support the service project {1}.
-MSG_SERVICE_SERVER_DOES_NOT_SUPPORT_PROJECT=The {0} server does not support the service project {1}. 
-MSG_SERVICE_RUNTIME_DOES_NOT_SUPPORT_TEMPLATE=The {0} Web service runtime does not support the service project type {1}.
-MSG_SERVICE_SERVER_DOES_NOT_SUPPORT_TEMPLATE=The {0} server does not support the service project type {1}.
-
-MSG_CLIENT_RUNTIME_DOES_NOT_SUPPORT_PROJECT=The {0} Web service runtime does not support the client project {1}.
-MSG_CLIENT_SERVER_DOES_NOT_SUPPORT_PROJECT=The {0} server does not support the client project {1}.
-MSG_CLIENT_RUNTIME_DOES_NOT_SUPPORT_TEMPLATE=The {0} Web service runtime does not support the client project type {1}.
-MSG_CLIENT_SERVER_DOES_NOT_SUPPORT_TEMPLATE=The {0} server does not support the client project type {1}.
-
-MSG_SAME_CLIENT_AND_SERVICE_EARS=Your selected service and client {0} modules have the same name.  Proceeding with this configuration may result in runtime errors.
-MSG_SAME_CLIENT_AND_SERVICE_COMPONENTS=Your selected service and client {0} modules have the same name.  Proceeding with this configuration will result in runtime errors.
-MSG_SAME_CLIENT_AND_SERVICE_PROJECTS=Your selected service and client projects are the same.  Proceeding with this configuration will result in errors.
-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.
-
-MSG_CLIENT_CANNOT_ASSOCIATE=The client project, {0}, cannot be associated with the EAR, {1}. Choose an EAR with a J2EE level of {2} or higher.
-MSG_SERVICE_CANNOT_ASSOCIATE=The service project, {0}, cannot be associated with the EAR, {1}. Choose an EAR with a J2EE level of {2} or higher.
-
-# WebServiceClientRuntimeSelectionPage
-PAGE_TITLE_WS_CLIENT_RUNTIME_SELECTION=Client Environment Configuration
-PAGE_DESC_WS_CLIENT_RUNTIME_SELECTION=Choose from the list of supported runtimes and servers for the client environment, or use the default settings.
-
-LABEL_CLIENT_SELECTION_VIEW_TITLE=Client-Side Environment Selection:
-LABEL_CLIENT_TYPE=Client Project type:
-LABEL_SERVICE_TYPE=Service Project 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
-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
-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.
-
-#
-# 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
-
-#
-# 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 oriented selection.
-TOOLTIP_PWRS_RADIO_EXPLORE=Explore combinations.
-
-#
-# Tooltips for WebServiceClientRuntimeSelectionPage
-#
-TOOLTIP_PWCR_COMBO_CLIENT_TYPE=Client project type.
-TOOLTIP_PWCR_COMBO_SERVICE_TYPE=Service project 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_INSTALL_SERVICE_WEB_PROJECT=Install the Web service on the server for this scenario.
-TOOLTIP_PWPR_CHECKBOX_INSTALL_CLIENT_WEB_PROJECT=Install the Web service client on the server for this scenario (managed client only). 
-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
-LABEL_VALIDATE_MESSAGES=WSDL validation messages:
-
-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.
-TOOLTIP_VALIDATE_TEXT_MESSAGE=Messages from WSDL validation.
-TOOLTIP_TABLE_VALIDATE_MESSAGE=Use the Web Service Profile Compliance and Validation preference to enable or disable WSDL validation.
-
-#
-# 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.
-
-#
-# Generate Handler Skeleton
-#
-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.
-
-#
-# ClientHandlersWidgetDefaultingCommand
-#
-MSG_ERROR_WEB_SERVICE_CLIENTS_NOT_FOUND=No Web service clients were found. Create a Web service client before configuring Web service client handlers.
-
-#
-# ServiceHandlersWidgetDefaultingCommand
-#
-MSG_ERROR_WEB_SERVICES_NOT_FOUND=No Web services were found.  Create a Web service before configuring Web service handlers.
-MSG_ERROR_WSDD_NOT_FOUND=Unable to launch handler wizard.  No deployment descriptor was found for this Web service.
-#
-# 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
-
-#
-# WSDLSelectionOutputCommand
-#
-MSG_WARNING_NO_SERVICE_ELEMENT=The WSDL file does not contain a Service element.  Therefore a service interface and Java proxy will not be generated and as a result, a Java test client will not be launched.  Click OK to proceed, or click Cancel to select another WSDL file.  Alternately, exit the wizard and use the WSDL editor to create a Service WSDL document.
-
-#
-# CheckWSDLValidationCommand
-#
-STILL_VALIDATING_WSDL=Wizard WSDL validation in Progress.  \n- Click Cancel to cancel the current WSDL validation and continue. \n- Click Cancel and Update to update the preference to always cancel incomplete WSDL validation while traversing the wizard.  \n- Click Wait to wait for WSDL validation to complete.
-CANCEL_VALIDATION_LABEL=Cancel
-CANCEL_VALIDATION_DESCRIPTION=Cancel the current WSDL validation and continue
-CANCEL_ALL_VALIDATION_LABEL=Cancel and Update
-CANCEL_ALL_VALIDATION_DESCRIPTION=Update the preference to always cancel incomplete WSDL validation while traversing the wizard.
-WAIT_VALIDATION_LABEL=Wait
-WAIT_VALIDATION_DESCRIPTION=Wait for WSDL validation to complete
-TASK_LABEL_CHECK_WSDL_VALIDATION=Check for WSDL validation
-TASK_DESC_CHECK_WSDL_VALIDATION=Check if WSDL validation has completed
-WAIT_FOR_WSDL=Do not continue with wizard.  Wait for WSDL validation to complete.
-
-#
-# WSDLValidation messages
-#
-MESSAGE_VALIDATE_NO_WSDL=Wizard WSDL validation is disabled.
-MESSAGE_VALIDATE_REMOTE_WSDL=Wizard WSDL validation is only enabled for remote files.
-MESSAGE_VALIDATE_ALL_WSDL=Wizard WSDL validation is enabled.
-MESSAGE_VALIDATE_IN_PROGRESS=WSDL validation in progress ...
-ERROR_MESSAGES_IN_VALIDATION=The WSDL file contains validation error(s).
-WARNING_MESSAGES_IN_VALIDATION=The WSDL file contains validation warning(s).
-WARNING_IF_CONTINUE=Continuing with the wizard may result in generation or runtime problem.
-VALIDATION_COMPLETED=WSDL validation completes with no warning or error.
-TOOLTIP_VALIDATE_TEXT_MESSAGE_SUMMARY=WSDL validation preference can be changed using the Web Services Profile Compliance and Validation preference.
-
-
-#
-# Start server page
-#
-PAGE_TITLE_WS_START_SERVER=Server startup page
-PAGE_DESC_WS_START_SERVER=Start the server from this page.
-LABEL_START_SERVER_TEXT1=In order to proceed the server "{0}" must be started.
-LABEL_START_SERVER_TEXT2=Once the server is started the "next" button will be enabled.
-LABEL_START_SERVER_TEXT3=The "back" button can be used while the server is starting to
-LABEL_START_SERVER_TEXT4=change any previous settings in this wizard.
-LABEL_START_SERVER_BUTTON=Start server
-TOOLTIP_START_SERVER_BUTTON=Start the server
-TEXT_SERVER_STATUS=Currently the server is {0}.
-TEXT_SERVER_MSG=Server {0}
-TEXT_SERVER_STARTED=started
-TEXT_SERVER_STARTING=starting
-TEXT_SERVER_STOPPED=stopped
-
-#
-# Ant task List options
-#
-
-# Note to translation do not translate keyword RuntimeId
-MSG_INFO_ANT_RUNTIME_HEADING=Web Service Runtime IDs (RuntimeId)
-MSG_INFO_ANT_SERVER_RUNTIME=Server runtime: {0}
-MSG_INFO_ANT_CLIENT_RUNTIME=Client runtime: {0} 
-
-# Note to translation do not translate keyword ServerId
-MSG_INFO_ANT_SERVER_HEADING=Server IDs (ServerId)
-MSG_INFO_ANT_SERVER=Server: {0}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/ConsumptionUIMessages.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/ConsumptionUIMessages.java
deleted file mode 100644
index 8a375494c..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/ConsumptionUIMessages.java
+++ /dev/null
@@ -1,334 +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
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060204 124143   rsinha@ca.ibm.com - Rupam Kuehner          
- * 20060204 124408   rsinha@ca.ibm.com - Rupam Kuehner     
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class ConsumptionUIMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUI";//$NON-NLS-1$
-
-	private ConsumptionUIMessages() {
-		// Do not instantiate
-	}
-
-	public static String PLUGIN_NEW_WIZARD_NAME_WS_CLIENT;
-	public static String ACTION_GENERATE_JAVA_PROXY;
-	public static String CHECKBOX_SHOW_GENERATE_JAVA_PROXY_DIALOG;
-	public static String TOOLTIP_PPAD_CHECKBOX_WSDL2PROXY;
-	public static String TOOLTIP_SRPF_COMBO_SERVER;
-	public static String TOOLTIP_SRPF_COMBO_RUNTIME;
-	public static String TOOLTIP_SRPF_COMBO_J2EE;
-	public static String MSG_ERROR_TASK_EXCEPTED;
-	public static String MSG_ERROR_NO_SERVER_RUNTIME;
-	public static String LABEL_FOLDER_NAME;
-	public static String LABEL_JSP_FOLDER_NAME;
-	public static String LABEL_WEB_PROJECT_NAME;
-	public static String LABEL_WEBSERVICETYPE;
-	public static String LABEL_J2EE_VERSION;
-	public static String LABEL_NA;
-	public static String BUTTON_BROWSE;
-	public static String BUTTON_BROWSE_FILES;
-	public static String BOTTOMUP_LABEL;
-	public static String TOPDOWN_LABEL;
-	public static String CLIENT_LABEL;
-	public static String COMBINED_TYPE_AND_RUNTIME_LABEL;
-	public static String WIZARD_TITLE_WSC;
-	public static String PAGE_TITLE_WS_PROJECT;
-	public static String PAGE_DESC_WS_PROJECT;
-	public static String BUTTON_START_WEB_PROJECT;
-	public static String BUTTON_INSTALL_SERVICE_WEB_PROJECT;
-	public static String BUTTON_INSTALL_CLIENT_WEB_PROJECT;
-	public static String GROUP_SCENARIO_SERVICE;
-	public static String GROUP_SCENARIO_CLIENT;
-	public static String LABEL_WEBSERVICECLIENTTYPE;
-	public static String PAGE_TITLE_WS_RUNTIME_SELECTION;
-	public static String PAGE_DESC_WS_RUNTIME_SELECTION;
-	public static String LABEL_RUNTIMES_LIST;
-	public static String LABEL_SERVERS_LIST;
-	public static String LABEL_EDIT_BUTTON;
-	public static String LABEL_SERVICE_EAR_MODULE;
-	public static String LABEL_CLIENT_EAR_MODULE;
-	public static String LABEL_CLIENT_MODULE;
-	public static String LABEL_SERVICE_MODULE;
-	public static String LABEL_CLIENT_PROJECT;
-	public static String LABEL_SERVICE_PROJECT;
-	public static String LABEL_CLIENT_EAR_PROJECT;
-	public static String LABEL_SERVICE_EAR_PROJECT;
-	public static String LABEL_CLIENT_COMP_TYPE_WEB;
-	public static String LABEL_CLIENT_COMP_TYPE_EJB;
-	public static String LABEL_CLIENT_COMP_TYPE_APP_CLIENT;
-	public static String LABEL_CLIENT_COMP_TYPE_CONTAINERLESS;
-	public static String TOOLTIP_PWRS_TEXT_RUNTIME;
-	public static String TOOLTIP_PWRS_TEXT_SERVER;
-	public static String TOOLTIP_PWRS_J2EE_VERSION;
-	public static String LABEL_SELECTION_VIEW_TITLE;
-	public static String LABEL_SELECTION_VIEW_RUNTIME;
-	public static String LABEL_SELECTION_VIEW_SERVER;
-	public static String LABEL_SELECTION_VIEW_EXPLORE;
-	public static String LABEL_TREE_EXISTING_SERVERS;
-	public static String LABEL_TREE_SERVER_TYPES;
-	public static String MSG_INVALID_SRT_SELECTIONS;
-	public static String MSG_NO_RUNTIME;
-	public static String MSG_NO_SERVER;
-	public static String MSG_ERROR_STUB_ONLY;
-	public static String MSG_WARN_STUB_ONLY;
-	public static String MSG_SERVER_TARGET_MISMATCH;
-	public static String MSG_J2EE_MISMATCH;
-	public static String MSG_SERVICE_PROJECT_EMPTY;
-	public static String MSG_SERVICE_EAR_EMPTY;
-	public static String MSG_CLIENT_PROJECT_EMPTY;
-	public static String MSG_CLIENT_EAR_EMPTY;
-	public static String MSG_INVALID_EJB_PROJECT;
-	public static String MSG_INVALID_WEB_PROJECT;
-	public static String MSG_INVALID_PROJECT_TYPE;
-	public static String MSG_MODULE;
-	public static String MSG_MODULE_NAME_AND_PROJECT_NAME_NOT_THE_SAME;
-    public static String MSG_SERVICE_RUNTIME_DOES_NOT_SUPPORT_PROJECT;
-    public static String MSG_SERVICE_SERVER_DOES_NOT_SUPPORT_PROJECT;
-    public static String MSG_SERVICE_RUNTIME_DOES_NOT_SUPPORT_TEMPLATE;
-    public static String MSG_SERVICE_SERVER_DOES_NOT_SUPPORT_TEMPLATE;
-    public static String MSG_CLIENT_RUNTIME_DOES_NOT_SUPPORT_PROJECT;
-    public static String MSG_CLIENT_SERVER_DOES_NOT_SUPPORT_PROJECT;
-    public static String MSG_CLIENT_RUNTIME_DOES_NOT_SUPPORT_TEMPLATE;
-    public static String MSG_CLIENT_SERVER_DOES_NOT_SUPPORT_TEMPLATE;
-	public static String MSG_SAME_CLIENT_AND_SERVICE_EARS;
-	public static String MSG_SAME_CLIENT_AND_SERVICE_COMPONENTS;
-	public static String MSG_SAME_CLIENT_AND_SERVICE_PROJECTS;
-	public static String MSG_WRONG_CLIENT_PROJECT_TYPE;
-	public static String MSG_CLIENT_SUB;
-	public static String MSG_SERVICE_SUB;
-	public static String MSG_GENERAL_PROJECT_AND_EAR;
-	public static String MSG_EAR_PROJECT_WILL_BE_CREATED;
-	public static String MSG_EAR_WILL_BE_ASSOCIATED;
-	public static String MSG_PROJECT_WILL_BE_CREATED;
-	public static String MSG_EAR_WILL_BE_CREATED;
-	public static String MSG_PROJECT_AND_EAR_CREATED;
-	public static String PAGE_TITLE_WS_CLIENT_RUNTIME_SELECTION;
-	public static String PAGE_DESC_WS_CLIENT_RUNTIME_SELECTION;
-	public static String LABEL_CLIENT_SELECTION_VIEW_TITLE;
-	public static String LABEL_CLIENT_TYPE;
-	public static String LABEL_SERVICE_TYPE;
-	public static String LABEL_WEB;
-	public static String LABEL_EJB;
-	public static String LABEL_NO_LABEL;
-	public static String PAGE_MSG_VALIDATION_INTERNAL_ERROR;
-	public static String PAGE_TITLE_WS_XML2BEAN;
-	public static String PAGE_DESC_N2P_MAPPINGS;
-	public static String MSG_MAPPING_DUPLICATE_ENTRIES;
-	public static String BUTTON_GENERATE_PROXY;
-	public static String PAGE_DESC_WSSKEL_CONFIG;
-	public static String PAGE_TITLE_WSSKEL_CONFIG;
-	public static String TOOLTIP_PBSC_TEXT_SKELETON_FOLDER;
-	public static String TOOLTIP_PBSC_BUTTON_SKELETON_FOLDER_BROWSE;
-	public static String LABEL_SKELETON_ROOT_NAME;
-	public static String LABEL_BEAN_CLASS_NAME;
-	public static String PAGE_MSG_BEAN_CANNOT_BE_EMPTY;
-	public static String BUTTON_BROWSE_CLASSES;
-	public static String PAGE_TITLE_WSTEST;
-	public static String PAGE_DESC_WSTEST;
-	public static String CHECKBOX_TEST_WEBSERVICE;
-	public static String CHECKBOX_MONITOR_WEBSERVICE;
-	public static String MSG_ERROR_UNABLE_TO_LAUNCH_WSDL_TEST;
-	public static String BUTTON_LAUNCH_SERVICE_TEST;
-	public static String PAGE_TITLE_WS_SAMPLE;
-	public static String PAGE_DESC_WS_SAMPLE;
-	public static String BUTTON_TEST;
-	public static String LABEL_TEST_TYPES;
-	public static String BUTTON_RUN_TEST;
-	public static String LABEL_METHODS;
-	public static String LABEL_JSP_PROJECT_NAME;
-	public static String MSG_ERROR_JTS_PROXY_NOT_COMPILED;
-	public static String MSG_ERROR_MALFORMED_URL;
-	public static String BUTTON_SELECT_ALL;
-	public static String BUTTON_DESELECT_ALL;
-	public static String TOOLTIP_PBME_BUTTON_SELECT_ALL;
-	public static String TOOLTIP_PBME_BUTTON_DESELECT_ALL;
-	public static String PAGE_TITLE_WSDL_SELECTION;
-	public static String PAGE_DESC_WSDL_SELECTION;
-	public static String PAGE_TITLE_WS_PUBLISH;
-	public static String PAGE_DESC_WS_PUBLISH;
-	public static String PAGE_TITLE_WS_FIND;
-	public static String PAGE_DESC_WS_FIND;
-	public static String BUTTON_WS_PUBLISH;
-	public static String BUTTON_WS_PUBLISH_PRIVATE_UDDI;
-	public static String BUTTON_WS_FIND;
-	public static String BUTTON_WS_FIND_PRIVATE_UDDI;
-	public static String LABEL_PUBLIC_UDDI_REGISTRIES;
-	public static String LABEL_EJB_BEAN_NAME;
-	public static String TABLE_TITLE_EJB_BEAN_NAMES;
-	public static String TABLE_TITLE_EJB_PROJECT_NAME;
-	public static String LABEL_EAR_PROJECTS;
-	public static String TOOLTIP_EAR_PROJECTS;
-	public static String TOOLTIP_TABLE_BEAN_NAMES;
-	public static String TOOLTIP_PWWS_PAGE;
-	public static String TOOLTIP_PBCL_PAGE;
-	public static String TOOLTIP_PBCL_TEXT_BEAN_CLASS;
-	public static String TOOLTIP_PBCL_BUTTON_BEAN_CLASS_BROWSE;
-	public static String TOOLTIP_PBCL_BUTTON_BEAN_RESOURCE_BROWSE;
-	public static String TOOLTIP_PSTP_COMBOBOX_TEST;
-	public static String TOOLTIP_PSTP_LAUNCH_BUTTON;
-	public static String TOOLTIP_PWRS_PAGE;
-	public static String TOOLTIP_PWRS_LIST_RUNTIMES;
-	public static String TOOLTIP_PWRS_LIST_SERVERS;
-	public static String TOOLTIP_PWRS_RADIO_SERVER;
-	public static String TOOLTIP_PWRS_RADIO_RUNTIME;
-	public static String TOOLTIP_PWRS_RADIO_EXPLORE;
-	public static String TOOLTIP_PWCR_COMBO_CLIENT_TYPE;
-	public static String TOOLTIP_PWCR_COMBO_SERVICE_TYPE;
-	public static String TOOLTIP_PWPR_COMBO_TYPE;
-	public static String TOOLTIP_PWPR_GROUP_SCENARIO_SERVICE;
-	public static String TOOLTIP_PWPR_CHECKBOX_GENERATE_PROXY;
-	public static String TOOLTIP_PWPR_CHECKBOX_START_WEB_PROJECT;
-	public static String TOOLTIP_PWPR_CHECKBOX_INSTALL_SERVICE_WEB_PROJECT;
-	public static String TOOLTIP_PWPR_CHECKBOX_INSTALL_CLIENT_WEB_PROJECT;
-	public static String TOOLTIP_PWPR_CHECKBOX_LAUNCH_WS;
-	public static String TOOLTIP_PWPR_CHECKBOX_TEST_SERVICE;
-	public static String TOOLTIP_PWPR_CHECKBOX_MONITOR_SERVICE;
-	public static String TOOLTIP_PWPR_GROUP_SCENARIO_CLIENT;
-	public static String TOOLTIP_PWPR_COMBO_CLIENTTYPE;
-	public static String TOOLTIP_PWPB_PAGE;
-	public static String TOOLTIP_PWPB_CHECKBOX_WS_LAUNCH;
-	public static String PAGE_WSIL_IMPORT;
-	public static String TITLE_WSIL_IMPORT;
-	public static String DESC_WSIL_IMPORT;
-	public static String PAGE_TITLE_WS_SELECTION;
-	public static String PAGE_DESC_WS_SELECTION;
-	public static String PAGE_MSG_LOADING_WEB_SERVICE_URI;
-	public static String PAGE_MSG_INVALID_WEB_SERVICE_URI;
-	public static String PAGE_MSG_NO_SUCH_FILE;
-	public static String PAGE_MSG_SELECTION_MUST_BE_WSDL;
-	public static String PAGE_MSG_INVALID_WSIL_FILE_NAME;
-	public static String MSG_ERROR_URI_NOT_RESOLVABLE;
-	public static String MSG_ERROR_WSDL_HAS_NO_SERVICE_ELEMENT;
-	public static String LABEL_WSIL_URI;
-	public static String LABEL_BROWSE;
-	public static String LABEL_WSDL;
-	public static String LABEL_WSDL_URI;
-	public static String LABEL_IMPORT;
-	public static String LABEL_ADD;
-	public static String LABEL_REMOVE;
-	public static String LABEL_WS_SELECTION;
-	public static String LABEL_SELECT_WSDL;
-	public static String LABEL_VALIDATE_MESSAGES;
-	public static String TOOLTIP_WSIL_IMPORT_PAGE;
-	public static String TOOLTIP_WSIL_TEXT_WSIL;
-	public static String TOOLTIP_WSIL_BUTTON_BROWSE_WSIL;
-	public static String TOOLTIP_WSIL_TABLE_WSDL;
-	public static String TOOLTIP_PCON_PAGE;
-	public static String TOOLTIP_PCON_TEXT_WS;
-	public static String TOOLTIP_PCON_BUTTON_BROWSE_WS;
-	public static String TOOLTIP_VALIDATE_TEXT_MESSAGE;
-	public static String TOOLTIP_TABLE_VALIDATE_MESSAGE;
-	public static String TOOLTIP_PWSM_PAGE;
-	public static String TOOLTIP_PWSM_CHECKBOX_TEST;
-	public static String TOOLTIP_PWSM_COMBOBOX_TEST;
-	public static String TOOLTIP_PWSM_CHECKBOX_LAUNCH;
-	public static String TOOLTIP_PWSM_TEXT_JSP_FOLDER;
-	public static String TOOLTIP_PWSM_BUTTON_JSP_FOLDER_BROWSE;
-	public static String TOOLTIP_PWSM_BUTTON_SELECT_ALL;
-	public static String TOOLTIP_PWSM_BUTTON_DESELECT_ALL;
-	public static String TOOLTIP_PWSM_COMBO_PROJECT;
-	public static String TOOLTIP_PWSM_TEXT_SAMPLE_FOLDER;
-	public static String TOOLTIP_PWSM_TREE_METHODS;
-	public static String TOOLTIP_PWSM_EAR_PROJECT;
-	public static String DIALOG_TITLE_HTTP_BASIC_AUTH;
-	public static String LABEL_URL;
-	public static String LABEL_HTTP_BASIC_AUTH_USERNAME;
-	public static String LABEL_HTTP_BASIC_AUTH_PASSWORD;
-	public static String TOOLTIP_HTTP_BASIC_AUTH_USERNAME;
-	public static String TOOLTIP_HTTP_BASIC_AUTH_PASSWORD;
-	public static String MSG_ERROR_GENERATE_HANDLER_SKELETON;
-	public static String MSG_ERROR_WRITE_FILE;
-	public static String LABEL_HANDLERS_CONFIG;
-	public static String LABEL_BUTTON_ADD;
-	public static String LABEL_BUTTON_REMOVE;
-	public static String LABEL_BUTTON_MOVE_UP;
-	public static String LABEL_BUTTON_MOVE_DOWN;
-	public static String LABEL_BUTTON_GEN_SKELETON;
-	public static String LABEL_COMBO_SOURCE_LOC;
-	public static String LABEL_COMBO_WS_CLIENT_REF;
-	public static String LABEL_COMBO_WS_SERVICE_DESC;
-	public static String LABEL_HANDLER_NAME;
-	public static String LABLE_HANDLER_CLASS;
-	public static String LABEL_HANDLER_PORT;
-	public static String DIALOG_TITLE_WS_ADD_HANDLER;
-	public static String LABEL_TEXT_HANDLER_NAME;
-	public static String LABEL_TEXT_HANDLER_CLASS;
-	public static String LABEL_TEXT_HANDLER_PORT;
-	public static String PAGE_TITLE_SERVICE_HDLR_CONFIG;
-	public static String PAGE_DESC_SERVICE_HDLR_CONFIG;
-	public static String PAGE_TITLE_CLIENT_HDLR_CONFIG;
-	public static String PAGE_DESC_CLIENT_HDLR_CONFIG;
-	public static String TOOLTIP_EDIT_WS_HANDLERS;
-	public static String TOOLTIP_BUTTON_GEN_SKELETON;
-	public static String TOOLTIP_COMBO_SOURCE_LOC;
-	public static String TOOLTIP_TEXT_HANDLER_NAME;
-	public static String TOOLTIP_TEXT_HANDLER_CLASS;
-	public static String TOOLTIP_TEXT_HANDLER_PORT;
-	public static String TOOLTIP_WS_CLIENT_REF;
-	public static String TOOLTIP_WS_SERVICE_DESC;
-	public static String MSG_ERROR_UNABLE_TO_OPEN_JAVA_EDITOR;
-	public static String MSG_WARN_IS_SERVICE_PROJECT;
-	public static String MSG_USER_ABORTED;
-	public static String MSG_MISSING_THIRD_PARTY_FILES;
-	public static String MSG_WARNING_NO_SERVICE_ELEMENT;
-	public static String STILL_VALIDATING_WSDL;
-	public static String CANCEL_VALIDATION_LABEL;
-	public static String CANCEL_VALIDATION_DESCRIPTION;
-	public static String CANCEL_ALL_VALIDATION_LABEL;
-	public static String CANCEL_ALL_VALIDATION_DESCRIPTION;
-	public static String WAIT_VALIDATION_LABEL;
-	public static String WAIT_VALIDATION_DESCRIPTION;
-	public static String TASK_LABEL_CHECK_WSDL_VALIDATION;
-	public static String TASK_DESC_CHECK_WSDL_VALIDATION;
-	public static String WAIT_FOR_WSDL;
-	public static String MESSAGE_VALIDATE_NO_WSDL;
-	public static String MESSAGE_VALIDATE_REMOTE_WSDL;
-	public static String MESSAGE_VALIDATE_ALL_WSDL;
-	public static String MESSAGE_VALIDATE_IN_PROGRESS;
-	public static String ERROR_MESSAGES_IN_VALIDATION;
-	public static String WARNING_MESSAGES_IN_VALIDATION;
-	public static String WARNING_IF_CONTINUE;
-	public static String VALIDATION_COMPLETED;
-	public static String TOOLTIP_VALIDATE_TEXT_MESSAGE_SUMMARY;
-	public static String PAGE_TITLE_WS_START_SERVER;
-	public static String PAGE_DESC_WS_START_SERVER;
-	public static String LABEL_START_SERVER_TEXT1;
-	public static String LABEL_START_SERVER_TEXT2;
-	public static String LABEL_START_SERVER_TEXT3;
-	public static String LABEL_START_SERVER_TEXT4;
-	public static String LABEL_START_SERVER_BUTTON;
-	public static String TOOLTIP_START_SERVER_BUTTON;
-	public static String TEXT_SERVER_STATUS;
-	public static String TEXT_SERVER_MSG;
-	public static String TEXT_SERVER_STARTED;
-	public static String TEXT_SERVER_STARTING;
-	public static String TEXT_SERVER_STOPPED;
-	public static String MSG_INFO_ANT_RUNTIME_HEADING;
-	public static String MSG_INFO_ANT_SERVER_RUNTIME;
-	public static String MSG_INFO_ANT_CLIENT_RUNTIME;
-	public static String MSG_INFO_ANT_SERVER_HEADING;
-	public static String MSG_INFO_ANT_SERVER;
-    public static String MSG_ERROR_WEB_SERVICE_CLIENTS_NOT_FOUND;
-    public static String MSG_ERROR_WEB_SERVICES_NOT_FOUND;
-    public static String MSG_ERROR_WSDD_NOT_FOUND;
-    public static String MSG_CLIENT_CANNOT_ASSOCIATE;
-    public static String MSG_SERVICE_CANNOT_ASSOCIATE;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, ConsumptionUIMessages.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/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 1266fece9..000000000
--- 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.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.wst.command.internal.env.core.context.TransientResourceContext;
-import org.eclipse.wst.command.internal.env.eclipse.EclipseEnvironment;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseStatusHandler;
-import org.eclipse.wst.ws.internal.explorer.LaunchOption;
-import org.eclipse.wst.ws.internal.explorer.LaunchOptions;
-import org.eclipse.wst.ws.internal.explorer.WSExplorerLauncherCommand;
-import org.eclipse.wst.ws.internal.explorer.plugin.ExplorerPlugin;
-
-
-public class LaunchWSEAction implements IWorkbenchWindowActionDelegate
-{
-  public void run(IAction action)
-  {
-    EclipseStatusHandler             handler     = new EclipseStatusHandler();
-    TransientResourceContext         context     = new TransientResourceContext();
-    EclipseEnvironment               environment = new EclipseEnvironment( null, context, handler ); 
-    WSExplorerLauncherCommand        cmd         = new WSExplorerLauncherCommand();
-    
-    String stateLocation = ExplorerPlugin.getInstance().getPluginStateLocation();
-	String defaultFavoritesLocation = ExplorerPlugin.getInstance().getDefaultFavoritesLocation();
-	LaunchOption[] launchOptions = new LaunchOption[] {
-		new LaunchOption(LaunchOptions.STATE_LOCATION,stateLocation),
-		new LaunchOption(LaunchOptions.DEFAULT_FAVORITES_LOCATION,defaultFavoritesLocation)
-	};
-    cmd.setLaunchOptions(launchOptions);
-    cmd.setEnvironment( environment );
-	  cmd.execute( null, null );
-  }
-  
-  /* (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/ant/AntClientRootCommandFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/ant/AntClientRootCommandFragment.java
deleted file mode 100644
index 12e2438ac..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/ant/AntClientRootCommandFragment.java
+++ /dev/null
@@ -1,193 +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.ant;
-
-import org.eclipse.jst.ws.internal.consumption.common.ScenarioCleanupCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.AntDefaultingOperation;
-import org.eclipse.jst.ws.internal.consumption.ui.command.CheckForServiceProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.ListOptionsCommand;
-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.extension.ClientRootFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.extension.PreClientDevelopCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.CheckWSDLValidationCommand;
-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.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.ClientTestDelegateCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.FinishDefaultCommand;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.ws.internal.extensions.AssembleClientFragment;
-import org.eclipse.wst.ws.internal.extensions.DeployClientFragment;
-import org.eclipse.wst.ws.internal.extensions.DevelopClientFragment;
-
-/**
- * 
- * Command fragment for generating a web service client using Ant task.
- * Run headless Eclipse or within workspace using Run as Ant Build.  This fragment eliminates any UI specific 
- * commands and data mappings between commands and widgets.  Widget to command mappings are
- * replaced by Ant property file to command mappings which are enabled by a antDataMapping extension 
- * point in the org.eclipse.wst.command.env plugin.
- * 
- * @author joan
- *
- */
-
-public class AntClientRootCommandFragment extends SequenceFragment{
-	
-  public AntClientRootCommandFragment()
-  {	 
-	    
-  add( new SimpleFragment( new ScenarioCleanupCommand(), "" ));
-  
-  add( new SimpleFragment(new ListOptionsCommand(), ""));
-  add (new SimpleFragment(new AntDefaultingOperation(), ""));
-  
-  add( new SimpleFragment( new ClientWizardWidgetDefaultingCommand(), "" ) );
-  add( new SimpleFragment( new ClientWizardWidgetOutputCommand(), "" ));
-  add( new SimpleFragment( new WSDLSelectionWidgetDefaultingCommand(), ""));
-  
-  add( new SimpleFragment( new WSDLSelectionOutputCommand(), ""));
-  add( new SimpleFragment( new CheckWSDLValidationCommand(), ""));
-  add( new SimpleFragment( new ClientRuntimeSelectionWidgetDefaultingCommand(), ""));
-  
-  add( new SimpleFragment( new ClientExtensionDefaultingCommand( true ), ""));
-  add( new ClientRootFragment() );
-  add( new SimpleFragment( new ClientExtensionOutputCommand(), "" ) );
- 
-  add(new FinishFragment());
-  
-  add( new SimpleFragment( new ScenarioCleanupCommand(), "" ));
- 
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
-   */
-  public void registerDataMappings(DataMappingRegistry dataRegistry)
-  {     
-      // Map ClientWizardWidgetDefaultingCommand command.
-      dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientWizardWidgetOutputCommand.class);
-      dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "TestService", ClientWizardWidgetOutputCommand.class);
-      dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "ResourceContext", ClientWizardWidgetOutputCommand.class);
-      
-      // Map ClientWizardWidgetOutputCommand command.
-      dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "ClientTypeRuntimeServer", ClientRuntimeSelectionWidgetDefaultingCommand.class);
-      dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "TestService", WSDLSelectionOutputCommand.class);
-      dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "TestService", ClientExtensionDefaultingCommand.class);   
-      dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "TestService", ClientRuntimeSelectionWidgetDefaultingCommand.class);           
-      dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "ResourceContext", ClientRuntimeSelectionWidgetDefaultingCommand.class);      
-      dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "ResourceContext", ClientExtensionDefaultingCommand.class);
-      
-      // Map ClientRuntimeSelectionWidgetDefaultingCommand command
-      dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientRuntimeId", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "Runtime2ClientTypes", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarComponentName", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentName", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentType", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientJ2EEVersion", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientNeedEAR", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "Runtime2ClientTypes", CheckForServiceProjectCommand.class);
-      
-//    Map AntDefaultingOperation      
-      dataRegistry.addMapping(AntDefaultingOperation.class, "ClientIdsFixed", ClientRuntimeSelectionWidgetDefaultingCommand.class);
-      dataRegistry.addMapping(AntDefaultingOperation.class, "StartService", PreClientDevelopCommand.class);
-      dataRegistry.addMapping(AntDefaultingOperation.class, "InstallClient", PreClientDevelopCommand.class);        
-          
-      // Map WSDLSelectionWidgetDefaultingCommand command.
-      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);
-      dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "ComponentName", WSDLSelectionOutputCommand.class);
-      
-      // WSDLSelectionOutputCommand
-      dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WsdlURI", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WebServicesParser", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "Project", ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialProject", null);
-      dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WsdlURI", ClientRuntimeSelectionWidgetDefaultingCommand.class);
-      dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "ComponentName", ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialComponentName", null);
-      dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WebServicesParser", ClientRuntimeSelectionWidgetDefaultingCommand.class);
-      dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WsdlURI", CheckForServiceProjectCommand.class);
-      dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WebServicesParser", CheckForServiceProjectCommand.class);      
-	  
-      // Setup the PreClientDevelopCommand.  
-      dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientRuntimeId", PreClientDevelopCommand.class );
-      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, "GenerateProxy", ClientTestFragment.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientNeedEAR", ClientTestDelegateCommand.class);
-	  dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientEarProjectName", ClientTestDelegateCommand.class);
-	  dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientEarComponentName", ClientTestDelegateCommand.class);
-	  dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject",ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", ClientTestDelegateCommand.class);      
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "WsdlURI", ClientTestDelegateCommand.class);
-      
-      // Map ClientExtensionOutputCommand command.
-	  dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ServerInstanceId", FinishDefaultCommand.class);
-
-      // MAP post server config call      
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", ClientExtensionOutputCommand.class, "EarProjectName", null);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServerInstance", ClientExtensionOutputCommand.class, "ExistingServerId", null);     
-            
-      //Mappings to enable peek-ahead for Page 3 of the client wizard
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "WebService", DevelopClientFragment.class );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Environment", DevelopClientFragment.class );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Context", DevelopClientFragment.class );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Selection", DevelopClientFragment.class );
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", DevelopClientFragment.class, "Project", null );
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentName", DevelopClientFragment.class, "Module", null );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", DevelopClientFragment.class, "EarProject", null );
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarComponentName", DevelopClientFragment.class, "Ear", null );
-    
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "WebService", AssembleClientFragment.class );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Environment", AssembleClientFragment.class );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Context", AssembleClientFragment.class );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Selection", AssembleClientFragment.class );
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", AssembleClientFragment.class, "Project", null );
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentName", AssembleClientFragment.class, "Module", null );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", AssembleClientFragment.class, "EarProject", null );
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarComponentName", AssembleClientFragment.class, "Ear", null );
-    
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "WebService", DeployClientFragment.class );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Environment", DeployClientFragment.class );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Context", DeployClientFragment.class );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Selection", DeployClientFragment.class );
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", DeployClientFragment.class, "Project", null );
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentName", DeployClientFragment.class, "Module", null );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", DeployClientFragment.class, "EarProject", null );
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarComponentName", DeployClientFragment.class, "Ear", null );  
-          
-   }        
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/AntDefaultingOperation.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/AntDefaultingOperation.java
deleted file mode 100644
index 9e0dfc093..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/AntDefaultingOperation.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.eclipse.jst.ws.internal.consumption.ui.command;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public class AntDefaultingOperation extends AbstractDataModelOperation{
-
-	public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		// TODO Auto-generated method stub
-		return Status.OK_STATUS;
-	}
-	
-	public boolean getServiceIdsFixed()
-	{
-		return true;
-	}
-
-	public boolean getClientIdsFixed()
-	{
-		return true;
-	}
-	
-	public boolean getStartService()
-	{
-		return false;	
-	}
-	
-	public boolean getInstallService()
-	{
-		return false;
-	}
-}
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 1b4d032cc..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/CheckForServiceProjectCommand.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.common.ValidationUtils;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.StatusException;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.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 AbstractDataModelOperation
-{
-  //SelectionListChoices runtime2ClientTypes;
-  String clientProjectName;
-  String wsdlURI;
-  WebServicesParser webServicesParser;
-    
-  public CheckForServiceProjectCommand()
-  {
-  }
-  
-
-  public void setClientProjectName(String name)
-  {
-    clientProjectName = name;
-  }
-  
-  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.internal.env.core.common.Environment)
-   */
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    IEnvironment environment = getEnvironment();
-    IStatus status = Status.OK_STATUS;
-    if (clientProjectName==null || wsdlURI==null || wsdlURI.length()==0 || webServicesParser==null)
-      return status;
-    
-    if (clientProjectName==null || clientProjectName.length()==0)
-      return status;
-    
-    IProject clientProject = ProjectUtilities.getProject(clientProjectName);
-    ValidationUtils vu = new ValidationUtils();
-    boolean isServiceProject = vu.isProjectServiceProject(clientProject, wsdlURI, webServicesParser);
-    if (isServiceProject)
-    {
-      IStatus wStatus = StatusUtils.warningStatus( NLS.bind(ConsumptionUIMessages.MSG_WARN_IS_SERVICE_PROJECT, new String[]{clientProjectName}) );
-      try
-      {
-        environment.getStatusHandler().report(wStatus);
-      }
-      catch (StatusException se)
-      {
-        //User decided to abort. Return an error status
-        IStatus eStatus = StatusUtils.errorStatus( ConsumptionUIMessages.MSG_USER_ABORTED );
-        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 14c3c0b55..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/GenerateHandlerSkeletonCommand.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.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.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EnvironmentUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-
-public class GenerateHandlerSkeletonCommand extends AbstractDataModelOperation
-{
-  private IPath outputLocation_;
-  private String[] handlerNames_;
-  private boolean genSkeleton_;
-  private String handlerNameForEdit_ = null;
-  
-  public GenerateHandlerSkeletonCommand()
-  {
-  }
-  
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    IEnvironment env          = getEnvironment();
-    MultiStatus status       = null;
-    IStatus     returnStatus = Status.OK_STATUS;
-  	
-  	if (!genSkeleton_)	return returnStatus; 
-  	
-  	int i;
-  	boolean error = false;
-  	
-  	IStatus writeStatus;	
-  	
-  	
-    for (i=0; i<handlerNames_.length; i++) 
-    {
-    	writeStatus = writeFile(env, handlerNames_[i], outputLocation_, monitor );
-    	// handle status return
-    	if (writeStatus.getSeverity() == Status.ERROR) 
-      {  // write status is OK or ERROR
-    		error = true;
-    		if (status == null) 
-        {
-    			status = StatusUtils.multiStatus( ConsumptionUIMessages.MSG_ERROR_GENERATE_HANDLER_SKELETON, new IStatus[0] );
-    		}
-    		status.add(writeStatus);
-    	} 
-    }
-    
-    if (error) 
-    {
-       env.getStatusHandler().reportError(status);
-       returnStatus = status;
-    }
-    
-  	return returnStatus;
-  }
-  
-  private IStatus writeFile (IEnvironment env, String className, IPath outputLocation, IProgressMonitor monitor ) 
-  {
-  	IStatus status = Status.OK_STATUS;
-  	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, monitor, 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 = Status.OK_STATUS;	
-  	} 
-    catch (IOException e) 
-    {
-  		status = StatusUtils.errorStatus( NLS.bind(ConsumptionUIMessages.MSG_ERROR_WRITE_FILE, new String[]{ className }), e );
-  		if (bw != null) {
-  			try {
-  				bw.close();
-  			} catch (IOException e1) {
-  			}
-  		}
-  	}
-  	return status;
-  }
-  
-  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/ListOptionsCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/ListOptionsCommand.java
deleted file mode 100644
index d51a7c21f..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/ListOptionsCommand.java
+++ /dev/null
@@ -1,122 +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.command;
-
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.core.ServerCore;
-
-/**
- * Command lists valid property values where requested.
- * Requests made via a Ant property value setting which is mapped to this command in the plugin.xml 
- */
-
-public class ListOptionsCommand extends AbstractDataModelOperation {
-
-	private boolean runtimes_ = false;
-	private boolean servers_ = false;
-	
-	public IStatus execute(IProgressMonitor monitor, IAdaptable info)
-			throws ExecutionException {
-				  	
-		if (runtimes_)
-		{				
-				String[] typeIds = WebServiceRuntimeExtensionUtils2.getServiceTypeLabels().getIds_();
-			    Vector runtimeIds = new Vector();
-					for (int k = 0; k < typeIds.length; k++) {
-						
-						String typeId = typeIds[k];						
-				    	String[] runtimes = WebServiceRuntimeExtensionUtils2.getRuntimesByServiceType(typeId);				    	
-								    
-				    	for (int j = 0; j < runtimes.length; j++) {
-				    		String runtime = runtimes[j];
-				    		if (!runtimeIds.contains(runtime))
-				    		{
-				    			runtimeIds.add(runtime);	
-				    		}
-						}
-					}
-		
-					Status statusObj = new Status(IStatus.INFO, 
-							WebServiceConsumptionUIPlugin.ID,
-							IStatus.OK,
-							ConsumptionUIMessages.MSG_INFO_ANT_RUNTIME_HEADING, 
-							null);					
-					getEnvironment().getStatusHandler().reportInfo(statusObj);
-					
-	        
-			for (Iterator iterator = runtimeIds.iterator(); iterator
-					.hasNext();) {			
-				  getEnvironment().getStatusHandler().reportInfo(new Status(IStatus.INFO, 
-						WebServiceConsumptionUIPlugin.ID,
-						IStatus.OK, 
-						NLS.bind(ConsumptionUIMessages.MSG_INFO_ANT_SERVER_RUNTIME,
-								iterator.next()), null));
-			}
-				
-			
-		    String[] clientRuntimes = WebServiceRuntimeExtensionUtils2.getAllRuntimesForClientSide();
-		    
-			for (int i = 0; i < clientRuntimes.length; i++) {				
-				
-				getEnvironment().getStatusHandler().reportInfo(new Status(IStatus.INFO, 
-						WebServiceConsumptionUIPlugin.ID,
-						IStatus.OK, 
-						NLS.bind(ConsumptionUIMessages.MSG_INFO_ANT_CLIENT_RUNTIME,
-								clientRuntimes[i]), null));
-			}
-		}
-		
-		if (servers_)
-		{			
-			getEnvironment().getStatusHandler().reportInfo(new Status(IStatus.INFO, 
-					WebServiceConsumptionUIPlugin.ID,
-					IStatus.OK, 
-					ConsumptionUIMessages.MSG_INFO_ANT_SERVER_HEADING, null));
-			
-			IServerType[] serverTypes = ServerCore.getServerTypes();
-		      for (int i=0; i<serverTypes.length; i++)
-		      {		        
-				getEnvironment().getStatusHandler().reportInfo(new Status(IStatus.INFO, 
-						WebServiceConsumptionUIPlugin.ID,
-						IStatus.OK, 
-						NLS.bind(ConsumptionUIMessages.MSG_INFO_ANT_SERVER,
-								serverTypes[i].getId()), null));
-
-		      }
-		}  
-		  
-		return OK_STATUS;
-	}
-	
-	public void setListRuntimes(boolean value)
-	{		
-		runtimes_=value;
-	}
-	
-	public void setListServers(boolean value)
-	{		
-		servers_=value;
-	}
-}
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 deae7fbb1..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/OpenJavaEditorCommand.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.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.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.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ui.progress.UIJob;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-public class OpenJavaEditorCommand extends AbstractDataModelOperation
-{
-  private List classNames;
-  private IProject project;
-
-  public OpenJavaEditorCommand()
-  {
-  }
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    OpenJavaEditorJob job = new OpenJavaEditorJob(classNames, project);
-    job.setPriority(Job.LONG);
-    job.schedule();
-    return Status.OK_STATUS;
-  }
-
-  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, NLS.bind(ConsumptionUIMessages.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, NLS.bind(ConsumptionUIMessages.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/PublishProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/PublishProjectCommand.java
deleted file mode 100644
index 1336782f3..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/PublishProjectCommand.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.command;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.core.common.ProgressUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.ILog;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.internal.Server;
-
-public class PublishProjectCommand extends AbstractDataModelOperation 
-{
-
-
-private String project;
-private String serverTypeID;
-private IServer existingServer;
-
-
-/**
- * Default CTOR;
- */
-public PublishProjectCommand() {
-}
-
-/**
- * Execute the command
- */
-public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-{
-  IEnvironment env = getEnvironment();
-  
-  IStatus status = Status.OK_STATUS;
-  try
-  {
-    ProgressUtils.report( monitor, ConsumptionMessages.PROGRESS_INFO_PUBLISH_WEB_PROJECT );
-    
-    if (project == null){
-      status = StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_PROJECT_NOT_FOUND ); 
-      env.getStatusHandler().reportError(status);
-      return status;
-    }
-	
-    IProject iProject = (IProject)ResourceUtils.findResource(project);
-    IServer instance = ServerUtils.getServerForModule(ServerUtils.getModule(iProject), serverTypeID, existingServer, true, monitor);
-    if (instance == null)
-    {
-      status = StatusUtils.errorStatus(ConsumptionMessages.MSG_ERROR_INSTANCE_NOT_FOUND);
-      env.getStatusHandler().reportError(status);
-      return status;
-    }
-
-    if (((Server)instance).shouldPublish()) {
-      IStatus returnedStatus = publish(instance,IServer.PUBLISH_INCREMENTAL, monitor);
-      status = returnedStatus;
-      
-      //getStatusMonitor().reportStatus (instance.publish(getProgressMonitor()));
-      env.getLog().log(ILog.OK, 5026, this, "execute", new String("project="+project+" successfully published"));
-      //ILog.write(PublishProjectCommand.class,"execute",ILog.OK,"project="+project+" successfully published");
-    }
-      return status;
-  }
-  catch (Exception e) {
-    status = StatusUtils.errorStatus(ConsumptionMessages.MSG_ERROR_PUBLISH, e);
-    env.getStatusHandler().reportError(status);
-    return status;
-
-  }
-}
-
-private IStatus publish(final IServer server, final int kind, IProgressMonitor monitor )
-{
-	final IStatus[] istatus = new IStatus[1];
-	istatus[0] = Status.OK_STATUS;
-	monitor.subTask(ConsumptionMessages.PROGRESS_INFO_PUBLISHING_SERVER);
-
-	IRunnableWithProgress runnable = new IRunnableWithProgress()
-	{
-		public void run(IProgressMonitor shellMonitor) throws InvocationTargetException, InterruptedException
-		{
-			istatus[0] = server.publish(kind, shellMonitor);
-		}  		
-	};
-
-	try
-	{
-		PlatformUI.getWorkbench().getProgressService().run(true,false,runnable);
-	}
-	catch(InvocationTargetException ite)
-	{
-		istatus[0] = new org.eclipse.core.runtime.Status( IStatus.ERROR, "id", 0, ite.getMessage(), ite );
-		ite.printStackTrace();
-	}
-	catch(InterruptedException ie)
-	{
-		istatus[0] = new org.eclipse.core.runtime.Status( IStatus.ERROR, "id", 0, ie.getMessage(), ie );
-		ie.printStackTrace();
-	}
-  
-	return istatus[0];
-}
-
-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.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/StartServerCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/StartServerCommand.java
deleted file mode 100644
index 1a42b5348..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/StartServerCommand.java
+++ /dev/null
@@ -1,204 +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.command;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.EnvironmentService;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.ILog;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.internal.Server;
-
-/**
- * (Re)Starts and publishes the server specifed by the serverInstanceId attribute.
- * 
- *
- */
-public class StartServerCommand extends AbstractDataModelOperation
-{
-  private ILog log;
-  private boolean doAsyncPublish_;
-  
-  private String serverInstanceId;
-	
-  
-  public StartServerCommand()
-  {
-    log             = EnvironmentService.getEclipseLog();
-    doAsyncPublish_ = true;
-  }
-	 
-  public StartServerCommand( boolean doAsyncPublish )
-  {
-    this();
-    
-    doAsyncPublish_ = doAsyncPublish;
-  }
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    IEnvironment env = getEnvironment();
-    IStatus status = Status.OK_STATUS;
-
-    IServer server = ServerCore.findServer(serverInstanceId);
-    if (server == null)
-    {
-      status = StatusUtils.errorStatus(ConsumptionMessages.MSG_ERROR_INSTANCE_NOT_FOUND);
-      env.getStatusHandler().reportError(status);
-      return status;
-    }
-
-    int serverState = server.getServerState();
-
-    //  Publish if required
-    if (((Server)server).shouldPublish()) {
-    	if (server.canPublish().getSeverity() == IStatus.OK)
-        {
-          status = publish(server, IServer.PUBLISH_INCREMENTAL, monitor );
-          if (status.getSeverity() == Status.ERROR)
-          {
-            env.getStatusHandler().reportError(status);
-            return status;
-          }
-        }
-    }
-    
-    //  start/restart server if required
-    	
-    switch (serverState)
-    {
-      case IServer.STATE_STOPPED:
-        if (server.canStart(ILaunchManager.RUN_MODE).getSeverity()==IStatus.OK)
-        {
-          status = start(server, monitor );
-          if (status.getSeverity() == Status.ERROR)
-          {
-            env.getStatusHandler().reportError(status);
-            return status;
-          }       
-        }
-        break;
-      case IServer.STATE_STARTED:    	
-    	boolean shouldRestart = ((Server)server).shouldRestart();    	
-    	
-    	if (shouldRestart && server.canRestart(ILaunchManager.RUN_MODE).getSeverity()==IStatus.OK)
-        {
-          status = restart(server, monitor );
-          if (status.getSeverity() == Status.ERROR)
-          {
-            env.getStatusHandler().reportError(status);
-            return status;
-          }       
-        }
-    }
-    
-    return status;
-  }
-
-  private IStatus publish(final IServer server, final int kind, IProgressMonitor monitor )
-  {
-    IStatus status = Status.OK_STATUS;
-    final IStatus[] istatus = new IStatus[1]; 
-    monitor.subTask(ConsumptionMessages.PROGRESS_INFO_PUBLISHING_SERVER);
-    IRunnableWithProgress runnable = new IRunnableWithProgress()
-	{
-  		public void run(IProgressMonitor shellMonitor) throws InvocationTargetException, InterruptedException
-		{
-  			istatus[0] = server.publish(kind, shellMonitor);
-		}  		
-	};
-	
-	try
-	{
-		if( doAsyncPublish_ )
-		{	
-		  PlatformUI.getWorkbench().getProgressService().run(true,false,runnable);
-		}
-		else
-		{
-		  runnable.run( monitor );
-		}
-		
-	}
-	catch(InvocationTargetException ite)
-	{
-	  istatus[0] = new org.eclipse.core.runtime.Status( IStatus.ERROR, "id", 0, ite.getMessage(), ite );
-	  ite.printStackTrace();
-	}
-	catch(InterruptedException ie)
-	{
-	  istatus[0] = new org.eclipse.core.runtime.Status( IStatus.ERROR, "id", 0, ie.getMessage(), ie );
-	  ie.printStackTrace();
-	}
-    
-    
-	if (istatus[0].getSeverity() != IStatus.OK)
-    {
-      status = istatus[0];
-      return status;
-    }
-    
-    log.log(ILog.INFO, 5051, this, "publishProject", "IServer=" + server + ", Publish command completed");
-    return status;
-  }
-
-  private IStatus restart(IServer server, IProgressMonitor monitor )
-  {
-    IStatus status = Status.OK_STATUS;
-    try
-    {
-      monitor.subTask(ConsumptionMessages.PROGRESS_INFO_STARTING_SERVER);
-      server.synchronousRestart(ILaunchManager.RUN_MODE, monitor);
-      log.log(ILog.INFO, 5052, this, "execute", "IServer=" + server + ", Restart command completed");
-      return status;
-    } catch (CoreException e)
-    {
-      status = StatusUtils.errorStatus(ConsumptionMessages.MSG_ERROR_SERVER, e);
-      return status;
-    }
-
-  }
-
-  private IStatus start(IServer server, IProgressMonitor monitor )
-  {
-    IStatus status = Status.OK_STATUS;
-    try
-    {
-      monitor.subTask(ConsumptionMessages.PROGRESS_INFO_STARTING_SERVER);
-      server.synchronousStart(ILaunchManager.RUN_MODE, monitor);
-      log.log(ILog.INFO, 5053, this, "execute", "IServer=" + server + ", Start command completed");
-      return status;
-    } catch (CoreException e)
-    {
-      status = StatusUtils.errorStatus(ConsumptionMessages.MSG_ERROR_SERVER, e);
-      return status;
-    }
-  }
-
-  public void setServerInstanceId(String serverInstanceId)
-  {
-    this.serverInstanceId = serverInstanceId;
-  }	
-}
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 ed3332a3c..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/WSINonCompliantRuntimeCommand.java
+++ /dev/null
@@ -1,78 +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.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.WstWSPluginMessages;
-import org.eclipse.wst.ws.internal.plugin.WSPlugin;
-import org.eclipse.wst.ws.internal.preferences.PersistentWSIAPContext;
-import org.eclipse.wst.ws.internal.preferences.PersistentWSISSBPContext;
-import org.eclipse.wst.ws.internal.preferences.WSIComplianceUtils;
-
-
-
-public class WSINonCompliantRuntimeCommand extends AbstractDataModelOperation
-{
-
-  private IProject serviceProject_;
-	
-  public WSINonCompliantRuntimeCommand()
-  {
-  } 
-  
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    IEnvironment environment = getEnvironment();
-    
-  	PersistentWSISSBPContext wsiSSBPContext = WSPlugin.getInstance().getWSISSBPContext(); 
-  	PersistentWSIAPContext wsiAPContext = WSPlugin.getInstance().getWSIAPContext(); 
-    Vector statusSSBP = new Vector();
-    statusSSBP.add( new Status( WSIComplianceUtils.getWSISeverity(serviceProject_, wsiSSBPContext), "id", 0,
-        WstWSPluginMessages.WSI_SSBP_INCOMPLIANT_RUNTIME, null ) );
-    Status[] statusesSSBP = (Status[]) statusSSBP.toArray(new Status[statusSSBP.size()]);
-    
-    Vector statusAP = new Vector();
-    statusAP.add( new Status( WSIComplianceUtils.getWSISeverity(serviceProject_, wsiAPContext), "id", 0, 
-    		WstWSPluginMessages.WSI_AP_INCOMPLIANT_RUNTIME, null ));
-    Status[] statusesAP = (Status[]) statusAP.toArray(new Status[statusAP.size()]);
-
-    if (WSIComplianceUtils.checkWSICompliance (environment.getStatusHandler(), statusesAP, serviceProject_, wsiAPContext)) 
-    {
-    	if (WSIComplianceUtils.checkWSICompliance (environment.getStatusHandler(), statusesSSBP, serviceProject_, wsiSSBPContext)) 
-      {
-    		return Status.OK_STATUS;
-    	} 
-      else 
-      {
-    		return StatusUtils.errorStatus( WstWSPluginMessages.NOT_OK );
-    	}
-    } 
-    else 
-    {
-		  return StatusUtils.errorStatus( WstWSPluginMessages.NOT_OK );
-	}
-  }
-  
-  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 8387d2e62..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/EclipseIPath2URLStringTransformer.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.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.internal.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 37c5817d7..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ProjectName2IProjectTransformer.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.consumption.ui.command.data;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-
-public class ProjectName2IProjectTransformer implements Transformer
-{
-  public Object transform(Object value)
-  {
-	String project     = (String)value;
-	int    slashIndex  = project.indexOf( '/' );
-	String projectName = project;
-	
-	if( slashIndex != -1 )
-	{
-	  projectName = project.substring( 0, slashIndex );
-	}
-	
-    return ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
-  }
-}
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 3ba0cd072..000000000
--- 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.internal.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.internal.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 e1160c50a..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ServerName2IServerTransformer.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.ui.command.data;
-
-import org.eclipse.wst.command.internal.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)
-  {
-    {
-      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/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 a603ed932..000000000
--- 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.internal.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 6943c0fee..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ServerSelectionUtils.java
+++ /dev/null
@@ -1,570 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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.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.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeInfo;
-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 componentName, 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[] configuredServers = ServerUtil.getServersByModule(ServerUtils.getModule(project), null);
-    IServer firstSupportedServer = getFirstSupportedServer(configuredServers, runtimeId );
-    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, runtimeId);
-        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, runtimeId);
-      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,runtimeId); 
-    if ( compatServerInfo != null)
-    {
-      return compatServerInfo;
-    }
-    
-    //No existing compatible server, pick a type.
-    String factoryId = getFirstSupportedServerType(runtimes, runtimeId);
-    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 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, runtimeId );
-    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, runtimeId);
-        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 runtime id. 
-   * Returns null of there are no supported servers in the array.
-   */
-  public static IServer getFirstSupportedServer(IServer[] servers, String webServiceRuntimeId)
-  {
-    //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 (WebServiceRuntimeExtensionUtils.doesRuntimeSupportServer(webServiceRuntimeId, 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 webServiceRuntimeId)
-  {
-    String runtimeId = runtimeTarget.getRuntimeType().getId();
-    WebServiceRuntimeInfo wsrt = WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(webServiceRuntimeId);
-    String[] serverFactoryIds = wsrt.getServerFactoryIds();
-    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 webServiceRuntimeId.
-   * Returns null if there are none.
-   */
-  public static String getFirstSupportedServerType(List runtimeTargets, String webServiceRuntimeId)
-  {
-    for (int i=0; i<runtimeTargets.size(); i++ )
-    {
-      IRuntime runtimeTarget = (IRuntime)runtimeTargets.get(i);
-      String factoryId = getFirstSupportedServerType(runtimeTarget, webServiceRuntimeId);
-      if (factoryId != null && factoryId.length()>0)
-        return factoryId;
-    }
-    
-    return null;
-  }  
-  /*
-   * Return the factory id of the first server type compatible with the runtimeTargets and typeId.
-   * Returns null if there are none.
-   * @deprecated
-   */
-  /*
-  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.
-   * @deprecated
-   */
-  public static String[] getCompatibleExistingServer(List runtimeTargets, String webServiceRuntimeId)
-  {
-    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, webServiceRuntimeId);
-      if (compatServer != null)
-      {
-        serverInfo[0] = compatServer.getServerType().getId();
-        serverInfo[1] = compatServer.getId();
-        return serverInfo;
-      }
-    }
-    return null;
-  }
-  
-  /*
-   * 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.
-   * @deprecated
-   */
-  /*
-  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;
-  }
-  
-  /**
-   * 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];
-    
-    //Get all possible valid servers. If there are none, we can't default intelligently, return null.
-
-    WebServiceRuntimeInfo wsrt = WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(webServiceRuntimeId);
-    String[] validServerFactoryIds = wsrt.getServerFactoryIds();
-    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[i];
-          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 d7dd937fc..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ValidationUtils.java
+++ /dev/null
@@ -1,496 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-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.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.internal.webservice.helper.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.server.core.FacetUtil;
-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.FacetUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.selection.SelectionListChoices;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.common.project.facet.core.VersionFormatException;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-/**
- *
- */
-public class ValidationUtils
-{
-
-  /**
-   * 
-   */
-  public ValidationUtils()
-  {
-  }
-  
-  public boolean doesServerSupportProject(String serverFactoryId, String projectName)
-  {
-    IProject project = ProjectUtilities.getProject(projectName);
-    IFacetedProject fProject = null;
-    if (project.exists())
-    {
-      try
-      {
-        fProject = ProjectFacetsManager.create(project);
-      } catch (CoreException ce)
-      {
-
-      }
-      
-      if (fProject != null)
-      {
-        Set facets = fProject.getProjectFacets();
-        return doesServerSupportFacets(serverFactoryId, facets);
-      }
-      else
-      {
-        //If it's not a faceted project, we have nothing to compare to - assume it's good.
-        return true;
-      }
-    }
-    else
-    {
-      //If the project doesn't exist, we have nothing to compare to - assume it's good.
-      return true;      
-    }
-    
-  }
-
-  public boolean doesServerSupportFacets(String serverFactoryId, Set facets)
-  {
-    Set runtimes = FacetUtils.getRuntimes(new Set[]{facets});
-    Iterator itr = runtimes.iterator();
-    IServerType st = ServerCore.findServerType(serverFactoryId);        
-    String runtimeTypeId = st.getRuntimeType().getId();
-    while (itr.hasNext())
-    {
-      org.eclipse.wst.common.project.facet.core.runtime.IRuntime fRuntime = (org.eclipse.wst.common.project.facet.core.runtime.IRuntime)itr.next();
-      IRuntime sRuntime = FacetUtil.getRuntime(fRuntime);
-      if (runtimeTypeId.equals(sRuntime.getRuntimeType().getId()))
-      {
-        //found a match
-        return true;
-      }
-    }
-    
-    return false;    
-  }
-  
-  public boolean doesServerSupportTemplate(String serverFactoryId, String templateId)
-  {
-    IFacetedProjectTemplate template = ProjectFacetsManager.getTemplate(templateId);
-    Set templateFacets = template.getFixedProjectFacets();
-    Iterator templateFacetsItr = templateFacets.iterator();
-    while (templateFacetsItr.hasNext())
-    {
-      boolean serverSupportsThisOne = false;
-      IProjectFacet fixedFacet = (IProjectFacet)templateFacetsItr.next();      
-      List versions = null;
-      try
-      {
-        versions = fixedFacet.getSortedVersions(true);
-      } catch (VersionFormatException e)
-      {
-        Set versionSet = fixedFacet.getVersions();
-        Iterator itr = versionSet.iterator();
-        versions = new ArrayList();
-        while (itr.hasNext())
-        {
-            versions.add(itr.next());
-        }            
-      } catch (CoreException e)
-      {
-        Set versionSet = fixedFacet.getVersions();
-        Iterator itr = versionSet.iterator();
-        versions = new ArrayList();
-        while (itr.hasNext())
-        {
-            versions.add(itr.next());
-        }            
-      } 
-      Iterator versionsItr = versions.iterator();
-      while(versionsItr.hasNext())
-      {
-        IProjectFacetVersion pfv = (IProjectFacetVersion)versionsItr.next();
-        Set pfvs = new HashSet();
-        pfvs.add(pfv);
-        if (doesServerSupportFacets(serverFactoryId, pfvs))
-        {
-          serverSupportsThisOne = true;
-          break;
-        }        
-      }
-      
-      if (!serverSupportsThisOne)
-      {
-        return false;
-      }
-    }
-    
-    return true;
-  }
-  
-  public IStatus validateProjectTargetAndJ2EE(String projectName, String compName, String earName, String earCompName, String serverFactoryId, String j2eeLevel)
-  {
-    IProject p = ProjectUtilities.getProject(projectName);
-    IProject earP = null;
-    if (earName!=null && !earName.equalsIgnoreCase("")) {
-    	earP = ProjectUtilities.getProject(earName);
-    }
-    IStatus targetStatus = doesProjectTargetMatchServerType(p, serverFactoryId);
-    if (earP!=null && targetStatus.getSeverity()==Status.OK)
-    {
-      //check the EAR      
-      IStatus earTargetStatus = doesProjectTargetMatchServerType(earP, serverFactoryId);
-      if(earTargetStatus.getSeverity()==Status.ERROR)
-      {
-        return earTargetStatus;
-      }            
-    }
-    else
-    {
-      return targetStatus;
-    }
-    
-
-    //Validate service side J2EE level    
-    IStatus j2eeStatus = doesProjectMatchJ2EELevel(p, compName, j2eeLevel);
-    if(earP!=null && j2eeStatus.getSeverity()==Status.OK)
-    {
-      IStatus earJ2EEStatus = doesProjectMatchJ2EELevel(earP, earCompName, j2eeLevel);
-      if(earJ2EEStatus.getSeverity()==Status.ERROR)
-      {
-        return earJ2EEStatus;
-      }
-    }
-    else
-    {
-      return j2eeStatus;
-    }
-    
-    return Status.OK_STATUS;
-  }
-  
-  private IStatus doesProjectTargetMatchServerType(IProject p, String serverFactoryId)
-  {
-    if (p!=null && p.exists())
-    {
-      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 StatusUtils.errorStatus( NLS.bind(ConsumptionUIMessages.MSG_SERVER_TARGET_MISMATCH,new String[]{p.getName()}) );
-          }
-        }
-      }
-    }
-    return Status.OK_STATUS;        
-  }
-
-  private IStatus doesProjectMatchJ2EELevel(IProject p, String compName, String j2eeLevel)
-  {
-
-    try {
-		if (p!=null && p.exists())
-		{
-  	  int projectJ2EELevel = J2EEUtils.getJ2EEVersion(p);
-		  if (projectJ2EELevel!=-1)
-		  {
-		    String projectJ2EELevelString = String.valueOf(projectJ2EELevel);
-		    if (j2eeLevel!=null && j2eeLevel.length()>0)
-		    {
-		      if (!projectJ2EELevelString.equals(j2eeLevel))
-		      {
-		        return StatusUtils.errorStatus( NLS.bind(ConsumptionUIMessages.MSG_J2EE_MISMATCH,new String[]{p.getName()}) );
-		      }
-		    }
-		  }
-		}
-	} catch(Exception e){
-    
-  }
-    
-    return Status.OK_STATUS;        
-  }
-  
-  public IStatus validateProjectType(String projectName, SelectionListChoices runtime2ClientTypes)
-  {
-    IStatus status = Status.OK_STATUS;
-    IProject p = ProjectUtilities.getProject(projectName);
-    if (p==null || !p.exists())
-    {
-      //Project does not exist which means a new project of the correct type will be created
-      //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 = NLS.bind(ConsumptionUIMessages.MSG_WRONG_CLIENT_PROJECT_TYPE,new String[]{projectName, clientTypeLabel});
-    IStatus eStatus = StatusUtils.errorStatus( message );
-    return eStatus;
-    
-  }
-  
-  
-  private String getClientTypeLabel( String type )
-  {	  
-	  if (type.equals(IModuleConstants.JST_WEB_MODULE))
-	  {
-		  return ConsumptionUIMessages.LABEL_CLIENT_COMP_TYPE_WEB;
-	  }
-	  else if (type.equals(IModuleConstants.JST_EJB_MODULE))
-	  {
-		  return ConsumptionUIMessages.LABEL_CLIENT_COMP_TYPE_EJB;
-	  }
-	  else if (type.equals(IModuleConstants.JST_APPCLIENT_MODULE))
-	  {
-		  return ConsumptionUIMessages.LABEL_CLIENT_COMP_TYPE_APP_CLIENT;
-	  }
-	  else if (type.equals(IModuleConstants.JST_UTILITY_MODULE))
-	  {
-		  return ConsumptionUIMessages.LABEL_CLIENT_COMP_TYPE_CONTAINERLESS;
-	  }
-	  else
-	  {
-		  //No known label, return the typeId itself. 
-		  return type;
-	  }	  	  
-  }  
-  
-  /**
-   * 
-   * @param p
-   * @param wsdlURL
-   * @param parser
-   * @return
-   */
-  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 = WebServicesManager.getInstance();
-    //WebServiceEditModel wsEditModel = wsm.getWSEditModel(p);
-    //WebServices ws = wsEditModel.getWebServices();
-    Iterator wsDescs = wsm.getInternalWebServicesDescriptions().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 d6517aa2f..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/ClientRootFragment.java
+++ /dev/null
@@ -1,112 +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
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060131 121071   rsinha@ca.ibm.com - Rupam Kuehner          
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.extension;
-
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.DataObjectCommand;
-import org.eclipse.wst.ws.internal.extensions.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(), 
-    	 "org.eclipse.jst.ws.internal.consumption.ui.extension.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 );
-  	
-	// Map the PreClientDevelopCommand into the dataObject.
-	registry.addMapping( PreClientDevelopCommand.class, "DataObject", DataObjectCommand.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, "WebService", PreClientInstallCommand.class );
-    registry.addMapping( PreClientDevelopCommand.class, "Project", PreClientInstallCommand.class );
-    registry.addMapping( PreClientDevelopCommand.class, "Context", 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 );    
-    registry.addMapping( PreClientDevelopCommand.class, "Context", 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 cee67b836..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientAssembleCommand.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
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060131 121071   rsinha@ca.ibm.com - Rupam Kuehner          
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.extension;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.ws.internal.consumption.command.common.AssociateModuleWithEARCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateFacetedProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.common.RequiredFacetVersion;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient;
-
-public class PreClientAssembleCommand extends AbstractDataModelOperation 
-{
-  private IWebServiceClient       webServiceClient_;
-  private String                  project_;
-  private String                  module_;
-  private String                  earProject_;
-  private String                  ear_;
-  
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    IEnvironment environment = getEnvironment();
-    
-	// Check if EAR module is req'd, ie. !=null
-	if (earProject_==null)
-		return Status.OK_STATUS;
-	
-    //  Create the client EAR module
-    CreateFacetedProjectCommand command = new CreateFacetedProjectCommand();
-    command.setProjectName(earProject_);
-    command.setTemplateId(IJ2EEModuleConstants.JST_EAR_TEMPLATE);
-    
-    // RequiredFacetVersions is set to an empty array because we don't need to impose any additional constraints.
-    // We just want to create the highest level of EAR project that the selected server supports.
-    command.setRequiredFacetVersions(new RequiredFacetVersion[0]); 
-    
-    command.setServerFactoryId(webServiceClient_.getWebServiceClientInfo().getServerFactoryId());
-    command.setServerInstanceId(webServiceClient_.getWebServiceClientInfo().getServerInstanceId());
-    IStatus status = command.execute( monitor, adaptable );
-    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_);
-    associateCommand.setEnvironment( environment );
-    status = associateCommand.execute( monitor, adaptable );
-    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/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 28203c621..000000000
--- 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.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public class PreClientDeployCommand extends AbstractDataModelOperation 
-{
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    return Status.OK_STATUS;
-  }
-}
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 5c4d697cc..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientDevelopCommand.java
+++ /dev/null
@@ -1,258 +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
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060131 121071   rsinha@ca.ibm.com - Rupam Kuehner     
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.extension;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateFacetedProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.common.FacetUtils;
-import org.eclipse.jst.ws.internal.consumption.common.RequiredFacetVersion;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-import org.eclipse.wst.ws.internal.wsrt.ISelection;
-import org.eclipse.wst.ws.internal.wsrt.IWebService;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntime;
-import org.eclipse.wst.ws.internal.wsrt.SimpleContext;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceClientInfo;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceState;
-
-public class PreClientDevelopCommand extends AbstractDataModelOperation 
-{
-  
-  private TypeRuntimeServer typeRuntimeServer_;
-  private String            clientRuntimeId_;
-  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 boolean						install_;
-  private boolean						run_;
-  private String            wsdlURI_;
-  private Object            dataObject_;
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    IEnvironment environment = getEnvironment();
-    
-    // Split up the project and module
-    int index = module_.indexOf("/");
-    if (index!=-1){
-      project_ = module_.substring(0,index);
-      module_ = module_.substring(index+1);
-    }
-
-    if (ear_!=null && ear_.length()>0)
-    {
-      int earIndex = ear_.indexOf("/");
-      if (earIndex!=-1) {
-        earProject_ = ear_.substring(0,earIndex);
-        ear_ = ear_.substring(earIndex+1);
-      }
-    }    
-    
-    IWebServiceRuntime wsrt = WebServiceRuntimeExtensionUtils2
-        .getClientRuntime(clientRuntimeId_);
-    WebServiceClientInfo wsInfo = new WebServiceClientInfo();
-
-    wsInfo.setServerFactoryId(typeRuntimeServer_.getServerId());
-    wsInfo.setServerInstanceId(typeRuntimeServer_.getServerInstanceId());
-    wsInfo.setState(WebServiceState.UNKNOWN_LITERAL);
-    wsInfo.setWebServiceRuntimeId(typeRuntimeServer_.getRuntimeId());
-    wsInfo.setWsdlURL(wsdlURI_);
-    
-    webServiceClient_ = wsrt.getWebServiceClient(wsInfo);
-    WebServiceScenario scenario = WebServiceScenario.CLIENT_LITERAL;
-    context_ = new SimpleContext(true, true, true, install_, run_, true, test_,
-        false, scenario, resourceContext_.isOverwriteFilesEnabled(),
-        resourceContext_.isCreateFoldersEnabled(), resourceContext_
-            .isCheckoutFilesEnabled());
-
-    IStatus status = Status.OK_STATUS;
-
-    // Create the client module if needed.
-    IProject project = ProjectUtilities.getProject(project_);
-    if (!project.exists())
-    {
-      boolean matches = WebServiceRuntimeExtensionUtils2.doesClientRuntimeSupportTemplate(clientRuntimeId_, moduleType_);
-      if (matches)
-      {  
-        RequiredFacetVersion[] rfv = WebServiceRuntimeExtensionUtils2.getClientRuntimeDescriptorById(clientRuntimeId_).getRequiredFacetVersions();
-        CreateFacetedProjectCommand command = new CreateFacetedProjectCommand();
-        command.setProjectName(project_);
-        command.setTemplateId(moduleType_);
-        command.setRequiredFacetVersions(rfv);
-        command.setServerFactoryId(typeRuntimeServer_.getServerId());
-        command.setServerInstanceId(typeRuntimeServer_.getServerInstanceId());
-        status = command.execute( monitor, adaptable );
-        if (status.getSeverity() == Status.ERROR)
-        {
-          environment.getStatusHandler().reportError( status );
-          return status;
-        }        
-      }            
-    }
-
-    //The project should now exist. Add facets if needed.
-    RequiredFacetVersion[] rfvs = WebServiceRuntimeExtensionUtils2.getClientRuntimeDescriptorById(clientRuntimeId_).getRequiredFacetVersions();
-    status = FacetUtils.addRequiredFacetsToProject(project, rfvs, monitor);
-    if (status.getSeverity() == Status.ERROR)
-    {
-      environment.getStatusHandler().reportError( status );
-      return status;
-    }              
-
-    return status;
-  }
-  
-  public void setClientTypeRuntimeServer( TypeRuntimeServer typeRuntimeServer )
-  {
-	typeRuntimeServer_ = typeRuntimeServer;  
-  }
-  
-  public void setClientRuntimeId( String id)
-  {
-    clientRuntimeId_ = id;
-  }
-  
-  public void setClientJ2EEVersion( String j2eeLevel )
-  {
-	j2eeLevel_ = j2eeLevel;  
-  }
-  
-  public String getJ2eeLevel()
-  {
-    return j2eeLevel_;  
-  }
-  
-  public IWebServiceClient getWebService()
-  {
-	return webServiceClient_;  
-  }
-  
-  public IContext getContext()
-  {
-    return context_;
-  }
-  
-  public void setResourceContext( ResourceContext resourceContext )
-  {
-    resourceContext_ = resourceContext;	  
-  }
-  
-  public ISelection getSelection()
-  {
-    return selection_;	  
-  }
-  
-  public void setSelection( ISelection selection )
-  {
-	selection_ = selection;  
-  }
-
-  public String getProject()
-  {
-    return project_;    
-  }
-  
-  public String getModule()
-  {
-    return module_;	  
-  }
-  
-  public void setModule( String module )
-  {
-	module_ = module;
-  }
-  
-  public void setModuleType( String moduleType)
-  {
-    moduleType_ = moduleType;
-  }
-
-  public String getEarProject()
-  {
-    return earProject_;   
-  }
-  
-  public String getEar()
-  {
-	return ear_;  
-  }
-  
-  public void setEar( String ear )
-  {
-	ear_ = ear;  
-  }
-	
-  public void setInstallClient(boolean installClient)
-  {
-	install_ = installClient;
-  }	
-  
-  public void setTestService(boolean testService)
-  {
-	test_ = testService;
-  }		
-  
-  public void setStartService(boolean startService)
-  {
-	  run_ = startService;
-  }
-  
-  public void setWsdlURI(String uri)
-  {
-    wsdlURI_ = uri;
-  }
-  
-  public void setDataObject( Object object )
-  {
-    dataObject_ = object;	  
-  }
-  
-  public Object getDataObject()
-  {
-	Object result = null;
-	
-    if( dataObject_ != null && dataObject_ instanceof IWebService )
-	{
-	  // The data object has already been set with an IWebService
-	  // so we will keep this value.
-	  result = dataObject_;
-	}
-    else
-	{
-	  result = webServiceClient_;	
-	}
-	
-	return result;
-  }
-}
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 c07be6b7f..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientInstallCommand.java
+++ /dev/null
@@ -1,113 +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.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.command.common.AddModuleToServerCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateServerCommand;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient;
-
-public class PreClientInstallCommand extends AbstractDataModelOperation 
-{
-  private IWebServiceClient webServiceClient_;
-  private String            project_;
-  private String            module_;
-  private String            earProject_;
-  private String            ear_;
-  private IContext			context_;
-  
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {	  
-	  if (context_.getInstall())
-	  {  
-	      IEnvironment environment = getEnvironment();
-	      
-	      if (webServiceClient_.getWebServiceClientInfo().getServerInstanceId()==null)
-	      {
-	        CreateServerCommand createServerCommand = new CreateServerCommand();
-	        createServerCommand.setServerFactoryid(webServiceClient_.getWebServiceClientInfo().getServerFactoryId());
-	        createServerCommand.setEnvironment( environment );
-	        IStatus createServerStatus = createServerCommand.execute(null, null);
-	        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_);       
-	      }
-	
-	      command.setEnvironment( environment );
-	      IStatus status = command.execute( null, null );
-	      if (status.getSeverity()==Status.ERROR)
-	      {
-	        environment.getStatusHandler().reportError( status );
-	      }     
-	      return status;
-	   }
-	   return Status.OK_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;  
-    }    
-    
-    public void setContext(IContext context)
-    {
-    	context_ = context;
-    }
-}
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 bc4870109..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientRunCommand.java
+++ /dev/null
@@ -1,60 +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.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.ui.command.StartServerCommand;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient;
-
-public class PreClientRunCommand extends AbstractDataModelOperation 
-{
-  private IWebServiceClient webServiceClient_;
-  private IContext context_;
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-	  IStatus status = Status.OK_STATUS;
-	 
-	  if (context_.getRun())
-	  {
-	    IEnvironment environment = getEnvironment();   
-	    
-	    StartServerCommand command = new StartServerCommand();
-	    command.setServerInstanceId(webServiceClient_.getWebServiceClientInfo().getServerInstanceId());
-	    command.setEnvironment( environment );
-	    status = command.execute( monitor, null );
-	    if (status.getSeverity()==Status.ERROR)
-	    {
-	      environment.getStatusHandler().reportError( status );       
-	    } 
-	  }
-	  
-    return status;	  
-  }
-	  
-
-  public void setWebService( IWebServiceClient webServiceClient )
-  {
-    webServiceClient_ = webServiceClient;  
-  }
-  
-  public void setContext(IContext context)
-  {
-	  context_=context;
-  }
-}
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 73175bb03..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/plugin/WebServiceConsumptionUIPlugin.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (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.jface.resource.ImageDescriptor;
-import org.eclipse.jst.ws.internal.consumption.ui.preferences.PersistentProjectTopologyContext;
-import org.eclipse.jst.ws.internal.consumption.ui.preferences.PersistentServerRuntimeContext;
-import org.eclipse.jst.ws.internal.consumption.ui.preferences.ProjectTopologyContext;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-
-
-/**
-* This is the plugin class for the Web Services plugin.
-* <p>
-* This plugin contains the graphic user interface to the
-* Web Services runtime found in org.eclipse.jst.ws.
-*/
-public class WebServiceConsumptionUIPlugin extends AbstractUIPlugin
-{
-
-  /**
-  * 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 PersistentProjectTopologyContext projectTopologyContext_;
-  
-  /**
-  * 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 ProjectTopologyContext getProjectTopologyContext()
-  {
-    if (projectTopologyContext_ == null)
-    {
-      projectTopologyContext_ = new PersistentProjectTopologyContext();
-      projectTopologyContext_.load();
-    }
-    
-    return projectTopologyContext_;
-  }
-
-  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/PersistentProjectTopologyContext.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/PersistentProjectTopologyContext.java
deleted file mode 100644
index 1e83b5a5e..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/PersistentProjectTopologyContext.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060202   119780 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.preferences;
-
-import java.util.StringTokenizer;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.wst.command.internal.env.context.PersistentContext;
-
-
-public class PersistentProjectTopologyContext extends PersistentContext implements ProjectTopologyContext
-{
-
-  public PersistentProjectTopologyContext () 
-  {
-	  super( WebServiceConsumptionUIPlugin.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]);
-    }
-    setDefaultStringIfNoDefault(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.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 558e6b804..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/PersistentServerRuntimeContext.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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.preferences;
-
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.wst.command.internal.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.50";
-	private String RUNTIME_ID_DEFAULT = "org.eclipse.jst.ws.axis.creation.axisWebServiceRT";
-	
-	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);
-		}
-				
-	}
-	
-	public String getDefaultServerFactoryId()
-	{
-		return getDefaultString(PREFERENCE_SERVER);
-	}
-
-	public String getDefaultRuntimeId()
-	{
-		return getDefaultString(PREFERENCE_RUNTIME);
-	}
-
-	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 void setServerFactoryId(String id)
-	{
-		setValue(PREFERENCE_SERVER,id);
-	}
-	
-	public void setRuntimeId(String id)
-	{
-		setValue(PREFERENCE_RUNTIME, id);
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/ProjectTopologyContext.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/ProjectTopologyContext.java
deleted file mode 100644
index 023ad738f..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/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.consumption.ui.preferences;
-
-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.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/ProjectTopologyDefaults.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/ProjectTopologyDefaults.java
deleted file mode 100644
index 113183c2b..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/ProjectTopologyDefaults.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (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.preferences;
-
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-
-public class ProjectTopologyDefaults
-{
-  public static final String[] getClientTypes()
-  {
-    return WebServiceRuntimeExtensionUtils2.getAllClientProjectTypes();
-  }
-
-  public static final boolean isUseTwoEARs()
-  {
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/ProjectTopologyPreferencePage.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/ProjectTopologyPreferencePage.java
deleted file mode 100644
index d4ebe1a28..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/ProjectTopologyPreferencePage.java
+++ /dev/null
@@ -1,293 +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.preferences;
-
-import java.util.Vector;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.ui.WSUIPluginMessages;
-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;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-
-
-public class ProjectTopologyPreferencePage extends PreferencePage implements IWorkbenchPreferencePage, SelectionListener
-{
-  /*CONTEXT_ID PTPP0001 for the Project Topology Preference Page*/
-  private String INFOPOP_PTPP_PAGE = WebServiceUIPlugin.ID + ".PPTP0001";
-
-  private TableViewer clientTypeViewer_;
-  private Button moveUp_;
-  private Button moveDown_;
-  private Vector clientTypes_;
-
-  private Button twoEAR_;
-
- /**
-   * Creates preference page controls on demand.
-   *   @param parent  the parent for the preference page
-   */
-  protected Control createContents(Composite superparent)
-  {
-    Composite   parent = new Composite( superparent, SWT.NONE );	
-    GridLayout layout = new GridLayout();
-    layout.numColumns = 1;
-    parent.setLayout( layout );
-    parent.setToolTipText(WSUIPluginMessages.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(WSUIPluginMessages.LABEL_CLIENT_TYPE_NAME);
-    clientTypeLabel.setLayoutData( new GridData( GridData.FILL_HORIZONTAL));
-
-    Composite clientTypeComposite = new Composite(parent, SWT.NONE);
-    GridLayout gl = new GridLayout();
-    gl.numColumns = 2;
-    gl.marginHeight = 0;
-    gl.marginWidth = 0;
-    clientTypeComposite.setLayout(gl);
-    clientTypeComposite.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ));
-
-    Table table= new Table(clientTypeComposite, SWT.BORDER | SWT.SINGLE | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL);
-    GridData gd = new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL);
-    gd.widthHint = 256;
-    table.setLayoutData(gd);
-    table.setToolTipText(WSUIPluginMessages.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(WSUIPluginMessages.LABEL_CLIENT_TYPE_NAME);
-    ColumnWeightData columnData = new ColumnWeightData(256, 256, false);
-    tableLayout.addColumnData(columnData);
-    table.setLayout(tableLayout);
-
-    Composite c = new Composite(clientTypeComposite, SWT.NONE);
-    gl = new GridLayout();
-    gl.numColumns = 1;
-    gl.marginHeight = 10;
-    gl.marginWidth = 0;
-    c.setLayout(gl);
-
-    moveUp_ = new Button(c, SWT.PUSH);
-    moveUp_.setText(WSUIPluginMessages.LABEL_MOVE_UP);
-    moveUp_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-    moveUp_.addSelectionListener(this);
-    moveUp_.setToolTipText(WSUIPluginMessages.TOOLTIP_MOVE_UP);
-
-    moveDown_ = new Button(c, SWT.PUSH);
-    moveDown_.setText(WSUIPluginMessages.LABEL_MOVE_DOWN);
-    moveDown_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-    moveDown_.addSelectionListener(this);
-    moveDown_.setToolTipText(WSUIPluginMessages.TOOLTIP_MOVE_DOWN);
-
-    twoEAR_ = new Button(parent, SWT.CHECK | SWT.WRAP );
-    twoEAR_.setText(WSUIPluginMessages.LABEL_ENABLE_TWO_EARS);
-    twoEAR_.setToolTipText(WSUIPluginMessages.TOOLTIP_ENABLE_TWO_EARS);
-
-    initializeValues();
-    org.eclipse.jface.dialogs.Dialog.applyDialogFont(superparent);    
-
-    return parent;
-  }
-  
-  /**
-   * Does anything necessary because the default button has been pressed.
-   */
-  protected void performDefaults()
-  {
-    super.performDefaults();
-    initializeDefaults();
-  }
-
-  /**
-   * Do anything necessary because the OK button has been pressed.
-   *  @return whether it is okay to close the preference page
-   */
-  public boolean performOk()
-  {
-    storeValues();
-    return true;
-  }
-
-  protected void performApply()
-  {
-    performOk();
-  }
-
-  /**
-   * @see IWorkbenchPreferencePage
-   */
-  public void init(IWorkbench workbench)  { }
-
-  /**
-   * Initializes states of the controls 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 = WebServiceConsumptionUIPlugin.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 = WebServiceConsumptionUIPlugin.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
-  {
-    public ClientTypeLabelProvider()
-    {
-    }
-
-    /**
-    * @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) 
-    {
-      IFacetedProjectTemplate template = ProjectFacetsManager.getTemplate( (String)value );
-      
-      return template.getLabel();
-    }
-  }
-}
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 54f647fb6..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/ServerRuntimePreferencePage.java
+++ /dev/null
@@ -1,346 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-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.internal.env.core.selection.SelectionListChoices;
-
-
-/**
- *
- */
-public class ServerRuntimePreferencePage extends PreferencePage implements IWorkbenchPreferencePage, Listener 
-{
-	private String pluginId_= "org.eclipse.jst.ws.consumption.ui";
-	
-	/* 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) 
-	{
-	  UIUtils uiUtils = new UIUtils(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,ConsumptionUIMessages.LABEL_SERVERS_LIST,
-			  ConsumptionUIMessages.TOOLTIP_SRPF_COMBO_SERVER,
-									INFOPOP_SRPF_SERVER_PREF,
-									SWT.SINGLE|SWT.BORDER|SWT.READ_ONLY);
-	  
-	  runtime_ = uiUtils.createCombo(page,ConsumptionUIMessages.LABEL_RUNTIMES_LIST,
-			  ConsumptionUIMessages.TOOLTIP_SRPF_COMBO_RUNTIME,
-									 INFOPOP_SRPF_RUNTIME_PREF,
-									 SWT.SINGLE|SWT.BORDER|SWT.READ_ONLY);
-
-/*
-	  j2eeVersion_ = uiUtils.createCombo(page,ConsumptionUIMessages.LABEL_J2EE_VERSION,
-			  ConsumptionUIMessages.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_ = WebServiceRuntimeExtensionUtils2.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);			
-	}
-	
-	public void handleEvent(Event event)
-	{
-		if (server_ == event.widget)
-		{
-			handleServerSelected();
-		}
-		else if (runtime_ == event.widget)
-		{
-			handleRuntimeSelected();
-		}
-	}
-
-	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);		
-		
-		startListening();
-	}
-	
-	private void handleRuntimeSelected()
-	{
-		stopListening();
-		
-		String selectedText = getRuntimeSelection();
-		serverToRuntimeToJ2EE_.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);
-	}
-
-	/**
-	 * 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());      
-	}
-	
-	protected void performApply()
-	{
-	  performOk();
-	}
-	
-  	
-	private void startListening()
-	{
-	  server_.addListener(SWT.Selection,this);
-	  runtime_.addListener(SWT.Selection,this);
-	}
-
-	private void stopListening()
-	{
-	  server_.removeListener(SWT.Selection, this);
-	  runtime_.removeListener(SWT.Selection, this);
-	}
-
-	private void setServerItems(String[] factoryIds)
-	{
-	  
-	  if (factoryIds != null)
-	  {
-	    ArrayList serverLabelsList = new ArrayList();
-		  for (int i=0;i<factoryIds.length;i++)
-		  {
-			  //String thisServerLabel = WebServiceServerRuntimeTypeRegistry.getInstance().getServerLabel(factoryIds[i]);
-        String thisServerLabel = WebServiceRuntimeExtensionUtils2.getServerLabelById(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]);
-      runtimeLabels[i] = WebServiceRuntimeExtensionUtils2.getRuntimeLabelById(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] = ConsumptionUIMessages.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);
-    return WebServiceRuntimeExtensionUtils2.getServerFactoryId(serverLabel);
-	}
-	
-	private String getRuntimeSelection()
-	{
-      String runtimeLabel = runtime_.getText();
-	  //return WebServiceServerRuntimeTypeRegistry.getInstance().getRuntimeId(runtimeLabel);
-      return WebServiceRuntimeExtensionUtils2.getRuntimeId(runtimeLabel);
-	}
-	
-    /*
-	private String getJ2EESelection()
-	{
-	  String j2eeLabel = j2eeVersion_.getText();
-	  return J2EEUtils.getJ2EEVersionFromLabel(j2eeLabel);		
-	}
-    */
-	
-	private void setServerSelection(String factoryId)
-	{
-		//String label = WebServiceServerRuntimeTypeRegistry.getInstance().getServerLabel(factoryId);
-    String label = WebServiceRuntimeExtensionUtils2.getServerLabelById(factoryId);
-		setSelection(server_,label);
-	}
-	
-	private void setRuntimeSelection(String id)
-	{
-		//String label = WebServiceServerRuntimeTypeRegistry.getInstance().getRuntimeLabel(id);
-    String label = WebServiceRuntimeExtensionUtils2.getRuntimeLabelById(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/preferences/TransientProjectTopologyContext.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/TransientProjectTopologyContext.java
deleted file mode 100644
index 0737788d8..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/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.consumption.ui.preferences;
-
-
-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.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 7daac8ead..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/selection/SelectionTransformer.java
+++ /dev/null
@@ -1,32 +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.consumption.ui.wsrt.Selection;
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-
-public class SelectionTransformer implements Transformer 
-{
-  public Object transform(Object value) 
-  {
-	IStructuredSelection inSelection  = (IStructuredSelection)value;
-	Selection            outSelection = new Selection();
-	
-	if (inSelection != null)
-	{
-		outSelection.setSelection( inSelection.toArray() );	
-	}
-	
-	return outSelection;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartClientWidgetContributor.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartClientWidgetContributor.java
deleted file mode 100644
index 4a5a76d41..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartClientWidgetContributor.java
+++ /dev/null
@@ -1,54 +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.server;
-
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.server.core.IServer;
-
-public class StartClientWidgetContributor implements INamedWidgetContributor 
-{
-  private IServer      server_;
-	  
-  public StartClientWidgetContributor( IServer server )
-  {
-	server_ = server;
-  }
-  
-  public String getDescription() 
-  {
-	return ConsumptionUIMessages.PAGE_DESC_WS_START_SERVER;
-  }
-
-  public String getName() 
-  {
-	return "";
-  }
-
-  public String getTitle() 
-  {
-	return ConsumptionUIMessages.PAGE_TITLE_WS_START_SERVER;
-  }
-
-  public WidgetContributorFactory getWidgetContributorFactory() 
-  {
-	return new WidgetContributorFactory()
-	       {
-			 public WidgetContributor create() 
-			 {
-				return new StartServerWidget( server_ );
- 			 }
-	       };
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartClientWidgetFactory.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartClientWidgetFactory.java
deleted file mode 100644
index ba92ff807..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartClientWidgetFactory.java
+++ /dev/null
@@ -1,65 +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.server;
-
-import org.eclipse.jst.ws.internal.consumption.ui.extension.PreClientDevelopCommand;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributorFactory;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient;
-
-public class StartClientWidgetFactory implements INamedWidgetContributorFactory 
-{
-  private IWebServiceClient webserviceClient_;
-  private IContext context_;
-  
-  public INamedWidgetContributor getFirstNamedWidget() 
-  {
-    IServer server = null;
-    
-    if( webserviceClient_ != null  && context_.getInstall())
-    {
-      server = ServerCore.findServer(webserviceClient_.getWebServiceClientInfo().getServerInstanceId() );
-    }
-    
-    if( server != null && server.getServerState() != IServer.STATE_STARTED )
-    {
-      return new StartClientWidgetContributor( server );
-    }
-    
-	return null;
-  }
-
-  public INamedWidgetContributor getNextNamedWidget( INamedWidgetContributor widgetContributor) 
-  {
-	return null;
-  }
-
-  public void registerDataMappings(DataMappingRegistry dataRegistry) 
-  {
-	dataRegistry.addMapping( PreClientDevelopCommand.class, "WebService", StartClientWidgetFactory.class );
-	dataRegistry.addMapping( PreClientDevelopCommand.class, "Context", StartClientWidgetFactory.class );
-  }
-  
-  public void setWebService( IWebServiceClient webserviceClient )
-  {
-    webserviceClient_ = webserviceClient;  
-  }
-  
-  public void setContext ( IContext context )
-  {
-    context_ = context;  
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartServerWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartServerWidget.java
deleted file mode 100644
index 47459296c..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartServerWidget.java
+++ /dev/null
@@ -1,443 +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.server;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.IJobChangeEvent;
-import org.eclipse.core.runtime.jobs.IJobManager;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.core.runtime.jobs.JobChangeAdapter;
-import org.eclipse.jface.wizard.ProgressMonitorPart;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.command.StartServerCommand;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.osgi.util.NLS;
-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.swt.widgets.Display;
-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.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.context.TransientResourceContext;
-import org.eclipse.wst.command.internal.env.eclipse.EclipseEnvironment;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseStatusHandler;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.common.environment.NullStatusHandler;
-import org.eclipse.wst.server.core.IServer;
-
-public class StartServerWidget extends SimpleWidgetDataContributor 
-{
-  private IServer             server_;
-  private IStatus              status_;
-  private Listener            statusListener_;
-  private Button              button_;
-  private JobChangeAdapter    jobChangeAdapter_;
-  private Text                serverStateText_;
-  private ProgressMonitorPart progressMonitor_;
-  private String              pluginId_;
-  private Composite           buttonGroup_;
-    
-  /*CONTEXT_ID SSWP0001 Start the server button. */
-  private String INFOPOP_SSWP_SERVER_BUTTON = "SSWP0001";
-  
-  public StartServerWidget( IServer server )
-  {
-	pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-		
-    server_ = server;
-    
-    jobChangeAdapter_ = new JobChangeAdapter()
-                        {
-                          public void done(final IJobChangeEvent event) 
-                          {
-                        	Display.getDefault().asyncExec( new Runnable()
-                        			                        {
-	        					                              public void run() 
-							                                  {
-	        						                            if( !progressMonitor_.isDisposed() )
-	        						                            {
-							                                      setServerState();	
-							                                      progressMonitor_.done();
-							                                      reportErrorIfRequired( (StartServerJob)event.getJob() );
-	        						                            }
-							                                  }
-                        			                        });
-                          }
-                        };
-  }
-  
-  public WidgetDataEvents addControls(Composite parent, Listener statusListener) 
-  {
-	statusListener_ = statusListener;
-	
-	UIUtils      uiUtils     = new UIUtils( pluginId_ );
-	Composite    group       = uiUtils.createComposite( parent, 1 );
-	
-	Text         text1        = uiUtils.createText( group, null, null, null, SWT.READ_ONLY );
-	text1.setText( NLS.bind(ConsumptionUIMessages.LABEL_START_SERVER_TEXT1, new String[]{ server_.getName() } ));
-	
-	Text         text2        = uiUtils.createText( group, null, null, null, SWT.READ_ONLY );
-	text2.setText( NLS.bind(ConsumptionUIMessages.LABEL_START_SERVER_TEXT2, new String[]{ server_.getName() } ));
-	
-	Text         text3        = uiUtils.createText( group, null, null, null, SWT.READ_ONLY );
-	text3.setText( NLS.bind(ConsumptionUIMessages.LABEL_START_SERVER_TEXT3, new String[]{ server_.getName() } ));
-	
-	Text         text4        = uiUtils.createText( group, null, null, null, SWT.READ_ONLY );
-	text4.setText( NLS.bind(ConsumptionUIMessages.LABEL_START_SERVER_TEXT4, new String[]{ server_.getName() } )); 
-	
-	buttonGroup_ = uiUtils.createComposite( group, 2,-1, 0 );
-	serverStateText_ = uiUtils.createText( buttonGroup_, null, null, null, SWT.READ_ONLY );
-	serverStateText_.setLayoutData( new GridData() );
-		
-	button_ = uiUtils.createPushButton( buttonGroup_, 
-			ConsumptionUIMessages.LABEL_START_SERVER_BUTTON,
-			ConsumptionUIMessages.TOOLTIP_START_SERVER_BUTTON,
-			                            INFOPOP_SSWP_SERVER_BUTTON );
-	
-	button_.addSelectionListener( new SelectionAdapter()
-			                      {
-									 public void widgetSelected( SelectionEvent evt )
-		                             {
-			                       	   serverStateText_.setText( getStateMessage( ConsumptionUIMessages.TEXT_SERVER_STATUS, ConsumptionUIMessages.TEXT_SERVER_STARTING ) );
-			                    	   progressMonitor_.beginTask( getStateMessage( ConsumptionUIMessages.TEXT_SERVER_MSG, ConsumptionUIMessages.TEXT_SERVER_STARTING ), IProgressMonitor.UNKNOWN );
-			                    	   button_.setEnabled( false );
-			                    	   buttonGroup_.pack();
-		                               startServerJob();
-		                             }	                          
-			                      } );	
-	
-	progressMonitor_ = new ProgressMonitorPart( group, new GridLayout() );
-	progressMonitor_.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ));
-	
-	setServerState();
-	return this;
-  }
-
-  public IStatus getStatus() 
-  {
-	return status_;
-  }
-  
-  private void setServerState()
-  {
-	int state = server_.getServerState();
-	
-	switch( state )
-	{
-	  case IServer.STATE_STARTED:
-	  {
-		status_ = Status.OK_STATUS;
-		button_.setEnabled( false );
-		serverStateText_.setText( getStateMessage( ConsumptionUIMessages.TEXT_SERVER_STATUS, ConsumptionUIMessages.TEXT_SERVER_STARTED ) );
-		
-	    break;	  
-	  }
-	  
-	  case IServer.STATE_STARTING:
-	  {
-		status_ = StatusUtils.errorStatus( "" );
-		button_.setEnabled( false );  
-		serverStateText_.setText( getStateMessage( ConsumptionUIMessages.TEXT_SERVER_STATUS, ConsumptionUIMessages.TEXT_SERVER_STARTING ) );
-		progressMonitor_.beginTask( getStateMessage( ConsumptionUIMessages.TEXT_SERVER_MSG, ConsumptionUIMessages.TEXT_SERVER_STARTING ), IProgressMonitor.UNKNOWN );
-		
-		// The server is still starting so we need to reconnect to the job
-		// that is starting it.
-		startServerJob();
-	    break;	  
-	  }
-	  
-	  default:
-	  {
-		status_ = StatusUtils.errorStatus( "" );
-        button_.setEnabled( true );
-		serverStateText_.setText( getStateMessage( ConsumptionUIMessages.TEXT_SERVER_STATUS, ConsumptionUIMessages.TEXT_SERVER_STOPPED ) );
-		break;  
-	  }
-	};
-	
-	statusListener_.handleEvent( null );
-	buttonGroup_.pack();
-  }  
-  
-  private String getStateMessage( String mainKey, String subKey )
-  {
-	return NLS.bind( mainKey, new String[]{ subKey } );
-  }
-  
-  // Connect to an existing server thread otherwise start a new one.
-  private void startServerJob()
-  {
-	IJobManager    jobManager     = Platform.getJobManager();
-	Job[]          jobs           = jobManager.find( StartServerFamily );
-	StartServerJob startServerJob = null;
-	
-	// There may be more than one job starting for different servers.
-	// Therefore, we need to find the one for our server if it is available.
-	for( int index = 0; index < jobs.length; index++ )
-	{
-	  StartServerJob jobFound = (StartServerJob)jobs[index];
-	  
-	  if( jobFound.getServer() == server_ )
-	  {
-	    startServerJob = jobFound;
-	    break;
-	  }
-	}
-	
-	if( startServerJob != null )
-	{
-	  synchronized( StartServerFamily ) 
-	  {
-        IStatus status = startServerJob.getStatus();
-        
-        // We are using status to determine if the job has completed or not.
-        // Normally, we would not get here if the job had already completed,
-        // but there is a slim window where the job manager gives us the job
-        // and then it immediately completes.
-        if( status == null )
-        {        
-          // The job had not completed yet so we will add a job change listener.
-          // We are adding the job listener here so that we don't have to assume
-          // that this instance of this widget is the same as the previous instance.
-          // If startServerJob already has "jobChangeAdapter_" added to it this
-          // method call will not have an effect.(Which is what we want.)
-          startServerJob.addJobChangeListener( jobChangeAdapter_ ); 
-          
-          // Note: this job was reporting progress to different progressMonitor_
-          //       control.  We need to tell the job that it should report progress
-          //       to our new progressMonitor_ control on this wizard page.
-          ProgressMonitorWrapper monitor = (ProgressMonitorWrapper)startServerJob.getMonitor();
-          monitor.setMonitor( progressMonitor_ );
-        }
-        else
-        {
-          // The job completed before we had a chance to add the job change listener
-          // Therefore, we will just call jobChangeAdapter_ directly to notify
-          // the UI that the job has completed.
-          jobChangeAdapter_.done( null );
-        }
-	  }
-	}
-	else
-	{
-	  startServerJob = new StartServerJob();	
-	  startServerJob.addJobChangeListener( jobChangeAdapter_ );
-	  startServerJob.schedule();
-	}
-  }
-     
-  private void reportErrorIfRequired( StartServerJob serverJob )
-  {
-	  IStatus status = serverJob.getStatus();
-	
-	  if( status.getSeverity() == Status.ERROR )
-	  {
-	    Shell                shell   = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
-      EclipseStatusHandler handler = new EclipseStatusHandler( shell );
-      
-      handler.reportError( status );
-	  }
-  }
-  
-  final private static String  StartServerFamily = "StartServerFamily";
-  
-  // This class is used to start up the server in an Eclipse job.
-  private class StartServerJob extends Job
-  {
-	  private IStatus                status_ = null;
-	  private ProgressMonitorWrapper envMonitor_;
-	
-	  public StartServerJob()
-	  {
-	    super( "StartServerJob" );
-	  
-	    envMonitor_ = new ProgressMonitorWrapper( progressMonitor_ );
-	  }
-	
-	  public IServer getServer()
-	  {
-	    return server_;	
-	  }
-	
-	  public ProgressMonitorWrapper getMonitor()
-	  {
-	    return envMonitor_;	
-	  }
-	
-	  public boolean belongsTo(Object family) 
-	  {
-	    return family == StartServerFamily;
-	  }
-
-	  protected IStatus run(IProgressMonitor monitor) 
-	  {
-	    NullStatusHandler        handler         = new NullStatusHandler();
-	    TransientResourceContext resourceContext = new TransientResourceContext();
-	    EclipseEnvironment       environment     = new EclipseEnvironment( null,resourceContext, handler );
-	    StartServerCommand       serverCommand   = new StartServerCommand( false );
-	    
-	    serverCommand.setServerInstanceId( server_.getId() );
-      serverCommand.setEnvironment( environment );
-	    
-	    try
-	    {
-	      setStatus( serverCommand.execute( envMonitor_, null ) );		
-	    }
-	    catch( Throwable exc )
-	    {
-		    exc.printStackTrace();
-	      setStatus( StatusUtils.errorStatus( exc ) );
-	    }
-	  	
-	    return Status.OK_STATUS;
-	  }
-	
-	  // Calls to this method need to first synchronize on the
-	  // StartServerFamily object.
-	  public IStatus getStatus()
-	  {
-	    return status_;
-	  }
-	
-	  private void setStatus( IStatus status )
-	  {
-	    synchronized( StartServerFamily ) 
-	    {
-        status_ = status;
-	    }
-	  }
-  }
-    
-  private class ProgressMonitorWrapper implements IProgressMonitor
-  {
-    private IProgressMonitor monitor_ = new NullProgressMonitor();
-  	  	
-    public ProgressMonitorWrapper( IProgressMonitor monitor )
-    {
-      monitor_ = monitor;  
-    }
-    
-    public void setMonitor( IProgressMonitor monitor )
-    {
-      monitor_ = monitor;	
-    }
-    
-    public void beginTask(final String name, final int totalWork) 
-    {
-      Display.getDefault().asyncExec( new Runnable()
-      		                          {
-                                        public void run()
-                                        {
-                                          if( !progressMonitor_.isDisposed() )
-                                          {
-                                      	    monitor_.beginTask( name, totalWork );
-                                          }
-                                        }
-      		                          } );
-    }
-
-    public void done() 
-    {
-      Display.getDefault().asyncExec( new Runnable()
-                                      {
-                                        public void run()
-                                        {
-                                          if( !progressMonitor_.isDisposed() )
-                                          {
-              	                            monitor_.done();
-                                          }
-                                        }
-                                      } );
-    }
-
-    public void internalWorked(final double work) 
-    {
-      Display.getDefault().asyncExec( new Runnable()
-                                      {
-                                        public void run()
-                                        {
-                                          if( !progressMonitor_.isDisposed() )
-                                          {
-              	                            monitor_.internalWorked( work );
-                                          }
-                                        }
-                                      } );
-    }
-
-    public boolean isCanceled() 
-    {
-      return progressMonitor_.isDisposed() ? false : monitor_.isCanceled();
-    }
-
-    public void setCanceled(boolean value) 
-    {
-      if( !progressMonitor_.isDisposed() )
-      {
-  	    monitor_.setCanceled( value );
-      }
-    }
-
-    public void setTaskName(final String name) 
-    {
-  	  Display.getDefault().asyncExec( new Runnable()
-                                      {
-                                        public void run()
-                                        {
-                                          if( !progressMonitor_.isDisposed() )
-                                          {
-                  	                        monitor_.setTaskName( name );
-                                          }
-                                        }
-                                      } );
-    }
-
-    public void subTask( final String name) 
-    {
-  	  Display.getDefault().asyncExec( new Runnable()
-                                      {
-                                        public void run()
-                                        {
-                                          if( !progressMonitor_.isDisposed() )
-                                          {
-                  	                        monitor_.subTask( name );
-                                          }
-                                        }
-                                      } );
-    }
-
-    public void worked(final int work) 
-    {
-      Display.getDefault().asyncExec( new Runnable()
-                                      {
-                                        public void run()
-                                        {
-                                          if( !progressMonitor_.isDisposed() )
-                                          {
-              	                            monitor_.worked( work );
-                                          }
-                                        }
-                                      } );
-    }
-  }
-}
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 0e05fcc15..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AbstractHandlersWidgetDefaultingCmd.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 java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-/**
- * AbstractHandlersWidgetDefaultingCmd
- *
- * Initialize and load the handlers data
- */
-public abstract class AbstractHandlersWidgetDefaultingCmd extends AbstractDataModelOperation 
-{
-  
-  private IStructuredSelection initialSelection_; 
-  
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    IEnvironment env = getEnvironment();
-    IStatus status = Status.OK_STATUS;
-    
-    IStructuredSelection selection = initialSelection_;
-    if (selection == null) {
-      status = StatusUtils.errorStatus( ConsumptionUIMessages.MSG_ERROR_TASK_EXCEPTED );
-      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 String getComponentName(){
-    IResource resource = getResourceFromInitialSelection();
-    if (resource!=null) {
-      IPath absolutePath = resource.getFullPath();
-      if (absolutePath.isAbsolute()) {
-        return absolutePath.segment(1);
-      }
-    }
-    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 acae4f7ac..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AddHandlerDialog.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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.ConsumptionUIMessages;
-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;
-
-
-
-public class AddHandlerDialog extends Dialog implements Listener {
-
-  private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-
-  private boolean validateOn_;
-  private boolean isClient_;
-  private String className;
-  private String name;
-  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$
-  
-  /* CONTEXT_ID AHDL0002 for the Handler Config Page */
-  private final String INFOPOP_TEXT_HANDLER_CLASS  = "AHDL0002"; //$NON-NLS-1$
-  
-  /* CONTEXT_ID AHDL0001 for the Handler Config Page */
-  private final String INFOPOP_TEXT_HANDLER_PORT  = "AHDL0003"; //$NON-NLS-1$
-    
-  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;
-    UIUtils uiUtils = new UIUtils(pluginId_);
-    
-    Shell thisShell = parent.getShell();
-    if (thisShell == null) {
-      thisShell = createShell();
-    }
-    thisShell.setText(ConsumptionUIMessages.DIALOG_TITLE_WS_ADD_HANDLER);
-    
-    Composite composite = (Composite) super.createDialogArea(parent);    
-    
-    Composite sourceLocationComp = uiUtils.createComposite(composite, 3);
-    
-    classNameText = uiUtils.createText(sourceLocationComp, ConsumptionUIMessages.LABEL_TEXT_HANDLER_CLASS, ConsumptionUIMessages.TOOLTIP_TEXT_HANDLER_CLASS, INFOPOP_TEXT_HANDLER_CLASS, SWT.SINGLE | SWT.BORDER);
-    classNameText.addListener(SWT.Modify,this);
-    
-    beanClassBrowseButton_ = uiUtils.createPushButton( sourceLocationComp, ConsumptionUIMessages.BUTTON_BROWSE_CLASSES,
-    		ConsumptionUIMessages.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, ConsumptionUIMessages.LABEL_TEXT_HANDLER_NAME, ConsumptionUIMessages.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, ConsumptionUIMessages.LABEL_TEXT_HANDLER_PORT, ConsumptionUIMessages.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) {
-    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/CheckWSDLValidationCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/CheckWSDLValidationCommand.java
deleted file mode 100644
index 67b1199d3..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/CheckWSDLValidationCommand.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.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.IJobManager;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ValidateWSDLJob;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Choice;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.plugin.WSPlugin;
-
-
-public class CheckWSDLValidationCommand extends AbstractDataModelOperation
-{	  
-	
-	public CheckWSDLValidationCommand () {
-	}
-  
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    IEnvironment env = getEnvironment();
-    
-    IJobManager    jobManager     = Platform.getJobManager();
-	  Job[]          jobs           = jobManager.find( ValidateWSDLJob.VALIDATE_WSDL_JOB_FAMILY );
-	  ValidateWSDLJob existingValidateWSDLJob = null;
-	  
-	  if( jobs.length > 0 )
-	  {
-		  for (int i=0; i<jobs.length; i++) {
-			  existingValidateWSDLJob = (ValidateWSDLJob)jobs[i];
-			  
-			  if (existingValidateWSDLJob.getState() != Job.NONE) { 
-				  if (ignoreWSDLValidation(env)) {
-					  // if don't want to wait for validation, cancel existing validation job
-					  existingValidateWSDLJob.cancel();
-					  return Status.OK_STATUS;
-				  } else {
-					  // wait for WSDL validation
-					  return StatusUtils.errorStatus( ConsumptionUIMessages.WAIT_FOR_WSDL );
-				  }
-			  }
-		  }
-	  }
-	  
-      return Status.OK_STATUS;
-	  
-  }
-  
-  private boolean ignoreWSDLValidation(IEnvironment env) {
-	  if (!WSPlugin.getInstance().getWaitForWSDLValidationContext().getPersistentWaitForWSDLValidation()) 
-		  return true; // do not want to wait for WSDL validation, i.e. Ignore all
-		  
-		// give a warning message with the options to stop, ignore this one, or
-		// ignore all coming messages
-		IStatus status_ = StatusUtils.warningStatus( ConsumptionUIMessages.STILL_VALIDATING_WSDL );
-		// adding all messages from WSI Incompliances
-
-		Choice ignoreChoice = new Choice('C', ConsumptionUIMessages.CANCEL_VALIDATION_LABEL, 
-				ConsumptionUIMessages.CANCEL_VALIDATION_DESCRIPTION);
-		Choice ignoreAllChoice = new Choice('A', ConsumptionUIMessages.CANCEL_ALL_VALIDATION_LABEL, 
-				ConsumptionUIMessages.CANCEL_ALL_VALIDATION_DESCRIPTION);
-		Choice cancelChoice = new Choice('W', ConsumptionUIMessages.WAIT_VALIDATION_LABEL, 
-				ConsumptionUIMessages.WAIT_VALIDATION_DESCRIPTION);
-
-		Choice result = env.getStatusHandler().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())) {
-			// update ignore WSDL validation preference
-			WSPlugin.getInstance().getWaitForWSDLValidationContext().setWaitForWSDLValidation(false);
-			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;
-	}
-  
-
-}
\ 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/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 b3f0cdac3..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientHandlersWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,299 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.applicationclient.componentcore.util.AppClientArtifactEdit;
-import org.eclipse.jst.j2ee.client.ApplicationClient;
-import org.eclipse.jst.j2ee.client.ApplicationClientResource;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EJBResource;
-import org.eclipse.jst.j2ee.ejb.internal.modulecore.util.EJBArtifactEditUtilities;
-import org.eclipse.jst.j2ee.internal.webservice.WebServiceNavigatorGroupType;
-import org.eclipse.jst.j2ee.internal.webservice.helper.WebServicesManager;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebAppResource;
-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.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.environment.IEnvironment;
-
-/**
- * ClientHandlersWidgetDefaultingCommand
- *
- * Initialize and load the handlers data
- */
-public class ClientHandlersWidgetDefaultingCommand extends AbstractHandlersWidgetDefaultingCmd {
-
-  private HandlerTableItem[] handlers_;
-
-  private Hashtable wsRefsToHandlersTable_;
-
-  private Hashtable refNameToServiceRefObj_;
-
-  private WebServicesManager webServicesManager_;
-
-  private IProject project_;
-  
-  private String serviceRefName_ = null;
-  
-  private Collection wsServiceRefs_;
-  
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {    
-    IEnvironment env = getEnvironment();
-    IStatus status = Status.OK_STATUS;
-
-    webServicesManager_ = WebServicesManager.getInstance();
-
-    IStructuredSelection selection = getInitialSelection();
-    if (selection == null) {
-      status = StatusUtils.errorStatus( ConsumptionUIMessages.MSG_ERROR_TASK_EXCEPTED );
-      env.getStatusHandler().reportError(status);
-      return status;
-    }
-
-    status = processHandlers();
-    return status;
-
-  }
-
-  public IStatus processHandlers() {
-    try {
-      Vector handlers = new Vector();
-      wsRefsToHandlersTable_ = new Hashtable();
-      refNameToServiceRefObj_ = new Hashtable();
-
-      wsServiceRefs_ = getWSServiceRefsFromSelection();
-
-      if (wsServiceRefs_ != null && wsServiceRefs_.size()>0) {
-        Iterator wsRefsIter = wsServiceRefs_.iterator();
-        for (int i = 0; i < wsServiceRefs_.size(); i++) {
-
-          ServiceRef wsServiceRef = (ServiceRef) wsRefsIter.next();
-          if (serviceRefName_== null || wsServiceRef.getServiceRefName().equalsIgnoreCase(serviceRefName_)) {
-              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]);
-      }
-      else if (wsServiceRefs_==null || wsServiceRefs_.isEmpty()){
-            //report no Web service client is available
-          return StatusUtils.errorStatus(ConsumptionUIMessages.MSG_ERROR_WEB_SERVICE_CLIENTS_NOT_FOUND);
-        }      
-    }
-    catch (Exception e) {
-      return StatusUtils.errorStatus( ConsumptionUIMessages.MSG_ERROR_TASK_EXCEPTED, e);
-    }
-    return Status.OK_STATUS;
-  }
-
-  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;
-  }
-
-  public String getServiceRefName() {
-    return this.serviceRefName_;
-  }
-
-  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);
-      }
-      else if (obj instanceof IFile){
-          Resource res = WorkbenchResourceHelperBase.getResource((IFile)obj, true);
-          Collection serviceRefs = null;
-          if (res instanceof WebServicesResource) {
-              // webservicesclient.xml for J2EE 1.3
-              WebServicesResource wsRes = (WebServicesResource)res;
-              serviceRefs = wsRes.getWebServicesClient().getServiceRefs();
-              ServiceRef ref = (ServiceRef)((List)serviceRefs).get(0);
-              serviceRefName_ = ref.getServiceRefName();
-              project_ = ProjectUtilities.getProject(ref);
-              return serviceRefs;
-          }
-          else {
-              if(res instanceof WebAppResource){
-                  // web.xml for J2EE 1.4
-                  WebAppResource webAppRes = (WebAppResource)res;
-                  serviceRefs = webAppRes.getWebApp().getServiceRefs();
-
-              }
-              else if (res instanceof EJBResource){
-                  EJBResource ejbRes = (EJBResource)res;
-                  serviceRefs = webServicesManager_.getServiceRefs(ejbRes.getEJBJar());
-                  
-              }
-              else if (res instanceof ApplicationClientResource){
-                  ApplicationClientResource appClientRes = (ApplicationClientResource)res;
-                  serviceRefs = webServicesManager_.getServiceRefs(appClientRes.getApplicationClient());//appClientRes.getApplicationClient().getServiceRefs();
-              }
-              if (serviceRefs!=null && serviceRefs.size()>0) {
-                  ServiceRef ref = (ServiceRef)((List)serviceRefs).get(0);
-                  serviceRefName_ = ref.getServiceRefName();
-                  project_ = ProjectUtilities.getProject(ref); 
-              }
-              return serviceRefs;              
-          }
-      }
-
-      // This section is for obtaining all the serviceRefs from the project, given that the initial selection
-      // was from the J2EE view (ServiceRef or WebServiceNavigatorGroupType), it will select the right serviceRef
-      if (project_==null){
-        project_ = getProject();
-      }
-      if (project_==null){
-        return null;
-      }     
-       
-      if (J2EEUtils.isWebComponent(project_)) {
-        WebArtifactEdit webEdit = null;
-        try {
-          IVirtualComponent vc = ComponentCore.createComponent(project_);          
-          webEdit = WebArtifactEdit.getWebArtifactEditForRead(vc);
-          if (webEdit != null)
-          {
-            WebApp webApp = (WebApp) webEdit.getDeploymentDescriptorRoot();
-            if (webApp != null) {
-              return webServicesManager_.getServiceRefs(webApp);
-            }
-          }
-        }
-        finally{
-          if(webEdit!=null)
-            webEdit.dispose();
-        }
-      }
-      else if (J2EEUtils.isEJBComponent(project_)){
-
-    	IVirtualComponent vc = ComponentCore.createComponent(project_);
-    	EJBJar ejbJar = EJBArtifactEditUtilities.getEJBJar(vc);
-        if (ejbJar!=null) {
-            return webServicesManager_.getServiceRefs(ejbJar);
-        }
-      }
-      else if (J2EEUtils.isAppClientComponent(project_)){
-    	  IVirtualComponent vc = ComponentCore.createComponent(project_);
-    	  AppClientArtifactEdit appEdit = null;
-          try {
-              appEdit = AppClientArtifactEdit.getAppClientArtifactEditForRead(vc);
-          if (appEdit!=null){
-              ApplicationClient appClient = appEdit.getApplicationClient();
-              if (appClient !=null){
-                  return webServicesManager_.getServiceRefs(appClient);
-              }
-          }
-          }
-          finally{
-              if(appEdit!=null){
-                  appEdit.dispose();
-              }
-          }
-      }
-
-    
-    }
-    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 4d77780bc..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientHandlersWidgetOutputCommand.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.applicationclient.componentcore.util.AppClientArtifactEdit;
-import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.jst.j2ee.webservice.wsclient.Handler;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory;
-import org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.Webservice_clientFactoryImpl;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.JavaMOFUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-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 AbstractDataModelOperation 
-{
-
-  private Hashtable oldWSServiceRefsToHandlersTable_;
-
-  private Hashtable newWSServiceRefsToHandlersTable_;
-
-  private Hashtable handlersTable_;
-
-  private IProject project_;
-
-  private Collection wsServiceRefs_;
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    IStatus status = Status.OK_STATUS;
-
-    try {
-
-      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 = JavaMOFUtils.getJavaClass(hti.getHandlerClassName(), project_);
-                  if (javaClass != null) {
-                    newHandler.setHandlerClass(javaClass);
-                  }
-
-                  ((List) newWSServiceRefsToHandlersTable_.get(wsRef)).add(newHandler);
-                }
-
-              }
-
-            }
-          }
-        }
-
-        // add handlers to ports
-        addHandlersToServiceRefs();
-        // save the artifact edit model
-        saveEditModel();
-
-      }
-    }
-    catch (Exception e) 
-    {
-      return StatusUtils.errorStatus(ConsumptionUIMessages.MSG_ERROR_TASK_EXCEPTED, e);
-    }
-
-    return status;
-  }
-
-  private void saveEditModel() {
-      ArtifactEdit artifactEdit = null;
-      try {
-          if (J2EEUtils.isWebComponent(project_)) {
-                artifactEdit = WebArtifactEdit.getWebArtifactEditForWrite(project_);
-          }
-          else if (J2EEUtils.isEJBComponent(project_)){
-                artifactEdit = EJBArtifactEdit.getEJBArtifactEditForWrite(project_);
-            }
-          else if (J2EEUtils.isAppClientComponent(project_)){
-                artifactEdit = AppClientArtifactEdit.getAppClientArtifactEditForWrite(project_);
-          }
-      }
-      finally {
-          if (artifactEdit!=null) {
-              artifactEdit.save(null);
-              artifactEdit.dispose();
-          }
-      }
-  }
-  
-  private void addHandlersToServiceRefs() {
-    try {
-      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();
-          //wsServiceRefs_.addAll(handlers);
-          modelHandlers.addAll(handlers);
-        }
-      }
-    }
-    catch (Exception e) {
-      e.printStackTrace();
-    }
-  }
-
-  /**
-   * The new handlerTableItems to set.
-   * @param handlerTableItems
-   */
-  public void setHandlersTable(Hashtable handlersTable) {
-    this.handlersTable_ = handlersTable;
-  }
-
-  public void setClientProject(IProject project) {
-    this.project_ = project;
-  }
-
-  public void setWsServiceRefs(Collection wsRefs) {
-    this.wsServiceRefs_ = wsRefs;
-  }
-
-}
\ 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 2e933bb60..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidget.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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.ConsumptionUIMessages;
-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.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-
-public class 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";
-    UIUtils      utils    = new UIUtils( 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, ConsumptionUIMessages.CHECKBOX_TEST_WEBSERVICE,
-    									ConsumptionUIMessages.TOOLTIP_PWPR_CHECKBOX_TEST_SERVICE,
-                                        INFOPOP_PWPR_CHECKBOX_TEST_SERVICE );
-    
-    // Create monitor service check box.
-    monitorService = utils.createCheckbox(testGroup, ConsumptionUIMessages.CHECKBOX_MONITOR_WEBSERVICE,
-    									ConsumptionUIMessages.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 void setInstallClient( Boolean install)
-  {
-    clientWidget_.setInstallClient( install );
-  }
-  
-  public Boolean getInstallClient()
-  {
-    return clientWidget_.getInstallClient();  
-  }
-  
-  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 f71c986dd..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidgetDefaultingCommand.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.jst.ws.internal.consumption.ui.widgets;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-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.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-public class ClientWizardWidgetDefaultingCommand extends AbstractDataModelOperation
-{    
-  public Boolean getTestService()
-  {
-    return new Boolean( getScenarioContext().getTestWebService() );
-  }
-  
-  public Boolean getMonitorService()
-  {
-    return new Boolean( getScenarioContext().getMonitorWebService());
-  }
-  
-  public Boolean getInstallClient()
-  {
-    return new Boolean( getScenarioContext().getInstallClient() );  
-  }
-
-  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  = WebServiceRuntimeExtensionUtils2.getAllRuntimesForClientSide()[0];
-    //String                       server   = registry.getAllClientServerFactoryIds()[0];
-		String                       server   = WebServiceRuntimeExtensionUtils2.getAllClientServerFactoryIds()[0];
-    TypeRuntimeServer            result   = new TypeRuntimeServer();
-		// rskreg
-    
-    result.setTypeId( type );
-    result.setRuntimeId( runtime );
-    result.setServerId( server ); 
-    
-    return result;  
-  }
-
-  public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
-  {
-    return Status.OK_STATUS;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.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 b800ecfee..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidgetOutputCommand.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.consumption.ui.widgets;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-public class ClientWizardWidgetOutputCommand extends AbstractDataModelOperation
-{    
-  private boolean           testService_;
-  private boolean monitorService;
-  private ResourceContext   resourceContext_;
-  private TypeRuntimeServer clientIds_;
-  private boolean installClient_;
-  
-  public boolean getTestService()
-  {
-    return testService_;
-  }
-
-  public void setTestService( boolean testService )
-  {
-    testService_ = testService;  
-  }
-  
-  public void setInstallClient( boolean installClient)
-  {
-    installClient_ = installClient;  
-  }
-  
-  public boolean getInstallClient()
-  {
-	return installClient_;  
-  }
-  
-  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;
-  }
-
-  public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
-  {
-    return Status.OK_STATUS;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.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 4bfc7c5b6..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ConfigClientHandlersTableWidget.java
+++ /dev/null
@@ -1,605 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-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.ConsumptionUIMessages;
-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.ControlAdapter;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.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.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-/**
- * ConfigClientHandlersTreeWidget
- *  
- */
-public class ConfigClientHandlersTableWidget extends SimpleWidgetDataContributor {
-
-  private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-
-  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$
-
-  /* CONTEXT_ID HDLR0002 for the Handler Config Page */
-  private final String INFOPOP_HDLR_GEN_SKELETON = "HDLR0002"; //$NON-NLS-1$
-
-  /* CONTEXT_ID HDLR0003 for the Handler Config Page */
-  private final String INFOPOP_COMBO_SOURCE_LOC = "HDLR0003"; //$NON-NLS-1$
-
-  /* CONTEXT_ID HDLR0004 for the Handler Config Page */
-  private final String INFOPOP_WS_CLIENT_REF = "HDLR0004"; //$NON-NLS-1$
-
-  // ------------------------
-
-  public ConfigClientHandlersTableWidget() {
-    super();
-  }
-
-  public WidgetDataEvents addControls(Composite parent, Listener statusListener) {
-
-    UIUtils uiUtils = new UIUtils(pluginId_);
-
-    parent_ = parent;
-
-    // Web service reference combo
-    Composite webServiceRefComp = uiUtils.createComposite(parent_, 2);
-    webServiceRefCombo_ = uiUtils.createCombo(webServiceRefComp, ConsumptionUIMessages.LABEL_COMBO_WS_CLIENT_REF, 
-    								ConsumptionUIMessages.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());
-
-    final 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 | GridData.GRAB_VERTICAL | GridData.FILL_VERTICAL);
-    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(ConsumptionUIMessages.LABEL_HANDLERS_CONFIG);
-    GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-    gd.horizontalSpan = 2;
-    handlersText.setLayoutData(gd);
-
-    handlersTable_ = uiUtils.createTable(handlersComp, ConsumptionUIMessages.TOOLTIP_EDIT_WS_HANDLERS, INFOPOP_HDLR_WS_HANDLERS, SWT.MULTI | SWT.FULL_SELECTION | SWT.BORDER);
-    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, ConsumptionUIMessages.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, ConsumptionUIMessages.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, ConsumptionUIMessages.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, ConsumptionUIMessages.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[] { ConsumptionUIMessages.LABEL_HANDLER_NAME, ConsumptionUIMessages.LABLE_HANDLER_CLASS};
-
-    final TableColumn[] tableCols = new TableColumn[columns_.length];
-    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);
-      tableCols[i] = tableColumn;
-    }
-
-    handlersComp.addControlListener(new ControlAdapter() {
-        public void controlResized(ControlEvent e) {
-          Rectangle area = handlersComp.getClientArea();
-          Point preferredSize = handlersTable_.computeSize(SWT.DEFAULT, SWT.DEFAULT);
-          int width = area.width - 2*handlersTable_.getBorderWidth()-10;
-          if (preferredSize.y > area.height + handlersTable_.getHeaderHeight()) {
-            // Subtract the scrollbar width from the total column width
-            // if a vertical scrollbar will be required
-            Point vBarSize = handlersTable_.getVerticalBar().getSize();
-            width -= vBarSize.x;
-          }
-          Point oldSize = handlersTable_.getSize();
-          if (oldSize.x > area.width) {
-            // table is getting smaller so make the columns 
-            // smaller first and then resize the table to
-            // match the client area width
-            tableCols[0].setWidth(width/2);
-            tableCols[1].setWidth(width - tableCols[0].getWidth());
-            handlersTable_.setSize(area.width, area.height);
-          } else {
-            // table is getting bigger so make the table 
-            // bigger first and then make the columns wider
-            // to match the client area width
-              handlersTable_.setSize(area.width, area.height);
-              tableCols[0].setWidth(width/2);
-              tableCols[1].setWidth(width - tableCols[0].getWidth());
-          }
-        }
-      });    
-    
-    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_, ConsumptionUIMessages.LABEL_BUTTON_GEN_SKELETON, ConsumptionUIMessages.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, ConsumptionUIMessages.LABEL_COMBO_SOURCE_LOC, ConsumptionUIMessages.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[] 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();
-    }
-
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#getStatus()
-   */
-  public IStatus getStatus() {
-    IStatus finalStatus = Status.OK_STATUS;
-
-    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();
-    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();
-    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();
-
-      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) {
-        // 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 7d6f7a0bb..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ConfigServiceHandlersTableWidget.java
+++ /dev/null
@@ -1,658 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-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.ConsumptionUIMessages;
-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.ControlAdapter;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.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.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-/**
- * ConfigServiceHandlersTreeWidget
- *  
- */
-public class ConfigServiceHandlersTableWidget extends SimpleWidgetDataContributor {
-
-  private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-  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 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 = 100;
-
-  // ----TOOLTIPS Section----
-  /* CONTEXT_ID SHLD0001 for the Handler Config Page */
-  private final String INFOPOP_HDLR_WS_HANDLERS = "SHDL0001"; //$NON-NLS-1$
-
-  /* CONTEXT_ID SHDL0002 for the Handler Config Page */
-  private final String INFOPOP_HDLR_GEN_SKELETON = "SHDL0002"; //$NON-NLS-1$
-
-  /* CONTEXT_ID SHDL0003 for the Handler Config Page */
-  private final String INFOPOP_COMBO_SOURCE_LOC = "SHDL0003"; //$NON-NLS-1$
-
-  /* CONTEXT_ID SHDL0004 for the Handler Config Page */
-  private final String INFOPOP_WS_SERVICE_DESC = "SHDL0004"; //$NON-NLS-1$
-
-  // ------------------------
-
-  public ConfigServiceHandlersTableWidget() {
-    super();
-  }
-
-  public WidgetDataEvents addControls(Composite parent, Listener statusListener) {
-    UIUtils uiUtils = new UIUtils( pluginId_);
-
-    parent_ = parent;
-    
-    int maxWidth = 130;
-    int maxHeight = 600;
-
-    // Web service reference combo
-    Composite webServiceRefComp = uiUtils.createComposite(parent_, 2);
-    webServiceDescCombo_ = uiUtils.createCombo(webServiceRefComp, ConsumptionUIMessages.LABEL_COMBO_WS_SERVICE_DESC, 
-    		ConsumptionUIMessages.TOOLTIP_WS_SERVICE_DESC, INFOPOP_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());
-
-    final 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 | GridData.GRAB_VERTICAL | GridData.FILL_VERTICAL);
-    handlersComp.setLayoutData(griddata);
-    handlersComp.setSize(maxWidth, maxHeight);
-
-    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(ConsumptionUIMessages.LABEL_HANDLERS_CONFIG);
-    GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-    gd.horizontalSpan = 2;
-    handlersText.setLayoutData(gd);
-
-    handlersTable_ = uiUtils.createTable(handlersComp, ConsumptionUIMessages.TOOLTIP_EDIT_WS_HANDLERS, INFOPOP_HDLR_WS_HANDLERS, SWT.MULTI | SWT.FULL_SELECTION | SWT.BORDER);
-    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, ConsumptionUIMessages.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, ConsumptionUIMessages.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, ConsumptionUIMessages.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, ConsumptionUIMessages.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[] {ConsumptionUIMessages.LABEL_HANDLER_NAME, ConsumptionUIMessages.LABLE_HANDLER_CLASS,
-    		ConsumptionUIMessages.LABEL_HANDLER_PORT};
-
-    final TableColumn[] tableCols = new TableColumn[columns_.length];
-    for (int i = 0; i < columns_.length; i++) {
-      TableColumn tableColumn = new TableColumn(handlersTable_, SWT.LEFT);
-      tableColumn.setText(columns_[i]);
-      tableColumn.setAlignment(SWT.LEFT);
-      tableColumn.setWidth(DEFAULT_COLUMN_WIDTH);
-      tableColumn.setResizable(true);
-      tableCols[i] = tableColumn;
-    }
-    handlersComp.addControlListener(new ControlAdapter() {
-        public void controlResized(ControlEvent e) {
-          Rectangle area = handlersComp.getClientArea();
-          Point preferredSize = handlersTable_.computeSize(SWT.DEFAULT, SWT.DEFAULT);
-          int width = area.width - 2*handlersTable_.getBorderWidth()-10;
-          if (preferredSize.y > area.height + handlersTable_.getHeaderHeight()) {
-            // Subtract the scrollbar width from the total column width
-            // if a vertical scrollbar will be required
-            Point vBarSize = handlersTable_.getVerticalBar().getSize();
-            width -= vBarSize.x;
-          }
-          Point oldSize = handlersTable_.getSize();
-          if (oldSize.x > area.width) {
-            // table is getting smaller so make the columns 
-            // smaller first and then resize the table to
-            // match the client area width
-            tableCols[0].setWidth(width/3);
-            tableCols[1].setWidth(width/3);
-            tableCols[2].setWidth(width - (tableCols[0].getWidth()+tableCols[1].getWidth()));
-            handlersTable_.setSize(area.width, area.height);
-          } else {
-            // table is getting bigger so make the table 
-            // bigger first and then make the columns wider
-            // to match the client area width
-              handlersTable_.setSize(area.width, area.height);
-              tableCols[0].setWidth(width/3);
-              tableCols[1].setWidth(width/3);
-              tableCols[2].setWidth(width - (tableCols[0].getWidth()+tableCols[1].getWidth()));
-          }
-        }
-      });
-    
-    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_, ConsumptionUIMessages.LABEL_BUTTON_GEN_SKELETON, ConsumptionUIMessages.TOOLTIP_BUTTON_GEN_SKELETON, INFOPOP_HDLR_GEN_SKELETON);
-    griddata = new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL);
-    genSkeletonRadioButton_.setLayoutData( griddata );    
-    genSkeletonRadioButton_.addSelectionListener(new SelectionAdapter() {
-
-      public void widgetSelected(SelectionEvent evt) {
-        handleGenSkeletonRadioButton();
-      }
-    });
-
-    Composite sourceLocationComp = uiUtils.createComposite(parent_, 2);
-    sourceLocationCombo_ = uiUtils.createCombo(sourceLocationComp, ConsumptionUIMessages.LABEL_COMBO_SOURCE_LOC, ConsumptionUIMessages.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[] 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) {
-    populateHandlersTable();
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#getStatus()
-   */
-  public IStatus getStatus() {
-    IStatus finalStatus = Status.OK_STATUS;
-
-    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();
-    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();
-    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();
-
-      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) {
-        // 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 f5b6e148c..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/HandlersDefaultingCommand.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.consumption.ui.widgets;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.webservice.WebServiceNavigatorGroupType;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-
-
-/**
- * HandlersDefaultingCommand
- * 
- * Determine if Handlers belongs to service or client side
- */
-public class HandlersDefaultingCommand extends AbstractHandlersWidgetDefaultingCmd 
-{
-  private boolean isClientHandler_ = false;
-  private boolean isServiceHandler_ = false;
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {    
-    IEnvironment env = getEnvironment();
-    IStatus status = Status.OK_STATUS;
-
-    IStructuredSelection selection = getInitialSelection();
-    if (selection != null && selection.size() == 1) {
-        Object obj = selection.getFirstElement();
-
-        if (obj instanceof WebServiceNavigatorGroupType) {
-          WebServiceNavigatorGroupType wsngt = (WebServiceNavigatorGroupType) obj;
-          if (wsngt.getWsdlService()!=null){
-          	isServiceHandler_ = true;
-          }
-          
-          if (wsngt.getServiceRef()!=null){
-          	isClientHandler_ = true;
-          }
-
-        }
-      }
-    else {
-      status = StatusUtils.errorStatus( ConsumptionUIMessages.MSG_ERROR_TASK_EXCEPTED );
-      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 7be3001ef..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ImportWSILWidget.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.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.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-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.ConsumptionUIMessages;
-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.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.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.ws.internal.wsil.AddWSDLToWSILCommand;
-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_;
-  
-  /**
-  * Constructs a new page.
-  */
-  public ImportWSILWidget()
-  {
-  }
-
-  public WidgetDataEvents addControls(Composite parent, Listener statusListener)
-  {
-  	IWorkbenchHelpSystem helpSystem = PlatformUI.getWorkbench().getHelpSystem();
-  	
-    parent.setToolTipText(ConsumptionUIMessages.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(ConsumptionUIMessages.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(ConsumptionUIMessages.TOOLTIP_WSIL_TEXT_WSIL);
-    helpSystem.setHelp(wsil_, INFOPOP_WSIL_TEXT_WSIL);
-
-    browse_ = new Button(composite, SWT.PUSH);
-    browse_.setText(ConsumptionUIMessages.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(ConsumptionUIMessages.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(ConsumptionUIMessages.LABEL_WSDL);
-    label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-    String[] columns = {ConsumptionUIMessages.LABEL_WSDL_URI};
-    wsdls_ = new TableViewerEditor(wsdlComposite, columns, new ArrayList(), "http://");
-    wsdls_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSIL_TABLE_WSDL);
-    wsdls_.setInfopop(INFOPOP_WSIL_TABLE_WSDL);
-    return this;
-  }
-
-  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 IStatus getStatus()
-  {
-    if (!wsil_.getText().endsWith(".wsil"))
-      return StatusUtils.errorStatus( ConsumptionUIMessages.PAGE_MSG_INVALID_WSIL_FILE_NAME );
-    else
-      return Status.OK_STATUS;
-  }
-  
-  public void setInitialSelection(IStructuredSelection 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 27fc72bbe..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PreferencesSelectionWidget.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;
-
-import org.eclipse.jst.ws.internal.ui.WSUIPluginMessages;
-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.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-
-public class 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       conPluginId = "org.eclipse.jst.ws.consumption.ui";
-  	UIUtils      utils       = new UIUtils( conPluginId );
-  	
-    Composite resourcesGroup = utils.createComposite( parent, 1 );
-    
-    overwriteFilesCheckbox_ = utils.createCheckbox( resourcesGroup, WSUIPluginMessages.BUTTON_OVERWRITE_FILES,
-    		WSUIPluginMessages.TOOLTIP_PPRM_CHECKBOX_OVERWRITE_FILES, 
-                                                    INFOPOP_PWPR_CHECKBOX_OVERWRITE_FILES );
-                                                 
-    createFoldersCheckbox_ = utils.createCheckbox( resourcesGroup, WSUIPluginMessages.BUTTON_CREATE_FOLDERS,
-    		WSUIPluginMessages.TOOLTIP_PPRM_CHECKBOX_CREATE_FOLDERS , 
-                                                   INFOPOP_PWPR_CHECKBOX_CREATE_FOLDERS );
-                                                      
-    checkoutFilesCheckbox_ = utils.createCheckbox( resourcesGroup, WSUIPluginMessages.BUTTON_CHECKOUT_FILES,
-    		WSUIPluginMessages.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 656491948..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PublishToPrivateUDDICommandFragment.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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.PrivateUDDIRegistryTypeRegistry;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.AbstractCommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.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(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 d044f7ced..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PublishWSWidget.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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.ConsumptionUIMessages;
-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.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.help.IWorkbenchHelpSystem;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.ws.internal.explorer.LaunchOption;
-import org.eclipse.wst.ws.internal.explorer.LaunchOptions;
-
-
-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 Listener statusListener;
-  private Boolean publish;
-
-  public PublishWSWidget(boolean publish)
-  {
-	  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(ConsumptionUIMessages.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(ConsumptionUIMessages.BUTTON_WS_PUBLISH_PRIVATE_UDDI);
-    else
-      launchPrivateUDDICheckbox_.setText(ConsumptionUIMessages.BUTTON_WS_FIND_PRIVATE_UDDI);
-    launchPrivateUDDICheckbox_.setToolTipText(ConsumptionUIMessages.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(ConsumptionUIMessages.BUTTON_WS_PUBLISH);
-    else
-      launchUDDICheckbox_.setText(ConsumptionUIMessages.BUTTON_WS_FIND);
-    launchUDDICheckbox_.setToolTipText(ConsumptionUIMessages.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(ConsumptionUIMessages.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 546cbfc0b..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ServiceHandlersWidgetDefaultingCommand.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.jst.ws.internal.consumption.ui.widgets;
-
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.webservice.WebServiceNavigatorGroupType;
-import org.eclipse.jst.j2ee.internal.webservice.helper.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.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.internal.impl.ServiceImpl;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-
-/**
- * ServiceHandlersWidgetDefaultingCommand
- * 
- * Initialize and load the handlers data
- */
-public class ServiceHandlersWidgetDefaultingCommand extends AbstractHandlersWidgetDefaultingCmd {
-
-  private HandlerTableItem[] handlers_;
-  private WebServiceDescription wsDescription_;
-  private WsddResource wsddResource_;
-  private WebServicesManager webServicesManager_;
-  private IProject project_;
-  private Hashtable wsDescToHandlers_;
-  private Hashtable serviceDescNameToDescObj_;
-  private String descriptionName_ = null;
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {    
-    IEnvironment env = getEnvironment();
-    IStatus status = Status.OK_STATUS;
-
-    webServicesManager_ = new WebServicesManager();
-    IStructuredSelection selection = getInitialSelection();
-    if (selection == null) {
-      status = StatusUtils.errorStatus( ConsumptionUIMessages.MSG_ERROR_TASK_EXCEPTED );
-      env.getStatusHandler().reportError(status);
-      return status;
-    }
-
-    status = processHandlers(env);
-    return status;
-
-  }
-
-  public IStatus processHandlers(IEnvironment env) {
-    try {
-      Vector handlers = new Vector();
-      wsDescToHandlers_ = new Hashtable();
-      serviceDescNameToDescObj_ = new Hashtable();
-      
-      wsddResource_ = getWsddResourceFromSelection();
-      if (wsddResource_ == null) {
-          return StatusUtils.errorStatus(ConsumptionUIMessages.MSG_ERROR_WSDD_NOT_FOUND);
-      }
-
-      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]);
-      }
-      else {
-          //report no Web service is available
-          return StatusUtils.errorStatus(ConsumptionUIMessages.MSG_ERROR_WEB_SERVICES_NOT_FOUND);        
-      }      
-    }
-    catch (Exception e) 
-    {
-      e.printStackTrace();
-      return StatusUtils.errorStatus( ConsumptionUIMessages.MSG_ERROR_TASK_EXCEPTED, e);
-    }
-    return Status.OK_STATUS;
-  }
-
-  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);
-      }
-      else if (obj instanceof IFile){
-    	  // webservices.xml file
-    	  Resource res = WorkbenchResourceHelperBase.getResource((IFile)obj, true);
-    	  WsddResource wsddRes = (WsddResource)res;
-    	  project_ = ProjectUtilities.getProject(res);
-    	  return wsddRes;
-      }
-    }
-    
-    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 504f1e5c6..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ServiceHandlersWidgetOutputCommand.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.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.j2ee.webservice.wsdd.internal.impl.WsddFactoryImpl;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-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 AbstractDataModelOperation
-{
-
-  private WsddResource wsddResource_;
-  private Hashtable wsDescToHandlers_;
-  private Hashtable serviceDescNameToDescObj_;
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    IStatus status = Status.OK_STATUS;
-    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 {
-      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 {
-      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) {
-  }
-
-  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 ed902a368..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/TableViewerWidget.java
+++ /dev/null
@@ -1,616 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-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.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.ui.dialog.DialogUtils;
-import org.eclipse.osgi.util.NLS;
-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.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-
-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;
-    
-	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(ConsumptionUIMessages.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(ConsumptionUIMessages.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(ConsumptionUIMessages.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();
-   
-	for(int cnt=0; cnt<values_.size(); cnt++){
-		String[] value = (String[])values_.get(cnt);
-		if(map.containsKey(value[0]) && ((rescriction & 1)!=0)){
-			message =NLS.bind(ConsumptionUIMessages.MSG_MAPPING_DUPLICATE_ENTRIES, new String[]{columns_[0],columns_[1]});
-			return;
-		}
-		if(map.containsValue(value[1]) && ((rescriction & 2)!=0)){
-			message =NLS.bind(ConsumptionUIMessages.MSG_MAPPING_DUPLICATE_ENTRIES, new String[]{columns_[1],columns_[0]});
-			return;
-		}
-		map.put(value[0],value[1]);
-
-	}
-	message = null;
-
-  }
-
-  public IStatus getStatus()
-  {
-    return message == null ? Status.OK_STATUS : 
-                             StatusUtils.errorStatus( message );
-  }
-
-  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 ad041c0db..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionConditionCommand.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.ui.widgets;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.wsil.DialogWWWAuthentication;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.core.common.Condition;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WWWAuthenticationException;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServiceEntity;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-public class WSDLSelectionConditionCommand extends AbstractDataModelOperation implements Condition
-{
-  private WebServicesParser webServicesParser;
-  private String webServiceURI;
-  private String httpBasicAuthUsername;
-  private String httpBasicAuthPassword;
-  private boolean needWSDLSelectionTreeWidget;
-  
-  public WSDLSelectionConditionCommand()
-  {
-  }
-
-  public void setWebServicesParser(WebServicesParser webServicesParser)
-  {
-    this.webServicesParser = webServicesParser;
-  }
-
-  public WebServicesParser getWebServicesParser()
-  {
-  	if (webServicesParser == null)
-  	  webServicesParser = new WebServicesParserExt();
-  	return webServicesParser;
-  }
-  
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-  	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 StatusUtils.errorStatus( NLS.bind(ConsumptionUIMessages.MSG_ERROR_URI_NOT_RESOLVABLE, new Object[] {webServiceURI}), t);
-        }
-        finally
-        {
-          parser.setHTTPBasicAuthUsername(null);
-          parser.setHTTPBasicAuthPassword(null);
-        }
-      }
-    }
-    catch (Throwable t)
-    {
-      return StatusUtils.errorStatus( NLS.bind(ConsumptionUIMessages.MSG_ERROR_URI_NOT_RESOLVABLE, new Object[] {webServiceURI}), t);
-    }
-    WebServiceEntity wsEntity = parser.getWebServiceEntityByURI(webServiceURI);
-    if (wsEntity != null)
-    {
-      int type = wsEntity.getType();
-      if (type != WebServiceEntity.TYPE_WSDL)
-      	needWSDLSelectionTreeWidget = true;
-    }
-    return Status.OK_STATUS;
-  }
-  
-  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 d861819f4..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionOutputCommand.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-public class WSDLSelectionOutputCommand extends AbstractDataModelOperation
-{
-  private WebServicesParser webServicesParser;
-  private String wsdlURI;
-  private IProject project;
-  private String componentName;
-  
-  private boolean testService;
-  
-  
-  public boolean getTestService() {
-    return testService;
-  }
-
-  
-  public void setTestService(boolean testService) {
-    this.testService = testService;
-  }
-
-  /**
-   * @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 getComponentName()
-  {
-    return componentName;
-  }
-
-  public void setComponentName(String componentName)
-  {
-    this.componentName = componentName;
-  }
-
-  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 IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    IEnvironment env = getEnvironment();
-       
-    if (wsdlURI != null && getWebServicesParser().getWSDLDefinition(wsdlURI) != null) {
-      IStatus status = Status.OK_STATUS;     
-      Map services = getWebServicesParser().getWSDLDefinition(wsdlURI).getServices();
-      if (services.isEmpty()){
-        if (testService==true){
-            testService = false;
-            status = StatusUtils.warningStatus( ConsumptionUIMessages.MSG_WARNING_NO_SERVICE_ELEMENT );
-            try{
-              env.getStatusHandler().report(status);
-            }catch(Exception e){
-              status = StatusUtils.errorStatus( ConsumptionUIMessages.MSG_WARNING_NO_SERVICE_ELEMENT );
-            }
-        }
-      }    
-    return status;
-  }
-    else
-    {
-      IStatus status = StatusUtils.errorStatus( ConsumptionUIMessages.PAGE_MSG_SELECTION_MUST_BE_WSDL );
-      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 71c3af8d1..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionTreeWidget.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-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.ConsumptionUIMessages;
-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.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServiceEntity;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-/**
-* This wizard page allows the user to select the WSDL URI for consumption
-*/
-public class WSDLSelectionTreeWidget extends SimpleWidgetDataContributor
-{
-  private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-
-  /*CONTEXT_ID PWWS0001 for the WSDL Selection Page*/
-  private final String INFOPOP_PWWS_PAGE = ".PWWS0001";
-
-  private WebServicesParser webServicesParser;
-  private String webServiceURI;
-  
-  private Listener statusListener;
-  private TreeViewer treeViewer_;
-  private TreeContentProvider treeContentProvider;
-  private Tree tree_;
-  private int pageWidth_;
-
-  /**
-  * Default constructor.
-  */
-  public WSDLSelectionTreeWidget()
-  {
-  }
-
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener )
-  {
-  	this.statusListener = statusListener;
-    parent.setToolTipText(ConsumptionUIMessages.TOOLTIP_PWWS_PAGE);
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, pluginId_ + INFOPOP_PWWS_PAGE);
-
-    Label wsdlLabel = new Label(parent, SWT.WRAP);
-    wsdlLabel.setText(ConsumptionUIMessages.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 IStatus getStatus()
-  {
-    WebServiceEntity wsEntity = getSelectionAsWebServiceEntity();
-    if (wsEntity == null || wsEntity.getType() != WebServiceEntity.TYPE_WSDL)
-      return StatusUtils.errorStatus( ConsumptionUIMessages.PAGE_MSG_SELECTION_MUST_BE_WSDL );
-    else
-      return Status.OK_STATUS;
-  }
-
-  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 fc40135fe..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionWidgetDefaultingCommand.java
+++ /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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import org.eclipse.core.commands.ExecutionException;
-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.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.ws.internal.common.J2EEActionAdapterFactory;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.wsdl.internal.impl.ServiceImpl;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-
-public class WSDLSelectionWidgetDefaultingCommand extends AbstractDataModelOperation
-{
-  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;
-  }
-  
-  public String getComponentName()
-  {
-    String cname = getComponentNameFromInitialSelection(selection_);
-    return cname;
-  }
-  
-  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 getComponentNameFromInitialSelection(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;
-          
-          IVirtualComponent comp = ResourceUtils.getComponentOf(resource);
-          if (comp!=null)
-          {
-            return comp.getName();
-          }
-        } catch(CoreException e)
-        {
-          return null;
-        }        
-      }
-    }
-    return null;
-  }
-
-  public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
-  {
-    return Status.OK_STATUS;
-  }  
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.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 e05e8fd19..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionWidgetWrapper.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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.core.runtime.IStatus;
-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.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-public class WSDLSelectionWidgetWrapper extends SimpleWidgetDataContributor
-{
-  private WSDLSelectionWidget wsdlSelectionWidget;
-  private IProject project;
-  private String componentName;
-  
-  public WSDLSelectionWidgetWrapper()
-  {
-  }
-  
-  public WidgetDataEvents addControls(Composite parent, Listener statusListener)
-  {
-    wsdlSelectionWidget = new WSDLSelectionWidget();
-    wsdlSelectionWidget.addControls(parent, statusListener);
-    return this;
-  }
-  
-  public IStatus 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;
-  }
-
-  public String getComponentName()
-  {
-    String cname = wsdlSelectionWidget.getComponentName();
-    if (cname==null)
-    {
-      return componentName;
-    }
-    else
-      return cname;
-  }
-
-  public void setComponentName(String componentName)
-  {
-    this.componentName = componentName;
-  }
-  
-    
-}
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 0300fc2f7..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WebServiceClientTypeWidget.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.internal.consumption.ui.widgets;
-
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-import org.eclipse.jst.ws.internal.data.LabelsAndIds;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.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.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.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";
-
-  /*CONTEXT_ID PWPR0016 for the Install Client check box of the Scenario page of Service and Client wizards*/
-  private String INFOPOP_PWPR_CHECKBOX_INSTALL_CLIENT = "PWPR0016";
-  
-  private Combo  clientTypeCombo_;
-  
-  private Button installClient_;
-      
-  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";
-    UIUtils      utils    = new UIUtils( pluginId );
-  	
-    Group clientGroup = utils.createGroup( parent, 
-    		ConsumptionUIMessages.GROUP_SCENARIO_CLIENT,
-    		ConsumptionUIMessages.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, 
-    		ConsumptionUIMessages.LABEL_WEBSERVICECLIENTTYPE,
-    		ConsumptionUIMessages.TOOLTIP_PWPR_COMBO_CLIENTTYPE, 
-                                          INFOPOP_PWPR_COMBO_CLIENTTYPE, 
-                                          comboStyle );
-           
-    Composite buttonGroup = utils.createComposite( clientGroup, 1 );
-    GridData  buttonGrid   = new GridData();
-    buttonGrid.horizontalSpan = 2;
-    buttonGroup.setLayoutData( buttonGrid );
-    
-    installClient_ = utils.createCheckbox( buttonGroup, ConsumptionUIMessages.BUTTON_INSTALL_CLIENT_WEB_PROJECT,
-			ConsumptionUIMessages.TOOLTIP_PWPR_CHECKBOX_INSTALL_CLIENT_WEB_PROJECT,
-			INFOPOP_PWPR_CHECKBOX_INSTALL_CLIENT );
-    
-    
-    
-    return this;
-  }
-  
-  public void enableWidget( boolean enable )
-  {
-    clientTypeCombo_.setEnabled( enable );
-    installClient_.setEnabled( enable );
-  }
-
-  public void setTypeRuntimeServer( TypeRuntimeServer ids )
-  {
-		// rskreg
-    //WebServiceClientTypeRegistry registry   = WebServiceClientTypeRegistry.getInstance();
-    //LabelsAndIds                 labelIds   = registry.getClientTypeLabels();
-		LabelsAndIds                 labelIds   = WebServiceRuntimeExtensionUtils2.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_;  
-  }
-      
-  public Boolean getInstallClient()
-  {
-    return new Boolean( installClient_.getSelection() );
-  }
-  
-  public void setInstallClient( Boolean value )
-  {
-    installClient_.setSelection( value.booleanValue() );  
-  }
-  
-
-}
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 bc2eada23..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ClientWidgetBinding.java
+++ /dev/null
@@ -1,423 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060204 124408    rsinha@ca.ibm.com - Rupam Kuehner          
- * 20060204 121605    rsinha@ca.ibm.com - Rupam Kuehner
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.binding;
-
-import org.eclipse.jst.ws.internal.consumption.command.common.GetMonitorCommand;
-import org.eclipse.jst.ws.internal.consumption.common.ScenarioCleanupCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-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.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.widgets.CheckWSDLValidationCommand;
-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.runtime.ClientRuntimeSelectionWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime.ClientRuntimeSelectionWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestDelegateCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.FinishDefaultCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.FinishTestFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.TestDefaultingFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WebServiceClientTestArrivalCommand;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.SelectionCommand;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-import org.eclipse.wst.ws.internal.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 ClientWidgetBinding implements CommandWidgetBinding
-{  
-  /* (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)
-  {
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry)
-   */
-  public void registerDataMappings(DataMappingRegistry dataRegistry)
-  {    
-    // Before ClientWizardWidget
-    dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientWizardWidget.class);
-    dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "InstallClient", 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, "InstallClient", 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(ClientWizardWidgetOutputCommand.class, "InstallClient", ClientRuntimeSelectionWidget.class);
-    dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientRuntimeSelectionWidget.class);
-    dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientRuntimeId", ClientRuntimeSelectionWidget.class);
-    dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", ClientRuntimeSelectionWidget.class);    
-    dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", ClientRuntimeSelectionWidget.class);
-    dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentType", ClientRuntimeSelectionWidget.class);
-    //dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientJ2EEVersion", ClientRuntimeSelectionWidget.class, "J2EEVersion", null);
-    //dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "Runtime2ClientTypes", ClientRuntimeSelectionWidget.class);
-    //dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentName", ClientRuntimeSelectionWidget.class);
-    //dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarComponentName", ClientRuntimeSelectionWidget.class);
-    dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientNeedEAR", ClientRuntimeSelectionWidget.class,"NeedEAR",null);
-    
-    // After ClientRuntimeSelectionWidget
-    dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "ClientTypeRuntimeServer", ClientExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "ClientRuntimeId", ClientExtensionDefaultingCommand.class);
-    //dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "J2EEVersion", ClientExtensionDefaultingCommand.class, "ClientJ2EEVersion", null);
-    //dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "Runtime2ClientTypes", ClientExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "ClientProjectName", ClientExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "ClientEarProjectName", ClientExtensionDefaultingCommand.class); 
-    //dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "ClientComponentName", ClientExtensionDefaultingCommand.class);
-    //dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "ClientEarComponentName", ClientExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "ClientComponentType", 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 );
-    dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "ComponentName", 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);
-    dataRegistry.addMapping(WSDLSelectionWidgetWrapper.class, "ComponentName", WSDLSelectionOutputCommand.class);
-	dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "GenerateProxy",TestDefaultingFragment.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)
-  {
-       
-    widgetRegistry.add( "ClientWizardWidget", 
-    		ConsumptionUIMessages.PAGE_TITLE_WS_PROJECT,
-                        ConsumptionUIMessages.PAGE_DESC_WS_PROJECT,
-				        new WidgetContributorFactory()
-				        {
-				          public WidgetContributor create()
-				          {
-				            return new ClientWizardWidget();
-				          }
-				        } );
-    
-    widgetRegistry.add( "ClientRuntimeSelectionWidget", 
-                        ConsumptionUIMessages.PAGE_TITLE_WS_CLIENT_RUNTIME_SELECTION,
-                        ConsumptionUIMessages.PAGE_DESC_WS_CLIENT_RUNTIME_SELECTION,
-						new WidgetContributorFactory()
-                        {
-						  public WidgetContributor create()
-						  {
-						    return new ClientRuntimeSelectionWidget();
-						  }
-						} );
-    
-    widgetRegistry.add( "WSDLSelectionWidgetWrapper", 
-                        ConsumptionUIMessages.PAGE_TITLE_WS_SELECTION,
-                        ConsumptionUIMessages.PAGE_DESC_WS_SELECTION,
-		                new WidgetContributorFactory()
-                        {
-		                  public WidgetContributor create()
-		                  {
-		                    return new WSDLSelectionWidgetWrapper();
-		                  }
-		                } );
-    
-    widgetRegistry.add( "ClientTestWidget", 
-                        ConsumptionUIMessages.PAGE_TITLE_WS_SAMPLE,
-                        ConsumptionUIMessages.PAGE_DESC_WS_SAMPLE,
-                        new WidgetContributorFactory()
-                        {
-                          public WidgetContributor create()
-                          {
-                            return new ClientTestWidget(); 
-                          }
-                        });
-  }
-  
-  private class ClientRootCommandFragment extends SequenceFragment
-  {
-    public ClientRootCommandFragment()
-    {
-      add( new SimpleFragment( new ScenarioCleanupCommand(), "" ));
-      
-      //add( new SimpleFragment( new CheckForMissingFiles(), "" ) );
-      add( new SimpleFragment( new ClientWizardWidgetDefaultingCommand(), "" ) );
-      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 CheckWSDLValidationCommand(), ""));
-      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 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());
-      
-      add( new SimpleFragment( new ScenarioCleanupCommand(), "" ));
-    }
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry)
-     */
-    public void registerDataMappings(DataMappingRegistry dataRegistry)
-    {
-      //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, "InstallClient", 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", WSDLSelectionOutputCommand.class);
-      dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "InstallClient", ClientExtensionDefaultingCommand.class);      
-            
-      dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "TestService", ClientExtensionDefaultingCommand.class);      
-      dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "TestService", ClientRuntimeSelectionWidgetDefaultingCommand.class);       
-      
-      dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "ResourceContext", ClientRuntimeSelectionWidgetDefaultingCommand.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, "ClientRuntimeId", ClientExtensionDefaultingCommand.class);
-      //dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "Runtime2ClientTypes", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", ClientExtensionDefaultingCommand.class);
-      //dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarComponentName", ClientExtensionDefaultingCommand.class);
-      //dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentName", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentType", ClientExtensionDefaultingCommand.class);
-      //dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientJ2EEVersion", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientNeedEAR", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", 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);
-      dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "ComponentName", 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, "ComponentName", ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialComponentName", null);
-      dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WebServicesParser", ClientRuntimeSelectionWidgetDefaultingCommand.class);
-      dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WsdlURI", CheckForServiceProjectCommand.class);
-      dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WebServicesParser", CheckForServiceProjectCommand.class);      
-	  
-	  // Setup the PreClientDevelopCommand.
-      dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "InstallClient", PreClientDevelopCommand.class);
-      
-      //Always start the client if it is installed.      
-      dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "InstallClient", PreClientDevelopCommand.class, "StartService", null);                 
-      
-      dataRegistry.addMapping( ClientExtensionDefaultingCommand.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( ClientExtensionDefaultingCommand.class, "ClientRuntimeId", 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, "ClientProjectEAR", WebServiceClientTestArrivalCommand.class);
-	  dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject", WebServiceClientTestArrivalCommand.class);
-            
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "GenerateProxy", ClientTestFragment.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", ClientTestFragment.class );     
-      
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientNeedEAR", ClientTestDelegateCommand.class);
-	  dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientEarProjectName", ClientTestDelegateCommand.class);
-	  dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientEarProjectName", ClientTestDelegateCommand.class,"ClientEarComponentName", null);
-	  dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject",ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServer", ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "WsdlURI", ClientTestDelegateCommand.class);
-      
-      // Map ClientExtensionOutputCommand command.
-      dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ProxyBean", WebServiceClientTestArrivalCommand.class);      
-	  dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ProxyBean", ClientTestDelegateCommand.class);      
-	  dataRegistry.addMapping(ClientExtensionOutputCommand.class, "GenerateProxy", ClientTestFragment.class);
-      dataRegistry.addMapping(ClientExtensionOutputCommand.class, "GenerateProxy", FinishTestFragment.class);
-      dataRegistry.addMapping(ClientExtensionOutputCommand.class, "SetEndpointMethod", ClientTestDelegateCommand.class);
-	  dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ServerInstanceId", FinishDefaultCommand.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);
-      
-      // Map WebServiceClientTestArrivalCommand command.
-      dataRegistry.addMapping(TestDefaultingFragment.class, "TestFacility",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);
-      
-            
-      //Mappings to enable peek-ahead for Page 3 of the client wizard
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "WebService", DevelopClientFragment.class );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Environment", DevelopClientFragment.class );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Context", DevelopClientFragment.class );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Selection", DevelopClientFragment.class );
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", DevelopClientFragment.class, "Project", null );
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", DevelopClientFragment.class, "Module", null );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", DevelopClientFragment.class, "EarProject", null );
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", DevelopClientFragment.class, "Ear", null );
-    
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "WebService", AssembleClientFragment.class );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Environment", AssembleClientFragment.class );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Context", AssembleClientFragment.class );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Selection", AssembleClientFragment.class );
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", AssembleClientFragment.class, "Project", null );
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", AssembleClientFragment.class, "Module", null );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", AssembleClientFragment.class, "EarProject", null );
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", AssembleClientFragment.class, "Ear", null );
-    
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "WebService", DeployClientFragment.class );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Environment", DeployClientFragment.class );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Context", DeployClientFragment.class );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Selection", DeployClientFragment.class );
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", DeployClientFragment.class, "Project", null );
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", DeployClientFragment.class, "Module", null );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", DeployClientFragment.class, "EarProject", null );
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", DeployClientFragment.class, "Ear", null );
-    
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "WebService", InstallClientFragment.class );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Environment", InstallClientFragment.class );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Context", InstallClientFragment.class );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Selection", InstallClientFragment.class );
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", InstallClientFragment.class, "Project", null );
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", InstallClientFragment.class, "Module", null );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", InstallClientFragment.class, "EarProject", null );
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", InstallClientFragment.class, "Ear", null );
-    
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "WebService", RunClientFragment.class );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Environment", RunClientFragment.class );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Context", RunClientFragment.class );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Selection", RunClientFragment.class );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", RunClientFragment.class, "Project", null );
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", RunClientFragment.class, "Module", null );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", RunClientFragment.class, "EarProject", null );
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", RunClientFragment.class, "Ear", null );      
-    }
-  }
-}
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 dda8dc338..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigClientHandlersWidgetBinding.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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.ConsumptionUIMessages;
-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.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.SelectionCommand;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-
-
-/**
- * 
- * Handler Configuration Window - Preferences - Java - Code Generation - Code
- * and Comments
- */
-public class ConfigClientHandlersWidgetBinding implements CommandWidgetBinding 
-{
-  
-  /*
-   * (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) {
-
-    widgetRegistry.add("ConfigClientHandlersTableWidget", 
-        ConsumptionUIMessages.PAGE_TITLE_CLIENT_HDLR_CONFIG, 
-        ConsumptionUIMessages.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.internal.env.core.data.DataMappingRegistry)
-   */
-  public void registerDataMappings(DataMappingRegistry dataRegistry) {
-    
-    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);
-
-    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) {
-
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.wst.command.internal.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.internal.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry)
-     */
-    public void registerDataMappings(DataMappingRegistry dataRegistry)
-    {
-      dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ClientHandlersWidgetDefaultingCommand.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 94654e13c..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigServiceHandlersWidgetBinding.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.binding;
-
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-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.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.SelectionCommand;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-
-
-/**
- * 
- * Handler Configuration Window - Preferences - Java - Code Generation - Code
- * and Comments
- */
-public class ConfigServiceHandlersWidgetBinding implements CommandWidgetBinding {
-  
-  /*
-   * (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) {
-
-    widgetRegistry.add("ConfigServiceHandlersTableWidget", 
-   		ConsumptionUIMessages.PAGE_TITLE_SERVICE_HDLR_CONFIG, 
-   		ConsumptionUIMessages.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.internal.env.core.data.DataMappingRegistry)
-   */
-  public void registerDataMappings(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) {
-
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.wst.command.internal.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.internal.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.internal.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 76ebc44f8..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigureHandlersWidgetBinding.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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.ConsumptionUIMessages;
-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.internal.env.core.common.Condition;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.SelectionCommand;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-
-
-public class ConfigureHandlersWidgetBinding implements CommandWidgetBinding {
-
-
-  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) {
-  }
-
-  /*
-   * (non-Javadoc),
-   * 
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry)
-   */
-  public void registerDataMappings(DataMappingRegistry dataRegistry) {
-
-    // 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) {
-
-    widgetRegistry.add("ConfigServiceHandlersTableWidget", ConsumptionUIMessages.PAGE_TITLE_SERVICE_HDLR_CONFIG, 
-    		ConsumptionUIMessages.PAGE_DESC_SERVICE_HDLR_CONFIG, new WidgetContributorFactory() {
-
-      public WidgetContributor create() {
-        return new ConfigServiceHandlersTableWidget();
-      }
-    });
-
-    widgetRegistry.add("ConfigClientHandlersTableWidget", ConsumptionUIMessages.PAGE_TITLE_CLIENT_HDLR_CONFIG, 
-    		ConsumptionUIMessages.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,"WsServiceRefs", ClientHandlersWidgetOutputCommand.class);      
-      dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"ClientProject", ClientHandlersWidgetOutputCommand.class);
-     
-      dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "WsddResource", ServiceHandlersWidgetOutputCommand.class);
-
-    }
-
-    public void registerCanFinish(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.internal.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry)
-     */
-    public void registerDataMappings(DataMappingRegistry dataRegistry) {
-      dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ClientHandlersWidgetDefaultingCommand.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.internal.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.internal.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 5f723f508..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/GenSampleWidgetBinding.java
+++ /dev/null
@@ -1,396 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.StringToIProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.command.common.AddModuleToServerCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateServerCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-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.ClientTestDelegateCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.FinishDefaultCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.FinishTestFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.TestDefaultingFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.TestWebServiceClient;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WebServiceClientTestArrivalCommand;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.SelectionCommand;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceClientInfo;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceState;
-
-
-public class GenSampleWidgetBinding implements CommandWidgetBinding
-{  
-  /* (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)
-  {
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry)
-   */
-  public void registerDataMappings(DataMappingRegistry dataRegistry)
-  {                    
-    // 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)
-  {
-           
-    widgetRegistry.add( "ClientTestWidget", 
-                        ConsumptionUIMessages.PAGE_TITLE_WS_SAMPLE,
-                        ConsumptionUIMessages.PAGE_DESC_WS_SAMPLE,
-                        new WidgetContributorFactory()
-                        {
-                          public WidgetContributor create()
-                          {
-                            return new ClientTestWidget(); 
-                          }
-                        });
-  }
-  
-  private class InitializeProxyCommand extends AbstractDataModelOperation
-  {
-    private IStructuredSelection selection_;
-	private TypeRuntimeServer typeRuntimeServer_;
-	private String            project_;
-	private String            module_;
-	private String            earProject_;
-	private String            ear_;
-	private IWebServiceClient webServiceClient_;
-	private String            wsdlURI_;
-    
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {    
-      IEnvironment env = getEnvironment();
-	    IStatus status = Status.OK_STATUS;	
-	  
-      // Split up the project and module
-      int index = module_.indexOf("/");
-      if (index!=-1){
-        project_ = module_.substring(0,index);
-        module_ = module_.substring(index+1);
-      }
-
-      if (ear_!=null && ear_.length()>0)
-      {
-        int earIndex = ear_.indexOf("/");
-        if (earIndex!=-1) {
-          earProject_ = ear_.substring(0,earIndex);
-          ear_ = ear_.substring(earIndex+1);
-        }
-      }    
-	  
-	  WebServiceClientInfo clientInfo = new WebServiceClientInfo();
-	  clientInfo.setImplURL(getProxyBean());
-	  //clientInfo.setJ2eeLevel(j2eeLevel_);
-	  clientInfo.setServerFactoryId(typeRuntimeServer_.getServerId());
-	  clientInfo.setServerInstanceId(typeRuntimeServer_.getServerInstanceId());
-	  clientInfo.setState(WebServiceState.UNKNOWN_LITERAL);
-	  clientInfo.setWebServiceRuntimeId(typeRuntimeServer_.getRuntimeId());
-	  clientInfo.setWsdlURL(wsdlURI_);
-	  if (clientInfo.getServerInstanceId()==null)
-	  {
-	    CreateServerCommand createServerCommand = new CreateServerCommand();
-	    createServerCommand.setServerFactoryid(clientInfo.getServerFactoryId());
-      createServerCommand.setEnvironment( env );
-	    IStatus createServerStatus = createServerCommand.execute( null, null );
-	    if (createServerStatus.getSeverity()==Status.OK){
-	      clientInfo.setServerInstanceId(createServerCommand.getServerInstanceId());
-	    }
-	    else if (createServerStatus.getSeverity()==Status.ERROR){
-	      env.getStatusHandler().reportError(  createServerStatus );
-	    }               
-	    
-	  }
-	  
-	  AddModuleToServerCommand command = new AddModuleToServerCommand();
-      command.setServerInstanceId(clientInfo.getServerInstanceId());
-      if (earProject_ != null && earProject_.length()>0 && ear_!= null && ear_.length()>0)
-      {
-        command.setProject(earProject_);
-        command.setModule(ear_);
-      }
-      else
-      {
-        command.setProject(project_);
-        command.setModule(module_);       
-      }
-
-      command.setEnvironment( env );
-      status = command.execute( monitor, null );
-      if (status.getSeverity()==Status.ERROR)
-      {
-        env.getStatusHandler().reportError(status);
-      }     
-
-	  webServiceClient_ = new TestWebServiceClient(clientInfo);
-	  return status;
-	}
-	
-	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 IWebServiceClient getWebServiceClient()
-	{
-	  return webServiceClient_;
-	}
-	
-    public boolean getGenerateProxy()
-    {
-      return true;
-    }
-    
-	public void setClientTypeRuntimeServer( TypeRuntimeServer typeRuntimeServer )
-	{
-      typeRuntimeServer_ = typeRuntimeServer;  
-	}
-	  
-	public void setModule( String module )
-	{
-	  module_ = module;
-	}
-	  
-	public void setModuleType( String moduleType)
-	{
-	}
-	
-	public void setResourceContext( ResourceContext resourceContext )
-	{
-	}
-	
-	public void setInitialSelection( IStructuredSelection selection )
-    {
-      selection_ = selection;  
-    }
-  }
-  
-  private class GenSampleRootCommandFragment extends SequenceFragment
-  {
-    public GenSampleRootCommandFragment()
-    {
-      add( new SimpleFragment( new ClientWizardWidgetDefaultingCommand(), "" ) );
-      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.internal.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.internal.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, "ClientProjectName", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", ClientExtensionDefaultingCommand.class);
-      //dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarComponentName", ClientExtensionDefaultingCommand.class);
-      //dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentName", ClientExtensionDefaultingCommand.class);   
-      dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentType", 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, "GenerateProxy", ClientTestFragment.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", ClientTestFragment.class );     
-
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientNeedEAR", ClientTestDelegateCommand.class);
-	  dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientEarProjectName", ClientTestDelegateCommand.class);
-	  dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientEarProjectName", ClientTestDelegateCommand.class,"ClientEarComponentName",null);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject",ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ServiceServerInstanceId", FinishDefaultCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServer", ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "WsdlURI", ClientTestDelegateCommand.class);
-      
-	  dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", InitializeProxyCommand.class );
-      dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientJ2EEVersion", InitializeProxyCommand.class);
-      dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientProject", InitializeProxyCommand.class, "Module", null );
-      dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientProjectType", InitializeProxyCommand.class, "ModuleType", null);
-      dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientProjectEAR", InitializeProxyCommand.class, "Ear", null );
-      dataRegistry.addMapping( ClientWizardWidgetOutputCommand.class, "ResourceContext", InitializeProxyCommand.class);
-	  dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "WsdlURI", InitializeProxyCommand.class );
-	  
-	  
-	  
-	  
-      // Map InitializeProxyCommand command.
-      dataRegistry.addMapping(InitializeProxyCommand.class, "WebServiceClient", ClientExtensionOutputCommand.class);      
-      dataRegistry.addMapping(InitializeProxyCommand.class, "GenerateProxy", ClientExtensionOutputCommand.class);
-      
-      // Map ClientExtensionOutputCommand command.
-      dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ProxyBean", WebServiceClientTestArrivalCommand.class);      
-	  dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ProxyBean", ClientTestDelegateCommand.class);      
-	  dataRegistry.addMapping(ClientExtensionOutputCommand.class, "GenerateProxy", TestDefaultingFragment.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, "ServerInstanceId", FinishDefaultCommand.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, "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);
-      
-      
-    }
-  }
-  
-  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 fc1c3122a..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ImportWSILWidgetBinding.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.widgets.binding;
-
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-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.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.SelectionCommand;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-
-
-public class ImportWSILWidgetBinding implements CommandWidgetBinding
-{
-  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)
-  {
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry)
-   */
-  public void registerDataMappings(DataMappingRegistry dataRegistry)
-  {    
-    // 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)
-  {
-
-    widgetRegistry.add("ImportWSILWidget", 
-      ConsumptionUIMessages.TITLE_WSIL_IMPORT,
-      ConsumptionUIMessages.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 c041a00fa..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ImportWSWidgetBinding.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.PublishToPrivateUDDICommandFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.PublishWSWidget;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-import org.eclipse.wst.ws.internal.explorer.WSExplorerLauncherCommand;
-
-
-public class 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.internal.env.core.data.DataMappingRegistry)
-   */
-  public void registerDataMappings(DataMappingRegistry dataRegistry)
-  {
-    this.dataMappingRegistry = dataRegistry;
-    publishToPrivateUDDICmdFrag.registerDataMappings(this.dataMappingRegistry);
-    
-    // PublishToPrivateUDDICommandFragment
-    dataMappingRegistry.addMapping(PublishWSWidget.class, "PublishToPrivateUDDI", PublishToPrivateUDDICommandFragment.class);
-    
-    // LaunchWebServicesExplorerCommand
-    dataMappingRegistry.addMapping(PublishWSWidget.class, "ForceLaunchOutsideIDE", WSExplorerLauncherCommand.class);
-    dataMappingRegistry.addMapping(PublishWSWidget.class, "LaunchOptions", WSExplorerLauncherCommand.class);
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
-   */
-  public void registerWidgetMappings(WidgetRegistry widgetRegistry)
-  {
-    this.widgetRegistry = widgetRegistry;
-    publishToPrivateUDDICmdFrag.registerWidgetMappings(this.widgetRegistry);
-
-    widgetRegistry.add("WSImport", 
-    ConsumptionUIMessages.PAGE_TITLE_WS_FIND,
-    ConsumptionUIMessages.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 536ddb965..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionDefaultingCommand.java
+++ /dev/null
@@ -1,513 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060204 124408   rsinha@ca.ibm.com - Rupam Kuehner          
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-public class ClientExtensionDefaultingCommand extends AbstractDataModelOperation
-{
-  // ClientWizardWidget
-  private TypeRuntimeServer    clientIds_;
-  private String               clientRuntimeId_;
-  private Boolean              testService;
-  private Boolean              installClient;
-  private ResourceContext      resourceContext;
-  
-  // ClientRuntimeSelectionWidget
-  //private SelectionListChoices clientChoices_;
-  private String clientProjectName_;
-  private String clientEarProjectName_;
-  //private String clientComponentName_;
-  //private String clientEarComponentName_;
-  private String clientComponentType_;
-  //private String j2eeVersion;
-  private boolean clientNeedEAR_;
-  
-  private String serviceServerFactoryId_;
-  private String serviceServerInstanceId_;
-  
-  // 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()
-  {
-	if (clientIds_.getServerInstanceId()==null || clientIds_.getServerInstanceId().length()==0)
-	{
-		//Set the instance id from the service side if the factory ids match
-		if (serviceServerInstanceId_!=null && serviceServerInstanceId_.length()>0)
-		{
-			if (serviceServerFactoryId_!=null && serviceServerFactoryId_.length()>0)
-			{
-				if (serviceServerFactoryId_.equals(clientIds_.getServerId()))
-				{
-					clientIds_.setServerInstanceId(serviceServerInstanceId_);
-				}
-			}
-		}
-	}
-    return clientIds_;
-  }
-  
-  public void setClientRuntimeId(String id)
-  {
-    clientRuntimeId_ = id;
-  }
-  
-  public String getClientRuntimeId()
-  {
-    return clientRuntimeId_;
-  }
-  
-  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 clientProjectName_ + "/" + clientComponentName_;
-      return clientProjectName_ + "/" + clientProjectName_;
-  }
-
-  /**
-   * @return Returns the clientProjectEAR.
-   */
-  public String getClientProjectEAR()
-  {
-    if (clientEarProjectName_!=null && clientEarProjectName_.length()>0)
-    {
-	    //return clientEarProjectName_ + "/" + clientEarComponentName_;
-      return clientEarProjectName_ + "/" + clientEarProjectName_;
-    }
-    else
-    {
-      return "";
-    }
-  }
-  
-  /*
-  private String getModuleProjectName( String projectName )
-  {
-	String result = "";
-	
-	if( projectName != null && !projectName.equals("") )
-	{
-	  IPath    projectPath = new Path( projectName );
-	  IProject project     = (IProject)ResourceUtils.findResource( projectPath );
-	  String   moduleName  = J2EEUtils.getFirstWebModuleName( project );
-	  
-	  result = projectName + "/" + moduleName;
-	}
-	
-	return result;
-  }
-  */
-  /**
-   * @return Returns the clientProjectType.
-   */
-  
-  public String getClientProjectType()
-  {
-    //return clientChoices_.getChoice().getList().getSelection();
-    return clientComponentType_;
-  }
-  
-  /**
-   * @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 installClient.
-   */
-  public Boolean getInstallClient()
-  {
-    return installClient;
-  }
-
-  /**
-   * @param testProxySelected
-   *            The testProxySelected to set.
-   */
-  public void setInstallClient(Boolean installClient)
-  {
-    this.installClient = installClient;
-  }
-  
-  /**
-   * @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 "14"; //rm j2ee
-  }
-
-  /**
-   * @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;
-  }
-
-  
-  public void setClientComponentType(String clientComponentType)
-  {
-    this.clientComponentType_ = clientComponentType;
-  }
-
-  public void setClientProjectName(String clientProjectName)
-  {
-    this.clientProjectName_ = clientProjectName;
-  }
-
-  /*
-  public void setClientComponentName(String clientComponentName)
-  {
-    this.clientComponentName_ = clientComponentName;
-  }
-  */
-  
-  public void setClientEarProjectName(String clientEarProjectName)
-  {
-    this.clientEarProjectName_ = clientEarProjectName;
-  }
-  
-  /*
-  public void setClientEarComponentName(String clientEarComponentName)
-  {
-    this.clientEarComponentName_ = clientEarComponentName;
-  }
-  */
-  
-  public String getClientEarProjectName()
-  {
-    return clientEarProjectName_;
-  }
-  
-  /*
-  public String getClientEarComponentName()
-  {
-    return clientEarComponentName_;
-  }
-  */
-  
-  public void setServiceServerFactoryId(String id)
-  {
-  	serviceServerFactoryId_ = id;
-  }
-
-  public void setServiceServerInstanceId(String id)
-  {
-  	serviceServerInstanceId_ = id;
-  }
-
-  public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
-  {
-    IEnvironment env = getEnvironment();
-    //Do some basic validation to ensure the server/runtime/type combination is supported.
-    //This is needed to catch problems in the defaulting
-    //when the user clicks Finish prior to page 3 of the wizard.
-    
-    IStatus status = Status.OK_STATUS;
-    String scenario = ConsumptionUIMessages.MSG_CLIENT_SUB;
-
-    //Ensure server and runtime are non-null
-    String runtimeId = clientIds_.getRuntimeId();
-    String serverId = clientIds_.getServerId();
-    String typeId = clientIds_.getTypeId();
-    
-    if( runtimeId == null || runtimeId.length()==0)
-    {
-      status = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_NO_RUNTIME, new String[]{ scenario } ) );
-      env.getStatusHandler().reportError(status);
-    }
-    
-    if( serverId == null || serverId.length()==0)
-    {
-      status = StatusUtils.errorStatus( NLS.bind(ConsumptionUIMessages.MSG_NO_SERVER, new String[]{ scenario } ) );
-      env.getStatusHandler().reportError(status);
-    }
-    
-    //ensure the server, runtime, and type are compatible
-    if (!WebServiceRuntimeExtensionUtils2.isServerClientRuntimeTypeSupported(serverId, runtimeId, typeId)) 
-    {    
-      String serverLabel = WebServiceRuntimeExtensionUtils2.getServerLabelById(serverId);
-      String runtimeLabel = WebServiceRuntimeExtensionUtils2.getRuntimeLabelById(runtimeId);
-      status = StatusUtils.errorStatus( NLS.bind(ConsumptionUIMessages.MSG_INVALID_SRT_SELECTIONS, new String[]{ serverLabel, runtimeLabel } ) );
-      env.getStatusHandler().reportError(status);
-    }
-    
-    //Determine if the selected server type has only stub runtimes associated with it.
-    //If so, set install and test to false in the context.
-    IRuntime nonStubRuntime = ServerUtils.getNonStubRuntime(serverId);
-    if (nonStubRuntime == null)
-    {
-      installClient = Boolean.FALSE;
-      testService = Boolean.FALSE;
-    }
-
-    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/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 7fcd8b265..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionFragment.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions;
-
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.env.core.fragment.ExtensionFragment;
-
-
-public class ClientExtensionFragment extends ExtensionFragment
-{  
-  public ClientExtensionFragment()
-  {
-  }
-  
-  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 5923a9f98..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionOutputCommand.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient;
-
-public class ClientExtensionOutputCommand extends AbstractDataModelOperation
-{
-  private IWebServiceClient webServiceClient_;
-  
-  /**
-   * @return Returns the proxyBean.
-   */
-  
-  public String getProxyBean()
-  {
-    return webServiceClient_.getWebServiceClientInfo().getImplURL();
-  }
-    
-  public boolean getGenerateProxy()
-  {
-	return true;
-  }
-  
-  /**
-   * @return Returns the setEndpointMethod.
-   */
-  public String getSetEndpointMethod()
-  {
-	return "setEndpoint";
-  }
-  	
-  public void setWebServiceClient(IWebServiceClient wsc)
-  {
-	webServiceClient_ = wsc;
-  }
-	
-  public String getServerInstanceId()
-  {
-	return webServiceClient_.getWebServiceClientInfo().getServerInstanceId();
-  }
-	
-  public String getServerFactoryId()
-  {
-	return webServiceClient_.getWebServiceClientInfo().getServerFactoryId();
-  }
-
-  public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
-  {
-    return Status.OK_STATUS;
-  }
-}
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 e30ae4f54..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionDefaultingCommand.java
+++ /dev/null
@@ -1,338 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060204 124408   rsinha@ca.ibm.com - Rupam Kuehner          
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-public class ServerExtensionDefaultingCommand extends AbstractDataModelOperation
-{
-  private Boolean              installService;
-  private Boolean              startService;
-  private Boolean              testService;
-  private Boolean              publishService;
-  private TypeRuntimeServer    serviceIds_;
-  private String               serviceRuntimeId_;
-  //private SelectionListChoices serviceChoices_;
-  private String               serviceProjectName_;
-  private String               serviceEarProjectName_;
-  private String               serviceComponentType_;
-  //private String               serviceComponentName_;
-  //private String               serviceEarComponentName_;
-  //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 setServiceRuntimeId(String id)
-  {
-    serviceRuntimeId_ = id;
-  }
-  
-  public String getServiceRuntimeId()
-  {
-    return serviceRuntimeId_;
-  }
-
-  /*
-  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 serviceProjectName_ + "/" + serviceProjectName_; 
-  }
-  
-  /**
-   * @return Returns the serverProjectEAR.
-   */
-  public String getServerProjectEAR()
-  {
-    if (serviceEarProjectName_!=null && serviceEarProjectName_.length()>0)
-    {
-      return serviceEarProjectName_ + "/" + serviceEarProjectName_;
-    }
-    else
-    {
-      return "";
-    }
-  }
-
-  /**
-   * @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 installService.
-   */
-  public Boolean getInstallService()
-  {
-    return installService;
-  }
-  /**
-   * @param installService
-   *            Specifies if service should be installed.
-   */
-  public void setInstallService(Boolean installService)
-  {
-    this.installService = installService;
-  }
-
-  /**
-   * @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 "14"; //rm j2ee
-  }
-  
-  /**
-   * 
-   * @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 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;
-  }
-  
-  
-  public void setServiceProjectName(String serviceProjectName)
-  {
-    this.serviceProjectName_ = serviceProjectName;
-  }
-
-  public void setServiceEarProjectName(String serviceEarProjectName)
-  {
-    this.serviceEarProjectName_ = serviceEarProjectName;
-  }
-  
-  public void setServiceComponentType(String type)
-  {
-    this.serviceComponentType_ = type;
-  }
-  
-  public String getServiceComponentType()
-  {
-    return serviceComponentType_;
-  }
-
-  public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
-  {
-    IEnvironment env = getEnvironment();
-    //Do some basic validation to ensure the server/runtime/type combination is supported.
-    //This is needed to catch problems in the defaulting
-    //when the user clicks Finish prior to page 3 of the wizard.
-    
-    IStatus status = Status.OK_STATUS;
-    String scenario = ConsumptionUIMessages.MSG_SERVICE_SUB;
-
-    //Ensure server and runtime are non-null
-    String runtimeId = serviceIds_.getRuntimeId();
-    String serverId = serviceIds_.getServerId();
-    String typeId = serviceIds_.getTypeId();
-    
-    if( runtimeId == null || runtimeId.length()==0)
-    {
-      status = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_NO_RUNTIME, new String[]{ scenario } ) );
-      env.getStatusHandler().reportError(status);
-    }
-    
-    if( serverId == null || serverId.length()==0)
-    {
-      status = StatusUtils.errorStatus( NLS.bind(ConsumptionUIMessages.MSG_NO_SERVER, new String[]{ scenario } ) );
-      env.getStatusHandler().reportError(status);
-    }
-    
-    //ensure the server, runtime, and type are compatible
-    if (!WebServiceRuntimeExtensionUtils2.isServerRuntimeTypeSupported(serverId, runtimeId, typeId)) 
-    {    
-      String serverLabel = WebServiceRuntimeExtensionUtils2.getServerLabelById(serverId);
-      String runtimeLabel = WebServiceRuntimeExtensionUtils2.getRuntimeLabelById(runtimeId);
-      status = StatusUtils.errorStatus( NLS.bind(ConsumptionUIMessages.MSG_INVALID_SRT_SELECTIONS, new String[]{ serverLabel, runtimeLabel } ) );
-      env.getStatusHandler().reportError(status);
-    }
-    
-    //Determine if the selected server type has only stub runtimes associated with it.
-    //If so, set install, run, and test to false in the context.
-    IRuntime nonStubRuntime = ServerUtils.getNonStubRuntime(serverId);
-    if (nonStubRuntime == null)
-    {
-      installService = Boolean.FALSE;
-      startService = Boolean.FALSE;
-      testService = Boolean.FALSE;
-    }
-    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/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 101cddece..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionFragment.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.widgets.extensions;
-
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.env.core.fragment.ExtensionFragment;
-
-
-public class ServerExtensionFragment extends ExtensionFragment
-{  
-  public ServerExtensionFragment()
-  {
-
-  }
-  
-  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 1d84f039a..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionOutputCommand.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.extensions;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.ws.internal.wsrt.IWebService;
-
-public class ServerExtensionOutputCommand extends AbstractDataModelOperation
-{
-  //private String            wsdlURI_;
-  private WebServicesParser wsdlParser_;
-	private IWebService 			webService_;
-  
-  private boolean isWebProjectStartupRequested_ = false;
-    
-  
-  /**
-   * @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) {
-}
-/**
- * @param existingServerId The existingServerId to set.
- */
-public void setExistingServerId(String existingServerId) {
-}
-
-/**
- * @return Returns the isRestartProjectNeeded.
- */
-public boolean getIsWebProjectStartupRequested() {
-	return isWebProjectStartupRequested_;
-}
-/**
- * @param isRestartProjectNeeded The isRestartProjectNeeded to set.
- */
-public void setIsWebProjectStartupRequested(boolean isRestartProjectNeeded) {
-	this.isWebProjectStartupRequested_ = isRestartProjectNeeded;
-}
-
-public String getServiceServerFactoryId()
-{
-	return webService_.getWebServiceInfo().getServerFactoryId();
-}
-
-public String getServiceServerInstanceId()
-{
-	return webService_.getWebServiceInfo().getServerInstanceId();
-}
-
-public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
-{
-  return Status.OK_STATUS;
-}
-}
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 cdb6e3b1f..000000000
--- 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.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.wst.command.internal.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 IStatus validateSelection(IStructuredSelection objectSelection)
-  {
-    //  subclass should override this method
-    return Status.OK_STATUS;
-  }
-
-  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/EJBSelectionTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionTransformer.java
deleted file mode 100644
index f6c35a6b0..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionTransformer.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.object;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-
-public class EJBSelectionTransformer implements Transformer
-{
-
-  public Object transform(Object value)
-  {
-    if (value instanceof IStructuredSelection)
-    {
-      Object sel = ((IStructuredSelection)value).getFirstElement();
-      if (sel instanceof EnterpriseBean)
-      {
-        return new StructuredSelection(((EnterpriseBean)sel).getName());
-      }
-    }
-    return value;
-  }
-  
-
-}
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 058f2d8b9..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionWidget.java
+++ /dev/null
@@ -1,393 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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.IStatus;
-import org.eclipse.core.runtime.Status;
-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.EJBResource;
-import org.eclipse.jst.j2ee.ejb.Session;
-import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-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.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class EJBSelectionWidget extends AbstractObjectSelectionWidget implements IObjectSelectionWidget
-{
-
-  private Combo earList;
-  private EJBTableViewer beanList;
-  private IVirtualComponent[] earComponents;
-  //rskejb private EARNatureRuntime[] earProjects;
-  private Integer selectedBeanIndex = null;
-  private Vector ejbBeanNames;
-  private Vector ejbComponentNames;
-  private Vector ejbComponentProjectNames;
-  //rskejb 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()
-  {
-	earComponents = J2EEUtils.getAllEARComponents();
-    /* rskejb 
-    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]);
-	rskejb */
-  }
-
-  public String getSelectedBean()
-  {
-    if (selectedBeanIndex != null)
-    {
-      return (String) (ejbBeanNames.elementAt(selectedBeanIndex.intValue()));
-    }
-    return null;
-  }
-
-  public String getSelectedProject()
-  {
-    if (selectedBeanIndex != null)
-    {
-      return (String) (ejbComponentProjectNames.elementAt(selectedBeanIndex.intValue()));
-    }
-    return null;
-  }
-
-  public WidgetDataEvents addControls(Composite parent, Listener statusListener)
-  {
-    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(ConsumptionUIMessages.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(earComponents[widget.getSelectionIndex()]);
-        selectedBeanIndex = null;
-        statusListener_.handleEvent(null);
-      }
-    });
-    addEARNamesToList();
-    earList.setToolTipText(ConsumptionUIMessages.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(ConsumptionUIMessages.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(ConsumptionUIMessages.TOOLTIP_TABLE_BEAN_NAMES);
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(beanTable, INFOPOP_PEBD_TABLE_BEAN_NAMES);
-    if (earComponents != null && earComponents.length > 0)
-    {
-      setBeanList(earComponents[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 (earComponents != null && earComponents.length > 0)
-    {
-      for (int index = 0; index < earComponents.length; index++)
-      {
-        earList.add(earComponents[index].getName());
-      }
-      earList.setText(earList.getItem(0));
-    }
-  }
-
-  private void setBeanList(IVirtualComponent earComponent)
-  {
-    IVirtualComponent[] ejbComponentsArray = J2EEUtils.getReferencingEJBComponentsFromEAR(earComponent.getProject());
-    Table beanTable = beanList.getTable();
-    beanTable.removeAll();
-    ejbBeanNames = new Vector();
-    ejbComponentNames = new Vector();
-    ejbComponentProjectNames = new Vector();
-    for (int index = 0; index < ejbComponentsArray.length; index++)
-    {
-      EJBArtifactEdit  ejbEdit = null;
-      try {
-        ejbEdit = EJBArtifactEdit.getEJBArtifactEditForRead(ejbComponentsArray[index]);
-        EJBResource ejbRes = ejbEdit.getEJBJarXmiResource();
-        EJBJar jar = ejbRes.getEJBJar();
-        Vector beans = J2EEUtils.getBeanNames(jar);
-        String componentName = ejbComponentsArray[index].getName();
-        String projectName = ejbComponentsArray[index].getProject().getName();
-        ejbBeanNames.addAll(beans);
-        ejbComponentNames.addAll(Collections.nCopies(beans.size(), componentName));
-        ejbComponentProjectNames.addAll(Collections.nCopies(beans.size(), projectName));                
-      }
-      finally {
-        if (ejbEdit!=null)
-          ejbEdit.dispose();
-      }      
-    }
-    beanList.setData(ejbBeanNames, ejbComponentNames);
-    beanList.setInput(ejbBeanNames);    
-    
-  }
-  
-  /*
-   * @deprecated
-   */
-  /*
-  private void setBeanList(EARNatureRuntime earProject)
-  {
-    Vector ejbProjects = J2EEUtils.getEJBProjects(earProject);
-    Table beanTable = beanList.getTable();
-    beanTable.removeAll();
-    ejbBeanNames = new Vector();
-    //rskejb ejbProjectNames = new Vector();
-    ejbComponentNames = new Vector();
-    ejbComponents = 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 < earComponents.length; i++)
-          {
-			      IVirtualComponent[] ejbComponents = J2EEUtils.getReferencingEJBComponentsFromEAR(earComponents[i].getProject());
-			      for (int j=0; j <ejbComponents.length; j++)
-			      {
-              EJBArtifactEdit  ejbEdit = null;
-              try {
-                ejbEdit = EJBArtifactEdit.getEJBArtifactEditForRead(ejbComponents[j]);
-                EJBResource ejbRes = ejbEdit.getEJBJarXmiResource();
-                if (ejbRes.getEJBJar() == jar)
-                {
-                  earList.setText(earComponents[i].getName());
-                  setBeanList(earComponents[i]);
-                  beanList.setSelection(new StructuredSelection(new Integer[]{new Integer(ejbBeanNames.indexOf(session.getName()))}));
-                  selectedBeanIndex = new Integer(ejbBeanNames.indexOf(session.getName()));
-                  return;
-                }                
-
-              }
-              finally {
-                if (ejbEdit!=null)
-                  ejbEdit.dispose();
-              }
-				
-			      }
-			      /* rskejb
-            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();
-            }
-			      rskejb */
-          }
-        }
-      }
-    }
-  }
-
-  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)
-        {
-          IProject project = earComponents[earList.getSelectionIndex()].getProject();
-          IVirtualComponent[] ejbComponents = J2EEUtils.getReferencingEJBComponentsFromEAR(project);
-          for (int i=0; i<ejbComponents.length; i++)
-          {
-            EJBArtifactEdit  ejbEdit = null;
-            try 
-            {
-              ejbEdit = EJBArtifactEdit.getEJBArtifactEditForRead(ejbComponents[i]);
-              EJBResource ejbRes = ejbEdit.getEJBJarXmiResource();
-              EJBJar jar = ejbRes.getEJBJar();
-              java.util.List sessions = jar.getSessionBeans();
-              for (Iterator it2 = sessions.iterator(); it2.hasNext();)
-              {
-                Session session = (Session) it2.next();
-                if (selEJBName.equals(session.getName()))
-                {
-                  return new StructuredSelection(new Session[]{session});
-                }
-              }
-            }
-            finally {
-              if (ejbEdit!=null)
-                ejbEdit.dispose();
-            }            
-          }
-          /* rskejb
-          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();
-          }
-          rskejb */
-        }
-      }
-    }
-    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 String getComponentName()
-  {
-    if (selectedBeanIndex != null)
-    {
-      return (String) (ejbComponentNames.elementAt(selectedBeanIndex.intValue()));
-    }
-    return null;
-  }    
-  
-  public IStatus validateSelection(IStructuredSelection objectSelection)
-  {
-    return Status.OK_STATUS;
-  }
-  
-  public IStatus getStatus()
-  {  	
-    if (selectedBeanIndex == null)
-    {
-    	return StatusUtils.errorStatus( "" );
-    }
-    
-  	return Status.OK_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/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 9d17a46e7..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBTableViewer.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.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.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-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;
-
-public class EJBTableViewer extends TableViewer
-{
-  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);
-    String columnProperties[] = {ConsumptionUIMessages.TABLE_TITLE_EJB_BEAN_NAMES, ConsumptionUIMessages.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 a7be6f437..000000000
--- 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 1383a1781..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/IObjectSelectionWidget.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.consumption.ui.widgets.object;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.wst.command.internal.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 IStatus 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();
-  
-  /**
-   * 
-   * @return returns the name of the IVirtualComponent that contains the selection
-   * object that the user has chosen with this widget.  The value can be 
-   * null if there is no IVirtualComponent for this object
-   */
-  public String getComponentName();  
-}
\ 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 7a9335831..000000000
--- 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.internal.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 || beanPackage.length() == 0 ? 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 22fb63d5f..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionWidget.java
+++ /dev/null
@@ -1,276 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-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.jst.j2ee.webservice.wsdd.BeanLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.PortComponentImpl;
-import org.eclipse.jst.j2ee.webservice.wsdd.internal.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.consumption.ui.ConsumptionUIMessages;
-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.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class JavaBeanSelectionWidget extends AbstractObjectSelectionWidget implements IObjectSelectionWidget
-{
-  private IProject           serverProject_ = null;
-  private String             serverComponentName_ = null;
-  private Composite          parent_ = 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 )
-  {
-	String       pluginId_ = "org.eclipse.jst.ws.consumption.ui";	  
-    this.statusListener = statusListener;
-    UIUtils      uiUtils  = new UIUtils( pluginId_ ); 
-    
-    parent_ = parent;
-    
-    Composite group = uiUtils.createComposite( parent, 4 );
-    
-    group.setToolTipText( ConsumptionUIMessages.TOOLTIP_PBCL_PAGE );
-    PlatformUI.getWorkbench().getHelpSystem().setHelp( group, pluginId_ + "." + INFOPOP_PBCL_PAGE );
-    
-    beanClassText_ = uiUtils.createText( group, ConsumptionUIMessages.LABEL_BEAN_CLASS_NAME,
-    		ConsumptionUIMessages.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, ConsumptionUIMessages.BUTTON_BROWSE_CLASSES,
-    		ConsumptionUIMessages.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, ConsumptionUIMessages.BUTTON_BROWSE_FILES,
-    		ConsumptionUIMessages.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;
-    serverComponentName_ = 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();
-          IVirtualComponent comp = ResourceUtils.getComponentOf(res);
-          if (comp!=null)
-          {
-            serverComponentName_ = comp.getName();
-          }
-        }
-        else
-        {
-          serverProject_ = null;
-          serverComponentName_ = null;
-        }
-      }
-      catch (JavaModelException jme)
-      {
-        serverProject_ = null;
-        serverComponentName_ = 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 || beanPackage.length() == 0 ? 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);
-        IVirtualComponent comp = ResourceUtils.getComponentOf(resource);
-        
-        if (comp!=null)
-        {	
-          serverComponentName_ = comp.getName();
-        }        
-        
-      }
-    }
-  }
-
-  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 String getComponentName()
-  {
-    return serverComponentName_;
-  }
-  
-  public IStatus getStatus()
-  {
-    String beanClassName = beanClassText_.getText().trim();
-    if (beanClassName == null || beanClassName.length() <= 0)
-    {
-      return StatusUtils.errorStatus(ConsumptionUIMessages.PAGE_MSG_BEAN_CANNOT_BE_EMPTY);
-    }
-    return Status.OK_STATUS;
-  }
-  
-  public IStatus validateSelection(IStructuredSelection objectSelection)
-  {
-    return Status.OK_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/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 a889d944a..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionFragment.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.jst.ws.internal.consumption.ui.widgets.object;
-
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceImpl;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.env.core.common.Condition;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.SelectionCommand;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-
-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);
-    dataRegistry.addMapping(ObjectSelectionWidget.class, "ComponentName", 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)
-    {
-      String wst = typeRuntimeServer.getTypeId();
-
-      int scenario = WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(wst);
-      String implId = WebServiceRuntimeExtensionUtils2.getWebServiceImplIdFromTypeId(wst);
-      if (scenario == WebServiceScenario.TOPDOWN)
-      {
-        //Must have WSDL object selection. No choice.
-        hasObjectSelectionWidget=true;        
-      }
-      else
-      {
-        WebServiceImpl wsimpl = WebServiceRuntimeExtensionUtils2.getWebServiceImplById(implId);
-        if (wsimpl!=null)
-        {  
-          String objectSelectionWidgetId = wsimpl.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 3899686a6..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionOutputCommand.java
+++ /dev/null
@@ -1,270 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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.IAdaptable;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceImpl;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.StatusException;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-
-public class ObjectSelectionOutputCommand extends AbstractDataModelOperation
-{
-  private String                 objectSelectionWidgetId_;
-  private IStructuredSelection   objectSelection_;
-  private IObjectSelectionWidget objectSelectionWidget_;
-  private IProject               project_;
-  private String                 componentName_;
-  private WebServicesParser      parser_;
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    IEnvironment env = getEnvironment();
-    
-    // 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
-    IStatus status = (objectSelectionWidget_ != null) ? objectSelectionWidget_.validateSelection(getObjectSelection()) : Status.OK_STATUS;
-    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)
-    {
-      String wst = typeRuntimeServer.getTypeId();
-
-      int scenario = WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(wst);
-      String implId = WebServiceRuntimeExtensionUtils2.getWebServiceImplIdFromTypeId(wst);
-
-      WebServiceImpl wsimpl = WebServiceRuntimeExtensionUtils2.getWebServiceImplById(implId);
-	    //IWebServiceType wst = WebServiceRuntimeExtensionUtils2.getWebServiceTypeById(typeRuntimeServer.getTypeId());
-
-      if (wsimpl != null)
-      {
-        String objectSelectionWidgetId = null;
-        if (scenario == WebServiceScenario.TOPDOWN)
-        {
-          objectSelectionWidgetId = "org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionWidget";
-        }
-        else
-        {
-          objectSelectionWidgetId = wsimpl.getObjectSelectionWidget();
-        }        
-        
-		objectSelectionWidgetId_ = objectSelectionWidgetId;
-		
-        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);
-    }
-    
-    //Set the componentName if you can
-    if (componentName_ == null)
-    {
-      componentName_ = getComponentNameFromObjectSelection(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;
-  }  
-  
-  public String getComponentName()
-  {
-    return componentName_;
-  }
-
-  public void setComponentName(String componentName)
-  {
-    this.componentName_ = componentName;
-  }
-
-  /**
-   * @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);
-          if (resource==null) 
-            return null;
-          IProject p = ResourceUtils.getProjectOf(resource.getFullPath());
-          return p;
-        } catch(CoreException e)
-        {
-			e.printStackTrace();
-          return null;
-        }        
-      }
-    }
-    return null;
-  }
-  
-  private String getComponentNameFromObjectSelection(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;
-     
-          IVirtualComponent comp = ResourceUtils.getComponentOf(resource);
-     
-          if (comp!=null)
-          {
-            return comp.getName();
-          }
-        } 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 8cdbd641b..000000000
--- 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 25a07a015..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionWidget.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceImpl;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-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.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-
-public class ObjectSelectionWidget extends AbstractObjectSelectionWidget implements IObjectSelectionWidget
-{
-  private IConfigurationElement[] elements;
-  private Composite parent;
-  private Listener statusListener;
-  private Composite composite;
-  private IStructuredSelection initialSelection;
-  private IProject project;
-  private String componentName;
-  private IObjectSelectionWidget child;
-  
-  public WidgetDataEvents addControls(Composite parentComposite, Listener statListener)
-  {
-    elements = ObjectSelectionRegistry.getInstance().getConfigurationElements();
-    this.parent = parentComposite;
-    this.statusListener = statListener;
-    composite = null;
-    return this;
-  }
-  
-  /**
-   * @param typeRuntimeServer The typeRuntimeServer to set.
-   */
-  public void setTypeRuntimeServer(TypeRuntimeServer typeRuntimeServer)
-  {
-    if (composite != null)
-    {
-      composite.dispose();
-      child = null;
-    }
-    if (typeRuntimeServer != null)
-    {
-      String wst = typeRuntimeServer.getTypeId();
-      int scenario = WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(wst);
-      String implId = WebServiceRuntimeExtensionUtils2.getWebServiceImplIdFromTypeId(wst);
-      WebServiceImpl wsimpl = WebServiceRuntimeExtensionUtils2.getWebServiceImplById(implId);
-      
-	    //IWebServiceType wst = WebServiceRuntimeExtensionUtils.getWebServiceTypeById(typeRuntimeServer.getTypeId());
-      if (wsimpl != null)
-      {
-        String objectSelectionWidgetId = null;
-        if (scenario == WebServiceScenario.TOPDOWN)
-        {
-          objectSelectionWidgetId = "org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionWidget";
-        }
-        else
-        {
-          objectSelectionWidgetId = wsimpl.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 IStatus getStatus()
-  {
-    return (child != null) ? child.getStatus() : Status.OK_STATUS;
-  }
-
-  public void setInitialSelection(IStructuredSelection initialSelection)
-  {
-    this.initialSelection = initialSelection;
-    project = getProjectFromInitialSelection(initialSelection);
-    componentName = getComponentNameFromInitialSelection(initialSelection);
-    if (child != null)
-      child.setInitialSelection(initialSelection);
-  }
-    
-  public IStructuredSelection getObjectSelection()
-  {
-    return (child != null) ? child.getObjectSelection() : null;
-  }
-  
-  public IStatus validateSelection(IStructuredSelection objectSelection)
-  {
-    return (child != null) ? child.validateSelection(objectSelection) : Status.OK_STATUS;
-  }
-  
-  public IProject getProject()
-  {
-    if (child != null)
-    {
-      IProject p = child.getProject();
-      if (p != null)
-        return p;
-      else
-        return project;
-    }
-    else
-    {
-      return null;
-    }
-  }
-  
-  public String getComponentName()
-  {
-    if (child != null)
-    {
-      String cname = child.getComponentName();
-      if (cname != null && cname.length()>0)
-        return cname;
-      else
-        return componentName;
-    }
-    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;
-  }
-  
-  private String getComponentNameFromInitialSelection(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;
-          
-          IVirtualComponent comp = ResourceUtils.getComponentOf(resource);
-          if (comp != null)
-          {
-            return comp.getName();  
-          }          
-        } 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 4db0a341c..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/Timer.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.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/ValidateWSDLJob.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ValidateWSDLJob.java
deleted file mode 100644
index e27ee08da..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ValidateWSDLJob.java
+++ /dev/null
@@ -1,88 +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.widgets.object;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.wst.wsdl.validation.internal.IValidationMessage;
-import org.eclipse.wst.wsdl.validation.internal.IValidationReport;
-import org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLValidator;
-
-
-
-public class ValidateWSDLJob extends Job {
-	
-	final public static String VALIDATE_WSDL_JOB_FAMILY = "ValidateWSDLJobJamily";
-	
-	private String wsdlURI_ = null;
-	private IValidationMessage[] validationMessages_ = null;
-	private int validationMessageSeverity_ = -1; // default value
-
-	public ValidateWSDLJob(String wsdlURI) {
-		super("ValidateWSDLJob");
-		wsdlURI_ = wsdlURI;
-	}
-
-	protected IStatus run(IProgressMonitor monitor) {
-		WSDLValidator wsdlValidator = WSDLValidator.getInstance();
-	    IValidationReport valReport = wsdlValidator.validate(wsdlURI_);
-	    validationMessages_ = valReport.getValidationMessages();
-	    reportSummary();
-		return Status.OK_STATUS;
-	}
-	
-	// calculate the higher severity for all the validation messages
-	private void reportSummary() {
-		int i;
-		int severity;
-		int errorCount = 0;
-		int warningCount = 0;
-		for (i=0; i<validationMessages_.length && errorCount == 0; i++) {
-			severity = validationMessages_[i].getSeverity();
-			switch (severity) {
-			case IValidationMessage.SEV_ERROR:
-				errorCount++;
-				break;
-			case IValidationMessage.SEV_WARNING:
-				warningCount++;
-				break;
-			default:
-				break;
-			}
-		}
-		if (errorCount > 0) {
-			validationMessageSeverity_ = IValidationMessage.SEV_ERROR;
-		} else if (warningCount > 0) {
-			validationMessageSeverity_ = IValidationMessage.SEV_WARNING;
-		}
-		
-	}
-
-	public boolean belongsTo(Object family)
-	{
-		return family == VALIDATE_WSDL_JOB_FAMILY;
-	}
-	
-	public IValidationMessage[] getValidationMessages() {
-		return validationMessages_;
-	}
-	
-	public int getValidationMessageSeverity() {
-		return validationMessageSeverity_;
-	}
-
-	public String getWsdlURI() {
-		return wsdlURI_;
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ValidationMessageViewerWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ValidationMessageViewerWidget.java
deleted file mode 100644
index 221645b89..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ValidationMessageViewerWidget.java
+++ /dev/null
@@ -1,235 +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.widgets.object;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.IContentProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-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.ConsumptionUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.wsdl.validation.internal.IValidationMessage;
-
-
-public class ValidationMessageViewerWidget extends SimpleWidgetDataContributor
-{
-  private int DEFAULT_TABLE_HEIGHT_HINT = 100;
-  private TableViewer tableViewer_;
-  private Table table_;
-  private String message = null;
-  static final String columns_[] = {"severity", "line", "column", "message"};
-  static final int columnsWidth_[] = {10, 10, 10, 60};
-
-  
-
-  public ValidationMessageViewerWidget()
-  {
-  }
-
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener )
-  { 
-   
-	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_BOTH));
-	
-    Label messageLabel = new Label( composite, SWT.WRAP);
-    messageLabel.setText( ConsumptionUIMessages.LABEL_VALIDATE_MESSAGES);
-    GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-    messageLabel.setLayoutData(gd);
-    messageLabel.setToolTipText( ConsumptionUIMessages.TOOLTIP_VALIDATE_TEXT_MESSAGE );
-
-	table_ = new Table(composite, SWT.SINGLE | SWT.FULL_SELECTION | SWT.BORDER);
-	gd = new GridData(GridData.FILL_BOTH);
-	gd.heightHint = DEFAULT_TABLE_HEIGHT_HINT;
-	table_.setLayoutData(gd);
-	table_.setHeaderVisible(true);
-	table_.setLinesVisible(true);
-	table_.setToolTipText(ConsumptionUIMessages.TOOLTIP_TABLE_VALIDATE_MESSAGE );
-	TableLayout tableLayout = new TableLayout();
-	for (int i = 0; i < columns_.length; i++)
-	{
-	  TableColumn tableColumn = new TableColumn(table_, SWT.NONE);
-	  tableColumn.setText(columns_[i]);
-	  tableColumn.pack();
-	  ColumnWeightData columnData = new ColumnWeightData(columnsWidth_[i], columnsWidth_[i], true);
-	  tableLayout.addColumnData(columnData);
-	}
-	table_.setLayout(tableLayout);
-
-	tableViewer_ = new TableViewer(table_);
-
-	tableViewer_.setContentProvider(new ListContentProvider());
-	tableViewer_.setLabelProvider(new ListLabelProvider());
-
-	return this;
-  }
-
-  public void setInput(IValidationMessage[] messages)
-  {
-  	tableViewer_.setInput(messages);
-  	tableViewer_.refresh();
-  }
-  
-  public void clearInput()
-  {
-	  IValidationMessage emptyMessages[] = {};
-	  this.setInput(emptyMessages);
-  }
-  
-  public IContentProvider getContentProvider()
-  {
-	  return tableViewer_.getContentProvider();
-  }
-
-  public IStatus getStatus()
-  {
-    return message == null ? Status.OK_STATUS : 
-                             StatusUtils.errorStatus(message );
-  }
-
-  public void refresh()
-  {
-	tableViewer_.refresh();
-  }
-
-  public TableItem[] getItems()
-  {
-	//internalRefresh();
-	return table_.getItems();
-  }
-
-  public void setEnabled(boolean enabled)
-  {
-  }
-
-  public void dispose()
-  {	
-	if (table_ != null)
-	  table_.dispose();
-  }
-
-  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 IValidationMessage[])
-	  {
-			IValidationMessage[] valMessages = (IValidationMessage[]) inputElement;
-		  return valMessages;
-	  }
-	  else
-		return new Object[0];
-	}
-  }
-
-  protected class ListLabelProvider implements ITableLabelProvider
-  {
-	public Image getColumnImage(Object element, int columnIndex)
-	{
-		if (element instanceof IValidationMessage)
-		{
-			IValidationMessage msg = (IValidationMessage) element;
-			
-			if (columnIndex == 0)
-			{	
-				int severity = msg.getSeverity();
-				if (severity == 0) {
-					return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_ERROR_TSK);
-				} else if (severity == 1) {
-					return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_WARN_TSK);
-				} else if (severity == 2) {
-					return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_INFO_TSK);
-				}
-			}
-		}	
-	  return null;
-	}
-
-	public String getColumnText(Object element, int columnIndex)
-	{
-		String text = "";
-		if (element instanceof IValidationMessage)
-		{
-			IValidationMessage msg = (IValidationMessage) element;
-			
-			switch (columnIndex) {
-			case 0:		
-				// no text to display, only display severity as image
-				break;
-			case 1:
-				text = (new Integer(msg.getLine())).toString();
-				break;
-			case 2:
-				text = (new Integer(msg.getColumn())).toString();
-				break;
-			case 3:
-				text = msg.getMessage();
-				break;		
-				
-			default:
-				break;
-			} 
-		}
-		return text;
-	}
-
-	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/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 2e2a8093a..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionTransformer.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.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.wsclient.internal.impl.ServiceRefImpl;
-import org.eclipse.jst.ws.internal.common.J2EEActionAdapterFactory;
-import org.eclipse.wst.command.internal.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 eb94809af..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWidget.java
+++ /dev/null
@@ -1,551 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.IJobChangeEvent;
-import org.eclipse.core.runtime.jobs.IJobManager;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.core.runtime.jobs.JobChangeAdapter;
-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.common.WSDLParserFactory;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-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.osgi.util.NLS;
-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.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServiceEntity;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.ws.internal.plugin.WSPlugin;
-import org.eclipse.wst.ws.internal.preferences.PersistentWSDLValidationContext;
-import org.eclipse.wst.wsdl.internal.impl.ServiceImpl;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-import org.eclipse.wst.wsdl.validation.internal.IValidationMessage;
-
-public class WSDLSelectionWidget extends AbstractObjectSelectionWidget implements IObjectSelectionWidget, Runnable
-{
-  private String              pluginId_;
-  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_;
-  
-  /*CONTEXT_ID PCON0004 for the Wizard WSDL Validation table of the WSDL Selection Page*/
-  private ValidationMessageViewerWidget msgViewer_;
-  private ValidateWSDLJob validateWSDLJob_;
-  private JobChangeAdapter    jobChangeAdapter_;
-  
-  /*CONTEXT_ID PCON0005 for the Wizard WSDL Validation summary message of the WSDL Selection Page*/
-  private Text validationSummaryText_;
-  private Text validationSummaryText2_;
-
-  
-  public WSDLSelectionWidget()
-  {
-    pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-    wsFilter_ = new FileExtensionFilter(new String[] {"wsdl", "wsil", "html"});
-    webServicesParser = WSDLParserFactory.getWSDLParser();
-    
-    final Runnable handleValidationMessages = new Runnable()
-    {
-	  public void run() 
-      {
-		  msgViewer_.setInput(validateWSDLJob_.getValidationMessages());
-		  updateValidationSummary(validateWSDLJob_.getValidationMessageSeverity());
-      }
-    };
-    
-    jobChangeAdapter_ = new JobChangeAdapter()
-    {
-      public void done(IJobChangeEvent event) 
-      {   	
-    	  if (msgViewer_!= null && msgViewer_.getContentProvider() != null) {
-    		  Display.getDefault().asyncExec( handleValidationMessages );
-		  }
-      }
-    };
-  }
-  
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener )
-  {
-    UIUtils uiUtils  = new UIUtils( pluginId_ );
-    parent_          = parent;
-    statusListener_  = statusListener;
-
-	  parent.setToolTipText( ConsumptionUIMessages.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( ConsumptionUIMessages.LABEL_WS_SELECTION);
-    GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-    gd.horizontalSpan = 2;
-    wsLabel.setLayoutData(gd);
-    wsLabel.setToolTipText( ConsumptionUIMessages.TOOLTIP_PCON_TEXT_WS );
-    
-    webServiceURI = uiUtils.createText( wsdlGroup, null, 
-    						ConsumptionUIMessages.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, ConsumptionUIMessages.BUTTON_BROWSE, 
-    								ConsumptionUIMessages.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);
-    
-    msgViewer_ = new ValidationMessageViewerWidget();
-    msgViewer_.addControls(parent, statusListener);
-    
-    validationSummaryText_ = new Text( parent, SWT.WRAP);
-    validationSummaryText_.setEditable(false);
-    GridData gd1 = new GridData(GridData.FILL_BOTH);
-    validationSummaryText_.setLayoutData(gd1);
-    validationSummaryText_.setToolTipText( ConsumptionUIMessages.TOOLTIP_VALIDATE_TEXT_MESSAGE_SUMMARY );
-    
-    validationSummaryText2_ = new Text( parent, SWT.WRAP);
-    validationSummaryText2_.setEditable(false);
-    validationSummaryText2_.setLayoutData(gd1);
-    
-    setMessageSummary();
-    return this;
-  }
-  
-  private void setMessageSummary() {
-	  String validationMessageSummary = ConsumptionUIMessages.MESSAGE_VALIDATE_NO_WSDL;
-	  PersistentWSDLValidationContext wsdlValidationContext = WSPlugin.getInstance().getWSDLValidationContext();
-	  String validationSelection = wsdlValidationContext.getPersistentWSDLValidation();
-	  if (PersistentWSDLValidationContext.VALIDATE_REMOTE_WSDL.equals(validationSelection)) {
-		  validationMessageSummary = ConsumptionUIMessages.MESSAGE_VALIDATE_REMOTE_WSDL;
-	  } else if (PersistentWSDLValidationContext.VALIDATE_ALL_WSDL.equals(validationSelection)) {
-		  validationMessageSummary = ConsumptionUIMessages.MESSAGE_VALIDATE_ALL_WSDL;
-	  }
-	  validationSummaryText_.setText( validationMessageSummary );
-	  validationSummaryText2_.setText(" ");
-  }
-  
-  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, 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 IStatus getStatus()
-  {
-    // Timer validation
-    /*
-     * Commenting out because we don't want to block fast typers from hitting Next/Finish 
-    if (Timer.isRunning())
-      return new SimpleStatus("", ConsumptionUIMessages.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 StatusUtils.errorStatus( ConsumptionUIMessages.PAGE_MSG_INVALID_WEB_SERVICE_URI );
-    else if( wsPath.indexOf(':') < 0 )
-    {
-      IResource res = ResourceUtils.findResource(wsPath);
-      if( res == null ) {
-    	  msgViewer_.clearInput();
-        return StatusUtils.errorStatus( NLS.bind(ConsumptionUIMessages.PAGE_MSG_NO_SUCH_FILE, new Object[] {wsPath}) );
-      }
-      else if( res.getType() != IResource.FILE ) {
-    	  msgViewer_.clearInput();
-        return StatusUtils.errorStatus( ConsumptionUIMessages.PAGE_MSG_INVALID_WEB_SERVICE_URI );
-      }
-    }
-
-    
-    // Validate the content of the Web service URI
-    // For example, is selection a WSDL URI?
-    if (!Timer.isRunning() && tree.isEnabled())
-    {
-      IStatus status = tree.getStatus();
-      if (status != null)
-      {
-        int severity = status.getSeverity();
-        if (severity == Status.ERROR || severity == Status.WARNING) {
-        	msgViewer_.clearInput();
-          return status;
-        }
-      }
-    }
-    else
-    {
-    	if( wsPath.indexOf(':') < 0 )
-        {
-          String wsdlURI = iFile2URI((IFile)ResourceUtils.findResource(wsPath));
-          if (webServicesParser.getWSDLDefinition(wsdlURI) == null) {
-        	  msgViewer_.clearInput();
-            return StatusUtils.errorStatus(ConsumptionUIMessages.PAGE_MSG_SELECTION_MUST_BE_WSDL );
-          }
-        }
-    }
-    
-    
-    if (!Timer.isRunning()) {
-    	String wsdlURI1 = wsPath;
-    	 boolean isRemote = true;
-    	if (tree.isEnabled()) { // is wsil
-    		wsdlURI1 = tree.getWsdlURI();
-    		if (wsdlURI1.startsWith("file:")) {
-    			isRemote = false;
-    		}
-    	} else { // is wsil
-    	
-    		if( wsPath.indexOf(':') < 0 )
-    		{      	// not remote
-    			isRemote = false;
-    			wsdlURI1 = iFile2URI((IFile)ResourceUtils.findResource(wsPath));
-    		}
-    	}
-  	  
-      setMessageSummary();
-  	  validateWSDL(wsdlURI1, isRemote);
-    }
-    
-
-    // OK status
-    return Status.OK_STATUS;
-  }
-  
-  private void validateWSDL (String wsdlURI, boolean isRemote) {
-
-	  String validationSelection = WSPlugin.getInstance().getWSDLValidationContext().getPersistentWSDLValidation();;
-	  if ((PersistentWSDLValidationContext.VALIDATE_ALL_WSDL.equals(validationSelection)) ||
-			  (PersistentWSDLValidationContext.VALIDATE_REMOTE_WSDL.equals(validationSelection) && isRemote)) {
-
-		  IJobManager    jobManager     = Platform.getJobManager();
-		  Job[]          jobs           = jobManager.find( ValidateWSDLJob.VALIDATE_WSDL_JOB_FAMILY );
-		  ValidateWSDLJob existingValidateWSDLJob = null;
-		  
-		  boolean startWSDLValidation = true;
-		  validationSummaryText_.setText( ConsumptionUIMessages.MESSAGE_VALIDATE_IN_PROGRESS );
-		  validationSummaryText2_.setText(" ");
-		  if( jobs.length > 0 )
-		  {
-			  for (int i=0; i<jobs.length; i++) {
-				  existingValidateWSDLJob = (ValidateWSDLJob)jobs[i];
-				  
-				  if (existingValidateWSDLJob.getState() != Job.NONE) { 
-					  // Job running or to be run
-					  // If the job is validating the same wsdlURI, let it finish running and ignore this one.
-					  // It is not for the same wsdlURI, cancel the job and schedule this one.
-
-					  if (!wsdlURI.equals(existingValidateWSDLJob.getWsdlURI())) {
-						  existingValidateWSDLJob.cancel();
-					  } else {						  
-						  startWSDLValidation = false;
-					  }
-				  } 
-			  }
-		  } 
-		  
-		  if (startWSDLValidation) {
-			  startWSDLValidationJob(wsdlURI);
-		  }
-	  }
-	  return;
-  }
-  
-  private void startWSDLValidationJob (String wsdlURI) {
-	  validateWSDLJob_ = new ValidateWSDLJob(wsdlURI);
-	  validateWSDLJob_.addJobChangeListener( jobChangeAdapter_ );
-	  validateWSDLJob_.schedule();
-  }
-  
-  public void updateValidationSummary(int messageSeverity)
-  {
-  	
-  	switch (messageSeverity) {
-  	case IValidationMessage.SEV_ERROR:
-		validationSummaryText_.setText(ConsumptionUIMessages.ERROR_MESSAGES_IN_VALIDATION);
-		validationSummaryText2_.setText(ConsumptionUIMessages.WARNING_IF_CONTINUE);
-		break;
-	case IValidationMessage.SEV_WARNING:
-		validationSummaryText_.setText(ConsumptionUIMessages.WARNING_MESSAGES_IN_VALIDATION);
-		validationSummaryText2_.setText(ConsumptionUIMessages.WARNING_IF_CONTINUE);
-		break;
-	default:
-		validationSummaryText_.setText(ConsumptionUIMessages.VALIDATION_COMPLETED);
-		validationSummaryText2_.setText(" ");
-		break;
-	}
-  }
-  
-  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;
-  }
-  
-  public IStructuredSelection getObjectSelection()
-  {
-    return new StructuredSelection( 
-               new WSDLSelectionWrapper( webServicesParser,
-                                         new StructuredSelection(tree.getWsdlURI()) ) );
-  }
-  
-  public WebServicesParser getWebServicesParser()
-  {
-    return webServicesParser;
-  }
-  
-  public IStatus validateSelection(IStructuredSelection objectSelection)
-  {
-    return Status.OK_STATUS;
-  }
-  
-  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;
-  }
-  
-  public String getComponentName()
-  {
-    String wsdlURI = tree.getWsdlURI();
-    if (wsdlURI != null)
-    {
-      String cname = getComponentNameFromURI(wsdlURI);
-      if (cname!=null && cname.length()>0)
-        return cname;
-      
-      String wsRelPath = webServiceURI.getText();
-      IResource wsRes = ResourceUtils.findResource(wsRelPath);
-      if (wsRes!=null && wsRes instanceof IFile)
-      {
-        IVirtualComponent comp = ResourceUtils.getComponentOf(wsRes);
-        if (comp!=null)
-        {
-          return comp.getName();
-        }
-      }
-      
-    }
-    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;
-  }
-  
-  private String getComponentNameFromURI(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)
-      {
-        IVirtualComponent comp = ResourceUtils.getComponentOf(res);
-        if (comp!=null)
-        {
-          return comp.getName();
-        }        
-      }
-    }
-    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 80a6c1823..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWrapper.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.object;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.wst.ws.internal.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 3d4ee2022..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ClientRuntimeSelectionWidget.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
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060204 124408   rsinha@ca.ibm.com - Rupam Kuehner          
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.consumption.common.FacetUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.common.ValidationUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-
-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 Group                        clientGroup_;
-  private RuntimeServerSelectionWidget runtimeWidget_;
-  private ProjectSelectionWidget       projectWidget_;
-  private boolean 					           isVisible_;
-  
-  
-  public WidgetDataEvents addControls( Composite parent, final Listener statusListener )
-  {
-    UIUtils      uiUtils  = new UIUtils( pluginId_ ); 
-    
-    clientGroup_ = uiUtils.createGroup( parent, ConsumptionUIMessages.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();
-                                        }
-                                      });
-                                         
-    
-    projectWidget_ = new ProjectSelectionWidget(true);
-    projectWidget_.addControls( clientGroup_, statusListener );
-        
-    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 getClientRuntimeId()
-  {
-    //calculate the most appropriate clientRuntimeId based on current settings.
-    String projectName = projectWidget_.getProjectName();
-    String templateId = projectWidget_.getComponentType();
-    
-    //Find the client runtime that fits this profile best.
-    return WebServiceRuntimeExtensionUtils2.getClientRuntimeId(runtimeWidget_.getTypeRuntimeServer(), projectName, templateId);
-  } 
-    
-  public boolean getClientNeedEAR()
-  {
-    return projectWidget_.getNeedEAR();
-  }
-  
-  public void setClientNeedEAR(boolean b)
-  {
-    projectWidget_.setNeedEAR(b);
-  }  
-  
-  public String getClientProjectName()
-  {
-	return projectWidget_.getProjectName();  
-  }
-  
-  public void setClientProjectName( String name )
-  {
-    projectWidget_.setProjectName( name );
-  }
-  
-  public String getClientEarProjectName()
-  {
-    return projectWidget_.getEarProjectName();	  
-  }
-  
-  public void setClientEarProjectName( String name )
-  {
-	projectWidget_.setEarProjectName( name );  
-  }
-  
-  public String getClientComponentType()
-  {
-    return projectWidget_.getComponentType();
-  }
-  
-  public void setClientComponentType( String type )
-  {
-	projectWidget_.setComponentType( type );  
-  }
-  
-  public void setInstallClient(boolean b)
-  {
-    runtimeWidget_.setInstall(b);
-  }
-
-  private void handleUpdateProjectWidget()
-  {
-    projectWidget_.setTypeRuntimeServer(runtimeWidget_.getTypeRuntimeServer());    
-
-    //Update the list of projects shown to the user.
-    projectWidget_.refreshProjectItems();    
-  }
-  
-  public ProjectSelectionWidget getProjectSelectionWidget() {
-    return this.projectWidget_;
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#getStatus()
-   */
-  public IStatus getStatus() 
-  {
-    //MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-    ValidationUtils valUtils = new ValidationUtils();
-    //Return OK all the time for now.
-    IStatus finalStatus   = Status.OK_STATUS;
-    
-    
-    IStatus projectStatus = projectWidget_.getStatus();
-    IStatus runtimeStatus = runtimeWidget_.getStatus();
-    
-    if( runtimeStatus.getSeverity() == Status.ERROR )
-    {
-      finalStatus = runtimeStatus;
-    }
-    else if( projectStatus.getSeverity() == Status.ERROR )
-    {
-      finalStatus = projectStatus;
-    }
-    else
-    {      
-      String projectName = projectWidget_.getProjectName();
-      if (projectName != null && projectName.length()>0)
-      {
-        //If the project exists, ensure that it is suitable for the selected runtime
-        //and server.
-        
-        IProject project = ProjectUtilities.getProject(projectName);
-        String typeId = getClientTypeRuntimeServer().getTypeId();
-        String runtimeId = getClientTypeRuntimeServer().getRuntimeId();
-        String serverFactoryId = getClientTypeRuntimeServer().getServerId();
-        
-        if (project.exists())
-        {
-          //Check if the runtime supports it.
-          if (!WebServiceRuntimeExtensionUtils2.doesClientTypeAndRuntimeSupportProject(typeId, runtimeId, projectName))
-          {
-            String runtimeLabel = WebServiceRuntimeExtensionUtils2.getRuntimeLabelById(runtimeId);
-            finalStatus = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_CLIENT_RUNTIME_DOES_NOT_SUPPORT_PROJECT, new String[]{runtimeLabel, projectName}));
-          }
-          
-          //Check if the server supports it.
-
-          if (serverFactoryId!=null && serverFactoryId.length()>0)
-          {
-            if (!valUtils.doesServerSupportProject(serverFactoryId, projectName))
-            {
-              String serverLabel = WebServiceRuntimeExtensionUtils2.getServerLabelById(serverFactoryId);
-              finalStatus = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_CLIENT_SERVER_DOES_NOT_SUPPORT_PROJECT, new String[]{serverLabel, projectName}));
-            }
-          }          
-        }
-        else
-        {
-          //Look at the project type to ensure that it is suitable for the selected runtime
-          //and server.
-          
-          String templateId = getClientComponentType();
-
-          if (templateId != null && templateId.length()>0)
-          {
-            //Check if the runtime supports it.            
-            if (!WebServiceRuntimeExtensionUtils2.doesClientTypeAndRuntimeSupportTemplate(typeId, runtimeId, templateId))
-            {
-              String runtimeLabel = WebServiceRuntimeExtensionUtils2.getRuntimeLabelById(runtimeId);
-              String templateLabel = FacetUtils.getTemplateLabelById(templateId);
-              finalStatus = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_CLIENT_RUNTIME_DOES_NOT_SUPPORT_TEMPLATE, new String[]{runtimeLabel, templateLabel}));
-            }
-            
-            //Check if the server supports it.
-            if (serverFactoryId!=null && serverFactoryId.length()>0)
-            {
-              if (!valUtils.doesServerSupportTemplate(serverFactoryId, templateId))
-              {
-                String serverLabel = WebServiceRuntimeExtensionUtils2.getServerLabelById(serverFactoryId);
-                String templateLabel = FacetUtils.getTemplateLabelById(templateId);
-                finalStatus = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_CLIENT_SERVER_DOES_NOT_SUPPORT_TEMPLATE, new String[]{serverLabel, templateLabel}));
-              }
-            }
-          }
-          
-          
-          
-        }
-      }
-      
-      //If finalStatus is still OK, check if there are any warnings.
-      if (finalStatus.getSeverity()!=Status.ERROR)
-      {
-        if( runtimeStatus.getSeverity() == Status.WARNING )
-        {
-          finalStatus = runtimeStatus;
-        }
-      }
-    }
-        
-    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 896c2f974..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ClientRuntimeSelectionWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,1274 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060131 121071   rsinha@ca.ibm.com - Rupam Kuehner
- * 20060206 126408   rsinha@ca.ibm.com - Rupam Kuehner
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.Vector;
-
-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.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.server.core.FacetUtil;
-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.FacetMatcher;
-import org.eclipse.jst.ws.internal.consumption.common.FacetUtils;
-import org.eclipse.jst.ws.internal.consumption.common.RequiredFacetVersion;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-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.preferences.ProjectTopologyContext;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.ClientRuntimeDescriptor;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.FacetMatchCache;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.ServiceRuntimeDescriptor;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.env.core.selection.SelectionList;
-import org.eclipse.wst.command.internal.env.core.selection.SelectionListChoices;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-import org.eclipse.wst.ws.internal.wsrt.ISelection;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntime;
-import org.eclipse.wst.ws.internal.wsrt.SimpleContext;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceClientInfo;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceState;
-
-public class ClientRuntimeSelectionWidgetDefaultingCommand extends AbstractDataModelOperation
-{   
-  
-  private TypeRuntimeServer    clientIds_;
-  private boolean clientIdsFixed_ = false;
-  private String clientRuntimeId_;
-  private String clientProjectName_;
-  private String clientEarProjectName_;
-  protected boolean clientNeedEAR_ = true;
-  private String clientComponentType_;
-  private FacetMatcher clientFacetMatcher_;
-  
-  private IContext          context_;
-  private ISelection        selection_;
-  private IWebServiceClient webServiceClient_;
-  private ResourceContext   resourceContext_;
-  private boolean           test_;
-  
-  //A note on initialSelections ...
-  //The difference between clientInitialProject/Component_ and initialInitialSelection is that
-  //clientInitialProject/Component_ 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 IProject clientInitialProject_;
-  private String wsdlURI_;
-
-  public ClientRuntimeSelectionWidgetDefaultingCommand()
-  {
-    super();
-  }
-  
-  public void setClientTypeRuntimeServer( TypeRuntimeServer ids )
-  {
-    clientIds_ = ids;
-  }
-  
-  public TypeRuntimeServer getClientTypeRuntimeServer()
-  {
-    return clientIds_; 
-  }
-  
-  public void setClientIdsFixed(boolean b)
-  {
-    clientIdsFixed_ = b;  
-  }
-  
-  public String getClientRuntimeId()
-  {
-    return clientRuntimeId_;
-  }
-  
-  public String getClientProjectName()
-  {
-    return clientProjectName_;
-  }
-  
-  public String getClientEarProjectName()
-  {
-    return clientEarProjectName_;
-  }
-  
-  public void setClientEarProjectName(String name)
-  {
-    clientEarProjectName_ = name;
-  }
-  
-  public String getClientComponentType()
-  {
-    return  clientComponentType_;
-  }
-  
-  public IWebServiceClient getWebService()
-  {
-    return webServiceClient_;  
-  }
-    
-  public IContext getContext()
-  {
-    return context_;
-  }  
-  
-  public ISelection getSelection()
-  {
-    return selection_;    
-  }
-  
-  public IStatus execute(IProgressMonitor monitor, IAdaptable adaptable)
-  {
-
-    IEnvironment env = getEnvironment();
-
-    try
-    {
-      
-      if (clientIdsFixed_)
-      {
-        // Set the clientRuntime based on the runtime, server, and initial
-        // selection.
-        DefaultRuntimeTriplet drt = getDefaultClientRuntimeForFixedRuntimeAndServer(clientInitialProject_);
-        clientFacetMatcher_ = drt.getFacetMatcher();
-        clientProjectName_ = drt.getProjectName();
-        clientRuntimeId_ = drt.getRuntimeId();        
-      } 
-      else
-      {
-        // Set the runtime based on the initial selection
-        DefaultRuntimeTriplet drt = getDefaultRuntime(clientInitialProject_, clientIds_.getTypeId(), true);
-        clientFacetMatcher_ = drt.getFacetMatcher();
-        clientProjectName_ = drt.getProjectName();
-        clientRuntimeId_ = drt.getRuntimeId();
-
-        if (clientRuntimeId_ == null)
-        {
-          // return and error.
-        }
-        clientIds_.setRuntimeId(WebServiceRuntimeExtensionUtils2.getClientRuntimeDescriptorById(clientRuntimeId_).getRuntime()
-            .getId());
-      }
-      
-      // Set the project
-      if (clientProjectName_ == null)
-      {
-        // Project name did not get set when the runtime was set, so set it now
-        clientProjectName_ = getDefaultClientProjectName();
-      }
-
-      IProject clientProject = ProjectUtilities.getProject(clientProjectName_);
-      if (!clientProject.exists())
-      {
-        // Set the project template
-        clientComponentType_ = getDefaultClientProjectTemplate();
-      }
-      else
-      {
-        //Set it to an empty String
-        clientComponentType_ = "";
-      }
-
-
-      // Set the server
-      if (!clientIdsFixed_)
-      {
-        IStatus serverStatus = setClientDefaultServer();
-        if (serverStatus.getSeverity() == Status.ERROR)
-        {
-          env.getStatusHandler().reportError(serverStatus);
-          return serverStatus;
-        }
-      }
-      
-      setDefaultClientEarProject();      
-      // Calculate default IWebServiceClient
-      setDefaultsForExtension(env);
-
-      return Status.OK_STATUS;
-      
-    } catch (Exception e)
-    {
-      // Catch all Exceptions in order to give some feedback to the user
-      IStatus errorStatus = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_ERROR_TASK_EXCEPTED,
-          new String[] { e.getMessage() }), e);
-      env.getStatusHandler().reportError(errorStatus);
-      return errorStatus;
-    }
-  }
-  
-  private void setDefaultClientEarProject()
-  {    
-    //Don't need an ear if this is a Java project, or if the selected template is jst.utility
-    IProject clientProject = ProjectUtilities.getProject(clientProjectName_);
-    if (clientProject.exists())
-    {
-      clientNeedEAR_ = !(FacetUtils.isJavaProject(clientProject));
-    }
-    else
-    {
-      clientNeedEAR_ = !(FacetUtils.isUtilityTemplate(clientComponentType_));  
-    }
-    
-    //If clientNeedEAR_ is still true, it means that we're not dealing with a Java project
-    //or Java project type. Check the server.
-    if (clientNeedEAR_)
-    {
-      // Determine if an ear selection is needed based on the server type.
-
-      String serverId = clientIds_.getServerId();
-      if (serverId != null)
-      {
-        // Use the server type
-        String serverTargetId = ServerUtils.getRuntimeTargetIdFromFactoryId(serverId);
-        if (serverTargetId != null && serverTargetId.length() > 0)
-        {
-          if (!ServerUtils.isTargetValidForEAR(serverTargetId, "13"))
-          {
-            // Default the EAR selection to be empty
-            clientNeedEAR_ = false;
-          }
-        }
-      }
-    }
-    
-    if (clientNeedEAR_)
-    {
-      clientEarProjectName_ = getDefaultClientEarProjectName();
-    }
-    else
-    {
-      clientEarProjectName_ = "";
-    }   
-  }
-  
-  private IStatus setClientDefaultServer()
-  {
-    //Choose an existing server the module is already associated with if possible
-    IProject clientProject = ProjectUtilities.getProject(clientProjectName_);
-    IServer[] configuredServers = ServerUtil.getServersByModule(ServerUtils.getModule(clientProject), null);
-    
-    if (configuredServers!=null && configuredServers.length>0)
-    {
-      clientIds_.setServerId(configuredServers[0].getServerType().getId());
-      clientIds_.setServerInstanceId(configuredServers[0].getId());
-      return Status.OK_STATUS;            	
-    }
-    
-    //If the project exists, choose a suitable server or server type based on the existing project's runtime or facets
-    if (clientProject.exists())
-    {
-      IServer server = getServerFromProject(clientProjectName_, clientFacetMatcher_);
-      if (server != null)
-      {
-        clientIds_.setServerId(server.getServerType().getId());
-        clientIds_.setServerInstanceId(server.getId());
-        return Status.OK_STATUS;
-      }
-      else
-      {
-        IServerType serverType = getServerTypeFromProject(clientProjectName_, clientFacetMatcher_);
-        if (serverType != null)
-        {
-          clientIds_.setServerId(serverType.getId());
-          return Status.OK_STATUS;
-        }
-      }
-    }
-
-    //Haven't picked a server/server type on the basis of the project. Pick a server/server type
-    //that is compatible with the clientRuntimeId.
-    IServer server = getServerFromClientRuntimeId();
-    if (server!=null)
-    {
-      clientIds_.setServerId(server.getServerType().getId());
-      clientIds_.setServerInstanceId(server.getId());
-      return Status.OK_STATUS;
-    }
-    
-    IServerType serverType = getServerTypeFromClientRuntimeId();
-    if (serverType != null)
-    {
-      clientIds_.setServerId(serverType.getId());
-      return Status.OK_STATUS;
-    }    
-    
-    //No suitable server was found. Popup an error.
-    String runtimeLabel = WebServiceRuntimeExtensionUtils2.getRuntimeLabelById(clientIds_.getRuntimeId());
-    String serverLabels = getServerLabels(clientRuntimeId_);    
-    IStatus status = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_ERROR_NO_SERVER_RUNTIME, new String[]{runtimeLabel, serverLabels}) );
-    return status;
-  }
-  
-  private IServer getServerFromClientRuntimeId()
-  {
-    IServer[] servers = ServerCore.getServers();
-    if (servers != null && servers.length > 0) {
-      for (int i = 0; i < servers.length; i++)
-      {
-        String serverFactoryId = servers[i].getServerType().getId();
-        if (WebServiceRuntimeExtensionUtils2.doesClientRuntimeSupportServer(clientRuntimeId_, serverFactoryId))
-        {
-          return servers[i];
-        }
-      }
-    }
-    return null;    
-  }
-  
-  private IServerType getServerTypeFromClientRuntimeId()
-  {
-    String[] serverTypes = WebServiceRuntimeExtensionUtils2.getServerFactoryIdsByClientRuntime(clientRuntimeId_);
-    if (serverTypes!=null && serverTypes.length>0)
-    {
-      //Return the preferred one if it is in the list
-      PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
-      String preferredServerFactoryId = context.getServerFactoryId();
-      for (int i=0; i<serverTypes.length; i++)
-      {
-        if (serverTypes[i].equals(preferredServerFactoryId))
-        {
-          return ServerCore.findServerType(serverTypes[i]);
-        }
-      }
-      
-      return ServerCore.findServerType(serverTypes[0]);
-    }    
-    
-    return null;
-  }
-  
-  protected IServer getServerFromProject(String projectName, FacetMatcher facetMatcher)
-  {
-    IServer server = null;
-    
-    IProject project = ProjectUtilities.getProject(projectName);
-    IServer[] servers = ServerCore.getServers();
-    
-    if (servers.length > 0)
-    {
-      // Get the runtime.
-      org.eclipse.wst.common.project.facet.core.runtime.IRuntime fRuntime = null;
-      IFacetedProject fProject = null;
-
-      if (project != null && project.exists())
-      {
-        try
-        {
-          fProject = ProjectFacetsManager.create(project);
-          if (fProject != null)
-          {
-            fRuntime = fProject.getRuntime();
-          }
-        } catch (CoreException ce)
-        {
-
-        }
-      }
-
-      if (fRuntime != null)
-      {
-        // Get an existing server that has the same runtime.
-        IRuntime sRuntime = FacetUtil.getRuntime(fRuntime);
-        for (int i = 0; i < servers.length; i++)
-        {
-          IServer thisServer = servers[i];
-          if (thisServer.getRuntime().getId().equals(sRuntime.getId()))
-          {
-            server = thisServer;
-            break;
-          }
-        }
-      }
-
-      // If an existing server could not be chosen on the basis of the project's
-      // runtime,
-      // try to find an existing server using the project's facets and the
-      // facetsToAdd.
-      if (server == null)
-      {
-        if (project!=null && project.exists())
-        {
-          Set facets = FacetUtils.getFacetsForProject(project.getName());
-          if (facets != null)
-          {
-            Set facetsClone = new HashSet();
-            facetsClone.addAll(facets);            
-            if (facetMatcher.getFacetsToAdd() != null)
-            {
-              Iterator itr = facetMatcher.getFacetsToAdd().iterator();
-              while (itr.hasNext())
-              {
-                facetsClone.add(itr.next());  
-              }            
-            }
-            server = getServerFromFacets(facetsClone);            
-          }
-        }
-      }
-    }
-    return server;
-  }
-  
-  protected IServer getServerFromFacets(Set facets)
-  {
-    IServer server = null;
-    Set runtimes = FacetUtils.getRuntimes(new Set[]{facets});
-    Iterator itr = runtimes.iterator();
-    IServer[] servers = ServerCore.getServers();
-    
-    outer:
-    while(itr.hasNext())
-    {
-      org.eclipse.wst.common.project.facet.core.runtime.IRuntime fRuntime = (org.eclipse.wst.common.project.facet.core.runtime.IRuntime)itr.next();
-      IRuntime sRuntime = FacetUtil.getRuntime(fRuntime);
-      for (int i=0; i<servers.length; i++)
-      {
-        IServer thisServer = servers[i];
-        if (thisServer.getRuntime().getId().equals(sRuntime.getId()))
-        {
-          server = thisServer;
-          break outer;
-        }
-      }      
-    }
-
-    return server;
-  }
-  
-  protected IServerType getServerTypeFromProject(String projectName, FacetMatcher facetMatcher)
-  {
-    IServerType serverType = null;
-    
-    IProject project = ProjectUtilities.getProject(projectName);
-    IServerType[] serverTypes = ServerCore.getServerTypes();
-    
-    //Get the runtime.
-    org.eclipse.wst.common.project.facet.core.runtime.IRuntime fRuntime = null;
-    IFacetedProject fProject = null;
-    
-    if (project != null && project.exists())
-    {
-      try
-      {
-        fProject = ProjectFacetsManager.create(project);
-        if (fProject != null)
-        {
-          fRuntime = fProject.getRuntime();
-        }
-      } catch (CoreException ce)
-      {
-        
-      }
-    }
-    
-    if (fRuntime != null)
-    {
-      //Get a server type that has the same runtime type.
-      IRuntime sRuntime = FacetUtil.getRuntime(fRuntime);
-      for (int i=0; i<serverTypes.length; i++)
-      {
-        IServerType thisServerType = serverTypes[i];
-        if (thisServerType.getRuntimeType().getId().equals(sRuntime.getRuntimeType().getId()))
-        {
-          serverType = thisServerType;
-          break;
-        }
-      }
-    }
-
-    //If a server type could not be chosen on the basis of the project's runtime,
-    //try to find a server type using the project's facets and the facetsToAdd.
-    if (serverType == null)
-    {
-      if (project != null && project.exists())
-      {
-        Set facets = FacetUtils.getFacetsForProject(project.getName());
-        if (facets != null)
-        {
-          Set facetsClone = new HashSet();
-          facetsClone.addAll(facets);          
-          if (facetMatcher.getFacetsToAdd() != null)
-          {
-            Iterator itr = facetMatcher.getFacetsToAdd().iterator();
-            while (itr.hasNext())
-            {
-              facetsClone.add(itr.next());  
-            }            
-          }
-          serverType = getServerTypeFromFacets(facetsClone);          
-        }
-      }
-    }
-    
-    return serverType;
-  }
-  
-  protected IServerType getServerTypeFromFacets(Set facets)
-  {
-    IServerType serverType = null;
-    Set runtimes = FacetUtils.getRuntimes(new Set[]{facets});
-    Iterator itr = runtimes.iterator();
-    IServerType[] serverTypes = ServerCore.getServerTypes();
-    
-    outer:
-    while(itr.hasNext())
-    {
-      org.eclipse.wst.common.project.facet.core.runtime.IRuntime fRuntime = (org.eclipse.wst.common.project.facet.core.runtime.IRuntime)itr.next();
-      IRuntime sRuntime = FacetUtil.getRuntime(fRuntime);
-      for (int i=0; i<serverTypes.length; i++)
-      {
-        IServerType thisServerType = serverTypes[i];
-        if (thisServerType.getRuntimeType().getId().equals(sRuntime.getRuntimeType().getId()))
-        {
-          serverType = thisServerType;
-          break outer;
-        }
-      }      
-    }
-
-    return serverType;
-  }  
-  
-  protected IServer getServerFromProjectType(String templateId, FacetMatcher facetMatcher)
-  {
-    IServer server = null;
-    Set facets = FacetUtils.getInitialFacetVersionsFromTemplate(templateId);
-    if (facetMatcher.getFacetsToAdd() != null)
-    {
-      Iterator itr = facetMatcher.getFacetsToAdd().iterator();
-      while (itr.hasNext())
-      {
-        facets.add(itr.next());  
-      }            
-    }
-    server = getServerFromFacets(facets);
-    return server;
-  }
-  
-  protected IServerType getServerTypeFromProjectType(String templateId, FacetMatcher facetMatcher)
-  {
-    IServerType serverType = null;
-    Set facets = FacetUtils.getInitialFacetVersionsFromTemplate(templateId);
-    if (facetMatcher.getFacetsToAdd() != null)
-    {
-      Iterator itr = facetMatcher.getFacetsToAdd().iterator();
-      while (itr.hasNext())
-      {
-        facets.add(itr.next());  
-      }            
-    }
-    //TODO Instead of passing in a single set of facets, pass in multiple sets, if the
-    //jst.java facet is one of them and the clientRuntimeId allows newer.
-    serverType = getServerTypeFromFacets(facets);
-    return serverType;    
-  }
-  
-  private String getDefaultClientProjectTemplate()
-  {
-    String[] templates = WebServiceRuntimeExtensionUtils2.getClientProjectTemplates(clientIds_.getTypeId(), clientIds_.getRuntimeId());
-    
-    //Pick the Web one if it's there, otherwise pick the first one.
-    //Walk the list of client project types in the project topology preference
-    ProjectTopologyContext ptc= WebServiceConsumptionUIPlugin.getInstance().getProjectTopologyContext();
-    String[] preferredTemplateIds = ptc.getClientTypes();
-    for (int j=0; j<preferredTemplateIds.length; j++)
-    {
-      for (int i=0; i<templates.length; i++)
-      {
-        String templateId = templates[i];
-        if (templateId.equals(preferredTemplateIds[j]))
-        {
-          
-          boolean matches = WebServiceRuntimeExtensionUtils2.doesClientRuntimeSupportTemplate(clientRuntimeId_, templateId);
-          if (matches)
-          {
-            return templates[i];            
-          }
-        }                                    
-      }      
-    }
-
-    
-    //Didn't find a template id in the preferred list that worked. 
-    //Return the first one that is a match.
-    for (int j = 0; j < templates.length; j++)
-    {
-      String templateId = templates[j];
-      boolean matches = WebServiceRuntimeExtensionUtils2.doesClientRuntimeSupportTemplate(clientRuntimeId_, templateId);
-      if (matches)
-      {
-        return templates[j];            
-      }
-    }
-    
-    //Still nothing, return the first one if available.
-    if (templates.length > 0)
-      return templates[0];
-    
-    return "";
-  }
-  
-  private String getDefaultClientProjectName()
-  {
-    IProject[] projects = FacetUtils.getAllProjects();
-    ClientRuntimeDescriptor desc = WebServiceRuntimeExtensionUtils2.getClientRuntimeDescriptorById(clientRuntimeId_);
-    RequiredFacetVersion[] rfvs = desc.getRequiredFacetVersions();
-    
-    //Check each project and its facetRuntime for compatibility with the clientRuntime
-    for (int i=0; i<projects.length; i++)
-    {
-
-      Set facetVersions = FacetUtils.getFacetsForProject(projects[i].getName());
-      org.eclipse.wst.common.project.facet.core.runtime.IRuntime fRuntime = null;
-      String fRuntimeName = null;
-      fRuntime = FacetUtils.getFacetRuntimeForProject(projects[i].getName());
-      if (fRuntime != null)
-      {
-        fRuntimeName = fRuntime.getName();        
-      }              
-
-      if (facetVersions != null)
-      {
-
-        //FacetMatcher fm = FacetUtils.match(rfvs, facetVersions);
-        FacetMatcher fm = FacetMatchCache.getInstance().getMatchForProject(true, clientRuntimeId_, projects[i].getName());
-        boolean facetRuntimeMatches = true;
-        if (fRuntimeName != null)
-        {
-          facetRuntimeMatches = FacetUtils.isFacetRuntimeSupported(rfvs, fRuntimeName);  
-        }
-        
-        if (fm.isMatch() && facetRuntimeMatches)
-        {
-          clientFacetMatcher_ = fm;
-          return projects[i].getName();
-        }                    
-      }
-    }
-    
-    //No project was suitable, return a new project name
-    return ResourceUtils.getDefaultWebProjectName();
-    
-  }
-  
-  private DefaultRuntimeTriplet getDefaultClientRuntimeForFixedRuntimeAndServer(IProject project)
-  {
-    String[] clientRuntimes = WebServiceRuntimeExtensionUtils2.getClientRuntimesByType(clientIds_.getTypeId());
-    ArrayList validClientRuntimes = new ArrayList();
-    for (int i=0; i<clientRuntimes.length; i++ )
-    {
-      ClientRuntimeDescriptor desc = WebServiceRuntimeExtensionUtils2.getClientRuntimeDescriptorById(clientRuntimes[i]);
-      if (desc.getRuntime().getId().equals(clientIds_.getRuntimeId()))
-      {
-        //Check if this client runtime supports the server
-        if (WebServiceRuntimeExtensionUtils2.doesClientRuntimeSupportServer(desc.getId(), clientIds_.getServerId()))
-        {
-          validClientRuntimes.add(desc.getId());
-          if (project != null && project.exists())
-          {
-            //RequiredFacetVersion[] rfv = desc.getRequiredFacetVersions();
-            Set facetVersions = FacetUtils.getFacetsForProject(project.getName());
-            if (facetVersions != null)
-            {
-              //FacetMatcher fm = FacetUtils.match(rfv, facetVersions);
-              FacetMatcher fm = FacetMatchCache.getInstance().getMatchForProject(true, clientRuntimes[i], project.getName());
-              if (fm.isMatch())
-              {
-                DefaultRuntimeTriplet drt = new DefaultRuntimeTriplet();
-                drt.setFacetMatcher(fm);
-                drt.setProjectName(project.getName());
-                drt.setRuntimeId(desc.getId());
-                return drt;                
-              }                      
-            }
-          }
-          
-        }
-      }
-      
-    }
-    
-    if (validClientRuntimes.size() > 0)
-    {
-      //We couldn't match to the initially selected project so return the first valid runtime.
-      DefaultRuntimeTriplet drt = new DefaultRuntimeTriplet();
-      drt.setFacetMatcher(null);
-      drt.setProjectName(null);
-      drt.setRuntimeId(((String[])validClientRuntimes.toArray(new String[0]))[0]);
-      return drt;            
-    }
-    else
-    {
-      //There are no client runtimes that match the fixed runtime and server. Fall back to original algorithm
-      clientIdsFixed_ = false;
-      return getDefaultRuntime(project, clientIds_.getTypeId(), true);
-    }
-  }  
-    
-  protected DefaultRuntimeTriplet getDefaultRuntime(IProject project, String typeId, boolean isClient)
-  {
-    String[] runtimes = null;
-    if (isClient)
-    {
-      runtimes = WebServiceRuntimeExtensionUtils2.getClientRuntimesByType(typeId);
-    }
-    else
-    {
-      runtimes = WebServiceRuntimeExtensionUtils2.getServiceRuntimesByServiceType(typeId);
-    }
-        
-    //Split the array of service/client runtimes into one containing the preferred set and one containing the rest.
-    PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
-    String preferredRuntimeId = context.getRuntimeId();
-    ArrayList preferredRuntimeIdsList = new ArrayList();
-    ArrayList otherRuntimeIdsList = new ArrayList();
-    for (int k=0; k<runtimes.length; k++ )
-    {
-      String descRuntimeId = null;
-      if (isClient)
-      {
-        ClientRuntimeDescriptor desc = WebServiceRuntimeExtensionUtils2.getClientRuntimeDescriptorById(runtimes[k]);
-        descRuntimeId = desc.getRuntime().getId();
-      }
-      else
-      {
-        ServiceRuntimeDescriptor desc = WebServiceRuntimeExtensionUtils2.getServiceRuntimeDescriptorById(runtimes[k]);
-        descRuntimeId = desc.getRuntime().getId();
-      }
-      
-      if (descRuntimeId.equals(preferredRuntimeId))
-      {
-        preferredRuntimeIdsList.add(runtimes[k]);
-      }
-      else
-      {
-        otherRuntimeIdsList.add(runtimes[k]);
-      }
-    }
-    String[] preferredRuntimeIds = (String[])preferredRuntimeIdsList.toArray(new String[0]);
-    String[] otherRuntimeIds = (String[])otherRuntimeIdsList.toArray(new String[0]);
-    
-    Set facetVersions = null;
-    org.eclipse.wst.common.project.facet.core.runtime.IRuntime fRuntime = null;
-    String fRuntimeName = null;
-    
-    //If the initially selected project exists and facets can be inferred from it, look for
-    //a service/client runtime that matches the project's facets and also, if possible, its facet runtime.
-    //Preference should be given to the preferred service/client runtimes. 
-    if (project != null && project.exists())
-    {
-      facetVersions = FacetUtils.getFacetsForProject(project.getName());
-      fRuntime = FacetUtils.getFacetRuntimeForProject(project.getName());
-      fRuntimeName = null;
-      if (fRuntime != null)
-      {
-        fRuntimeName = fRuntime.getName();        
-      }
-      
-      if (facetVersions != null)
-      {
-        //1. First check to see if one of the preferred service/client runtimes matches the existing
-        //project's facets and runtime.
-        for (int p = 0; p < preferredRuntimeIds.length; p++)
-        {
-          RequiredFacetVersion[] prfv = null;
-          if (isClient)
-          {
-            prfv = WebServiceRuntimeExtensionUtils2.getClientRuntimeDescriptorById(preferredRuntimeIds[p]).getRequiredFacetVersions();
-          }
-          else
-          {
-            prfv = WebServiceRuntimeExtensionUtils2.getServiceRuntimeDescriptorById(preferredRuntimeIds[p]).getRequiredFacetVersions();
-          }
-          
-          //FacetMatcher fm = FacetUtils.match(prfv, facetVersions);
-          FacetMatcher fm = FacetMatchCache.getInstance().getMatchForProject(isClient, preferredRuntimeIds[p], project.getName());
-          boolean facetRuntimeMatches = true;
-          if (fRuntimeName != null)
-          {
-            facetRuntimeMatches = FacetUtils.isFacetRuntimeSupported(prfv, fRuntimeName);  
-          }          
-          
-          if (fm.isMatch() && facetRuntimeMatches)
-          {
-            DefaultRuntimeTriplet drt = new DefaultRuntimeTriplet();
-            drt.setFacetMatcher(fm);
-            drt.setProjectName(project.getName());
-            drt.setRuntimeId(preferredRuntimeIds[p]);
-            return drt;
-          }
-        }
-        
-        //2. Second, check to see if one of the other clientRuntimes matches the existing
-        //project's facets and runtime.        
-        for (int i=0; i<otherRuntimeIds.length; i++)
-        {        
-          RequiredFacetVersion[] rfv = null;
-          if (isClient)
-          {
-            rfv = WebServiceRuntimeExtensionUtils2.getClientRuntimeDescriptorById(otherRuntimeIds[i]).getRequiredFacetVersions();  
-          }
-          else
-          {
-            rfv = WebServiceRuntimeExtensionUtils2.getServiceRuntimeDescriptorById(otherRuntimeIds[i]).getRequiredFacetVersions();
-          }
-          
-          FacetMatcher fm = FacetMatchCache.getInstance().getMatchForProject(isClient, otherRuntimeIds[i], project.getName());
-          boolean facetRuntimeMatches = true;
-          if (fRuntimeName != null)
-          {
-            facetRuntimeMatches = FacetUtils.isFacetRuntimeSupported(rfv, fRuntimeName);  
-          }                      
-          if (fm.isMatch() && facetRuntimeMatches)
-          {
-            DefaultRuntimeTriplet drt = new DefaultRuntimeTriplet();
-            drt.setFacetMatcher(fm);
-            drt.setProjectName(project.getName());
-            drt.setRuntimeId(otherRuntimeIds[i]);
-            return drt;
-          }                              
-        }
-        
-        //3. Third, check to see if one of the preferred clientRuntimes matches the existing
-        //project's facets.
-        for (int p = 0; p < preferredRuntimeIds.length; p++)
-        {
-            FacetMatcher fm = FacetMatchCache.getInstance().getMatchForProject(isClient, preferredRuntimeIds[p], project.getName()); 
-            if (fm.isMatch())
-            {
-              DefaultRuntimeTriplet drt = new DefaultRuntimeTriplet();
-              drt.setFacetMatcher(fm);
-              drt.setProjectName(project.getName());
-              drt.setRuntimeId(preferredRuntimeIds[p]);
-              return drt;
-            }         
-        }
-        
-        //4. Fourth, check to see if the one the other clientRuntimes matches the existing
-        //project's facets.        
-        for (int i=0; i<otherRuntimeIds.length; i++)
-        {
-            FacetMatcher fm = FacetMatchCache.getInstance().getMatchForProject(isClient, otherRuntimeIds[i], project.getName()); 
-            if (fm.isMatch())
-            {
-              DefaultRuntimeTriplet drt = new DefaultRuntimeTriplet();
-              drt.setFacetMatcher(fm);
-              drt.setProjectName(project.getName());
-              drt.setRuntimeId(otherRuntimeIds[i]);
-              return drt;
-            }        
-        }        
-      }            
-    }
-    
-    //Haven't returned yet so this means that the intitially selected project cannot be used
-    //to influence the selection of the service/client runtime. 
-    
-    //If this is client defaulting, use the preferred client project types to
-    //influence the selection of a runtime.
-    if (isClient)
-    {
-      ProjectTopologyContext ptc = WebServiceConsumptionUIPlugin.getInstance().getProjectTopologyContext();
-      String[] preferredTemplateIds = ptc.getClientTypes();
-    
-      for (int n=0; n<preferredTemplateIds.length; n++)
-      {
-        String preferredTemplateId = preferredTemplateIds[n];
-        //Set templateFacetVersions = FacetUtils.getInitialFacetVersionsFromTemplate(preferredTemplateId);
-
-        for (int m=0; m<preferredRuntimeIds.length; m++)
-        {
-          //If this clientRuntime supports this template, choose it and exit.        
-          //ClientRuntimeDescriptor desc = WebServiceRuntimeExtensionUtils2.getClientRuntimeDescriptorById(preferredRuntimeIds[m]);
-          boolean matches = WebServiceRuntimeExtensionUtils2.doesClientRuntimeSupportTemplate(preferredRuntimeIds[m], preferredTemplateId);
-          if (matches)
-          {
-            DefaultRuntimeTriplet drt = new DefaultRuntimeTriplet();
-            drt.setFacetMatcher(null);
-            drt.setProjectName(null);            
-            drt.setRuntimeId(preferredRuntimeIds[m]);
-            return drt;            
-          }        
-        }
-      }
-    }
-    
-    //Still haven't returned. Return the first preferred service/client runtime id.
-    if (preferredRuntimeIds.length > 0)
-    {
-      DefaultRuntimeTriplet drt = new DefaultRuntimeTriplet();
-      drt.setFacetMatcher(null);
-      drt.setProjectName(null);
-      drt.setRuntimeId(preferredRuntimeIds[0]);
-      return drt;      
-    }
-      
-    if (runtimes.length > 0)
-    {
-      DefaultRuntimeTriplet drt = new DefaultRuntimeTriplet();
-      drt.setFacetMatcher(null);
-      drt.setProjectName(null);
-      drt.setRuntimeId(runtimes[0]);
-      return drt;
-    }
-    else
-    {
-      DefaultRuntimeTriplet drt = new DefaultRuntimeTriplet();
-      drt.setFacetMatcher(null);
-      drt.setProjectName(null);
-      drt.setRuntimeId(null);
-      return drt;
-    }    
-  }
-  /**
- * 
- * @param project
- * @return
- */
-  protected SelectionListChoices getProjectEARChoice(IProject project)
-  {
-    String[] flexProjects = getAllFlexibleProjects();
-    SelectionList list = new SelectionList(flexProjects, 0);
-    return new SelectionListChoices(list, null);
-  }
-  
-  protected SelectionList getEARProjects()
-  {
-    String[] flexProjects = getAllFlexibleProjects();
-    return new SelectionList(flexProjects, 0);
-  }
-  
-  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;
-  }
-  
-  
-  protected String getDefaultClientEarProjectName()
-  {
-    IProject clientProject = ProjectUtilities.getProject(clientProjectName_);
-    IVirtualComponent[] earComps = J2EEUtils.getReferencingEARComponents(clientProject);
-    if (earComps.length>0)
-    {
-      //Pick the first one
-      return earComps[0].getName();
-    }    
-
-    //Either project does not exist or component is not associated with any EARs, so pick the first EAR you see with the correct J2EE version.
-    IVirtualComponent[] allEarComps = J2EEUtils.getAllEARComponents();
-    if (allEarComps.length>0)
-    {
-        //TODO Choose an existing EAR that can be added to the server and who's J2EE level in consistent with 
-        //that of the selected project, if applicable. Picking the first one for now.        
-        return allEarComps[0].getName();             
-    }
-    else
-    {
-      //there are no Ears.
-      return ResourceUtils.getDefaultClientEARProjectName();
-    }    
-  }
-    
-    
-  private String getServerLabels(String clientRuntimeId)
-  {
-        String[] validServerFactoryIds = WebServiceRuntimeExtensionUtils2.getServerFactoryIdsByClientRuntime(clientRuntimeId);
-	    //String[] validServerLabels = new String[validServerFactoryIds.length];
-	    StringBuffer validServerLabels = new StringBuffer(); 
-	    for (int i=0; i<validServerFactoryIds.length; i++)
-	    {
-	    	if (i>0)
-	    	{
-	    		validServerLabels.append(", ");
-	    	}
-	    	validServerLabels.append(WebServiceRuntimeExtensionUtils.getServerLabelById(validServerFactoryIds[i]));
-	    	
-	    }
-	    return validServerLabels.toString();
-  }
-  
-  
-  /*
-   * Update the client project, client project type and clientRuntime as needed.
-   * Used by ServerRuntimeSelectionWidgetDefaultingCommand to update client side
-   * stuff based on service side defaults.
-   */
-  protected void updateClientProject(String projectName, String serviceTypeId)
-  {
-    boolean isEJB = false;
-    String implId = WebServiceRuntimeExtensionUtils2.getWebServiceImplIdFromTypeId(serviceTypeId);
-    isEJB = (implId.equals("org.eclipse.jst.ws.wsImpl.ejb"));
-    String[] updatedNames = ResourceUtils.getClientProjectComponentName(projectName, projectName, isEJB);
-    clientProjectName_ = updatedNames[0];
-    
-    IProject clientProject = ProjectUtilities.getProject(clientProjectName_);
-    if (clientProject.exists())
-    {
-      clientComponentType_ = "";
-      clientRuntimeId_ = WebServiceRuntimeExtensionUtils2.getClientRuntimeId(clientIds_, projectName, clientComponentType_);
-      
-    }
-    else
-    {
-      //Pick a client project type based on project topology preferences. Modify the clientRuntimeId_
-      //as needed.
-      String[] templateIds = WebServiceRuntimeExtensionUtils2.getClientProjectTemplates(clientIds_.getTypeId(), clientIds_.getRuntimeId());
-      ProjectTopologyContext ptc = WebServiceConsumptionUIPlugin.getInstance().getProjectTopologyContext();
-      String[] preferredTemplateIds = ptc.getClientTypes();
-      outer: 
-      for (int j = 0; j < preferredTemplateIds.length; j++)
-      {
-        for (int i = 0; i < templateIds.length; i++)
-        {
-          String templateId = templateIds[i];
-          if (templateId.equals(preferredTemplateIds[j]))
-          {
-            //Get a clientRuntimeId for this template
-            String newClientRuntimeId = WebServiceRuntimeExtensionUtils2.getClientRuntimeId(clientIds_, clientProjectName_, templateId);
-            if (newClientRuntimeId.length() > 0)
-            {
-              clientRuntimeId_ = newClientRuntimeId;
-              clientComponentType_ = templateId;
-              break outer;
-            }
-          }
-        }
-      }            
-    }    
-  }
-  
-  
-  private void setDefaultsForExtension(IEnvironment env)
-  {
-    IWebServiceRuntime wsrt = WebServiceRuntimeExtensionUtils2.getClientRuntime(clientRuntimeId_);
-    if (wsrt != null)
-    {
-      WebServiceClientInfo wsInfo = new WebServiceClientInfo();      
-      wsInfo.setServerFactoryId(clientIds_.getServerId());
-      wsInfo.setServerInstanceId(clientIds_.getServerInstanceId());
-      wsInfo.setState(WebServiceState.UNKNOWN_LITERAL);
-      wsInfo.setWebServiceRuntimeId(clientIds_.getRuntimeId());
-      wsInfo.setWsdlURL(wsdlURI_);
-
-      webServiceClient_ = wsrt.getWebServiceClient(wsInfo);
-      WebServiceScenario scenario = WebServiceScenario.CLIENT_LITERAL;
-      if (resourceContext_ != null)
-      {
-        context_ = new SimpleContext(true, true, true, true, true, true, test_, false, scenario, resourceContext_.isOverwriteFilesEnabled(), resourceContext_
-            .isCreateFoldersEnabled(), resourceContext_.isCheckoutFilesEnabled());
-      }
-    }
-  
-  }
-  
-  public void setClientInitialSelection(IStructuredSelection 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)
-  {
-    // TODO Delete this method and corresponding mappings
-	// if no longer required.
-  }
-  
-  public boolean getClientNeedEAR()
-  {
-    return clientNeedEAR_;
-  }
-
-  /**
-   * @param parser_ The parser_ to set.
-   */
-  public void setWebServicesParser(WebServicesParser parser) {
-    // TODO Delete this method and corresponding mappings
-	// if no longer required.
-  }
-  
-  public void setWsdlURI(String wsdlURI)
-  {
-    wsdlURI_ = wsdlURI;
-  }
-  
-  public void setTestService(boolean testService)
-  {
-    test_ = testService;
-  }   
-  
-  public void setResourceContext( ResourceContext resourceContext )
-  {
-    resourceContext_ = resourceContext;   
-  }  
-  
-  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;
-  }
-  
-  protected String[] getAllFlexibleProjects()
-  {
-    Vector v = new Vector();
-    IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
-    for (int i = 0; i < projects.length; i++)
-    {
-      if (!projects[i].getName().equals("Servers") && !projects[i].getName().startsWith("."))
-      {
-        v.add(projects[i].getName());
-      }
-    }    
-    
-    return (String[])v.toArray(new String[0]);
-    
-  }
-  
-  protected class FacetRuntimeMatcher
-  {
-    FacetMatcher facetMatcher;
-    boolean runtimeMatches;
-    
-    public FacetMatcher getFacetMatcher()
-    {
-      return facetMatcher;
-    }
-    public void setFacetMatcher(FacetMatcher facetMatcher)
-    {
-      this.facetMatcher = facetMatcher;
-    }
-    public boolean isRuntimeMatches()
-    {
-      return runtimeMatches;
-    }
-    public void setRuntimeMatches(boolean runtimeMatches)
-    {
-      this.runtimeMatches = runtimeMatches;
-    }   
-  }
-  
-  protected class DefaultRuntimeTriplet
-  {
-    FacetMatcher facetMatcher_;
-    String projectName_;
-    String runtimeId_;
-    
-    
-    public DefaultRuntimeTriplet()
-    {
-    }
-    
-    public FacetMatcher getFacetMatcher()
-    {
-      return facetMatcher_;
-    }
-    public void setFacetMatcher(FacetMatcher facetMatcher_)
-    {
-      this.facetMatcher_ = facetMatcher_;
-    }
-    public String getProjectName()
-    {
-      return projectName_;
-    }
-    public void setProjectName(String projectName_)
-    {
-      this.projectName_ = projectName_;
-    }
-    public String getRuntimeId()
-    {
-      return runtimeId_;
-    }
-    public void setRuntimeId(String runtimeId_)
-    {
-      this.runtimeId_ = runtimeId_;
-    }        
-  }
-}
\ 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 e47c1a449..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ProjectSelectionWidget.java
+++ /dev/null
@@ -1,760 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060204 124143   rsinha@ca.ibm.com - Rupam Kuehner          
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.common.FacetUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.preferences.ProjectTopologyContext;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.osgi.util.NLS;
-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.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class ProjectSelectionWidget extends SimpleWidgetDataContributor {
-
-
-  
-  private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-  
-  //private SelectionListChoices projects_;
-  
-  private boolean needEAR_;
-  
-  private TypeRuntimeServer trsIds_;
-
-  private Listener statusListener_;
-
-  private Text messageText_;
-
-  private boolean isClient_ = false;
-
-  private byte CREATE_PROJECT = (byte) 1;
-
-  private byte CREATE_EAR = (byte) 2;
-
-  private byte ADD_EAR_ASSOCIATION = (byte) 4;
-  
-  private Combo moduleProject_;
-  private Combo earProject_;
-  private Combo projectType_;
-  
-  private String[] templates_;
-
-  //private String   componentType_;
-  
-  private ModifyListener projectTypeListener_;
-  private ModifyListener moduleProjectListener_;
-  private ModifyListener earProjectListener_;
-
-  /*
-   * 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 module_;
-
-  /* CONTEXT_ID PWRS0018 for the client project type combo box of the runtime selection Page */
-  private String INFOPOP_PWRS_COMBO_CLIENT_PROJECT_TYPE = pluginId_ + ".PWRS0018";
-  
-  /* CONTEXT_ID PWRS0024 for the service project type combo box of the runtime selection Page */
-  private String INFOPOP_PWRS_COMBO_SERVICE_PROJECT_TYPE = pluginId_ + ".PWRS0018";    
-
-  //private Combo earModule_;
-
-  /*
-   * Default Constructor
-   */
-  public ProjectSelectionWidget() {
-  }
-
-  /*
-   * ProjectSelectionWidget @param isClient
-   */
-  public ProjectSelectionWidget(boolean isClient) {
-    this.isClient_ = isClient;
-  }
-
-  public WidgetDataEvents addControls(Composite parent, Listener statusListener) {
-
-    UIUtils uiUtils = new UIUtils(pluginId_);
-
-    statusListener_ = statusListener;
-		
-    if (isClient_)
-	{
-      projectType_ = uiUtils.createCombo(parent, ConsumptionUIMessages.LABEL_CLIENT_TYPE, ConsumptionUIMessages.TOOLTIP_PWCR_COMBO_CLIENT_TYPE, INFOPOP_PWRS_COMBO_CLIENT_PROJECT_TYPE, SWT.SINGLE | SWT.BORDER);
-	  moduleProject_ = uiUtils.createCombo(parent, ConsumptionUIMessages.LABEL_CLIENT_PROJECT, ConsumptionUIMessages.LABEL_CLIENT_PROJECT, INFOPOP_PWRS_COMBO_PROJECT, SWT.SINGLE | SWT.BORDER );            
-      //module_ = uiUtils.createCombo(parent, ConsumptionUIMessages.LABEL_CLIENT_MODULE", ConsumptionUIMessages.LABEL_CLIENT_MODULE", INFOPOP_PWRS_COMBO_PROJECT, SWT.SINGLE | SWT.BORDER );
-	  earProject_ = uiUtils.createCombo(parent, ConsumptionUIMessages.LABEL_CLIENT_EAR_PROJECT, ConsumptionUIMessages.LABEL_CLIENT_EAR_PROJECT, INFOPOP_PWRS_COMBO_PROJECT, SWT.SINGLE | SWT.BORDER );
-	  //earModule_ = uiUtils.createCombo(parent, ConsumptionUIMessages.LABEL_CLIENT_EAR_MODULE", ConsumptionUIMessages.LABEL_CLIENT_EAR_MODULE", INFOPOP_PWRS_COMBO_EAR, SWT.SINGLE | SWT.BORDER );
-    }
-    else 
-	{
-      projectType_ = uiUtils.createCombo(parent, ConsumptionUIMessages.LABEL_SERVICE_TYPE, ConsumptionUIMessages.TOOLTIP_PWCR_COMBO_SERVICE_TYPE, INFOPOP_PWRS_COMBO_SERVICE_PROJECT_TYPE, SWT.SINGLE | SWT.BORDER);      
-	  moduleProject_ = uiUtils.createCombo(parent, ConsumptionUIMessages.LABEL_SERVICE_PROJECT, ConsumptionUIMessages.LABEL_SERVICE_PROJECT, INFOPOP_PWRS_COMBO_PROJECT, SWT.SINGLE | SWT.BORDER );
-      //module_ = uiUtils.createCombo(parent, ConsumptionUIMessages.LABEL_SERVICE_MODULE", ConsumptionUIMessages.LABEL_SERVICE_MODULE", INFOPOP_PWRS_COMBO_PROJECT, SWT.SINGLE | SWT.BORDER );
-	  earProject_ = uiUtils.createCombo(parent, ConsumptionUIMessages.LABEL_SERVICE_EAR_PROJECT, ConsumptionUIMessages.LABEL_SERVICE_EAR_PROJECT, INFOPOP_PWRS_COMBO_PROJECT, SWT.SINGLE | SWT.BORDER );
-	  //earModule_ = uiUtils.createCombo(parent, ConsumptionUIMessages.LABEL_SERVICE_EAR_MODULE, ConsumptionUIMessages.LABEL_SERVICE_EAR_MODULE, INFOPOP_PWRS_COMBO_EAR, SWT.SINGLE | SWT.BORDER );
-    }
-    
-    //Temporarily remove the listeners
-    
-    projectTypeListener_ = new ModifyListener()
-    {
-      public void modifyText(ModifyEvent evt) 
-      {
-        statusListener_.handleEvent( null );
-      }
-    };    
-    
-	moduleProjectListener_ = new ModifyListener()
-	                         {
-	                           public void modifyText(ModifyEvent evt) 
-					           {
-					             handleProjectChanged();
-					             statusListener_.handleEvent( null );
-		                       }
-	                         };
-    
-	earProjectListener_ = new ModifyListener()
-                          {
-                            public void modifyText(ModifyEvent evt) 
-				            {
-				              statusListener_.handleEvent( null );
-	                        }
-                          };
-  					  
-    // message area
-    messageText_ = uiUtils.createText(parent, ConsumptionUIMessages.LABEL_NO_LABEL, ConsumptionUIMessages.LABEL_NO_LABEL, null, SWT.WRAP | SWT.MULTI | SWT.READ_ONLY);
-    setEarProjectItems();
-  
-    return this;
-  }
-  
-  private void listenersOn()
-  {
-    projectType_.addModifyListener(projectTypeListener_);
-	moduleProject_.addModifyListener( moduleProjectListener_ );
-	earProject_.addModifyListener( earProjectListener_ );
-  }
-  
-  private void listenersOff()
-  {
-    projectType_.removeModifyListener(projectTypeListener_);
-    moduleProject_.removeModifyListener( moduleProjectListener_ );
-    earProject_.removeModifyListener( earProjectListener_ );
-  }
-  
-  /*
-  private void handleModuleProjectChanged(String moduleName)
-  {
-	String   projectName = moduleProject_.getText(); 
-	IProject project     = null;
-	
-	if( projectName.equals( "" ) ) 
-	{
-	  module_.setItems( new String[0] );
-	  
-	  return;
-	}
-			
-	project = ProjectUtilities.getProject( projectName );
-	
-	
-	IVirtualComponent[] components = J2EEUtils.getComponentsByType( project, componentType_ );
-	String[] modules = new String[components.length];
-	
-	for( int index = 0; index < components.length; index++ )
-	{
-	  modules[index] = components[index].getName();	
-	}
-	
-	module_.setItems( modules );
-	
-	  if( modules.length > 0 )
-	  {
-      if (moduleName != null)
-      {
-       module_.setText(moduleName); 
-      }
-      else
-      {
-	      module_.setText( modules[0] );
-      }
-       
-	  }
-	  else
-	  {
-	    module_.setText( projectName );
-	  }
-  
-  }
-  */
-  
-  /*
-  private void handleModuleChanged()
-  {
-	IVirtualComponent component = getEarModuleForModule();
-	
-	if( component != null )
-	{
-	  String earProject    = component.getProject().getName();
-	  String componentName = component.getName();
-	
-      // This will cause the module list to be update via a listener.
-	  earProject_.setText( earProject );  
-	  earModule_.setText( componentName );
-	}
-	else
-	{
-	  earProject_.setText( "" );  
-	  earModule_.setText( "" );
-	}
-	
-	updateEAREnabledState();
-  }
-  */
-
-  /*
-  private void handleEarProjectChanged()
-  {
-	
-	String   projectName = earProject_.getText(); 
-	
-	if( projectName != null && !projectName.equals( "" ))
-	{
-	  IProject project     = ProjectUtilities.getProject( projectName );
-	
-	  IVirtualComponent[] components = J2EEUtils.getComponentsByType( project, J2EEUtils.EAR );
-	  String[] earModules = new String[components.length];
-	
-	  for( int index = 0; index < components.length; index++ )
-	  {
-	    earModules[index] = components[index].getName();	
-	  }
-	
-	  earModule_.setItems( earModules );
-	
-	  if( earModules.length > 0 )
-	  {
-	    earModule_.setText( earModules[0] );	
-	  }
-	  else
-	  {
-	    earModule_.setText( projectName );	
-	  }
-	}
-	else
-	{
-	  earModule_.setItems( new String[0] );	
-	}
-  }
-  */
-  
-  /*
-  private IVirtualComponent getEarModuleForModule()
-  {
-	String   projectName = moduleProject_.getText(); 
-	
-	if( projectName.equals( "" ) )
-	{
-	  return null;	
-	}
-	
-	IProject project     = ProjectUtilities.getProject( projectName );
-	
-	IVirtualComponent[] components = J2EEUtils.getReferencingEARComponents( project );
-	
-	return components.length == 0 ? null : components[0];
-  }
-  */
-  
-  /*
-  public void setProjectChoices(SelectionListChoices projects) 
-  {
-	listenersOff();
-	
-    projects_ = projects;
-	
-	String   selectedModuleProject    = projects.getList().getSelection();
-	String   selectedEarModuleProject = projects.getChoice().getList().getSelection();
-	String[] projectNames             = getProjects();
-	
-	moduleProject_.setItems( projectNames );
-	moduleProject_.setText( selectedModuleProject );
-	earProject_.setItems( projectNames );
-	earProject_.setText( selectedEarModuleProject );
-		
-	handleModuleProjectChanged(initialModuleName_);
-  handleModuleChanged();
-	updateEAREnabledState();	
-    listenersOn();
-  }
-  */
-  
-
-
-  /*
-  public SelectionListChoices getProjectChoices() 
-  {
-    return projects_;
-  }
-  */
-  
-  public String getProjectName()
-  {
-	return moduleProject_.getText();
-  }
-  
-  public void setProjectName( String name )
-  {
-	listenersOff();
-    moduleProject_.setText( name );
-    handleProjectChanged();
-	listenersOn();
-  }
-  
-  public String getEarProjectName()
-  {
-    return earProject_.getText();
-  }
-  
-  public void setEarProjectName( String name )
-  { 
-	listenersOff();
-	earProject_.setText( name );
-	listenersOn();
-  }
-  
-  public void setComponentType( String type )
-  {
-    listenersOff();
-    if (type != null && type.length()>0)
-    {
-      String label = FacetUtils.getTemplateLabelById(type);
-	  projectType_.setText(label);
-    }
-    else
-      projectType_.setText("");
-    
-    listenersOn();
-  }
-  
-  public String getComponentType()
-  {
-    int idx = projectType_.getSelectionIndex();
-    if (templates_ != null && idx > -1)
-    {
-      return templates_[idx];
-    }
-    else
-    {
-      String templateLabel = projectType_.getText();
-      String templateId = FacetUtils.getTemplateIdByLabel(templateLabel);
-      return templateId;
-    }
-
-  }
-  
-  public boolean getNeedEAR()
-  {
-    return needEAR_;
-  }
-  
-  public void setNeedEAR(boolean b)
-  {
-    listenersOff();
-    needEAR_ = b;
-    if (needEAR_)
-    {
-     earProject_.setEnabled(true);
-     populateEARCombos();
-    }
-    else
-    {
-      earProject_.setEnabled(false);
-      earProject_.setText("");
-    }
-    listenersOn();
-  }    
-
-  public void setTypeRuntimeServer(TypeRuntimeServer trs)
-  {
-    trsIds_ = trs;
-	listenersOff();
-    updateEARState();
-    listenersOn();
-  }
-  
-  public void refreshProjectItems()
-  {
-    listenersOff();
-    String selectedModuleProject = moduleProject_.getText();    
-    String runtimeId = trsIds_.getRuntimeId();
-    String typeId = trsIds_.getTypeId();
-    
-    //Get all the projects that are compatible with the type and runtime
-    String[] projectNames = null;
-    if (isClient_)
-    {
-      projectNames = WebServiceRuntimeExtensionUtils2.getProjectsForClientTypeAndRuntime(typeId, runtimeId);
-    }
-    else
-    {
-      projectNames = WebServiceRuntimeExtensionUtils2.getProjectsForServiceTypeAndRuntime(typeId, runtimeId);
-    }
-    
-    moduleProject_.setItems(projectNames);
-    moduleProject_.setText(selectedModuleProject);
-    handleProjectChanged();
-    listenersOn();
-  }
-  
-  public void setEarProjectItems()
-  {
-    IVirtualComponent[] ears = J2EEUtils.getAllEARComponents();
-    String[] earProjectNames = new String[ears.length];
-    for (int i=0; i<earProjectNames.length; i++)
-    {
-      earProjectNames[i]=ears[i].getProject().getName();
-    }
-    earProject_.setItems(earProjectNames);
-    
-    if (earProjectNames.length > 0)
-      earProject_.select(0);
-  }
-  
-  private void handleProjectChanged()
-  {  
-    updateEARState();
-    updateTemplates();
-  }
-  
-  private void updateTemplates()
-  {
-    String projectName = moduleProject_.getText();
-    if (projectName != null && projectName.length()>0)
-    {
-      IProject project = ProjectUtilities.getProject(projectName);
-      if (project.exists())
-      {
-        projectType_.setEnabled(false);
-        projectType_.setText("");        
-      }
-      else
-      {
-        populateProjectTypeCombo();
-        projectType_.setEnabled(true);
-      }
-    }
-  }
-  
-  private void populateProjectTypeCombo()
-  {
-    //Get the old value if there was one.
-    String oldTemplateId = getComponentType();
-    
-    String[] templates = null;
-    if (isClient_)
-    {
-      templates = WebServiceRuntimeExtensionUtils2.getClientProjectTemplates(trsIds_.getTypeId(), trsIds_.getRuntimeId());
-    }
-    else
-    {
-      templates = WebServiceRuntimeExtensionUtils2.getServiceProjectTemplates(trsIds_.getTypeId(), trsIds_.getRuntimeId());      
-    }
-    
-    String[] templateLabels = FacetUtils.getTemplateLabels(templates);
-    projectType_.setItems(templateLabels);
-    templates_ = templates;
-      
-    if (templates.length > 0)
-    {
-      
-      //Select the previous template selection if that one is in the list.
-      int idx = getIndexOfTemplateId(templates, oldTemplateId);
-      if (idx > -1)        
-      {
-        projectType_.select(idx);
-      }
-      else
-      {
-
-        if (isClient_)
-        {
-          // Select the preferred client project type.
-          ProjectTopologyContext ptc = WebServiceConsumptionUIPlugin.getInstance().getProjectTopologyContext();
-          String[] preferredTemplateIds = ptc.getClientTypes();
-          boolean selected = false;
-          outer: for (int j = 0; j < preferredTemplateIds.length; j++)
-          {
-            for (int i = 0; i < templates.length; i++)
-            {
-              String templateId = templates[i];
-              if (templateId.equals(preferredTemplateIds[j]))
-              {
-                projectType_.select(i);
-                selected = true;
-                break outer;
-              }
-            }
-          }
-
-          if (!selected)
-          {
-            projectType_.select(0);
-          }
-
-        } else
-        {
-          // If a "..web.." template is there, pick that as the default.
-          int webTemplateIndex = getWebTemplateIndex(templates);
-          if (webTemplateIndex > -1)
-          {
-            projectType_.select(webTemplateIndex);
-          } else
-          {
-            projectType_.select(0);
-          }
-        }
-      }
-    }
-  }
-  
-
-  private int getIndexOfTemplateId(String[] templateIds, String templateId)
-  {
-    for (int i=0; i<templateIds.length; i++)
-    {
-      if (templateIds[i].equals(templateId))
-      {
-        return i;
-      }
-    }
-    
-    return -1;    
-  }
-  
-  private int getWebTemplateIndex(String[] templateIds)
-  {
-    for (int i=0; i<templateIds.length; i++)
-    {
-      if (templateIds[i].indexOf("web") > -1)
-      {
-        return i;
-      }
-    }
-    
-    return -1;
-  }
-  
-  private void updateEARState()
-  {
-      if(!projectNeedsEAR(moduleProject_.getText()))
-      {
-	    earProject_.setEnabled(false);   
-        earProject_.setText("");
-        needEAR_ = false;
-      }
-      else
-      {
-        needEAR_ = true;
-        earProject_.setEnabled(true);
-        populateEARCombos();
-      }
-    
-  }
-
-  private void populateEARCombos()
-  {
-    earProject_.removeAll();
-    String projectName = moduleProject_.getText();
-    setEarProjectItems();
-    if (projectName != null && projectName.length() > 0)
-    {
-      IProject proj = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
-      
-      if (proj.exists())
-      {
-        
-        IVirtualComponent[] ears = J2EEUtils.getReferencingEARComponents(proj);
-        if (ears != null && ears.length > 0)
-        {
-          earProject_.setText(ears[0].getName());
-          return;
-        }
-        
-      }
-      
-     
-      String earName = projectName + "EAR";
-      earProject_.setText(earName);      
-    }
-  }
-
-  private boolean projectNeedsEAR(String projectName)
-  {
-	//Use the server type
-    if (trsIds_ != null && trsIds_.getServerId() != null)
-    {
-      String targetId = ServerUtils.getRuntimeTargetIdFromFactoryId(trsIds_.getServerId());
-  	  if (targetId!=null && targetId.length()>0)
-  	  {
-  	    if (!ServerUtils.isTargetValidForEAR(targetId,"13")) //rm j2ee
-  	    {
-  	      return false;
-  	    }
-  	  }
-    }
-  	
-  	return true;    
-  }
-  
-  
-  private IStatus handleSetMessageText() {
-    IStatus status = Status.OK_STATUS;
-    try {
-      byte result = (byte) 0;
-      if (moduleProject_.getText().length() != 0 && earProject_.getText().length() != 0) {
-        String projectText = moduleProject_.getText();
-        String earText = earProject_.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() && J2EEUtils.exists(project) && ear.exists() && J2EEUtils.exists(ear)) {
-            if (!J2EEUtils.isComponentAssociated(ear, project)) result = (byte) (result | ADD_EAR_ASSOCIATION);
-          }
-        }
-      }
-      if (isClient_) {
-        messageText_.setText(getValidationMessage(result, ConsumptionUIMessages.MSG_CLIENT_SUB));
-      }
-      else {
-        messageText_.setText(getValidationMessage(result, ConsumptionUIMessages.MSG_SERVICE_SUB));
-      }
-    }
-    catch (Exception e) {
-      return StatusUtils.errorStatus( ConsumptionUIMessages.PAGE_MSG_VALIDATION_INTERNAL_ERROR, e );
-    }
-    return status;
-  }
-  
-  private String getValidationMessage(byte result, String serviceOrClient) {
-    String msg = null;
-    switch (result) {
-    case 0:
-      return "";
-    case 1:
-    case 5:
-      msg = ConsumptionUIMessages.MSG_PROJECT_WILL_BE_CREATED;
-      break;
-    case 2:
-    case 6:
-      msg = ConsumptionUIMessages.MSG_EAR_WILL_BE_CREATED;
-      break;
-    case 3:
-    case 7:
-      msg = ConsumptionUIMessages.MSG_PROJECT_AND_EAR_CREATED;
-      break;
-    case 4:
-      msg = ConsumptionUIMessages.MSG_EAR_WILL_BE_ASSOCIATED;
-      break;
-    }
-    return msg != null ? NLS.bind(msg, new Object[] { serviceOrClient}) : "";
-  }
-
-  public IStatus getStatus() 
-  {
-    IStatus finalStatus = Status.OK_STATUS;
-    handleSetMessageText();
-    String projectText = moduleProject_.getText();
-    String earText = earProject_.getText();
-    
-    if (projectText==null || projectText.length()==0)
-    {
-      if (isClient_)
-        return StatusUtils.errorStatus( NLS.bind(ConsumptionUIMessages.MSG_CLIENT_PROJECT_EMPTY, new String[]{""} ) );
-      else
-        return StatusUtils.errorStatus( NLS.bind(ConsumptionUIMessages.MSG_SERVICE_PROJECT_EMPTY, new String[]{""} ) );
-    }
-    
-    if (needEAR_ && (earText==null || earText.length()==0))
-    {
-      if (isClient_)
-      {
-        return StatusUtils.errorStatus( NLS.bind(ConsumptionUIMessages.MSG_CLIENT_EAR_EMPTY, new String[]{""} ) );
-      }
-      else
-      {
-        return StatusUtils.errorStatus( NLS.bind(ConsumptionUIMessages.MSG_SERVICE_EAR_EMPTY, new String[]{""} ) );
-      }      
-    }
-    
-    //If the project and EAR both exist and the project is not already associated with the EAR, ensure
-    //they can be associated.
-    if (needEAR_)
-    {
-      IProject p = ProjectUtilities.getProject(projectText.trim());
-      IProject ep = ProjectUtilities.getProject(earText.trim());
-      if (p.exists() && ep.exists())
-      {
-        if (!J2EEUtils.isComponentAssociated(ep,p))
-        {
-          IStatus associateStatus = J2EEUtils.canAssociateProjectToEAR(p, ep);
-          if (associateStatus.getSeverity() == IStatus.ERROR)
-          {
-            if (isClient_)
-            {
-              return StatusUtils.errorStatus( NLS.bind(ConsumptionUIMessages.MSG_CLIENT_CANNOT_ASSOCIATE, new String[]{p.getName(), ep.getName(), associateStatus.getMessage()} ) );
-            }
-            else
-            {
-              return StatusUtils.errorStatus( NLS.bind(ConsumptionUIMessages.MSG_SERVICE_CANNOT_ASSOCIATE, new String[]{p.getName(), ep.getName(), associateStatus.getMessage()} ) );
-            }                  
-          }
-        }
-      }
-    }
-    
-    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 e1f6567f4..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/RuntimeServerSelectionWidget.java
+++ /dev/null
@@ -1,249 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060204 124408   rsinha@ca.ibm.com - Rupam Kuehner          
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.RuntimeServerSelectionDialog;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.osgi.util.NLS;
-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.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.core.ServerCore;
-
-
-
-public class RuntimeServerSelectionWidget extends SimpleWidgetDataContributor
-{
-  private String            pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-  private Text              runtime_;
-  private Text              server_;
-
-  private Composite         parent_;
-  private boolean           isClientContext_;
-  private TypeRuntimeServer ids_;
-  private boolean           install_;
-
-  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";
-
-  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 )
-  {
-    UIUtils      uiUtils  = new UIUtils( pluginId_ ); 
-    
-    parent_         = parent;
-    statusListener_ = statusListener;
-        
-    // Runtime label and text
-    runtime_ = uiUtils.createText( parent, ConsumptionUIMessages.LABEL_RUNTIMES_LIST,  
-    		ConsumptionUIMessages.TOOLTIP_PWRS_TEXT_RUNTIME,
-                                   INFOPOP_PWRS_GROUP_SERVICE_RUNTIME, SWT.READ_ONLY );
-    
-    // Server label and text
-    server_ = uiUtils.createText( parent, ConsumptionUIMessages.LABEL_SERVERS_LIST,  
-    		ConsumptionUIMessages.TOOLTIP_PWRS_TEXT_SERVER,
-                                  INFOPOP_PWRS_GROUP_SERVICE_SERVER, SWT.READ_ONLY );
-    
-    Button editButton = new Button( parent, SWT.NONE );
-    editButton.setText( ConsumptionUIMessages.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 void setInstall(boolean b)
-  {
-    install_ = b;
-  }
-  
-  private void setLabels()
-  {
-	String                       runtimeLabel = WebServiceRuntimeExtensionUtils2.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();
-      String serverId = ids_.getServerId();
-      if (serverId != null)
-        serverLabel = WebServiceRuntimeExtensionUtils2.getServerLabelById(serverId);
-    }
-    else
-    {
-      // Get the label for the server instance.
-      //serverLabel = registry.getServerInstanceLabelFromInstanceId( ids_.getServerInstanceId() );
-      String serverInstanceId = ids_.getServerInstanceId();
-      if (serverInstanceId != null)
-        serverLabel = WebServiceRuntimeExtensionUtils2.getServerInstanceLabelFromInstanceId(serverInstanceId);
-    }
-    // rskreg
-    runtimeLabel = runtimeLabel == null ? "" : runtimeLabel;
-    
-    runtime_.setText( runtimeLabel );
-    if (serverLabel != null)
-      server_.setText( serverLabel );
- 
-  }
-  
-  public void handleEditButton()
-  {
-    byte mode = isClientContext_ ? (byte)1 : (byte)0;
-    
-    RuntimeServerSelectionDialog dialog     
-      = dialog = new RuntimeServerSelectionDialog( parent_.getShell(), mode, ids_, "14" ); //rm j2ee
-    dialog.create();
-    dialog.handleServerViewSelectionEvent();
-    int result = dialog.open();
-
-    if (result == Window.OK)
-    {
-      ids_ = dialog.getTypeRuntimeServer();
-      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 IStatus getStatus() 
-  {
-    IStatus status = Status.OK_STATUS;
-    String scenario = isClientContext_ ? ConsumptionUIMessages.MSG_CLIENT_SUB
-                                        : ConsumptionUIMessages.MSG_SERVICE_SUB;
-    
-	String                       runtimeLabel = WebServiceRuntimeExtensionUtils2.getRuntimeLabelById( ids_.getRuntimeId() );
-	String                       serverLabel  = ids_.getServerId() == null ? "" : WebServiceRuntimeExtensionUtils2.getServerLabelById(ids_.getServerId());
-    
-	
-    if( ids_.getRuntimeId() == null || runtimeLabel == null || runtimeLabel.equals("" ))
-    {
-      status = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_NO_RUNTIME, new String[]{ scenario } ) );
-    }
-    else if( ids_.getServerId() == null || serverLabel.equals( "" ))
-    {
-      status = StatusUtils.errorStatus( NLS.bind(ConsumptionUIMessages.MSG_NO_SERVER, new String[]{ scenario } ) );      
-    }
-    
-    //
-    
-	//--------- check if WSCT exists for these selections
-	if (!(ids_.getServerId() == null) && !(ids_.getRuntimeId() == null) && isClientContext_)
-	{
-
-		if (!WebServiceRuntimeExtensionUtils2.isServerClientRuntimeTypeSupported( ids_.getServerId(), ids_.getRuntimeId(), ids_.getTypeId())) 
-		{
-			status = StatusUtils.errorStatus( NLS.bind(ConsumptionUIMessages.MSG_INVALID_SRT_SELECTIONS, new String[]{ serverLabel, runtimeLabel } ) );		  
-		}
-
-	}    
-    
-    //--------- check if WSSRT exists for these selections
-    if (!(ids_.getServerId() == null) && !(ids_.getRuntimeId() == null) && !isClientContext_)
-    {
-
-	  if (!WebServiceRuntimeExtensionUtils2.isServerRuntimeTypeSupported(ids_.getServerId(), ids_.getRuntimeId(), ids_.getTypeId())) {	  
-        status = StatusUtils.errorStatus( NLS.bind(ConsumptionUIMessages.MSG_INVALID_SRT_SELECTIONS, new String[]{ serverLabel, runtimeLabel } ) );      
-      }
-
-    }
-
-    if (status.getSeverity() != Status.ERROR)
-    {
-      // Check if only stub runtime is available for the selected server type
-
-      String serverFactoryId = ids_.getServerId();
-      //
-      IServerType serverType = ServerCore.findServerType(serverFactoryId);
-      if (serverType != null)
-      {
-
-        // Find a Runtime which is not a stub
-        IRuntime nonStubRuntime = ServerUtils.getNonStubRuntime(serverFactoryId);
-        if (install_ && nonStubRuntime == null)
-        {
-          String servertypeLabel = WebServiceRuntimeExtensionUtils2.getServerLabelById(serverFactoryId);
-          status = StatusUtils.warningStatus(NLS
-              .bind(ConsumptionUIMessages.MSG_WARN_STUB_ONLY, new String[] { servertypeLabel }));
-        }
-      }
-    }
-            
-    return status;
-  }
-}
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 cac73e127..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestDelegateCommand.java
+++ /dev/null
@@ -1,347 +0,0 @@
-/*******************************************************************************
- * Copyright (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.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.context.ScenarioContext;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestExtension;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestRegistry;
-import org.eclipse.wst.command.internal.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.selection.BooleanSelection;
-import org.eclipse.wst.command.internal.env.core.selection.SelectionList;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.IStatusHandler;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceTester;
-import org.eclipse.wst.ws.internal.wsrt.TestInfo;
-
-
-/*
-* The JSPGeneration task runs the jsp generation engine found in the 
-* JBWizard Plugin
-*
-*
-*/
-public class ClientTestDelegateCommand extends AbstractDataModelOperation
-{
-  private WebServiceTestRegistry testRegistry;
-  private SelectionList testFacilities;
-  private String jspFolder;
-  private BooleanSelection[] methods;
-  private String sampleServerTypeID;
-  private IServer sampleExistingServer;
-  private String proxyBean;
-  private String sampleProject;
-  private String sampleP;
-  private String clientProject;
-  private String clientP;
-  private String clientC;
-  private boolean clientNeedEAR;
-  private String clientEarProjectName;
-  private String clientEarComponentName;
-  private TypeRuntimeServer serverIds;
-  private String serviceProject;
-  private String serviceP;
-  private String wsdlServiceURL;
-  private boolean isTestWidget = false;
-  private String setEndpointMethod;
-  private List endpoints;
-
-  public ClientTestDelegateCommand ()
-  {
-    testRegistry = WebServiceTestRegistry.getInstance();
-  }
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {    
-    IEnvironment env = getEnvironment();
-  	IStatus status = Status.OK_STATUS;
-  	String clientTestID = testFacilities.getSelection();
-  	
-	//Get the webservice extension
-	
-	WebServiceTestExtension wscte = (WebServiceTestExtension)testRegistry.getWebServiceExtensionsByName(clientTestID);
-    IWebServiceTester iwst = (IWebServiceTester)wscte.getWebServiceExecutableExtension();
-	TestInfo testInfo = getTestInfo();
-	
-	status = commandFactoryExecution(iwst.generate(testInfo),env, monitor );
-	if(status.getSeverity() == Status.ERROR){
-	  return status;	
-	}
-	status = commandFactoryExecution(iwst.launch(testInfo),env, monitor );
-	if(status.getSeverity() == Status.ERROR){
-	  return status;	
-	}
-	
-    return status;
-  }
-  
-  private IStatus commandFactoryExecution(ICommandFactory commandFactory,IEnvironment env, IProgressMonitor monitor )
-  {
-    IStatus status = Status.OK_STATUS;  	
-	
-	while(commandFactory.hasNext())
-  {
-    AbstractDataModelOperation operation = commandFactory.getNextCommand();
-    operation.setEnvironment( env );
-    
-    try
-    {
-      status = operation.execute( monitor, null );
-    }
-    catch( Exception exc )
-    {
-      status = StatusUtils.errorStatus( exc );  
-    }
-    
-	  if(status.getSeverity() == Status.ERROR){
-	    IStatusHandler sHandler = env.getStatusHandler();
-		sHandler.reportError(status);
-		return status;
-	  }
-    }
-    return status;
-  }
-  
-  
-  //Helper method which sets up the TestInfo data structure
-  private TestInfo getTestInfo()
-  {
-	IServer serviceExistingServer = null;
-	String serviceServerTypeID = null;
-		
-	//service server info
-	if(serverIds != null){
-	  if (serverIds.getServerInstanceId() != null) 
-	    serviceExistingServer = ServerCore.findServer(serverIds.getServerInstanceId());
-	}	
-	if (serviceExistingServer != null)
-      serviceServerTypeID = serviceExistingServer.getServerType().getId();
-    
-	
-	if(clientProject != null){
-  	  int index = clientProject.indexOf("/");
-      if (index!=-1){
-        clientP = clientProject.substring(0,index);
-        clientC = clientProject.substring(index + 1);
-      }
-  	}
-
-  
-	if(sampleProject != null){
-	  int index = sampleProject.indexOf("/");
-      if (index!=-1){
-        sampleP = sampleProject.substring(0,index);
-      }
-	}
-	
-	TestInfo testInfo = new TestInfo();  
-	testInfo.setClientExistingServer(sampleExistingServer);
-	testInfo.setClientServerTypeID(sampleServerTypeID);
-	testInfo.setJspFolder(jspFolder);
-	testInfo.setExternalBrowser(false);
-	testInfo.setEndpoint(endpoints);
-	testInfo.setGenerationProject(sampleP);
-	testInfo.setProxyBean(proxyBean);
-	testInfo.setSetEndpointMethod(setEndpointMethod);
-	testInfo.setClientProject(clientP);
-	testInfo.setClientModule(clientC);
-	testInfo.setClientNeedEAR(clientNeedEAR);
-	testInfo.setClientEARProject(clientEarProjectName);
-	testInfo.setClientEARModule(clientEarComponentName);
-	testInfo.setMethods(methods);
-	
-	//if this is a client scenario the service stuff is empty
-	if(serviceServerTypeID == null){
-	  serviceServerTypeID = sampleServerTypeID;
-	  serviceExistingServer = sampleExistingServer;
-	}
-	
-	
-	testInfo.setServiceServerTypeID(serviceServerTypeID);
-	testInfo.setServiceExistingServer(serviceExistingServer);
-	//wsdl stuff
-	testInfo.setServiceProject(getWSDLProject());
-	testInfo.setWsdlServiceURL(wsdlServiceURL);
-	return testInfo;
-  }
-   
-
-  
-  //The test facilities retrieved from the extension
-  //plus the default
-  public void setTestFacility(SelectionList selection)
-  {
-    testFacilities = selection;
-  } 
-  
-  public void setFolder(String folder)
-  {
-  }
-  
-  public void setJspFolder(String jspFolder)
-  {
-  	this.jspFolder = jspFolder;
-  }
-  
-  public void setMethods(BooleanSelection[] methods)
-  {
-    this.methods = methods;  
-  }
- 
-  public void setRunClientTest(boolean 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)
-  {
-  }
-  
-  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)
-  {
-  }
-  
-  public void setServiceTypeRuntimeServer(TypeRuntimeServer ids)
-  {
-    serverIds = ids;
-  }
-  
-  public String getSampleServerTypeID()
-  {
-  	return sampleServerTypeID;
-  }
-  
-  public IServer getSampleExistingServer()
-  {
-  	return sampleExistingServer;
-  }
-
-  public void setClientServer(String clientServer)
-  {
-  }
-  
-  public void setServerProject(String serviceProject)
-  {
-  	this.serviceProject = serviceProject;
-  }
-  
-  public String getWSDLProject()
-  {
-  	 if(serviceProject != null){
-	     int index = serviceProject.indexOf("/");
-       if (index!=-1) {
-		     serviceP = serviceProject.substring(0,index);
-	       return serviceP;
-       }
-  	}	
-	
-  	return clientP;
-  }
-  
-  public void setWsdlURI(String wsdlServiceURL)
-  {
-    this.wsdlServiceURL = wsdlServiceURL;
-  }
- 
-  public void setGenerateProxy(boolean generateProxy)
-  {
-  }
-  
-  public boolean getIsTestWidget()
-  {
-  	return isTestWidget;
-  }
-
-  public void setClientEarProjectName(String clientEarProjectName)
-  {
-     this.clientEarProjectName = clientEarProjectName;
-  }
-  
-  public void setClientEarComponentName(String clientEarComponentName)
-  {
-	this.clientEarComponentName = clientEarComponentName;
-  }
-  
-  
-  
-  /**
-   * @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;
-  }
-  
-  public boolean getClientNeedEAR() {
-		return clientNeedEAR;
-	}
-
-	public void setClientNeedEAR(boolean clientNeedEAR) {
-		this.clientNeedEAR = clientNeedEAR;
-	}
-}
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 f86bb2619..000000000
--- 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.internal.env.core.common.Condition;
-import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-
-
-public class 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 9021919ad..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestWidget.java
+++ /dev/null
@@ -1,415 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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.consumption.ui.ConsumptionUIMessages;
-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.internal.env.core.selection.BooleanSelection;
-import org.eclipse.wst.command.internal.env.core.selection.SelectionList;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-
-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_;
-
-  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 Composite            comboGroup_; 
-  private SelectionList        testFacilities_;
-  private FolderResourceFilter folderFilter_ = new FolderResourceFilter();
-  private IStructuredSelection initialSelection_;
-  private boolean isTestWidget = false;
-  
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener )
-  {
-    isTestWidget = true;
-    UIUtils      uiUtils  = new UIUtils( pluginId_ );
-        
-	parent.setToolTipText( ConsumptionUIMessages.TOOLTIP_PWSM_PAGE );
-	PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId_ + "." + INFOPOP_PWSM_PAGE );
-    
-    testCheckbox_ = uiUtils.createCheckbox( parent, ConsumptionUIMessages.BUTTON_TEST,
-    		ConsumptionUIMessages.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_, ConsumptionUIMessages.LABEL_TEST_TYPES,
-    									ConsumptionUIMessages.TOOLTIP_PWSM_COMBOBOX_TEST,
-                                          INFOPOP_PWSM_COMBOBOX_TEST,
-                                          SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-    new Label( comboGroup_, SWT.NONE );
-    
-    projectCombo_ = uiUtils.createCombo( comboGroup_, ConsumptionUIMessages.LABEL_JSP_PROJECT_NAME,
-    									ConsumptionUIMessages.TOOLTIP_PWSM_COMBO_PROJECT,
-                                          INFOPOP_PWSM_COMBO_PROJECT,
-                                          SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-    projectCombo_.setEnabled( false );
-    new Label( comboGroup_, SWT.NONE );
-    
-    
-    earCombo_ = uiUtils.createCombo( comboGroup_, ConsumptionUIMessages.LABEL_EAR_PROJECTS,
-    								ConsumptionUIMessages.TOOLTIP_PWSM_EAR_PROJECT,
-                                     INFOPOP_PWSM_EAR_COMBO,
-                                     SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-    earCombo_.setEnabled( false );
-    new Label( comboGroup_, SWT.NONE );
-    
-    
-    
-    sampleFolderText_ = uiUtils.createText( comboGroup_, ConsumptionUIMessages.LABEL_FOLDER_NAME,
-    										ConsumptionUIMessages.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_, ConsumptionUIMessages.BUTTON_BROWSE, 
-    											ConsumptionUIMessages.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_, ConsumptionUIMessages.LABEL_JSP_FOLDER_NAME,
-    		ConsumptionUIMessages.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, ConsumptionUIMessages.LABEL_METHODS,  
-    				ConsumptionUIMessages.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, ConsumptionUIMessages.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, ConsumptionUIMessages.BUTTON_SELECT_ALL, 
-    		  ConsumptionUIMessages.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, ConsumptionUIMessages.BUTTON_DESELECT_ALL, 
-    		  					ConsumptionUIMessages.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, ConsumptionUIMessages.BUTTON_RUN_TEST,
-    										ConsumptionUIMessages.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 String getJspFolder()
-  {
-    return jspFolderText_.getText();
-  }
-  
-  public void setLaunchedServiceTestName (String 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 bb5e85a61..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/CopyWebServiceUtilsJarCommand.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.ui.widgets.test;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.command.internal.env.core.common.ProgressUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.env.core.context.TransientResourceContext;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.IStatusHandler;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-public class CopyWebServiceUtilsJarCommand extends AbstractDataModelOperation 
-{
-  private String sampleProject;
-	
-/**
- * Default CTOR;
- */
-
-
-public CopyWebServiceUtilsJarCommand()
-{
-
-}
-
-/**
- * Execute the command
- */
-public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-{
-  IEnvironment env = getEnvironment();
-  
-  try
-  {
-    ProgressUtils.report( monitor, ConsumptionMessages.PROGRESS_INFO_COPY_WEBSERVICE_UTILS );
-    IProject sampleIProject = ProjectUtilities.getProject(sampleProject);    
-    IPath webModulePath = J2EEUtils.getWebContentPath(sampleIProject);	
-    if (webModulePath == null)
-      return StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_PROJECT_NOT_FOUND );
-      
-    IStatus status = copyIFile("webserviceutils.jar",webModulePath,"WEB-INF/lib/webserviceutils.jar", WebServiceConsumptionPlugin.getInstance(),env, monitor);
-    if(status.getSeverity() == Status.ERROR){
-      IStatusHandler sHandler = env.getStatusHandler();
-      IStatus errorStatus = StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_FILECOPY_WEBSERVICE_UTILS );
-      sHandler.reportError(errorStatus);	
-      return status;
-     }
-      
-      
-    }
-    catch (Exception e) {
-      IStatusHandler sHandler = env.getStatusHandler();
-      IStatus errorStatus = StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_FILECOPY_WEBSERVICE_UTILS );
-      sHandler.reportError(errorStatus);	
-      return StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_FILECOPY_WEBSERVICE_UTILS, e);
-    }
-  return Status.OK_STATUS;
-}
-
-/**
- *
- */
-private IStatus copyIFile(String source, IPath targetPath, String targetFile, Plugin plugin,IEnvironment env, IProgressMonitor monitor )
-{
-    
-  if (plugin != null)
-  {
-    IPath target = targetPath.append(new Path(targetFile));
-    
-    ProgressUtils.report( monitor, ConsumptionMessages.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 Status.OK_STATUS;
-       FileResourceUtils.createFile(context, 
-                      							target,
-                                    plugin.openStream(new Path(source)),
-                                    monitor,
-                                    env.getStatusHandler());
-    }
-    catch (Exception e) {
-      return StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_FILECOPY_WEBSERVICE_UTILS ,e);
-    }
-  }
-  return Status.OK_STATUS;
-}
-
-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 e6828443d..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/CreateSampleProjectCommand.java
+++ /dev/null
@@ -1,174 +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.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.command.common.AddModuleToServerCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.AssociateModuleWithEARCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateModuleCommand;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-
-public class CreateSampleProjectCommand extends AbstractDataModelOperation
-{
-  private String sampleProject;
-  private String sampleProjectEar;
-  private IServer existingServer;
-  private String serverFactoryId;
-  private boolean needEAR;
-  private String j2eeVersion;
-  
-  
-  public CreateSampleProjectCommand()
-  {
-  }
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    IEnvironment env = getEnvironment();
-    IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-    if (!root.getProject(sampleProject).exists() || !root.getProject(sampleProjectEar).exists())
-    {
-      //Do the following
-      //1. Create the Web project/component to house the sample JSPs.
-      //2. If needEAR is true then
-      //   - create a EAR project and component if it doesn't exist
-      //   - add the Web component to the EAR component
-      //3. Add the right component to the server.
-      CreateModuleCommand command = new CreateModuleCommand();
-	  command.setProjectName(sampleProject);
-	  command.setModuleName(sampleProject);			
-	  command.setModuleType(CreateModuleCommand.WEB);
-	  command.setServerFactoryId(serverFactoryId);
-	  command.setServerInstanceId(existingServer.getId());
-	  command.setJ2eeLevel(j2eeVersion);
-    command.setEnvironment( env );
-	  IStatus status = command.execute( monitor, null ) ;
-	  if (status.getSeverity()==Status.ERROR)
-	  {
-		  env.getStatusHandler().reportError(status);
-		  return status;
-	  }
-		  
-	  if (needEAR)
-	  {
-			CreateModuleCommand commandEAR = new CreateModuleCommand();
-			commandEAR.setProjectName(sampleProjectEar);
-			//TODO The EAR component name is not necessarily the same as the project name
-			//so the component name needs to somehow be piped into this command
-			commandEAR.setModuleName(sampleProjectEar);
-			commandEAR.setModuleType(CreateModuleCommand.EAR);
-			commandEAR.setServerFactoryId(serverFactoryId);
-			commandEAR.setServerInstanceId(existingServer.getId());
-			commandEAR.setJ2eeLevel(j2eeVersion);
-      commandEAR.setEnvironment( env );
-			status = commandEAR.execute( monitor, null );
-			if (status.getSeverity()==Status.ERROR)
-			{
-			  env.getStatusHandler().reportError(status);
-			  return status;
-			}			
-				
-				
-			//Associate the service module and service EAR
-			AssociateModuleWithEARCommand associateCommand = new AssociateModuleWithEARCommand();
-			associateCommand.setProject(sampleProject);
-			associateCommand.setModule(sampleProject);
-			associateCommand.setEARProject(sampleProjectEar);
-			//TODO The EAR component name is not necessarily the same as the project name
-			//so the component name needs to somehow be piped into this command
-			associateCommand.setEar(sampleProjectEar);
-      associateCommand.setEnvironment( env );
-			status = associateCommand.execute( monitor, null );
-			if (status.getSeverity()==Status.ERROR)
-			{
-				env.getStatusHandler().reportError(status);
-				return status;
-			}			
-				
-			//Add the EAR to the server
-			AddModuleToServerCommand commandInstall = new AddModuleToServerCommand();
-			commandInstall.setServerInstanceId(existingServer.getId());
-			commandInstall.setProject(sampleProjectEar);
-			//TODO The EAR component name is not necessarily the same as the project name
-			//so the component name needs to somehow be piped into this command
-			commandInstall.setModule(sampleProjectEar);
-			commandInstall.setEnvironment( env );	
-			status = commandInstall.execute( monitor, null ) ;
-			if (status.getSeverity()==Status.ERROR)
-			{
-				env.getStatusHandler().reportError(status);
-				return status;
-			}							
-		}
-	    else
-		{
-		    //Add the Web component to the server
-			AddModuleToServerCommand commandInstall = new AddModuleToServerCommand();
-			commandInstall.setServerInstanceId(existingServer.getId());
-			commandInstall.setProject(sampleProject);
-			commandInstall.setModule(sampleProject);
-      commandInstall.setEnvironment( env );
-			
-			status = commandInstall.execute( monitor, null ) ;
-			if (status.getSeverity()==Status.ERROR)
-			{
-				env.getStatusHandler().reportError(status);
-				return status;
-			}			  
-		}
-		  
-    }
-    return Status.OK_STATUS;
-  }
-
-  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 9c6df0cba..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishDefaultCommand.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.ui.widgets.test;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-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 AbstractDataModelOperation
-{
-  private String sampleServerTypeID;
-  private IServer sampleExistingServer;
-  private String sampleServerInstanceId;
-
-  
-  public FinishDefaultCommand ()
-  {
-  }
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-  	IStatus status = Status.OK_STATUS;
-  	if(sampleServerInstanceId != null){
-  	  sampleExistingServer = ServerCore.findServer(sampleServerInstanceId);
-  	if (sampleExistingServer != null)
-      sampleServerTypeID = sampleExistingServer.getServerType().getId();
-      
-  	}
-    return status;
-  
-  }
-  
-  public void setServerInstanceId(String serverInstanceId)
-  {
-	this.sampleServerInstanceId = serverInstanceId;
-  }
-  
-  public String getSampleServerTypeID()
-  {
-  	return sampleServerTypeID;
-	
-  }
-  
-  public IServer getSampleExistingServer()
-  {
-  	return sampleExistingServer;
-  }
-
-  public void setExistingServerId(String 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 f90c1b5ac..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishJavaTestFragment.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
- *******************************************************************************/
-/*
- * 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.internal.env.core.common.Condition;
-import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-
-
-/**
- * @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 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 aeb174ab7..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishTestFragment.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
- *******************************************************************************/
-/*
- * 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.internal.env.core.common.Condition;
-import org.eclipse.wst.command.internal.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 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.testWSDL())	
-	  return true;
-	return false;
-  }
-
-  public boolean isClientTestJava()
-  {
-  	if(testID == null) return false;
-  	WebServiceTestRegistry wsttRegistry = WebServiceTestRegistry.getInstance();
-	WebServiceTestExtension wscte = (WebServiceTestExtension)wsttRegistry.getWebServiceExtensionsByName(testID);  	
-	if(!wscte.testWSDL())	
-      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 6c61ebaaa..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestClientDepartureInitCommand.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
- *******************************************************************************/
-/*
- * 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.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
- * @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 AbstractDataModelOperation 
-{
-  
-  private boolean forceBuild;	
-	
-  public TestClientDepartureInitCommand()
-  {
-  	forceBuild = true;
-  }
-
-  public boolean getForceBuild()
-  {
-  	return forceBuild;
-  }
-
-  public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
-  {
-    return Status.OK_STATUS;
-  }
-  
-}
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 a59529450..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestDefaultingFragment.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.context.ScenarioContext;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.internal.env.core.selection.SelectionList;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-/**
- * @author gilberta
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class TestDefaultingFragment extends AbstractDataModelOperation
-{
-  
-  private SelectionList testFacilities;
-  private String launchedServiceTestName;
-  private ScenarioContext scenarioContext;	
-  private boolean generateProxy;
-  
-  
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-  	IStatus status = Status.OK_STATUS;
-  	
-  	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];
-	String[] wsdlCases = scenarioContext.getNonJavaTestService();
-	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;
-    
-	
-	if(!generateProxy)
-      testFacilities = new SelectionList(wsdlCases,0);	
-	else
-	  testFacilities = new SelectionList(newTestTypes,0);	
-  }
-
-  public void setLaunchedServiceTestName(String launchedServiceTestName)
-  {
-  	this.launchedServiceTestName = launchedServiceTestName;
-  }
-  
-  public void setGenerateProxy(boolean generateProxy)
-  {
-  	this.generateProxy = generateProxy;
-  }
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestWebServiceClient.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestWebServiceClient.java
deleted file mode 100644
index a4efaabcb..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestWebServiceClient.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
-
-import org.eclipse.wst.command.internal.env.core.ICommandFactory;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.ws.internal.wsrt.AbstractWebServiceClient;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-import org.eclipse.wst.ws.internal.wsrt.ISelection;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceClientInfo;
-
-public class TestWebServiceClient extends AbstractWebServiceClient {
-  
-  public TestWebServiceClient(WebServiceClientInfo clientInfo){
-	super(clientInfo);  
-  }
-  
-  public ICommandFactory assemble(IEnvironment env, IContext ctx, ISelection sel,
-      String project, String earProject){
-    return null;	  
-  }
-			
-  public ICommandFactory deploy(IEnvironment env, IContext ctx, ISelection sel,
-      String project, String earProject){
-    return null;	  
-  }
-			
-
-  public ICommandFactory develop(IEnvironment env, IContext ctx, ISelection sel,
-		      String project, String earProject){
-    return null;	  
-  }
-				
-  public ICommandFactory install(IEnvironment env, IContext ctx, ISelection sel,
-		      String project, String earProject){
-    return null;
-  }
-			
-
-  public ICommandFactory run(IEnvironment env, IContext ctx, ISelection sel,
-		      String project, String earProject){
-    return null;	  
-  }
-  
-}
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 07f436804..000000000
--- 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.internal.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 89d839b0d..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WSDLTestLaunchCommand.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestExtension;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestRegistry;
-import org.eclipse.wst.command.internal.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.IStatusHandler;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceTester;
-import org.eclipse.wst.ws.internal.wsrt.TestInfo;
-
-/**
- * @author gilberta
- *
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class WSDLTestLaunchCommand extends AbstractDataModelOperation
-{
-  private String testID; 
-  private String launchedServiceTestName;
-  private TypeRuntimeServer serviceids;
-  private String serverProject;
-  private String serverModule;
-  private String wsdlURI;
-  private boolean externalBrowser;
-  private List endpoints;
-  private IServer serviceExistingServer = null;
-  private String serviceServerTypeID = null;
-  private String serviceServerInstanceId = null;
-	
-  public WSDLTestLaunchCommand()
-  {
-  }
-  
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {    
-    IEnvironment env = getEnvironment();
-  	IStatus status = Status.OK_STATUS;
-  	
-  	WebServiceTestRegistry testRegistry = WebServiceTestRegistry.getInstance();
-  	WebServiceTestExtension wscte = (WebServiceTestExtension)testRegistry.getWebServiceExtensionsByName(testID);
-	IWebServiceTester iwst = (IWebServiceTester)wscte.getWebServiceExecutableExtension();
-	TestInfo testInfo = getTestInfo();
-	
-	
-	status = commandFactoryExecution(iwst.launch(testInfo),env, monitor);
-	
-    //Dont need to shut everything down because the wsdl test doesnt work
-    if(status.getSeverity() != Status.OK){
-      IStatusHandler sHandler = env.getStatusHandler();
-      IStatus infoStatus = StatusUtils.infoStatus( ConsumptionUIMessages.MSG_ERROR_UNABLE_TO_LAUNCH_WSDL_TEST );
-      sHandler.reportInfo(infoStatus);
-      return infoStatus;	
-    }
-   return status;
-  	
-  }
-
-  private IStatus commandFactoryExecution(ICommandFactory commandFactory,IEnvironment env, IProgressMonitor monitor)
-  {
-	IStatus status = Status.OK_STATUS;  	
-	while(commandFactory.hasNext())
-  { 
-	  AbstractDataModelOperation operation = commandFactory.getNextCommand();
-    
-	  if (operation != null)
-    {
-      try
-      {
-        operation.setEnvironment( env );
-	      status = operation.execute( monitor, null );
-      }
-      catch( Exception exc )
-      {
-        status = StatusUtils.errorStatus( exc );
-      }
-    }
-    
-	  if(status.getSeverity() == Status.ERROR){
-	    IStatusHandler sHandler = env.getStatusHandler();
-		sHandler.reportError(status);
-		return status;
-	  }
-    }
-    return status;
-  }
-  
-  
-  private TestInfo getTestInfo()
-  {
-    //	get the server stuff
-    if (serviceids.getServerInstanceId() != null) 
-	  serviceExistingServer = ServerCore.findServer(serviceids.getServerInstanceId());
-    else if (serviceServerInstanceId!=null)
-		serviceExistingServer = ServerCore.findServer(serviceServerInstanceId);
-	
-	if (serviceExistingServer != null)
-	  serviceServerTypeID = serviceExistingServer.getServerType().getId();
-	else
-	  serviceServerTypeID = serviceids.getServerId();
-	// server will be created in ServerDeployableConfigurationCommand
-  
-    TestInfo testInfo = new TestInfo();
-	if (serviceExistingServer!=null)
-		testInfo.setServiceExistingServer(serviceExistingServer);
-    testInfo.setServiceServerTypeID(serviceServerTypeID);
-	testInfo.setServiceProject(serverProject);
-	testInfo.setWsdlServiceURL(wsdlURI);
-	testInfo.setExternalBrowser(externalBrowser);
-	testInfo.setEndpoint(endpoints);
-	return testInfo;
-	
-  }
-  
-  
-  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;
-  }
-
-public String getServerModule() {
-	return serverModule;
-}
-
-public void setServerModule(String serverModule) {
-	this.serverModule = serverModule;
-}
-
-public void setServiceServerInstanceId(String ssInstanceId){
-	this.serviceServerInstanceId = ssInstanceId;
-}
-
-}
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 920259315..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WebServiceClientTestArrivalCommand.java
+++ /dev/null
@@ -1,234 +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.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.consumption.command.common.JavaMofReflectionCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.selection.BooleanSelection;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.IStatusHandler;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-/**
-* This task sets up all the defaults for the webservice test
-* client page
-*
-*/
-public class WebServiceClientTestArrivalCommand extends AbstractDataModelOperation
-{
-  public static final String DEFAULT_WEB_MODULE_ROOT = "WebContent";
-  public static final String DEFAULT_SAMPLE_WEB_PROJECT_EXT = "Sample";
-
-  public static String SAMPLE_DIR = "sample";
-  
-  private String clientProject;
-  private String clientProjectEAR;
-  private String clientP;
-  private String clientC;
-  private IProject clientIProject;
-  private String folder;
-  private String jspFolder;
-  private BooleanSelection[] methods;
-  private String proxyBean;
-  private String sampleProject;
-  private String sampleP;
-  private String sampleC;
-  private String sampleProjectEAR;
-
-  
-  
-  /**
-  * Constructs a new WebServiceClientTestArrivalTask object with the given label and description.
-  */
-  public WebServiceClientTestArrivalCommand ()
-  {
-
-  }
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    IEnvironment env = getEnvironment();
-  	
-	IStatus status = Status.OK_STATUS;
-  	
-	sampleProjectAndEarSetup(env);
-  	
-    //Get the sample Folder ready
-    StringBuffer sb = new StringBuffer();
-	
-	sb.append("/").append(sampleC).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){
-      IStatusHandler sHandler = env.getStatusHandler();
-      IStatus errorStatus = StatusUtils.errorStatus( ConsumptionUIMessages.MSG_ERROR_JTS_PROXY_NOT_COMPILED );
-      sHandler.reportError(errorStatus);
-      return errorStatus;
-      
-    } 	
-    
-    
-    JavaMofReflectionCommand javamofcommand = new JavaMofReflectionCommand(); 
-    javamofcommand.setProxyBean(proxyBean);
-    javamofcommand.setClientProject(clientP);
-    javamofcommand.setEnvironment( env );
-    
-    
-    
-    try{ 
-      IStatus mofStatus = javamofcommand.execute( monitor, null);
-      if(mofStatus.getSeverity() == Status.ERROR)
-      	return mofStatus;
-    }catch(Exception exc){
-    	IStatusHandler sHandler = env.getStatusHandler();
-        IStatus errorStatus = StatusUtils.errorStatus( ConsumptionUIMessages.MSG_ERROR_JTS_PROXY_NOT_COMPILED );
-        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;
-      
-      tempMethods[j] = new BooleanSelection( method.getMethodElementSignature(), true);      
-      j++;
-    } 
-    methods = tempMethods;
-    return status;
-  }
-  public static final String DEFAULT_SAMPLE_EAR_PROJECT_EXT = "EAR";
-  
-  private void sampleProjectAndEarSetup(IEnvironment env)
-  {
-	if(clientProject == null) return;
-  	else{
-	  int index = clientProject.indexOf("/");
-	  clientP = clientProject.substring(0,index);
-	  clientC = clientProject.substring(index + 1);
-  	}
-	  
-	clientIProject = (IProject)ProjectUtilities.getProject(clientP);
-  	
-  	if(J2EEUtils.isWebComponent(clientIProject)){
-      sampleProject = clientProject;
-	  sampleP = clientP;
-	  sampleC = clientC;
- 	}  	
-  	else{ 
-  	  sampleP = clientP + DEFAULT_SAMPLE_WEB_PROJECT_EXT;
-	  sampleC = clientC + DEFAULT_SAMPLE_WEB_PROJECT_EXT;
-	  sampleProject = sampleP + "/" + sampleC;
-	  
-	  
-	}  
-	sampleProjectEAR = clientProjectEAR;
-	if (sampleProjectEAR == null || sampleProjectEAR.length()==0){
-	  sampleProjectEAR = sampleP + DEFAULT_SAMPLE_EAR_PROJECT_EXT + "/" + sampleC + DEFAULT_SAMPLE_EAR_PROJECT_EXT;	
-	}
-	
-  }
-    
-  //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 String getFolder()
-  {
-  	return folder;
-  }
-  
-  public String getJspFolder()
-  {
-  	return jspFolder;
-  }
-  
-  public BooleanSelection[] getMethods()
-  {
-    return methods;  
-  }
-    
-  public String getSampleProject()
-  {
-  	return sampleProject;
-  }
-       
-  public void setClientProject(String clientProject)
-  {
-    this.clientProject = clientProject;
-  }
-  
-    
-  public void setClientProjectEAR(String clientProjectEAR)
-  {
-    this.clientProjectEAR = clientProjectEAR;
-  }
-  
-  
-  public void setProxyBean(String proxyBean)
-  {
-  	this.proxyBean = proxyBean;
-  }
-  
-  public String getSampleProjectEAR()
-  {
-    return sampleProjectEAR;
-  }
-  
-
-}
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 00bdfd0b4..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WebServiceTestClientDepartureFragment.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
- *******************************************************************************/
-/*
- * 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.jst.ws.internal.consumption.ui.widgets.test.wssample.AddModuleDependenciesCommand;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-
-
-/**
- * @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 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);
-  	    
-  }
-
-}
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 ebbf6a453..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/ExplorerServiceTestCommand.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.ui.widgets.test.explorer;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.ext.test.WSDLTestFinishCommand;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.ws.internal.explorer.LaunchOption;
-import org.eclipse.wst.ws.internal.explorer.LaunchOptions;
-import org.eclipse.wst.ws.internal.explorer.WSExplorerLauncherCommand;
-import org.eclipse.wst.ws.internal.explorer.plugin.ExplorerPlugin;
-
-public class ExplorerServiceTestCommand extends AbstractDataModelOperation implements WSDLTestFinishCommand
-{
-
-  private boolean externalBrowser = true;
-  private String wsdlServiceURL;
-  private List endpoints;
-  
-  /**
-  * Constructs a new WebServiceExplorerLaunch object with the given label and description.
-  */
-  public ExplorerServiceTestCommand ()
-  {
-  }
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    IEnvironment env = getEnvironment();
-    
-  	IStatus status = Status.OK_STATUS;
-    
-    WSExplorerLauncherCommand launchCommand = new WSExplorerLauncherCommand();
-    launchCommand.setForceLaunchOutsideIDE(externalBrowser);
-    Vector launchOptionVector = new Vector();
-	String stateLocation = ExplorerPlugin.getInstance().getPluginStateLocation();
-	String defaultFavoritesLocation = ExplorerPlugin.getInstance().getDefaultFavoritesLocation();
-	launchOptionVector.add(new LaunchOption(LaunchOptions.STATE_LOCATION,stateLocation));
-	launchOptionVector.add(new LaunchOption(LaunchOptions.DEFAULT_FAVORITES_LOCATION,defaultFavoritesLocation));
-    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]));
-    launchCommand.setEnvironment( env );
-    status = launchCommand.execute( monitor, null );
-    return status;
-  }
-
-  public void setExternalBrowser(boolean externalBrowser)
-  {
-  	this.externalBrowser = externalBrowser;
-  }
-  
-  public void setWsdlServiceURL(String wsdlServiceURL)
-  {
-  	this.wsdlServiceURL = wsdlServiceURL;
-  }
-  
-  public void setServerTypeID(String serviceServerTypeID)
-  {
-    //TODO: Type mappings to this property should be removed.
-  }
-  
-  public void setExistingServer(IServer serviceExistingServer)
-  {
-    //TODO: Type mappings to this property should be removed.
-  }
-  
-  public void setServiceProject(String serviceProject)
-  {
-    //TODO: Type mappings to this property should be removed.
-  }
-  
-  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/WSEGenerateCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WSEGenerateCommand.java
deleted file mode 100644
index 8ad6eeb12..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WSEGenerateCommand.java
+++ /dev/null
@@ -1,60 +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.widgets.test.explorer;
-
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.explorer.LaunchOption;
-import org.eclipse.wst.ws.internal.explorer.LaunchOptions;
-import org.eclipse.wst.ws.internal.explorer.WSExplorerLauncherCommand;
-import org.eclipse.wst.ws.internal.explorer.plugin.ExplorerPlugin;
-import org.eclipse.wst.ws.internal.wsrt.TestInfo;
-
-public class WSEGenerateCommand extends AbstractDataModelOperation 
-{
-
-  private TestInfo testInfo;
-	  
-  public WSEGenerateCommand(TestInfo testInfo){
-    this.testInfo = testInfo;
-  }
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    IEnvironment env = getEnvironment();
-    
-  	IStatus status = Status.OK_STATUS;
-    
-    WSExplorerLauncherCommand launchCommand = new WSExplorerLauncherCommand();
-    launchCommand.setForceLaunchOutsideIDE(testInfo.getExternalBrowser());
-    Vector launchOptionVector = new Vector();
-	String stateLocation = ExplorerPlugin.getInstance().getPluginStateLocation();
-	String defaultFavoritesLocation = ExplorerPlugin.getInstance().getDefaultFavoritesLocation();
-	launchOptionVector.add(new LaunchOption(LaunchOptions.STATE_LOCATION,stateLocation));
-	launchOptionVector.add(new LaunchOption(LaunchOptions.DEFAULT_FAVORITES_LOCATION,defaultFavoritesLocation));
-    launchOptionVector.add(new LaunchOption(LaunchOptions.WSDL_URL,testInfo.getWsdlServiceURL()));
-    if (testInfo.getEndpoint() != null)
-      for (Iterator it = testInfo.getEndpoint().iterator(); it.hasNext();)
-        launchOptionVector.add(new LaunchOption(LaunchOptions.WEB_SERVICE_ENDPOINT, it.next().toString()));
-    launchCommand.setLaunchOptions((LaunchOption[])launchOptionVector.toArray(new LaunchOption[0]));
-    launchCommand.setEnvironment( env );
-    status = launchCommand.execute( monitor, null );
-    return status;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WSEWebServiceTester.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WSEWebServiceTester.java
deleted file mode 100644
index cfa116d05..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WSEWebServiceTester.java
+++ /dev/null
@@ -1,34 +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.widgets.test.explorer;
-
-import java.util.Vector;
-
-import org.eclipse.wst.command.internal.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.env.core.SimpleCommandFactory;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceTester;
-import org.eclipse.wst.ws.internal.wsrt.TestInfo;
-
-public class WSEWebServiceTester implements IWebServiceTester  {
-
-  public ICommandFactory generate(TestInfo testInfo){
-    Vector commands = new Vector();
-	return new SimpleCommandFactory(commands);
-  }
-	  
-  public ICommandFactory launch(TestInfo testInfo){
-    Vector commands = new Vector();
-	commands.add(new WSEGenerateCommand(testInfo));
-	return new SimpleCommandFactory(commands);	
-  }
-
-}
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 ecb320e5a..000000000
--- 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.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
-* 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 AbstractDataModelOperation 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/AddModuleDependenciesCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/AddModuleDependenciesCommand.java
deleted file mode 100644
index 432a5b1d4..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/AddModuleDependenciesCommand.java
+++ /dev/null
@@ -1,208 +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.wssample;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.project.facet.IJavaProjectMigrationDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.JavaProjectMigrationDataModelProvider;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.consumption.command.common.AddModuleToServerCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.AssociateModuleWithEARCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateModuleCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.StartServerCommand;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.operation.CreateReferenceComponentsDataModelProvider;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.ws.internal.wsrt.TestInfo;
-
-public class AddModuleDependenciesCommand extends AbstractDataModelOperation
-{
-  
-  private TestInfo testInfo;	
-	
-  private IProject sampleIProject;
-  private IProject clientIProject;
-  private IProject sampleEARIProject;
-  private String sampleEARProject;
-  private String sampleEARModule;
-  
-  public AddModuleDependenciesCommand(TestInfo testInfo)
-  {
-    this.testInfo = testInfo;
-  }
-
-  /**
-   * Execute WebServerDefaultingTask Set the default server name and id given a
-   * deployable.
-   */
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    IEnvironment env = getEnvironment();
-      createSampleProjects(env, monitor );
-	  clientIProject = ProjectUtilities.getProject(testInfo.getClientProject());
-	        
-      if (clientIProject != null && !J2EEUtils.isWebComponent(clientIProject))
-      {
-        if (J2EEUtils.isJavaComponent(clientIProject)){
-          addJavaProjectAsUtilityJar(clientIProject, sampleEARIProject,monitor);
-          addJavaProjectAsUtilityJar(clientIProject, sampleIProject,monitor);
-		}
-	  }
-    
-    return Status.OK_STATUS;
-  }
-
-  private void addJavaProjectAsUtilityJar(IProject javaProject, IProject earProject,IProgressMonitor monitor)
-  {
-	  try {
-		  IDataModel migrationdm = DataModelFactory.createDataModel(new JavaProjectMigrationDataModelProvider());
-		  migrationdm.setProperty(IJavaProjectMigrationDataModelProperties.PROJECT_NAME, javaProject.getName());
-		  migrationdm.getDefaultOperation().execute(monitor, null);
- 
- 
-		  IDataModel refdm = DataModelFactory.createDataModel(new CreateReferenceComponentsDataModelProvider());
-		  List targetCompList = (List) refdm.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
- 
-		  IVirtualComponent targetcomponent = ComponentCore.createComponent(javaProject);
-		  IVirtualComponent sourcecomponent = ComponentUtilities.getComponent(earProject.getName());
-		  targetCompList.add(targetcomponent);
- 
-		  refdm.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT,sourcecomponent );
-		  refdm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, targetCompList);
-		  refdm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_DEPLOY_PATH,  "/WEB-INF/lib");
-		  refdm.getDefaultOperation().execute(monitor, null);
-	  }catch (Exception e) {
-		  
-	  }
-  }
-
- 
-
-  public static final String DEFAULT_SAMPLE_EAR_PROJECT_EXT = "EAR";
-  
-  private void createSampleProjects(IEnvironment env, IProgressMonitor monitor )
-  {
-	  sampleIProject = ProjectUtilities.getProject(testInfo.getGenerationProject());
-	  clientIProject = ProjectUtilities.getProject(testInfo.getClientProject());
-	  
-	if (testInfo.getClientNeedEAR()) {
-	  if(testInfo.getClientEARProject() == null || testInfo.getClientEARProject().length() == 0){
-		  sampleEARProject = testInfo.getGenerationProject() + DEFAULT_SAMPLE_EAR_PROJECT_EXT;	
-	  }
-	  else{ 
-	      sampleEARProject = testInfo.getClientEARProject();
-	  }
-	  
-	  sampleEARIProject  = ProjectUtilities.getProject(sampleEARProject);
-	  if(sampleEARIProject == null || !sampleEARIProject.isOpen()){
-		  
-	    CreateModuleCommand createEAR = new CreateModuleCommand();
-	    createEAR.setProjectName(sampleEARProject);
-	    createEAR.setModuleName(sampleEARModule);
-	    createEAR.setServerInstanceId(testInfo.getClientExistingServer().getId());
-	    createEAR.setServerFactoryId(testInfo.getClientServerTypeID());
-	    createEAR.setModuleType(CreateModuleCommand.EAR);
-	    createEAR.setJ2eeLevel(J2EEUtils.getJ2EEVersionAsString(clientIProject));
-		createEAR.setEnvironment( env );
-		  IStatus status = createEAR.execute( monitor, null );
-	    if (status.getSeverity()==Status.ERROR)
-        {
-          env.getStatusHandler().reportError(status);     
-        }
-	  
-		AddModuleToServerCommand modToServer = new AddModuleToServerCommand();
-		modToServer.setModule(sampleEARModule);
-		modToServer.setProject(sampleEARProject);
-		modToServer.setServerInstanceId(testInfo.getClientExistingServer().getId());
-		modToServer.setEnvironment( env );
-		status = modToServer.execute( monitor, null );
-		if (status.getSeverity()==Status.ERROR)
-	    {
-	      env.getStatusHandler().reportError(status);     
-	    }     
-	  
-	  }
-	}
-	
-	  if (!sampleIProject.isOpen())
-      {
-        CreateModuleCommand createSample = new CreateModuleCommand();
-        createSample.setProjectName(testInfo.getGenerationProject());
-		createSample.setModuleType(CreateModuleCommand.WEB);
-		createSample.setServerInstanceId(testInfo.getClientExistingServer().getId());
-        createSample.setServerFactoryId(testInfo.getClientServerTypeID());
-        createSample.setJ2eeLevel(J2EEUtils.getJ2EEVersionAsString(clientIProject));
-        createSample.setEnvironment( env );
-		IStatus status = createSample.execute( monitor, null );
-      
-	   if (testInfo.getClientNeedEAR()) {
-//		Associate the client module and service EAR
-	    AssociateModuleWithEARCommand associateCommand = new AssociateModuleWithEARCommand();
-	    associateCommand.setProject(testInfo.getGenerationProject());
-	    associateCommand.setEARProject(sampleEARProject);
-	    associateCommand.setEar(sampleEARModule);
-		associateCommand.setEnvironment( env );
-	    status = associateCommand.execute( monitor, null );
-	    if (status.getSeverity()==Status.ERROR)
-	    {
-	      env.getStatusHandler().reportError(status);     
-	    }  
-	   }
-       else
-       {
-         // If no EAR is needed, the sample project needs to be added to
-         // to the server directly.
-        AddModuleToServerCommand addToServer = new AddModuleToServerCommand();
-        addToServer.setModule(testInfo.getGenerationProject());
-        addToServer.setProject(testInfo.getGenerationProject());
-        addToServer.setServerInstanceId(testInfo.getClientExistingServer().getId());
-        addToServer.setEnvironment( env );
-        status = addToServer.execute( monitor, null );
-        if (status.getSeverity()==Status.ERROR)
-        {
-          env.getStatusHandler().reportError(status);     
-        }              
-       }
-		
-		StartServerCommand startServer = new StartServerCommand(true);
-		startServer.setServerInstanceId(testInfo.getClientExistingServer().getId());
-		startServer.setEnvironment( env );
-		status = startServer.execute( monitor, null );
-	    if (status.getSeverity()==Status.ERROR)
-	    {
-	      env.getStatusHandler().reportError(status);     
-	    }     
-		
-	  }
-	  
-  }
-
-   
-
-  
-
- 
-
- 
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCGenerateCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCGenerateCommand.java
deleted file mode 100644
index e7d91d9aa..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCGenerateCommand.java
+++ /dev/null
@@ -1,172 +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.widgets.test.wssample;
-
-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.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-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.wst.command.internal.env.ui.eclipse.EnvironmentUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.wsrt.TestInfo;
-
-public class GSTCGenerateCommand extends AbstractDataModelOperation 
-{
-
-  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 TestInfo testInfo;
-  private Model proxyModel;
-  private String jspfolder;
-  
-  public GSTCGenerateCommand(TestInfo testInfo){
-  	this.testInfo = testInfo;
-  }
-	
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    IEnvironment env = getEnvironment();
-    IStatus status = Status.OK_STATUS;
-	CopyWebServiceUtilsJarCommand copy = new CopyWebServiceUtilsJarCommand();    
-	copy.setSampleProject(testInfo.getGenerationProject());
-    copy.setEnvironment( env );
-	status = copy.execute( monitor, null);
-	if (status.getSeverity() == Status.ERROR) return status;
-	setJSPFolder();
-	status = createModel(env, monitor);
-	if (status.getSeverity() == Status.ERROR) return status;
-	status = generatePages(env);
-	if (status.getSeverity() == Status.ERROR) return status;
-	return status;   
-  }
-
-  private void setJSPFolder(){
-    //if the client is not a webcomponent then the 
-	//sample must have been created, we must now factor in 
-	//flexible projects  
-	  
-	IProject clientIProject = ProjectUtilities.getProject(testInfo.getClientProject());
-    if (clientIProject != null && !J2EEUtils.isWebComponent(clientIProject)){   
-	  IProject project = ProjectUtilities.getProject(testInfo.getGenerationProject());
-	  IPath path = J2EEUtils.getWebContentPath(project);
-	  int index = testInfo.getJspFolder().lastIndexOf("/");
-	  String jsp = testInfo.getJspFolder().substring(index + 1);
-	  StringBuffer sb = new StringBuffer();	
-	  sb.append("/").append(path.toString()).append("/").append(jsp);	  
-	  jspfolder = sb.toString();
-	} 
-    else
-	  jspfolder = testInfo.getJspFolder();	
-  
-  
-  }
-  
-  //create the model from the resource
-  private IStatus createModel(IEnvironment env, IProgressMonitor monitor ) {
-    JavaToModelCommand jtmc = new JavaToModelCommand();
-	jtmc.setMethods(testInfo.getMethods());
-	jtmc.setClientProject(testInfo.getClientProject());
-	jtmc.setProxyBean(testInfo.getProxyBean());
-	jtmc.setEnvironment( env );
-	IStatus status = jtmc.execute( monitor, null);
-	if (status.getSeverity() == Status.ERROR) return status;
-    proxyModel = jtmc.getJavaDataModel();
-	return status;
-  } 
-  
-   /**
-   * Generate the four jsps that make up this
-   * sample app.
-   */
-   private IStatus generatePages(IEnvironment env)
-   {
-   	IStatus status = Status.OK_STATUS;
-	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());
-     gpcTest.setEnvironment( env );
-     status = gpcTest.execute( null, null );
-     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());
-     gpcInput.setEnvironment( env );
-     status = gpcInput.execute( null, null );
-     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());
-     gpcMethod.setEnvironment( env );
-     status = gpcMethod.execute( null, null );
-     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(testInfo.getSetEndpointMethod());
-     GeneratePageCommand gpcResult = new GeneratePageCommand(EnvironmentUtils.getResourceContext(env), proxyModel,
-       rfg,fileResult);
-     gpcResult.setEnvironment( env );
-     status = gpcResult.execute( null, null );
-     
-     return status;
-   }
-
-   
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCLaunchCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCLaunchCommand.java
deleted file mode 100644
index 264ed9391..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCLaunchCommand.java
+++ /dev/null
@@ -1,200 +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.widgets.test.wssample;
-
-import java.io.IOException;
-import java.io.InputStream;
-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.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.command.PublishProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.StartServerCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.browser.IWebBrowser;
-import org.eclipse.ui.browser.IWorkbenchBrowserSupport;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.ILog;
-import org.eclipse.wst.common.environment.StatusException;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.wsrt.TestInfo;
-
-public class GSTCLaunchCommand extends AbstractDataModelOperation
-{
-
-  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 TestInfo testInfo;
-  private String jspfolder;
-  
-  public GSTCLaunchCommand(TestInfo testInfo){
-    this.testInfo = testInfo;
-  }
-		
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {    
-    IEnvironment env = getEnvironment();
-    
-    setJSPFolder();
-    
-	  return launchSample(env, monitor);
-  }
-  private void setJSPFolder(){
-	    //if the client is not a webcomponent then the 
-		//sample must have been created, we must now factor in 
-		//flexible projects  
-		  
-		IProject clientIProject = ProjectUtilities.getProject(testInfo.getClientProject());
-	    if (clientIProject != null && !J2EEUtils.isWebComponent(clientIProject)){   
-		  IProject project = ProjectUtilities.getProject(testInfo.getGenerationProject());
-		  IPath path = J2EEUtils.getWebContentPath(project);
-		  int index = testInfo.getJspFolder().lastIndexOf("/");
-		  String jsp = testInfo.getJspFolder().substring(index + 1);
-		  StringBuffer sb = new StringBuffer();	
-		  sb.append("/").append(path.toString()).append("/").append(jsp);	  
-		  jspfolder = sb.toString();
-		} 
-	    else
-		  jspfolder = testInfo.getJspFolder();	
-	  
-	  
-	  }
-  
-  private IStatus launchSample (IEnvironment env, IProgressMonitor monitor ) {
-    IStatus status = Status.OK_STATUS;
-	IPath fDestinationFolderPath = new Path(jspfolder);
-	fDestinationFolderPath = fDestinationFolderPath.makeAbsolute();    
-	 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. 
-	 }
-
-	PublishProjectCommand ppc = new PublishProjectCommand();
-    ppc.setServerTypeID(testInfo.getClientServerTypeID());
-    ppc.setExistingServer(testInfo.getClientExistingServer());
-    ppc.setProject(testInfo.getGenerationProject());
-    ppc.setEnvironment( env );
-	status = ppc.execute( monitor, null );
-
-	StartServerCommand serverCommand = new StartServerCommand( true );
-	serverCommand.setServerInstanceId( testInfo.getClientExistingServer().getId() );
-	serverCommand.setEnvironment( env );
-	
-	status = serverCommand.execute(monitor, null);
-	if (status.getSeverity() == Status.ERROR) return status;
-	
-	IProject sampleProject = ProjectUtilities.getProject(testInfo.getGenerationProject());
-	String   newPath = ServerUtils.getWebComponentURL(sampleProject, testInfo.getClientServerTypeID(),testInfo.getClientExistingServer());
-	int count = J2EEUtils.getWebContentPath(sampleProject).segmentCount();
-	
-	newPath = newPath + "/" + fDestinationFolderPath.removeFirstSegments(count);
-	StringBuffer urlString = new StringBuffer( newPath + "/" + TEST_CLIENT );
-	if (testInfo.getEndpoint() != null && !testInfo.getEndpoint().isEmpty())
-	{
-	  urlString.append("?endpoint=");
-	  urlString.append(testInfo.getEndpoint().get(0).toString());
-	}
-	    
-	try{
-	      URL url;
-	      url = new URL(urlString.toString());
-        
-        InputStream resultStream = null;
-        InputStream methodStream = null;
-        InputStream inputStream  = null;
-        InputStream clientStream = null;
-
-	      for( int retries = 0; retries < 10; retries++ )
-	      {
-	        try
-	        {
-	          // Test the URLs
-            
-	          resultStream = new URL(newPath + "/" + RESULT).openStream();
-	          methodStream = new URL(newPath + "/" + METHOD).openStream();
-	          inputStream  = new URL(newPath + "/" + INPUT).openStream();
-	          clientStream = new URL(newPath + "/" + TEST_CLIENT).openStream();
-            
-	          // Looks good, exit loop
-	          break;
-	        }
-	        catch( IOException ioe )
-	        {
-	          try
-	          {
-	            Thread.sleep(1000);
-	          }
-	          catch (InterruptedException ie) {} 	  	          
-	        }
-          finally
-          {
-            try
-            {
-              if( resultStream != null ) resultStream.close();
-              if( methodStream != null ) methodStream.close();
-              if( inputStream != null ) inputStream.close();
-              if( clientStream != null ) clientStream.close();
-            }
-            catch( IOException exc )
-            {
-            }
-          }
-	      }
-
-			IWorkbenchBrowserSupport browserSupport = WebServiceConsumptionUIPlugin.getInstance().getWorkbench().getBrowserSupport();
-			IWebBrowser browser = browserSupport.createBrowser(IWorkbenchBrowserSupport.LOCATION_BAR, null, null, null);
-			browser.openURL(url);
-	      return status;
-		 }catch(PartInitException exc){
-			//TODO: change error message
-			env.getLog().log(ILog.WARNING, 5048, this, "launchSample", exc);
-			status = StatusUtils.warningStatus( ConsumptionUIMessages.MSG_ERROR_MALFORMED_URL );
-			try {
-				env.getStatusHandler().report(status);
-			} catch (StatusException e) {
-				status = StatusUtils.errorStatus( ConsumptionUIMessages.MSG_ERROR_MALFORMED_URL, e );
-			}
-	    	return status;
-	    }catch(MalformedURLException exc){
-	    	env.getLog().log(ILog.WARNING, 5048, this, "launchSample", exc);
-			status = StatusUtils.warningStatus( ConsumptionUIMessages.MSG_ERROR_MALFORMED_URL, exc );
-			try {
-				env.getStatusHandler().report(status);
-			} catch (StatusException e) {
-				status = StatusUtils.errorStatus( ConsumptionUIMessages.MSG_ERROR_MALFORMED_URL, e );
-			}
-	    	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/test/wssample/GSTCWebServiceTester.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCWebServiceTester.java
deleted file mode 100644
index 29f1651d6..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCWebServiceTester.java
+++ /dev/null
@@ -1,36 +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.widgets.test.wssample;
-
-import java.util.Vector;
-
-import org.eclipse.wst.command.internal.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.env.core.SimpleCommandFactory;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceTester;
-import org.eclipse.wst.ws.internal.wsrt.TestInfo;
-
-public class GSTCWebServiceTester implements IWebServiceTester  {
-
-  public ICommandFactory generate(TestInfo testInfo){
-    Vector commands = new Vector();
-	commands.add(new AddModuleDependenciesCommand(testInfo));
-	commands.add(new GSTCGenerateCommand(testInfo));
-	return new SimpleCommandFactory(commands);
-  }
-  
-  public ICommandFactory launch(TestInfo testInfo){
-	Vector commands = new Vector();
-    commands.add(new GSTCLaunchCommand(testInfo));
-    return new SimpleCommandFactory(commands);	
-  }
-	
-}
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 b0a0f587f..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/WSSampleFinishCommand.java
+++ /dev/null
@@ -1,327 +0,0 @@
-/*******************************************************************************
- * Copyright (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.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.command.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.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.CopyWebServiceUtilsJarCommand;
-import org.eclipse.jst.ws.internal.ext.test.JavaProxyTestCommand;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.browser.IWebBrowser;
-import org.eclipse.ui.browser.IWorkbenchBrowserSupport;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.selection.BooleanSelection;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EnvironmentUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.ILog;
-import org.eclipse.wst.common.environment.StatusException;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-public class WSSampleFinishCommand extends AbstractDataModelOperation 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 Model proxyModel;
-  private String sampleServerTypeID;
-  private IServer sampleExistingServer;
-  
-  
-  private String clientProject;
-  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 ()
-  {
-  }
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    IEnvironment env = getEnvironment();
-    
-  	IStatus status = Status.OK_STATUS;
-    //setters and getters to be removed
-  	CopyWebServiceUtilsJarCommand copy = new CopyWebServiceUtilsJarCommand();    
-  	copy.setSampleProject(sampleProject);
-    copy.setEnvironment( env );
-  	status = copy.execute( monitor, null );
-    if (status.getSeverity() == Status.ERROR) return status;
-    status = createModel(env, monitor );
-    if (status.getSeverity() == Status.ERROR) return status;
-    status = generatePages(env, monitor );
-    if (status.getSeverity() == Status.ERROR) return status;
-    //if (!isSuccessful()) return;
-    status = launchSample(env, monitor);
-    return status;   
-  }
-
-   
-  /**
-  * Generate the four jsps that make up this
-  * sample app.
-  */
-  protected IStatus generatePages(IEnvironment env, IProgressMonitor monitor )
-  {
-  	IStatus status = Status.OK_STATUS;
-    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());
-    gpcTest.setEnvironment( env );
-    status = gpcTest.execute( monitor, null );
-    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());
-    gpcInput.setEnvironment( env );
-    status = gpcInput.execute( monitor, null );
-    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());
-    gpcMethod.setEnvironment( env );
-    status = gpcMethod.execute( monitor, null );
-    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());
-    gpcResult.setEnvironment( env );
-    status = gpcResult.execute( monitor, null );
-    
-    return status;
-  }
-
-
-  protected IStatus launchSample (IEnvironment env, IProgressMonitor monitor ) {
-
-  	IStatus status = Status.OK_STATUS;
-    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);
-    ppc.setEnvironment( env );
-    status = ppc.execute( monitor, null );
-
-    StartProjectCommand spc = new StartProjectCommand(false );
-    spc.setServiceServerTypeID(sampleServerTypeID);
-    spc.setSampleExistingServer(sampleExistingServer);
-    IProject project = (IProject) ResourceUtils.findResource(sampleProject);
-    spc.setSampleProject(project);
-    spc.setIsWebProjectStartupRequested(true);
-    spc.setEnvironment( env );
-    
-    status = spc.execute( monitor, null );
-    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());
-
-      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) {} 	  	          
-        }
-      }
-
-		IWorkbenchBrowserSupport browserSupport = WebServiceConsumptionUIPlugin.getInstance().getWorkbench().getBrowserSupport();
-		IWebBrowser browser = browserSupport.createBrowser(IWorkbenchBrowserSupport.LOCATION_BAR | IWorkbenchBrowserSupport.NAVIGATION_BAR, null, null, null);
-		browser.openURL(url);
-      return status;
-	 }catch(PartInitException exc){
-		//TODO: change error message
-		env.getLog().log(ILog.WARNING, 5048, this, "launchSample", exc);
-		status = StatusUtils.warningStatus( ConsumptionUIMessages.MSG_ERROR_MALFORMED_URL, exc );
-		try {
-			env.getStatusHandler().report(status);
-		} catch (StatusException e) {
-			status = StatusUtils.errorStatus( ConsumptionUIMessages.MSG_ERROR_MALFORMED_URL, e );
-		}
-    	return status;
-    }catch(MalformedURLException exc){
-    	env.getLog().log(ILog.WARNING, 5048, this, "launchSample", exc);
-		status = StatusUtils.warningStatus( ConsumptionUIMessages.MSG_ERROR_MALFORMED_URL, exc );
-		try {
-			env.getStatusHandler().report(status);
-		} catch (StatusException e) {
-			status = StatusUtils.errorStatus( ConsumptionUIMessages.MSG_ERROR_MALFORMED_URL, e );
-		}
-    	return status;
-    }
-  }
-
-  
-
-  protected IStatus createModel(IEnvironment env, IProgressMonitor monitor ) {
-
-  	//create the model from the resource
-    JavaToModelCommand jtmc = new JavaToModelCommand();
-    jtmc.setMethods(methods);
-    jtmc.setClientProject(clientProject);
-    jtmc.setProxyBean(proxyBean);
-    jtmc.setEnvironment( env );
-    //jtmc.setStatusMonitor(getStatusMonitor());
-    IStatus status = jtmc.execute( monitor, null);
-    if (status.getSeverity() == Status.ERROR) return status;
-
-    proxyModel = jtmc.getJavaDataModel();
-    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 59f68f977..000000000
--- 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.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
-* 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 AbstractDataModelOperation getFinishCommand()
-  {
-  	return new WSSampleFinishCommand();
-  }
-    
-}
-
-
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 e19b750e6..000000000
--- 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 0070383df..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/PublicUDDIRegistryTypeRegistry.java
+++ /dev/null
@@ -1,96 +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 e8ba923f0..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/RuntimeServerSelectionDialog.java
+++ /dev/null
@@ -1,651 +0,0 @@
-/*******************************************************************************
- * Copyright (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.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.RuntimeDescriptor;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-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.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.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_;
-
-  /*
-   * 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";
-  private Hashtable serverLabels_;
-  private Hashtable existingServersTable_;
-  private String defaultServer_;
-  private String defaultRuntime_;
-  private String typeId_;
-
-  private RuntimeDescriptor selectedRuntime_;
-
-  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 String SERVER_TYPES_ICON = "icons/servers/servers_obj.gif";
-  private final String EXISTING_SERVERS_ICON = "icons/servers/existing_server_obj.gif";
-  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();
-  }
-
-  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;
-  }
-
-  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(ConsumptionUIMessages.PAGE_TITLE_WS_RUNTIME_SELECTION);
-    else
-      thisShell.setText(ConsumptionUIMessages.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(ConsumptionUIMessages.PAGE_DESC_WS_RUNTIME_SELECTION + "\n" + "      "); // reserves a second line for message display
-    messageBanner_.setToolTipText(ConsumptionUIMessages.PAGE_DESC_WS_RUNTIME_SELECTION);
-    gd = new GridData(GridData.FILL_HORIZONTAL);
-    messageBanner_.setLayoutData(gd);
-    //  -----------------------------------------------------------------------//
-    new Label(composite, SWT.HORIZONTAL);
-    //  -----------------------------------------------------------------------//
-    // Selection
-    thisShell.setToolTipText(ConsumptionUIMessages.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(ConsumptionUIMessages.LABEL_SELECTION_VIEW_TITLE);
-    else
-      viewSelectionGroup_.setText(ConsumptionUIMessages.LABEL_CLIENT_SELECTION_VIEW_TITLE);
-    viewSelectionByServerButton_ = new Button(viewSelectionGroup_, SWT.RADIO);
-    viewSelectionByServerButton_.setText(ConsumptionUIMessages.LABEL_SELECTION_VIEW_SERVER);
-    viewSelectionByServerButton_.addListener(SWT.Selection, this);
-    viewSelectionByServerButton_.setToolTipText(ConsumptionUIMessages.TOOLTIP_PWRS_RADIO_SERVER);
-    viewSelectionByServerButton_.setSelection(true);
-    helpSystem.setHelp(viewSelectionByServerButton_, INFOPOP_PWRS_RADIO_SERVER);
-    viewSelectionByRuntimeButton_ = new Button(viewSelectionGroup_, SWT.RADIO);
-    viewSelectionByRuntimeButton_.setText(ConsumptionUIMessages.LABEL_SELECTION_VIEW_RUNTIME);
-    viewSelectionByRuntimeButton_.addListener(SWT.Selection, this);
-    viewSelectionByRuntimeButton_.setToolTipText(ConsumptionUIMessages.TOOLTIP_PWRS_RADIO_RUNTIME);
-    helpSystem.setHelp(viewSelectionByRuntimeButton_, INFOPOP_PWRS_RADIO_RUNTIME);
-    viewSelectionByExploreButton_ = new Button(viewSelectionGroup_, SWT.RADIO);
-    viewSelectionByExploreButton_.setText(ConsumptionUIMessages.LABEL_SELECTION_VIEW_EXPLORE);
-    viewSelectionByExploreButton_.addListener(SWT.Selection, this);
-    viewSelectionByExploreButton_.setToolTipText(ConsumptionUIMessages.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(ConsumptionUIMessages.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(ConsumptionUIMessages.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(ConsumptionUIMessages.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(ConsumptionUIMessages.TOOLTIP_PWRS_LIST_SERVERS);
-    ServersList serverList = new ServersList();
-    serverList.setServerTreeItems(serverList_);
-    helpSystem.setHelp(serverList_, INFOPOP_PWRS_LIST_SERVERS);
-    setRuntimesGroup();
-    //  -----------------------------------------------------------------------//
-    new Label(composite, SWT.HORIZONTAL);
-    validateOn_ = true;
-    org.eclipse.jface.dialogs.Dialog.applyDialogFont(parent);
-    return composite;
-  }
-
-
-  private void validateServerRuntimeSelection() {
-    // Check if the extension exists
-    if (selectionMode_ == MODE_SERVICE) {
-      if (selectedServerFactoryID_!=null && selectedRuntime_!=null) {
-
-      boolean wssrtSupported = WebServiceRuntimeExtensionUtils2.isServerRuntimeTypeSupported(selectedServerFactoryID_,selectedRuntime_.getId(),typeId_);
-	  
-      if (wssrtSupported && WebServiceRuntimeExtensionUtils2.isServerSupportedForChosenServiceType(typeId_, selectedServerFactoryID_)) {
-	        setOKStatusMessage();
-	      }	  
-      else {
-        setERRORStatusMessage(ConsumptionUIMessages.MSG_INVALID_SRT_SELECTIONS);
-      }
-      }
-    }
-    else {
-
-      String clientId = typeId_;
-      if (selectedServerFactoryID_==null || selectedRuntime_ == null || !WebServiceRuntimeExtensionUtils2.isServerClientRuntimeTypeSupported(selectedServerFactoryID_, selectedRuntime_.getId(), clientId)) {
-	        setERRORStatusMessage(ConsumptionUIMessages.MSG_INVALID_SRT_SELECTIONS);
-	  }	  
-      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(ConsumptionUIMessages.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(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() {
-    setReturnCode(OK);
-    close();
-  }
-
-  /**
-   * 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 (runtimesList_ == event.widget) {
-      TreeItem[] runtimeSel = runtimesList_.getSelection();
-      processRuntimeListSelection(runtimeSel[0].getText());
-      validateServerRuntimeSelection();
-    }
-    else if (serverList_ == event.widget) {
-      processServerListSelection();
-      validateServerRuntimeSelection();
-    }
-  }
-
-  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) {
-
-    if (selectionMode_ == MODE_SERVICE) {
-		selectedRuntime_ = WebServiceRuntimeExtensionUtils2.getRuntimeByLabel(runtimeName);
-    }
-    else {
-		selectedRuntime_ = WebServiceRuntimeExtensionUtils2.getRuntimeByLabel(runtimeName);
-    }
-  }
-
-  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(ConsumptionUIMessages.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(ConsumptionUIMessages.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 void setRuntimesGroup() {
-    runtimesList_.removeAll();
-    String[] runtimes = null;
-
-    if (selectionMode_ == MODE_SERVICE) {
-		runtimes = WebServiceRuntimeExtensionUtils2.getRuntimesByServiceType(typeId_);
-    }
-    else {
-	  runtimes = WebServiceRuntimeExtensionUtils2.getAllRuntimesForClientSide();
-    }
-
-    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();
-  }
-
-  private RuntimeDescriptor getRuntime(String type) {
-    if (selectionMode_ == MODE_SERVICE) {
-	  return WebServiceRuntimeExtensionUtils2.getRuntimeById(type);
-    }
-    else {
-	  return WebServiceRuntimeExtensionUtils2.getRuntimeById(type);
-    }
-  }
-
-  /**
-   * 
-   * ServersList class
-   * 
-   * Class which easily creates the Tree structure and entries for existing servers and server types
-   */
-  public class ServersList {
-
-    private TreeItem[] existingServersTree;
-    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(ConsumptionUIMessages.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(ConsumptionUIMessages.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) {
-		serverIds = WebServiceRuntimeExtensionUtils2.getServerFactoryIdsByServiceType(typeId_);
-      }
-      else {
-		serverIds = WebServiceRuntimeExtensionUtils2.getAllClientServerFactoryIds();
-      }
-      // 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 2d28a715f..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/TypeSelectionFilter.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.ui.wizard;
-
-import java.util.ArrayList;
-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;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceImpl;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-
-public class TypeSelectionFilter
-{
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  public String[] getWebServiceTypeByInitialSelection(IStructuredSelection initialSelection, ArrayList webServiceTypeList)
-  {
-        
-    ArrayList supportedTypes = new ArrayList();
-    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 = webServiceTypeList.iterator();
-      while (iter.hasNext())
-      {
-        String wst = (String)iter.next();
-        String scenario = wst.substring(0,wst.indexOf("/"));
-        String implId = wst.substring(wst.indexOf("/")+1);        
-        //IWebServiceType wst = (IWebServiceType)iter.next();
-        //String typeId = (String)wst.getId();
-        if (scenario.equals(String.valueOf(WebServiceScenario.BOTTOMUP)) && !supportedTypes.contains(wst))
-        {
-
-          
-          WebServiceImpl wsimpl = WebServiceRuntimeExtensionUtils.getWebServiceImplById(implId);
-          String[] resourceTypes = wsimpl.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 = wsimpl.getExtensionMetadata();
-                if (acceptsName(name, extensions))
-                {
-                  supportedTypes.add(wst);
-                }
-              }
-              
-            }
-          }
-        }
-      }
-      
-      //If no wsImpls have accepted this selection, check if this is WSDL. If it is,
-      //add the top-down Java service type to the list.
-      if (supportedTypes.isEmpty())
-      {
-        String[] resourceTypes = {"File", "IResource", "String", "ServiceImpl", "ServiceRefImpl", "WSDLResourceImpl"};
-        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 = {".wsdl", ".wsil", ".html", ".ServiceImpl", ".ServiceRefImpl", ".WSDLResourceImpl"};
-              if (acceptsName(name, extensions))
-              {
-                StringBuffer entrybuff = new StringBuffer();
-                entrybuff.append(String.valueOf(WebServiceScenario.TOPDOWN));
-                entrybuff.append("/");
-                entrybuff.append("org.eclipse.jst.ws.wsImpl.java");
-                String entry = entrybuff.toString();                
-                supportedTypes.add(entry);
-              }
-            }
-            
-          }
-        }      
-      }
-      
-    }    
-  
-
-    
-    if (supportedTypes.isEmpty())
-    {
-      //It's not a registered implementation and its not WSDL so return null;
-      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/TypeSelectionFilter2.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/TypeSelectionFilter2.java
deleted file mode 100644
index b58fb52e3..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/TypeSelectionFilter2.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.ui.wizard;
-
-import java.util.ArrayList;
-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;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceImpl;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-
-public class TypeSelectionFilter2
-{
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  public String[] getWebServiceTypeByInitialSelection(IStructuredSelection initialSelection, ArrayList webServiceTypeList)
-  {
-        
-    ArrayList supportedTypes = new ArrayList();
-    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 = webServiceTypeList.iterator();
-      while (iter.hasNext())
-      {
-        String wst = (String)iter.next();
-        String scenario = wst.substring(0,wst.indexOf("/"));
-        String implId = wst.substring(wst.indexOf("/")+1);        
-        //IWebServiceType wst = (IWebServiceType)iter.next();
-        //String typeId = (String)wst.getId();
-        if (scenario.equals(String.valueOf(WebServiceScenario.BOTTOMUP)) && !supportedTypes.contains(wst))
-        {
-
-          
-          WebServiceImpl wsimpl = WebServiceRuntimeExtensionUtils2.getWebServiceImplById(implId);
-          String[] resourceTypes = wsimpl.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 = wsimpl.getExtensionMetadata();
-                if (acceptsName(name, extensions))
-                {
-                  supportedTypes.add(wst);
-                }
-              }
-              
-            }
-          }
-        }
-      }
-      
-      //If no wsImpls have accepted this selection, check if this is WSDL. If it is,
-      //add the top-down Java service type to the list.
-      if (supportedTypes.isEmpty())
-      {
-        String[] resourceTypes = {"File", "IResource", "String", "ServiceImpl", "ServiceRefImpl", "WSDLResourceImpl"};
-        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 = {".wsdl", ".wsil", ".html", ".ServiceImpl", ".ServiceRefImpl", ".WSDLResourceImpl"};
-              if (acceptsName(name, extensions))
-              {
-                StringBuffer entrybuff = new StringBuffer();
-                entrybuff.append(String.valueOf(WebServiceScenario.TOPDOWN));
-                entrybuff.append("/");
-                entrybuff.append("org.eclipse.jst.ws.wsImpl.java");
-                String entry = entrybuff.toString();                
-                supportedTypes.add(entry);
-              }
-            }
-            
-          }
-        }      
-      }
-      
-    }    
-  
-
-    
-    if (supportedTypes.isEmpty())
-    {
-      //It's not a registered implementation and its not WSDL so return null;
-      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 198c12dd3..000000000
--- 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/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 64bc552ba..000000000
--- 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/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 7f3aa24ee..000000000
--- 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.parser.PluginMessages;
-
-public class PublicUDDIRegistryIBM implements PublicUDDIRegistryType
-{
-
-    // Copyright
-    public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
-    public PublicUDDIRegistryIBM() {
-    }
-
-    public String getName() {
-        return PluginMessages.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 78d2c0ce0..000000000
--- 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.parser.PluginMessages;
-
-public class PublicUDDIRegistryIBMTest implements PublicUDDIRegistryType
-{
-
-    // Copyright
-    public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
-    public PublicUDDIRegistryIBMTest() {
-    }
-
-    public String getName() {
-        return PluginMessages.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 bbbb8d7a4..000000000
--- 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.parser.PluginMessages;
-
-public class PublicUDDIRegistryMicrosoft implements PublicUDDIRegistryType
-{
-
-    // Copyright
-    public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
-    public PublicUDDIRegistryMicrosoft() {
-    }
-
-    public String getName() {
-        return PluginMessages.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 a6f9bee2e..000000000
--- 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.parser.PluginMessages;
-
-public class PublicUDDIRegistryMicrosoftTest implements PublicUDDIRegistryType
-{
-
-    // Copyright
-    public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
-    public PublicUDDIRegistryMicrosoftTest() {
-    }
-
-    public String getName() {
-        return PluginMessages.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 26e14b4b1..000000000
--- 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.parser.PluginMessages;
-
-public class PublicUDDIRegistryNTTComm implements PublicUDDIRegistryType
-{
-
-    // Copyright
-    public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
-    public PublicUDDIRegistryNTTComm() {
-    }
-
-    public String getName() {
-        return PluginMessages.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 1ad68fe4a..000000000
--- 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.parser.PluginMessages;
-
-public class PublicUDDIRegistrySAP implements PublicUDDIRegistryType
-{
-
-    // Copyright
-    public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
-    public PublicUDDIRegistrySAP() {
-    }
-
-    public String getName() {
-        return PluginMessages.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 5fad14824..000000000
--- 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.parser.PluginMessages;
-
-public class PublicUDDIRegistrySAPTest implements PublicUDDIRegistryType
-{
-
-    // Copyright
-    public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
-    public PublicUDDIRegistrySAPTest() {
-    }
-
-    public String getName() {
-        return PluginMessages.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 e4d9e6589..000000000
--- 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 8e7bde35a..000000000
--- 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.parser.PluginMessages;
-
-public class PublicUDDIRegistryXMethods implements PublicUDDIRegistryType
-{
-
-    // Copyright
-    public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
-    public PublicUDDIRegistryXMethods() {
-    }
-
-    public String getName() {
-        return PluginMessages.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 23193c1a5..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/AddWSDLToWSILWrapperCommand.java
+++ /dev/null
@@ -1,65 +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.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.wsil.AddWSDLToWSILCommand;
-
-
-
-public class AddWSDLToWSILWrapperCommand extends AbstractDataModelOperation
-{
-  private AddWSDLToWSILCommand command;
-  private Arguments args;
-
-  public AddWSDLToWSILWrapperCommand()
-  {
-  }
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    IEnvironment env = getEnvironment();
-    
-    if (command == null)
-      command = new AddWSDLToWSILCommand();
-    if (!args.isEmpty())
-    {
-      command.setArguments(args.getStringArguments());
-      command.setWWWAuthenticationHandler(new DialogWWWAuthentication(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell()));
-      command.setEnvironment( env );
-      return command.execute( null, null);
-    }
-    return Status.OK_STATUS;
-  }
-  /**
-   * @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 7a177c5a8..000000000
--- 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 565c91dc2..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/DialogWWWAuthentication.java
+++ /dev/null
@@ -1,153 +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.ConsumptionUIMessages;
-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.internal.parser.wsil.WWWAuthenticationException;
-import org.eclipse.wst.ws.internal.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(ConsumptionUIMessages.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(ConsumptionUIMessages.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(ConsumptionUIMessages.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(ConsumptionUIMessages.TOOLTIP_HTTP_BASIC_AUTH_USERNAME);
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(username_, INFOPOP_DBAS_USERNAME);
-
-    label = new Label(composite, SWT.WRAP);
-    label.setText(ConsumptionUIMessages.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(ConsumptionUIMessages.TOOLTIP_HTTP_BASIC_AUTH_PASSWORD);
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(username_, INFOPOP_DBAS_PASSWORD);
-
-    return composite;
-  }
-
-  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 6b47c1211..000000000
--- 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.ConsumptionUIMessages;
-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(ConsumptionUIMessages.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(ConsumptionUIMessages.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 4dae50bac..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/Utils.java
+++ /dev/null
@@ -1,52 +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/consumption/ui/wsrt/ClientRuntimeDescriptor.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ClientRuntimeDescriptor.java
deleted file mode 100644
index 65bedf58f..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ClientRuntimeDescriptor.java
+++ /dev/null
@@ -1,147 +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.wsrt;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jst.ws.internal.consumption.common.RequiredFacetVersion;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntime;
-
-public class ClientRuntimeDescriptor
-{
-  private IConfigurationElement elem;
-  private Hashtable allWebServiceClientImpls;
-  private Hashtable allRuntimes;
-  private String id;
-  private WebServiceClientImpl clientImplementationType;
-  private RuntimeDescriptor runtime;
-  private String clientRuntimeClassName;
-  private IWebServiceRuntime webServiceRuntime;
-  private RequiredFacetVersion[] requiredFacetVersions;
-  private Set projectFacetVersions;
-  
-  public ClientRuntimeDescriptor(IConfigurationElement elem, Hashtable allWebServiceClientImpls, Hashtable allRuntimes)
-  {
-    this.elem = elem;
-    this.allWebServiceClientImpls = allWebServiceClientImpls;
-    this.allRuntimes = allRuntimes;
-  }
-  
-  public WebServiceClientImpl getClientImplementationType()
-  {
-    if (clientImplementationType == null)
-    {
-     String clientImplementationTypeId = elem.getAttribute("clientImplementationTypeId");
-     clientImplementationType = (WebServiceClientImpl)allWebServiceClientImpls.get(clientImplementationTypeId);
-    }
-    return clientImplementationType;
-  }
-  
-  public String getClientRuntimeClassName()
-  {
-    if (clientRuntimeClassName == null)
-    {
-      clientRuntimeClassName = elem.getAttribute("class");
-    }
-    return clientRuntimeClassName;
-  }
-  
-  public String getId()
-  {
-    if (id == null)
-    {
-      id = elem.getAttribute("id");
-    }    
-    return id;
-  }
-  
-  public RequiredFacetVersion[] getRequiredFacetVersions()
-  {
-    if (requiredFacetVersions == null)
-    {
-      ArrayList requiredFacetVersionList = new ArrayList();
-      IConfigurationElement[] facetElems = elem.getChildren("required-facet-version");
-      for (int i = 0; i < facetElems.length; i++)
-      {
-        RequiredFacetVersion rfv = new RequiredFacetVersion();
-        IProjectFacet projectFacet = ProjectFacetsManager.getProjectFacet(facetElems[i].getAttribute("facet"));        
-        IProjectFacetVersion projectFacetVersion = projectFacet.getVersion(facetElems[i].getAttribute("version"));
-        rfv.setProjectFacetVersion(projectFacetVersion);
-        String allowNewerValue = facetElems[i].getAttribute("allow-newer");
-        if (allowNewerValue == null)
-        {
-          rfv.setAllowNewer(false);
-        }
-        else
-        {
-          rfv.setAllowNewer(Boolean.valueOf(allowNewerValue).booleanValue());
-        }
-        
-        requiredFacetVersionList.add(rfv);
-      }
-      
-      requiredFacetVersions = (RequiredFacetVersion[])requiredFacetVersionList.toArray(new RequiredFacetVersion[]{});
-    }
-    
-    return requiredFacetVersions;
-  }
-  
-  public Set getProjectFacetVersions()
-  {
-    if (projectFacetVersions == null)
-    {
-     projectFacetVersions = new HashSet();
-     RequiredFacetVersion[] rfv = getRequiredFacetVersions();
-     for (int i=0; i<rfv.length; i++)
-     {
-       projectFacetVersions.add(rfv[i].getProjectFacetVersion());
-     }
-    }
-    
-    return projectFacetVersions;    
-  }  
-  
-  public RuntimeDescriptor getRuntime()
-  {
-    if (runtime == null)
-    {
-     String runtimeId = elem.getAttribute("runtimeId");
-     runtime = (RuntimeDescriptor)allRuntimes.get(runtimeId);
-    }    
-    return runtime;
-  }
-  
-  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.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ClientType.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ClientType.java
deleted file mode 100644
index 85a02603b..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ClientType.java
+++ /dev/null
@@ -1,117 +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.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;
-	
-  
-  
-	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/consumption/ui/wsrt/Context.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/Context.java
deleted file mode 100644
index 034a6e8ef..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/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.consumption.ui.wsrt;
-
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-/**
- * @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/consumption/ui/wsrt/FacetMatchCache.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/FacetMatchCache.java
deleted file mode 100644
index c3e72ef80..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/FacetMatchCache.java
+++ /dev/null
@@ -1,368 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060131 121071   rsinha@ca.ibm.com - Rupam Kuehner (initial creation)
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.wsrt;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.consumption.common.FacetMatcher;
-import org.eclipse.jst.ws.internal.consumption.common.FacetSetsByTemplateCache;
-import org.eclipse.jst.ws.internal.consumption.common.FacetUtils;
-import org.eclipse.jst.ws.internal.consumption.common.RequiredFacetVersion;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-public class FacetMatchCache implements IResourceChangeListener
-{
-  //single instance per workbench
-  private static FacetMatchCache instance_;
-  
-  //Tables related to existing projects in the workspace
-  private Hashtable serviceFacetMatchTable_;
-  private Hashtable serviceTableKeysByProjectName_;
-  
-  private Hashtable clientFacetMatchTable_;
-  private Hashtable clientTableKeysByProjectName_;
-  
-  private List projectEntriesToDelete_;
-    
-  //Tables related to templates  
-  private Hashtable templatesByServiceRuntimeId_;
-  private Hashtable templatesByClientRuntimeId_;
-  
-  /**
-   * Returns a singleton instance of this class.
-   * 
-   * @return A singleton FacetMatchCache object.
-   */
-  public static synchronized FacetMatchCache getInstance()
-  {
-    if (instance_ == null)
-    {
-      instance_ = new FacetMatchCache();
-      instance_.load();
-    }
-    return instance_;
-  }  
-  
-  private void load()
-  {
-    serviceFacetMatchTable_ = new Hashtable();
-    serviceTableKeysByProjectName_ = new Hashtable();
-    clientFacetMatchTable_ = new Hashtable();    
-    clientTableKeysByProjectName_ = new Hashtable();
-    projectEntriesToDelete_ = new ArrayList();
-    templatesByClientRuntimeId_ = new Hashtable();
-    templatesByServiceRuntimeId_ = new Hashtable();
-    ResourcesPlugin.getWorkspace().addResourceChangeListener(this, IResourceChangeEvent.PRE_DELETE);
-  }
-  
-
-  /*
-   * Returns the FacetMatcher resulting from matching a service/client runtime with an existing project.
-   * @param isClient 
-   * @param runtimeId the id of a client runtime if isClient is true or the id of a service runtime if
-   * isClient is false.
-   * @param projectName the name of an existing project.
-   * 
-   * @returns FacetMatcher resulting from calling FacetUtils.match(..) using the service/client runtime id
-   * and the project name. null if the project doesn't exist. Non-faceted existing projects will always result
-   * in a FacetMatcher with isMatch() equal to false (with the exception of Java projects are a special case 
-   * - see FacetUtils.getFacetsForProject()).
-   */
-  public synchronized FacetMatcher getMatchForProject(boolean isClient, String runtimeId, String projectName)
-  {    
-    //Delete entries from table if there are deletions pending.
-    if (projectEntriesToDelete_.size() > 0)
-    {
-      Iterator projectItr = projectEntriesToDelete_.iterator();
-      while(projectItr.hasNext())
-      {
-        String projectNameToDelete = (String)projectItr.next();
-       
-        //Delete entries from client table
-        removeTableEntriesForProject(true, projectNameToDelete);
-        
-        //Delete entries from service table
-        removeTableEntriesForProject(false, projectNameToDelete);
-      }
-      
-      //Clear the projectEntriesToDelete list
-      projectEntriesToDelete_.clear();
-    }
-    
-    IProject project = ProjectUtilities.getProject(projectName);
-    FacetMatcher fm = null;
-    if (project != null && project.exists())
-    {
-      String key = getKey(runtimeId, projectName);
-      if (isClient)
-      {
-        fm = (FacetMatcher) clientFacetMatchTable_.get(key);
-      }
-      else
-      {
-        fm = (FacetMatcher) serviceFacetMatchTable_.get(key);
-      }
-      
-      if (fm == null)
-      {
-        // This combination has not yet been calculated and cached so calculate it and cache it.        
-        fm = calculateFacetMatcher(isClient, runtimeId, projectName);         
-        if (isClient)
-        {
-          clientFacetMatchTable_.put(key,fm);     
-        }
-        else
-        {
-          serviceFacetMatchTable_.put(key, fm);
-        }
-        updateTableOfKeys(isClient, key, projectName);
-        
-      } else
-      {
-        // If the project's facets have changed since the last time the
-        // facets were calculated, refresh the facetMatcher.        
-        Set currentFacetVersions = FacetUtils.getFacetsForProject(projectName);
-        Set previousFacetVersions = fm.getFacetsTested();
-        if (!currentFacetVersions.equals(previousFacetVersions))
-        {
-          //recalculate and cache the FacetMatcher
-          fm = calculateFacetMatcher(isClient, runtimeId, projectName);
-          if (isClient)
-          {
-            clientFacetMatchTable_.put(key,fm);         
-          }
-          else
-          {
-            serviceFacetMatchTable_.put(key, fm);
-          }                    
-        }
-      }
-    }
-    
-    return fm;    
-  }
-  
-  private void updateTableOfKeys(boolean isClient, String key, String projectName)
-  {
-    Set setOfKeysForProjectName = null;
-    if (isClient)
-    {
-      setOfKeysForProjectName = (Set)clientTableKeysByProjectName_.get(projectName);      
-    }
-    else
-    {
-      setOfKeysForProjectName = (Set)serviceTableKeysByProjectName_.get(projectName);
-    }
-    
-    if (setOfKeysForProjectName == null)
-    {
-      //Add an entry in the table for this project.
-      Set keys = new HashSet();
-      keys.add(key);
-      if (isClient)
-      {
-        clientTableKeysByProjectName_.put(projectName, keys);
-      }
-      else
-      {
-        serviceTableKeysByProjectName_.put(projectName, keys);
-      }
-    }
-    else
-    {
-      //Update the entry in the table for this project.
-      setOfKeysForProjectName.add(key);      
-    }
-  }
-  
-  private FacetMatcher calculateFacetMatcher(boolean isClient, String runtimeId, String projectName)
-  {
-    FacetMatcher fm = null;
-    RequiredFacetVersion[] rfvs = null;
-    if (isClient)
-    {
-      ClientRuntimeDescriptor desc = WebServiceRuntimeExtensionUtils2.getClientRuntimeDescriptorById(runtimeId);
-      rfvs = desc.getRequiredFacetVersions();
-    }
-    else
-    {
-      ServiceRuntimeDescriptor desc = WebServiceRuntimeExtensionUtils2.getServiceRuntimeDescriptorById(runtimeId);
-      rfvs = desc.getRequiredFacetVersions();
-    }
-    
-    Set facetVersions = FacetUtils.getFacetsForProject(projectName);
-    if (facetVersions != null)
-    {
-      fm = FacetUtils.match(rfvs, facetVersions);
-    } else
-    {
-      fm = new FacetMatcher();
-      fm.setMatch(false);
-    }    
-    
-    return fm;
-  }
-
-  private String getKey(String a, String b)
-  {
-    StringBuffer keysb = new StringBuffer();
-    keysb.append(a);
-    keysb.append("/");
-    keysb.append(b);    
-    return keysb.toString();    
-  }  
-  
-  private void removeTableEntriesForProject(boolean isClient, String projectName)
-  {
-    //First remove the entries from clientFacetMatchTable_ or serviceFacetMatchTable_
-    //that have keys containing this project name.
-    Set setOfKeysForProjectName = null;
-    if (isClient)
-    {
-      setOfKeysForProjectName = (Set)clientTableKeysByProjectName_.get(projectName);      
-    }
-    else
-    {
-      setOfKeysForProjectName = (Set)serviceTableKeysByProjectName_.get(projectName);
-    }
-    
-    if (setOfKeysForProjectName != null)
-    { 
-      Iterator keysItr = setOfKeysForProjectName.iterator();
-      while (keysItr.hasNext())
-      {
-        String key = (String)keysItr.next();
-        if (isClient)
-        { 
-          clientFacetMatchTable_.remove(key);          
-        }
-        else
-        {
-          serviceFacetMatchTable_.remove(key);
-        }
-      }
-      
-      //Second, remove the entry in clientTableKeysByProjectName_ or serviceTableKeysByProjectName_
-      //with this projectName as the key.
-      if (isClient)
-      {
-        clientTableKeysByProjectName_.remove(projectName);  
-      }
-      else
-      {
-        serviceTableKeysByProjectName_.remove(projectName);
-      }
-      
-    }
-    
-  }
-
-  /*
-   * Returns a set of templates supported by th given client runtime
-   * @returns Set (type: IFacetedProjectTemplate)
-   */
-  public synchronized Set getTemplatesForClientRuntime(String clientRuntimeId)
-  {
-    Set templates = (Set)templatesByClientRuntimeId_.get(clientRuntimeId);
-    if (templates != null)
-    {
-      //Return the cached set of templates.
-      return templates;
-    }
-    else
-    {
-      //Calculate the templates, cache them for later use, and return them.
-      ClientRuntimeDescriptor desc = WebServiceRuntimeExtensionUtils2.getClientRuntimeDescriptorById(clientRuntimeId);
-      Set validTemplates = getTemplates(desc.getRequiredFacetVersions());
-      templatesByClientRuntimeId_.put(clientRuntimeId, validTemplates);
-      return validTemplates;
-    }
-  }
-  
-  public synchronized Set getTemplatesForServiceRuntime(String serviceRuntimeId)
-  {
-    Set templates = (Set)templatesByServiceRuntimeId_.get(serviceRuntimeId);
-    if (templates != null)
-    {
-      //Return the cached set of templates.
-      return templates;
-    }
-    else
-    {
-      //Calculate the templates, cache them for later use, and return them.
-      ServiceRuntimeDescriptor desc = WebServiceRuntimeExtensionUtils2.getServiceRuntimeDescriptorById(serviceRuntimeId);
-      Set validTemplates = getTemplates(desc.getRequiredFacetVersions());
-      templatesByServiceRuntimeId_.put(serviceRuntimeId, validTemplates);
-      return validTemplates;
-    }
-  }
-  
-  private Set getTemplates(RequiredFacetVersion[] requiredFacetVersions)
-  {
-    
-    //Get the templates that support the actions
-    Set templates = new HashSet();
-    
-    for( Iterator itr = ProjectFacetsManager.getTemplates().iterator(); itr.hasNext(); )
-    {
-        final IFacetedProjectTemplate template = (IFacetedProjectTemplate) itr.next();
-        String templateId = template.getId();
-        if (templateId.indexOf("ear") == -1 && templateId.indexOf("wst.web") == -1) //Don't include the EARs!!
-        {           
-          Set[] combinations = FacetSetsByTemplateCache.getInstance().getFacetVersionCombinationsFromTemplate(templateId);
-          for (int i=0; i<combinations.length; i++)
-          {
-            FacetMatcher fm = FacetUtils.match(requiredFacetVersions, combinations[i]);
-            if (fm.isMatch())
-            {
-              //Found a combination that worked. Add the template to the list and move on.
-              templates.add(template);
-              break;
-            }
-          }
-        }
-    }    
-    
-    return templates;
-    
-  }
-  
-  public synchronized void resourceChanged(IResourceChangeEvent event)
-  {
-    if (event.getType() == IResourceChangeEvent.PRE_DELETE)
-    {
-      IResource projectResource = event.getResource();
-      if (projectResource!=null)
-      {
-        String projectName = projectResource.getName();
-        
-        //Add this project name to the list of project entries
-        //to delete.
-        projectEntriesToDelete_.add(projectName);
-      }
-    }    
-  }  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/RuntimeDescriptor.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/RuntimeDescriptor.java
deleted file mode 100644
index b6295375f..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/RuntimeDescriptor.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.jst.ws.internal.consumption.ui.wsrt;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-
-public class RuntimeDescriptor
-{
-
-  private IConfigurationElement elem;
-  private String id;
-  private String label;
-  
-
-  public RuntimeDescriptor(IConfigurationElement elem)
-  {
-    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;
-  }
-  
-  public String[] getJ2eeLevels()
-  {
-    return new String[]{"13", "14"};
-  }
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/Selection.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/Selection.java
deleted file mode 100644
index 631454bd6..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/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.consumption.ui.wsrt;
-
-import org.eclipse.wst.ws.internal.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/consumption/ui/wsrt/ServiceRuntimeDescriptor.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ServiceRuntimeDescriptor.java
deleted file mode 100644
index fc5c87187..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ServiceRuntimeDescriptor.java
+++ /dev/null
@@ -1,164 +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.wsrt;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jst.ws.internal.consumption.common.RequiredFacetVersion;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntime;
-
-
-public class ServiceRuntimeDescriptor
-{
-  private IConfigurationElement elem;
-  private Hashtable allWebServiceImpls;
-  private Hashtable allRuntimes;
-  private String id;
-  private WebServiceImpl serviceImplementationType;
-  private RuntimeDescriptor runtime;
-  private boolean bottomUp = false;
-  private boolean topDown = false;
-  private String serviceRuntimeClassName;
-  private IWebServiceRuntime webServiceRuntime;
-  private RequiredFacetVersion[] requiredFacetVersions;
-  private Set projectFacetVersions;
-  
-  public ServiceRuntimeDescriptor(IConfigurationElement elem, Hashtable allWebServiceImpls, Hashtable allRuntimes)
-  {
-    this.elem = elem;
-    this.allWebServiceImpls = allWebServiceImpls;
-    this.allRuntimes = allRuntimes;
-
-    bottomUp = (Boolean.valueOf(elem.getAttribute("bottomUp"))).booleanValue();
-    topDown = (Boolean.valueOf(elem.getAttribute("topDown"))).booleanValue();    
-  }
-  
-  public boolean getBottomUp()
-  {    
-    return bottomUp;
-  }
-  
-  public String getId()
-  {
-    if (id == null)
-    {
-      id = elem.getAttribute("id");
-    }
-    return id;
-  }
-  
-  
-  public RequiredFacetVersion[] getRequiredFacetVersions()
-  {
-    if (requiredFacetVersions == null)
-    {
-      ArrayList requiredFacetVersionList = new ArrayList();
-      IConfigurationElement[] facetElems = elem.getChildren("required-facet-version");
-      for (int i = 0; i < facetElems.length; i++)
-      {
-        RequiredFacetVersion rfv = new RequiredFacetVersion();
-        IProjectFacet projectFacet = ProjectFacetsManager.getProjectFacet(facetElems[i].getAttribute("facet"));        
-        IProjectFacetVersion projectFacetVersion = projectFacet.getVersion(facetElems[i].getAttribute("version"));
-        rfv.setProjectFacetVersion(projectFacetVersion);
-        String allowNewerValue = facetElems[i].getAttribute("allow-newer");
-        if (allowNewerValue == null)
-        {
-          rfv.setAllowNewer(false);
-        }
-        else
-        {
-          rfv.setAllowNewer(Boolean.valueOf(allowNewerValue).booleanValue());
-        }
-        
-        requiredFacetVersionList.add(rfv);
-      }
-      
-      requiredFacetVersions = (RequiredFacetVersion[])requiredFacetVersionList.toArray(new RequiredFacetVersion[]{});
-    }
-    
-    return requiredFacetVersions;
-  }
-  
-  public Set getProjectFacetVersions()
-  {
-    if (projectFacetVersions == null)
-    {
-     projectFacetVersions = new HashSet();
-     RequiredFacetVersion[] rfv = getRequiredFacetVersions();
-     for (int i=0; i<rfv.length; i++)
-     {
-       projectFacetVersions.add(rfv[i].getProjectFacetVersion());
-     }
-    }
-    
-    return projectFacetVersions;    
-  }
-  
-  public RuntimeDescriptor getRuntime()
-  {
-    if (runtime == null)
-    {
-     String runtimeId = elem.getAttribute("runtimeId");
-     runtime = (RuntimeDescriptor)allRuntimes.get(runtimeId);     
-    }
-    return runtime;
-  }
-  
-  public WebServiceImpl getServiceImplementationType()
-  {
-    if (serviceImplementationType == null)
-    {      
-      String serviceImplementationTypeId = elem.getAttribute("serviceImplementationTypeId");
-      serviceImplementationType = (WebServiceImpl)allWebServiceImpls.get(serviceImplementationTypeId);
-    }
-    return serviceImplementationType;
-  }
-  
-  public String getServiceRuntimeClassName()
-  {
-    if (serviceRuntimeClassName == null)
-    {
-      serviceRuntimeClassName = elem.getAttribute("class");
-    }
-    return serviceRuntimeClassName;
-  }
-  
-  public boolean getTopDown()
-  {
-    return topDown;
-  }
-  
-  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.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ServiceType.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ServiceType.java
deleted file mode 100644
index 85bf5af4a..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ServiceType.java
+++ /dev/null
@@ -1,198 +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.wsrt;
-
-import java.util.Hashtable;
-import java.util.StringTokenizer;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-public class ServiceType {
-
-  private IConfigurationElement elem_;
-  private Hashtable webServiceImpls_;
-  private String id;
-  private WebServiceImpl webServiceImpl;
-  private String[] bottomUpModuleTypesInclude;
-  private String[] topDownModuleTypesInclude;
-  private String[] bottomUpModuleTypesExclude;
-  private String[] topDownModuleTypesExclude;
-
-  
-
-  
-  public ServiceType(IConfigurationElement elem_, Hashtable webServiceImpls_)
-  {
-    super();
-    this.elem_ = elem_;
-    this.webServiceImpls_ = webServiceImpls_;
-  }
-
-  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 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;
-  }
-  
-  public boolean supportsScenario(int scenario)
-  {
-    switch(scenario)
-    {
-    case WebServiceScenario.BOTTOMUP:
-      String[] bus = getBottomUpModuleTypesInclude();
-      if (bus!=null && bus.length>0)
-      {
-        return true;
-      }
-      break;
-    case WebServiceScenario.TOPDOWN:
-      String[] tds = getTopDownModuleTypesInclude();
-      if (tds!=null && tds.length>0)
-      {
-        return true;
-      }
-      break;
-    default:
-     
-    }
-    
-    return false;
-  }
-  
-	public String[] getModuleTypesInclude(int scenario)
-  {
-    switch(scenario)
-    {
-    case WebServiceScenario.BOTTOMUP:
-      return getBottomUpModuleTypesInclude();
-    case WebServiceScenario.TOPDOWN:
-      return getTopDownModuleTypesInclude();
-    default:     
-    }
-    
-    return null;    
-  }
-  
-	
-	
-	
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceClientImpl.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceClientImpl.java
deleted file mode 100644
index d187b3a6a..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/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.consumption.ui.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/consumption/ui/wsrt/WebServiceImpl.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceImpl.java
deleted file mode 100644
index b5630e9dc..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceImpl.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.consumption.ui.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;
-  private String objectSelectionWidget;
-  
-  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;
-  }
-
-  public String getObjectSelectionWidget()
-  {
-    if (objectSelectionWidget==null)
-    {
-      objectSelectionWidget = elem_.getAttribute("objectSelectionWidget");
-    }
-    return objectSelectionWidget;
-  }
-  
-	
-  
-  
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionRegistry.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionRegistry.java
deleted file mode 100644
index acb0acc1b..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionRegistry.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*******************************************************************************
- * Copyright (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.wsrt;
-
-import java.util.ArrayList;
-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.wst.ws.internal.wsrt.WebServiceScenario;
-
-public class WebServiceRuntimeExtensionRegistry
-{
-
-  private static WebServiceRuntimeExtensionRegistry instance_;
-
-  HashMap webServiceTypes_;
-  
-  ArrayList webServiceTypesList_;
-  
-  ArrayList webServiceClientTypesList_;
-
-  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();
-    webServiceTypesList_ = new ArrayList();
-    webServiceClientTypesList_ = new ArrayList();
-    webServiceImpls_ = new Hashtable();
-    webServiceClientImpls_ = new Hashtable();
-    serviceTypes_ = new Hashtable();
-    clientTypes_ = new Hashtable();
-    webServiceRuntimes_ = new Hashtable();
-
-    IExtensionRegistry reg = Platform.getExtensionRegistry();
-    
-    //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_);
-          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);
-          
-          //Update the type lists
-          updateWebServiceTypeList(wsrtInfo);
-          updateWebServiceClientTypeList(wsrtInfo);
-          
-        }        
-    }
-  }  
-    
-  private void updateWebServiceTypeList(WebServiceRuntimeInfo wsrtInfo)
-  {
-    ServiceType[] sts = wsrtInfo.getServiceTypes();
-    if (sts != null)
-    {
-      for (int j = 0; j < sts.length; j++)
-      {
-        String implId = sts[j].getWebServiceImpl().getId();
-        String[] bus = sts[j].getBottomUpModuleTypesInclude();
-        String[] tds = sts[j].getTopDownModuleTypesInclude();
-        if (bus != null)
-        {
-          StringBuffer entrybuff = new StringBuffer();
-          entrybuff.append(String.valueOf(WebServiceScenario.BOTTOMUP));
-          entrybuff.append("/");
-          entrybuff.append(implId);
-          String entry = entrybuff.toString();
-          if (!webServiceTypesList_.contains(entry))
-          {
-            webServiceTypesList_.add(entry);
-          }
-        }
-        if (tds != null)
-        {
-          StringBuffer entrybuff = new StringBuffer();
-          entrybuff.append(String.valueOf(WebServiceScenario.TOPDOWN));
-          entrybuff.append("/");
-          entrybuff.append(implId);
-          String entry = entrybuff.toString();
-          if (!webServiceTypesList_.contains(entry))
-          {
-            webServiceTypesList_.add(entry);
-          }
-        }
-      }
-    }
-  }
-  
-  private void updateWebServiceClientTypeList(WebServiceRuntimeInfo wsrtInfo)
-  {
-    ClientType[] cts = wsrtInfo.getClientTypes();
-    if (cts != null)
-    {
-      for (int j = 0; j < cts.length; j++)
-      {
-        String implId = cts[j].getWebServiceClientImpl().getId();
-        String[] mods = cts[j].getModuleTypesInclude();
-        if (mods != null)
-        {
-          StringBuffer entrybuff = new StringBuffer();
-          entrybuff.append(String.valueOf(WebServiceScenario.CLIENT));
-          entrybuff.append("/");
-          entrybuff.append(implId);
-          String entry = entrybuff.toString();
-          if (!webServiceClientTypesList_.contains(entry))
-          {
-            webServiceClientTypesList_.add(entry);
-          }
-        }
-      }
-    }
-  }
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionRegistry2.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionRegistry2.java
deleted file mode 100644
index 1cec7cad4..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionRegistry2.java
+++ /dev/null
@@ -1,195 +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.wsrt;
-
-import java.util.ArrayList;
-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.wst.ws.internal.wsrt.WebServiceScenario;
-
-public class WebServiceRuntimeExtensionRegistry2
-{
-
-  private static WebServiceRuntimeExtensionRegistry2 instance_;
-
-
-  Hashtable webServiceImpls_;
-
-  Hashtable webServiceClientImpls_;
-
-  Hashtable runtimes_;
-  
-  Hashtable serviceRuntimes_;
-  
-  Hashtable clientRuntimes_;
-  
-  ArrayList webServiceTypesList_;
-  
-  ArrayList webServiceClientTypesList_;  
-  
-  
-  /**
-   * Returns a singleton instance of this class.
-   * 
-   * @return A singleton WebServiceRuntimeExtensionRegistry2 object.
-   */
-  public static WebServiceRuntimeExtensionRegistry2 getInstance()
-  {
-    if (instance_ == null)
-    {
-      instance_ = new WebServiceRuntimeExtensionRegistry2();
-      instance_.load();
-    }
-    return instance_;
-  }
-
-  private void load()
-  {
-    webServiceImpls_ = new Hashtable();
-    webServiceClientImpls_ = new Hashtable();
-    runtimes_ = new Hashtable();
-    serviceRuntimes_ = new Hashtable();
-    clientRuntimes_ = new Hashtable();
-    webServiceTypesList_ = new ArrayList();
-    webServiceClientTypesList_ = new ArrayList();
-    
-    
-    IExtensionRegistry reg = Platform.getExtensionRegistry();
-    
-    //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 runtimes
-    IConfigurationElement[] runtimeExts = reg.getConfigurationElementsFor(
-        "org.eclipse.jst.ws.consumption.ui", "runtimes");
-    
-    for(int idx=0; idx<runtimeExts.length; idx++) 
-    {
-      IConfigurationElement elem = runtimeExts[idx];
-
-        if (elem.getName().equals("runtime"))
-        {
-          RuntimeDescriptor rd = new RuntimeDescriptor(elem);
-          runtimes_.put(elem.getAttribute("id"), rd);
-        }        
-    }
-    
-    //Load serviceRuntimes
-    IConfigurationElement[] serviceRuntimeExts = reg.getConfigurationElementsFor(
-        "org.eclipse.jst.ws.consumption.ui", "serviceRuntimes");
-    
-    for(int idx=0; idx<serviceRuntimeExts.length; idx++) 
-    {
-      IConfigurationElement elem = serviceRuntimeExts[idx];
-
-        if (elem.getName().equals("serviceRuntime"))
-        {
-          ServiceRuntimeDescriptor rd = new ServiceRuntimeDescriptor(elem, webServiceImpls_, runtimes_);
-          serviceRuntimes_.put(elem.getAttribute("id"), rd);          
-          updateWebServiceTypeList(rd);
-        }        
-    }
-    
-    //Load serviceRuntimes
-    IConfigurationElement[] clientRuntimeExts = reg.getConfigurationElementsFor(
-        "org.eclipse.jst.ws.consumption.ui", "clientRuntimes");
-    
-    for(int idx=0; idx<clientRuntimeExts.length; idx++) 
-    {
-      IConfigurationElement elem = clientRuntimeExts[idx];
-
-      if (elem.getName().equals("clientRuntime"))
-      {
-        ClientRuntimeDescriptor rd = new ClientRuntimeDescriptor(elem, webServiceClientImpls_, runtimes_);
-        clientRuntimes_.put(elem.getAttribute("id"), rd);
-        updateWebServiceClientTypeList(rd);
-          
-      }        
-    }
-  }  
-    
-  private void updateWebServiceTypeList(ServiceRuntimeDescriptor descriptor)
-  {
-    String serviceImplId = descriptor.getServiceImplementationType().getId();
-    boolean bottomUp = descriptor.getBottomUp();
-    boolean topDown = descriptor.getTopDown();
-    if (bottomUp)
-    {
-      StringBuffer entrybuff = new StringBuffer();
-      entrybuff.append(String.valueOf(WebServiceScenario.BOTTOMUP));
-      entrybuff.append("/");
-      entrybuff.append(serviceImplId);
-      String entry = entrybuff.toString();
-      if (!webServiceTypesList_.contains(entry))
-      {
-        webServiceTypesList_.add(entry);
-      }      
-    }
-    
-    if (topDown)
-    {
-      StringBuffer entrybuff = new StringBuffer();
-      entrybuff.append(String.valueOf(WebServiceScenario.TOPDOWN));
-      entrybuff.append("/");
-      entrybuff.append(serviceImplId);
-      String entry = entrybuff.toString();
-      if (!webServiceTypesList_.contains(entry))
-      {
-        webServiceTypesList_.add(entry);
-      }      
-    }
-  }
-  
-  private void updateWebServiceClientTypeList(ClientRuntimeDescriptor descriptor)
-  {
-    String clientImplId = descriptor.getClientImplementationType().getId();
-    StringBuffer entrybuff = new StringBuffer();
-    entrybuff.append(String.valueOf(WebServiceScenario.CLIENT));
-    entrybuff.append("/");
-    entrybuff.append(clientImplId);
-    String entry = entrybuff.toString();
-    if (!webServiceClientTypesList_.contains(entry))
-    {
-      webServiceClientTypesList_.add(entry);
-    }    
-  }
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionUtils.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionUtils.java
deleted file mode 100644
index 9dc843be8..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionUtils.java
+++ /dev/null
@@ -1,967 +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.wsrt;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.TypeSelectionFilter;
-import org.eclipse.jst.ws.internal.data.LabelsAndIds;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.core.selection.SelectionList;
-import org.eclipse.wst.command.internal.env.core.selection.SelectionListChoices;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-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.wsrt.IWebServiceRuntime;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-public class WebServiceRuntimeExtensionUtils
-{
-  private static WebServiceRuntimeExtensionRegistry registry = WebServiceRuntimeExtensionRegistry.getInstance();
-  private static SelectionListChoices serverToRuntimeToJ2EE_;
-  private static Hashtable serverFactoryIdByLabel_;
-  private static Hashtable runtimeIdByLabel_;
-  
-  public static IWebServiceRuntime getWebServiceRuntime( String runtimeId )
-  {
-	WebServiceRuntimeInfo wsrtInfo       		= getWebServiceRuntimeById(runtimeId);
-	IWebServiceRuntime    webserviceRuntime     = null;
-	if (wsrtInfo != null)
-	{
-		webserviceRuntime = wsrtInfo.getWebServiceRuntime();
-	}
-	
-	return webserviceRuntime;
-  }  
-  
-  public static WebServiceImpl getWebServiceImplById(String id)
-  {
-    Object result = registry.webServiceImpls_.get(id);
-    if (result!=null)
-    {
-      return (WebServiceImpl)result;
-    }
-    return null;    
-  }
-  
-  public static int getScenarioFromTypeId(String typeId)
-  {
-    return Integer.parseInt(typeId.substring(0,typeId.indexOf("/")));
-  }
-  
-  public static String getImplIdFromTypeId(String typeId)
-  {
-    return typeId.substring(typeId.indexOf("/")+1);
-  }
-  /*
-   * @param typeId will be a String of the format "0/implId"
-   * where the digit before the "/" represents the scenario
-   * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the id
-   * of the WebServiceImpl
-   */  
-  public static ServiceType getServiceType(String runtimeId, String typeId)
-  {
-    WebServiceRuntimeInfo wsrt = getWebServiceRuntimeById(runtimeId);
-    if (wsrt!=null)
-    {
-      int scenario = getScenarioFromTypeId(typeId);
-      String implId = getImplIdFromTypeId(typeId);
-      //Return the first service type that supports the impl and scenario
-      ServiceType[] sts = wsrt.getServiceTypes();
-      if (sts != null)
-      {
-        for (int i = 0; i < sts.length; i++)
-        {
-          String thisImplId = sts[i].getWebServiceImpl().getId();
-          if (implId.equals(thisImplId))
-          {
-            // Check if scenario is supported
-            if (sts[i].supportsScenario(scenario))
-            {
-              return sts[i];
-            }
-          }
-        }
-      }
-    }
-    
-    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;      
-  }  
-
-  /*
-   * @param typeId will be a String of the format "0/implId"
-   * where the digit before the "/" represents the scenario
-   * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the id
-   * of the WebServiceImpl
-   */
-  public static String[] getRuntimesByType(String typeId) 
-  {
-    int scenario = getScenarioFromTypeId(typeId);
-    String implId = getImplIdFromTypeId(typeId);    
-    ArrayList ids = new ArrayList();
-    Iterator iter = registry.webServiceRuntimes_.values().iterator();
-    while (iter.hasNext())
-    {
-      WebServiceRuntimeInfo wsr = (WebServiceRuntimeInfo)iter.next();
-      ServiceType[] sts = wsr.getServiceTypes();
-      if (sts != null)
-      {
-        for (int i = 0; i < sts.length; i++)
-        {
-          String thisImplId = sts[i].getWebServiceImpl().getId();
-          if (implId.equals(thisImplId))
-          {
-            // Check if scenario is supported
-            if (sts[i].supportsScenario(scenario))
-            {
-              ids.add(wsr.getId());
-              break;
-            }
-          }
-        }
-      }
-    }
-    
-    if (ids.size() > 0)
-    {
-      String[] runtimeIds = (String[])ids.toArray(new String[0]);
-      return runtimeIds;
-    }
-    
-    return null;
-  }
-  
-  /*
-   * @param typeId will be a String of the format "0/implId"
-   * where the digit before the "/" represents the scenario
-   * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the id
-   * of the WebServiceImpl
-   */  
-  public static boolean isRuntimeSupportedForType(String typeId, String runtimeId)
-  {
-    String[] runtimeIds = getRuntimesByType(typeId);
-    if (runtimeIds!=null)
-    {
-      for (int i=0; i < runtimeIds.length; i++)
-      {
-        if (runtimeIds[i].equals(runtimeId))
-        {
-          return true;
-        }
-      }
-    }
-    
-    return false;
-  }
-  
-  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;    
-  }
-  
-  /*
-   * @param typeId will be a String of the format "0/implId"
-   * where the digit before the "/" represents the scenario
-   * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the id
-   * of the WebServiceImpl
-   */
-  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;
-  }
-  
-  /*
-   * @param typeId will be a String of the format "0/implId"
-   * where the digit before the "/" represents the scenario
-   * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the id
-   * of the WebServiceImpl
-   */    
-  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 static 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[] getAllProjects()
-  {
-    IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
-    ArrayList validProjects = new ArrayList();
-    for (int i = 0; i < projects.length; i++)
-    {
-      if (!projects[i].getName().equals("Servers") && !projects[i].getName().startsWith("."))
-      {
-        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
-  }
-  
-  public static LabelsAndIds getServiceTypeLabels()
-  {
-    String       pluginId = "org.eclipse.jst.ws.internal.consumption.ui";
-    MessageUtils msgUtils = new MessageUtils( pluginId + ".ConsumptionUI", registry );
-    
-    LabelsAndIds labelIds = new LabelsAndIds();
-    Iterator     iterator = registry.webServiceTypesList_.iterator();
-    int          size     = registry.webServiceTypesList_.size();
-    String[]     labels   = new String[size];
-    String[]     ids      = new String[size];
-    int          index    = 0;
-    
-    labelIds.setLabels_( labels );
-    labelIds.setIds_( ids );
-    
-    while( iterator.hasNext() ) 
-    {
-      String wst = (String)iterator.next();
-      int scenario = getScenarioFromTypeId(wst);
-      String implId = getImplIdFromTypeId(wst);
-      WebServiceImpl wsimpl = WebServiceRuntimeExtensionUtils.getWebServiceImplById(implId);
-      String impllabel = wsimpl.getLabel();
-      ids[index]    = wst;
-      String scenLabel = "";
-      switch(scenario)
-      {
-      case WebServiceScenario.BOTTOMUP:
-        scenLabel = msgUtils.getMessage(WebServiceScenario.BOTTOMUP_LABEL);
-        break;
-      case WebServiceScenario.TOPDOWN:
-        scenLabel = msgUtils.getMessage(WebServiceScenario.TOPDOWN_LABEL);
-        break; 
-      default:
-      }
-      labels[index] = msgUtils.getMessage( "COMBINED_TYPE_AND_RUNTIME_LABEL", new String[]{ scenLabel, impllabel } );
-      index++;
-    }    
-    
-    return labelIds;
-  }
-  
-  /*
-   * @param typeId will be a String of the format "0/implId"
-   * where the digit before the "/" represents the scenario
-   * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the id
-   * of the WebServiceImpl
-   */
-  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.webServiceTypesList_);
-    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;
-//  }  
-  
-  /*
-   * @param typeId will be a String of the format "0/implId"
-   * where the digit before the "/" represents the scenario
-   * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the id
-   * of the WebServiceImpl
-   */
-  public static boolean requiresEJBProject(String runtimeId, String typeId)
-  {
-    ServiceType st = getServiceType(runtimeId, typeId);
-    if (st!=null)
-    {
-      String[] includedNatures = st.getModuleTypesInclude(getScenarioFromTypeId(typeId));
-      if (includedNatures!=null && includedNatures.length>0)
-      {
-        if (includedNatures[0].equals(IModuleConstants.JST_EJB_MODULE))
-        {
-          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 boolean doesRuntimeSupportServer(String runtimeId, String factoryId)
-  {
-    WebServiceRuntimeInfo wsrt = getWebServiceRuntimeById(runtimeId);
-    if (wsrt != null)
-    {
-      String[] fids = wsrt.getServerFactoryIds();
-      if (fids!=null)
-      {
-        for (int i=0; i<fids.length; i++)
-        {
-          if (fids[i].equals(factoryId))
-          {
-            return true;
-          }
-        }
-      }
-    }
-    return false;
-  }
-  
-  public static String getFirstSupportedServer(String runtimeId)
-  {
-    WebServiceRuntimeInfo wsrt = getWebServiceRuntimeById(runtimeId);
-    
-    if (wsrt != null)
-    {
-      String[] fids = wsrt.getServerFactoryIds();
-      if (fids!=null && fids.length>0)
-      {
-        return fids[0];
-      }
-    }
-    
-    return null;    
-  }
-
-
-  public static String[] getRuntimesByClientType(String clientImplId) 
-  {
-    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)
-      {
-        for (int i = 0; i < cts.length; i++)
-        {
-          String wsClientImplId = cts[i].getWebServiceClientImpl().getId();
-          if (wsClientImplId.equals(clientImplId))
-          {
-            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 clientImplId, String runtimeId)
-  {
-    String[] rIds = getRuntimesByClientType(clientImplId);
-    if (rIds == null)
-    {
-      return null;
-    }
-    
-    for (int i = 0; i < rIds.length; i++)
-    {
-      if (runtimeId.equals(rIds[i]))
-      {
-        ClientType[] cts = getWebServiceRuntimeById(rIds[i]).getClientTypes();
-        if (cts != null)
-        {
-          for (int j = 0; j < cts.length; j++)
-          {
-            String thisClientImplId = cts[j].getWebServiceClientImpl().getId();
-            if (clientImplId.equals(thisClientImplId))
-            {
-              // Found the one!
-              String[] projectTypes = cts[j].getModuleTypesInclude();
-              return projectTypes;
-            }
-          }
-        }
-      }
-    }  
-    
-    return null;    
-  }
-  
-  public static boolean doesRuntimeSupportComponentType(String clientImplId, String runtimeId, String componentTypeId)
-  {
-    String[] compTypeIds = getClientProjectTypes(clientImplId, runtimeId);
-    if (compTypeIds!=null)
-    {
-      for (int i=0; i<compTypeIds.length; i++)
-      {
-       if (compTypeIds[i].equals(componentTypeId))
-       {
-         return true;
-       }
-      }
-    }
-    
-    return false;
-  }
-  
-  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();
-      if (cts != null)
-      {
-        for (int j = 0; j < cts.length; j++)
-        {
-          ClientType ct = cts[j];
-          // String id = ct.getWebServiceClientTypeId();
-          String id = ct.getWebServiceClientImpl().getId();
-          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;
-
-  }  
-  
-  //Utilities used by the ServerRuntimePreferencePage
-  
-  public static SelectionListChoices getServerToRuntimeToJ2EE()
-  {
-    if (serverToRuntimeToJ2EE_!=null)
-    {
-      return serverToRuntimeToJ2EE_;
-    }
-    
-    //String[] servers = getStringArrayIntersection(getAllServerFactoryIds(), WebServiceClientTypeRegistry.getInstance().getAllClientServerFactoryIds());
-    String[] servers = getAllServerFactoryIds();
-    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 static SelectionListChoices getRuntimeChoices(String serverFactoryId)
-  {
-    
-    String[] runtimes = getRuntimeIDsByServerFactoryID(serverFactoryId);
-    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 static SelectionListChoices getJ2EEChoices(String runtimeId)
-  {
-    //String[] serviceJ2EEVersions = getWebServiceRuntimeById(runtimeId).getJ2EEVersions();
-    //String[] clientJ2EEVersions = WebServiceClientTypeRegistry.getInstance().getWebServiceRuntimeById(runtimeId).getJ2EEVersions();
-    //String[] j2eeVersions = getStringArrayIntersection(serviceJ2EEVersions, clientJ2EEVersions);
-    WebServiceRuntimeInfo wsr = getWebServiceRuntimeById(runtimeId);
-    if (wsr==null)
-    {
-      return null;
-    }
-    
-    String[] j2eeVersions = wsr.getJ2eeLevels();
-    SelectionList j2eeVersionsList = new SelectionList(j2eeVersions, 0);
-    return new SelectionListChoices(j2eeVersionsList, null);
-  }  
-  
-  private static String[] getAllServerFactoryIds()
-  {
-    ArrayList ids = new ArrayList();
-    if (serverFactoryIdByLabel_ == null)
-    {
-      serverFactoryIdByLabel_ = new Hashtable();
-      Iterator iter = registry.webServiceRuntimes_.values().iterator();
-      while (iter.hasNext())
-      {
-        WebServiceRuntimeInfo wsr = (WebServiceRuntimeInfo) iter.next();
-        String[] sfids = wsr.getServerFactoryIds();
-        for (int i = 0; i < sfids.length; i++)
-        {
-          if (!ids.contains(sfids[i]))
-          {
-            String label = getServerLabelById(sfids[i]);
-            if (label != null)
-            {
-              ids.add(sfids[i]);
-              serverFactoryIdByLabel_.put(label, sfids[i]);
-            }
-          }
-        }
-      }
-    }
-    else
-    {
-      Iterator fids =  serverFactoryIdByLabel_.values().iterator();
-      while (fids.hasNext())
-      {
-        String fid = (String)fids.next();
-        ids.add(fid);
-      }           
-    }
-    
-    if (ids.size() > 0)
-    {
-      String[] serverFactoryIds = (String[])ids.toArray(new String[0]);
-      return serverFactoryIds;
-    }
-    
-    return null;
-  }  
-  
-  private static String[] getRuntimeIDsByServerFactoryID(String serverFactoryID) 
-  {
-    ArrayList ids = new ArrayList();
-    Iterator iter = registry.webServiceRuntimes_.values().iterator();
-    while (iter.hasNext())
-    {
-      WebServiceRuntimeInfo wsr = (WebServiceRuntimeInfo)iter.next();
-      if (doesRuntimeSupportServer(wsr.getId(), serverFactoryID))
-      {
-        ids.add(wsr.getId());
-      }
-      
-    }
-    
-    if (ids.size() > 0)
-    {
-      String[] runtimeIds = (String[])ids.toArray(new String[0]);
-      return runtimeIds;
-    }
-    
-    return null;    
-    
-    
-  }
-  
-  public static String getServerFactoryId(String label)
-  {
-    if (label==null || label.length()==0)
-      return null;
-    
-    if (serverFactoryIdByLabel_ == null)
-    {
-      getAllServerFactoryIds();
-    }
-    
-    if (serverFactoryIdByLabel_.containsKey(label))
-    {
-      return (String)serverFactoryIdByLabel_.get(label);  
-    }
-    else
-    {
-      return null;
-    }       
-  }  
-  
-  public static String getRuntimeId(String label)
-  {
-    
-    if (label==null || label.length()==0)
-      return null;
-    
-    if (runtimeIdByLabel_ == null)
-    {
-      runtimeIdByLabel_ = new Hashtable();
-      Iterator iter = registry.webServiceRuntimes_.values().iterator();
-      while (iter.hasNext())
-      {
-        WebServiceRuntimeInfo wsr = (WebServiceRuntimeInfo)iter.next();
-        runtimeIdByLabel_.put(wsr.getLabel(), wsr.getId());        
-      }      
-    }
-    
-    return (String)runtimeIdByLabel_.get(label);    
-  }    
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionUtils2.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionUtils2.java
deleted file mode 100644
index b9dc9507b..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionUtils2.java
+++ /dev/null
@@ -1,1487 +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
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060131 121071   rsinha@ca.ibm.com - Rupam Kuehner     
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wsrt;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.server.core.FacetUtil;
-import org.eclipse.jst.ws.internal.consumption.common.FacetMatcher;
-import org.eclipse.jst.ws.internal.consumption.common.FacetUtils;
-import org.eclipse.jst.ws.internal.consumption.common.RequiredFacetVersion;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.TypeSelectionFilter2;
-import org.eclipse.jst.ws.internal.data.LabelsAndIds;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.core.selection.SelectionList;
-import org.eclipse.wst.command.internal.env.core.selection.SelectionListChoices;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.common.project.facet.core.runtime.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.ui.ServerUICore;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntime;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-public class WebServiceRuntimeExtensionUtils2
-{
-  private static WebServiceRuntimeExtensionRegistry2 registry = WebServiceRuntimeExtensionRegistry2.getInstance();
-  
-  public static RuntimeDescriptor getRuntimeById(String id)
-  {
-    Object result = registry.runtimes_.get(id);
-    if (result!=null)
-    {
-      return (RuntimeDescriptor)result;
-    }
-    return null;        
-  }
-  
-  public static String[] getAllClientProjectTypes()
-  {
-    ArrayList finalTemplateIdList = new ArrayList();
-    Iterator iter = registry.clientRuntimes_.values().iterator();
-
-    //Loop through all the clientRuntimes
-    while (iter.hasNext())   
-    {
-      ClientRuntimeDescriptor desc = (ClientRuntimeDescriptor)iter.next();
-      
-      //Get the templates for this client runtime
-      Set templates = FacetMatchCache.getInstance().getTemplatesForClientRuntime(desc.getId());
-      
-      //Add the template ids to the list if they have not already been added
-      Iterator itr = templates.iterator();
-      while (itr.hasNext())
-      {
-        IFacetedProjectTemplate template = (IFacetedProjectTemplate)itr.next();
-        if (!finalTemplateIdList.contains(template.getId()))
-        {
-          finalTemplateIdList.add(template.getId());
-        }
-      }            
-    }
-    
-    return (String[])finalTemplateIdList.toArray(new String[]{});
-  }
-  
-  public static String getRuntimeLabelById(String runtimeId) 
-  {
-    RuntimeDescriptor desc = getRuntimeById(runtimeId);
-    if (desc == null)
-      return null;
-    
-    return desc.getLabel();
-  }    
-  
-  public static RuntimeDescriptor getRuntimeByLabel(String label)
-  {
-    Iterator iter = registry.runtimes_.values().iterator();
-    while (iter.hasNext())
-    {
-      RuntimeDescriptor descriptor = (RuntimeDescriptor)iter.next();
-      if (descriptor!=null) {
-        if (label.equals(descriptor.getLabel()))
-          return descriptor;
-      }
-    }
-    return null;      
-  }      
-
-  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();
-  }  
-
-  private static String[] getServerFactoryIdsByFacetRuntimes(Set facetRuntimes)
-  {
-    
-    ArrayList supportedServerFactoryIds = new ArrayList();
-    String[] serverTypeIds = getAllServerFactoryIdsWithRuntimes();
-    Iterator itr = facetRuntimes.iterator();
-    while(itr.hasNext())
-    {
-      IRuntime fRuntime = (IRuntime)itr.next();
-      org.eclipse.wst.server.core.IRuntime sRuntime = FacetUtil.getRuntime(fRuntime);
-      for (int i=0; i<serverTypeIds.length; i++)
-      {
-        IServerType serverType = ServerCore.findServerType(serverTypeIds[i]);
-        String runtimeTypeId = serverType.getRuntimeType().getId();
-        if (runtimeTypeId.equals(sRuntime.getRuntimeType().getId()))
-        {
-          supportedServerFactoryIds.add(serverTypeIds[i]);          
-        }        
-      }
-    }
-    
-    return (String[])supportedServerFactoryIds.toArray(new String[0]);
-    
-    //Temporarily return all factory ids with runtimes
-    //return getAllServerFactoryIdsWithRuntimes();    
-  }
-  
-  //Service-side utilities
-  public static WebServiceImpl getWebServiceImplById(String id)
-  {
-    Object result = registry.webServiceImpls_.get(id);
-    if (result!=null)
-    {
-      return (WebServiceImpl)result;
-    }
-    return null;    
-  }
-  
-  public static ServiceRuntimeDescriptor getServiceRuntimeDescriptorById(String id)
-  {
-    Object result = registry.serviceRuntimes_.get(id);
-    if (result!=null)
-    {
-      return (ServiceRuntimeDescriptor)result;
-    }
-    return null;        
-  }  
-  
-  public static IWebServiceRuntime getServiceRuntime( String serviceRuntimeId )
-  {
-    ServiceRuntimeDescriptor descriptor = getServiceRuntimeDescriptorById(serviceRuntimeId);
-    IWebServiceRuntime    webserviceRuntime     = null;
-    if (descriptor != null)
-    {
-        webserviceRuntime = descriptor.getWebServiceRuntime();
-    }
-    
-    return webserviceRuntime;
-  }
-  
-  public static String getServiceRuntimeId(TypeRuntimeServer trs, String projectName, String templateId)
-  {
-    //Find the first client runtime that supports the implementation type, runtime, server, and project
-    String[] descs = getServiceRuntimesByServiceType(trs.getTypeId());
-    for (int i=0; i<descs.length; i++)
-    {
-      ServiceRuntimeDescriptor desc = getServiceRuntimeDescriptorById(descs[i]);      
-      if (desc.getRuntime().getId().equals(trs.getRuntimeId()))
-      {
-        boolean supportsServer = doesServiceRuntimeSupportServer(desc.getId(), trs.getServerId());
-        if (!supportsServer)
-        {
-          continue;
-        }
-        
-        IProject project = ProjectUtilities.getProject(projectName);
-        if (project.exists())
-        {
-          if (doesServiceRuntimeSupportProject(desc.getId(), projectName))
-          {
-            return desc.getId();
-          }
-        }
-        else
-        {
-          //Check if template is supported
-          if (doesServiceRuntimeSupportTemplate(desc.getId(), templateId))
-          {
-            return desc.getId();
-          }
-        }
-      }
-    }
-    
-    return "";
-    
-  }  
-  
-  /*
-   * @param typeId will be a String of the format "0/implId"
-   * where the digit before the "/" represents the scenario
-   * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the id
-   * of the WebServiceImpl
-   */    
-  public static int getScenarioFromTypeId(String typeId)
-  {
-    return Integer.parseInt(typeId.substring(0,typeId.indexOf("/")));
-  }
-  
-  /*
-   * @param typeId will be a String of the format "0/implId"
-   * where the digit before the "/" represents the scenario
-   * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the id
-   * of the WebServiceImpl
-   */    
-  public static String getWebServiceImplIdFromTypeId(String typeId)
-  {
-    return typeId.substring(typeId.indexOf("/")+1);
-  }    
-  
-  /*
-   * @param typeId will be a String of the format "0/implId"
-   * where the digit before the "/" represents the scenario
-   * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the id
-   * of the WebServiceImpl
-   * 
-   * @returns String[] containing the ids of all runtimes that
-   * support this type.
-   */
-  public static String[] getRuntimesByServiceType(String typeId) 
-  {
-    int scenario = getScenarioFromTypeId(typeId);
-    String implId = getWebServiceImplIdFromTypeId(typeId);    
-    ArrayList ids = new ArrayList();
-    Iterator iter = registry.serviceRuntimes_.values().iterator();
-    while (iter.hasNext())   
-    {
-      ServiceRuntimeDescriptor desc = (ServiceRuntimeDescriptor)iter.next();
-      //Check if this serviceRuntime supports the implementation type
-      if (desc.getServiceImplementationType().getId().equals(implId))
-      {
-        switch (scenario)
-        {
-          case WebServiceScenario.BOTTOMUP:
-            if (desc.getBottomUp())
-            {
-              String runtimeId = desc.getRuntime().getId(); 
-              if (!ids.contains(runtimeId))
-              {
-                ids.add(runtimeId);
-              }
-            }
-            break;
-          case WebServiceScenario.TOPDOWN:
-            if (desc.getTopDown())
-            {
-              String runtimeId = desc.getRuntime().getId(); 
-              if (!ids.contains(runtimeId))
-              {
-                ids.add(runtimeId);
-              }
-            }
-            break;
-          default:          
-        }
-      }
-    }
-    
-    return (String[])ids.toArray(new String[]{});
-  }
-  
-  /*
-   * @param typeId will be a String of the format "0/implId"
-   * where the digit before the "/" represents the scenario
-   * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the id
-   * of the WebServiceImpl
-   * 
-   * @returns String[] containing the ids of all service runtimes that
-   * support this type.
-   */
-  public static String[] getServiceRuntimesByServiceType(String typeId) 
-  {
-    int scenario = getScenarioFromTypeId(typeId);
-    String implId = getWebServiceImplIdFromTypeId(typeId);    
-    ArrayList ids = new ArrayList();
-    Iterator iter = registry.serviceRuntimes_.values().iterator();
-    while (iter.hasNext())   
-    {
-      ServiceRuntimeDescriptor desc = (ServiceRuntimeDescriptor)iter.next();
-      //Check if this serviceRuntime supports the implementation type
-      if (desc.getServiceImplementationType().getId().equals(implId))
-      {
-        switch (scenario)
-        {
-          case WebServiceScenario.BOTTOMUP:
-            if (desc.getBottomUp())
-            {
-              String serviceRuntimeId = desc.getId(); 
-              ids.add(serviceRuntimeId);
-            }
-            break;
-          case WebServiceScenario.TOPDOWN:
-            if (desc.getTopDown())
-            {
-              String serviceRuntimeId = desc.getId(); 
-              ids.add(serviceRuntimeId);
-            }
-            break;
-          default:          
-        }
-      }
-    }
-    
-    return (String[])ids.toArray(new String[]{});
-  }  
-  /*
-   * @param typeId will be a String of the format "0/implId"
-   * where the digit before the "/" represents the scenario
-   * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the id
-   * of the WebServiceImpl
-   * @param runtimeId id of a Web service runtime (RuntimeDescriptor)
-   */  
-  public static boolean isRuntimeSupportedForServiceType(String typeId, String runtimeId)
-  {
-    String[] serviceRuntimeIds = getServiceRuntimesByServiceType(typeId);
-    if (serviceRuntimeIds!=null)
-    {
-      for (int i=0; i < serviceRuntimeIds.length; i++)
-      {
-        ServiceRuntimeDescriptor desc = getServiceRuntimeDescriptorById(serviceRuntimeIds[i]);
-        if (desc.getRuntime().getId().equals(runtimeId))
-        {
-          return true;
-        }
-      }
-    }
-    
-    return false;
-  }  
-  
-  public static String[] getServerFactoryIdsByServiceType(String typeId)
-  {
-    ArrayList serverFactoryIds = new ArrayList();
-    String[] srts = getServiceRuntimesByServiceType(typeId);
-    if (srts != null)
-    {
-      for (int i = 0; i < srts.length; i++)
-      {
-        //Get the runtimes that work for the facets required for this service runtime        
-        String[] fIds = getServerFactoryIdsByServiceRuntime(srts[i]);
-        for (int j=0; j<fIds.length; j++)
-        {
-          if (!serverFactoryIds.contains(fIds[j]))
-          {
-            serverFactoryIds.add(fIds[j]);            
-          }
-        }
-      }
-    }
-    
-    return (String[])serverFactoryIds.toArray(new String[]{});
-    
-    //Temporarily return all server type ids.
-    //return getAllServerFactoryIdsWithRuntimes();
-  }
-  
-  /*
-   * @param typeId will be a String of the format "0/implId"
-   * where the digit before the "/" represents the scenario
-   * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the id
-   * of the WebServiceImpl
-   */
-  public static boolean isServerSupportedForChosenServiceType(String typeId, String serverFactoryId)
-  {
-    String[] fIds = getServerFactoryIdsByServiceType(typeId);
-    if (fIds == null)
-    {
-      return false;
-    }
-
-    for (int i=0;i<fIds.length;i++)
-    {
-      if (serverFactoryId.equals(fIds[i]))
-      {
-        return true;
-      }      
-    }
-    
-    return false;
-  }
-  
-  public static String[] getServerFactoryIdsByServiceRuntime(String serviceRuntimeId)
-  {       
-    ServiceRuntimeDescriptor desc = getServiceRuntimeDescriptorById(serviceRuntimeId);
-    Set facetRuntimes = getRuntimes(desc.getRequiredFacetVersions());
-            
-    //Temporarily return all server types
-    //return getAllServerFactoryIdsWithRuntimes();
-    return getServerFactoryIdsByFacetRuntimes(facetRuntimes);
-  } 
-  
-
-  
-
-  public static boolean doesServiceRuntimeSupportServer(String serviceRuntimeId, String serverFactoryId)
-  {
-    String[] serverIds = getServerFactoryIdsByServiceRuntime(serviceRuntimeId);
-    for (int i=0; i<serverIds.length; i++)
-    {
-      if (serverIds[i].equals(serverFactoryId))
-      {
-        return true;
-      }
-    }
-    
-    return false;
-  }
-    
-  
-  public static LabelsAndIds getServiceTypeLabels()
-  {
-    String       pluginId = "org.eclipse.jst.ws.internal.consumption.ui";
-    MessageUtils msgUtils = new MessageUtils( pluginId + ".ConsumptionUI", registry );
-    
-    LabelsAndIds labelIds = new LabelsAndIds();
-    Iterator     iterator = registry.webServiceTypesList_.iterator();
-    int          size     = registry.webServiceTypesList_.size();
-    String[]     labels   = new String[size];
-    String[]     ids      = new String[size];
-    int          index    = 0;
-    
-    labelIds.setLabels_( labels );
-    labelIds.setIds_( ids );
-    
-    while( iterator.hasNext() ) 
-    {
-      String wst = (String)iterator.next();
-      int scenario = getScenarioFromTypeId(wst);
-      String implId = getWebServiceImplIdFromTypeId(wst);
-      WebServiceImpl wsimpl = getWebServiceImplById(implId);
-      String impllabel = wsimpl.getLabel();
-      ids[index]    = wst;
-      String scenLabel = "";
-      switch(scenario)
-      {
-      case WebServiceScenario.BOTTOMUP:
-        scenLabel = msgUtils.getMessage(WebServiceScenario.BOTTOMUP_LABEL);
-        break;
-      case WebServiceScenario.TOPDOWN:
-        scenLabel = msgUtils.getMessage(WebServiceScenario.TOPDOWN_LABEL);
-        break; 
-      default:
-      }
-      labels[index] = msgUtils.getMessage( "COMBINED_TYPE_AND_RUNTIME_LABEL", new String[]{ scenLabel, impllabel } );
-      index++;
-    }    
-    
-    return labelIds;
-  }
-  
-  /*
-   * @param typeId will be a String of the format "0/implId"
-   * where the digit before the "/" represents the scenario
-   * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the id
-   * of the WebServiceImpl
-   */
-  public static String getDefaultRuntimeValueFor(String typeId)
-  {
-    String[] srIds = getServiceRuntimesByServiceType(typeId);
-    if (srIds == null)
-    {
-      return null;
-    }
-    
-    ServiceRuntimeDescriptor desc = getServiceRuntimeDescriptorById(srIds[0]);
-    return desc.getRuntime().getId();
-  }      
-  
-  public static String getDefaultServerValueFor(String typeId)
-  {
-    String[] fIds = getServerFactoryIdsByServiceType(typeId);
-    if (fIds==null)
-      return null;
-    
-    return fIds[0];
-  }    
-  
-  /*
-   * @param typeId will be a String of the format "0/implId"
-   * where the digit before the "/" represents the scenario
-   * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the id
-   * of the WebServiceImpl
-   * @param runtimeId is the id of a RuntimeDescriptor
-   * @param serverFactoryId server factory id
-   */    
-  public static boolean isServerRuntimeTypeSupported(String serverFactoryId, String runtimeId, String typeId)  
-  {
-    //Ensure there is at least one service runtime that supports the given type
-    String[] serviceRuntimes = getServiceRuntimesByServiceType(typeId);
-    if (serviceRuntimes!=null && serviceRuntimes.length>0)
-    {
-      //Ensure that at least one of these server runtimes supports the given server
-      for (int i=0; i<serviceRuntimes.length; i++)
-      {
-        ServiceRuntimeDescriptor desc = getServiceRuntimeDescriptorById(serviceRuntimes[i]);
-        if (desc.getRuntime().getId().equals(runtimeId))
-        {
-          //Matches the type and the runtime. Check if it matches the server
-          Set runtimes = getRuntimes(desc.getRequiredFacetVersions());
-          String[] fIds = getServerFactoryIdsByFacetRuntimes(runtimes);
-          for (int j=0; j<fIds.length; j++)
-          {
-            if (fIds[j].equals(serverFactoryId))
-            {
-              return true;
-            }
-          }          
-        }        
-      }
-    }
-    
-    //didn't find a match. return false.
-    return false;
-  }  
-  
-  public static String[] getWebServiceTypeBySelection(IStructuredSelection selection)
-  {
-    TypeSelectionFilter2 tsf = new TypeSelectionFilter2();
-    String[] wst = tsf.getWebServiceTypeByInitialSelection(selection, registry.webServiceTypesList_);
-    return wst == null ? null : wst;
-  }    
-  
-  /*
-   * @param runtimeId : id of a RuntimeDescriptor
-   * @param factoryId : id of a server type
-   */
-  public static boolean doesRuntimeSupportServerForServiceSide(String runtimeId, String factoryId)
-  {
-    //Get all the ServiceRuntimeDescriptors that point to this runtimeId
-    Iterator iter = registry.serviceRuntimes_.values().iterator();
-    while (iter.hasNext())   
-    {
-      ServiceRuntimeDescriptor desc = (ServiceRuntimeDescriptor)iter.next();
-      //check if this service runtime points to runtimeId
-      String thisRuntimeId = desc.getRuntime().getId();
-      if (thisRuntimeId.equals(runtimeId))
-      {
-        Set facetRuntimes = getRuntimes(desc.getRequiredFacetVersions());
-        String[] fIds = getServerFactoryIdsByFacetRuntimes(facetRuntimes);
-        for (int j=0; j<fIds.length; j++)
-        {
-          if (fIds[j].equals(factoryId))
-          {
-            return true;
-          }
-        }              
-      }            
-    }
-    
-    //No service runtime matched. Return false.
-    return false;
-  }
-  
-  /*
-   * @param runtimeId: id of a RuntimeDescriptor
-   * @return: server factory id
-   */
-  public static String getFirstSupportedServerForServiceSide(String runtimeId)
-  {
-    //Get all the ServiceRuntimeDescriptors that point to this runtimeId
-    Iterator iter = registry.serviceRuntimes_.values().iterator();
-    while (iter.hasNext())   
-    {
-      ServiceRuntimeDescriptor desc = (ServiceRuntimeDescriptor)iter.next();
-      //check if this service runtime points to runtimeId
-      String thisRuntimeId = desc.getRuntime().getId();
-      if (thisRuntimeId.equals(runtimeId))
-      {
-        Set facetRuntimes = getRuntimes(desc.getRequiredFacetVersions());
-        String[] factoryIds = getServerFactoryIdsByFacetRuntimes(facetRuntimes);
-        if (factoryIds!=null && factoryIds.length >0)
-        {
-          return factoryIds[0];
-        }
-      }            
-    }
-    
-    //didn't get a single suitable server type id, return null.
-    return null;
-  }  
-  
-  public static String[] getProjectsForServiceTypeAndRuntime(String typeId, String runtimeId)
-  {
-    IProject[] projects = FacetUtils.getAllProjects();
-    ArrayList validProjects = new ArrayList();
-    
-    for (int i=0; i<projects.length;i++)
-    {
-      if (doesServiceTypeAndRuntimeSupportProject(typeId, runtimeId, projects[i].getName()))
-      {
-        validProjects.add(projects[i].getName());        
-      }      
-    }
-    
-    return (String[])validProjects.toArray(new String[0]);
-    
-  }
-  
-  public static boolean doesServiceTypeAndRuntimeSupportProject(String typeId, String runtimeId, String projectName)
-  {
-    String[] descs = getServiceRuntimesByServiceType(typeId);
-    for (int j = 0; j < descs.length; j++)
-    {
-      ServiceRuntimeDescriptor desc = getServiceRuntimeDescriptorById(descs[j]);
-      if (desc.getRuntime().getId().equals(runtimeId))
-      {
-        if (doesServiceRuntimeSupportProject(descs[j], projectName))
-        {
-          return true;
-        }
-      }
-    }
-    
-    return false;    
-    
-  }  
-  public static boolean doesServiceRuntimeSupportProject(String serviceRuntimeId, String projectName)
-  {
-    FacetMatcher fm = FacetMatchCache.getInstance().getMatchForProject(false, serviceRuntimeId, projectName);
-    if (fm != null)
-    {
-      return fm.isMatch();
-    }
-    else
-    {
-      return false;
-    }    
-  }  
-  
-  /*
-   * Returns a list of valid faceted project template ids
-   * @param typeId id of the form "0/implId" on the service side.
-   * @param runtimeId id of a RuntimeDescriptor
-   * 
-   * @return String[] array of IFacetedProjectTemplate ids
-   */
-  public static String[] getServiceProjectTemplates(String typeId, String runtimeId)
-  {
-    String[] srIds = getServiceRuntimesByServiceType(typeId);
-    if (srIds == null)
-    {
-      return null;
-    }
-
-    ArrayList templateIdList = new ArrayList();
-    for (int i = 0; i < srIds.length; i++)
-    {
-      ServiceRuntimeDescriptor desc = getServiceRuntimeDescriptorById(srIds[i]);
-      String thisRuntimeId = desc.getRuntime().getId();
-      if (thisRuntimeId.equals(runtimeId))
-      {
-        //Get the templates for this client runtime
-        Set templates = FacetMatchCache.getInstance().getTemplatesForServiceRuntime(desc.getId());
-        
-        //Add the template ids to the list if they have not already been added
-        Iterator itr = templates.iterator();
-        while (itr.hasNext())
-        {
-          IFacetedProjectTemplate template = (IFacetedProjectTemplate)itr.next();
-          if (!templateIdList.contains(template.getId()))
-          {
-            templateIdList.add(template.getId());
-          }
-        }
-      }
-      
-    }  
-    
-    return (String[])templateIdList.toArray(new String[]{});    
-  }
-
-  public static boolean doesServiceTypeAndRuntimeSupportTemplate(String typeId, String runtimeId, String templateId)
-  {
-    String[] srIds = getServiceRuntimesByServiceType(typeId);
-    if (srIds == null)
-    {
-      return false;
-    }
-
-    for (int i = 0; i < srIds.length; i++)
-    {
-      ServiceRuntimeDescriptor desc = getServiceRuntimeDescriptorById(srIds[i]);
-      String thisRuntimeId = desc.getRuntime().getId();
-      if (thisRuntimeId.equals(runtimeId))
-      {
-        //Get the templates for this service runtime
-        Set templates = FacetMatchCache.getInstance().getTemplatesForServiceRuntime(srIds[i]);
-        
-        //Check if any of the template ids match the given one.
-        Iterator itr = templates.iterator();
-        while (itr.hasNext())
-        {
-          IFacetedProjectTemplate template = (IFacetedProjectTemplate)itr.next();
-          if (template.getId().equals(templateId))
-          {
-            return true;
-          }
-
-        }
-      }
-      
-    }  
-    
-    return false;    
-  }
-  
-  public static boolean doesServiceRuntimeSupportTemplate(String serviceRuntimeId, String templateId)
-  {
-    //Get the templates for this service runtime
-    Set templates = FacetMatchCache.getInstance().getTemplatesForServiceRuntime(serviceRuntimeId);
-    IFacetedProjectTemplate checkingTemplate = ProjectFacetsManager.getTemplate(templateId);
-    return templates.contains(checkingTemplate);
-  }  
-  
-  //Client-side utilities
-  public static WebServiceClientImpl getWebServiceClientImplById(String id)
-  {
-    Object result = registry.webServiceClientImpls_.get(id);
-    if (result!=null)
-    {
-      return (WebServiceClientImpl)result;
-    }
-    return null;    
-  }
-  
-  public static ClientRuntimeDescriptor getClientRuntimeDescriptorById(String id)
-  {
-    Object result = registry.clientRuntimes_.get(id);
-    if (result!=null)
-    {
-      return (ClientRuntimeDescriptor)result;
-    }
-    return null;        
-  }    
-  
-  public static IWebServiceRuntime getClientRuntime( String clientRuntimeId )
-  {
-    ClientRuntimeDescriptor descriptor = getClientRuntimeDescriptorById(clientRuntimeId);
-    IWebServiceRuntime    webserviceRuntime     = null;
-    if (descriptor != null)
-    {
-        webserviceRuntime = descriptor.getWebServiceRuntime();
-    }
-    
-    return webserviceRuntime;
-  }
-  
-  public static String getClientRuntimeId(TypeRuntimeServer trs, String projectName, String templateId)
-  {
-    //Find the first client runtime that supports the implementation type, runtime, server, and project
-    String[] descs = getClientRuntimesByType(trs.getTypeId());
-    for (int i=0; i<descs.length; i++)
-    {
-      ClientRuntimeDescriptor desc = getClientRuntimeDescriptorById(descs[i]);      
-      if (desc.getRuntime().getId().equals(trs.getRuntimeId()))
-      {
-        boolean supportsServer = doesClientRuntimeSupportServer(desc.getId(), trs.getServerId());
-        if (!supportsServer)
-        {
-          continue;
-        }
-        
-        IProject project = ProjectUtilities.getProject(projectName);
-        if (project.exists())
-        {
-          if (doesClientRuntimeSupportProject(desc.getId(), projectName))
-          {
-            return desc.getId();
-          }
-        }
-        else
-        {
-          //Check if template is supported
-          if (doesClientRuntimeSupportTemplate(desc.getId(), templateId))
-          {
-            return desc.getId();
-          }
-        }
-      }
-    }
-    
-    return "";
-    
-  }
-  
-  /*
-   * @return String[] array of ids of RuntimeDescriptors
-   */
-  public static String[] getAllRuntimesForClientSide() 
-  {
-    ArrayList runtimeIds = new ArrayList();
-    Iterator iter = registry.clientRuntimes_.values().iterator();
-    while (iter.hasNext())   
-    {
-      ClientRuntimeDescriptor desc = (ClientRuntimeDescriptor)iter.next();
-      String thisRuntimeId = desc.getRuntime().getId(); 
-      if (!runtimeIds.contains(thisRuntimeId))
-      runtimeIds.add(thisRuntimeId);
-    }      
-    return (String[])runtimeIds.toArray(new String[]{});
-  }
-  
-  /*
-   * @param clientImpld The id of a client implementation type
-   * 
-   * @returns String[] containing the ids of all clientRuntimes that
-   * support this client implementation type
-   */
-  public static String[] getClientRuntimesByType(String clientImplId) 
-  {
-    ArrayList ids = new ArrayList();
-    Iterator iter = registry.clientRuntimes_.values().iterator();
-    while (iter.hasNext())   
-    {
-      ClientRuntimeDescriptor desc = (ClientRuntimeDescriptor)iter.next();
-      //Check if this serviceRuntime supports the implementation type
-      if (desc.getClientImplementationType().getId().equals(clientImplId))
-      {
-        ids.add(desc.getId());
-      }
-    }
-    
-    return (String[])ids.toArray(new String[]{});
-  }  
-  
-  /*
-   * @param clientImplId id of a WebServiceClientImpl
-   * @return String[] array of RuntimeDescriptor ids
-   */
-  public static String[] getRuntimesByClientType(String clientImplId) 
-  {
-    ArrayList runtimeIds = new ArrayList();
-    Iterator iter = registry.clientRuntimes_.values().iterator();
-    while (iter.hasNext())   
-    {
-      ClientRuntimeDescriptor desc = (ClientRuntimeDescriptor)iter.next();
-      //Check if this serviceRuntime supports the implementation type
-      if (desc.getClientImplementationType().getId().equals(clientImplId))
-      {
-        runtimeIds.add(desc.getRuntime().getId());
-      }
-    }
-    
-    return (String[])runtimeIds.toArray(new String[]{});
-  }
-  
-  /*
-   * @param clientImplId The id of a client implementation type
-   * @param runtimeId id of a runtime (RuntimeDescriptor)
-   */  
-  public static boolean isRuntimeSupportedForClientType(String clientImplId, String runtimeId)
-  {
-    String[] clientRuntimeIds = getClientRuntimesByType(clientImplId);
-    if (clientRuntimeIds!=null)
-    {
-      for (int i=0; i < clientRuntimeIds.length; i++)
-      {
-        ClientRuntimeDescriptor desc = getClientRuntimeDescriptorById(clientRuntimeIds[i]);
-        if (desc.getRuntime().getId().equals(runtimeId))
-        {
-          return true;
-        }
-      }
-    }
-    
-    return false;
-  }
-  
-  public static String[] getAllClientServerFactoryIds() 
-  {    
-    //Iterator iter = registry.clientRuntimes_.values().iterator();
-    //while (iter.hasNext())   
-    //{
-      //TODO iterate over all the server types and see if their runtime types have an
-      //id that matches the runtime type of any of the runtimes.            
-      // ClientRuntimeDescriptor desc = (ClientRuntimeDescriptor)iter.next();
-      // Set runtimes = getRuntimes(desc.getRequiredFacetVersions());
-      // IServerType[] allServerTypes = ServerCore.getServerTypes();
-    //}
-    //return (String[])serverFactoryIds.toArray(new String[]{});
-    //Temporarily return all server types
-    return getAllServerFactoryIdsWithRuntimes();    
-  }
-  
-  public static String[] getServerFactoryIdsByClientType(String clientImplId)
-  {
-    ArrayList serverFactoryIds = new ArrayList();
-    String[] crts = getClientRuntimesByType(clientImplId);
-    if (crts != null)
-    {
-      for (int i = 0; i < crts.length; i++)
-      {
-        //Get the runtimes that work for the facets required for this service runtime        
-        String[] fIds = getServerFactoryIdsByClientRuntime(crts[i]);
-        for (int j=0; j<fIds.length; j++)
-        {
-          if (!serverFactoryIds.contains(fIds[j]))
-          {
-            serverFactoryIds.add(fIds[j]);            
-          }
-        }
-      }        
-    }
-    
-    return (String[])serverFactoryIds.toArray(new String[]{});
-  }  
-  
-  /*
-   * 
-   */
-  public static boolean isServerSupportedForChosenClientType(String clientImplId, String serverFactoryId)
-  {
-    String[] fIds = getServerFactoryIdsByClientType(clientImplId);
-    if (fIds == null)
-    {
-      return false;
-    }
-
-    for (int i=0;i<fIds.length;i++)
-    {
-      if (serverFactoryId.equals(fIds[i]))
-      {
-        return true;
-      }      
-    }
-    
-    return false;
-  }  
-  
-  /*
-   * @prarm clientRuntimeId : id of a ClientRuntimeDescriptor
-   * 
-   */
-  public static String[] getServerFactoryIdsByClientRuntime(String clientRuntimeId)
-  {       
-    ClientRuntimeDescriptor desc = getClientRuntimeDescriptorById(clientRuntimeId);
-    Set facetRuntimes = getRuntimes(desc.getRequiredFacetVersions());
-
-    String[] fIds = getServerFactoryIdsByFacetRuntimes(facetRuntimes);
-    return fIds;    
-  }    
-
-  /*
-   * @param clientRuntimeId id of a ClientRuntimeDescriptor
-   */
-  public static boolean doesClientRuntimeSupportServer(String clientRuntimeId, String serverFactoryId)
-  {
-    String[] serverIds = getServerFactoryIdsByClientRuntime(clientRuntimeId);
-    for (int i=0; i<serverIds.length; i++)
-    {
-      if (serverIds[i].equals(serverFactoryId))
-      {
-        return true;
-      }
-    }
-    
-    return false;
-  }
-  
-  /*
-   * @param runtimeId : id of a RuntimeDescriptor
-   * @param factoryId : id of a server type
-   */
-  public static boolean doesRuntimeSupportServerForClientSide(String runtimeId, String factoryId)
-  {
-    //Get all the ClientRuntimeDescriptors that point to this runtimeId
-    Iterator iter = registry.clientRuntimes_.values().iterator();
-    while (iter.hasNext())   
-    {
-      ClientRuntimeDescriptor desc = (ClientRuntimeDescriptor)iter.next();
-      //check if this client runtime points to runtimeId
-      String thisRuntimeId = desc.getRuntime().getId();
-      if (thisRuntimeId.equals(runtimeId))
-      {
-        Set facetRuntimes = getRuntimes(desc.getRequiredFacetVersions());
-        String[] fIds = getServerFactoryIdsByFacetRuntimes(facetRuntimes);
-        for (int i=0; i<fIds.length; i++)
-        {
-          if (fIds[i].equals(factoryId))
-          {
-            return true;
-          }
-        }
-      }            
-    }
-    
-    //No match.
-    return false;
-  }    
-  
-  /*
-   * @param runtimeId: id of a RuntimeDescriptor
-   * @return: server factory id
-   */
-  public static String getFirstSupportedServerForClientSide(String runtimeId)
-  {
-    //Get all the ClientRuntimeDescriptors that point to this runtimeId
-    Iterator iter = registry.clientRuntimes_.values().iterator();
-    while (iter.hasNext())   
-    {
-      ClientRuntimeDescriptor desc = (ClientRuntimeDescriptor)iter.next();
-      //check if this service runtime points to runtimeId
-      String thisRuntimeId = desc.getRuntime().getId();
-      if (thisRuntimeId.equals(runtimeId))
-      {
-        Set facetRuntimes = getRuntimes(desc.getRequiredFacetVersions());
-        String[] factoryIds = getServerFactoryIdsByFacetRuntimes(facetRuntimes);
-        if (factoryIds!=null && factoryIds.length >0)
-        {
-          return factoryIds[0];
-        }
-      }            
-    }
-    
-    //No suitable servers found. Return null.
-    return null;
-
-  }
-  
-  /*
-   * @param clientImplId is the id of a WebServiceClientImpl
-   * @param runtimeId is the id of a RuntimeDescriptor
-   * @param serverFactoryId server factory id
-   */    
-  public static boolean isServerClientRuntimeTypeSupported(String serverFactoryId, String runtimeId, String clientImplId)  
-  {
-    //Ensure there is at least one client runtime that supports the given type
-    String[] clientRuntimes = getClientRuntimesByType(clientImplId);
-    if (clientRuntimes!=null && clientRuntimes.length>0)
-    {
-      //Ensure that at least one of these server runtimes supports the given server
-      for (int i=0; i<clientRuntimes.length; i++)
-      {
-        ClientRuntimeDescriptor desc = getClientRuntimeDescriptorById(clientRuntimes[i]);
-        if (desc.getRuntime().getId().equals(runtimeId))
-        {
-          //Matched type and runtime. Check the server.
-          String[] factoryIds = getServerFactoryIdsByClientRuntime(desc.getId());
-          for (int j=0; j<factoryIds.length; j++)
-          {
-            if (factoryIds[j].equals(serverFactoryId))
-            {
-              return true;
-            }
-          }
-        }
-      }
-    }
-    
-    //No match found. return false.
-    return false;
-  }    
-  
-  /*
-   * Returns a set of templates supported by th given client runtime
-   * @returns Set (type: IFacetedProjectTemplate)
-   */
-  /*
-  private static Set getTemplatesForClientRuntime(String clientRuntimeId)
-  {
-    Set templates = (Set)registry.templatesByClientRuntimeId_.get(clientRuntimeId);
-    if (templates != null)
-    {
-      //Return the cached set of templates.
-      return templates;
-    }
-    else
-    {
-      //Calculate the templates, cache them for later use, and return them.
-      ClientRuntimeDescriptor desc = getClientRuntimeDescriptorById(clientRuntimeId);
-      //Set validTemplates = FacetUtils.getTemplates(desc.getRequiredFacetVersions());
-      Set validTemplates = FacetMatchCache.getInstance().getTemplates(desc.getRequiredFacetVersions());
-      registry.templatesByClientRuntimeId_.put(clientRuntimeId, validTemplates);
-      return validTemplates;
-    }
-  }
-  */
-  /*
-   * Returns a list of valid faceted project template ids
-   * @param clientImplId id of a WebServiceClientImpl
-   * @param runtimeId id of a RuntimeDescriptor
-   * 
-   * @return String[] array of IFacetedProjectTemplate ids
-   */
-  public static String[] getClientProjectTemplates(String clientImplId, String runtimeId)
-  {
-    String[] crIds = getClientRuntimesByType(clientImplId);
-    if (crIds == null)
-    {
-      return null;
-    }
-
-    ArrayList templateIdList = new ArrayList();
-    for (int i = 0; i < crIds.length; i++)
-    {
-      ClientRuntimeDescriptor desc = getClientRuntimeDescriptorById(crIds[i]);
-      String thisRuntimeId = desc.getRuntime().getId();
-      if (thisRuntimeId.equals(runtimeId))
-      {
-        //Get the templates for this client runtime
-        Set templates = FacetMatchCache.getInstance().getTemplatesForClientRuntime(desc.getId());
-        
-        //Add the template ids to the list if they have not already been added
-        Iterator itr = templates.iterator();
-        while (itr.hasNext())
-        {
-          IFacetedProjectTemplate template = (IFacetedProjectTemplate)itr.next();
-          if (!templateIdList.contains(template.getId()))
-          {
-            templateIdList.add(template.getId());
-          }
-        }
-      }
-      
-    }  
-    
-    return (String[])templateIdList.toArray(new String[]{});    
-  }  
-  
-  public static boolean doesClientTypeAndRuntimeSupportTemplate(String clientImplId, String runtimeId, String templateId)
-  {
-    String[] crIds = getClientRuntimesByType(clientImplId);
-    if (crIds == null)
-    {
-      return false;
-    }
-
-    for (int i = 0; i < crIds.length; i++)
-    {
-      ClientRuntimeDescriptor desc = getClientRuntimeDescriptorById(crIds[i]);
-      String thisRuntimeId = desc.getRuntime().getId();
-      if (thisRuntimeId.equals(runtimeId))
-      {
-        //Get the templates for this client runtime
-        Set templates = FacetMatchCache.getInstance().getTemplatesForClientRuntime(crIds[i]);
-        
-        //Check if the template ids contains the template we're checking for
-        Iterator itr = templates.iterator();
-        while (itr.hasNext())
-        {
-          IFacetedProjectTemplate template = (IFacetedProjectTemplate)itr.next();
-          if (template.getId().equals(templateId))
-          {
-            return true;
-          }
-        }
-      }
-      
-    }  
-    
-    return false;    
-  }  
-  
-
-  public static boolean doesClientRuntimeSupportTemplate(String clientRuntimeId, String templateId)
-  {
-    //ClientRuntimeDescriptor desc = getClientRuntimeDescriptorById(clientRuntimeId);
-
-    //Get the templates for this client runtime
-    Set templates = FacetMatchCache.getInstance().getTemplatesForClientRuntime(clientRuntimeId);
-    IFacetedProjectTemplate checkingTemplate = ProjectFacetsManager.getTemplate(templateId);
-    return templates.contains(checkingTemplate);
-  }
-  
-    
-  public static LabelsAndIds getClientTypeLabels()
-  {
-    
-    LabelsAndIds labelIds = new LabelsAndIds();
-    String[] idsArray = new String[0];
-    String[] labelsArray = new String[0];
-    labelIds.setIds_(idsArray);
-    labelIds.setLabels_(labelsArray);
-  
-    ArrayList ids = new ArrayList();
-    ArrayList labels = new ArrayList();
-  
-    Iterator itr = registry.clientRuntimes_.values().iterator();
-    while(itr.hasNext())
-    {
-      ClientRuntimeDescriptor desc = (ClientRuntimeDescriptor)itr.next();
-      WebServiceClientImpl thisClientImpl = desc.getClientImplementationType();
-      if (!ids.contains(thisClientImpl.getId()))
-      {
-        ids.add(thisClientImpl.getId());
-        labels.add(thisClientImpl.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;
-
-  }  
-  
-  public static String[] getAllServerFactoryIdsWithRuntimes()
-  {
-    ArrayList fids = new ArrayList();
-    IServerType[] sts = ServerCore.getServerTypes();
-    org.eclipse.wst.server.core.IRuntime[] rts = ServerCore.getRuntimes();
-    
-    for (int i=0; i<sts.length; i++)
-    {
-      IServerType st = sts[i];
-      for (int j=0; j<rts.length; j++)
-      {
-        org.eclipse.wst.server.core.IRuntime rt = rts[j];
-        // If the server type has the same runtime type as this runtime, add it to the list
-        String serverTypeRuntimeTypeId = st.getRuntimeType().getId();
-        String runtimeRuntimeTypeId = rt.getRuntimeType().getId();
-        if (serverTypeRuntimeTypeId.equals(runtimeRuntimeTypeId))
-        {
-          if (!fids.contains(st.getId()))
-          {
-            fids.add(st.getId());
-          }
-        }
-      }
-    }
-   
-    return (String[])fids.toArray(new String[0]);
-  }
-  
-  public static String[] getProjectsForClientTypeAndRuntime(String typeId, String runtimeId)
-  {
-    //String[] descs = getClientRuntimesByType(typeId);
-    IProject[] projects = FacetUtils.getAllProjects();
-    ArrayList validProjects = new ArrayList();
-    
-    for (int i=0; i<projects.length;i++)
-    {
-      if (doesClientTypeAndRuntimeSupportProject(typeId, runtimeId, projects[i].getName()))
-      {
-        validProjects.add(projects[i].getName());        
-      }      
-    }
-    
-    return (String[])validProjects.toArray(new String[0]);
-    
-  }  
-  
-  public static boolean doesClientTypeAndRuntimeSupportProject(String typeId, String runtimeId, String projectName)
-  {
-    String[] descs = getClientRuntimesByType(typeId);
-    for (int j = 0; j < descs.length; j++)
-    {
-      ClientRuntimeDescriptor desc = getClientRuntimeDescriptorById(descs[j]);
-      if (desc.getRuntime().getId().equals(runtimeId))
-      {
-        if (doesClientRuntimeSupportProject(descs[j], projectName))
-        {
-          return true;
-        }
-      }
-    }
-    
-    return false;
-    
-    
-  }  
-  
-  
-  public static boolean doesClientRuntimeSupportProject(String clientRuntimeId, String projectName)
-  {
-    FacetMatcher fm = FacetMatchCache.getInstance().getMatchForProject(true, clientRuntimeId, projectName);
-    if (fm != null)
-    {
-      return fm.isMatch();
-    }
-    else
-    {
-      return false;
-    }
-  }
-  
-  //Utilities used by the ServerRuntimePreferencePage
-  
-  private static SelectionListChoices serverToRuntimeToJ2EE_;
-  private static Hashtable serverFactoryIdByLabel_;
-  private static Hashtable runtimeIdByLabel_;
-  
-  public static SelectionListChoices getServerToRuntimeToJ2EE()
-  {
-    if (serverToRuntimeToJ2EE_!=null)
-    {
-      return serverToRuntimeToJ2EE_;
-    }
-    
-    //String[] servers = getStringArrayIntersection(getAllServerFactoryIds(), WebServiceClientTypeRegistry.getInstance().getAllClientServerFactoryIds());
-    String[] servers = getAllServerFactoryIds();
-    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 static SelectionListChoices getRuntimeChoices(String serverFactoryId)
-  {
-    //Return all the runtimes for now.
-    Set runtimes = registry.runtimes_.keySet();
-    Iterator itr = registry.runtimes_.keySet().iterator();
-    String[] runtimeIds = new String[runtimes.size()];
-    //TODO String[] runtimeIds = getRuntimeIDsByServerFactoryID(serverFactoryId);    
-    int i = 0;
-    while (itr.hasNext())
-    {
-      String runtimeId = (String)itr.next();
-      runtimeIds[i] = runtimeId;
-      i++;
-     
-    }
-
-    SelectionList runtimesList = new SelectionList(runtimeIds, 0);
-    Vector choices = new Vector();
-    for (int j=0; j<runtimeIds.length; j++)
-    {
-      choices.add(getJ2EEChoices(runtimeIds[j]));
-    }
-    return new SelectionListChoices(runtimesList, choices);    
-  }  
-  
-  private static SelectionListChoices getJ2EEChoices(String runtimeId)
-  {
-    //J2EE levels will be removed from the Server Runtime preference page.
-    //Return some hard coded values for now.
-    String[] j2eeVersions = new String[]{"13", "14"};
-    SelectionList j2eeVersionsList = new SelectionList(j2eeVersions, 0);
-    return new SelectionListChoices(j2eeVersionsList, null);        
-  }  
-  
-  private static String[] getAllServerFactoryIds()
-  {
-    //Return all server type ids for now.
-    //TODO Only the servers that are appropriate for the Web service runtimes should be displayed.
-    ArrayList ids = new ArrayList();
-    if (serverFactoryIdByLabel_ == null)
-    {
-      serverFactoryIdByLabel_ = new Hashtable();
-      IServerType[] serverTypes = ServerCore.getServerTypes();
-      for (int i=0; i<serverTypes.length; i++)
-      {
-        String id = serverTypes[i].getId();
-        String label = getServerLabelById(id);
-        serverFactoryIdByLabel_.put(label, id);
-        ids.add(id);
-      }    
-    }
-    else
-    {
-      Iterator fids =  serverFactoryIdByLabel_.values().iterator();
-      while (fids.hasNext())
-      {
-        String fid = (String)fids.next();
-        ids.add(fid);
-      }           
-    }
-    
-    if (ids.size() > 0)
-    {
-      String[] serverFactoryIds = (String[])ids.toArray(new String[0]);
-      return serverFactoryIds;
-    }
-    
-    return null;
-  }  
-  
-  //TODO this needs to be implemented once facet runtime to server runtime bridge is available.
-  /*
-  private static String[] getRuntimeIDsByServerFactoryID(String serverFactoryID) 
-  {
-    ArrayList ids = new ArrayList();
-    Iterator iter = registry.webServiceRuntimes_.values().iterator();
-    while (iter.hasNext())
-    {
-      WebServiceRuntimeInfo wsr = (WebServiceRuntimeInfo)iter.next();
-      if (doesRuntimeSupportServer(wsr.getId(), serverFactoryID))
-      {
-        ids.add(wsr.getId());
-      }
-      
-    }
-    
-    if (ids.size() > 0)
-    {
-      String[] runtimeIds = (String[])ids.toArray(new String[0]);
-      return runtimeIds;
-    }
-    
-    return null;    
-    
-    
-  }
-  */
-  
-  public static String getServerFactoryId(String label)
-  {
-    if (label==null || label.length()==0)
-      return null;
-    
-    if (serverFactoryIdByLabel_ == null)
-    {
-      getAllServerFactoryIds();
-    }
-    
-    if (serverFactoryIdByLabel_.containsKey(label))
-    {
-      return (String)serverFactoryIdByLabel_.get(label);  
-    }
-    else
-    {
-      return null;
-    }       
-  }  
-  
-  public static String getRuntimeId(String label)
-  {
-    
-    if (label==null || label.length()==0)
-      return null;
-    
-    if (runtimeIdByLabel_ == null)
-    {
-      runtimeIdByLabel_ = new Hashtable();
-      Iterator iter = registry.runtimes_.values().iterator();
-      while (iter.hasNext())
-      {
-        RuntimeDescriptor desc = (RuntimeDescriptor)iter.next();
-        runtimeIdByLabel_.put(desc.getLabel(), desc.getId());        
-      }      
-    }
-    
-    return (String)runtimeIdByLabel_.get(label);    
-  }    
-  
-    
-  private static Set getRuntimes(RequiredFacetVersion[] requiredFacetVersions)
-  {
-    return FacetUtils.getRuntimes(requiredFacetVersions);
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeInfo.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeInfo.java
deleted file mode 100644
index a69832c3d..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeInfo.java
+++ /dev/null
@@ -1,208 +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.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.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)
-		{
-			ce.printStackTrace();
-		}
-	}
-	
-	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 7c69b4f1a..000000000
--- 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.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.consumption/.cvsignore b/bundles/org.eclipse.jst.ws.consumption/.cvsignore
deleted file mode 100644
index bd9ea09c5..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-build.xml
-temp.folder
-webserviceutils.jar
-wsc.jar
-webserviceutilssrc.zip
-wscsrc.zip
diff --git a/bundles/org.eclipse.jst.ws.consumption/.project b/bundles/org.eclipse.jst.ws.consumption/.project
deleted file mode 100644
index 2a89cfa56..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/.project
+++ /dev/null
@@ -1,32 +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>
-	</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/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.consumption/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 1426bed8a..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,57 +0,0 @@
-#Mon Jan 30 10:35:51 EST 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/bundles/org.eclipse.jst.ws.consumption/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.jst.ws.consumption/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 813550758..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Jan 30 10:41:25 EST 2006
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.jst.ws.consumption/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.consumption/META-INF/MANIFEST.MF
deleted file mode 100644
index c7feffe41..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,60 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.consumption; singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-ClassPath: wsc.jar,
- webserviceutils.jar
-Bundle-Activator: org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.consumption,
- org.eclipse.jst.ws.internal.consumption.codegen,
- org.eclipse.jst.ws.internal.consumption.codegen.bean,
- org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitoractions,
- org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors,
- org.eclipse.jst.ws.internal.consumption.command.common,
- org.eclipse.jst.ws.internal.consumption.common,
- org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel,
- org.eclipse.jst.ws.internal.consumption.datamodel.validate,
- org.eclipse.jst.ws.internal.consumption.datamodel.wsdlmodel,
- org.eclipse.jst.ws.internal.consumption.fragments,
- org.eclipse.jst.ws.internal.consumption.plugin,
- org.eclipse.jst.ws.internal.consumption.sampleapp.codegen,
- org.eclipse.jst.ws.internal.consumption.sampleapp.command,
- org.eclipse.jst.ws.internal.consumption.sampleapp.common,
- org.eclipse.jst.ws.internal.consumption.wsfinder,
- org.eclipse.jst.ws.util
-Require-Bundle: org.eclipse.jem,
- org.eclipse.jem.workbench,
- org.eclipse.emf.common,
- org.eclipse.emf.ecore,
- org.eclipse.jdt.core,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.xsd,
- org.eclipse.debug.core,
- org.eclipse.jst.ws,
- org.eclipse.jdt.launching,
- org.eclipse.wst.command.env.core,
- org.eclipse.wst.command.env,
- org.eclipse.jem.workbench,
- org.eclipse.jface,
- org.eclipse.wst.ws,
- org.eclipse.wst.ws.parser,
- org.eclipse.wst.server.core,
- org.eclipse.wst.wsdl,
- org.eclipse.wst.internet.monitor.core,
- org.eclipse.jst.j2ee.core,
- org.eclipse.jst.j2ee.ejb,
- org.eclipse.jst.j2ee,
- org.eclipse.jst.j2ee.web,
- org.eclipse.wst.common.emfworkbench.integration,
- org.eclipse.wst.common.frameworks,
- org.wsdl4j,
- org.eclipse.jem.util,
- org.eclipse.wst.common.uriresolver,
- org.eclipse.wst.common.environment,
- org.eclipse.wst.common.project.facet.core,
- org.eclipse.jst.server.core
-Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.jst.ws.consumption/about.html b/bundles/org.eclipse.jst.ws.consumption/about.html
deleted file mode 100644
index 6f6b96c4c..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption/build.properties b/bundles/org.eclipse.jst.ws.consumption/build.properties
deleted file mode 100644
index 31b6245e1..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/build.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-source.wsc.jar = src/
-source.webserviceutils.jar = webserviceutils/
-jars.compile.order = wsc.jar,\
-                     webserviceutils.jar
-bin.includes = plugin.properties,\
-               plugin.xml,\
-               wsc.jar,\
-               webserviceutils.jar,\
-               META-INF/,\
-               about.html
-jars.extra.classpath = ../org.apache.axis/lib/saaj.jar
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 f484e2606..000000000
--- 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 f6640aacf..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/plugin.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
-   <!-- The following extension point is internal and likely to be removed in a future release. -->
-   <extension-point
-      id="wsfinder"
-      name="%XP_WSFINDER"/>
-
-   <!-- The following extension point is internal and likely to be removed in a future release. -->
-   <extension-point
-      id="webServiceStartServerType"
-      name="%XP_WEB_SERVICE_START_SERVER_TYPE"/>
-
-   <!-- The following extension point is internal and likely to be removed in a future release. -->
-   <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>
-      <webServiceStartServerType
-            factoryId="org.eclipse.jst.server.geronimo.10"
-            class="org.eclipse.jst.ws.internal.consumption.command.common.StartTomcatServer"
-            id="SERVER_ID_GERONIMO10_LOCAL">
-       </webServiceStartServerType> 
-   </extension>
-   
-
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/Consumption.properties b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/Consumption.properties
deleted file mode 100644
index a2cd92c74..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/Consumption.properties
+++ /dev/null
@@ -1,180 +0,0 @@
-###############################################################################
-# Copyright (c) 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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.
-MSG_ERROR_JTS_JSP_GEN=Error in generating sample JSP
-
-# Not used
-#MSG_ERROR_CANNOT_CREATE_COMPONENT=The Web service wizard cannot automatically create component "{0}". Cancel the wizard and create the component manually.
-
-
-#
-# 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".
-
-PROPERTIES_FILTER_NAME=Properties files
-PROPERTIES_FILTER_DESC=Files with names ending in ".properties"
-PROPERTIES_FILTER_MSG_ERROR_WRONG_EXTENSION= The file "{0}" does not end in ".properties".
-
-FOLDER_FILTER_NAME=Folders
-FOLDER_FILTER_DESC=Folders.
-
-#
-# 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_ERROR_ADD_MODULE=Error occured when adding the module, {0}, to the server
-
-MSG_ERROR_CREATE_SERVER=IWAB0025E Unable to create server.
-MSG_ERROR_STUB_ONLY=Unable to create server because only stub runtimes are available for the {0} server type. Go to Window > Preferences. Select Server > Installed Runtimes to install a non-stub runtime.
-
-#
-# EJB messages
-# 4 unused messages in jst.ws and wst.ws
-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}.
-
-#
-# 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.
-
-#
-# MISC
-#
-MSG_ERROR_WEB_PROJECT_CREATE=IWAB0310E An error occurred during creation of the Web Project.
-
-#
-# CheckProjectOKCommand
-#
-MSG_ERROR_SERVER_VIEW_OPEN=IWAB0126E The server configuration editor is open for {0}.  Close it and restart the wizard.
-
-
-#
-#	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.
-
-WARN_BEAN_NAME_STARTS_WITH_LOWER_CASE
-
-#
-# 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}
-
-#
-# AssociateModuleWithEARCommand
-#
-MSG_ERROR_UNABLE_TO_ASSOCIATE=Unable to associate component {0} to ear component {1}.
-
-#
-# CreateModuleCommand
-#
-MSG_ERROR_CREATE_FLEX_PROJET=An error occured during creation of flexible project {0}.
-MSG_ERROR_CREATE_EJB_COMPONENT=An error occured during creation of EJB component {0}.
-MSG_ERROR_CREATE_APPCLIENT_COMPONENT=An error occured during creation of Application Client component {0}.
-MSG_ERROR_COMPONENT_CREATION=Unable to create project {0} and/or component {1}.
-
-
-#
-# CreateFacetedProjectCommand
-#
-MSG_ERROR_PROJECT_CREATION=Unable to create project {0}.
-
-
-#
-# PreServiceDevelopCommand
-#
-MSG_ERROR_PROJECT_DOES_NOT_EXIST=The project {0} does not exist.
-MSG_ERROR_PROJECT_IS_NOT_OPEN=The project {0} is not open.
-
-#
-# SPECIAL NOTE TO TRANSLATORS: Substitution {1} in MSG_ERROR_ADDING_FACETS_TO_PROJECT will be a delimited
-# list of translated labels. The list is formed through repeated use of MSG_FACETS.
-#
-MSG_ERROR_ADDING_FACETS_TO_PROJECT=Unable to add the follwing facets to project {0}: {1}.
-MSG_FACETS={0}, {1}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/ConsumptionMessages.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/ConsumptionMessages.java
deleted file mode 100644
index 05a2f11c5..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/ConsumptionMessages.java
+++ /dev/null
@@ -1,110 +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.consumption;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class ConsumptionMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.jst.ws.internal.consumption.Consumption";//$NON-NLS-1$
-
-	private ConsumptionMessages() {
-		// Do not instantiate
-	}
-
-	public static String MSG_ERROR_JTS_PROXY_HAS_NO_METHODS;
-	public static String MSG_ERROR_JTS_PROXY_HAS_NO_DEFAULT;
-	public static String MSG_ERROR_JTS_NO_PROXY_METHODS_PROCESSED;
-	public static String MSG_WARN_JTS_UNSUPPORTED_TYPE;
-	public static String MSG_WARN_JTS_UNSUPPORTED_INDEXED_PROPERTIES;
-	public static String MSG_WARN_JTS_UNSUPPORTED_PARAMETERS_ARRAYS;
-	public static String MSG_WARN_JTS_UNSUPPORTED_PARAMETERS_INPUTS;
-	public static String MSG_ERROR_JTS_CYCLIC_BEAN;
-	public static String MSG_WARN_JTS_PROXY_METHODS_OMITTED;
-	public static String MSG_ERROR_SAMPLE_CREATION_CANCELED;
-	public static String MSG_WARN_UNABLE_TO_FIND_PROXY;
-	public static String MSG_ERROR_JTS_JSP_GEN;
-	public static String FILTER_MSG_ERROR_NULL_OBJECT;
-	public static String FILTER_MSG_ERROR_NOT_FILE;
-	public static String FILTER_MSG_ERROR_NOT_FOLDER;
-	public static String JAVA_FILTER_NAME;
-	public static String JAVA_FILTER_DESC;
-	public static String JAVA_FILTER_MSG_ERROR_WRONG_EXTENSION;
-	public static String WSDL_FILTER_NAME;
-	public static String WSDL_FILTER_DESC;
-	public static String WSDL_FILTER_MSG_ERROR_WRONG_EXTENSION;
-	public static String ISD_FILTER_NAME;
-	public static String ISD_FILTER_DESC;
-	public static String ISD_FILTER_MSG_ERROR_WRONG_EXTENSION;
-	public static String PROPERTIES_FILTER_NAME;
-	public static String PROPERTIES_FILTER_DESC;
-	public static String PROPERTIES_FILTER_MSG_ERROR_WRONG_EXTENSION;
-	public static String FOLDER_FILTER_NAME;
-	public static String FOLDER_FILTER_DESC;
-	public static String PROGRESS_INFO_COPY_WEBSERVICE_UTILS;
-	public static String PROGRESS_INFO_COPYING_FILE;
-	public static String PROGRESS_INFO_START_WEB_PROJECT;
-	public static String PROGRESS_INFO_PUBLISHING_SERVER;
-	public static String PROGRESS_INFO_STARTING_SERVER;
-	public static String PROGRESS_INFO_PUBLISH_WEB_PROJECT;
-	public static String MSG_ERROR_PROJECT_NOT_FOUND;
-	public static String MSG_ERROR_FILECOPY_WEBSERVICE_UTILS;
-	public static String MSG_ERROR_INSTANCE_NOT_FOUND;
-	public static String MSG_ERROR_SERVER;
-	public static String MSG_ERROR_PUBLISH;
-	public static String MSG_ERROR_ADD_MODULE;
-	public static String MSG_ERROR_CREATE_SERVER;
-	public static String MSG_ERROR_STUB_ONLY;
-	public static String TASK_LABEL_CREATE_EJB_PROJECT;
-	public static String TASK_DESC_CREATE_EJB_PROJECT;
-	public static String MSG_ERROR_CANNOT_CREATE_EJB_PROJECT;
-	public static String MSG_ERROR_CANNOT_CREATE_APP_CLIENT_PROJECT;
-	public static String MSG_ERROR_CANNOT_CREATE_JAVA_PROJECT;
-	public static String MSG_ERROR_CANNOT_CREATE_EAR_PROJECT;
-	public static String TASK_LABEL_WEBSERVICE_DISABLE_VALIDATION;
-	public static String TASK_DESC_WEBSERVICE_DISABLE_VALIDATION;
-	public static String TASK_LABEL_WEBSERVICE_RESTORE_VALIDATION;
-	public static String TASK_DESC_WEBSERVICE_RESTORE_VALIDATION;
-	public static String TASK_LABEL_WEBSERVICE_DISABLE_BUILD;
-	public static String TASK_DESC_WEBSERVICE_DISABLE_BUILD;
-	public static String TASK_LABEL_WEBSERVICE_RESTORE_BUILD;
-	public static String TASK_DESC_WEBSERVICE_RESTORE_BUILD;
-	public static String MSG_ERROR_WEB_PROJECT_CREATE;
-	public static String MSG_ERROR_SERVER_VIEW_OPEN;
-	public static String MSG_WARN_JAVA_METHOD_START_WITH_UPPER_CASE;
-	public static String MSG_WARN_METHOD_NAME_INVALID;
-	public static String MSG_WARN_BOOLEAN_PROPERTY_ACCESSORS;
-	public static String MSG_WARN_PACKAGE_NAME_HAS_UPPER_CASE;
-	public static String WARN_BEAN_NAME_STARTS_WITH_LOWER_CASE;
-	public static String LABEL_OK;
-	public static String DESCRIPTION_OK;
-	public static String LABEL_CANCEL;
-	public static String DESCRIPTION_CANCEL;
-	public static String MSG_ERROR_UNABLE_TO_START_MONITOR;
-	public static String MSG_INFO_MONITORING_NOT_SUPPORTED;
-	public static String COMMAND_LABEL_COPY_WSDL;
-	public static String COMMAND_DESC_COPY_WSDL;
-	public static String MSG_ERROR_COPY_WSDL;
-	public static String MSG_ERROR_UNABLE_TO_ASSOCIATE;
-	public static String MSG_ERROR_CREATE_FLEX_PROJET;
-	public static String MSG_ERROR_CREATE_EJB_COMPONENT;
-	public static String MSG_ERROR_CREATE_APPCLIENT_COMPONENT;
-	public static String MSG_ERROR_COMPONENT_CREATION;
-	public static String MSG_ERROR_PROJECT_CREATION;
-    public static String MSG_ERROR_PROJECT_DOES_NOT_EXIST;
-    public static String MSG_ERROR_PROJECT_IS_NOT_OPEN;
-    public static String MSG_ERROR_ADDING_FACETS_TO_PROJECT;
-    public static String MSG_FACETS;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, ConsumptionMessages.class);
-	}
-}
\ No newline at end of file
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 a260ac085..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/Generator.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*******************************************************************************
- * Copyright (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.core.runtime.IStatus;
-import org.eclipse.core.runtime.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 IStatus visit (Object object)
-  {
-   //implemented by subclasses
-  	return Status.OK_STATUS;
-  }
-  
-
-}
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 fac00ac9b..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/RelVisitor.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (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.core.runtime.IStatus;
-import org.eclipse.core.runtime.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 IStatus run (Object sourceElement,VisitorAction vAction)
-  {
-  	    IStatus status = Status.OK_STATUS;
-        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 c68cdadb0..000000000
--- 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.core.runtime.IStatus;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public interface Visitor 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  public IStatus 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 9a3d6537f..000000000
--- 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.core.runtime.IStatus;
-
-
-/**
-* 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 IStatus 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 a01a64112..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/AttributeVisitor.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (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 Vector fResidentVector1;
-  private Vector fResidentVector2;
-
-   /**
-  * Constructor.
-  * 
-  */
-
-  public AttributeVisitor ()
-  {
-    super(TypeElement.REL_ATTRIBUTES);
-  }
-
-  public AttributeVisitor (String rel)
-  {
-    super(rel);
-  }
-  
-  public void setResidentString(String 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 5a9ad690a..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/FieldVisitor.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.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 Vector fResidentVector1;
-  private Vector fResidentVector2;
-
-   /**
-  * Constructor.
-  * 
-  */
-
-  public FieldVisitor ()
-  {
-    super(TypeElement.REL_FIELDS);
-  }
-  
-  public void setResidentString(String 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 34664622f..000000000
--- 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 0749312d4..000000000
--- 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 1f6207072..000000000
--- 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 d254615d7..000000000
--- 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 730077693..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsBeanVisitorAction.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.codegen.javamofvisitoractions;
-
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofMethodVisitor;
-
-
-
-
-/**
-* 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 = '_';
-
-  public DetectNonJavaCharsBeanVisitorAction ( Vector messages, Vector beans)
-  	{
-  		super (messages, beans);
-  	}
-
-  /**
-  * The visit will create the bean
-  * Walk the methods
-  * @param JavaClass the class to be used to create the bean model
-  **/
-  public IStatus 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 Status.OK_STATUS;
-   }
-
-   private void checkBeanName(String beanName)
-   	{
-	 
-	 // check if the bean starts with a lower case
-	 if ( Character.isLowerCase(beanName.charAt(0)))
-    	addMessage(ConsumptionMessages.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(ConsumptionMessages.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(ConsumptionMessages.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 16bca06e6..000000000
--- 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.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofParameterVisitor;
-
-
-/**
-* 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 IStatus 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 Status.OK_STATUS;
-	}
-
-  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(ConsumptionMessages.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(ConsumptionMessages.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(ConsumptionMessages.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(ConsumptionMessages.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 680c07964..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsParameterVisitorAction.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.codegen.javamofvisitoractions;
-
-import java.util.Vector;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-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;
-
-
-
-/**
-* 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 IStatus 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 Status.OK_STATUS;
-  }
-  
-
-  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 1a9ac05d2..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofAttributeVisitorAction.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.codegen.javamofvisitoractions;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-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.ConsumptionMessages;
-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.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.ILog;
-import org.eclipse.wst.common.environment.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
-{
-
-  /*
-  *Constructor
-  **/
-  public JavaMofAttributeVisitorAction(Element parentElement, String project, IEnvironment env)
-  {
-    super(parentElement,project, env);
-  }
-
-  public IStatus visit (Object propertyDecorator)
-  {
-  	IStatus status = Status.OK_STATUS;
-  	  	
-    //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 = StatusUtils.warningStatus( ConsumptionMessages.MSG_WARN_JTS_UNSUPPORTED_TYPE + ((JavaHelpers)pd.getPropertyType()).getJavaName() );
-	      //getStatusMonitor().reportStatus( new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
-	      //ConsumptionMessages.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 = StatusUtils.warningStatus( ConsumptionMessages.MSG_WARN_JTS_UNSUPPORTED_INDEXED_PROPERTIES + getMethod.getName() );
-	          //getStatusMonitor().reportStatus (new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
-	          //		ConsumptionMessages.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(ILog.WARNING, 5054, this, "visit", e);
-    	status = StatusUtils.warningStatus(	ConsumptionMessages.MSG_ERROR_JTS_JSP_GEN, e);
-    	try {
-			env_.getStatusHandler().report(status);
-		} catch (StatusException e1) {
-			status = StatusUtils.errorStatus(ConsumptionMessages.MSG_ERROR_JTS_JSP_GEN);
-		}
-    	return status;
-    }
-    //env.Log.write(this,"visit",ILog.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 9af115278..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofBeanVisitorAction.java
+++ /dev/null
@@ -1,425 +0,0 @@
-/*******************************************************************************
- * Copyright (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.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-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.ConsumptionMessages;
-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.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.selection.BooleanSelection;
-import org.eclipse.wst.common.environment.Choice;
-import org.eclipse.wst.common.environment.IEnvironment;
-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
-{
-
-  protected IEnvironment env_;
-  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, IEnvironment env)
-  {
-    this.clientProject = clientProject;
-    fMethodsSelected = methods;
-	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, IEnvironment env)
-  {
-    this.clientProject = clientProject;
-    fModel = model;
-	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, IEnvironment env )
-  {
-    fParentElement = parentElement;
-    this.clientProject = clientProject;
-	env_ = env;
-  }
-
-  /**
-  * The visit will create the bean
-  * Walk the methods
-  * @param JavaClass the class to be used to create the bean model
-  **/
-  public IStatus visit (Object javaclass)
-  {
-  	Choice OKChoice = new Choice('O', ConsumptionMessages.LABEL_OK, ConsumptionMessages.DESCRIPTION_OK);
-  	Choice CancelChoice = new Choice('C', ConsumptionMessages.LABEL_CANCEL, ConsumptionMessages.DESCRIPTION_CANCEL);
-  	IStatus status = Status.OK_STATUS;
-    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 = StatusUtils.warningStatus( ConsumptionMessages.MSG_ERROR_JTS_CYCLIC_BEAN );
-            //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 StatusUtils.errorStatus(ConsumptionMessages.MSG_ERROR_SAMPLE_CREATION_CANCELED );
-         }
-         	
-       }
-       //                           
-
-       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 StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_SAMPLE_CREATION_CANCELED );
-         }
-         	
-       }
-       //       
-       
-   }
-
-    //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 StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_SAMPLE_CREATION_CANCELED );
-        }
-        	
-      }
-      //                      
-      //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 = StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_JTS_NO_PROXY_METHODS_PROCESSED );
-      	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 = StatusUtils.warningStatus( ConsumptionMessages.MSG_WARN_JTS_PROXY_METHODS_OMITTED );
-      	return status;
-        //getStatusMonitor().reportStatus( new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
-        //		ConsumptionMessages.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, IStatus status)
-  {
-     // first check for a method
-     Iterator m=javaClass.getPublicMethods().iterator();
-     if (!m.hasNext()){
-     	status = StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_JTS_PROXY_HAS_NO_METHODS );
-       //getStatusMonitor().reportStatus( new Status(IStatus.ERROR,WebServiceConsumptionPlugin.ID,0,
-       //			ConsumptionMessages.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 = StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_JTS_PROXY_HAS_NO_DEFAULT );
-             //getStatusMonitor().reportStatus( new Status(IStatus.ERROR,WebServiceConsumptionPlugin.ID,0,
-             		//ConsumptionMessages.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(IEnvironment 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 143774f22..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofFieldVisitorAction.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 org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-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.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.ILog;
-import org.eclipse.wst.common.environment.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
-{
-
-  /*
-  *Constructor
-  **/
-  public JavaMofFieldVisitorAction(Element parentElement, String project, IEnvironment env)
-  {
-    super(parentElement,project, env);
-  }
-
-
-  public IStatus visit (Object field_)
-  {
-  	IStatus status = Status.OK_STATUS;
-    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 = StatusUtils.warningStatus( ConsumptionMessages.MSG_WARN_JTS_UNSUPPORTED_TYPE + ((JavaHelpers)field.getJavaClass()).getJavaName() );
-	      //getStatusMonitor().reportStatus( new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
-	      //ConsumptionMessages.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(ILog.WARNING, 5055, this, "visit", e);
-    	status = StatusUtils.warningStatus(	ConsumptionMessages.MSG_ERROR_JTS_JSP_GEN, e);
-    	try {
-    		env_.getStatusHandler().report(status);
-    	} 
-      catch (StatusException e1) 
-      {
-    		status = StatusUtils.errorStatus(ConsumptionMessages.MSG_ERROR_JTS_JSP_GEN, e1 );
-    	}
-    	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 abe72790a..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofMethodVisitorAction.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.consumption.codegen.javamofvisitoractions;
-
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-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.ConsumptionMessages;
-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.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-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 
-{
-
-  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, IEnvironment env)
-  {
-    super(parentElement,project, env);
-    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 IStatus visit (Object imethod)
-  {
-  	IStatus status = Status.OK_STATUS;
-    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 = StatusUtils.warningStatus(ConsumptionMessages.MSG_WARN_JTS_UNSUPPORTED_PARAMETERS_ARRAYS + fUnsupportedParameterName );
-        //getStatusMonitor().reportStatus (new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
-        //		ConsumptionMessages.MSG_WARN_JTS_UNSUPPORTED_PARAMETERS_ARRAYS + fUnsupportedParameterName,null));
-        fMethodsOmitted.addElement(method.getMethodElementSignature());
-        return status;
-      }
-      if(!nullConstructor(method)){
-      	status = StatusUtils.warningStatus( ConsumptionMessages.MSG_WARN_JTS_UNSUPPORTED_PARAMETERS_INPUTS + fUnsupportedParameterName );
-        //getStatusMonitor().reportStatus (new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
-       	//	ConsumptionMessages.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(); 
-    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(); 
-    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 2a1fb4547..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofParameterVisitorAction.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.codegen.javamofvisitoractions;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-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.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Choice;
-import org.eclipse.wst.common.environment.IEnvironment;
-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 
-{
-
-
-  /*
-  *Constructor
-  **/
-  public JavaMofParameterVisitorAction(Element parentElement,String project, IEnvironment env)
-  {
-    super(parentElement,project, env);
-  }
-   
-  /**
-  * Create a parameter element from the method 
-  * @param JavaParameter the mof element to be used to create the Parameter
-  **/
-  public IStatus visit (Object ijavaParameter)
-  {
-  	IStatus status = Status.OK_STATUS;
-  	Choice OKChoice = new Choice('O',ConsumptionMessages.LABEL_OK, ConsumptionMessages.DESCRIPTION_OK);
-  	Choice CancelChoice = new Choice('C', ConsumptionMessages.LABEL_CANCEL, ConsumptionMessages.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 StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_SAMPLE_CREATION_CANCELED );
-      }
-      	
-    }
-    //           
-    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 88aa4591b..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofTypeVisitorAction.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.consumption.codegen.javamofvisitoractions;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-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.TypeFactory;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Choice;
-import org.eclipse.wst.common.environment.IEnvironment;
-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
-{
-
-  /*
-  *Constructor
-  **/
-  public JavaMofTypeVisitorAction(Element parentElement,String project, IEnvironment env)
-  {
-    super(parentElement,project, env);
-  }
-
-  /**
-  * Create a type element from the JavaHelper
-  * @param JavaHelper the mof element to be used to create the Type
-  **/
-  public IStatus visit (Object typeNavigator)
-  {
-  	 IStatus status = Status.OK_STATUS;
-   	 Choice OKChoice = new Choice('O', ConsumptionMessages.LABEL_OK, ConsumptionMessages.DESCRIPTION_OK);
-  	 Choice CancelChoice = new Choice('C', ConsumptionMessages.LABEL_CANCEL, ConsumptionMessages.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))
-     {
-       BeanModelElementsFactory.getBeanModelElement(typeNavigator,fParentElement);
-     }	
-     else{
-	    if(TypeFactory.isUnSupportedType((JavaHelpers)typeNavigator)){
-	      status = StatusUtils.warningStatus( ConsumptionMessages.MSG_WARN_JTS_UNSUPPORTED_TYPE + ((JavaHelpers)typeNavigator).getJavaName() );	    	
-	      //getStatusMonitor().reportStatus( new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
-              //ConsumptionMessages.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()))
-      {
-	      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 StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_SAMPLE_CREATION_CANCELED );
-       }
-       	
-     }
-     //
-     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 35833fbd4..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/VisitorActionImpl.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.Visitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.osgi.util.NLS;
-
-
-
-
-
-/**
-* Objects of this class represent a VisitorAction.
-* It will automatically walk the methods in the JavaClass
-* */
-public abstract class VisitorActionImpl implements VisitorAction 
-{
-
-  private Vector beansVisited = null;
-  private Vector messages = null;
-
-  public VisitorActionImpl( Vector messages, Vector beansVisited)
-  	{
-  	 this.messages = messages;
-  	 this.beansVisited = beansVisited;
-  	}
-  
-  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)
-  {
-  }
-
-  protected void addMessage ( String key )
-  {
-    getMessages().add(key);
-  }
-
-  protected void addMessage ( String key, Object[] args )
-  {
-    getMessages().add(NLS.bind(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 6d2d6a044..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofAttributeVisitor.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*******************************************************************************
- * Copyright (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.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-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.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.common.environment.IEnvironment;
-
-
-/**
-* 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 IEnvironment env;
-  
-  
-  public void setEnvironment(IEnvironment 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 IStatus run ( Object javaclass, VisitorAction vAction)
-  {
-  	IStatus status = Status.OK_STATUS;
-    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);
-
-        Field field = javaClass.getFieldNamed(propertyName);
-        JavaHelpers propertyType = null; 
-        if(field != null){
-          propertyType = (JavaHelpers)field.getEType();
-          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.setEnvironment( env );
-    javaMofRef.execute(null, null);
-    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]; 	
-      jp.getJavaType().getJavaName();
-      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;
-  }
-          
-}
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 2b571f830..000000000
--- 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.core.runtime.IStatus;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.ws.internal.consumption.codegen.Visitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-
-
-
-
-/**
-* 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 IStatus 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 f693dfab0..000000000
--- 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.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.util.EList;
-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.JavaVisibilityKind;
-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.jst.ws.internal.consumption.command.common.JavaMofReflectionCommand;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-
-
-/**
-* 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 IStatus run ( Object javaclass, VisitorAction vAction)
-  {
-  	IStatus status = Status.OK_STATUS;
-    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(field))
-            status = vAction.visit(field);
-        }
-      }
-    }
-    
-    return status;
-  }       
-  private boolean fieldCheck(Field field)
-  {
-    // so its a bean make sure it has a default constructor 
-    JavaMofReflectionCommand javaMofRef = new JavaMofReflectionCommand();
-    javaMofRef.setProxyBean(((JavaHelpers)field.getEType()).getQualifiedName());
-    javaMofRef.setClientProject(getProject());
-    javaMofRef.execute(null, 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 3e37c717a..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofMethodVisitor.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.javamofvisitors;
-
-import java.util.Iterator;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-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.internal.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 IStatus run ( Object javaclass, VisitorAction vAction)
-  {
-  	IStatus status = Status.OK_STATUS;
-    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();
-        }
-        
-        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 f297c3d7f..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofParameterVisitor.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.codegen.javamofvisitors;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-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.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.codegen.Visitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Choice;
-import org.eclipse.wst.common.environment.IEnvironment;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class JavaMofParameterVisitor implements Visitor 
-{
-  private IEnvironment env_;
-
-  /*
-  * Constructor
-  **/
-  public JavaMofParameterVisitor(IEnvironment env)
-  {
-  	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 IStatus run ( Object imethod, VisitorAction vAction)
-  {
-  	IStatus status = Status.OK_STATUS;
-  	Choice OKChoice = new Choice('O', ConsumptionMessages.LABEL_OK, ConsumptionMessages.DESCRIPTION_OK);
-  	Choice CancelChoice = new Choice('C', ConsumptionMessages.LABEL_CANCEL, ConsumptionMessages.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 StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_SAMPLE_CREATION_CANCELED );
-      }
-      	
-    }
-    //           
-
-    //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 StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_SAMPLE_CREATION_CANCELED );
-        }
-        	
-      }
-      //      
-    }
-    
-    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 db1f25571..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofTypeVisitor.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.javamofvisitors;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-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.common.environment.IEnvironment;
-
-
-
-/**
-* 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 IEnvironment env_;
-
-  private String clientProject;
-
-  /*
-  * Constructor
-  **/
-  public JavaMofTypeVisitor(IEnvironment 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 IStatus run ( Object typeNavigator, VisitorAction vAction)
-  {
-  	IStatus status = Status.OK_STATUS;
-    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());
-      javaMofRef.setEnvironment( env_ );
-      status = javaMofRef.execute( null, null );
-      if (status.getSeverity()==Status.ERROR)
-      	return status;
-      
-      status = vAction.visit(javaMofRef.getJavaClass());
-    }
-    else if (typeNavigator instanceof Field){
-      Field field = (Field)typeNavigator;
-      JavaMofReflectionCommand javaMofRef = new JavaMofReflectionCommand();
-      javaMofRef.setClientProject(clientProject);
-      javaMofRef.setProxyBean(((JavaHelpers)field.getEType()).getQualifiedName());
-      javaMofRef.setEnvironment( env_ );
-     
-      status = javaMofRef.execute( null, null );
-      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 2cd7ffc62..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AbstractStartServer.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.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.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.wst.common.environment.EnvironmentService;
-import org.eclipse.wst.common.environment.ILog;
-import org.eclipse.wst.server.core.IServer;
-
-public abstract class AbstractStartServer {
- 
-protected IProgressMonitor monitor;
-private ILog log_;
-
-public AbstractStartServer()
-{
-	log_ = EnvironmentService.getEclipseLog();
-}
-
-/**
- * Execute the command
- */
-public void StartServer (IProject project, IServer server, IProgressMonitor monitor, boolean restart) throws CoreException
-{
-	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(ILog.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,ConsumptionMessages.MSG_ERROR_SERVER,e));
-  }
-}
-
-protected void publishProject(IServer server) throws CoreException
-{
-      monitor.subTask( ConsumptionMessages.PROGRESS_INFO_PUBLISHING_SERVER );
-      IStatus status = server.publish(IServer.PUBLISH_INCREMENTAL, monitor);
-      if (status.getSeverity() != IStatus.OK)
-      	throw new CoreException(status);
-      log_.log(ILog.INFO, 5051, this, "publishProject", "IServer="+server+", Publish command completed");
- }
-
-protected void startProject(IServer server) throws CoreException
-{
-  try
-  {
-    monitor.subTask( ConsumptionMessages.PROGRESS_INFO_STARTING_SERVER );    
-    server.synchronousStart(ILaunchManager.RUN_MODE, monitor);
-    log_.log(ILog.INFO, 5052, this, "startProject", "IServer="+server+", Start command completed");
-    
-  }
-  catch (Exception e) {
-    throw new CoreException(new Status(IStatus.ERROR,WebServiceConsumptionPlugin.ID,0,ConsumptionMessages.MSG_ERROR_SERVER,e));
-  }  
-}
-
-protected void restartProject(IProject project, IServer server) throws CoreException
-{
-  //Do nothing
-}
-
-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 d25b4ec0b..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AddModuleToServerCommand.java
+++ /dev/null
@@ -1,118 +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.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-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 AddModuleToServerCommand extends AbstractDataModelOperation
-{
-  
-  private String serverInstanceId;
-  private String project;
-  private String module;
-	
-	public AddModuleToServerCommand()
-	{
-	}
-	
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-	{
-      IEnvironment env = getEnvironment();
-      
-	    IStatus status = Status.OK_STATUS;	    
-	    
-	    IServer server = ServerCore.findServer(serverInstanceId);
-	    if (server == null)
-	    {
-	      status = StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_INSTANCE_NOT_FOUND );
-	      env.getStatusHandler().reportError(status);
-	      return status;
-	    }
-	   
-	    IServerWorkingCopy serverwc = null;
-	    
-	    try
-	    {
-	    //Ensure the module is not a Java utility
-	    IProject iproject = ProjectUtilities.getProject(project);
-	    if (!J2EEUtils.isJavaComponent(iproject))
-	    {      
-	      IModule imodule = ServerUtils.getModule(iproject);
-	      if (!ServerUtil.containsModule(server, imodule, null))
-	      {
-	        IModule[] imodules = new IModule[]{imodule};
-	        serverwc = server.createWorkingCopy();
-	        ServerUtil.modifyModules(serverwc, imodules, null, null);
-	      }
-
-	    }
-	    } catch (CoreException e)
-	    {
-	      status = StatusUtils.errorStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_ADD_MODULE, new String[]{module}) );
-	      env.getStatusHandler().reportError(status);
-	      return status;      
-	    } finally
-	    {
-	      try
-	      {
-	        if (serverwc != null)
-	        {
-	          serverwc.save(true, null);
-	        }
-	      } catch (CoreException ce)
-	      {
-	        status = StatusUtils.errorStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_ADD_MODULE, new String[] { module }) );
-	        env.getStatusHandler().reportError(status);
-	        return status;
-	      }      
-	    }
-	    
-		return status;
-	    
-		
-	}
-
-	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 82ab8a312..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AssociateModuleWithEARCommand.java
+++ /dev/null
@@ -1,89 +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.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public class AssociateModuleWithEARCommand extends AbstractDataModelOperation
-{
-	private String project_;
-	private String module_;
-	private String earProject_;
-	private String ear_;
-	
-
-  public AssociateModuleWithEARCommand(){
-
-  }
-  
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-	{
-    IEnvironment env = getEnvironment();
-    
-		IStatus status = Status.OK_STATUS;
-		IProject moduleProject = null;
-		IProject earProject = null;
-
-		// get projects
-		if (project_!=null)
-			moduleProject = ProjectUtilities.getProject(project_);
-		if (earProject_!=null)
-			earProject = ProjectUtilities.getProject(earProject_);
-		
-		// associate modules if not already associated
-		if (moduleProject!=null && earProject!=null) {
-			if (!J2EEUtils.isComponentAssociated(earProject, moduleProject))
-				J2EEUtils.associateComponentToEAR(moduleProject, earProject);
-		}
-		
-		// ensure modules are associated otherwise report error
-		if (!J2EEUtils.isComponentAssociated(earProject, moduleProject)){
-			status = StatusUtils.errorStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_UNABLE_TO_ASSOCIATE, new String[]{module_, ear_}) );
-			if (env!=null)
-				env.getStatusHandler().reportError(status);
-		    return 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;  
-  }	
-}
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 90c6ff9b3..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/BuildProjectCommand.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.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.datamodel.validate.ValidationManager;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-public class BuildProjectCommand extends AbstractDataModelOperation 
-{
-  private ValidationManager validationManager;
-  private IProject project_;
-  private boolean forceBuild_;
-  // rm private Model model;
-
-  /**
-   * Default CTOR;
-   */
-  public BuildProjectCommand()
-  {
-  }
-
-  /**
-   * Execute the command
-   */
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    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(ResourcesPlugin.FAMILY_AUTO_BUILD, new NullProgressMonitor());   
-    }
-    catch (InterruptedException ie)
-    {
-      // continue execution
-    }
-    catch (OperationCanceledException oce)
-    {
-      // continue execution
-    }
-    
-    return Status.OK_STATUS;
-  }
-  /**
-   * @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 c5274a5ef..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CheckProjectOKCommand.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.consumption.command.common;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-
-public class CheckProjectOKCommand extends AbstractDataModelOperation 
-{
-
-  private String serviceServerTypeId_;
-
-
-  /**
-   * Default CTOR
-   */
-  public CheckProjectOKCommand() {
-  }
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  { 
-    IStatus status = Status.OK_STATUS;
-    
-    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 = NLS.bind(ConsumptionMessages.MSG_ERROR_SERVER_VIEW_OPEN, new String[] { serverName});
-      return StatusUtils.errorStatus( errorMessage );
-      
-    }
-    
-    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/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 329a3e5d9..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ComputeEndpointCommand.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.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.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-public class ComputeEndpointCommand extends AbstractDataModelOperation
-{
-  private WebServicesParser webServicesParser;
-  private String wsdlURI;
-  private Boolean monitorService;
-  private Integer monitoredPort;
-
-  public 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;
-  }
-
-  public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
-  {
-    return Status.OK_STATUS;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.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 c50a2a4b8..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CopyWSDLCommand.java
+++ /dev/null
@@ -1,333 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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.io.UnsupportedEncodingException;
-import java.net.URI;
-import java.net.URISyntaxException;
-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.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.uri.URIException;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.uriresolver.internal.util.URIEncoder;
-import org.eclipse.wst.ws.internal.parser.discovery.NetUtils;
-import org.eclipse.wst.ws.internal.parser.wsil.WWWAuthenticationException;
-import org.eclipse.wst.ws.internal.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 AbstractDataModelOperation
-{
-  private String wsdlURI;
-  private WebServicesParser webServicesParser;
-  private String destinationURI;
-  private Definition def;
-  private Vector ignoreList;
-
-  public CopyWSDLCommand()
-  {
-  }
-
-  /**
-   * Execute the command
-   */
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    IEnvironment env = getEnvironment();
-    
-    try
-    {
-      ignoreList = new Vector();
-      if (def == null)
-        def = webServicesParser.getWSDLDefinition(wsdlURI);
-      copyWSDL(env, wsdlURI, getBaseURI(destinationURI), getLocalname(destinationURI), def);
-      return Status.OK_STATUS;
-    }
-    catch (Throwable t)
-    {
-      t.printStackTrace();
-      IStatus status = StatusUtils.errorStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_COPY_WSDL, new String[]{wsdlURI, destinationURI}), t);
-      env.getStatusHandler().reportError(status);
-      return status;
-    }
-  }
-
-  private void copyWSDL(IEnvironment 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(IEnvironment env, String uri, String destURI, String destLocalname, Definition definition) throws WSDLException, IOException, WWWAuthenticationException, TransformerException, TransformerConfigurationException, URIException
-  {
-	if (!needToCopy(uri)) {
-	   	return;
-	}
-    
-    String baseURI = getBaseURI(uri);
-    if (destLocalname == null || destLocalname.length() <= 0)
-      destLocalname = getLocalname(uri);
-    
-    // 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(IEnvironment env, String uri, String destURI) throws TransformerException, TransformerConfigurationException, IOException, URIException
-  {
-	  if (!needToCopy(uri)) {
-	    	return;
-	    }
-	
-    // 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(IEnvironment 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());
-          }
-        }
-      }
-    }
-  }
-
-  private boolean needToCopy (String uri) {
-	  String normalizedURI = normalize(uri);	
-	  if (ignoreList.contains(normalizedURI))
-		  return false;
-	  ignoreList.add(normalizedURI);
-	  return true;
-  }
-  
-  private String normalize(String uri )
-  {
-	  try {
-		  String encodedURI = URIEncoder.encode(uri,"UTF-8");
-		  URI normalizedURI = new URI(encodedURI);
-		  normalizedURI = normalizedURI.normalize();
-		  return normalizedURI.toString();
-	  } catch (URISyntaxException e) {
-		  return uri;
-	  } catch (UnsupportedEncodingException e) {
-		  return uri;
-	  }
-  }
-	  
-  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/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 1d10ea922..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateEARProjectCommand.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.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.j2ee.datamodel.properties.IEarComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.earcreation.EarComponentCreationDataModelProvider;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-
-public class CreateEARProjectCommand extends AbstractDataModelOperation
-{
-  private String earProjectName_;
-  private String serverFactoryId_;
-  private String j2eeVersion_;  
-
-  /**
-   * Constructor
-   */
-  public CreateEARProjectCommand()
-  {
-  }
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    IEnvironment  env       = getEnvironment();
-	
-    try
-    {
-      IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(earProjectName_);
-      if (project != null && !project.exists())
-      {
-        IDataModel info = DataModelFactory.createDataModel(new EarComponentCreationDataModelProvider());
-        info.setProperty(IEarComponentCreationDataModelProperties.PROJECT_NAME, project.getName());
-        
-        //Set the J2EE version
-        if (j2eeVersion_ != null && j2eeVersion_.length()>0)
-        {
-          info.setProperty(IEarComponentCreationDataModelProperties.COMPONENT_VERSION, new Integer(j2eeVersion_));
-        }
-        else
-        {
-          info.setProperty(IEarComponentCreationDataModelProperties.COMPONENT_VERSION, new Integer(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
-        IDataModelOperation operation = info.getDefaultOperation();
-        operation.execute(new NullProgressMonitor(), null);
-      }
-    }
-    catch (ExecutionException ite)
-    {
-      IStatus status = StatusUtils.errorStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_CANNOT_CREATE_EAR_PROJECT, new String[] {earProjectName_}), ite);
-      env.getStatusHandler().reportError(status);
-      return status;
-    }
-    return Status.OK_STATUS;
-  }
-  /**
-   * @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/CreateFacetedProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateFacetedProjectCommand.java
deleted file mode 100644
index e707c9801..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateFacetedProjectCommand.java
+++ /dev/null
@@ -1,251 +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
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060131 121071   rsinha@ca.ibm.com - Rupam Kuehner     
- * 20060204 124408   rsinha@ca.ibm.com - Rupam Kuehner      
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.server.core.FacetUtil;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.common.FacetMatcher;
-import org.eclipse.jst.ws.internal.consumption.common.FacetSetsByTemplateCache;
-import org.eclipse.jst.ws.internal.consumption.common.FacetUtils;
-import org.eclipse.jst.ws.internal.consumption.common.RequiredFacetVersion;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.core.ServerCore;
-
-public class CreateFacetedProjectCommand extends AbstractDataModelOperation
-{
-
-  private String   projectName;
-  private String   templateId;
-  private RequiredFacetVersion[]   requiredFacetVersions;
-  //private FacetMatcher facetMatcher;
-  private String   serverFactoryId;
-  private String   serverInstanceId;
-  
-  private org.eclipse.wst.common.project.facet.core.runtime.IRuntime facetRuntime;
-  
-  private IProgressMonitor monitor_;
-  
-  
-  public IStatus execute(IProgressMonitor monitor, IAdaptable info)
-  {
-    monitor_ = monitor;
-    IStatus status = Status.OK_STATUS;
-    
-    // check if data ready
-    status = checkDataReady();
-    if (status.getSeverity()==Status.ERROR)
-    {
-      return status;
-    }
-
-    IProject project = ProjectUtilities.getProject(projectName);
-    if (!project.exists())
-    {
-      try
-      {
-        IFacetedProject fproject = ProjectFacetsManager.create(projectName, null, monitor_);
-        
-        //Decide which facets to install based on the templateId and the selected server. 
-        Set facetsToAdd = getFacetsToAdd();
-        
-        //Set up the install actions.
-        Set actions = FacetUtils.getInstallActions(facetsToAdd);
-        fproject.modify(actions, monitor_);
-        
-        Set newFacetVersions = fproject.getProjectFacets();
-        Set fixedFacets = new HashSet();
-        for (Iterator iter = newFacetVersions.iterator(); iter.hasNext();) {
-            IProjectFacetVersion facetVersion = (IProjectFacetVersion) iter.next();
-            fixedFacets.add(facetVersion.getProjectFacet());
-        }
-        fproject.setFixedProjectFacets(fixedFacets);
-        
-        
-        //Set the runtime        
-        if (facetRuntime != null)
-        {
-          fproject.setRuntime(facetRuntime, monitor);
-        }
-
- 
-      } catch (CoreException ce)
-      {
-        return StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_PROJECT_CREATION, new String[] { projectName }));
-      }
-    }
-    return status;
-  }
-    
-  private IStatus checkDataReady()
-  {
-
-    if (projectName == null || serverFactoryId == null)
-    {
-      return StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_PROJECT_CREATION, new String[] {projectName}));
-    }
-
-    return Status.OK_STATUS;
-  }
-  
-  /*
-   * @return Set Returns the Set of facets to add to the new project, 
-   * choosing the highest level of each facet that works on the selected server.
-   */
-  private Set getFacetsToAdd()
-  {
-    Set facets = null;
-    
-    //Set the facet runtime.
-    setFacetRuntime();
-    Set[] allCombinations = FacetSetsByTemplateCache.getInstance().getFacetVersionCombinationsFromTemplate(templateId);
-    int n = allCombinations.length;
-    if (facetRuntime != null)
-    {
-      for (int i=n-1; i>=0; i--)
-      {
-        //Check this template combination to see if it is compatible with both the 
-        //service/client runtime and the server runtime. If it is, choose it.
-        Set combination = allCombinations[i];
-        FacetMatcher fm = FacetUtils.match(requiredFacetVersions, combination);
-        if (fm.isMatch())
-        {
-          //Check against Runtime
-          if (FacetUtils.doesRuntimeSupportFacets(facetRuntime, combination))
-          {
-            //We have a match. Use this combination of facet versions for project creation.
-            facets = combination;
-            break;
-          }
-        }                
-      }
-    }
-    else
-    {
-      for (int i=n-1; i>=0; i--)
-      {
-        //Check this template combination to see if it is compatible with both the 
-        //service/client runtime and the server runtime. If it is, choose it.
-        Set combination = allCombinations[i];
-        FacetMatcher fm = FacetUtils.match(requiredFacetVersions, combination);
-        if (fm.isMatch())
-        {
-            //We have a match. Use this combination of facet versions for project creation.
-            facets = combination;
-            break;
-        }                
-      }      
-    }
-   
-    if (facets == null)
-    {
-      facets = FacetUtils.getInitialFacetVersionsFromTemplate(templateId);
-    }
-     
-    return facets;
-  }
-
-  private void setFacetRuntime()
-  {
-    
-    if (serverInstanceId != null && serverInstanceId.length()>0)
-    {
-      IServer server = ServerCore.findServer(serverInstanceId);
-      IRuntime sRuntime = server.getRuntime();
-      facetRuntime = FacetUtil.getRuntime(sRuntime);      
-    }
-    else
-    {
-      //Find a non Stub runtime that matches this server type
-      IRuntime serverRuntime = ServerUtils.getNonStubRuntime(serverFactoryId);
-      if (serverRuntime != null)
-      {
-        facetRuntime = FacetUtil.getRuntime(serverRuntime);
-      }
-      else
-      {
-        //Accept stub runtime.
-        IServerType st = ServerCore.findServerType(serverFactoryId);
-        String runtimeTypeId = st.getRuntimeType().getId();   
-        //Find the facet runtime
-        IRuntime[] runtimes = ServerCore.getRuntimes();
-        for (int i=0; i<runtimes.length; i++)
-        {
-          IRuntime sRuntime = runtimes[i];
-          if (sRuntime.getRuntimeType().getId().equals(runtimeTypeId))
-          {
-            facetRuntime = FacetUtil.getRuntime(sRuntime);
-          }
-        }                
-      }
-    }
-  }
-  
-  /*
-  public void setFacetMatcher(FacetMatcher facetMatcher)
-  {
-    this.facetMatcher = facetMatcher;
-  }
-  */
-  
-  public void setProjectName(String projectName)
-  {
-    this.projectName = projectName;
-  }  
-  
-  public void setTemplateId(String templateId)
-  {
-    this.templateId = templateId;
-  }    
-
-  public void setRequiredFacetVersions(RequiredFacetVersion[] requiredFacetVersions)
-  {
-    this.requiredFacetVersions = requiredFacetVersions;
-  }
-
-  public void setServerFactoryId(String serverFactoryId)
-  {
-    this.serverFactoryId = serverFactoryId;
-  }
-
-  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/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 b17308122..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateJavaProjectCommand.java
+++ /dev/null
@@ -1,82 +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.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.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.ConsumptionMessages;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-
-public class CreateJavaProjectCommand extends AbstractDataModelOperation
-{
-  private String projectName_;
-
-  /**
-   * Default CTOR
-   */
-  public CreateJavaProjectCommand()
-  {
-  }
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    IEnvironment env = getEnvironment();
-    IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName_);
-    
-    if (project != null && !project.exists())
-    {
-      try
-      {
-        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)
-      {
-        IStatus status = StatusUtils.errorStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_CANNOT_CREATE_JAVA_PROJECT, new String[] {projectName_}), ce);
-        env.getStatusHandler().reportError(status);
-        return status;
-      }
-    }
-    return Status.OK_STATUS;
-  }
-  
-  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 5097a5e31..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateModuleCommand.java
+++ /dev/null
@@ -1,712 +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
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060204 124408   rsinha@ca.ibm.com - Rupam Kuehner      *     
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.application.internal.operations.FlexibleJavaProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.project.datamodel.properties.IFlexibleJavaProjectCreationDataModelProperties;
-import org.eclipse.jst.server.core.FacetUtil;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.common.FacetUtils;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.common.project.facet.core.VersionFormatException;
-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;
-
-public class CreateModuleCommand extends AbstractDataModelOperation
-{
-	
-	public final static int WEB = J2EEUtils.WEB;    
-	public final static int EJB = J2EEUtils.EJB;    
-	public final static int APPCLIENT = J2EEUtils.APPCLIENT;
-	public final static int EAR = J2EEUtils.EAR;
-    
-    //Templates
-    //TODO  Remove these template constants once J2EE tools defines constants (bug 117531)
-    public final static String WEB_TEMPLATE = "template.jst.web";
-    public final static String EJB_TEMPLATE = "template.jst.ejb";
-    public final static String APPCLIENT_TEMPLATE = "template.jst.appclient";
-    public final static String EAR_TEMPLATE = "template.jst.ear";
-	
-	private String   projectName;
-	private String   moduleName;  // may be null for non-flexible project
-	private int      moduleType;;
-	private String   j2eeLevel;
-	private String   serverFactoryId;
-	private String   serverInstanceId_;
-	private IEnvironment env;
-    private IProgressMonitor monitor_;
-	
-    private org.eclipse.wst.common.project.facet.core.runtime.IRuntime facetRuntime;
-    
-	public CreateModuleCommand(){
-	}
-	
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    monitor_ = monitor;
-		this.env = getEnvironment();
-		IStatus status = Status.OK_STATUS;
-		
-		// check if data ready
-		status = checkDataReady();
-		if (status.getSeverity()==Status.ERROR){
-			return status;
-		}	
-
-        //ensure the project does not exist
-        IProject project = ProjectUtilities.getProject(projectName);
-        if (!project.exists())
-        {
-          // create the component according to the component type specified
-          int type = getModuleType();
-          switch (type) {
-          case WEB:
-            status = createWebComponent();
-            break;
-          case EJB:
-             status = createEJBComponent();
-            break;
-          case APPCLIENT:
-            status = createAppClientComponent();
-            break;
-          case EAR:
-            status = createEARComponent();
-            break;
-
-          default:
-            return StatusUtils.errorStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_COMPONENT_CREATION, new String[]{moduleName}) );         
-          }          
-        }
-		
-        
-        // check if flexible project exists
-        /*
-		if (project==null || !project.exists()){
-			status = createFlexibleJavaProject();
-			if (status.getSeverity()==Status.ERROR){
-				return status;
-			}			
-		}
-        */
-        /*
-		// check if project and/or component exists
-        if (projectName!=null) {
-          if (moduleName==null){
-            if (project.exists())
-              return status;
-          }
-          else {
-			if (J2EEUtils.exists(projectName, moduleName))
-				return status;
-          }
-        }
-		else {
-			return StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_COMPONENT_CREATION, new String[]{projectName, moduleName}) );
-		} 
-        */       
-        
-
-		
-	
-		return status;
-	}
-
-	private IStatus checkDataReady(){
-		
-		if (projectName==null || serverFactoryId==null){
-			return StatusUtils.errorStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_COMPONENT_CREATION, new String[]{projectName, moduleName}) );
-		}
-		
-		return Status.OK_STATUS;
-	}
-	
-	
-	/**
-	 * Create a Web component
-	 * @return
-	 */
-	public IStatus createWebComponent(){   
-    
-      IStatus status = Status.OK_STATUS;      
-      
-      try
-      {
-        IFacetedProject fproject = ProjectFacetsManager.create(projectName, null, monitor_);
-
-        //Decide which facets to install based on the templateId and the selected server. 
-        Set facetsToAdd = getFacetsToAdd(WEB_TEMPLATE); 
-        Set facetsToAddModified = facetsToAdd;
-        //If the J2EE level has been set, modify the Web facet version to be consistent.
-        if (j2eeLevel!=null && j2eeLevel.length()>0)
-        {
-          String webVersion = getWebVersionFromJ2EELevel(j2eeLevel);
-          facetsToAddModified = new HashSet();
-          Iterator itr = facetsToAdd.iterator();
-          while (itr.hasNext())
-          {
-            //If this is the web facet, get the right version.
-            IProjectFacetVersion pfv = (IProjectFacetVersion)itr.next();
-            IProjectFacet pf = pfv.getProjectFacet(); 
-            if (pf.getId().equals(IModuleConstants.JST_WEB_MODULE))
-            {
-              IProjectFacetVersion webfv = pf.getVersion(webVersion);
-              facetsToAddModified.add(webfv);
-            }
-            else
-            {
-              facetsToAddModified.add(pfv); 
-            }
-          }
-        }
-        
-        //Set up the install actions.
-        Set actions = FacetUtils.getInstallActions(facetsToAddModified);
-        fproject.modify(actions, monitor_);
-        
-        Set newFacetVersions = fproject.getProjectFacets();
-        Set fixedFacets = new HashSet();
-        for (Iterator iter = newFacetVersions.iterator(); iter.hasNext();) {
-            IProjectFacetVersion facetVersion = (IProjectFacetVersion) iter.next();
-            fixedFacets.add(facetVersion.getProjectFacet());
-        }
-        fproject.setFixedProjectFacets(fixedFacets);
-        
-        
-        //Set the runtime        
-        if (facetRuntime != null)
-        {
-          fproject.setRuntime(facetRuntime, monitor_);
-        }        
-        
-      } catch (CoreException ce)
-      {
-        System.out.println("Exception occurred when creating a faceted project.");
-        return StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_PROJECT_CREATION, new String[] { projectName }), ce);
-      }
-		return status;
-      		
-	}
-	
-	/**
-	 * Create an EAR component
-	 * @return
-	 */
-	public IStatus createEARComponent(){
-      IStatus status = Status.OK_STATUS;      
-      
-      try
-      {
-        IFacetedProject fproject = ProjectFacetsManager.create(projectName, null, monitor_);
-
-        //Decide which facets to install based on the templateId and the selected server. 
-        Set facetsToAdd = getFacetsToAdd(EAR_TEMPLATE); 
-        Set facetsToAddModified = facetsToAdd;
-        //If the J2EE level has been set, modify the Web facet version to be consistent.
-        if (j2eeLevel!=null && j2eeLevel.length()>0)
-        {
-          String webVersion = getEARVersionFromJ2EELevel(j2eeLevel);
-          facetsToAddModified = new HashSet();
-          Iterator itr = facetsToAdd.iterator();
-          while (itr.hasNext())
-          {
-            //If this is the ear facet, get the right version.
-            IProjectFacetVersion pfv = (IProjectFacetVersion)itr.next();
-            IProjectFacet pf = pfv.getProjectFacet(); 
-            if (pf.getId().equals(IModuleConstants.JST_EAR_MODULE))
-            {
-              IProjectFacetVersion webfv = pf.getVersion(webVersion);
-              facetsToAddModified.add(webfv);
-            }
-            else
-            {
-              facetsToAddModified.add(pfv); 
-            }
-          }
-        }
-        
-        //Set up the install actions.
-        Set actions = FacetUtils.getInstallActions(facetsToAddModified);
-        fproject.modify(actions, monitor_);
-        
-        Set newFacetVersions = fproject.getProjectFacets();
-        Set fixedFacets = new HashSet();
-        for (Iterator iter = newFacetVersions.iterator(); iter.hasNext();) {
-            IProjectFacetVersion facetVersion = (IProjectFacetVersion) iter.next();
-            fixedFacets.add(facetVersion.getProjectFacet());
-        }
-        fproject.setFixedProjectFacets(fixedFacets);
-        
-        
-        //Set the runtime        
-        if (facetRuntime != null)
-        {
-          fproject.setRuntime(facetRuntime, monitor_);
-        }        
-        
-      } catch (CoreException ce)
-      {
-        System.out.println("Exception occurred when creating a faceted project.");
-        return StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_PROJECT_CREATION, new String[] { projectName }), ce);
-      }
-        return status;
-	}
-	
-	/**
-	 * Create an EJB Component
-	 * @return
-	 */
-	public IStatus createEJBComponent(){
-      IStatus status = Status.OK_STATUS;      
-      
-      try
-      {
-        IFacetedProject fproject = ProjectFacetsManager.create(projectName, null, monitor_);
-
-        //Decide which facets to install based on the templateId and the selected server. 
-        Set facetsToAdd = getFacetsToAdd(EJB_TEMPLATE); 
-        Set facetsToAddModified = facetsToAdd;
-        //If the J2EE level has been set, modify the Web facet version to be consistent.
-        if (j2eeLevel!=null && j2eeLevel.length()>0)
-        {
-          String webVersion = getEJBVersionFromJ2EELevel(j2eeLevel);
-          facetsToAddModified = new HashSet();
-          Iterator itr = facetsToAdd.iterator();
-          while (itr.hasNext())
-          {
-            //If this is the web facet, get the right version.
-            IProjectFacetVersion pfv = (IProjectFacetVersion)itr.next();
-            IProjectFacet pf = pfv.getProjectFacet(); 
-            if (pf.getId().equals(IModuleConstants.JST_EJB_MODULE))
-            {
-              IProjectFacetVersion webfv = pf.getVersion(webVersion);
-              facetsToAddModified.add(webfv);
-            }
-            else
-            {
-              facetsToAddModified.add(pfv); 
-            }
-          }
-        }
-        
-        //Set up the install actions.
-        Set actions = FacetUtils.getInstallActions(facetsToAddModified);
-        fproject.modify(actions, monitor_);
-        
-        Set newFacetVersions = fproject.getProjectFacets();
-        Set fixedFacets = new HashSet();
-        for (Iterator iter = newFacetVersions.iterator(); iter.hasNext();) {
-            IProjectFacetVersion facetVersion = (IProjectFacetVersion) iter.next();
-            fixedFacets.add(facetVersion.getProjectFacet());
-        }
-        fproject.setFixedProjectFacets(fixedFacets);
-        
-        
-        //Set the runtime        
-        if (facetRuntime != null)
-        {
-          fproject.setRuntime(facetRuntime, monitor_);
-        }        
-        
-      } catch (CoreException ce)
-      {
-        System.out.println("Exception occurred when creating a faceted project.");
-        return StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_CREATE_EJB_COMPONENT, new String[] { projectName }), ce);
-      }
-        return status;      
-
-	}
-	
-	/**
-	 * Create an Application Client component
-	 * @return
-	 */
-	public IStatus createAppClientComponent()
-    {
-      IStatus status = Status.OK_STATUS;      
-      
-      try
-      {
-        IFacetedProject fproject = ProjectFacetsManager.create(projectName, null, monitor_);
-
-        //Decide which facets to install based on the templateId and the selected server. 
-        Set facetsToAdd = getFacetsToAdd(APPCLIENT_TEMPLATE); 
-        Set facetsToAddModified = facetsToAdd;
-        //If the J2EE level has been set, modify the Web facet version to be consistent.
-        if (j2eeLevel!=null && j2eeLevel.length()>0)
-        {
-          String webVersion = getAppClientVersionFromJ2EELevel(j2eeLevel);
-          facetsToAddModified = new HashSet();
-          Iterator itr = facetsToAdd.iterator();
-          while (itr.hasNext())
-          {
-            //If this is the web facet, get the right version.
-            IProjectFacetVersion pfv = (IProjectFacetVersion)itr.next();
-            IProjectFacet pf = pfv.getProjectFacet(); 
-            if (pf.getId().equals(IModuleConstants.JST_APPCLIENT_MODULE))
-            {
-              IProjectFacetVersion webfv = pf.getVersion(webVersion);
-              facetsToAddModified.add(webfv);
-            }
-            else
-            {
-              facetsToAddModified.add(pfv); 
-            }
-          }
-        }
-        
-        //Set up the install actions.
-        Set actions = FacetUtils.getInstallActions(facetsToAddModified);
-        fproject.modify(actions, monitor_);
-        
-        Set newFacetVersions = fproject.getProjectFacets();
-        Set fixedFacets = new HashSet();
-        for (Iterator iter = newFacetVersions.iterator(); iter.hasNext();) {
-            IProjectFacetVersion facetVersion = (IProjectFacetVersion) iter.next();
-            fixedFacets.add(facetVersion.getProjectFacet());
-        }
-        fproject.setFixedProjectFacets(fixedFacets);
-        
-        
-        //Set the runtime        
-        if (facetRuntime != null)
-        {
-          fproject.setRuntime(facetRuntime, monitor_);
-        }        
-        
-      } catch (CoreException ce)
-      {
-        System.out.println("Exception occurred when creating a faceted project.");
-        return StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_CREATE_APPCLIENT_COMPONENT, new String[] { projectName }), ce);
-      }
-        return status;      
-      
-        /*
-		IStatus status = Status.OK_STATUS;
-        
-		try
-		{
-		  IDataModel projectInfo = DataModelFactory.createDataModel(new AppClientComponentCreationDataModelProvider());
-		  projectInfo.setProperty(IAppClientComponentCreationDataModelProperties.PROJECT_NAME,projectName);
-          if (moduleName!=null)      
-		      projectInfo.setProperty(IAppClientComponentCreationDataModelProperties.COMPONENT_NAME, moduleName);
-		  if (j2eeLevel!=null)		  
-			  projectInfo.setProperty(IAppClientComponentCreationDataModelProperties.COMPONENT_VERSION, Integer.valueOf(j2eeLevel));
-		  
-		  //Don't create an EAR. The ADD_TO_EAR property gets defaulted to TRUE for everything except Web projects.
-		  projectInfo.setProperty(IAppClientComponentCreationDataModelProperties.ADD_TO_EAR, Boolean.FALSE);
-		  
-		  IDataModelOperation op = projectInfo.getDefaultOperation();
-
-			op.execute( monitor_, null);
-		}
-		catch (Exception e)
-		{
-			status = StatusUtils.errorStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_CREATE_APPCLIENT_COMPONENT, new String[]{projectName}), e);
-		}
-        
-		return status;
-        */		
-	}
-	
-	/**
-	 * Creates Flexible Java Project structure
-	 * This project is required if it doesn't already exist in order to create the component 
-	 * @return
-	 * 
-	 * Note: This call may not be necessary once J2EE implements creating a flex project automatically
-	 * 		with the creation of components.
-	 */
-	public IStatus createFlexibleJavaProject(){
-		IStatus status = Status.OK_STATUS;
-		try
-		{
-		  IDataModel projectInfo = DataModelFactory.createDataModel(new FlexibleJavaProjectCreationDataModelProvider());
-		  projectInfo.setProperty(IFlexibleJavaProjectCreationDataModelProperties.PROJECT_NAME,projectName);
-  
-		  String runtimeTargetId = null;
-		  if( serverInstanceId_ == null )
-		  {
-			// We don't have a server instance so we will get the first runtimeTarget from the factory ID.
-			runtimeTargetId = ServerUtils.getServerTargetIdFromFactoryId(serverFactoryId, ServerUtils.getServerTargetModuleType(moduleType), j2eeLevel);		
-		  }
-		  else
-		  {
-			// We have a server instance so we will just get it's runtimeTargetId.
-			IServer server = ServerCore.findServer( serverInstanceId_ );
-			runtimeTargetId = server.getRuntime().getId();  
-		  }
-		  
-		  projectInfo.setProperty(IFlexibleJavaProjectCreationDataModelProperties.RUNTIME_TARGET_ID,runtimeTargetId);
-		  projectInfo.setProperty(IFlexibleJavaProjectCreationDataModelProperties.ADD_SERVER_TARGET,Boolean.TRUE);
-		  IDataModelOperation op = projectInfo.getDefaultOperation();
-		  if (env!=null)
-			  op.execute( monitor_, null);
-		  else 
-			  op.execute(new NullProgressMonitor(), null);
-
-		}
-		catch (Exception e)
-		{
-			status = StatusUtils.errorStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_CREATE_FLEX_PROJET, new String[]{projectName}), e);
-		}
-		return status;		
-	}
-    
-      /*
-       * @return Set Returns the Set of facets to add to the new project, 
-       * choosing the highest level of each facet that works on the selected server.
-       */
-      private Set getFacetsToAdd(String templateId)
-      {
-        Set facets = new HashSet();
-        
-        //Set the facet runtime.
-        setFacetRuntime();
-        if (facetRuntime != null)
-        {
-          IFacetedProjectTemplate template = ProjectFacetsManager.getTemplate(templateId);
-          Set templateFacets = template.getFixedProjectFacets();
-          Iterator templateFacetsItr = templateFacets.iterator();
-          while (templateFacetsItr.hasNext())
-          {
-            IProjectFacet fixedFacet = (IProjectFacet)templateFacetsItr.next();
-            List versions = null;
-            try {
-                versions = fixedFacet.getSortedVersions(false);
-            } catch (VersionFormatException e) {
-                Set versionSet = fixedFacet.getVersions();
-                Iterator itr = versionSet.iterator();
-                versions = new ArrayList();
-                while (itr.hasNext())
-                {
-                    versions.add(itr.next());
-                }            
-            } catch (CoreException e) {
-                Set versionSet = fixedFacet.getVersions();
-                Iterator itr = versionSet.iterator();
-                versions = new ArrayList();
-                while (itr.hasNext())
-                {
-                    versions.add(itr.next());
-                }            
-            } 
-            Iterator versionsItr = versions.iterator();
-            while(versionsItr.hasNext())
-            {
-              IProjectFacetVersion pfv = (IProjectFacetVersion)versionsItr.next();
-              Set pfvs = new HashSet();
-              pfvs.add(pfv);           
-              
-              //Check against Runtime
-              if (FacetUtils.doesRuntimeSupportFacets(facetRuntime, pfvs))
-              {
-                  //We have a match. Add this one to the master set.
-                  facets.add(pfv);
-                  break;
-              }                        
-            }
-          }
-        }
-        else
-        {
-          facets = FacetUtils.getInitialFacetVersionsFromTemplate(templateId);
-        }
-     
-        
-        return facets;
-      }
-      
-      private void setFacetRuntime()
-      {
-        
-        if (serverInstanceId_ != null && serverInstanceId_.length()>0)
-        {
-          IServer server = ServerCore.findServer(serverInstanceId_);
-          IRuntime sRuntime = server.getRuntime();
-          facetRuntime = FacetUtil.getRuntime(sRuntime);      
-        }
-        else
-        {
-          //Find a non Stub runtime that matches this server type
-          IRuntime serverRuntime = ServerUtils.getNonStubRuntime(serverFactoryId);
-          if (serverRuntime != null)
-          {
-            facetRuntime = FacetUtil.getRuntime(serverRuntime);
-          }
-          else
-          {
-            //Accept stub runtime.
-            IServerType st = ServerCore.findServerType(serverFactoryId);
-            String runtimeTypeId = st.getRuntimeType().getId();   
-            //Find the facet runtime
-            IRuntime[] runtimes = ServerCore.getRuntimes();
-            for (int i=0; i<runtimes.length; i++)
-            {
-              IRuntime sRuntime = runtimes[i];
-              if (sRuntime.getRuntimeType().getId().equals(runtimeTypeId))
-              {
-                facetRuntime = FacetUtil.getRuntime(sRuntime);
-              }
-            }                
-          }
-        }
-      }      
-    
-   private String getWebVersionFromJ2EELevel(String j2eeVersion)
-   {
-        int aVersion = Integer.valueOf(j2eeLevel).intValue();
-        switch (aVersion) {
-        case J2EEVersionConstants.J2EE_1_2_ID:
-            return "2.2";
-
-        case J2EEVersionConstants.J2EE_1_3_ID:
-            return "2.3";
-
-        case J2EEVersionConstants.J2EE_1_4_ID:
-            return "2.4";
-            
-        default:
-            return "2.4";
-        }                
-   }
-	
-   private String getEJBVersionFromJ2EELevel(String j2eeVersion)
-   {
-        int aVersion = Integer.valueOf(j2eeLevel).intValue();
-        switch (aVersion) {
-        case J2EEVersionConstants.J2EE_1_2_ID:
-            return "1.1";
-
-        case J2EEVersionConstants.J2EE_1_3_ID:
-            return "2.0";
-
-        case J2EEVersionConstants.J2EE_1_4_ID:
-            return "2.1";
-            
-        default:
-            return "2.1";
-        }                
-   }
-   
-   private String getAppClientVersionFromJ2EELevel(String j2eeVersion)
-   {
-        int aVersion = Integer.valueOf(j2eeLevel).intValue();
-        switch (aVersion) {
-        case J2EEVersionConstants.J2EE_1_2_ID:
-            return "1.2";
-
-        case J2EEVersionConstants.J2EE_1_3_ID:
-            return "1.3";
-
-        case J2EEVersionConstants.J2EE_1_4_ID:
-            return "1.4";
-            
-        default:
-            return "1.4";
-        }                
-   }
-   
-   private String getEARVersionFromJ2EELevel(String j2eeVersion)
-   {
-        int aVersion = Integer.valueOf(j2eeLevel).intValue();
-        switch (aVersion) {
-        case J2EEVersionConstants.J2EE_1_2_ID:
-            return "1.2";
-
-        case J2EEVersionConstants.J2EE_1_3_ID:
-            return "1.3";
-
-        case J2EEVersionConstants.J2EE_1_4_ID:
-            return "1.4";
-            
-        default:
-            return "1.4";
-        }                
-   }
-   
-	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;
-	}
-
-	/**
-	 * Expecting 12,13,14 etc.
-	 * @param level
-	 */
-	public void setJ2eeLevel(String level)
-	{
-		if (level !=null && level.indexOf(".")!=-1)
-			j2eeLevel = J2EEUtils.getJ2EEIntVersionAsString(level);
-		else
-			j2eeLevel = level;
-	}
-
-	public void setServerFactoryId(String serverFactoryId)
-	{
-		this.serverFactoryId = serverFactoryId;
-	}
-	
-	public void setServerInstanceId( String serverInstanceId )
-	{
-	  serverInstanceId_ = serverInstanceId;
-	}
-
-}
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 ce05bff11..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateMonitorCommand.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.internal.consumption.command.common;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.ServerPort;
-import org.eclipse.wst.server.core.internal.IMonitoredServerPort;
-import org.eclipse.wst.server.core.internal.IServerMonitorManager;
-import org.eclipse.wst.server.core.internal.ServerMonitorManager;
-
-public class CreateMonitorCommand extends AbstractDataModelOperation
-{
-
-  private static final String WEB_SERVICES = "Web services";
-
-  private Boolean monitorService;
-
-  private String serviceServerInstanceId;
-
-  private Integer monitoredPort;
-
-  public CreateMonitorCommand() {
-  }
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    IEnvironment env = getEnvironment();
-    
-    if (monitorService != null && monitorService.booleanValue()) {
-      IServer server = ServerCore.findServer(serviceServerInstanceId);
-      if (server != null) {
-
-        // IMonitorableServer monitorableServer = (IMonitorableServer)
-        // serverDelegate;
-        ServerPort[] ports = server.getServerPorts(null);
-        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) {
-                  IStatus error = StatusUtils.errorStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_UNABLE_TO_START_MONITOR,
-                                                           new Object[] { String.valueOf(port.getPort()), server.getName()}), ce);
-                  env.getStatusHandler().reportError(error);
-                  return error;
-                }
-              }
-              monitoredPort = new Integer(imsPort.getMonitorPort());
-              return Status.OK_STATUS;
-            }
-          }
-          try {
-            IMonitoredServerPort imsPort = serverMonitorManager.createMonitor(server, port, -1, new String[] { WEB_SERVICES});
-            serverMonitorManager.startMonitor(imsPort);
-            monitoredPort = new Integer(imsPort.getMonitorPort());
-            return Status.OK_STATUS;
-          }
-          catch (CoreException ce) {
-            IStatus error = StatusUtils.errorStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_UNABLE_TO_START_MONITOR, new Object[] {
-                                                     String.valueOf(port.getPort()), server.getName()}), ce);
-            env.getStatusHandler().reportError(error);
-            return error;
-          }
-        }
-
-        else {
-          IStatus info = StatusUtils.infoStatus( NLS.bind(ConsumptionMessages.MSG_INFO_MONITORING_NOT_SUPPORTED,
-                                                 new Object[] { server.getName()}) );
-          env.getStatusHandler().reportInfo(info);
-          return info;
-        }
-      }
-    }
-    return Status.OK_STATUS;
-  }
-
-  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 fe31e83af..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateServerCommand.java
+++ /dev/null
@@ -1,123 +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.command.common;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-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;
-
-public class CreateServerCommand extends AbstractDataModelOperation
-{
-	private String serverFactoryId;
-	private String serverInstanceId;
-	
-	/**
-	 * Creates a server of the factory id
-	 * Note1: Checking for server instance == null is done in the PreService/ClientInstallCommands
-	 * Note2: Reporting of errors is done in PreService/ClientInstallCommands; simply return the status.
-	 */
-	public CreateServerCommand(){
-	}
-	
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    IEnvironment env = getEnvironment();
-    
-		IStatus status = Status.OK_STATUS;
-		
-		if (serverFactoryId==null){
-			status = StatusUtils.errorStatus(ConsumptionMessages.MSG_ERROR_CREATE_SERVER );
-			return status;			
-		}
-		
-		IServerWorkingCopy serverWC = null;
-		IServer server = null;
-		try {
-			IServerType serverType = ServerCore.findServerType(serverFactoryId);
-			if (serverType!=null) {
-				
-				//Choose a Runtime which is not a stub
-				IRuntime nonStubRuntime = null;
-				IRuntime[] runtimes = ServerUtil.getRuntimes(null, null);
-				String serverRuntimeTypeId = serverType.getRuntimeType().getId();
-				for (int i = 0; i < runtimes.length; i++) {
-					IRuntime runtime = runtimes[i];
-					String thisRuntimeTypeId = runtime.getRuntimeType().getId();
-					if (thisRuntimeTypeId.equals(serverRuntimeTypeId) && !runtime.isStub()) {
-				        //Found an appropriate IRuntime that is not a stub
-						nonStubRuntime = runtime;
-						break;
-					}
-				}				
-				
-				if (nonStubRuntime==null)
-				{					
-					status = StatusUtils.errorStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_STUB_ONLY,new String[]{serverFactoryId}) );
-					return status;					
-				}
-				
-				if (env!=null)
-				{
-					serverWC = serverType.createServer(null, null, nonStubRuntime, monitor );
-				}
-				else
-				{					
-					serverWC = serverType.createServer(null, null, nonStubRuntime, null);
-				}
-				
-				if (serverWC != null) {
-					if (env!=null)
-						server = serverWC.saveAll(true, monitor );
-					else
-						server = serverWC.saveAll(true, null);
-				}
-			}
-		} catch (CoreException ce) {
-			status = StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_CREATE_SERVER, ce);
-			return status;
-		}
-		
-		// set serverInstanceId
-		if (server!=null)
-			serverInstanceId = server.getId();
-		else {
-			status = StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_CREATE_SERVER );			
-		}
-		
-		return status;
-	}
-
-	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/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 f10d2c35c..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableBuildCommand.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (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.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.datamodel.validate.ValidationManager;
-import org.eclipse.wst.command.internal.env.core.common.ProgressUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-
-public class DisableBuildCommand extends AbstractDataModelOperation 
-{
-
-  private ValidationManager manager_;
-  /**
-   * CTOR;
-   */
-  public DisableBuildCommand()
-  {
-
-  }
-
-  /**
-   * Execute the command
-   */
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {    
-    IStatus status = Status.OK_STATUS;
-
-    ProgressUtils.report( monitor, ConsumptionMessages.TASK_DESC_WEBSERVICE_DISABLE_BUILD);
-
-    if (manager_!=null) {
-      manager_.disableAutoBuild();
-    }
-    return status;
-  }
-
-  /**
-   * Set the model
-   * 
-   * @param model
-   */
-  public void setModel(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 c513db90b..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableValidationCommand.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.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.datamodel.validate.ValidationManager;
-import org.eclipse.wst.command.internal.env.core.common.ProgressUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-public class DisableValidationCommand extends AbstractDataModelOperation 
-{
-
-  private ValidationManager manager_;
-  private IProject serviceProject_;
-
-  /**
-   * CTOR;
-   */
-  public DisableValidationCommand() {
-  }
-
-  /**
-   * Execute the command
-   */
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    IStatus status = Status.OK_STATUS;
-
-    ProgressUtils.report(monitor, ConsumptionMessages.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 423b1eb19..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/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.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.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.StatusException;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.internet.monitor.core.internal.provisional.IMonitor;
-import org.eclipse.wst.internet.monitor.core.internal.provisional.IMonitorWorkingCopy;
-import org.eclipse.wst.internet.monitor.core.internal.provisional.MonitorCore;
-import org.eclipse.wst.server.core.util.SocketUtil;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-public class GetMonitorCommand extends AbstractDataModelOperation
-{
-  private boolean monitorService;
-  private boolean create;
-  private WebServicesParser webServicesParser;
-  private String wsdlURI;
-  private List endpoints;
-
-  public GetMonitorCommand()
-  {
-    monitorService = true;
-    create = true;
-  }
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    IEnvironment env = getEnvironment();
-    
-    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)
-                    {
-                      IStatus warning = StatusUtils.warningStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_UNABLE_TO_START_MONITOR, new Object[]{String.valueOf(port), endpoint}), 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)
-                    {
-                      IStatus warning = StatusUtils.warningStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_UNABLE_TO_START_MONITOR, new Object[]{String.valueOf(port), endpoint}), t);
-                      try
-                      {
-                        if (env != null)
-                          env.getStatusHandler().report(warning);
-                      }
-                      catch (StatusException se)
-                      {
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-    return Status.OK_STATUS;
-  }
-
-  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 b0ad9da58..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/JavaMofReflectionCommand.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.consumption.command.common;
-
-
-//core stuff
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jem.util.emf.workbench.nature.EMFNature;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-/**
-* 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 AbstractDataModelOperation
-{
-
-  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 String clientProject;
-  private JavaHelpers javaClass;
-  private String qname;
-  private String proxyBean;
- 
-  /**
-  * Constructs a new JavaMofReflectionCommand with the given label and description
-  * 
-  */
-  public JavaMofReflectionCommand()
-  {
-  }
-  
-  // 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 IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {    
- 	  //just make sure the project and qname are there
-  	//they are essential for this operation
-  	IStatus status = Status.OK_STATUS;
-  	IProject clientIProject = (IProject)ResourceUtils.findResource(clientProject);
-  	processQName();
-  	if(clientProject == null || qname == null)
-  	  return StatusUtils.warningStatus( ConsumptionMessages.MSG_WARN_UNABLE_TO_FIND_PROXY );
-  	
-    try {
-		EMFNature nature = JemProjectUtilities.getJEM_EMF_Nature(clientIProject, true);
-		javaClass = JavaRefFactory.eINSTANCE.reflectType(qname, nature.getResourceSet());
-	} catch (CoreException e) {
-	}
-    
-    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 5ca1c3224..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ManageServerStartUpCommand.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.wst.command.internal.env.core.common.ProgressUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-
-public class ManageServerStartUpCommand extends AbstractDataModelOperation
-{
-
-	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( ) {
-
-	}
-	
-	/**
-	 * Execute the command
-	 */
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-      IEnvironment env = getEnvironment();
-	    IStatus status = Status.OK_STATUS;
-	    ProgressUtils.report(monitor, ConsumptionMessages.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.setEnvironment( env );
-	    	spc.execute( null, null );
-	    }
-	    
-	    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.setEnvironment( env );
-	    	spc.execute( null, null );	    	
-	    }
-	    
-	    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 3e86dd4da..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/PublishProjectCommand.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.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.wst.command.internal.env.core.common.ProgressUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.ILog;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-
-public class PublishProjectCommand extends AbstractDataModelOperation 
-{
-
-
-private String project;
-private String serverTypeID;
-private IServer existingServer;
-
-
-/**
- * Default CTOR;
- */
-public PublishProjectCommand() {
-}
-
-/**
- * Execute the command
- */
-public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-{
-  IEnvironment env = getEnvironment();
-  
-  IStatus status = Status.OK_STATUS;
-  try
-  {
-    ProgressUtils.report( monitor, ConsumptionMessages.PROGRESS_INFO_PUBLISH_WEB_PROJECT );
-    
-    if (project == null){
-      status = StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_PROJECT_NOT_FOUND ); 
-      env.getStatusHandler().reportError(status);
-      return status;
-    }
-	
-    IProject iProject = (IProject)ResourceUtils.findResource(project);
-    IServer instance = ServerUtils.getServerForModule(ServerUtils.getModule(iProject), serverTypeID, existingServer, true, monitor);
-    if (instance == null)
-    {
-      status = StatusUtils.errorStatus(ConsumptionMessages.MSG_ERROR_INSTANCE_NOT_FOUND);
-      env.getStatusHandler().reportError(status);
-      return status;
-    }
-
-      IStatus returnedStatus = instance.publish(IServer.PUBLISH_INCREMENTAL, monitor);
-      status = returnedStatus;
-      
-      //getStatusMonitor().reportStatus (instance.publish(getProgressMonitor()));
-      env.getLog().log(ILog.OK, 5026, this, "execute", new String("project="+project+" successfully published"));
-      //ILog.write(PublishProjectCommand.class,"execute",ILog.OK,"project="+project+" successfully published");
-      return status;
-  }
-  catch (Exception e) {
-    status = StatusUtils.errorStatus(ConsumptionMessages.MSG_ERROR_PUBLISH, 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 f663b4846..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreBuildStateCommand.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.command.common;
-
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.datamodel.validate.ValidationManager;
-import org.eclipse.wst.command.internal.env.core.common.ProgressUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-public class RestoreBuildStateCommand extends AbstractDataModelOperation
-{
-
-  private ValidationManager manager_;
-  
-  /**
-   * Default CTOR;
-   */
-  public RestoreBuildStateCommand()
-  {
-  }
-
-  /**
-   * Execute the command
-   */
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    ProgressUtils.report( monitor, ConsumptionMessages.TASK_DESC_WEBSERVICE_RESTORE_BUILD);
-
-    manager_.restoreAutoBuild();
-
-    return Status.OK_STATUS;
-  }
-    
-  /**
-   * @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 6ae6317ea..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreValidationStateCommand.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.command.common;
-
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.datamodel.validate.ValidationManager;
-import org.eclipse.wst.command.internal.env.core.common.ProgressUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-public class RestoreValidationStateCommand extends AbstractDataModelOperation 
-{
-  private ValidationManager manager_;
-  
-  private boolean runValidation_;
-
-  /**
-   * Default CTOR;
-   */
-  public RestoreValidationStateCommand( boolean runValidation )
-  {
-    runValidation_ = runValidation;
-  }
-
-  /**
-   * Execute the command
-   */
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    ProgressUtils.report( monitor, ConsumptionMessages.TASK_DESC_WEBSERVICE_RESTORE_VALIDATION);
-
-    manager_.restoreValidationForProjects( runValidation_ );    
-
-    return Status.OK_STATUS;
-  }
-    
-  /**
-   * @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/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 ef01e27a5..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartProjectCommand.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.consumption.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.common.WebServiceStartServerRegistry;
-import org.eclipse.wst.command.internal.env.core.common.ProgressUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-
-public class StartProjectCommand extends AbstractDataModelOperation 
-{
-
-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_;
-
-
-/**
- * Default CTOR;
- */
-public StartProjectCommand( ) {
-
-}
-
-/**
- * Default CTOR;
- */
-public StartProjectCommand(boolean creationScenario ) {
-	creationScenario_ = new Boolean(creationScenario);
-}
-
-/**
- * Execute the command
- */
-public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-{
-    IEnvironment env = getEnvironment();    
-  
-    IStatus status = Status.OK_STATUS;
-    ProgressUtils.report( monitor, ConsumptionMessages.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 = StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_PROJECT_NOT_FOUND );  
-      env.getStatusHandler().reportError(status);
-      return status;
-    }	
-    IServer instance = ServerUtils.getServerForModule(ServerUtils.getModule(project), serverTypeID, server, true, monitor );
-    if (instance == null)
-    {
-      status = StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_INSTANCE_NOT_FOUND );
-      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, monitor, isWebProjectStartupRequested_);
-    	return status;
-   	}
-  catch (CoreException ce )
-  	{
-    	IStatus embeddedStatus = ce.getStatus();
-    	status = embeddedStatus;
-    	env.getStatusHandler().reportError(status);
-  		return status;
-  	}
-   catch (Exception e)
-   	{
-       status = StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_SERVER, 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/common/FacetMatcher.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FacetMatcher.java
deleted file mode 100644
index 5fac372d0..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FacetMatcher.java
+++ /dev/null
@@ -1,61 +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 java.util.Set;
-
-public class FacetMatcher
-{
-  private boolean match;
-  private Set facetsTested;
-  private Set facetsThatMatched;
-  private Set facetsToAdd;
-  
-  public Set getFacetsThatMatched()
-  {
-    return facetsThatMatched;
-  }
-  public void setFacetsThatMatched(Set facetsThatMatched)
-  {
-    this.facetsThatMatched = facetsThatMatched;
-  }
-  public Set getFacetsToAdd()
-  {
-    return facetsToAdd;
-  }
-  public void setFacetsToAdd(Set facetsToAdd)
-  {
-    this.facetsToAdd = facetsToAdd;
-  }
-  public boolean isMatch()
-  {
-    return match;
-  }
-  public void setMatch(boolean match)
-  {
-    this.match = match;
-  }
-  public Set getFacetsTested()
-  {
-    return facetsTested;
-  }
-  public void setFacetsTested(Set facetsTested)
-  {
-    this.facetsTested = facetsTested;
-  }
-  
-  
-
-  
-  
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FacetSetsByTemplateCache.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FacetSetsByTemplateCache.java
deleted file mode 100644
index f6f9e44d8..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FacetSetsByTemplateCache.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060131 121071   rsinha@ca.ibm.com - Rupam Kuehner (creation)
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.common;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.common.project.facet.core.VersionFormatException;
-
-
-public class FacetSetsByTemplateCache
-{
-  private static FacetSetsByTemplateCache instance_;
-  
-  private Hashtable facetSetsByTemplateId_;
-  /**
-   * Returns a singleton instance of this class.
-   * 
-   * @return A singleton FacetSetsByTemplateCache object.
-   */
-  public static synchronized FacetSetsByTemplateCache getInstance()
-  {
-    if (instance_ == null)
-    {
-      instance_ = new FacetSetsByTemplateCache();
-      instance_.load();
-    }
-    return instance_;
-  }
-  
-  private void load()
-  {
-    facetSetsByTemplateId_ = new Hashtable();
-  }  
-  
-  public synchronized Set[] getFacetVersionCombinationsFromTemplate(String templateId)
-  {
-    Set[] cachedCombinations = (Set[])facetSetsByTemplateId_.get(templateId);
-    if (cachedCombinations != null)
-    {
-      return cachedCombinations;
-    }
-    else
-    {
-      //ArrayList allValidCombinations = new ArrayList();
-      
-      IFacetedProjectTemplate template = ProjectFacetsManager.getTemplate(templateId);
-      Set fixedFacets = template.getFixedProjectFacets();
-      
-      //Create an array of arrays. Each element of the array will contain the array
-      //of IProjectFacetVersions for each IProjectFacet in the set of fixed facets.
-      Iterator itr = fixedFacets.iterator();
-      ArrayList projectFacetVersionArrays = new ArrayList();      
-
-      while (itr.hasNext())
-      {
-        IProjectFacet facet = (IProjectFacet) itr.next();
-        List versions = null;
-        try
-        {
-          versions = facet.getSortedVersions(true);
-        } catch (VersionFormatException e) {
-            Set versionSet = facet.getVersions();
-            Iterator versionSetItr = versionSet.iterator();
-            versions = new ArrayList();
-            while (versionSetItr.hasNext())
-            {
-                versions.add(itr.next());
-            }            
-        } catch (CoreException e) {
-          Set versionSet = facet.getVersions();
-          Iterator versionSetItr = versionSet.iterator();
-          versions = new ArrayList();
-          while (versionSetItr.hasNext())
-          {
-              versions.add(itr.next());
-          }            
-        }         
-        if (versions.size() > 0)
-        {
-          //Create an array of IProjectFacetVersions from versions.
-          Iterator versionItr = versions.iterator();
-          ArrayList arrayOfVersionsList = new ArrayList();
-          while (versionItr.hasNext())
-          {
-            IProjectFacetVersion pfv = (IProjectFacetVersion)versionItr.next();
-            arrayOfVersionsList.add(pfv);
-          }          
-          
-          //Add the array of versions to the list of arrays.
-          projectFacetVersionArrays.add((IProjectFacetVersion[])arrayOfVersionsList.toArray(new IProjectFacetVersion[0]));
-        }
-      }
-      
-      IProjectFacetVersion[][] arrayOfProjectFacetVersionArrays = (IProjectFacetVersion[][])projectFacetVersionArrays.toArray(new IProjectFacetVersion[0][0]);
-      Set[] allValidCombinationsArray = FacetUtils.getFacetCombinations(arrayOfProjectFacetVersionArrays, true);
-      facetSetsByTemplateId_.put(templateId, allValidCombinationsArray);
-      return allValidCombinationsArray;
-    }    
-  }  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FacetUtils.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FacetUtils.java
deleted file mode 100644
index 0c497c332..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FacetUtils.java
+++ /dev/null
@@ -1,841 +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
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060131 121071   rsinha@ca.ibm.com - Rupam Kuehner     
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.common;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-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.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.common.project.facet.core.VersionFormatException;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject.Action;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject.Action.Type;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-import org.eclipse.wst.common.project.facet.core.runtime.RuntimeManager;
-
-public class FacetUtils
-{
-
-  /**
-   * Returns a list of valid projects. Valid projects include projects with the facets nature or
-   * projects with the Java nature.
-   * @return IProject[] an array of valid projects
-   */
-  public static IProject[] getAllProjects()
-  {
-    //Return all projects in the workspace that have the project facet nature or that do not have the project
-    //facet nature but have the Java nature.
-    IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
-    ArrayList validProjects = new ArrayList();
-    for (int i = 0; i < projects.length; i++)
-    {
-      try
-      {
-        IFacetedProject facProject = ProjectFacetsManager.create(projects[i]);
-        if (facProject != null)
-        {
-          //Add it to the list
-          validProjects.add(projects[i]);
-        }
-        else
-        {
-          //Check if it's a Java project        
-          IJavaProject javaProject = null;    
-          javaProject = JavaCore.create(projects[i]);    
-          if (javaProject != null)
-          {
-            //Add it to the list
-            validProjects.add(projects[i]);
-          }
-        }
-      }
-      catch (CoreException ce)
-      {        
-      }      
-    }
-    return (IProject[])validProjects.toArray(new IProject[]{});
-  }
-  
-  /*
-   * @returns the set of project facets currently installed on this project. If the project
-   * is not a faceted project but is a Java project, facets are inferred from the Java project. 
-   *   (element type: {@see IProjectFacetVersion}) 
-   */
-  public static Set getFacetsForProject(String projectName)
-  {
-    Set facetVersions = null;
-    IProject project = ProjectUtilities.getProject(projectName);
-    if (project!=null && project.exists())
-    {
-      try
-      {
-        IFacetedProject fproject = ProjectFacetsManager.create(project);
-        if (fproject != null)
-        {
-          facetVersions = fproject.getProjectFacets();
-        } else
-        {
-          //If this is not a faceted project, it may still be okay if it is a Java project
-          //and the client runtime supports a Java project.
-          IJavaProject javaProject = null;
-          javaProject = JavaCore.create(project);    
-          if (javaProject != null)
-          {
-            facetVersions = FacetUtils.getFacetsForJavaProject(javaProject);
-          }
-        }
-      } catch (CoreException ce)
-      {
-
-      }      
-    }
-    
-    return facetVersions;
-    
-  }
-  
-  public static IRuntime getFacetRuntimeForProject(String projectName)
-  {
-    IProject project = ProjectUtilities.getProject(projectName);
-    if (project!=null && project.exists())
-    {
-      try
-      {
-        IFacetedProject fproject = ProjectFacetsManager.create(project);
-        if (fproject != null)
-        {
-          return fproject.getRuntime();
-        }
-      } catch (CoreException ce)
-      {
-      }
-    }
-    
-    return null;    
-  }
-  
-  
-  /*
-   * Return the set of all possible combinations of IProjectFacetVersions. For example,
-   * If arrayOfProjectFacetVersionArrays represents an array of IProjectFacetVersions that has
-   * a structure like this:
-   * FacetA_version1, FacetA_version2
-   * FacetB_version1
-   * FacetC_version1, FacetC_version2
-   * 
-   * Then the following 4 combinations of IProjectFacetVersions will be returned:
-   * [FacetA_version1, FacetB_version1, FacetC_version1]
-   * [FacetA_version2, FacetB_version1, FacetC_version1]
-   * [FacetA_version1, FacetB_version1, FacetC_version2]
-   * [FacetA_version2, FacetB_version1, FacetC_version2]
-   * 
-   * If returnValidOnly is false, all combinations are returned. Otherwise, only valid combinations
-   * are returned.
-   */
-  public static Set[] getFacetCombinations(IProjectFacetVersion[][] arrayOfProjectFacetVersionArrays, boolean returnValidOnly)  
-  {
-    ArrayList allCombinations = new ArrayList();
-    //maxCount contains the number of versions in each array of IProjectFacetVersions.
-    //initialize counter, which will be used to navigate arrayOfProjectFacetVersionArrays.
-    int n = arrayOfProjectFacetVersionArrays.length;
-    int[] maxCount = new int[n];
-    int[] counter = new int[n];
-    for (int i=0; i<n; i++)
-    {
-      maxCount[i] = arrayOfProjectFacetVersionArrays[i].length - 1;
-      counter[i] = 0;
-    }      
-    
-    //Navigate arrayOfProjectFacetVersionArrays to create all possible combinations.
-    boolean done = false;
-    while (!done)
-    {
-      //Create a combination of size n using current values in counter.
-      //Add it to the list of all combinations, checking first for validity if returnValidOnly is true.
-      Set combination = new HashSet();
-      for (int j=0; j<n; j++)
-      {
-        IProjectFacetVersion pfv = arrayOfProjectFacetVersionArrays[j][counter[j]];
-        combination.add(pfv);
-      }
-      
-      //Check if valid.
-      if (returnValidOnly)
-      {
-        Set actions = getInstallActions(combination);
-        if( ProjectFacetsManager.check( new HashSet(), actions ).getSeverity() == IStatus.OK )        
-        {
-          allCombinations.add((combination));
-        }
-      }
-      else
-      {
-        allCombinations.add((combination));
-      }
-      
-      //Update the counters.
-      for (int p=0; p<n; p++)
-      {
-        if ( (counter[p] + 1) <= maxCount[p])
-        {
-          (counter[p])++;
-          break;
-        }
-        else
-        {
-          counter[p] = 0;
-          if (p == n-1)
-          {
-            done = true;
-          }
-        }
-      }
-    }
-    
-    Set[] allCombinationsArray = (Set[])allCombinations.toArray(new Set[0]);    
-    return allCombinationsArray;    
-  }
-  
-  public static Set getInitialFacetVersionsFromTemplate(String templateId)
-  {
-    IFacetedProjectTemplate template = ProjectFacetsManager.getTemplate(templateId);
-    Set fixedFacets = template.getFixedProjectFacets(); 
-    HashSet initial = new HashSet(); 
-    for (Iterator itr2 = fixedFacets.iterator(); itr2.hasNext(); ) 
-    { 
-      IProjectFacet facet = (IProjectFacet) itr2.next(); 
-      IProjectFacetVersion highestFacetVersion = null;
-      try {
-    	  if (isJavaFacet(facet)) //special case the java facet because 1.4 is a better default than 5.0 for now.
-    	  {
-    		  highestFacetVersion = facet.getVersion("1.4");
-    	  } else {
-    		  highestFacetVersion = facet.getLatestVersion();
-    	  }
-      } catch (VersionFormatException e) {
-      } catch (CoreException e) {
-      }
-      initial.add(highestFacetVersion); 
-    }             
-    
-    return initial;
-  }
-  
-  public static String[] getTemplateLabels(String[] templateIds)
-  {
-    String[] labels = new String[templateIds.length];
-    for (int i=0; i<templateIds.length; i++)
-    {
-      IFacetedProjectTemplate template = ProjectFacetsManager.getTemplate(templateIds[i]);      
-      labels[i] = template.getLabel();
-    }
-    return labels;
-    
-  }
-  
-  public static String getTemplateIdByLabel(String templateLabel)
-  {
-    for( Iterator itr = ProjectFacetsManager.getTemplates().iterator(); itr.hasNext(); )
-    {
-        final IFacetedProjectTemplate template = (IFacetedProjectTemplate) itr.next();
-        if (template.getLabel().equals(templateLabel))
-        {
-          return template.getId();
-
-        }
-    }
-    
-    return "";
-  }
-  
-  public static String getTemplateLabelById(String templateId)
-  {
-    IFacetedProjectTemplate template = ProjectFacetsManager.getTemplate(templateId);
-    return template.getLabel();
-  }
-  
-  public static Set getInstallActions(Set projectFacetVersions)
-  {
-    HashSet actions = new HashSet();
-    
-    Iterator facets = projectFacetVersions.iterator();
-    
-    while(facets.hasNext())
-    {
-      IProjectFacetVersion fv = (IProjectFacetVersion)facets.next();
-      Action action = new Action(Type.INSTALL, fv, null);
-      actions.add(action);
-    }
-    
-    return actions;
-  }
-  
-  public static FacetMatcher match(RequiredFacetVersion[] requiredFacetVersions, Set projectFacetVersions)
-  {
-    FacetMatcher fm = new FacetMatcher();
-    fm.setFacetsTested(projectFacetVersions);
-    HashSet facetsToAdd = new HashSet();
-    HashSet requiredFacetVersionsToAdd = new HashSet();
-    HashSet facetsThatMatched = new HashSet();
-    for (int i=0; i<requiredFacetVersions.length; i++)
-    {
-      RequiredFacetVersion rfv = requiredFacetVersions[i];
-      IProjectFacetVersion rpfv = rfv.getProjectFacetVersion();
-      String rid = rpfv.getProjectFacet().getId();
-      String rv = rpfv.getVersionString();
-      boolean facetPresent = false;
-
-      //Is the project facet present? or a later version of applicable.
-      Iterator itr = projectFacetVersions.iterator();
-      while(itr.hasNext())
-      {
-        IProjectFacetVersion pfv = (IProjectFacetVersion)itr.next();
-        String id = pfv.getProjectFacet().getId();
-        String version = pfv.getVersionString();
-        if (rid.equals(id))
-        {
-          if (rv.equals(version))
-          {
-            //found an exact match
-            facetPresent = true;
-            facetsThatMatched.add(pfv);
-          }
-          else
-          {
-            if (rfv.getAllowNewer())
-            {
-              if (greaterThan(version, rv))
-              {
-                //found a match
-                facetPresent = true;
-                facetsThatMatched.add(pfv);
-              }
-            }
-          }
-          //No need to keep iterating since we hit a facet with the same id;
-          break;
-        }
-      }
-      
-      //if not present, put it in the list to check if it can be added.
-      if (!facetPresent)
-      {
-        facetsToAdd.add(rpfv);
-        requiredFacetVersionsToAdd.add(rfv);
-      }
-      
-    }
-    
-    //Check if the facetsToAdd can be added
-    if (requiredFacetVersionsToAdd.size() > 0)
-    {
-      //Test all possible combinations of the facets that need to be added
-      //Create an array of arrays. Each element of the array will contain the array
-      //of the permitted IProjectFacetVersions for each required facet.
-      boolean facetsCanBeAdded = false;
-      Iterator itr = requiredFacetVersionsToAdd.iterator();
-      ArrayList projectFacetVersionArrays = new ArrayList();      
-
-      while (itr.hasNext())
-      {
-        RequiredFacetVersion reqFacetVersion = (RequiredFacetVersion) itr.next();
-        IProjectFacetVersion[] versions = reqFacetVersion.getAllowedProjectFacetVersions();
-        if (versions != null && versions.length > 0)
-        {          
-          //Add the array of versions to the list of arrays.
-          projectFacetVersionArrays.add(versions);
-        }
-      }
-      
-      IProjectFacetVersion[][] arrayOfProjectFacetVersionArrays = (IProjectFacetVersion[][])projectFacetVersionArrays.toArray(new IProjectFacetVersion[0][0]);
-      Set[] combinations = getFacetCombinations(arrayOfProjectFacetVersionArrays, false);
-      for (int i=0; i<combinations.length; i++)
-      {
-        //Check if the set can be added. If so, this is a match. Update the facet matcher and break.
-        Set actions = getInstallActions(combinations[i]);
-        if( ProjectFacetsManager.check( projectFacetVersions, actions ).getSeverity() == IStatus.OK )
-        {
-          //Facets can be added so there is a match
-          facetsCanBeAdded=true;
-          fm.setMatch(true);
-          fm.setFacetsThatMatched(facetsThatMatched);
-          fm.setFacetsToAdd(combinations[i]);
-          break;
-        }                
-      }
-      
-      
-      if (!facetsCanBeAdded)
-      {
-        fm.setMatch(false);
-      }      
-    }
-    else
-    {
-      //There are no facets to add.
-      fm.setMatch(true);
-      fm.setFacetsThatMatched(facetsThatMatched);
-      fm.setFacetsToAdd(facetsToAdd);
-    }
-    
-    return fm;
-  }
-  
-  public static IStatus addRequiredFacetsToProject(IProject project, RequiredFacetVersion[] rfvs, IProgressMonitor monitor)
-  {
-    IStatus status = Status.OK_STATUS;
-    
-    Set missingFacets = null;
-    Set facetsToAdd = new HashSet();
-    try
-    {
-      IFacetedProject fProject = ProjectFacetsManager.create(project);
-      if (fProject != null)
-      {
-        Set projectFacetVersions = fProject.getProjectFacets();
-        FacetMatcher projectFacetMatcher = FacetUtils.match(rfvs, projectFacetVersions);
-        if (projectFacetMatcher.isMatch())
-        {
-          missingFacets = projectFacetMatcher.getFacetsToAdd();
-          if (missingFacets.size() > 0)
-          {
-            IRuntime fRuntime = null;
-            fRuntime = FacetUtils.getFacetRuntimeForProject(project.getName());
-            if (fRuntime != null)
-            {  
-              //Add the highest version supported by the runtime the project is bound to.
-              Iterator missingFacetsItr = missingFacets.iterator();
-              while (missingFacetsItr.hasNext())
-              {
-                IProjectFacet facet = ((IProjectFacetVersion)missingFacetsItr.next()).getProjectFacet();
-                //Get the highest level of this facet supported by the runtime.
-                List versions = null;
-                try {
-                    versions = facet.getSortedVersions(false);
-                } catch (VersionFormatException e) {
-                    Set versionSet = facet.getVersions();
-                    Iterator itr = versionSet.iterator();
-                    versions = new ArrayList();
-                    while (itr.hasNext())
-                    {
-                        versions.add(itr.next());
-                    }            
-                } catch (CoreException e) {
-                    Set versionSet = facet.getVersions();
-                    Iterator itr = versionSet.iterator();
-                    versions = new ArrayList();
-                    while (itr.hasNext())
-                    {
-                        versions.add(itr.next());
-                    }            
-                }
-                
-                //Iterate over the versions in descending order and pick the 
-                //first one that fRuntime supports.
-                Iterator versionsItr = versions.iterator();
-                while(versionsItr.hasNext())
-                {
-                  boolean match = false;
-                  IProjectFacetVersion pfv = (IProjectFacetVersion)versionsItr.next();
-                  Set pfvs = new HashSet();
-                  pfvs.add(pfv);
-                  
-                  //Check the required facets to see if this version of this facet is supported.
-                  for (int j=0; j<rfvs.length; j++)
-                  {
-                    RequiredFacetVersion rfv = rfvs[j];
-                    IProjectFacetVersion rpfv = rfv.getProjectFacetVersion();
-                    if (rpfv.getProjectFacet().getId().equals(pfv.getProjectFacet().getId()))
-                    {
-                      if (rpfv.getVersionString().equals(pfv.getVersionString()))
-                      {
-                        match = true;
-                      }
-                      else
-                      {
-                        if (rfv.getAllowNewer())
-                        {
-                          if (greaterThan(pfv.getVersionString(), rpfv.getVersionString()))
-                          {
-                            match = true;
-                          }
-                        }
-                      }
-                    }
-                  }
-                  
-                  if (match)
-                  {
-                    //Check against Runtime
-                    if (FacetUtils.doesRuntimeSupportFacets(fRuntime, pfvs))
-                    {
-                      //We have a match. Add this one to the master set.
-                      facetsToAdd.add(pfv);
-                      break;
-                    }
-                  }                            
-                }              
-              }
-            }
-            else
-            {
-              facetsToAdd = missingFacets;
-            }
-
-            Set actions = FacetUtils.getInstallActions(facetsToAdd);
-            fProject.modify(actions, monitor);
-          }
-        }            
-      }
-    } catch (CoreException ce)
-    {
-      //Display an appropriate error message to the user.
-      //A CoreException could have been thrown for any of the following three reasons
-      //1. The project does not exist
-      //2. The project is not open
-      //3. There was a problem adding the facets to the project.
-      
-      if (!project.exists())
-      {
-        status = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_PROJECT_DOES_NOT_EXIST, new String[] { project.getName()}));            
-      }
-      else if (!project.isOpen())
-      {
-        status = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_PROJECT_IS_NOT_OPEN, new String[] { project.getName()}));            
-      }
-      else
-      { 
-        //Iterate over facets to add to form error message
-        Iterator itr = facetsToAdd.iterator();
-        int size = facetsToAdd.size();
-        if (size > 0)
-        {          
-          IProjectFacetVersion firstProjectFacetVersion = (IProjectFacetVersion)itr.next();
-          String facetList = firstProjectFacetVersion.getProjectFacet().getLabel();
-          while (itr.hasNext())
-          {
-            IProjectFacetVersion pfv = (IProjectFacetVersion)itr.next();
-            String pfvLabel = pfv.getProjectFacet().getLabel();
-            facetList = NLS.bind(ConsumptionMessages.MSG_FACETS, new String[] {facetList, pfvLabel});
-          }
-          status = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_ADDING_FACETS_TO_PROJECT, new String[] { project.getName(), facetList}));
-        }            
-      }
-    }
-    
-    return status;
-  }
-  
-  public static Set getFacetsForJavaProject(IJavaProject javaProject)
-  {
-    Set facets = new HashSet();
-    String jdkComplianceLevel = null;
-    if (javaProject!=null)
-    {
-      jdkComplianceLevel = javaProject.getOption("org.eclipse.jdt.core.compiler.compliance", false);
-      if (jdkComplianceLevel == null)
-      {
-        jdkComplianceLevel = (String)JavaCore.getDefaultOptions().get("org.eclipse.jdt.core.compiler.compliance");
-        if (jdkComplianceLevel == null)
-        {
-          jdkComplianceLevel = "1.4";
-        }
-      }
-    }
-    
-    IProjectFacet javaFacet = ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_JAVA);
-    IProjectFacetVersion javaFacetVersion = null;
-    if (jdkComplianceLevel.equals("1.3"))
-    {
-      javaFacetVersion = javaFacet.getVersion("1.3");
-    }
-    else if (jdkComplianceLevel.equals("1.4"))
-    {
-      javaFacetVersion = javaFacet.getVersion("1.4");
-    }
-    else if (jdkComplianceLevel.equals("1.5"))
-    {
-      javaFacetVersion = javaFacet.getVersion("5.0");
-    }
-    else
-    {
-      javaFacetVersion = javaFacet.getVersion("1.4");
-    }
- 
-    facets.add(javaFacetVersion);
-    IProjectFacet utilityFacet = ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_UTILITY_MODULE);
-    IProjectFacetVersion utilityFacetVersion = null;
-    try
-    {
-      utilityFacetVersion = utilityFacet.getLatestVersion();
-    }
-    catch (CoreException ce)
-    {
-      
-    }
-    if (utilityFacetVersion != null)
-    {
-      facets.add(utilityFacetVersion);
-    }
-    return facets;
-  }
-  
-  
-  //Methods related to facet runtimes.
-  
-  public static Set getRuntimes(RequiredFacetVersion[] requiredFacetVersions)
-  {
-    //Form the sets of IProjectFacetVersions these RequiredFacetVersions represent.
-    ArrayList listOfFacetSets = new ArrayList();
-    
-    HashSet facets = new HashSet();
-    int javaFacetIndex = -1;
-    for (int i=0; i<requiredFacetVersions.length; i++)
-    {
-      IProjectFacetVersion pfv = requiredFacetVersions[i].getProjectFacetVersion();
-      if (FacetUtils.isJavaFacet(pfv.getProjectFacet()))
-      {
-        //Remember the index
-        javaFacetIndex = i;
-      }
-      facets.add(requiredFacetVersions[i].getProjectFacetVersion());
-    }
-    
-    listOfFacetSets.add(facets);
-    
-    //If the java facet was one of the facets in the set, and new versions of java are allowed,
-    //create sets that contain the newer permitted versions of the java facets.
-    if (javaFacetIndex > -1)
-    {
-      ArrayList permittedJavaVersions = new ArrayList();
-      RequiredFacetVersion rfv = requiredFacetVersions[javaFacetIndex];
-      if (rfv.getAllowNewer())
-      {
-        String version = rfv.getProjectFacetVersion().getVersionString();      
-        Set allVersions = rfv.getProjectFacetVersion().getProjectFacet().getVersions();
-        Iterator itr = allVersions.iterator();
-        while (itr.hasNext())
-        {
-          IProjectFacetVersion thisPfv = (IProjectFacetVersion)itr.next();
-          String thisVersion = thisPfv.getVersionString();
-          if (greaterThan(thisVersion, version))
-          {
-            permittedJavaVersions.add(thisVersion);
-          }          
-        }
-        
-        String[] javaVersions = (String[])permittedJavaVersions.toArray(new String[0]);
-        
-        for (int j=0; j<javaVersions.length; j++)
-        {
-          HashSet thisFacetSet = new HashSet();
-          
-          for (int k=0; k<requiredFacetVersions.length; k++)
-          {
-             if (k==javaFacetIndex)
-             {
-               IProjectFacetVersion pfv = requiredFacetVersions[k].getProjectFacetVersion().getProjectFacet().getVersion(javaVersions[j]);
-               thisFacetSet.add(pfv);
-             }
-             else
-             {
-               IProjectFacetVersion pfv = requiredFacetVersions[k].getProjectFacetVersion();
-               thisFacetSet.add(pfv);
-             }
-          }
-          
-          listOfFacetSets.add(thisFacetSet);          
-        }
-      }
-    }
-    
-    //Return the union of runtimes for all the facetSets.
-    return getRuntimes((Set[])listOfFacetSets.toArray(new Set[0]));
-    
-  }  
-  
-  public static boolean isFacetRuntimeSupported(RequiredFacetVersion[] requiredFacetVersions, String fRuntimeName)
-  {
-    Set fRuntimes = getRuntimes(requiredFacetVersions);
-    Iterator itr = fRuntimes.iterator();
-    while (itr.hasNext())
-    {
-      IRuntime runtime = (IRuntime)itr.next();
-      if (runtime.getName().equals(fRuntimeName))
-      {
-        return true;
-      }      
-    }
-    
-    return false;
-  }
-    
-  public static Set getRuntimes(Set[] facetSets)  
-  {
-    HashSet unionSet = new HashSet();
-    for (int i=0; i<facetSets.length; i++)
-    {
-      Set facets = facetSets[i];
-      Set runtimes = RuntimeManager.getRuntimes(facets);
-      Iterator itr = runtimes.iterator();
-      while (itr.hasNext())
-      {
-        IRuntime runtime = (IRuntime)itr.next();
-        if (!unionSet.contains(runtime))
-        {
-          unionSet.add(runtime);
-        }
-      }
-    }
-    return unionSet;
-  }
-  
-  public static boolean doesRuntimeSupportFacets(IRuntime facetRuntime, Set projectFacetVersions)
-  {
-    Set runtimes = RuntimeManager.getRuntimes(projectFacetVersions);
-    Iterator itr = runtimes.iterator();
-    while (itr.hasNext())
-    {
-      IRuntime runtime = (IRuntime)itr.next();
-      if (runtime.getName().equals(facetRuntime.getName()))
-      {
-        return true;
-      }
-    }
-    
-    return false;
-  }
-  
-  /*
-   * @param versionA version number of the form 1.2.3
-   * @param versionA version number of the form 1.2.3
-   * @return boolean returns whether versionA is greater than versionB
-   */
-  public static boolean greaterThan(String versionA, String versionB)
-  {
-    StringTokenizer stA = new StringTokenizer(versionA, ".");
-    StringTokenizer stB = new StringTokenizer(versionB, ".");
-    
-    int sizeA = stA.countTokens();
-    int sizeB = stB.countTokens();
-    
-    int size;
-    if (sizeA < sizeB)
-    {
-      size = sizeA;
-    }
-    else
-      size = sizeB;
-    
-    for (int i=0; i<size; i++)
-    {
-      int a = Integer.parseInt(stA.nextToken());
-      int b = Integer.parseInt(stB.nextToken());
-      if (a!=b)
-      {
-        return a > b;
-      }      
-    }
-    
-    return sizeA > sizeB;
-  }
-  
-  public static boolean isJavaFacet(IProjectFacet pf)
-  {
-    if (pf.getId().equals("jst.java"))
-      return true;
-    else
-      return false;
-  }
-  
-  public static boolean isJavaProject(IProject project)
-  {
-    //Check if it's a faceted project
-    try
-    {
-      IFacetedProject fProject = ProjectFacetsManager.create(project);
-      if (fProject != null)
-      {
-        //Return true if it's a utility project
-        if (J2EEUtils.isJavaComponent(project))
-        {
-          return true;
-        }
-        else
-        {
-          //See if the java facet is the only one it has.
-          Set facets = fProject.getProjectFacets();
-          if (facets.size()==1)
-          {
-            IProjectFacetVersion pfv = (IProjectFacetVersion)facets.iterator().next();
-            if (isJavaFacet(pfv.getProjectFacet()))
-            {
-              return true;
-            }
-          }
-        }
-      }
-      else
-      {
-        IJavaProject javaProject = null;    
-        javaProject = JavaCore.create(project);    
-        if (javaProject != null)
-        {
-          return true;
-        }        
-      }
-    } catch (CoreException ce)
-    {
-      
-    }
-
-    return false;
-  }
-  
-  public static boolean isUtilityTemplate(String templateId)
-  {
-    if (ProjectFacetsManager.isTemplateDefined(templateId))
-    {
-      if (templateId.equals("template.jst.utility"))
-      {
-        return true;
-      }
-    }
-    
-    return 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 e78fcf032..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FolderResourceFilter.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (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.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.osgi.util.NLS;
-
-
-/**
-* This is a kind of 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
-{
-
-  /**
-  * 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 ConsumptionMessages.FOLDER_FILTER_NAME;
-  }
-
-  /**
-  * Returns the locale-specific description of this filter.
-  * @return The locale-specific description of this filter.
-  */
-  public String getDescription ()
-  {
-    return ConsumptionMessages.FOLDER_FILTER_DESC;
-  }
-
- public IStatus statusOf ( Object object )
-  {
-    if (object == null)
-    {
-      return new Status(
-        IStatus.ERROR,
-        WebServiceConsumptionPlugin.ID,
-        0,
-        ConsumptionMessages.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,
-          NLS.bind(ConsumptionMessages.FILTER_MSG_ERROR_NOT_FOLDER,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/IServerDefaulter.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/IServerDefaulter.java
deleted file mode 100644
index fc1f1d910..000000000
--- 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 a15eb540a..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/JavaResourceFilter.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*******************************************************************************
- * Copyright (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.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.osgi.util.NLS;
-
-
-/**
-* This is a kind of 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
-{
-
-  /**
-  * 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 ConsumptionMessages.JAVA_FILTER_NAME;
-  }
-
-  /**
-  * Returns the locale-specific description of this filter.
-  * @return The locale-specific description of this filter.
-  */
-  public String getDescription ()
-  {
-    return ConsumptionMessages.JAVA_FILTER_DESC;
-  }
-
-  /**
-  * Returns an {@link org.eclipse.core.runtime.IStatus}
-  * describing the <code>Filter</code>'s assessment of
-  * the given <code>object</code>.
-  * @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,
-        ConsumptionMessages.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,
-          NLS.bind(ConsumptionMessages.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,
-        NLS.bind(ConsumptionMessages.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 e8da47621..000000000
--- 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, String componentName)
-  {
-    IPath wsdlFolder=null;
-//  	IPath webModuleServerRoot = ResourceUtils.getWebModuleServerRoot( project ).getFullPath();
-  	IPath webModuleServerRoot = J2EEUtils.getWebContentPath(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 bf7f4f058..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/PropertiesResourceFilter.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.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.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.osgi.util.NLS;
-
-
-/**
-* This is a kind of 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
-{
- 
-  /**
-  * 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 ConsumptionMessages.PROPERTIES_FILTER_NAME;
-  }
-
-  /**
-  * Returns the locale-specific description of this filter.
-  * @return The locale-specific description of this filter.
-  */
-  public String getDescription ()
-  {
-    return ConsumptionMessages.PROPERTIES_FILTER_DESC;
-  }
-
-  /**
-  * Returns an {@link org.eclipse.core.runtime.IStatus}
-  * describing the <code>Filter</code>'s assessment of
-  * the given <code>object</code>.
-  * @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,
-        ConsumptionMessages.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,
-          NLS.bind(ConsumptionMessages.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,
-        NLS.bind(ConsumptionMessages.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/RequiredFacetVersion.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/RequiredFacetVersion.java
deleted file mode 100644
index 4a501df52..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/RequiredFacetVersion.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
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060131 121071   rsinha@ca.ibm.com - Rupam Kuehner          
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.common;
-
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-public class RequiredFacetVersion
-{
-  private IProjectFacetVersion projectFacetVersion;
-  private boolean allowNewer;
-  private IProjectFacetVersion[] allowedProjectFacetVersions;
-  
-  public boolean getAllowNewer()
-  {
-    return allowNewer;
-  }
-  public void setAllowNewer(boolean allowNewer)
-  {
-    this.allowNewer = allowNewer;
-  }
-  public IProjectFacetVersion getProjectFacetVersion()
-  {
-    return projectFacetVersion;
-  }
-  public void setProjectFacetVersion(IProjectFacetVersion projectFacetVersion)
-  {
-    this.projectFacetVersion = projectFacetVersion;
-  }  
-  public IProjectFacetVersion[] getAllowedProjectFacetVersions()  
-  {
-    if (allowedProjectFacetVersions == null)
-    {
-      ArrayList versions = new ArrayList();
-      IProjectFacetVersion minpfv = getProjectFacetVersion();
-      versions.add(minpfv);
-      //If allow-newer is true, add all the versions greater than the min version.
-      if (getAllowNewer())
-      {
-        String minVersion = minpfv.getVersionString();
-        Iterator allVersionsItr = minpfv.getProjectFacet().getVersions().iterator();
-        while (allVersionsItr.hasNext())
-        {
-          IProjectFacetVersion testpfv = (IProjectFacetVersion)allVersionsItr.next();
-          String testVersion = testpfv.getVersionString();
-          if (FacetUtils.greaterThan(testVersion, minVersion))
-          {
-            versions.add(testpfv);              
-          }
-        }      
-      }
-      
-      allowedProjectFacetVersions = (IProjectFacetVersion[])versions.toArray(new IProjectFacetVersion[0]);      
-    }
-    
-    return allowedProjectFacetVersions;
-  }
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/ScenarioCleanupCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/ScenarioCleanupCommand.java
deleted file mode 100644
index 91ef77815..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/ScenarioCleanupCommand.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.consumption.common;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
- *  This command is intended to clean up data after either the
- *  client or service wizards.  Currently is just resets the
- *  parser factory. 
- *
- */
-public class ScenarioCleanupCommand extends AbstractDataModelOperation
-{
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-	  WSDLParserFactory.killParser();
-	
-	  return Status.OK_STATUS;
-  }
-
-  
-  public IStatus undo( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-	  // Even if the user cancels out of the wizard we want to
-	  // kill the parser.
-	  WSDLParserFactory.killParser();
-    
-    return Status.OK_STATUS;
-  }
-}
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 0625cb2e3..000000000
--- 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 a6dd1815a..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WSDLParserFactory.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.jst.ws.internal.consumption.common;
-
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.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.
- *
- */
-//TODO We need to find a better way to pass around the parser than
-//     using this singleton factory.  Hopefully, we can then delete
-//     this class.
-public class WSDLParserFactory 
-{
-  private static WebServicesParserExt parser_;
-  
-  private WSDLParserFactory()
-  {
-  }
-  
-  public static WebServicesParser getWSDLParser()
-  {
-    if( parser_ == null )
-	{
-	  parser_ = new WebServicesParserExt();
-	}
-	
-	return parser_;
-  }
-  
-  public static void killParser()
-  {
-    parser_ = null;
-  }
-}
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 880819506..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WSDLResourceFilter.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (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.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.osgi.util.NLS;
-
-
-/**
-* This is a kind of 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
-{
-  /**
-  * 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 ConsumptionMessages.WSDL_FILTER_NAME;
-  }
-
-  /**
-  * Returns the locale-specific description of this filter.
-  * @return The locale-specific description of this filter.
-  */
-  public String getDescription ()
-  {
-    return ConsumptionMessages.WSDL_FILTER_DESC;
-  }
-
-  /**
-  * Returns an {@link org.eclipse.core.runtime.IStatus}
-  * describing the <code>Filter</code>'s assessment of
-  * the given <code>object</code>.
-  * @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,
-        ConsumptionMessages.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,
-          NLS.bind(ConsumptionMessages.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,
-        NLS.bind(ConsumptionMessages.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 59b3831ce..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WebServiceStartServerRegistry.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.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.common.environment.EnvironmentService;
-import org.eclipse.wst.common.environment.ILog;
-
-
-
-/**
-* 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)
-      {
-        ILog log = EnvironmentService.getEclipseLog();
-        log.log(ILog.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 c07aa7287..000000000
--- 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 0c7ce9c62..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ArrayType.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;
-
-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.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public ArrayType(String typeName)
-  {
-    this(TypeFactory.ARRAY_NAME,typeName);
-  }
-
-  public ArrayType(String name,String typeName)
-  {
-    super(name);
-  } 
-
- 
-   /**
-  * 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 c3cc514bb..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/AttributeElement.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.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 0b0b6fc88..000000000
--- 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 fc9c4f01f..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BeanElement.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 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 1ed79927a..000000000
--- 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 24da0c1c0..000000000
--- 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 acf6033cc..000000000
--- 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 4861a696f..000000000
--- 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 6a839891b..000000000
--- 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 c0406ac6b..000000000
--- 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 eceb2eb6e..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/FieldElement.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (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 d7cfbf9c4..000000000
--- 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 a1ff2cf46..000000000
--- 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 0035bfbe8..000000000
--- 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 52e8d6032..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/MethodElement.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.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 36f08a8b8..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ParameterElement.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.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 387306178..000000000
--- 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 f58ad9d80..000000000
--- 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 5045d26dd..000000000
--- 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 d52f90393..000000000
--- 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 7b362e718..000000000
--- 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 200f9d7ca..000000000
--- 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 2f33dd929..000000000
--- 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 f71523669..000000000
--- 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 ef0c82698..000000000
--- 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 8f91ce6ac..000000000
--- 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 4b5176766..000000000
--- 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 fc721a809..000000000
--- 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 289e009e5..000000000
--- 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 f478345d1..000000000
--- 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 e81948248..000000000
--- 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 50cb4cfbe..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/StateLessBeanType.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.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.";
-
-
-  /**
-  *Constructor
-  *
-  */
-  
-  public StateLessBeanType(String name)
-  {
-    super(TypeFactory.STATELESS_BEAN);
-  }
-
-  
-}
-
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 1b99c746e..000000000
--- 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 f1592f6aa..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/TypeElement.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*******************************************************************************
- * Copyright (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 f7a176058..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/TypeFactory.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*******************************************************************************
- * Copyright (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 9c0fb28c8..000000000
--- 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 5a0718ddc..000000000
--- 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 5fde91e13..000000000
--- 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 1e8647fd2..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/validate/ValidationManager.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.datamodel.validate;
-
-import java.util.HashSet;
-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 )
-  {
-  }
-
-  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 e7ca18741..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/BindingElement.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;
-
-
-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 723975828..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/DefinitionElement.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.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 f0d010cbc..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/MessageElement.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.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 2f501e067..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/OperationElement.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.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 d80ffbb39..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/PartElement.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.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 78e2ac4af..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/PortElement.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (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 08f6883f8..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/PortTypeElement.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.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 3302d8968..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/ServiceElement.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.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 64611e868..000000000
--- 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");
-    new OperationElement(bind2,"op1");
-    new OperationElement(bind3,"op1");
-    new OperationElement(bind4,"op1");
-    MessageElement me1 = new MessageElement(op1,"me1");
-    MessageElement me2 = new MessageElement(op1,"me2");
-    new PartElement(me1,"pe1");
-    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");
-    new OperationElement(bind5,"op1");
-    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 a9e89d3bc..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/WSDLElement.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (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 65cab80e0..000000000
--- 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.internal.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 0b09cf2a8..000000000
--- 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.internal.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 6a3f5cf25..000000000
--- 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.internal.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 a3da3d86d..000000000
--- 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.internal.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 7cd1b4c2f..000000000
--- 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.internal.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 5c1db7301..000000000
--- 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.internal.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 a0e9c21ec..000000000
--- 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.internal.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 af8268a89..000000000
--- 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.internal.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 ac20679c5..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/plugin/WebServiceConsumptionPlugin.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.plugin;
-
-import java.text.MessageFormat;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-
-/**
-* This is the plugin class for the Web Services plugin.
-* <p>
-* This plugin contains the 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_;
-
-  /**
-  * 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 e485e04f3..000000000
--- 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.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-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;
-
-
-/**
-* 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 IStatus 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 Status.OK_STATUS;
-  }
-}
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 83719d761..000000000
--- 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.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-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.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 IStatus 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 Status.OK_STATUS;
-
-    }
-}
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 9cca6548f..000000000
--- 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.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-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.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 IStatus visit (Object object)
-  {
-     Element methodElement = (Element)object;
-     MethodElement method = (MethodElement)methodElement;
-     if (method.getMethodOmmission()) return Status.OK_STATUS;
-     
-     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 Status.OK_STATUS;
-     
-  
-  }   
-  
-}
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 9e9232b70..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileHelp2Generator.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (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.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.TypeVisitor;
-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 IStatus visit (Object object)
-  {
-      Element parameterElement = (Element)object;
-      getVisitor();
-
-      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 Status.OK_STATUS;
-  
-  }
-
-  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 f6d45c3df..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileTypeGenerator.java
+++ /dev/null
@@ -1,291 +0,0 @@
-/*******************************************************************************
- * Copyright (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.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-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;
-
-
-/**
-* 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 IStatus 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 Status.OK_STATUS;
-
-     //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 Status.OK_STATUS;
-  }
-}
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 a8f4cb17e..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/LevelsDeepVisitorAction.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.sampleapp.codegen;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-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.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 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)
-  {
-  }
-
-
-  /**
-  * 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 IStatus 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 Status.OK_STATUS;   
-  }
-
-}
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 3a8973402..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/MethodFileGenerator.java
+++ /dev/null
@@ -1,77 +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.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-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.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 IStatus visit (Object object)
-   {
-      Element beanElement = (Element)object;
-      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 Status.OK_STATUS;
-  }
-}
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 45ff5f9e2..000000000
--- 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.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.MethodElement;
-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 IStatus visit (Object object)
-  {
-      Element methodElement = (Element)object;
-      MethodElement method = (MethodElement)methodElement;
-      if (method.getMethodOmmission()) return Status.OK_STATUS;
-      
-      fbuffer.append("<LI><A HREF=\"" + fInputName + "?method=" + method.getNumberID());
-      fbuffer.append("\" TARGET=\"inputs\"> " + method.getDisplayName());
-      fbuffer.append("</A></LI>" + StringUtils.NEWLINE);
-
-      return Status.OK_STATUS;
-  }
-
-
-}
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 34e7a4da0..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileAttributeGenerator.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.sampleapp.codegen;
-
-import java.util.Vector;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-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.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 IStatus 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 Status.OK_STATUS; 
-     putResidentVector(attributeElementType.getSetterSignature((String)setterInputs.firstElement()));
-     
-     return Status.OK_STATUS;
-  }   
-
-  
-  
-}
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 586bba91a..000000000
--- 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.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-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.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 IStatus 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 Status.OK_STATUS;
-    }
-
-  /**
-   * @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 b6d38ab37..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileHelp1Generator.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.consumption.sampleapp.codegen;
-
-import java.util.Enumeration;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-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.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";
-  
-  /**
-  * Constructor.
-  * @param buffer StringBuffer object that this code generator writes to 
-  */
-  public ResultFileHelp1Generator (StringBuffer buffer)
-  {
-      super(buffer);    
-  }
-  
-  /**
-  * Visit Method generates code for this Visitor
-  * @param method method code will be generated for 
-  */
-  public IStatus visit (Object object)
-  {
-     Element methodElement = (Element)object;
-  
-
-     MethodElement method = (MethodElement)methodElement;
-     if (method.getMethodOmmission()) return Status.OK_STATUS;
-
-     fbuffer.append("case " + method.getNumberID()+ ":" + StringUtils.NEWLINE);
-     visitHelper(method);
-     
-     fbuffer.append("break;" + StringUtils.NEWLINE); 
-  
-     return Status.OK_STATUS;
-  }   
-  /**
-  * 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 724285e06..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileHelp2Generator.java
+++ /dev/null
@@ -1,100 +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.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-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;
-
-/**
-* 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 IStatus visit (Object object)
-  {
-    
-
-     ParameterElement parameterElement = (ParameterElement)object;
-     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 Status.OK_STATUS;
-  }
-
-
-  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 f78cd599d..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileTypeGenerator.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.jst.ws.internal.consumption.sampleapp.codegen;
-
-import java.util.Enumeration;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-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.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 IStatus 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 Status.OK_STATUS;
-  }   
-  
-
-  
-}
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 83fe42bca..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/TestClientFileGenerator.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (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.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-
-
-/**
-* 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 IStatus visit (Object 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 Status.OK_STATUS;
-  }
-}
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 d456f896e..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/command/GeneratePageCommand.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (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.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-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 AbstractDataModelOperation 
-{
-		
-private Model model_;
-private Generator fGenerator;
-private IFile fIFile;
-private ResourceContext resourceContext_;
-private StringBuffer fStringBuffer;
-
-/**
- * Build constructor comment.
- */
-public GeneratePageCommand()
-{
-}
-
-/**
-* 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)
-{
-  model_ = model;
-  fGenerator = generator;
-  fIFile = file;
-  resourceContext_ = context;
-}
-
-public Model getJavaDataModel()
-{
-  return model_;
-}
-
-/**
- *
- */
-public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-{
-  IEnvironment env = getEnvironment();
-  
-  IStatus status = Status.OK_STATUS;
-  try {
-    fGenerator.visit(model_.getRootElement());
-    fStringBuffer = fGenerator.getStringBuffer();
-    String tempString = fStringBuffer.toString();
-    OutputStream fileResource = FileResourceUtils.newFileOutputStream(resourceContext_, fIFile.getFullPath(), monitor, 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 = StatusUtils.errorStatus( ioexc );
-  	return status;
-  }
-}
-
-public void setRootElement(Element 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 b40810432..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/command/JavaToModelCommand.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/*******************************************************************************
- * Copyright (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.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-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.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.selection.BooleanSelection;
-import org.eclipse.wst.common.environment.Choice;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-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 AbstractDataModelOperation
-{
-
-  private String clientProject;
-  private BooleanSelection[] methods;
-  private String proxyBean;
-  private JavaClass javaClass;
-  private Model model;
-  private Element parentElement;
-  
-  public JavaToModelCommand ()
-  {
-  }
-
-  
-  private IStatus createJavaReflection(IEnvironment env, IProgressMonitor monitor )
-  {
-  	IStatus status = Status.OK_STATUS;
-    JavaMofReflectionCommand javaMofReflectionCommand = new JavaMofReflectionCommand();
-    javaMofReflectionCommand.setClientProject(clientProject);
-    javaMofReflectionCommand.setProxyBean(proxyBean);
-    javaMofReflectionCommand.setEnvironment( env );
-    //javaMofReflectionCommand.setStatusMonitor(getStatusMonitor());
-    status = javaMofReflectionCommand.execute( monitor, null);
-    javaClass = (JavaClass)javaMofReflectionCommand.getJavaClass();
-    return status;
-  }
-
-  /**
-  * The Model that was created from this javamof
-  * @return Model The data model that was created
-  **/
-  public Model getJavaDataModel()
-  {
-    return model;
-  }
-
-  /**
-  * Build the datamodel from the mof
-  */
-  public IStatus buildModelFromMof (IEnvironment env) throws CoreException
-  {
-  	
-  	Choice OKChoice = new Choice('O', ConsumptionMessages.LABEL_OK, ConsumptionMessages.DESCRIPTION_OK);
-  	Choice CancelChoice = new Choice('C', ConsumptionMessages.LABEL_CANCEL, ConsumptionMessages.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
-      IStatus status = Status.OK_STATUS;
-
-      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 StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_SAMPLE_CREATION_CANCELED );
-           }
-           	
-         }
-         //
-         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 StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_SAMPLE_CREATION_CANCELED );
-           }
-           	
-         }
-         //         
-         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 StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_SAMPLE_CREATION_CANCELED );
-           }
-           	
-         }
-         //         
-         model = beanVisitorAction.getModel();
-      }
-
-      return status;
-  }
-
-  /**
-  * Get the java model from the resource then
-  * build the model from the mof
-  */
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {    
-    IEnvironment env = getEnvironment();
-  	IStatus status = Status.OK_STATUS;
-    if(clientProject == null) return status;
-    
-  	status = createJavaReflection(env, monitor);
-    if (status.getSeverity()==Status.ERROR) return status;
-    try{
-      status = buildModelFromMof(env);
-      return status;
-    }catch(CoreException exc){
-      IStatus embeddedStatus = exc.getStatus();
-      status = 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 74f4b0115..000000000
--- 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 7ea7ff5f7..000000000
--- 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 97b207ecd..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/LiveWSDLFilter.java
+++ /dev/null
@@ -1,99 +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.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.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/WSFinderRegistry.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/WSFinderRegistry.java
deleted file mode 100644
index e93561e25..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/WSFinderRegistry.java
+++ /dev/null
@@ -1,86 +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 5123e55e2..000000000
--- 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.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-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 abb9013e9..000000000
--- 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 18030062b..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/SoapElementHelper.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005,2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060131   123963 andyzhai@ca.ibm.com - Andy Zhai
- *******************************************************************************/
-package org.eclipse.jst.ws.util;
-
-import java.io.IOException;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.xml.sax.SAXException;
-
-/**
- * @author gilberta
- */
-public class SoapElementHelper
-{
-	public static javax.xml.soap.SOAPElement createSOAPElementFromXMLString(String xmlString) throws ParserConfigurationException, IOException, SAXException
-	{
-		java.io.StringReader stringReader = new java.io.StringReader(xmlString); 
-		org.xml.sax.InputSource inputSource = new org.xml.sax.InputSource(stringReader); 
-		SAXParserFactory factory = SAXParserFactory.newInstance();
-		factory.setNamespaceAware(true);
-		SAXParser parser = factory.newSAXParser();
-		SoapElementSaxHandler handler = new SoapElementSaxHandler();
-		parser.parse(inputSource,handler);
-		return handler.getSOAPElement();    
-	}
-
-	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 2335ef522..000000000
--- 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.consumption/webserviceutils/org/eclipse/jst/ws/util/SoapElementSaxHandler.java b/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/SoapElementSaxHandler.java
deleted file mode 100644
index 26bbf6e30..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/SoapElementSaxHandler.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060131   123963 andyzhai@ca.ibm.com - Andy Zhai
- *******************************************************************************/
-
-package org.eclipse.jst.ws.util;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-
-import javax.xml.soap.Name;
-import javax.xml.soap.SOAPElement;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPFactory;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * @author xinzhai
- */
-public class SoapElementSaxHandler extends DefaultHandler
-{
-	//Stores all values of pairs of prefix and URI in the document
-	private HashMap prefixURIMapping = new HashMap();
-	//Stores a list of URIs for a particular SOAP element
-	private ArrayList uris = new ArrayList();
-	//Represents the whole(root) SOAP document
-	private SOAPElement rootElement = null;
-	//Represents the current SOAP element where SAX parser is reading
-	private SOAPElement currentElement = null;
-	private SOAPFactory soapFactory;
-	
-	public SOAPElement getSOAPElement()
-	{
-		return rootElement;
-	}
-	
-	public void startDocument() throws SAXException
-	{
-		try 
-		{
-			soapFactory = SOAPFactory.newInstance();
-		}
-		catch (SOAPException e) 
-		{
-			throw new SAXException("Can't create a SOAPFactory instance", e);
-		}	
-	}
-
-	public void startPrefixMapping(String prefix, String uri)
-	{
-		prefixURIMapping.put(uri,prefix);
-		uris.add(uri);
-	}
-	
-	public void characters(char[] ch, int start, int length) throws SAXException
-	{
-		String str = String.valueOf(ch);
-		//Add non-trivial text as a text node
-		if (length > 1)
-		{
-			try 
-			{
-				currentElement.addTextNode(str.substring(start,start+length));
-			} 
-			catch (SOAPException e) 
-			{
-				throw new SAXException("Can't add a text node into SOAPElement from text", e);
-			}
-		}
-	}
-	
-	public void endElement (String uri, String localName, String qName)
-	{
-		if (currentElement != rootElement )
-		{
-			currentElement = currentElement.getParentElement();
-		}
-	}
-	public void startElement(String namespaceURI, String localName, String qName, Attributes atts) throws SAXException
-	{
-		String prefix = (String)prefixURIMapping.get(namespaceURI);
-		try
-		{
-			// Create and/or add child element
-			if (rootElement == null && currentElement == null)
-			{
-				rootElement = soapFactory.createElement(localName,prefix,namespaceURI);
-				currentElement = rootElement;
-			} 
-			else
-			{
-				currentElement = currentElement.addChildElement(localName,prefix,namespaceURI);
-			}
-			
-			// Add namespace declaration
-			if (uris.size() > 0)
-			{
-				for (int i = 0; i < uris.size(); i++)
-				{
-					String uri = (String)uris.get(i);
-					String pre = (String)prefixURIMapping.get(uri);
-					currentElement.addNamespaceDeclaration(pre,uri);
-				}
-				// Need to reset uris as we will use it for next element.
-				uris.clear(); 
-			}
-			
-			// Add attibutes
-			for (int i =0; i<atts.getLength(); i++)
-			{
-				Name attriName;
-				if (atts.getURI(i) != null)
-				{
-					String attriPre = (String)prefixURIMapping.get(atts.getURI(i));
-					attriName = soapFactory.createName(atts.getLocalName(i),attriPre,atts.getURI(i));
-				}
-				else
-				{
-					attriName = soapFactory.createName(atts.getLocalName(i));
-				}
-				currentElement.addAttribute(attriName, atts.getValue(i));
-			}
-		}
-		catch (SOAPException e) 
-		{
-			throw new SAXException(e);
-		}
-	}
-}
-
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 c14487cea..000000000
--- 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 802346176..000000000
--- 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/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.jst.ws.creation.ejb.ui/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 5709b0185..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ejb.ui/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Jan 30 10:41:15 EST 2006
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.jst.ws.creation.ejb.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.creation.ejb.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index c5b959956..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ejb.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,9 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.creation.ejb.ui; singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.jst.ws.consumption.ui,
- org.eclipse.wst.command.env.ui
diff --git a/bundles/org.eclipse.jst.ws.creation.ejb.ui/about.html b/bundles/org.eclipse.jst.ws.creation.ejb.ui/about.html
deleted file mode 100644
index 6f6b96c4c..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ejb.ui/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.creation.ejb.ui/build.properties b/bundles/org.eclipse.jst.ws.creation.ejb.ui/build.properties
deleted file mode 100644
index 6e2940fa0..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ejb.ui/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-bin.includes = plugin.xml,\
-               plugin.properties,\
-               META-INF/,\
-               about.html
diff --git a/bundles/org.eclipse.jst.ws.creation.ejb.ui/plugin.properties b/bundles/org.eclipse.jst.ws.creation.ejb.ui/plugin.properties
deleted file mode 100644
index 13fe654ef..000000000
--- 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 83a18e6f0..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ejb.ui/plugin.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
-    <!-- EJB Web Service Types -->
-<!--   
-   <extension
-         point="org.eclipse.jst.ws.consumption.ui.webServiceServerRuntimeType">
-
-      <webServiceType
-            label="%WEBSERVICETYPE_NAME_WSDL_EJB_TP"
-            resourceTypeMetadata="File IResource"
-            extensionMetadata=".wsdl"
-            objectSelectionWidget="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionWidget"
-            includeNatures="org.eclipse.jst.j2ee.ejb.EJBNature"
-            excludeNatures=""
-            id="org.eclipse.jst.ws.type.wsdl.ejb">
-      </webServiceType>
-
-      <webServiceType
-		    label="%WEBSERVICETYPE_NAME_EJB_TP"
-		    resourceTypeMetadata="EJBObject org.eclipse.jst.j2ee.ejb.EnterpriseBean SessionImpl"
-		    extensionMetadata=".java .class .SessionImpl"
-		    objectSelectionWidget="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.EJBSelectionWidget"
-		    includeNatures="org.eclipse.jst.j2ee.ejb.EJBNature"
-		    excludeNatures=""
-		    id="org.eclipse.jst.ws.type.ejb">
-  	 </webServiceType>
-	</extension>
--->
-
-   <!-- Popups -->
-      
-   <extension
-         point="org.eclipse.ui.popupMenus">
-      <objectContribution
-            objectClass="org.eclipse.jst.j2ee.ejb.EnterpriseBean"
-            id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java">
-         <action
-               label="%ACTION_DEPLOY_WEBSERVICE"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.ejb.popupMenu/popupActions"
-               id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
-         </action>
-      </objectContribution>
-   </extension>
-
-
-<!-- EJB stuff -->
-     <extension point="org.eclipse.jst.ws.consumption.ui.wsImpl">
-     <webServiceImpl
-            id="org.eclipse.jst.ws.wsImpl.ejb"
-            label="%WEBSERVICETYPE_NAME_EJB_TP"
-            resourceTypeMetadata="EJBObject org.eclipse.jst.j2ee.ejb.EnterpriseBean SessionImpl"
-            extensionMetadata=".java .class .SessionImpl"
-            objectSelectionWidget="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.EJBSelectionWidget">
-     </webServiceImpl>
-    </extension>    
-    
-
-            
-   
-</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 cb0105380..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/.cvsignore b/bundles/org.eclipse.jst.ws.creation.ui/.cvsignore
deleted file mode 100644
index abf11a4c8..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-build.xml
-temp.folder
-wss-ui.jar
-@dot
-src.zip
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 ef454e4c4..000000000
--- 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/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.creation.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index d79b49db9..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,57 +0,0 @@
-#Mon Jan 30 10:36:30 EST 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.jst.ws.creation.ui/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 5971ac072..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Jan 30 10:41:04 EST 2006
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.creation.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 851f25490..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,45 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.creation.ui; singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.jst.ws.internal.creation.ui.plugin.WebServiceCreationUIPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.creation.ui,
- org.eclipse.jst.ws.internal.creation.ui.ant,
- org.eclipse.jst.ws.internal.creation.ui.extension,
- org.eclipse.jst.ws.internal.creation.ui.plugin,
- org.eclipse.jst.ws.internal.creation.ui.preferences,
- org.eclipse.jst.ws.internal.creation.ui.server,
- org.eclipse.jst.ws.internal.creation.ui.widgets,
- org.eclipse.jst.ws.internal.creation.ui.widgets.binding,
- org.eclipse.jst.ws.internal.creation.ui.widgets.runtime,
- org.eclipse.jst.ws.internal.creation.ui.widgets.test
-Require-Bundle: org.eclipse.wst.command.env,
- org.eclipse.wst.command.env.ui,
- org.eclipse.wst.command.env.core,
- org.eclipse.wst.wsdl,
- org.eclipse.wst.ws,
- org.eclipse.wst.ws.explorer,
- org.eclipse.jst.ws,
- org.eclipse.jst.ws.consumption,
- org.eclipse.jst.ws.ui,
- org.eclipse.jst.ws.consumption.ui,
- org.eclipse.jdt.core,
- org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.emf.common,
- org.eclipse.jem.util,
- org.eclipse.jem.workbench,
- org.eclipse.wst.server.core,
- org.eclipse.wst.common.emfworkbench.integration,
- org.eclipse.jst.j2ee,
- org.eclipse.jst.j2ee.core,
- org.eclipse.jst.j2ee.ejb,
- org.wsdl4j,
- org.eclipse.wst.common.frameworks,
- org.eclipse.wst.common.environment,
- org.eclipse.wst.common.project.facet.core
-Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/about.html b/bundles/org.eclipse.jst.ws.creation.ui/about.html
deleted file mode 100644
index 6f6b96c4c..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/build.properties b/bundles/org.eclipse.jst.ws.creation.ui/build.properties
deleted file mode 100644
index e1dec33b5..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-bin.includes = .,\
-               icons/,\
-               plugin.properties,\
-               plugin.xml,\
-               META-INF/,\
-               about.html
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/export_ws.gif b/bundles/org.eclipse.jst.ws.creation.ui/icons/export_ws.gif
deleted file mode 100644
index ca44ef839..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/export_ws.gif
+++ /dev/null
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 74fcd7711..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/export_ws_wiz.gif
+++ /dev/null
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 2d737f07a..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/full/ctool16/new_webserv_wiz.gif
+++ /dev/null
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 abd1f9c82..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/full/wizban/webservices_wiz.gif
+++ /dev/null
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 c124705dc..000000000
--- 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 fb08480c9..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/plugin.xml
+++ /dev/null
@@ -1,341 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
-     <!-- Wizards -->
-
-   <extension
-         point="org.eclipse.ui.newWizards">
-      <category
-            name="%PLUGIN_NEW_CATEGORY_NAME_WS"
-            id="org.eclipse.jst.ws.ui.new">
-      </category>
-      <wizard
-            name="%PLUGIN_NEW_WIZARD_NAME_WS_SERVICE"
-            icon="icons/full/ctool16/new_webserv_wiz.gif"
-            category="org.eclipse.jst.ws.ui.new"
-            class="org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard"
-            id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
-         <description>
-            %PLUGIN_NEW_WIZARD_DESC_WS_SERVICE
-         </description>
-      </wizard>
-   </extension>
-
-   <extension
-         point="org.eclipse.wst.command.env.dynamicWizard">
-      <dynamicWizard
-            iconbanner="icons/full/wizban/webservices_wiz.gif"
-            title="%WIZARD_TITLE_WSS"
-            class="org.eclipse.jst.ws.internal.creation.ui.widgets.binding.ServerWidgetBinding"
-            id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
-      </dynamicWizard>
-   </extension>
-
-   <extension
-         point="org.eclipse.ui.exportWizards">
-      <wizard
-            name="%PLUGIN_EXPORT_WIZARD_NAME_WS"
-            icon="icons/export_ws.gif"
-            class="org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard"
-            id="wsexport">
-         <description>
-            %PLUGIN_EXPORT_WIZARD_DESC_WS
-         </description>
-      </wizard>
-   </extension>
-
-   <extension
-         point="org.eclipse.wst.command.env.dynamicWizard">
-      <dynamicWizard
-            iconbanner="icons/export_ws_wiz.gif"
-            name="%PLUGIN_EXPORT_WIZARD_NAME_WS"
-            class="org.eclipse.jst.ws.internal.creation.ui.widgets.binding.ExportWSWidgetBinding"
-            id="wsexport">
-      </dynamicWizard>
-   </extension>
-
-   <extension
-         point="org.eclipse.wst.command.env.dynamicWizard">
-      <dynamicWizard
-            iconbanner="icons/export_ws_wiz.gif"
-            name="%PLUGIN_EXPORT_WIZARD_NAME_WS"
-            class="org.eclipse.jst.ws.internal.creation.ui.widgets.binding.ExportWSWidgetBinding"
-            id="org.eclipse.jst.ws.creation.ui.wizard.publish">
-      </dynamicWizard>
-   </extension>
-
-   <!-- "Don't Show Me" Preferences -->
-
-   <extension
-         point="org.eclipse.wst.command.env.actionDialogPreferenceType">
-
-      <actionDialogPreferenceType
-            name="%CHECKBOX_SHOW_DEPLOY_WEB_SERVICE_DIALOG"
-            tooltip="%TOOLTIP_PPAD_CHECKBOX_DEPLOY"
-            infopop="org.eclipse.jst.ws.creation.ui.PPAD0006"
-            category="org.eclipse.jst.wss.popup.category"
-            id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java">
-      </actionDialogPreferenceType>
-
-      <actionDialogPreferenceType
-            name="%CHECKBOX_SHOW_GENERATE_SKELETON_DIALOG"
-            tooltip="%TOOLTIP_PPAD_CHECKBOX_SKELETON"
-            infopop="org.eclipse.jst.ws.creation.ui.PPAD0008"
-            category="org.eclipse.jst.wss.popup.category"
-            id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton">
-      </actionDialogPreferenceType>
-
-      <actionDialogPreferenceType
-            name="%CHECKBOX_SHOW_PUBLISH_WSDL_DIALOG"
-            tooltip="%TOOLTIP_PPAD_CHECKBOX_PUBLISH"
-            infopop="org.eclipse.jst.ws.creation.ui.PPAD0009"
-            category="org.eclipse.jst.wss.popup.category"
-            id="org.eclipse.jst.ws.creation.ui.wizard.publish">
-      </actionDialogPreferenceType>
-
-   </extension>
-
-   <!-- Popups -->
-   
-   <extension
-         point="org.eclipse.ui.popupMenus">
-
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="*.java"
-            id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java">
-         <action
-               label="%ACTION_DEPLOY_WEBSERVICE"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu/popupActions"
-               id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
-         </action>
-      </objectContribution>
-
-      <objectContribution
-            objectClass="org.eclipse.jdt.internal.core.CompilationUnit"
-            nameFilter="*.java"
-            id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java">
-         <action
-               label="%ACTION_DEPLOY_WEBSERVICE"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu/popupActions"
-               id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
-         </action>
-      </objectContribution>
-
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="*.wsdl"
-            id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton">
-         <action
-               label="%ACTION_GENERATE_JAVA_SKELETON"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu/popupActions"
-               id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
-         </action>
-      </objectContribution>
-
-      <objectContribution
-            objectClass="org.eclipse.wst.wsdl.Service"
-            nameFilter="*"
-            id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton">
-         <action
-               label="%ACTION_GENERATE_JAVA_SKELETON"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="additions"
-               id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
-         </action>
-      </objectContribution>
-
-      <objectContribution
-            objectClass="org.eclipse.wst.wsdl.util.WSDLResourceImpl"
-            nameFilter="*"
-            id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton">
-         <action
-               label="%ACTION_GENERATE_JAVA_SKELETON"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="additions"
-               id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
-         </action>
-      </objectContribution>
-
-      <objectContribution
-            objectClass="org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef"
-            nameFilter="*"
-            id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton">
-         <action
-               label="%ACTION_GENERATE_JAVA_SKELETON"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="additions"
-               id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
-         </action>
-      </objectContribution>
-
-      <objectContribution
-            objectClass="org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean"
-            nameFilter="*"
-            id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java">
-         <action
-               label="%ACTION_DEPLOY_WEBSERVICE"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="additions"
-               id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
-         </action>
-      </objectContribution>
-      
-      <objectContribution
-            objectClass="org.eclipse.jst.j2ee.webservice.wsdd.BeanLink"
-            nameFilter="*"
-            id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java">
-         <action
-               label="%ACTION_DEPLOY_WEBSERVICE"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="additions"
-               id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
-         </action>
-      </objectContribution>       
-      
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="*.wsil"
-            id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton">
-         <action
-               label="%ACTION_GENERATE_JAVA_SKELETON"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu/popupActions"
-               id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
-         </action>
-      </objectContribution>
-
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="*.wsdl"
-            id="org.eclipse.jst.ws.creation.ui.wizard.publish">
-         <action
-               label="%ACTION_PUBLISH_WSDL"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu/popupActions"
-               id="org.eclipse.jst.ws.creation.ui.wizard.publish">
-         </action>
-      </objectContribution>
-
-   </extension>
-   
-   <!-- Preference Pages -->
-
-   <extension point="org.eclipse.ui.preferencePages">
-      <page
-            name="%PREFERENCE_CATEGORY_SCENARIO_DEFAULTS"
-            category="org.eclipse.wst.ws.internal.ui.preferences.name"
-            class="org.eclipse.jst.ws.internal.creation.ui.preferences.ScenarioDefaultsPreferencePage"
-            id="org.eclipse.jst.ws.internal.creation.ui.preferences.ScenarioDefaultsPreferencePage">
-      </page>
-   </extension>
-   
-	<extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
-       <widgetFactory   
-             id="StartServiceServer"
-             insertBeforeCommandId="org.eclipse.jst.ws.internal.creation.ui.extension.PreServiceRunCommand"
-             class="org.eclipse.jst.ws.internal.creation.ui.server.StartServerWidgetFactory"/>
-    </extension> 
-    
-     <extension point="org.eclipse.wst.command.env.antScenario">
-        <antScenario
-            class="org.eclipse.jst.ws.internal.creation.ui.ant.AntServiceRootCommandFragment"
-            scenarioType="service"/>
-     </extension>    
-    
-     <extension
-           point="org.eclipse.wst.command.env.antDataMapping">
-        <map
-              key="InitialSelection"
-              operation="org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidgetDefaultingCommand"
-              property="InitialSelection"
-              transform="org.eclipse.jst.ws.internal.common.String2SelectionTransformer"/>
-        <map
-              key="InitialSelection"
-              operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionOutputCommand"
-              property="ObjectSelection"
-              transform="org.eclipse.jst.ws.internal.common.String2SelectionTransformer"/>              
-		<map
-              key="Project"
-              operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionOutputCommand"
-              property="Project"
-              transform="org.eclipse.jst.ws.internal.common.String2IProjectTransformer"/>
-        <map
-              key="ComponentName"
-              operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionOutputCommand"
-              property="ComponentName"/>
-        <map
-              key="Service.RuntimeId"
-              operation="org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidgetOutputCommand"
-              property="ServiceTypeRuntimeServer"
-              transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/>
-        <map
-              key="Service.ServerId"
-              operation="org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidgetOutputCommand"
-              property="ServiceTypeRuntimeServer"
-              transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/>
-        <map
-              key="Service.TypeId"
-              operation="org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidgetOutputCommand"
-              property="ServiceTypeRuntimeServer"
-              transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/>             
-        <map
-              key="GenerateProxy"
-              operation="org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidgetOutputCommand"
-              property="GenerateProxy"/>
-      <map
-              key="Service.RuntimeId"
-              operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand"
-              property="ServiceTypeRuntimeServer"
-              transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/>
-     <map
-              key="Service.ServerId"
-              operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand"
-              property="ServiceTypeRuntimeServer"
-              transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/>
-      <map
-              key="Service.TypeId"
-              operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand"
-              property="ServiceTypeRuntimeServer"
-              transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/>
-      <map
-              key="ServiceProjectName"
-              operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand"
-              property="ServiceProjectName"/>
-              
-      <map
-              key="ServiceComponentName"
-              operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand"
-              property="ServiceComponentName"/>
-
-      <map
-              key="ServiceEarProjectName"
-              operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand"
-              property="ServiceEarProjectName"/>
-              
-      <map
-              key="ServiceEarComponentName"
-              operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand"
-              property="ServiceEarComponentName"/>              
-      <map
-              key="Service.RuntimeId"
-              operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionFragment"
-              property="ServiceTypeRuntimeServer"
-              transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/>
-      <map
-              key="Service.ServerId"
-              operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionFragment"
-              property="ServiceTypeRuntimeServer"
-              transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/>
-      <map
-              key="Service.TypeId"
-              operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionFragment"
-              property="ServiceTypeRuntimeServer"
-              transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/>
-     </extension>
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/CreationUI.properties b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/CreationUI.properties
deleted file mode 100644
index 14c74bf2f..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/CreationUI.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# 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/CreationUIMessages.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/CreationUIMessages.java
deleted file mode 100644
index eb19e8bc6..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/CreationUIMessages.java
+++ /dev/null
@@ -1,29 +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.creation.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class CreationUIMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.jst.ws.internal.creation.ui.CreationUI";//$NON-NLS-1$
-
-	private CreationUIMessages() {
-		// Do not instantiate
-	}
-
-	public static String PAGE_TITLE_OBJECT_SELECTION;
-	public static String PAGE_DESC_OBJECT_SELECTION;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, CreationUIMessages.class);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/ant/AntServiceRootCommandFragment.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/ant/AntServiceRootCommandFragment.java
deleted file mode 100644
index 40ad678b1..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/ant/AntServiceRootCommandFragment.java
+++ /dev/null
@@ -1,128 +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.ant;
-
-import org.eclipse.jst.ws.internal.consumption.common.ScenarioCleanupCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.AntDefaultingOperation;
-import org.eclipse.jst.ws.internal.consumption.ui.command.ListOptionsCommand;
-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.CheckWSDLValidationCommand;
-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.creation.ui.extension.PreServiceDevelopCommand;
-import org.eclipse.jst.ws.internal.creation.ui.extension.ServiceRootFragment;
-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.ServerRuntimeSelectionWidgetDefaultingCommand;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
- 
-/**
- * 
- * Command fragment for generating web service top down or bottom up using Ant task.
- * Run headless Eclipse or within workspace using Run as Ant Build.  This fragment eliminates any UI specific 
- * commands and data mappings between commands and widgets.  Widget to command mappings are
- * replaced by Ant property file to command mappings which are enabled by a antDataMapping extension 
- * point in the org.eclipse.wst.command.env plugin.
- * 
- * @author joan
- *
- */
-
-public class AntServiceRootCommandFragment extends SequenceFragment
-{
-	
-  public AntServiceRootCommandFragment()
-  { 
-    add( new SimpleFragment( new ScenarioCleanupCommand(), "" ));
-    add( new SimpleFragment(new ListOptionsCommand(), ""));
-    add (new SimpleFragment(new AntDefaultingOperation(), ""));    
-    add( new SimpleFragment( new ServerWizardWidgetDefaultingCommand(), ""));
-    add( new SimpleFragment( new ServerWizardWidgetOutputCommand(), "" ));    
-    add( new ObjectSelectionFragment() );
-    add( new SimpleFragment( new CheckWSDLValidationCommand(), ""));
-    add( new SimpleFragment( new ServerRuntimeSelectionWidgetDefaultingCommand(), ""));
-    add( new SimpleFragment( new ServerExtensionDefaultingCommand(), ""));   
-    add( new ServiceRootFragment() );
-    add( new SimpleFragment( new ServerExtensionOutputCommand(), "" ));
-    add(new FinishFragment());
-    add( new SimpleFragment( new ScenarioCleanupCommand(), "" ));
-  }
-  
-  public void registerDataMappings(DataMappingRegistry dataRegistry)
-  { 	
-	dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ObjectSelection", ServerRuntimeSelectionWidgetDefaultingCommand.class, "InitialSelection", null);
-    dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ObjectSelection", ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialSelection", null);
-    dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "Project", ServerRuntimeSelectionWidgetDefaultingCommand.class, "InitialProject", null);
-    dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "Project", ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialProject", null);
-    dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ComponentName", ServerRuntimeSelectionWidgetDefaultingCommand.class, "InitialComponentName", null);
-    dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ComponentName", ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialComponentName", null);      
-    dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "WebServicesParser", ServerExtensionDefaultingCommand.class );    
-	
-    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, "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, "GenerateProxy", ServerRuntimeSelectionWidgetDefaultingCommand.class);
-    
-    //Map AntDefaultingFragment
-    dataRegistry.addMapping(AntDefaultingOperation.class, "ServiceIdsFixed", ServerRuntimeSelectionWidgetDefaultingCommand.class);
-    dataRegistry.addMapping(AntDefaultingOperation.class, "ClientIdsFixed", ServerRuntimeSelectionWidgetDefaultingCommand.class);
-    dataRegistry.addMapping(AntDefaultingOperation.class, "StartService", PreServiceDevelopCommand.class);
-    dataRegistry.addMapping(AntDefaultingOperation.class, "InstallService", PreServiceDevelopCommand.class);
-    
-    // Map ServerRuntimeSelectionWidgetDefaultingCommand
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerExtensionDefaultingCommand.class);    
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceProjectName", ServerExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceEarProjectName", ServerExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceComponentName", ServerExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceEarComponentName", ServerExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceJ2EEVersion", ServerExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceNeedEAR", ServerExtensionDefaultingCommand.class);
-    
-    
-    // Map ServerExtensionDefaultingCommand
-    dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerExtensionFragment.class);
-    	  
-	// Setup the PreServiceDevelopCommand.	
-    dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "StartService", PreServiceDevelopCommand.class);
-    dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "GenerateProxy", PreServiceDevelopCommand.class);      
-    dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "ResourceContext", PreServiceDevelopCommand.class);			
-	
-	dataRegistry.addMapping( ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceComponentType", PreServiceDevelopCommand.class, "ModuleType", null);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceRuntimeId", ServerExtensionDefaultingCommand.class);
-	dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", PreServiceDevelopCommand.class );
-	dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServiceRuntimeId", PreServiceDevelopCommand.class );
-    dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServiceJ2EEVersion", PreServiceDevelopCommand.class);
-    dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServerProject", PreServiceDevelopCommand.class, "Module", null );
-    dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServerProjectEAR", PreServiceDevelopCommand.class, "Ear", null );
-    
-	dataRegistry.addMapping( ObjectSelectionOutputCommand.class, "ObjectSelection", PreServiceDevelopCommand.class, "Selection", new SelectionTransformer() );
-	dataRegistry.addMapping( PreServiceDevelopCommand.class, "WebService", ServerExtensionOutputCommand.class );
-
-    // Map ServerExtensionOutputCommand for ServerStart()
-    dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProjectEAR", ServerExtensionOutputCommand.class, "EarProjectName", null);
-    
-  }
-
-}
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 bb42e9cf9..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceAssembleCommand.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060131 121071   rsinha@ca.ibm.com - Rupam Kuehner     
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.creation.ui.extension;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.ws.internal.consumption.command.common.AssociateModuleWithEARCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateFacetedProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.common.RequiredFacetVersion;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.wsrt.IWebService;
-
-public class PreServiceAssembleCommand extends AbstractDataModelOperation 
-{
-	private IWebService				webService_;
-	private String						project_;
-  private String            module_;
-	private String						earProject_;
-  private String            ear_;
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    IEnvironment environment = getEnvironment();
-    
-		// Check if EAR module is req'd, ie. !=null
-		if (earProject_==null)
-			return Status.OK_STATUS;
-	  
-	  
-        
-		//Create the service EAR module
-        
-        CreateFacetedProjectCommand command = new CreateFacetedProjectCommand();
-        command.setProjectName(earProject_);
-        command.setTemplateId(IJ2EEModuleConstants.JST_EAR_TEMPLATE);
-        
-        // RequiredFacetVersions is set to an empty array because we don't need to impose any additional constraints.
-        // We just want to create the highest level of EAR project that the selected server supports.
-        command.setRequiredFacetVersions(new RequiredFacetVersion[0]); 
-        
-        command.setServerFactoryId(webService_.getWebServiceInfo().getServerFactoryId());
-        command.setServerInstanceId(webService_.getWebServiceInfo().getServerInstanceId());
-        IStatus status = command.execute( monitor, adaptable );
-        if (status.getSeverity() == Status.ERROR)
-        {
-          environment.getStatusHandler().reportError( status );
-          return status;
-        }                
-		
-		//Associate the service module and service EAR
-		AssociateModuleWithEARCommand associateCommand = new AssociateModuleWithEARCommand();
-		associateCommand.setProject(project_);
-		associateCommand.setModule(module_);
-		associateCommand.setEARProject(earProject_);
-		associateCommand.setEar(ear_);
-    associateCommand.setEnvironment( environment );
-		status = associateCommand.execute( monitor, null );
-		if (status.getSeverity()==Status.ERROR)
-		{
-			environment.getStatusHandler().reportError(status);		  
-		}			
-		
-		return status;	  
-  }
-	
-  public void setProject( String project )
-  {
-	  project_ = project;
-  }
-	  
-  public void setModule( String module )
-  {
-	  module_ = module;
-  }	
-	
-  public void setEarProject( String earProject )
-  {
-	  earProject_ = earProject;
-  }
-  
-  public void setEar( String ear )
-  {
-	  ear_ = ear;  
-  }
-	
-  public void 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 b4668ec72..000000000
--- 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.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public class PreServiceDeployCommand extends AbstractDataModelOperation
-{
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-	  return Status.OK_STATUS;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDevelopCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDevelopCommand.java
deleted file mode 100644
index 9d2d37667..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDevelopCommand.java
+++ /dev/null
@@ -1,259 +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
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060131 121071   rsinha@ca.ibm.com - Rupam Kuehner
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.creation.ui.extension;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateFacetedProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.common.FacetUtils;
-import org.eclipse.jst.ws.internal.consumption.common.RequiredFacetVersion;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-import org.eclipse.wst.ws.internal.wsrt.ISelection;
-import org.eclipse.wst.ws.internal.wsrt.IWebService;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntime;
-import org.eclipse.wst.ws.internal.wsrt.SimpleContext;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceState;
-
-public class PreServiceDevelopCommand extends AbstractDataModelOperation 
-{
-  private TypeRuntimeServer typeRuntimeServer_;
-  private String            serviceRuntimeId_;
-  private IContext          context_;
-  private ISelection        selection_;
-  private String			project_;
-  private String            module_;
-  private String			moduleType_;
-  private String			earProject_;
-  private String            ear_;
-	
-  private IWebService       webService_;
-  private String            j2eeLevel_;
-  private ResourceContext   resourceContext_;
-  
-  private boolean install_;
-  private boolean run_;
-  private boolean client_;
-  private boolean test_;
-  private boolean publish_;
-  
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    IEnvironment environment = getEnvironment();
-	  
-    // Split up the project and module
-    int index = module_.indexOf("/");
-    if (index!=-1){
-      project_ = module_.substring(0,index);
-      module_ = module_.substring(index+1);
-    }
-
-    if (ear_!=null && ear_.length()>0)
-    {
-      int earIndex = ear_.indexOf("/");
-      if (earIndex!=-1) {
-        earProject_ = ear_.substring(0,earIndex);
-        ear_ = ear_.substring(earIndex+1);
-      }
-    }
-    
-    
-	  IWebServiceRuntime wsrt   = WebServiceRuntimeExtensionUtils2.getServiceRuntime( serviceRuntimeId_ );
-	  WebServiceInfo     wsInfo = new WebServiceInfo();
-
-	  wsInfo.setServerFactoryId( typeRuntimeServer_.getServerId() );
-      wsInfo.setServerInstanceId( typeRuntimeServer_.getServerInstanceId());
-	  wsInfo.setState( WebServiceState.UNKNOWN_LITERAL );
-	  wsInfo.setWebServiceRuntimeId( typeRuntimeServer_.getRuntimeId() );
-    
-		webService_  = wsrt.getWebService( wsInfo );
-	
-		//Set up the IContext
-		WebServiceScenario scenario = null;
-    int scenarioInt = WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(typeRuntimeServer_.getTypeId());
-    if (scenarioInt == WebServiceScenario.BOTTOMUP)
-		{
-			scenario = WebServiceScenario.BOTTOMUP_LITERAL;
-      String impl = (String)(selection_.getSelection())[0];
-      wsInfo.setImplURL(impl);
-		}
-    else if (scenarioInt == WebServiceScenario.TOPDOWN)
-		{
-		  scenario = WebServiceScenario.TOPDOWN_LITERAL;
-      String wsdlURL = (String)(selection_.getSelection())[0];
-      wsInfo.setWsdlURL(wsdlURL);      
-		}
-	
-		context_     = new SimpleContext(true, true, true, install_, run_, client_, test_, publish_, 
-																		scenario, 
-																		resourceContext_.isOverwriteFilesEnabled(),
-																		resourceContext_.isCreateFoldersEnabled(),
-																		resourceContext_.isCheckoutFilesEnabled());
-
-        IStatus status = Status.OK_STATUS;
-
-        // Create the service module if needed.
-        IProject project = ProjectUtilities.getProject(project_);
-        if (!project.exists())
-        {
-          boolean matches = WebServiceRuntimeExtensionUtils2.doesServiceRuntimeSupportTemplate(serviceRuntimeId_, moduleType_);
-          if (matches)
-          {
-            RequiredFacetVersion[] rfv = WebServiceRuntimeExtensionUtils2.getServiceRuntimeDescriptorById(serviceRuntimeId_).getRequiredFacetVersions();
-            CreateFacetedProjectCommand command = new CreateFacetedProjectCommand();
-            command.setProjectName(project_);
-            command.setTemplateId(moduleType_);
-            command.setRequiredFacetVersions(rfv);
-            command.setServerFactoryId(typeRuntimeServer_.getServerId());
-            command.setServerInstanceId(typeRuntimeServer_.getServerInstanceId());
-            status = command.execute( monitor, adaptable );
-            if (status.getSeverity() == Status.ERROR)
-            {
-              environment.getStatusHandler().reportError( status );
-              return status;
-            }        
-          }            
-        }
-
-        //The project should now exist. Add facets if needed.        
-        RequiredFacetVersion[] rfvs = WebServiceRuntimeExtensionUtils2.getServiceRuntimeDescriptorById(serviceRuntimeId_).getRequiredFacetVersions();
-        status = FacetUtils.addRequiredFacetsToProject(project, rfvs, monitor);
-        if (status.getSeverity() == Status.ERROR)
-        {
-          environment.getStatusHandler().reportError( status );
-          return status;
-        }                      
-
-	  return status;				
-  }
-  
-  public void setServiceTypeRuntimeServer( TypeRuntimeServer typeRuntimeServer )
-  {
-	  typeRuntimeServer_ = typeRuntimeServer;  
-  }
-  
-  public void setServiceRuntimeId(String id)
-  {
-    serviceRuntimeId_ = id;
-  }
-	  
-  public void setServiceJ2EEVersion( String j2eeLevel )
-  {
-	j2eeLevel_ = j2eeLevel;  
-  }
-  
-  public String getJ2eeLevel()
-  {
-	  return j2eeLevel_;  
-  }
-	
-  public IWebService getWebService()
-  {
-	return webService_;  
-  }
-  
-  public IContext getContext()
-  {
-    return context_;
-  }
-  
-  public void setResourceContext( ResourceContext resourceContext )
-  {
-    resourceContext_ = resourceContext;	  
-  }
-  
-  public ISelection getSelection()
-  {
-    return selection_;	  
-  }
-  
-  public void setSelection( ISelection selection )
-  {
-	selection_ = selection;  
-  }
-  
-  public String getProject()
-  {
-    return project_;	  
-  }
-	 
-  public String getModule()
-  {
-    return module_;	  
-  }
-	
-  public void setModule( String module )
-  {
-	  module_ = module;
-  }
-  
-  public void setModuleType(String type)
-  {
-	  moduleType_ = type;
-  }
-	
-  public String getEarProject()
-  {
-    return earProject_;	  
-  }
-	
-  public String getEar()
-  {
-	  return ear_;  
-  }
-  
-  public void setEar( String ear )
-  {
-	  ear_ = ear;  
-  }
-  
-  public void setInstallService(boolean installService)
-	{
-		install_ = installService;
-	}
-  
-	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 7bea4682b..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceInstallCommand.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.creation.ui.extension;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.command.common.AddModuleToServerCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateServerCommand;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-import org.eclipse.wst.ws.internal.wsrt.IWebService;
-
-public class PreServiceInstallCommand extends AbstractDataModelOperation 
-{
-	private IWebService webService_;
-	private String		project_;
-    private String      module_;
-	private String		earProject_;
-    private String      ear_;
-    private IContext    context_;
-		
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-	  if (context_.getInstall())
-	  {
-	            IEnvironment environment = getEnvironment();      
-			  			
-				if (webService_.getWebServiceInfo().getServerInstanceId()==null)
-				{
-					CreateServerCommand createServerCommand = new CreateServerCommand();
-					createServerCommand.setServerFactoryid(webService_.getWebServiceInfo().getServerFactoryId());
-	                createServerCommand.setEnvironment( environment );
-					IStatus createServerStatus = createServerCommand.execute( monitor, null);
-					if (createServerStatus.getSeverity()==Status.OK)
-					{
-						webService_.getWebServiceInfo().setServerInstanceId(createServerCommand.getServerInstanceId());
-					}
-					else
-					{
-						if (createServerStatus.getSeverity()==Status.ERROR)
-						{
-							environment.getStatusHandler().reportError(createServerStatus);
-						}								
-						return createServerStatus;
-					}
-				}
-				  
-				
-				
-				AddModuleToServerCommand command = new AddModuleToServerCommand();
-				command.setServerInstanceId(webService_.getWebServiceInfo().getServerInstanceId());
-				if (earProject_ != null && earProject_.length()>0 && ear_!= null && ear_.length()>0)
-				{
-					command.setProject(earProject_);
-					command.setModule(ear_);
-				}
-				else
-				{
-					command.setProject(project_);
-					command.setModule(module_);				
-				}
-	
-	            command.setEnvironment( environment );
-				IStatus status = command.execute( monitor, null );
-				if (status.getSeverity()==Status.ERROR)
-				{
-					environment.getStatusHandler().reportError(status);
-				}			
-			  return status;
-		  }
-		  return Status.OK_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;  
-	  }
-	  
-	  public void setContext(IContext context)
-	  {
-		  context_=context;
-	  }
-		
-}
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 b758bca54..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceRunCommand.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.creation.ui.extension;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.ui.command.StartServerCommand;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-import org.eclipse.wst.ws.internal.wsrt.IWebService;
-
-public class PreServiceRunCommand extends AbstractDataModelOperation 
-{
-	private IWebService				webService_;
-	private IContext				context_;
-	
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-		  IStatus status = Status.OK_STATUS;
-	      if (context_.getRun())
-		  {
-	            IEnvironment environment = getEnvironment();
-				
-				StartServerCommand command = new StartServerCommand();
-				command.setServerInstanceId(webService_.getWebServiceInfo().getServerInstanceId());
-	            command.setEnvironment( environment );
-				status = command.execute( monitor, null );
-				if (status.getSeverity()==Status.ERROR)
-				{
-					environment.getStatusHandler().reportError(status);			  
-				}
-		  }
-		  
-		  return status;			
-	  }
-		
-	  public void setWebService( IWebService webService )
-	  {
-		  webService_ = webService;  
-	  }
-	  
-	  public void setContext (IContext context)
-	  {
-		  context_ = context;
-	  }
-
-}
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 36dad87c2..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/ServiceRootFragment.java
+++ /dev/null
@@ -1,115 +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
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060131 121071   rsinha@ca.ibm.com - Rupam Kuehner     
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.creation.ui.extension;
-
-import org.eclipse.jst.ws.internal.consumption.ui.extension.PreClientDevelopCommand;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.DataObjectCommand;
-import org.eclipse.wst.ws.internal.extensions.AssembleServiceFragment;
-import org.eclipse.wst.ws.internal.extensions.DeployServiceFragment;
-import org.eclipse.wst.ws.internal.extensions.DevelopServiceFragment;
-import org.eclipse.wst.ws.internal.extensions.InstallServiceFragment;
-import org.eclipse.wst.ws.internal.extensions.RunServiceFragment;
-
-public class ServiceRootFragment extends SequenceFragment 
-{
-  public ServiceRootFragment()
-  {
-    add( new SimpleFragment( new PreServiceDevelopCommand(), "" ) );
-    add( new DevelopServiceFragment() );
-    add( new SimpleFragment( new PreServiceAssembleCommand(), "" ) );
-    add( new AssembleServiceFragment() );
-    add( new SimpleFragment( new PreServiceDeployCommand(), "" ) );
-    add( new DeployServiceFragment() );
-    add( new SimpleFragment( new PreServiceInstallCommand(), "" ) );
-    add( new InstallServiceFragment() );
-    add( new SimpleFragment( new PreServiceRunCommand(), 
-    	 "org.eclipse.jst.ws.internal.creation.ui.extension.PreServiceRunCommand" ) );
-    add( new RunServiceFragment() );
-  }
-
-  public void registerDataMappings(DataMappingRegistry registry) 
-  {
-		//Mappings from framework to extension fragments
-  	registry.addMapping( PreServiceDevelopCommand.class, "WebService", DevelopServiceFragment.class );  
-  	registry.addMapping( PreServiceDevelopCommand.class, "Environment", DevelopServiceFragment.class );  
-  	registry.addMapping( PreServiceDevelopCommand.class, "Context", DevelopServiceFragment.class );  
-  	registry.addMapping( PreServiceDevelopCommand.class, "Selection", DevelopServiceFragment.class );  
-		registry.addMapping( PreServiceDevelopCommand.class, "Project", DevelopServiceFragment.class );
-  	registry.addMapping( PreServiceDevelopCommand.class, "Module", DevelopServiceFragment.class );
-		registry.addMapping( PreServiceDevelopCommand.class, "EarProject", DevelopServiceFragment.class );
-  	registry.addMapping( PreServiceDevelopCommand.class, "Ear", DevelopServiceFragment.class );
-	
-	// Map the PreServiceDevelopCommand into the dataObject and the PreClientDevelopCommand.
-	registry.addMapping( PreServiceDevelopCommand.class, "WebService", DataObjectCommand.class, "DataObject", null );
-	registry.addMapping( PreServiceDevelopCommand.class, "WebService", PreClientDevelopCommand.class, "DataObject", null );
-		
-  	registry.addMapping( PreServiceDevelopCommand.class, "WebService", AssembleServiceFragment.class );  
-  	registry.addMapping( PreServiceDevelopCommand.class, "Environment", AssembleServiceFragment.class );  
-  	registry.addMapping( PreServiceDevelopCommand.class, "Context", AssembleServiceFragment.class );  
-  	registry.addMapping( PreServiceDevelopCommand.class, "Selection", AssembleServiceFragment.class );
-		registry.addMapping( PreServiceDevelopCommand.class, "Project", AssembleServiceFragment.class );
-  	registry.addMapping( PreServiceDevelopCommand.class, "Module", AssembleServiceFragment.class );  
-		registry.addMapping( PreServiceDevelopCommand.class, "EarProject", AssembleServiceFragment.class );
-  	registry.addMapping( PreServiceDevelopCommand.class, "Ear", AssembleServiceFragment.class );
-	
-  	registry.addMapping( PreServiceDevelopCommand.class, "WebService", DeployServiceFragment.class );  
-  	registry.addMapping( PreServiceDevelopCommand.class, "Environment", DeployServiceFragment.class );  
-  	registry.addMapping( PreServiceDevelopCommand.class, "Context", DeployServiceFragment.class );  
-  	registry.addMapping( PreServiceDevelopCommand.class, "Selection", DeployServiceFragment.class );
-		registry.addMapping( PreServiceDevelopCommand.class, "Project", DeployServiceFragment.class );
-  	registry.addMapping( PreServiceDevelopCommand.class, "Module", DeployServiceFragment.class );  
-		registry.addMapping( PreServiceDevelopCommand.class, "EarProject", DeployServiceFragment.class );
-  	registry.addMapping( PreServiceDevelopCommand.class, "Ear", DeployServiceFragment.class );
-	
-  	registry.addMapping( PreServiceDevelopCommand.class, "WebService", InstallServiceFragment.class );  
-  	registry.addMapping( PreServiceDevelopCommand.class, "Environment", InstallServiceFragment.class );  
-  	registry.addMapping( PreServiceDevelopCommand.class, "Context", InstallServiceFragment.class );  
-  	registry.addMapping( PreServiceDevelopCommand.class, "Selection", InstallServiceFragment.class );
-		registry.addMapping( PreServiceDevelopCommand.class, "Project", InstallServiceFragment.class );
-  	registry.addMapping( PreServiceDevelopCommand.class, "Module", InstallServiceFragment.class );  
-		registry.addMapping( PreServiceDevelopCommand.class, "EarProject", InstallServiceFragment.class );
-  	registry.addMapping( PreServiceDevelopCommand.class, "Ear", InstallServiceFragment.class );
-	
-  	registry.addMapping( PreServiceDevelopCommand.class, "WebService", RunServiceFragment.class );  
-  	registry.addMapping( PreServiceDevelopCommand.class, "Environment", RunServiceFragment.class );  
-  	registry.addMapping( PreServiceDevelopCommand.class, "Context", RunServiceFragment.class );  
-  	registry.addMapping( PreServiceDevelopCommand.class, "Selection", RunServiceFragment.class );  
-		registry.addMapping( PreServiceDevelopCommand.class, "Project", RunServiceFragment.class );
-  	registry.addMapping( PreServiceDevelopCommand.class, "Module", RunServiceFragment.class );  
-		registry.addMapping( PreServiceDevelopCommand.class, "EarProject", RunServiceFragment.class );
-  	registry.addMapping( PreServiceDevelopCommand.class, "Ear", RunServiceFragment.class );
-		
-		//Mappings from framework to framework commands
-  	registry.addMapping( PreServiceDevelopCommand.class, "WebService", PreServiceAssembleCommand.class );
-		registry.addMapping( PreServiceDevelopCommand.class, "Project", PreServiceAssembleCommand.class );
-  	registry.addMapping( PreServiceDevelopCommand.class, "Module", PreServiceAssembleCommand.class );
-		registry.addMapping( PreServiceDevelopCommand.class, "EarProject", PreServiceAssembleCommand.class );
-  	registry.addMapping( PreServiceDevelopCommand.class, "Ear", PreServiceAssembleCommand.class );
-		
-  	registry.addMapping( PreServiceDevelopCommand.class, "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, "Context", PreServiceInstallCommand.class );
-
-  	registry.addMapping( PreServiceDevelopCommand.class, "WebService", PreServiceRunCommand.class );
-  	registry.addMapping( PreServiceDevelopCommand.class, "Context", 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 2a18e14d4..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/plugin/WebServiceCreationUIPlugin.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.plugin;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-
-
-/**
-* This is the plugin class for the Web Services Creation UI plugin.
-* <p>
-* The Web Services Creation UI plugin's sole function is to add 
-* user interface of the Web Services Creation Wizard, contained in  
-* the org.eclipse.jst.ws.ui plugin.
-*/
-public class WebServiceCreationUIPlugin extends Plugin
-{
-
-  /**
-  * The identifier of the descriptor of this plugin in plugin.xml.
-  */
-  public static final String ID = "org.eclipse.jst.ws.creation.ui";
-
-  /**
-  * The reference to the singleton instance of this plugin.
-  */
-  private static WebServiceCreationUIPlugin instance_;
-
-  /**
-  * Constructs a runtime plugin object for this plugin.
-  * The "plugin" element in plugin.xml should include the attribute
-  * class = "org.eclipse.jst.ws.internal.creation.ui.plugin.WebServiceCreationUIPlugin".
-  * @param descriptor The descriptor of this plugin.
-  */
-  public WebServiceCreationUIPlugin ()
-  {
-    super();
-    instance_ = this;
-  }
-
-  /**
-  * Returns the singleton instance of this plugin. Equivalent to calling
-  * (WebServiceCreationUIPlugin)Platform.getPlugin("org.eclipse.jst.ws.creation.ui");
-  * @return The WebServiceCreationUIPlugin singleton.
-  */
-  public static WebServiceCreationUIPlugin getInstance ()
-  {
-    return instance_;
-  }
-
-  /**
-  * Returns the message string identified by the given key from
-  * plugin.properties.
-  * @return The String message.
-  */
-  public static String getMessage ( String key )
-  {
-    MessageUtils msgUtils = new MessageUtils( "org.eclipse.jst.ws.creation.ui.plugin", instance_ );
-    
-    if( key.startsWith("%"))
-    {
-      key = key.substring( 1, key.length() );
-    }
-    
-    return msgUtils.getMessage(key);
-  }
-
-  /**
-  * Returns the message string identified by the given key from
-  * plugin.properties. Substitution sequences in the message string
-  * are replaced by the given array of substitution objects (which
-  * are most frequently strings). See the JDK's
-  * {@link java.text.MessageFormat java.text.MessageFormat}
-  * class for further details on substitution.
-  * @return The String message.
-  */
-  public static String getMessage ( String key, Object[] args )
-  {
-    return MessageFormat.format(getMessage(key),args);
-  }
-
-  /**
-  * Returns an image descriptor for the named resource
-  * as relative to the plugin install location.
-  * @return An image descriptor, possibly null.
-  */
-  public static ImageDescriptor getImageDescriptor ( String name )
-  {
-    try
-    {
-      URL installURL = instance_.getBundle().getEntry("/");
-      URL imageURL = new URL(installURL,name);
-      return ImageDescriptor.createFromURL(imageURL);
-    }
-    catch (MalformedURLException e)
-    {
-      return null;
-    }
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/preferences/ScenarioDefaultsPreferencePage.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/preferences/ScenarioDefaultsPreferencePage.java
deleted file mode 100644
index 514b1f3b9..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/preferences/ScenarioDefaultsPreferencePage.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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);
-	  
-	  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_.setInstallService( new Boolean(context.getInstallWebService()) );
-      serverWidget_.setInstallClient( new Boolean(context.getInstallClient()) );
-      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_.setInstallService( new Boolean(context.getInstallWebServiceDefault()) );
-      serverWidget_.setInstallClient( new Boolean(context.getInstallClientDefault()) );
-      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.setInstallWebService( serverWidget_.getInstallService().booleanValue() );
-      context.setInstallClient( serverWidget_.getInstallClient().booleanValue() );
-      context.setStartWebService( serverWidget_.getStartService().booleanValue() );
-      context.setTestWebService( serverWidget_.getTestService().booleanValue() );
-      context.setMonitorWebService(serverWidget_.getMonitorService().booleanValue());
-	}
-	
-	protected void performApply()
-	{
-	  performOk();
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/server/StartServerWidgetContributor.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/server/StartServerWidgetContributor.java
deleted file mode 100644
index fc96c1c97..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/server/StartServerWidgetContributor.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.creation.ui.server;
-
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.server.StartServerWidget;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.server.core.IServer;
-
-public class StartServerWidgetContributor implements INamedWidgetContributor 
-{
-  private IServer      server_;
-	  
-  public StartServerWidgetContributor( IServer server )
-  {
-	server_ = server;
-  }
-  
-  public String getDescription() 
-  {
-	return ConsumptionUIMessages.PAGE_DESC_WS_START_SERVER;
-  }
-
-  public String getName() 
-  {
-	return "";
-  }
-
-  public String getTitle() 
-  {
-	return ConsumptionUIMessages.PAGE_TITLE_WS_START_SERVER;
-  }
-
-  public WidgetContributorFactory getWidgetContributorFactory() 
-  {
-	return new WidgetContributorFactory()
-	       {
-			 public WidgetContributor create() 
-			 {
-				return new StartServerWidget( server_ );
- 			 }
-	       };
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/server/StartServerWidgetFactory.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/server/StartServerWidgetFactory.java
deleted file mode 100644
index 942845f6e..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/server/StartServerWidgetFactory.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.creation.ui.server;
-
-import org.eclipse.jst.ws.internal.creation.ui.extension.PreServiceDevelopCommand;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributorFactory;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-import org.eclipse.wst.ws.internal.wsrt.IWebService;
-
-public class StartServerWidgetFactory implements INamedWidgetContributorFactory 
-{
-  private IWebService webservice_;
-  private IContext context_;
-  
-  public INamedWidgetContributor getFirstNamedWidget() 
-  {
-    IServer server = null;
-    
-    if( webservice_ != null && context_.getInstall())
-    {
-      server = ServerCore.findServer(webservice_.getWebServiceInfo().getServerInstanceId() );
-    }
-    
-    if( server != null && server.getServerState() != IServer.STATE_STARTED )
-    {
-      return new StartServerWidgetContributor( server );
-    }
-    
-	return null;
-  }
-
-  public INamedWidgetContributor getNextNamedWidget( INamedWidgetContributor widgetContributor) 
-  {
-	return null;
-  }
-
-  public void registerDataMappings(DataMappingRegistry dataRegistry) 
-  {
-	dataRegistry.addMapping( PreServiceDevelopCommand.class, "WebService", StartServerWidgetFactory.class );
-	dataRegistry.addMapping( PreServiceDevelopCommand.class, "Context", StartServerWidgetFactory.class );
-  }
-  
-  public void setWebService( IWebService webservice )
-  {
-    webservice_ = webservice;  
-  }
-  public void setContext ( IContext context )
-  {
-    context_ = context;  
-  }
-}
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 b727c51fa..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidget.java
+++ /dev/null
@@ -1,351 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.widgets;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.PreferencesSelectionWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.WebServiceClientTypeWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-import org.eclipse.jst.ws.internal.data.LabelsAndIds;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-
-public class ServerWizardWidget extends SimpleWidgetDataContributor
-{   
-  private WebServiceClientTypeWidget clientWidget_;
-  private PreferencesSelectionWidget preferencesWidget_;
-  private Listener                   statusListener_;
-  private TypeRuntimeServer          ids_;
-  private LabelsAndIds               labelIds_;
-  private boolean                    displayPreferences_;
-  
-  /*CONTEXT_ID PWPR0001 for the Project Page*/
-  private String INFOPOP_PWPR_PAGE = "PWPR0001";
-  
-  /*CONTEXT_ID PWPR0005 for the Generate Proxy check box of the Project Page*/
-  private String INFOPOP_PWPR_CHECKBOX_GENERATE_PROXY = "PWPR0005";
-  private Button  generateProxy_;
-  
-  /*CONTEXT_ID PWPR0010 for the Web Service Type combo box of the Project Page*/
-  private String INFOPOP_PWPR_COMBO_TYPE = "PWPR0010";
-  private Combo  webserviceType_;
-  
-  /*CONTEXT_ID PWPR0011 for the Wizard Scenario Service group of the Project Page*/
-  private String INFOPOP_PWPR_GROUP_SCENARIO_SERVICE = "PWPR0011";
-  private Button startService_;
-  
-  /*CONTEXT_ID PWPR0017 for the Install Service check box of the Scenario page of Service wizard*/
-  private String INFOPOP_PWPR_CHECKBOX_INSTALL_SERVICE = "PWPR0017";  
-  private Button installService_;
-  
-  /*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";
-    UIUtils      utils    = new UIUtils( createPluginId );
-    
-    statusListener_ = statusListener;
-    
-  	PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId + "." +  INFOPOP_PWPR_PAGE );
-  	
-  	Composite serverComposite = utils.createComposite( parent, 1 );
-  	
-  	Group serviceGroup = utils.createGroup( serverComposite, ConsumptionUIMessages.GROUP_SCENARIO_SERVICE,
-  			ConsumptionUIMessages.TOOLTIP_PWPR_GROUP_SCENARIO_SERVICE, 
-  	                                        INFOPOP_PWPR_GROUP_SCENARIO_SERVICE,
-											2, 10, 10);
-  	
-  	
-  	// Create webservice combo box.
-    webserviceType_ = utils.createCombo( serviceGroup, ConsumptionUIMessages.LABEL_WEBSERVICETYPE,
-    		ConsumptionUIMessages.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 install service check box.
-    installService_ = utils.createCheckbox( buttonsGroup, ConsumptionUIMessages.BUTTON_INSTALL_SERVICE_WEB_PROJECT,
-    		ConsumptionUIMessages.TOOLTIP_PWPR_CHECKBOX_INSTALL_SERVICE_WEB_PROJECT,
-                                          INFOPOP_PWPR_CHECKBOX_INSTALL_SERVICE );
-    installService_ .addSelectionListener( new SelectionAdapter()
-                                        {
-                                          public void widgetSelected( SelectionEvent evt )
-                                          {
-                                        	  handleInstallPressed();
-                                          }
-                                        });
-    
-    // Create start service check box.
-    startService_ = utils.createCheckbox( buttonsGroup, ConsumptionUIMessages.BUTTON_START_WEB_PROJECT,
-    		ConsumptionUIMessages.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, ConsumptionUIMessages.BUTTON_WS_PUBLISH,
-    		ConsumptionUIMessages.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, ConsumptionUIMessages.BUTTON_GENERATE_PROXY,
-    		ConsumptionUIMessages.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, ConsumptionUIMessages.CHECKBOX_TEST_WEBSERVICE,
-    		ConsumptionUIMessages.TOOLTIP_PWPR_CHECKBOX_TEST_SERVICE,
-                                         INFOPOP_PWPR_CHECKBOX_TEST_SERVICE );
-
-    monitorService = utils.createCheckbox( testGroup, ConsumptionUIMessages.CHECKBOX_MONITOR_WEBSERVICE,
-    		ConsumptionUIMessages.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 handleInstallPressed()
-  {
-    boolean enabled = installService_.getSelection();
-    
-    if (!enabled)
-    {
-    	startService_.setSelection(enabled);
-    }
-    startService_.setEnabled(enabled);
-    handleStartPressed();
-  }
-  
-  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 setInstallClient( Boolean install)
-  {
-    clientWidget_.setInstallClient( install );
-  }
-  
-  public Boolean getInstallClient()
-  {
-    return clientWidget_.getInstallClient();  
-  }
-  
-  public void setServiceTypeRuntimeServer( TypeRuntimeServer ids )
-  {
-    LabelsAndIds                        labelIds   = WebServiceRuntimeExtensionUtils2.getServiceTypeLabels();
-	//rskreg
-    int                                 selection  = 0;
-    String[]                            serviceIds = labelIds.getIds_();
-    String                              selectedId = ids.getTypeId();
-    
-    webserviceType_.removeListener( SWT.Modify, statusListener_ );
-    webserviceType_.setItems( labelIds.getLabels_() );
-        
-    // Now find the selected one.
-    for( int index = 0; index < serviceIds.length; index++ )
-    {
-      if( selectedId.equals( serviceIds[index ]) )
-      {
-        selection = index;
-        break;
-      }
-    }
-    
-    webserviceType_.select( selection );
-    webserviceType_.addListener( SWT.Modify, statusListener_ );
-    ids_      = ids;  
-    labelIds_ = labelIds;
-  }
-  
-  public TypeRuntimeServer getServiceTypeRuntimeServer()
-  {
-    int selectionIndex = webserviceType_.getSelectionIndex();
-    
-    ids_.setTypeId( labelIds_.getIds_()[selectionIndex] );
-    
-    return ids_;  
-  }
-  
-  public Boolean getStartService()
-  {
-    return new Boolean( startService_.getSelection() && installService_.getSelection());  
-  }
-  
-  public void setStartService( Boolean value )
-  {
-    startService_.setSelection( value.booleanValue() );
-  }
-
-  public Boolean getInstallService()
-  {
-    return new Boolean( installService_.getSelection() );  
-  }
-  
-  public void setInstallService( Boolean value )
-  {
-    installService_.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()
-  {
-	handleInstallPressed();  
-    handleStartPressed();  
-  }
-  
-  public IStatus getStatus()
-  {
-    IStatus status = Status.OK_STATUS;
-    
-    // If the webservice has not been selected then user can not move
-    // forward to the next page.
-    if( webserviceType_.getText().equals("") )
-    {
-      status = StatusUtils.errorStatus( "" );
-    }
-    
-    return status;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetDefaultingCommand.java
deleted file mode 100644
index fb1ad1023..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.widgets;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-
-public class ServerWizardWidgetDefaultingCommand extends ClientWizardWidgetDefaultingCommand
-{    
-  private TypeRuntimeServer typeRuntimeServer_;
-  private IStructuredSelection initialSelection_;
-  
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {    
-  
-    String type      = getScenarioContext().getWebServiceType();
-    String runtime   = WebServiceRuntimeExtensionUtils2.getDefaultRuntimeValueFor( type );
-	
-    String factoryID = WebServiceRuntimeExtensionUtils2.getDefaultServerValueFor(type);    
-    typeRuntimeServer_ = new TypeRuntimeServer();
-    
-    typeRuntimeServer_.setTypeId( type );
-    typeRuntimeServer_.setRuntimeId( runtime );
-    typeRuntimeServer_.setServerId( factoryID );
-    
-    //Default the typeId from the initial selection
-    String[] typeIds = WebServiceRuntimeExtensionUtils2.getWebServiceTypeBySelection(initialSelection_);
-
-    if (typeIds!=null && typeIds.length>0)
-    {
-      typeRuntimeServer_.setTypeId(typeIds[0]);
-    }
-    
-    return Status.OK_STATUS;
-  }
-  
-  public void setInitialSelection(IStructuredSelection selection)
-  {
-    initialSelection_ = selection;
-  }
-  
-  public TypeRuntimeServer getServiceTypeRuntimeServer()
-  { 
-    return typeRuntimeServer_;
-  }
-
-  public Boolean getInstallService()
-  {
-    return new Boolean( getScenarioContext().getInstallWebService() );  
-  }
-  
-  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 3b0c12549..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetOutputCommand.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.creation.ui.widgets;
-
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidgetOutputCommand;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-
-
-public class ServerWizardWidgetOutputCommand extends ClientWizardWidgetOutputCommand
-{    
-  private TypeRuntimeServer typeRuntimeServer_;
-  private boolean           installService_;
-  private boolean           startService_;
-  private boolean           testService_;
-  private boolean           publishService_;
-  private boolean           generateProxy_;
-	private ResourceContext   resourceContext_;
-    
-  
-  public TypeRuntimeServer getServiceTypeRuntimeServer()
-  { 
-    return typeRuntimeServer_;
-  }
-
-  public boolean getInstallService()
-  {
-    return installService_;  
-  }
-
-  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 installService_ The installService_ to set.
-   */
-  public void setInstallService(boolean installService_)
-  {
-    this.installService_ = installService_;
-  }
-  /**
-   * @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 804cb29d4..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ExportWSWidgetBinding.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.PublishToPrivateUDDICommandFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.PublishWSWidget;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-import org.eclipse.wst.ws.internal.explorer.WSExplorerLauncherCommand;
-
-
-public class ExportWSWidgetBinding implements CommandWidgetBinding
-{
-  private CanFinishRegistry   canFinishRegistry;
-  private WidgetRegistry      widgetRegistry;
-  private DataMappingRegistry dataMappingRegistry;
-  private PublishToPrivateUDDICommandFragment publishToPrivateUDDICmdFrag;
-
-  public ExportWSWidgetBinding()
-  {
-    publishToPrivateUDDICmdFrag = new PublishToPrivateUDDICommandFragment();
-  }
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#create()
-   */
-  public CommandFragmentFactory create()
-  {
-    return new CommandFragmentFactory()
-           {
-             public CommandFragment create()
-             {
-               SequenceFragment root = new SequenceFragment();
-               root.add(new SimpleFragment("WSExport"));
-               root.add(publishToPrivateUDDICmdFrag);
-               root.add(new SimpleFragment(new WSExplorerLauncherCommand(), ""));
-               return root;  
-             }
-           };
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
-   */
-  public void registerCanFinish(CanFinishRegistry canFinishRegistry)
-  {
-    this.canFinishRegistry = canFinishRegistry;
-    publishToPrivateUDDICmdFrag.registerCanFinish(this.canFinishRegistry);
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry)
-   */
-  public void registerDataMappings(DataMappingRegistry dataRegistry)
-  {
-    this.dataMappingRegistry = dataRegistry;
-    publishToPrivateUDDICmdFrag.registerDataMappings(this.dataMappingRegistry);
-    
-    // PublishToPrivateUDDICommandFragment
-    dataMappingRegistry.addMapping(PublishWSWidget.class, "PublishToPrivateUDDI", PublishToPrivateUDDICommandFragment.class);
-    
-    // LaunchWebServicesExplorerCommand
-    dataMappingRegistry.addMapping(PublishWSWidget.class, "ForceLaunchOutsideIDE", WSExplorerLauncherCommand.class);
-    dataMappingRegistry.addMapping(PublishWSWidget.class, "LaunchOptions", WSExplorerLauncherCommand.class);
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
-   */
-  public void registerWidgetMappings(WidgetRegistry widgetRegistry)
-  {
-    this.widgetRegistry = widgetRegistry;
-    publishToPrivateUDDICmdFrag.registerWidgetMappings(this.widgetRegistry);
-
-    widgetRegistry.add("WSExport", 
-    ConsumptionUIMessages.PAGE_TITLE_WS_PUBLISH,
-    ConsumptionUIMessages.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 37d757656..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/PublishWSDLWidgetBinding.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.widgets.binding;
-
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-
-
-public class PublishWSDLWidgetBinding implements CommandWidgetBinding
-{
-  public PublishWSDLWidgetBinding()
-  {
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#create()
-   */
-  public CommandFragmentFactory create()
-  {
-    return new CommandFragmentFactory()
-           {
-             public CommandFragment create()
-             {
-               return new SimpleFragment();  
-             }
-           };
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
-   */
-  public void registerCanFinish(CanFinishRegistry canFinishRegistry)
-  {
-  }
-
-  /* (non-Javadoc), 
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry)
-   */
-  public void registerDataMappings(DataMappingRegistry dataRegistry)
-  {
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
-   */
-  public void registerWidgetMappings(WidgetRegistry widgetRegistry)
-  {
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ServerWidgetBinding.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ServerWidgetBinding.java
deleted file mode 100644
index 9dd160026..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ServerWidgetBinding.java
+++ /dev/null
@@ -1,599 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060204 124408   rsinha@ca.ibm.com - Rupam Kuehner
- * 20060204 121605   rsinha@ca.ibm.com - Rupam Kuehner           
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.widgets.binding;
-
-import org.eclipse.jst.ws.internal.common.StringToIProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.command.common.ComputeEndpointCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateMonitorCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.ManageServerStartUpCommand;
-import org.eclipse.jst.ws.internal.consumption.common.ScenarioCleanupCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.command.data.ServerInstToIServerTransformer;
-import org.eclipse.jst.ws.internal.consumption.ui.common.FinishFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.extension.ClientRootFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.extension.PreClientDevelopCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.selection.SelectionTransformer;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.CheckWSDLValidationCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.PublishToPrivateUDDICommandFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.PublishWSWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestDelegateCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.FinishDefaultCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.FinishTestFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.TestDefaultingFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WSDLTestLaunchCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WebServiceClientTestArrivalCommand;
-import org.eclipse.jst.ws.internal.creation.ui.CreationUIMessages;
-import org.eclipse.jst.ws.internal.creation.ui.extension.PreServiceDevelopCommand;
-import org.eclipse.jst.ws.internal.creation.ui.extension.ServiceRootFragment;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidget;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidgetOutputCommand;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.runtime.ServerRuntimeSelectionWidget;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.runtime.ServerRuntimeSelectionWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.test.LaunchFragment;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.test.ServiceTestFragment;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.test.ServiceTestWidget;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.test.WebServiceTestDefaultingCommand;
-import org.eclipse.wst.command.internal.env.core.common.Condition;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.SelectionCommand;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-import org.eclipse.wst.ws.internal.explorer.WSExplorerLauncherCommand;
-
-public class ServerWidgetBinding implements CommandWidgetBinding
-{
-  private CanFinishRegistry   canFinishRegistry_;
-  private WidgetRegistry      widgetRegistry_;
-  private DataMappingRegistry dataMappingRegistry_;
-  private PublishToPrivateUDDICommandFragment publishToPrivateUDDICmdFrag;
-
-  public ServerWidgetBinding()
-  {
-    publishToPrivateUDDICmdFrag = new PublishToPrivateUDDICommandFragment();
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#create()
-   */
-  public CommandFragmentFactory create()
-  {
-    return new CommandFragmentFactory()
-           {
-             public CommandFragment create()
-             {
-               return new ServiceRootCommandFragment();  
-             }
-           };
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
-   */
-  public void registerCanFinish(CanFinishRegistry canFinishRegistry)
-  {
-    canFinishRegistry_ = canFinishRegistry;
-    publishToPrivateUDDICmdFrag.registerCanFinish(canFinishRegistry_);
-  }
-
-  /* (non-Javadoc), 
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry)
-   */
-  public void registerDataMappings(DataMappingRegistry dataRegistry)
-  {
-    dataMappingRegistry_ = dataRegistry;
-    
-    // Before ServerWizardWidget
-    dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerWizardWidget.class);
-    dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "StartService", ServerWizardWidget.class);
-    dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "InstallService", 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, "InstallClient", 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, "InstallService", ServerWizardWidgetOutputCommand.class);
-    dataRegistry.addMapping(ServerWizardWidget.class, "InstallClient", 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(ServerExtensionDefaultingCommand.class, "TestService", ClientTestWidget.class );
-    dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "TestService",FinishTestFragment.class);
-    
-	dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "GenerateProxy", TestDefaultingFragment.class);
-    // Before ServerRuntimeSelectionWidget
-    dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "InstallService", ServerRuntimeSelectionWidget.class);
-    dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "InstallClient", ServerRuntimeSelectionWidget.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "GenerateProxy", ServerRuntimeSelectionWidget.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceProjectName", ServerRuntimeSelectionWidget.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceEarProjectName", ServerRuntimeSelectionWidget.class);
-    //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceProject2EARProject", ServerRuntimeSelectionWidget.class);
-    //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceComponentName", ServerRuntimeSelectionWidget.class);
-    //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceEarComponentName", ServerRuntimeSelectionWidget.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceComponentType", ServerRuntimeSelectionWidget.class);
-    //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "Runtime2ClientTypes", ServerRuntimeSelectionWidget.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", ServerRuntimeSelectionWidget.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", ServerRuntimeSelectionWidget.class);
-    //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentName", ServerRuntimeSelectionWidget.class);
-    //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarComponentName", ServerRuntimeSelectionWidget.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerRuntimeSelectionWidget.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceRuntimeId", ServerRuntimeSelectionWidget.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ServerRuntimeSelectionWidget.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientRuntimeId", ServerRuntimeSelectionWidget.class);    
-    //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceJ2EEVersion", ServerRuntimeSelectionWidget.class);
-    //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientJ2EEVersion", ServerRuntimeSelectionWidget.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceNeedEAR", ServerRuntimeSelectionWidget.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientNeedEAR", ServerRuntimeSelectionWidget.class);
-    
-            
-    // After ServerRuntimeSelectionWidget    
-    dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ServiceTypeRuntimeServer", ServerExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ServiceRuntimeId", ServerExtensionDefaultingCommand.class);    
-    //dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ServiceJ2EEVersion", ServerExtensionDefaultingCommand.class );
-    dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ClientTypeRuntimeServer", ClientExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ClientRuntimeId", ClientExtensionDefaultingCommand.class);
-    //dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ClientJ2EEVersion", ClientExtensionDefaultingCommand.class );
-    //dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ServiceProject2EARProject", ServerExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ServiceProjectName", ServerExtensionDefaultingCommand.class);
-    //dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ServiceComponentName", ServerExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ServiceEarProjectName", ServerExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ServiceComponentType", ServerExtensionDefaultingCommand.class);        
-    //dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ServiceEarComponentName", ServerExtensionDefaultingCommand.class);
-    //dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "Runtime2ClientTypes", ClientExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ClientProjectName", ClientExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ClientEarProjectName", ClientExtensionDefaultingCommand.class);
-    //dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ClientComponentName", ClientExtensionDefaultingCommand.class);
-    //dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ClientEarComponentName", ClientExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ClientComponentType", ClientExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ServiceNeedEAR", ServerExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ClientNeedEAR", ClientExtensionDefaultingCommand.class);
-    
-
-    // Map fragments that depend on data.   
-    dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ClientTypeRuntimeServer", ClientExtensionFragment.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ServiceTypeRuntimeServer", ServerExtensionFragment.class);
-    
-    // CreateMonitorCommand
-    dataRegistry.addMapping(CreateMonitorCommand.class, "MonitoredPort", ComputeEndpointCommand.class);
-    
-    // ComputeEndpointCommand
-    dataRegistry.addMapping(ComputeEndpointCommand.class, "Endpoint", ServiceTestWidget.class);
-    dataRegistry.addMapping(ComputeEndpointCommand.class, "Endpoint", ClientTestDelegateCommand.class);
-
-    //ServiceTestWidget mappings    
-    dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", ServiceTestWidget.class);
-    dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", ServiceTestWidget.class);
-    dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", CreateMonitorCommand.class);
-    dataRegistry.addMapping(ServerExtensionOutputCommand.class, "WsdlURI", ServiceTestWidget.class);
-	dataRegistry.addMapping(ServerExtensionOutputCommand.class, "ServiceServerInstanceId", ServiceTestWidget.class);
-    dataRegistry.addMapping(ServerExtensionOutputCommand.class, "WsdlURI", ComputeEndpointCommand.class);
-    dataRegistry.addMapping(ServerExtensionOutputCommand.class, "WebServicesParser", ComputeEndpointCommand.class);
-    dataRegistry.addMapping(WebServiceTestDefaultingCommand.class, "ServiceTestFacilities", ServiceTestWidget.class);    
-    dataRegistry.addMapping(WebServiceTestDefaultingCommand.class, "Environment", ServiceTestWidget.class);
-    dataRegistry.addMapping(ServiceTestWidget.class, "LaunchedServiceTestName", ClientExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServiceTestWidget.class, "LaunchedServiceTestName", FinishTestFragment.class);
-    dataRegistry.addMapping(ServiceTestWidget.class, "LaunchedServiceTestName", TestDefaultingFragment.class);
-        
-    // Before Client Test widget.
-    dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ClientTestWidget.class );
-    
-    // Before ClientTestWidget
-        
-    dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProject", ClientTestWidget.class );
-    dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProjectEAR", ClientTestWidget.class );
-    dataRegistry.addMapping(TestDefaultingFragment.class, "TestFacility",ClientTestWidget.class);
-    dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Folder",ClientTestWidget.class);
-    dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "JspFolder",ClientTestWidget.class);
-    dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "RunClientTest",ClientTestWidget.class);
-    dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Methods",ClientTestWidget.class);
-    
-    
-    // After ClientTestWidget    
-    dataRegistry.addMapping(ClientTestWidget.class, "SampleProjectEAR",FinishDefaultCommand.class);
-    dataRegistry.addMapping(ClientTestWidget.class, "SampleProject",FinishDefaultCommand.class);
-    dataRegistry.addMapping(ClientTestWidget.class, "TestFacility",ClientTestDelegateCommand.class);
-    dataRegistry.addMapping(ClientTestWidget.class, "Folder",ClientTestDelegateCommand.class);
-    dataRegistry.addMapping(ClientTestWidget.class, "JspFolder",ClientTestDelegateCommand.class);
-    dataRegistry.addMapping(ClientTestWidget.class, "RunClientTest",ClientTestDelegateCommand.class);
-    dataRegistry.addMapping(ClientTestWidget.class, "Methods",ClientTestDelegateCommand.class);
-    dataRegistry.addMapping(ClientTestWidget.class, "TestService",FinishTestFragment.class);
-    dataRegistry.addMapping(ClientTestWidget.class, "TestID",FinishTestFragment.class);
-    dataRegistry.addMapping(ClientTestWidget.class, "IsTestWidget",FinishTestFragment.class);
-    // PublishWSWidget
-    dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "PublishService", PublishWSWidget.class, "PublishToPublicUDDI", null);
-    
-    // PublishToPrivateUDDICommandFragment
-    dataRegistry.addMapping(PublishWSWidget.class, "PublishToPrivateUDDI", PublishToPrivateUDDICommandFragment.class);
-    
-    // LaunchWebServicesExplorerCommand
-    dataRegistry.addMapping(PublishWSWidget.class, "PublishToPrivateUDDI", LaunchFragment.class);
-    dataRegistry.addMapping(PublishWSWidget.class, "PublishToPublicUDDI", LaunchFragment.class);
-    // TODO Need defaults for these properties.
-    dataRegistry.addMapping(PublishWSWidget.class, "ForceLaunchOutsideIDE", WSExplorerLauncherCommand.class);
-    dataRegistry.addMapping(PublishWSWidget.class, "LaunchOptions", WSExplorerLauncherCommand.class);
-  
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
-   */
-  public void registerWidgetMappings(WidgetRegistry widgetRegistry)
-  {
-   
-    widgetRegistry_ = widgetRegistry;
-    publishToPrivateUDDICmdFrag.registerWidgetMappings(widgetRegistry_);
-
-    widgetRegistry.add( "ServerWizardWidget", 
-                        ConsumptionUIMessages.PAGE_TITLE_WS_PROJECT,
-                        ConsumptionUIMessages.PAGE_DESC_WS_PROJECT,
-				        new WidgetContributorFactory()
-				        {
-				          public WidgetContributor create()
-				          {
-				            return new ServerWizardWidget( true );
-				          }
-				        } );
-
-    widgetRegistry.add( "ObjectSelectionWidget", 
-                        CreationUIMessages.PAGE_TITLE_OBJECT_SELECTION,
-                        CreationUIMessages.PAGE_DESC_OBJECT_SELECTION,
-                        new WidgetContributorFactory()
-                        {
-                          public WidgetContributor create()
-                          {
-                            return new ObjectSelectionWidget();
-                          }
-                        });
-
-    widgetRegistry.add( "ServerRuntimeSelectionWidget", 
-                        ConsumptionUIMessages.PAGE_TITLE_WS_RUNTIME_SELECTION,
-                        ConsumptionUIMessages.PAGE_DESC_WS_RUNTIME_SELECTION,
-						new WidgetContributorFactory()
-                        {
-						  public WidgetContributor create()
-						  {
-						    return new ServerRuntimeSelectionWidget();
-						  }
-						} ); 
-    
-    widgetRegistry.add( "TestService", 
-                        ConsumptionUIMessages.PAGE_TITLE_WSTEST,
-                        ConsumptionUIMessages.PAGE_DESC_WSTEST,
-                        new WidgetContributorFactory()
-                        {
-                          public WidgetContributor create()
-                          {
-                            return new ServiceTestWidget();
-                          }
-                        } );
-    
-    widgetRegistry.add( "ClientTestWidget", 
-            ConsumptionUIMessages.PAGE_TITLE_WS_SAMPLE,
-            ConsumptionUIMessages.PAGE_DESC_WS_SAMPLE,
-            new WidgetContributorFactory()
-            {
-              public WidgetContributor create()
-              {
-                return new ClientTestWidget(); 
-              }
-            });
-    
-    widgetRegistry.add( "Publish", 
-                        ConsumptionUIMessages.PAGE_TITLE_WS_PUBLISH,
-                        ConsumptionUIMessages.PAGE_DESC_WS_PUBLISH,
-                        new WidgetContributorFactory()
-                        {
-                          public WidgetContributor create()
-                          {
-                            return new PublishWSWidget(true);
-                          }
-                        } );
-  }
-      
-  private class ClientFragment extends BooleanFragment
-  {
-    boolean genProxy_ = false;
-    
-    public ClientFragment()
-    {      
-      setCondition( new Condition() 
-                    {
-                      public boolean evaluate()
-                      {
-                        return genProxy_;
-                      }
-                    });
-      
-      SequenceFragment clientRoot = new SequenceFragment();
-      
-      clientRoot.add( new SimpleFragment( new ClientExtensionDefaultingCommand( false ), ""));
-      //clientRoot.add(new SimpleFragment(new ClientServerDeployableConfigCommand(), "")); //Note: added here for client     
-      //clientRoot.add( new ClientExtensionFragment() );
-      clientRoot.add( new ClientRootFragment() );
-      clientRoot.add( new SimpleFragment( new ClientExtensionOutputCommand(), "" ));
-      
-      setTrueFragment( clientRoot );
-    }
-    
-    public void setGenerateProxy( boolean genProxy )
-    {
-      genProxy_ = genProxy;
-    }
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry)
-     */
-    public void registerDataMappings(DataMappingRegistry dataRegistry)
-    {
-      // Map the output of the service scenario to the client scenario.
-      dataRegistry.addMapping( ServerExtensionOutputCommand.class, "WebServicesParser", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping( ServerExtensionOutputCommand.class, "WsdlURI", ClientExtensionDefaultingCommand.class );
-	  dataRegistry.addMapping( ServerExtensionOutputCommand.class, "ServiceServerFactoryId", ClientExtensionDefaultingCommand.class );
-	  dataRegistry.addMapping( ServerExtensionOutputCommand.class, "ServiceServerInstanceId", ClientExtensionDefaultingCommand.class );
-	  
-      
-      // Setup the PreClientDevelopCommand.
-      dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "TestService", PreClientDevelopCommand.class);
-      
-      dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "ResourceContext", PreClientDevelopCommand.class);
-      dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "InstallClient", PreClientDevelopCommand.class );
-      dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "InstallClient", PreClientDevelopCommand.class, "StartService", null);      
-      dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", PreClientDevelopCommand.class );
-      dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientRuntimeId", PreClientDevelopCommand.class );      
-      dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientJ2EEVersion", PreClientDevelopCommand.class);
-      dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientProject", PreClientDevelopCommand.class, "Module", null );
-      dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientProjectType", PreClientDevelopCommand.class, "ModuleType", null);
-      dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientProjectEAR", PreClientDevelopCommand.class, "Ear", null );      
-      dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "WsdlURI", PreClientDevelopCommand.class);
-      dataRegistry.addMapping( PreClientDevelopCommand.class, "WebService", ClientExtensionOutputCommand.class, "WebServiceClient", null );      
-    }
-  }
-  
-  private class ServiceRootCommandFragment extends SequenceFragment
-  {
-    public ServiceRootCommandFragment()
-    {
-      add( new SimpleFragment( new ScenarioCleanupCommand(), "" ));
-      
-      add( new SimpleFragment( new ServerWizardWidgetDefaultingCommand(), ""));
-      add( new SimpleFragment( "ServerWizardWidget" ) );
-      add( new SimpleFragment( new ServerWizardWidgetOutputCommand(), "" ));
-      add( new ObjectSelectionFragment() );
-      add( new SimpleFragment( new CheckWSDLValidationCommand(), ""));
-      add( new SimpleFragment( new ServerRuntimeSelectionWidgetDefaultingCommand(), ""));
-      add( new SimpleFragment( "ServerRuntimeSelectionWidget" ) );
-      add( new SimpleFragment( new ServerExtensionDefaultingCommand(), ""));
-      //add(new SimpleFragment(new ServerDeployableConfigurationCommand(), "")); //Note: added here            
-      //add( new ServerExtensionFragment() );
-	  add( new ServiceRootFragment() );
-      add( new SimpleFragment( new ServerExtensionOutputCommand(), "" ));
-      add(new SimpleFragment(new CreateMonitorCommand(), ""));
-      add(new SimpleFragment(new ComputeEndpointCommand(), ""));
-      add( new ServiceTestFragment( "TestService") );
-      add( new SimpleFragment(new TestDefaultingFragment(),""));
-      add( new ClientFragment() );
-//      add( new SimpleFragment(new ManageServerStartUpCommand(),""));
-      add( new ClientTestFragment( "ClientTestWidget") );
-      add( new SimpleFragment( "Publish") );
-      add(publishToPrivateUDDICmdFrag);
-      add(new LaunchFragment());
-      add(new FinishFragment());
-      
-      add( new SimpleFragment( new ScenarioCleanupCommand(), "" ));
-    }
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry)
-     */
-    public void registerDataMappings(DataMappingRegistry dataRegistry)
-    {
-      publishToPrivateUDDICmdFrag.registerDataMappings(dataMappingRegistry_);   
-      
-      dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ServerWizardWidgetDefaultingCommand.class );
-
-      //dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ServerRuntimeSelectionWidgetDefaultingCommand.class, "InitialSelection", null);
-      //dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialSelection", null);
-
-      dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ObjectSelection", ServerRuntimeSelectionWidgetDefaultingCommand.class, "InitialSelection", null);
-      dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ObjectSelection", ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialSelection", null);
-      dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "Project", ServerRuntimeSelectionWidgetDefaultingCommand.class, "InitialProject", null);
-      dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "Project", ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialProject", null);
-      dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ComponentName", ServerRuntimeSelectionWidgetDefaultingCommand.class, "InitialComponentName", null);
-      dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ComponentName", ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialComponentName", null);      
-      dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "WebServicesParser", ServerExtensionDefaultingCommand.class );
-      
-      // Map ServerWizardWidgetDefaultingCommand
-      dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ServerWizardWidgetOutputCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerWizardWidgetOutputCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "GenerateProxy", ServerWizardWidgetOutputCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "InstallService", 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, "InstallService", ServerExtensionDefaultingCommand.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, "InstallClient", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "TestService", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "ResourceContext", ClientExtensionDefaultingCommand.class);
-      
-      //to the test wizard
-      dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "GenerateProxy", ServiceTestFragment.class);
-      dataRegistry.addMapping(ServerExtensionOutputCommand.class, "WsdlURI", WSDLTestLaunchCommand.class);
-      dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", WSDLTestLaunchCommand.class);
-      
-	  
-      
-      // Map ServerRuntimeSelectionWidgetDefaultingCommand
-      dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceRuntimeId", ServerExtensionDefaultingCommand.class);      
-      dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientRuntimeId", ClientExtensionDefaultingCommand.class);      
-      //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceProject2EARProject", ServerExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceProjectName", ServerExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceEarProjectName", ServerExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceComponentType", ServerExtensionDefaultingCommand.class);      
-      //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceComponentName", ServerExtensionDefaultingCommand.class);
-      //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceEarComponentName", ServerExtensionDefaultingCommand.class);
-      //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "Runtime2ClientTypes", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", ClientExtensionDefaultingCommand.class);
-      //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarComponentName", ClientExtensionDefaultingCommand.class);
-      //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentName", ClientExtensionDefaultingCommand.class);      
-      dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentType", ClientExtensionDefaultingCommand.class);
-      //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceJ2EEVersion", ServerExtensionDefaultingCommand.class);
-      //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientJ2EEVersion", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "GenerateProxy", ClientFragment.class);
-      dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "GenerateProxy", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceNeedEAR", ServerExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientNeedEAR", ClientExtensionDefaultingCommand.class);
-      
-      
-      // Map ServerExtensionDefaultingCommand
-      dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerExtensionFragment.class);
-      dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "TestService", ServiceTestFragment.class);
-      dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "Publish", PublishToPrivateUDDICommandFragment.class);      
-      dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer",WSDLTestLaunchCommand.class);
-      dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", ClientTestDelegateCommand.class);
-	  
-	    // Setup the PreServiceDevelopCommand.
-      dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "InstallService", PreServiceDevelopCommand.class);
-      dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "StartService", PreServiceDevelopCommand.class);      
-      dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "TestService", PreServiceDevelopCommand.class);
-      
-      dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "PublishService", PreServiceDevelopCommand.class);      
-      dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "GenerateProxy", PreServiceDevelopCommand.class);      
-      dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "ResourceContext", PreServiceDevelopCommand.class);			
-			//
-	  //dataRegistry.addMapping( ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceComponentType", PreServiceDevelopCommand.class, "ModuleType", null);
-	    dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", PreServiceDevelopCommand.class );
-        dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServiceRuntimeId", PreServiceDevelopCommand.class );
-      dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServiceJ2EEVersion", PreServiceDevelopCommand.class);
-      dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServerProject", PreServiceDevelopCommand.class, "Module", null );
-      dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServerProjectEAR", PreServiceDevelopCommand.class, "Ear", null );
-      dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServiceComponentType", PreServiceDevelopCommand.class, "ModuleType", null );
-      //
-	    dataRegistry.addMapping( ObjectSelectionOutputCommand.class, "ObjectSelection", PreServiceDevelopCommand.class, "Selection", new SelectionTransformer() );
-			
-			dataRegistry.addMapping( PreServiceDevelopCommand.class, "WebService", ServerExtensionOutputCommand.class );
- 
-      // Map ClientExtensionDefaultingCommand
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", ClientExtensionFragment.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", FinishDefaultCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", ClientTestFragment.class );
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", ClientTestWidget.class );
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject",ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientNeedEAR", ClientTestDelegateCommand.class);
-	  dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientEarProjectName", ClientTestDelegateCommand.class);
-	  dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientEarComponentName", ClientTestDelegateCommand.class);
-	  dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject", WebServiceClientTestArrivalCommand.class);
-	  dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", WebServiceClientTestArrivalCommand.class);
-	  dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "LaunchedServiceTestName", WebServiceClientTestArrivalCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServer", ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "GenerateProxy", ClientTestFragment.class);
-
-      
-      dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(ServerExtensionOutputCommand.class, "WsdlURI", ClientTestDelegateCommand.class);
-           
-      dataRegistry.addMapping(ServerExtensionOutputCommand.class, "ServiceServerInstanceId", CreateMonitorCommand.class);
-
-      // Map ServerExtensionOutputCommand for ServerStart()
-      dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProjectEAR", ServerExtensionOutputCommand.class, "EarProjectName", null);
-
-      // MAP post server config call
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", ClientExtensionOutputCommand.class, "EarProjectName", null);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServerInstance", ClientExtensionOutputCommand.class, "ExistingServerId", null);
-      
-      // Map ClientExtensionOutputCommand
-      dataRegistry.addMapping(ClientExtensionOutputCommand.class, "GenerateProxy", ClientTestFragment.class);
-      dataRegistry.addMapping(ClientExtensionOutputCommand.class, "GenerateProxy", ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(ClientExtensionOutputCommand.class, "GenerateProxy", FinishTestFragment.class);
-      dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ProxyBean", WebServiceClientTestArrivalCommand.class);
-      dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ProxyBean", ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(ClientExtensionOutputCommand.class, "SetEndpointMethod", ClientTestDelegateCommand.class);
-	  dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ServerInstanceId", FinishDefaultCommand.class);
-	  
-      // Map ManageServerStartUpCommand
-      dataRegistry.addMapping(ServerExtensionOutputCommand.class, "IsWebProjectStartupRequested", ManageServerStartUpCommand.class);
-      
-      dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "StartService", ManageServerStartUpCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "TestService", ManageServerStartUpCommand.class);
-      dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", ManageServerStartUpCommand.class, "ServiceProject", new StringToIProjectTransformer());
-      dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerServer", ManageServerStartUpCommand.class,"ServiceServerTypeId", null);
-      
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject", ManageServerStartUpCommand.class, "SampleProject", new StringToIProjectTransformer());
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServerInstance", ManageServerStartUpCommand.class,"SampleExistingServer", new ServerInstToIServerTransformer());      
-      
-      // Map WebServiceClientTestArrivalCommand
-      dataRegistry.addMapping(TestDefaultingFragment.class, "TestFacility",ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Folder",ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "JspFolder",ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "RunClientTest",ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Methods",ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProject",ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProjectEAR",ClientTestDelegateCommand.class);    
-    
-    
-      //Map Finish Command 
-      
-      
-    }
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidget.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidget.java
deleted file mode 100644
index 0ad7f224c..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidget.java
+++ /dev/null
@@ -1,438 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060204 124408   rsinha@ca.ibm.com - Rupam Kuehner          
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.widgets.runtime;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.consumption.common.FacetUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.common.ValidationUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime.ClientRuntimeSelectionWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime.ProjectSelectionWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime.RuntimeServerSelectionWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.ScrolledComposite;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.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 createPluginId_ = "org.eclipse.jst.ws.creation.ui";
-  
-  /* CONTEXT_ID PWRS0002 for the Wizard Scenario Service configuration of the Runtime Selection Page */
-  private String INFOPOP_PWRS_GROUP_SERVICE =  "PWRS0002";
-  
-  private RuntimeServerSelectionWidget runtimeWidget_;
-  private ProjectSelectionWidget       projectWidget_;
-  private ClientRuntimeSelectionWidget clientWidget_;
-  private TextModifyListener           textListener_;
-
-  private boolean isClientWidgetVisible_ = true;
-  
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener )
-  {
-    UIUtils      uiUtils  = new UIUtils( createPluginId_ ); 
-    
-    ScrolledComposite scroller = new ScrolledComposite( parent, SWT.H_SCROLL | SWT.V_SCROLL );
-    scroller.setExpandHorizontal(true);
-    scroller.setExpandVertical(true);
-    
-    Composite root = uiUtils.createComposite( scroller, 1 );
-    scroller.setContent( root );
-    
-    Composite textComposite = uiUtils.createComposite( root, 1, 0, 0 );
-    createMessageText( textComposite, NLS.bind(ConsumptionUIMessages.MSG_GENERAL_PROJECT_AND_EAR, new String[] {ConsumptionUIMessages.MSG_SERVICE_SUB}));
-    createMessageText( textComposite, ConsumptionUIMessages.MSG_EAR_PROJECT_WILL_BE_CREATED );
-    
-    Composite serverComp = uiUtils.createComposite( root, 1, 5, 0 );
-    
-    Group serverGroup = uiUtils.createGroup( serverComp, ConsumptionUIMessages.LABEL_SELECTION_VIEW_TITLE,
-                                             null, INFOPOP_PWRS_GROUP_SERVICE,
-											 2, 5, 5);
-    
-    runtimeWidget_ = new RuntimeServerSelectionWidget( false );
-    runtimeWidget_.addControls( serverGroup, statusListener );
-    textListener_ = new TextModifyListener();
-    runtimeWidget_.addModifyListener( textListener_ );
-             
-    projectWidget_ = new ProjectSelectionWidget();
-    projectWidget_.addControls( serverGroup, statusListener );
-    
-    clientWidget_ = new ClientRuntimeSelectionWidget();
-    clientWidget_.addControls( root, statusListener );
-    
-    Point size = root.computeSize(SWT.DEFAULT, SWT.DEFAULT);
-    scroller.setMinSize( size ); 
-    root.setSize( size );
-     
-    scroller.setLayoutData( new GridData( GridData.FILL_BOTH ) );
-    
-    return this;
-  }
-  
-  //If generate proxy is not selected, don't show the client portion of the page.
-  public void setGenerateProxy( Boolean value )
-  {
-    clientWidget_.setVisible( value.booleanValue() ); 
-    isClientWidgetVisible_ = value.booleanValue();
-  }
-  
-  public TypeRuntimeServer getServiceTypeRuntimeServer()
-  {
-    return runtimeWidget_.getTypeRuntimeServer();  
-  }
-   
-  public void setServiceTypeRuntimeServer( TypeRuntimeServer ids )
-  {
-    runtimeWidget_.removeModifyListener( textListener_ );
-    runtimeWidget_.setTypeRuntimeServer( ids );  
-    projectWidget_.setTypeRuntimeServer(ids);
-    projectWidget_.refreshProjectItems();
-    runtimeWidget_.addModifyListener( textListener_ );
-  }
-  
-  public TypeRuntimeServer getClientTypeRuntimeServer()
-  {
-    return clientWidget_.getClientTypeRuntimeServer();  
-  }
-   
-  public void setClientTypeRuntimeServer( TypeRuntimeServer ids )
-  {
-    clientWidget_.setClientTypeRuntimeServer( ids );  
-  }
-  
-  public void setServiceRuntimeId(String id)
-  {
-	//TODO This method and any mappings to it
-	// should be deleted if no longer required.
-  }
-  
-  public String getServiceRuntimeId()
-  {
-    //calculate the most appropriate clientRuntimeId based on current settings.
-    String projectName = projectWidget_.getProjectName();
-    String templateId = projectWidget_.getComponentType();
-    
-    //Find the service runtime that fits this profile best.
-    return WebServiceRuntimeExtensionUtils2.getServiceRuntimeId(runtimeWidget_.getTypeRuntimeServer(), projectName, templateId);    
-  }  
-  
-  public void setClientRuntimeId(String id)
-  {
-    //TODO This method and any mappings to it
-	// should be deleted if no longer required.
-  }
-  
-  public String getClientRuntimeId()
-  {
-    //calculate the most appropriate clientRuntimeId based on current settings.
-    return clientWidget_.getClientRuntimeId();
-  } 
-  
-  public boolean getServiceNeedEAR()
-  {
-    return projectWidget_.getNeedEAR();
-  }
-  
-  public void setServiceNeedEAR(boolean b)
-  {
-    projectWidget_.setNeedEAR(b);
-  }
-  
-  public boolean getClientNeedEAR()
-  {
-    return clientWidget_.getClientNeedEAR();
-  }
-  
-  public void setClientNeedEAR(boolean b)
-  {
-    clientWidget_.setClientNeedEAR(b);
-  }  
-  
-  public String getServiceComponentType()
-  {
-    return projectWidget_.getComponentType();
-  }
-  
-  public void setServiceComponentType( String type )
-  {
-	projectWidget_.setComponentType( type );  
-  }
-  
-  public String getClientComponentType()
-  {
-    return clientWidget_.getClientComponentType();
-  }  
-  
-  public void setClientComponentType( String type )
-  {
-	clientWidget_.setClientComponentType( type );  
-  }
-  
-  public String getServiceProjectName()
-  {
-    return projectWidget_.getProjectName();  
-  }
-  
-  public void setServiceProjectName(String name)
-  {
-    projectWidget_.setProjectName(name);  
-  }
-  
-  public String getServiceEarProjectName()
-  {
-	return projectWidget_.getEarProjectName();  
-  }
-  
-  public void setServiceEarProjectName(String name)
-  {
-    projectWidget_.setEarProjectName(name);  
-  }  
-  
-  public String getClientProjectName()
-  {
-    return clientWidget_.getClientProjectName();  
-  }
-  
-  public void setClientProjectName(String name)
-  {
-    clientWidget_.setClientProjectName(name);  
-  }  
-  
-  public String getClientEarProjectName()
-  {
-	return clientWidget_.getClientEarProjectName();  
-  }
-  
-  public void setClientEarProjectName(String name)
-  {
-    clientWidget_.setClientEarProjectName(name);  
-  }    
-  
-  public void setInstallService(boolean b)
-  {
-    runtimeWidget_.setInstall(b);
-  }  
-  
-  public void setInstallClient(boolean b)
-  {
-    clientWidget_.setInstallClient(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_.refreshProjectItems();
-  	}
-  }
- 
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#getStatus()
-   */
-  public IStatus getStatus() 
-  {
-    IStatus serviceStatus = runtimeWidget_.getStatus();
-    IStatus projectStatus = projectWidget_.getStatus();
-    IStatus clientStatus  = clientWidget_.getStatus();    
-    IStatus finalStatus   = Status.OK_STATUS;
-    
-    
-    // call child widgets' getStatus()
-    if( serviceStatus.getSeverity() == Status.ERROR )
-    {
-      finalStatus = serviceStatus;
-    }
-    else if( clientStatus.getSeverity() == Status.ERROR )
-    {
-      if (isClientWidgetVisible_)
-        finalStatus = clientStatus;
-    }
-    else if ( projectStatus.getSeverity()== Status.ERROR) {
-      finalStatus = projectStatus;
-    }    
-    
-    String projectName = projectWidget_.getProjectName();
-    if (projectName != null && projectName.length()>0)
-    {
-      //If the project exists, ensure that it is suitable for the selected runtime
-      //and server.
-      ValidationUtils valUtils = new ValidationUtils();
-      IProject project = ProjectUtilities.getProject(projectName);
-      String typeId = getServiceTypeRuntimeServer().getTypeId();
-      String runtimeId = getServiceTypeRuntimeServer().getRuntimeId();
-      String serverFactoryId = getServiceTypeRuntimeServer().getServerId();
-      
-      if (project.exists())
-      {
-        //Check if the runtime supports it.
-        if (!WebServiceRuntimeExtensionUtils2.doesServiceTypeAndRuntimeSupportProject(typeId, runtimeId, projectName))
-        {
-          String runtimeLabel = WebServiceRuntimeExtensionUtils2.getRuntimeLabelById(runtimeId);
-          finalStatus = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_SERVICE_RUNTIME_DOES_NOT_SUPPORT_PROJECT, new String[]{runtimeLabel, projectName}));
-        }
-        
-        //Check if the server supports it.
-
-        if (serverFactoryId!=null && serverFactoryId.length()>0)
-        {
-          if (!valUtils.doesServerSupportProject(serverFactoryId, projectName))
-          {
-            String serverLabel = WebServiceRuntimeExtensionUtils2.getServerLabelById(serverFactoryId);
-            finalStatus = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_SERVICE_SERVER_DOES_NOT_SUPPORT_PROJECT, new String[]{serverLabel, projectName}));
-          }
-        }          
-      }
-      else
-      {
-        //Look at the project type to ensure that it is suitable for the selected runtime
-        //and server.
-        
-        String templateId = getServiceComponentType();
-
-        if (templateId != null && templateId.length()>0)
-        {
-          //Check if the runtime supports it.            
-          if (!WebServiceRuntimeExtensionUtils2.doesServiceTypeAndRuntimeSupportTemplate(typeId, runtimeId, templateId))
-          {
-            String runtimeLabel = WebServiceRuntimeExtensionUtils2.getRuntimeLabelById(runtimeId);
-            String templateLabel = FacetUtils.getTemplateLabelById(templateId);
-            finalStatus = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_SERVICE_RUNTIME_DOES_NOT_SUPPORT_TEMPLATE, new String[]{runtimeLabel, templateLabel}));
-          }
-          
-          //Check if the server supports it.
-          if (serverFactoryId!=null && serverFactoryId.length()>0)
-          {
-            if (!valUtils.doesServerSupportTemplate(serverFactoryId, templateId))
-            {
-              String serverLabel = WebServiceRuntimeExtensionUtils2.getServerLabelById(serverFactoryId);
-              String templateLabel = FacetUtils.getTemplateLabelById(templateId);
-              finalStatus = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_SERVICE_SERVER_DOES_NOT_SUPPORT_TEMPLATE, new String[]{serverLabel, templateLabel}));
-            }
-          }
-        }
-        
-        
-        
-      }
-    }    
-
-    if (isClientWidgetVisible_) 
-    {
-	    String clientEARName   = clientWidget_.getClientEarProjectName();
-	    String clientProjName  = clientWidget_.getClientProjectName();
-        String serviceProjName = projectWidget_.getProjectName();
-	    String serviceEarName  = projectWidget_.getEarProjectName();
-  		//String clientComponentName = clientWidget_.getClientComponentName();
-		
-	    // check same EAR-ness -----
-	    String warning_msg = getEARProjectWarningMessage(serviceEarName, clientEARName);
-	    
-		//if (serviceComponentName.equalsIgnoreCase(clientComponentName)){
-			  //String err_msg = NLS.bind(ConsumptionUIMessages.MSG_SAME_CLIENT_AND_SERVICE_COMPONENTS, new String[]{ "WEB" } );
-			  //finalStatus = StatusUtils.errorStatus( err_msg );				
-		//}
-		
-	    if( clientProjName != null && serviceProjName != null && 
-	        clientProjName.equalsIgnoreCase( serviceProjName ))
-	    {
-		  String error_msg =ConsumptionUIMessages.MSG_SAME_CLIENT_AND_SERVICE_PROJECTS;
-		  finalStatus = StatusUtils.errorStatus( error_msg );
-	    }
-	    
-		if (warning_msg != null)
-	    {
-	      if (finalStatus.getSeverity()!=Status.ERROR)
-	      	return StatusUtils.warningStatus( warning_msg );          
-	    }         
-      
-    }
-
-    //If finalStatus is still OK, check if there are any warnings.
-    if (finalStatus.getSeverity()!=Status.ERROR)
-    {
-      if( serviceStatus.getSeverity() == Status.WARNING )
-      {
-        finalStatus = serviceStatus;
-      }
-      else if (clientStatus.getSeverity() == Status.WARNING)
-      {
-        finalStatus = serviceStatus;
-      }        
-    }
-
-    return finalStatus;
-  }
-  
-  private void createMessageText( Composite parent, String value )
-  {
-    Text     messageText = new Text( parent, SWT.WRAP | SWT.MULTI | SWT.READ_ONLY );    
-	GridData gridData    = new GridData( GridData.FILL_BOTH );
-	
-	gridData.horizontalIndent = 10;    
-	messageText.setLayoutData( gridData );
-	messageText.setText( value );
-  }
-  
-  private String getEARProjectWarningMessage(String serviceEARName, String clientEARName ) {
-
-    // check if service and client share the same EAR
-    if (serviceEARName!=null && clientEARName!=null) {
-    
-      if (clientEARName.equalsIgnoreCase(serviceEARName) && clientEARName.length()>0) {
-        return NLS.bind(ConsumptionUIMessages.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 43a9705cf..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,607 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060131 121071   rsinha@ca.ibm.com - Rupam Kuehner     
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.widgets.runtime;
-
-import java.util.ArrayList;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.common.FacetMatcher;
-import org.eclipse.jst.ws.internal.consumption.common.FacetUtils;
-import org.eclipse.jst.ws.internal.consumption.common.RequiredFacetVersion;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-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.preferences.ProjectTopologyContext;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime.ClientRuntimeSelectionWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.FacetMatchCache;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.ServiceRuntimeDescriptor;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.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 ServerRuntimeSelectionWidgetDefaultingCommand extends ClientRuntimeSelectionWidgetDefaultingCommand
-{
-  private String DEFAULT_CLIENT_EAR_PROJECT_EXT = "EAR";	
-  private boolean           generateProxy_;
-  
-  private TypeRuntimeServer serviceIds_;
-  private boolean serviceIdsFixed_ = false;
-  private String serviceRuntimeId_;
-  private String serviceProjectName_;
-  private String serviceEarProjectName_;
-  private String serviceComponentType_;
-  private IProject initialProject_;
-  private boolean serviceNeedEAR_ = true;
-  private FacetMatcher serviceFacetMatcher_;
-
-  public ServerRuntimeSelectionWidgetDefaultingCommand()
-  {
-    super();
-  }
-  
-  
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {    
-    IEnvironment env = getEnvironment();
-    
-    try
-    {
-     IStatus clientSideStatus = super.execute(monitor, null);
-     if (clientSideStatus.getSeverity()==Status.ERROR)
-     {
-       return clientSideStatus;
-     }
-     
-     if (serviceIdsFixed_)
-     {
-       //Set the serviceRuntime based on the runtime, server, and initial selection. 
-        DefaultRuntimeTriplet drt = getDefaultServiceRuntimeForFixedRuntimeAndServer(initialProject_);
-        serviceFacetMatcher_ = drt.getFacetMatcher();
-        serviceProjectName_ = drt.getProjectName();
-        serviceRuntimeId_ = drt.getRuntimeId(); 
-     }
-     else
-     {
-       // Set the runtime based on the initial selection
-       DefaultRuntimeTriplet drt = getDefaultRuntime(initialProject_, serviceIds_.getTypeId(), false);
-       serviceFacetMatcher_ = drt.getFacetMatcher();
-       serviceProjectName_ = drt.getProjectName();
-       serviceRuntimeId_ = drt.getRuntimeId();       
-
-       if (serviceRuntimeId_ == null)
-       {
-         // return and error.
-       }
-       serviceIds_.setRuntimeId(WebServiceRuntimeExtensionUtils2.getServiceRuntimeDescriptorById(serviceRuntimeId_).getRuntime()
-         .getId());
-     }
-     
-     // Set the project
-     if (serviceProjectName_ == null)
-     {
-       // Project name did not get set when the runtime was set, so set it now
-       serviceProjectName_ = getDefaultServiceProjectName();
-     }
-
-     IProject serviceProject = ProjectUtilities.getProject(serviceProjectName_);
-     if (!serviceProject.exists())
-     {
-       // Set the project template
-       serviceComponentType_ = getDefaultServiceProjectTemplate();
-     }
-     else
-     {
-       //Set it to an empty String
-       serviceComponentType_ = "";
-     }
-
-     updateClientProject(serviceProjectName_, serviceIds_.getTypeId());
-
-     if (!serviceIdsFixed_)
-     {
-       // Set the server
-       IStatus serverStatus = setServiceDefaultServer();
-       if (serverStatus.getSeverity() == Status.ERROR)
-       {
-         env.getStatusHandler().reportError(serverStatus);
-         return serverStatus;
-       }
-     }
-     
-     setDefaultServiceEarProject();
-          
-     return Status.OK_STATUS;
-     
-    } catch (Exception e)
-    {
-      // Catch all Exceptions in order to give some feedback to the user
-      IStatus errorStatus = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_ERROR_TASK_EXCEPTED,
-          new String[] { e.getMessage() }), e);
-      env.getStatusHandler().reportError(errorStatus);
-      return errorStatus;
-    }
-  }
-
-  private void setDefaultServiceEarProject()
-  {
-    //Don't need an ear if this is a Java project, or if the selected template is jst.utility
-    IProject serviceProject = ProjectUtilities.getProject(serviceProjectName_);
-    if (serviceProject.exists())
-    {
-      serviceNeedEAR_ = !(FacetUtils.isJavaProject(serviceProject));
-    }
-    else
-    {
-      serviceNeedEAR_ = !(FacetUtils.isUtilityTemplate(serviceComponentType_));  
-    }    
-    
-    //If serviceNeedEAR_ is still true, it means that we're not dealing with a Java project
-    //or Java project type. Check the server.
-    
-    
-    if (serviceNeedEAR_)
-    {
-      
-      // Determine if an ear selection is needed based on the server type.      
-      String serverId = serviceIds_.getServerId();
-      if (serverId != null)
-      {
-        // Use the server type
-        String serverTargetId = ServerUtils.getRuntimeTargetIdFromFactoryId(serverId);
-        if (serverTargetId != null && serverTargetId.length() > 0)
-        {
-          if (!ServerUtils.isTargetValidForEAR(serverTargetId, "13"))
-          {
-            // Default the EAR selection to be empty
-            serviceNeedEAR_ = false;
-          }
-        }
-      }
-    }
-    
-    if (serviceNeedEAR_)
-    {
-      serviceEarProjectName_ = getDefaultServiceEarProjectName();
-
-      
-      //Client side
-      if (getClientNeedEAR())
-      {
-        String defaultClientEarProjectName = getDefaultClientEarProjectName();
-        IProject clientProject = ProjectUtilities.getProject(getClientProjectName());
-        if(clientProject!=null && clientProject.exists() 
-          && defaultClientEarProjectName.equalsIgnoreCase(serviceEarProjectName_))
-        {
-          setClientEarProjectName(defaultClientEarProjectName);
-        }
-        else
-        { 
-          ProjectTopologyContext ptc= WebServiceConsumptionUIPlugin.getInstance().getProjectTopologyContext();         
-          if (!ptc.isUseTwoEARs()) 
-          {
-            setClientEarProjectName(serviceEarProjectName_);
-          }
-          else 
-          {
-            IProject proxyEARProject = getUniqueClientEAR(defaultClientEarProjectName, serviceEarProjectName_, getClientProjectName());
-            setClientEarProjectName(proxyEARProject.getName());
-          }     
-        }
-      }
-    }
-    else
-    {
-      serviceEarProjectName_ = "";
-    }   
-  }
-
-  private String getDefaultServiceEarProjectName()
-  {
-    //Choose an appropriate default.
-    
-    IProject serviceProject = ProjectUtilities.getProject(serviceProjectName_);
-    if (serviceProject != null && serviceProject.exists())
-    {
-      IVirtualComponent[] earComps = J2EEUtils.getReferencingEARComponents(serviceProject);
-      if (earComps.length > 0)
-      {
-        //pick the first one.
-        return earComps[0].getName();
-
-      }
-    }
-    
-
-    IVirtualComponent[] allEarComps = J2EEUtils.getAllEARComponents();
-      
-    //TODO Choose an existing EAR that can be added to the server and who's J2EE level in consistent with 
-    //that of the selected project, if applicable. Picking the first one for now.
-    if (allEarComps.length > 0)
-    {
-      return allEarComps[0].getName();
-    }
-
-
-    
-    // there are no suitable existing EARs
-    return ResourceUtils.getDefaultServiceEARProjectName();
-    
-  }
-  
-  private IStatus setServiceDefaultServer()
-  {
-    //Choose an existing server the module is already associated with if possible
-    IProject serviceProject = ProjectUtilities.getProject(serviceProjectName_);
-    IServer[] configuredServers = ServerUtil.getServersByModule(ServerUtils.getModule(serviceProject), null);
-    if (configuredServers!=null && configuredServers.length>0)
-    {
-      serviceIds_.setServerId(configuredServers[0].getServerType().getId());
-      serviceIds_.setServerInstanceId(configuredServers[0].getId());
-      return Status.OK_STATUS;              
-    }
-    
-    //If the project exists, choose a suitable server or server type based on the existing project's runtime or facets
-    if (serviceProject.exists())
-    {
-      IServer server = getServerFromProject(serviceProjectName_, serviceFacetMatcher_);
-      if (server != null)
-      {
-        serviceIds_.setServerId(server.getServerType().getId());
-        serviceIds_.setServerInstanceId(server.getId());
-        return Status.OK_STATUS;
-      }
-      else
-      {
-        IServerType serverType = getServerTypeFromProject(serviceProjectName_, serviceFacetMatcher_);
-        if (serverType != null)
-        {
-          serviceIds_.setServerId(serverType.getId());
-          return Status.OK_STATUS;
-        }
-      }
-    }
-    
-    //Haven't picked a server/server type on the basis of the project. Pick a server/server type
-    //that is compatible with the serviceRuntimeId.
-    IServer server = getServerFromServiceRuntimeId();
-    if (server!=null)
-    {
-      serviceIds_.setServerId(server.getServerType().getId());
-      serviceIds_.setServerInstanceId(server.getId());
-      return Status.OK_STATUS;
-    }
-    
-    IServerType serverType = getServerTypeFromServiceRuntimeId();
-    if (serverType != null)
-    {
-      serviceIds_.setServerId(serverType.getId());
-      return Status.OK_STATUS;
-    }    
-
-    //No suitable server was found. Popup an error.
-    String runtimeLabel = WebServiceRuntimeExtensionUtils2.getRuntimeLabelById(serviceIds_.getRuntimeId());
-    String serverLabels = getServerLabels(serviceIds_.getRuntimeId());    
-    IStatus status = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_ERROR_NO_SERVER_RUNTIME, new String[]{runtimeLabel, serverLabels}) );
-    return status;
-  }  
-  
-  private IServer getServerFromServiceRuntimeId()
-  {
-    IServer[] servers = ServerCore.getServers();
-    if (servers != null && servers.length > 0) {
-      for (int i = 0; i < servers.length; i++)
-      {
-        String serverFactoryId = servers[i].getServerType().getId();
-        if (WebServiceRuntimeExtensionUtils2.doesServiceRuntimeSupportServer(serviceRuntimeId_, serverFactoryId))
-        {
-          return servers[i];
-        }
-      }
-    }
-    return null;    
-  }
-  
-  private IServerType getServerTypeFromServiceRuntimeId()
-  {
-    String[] serverTypes = WebServiceRuntimeExtensionUtils2.getServerFactoryIdsByServiceRuntime(serviceRuntimeId_);
-    if (serverTypes!=null && serverTypes.length>0)
-    {
-      //Return the preferred one if it is in the list
-      PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
-      String preferredServerFactoryId = context.getServerFactoryId();
-      for (int i=0; i<serverTypes.length; i++)
-      {
-        if (serverTypes[i].equals(preferredServerFactoryId))
-        {
-          return ServerCore.findServerType(serverTypes[i]);
-        }
-      }
-      
-      return ServerCore.findServerType(serverTypes[0]);
-    }    
-    
-    return null;
-  }  
-  
-  /*
-  private IServer getFirstSupportedServer(IServer[] servers, String serviceRuntimeId, IProject serviceProject)
-  {
-    if (servers != null && servers.length > 0) {
-      for (int i = 0; i < servers.length; i++)
-      {
-        String serverFactoryId = servers[i].getServerType().getId();
-        if (WebServiceRuntimeExtensionUtils2.doesServiceRuntimeSupportServer(serviceRuntimeId, serverFactoryId))
-        {
-          //TODO check if the server type supports the project before returning.
-          return servers[i];
-        }
-      }
-    }
-    return null;
-  }
-  */
-  
-  private String getServerLabels(String serviceRuntimeId)
-  {
-        String[] validServerFactoryIds = WebServiceRuntimeExtensionUtils2.getServerFactoryIdsByServiceRuntime(serviceRuntimeId);
-        //String[] validServerLabels = new String[validServerFactoryIds.length];
-        StringBuffer validServerLabels = new StringBuffer(); 
-        for (int i=0; i<validServerFactoryIds.length; i++)
-        {
-            if (i>0)
-            {
-                validServerLabels.append(", ");
-            }
-            validServerLabels.append(WebServiceRuntimeExtensionUtils.getServerLabelById(validServerFactoryIds[i]));
-            
-        }
-        return validServerLabels.toString();
-  }
-
-  private String getDefaultServiceProjectTemplate()
-  {
-    String[] templates = WebServiceRuntimeExtensionUtils2.getServiceProjectTemplates(serviceIds_.getTypeId(), serviceIds_.getRuntimeId());    
-    
-    //Pick the Web one if it's there, otherwise pick the first one.    
-    for (int i=0; i<templates.length; i++)
-    {
-      String templateId = templates[i];
-      if (templateId.indexOf("web") != -1)
-      {
-        boolean matches = WebServiceRuntimeExtensionUtils2.doesServiceRuntimeSupportTemplate(serviceRuntimeId_, templateId);
-        if (matches)
-        {
-          return templates[i];
-        }        
-      }                                    
-    }
-    
-    //Didn't find a "web" type. Return the first one that is a match. Calculate the facet matcher for the template
-    //so that we know what to create and what to add during module creation.
-    for (int j = 0; j < templates.length; j++)
-    {
-      String templateId = templates[j];
-      boolean matches = WebServiceRuntimeExtensionUtils2.doesServiceRuntimeSupportTemplate(serviceRuntimeId_, templateId);
-      if (matches)
-      {
-        return templates[j];
-      }
-    }
-    
-    //Still nothing, return the first one if available.
-    if (templates.length > 0)
-      return templates[0];
-    
-    return "";    
-    
-  }  
-  
-  private String getDefaultServiceProjectName()
-  {
-    IProject[] projects = FacetUtils.getAllProjects();
-    ServiceRuntimeDescriptor desc = WebServiceRuntimeExtensionUtils2.getServiceRuntimeDescriptorById(serviceRuntimeId_);
-    RequiredFacetVersion[] rfvs = desc.getRequiredFacetVersions();
-    
-    //Check each project for compatibility with the serviceRuntime
-    for (int i=0; i<projects.length; i++)
-    {
-      Set facetVersions = FacetUtils.getFacetsForProject(projects[i].getName());
-      org.eclipse.wst.common.project.facet.core.runtime.IRuntime fRuntime = null;
-      String fRuntimeName = null;
-      fRuntime = FacetUtils.getFacetRuntimeForProject(projects[i].getName());
-      if (fRuntime != null)
-      {
-        fRuntimeName = fRuntime.getName();        
-      }              
-      
-      if (facetVersions != null)
-      {
-        FacetMatcher fm = FacetMatchCache.getInstance().getMatchForProject(false, serviceRuntimeId_, projects[i].getName());
-        boolean facetRuntimeMatches = true;
-        if (fRuntimeName != null)
-        {
-          facetRuntimeMatches = FacetUtils.isFacetRuntimeSupported(rfvs, fRuntimeName);  
-        }
-        
-        if (fm.isMatch() && facetRuntimeMatches)
-        {
-          serviceFacetMatcher_ = fm;
-          return projects[i].getName();
-        }                    
-      }
-    }
-    
-    //No project was suitable, return a new project name
-    return ResourceUtils.getDefaultWebProjectName();
-    
-  }  
-  
-  private DefaultRuntimeTriplet getDefaultServiceRuntimeForFixedRuntimeAndServer(IProject project)
-  {
-    String[] serviceRuntimes = WebServiceRuntimeExtensionUtils2.getServiceRuntimesByServiceType(serviceIds_.getTypeId());
-    ArrayList validServiceRuntimes = new ArrayList();
-    for (int i=0; i<serviceRuntimes.length; i++ )
-    {
-      ServiceRuntimeDescriptor desc = WebServiceRuntimeExtensionUtils2.getServiceRuntimeDescriptorById(serviceRuntimes[i]);
-      if (desc.getRuntime().getId().equals(serviceIds_.getRuntimeId()))
-      {
-        //Check if this service runtime supports the server
-        if (WebServiceRuntimeExtensionUtils2.doesServiceRuntimeSupportServer(desc.getId(), serviceIds_.getServerId()))
-        {
-          validServiceRuntimes.add(desc.getId());
-          if (project != null && project.exists())
-          {
-            Set facetVersions = FacetUtils.getFacetsForProject(project.getName());
-            if (facetVersions != null)
-            {
-              FacetMatcher fm = FacetMatchCache.getInstance().getMatchForProject(false, serviceRuntimes[i], project.getName());
-              if (fm.isMatch())
-              {
-                DefaultRuntimeTriplet drt = new DefaultRuntimeTriplet();
-                drt.setFacetMatcher(fm);
-                drt.setProjectName(project.getName());
-                drt.setRuntimeId(desc.getId());
-                return drt;
-              }                      
-            }
-          }
-          
-        }
-      }
-      
-    }
-    
-    if (validServiceRuntimes.size() > 0)
-    {
-      //We couldn't match to the initially selected project so return the first valid runtime.
-      DefaultRuntimeTriplet drt = new DefaultRuntimeTriplet();
-      drt.setFacetMatcher(null);
-      drt.setProjectName(null);
-      drt.setRuntimeId(((String[])validServiceRuntimes.toArray(new String[0]))[0]);
-      return drt;      
-    }
-    else
-    {
-      //There are no service runtimes that match the fixed runtime and server. Fall back to original algorithm.
-      serviceIdsFixed_ = false;
-      return getDefaultRuntime(project, serviceIds_.getTypeId(), false);
-    }
-  }
-  
-  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);
-    
-  }
-  
-  public void setInitialSelection(IStructuredSelection selection)
-  {
-  }
-  
-  public void setInitialProject(IProject initialProject)
-  {
-    initialProject_ = initialProject;
-  }
-  
-  public void setInitialComponentName(String name)
-  {
-    //TODO This method and any mappings to it
-	// should be removed if no longer needed.
-  }
-  
-  public void setServiceTypeRuntimeServer( TypeRuntimeServer ids )
-  {
-    serviceIds_ = ids;
-  }
-  
-  public void setServiceIdsFixed(boolean b)
-  {
-    serviceIdsFixed_ = b;  
-  }
-  
-  public TypeRuntimeServer getServiceTypeRuntimeServer()
-  {
-    return serviceIds_; 
-  }
-
-  public String getServiceRuntimeId()
-  {
-    return serviceRuntimeId_;
-  }
-  /**
-   * @return Returns the generateProxy_.
-   */
-  public boolean getGenerateProxy()
-  {
-    return generateProxy_;
-  }
-  /**
-   * @param generateProxy_ The generateProxy_ to set.
-   */
-  public void setGenerateProxy(boolean generateProxy_)
-  {
-    this.generateProxy_ = generateProxy_;
-  }
-  
-  public String getServiceProjectName()
-  {
-    return serviceProjectName_;  
-  }
-  
-  public String getServiceEarProjectName()
-  {
-    return serviceEarProjectName_;
-  }
-  
-  public String getServiceComponentType()
-  {
-    return serviceComponentType_;
-  }
-  
-  public boolean getServiceNeedEAR()
-  {
-    return serviceNeedEAR_;
-  }
-  
-}
\ 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 a00645bc3..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/LaunchFragment.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- */
-package org.eclipse.jst.ws.internal.creation.ui.widgets.test;
-
-import org.eclipse.wst.command.internal.env.core.common.Condition;
-import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.ws.internal.explorer.WSExplorerLauncherCommand;
-
-
-public class LaunchFragment extends BooleanFragment
-{
-  private boolean publishToPublicUDDI_;  
-  private boolean publishToPrivateUDDI_;
-  
-  public LaunchFragment()
-  {
-    Condition condition = new Condition()
-    {
-      public boolean evaluate()
-      {
-        return (publishToPublicUDDI_ || publishToPrivateUDDI_);
-      }
-    };
-    setCondition( condition );
-    setTrueFragment( new SimpleFragment( new WSExplorerLauncherCommand(), "" ) );
-  }
-  
-  public void setPublishToPublicUDDI(boolean publishToPublicUDDI)
-  {
-    publishToPublicUDDI_ = publishToPublicUDDI;
-  }
-  
-  public void setPublishToPrivateUDDI(boolean publishToPrivateUDDI)
-  {
-  	publishToPrivateUDDI_ = publishToPrivateUDDI;
-  }
-   
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/ServiceTestFragment.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/ServiceTestFragment.java
deleted file mode 100644
index 196ed3649..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/ServiceTestFragment.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- */
-package org.eclipse.jst.ws.internal.creation.ui.widgets.test;
-
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WSDLTestLaunchCommand;
-import org.eclipse.wst.command.internal.env.core.common.Condition;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-
-
-public class ServiceTestFragment extends BooleanFragment
-{
-  private boolean testService;
-  private boolean generateProxy;
-  
-  
-  public ServiceTestFragment( String id )
-  {
-  	SequenceFragment testRoot = new SequenceFragment();
-  	Condition condition = new Condition()
-                          {
-                            public boolean evaluate()
-                            {
-                              return testService;
-                            }
-                          };
-    setCondition( condition );
-    
-    testRoot.add( new SimpleFragment( new WebServiceTestDefaultingCommand(), "" ) );
-    testRoot.add( new SimpleFragment( id ) );
-    setTrueFragment( testRoot );
-      
-  }
- 
-  
-  public void registerDataMappings(DataMappingRegistry dataRegistry)
-  {
-  	
-  	dataRegistry.addMapping(WebServiceTestDefaultingCommand.class, "TestID",WSDLTestLaunchCommand.class);
-  	
-  	//from the wizard 
-  	dataRegistry.addMapping(ServiceTestWidget.class, "TestID",WSDLTestLaunchCommand.class);
-  	dataRegistry.addMapping(WebServiceTestDefaultingCommand.class, "ExternalBrowser",WSDLTestLaunchCommand.class);
-  }
-  
-  public void setGenerateProxy(boolean generateProxy)
-  {
-  	this.generateProxy = generateProxy;
-  }
-  
-  public boolean getGenerateProxy()
-  {
-  	return generateProxy;
-  }
-  
-  /**
-   * @return Returns the testService.
-   */
-  public void setTestService( boolean testService )
-  {
-    this.testService = testService;
-  }
-
-  
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/ServiceTestWidget.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/ServiceTestWidget.java
deleted file mode 100644
index 2096c8d90..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/ServiceTestWidget.java
+++ /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
- *******************************************************************************/
-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.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WSDLTestLaunchCommand;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.wst.command.internal.env.core.selection.SelectionList;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.common.environment.IEnvironment;
-
-
-public class ServiceTestWidget extends SimpleWidgetDataContributor
-{
-  private String 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 Button launchButton_;
-  /*CONTEXT_ID PSTP0002 for the launch button of the Service Test Page*/
-  private final String INFOPOP_PSTP_LAUNCH_BUTTON = "PSTP0002";
-
-  
-  private SelectionList facilities_;
-  
-  private String serviceServerInstanceId = null;
-  
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener )
-  {
-    UIUtils      uiUtils  = new UIUtils(createPluginId_ );
-        
-    Composite testComposite = uiUtils.createComposite( parent, 3, 0, 0 );
-    
-    testTypeCombo_ = uiUtils.createCombo( testComposite, ConsumptionUIMessages.LABEL_TEST_TYPES,
-    									ConsumptionUIMessages.TOOLTIP_PSTP_COMBOBOX_TEST,
-                                          INFOPOP_PSTP_COMBOBOX_TEST,
-                                          SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-    
-    launchButton_ = uiUtils.createPushButton( testComposite, ConsumptionUIMessages.BUTTON_LAUNCH_SERVICE_TEST,
-    									ConsumptionUIMessages.TOOLTIP_PSTP_LAUNCH_BUTTON,
-                                          INFOPOP_PSTP_LAUNCH_BUTTON );
-    launchButton_.addSelectionListener( new SelectionAdapter()
-                                        {
-                                          public void widgetSelected( SelectionEvent event )
-                                          {
-                                            handleLaunchButton();
-                                          }
-                                        });
-    
-     
-    return this;
-  }
-  
-  private TypeRuntimeServer serviceids;
-  private String serverProject;
-  private String module;
-  private String wsdlURI;
-  private String launchedServiceTestName = "";
-  private IEnvironment env;
-  private List endpoints;
-  
-  private void handleLaunchButton()
-  {
-	// Split up the project and module
-	int p = serverProject.indexOf("/");
-	if (p != -1){
-		module = serverProject.substring(p+1);
-		serverProject = serverProject.substring(0,p);
-	}
-  	
-  	String testID = testTypeCombo_.getText();
-  	launchedServiceTestName = testID;
-  	WSDLTestLaunchCommand wtlc = new WSDLTestLaunchCommand();
-  	wtlc.setTestID(testID);
-  	wtlc.setServiceTypeRuntimeServer(serviceids);
-	  wtlc.setServiceServerInstanceId(serviceServerInstanceId);
-  	wtlc.setServerProject(serverProject);
-	  wtlc.setServerModule(module);
-  	wtlc.setWsdlURI(wsdlURI);
-  	wtlc.setExternalBrowser(true);
-  	wtlc.setEndpoint(endpoints);
-  	wtlc.setEnvironment( env );
-  	wtlc.execute( null, null );
-  }
-  
-  public void setServiceTestFacilities( SelectionList facilities )
-  {
-    facilities_ = facilities;
-    testTypeCombo_.setItems( facilities.getList() );
-    testTypeCombo_.select( facilities.getIndex() );
-  }
-  
-  public SelectionList getServiceTestFacilities()
-  {
-    facilities_.setIndex( testTypeCombo_.getSelectionIndex() );
-    return facilities_;
-  }
-
-  public String getTestID()
-  {
-  	return testTypeCombo_.getText();
-  }
-  
-  public void setWsdlURI(String wsdlURI)
-  {
-  	this.wsdlURI = wsdlURI;
-  }
-    
-  public void setServerProject(String serverProject)
-  {
-    this.serverProject = serverProject;
-  }
-
-  public void setServiceTypeRuntimeServer(TypeRuntimeServer serviceids)
-  {
-    this.serviceids = serviceids;
-  }
-  
-  public String getLaunchedServiceTestName()
-  {
-    return launchedServiceTestName;
-  }
-
-  public void setEnvironment(IEnvironment env)
-  {
-  	this.env = env;
-  }
-
-  public void setEndpoint(String endpoint)
-  {
-    if (endpoint != null && endpoint.length() > 0)
-    {
-      Vector v = new Vector();
-      v.add(endpoint);
-      setEndpoints(v);
-    }
-  }
-  
-  public void setEndpoints(List endpoints)
-  {
-    this.endpoints = endpoints;
-  }
-  
-  public void setServiceServerInstanceId(String ssInstanceId){
-	  this.serviceServerInstanceId = ssInstanceId;
-  }
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/WebServiceTestDefaultingCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/WebServiceTestDefaultingCommand.java
deleted file mode 100644
index 20971001b..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/WebServiceTestDefaultingCommand.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 15, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.ws.internal.creation.ui.widgets.test;
-
-import java.util.Enumeration;
-import java.util.Vector;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.context.ScenarioContext;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestExtension;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestRegistry;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.internal.env.core.selection.SelectionList;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-/**
- * @author gilberta
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-public class WebServiceTestDefaultingCommand extends AbstractDataModelOperation 
-{
-  
-  private SelectionList serviceTestFacilities;	
-  private String[] testID;
-  
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {    
-  	ScenarioContext scenarioContext = WebServicePlugin.getInstance().getScenarioContext().copy();
-  	testID = scenarioContext.getNonJavaTestService();
-  	String[] testTypes = scenarioContext.getWebServiceTestTypes();
-  	  	
-  	IStatus status = Status.OK_STATUS;
-  	WebServiceTestRegistry wsttRegistry = WebServiceTestRegistry.getInstance();
-  	
-    
-  	Vector wsdlNames = new Vector();
-  	for(int i =0 ;i<testTypes.length;i++){
-  	  WebServiceTestExtension wscte = (WebServiceTestExtension)wsttRegistry.getWebServiceExtensionsByName(testTypes[i]);  	
-  	  if(wscte.testWSDL()){
-  	    wsdlNames.addElement(testTypes[i]);
-  	  }
-  	}
-    
-  	String javaNamesArray[] = new String[wsdlNames.size()];
-  	Enumeration e = wsdlNames.elements();
-  	int i = 0;
-  	while(e.hasMoreElements()){
-      javaNamesArray[i] = (String)e.nextElement();
-  	  i++;
-  	}
-  	
-  	
-  	serviceTestFacilities = new SelectionList(javaNamesArray,0);  	
-  	
- 	return status;
-  }
-
-  public SelectionList getServiceTestFacilities()
-  {
-  	return serviceTestFacilities;
-  }
-
-  public String[] getTestID()
-  {
-  	return testID;
-  }
-  
-  public 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 cb0105380..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/.cvsignore b/bundles/org.eclipse.jst.ws.uddiregistry/.cvsignore
deleted file mode 100644
index 5306ed26a..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-build.xml
-temp.folder
-uddiregistry.jar
-@dot
-src.zip
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/.project b/bundles/org.eclipse.jst.ws.uddiregistry/.project
deleted file mode 100644
index cd999f6fd..000000000
--- 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/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.uddiregistry/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f2b029a29..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,57 +0,0 @@
-#Mon Jan 30 10:36:58 EST 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.jst.ws.uddiregistry/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 9269b4dcf..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Jan 30 10:40:49 EST 2006
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.uddiregistry/META-INF/MANIFEST.MF
deleted file mode 100644
index 355c4305d..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,21 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.uddiregistry; singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.jst.ws.internal.uddiregistry.plugin.WebServiceUDDIRegistryPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.uddiregistry.plugin,
- org.eclipse.jst.ws.internal.uddiregistry.widgets,
- org.eclipse.jst.ws.internal.uddiregistry.widgets.binding,
- org.eclipse.jst.ws.internal.uddiregistry.wizard,
- org.eclipse.jst.ws.internal.uddiregistry
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.jst.ws.ui,
- org.eclipse.wst.command.env.core,
- org.eclipse.wst.command.env,
- org.eclipse.wst.command.env.ui,
- org.eclipse.wst.common.frameworks
-Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/about.html b/bundles/org.eclipse.jst.ws.uddiregistry/about.html
deleted file mode 100644
index 6f6b96c4c..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/build.properties b/bundles/org.eclipse.jst.ws.uddiregistry/build.properties
deleted file mode 100644
index e1dec33b5..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-bin.includes = .,\
-               icons/,\
-               plugin.properties,\
-               plugin.xml,\
-               META-INF/,\
-               about.html
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/icons/registry.gif b/bundles/org.eclipse.jst.ws.uddiregistry/icons/registry.gif
deleted file mode 100644
index 5b43cae7b..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/icons/registry.gif
+++ /dev/null
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 31611ec30..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/icons/uddiprivateconfig_wiz.gif
+++ /dev/null
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 d8cfbff82..000000000
--- 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 f7834fe69..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/plugin.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
-   <!-- The following extension point is internal and likely to be removed in a future release. -->
-   <extension-point id="privateUDDIRegistryType" name="%XP_PRIVATE_UDDI_REGISTRY_TYPES"/>
-
-   <extension
-         point="org.eclipse.jst.ws.consumption.ui.privateUDDIRegistryType">
-      <privateUDDIRegistryType
-            name="%PRIVATE_UDDI_REGISTRY_TYPE_IMPL"
-            class="org.eclipse.jst.ws.internal.uddiregistry.wizard.PrivateUDDIRegistryTypeImpl"
-            id="org.eclipse.jst.ws.internal.uddiregistry.wizard.PrivateUDDIRegistryTypeImpl">
-      </privateUDDIRegistryType>
-   </extension>
-   <extension
-         point="org.eclipse.ui.newWizards">
-      <wizard
-            name="%PLUGIN_NEW_WIZARD_NAME_WS_UNIT_TEST_UDDI"
-            icon="icons/registry.gif"
-            category="org.eclipse.jst.ws.ui.new"
-            class="org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard"
-            id="org.eclipse.jst.ws.internal.uddiregistry.widgets.binding.PrivateUDDIWidgetBinding">
-      </wizard>
-   </extension>
-   <extension
-         point="org.eclipse.wst.command.env.dynamicWizard">
-      <dynamicWizard
-            name="%PLUGIN_NEW_WIZARD_NAME_WS_UNIT_TEST_UDDI"
-            class="org.eclipse.jst.ws.internal.uddiregistry.widgets.binding.PrivateUDDIWidgetBinding"
-            iconbanner="icons/uddiprivateconfig_wiz.gif"
-            id="org.eclipse.jst.ws.internal.uddiregistry.widgets.binding.PrivateUDDIWidgetBinding">
-      </dynamicWizard>
-   </extension>
-   <!--
-   <extension
-         point="org.eclipse.ui.newWizards">
-      <wizard
-            name="%PLUGIN_NEW_WIZARD_NAME_WS_UNIT_TEST_UDDI"
-            icon="icons/registry.gif"
-            category="org.eclipse.jst.ws.ui.new"
-            class="org.eclipse.jst.ws.internal.uddiregistry.wizard.PrivateUDDIWizard"
-            id="org.eclipse.jst.ws.internal.uddiregistry.wizard.PrivateUDDIWizard">
-         <description>
-            %PLUGIN_NEW_WIZARD_DESC_WS_UNIT_TEST_UDDI
-         </description>
-         <selection
-               class="org.eclipse.core.resources.IResource">
-         </selection>
-      </wizard>
-   </extension>
-   -->
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/UDDIRegistry.properties b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/UDDIRegistry.properties
deleted file mode 100644
index 8b15a6d55..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/UDDIRegistry.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.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/UDDIRegistryMessages.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/UDDIRegistryMessages.java
deleted file mode 100644
index ea29e8828..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/UDDIRegistryMessages.java
+++ /dev/null
@@ -1,39 +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.uddiregistry;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class UDDIRegistryMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.jst.ws.internal.uddiregistry.UDDIRegistry";//$NON-NLS-1$
-
-	private UDDIRegistryMessages() {
-		// Do not instantiate
-	}
-
-	public static String PAGE_TITLE_PRIVATE_UDDI_CONFIG;
-	public static String PAGE_DESC_PRIVATE_UDDI_CONFIG;
-	public static String TOOLTIP_PUPR_PRIVATE_UDDI_PAGE;
-	public static String TOOLTIP_PUPR_PRIVATE_UDDI_TYPE;
-	public static String TOOLTIP_PUPR_DEPLOY_PRIVATE_UDDI;
-	public static String TOOLTIP_PUPR_UPDATE_PRIVATE_UDDI;
-	public static String TOOLTIP_PUPR_REMOVE_PRIVATE_UDDI;
-	public static String LABEL_PRIVATE_UDDI_REGISTRY_TYPES;
-	public static String BUTTON_DEPLOY_UDDI_REGISTRY;
-	public static String BUTTON_UPDATE_UDDI_REGISTRY;
-	public static String BUTTON_REMOVE_UDDI_REGISTRY;
-	public static String MSG_ERROR_NO_UDDI_REGISTRY_AVAILABLE;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, UDDIRegistryMessages.class);
-	}
-}
\ No newline at end of file
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 81df413f7..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/plugin/WebServiceUDDIRegistryPlugin.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.uddiregistry.plugin;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jface.resource.ImageDescriptor;
-
-/**
-* This is the plugin class for the Web Services UDDI Registry plugin.
-* <p>
-* The Web Services UDDI Registry plugin's is to add the
-* option to create a unit test UDDI registry 
-*/
-public class WebServiceUDDIRegistryPlugin extends Plugin
-{
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-  /**
-  * The identifier of the descriptor of this plugin in plugin.xml.
-  */
-  public static final String ID = "org.eclipse.jst.ws.uddiregistry";
-
-  /**
-  * The reference to the singleton instance of this plugin.
-  */
-  private static WebServiceUDDIRegistryPlugin instance_;
-  
-  /**
-  * Constructs a runtime plugin object for this plugin.
-  */
-  public WebServiceUDDIRegistryPlugin ()
-  {
-    super();
-    instance_ = this;
-  }
-
-  /**
-  * Returns the singleton instance of this plugin. Equivalent to calling
-  * (WebServiceUDDIRegistryPlugin)Platform.getPlugin("org.eclipse.jst.ws.uddiregistry");
-  * @return The WebServiceUDDIRegistryPlugin singleton.
-  */
-  public static WebServiceUDDIRegistryPlugin getInstance ()
-  {
-    return instance_;
-  }
-
-  /**
-  * Returns an image descriptor for the named resource
-  * as relative to the plugin install location.
-  * @return An image descriptor, possibly null.
-  */
-  public static ImageDescriptor getImageDescriptor ( String name )
-  {
-    try
-    {
-      URL installURL = instance_.getBundle().getEntry("/");
-      URL imageURL = new URL(installURL,name);
-      return ImageDescriptor.createFromURL(imageURL);
-    }
-    catch (MalformedURLException e)
-    {
-      return null;
-    }
-  }
-
-  /**
-  * Returns the message string identified by the given key from
-  * plugin.properties.
-  * @return The String message.
-  */
-  public static String getMessage ( String key )
-  {
-    return Platform.getResourceString(instance_.getBundle(),key);
-  }
-
-  /**
-  * Returns the message string identified by the given key from
-  * plugin.properties. Substitution sequences in the message string
-  * are replaced by the given array of substitution objects (which
-  * are most frequently strings). See the JDK's
-  * {@link java.text.MessageFormat java.text.MessageFormat}
-  * class for further details on substitution.
-  * @return The String message.
-  */
-  public static String getMessage ( String key, Object[] args )
-  {
-    return MessageFormat.format(getMessage(key),args);
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionCommand.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionCommand.java
deleted file mode 100644
index 7fb402cef..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionCommand.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.uddiregistry.widgets;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.uddiregistry.wizard.PrivateUDDIRegistryType;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-/*
-import org.eclipse.wst.command.internal.env.core.common.Environment;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.env.core.common.Status;
-import org.eclipse.jst.ws.internal.uddiregistry.plugin.WebServiceUDDIRegistryPlugin;
-*/
-
-public class PrivateUDDISelectionCommand extends AbstractDataModelOperation
-{
-  private byte operationType;
-  private PrivateUDDIRegistryType registryType;
-  
-  /*
-  public Status execute(Environment env)
-  {
-    MessageUtils msgUtils = new MessageUtils(WebServiceUDDIRegistryPlugin.ID + ".plugin", this);
-  	if (registryType != null)
-  	{
-  	  switch (operationType)
-  	  {
-  	  	case PrivateUDDIRegistryType.OP_DEPLOY:
-  	      return registryType.deploy(env);
-  	  	case PrivateUDDIRegistryType.OP_UPDATE:
-  	  	  return registryType.update(env);
-  	  	case PrivateUDDIRegistryType.OP_REMOVE:
-  	  	  return registryType.remove(env);
-  	  	default:
-  	  }
-  	}
-  	return new SimpleStatus("");
-  }
-  */
-
-  public PrivateUDDIRegistryType getRegistryType()
-  {
-    return getPrivateUDDIRegistryType();
-  }
-  
-  public byte getOperationType()
-  {
-    return operationType;
-  }
-  
-  public PrivateUDDIRegistryType getPrivateUDDIRegistryType()
-  {
-  	return registryType;
-  }
-
-  public void setRegistryType(PrivateUDDIRegistryType regType)
-  {
-  	setPrivateUDDIRegistryType(regType);
-  }
-  
-  public void setOperationType(byte type)
-  {
-    operationType = type;
-  }
-  
-  public void setPrivateUDDIRegistryType(PrivateUDDIRegistryType regType)
-  {
-  	registryType = regType;
-  }
-
-  public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
-  {
-    return Status.OK_STATUS;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionCommandFragment.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionCommandFragment.java
deleted file mode 100644
index b408b68f1..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionCommandFragment.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.uddiregistry.widgets;
-
-import org.eclipse.jst.ws.internal.uddiregistry.wizard.PrivateUDDIRegistryType;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.AbstractCommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-
-
-public class PrivateUDDISelectionCommandFragment extends AbstractCommandFragment
-{
-  private PrivateUDDIRegistryType registryType;
-  private DataMappingRegistry dataMappingRegistry;
-  private CanFinishRegistry canFinishRegistry;
-  private WidgetRegistry widgetRegistry;
-  
-  public PrivateUDDISelectionCommandFragment()
-  {
-  	super(null, "");
-  }
-
-  /** 
-    * Gets the first child fragment for this fragment.
-    *
-    * @return returns the first child fragment for this fragment.  Returns
-    * null when there is no first child.
-  **/
-  public CommandFragment getFirstSubFragment()
-  {
-  	if (registryType != null)
-  	{
-      registryType.registerCanFinish(canFinishRegistry);
-      registryType.registerDataMappings(dataMappingRegistry);
-      registryType.registerWidgetMappings(widgetRegistry);
-      return registryType.create().create();
-  	}
-    else
-      return null;
-  }
-
-  /**
-    * Gets the next child fragment for this fragment.
-    *
-    * @return returns the next child fragment for this fragment.  Returns null
-    * when there is no next child.
-  **/
-  public CommandFragment getNextSubFragment(CommandFragment fragment)
-  {
-  	return null;
-  }
-  
-  /*
-   * This method is called to retrieve the data mappings for this command fragment.
-   */
-  public void registerDataMappings(DataMappingRegistry registry)
-  {
-  	dataMappingRegistry = registry;
-  }
-
-  public void registerCanFinish(CanFinishRegistry canFinishRegistry)
-  {
-    this.canFinishRegistry = canFinishRegistry;
-  }
-
-  public void registerWidgetMappings(WidgetRegistry widgetRegistry)
-  {
-    this.widgetRegistry = widgetRegistry;
-  }
-
-  /**
-    * All wizard fragments need to be cloneable.
-  **/
-  public Object clone()
-  {
-  	PrivateUDDISelectionCommandFragment fragment = new PrivateUDDISelectionCommandFragment();
-  	fragment.registerDataMappings(dataMappingRegistry);
-  	fragment.registerCanFinish(canFinishRegistry);
-  	fragment.registerWidgetMappings(widgetRegistry);
-  	fragment.setPrivateUDDIRegistryType(registryType);
-  	return fragment;
-  }
-  
-  public void setPrivateUDDIRegistryType(PrivateUDDIRegistryType registryType)
-  {
-  	this.registryType = registryType;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionWidget.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionWidget.java
deleted file mode 100644
index d3ea22f56..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionWidget.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.uddiregistry.widgets;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.ws.internal.uddiregistry.UDDIRegistryMessages;
-import org.eclipse.jst.ws.internal.uddiregistry.plugin.WebServiceUDDIRegistryPlugin;
-import org.eclipse.jst.ws.internal.uddiregistry.wizard.PrivateUDDIRegistryType;
-import org.eclipse.jst.ws.internal.uddiregistry.wizard.PrivateUDDIRegistryTypeRegistry;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.help.IWorkbenchHelpSystem;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-
-/**
-* This UDDI configuration page prompts the user
-* for the information required to configure the
-* unit test UDDI registry.
-*/
-public class PrivateUDDISelectionWidget extends SimpleWidgetDataContributor
-{
-  private 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()
-  {
-  }
-
-  public WidgetDataEvents addControls(Composite parent, Listener statusListener)
-  {
-  	this.statusListener = statusListener;
-    parent.setToolTipText(UDDIRegistryMessages.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(UDDIRegistryMessages.BUTTON_DEPLOY_UDDI_REGISTRY);
-    deployRadio_.setSelection(true);
-    deployRadio_.addListener(SWT.Selection, listener);
-    deployRadio_.setToolTipText(UDDIRegistryMessages.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(UDDIRegistryMessages.LABEL_PRIVATE_UDDI_REGISTRY_TYPES);
-    typesLabel_.setToolTipText(UDDIRegistryMessages.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(UDDIRegistryMessages.TOOLTIP_PUPR_PRIVATE_UDDI_TYPE);
-    helpSystem.setHelp(typesCombo_, INFOPOP_PUPR_PRIVATE_UDDI_TYPE);
-
-    updateRadio_ = new Button(parent,SWT.RADIO);
-    updateRadio_.setText(UDDIRegistryMessages.BUTTON_UPDATE_UDDI_REGISTRY);
-    updateRadio_.setSelection(false);
-    updateRadio_.addListener(SWT.Selection,listener);
-    updateRadio_.setToolTipText(UDDIRegistryMessages.TOOLTIP_PUPR_UPDATE_PRIVATE_UDDI);
-    helpSystem.setHelp(updateRadio_, INFOPOP_PUPR_UPDATE_PRIVATE_UDDI);
-
-    removeRadio_ = new Button(parent, SWT.RADIO);
-    removeRadio_.setText(UDDIRegistryMessages.BUTTON_REMOVE_UDDI_REGISTRY);
-    removeRadio_.setSelection(false);
-    removeRadio_.addListener(SWT.Selection, listener);
-    removeRadio_.setToolTipText(UDDIRegistryMessages.TOOLTIP_PUPR_REMOVE_PRIVATE_UDDI);
-    helpSystem.setHelp(removeRadio_, INFOPOP_PUPR_REMOVE_PRIVATE_UDDI);                
-
-    loadTypes();
-    init();
-    return this;
-  }
-
-  private final void loadTypes()
-  {
-    types_ = PrivateUDDIRegistryTypeRegistry.getInstance().getTypes();
-  }
-
-  private final void init()
-  {
-    for (int i = 0; i < types_.length; i++)
-    {
-      if (types_[i] != null)
-      {
-        typesCombo_.add(types_[i].getName());
-        if (types_[i].isPrivateUDDIRegistryInstalled())
-          installedType_ = types_[i];
-      }
-    }
-    if (typesCombo_.getItemCount() > 0)
-      typesCombo_.setText(typesCombo_.getItem(0));
-    if (installedType_ != null)
-    {
-      updateRadio_.setEnabled(true);
-      removeRadio_.setEnabled(true);                
-    }
-    else
-    {
-      updateRadio_.setEnabled(false);
-      removeRadio_.setEnabled(false);
-    }
-  }
-
-  private void handleWidgetEvent(Event event)
-  {
-    if (event.widget == removeRadio_ || event.widget == updateRadio_)
-    {
-      boolean isUpdateOrRemoveSelected = ((Button)event.widget).getSelection();
-      typesLabel_.setEnabled(!isUpdateOrRemoveSelected);
-      typesCombo_.setEnabled(!isUpdateOrRemoveSelected);
-    }
-    else if (event.widget == deployRadio_)
-    {
-      boolean isDeploySelected = ((Button)event.widget).getSelection();
-      typesLabel_.setEnabled(isDeploySelected);
-      typesCombo_.setEnabled(isDeploySelected);
-    }
-    statusListener.handleEvent(event);
-  }
-  
-  public PrivateUDDIRegistryType getPrivateUDDIRegistryType()
-  {
-  	if (deployRadio_.getSelection())
-  	{
-  	  String selectedRegistryName = typesCombo_.getText();
-  	  for (int i = 0; i < types_.length; i++)
-        if (selectedRegistryName.equals(types_[i].getName()))
-  	  	  return types_[i];
-      return null;
-  	}
-  	else
-  	  return installedType_;
-  }
-  
-  public byte getOperationType()
-  {
-  	if (deployRadio_.getSelection())
-  	  return PrivateUDDIRegistryType.OP_DEPLOY;
-  	else if (updateRadio_.getSelection())
-      return PrivateUDDIRegistryType.OP_UPDATE;
-  	else if (removeRadio_.getSelection())
-      return PrivateUDDIRegistryType.OP_REMOVE;
-  	else
-  	  return PrivateUDDIRegistryType.OP_DEPLOY;
-  }
-
-  public IStatus getStatus()
-  {
-    PrivateUDDIRegistryType privateUDDIRegistryType = getPrivateUDDIRegistryType();
-    if (privateUDDIRegistryType != null)
-      return privateUDDIRegistryType.getOperationStatus(getOperationType());
-    else
-      return StatusUtils.errorStatus( UDDIRegistryMessages.MSG_ERROR_NO_UDDI_REGISTRY_AVAILABLE );
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionWidgetConditionCommand.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionWidgetConditionCommand.java
deleted file mode 100644
index 3141b637c..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionWidgetConditionCommand.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.uddiregistry.widgets;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.command.internal.env.core.common.Condition;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-public class PrivateUDDISelectionWidgetConditionCommand extends AbstractDataModelOperation implements Condition
-{
-  private boolean condition;
-
-  public PrivateUDDISelectionWidgetConditionCommand()
-  {
-    condition = true;
-  }
-  
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    condition = !condition;
-    return Status.OK_STATUS;
-  }
-  
-  public IStatus undo( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    condition = !condition;
-    return Status.OK_STATUS;
-  }
-  
-  public boolean evaluate()
-  {
-    return condition;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/binding/PrivateUDDIWidgetBinding.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/binding/PrivateUDDIWidgetBinding.java
deleted file mode 100644
index a9d5aca2c..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/binding/PrivateUDDIWidgetBinding.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.uddiregistry.widgets.binding;
-
-import org.eclipse.jst.ws.internal.uddiregistry.UDDIRegistryMessages;
-import org.eclipse.jst.ws.internal.uddiregistry.widgets.PrivateUDDISelectionCommand;
-import org.eclipse.jst.ws.internal.uddiregistry.widgets.PrivateUDDISelectionCommandFragment;
-import org.eclipse.jst.ws.internal.uddiregistry.widgets.PrivateUDDISelectionWidget;
-import org.eclipse.jst.ws.internal.uddiregistry.widgets.PrivateUDDISelectionWidgetConditionCommand;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-
-
-public class PrivateUDDIWidgetBinding implements CommandWidgetBinding
-{
-  private CanFinishRegistry   canFinishRegistry;
-  private WidgetRegistry      widgetRegistry;
-  private DataMappingRegistry dataMappingRegistry;
-  private PrivateUDDISelectionCommandFragment privateUDDISelFragment;
-  private PrivateUDDISelectionWidgetConditionCommand conditionCommand;
-  
-  public PrivateUDDIWidgetBinding()
-  {
-    privateUDDISelFragment = new PrivateUDDISelectionCommandFragment();
-    conditionCommand = new PrivateUDDISelectionWidgetConditionCommand();
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#create()
-   */
-  public CommandFragmentFactory create()
-  {
-    return new CommandFragmentFactory()
-    {
-      public CommandFragment create()
-      {
-        SequenceFragment root = new SequenceFragment();
-        root.add(new SimpleFragment(conditionCommand, ""));
-        root.add(new SimpleFragment("PrivateUDDISelectionWidget"));
-        root.add(new SimpleFragment(conditionCommand, ""));
-        root.add(new SimpleFragment(new PrivateUDDISelectionCommand(), ""));
-        root.add(privateUDDISelFragment);
-        return root;
-      }
-    };
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
-   */
-  public void registerCanFinish(CanFinishRegistry canFinishRegistry)
-  {
-    this.canFinishRegistry = canFinishRegistry;
-    privateUDDISelFragment.registerCanFinish(this.canFinishRegistry);
-    
-    canFinishRegistry.addCondition(conditionCommand);
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry)
-   */
-  public void registerDataMappings(DataMappingRegistry dataRegistry)
-  {
-    dataMappingRegistry = dataRegistry;
-    privateUDDISelFragment.registerDataMappings(dataMappingRegistry);
-    
-    // PrivateUDDISelectionCommand
-    dataMappingRegistry.addMapping(PrivateUDDISelectionWidget.class, "PrivateUDDIRegistryType", PrivateUDDISelectionCommand.class);
-    dataMappingRegistry.addMapping(PrivateUDDISelectionWidget.class, "OperationType", PrivateUDDISelectionCommand.class);
-    
-    // PrivateUDDISelectionCommandFragment
-    dataMappingRegistry.addMapping(PrivateUDDISelectionWidget.class, "PrivateUDDIRegistryType", PrivateUDDISelectionCommandFragment.class);
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
-   */
-  public void registerWidgetMappings(WidgetRegistry widgetRegistry)
-  {
-    this.widgetRegistry = widgetRegistry;
-    privateUDDISelFragment.registerWidgetMappings(this.widgetRegistry);
-
-    widgetRegistry.add("PrivateUDDISelectionWidget", 
-      UDDIRegistryMessages.PAGE_TITLE_PRIVATE_UDDI_CONFIG,
-      UDDIRegistryMessages.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 7e48cf0cc..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryType.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.uddiregistry.wizard;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-
-
-public interface PrivateUDDIRegistryType extends CommandWidgetBinding
-{
-  // operation types
-  public static byte OP_DEPLOY = 0x0;
-  public static byte OP_UPDATE = 0x1;
-  public static byte OP_REMOVE = 0x2;
-
-  // general information
-  public String getID();
-  public String getName();
-  public boolean isPrivateUDDIRegistryInstalled();
-  public IStatus getOperationStatus(byte operation);
-
-  // registry URLs
-  public String getInquiryAPI();
-  public String getPublishAPI();
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryTypeImpl.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryTypeImpl.java
deleted file mode 100644
index 79d092128..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryTypeImpl.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.uddiregistry.wizard;
-
-import java.util.Enumeration;
-import java.util.Vector;
-import org.eclipse.jst.ws.internal.uddiregistry.widgets.binding.PrivateUDDIWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-
-
-public class PrivateUDDIRegistryTypeImpl implements org.eclipse.jst.ws.internal.ui.uddi.PrivateUDDIRegistryType
-{
-    public PrivateUDDIRegistryTypeImpl() {
-    }
-
-    public boolean isPrivateUDDIRegistryInstalled() {
-        PrivateUDDIRegistryType[] types = PrivateUDDIRegistryTypeRegistry.getInstance().getTypes();
-        for (int i = 0; i < types.length; i++) {
-            if (types[i].isPrivateUDDIRegistryInstalled())
-                return true;
-        }
-        return false;
-    }
-
-    public String[] getPrivateUDDIRegistryInquiryAPI() {
-        Vector inquiryAPIVector = new Vector();
-        PrivateUDDIRegistryType[] types = PrivateUDDIRegistryTypeRegistry.getInstance().getTypes();
-        for (int i = 0; i < types.length; i++) {
-            if (types[i].isPrivateUDDIRegistryInstalled()) {
-                String inquiryAPI = types[i].getInquiryAPI();
-                if (inquiryAPI != null && inquiryAPI.startsWith("http"))
-                    inquiryAPIVector.add(inquiryAPI);
-            }
-        }
-
-        String[] inquiryAPIArray = new String[inquiryAPIVector.size()];
-        Enumeration e = inquiryAPIVector.elements();
-        int j = 0;
-        while(e.hasMoreElements()) {
-            inquiryAPIArray[j] = (String)e.nextElement();
-            j++;
-        }
-        return inquiryAPIArray;
-    }
-
-    public String[] getPrivateUDDIRegistryPublishAPI() {
-        Vector publishAPIVector = new Vector();
-        PrivateUDDIRegistryType[] types = PrivateUDDIRegistryTypeRegistry.getInstance().getTypes();
-        for (int i = 0; i < types.length; i++) {
-            if (types[i].isPrivateUDDIRegistryInstalled()) {
-                String publishAPI = types[i].getPublishAPI();
-                if (publishAPI != null && publishAPI.startsWith("http"))
-                    publishAPIVector.add(publishAPI);
-            }
-        }
-
-        String[] publishAPIArray = new String[publishAPIVector.size()];
-        Enumeration e = publishAPIVector.elements();
-        int j = 0;
-        while(e.hasMoreElements()) {
-            publishAPIArray[j] = (String)e.nextElement();
-            j++;
-        }
-        return publishAPIArray;
-    }
-    
-    public CommandWidgetBinding getBinding()
-    {
-      return new PrivateUDDIWidgetBinding();
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryTypeRegistry.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryTypeRegistry.java
deleted file mode 100644
index 5fd441ee4..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryTypeRegistry.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.uddiregistry.wizard;
-
-import java.util.StringTokenizer;
-import java.util.Vector;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-
-public class PrivateUDDIRegistryTypeRegistry {
-
-    private static PrivateUDDIRegistryTypeRegistry instance_;
-    private IConfigurationElement[] configElements_;
-
-    private PrivateUDDIRegistryTypeRegistry() {
-    }
-  
-    /**
-    * Returns a singleton instance of this class.
-    * @return A singleton WebServiceClientTypeRegistry object.
-    */
-    public static PrivateUDDIRegistryTypeRegistry getInstance() {
-        if (instance_ == null) {
-            instance_ = new PrivateUDDIRegistryTypeRegistry();
-            instance_.getConfigElements();
-        }
-        return instance_;
-    }
-  
-    public IConfigurationElement[] getConfigElements() {
-        IExtensionRegistry reg = Platform.getExtensionRegistry();
-        configElements_ = reg.getConfigurationElementsFor(
-                                     "org.eclipse.jst.ws.uddiregistry",
-                                     "privateUDDIRegistryType");
-        Vector v = new Vector();
-        for (int i = 0; i < configElements_.length; i++)
-        {
-          int weight = getWeight(configElements_[i]);
-          int index = -1;
-          for (int j = v.size()-1; j >= 0; j--)
-          {
-            if (weight > getWeight((IConfigurationElement)v.get(j)))
-              index = j;
-            else
-              break;
-          }
-          if (index != -1)
-            v.add(index, configElements_[i]);
-          else
-            v.add(configElements_[i]);
-        }
-        v.copyInto(configElements_);
-        return configElements_;
-    }
-
-    private int getWeight(IConfigurationElement e)
-    {
-      try
-      {
-        return Integer.parseInt(e.getAttribute("weight"));
-      }
-      catch (NumberFormatException nfe)
-      {
-        return -1;
-      }
-    }
-
-    private IConfigurationElement getConfigElementByID(String id) {
-        for (int i = 0; i <configElements_.length; i++) {
-            if (configElements_[i].getAttribute("id").equals(id))
-                return configElements_[i];
-        }
-        return null;
-    }
-
-    public PrivateUDDIRegistryType[] getTypes() {
-        Vector types = new Vector();
-        for (int i = 0; i < configElements_.length; i++) {
-            try {
-                Object typeObj = configElements_[i].createExecutableExtension("class");
-                if (typeObj instanceof PrivateUDDIRegistryType)
-                    types.add(typeObj);
-            }
-            catch (Exception e) {}
-        }
-
-        PrivateUDDIRegistryType[] typesArray = new PrivateUDDIRegistryType[types.size()];
-        for (int j = 0; j < types.size(); j++) {
-            typesArray[j] = (PrivateUDDIRegistryType)types.elementAt(j);
-        }
-        return typesArray;
-    }
-
-    public PrivateUDDIRegistryType getTypeByID(String id) {
-        try {
-            Object typeObj = getConfigElementByID(id).createExecutableExtension("class");
-            if (typeObj instanceof PrivateUDDIRegistryType)
-                return (PrivateUDDIRegistryType)typeObj; 
-        }
-        catch (Exception e) {}
-        return null;
-    }
-
-    public String[] getSupportedServerFactoryIDByID(String id) {
-        IConfigurationElement configElement = getConfigElementByID(id);
-        if (configElement == null)
-            return new String[0];
-        Vector idVector = new Vector();
-        StringTokenizer st = new StringTokenizer(configElement.getAttribute("serverFactoryID"), ",");
-        while (st.hasMoreTokens()) {
-            idVector.add(st.nextToken());
-        }
-        String[] ids = new String[idVector.size()];
-        for (int i = 0; i < idVector.size(); i++) {
-            ids[i] = (String)idVector.elementAt(i);
-        }
-        return ids;
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/.classpath b/bundles/org.eclipse.jst.ws.ui/.classpath
deleted file mode 100644
index cb0105380..000000000
--- a/bundles/org.eclipse.jst.ws.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.ui/.cvsignore b/bundles/org.eclipse.jst.ws.ui/.cvsignore
deleted file mode 100644
index 1d99ec986..000000000
--- a/bundles/org.eclipse.jst.ws.ui/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-build.xml
-temp.folder
-ws-ui.jar
-@dot
-src.zip
diff --git a/bundles/org.eclipse.jst.ws.ui/.project b/bundles/org.eclipse.jst.ws.ui/.project
deleted file mode 100644
index 17ef9ac85..000000000
--- 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/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index af2a5be27..000000000
--- a/bundles/org.eclipse.jst.ws.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,57 +0,0 @@
-#Mon Jan 30 10:37:07 EST 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/bundles/org.eclipse.jst.ws.ui/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.jst.ws.ui/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index df6fea3cc..000000000
--- a/bundles/org.eclipse.jst.ws.ui/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Jan 30 10:40:45 EST 2006
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.jst.ws.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 6ef074037..000000000
--- a/bundles/org.eclipse.jst.ws.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,32 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.ui; singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.jst.ws.internal.ui.plugin.WebServiceUIPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.ui.action,
- org.eclipse.jst.ws.internal.ui.common,
- org.eclipse.jst.ws.internal.ui.dialog,
- org.eclipse.jst.ws.internal.ui.plugin,
- org.eclipse.jst.ws.internal.ui.preferences,
- org.eclipse.jst.ws.internal.ui.uddi,
- org.eclipse.jst.ws.internal.ui
-Require-Bundle: org.eclipse.wst.command.env,
- org.eclipse.wst.command.env.ui,
- org.eclipse.wst.command.env.core,
- org.eclipse.jst.ws,
- org.eclipse.jdt.core,
- org.eclipse.jdt.ui,
- org.eclipse.ui.ide,
- org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.emf.ecore,
- org.eclipse.jem.util,
- org.eclipse.wst.server.core,
- org.eclipse.jst.j2ee,
- org.eclipse.wst.ws.explorer,
- org.eclipse.jst.j2ee.core
-Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.jst.ws.ui/about.html b/bundles/org.eclipse.jst.ws.ui/about.html
deleted file mode 100644
index 6f6b96c4c..000000000
--- a/bundles/org.eclipse.jst.ws.ui/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.ui/build.properties b/bundles/org.eclipse.jst.ws.ui/build.properties
deleted file mode 100644
index e1dec33b5..000000000
--- a/bundles/org.eclipse.jst.ws.ui/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-bin.includes = .,\
-               icons/,\
-               plugin.properties,\
-               plugin.xml,\
-               META-INF/,\
-               about.html
diff --git a/bundles/org.eclipse.jst.ws.ui/icons/jar_obj.gif b/bundles/org.eclipse.jst.ws.ui/icons/jar_obj.gif
deleted file mode 100644
index 152f4f2b3..000000000
--- a/bundles/org.eclipse.jst.ws.ui/icons/jar_obj.gif
+++ /dev/null
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 bf5d6cf21..000000000
--- a/bundles/org.eclipse.jst.ws.ui/plugin.properties
+++ /dev/null
@@ -1,48 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Web Services Graphical User Interface
-PLUGIN_PROVIDER=Eclipse.org
-
-PLUGIN_NEW_CATEGORY_NAME_WS=Web Services
-
-#
-#	Web Services Preferance Pages
-#
-# Categories
-PREFERENCE_CATEGORY_RESOURCE_MANAGEMENT=Resource Management
-
-#
-#  WS-I Preference pages
-#
-# WS-I Compliance Page
-#
-PREFERENCE_CATEGORY_WSI=WS-I Compliance
-
-#
-# Popup action Category
-#
-LABEL_POPUP_CATEGORY_WEB_SERVICES=Web Services
-
-#
-# Messages for popup action (Test with Web Services Explorer)
-#
-POPUP_TEST_WSDL=Test with Web Services Explorer
-
-
-
-
-
-
-
diff --git a/bundles/org.eclipse.jst.ws.ui/plugin.xml b/bundles/org.eclipse.jst.ws.ui/plugin.xml
deleted file mode 100644
index 375662aaf..000000000
--- a/bundles/org.eclipse.jst.ws.ui/plugin.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
-     <extension
-         point="org.eclipse.ui.newWizards">
-      <category
-            name="%PLUGIN_NEW_CATEGORY_NAME_WS"
-            id="org.eclipse.jst.ws.ui.new">
-      </category>
-   </extension>
-
-   <extension
-         point="org.eclipse.ui.preferencePages">
-      
-      <page
-            name="%PREFERENCE_CATEGORY_RESOURCE_MANAGEMENT"
-            category="org.eclipse.wst.ws.internal.ui.preferences.name"
-            class="org.eclipse.jst.ws.internal.ui.preferences.ResourceManagmentPreferencePage"
-            id="org.eclipse.jst.ws.internal.ui.preferences.ResourceManagmentPreferencePage">
-      </page>
-
-   </extension>
-
-   <extension
-         point="org.eclipse.ui.propertyPages">
-
-      
-
-   </extension>
-
-   <extension
-         point="org.eclipse.ui.popupMenus">
-
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IResource"
-            adaptable="true"
-            id="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu">
-         <menu
-               label="%LABEL_POPUP_CATEGORY_WEB_SERVICES"
-               path="additions"
-               id="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu">
-            <separator
-                  name="popupActions">
-            </separator>
-         </menu>
-      </objectContribution>
-
-
-      <objectContribution
-            objectClass="org.eclipse.jst.j2ee.ejb.EnterpriseBean"
-            adaptable="true"
-            id="org.eclipse.jst.ws.atk.ui.webservice.category.ejb.popupMenu">
-         <menu
-               label="%LABEL_POPUP_CATEGORY_WEB_SERVICES"
-               path="additions"
-               id="org.eclipse.jst.ws.atk.ui.webservice.category.ejb.popupMenu">
-            <separator
-                  name="popupActions">
-            </separator>
-         </menu>
-      </objectContribution>
-      
-
-      <objectContribution
-            objectClass="org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef"
-            nameFilter="*"
-            id="org.eclipse.jst.ws.internal.consumption.ui.action.WSDLFileMenu">
-         <action
-               label="%POPUP_TEST_WSDL"
-               class="org.eclipse.wst.ws.internal.explorer.popup.PopupTestWSDL"
-               menubarPath="additions"
-               id="org.eclipse.wst.ws.internal.explorer.popup.PopupTestWSDL">
-         </action>
-      </objectContribution>
-   </extension>
-   
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/WSUIPlugin.properties b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/WSUIPlugin.properties
deleted file mode 100644
index 21d64a1fb..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/WSUIPlugin.properties
+++ /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
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Web Services Graphical User Interface
-PLUGIN_VENDOR=Eclipse.org
-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_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_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_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.
-
-#
-# 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:
-
-#
-# Resource Browser
-#
-DIALOG_TITLE_RESOURCE_BROWSER=Resource browser
-TOOLTIP_RESOURCE_TREE=Choose a resource.
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/WSUIPluginMessages.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/WSUIPluginMessages.java
deleted file mode 100644
index 7f57583f9..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/WSUIPluginMessages.java
+++ /dev/null
@@ -1,67 +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.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class WSUIPluginMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.jst.ws.internal.ui.WSUIPlugin";//$NON-NLS-1$
-
-	private WSUIPluginMessages() {
-		// Do not instantiate
-	}
-
-	public static String PLUGIN_NAME;
-	public static String PLUGIN_VENDOR;
-	public static String PLUGIN_DESC;
-	public static String PLUGIN_NEW_CATEGORY_NAME_WS;
-	public static String PREFERENCE_CATEGORY_RESOURCE_MANAGEMENT;
-	public static String PREFERENCE_CATEGORY_CODE_GENERATION;
-	public static String PREFERENCE_CATEGORY_SCENARIO_DEFAULTS;
-	public static String PREFERENCE_CATEGORY_PROJECT_TOPOLOGY;
-	public static String PREFERENCE_CATEGORY_DRIVER_JARS;
-	public static String BUTTON_LAUNCH_SAMPLE;
-	public static String LABEL_MOVE_UP;
-	public static String LABEL_MOVE_DOWN;
-	public static String TOOLTIP_PPSD_PAGE;
-	public static String TOOLTIP_PPSD_CHECKBOX_LAUNCH_SAMPLE;
-	public static String TOOLTIP_CLIENT_TYPE_TABLE_VIEWER;
-	public static String TOOLTIP_MOVE_UP;
-	public static String TOOLTIP_MOVE_DOWN;
-	public static String TOOLTIP_PPRM_PAGE;
-	public static String TOOLTIP_PPRM_CHECKBOX_OVERWRITE_FILES;
-	public static String TOOLTIP_PPRM_CHECKBOX_CREATE_FOLDERS;
-	public static String TOOLTIP_PPRM_CHECKBOX_CHECK_OUT;
-	public static String BUTTON_CREATE_FOLDERS;
-	public static String BUTTON_OVERWRITE_FILES;
-	public static String BUTTON_CHECKOUT_FILES;
-	public static String ISTATUS_WITHOUT_EXCEPTION;
-	public static String ISTATUS_WITH_EXCEPTION;
-	public static String MSG_INFO_SAVED_STATUS;
-	public static String DIALOG_TITLE_CLASS_BROWSE;
-	public static String DIALOG_TITLE_INTERFACE_BROWSE;
-	public static String LABEL_SAMPLE_TYPES;
-	public static String DIALOG_TITLE_RESOURCE_BROWSE;
-	public static String LABEL_RESOURCE_FILTER;
-	public static String TOOLTIP_DRES_COMBO_RESOURCE_TYPE;
-	public static String TOOLTIP_DRES_TREE_RESOURCE;
-	public static String TOOLTIP_PTPP_PAGE;
-	public static String TOOLTIP_ENABLE_TWO_EARS;
-	public static String LABEL_ENABLE_TWO_EARS;
-	public static String LABEL_CLIENT_TYPE_NAME;
-	public static String DIALOG_TITLE_RESOURCE_BROWSER;
-	public static String TOOLTIP_RESOURCE_TREE;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, WSUIPluginMessages.class);
-	}
-}
\ No newline at end of file
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 9597ab97b..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/LaunchImportWizardAction.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.ui.action;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.ui.IActionDelegate;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard;
-
-
-/**
- * This class launches the import wizard.
- */
-public class LaunchImportWizardAction implements IActionDelegate
-{
-    private IStructuredSelection selection_;
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-     */
-    public void run(IAction action) 
-    {
-      DynamicWizard wizard = new DynamicWizard();
-      
-      try
-      {
-        wizard.setInitialData( "wsimport" );
-        wizard.init( PlatformUI.getWorkbench(), selection_ );
-      }
-      catch( CoreException exc )
-      {
-        // Do nothing.
-        return;
-      }
-      
-  	  WizardDialog dialog= new WizardDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), wizard);
-	  dialog.setPageSize( 500, 400 );
-	  dialog.create();
-	  dialog.open();
-    }
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
-     */
-    public void selectionChanged(IAction action, ISelection selection) 
-    {
-      if( selection instanceof IStructuredSelection )
-      {
-        selection_ = (IStructuredSelection)selection;
-      }
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WebServiceDeploy.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WebServiceDeploy.java
deleted file mode 100644
index e8d48b71f..000000000
--- 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 a1db9cbbc..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WebServiceDeployAction.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ui.action;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-
-public class WebServiceDeployAction extends WindowActionDelegate {
-public void run(org.eclipse.jface.action.IAction action) {
-
-   IProject project = getSelectedResourceProject();
-
-   String [] typeIds = ServerUtils.getServerTypeIdsByModule(project);
-   Object theAction = null;
-
-   IExtensionRegistry reg = Platform.getExtensionRegistry();
-   IConfigurationElement[] elements = reg.getConfigurationElementsFor("org.eclipse.jst.ws.ui", "webservicedeploy");
-   try {
-   	
-   	if (typeIds == null || typeIds.length <= 0)
-   	{
-   	 	// that means the module is not attached to a server then pick the first extension found
-   	    theAction = elements[0].createExecutableExtension("class");
-   	}
-   	else if ( typeIds.length == 1)
-   	{
-   		// that means the module is attached to one server then finds it id and a matchin extension or give a message
-   		for (int i = 0; i < elements.length; i++)
-      	{
-		   	String id = elements[i].getAttribute("factoryId");
-    	   	if ( typeIds[0].equals(id))
-		   	{
-		   		theAction = elements[i].createExecutableExtension("class");
-		   		break;
-		   	}
-   		}
-   		if (theAction == null )
-   			{
-   				// give a message
-   			}
-   	}
-   	else
-   	{
-		// The module is attached to more than one server find the first server-extension couple
-		// TBD: add a dialog to choose the server for deployment
-		for (int i = 0; i < elements.length; i++)
-      	{
-		   	String id = elements[i].getAttribute("factoryId");
-		   	for ( int k=0; k< typeIds.length; k++)
-		   	{
-    	   		if ( typeIds[k].equals(id))
-		   		{
-		   			theAction = elements[i].createExecutableExtension("class");
-		   			break;
-		   		}
-		   	}
-		   if (theAction != null) break;
-   		 }
-		if (theAction == null) 
-			{
-				// give a Message
-			}
-   	}
-
-    if (theAction instanceof WebServiceDeploy)
-          ((WebServiceDeploy)theAction).run(project);   
-  }
-
-  catch (Exception e) {}
-} 
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WindowActionDelegate.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WindowActionDelegate.java
deleted file mode 100644
index 837e28409..000000000
--- 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 6d25ca1ea..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/DialogResourceBrowser.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ui.common;
-
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.DecoratingLabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.ws.internal.ui.WSUIPluginMessages;
-import org.eclipse.jst.ws.internal.ui.plugin.WebServiceUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-/**
-* This class provides a dialog for browsing workspace resources.
-*/
-public class DialogResourceBrowser extends Dialog
-{
-  private final String INFOPOP_RESOURCE_TREE = WebServiceUIPlugin.ID + ".DRES0001";
-
-  private IResource root_;
-  private IFilter[] filters_;
-  private boolean multipleSelectionEnabled_;
-  private IResource[] selection_;
-  private Tree resourceTree_;
-  private TreeViewer fileViewer_;
-
-  public DialogResourceBrowser(Shell shell, IResource root, IFilter filter)
-  {
-    this(shell, root, new IFilter[]{filter});
-  }
-
-  /**
-  * Constructs a new <code>DialogResourceBrowser</code>
-  * under the given <code>parent Shell</code>.
-  * The dialog renders all resources including and
-  * under the given <code>root IResource</code>
-  * @param parent The parent {@link org.eclipse.swt.widgets.Shell}.
-  * or null to create a top-level shell.
-  * @param root The root {@link org.eclipse.core.resources.IResource},
-  * or null to begin with the workspace root.
-  * @param filters An array of java.lang.String
-  */
-  public DialogResourceBrowser(Shell shell, IResource root, IFilter[] filters)
-  {
-    super(shell);
-
-    IResource moduleRoot = root;
-    if (root instanceof IProject)
-    {
-      IProject p = (IProject)moduleRoot;
-     
-        moduleRoot = p;
-    
-    }
-
-    root_ = (moduleRoot == null) ? ResourcesPlugin.getWorkspace().getRoot() : moduleRoot;
-    filters_ = (filters == null) ? new IFilter[0] : filters;
-    multipleSelectionEnabled_ = false;
-    setShellStyle(SWT.DIALOG_TRIM | SWT.RESIZE | SWT.APPLICATION_MODAL);
-  }
-
-  /**
-  * Enables or disables multiple selection in the tree view.
-  * Multiple selection is disabled by default.
-  * @param multipleSelectionEnabled True to enabled or false to disable.
-  */
-  public void setMultipleSelectionEnabled(boolean multipleSelectionEnabled)
-  {
-    multipleSelectionEnabled_ = multipleSelectionEnabled;
-  }
-
-  /**
-  * Returns the selections made in the dialog if OK was pressed,
-  * or null if Cancel was pressed. Returns null if the dialog
-  * has never been opened.
-  * @return An array of selected resources, possibly empty, possibly null.
-  */
-  public IResource[] getSelection()
-  {
-    return selection_;
-  }
-
-  public IResource getFirstSelection()
-  {
-    if (selection_ != null && selection_.length > 0)
-      return selection_[0];
-    else
-      return null;
-  }
-
-   /**
-  * Called when the Cancel button is pressed.
-  * Insures that {@link #getResult} will return null.
-  */
-  protected void cancelPressed()
-  {
-    selection_ = null;
-    setReturnCode(Dialog.CANCEL);
-    super.cancelPressed();
-  }
-
-  /**
-  * Called when the OK button is pressed.
-  * Squirrels away the list of zero or more selected
-  * <code>IResource</code>s to be returned by {@link #getResult}.
-  */
-  protected void okPressed()
-  {
-    ISelection selection = fileViewer_.getSelection();
-    if (selection instanceof IStructuredSelection)
-    {
-      IStructuredSelection structuredSelection = (IStructuredSelection)selection;
-      selection_ = new IResource[structuredSelection.size()];
-      int i = 0;
-      Iterator it = structuredSelection.iterator();
-      while (it.hasNext())
-      {
-        Object object = it.next();
-        if (object instanceof IResource)
-          selection_[i++] = (IResource)object;
-      }
-    }
-    setReturnCode(Dialog.OK);
-    super.okPressed();
-  }
-
-  /**
-  * See {@link org.eclipse.jface.window.Window#configureShell}.
-  * @param shell The shell.
-  */
-  protected void configureShell(Shell shell)
-  {
-    super.configureShell(shell);
-    shell.setText(WSUIPluginMessages.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(WSUIPluginMessages.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;
-  }
-
-}
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 ed355c40d..000000000
--- 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 2e5db8b50..000000000
--- 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 1497e855f..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/UIUtils.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.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;
-
-
-public class UIUtils 
-{
-  String       infoPopid_;
-  
-  public UIUtils( String infoPopid )
-  {
-    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( labelName );
-    button.setToolTipText( 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( labelName );
-      label.setToolTipText( tooltip );
-    }
-    
-    Combo combo = new Combo( parent, style );
-    GridData griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
-     
-    combo.setLayoutData( griddata );
-    combo.setToolTipText( 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(  labelName  );
-      label.setToolTipText(  tooltip );
-    }
-    
-    Text text = new Text( parent, style );
-    GridData griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
-    
-    text.setLayoutData( griddata );
-    text.setToolTipText( 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(  groupName  );
-    newGroup.setLayoutData( griddata );
-    newGroup.setToolTipText(  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( 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( 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 1472a56e4..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/dialog/DialogUtils.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/*******************************************************************************
- * Copyright (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.WSUIPluginMessages;
-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
-{
-
-  /**
-  * 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(WSUIPluginMessages.DIALOG_TITLE_CLASS_BROWSE);
-      dialog.setMessage(WSUIPluginMessages.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(WSUIPluginMessages.DIALOG_TITLE_INTERFACE_BROWSE);
-    	dialog.setMessage(WSUIPluginMessages.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 1d88d39d6..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/dialog/ResourceSelectionDialog.java
+++ /dev/null
@@ -1,319 +0,0 @@
-/*******************************************************************************
- * Copyright (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.WSUIPluginMessages;
-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
-{
-
-  // 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 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";
-
-  //
-  // Essential goodies.
-  //
-  private IResource root_;
-  private IResource initialSelection_;
-  private Filter[] filters_;
-  private Filter currentFilter_;
-  private IResource[] selection_;
-  private boolean multipleSelectionEnabled_;
-
-  /**
-  * Constructs a new <code>ResourceSelectionDialog</code>
-  * under the given <code>parent Shell</code>.
-  * The dialog renders all resources including and
-  * under the given <code>root IResource</code>.
-  * @param parent The parent {@link org.eclipse.swt.widgets.Shell},
-  * or null to create a top-level shell.
-  * @param root The root {@link org.eclipse.core.resources.IResource},
-  * or null to begin with the workspace root.
-  * @param initialSelection The initially selected object or null if none.
-  */
-  public ResourceSelectionDialog ( Shell parent, IResource root, IResource initialSelection )
-  {
-    this(parent,root,initialSelection,new Filter[] {new AnyFilter()});
-  }
-
-  /**
-  * Constructs a new <code>ResourceSelectionDialog</code>
-  * under the given <code>parent Shell</code>.
-  * The dialog renders all resources including and
-  * under the given <code>root IResource</code> that
-  * are accepted by the given filter.
-  * See {@link org.eclipse.jst.ws.internal.common.Filter#accepts}.
-  * @param parent The parent {@link org.eclipse.swt.widgets.Shell},
-  * or null to create a top-level shell.
-  * @param root The root {@link org.eclipse.core.resources.IResource},
-  * or null to begin with the workspace root.
-  * @param initialSelection The initially selected object or null if none.
-  * @param filter The {@link org.eclipse.jst.ws.internal.common.Filter},
-  * or null to default to all resources under the <code>root</code>.
-  */
-  public ResourceSelectionDialog ( Shell parent, IResource root, IResource initialSelection, Filter filter )
-  {
-    this(parent,root,initialSelection,new Filter[] {filter});
-  }
-
-  /**
-  * Constructs a new <code>ResourceSelectionDialog</code>
-  * under the given <code>parent Shell</code>.
-  * The dialog renders all resources including and
-  * under the given <code>root IResource</code> that
-  * are accepted by the given filters.
-  * See {@link org.eclipse.jst.ws.internal.common.Filter#accepts}.
-  * @param parent The parent {@link org.eclipse.swt.widgets.Shell}.
-  * or null to create a top-level shell.
-  * @param root The root {@link org.eclipse.core.resources.IResource},
-  * or null to begin with the workspace root.
-  * @param initialSelection The initially selected object or null if none.
-  * @param filters An array of {@link org.eclipse.jst.ws.internal.common.Filter}
-  * objects.
-  * If the array is null or of length zero, then all resources are accepted
-  * (ie. equivalent to <code>ResourceSelectionDialog(parent,root)</code>.
-  * If the array is of length one, then the dialog will consist of a single
-  * control showing a list of all filtered resources.
-  * If the array is of length greater than one, then the dialog will
-  * consist of a combo box containing the names of the filters and with the
-  * first filter (ie. <code>filters[0]</code>) selected by default, followed
-  * by a control showing a list of all resources filtered by the selected filter. 
-  */
-  public ResourceSelectionDialog ( Shell parent, IResource root, IResource initialSelection, Filter[] filters )
-  {
-    super(parent);
-    root_ = root == null ? ResourceUtils.getWorkspaceRoot() : root;
-    initialSelection_ = initialSelection;
-    filters_ = (filters == null || filters.length == 0) ? new Filter[] {new AnyFilter()} : filters;
-    currentFilter_ = filters_[0];
-    multipleSelectionEnabled_ = false;
-    setShellStyle(SWT.DIALOG_TRIM | SWT.RESIZE | SWT.APPLICATION_MODAL);
-  }
-
-  /**
-  * Enables or disables multiple selection in the tree view.
-  * Multiple selection is disabled by default.
-  * @param multipleSelectionEnabled True to enabled or false to disable.
-  */
-  public void setMultipleSelectionEnabled ( boolean multipleSelectionEnabled )
-  {
-    multipleSelectionEnabled_ = multipleSelectionEnabled;
-  }
-
-  /**
-  * Returns the selections made in the dialog if OK was pressed,
-  * or null if Cancel was pressed. Returns null if the dialog
-  * has never been opened.
-  * @return An array of selected resources, possibly empty, possibly null.
-  */
-  public IResource[] getResult ()
-  {
-    return selection_;
-  }
-
-  /**
-  * Called when the Cancel button is pressed.
-  * Insures that {@link #getResult} will return null.
-  */
-  protected void cancelPressed ()
-  {
-    selection_ = null;
-    setReturnCode(Dialog.CANCEL);
-    super.cancelPressed();
-  }
-
-  /**
-  * Called when the OK button is pressed.
-  * Squirrels away the list of zero or more selected
-  * <code>IResource</code>s to be returned by {@link #getResult}.
-  */
-  protected void okPressed ()
-  {
-    ISelection selection = fileViewer_.getSelection();
-    if (selection instanceof IStructuredSelection)
-    {
-      IStructuredSelection structuredSelection = (IStructuredSelection)selection;
-      selection_ = new IResource[structuredSelection.size()];
-      int i=0;
-      Iterator iter = structuredSelection.iterator();
-      while (iter.hasNext())
-      {
-        Object object = iter.next();
-        if (object instanceof IResource)
-        {
-          selection_[i++] = (IResource)object;
-        }
-      }
-    }
-    setReturnCode(Dialog.OK);
-    super.okPressed();
-  }
-
-  /**
-  * See {@link org.eclipse.jface.window.Window#configureShell}.
-  * @param shell The shell.
-  */
-  protected void configureShell ( Shell shell )
-  {
-    super.configureShell(shell);
-    shell.setText(WSUIPluginMessages.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(WSUIPluginMessages.LABEL_RESOURCE_FILTER);
-      filterLabel_.setToolTipText(WSUIPluginMessages.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(WSUIPluginMessages.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(WSUIPluginMessages.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 722b311a5..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/plugin/WebServiceUIPlugin.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.ui.plugin;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.ws.internal.ui.preferences.PersistentActionDialogsContext;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-
-
-/**
-* This is the plugin class for the Web Services plugin.
-* <p>
-* This plugin contains the graphic user interface to the
-* Web Services runtime found in org.eclipse.jst.ws.
-*/
-public class WebServiceUIPlugin extends AbstractUIPlugin
-{
-
-  /**
-  * The identifier of the descriptor of this plugin in plugin.xml.
-  */
-  public static final String ID = "org.eclipse.jst.ws.ui";
-
-  /**
-  * The reference to the singleton instance of this plugin.
-  */
-  private static WebServiceUIPlugin instance_;
-
-  private PersistentActionDialogsContext actionDialogsContext_;
-  
-  /**
-   * Constructs a runtime plugin object for this plugin.
-   */
-  public WebServiceUIPlugin() {
-	super();
-	instance_ = this;
-  }
-
-  /**
-  * Returns the singleton instance of this plugin. Equivalent to calling
-  * (WebServiceUIPlugin)Platform.getPlugin("org.eclipse.jst.ws.ui");
-  * @return The WebServiceUIPlugin singleton.
-  */
-  static public WebServiceUIPlugin getInstance() {
-    return instance_;
-  }
-
-
-  public PersistentActionDialogsContext getActionDialogsContext() 
-  	{
-  	  if (actionDialogsContext_ == null)
-  	  	{
-  	  		actionDialogsContext_ = new PersistentActionDialogsContext();
-  	  		actionDialogsContext_.load();
-  	  	}
-  	  return actionDialogsContext_;
-  	}
-		
-  /**
-  * Returns the message string identified by the given key from
-  * the plugin.properties file for the appropriate locale.
-  * @param key The message key string prefixed by a "%" symbol.
-  * That is, the string passed in must be of the form "%KEY"
-  * where the plugin.properties file contains a line of the
-  * form: "KEY = value".
-  * @return The locale-specific message.
-  */
-	public static String getMessage(String key) 
-	{
-	    MessageUtils msgUtils = new MessageUtils( "org.eclipse.jst.ws.ui.plugin", instance_ );
-	    
-	    if( key.startsWith("%"))
-	    {
-	      key = key.substring( 1, key.length() );
-	    }
-	    
-	    return msgUtils.getMessage(key);
-    }
-
-  /**
-  * Returns the message string identified by the given key from
-  * the plugin.properties file for the appropriate locale.
-  * Substitution sequences in the message string
-  * are replaced by the given array of substitution objects (which
-  * are most frequently strings). See java.text.MessageFormat for
-  * further details on substitution.
-  * @param key The message key string prefixed by a "%" symbol.
-  * That is, the string passed in must be of the form "%KEY"
-  * where the plugin.properties file contains a line of the
-  * form: "KEY = value".
-  * @param args The substitution values for the message
-  * as required by the message in plugin.properties and
-  * by the rules of class java.text.MessageFormat.
-  * @return The locale-specific message.
-  */
-	public static String getMessage(String key, Object[] args) {
-		return MessageFormat.format(getMessage(key), args);
-  }
-
-  /**
-  * Returns an image descriptor for the named resource
-  * as relative to the plugin install location.
-  * @return An image descriptor, possibly null.
-  */
-	public static ImageDescriptor getImageDescriptor(String name) {
-		try {
-			URL installURL = instance_.getBundle().getEntry("/");
-			URL imageURL = new URL(installURL, name);
-			return ImageDescriptor.createFromURL(imageURL);
-		} catch (MalformedURLException e) {
-      return null;
-    }
-  }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ActionDialogPreferenceType.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ActionDialogPreferenceType.java
deleted file mode 100644
index 7e2ba9c7d..000000000
--- 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 e6a3a3f39..000000000
--- 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 8e25b5130..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ActionDialogsPreferencePage.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*******************************************************************************
- * Copyright (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;
-import org.eclipse.wst.command.internal.env.ui.EnvironmentUIMessages;
-
-;
-
-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(EnvironmentUIMessages.TOOLTIP_PPAD_PAGE);
-    helpSystem.setHelp(parent,INFOPOP_PPAD_PAGE);
-	
-    showAll = new Button(parent, SWT.NONE);
-    showAll.setText(EnvironmentUIMessages.BUTTON_SHOW_ALL_DIALOGS);
-    showAll.addListener(SWT.Selection, this);
-    showAll.setToolTipText(EnvironmentUIMessages.TOOLTIP_PPAD_BUTTON_SHOW_ALL);
-    helpSystem.setHelp(showAll,INFOPOP_PPAD_BUTTON_SHOW_ALL);
-   
-    hideAll = new Button(parent, SWT.NONE);
-    hideAll.setText(EnvironmentUIMessages.BUTTON_HIDE_ALL_DIALOGS);
-    hideAll.addListener ( SWT.Selection, this);
-    hideAll.setToolTipText(EnvironmentUIMessages.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 cabefe40f..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/PersistentActionDialogsContext.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ui.preferences;
-
-import org.eclipse.jst.ws.internal.ui.plugin.WebServiceUIPlugin;
-import org.eclipse.wst.command.internal.env.context.PersistentContext;
-
-
-public class PersistentActionDialogsContext extends PersistentContext
-{
- private ActionDialogPreferenceType [] dialogs_;
-
-public PersistentActionDialogsContext () 
-{
-	super(  WebServiceUIPlugin.getInstance());
-}
-public void load() 
-{
-    ActionDialogPreferenceTypeRegistry reg = ActionDialogPreferenceTypeRegistry.getInstance();
-    dialogs_ = reg.getActionDialogsPrefrences();
-    for (int i = 0; i < dialogs_.length; i++) {
-    	setDefault(dialogs_[i].getId(), true);
-   }
-}
-
-public ActionDialogPreferenceType[] getDialogs()
-{
-  return dialogs_;
-}
-
-public void setActionDialogEnabled ( String id, boolean value)
-{
- 	setValue (id, value);
-}
-
-public boolean isActionDialogEnabled( String id)
-{
-     if (id == null ) 
-     	return true;
-	 return getValueAsBoolean(id);
-}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ResourceManagmentPreferencePage.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ResourceManagmentPreferencePage.java
deleted file mode 100644
index 7c1f7c611..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ResourceManagmentPreferencePage.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (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.WSUIPluginMessages;
-import org.eclipse.jst.ws.internal.ui.plugin.WebServiceUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.help.IWorkbenchHelpSystem;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.env.core.context.ResourceDefaults;
-
-
-
-public class ResourceManagmentPreferencePage extends PreferencePage implements IWorkbenchPreferencePage
-{
-  /*CONTEXT_ID PPRM0001 for the Resource Managment Preference Page*/
-  private String INFOPOP_PPRM_PAGE = WebServiceUIPlugin.ID + ".PPRM0001";
-  //
-  private Button overWriteFiles;
-  /*CONTEXT_ID PPRM0002 for the file overwrite check box on the Resource Management Preference Page*/
-  private String INFOPOP_PPRM_CHECKBOX_OVERWRITE_FILES = WebServiceUIPlugin.ID + ".PPRM0002";
-  //
-  private Button createFolders;
-  /*CONTEXT_ID PPRM0003 for the create folders check box on the Resource Management Preference Page*/
-  private String INFOPOP_PPRM_CHECKBOX_CREATE_FOLDERS = WebServiceUIPlugin.ID + ".PPRM0003";
-  //
-  private Button checkoutFiles;
-  /*CONTEXT_ID PPRM0004 for the checkout files check box on the Resource Management Preference Page*/
-  private String INFOPOP_PPRM_CHECKBOX_CHECK_OUT = WebServiceUIPlugin.ID + ".PPRM0004";
-
- /**
-   * Creates preference page controls on demand.
-   *   @param parent  the parent for the preference page
-   */
-  protected Control createContents(Composite superparent)
-  {
-  	IWorkbenchHelpSystem helpSystem = PlatformUI.getWorkbench().getHelpSystem();
-  	
-    Composite   parent = new Composite( superparent, SWT.NONE );	
-    GridLayout layout = new GridLayout();
-    layout.numColumns = 1;
-    parent.setLayout( layout );
-    parent.setToolTipText(WSUIPluginMessages.TOOLTIP_PPRM_PAGE);
-    helpSystem.setHelp(parent, INFOPOP_PPRM_PAGE);
-
-    overWriteFiles = createCheckBox(parent, WSUIPluginMessages.BUTTON_OVERWRITE_FILES);
-    overWriteFiles.setToolTipText(WSUIPluginMessages.TOOLTIP_PPRM_CHECKBOX_OVERWRITE_FILES);
-    helpSystem.setHelp(overWriteFiles, INFOPOP_PPRM_CHECKBOX_OVERWRITE_FILES);
-
-    createFolders  = createCheckBox(parent, WSUIPluginMessages.BUTTON_CREATE_FOLDERS);
-    createFolders.setToolTipText(WSUIPluginMessages.TOOLTIP_PPRM_CHECKBOX_CREATE_FOLDERS);
-    helpSystem.setHelp(createFolders, INFOPOP_PPRM_CHECKBOX_CREATE_FOLDERS);
-
-    checkoutFiles = createCheckBox(parent, WSUIPluginMessages.BUTTON_CHECKOUT_FILES);    
-    checkoutFiles.setToolTipText(WSUIPluginMessages.TOOLTIP_PPRM_CHECKBOX_CHECK_OUT);
-    helpSystem.setHelp(checkoutFiles, INFOPOP_PPRM_CHECKBOX_CHECK_OUT);
-
-    initializeValues();
-    org.eclipse.jface.dialogs.Dialog.applyDialogFont(superparent);    
-
-    return parent;
-  }
- 
-  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 f7a8bf148..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ScenarioDefaultsPreferencePage.java
+++ /dev/null
@@ -1,313 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.ui.preferences;
-
-import java.util.Vector;
-
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.ws.internal.context.ScenarioContext;
-import org.eclipse.jst.ws.internal.context.ScenarioDefaults;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.jst.ws.internal.ui.WSUIPluginMessages;
-import org.eclipse.jst.ws.internal.ui.plugin.WebServiceUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.PlatformUI;
-
-
-
-public class ScenarioDefaultsPreferencePage extends PreferencePage implements IWorkbenchPreferencePage, SelectionListener
-{
-  
-  private TableViewer webServiceTestTypeViewer_; 
-  private Button moveUp_;
-  private Button moveDown_;
-  private Vector webServiceTestTypes_;
-  
-  /*CONTEXT_ID PPSD0001 for the Scenario Defaults Preference Page*/
-  private String INFOPOP_PPSD_PAGE = WebServiceUIPlugin.ID + ".PPSD0001";
-  //
-  private Button launchSample;
-  /*CONTEXT_ID PPSD0002 for the launch sample check box on the Scenario Defaults Preference Page*/
-  private final String INFOPOP_PPSD_CHECKBOX_LAUNCH_SAMPLE = WebServiceUIPlugin.ID + ".PPSD0002";
-  //
-
-  /**
-   * Creates preference page controls on demand.
-   *   @param parent  the parent for the preference page
-   */
-  protected Control createContents(Composite superparent)
-  {
-    
-  	Composite   parent = new Composite( superparent, SWT.NONE );	
-    GridLayout layout = new GridLayout();
-    layout.numColumns = 1;
-    parent.setLayout( layout );
-    parent.setToolTipText(WSUIPluginMessages.TOOLTIP_PPSD_PAGE);
-    parent.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(parent,INFOPOP_PPSD_PAGE);    
-
-    launchSample = createCheckBox(parent, WSUIPluginMessages.BUTTON_LAUNCH_SAMPLE);
-    launchSample.setToolTipText(WSUIPluginMessages.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(WSUIPluginMessages.LABEL_SAMPLE_TYPES);
-    testServiceTypeLabel.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
-
-    Composite webServiceTestTypeComposite = new Composite(parent, SWT.NONE);
-    GridLayout gl = new GridLayout();
-    gl.numColumns = 2;
-    gl.marginHeight = 0;
-    gl.marginWidth = 0;
-    webServiceTestTypeComposite.setLayout(gl);
-    webServiceTestTypeComposite.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
-
-    Table table= new Table(webServiceTestTypeComposite, SWT.BORDER | SWT.SINGLE | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL);
-    GridData gd = new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL);
-    gd.widthHint = 256;
-    table.setLayoutData(gd);
-    table.setToolTipText(WSUIPluginMessages.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(WSUIPluginMessages.LABEL_CLIENT_TYPE_NAME);
-    ColumnWeightData columnData = new ColumnWeightData(256, 256, false);
-    tableLayout.addColumnData(columnData);
-    table.setLayout(tableLayout);
-
-    Composite c = new Composite(webServiceTestTypeComposite, SWT.NONE);
-    gl = new GridLayout();
-    gl.numColumns = 1;
-    gl.marginHeight = 10;
-    gl.marginWidth = 0;
-    c.setLayout(gl);
-
-    moveUp_ = new Button(c, SWT.PUSH);
-    moveUp_.setText(WSUIPluginMessages.LABEL_MOVE_UP);
-    moveUp_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-    moveUp_.addSelectionListener(this);
-    moveUp_.setToolTipText(WSUIPluginMessages.TOOLTIP_MOVE_UP);
-
-    moveDown_ = new Button(c, SWT.PUSH);
-    moveDown_.setText(WSUIPluginMessages.LABEL_MOVE_DOWN);
-    moveDown_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-    moveDown_.addSelectionListener(this);
-    moveDown_.setToolTipText(WSUIPluginMessages.TOOLTIP_MOVE_DOWN);
-
-    initializeValues();
-    org.eclipse.jface.dialogs.Dialog.applyDialogFont(superparent);    
-
-    return parent;
-  }
-
-  private Button createCheckBox( Composite parent, String text )
-  {
-    Button button = new Button( parent, SWT.CHECK );
-    button.setText( text );
-    return button;
-  }
-
-  /**
-   * Does anything necessary because the default button has been pressed.
-   */
-  protected void performDefaults()
-  {
-    super.performDefaults();
-    initializeDefaults();
-  }
-
-  /**
-   * Do anything necessary because the OK button has been pressed.
-   *  @return whether it is okay to close the preference page
-   */
-  public boolean performOk()
-  {
-    try{
-      storeValues();
-    }catch (Exception exc){
-    	exc.printStackTrace();}
-    return true;
-  }
-
-  protected void performApply()
-  {
-    try{
-  	performOk();
-    }catch(NullPointerException exc){
-      exc.printStackTrace();
-    }
-  }
-
-  /**
-   * @see IWorkbenchPreferencePage
-   */
-  public void init(IWorkbench workbench)  { }
-
-  /**
-   * Initializes states of the controls to their burned-in defaults.
-   */
-  private void initializeDefaults()
-  {
-    ScenarioDefaults defaults = new ScenarioDefaults();
-    //pgm launchSample.setSelection( defaults.getLaunchSampleDefault());
-    
-    webServiceTestTypes_.clear();
-    String[] types = defaults.getWebServiceTestTypes();
-    for (int i = 0; i < types.length; i++)
-      webServiceTestTypes_.add(types[i]);
-    webServiceTestTypeViewer_.refresh();
-  }
-
-  /**
-   * Initializes states of the controls from the preference helper.
-   */
-  private void initializeValues()
-  {
-  	ScenarioContext  context  = WebServicePlugin.getInstance().getScenarioContext();
-    ScenarioDefaults defaults = new ScenarioDefaults();
-    //pgm launchSample.setSelection( context.isLaunchSampleEnabled());
-        
-    String[] types = context.getWebServiceTestTypes();
-    for (int i = 0; i < types.length; i++)
-      webServiceTestTypes_.add(types[i]);
-    // check whether we missed any types from the default list
-    boolean missed = false;
-    types = defaults.getWebServiceTestTypes();
-    for (int i = 0; i < types.length; i++)
-    {
-      if (webServiceTestTypes_.indexOf(types[i]) == -1)
-      {
-        webServiceTestTypes_.add(types[i]);
-        missed = true;
-      }
-    }
-    if (missed)
-    {
-      types = new String[webServiceTestTypes_.size()];
-      webServiceTestTypes_.copyInto(types);
-      context.setWebServiceTestTypes(types);
-    }
-    // refresh viewer
-    webServiceTestTypeViewer_.refresh();
-   }
-
-  /**
-   * Stores the values of the controls back to the preference helper.
-   */
-  private void storeValues()
-  {
-    ScenarioContext context = WebServicePlugin.getInstance().getScenarioContext();
-    String[] types = new String[webServiceTestTypes_.size()];
-    webServiceTestTypes_.copyInto(types);
-    context.setWebServiceTestTypes(types);
-    
-    //pgm context.setLaunchSampleEnabled(launchSample.getSelection());
-  }
-
-  public void widgetDefaultSelected(SelectionEvent e)
-  {
-  }
-
-  public void widgetSelected(SelectionEvent e)
-  {
-    int index = webServiceTestTypeViewer_.getTable().getSelectionIndex();
-    if (index != -1)
-    {
-      if (e.widget == moveUp_ && index > 0)
-      {
-        Object object = webServiceTestTypes_.remove(index);
-        webServiceTestTypes_.insertElementAt(object, index-1);
-        webServiceTestTypeViewer_.refresh();
-      }
-      else if (e.widget == moveDown_ && index < webServiceTestTypes_.size()-1)
-      {
-        Object object = webServiceTestTypes_.remove(index);
-        webServiceTestTypes_.insertElementAt(object, index+1);
-        webServiceTestTypeViewer_.refresh();
-      }
-    }
-  }
-
-  private class WebServiceTestTypeContentProvider implements IStructuredContentProvider
-  {
-    /**
-     * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(Object)
-     */
-    public Object[] getElements(Object value) 
-    {
-      return ((Vector)value).toArray(new String[0]);
-    }
-
-    /**
-     * @see org.eclipse.jface.viewers.IContentProvider#dispose()
-     */
-    public void dispose() 
-    {
-    }
-
-    /**
-     * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(Viewer, Object, Object)
-     */
-    public void inputChanged(Viewer arg0, Object arg1, Object arg2) 
-    {
-    }
-  }
-
-  private class WebServiceTestTypeLabelProvider extends LabelProvider
-  {
-    public WebServiceTestTypeLabelProvider()
-    {
-    }
-
-    /**
-    * @see org.eclipse.jface.viewers.ILabelProvider#getImage(Object)
-    */
-    public Image getImage(Object arg0) 
-    { 
-      return null;
-    }
-
-    /**
-     * @see org.eclipse.jface.viewers.ILabelProvider#getText(Object)
-     */
-    public String getText(Object value) 
-    {
-      //return getElementByAttribute("id", value.toString()).getAttribute("label"); 
-      return value.toString();
-    }
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/uddi/PrivateUDDIRegistryType.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/uddi/PrivateUDDIRegistryType.java
deleted file mode 100644
index e37abc3d3..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/uddi/PrivateUDDIRegistryType.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.ui.uddi;
-
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-
-public interface PrivateUDDIRegistryType
-{
-    public boolean isPrivateUDDIRegistryInstalled();
-    public String[] getPrivateUDDIRegistryInquiryAPI();
-    public String[] getPrivateUDDIRegistryPublishAPI();
-    public CommandWidgetBinding getBinding();
-}
diff --git a/bundles/org.eclipse.jst.ws/.classpath b/bundles/org.eclipse.jst.ws/.classpath
deleted file mode 100644
index 751c8f2e5..000000000
--- 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.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws/.cvsignore b/bundles/org.eclipse.jst.ws/.cvsignore
deleted file mode 100644
index 985411422..000000000
--- a/bundles/org.eclipse.jst.ws/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-build.xml
-temp.folder
-ws.jar
-@dot
-src.zip
diff --git a/bundles/org.eclipse.jst.ws/.project b/bundles/org.eclipse.jst.ws/.project
deleted file mode 100644
index b3091849c..000000000
--- a/bundles/org.eclipse.jst.ws/.project
+++ /dev/null
@@ -1,31 +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>
-	</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/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index ac5284f3f..000000000
--- a/bundles/org.eclipse.jst.ws/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,57 +0,0 @@
-#Mon Jan 30 10:35:26 EST 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/bundles/org.eclipse.jst.ws/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.jst.ws/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 2bcc8c952..000000000
--- a/bundles/org.eclipse.jst.ws/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Jan 30 10:41:42 EST 2006
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.jst.ws/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws/META-INF/MANIFEST.MF
deleted file mode 100644
index e3b25c3e3..000000000
--- a/bundles/org.eclipse.jst.ws/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,50 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.jst.ws.internal.plugin.WebServicePlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal,
- org.eclipse.jst.ws.internal.command,
- org.eclipse.jst.ws.internal.common,
- org.eclipse.jst.ws.internal.context,
- org.eclipse.jst.ws.internal.data,
- org.eclipse.jst.ws.internal.dialog,
- org.eclipse.jst.ws.internal.ext,
- org.eclipse.jst.ws.internal.ext.test,
- org.eclipse.jst.ws.internal.plugin
-Require-Bundle: org.eclipse.wst.command.env,
- org.eclipse.wst.command.env.ui,
- org.eclipse.wst.command.env.core,
- org.eclipse.jem.util,
- org.eclipse.jem.workbench,
- org.eclipse.jem,
- org.eclipse.jdt.core,
- org.eclipse.emf.common,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.jface,
- org.eclipse.emf.ecore,
- org.eclipse.debug.core,
- org.eclipse.jem.workbench,
- org.eclipse.wst.server.core,
- org.eclipse.wst.server.ui,
- org.eclipse.wst.wsdl,
- org.eclipse.jst.j2ee.core,
- org.eclipse.jst.j2ee.ejb,
- org.eclipse.jst.j2ee,
- org.eclipse.jst.j2ee.web,
- org.eclipse.wst.common.emfworkbench.integration,
- org.eclipse.wst.web,
- org.eclipse.wst.common.modulecore,
- org.uddi4j,
- org.eclipse.wst.common.frameworks,
- org.eclipse.wst.common.emf,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.jem.util,
- org.eclipse.jst.common.frameworks,
- org.eclipse.wst.common.environment,
- org.eclipse.wst.common.project.facet.core
-Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.jst.ws/about.html b/bundles/org.eclipse.jst.ws/about.html
deleted file mode 100644
index 6f6b96c4c..000000000
--- a/bundles/org.eclipse.jst.ws/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws/build.properties b/bundles/org.eclipse.jst.ws/build.properties
deleted file mode 100644
index cbb23103c..000000000
--- a/bundles/org.eclipse.jst.ws/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-src.includes = component.xml
-bin.includes = plugin.properties,\
-               plugin.xml,\
-               .,\
-               META-INF/,\
-               about.html
-source.. = src/
diff --git a/bundles/org.eclipse.jst.ws/component.xml b/bundles/org.eclipse.jst.ws/component.xml
deleted file mode 100644
index a90bf17d8..000000000
--- a/bundles/org.eclipse.jst.ws/component.xml
+++ /dev/null
@@ -1,15 +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.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 505a8be08..000000000
--- 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/src/org/eclipse/jst/ws/internal/WSPlugin.properties b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/WSPlugin.properties
deleted file mode 100644
index 97d4fc15f..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/WSPlugin.properties
+++ /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
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-
-MSG_ERROR_SERVER=IWAB0213E Error in starting server.
-
-ANY_FILTER_NAME=All files
-ANY_FILTER_DESC=This is a kind of Filter that accepts all objects.
-
-ERROR_SELECTION_TRANSFORM=Specified selection does not match a resource.
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/WSPluginMessages.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/WSPluginMessages.java
deleted file mode 100644
index 9cffbd37c..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/WSPluginMessages.java
+++ /dev/null
@@ -1,31 +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;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class WSPluginMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.jst.ws.internal.WSPlugin";//$NON-NLS-1$
-
-	private WSPluginMessages() {
-		// Do not instantiate
-	}
-
-	public static String MSG_ERROR_SERVER;
-	public static String ANY_FILTER_NAME;
-	public static String ANY_FILTER_DESC;
-	public static String ERROR_SELECTION_TRANSFORM;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, WSPluginMessages.class);
-	}
-}
\ No newline at end of file
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 c0454d107..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/NullStatusMonitor.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (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 de0758f77..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/StatusMonitor.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.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 0cff3a6b8..000000000
--- 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 c88ba88cd..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/AnyFilter.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.common;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.jst.ws.internal.WSPluginMessages;
-
-/**
-* 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
-{
-
-  /**
-  * 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 WSPluginMessages.ANY_FILTER_NAME;
-  }
-
-  /**
-  * Returns the locale-specific description of this filter.
-  * @return The locale-specific description of this filter.
-  */
-  public String getDescription ()
-  {
-    return WSPluginMessages.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/Filter.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/Filter.java
deleted file mode 100644
index 7749cad43..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/Filter.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.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
-{
-
-  /**
-  * 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 5bec5527e..000000000
--- 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.internal.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 63b9f9ab5..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEActionAdapterFactory.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
- *******************************************************************************/
-/*
- * 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.jem.util.emf.workbench.ProjectUtilities;
-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;
-
-
-/**
- * @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 447eeea98..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEUtils.java
+++ /dev/null
@@ -1,1378 +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
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060204  124143   rsinha@ca.ibm.com - Rupam Kuehner     
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.common;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.StringTokenizer;
-import java.util.Vector;
-
-import org.eclipse.core.commands.ExecutionException;
-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.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationDataModelProvider;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EJBResource;
-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.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-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.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.environment.EnvironmentService;
-import org.eclipse.wst.common.environment.ILog;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-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 for Web services internal use.
- */
-public final class J2EEUtils {
-	
-	public final static int WEB = 1;
-	public final static int EJB = 2;
-	public final static int APPCLIENT = 4;
-	public final static int EAR = 8;	
-	
-	/**
-	 * Returns an IVirtualComponent
-	 * @param project
-	 * @return
-	 */
-	public static IVirtualComponent getVirtualComponent(IProject project){
-		return ComponentCore.createComponent(project);
-	}
-	
-	/**
-	 * 
-	 * @param projectName
-	 * @return
-	 */
-	public static IVirtualComponent getVirtualComponent(String projectName){
-		IProject project = null;
-		if (projectName!=null && projectName.length() > 0 )
-      project = ProjectUtilities.getProject(projectName);
-		
-		return ComponentCore.createComponent(project);
-	}
-	
-
-	/**
-	 * Returns the J2EE version
-	 * @param p project
-	 * @return int
-	 */
-	public static int getJ2EEVersion(IProject p){
-		
-		String ver = J2EEProjectUtilities.getJ2EEProjectVersion(p);
-		return J2EEVersionUtil.convertVersionStringToInt(ver);
-
-		/*
-		int j2eeVer = -1;
-		try {
-          IVirtualComponent vc = ComponentCore.createComponent(p);
-          if (vc!=null){
-            j2eeVer = getJ2EEVersion(vc);
-          }
-		}
-		catch (Exception e){
-			//handle exception
-		}
-		return j2eeVer;
-		*/
-	}
-	
-	public static int getJ2EEVersion(IVirtualComponent ch){
-      int j2eeVer = -1;
-      //check type
-      if (ch!=null){
-    	  IProject project = ch.getProject();
-    	  j2eeVer = getJ2EEVersion(project);
-      }
-      
-      /*  Use new API provided by J2EE 
-      if (ch!=null) {
-        if (isWebComponent(ch))
-          j2eeVer = getWebComponentJ2EEVersion(ch);
-        else if (isAppClientComponent(ch))
-          j2eeVer = getAppClientComponentJ2EEVersion(ch);
-        else if (isEJBComponent(ch))
-          j2eeVer = getEJBComponentJ2EEVersion(ch);
-        else if (isEARComponent(ch))
-          j2eeVer = getEARComponentJ2EEVersion(ch);
-      }
-      */
-      
-      return j2eeVer; 
-	}
-	
-
-	/**
-	 * Returns the J2EEVersion
-	 * @param p IProject
-	 * @return String
-	 */
-	public static String getJ2EEVersionAsString(IProject p){
-		
-		String ver = J2EEProjectUtilities.getJ2EEProjectVersion(p);
-		return  ver != null ? ver : null;
-		 
-		/*
-		int j2eeVer = getJ2EEVersion(p);
-		if (j2eeVer!=-1){
-			return J2EEVersionUtil.getJ2EETextVersion(j2eeVer);
-		}
-		else 
-			return null;
-		
-		*/
-	}
-	
-	public static IVirtualComponent[] getAllComponents(){
-		List v = new ArrayList();
-		IProject[] projects = ResourceUtils.getWorkspaceRoot().getProjects();
-		for (int i = 0; i < projects.length; i++) {
-          IVirtualComponent vc = ComponentCore.createComponent(projects[i]);
-          if(vc != null)
-        	  v.add(vc);
-          }
-
-		return (IVirtualComponent[])v.toArray(new IVirtualComponent[0]);
-	}
-	
-	/**
-	 * Returns all the EAR components in the workspace
-	 * @return IVirtualComponent[]; empty if none
-	 */
-	public static IVirtualComponent[] getAllEARComponents() {
-		List v = new ArrayList();
-		IProject[] projects = ResourceUtils.getWorkspaceRoot().getProjects();
-		for (int i = 0; i < projects.length; i++) {
-			try {
-				IVirtualComponent[] components = getEARComponentsFromProject(projects[i]);
-				for (int j=0; j<components.length; j++) {
-					if (components[j]!=null)
-						v.add(components[j]);
-				}
-			} catch (Exception e) {
-				e.printStackTrace();
-				//handle exception
-			}
-
-		}
-		return (IVirtualComponent[])v.toArray(new IVirtualComponent[0]);
-	}
-	
-	public static IVirtualComponent[] getAllWebComponents(){
-		List v = new ArrayList();
-		IProject[] projects = ResourceUtils.getWorkspaceRoot().getProjects();
-		for (int i = 0; i < projects.length; i++) {
-			try {
-				IVirtualComponent[] components = getWebComponents(projects[i]);
-				for (int j=0; j<components.length; j++) {
-					if (components[j]!=null)
-						v.add(components[j]);
-				}
-			} catch (Exception e) {
-				e.printStackTrace();
-				//handle exception
-			}
-
-		}
-		return (IVirtualComponent[])v.toArray(new IVirtualComponent[0]);		
-	}
-	
-	/**
-	 * Returns the EAR components in a given IProject
-	 * @param project
-	 * @return empty if no EAR components; must not return null
-	 */
-	public static IVirtualComponent[] getEARComponentsFromProject(IProject project){
-		//get all components in the project
-		List v = new ArrayList();		
-		try {
-			IVirtualComponent component = ComponentCore.createComponent(project);
-			if (component != null && isEARComponent(component)){
-				v.add(component);
-			}
-		}
-		catch (Exception e){
-			//handle exception
-		}
-		
-		return (IVirtualComponent[])v.toArray(new IVirtualComponent[0]);
-	}
-	
-	/**
-	 * Returns Web components in a project
-	 * @param project
-	 * @return empty array if no web components; must not return null
-	 */
-	public static IVirtualComponent[] getWebComponents(IProject project){
-		
-		//get all components in the project
-		List v = new ArrayList();
-		try {
-			IVirtualComponent component = ComponentCore.createComponent(project);
-			
-				if (component != null && isWebComponent(component)){
-					v.add(component);
-				}		
-
-		}
-		catch (Exception e){
-			//handle exception
-		}
-		
-		return (IVirtualComponent[])v.toArray(new IVirtualComponent[0]);
-	} 
-	
-	public static String[] getWebComponentNames(IProject project){
-		IVirtualComponent[] vcs = getWebComponents(project);
-		return toComponentNamesArray(vcs);
-	}
-	
-	public static String[] getEARComponentNames(IProject project){
-		IVirtualComponent[] vcs = getEARComponentsFromProject(project);
-		return toComponentNamesArray(vcs);
-	}
-	
-	/**
-	 * Returns all components of type, componentType in the project.
-	 * @param project
-	 * @param componentType i.e. J2EEUtils.WEB
-	 * @return
-	 */
-	public static IVirtualComponent[] getComponentsByType(IProject project, int componentType){
-		
-		List v = new ArrayList();
-		if ( (WEB & componentType)==WEB ){
-			IVirtualComponent[] webVC = getWebComponents(project);
-			addToArrayListHelper(webVC, v);
-		}
-		if ( (EJB & componentType)==EJB ){
-			IVirtualComponent[] ejbVC = getEJBComponents(project);
-			addToArrayListHelper(ejbVC, v);
-		}
-		if ( (APPCLIENT & componentType)==APPCLIENT ) {
-			IVirtualComponent[] appClientVC = getAppClientComponents(project);
-			addToArrayListHelper(appClientVC, v);
-		}
-		if ( (EAR & componentType)==EAR ) {
-			IVirtualComponent[] earVC = getEARComponentsFromProject(project);
-			addToArrayListHelper(earVC, v);
-		}
-		
-		return (IVirtualComponent[])v.toArray(new IVirtualComponent[0]);		
-	}
-	
-	/**
-	 * Returns all components of type, componentType in the project.
-	 * @param project
-	 * @param componentTypeId as defined in IModuleConstants.
-	 * @return
-	 */
-	public static IVirtualComponent[] getComponentsByType(IProject project, String componentTypeId){
-		
-		//get all components in the project of type componentTypeId
-		List v = new ArrayList();
-		try {
-
-			IVirtualComponent vc = ComponentCore.createComponent(project);	
-			if ( vc != null && J2EEProjectUtilities.isProjectOfType(project,componentTypeId))
-			{
-				v.add(vc);
-			}
-			//if (isWebComponent(project, components[i].getName())){
-				//v.add(components[i]);
-			//}		
-
-		}
-		catch (Exception e){
-			//handle exception
-		}
-		
-		return (IVirtualComponent[])v.toArray(new IVirtualComponent[0]);
-	}
-	
-	public static String[] getProjectsContainingComponentOfType(String componentTypeId)
-	{
-	    Vector v = new Vector(); 
-	    IVirtualComponent[] comps = getAllComponents();
-	    for (int i = 0; i < comps.length; i++) {
-			if (J2EEProjectUtilities.isProjectOfType(comps[i].getProject(),componentTypeId))
-			{
-				//Add the project name to the vector if it has not been added already
-				String name = comps[i].getProject().getName();
-				if (!v.contains(name))
-				{
-					v.add(name);	
-				}		        			
-			}
-
-        }
-
-        return (String[])v.toArray(new String[0]);
-	}
-   
-	/**
-	 * Helper method for getComponentsByType
-	 * @param vcs
-	 * @param vect
-	 */
-	private static void addToArrayListHelper(IVirtualComponent[] vcs, List al){
-		for (int i=0;i<vcs.length;i++){
-			al.add(vcs[i]);
-		}		
-	}
-
-	
-	/**
-	 * Essentially, returns all projects in the workspace
-	 * @return
-	 */
-	public static IProject[] getAllFlexibleProjects(){
-
-		List v = new ArrayList();
-		try {
-			IProject[] projects = ProjectUtilities.getAllProjects();
-			for(int i=0; i<projects.length;i++) {
-				if (ModuleCoreNature.getModuleCoreNature(projects[i])!=null){
-					v.add(projects[i]);
-				}
-			}
-		}
-		catch(Exception e){
-		}
-
-		return (IProject[])v.toArray(new IProject[0]);
-	}
-	
-	
-	/**
-	 * 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 = ProjectUtilities.getProject(projectName);
-        }
-        else
-          return false;
-		
-		return exists(project);
-	}
-	
-	/**
-	 * True if there exists a underlying resource backing up the component and project
-	 * @param project
-	 * @return
-	 */
-	public static boolean exists(IProject project){
-		if (project!=null) {
-            if (!project.exists())
-              return false;
-            
-			IVirtualComponent vc = ComponentCore.createComponent(project);
-			return vc.exists();
-		}
-		else 
-			return false;
-		
-	}	
-
-	/**
-	 * Returns an array of EAR components which are referenced by the component
-	 * @param project
-	 * @return
-	 */
-	public static IVirtualComponent[] getReferencingEARComponents(IProject project){
-		List ears = new ArrayList();
-		try{
-			IVirtualComponent targetVC = ComponentCore.createComponent(project);
-			
-			IVirtualComponent[] earVC = getAllEARComponents();
-			for (int i=0; i<earVC.length;i++) {
-				IVirtualReference[] refs = earVC[i].getReferences();
-				for (int k=0;k<refs.length;k++) {
-					if (targetVC.equals(refs[k].getReferencedComponent())){
-						ears.add(refs[k].getEnclosingComponent());
-					}
-				}
-			}
-
-		}
-		catch (Exception e){
-		}
-
-		return (IVirtualComponent[])ears.toArray(new IVirtualComponent[0]);
-	}
-	
-	
-	/**
-	 * Returns the EJB Components referenced by the ear
-	 * @param project
-	 * @return
-	 */
-	public static IVirtualComponent[] getReferencingEJBComponentsFromEAR(IProject project){
-
-		List ejbComps = new ArrayList();
-		try{
-			IVirtualComponent vc = ComponentCore.createComponent(project);
-			IVirtualReference[] refs = vc.getReferences();
-			for (int i=0;i<refs.length;i++){
-				if (isEJBComponent(refs[i].getReferencedComponent())){
-					ejbComps.add(refs[i].getReferencedComponent());
-				}
-			}
-		}
-		catch(Exception e){
-		}
-		
-		return (IVirtualComponent[])ejbComps.toArray(new IVirtualComponent[0]);		
-	}
-
-	
-	/**
-	 * 
-	 * @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 jem ProjectUtilities to get the project
-	 * @param ejb eObject
-	 * @return IProject
-	 */
-	public static IProject getProjectFromEJB(EnterpriseBean ejb) {
-		return ProjectUtilities.getProject(ejb);
-	}
-
-	/**
-	 * Returns a default J2EE 1.3 EAR component in the workspace
-	 * @return EAR component name
-	 */
-	public static IVirtualComponent getDefault13EARComponent(){
-		IVirtualComponent[] allEARComponents = getAllEARComponents();
-		for (int j=0;j<allEARComponents.length;j++){
-			int j2eeVersion = getJ2EEVersion(allEARComponents[j]);
-			if (j2eeVersion == J2EEVersionConstants.J2EE_1_3_ID)
-				 return allEARComponents[j];
-		 }	
-		return null;
-	}
-	
-	/**
-	 * Returns a default J2EE 1.4 EAR component in the workspace
-	 * @return EAR component name
-	 */
-	public static IVirtualComponent getDefault14EARComponent(){
-		IVirtualComponent[] allEARComponents = getAllEARComponents();
-		for (int j=0;j<allEARComponents.length;j++){
-			int j2eeVersion = getJ2EEVersion(allEARComponents[j]);
-			if (j2eeVersion == J2EEVersionConstants.J2EE_1_4_ID)
-				 return allEARComponents[j];
-		 }	
-		return null;
-	}
-	
-	/**
-	 * Returns the first EAR component of the J2EE version
-	 * @param versionId
-	 * @return
-	 */
-	public static IVirtualComponent getEARComponentofJ2EEVersion(int versionId){
-		IVirtualComponent[] components = getAllEARComponents();
-		for (int i=0; i<components.length; i++){
-			if (getJ2EEVersion(components[i]) == versionId)
-				return components[i];
-		}
-		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 :
-				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 "";
-
-	}
-	
-	/**
-	 * Returns String representations of J2EE versions
-	 * @param aVersion
-	 * @return
-	 */
-	public static String getJ2EEIntVersionAsString(String aVersion) {
-		if (aVersion.equals(J2EEVersionConstants.VERSION_1_4_TEXT))
-			return new Integer(J2EEVersionConstants.J2EE_1_4_ID).toString();
-		if (aVersion.equals(J2EEVersionConstants.VERSION_1_3_TEXT))
-			return new Integer(J2EEVersionConstants.J2EE_1_3_ID).toString();
-		if (aVersion.equals(J2EEVersionConstants.VERSION_1_2_TEXT))
-			return new Integer(J2EEVersionConstants.J2EE_1_2_ID).toString();		
-		// default
-		return new Integer(J2EEVersionConstants.J2EE_1_4_ID).toString();
-	}	
-
-	// ----------------------------------------------------------------------
-
-
-
-	/**
-	 * 
-	 * @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
-			}
-
-		}
-
-		return (IProject[])v.toArray(new IProject[0]);
-	}
-	
-	
-	/**
-	 * 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) {
-				ILog log = EnvironmentService.getEclipseLog();
-				log.log(ILog.ERROR, 5039, J2EEUtils.class, "getEARProjects", ce);
-
-			}
-		}
-		return earProjects[0];
-	}
-
-	/**
-	 * Gets the EJB Components in the project
-	 * @param project
-	 * @return
-	 */
-	public static IVirtualComponent[] getEJBComponents(IProject project){
-		
-		//get all components in the project
-		List v = new ArrayList();
-		IVirtualComponent component = ComponentCore.createComponent(project);
-		try {
-			if (component != null && isEJBComponent(component)){
-				v.add(component);
-			}	
-		}
-		catch (Exception e){
-			//handle exception
-		}
-		
-		return (IVirtualComponent[])v.toArray(new IVirtualComponent[0]);
-	} 
-	
-	/**
-	 * Gets the Application Client components in a project.
-	 * @param project
-	 * @return
-	 */
-	public static IVirtualComponent[] getAppClientComponents(IProject project){
-		
-		//get all components in the project
-		List v = new ArrayList();
-		try {
-			IVirtualComponent component = ComponentCore.createComponent(project);
-			
-				if (component != null && isAppClientComponent(component)){
-					v.add(component);
-				}	
-		}
-		catch (Exception e){
-			//handle exception
-		}
-		
-		return (IVirtualComponent[])v.toArray(new IVirtualComponent[0]);
-	} 	
-	
-	/**
-	 * 
-	 * @param project
-	 * @return
-	 */
-	public static IVirtualComponent[] getReferencingEJB20ComponentsFromEAR(IProject project){
-		 
-		List ejbComps = new ArrayList();
-		try{
-			IVirtualComponent vc = ComponentCore.createComponent(project);
-			IVirtualReference[] refs = vc.getReferences();
-			for (int i=0; i<refs.length;i++) {
-				if (isEJB20Component(refs[i].getReferencedComponent()))
-					ejbComps.add(refs[i].getReferencedComponent());
-			}
-		}
-		catch (Exception e){
-		}
-		
-		return (IVirtualComponent[])ejbComps.toArray(new IVirtualComponent[0]);		
-	}
-	
-	
-	/**
-	 * 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;
-	}
-
-	/**
-	 * 
-	 * @param project
-	 * @return
-	 */
-	public static IVirtualComponent[] getReferencingWebComponentsFromEAR(IProject project){
-		List webComps = new ArrayList();
-		try{
-			IVirtualComponent vc = ComponentCore.createComponent(project);
-			IVirtualReference[] refs = vc.getReferences();
-			for (int i=0; i<refs.length;i++) {
-				if (isWebComponent(refs[i].getReferencedComponent()))
-					webComps.add(refs[i].getReferencedComponent());
-			}			
-		}
-		catch(Exception e){
-		}
-		
-		return (IVirtualComponent[])webComps.toArray(new IVirtualComponent[0]);	
-	}
-	
-
-	
-	/**
-	 * 
-	 * @param ejbComponent
-	 * @return
-	 */
-	public static boolean isEJB20Component(IVirtualComponent ejbComponent){
-		return isEJB20Component(ejbComponent.getProject());
-	}
-	
-	/**
-	 * 
-	 * @param project
-	 * @return
-	 */
-	public static boolean isEJB20Component(IProject project){
-		boolean isEJB = false;
-		try {
-      IVirtualComponent vc = ComponentCore.createComponent(project);
-		  if (EJBArtifactEdit.isValidEJBModule(vc)) {
-			  EJBArtifactEdit  ejbEdit = null;
-			  try {
-				  ejbEdit = EJBArtifactEdit.getEJBArtifactEditForRead(vc);
-				  EJBResource ejbRes = ejbEdit.getEJBJarXmiResource();
-				  if (ejbRes.getModuleVersionID()== J2EEVersionConstants.EJB_2_0_ID) {
-					  return true;
-				  }
-			  }
-			  finally {
-				  if (ejbEdit!=null)
-					  ejbEdit.dispose();
-			  }
-		  }
-		}
-		catch(Exception ex){}
-		
-		return isEJB;			
-	}
-
-	
-	/**
-	 * Checks if the component at compName is referenced by the ear at earCompName
-	 * @param earProject
-	 * @param project
-	 * @return
-	 */
-	public static boolean isComponentAssociated(IProject earProject, IProject project) {
-		IVirtualComponent vc1 = ComponentCore.createComponent(earProject);
-		IVirtualComponent vc2 = ComponentCore.createComponent(project);
-		return isComponentAssociated(vc1, vc2);
-	}
-	
-	/**
-	 * Checks if the component is referenced by the ear
-	 * @param ear 
-	 * @param component
-	 * @return
-	 */
-	private static boolean isComponentAssociated(IVirtualComponent ear, IVirtualComponent component){
-		boolean isAssociated = false;
-		
-		// Note: not implemented by J2EE yet.. to be used later.
-		IVirtualReference[] compRefs = ear.getReferences();
-		if (compRefs!= null) {
-			for (int i=0;i<compRefs.length;i++){
-				IVirtualReference vref = compRefs[i];
-				if (component.equals(vref.getReferencedComponent()))
-						isAssociated = true;
-			}
-		}
-		return isAssociated;
-	}
-
-	/**
-	 * 
-	 * @param project
-	 * @param earProject
-	 */
-	public static void associateComponentToEAR(IProject project, IProject earProject) {
-		
-        IDataModel addComponentToEARDataModel = DataModelFactory.createDataModel(new AddComponentToEnterpriseApplicationDataModelProvider());
-		IVirtualComponent earComp = ComponentCore.createComponent(earProject);
-        addComponentToEARDataModel.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, earComp);
-        List modList = (List) addComponentToEARDataModel.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
-        IVirtualComponent targetComp = ComponentCore.createComponent(project);
-        modList.add(targetComp);
-		addComponentToEARDataModel.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, modList);
-        
-		try {
-			addComponentToEARDataModel.getDefaultOperation().execute(null, null);
-		} catch (ExecutionException e) {
-			Logger.getLogger().log(e);
-		}
-            
-	}
-    
-    /*
-     * Determines whether project can be associated with earProject.
-     * @returns IStatus of OK if the project is a Web project, EJB project, or AppClient
-     * project that can be associated with the EAR project. 
-     * Returns IStatus with an ERROR severity if the project is a Web project, 
-     * EJB project, or AppClient project that cannot be associated with the EAR project. 
-     * When an IStatus of severity ERROR is returned, the IStatus' message will contain the 
-     * lowest J2EE level that this project requires on an EAR.
-     * Returns an IStatus with severity OK if project is not recognized as a Web, EJB, or
-     * AppClient project or if earProject is not recognized as an EAR project.
-     */
-    public static IStatus canAssociateProjectToEAR(IProject project, IProject earProject)
-    {
-      //If project contains the web, ejb, or appclient facet, and earProject contains the 
-      //ear facet, return whether or not the facet versions are such that the project
-      //can be added to the ear.      
-
-      IStatus status = Status.OK_STATUS;
-      boolean isWeb = isWebComponent(project);
-      boolean isEJB = isEJBComponent(project);
-      boolean isAppClient = isAppClientComponent(project);
-      boolean isEAR = isEARComponent(earProject);
-      if ((isWeb || isEJB || isAppClient) && isEAR)
-      {        
-        try
-        {
-          IFacetedProject fProject = ProjectFacetsManager.create(project);
-          IFacetedProject fEarProject = ProjectFacetsManager.create(earProject);
-          
-          IProjectFacet earPf = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_EAR_MODULE);
-          IProjectFacetVersion earPfv = fEarProject.getInstalledVersion(earPf);
-          String earVersion = earPfv.getVersionString();
-          
-          String webVersion = null;
-          String ejbVersion = null;
-          String acVersion = null;
-            
-          if (isWeb)
-          {
-            IProjectFacet webPf = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_WEB_MODULE);
-            IProjectFacetVersion webPfv = fProject.getInstalledVersion(webPf);
-            webVersion = webPfv.getVersionString();
-          }
-          else if (isEJB)            
-          {
-            IProjectFacet ejbPf = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_EJB_MODULE);
-            IProjectFacetVersion ejbPfv = fProject.getInstalledVersion(ejbPf);
-            ejbVersion = ejbPfv.getVersionString();
-          }
-          else if (isAppClient)
-          {
-            IProjectFacet acPf = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_APPCLIENT_MODULE);
-            IProjectFacetVersion acPfv = fProject.getInstalledVersion(acPf);
-            acVersion = acPfv.getVersionString();
-          } 
-          
-          if ((isWeb && webVersion.equals(J2EEVersionConstants.VERSION_2_2_TEXT)) ||
-              (isEJB && ejbVersion.equals(J2EEVersionConstants.VERSION_1_1_TEXT)) ||
-              (isAppClient && acVersion.equals(J2EEVersionConstants.VERSION_1_2_TEXT))
-              )
-          {
-            if (!greaterThanOrEqualTo(earVersion, J2EEVersionConstants.VERSION_1_2_TEXT))
-            {
-              status = StatusUtils.errorStatus(J2EEVersionConstants.VERSION_1_2_TEXT);
-            }            
-          }
-          else if ((isWeb && webVersion.equals(J2EEVersionConstants.VERSION_2_3_TEXT)) ||
-              (isEJB && ejbVersion.equals(J2EEVersionConstants.VERSION_2_0_TEXT)) ||
-              (isAppClient && acVersion.equals(J2EEVersionConstants.VERSION_1_3_TEXT))
-                )
-            {
-              if (!greaterThanOrEqualTo(earVersion, J2EEVersionConstants.VERSION_1_3_TEXT))
-              {
-                status = StatusUtils.errorStatus(J2EEVersionConstants.VERSION_1_3_TEXT);
-              }            
-            }          
-          else if ((isWeb && webVersion.equals(J2EEVersionConstants.VERSION_2_4_TEXT)) ||
-              (isEJB && ejbVersion.equals(J2EEVersionConstants.VERSION_2_1_TEXT)) ||
-              (isAppClient && acVersion.equals(J2EEVersionConstants.VERSION_1_4_TEXT))
-                )
-            {
-              if (!greaterThanOrEqualTo(earVersion, J2EEVersionConstants.VERSION_1_4_TEXT))
-              {
-                status = StatusUtils.errorStatus(J2EEVersionConstants.VERSION_1_4_TEXT);
-              }            
-            }                    
-        } catch (CoreException ce)
-        {
-          //If facet API throws a CoreException when trying to create an IFacetedProject from 
-          //an IProject, an OK Status will be returned and clients of this utility method
-          //won't raise a validation error.
-        }         
-      }
-
-      return status;
-    }
-
-	
-    /*
-     * @param versionA version number of the form 1.2.3
-     * @param versionA version number of the form 1.2.3
-     * @return boolean returns whether versionA is greater than or equal to versionB
-     */
-    private static boolean greaterThanOrEqualTo(String versionA, String versionB)
-    {
-      if (versionA.equals(versionB))
-      {
-        return true;
-      }
-      else
-      {
-        StringTokenizer stA = new StringTokenizer(versionA, ".");
-        StringTokenizer stB = new StringTokenizer(versionB, ".");
-
-        int sizeA = stA.countTokens();
-        int sizeB = stB.countTokens();
-
-        int size;
-        if (sizeA < sizeB)
-        {
-          size = sizeA;
-        } 
-        else
-          size = sizeB;
-
-        for (int i = 0; i < size; i++)
-        {
-          int a = Integer.parseInt(stA.nextToken());
-          int b = Integer.parseInt(stB.nextToken());
-          if (a != b)
-          {
-            return a > b;
-          }
-        }
-
-        return sizeA > sizeB;
-      }
-    }
-	
-	/**
-   * @param project
-   * @return
-   */
-	public static IPath getWebInfPath(IProject project){
-		
-		IVirtualComponent component = ComponentCore.createComponent(project);
-		IVirtualFolder webInfDir = component.getRootFolder().getFolder(new Path("/WEB-INF"));
-		IPath modulePath = webInfDir.getWorkspaceRelativePath();
-	
-		return modulePath;
-	}
-	
-	
-	/**
-	 * 
-	 * @param project
-	 * @return
-	 * 
-	 */
-	public static IPath getFirstWebContentPath(IProject project){
-		
-		IPath modulePath = null;
-		try {
-          IVirtualComponent vc = ComponentCore.createComponent(project);
-		  if (ModuleCoreNature.isFlexibleProject(project)) {
-            modulePath = vc.getRootFolder().getWorkspaceRelativePath();
-		  }
-		}
-		catch(Exception ex){}
-
-		return modulePath;			
-	}
-	
-	/**
-	 * @param project
-	 * @return
-	 */
-	public static IPath getWebContentPath(IProject project){
-		IVirtualComponent component = ComponentCore.createComponent(project);
-		IPath modulePath = component.getRootFolder().getWorkspaceRelativePath();
-		return modulePath;
-	}
-	
-	/**
-	 * 
-	 * @param project
-	 * @return
-	 * 
-	 */
-	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;
-	}
-	
-	/**
-	 * @param project
-	 * @return
-	 */
-	public static IContainer getWebContentContainer(IProject project){
-		IContainer container = null;
-		IPath modulePath = getWebContentPath(project);
-		IResource res = ResourceUtils.findResource(modulePath);
-		if (res instanceof IContainer){
-		  container = (IContainer)res;
-		}		
-		return container;
-	}
-	
-	
-	/**
-	 * Returns the first Module name 
-	 * @param project
-	 * @return
-	 * 
-	 */
-	public static String getFirstWebModuleName(IProject project){
-      String moduleName = null;
-      try {
-        IVirtualComponent vc = ComponentCore.createComponent(project);
-        moduleName = vc.getName();
-      }
-      catch(Exception ex){}
-  
-      return moduleName;  			
-	}
-	
-	
-	public static boolean isWebComponent(IVirtualComponent comp){
-	    return J2EEProjectUtilities.isDynamicWebProject(comp.getProject());
-  }
-	
-	public static boolean isEARComponent(IVirtualComponent comp){
-	    return J2EEProjectUtilities.isEARProject(comp.getProject());
-	}
-
-	/**
-	 * True if the component is a valid EJB component
-	 * @param project
-	 * @return
-	 */
-	public static boolean isEJBComponent(IProject project) {
-      IVirtualComponent vc = ComponentCore.createComponent(project);
-      if (vc != null)
-      {
-        return isEJBComponent(vc);
-      }
-      else
-      { 
-        return false;
-      }
-	}
-
-	public static boolean isEJBComponent(IVirtualComponent comp){
-		return J2EEProjectUtilities.isEJBProject(comp.getProject());
-	}	
-
-	public static boolean isAppClientComponent(IVirtualComponent comp){
-		return J2EEProjectUtilities.isApplicationClientProject(comp.getProject());
-	}
-	
-	public static boolean isJavaComponent(IVirtualComponent comp){
-		return J2EEProjectUtilities.isUtilityProject(comp.getProject());
-	}	
-	
-	public static String getComponentTypeId(IProject project) {
-		return J2EEProjectUtilities.getJ2EEProjectType(project);
-	}
-  
-	public static String[] toComponentNamesArray(IVirtualComponent[] components){
-		String[] ecNames = new String[components.length];
-		for(int i=0; i<components.length; i++){
-			ecNames[i] = components[i].getName();
-		}
-		return ecNames;		
-	}
-	
-	public static IProject[] toProjectArray(IVirtualComponent[] components){
-		IProject[] projects = new IProject[components.length];
-		for (int i=0; i<components.length; i++){
-			projects[i] = components[i].getProject();
-		}
-		return projects;
-	}
-	
-	/**
-	 * Given a J2EE level, this method returns the highest supported servlet level
-	 * @param j2eeLevel
-	 * @return web app version
-	 */
-	public static Integer getServletVersionForJ2EEVersion(String j2eeLevel){
-		int aVersion = Integer.valueOf(j2eeLevel).intValue();
-		switch (aVersion) {
-		case J2EEVersionConstants.J2EE_1_2_ID:
-			return new Integer(J2EEVersionConstants.WEB_2_2_ID);
-
-		case J2EEVersionConstants.J2EE_1_3_ID:
-			return new Integer(J2EEVersionConstants.WEB_2_3_ID);
-
-		case J2EEVersionConstants.J2EE_1_4_ID:
-			return new Integer(J2EEVersionConstants.WEB_2_4_ID);
-			
-		default:
-			return new Integer(J2EEVersionConstants.WEB_2_3_ID);
-		}		
-	}
-	
-	/**
-	 * Given a J2EE level, this method returns the highest supported EJB version
-	 * @param j2eeLevel
-	 * @return ejb spec version
-	 */
-	public static Integer getEJBVersionForJ2EEVersion(String j2eeLevel){
-		int aVersion = Integer.valueOf(j2eeLevel).intValue();
-		switch (aVersion) {
-		case J2EEVersionConstants.J2EE_1_2_ID:
-			return new Integer(J2EEVersionConstants.EJB_1_1_ID);
-
-		case J2EEVersionConstants.J2EE_1_3_ID:
-			return new Integer(J2EEVersionConstants.EJB_2_0_ID);
-
-		case J2EEVersionConstants.J2EE_1_4_ID:
-			return new Integer(J2EEVersionConstants.EJB_2_1_ID);
-			
-		default:
-			return new Integer(J2EEVersionConstants.EJB_2_0_ID);
-		}			
-	}
-
-	/**
-	 * True if the component is a valid Java component
-	 * @param project
-	 * @return
-	 */
-	public static boolean isJavaComponent(IProject project) {
-	  IVirtualComponent vc = ComponentCore.createComponent(project);
-      if (vc != null)
-      {
-	    return isJavaComponent(vc);
-      }
-      else
-      {
-        //check if it's a faceted project with only the Java facet.
-        try
-        {
-          if (project.exists())
-          {
-            IFacetedProject fProject = ProjectFacetsManager.create(project);
-            if (fProject != null)
-            {
-              Set facets = fProject.getProjectFacets();
-              if (facets.size()==1)
-              {
-                IProjectFacetVersion pfv = (IProjectFacetVersion)facets.iterator().next();
-                if (pfv.getProjectFacet().getId().equals(IModuleConstants.JST_JAVA))
-                {
-                  return true;
-                }
-              }                            
-            }
-            else
-            {
-              //This is not a faceted project. Check if this is a simple Java project.
-              IJavaProject javaProject = null;    
-              javaProject = JavaCore.create(project);    
-              if (javaProject != null)
-              {
-                return true;
-              }        
-            }
-          }
-        } catch (CoreException ce)
-        {
-          
-        }                        
-      }
-      
-      return false;
-	}
-
-	/**
-	 * True if the component is a valid Web component
-	 * @param project
-	 * @return
-	 */
-	public static boolean isWebComponent(IProject project) {
-	  IVirtualComponent vc = ComponentCore.createComponent(project);
-      if (vc != null)
-      {
-        return isWebComponent(vc);  
-      }
-      else
-      {
-        return false;
-      }	
-	}
-
-	/**
-	 * True if the component is a true Application client component
-	 * @param project
-	 * @return
-	 */
-	public static boolean isAppClientComponent(IProject project) {
-	  IVirtualComponent vc = ComponentCore.createComponent(project);
-      if (vc != null)
-      {
-	  return isAppClientComponent(vc);
-      }
-      else
-      {
-        return false;
-      }
-	}
-
-	/**
-	 * True is the component is a valid EAR component
-	 * @param project
-	 * @return
-	 */
-	public static boolean isEARComponent(IProject project){
-	  IVirtualComponent vc = ComponentCore.createComponent(project);
-      if (vc != null)
-      {
-	  return isEARComponent(vc);
-      }
-      else
-      {
-        return false;
-      }
-	}
-	
-	public static IFolder getOutputContainerRoot (IVirtualComponent component) {
-		return (IFolder)J2EEProjectUtilities.getOutputContainers(component.getProject())[0];
-	}
-	
-}
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 f883dd34c..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/JavaMOFUtils.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*******************************************************************************
- * Copyright (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.util.emf.workbench.nature.EMFNature;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jem.java.JavaVisibilityKind;
-import org.eclipse.jem.java.Method;
-
-/**
-* 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;
- 	}
-
-  /* 
-   * 
-   */
- /**
- * @param classQName Fully qualified classname (packageName + typeName)
- * @param project
- * @return
- * @throws CoreException
- */
-public static JavaClass getJavaClass(String classQName , IProject project) throws CoreException
- 	{
-	 	EMFNature jMOF = JemProjectUtilities.getJEM_EMF_Nature(project, true);
-	 	return (JavaClass)JavaRefFactory.eINSTANCE.reflectType(classQName,jMOF.getResourceSet());
- 	}
- 
- /**
- * @param packageName
- * @param typeName
- * @param project
- * @return
- * @throws CoreException
- */
-public static JavaClass getJavaClass(String packageName, String typeName , IProject project) throws CoreException
-	{
-	 	EMFNature jMOF = JemProjectUtilities.getJEM_EMF_Nature(project, true);
-	 	return (JavaClass)JavaRefFactory.eINSTANCE.reflectType(packageName, typeName, 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 d2fa7c314..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ResourceUtils.java
+++ /dev/null
@@ -1,1850 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.ArrayList;
-import java.util.Enumeration;
-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.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.IJavaElement;
-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.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.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;
-import org.eclipse.wst.common.environment.EnvironmentService;
-import org.eclipse.wst.common.environment.ILog;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IServer;
-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;
-
-	/**
-	 * 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_CLIENT_EJB_PROJECT_EXT = "EJBClient";
-	private static final String DEFAULT_EJB_PROJECT_NAME = "WebServiceEJBProject";
-    private static final String DEFAULT_EJB_COMPONENT_NAME = "WebServiceEJB";
-	private static final String DEFAULT_WEB_PROJECT_NAME = "WebServiceProject";
-    private static final String DEFAULT_WEB_COMPONENT_NAME = "WebServiceProject";
-	private static final String DEFAULT_ROUTER_PROJECT_EXT = "Router";
-
-	private static final String DEFAULT_SERVICE_EAR_PROJECT_NAME = "WebServiceProjectEAR";
-    private static final String DEFAULT_SERVICE_EAR_COMPONENT_NAME = "WebServiceProjectEAR";
-	private static final String DEFAULT_CLIENT_EAR_PROJECT_NAME = "WebServiceProjectClientEAR";
-    private static final String DEFAULT_CLIENT_EAR_COMPONENT_NAME = "WebServiceProjectClientEAR";
-
-	/**
-	 * 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.
-	 *         
-	 * @deprecated not used         
-	 */
-	public static IStatus validateName(String segment, int typeMask) {
-		return 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.
-	 * @deprecated not used 
-	 */
-	public static IStatus validatePath(String path, int typeMask) {
-		return 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.
-	 * @deprecated use JavaConventions in the jdt core 
-	 */
-	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.
-	 * 
-	 * @deprecated
-	 */
-	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 projectName = absolutePath.segment(0);
-				IProject project = getWorkspaceRoot().getProject(projectName);
-				if (projectName != null) {
-					return ComponentCore.createComponent(project);
-				}
-		}
-		return null;
-	}
-	
-	public static IVirtualComponent getComponentOf(IResource res)
-	{
-		IVirtualResource[] vresources = ComponentCore.createResources(res);
-		IVirtualComponent vcomp = null;
-		if (vresources != null && vresources.length>0)
-		{
-			IVirtualResource vres = vresources[0];
-			vcomp = vres.getComponent();
-		}
-		return vcomp;
-	}
-	
-	
-	/**
-	 * 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.
-   * 
-   * @deprecated
-	 */
-	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
-   * 
-   * @deprecated
-	 */
-	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.
-   * 
-   * @deprecated
-   * 
-	 */
-	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
-   * 
-   * @deprecated
-	 */
-	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.
-	 * 
-	 * @deprecated use getComponentType
-	 */ 
-	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;
-		}
-		return projectType;
-	}
-
-	/**
-	 * Returns the component type id as defined in IModuleConstants
-	 * i.e. IModuleConstants.JST_WEB_MODULE = "jst.web"
-	 * @param project
-	 * @return
-	 */
-	public static String getComponentType(IProject project){
-		return J2EEProjectUtilities.getJ2EEProjectType(project);
-	}
-	
-	/**
-	 * Returns the component type
-	 * @param component
-	 * @return
-	 */
-	public static String getComponentType(IVirtualComponent component){
-		return getComponentType(component.getProject());
-	}
-	
-	/**
-	 * 
-	 * @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.
-	 */
-	public static IModule getModule(IProject project) {
-	return ServerUtil.getModule(project);
-}
-	
-// Workaround for 113621 
-//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.
-	 * i.e. WP\.deployables\webModule\WEB-INF\classes
-	 * @param project
-	 *            The project.
-	 * @return The build output location of the <code>project</code> or null
-	 *         if the project has no Java nature.
-	 * @deprecated not used 
-	 */
-	public static IPath getJavaOutputLocation(IProject project) {
-		IPath outputLocation = null;
-		try {
-			IJavaProject javaProject = JavaCore.create(project);
-			if (javaProject != null) {
-				outputLocation = javaProject.getOutputLocation();
-			}
-		} catch (JavaModelException e) {
-		}
-		ILog log = EnvironmentService.getEclipseLog();
-		log.log(ILog.INFO, 5032, ResourceUtils.class, "getJavaOutputLocation",
-				"project=" + project + ",outputLocation=" + outputLocation);
-
-		return outputLocation;
-	}
-
-	/**
-	 * 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) {
-			}
-		}
-
-		ILog log = EnvironmentService.getEclipseLog();
-		log.log(ILog.INFO, 5030, ResourceUtils.class, "getJavaSourceLocation",
-				"project=" + project + ",sourceLocation=" + sourceLocation);
-		
-		return sourceLocation;
-	}
-
-	
-	/**
-	 * Returns the "JavaSource" folder
-	 * @param project
-	 * @return
-	 */
-    /*
-	public static IPath getJavaSourceLocation(IProject project){
-		IVirtualComponent component = ComponentCore.createComponent(project);
-		return getJavaSourceLocation(component);			
-	}
-	*/
-	/**
-	 * Returns the JavaSource location folder
-	 * @param comp
-	 * @return
-	 */
-	public static IPath getJavaSourceLocation(IVirtualComponent comp){
-		if (comp!=null){
-		   IVirtualFolder folder = comp.getRootFolder().getFolder(new Path("/WEB-INF/classes"));
-		   return folder.getWorkspaceRelativePath();
-		}
-		return null;
-	}
-	
-	/**
-	 * Returns the JavaSource locations in each project
-	 * @param project
-	 * @return
-	 */
-	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) {
-			}
-		}
-		return (IPath[]) pathVector.toArray(new Path[pathVector.size()]);
-	}
-
-	public static IPath[] getAllJavaSourceLocations(IVirtualComponent[] components) {
-
-		if (components!=null){
-			List javaSourcePaths = new ArrayList();
-			for (int i=0;i<components.length;i++){
-				IPath path = getJavaSourceLocation(components[i]);
-				javaSourcePaths.add(path);
-			}
-			return (IPath[])javaSourcePaths.toArray(new IPath[0]);
-		}
-		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) {
-		}
-		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];
-	}
-
-	/**
-	 * 
-	 * @param project
-	 * @return
-	 */
-	public static IFolder getWebComponentServerRoot(IProject project){
-		
-      IFolder webModuleServerRoot = null;
-      IVirtualComponent vc = ComponentCore.createComponent(project);
-      if (vc.exists())
-        webModuleServerRoot = J2EEUtils.getOutputContainerRoot(vc);
-
-	  return webModuleServerRoot;
-	}
-
-	/**
-	 * 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(..) which belongs in ServerUtils
-	 */
-	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);
-				}
-			}
-		}
-		
-		ILog log = EnvironmentService.getEclipseLog();
-		log.log(ILog.INFO, 5036, ResourceUtils.class, "getWebProjectURL",
-				"project=" + project + ",webProjectURL=" + webProjectURL);
-
-		return webProjectURL;
-	}
-	
-	/**
-	 * 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  not used
-	 */
-//	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(null);
-//  	          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);
-//  			}
-//  		}
-//  	}
-// 	ILog log = new EclipseLog();
-//    log.log(ILog.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.
-	 * @deprecated belongs in ServerUtils
-	 *
-	 */
-	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);
-				}
-			}
-		}
-		ILog log = EnvironmentService.getEclipseLog();
-		log.log(ILog.INFO, 5037, ResourceUtils.class, "getWebProjectURL",
-				"project=" + project + ",webProjectURL=" + webProjectURL);
-
-		return webProjectURL;
-	}
-
-	/**
-	 * 
-	 * @param project
-	 * @return
-	 * 
-	 * @deprecated should be in ServerUtils
-	 */
-	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;
-	}
-
-	/**
-	 * 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.
-	 * @deprecated not used
-	 */
-	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.
-	 * @deprecated not used
-	 */
-//	public static String getURLFromPath(IPath absolutePath,
-//			String serverFactoryId, IServer server) {
-//		return getURLFromPath(absolutePath, getWebProjectURL(
-//				getProjectOf(absolutePath), serverFactoryId, server));
-//	}
-
-	/**
-	 * 
-	 * @param absolutePath
-	 * @param webProjectURL
-	 * @return
-	 * @deprecated not used
-	 */
-//	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 = getWorkspaceRoot();
-//			url.append(getResourceURI(workspace.getFile(absolutePath)));
-//		}
-//		ILog log = new EclipseLog();
-//		log.log(ILog.INFO, 5038, ResourceUtils.class, "getURLFromPath",
-//				"absolutePath=" + absolutePath + ",url=" + url);
-//
-//		return url.toString();
-//	}
-
-	/**
-	 * 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) {
-			if (obj instanceof IResource) {
-				res = (IResource) obj;
-			} else if (obj instanceof IJavaElement) {
-				IJavaElement javaElement = (IJavaElement) obj;
-				res = javaElement.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.
-	 * 
-	 * @deprecated
-	 */
-	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 String[] getClientProjectComponentName(String projectName, String componentName, boolean isEJB)
-  {
-    String clientProjectName = null;
-    String clientComponentName = null;
-    if (isEJB)
-    {
-      clientProjectName = projectName + DEFAULT_CLIENT_EJB_PROJECT_EXT;
-      clientComponentName = componentName + DEFAULT_CLIENT_EJB_PROJECT_EXT;
-    }
-    else
-    {
-      clientProjectName = projectName + DEFAULT_CLIENT_WEB_PROJECT_EXT;
-//      String baseName = clientProjectName;
-      clientComponentName = componentName + DEFAULT_CLIENT_WEB_PROJECT_EXT;
-//      String baseCompName = clientComponentName;
-    }
-    
-    //TODO we may want to remove this if statement once defect 103366 is resolved.
-    //TODO:  Defect 107997 - Revisit prject and module creation logic
-//    if( !FlexibleJavaProjectPreferenceUtil.getMultipleModulesPerProjectProp() )
-//    {
-//      clientComponentName = clientProjectName;	
-//    }
-    
-//    boolean  foundWebProject     = false;
-//    int      i                   = 1;
-//    
-//    while (!foundWebProject) 
-//    {
-//      IPath projectPath = new Path(clientProjectName).makeAbsolute();
-//      IProject project = ResourceUtils.getProjectOf(projectPath);
-//      
-//      if (project.exists()) 
-//      {
-//        clientProjectName = baseName + i;
-//        clientComponentName = baseCompName + i;
-//        i++;
-//      }
-//      else 
-//      {
-//        foundWebProject = true;
-//      }
-//    }
-    
-    return new String[]{clientProjectName, clientComponentName};
-  }
-  
-    /**
-     * 
-     * @param typeID
-     * @return
-     * 
-     * @deprecated
-     */
-	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 getDefaultEJBComponentName() {
-    return DEFAULT_EJB_COMPONENT_NAME;
-  }  
-
-	public static String getDefaultWebProjectName() {
-		return DEFAULT_WEB_PROJECT_NAME;
-	}
-  
-  public static String getDefaultWebComponentName() {
-    return DEFAULT_WEB_COMPONENT_NAME;
-  }
-
-  public static String getDefaultClientExtension() {
-    return DEFAULT_CLIENT_WEB_PROJECT_EXT;
-  }
-  
-	/**
-	 * 
-	 * @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 getDefaultServiceEARComponentName() {
-    return DEFAULT_SERVICE_EAR_COMPONENT_NAME;
-  }
-
-	public static String getDefaultClientEARProjectName() {
-		return DEFAULT_CLIENT_EAR_PROJECT_NAME;
-	}
-
-  public static String getDefaultClientEARComponentName() {
-    return DEFAULT_CLIENT_EAR_COMPONENT_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 7c77dabbc..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/SelectionToResource.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-
-public class SelectionToResource implements Transformer
-{
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.internal.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 cdbd63607..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ServerUtils.java
+++ /dev/null
@@ -1,782 +0,0 @@
-/*******************************************************************************
- * Copyright (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
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060204  124408   rsinha@ca.ibm.com - Rupam Kuehner          
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.common;
-
-import java.io.IOException;
-import java.net.URL;
-import java.net.URLEncoder;
-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.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.servertarget.IServerTargetConstants;
-import org.eclipse.jst.ws.internal.WSPluginMessages;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IRuntime;
-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.IServerWorkingCopy;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.model.IURLProvider;
-
-/**
- * This class contains useful methods for working with Server plugin functions
- */
-public final class ServerUtils {
-
-	private Hashtable serverIdToLabel_;
-
-	private Hashtable serverLabelToId_;
-
-	private static ServerUtils instance_;
-
-	public static ServerUtils getInstance() {
-		if (instance_ == null) {
-			instance_ = new ServerUtils();
-		}
-		return instance_;
-
-	}
-
-	public ServerUtils() {
-	}
-
-	// 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 IStatus modifyModules(IEnvironment env, IServer server,
-			IModule module, boolean add, IProgressMonitor monitor) {
-
-		IServerWorkingCopy wc = null;
-		IStatus status = Status.OK_STATUS;
-    
-		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 exc ) 
-    {
-			status = StatusUtils.errorStatus( WSPluginMessages.MSG_ERROR_SERVER, exc );
-			env.getStatusHandler().reportError(status);
-			return status;
-		} finally {
-			if (wc != null) {
-				// Always saveAll and release the serverWorkingCopy
-				try 
-        {
-					wc.saveAll(true, monitor);
-				} 
-        catch (CoreException exc ) 
-        {
-					status = StatusUtils.errorStatus( WSPluginMessages.MSG_ERROR_SERVER, exc );
-					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;
-		}
-	}
-
-	/**
-	 * 
-	 * @param env
-	 * @param module
-	 * @param serverTypeId
-	 * @param monitor
-	 * @return
-	 * 
-	 * @deprecated
-	 */
-	public IServer createServer(IEnvironment 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) 
-      {
-				IStatus status = StatusUtils.errorStatus( WSPluginMessages.MSG_ERROR_SERVER, 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) 
-    {
-			IStatus status = StatusUtils.errorStatus( WSPluginMessages.MSG_ERROR_SERVER, e);
-			env.getStatusHandler().reportError(status);
-			return null;
-		} finally {
-			try {
-				if (serverWC != null) {
-					serverWC.saveAll(true, monitor);
-				}
-			} catch (CoreException ce) {
-				IStatus status = StatusUtils.errorStatus( WSPluginMessages.MSG_ERROR_SERVER, 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
-	 * 
-	 * @deprecated
-	 */
-	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) {
-		IProject project = component.getProject();
-		String[] serverIds = null;
-
-		if (project != null) {
-			IServer[] servers = ServerUtil.getServersByModule(getModule(project), null);
-			if (servers != null) {
-				serverIds = new String[servers.length];
-
-				for (int index = 0; index < servers.length; index++) {
-					serverIds[index] = servers[index].getId();
-
-				}
-			}
-		}
-
-		if (serverIds == null) {
-			serverIds = new String[0];
-		}
-
-		return serverIds;
-	}
-
-	/**
-	 * @param project
-	 * @return
-	 * @deprecated should be using getServerTypeIdsByModule( IVirtualComponent )
-	 */
-	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 IModule getModule(IProject project) {
-	return ServerUtil.getModule(project);
-}
-	
-// Workaround for 113621
-//public static IModule getModule(IProject project) {
-//	IModule[] modules = ServerUtil.getModules(project);
-//	if (modules!=null && modules.length!=0) {
-//		return modules[0];
-//	}
-//	return null;
-//}
-  
-	/**
-	 * Returns the URL string corresponding to the web server module root of the
-	 * component 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 getWebComponentURL(IProject project, String serverFactoryId) {
-		String webProjectURL = null;
-		IModule module = getModule(project);
-		if (module != null) {
-			IServer serverInstance = getServerForModule(module);
-			if (serverInstance != null) {
-				IURLProvider urlProvider = (IURLProvider) serverInstance.loadAdapter(IURLProvider.class, null);
-				if (urlProvider!=null) {
-					URL url = urlProvider.getModuleRootURL(module);
-					if (url != null) {
-						String s = url.toString();
-						webProjectURL = (s.endsWith("/") ? s.substring(0, s.length() - 1) : s);
-					}
-				}
-			}
-			else {
-				//IRuntime projectTarget = ServerCore.getProjectProperties(project).getRuntimeTarget();
-                IServerType serverType = ServerCore.findServerType(serverFactoryId);               
-				if (serverType!=null)
-				{
-					try {
-                        //Choose a Runtime which is not a stub
-                        IRuntime nonStubRuntime = null;
-                        IRuntime[] runtimes = ServerUtil.getRuntimes(null, null);
-                        String serverRuntimeTypeId = serverType.getRuntimeType().getId();
-                        for (int i = 0; i < runtimes.length; i++) {
-                            IRuntime runtime = runtimes[i];
-                            String thisRuntimeTypeId = runtime.getRuntimeType().getId();
-                            if (thisRuntimeTypeId.equals(serverRuntimeTypeId) && !runtime.isStub()) {
-                                //Found an appropriate IRuntime that is not a stub
-                                nonStubRuntime = runtime;
-                                break;
-                            }
-                        }
-                        
-                        if (nonStubRuntime != null)
-                        {
-					      IServerWorkingCopy serverWC = serverType.createServer(null, null, nonStubRuntime, null);
-						  IURLProvider urlProvider = (IURLProvider) serverWC.loadAdapter(IURLProvider.class, null);
-						  if (urlProvider!=null) {
-						     URL url = urlProvider.getModuleRootURL(module);							
-							 if (url != null) {
-								String s = url.toString();
-								webProjectURL = (s.endsWith("/") ? s.substring(0, s.length() - 1) : s);
-							 }				
-						  }
-                        }
-
-					} catch(CoreException ce){
-                        Logger.getLogger().log(ce);
-					}
-					
-				}
-			}
-		}
-		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 getWebComponentURL(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) {
-                IURLProvider urlProvider = (IURLProvider) serverInstance.loadAdapter(IURLProvider.class, null);
-                if (urlProvider!=null) {
-                    URL url = urlProvider.getModuleRootURL(module);              
-					if (url != null) {
-					  String s = url.toString();
-					  webProjectURL = (s.endsWith("/") ? s.substring(0, s.length() - 1) : s);
-                    }
-				}
-			}
-		}
-		return webProjectURL;
-	}
-
-	public static String getEncodedWebComponentURL(IProject project, String serverFactoryId) {
-		String url = getWebComponentURL(project, serverFactoryId);
-		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 IServer getDefaultExistingServer(IVirtualComponent component) {
-		IProject project = component.getProject();
-		IModule module = getModule(project);
-		IServer preferredServer = ServerCore.getDefaultServer(module);
-		if (preferredServer != null)
-			return preferredServer;
-		
-		IServer[] configuredServers = ServerUtil.getServersByModule(module,
-				null);
-
-		if (configuredServers != null && configuredServers.length > 0) {
-			preferredServer = configuredServers[0];
-		} else {
-			IServer[] nonConfiguredServers = ServerUtil
-					.getAvailableServersForModule(module, false, null);
-
-			if (nonConfiguredServers != null
-					&& nonConfiguredServers.length > 0) {
-				preferredServer = nonConfiguredServers[0];
-			}
-		}
-
-		return preferredServer;
-	}
-
-	/**
-	 * @param project
-	 * @return
-	 * @deprecated should be using getDefaultExistingServer( IVirtualComponent )
-	 */
-	public static IServer getDefaultExistingServer(IProject project) {
-    
-      IModule module = ServerUtil.getModule(project);
-      IServer preferredServer = null;
-      preferredServer = ServerCore.getDefaultServer(module);
-		
-// Workaround for 113621
-//		IModule[] modules = ServerUtil.getModules(project);
-//      IServer preferredServer = null;
-//      if (modules.length > 0){
-//        preferredServer = ServerCore.getDefaultServer(modules[0]);
-//      }
-  
-		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 = Arrays.asList(ServerUtil.getRuntimes(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) && !runtime.isStub()) {
-				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 "";
-	}
-	
-	public static String getFactoryIdFromRuntimeTargetId(String runtimeTargetId){
-		IServerType[] serverTypes = ServerCore.getServerTypes();
-		for (int i=0;i<serverTypes.length;i++) {
-			IRuntimeType runtimeTyp = serverTypes[i].getRuntimeType();
-			if (runtimeTyp!=null){
-				if (runtimeTyp.getId().equals(runtimeTargetId))
-					return serverTypes[i].getId();
-			}
-		}
-		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 = IModuleConstants.JST_EAR_MODULE;
-		String stJ2EEVersion = ServerUtils.getServerTargetJ2EEVersion(j2eeVersion);
-        List runtimes = Arrays.asList(ServerUtil.getRuntimes(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 = Arrays.asList(ServerUtil.getRuntimes(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) {
-
-		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;
-		}
-	}
-	
-	//Converts a module type from J2EEUtils to a module type like
-	//the one in IServerTargetConstants.
-	public static String getServerTargetModuleType(int moduleType)
-	{
-		switch (moduleType)
-    {
-    case J2EEUtils.WEB :
-      return IServerTargetConstants.WEB_TYPE;
-    case J2EEUtils.EJB :
-      return IServerTargetConstants.EJB_TYPE;
-    case J2EEUtils.APPCLIENT :
-      return IServerTargetConstants.APP_CLIENT_TYPE;
-    case J2EEUtils.EAR :
-      return IServerTargetConstants.EAR_TYPE;
-    default:
-      return null;
-      
-    }      			
-	}
-    
-  /*
-   * Returns a non-stub runtime if one is available for the the given server type.
-   * @param serverFactoryId - server type id
-   * @returns IRuntime Returns a non-stub runtime if one is available for the the given server type.
-   * Returns null otherwise.
-   */
-  public static IRuntime getNonStubRuntime(String serverFactoryId)
-  {
-    //Find a Runtime which is not a stub
-    IServerType serverType = ServerCore.findServerType(serverFactoryId);
-    IRuntime nonStubRuntime = null;
-    if (serverType != null)
-    {
-      //boolean foundNonStubRuntime = false;
-      IRuntime[] runtimes = ServerUtil.getRuntimes(null, null);
-      String serverRuntimeTypeId = serverType.getRuntimeType().getId();
-      for (int i = 0; i < runtimes.length; i++)
-      {
-        IRuntime runtime = runtimes[i];
-        String thisRuntimeTypeId = runtime.getRuntimeType().getId();
-        if (thisRuntimeTypeId.equals(serverRuntimeTypeId) && !runtime.isStub())
-        {
-          // Found an appropriate IRuntime that is not a stub
-          //foundNonStubRuntime = true;
-          nonStubRuntime = runtime;
-          break;
-        }
-      }
-    }
-    
-    return nonStubRuntime;
-  }
-}
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 1111d76c7..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StatusObjectHandler.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.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/String2PathTransformer.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/String2PathTransformer.java
deleted file mode 100644
index da7e1da65..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/String2PathTransformer.java
+++ /dev/null
@@ -1,32 +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.common;
-
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-
-/**
- * 
- * Transforms a input String to a Path
- * 
- * @author joan
- *
- */
-
-public class String2PathTransformer implements Transformer {
-	
-	public Object transform(Object value) {				 
-		Path path = new Path(value.toString());
-		return path;		 
-	}
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/String2SelectionTransformer.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/String2SelectionTransformer.java
deleted file mode 100644
index 2e0ef4bd0..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/String2SelectionTransformer.java
+++ /dev/null
@@ -1,88 +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.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EJBResource;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit;
-import org.eclipse.jst.ws.internal.WSPluginMessages;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-/**
- * Transforms a string value representing a workspace resource path into a StructuredSelection object
- * 
- * @author joan
- *
- */
-
-public class String2SelectionTransformer implements Transformer {
-
-	public Object transform(Object value) {
-		
-		StructuredSelection selection = null;
-		IResource resource = FileResourceUtils.getWorkspaceRoot().findMember(new Path(value.toString()));
-		if (resource != null)
-		{
-			IProject resProject = resource.getProject();			
-			// check if resource is part of an EJB
-			if (J2EEUtils.isEJBComponent(resProject))
-			{
-				// if resource is part of EJB need to get the EnterpriseBean as the selection
-				IVirtualComponent[] ejbComponents = J2EEUtils.getEJBComponents(resProject);
-				EJBArtifactEdit  ejbEdit = null;			
-				try{				
-					ejbEdit = EJBArtifactEdit.getEJBArtifactEditForRead(ejbComponents[0]);				
-		            EJBResource ejbRes = ejbEdit.getEJBJarXmiResource();
-		            EJBJar ejbJar = ejbRes.getEJBJar();	            
-		            IPath path = resource.getFullPath();
-		            String resourcePath = ResourceUtils.getJavaResourcePackageName(path);
-		            String javaClassName = resource.getName();
-		            // strip off file extension if necessary
-		            if (javaClassName.lastIndexOf('.')>-1)
-		            {	
-		              javaClassName = javaClassName.substring(0, javaClassName.lastIndexOf('.'));	              
-		            } 
-		            JavaClass javaClass = JavaMOFUtils.getJavaClass(resourcePath, javaClassName, resProject);
-		            EnterpriseBean ejb = ejbJar.getEnterpriseBeanWithReference(javaClass);
-		            if (ejb != null)
-		            {
-		            	selection = new StructuredSelection(ejb.getName());	
-		            }
-				}
-				catch (Exception exc)
-				{
-					
-				}
-				finally {
-		              if (ejbEdit!=null)
-		                ejbEdit.dispose();
-		        }
-			}
-			selection = new StructuredSelection(resource);			
-		}
-		else
-		{
-			// string doesn't return resource - error condition
-			throw new IllegalArgumentException(WSPluginMessages.ERROR_SELECTION_TRANSFORM);
-		}
-		return selection;
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/String2TestFacilityListTransformer.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/String2TestFacilityListTransformer.java
deleted file mode 100644
index b8596054b..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/String2TestFacilityListTransformer.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.jst.ws.internal.common;
-
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-import org.eclipse.wst.command.internal.env.core.selection.SelectionList;
-
-public class String2TestFacilityListTransformer implements Transformer {
-
-	public Object transform(Object value) {
-		String testFacility = (String)value;
-		//value represents name of a test facility
-		//pick up list of test facilities
-		String[] testTypes = WebServicePlugin.getInstance().getScenarioContext().getWebServiceTestTypes();        	
-		
-		int index = 0;
-		//match value to name of test facility and set index accordingly
-		for (int i = 0; i < testTypes.length; i++) {
-			if (testTypes[i].equals(testFacility))
-			{		
-				break;
-			}			
-			index++;
-		}
-		
-		SelectionList selectionList = new SelectionList(testTypes, index);		
-		return selectionList;
-	}
-}
-
-
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/String2TypeRuntimeServerModifier.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/String2TypeRuntimeServerModifier.java
deleted file mode 100644
index adb3c62ff..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/String2TypeRuntimeServerModifier.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.jst.ws.internal.common;
-
-import java.util.Map;
-
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.env.core.data.BeanModifier;
-
-public class String2TypeRuntimeServerModifier implements BeanModifier {
-
-	private String SERVICE_RT_ID_KEY = "Service.RuntimeId";  //$NON-NLS-N$
-	private String RUNTIME_ID = "RuntimeId";  //$NON-NLS-N$
-	private String SERVICE_SRV_ID_KEY = "Service.ServerId";  //$NON-NLS-N$
-	private String SERVER_ID = "ServerId";  //$NON-NLS-N$
-	private String SERVICE_PREFIX = "Service.";  //$NON-NLS-N$
-	private String CLIENT_PREFIX = "Client.";  //$NON-NLS-N$
-	
-	/**
-	 * Modifies the supplied TypeRuntimeServer bean with properties in holder.
-	 * If the bean is null, construct a new one and set its properties.
-	 * @param bean TypeRuntimeServer bean to be modified
-	 * @param holder Map containing values for TypeRuntimeServer properties 
-	 * @return TypeRuntimeServer with properties set
-	 */
-	public void modify(Object bean, Object holder) {
-		
-		TypeRuntimeServer types = null;
-		if (bean == null || !(bean instanceof TypeRuntimeServer))
-		{
-			types = new TypeRuntimeServer();			
-		}
-		else
-		{
-			types = (TypeRuntimeServer)bean;
-		}
-		
-		if (holder instanceof Map)
-		{	
-			Map typesMap = (Map)holder;
-			String prefix = "";
-			
-			
-			if (typesMap.containsKey(SERVICE_RT_ID_KEY)||typesMap.containsKey(SERVICE_SRV_ID_KEY))
-			{
-				prefix = SERVICE_PREFIX;
-			}			  	
-			else
-			{
-				prefix = CLIENT_PREFIX;
-			}
-			
-			String runtimeID = (String)typesMap.get(prefix+RUNTIME_ID);
-			if (runtimeID != null)
-				types.setRuntimeId(runtimeID);		
-			
-			String serverID = (String)typesMap.get(prefix+SERVER_ID);
-			if (serverID  != null)				
-				types.setServerId(serverID);			
-		}
-  }
-
-	
-}
-
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 92efc3b17..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StringToIProjectTransformer.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (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.ResourcesPlugin;
-import org.eclipse.wst.command.internal.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.internal.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)
-  {
-	String project     = (String)value;
-	int    slashIndex  = project.indexOf( '/' );
-	String projectName = project;
-	
-	if( slashIndex != -1 )
-	{
-	  projectName = project.substring( 0, slashIndex );
-	}
-	
-    return ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
-  }
-}
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 0c4bd2dc9..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StringUtils.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.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/PersistentScenarioContext.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/PersistentScenarioContext.java
deleted file mode 100644
index e5ae338fd..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/PersistentScenarioContext.java
+++ /dev/null
@@ -1,330 +0,0 @@
-/*******************************************************************************
- * Copyright (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.Enumeration;
-import java.util.StringTokenizer;
-import java.util.Vector;
-
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestExtension;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestRegistry;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.internal.env.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_INSTALL_WEBSERVICE, defaults.installWebserviceDefault() );
-    setDefaultBooleanIfNoDefault(PREFERENCE_INSTALL_CLIENT, defaults.installClientDefault() );
-    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();
-    Vector newTestCases = new Vector();
-	for (int i = 0; i < testTypes.length; i++)
-    {
-      WebServiceTestExtension wse = (WebServiceTestExtension) registry
-          .getWebServiceExtensionsByName(testTypes[i]);
-      if (wse.testWSDL()) 
-		  newTestCases.addElement(testTypes[i]);
-    }
-	String[] wsdlTestArray = new String[newTestCases.size()];
-	Enumeration e = newTestCases.elements();
-	int i = 0;
-	while(e.hasMoreElements()){
-	  wsdlTestArray[i] = (String)e.nextElement();
-	  i++;
-	}
-	
-	return wsdlTestArray;
-  }
-  
-  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#getInstallWebService()
-   */
-  public boolean getInstallWebService()
-  {
-    return getValueAsBoolean(PREFERENCE_INSTALL_WEBSERVICE);
-  }
-  
-  public boolean getInstallWebServiceDefault()
-  {
-    return getDefaultBoolean(PREFERENCE_INSTALL_WEBSERVICE);
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getInstallWebService()
-   */
-  public boolean getInstallClient()
-  {
-    return getValueAsBoolean(PREFERENCE_INSTALL_CLIENT);
-  }
-  
-  public boolean getInstallClientDefault()
-  {
-    return getDefaultBoolean(PREFERENCE_INSTALL_CLIENT);
-  }
-  
-  /* (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#setInstallWebService(boolean)
-   */
-  public void setInstallWebService(boolean value)
-  {
-    setValue( PREFERENCE_INSTALL_WEBSERVICE, value);
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setInstallWebService(boolean)
-   */
-  public void setInstallClient(boolean value)
-  {
-    setValue( PREFERENCE_INSTALL_CLIENT, 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 f5888125b..000000000
--- 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.internal.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/ScenarioContext.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ScenarioContext.java
deleted file mode 100644
index a5c07f047..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ScenarioContext.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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_INSTALL_WEBSERVICE = "installWebService";
-  
-  public final String PREFERENCE_INSTALL_CLIENT = "installClient";
-  
-  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 getInstallWebService();
-  public boolean getInstallWebServiceDefault();
-  public void    setInstallWebService( boolean value );
-  
-  public boolean getInstallClient();
-  public boolean getInstallClientDefault();
-  public void    setInstallClient( boolean 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 cf4c3149e..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ScenarioDefaults.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 "0/org.eclipse.jst.ws.wsImpl.java";
-  }
-  
-  public boolean startWebserviceDefault()
-  {
-    return true;
-  }
-  
-  public boolean installWebserviceDefault()
-  {
-    return true;
-  }
-  
-  public boolean installClientDefault()
-  {
-    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/TransientScenarioContext.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/TransientScenarioContext.java
deleted file mode 100644
index 43f589d75..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/TransientScenarioContext.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/*******************************************************************************
- * Copyright (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  installWebService_;
-  private boolean  installClient_;
-  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.setInstallWebService( getInstallWebService() );
-	context.setInstallClient( getInstallClient() );
-	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#getInstallWebService()
-   */
-  public boolean getInstallWebService()
-  {
-    return installWebService_;
-  }
-  
-  public boolean getInstallWebServiceDefault(){ return defaults.installWebserviceDefault(); }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getInstallWebService()
-   */
-  public boolean getInstallClient()
-  {
-    return installClient_;
-  }
-  
-  public boolean getInstallClientDefault(){ return defaults.installClientDefault(); }
-  
-  
-  
-  /* (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#setInstallWebService(boolean)
-   */
-  public void setInstallWebService(boolean value)
-  {
-    installWebService_ = value;
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setInstallWebService(boolean)
-   */
-  public void setInstallClient(boolean value)
-  {
-    installClient_ = 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 a24addb41..000000000
--- 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 39eba91a8..000000000
--- 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 4bd0f64e4..000000000
--- 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 4dc349d16..000000000
--- 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 5831b233a..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/dialog/IStatusDialogConstants.java
+++ /dev/null
@@ -1,40 +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;
-
-/**
-* Constants for status dialogs
-*/
-public interface IStatusDialogConstants {
-
-  /*
-  * 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;
-
-}
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 9660fbb82..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExecutable.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.ext;
-
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
-* 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 AbstractDataModelOperation 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 4332d0a74..000000000
--- 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 Object 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 7d9d92fe5..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionImpl.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.jst.ws.internal.ext;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.wst.common.environment.EnvironmentService;
-import org.eclipse.wst.common.environment.ILog;
-
-
-
-
-
-/**
-* 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 ILog	log_;
-	
-  /*
-  * The ConfigElement that holds extension info
-  */
-  protected IConfigurationElement configElement_;
-
-  /*
-  * The extension executable 
-  */
-  protected WebServiceExecutable webServiceExecutable_;
-  
-
-  public WebServiceExtensionImpl(IConfigurationElement configElement)
-  {
-    configElement_ = configElement;
-    log_ = EnvironmentService.getEclipseLog();
-  }
-
-  // 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 Object getWebServiceExecutableExtension()
-  {
-    if(webServiceExecutable_ != null) return webServiceExecutable_;
-
-    try{
-      return configElement_.createExecutableExtension("class");
-    }catch (CoreException e){
-      log_.log(ILog.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 afc1d0721..000000000
--- 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 5a9456f83..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionRegistryImpl.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.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 label = elem.getAttribute( "label" );
-      String id =   elem.getAttribute( "id" );      
-      WebServiceExtension webServiceExtension = createWebServiceExtension(elem);	
-      nameExtensionTable_.put(label,webServiceExtension);
-      label_.add(label);
-      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/test/JavaProxyTestCommand.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/JavaProxyTestCommand.java
deleted file mode 100644
index 4eae34196..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/JavaProxyTestCommand.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2002 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.wst.command.internal.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 1b29e53d4..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WSDLTestFinishCommand.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2002 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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;
-
-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 76f7d777d..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestExtension.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.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 testWSDL()
-  {
-  	String wsdl = getConfigElement().getAttribute( "testWSDL" );
-    if(wsdl.equals("yes") || wsdl.equals("true"))
-	  return true;
-	 
-	return false;  
-  }
-  	
-  
-}
-
-
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 74193670b..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestFinishCommand.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2002 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 java.util.List;
-import org.eclipse.wst.server.core.IServer;
-
-public interface WebServiceTestFinishCommand 
-{
-
-  /**
-   * 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 310e3d55c..000000000
--- 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",
-                                     "tester");
-    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 6ebdb3e35..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/plugin/WebServicePlugin.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.plugin;
-
-import java.text.MessageFormat;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jst.ws.internal.context.PersistentScenarioContext;
-import org.eclipse.jst.ws.internal.context.PersistentUDDIPreferenceContext;
-import org.eclipse.jst.ws.internal.context.ScenarioContext;
-import org.eclipse.jst.ws.internal.context.UDDIPreferenceContext;
-import org.eclipse.wst.command.internal.env.context.PersistentResourceContext;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-
-
-/**
-* 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 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() 
-  {
-  		((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 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.wst.command.env.core/.classpath b/bundles/org.eclipse.wst.command.env.core/.classpath
deleted file mode 100644
index 751c8f2e5..000000000
--- a/bundles/org.eclipse.wst.command.env.core/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.wst.command.env.core/.cvsignore b/bundles/org.eclipse.wst.command.env.core/.cvsignore
deleted file mode 100644
index b46ce701c..000000000
--- a/bundles/org.eclipse.wst.command.env.core/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-build.xml
-runtime
-temp.folder
-envcore.jar
-@dot
-src.zip
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 6327deaaa..000000000
--- 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/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.wst.command.env.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index eede846b0..000000000
--- a/bundles/org.eclipse.wst.command.env.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,57 +0,0 @@
-#Mon Jan 30 10:37:21 EST 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/bundles/org.eclipse.wst.command.env.core/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.wst.command.env.core/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 1d7a235d2..000000000
--- a/bundles/org.eclipse.wst.command.env.core/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Jan 30 10:40:34 EST 2006
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.wst.command.env.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.command.env.core/META-INF/MANIFEST.MF
deleted file mode 100644
index b224dbcf7..000000000
--- a/bundles/org.eclipse.wst.command.env.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.wst.command.env.core
-Bundle-Version: 1.0.1.qualifier
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.command.internal.env.core.data,
- org.eclipse.wst.command.internal.env.core.fragment,
- org.eclipse.wst.command.internal.env.core.registry,
- org.eclipse.wst.command.internal.env.core,
- org.eclipse.wst.command.internal.env.core.common,
- org.eclipse.wst.command.internal.env.core.context,
- org.eclipse.wst.command.internal.env.core.selection,
- org.eclipse.wst.command.internal.env.core.uri
-Require-Bundle: org.eclipse.wst.common.frameworks,
- org.eclipse.core.commands,
- org.eclipse.core.runtime,
- org.eclipse.wst.common.environment
diff --git a/bundles/org.eclipse.wst.command.env.core/about.html b/bundles/org.eclipse.wst.command.env.core/about.html
deleted file mode 100644
index 6f6b96c4c..000000000
--- a/bundles/org.eclipse.wst.command.env.core/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.command.env.core/build.properties b/bundles/org.eclipse.wst.command.env.core/build.properties
deleted file mode 100644
index 443347a94..000000000
--- a/bundles/org.eclipse.wst.command.env.core/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-bin.includes = plugin.xml,\
-               *.jar,\
-               .,\
-               META-INF/,\
-               plugin.properties,\
-               about.html
-src.includes = component.xml
-source.. = src/
-output.. = bin/
-
diff --git a/bundles/org.eclipse.wst.command.env.core/component.xml b/bundles/org.eclipse.wst.command.env.core/component.xml
deleted file mode 100644
index 7c458f7de..000000000
--- 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 c71709d6d..000000000
--- 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/src/org/eclipse/wst/command/internal/env/core/CommandFactory.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/CommandFactory.java
deleted file mode 100644
index 0957e6ded..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/CommandFactory.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core;
-
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
- * This interface is used to create Command objects.
- *
- */
-public interface CommandFactory 
-{
-  /**
-   * 
-   * @return returns a created Command object.
-   */
-  public AbstractDataModelOperation create();
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/CommandManager.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/CommandManager.java
deleted file mode 100644
index 19da21946..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/CommandManager.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core;
-
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-
-/**
- * CommandManagers help manage the lifecycle of Commands.
- */
-public interface CommandManager
-{
-  /**
-   * Returns true if this CommandManager is capable of undoing
-   * Commands. Some CommandManagers and Environments may be of
-   * a sort that will never undo() Commands. Command.execute()
-   * methods should take advantage of this method to optimize
-   * out any caching logic whenever this method returns false.
-   */
-  public boolean isUndoEnabled ();
-
-  // There's probably more, like factory methods for creating
-  // Undo/Redo stacks and stuff like that.
-  
-  public DataMappingRegistry getMappingRegistry();
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/EnvironmentCore.properties b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/EnvironmentCore.properties
deleted file mode 100644
index 429c18eaa..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/EnvironmentCore.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
-###############################################################################
-
-#
-# Common Messages
-#
-MSG_ERROR_UNEXPECTED_ERROR=IWAB0014E Unexpected exception occured.
-
-TITLE_WARNING=Warning:
-TITLE_ERROR=Error:
-TITLE_INFO=Info:
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/EnvironmentCoreMessages.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/EnvironmentCoreMessages.java
deleted file mode 100644
index 94581af68..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/EnvironmentCoreMessages.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class EnvironmentCoreMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.wst.command.internal.env.core.EnvironmentCore";//$NON-NLS-1$
-
-	private EnvironmentCoreMessages() {
-		// Do not instantiate
-	}
-
-	public static String MSG_ERROR_UNEXPECTED_ERROR;
-	public static String TITLE_WARNING;
-	public static String TITLE_ERROR;
-	public static String TITLE_INFO;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, EnvironmentCoreMessages.class);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/ICommandFactory.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/ICommandFactory.java
deleted file mode 100644
index 182a28b10..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/ICommandFactory.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.command.internal.env.core;
-
-import java.util.Iterator;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-/**
- * 
- * This class is used to return a sequence of Commands.
- *
- */
-public interface ICommandFactory extends Iterator 
-{
-  /**
-   * 
-   * @return returns the next Command in the sequence.
-   */
-  public AbstractDataModelOperation getNextCommand();
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/SimpleCommandFactory.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/SimpleCommandFactory.java
deleted file mode 100644
index 75fdc4a52..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/SimpleCommandFactory.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.command.internal.env.core;
-
-import java.util.Vector;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-public class SimpleCommandFactory implements ICommandFactory 
-{
-    private Vector commands_;
-	private int    index_;
-	
-	public SimpleCommandFactory( Vector commands )
-	{
-	  commands_ = commands;
-	  index_    = 0;
-	}
-	
-	public AbstractDataModelOperation getNextCommand() 
-	{
-		return (AbstractDataModelOperation)next();
-	}
-
-	public void remove() 
-	{
-      throw new UnsupportedOperationException();
-	}
-
-	public boolean hasNext() 
-	{
-		return index_ < commands_.size();
-	}
-
-	public Object next() 
-	{
-		return commands_.elementAt(index_++);
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/Condition.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/Condition.java
deleted file mode 100644
index 6d5b18053..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/Condition.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.common;
-
-/**
- * This interface defines a boolean condition that can be evaluated for any object.
- */
-public interface Condition
-{
-  /**
-   * This returns whether the given object passes this condition.
-   */
-  public boolean evaluate();
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/Evaluate.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/Evaluate.java
deleted file mode 100644
index 0dcb74ec0..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/Evaluate.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.common;
-
-/**
-  * This interface can be used when a conditional object needs to be returned.
-**/
-public interface Evaluate
-{
-  /**
-    * @return returns an object based on some evaluated condition.
-  **/
-  public Object evaluate();
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/MessageUtils.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/MessageUtils.java
deleted file mode 100644
index aa7bb5939..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/MessageUtils.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.common;
-
-import java.text.MessageFormat;
-import java.util.Hashtable;
-import java.util.Locale;
-import java.util.ResourceBundle;
-
-/**
- * This class provides a convienent way to access resource bundles and
- * retieve translated strings.
- *
- *
- */
-public class MessageUtils
-{
-  private ResourceBundle resource_;
-  
-  private static Hashtable bundles_ = new Hashtable();
-  
-  /**
-   * 
-   * @param bundleId the resource bundle ID.
-   * @param object the class loader for this object will be used to retrieve
-   *               the resource bundle.
-   */
-  public MessageUtils( String bundleId, Object object )
-  {
-    this( bundleId, object.getClass().getClassLoader() );
-  }
-  
-  /**
-   * 
-   * @param bundleId the resource bundle ID.
-   * @param loader the class loader that will be used to retrieve
-   *               the resource bundle.
-   */
-  public MessageUtils( String bundleId, ClassLoader loader )
-  {
-    resource_ = (ResourceBundle)bundles_.get( bundleId );
-    
-    if( resource_ == null )
-    {
-      resource_ = ResourceBundle.getBundle( bundleId, Locale.getDefault(), loader );
-      bundles_.put( bundleId, resource_ );
-    }
-  }
-  
-  /**
-   * 
-   * @param key the key for the string to retrieve.
-   * @return returns the translated string.
-   */
-  public String getMessage ( String key )
-  {
-    String value = key;
-    
-    try
-    {
-      value = resource_.getString( key ); 
-    }
-    catch( Throwable exc )
-    {
-    }
-    
-    return value;
-  }
-  
-  /**
-   * 
-   * @param key the key for the string to retrieve.
-   * @param args These arguments will be substituted into the translated string.
-   * @return returns the translated string with any substitutions.
-   */
-  public String getMessage ( String key, Object[] args )
-  {
-    return MessageFormat.format( getMessage(key),args );
-  } 
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/ProgressUtils.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/ProgressUtils.java
deleted file mode 100644
index 4028caa12..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/ProgressUtils.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.command.internal.env.core.common;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-
-public class ProgressUtils
-{
-  static public void report( IProgressMonitor monitor, String message )
-  {
-    if( monitor != null ) 
-    {
-       monitor.beginTask( message, IProgressMonitor.UNKNOWN );
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/Range.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/Range.java
deleted file mode 100644
index 2e98b4b20..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/Range.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.common;
-
-import org.eclipse.wst.common.environment.uri.IURI;
-
-/**
- * Carries position information within a resource.
- */
-public interface Range
-{
-  public static final int UNKNOWN = -1;
-
-  /**
-   * Returns the identifier of the resource the range applies to.
-   */
-  public IURI getURI ();
-
-  /**
-   * Returns the index, zero-indexed, of the first line
-   * of the range.
-   */
-  public int getStartingLineNumber ();
-
-  /**
-   * Returns the index, zero-indexed, of the first character
-   * of the range relative to the beginning of the line.
-   */
-  public int getStartingCharNumberInLine ();
-
-  /**
-   * Returns the index, zero-indexed, of the first character
-   * of the range relative to the beginning of the file.
-   */
-  public int getStartingCharNumberInURI ();
-
-  /**
-   * Returns the index, zero-indexed, of the last line
-   * of the range.
-   */
-  public int getEndingLineNumber ();
-
-  /**
-   * Returns the offset, zero-indexed, of the last character
-   * of the range relative to the beginning of the line.
-   */
-  public int getEndingCharNumberInLine ();
-
-  /**
-   * Returns the index, zero-indexed, of the last character
-   * of the range relative to the beginning of the file.
-   */
-  public int getEndingCharNumberInURI ();
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/RangeVector.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/RangeVector.java
deleted file mode 100644
index 3f86edfaf..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/RangeVector.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.common;
-
-import java.util.Vector;
-
-/**
- * This Vector makes the protected method removeRange public.
- *
- */
-public class RangeVector extends Vector
-{
-  /**
-   * Comment for <code>serialVersionUID</code>
-   */
-  private static final long serialVersionUID = 4048793476659230773L;
-
-  public void removeRange( int start, int end )
-  {
-    super.removeRange( start, end );
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/StatusUtils.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/StatusUtils.java
deleted file mode 100644
index a03a57201..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/StatusUtils.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.command.internal.env.core.common;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-
-public class StatusUtils
-{
-  public static IStatus errorStatus( String errorMessage )
-  {
-    return new Status( IStatus.ERROR, "id", 0, errorMessage, null );
-  }
-  
-  public static IStatus errorStatus( Throwable exc )
-  {
-    String message = exc.getMessage();
-    
-    return new Status( IStatus.ERROR, "id", 0, message == null ? "" : message, exc );
-  }
-  
-  public static IStatus errorStatus( String message, Throwable exc )
-  {
-    return new Status( IStatus.ERROR, "id", 0, message, exc );
-  }
-  
-  public static MultiStatus multiStatus( String message, IStatus[] children, Throwable exc )
-  {
-    return new MultiStatus( "id", 0, children, message, exc );  
-  }
-  
-  public static MultiStatus multiStatus( String message, IStatus[] children )
-  {
-    return new MultiStatus( "id", 0, children, message, null );  
-  }
-  
-  public static IStatus warningStatus( String warningMessage )
-  {
-    return new Status( IStatus.WARNING, "id", 0, warningMessage, null );
-  }
-  
-  public static IStatus warningStatus( String warningMessage, Throwable exc )
-  {
-    return new Status( IStatus.WARNING, "id", 0, warningMessage, exc );
-  }
-  
-  public static IStatus infoStatus( String infoMessage )
-  {
-    return new Status( IStatus.INFO, "id", 0, infoMessage, null );
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/context/Context.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/context/Context.java
deleted file mode 100644
index d38351bd0..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/context/Context.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.context;
-
-/**
- * This interface provides a way to get and set preference information.
- *
- */
-public interface Context 
-{
- /**
-  * Loads the preference data into this Context object.
-  *
-  */
- public void load();
-
- /**
-  * Sets the default for a boolean preference.
-  * @param name the preference name.
-  * @param value the preference value.
-  */
- public void setDefault (String name, boolean value); 
- 
- /**
-  * Sets the default for a string preference.
-  * @param name the preference name.
-  * @param value the preference value.
-  */
- public void setDefault (String name, String value);
- 
- /**
-  * Sets the default for a int preference.
-  * @param name the preference name.
-  * @param value the preference value.
-  */
- public void setDefault (String name, int value); 
-
- /**
-  * Sets the value for a string preference.
-  * @param name the preference name.
-  * @param value the preference value.
-  */
- public void setValue (String name, String value);
- 
- /**
-  * Sets the value for a boolean preference.
-  * @param name the preference name.
-  * @param value the preference value.
-  */
- public void setValue (String name, boolean value);
- 
- /**
-  * Sets the value for a int preference.
-  * @param name the preference name.
-  * @param value the preference value.
-  */
- public void setValue (String name, int value);   
-
- /**
-  * Gets the value for a string preference.
-  * @param name the preference name.
-  * @return the preference value.
-  */
- public String getValueAsString ( String name);
- 
- /**
-  * Gets the value for a boolean preference.
-  * @param name the preference name.
-  * @return the preference value.
-  */
- public boolean getValueAsBoolean ( String name);
- 
- /**
-  * Gets the value for a int preference.
-  * @param name the preference name.
-  * @return the preference value.
-  */
- public int getValueAsInt ( String name);  		
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/context/ResourceContext.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/context/ResourceContext.java
deleted file mode 100644
index b36ecc2ca..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/context/ResourceContext.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.context;
-
-public interface ResourceContext 
-{
- /**
-   * This constant string is used to lookup the overwrite files general preference from
-   * the plugins local preferences store.
- **/
- public static final String PREFERENCE_OVERWRITE = "filesOverwrite";
-
- /**
-   * This constant string is used to lookup the create folders general preference from
-   * the plugins local preferences store.
- **/
- public static final String PREFERENCE_CREATE_FOLDERS = "createFolders";
- 
- /**
-   * This constant string is used to lookup the checkout files general preference from
-   * the plugins local preferences store.
- **/
- public static final String PREFERENCE_CHECKOUT = "filesCheckout";
-
- /**
-  * 
-  * @param enable set whether overwriting of files is enabled.
-  */
- public void setOverwriteFilesEnabled ( boolean enable);
- 
- /**
-  * 
-  * @return returns whether overwriting of files is enabled.
-  */
- public boolean isOverwriteFilesEnabled();
- 
- /**
-  * 
-  * @param enable set whether creation of folders is enabled.
-  */
- public void setCreateFoldersEnabled( boolean enable);
- 
- /**
-  * 
-  * @return returns whether creation of folders is enabled.
-  */
- public boolean isCreateFoldersEnabled(); 
- 
- /**
-  * 
-  * @param enable sets whether automatic checkout of files is enabled.
-  */
- public void setCheckoutFilesEnabled( boolean enable);
- 
- /**
-  * 
-  * @return returns whether automatic checkout of files is enabled.
-  */
- public boolean isCheckoutFilesEnabled();
- 
- /**
-  * 
-  * @return returns a copy of this ResourceContext.
-  */
- public ResourceContext copy();
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/context/ResourceDefaults.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/context/ResourceDefaults.java
deleted file mode 100644
index dad802626..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/context/ResourceDefaults.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.context;
-
-public class ResourceDefaults
-{
- private static final boolean PREFERENCE_OVERWRITE_DEFAULT = false;
- private static final boolean PREFERENCE_CREATE_FOLDERS_DEFAULT = true;
- private static final boolean PREFERENCE_CHECKOUT_DEFAULT = false;
-
- /**
-  * 
-  * @return returns the default setting for overwriting files.
-  */
- public static boolean getOverwriteFilesDefault ()
- {
- 	return PREFERENCE_OVERWRITE_DEFAULT;
- }
- 
- /**
-  * 
-  * @return returns the default setting ofr creating folders.
-  */
- public static boolean getCreateFoldersDefault ()
- { 
-	return PREFERENCE_CREATE_FOLDERS_DEFAULT;
- }
-
- /**
-  * 
-  * @return returns the default setting for checking out files.
-  */
- public static boolean getCheckoutFilesDefault()
- {
-	return PREFERENCE_CHECKOUT_DEFAULT;
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/context/TransientResourceContext.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/context/TransientResourceContext.java
deleted file mode 100644
index 1dffa025b..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/context/TransientResourceContext.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.context;
-
-/**
- * This class implements a ResourceContext interface where the state
- * of the context data is transient.
- *
- */
-public class TransientResourceContext implements ResourceContext 
-{
-  private boolean overWriteFiles;
-  private boolean createFolders;
-  private boolean checkOutFiles;
-
-  public TransientResourceContext() {
-    setOverwriteFilesEnabled(ResourceDefaults.getOverwriteFilesDefault());
-    setCreateFoldersEnabled(ResourceDefaults.getCreateFoldersDefault());
-    setCheckoutFilesEnabled(ResourceDefaults.getCheckoutFilesDefault());
-  }
-
-  /**  
-   * @see org.eclipse.wst.command.internal.env.core.context.ResourceContext#setOverwriteFilesEnabled(boolean)
-   */
-  public void setOverwriteFilesEnabled(boolean enable) {
-    overWriteFiles = enable;
-  }
-  
-  /**  
-   * @see org.eclipse.wst.command.internal.env.core.context.ResourceContext#isOverwriteFilesEnabled()
-   */
-  public boolean isOverwriteFilesEnabled() {
-    return overWriteFiles;
-  }
-
-  /**  
-   * @see org.eclipse.wst.command.internal.env.core.context.ResourceContext#setCreateFoldersEnabled(boolean)
-   */
-  public void setCreateFoldersEnabled(boolean enable) {
-    createFolders = enable;
-  }
-  
-  /**  
-   * @see org.eclipse.wst.command.internal.env.core.context.ResourceContext#isCreateFoldersEnabled()
-   */
-  public boolean isCreateFoldersEnabled() {
-    return createFolders;
-  }
-
-  /**  
-   * @see org.eclipse.wst.command.internal.env.core.context.ResourceContext#setCheckoutFilesEnabled(boolean)
-   */
-  public void setCheckoutFilesEnabled(boolean enable) {
-    checkOutFiles = enable;
-  }
-  
-  /**  
-   * @see org.eclipse.wst.command.internal.env.core.context.ResourceContext#isCheckoutFilesEnabled()
-   */
-  public boolean isCheckoutFilesEnabled() {
-    return checkOutFiles;
-  }
-  
-  /**  
-   * @see org.eclipse.wst.command.internal.env.core.context.ResourceContext#copy()
-   */
-  public ResourceContext copy() {
-    ResourceContext cc = new TransientResourceContext();
-    cc.setOverwriteFilesEnabled(isOverwriteFilesEnabled());
-    cc.setCreateFoldersEnabled(isCreateFoldersEnabled());
-    cc.setCheckoutFilesEnabled(isCheckoutFilesEnabled());
-    return cc;
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/BeanModifier.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/BeanModifier.java
deleted file mode 100644
index d56fc66c0..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/BeanModifier.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.data;
-
-public interface BeanModifier {
-
-	/**
-	 * Performs modification on bean properties using data provided
-	 * @param bean  The bean to be modified
-	 * @param propertyHolder The data to use to make the modification
-	 */
-	public void modify(Object bean, Object propertyHolder);
-	
-}
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 0d08d1017..000000000
--- 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 30ce90f80..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/DataFlowManager.java
+++ /dev/null
@@ -1,272 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.data;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.ILog;
-
-
-public class DataFlowManager 
-{
-  private DataMappingRegistryImpl registry_;
-  private Hashtable               classTable_;
-  private int                     order_;
-  private IEnvironment				environment_;
-  
-  public DataFlowManager( DataMappingRegistryImpl registry, IEnvironment environment )
-  {
-    registry_   = registry;
-    classTable_ = new Hashtable();
-    order_      = 0;
-    environment_ = environment;
-  }
-  
-  public DataMappingRegistry getMappingRegistry()
-  {
-    return registry_; 
-  }
-  
-  public void process( Object object )
-  {
-    // Add this object to the classTable_ if required.
-    String     objectType = object.getClass().getName();
-    ClassEntry classEntry = (ClassEntry)classTable_.get( objectType );
-	
-    environment_.getLog().log(ILog.INFO, "data", 5004, this, "process", "Processing: " + objectType );
-    
-    if( classEntry == null )
-    {
-      classEntry = new ClassEntry();
-      classTable_.put( objectType, classEntry );
-    }
-    
-    classEntry.lastObject_ = object;
-    classEntry.order_      = order_++;
-    
-    // Now process the setters for this object
-    Vector ruleEntries  = registry_.getRuleEntries( objectType );
-    
-    if( ruleEntries != null )
-    {
-      if( classEntry.setterList_ == null )
-      {
-        classEntry.setterList_ = getSetterList( object );  
-      }    
-      
-      // For each setter in this object try to find a rule.
-      for( int setterIndex = 0; setterIndex < classEntry.setterList_.size(); setterIndex++ )
-      {
-        ObjectMethod currentObjectMethod = new ObjectMethod();
-        Method       setterMethod        = (Method)classEntry.setterList_.elementAt( setterIndex );
-        RuleEntry    currentRuleEntry    = null;
-
-        currentObjectMethod.order = -1;
-        
-        // Find rules that match this setter.  Note: there can be more than one rule
-        // that matches this setter.  In this case we use the most recent, which is 
-        // defined by the order field.
-        for( int index = 0; index < ruleEntries.size(); index++ )
-        {
-          RuleEntry ruleEntry = (RuleEntry)ruleEntries.elementAt( index );       
-          
-          if( setterMethod.getName().equals( "set" + ruleEntry.targetProperty_ ) )
-          {
-            // We found a setter for this rule.  Now find the getter method.
-            // Note: getGetterMethod always returns a value, but if there is no
-            //       getters available it will set the order to -1.
-            ObjectMethod getter = getGetterMethod( ruleEntry.sourceType_, ruleEntry.sourceProperty_ );
-            
-            if( getter.order == -1 )
-            {
-            	environment_.getLog().log(ILog.INFO , "data", 5005, this, "process", "  >>No getter found for property: " + setterMethod.getName());
-            }
-            
-            if( currentObjectMethod.order < getter.order ) 
-            {
-              // We found a more recent getter.
-              currentObjectMethod = getter;
-              currentRuleEntry = ruleEntry;
-            }
-          }
-        } 
-        
-        if( currentObjectMethod.order != -1 )
-        {
-          invokeMethod( currentObjectMethod.object, 
-                        currentObjectMethod.method, 
-                        object, 
-                        setterMethod, 
-                        currentRuleEntry.transformer_ );
-        }
-        else
-        {
-        	environment_.getLog().log(ILog.INFO, "data", 5006, this, "process", "  >>No rule found for setter: " + setterMethod.getName() );
-        }
-      }
-    }   
-  }
-  
-  /**
-   * Find all the setters for this object and return a vector of them.
-   * 
-   * @param object
-   * @return
-   */
-  private Vector getSetterList( Object object )
-  {
-    Vector result = new Vector();
-    
-    Method[] methods = object.getClass().getMethods();
-    
-    for( int index = 0; index < methods.length; index++ )
-    {
-      Method  method     = methods[index];
-      boolean isPublic   = Modifier.isPublic( method.getModifiers() );
-      Class   returnType = method.getReturnType();
-    
-      if( isPublic && 
-          returnType == Void.TYPE && 
-          method.getParameterTypes().length == 1 &&
-          method.getName().startsWith( "set" ))
-      {
-        method.setAccessible( true );
-        result.add( method );
-      }
-    }
-    
-    return result;
-  }
-  
-  private ObjectMethod getGetterMethod( String sourceType, String sourceProperty )
-  {
-    ClassEntry   classEntry = (ClassEntry)classTable_.get( sourceType );
-    ObjectMethod getterFound = new ObjectMethod();
-    
-    // Indicate that there is no getter yet.
-    getterFound.order = -1;
-    
-    if( classEntry != null )
-    {
-      if( classEntry.getterList_ == null )
-      {
-        // Build the getter list.
-        classEntry.getterList_ = getGetterList( classEntry.lastObject_ );
-      }
-      
-      for( int index = 0; index < classEntry.getterList_.size(); index++ )
-      {
-        Method getter = (Method)classEntry.getterList_.elementAt( index );
-        
-        if( getter.getName().equals( "get" + sourceProperty ))
-        {
-          getterFound.order  = classEntry.order_;
-          getterFound.method = getter;
-          getterFound.object = classEntry.lastObject_;
-          break;
-        }
-      }
-    }
-    
-    return getterFound;
-  }
-  
-  private Vector getGetterList( Object object )
-  {
-    Vector result = new Vector();
-    
-    Method[] methods = object.getClass().getMethods();
-    
-    for( int index = 0; index < methods.length; index++ )
-    {
-      Method  method     = methods[index];
-      boolean isPublic   = Modifier.isPublic( method.getModifiers() );
-      Class   returnType = method.getReturnType();
-    
-      if( isPublic && 
-          returnType != Void.TYPE && 
-          method.getParameterTypes().length == 0 &&
-          method.getName().startsWith( "get" ))
-      {
-        method.setAccessible( true );
-        result.add( method );
-      }
-    }
-    
-    return result;
-  }
-    
-  private void invokeMethod( Object      sourceObject, 
-                             Method      sourceMethod , 
-                             Object      clientObject, 
-                             Method      clientMethod,
-                             Transformer transformer)
-  {  	
-  	Object data = null;
-  	  	  	
-  	try
-  	{
-  	  data = sourceMethod.invoke( sourceObject, new Object[0] );
-  	}
-  	catch( InvocationTargetException exc )
-  	{
-  	  exc.printStackTrace();
-      // pgm Need to externalize this string.
-      throw new IllegalArgumentException( "Provider \"" + sourceObject.getClass().getName() +
-                                          "\" threw an exception." );
-  	}
-  	catch( IllegalAccessException exc )
-  	{
-  	  exc.printStackTrace();
-      // pgm Need to externalize this string.
-      throw new IllegalArgumentException( "Provider \"" + sourceObject.getClass().getName() +
-                                        "\" threw an exception." );
-  	}
-  	
-  	environment_.getLog().log(ILog.INFO, "data", 5007, this, "invokeMethod ","  Setting prop: " + clientMethod.getName() + " data=" + data + " from: " + sourceObject.getClass().getName() );
-  	
-  	
-  	if( transformer != null )
-  	{
-  	  data = transformer.transform( data );  	    
-  	}
-  	
-  	try
-  	{  	  
-  	  clientMethod.invoke( clientObject, new Object[]{ data } );
-  	}
-  	catch( InvocationTargetException exc )
-  	{
-  	  exc.printStackTrace();
-      // pgm Need to externalize this string.
-      throw new IllegalArgumentException( "Client \"" + clientObject.getClass().getName() +
-                                          "\" threw an exception." );
-  	}
-  	catch( IllegalAccessException exc )
-  	{
-  	  exc.printStackTrace();
-      // pgm Need to externalize this string.
-      throw new IllegalArgumentException( "Client \"" + clientObject.getClass().getName() +
-                                          "\" threw an exception." );
-  	}
-  }
-  
-  private class ObjectMethod
-  {
-    public Object object;
-    public Method method;
-    public int    order;
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/DataMappingRegistry.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/DataMappingRegistry.java
deleted file mode 100644
index 99da37a6f..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/DataMappingRegistry.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.data;
-
-public interface DataMappingRegistry
-{
-  /**
-   * This method adds a data mapping from a source object to a target
-   * object.  When the sourceObject is encountered by the framework the
-   * sourceProperty will be called and the data will be passed to the
-   * targetProperty in the targetObject.  If a transformer object is
-   * specified the sourceObject is transformed before being passed to
-   * the target object.
-   * 
-   * @param sourceType      The source object.
-   * @param sourceProperty  The source property.
-   * @param targetType      The target object.
-   * @param targetProperty  The target property.
-   * @param transformer     The transformer object that transforms the
-   *                        the source object.
-   */
-  public void addMapping( Class       sourceType,
-						  String      sourceProperty,
-						  Class       targetType,
-						  String      targetProperty,
-						  Transformer transformer );
-  
-  /**
-   * This method is equivalent to the above with targetProperty the same
-   * as the sourceProperty and with the transformer set to null.
-   * 
-   * @param sourceType     The source object.
-   * @param sourceProperty The source property.
-   * @param targetType     The target object.
-   */
-  public void addMapping( Class       sourceType,
-	                      String      sourceProperty,
-	                      Class       targetType );
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/DataMappingRegistryImpl.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/DataMappingRegistryImpl.java
deleted file mode 100644
index 7bea57788..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/DataMappingRegistryImpl.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.data;
-
-import java.util.Hashtable;
-import java.util.Vector;
-
-
-public class DataMappingRegistryImpl implements DataMappingRegistry
-{  
-  private Hashtable rulesTable_ = new Hashtable();
-
-  public Vector getRuleEntries( String targetType )
-  {
-    return (Vector)rulesTable_.get( targetType );
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry#addMapping(java.lang.Class, java.lang.String, java.lang.Class, java.lang.String, org.eclipse.wst.command.internal.env.core.data.Transformer)
-   */
-  public void addMapping( Class sourceType, String sourceProperty,
-                          Class targetType, String targetProperty, 
-                          Transformer transformer) 
-  {
-    Vector    ruleEntries = (Vector)rulesTable_.get( targetType.getName() );
-    RuleEntry ruleEntry   = null;
-    
-    if( ruleEntries == null )
-    {
-      ruleEntries = new Vector();
-      rulesTable_.put( targetType.getName(), ruleEntries );
-    }
-    
-    // Find the rule entry
-    for( int index = 0; index < ruleEntries.size(); index++ )
-    {
-      RuleEntry newEntry = (RuleEntry)ruleEntries.elementAt( index );
-    
-      if( sourceProperty.equals( newEntry.sourceProperty_ ) &&
-          sourceType.equals( newEntry.sourceType_ ) &&
-          targetProperty.equals( newEntry.targetProperty_ ) )
-      {
-        // The entry already exists
-        ruleEntry = newEntry;
-        break;
-      }
-    }
-    
-    if( ruleEntry == null )
-    {
-      // The rule didn't exist already so we will create a new one.
-      ruleEntry = new RuleEntry(sourceType.getName(), sourceProperty, targetProperty, transformer );
-      ruleEntries.add( ruleEntry );
-    }
-    else
-    {
-      // Just update the transformer.
-      ruleEntry.transformer_ = transformer;  
-    }
-  }
-    
-    //ruleEntries_.
-//    String    sourceClass = sourceType.getName();
-//    String    targetClass = targetType.getName();
-//    Vector    entries     = (Vector)ruleEntries_.get( sourceClass ); 
-//    RuleEntry ruleEntry   = null;
-//    
-//    if( entries != null )
-//    {
-//      // Check to see if this mapping already exists.
-//      for( int index = 0; index < entries.size(); index++ )
-//      {
-//        RuleEntry foundEntry = (RuleEntry)entries.elementAt( index );
-//        
-//        if( sourceProperty.equals( foundEntry.sourceProperty_ ) &&
-//            targetType.equals( foundEntry.targetType_ ) &&
-//            targetProperty.equals( foundEntry.targetProperty_ ) )
-//        {
-//          ruleEntry = foundEntry;
-//          ruleEntry.transformer_ = transformer;
-//        }
-//      }
-//      
-//      // There is an existing vector for this sourceClass, but it didn't
-//      // contain this new rule so we will add it in.
-//      if( ruleEntry == null )
-//      {
-//        ruleEntry = new RuleEntry( sourceProperty, targetClass, targetProperty, transformer );
-//        entries.add( ruleEntry );
-//      }
-//    }
-//    else
-//    {
-//      // We need to create a new vector for this sourceClass.
-//      entries = new Vector();
-//      ruleEntry = new RuleEntry( sourceProperty, targetClass, targetProperty, transformer );
-//      entries.add( ruleEntry );
-//      ruleEntries_.put( sourceClass, entries );  
-//    }    
-//  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry#addMapping(java.lang.Class, java.lang.String, java.lang.Class)
-   */
-  public void addMapping(Class sourceType, String sourceProperty, Class targetType) 
-  {
-    addMapping( sourceType, sourceProperty, targetType, sourceProperty, null );
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/RuleEntry.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/RuleEntry.java
deleted file mode 100644
index df242c105..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/RuleEntry.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.data;
-
-
-public class RuleEntry 
-{
-  public String      sourceType_;
-  public String      sourceProperty_;
-  public String      targetProperty_;
-  public Transformer transformer_;
-  
- 
-  public RuleEntry( String sourceType,
-                    String sourceProperty,
-                    String targetProperty, 
-                    Transformer transformer )
-  {
-    sourceType_     = sourceType;
-    sourceProperty_ = sourceProperty;
-    targetProperty_ = targetProperty;    
-    transformer_    = transformer;
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/Transformer.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/Transformer.java
deleted file mode 100644
index 19c3c01e7..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/Transformer.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.data;
-
-/**
- * This interface is used to transform an object from one class to another.
- *
- */
-public interface Transformer
-{
-  /*
-   * @return returns a transformed object based on the input value.
-   */
-  public Object transform( Object value );
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/AbstractCommandFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/AbstractCommandFragment.java
deleted file mode 100644
index d18a2f2db..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/AbstractCommandFragment.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.fragment;
-
-import org.eclipse.wst.command.internal.env.core.CommandFactory;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-
-
-/**
-  * This class is used as the base class for other standard fragment classes.
-  * 
-**/
-public abstract class AbstractCommandFragment implements CommandFragment
-{
-  private CommandFactory commandFactory_;
-  private String         id_;
-  private boolean        doNotRunInTransaction_ = false;
-
-  /**
-   * Copy constructor.
-   * @param fragment
-   */
-  protected AbstractCommandFragment( AbstractCommandFragment fragment )
-  {
-    commandFactory_ = fragment.commandFactory_;
-    id_             = fragment.id_;
-  }
-  
-  /**
-    * Creates a new AbstractCommandFragment.
-    *
-    * @param command the executable command for this fragment.
-  **/
-  public AbstractCommandFragment( CommandFactory commandFactory, String id )
-  {
-    commandFactory_ = commandFactory;  
-    id_      = id;
-  } 
-  
-  public String getId()
-  {
-    return id_;
-  }
-   
-  public void setId( String id )
-  {
-    id_ = id; 
-  }
-  
-  /** 
-    * Gets executable command associated with this fragment.
-    *
-    * @return returns the first child fragment for this fragment.  Returns
-    * null when there is no first child.
-  **/
-  public CommandFactory getCommandFactory()
-  {
-    return commandFactory_;
-  }
-  
-  /**
-   *  This method is called retrieve the data mappings for this command fragment.
-   */
-  public void registerDataMappings( DataMappingRegistry registry )
-  {
-    // The default behaviour is not to add any entries to the registry.
-  }
-  
-  /**
-   * 
-   * @return If the commands for this fragment should not be run within a transaction then
-   * this method should return true.  If the fragment does not care if it is run in a transaction
-   * or not it should return false.
-   */
-  public boolean doNotRunInTransaction()
-  {
-    return doNotRunInTransaction_;
-  }
-  
-  /**
-   * Sets the run in transaction property.
-   * @param doNotRunInTransaction
-   */
-  public void setDoNotRunInTransaction( boolean doNotRunInTransaction )
-  {
-    doNotRunInTransaction_ = doNotRunInTransaction;
-  }
-  
-  /**
-    * All fragments need to be cloneable.
-  **/
-  abstract public Object clone();  
-  
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/BooleanFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/BooleanFragment.java
deleted file mode 100644
index 571156de4..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/BooleanFragment.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.fragment;
-
-import org.eclipse.wst.command.internal.env.core.CommandFactory;
-import org.eclipse.wst.command.internal.env.core.common.Condition;
-
-
-/**
-  * This class returns either the true fragment or the false fragment
-  * based on the response from the condition object.
-**/
-public class BooleanFragment extends AbstractCommandFragment
-{
-  private CommandFragment trueFragment_;
-  private CommandFragment falseFragment_;
-  private Condition       condition_;
-
-  /**
-   * Create a BooleanFragment with default values.
-   *
-   */
-  public BooleanFragment()
-  {
-    this( null, null, new Condition()
-                      {
-                        public boolean evaluate()
-                        {
-                          return true;
-                        }
-                      }, 
-                      null, "" );  
-  }
-  
-  /**
-   * 
-   * @param trueFragment  The fragment chosen if the condition is true.
-   * @param falseFragment The fragment chosen if the condition is false.
-   * @param condition     The condition.
-   */
-  public BooleanFragment( CommandFragment trueFragment,
-                          CommandFragment falseFragment,
-                          Condition       condition )
-  {
-    this( trueFragment, falseFragment, condition, null, "" );
-  }                          
-
-  /**
-    * Creates a new BooleanFragment.
-    *
-    * @param trueFragment returned if condition is true.
-    * @param falseFragment returned if condition is false.
-    * @param condition the condition for this fragment.
-    * @param state the state passed to the condition.
-    * @param command the exectable command for this fragment.
-  **/
-  public BooleanFragment( CommandFragment  trueFragment,
-                           CommandFragment falseFragment,
-                           Condition       condition,
-                           CommandFactory  commandFactory,
-                           String          id )
-  {
-    super( commandFactory, id );
-
-    trueFragment_       = trueFragment;
-    falseFragment_      = falseFragment;
-    condition_          = condition; 
-  }
-
-  /**
-   * Copy constructor.
-   * @param frag
-   */
-  protected BooleanFragment( BooleanFragment frag )
-  {
-    this( null,
-    	  null,
-    	  frag.condition_,
-    	  frag.getCommandFactory(),
-    	  frag.getId() );
-
-    // Now we have to clone in the true and false
-    // fragments.
-    trueFragment_  = (CommandFragment)trueFragment_.clone();
-    falseFragment_ = (CommandFragment)falseFragment_.clone();
-  }
-  
-  /**
-    * Makes a copy of the CommandFragment.
-    *
-    * @return returns a copy of this fragment.
-  **/
-  public Object clone()
-  {
-    return new BooleanFragment( this );
-  }
-
-  /** 
-    * Gets the first child fragment for this fragment.
-    *
-    * @return returns the first child fragment for this fragment.  Returns
-    * null when there is no first child.
-  **/
-  public CommandFragment getFirstSubFragment()
-  {    
-    return condition_.evaluate() ? trueFragment_ : falseFragment_;
-  }
-  
-  /**
-    * Gets the next child fragment for this fragment.
-    *
-    * @return returns the next child fragment for this fragment.  Returns null
-    * when there is no next child.
-  **/
-  public CommandFragment getNextSubFragment( CommandFragment fragment )
-  {
-    return null;
-  }
-  
-  /**
-   * Sets the condition.
-   * @param condition
-   */
-  public void setCondition( Condition condition )
-  {
-    condition_ = condition;    
-  }
-  
-  /**
-   * Sets the true fragment.
-   * @param fragment
-   */
-  public void setTrueFragment( CommandFragment fragment )
-  {
-    trueFragment_ = fragment;
-  }
-  
-  /**
-   * Sets the false fragment.
-   * @param fragment
-   */
-  public void setFalseFragment( CommandFragment fragment )
-  {
-    falseFragment_ = fragment;
-  } 
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/ChoiceFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/ChoiceFragment.java
deleted file mode 100644
index 3982cbd05..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/ChoiceFragment.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.fragment;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import org.eclipse.wst.command.internal.env.core.CommandFactory;
-import org.eclipse.wst.command.internal.env.core.common.Evaluate;
-
-
-/**
-  * This class returns a fragment from a list of fragments based
-  * on the object returned from the Evaluate object.
-**/
-public class ChoiceFragment extends AbstractCommandFragment 
-{
-  private Hashtable      fragmentTable_;
-  private Evaluate       evaluate_;
-
-  /**
-    * Create a clone with new a new hashtable.
-  **/
-  protected ChoiceFragment( ChoiceFragment frag )
-  {
-    super( frag.getCommandFactory(), frag.getId() );
-    
-    evaluate_      = frag.evaluate_;
-    fragmentTable_ = new Hashtable();
-   
-    Enumeration keys = frag.fragmentTable_.keys();
-
-    // Clone the fragments in the table.
-    while( keys.hasMoreElements() )
-    {
-      Object key = keys.nextElement();
-      fragmentTable_.put( key, ((CommandFragment)frag.fragmentTable_.get(key)).clone() );
-    }
-  }
-  
-  public ChoiceFragment( Object[]          keys,
-                         CommandFragment[] fragments )
-  {
-  	this( keys, fragments, null, null, "" );    
-  }
-  
-  public ChoiceFragment( Object[]          keys,
-                         CommandFragment[] fragments,
-                         Evaluate          evaluate )
-  {
-  	this( keys, fragments, evaluate, null, "" );
-  }                         
-  
-  public void setEvaluate( Evaluate evaluate )
-  {
-    evaluate_ = evaluate;  
-  }
-  
-  /**
-    * Constructs a choice fragment.  The key at index X is mapped to 
-    * to the fragment at index X.
-    *
-    * @param keys these keys must be unique as determined by the equals method.
-    * They are used to identify which fragment to return.
-    * @param fragments these are the fragments to be returned.  Null is not allowed
-    * as an entry in the array.
-    * @param evaluate the object returned by this evaluate object is used
-    * as the key to locate a fragment.
-    * @param state the state passed to evaluate.
-  **/
-  public ChoiceFragment( Object[]          keys,
-                         CommandFragment[] fragments,
-                         Evaluate          evaluate,
-                         CommandFactory    commandFactory,
-                         String            id )
-  {
-    super( commandFactory, id );
-
-    evaluate_      = evaluate;
-    fragmentTable_ = new Hashtable();
-
-    if( keys == null || fragments == null || keys.length != fragments.length )
-    {
-      throw new IllegalArgumentException( "Bad keys or fragments." );
-    }
-    else
-    {
-      // Create the fragment table.
-      for( int index = 0; index < keys.length; index++ )
-      {
-        fragmentTable_.put( keys[index], fragments[index] );
-      }     
-    }
-  }
-  
-  /**
-    * Makes a copy of the CommandFragment.
-    *
-    * @return returns a copy of this fragment.
-  **/
-  public Object clone()
-  {
-    return new ChoiceFragment( this );
-  }
-  
-  /** 
-    * Gets the first child fragment for this fragment.
-    *
-    * @return returns the first child fragment for this fragment.  Returns
-    * null when there is no first child.
-  **/
-  public CommandFragment getFirstSubFragment()
-  {    
-    Object key              = evaluate_.evaluate();
-    CommandFragment fragment = (CommandFragment)fragmentTable_.get(key);
-
-    if( fragment == null )
-    {
-      throw new IllegalArgumentException( "Key not found in table. Key=" + key );
-    }
-
-    return fragment;
-  }
-  
-  /**
-    * Gets the next child fragment for this fragment.
-    *
-    * @return returns the next child fragment for this fragment.  Returns null
-    * when there is no next child.
-  **/
-  public CommandFragment getNextSubFragment( CommandFragment fragment )
-  {
-    return null;
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFactoryFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFactoryFragment.java
deleted file mode 100644
index 19075ac57..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFactoryFragment.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.command.internal.env.core.fragment;
-
-import java.util.Vector;
-
-import org.eclipse.wst.command.internal.env.core.CommandFactory;
-import org.eclipse.wst.command.internal.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public abstract class CommandFactoryFragment implements CommandFragment 
-{
-  private Vector commands_;
-  
-  /**
-   * Subclasses should override this method and return
-   * an CommandFactory.
-   * @return
-   */
-  public abstract ICommandFactory getICommandFactory();
-  
-  /**
-   * All wizard fragments need to be cloneable.
-  **/
-  public abstract Object clone();
-  
-  protected CommandFactoryFragment( CommandFactoryFragment frag )
-  {
-    commands_ = frag.commands_;  
-  }
-  
-  public CommandFactoryFragment()
-  {
-  }
-  
-  /**
-   * 
-   * @return Returns a unique identifier for this fragment.
-   */
-  public String getId()
-  {
-    return "";
-  }
-  
-  /** 
-    * Gets executable command associated with this fragment.
-    *
-    * @return returns the first child fragment for this fragment.  Returns
-    * null when there is no first child.
-  **/
-  public CommandFactory getCommandFactory()
-  {
-    return null;
-  }
-
-  /** 
-    * Gets the first child fragment for this fragment.
-    *
-    * @return returns the first child fragment for this fragment.  Returns
-    * null when there is no first child.
-  **/
-  public CommandFragment getFirstSubFragment()
-  {
-	CommandFragment result = null;
-	
-    commands_ = createCommands();	
-
-	if( commands_.size() > 0 )
-	{
-	  result = (ChildFragment)commands_.elementAt(0);
-	}
-	
-	return result;
-  }
-
-  /**
-    * Gets the next child fragment for this fragment.
-    *
-    * @return returns the next child fragment for this fragment.  Returns null
-    * when there is no next child.
-  **/
-  public CommandFragment getNextSubFragment( CommandFragment fragment )
-  {
-	CommandFragment result = null;
-		
-	if( commands_ != null && fragment instanceof ChildFragment ) 
-	{
-	  ChildFragment child = (ChildFragment)fragment;
-	  
-	  int index = child.index_;
-	
-      if( index != -1 )
-	  {
-	    index++;
-	  
-	    if( index < commands_.size() )
-		{
-		  result = (CommandFragment)commands_.elementAt( index );
-		}
-	  }
-	}
-	
-	return result;
-  }
-  
-  /*
-   * This method is called to retrieve the data mappings for this command fragment.
-   */
-  public void registerDataMappings( DataMappingRegistry registry )
-  {
-  }
-
-  /**
-   * 
-   * @return If the commands for this fragment should not be run within a transaction then
-   * this method should return true.  If the fragment does not care if it is run in a transaction
-   * or not it should return false.
-   */
-  public boolean doNotRunInTransaction()
-  {
-    return false;
-  }  
-  
-  private Vector createCommands()
-  {
-	Vector          commands = new Vector();
-	ICommandFactory factory  = getICommandFactory();
-	int             index    = 0;
-		  
-	while( factory != null && factory.hasNext() )
-	{
-	  AbstractDataModelOperation command = factory.getNextCommand();
-			
-	  commands.add( new ChildFragment( command, index++ ) );
-	}
-	
-	return commands;
-  }
-  
-  private class ChildFragment extends SimpleFragment
-  {
-	  int index_;
-	
-	  public ChildFragment( AbstractDataModelOperation command, int index )
-	  {
-	    super( command, command.getID() );
-	    index_ = index;
-	  }
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragment.java
deleted file mode 100644
index 03af35eca..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragment.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.fragment;
-
-import org.eclipse.wst.command.internal.env.core.CommandFactory;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-
-
-/**
-  * This interface describes a list of interruptable commands.  The
-  * order of this list of commands is defined by the getFirstSubFragment and
-  * getNextSubFragment methods.
-**/
-public interface CommandFragment extends Cloneable
-{ 
-  /**
-   * 
-   * @return Returns a unique identifier for this fragment.
-   */
-  public String getId();
-  
-  /** 
-    * Gets executable command associated with this fragment.
-    *
-    * @return returns the first child fragment for this fragment.  Returns
-    * null when there is no first child.
-  **/
-  public CommandFactory getCommandFactory();
-
-  /** 
-    * Gets the first child fragment for this fragment.
-    *
-    * @return returns the first child fragment for this fragment.  Returns
-    * null when there is no first child.
-  **/
-  public CommandFragment getFirstSubFragment();
-
-  /**
-    * Gets the next child fragment for this fragment.
-    *
-    * @return returns the next child fragment for this fragment.  Returns null
-    * when there is no next child.
-  **/
-  public CommandFragment getNextSubFragment( CommandFragment fragment );
-  
-  /*
-   * This method is called to retrieve the data mappings for this command fragment.
-   */
-  public void registerDataMappings( DataMappingRegistry registry );
-
-  /**
-   * 
-   * @return If the commands for this fragment should not be run within a transaction then
-   * this method should return true.  If the fragment does not care if it is run in a transaction
-   * or not it should return false.
-   */
-  public boolean doNotRunInTransaction();
-  
-  /**
-    * All wizard fragments need to be cloneable.
-  **/
-  public Object clone();  
-}  
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragmentEngine.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragmentEngine.java
deleted file mode 100644
index 4b98c587b..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragmentEngine.java
+++ /dev/null
@@ -1,432 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.fragment;
-
-import java.util.Stack;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.command.internal.env.core.CommandFactory;
-import org.eclipse.wst.command.internal.env.core.CommandManager;
-import org.eclipse.wst.command.internal.env.core.EnvironmentCoreMessages;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.data.DataFlowManager;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.ILog;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-
-/**
- * The CommandFragmentEngine provides a convienent way to traverse CommandFragments
- * and possiblity execute its associate Command.
- */
-public class CommandFragmentEngine implements CommandManager
-{
-  private Stack            commandStack_;
-  private FragmentListener undoFragmentListener_;
-  private FragmentListener nextFragmentListener_;
-  private FragmentListener afterExecuteFragmentListener_;
-  private FragmentListener peekFragmentListener_;
-  private DataFlowManager  dataManager_;
-  private IEnvironment     environment_;
-  private IStatus          lastStatus_;
-  
-  /**
-   * Creates a CommandFragmentEngine.
-   * 
-   * @param startFragment the root fragment where traversal will begin.
-   * @param dataManager the data manager containing all of the data mappings.
-   * @param environment the environment.
-   */
-  public CommandFragmentEngine( CommandFragment startFragment, DataFlowManager dataManager, IEnvironment environment )
-  {
-  	SequenceFragment root = new SequenceFragment();
-  	root.add( startFragment );
-  	  	
-  	commandStack_ = new Stack();
-  	
-  	addToStack( root, -1 );
-  	addToStack( startFragment, 0 );
-  	
-  	dataManager_ = dataManager;
-  	environment_ = environment;
-  } 
-  
-  /**
-   * @return returns the Data mapping registry.
-   */
-  public DataMappingRegistry getMappingRegistry()
-  {
-	return dataManager_.getMappingRegistry();
-  }
-  
-  /**
-   * 
-   * @return the Status from the last Command executed.
-   */
-  public IStatus getLastStatus()
-  {
-    return lastStatus_;
-  }
-  
-  /**
-   */
-  public boolean isUndoEnabled()
-  {
-    return true;
-  }
-  
-  /**
-   * Sets the next fragment listener for this engine.  This listener will be
-   * called for each fragment that is traversed in moveForwardToNextStop operation.
-   * 
-   * @param listener the fragment listener.
-   */
-  public void setNextFragmentListener( FragmentListener listener )
-  {
-    nextFragmentListener_ = listener;
-  }
-  
-  public void setAfterExecuteFragmentListener( FragmentListener listener )
-  {
-    afterExecuteFragmentListener_ = listener;
-  }
-  
-  /**
-   * Sets the next fragment listener for this engine.  This listener will be
-   * called for each fragment that is traversed in peekForwardToNextStop operation.
-   * 
-   * @param listener the fragment listener.
-   */
-  public void setPeekFragmentListener( FragmentListener listener )
-  {
-    peekFragmentListener_ = listener;
-  }
-  
-  /**
-   * Sets the peek fragment listener for this engine.  This listener will be
-   * called for each fragment that is traversed in undoToLastStop operation.
-   * 
-   * @param listener the fragment listener.
-   */
-  public void setUndoFragmentListener( FragmentListener listener )
-  {
-    undoFragmentListener_ = listener;
-  }
-  
-  /**
-   * Traverse the CommandFragments starting with the CommandFragment on the
-   * top of the command fragment stack.  The operation does NOT change the
-   * command fragment stack and does not execute any command associated with
-   * a CommandFragment.
-   */
-  public void peekForwardToNextStop()
-  {
-  	CommandListEntry topEntry      = (CommandListEntry)commandStack_.lastElement();  	
-  	int              parentIndex   = topEntry.parentIndex_;
-  	CommandFragment  childFragment = topEntry.fragment_; 
-  	boolean          continueLoop  = navigateChildFragments( childFragment, false );
-  	  	
-  	while( parentIndex != -1 && continueLoop )
-  	{  	
-  	  CommandListEntry parentEntry    = (CommandListEntry)commandStack_.elementAt( parentIndex );
-  	  CommandFragment  parentFragment = parentEntry.fragment_;
-  	  CommandFragment  nextFragment   = parentFragment.getNextSubFragment( childFragment );
-  	  
-  	  if( nextFragment == null )
-  	  {
-  	  	// There are no more sibling fragments to navigate so we will pop up to the parent
-  	  	// an continue navigation there.
-  	  	parentIndex   = parentEntry.parentIndex_;
-  	  	childFragment = parentFragment; 
-  	  }
-  	  else
-  	  {  	  	
-  	  	if( navigateChildFragments( nextFragment, true ) ) 
-  	  	{
-  	  	  // We are continuing to navigate.  This time we want to traverse the sibling
-  	  	  // of nextFragment. 
-  	  	  childFragment = nextFragment;
-  	  	}
-  	  	else
-  	  	{
-  	  	  // We are stopping our navigation.
-  	  	  continueLoop = false;
-  	  	}
-  	  }
-  	}
-  }
-  
-  
-  /**
-   * Traverse the CommandFragments starting with the CommandFragment on the
-   * top of the command fragment stack.  This operation does change the
-   * command fragment stack and does execute any command associated with
-   * a CommandFragment.
-   */
-  public void moveForwardToNextStop( IProgressMonitor monitor )
-  {
-  	CommandListEntry topEntry        = (CommandListEntry)commandStack_.lastElement();  	
-  	int              parentIndex     = topEntry.parentIndex_;
-  	CommandFragment  currentFragment = topEntry.fragment_;  
-  	boolean          continueExecute = visitTop( monitor );
-  	CommandFragment  childFragment    = currentFragment.getFirstSubFragment();
-  	    
-  	// If the current fragment has child fragments we need to traverse these children.
-  	while( childFragment != null && continueExecute )
-  	{
-  	  parentIndex = commandStack_.size() - 1;
-  	  addToStack( childFragment, parentIndex );
-  	  continueExecute = visitTop( monitor );
-  	  currentFragment = childFragment;
-  	  childFragment   = currentFragment.getFirstSubFragment();
-  	}
-  	
-  	// The previous while loop has guaranteed that currentFragment has no
-  	// child fragments. This while loop assumes this to be the case.
-  	while( parentIndex != -1 && continueExecute )
-  	{  	   	
-  	  CommandListEntry parentEntry    = (CommandListEntry)commandStack_.elementAt( parentIndex );
-  	  CommandFragment  parentFragment = parentEntry.fragment_;
-  	  CommandFragment  nextFragment   = null;
-  	  
-  	  if( currentFragment == null )
-  	  {
-  	    nextFragment = parentFragment.getFirstSubFragment();
-  	  }
-  	  else
-  	  {	
-  	    nextFragment = parentFragment.getNextSubFragment( currentFragment );
-  	  }
-  	  
-  	  if( nextFragment == null )
-  	  {
-  	  	// There are no more sibling fragments to navigate so we will pop up to the parent
-  	  	// and continue navigation there.
-  	  	parentIndex     = parentEntry.parentIndex_;
-  	  	currentFragment = parentFragment; 
-  	  }
-  	  else
-  	  {  	
-  	  	// We have a new fragment that we need to add to the top of the stack.
-  	  	addToStack( nextFragment, parentIndex );  	  	
-  	    parentIndex     = commandStack_.size() - 1;  	
-  	    continueExecute = visitTop( monitor );
-  	    currentFragment = null;  	  	
-  	  }
-  	}
-  }
-  
-  /**
-   * 
-   * @return returns true if the there is not longer any elements on the stack.  Note:
-   *                 that last two entries are always left on the stack.
-   */
-  public boolean undoToLastStop()
-  {    
-  	CommandListEntry topEntry = (CommandListEntry)commandStack_.lastElement();	
-  	
-	  if( topEntry.fragmentStopped_ && !topEntry.beforeExecute_ )
-    {
-      // Normally the command at the top of the stack has not been executed.  If
-      // it has been execute, it means that we tried to execute and it failed.
-      // The first command in the command stack failed.  Therefore, we should
-      // only undo this command.
-      performUndo( topEntry );
-      return topEntry.parentIndex_ == 0;
-    }
-    
-  	performUndo( topEntry );
-  		
-    while( topEntry.parentIndex_ != 0 )
-  	{
-      commandStack_.pop();
-  	  topEntry = (CommandListEntry)commandStack_.lastElement();	  
-      
-  	  performUndo( topEntry );
-  	  
-  	  if( topEntry.fragmentStopped_ )
-  	  {
-  	    break;
-  	  }
-  	}
-  	
-  	return topEntry.parentIndex_ == 0;
-  }
-   
-  private void performUndo( CommandListEntry entry )
-  {
-    if( entry.parentIndex_ == 0 ) return;
-    
-	  AbstractDataModelOperation cmd = entry.command_;
-  	  
-  	if( cmd != null && cmd.canUndo() && !entry.beforeExecute_ )
-	{
-    try
-    {
-	    cmd.undo( null, null );
-    }
-    catch( Exception exc )
-    {
-      exc.printStackTrace();
-    }
-    
-	  entry.beforeExecute_ = true;
-	}
-  	  
-	undoFragmentListener_.notify( entry.fragment_ );  	
-  }
-  
-  private boolean navigateChildFragments( CommandFragment fragment, boolean visitCurrent )
-  {
-  	boolean         continueNavigate = true;
-  	CommandFragment childFrag        = null; 
-  	  
-  	if( visitCurrent )
-  	{
-  	  continueNavigate = peekFragmentListener_.notify( fragment );
-      dataManager_.process( fragment );
-  	}
-  	
-  	childFrag = fragment.getFirstSubFragment();
-   	
-  	while( childFrag != null && continueNavigate )
-  	{
-  	  continueNavigate = navigateChildFragments( childFrag, true );
-  	  childFrag        = fragment.getNextSubFragment( childFrag );
-  	}
-  	
-  	return continueNavigate;
-  }
-    
-  private boolean visitTop( IProgressMonitor monitor )
-  {  
-  	CommandListEntry entry           = (CommandListEntry)commandStack_.lastElement();
-  	boolean         continueNavigate = nextFragmentListener_.notify( entry.fragment_ );
-  	  
-  	if( continueNavigate )
-  	{
-  	  // Call the setters for this fragment.
-      dataManager_.process( entry.fragment_ );
-      
-      // Add any rules to the mapping registry before we execute the command.
-      entry.fragment_.registerDataMappings( dataManager_.getMappingRegistry() );
-   
-  	  lastStatus_ = runCommand( entry, monitor );
-  	  
-      if( afterExecuteFragmentListener_ != null )
-      {
-        continueNavigate = afterExecuteFragmentListener_.notify( entry.fragment_ );  
-        
-        if( !continueNavigate )
-        {
-          // The after execution listener has indicated that execution should stop.
-          // Therefore, we will upgrade the severity of the last status to ERROR.
-          lastStatus_ = new Status( IStatus.ERROR, 
-                                    lastStatus_.getPlugin(), 
-                                    lastStatus_.getCode(), 
-                                    lastStatus_.getMessage(),
-                                    lastStatus_.getException() );
-        }
-      }
-      
-  	  if( continueNavigate && lastStatus_.getSeverity() == IStatus.ERROR ) continueNavigate = false;
-  	}
-  	
-   	if( !continueNavigate ) entry.fragmentStopped_ = true;
-   	
-  	return continueNavigate;
-  }
-  
-  private void addToStack( CommandFragment fragment, int parentIndex )
-  {
-    CommandListEntry entry = new CommandListEntry( fragment, parentIndex );
-    commandStack_.push( entry );
-  }
-  
-  // Subclasses can do initialization before the execution of a command here
-  protected IStatus initBeforeExecute( AbstractDataModelOperation operation )
-  {  
-	  return Status.OK_STATUS;
-  }
-  
-  private IStatus runCommand( CommandListEntry entry, IProgressMonitor monitor )
-  {
-	CommandFactory factory  = entry.fragment_.getCommandFactory();
-  	IStatus      status   = Status.OK_STATUS;
-  	
-  	if( factory != null )
-  	{
-  	  AbstractDataModelOperation cmd  = factory.create();
-      
-  	  entry.command_ = cmd;
-  	    
-  	  if( cmd != null )
-  	  {
-  	    dataManager_.process( cmd );
-  	  	  
-  	    try
-  	    {
-          status = initBeforeExecute( cmd );
-          
-  	      environment_.getLog().log(ILog.INFO, "command", 5001, this, "runCommand", "Executing: " + cmd.getClass().getName());
-  	  	    
- 	        cmd.setEnvironment( environment_ );
-          status = cmd.execute( monitor, null );
-          
-		      entry.beforeExecute_ = false;
-  	    }
-  	    catch( Throwable exc )
-  	    {
-  	      IStatus      unexpectedError = StatusUtils.errorStatus( exc );
-          MultiStatus  parentStatus    = new MultiStatus( "id", 0, new IStatus[]{unexpectedError}, 
-                                                          EnvironmentCoreMessages.MSG_ERROR_UNEXPECTED_ERROR, null );
-  	      environment_.getStatusHandler().reportError( parentStatus );
-  	      status = unexpectedError;
-  	    }
-  	    finally
-  	    {
-  	      String message = "Ok";
-  	      
-  	      if( status.getSeverity() == Status.ERROR )
-  	      {
-  	        message = "Error: " + status.getMessage(); 
-  	      }
-  	      
-	      environment_.getLog().log(ILog.INFO, "command", 5001, this, "runCommand", "Execution status: " + message );
-  	    }
-  	  }
-  	}
-  	
-  	return status;
-  }
-    
-  private class CommandListEntry
-  {
-  	public CommandListEntry( CommandFragment fragment, int parentIndex )
-  	{
-  	  fragment_        = fragment;
-  	  parentIndex_     = parentIndex;
-  	  fragmentStopped_ = false;
-	  beforeExecute_   = true;
-  	}
-  	  	
-  	public AbstractDataModelOperation command_;
-  	public CommandFragment fragment_;
-  	public int             parentIndex_;
-  	public boolean         fragmentStopped_;
-	public boolean         beforeExecute_;
-  }    
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragmentFactory.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragmentFactory.java
deleted file mode 100644
index a99be49b3..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragmentFactory.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.fragment;
-
-/**
- * This interface provides a way to create CommandFragments.
- *
- */
-public interface CommandFragmentFactory
-{
-  /**
-   * 
-   * @return returns a created CommandFragment object.
-   */
-  public CommandFragment create();
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragmentFactoryFactory.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragmentFactoryFactory.java
deleted file mode 100644
index 0f1701c09..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragmentFactoryFactory.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.fragment;
-
-public interface CommandFragmentFactoryFactory 
-{
-  /**
-   * The framework calls this method to get the CommandFragmentFactory
-   * for a particular extension.
-   * 
-   * @return Creates a CommandFragmentFactory.
-   */
-  public CommandFragmentFactory create();  
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/ExtensionFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/ExtensionFragment.java
deleted file mode 100644
index 7751ba603..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/ExtensionFragment.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.fragment;
-
-import java.util.Hashtable;
-import org.eclipse.wst.command.internal.env.core.registry.CommandRegistry;
-
-
-public class ExtensionFragment extends AbstractCommandFragment 
-{
-  private String[]        ids_;;
-  private CommandRegistry extensionRegistry_;
-  private Hashtable       fragments_;
-  
-  /**
-   *  The default constructor
-   *
-   */
-  public ExtensionFragment()
-  {
-    super( null, "" );  
-    fragments_ = new Hashtable();
-  }
-    
-  /**
-   * Copy constructor.
-   * @param Fragment the fragment to copy
-   */
-  protected ExtensionFragment( ExtensionFragment fragment )
-  {
-    super( fragment );
-    
-    ids_               = fragment.ids_;
-    extensionRegistry_ = fragment.extensionRegistry_;
-    fragments_         = fragment.fragments_;
-  }
-  
-  /**
-   * 
-   * @param ids Sets the IDs for this extension fragment.
-   */
-  public void setExtensionIds( String[] ids )
-  {
-    ids_ = ids;
-  }
-  
-  /**
-   * 
-   * @param registry Sets the registry for this extension fragment.
-   */
-  public void setExtensionRegistry( CommandRegistry registry )
-  {
-    extensionRegistry_ = registry; 
-  }
-      
-  /**
-   * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#getFirstSubFragment()
-   */
-  public CommandFragment getFirstSubFragment() 
-  {
-    CommandFragmentFactoryFactory factory  = extensionRegistry_.getFactoryFactory( ids_ );
-    
-    if( factory == null ) return null;
-    
-    CommandFragment               fragment = (CommandFragment)fragments_.get( factory );
-    
-    if( fragment == null )
-    {
-      fragment = factory.create().create();
-      fragments_.put( factory, fragment );
-    }
-    
-    return  fragment;
-  }
-  
-  /**
-   * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#getNextSubFragment(org.eclipse.wst.command.internal.env.core.fragment.CommandFragment)
-   */
-  public CommandFragment getNextSubFragment(CommandFragment fragment) 
-  {
-    return null;
-  }
-  
-  /**
-   * @see java.lang.Object#clone()
-   */
-  public Object clone() 
-  {
-    return new ExtensionFragment( this );
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/FragmentListener.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/FragmentListener.java
deleted file mode 100644
index 01cd7a163..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/FragmentListener.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.fragment;
-
-/**
- * This interface should be implement for code that needs to listen to fragments
- * that are being traverse by the CommandFragmentEngine.
- *
- */
-public interface FragmentListener 
-{
-  /*
-   * Notifies this listener that a commandFragment is being visited during
-   * a traversal.
-   */
-  public boolean notify( CommandFragment commandFragment );
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/LoopCondition.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/LoopCondition.java
deleted file mode 100644
index 8c3e4d416..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/LoopCondition.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.fragment;
-
-/**
-  * This interface can be used when a conditional object needs to be returned.
-**/
-public interface LoopCondition
-{
-  /**
-    * Evaluates a loop condition.
-    *
-    * @param loop the loop fragment that is being evaluated.
-    * @param fragment the child fragment of the loop 
-    *        under evaluation.  Note: fragment can be null.
-    * @return returns an object based on some evaluated condition.
-  **/
-  public boolean evaluate( LoopFragment loop, CommandFragment fragment );
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/LoopFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/LoopFragment.java
deleted file mode 100644
index 60cdc9a72..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/LoopFragment.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.fragment;
-
-import org.eclipse.wst.command.internal.env.core.CommandFactory;
-import org.eclipse.wst.command.internal.env.core.common.RangeVector;
-
-
-/**
-  * This class returns a dynamically determined number of
-  * fragments.  This loop will return the fragment parameter
-  * as long as the stopCondition evaluates to false.  Otherwise,
-  * null is returned.
-**/
-public class LoopFragment extends AbstractCommandFragment
-{
-  private LoopCondition   stopCondition_;
-  private CommandFragment fragment_;
-  private RangeVector     fragmentHistory_;
-
-  /**
-    * Copy contructor for this fragment.
-  **/
-  protected LoopFragment( LoopFragment fragment )
-  {
-    this( fragment.fragment_,
-    	  fragment.stopCondition_,
-    	  fragment.getCommandFactory(),
-    	  fragment.getId() );
-  }
-  
-  public LoopFragment( CommandFragment fragment,
-                        LoopCondition   stopCondition )
-  {
-    this( fragment, stopCondition, null, "" );
-  }                       
-  
-  /**
-    * @param fragment the fragment that will be returned by the loop.
-    * @param stopCondition when false the fragment will be returned, 
-    * otherwise null is returned.
-    * @param state the state passed to the condition.
-    * @param command the executable command for this fragment.
-  **/
-  public LoopFragment( CommandFragment fragment,
-                       LoopCondition   stopCondition,
-                       CommandFactory  commandFactory,
-                       String          id   )
-  {
-    super( commandFactory, id );
-
-    fragment_        = fragment;
-    stopCondition_   = stopCondition;
-    fragmentHistory_ = new RangeVector();
-  }
-  
-  /**
-    * Makes a copy of the CommandFragment.
-    *
-    * @return returns a copy of this fragment.
-  **/
-  public Object clone()
-  {
-    return new LoopFragment( this );
-  }
-
-  /**
-    * Returns the index of the fragment
-    *
-    * @param fragment the fragment to search.
-    * @return the index of this fragment.
-  **/
-  public int indexOf( CommandFragment fragment )
-  {
-    return fragmentHistory_.indexOf( fragment );
-  }
-
-
-  /** 
-    * Gets the first child fragment for this fragment.
-    *
-    * @return returns the first child fragment for this fragment.  Returns
-    * null when there is no first child.
-  **/
-  public CommandFragment getFirstSubFragment()
-  {    
-    return getNextSubFragment( null );
-  }
-
-  /**
-    * Gets the next child fragment for this fragment.
-    *
-    * @return returns the next child fragment for this fragment.  Returns null
-    * when there is no next child.
-  **/
-  public CommandFragment getNextSubFragment( CommandFragment frag )
-  {
-    CommandFragment nextFrag  = null;
-    
-    if( stopCondition_.evaluate( this, frag ) )
-    {
-      // The stop condition has been met.
-      // Do nothing.
-    }
-    else
-    {      
-      int fragIndex = indexOf( frag );
-
-      // Note: when fragment == null the fragIndex
-      //       should be -1.  Therefore, if there
-      //       is already a first fragment in
-      //       fragmentHistory that will be returned.
-      if( fragIndex + 1 < fragmentHistory_.size() )
-      {
-        // We have a copy of the fragment already.
-        nextFrag = (CommandFragment)(fragmentHistory_.elementAt( fragIndex + 1 )); 
-      }
-      else
-      {
-        nextFrag = (CommandFragment)(fragment_.clone());
-        fragmentHistory_.add( nextFrag );
-      }
-    }
-
-    return nextFrag;
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/SequenceFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/SequenceFragment.java
deleted file mode 100644
index 190871230..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/SequenceFragment.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.fragment;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.wst.command.internal.env.core.CommandFactory;
-
-
-/**
-  * This class implements a sequence of CommandFragments.
-**/
-public class SequenceFragment extends AbstractCommandFragment
-{
-  private List fragmentList_;
-
-  protected SequenceFragment( SequenceFragment frag )
-  {
-  	super( frag.getCommandFactory(), frag.getId() );
-  	
-    fragmentList_ = new Vector();
-    
-    for( int index = 0; index < frag.fragmentList_.size(); index++ )
-    {
-      Object newFrag = ((CommandFragment)frag.fragmentList_.get(index)).clone();
-      fragmentList_.add( newFrag );
-    }
-  }
-  
-  public SequenceFragment( CommandFragment[] fragments, 
-						   CommandFactory    commandFactory, 
-					       String            id  )
-  {
-  	super( commandFactory, id );
-  	
-    if( fragments != null )
-    {
-      fragmentList_ = Arrays.asList( fragments );
-    }
-    else
-    {
-      fragmentList_ = new Vector();
-    }
-  }
-  
-  public SequenceFragment()
-  {
-  	super( null, "" );
-  	
-  	fragmentList_ = new Vector();
-  }
-
-  /**
-    * Appends a fragment to the sequence. 
-  **/
-  public void add( CommandFragment fragment )
-  {
-    fragmentList_.add( fragment );
-  }
-  
-  /**
-    * Makes a copy of the CommandFragment.
-    *
-    * @return returns a copy of this fragment.
-  **/
-  public Object clone()
-  {
-    return new SequenceFragment( this );
-  }
-
-  /** 
-    * Gets the first child fragment for this fragment.
-    *
-    * @return returns the first child fragment for this fragment.  Returns
-    * null when there is no first child.
-  **/
-  public CommandFragment getFirstSubFragment()
-  {
-    CommandFragment fragment = null;
-
-    if( fragmentList_ == null || fragmentList_.size() == 0 )
-    {
-      fragment = null;
-    }
-    else
-    {      
-      fragment = (CommandFragment)( fragmentList_.get(0) );
-    }
-
-    return fragment;    
-  }
-
-  /**
-    * Gets the next child fragment for this fragment.
-    *
-    * @return returns the next child fragment for this fragment.  Returns null
-    * when there is no next child.
-  **/
-  public CommandFragment getNextSubFragment( CommandFragment fragment )
-  {
-    int index = fragmentList_.indexOf( fragment );
-
-    if( index == -1 )
-    {
-      throw new IllegalArgumentException( "Fragment not found in sequence.");
-    }
-    else
-    {
-      index++;
-
-      if( index >= fragmentList_.size() )
-      {
-        // There is nothing following this fragment so return null;
-        return null;
-      }
-      else
-      {
-        // Return the next fragment.
-        return (CommandFragment)(fragmentList_.get( index ));
-      }
-    }
-  }	
-}  
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/SimpleFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/SimpleFragment.java
deleted file mode 100644
index 0d1f1e4eb..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/SimpleFragment.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.fragment;
-
-import org.eclipse.wst.command.internal.env.core.CommandFactory;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
-  * This class implements an empty of WizardFragment.
-**/
-public class SimpleFragment extends AbstractCommandFragment
-{
-  public SimpleFragment()
-  {
-    this( (CommandFactory)null, "" );
-  }
-  
-  public SimpleFragment( String id )
-  {
-    this( (CommandFactory)null, id );  
-  }
-  
-  public SimpleFragment( final AbstractDataModelOperation operation, String id )
-  {
-    super( new CommandFactory()
-           {
-             public AbstractDataModelOperation create()
-             {
-               return operation;
-             }
-           }, id );  
-  }
-  
-  public SimpleFragment( CommandFactory commandFactory, String id )
-  {
-  	super( commandFactory, id );
-  }
-  
-  /**
-    * Copy constructor for fragment.
-  **/
-  protected SimpleFragment( SimpleFragment fragment )
-  {
-    super( fragment.getCommandFactory(), fragment.getId() );
-  }
-    
-  /**
-    * All wizard fragments need to be cloneable.
-  **/
-  public Object clone()
-  {
-    return new SimpleFragment( this );
-  }
-
-
-  /** 
-    * Gets the first child fragment for this fragment.
-    *
-    * @return returns the first child fragment for this fragment.  Returns
-    * null when there is no first child.
-  **/
-  public CommandFragment getFirstSubFragment(){ return null; }
-
-  /**
-    * Gets the next child fragment for this fragment.
-    * Since this is a simple fragment, there is no next fragment
-    * so we will always return null. 
-    *
-    * @return returns the next child fragment for this fragment.  Returns null
-    * when there is no next child.
-  **/  
-  public CommandFragment getNextSubFragment( CommandFragment fragment ){ return null; }
-}  
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/registry/CommandRegistry.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/registry/CommandRegistry.java
deleted file mode 100644
index 86f4829b5..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/registry/CommandRegistry.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.registry;
-
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactoryFactory;
-
-/**
- * This interface provides a way to create a CommandFragmentFactoryFactory
- * from an array of ids.
- *
- */
-public interface CommandRegistry 
-{  
-  /**
-   * Creates a CommandFragmentFactoryFactory from an array of ids.
-   * 
-   * @param ids the ids.
-   * @return the CommandFragmentFactoryFactory object.
-   */
-  public CommandFragmentFactoryFactory getFactoryFactory( String[] ids );
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/BooleanSelection.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/BooleanSelection.java
deleted file mode 100644
index b2ee8b00a..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/BooleanSelection.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- * This class combines a string with a boolean value.  This is
- * useful for storing the state data for a boolean selection list.
- */
-package org.eclipse.wst.command.internal.env.core.selection;
-
-public class BooleanSelection
-{
-  private String  value_;
-  private boolean selected_;
-  
-  public BooleanSelection( String value, boolean selected )
-  {
-    value_    = value;
-    selected_ = selected;
-  }
-  
-  /**
-   * 
-   * @return Get the string value.
-   */
-  public String getValue()
-  {
-    return value_;
-  }
-  
-  /**
-   * 
-   * @return Get the boolean value for this string.
-   */
-  public boolean isSelected()
-  {
-    return selected_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/ChoicesToString.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/ChoicesToString.java
deleted file mode 100644
index 3453a0203..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/ChoicesToString.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.selection;
-
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-
-/**
- * This transformer class selects a string at a particular level
- * in a SelectionListChoices class.
- */
-public class ChoicesToString implements Transformer
-{
-  private int level_;
-  
-  public ChoicesToString( int level )
-  {
-    level_ = level;
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.internal.env.core.data.Transformer#transform(java.lang.Object)
-   */
-  public Object transform( Object value )
-  {
-    SelectionListChoices choices = (SelectionListChoices)value;
-    
-    for( int index = 0; index < level_; index++ )
-    {
-      choices = choices.getChoice();
-    }
-    
-    return choices.getList().getSelection();
-  }
-
-  public SelectionList transform( SelectionListChoices choices )
-  {
-    return (SelectionList)transform( (Object)choices );
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/DynamicList.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/DynamicList.java
deleted file mode 100644
index 937d38d13..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/DynamicList.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.selection;
-
-import java.util.Vector;
-
-/**
- * This is a Dynamic version of the SelectionListChoices class.
- */
-public class DynamicList 
-{
-  private Vector stringList_ = new Vector();
-  private Vector dynamicListVectorList_ = new Vector();
-  
-  /**
-   * Adds an entry into the dynamic list.
-   * 
-   * @param values the string values that lead to the target.
-   * @param target the target.
-   */
-  public void add( String[] values, Object target )
-  {
-    DynamicList currentList = this;
-    
-    for( int index = 0; index < values.length; index++ )
-    {
-      String value      = values[index];
-      int    length     = currentList.stringList_.size();
-      int    foundIndex = -1;
-      
-      // Find the string in the current list.
-      for( int searchIndex = 0; searchIndex < length; searchIndex++ )
-      {
-        String string = (String)currentList.stringList_.elementAt( searchIndex ); 
-        
-        if( string.equals( value ) ) 
-        {
-          foundIndex = searchIndex;
-          break;
-        }
-      }
-      
-      if( foundIndex == -1 )
-      {
-        // We have a new string so add it to the list.
-        currentList.stringList_.add( value );
-        currentList.dynamicListVectorList_.add( new DynamicList() );
-        foundIndex = length;
-      }
-      
-      currentList = (DynamicList)currentList.dynamicListVectorList_.elementAt( foundIndex );       
-    }
-    
-    currentList.dynamicListVectorList_.add( target );
-  }
-  
-  /**
-   * 
-   * @return returns a SelectionListChoices object from this DynamicList
-   * object.
-   */
-  public SelectionListChoices toListChoices()
-  {
-    SelectionList list   = new SelectionList( (String[])stringList_.toArray( new String[0] ), 0);
-    int           length = dynamicListVectorList_.size();
-    Vector        vector = new Vector(); 
-    
-    for( int index = 0; index < length; index++ )
-    {
-      Object obj = dynamicListVectorList_.elementAt(index);
-      
-      if( obj instanceof DynamicList )
-      {
-        vector.add( ((DynamicList)obj).toListChoices() );
-      }
-      else
-      {
-        vector.add( obj );
-      }
-    }
-    
-    return new SelectionListChoices( list, vector );
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/SelectionList.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/SelectionList.java
deleted file mode 100644
index e52ebdc65..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/SelectionList.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.selection;
-
-/**
- * This class stores a list strings along with a selectionIndex which
- * stores the current string that selected.  There is also a selection
- * value.  If this value is one of the strings in the the string list
- * then selectionIndex will contain the index of this string.  If it
- * is not in the list then the selectionValue string will contain this
- * value and selectionIndex will be set to -1.  This class can be
- * used to store the state data for a Combo box.
- */
-public class SelectionList
-{
-  private int      selectionIndex_;
-  private String[] list_;
-  private String   selectionValue_;
-  
-  public SelectionList( String[] list, int selectionIndex )
-  {
-    list_           = list;
-    selectionIndex_ = selectionIndex;
-  }
-  
-  /**
-   * Sets the selection value for this object.
-   * 
-   * @param value the value.
-   */
-  public void setSelectionValue( String value )
-  {
-    selectionValue_ = value;  
-    selectionIndex_ = -1;
-    
-    for( int index = 0; index < list_.length; index++ )
-    {
-      if( value.equals( list_[index] ) )
-      {
-        selectionIndex_ = index;
-        break;
-      }
-    }
-  } 
-  
-  /*
-   * @return returns the string list.
-   */
-  public String[] getList()
-  {
-    return list_;
-  }
-  
-  /*
-   * Sets the currently selected string in the list.
-   */
-  public void setIndex( int index )
-  {
-    selectionIndex_ = index;
-    selectionValue_ = null;
-  }
- 
-  /*
-   * @return returns the index of the current string.  The value
-   * will be -1 if the selection value is not in the string list.
-   */
-  public int getIndex()
-  {
-    return selectionIndex_;  
-  }
-  
-  /*
-   * @return returns the current string selection for this object.
-   */
-  public String getSelection()
-  {
-    if( selectionValue_ != null ) return selectionValue_;
-    
-    if( selectionIndex_ == -1 || selectionIndex_ > list_.length-1 )
-    {
-      return "";
-    }
-    else
-    {
-      return list_[ selectionIndex_ ];
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/SelectionListChoices.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/SelectionListChoices.java
deleted file mode 100644
index 6c6aba878..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/SelectionListChoices.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.selection;
-
-import java.util.Vector;
-
-/*
- * This class can be used to store a hierarchy of SelectionList
- * objects.
- */
-public class SelectionListChoices
-{
-  private SelectionList selectionList_;
-  private Vector        choices_;
-  private SelectionList newValueSelectionList_;
-  
-  /**
-   * 
-   * @param list     The selection list.
-   * @param choices  This is a vector of SelectionListChoies and can be
-   *                 null if there are no choices.  This index of list
-   *                 is used to index into choices.  If index is -1 then
-   *                 the newValueSelectionList is used.
-   */
-  public SelectionListChoices( SelectionList list, Vector choices )
-  {
-    selectionList_ = list;
-    choices_       = choices;
-    
-    newValueSelectionList_ = new SelectionList( new String[0], -1 );
-  }
-  
-  public SelectionListChoices( SelectionList list, Vector choices, SelectionList newList )
-  {
-    this( list, choices );
-    newValueSelectionList_ = newList;
-  }
-  
-  /**
-   * @return returns the current Selection list.
-   */
-  public SelectionList getList()
-  {
-    return selectionList_;
-  }
-  
-  /**
-   * 
-   * @return returns the choices for this object.
-   */
-  public Vector getChoices()
-  {
-    return choices_;
-  }
-  
-  /**
-   * 
-   * @param level the level in the hierarchy where we want to get the choices.
-   * @return returns a vector of SelectionListChoices.
-   */
-  public Vector getChoicesAtLevel( int level )
-  {
-    SelectionListChoices choices = this;
-    
-    for( int index = 0; index < level; index++ )
-    {
-      choices = choices.getChoice();
-    }
-    
-    return choices.getChoices();
-  }
-  
-  /**
-   * 
-   * @return returns the current SelectionListChoice
-   */
-  public SelectionListChoices getChoice()
-  {
-    int                  selectionIndex = selectionList_.getIndex();
-    SelectionListChoices result         = null;
-    
-    if( selectionIndex == -1 )
-    {
-      result = new SelectionListChoices( newValueSelectionList_, null );
-    }
-    else if( choices_ != null && choices_.size() != 0 ) 
-    {
-      result = (SelectionListChoices)choices_.elementAt( selectionIndex );
-    }
-    
-    return result;
-  }
-  
-  /**
-   * 
-   * @param index the index of the choice we want.
-   * @return returns the SelectionListChoice at the index specified.
-   */
-  public SelectionListChoices getChoice(int index)
-  {
-    SelectionListChoices result = null;
-    if (index < 0 || index >= getList().getList().length)
-    {
-      result = new SelectionListChoices( newValueSelectionList_, null );      
-    }
-    else
-    {
-      result = (SelectionListChoices)choices_.elementAt( index );
-    }
-      
-    return result;
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/uri/NativeFileCommand.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/uri/NativeFileCommand.java
deleted file mode 100644
index ef51355ea..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/uri/NativeFileCommand.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.uri;
-
-import java.io.File;
-import java.util.LinkedList;
-import java.util.List;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.wst.common.environment.uri.IURI;
-import org.eclipse.wst.common.environment.uri.URIException;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public abstract class NativeFileCommand extends AbstractDataModelOperation
-{
-  protected String name;
-
-  protected String description;
-
-  protected IURI[] urisToRead;
-
-  protected IURI[] urisToWrite;
-
-  protected NativeFileCommand ()
-  {
-    this(null,null);
-  }
-
-  protected NativeFileCommand ( String name, String description )
-  {
-    this.name = name;
-    this.description = description;
-  }
-
-  public String getName ()
-  {
-    return name;
-  }
-
-  public String getDescription ()
-  {
-    return description;
-  }
-
-  public void setURIsToRead ( IURI[] urisToRead )
-  {
-    this.urisToRead = urisToRead;
-  }
-
-  public IURI[] getURIsToRead ()
-  {
-    return urisToRead;
-  }
-
-  public void setURIsToWrite ( IURI[] urisToWrite )
-  {
-    this.urisToWrite = urisToWrite;
-  }
-
-  public IURI[] getURIsToWrite ()
-  {
-    return urisToWrite;
-  }
-
-  public IStatus execute ( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    File[] filesToRead = getFiles(urisToRead);
-    File[] filesToWrite = getFiles(urisToWrite);
-    preProcess(filesToRead,filesToWrite);
-    IStatus status = execute(filesToRead,filesToWrite);
-    postProcess(filesToRead,filesToWrite);
-    return status;
-  }
-
-  public abstract IStatus execute ( File[] filesToRead, File[] filesToWrite );
-
-  private void preProcess ( File[] filesToRead, File[] filesToWrite )
-  {
-    // TBD.
-  }
-
-  private void postProcess ( File[] filesToRead, File[] filesToWrite )
-  {
-    // TBD.
-  }
-
-  private File[] getFiles ( IURI[] uris )
-  {
-    List list = new LinkedList();
-    if (uris != null)
-    {
-      for (int i=0; i<uris.length; i++)
-      {
-        if (uris[i].isAvailableAsFile())
-        {
-          try
-          {
-            list.add(uris[i].asFile());
-          }
-          catch (URIException e)
-          {
-          }
-        }
-      }
-    }
-    return (File[])list.toArray(new File[0]);
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/.classpath b/bundles/org.eclipse.wst.command.env.ui/.classpath
deleted file mode 100644
index 751c8f2e5..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.wst.command.env.ui/.cvsignore b/bundles/org.eclipse.wst.command.env.ui/.cvsignore
deleted file mode 100644
index 156443ac0..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-build.xml
-runtime
-temp.folder
-envui.jar
-@dot
-src.zip
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 ceb0b3793..000000000
--- 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/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.wst.command.env.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index d87aee152..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,57 +0,0 @@
-#Mon Jan 30 10:37:28 EST 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/bundles/org.eclipse.wst.command.env.ui/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.wst.command.env.ui/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index cbae875a4..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Jan 30 10:40:30 EST 2006
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.wst.command.env.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.command.env.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 82e13c598..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,26 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.wst.command.env.ui; singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.wst.command.internal.env.ui.plugin.EnvUIPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.command.internal.env.ui,
- org.eclipse.wst.command.internal.env.ui.dialog,
- org.eclipse.wst.command.internal.env.ui.eclipse,
- org.eclipse.wst.command.internal.env.ui.plugin,
- org.eclipse.wst.command.internal.env.ui.preferences,
- org.eclipse.wst.command.internal.env.ui.registry,
- org.eclipse.wst.command.internal.env.ui.widgets,
- org.eclipse.wst.command.internal.env.ui.widgets.popup
-Require-Bundle: org.eclipse.wst.command.env.core,
- org.eclipse.wst.command.env,
- org.eclipse.core.runtime,
- org.eclipse.ui,
- org.eclipse.osgi,
- org.eclipse.wst.common.frameworks,
- org.eclipse.wst.common.environment,
- org.eclipse.core.resources,
- org.eclipse.ui.ide
-Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.wst.command.env.ui/about.html b/bundles/org.eclipse.wst.command.env.ui/about.html
deleted file mode 100644
index 6f6b96c4c..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.command.env.ui/build.properties b/bundles/org.eclipse.wst.command.env.ui/build.properties
deleted file mode 100644
index 74d7e4984..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-bin.includes = plugin.xml,\
-               *.jar,\
-               .,\
-               META-INF/,\
-               icons/,\
-               plugin.properties,\
-               about.html
-source.. = src/
-output.. = bin/
-src.includes = schema/
diff --git a/bundles/org.eclipse.wst.command.env.ui/icons/full/obj16/ant_buildfile.gif b/bundles/org.eclipse.wst.command.env.ui/icons/full/obj16/ant_buildfile.gif
deleted file mode 100644
index 6df3469e5..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/icons/full/obj16/ant_buildfile.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.command.env.ui/icons/full/wizban/newantfiles_wiz.gif b/bundles/org.eclipse.wst.command.env.ui/icons/full/wizban/newantfiles_wiz.gif
deleted file mode 100644
index bc3553cd7..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/icons/full/wizban/newantfiles_wiz.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.command.env.ui/icons/full/wizban/webservices_wiz.gif b/bundles/org.eclipse.wst.command.env.ui/icons/full/wizban/webservices_wiz.gif
deleted file mode 100644
index abd1f9c82..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/icons/full/wizban/webservices_wiz.gif
+++ /dev/null
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 2c57ea915..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/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 (GUI)
-PLUGIN_PROVIDER=Eclipse.org
-
-WIDGET_REGISTRY_NAME=Widget contributor registry
-
-PLUGIN_XP_ANT_WIZARD_NAME=Ant Files
-PLUGIN_XP_ANT_WIZARD_DESC=Create Ant script and properties files in the workspace.
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 ed639852d..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/plugin.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
-<extension
-         point="org.eclipse.ui.newWizards">
-      <wizard
-            name="%PLUGIN_XP_ANT_WIZARD_NAME"
-            icon="icons/full/obj16/ant_buildfile.gif"
-            category="org.eclipse.jst.ws.ui.new"
-            class="org.eclipse.wst.command.internal.env.ui.dialog.AntFileImportWizard"
-            id="org.eclipse.wst.command.env.ui.AntFileImportWizard">
-         <description>
-            %PLUGIN_XP_ANT_WIZARD_DESC
-         </description>
-      </wizard>
-   </extension>
-
-   <!-- The following extension point is internal and likely to be removed in a future release. -->
-   <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 596cc7c33..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/schema/widgetRegistry.exsd
+++ /dev/null
@@ -1,117 +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="Widget Registry"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="widgetFactory"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified identifier of the target extension point
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  an optional identifier of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  an optional name of the extension instance
-               </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>
-         &lt;b&gt;This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.&lt;/b&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;
-All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
-this distribution, and is available at &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/EnvironmentUI.properties b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/EnvironmentUI.properties
deleted file mode 100644
index 7b5414cbe..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/EnvironmentUI.properties
+++ /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
-###############################################################################
-
-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.
-
-WIZARD_TITLE_ANT=Create Ant Files
-WIZARD_PAGE_TITLE_ANT=Create Web Service Ant files
-WIZARD_PAGE_DESC_ANT=Select workspace folder for Ant script and properties files
-MSG_STATUS_COPYING_ANT_FILES=Copying web services Ant files
-MSG_ERR_COPYING_ANT_FILES=Error encountered copying Ant files
-
-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/EnvironmentUIMessages.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/EnvironmentUIMessages.java
deleted file mode 100644
index c7ce6df03..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/EnvironmentUIMessages.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class EnvironmentUIMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.wst.command.internal.env.ui.EnvironmentUI";//$NON-NLS-1$
-
-	private EnvironmentUIMessages() {
-		// Do not instantiate
-	}
-
-	public static String BUTTON_SHOW_ALL_DIALOGS;
-	public static String BUTTON_HIDE_ALL_DIALOGS;
-	public static String CHECKBOX_DO_NOT_SHOW_DIALOG_AGAIN;
-	public static String TOOLTIP_PPAD_PAGE;
-	public static String TOOLTIP_DO_NOT_SHOW_DIALOG_AGAIN;
-	public static String TOOLTIP_PPAD_BUTTON_SHOW_ALL;
-	public static String TOOLTIP_PPAD_BUTTON_HIDE_ALL;
-	public static String MSG_ERROR_WIZARD_ID_NOT_FOUND;
-	public static String WIZARD_TITLE_ANT;
-	public static String WIZARD_PAGE_TITLE_ANT;
-	public static String WIZARD_PAGE_DESC_ANT;
-	public static String MSG_STATUS_COPYING_ANT_FILES;
-	public static String MSG_ERR_COPYING_ANT_FILES;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, EnvironmentUIMessages.class);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/AntFileImportWizard.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/AntFileImportWizard.java
deleted file mode 100644
index 274290f5c..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/AntFileImportWizard.java
+++ /dev/null
@@ -1,245 +0,0 @@
-package org.eclipse.wst.command.internal.env.ui.dialog;
-
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IResource;
-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.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.Wizard;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchPartReference;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.part.ISetSelectionTarget;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.command.internal.env.core.common.ProgressUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.env.core.context.TransientResourceContext;
-import org.eclipse.wst.command.internal.env.plugin.EnvPlugin;
-import org.eclipse.wst.command.internal.env.ui.EnvironmentUIMessages;
-import org.eclipse.wst.command.internal.env.ui.plugin.EnvUIPlugin;
-import org.eclipse.wst.common.environment.IStatusHandler;
-import org.eclipse.wst.common.environment.NullStatusHandler;
-//import org.eclipse.wst.common.environment.IEnvironment;
-
-public class AntFileImportWizard extends Wizard implements INewWizard {
-
-	//private IConfigurationElement fConfigElement;
-	private AntFileImportWizardPage mainPage;
-	/**
-     * The workbench.
-     */
-    private IWorkbench workbench;
-
-    /**
-     * The current selection.
-     */
-    protected IStructuredSelection selection;
-    
-	public AntFileImportWizard()
-	{
-		super();		 
-		setWindowTitle(EnvironmentUIMessages.WIZARD_TITLE_ANT);
-	}
-	
-	public void setWindowTitle(String newTitle) {
-		super.setWindowTitle(newTitle);
-	}
-	
-	 public void addPages() {
-	        super.addPages();	        
-	        mainPage = new AntFileImportWizardPage(EnvironmentUIMessages.WIZARD_PAGE_TITLE_ANT, getSelection());
-            addPage(mainPage);
-	    }
-	
-	public boolean performFinish() {	
-		IPath destination = mainPage.getPath();
-		if (destination == null)
-		{
-			return false;
-		}			
-		else
-		{
-			//jvh: TODO: add extension so extenders of the command framework can register properties files to import
-			//  here we pick up all registered Ant files and import - also would be nice to allow user to choose a subset
-			String[] sourceFiles = new String[]{"ant/wsgen.xml", "ant/axisclient.properties", "ant/axisservice.properties"}; //$NON-NLS$
-			for (int i = 0; i < sourceFiles.length; i++) {
-				String fileSource = sourceFiles[i];
-				String targetFile = fileSource;
-				//strip any leading segments off of targetFile
-				int fileStart = targetFile.lastIndexOf("/");
-				if (fileStart >= 0)
-				{
-				  targetFile = targetFile.substring(fileStart);
-				}
-				Plugin sourcePlugin = EnvPlugin.getInstance();  
-				//jvh: TODO - add real progress monitor in here...
-				copyIFile(sourcePlugin, fileSource, destination, targetFile, (IProgressMonitor)new NullProgressMonitor());					
-			}
-		}
-	    return true;		
-  }	
-	
-	private IStatus copyIFile(Plugin plugin, String source, IPath targetPath, String targetFile, /*IEnvironment env,*/ IProgressMonitor monitor )
-	{
-	    
-	  if (plugin != null)
-	  {
-	    IPath target = targetPath.append(new Path(targetFile));
-	    
-	    ProgressUtils.report( monitor, EnvironmentUIMessages.MSG_STATUS_COPYING_ANT_FILES);
-	    try
-	    {
-	       ResourceContext context = new TransientResourceContext();
-	       context.setOverwriteFilesEnabled(true);
-	       context.setCreateFoldersEnabled(true);
-	       context.setCheckoutFilesEnabled(true);
-	       IResource resource = FileResourceUtils.findResource(target);
-	       if(resource != null) return Status.OK_STATUS;
-	       FileResourceUtils.createFile(context, 
-	                      							target,
-	                                    plugin.openStream(new Path(source)),
-	                                    monitor, (IStatusHandler)new NullStatusHandler());
-	       
-	                                    
-	    }
-	    catch (Exception e) {	    	
-	      return StatusUtils.errorStatus(EnvironmentUIMessages.MSG_ERR_COPYING_ANT_FILES, e);
-	    }
-	  }
-	  return Status.OK_STATUS;
-	}
-	
-    /**
-     * Returns the selection which was passed to <code>init</code>.
-     *
-     * @return the selection
-     */
-    public IStructuredSelection getSelection() {
-        return selection;
-    }
-
-    /**
-     * Returns the workbench which was passed to <code>init</code>.
-     *
-     * @return the workbench
-     */
-    public IWorkbench getWorkbench() {
-        return workbench;
-    }
-
-    /**
-     * The <code>BasicNewResourceWizard</code> implementation of this 
-     * <code>IWorkbenchWizard</code> method records the given workbench and
-     * selection, and initializes the default banner image for the pages
-     * by calling <code>initializeDefaultPageImageDescriptor</code>.
-     * Subclasses may extend.
-     */
-    public void init(IWorkbench workbench, IStructuredSelection currentSelection) {
-        this.workbench = workbench;
-        this.selection = currentSelection;
-
-        initializeDefaultPageImageDescriptor();
-    }
-
-    /**
-     * Initializes the default page image descriptor to an appropriate banner.
-     * By calling <code>setDefaultPageImageDescriptor</code>.
-     * The default implementation of this method uses a generic new wizard image.
-     * <p>
-     * Subclasses may reimplement.
-     * </p>
-     */
-    protected void initializeDefaultPageImageDescriptor() {
-    	ImageDescriptor desc = EnvUIPlugin.getImageDescriptor("icons/full/wizban/newantfiles_wiz.gif");//$NON-NLS-1$
-        setDefaultPageImageDescriptor(desc);
-    }
-
-    /**
-     * Selects and reveals the newly added resource in all parts
-     * of the active workbench window's active page.
-     *
-     * @see ISetSelectionTarget
-     */
-    protected void selectAndReveal(IResource newResource) {
-        selectAndReveal(newResource, getWorkbench().getActiveWorkbenchWindow());
-    }
-
-    /**
-     * Attempts to select and reveal the specified resource in all
-     * parts within the supplied workbench window's active page.
-     * <p>
-     * Checks all parts in the active page to see if they implement <code>ISetSelectionTarget</code>,
-     * either directly or as an adapter. If so, tells the part to select and reveal the
-     * specified resource.
-     * </p>
-     *
-     * @param resource the resource to be selected and revealed
-     * @param window the workbench window to select and reveal the resource
-     * 
-     * @see ISetSelectionTarget
-     */
-    public static void selectAndReveal(IResource resource,
-            IWorkbenchWindow window) {
-        // validate the input
-        if (window == null || resource == null)
-            return;
-        IWorkbenchPage page = window.getActivePage();
-        if (page == null)
-            return;
-
-        // get all the view and editor parts
-        List parts = new ArrayList();
-        IWorkbenchPartReference refs[] = page.getViewReferences();
-        for (int i = 0; i < refs.length; i++) {
-            IWorkbenchPart part = refs[i].getPart(false);
-            if (part != null)
-                parts.add(part);
-        }
-        refs = page.getEditorReferences();
-        for (int i = 0; i < refs.length; i++) {
-            if (refs[i].getPart(false) != null)
-                parts.add(refs[i].getPart(false));
-        }
-
-        final ISelection selection = new StructuredSelection(resource);
-        Iterator itr = parts.iterator();
-        while (itr.hasNext()) {
-            IWorkbenchPart part = (IWorkbenchPart) itr.next();
-
-            // get the part's ISetSelectionTarget implementation
-            ISetSelectionTarget target = null;
-            if (part instanceof ISetSelectionTarget)
-                target = (ISetSelectionTarget) part;
-            else
-                target = (ISetSelectionTarget) part
-                        .getAdapter(ISetSelectionTarget.class);
-
-            if (target != null) {
-                // select and reveal resource
-                final ISetSelectionTarget finalTarget = target;
-                window.getShell().getDisplay().asyncExec(new Runnable() {
-                    public void run() {
-                        finalTarget.selectReveal(selection);
-                    }
-                });
-            }
-        }
-    }
-	
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/AntFileImportWizardPage.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/AntFileImportWizardPage.java
deleted file mode 100644
index da9442236..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/AntFileImportWizardPage.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.eclipse.wst.command.internal.env.ui.dialog;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.dialogs.WizardResourceImportPage;
-import org.eclipse.wst.command.internal.env.ui.EnvironmentUIMessages;
-
-public class AntFileImportWizardPage extends WizardResourceImportPage{
-	  
-	public AntFileImportWizardPage(String pageName,
-	            IStructuredSelection selection) {
-	        super("WSAntFilesPage1", selection);//$NON-NLS-1$
-	        setTitle(pageName);	        
-	        setDescription(EnvironmentUIMessages.WIZARD_PAGE_DESC_ANT);	        
-	    }
-	
-	protected ITreeContentProvider getFileProvider() {
-		return null;
-	}
-	
-	public IPath getPath()
-	{
-		return getContainerFullPath();
-	}
-	
-		protected void createSourceGroup(Composite parent) {
-			//don't need source group
-		}
-	
-	protected ITreeContentProvider getFolderProvider() {
-		 return null;
-	}
-	
-	protected void createOptionsGroup(Composite parent) {
-        //empty - don't want an options group 
-    }
-	
-	
-	
-}
-
-
-
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 16cc76ad6..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/ErrorDialog.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.dialog;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * A dialog to display one or more errors to the user, as contained in an
- * <code>Status</code> object. If an error contains additional detailed
- * information then a Details button is automatically supplied, which shows or
- * hides an error details viewer when pressed by the user.
- *  
- */
-public class ErrorDialog extends MessageDialog
-{
-
-  /**
-   * Creates an error dialog. Note that the dialog will have no visual
-   * representation (no widgets) until it is told to open.
-   * <p>
-   * Normally one should use <code>openError</code> to create and open one of
-   * these. This constructor is useful only if the error object being displayed
-   * contains child items <it>and</it> you need to specify a mask which will
-   * be used to filter the displaying of these children.
-   * </p>
-   * 
-   * @param parentShell
-   *            the shell under which to create this dialog
-   * @param dialogTitle
-   *            the title to use for this dialog, or <code>null</code> to
-   *            indicate that the default title should be used
-   * @param message
-   *            the message to show in this dialog, or <code>null</code> to
-   *            indicate that the error's message should be shown as the
-   *            primary message
-   * @param status
-   *            the error to show to the user
-   * @param displayMask
-   *            the mask to use to filter the displaying of child items, as per
-   *            <code>Status.matches</code>
-   */
-  public ErrorDialog(
-    Shell parentShell,
-    String dialogTitle,
-    String message,
-    IStatus status,
-    int displayMask)
-  {
-    super(parentShell, dialogTitle, message, status, displayMask);
-  }
-
-  /*
-   * (non-Javadoc) This should also be overwritten Method declared on Dialog.
-   */
-  protected void createButtonsForButtonBar(Composite parent)
-  {
-    // create OK and Details buttons
-    createButton(
-      parent,
-      StatusDialogConstants.OK_ID,
-      IDialogConstants.OK_LABEL,
-      true);
-    if (status.isMultiStatus() || status.getException() != null )
-    {
-      detailsButton =
-        createButton(
-          parent,
-          StatusDialogConstants.DETAILS_ID,
-          IDialogConstants.SHOW_DETAILS_LABEL,
-          false);
-    }
-  }
-
-  /*
-   * This is one of the few methods that needs to be overwritten by the
-   * subclasses. The image names can be found in the Dialog class
-   */
-  protected Image getDialogImage()
-  {
-    // create image
-    return PlatformUI.getWorkbench().getDisplay().getSystemImage(SWT.ICON_ERROR);
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/InfoDialog.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/InfoDialog.java
deleted file mode 100644
index fa6c84f0a..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/InfoDialog.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.dialog;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * A dialog to display one or more errors to the user, as contained in an
- * <code>Status</code> object. If an error contains additional detailed
- * information then a Details button is automatically supplied, which shows or
- * hides an error details viewer when pressed by the user.
- *  
- */
-public class InfoDialog extends MessageDialog
-{
-  /**
-   * Creates an error dialog. Note that the dialog will have no visual
-   * representation (no widgets) until it is told to open.
-   * <p>
-   * Normally one should use <code>openError</code> to create and open one of
-   * these. This constructor is useful only if the error object being displayed
-   * contains child items <it>and</it> you need to specify a mask which will
-   * be used to filter the displaying of these children.
-   * </p>
-   * 
-   * @param parentShell
-   *            the shell under which to create this dialog
-   * @param dialogTitle
-   *            the title to use for this dialog, or <code>null</code> to
-   *            indicate that the default title should be used
-   * @param message
-   *            the message to show in this dialog, or <code>null</code> to
-   *            indicate that the error's message should be shown as the
-   *            primary message
-   * @param status
-   *            the error to show to the user
-   * @param displayMask
-   *            the mask to use to filter the displaying of child items, as per
-   *            <code>Status.matches</code>
-   */
-  public InfoDialog(
-    Shell parentShell,
-    String dialogTitle,
-    String message,
-    IStatus status,
-    int displayMask)
-  {
-    super(parentShell, dialogTitle, message, status, displayMask);
-  }
-
-  /*
-   * (non-Javadoc) This should also be overwritten Method declared on Dialog.
-   */
-  protected void createButtonsForButtonBar(Composite parent)
-  {
-    // create OK and Details buttons
-    createButton(
-      parent,
-      StatusDialogConstants.OK_ID,
-      IDialogConstants.OK_LABEL,
-      true);
-    if (status.isMultiStatus() )
-    {
-      detailsButton =
-        createButton(
-          parent,
-          StatusDialogConstants.DETAILS_ID,
-          IDialogConstants.SHOW_DETAILS_LABEL,
-          false);
-    }
-  }
-
-  /*
-   * This is one of the few methods that needs to be overwritten by the
-   * subclasses. The image names can be found in the Dialog class
-   */
-  protected Image getDialogImage()
-  {
-    // create image
-    return PlatformUI.getWorkbench().getDisplay().getSystemImage(SWT.ICON_INFORMATION);
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/MessageDialog.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/MessageDialog.java
deleted file mode 100644
index f75cc47a2..000000000
--- 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.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.common.StringUtils;
-import org.eclipse.wst.common.environment.Choice;
-
-
-/**
- * A dialog to display one or more errors to the user, as contained in an
- * <code>Status</code> object. If an error contains additional detailed
- * information then a Details button is automatically supplied, which shows or
- * hides an error details viewer when pressed by the user.
- *  
- */
-public class MessageDialog extends Dialog
-{
-  protected Composite parent;
-
-  /**
-   * Reserve room for this many list items.
-   */
-  protected static final int LIST_ITEM_COUNT = 7;
-
-  /**
-   * The Details button.
-   */
-  protected Button detailsButton;
-
-  /**
-   * The title of the dialog.
-   */
-  protected String title;
-
-  /**
-   * The message to display.
-   */
-  protected String message;
-
-  /**
-   * The SWT list control that displays the error details.
-   */
-  protected List list;
-  protected Text details;
-
-  /**
-   * Indicates whether the error details viewer is currently created.
-   */
-  protected boolean listCreated = false;
-  protected boolean detailsCreated = false;
-
-  /**
-   * Filter mask for determining which status items to display.
-   */
-  protected int displayMask = 0xFFFF;
-
-  /**
-   * The main status object.
-   */
-  protected IStatus status;
-  
-  private Point savedSize = null;
-
-  /**
-   * List of the main error object's detailed errors (element type: <code>Status</code>).
-   */
-  protected java.util.List statusList;
-  /**
-   * Creates an error dialog. Note that the dialog will have no visual
-   * representation (no widgets) until it is told to open.
-   * <p>
-   * Normally one should use <code>openError</code> to create and open one of
-   * these. This constructor is useful only if the error object being displayed
-   * contains child items <it>and</it> you need to specify a mask which will
-   * be used to filter the displaying of these children.
-   * </p>
-   * 
-   * @param parentShell
-   *            the shell under which to create this dialog
-   * @param dialogTitle
-   *            the title to use for this dialog, or <code>null</code> to
-   *            indicate that the default title should be used
-   * @param message
-   *            the message to show in this dialog, or <code>null</code> to
-   *            indicate that the error's message should be shown as the
-   *            primary message
-   * @param status
-   *            the error to show to the user
-   * @param displayMask
-   *            the mask to use to filter the displaying of child items, as per
-   *            <code>Status.matches</code>
-   */
-  public MessageDialog(
-    Shell parentShell,
-    String dialogTitle,
-    String message,
-    IStatus status,
-    int displayMask)
-  {
-    super(parentShell);
-      this.title = dialogTitle == null ? JFaceResources.getString("Problem_Occurred") : //$NON-NLS-1$
-  dialogTitle;
-    this.message = message == null ? status.getMessage() : JFaceResources.format("Reason", new Object[] { message, status.getMessage()}); //$NON-NLS-1$
-    this.status = status;
-    statusList = Arrays.asList(status.getChildren());
-    this.displayMask = displayMask;
-    setShellStyle(SWT.DIALOG_TRIM | SWT.RESIZE | SWT.APPLICATION_MODAL);
-  }
-  /*
-   * (non-Javadoc) Method declared on Dialog. Handles the pressing of the Ok or
-   * Details button in this dialog. If the Ok button was pressed then close
-   * this dialog. If the Details button was pressed then toggle the displaying
-   * of the error details area. Note that the Details button will only be
-   * visible if the error being displayed specifies child details.
-   */
-  protected void buttonPressed(int id)
-  {
-    if (id == StatusDialogConstants.DETAILS_ID)
-    { // was the details button pressed?
-      toggleDetailsArea();
-    }
-    else
-    {
-      super.buttonPressed(id);
-    }
-  }
-  /*
-   * (non-Javadoc) Method declared in Window.
-   */
-  protected void configureShell(Shell shell)
-  {
-    super.configureShell(shell);
-    shell.setText(title);
-  }
-  /*
-   * (non-Javadoc) This should also be overwritten Method declared on Dialog.
-   */
-  protected void createButtonsForButtonBar(Composite parent)
-  {
-    // create OK and Details buttons
-    createButton(
-      parent,
-      StatusDialogConstants.OK_ID,
-      IDialogConstants.OK_LABEL,
-      true);
-    if (status.isMultiStatus() || status.getException() != null )
-    {
-      detailsButton =
-        createButton(
-          parent,
-          StatusDialogConstants.DETAILS_ID,
-          IDialogConstants.SHOW_DETAILS_LABEL,
-          false);
-    }
-    
-    parent.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ));
-  }
-
-  /*
-   * This is one of the few methods that needs to be overwritten by the
-   * subclasses. The image names can be found in the Dialog class
-   */
-  protected Image getDialogImage()
-  {
-    // create image
-    return PlatformUI.getWorkbench().getDisplay().getSystemImage(SWT.ICON_INFORMATION);
-  }
-
-  /*
-   * (non-Javadoc) Method declared on Dialog. Creates and returns the contents
-   * of the upper part of the dialog (above the button bar).
-   */
-  protected Control createDialogArea(Composite parent)
-  {
-    this.parent = parent;
-
-    // create composite
-    Composite composite = (Composite) super.createDialogArea(parent);
-    Composite imageAndLabel = new Composite(composite, SWT.NONE);
-    GridLayout gl = new GridLayout();
-    gl.numColumns = 2;
-    imageAndLabel.setLayout(gl);
-    imageAndLabel.setLayoutData( new GridData( GridData.FILL_BOTH ) );
-    composite.setLayoutData( new GridData( GridData.FILL_BOTH ));
-    
-    // create image
-    Image image = getDialogImage();
-    if (image != null)
-    {
-      Label label = new Label(imageAndLabel, 0);
-      image.setBackground(label.getBackground());
-      label.setImage(image);
-      label.setLayoutData(
-        new GridData(
-          GridData.HORIZONTAL_ALIGN_CENTER
-            | GridData.VERTICAL_ALIGN_BEGINNING));
-    }
-
-    // create message
-    if (message != null)
-    {
-      Text text = new Text(imageAndLabel, SWT.READ_ONLY|SWT.WRAP);
-      text.setText(message);
-      GridData data =
-        new GridData(
-          GridData.GRAB_HORIZONTAL
-            | GridData.GRAB_VERTICAL
-            | GridData.HORIZONTAL_ALIGN_FILL
-            | GridData.VERTICAL_ALIGN_CENTER);
-      data.widthHint =
-        convertHorizontalDLUsToPixels(
-          IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH);
-     
-      text.setLayoutData(data);
-      text.setFont(parent.getFont());
-    }
-
-    return composite;
-  }
-
-  protected List createDropDownList(Composite parent)
-  {
-    // create the list
-    list = new List(parent, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
-
-    // fill the list
-    populateList(list);
-
-    GridData data =
-      new GridData(
-        GridData.HORIZONTAL_ALIGN_FILL
-          | GridData.GRAB_HORIZONTAL
-          | GridData.VERTICAL_ALIGN_FILL
-          | GridData.GRAB_VERTICAL);
-    data.heightHint = list.getItemHeight() * LIST_ITEM_COUNT;
-    list.setLayoutData(data);
-    listCreated = true;
-    return list;
-  }
-  protected Text createDropDownDetails(Composite parent)
-  {
-    details = new Text(parent, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL | SWT.READ_ONLY);
-    //details.setEditable(false);
-    Color color = new Color(parent.getShell().getDisplay(), 255, 255, 255);
-    details.setBackground(color);
-    populateDetails(details, status, 0);
-    GridData data =
-      new GridData(
-        GridData.HORIZONTAL_ALIGN_FILL
-          | GridData.GRAB_HORIZONTAL
-          | GridData.VERTICAL_ALIGN_FILL
-          | GridData.GRAB_VERTICAL);
-    details.setLayoutData(data);
-    details.setSelection(0);
-    detailsCreated = true;
-    return details;
-  }
-  /*
-   * (non-Javadoc) Method declared on Window.
-   */
-  /**
-   * Extends <code>Window.open()</code>. Opens an error dialog to display
-   * the error. If you specified a mask to filter the displaying of these
-   * children, the error dialog will only be displayed if there is at least one
-   * child status matching the mask.
-   */
-  public int open()
-  {
-    if (shouldDisplay(status, displayMask))
-    {
-      return super.open();
-    }
-    return 0;
-  }
-  /**
-   * This essentially does the work of a factory Opens an error dialog to
-   * display the given error. Use this method if the error object being
-   * displayed does not contain child items, or if you wish to display all such
-   * items without filtering.
-   * 
-   * @param parent
-   *            the parent shell of the dialog, or <code>null</code> if none
-   * @param dialogTitle
-   *            the title to use for this dialog, or <code>null</code> to
-   *            indicate that the default title should be used
-   * @param message
-   *            the message to show in this dialog, or <code>null</code> to
-   *            indicate that the error's message should be shown as the
-   *            primary message
-   * @param status
-   *            the error to show to the user
-   * @return the code of the button that was pressed that resulted in this
-   *         dialog closing. This will be <code>Dialog.OK</code> if the OK
-   *         button was pressed, or <code>Dialog.CANCEL</code> if this
-   *         dialog's close window decoration or the ESC key was used.
-   */
-  public static int openMessage(
-    Shell parent,
-    String dialogTitle,
-    String message,
-    IStatus status)
-  {
-
-    switch (status.getSeverity())
-    {
-      case IStatus.INFO :
-        return openInfo(
-          parent,
-          dialogTitle,
-          message,
-          status,
-          IStatus.OK | IStatus.INFO | IStatus.WARNING | IStatus.ERROR);
-      case IStatus.WARNING :
-        return openWarning(
-          parent,
-          dialogTitle,
-          message,
-          status,
-          IStatus.OK | IStatus.INFO | IStatus.WARNING | IStatus.ERROR);
-      default :
-        return openError(
-          parent,
-          dialogTitle,
-          message,
-          status,
-          IStatus.OK | IStatus.INFO | IStatus.WARNING | IStatus.ERROR);
-    }
-
-  }
-
-  public static int openMessage(
-    Shell parent,
-    String dialogTitle,
-    String message,
-    IStatus status,
-    Choice[] options)
-  {
-
-    return openOptions(
-      parent,
-      dialogTitle,
-      message,
-      status,
-      IStatus.OK | IStatus.INFO | IStatus.WARNING | IStatus.ERROR,
-      options);
-  }
-
-  /**
-   * Opens an error dialog to display the given error. Use this method if the
-   * error object being displayed contains child items <it>and</it> you wish
-   * to specify a mask which will be used to filter the displaying of these
-   * children. The error dialog will only be displayed if there is at least one
-   * child status matching the mask.
-   * 
-   * @param parentShell
-   *            the parent shell of the dialog, or <code>null</code> if none
-   * @param dialogTitle
-   *            the title to use for this dialog, or <code>null</code> to
-   *            indicate that the default title should be used
-   * @param message
-   *            the message to show in this dialog, or <code>null</code> to
-   *            indicate that the error's message should be shown as the
-   *            primary message
-   * @param status
-   *            the error to show to the user
-   * @param displayMask
-   *            the mask to use to filter the displaying of child items, as per
-   *            <code>Status.matches</code>
-   * @return the code of the button that was pressed that resulted in this
-   *         dialog closing. This will be <code>Dialog.OK</code> if the OK
-   *         button was pressed, or <code>Dialog.CANCEL</code> if this
-   *         dialog's close window decoration or the ESC key was used.
-   */
-  public static int openError(
-    Shell parentShell,
-    String title,
-    String message,
-    IStatus status,
-    int displayMask)
-  {
-    ErrorDialog dialog =
-      new ErrorDialog(parentShell, title, message, status, displayMask);
-    return dialog.open();
-  }
-
-  public static int openInfo(
-    Shell parentShell,
-    String title,
-    String message,
-    IStatus status,
-    int displayMask)
-  {
-    InfoDialog dialog =
-      new InfoDialog(parentShell, title, message, status, displayMask);
-    return dialog.open();
-  }
-
-  public static int openWarning(
-    Shell parentShell,
-    String title,
-    String message,
-    IStatus status,
-    int displayMask)
-  {
-    WarningDialog dialog =
-      new WarningDialog(parentShell, title, message, status, displayMask);
-    return dialog.open();
-  }
-
-  public static int openOptions(
-    Shell parentShell,
-    String title,
-    String message,
-    IStatus status,
-    int displayMask,
-    Choice[] options)
-  {
-    OptionsDialog dialog =
-      new OptionsDialog(
-        parentShell,
-        title,
-        message,
-        status,
-        displayMask,
-        options);
-    dialog.open();
-    return dialog.getReturnCode();
-  }
-
-  /**
-   * Populates the list using this error dialog's status object. This walks the
-   * child stati of the status object and displays them in a list. The format
-   * for each entry is status_path : status_message If the status's path was
-   * null then it (and the colon) are omitted.
-   */
-  private void populateList(List list)
-  {
-    Iterator enumeration = statusList.iterator();
-    while (enumeration.hasNext())
-    {
-      IStatus childStatus = (IStatus) enumeration.next();
-      populateList(list, childStatus, 0);
-    }
-  }
-  private void populateList(List list, IStatus status, int nesting)
-  {
-    if (!status.matches(displayMask))
-    {
-      return;
-    }
-    StringBuffer sb = new StringBuffer();
-    for (int i = 0; i < nesting; i++)
-    {
-      sb.append("  ");
-    }
-    sb.append(status.getMessage());
-    list.add(sb.toString());
-    IStatus[] children = status.getChildren();
-    for (int i = 0; i < children.length; i++)
-    {
-      populateList(list, children[i], nesting + 1);
-    }
-  }
-  private void populateDetails(Text text, IStatus status, int nesting)
-  {
-    if (!status.matches(displayMask))
-    {
-      return;
-    }
-        
-    String    tabChars    = StringUtils.repeat( ' ', nesting * 2 );
-    String    messageLine = tabChars + status.getMessage() + System.getProperty("line.separator");
-    Throwable except      = status.getException();
-    
-    text.append( messageLine );
-    
-    if( except != null )
-    {
-      String[] trace = StringUtils.getStackTrace( except );
-      
-      for( int index = 0; index < trace.length; index++ )
-      {
-        text.append( tabChars + "    " + trace[index] + System.getProperty("line.separator") );
-      }
-    }
-    
-    IStatus[] children = status.getChildren();
-    for (int i = 0; i < children.length; i++)
-    {
-      populateDetails(text, children[i], nesting + 1);
-    }
-  }
-  /**
-   * Returns whether the given status object should be displayed.
-   * 
-   * @param status
-   *            a status object
-   * @param mask
-   *            a mask as per <code>Status.matches</code>
-   * @return <code>true</code> if the given status should be displayed, and
-   *         <code>false</code> otherwise
-   */
-  protected static boolean shouldDisplay(IStatus status, int mask)
-  {
-    IStatus[] children = status.getChildren();
-    if (children == null || children.length == 0)
-    {
-      return status.matches(mask);
-    }
-    for (int i = 0; i < children.length; i++)
-    {
-      if (children[i].matches(mask))
-        return true;
-    }
-    return false;
-  }
-  /**
-   * Toggles the unfolding of the details area. This is triggered by the user
-   * pressing the details button.
-   */
-  private void toggleDetailsArea()
-  {
-    Point windowSize = getShell().getSize();
-    int   newHeight  = -1;
-    
-    if (detailsCreated)
-    {
-      details.dispose();
-      detailsCreated = false;
-      detailsButton.setText(IDialogConstants.SHOW_DETAILS_LABEL);
-      
-      // Without the following computeSize call the setSize call below throws an array out of bounds exception.
-      // Very weird.
-      getContents().computeSize(SWT.DEFAULT, SWT.DEFAULT);
-      
-      newHeight = savedSize.y;
-    }
-    else
-    {
-      if( savedSize == null ) savedSize = windowSize;
-        
-      details = createDropDownDetails((Composite) getContents());
-      detailsButton.setText(IDialogConstants.HIDE_DETAILS_LABEL);
-      newHeight = getContents().computeSize(SWT.DEFAULT, SWT.DEFAULT).y;
-    }
-
-
-    newHeight = newHeight > 400 ? 400 : newHeight;
-    
-    getShell().setSize( new Point(windowSize.x, newHeight) );
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/OptionsDialog.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/OptionsDialog.java
deleted file mode 100644
index 24ceea306..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/OptionsDialog.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.dialog;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.environment.Choice;
-
-
-/**
- * A dialog to display one or more errors to the user, as contained in an
- * <code>Status</code> object. If an error contains additional detailed
- * information then a Details button is automatically supplied, which shows or
- * hides an error details viewer when pressed by the user.
- *  
- */
-public class OptionsDialog extends MessageDialog
-{
-  private Choice[] choices;
-  private int returnCode_;
-
-  public OptionsDialog(
-    Shell parentShell,
-    String dialogTitle,
-    String message,
-    IStatus status,
-    int displayMask,
-    Choice[] choices)
-  {
-    super(parentShell, dialogTitle, message, status, displayMask);
-    this.choices = choices;
-  }
-
-  /*
-   * (non-Javadoc) This should also be overwritten Method declared on Dialog.
-   */
-  protected void createButtonsForButtonBar(Composite parent)
-  {
-    // create a button for each options
-    for (int i = 0; i < choices.length; i++)
-    {
-      createButton(parent, choices[i].getShortcut(), choices[i].getLabel(), true);
-    }
-    if (status.isMultiStatus() )
-    {
-      detailsButton =
-        createButton(
-          parent,
-          StatusDialogConstants.DETAILS_ID,
-          IDialogConstants.SHOW_DETAILS_LABEL,
-          false);
-    }
-  }
-
-  protected void buttonPressed(int id)
-  {
-    if (id == StatusDialogConstants.DETAILS_ID)
-      // was the Details button pressed?
-      super.buttonPressed(id);
-    else
-    {
-      setReturnCode(id);
-      close();
-    }
-  }
-
-  protected void setReturnCode(int id)
-  {
-    returnCode_ = id;
-  }
-
-  public int getReturnCode()
-  {
-    return returnCode_;
-  }
-  /*
-   * This is one of the few methods that needs to be overwritten by the
-   * subclasses. The image names can be found in the Dialog class
-   */
-  protected Image getDialogImage()
-  {
-    // create image
-    switch (status.getSeverity())
-    {
-      case IStatus.INFO :
-        return PlatformUI.getWorkbench().getDisplay().getSystemImage(SWT.ICON_INFORMATION);
-      case IStatus.WARNING :
-        return PlatformUI.getWorkbench().getDisplay().getSystemImage(SWT.ICON_WARNING);
-      default :
-        return PlatformUI.getWorkbench().getDisplay().getSystemImage(SWT.ICON_ERROR);
-    }
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/StatusDialogConstants.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/StatusDialogConstants.java
deleted file mode 100644
index 4e56788ec..000000000
--- 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 9d28e3d2a..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/WarningDialog.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.dialog;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * A dialog to display one or more errors to the user, as contained in an
- * <code>Status</code> object. If an error contains additional detailed
- * information then a Details button is automatically supplied, which shows or
- * hides an error details viewer when pressed by the user.
- *  
- */
-public class WarningDialog extends MessageDialog
-{
-  /**
-   * Creates an error dialog. Note that the dialog will have no visual
-   * representation (no widgets) until it is told to open.
-   * <p>
-   * Normally one should use <code>openError</code> to create and open one of
-   * these. This constructor is useful only if the error object being displayed
-   * contains child items <it>and</it> you need to specify a mask which will
-   * be used to filter the displaying of these children.
-   * </p>
-   * 
-   * @param parentShell
-   *            the shell under which to create this dialog
-   * @param dialogTitle
-   *            the title to use for this dialog, or <code>null</code> to
-   *            indicate that the default title should be used
-   * @param message
-   *            the message to show in this dialog, or <code>null</code> to
-   *            indicate that the error's message should be shown as the
-   *            primary message
-   * @param status
-   *            the error to show to the user
-   * @param displayMask
-   *            the mask to use to filter the displaying of child items, as per
-   *            <code>Status.matches</code>
-   */
-  public WarningDialog(
-    Shell parentShell,
-    String dialogTitle,
-    String message,
-    IStatus status,
-    int displayMask)
-  {
-    super(parentShell, dialogTitle, message, status, displayMask);
-  }
-
-  /*
-   * (non-Javadoc) This should also be overwritten Method declared on Dialog.
-   */
-  protected void createButtonsForButtonBar(Composite parent)
-  {
-    // create OK, Cancel and Details buttons
-    createButton(
-      parent,
-      StatusDialogConstants.OK_ID,
-      IDialogConstants.OK_LABEL,
-      true);
-    createButton(
-      parent,
-      StatusDialogConstants.CANCEL_ID,
-      IDialogConstants.CANCEL_LABEL,
-      false);
-    if (status.isMultiStatus())
-    {
-      detailsButton =
-        createButton(
-          parent,
-          StatusDialogConstants.DETAILS_ID,
-          IDialogConstants.SHOW_DETAILS_LABEL,
-          false);
-    }
-  }
-
-  /*
-   * This is one of the few methods that needs to be overwritten by the
-   * subclasses. The image names can be found in the Dialog class
-   */
-  protected Image getDialogImage()
-  {
-    // create image
-    return PlatformUI.getWorkbench().getDisplay().getSystemImage(SWT.ICON_WARNING);
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/eclipse/EclipseStatusHandler.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/eclipse/EclipseStatusHandler.java
deleted file mode 100644
index 1c133103c..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/eclipse/EclipseStatusHandler.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.eclipse;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.command.internal.env.core.EnvironmentCoreMessages;
-import org.eclipse.wst.command.internal.env.ui.dialog.MessageDialog;
-import org.eclipse.wst.command.internal.env.ui.dialog.StatusDialogConstants;
-import org.eclipse.wst.common.environment.Choice;
-import org.eclipse.wst.common.environment.IStatusHandler;
-import org.eclipse.wst.common.environment.StatusException;
-
-
-/**
- * This is the Eclipse UI version of the IStatusHandler
- */
-public class EclipseStatusHandler implements IStatusHandler
-{
-  private IStatus worstStatus = Status.OK_STATUS;
-  private Shell   shell       = null;
-    
-  public EclipseStatusHandler()
-  {  
-  }
-  
-  public EclipseStatusHandler( Shell theShell )
-  {
-    shell = theShell;  
-  }
-  
-  public IStatus getStatus()
-  {
-    return worstStatus;
-  }
-  
-  public void resetStatus()
-  {
-    worstStatus = Status.OK_STATUS;  
-  }
-  
-  /**
-   * @see org.eclipse.env.common.IStatusHandler#report(org.eclipse.env.common.Status, org.eclipse.env.common.Choice[])
-   */
-  public Choice report( final IStatus status, final Choice[] choices) 
-  {
-    final int[] result = new int[1];
-    
-    checkStatus( status );
-    
-    Runnable runnable = new Runnable()
-    {
-      public void run()
-      {
-        result[0] =
-          MessageDialog.openMessage( getShell(),
-                                     EnvironmentCoreMessages.TITLE_WARNING, //TODO: Should be inferred from status' severity.
-				                             null,
-				                             status,
-				                             choices);
-      }
-    };
-    
-    Display.getDefault().syncExec( runnable );
-    
-    for (int i = 0; i < choices.length; i++)
-     {
-      if (choices[i].getShortcut() == result[0] )
-        return choices[i];
-    }
-    
-    return null;
-  }
-
-  /**
-   * @see org.eclipse.env.common.IStatusHandler#report(org.eclipse.env.common.Status)
-   */
-  public void report(IStatus status) throws StatusException
-  {
-    boolean userOk = false;
-    
-    checkStatus( status );
-    
-    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( final IStatus status )
-  {
-    final int userResponse[] = new int[1];
-    
-    Runnable runnable = new Runnable()
-    {
-      public void run()
-      {
-        userResponse[0] =
-          MessageDialog.openMessage( getShell(),
-                                     EnvironmentCoreMessages.TITLE_WARNING,
-                                     null,
-                                     status);
-      }
-    };
-    
-    Display.getDefault().syncExec( runnable );
-    
-    return (userResponse[0] == StatusDialogConstants.OK_ID);
-  }
-
-  private boolean reportErrorStatus(final IStatus status)
-  {
-    Runnable runnable = new Runnable()
-    {
-      public void run()
-      {
-        MessageDialog.openMessage( getShell(),
-                                   EnvironmentCoreMessages.TITLE_ERROR,
-                                   null,
-                                   status);
-      }
-    };
-    
-    Display.getDefault().syncExec( runnable );
-    
-    return false;
-  }
-  
-  private void checkStatus( IStatus status )
-  {
-    if( status.getSeverity() > worstStatus.getSeverity() )
-    {
-      worstStatus = status;
-    }
-  }
-  
-  /**
-   * @see org.eclipse.wst.command.internal.env.core.common.IStatusHandler#reportError(org.eclipse.wst.command.internal.env.core.common.Status)
-   */
-  public void reportError(IStatus status)
-  {
-    checkStatus( status );
-    reportErrorStatus( status );
-  }
-  
-  /**
-   * @see org.eclipse.wst.command.internal.env.core.common.IStatusHandler#reportInfo(org.eclipse.wst.command.internal.env.core.common.Status)
-   */
-  public void reportInfo(final IStatus status)
-  {
-    Runnable runnable = new Runnable()
-    {
-      public void run()
-      {
-        MessageDialog.openMessage( getShell(),
-                                   EnvironmentCoreMessages.TITLE_INFO,
-                                   null,
-                                   status);
-      }
-    };
-    
-    Display.getDefault().syncExec( runnable );
-  }
-  
-  private Shell getShell()
-  {
-    if( shell != null ) return shell;
-    
-    Display display = Display.getDefault();
-    
-    return display == null ? null : display.getActiveShell();
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/eclipse/EnvironmentUtils.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/eclipse/EnvironmentUtils.java
deleted file mode 100644
index 60ea6d2a2..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/eclipse/EnvironmentUtils.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.eclipse;
-
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.env.core.context.TransientResourceContext;
-import org.eclipse.wst.command.internal.env.eclipse.EclipseEnvironment;
-import org.eclipse.wst.common.environment.IEnvironment;
-
-public final class EnvironmentUtils
-{     
-  /**
-   * 
-   * @param env This should be an EclipseEnvironment.
-   * @return Returns a ResourceContext.
-   */ 
-  public static ResourceContext getResourceContext( IEnvironment env )
-  {
-    ResourceContext context = null;
-    
-    if( env instanceof EclipseEnvironment )
-    {
-      context = ((EclipseEnvironment)env).getResourceContext();
-    }
-    else
-    {
-      context = new TransientResourceContext();
-    }
-    
-    return context;
-  }
-  
-  
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/eclipse/SWTEnvironmentManager.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/eclipse/SWTEnvironmentManager.java
deleted file mode 100644
index 99132bcc5..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/eclipse/SWTEnvironmentManager.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.command.internal.env.ui.eclipse;
-
-import org.eclipse.wst.command.internal.env.context.PersistentResourceContext;
-import org.eclipse.wst.command.internal.env.eclipse.BaseEclipseEnvironment;
-import org.eclipse.wst.command.internal.env.eclipse.EclipseEnvironment;
-
-public class SWTEnvironmentManager
-{
-  /**
-   * Returns a new instance of an IEnvironment for the Eclipse SWT GUI.
-   */
-  public static BaseEclipseEnvironment getNewSWTEnvironment()
-  {
-    PersistentResourceContext context        = PersistentResourceContext.getInstance();
-    EclipseStatusHandler      handler        = new EclipseStatusHandler();
-    EclipseEnvironment        environment    = new EclipseEnvironment( null, context, handler );
-    
-    return environment;  
-  }
-}
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 4c15d6091..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/plugin/EnvUIPlugin.java
+++ /dev/null
@@ -1,55 +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 java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jface.resource.ImageDescriptor;
-
-/**
- * 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;
-	}
-	 public static ImageDescriptor getImageDescriptor ( String name )
-	  {
-	    try
-	    {
-	      URL installURL = instance.getBundle().getEntry("/");
-	      URL imageURL = new URL(installURL,name);
-	      return ImageDescriptor.createFromURL(imageURL);
-	    }
-	    catch (MalformedURLException e)
-	    {
-	      return null;
-	    }
-	  }
-}
diff --git a/bundles/org.eclipse.wst.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 ed422d3a0..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/preferences/ActionDialogsPreferencePage.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.preferences;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExecutableExtension;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.context.PersistentActionDialogsContext;
-import org.eclipse.wst.command.internal.env.preferences.ActionDialogPreferenceType;
-import org.eclipse.wst.command.internal.env.ui.EnvironmentUIMessages;
-
-
-/**
- * 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)
-  {
-   
-    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(EnvironmentUIMessages.TOOLTIP_PPAD_PAGE);
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, INFOPOP_PPAD_PAGE );
-	
-    showAll = new Button(parent, SWT.NONE);
-    showAll.setText(EnvironmentUIMessages.BUTTON_SHOW_ALL_DIALOGS);
-    showAll.addListener(SWT.Selection, this);
-    showAll.setToolTipText(EnvironmentUIMessages.TOOLTIP_PPAD_BUTTON_SHOW_ALL);
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(showAll, INFOPOP_PPAD_BUTTON_SHOW_ALL );
-   
-    hideAll = new Button(parent, SWT.NONE);
-    hideAll.setText(EnvironmentUIMessages.BUTTON_HIDE_ALL_DIALOGS);
-    hideAll.addListener ( SWT.Selection, this);
-    hideAll.setToolTipText(EnvironmentUIMessages.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 5ab5b3104..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/registry/WidgetRegistry.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.command.internal.env.ui.registry;
-
-import java.util.Hashtable;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributorFactory;
-
-public class WidgetRegistry 
-{
-  private static WidgetRegistry registry_;
-  
-  private Hashtable entries_;
-  
-  private WidgetRegistry()
-  {
-  }
-  
-  public static WidgetRegistry instance()
-  {
-	if (registry_ == null)
-	{
-		registry_ = new WidgetRegistry();
-		registry_.load();
-	}
-
-	return registry_;
-  }
-  
-  public static void initialize()
-  {
-    registry_ = null;  
-  }
-  
-  /**
-   * 
-   * @param id the methodId that may have WidgetContributor associated with it.
-   * @return returns a INamedWidgetContributorFactory if one was defined in the registry.
-   * Otherwise null is returned.
-   */
-  public INamedWidgetContributorFactory getFactory( String id )
-  {
-	INamedWidgetContributorFactory factory = null;
-	Entry                          entry   = (Entry)entries_.get( id );
-	
-	if( entry != null )
-	{
-	  try
-	  {
-		if( entry.factory_ == null )
-		{
-		  entry.factory_ = (INamedWidgetContributorFactory)entry.element_.createExecutableExtension( "class" );
-		}
-		
-		factory = entry.factory_;
-	  }
-	  catch( CoreException exc )
-	  {
-	    exc.printStackTrace();
-	  }
-	  catch( Throwable exc )
-	  {
-		exc.printStackTrace();
-	  }
-	}
-	
-	return factory;
-  }
-  
-  private void load()
-  {
-	IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor("org.eclipse.wst.command.env.ui.widgetRegistry");
-	
-	entries_ = new Hashtable();
-	
-	for( int index = 0; index < elements.length; index++ )
-	{
-	  // If this is not an element that know about we will skip it.
-	  if( !elements[index].getName().equals("widgetFactory") ) continue;
-	  
-	  Entry                 entry    = new Entry();
-	  IConfigurationElement element  = elements[index];
-	  String                id       = element.getAttribute( "id" );
-	  String                methodId = element.getAttribute( "insertBeforeCommandId" );
-	  
-	  entry.element_ = element;
-	  entry.id_      = id;
-	  
-	  entries_.put( methodId, entry );
-	}
-  }
-  
-  private class Entry
-  {
-    String                         id_;
-	IConfigurationElement          element_;
-	INamedWidgetContributorFactory factory_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CanFinishRegistry.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CanFinishRegistry.java
deleted file mode 100644
index bfe0a0e07..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CanFinishRegistry.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import org.eclipse.wst.command.internal.env.core.common.Condition;
-
-/**
- * This is an interface for an abstract can finish registry.
- * This registry is usually associate with an Eclipse wizard.  This
- * registry allow condition object to be added to it in order to
- * determine if the wizard can finish or not.
- *
- */
-public interface CanFinishRegistry
-{
-  /**
-   * Add a condition object to the registry.
-   * @param condition the condition.
-   */
-  public void addCondition( Condition condition );
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CommandWidgetBinding.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CommandWidgetBinding.java
deleted file mode 100644
index afd591ba5..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CommandWidgetBinding.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactoryFactory;
-
-
-public interface CommandWidgetBinding extends CommandFragmentFactoryFactory
-{
-  /**
-   * This method is used by extensions to register their widgets with
-   * CommandFragments
-   * 
-   * @param widgetRegistry
-   */
-  public void registerWidgetMappings( WidgetRegistry widgetRegistry );
-  
-  /**
-   * This method is used by extenions to register the data mappings
-   * that their widgets use.
-   * 
-   * @param dataRegistry
-   */
-  public void registerDataMappings( DataMappingRegistry dataRegistry );
-  
-  /**
-   * This method is used by extensions to register condition objects
-   * that control if the wizard can finish or not.
-   * 
-   * @param canFinishRegistry
-   */
-  public void registerCanFinish( CanFinishRegistry canFinishRegistry );
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CommandWidgetBindingList.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CommandWidgetBindingList.java
deleted file mode 100644
index 7b8784584..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CommandWidgetBindingList.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import java.util.Vector;
-
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-
-
-public class CommandWidgetBindingList implements CommandWidgetBinding
-{
-  private Vector                 bindings_;
-  private Vector                 fragments_;
-  private CommandFragmentFactory factory_;
-  
-  /**
-   * This CommandWidgetBinding combines a list of CommandWidgetBindings.
-   * There should be the same number of entries in both the bindings
-   * parameter and the fragments parameter.  Entries in either of the
-   * bindings for fragments vectors are allowed to be null.
-   * 
-   * @param bindings   the bindings to combine.
-   * @param fragments  These fragments will be interspersed with the
-   *                   fragments associated with each binding.  The first
-   *                   fragment will be put before the fragment from the
-   *                   first binding.  Following this will be the second
-   *                   fragment from the fragments vector and then the
-   *                   second fragment from the bindings vector, etc.
-   */
-  public CommandWidgetBindingList( Vector bindings, Vector fragments )
-  {
-    bindings_  = bindings; 
-    fragments_ = fragments;
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
-   */
-  public void registerCanFinish(CanFinishRegistry canFinishRegistry) 
-  {
-    int length = bindings_.size();
-    
-    for( int index = 0; index < length; index++ )
-    {
-      CommandWidgetBinding binding = (CommandWidgetBinding)bindings_.elementAt( index );
-      
-      if( binding != null ) binding.registerCanFinish( canFinishRegistry );
-    }
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry)
-   */
-  public void registerDataMappings(DataMappingRegistry dataRegistry) 
-  {
-    int length = bindings_.size();
-    
-    for( int index = 0; index < length; index++ )
-    {
-      CommandWidgetBinding binding = (CommandWidgetBinding)bindings_.elementAt( index );
-      if( binding != null ) binding.registerDataMappings( dataRegistry );
-    }
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
-   */
-  public void registerWidgetMappings(WidgetRegistry widgetRegistry) 
-  {
-    int length = bindings_.size();
-    
-    for( int index = 0; index < length; index++ )
-    {
-      CommandWidgetBinding binding = (CommandWidgetBinding)bindings_.elementAt( index );
-      if( binding != null ) binding.registerWidgetMappings( widgetRegistry );
-    }
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactoryFactory#create()
-   */
-  public CommandFragmentFactory create() 
-  {
-    if( factory_ == null )
-    {
-      factory_ = new CommandFragmentFactory()
-        {
-          public CommandFragment create()
-          {
-            SequenceFragment fragmentList = new SequenceFragment();
-            int              length       = bindings_.size();
-            
-            for( int index = 0; index < length; index++ )
-            {
-              CommandFragment fragment = (CommandFragment)fragments_.elementAt( index );
-              
-              if( fragment != null )
-              {
-                fragmentList.add( fragment );
-              }
-              
-              CommandWidgetBinding binding = (CommandWidgetBinding)bindings_.elementAt( index );
-              
-              if( binding != null )
-              {
-                fragmentList.add( binding.create().create() );
-              }
-            }
-            
-            return fragmentList;
-          }
-        }; 
-    }
-    
-    return factory_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CurrentPageCommand.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CurrentPageCommand.java
deleted file mode 100644
index 6509401e0..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CurrentPageCommand.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-/**
- * This Command can be used to get the current page.
- * Use of this class is not recommended.
- *
- */
-public class CurrentPageCommand extends AbstractDataModelOperation
-{
-  private WizardPageManager pageManager_;
-  
-  public CurrentPageCommand( WizardPageManager pageManager )
-  {
-    pageManager_ = pageManager;
-  }
-  
-  public IWizardPage getCurrentPage()
-  {
-    return pageManager_.getCurrentPage();
-  }
-
-  public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
-  {
-    return Status.OK_STATUS;
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/DataObjectCommand.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/DataObjectCommand.java
deleted file mode 100644
index 0450ad308..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/DataObjectCommand.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-/**
- * This Command can be use to get the resulting data object for
- * this wizard.
- *
- */
-public class DataObjectCommand extends AbstractDataModelOperation
-{
-  private Object dataObject_;
-  
-  public void setDataObject( Object object )
-  {
-    dataObject_ = object;
-  }
-  
-  public Object getDataObject()
-  {
-    return dataObject_;
-  }
-
-  public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
-  {
-    return Status.OK_STATUS;
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/DynamicWizard.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/DynamicWizard.java
deleted file mode 100644
index 5b94b66e5..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/DynamicWizard.java
+++ /dev/null
@@ -1,392 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.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.osgi.util.NLS;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.wst.command.internal.env.context.PersistentResourceContext;
-import org.eclipse.wst.command.internal.env.core.common.Condition;
-import org.eclipse.wst.command.internal.env.core.data.DataFlowManager;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistryImpl;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.eclipse.EclipseEnvironment;
-import org.eclipse.wst.command.internal.env.ui.EnvironmentUIMessages;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseStatusHandler;
-import org.eclipse.wst.command.internal.env.ui.registry.WidgetRegistry;
-import org.osgi.framework.Bundle;
-
-
-/**
- * This class is used to add dynamic wizards into Eclipse.  When adding
- * a dynamic wizard into eclipse two entries need to be made in the plugin.xml
- * file.  This first entry tells Eclipse that a new wizard should be added
- * and it references this class.  The second entry specifies detailed information
- * that is specific to the wizard to be added.  These two plugin.xml entries
- * are linked together via their id attributes.  For example here is an
- * entry that registers a new wizard with eclipse.  Note the class attribute
- * references this class.
- * <pre>
- *   &lt;extension
- *        point="org.eclipse.ui.newWizards"&gt;
- *     &lt;wizard
- *           name="%PLUGIN_NEW_WIZARD_NAME_WS_CLIENT"
- *           icon="icons/full/ctool16/newclient_webserv_wiz.gif"
- *           category="org.eclipse.jst.ws.ui.new"
- *           class="org.eclipse.wst.command.env.ui.widgets.DynamicWizard"
- *           id="org.eclipse.jst.ws.consumption.ui.wizard.client.clientwizard"&gt;
- *        &lt;description&gt;
- *           %PLUGIN_NEW_WIZARD_DESC_WS_CLIENT
- *        &lt;/description&gt;
- *        &lt;selection
- *              class="org.eclipse.core.resources.IResource"&gt;
- *        &lt;/selection&gt;
- *     &lt;/wizard&gt;
- *   &lt;/extension&gt;
- *
- * </pre>
- * Here is the dynamicWizard entry for this particular wizard.  This id attributes
- * link these two entries together.  The class attribute must specify a class that
- * implements the org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding interface.  This
- * interface specifies what the UI should look like and the commands the should
- * be executed in the wizard.
- * 
- * <pre>
- *   &lt;extension
- *        point="org.eclipse.wst.command.env.dynamicWizard"&gt;
- *     &lt;dynamicWizard
- *           iconbanner="icons/full/wizban/webservicesclient_wiz.gif"
- *           class="org.eclipse.jst.ws.consumption.ui.widgets.binding.ClientWidgetBinding"
- *           title="%WIZARD_TITLE_WSC"
- *           id="org.eclipse.jst.ws.consumption.ui.wizard.client.clientwizard"&gt;
- *     &lt;/dynamicWizard&gt;
- *   &lt;/extension&gt;
- * </pre>
- *
- */
-public class DynamicWizard extends Wizard implements INewWizard, IExecutableExtension
-{
-  private   String                  iconBannerName_;
-  private   Bundle                  bundle_;
-  private   SimpleCanFinishRegistry canFinishRegistry_; 
-  private   WizardPageManager       pageManager_;
-  private   String                  wizardTitle_;
-  private   DataObjectCommand       dataObjectCommand_ = null;
-
-  protected IWizardPage             startPage_ = null;
-  protected IConfigurationElement   wizardElement_;
-  protected IConfigurationElement   originalElement_;
-  protected CommandWidgetBinding    commandWidgetBinding_;
-  
-  public DynamicWizard()
-  {
-	setNeedsProgressMonitor(true);
-  }
-  
-  /**
-   * This method is called when the Dynamic wizard is created by eclipse.
-   * We need to find a dynamicWizard extension point that matches the id
-   * for this wizard.  Once the extension point is found it will contain
-   * a reference to a CommandWidgetBinding class which defines the widgets 
-   * and commands for this wizard.
-   * 
-   * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, java.lang.String, java.lang.Object)
-   */
-  public void setInitializationData( IConfigurationElement config,
-			                         String                propertyName,
-			                         Object                data )
-    throws CoreException
-  {
-    String wizardId   = config.getAttribute( "id" );
-    
-    setInitialData( wizardId );
-    originalElement_ = config;
-  }
-  
-  /**
-   * This method should only be called if the Dynamic Wizard is being
-   * launched through some other mechanise other than the Eclipse New Wizard
-   * mechanism.
-   * 
-   * @param binding        the command widget binding for this wizard.
-   * @param descriptor     the plugin descriptor where the icon banner is
-   *                       located.
-   * @param iconBannerPath the icon banner path for this wizard.  The path
-   *                       is relative to the plugin specified by the 
-   *                       descriptor parameter.
-   * @param wizardTitle    the wizard title
-   */
-  public void setInitialData( CommandWidgetBinding binding,
-                              Bundle               bundle,
-                              String               iconBannerPath,
-                              String               wizardTitle )
-  {
-    commandWidgetBinding_ = binding;
-    bundle_               = bundle;
-    iconBannerName_       = iconBannerPath;
-    wizardTitle_          = wizardTitle;
-  }
-  
-  /**
-   * Sets the initial data based on the dynamic wizard id.
-   * 
-   * @param wizardId
-   */
-  public void setInitialData( String wizardId ) throws CoreException
-  {
-    IExtensionRegistry    registry      = Platform.getExtensionRegistry();
-    IExtensionPoint       point         = registry.getExtensionPoint("org.eclipse.wst.command.env.dynamicWizard");
-    IExtension[]          extensions    = point.getExtensions();
-    
-    for( int index = 0; index < extensions.length; index++) 
-    {
-      IConfigurationElement[] elements = extensions[index].getConfigurationElements();
-      
-      if( elements.length == 1 && elements[0].getName().equals( "dynamicWizard") ) 
-      {
-        String id = elements[0].getAttribute( "id" );
-        
-        if( id != null && id.equals( wizardId ) )
-        {
-          wizardElement_ = elements[0];
-          break;
-        }
-      }
-    }
-        
-    if( wizardElement_ == null )
-    {
-      Status status = new Status( Status.ERROR, "id", 0, NLS.bind(EnvironmentUIMessages.MSG_ERROR_WIZARD_ID_NOT_FOUND, new String[]{ wizardId}) , null );
-      throw new CoreException( status );
-    }
-  }
-    
-  /**
-   * This method is called by the eclipse framework to initialize the
-   * wizard. 
-   * 
-   * @param workbench the eclipse workbench
-   * @param selection the initial selection that the user has made within
-   *                  eclipse.
-   */
-  public void init ( IWorkbench workbench, IStructuredSelection selection )
-  {    
-    PersistentResourceContext context        = PersistentResourceContext.getInstance();
-    EclipseStatusHandler      handler        = new EclipseStatusHandler();
-    EclipseEnvironment        environment    = new EclipseEnvironment( null, context, handler );
-    
-    DataMappingRegistryImpl dataRegistry_   = new DataMappingRegistryImpl();
-    SimpleWidgetRegistry    widgetRegistry_ = new SimpleWidgetRegistry();  
-    DataFlowManager         dataManager     = new DataFlowManager( dataRegistry_, environment );
-    
-    try
-    {
-      commandWidgetBinding_ = (CommandWidgetBinding)wizardElement_.createExecutableExtension( "class" );
-      bundle_               = Platform.getBundle( wizardElement_.getNamespace() );
-      iconBannerName_       = wizardElement_.getAttribute( "iconbanner" );
-      wizardTitle_          = wizardElement_.getAttribute( "title" );
-    }
-    catch( CoreException exc )
-    {
-      exc.printStackTrace();
-    }
-    
-	dataObjectCommand_ = new DataObjectCommand();
-    startPage_         = null;
-    canFinishRegistry_ = new SimpleCanFinishRegistry(); 
-    pageManager_       = new WizardPageManager( widgetRegistry_, 
-                                                getWizardPageFactory(), 
-				                                this,
-				                                dataManager,
-				                                environment );  
-    
-    pageManager_.setRootFragment( getRootFragment( selection, pageManager_ ) );
-    
-    commandWidgetBinding_.registerWidgetMappings( widgetRegistry_ );
-    commandWidgetBinding_.registerDataMappings( dataRegistry_ );
-    commandWidgetBinding_.registerCanFinish( canFinishRegistry_ );
-        
-    // If a page is not complete ensure that canFinish is false.
-    Condition canFinish = new Condition()
-                          {
-                            public boolean evaluate()
-                            {
-                              IWizardPage currentPage = pageManager_.getCurrentPage();
-                              
-                              return currentPage != null ? currentPage.isPageComplete() : true;
-                            }
-                          }; 
-    
-    canFinishRegistry_.add( canFinish );
-    
-    // Set that we need a progress monitor.
-    setNeedsProgressMonitor( true );
-    
-    // Ensure that the next/back buttons are enabled.
-	setForcePreviousAndNextButtons( true );
-    
-    // Set the icon banner if specified.
-    if( iconBannerName_ != null && iconBannerName_.length() > 0 )
-    {
-      try
-      {
-        URL installURL        = bundle_.getEntry("/");
-        URL imageURL          = new URL(installURL, iconBannerName_ );
-        ImageDescriptor image = ImageDescriptor.createFromURL(imageURL);
-        
-        if( image != null )
-        {
-          setDefaultPageImageDescriptor( image );
-        }
-      }
-      catch (MalformedURLException e)
-      {
-      }
-    }
-    
-    if( wizardTitle_ != null && wizardTitle_.length() > 0 )
-    {
-      setWindowTitle( wizardTitle_ );
-    }
-  }
-  
-  // Subclasses can override this.
-  protected WizardPageFactory getWizardPageFactory()
-  {
-    return new SimplePageFactory();
-  }
-  
-  /**
-  * Returns true if all pages are complete.
-  * @return True if all pages are complete.
-  */
-  public boolean canFinish ()
-  {
-  	int     length = canFinishRegistry_.size();
-  	boolean result = true;
-  	
-    for( int index = 0; index < length; index++ )
-    {
-      Condition condition = (Condition)canFinishRegistry_.elementAt( index );
-    
-      result = condition.evaluate();
-      
-      if( !result ) break;
-    }
-    
-    return result;
-  }
-
-  /**
-    * Returns the first page for this wizard.
-    *
-    * @return the first page for this wizard.
-  **/
-  public IWizardPage getStartingPage()
-  {
-  	if( startPage_ == null )
-  	{
-  		startPage_ = pageManager_.getNextPage();
-  	}
-  	
-    return startPage_;
-  }
-
-  /**
-    * Returns the next page after page and
-    * runs the appropriate tasks.
-    *
-    * @return the next page after page.
-  **/
-  public IWizardPage getNextPage( IWizardPage page )
-  {   
-    return pageManager_.getNextPage();
-  }
-  
-  /**
-  */
-  public boolean performFinish ()
-  { 
-    boolean result = pageManager_.performFinish();
-    
-    if( result ) cleanup();
-    
-    return result;
-  }
-
-  /**
-   * Undo fragments
-  */
-  public boolean performCancel ()
-  {
-  	boolean result = pageManager_.performCancel();
-  	
-  	if( result ) cleanup();
-  	
-  	return result;
-  }  
-      
-  public Object getDataObject()
-  {
-    return dataObjectCommand_.getDataObject();  
-  }
-  
-  protected CommandFragment getRootFragment( IStructuredSelection selection, WizardPageManager pageManager )
-  {
-    SequenceFragment root = new SequenceFragment();
-    
-    root.add( new SimpleFragment( new SelectionCommand( selection ), "" ) );
-    root.add( new SimpleFragment( new CurrentPageCommand( pageManager ), "" ) );
-    root.add( commandWidgetBinding_.create().create() );
-	root.add( new SimpleFragment( dataObjectCommand_, "" ));
-    
-    return root;
-  }
-  
-  protected IConfigurationElement getConfigElement()
-  {
-    return wizardElement_;
-  }
-  
-  /**
-   * This method frees up the memory held by this object.
-   *
-   */
-  private void cleanup()
-  {
-	  iconBannerName_       = null;
-	  bundle_               = null;
-	  canFinishRegistry_    = null; 
-	  pageManager_          = null;
-	  wizardTitle_          = null;
-	  dataObjectCommand_    = null;
-	  startPage_            = null;
-	  commandWidgetBinding_ = null;
-	  WidgetRegistry.initialize();
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/INamedWidgetContributor.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/INamedWidgetContributor.java
deleted file mode 100644
index a5baf32b4..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/INamedWidgetContributor.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-
-public interface INamedWidgetContributor 
-{
-  /**
-   * 
-   * @return returns the WidgetContributor for this Named widget.
-   */
-  public WidgetContributorFactory getWidgetContributorFactory();
-  
-  /**
-   * 
-   * @return returns the name.
-   */
-  public String getName ();
-  
-  /**
-   * 
-   * @return returns a description that might be displayed on
-   * a wizard page.
-   */
-  public String getDescription ();
-  
-  /**
-   * 
-   * @return returns title that may be displayed on 
-   * a wizard page.
-   */
-  public String getTitle();  
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/INamedWidgetContributorFactory.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/INamedWidgetContributorFactory.java
deleted file mode 100644
index f14ff0380..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/INamedWidgetContributorFactory.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-
-public interface INamedWidgetContributorFactory 
-{
-  /**
-   * 
-   * @return returns the first named widget.
-   */
-  INamedWidgetContributor getFirstNamedWidget();
-  
-  /**
-   * 
-   * @param widgetContributor
-   * @return returns the next named widget after the one specified.
-   */
-  INamedWidgetContributor getNextNamedWidget( INamedWidgetContributor widgetContributor );
-  
-  /**
-   * This method is used by extenions to register the data mappings
-   * that their widgets use.
-   * 
-   * @param dataRegistry
-   */
-  public void registerDataMappings( DataMappingRegistry dataRegistry );
-  
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/PageInfo.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/PageInfo.java
deleted file mode 100644
index cbad7b240..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/PageInfo.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-
-
-public class PageInfo 
-{
-  private String                   pageName_;
-  private String                   pageTitle_;
-  private WidgetContributorFactory widgetFactory_;
-  
-  public PageInfo( String                   pageName,
-                   String                   pageTitle,
-                   WidgetContributorFactory widgetFactory )
-  {
-    pageName_       = pageName;
-    pageTitle_      = pageTitle;
-    widgetFactory_  = widgetFactory;
-  }   
-  
-  public String getPageName()
-  {
-    return pageName_;
-  }
-  
-  public String getPageTitle()
-  {
-    return pageTitle_;
-  }
-  
-  public WidgetContributorFactory getWidgetFactory()
-  {
-    return widgetFactory_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/PageWizardDataEvents.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/PageWizardDataEvents.java
deleted file mode 100644
index b4c858922..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/PageWizardDataEvents.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import org.eclipse.jface.wizard.IWizardPage;
-
-/**
- * Dynamic wizard implementations that want to create different
- * kinds of wizard pages need to implement this interface.
- * The WizardPageFactory returns a class of this type.
- *
- */
-public interface PageWizardDataEvents extends IWizardPage
-{
-  /**
-   * 
-   * @return returns the WidgetDataEvents object created by the addControls
-   * method of a WidgetContributor.
-   */
-  public WidgetDataEvents getDataEvents();
-  
-  /**
-   * Validates that this wizard page is complete. 
-   *
-   */
-  public void validatePageToStatus();
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SelectionCommand.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SelectionCommand.java
deleted file mode 100644
index 1abb1e68a..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SelectionCommand.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-/**
- * This SelectionCommand is execute at the very beginning of the
- * dynamic wizard.  Commands executed in the wizard that need
- * the initial selection can get it through a data mapping from 
- * this command to the command that needs it.
- *
- */
-public class SelectionCommand extends AbstractDataModelOperation
-{
-  private IStructuredSelection selection_;
-  
-  public SelectionCommand( IStructuredSelection selection )
-  {
-    selection_ = selection;  
-  }
-  
-  public IStructuredSelection getInitialSelection()
-  {
-    return selection_;
-  }
-
-  public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
-  {
-    return Status.OK_STATUS;
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleCanFinishRegistry.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleCanFinishRegistry.java
deleted file mode 100644
index 43d193ff0..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleCanFinishRegistry.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import java.util.Vector;
-
-import org.eclipse.wst.command.internal.env.core.common.Condition;
-
-
-
-public class SimpleCanFinishRegistry extends Vector implements CanFinishRegistry
-{
-
-  /**
-   * Comment for <code>serialVersionUID</code>
-   */
-  private static final long serialVersionUID = 3257285837870741305L;
-
-  /* (non-Javadoc)
-   * @see org.eclipse.env.widgets.CanFinishRegistry#addCondition(org.eclipse.env.command.fragment.Condition)
-   */
-  public void addCondition(Condition condition)
-  {
-    add( condition );
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleCommandEngineManager.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleCommandEngineManager.java
deleted file mode 100644
index a92bb296f..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleCommandEngineManager.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.ui.widgets;
-
-import java.lang.reflect.InvocationTargetException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.wst.command.internal.env.core.data.DataFlowManager;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentEngine;
-import org.eclipse.wst.command.internal.env.core.fragment.FragmentListener;
-import org.eclipse.wst.command.internal.env.eclipse.EclipseEnvironment;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseStatusHandler;
-import org.eclipse.wst.common.environment.ILog;
-
-
-/**
- * This class manages the execution of Commands in a flow of CommandFragments.
- * The bulk of this work is done by the CommandFragmentEngine.  The main job of
- * this class is run the fragments in a particular transactional environment.
- * A fragment has a method called doNotRunInTransaction which is used to determine
- * if its commands should be run in a transaction or not.  If this method returns
- * true(ie. not in a transaction) the Commands are wrapped in a IRunnableWithProgress.
- * If false( ie. in a transaction ) the Commands are wrapped in a WorkspaceModifyOperation. 
- *
- */
-public class SimpleCommandEngineManager
-{
-  protected CommandFragmentEngine engine_;
-  protected DataFlowManager       dataManager_;
-  private   EclipseEnvironment    environment_;
-  
-  private   boolean               foundStop_;
-  private   boolean               doNotRunInTransaction_;
-  
-  public SimpleCommandEngineManager( EclipseEnvironment environment, DataFlowManager dataManager )
-  {
-    environment_ = environment;
-    dataManager_ = dataManager;
-  }
-  
-  /**
-   * Sets the root fragment.  The execution engine will start executing commands
-   * at the beginning of this root fragment.
-   * 
-   * @param root the root fragment.
-   */
-  public void setRootFragment( CommandFragment root )
-  {
-  	engine_ = new CommandFragmentEngine( root, dataManager_, environment_ );
-	
-	  environment_.setCommandManager( engine_ );
-  	
-    engine_.setPeekFragmentListener( 
-      new FragmentListener()
-      {
-        public  boolean notify( CommandFragment fragment )
-        {
-          return peekFragment( fragment );
-        }
-      } );  
-                  
-    engine_.setNextFragmentListener( 
-      new FragmentListener()
-      {
-        public  boolean notify( CommandFragment fragment )
-        {
-          return nextFragment( fragment );
-        }
-      } );  
-    
-    engine_.setAfterExecuteFragmentListener( 
-        new FragmentListener()
-        {
-          public  boolean notify( CommandFragment fragment )
-          {
-            return afterExecuteNextFragment( fragment );
-          }
-        } );  
-                                                             
-	  engine_.setUndoFragmentListener(
-      new FragmentListener()
-      {
-        public boolean notify( CommandFragment fragment )
-        {
-          return undoFragment( fragment );
-        }
-      } );               
-  }
-
-  protected boolean afterExecuteNextFragment( CommandFragment fragment )
-  {
-    boolean              continueExecute = true;
-    EclipseStatusHandler statusHandler   = (EclipseStatusHandler)environment_.getStatusHandler();
-    IStatus              commandStatus   = engine_.getLastStatus();
-    IStatus              handlerStatus   = statusHandler.getStatus();
-    
-    if( commandStatus.getSeverity() == IStatus.ERROR &&
-        handlerStatus.getSeverity() != IStatus.ERROR )
-    {
-      // The command returned an error status for the engine to stop,
-      // but the status handler did not have report and error.
-      // Therefore, we will report this status returned by the command
-      // if there is a message to display.  
-      String errorMessage = commandStatus.getMessage();
-      
-      if( errorMessage != null && errorMessage.length() > 0 )
-      {
-        statusHandler.reportError( commandStatus );
-      }
-    }
-    else if( commandStatus.getSeverity() != IStatus.ERROR &&
-             handlerStatus.getSeverity() == IStatus.ERROR )
-    {
-      // The last command didn't return an error, but the status handler
-      // did report and error.  Therefore, we should stop.
-      continueExecute = false;   
-    }
-    
-    return continueExecute;
-  }
-  
-  /**
-   * The CommandFragmentEngine calls this method when it is peeking forward
-   * in the fragments.  When peeking forward the command stack state in the
-   * engine is not changes.
-   * 
-   * 
-   * @param fragment the fragment that it is peeking at.
-   * @return Indicates whether peeking should stop or not.
-   */
-  protected boolean peekFragment( CommandFragment fragment )
-  {     
-    return true;
-  }
-  
-  /**
-   * The CommandFragmentEngine calls this method when it is moving forward
-   * in the fragments.   When moving forward the command stack state is saved
-   * at each fragment is traversed.
-   * 
-   * @param fragment the fragment that is being traversed.
-   * @return indicates if the forward traversal should continue.  
-   */
-  protected boolean nextFragment( CommandFragment fragment )
-  {     
-    if( fragment.doNotRunInTransaction() != doNotRunInTransaction_ )
-    {
-      // The fragment is requesting a different transaction environment than
-      // the one that we are in so we must stop and change environments.
-      doNotRunInTransaction_ = fragment.doNotRunInTransaction();
-      foundStop_             = false;      
-    }
-    
-    return foundStop_;
-  }
-  
-  /**
-   * This method is called for each fragment when the command engine is unwinding
-   * its stack during an undo operation.
-   * 
-   * @param fragment  the fragment being undone.
-   * @return returns true if the undo process should continue.
-   */
-  protected boolean undoFragment( CommandFragment fragment )
-  {  	  	
-    return true;
-  }
-    
-  /**
-   * The method executes the CommandFragment commands in the context provided.
-   * 
-   * @param context the context
-   * @return returns the status of executing the commands.
-   */
-  public IStatus runForwardToNextStop( IRunnableContext context )
-  {
-    IRunnableWithProgress operation = null;
-    
-  	doNotRunInTransaction_ = false;
-  	
-  	do
-  	{
-  	  // We will stop unless we are changing transaction modes.
-      foundStop_ = true;
-      
-  	  if( doNotRunInTransaction_ )
-  	  {
-  	    operation = getNoTransactionOperation();
-  	  }
-  	  else
-  	  {
-  	    operation = getTransactionOperation();
-  	  }
-  	  
-   	  try
-  	  {  	   
-  	    if( context == null )
-  	    {
-  	   	  // We don't have a container yet so just run the operation.
-  	   	  operation.run( null );
-  	    }
-  	    else
-  	    {
-  	   	  // We have a container where this operation can run and have
-  	   	  // its progress displayed.
-  	      context.run( false, false, operation );
-  	    }
-  	  }
-  	  catch( InterruptedException exc )
-  	  {
-  	    //TODO should log these exceptions.
-  	    exc.printStackTrace();
-  	  }
-  	  catch( InvocationTargetException exc )
-  	  {
-  	    //TODO should log these exceptions.
-  	    exc.printStackTrace();
-  	  }
-  	}  
-  	while( !foundStop_ ); 
-  	
-  	return engine_.getLastStatus();
-  }
-  
-  private IRunnableWithProgress getTransactionOperation()
-  {
-    IRunnableWithProgress operation = new IRunnableWithProgress()
-    {
-      public void run( IProgressMonitor monitor )
-      {
-        environment_.getLog().log(ILog.INFO, "command", 5002, this, "getTransactionOperation", "Start of transaction");
-        
-        EclipseStatusHandler statusHandler = (EclipseStatusHandler)environment_.getStatusHandler();
-        
-        statusHandler.resetStatus();
-        engine_.moveForwardToNextStop( monitor );
-        
-        
-        environment_.getLog().log(ILog.INFO, "command", 5003, this, "getTransactionOperation", "End of transaction");
-      }
-    };
-    
-    return operation;
-  }
-  
-  private IRunnableWithProgress getNoTransactionOperation()
-  {
-    IRunnableWithProgress operation = new IRunnableWithProgress()
-    {
-      public void run( IProgressMonitor monitor )
-      {
-        environment_.getLog().log(ILog.INFO, "command", 5085, this, "getNoTransactionOperation", "Start of NON transaction");
-        
-        EclipseStatusHandler statusHandler = (EclipseStatusHandler)environment_.getStatusHandler();
-        
-        statusHandler.resetStatus();
-        engine_.moveForwardToNextStop( monitor );
-        environment_.getLog().log(ILog.INFO, "command", 5086, this, "getNoTransactionOperation", "End of NON transaction");
-      }
-    }; 
-    
-    return operation;
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimplePageFactory.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimplePageFactory.java
deleted file mode 100644
index 4c02e6be5..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimplePageFactory.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-
-public class SimplePageFactory implements WizardPageFactory
-{   
-  public PageWizardDataEvents getPage( PageInfo pageInfo, WizardPageManager manager )
-  {
-    return new SimpleWizardPage( pageInfo, manager );
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimplePopupPageFactory.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimplePopupPageFactory.java
deleted file mode 100644
index ada9688e7..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimplePopupPageFactory.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-
-public class SimplePopupPageFactory implements WizardPageFactory
-{   
-  private String id_;
-  
-  public SimplePopupPageFactory( String id )
-  {
-    id_ = id;  
-  }
-  
-  public PageWizardDataEvents getPage( PageInfo pageInfo, WizardPageManager manager )
-  {
-    return new SimplePopupWizardPage( pageInfo, manager, id_ );
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimplePopupWizardPage.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimplePopupWizardPage.java
deleted file mode 100644
index d79c2ac82..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimplePopupWizardPage.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.wst.command.internal.env.ui.widgets;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.context.PersistentActionDialogsContext;
-import org.eclipse.wst.command.internal.env.ui.EnvironmentUIMessages;
-
-
-
-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 );
-  	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   = EnvironmentUIMessages.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 = EnvironmentUIMessages.TOOLTIP_DO_NOT_SHOW_DIALOG_AGAIN;
-      
-      button.setText( label );
-      button.setToolTipText( tooltip );
-      button.addSelectionListener( new SelectionAdapter()
-                                   {
-                                     public void widgetSelected( SelectionEvent evt )
-                                     {
-                                       context.setActionDialogEnabled( id_, button.getSelection() );  
-                                     }
-                                   });
-      button.setSelection( false );
-      
-      PlatformUI.getWorkbench().getHelpSystem().setHelp( button, infopop );  	
-  	}
-  	
-  	setControl( composite );
-  }  
-}  
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWidgetContributor.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWidgetContributor.java
deleted file mode 100644
index 652acb165..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWidgetContributor.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-
-public class SimpleWidgetContributor implements INamedWidgetContributor 
-{
-    private WidgetContributorFactory factory_;
-	private String                   name_;
-	private String                   description_;
-	private String                   title_;
-	
-	public void setDescription(String description) 
-	{
-		description_ = description;
-	}
-	
-
-	public void setFactory(WidgetContributorFactory factory) 
-	{
-		factory_ = factory;
-	}
-	
-
-	public void setName(String name) 
-	{
-		name_ = name;
-	}
-	
-
-	public void setTitle(String title) 
-	{
-		title_ = title;
-	}
-	
-
-	public WidgetContributorFactory getWidgetContributorFactory() 
-	{
-		return factory_;
-	}
-
-	public String getName() 
-	{
-		return name_;
-	}
-
-	public String getDescription() 
-	{
-		return description_;
-	}
-
-	public String getTitle() 
-	{
-		return title_;
-	}
-
-	/**
-	 * Subsclassers should override this method.
-	 */
-	public void registerDataMappings(DataMappingRegistry dataRegistry) 
-	{
-
-	}
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWidgetDataContributor.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWidgetDataContributor.java
deleted file mode 100644
index 5484c9ef0..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWidgetDataContributor.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-
-
-/**
- * This class provides a simple WidgetDataContributor class that concrete 
- * WidgetDataContributors can subclass.
- *
- */
-public class SimpleWidgetDataContributor implements WidgetDataContributor
-{  
-  /**
-   * @see org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor#addControls(org.eclipse.swt.widgets.Composite, org.eclipse.swt.widgets.Listener)
-   */
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener)
-  {
-    return this;
-  }
-
-  /**
-   * @see org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor#getStatus()
-   */
-  public IStatus getStatus()
-  {
-    return null;
-  }
-
-  /**
-   * @see org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents#externalize()
-   */
-  public void externalize()
-  {
-  }
-
-  /**
-   * @see org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents#internalize()
-   */
-  public void internalize()
-  {
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWidgetRegistry.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWidgetRegistry.java
deleted file mode 100644
index 0489bca3f..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWidgetRegistry.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import java.util.Hashtable;
-
-
-
-public class SimpleWidgetRegistry implements WidgetRegistry
-{
-  private Hashtable table_ = new Hashtable();
-  
-  public void add( String fragmentId,
-                   String pageName,
-                   String pageTitle,
-                   WidgetContributorFactory widgetFactory )
-  {
-  	PageInfo entry = new PageInfo( pageName, pageTitle, widgetFactory );
-  	table_.put( fragmentId, entry );
-  }                   
-  
-  public PageInfo getPageInfo( String fragmentId )
-  {
-    return (PageInfo)table_.get( fragmentId );
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWizardPage.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWizardPage.java
deleted file mode 100644
index 4d2bb595f..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWizardPage.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-
-
-
-public class SimpleWizardPage extends WizardPage implements PageWizardDataEvents
-{
-  private   WidgetContributor widget_;
-  private   WidgetDataEvents  dataEvents_;
-  private   Listener          statusListener_;
-  protected WizardPageManager pageManager_;
-  	
-  public SimpleWizardPage( PageInfo pageInfo, WizardPageManager pageManager )
-  {
-  	super( "" );
-  	
-  	setTitle( pageInfo.getPageName() );
-  	setDescription( pageInfo.getPageTitle());
-  	  
-  	widget_         = pageInfo.getWidgetFactory().create();
-  	statusListener_ = new StatusListener();
-  	pageManager_    = pageManager;
-  } 	  
-  	
-  public void createControl( Composite parent ) 
-  {
-  	Composite control = new Composite( parent, SWT.NONE );
-  	control.setLayout( new GridLayout() );
-  	control.setLayoutData( new GridData( GridData.FILL_BOTH ));
-  	
-	dataEvents_ = widget_.addControls( control, statusListener_ );
-	  
-    org.eclipse.jface.dialogs.Dialog.applyDialogFont(control);
-    setControl( control );
-  }
-  
-  public WidgetDataEvents getDataEvents()
-  {
-    return dataEvents_;
-  }
-  	  
-  public void validatePageToStatus()
-  {
-    IStatus status  = widget_.getStatus();
-    
-    if( status != null )
-    {
-      if( status.getSeverity() == IStatus.ERROR )
-      {
-        String message = status.getMessage();
-
-        if( message.length() == 0 )
-        {
-          setErrorMessage( null );
-          setMessage( getDescription() );
-        }
-        else
-        {
-          setErrorMessage( message );
-        }
-          
-        setPageComplete( false );
-      }
-      else if (status.getSeverity() == IStatus.WARNING )
-      {
-        setErrorMessage( null );
-        setMessage(status.getMessage(), IStatus.WARNING );
-        setPageComplete( true );
-      }
-      else if( status.getSeverity() == IStatus.INFO )
-      {
-        setErrorMessage( null );
-        setMessage( status.getMessage(), IStatus.INFO );
-        setPageComplete( true );
-      }
-      else
-      {
-        setErrorMessage( null );
-        setMessage( getDescription() );
-        setPageComplete( true );
-      }
-    }
-    else
-    {
-      setErrorMessage( null );
-      setMessage( getDescription() );
-      setPageComplete( true );
-    }
-    
-    getContainer().updateButtons();
-  }
-    
-  public boolean canFlipToNextPage() 
-  {
-	return isPageComplete() && pageManager_.hasNextPage();
-  }
-
-  public IWizardPage getNextPage() 
-  {
-	return pageManager_.getNextPage();
-  }
-  
-  public void setVisible(boolean value) 
-  {
-  	pageManager_.handlePageVisible( this, value );
-  	
-    super.setVisible(value);
-  }
-  
-  private class StatusListener implements Listener
-  {
-	public void handleEvent( Event evt ) 
-	{
-      validatePageToStatus();
-	}
-  }
-}  
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetBindingToWidgetFactoryAdapter.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetBindingToWidgetFactoryAdapter.java
deleted file mode 100644
index 152f7c8c8..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetBindingToWidgetFactoryAdapter.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import java.util.Hashtable;
-
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-
-public class WidgetBindingToWidgetFactoryAdapter 
-{
-  private Hashtable            widgetContributor_;
-  private CommandWidgetBinding binding_;
-  
-  public WidgetBindingToWidgetFactoryAdapter( CommandWidgetBinding binding )
-  {
-    widgetContributor_ = new Hashtable(); 
-	binding_           = binding;
-	
-	binding.registerWidgetMappings( new MyWidgetRegistry() );
-  }
-  
-  public INamedWidgetContributor getWidget( String id )
-  {
-    return (INamedWidgetContributor)widgetContributor_.get( id );  
-  }
-  
-  public void registerDataMappings( DataMappingRegistry registry )
-  {
-    binding_.registerDataMappings( registry );  
-  }
-  
-  private class MyWidgetRegistry implements WidgetRegistry
-  {
-	public void add(String fragmentId, String pageName, String pageTitle, WidgetContributorFactory widgetFactory) 
-	{
-	  SimpleWidgetContributor widget = new SimpleWidgetContributor();
-	  widget.setTitle( pageName );
-	  widget.setDescription( pageTitle );
-	  widget.setFactory( new MyWidgetContributorFactory( widgetFactory ) );
-	  
-	  widgetContributor_.put( fragmentId, widget );
-	}	  
-  }
-  
-  private class MyWidgetContributorFactory implements WidgetContributorFactory
-  {
-	private WidgetContributorFactory factory_;
-	private WidgetContributor        widget_;
-	
-	public MyWidgetContributorFactory( WidgetContributorFactory factory )
-	{
-	  factory_ = factory;	
-	}
-	
-	public WidgetContributor create() 
-	{
-      if( widget_ == null )
-	  {
-	    widget_ = factory_.create();
-	  }
-	  
-	  return widget_;
-	}	  
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetContributor.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetContributor.java
deleted file mode 100644
index b6db62601..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetContributor.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-
-
-/**
- * This interface provides a way for developers to create validatable widgets
- * that can be used in many different Eclipse UI contexts. (ie. in a Windows, Diaglogs,
- * wizard pages, etc)
- *
- * The main functionality this interface has over just a regular Eclipse Composite
- * is that it provides a mechanism for validating the Widget.  When validating
- * there are two aspects to keep in mind.  The first aspect deals with WHEN validation
- * occurs and the second aspect deals with WHAT to do for a validation event.
- * 
- * The first aspect of triggering validation events is handled by the statusListener
- * parameter of the addControls method.  If a particular control that is contributed can
- * affect the validity of this WidgetContributor then the statusListener object
- * should be added to the listener list of that control.  For example, if the text in
- * a Text widget can affect the validity of this WidgetContributor then you would
- * add the statusListener to the Text widgets Modify listener list:
- * 
- * 
- *   Text someText = new Text( parent, SWT.NONE );
- *   someText.addListener( SWT.Modify, statusListener );
- * 
- * Note: if you want to force validation of this widget you can call
- *       the statusListener.handleEvent(null) method directly.  This
- *       is not the prefered may to trigger validation, however.
- *       
- * The second aspect of valiation is what to do when the validation event occurs.
- * This is handled by getStatus method.  Any code that ensures that this widget is
- * valid should be put in the getStatus implementation. 
- * 
- * 
-*/
-public interface WidgetContributor 
-{
-  /**
-   * This method should be used to implement the UI contributions for this widget.
-   * 
-   * @param parent The composite parent that sub widgets should use.
-   * @param statusListener This listener should be added to any widget that can
-   *                       affect the validity of this WidgetContributor.
-   * @return returns a WidgetDataEvents object.  This object is used by the
-   *         framework to internalize and externalize data for this widget.
-   */
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener );
-  
-  /**
-   * This method should implement validation code for this WidgetContributor.
-   * 
-   * @return returns a status object indicating the validity of this widget.
-   *         If the status severity is ERROR then this widget is considered to
-   *         be invalid.  For any other status severity or if the status returned
-   *         is null this widget is considered to be valid.
-   */
-  public IStatus getStatus();
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetContributorFactory.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetContributorFactory.java
deleted file mode 100644
index 65b5d0aa3..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetContributorFactory.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-/**
- * This interface provide a way for creating WidgetContributors
- *
- *
- */
-public interface WidgetContributorFactory 
-{
-  public WidgetContributor create();
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetDataContributor.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetDataContributor.java
deleted file mode 100644
index e9aa31db7..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetDataContributor.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-/**
- * This interface is a combination of the WidgetContributor interface and
- * the WidgetDataEvents interface.
- *
- */
-public interface WidgetDataContributor extends WidgetContributor, WidgetDataEvents 
-{
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetDataEvents.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetDataEvents.java
deleted file mode 100644
index 4cb03f0fc..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetDataEvents.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-/**
- * This interface provides a way for internalizing and externalizing state
- * data in a WidgetContributor.  The internalize method will be called
- * before the widget is displayed so that it can set the default data
- * for that widget.  The externalize method provides a way of getting data
- * from the widget after it is displayed.
- *
- */
-public interface WidgetDataEvents 
-{
-  /**
-   * Implementations should set widget state data here.
-   *
-   */
-  public void internalize();
-  
-  /**
-   * Implemenations should get widget state data here.
-   *
-   */
-  public void externalize();  
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetRegistry.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetRegistry.java
deleted file mode 100644
index c01107c0f..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetRegistry.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-/**
- * This interface defines how WidgetContributors are made known to the
- * dynamic wizard framework.  This widget will be displayed as a wizard page
- * with the name and title specified in the add method.  The fragmentId is 
- * used to associate this widget with a particular CommandFragment.  When
- * a CommandFragment with this fragmentId is traversed the corresponding
- * WidgetContributor will be displayed.
- *
- */
-public interface WidgetRegistry
-{
-  /**
-   * Adds a WidgetContributorFactory to the framework.  This factory
-   * is used to get the WidgetContributor.  This WidgetContributor
-   * will be used to render the wizard page.
-   * 
-   * @param fragmentId the CommandFragment id that this WidgetContributor is associated with.
-   * @param pageName the name of this wizard page.
-   * @param pageTitle the title of this wizard page.
-   * @param widgetFactory the factory which will create the WidgetContributor.
-   */
-  public void add( String fragmentId,
-				   String pageName,
-				   String pageTitle,
-				   WidgetContributorFactory widgetFactory );
-  
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WizardPageFactory.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WizardPageFactory.java
deleted file mode 100644
index c520979b2..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WizardPageFactory.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-
-/**
- * 
- *
- *
- *
- */
-public interface WizardPageFactory 
-{
-  public PageWizardDataEvents getPage( PageInfo pageInfo, WizardPageManager manager ); 
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WizardPageManager.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WizardPageManager.java
deleted file mode 100644
index 37a8fe03e..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WizardPageManager.java
+++ /dev/null
@@ -1,480 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import java.util.Hashtable;
-import java.util.Stack;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.IWizardContainer;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.wst.command.internal.env.core.data.DataFlowManager;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.eclipse.EclipseEnvironment;
-import org.eclipse.wst.command.internal.env.ui.registry.WidgetRegistry;
-
-
-
-public class WizardPageManager extends SimpleCommandEngineManager
-{
-  private   WizardPageFactory      pageFactory_;
-  private   Hashtable              pageTable_;
-  private   IWizard                wizard_;
-  protected SimpleWidgetRegistry   registry_;
-  
-  // These variables are used and set by our methods which is
-  // why they are not initialized in the constructor.
-  private PageWizardDataEvents currentPage_;
-  private PageWizardDataEvents nextPage_;
-  private PageWizardDataEvents nextPeekPage_;
-  private PageWizardDataEvents firstPage_;
-  private CommandFragment      lastUndoFragment_;
-  private boolean              firstFragment_;
-  
-  private INamedWidgetContributorFactory widgetFactory_;
-  private Stack                          widgetStack_;
-  private Stack                          widgetStackStack_;
-  private Hashtable                      widgetTable_;
-  private WidgetRegistry                 widgetRegistry_;
-  private Hashtable                      widgetFactoryTable_;
-    
-  public WizardPageManager( SimpleWidgetRegistry  registry,
-                            WizardPageFactory     pageFactory,
-                            IWizard               wizard,
-                            DataFlowManager       dataManager,
-                            EclipseEnvironment    environment )
-  { 
-    super( environment, dataManager );  
-    
-  	pageFactory_        = pageFactory;
-  	pageTable_          = new Hashtable();  
-  	registry_           = registry;
-  	wizard_             = wizard;
-	  widgetTable_        = new Hashtable();
-	  widgetFactoryTable_ = new Hashtable();
-	  widgetRegistry_     = WidgetRegistry.instance();
-	  widgetStackStack_   = new Stack();
-  }
-  
-  public IStatus runForwardToNextStop()
-  {    
-  	firstFragment_  = true;
-  	nextPage_       = null;
- 
-  	IWizardContainer container = wizard_.getContainer();
-  	
-  	if( container == null || container.getCurrentPage() == null )
-  	{
-  	  container = null;
-  	}
-  	
-  	return super.runForwardToNextStop( container );
-  }
-    
-  public IWizardPage getCurrentPage()
-  {
-    return currentPage_;
-  }
-    
-  public boolean hasNextPage()
-  {	
-	 
-    nextPeekPage_ = null;
-    
-	try
-	{
-  	nextPeekPage_ = getNextPageInGroup( widgetFactory_, false );
-		
-	  if( nextPeekPage_ == null )
-	  {
-	    // If a page is found nextPage_ will be set to its value in the method below.
-  	    engine_.peekForwardToNextStop();
-	  }
-	}
-	catch( Throwable exc )
-	{
-	  exc.printStackTrace();
-	}
-  	
-    return nextPeekPage_ != null;
-  }
-  
-  public IWizardPage getNextPage()
-  {  	
-	try
-	{    
-  	// Need to externalize the data for the current page so that
-  	// when we move forward below the data is available.
-  	if( currentPage_ != null ) currentPage_.getDataEvents().externalize();
-  	
-	  nextPage_ = getNextPageInGroup( widgetFactory_, true );
-	
-	  if( nextPage_ == null )
-	  {
-	    widgetFactory_ = null;
-	    widgetStack_   = null;
-		
-  	  IStatus status = runForwardToNextStop();
-  	
-  	  if( status.getSeverity() == IStatus.ERROR )
-  	  {
-  	    // An error has occured so we need undo to the previous stop point.
-  	    undoToLastPage();
-  	  }
-	  }
-	
-  	if( nextPage_ != null ) nextPage_.setWizard( wizard_ );
-  	  	
-  	return nextPage_;
-	}
-	catch( Throwable exc )
-	{
-	  exc.printStackTrace();	
-	}
-	
-	return null;
-  }
-    
-  public void handlePageVisible( PageWizardDataEvents page, boolean isPageVisible )
-  {
-    if( !isPageVisible && page == firstPage_ && page == currentPage_ )
-    {
-      // We are moving back one page from the first page.  This can't happen with popup wizards
-      // since the previous button would be greyed out.  But when the new wizard launches this wizard
-      // the previous button is not greyed out and brings the user back to the list wizards to select.
-      // Therefore, we must unwind the command engine and get ready for the user to invoke this wizard 
-      // again.  We are assuming here that the first page is never part of a widget group!
-  	  undoToLastPage();	  
-      currentPage_ = null;
-      firstPage_   = null;
-    }
-  	if( currentPage_ != null && page == currentPage_.getPreviousPage() && isPageVisible )
-  	{
-  	  // We are moving back one page.
-  	  // Note: we don't internalize the previous page and we do not externalize the current page.
-  	  //       we are basically just leaving the current page without retrieving its state and
-  	  //       moving to the previous page which already has its state set.
-	
-	    if( widgetFactory_ != null )
-	    {
-		    if( widgetStack_.size() > 0 )
-		    {
-		      widgetStack_.pop();
-		    }
-		
-		    if( widgetStack_.size() == 0 )
-		    {
-		      widgetFactory_ = null;
-		      widgetStack_ = null;
-		      widgetStackStack_.pop();
-		    }
-	    }
-	  
-	    if( widgetFactory_ == null )
-	    {
-  	    undoToLastPage();
-	    }
-	  
-  	  currentPage_ = page;
-  	}	
-  	else if( isPageVisible )
-  	{
-	    try
-	    {
-  	    // We are moving forward one page.
-  	    WidgetDataEvents dataEvents = page.getDataEvents();
-  	  
-  	    dataManager_.process( dataEvents );  // Push model data into the new page.
-  	    dataEvents.internalize();
-  	  
-  	    page.validatePageToStatus();  	  
-	    }
-	    catch( Throwable exc )
-	    {
-		    exc.printStackTrace();
-	    }
-	    finally
-	    {
-	  	  if( currentPage_ != null ) page.setPreviousPage( currentPage_ );
-	    	  
-	  	  if( firstPage_ == null ) firstPage_ = page;
-	  	  
-	  	  currentPage_ = page;  
-	    }
-  	}
-  }
-  
-  public boolean performFinish()
-  { 	
-  	// We need to simulate the next button being pressed until there are no more pages.
-  	// If an error occurs we will return false and reset the command stack back our original state.
-  	boolean    doneOk    = true;
-  	PageWizardDataEvents startPage = currentPage_;
-  	
-  	// Externalize the current page.
-  	currentPage_.getDataEvents().externalize();
-  	
-  	// Loop through subsequent pages.
-  	do
-  	{  	  
-  	  IStatus status = runForwardToNextStop();	  
-  	  
-  	  if( status.getSeverity() == IStatus.ERROR )
-  	  {
-  	  	// An error occured in one of the commands.
-  	  	doneOk = false;
-  	  }
-  	  else
-  	  {
-  	  	currentPage_ = nextPage_;
-  	  }
-  	}
-  	while( nextPage_ != null && doneOk);
-  	
-  	if( !doneOk )
-  	{
-  	  // An error occured, so we need to return the command stack to it's
-  	  // orginal state.
-  	  PageWizardDataEvents page = null;
-  	  boolean              done = false;
-  	  
-  	  do
-  	  {
-  	    done = engine_.undoToLastStop();
-  	    page = getPage( lastUndoFragment_ );
-  	  }
-  	  while( page != startPage && !done ); 	  
-  	  
-  	  currentPage_ = page;
-  	}
-  	
-  	return doneOk;
-  }
-  
-  public boolean performCancel()
-  {
-  	while( !engine_.undoToLastStop() ){}
-  	
-  	return true;
-  }
-    
-  protected boolean peekFragment( CommandFragment fragment )
-  {     	
-    // Check to see if this fragment is in our page table.
-    nextPeekPage_ = getPage( fragment );
-          	
-	  if( nextPeekPage_ == null )
-	  {
-	    INamedWidgetContributorFactory factory = getWidgetFactory( fragment.getId() );
-	  
-	    if( factory != null )
-	    {
-		    nextPeekPage_ = getNextPageInGroup( factory, false );  
-	    }
-	  }
-	
-    return nextPeekPage_ == null;
-  }
-  
-  protected boolean nextFragment( CommandFragment fragment )
-  {
-    // If the super class nextFragment want us to stop then we will stop right away.
-    if( !super.nextFragment( fragment ) ) return false;
-    
-  	// The first fragment is either at the start of the wizard
-  	// or it is on a wizard page.  In either case we do not want 
-  	// to stop if a page is found.
-  	if( firstFragment_ )
-  	{
-  	  firstFragment_ = false;
-  	}
-  	else
-  	{
-	    widgetFactory_ = getWidgetFactory( fragment.getId() );
-	  
-	    if( widgetFactory_ != null )
-	    {
-		    widgetStack_ = new Stack();
-        
-        nextPage_ = getNextPageInGroup( widgetFactory_, true );
-		
-        if( nextPage_ == null )
-        {
-          // We found a widget contributor for this fragment, but no page was delivered for it.
-          // We will therefore, not put it on our stack of widget stacks.
-          widgetStack_ = null;
-          widgetFactory_ = null;
-        }
-        else
-        {
-		      StackEntry entry = new StackEntry();
-		
-		      entry.factory_ = widgetFactory_;
-		      entry.stack_   = widgetStack_;
-		      widgetStackStack_.push( entry );
-        }
-	    }
-	    else
-	    {
-  	    nextPage_ = getPage( fragment );
-	    }
-  	}  	  	
-  	
-    return nextPage_ == null;
-  }
-  
-  protected boolean undoFragment( CommandFragment fragment )
-  {
-  	lastUndoFragment_ = fragment;
-  	
-  	return true;
-  }
-  
-  
-  private PageWizardDataEvents getNextPageInGroup( INamedWidgetContributorFactory factory, boolean pushNewWidget )
-  {
-	  PageWizardDataEvents page = null;
-	
-	  if( factory != null )
-	  {	  
-	    INamedWidgetContributor newWidget = null;
-		  
-	    if( widgetStack_ == null || widgetStack_.size() == 0 )
-	    {
-		    newWidget = factory.getFirstNamedWidget();   
-	    }
-	    else
-	    {
-		    INamedWidgetContributor currentWidget = (INamedWidgetContributor)widgetStack_.peek();
-		    newWidget = factory.getNextNamedWidget( currentWidget ); 
-	    }
-		  
-	    if( newWidget != null )
-	    {
-		    page = getPage( newWidget );
-		
-		    if( pushNewWidget )
-		    {
-		      widgetStack_.push( newWidget );
-		    }
-	    }
-	  }
-		
-	  return page;  
-  }
-  
-  private void undoToLastPage()
-  {
-    boolean stackEmpty  = false;
-	  boolean doneUndoing = false;
-    
-	  while( !doneUndoing )
-	  {
-	    stackEmpty = engine_.undoToLastStop();
-	  
-	    IWizardPage page = null;
-	  
-	    if( lastUndoFragment_ != null )
-	    {
-	      page = getPage( lastUndoFragment_ );
-		
-	      if( page == null )
-	      {
-		      // Check to see if a group page fragment was found.
-		      INamedWidgetContributorFactory factory = getWidgetFactory( lastUndoFragment_.getId() );
-		  
-		      if( factory != null )
-		      {
-		        StackEntry entry = (StackEntry)widgetStackStack_.peek();
-			
-		        widgetFactory_ = entry.factory_;
-		        widgetStack_   = entry.stack_;	
-			
-		        if( widgetStack_ != null && !widgetStack_.empty() )
-		        {
-		          INamedWidgetContributor currentWidget = (INamedWidgetContributor)widgetStack_.peek();
-			
-		          page = getPage( currentWidget );
-		        }
-		      }
-	      }
-	    }
-	  
-	    doneUndoing = page != null || stackEmpty;
-	  }
-  }
-  
-  private PageWizardDataEvents getPage( CommandFragment fragment )
-  {
-    // Check to see if this fragment is in our page table.
-  	PageWizardDataEvents page = (PageWizardDataEvents)pageTable_.get( fragment ); 
-  	String      id   = fragment.getId();      	
-          	
-    if( page == null && id != null )
-    {
-      // Check to see if this fragment id is in the registry.
-      PageInfo pageInfo = registry_.getPageInfo( id );          	  
-              
-      if( pageInfo != null )
-      {
-        page = pageFactory_.getPage( pageInfo, this );
-        pageTable_.put( fragment, page );            	
-      }
-    }
-
-    return page;
-  }    
-  
-  private PageWizardDataEvents getPage( INamedWidgetContributor widget )
-  {
-	  PageWizardDataEvents page = (PageWizardDataEvents)widgetTable_.get( widget );
-
-	  if( page == null )
-	  {
-	    PageInfo pageInfo = new PageInfo(widget.getTitle(), widget.getDescription(), widget.getWidgetContributorFactory() );
-	  
-	    page = pageFactory_.getPage( pageInfo, this );
-	    widgetTable_.put( widget, page );
-	  }
-	
-	  return page;
-  }
-  
-  private INamedWidgetContributorFactory getWidgetFactory( String id )
-  {
-	  INamedWidgetContributorFactory factory = (INamedWidgetContributorFactory)widgetFactoryTable_.get( id );
-	
-	  if( factory == null )
-	  {
-	    // The factory is not in our table so we will try the registry.
-	    factory = widgetRegistry_.getFactory( id );
-	  
-	    if( factory != null )
-	    {
-	      widgetFactoryTable_.put( id, factory );
-	      factory.registerDataMappings( dataManager_.getMappingRegistry() );
-		    dataManager_.process( factory );
-	    }
-	  }
-	  else
-	  {
-	    dataManager_.process( factory );
-	  }
-	
-	  return factory;
-  }
-  
-  private class StackEntry
-  {
-    INamedWidgetContributorFactory factory_;
-	  Stack                          stack_;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/popup/DynamicPopupWizard.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/popup/DynamicPopupWizard.java
deleted file mode 100644
index 4738f8b96..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/popup/DynamicPopupWizard.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets.popup;
-
-import java.lang.reflect.InvocationTargetException;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.ui.IActionDelegate;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.context.PersistentActionDialogsContext;
-import org.eclipse.wst.command.internal.env.context.PersistentResourceContext;
-import org.eclipse.wst.command.internal.env.core.data.DataFlowManager;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistryImpl;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.eclipse.EclipseEnvironment;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseStatusHandler;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleCommandEngineManager;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimplePopupPageFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WizardPageFactory;
-
-
-/**
- * This class is used to popup dynamic wizards.  The popupMenus extension is used
- * the contribute a popup to Eclipse.  The class in the action element should reference
- * this DynamicPopupWizard class.  This id attribute in the action element should contain
- * an id that references a dynamicWizard extension point.  This is how the DynamicPopupWizard
- * class knows which wizard to display.
- *   
- * Note: the id attribute in the objectContribution element refers to an
- *       actionDialogPreferenceType extension point.  The ids in objectContribution
- *       element and the action element need not be the same as they are in the
- *       example below.
- *
- *<pre>
- *   &lt;extension
- *         point="org.eclipse.ui.popupMenus"&gt;
- *&lt;!-- IFile *.wsdl popup menu --&gt;
- *     &lt;objectContribution
- *           objectClass="org.eclipse.core.resources.IFile"
- *           nameFilter="*.wsdl"
- *           id="org.eclipse.jst.ws.consumption.ui.wizard.client.clientwizard"&gt;
- *&lt;!-- WSDL To Java Bean Proxy --&gt;
- *        &lt;action
- *              label="%ACTION_GENERATE_JAVA_PROXY"
- *              class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- *              menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu/popupActions"
- *              id="org.eclipse.jst.ws.consumption.ui.wizard.client.clientwizard"&gt;
- *        &lt;/action&gt;
- *     &lt;/objectContribution&gt;
- *  &lt;/extension&gt;
- *
- *   &lt;extension
- *        point="org.eclipse.wst.command.env.dynamicWizard"&gt;
- *     &lt;dynamicWizard
- *           iconbanner="icons/full/wizban/webservicesclient_wiz.gif"
- *           class="org.eclipse.jst.ws.consumption.ui.widgets.binding.ClientWidgetBinding"
- *           title="%WIZARD_TITLE_WSC"
- *           id="org.eclipse.jst.ws.consumption.ui.wizard.client.clientwizard"&gt;
- *     &lt;/dynamicWizard&gt;
- *  &lt;/extension&gt;
- *</pre>
- *
- */
-public class DynamicPopupWizard extends DynamicWizard implements IActionDelegate
-{
-  private ISelection selection_;
-  
-  public DynamicPopupWizard()
-  {
-	super();
-  }
-  
-  /**
-   * 
-   * @see org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard#getWizardPageFactory()
-   */
-  protected WizardPageFactory getWizardPageFactory()
-  {
-    return new SimplePopupPageFactory( getId() );
-  }
-  
-  private String getId()
-  {
-    return ((IConfigurationElement)originalElement_.getParent()).getAttribute( "id" );  
-  }
-  
-  /**
-   * @see IActionDelegate#run
-   */
-  public void run(IAction action) 
-  {
-    PersistentActionDialogsContext context = PersistentActionDialogsContext.getInstance();
-    String                         id      = getId();
-    
-	if( context.showDialog(id) )
-	{
-	  // Launch the wizard.
-	  init( PlatformUI.getWorkbench(), getSelection() );  
-	    
-	  WizardDialog dialog= new WizardDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), this);
-	  dialog.setPageSize( 400, 500 );
-	  dialog.create();
-    
-    if( startPage_ != null )
-    {
-	    dialog.open();
-    }
-	}
-	else
-	{
-	  final ProgressMonitorDialog monitor = new ProgressMonitorDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell());
-	  
-	  try
-	  {
-	    monitor.run( false, false, new IRunnableWithProgress()
-	                               {
-	                                 public void run( IProgressMonitor progressMonitor )
-	                                 {
-	                             	     runHeadLess( getSelection(), monitor );
-	                                 }
-	                               } );
-	  }
-	  catch( InterruptedException exc )
-	  { 
-	  }
-	  catch( InvocationTargetException exc )
-	  {
-	  }
-	}
-  }
-  
-  /**
-   * Runs only the Commands associated with the dynamic wizard.
-   * 
-   * @param selection the initial selection from the user.
-   * @param context the context that this execution should take place in.  This
-   *                is usually a progress context so that the user can get feedback
-   *                on how execution is progressing.  The context may be null.
-   */
-  public void runHeadLess( IStructuredSelection selection, IRunnableContext context )
-  {
-	PersistentResourceContext  resourceContext = PersistentResourceContext.getInstance();
-	EclipseStatusHandler       handler         = new EclipseStatusHandler();
-	EclipseEnvironment         environment     = new EclipseEnvironment( null, resourceContext, handler );
-	    
-	DataMappingRegistryImpl    dataRegistry_   = new DataMappingRegistryImpl();	    
-	DataFlowManager            dataManager     = new DataFlowManager( dataRegistry_, environment );
-	SimpleCommandEngineManager manager         = new SimpleCommandEngineManager(environment, dataManager );
-	
-    try
-    {
-      commandWidgetBinding_ = (CommandWidgetBinding)wizardElement_.createExecutableExtension( "class" );
-    }
-    catch( CoreException exc )
-    {
-      exc.printStackTrace();
-    }
-	  
-	commandWidgetBinding_.registerDataMappings( dataRegistry_ );
-	
-	CommandFragment rootFragment = getRootFragment( selection, null );
-	
-	manager.setRootFragment( rootFragment );
-	manager.runForwardToNextStop( context );
-  }
-  
-  /**
-   * @see IActionDelegate#selectionChanged
-   */
-  public void selectionChanged(IAction action, ISelection selection) 
-  {
-      selection_ = selection;
-  }
-  
-  private IStructuredSelection getSelection()
-  {
-    IStructuredSelection result = new StructuredSelection();
-    
-	if( selection_ != null) 
-	{	
-	  if( selection_ instanceof IStructuredSelection ) 
-	  {
-	    result = (IStructuredSelection)selection_;
-	  }
-	}
-	else 
-	{
-	  IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-	  
-	  if( window != null ) 
-	  {
-		ISelection selection = window.getSelectionService().getSelection();
-		
-		if( selection instanceof IStructuredSelection ) 
-		{
-		  result = (IStructuredSelection)selection;
-		}
-	  }
-	}
-	
-	return result;
-  }  
-}
diff --git a/bundles/org.eclipse.wst.command.env/.classpath b/bundles/org.eclipse.wst.command.env/.classpath
deleted file mode 100644
index 70d4ebca6..000000000
--- a/bundles/org.eclipse.wst.command.env/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="ant-src"/>
-	<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 7be5ad242..000000000
--- a/bundles/org.eclipse.wst.command.env/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-bin
-build.xml
-runtime
-temp.folder
-env.jar
-@dot
-src.zip
-envsrc.zip
diff --git a/bundles/org.eclipse.wst.command.env/.externalToolBuilders/build-anttasks.launch b/bundles/org.eclipse.wst.command.env/.externalToolBuilders/build-anttasks.launch
deleted file mode 100644
index e4b79adab..000000000
--- a/bundles/org.eclipse.wst.command.env/.externalToolBuilders/build-anttasks.launch
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/>
-<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.wst.command.env/build-anttasks.xml}"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-</launchConfiguration>
diff --git a/bundles/org.eclipse.wst.command.env/.project b/bundles/org.eclipse.wst.command.env/.project
deleted file mode 100644
index 31281d9e6..000000000
--- a/bundles/org.eclipse.wst.command.env/.project
+++ /dev/null
@@ -1,38 +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>
-		<buildCommand>
-			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
-			<triggers>full,incremental,</triggers>
-			<arguments>
-				<dictionary>
-					<key>LaunchConfigHandle</key>
-					<value>&lt;project&gt;/.externalToolBuilders/build-anttasks.launch</value>
-				</dictionary>
-			</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/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.wst.command.env/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 216c1c113..000000000
--- a/bundles/org.eclipse.wst.command.env/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,57 +0,0 @@
-#Mon Jan 30 10:37:15 EST 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/bundles/org.eclipse.wst.command.env/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.wst.command.env/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index d6f09abab..000000000
--- a/bundles/org.eclipse.wst.command.env/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Jan 31 00:16:54 EST 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/bundles/org.eclipse.wst.command.env/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.wst.command.env/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 00faa094e..000000000
--- a/bundles/org.eclipse.wst.command.env/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Jan 30 10:40:38 EST 2006
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.wst.command.env/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.command.env/META-INF/MANIFEST.MF
deleted file mode 100644
index 5586e0807..000000000
--- a/bundles/org.eclipse.wst.command.env/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,26 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ClassPath: env.jar
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.wst.command.env; singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.wst.command.internal.env.plugin.EnvPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.command.internal.env.ant,
- org.eclipse.wst.command.internal.env,
- org.eclipse.wst.command.internal.env.commandline,
- org.eclipse.wst.command.internal.env.common,
- org.eclipse.wst.command.internal.env.context,
- org.eclipse.wst.command.internal.env.eclipse,
- org.eclipse.wst.command.internal.env.plugin,
- org.eclipse.wst.command.internal.env.preferences
-Require-Bundle: org.eclipse.wst.command.env.core,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.wst.common.frameworks,
- org.eclipse.core.commands,
- org.eclipse.wst.common.environment,
- org.apache.ant,
- org.eclipse.ant.core
-Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.wst.command.env/about.html b/bundles/org.eclipse.wst.command.env/about.html
deleted file mode 100644
index 6f6b96c4c..000000000
--- a/bundles/org.eclipse.wst.command.env/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.command.env/ant-lib/.cvsignore b/bundles/org.eclipse.wst.command.env/ant-lib/.cvsignore
deleted file mode 100644
index 60dbc397b..000000000
--- a/bundles/org.eclipse.wst.command.env/ant-lib/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-anttasks.jar
-anttaskssrc.zip
diff --git a/bundles/org.eclipse.wst.command.env/ant-src/ws/ant/task/WebServiceGenerationAntTask.java b/bundles/org.eclipse.wst.command.env/ant-src/ws/ant/task/WebServiceGenerationAntTask.java
deleted file mode 100644
index d4f3b7dd3..000000000
--- a/bundles/org.eclipse.wst.command.env/ant-src/ws/ant/task/WebServiceGenerationAntTask.java
+++ /dev/null
@@ -1,31 +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 ws.ant.task;
-
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Task;
-import org.eclipse.wst.command.internal.env.ant.AntController;
-
-public class WebServiceGenerationAntTask extends Task {
-	
-		public void execute()
-		{			
-			//get properties set in the Ant file
-			Project proj = getProject();
-            if (proj != null)
-            {
-                //call the AntController to kick off generation
-    			new AntController(proj.getProperties());
-            }           		
-		}		
-	}
-
-
diff --git a/bundles/org.eclipse.wst.command.env/ant/axisclient.properties b/bundles/org.eclipse.wst.command.env/ant/axisclient.properties
deleted file mode 100644
index f5ed32b50..000000000
--- a/bundles/org.eclipse.wst.command.env/ant/axisclient.properties
+++ /dev/null
@@ -1,46 +0,0 @@
-!--scenarioType REQUIRED. Differentiates from "service" scenario.  See axisservice.properties.
-scenarioType=client
-
-!--InitialSelection REQUIRED.  Workspace relative URI to the input WSDL or Java.
-InitialSelection=/dynamicWebProjectName/WebContent/wsdl/myService.wsdl
-
-!--Utility property values - use these to list values for the following properties:
-!-- Client.RuntimeId, Client.ServerId 
-ListRuntimes=true
-ListServers=true
- 
-!--type:String - ID of web service runtime 
-Client.RuntimeId=org.eclipse.jst.ws.axis.creation.axisWebServiceRT
-!--type:String - ID of target server 
-Client.ServerId=org.eclipse.jst.server.tomcat.50
-
-!--type:String - name of Client project - this property can be used to give the client project a 
-!-- different name than the project containing the initial selection
-ClientProjectName=clientProjectName
-!--type:String - name of Client EAR project - set only if applicable for selected server type
-ClientEarProjectName=clientEARProjectName
-!--type:String - type of Client project - must be one of: jst.web, jst.java
-!-- only jst.web is valid for Axis
-ClientComponentType=jst.web
-
-!-- CustomizeClientMappings - set to true to supply package-namespace mappings type: boolean
-CustomizeClientMappings=false  
-    
-!-- type:String 
-!-- Workspace relative URI to property file containing mappings
-!-- Mappings are used to override the default package names of the generated Java classes.
-!-- Need not be set if CustomizeClientMappings is false  
-!-- The content of the properties file must be of the format package = namespace.
-Mappings=/testProj/mappings/mappings.txt
-
-!--OverwriteFilesEnabled - set to true to overwrite files that already exist. type:boolean 
-!-- note for non-interactive mode it is recommended that this be set to true
-OverwriteFilesEnabled=true
-
-!--CreateFoldersEnabled - set to true create folders necessary during file generation type:boolean
-!-- note for non-interactive mode it is recommended that this be set to true
-CreateFoldersEnabled=true
-
-!--CheckoutFilesEnabled - set to true to check out files with no warning to the user type:boolean
-!-- note for non-interactive mode it is recommended that this be set to true
-CheckoutFilesEnabled=true
diff --git a/bundles/org.eclipse.wst.command.env/ant/axisservice.properties b/bundles/org.eclipse.wst.command.env/ant/axisservice.properties
deleted file mode 100644
index e094a0ada..000000000
--- a/bundles/org.eclipse.wst.command.env/ant/axisservice.properties
+++ /dev/null
@@ -1,50 +0,0 @@
-!-- REQUIRED. Differentiates from "client" scenario.  See axisclient.properties.
-scenarioType=service
-
-!-- REQUIRED.  Workspace relative URI to the input WSDL or Java
-InitialSelection=/dynamicWebProjectName/WebContent/myService.wsdl
-
-!--Utility property values - use these to list valid values for the following properties:
-!-- Service.RuntimeId, Service.ServerId 
-ListRuntimes=true
-ListServers=true
-
-!--  type:String  - ID of web service runtime 
-Service.RuntimeId=org.eclipse.jst.ws.axis.creation.axisWebServiceRT
-!--type:String -  ID of target server 
-Service.ServerId=org.eclipse.jst.server.tomcat.50
-
-!--ServiceProjectName - !--type:String - name of Service project - this property can be used to give the service project a different name than the project containing the initial selection.  type: String    
-ServiceProjectName=serviceProjectName
-!--ServiceProjectName - !--type:String - name of Service project - this property can be used to give the service project a different name than the project containing the initial selection.  type: String
-ServiceEarProjectName=serviceEarProjectName
-
-!-- AXIS SERVICE ----
-!-- All scenarios. String: workspace relative URI to property file containing mappings
-!-- Top Down: Mappings are used to override the default package names of the generated Java template classes.
-!-- The content of the properties file must be of the format namespace=package  
-!-- Bottom Up: Mappings are used to override the default namespace names in the generated WSDL.
-!-- The content of the properties file must be of the format package = namespace 
-Mappings=/testProj/mappings/mappings.txt
-
-!-- Top down - String: the workspace relative URI for a Java source folder for the generated Java code - must be existing workspace source folder
-JavaOutput=/projectName/JavaSource
-
-!-- Bottom up - space delimited string of method signatures (i.e. method1(parmType1) method2(parmType2)) to be exposed in output WSDL.  If no list is provided, all methods are exposed.
-Methods=
-!-- Bottom up - String: one of: RPC, DOCUMENT, WRAPPED
-Style=DOCUMENT
-!-- Bottom up - String: one of: LITERAL, ENCODED 
-Use=LITERAL
-
-!--OverwriteFilesEnabled - set to true to overwrite files that already exist. type:boolean 
-!-- note for non-interactive mode it is recommended that this be set to true
-OverwriteFilesEnabled=true
-
-!--CreateFoldersEnabled - set to true create folders necessary during file generation type:boolean
-!-- note for non-interactive mode it is recommended that this be set to true
-CreateFoldersEnabled=true
-
-!--CheckoutFilesEnabled - set to true to check out files with no warning to the user type:boolean
-!-- note for non-interactive mode it is recommended that this be set to true
-CheckoutFilesEnabled=true
diff --git a/bundles/org.eclipse.wst.command.env/ant/wsant.bat b/bundles/org.eclipse.wst.command.env/ant/wsant.bat
deleted file mode 100644
index a1f0bf5d0..000000000
--- a/bundles/org.eclipse.wst.command.env/ant/wsant.bat
+++ /dev/null
@@ -1,28 +0,0 @@
-echo off
-setlocal
-
-REM *********** Local envars ***************************
-
-REM The JRE java.exe to be used
-set JAVAEXE="C:\j2sdk1.4.2_07\jre\bin\java.exe"
-
-REM The Eclipse startup.jar - target workspace/wtp workspace
-set STARTUPJAR="D:\wtp0929\eclipse\startup.jar"
-
-REM The location of your workspace
-set WORKSPACE=D:\workspaces\ant_task
-
-REM ****************************************************
-
-if not exist %JAVAEXE% echo ERROR: incorrect java.exe=%JAVAEXE%, edit this file and correct the JAVAEXE envar
-if not exist %JAVAEXE% goto done
-
-if not exist %STARTUPJAR% echo ERROR: incorrect startup.jar=%STARTUPJAR%, edit this file and correct the STARTUPJAR envar
-if not exist %STARTUPJAR% goto done
-
-:run
-@echo on
-%JAVAEXE% -cp %STARTUPJAR% org.eclipse.core.launcher.Main -noupdate -application org.eclipse.ant.core.antRunner -data %WORKSPACE% -file wsgen.xml %* >wsgen.txt 2>&1
-
-:done
-pause
diff --git a/bundles/org.eclipse.wst.command.env/ant/wsant.sh b/bundles/org.eclipse.wst.command.env/ant/wsant.sh
deleted file mode 100644
index b2efc1643..000000000
--- a/bundles/org.eclipse.wst.command.env/ant/wsant.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-set +v
-
-#Script to run WebService Ant tasks in headless Eclipse mode
-
-echo "Setting environment variables"
-
-# The JRE java.exe to be used
-JAVAEXE=/home/tester/sunjdk/j2sdk1.4.2_06/bin/java
-                                                                                
-# The Eclipse startup.jar - the wtp workspace to launch headless
-STARTUPJAR=/opt/wtp_install/wtp_1116/eclipse/startup.jar
-
-# The location of your workspace
-WORKSPACE=/home/tester/workspace_1116b
-
-run() {
-  set -v
-  $JAVAEXE -cp $STARTUPJAR org.eclipse.core.launcher.Main -noupdate -application org.eclipse.ant.core.antRunner -data $WORKSPACE -file wsgen.xml $ls > wsgen.txt 2>&1
-}
-
-if [ ! -e $JAVAEXE ]; then 
-  echo "ERROR: incorrect java.exe=$JAVAEXE, edit the script and correct the JAVAEXE environment variable";
-  exit 1;
-fi
-                                                                           
-if [ ! -e $STARTUPJAR ]; then
-echo "ERROR: incorrect startup.jar=$STARTUPJAR, edit the script and correct the STARTUPJAR environment variable";
-exit 1;
-fi  
-
-run
-exit 0
diff --git a/bundles/org.eclipse.wst.command.env/ant/wsgen.xml b/bundles/org.eclipse.wst.command.env/ant/wsgen.xml
deleted file mode 100644
index 947a6c7b3..000000000
--- a/bundles/org.eclipse.wst.command.env/ant/wsgen.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-
-<project default="main" basedir=".">
-
-<echo message="pulling in property files"/>
-<property file="axisservice.properties"/>
-	
-<echo message="calling the web services generation ant task: wsgen"/>
- <target name="main" >
-  	 <wsgen/>
-  </target>
-  
-</project>
diff --git a/bundles/org.eclipse.wst.command.env/build-anttasks.xml b/bundles/org.eclipse.wst.command.env/build-anttasks.xml
deleted file mode 100644
index 42458bc84..000000000
--- a/bundles/org.eclipse.wst.command.env/build-anttasks.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="Build Ant Environment support JAR" default="build" basedir=".">
-
-	<target name="build" description="Cleans, builds and refreshes" depends="clean, ant-lib/anttasks.jar"/>
-
-	<target name="init" depends="properties">
-		<property name="version.suffix" value="_3.1.0"/>
-		<property name="new.version.suffix" value="_3.2.0"/>
-		<property name="bootclasspath" value=""/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="win32.jar" value="${eclipse.home}/plugins/org.eclipse.swt.win32.win32.x86${version.suffix}.jar"/>
-		<property name="gtk.jar" value="${eclipse.home}/plugins/org.eclipse.swt.gtk.linux.x86${version.suffix}.jar"/>
-		<property name="motif.jar" value="${eclipse.home}/plugins/org.eclipse.swt.motif${version.suffix}.jar"/>
-		<property name="osx.jar" value="${eclipse.home}/plugins/org.eclipse.swt.carbon.macosx.ppc${version.suffix}.jar"/>
-		<available file="${win32.jar}" property="swt.jar" value="${win32.jar}"/>
-		<available file="${gtk.jar}" property="swt.jar" value="${gtk.jar}"/>
-		<available file="${motif.jar}" property="swt.jar" value="${motif.jar}"/>
-		<available file="${osx.jar}" property="swt.jar" value="${osx.jar}"/>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-	</target>
-		
-		<target name="ant-lib/anttasks.jar" description= "Creates the antrunner.jar" depends="init">
-			<property name="destdir" value="${temp.folder}/ant-lib/anttasks.jar"/>
-			<delete dir="${destdir}"/>
-			<mkdir dir="${destdir}"/>
-			<javac destdir="${destdir}" failonerror="true" verbose="false" debug="on" includeJavaRuntime= "yes"
-			 	bootclasspath="${bootclasspath}"
-			 	classpath="${basedir}/bin">
-				<src path="ant-src/"/>
-			</javac>
-			<copy todir="${destdir}">
-				<fileset dir="ant-src/" excludes="**/*.java"/>
-			</copy>
-			<mkdir dir="${build.result.folder}/ant-lib"/>
-			<jar destfile="${build.result.folder}/ant-lib/anttasks.jar" basedir="${destdir}"/>
-			<delete dir="${temp.folder}"/>
-		</target>
-
-		<target name="clean" description="Deletes previous build remnants" depends="init">
-			<delete file="${build.result.folder}/ant-lib/anttasks.jar"/>
-			<delete dir="${temp.folder}"/>
-		</target>
-	</project>
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 915706aa5..000000000
--- a/bundles/org.eclipse.wst.command.env/build.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-bin.includes = plugin.xml,\
-               plugin.properties,\
-               env.jar,\
-               META-INF/,\
-               about.html,\
-               ant/,\
-               ant-lib/anttasks.jar
-source.env.jar = src/
-output.env.jar = bin/
-jars.compile.order = env.jar,\
-                     ant-lib/anttasks.jar
-source.ant-lib/anttasks.jar = ant-src/
-output.ant-lib/anttasks.jar = bin/
-root.permissions.777 = ant/
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 55e7f09e5..000000000
--- a/bundles/org.eclipse.wst.command.env/plugin.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 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
-
-XP_antDataMapping=Ant Environment property mappings
-XP_antScenario=Ant Environment scenarios
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 39622169c..000000000
--- a/bundles/org.eclipse.wst.command.env/plugin.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
-   <!-- The following extension point is internal and likely to change. -->
-   <extension-point
-      id="dynamicWizard"
-      name="%PLUGIN_XP_DYNAMIC_WIZARD"/>
-
-   <!-- The following extension point is internal and likely to change. -->   
-   <extension-point
-      id="actionDialogPreferenceType"
-      name="%PLUGIN_XP_POPUP_DIALOGS"/>
-
-   <extension-point id="antDataMapping" name="%XP_antDataMapping" schema="schema/antdatamapping.exsd"/>
-   <extension-point id="antScenario" name="%XP_antScenario" schema="schema/antScenario.exsd"/>
-     
-   <extension
-         id="wsgen"
-         name="wsgen"
-         point="org.eclipse.ant.core.antTasks">
-      <antTask
-            class="ws.ant.task.WebServiceGenerationAntTask"
-            eclipseRuntime="true"
-            headless="true"
-            library="ant-lib/anttasks.jar"
-            name="wsgen"/>
-   </extension> 
-     <extension
-           point="org.eclipse.ant.core.extraClasspathEntries">
-        <extraClasspathEntry library="ant-lib/anttasks.jar"/>
-     </extension>     
-
-</plugin>
diff --git a/bundles/org.eclipse.wst.command.env/schema/antScenario.exsd b/bundles/org.eclipse.wst.command.env/schema/antScenario.exsd
deleted file mode 100644
index caaff5289..000000000
--- a/bundles/org.eclipse.wst.command.env/schema/antScenario.exsd
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.command.env">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.wst.command.env" id="antScenario" name="Ant Environment Scenarios"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="antScenario"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified identifier of the target extension point
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  an optional identifier of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  an optional name of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="antScenario">
-      <complexType>
-         <attribute name="scenarioType" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         &lt;b&gt;This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.&lt;/b&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;
-All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
-this distribution, and is available at &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.wst.command.env/schema/antdatamapping.exsd b/bundles/org.eclipse.wst.command.env/schema/antdatamapping.exsd
deleted file mode 100644
index 95d9cad21..000000000
--- a/bundles/org.eclipse.wst.command.env/schema/antdatamapping.exsd
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.command.env">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.wst.command.env" id="antDataMapping" name="Ant Environment Property Mappings"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="map"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified identifier of the target extension point
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  an optional identifier of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  an optional name of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="map">
-      <complexType>
-         <attribute name="key" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="operation" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="property" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="transform" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         &lt;b&gt;This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.&lt;/b&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;
-All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
-this distribution, and is available at &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/Environment.properties b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/Environment.properties
deleted file mode 100644
index adfb459a4..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/Environment.properties
+++ /dev/null
@@ -1,37 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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 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 Cannot overwrite file {1} in folder {0}.
-MSG_ERROR_FILE_CHECKOUT_DISABLED=IWAB0010E Cannot 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 Cannot 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_UNEXPECTED_ERROR=IWAB0014E Unexpected exception occured.
-MSG_ERR_ANT_DATA_TRANSFORM=Exception transforming Ant property key {0} using transformation {1}.
-MSG_ERR_ANT_CALL_SETTER=Exception invoking setter method {0} for Ant property.
-MSG_ERR_ANT_CMD_FRAGMENT=Exception retrieving Ant command fragment from registry.
-MSG_ERR_ANT_SCENARIO_TYPE=Cannot determine scenario type.  Please ensure scenarioType Ant property is set.
-
-LABEL_YES=Yes
-LABEL_YES_TO_ALL=Yes All
-LABEL_CANCEL=Cancel
-
-
-
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/EnvironmentMessages.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/EnvironmentMessages.java
deleted file mode 100644
index 7025e31df..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/EnvironmentMessages.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class EnvironmentMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.wst.command.internal.env.Environment";//$NON-NLS-1$
-
-	private EnvironmentMessages() {
-		// Do not instantiate
-	}
-
-	public static String MSG_ERROR_PATH_NOT_ABSOLUTE;
-	public static String MSG_ERROR_PATH_EMPTY;
-	public static String MSG_ERROR_PATH_NOT_FOLDER;
-	public static String MSG_ERROR_FOLDER_CREATION_DISABLED;
-	public static String MSG_ERROR_RESOURCE_NOT_FOLDER;
-	public static String MSG_WARN_FILE_OVERWRITE_DISABLED;
-	public static String MSG_ERROR_FILE_CHECKOUT_DISABLED;
-	public static String MSG_ERROR_RESOURCE_NOT_FILE;
-	public static String MSG_ERROR_FOLDER_HAS_CHILDREN;
-	public static String MSG_ERROR_IO;
-	public static String MSG_ERROR_FILE_OVERWRITE_DISABLED;
-	public static String MSG_ERROR_UNEXPECTED_ERROR;
-	public static String MSG_ERR_ANT_DATA_TRANSFORM;
-	public static String MSG_ERR_ANT_CALL_SETTER;
-	public static String MSG_ERR_ANT_CMD_FRAGMENT;
-	public static String MSG_ERR_ANT_SCENARIO_TYPE;
-	public static String LABEL_YES;
-	public static String LABEL_YES_TO_ALL;
-	public static String LABEL_CANCEL;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, EnvironmentMessages.class);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/ant/AntController.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/ant/AntController.java
deleted file mode 100644
index 4080a0fd9..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/ant/AntController.java
+++ /dev/null
@@ -1,156 +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.ant;
-
-import java.util.Hashtable;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.command.internal.env.EnvironmentMessages;
-import org.eclipse.wst.command.internal.env.context.PersistentResourceContext;
-import org.eclipse.wst.command.internal.env.core.CommandManager;
-import org.eclipse.wst.command.internal.env.core.data.DataFlowManager;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistryImpl;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.FragmentListener;
-
-/**
- * 
- * Central point of control for web service Ant tasks.
- * Constructs Ant environment, root fragment and command manager.  Starts execution of the command stack.
- * 
- * @author joan
- *
- */
-
-public class AntController {
-	
-	
-   private AntOperationManager operationManager_;
-	
-   public AntController(Hashtable properties)
-   {
-	   // construct the environment - passing in the property table	   
-	   // --maintains link to property table plus any other environment properties
-	   // --code to access extension point mappings for operations to retrieve data from property table
-	   PersistentResourceContext  resourceContext = PersistentResourceContext.getInstance();
-	   AntStatusHandler handler         = new AntStatusHandler();
-	   AntEnvironment environment = new AntEnvironment(this, resourceContext, handler, properties);
-       
-	   // construct data manager for maintaining state across operations
-	   DataFlowManager dataManager = new DataFlowManager( new DataMappingRegistryImpl(), environment);
-       
-	   //  set up operation fragments - conditional on options by user... service or client
-	   //  also need to initialize the "selection" or input file (WSDL, Java) here
-	   
-	   CommandFragment rootFragment =  environment.getRootCommandFragment();
-	   
-	   if (rootFragment != null)
-	   {		   
-	       //construct the engine - manages execution of operations
-		   createOperationManager(rootFragment, dataManager, environment);
-		   
-		   DataMappingRegistryImpl    dataRegistry_   = new DataMappingRegistryImpl();
-		   rootFragment.registerDataMappings(dataRegistry_);		   
-	   }
-	   else  //problem getting the root fragment - scenario type is likely missing
-	   {
-		   handler.reportError(new Status(IStatus.ERROR, "ws_ant", 9999, EnvironmentMessages.MSG_ERR_ANT_SCENARIO_TYPE, null));
-		   return;
-	   }
-	      
-	   //ready to start running operations
- 	   ((AntOperationManager)getOperationManager()).moveForwardToNextStop(new NullProgressMonitor());
-   }
-   
-   private void createOperationManager(CommandFragment frag, DataFlowManager mgr, AntEnvironment env)
-   {		   
-		   operationManager_ = new AntOperationManager(frag, mgr, env);			
-	
-		   operationManager_.setPeekFragmentListener( 
-				      new FragmentListener()
-				      {
-				        public  boolean notify( CommandFragment fragment )
-				        {
-				          return peekFragment( fragment );
-				        }
-				      } );  
-				                  
-		   operationManager_.setNextFragmentListener( 
-				      new FragmentListener()
-				      {
-				        public  boolean notify( CommandFragment fragment )
-				        {
-				          return nextFragment( fragment );
-				        }
-				      } );  
-				                                                             
-		   operationManager_.setUndoFragmentListener(
-				      new FragmentListener()
-				      {
-				        public boolean notify( CommandFragment fragment )
-				        {
-				          return undoFragment( fragment );
-				        }
-				      } );
-   }
-	
-	protected CommandManager getOperationManager()
-	{
-		return operationManager_;
-	}
-	
-	/**
-	   * 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 )
-	  {     
-	    return true;
-	  }
-	  
-	  /**
-	   * 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;
-	  }
-	   
-
-	
-	
-   
-   }
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/ant/AntEnvironment.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/ant/AntEnvironment.java
deleted file mode 100644
index d65dbc99f..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/ant/AntEnvironment.java
+++ /dev/null
@@ -1,516 +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.ant;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.command.internal.env.EnvironmentMessages;
-import org.eclipse.wst.command.internal.env.core.CommandManager;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.env.core.data.BeanModifier;
-import org.eclipse.wst.command.internal.env.core.data.ClassEntry;
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.eclipse.EclipseEnvironment;
-import org.eclipse.wst.common.environment.ILog;
-import org.eclipse.wst.common.environment.IStatusHandler;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
- * 
- * Access to status handler, log, resource context and command manager.  
- * Initializes data for commands from Ant property files based on antDataMapping extensions. 
- * 
- * @author joan
- *
- */
-
-public class AntEnvironment extends EclipseEnvironment{
-	
-	private Hashtable antProperties_;
-	private Hashtable operationDataRecord_ = new Hashtable();
-	private boolean mappingComplete_;
-	private ClassEntry classEntry;	
-	
-	// extensionPoint names and namespace
-	private static String MAPPER_EXT_PT = "antDataMapping";  //$NON-NLS-1$
-	private static String SCENARIO_EXT_PT = "antScenario";  //$NON-NLS-1$
-	private static String EXT_PT_NAMESPACE = "org.eclipse.wst.command.env"; ////$NON-NLS-1$
-	
-	// antDataMapping extension point attributes
-	private static final String MAPPER_OPERATION_ATTRIBUTE= "operation"; //$NON-NLS-1$
-	private static final String MAPPER_KEY_ATTRIBUTE= "key"; //$NON-NLS-1$
-	private static final String MAPPER_PROPERTY_ATTRIBUTE= "property"; //$NON-NLS-1$
-	private static final String MAPPER_TRANSFORM_ATTRIBUTE= "transform"; //$NON-NLS-1$
-	
-	// antScenario extension point attributes
-	private static final String SCENARIO_TYPE_ATTRIBUTE = "scenarioType"; //$NON-NLS-1$
-	private static final String SCENARIO_CLASS_ATTRIBUTE = "class"; //$NON-NLS-1$
-
-    private AntController controller_;
-	
-	public AntEnvironment(AntController controller, ResourceContext context, IStatusHandler handler, Hashtable properties)
-	{
-	   super(controller.getOperationManager(), context, handler);
-	   antProperties_ = properties;	
-	   controller_ = controller;	   
-	}
-	
-	// returns String since the property table built by Ant is property value pairs where the value is a String
-	private String getProperty(String key)
-	{
-		Object property = antProperties_.get(key);
-		if (property != null)
-			return property.toString().trim();
-		return null;
-	}
-	
-	// call from engine prior to executing the operation 
-	public IStatus initOperationData(AbstractDataModelOperation op)
-	{
-		//check to see if data has already been primed for this operation 
-		String qualifiedClassName = op.getClass().getName();
-		if (operationDataRecord_.get(qualifiedClassName) == null)
-		{
-			classEntry = new ClassEntry();
-			
-			try {
-				//extension lookup for the bean - may be more than one property for it
-				Enumeration operationData = getMappingExtensions(op);					
-				classEntry.setterList_= getSetterList(op);		
-				while (operationData.hasMoreElements())
-				{				
-					PropertyDataHolder mapping = (PropertyDataHolder)operationData.nextElement();
-						
-					    mappingComplete_ = false;
-						String property = mapping.property_;
-						String setterMethodName = createSetterName(property);		
-												
-						int step = 1;
-						while (!mappingComplete_)
-						{							
-						   switch (step) {
-							case 1:
-								mappingComplete_ = transformAndSet(mapping, setterMethodName);								
-								break;								
-							case 2:
-								mappingComplete_ = callSetter(mapping.operation_, mapping.value_, setterMethodName);
-								break;
-								
-							case 3:
-								mappingComplete_ = callPrimitiveSetter(mapping);
-								break;
-							
-							case 4:
-								mappingComplete_ = callSetterConstructor(mapping);
-								break;
-								
-							default:
-								mappingComplete_ = true;
-								break;								
-							}
-						   step++;
-						}					
-				  }				
-                //add operation to the record - no need to initialize again...
-                operationDataRecord_.put(qualifiedClassName, "");
-			}			
-			catch (Exception e)
-			{					                                
-				throw new IllegalArgumentException(e.getMessage());
-			}
-
-		}
-		return Status.OK_STATUS;
-	}
-
-	/**
-	 * Creates setter name based on the property passed in.  If the 
-	 * property has any leading qualifiers they are stripped off.
-	 * The property is capitalized and set is prepended.
-	 * @param property  The name of the property that requires a setter.
-	 * @return
-	 */	
-	private String createSetterName(String property)
-	{		
-		while (property.indexOf(".")>=0)
-		{
-			property=property.substring(property.indexOf(".")+1);
-		}		 
-		 String firstChar = property.substring(0,1);
-		 firstChar = firstChar.toUpperCase();
-		 property = firstChar + property.substring(1);  
-		 String setterName = "set" + property;		 
-		 return setterName;		 
-	}	
-	
-	   /**
-	    * Retrieves extensions for the org.eclipse.wst.command.env antDataMapping
-	    * extension point.  Extracts those that with class attribute values that match operationName.
-	    * All mappings are converted to PropertyDataHolder objects.
-	    * Any m:1 Ant key to property mappings are collected into a key-value map within
-	    * a single PropertyDataHolder.  
-	    * @param operationName The name of the operation that is being initialized.
-	    * @return A collection of PropertyDataHolder objects. Returns null if there are no extensions matching the operationName.
-	    */
-	   private Enumeration getMappingExtensions(AbstractDataModelOperation operation) throws CoreException
-	   {	   		   
-		   String operationName = operation.getClass().getName();
-		   //go to ext registry and get all antMapping extensions
-		   IExtensionRegistry reg = Platform.getExtensionRegistry();
-		   IExtensionPoint extPt = reg.getExtensionPoint(EXT_PT_NAMESPACE, MAPPER_EXT_PT);
-		   Hashtable dataTable = new Hashtable(25);
-		   
-		   IConfigurationElement[] elements = extPt.getConfigurationElements();
-		   
-		   for (int i = 0; i < elements.length; i++) {
-			
-			 IConfigurationElement ce = elements[i];
-			 Object obj = ce.getAttribute(MAPPER_OPERATION_ATTRIBUTE);
-			 // look for mappings for this operation
-			 if (obj.equals(operationName))
-			 {				 
-				 String key = ce.getAttribute(MAPPER_KEY_ATTRIBUTE);
-				 String value = getProperty(key);
-				 
-				 //check to see if the property for this extension is already in the data table
-				 // if so, there is a m:1 mapping
-				 if (value != null)  //only do a mapping if there is an Ant property value passed in...
-				 {
-				
-					 String property = ce.getAttribute(MAPPER_PROPERTY_ATTRIBUTE);
-					 Object transform = null;
-					 try
-					 {
-						 transform = ce.createExecutableExtension(MAPPER_TRANSFORM_ATTRIBUTE);	 
-					 }
-					 catch (CoreException cex) {
-					   Status errorStatus = new Status(Status.ERROR, "ws_ant", 5092, cex.getMessage(), cex);
-					   getStatusHandler().reportError(errorStatus);
-					   getLog().log(ILog.ERROR, "ws_ant", 5092, this, "getMappingExtensions", EnvironmentMessages.bind(EnvironmentMessages.MSG_ERR_ANT_DATA_TRANSFORM, key, transform));
-					   throw new CoreException(errorStatus);
-					 }
-					 
-					 if (transform != null && transform instanceof BeanModifier/*dataTable.containsKey(property)*/)
-					 {
-						 //get the PropertyDataHolder from the table
-						 PropertyDataHolder holder = (PropertyDataHolder)dataTable.get(property);
-						 if (holder == null)
-						 {
-							 holder = new PropertyDataHolder();
-							 holder.key_ = "";
-							 holder.value_ = "";	
-							 holder.transform_ = transform;
-							 holder.operation_ = operation;
-							 holder.property_ = property;
-							 holder.map_ = new HashMap();
-							 holder.map_.put(key, value);
-							 dataTable.put(property, holder);
-						 }						 
-						 else
-						 {						
-							holder.map_.put(key, value);
-						 }					
-					 }
-					 else  //plain property mapping not a bean
-					 {
-						 PropertyDataHolder holder = new PropertyDataHolder();
-						 holder.operation_ = operation;
-						 holder.key_ = key;
-						 holder.property_ = property;
-						 holder.transform_ = transform;
-						 holder.value_ = value;
-						 dataTable.put(property, holder);
-					 }			 
-				 }			 
-		      }    	 
-		  }
-		   return dataTable.elements();
-		}     
-	   
-	   private boolean transformAndSet(PropertyDataHolder mapping, String setterMethodName)
-	   {
-			Object transform = mapping.transform_;
-			if (transform != null)
-			{
-				// get transform class & create setter parameters		
-				try
-				{
-					//Object classObject = Class.forName(transform).newInstance();
-					Object param = new Object();
-					if (transform instanceof Transformer)
-					{
-						Transformer transformer = (Transformer)transform;						
-						// transform the property value
-						param = transformer.transform(mapping.value_);						
-					}
-					else if (mapping.map_ != null && transform instanceof BeanModifier)
-					{
-						  BeanModifier modifier = (BeanModifier)transform;		
-                          Method getter = getGetterMethod(mapping);
-						  param = getter.invoke(mapping.operation_, new Object[]{});						  
-						  modifier.modify(param, mapping.map_);
-					}												
-					return callSetter(mapping.operation_, param, setterMethodName);
-					
-				}
-				catch (Exception exc)
-				{
-					getStatusHandler().reportError(new Status(Status.ERROR, "ws_ant", 5093, exc.getMessage(), exc));
-                    getLog().log(ILog.ERROR, "ws_ant", 5093, this, "transformAndSet", EnvironmentMessages.bind(EnvironmentMessages.MSG_ERR_ANT_DATA_TRANSFORM, mapping.key_, mapping.transform_));
-                    throw new IllegalArgumentException(exc.getMessage());
-				}				
-			}
-			return false;
-	   }	   
-	   
-	   private Vector getSetterList(Object op)
-	   {
-		   Vector result = new Vector();
-           Method[] methods = op.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 Method getGetterMethod(PropertyDataHolder mapping)
-	   {
-	       Method getterFound = null;     
-
-	       if (classEntry.getterList_ == null)
-	       {
-	    	   classEntry.getterList_ = getGetterList(mapping.operation_);  
-	       }
-	       
-	       for( int index = 0; index < classEntry.getterList_.size(); index++ )
-	       {
-	         Method getter = (Method)classEntry.getterList_.elementAt( index );
-	         
-	         if( getter.getName().equals( "get" + mapping.property_ ))
-	         {
-	            getterFound = getter;
-	            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 boolean callSetter(AbstractDataModelOperation op, Object param, String setterMethodName) throws CoreException
-	   {
-		   for (Iterator iterator = classEntry.setterList_.iterator(); iterator.hasNext();) 
-		   {
-				Method method = (Method) iterator.next();
-				if (method.getName().equals(setterMethodName))
-				{                                        
-			       Class[] paramTypes = method.getParameterTypes();
-			       if (paramTypes.length == 1 && param != null)
-			       {			  
-			        	 try{			      			
-			     			 method.invoke(op, new Object[]{param});
-			     			 return true;
-			     		 }
-			     		 catch(Exception cex){
-			     			Status errorStatus = new Status(Status.ERROR, "ws_ant", 5094, cex.getMessage(), cex);
-			     			getStatusHandler().reportError(errorStatus);
-			     			getLog().log(ILog.ERROR, "ws_ant", 5094, this, "callSetter", EnvironmentMessages.bind(EnvironmentMessages.MSG_ERR_ANT_CALL_SETTER, setterMethodName));
-			     			throw new CoreException(errorStatus);
-			     		 }
-			       }  
-				}
-			}
-		    return false;
-	   }
-	   
-	
-	   // look for setter with primitive type parameter - if find one, convert String propertyValue and call it
-	   private boolean callPrimitiveSetter(PropertyDataHolder mapping) throws CoreException
-	   {			
-			for (Iterator iterator = classEntry.setterList_.iterator(); iterator.hasNext();) {
-				Method element = (Method) iterator.next();
-				Class[] parmTypes = element.getParameterTypes();
-				if (parmTypes.length==1 && parmTypes[0].isPrimitive())
-				{										
-					Class parmType = parmTypes[0].getClass();
-					Object setterParm = null;
-					if (parmType.equals(Integer.class))
-					{
-						setterParm = Integer.valueOf(mapping.value_);
-					}
-					else if (parmType.equals(Boolean.class))
-					{
-						setterParm = Boolean.valueOf(mapping.value_);
-					}
-					else if (parmType.equals(Character.class) && mapping.value_.length() == 1)
-					{
-						setterParm = new Character(mapping.value_.charAt(0));  
-					}
-					else if (parmType.equals(Byte.class))
-					{
-						setterParm = Byte.valueOf(mapping.value_);
-					}
-					else if (parmType.equals(Short.class))
-					{
-						setterParm = Short.valueOf(mapping.value_);
-					}
-					else if (parmType.equals(Long.class))
-					{
-						setterParm = Long.valueOf(mapping.value_);
-					}
-					else if (parmType.equals(Float.class))
-					{
-						setterParm = Float.valueOf(mapping.value_);
-					}
-					else if (parmType.equals(Double.class))
-					{
-						setterParm = Double.valueOf(mapping.value_);
-					}
-														
-				    if (setterParm != null)
-				    {	
-				    	try
-				    	{
-				    		element.invoke(mapping.operation_, new Object[]{setterParm});
-					    	return true;	
-				    	}
-				    	catch(Exception e){
-				    		Status errorStatus = new Status(Status.ERROR, "ws_ant", 5095, e.getMessage(), e);
-				    		getStatusHandler().reportError(errorStatus);
-				    		getLog().log(ILog.ERROR, "ws_ant", 5095, this, "callPrimitiveSetter", EnvironmentMessages.bind(EnvironmentMessages.MSG_ERR_ANT_CALL_SETTER, element.getName()));
-				    		throw new CoreException(errorStatus);
-				    	}
-				    }			
-				}
-		    }   
-			return false;
-	   }
-		
-		//check for setter with parameter type that takes a String to construct
-		// construct the parameter using String & call the setter  
-	   private boolean callSetterConstructor(PropertyDataHolder mapping) throws CoreException
-	   {	
-			for (Iterator iterator = classEntry.setterList_.iterator(); iterator.hasNext();) {
-				Method element = (Method) iterator.next();
-				Class[] parmTypes = element.getParameterTypes();
-				Class[] stringParm = new Class[]{String.class};
-				if (parmTypes.length==1)
-				{
-					try
-					{			
-						Constructor ctor = parmTypes.getClass().getConstructor(stringParm);
-						Object parameter = ctor.newInstance(new Object[]{mapping.value_});
-						element.invoke(mapping.operation_, new Object[]{parameter});						
-					}
-					catch (Exception exc)
-					{
-						Status errorStatus = new Status(Status.ERROR, "ws_ant", 5096, exc.getMessage(), exc);
-						getStatusHandler().reportError(errorStatus);
-						getLog().log(ILog.ERROR, "ws_ant", 5096, this, "callSetterConstructor", EnvironmentMessages.bind(EnvironmentMessages.MSG_ERR_ANT_CALL_SETTER, element.getName()));
-						throw new CoreException(errorStatus);
-					}
-				}
-	        }			
-		   return false;
-	   }
-
-	   /**
-	    * Returns an object that helps manage execution/undoing of Commands.
-	    */
-	   public CommandManager getCommandManager (){
-		   return controller_.getOperationManager();
-	   } 
-	   
-	   public CommandFragment getRootCommandFragment() 
-       {
-    	   
-    	   //look up the commandFragment in the scenarioRegistry extension point with an ID corresponding to the scenario property in the propertytable
-    	   String scenarioProperty = (String)getProperty(SCENARIO_TYPE_ATTRIBUTE);
-    	   IExtensionRegistry reg = Platform.getExtensionRegistry();
-		   IExtensionPoint extPt = reg.getExtensionPoint(EXT_PT_NAMESPACE, SCENARIO_EXT_PT);
-		   
-		   IConfigurationElement[] elements = extPt.getConfigurationElements();
-		   
-		   for (int i = 0; i < elements.length; i++) {
-			
-			 IConfigurationElement configElement = elements[i];			 
-			 if (configElement.getAttribute(SCENARIO_TYPE_ATTRIBUTE).equals(scenarioProperty))
-			 {				 
-				 try
-				 {					 
-					Object obj = configElement.createExecutableExtension(SCENARIO_CLASS_ATTRIBUTE);
-		
-					if (obj instanceof org.eclipse.wst.command.internal.env.core.fragment.CommandFragment)
-					{
-						return (org.eclipse.wst.command.internal.env.core.fragment.CommandFragment)obj;
-					}
-				 }
-				 catch (Exception exception)
-				 {
-					 Status errorStatus = new Status(Status.ERROR, "ws_ant", 5097, exception.getMessage(), exception);
-					 getStatusHandler().reportError(errorStatus);
-					 getLog().log(ILog.ERROR, "ws_ant", 5097, this, "getRootCommandFragment", EnvironmentMessages.MSG_ERR_ANT_CMD_FRAGMENT);					 
-				 }				 
-			  }    	   
-           }
-		   return null;
-       }
-  }
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/ant/AntOperationManager.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/ant/AntOperationManager.java
deleted file mode 100644
index 189861203..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/ant/AntOperationManager.java
+++ /dev/null
@@ -1,63 +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.ant;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.command.internal.env.core.data.DataFlowManager;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentEngine;
-import org.eclipse.wst.common.environment.ILog;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
- * Manages the execution of commands in the root fragment passed to the constructor.
- * 
- * @author joan
- *
- */	
-
-public class AntOperationManager extends CommandFragmentEngine
-{	
-	  private AntEnvironment environment_;
-	  
-	  protected IStatus initBeforeExecute( AbstractDataModelOperation operation )
-    {      
-      environment_.getLog().log(ILog.INFO, "ws_ant", 5098, this, "initBeforeExecute", "Initializing data for: " + operation.getClass().getName());
-      IStatus initStatus = Status.OK_STATUS;
-      try
-      {
-    	  initStatus = environment_.initOperationData( operation );  
-      }
-      catch (Exception e)
-      {
-    	 throw new IllegalArgumentException(e.getMessage());  
-      }        
-      return initStatus;
-    }
-
-    /**
-	   * 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 AntOperationManager( CommandFragment startFragment, DataFlowManager dataManager, AntEnvironment environment )
-	  {
-      super( startFragment, dataManager, environment );
-      
-	  	environment_ = environment;
-	  } 
-}
-
-
-
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/ant/AntStatusHandler.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/ant/AntStatusHandler.java
deleted file mode 100644
index aa4c6c884..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/ant/AntStatusHandler.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.wst.command.internal.env.ant;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.wst.common.environment.Choice;
-import org.eclipse.wst.common.environment.IStatusHandler;
-import org.eclipse.wst.common.environment.StatusException;
-
-public class AntStatusHandler implements IStatusHandler {
-
-	public Choice report(IStatus status, Choice[] choices) {
-		// TODO 
-		return null;
-	}
-
-	public void report(IStatus status) throws StatusException {
-		if (status.getSeverity() == IStatus.ERROR)
-			reportError(status);
-		else
-			reportInfo(status);
-
-	}
-
-	public void reportError(IStatus status) {
-		System.err.println(status.getMessage());
-	}
-
-	public void reportInfo(IStatus status) {		
-		System.out.println(status.getMessage());		
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/ant/PropertyDataHolder.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/ant/PropertyDataHolder.java
deleted file mode 100644
index 509ab6bb0..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/ant/PropertyDataHolder.java
+++ /dev/null
@@ -1,33 +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.ant;
-
-/**
- * Simple class to hold data mapping information once retrieved from Ant property file.
- * Map is used for many to one mappings involving mapping of multiple properties to a bean.
- * In this case, the key_ and value_ should be set to an empty string and all key value pairs
- * for properties put into the map instead.  The transformation for this case would be a modifier
- * which will set the properties onto the bean.
- */
- 
-import java.util.Map;
-
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public class PropertyDataHolder {
-	   public AbstractDataModelOperation operation_;
-	   public Object transform_;
-	   public String key_;
-	   public String property_;
-	   public String value_;		
-	   public Map map_;
-}
-
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/ant/String2BooleanTransformer.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/ant/String2BooleanTransformer.java
deleted file mode 100644
index 783e54cac..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/ant/String2BooleanTransformer.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.command.internal.env.ant;
-
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-
-public class String2BooleanTransformer implements Transformer {
-
-	public Object transform(Object value) {
-			String str = (String)value;
-			str = str.toLowerCase();
-			if (str.equals("true"))
-			{
-				return new Boolean(true);
-			}
-			else return new Boolean(false);		
-
-	}
-
-}
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 c35982acf..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/commandline/CommandLine.java
+++ /dev/null
@@ -1,855 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.commandline;
-
-import java.text.MessageFormat;
-import java.util.Arrays;
-import java.util.BitSet;
-import java.util.ResourceBundle;
-import java.util.Vector;
-import org.eclipse.wst.command.internal.env.common.StringUtils;
-
-
-/**
-  * <p>This is a generic command line parsing class.  The programmer need only specify
-  * the characteristics of their command line(ie. positional parameters, flags, etc)
-  * and this class will perform the rest of the parsing work.  As an added bonus this
-  * class will also create formated help text that displays the syntax of this
-  * command line.
-  *
-  * <p>The main parameter to the CommandLine constructor is a two dimensional String
-  * array.  There are 5 columns in this array and as many rows as needed for each
-  * flag or positional parameter.  The five columns are:
-  *
-  * <ol>
-  * <li>The name of the flag(eg. "help" or "a", etc)
-  *     Note: no dash should be in the name here.  The user would specify "-help" on the
-  *           command line though.
-  * <li>The name of the flag parameter(if any)
-  * <li>A string indicating whether this flag can appear more than once on the
-  *     command line.
-  * <li>A string indicating whether this flag must be specified on the command line.
-  * <li>A help text string which describes this particular flag or positional parameter.
-  * </ol>
-  *
-  * <p>Each row in the string array is associate with either a positional parameter
-  * or with a flag.  For example, consider this command line:
-  * <ul>
-  * <li>My_prog required_parm1 -ab parm_for_ab required_parm2 -help optional_parms
-  * </ul>
-  *
-  * <p>In this example My_prog is the name of the program.  required_parm1 and
-  * required_parm2 must be specified on the command line.  Notice that they do not
-  * have to be adjacent to each other on the command line. optional_parms may optionally
-  * specified.  optional_parms can be 0 or more parameters.  They does not need to be
-  * adjacent to the required parameters, but they do need to follow the required
-  * parameters. Two flags are specified "-ab" and "-help".  The "-ab" flag has a
-  * parameter "parm_for_ab" associated with it.  Note: a flag can not have an optional
-  * parameter. (ie. a flag either never have a parameter or it always has a parameter)
-  * In this example, the first two rows in the string array would describe required_parm1
-  * and required_parm2.  The third entry would describe optional_parms.  The fourth and
-  * fifth rows would describe "-ab" and "-help".  For this command line the string array
-  * would look like this:
-  *
-  * <ul>
-  * <li>{ { CommandLine.POSITIONAL, "parm1", CommandLine.NO_DUPS,
-  *       CommandLine.REQUIRED, "parm1 help text" },
-  * <li>{ CommandLine.POSITIONAL, "parm2", CommandLine.NO_DUPS,
-  *       CommandLine.REQUIRED, "parm2 help text" },
-  * <li>{ CommandLine.POSITIONAL, "optional_parms", CommandLine.DUPS_OK,
-  *       CommandLine.REQUIRED, "optional help text" },
-  * <li>{ "ab", "parm_for_ab", CommandLine.NO_DUPS,
-  *       CommandLine.OPTIONAL, "ab help text" },
-  * <li>{ "help", CommandLine.NO_PARM, CommandLine.NO_DUPS,
-  *       CommandLine.OPTIONAL, "displays this help text" } }
-  * </ul>
-  *
-  * <p>String array rules:
-  *
-  * <ol>
-  * <li>Positional rows must always come first in the array.  These rows must
-  *     have a name specified in column 2, except for one case.  If you want to indicate that
-  *     there are no optional positional parameters you would put CommandLine.NO_PARM
-  *     in column 2 of the positional row.  You would also need to put CommandLine.OPTIONAL
-  *     in column 4 since this row is for optional parameters(or the non-existence of
-  *     optional parameters as the case may be)
-  * <li>Once a positional row specifies that it is optional, no further positional rows
-  *     may be specified.
-  * <li>At least one positional row must be specified, even if it is to just to specify that
-  *     there are no optional parameters.
-  * <li>Flag names must be in lower case.  Note: the user can specify upper or lower case
-  *     on the command line.
-  * <li>If a flag has a parameter the name of the parameter should be put into column 2.
-  *     otherwise CommandLine.NO_PARM should be put in column 2.
-  * <li>If a flag is allowed to appear more than once on the command line then
-  *     CommandLine.DUPS_OK should be put into column 3, otherwise CommandLine.NO_DUPS
-  *     should be put into column 3.
-  * <li>If a flag must be specified on the command line then CommandLine.REQUIRED should
-  *     be specified in column 4, otherwise CommandLine.OPTIONAL should be specified.
-  * <li>A help flag must be specified.
-  * <li>The strings specified in the flags column, the parameter name column, and the
-  *     help column are always translated using the resource bundle specified.  Of
-  *     course the special string values such as POSITIONAL and NO_PARM are not
-  *     translated.
-  * </ol>
-  *
-  * <p> Flag matching rules:
-  * <ol>
-  * <li>The parser will attempt to match a user specified flag with the minimum number
-  *     of programmer specified flag characters.  For example, if the programmer has
-  *     specified that the flag is "help" the user could specify "-h", "-he", "-hel", or
-  *     "-help".  If the programmer has also specified a flag called "hello", the
-  *     user would get an error message for specifing either "-h", "-he" or "-hel", since
-  *     it is ambiguous which flag is being refered to.  Both "-hell" and "-hello"
-  *     would be ok for the user to specify the hello flag on the command line.
-  * <li>If a flag has a parameter, the parameter may be immediately adjacent to the flag.
-  *     For example if "abcd" is specified as a flag with a parameter, the user could
-  *     specify the following assuming there are no other ambiguous flags. "-abcdparm",
-  *     "-abcparm", "-abparm", or "-aparm" where parm is the parameter for the flag.
-  *     (Of course the user can always put a white space between the flag and the
-  *     parameter.)
-  * <li>If a flag does not have a parameter and a parameter is adjacent to it then this
-  *     parameter is interpreted as a positional parameter.  For example if "abcb" is
-  *     specified as a flag and the user specifies "-abhello", then the first "ab" will be
-  *     interpreted as the flag and "hello" will be interpreted as a positional
-  *     parameter.
-  * </ol>
-  *
-  * @author Peter Moogk
-  * @date   July 13, 2000
-**/
-
-public class CommandLine
-{
-  // Constant strings that the user should use in their flags_info input array.
-  /**
-    * Specifies that this flag or positional parameter is required.
-  **/
-  public static final String REQUIRED   = "required";
-  /**
-    * Specifies that this flag or positional parameter is optional.
-  **/
-  public static final String OPTIONAL   = "optional";
-  /**
-    * Specifies that this flag may be specified more than once on the command line.
-    * Note: This string has no meaning for positional parameters.
-  **/
-  public static final String DUPS_OK    = "dups_ok";
-  /**
-    * Specifies that this flag may not be specified more than once on the command line.
-    * Note: This string has no meaning for positional parameters.
-  **/
-  public static final String NO_DUPS    = "no_dups";
-  /**
-    * Specifies that a row is a positional parameter row.
-  **/
-  public static final String POSITIONAL = "";
-  /**
-    * Specifies that a flag has no parameter.  For positional parameters this
-    * string indicates that there are no optional parameters.
-  **/
-  public static final String NO_PARM    = "";
-  
-  /**
-    * @param flags_info This parameter specifies the characteristics of the
-    *                   command line parser.  See the class description for a
-    *                   definition of what this string array should look like.
-    * @param help_flag  This string indicates which flag in the flags_info
-    *                   array is the help flag.
-    * @param tool_name  This string indicates the name of the tool that this
-    *                   command line parser is being used for.  This string
-    *                   is only used when creating the help text.
-  **/
-  public CommandLine( String[][]     flags_info,
-                       String         help_flag,
-                       String         tool_name,
-                       ResourceBundle flagMessages )
-                   
-    throws InternalErrorExc
-  {
-    this.flags_info   = flags_info;
-    this.help_flag    = help_flag;
-    this.tool_name    = tool_name;
-    this.flagMessages = flagMessages;
-    
-    messages = ResourceBundle.getBundle( "org.eclipse.wst.command.internal.env.commandline.commandline" );
-    verify_flags_info();
-  }
-
-  /**
-    * Call this method to parse a command line.
-    * @param args This is the string array from the command line.
-    * @throws Flag_error If the user has specified the command line incorrectly
-    *                    a Flag_error exception will be thrown.  Use getMessage
-    *                    to get a description of the user error.
-    *
-    * @throws Help_specified If the user specifies the help flag this exception
-    *                        will be thrown.  Use getMessage to get a fully
-    *                        formatted syntax description of this command line.
-  **/
-  public void check_flags( String[] args ) throws Flag_error
-  {
-    flags_specified = new Vector[flags_info.length];
-
-    for( int index = 0; index < args.length; index++ )
-    {
-      boolean processed_the_next_arg = process_arg( args, index );
-      if( processed_the_next_arg == true ) index++;
-    }
-
-    // If help was specified we will not check the regular rules.
-    if( !flag_specified( help_flag ) )
-    {
-      // Check for flags breaking the rules specified in flags_info.
-      check_rules();
-
-      // Call subclassed method to see if more processing is required.
-      more_processing();
-    }
-  }
-
-  /**
-    * This method is for subclasses of this class.  This method is called at
-    * the very end of check_flags method.  It is intended that subclasses would
-    * perform additional command line checking here.
-  **/
-  protected void more_processing() throws Flag_error, InternalErrorExc
-  {
-  }
-
-  /**
-    * Once the command line has been parsed by calling check_flags a
-    * call can be made to this method to get the parameters for this flag.
-    * If the flag was not specified on the command line null will be returned.
-    * If the flag was specified, but has no parameters a valid vector will be
-    * returned containing a null.
-  **/
-  public String[] get_flag_parms( String flag )
-  {
-    int     row        = 0;
-    boolean flag_found = false;
-
-    while( flag_found == false && row < flags_info.length )
-    {
-      if( flags_info[row][FLAG_COL].equals( flag ) )
-      {
-        flag_found = true;
-      }
-      else
-      {
-        row++;
-      }
-    }
-
-    if( flag_found == true ) 
-    {
-      Vector parms = flags_specified[row];
-      return parms == null ? null : (String[])(parms.toArray( new String[0] ));
-    }
-
-    return null;
-  }
-
-  /**
-    * Call this method to get all of the positional parameters.
-    * This method returns both the required positionals and the
-    * optional positionals in that order.  If no positional parameters
-    * were specified null will be returned.
-  **/
-  public String[] get_positionals()
-  {
-    return (String[])flags_specified[POSITIONAL_ROW].toArray( new String[0] );
-  }
-
-  /**
-    * This method returns true if this flag was specified by the user
-    * otherwise false is returned.
-  **/
-  public boolean flag_specified( String flag )
-  {
-    return get_flag_parms( flag ) != null;
-  }
-
-  /**
-    * This method returns fully formated help text syntax for this
-    * command line.
-  **/
-  public String get_help_text()
-  {
-    StringBuffer help_text  = new StringBuffer(400);
-    int          help_width = HELP_LINE_LEN -
-                              2 -              // blanks
-                              1 -              // dash
-                              max_flag_size -  // flag field
-                              1 -              // blank
-                              max_name_size -  // name field
-                              1;               // blank
-
-    help_text.append( messages.getString( FlagMessages.PARSER_INFO_SYNTAX ) +
-                      ": " + tool_name + " " );
-
-    // Display the required positionals if any.
-    for( int index = 0; index < required_positionals; index++ )
-    {
-      help_text.append( flagMessages.getString( flags_info[index][NAME_COL] ) +
-                        " " );
-    }
-
-    help_text.append( "[" + messages.getString( FlagMessages.PARSER_FLAGS ) +
-                      "] " );
-
-    if( optional_positionals_allowed == true )
-    {
-      help_text.append( flagMessages.getString( flags_info[optional_list_index][NAME_COL] ) );
-    }
-
-    help_text.append( "\n  " + messages.getString( FlagMessages.PARSER_INFO_WHERE ) + "\n" );
-
-    // Create one line of description for each parameter
-    for( int row = 0; row < flags_info.length; row++ )
-    {
-      String columnId   = flags_info[row][NAME_COL];
-      String columnName = columnId == NO_PARM ? "" : flagMessages.getString( columnId );
-
-      String flagId     = flags_info[row][FLAG_COL];
-      String flagName   = flagId == POSITIONAL ? POSITIONAL : flagMessages.getString(flagId);
-
-      int flag_padding = max_flag_size - flagName.length();
-      int name_padding = max_name_size - columnName.length();
-
-      // Skip this row if this is a marker for no optional positionals.
-      if( flags_info[row][FLAG_COL] == POSITIONAL &&
-          flags_info[row][NAME_COL] == NO_PARM ) continue;
-
-      if( flagName == POSITIONAL )
-      {
-        help_text.append( getBlanks(3 ) );
-      }
-      else
-      {
-        help_text.append( "  -" + flagName );
-      }
-
-      help_text.append( getBlanks( flag_padding + 1 ) );
-      help_text.append( columnName );
-      help_text.append( getBlanks( name_padding + 1 ) );
-
-      String   columnHelp = flagMessages.getString( flags_info[row][HELP_COL] );
-      String[] split_help_text
-        = StringUtils.splitter( columnHelp, help_width );
-
-      if( split_help_text.length > 0 )
-        help_text.append( split_help_text[0] + "\n" );
-      else
-        help_text.append( "\n" );
-
-      for( int index = 1; index < split_help_text.length; index++ )
-      {
-        help_text.append( getBlanks( HELP_LINE_LEN - help_width ) );
-        help_text.append( split_help_text[index] + "\n" );
-      }
-      
-      help_text.append( "\n" );
-    }
-
-    return "" + help_text;
-  }
-  
-  /**
-   *  Return a string with the specified number of blanks.
-   */
-  private String getBlanks( int count )
-  {
-  	char[] blanks = new char[count];
-  	Arrays.fill( blanks, 0, count, ' ' );
-  	
-  	return new String( blanks );
-  }
-
-  /**
-    * This class is the base for all command line exception classes.
-  **/
-  static public class ErrorExc extends Exception
-  {
-  	/**
-	 * Comment for <code>serialVersionUID</code>
-	 */
-	private static final long serialVersionUID = 3257567317259793720L;
-
-	public ErrorExc( String message, String[] args )
-  	{
-  	  super( MessageFormat.format( message, args ) );
-  	}
-  }
-
-  /**
-    * This class will be thrown when an internal error is detected.
-    * This usually happens if the flag description information was
-    * specified incorrectly.
-  **/
-  static public class InternalErrorExc extends IllegalArgumentException
-  {  	
-  	/**
-	 * Comment for <code>serialVersionUID</code>
-	 */
-	private static final long serialVersionUID = 3258410621136614450L;
-
-	public InternalErrorExc( String message, String[] args )
-  	{
-  	  super( MessageFormat.format( message, args ) );
-  	}
-  	
-  	public InternalErrorExc( String message )
-  	{
-  	  this( message, (String[])null );
-  	}
-  	
-  	public InternalErrorExc( String message, String arg )
-  	{
-  	  this( message, new String[]{ arg } );
-  	}
-  }
-
-  /**
-    * This class will be thrown if a user error occurs while parsing the command line.
-  **/
-  static public class Flag_error extends ErrorExc
-  {
-    /**
-	 * Comment for <code>serialVersionUID</code>
-	 */
-	private static final long serialVersionUID = 3832621776877663537L;
-
-	public Flag_error( String message, String[] args )
-    {
-      super( message, args );
-    }
-
-    public Flag_error( String message, String arg )
-    {
-      super( message, new String[]{ arg } );
-    }
-
-    public Flag_error( String message )
-    {
-      super( message, null );
-    }
-  }
-
-  /**
-    * Tries to process a single flag on the command line.
-    * @param  args      All the command line parameters.
-    * @param  arg_index This is the index of the argument that is to be processed.
-    * @return returns true if the argument we are processing is a flag that has a
-    *         parameter and the parameter is specified in the next argument.
-  **/
-  private boolean process_arg( String[] args, int arg_index ) throws Flag_error
-  {
-    boolean processed_next_arg = false;
-
-    if( args[arg_index].charAt(0) == '-' )
-    {
-      // This is the start of a flag.
-      int flag_index = 1;
-      int info_index = get_info_index( args[arg_index], flag_index );
-      int max_index  = get_max_index( args[arg_index], flag_index, info_index );
-
-      if( flags_info[info_index][NAME_COL] != NO_PARM )
-      {
-        // This flag takes a parameter so check if it is stuck to this
-        // arg.
-        if( max_index < args[arg_index].length() )
-        {
-          add_flag_parm( info_index,
-                         args[arg_index].substring( max_index,
-                                                    args[arg_index].length() ) );
-        }
-        else
-        {
-          // This flag has a parameter and it wasn't stuck to the flag,
-          // so we will try to get it from the next arg.
-          if( arg_index+1 < args.length &&
-              args[arg_index+1].charAt(0) != '-' )
-          {
-            // We found an parameter in the next string so we will use this
-            // one as a parameter for this flag.  Note: if was no parameter
-            // after the flag at all, the error will be caught in the
-            // check_rules method.
-            add_flag_parm( info_index, args[arg_index+1] );
-            processed_next_arg = true;
-          }
-          else
-          {
-            // Error missing paramater. This error is caught by check_rules.
-            add_flag_parm( info_index, null );
-          }
-        }
-      }
-      else
-      {
-        // The flag does not have a parameter so we will add a null.
-        add_flag_parm( info_index, null );
-
-        // Check to see if a positional parameter is stuck to this flag.
-        if( max_index < args[arg_index].length() )
-        {
-          add_positional( args[arg_index].substring( max_index,
-                                                     args[arg_index].length() ) );
-        }
-      }
-    }
-    else
-    {
-      // This is a positional parameter.
-      add_positional( args[arg_index] );
-    }
-
-    return processed_next_arg;
-  }
-
-  /**
-    * Finds the row for the flag that uniquely matched this flag str.
-    * @return returns the flags_info index of the matching flag.
-  **/
-  private int get_info_index( String flag_str, int start_index )
-    throws Flag_error
-  {
-    //int info_start  = 1;
-    //int info_end    = flags_info.length;
-    int info_index;
-    int found_count = 0;
-    int info_col_index = 0;
-    int last_info_index = 0;
-
-    BitSet flags_rejected = new BitSet();
-
-    // Loop over each char in flag_str.  Note: we will probably bail early.
-    for( int flag_col_index = start_index; flag_col_index < flag_str.length(); flag_col_index++ )
-    {
-      // Loop over each flag in flag_info
-      for( info_index = 0; info_index < flags_info.length; info_index++ )
-      {
-        String flagId   = flags_info[info_index][FLAG_COL];
-        String flagName = flagId == POSITIONAL ? POSITIONAL : flagMessages.getString( flagId );
-
-        if( flags_rejected.get( info_index ) == false &&
-            info_col_index < flagName.length() &&
-              Character.toLowerCase(flag_str.charAt(flag_col_index)) ==
-              flagName.charAt(info_col_index) )
-        {
-          found_count++;
-          last_info_index = info_index;
-        }
-        else
-        {
-          flags_rejected.set( info_index );
-        }
-      }
-
-      if( found_count == 1 )
-      {
-        // We have a match.
-        return last_info_index;
-      }
-      else if( found_count == 0 )
-      {
-        // Flag not found at all.
-        throw new Flag_error( messages.getString( FlagMessages.PARSER_ERROR_FLAG_NOT_FOUND ),
-                              flag_str.substring( start_index ) );
-      }
-      else
-      {
-        // More than one flag was found with this char so we will go to the
-        // next char to uniquely match it.
-        info_col_index++;
-        //info_start = last_info_index - found_count + 1;
-        //info_end   = last_info_index + 1;
-        found_count = 0;
-      }
-    }
-
-    // The only way to get to this code is if the loop exited with
-    // the found_count greater than 1.  Therefore, the flag specified is
-    // ambiguous.
-    throw new Flag_error( messages.getString( FlagMessages.PARSER_ERROR_AMBIGUOUS_FLAG ),
-                          flag_str.substring( start_index) );
-  }
-
-  /**
-    * This method tries to match as many characters as possible of the user
-    * specified flag with the matched flag string.
-    * @return returns the position of the last matching flag chararacter.
-  **/
-  private int get_max_index( String flag_str, int flag_start, int info_index )
-  {
-    int flag_col_index = flag_start;
-    int info_col_index = 0;
-
-    String info_str = flagMessages.getString( flags_info[info_index][FLAG_COL] );
-
-    while( flag_col_index < flag_str.length() &&
-           info_col_index < info_str.length() )
-    {
-      if( Character.toLowerCase( flag_str.charAt(flag_col_index) ) !=
-          info_str.charAt(info_col_index) )
-        break;
-
-      flag_col_index++;
-      info_col_index++;
-    }
-
-    return flag_col_index;
-  }
-
-  /**
-    * Adds a positional parameter to flags_specified.
-  **/
-  private void add_positional( String positional_parm )
-  {
-    if( flags_specified[POSITIONAL_ROW] == null )
-      flags_specified[POSITIONAL_ROW] = new Vector(3);
-
-    flags_specified[POSITIONAL_ROW].add( positional_parm );
-  }
-
-  /**
-    * Adds a flag and its parameter to flags_specified.  If only the
-    * flag was specified, then a null should be passed to flag_parm.
-  **/
-  private void add_flag_parm( int flag_index, String flag_parm )
-    throws Flag_error
-  {
-    if( flags_info[flag_index][DUP_COL] == NO_DUPS &&
-        flags_specified[flag_index] != null )
-      throw new Flag_error( messages.getString( FlagMessages.PARSER_ERROR_DUPLICATE_FLAGS_NOT_ALLOWED ),
-                             flagMessages.getString( flags_info[flag_index][FLAG_COL] ) );
-
-    if( flags_specified[flag_index] == null )
-      flags_specified[flag_index] = new Vector(3);
-
-    flags_specified[flag_index].add( flag_parm );
-  }
-
-  /**
-    * Checks that the user hasn't broken any command line rules.
-  **/
-  private void check_rules() throws Flag_error
-  {
-    // Check that all of the required positionals were specified.
-    int positional_count = 0;
-
-    if( flags_specified[POSITIONAL_ROW] != null )
-    {
-      positional_count = flags_specified[POSITIONAL_ROW].size();
-    }
-
-    if( required_positionals > positional_count )
-      throw new Flag_error( messages.getString( FlagMessages.PARSER_ERROR_MISSING_POSITIONAL ),
-                             flagMessages.getString( flags_info[required_positionals-1][NAME_COL] ) );
-
-    else if( required_positionals < positional_count &&
-             optional_positionals_allowed == false )
-      throw new Flag_error( messages.getString( FlagMessages.PARSER_ERROR_TOO_MANY_POSITIONALS ) );
-
-    for( int row = 0; row < flags_info.length; row++ )
-    {
-      if( flags_info[row][FLAG_COL] == POSITIONAL ) continue;
-
-      if( flags_specified[row] == null &&
-          flags_info[row][REQUIRED_COL] == REQUIRED )
-        throw new Flag_error( messages.getString( FlagMessages.PARSER_ERROR_MISSING_REQUIRED_FLAG ),
-                               flagMessages.getString( flags_info[row][FLAG_COL] ) );
-
-      int parm_count = 0;
-
-      if( flags_specified[row] != null ) parm_count = flags_specified[row].size();
-
-      // Check for too many flag parameters.
-      if( flags_info[row][DUP_COL] == NO_DUPS && parm_count > 1 )
-        throw new Flag_error( messages.getString( FlagMessages.PARSER_ERROR_DUPLICATE_FLAGS_NOT_ALLOWED ),
-                               flagMessages.getString( flags_info[row][FLAG_COL] ) );
-
-      // Check for missing flag parameter.
-      if( parm_count > 0 && flags_info[row][NAME_COL] != NO_PARM )
-      {
-        for( int index = 0; index < flags_specified[row].size(); index++ )
-        {
-          if( flags_specified[row].elementAt(index) == null )
-            throw new Flag_error( messages.getString( FlagMessages.PARSER_ERROR_MISSING_FLAG_PARAMETER ),
-                                  new String[]
-                                    { flagMessages.getString( flags_info[row][FLAG_COL] ),
-                                      flagMessages.getString( flags_info[row][NAME_COL] ) } );
-
-        }
-      }
-    }
-  }
-
-  /**
-    * This method verifies that a proper flags_info string array was passed
-    * to us by the programmer.
-  **/
-  private void verify_flags_info() throws InternalErrorExc
-  {
-    boolean done_positionals = false;
-    boolean help_specified   = false;
-
-    required_positionals = 0;
-    optional_positionals_allowed = false;
-    optional_list_index = -1;
-    max_flag_size = 0;
-    max_name_size = 0;
-
-    if( flags_info == null || flags_info.length == 0 )
-      throw new InternalErrorExc( messages.getString( FlagMessages.PARSER_ERROR_NO_FLAGS_DATA_SPECIFIED  ) );
-
-    if( flags_info[POSITIONAL_ROW] != null &&
-        flags_info[POSITIONAL_ROW].length > 0 &&
-        flags_info[POSITIONAL_ROW][FLAG_COL] != POSITIONAL )
-      throw new InternalErrorExc( messages.getString( FlagMessages.PARSER_ERROR_FIRST_FLAG_NOT_POSITIONAL ) );
-
-    for( int row = 0; row < flags_info.length; row++ )
-    {
-      if( flags_info[row] == null )
-        throw new InternalErrorExc( messages.getString( FlagMessages.PARSER_ERROR_NULL_FLAG_ROW ) );
-
-      if( flags_info[row].length != 5 )
-        throw new InternalErrorExc( messages.getString( FlagMessages.PARSER_ERROR_INCORRECT_ROW_SIZE ) );
-
-      if( flags_info[row][FLAG_COL] == null ||
-          flags_info[row][NAME_COL] == null ||
-          flags_info[row][HELP_COL] == null )
-        throw new InternalErrorExc( messages.getString( FlagMessages.PARSER_ERROR_NULL_IN_ROW ) );
-
-      if( flags_info[row][FLAG_COL].equals( help_flag ) ) help_specified = true;
-
-      String flagId   = flags_info[row][FLAG_COL];
-      String nameId   = flags_info[row][NAME_COL];
-
-      String flag_col = flagId == POSITIONAL ? POSITIONAL : flagMessages.getString( flagId );
-      String name_col = nameId == NO_PARM ? NO_PARM : flagMessages.getString( nameId );
-
-      if( flag_col.length() > max_flag_size )
-        max_flag_size = flag_col.length();
-
-      if( name_col != NO_PARM && name_col.length() > max_name_size )
-        max_name_size = name_col.length();
-
-      // Ensure that flags are all in lowercase.
-      if( !flag_col.equals( flag_col.toLowerCase() ) )
-        throw new InternalErrorExc( messages.getString( FlagMessages.PARSER_ERROR_FLAG_NOT_LOWERCASE ),
-                                    flag_col );
-
-      // Ensure that only the predefined dup strings are used.
-      // Note: it's ok to use != when comparing constant strings literals.
-      if( flags_info[row][DUP_COL] == null ||
-          ( flags_info[row][DUP_COL] != NO_DUPS &&
-            flags_info[row][DUP_COL] != DUPS_OK ) )
-        throw new InternalErrorExc( messages.getString( FlagMessages.PARSER_ERROR_INCORRECT_DUP_STRING ),
-                                 flags_info[row][DUP_COL] );
-
-      // Ensure that only the predefined required strings are used.
-      if( flags_info[row][REQUIRED_COL] == null ||
-          ( flags_info[row][REQUIRED_COL] != REQUIRED &&
-            flags_info[row][REQUIRED_COL] != OPTIONAL ) )
-        throw new InternalErrorExc( messages.getString( FlagMessages.PARSER_ERROR_INCORRECT_REQUIRED_STRING ),
-                                 flags_info[row][REQUIRED_COL] );
-
-      // Count the number of required positionals.
-      if( flags_info[row][FLAG_COL] == POSITIONAL )
-      {
-        if( flags_info[row][REQUIRED_COL] == REQUIRED )
-        {
-          if( flags_info[row][NAME_COL] == NO_PARM )
-            throw new InternalErrorExc( messages.getString( FlagMessages.PARSER_ERROR_REQUIRED_POSITIONAL_NEEDS_NAME ) );
-
-          required_positionals++;
-        }
-        else if( flags_info[row][NAME_COL] != NO_PARM )
-        {
-          // We use the NAME_COL field for an optional positional to denote
-          // whether additional positionals are allowed or not.
-          optional_positionals_allowed = true;
-          optional_list_index = row;
-        }
-      }
-
-      // Ensure that positionals are at the beginning of the info.
-      if( flags_info[row][FLAG_COL] != POSITIONAL ||
-          ( done_positionals == false &&
-            flags_info[row][FLAG_COL] == POSITIONAL &&
-            flags_info[row][REQUIRED_COL] == OPTIONAL ) )
-      {
-        done_positionals = true;
-      }
-      else if( done_positionals == true )
-        throw new InternalErrorExc( messages.getString( FlagMessages.PARSER_ERROR_POSITIONAL_NOT_AT_BEGINNING ) );
-    }
-
-    // Ensure that a help flag was specified in the info list.
-    if( help_specified == false )
-      throw new InternalErrorExc( messages.getString( FlagMessages.PARSER_ERROR_HELP_FLAG_NOT_SPECIFIED ) );
-  }
-
-  /**
-    * This method is used to dump internal information about a parsed
-    * command line.
-  **/
-  public String toString()
-  {
-    StringBuffer b = new StringBuffer(100);
-
-    for( int row = 0; row < flags_info.length; row++ )
-    {
-      b.append( "\n" );
-
-      if( flags_info[row][FLAG_COL] == POSITIONAL )
-        b.append( "Positional:" );
-      else
-        b.append( flagMessages.getString( flags_info[row][FLAG_COL] ) + ":" );
-
-
-      if( flags_specified[row] == null )
-        b.append( "no parameters" );
-      else
-        for( int parm_index = 0; parm_index < flags_specified[row].size(); parm_index++ )
-        {
-          String parm = (String)flags_specified[row].elementAt(parm_index);
-          b.append( parm + ":" );
-        }
-      b.append( "\n" );
-    }
-
-    return ""+b;
-  }
-
-  private static final int FLAG_COL     = 0;
-  private static final int NAME_COL     = 1;
-  private static final int DUP_COL      = 2;
-  private static final int REQUIRED_COL = 3;
-  private static final int HELP_COL     = 4;
-
-  private static final int POSITIONAL_ROW = 0;
-  private static final int HELP_LINE_LEN  = 75;
-
-  private String[][] flags_info;
-  private String     help_flag;
-  private String     tool_name;
-  private Vector[]   flags_specified;
-  private int        required_positionals;
-  private boolean    optional_positionals_allowed;
-  private int        optional_list_index;
-  private int        max_flag_size;
-  private int        max_name_size;
-
-  protected ResourceBundle messages;
-  private   ResourceBundle flagMessages;
-}
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/commandline/FlagMessages.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/commandline/FlagMessages.java
deleted file mode 100644
index 1c56797c7..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/commandline/FlagMessages.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.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
-{
-
-  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 78529810d..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/commandline/commandline.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-PARSER_ERROR_FLAG_NOT_FOUND=IWAB0123E Flag -{0} is not valid.
-PARSER_ERROR_AMBIGUOUS_FLAG=IWAB0284E Flag -{0} is ambiguous.
-PARSER_ERROR_MISSING_POSITIONAL=IWAB0285E Missing {0} parameter.
-PARSER_ERROR_TOO_MANY_POSITIONALS=IWAB0286E Too many positional parameters specified.
-PARSER_ERROR_MISSING_REQUIRED_FLAG=IWAB0288E Flag -{0} is missing.
-PARSER_ERROR_DUPLICATE_FLAGS_NOT_ALLOWED=IWAB0293E Flag -{0} has been specified more than once.
-PARSER_ERROR_MISSING_FLAG_PARAMETER=IWAB0294E Flag -{0} is missing parameter {1}.
-PARSER_ERROR_MESSAGE_MISSING_ARG=IWAB0319E Error message {0} is missing an argument.
-PARSER_ERROR_NO_FLAGS_DATA_SPECIFIED=IWAB0345E Specify flag information.
-PARSER_ERROR_FIRST_FLAG_NOT_POSITIONAL=IWAB0346E The first flag must be positional.
-PARSER_ERROR_NULL_FLAG_ROW=IWAB0347E Null flag row.
-PARSER_ERROR_INCORRECT_ROW_SIZE=IWAB0348E Flag row must have 5 strings.
-PARSER_ERROR_NULL_IN_ROW=IWAB0349E Flag information contains a null string.
-PARSER_ERROR_INCORRECT_DUP_STRING=IWAB0350E Duplicate string {0} is not valid.
-PARSER_ERROR_INCORRECT_REQUIRED_STRING=IWAB0351E Required string {0} is not valid.
-PARSER_ERROR_POSITIONAL_NOT_AT_BEGINNING=IWAB0352E Positional flag is not at the beginning.
-PARSER_ERROR_HELP_FLAG_NOT_SPECIFIED=IWAB0353E Help flag is not specified in information array.
-PARSER_ERROR_FLAGS_NOT_ORDERED=IWAB0354E Flags are not in lexical order.
-PARSER_ERROR_FLAG_NOT_LOWERCASE=IWAB0355E Flag {0} is not lowercase.
-PARSER_ERROR_REQUIRED_POSITIONAL_NEEDS_NAME=IWAB0356E Required positional parameters must have a name specified.
-PARSER_SYNTAX=Syntax
-PARSER_FLAGS=Flags
-PARSER_WHERE=Where
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/ClassPath.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/ClassPath.java
deleted file mode 100644
index fa1923e7b..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/ClassPath.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.common;
-
-import java.io.File;
-
-/**
- * 
- * The class provides and easy way to build classpaths.
- *
- */
-public class ClassPath 
-{
-  private StringBuffer path = new StringBuffer();
-  
-  /**
-   * 
-   * @param newPath appends this new path to the end of the classpath.
-   */
-  public void appendPath( String newPath )
-  {
-  	// No value to put on path, so just return
-  	if( newPath.equals( "" ) ) return;
-  	
-  	// If this is the first path in the string then we don't need a path
-  	// separator.
-  	if( path.length() == 0 )
-  	{
-  	  path.append( newPath );
-  	}
-  	else
-  	{
-  	  path.append( File.pathSeparatorChar + newPath );
-  	}
-  }
-  
-  /**
-   * This method appends all jar and zip files in a particular directory to
-   * the classpath.
-   * 
-   * @param directory specifies a directory contains jar and zip files.
-   */
-  public void appendDir( String directory )
-  {
-  	File dir = new File( directory );
-  	
-  	if( !dir.isDirectory() ) return;
-  	
-  	File[] files = dir.listFiles();
-  	
-  	for( int index = 0; index < files.length; index++ )
-  	{
-  	  File   file = files[index];
-  	  String name = file.getName();
-  	  
-  	  if( file.isFile() &&
-  	      ( name.endsWith( ".jar" ) ||
-  	        name.endsWith( ".zip" ) ) )
-  	  {
-  	  	appendPath( file.getAbsolutePath() );
-  	  }
-  	        
-  	}
-  }
-  
-  /**
-   * 
-   * @param newPath appends a new classpath to the end of this classpath.
-   */
-  public void appendPath( ClassPath newPath )
-  {
-  	appendPath( newPath.path.toString() );
-  }
-  
-  /**
-   * @return returns the full string classpath with separators.
-   */
-  public String toString()
-  {
-  	return path.toString();
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/FileResourceOutputStream.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/FileResourceOutputStream.java
deleted file mode 100644
index 0960ac613..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/FileResourceOutputStream.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.common;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.common.environment.IStatusHandler;
-
-
-
-/**
-* This class defines an output stream that writes to an
-* {@link org.eclipse.core.resources.IFile IFile}.
-*/
-public class FileResourceOutputStream extends OutputStream
-{
-
-  IPath                 fFilePath;
-  ResourceContext       fResourceContext; 
-  IProgressMonitor       fMonitor;   
-  IStatusHandler         fStatusHandler;
-  ByteArrayOutputStream fByteArrayOutputStream;
-  boolean               fOpen;
-
-  /**
-  * Constructs an output stream that can be used to write to the
-  * given <code>file</code>. The workspace is neither examined nor
-  * altered during construction. All resource creation is deferred
-  * until later in the stream's lifecycle, such as during writing
-  * or closure.
-  * <b>Note:</b> The preferred mechanism for creating a stream that
-  * writes to an IFile is to call the static factory method
-  * {@link FileResourceUtils#newFileOutputStream FileResourceUtils.newFileOutputStream()}
-  * and work with the resulting <code>OutputStream</code>.
-  * Direct construction of a FileResourceOutputStream is not recommended.
-  * @param file The {@link org.eclipse.core.resources.IFile IFile}
-  * handle of the file resource to create. The project implied by the
-  * pathname of the file must already exist,
-  * that is, this method cannot be used to create projects.
-  * @param progressMonitor The progress monitor for the operation, or null.
-  */
-  public FileResourceOutputStream ( 
-  			ResourceContext resourceContext, 
-  			IPath           filePath, 
-  			IProgressMonitor monitor,
-  			IStatusHandler   statusHandler
-  			)
-  {
-    fFilePath = filePath;
-    fResourceContext = resourceContext;
-    fMonitor = monitor;
-    fStatusHandler = statusHandler;
-    fByteArrayOutputStream = new ByteArrayOutputStream();
-    fOpen = true;
-  }
-
-  /**
-  * Closes the stream.
-  * @throws IOException If an error occurs while closing the stream.
-  * For example, if this stream was constructed with overwriteFile = false
-  * and a file of the same name already exists, then an IOException will
-  * be thrown either now or during an earlier {@link #write write}.
-  */
-  public void close ()
-  throws IOException
-  {
-    if (!fOpen) return;
-    fOpen = false;
-    fByteArrayOutputStream.close();
-    byte[] buffer = fByteArrayOutputStream.toByteArray();
-    ByteArrayInputStream tempInputStream = new ByteArrayInputStream(buffer);
-    try
-    {
-      FileResourceUtils.createFile(fResourceContext, fFilePath, tempInputStream, fMonitor, fStatusHandler);
-    }
-    catch (CoreException e)
-    {
-      throw new IOException(e.getMessage());
-    }
-  }
-
-  /**
-  * Flushes the stream. This does not imply the File resource
-  * will be created or become visible within the workbench.
-  * @throws IOException If an error occurs. For example, if this
-  * stream was constructed with overwriteFile = false and a file of the
-  * same name already exists, then an IOException may be thrown at
-  * this point.
-  */
-  public void flush ()
-  throws IOException
-  {
-    fByteArrayOutputStream.flush();
-  }
-
-  /**
-  * Writes all bytes from the given array to the stream.
-  * @param b The array of bytes to write.
-  * @throws IOException If an error occurs. For example, if this
-  * stream was constructed with overwriteFile = false and a file of the
-  * same name already exists, then an IOException may be thrown at
-  * this point.
-  */
-  public void write ( byte[] b )
-  throws IOException
-  {
-    fByteArrayOutputStream.write(b);
-  }
-
-  /**
-  * Writes bytes from the given array beginning at some offset
-  * and continuing for some number of bytes (len) to the stream.
-  * @param b The array of bytes to write.
-  * @param off The offset into the array to begin writing.
-  * @param len The number of bytes to write.
-  * @throws IOException If an error occurs. For example, if this
-  * stream was constructed with overwriteFile = false and a file of the
-  * same name already exists, then an IOException may be thrown at
-  * this point.
-  */
-  public void write ( byte[] b, int off, int len )
-  {
-    fByteArrayOutputStream.write(b,off,len);
-  }
-
-  /**
-  * Writes a single byte to the stream.
-  * @param b The byte to write.
-  * @throws IOException If an error occurs. For example, if this
-  * stream was constructed with overwriteFile = false and a file of the
-  * same name already exists, then an IOException may be thrown at
-  * this point.
-  */
-  public void write ( int b )
-  {
-    fByteArrayOutputStream.write(b);
-  }
-}
-
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/FileResourceUtils.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/FileResourceUtils.java
deleted file mode 100644
index 0c85096fd..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/FileResourceUtils.java
+++ /dev/null
@@ -1,777 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     yyyymmdd	bug #	email					comment
- *     20060112	[121199] jesper@selskabet.org 	- Jesper S Moller contributed patch for createFileAtLocation and makeFolderPathAtLocation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.common;
-
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.EnvironmentMessages;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.common.environment.Choice;
-import org.eclipse.wst.common.environment.IStatusHandler;
-import org.eclipse.wst.common.environment.StatusException;
-
-
-
-/**
-* This class contains useful methods for working with Eclipse resources.
-*/
-public final class FileResourceUtils
-{
-  //
-  // Keeps the IWorkspace hanging around. See getWorkspace().
-  //
-  private static IWorkspace workspace_ = null;
-  //
-  // Keeps the IWorkspaceRoot hanging around. See getWorkspaceRoot().
-  //
-  private static IWorkspaceRoot root_ = null;
-  
-//  private static MessageUtils msg_ = new MessageUtils( "org.eclipse.wst.command.internal.env.common.environment", new FileResourceUtils() );
-
-
- /**
-  * Returns the IWorkspaceRoot object.
-  * @return The IWorkspaceRoot object.
-  */
-  public static IWorkspaceRoot getWorkspaceRoot ()
-  {
-    if (root_ == null)
-    {
-      root_ = ResourcesPlugin.getWorkspace().getRoot();
-    }
-    return root_;
-  }
-
-  /**
-	 * Returns the IWorkspace object.
-	 * 
-	 * @return The IWorkspace object.
-	 */
-  public static IWorkspace getWorkspace ()
-  {
-    if (workspace_ == null)
-    {
-      if (root_ == null)
-      {
-        root_ = ResourcesPlugin.getWorkspace().getRoot();
-      }
-      
-      workspace_ = root_.getWorkspace();
-    }
-    
-    return workspace_;
-  }
-  
-  /**
-   * 
-   * @return returns an array of three common choices. (ie. Yes, yes all, and cancel )
-   */
-  public static Choice[] getThreeStateFileOptions() 
-  {
-    Vector choices = new Vector();
-    
-    choices.add(new Choice( 'Y', EnvironmentMessages.LABEL_YES));
-    choices.add(new Choice( 'A', EnvironmentMessages.LABEL_YES_TO_ALL));
-    choices.add(new Choice( 'C', EnvironmentMessages.LABEL_CANCEL));
-    
-    return (Choice[])choices.toArray(new Choice[choices.size()]);
-  }
-  
-  /**
-  * Returns an
-  * {@link org.eclipse.core.resources.IResource IResource}
-  * of the given absolute pathname or null if no such resource exists.
-  * @param absolutePathname The absolute path of the resource.
-  * @return The <code>IResource</code>.
-  */
-  public static IResource findResource ( String absolutePathname )
-  {
-    if (absolutePathname == null)
-    {
-      return null;
-    }
-    
-    return findResource(new Path(absolutePathname));
-  }
-
-  /**
-  * Returns an
-  * {@link org.eclipse.core.resources.IResource IResource}
-  * of the given absolute path or null if no such resource exists.
-  * @param absolutePath The absolute <code>IPath</code> of the resource.
-  * @return The <code>IResource</code>.
-  */
-  public static IResource findResource ( IPath absolutePath )
-  {
-    if (absolutePath == null)
-    {
-      return null;
-    }
-    
-    return FileResourceUtils.getWorkspaceRoot().findMember(absolutePath);
-  }
-  
-  /**
-   * Copies a file from a plugin's installation location
-   * to an Eclipse folder.
-   * @param plugin The plugin containing the files to copy.
-   * Must not be null.
-   * @param sourcePath The path, relative to the <code>plugin</code>
-   * install location, containing the files to copy.
-   * If null, then the plugin install location is the source path
-   * (ie. null is equivalent to ".").
-   * @param pathname The pathname of the file to copy.
-   * The pathname is relative to the <code>plugin sourcePath</code>.
-   * Must not be null.
-   * @param targetPath The absolute Eclipse path of the folder to
-   * which the file will be copied. The relative pathname of the
-   * file is preserved.
-   * Must not be null.
-   * @param createFolders The intermediate folder creation policy, one of
-   * {@link #CREATE CREATE} or {@link #DONT_CREATE DONT_CREATE}.
-   * <ul>
-   * <li><code>CREATE</code> -
-   * If any intermediate folders in the given <code>absolutePath</code>
-   * do not exist, they will be created.
-   * <li><code>DONT_CREATE</code> -
-   * If any intermediate folders in the given <code>absolutePath</code>
-   * do not exist, the method will throw a <code>CoreException</code>.
-   * </ul>
-   * @param overwriteFile The policy for existing files, one of
-   * {@link #OVERWRITE OVERWRITE} or {@link #DONT_OVERWRITE DONT_OVERWRITE}.
-   * <ul>
-   * <li><code>OVERWRITE</code> -
-   * If a resource of the same name as the given
-   * <code>absolutePath</code> already exists and is a file,
-   * it will be replaced.
-   * If the resource already exists and it is not a file,
-   * then no file will be created and
-   * a <code>CoreException</code> will be thrown.
-   * <li><code>DONT_OVERWRITE</code> -
-   * If any resource of the same name as the given
-   * <code>absolutePath</code> already exists,
-   * then no file will be created and
-   * a <code>CoreException</code> will be thrown.
-   * </ul>
-   * @param progressMonitor The progress monitor for the operation, or null.
-   * @throws CoreException An exception containing an
-   * {@link org.eclipse.core.runtime.IStatus IStatus}
-   * with a severity of <code>IStatus.ERROR</code> and a
-   * locale-specific description of the cause.
-   */
-   static public void copyFile( ResourceContext resourceContext,
-                                Plugin plugin,
-                                IPath sourcePath,
-                                IPath pathname,
-                                IPath targetPath,
-                                IProgressMonitor progressMonitor,
-                                IStatusHandler statusMonitor )
-     throws CoreException
-   {
-     try
-     {
-       IPath target = targetPath.append(pathname);
-       IPath source = sourcePath == null ? pathname : sourcePath.append(pathname);
-       InputStream input = plugin.openStream(source);
-       createFile(resourceContext, target, input, progressMonitor, statusMonitor);
-     }
-     catch (IOException e)
-     {
-       throw new CoreException(new Status(IStatus.ERROR,
-                               plugin.getBundle().getSymbolicName(),
-                               0,
-                               EnvironmentMessages.MSG_ERROR_IO,e));
-     }
-   }
-   
-  /**
-   * Deletes a file under a container.
-   * The container must already exist.
-   * @param file - the IFile to be deleted
-   * @param progressMonitor
-   * @param statusMonitor
-   * @return True if the file does not exist or if it exists and is successfully deleted. False otherwise.
-   */
-  public static boolean deleteFile( ResourceContext resourceContext, 
-                                    IFile file,
-                                    IProgressMonitor progressMonitor, 
-                                    IStatusHandler statusMonitor)
-    throws CoreException
-  {
-    if (file.exists())
-    {
-      if (!resourceContext.isOverwriteFilesEnabled())
-      {
-        IStatus status 
-          = StatusUtils.warningStatus( NLS.bind(EnvironmentMessages.MSG_ERROR_FILE_OVERWRITE_DISABLED,
-                                                        new Object[]{ file.getParent().getFullPath().toString(),
-                                                                      file.getName()}) );
-                            
-        
-        Choice choice = statusMonitor.report( status, getThreeStateFileOptions() );
-        
-        if( choice.getShortcut() == 'C' ) return false;
-        
-        if( choice.getShortcut() == 'A' ) resourceContext.setOverwriteFilesEnabled(true);
-      }
-      
-      //We have permission to overwrite so check if file is read-only
-      if (file.isReadOnly())
-      {
-        if (!resourceContext.isCheckoutFilesEnabled())
-        {
-          IStatus status 
-            = StatusUtils.warningStatus( NLS.bind(EnvironmentMessages.MSG_ERROR_FILE_CHECKOUT_DISABLED,
-                                                          new Object[]{ file.getParent().getFullPath().toString(),
-                                                                        file.getName()}) );
-          
-          Choice choice = statusMonitor.report( status, getThreeStateFileOptions() );
-          
-          if( choice.getShortcut() == 'C' ) return false;
-          
-          if( choice.getShortcut() == 'A' ) resourceContext.setCheckoutFilesEnabled(true);          
-        }
-        
-        IFile[] files = new IFile[1];
-        files[0] = file;
-        IStatus status = getWorkspace().validateEdit(files, null);
-        
-        if( status.getSeverity() == IStatus.ERROR )
-        {
-          statusMonitor.reportError( status );
-          return false;
-        }
-      }
-      
-      file.delete(true, null);
-    }
-    //At this point, either the file did not exist or we successfully deleted
-    // it. Return success.
-    return true;
-  }
-
-  /**
-   * Deletes a folder under a container.
-   * @param folder - the IFolder to be deleted
-   * @param progressMonitor
-   * @param statusMonitor
-   * @return True if the folder does not exist or if it exists and is successfully deleted along with its members. False otherwise.
-   */
-   public static boolean deleteFolder( ResourceContext resourceContext,
-                                       IFolder folder,
-                                       IProgressMonitor progressMonitor,
-                                       IStatusHandler statusMonitor )
-     throws CoreException
-   {
-     if (!folder.exists()) return true;
-
-     boolean     deleted   = true;
-     IResource[] resources = folder.members();
-     
-     for (int i=0; i<resources.length; i++)
-     {
-       IResource resource = resources[i];
-       if (resource instanceof IFile)
-       {
-         deleted = deleteFile(resourceContext, (IFile)resource, progressMonitor, statusMonitor);
-       }
-       if (resource instanceof IFolder)
-       {
-         deleted = deleteFolder( resourceContext, (IFolder)resource, progressMonitor, statusMonitor);
-       }
-
-       if( !deleted ) break;
-     }
-     
-     if( deleted )
-     {
-       folder.delete(true, true, null);
-       return true;
-     }
-     else
-       return false;
-   }
-
-  /**
-  * Creates a file of the given <code>absolutePath</code>
-  * and returns its handle as an <code>IFile</code>.
-  * If the file cannot be created, a
-  * <code>CoreException</code> containing an
-  * <code>IStatus</code> object is thrown.
-  * @param absolutePath The absolute path of the file to create.
-  * The project at the beginning of the path must already exist,
-  * that is, this method cannot be used to create projects.
-  * @param progressMonitor The progress monitor for the operation, or null.
-  * @return The {@link org.eclipse.core.resources.IFile IFile}
-  * handle of the file.
-  * @throws CoreException An exception containing an
-  * {@link org.eclipse.core.runtime.IStatus IStatus}
-  * with a severity of <code>IStatus.ERROR</code> and a
-  * locale-specific description of the cause.
-  */
-  public static IFile createFile (
-    ResourceContext resourceContext,
-    IPath           absolutePath,
-    InputStream     inputStream,
-    IProgressMonitor progressMonitor,
-    IStatusHandler   statusHandler )
-
-    throws CoreException 
-  {    
-    if (!absolutePath.isAbsolute())
-    {
-      throw new CoreException(new Status(IStatus.ERROR, "ResourceUtils",0,NLS.bind(EnvironmentMessages.MSG_ERROR_PATH_NOT_ABSOLUTE,new Object[] {absolutePath.toString()}),null));
-    }
-    if (absolutePath.segmentCount() < 1)
-    {
-      throw new CoreException(new Status(IStatus.ERROR,"ResourceUtils",0,NLS.bind(EnvironmentMessages.MSG_ERROR_PATH_EMPTY,new Object[] {absolutePath.toString()}),null));
-    }
-    if (absolutePath.segmentCount() < 2)
-    {
-      throw new CoreException(new Status(IStatus.ERROR,"ResourceUtils",0,NLS.bind(EnvironmentMessages.MSG_ERROR_PATH_NOT_FOLDER,new Object[] {absolutePath.toString()}),null));
-    }
-    IContainer parent   = makeFolderPath(resourceContext, absolutePath.removeLastSegments(1), progressMonitor, statusHandler);
-    String     fileName = absolutePath.lastSegment();
-    
-    return makeFile(resourceContext, parent, fileName, inputStream, progressMonitor, statusHandler);
-  }
-
-  /**
-  * Creates under the given <code>project</code>
-  * a file of the given <code>relativePath</code>
-  * and returns its handle as an <code>IFile</code>.
-  * If the file cannot be created, a
-  * <code>CoreException</code> containing an
-  * <code>IStatus</code> object is thrown.
-  * @param absolutePath The absolute path of the file to create.
-  * The project at the beginning of the path must already exist,
-  * that is, this method cannot be used to create projects.
-  * @param createFolders The intermediate folder creation policy, one of
-  * {@link #CREATE CREATE} or {@link #DONT_CREATE DONT_CREATE}.
-  * <ul>
-  * <li><code>CREATE</code> -
-  * If any intermediate folders in the given <code>absolutePath</code>
-  * do not exist, they will be created.
-  * <li><code>DONT_CREATE</code> -
-  * If any intermediate folders in the given <code>absolutePath</code>
-  * do not exist, the method will throw a <code>CoreException</code>.
-  * </ul>
-  * @param overwriteFile The policy for existing files, one of
-  * {@link #OVERWRITE OVERWRITE} or {@link #DONT_OVERWRITE DONT_OVERWRITE}.
-  * <ul>
-  * <li><code>OVERWRITE</code> -
-  * If a resource of the same name as the given
-  * <code>absolutePath</code> already exists and is a file,
-  * it will be replaced.
-  * If the resource already exists and it is not a file,
-  * then no file will be created and
-  * a <code>CoreException</code> will be thrown.
-  * <li><code>DONT_OVERWRITE</code> -
-  * If any resource of the same name as the given
-  * <code>absolutePath</code> already exists,
-  * then no file will be created and
-  * a <code>CoreException</code> will be thrown.
-  * </ul>
-  * @param progressMonitor The progress monitor for the operation, or null.
-  * @return The {@link org.eclipse.core.resources.IFile IFile}
-  * handle of the file.
-  * @throws CoreException An exception containing an
-  * {@link org.eclipse.core.runtime.IStatus IStatus}
-  * with a severity of <code>IStatus.ERROR</code> and a
-  * locale-specific description of the cause.
-  */
-  public static IFile createFile (
-    ResourceContext resourceContext,
-    IProject        project,
-    IPath           relativePath,
-    InputStream     inputStream,
-    IProgressMonitor progressMonitor,
-    IStatusHandler   statusMonitor )
- 
-    throws CoreException 
-  {
-    IPath absolutePath = project.getFullPath().append(relativePath);
-    return createFile(resourceContext, absolutePath, inputStream, progressMonitor, statusMonitor);
-  }
-
-  /**
-  * Creates an output stream that can be used to write to the
-  * given <code>file</code>. Actual changes to the workspace
-  * may occur during creation of the stream, while writing to
-  * the stream, or when the stream is closed.
-  * A <code>CoreException</code> containing
-  * an <code>IStatus</code> will be thrown
-  * at some point in the lifecycle of the stream
-  * if the file resource cannot be created.
-  * @param file The {@link org.eclipse.core.resources.IFile IFile}
-  * handle of the file resource to create. The project implied by the
-  * pathname of the file must already exist,
-  * that is, this method cannot be used to create projects.
-  * @param progressMonitor The progress monitor for the operation, or null.
-  * @return An <code>OutputStream</code> tied to the file resource.
-  * Actual checks of or changes to the workspace may occur as early during
-  * stream creation, closure, or any time in between.
-  * @throws CoreException An exception containing an
-  * {@link org.eclipse.core.runtime.IStatus IStatus}
-  * with a severity of <code>IStatus.ERROR</code> and a
-  * locale-specific description of the cause.
-  * Reasons include:
-  * <ol>
-  * <li>The project of the given file's path does not exist.
-  * <li>A non-file resource of the same name of the given file
-  * already exists.
-  * <li>A file resource of the same name of the given file
-  * already exists, and <code>overwriteFile</code> is false.
-  * <li>One or more intermediate folders to the given file
-  * do not exist, and <code>createFolders</code> is false.
-  * </ol>
-  */
-
-  public static OutputStream newFileOutputStream (
-       ResourceContext  context,
-       IPath            file,
-       IProgressMonitor progressMonitor,
-       IStatusHandler    statusHandler )
- 
-  {
-    return new FileResourceOutputStream(context, file, progressMonitor, statusHandler);
-  }
-
-  //----------------------------------------------------------------------
-  // Naughty bits...
-  //----------------------------------------------------------------------
-
-  //
-  // Creates a path of folders.
-  // Do not call with an absolutePath of less than one segment.
-  //
-  /**
-   * Creates a path of folders.
-   * Do not call with an absolutePath of less than one segment.
-   * @param resourceContext the resource context for making folders.
-   * @param absolutePath the path of folders that will be created.
-   * @param progressMonitor the progress monitor to be used.
-   * @param statusHandler the status handler.
-   * @return returns the IContainer of the created folder.
-   */
-  public static IContainer makeFolderPath (
-    ResourceContext  resourceContext,
-    IPath            absolutePath,
-    IProgressMonitor progressMonitor,
-    IStatusHandler    statusHandler )
-  
-    throws CoreException
-  {
-    if (absolutePath.segmentCount() <= 1)
-    {
-      return getWorkspaceRoot().getProject(absolutePath.segment(0));
-    }
-    else
-    {
-      IContainer parent = makeFolderPath(resourceContext, absolutePath.removeLastSegments(1), progressMonitor, statusHandler );
-      String folderName = absolutePath.lastSegment();
-      
-      return makeFolder(resourceContext, parent,folderName, progressMonitor , statusHandler );
-    }
-  }
-  //
-  // Creates a folder under a container.
-  // The container must already exist.
-  //
- private static IFolder makeFolder (
-    ResourceContext  resourceContext,
-    IContainer       parent,
-    String           folderName,
-    IProgressMonitor progressMonitor,
-    IStatusHandler    statusHandler )
-  
-  throws CoreException
-  {
-    IResource child  = parent.findMember(folderName);
-    Choice    result = null;
-    
-    if( child == null )
-    {
-      if (!resourceContext.isCreateFoldersEnabled())  
-      {
-        result = statusHandler.report(
-                StatusUtils.warningStatus(
-                		NLS.bind(EnvironmentMessages.MSG_ERROR_FOLDER_CREATION_DISABLED,
-        	                      new Object[]{ parent.getFullPath().toString(), folderName} ) ), 
-                getThreeStateFileOptions() );
-        
-        if( result == null || result.getShortcut() == 'C' )
-        {
-          return null;
-        }
-        else if( result.getShortcut() == 'A' )
-        {
-          resourceContext.setCreateFoldersEnabled(true);
-        }
-      }
-      
-      IFolder folder = parent.getFolder(new Path(folderName));
-      folder.create(true,true,null);
-      return folder;
-    }
-    else if( child.getType() == IResource.FOLDER )
-    {
-      return (IFolder)child;
-    }
-    else
-    {
-      throw new CoreException(
-        new Status( IStatus.ERROR, 
-                    "ResourceUtils",
-                    0, 
-                    NLS.bind(EnvironmentMessages.MSG_ERROR_RESOURCE_NOT_FOLDER,
-					                 new Object[]{ parent.getFullPath().append(folderName).toString() }),
-			null ) );
-    }
-  }
-
-  //
-  // Creates a file under a container.
-  // The container must already exist.
-  //
- private static IFile makeFile (
-    ResourceContext  resourceContext,
-    IContainer       parent,
-    String           fileName,
-    InputStream      inputStream,
-    IProgressMonitor progressMonitor,
-    IStatusHandler    statusHandler )
- 
-    throws CoreException
-  {
-    IResource child  = parent.findMember(fileName);
-    Choice    result = null;
-    
-    if( child != null )
-    {
-      if( child.getType() == IResource.FILE )
-      {
-        if( !resourceContext.isOverwriteFilesEnabled() )   
-        {
-          result = statusHandler.report( 
-                StatusUtils.warningStatus( NLS.bind(EnvironmentMessages.MSG_ERROR_FILE_OVERWRITE_DISABLED,
-                                           new Object[] {parent.getFullPath().toString(),fileName}) ),					  		    
-                getThreeStateFileOptions() );
-          
-          if( result == null || result.getShortcut() == 'C' )
-          {
-            return null;
-          }
-          else if( result.getShortcut() == 'A' )
-          {
-            resourceContext.setOverwriteFilesEnabled(true);
-          }
-        }	
-        
-        //We have permission to overwrite so check if file is read-only
-        if( child.getResourceAttributes().isReadOnly() )
-        {
-          if( !resourceContext.isCheckoutFilesEnabled() ) 
-          {            
-            result = statusHandler.report( 
-                         StatusUtils.errorStatus( NLS.bind(EnvironmentMessages.MSG_ERROR_FILE_CHECKOUT_DISABLED,
-                                                  new Object[]{ parent.getFullPath().toString(),fileName} ) ), 
-                         getThreeStateFileOptions() );
-            
-		    if( result == null || result.getShortcut() == 'C' )
-		    {
-              return null;
-		    }
-            else if( result.getShortcut() == 'A' )
-            {
-              resourceContext.setCheckoutFilesEnabled(true);
-            }
-          }
-
-          IFile[] files = new IFile[1];
-          files[0] = (IFile)child;
-          
-          IStatus status = getWorkspace().validateEdit(files,null);
-          
-          try
-          {
-            statusHandler.report( status );
-          }
-          catch( StatusException exc )
-          {
-            return null;
-          }
-        }
-
-        //Change the contents of the existing file.
-        IFile file = parent.getFile( new Path(fileName) );
-        file.setContents( inputStream, true, true, null );
-        
-        return file;
-      
-      }
-      else
-      {
-        throw new CoreException( 
-          new Status( IStatus.ERROR,
-                      "ResourceUtils",
-                      0, 
-                      NLS.bind(EnvironmentMessages.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;
-    }
-  }
-
- 
- /**
-   * 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 createFileAtLocation (
-     ResourceContext resourceContext,
-     IPath           absolutePath,
-     InputStream     inputStream,
-     IProgressMonitor progressMonitor,
-     IStatusHandler   statusHandler )
-
-     throws CoreException 
-   {    
-     if (!absolutePath.isAbsolute())
-     {
-       throw new CoreException(new Status(IStatus.ERROR, "ResourceUtils",0,NLS.bind(EnvironmentMessages.MSG_ERROR_PATH_NOT_ABSOLUTE,new Object[] {absolutePath.toString()}),null));
-     }
-     if (absolutePath.segmentCount() < 1)
-     {
-       throw new CoreException(new Status(IStatus.ERROR,"ResourceUtils",0,NLS.bind(EnvironmentMessages.MSG_ERROR_PATH_EMPTY,new Object[] {absolutePath.toString()}),null));
-     }
-     if (absolutePath.segmentCount() < 2)
-     {
-       throw new CoreException(new Status(IStatus.ERROR,"ResourceUtils",0,NLS.bind(EnvironmentMessages.MSG_ERROR_PATH_NOT_FOLDER,new Object[] {absolutePath.toString()}),null));
-     }
-     IContainer parent   = makeFolderPathAtLocation(resourceContext, absolutePath.removeLastSegments(1), progressMonitor, statusHandler);
-     String     fileName = absolutePath.lastSegment();
-     
-     return makeFile(resourceContext, parent, fileName, inputStream, progressMonitor, statusHandler);
-   }
-
-/**
-  * Creates a path of folders using absolute filenames.
-  * Do not call with an absolutePath of less than one segment.
-  * @param resourceContext the resource context for making folders.
-  * @param resource the resource 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 makeFolderPathAtLocation (
-   ResourceContext  resourceContext,
-   IContainer       resource,
-   IProgressMonitor progressMonitor,
-   IStatusHandler   statusHandler )
- 
-   throws CoreException
-   {
-	 if (resource.exists())
-	 {
-		 if (resource instanceof IContainer)
-		 {
-			 return (IContainer) resource;
-		 }
-		 else
-		 {
-			 throw new CoreException(
-					 new Status( IStatus.ERROR, 
-							 "ResourceUtils",
-							 0, 
-							 NLS.bind(EnvironmentMessages.MSG_ERROR_RESOURCE_NOT_FOLDER,
-									 new Object[]{ resource.getFullPath().toString() }),
-									 null ) );
-		 }
-	 }
-	 else
-	 {
-		 IContainer parent = makeFolderPathAtLocation(resourceContext, resource.getParent(), progressMonitor, statusHandler );
-		 String folderName = resource.getName();
-		 
-		 return makeFolder(resourceContext, parent, folderName, progressMonitor , statusHandler );
-	 }
- }
- 
- /**
-  * 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 makeFolderPathAtLocation (
-   ResourceContext  resourceContext,
-   IPath            absolutePath,
-   IProgressMonitor progressMonitor,
-   IStatusHandler    statusHandler )
- 
-   throws CoreException
- {
- 	return makeFolderPathAtLocation(resourceContext,
- 		getWorkspaceRoot().getContainerForLocation(absolutePath),
- 		progressMonitor, statusHandler);
- }
- 
- 
-
-}
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/StringUtils.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/StringUtils.java
deleted file mode 100644
index 601e15a2b..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/StringUtils.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.common;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.util.Enumeration;
-import java.util.Vector;
-
-/**
-  * This class contains some useful string utilities that are not provided by
-  * either String or StringBuffer.
-  *
-  * @author Peter Moogk
-  * @date   July 13, 2000
-**/
-public final class StringUtils
-{
-  /**
-  * The platform-specific line separator.
-  */
-  public static final String NEWLINE = System.getProperty("line.separator");
-
-  private StringUtils(){};
-
-  /**
-    * This method splits a single line of text into multiple lines
-    * based on a maximum line length.  The method will try to fit as
-    * many words as possible onto a line without exceeding the maximum
-    * line length.  Note: the only case where a line might exceed the
-    * maximum is if a single word is longer than the maximum.
-    * @param text a single line a text that is to be split.
-    * @param max_length the maximum length of each split line.
-    * @return a string array of the split lines.
-  **/
-  public static String[] splitter( String text, int max_length )
-  {
-    Vector          return_text = new Vector(20);
-    String[]        return_str;
-    int             index = 0;
-
-    while( index < text.length() )
-    {
-      String str = text.substring( index, Math.min( max_length + index,
-                                                    text.length() ) );
-      int space_index = str.lastIndexOf( " " );
-
-      if( index + str.length() < text.length() &&
-          text.charAt( index + str.length() - 1 ) != ' ' &&
-          text.charAt( index + str.length() ) != ' ' &&
-          space_index != -1 )
-      {
-        return_text.addElement( str.substring( 0, space_index ) );
-        index += space_index + 1;
-      }
-      else
-      {
-        return_text.addElement( str.trim() );
-        index += str.length();
-      }
-    }
-
-    return_str = new String[return_text.size()];
-
-    for( index = 0; index < return_text.size(); index++ )
-    {
-      return_str[index] = (String)(return_text.elementAt(index));
-    }
-
-    return return_str;
-  }
-
-  /**
-    * This method returns a string with a repeated number of characters.
-    * @param the_char the character to be repeated.
-    * @param count the number of time this character should be repeated.
-    * @return the resulting string of repeated characters.
-  **/
-  static public String repeat( char the_char, int count )
-  {
-    StringBuffer buf = new StringBuffer( count );
-
-    for( int index = 0; index < count; index++ )
-    {
-      buf.append( the_char );
-    }
-
-    return buf.toString();
-  }
-
-  /**
-    * This method flattens an array of arguments to a string.
-    * The method respects embedded whitespace and quotes.
-    * <ul>
-    * <li>Any argument with embedded whitespace will be flattened out
-    * with enclosing quotes. For example, the single argument
-    * <u>Hello World</u>
-    * will be returned as
-    * <u>"Hello World"</u>.
-    * <li>Any argument with quotes will be flattened out with the
-    * quotes escaped. For example, the single argument
-    * <u>"Happy days"</u>
-    * will be returned as
-    * <u>\"Happy days\"</u>.
-    * </ul>
-    * @param arguments The array of strings to flatten.
-    * @return the flattened string.
-  */
-  static public String flattenArguments ( String[] arguments )
-  {
-    StringBuffer buf = new StringBuffer();
-
-    for (int i=0; i<arguments.length; i++)
-    {
-      //
-      // Append a separator (except the first time).
-      //
-      if (i > 0) buf.append(' ');
-
-      //
-      // Look for whitespace.
-      //
-      boolean whitespace = false;
-      char[] chars = arguments[i].toCharArray();
-      for (int j=0; !whitespace && j<chars.length; j++)
-      {
-        if (Character.isWhitespace(chars[j]))
-        {
-          whitespace = true;
-        }
-      }
-
-      //
-      // Append the argument, quoted as necessary.
-      //
-      if (whitespace) buf.append('"');
-      for (int j=0; j<chars.length; j++)
-      {
-        if (chars[j] == '"') buf.append('\\');
-        buf.append(chars[j]);
-      }
-      if (whitespace) buf.append('"');
-    }
-
-    return buf.toString();
-  }
-
-  /**
-    * This method parses whitespace-delimitted filenames from
-    * the given <code>input</code> stream. <b>Limitation:</b>
-    * Quoted filenames or filenames with embedded whitespace
-    * are not currently supported.
-    * @param input The input stream.
-    * @return An enumeration of filenames from the stream.
-  */
-  static public Enumeration parseFilenamesFromStream ( InputStream input )
-  throws IOException
-  {
-    Vector filenames = new Vector(64,64);
-    StringBuffer buffer = null;
-    byte state = STATE_WS;
-    int ic = input.read();
-    while (ic >= 0)
-    {
-      char c = (char)ic;
-      switch (state)
-      {
-        case STATE_WS:
-          if (!Character.isWhitespace(c))
-          {
-            buffer = new StringBuffer();
-            buffer.append(c);
-            state = STATE_NWS;
-          }
-          break;
-        case STATE_NWS:
-          if (!Character.isWhitespace(c))
-          {
-            buffer.append(c);
-          }
-          else
-          {
-            String filename = buffer.toString();
-            filenames.add(filename);
-            buffer = null;
-            state = STATE_WS;
-          }
-          break;
-        default:
-          break;
-      }
-      ic = input.read();
-    }
-    return filenames.elements();
-  }
-
-  private static final byte STATE_WS = 0;
-  private static final byte STATE_NWS = 1;
-
-
-  /**
-  * Returns true is the type passed in is a primtive java type
-  * @param class name String
-  * @return true is primitive type
-  */
-  public static boolean isPrimitiveType(String typeName) 
-  {
-
-    if (typeName.equalsIgnoreCase("boolean") ||
-      typeName.equalsIgnoreCase("byte") ||
-      typeName.equalsIgnoreCase("double") ||
-      typeName.equalsIgnoreCase("float") ||
-      typeName.equalsIgnoreCase("int") ||
-      typeName.equalsIgnoreCase("long") ||
-      typeName.equalsIgnoreCase("short") ||
-      typeName.equalsIgnoreCase("char"))
-      return true;
-    return false;
-
-  }
-
-  /**
-  * The method replace the characters that are allowed in URIs
-  * and not allowed in Java class names to an underscore ('_')
-  * @param URI String
-  * @return valid Java class name String
-  */
-  public static String URI2ClassName( String uri ) {
-    String className = uri;
-    for ( int i = 0; i < URI_SYMBOLS.length; i++ ) {
-    	className = className.replace ( URI_SYMBOLS[i], UNDERSCORE );
-    }
-    return className;
-  }
-
-  /**
-   * Creates and array of strings containing the exception traceback information of
-   * a Throwable.  This is the same traceback data that is displayed by exc.printStackTrace().
-   * @param exc the exception
-   * @return a string array of the traceback information.
-   */
-  public static String[] getStackTrace( Throwable exc )
-  {
-    Vector       lines        = new Vector();
-    StringWriter stringWriter = new StringWriter();
-    PrintWriter  printWriter  = new PrintWriter( stringWriter );
-    
-    exc.printStackTrace( printWriter );
-    
-    try
-    {
-      printWriter.close();
-      stringWriter.close();
-    }
-    catch( Exception nestedExc )
-    {
-      return new String[0];
-    }
-    
-    StringReader stringReader = new StringReader( stringWriter.toString() );
-    BufferedReader reader     = new BufferedReader( stringReader );
-    String         line       = null;
-    
-    try
-    {
-      line = reader.readLine();
-    
-      while( line != null )
-      {
-        lines.add( line.trim() );
-        line = reader.readLine();
-      }
-    }
-    catch( Exception nestedExc )
-    {
-      return new String[0];
-    }
-    
-    return (String[])lines.toArray( new String[0] );
-  }
-  
-  private static final char[] URI_SYMBOLS = {'-', '~', '#', '/', '.'};
-  private static final char UNDERSCORE = '_';
-}
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/WaitForAutoBuildCommand.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/WaitForAutoBuildCommand.java
deleted file mode 100644
index 0d8a1843c..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/WaitForAutoBuildCommand.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.common;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-public class WaitForAutoBuildCommand extends AbstractDataModelOperation
-{
-  public IStatus execute( IProgressMonitor montitor, IAdaptable adaptable ) 
-  {
-  	IStatus status = Status.OK_STATUS;
-  	
-	try 
-	{
-	  Platform.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-	} 
-	catch( InterruptedException exc ) 
-	{
-	  // UISynchronizer.syncExec seems to interrupt the UI tread when the autobuilder is done.  Not sure, why.
-	  // I'm assuming here that the autobuilder has actually completed its stuff.	
-	}
-		
-	return status;
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/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 ff6a2c522..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/ActionDialogPreferenceTypeRegistry.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.command.internal.env.context;
-
-import java.util.Vector;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.command.internal.env.preferences.ActionDialogPreferenceType;
-
-
-public class ActionDialogPreferenceTypeRegistry
-{
-  private Vector preferences_;
-  
-  private static ActionDialogPreferenceTypeRegistry registry_;
-
-  private ActionDialogPreferenceTypeRegistry()
-  {
-    preferences_ = new Vector();
-    
-    loadDialogsPreferences();  
-  }
-  
-  static public ActionDialogPreferenceTypeRegistry getInstance()
-  {
-    if( registry_ == null )
-    {
-      registry_ = new ActionDialogPreferenceTypeRegistry();
-    }
-    
-    return registry_;
-  }
-  
-  //
-  private void loadDialogsPreferences ()
-  {
-  	IExtensionRegistry reg = Platform.getExtensionRegistry();
-    IConfigurationElement[] config = reg.getConfigurationElementsFor( "org.eclipse.wst.command.env",
-                                                                      "actionDialogPreferenceType");
-    
-    for(int idx=0; idx<config.length; idx++) 
-    {
-      IConfigurationElement      elem   = config[idx];     
-      ActionDialogPreferenceType dialog = new ActionDialogPreferenceType();
-      
-      dialog.setId( elem.getAttribute("id") );
-      dialog.setName( elem.getAttribute("name") );
-      dialog.setInfopop( elem.getAttribute("infopop") );
-      dialog.setTooltip( elem.getAttribute("tooltip") );
-      dialog.setCategory( elem.getAttribute("category") );
-      
-      String showCheckbox = elem.getAttribute( "showcheckbox" );
-      String alwaysHide   = elem.getAttribute( "alwayshide" );
-      
-      dialog.setShowCheckbox( showCheckbox == null ? true : showCheckbox.equals( "true" ) );
-      dialog.setAlwaysHide( alwaysHide == null ? false : alwaysHide.equals( "true" ) );
-      
-      preferences_.add(dialog);        
-    }
-  }
-
-  /**
-  * Returns all registered <code>WebServiceType</code> objects.
-  * @return All registered <code>WebServiceType</code> objects.
-  */
-  public ActionDialogPreferenceType[] getActionDialogsPrefrences ()
-  {
-    return (ActionDialogPreferenceType[])preferences_.toArray( new ActionDialogPreferenceType[0]);
-  }
-  
-  public ActionDialogPreferenceType getActionDialogsPrefrence( String id )
-  {
-    int                        length = preferences_.size();
-    ActionDialogPreferenceType result = null;
-    
-    for( int index = 0; index < length; index++ )
-    {
-      ActionDialogPreferenceType preference = (ActionDialogPreferenceType)preferences_.elementAt( index );
-      
-      if( preference.getId().equals( id ) )
-      {
-        result = preference;
-        break;
-      }
-    }
-    
-    return result;
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/PersistentActionDialogsContext.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/PersistentActionDialogsContext.java
deleted file mode 100644
index 2293f8cd4..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/PersistentActionDialogsContext.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.context;
-
-import org.eclipse.wst.command.internal.env.plugin.EnvPlugin;
-import org.eclipse.wst.command.internal.env.preferences.ActionDialogPreferenceType;
-
-
-public class PersistentActionDialogsContext extends PersistentContext
-{
-  private ActionDialogPreferenceTypeRegistry registry;
-  
-  private static PersistentActionDialogsContext instance_ = null;
-
-  private PersistentActionDialogsContext()
-  {
-    super(EnvPlugin.getInstance());
-  }
-  
-  static public PersistentActionDialogsContext getInstance()
-  {
-    if( instance_ == null )
-    {
-      instance_ = new PersistentActionDialogsContext();
-      instance_.load();
-    }
-    
-    return instance_;
-  }
-
-  public void load()
-  {
-    registry = ActionDialogPreferenceTypeRegistry.getInstance();
-    ActionDialogPreferenceType[] dialogs = registry.getActionDialogsPrefrences();
-  
-    for (int i = 0; i < dialogs.length; i++)
-    {
-      setDefault(dialogs[i].getId(), false);
-    }
-  }
-
-  public ActionDialogPreferenceType[] getDialogs()
-  {
-    return registry.getActionDialogsPrefrences();
-  }
-
-  public void setActionDialogEnabled(String id, boolean value)
-  {
-    setValue(id, value);
-  }
-
-  public boolean isActionDialogEnabled(String id)
-  {
-    if (id == null) return true;
-    return getValueAsBoolean(id);
-  }
-  
-  public boolean showDialog( String id )
-  {
-    ActionDialogPreferenceType dialog = registry.getActionDialogsPrefrence( id );    
-   
-    // We are trying to determine if the popup wizard should be displayed
-    // or not with this logic.  If the dialog variable is null then
-    // there was no popup extension point point defined for this wizard.  In
-    // this case we will assume that the popup should always be displayed.
-    // In the case where the extension says that the show check box control
-    // should be displayed we need to ensure that wizard should not always
-    // be hidden, as well we need to check the current setting of the check
-    // box via the isActionDialogEnabled call.  If the show check box state
-    // defined in the extension is false, but always hide is also false then
-    // we will display the pop wizard.
-    return dialog == null ||
-           ( ( dialog.getShowCheckbox() && 
-               !dialog.getAlwaysHide() && 
-               !isActionDialogEnabled( id ) ) ||
-             ( !dialog.getShowCheckbox() && 
-               !dialog.getAlwaysHide() ) );
-  }
-  
-  public boolean showCheckbox( String id )
-  {
-    ActionDialogPreferenceType dialog = registry.getActionDialogsPrefrence( id );    
-    
-    return dialog == null ? false : dialog.getShowCheckbox();
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/PersistentContext.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/PersistentContext.java
deleted file mode 100644
index 5852c9083..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/PersistentContext.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.context;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.wst.command.internal.env.core.context.Context;
-
-/**
- * This class is used as the base class for types that what to persist preference
- * data in the plugin preferences area.
- *
- *
- */
-public abstract class PersistentContext implements Context
-{
- protected Preferences preferences_;
- protected Plugin plugin_;
-
- public PersistentContext ( Plugin plugin)
- 	{
- 		plugin_ = plugin;
- 	  	preferences_ = plugin.getPluginPreferences();
- 	}
-
- /**
-  * Sets the default for a boolean preference.
-  * @param name the preference name.
-  * @param value the preference value.
-  */
- public void setDefault (String name, boolean value) {
- 	preferences_.setDefault(name, value);
- 	}
- 
- /**
-  * Sets the default for a string preference.
-  * @param name the preference name.
-  * @param value the preference value.
-  */
- public void setDefault (String name, String value) {
- 	preferences_.setDefault(name,value);
- 	}
- 
- /**
-  * Sets the default for a int preference.
-  * @param name the preference name.
-  * @param value the preference value.
-  */
- public void setDefault (String name, int value) {
- 	preferences_.setDefault(name,value);
- 	}
- 
- /**
-  * Sets the value for a string preference.
-  * @param name the preference name.
-  * @param value the preference value.
-  */
- public void setValue (String name, String value) {
- 	preferences_.setValue(name,value);
- 	plugin_.savePluginPreferences();
- 	}
- 
- /**
-  * Sets the value for a boolean preference.
-  * @param name the preference name.
-  * @param value the preference value.
-  */
- public void setValue (String name, boolean value) {
- 	preferences_.setValue(name, value);
- 	plugin_.savePluginPreferences();
- 	}
- 
- /**
-  * Sets the value for a int preference.
-  * @param name the preference name.
-  * @param value the preference value.
-  */
- public void setValue (String name, int value) {
- 	preferences_.setValue(name, value);
- 	plugin_.savePluginPreferences();
-	}
-
- /**
-  * Gets the value for a string preference.
-  * @param name the preference name.
-  * @return the preference value.
-  */
- public String getValueAsString ( String name) {
- 	return preferences_.getString(name);
- 	}
- 
- /**
-  * Gets the value for a boolean preference.
-  * @param name the preference name.
-  * @return the preference value.
-  */
-  public boolean getValueAsBoolean ( String name) {
- 	return preferences_.getBoolean(name);
- 	}
-  
-  /**
-   * Gets the value for a int preference.
-   * @param name the preference name.
-   * @return the preference value.
-   */
- public int getValueAsInt( String name) {
- 		return preferences_.getInt(name);
- 	}
- 
- /**
-  * Gets the default value for a string preference.
-  * @param name the preference name.
-  * @return the default preference value.
-  */
- public String getDefaultString(String name)
- {
- 	return preferences_.getDefaultString(name);
- }
- 
- /**
-  * Gets the default value for a boolean preference.
-  * @param name the preference name.
-  * @return the default preference value.
-  */
- public boolean getDefaultBoolean(String name)
- {
- 	return preferences_.getDefaultBoolean(name);
- }
- 
- /**
-  * Gets the default value for a int preference.
-  * @param name the preference name.
-  * @return the default preference value.
-  */
- public int getDefaultInt(String name)
- {
- 	return preferences_.getDefaultInt(name);
- }
- 
- /**
-  * Sets the default value for a string preference if a default value has
-  * not already been set.
-  * @param name the preference name.
-  * @param value the default preference value
-  */
- public void setDefaultStringIfNoDefault( String key, String value )
- {
-   // If the key already has a default value we don't want to override it.
-   if( preferences_.getDefaultString( key ).equals("") ) 
-   {
-     preferences_.setDefault( key, value );
-   }
- }
- 
- /**
-  * Sets the default value for a boolean preference if a default value has
-  * not already been set.
-  * @param name the preference name.
-  * @param value the default preference value
-  */
- public void setDefaultBooleanIfNoDefault( String key, boolean value )
- {
-   // If the key already has a default value we don't want to override it.
-   if( preferences_.getDefaultString( key ).equals("") ) 
-   {
-     preferences_.setDefault( key, value );
-   }
- }
- 
- /**
-  * Sets the default value for a int preference if a default value has
-  * not already been set.
-  * @param name the preference name.
-  * @param value the default preference value
-  */
- public void setDefaultIntIfNoDefault( String key, int value )
- {
-   // If the key already has a default value we don't want to override it.
-   if( preferences_.getDefaultString( key ).equals("") ) 
-   {
-     preferences_.setDefault( key, value );
-   }
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/PersistentResourceContext.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/PersistentResourceContext.java
deleted file mode 100644
index a0675c409..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/PersistentResourceContext.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.context;
-
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.env.core.context.ResourceDefaults;
-import org.eclipse.wst.command.internal.env.core.context.TransientResourceContext;
-import org.eclipse.wst.command.internal.env.plugin.EnvPlugin;
-
-
-public class PersistentResourceContext extends PersistentContext implements ResourceContext
-{
-  private static PersistentResourceContext context_ = null;
-  
-  public static PersistentResourceContext getInstance()
-  {
-    if( context_ == null )
-    {
-      context_ = new PersistentResourceContext();
-      context_.load();
-    }
-    
-    return context_;
-  }
-  
-  private PersistentResourceContext()
-  {
-    super(EnvPlugin.getInstance());
-  }
-
-  public void load()
-  {
-    setDefault(PREFERENCE_OVERWRITE, ResourceDefaults
-        .getOverwriteFilesDefault());
-    setDefault(PREFERENCE_CREATE_FOLDERS, ResourceDefaults
-        .getCreateFoldersDefault());
-    setDefault(PREFERENCE_CHECKOUT, ResourceDefaults.getCheckoutFilesDefault());
-  }
-
-  public void setOverwriteFilesEnabled(boolean enable)
-  {
-    setValue(PREFERENCE_OVERWRITE, enable);
-  }
-
-  public boolean isOverwriteFilesEnabled()
-  {
-    return getValueAsBoolean(PREFERENCE_OVERWRITE);
-  }
-
-  public void setCreateFoldersEnabled(boolean enable)
-  {
-    setValue(PREFERENCE_CREATE_FOLDERS, enable);
-  }
-
-  public boolean isCreateFoldersEnabled()
-  {
-    return getValueAsBoolean(PREFERENCE_CREATE_FOLDERS);
-  }
-
-  public void setCheckoutFilesEnabled(boolean enable)
-  {
-    setValue(PREFERENCE_CHECKOUT, enable);
-  }
-
-  public boolean isCheckoutFilesEnabled()
-  {
-    return getValueAsBoolean(PREFERENCE_CHECKOUT);
-  }
-
-  public ResourceContext copy()
-  {
-    ResourceContext cc = new TransientResourceContext();
-    cc.setOverwriteFilesEnabled(isOverwriteFilesEnabled());
-    cc.setCreateFoldersEnabled(isCreateFoldersEnabled());
-    cc.setCheckoutFilesEnabled(isCheckoutFilesEnabled());
-    return cc;
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/eclipse/BaseEclipseEnvironment.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/eclipse/BaseEclipseEnvironment.java
deleted file mode 100644
index 4f59f6ca6..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/eclipse/BaseEclipseEnvironment.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.eclipse;
-
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.common.environment.IEnvironment;
-
-
-/**
- * This interface adds resources to the base IEnvironment.
- */
-public interface BaseEclipseEnvironment extends IEnvironment 
-{
-  /**
-   * 
-   * @return returns a ResourceContext object for this environment.
-   */	
-  public ResourceContext getResourceContext();
-}
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/eclipse/EclipseEnvironment.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/eclipse/EclipseEnvironment.java
deleted file mode 100644
index 20766b93c..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/eclipse/EclipseEnvironment.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.wst.command.internal.env.eclipse;
-
-import org.eclipse.wst.command.internal.env.core.CommandManager;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.common.environment.EnvironmentService;
-import org.eclipse.wst.common.environment.ILog;
-import org.eclipse.wst.common.environment.IStatusHandler;
-import org.eclipse.wst.common.environment.uri.SimpleURIFactory;
-import org.eclipse.wst.common.environment.uri.IURIFactory;
-import org.eclipse.wst.common.environment.uri.IURIScheme;
-
-
-/**
- * This class implements an IEnvironment class for the Eclipse IEnvironment.
- * This IEnvironment currently supports the "platform" protocol and the "file"
- * protocol.
- *
- */
-public class EclipseEnvironment implements BaseEclipseEnvironment
-{
-  private CommandManager   commandManager_  = null;
-  private SimpleURIFactory uriFactory_      = null;
-  private ResourceContext  resourceContext_ = null;
-  private IStatusHandler    statusHandler_   = null;
-  private ILog              logger_          = null;
-  
-  public EclipseEnvironment( CommandManager  commandManager, 
- 		                         ResourceContext resourceContext,
-						                 IStatusHandler   statusHandler )
-  {
-    IURIScheme eclipseScheme = EnvironmentService.getEclipseScheme();
-    IURIScheme fileScheme    = EnvironmentService.getFileScheme();
-    
-    commandManager_  = commandManager;
-    resourceContext_ = resourceContext;
-    uriFactory_      = new SimpleURIFactory();
-    statusHandler_   = statusHandler;
-    
-    uriFactory_.registerScheme( "platform", eclipseScheme );
-    uriFactory_.registerScheme( "file", fileScheme );
-  }
-  
-  /**
-   * @see org.eclipse.wst.command.internal.env.core.common.IEnvironment#getCommandManager()
-   */
-  public CommandManager getCommandManager()
-  {
-    return commandManager_;
-  }
-
-  /**
-   * @see org.eclipse.wst.command.internal.env.core.common.IEnvironment#getLog()
-   */
-  public ILog getLog()
-  {
-	  if( logger_ == null )
-    {  
-      logger_ = EnvironmentService.getEclipseLog(); 
-    };
-	
-    return logger_;
-  }
-
-  /**
-   * 
-   * @param logger the new logger for this environment.
-   */
-  public void setLog( ILog logger )
-  {
-	logger_ = logger;  
-  }
-   
-  /**
-   * @see org.eclipse.wst.command.internal.env.core.common.IEnvironment#getStatusHandler()
-   */
-  public IStatusHandler getStatusHandler()
-  {
-    return statusHandler_;
-  }
-
-  /** (non-Javadoc)
-   * @see org.eclipse.wst.command.internal.env.core.common.IEnvironment#getURIFactory()
-   */
-  public IURIFactory getURIFactory()
-  {
-    return uriFactory_;
-  }
-
-  /**
-   * @return returns a ResourceContext for this IEnvironment.
-   */
-  public ResourceContext getResourceContext()
-  {
-    return resourceContext_;
-  }
-  
-  public void setCommandManager( CommandManager manager )
-  {
-	commandManager_ = manager;  
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/eclipse/EnvironmentManager.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/eclipse/EnvironmentManager.java
deleted file mode 100644
index ed691d68a..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/eclipse/EnvironmentManager.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.command.internal.env.eclipse;
-
-import org.eclipse.wst.command.internal.env.context.PersistentResourceContext;
-import org.eclipse.wst.common.environment.IStatusHandler;
-import org.eclipse.wst.common.environment.NullStatusHandler;
-
-public class EnvironmentManager
-{
-  /**
-   * Returns a new instance of an IEnvironment for the Eclipse non-GUI.
-   */
-  public static BaseEclipseEnvironment getNewEnvironment()
-  {
-    PersistentResourceContext context        = PersistentResourceContext.getInstance();
-    IStatusHandler            handler        = new NullStatusHandler();
-    EclipseEnvironment        environment    = new EclipseEnvironment( null, context, handler );
-    
-    return environment;  
-  }
-}
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 cb8f4abd1..000000000
--- 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 d1a551e53..000000000
--- 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.explorer/.classpath b/bundles/org.eclipse.wst.ws.explorer/.classpath
deleted file mode 100644
index 91e409660..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="wsexplorer-properties"/>
-	<classpathentry kind="src" path="wsexplorer-src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.wst.ws.explorer/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/.cvsignore
deleted file mode 100644
index 7b4a75f64..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-bin
-build
-webapps
-temp.folder
-build.xml
-*.jar
-*.war
-explorersrc.zip
diff --git a/bundles/org.eclipse.wst.ws.explorer/.project b/bundles/org.eclipse.wst.ws.explorer/.project
deleted file mode 100644
index 9621998fa..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.ws.explorer</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.explorer/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.wst.ws.explorer/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 707faaa73..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,67 +0,0 @@
-#Mon Jan 30 10:38:01 EST 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/bundles/org.eclipse.wst.ws.explorer/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.wst.ws.explorer/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 1300f7816..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Jun 03 00:32:02 EDT 2005
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/bundles/org.eclipse.wst.ws.explorer/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.wst.ws.explorer/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 5c1e93a91..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Jan 30 10:40:04 EST 2006
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.wst.ws.explorer/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.ws.explorer/META-INF/MANIFEST.MF
deleted file mode 100644
index 3aab59c17..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,71 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.wst.ws.explorer; singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-ClassPath: explorer.jar,
- wsexplorer-properties.jar
-Bundle-Activator: org.eclipse.wst.ws.internal.explorer.plugin.ExplorerPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.ws.internal.explorer,
- org.eclipse.wst.ws.internal.explorer.favorites,
- org.eclipse.wst.ws.internal.explorer.platform.actions,
- org.eclipse.wst.ws.internal.explorer.platform.constants,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel,
- org.eclipse.wst.ws.internal.explorer.platform.engine,
- org.eclipse.wst.ws.internal.explorer.platform.engine.constants,
- org.eclipse.wst.ws.internal.explorer.platform.engine.data,
- org.eclipse.wst.ws.internal.explorer.platform.engine.transformer,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.actions,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective,
- org.eclipse.wst.ws.internal.explorer.platform.perspective,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.actions,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.util,
- org.eclipse.wst.ws.internal.explorer.platform.util,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.transformer,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.transport,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.util,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.actions,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.constants,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer,
- org.eclipse.wst.ws.internal.explorer.plugin,
- org.eclipse.wst.ws.internal.explorer.popup
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.tomcat,
- org.eclipse.help.appserver,
- org.eclipse.ui,
- org.eclipse.emf.common,
- org.eclipse.emf.ecore,
- org.eclipse.xsd,
- org.eclipse.wst.command.env,
- org.eclipse.wst.command.env.core,
- org.eclipse.wst.command.env.ui,
- org.eclipse.wst.ws,
- org.eclipse.wst.ws.parser,
- org.eclipse.wst.wsdl,
- org.wsdl4j,
- org.apache.wsil4j,
- org.uddi4j,
- org.apache.axis,
- org.eclipse.wst.common.frameworks,
- org.eclipse.wst.common.frameworks.ui,
- org.eclipse.wst.common.environment,
- org.eclipse.wst.common.uriresolver
-Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.wst.ws.explorer/about.html b/bundles/org.eclipse.wst.ws.explorer/about.html
deleted file mode 100644
index 6f6b96c4c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/build-war-pde.xml b/bundles/org.eclipse.wst.ws.explorer/build-war-pde.xml
deleted file mode 100644
index 0c4ca146d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/build-war-pde.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.wst.ws.explorer" default="build.wars" basedir=".">
-
-	<!--
-	This script builds wsexplorer.war within the PDE.
-	Instructions for use:
-	1. If you have a prior build of wsexplorer.war in your workspace,
-	   you should first:
-	   a. Replace wsexplorer/WEB-INF/web.xml from HEAD
-	   b. Delete wsexplorer/WEB-INF/lib/wsexplorer.jar
-	   c. Delete wsexplorer.war
-       d. Delete wsexplorer/**/*.java
-	   e. Delete wsexplorer/**/*.class
-	   f. Refresh the project.
-	   TODO: Update this script's "clean" rules to do this stuff automagically.
-	2. Generate and run build.xml to create
-	   wsexplorer/WEB-INF/lib/wsexplorer.jar:
-	   a. plugin.xml -> PDE Tools -> Create Ant Build File
-	   b. build.xml -> Run As -> Ant Build
-	   c. Refresh the project.
-	3. Run build-war-pde.xml to create the WAR:
-	   a. build-war-pde.xml -> Run As -> Ant Build...
-	      to open the "Modify attributes and launch" dialog.
-	   b. Click on the "Properties" tab.
-	   c. Deselect "Use global properties...".
-	   d. Add the following two properties:
-	      baseLocation = the absolute path to your target platform's "eclipse" directory.
-	      buildDirectory = the absolute path to your workspace directory.
-	   e. Click on "Run" to run the script.
-	   f. Refresh the project when the build is done.
-	-->
-	
-	<property name="wsexplorerDir" value="${buildDirectory}/org.eclipse.wst.ws.explorer/wsexplorer"/>
-
-	<target name="jspcompile" unless="wsexplorer.war" description="Pre-compile the JSPs in the org.eclipse.wst.ws.explorer plugin">
-		<java classname="org.apache.jasper.JspC" fork="true">
-			<arg line="-webxml ${wsexplorerDir}/WEB-INF/web.xml -d ${wsexplorerDir} -webapp ${wsexplorerDir}"/>
-			<classpath>
-				<fileset dir="${baseLocation}/plugins">
-					<include name="org.eclipse.tomcat*/*.jar" />
-				</fileset>
-				<fileset dir="${baseLocation}/plugins">
-					<include name="org.apache.ant*/lib/*.jar" />
-				</fileset>
-			</classpath>
-		</java>
-		<javac destdir="${wsexplorerDir}/WEB-INF/classes" includeAntRuntime="false">
-			<src path="${wsexplorerDir}"/>
-			<classpath>
-				<dirset dir="${buildDirectory}">
-					<include name="*/@dot" />
-				</dirset>
-				<fileset dir="${buildDirectory}">
-					<include name="**/*.jar" /> 
-				</fileset>
-				<fileset dir="${baseLocation}/plugins">
-					<include name="**/*.jar" /> 
-				</fileset>
-			</classpath>
-		</javac>
-	</target>
-
-	<target name="wsexplorer.war" unless="wsexplorer.war" description="Create war: wsexplorer.war.">
-		<zip
-			basedir="${wsexplorerDir}"
-			destfile="${wsexplorerDir}/../wsexplorer.war"
-			whenempty="skip" update="false"
-			excludes="**/*.java **/*.jsp **/*.inc"
-		/>
-	</target>	
-	
-	<target name="build.wars" description="Build all the wars for the plug-in: org.eclipse.wst.ws.explorer.">
-		<available property="wsexplorer.war" file="${wsexplorerDir}/../wsexplorer.war"/>
-		<antcall target="jspcompile"/>
-		<antcall target="wsexplorer.war"/>
-	</target>
-
-	<target name="clean.wars" description="Clean all the wars for the plug-in: org.eclipse.wst.ws.explorer.">
-		<delete file="wsexplorer.war"/>
-	</target>
-</project>
diff --git a/bundles/org.eclipse.wst.ws.explorer/build-war.xml b/bundles/org.eclipse.wst.ws.explorer/build-war.xml
deleted file mode 100644
index 37aba57e3..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/build-war.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.wst.ws.explorer" default="build.wars" basedir=".">
-
-	<property name="wsexplorerDir" value="${buildDirectory}/plugins/org.eclipse.wst.ws.explorer/wsexplorer"/>
-
-	<target name="jspcompile" unless="wsexplorer.war" description="Pre-compile the JSPs in the org.eclipse.wst.ws.explorer plugin">
-		<java classname="org.apache.jasper.JspC" fork="true">
-			<arg line="-webxml ${wsexplorerDir}/WEB-INF/web.xml -d ${wsexplorerDir} -webapp ${wsexplorerDir}"/>
-			<classpath>
-				<fileset dir="${baseLocation}/plugins">
-					<include name="org.eclipse.tomcat*/*.jar" />
-				</fileset>
-				<fileset dir="${baseLocation}/plugins">
-					<include name="org.apache.ant*/lib/*.jar" />
-				</fileset>
-			</classpath>
-		</java>
-		<javac destdir="${wsexplorerDir}/WEB-INF/classes" includeAntRuntime="false" failonerror="false">
-			<src path="${wsexplorerDir}"/>
-			<classpath>
-				<fileset dir="${buildDirectory}/plugins">
-					<include name="**/*.jar" />
-				</fileset>
-				<fileset dir="${buildDirectory}/plugins">
-					<include name="*.jar" />
-				</fileset>
-				<dirset dir="${buildDirectory}/plugins">
-					<include name="**/@dot"/>
-				</dirset>
-				<fileset dir="${baseLocation}/plugins">
-					<include name="**/*.jar" />
-				</fileset>
-				<fileset dir="${baseLocation}/plugins">
-					<include name="*.jar" />
-				</fileset>
-			</classpath>
-		</javac>
-	</target>
-
-	<target name="wsexplorer.war" unless="wsexplorer.war" description="Create war: wsexplorer.war.">
-		<zip
-			basedir="${wsexplorerDir}"
-			destfile="${wsexplorerDir}/../wsexplorer.war"
-			whenempty="skip" update="false"
-			excludes="**/*.java **/*.jsp **/*.inc"
-		/>
-	</target>	
-	
-	<target name="build.wars" description="Build all the wars for the plug-in: org.eclipse.wst.ws.explorer.">
-		<available property="wsexplorer.war" file="${wsexplorerDir}/../wsexplorer.war"/>
-		<antcall target="jspcompile"/>
-		<antcall target="wsexplorer.war"/>
-	</target>
-
-	<target name="clean.wars" description="Clean all the wars for the plug-in: org.eclipse.wst.ws.explorer.">
-		<delete file="wsexplorer.war"/>
-	</target>
-
-</project>
diff --git a/bundles/org.eclipse.wst.ws.explorer/build.properties b/bundles/org.eclipse.wst.ws.explorer/build.properties
deleted file mode 100644
index cfff00102..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/build.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-source.explorer.jar = src/
-source.wsexplorer/WEB-INF/lib/wsexplorer.jar = wsexplorer-src/
-jars.compile.order = explorer.jar,\
-                     wsexplorer/WEB-INF/lib/wsexplorer.jar,\
-                     wsexplorer-properties.jar
-output.wsexplorer/WEB-INF/lib/wsexplorer.jar = bin/
-bin.includes = plugin.xml,\
-               *.jar,\
-               explorer.jar,\
-               plugin.properties,\
-               properties/,\
-               webapps/,\
-               wsexplorer.war,\
-               META-INF/,\
-               about.html,\
-               wsexplorer-properties.jar
-src.includes = wsexplorer/**/*.zip,\
-               wsexplorer/**/*.jsp,\
-               wsexplorer/**/*.inc
-
-custom = false
-source.wsexplorer-properties.jar = wsexplorer-properties/
diff --git a/bundles/org.eclipse.wst.ws.explorer/plugin.properties b/bundles/org.eclipse.wst.ws.explorer/plugin.properties
deleted file mode 100644
index 5ec01b2e5..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/plugin.properties
+++ /dev/null
@@ -1,35 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Web Services Explorer
-PLUGIN_PROVIDER=Eclipse.org
-
-#
-# Messages for the client type extension
-#
-WEBSERVICECLIENTTYPE_NAME_WSEXPLORER=Stubless (Web Services Explorer)
-TASK_LABEL_EXPLORE_WSDL_USING_WSE=Explorer WSDL using Web Services Explorer.
-
-#
-# Messages for the WSExplorer type extension
-#
-MSG_ERROR_LAUNCH_WSEXPLORER=IWAB0366E Unable to launch Web Services Explorer.
-MSG_ERROR_LOAD_LAUNCH_OPTIONS=IWAB0367E Unable to load launch options.
-MSG_BROKEN_VM_DOES_NOT_SUPPORT_UTF-8=Broken VM does not support UTF-8.
-
-#
-# Messages for popup action (Test with Web Services Explorer)
-#
-POPUP_TEST_WSDL=Test with Web Services Explorer
-
diff --git a/bundles/org.eclipse.wst.ws.explorer/plugin.xml b/bundles/org.eclipse.wst.ws.explorer/plugin.xml
deleted file mode 100644
index 50dc1e806..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/plugin.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
-    
-<!-- ================================================================= -->
-<!-- Extension point: Eclipse Popup Action (org.eclipse.ui.popupMenus) -->
-<!-- ================================================================= -->
-   <extension
-         point="org.eclipse.ui.popupMenus">
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="*.wsdl"
-            id="org.eclipse.jst.ws.internal.consumption.ui.action.WSDLFileMenu">
-         <action
-               label="%POPUP_TEST_WSDL"
-               class="org.eclipse.wst.ws.internal.explorer.popup.PopupTestWSDL"
-               menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu/popupActions"
-               id="org.eclipse.wst.ws.internal.explorer.popup.PopupTestWSDL">
-         </action>
-      </objectContribution>
-      <objectContribution
-            objectClass="org.eclipse.wst.wsdl.util.WSDLResourceImpl"
-            nameFilter="*"
-            id="org.eclipse.jst.ws.internal.consumption.ui.action.WSDLFileMenu">
-         <action
-               label="%POPUP_TEST_WSDL"
-               class="org.eclipse.wst.ws.internal.explorer.popup.PopupTestWSDL"
-               menubarPath="additions"
-               id="org.eclipse.wst.ws.internal.explorer.popup.PopupTestWSDL">
-         </action>
-      </objectContribution>
-      <objectContribution
-            objectClass="org.eclipse.wst.wsdl.Service"
-            nameFilter="*"
-            id="org.eclipse.jst.ws.internal.consumption.ui.action.WSDLFileMenu">
-         <action
-               label="%POPUP_TEST_WSDL"
-               class="org.eclipse.wst.ws.internal.explorer.popup.PopupTestWSDL"
-               menubarPath="additions"
-               id="org.eclipse.wst.ws.internal.explorer.popup.PopupTestWSDL">
-         </action>
-      </objectContribution>
-   </extension>
-
-</plugin>
diff --git a/bundles/org.eclipse.wst.ws.explorer/properties/favorites_default.wsil b/bundles/org.eclipse.wst.ws.explorer/properties/favorites_default.wsil
deleted file mode 100644
index 10658f4bc..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/properties/favorites_default.wsil
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inspection xmlns="http://schemas.xmlsoap.org/ws/2001/10/inspection/"
-  xmlns:wsilwsdl="http://schemas.xmlsoap.org/ws/2001/10/inspection/wsdl/"
-  xmlns:wsiluddi="http://schemas.xmlsoap.org/ws/2001/10/inspection/uddi/"
-  xmlns:uddi="urn:uddi-org:api">
-  <abstract xml:lang="en-US">v5_0_1_0</abstract>
-
-  <link referencedNamespace="urn:uddi-org:api">
-    <abstract xml:lang="en-US">%PUBLICUDDIREGISTRYTYPE_NAME_IBM_TEST</abstract>
-    <abstract xml:lang="en-US">http://uddi.ibm.com/testregistry/inquiryapi</abstract>
-    <abstract xml:lang="en-US">https://uddi.ibm.com/testregistry/publishapi</abstract>
-    <abstract xml:lang="en-US">http://uddi.ibm.com/testregistry/registry.html</abstract>
-  </link>
-
-  <link referencedNamespace="urn:uddi-org:api">
-    <abstract xml:lang="en-US">%PUBLICUDDIREGISTRYTYPE_NAME_IBM</abstract>
-    <abstract xml:lang="en-US">http://uddi.ibm.com/ubr/inquiryapi</abstract>
-    <abstract xml:lang="en-US">https://uddi.ibm.com/ubr/publishapi</abstract>
-    <abstract xml:lang="en-US">http://uddi.ibm.com/ubr/registry.html</abstract>
-  </link>
-
-  <link referencedNamespace="urn:uddi-org:api">
-    <abstract xml:lang="en-US">%PUBLICUDDIREGISTRYTYPE_NAME_MICROSOFT_TEST</abstract>
-    <abstract xml:lang="en-US">http://test.uddi.microsoft.com/inquire</abstract>
-    <abstract xml:lang="en-US">https://test.uddi.microsoft.com/publish</abstract>
-    <abstract xml:lang="en-US">https://test.uddi.microsoft.com/register.aspx</abstract>
-  </link>
-
-  <link referencedNamespace="urn:uddi-org:api">
-    <abstract xml:lang="en-US">%PUBLICUDDIREGISTRYTYPE_NAME_MICROSOFT</abstract>
-    <abstract xml:lang="en-US">http://uddi.microsoft.com/inquire</abstract>
-    <abstract xml:lang="en-US">https://uddi.microsoft.com/publish</abstract>
-    <abstract xml:lang="en-US">https://uddi.microsoft.com/register.aspx</abstract>
-  </link>
-
-  <link referencedNamespace="urn:uddi-org:api">
-    <abstract xml:lang="en-US">%PUBLICUDDIREGISTRYTYPE_NAME_SAP_TEST</abstract>
-    <abstract xml:lang="en-US">http://udditest.sap.com/UDDI/api/inquiry/</abstract>
-    <abstract xml:lang="en-US">https://udditest.sap.com/UDDI/api/publish/</abstract>
-    <abstract xml:lang="en-US">http://udditest.sap.com/</abstract>
-  </link>
-
-  <link referencedNamespace="urn:uddi-org:api">
-    <abstract xml:lang="en-US">%PUBLICUDDIREGISTRYTYPE_NAME_SAP</abstract>
-    <abstract xml:lang="en-US">http://uddi.sap.com/UDDI/api/inquiry/</abstract>
-    <abstract xml:lang="en-US">https://uddi.sap.com/UDDI/api/publish/</abstract>
-    <abstract xml:lang="en-US">http://uddi.sap.com/</abstract>
-  </link>
-
-  <link referencedNamespace="urn:uddi-org:api">
-    <abstract xml:lang="en-US">%PUBLICUDDIREGISTRYTYPE_NAME_XMETHODS</abstract>
-    <abstract xml:lang="en-US">http://uddi.xmethods.net/inquire</abstract>
-    <abstract xml:lang="en-US">https://uddi.xmethods.net/publish</abstract>
-    <abstract xml:lang="en-US">http://www.xmethods.net/ve2/Register.po?event=registerOrg</abstract>
-  </link>
-
-  <link referencedNamespace="urn:uddi-org:api">
-    <abstract xml:lang="en-US">%PUBLICUDDIREGISTRYTYPE_NAME_NTTCOMM</abstract>
-    <abstract xml:lang="en-US">http://www.uddi.ne.jp/registry/inquiryapi</abstract>
-    <abstract xml:lang="en-US">https://www.uddi.ne.jp/registry/publishapi</abstract>
-    <abstract xml:lang="en-US">http://www.uddi.ne.jp/registry/registry.html</abstract>
-  </link>
-
-  <link referencedNamespace="http://schemas.xmlsoap.org/ws/2001/10/inspection/" location="http://www.xmethods.com/inspection.wsil"/>
-</inspection>
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/CatalinaRunnable.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/CatalinaRunnable.java
deleted file mode 100644
index 19ba1f16f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/CatalinaRunnable.java
+++ /dev/null
@@ -1,59 +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.wst.ws.internal.explorer;
-
-import org.eclipse.core.runtime.Path;
-import org.eclipse.help.internal.appserver.AppserverPlugin;
-import org.eclipse.help.internal.appserver.WebappManager;
-
-public class CatalinaRunnable {
-
-	private static CatalinaRunnable catalinaRunnable_;
-
-	private CatalinaRunnable() {
-	}
-
-	public static CatalinaRunnable getCatalinaRunnable() {
-		if (catalinaRunnable_ == null) {
-			catalinaRunnable_ = new CatalinaRunnable();
-			catalinaRunnable_.init();
-		}
-		return catalinaRunnable_;
-	}
-
-	public boolean isTomcatStarted() {
-		try {
-			return AppserverPlugin.getDefault().getAppServer().isRunning();
-		} catch (Throwable t) {
-			return false;
-		}
-	}
-
-	public int getTomcatPort() {
-		return WebappManager.getPort();
-	}
-
-	private void init() {
-		WSExplorer wsExplorer = WSExplorer.getInstance();
-		String ctxt = wsExplorer.getContextName();
-		String pluginID = wsExplorer.getParentPluginID();
-		String warLocation = wsExplorer.getWARLocation();
-		String webappLocation = wsExplorer.getWebAppLocation();
-		try {
-			if (warLocation != null)
-				WebappManager.start(ctxt, pluginID, new Path(warLocation));
-			else
-				WebappManager.start(ctxt, pluginID, new Path(webappLocation));
-		} catch (Throwable t) {
-		}
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/LaunchOption.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/LaunchOption.java
deleted file mode 100644
index 3666ede76..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/LaunchOption.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 Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer;
-
-/**
- * @author cbrealey@ca.ibm.com
- * 
- * This simple class is used to hold a single Web Services
- * Explorer launch option property and its value. Allowed
- * launch option properties are defined by
- * <code>{@link LaunchOptions}</code>.
- */
-public class LaunchOption {
-	private String key_;
-
-	private String option_;
-
-	/*
-	 * Constructs a new launch option with the given
-	 * property name and value. 
-	 */
-	public LaunchOption(String key, String option) {
-		key_ = key;
-		option_ = option;
-	}
-
-	/**
-	 * Returns the property name of this launch option.
-	 * @return The property name.
-	 */
-	public String getKey() {
-		return key_;
-	}
-
-	/**
-	 * Returns the property value of this launch option.
-	 * @return The property value.
-	 */
-	public String getOption() {
-		return option_;
-	}
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/LaunchOptions.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/LaunchOptions.java
deleted file mode 100644
index 392f03b11..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/LaunchOptions.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 Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer;
-
-/**
- * @author cbrealey@ca.ibm.com
- * 
- * This class defines the property names understood by the Web Services Explorer
- * and used to configure it's initial appearance and behaviour at the time it is
- * launched.
- * @see LaunchOption
- */
-public class LaunchOptions {
-	// General purpose preload constants
-	
-	public static final String STATE_LOCATION = "stateLocation";
-	
-	public static final String DEFAULT_FAVORITES_LOCATION = "defaultFavoritesLocation";
-	
-	// WSDL Page preload constants
-
-	public static final String WSDL_URL = "wsdl";
-
-	public static final String WEB_SERVICE_ENDPOINT = "webServiceEndpoint";
-
-	public static final String SERVICE_QNAME_STRING = "serviceQNameString";
-
-	public static final String BINDING_NAME_STRING = "bindingNameString";
-
-	// UDDI Page preload constants
-
-	public static final String INQUIRY_URL = "inquiry";
-
-	public static final String PUBLISH_URL = "publish";
-
-	public static final String SERVICE_NAME = "serviceName";
-
-	public static final String SERVICE_KEY = "serviceKey";
-
-	public static final String CATEGORIES_DIRECTORY = "categoriesDirectory";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/LaunchWizardRunnable.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/LaunchWizardRunnable.java
deleted file mode 100644
index 6375d5312..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/LaunchWizardRunnable.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.wst.ws.internal.explorer;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard;
-
-public class LaunchWizardRunnable extends Thread implements Runnable {
-	private String id;
-
-	private String wsdlURL;
-
-	private boolean finish;
-
-	public LaunchWizardRunnable(String id, String wsdlURL) {
-		this.id = id;
-		this.wsdlURL = (wsdlURL != null) ? wsdlURL : "";
-		finish = false;
-	}
-
-	public boolean isFinish() {
-		return finish;
-	}
-
-	public void run() {
-		try {
-			DynamicWizard wizard = new DynamicWizard();
-			wizard.setInitialData(id);
-			IStructuredSelection sel = new StructuredSelection(wsdlURL);
-			wizard.init(null, sel);
-			WizardDialog wd = new WizardDialog(new Shell(Display.getDefault(),
-					SWT.APPLICATION_MODAL), wizard);
-			wd.open();
-		} catch (Exception e) {
-		} finally {
-			finish = true;
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/LaunchWizardTask.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/LaunchWizardTask.java
deleted file mode 100644
index f5329e2f4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/LaunchWizardTask.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.ws.internal.explorer;
-
-import org.eclipse.swt.SWTException;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-
-public class LaunchWizardTask {
-	// singleton
-	private static LaunchWizardTask task_;
-
-	// the shell for the wizard to be launched
-	private Shell shell_;
-
-	// the LaunchWizardRunnable that is currently running
-	private LaunchWizardRunnable runnable_;
-
-	private LaunchWizardTask(Shell shell) {
-		shell_ = shell;
-		runnable_ = null;
-	}
-
-	public static LaunchWizardTask getInstance() {
-		if (task_ == null)
-			task_ = new LaunchWizardTask(PlatformUI.getWorkbench()
-					.getActiveWorkbenchWindow().getShell());
-		return task_;
-	}
-
-	public void asyncExec(Runnable runnable) throws SWTException {
-		shell_.getDisplay().asyncExec(runnable);
-	}
-
-	public boolean checkAndAsyncExec(LaunchWizardRunnable runnable) {
-		try {
-			if (!getIsExecuting()) {
-				asyncExec(runnable);
-				runnable_ = runnable;
-				return true;
-			} else
-				return false;
-		} catch (Exception e) {
-			return false;
-		}
-	}
-
-	public boolean getIsExecuting() {
-		if (runnable_ != null) {
-			boolean isFinish = runnable_.isFinish();
-			if (isFinish)
-				runnable_ = null;
-			return !isFinish;
-		} else
-			return false;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WSExplorer.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WSExplorer.java
deleted file mode 100644
index b12fd54b4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WSExplorer.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer;
-
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLEncoder;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.browser.IWebBrowser;
-import org.eclipse.ui.browser.IWorkbenchBrowserSupport;
-import org.eclipse.wst.ws.internal.explorer.plugin.ExplorerPlugin;
-
-public class WSExplorer {
-	private static WSExplorer instance;
-
-	private static int launchOptionsKey_ = 0;
-
-	public WSExplorer() {
-	}
-
-	public static WSExplorer getInstance() {
-		if (instance == null) {
-			instance = new WSExplorer();
-		}
-		return instance;
-	}
-
-	public String getContextName() {
-		return "wsexplorer";
-	}
-
-	public String getParentPluginID() {
-		return ExplorerPlugin.ID;
-	}
-
-	public String getWARLocation() {
-		return "wsexplorer.war";
-	}
-
-	public String getWebAppLocation() {
-		return "wsexplorer";
-	}
-
-	public String getWelcomeURL() {
-		return "wsexplorer.jsp";
-	}
-
-	public String getLaunchOptionRegistryURL() {
-		return "launch_options_registry.jsp";
-	}
-
-	public String getBaseURL() {
-		StringBuffer sb = new StringBuffer();
-		sb.append("http://localhost:");
-		sb.append(CatalinaRunnable.getCatalinaRunnable().getTomcatPort());
-		sb.append("/");
-		sb.append(getContextName());
-		sb.append("/");
-		return sb.toString();
-	}
-
-	public String getMetadataDirectory() {
-		// <workspace>/.metadata/.plugins/org.eclipse.wst.ws.explorer/ (note
-		// the trailing separator).
-		return ExplorerPlugin.getInstance().getPluginStateLocation();
-	}
-
-	public IStatus launch(IWorkbench wb, IStructuredSelection sel,
-		LaunchOption[] options, boolean forceLaunchOutsideIDE) {
-		// launchOptionKey
-		int launchOptionKey = getLaunchOptionsKey();
-		// Web Services Explorer URL
-		StringBuffer sb = new StringBuffer();
-		sb.append(getBaseURL());
-		sb.append(getWelcomeURL());
-		sb.append("?");
-		if (options != null && options.length > 0) {
-			String encodedID = null;
-			try {
-				encodedID = URLEncoder.encode(ExplorerPlugin.ID,
-						ExplorerPlugin.CHARSET);
-			} catch (UnsupportedEncodingException e) {
-				return new Status(
-						IStatus.ERROR,
-						ExplorerPlugin.ID,
-						0,
-						ExplorerPlugin
-								.getMessage("%MSG_BROKEN_VM_DOES_NOT_SUPPORT_UTF-8"),
-						e);
-			}
-			sb.append(encodedID);
-			sb.append("=");
-			sb.append(launchOptionKey);
-		}
-		// launch Web Services Explorer
-		try {
-			URL url = new URL(sb.toString());
-			if (forceLaunchOutsideIDE) {
-				if (System.getProperty("os.name").toLowerCase().indexOf("win") == -1)
-					Runtime.getRuntime()
-							.exec("mozilla " + url.toExternalForm());
-				else
-					Runtime.getRuntime().exec(
-							"cmd /C start iexplore " + url.toExternalForm());
-			} else {
-				// browserId
-				StringBuffer browserId = new StringBuffer();
-				browserId.append(ExplorerPlugin.ID);
-				browserId.append(getContextName());
-				
-				IWorkbenchBrowserSupport browserSupport = ExplorerPlugin.getInstance().getWorkbench().getBrowserSupport();
-				IWebBrowser browser = browserSupport.createBrowser(browserId.toString());
-				browser.openURL(url);
-			}
-		} catch (Exception e) {
-			return new Status(IStatus.ERROR, ExplorerPlugin.ID, 0,
-					ExplorerPlugin.getMessage("%MSG_ERROR_LAUNCH_WSEXPLORER"),
-					e);
-		}
-		// register launch options
-		if (options != null && options.length > 0) {
-			try {
-				StringBuffer launchOptionsRegURL = new StringBuffer();
-				launchOptionsRegURL.append(getBaseURL());
-				launchOptionsRegURL.append(getLaunchOptionRegistryURL());
-				URL url = new URL(launchOptionsRegURL.toString());
-				URLConnection connection = url.openConnection();
-				connection.setDoOutput(true);
-				PrintWriter out = new PrintWriter(connection.getOutputStream());
-				StringBuffer params = new StringBuffer();
-				String encodedID = null;
-				try {
-					encodedID = URLEncoder.encode(ExplorerPlugin.ID,
-							ExplorerPlugin.CHARSET);
-				} catch (UnsupportedEncodingException e) {
-					return new Status(
-							IStatus.ERROR,
-							ExplorerPlugin.ID,
-							0,
-							ExplorerPlugin
-									.getMessage("%MSG_BROKEN_VM_DOES_NOT_SUPPORT_UTF-8"),
-							e);
-				}
-				params.append(encodedID);
-				params.append("=");
-				params.append(launchOptionKey);
-				params.append("&");
-				for (int i = 0; i < options.length; i++) {
-					if (options[i] != null) {
-						params.append(options[i].getKey());
-						params.append("=");
-						String option = null;
-						try {
-							option = URLEncoder.encode(options[i].getOption(),
-									ExplorerPlugin.CHARSET);
-						} catch (UnsupportedEncodingException e) {
-							return new Status(
-									IStatus.ERROR,
-									ExplorerPlugin.ID,
-									0,
-									ExplorerPlugin
-											.getMessage("%MSG_BROKEN_VM_DOES_NOT_SUPPORT_UTF-8"),
-									e);
-						}
-						params.append(option);
-						params.append("&");
-					}
-				}
-				out.print(params.toString());
-				out.close();
-				out = null;
-				InputStream is = connection.getInputStream();
-				is.close();
-				is = null;
-			} catch (Exception e) {
-				return new Status(IStatus.WARNING, ExplorerPlugin.ID, 0,
-						ExplorerPlugin
-								.getMessage("%MSG_ERROR_LOAD_LAUNCH_OPTIONS"),
-						e);
-			}
-		}
-		return new Status(IStatus.OK, ExplorerPlugin.ID, 0, "", null);
-	}
-
-	private static int getLaunchOptionsKey() {
-		return launchOptionsKey_++;
-	}
-
-	public IStatus launch(IWorkbench wb, IStructuredSelection sel,
-			String[] inquiryURL, String[] publishURL,
-			boolean forceLaunchOutsideIDE) {
-		int inquiryURLOptionLength = (inquiryURL != null) ? inquiryURL.length
-				: 0;
-		int publishURLOptionLength = (publishURL != null) ? publishURL.length
-				: 0;
-		LaunchOption[] options = new LaunchOption[inquiryURLOptionLength
-				+ publishURLOptionLength];
-		int index = 0;
-		if (inquiryURL != null) {
-			for (int i = 0; i < inquiryURL.length; i++) {
-				options[index] = new LaunchOption(LaunchOptions.INQUIRY_URL,
-						inquiryURL[i]);
-				index++;
-			}
-		}
-		if (publishURL != null) {
-			for (int i = 0; i < publishURL.length; i++) {
-				options[index] = new LaunchOption(LaunchOptions.PUBLISH_URL,
-						publishURL[i]);
-				index++;
-			}
-		}
-		return launch(wb, sel, options, forceLaunchOutsideIDE);
-	}
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WSExplorerContext.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WSExplorerContext.java
deleted file mode 100644
index 9d8ee2c16..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WSExplorerContext.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer;
-
-public final class WSExplorerContext {
-	public static final String ID = "org.eclipse.wst.ws.explorer";
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WSExplorerLauncherCommand.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WSExplorerLauncherCommand.java
deleted file mode 100644
index bbc765abb..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WSExplorerLauncherCommand.java
+++ /dev/null
@@ -1,85 +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.explorer;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.net.URLEncoder;
-import java.util.Properties;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
- * @author cbrealey@ca.ibm.com
- * 
- * This <code>Command</code>, when executed, launches the
- * Web Services Explorer.
- */
-public class WSExplorerLauncherCommand extends AbstractDataModelOperation {
-	private boolean forceLaunchOutsideIDE;
-
-	private LaunchOption[] launchOptions;
-
-	public WSExplorerLauncherCommand() {
-	}
-
-	public void writeCategoryInfo(String inquiryURL, String categoriesDirectory) {
-		try {
-			Properties p = new Properties();
-			p.setProperty(LaunchOptions.CATEGORIES_DIRECTORY,
-					categoriesDirectory);
-			StringBuffer propertiesFileName = new StringBuffer();
-			propertiesFileName.append(WSExplorer.getInstance()
-					.getMetadataDirectory());
-			File metadataDirectoryFile = new File(propertiesFileName.toString());
-			if (!metadataDirectoryFile.exists()) {
-				metadataDirectoryFile.mkdirs();
-			}
-			propertiesFileName.append(URLEncoder.encode(inquiryURL,"UTF-8")).append(
-					".properties");
-			FileOutputStream fout = new FileOutputStream(propertiesFileName
-					.toString());
-			p.store(fout, null);
-			fout.close();
-		} catch (IOException e) {
-		}
-	}
-
-	public IStatus execute() {
-		return WSExplorer.getInstance().launch(null, null, launchOptions,
-				forceLaunchOutsideIDE);
-	}
-
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-  {
-    return execute();
-	}
-
-	/**
-	 * @param forceLaunchOutsideIDE
-	 *            The forceLaunchOutsideIDE to set.
-	 */
-	public void setForceLaunchOutsideIDE(boolean forceLaunchOutsideIDE) {
-		this.forceLaunchOutsideIDE = forceLaunchOutsideIDE;
-	}
-
-	/**
-	 * @param launchOptions
-	 *            The launchOptions to set.
-	 */
-	public void setLaunchOptions(LaunchOption[] launchOptions) {
-		this.launchOptions = launchOptions;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/favorites/FavoritesRegistryTypeDefault.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/favorites/FavoritesRegistryTypeDefault.java
deleted file mode 100644
index 6d8809f03..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/favorites/FavoritesRegistryTypeDefault.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.wst.ws.internal.explorer.favorites;
-
-import java.io.IOException;
-import org.apache.wsil.WSILDocument;
-import org.apache.wsil.WSILException;
-import org.eclipse.wst.ws.internal.explorer.plugin.ExplorerPlugin;
-import org.eclipse.wst.ws.internal.parser.favorites.FavoritesRegistryTypeAbstract;
-
-public class FavoritesRegistryTypeDefault extends FavoritesRegistryTypeAbstract {
-	private static WSILDocument wsilDoc_;
-
-	public static final String FAVORITES_DEFAULT = "properties/favorites_default.wsil";
-	
-	private String defaultFavorites_ = null;
-
-	public FavoritesRegistryTypeDefault() {
-		super();
-		wsilDoc_ = null;
-	}
-
-	public FavoritesRegistryTypeDefault(String defaultFavorites) {
-		super();
-		wsilDoc_ = null;
-		defaultFavorites_ = defaultFavorites;
-	}
-
-	public String getReadLocation() {
-		StringBuffer readLocation = new StringBuffer();
-		if (defaultFavorites_ == null)
-		{
-			readLocation.append(ExplorerPlugin.getInstance().getPluginInstallLocation());
-			readLocation.append(FAVORITES_DEFAULT);
-		}
-		else
-		{
-			readLocation.append(defaultFavorites_);
-		}
-		return readLocation.toString();
-	}
-
-	public String getWriteLocation() {
-		return null;
-	}
-
-	protected WSILDocument getWSILDocument() {
-		if (wsilDoc_ == null) {
-			wsilDoc_ = loadWSILDocument(getReadLocation(), true);
-			getFavoritesUDDIRegistries();
-			/* TODO: Public registry strings shouldn't be in properties - Ain't extensible.
-			for (int i = 0; i < registries.length; i++) {
-				registries[i].setName(WSPlugin.getResourceString(registries[i].getName()));
-			}
-			*/
-		}
-		return wsilDoc_;
-	}
-
-	public WSILDocument getFavoritesDefault() {
-		return getWSILDocument();
-	}
-
-	public void save() throws WSILException, IOException {
-	}
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/favorites/FavoritesRegistryTypeWSE.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/favorites/FavoritesRegistryTypeWSE.java
deleted file mode 100644
index 253fc8c16..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/favorites/FavoritesRegistryTypeWSE.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.favorites;
-
-import org.apache.wsil.WSILDocument;
-import org.eclipse.wst.ws.internal.explorer.plugin.ExplorerPlugin;
-import org.eclipse.wst.ws.internal.parser.favorites.FavoritesRegistryTypeAbstract;
-
-
-public class FavoritesRegistryTypeWSE extends FavoritesRegistryTypeAbstract
-{
-  private static WSILDocument wsilDoc_;
-  public static final String FAVORITES_WSEXPLORER = "favorites.wsil";
-  private String defaultFavorites_ = null;
-  private String stateLocation_ = null;
-  
-  public FavoritesRegistryTypeWSE()
-  {
-    super();
-    wsilDoc_ = null;
-  }
-  
-  public FavoritesRegistryTypeWSE(String defaultFavorites, String stateLocation) {
-	super();
-	wsilDoc_ = null;
-	defaultFavorites_ = defaultFavorites;
-	stateLocation_ = stateLocation;
-  }
-
-  public String getReadLocation()
-  {
-    StringBuffer readLocation = new StringBuffer();
-    readLocation.append(stateLocation_ == null ? ExplorerPlugin.getInstance().getPluginStateLocation() : stateLocation_);
-    readLocation.append(FAVORITES_WSEXPLORER);
-    return readLocation.toString();
-  }
-
-  public String getWriteLocation()
-  {
-    return getReadLocation();
-  }
-
-  protected WSILDocument getWSILDocument()
-  {
-    if (wsilDoc_ == null)
-    {
-      wsilDoc_ = loadWSILDocument(getReadLocation(), false);
-      if (wsilDoc_ == null)
-      {
-        restoreFavoritesDefault();
-        try
-        {
-          save();
-        }
-        catch (Throwable t)
-        {
-        }
-      }
-    }
-    return wsilDoc_;
-  }
-
-  public void restoreFavoritesDefault()
-  {
-    wsilDoc_ = (new FavoritesRegistryTypeDefault(defaultFavorites_)).getWSILDocument();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/plugin/ExplorerPlugin.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/plugin/ExplorerPlugin.java
deleted file mode 100644
index 43e10584d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/plugin/ExplorerPlugin.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.plugin;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.Hashtable;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.ws.internal.explorer.LaunchWizardTask;
-import org.eclipse.wst.ws.internal.explorer.favorites.FavoritesRegistryTypeDefault;
-import org.osgi.framework.BundleContext;
-
-
-/**
- * This is the plugin class for the Web Services Explorer.
- */
-public class ExplorerPlugin extends AbstractUIPlugin
-{
-  /**
-   * The identifier of the descriptor of this plugin in plugin.xml.
-   */
-  public static final String ID = "org.eclipse.wst.ws.explorer";
-  public static final String CHARSET = "UTF-8";
-  /**
-   * The reference to the singleton instance of this plugin.
-   */
-  private static ExplorerPlugin instance_;
-
-  /**
-   * Constructs a runtime plugin object for this plugin. The "plugin" element
-   * in plugin.xml should include the attribute class =
-   * "org.eclipse.wst.ws.internal.explorer.plugin.ExplorerPlugin".
-   * 
-   * @param descriptor
-   *            The descriptor of this plugin.
-   */
-  public ExplorerPlugin()
-  {
-    super();
-    instance_ = this;
-  }
-
-  /**
-   * Returns the singleton instance of this plugin. Equivalent to calling
-   * (ExplorerPlugin)Platform.getPlugin("org.eclipse.wst.ws.explorer");
-   * 
-   * @return The ExplorerPlugin singleton.
-   */
-  static public ExplorerPlugin getInstance()
-  {
-    return instance_;
-  }
-
-  /**
-   * Called once by the platform when this plugin is first loaded.
-   */
-  public void start(BundleContext bundle) throws Exception
-  {
-    super.start(bundle);
-    // init the shell of LaunchWizardTask
-    LaunchWizardTask.getInstance();
-  }
-
-  /**
-   * Called once by the platform when this plugin is unloaded.
-   */
-  public void stop(BundleContext bundle) throws Exception
-  {
-    super.stop(bundle);
-  }
-
-  /**
-   * 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 Platform.getResourceString(instance_.getBundle(), 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;
-    }
-  }
-
-  /**
-   * See IPluginHelper.
-   */
-  public void setMsgLoggerConfig(Hashtable msgLoggerConfig)
-  {
-  }
-
-  /**
-   * See IPluginHelper.
-   */
-  public Hashtable getMsgLoggerConfig(Plugin plugin)
-  {
-    return new Hashtable();
-  }
-
-  /**
-   * See IPluginHelper.
-   */
-  public Hashtable getMsgLoggerConfig()
-  {
-    return getMsgLoggerConfig(this);
-  }
-
-  public String getPluginStateLocation()
-  {
-    return Platform.getPluginStateLocation(this).addTrailingSeparator().toOSString();
-  }
-
-  public String getDefaultFavoritesLocation()
-  {
-	// TODO: getPluginInstallLocation can return null and cause trouble for the WSE's favourites mechanism. 89101 should correct this.
-	return getPluginInstallLocation()+FavoritesRegistryTypeDefault.FAVORITES_DEFAULT;
-  }
-  
-  public String getPluginInstallLocation()
-  {
-    try
-    {
-      return Platform.resolve(instance_.getBundle().getEntry("/")).getFile();
-    }
-    catch (Exception e)
-    {
-      return null;
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/popup/PopupTestWSDL.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/popup/PopupTestWSDL.java
deleted file mode 100644
index 87aed0065..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/popup/PopupTestWSDL.java
+++ /dev/null
@@ -1,121 +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.wst.ws.internal.explorer.popup;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.action.Action;
-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.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.ws.internal.explorer.LaunchOption;
-import org.eclipse.wst.ws.internal.explorer.LaunchOptions;
-import org.eclipse.wst.ws.internal.explorer.WSExplorerLauncherCommand;
-import org.eclipse.wst.ws.internal.explorer.plugin.ExplorerPlugin;
-import org.eclipse.wst.ws.internal.monitor.GetMonitorCommand;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-public class PopupTestWSDL extends Action implements IActionDelegate
-{
-  public PopupTestWSDL()
-  {
-    super(ExplorerPlugin.getMessage("%POPUP_TEST_WSDL"));
-  }
-
-  private IStructuredSelection getWorkbenchSelection()
-  {
-    IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-    if (window != null)
-    {
-      ISelection selection = window.getSelectionService().getSelection();
-      if (selection instanceof IStructuredSelection)
-        return (IStructuredSelection)selection;
-    }
-    return null;
-  }
-
-  public void run()
-  {
-	String stateLocation = ExplorerPlugin.getInstance().getPluginStateLocation();
-	String defaultFavoritesLocation = ExplorerPlugin.getInstance().getDefaultFavoritesLocation();
-  	WSExplorerLauncherCommand command = new WSExplorerLauncherCommand();
-    command.setForceLaunchOutsideIDE(false);
-    IStructuredSelection selection = getWorkbenchSelection();
-    Vector launchOptions = new Vector();
-    if (selection != null)
-    {
-      for (Iterator it = selection.iterator(); it.hasNext();)
-      {
-        String wsdlURL = null;
-        Object object = it.next();
-        if (object instanceof IResource)
-        {
-          File wsdlFile = ((IResource)object).getLocation().toFile();
-          try
-          {
-            wsdlURL = wsdlFile.toURL().toString();
-          }
-          catch (MalformedURLException murle)
-          {
-            wsdlURL = wsdlFile.toString();
-          }
-        }
-        /* TODO: Move this up to org.eclipse.jst.ws.ui.
-        if (object instanceof ServiceImpl)
-        {
-          ServiceImpl serviceImpl = (ServiceImpl)object;
-          wsdlURL = J2EEActionAdapterFactory.getWSDLURI(serviceImpl);
-        }
-        if (object instanceof ServiceRef)
-        {
-          ServiceRef serviceImpl = (ServiceRef)object;
-          wsdlURL = J2EEActionAdapterFactory.getWSDLURI(serviceImpl);
-        }
-        if (object instanceof WSDLResourceImpl)
-        {
-          WSDLResourceImpl WSDLRImpl = (WSDLResourceImpl)object;
-          wsdlURL = J2EEActionAdapterFactory.getWSDLURI(WSDLRImpl);
-        }
-        */
-        GetMonitorCommand getMonitorCmd = new GetMonitorCommand();
-        getMonitorCmd.setMonitorService(true);
-        getMonitorCmd.setCreate(false);
-        getMonitorCmd.setWebServicesParser(new WebServicesParser());
-        getMonitorCmd.setWsdlURI(wsdlURL);
-        getMonitorCmd.execute(null, null);
-        List endpoints = getMonitorCmd.getEndpoints();
-        for (Iterator endpointsIt = endpoints.iterator(); endpointsIt.hasNext();)
-          launchOptions.add(new LaunchOption(LaunchOptions.WEB_SERVICE_ENDPOINT, (String)endpointsIt.next()));
-        launchOptions.add(new LaunchOption(LaunchOptions.WSDL_URL, wsdlURL));
-		launchOptions.add(new LaunchOption(LaunchOptions.STATE_LOCATION,stateLocation));
-		launchOptions.add(new LaunchOption(LaunchOptions.DEFAULT_FAVORITES_LOCATION,defaultFavoritesLocation));
-      }
-    }
-    command.setLaunchOptions((LaunchOption[])launchOptions.toArray(new LaunchOption[0]));
-    command.execute();
-  }
-
-  public void run(IAction action)
-  {
-    run();
-  }
-
-  public void selectionChanged(IAction action, ISelection selection)
-  {
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/explorer.properties b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/explorer.properties
deleted file mode 100644
index 974ce4a85..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/explorer.properties
+++ /dev/null
@@ -1,181 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-TITLE_WSEXPLORER=Web Services Explorer
-
-# Tree Nodes
-ALT_OPEN=Open
-ALT_CLOSE=Close
-
-# Perspective Toolbar
-ALT_BACK=Back
-ALT_FORWARD=Forward
-ALT_ACTION_ENGINE=Action Recorder
-ALT_UDDI_PERSPECTIVE=UDDI Page
-ALT_WSIL_PERSPECTIVE=WSIL Page
-ALT_WSDL_PERSPECTIVE=WSDL Page
-ALT_FAVORITES_PERSPECTIVE=Favorites
-
-# Toolbars
-ALT_DOUBLE_CLICK_TO_MAXIMIZE=Double Click to Maximize
-ALT_DOUBLE_CLICK_TO_RESTORE=Double Click to Restore
-
-# SetDefaultViewTool
-ALT_BACK_TO_TOP=Back to top
-
-# Common Actions
-ALT_REFRESH=Refresh
-ALT_CLEAR=Clear
-ALT_RESULTS=Results
-
-# Common Labels
-ALT_NAVIGATOR=Navigator
-ALT_ACTIONS=Actions
-ALT_STATUS=Status
-ALT_OTHER_ACTIONS=Other Actions
-FORM_BUTTON_GO=&nbsp;&nbsp;Go&nbsp;&nbsp;
-FORM_BUTTON_RESET=Reset
-FORM_BUTTON_CANCEL=Cancel
-FORM_LABEL_ACTIONS=Actions
-FORM_LABEL_ACTIONS_NONE=None
-
-# Placeholder for blank table entries
-TABLE_BLANK_PLACEHOLDER=--
-
-# Common Form Control Titles
-FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX=Select all
-FORM_CONTROL_TITLE_SELECT_ROW_CHECK_BOX=Select row
-
-# Common Messages
-MSG_ERROR_UNEXPECTED=IWAB0135E An unexpected error has occurred.
-MSG_ERROR_NO_ACTION_SELECTED=IWAB0124E Select an action.
-MSG_ERROR_NO_NODE_SELECTED=IWAB0125E Select a node.
-MSG_SUBMIT_IN_PROGRESS=Please wait. The operation is still in progress.
-MSG_LOAD_IN_PROGRESS=Please wait while the form loads...
-
-#LaunchWebServiceWizardAction
-ALT_LAUNCH_WEB_SERVICE_WIZARD=Launch Web Service Wizard
-FORM_LABEL_CHOOSE_WIZARD=Select a wizard to launch:
-FORM_RADIO_WEB_SERVICE_CLIENT_WIZARD=Web Service Client
-FORM_RADIO_WEB_SERVICE_SKELETON_WIZARD=Web Service Skeleton
-MSG_ERROR_WIZARD_ALREADY_RUNNING=IWAB0126E A Web service wizard is already in progress.  Finish with the existing wizard before launching a new one.
-MSG_ERROR_WSDL_URL_IS_UNREACHABLE=IWAB0127E The WSDL document is unreachable.
-
-# ImportToFileSystemAction
-ALT_WSIL_IMPORT_TO_FS=Import WSIL To File System
-ALT_WSDL_IMPORT_TO_FS=Import WSDL To File System
-MSG_ERROR_RETRIEVING_WSDL_DOC=IWAB0128E Unable to retrieve WSDL document.
-MSG_ERROR_RETRIEVING_WSIL_DOC=IWAB0129E Unable to retrieve WSIL document.
-MSG_IMPORT_WSDL_SUCCESSFUL=WSDL document successfully imported.
-MSG_IMPORT_WSIL_SUCCESSFUL=WSIL document successfully imported.
-
-# ImportToWorkbenchAction
-ALT_IMPORT_WSDL_TO_WORKBENCH=Import WSDL To workbench
-FORM_LABEL_IMPORT_TO_WORKBENCH_DESC=Select a workbench project to save the WSDL file into. You may also change the name of the WSDL file.
-WEB_PROJECT_NAME=Web project:
-WORKBENCH_PROJECT_NAME=Workbench project:
-LABEL_IMPORT_WSDL=Import WSDL document
-LABEL_IMPORT_TO_WSIL=Import as a service reference to a WSIL document
-IMPORTED_WSDL_FILE_NAME=WSDL file name:
-WSIL_FILE_NAME=WSIL file name:
-MSG_ERROR_FILE_OVERWRITE_DISABLED=Cannot create the file "%2" relative to the path "%1" because automatic file overwriting has not been enabled. Do you want to enable it for this file?
-MSG_ERROR_INVALID_WORKBENCH_PROJECT=IWAB0130E Select a workbench project.
-MSG_ERROR_INVALID_WSDL_FILE_NAME=IWAB0131E Invalid file name.
-MSG_ERROR_INVALID_WSIL_FILE_NAME=IWAB0470E Invalid WSIL file name.
-MSG_ERROR_NO_IMPORT_OPTION_SELECTED=IWAB0471E No import option is selected.  Please choose at least one import option.
-MSG_ERROR_WRITING_TEMP_FILE_TO_FS=IWAB0132E Unable to write temporary file.
-MSG_INFO_IMPORT_TO_WORKBENCH_SUCCESSFUL=IWAB0314I %1 was successfully imported to the workbench.
-MSG_INFO_IMPORT_SERVICE_REF_TO_WSIL_SUCCESSFUL=IWAB0472I Service reference was successfully imported to %1.
-
-# CheckWorkbenchFileReadOnlyAction
-MSG_ERROR_FILE_CHECKOUT_DISABLED=Cannot create the file "%2" relative to the path "%1" because automatic file check out has not been enabled. Do you want to enable it for this file?
-
-# ClearNodeAction
-MSG_INFO_NODE_CLEARED=IWAB0133I %1 cleared.
-
-# Table twistees
-ALT_TWIST_OPENED=Hide
-ALT_TWIST_CLOSED=Expand
-
-# WSDL Browser
-FORM_LINK_BROWSE=Browse...
-TITLE_WSDL_BROWSER=WSDL Browser - %1
-FORM_LABEL_WSDL_SOURCE=Select a WSDL source:
-FORM_LABEL_WSDL_SOURCE_WEBPROJECTS=Workspace Projects
-FORM_LABEL_WSDL_SOURCE_FAVORITES=Favorites
-FORM_LABEL_WEB_PROJECT=Workspace Project
-FORM_LABEL_WSDL_URL=WSDL URL
-FORM_BUTTON_REFRESH=Refresh
-ALT_WSDL_BROWSER=WSDL Browser
-WSDL_TYPE_SERVICE_INTERFACES=Service Interfaces
-WSDL_TYPE_SERVICES=Services
-
-# Calendar Browser
-TITLE_CALENDAR_BROWSER=Calendar Browser
-# 2 character abbreviations for days of the week.
-FORM_LABEL_SH_SUNDAY=Su
-FORM_LABEL_SH_MONDAY=Mo
-FORM_LABEL_SH_TUESDAY=Tu
-FORM_LABEL_SH_WEDNESDAY=We
-FORM_LABEL_SH_THURSDAY=Th
-FORM_LABEL_SH_FRIDAY=Fr
-FORM_LABEL_SH_SATURDAY=Sa
-# Months of the year
-FORM_LABEL_MONTH=Month:
-FORM_LABEL_JANUARY=January
-FORM_LABEL_FEBRUARY=February
-FORM_LABEL_MARCH=March
-FORM_LABEL_APRIL=April
-FORM_LABEL_MAY=May
-FORM_LABEL_JUNE=June
-FORM_LABEL_JULY=July
-FORM_LABEL_AUGUST=August
-FORM_LABEL_SEPTEMBER=September
-FORM_LABEL_OCTOBER=October
-FORM_LABEL_NOVEMBER=November
-FORM_LABEL_DECEMBER=December
-FORM_LABEL_YEAR=Year:
-FORM_LABEL_TIME=Time:
-FORM_LINK_TODAY=Today
-FORM_LINK_PREVIOUS_YEAR=<<
-FORM_LINK_PREVIOUS_MONTH=<
-FORM_LINK_NEXT_MONTH=>
-FORM_LINK_NEXT_YEAR=>>
-ALT_PREVIOUS_YEAR=Previous Year
-ALT_PREVIOUS_MONTH=Previous Month
-ALT_NEXT_MONTH=Next Month
-ALT_NEXT_YEAR=Next Year
-ALT_TODAY=Today
-ALT_CALENDAR_BROWSER=Calendar Browser
-MSG_ERROR_INVALID_TIME_FORMAT=IWAB0368E Time was not formatted as HH:MM:SS[.SSS]. Do you wish to use the current time instead?
-
-# Action engine
-TITLE_ACTION_RECORDER=Action Recorder
-FORM_LABEL_MODE=Mode:
-FORM_LABEL_MODE_PLAY=Play
-FORM_LABEL_MODE_STOP=Stop
-FORM_LABEL_MODE_RECORD=Record
-FORM_LABEL_SAVE=Save
-FORM_LABEL_PLAY_FILE=Play file:
-MSG_ERROR_INVALID_PLAY_FILE=IWAB0362E Enter a play file.
-
-# Frame titles
-FRAME_TITLE_PERSPECTIVE_WORKAREA=Web Services Explorer Internal Work Area
-FRAME_TITLE_PERSPECTIVE_TOOLBAR=Web Services Explorer Toolbar
-FRAME_TITLE_PERSPECTIVE_CONTENT=Web Services Explorer Page Content
-FRAME_TITLE_WSDL_TOOLBAR=WSDL Browser Toolbar
-FRAME_TITLE_WSDL_CONTENT=WSDL Browser Content
-
-# Form titles
-FORM_TITLE_PAGE_LOADER=Page Loader
-FORM_TITLE_PAGE_CONTENT=Loaded Page Content
-FORM_TITLE_LAUNCH_WEBSERVICE_WIZARD=Launch Web Service Wizard Form
-FORM_TITLE_IMPORT_TO_WORKBENCH=Import to Workbench Form
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/favorites.properties b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/favorites.properties
deleted file mode 100644
index 20f6b38d6..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/favorites.properties
+++ /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
-###############################################################################
-
-title=Favorites
-
-# Navigator
-FAVORITES_MAIN_NODE=Favorites Main
-FAVORITES_WSIL_FOLDER_NODE=Favorite WSILs
-FAVORITES_WSDL_SERVICE_FOLDER_NODE=Favorite WSDL Services
-FAVORITES_UDDI_SERVICE_FOLDER_NODE=Favorite UDDI Services
-FAVORITES_UDDI_BUSINESSES_FOLDER_NODE=Favorite UDDI Businesses
-FAVORITES_UDDI_SERVICE_INTERFACES_FOLDER_NODE=Favorite UDDI Service Interfaces
-FAVORITES_UDDI_REGISTRIES_FOLDER_NODE=Favorite UDDI Registries
-FAVORITES_USER_DEF_UDDI_REGISTRIES_FOLDER_NODE=Favorite User Defined UDDI Registries
-
-# Form
-FORM_LABEL_FAVORITE_WSIL=Favorite WSILs
-FORM_LABEL_FAVORITE_WSDL=Favorite WSDLs
-FORM_LABEL_FAVORITE_UDDI_REGISTRY=Favorite UDDI Registries
-FORM_LABEL_FAVORITE_USER_DEF_UDDI_REGISTRY=Favorite User Defined UDDI Registries
-FORM_LABEL_FAVORITE_UDDI_SERVICE=Favorite UDDI Services
-FORM_LABEL_FAVORITE_UDDI_BUSINESS=Favorite UDDI Business Entities
-FORM_LABEL_FAVORITE_UDDI_SERVICE_INTERFACE=Favorite UDDI Service Interfaces
-FORM_LABEL_REMOVE=Remove
-FORM_LABEL_IMPORT_TO_WSIL_PERSPECTIVE=Add To WSIL Page
-FORM_LABEL_IMPORT_TO_UDDI_PERSPECTIVE=Add To UDDI Page
-FORM_LABEL_IMPORT_TO_WSDL_PERSPECTIVE=Add To WSDL Page
-FORM_LABEL_URL=URL
-FORM_LABEL_ITEM_NUMBER=Item #
-FORM_LABEL_UDDI_VERSION=UDDI Version
-FORM_LABEL_NAME=Name
-FORM_LABEL_DESC=Description
-FORM_LABEL_DEFAULT_LOGIN=Default Login
-FORM_LABEL_DEFAULT_PASSWORD=Default Password
-FORM_LABEL_INQUIRY_URL=Inquiry URL
-FORM_LABEL_PUBLISH_URL=Publish URL
-FORM_LABEL_SECURE_INQUIRY_URL=Secure Inquiry URL
-FORM_LABEL_SECURE_PUBLISH_URL=Secure Publish URL
-FORM_LABEL_TAXONOMY=Taxonomy
-FORM_LABEL_LANGUAGE=Language
-FORM_LABEL_REGISTRY_NAME=Registry Name
-FORM_LABEL_BUSINESS_NAME=Business Name
-FORM_LABEL_BUSINESS_KEY=Business Key
-FORM_LABEL_SERVICE_NAME=Service Name
-FORM_LABEL_SERVICE_KEY=Service Key
-FORM_LABEL_SERVICE_INTERFACE_NAME=Service Interface Name
-FORM_LABEL_SERVICE_INTERFACE_KEY=Service Interface Key
-FORM_LABEL_REGISTRY_URL=<a href="%1" target="_blank">Click here</a> to obtain a user ID and password for this registry.
-FORM_LABEL_USER_DEFINED_CATEGORY_DATA_FILES=Data files for User Defined Categories
-MSG_ERROR_NOTHING_SELECTED=IWAB0315E Select at least one item.
-
-# ListFavoriteWSILAction
-ALT_LIST_FAVORITE_WSIL=List Favorite WSILs
-FORM_LABEL_LIST_FAVORITE_WSIL_DESC=Select a set of favorite WSIL links and press <strong>Add to WSIL Page</strong> to open them in the WSIL navigator. Press <strong>Remove</strong> to remove the selections.
-
-# ListFavoriteWSDLServiceAction
-ALT_LIST_FAVORITE_WSDL_SERVICE=List Favorite WSDL Services
-FORM_LABEL_LIST_FAVORITE_WSDL_SERVICE_DESC=Select a set of favorite WSDL services and press <strong>Remove</strong> to remove them.
-
-# ListFavoriteUDDIServiceAction
-ALT_LIST_FAVORITE_UDDI_SERVICE=List Favorite UDDI Services
-FORM_LABEL_LIST_FAVORITE_UDDI_SERVICE_DESC=Select a set of favorite UDDI services and press <strong>Add to UDDI Page</strong> to open them in the UDDI navigator. Press <strong>Remove</strong> to remove the selections.
-
-# ListFavoriteUDDIBusinessAction
-ALT_LIST_FAVORITE_UDDI_BUSINESS=List Favorite UDDI Businesses
-FORM_LABEL_LIST_FAVORITE_UDDI_BUSINESS_DESC=Select a set of favorite UDDI businesses and press <strong>Add to UDDI Page</strong> to open them in the UDDI navigator. Press <strong>Remove</strong> to remove the selections.
-
-# ListFavoriteUDDIRegistryAction
-ALT_LIST_FAVORITE_UDDI_REGISTRY=List Favorite UDDI Registries
-FORM_LABEL_LIST_FAVORITE_UDDI_REGISTRY_DESC=Select a set of favorite UDDI registries and press <strong>Add to UDDI Page</strong> to open them in the UDDI navigator. Press <strong>Remove</strong> to remove the selections.
-
-# ListFavoriteUserDefUDDIRegistryAction
-ALT_LIST_FAVORITE_USER_DEF_UDDI_REGISTRY=List Favorite User Defined UDDI Registries
-FORM_LABEL_LIST_FAVORITE_USER_DEF_UDDI_REGISTRY_DESC=Select a set of favorite UDDI registries and press <strong>Add to UDDI Page</strong> to open them in the UDDI navigator.
-
-# ListFavoriteUDDIServiceInterfaceAction
-ALT_LIST_FAVORITE_UDDI_SERVICE_INTERFACE=List Favorite UDDI Service Interfaces
-FORM_LABEL_LIST_FAVORITE_UDDI_SERVICE_INTERFACE_DESC=Select a set of favorite UDDI service interfaces and press <strong>Add to UDDI Page</strong> to open them in the UDDI navigator. Press <strong>Remove</strong> to remove the selections.
-
-# FavoritesWSILDetailsAction
-ALT_FAVORITES_WSIL_DETAILS=Favorite WSIL Details
-
-# FavoritesWSDLDetailsAction
-ALT_FAVORITES_WSDL_DETAILS=Favorite WSDL Details
-
-# FavoritesUDDIRegistryDetailsAction
-ALT_FAVORITES_UDDI_REGISTRY_DETAILS=Favorite UDDI Registry Details
-
-# FavoritesUserDefUDDIRegistryDetailsAction
-ALT_FAVORITES_USER_DEF_UDDI_REGISTRY_DETAILS=Favorite User Defined UDDI Registry Details
-
-# FavoritesUDDIBusinessDetailsAction
-ALT_FAVORITES_UDDI_BUSINESS_DETAILS=Favorite UDDI Business Details
-
-# FavoritesUDDIServiceDetailsAction
-ALT_FAVORITES_UDDI_SERVICE_DETAILS=Favorite UDDI Service Details
-
-# FavoritesUDDIServiceInterfaceDetailsAction
-ALT_FAVORITES_UDDI_SERVICE_INTERFACE_DETAILS=Favorite UDDI Service Interface Details
-
-# AddWSILToWSILPerspectiveAction
-ALT_ADD_WSIL_TO_WSIL_PERSPECTIVE=Add to WSIL Page
-MSG_ERROR_WSIL_ALREADY_OPENED=IWAB0316E %1 is already opened in WSIL Page.
-MSG_INFO_ADD_WSIL_TO_WSIL_PERSPECTIVE_SUCCESSFUL=IWAB0317I %1 is added to WSIL Page.
-MSG_ERROR_ADD_WSIL_TO_WSIL_PERSPECTIVE=IWAB0318E WSIL %1 could not be loaded.
-
-# AddToUDDIPerspectiveAction
-ALT_ADD_TO_UDDI_PERSPECTIVE=Add to UDDI Page
-MSG_ERROR_ADD_TO_UDDI_PERSPECTIVE=IWAB0320E %1 could not be found in the registry.
-MSG_INFO_ADD_TO_UDDI_PERSPECTIVE_SUCCESSFUL=IWAB0321I %1 is added to UDDI Page.
-
-# FavoritesAddToWSDLPerspectiveAction
-ALT_ADD_WSDL_TO_WSDL_PERSPECTIVE=Add to WSDL Page
-MSG_INFO_ADD_WSDL_TO_WSDL_PERSPECTIVE_SUCCESSFUL=IWAB0369I %1 is added to WSDL Page.
-MSG_ERROR_ADD_WSDL_TO_WSDL_PERSPECTIVE=IWAB0370E WSDL %1 could not be loaded.
-
-# RemoveFavoriteAction
-ALT_REMOVE_FAVORITE=Remove Favorite
-MSG_CONFIRM_REMOVE_NODE=%1 is no longer resolvable.  Do you wish to clear it?
-
-# FavoritesRestoreDefaultFavoritesAction
-ALT_RESTORE_DEFAULT_FAVORITES=Restore Default Favorites
-MSG_CONFIRM_RESTORE_DEFAULT_FAVORITES=This operation will overwrite the current favorites.  Do you wish to continue?
-MSG_ERROR_OPEN_FAVORITES_BACKUP=IWAB0134E Unable to load the default favorites.
-MSG_INFO_FAVORITES_RESTORED_TO_DEFAULT=IWAB0322I Default Favorites are restored.
-MSG_ERROR_SAVE_FAVORITES_WSIL=IWAB0186E Unable to save favorites to %1.
-
-# Frame titles
-FRAME_TITLE_NAVIGATOR_CONTAINER=Navigator Container
-FRAME_TITLE_NAVIGATOR_TOOLBAR=Navigator Toolbar
-FRAME_TITLE_NAVIGATOR_CONTENT=Navigator Content
-FRAME_TITLE_ACTIONS_CONTAINER=Actions Container
-FRAME_TITLE_PROPERTIES_CONTAINER=Properties Container
-FRAME_TITLE_PROPERTIES_CONTENT=Properties Content
-FRAME_TITLE_PROPERTIES_TOOLBAR=Properties Toolbar
-FRAME_TITLE_STATUS_CONTAINER=Status Container
-FRAME_TITLE_STATUS_CONTENT=Status Content
-FRAME_TITLE_STATUS_TOOLBAR=Status Toolbar
-
-# Form titles
-FORM_TITLE_UDDI_BUSINESS_DETAILS=UDDI Business Details Form
-FORM_TITLE_UDDI_REGISTRY_DETAILS=UDDI Registry Details Form
-FORM_TITLE_USER_DEF_UDDI_REGISTRY_DETAILS=User Defined UDDI Registry Details Form
-FORM_TITLE_UDDI_SERVICE_DETAILS=UDDI Service Details Form
-FORM_TITLE_UDDI_SERVICE_INTERFACE_DETAILS=UDDI Service Interface Details Form
-FORM_TITLE_WSDL_DETAILS=WSDL Details Form
-FORM_TITLE_WSIL_DETAILS=WSIL Details Form
-
-# View titles
-VIEW_TITLE_UDDI_BUSINESS_LIST=UDDI Businesses List View
-VIEW_TITLE_UDDI_REGISTRY_LIST=UDDI Registries List View
-VIEW_TITLE_USER_DEF_UDDI_REGISTRY_LIST=User Defined UDDI Registries List View
-VIEW_TITLE_UDDI_SERVICE_INTERFACE_LIST=UDDI Service Interfaces List View
-VIEW_TITLE_UDDI_SERVICE_LIST=UDDI Services List View
-VIEW_TITLE_WSDL_SERVICE_LIST=WSDL Services List View
-VIEW_TITLE_WSIL_LIST=WSIL Links List View
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/uddi.properties b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/uddi.properties
deleted file mode 100644
index eddd98343..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/uddi.properties
+++ /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
-###############################################################################
-
-title=UDDI
-
-# Nodes
-NODE_NAME_UDDI_MAIN=UDDI Main
-NODE_NAME_QUERIES_FOLDER=Executed Queries
-NODE_NAME_PUBLISHED_BUSINESSES_FOLDER=Published Businesses
-NODE_NAME_PUBLISHED_SERVICES_FOLDER=Published Services
-NODE_NAME_PUBLISHED_SERVICE_INTERFACES_FOLDER=Published Service Interfaces
-
-# OpenRegistryAction
-ALT_OPEN_REGISTRY=Open Registry
-FORM_LABEL_OPEN_REGISTRY_DESC=Specify the name and inquiry URL of the registry to be opened. Selecting a favorite registry will automatically fill in the required information. Press <strong>Go</strong> to open the registry.
-FORM_LABEL_FAVORITE_REGISTRY=Favorite Registry
-FORM_LABEL_REGISTRY_NAME=Registry Name
-FORM_LABEL_INQUIRY_URL=Inquiry URL
-FORM_LABEL_CHECK_USER_DEFINED_CATEGORIES=Check for user-defined categories
-DEFAULT_REGISTRY_NAME=IBM UDDI Test Registry
-MSG_ERROR_INVALID_REGISTRY_NAME=IWAB0136E Enter a valid registry name.
-MSG_ERROR_INVALID_INQUIRY_URL=IWAB0138E Enter a valid inquiry URL.
-MSG_INFO_REGISTRY_OPENED=IWAB0139I The registry named %1 located at %2 was opened successfully.
-FORM_LABEL_IS_WEBSPHERE_UDDI_REGISTRY=Is WebSphere UDDI registry?
-DEFAULT_REGISTRY_NAME_WEBSPHERE=IBM WebSphere Private UDDI Registry
-FORM_LABEL_REGISTRY_HOST=Host
-FORM_LABEL_REGISTRY_PORT=Port
-
-# User-defined Categories
-FORM_LABEL_ADD_CATEGORY_DATA=<a href="%1">Click here</a> to load this category's data.
-FORM_CONTROL_TITLE_CATEGORY_FILE=Category data file name
-MSG_INFO_NO_USER_DEFINED_CATEGORIES_FOUND=IWAB0371I No user defined categories detected.
-MSG_INFO_NO_CATEGORY_DATA=IWAB0372I Category data for %1 is not available or is invalid.
-MSG_INFO_USER_DEFINED_CATEGORY_DATA_LOADED=IWAB0373I Data for user defined category %1 was successfully loaded.
-MSG_ERROR_INVALID_USER_DEFINED_CATEGORY_DATA_FILE_KEY=IWAB0374E Invalid data file for user defined category %1. A category key '%2' was found but '%3' was expected.
-MSG_ERROR_INVALID_USER_DEFINED_CATEGORY_DATA_FILE_FORMAT=IWAB0473E Unknown format in line: %1 of the data file for user defined category %2. The line is: "%3"
-MSG_ERROR_INVALID_USER_DEFINED_CATEGORY_DATA_FILE=IWAB0375E Invalid data file for user defined category %1.
-MSG_ERROR_SAVING_CATEGORY_DATA=IWAB0474E An error occured while saving data for category %1. Exception text: %2
-
-# UDDI Category Browser
-TITLE_CATEGORY_BROWSER=Category Browser
-ALT_CATEGORIES=Categories
-
-# Details
-ALT_REGISTRY_DETAILS=Registry Details
-ALT_BUSINESS_DETAILS=Business Details
-ALT_SERVICE_DETAILS=Service Details
-ALT_SERVICE_INTERFACE_DETAILS=Service Interface Details
-FORM_LABEL_DETAILS_EDITABLE=Details for <strong>%1</strong> are shown below. Some items may be added, removed, or changed. Authentication may be required for changes. Other actions are listed at the bottom of this page.
-
-# Get
-ALT_GET=Get
-
-# Common Form Control Title
-FORM_CONTROL_TITLE_NAME_TEXT_VALUE=Name value
-FORM_CONTROL_TITLE_DESCRIPTION_TEXT_VALUE=Description value
-FORM_CONTROL_TITLE_CATEGORY_KEY_NAME=Category key name
-FORM_CONTROL_TITLE_CATEGORY_KEY_VALUE=Category key value
-FORM_CONTROL_TITLE_IDENTIFIER_KEY_NAME=Identifier key name
-FORM_CONTROL_TITLE_IDENTIFIER_KEY_VALUE=Identifier key value
-FORM_CONTROL_TITLE_DISCOVERY_URL=Discovery URL
-
-# Find actions
-ALT_FIND=Find
-ALT_SUBQUERY=Find %1 Subquery
-FORM_LABEL_QUERY_NAME=Name of this query
-DEFAULT_QUERY_NAME=query results
-DEFAULT_SUBQUERY_NAME=%1 - %2 subquery
-FORM_LABEL_SEARCH_FOR=Search for
-FORM_OPTION_BUSINESSES=Businesses
-FORM_OPTION_SERVICES=Services
-FORM_OPTION_SERVICE_INTERFACES=Service Interfaces
-FORM_LABEL_SEARCH_TYPE=Type of search
-FORM_RADIO_SIMPLE=Simple
-FORM_RADIO_ADVANCED=Advanced
-FORM_RADIO_UUID=UUID
-FORM_LABEL_FIND_BUSINESSES_SIMPLE_DESC=Enter the partial or complete name of a business to search for. The '%' symbol can be used as a wildcard that matches any character. Press <strong>Go</strong> to execute the search.
-FORM_LABEL_FIND_ADVANCED_DESC=Enter values for one or more of the parameters listed below. The '%' symbol can be used as a wildcard that matches any character in the Name field of the Names table. Authentication may be required. Press <strong>Go</strong> to execute the search.
-FORM_LABEL_FIND_BUSINESS_UUID_DESC=Enter the UUID of the business to search for. Press <strong>Go</strong> to execute the search.
-FORM_LABEL_NAMES=Names
-FORM_LINK_ADD=Add
-FORM_LINK_GET=Get
-FORM_LINK_FIND=Find
-FORM_LINK_REMOVE=Remove
-FORM_LABEL_OWNED=Owned
-FORM_LABEL_PUBLISH_URL=Publish URL
-FORM_LABEL_USERID=User ID
-FORM_LABEL_PASSWORD=Password
-FORM_LABEL_LANGUAGE=Language
-FORM_LABEL_NAME=Name
-FORM_LABEL_DESCRIPTION=Description
-FORM_OPTION_LANGUAGE_EN=English
-FORM_OPTION_LANGUAGE_AA=Afar
-FORM_OPTION_LANGUAGE_AB=Abkhazian
-FORM_OPTION_LANGUAGE_AF=Afrikaans
-FORM_OPTION_LANGUAGE_AM=Amharic
-FORM_OPTION_LANGUAGE_AR=Arabic
-FORM_OPTION_LANGUAGE_AS=Assamese
-FORM_OPTION_LANGUAGE_AY=Aymara
-FORM_OPTION_LANGUAGE_AZ=Azerbaijani
-FORM_OPTION_LANGUAGE_BA=Bashkir
-FORM_OPTION_LANGUAGE_BE=Byelorussian
-FORM_OPTION_LANGUAGE_BG=Bulgarian
-FORM_OPTION_LANGUAGE_BH=Bihari
-FORM_OPTION_LANGUAGE_BI=Bislama
-FORM_OPTION_LANGUAGE_BN=Bengali; Bangla
-FORM_OPTION_LANGUAGE_BO=Tibetan
-FORM_OPTION_LANGUAGE_BR=Breton
-FORM_OPTION_LANGUAGE_CA=Catalan
-FORM_OPTION_LANGUAGE_CO=Corsican
-FORM_OPTION_LANGUAGE_CZ=Czech
-FORM_OPTION_LANGUAGE_CY=Welsh
-FORM_OPTION_LANGUAGE_DA=Danish
-FORM_OPTION_LANGUAGE_DE=German
-FORM_OPTION_LANGUAGE_DZ=Bhutani
-FORM_OPTION_LANGUAGE_EL=Greek
-FORM_OPTION_LANGUAGE_EO=Esperanto
-FORM_OPTION_LANGUAGE_ES=Spanish
-FORM_OPTION_LANGUAGE_ET=Estonian
-FORM_OPTION_LANGUAGE_EU=Basque
-FORM_OPTION_LANGUAGE_FA=Persian
-FORM_OPTION_LANGUAGE_FI=Finnish
-FORM_OPTION_LANGUAGE_FJ=Fiji
-FORM_OPTION_LANGUAGE_FO=Faeroese
-FORM_OPTION_LANGUAGE_FR=French
-FORM_OPTION_LANGUAGE_FY=Frisian
-FORM_OPTION_LANGUAGE_GA=Irish
-FORM_OPTION_LANGUAGE_GD=Scots Gaelic
-FORM_OPTION_LANGUAGE_GL=Galician
-FORM_OPTION_LANGUAGE_GN=Guarani
-FORM_OPTION_LANGUAGE_GU=Gujarati
-FORM_OPTION_LANGUAGE_HA=Hausa
-FORM_OPTION_LANGUAGE_HI=Hindi
-FORM_OPTION_LANGUAGE_HR=Croatian
-FORM_OPTION_LANGUAGE_HU=Hungarian
-FORM_OPTION_LANGUAGE_HY=Armenian
-FORM_OPTION_LANGUAGE_IA=Interlingua
-FORM_OPTION_LANGUAGE_IE=Interlingue
-FORM_OPTION_LANGUAGE_IK=Inupiak
-FORM_OPTION_LANGUAGE_IN=Indonesian
-FORM_OPTION_LANGUAGE_IS=Icelandic
-FORM_OPTION_LANGUAGE_IT=Italian
-FORM_OPTION_LANGUAGE_IW=Hebrew
-FORM_OPTION_LANGUAGE_JA=Japanese
-FORM_OPTION_LANGUAGE_JI=Yiddish
-FORM_OPTION_LANGUAGE_JW=Javanese
-FORM_OPTION_LANGUAGE_KA=Georgian
-FORM_OPTION_LANGUAGE_KK=Kazakh
-FORM_OPTION_LANGUAGE_KL=Greenlandic
-FORM_OPTION_LANGUAGE_KM=Cambodian
-FORM_OPTION_LANGUAGE_KN=Kannada
-FORM_OPTION_LANGUAGE_KO=Korean
-FORM_OPTION_LANGUAGE_KS=Kashmiri
-FORM_OPTION_LANGUAGE_KU=Kurdish
-FORM_OPTION_LANGUAGE_KY=Kirghiz
-FORM_OPTION_LANGUAGE_LA=Latin
-FORM_OPTION_LANGUAGE_LN=Lingala
-FORM_OPTION_LANGUAGE_LO=Laothian
-FORM_OPTION_LANGUAGE_LT=Lithuanian
-FORM_OPTION_LANGUAGE_LV=Latvian, Lettish
-FORM_OPTION_LANGUAGE_MG=Malagasy
-FORM_OPTION_LANGUAGE_MI=Maori
-FORM_OPTION_LANGUAGE_MK=Macedonian
-FORM_OPTION_LANGUAGE_ML=Malayalam
-FORM_OPTION_LANGUAGE_MN=Mongolian
-FORM_OPTION_LANGUAGE_MO=Moldavian
-FORM_OPTION_LANGUAGE_MR=Marathi
-FORM_OPTION_LANGUAGE_MS=Malay
-FORM_OPTION_LANGUAGE_MT=Maltese
-FORM_OPTION_LANGUAGE_MY=Burmese
-FORM_OPTION_LANGUAGE_NA=Nauru
-FORM_OPTION_LANGUAGE_NE=Nepali
-FORM_OPTION_LANGUAGE_NL=Dutch
-FORM_OPTION_LANGUAGE_NO=Norwegian
-FORM_OPTION_LANGUAGE_OC=Occitan
-FORM_OPTION_LANGUAGE_OM=(Afan) Oromo
-FORM_OPTION_LANGUAGE_OR=Oriya
-FORM_OPTION_LANGUAGE_PA=Punjabi
-FORM_OPTION_LANGUAGE_PL=Polish
-FORM_OPTION_LANGUAGE_PS=Pashto, Pushto
-FORM_OPTION_LANGUAGE_PT=Portuguese
-FORM_OPTION_LANGUAGE_QU=Quechua
-FORM_OPTION_LANGUAGE_RM=Rhaeto-Romance
-FORM_OPTION_LANGUAGE_RN=Kirundi
-FORM_OPTION_LANGUAGE_RO=Romanian
-FORM_OPTION_LANGUAGE_RU=Russian
-FORM_OPTION_LANGUAGE_RW=Kinyarwanda
-FORM_OPTION_LANGUAGE_SA=Sanskrit
-FORM_OPTION_LANGUAGE_SD=Sindhi
-FORM_OPTION_LANGUAGE_SG=Sangro
-FORM_OPTION_LANGUAGE_SH=Serbo-Croatian
-FORM_OPTION_LANGUAGE_SI=Singhalese
-FORM_OPTION_LANGUAGE_SK=Slovak
-FORM_OPTION_LANGUAGE_SL=Slovenian
-FORM_OPTION_LANGUAGE_SM=Samoan
-FORM_OPTION_LANGUAGE_SN=Shona
-FORM_OPTION_LANGUAGE_SO=Somali
-FORM_OPTION_LANGUAGE_SQ=Albanian
-FORM_OPTION_LANGUAGE_SR=Serbian
-FORM_OPTION_LANGUAGE_SS=Siswati
-FORM_OPTION_LANGUAGE_ST=Sesotho
-FORM_OPTION_LANGUAGE_SU=Sundanese
-FORM_OPTION_LANGUAGE_SV=Swedish
-FORM_OPTION_LANGUAGE_SW=Swahili
-FORM_OPTION_LANGUAGE_TA=Tamil
-FORM_OPTION_LANGUAGE_TE=Tegulu
-FORM_OPTION_LANGUAGE_TG=Tajik
-FORM_OPTION_LANGUAGE_TH=Thai
-FORM_OPTION_LANGUAGE_TI=Tigrinya
-FORM_OPTION_LANGUAGE_TK=Turkmen
-FORM_OPTION_LANGUAGE_TL=Tagalog
-FORM_OPTION_LANGUAGE_TN=Setswana
-FORM_OPTION_LANGUAGE_TO=Tonga
-FORM_OPTION_LANGUAGE_TR=Turkish
-FORM_OPTION_LANGUAGE_TS=Tsonga
-FORM_OPTION_LANGUAGE_TT=Tatar
-FORM_OPTION_LANGUAGE_TW=Twi
-FORM_OPTION_LANGUAGE_UK=Ukrainian
-FORM_OPTION_LANGUAGE_UR=Urdu
-FORM_OPTION_LANGUAGE_UZ=Uzbek
-FORM_OPTION_LANGUAGE_VI=Vietnamese
-FORM_OPTION_LANGUAGE_VO=Volapuk
-FORM_OPTION_LANGUAGE_WO=Wolof
-FORM_OPTION_LANGUAGE_XH=Xhosa
-FORM_OPTION_LANGUAGE_YO=Yoruba
-FORM_OPTION_LANGUAGE_ZH=Chinese
-FORM_OPTION_LANGUAGE_ZU=Zulu
-FORM_LABEL_EXACT_NAME_MATCH=Exact match
-FORM_LABEL_CASE_SENSITIVE_MATCH=Case sensitive
-FORM_LABEL_SOUNDEX=Sound alike
-FORM_LABEL_IDENTIFIERS=Identifiers
-FORM_LABEL_IDENTIFIER_TYPE=Type
-
-# Do not translate the two items below.
-FORM_OPTION_IDENTIFIER_DUNS=D-U-N-S
-FORM_OPTION_IDENTIFIER_THOMAS_REGISTRY=Thomas Registry
-
-FORM_LABEL_KEY_NAME=Key name
-FORM_LABEL_KEY_VALUE=Key value
-FORM_LABEL_CATEGORIES=Categories
-FORM_LABEL_CATEGORY_TYPE=Type
-FORM_OPTION_CATEGORY_NAICS=NAICS
-FORM_OPTION_CATEGORY_UNSPSC_73=UNSPSC 7.3
-FORM_OPTION_CATEGORY_GEO=GEO
-FORM_LABEL_BUSINESS_CATEGORIES=Compare with:
-FORM_OPTION_BUSINESSES_ONLY=Businesses only
-FORM_OPTION_SERVICES_ONLY=Services only
-FORM_OPTION_BOTH=Businesses and Services
-FORM_LABEL_DISCOVERYURLS=Discovery URLs
-FORM_LABEL_DISCOVERYURL=Discovery URL
-FORM_LABEL_FINDQUALIFIERS=Find Qualifiers
-FORM_LABEL_COMBINE_KEYS=Combine keys:
-FORM_OPTION_ANDALLKEYS=And
-FORM_OPTION_ORALLKEYS=Or
-FORM_OPTION_ORLIKEKEYS=Or Like
-FORM_LABEL_SORT_BY_NAME=Sort by name:
-FORM_RADIO_SORT_ASC=Ascending
-FORM_RADIO_SORT_DESC=Descending
-FORM_LABEL_SORT_BY_DATE=Sort by date:
-FORM_LABEL_MAX_SEARCH_SET=Maximum size of search set:
-FORM_LABEL_MAX_RESULTS=Maximum number of results:
-FORM_LABEL_FIND_SERVICES_SIMPLE_DESC=Enter the partial or complete name of a service to search for. The '%' symbol can be used as a wildcard that matches any character. Press <strong>Go</strong> to execute the search.
-FORM_LABEL_FIND_SERVICE_UUID_DESC=Enter the UUID of the service to search for. Press <strong>Go</strong> to execute the search.
-FORM_LABEL_FIND_SERVICE_INTERFACES_SIMPLE_DESC=Enter the partial or complete name of a service interface to search for. The '%' symbol can be used as a wildcard that matches any character. Press <strong>Go</strong> to execute the search.
-FORM_LABEL_FIND_SERVICE_INTERFACE_UUID_DESC=Enter the UUID of the service interface to search for. Press <strong>Go</strong> to execute the search.
-FORM_LABEL_SERVICE_INTERFACES=Service Interfaces
-FORM_LABEL_UUID_KEY=UUID Key:
-FORM_LABEL_USE_SERVICE=Use service
-FORM_LABEL_SERVICE=Service
-FORM_LABEL_BUSINESS=Business
-FORM_LABEL_PUBLISH_ASSERTIONS=Publisher Assertions
-FORM_LABEL_DIRECTION=Direction
-FORM_LABEL_FROM_KEY=From Key
-FORM_LABEL_TO_KEY=To Key
-FORM_LABEL_STATUS=Status
-FORM_LABEL_ASSERTION_TYPE=Assertion Type
-FORM_OPTION_ASSERTION_TYPE_PARENT_CHILD=Parent-Child
-FORM_OPTION_ASSERTION_TYPE_PEER_TO_PEER=Peer-Peer
-FORM_OPTION_ASSERTION_TYPE_IDENTITY=Identity
-FORM_LABEL_ASSERTION_DIRETION_DESC=Direction <strong>From</strong> will create a publisher assertion from this business to the businesses above.  Direction <strong>To</strong> will create a publisher assertion from the above businesses to this business.
-FORM_OPTION_ASSERTION_DIRECTION_FROM=--->
-FORM_OPTION_ASSERTION_DIRECTION_TO=<---
-FORM_LABEL_THIS_BUSINESS=This
-MSG_ERROR_INVALID_QUERY_NAME=IWAB0140E Enter a valid name for the query.
-MSG_ERROR_INVALID_NAMES=IWAB0141E Enter a series of valid names.
-MSG_ERROR_INVALID_PUBLISH_URL=IWAB0142E Enter a valid publish URL.
-MSG_ERROR_INVALID_USERID=IWAB0143E Enter a valid user ID.
-MSG_ERROR_INVALID_MAX_SEARCH_SET=IWAB0145E Enter a valid size for the maximum search set.
-MSG_ERROR_INVALID_MAX_RESULTS=IWAB0146E Enter a valid size for the maximum number of results.
-MSG_INFO_BUSINESSES_FOUND=IWAB0147I Number of businesses found: %1
-MSG_ERROR_NO_BUSINESSES_FOUND=IWAB0148E No businesses found.
-MSG_INFO_SERVICES_FOUND=IWAB0149I Number of services found: %1
-MSG_ERROR_NO_SERVICES_FOUND=IWAB0150E No services found.
-MSG_ERROR_SINGLE_ITEM=IWAB0151E Select just one item.
-MSG_QUESTION_ITEM_REPLACEMENT=The selection will replace an item already in the target. Do you wish to proceed?
-MSG_INFO_SERVICE_INTERFACES_FOUND=IWAB0152I Number of service interfaces found: %1
-MSG_ERROR_NO_SERVICE_INTERFACES_FOUND=IWAB0153E No service interfaces found.
-MSG_ERROR_NOTHING_SELECTED=IWAB0154E Select at least one item.
-MSG_ERROR_INVALID_UUID_KEY=IWAB0155E Enter a valid UUID key.
-MSG_ERROR_QUERY_NAME_CONFLICT=IWAB0156E The subquery's query name cannot be the same as the originator.
-MSG_ERROR_NO_ITEMS_TO_GET=IWAB0157E No items of the specified type have been published or discovered yet.
-
-# Results
-ALT_QUERY_RESULTS=Query Results
-FORM_LABEL_SUBQUERY=The results may be used as inputs of another operation. Click the <strong>target</strong> link at the top to see the operation. Selected results can be used in the operation by clicking the <strong>Transfer</strong> button.
-FORM_LABEL_QUERY=Select a result to see more details or select a set of results and click a button to perform an operation.
-FORM_LINK_TARGET=target
-FORM_BUTTON_TRANSFER=Transfer
-FORM_BUTTON_REFRESH=Refresh
-FORM_BUTTON_ADD_TO_FAVORITES=Add to favorites
-FORM_BUTTON_UNPUBLISH=Unpublish
-FORM_BUTTON_CLEAR=Clear
-
-# Publish actions
-ALT_PUBLISH=Publish
-FORM_LABEL_PUBLISH=Publish:
-FORM_OPTION_BUSINESS=Business
-FORM_OPTION_SERVICE=Service
-FORM_OPTION_SERVICE_INTERFACE=Service Interface
-FORM_LABEL_PUBLISH_BUSINESS_SIMPLE_DESC=Enter a name and an optional description for the business to be published. Authentication may be required.
-FORM_LABEL_PUBLISH_BUSINESS_ADVANCED_DESC=Provide a name for the business to be published. Other parameters may also be specified. Authentication may be required.
-FORM_LABEL_PUBLISH_SERVICE_SIMPLE_DESC=Get or find a business and then provide the WSDL URL, name and an optional description for the service to be published. Authentication may be required.
-FORM_LABEL_PUBLISH_SERVICE_ADVANCED_DESC=Get or find a business and then provide the WSDL URL and a name for the service to be published. Other parameters may also be specified. Authentication may be required.
-FORM_LABEL_BUSINESS_PUBLISH_SERVICE_SIMPLE_DESC=Provide the WSDL URL, name and an optional description for the service to be published. Authentication may be required.
-FORM_LABEL_BUSINESS_PUBLISH_SERVICE_ADVANCED_DESC=Provide the WSDL URL and a name for the service to be published. Other parameters may also be specified. Authentication may be required.
-FORM_LABEL_PUBLISH_SERVICE_INTERFACE_SIMPLE_DESC=Enter a WSDL URL, name and an optional description for the service interface to be published. Authentication may be required.
-FORM_LABEL_PUBLISH_SERVICE_INTERFACE_ADVANCED_DESC=Provide the WSDL URL and name for the service interface to be published. Other parameters may also be specified. Authentication may be required.
-FORM_LABEL_PUBLISH_FORM=Publication format
-FORM_LABEL_DESCRIPTION=Description
-FORM_LABEL_DESCRIPTIONS=Descriptions
-MSG_INFO_BUSINESS_PUBLISHED=IWAB0158I Business %1 was successfully published.
-MSG_INFO_SERVICE_PUBLISHED=IWAB0159I Service %1 was successfully published.
-MSG_INFO_SERVICE_INTERFACE_PUBLISHED=IWAB0160I Service interface %1 was successfully published.
-MSG_ERROR_INVALID_NAME=IWAB0161E Enter a valid name.
-MSG_ERROR_ROW_BLANK_LANGUAGE=IWAB0250E Select a non-blank language for the %1 in row %2. Only the first row can have a blank language.
-MSG_ERROR_ROW_DUPLICATE_LANGUAGE=IWAB0251E Change the language for the %1 in row %2. The current one is already in use.
-MSG_ERROR_ROW_INVALID_TEXT=IWAB0252E Enter a valid %1 in row %2
-MSG_ERROR_INVALID_WSDL_URL=IWAB0253E Enter a valid WSDL URL.
-MSG_ERROR_NO_NAMES=IWAB0254E Add at least one name.
-MSG_ERROR_INVALID_SERVICE=IWAB0255E Provide a valid service.
-MSG_ERROR_INVALID_BUSINESS=IWAB0256E Provide a valid business.
-
-# Business Publish Service action
-ALT_PUBLISH_SERVICE=Publish Service
-
-# WSDL Browser
-TITLE_WSDL_BROWSER=WSDL Browser - %1
-FORM_LABEL_WSDL_SOURCE=Select a WSDL source:
-FORM_LABEL_WSDL_SOURCE_WEBPROJECTS=Web Projects
-FORM_LABEL_WSDL_SOURCE_FAVORITES=Favorites
-FORM_LABEL_WEB_PROJECT=Web Project
-FORM_LABEL_WSDL_URL=WSDL URL
-ALT_WSDL_BROWSER=WSDL Browser
-
-# Details
-FORM_LINK_EDIT=Edit
-FORM_LINK_CANCEL=Cancel
-FORM_LABEL_BUSINESS_KEY=Business Key
-FORM_LABEL_SERVICE_KEY=Service Key
-FORM_LABEL_SERVICE_INTERFACE_KEY=TModel Key
-FORM_LABEL_USER_DEFINED_CATEGORIES=User Defined Categories
-FORM_LABEL_CHECKED=Checked
-FORM_LABEL_FILE=File
-MSG_QUESTION_PUBLISH_ITEM=The item could not be found in the registry. Do you wish to publish it?
-MSG_QUESTION_SERVICE_PUBLISH_BUSINESS=The service and its business could not be found in the registry. Proceed to publish?
-MSG_INFO_BUSINESS_UPDATED=IWAB0257I Business %1 was successfully updated.
-MSG_INFO_SERVICE_UPDATED=IWAB0258I Service %1 was successfully updated.
-MSG_INFO_SERVICE_INTERFACE_UPDATED=IWAB0259I Service Interface %1 was successfully updated.
-MSG_INFO_REGISTRY_UPDATED=IWAB0323I Registry %1 was successfully updated.
-
-# UnpublishAction
-ALT_UNPUBLISH_BUSINESS=Unpublish Business
-ALT_UNPUBLISH_SERVICE=Unpublish Service
-ALT_UNPUBLISH_SERVICE_INTERFACE=Unpublish Service Interface
-FORM_LABEL_UNPUBLISH_DESC=Press <strong>Go</strong> to unpublish this object. Authentication may be required.
-MSG_INFO_BUSINESS_UNPUBLISHED=IWAB0260I Business %1 was successfully unpublished.
-MSG_INFO_SERVICE_UNPUBLISHED=IWAB0261I Service %1 was successfully unpublished.
-MSG_INFO_SERVICE_INTERFACE_UNPUBLISHED=IWAB0262I Service Interface %1 was successfully unpublished.
-
-# Add to WSDL Perspective
-ALT_ADD_TO_WSDL_PERSPECTIVE=Add To WSDL Page
-MSG_INFO_WSDL_ADDED_TO_WSDL_PERSPECTIVE=IWAB0376I %1 was successfully added to WSDL page.
-MSG_ERROR_WSDL_NOT_ADDED_TO_WSDL_PERSPECTIVE=IWAB0377E %1 could not be added to WSDL page.
-
-# Add to Favorites
-ALT_ADD_TO_FAVORITES=Add To Favorites
-MSG_INFO_FAVORITE_ADDED=IWAB0263I %1 was successfully added to favorites.
-MSG_ERROR_FAVORITE_NOT_ADDED=IWAB0264E %1 could not be added to favorites.
-MSG_ERROR_FAVORITE_ALREADY_EXISTS=IWAB0324E %1 already exists in favorties.
-MSG_QUESTION_OVERWRITE_FAVORITES=Favorite already exists.  Do you wish to overwrite?
-
-# Refresh
-MSG_INFO_NODE_REFRESHED=IWAB0265I %1 refreshed.
-MSG_QUESTION_REMOVE_NODE=%1 could not be found in the registry. Do you wish to clear it?
-
-# ManageReferencedServices
-ALT_MANAGE_REFERENCED_SERVICES=Manage Referenced Services
-FORM_LABEL_MANAGE_REFERENCED_SERVICES_DESC=Add discovered or published services to the list of referenced services by clicking the <strong>Add Services</strong> button. Remove selected references by clicking the <strong>Remove References</strong> button. Authentication may be required for changes.
-FORM_LABEL_REFERENCED_SERVICES=Referenced Services
-FORM_BUTTON_ADD_SERVICES=Add Services
-FORM_BUTTON_REMOVE_REFERENCES=Remove References
-MSG_ERROR_NO_REFERENCE_SELECTED=IWAB0266E Select at least one referenced service before proceeding.
-MSG_ERROR_NO_SERVICES=IWAB0267E Get or find at least one service before proceeding.
-MSG_ERROR_SERVICE_NOT_REFERENCED=IWAB0268E Service %1 could not be referenced.
-MSG_ERROR_REFERENCE_NOT_REMOVED=IWAB0269E Service reference %1 could not be removed.
-MSG_INFO_SERVICE_REFERENCED=IWAB0270I Service %1 was successfully referenced.
-MSG_INFO_SERVICE_REFERENCE_REMOVED=IWAB0271I Service reference %1 was successfully removed.
-
-# ManagePublisherAssertions
-ALT_MANAGE_PUBLISHER_ASSERTIONS=Manage Publisher Assertions
-FORM_LABEL_MANAGE_PUBLISHER_ASSERTIONS_DESC=Add discovered or published businesses to the list of publisher assertions by clicking <strong>Add Assertions</strong>. Remove selected assertions by clicking <strong>Remove Assertions</strong>. Complete selected assertions by clicking <strong>Complete Assertions</strong>. Click <strong>Refresh Assertions</strong> to refresh the list of assertions.
-FORM_LABEL_INCOMPLETE_ASSERTIONS_VISIBILITY_DESC=Please note that incomplete publisher assertions are visible only to the owner of the business.
-FORM_LABEL_BUSINESSES=Businesses
-FORM_BUTTON_SHOW_ALL_PUBLISHER_ASSERTIONS=Refresh Assertions
-FORM_BUTTON_COMPLETE_PUBLISHER_ASSERTIONS=Complete Assertions
-FORM_BUTTON_ADD_PUBLISHER_ASSERTIONS=Add Assertions
-FORM_BUTTON_REMOVE_PUBLISHER_ASSERTIONS=Remove Assertions
-MSG_INFO_PUBLISHER_ASSERTIONS_REFRESHED=IWAB0325I Publisher Assertions are refreshed.
-MSG_ERROR_NO_INCOMPLETE_ASSERTION_SELECTED=IWAB0326E Select at least one incomplete publisher assertion.
-MSG_ERROR_NOT_OWNED_BUSINESS=IWAB0327E This operation cannot be performed on a business owned by another party.
-
-# GetBusinesses
-ALT_GET_BUSINESS=Get Business
-ALT_GET_BUSINESSES=Get Businesses
-NODE_NAME_SERVICE_BUSINESS=Business for service %1
-NODE_NAME_SI_BUSINESSES=Businesses for service interface %1
-MSG_QUESTION_REMOVE_SERVICE_NODE=The service could not be found in the registry. Do you wish to remove this node?
-
-# GetServiceInterfaces
-ALT_GET_SERVICE_INTERFACES=Get Service Interfaces
-NODE_NAME_SERVICE_SERVICE_INTERFACES=Service interfaces for service %1
-MSG_QUESTION_GET_SI_REMOVE_SERVICE_NODE=The service could not be found in the registry. Do you wish to remove this node?
-
-# GetServices
-ALT_GET_SERVICES=Get Services
-NODE_NAME_SI_SERVICES=Services for service interface %1
-NODE_NAME_BUSINESS_SERVICES=Services for business %1
-MSG_QUESTION_REMOVE_SI_NODE=The service interface could not be found in the registry. Do you wish to remove this node?
-MSG_QUESTION_REMOVE_BUSINESS_NODE=The business could not be found in the registry. Do you wish to remove this node?
-
-# RefreshUDDINodesAction
-MSG_ERROR_NODE_DATA_VALIDATION_FAILED=IWAB0272E %1 could not be found in the registry.
-
-# Summaries
-ALT_SUMMARY_QUERIES=Summary of Queries
-ALT_SUMMARY_BUSINESSES=Summary of Businesses
-ALT_SUMMARY_SERVICES=Summary of Services
-ALT_SUMMARY_SERVICE_INTERFACES=Summary of Service Interfaces
-FORM_LABEL_QUERIES=Queries
-
-# SelectSubQueryItemAction
-MSG_QUESTION_ITEM_VALIDATION_FAILED=%1 could not be found in the registry. Do you wish to remove it?
-
-# Frame titles
-FRAME_TITLE_NAVIGATOR_CONTAINER=Navigator Container
-FRAME_TITLE_NAVIGATOR_TOOLBAR=Navigator Toolbar
-FRAME_TITLE_NAVIGATOR_CONTENT=Navigator Content
-FRAME_TITLE_ACTIONS_CONTAINER=Actions Container
-FRAME_TITLE_PROPERTIES_CONTAINER=Properties Container
-FRAME_TITLE_PROPERTIES_TOOLBAR=Properties Toolbar
-FRAME_TITLE_PROPERTIES_CONTENT=Properties Content
-FRAME_TITLE_STATUS_CONTAINER=Status Container
-FRAME_TITLE_STATUS_TOOLBAR=Status Toolbar
-FRAME_TITLE_STATUS_CONTENT=Status Content
-FRAME_TITLE_UDDI_PERSPECTIVE_CONTENT=UDDI Page Content
-FRAME_TITLE_CATEGORIES_WORKAREA=Categories Work Area
-FRAME_TITLE_CATEGORIES_TOOLBAR=Categories Toolbar
-FRAME_TITLE_CATEGORIES_CONTENT=Categories Content
-FRAME_TITLE_WSDL_TOOLBAR=WSDL Browser Toolbar
-FRAME_TITLE_WSDL_CONTENT=WSDL Browser Content
-
-# Form titles
-FORM_TITLE_BUSINESS_DETAILS=Business Details Form
-FORM_TITLE_BUSINESS_PUBLISH_SERVICE=Business Publish Service Form
-FORM_TITLE_GET_FORM=Select from Discovered and Published Objects Form
-FORM_TITLE_ITEMS_SUMMARY=Summary of Items Form
-FORM_TITLE_MANAGE_PUBLISHER_ASSERTIONS=Manage Publisher Assertions Form
-FORM_TITLE_MANAGE_REFERENCED_SERVICES=Manage Referenced Services Form
-FORM_TITLE_OPEN_REGISTRY=Open Registry Form
-FORM_TITLE_REGISTRY_DETAILS=Registry Details Form
-FORM_TITLE_REGISTRY_PUBLISH=Registry Publish Form
-FORM_TITLE_REGISTRY_FIND=Registry Find Form
-FORM_TITLE_RESULTS=Results Form
-FORM_TITLE_SERVICE_DETAILS=Service Details Form
-FORM_TITLE_SERVICE_INTERFACE_DETAILS=Service Interface Details Form
-FORM_TITLE_UNPUBLISH=Unpublish Form
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/wsdl.properties b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/wsdl.properties
deleted file mode 100644
index f53ffe4ea..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/wsdl.properties
+++ /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
-###############################################################################
-
-title=WSDL
-
-# Nodes
-NODE_NAME_WSDL_MAIN=WSDL Main
-
-# Frame titles
-FRAME_TITLE_NAVIGATOR_CONTAINER=Navigator Container
-FRAME_TITLE_NAVIGATOR_TOOLBAR=Navigator Toolbar
-FRAME_TITLE_NAVIGATOR_CONTENT=Navigator Content
-FRAME_TITLE_ACTIONS_CONTAINER=Actions Container
-FRAME_TITLE_PROPERTIES_CONTAINER=Properties Container
-FRAME_TITLE_PROPERTIES_TOOLBAR=Properties Toolbar
-FRAME_TITLE_PROPERTIES_CONTENT=Properties Content
-FRAME_TITLE_STATUS_CONTAINER=Status Container
-FRAME_TITLE_STATUS_TOOLBAR=Status Toolbar
-FRAME_TITLE_STATUS_CONTENT=Status Content
-FRAME_TITLE_WSDL_PERSPECTIVE_CONTENT=WSDL Page Content
-FRAME_TITLE_XSD_INFORMATION_TOOLBAR=XSD Information Dialog Toolbar
-FRAME_TITLE_XSD_INFORMATION_CONTENT=XSD Information Dialog Content
-
-# OpenWSDLAction
-ALT_OPEN_WSDL=Open WSDL
-MSG_ERROR_INVALID_WSDL_URL=IWAB0378E Enter a valid WSDL URL.
-MSG_ERROR_OPEN_WSDL=IWAB0379E Unable to open %1.
-MSG_ERROR_XSD_VALIDATION=IWAB0380E Errors were encountered while validating XML schemas.
-MSG_INFO_OPEN_WSDL_SUCCESSFUL=IWAB0381I %1 was successfully opened.
-
-# WSDL Element details
-ALT_WSDL_DETAILS=WSDL Details
-FORM_LABEL_WSDL_DETAILS_DESC=Shown below are the details for this WSDL document. Click on a service or binding to see its details.
-
-# WSDL Service Element details
-ALT_WSDL_SERVICE_DETAILS=WSDL Service Details
-FORM_LABEL_SERVICE_DETAILS_DESC=Shown below are the details for this &lt;service&gt; element. Click on a binding to see its operations.
-
-# WSDL Binding Element details
-ALT_WSDL_BINDING_DETAILS=WSDL Binding Details
-FORM_LABEL_BINDING_DETAILS_DESC=Shown below are the details for this <strong>%1</strong>  &lt;binding&gt; element. Click on an operation to fill in its parameters and invoke it or specify additional endpoints.
-
-# InvokeWSDLOperationAction
-ALT_INVOKE_WSDL_OPERATION=Invoke a WSDL Operation
-MSG_ERROR_UNABLE_TO_CONNECT=IWAB0382E Unable to connect to %1
-MSG_ERROR_VALIDATING_PARAMETER=IWAB0383E Error validating %1
-
-# WSDLAddToFavoritesAction
-ALT_ADD_WSDL_TO_FAVORITES=Add WSDL To Favorites
-MSG_ERROR_FAVORITES_ALREADY_EXISTS=IWAB0384E %1 already exists in favorites.
-MSG_ERROR_ADD_TO_FAVORITES=IWAB0385E Unable to add %1 to favorites.
-MSG_INFO_ADD_TO_FAVORITES_SUCCESSFUL=IWAB0386I %1 is added to favorites.
-MSG_QUESTION_OVERWRITE_FAVORITES=Favorite already exists.  Do you wish to overwrite?
-
-# RefreshWSDLAction
-MSG_INFO_REFRESH_WSDL_SUCCESSFUL=IWAB0387I %1 is refreshed.
-MSG_QUESTION_REMOVE_WSDL_NODE=%1 is no longer resolvable.  Do you wish to clear it?
-
-# UpdateWSDLBindingAction
-MSG_INFO_UPDATE_WSDL_BINDING_SUCCESSFUL=IWAB0388I Endpoints were successfully updated.
-
-# Form titles
-FORM_TITLE_OPEN_WSDL=Open WSDL Form
-FORM_TITLE_WSDL_DETAILS=WSDL Details Form
-FORM_TITLE_WSDL_SERVICE_DETAILS=WSDL Service Details Form
-FORM_TITLE_WSDL_BINDING_DETAILS=WSDL Binding Details Form
-FORM_TITLE_INVOKE_WSDL_OPERATION=WSDL Operation Form
-
-# Form Labels
-FORM_LABEL_OPEN_WSDL_DESC=Enter the URL of a WSDL document and click <strong>Go</strong> to explore.
-FORM_LABEL_SERVICES=Services
-FORM_LABEL_BINDINGS=Bindings
-FORM_LABEL_OPERATIONS=Operations
-FORM_LABEL_BINDING_TYPE=Type
-FORM_LABEL_BINDING_TYPE_UNSUPPORTED=Unsupported
-FORM_LABEL_BINDING_TYPE_SOAP=SOAP
-FORM_LABEL_BINDING_TYPE_HTTP_GET=HTTP GET
-FORM_LABEL_BINDING_TYPE_HTTP_POST=HTTP POST
-FORM_LABEL_NAME=Name
-FORM_LABEL_DOCUMENTATION=Documentation
-FORM_LABEL_ENDPOINT=Endpoint
-FORM_LABEL_INVOKE_WSDL_OPERATION_DESC=Enter the parameters of this WSDL operation and click <strong>Go</Strong> to invoke.
-FORM_LINK_ADD=Add
-FORM_LINK_REMOVE=Remove
-FORM_LABEL_VALUES=Values
-FORM_LABEL_ENABLE_DISABLE_GROUP=Enable/Disable group
-FORM_LABEL_UNION_TYPE=Union types
-FORM_LABEL_LANGUAGE=Language
-FORM_LABEL_XSD_APPLICATION_INFORMATION=Application Information
-FORM_LABEL_XSD_DOCUMENTATION=Documentation
-FORM_LABEL_SOAP_REQUEST_ENVELOPE=SOAP Request Envelope:
-FORM_LABEL_SOAP_RESPONSE_ENVELOPE=SOAP Response Envelope:
-FORM_LABEL_GROUP_ALL_ORDERING_MOVE_UP=Move element up
-FORM_LABEL_GROUP_ALL_ORDERING_MOVE_DOWN=Move element down
-FORM_LABEL_BASE_TYPE=Base type
-FORM_LABEL_UNBOUNDED=Unbounded
-FORM_LABEL_LENGTH=Length
-FORM_LABEL_LENGTH_VALUE=[%1..%2]
-FORM_LABEL_PATTERN=Pattern
-FORM_LABEL_WHITESPACE=Whitespace
-FORM_LABEL_RANGE_OF_VALUES=Range of values
-FORM_LABEL_MIN_EXCLUSIVE=(%1..
-FORM_LABEL_MIN_INCLUSIVE=[%1..
-FORM_LABEL_MAX_EXCLUSIVE=%1)
-FORM_LABEL_MAX_INCLUSIVE=%1]
-FORM_LABEL_TOTAL_DIGITS=Total digits
-FORM_LABEL_FRACTION_DIGITS=Fraction digits
-FORM_LABEL_OCCURANCE=Occurance of
-FORM_LABEL_UNION_MEMBERS=Union Members
-FORM_LABEL_LIST_ITEMS=List items
-FORM_LABEL_ELEMENTS=Elements
-FORM_LABEL_SOAP_ENC_ARRAYS=SOAP Arrays
-FORM_LABEL_CONTENT=Content
-FORM_LABEL_ATOMIC_NAME_TYPE=%1 (%2):
-FORM_LABEL_NULL=null
-FORM_LABEL_GROUP_NUMBER=Group %1
-FORM_LABEL_CHOICES=Choices
-FORM_LABEL_NOTHING_TO_DISPLAY_IN_FORM_VIEW=There is nothing to be displayed in the form view.  Please switch to the source view for the SOAP request and response.
-FORM_LABEL_SOAP_RESPONSE_FAILED_VALIDATION_IN_FORM_VIEW=The SOAP response failed schema validation.  Please switch to the source view for the SOAP response in XML format.
-FORM_LABEL_END_POINTS=Endpoints
-
-# Source/Form views
-FORM_LINK_FORM=Form
-ALT_SWITCH_TO_FORM_VIEW=Switch to form view
-FORM_LINK_SOURCE=Source
-ALT_SWITCH_TO_SOURCE_VIEW=Switch to source view
-FORM_LABEL_FRAGMENT_SOAP_VIEW_CONTENT=Soap Body:
-BUTTON_LABEL_LOAD=Load
-BUTTON_LABEL_SAVE_AS=Save As...
-MSG_QUESTION_SYNC_VIEWS=Format of the source content may be altered as a result of switching to the form view.  Do you wish to process?
-MSG_QUESTION_SYNC_VIEWS_DESPITE_INVALID_SOURCE_CONTENT=Content of the source view failed schema validation.  Synchronize anyways?  (Content of the source view may be modified)
-
-# Form control titles
-FORM_CONTROL_TITLE_ENABLE_DISABLE_GROUP=Enable/Disable group
-FORM_CONTROL_TITLE_SELECT_ELEMENT_IN_GROUP=Select element in group
-FORM_CONTROL_TITLE_SELECT_UNION_TYPE=Select union type
-FORM_CONTROL_TITLE_SOAP_FILE=SOAP data file
-
-# XSD Information Dialog
-TITLE_XSD_INFORMATION_DIALOG=XSD Information Dialog
-
-# Error messages
-MSG_ERROR_NOTHING_SELECTED=IWAB0389E Select at least one item.
-MSG_ERROR_MAX_OCCURS_VIOLATION=IWAB0390E Maximum occurance is reached.
-MSG_ERROR_MIN_OCCURS_VIOLATION=IWAB0391E Minimum occurance is reached.
-MSG_ERROR_CANNOT_MOVE_FIRST_ELEMENT_UP=IWAB0392E Selected element is already the first in the group.
-MSG_ERROR_CANNOT_MOVE_LAST_ELEMENT_DOWN=IWAB0393E Selected element is already the last in the group.
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/wsil.properties b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/wsil.properties
deleted file mode 100644
index b64c5b731..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/wsil.properties
+++ /dev/null
@@ -1,163 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-title=WSIL
-
-# Navigator
-WSIL_MAIN_NODE=WSIL Main
-
-# Forms
-FORM_LABEL_URL=URL
-FORM_LABEL_ITEM_NUMBER=Item #
-FORM_LABEL_UDDI_BUSINESS_NAME=UDDI Business Name
-FORM_LABEL_UDDI_SERVICE_NAME=UDDI Service Name
-FORM_LABEL_LANGUAGE=Language
-FORM_LABEL_ABSTRACT=Abstract
-FORM_LABEL_NAME=Name
-FORM_LABEL_WSDL_BINDINGS=WSDL Bindings
-FORM_LABEL_NAMESPACE_URI=Namespace URI
-FORM_LABEL_LOCAL_NAME=Local Name
-FORM_LABEL_INQUIRY_API=Inquiry API
-FORM_LABEL_SERVICE_KEY=Service Key
-FORM_LABEL_BUSINESS_KEY=Business Key
-FORM_LABEL_DISCOVERY_URL=Discovery URL
-FORM_LABEL_WSIL=WSIL Details
-FORM_LABEL_WSIL_LINKS=WSIL Links
-FORM_LABEL_WSDL_SERVICE=WSDL Services
-FORM_LABEL_UDDI_SERVICE=UDDI Services
-FORM_LABEL_UDDI_BUSINESS=UDDI Businesses
-FORM_LABEL_ADD_TO_NAVIGATOR=Add To Navigator
-FORM_LABEL_ADD_TO_FAVORITES=Add To Favorites
-FORM_LABEL_ADD_TO_UDDI_PERSPECTIVE=Add To UDDI Page
-FORM_LABEL_ADD_TO_WSDL_PERSPECTIVE=Add To WSDL Page
-FORM_LABEL_REFRESH=Refresh
-FORM_LABEL_NA=N/A
-FORM_LABEL_UNAVAILABLE_UDDI_SERVICE=Service Unavailable:
-FORM_LABEL_UNAVAILABLE_UDDI_BUSINESS=Business Unavailable:
-FORM_LABEL_CHOOSE_WSIL_INSPECTION_TYPE=Choose the type of objects to inspect:
-MSG_ERROR_NOTHING_SELECTED=IWAB0328E Select at least one item.
-
-# OpenWSILAction
-ALT_OPEN_WSIL=Open WSIL
-FORM_LABEL_OPEN_WSIL_DESC=Enter the URL of a WSIL document or a HTML document and click <strong>Go</strong> to open inspect.
-WSIL_URL=URL to document:
-MSG_ERROR_INVALID_WSIL_URL=IWAB0394E %1 is not a valid WSIL URL or HTML URL.
-MSG_ERROR_WSIL_ALREADY_OPENED=IWAB0329E %1 is already opened in the navigator.
-MSG_INFO_OPEN_WSIL_SUCCESSFUL=IWAB0330I %1 was successfully opened.
-
-# OpenWSILLinkAction
-ALT_OPEN_WSIL_LINK=Open WSIL Link
-MSG_ERROR_WSIL_LINK_ALREADY_OPENED=IWAB0331E %1 is already opened in the navigator
-MSG_INFO_OPEN_WSIL_LINK_SUCCESSFUL=IWAB0332I %1 was successfully opened.
-
-# WsilDetailsAction
-ALT_WSIL_DETAILS=WSIL Details
-
-# WsilServiceDetailsAction
-ALT_WSIL_SERVICE_DETAILS=WSIL Service Details
-
-# UddiLinkDetailsAction
-ALT_UDDI_LINK_DETAILS=UDDI Business Details
-
-# WsilLinkDetailsAction
-ALT_WSIL_LINK_DETAILS=WSIL Link Details
-
-# ListWSDLServicesAction
-ALT_LIST_WSDL_SERVICES=List All WSDL Services
-FORM_LABEL_LIST_WSDL_SERVICES_DESC=Select a set of WSDL services and click <strong>Add to Favorites</strong> to add these to the list of favorites.
-
-# ListUDDIServicesAction
-ALT_LIST_UDDI_SERVICES=List All UDDI Services
-FORM_LABEL_LIST_UDDI_SERVICES_DESC=Select a set of UDDI services and click <strong>Add to Favorites</strong> to add these to the list of favorites. Click <strong>Add to UDDI Page</strong> to add the selections to the UDDI Page. Click <strong>Refresh</strong> to refresh the selections.
-
-# ListUDDIBusinessesAction
-ALT_LIST_UDDI_LINKS=List All UDDI Businesses
-FORM_LABEL_LIST_UDDI_BUSINESSES_DESC=Select a set of UDDI businesses and click <strong>Add to Favorites</strong> to add these to the list of favorites. Click <strong>Add to UDDI Page</strong> to add these to the UDDI Page. Click <strong>Refresh</strong> to refresh the selections.
-
-# ListWSILLinksAction
-ALT_LIST_WSIL_LINKS=List All WSIL Links
-FORM_LABEL_LIST_WSIL_LINKS=Select a set of WSIL links and press <strong>Add to Navigator</strong> to open them in the navigator.
-
-# ClearWSILAction
-ALT_CLEAR_WSIL=Clear WSIL
-
-# RefreshAction
-ALT_REFRESH_WSIL=Refresh WSIL
-ALT_REFRESH_UDDI_BUSINESS=Refresh UDDI Business
-ALT_REFRESH_UDDI_SERVICE=Refresh UDDI Service
-MSG_ERROR_WSIL_NOT_FOUND=IWAB0333E WSIL %1 could not be loaded.
-MSG_ERROR_BUSINESS_NOT_FOUND=IWAB0334E Business %1 could not be found in the registry.
-MSG_ERROR_SERVICE_NOT_FOUND=IWAB0335E Service %1 could not be found in the registry.
-MSG_INFO_REFRESH_SUCCESSFUL=IWAB0336I %1 is refreshed.
-MSG_CONFIRM_REMOVE_NODE=%1 is no longer resolvable.  Do you wish to clear it?
-
-# AddToUDDIPerspectiveAction
-ALT_ADD_BUSINESS_TO_UDDI_PERSPECTIVE=Add Business To UDDI Page
-ALT_ADD_SERVICE_TO_UDDI_PERSPECTIVE=Add Service To UDDI Page
-MSG_INFO_ADD_TO_UDDI_PERSPECTIVE_SUCCESSFUL=IWAB0337I %1 is added to UDDI Page.
-MSG_ERROR_ADD_TO_UDDI_PERSPECTIVE=IWAB0338E Unable to add %1 to UDDI Page.
-MSG_ERROR_BUSINESS_NOT_FOUND=IWAB0339E Business %1 could not be found in the registry.
-MSG_ERROR_SERVICE_NOT_FOUND=IWAB0340E Service %1 could not be found in the registry.
-
-# WsilAddToWSDLPerspectiveAction
-ALT_ADD_WSDL_TO_WSDL_PERSPECTIVE=Add WSDL To WSDL Page
-MSG_INFO_ADD_WSDL_TO_WSDL_PERSPECTIVE_SUCCESSFUL=IWAB0395I %1 is added to WSDL Page.
-MSG_ERROR_ADD_WSDL_TO_WSDL_PERSPECTIVE=IWAB0396E %1 could not be loaded.
-
-# AddWSILToFavoritesAction
-ALT_ADD_WSIL_TO_FAVORITES=Add WSIL To Favorites
-MSG_ERROR_ADD_TO_FAVORITES=IWAB0341E Unable to add %1 to favorites.
-MSG_ERROR_FAVORITES_ALREADY_EXISTS=IWAB0342E %1 already exists in favorites.
-MSG_INFO_ADD_TO_FAVORITES_SUCCESSFUL=IWAB0343I %1 is added to favorites.
-MSG_QUESTION_OVERWRITE_FAVORITES=Favorite already exists.  Do you wish to overwrite?
-
-# AddWSDLServiceToFavoritesAction
-ALT_ADD_WSDL_SERVICE_TO_FAVORITES=Add WSDL To Favorites
-
-# AddBusinessToFavoritesAction
-ALT_ADD_UDDI_BUSINESS_TO_FAVORITES=Add UDDI Business To Favorites
-
-# AddServiceToFavoritesAction
-ALT_ADD_SERVICE_TO_FAVORITES=Add UDDI Service To Favorites
-
-# WSILImportWSILToWorkbench
-ATL_IMPORT_WSIL_TO_WORKBENCH=Import WSIL To Workbench
-FORM_LABEL_IMPORT_WSIL_TO_WORKBENCH_DESC=Select a workbench project to save the WSIL file into. You may also change the name of the WSIL file.
-
-# ImportToFileSystemAction
-ALT_WSIL_IMPORT_TO_FS=Import WSIL To File System
-ALT_WSDL_IMPORT_TO_FS=Import WSDL To File System
-
-# Frame titles
-FRAME_TITLE_NAVIGATOR_CONTAINER=Navigator Container
-FRAME_TITLE_NAVIGATOR_TOOLBAR=Navigator Toolbar
-FRAME_TITLE_NAVIGATOR_CONTENT=Navigator Content
-FRAME_TITLE_ACTIONS_CONTAINER=Actions Container
-FRAME_TITLE_PROPERTIES_CONTAINER=Properties Container
-FRAME_TITLE_PROPERTIES_CONTENT=Properties Content
-FRAME_TITLE_PROPERTIES_TOOLBAR=Properties Toolbar
-FRAME_TITLE_STATUS_CONTAINER=Status Container
-FRAME_TITLE_STATUS_CONTENT=Status Content
-FRAME_TITLE_STATUS_TOOLBAR=Status Toolbar
-
-# Form titles
-FORM_TITLE_OPEN_WSIL=Open WSIL Form
-FORM_TITLE_UDDI_BUSINESS_DETAILS=UDDI Business Details Form
-FORM_TITLE_UDDI_SERVICE_DETAILS=UDDI Service Details Form
-FORM_TITLE_WSDL_SERVICE_DETAILS=WSDL Service Details Form
-FORM_TITLE_WSIL_DETAILS=WSIL Details Form
-FORM_TITLE_WSIL_LINK_DETAILS=WSIL Link Details Form
-
-# View titles
-VIEW_TITLE_UDDI_BUSINESSES=UDDI Businesses View
-VIEW_TITLE_UDDI_SERVICES=UDDI Services View
-VIEW_TITLE_WSDL_SERVICES=WSDL Services View
-VIEW_TITLE_WSIL_LINKS=WSIL Links View
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/Action.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/Action.java
deleted file mode 100644
index 5f27c2f9c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/Action.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.actions;
-
-import java.util.Hashtable;
-import java.util.Vector;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.CurrentNodeSelectionTransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Perspective;
-
-// Abstract action class used for both Link and Form actions.
-public abstract class Action
-{
-  protected Controller controller_;
-  protected Hashtable propertyTable_;
-  protected Vector removedProperties_;
-
-  public Action()
-  {
-    this(null);
-  }
-
-  public Action(Controller controller)
-  {
-    controller_ = controller;
-    propertyTable_ = new Hashtable();
-    removedProperties_ = new Vector();
-  }
-
-  public final Controller getController()
-  {
-    return controller_;
-  }
-
-  /**
-  * Read properties from an HttpServletRequest and add them to the property table.
-  * @param HttpServletRequest The HttpServletRequest containing the embedded parameters.
-  * @return boolean Whether or not the operation was successful.
-  */
-  public abstract boolean populatePropertyTable(HttpServletRequest request);
-
-  /**
-  * Get the property table.
-  * @return Hashtable A hashtable containing the properties for this action.
-  */
-  public final Hashtable getPropertyTable()
-  {
-    return propertyTable_;
-  }
-  
-  /**
-   * Set the property table.
-   * @return void
-   */
-  public void setPropertyTable(Hashtable propertyTable)
-  {
-   propertyTable_ = propertyTable;
-  }
-  
-  /**
-   * Add a property to the property table.
-   * @param void
-   */
-  public final void addProperty(Object key, Object value)
-  {
-    propertyTable_.put(key, value);
-  }
-
-  /**
-  * Remove a property from the property table. Track the deletions.
-  * @param Object The key of the property being removed.
-  */
-  public final void removeProperty(Object key)
-  {
-    propertyTable_.remove(key);
-    removedProperties_.addElement(key);
-  }
-  
-  public final String[] getPropertyAsStringArray(Object key)
-  {
-    Object object = propertyTable_.get(key);
-    if (object instanceof String[])
-      return (String[])object;
-    else if (object != null)
-      return new String[] {object.toString()};
-    else
-      return new String[0];
-  }
-
-  public final boolean execute()
-  {
-    return execute(true);
-  }
-
-  public final boolean execute(boolean useActionEngine)
-  {
-    if (useActionEngine)
-      return controller_.getActionEngine().executeAction(this);
-    else
-      return run();
-  }
-
-  // Abstract method for running this action.
-  public abstract boolean run();
-  
-  /**
-  * Return the transformers used to normalize the input/output parameters for this action
-  * @return ITransformer[]
-  */
-  public ITransformer[] getTransformers()
-  {
-    return new ITransformer[] {new CurrentNodeSelectionTransformer(controller_)};
-  }
-  
-  protected void handleUnexpectedException(Perspective perspective,MessageQueue messageQueue,String exceptionName,Throwable t)
-  {
-    messageQueue.addMessage(perspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
-    messageQueue.addMessage(exceptionName);
-    messageQueue.addMessage(t.getMessage());
-  }  
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/CheckWorkbenchFileReadOnlyAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/CheckWorkbenchFileReadOnlyAction.java
deleted file mode 100644
index fd0e81f48..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/CheckWorkbenchFileReadOnlyAction.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.actions;
-
-import javax.servlet.http.HttpServletRequest;
-
-public class CheckWorkbenchFileReadOnlyAction extends Action
-{
-  public static final String getActionLink()
-  {
-    return "actions/CheckWorkbenchFileReadOnlyActionJSP.jsp";
-  }
-    
-  public boolean populatePropertyTable(HttpServletRequest request)
-  {
-    return true;
-  }
-  
-  public boolean run()
-  {
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ClearNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ClearNodeAction.java
deleted file mode 100644
index 56a51937b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ClearNodeAction.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.ws.internal.explorer.platform.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public abstract class ClearNodeAction extends NodeAction
-{
-  public ClearNodeAction(Controller controller,NodeManager nodeManager)
-  {
-    super(controller,nodeManager);
-  }
-
-  public boolean run()
-  {
-    int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-    if (!isStaleNode(nodeId))
-    {
-      Node node = nodeManager_.getNode(nodeId);
-      TreeElement element = node.getTreeElement();
-      element.disconnectAll();
-      // Do not add this to the history.
-      MessageQueue messageQueue = controller_.getCurrentPerspective().getMessageQueue();
-      messageQueue.addMessage(controller_.getMessage("MSG_INFO_NODE_CLEARED",node.getNodeName()));
-      return true;
-    }
-    return false;
-  }
-
-  public final String getActionLinkForHistory()
-  {
-    return null;
-  }
-
-  // Deleting a node from the tree results in changes to the treeview and status contents.
-  public abstract String getTreeContentVar();
-  public abstract String getTreeContentPage();
-  public abstract String getPropertiesContainerVar();
-  public abstract String getPropertiesContainerPage();
-  public abstract String getStatusContentVar();
-  public abstract String getStatusContentPage();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ClearViewElementAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ClearViewElementAction.java
deleted file mode 100644
index 38d97214d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ClearViewElementAction.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.ws.internal.explorer.platform.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListManager;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ViewTool;
-
-// Abstract action class used for both Link and Form actions.
-public abstract class ClearViewElementAction extends LinkAction
-{
-  private String listManagerRel_;
-  private NodeManager nodeManager_;
-  public ClearViewElementAction(Controller controller,NodeManager nodeManager,String listManagerRel)
-  {
-    super(controller);
-    nodeManager_  = nodeManager;
-    listManagerRel_ = listManagerRel;
-  }
-
-  // ...jsp?viewId=...
-  protected final boolean processLinkParameters(HttpServletRequest request)
-  {
-    String viewIdString = request.getParameter(ActionInputs.VIEWID);
-    // Perform data validation.
-    try
-    {
-      Integer.parseInt(viewIdString);
-    }
-    catch (NumberFormatException e)
-    {
-      // Validation failed!
-      return false;
-    }
-    propertyTable_.put(ActionInputs.VIEWID,viewIdString);
-    return true;
-  }
-
-  public final boolean run()
-  {
-    int viewId = Integer.parseInt((String)propertyTable_.get(ActionInputs.VIEWID));
-    Node selectedNode = nodeManager_.getSelectedNode();
-    ViewTool viewTool = (ViewTool)selectedNode.getToolManager().getSelectedTool();
-    if (viewTool.getToolManager(viewId) == null)
-    {
-      // Stale view.
-      return false;
-    }
-    TreeElement element = selectedNode.getTreeElement();
-    ListManager listManager = (ListManager)element.getPropertyAsObject(listManagerRel_);
-    listManager.removeElementWithViewId(viewId);
-    viewTool.clearViewToolManager(viewId);
-    selectedNode.setViewId(ActionInputs.VIEWID_DEFAULT);
-    // Do not add this to the history.
-    return true;
-  }
-
-  public final String getActionLinkForHistory()
-  {
-    return null;
-  }
-
-  public abstract String getPropertiesContainerVar();
-  public abstract String getPropertiesContainerPage();
-  public abstract String getStatusContentVar();
-  public abstract String getStatusContentPage();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/FormAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/FormAction.java
deleted file mode 100644
index 8ade3c5a9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/FormAction.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.wst.ws.internal.explorer.platform.actions;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.util.HTMLUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-
-public abstract class FormAction extends Action
-{
-  public FormAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  protected abstract boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException;
-
-  public final boolean populatePropertyTable(HttpServletRequest request)
-  {
-    try
-    {
-      MultipartFormDataParser parser = new MultipartFormDataParser();
-      parser.parseRequest(request,HTMLUtils.UTF8_ENCODING);
-      getSelectedFormTool().clearErrors();
-      boolean result = processParsedResults(parser);
-      removedProperties_.removeAllElements();
-      return result;
-    }
-    catch (MultipartFormDataException e)
-    {
-    }
-    return false;
-  }
-  
-  public void setPropertyTable(Hashtable propertyTable)
-  {
-    try
-    {
-      processParsedResults(new MultipartFormDataParser(propertyTable));
-    }
-    catch (MultipartFormDataException mfde)
-    {
-    }
-    for (Iterator it = propertyTable.keySet().iterator(); it.hasNext();)
-    {
-      Object key = it.next();
-      Hashtable thisPropertyTable = getPropertyTable();
-      if (!thisPropertyTable.containsKey(key))
-        addProperty(key, propertyTable.get(key));
-    }
-  }
-
-  protected final void addToHistory(int perspectiveId,String url)
-  {
-    controller_.addToHistory(perspectiveId,url);
-  }
-
-  public abstract FormTool getSelectedFormTool();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/FormInputException.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/FormInputException.java
deleted file mode 100644
index 0f94a9920..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/FormInputException.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.ws.internal.explorer.platform.actions;
-
-// A class for reporting form input exceptions.
-public class FormInputException extends Exception
-{
-  /**
-	 * Comment for <code>serialVersionUID</code>
-	 */
-	private static final long serialVersionUID = 3257846601685938742L;
-
-public FormInputException(String msg)
-  {
-    super(msg);
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ImportToFileSystemAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ImportToFileSystemAction.java
deleted file mode 100644
index 3ad12b3a3..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ImportToFileSystemAction.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.wst.ws.internal.explorer.platform.actions;
-
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import javax.servlet.http.HttpServletRequest;
-import javax.wsdl.Definition;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLWriter;
-import org.apache.wsil.WSILDocument;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.wsdl.internal.impl.wsdl4j.WSDLFactoryImpl;
-
-public abstract class ImportToFileSystemAction extends LinkAction
-{
-  public ImportToFileSystemAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  // os is the OutputStream of the file in the file system
-  public abstract boolean write(OutputStream os);
-
-  // the default name for the file
-  public abstract String getDefaultFileName();
-
-  public boolean writeWSDLDefinition(OutputStream os, Definition definition)
-  {
-    try
-    {
-      WSDLFactory wsdlFactory = new WSDLFactoryImpl();
-      WSDLWriter wsdlWriter = wsdlFactory.newWSDLWriter();
-      wsdlWriter.writeWSDL(definition, os);
-      return true;
-    }
-    catch (Throwable t)
-    {
-      return false;
-    }
-  }
-
-  public boolean writeWSILDocument(OutputStream os, WSILDocument wsilDoc)
-  {
-    OutputStreamWriter osw = null;
-    try
-    {
-      osw = new OutputStreamWriter(os);
-      wsilDoc.write(osw);
-      return true;
-    }
-    catch (Exception e)
-    {
-      return false;
-    }
-    finally
-    {
-      try
-      {
-        if (osw != null)
-          osw.close();
-      }
-      catch (Exception e)
-      {
-      }
-    }
-  }
-
-  public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID, String jspPage)
-  {
-    StringBuffer actionLink = new StringBuffer(jspPage);
-    actionLink.append('?');
-    actionLink.append(ActionInputs.NODEID);
-    actionLink.append('=');
-    actionLink.append(nodeID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.TOOLID);
-    actionLink.append('=');
-    actionLink.append(toolID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.VIEWID);
-    actionLink.append('=');
-    actionLink.append(viewID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.VIEWTOOLID);
-    actionLink.append('=');
-    actionLink.append(viewToolID);
-    return actionLink.toString();
-  }
-
-  protected boolean processLinkParameters(HttpServletRequest request)
-  {
-    String nodeID = request.getParameter(ActionInputs.NODEID);
-    String toolID = request.getParameter(ActionInputs.TOOLID);
-    String viewID = request.getParameter(ActionInputs.VIEWID);
-    String viewToolID = request.getParameter(ActionInputs.VIEWTOOLID);
-    try
-    {
-      Integer.parseInt(nodeID);
-      Integer.parseInt(toolID);
-      Integer.parseInt(viewID);
-      Integer.parseInt(viewToolID);
-      propertyTable_.put(ActionInputs.NODEID, nodeID);
-      propertyTable_.put(ActionInputs.TOOLID, toolID);
-      propertyTable_.put(ActionInputs.VIEWID, viewID);
-      propertyTable_.put(ActionInputs.VIEWTOOLID, viewToolID);
-    }
-    catch (Exception e)
-    {
-      return false;
-    }
-    return true;
-  }
-
-  public abstract String getStatusContentVar();
-
-  public abstract String getStatusContentPage();
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ImportToWorkbenchAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ImportToWorkbenchAction.java
deleted file mode 100644
index 4c714779a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ImportToWorkbenchAction.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.actions;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.OutputStream;
-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.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.wst.command.internal.env.eclipse.EclipseEnvironment;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.wsil.AddWSDLToWSILCommand;
-
-public abstract class ImportToWorkbenchAction extends FormAction {
-  private IWorkspaceRoot iWorkspaceRoot_;
-  private IProject iProject_;
-  private IResource targetFileResource_;
-
-    public ImportToWorkbenchAction(Controller controller) {
-        super(controller);
-        iWorkspaceRoot_ = ResourcesPlugin.getWorkspace().getRoot();
-    }
-
-    protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException {
-        getSelectedFormTool();
-        MessageQueue msgQueue = controller_.getCurrentPerspective().getMessageQueue();
-        boolean inputsValid = true;
-        String workbenchProjectName = parser.getParameter(ActionInputs.WORKBENCH_PROJECT_NAME);
-        if (workbenchProjectName == null || workbenchProjectName.length() <= 0) {
-            msgQueue.addMessage(controller_.getMessage("MSG_ERROR_INVALID_WORKBENCH_PROJECT"));
-            inputsValid = false;
-        }
-        else
-        {
-            iProject_ = iWorkspaceRoot_.getProject(workbenchProjectName);
-            propertyTable_.put(ActionInputs.WORKBENCH_PROJECT_NAME, workbenchProjectName);
-        }
-        String importFile = parser.getParameter(ActionInputs.IMPORT_FILE);
-        if (importFile != null)
-        {
-            propertyTable_.put(ActionInputs.IMPORT_FILE, ActionInputs.IMPORT_FILE);
-            String importedFileName = parser.getParameter(ActionInputs.IMPORTED_FILE_NAME);
-            if (importedFileName == null || importedFileName.length() <= 0)
-            {
-                msgQueue.addMessage(controller_.getMessage("MSG_ERROR_INVALID_FILE_NAME"));
-                inputsValid = false;
-            }
-            else
-                propertyTable_.put(ActionInputs.IMPORTED_FILE_NAME, importedFileName);
-        }
-        String importToWSIL = parser.getParameter(ActionInputs.IMPORT_TO_WSIL);
-        if (importToWSIL != null)
-        {
-            propertyTable_.put(ActionInputs.IMPORT_TO_WSIL, ActionInputs.IMPORT_TO_WSIL);
-            propertyTable_.put(ActionInputs.IMPORTED_WSDL_URL, parser.getParameter(ActionInputs.IMPORTED_WSDL_URL));
-            String wsilFileName = parser.getParameter(ActionInputs.WSIL_FILE_NAME);
-            if (wsilFileName == null || wsilFileName.length() <= 0)
-            {
-                msgQueue.addMessage(controller_.getMessage("MSG_ERROR_INVALID_WSIL_FILE_NAME"));
-                inputsValid = false;
-            }
-            else
-                propertyTable_.put(ActionInputs.WSIL_FILE_NAME, wsilFileName);
-        }
-        if (importFile == null && importToWSIL == null)
-        {
-            msgQueue.addMessage(controller_.getMessage("MSG_ERROR_NO_IMPORT_OPTION_SELECTED"));
-            inputsValid = false;
-        }
-        return inputsValid;
-    }
-
-    private OutputStream getOutputStream(String defaultFileName) throws FileNotFoundException {
-        File file = new File(controller_.getServletEngineStateLocation() + defaultFileName);
-        FileOutputStream fos = new FileOutputStream(file);
-        return fos;
-    }
-
-    private boolean importTempFileToWebProject(String defaultFileName) throws FileNotFoundException, CoreException
-    {
-      if (targetFileResource_ != null && targetFileResource_.getType() == IResource.FILE)
-        targetFileResource_.delete(true,new NullProgressMonitor());
-
-      String importedFileName = (String)propertyTable_.get(ActionInputs.IMPORTED_FILE_NAME);
-      File file = new File(controller_.getServletEngineStateLocation()+defaultFileName);
-      BufferedInputStream bis = new BufferedInputStream(new FileInputStream(file));
-
-      IFile iFile = iProject_.getFile("/"+importedFileName);
-      iFile.create(bis,true,new NullProgressMonitor());
-
-      // Remove the temporary file
-      file.delete();
-      return true;
-    }
-
-    public boolean fileExists()
-    {
-      String importedFileName = (String)propertyTable_.get(ActionInputs.IMPORTED_FILE_NAME);
-      if (importedFileName != null)
-      {
-        targetFileResource_ = iProject_.findMember(importedFileName);
-        return (targetFileResource_ != null && targetFileResource_.getType() == IResource.FILE);
-      }
-      else
-        return false;
-    }
-
-    public boolean isTargetFileResourceReadOnly()
-    {
-      return targetFileResource_.getResourceAttributes().isReadOnly();
-    }
-
-    // TODO: ResourceContext need to move to org.eclipse.wst.ws.
-    public boolean isCheckoutFilesEnabled()
-    {
-    	return true;
-//      return WebServicePlugin.getInstance().getResourceContext().isCheckoutFilesEnabled();
-    }
-
-    public String getWebServicePluginFileMessage(String messageId)
-    {
-      String importedFileName = (String)propertyTable_.get(ActionInputs.IMPORTED_FILE_NAME);
-      return controller_.getMessage(messageId,new String[]{iProject_.getFullPath().toString(),importedFileName});
-    }
-
-    // TODO: ResourceContext need to move to org.eclipse.wst.ws. 
-    public boolean isOverwriteFilesEnabled()
-    {
-    	return true;
-//      return WebServicePlugin.getInstance().getResourceContext().isOverwriteFilesEnabled();
-    }
-
-    public boolean validateEdit()
-    {
-      IFile[] files = new IFile[1];
-      files[0] = (IFile)targetFileResource_;
-      IStatus status = ResourcesPlugin.getWorkspace().validateEdit(files,null);
-      MessageQueue messageQueue = controller_.getCurrentPerspective().getMessageQueue();
-      messageQueue.addMessage(status.getMessage());
-      return status.isOK();
-    }
-
-    public boolean run() {
-        MessageQueue msgQueue = controller_.getCurrentPerspective().getMessageQueue();
-        if (propertyTable_.get(ActionInputs.IMPORT_FILE) != null)
-        {
-            try {
-                ImportToFileSystemAction action = newImportToFileSystemAction();
-                action.run();
-                String defaultFileName = action.getDefaultFileName();
-                if (!action.write(getOutputStream(defaultFileName))) {
-                    msgQueue.addMessage(controller_.getMessage("MSG_ERROR_WRITING_TEMP_FILE_TO_FS"));
-                    return false;
-                }
-                importTempFileToWebProject(defaultFileName);
-                String importedFileName = (String)propertyTable_.get(ActionInputs.IMPORTED_FILE_NAME);
-                msgQueue.addMessage(controller_.getMessage("MSG_INFO_IMPORT_TO_WORKBENCH_SUCCESSFUL", importedFileName));
-            }
-            catch (FileNotFoundException fnfe) {
-                msgQueue.addMessage(fnfe.getMessage());
-                return false;
-            }
-            catch (CoreException ce) {
-                msgQueue.addMessage(ce.getMessage());
-                return false;
-            }
-        }
-        if (propertyTable_.get(ActionInputs.IMPORT_TO_WSIL) != null)
-        {
-            String projectName = (String)propertyTable_.get(ActionInputs.WORKBENCH_PROJECT_NAME);
-            String importedWSILFileName = (String)propertyTable_.get(ActionInputs.WSIL_FILE_NAME);
-            String wsdlURL = (String)propertyTable_.get(ActionInputs.IMPORTED_WSDL_URL);
-            StringBuffer wsilPlatformURL = new StringBuffer("platform:/resource/");
-            wsilPlatformURL.append(projectName);
-            wsilPlatformURL.append('/');
-            wsilPlatformURL.append(importedWSILFileName);
-            AddWSDLToWSILCommand command = new AddWSDLToWSILCommand();
-            String[] args = new String[5];
-            args[0] = AddWSDLToWSILCommand.ARG_WSIL;
-            args[1] = wsilPlatformURL.toString();
-            args[2] = AddWSDLToWSILCommand.ARG_WSDL;
-            args[3] = wsdlURL;
-            args[4] = AddWSDLToWSILCommand.ARG_RESOLVE_WSDL;
-            command.setArguments(args);
-            IEnvironment env = new EclipseEnvironment(null, null, null);
-            command.setEnvironment( env );
-            command.execute( null, null );
-            msgQueue.addMessage(controller_.getMessage("MSG_INFO_IMPORT_SERVICE_REF_TO_WSIL_SUCCESSFUL", importedWSILFileName));
-        }
-        return true;
-    }
-
-    public abstract String getStatusContentVar();
-    public abstract String getStatusContentPage();
-    public abstract ImportToFileSystemAction newImportToFileSystemAction();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/LaunchWebServiceWizardAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/LaunchWebServiceWizardAction.java
deleted file mode 100644
index f9ddf5e87..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/LaunchWebServiceWizardAction.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.actions;
-
-import org.eclipse.wst.ws.internal.explorer.LaunchWizardRunnable;
-import org.eclipse.wst.ws.internal.explorer.LaunchWizardTask;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-
-public abstract class LaunchWebServiceWizardAction extends FormAction
-{
-  public LaunchWebServiceWizardAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    String wizardID = parser.getParameter(ActionInputs.WEB_SERVICE_WIZARD);
-    propertyTable_.put(ActionInputs.WEB_SERVICE_WIZARD, wizardID);
-    return true;
-  }
-
-  public boolean launchWizard(String wsdlURL)
-  {
-    LaunchWizardTask task = LaunchWizardTask.getInstance();
-    if (task.getIsExecuting())
-    {
-      controller_.getCurrentPerspective().getMessageQueue().addMessage(controller_.getMessage("MSG_ERROR_WIZARD_ALREADY_RUNNING"));
-      return false;
-    }
-    int wizardID = Integer.parseInt((String)propertyTable_.get(ActionInputs.WEB_SERVICE_WIZARD));
-    LaunchWizardRunnable runnable;
-    if (wizardID == ActionInputs.WEB_SERVICE_CLIENT_WIZARD)
-      runnable = new LaunchWizardRunnable("org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard", wsdlURL);
-    else if (wizardID == ActionInputs.WEB_SERVICE_SKELETON_WIZARD)
-      runnable = new LaunchWizardRunnable("org.eclipse.jst.ws.creation.ui.wizard.serverwizard", wsdlURL);
-    else
-      return false;
-    task.checkAndAsyncExec(runnable);
-    return true;
-  }
-
-  public abstract String getStatusContentVar();
-
-  public abstract String getStatusContentPage();
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/LinkAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/LinkAction.java
deleted file mode 100644
index 06c508f25..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/LinkAction.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-
-// Abstract class representing the action of clicking a link. These actions
-// may change the history list.
-public abstract class LinkAction extends Action
-{
-  private boolean isAddedToHistory_;
-  private boolean isStaleBreadCrumb_;
-
-  public LinkAction(Controller controller)
-  {
-    super(controller);
-    isAddedToHistory_ = false;
-    isStaleBreadCrumb_ = false;
-  }
-
-  // Determine if the action was successfully added to this history list.
-  // This should be called after the run() method.
-  public final boolean isAddedToHistory()
-  {
-    return isAddedToHistory_;
-  }
-
-  protected abstract boolean processLinkParameters(HttpServletRequest request);
-
-  public final boolean populatePropertyTable(HttpServletRequest request)
-  {
-    String isHistoryString = request.getParameter(ActionInputs.ISHISTORY);
-    if (isHistoryString != null)
-      propertyTable_.put(ActionInputs.ISHISTORY,isHistoryString);
-    return processLinkParameters(request);
-  }
-
-  // Add the action's URL to the controller's history list.
-  protected final void addToHistory(int perspectiveId,String url)
-  {
-    if (!isHistoryAction())
-      isAddedToHistory_ = controller_.addToHistory(perspectiveId,url);
-  }
-
-  public final boolean isHistoryAction()
-  {
-    return (propertyTable_.get(ActionInputs.ISHISTORY) != null);
-  }
-
-  public final void setStaleBreadCrumb()
-  {
-    if (isHistoryAction())
-    {
-      isStaleBreadCrumb_ = true;
-      controller_.processStaleBreadCrumb();
-    }
-  }
-
-  public final boolean isStaleBreadCrumb()
-  {
-    return isStaleBreadCrumb_;
-  }
-
-  // Call this when a stale breadcrumb is encountered while traversing history chain.
-  public final String getNextHistoryActionLink()
-  {
-    return RetrieveHistoryAction.getActionLink(controller_.getHistoryDirection());
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/NodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/NodeAction.java
deleted file mode 100644
index 210e052ed..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/NodeAction.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.ws.internal.explorer.platform.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public abstract class NodeAction extends LinkAction
-{
-  protected NodeManager nodeManager_;
-  private boolean requiresTreeViewRefresh_;
-  private boolean requiresNodeSelection_;
-  private boolean requiresViewSelection_;
-  private boolean requiresStatusUpdate_;
-
-  public NodeAction(Controller controller,NodeManager nodeManager)
-  {
-    super(controller);
-    nodeManager_ = nodeManager;
-    requiresTreeViewRefresh_ = false;
-    requiresNodeSelection_ = false;
-    requiresViewSelection_ = false;
-    requiresStatusUpdate_ = false;
-  }
-
-  // ...jsp?nodeId=...<&isHistory=1>
-  protected boolean processLinkParameters(HttpServletRequest request)
-  {
-    String nodeIdString = request.getParameter(ActionInputs.NODEID);
-    // Perform data validation.
-    try
-    {
-      Integer.parseInt(nodeIdString);
-    }
-    catch (NumberFormatException e)
-    {
-      // Validation failed!
-      return false;
-    }
-    propertyTable_.put(ActionInputs.NODEID,nodeIdString);
-    return true;
-  }
-
-  protected final boolean isStaleNode(int nodeId)
-  {
-    return (nodeManager_.getNode(nodeId) == null);
-  }
-
-  /**
-  * Make a node visible. A node is visible when all of its ancestors are expanded.
-  * @param Node The node to be made visible.
-  * @return boolean Indicator for whether or not the tree structure was changed (i.e. expanded to show the node in question).
-  */
-  protected final boolean makeNodeVisible(Node node)
-  {
-    requiresTreeViewRefresh_ = node.getNodeManager().makeNodeVisible(node);
-    return requiresTreeViewRefresh_;
-  }
-
-  /**
-  * Select a node with id nodeId.
-  * @param int The id of the node to be selected.
-  */
-  protected final void setSelectedNodeId(int nodeId)
-  {
-    if (nodeManager_.getSelectedNodeId() != nodeId)
-    {
-      requiresNodeSelection_ = true;
-      nodeManager_.setSelectedNodeId(nodeId);
-    }
-  }
-
-  protected final void setSelectedViewId(int viewId)
-  {
-    Node selectedNode = nodeManager_.getSelectedNode();
-    if (selectedNode.getViewId() != viewId)
-    {
-      requiresViewSelection_ = true;
-      selectedNode.setViewId(viewId);
-    }
-  }
-
-  // Determine whether or not the treeview requires reloading as a result of this action.
-  // Reloading is required when branches are added/removed.
-  public boolean requiresTreeViewRefresh()
-  {
-    return requiresTreeViewRefresh_;
-  }
-
-  // Determine whether or not a new node has been selected as a result of the action.
-  public boolean requiresNodeSelection()
-  {
-    return requiresNodeSelection_;
-  }
-
-  // Determine if a new view element is selected.
-  public boolean requiresViewSelection()
-  {
-    return requiresViewSelection_;
-  }
-
-  // Determine if any status messages arose from this action.
-  public boolean requiresStatusUpdate()
-  {
-    return requiresStatusUpdate_;
-  }
-
-  protected abstract String getActionLinkForHistory();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/OpenCalendarBrowserAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/OpenCalendarBrowserAction.java
deleted file mode 100644
index 48ec08b1d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/OpenCalendarBrowserAction.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.ws.internal.explorer.platform.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-
-public class OpenCalendarBrowserAction extends Action
-{
-  public OpenCalendarBrowserAction()
-  {
-  }
-
-  // calendar_browser.jsp?sessionId=...&calendarType=...
-  public static final String getActionLink(String sessionId,int calendarType)
-  {
-    StringBuffer actionLink = new StringBuffer("calendar_browser.jsp?");
-    actionLink.append(ActionInputs.SESSIONID).append('=').append(sessionId);
-    actionLink.append('&').append(ActionInputs.CALENDAR_TYPE).append('=').append(calendarType);
-    return actionLink.toString();
-  }
-  
-  public static final String getActionLinkForDate(String sessionId)
-  {
-    return getActionLink(sessionId,ActionInputs.CALENDAR_TYPE_DATE);
-  }
-  
-  public static final String getActionLinkForDateTime(String sessionId)
-  {
-    return getActionLink(sessionId,ActionInputs.CALENDAR_TYPE_DATETIME);
-  }
-  
-  public static final String getActionLinkForGYearMonth(String sessionId)
-  {
-    return getActionLink(sessionId,ActionInputs.CALENDAR_TYPE_GYEARMONTH);
-  }
-  
-  public static final String getActionLinkForGDay(String sessionId)
-  {
-    return getActionLink(sessionId,ActionInputs.CALENDAR_TYPE_GDAY);
-  }
-  
-  public static final String getActionLinkForGMonthDay(String sessionId)
-  {
-    return getActionLink(sessionId,ActionInputs.CALENDAR_TYPE_GMONTHDAY);
-  }
-
-  public final boolean populatePropertyTable(HttpServletRequest request)
-  {
-    return true;
-  }
-
-  public final boolean run()
-  {
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/OpenWSDLBrowserAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/OpenWSDLBrowserAction.java
deleted file mode 100644
index fc176914a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/OpenWSDLBrowserAction.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-
-public class OpenWSDLBrowserAction extends Action
-{
-  public OpenWSDLBrowserAction()
-  {
-  }
-
-  public static final String getActionLink(String sessionId,int wsdlType)
-  {
-    StringBuffer actionLink = new StringBuffer("wsdl_browser.jsp?");
-    actionLink.append(ActionInputs.SESSIONID).append('=').append(sessionId);
-    actionLink.append('&').append(ActionInputs.WSDL_TYPE).append('=').append(wsdlType);
-    return actionLink.toString();
-  }
-
-  public static final String getActionLinkForService(String sessionId)
-  {
-    return getActionLink(sessionId,ActionInputs.WSDL_TYPE_SERVICE);
-  }
-  
-  public static final String getActionLinkForServiceInterface(String sessionId)
-  {
-    return getActionLink(sessionId,ActionInputs.WSDL_TYPE_SERVICE_INTERFACE);
-  }
-
-  public final boolean populatePropertyTable(HttpServletRequest request)
-  {
-    return true;
-  }
-
-  public final boolean run()
-  {
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ProxyLoadPageAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ProxyLoadPageAction.java
deleted file mode 100644
index 56ef2d662..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ProxyLoadPageAction.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.ws.internal.explorer.platform.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-
-public class ProxyLoadPageAction extends Action
-{
-  // Get the action given a relative targetPage URL. e.g. "forms/LongLoadingForm.jsp"
-  public static final String getActionLink(String targetPage)
-  {
-    return getActionLink(null,targetPage);
-  }
-  
-  // Get the action given a sessionId and a relative targetPage URL.
-  public static final String getActionLink(String sessionId,String targetPage)
-  {
-    StringBuffer actionLink = new StringBuffer("forms/ProxyLoadPage.jsp?");
-    if (sessionId != null)
-      actionLink.append(ActionInputs.SESSIONID).append('=').append(sessionId).append('&');
-    actionLink.append(ActionInputs.TARGET_PAGE).append('=').append(targetPage);
-    return actionLink.toString();
-  }
-  
-  public boolean populatePropertyTable(HttpServletRequest request)
-  {
-    return true;
-  }
-  
-  public boolean run()
-  {
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ResizeFramesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ResizeFramesAction.java
deleted file mode 100644
index 1cc9e44a3..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ResizeFramesAction.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.ws.internal.explorer.platform.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.util.HTMLUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-
-public abstract class ResizeFramesAction extends Action
-{
-  protected Controller controller_;
-  protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    String frameName = parser.getParameter(ActionInputs.FRAME_NAME);
-    if (frameName != null)
-      propertyTable_.put(ActionInputs.FRAME_NAME,frameName);
-    else
-      return false;
-    return processOthers(parser);
-  }
-  
-  protected abstract boolean processOthers(MultipartFormDataParser parser) throws MultipartFormDataException;
-  
-  public ResizeFramesAction(Controller controller)
-  {
-    controller_ = controller;
-  }
-  
-  public final boolean populatePropertyTable(HttpServletRequest request)
-  {
-    try
-    {
-      MultipartFormDataParser parser = new MultipartFormDataParser();
-      parser.parseRequest(request,HTMLUtils.UTF8_ENCODING);
-      boolean result = processParsedResults(parser);
-      return result;
-    }
-    catch (MultipartFormDataException e)
-    {
-    }
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/RetrieveHistoryAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/RetrieveHistoryAction.java
deleted file mode 100644
index d24ce285a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/RetrieveHistoryAction.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.ws.internal.explorer.platform.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.BreadCrumb;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-
-public class RetrieveHistoryAction extends LinkAction
-{
-  private BreadCrumb breadCrumb_;
-
-  public RetrieveHistoryAction(Controller controller)
-  {
-    super(controller);
-    breadCrumb_ = null;
-  }
-
-  // actions/RetrieveHistoryAction.jsp?jump=1  - forward  (ActionInputs.JUMP_FORWARD)
-  // actions/RetrieveHistoryAction.jsp?jump=-1 - backward (ActionInputs.JUMP_BACK)
-  public final static String getActionLink(int jump)
-  {
-    StringBuffer actionLink = new StringBuffer("actions/RetrieveHistoryActionJSP.jsp?");
-    actionLink.append(ActionInputs.JUMP).append('=').append(jump);
-    return actionLink.toString();
-  }
-
-  protected final boolean processLinkParameters(HttpServletRequest request)
-  {
-    String jumpString = request.getParameter(ActionInputs.JUMP);
-    // Perform data validation.
-    try
-    {
-      Integer.parseInt(jumpString);
-    }
-    catch (NumberFormatException e)
-    {
-      // Validation failed!
-      return false;
-    }
-    propertyTable_.put(ActionInputs.JUMP,jumpString);
-    return true;
-  }
-
-  public final boolean run()
-  {
-    int jump = Integer.parseInt((String)propertyTable_.get(ActionInputs.JUMP));
-    switch (jump)
-    {
-      case ActionInputs.JUMP_FORWARD:
-        breadCrumb_ = controller_.forward();
-        return true;
-      case ActionInputs.JUMP_BACK:
-        breadCrumb_ = controller_.back();
-        return true;
-    }
-    return false;
-  }
-
-  public final BreadCrumb getBreadCrumb()
-  {
-    return breadCrumb_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/SelectNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/SelectNodeAction.java
deleted file mode 100644
index fa84e2621..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/SelectNodeAction.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.NodeSelectionTransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public abstract class SelectNodeAction extends NodeAction
-{
-  protected Node selectedNode_;
-
-  public SelectNodeAction(Controller controller,NodeManager nodeManager)
-  {
-    super(controller,nodeManager);
-    selectedNode_ = null;
-  }
-
-  public final void performBaseAction(int nodeId)
-  {
-    setSelectedNodeId(nodeId);
-    selectedNode_ = nodeManager_.getSelectedNode();
-  }
-
-  public boolean run()
-  {
-    int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-    if (!isStaleNode(nodeId))
-    {
-      // Ensure that the node is visible.
-      makeNodeVisible(nodeManager_.getNode(nodeId));
-      performBaseAction(nodeId);
-      addToHistory(getPerspectiveId(),getActionLinkForHistory());
-      return true;
-    }
-    setStaleBreadCrumb();
-    return false;
-  }
-
-  public final Node getSelectedNode()
-  {
-    return selectedNode_;
-  }
-  
-  public ITransformer[] getTransformers()
-  {
-    return new ITransformer[] {new NodeSelectionTransformer(controller_)};
-  }
-
-  // Selecting a node changes the treeview content and the properties container.
-  public abstract String getTreeContentVar();
-  public abstract String getTreeContentPage();
-  public abstract String getPropertiesContainerVar();
-  public abstract String getPropertiesContainerPage();
-  public abstract int getPerspectiveId();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/SelectNodeToolAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/SelectNodeToolAction.java
deleted file mode 100644
index 9bdf7b575..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/SelectNodeToolAction.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.CurrentNodeSelectionTransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ViewTool;
-
-public abstract class SelectNodeToolAction extends SelectNodeAction
-{
-  protected NodeManager nodeManager_;
-  protected Tool selectedTool_;
-
-  public SelectNodeToolAction(Controller controller,NodeManager nodeManager)
-  {
-    super(controller,nodeManager);
-    nodeManager_ = nodeManager;
-    selectedTool_ = null;
-  }
-
-  public final NodeManager getNodeManager()
-  {
-    return nodeManager_;
-  }
-
-  // ...jsp?nodeId=...&toolId=...<&viewId=...&viewToolId=...><&isHistory=1>
-  protected boolean processLinkParameters(HttpServletRequest request)
-  {
-    boolean result = super.processLinkParameters(request);
-    String toolIdString = request.getParameter(ActionInputs.TOOLID);
-    String viewIdString = request.getParameter(ActionInputs.VIEWID);
-    String viewToolIdString = request.getParameter(ActionInputs.VIEWTOOLID);
-
-    // Perform data validation.
-    try
-    {
-      Integer.parseInt(toolIdString);
-    }
-    catch (NumberFormatException e)
-    {
-      // Validation failed.
-      return false;
-    }
-    propertyTable_.put(ActionInputs.TOOLID,toolIdString);
-
-    // Optional properties
-    try
-    {
-      int viewId = Integer.parseInt(viewIdString);
-      propertyTable_.put(ActionInputs.VIEWID,viewIdString);
-      if (viewId != ActionInputs.VIEWID_DEFAULT)
-      {
-        Integer.parseInt(viewToolIdString);
-        propertyTable_.put(ActionInputs.VIEWTOOLID,viewToolIdString);
-      }
-    }
-    catch (NumberFormatException e)
-    {
-    }
-    return result;
-  }
-
-  public boolean run()
-  {
-    int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-    if (!isStaleNode(nodeId))
-    {
-      // Ensure that the node is visible.
-      makeNodeVisible(nodeManager_.getNode(nodeId));
-      setSelectedNodeId(nodeId);
-      selectedNode_ = nodeManager_.getSelectedNode();
-      int toolId = Integer.parseInt((String)propertyTable_.get(ActionInputs.TOOLID));
-      ToolManager toolManager = selectedNode_.getToolManager();
-      toolManager.setSelectedToolId(toolId);
-      selectedTool_ = toolManager.getSelectedTool();
-      String viewIdString = ((String)propertyTable_.get(ActionInputs.VIEWID));
-      if (viewIdString != null)
-      {
-        int viewId = Integer.parseInt(viewIdString);
-        setSelectedViewId(viewId);
-        if (viewId != ActionInputs.VIEWID_DEFAULT)
-        {
-          String viewToolIdString = ((String)propertyTable_.get(ActionInputs.VIEWTOOLID));
-          ViewTool viewTool = (ViewTool)selectedTool_;
-          if (viewToolIdString != null)
-          {
-            int viewToolId = Integer.parseInt(viewToolIdString);
-            ToolManager viewToolManager = selectedNode_.getViewToolManager();
-            if (viewToolManager == null)
-            {
-              if (!isHistoryAction())
-              {
-                viewToolManager = viewTool.createToolManager(viewId);
-                viewToolId = viewToolManager.getSelectedToolId();
-              }
-              else
-              {
-                setStaleBreadCrumb();
-                return false;
-              }
-            }
-            viewToolManager.setSelectedToolId(viewToolId);
-          }
-        }
-      }
-      else
-        setSelectedViewId(ActionInputs.VIEWID_DEFAULT);
-      addToHistory(getPerspectiveId(),getActionLinkForHistory());
-      return true;
-    }
-    setStaleBreadCrumb();
-    return false;
-  }
-
-  public ITransformer[] getTransformers()
-  {
-    return new ITransformer[] {new CurrentNodeSelectionTransformer(controller_)};
-  }
-
-  public final Tool getSelectedViewTool()
-  {
-    if (propertyTable_.get(ActionInputs.VIEWID) != null)
-      return selectedNode_.getViewToolManager().getSelectedTool();
-    return null;
-  }
-
-  public final Tool getSelectedTool()
-  {
-    return selectedTool_;
-  }
-
-  // Selecting a node tool updates the properties content. Also, in the event
-  // of a history switch, nodes may need to be selected resulting in changes to
-  // both the treeview content and the properties container. These requirements are
-  // covered through the base class.
-  public abstract String getPropertiesContentVar();
-  public abstract String getPropertiesContentPage();
-  public String getStatusContentVar()
-  {
-    return null;
-  }
-
-  public String getStatusContentPage()
-  {
-    return null;
-  }
-  
-  public abstract int getPerspectiveId();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ShowPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ShowPerspectiveAction.java
deleted file mode 100644
index be72f50bb..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ShowPerspectiveAction.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.ws.internal.explorer.platform.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.util.HTMLUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-
-public class ShowPerspectiveAction extends LinkAction
-{
-  public ShowPerspectiveAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  // actions/show_perspective.jsp?perspective=0<&isHistory=1> - UDDI (ActionInputs.PERSPECTIVE_UDDI)
-  // actions/show_perspective.jsp?perspective=1<&isHistory=1> - WSIL (ActionInputs.PERSPECTIVE_WSIL)
-  // actions/show_perspective.jsp?perspective=2<&isHistory=1> - WSDL (ActionInputs.PERSPECTIVE_WSDL)
-  // actions/show_perspective.jsp?perspective=3<&isHistory=1> - Favorites (ActionInputs.PERSPECTIVE_FAVORITES)
-  public final static String getActionLink(int newPerspective,boolean forHistory)
-  {
-    StringBuffer actionLink = new StringBuffer("actions/ShowPerspectiveActionJSP.jsp?");
-    actionLink.append(ActionInputs.PERSPECTIVE).append('=').append(newPerspective);
-    if (forHistory)
-      actionLink.append('&').append(ActionInputs.ISHISTORY).append("=1");
-    return actionLink.toString();
-  }
-  
-  protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    return true;
-  }
-  
-  protected final boolean processLinkParameters(HttpServletRequest request)
-  {
-    boolean result = false;
-    String perspectiveString = request.getParameter(ActionInputs.PERSPECTIVE);
-    // Perform data validation.
-    try
-    {
-      Integer.parseInt(perspectiveString);
-      propertyTable_.put(ActionInputs.PERSPECTIVE,perspectiveString);
-      MultipartFormDataParser parser = new MultipartFormDataParser();
-      parser.parseRequest(request,HTMLUtils.UTF8_ENCODING);
-      result = processParsedResults(parser);
-      removedProperties_.removeAllElements();
-    }
-    catch (NumberFormatException e)
-    {
-      // Validation failed! - This should not happen.
-    }
-    catch (MultipartFormDataException e)
-    {
-    }
-    return result;
-  }
-
-  public boolean run()
-  {
-    int perspective = Integer.parseInt((String)propertyTable_.get(ActionInputs.PERSPECTIVE));
-    controller_.setCurrentPerspective(perspective);
-    addToHistory(perspective,getActionLink(perspective,true));
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ToggleNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ToggleNodeAction.java
deleted file mode 100644
index 474048ce3..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ToggleNodeAction.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.wst.ws.internal.explorer.platform.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.NodeIdTransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public abstract class ToggleNodeAction extends NodeAction
-{
-  protected Node toggledNode_;
-  public ToggleNodeAction(Controller controller,NodeManager nodeManager)
-  {
-    super(controller,nodeManager);
-    toggledNode_ = null;
-  }
-
-  // Toggle the current node and update the selection iff the currently selected
-  // is a related descendant of a collapsed node.
-  /**
-  * Toggle the current node and update the selection iff the currently selected
-  * node is a related descendant of the current node and the current node is
-  * now collapsed as a result of this action.
-  *
-  * @param int The node ID of the node for which this action applies to.
-  * @return boolean Indicator of whether or not a selection change was necessary.
-  */
-  public final boolean performBaseAction(int nodeId)
-  {
-    toggledNode_ = nodeManager_.getNode(nodeId);
-    nodeManager_.setFocusedNodeId(nodeId);
-    toggledNode_.setVisibilityOfChildren(!toggledNode_.isOpen());
-    Node selectedNode = nodeManager_.getSelectedNode();
-    if (selectedNode != null)
-    {
-      if (!selectedNode.isVisible())
-      {
-        setSelectedNodeId(nodeId);
-        return true;
-      }
-    }
-    return false;
-  }
-
-  public boolean run()
-  {
-    int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-    if (!isStaleNode(nodeId))
-    {
-      if (performBaseAction(nodeId))
-      {
-        // Save the selection of the toggle link in the history.
-        addToHistory(getPerspectiveId(),getActionLinkForHistory());
-      }
-      // Do not save the toggle in history.
-      return true;
-    }
-    setStaleBreadCrumb();
-    return false;
-  }
-
-  public final Node getToggledNode()
-  {
-    return toggledNode_;
-  }
-
-  public ITransformer[] getTransformers()
-  {
-    return new ITransformer[] {new NodeIdTransformer(controller_)};
-  }
-
-  public abstract String getTreeContentVar();
-  public abstract String getTreeContentPage();
-  public abstract String getPropertiesContainerVar();
-  public abstract String getPropertiesContainerPage();
-  public abstract int getPerspectiveId();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ValidateEditAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ValidateEditAction.java
deleted file mode 100644
index 78c95671a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ValidateEditAction.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.actions;
-
-import javax.servlet.http.HttpServletRequest;
-
-public class ValidateEditAction extends Action
-{
-  public static final String getActionLink()
-  {
-    return "actions/ValidateEditActionJSP.jsp";
-  }
-    
-  public boolean populatePropertyTable(HttpServletRequest request)
-  {
-    return true;
-  }
-  
-  public boolean run()
-  {
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/WSDLFileNameHelper.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/WSDLFileNameHelper.java
deleted file mode 100644
index 2471ea164..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/WSDLFileNameHelper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.actions;
-
-public class WSDLFileNameHelper
-{
-  private static final String default_ = "temp.wsdl";
-  
-  /**
-  * Given a wsdl path (file, URL etc.), guess at the file name by looking for the .wsdl extension at the end of the
-  * path and the file that it belongs to. If this is not possible, return the default defined in this class.
-  * @param String The path (file, URL etc.) of this WSDL file.
-  * @return String The WSDL file name determined by this routine.
-  */
-  public static final String getWSDLFileName(String wsdlPathname)
-  {
-    if (wsdlPathname != null)
-    {
-      if (wsdlPathname.endsWith(".wsdl"))
-      {
-        int lastSeparatorPos = Math.max(wsdlPathname.lastIndexOf("/"),wsdlPathname.lastIndexOf("\\"));
-        if (lastSeparatorPos > 0)
-          return wsdlPathname.substring(lastSeparatorPos+1,wsdlPathname.length());
-      }
-    }
-    return default_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/WriteWSDLToWorkbenchAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/WriteWSDLToWorkbenchAction.java
deleted file mode 100644
index 8b96d21b0..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/WriteWSDLToWorkbenchAction.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.actions;
-
-import javax.servlet.http.HttpServletRequest;
-
-public class WriteWSDLToWorkbenchAction extends Action
-{
-  public static final String getActionLink()
-  {
-    return "actions/WriteWSDLToWorkbenchActionJSP.jsp";
-  }
-    
-  public boolean populatePropertyTable(HttpServletRequest request)
-  {
-    return true;
-  }
-  
-  public boolean run()
-  {
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/constants/ActionInputs.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/constants/ActionInputs.java
deleted file mode 100644
index 0bfeac353..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/constants/ActionInputs.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.constants;
-
-public class ActionInputs
-{
-  // URL parm for all actions which are in the history list.
-  public static final String ISHISTORY = "isHistory";
-
-  // Utility constant for tree node identification.
-  public static final String NODEID = "nodeId";
-
-  // Utility constant for tool identification.
-  public static final String TOOLID = "toolId";
-
-  // Utility constant for view identification.
-  public static final String VIEWID = "viewId";
-  public static final int VIEWID_DEFAULT = -1;
-
-  // Utility constant for view tool identification.
-  public static final String VIEWTOOLID = "viewToolId";
-  public static final int VIEWTOOLID_DEFAULT = -1;
-
-  // Utility constants for transport classes
-  public static final String TRANSPORT_CLASS_NAME = "org.uddi4j.TransportClassName";
-  public static final String TRASPORT_CLASS = "org.uddi4j.transport.ApacheAxisTransport";
-  //public static final String AXIS_TRANSPORT_CLASS = "org.uddi4j.transport.ApacheAxisTransport";
-  //public static final String SOAP_TRANSPORT_CLASS = "org.uddi4j.transport.ApacheSOAPTransport";
-
-  // ToggleNodeAction and its derivatives.
-  public static final String OPEN = "open";
-  public static final int OPEN_NODE = 1;
-  public static final int CLOSE_NODE = 0;
-
-  // ShowPerspectiveAction
-  public static final String PERSPECTIVE = "perspective";
-  public static final int PERSPECTIVE_UDDI = 0;
-  public static final int PERSPECTIVE_WSIL = 1;
-  public static final int PERSPECTIVE_WSDL = 2;
-  public static final int PERSPECTIVE_FAVORITES = 3;
-
-  // RetrieveHistoryAction
-  public static final String JUMP = "jump";
-  public static final int JUMP_FORWARD = 1;
-  public static final int JUMP_BACK = -1;
-
-  // LaunchWebServiceWizardAction
-  public final static String WEB_SERVICE_WIZARD = "webServiceWizard";
-  public final static int WEB_SERVICE_CLIENT_WIZARD = 0;
-  public final static int WEB_SERVICE_SKELETON_WIZARD = 1;
-
-  // ImportToWorkbenchAction
-  public final static String WORKBENCH_PROJECT_NAME = "workbenchProjectName";
-  public final static String IMPORT_FILE = "importWSDL";
-  public final static String IMPORTED_FILE_NAME = "importedFileName";
-  public final static String IMPORT_TO_WSIL = "importToWSIL";
-  public final static String WSIL_FILE_NAME = "WSILFileName";
-  public final static String IMPORTED_WSDL_URL = "importedWsdlUrl";
-  public final static String IMPORT_ACTION = "importAction";
-
-  // ProxyLoadAction
-  public final static String TARGET_PAGE = "targetPage";
-
-  // Session ID for pop ups whose browsers choose to ignore the session.
-  public final static String SESSIONID = "sId";
-
-  // WSDL Browser
-  public static final String PROJECT = "project";
-  public static final String WSDL_TYPE = "wsdlType";
-  public static final int WSDL_TYPE_SERVICE_INTERFACE = 0;
-  public static final int WSDL_TYPE_SERVICE = 1;
-  public static final String QUERY_INPUT_WEBPROJECT_WSDL_URL = "webProjectWSDLURL";
-  public static final String QUERY_INPUT_FAVORITE_WSDL_URL = "favoriteWSDLURL";
-  public static final String QUERY_INPUT_WSDL_URL = "wsdlURL";
-
-  // Calendar Browser
-  public static final String CALENDAR_TYPE = "calendarType";
-  public static final int CALENDAR_TYPE_DATE = 0;
-  public static final int CALENDAR_TYPE_DATETIME = 1;
-  public static final int CALENDAR_TYPE_GYEARMONTH = 2;
-  public static final int CALENDAR_TYPE_GDAY = 3;
-  public static final int CALENDAR_TYPE_GMONTHDAY = 4;
-
-  // ResizeFrameAction
-  public static final String FRAME_NAME = "frameName";
-
-  // Other Actions
-  public static final String CURRENT_TOOL_MANAGER = "currentToolManager";
-  
-  // Action Engine
-  public static final String ACTION_ENGINE_SCENARIO = "actionEngineScenario";
-  public static final String ACTION_ENGINE_MODE = "actionEngineMode";
-
-  // MultipartFormDataParser
-  public static final String MULTIPART_FORM_DATA_PARSER = "multipartFormDataParser";
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/constants/FrameNames.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/constants/FrameNames.java
deleted file mode 100644
index eb71f5fd1..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/constants/FrameNames.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.ws.internal.explorer.platform.constants;
-
-public class FrameNames
-{
-  // wsexplorer.jsp
-  public final static String WINDOW_NAME_WSEXPLORER_JSP = "wsexplorer.jsp";
-  public final static String PERSPECTIVE_WORKAREA = "perspective_workarea";
-  public final static String PERSPECTIVE_TOOLBAR = "perspective_toolbar";
-  public final static String PERSPECTIVE_CONTENT = "perspective_content";
-  
-  // WSDL Browser
-  public final static String WSDL_TOOLBAR = "wsdl_toolbar";
-  public final static String WSDL_CONTENT = "wsdl_content";
-  
-  // Calendar Browser
-  public final static String CALENDAR_TOOLBAR = "calendar_toolbar";
-  public final static String CALENDAR_CONTENT = "calendar_content";  
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/constants/ModelConstants.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/constants/ModelConstants.java
deleted file mode 100644
index dd55527ba..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/constants/ModelConstants.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.constants;
-
-public class ModelConstants
-{
-  public static final String REL_ID = "relationshipId";
-  public static final String REL_LOCALNAME_SEPARATOR = "#";
-  public static final String REL_OWNER = "owner";
-  public static final String REL_CHILDREN = "children";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/constants/ToolTypes.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/constants/ToolTypes.java
deleted file mode 100644
index b27134cd1..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/constants/ToolTypes.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.constants;
-
-public class ToolTypes
-{
-  public static final byte FORM = 0;
-  public static final byte ACTION = 1;
-  public static final byte VIEW = 2;
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/ListElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/ListElement.java
deleted file mode 100644
index 49f3f3fd2..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/ListElement.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.ws.internal.explorer.platform.datamodel;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-
-public class ListElement
-{
-  private int viewId_;
-  private Object object_;
-  // For search parameters: info on the Node and ViewTool holding this element.
-  private int targetNodeId_;
-  private int targetToolId_;
-  private int targetViewId_;
-
-  public ListElement(Object object)
-  {
-    object_ = object;
-    viewId_ = ActionInputs.VIEWID_DEFAULT;
-    targetNodeId_ = -1;
-    targetToolId_ = -1;
-    targetViewId_ = ActionInputs.VIEWID_DEFAULT;
-  }
-
-  public final Object getObject()
-  {
-    return object_;
-  }
-
-  public final void setViewId(int viewId)
-  {
-    viewId_ = viewId;
-  }
-
-  public final int getViewId()
-  {
-    return viewId_;
-  }
-
-  public final void setTargetViewToolInfo(int nodeId,int toolId,int viewId)
-  {
-    targetNodeId_ = nodeId;
-    targetToolId_ = toolId;
-    targetViewId_ = viewId;
-  }
-
-  public final int getTargetNodeId()
-  {
-    return targetNodeId_;
-  }
-
-  public final int getTargetToolId()
-  {
-    return targetToolId_;
-  }
-
-  public final int getTargetViewId()
-  {
-    return targetViewId_;
-  }
-
-  public final String toString() {
-    return getObject().toString();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/ListManager.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/ListManager.java
deleted file mode 100644
index abbd14650..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/ListManager.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.ws.internal.explorer.platform.datamodel;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-
-public class ListManager
-{
-  private int nextViewId_;
-  private Vector itemsList_;
-  private Hashtable itemsTable_;
-
-  public ListManager()
-  {
-    nextViewId_ = 0;
-    itemsList_ = new Vector();
-    itemsTable_ = new Hashtable();
-  }
-
-  private final void updateManager(ListElement element)
-  {
-    itemsTable_.put(String.valueOf(nextViewId_),element);
-    element.setViewId(nextViewId_);
-    nextViewId_++;
-  }
-
-  public final void add(ListElement element)
-  {
-    itemsList_.addElement(element);
-    updateManager(element);
-  }
-
-  public final void addWithCurrentViewId(ListElement element)
-  {
-    itemsList_.addElement(element);
-    itemsTable_.put(String.valueOf(element.getViewId()),element);
-  }
-
-  public final ListElement elementAt(int index)
-  {
-    return (ListElement)itemsList_.elementAt(index);
-  }
-
-  public final ListElement getElementWithViewId(int viewId)
-  {
-    return (ListElement)itemsTable_.get(String.valueOf(viewId));
-  }
-
-  public final void removeElementWithViewId(int viewId)
-  {
-    itemsTable_.remove(String.valueOf(viewId));
-    for (int i=0;i<itemsList_.size();i++)
-    {
-      ListElement listElement = elementAt(i);
-      if (listElement.getViewId() == viewId)
-      {
-        itemsList_.removeElementAt(i);
-        break;
-      }
-    }
-  }
-
-  public final void removeElementAt(int index)
-  {
-    ListElement listElement = (ListElement)elementAt(index);
-    itemsList_.removeElementAt(index);
-    itemsTable_.remove(String.valueOf(listElement.getViewId()));
-  }
-
-  public final void insertElementAt(ListElement element,int index)
-  {
-    itemsList_.insertElementAt(element,index);
-    updateManager(element);
-  }
-
-  public final Enumeration getListElements()
-  {
-    return itemsList_.elements();
-  }
-
-  public final void clear()
-  {
-    itemsList_.removeAllElements();
-    itemsTable_.clear();
-  }
-
-  public final ListManager copy(ListManager newListManager)
-  {
-    newListManager.clear();
-    for (int i=0;i<itemsList_.size();i++)
-    {
-      ListElement listElement = (ListElement)elementAt(i);
-      ListElement newListElement = new ListElement(listElement.getObject());
-      newListElement.setViewId(listElement.getViewId());
-      newListElement.setTargetViewToolInfo(listElement.getTargetNodeId(),listElement.getTargetToolId(),listElement.getTargetViewId());
-      newListManager.addWithCurrentViewId(newListElement);
-    }
-    newListManager.setNextViewId(nextViewId_);
-    return newListManager;
-  }
-
-  public final void setNextViewId(int nextViewId)
-  {
-    nextViewId_ = nextViewId;
-  }
-
-  public final int getNextViewId()
-  {
-    return nextViewId_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/TreeElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/TreeElement.java
deleted file mode 100644
index 8228ad3a8..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/TreeElement.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.ws.internal.explorer.platform.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-public class TreeElement extends BasicElement
-{
-  private String key_;
-
-  public TreeElement(String name,Model model)
-  {
-    super(name,model);
-    key_ = name;
-  }
-
-  public void setKey(String key)
-  {
-    key_ = key;
-  }
-
-  public String getKey()
-  {
-    return key_;
-  }
-
-  public boolean equals(TreeElement element)
-  {
-    if (key_ == null)
-      return false;
-    return key_.equals(element.getKey());
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/ActionDataParser.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/ActionDataParser.java
deleted file mode 100644
index c613f0dd7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/ActionDataParser.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.engine;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.FactoryConfigurationError;
-import javax.xml.parsers.ParserConfigurationException;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.constants.ActionDataConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.data.ActionDescriptor;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.data.ScenarioDescriptor;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.data.TransactionDescriptor;
-import org.w3c.dom.CDATASection;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class ActionDataParser
-{
-  private Document doc;
-
-  public ScenarioDescriptor parseScenario(Element e)
-  {
-    ScenarioDescriptor scenarioDescriptor = new ScenarioDescriptor();
-    NodeList transactions = e.getElementsByTagName(ActionDataConstants.ELEMENT_TRANSACTION);
-    TransactionDescriptor[] transactionDescriptors = new TransactionDescriptor[transactions.getLength()];
-    for (int i = 0; i < transactionDescriptors.length; i++)
-      transactionDescriptors[i] = parseTransaction((Element) transactions.item(i));
-    scenarioDescriptor.setTransactionDescriptors(transactionDescriptors);
-    return scenarioDescriptor;
-  }
-
-  public TransactionDescriptor parseTransaction(Element e)
-  {
-    TransactionDescriptor transactionDescriptor = new TransactionDescriptor();
-    NodeList actions = e.getElementsByTagName(ActionDataConstants.ELEMENT_ACTION);
-    ActionDescriptor[] actionDescriptors = new ActionDescriptor[actions.getLength()];
-    for (int i = 0; i < actionDescriptors.length; i++)
-      actionDescriptors[i] = parseAction((Element) actions.item(i));
-    transactionDescriptor.setActionDescriptors(actionDescriptors);
-    return transactionDescriptor;
-  }
-
-  public ActionDescriptor parseAction(Element e)
-  {
-    ActionDescriptor actionDescriptor = new ActionDescriptor();
-    actionDescriptor.setId(e.getAttribute(ActionDataConstants.ATTR_ID));
-    try
-    {
-      actionDescriptor.setAttempts(Integer.parseInt(e.getAttribute(ActionDataConstants.ATTR_ATTEMPTS)));
-    }
-    catch (Throwable t)
-    {
-      actionDescriptor.setAttempts(1);
-    }
-    actionDescriptor.setStatusId(e.getAttribute(ActionDataConstants.ATTR_STATUS_ID));
-    Hashtable propertiesTable = new Hashtable();
-    NodeList properties = e.getElementsByTagName(ActionDataConstants.ELEMENT_PROPERTY);
-    for (int i = 0; i < properties.getLength(); i++)
-    {
-      Element property = (Element) properties.item(i);
-      String name = property.getAttribute(ActionDataConstants.ATTR_NAME);
-      NodeList valueList = property.getElementsByTagName(ActionDataConstants.ELEMENT_VALUE);
-      if (valueList.getLength() > 1)
-      {
-        String[] values = new String[valueList.getLength()];
-        for (int j = 0; j < values.length; j++)
-        {
-          Element value = (Element) valueList.item(j);
-          Node textNode = value.getFirstChild();
-          values[j] = (textNode != null) ? textNode.getNodeValue().trim() : "";
-        }
-        propertiesTable.put(name, values);
-      }
-      else
-      {
-        Node textNode = ((Element) valueList.item(0)).getFirstChild();
-        propertiesTable.put(name, (textNode != null) ? textNode.getNodeValue().trim() : "");
-      }
-    }
-    actionDescriptor.setProperties(propertiesTable);
-    NodeList statusList = e.getElementsByTagName(ActionDataConstants.ELEMENT_STATUS);
-    for (int i = 0; i < statusList.getLength(); i++)
-    {
-      Element status = (Element)statusList.item(i);
-      CDATASection cData = (CDATASection)status.getFirstChild();
-      actionDescriptor.addStatus(cData.getData());
-    }
-    return actionDescriptor;
-  }
-
-  public Element toElement(ScenarioDescriptor scenarioDescriptor)
-  {
-    try
-    {
-      Document document = getDocument();
-      Element scenarioElement = document.createElement(ActionDataConstants.ELEMENT_SCENARIO);
-      TransactionDescriptor[] transactionDescriptors = scenarioDescriptor.getTransactionDescriptors();
-      for (int i = 0; i < transactionDescriptors.length; i++)
-      {
-        Element transactionElement = toElement(transactionDescriptors[i]);
-        if (transactionElement != null)
-          scenarioElement.appendChild(transactionElement);
-      }
-      return scenarioElement;
-    }
-    catch (DOMException dome)
-    {
-      return null;
-    }
-  }
-
-  public Element toElement(TransactionDescriptor transactionDescriptor)
-  {
-    try
-    {
-      Document document = getDocument();
-      Element transactionElement = document.createElement(ActionDataConstants.ELEMENT_TRANSACTION);
-      ActionDescriptor[] actionDescriptors = transactionDescriptor.getActionDescriptors();
-      for (int i = 0; i < actionDescriptors.length; i++)
-      {
-        Element actionElement = toElement(actionDescriptors[i]);
-        if (actionElement != null)
-          transactionElement.appendChild(actionElement);
-      }
-      return transactionElement;
-    }
-    catch (DOMException dome)
-    {
-      return null;
-    }
-  }
-
-  public Element toElement(ActionDescriptor actionDescriptor)
-  {
-    try
-    {
-      Document document = getDocument();
-      Element actionElement = document.createElement(ActionDataConstants.ELEMENT_ACTION);
-      actionElement.setAttribute(ActionDataConstants.ATTR_ID, actionDescriptor.getId());
-      actionElement.setAttribute(ActionDataConstants.ATTR_ATTEMPTS, String.valueOf(actionDescriptor.getAttempts()));
-      String statusId = actionDescriptor.getStatusId();
-      if (statusId != null)
-        actionElement.setAttribute(ActionDataConstants.ATTR_STATUS_ID, statusId);
-      Hashtable properties = actionDescriptor.getProperties();
-      if (properties != null)
-      {
-        for (Iterator it = properties.keySet().iterator(); it.hasNext();)
-        {
-          Object key = it.next();
-          Object value = properties.get(key);
-          Object[] values;
-          if (value.getClass().isArray())
-            values = (Object[])value;
-          else if (value instanceof List)
-            values = ((List)value).toArray();
-          else
-            values = new Object[] {value};
-          boolean isAdded = false;
-          Element propertyElement = document.createElement(ActionDataConstants.ELEMENT_PROPERTY);
-          propertyElement.setAttribute(ActionDataConstants.ATTR_NAME, key.toString());
-          for (int i = 0; i < values.length; i++)
-          {
-            if (values[i] instanceof String)
-            {
-              Element valueElement = document.createElement(ActionDataConstants.ELEMENT_VALUE);
-              valueElement.appendChild(document.createTextNode(values[i].toString()));
-              propertyElement.appendChild(valueElement);
-              isAdded = true;
-            }
-          }
-          if (isAdded)
-            actionElement.appendChild(propertyElement);
-        }
-      }
-      List status = actionDescriptor.getStatus();
-      if (status != null)
-      {
-        for (Iterator it = status.iterator(); it.hasNext();)
-        {
-          Element statusElement = document.createElement(ActionDataConstants.ELEMENT_STATUS);
-          CDATASection cData = document.createCDATASection(it.next().toString());
-          statusElement.appendChild(cData);
-          actionElement.appendChild(statusElement);
-        }
-      }
-      return actionElement;
-    }
-    catch (DOMException dome)
-    {
-      return null;
-    }
-  }
-
-  private Document getDocument()
-  {
-    try
-    {
-      if (doc == null)
-      {
-        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-        DocumentBuilder builder = factory.newDocumentBuilder();
-        doc = builder.newDocument();
-      }
-      return doc;
-    }
-    catch (FactoryConfigurationError fce)
-    {
-      return null;
-    }
-    catch (ParserConfigurationException pce)
-    {
-      return null;
-    }
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/ActionEngine.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/ActionEngine.java
deleted file mode 100644
index f7ae8573f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/ActionEngine.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.engine;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.Action;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ShowPerspectiveAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.constants.ActionDataConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.data.ActionDescriptor;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.data.ScenarioDescriptor;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.data.TransactionDescriptor;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-
-public class ActionEngine
-{
-  public static final byte MODE_DISABLED = 0x0;
-  public static final byte MODE_STOP = 0x1;
-  public static final byte MODE_RECORD = 0x2;
-  public static final byte MODE_PLAY = 0x3;
-
-  private Controller controller;
-  private byte mode;
-  private Vector actionDescriptors;
-
-  public ActionEngine(Controller controller)
-  {
-    this.controller = controller;
-    mode = MODE_DISABLED;
-    actionDescriptors = new Vector();
-  }
-
-  public void executeScenario(ScenarioDescriptor scenarioDescriptor)
-  {
-    TransactionDescriptor[] transactionDescriptors = scenarioDescriptor.getTransactionDescriptors();
-    for (int i = 0; i < transactionDescriptors.length; i++)
-      executeTransaction(transactionDescriptors[i]);
-  }
-
-  public boolean executeTransaction(TransactionDescriptor transactionDescriptor)
-  {
-    boolean result = true;
-    ActionDescriptor[] actionDescriptors = transactionDescriptor.getActionDescriptors();
-    for (int i = 0; i < actionDescriptors.length; i++)
-    {
-      if (result)
-      {
-        if (!executeAction(actionDescriptors[i]))
-          result = false;
-      }
-      else
-        actionDescriptors[i].setStatusId(ActionDataConstants.VALUE_STATUS_ID_UNATTEMPTED);
-    }
-    return result;
-  }
-
-  public boolean executeAction(ActionDescriptor actionDescriptor)
-  {
-    int attempts = actionDescriptor.getAttempts();
-    for (int i = 0; i < attempts; i++)
-    {
-      try
-      {
-        Class classAction = Class.forName(actionDescriptor.getId());
-        if (Action.class.isAssignableFrom(classAction))
-        {
-          Action action = (Action) newInstance(classAction);
-          if (action != null)
-          {
-            Hashtable properties = actionDescriptor.getProperties();
-            ITransformer[] transformers = action.getTransformers();
-            for (int j = 0; j < transformers.length; j++)
-              properties = transformers[j].deNormalize(properties);
-            action.setPropertyTable(properties);
-            boolean actionResult = action.run();
-            // TODO actionDescriptor.addStatus(action.getStatus());
-            if (actionResult)
-            {
-              actionDescriptor.setStatusId(ActionDataConstants.VALUE_STATUS_ID_PASSED);
-              return true;
-            }
-          }
-          else
-            throw new ClassNotFoundException(actionDescriptor.getId());
-        }
-      }
-      catch (ClassNotFoundException cnfe)
-      {
-        cnfe.printStackTrace();
-        StringWriter sw = new StringWriter();
-        cnfe.printStackTrace(new PrintWriter(sw));
-        actionDescriptor.addStatus(sw.getBuffer().toString());
-      }
-      catch (Throwable t)
-      {
-        t.printStackTrace();
-        StringWriter sw = new StringWriter();
-        t.printStackTrace(new PrintWriter(sw));
-        actionDescriptor.addStatus(sw.getBuffer().toString());
-      }
-    }
-    actionDescriptor.setStatusId(ActionDataConstants.VALUE_STATUS_ID_FAILED);
-    return false;
-  }
-
-  private ScenarioDescriptor newScenarioDescriptor()
-  {
-    return new ScenarioDescriptor();
-  }
-
-  private TransactionDescriptor newTransactionDescriptor()
-  {
-    return new TransactionDescriptor();
-  }
-
-  private ActionDescriptor newActionDescriptor(Action action)
-  {
-    ActionDescriptor actionDescriptor = new ActionDescriptor();
-    actionDescriptor.setId(action.getClass().getName());
-    Hashtable properties = new Hashtable(action.getPropertyTable());
-    ITransformer[] transformers = action.getTransformers();
-    for (int i = 0; i < transformers.length; i++)
-      properties = transformers[i].normalize(properties);
-    actionDescriptor.setProperties(properties);
-    return actionDescriptor;
-  }
-
-  private Object newInstance(Class c)
-  {
-    try
-    {
-      // instantiates the action using the constructor that takes in a
-      // controller object
-      Constructor constructor = c.getConstructor(new Class[]{Controller.class});
-      return constructor.newInstance(new Object[]{controller});
-    }
-    catch (NoSuchMethodException nsme)
-    {
-    }
-    catch (InstantiationException ie)
-    {
-    }
-    catch (IllegalAccessException iae)
-    {
-    }
-    catch (InvocationTargetException ite)
-    {
-    }
-    catch (Throwable t)
-    {
-    }
-    Object instance = null;
-    try
-    {
-      // instantiates the action using the default constructor
-      Constructor constructor = c.getConstructor(new Class[0]);
-      instance = constructor.newInstance(new Object[0]);
-      Method method = c.getMethod("setController", new Class[]{Controller.class});
-      method.invoke(instance, new Object[]{controller});
-    }
-    catch (NoSuchMethodException nsme)
-    {
-    }
-    catch (InstantiationException ie)
-    {
-    }
-    catch (IllegalAccessException iae)
-    {
-    }
-    catch (IllegalArgumentException iae)
-    {
-    }
-    catch (InvocationTargetException ite)
-    {
-    }
-    catch (Throwable t)
-    {
-    }
-    return instance;
-  }
-  
-  public byte getMode()
-  {
-    return mode;
-  }
-  
-  public void setMode(byte mode)
-  {
-    this.mode = mode;
-    if (mode == MODE_RECORD)
-    {
-      actionDescriptors = new Vector();
-      ShowPerspectiveAction showPerspectiveAction = new ShowPerspectiveAction(controller);
-      showPerspectiveAction.addProperty(ActionInputs.PERSPECTIVE, String.valueOf(controller.getCurrentPerspective().getPerspectiveId()));
-      actionDescriptors.add(newActionDescriptor(showPerspectiveAction));
-    }
-  }
-  
-  public boolean executeAction(Action action)
-  {
-    if (mode == MODE_RECORD)
-    {
-      ActionDescriptor actionDescriptor = newActionDescriptor(action);
-      actionDescriptors.add(actionDescriptor);
-    }
-    return action.run();
-  }
-  
-  public ScenarioDescriptor getScenario()
-  {
-    ScenarioDescriptor scenarioDescriptor = newScenarioDescriptor();
-    TransactionDescriptor transactionDescriptor = newTransactionDescriptor();
-    ActionDescriptor[] actionDescriptorArray = (ActionDescriptor[])actionDescriptors.toArray(new ActionDescriptor[0]);
-    transactionDescriptor.setActionDescriptors(actionDescriptorArray);
-    scenarioDescriptor.setTransactionDescriptors(new TransactionDescriptor[] {transactionDescriptor});
-    return scenarioDescriptor;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/constants/ActionDataConstants.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/constants/ActionDataConstants.java
deleted file mode 100644
index 7d53ee26b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/constants/ActionDataConstants.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.ws.internal.explorer.platform.engine.constants;
-
-public class ActionDataConstants
-{
-  public static final String ATTR_ID = "id";
-  public static final String ATTR_NAME = "name";
-  public static final String ATTR_ATTEMPTS = "attempts";
-  public static final String ATTR_STATUS_ID = "statusId";
-  
-  public static final String ELEMENT_SCENARIO = "scenario";
-  public static final String ELEMENT_TRANSACTION = "transaction";
-  public static final String ELEMENT_ACTION = "action";
-  public static final String ELEMENT_PROPERTY = "property";
-  public static final String ELEMENT_VALUE = "value";
-  public static final String ELEMENT_STATUS = "status";
-  
-  public static final String VALUE_STATUS_ID_UNATTEMPTED = "unattempted";
-  public static final String VALUE_STATUS_ID_PASSED = "passed";
-  public static final String VALUE_STATUS_ID_FAILED = "failed";
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/data/ActionDescriptor.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/data/ActionDescriptor.java
deleted file mode 100644
index 85bb5b7da..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/data/ActionDescriptor.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.ws.internal.explorer.platform.engine.data;
-
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Vector;
-
-public class ActionDescriptor
-{
-  private String id;
-  private Hashtable properties;
-  private int attempts;
-  private String statusId;
-  private List statusList;
-  
-  public ActionDescriptor()
-  {
-    attempts = 1;
-  }
-
-  public String getId()
-  {
-    return id;
-  }
-  
-  public void setId(String id)
-  {
-    this.id = id;
-  }
-
-  public Hashtable getProperties()
-  {
-    return properties;
-  }
-  
-  public void setProperties(Hashtable properties)
-  {
-    this.properties = properties;
-  }
-  
-  public int getAttempts()
-  {
-  	return attempts;
-  }
-  
-  public void setAttempts(int attempts)
-  {
-  	this.attempts = attempts;
-  }
-  
-  public String getStatusId()
-  {
-    return statusId;
-  }
-  
-  public void setStatusId(String statusId)
-  {
-    this.statusId = statusId;
-  }
-  
-  public void addStatus(Object status)
-  {
-    if (status != null)
-    {
-      if (statusList == null)
-        statusList = new Vector();
-      statusList.add(status);
-    }
-  }
-  
-  public boolean removeStatus(Object status)
-  {
-    if (status != null && statusList != null)
-      return statusList.remove(status);
-    else
-      return false;
-  }
-  
-  public List getStatus()
-  {
-    return statusList;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/data/ScenarioDescriptor.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/data/ScenarioDescriptor.java
deleted file mode 100644
index 41a3f90fe..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/data/ScenarioDescriptor.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.ws.internal.explorer.platform.engine.data;
-
-public class ScenarioDescriptor
-{
-  private TransactionDescriptor[] transactionDescriptors;
-
-  public TransactionDescriptor[] getTransactionDescriptors()
-  {
-    return transactionDescriptors;
-  }
-  
-  public void setTransactionDescriptors(TransactionDescriptor[] transactionDescriptors)
-  {
-    this.transactionDescriptors = transactionDescriptors;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/data/TransactionDescriptor.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/data/TransactionDescriptor.java
deleted file mode 100644
index 3ef67b972..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/data/TransactionDescriptor.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.ws.internal.explorer.platform.engine.data;
-
-public class TransactionDescriptor
-{
-  private ActionDescriptor[] actionDescriptors;
-
-  public ActionDescriptor[] getActionDescriptors()
-  {
-    return actionDescriptors;
-  }
-  
-  public void setActionDescriptors(ActionDescriptor[] actionDescriptors)
-  {
-    this.actionDescriptors = actionDescriptors;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/CurrentNodeSelectionTransformer.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/CurrentNodeSelectionTransformer.java
deleted file mode 100644
index 48a0b2768..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/CurrentNodeSelectionTransformer.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.engine.transformer;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-
-public class CurrentNodeSelectionTransformer implements ITransformer
-{
-  protected Controller controller;
-  protected String key;
-
-  public CurrentNodeSelectionTransformer(Controller controller)
-  {
-    this(controller, ActionInputs.NODEID);
-  }
-
-  public CurrentNodeSelectionTransformer(Controller controller, String key)
-  {
-    this.controller = controller;
-    this.key = key;
-  }
-
-  public Hashtable normalize(Hashtable properties)
-  {
-    return properties;
-  }
-  
-  public Hashtable deNormalize(Hashtable properties)
-  {
-    Node currNode = controller.getCurrentPerspective().getNodeManager().getSelectedNode();
-    if (currNode != null)
-      properties.put(key, String.valueOf(currNode.getNodeId()));
-    return properties;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/ITransformer.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/ITransformer.java
deleted file mode 100644
index 4755ffe85..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/ITransformer.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.engine.transformer;
-
-import java.util.Hashtable;
-
-public interface ITransformer
-{
-  public Hashtable normalize(Hashtable properties);
-  public Hashtable deNormalize(Hashtable properties);
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/MassNodeIdTransformer.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/MassNodeIdTransformer.java
deleted file mode 100644
index 521869289..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/MassNodeIdTransformer.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.engine.transformer;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-
-public class MassNodeIdTransformer extends NodeIdTransformer
-{
-  protected String massNodeIdKey;
-
-  public MassNodeIdTransformer(Controller controller, String massNodeIdKey)
-  {
-    super(controller);
-    this.massNodeIdKey = massNodeIdKey;
-  }
-
-  public Hashtable normalize(Hashtable properties)
-  {
-    if (!properties.containsKey(massNodeIdKey))
-      return super.normalize(properties);
-    Object origNodeId = properties.get(ActionInputs.NODEID);
-    String[] massNodeIds = getValueAsStringArray(properties, massNodeIdKey);
-    for (int i = 0; i < massNodeIds.length; i++)
-    {
-      properties.put(ActionInputs.NODEID, massNodeIds[i]);
-      properties = super.normalize(properties);
-      String[] rels = getValueAsStringArray(properties, ModelConstants.REL_ID);
-      if (rels.length > 0)
-      {
-        StringBuffer sb = new StringBuffer(ModelConstants.REL_ID);
-        sb.append(ModelConstants.REL_LOCALNAME_SEPARATOR);
-        sb.append(massNodeIds[i]);
-        properties.put(sb.toString(), rels);
-      }
-      properties.remove(ActionInputs.NODEID);
-      properties.remove(ModelConstants.REL_ID);
-    }
-    if (origNodeId != null)
-      properties.put(ActionInputs.NODEID, origNodeId);
-    return properties;
-  }
-
-  public Hashtable deNormalize(Hashtable properties)
-  {
-    if (!properties.containsKey(massNodeIdKey))
-      return super.deNormalize(properties);
-    Vector massNodeIdVector = new Vector();
-    Object origNodeId = properties.get(ActionInputs.NODEID);
-    properties.remove(ActionInputs.NODEID);
-    String[] massNodeIds = getValueAsStringArray(properties, massNodeIdKey);
-    for (int i = 0; i < massNodeIds.length; i++)
-    {
-      StringBuffer sb = new StringBuffer(ModelConstants.REL_ID);
-      sb.append(ModelConstants.REL_LOCALNAME_SEPARATOR);
-      sb.append(massNodeIds[i]);
-      Object rels = properties.get(sb.toString());
-      if (rels != null)
-      {
-        properties.put(ModelConstants.REL_ID, rels);
-        properties = super.deNormalize(properties);
-        Object nodeId = properties.get(ActionInputs.NODEID);
-        if (nodeId != null)
-        {
-          massNodeIdVector.add(nodeId);
-          properties.remove(ActionInputs.NODEID);
-        }
-        properties.remove(ModelConstants.REL_ID);
-      }
-    }
-    if (origNodeId != null)
-      properties.put(ActionInputs.NODEID, origNodeId);
-    int size = massNodeIdVector.size();
-    if (size == 1)
-      properties.put(massNodeIdKey, massNodeIdVector.get(0));
-    else if (size > 1)
-      properties.put(massNodeIdKey, massNodeIdVector.toArray(new String[0]));
-    else
-      properties.remove(massNodeIdKey);
-    return properties;
-  }
-
-  private String[] getValueAsStringArray(Hashtable properties, String key)
-  {
-    Object values = properties.get(key);
-    if (values == null)
-      return new String[0];
-    else if (values instanceof String[])
-      return (String[])values;
-    else
-      return new String[] {values.toString()};
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/MultipartFormDataParserTransformer.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/MultipartFormDataParserTransformer.java
deleted file mode 100644
index 182f3e88d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/MultipartFormDataParserTransformer.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.ws.internal.explorer.platform.engine.transformer;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-
-public class MultipartFormDataParserTransformer implements ITransformer
-{
-  protected Controller controller;
-
-  public MultipartFormDataParserTransformer(Controller controller)
-  {
-    this.controller = controller;
-  }
-
-  public Hashtable normalize(Hashtable properties)
-  {
-    MultipartFormDataParser parser = (MultipartFormDataParser)properties.get(ActionInputs.MULTIPART_FORM_DATA_PARSER);
-    String[] keys;
-    try
-    {
-      keys = parser.getParameterNames();
-    }
-    catch (Throwable t)
-    {
-      keys = new String[0];
-    }
-    for (int i = 0; i < keys.length; i++)
-    {
-      StringBuffer newKey = new StringBuffer(ActionInputs.MULTIPART_FORM_DATA_PARSER);
-      newKey.append(keys[i]);
-      try
-      {
-        properties.put(newKey.toString(), parser.getParameterValues(keys[i]));
-      }
-      catch (Throwable t)
-      {
-      }
-    }
-    return properties;
-  }
-  
-  public Hashtable deNormalize(Hashtable properties)
-  {
-    Enumeration e = properties.keys();
-    while (e.hasMoreElements())
-    {
-      Object key = e.nextElement();
-      if (key instanceof String)
-      {
-        if (((String)key).startsWith(ActionInputs.MULTIPART_FORM_DATA_PARSER))
-        {
-          String realKey = ((String)key).substring(ActionInputs.MULTIPART_FORM_DATA_PARSER.length());
-          if (!properties.containsKey(realKey))
-          {
-            Object value = properties.remove(key);
-            properties.put(realKey, value);
-          }
-        }
-      }
-    }
-    return properties;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/NodeIdTransformer.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/NodeIdTransformer.java
deleted file mode 100644
index 75657d232..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/NodeIdTransformer.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.engine.transformer;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-import org.eclipse.wst.ws.internal.datamodel.Rel;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class NodeIdTransformer implements ITransformer
-{
-  protected Controller controller;
-
-  public NodeIdTransformer(Controller controller)
-  {
-    this.controller = controller;
-  }
-
-  public Hashtable normalize(Hashtable properties)
-  {
-    Vector rels = new Vector();
-    try
-    {
-      int nodeId = Integer.parseInt((String)properties.get(ActionInputs.NODEID));
-      NodeManager nodeManager = controller.getCurrentPerspective().getNodeManager();
-      Node rootNode = nodeManager.getRootNode();
-      Node node = nodeManager.getNode(nodeId);
-      int depth = 0;
-      if (node != null)
-        depth = node.getNodeDepth();
-      while (rels.size() < depth && node != null && node != rootNode)
-      {
-        Node parentNode = node.getParent();
-        Element element = node.getTreeElement();
-        Rel rel = getRel(parentNode.getTreeElement(), element);
-        StringBuffer relValue = new StringBuffer(rel.getName());
-        relValue.append(ModelConstants.REL_LOCALNAME_SEPARATOR);
-        relValue.append(element.getName());
-        rels.insertElementAt(relValue.toString(), 0);
-        node = parentNode;
-      }
-    }
-    catch (NumberFormatException nfe)
-    {
-    }
-    int numRelationships = rels.size();
-    if (numRelationships == 1)
-      properties.put(ModelConstants.REL_ID, rels.get(0).toString());
-    else if (numRelationships > 1)
-      properties.put(ModelConstants.REL_ID, (String[])rels.toArray(new String[0]));
-    return properties;
-  }
-
-  private Rel getRel(Element sourceElement, Element targetElement)
-  {
-    Enumeration rels = sourceElement.getRels();
-    while (rels.hasMoreElements())
-    {
-      Rel rel = (Rel)rels.nextElement();
-      Enumeration targetElements = rel.getTargetElements();
-      while (targetElements.hasMoreElements())
-      {
-        if (targetElements.nextElement() == targetElement)
-          return rel;
-      }
-    }
-    return null;
-  }
-
-  public Hashtable deNormalize(Hashtable properties)
-  {
-    NodeManager nodeManager = controller.getCurrentPerspective().getNodeManager();
-    Node node = nodeManager.getRootNode();
-    Object value = properties.get(ModelConstants.REL_ID);
-    String[] relationships = null;
-    if (value instanceof String[])
-      relationships = (String[])value;
-    else if (value != null)
-      relationships = new String[] {value.toString()};
-    if (relationships != null)
-    {
-      for (int i = 0; i < relationships.length; i++)
-      {
-        int index = relationships[i].indexOf(ModelConstants.REL_LOCALNAME_SEPARATOR);
-        if (index == -1)
-          return deNormalizeAsSelectedNode(properties);
-        String rel = (index != -1) ? relationships[i].substring(0, index) : relationships[i];
-        String localname = (index != -1) ? relationships[i].substring(index + 1, relationships[i].length()) : null;
-        if (localname == null)
-          return deNormalizeAsSelectedNode(properties);
-        node = getNode(node, rel, localname);
-        if (node == null)
-          return deNormalizeAsSelectedNode(properties);
-      }
-      properties.put(ActionInputs.NODEID, String.valueOf(node.getNodeId()));
-      return properties;
-    }
-    else
-      return deNormalizeAsSelectedNode(properties);
-  }
-  
-  private Hashtable deNormalizeAsSelectedNode(Hashtable properties)
-  {
-    return (new CurrentNodeSelectionTransformer(controller)).deNormalize(properties);
-  }
-
-  private Node getNode(Node parent, String rel, String localname)
-  {
-    Element parentElement = parent.getTreeElement();
-    Enumeration e = parentElement.getElements(rel);
-    while (e.hasMoreElements())
-    {
-      Element element = (Element)e.nextElement();
-      if (localname.equals(element.getName()))
-        return parent.getChildNode((TreeElement)element);
-    }
-    return null;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/NodeSelectionTransformer.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/NodeSelectionTransformer.java
deleted file mode 100644
index 175dc03d0..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/NodeSelectionTransformer.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.engine.transformer;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-import org.eclipse.wst.ws.internal.datamodel.Rel;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class NodeSelectionTransformer implements ITransformer
-{
-  protected Controller controller;
-
-  public NodeSelectionTransformer(Controller controller)
-  {
-    this.controller = controller;
-  }
-
-  public Hashtable normalize(Hashtable properties)
-  {
-    try
-    {
-      NodeManager nodeManager = controller.getCurrentPerspective().getNodeManager();
-      Node nextNode = nodeManager.getNode(Integer.parseInt((String) properties.get(ActionInputs.NODEID)));
-      Node currNode = nodeManager.getSelectedNode();
-      if (currNode == null)
-        currNode = nodeManager.getRootNode();
-      Vector nextRels = new Vector();
-      Vector currRels = new Vector();
-      while (nextNode != null && currNode != null && (!isRootElement(nextNode.getTreeElement()) || !isRootElement(currNode.getTreeElement())) && nextNode != currNode)
-      {
-        if (nextNode.getNodeDepth() >= currNode.getNodeDepth())
-        {
-          Node parentNode = nextNode.getParent();
-          Element nextElement = nextNode.getTreeElement();
-          Rel rel = getRel(parentNode.getTreeElement(), nextElement);
-          StringBuffer relValue = new StringBuffer(rel.getName());
-          relValue.append(ModelConstants.REL_LOCALNAME_SEPARATOR);
-          relValue.append(nextElement.getName());
-          nextRels.insertElementAt(relValue.toString(), 0);
-          nextNode = parentNode;
-        }
-        else
-        {
-          Node parentNode = currNode.getParent();
-          Element parentElement = parentNode.getTreeElement();
-          Rel rel = getRel(currNode.getTreeElement(), parentElement);
-          StringBuffer relValue = new StringBuffer(rel.getName());
-          relValue.append(ModelConstants.REL_LOCALNAME_SEPARATOR);
-          relValue.append(parentElement.getName());
-          currRels.add(relValue.toString());
-          currNode = parentNode;
-        }
-      }
-      currRels.addAll(nextRels);
-      int numRelationships = currRels.size();
-      if (numRelationships == 1)
-        properties.put(ModelConstants.REL_ID, currRels.get(0).toString());
-      else if (numRelationships > 1)
-        properties.put(ModelConstants.REL_ID, (String[]) currRels.toArray(new String[0]));
-    }
-    catch (NumberFormatException nfe)
-    {
-    }
-    return properties;
-  }
-
-  private boolean isRootElement(Element e)
-  {
-    return e.getModel().getRootElement() == e;
-  }
-
-  private Rel getRel(Element sourceElement, Element targetElement)
-  {
-    Enumeration rels = sourceElement.getRels();
-    while (rels.hasMoreElements())
-    {
-      Rel rel = (Rel) rels.nextElement();
-      Enumeration targetElements = rel.getTargetElements();
-      while (targetElements.hasMoreElements())
-      {
-        if (targetElements.nextElement() == targetElement)
-          return rel;
-      }
-    }
-    return null;
-  }
-
-  public Hashtable deNormalize(Hashtable properties)
-  {
-    NodeManager nodeManager = controller.getCurrentPerspective().getNodeManager();
-    Node rootNode = nodeManager.getRootNode();
-    Node currNode = nodeManager.getSelectedNode();
-    if (currNode == null)
-      currNode = rootNode;
-    Object value = properties.get(ModelConstants.REL_ID);
-    String[] relationships = null;
-    if (value instanceof String[])
-      relationships = (String[]) value;
-    else if (value != null)
-      relationships = new String[]{value.toString()};
-    if (relationships != null)
-    {
-      Element currElement = currNode.getTreeElement();
-      for (int i = 0; i < relationships.length; i++)
-      {
-        int index = relationships[i].indexOf(ModelConstants.REL_LOCALNAME_SEPARATOR);
-        String rel = (index != -1) ? relationships[i].substring(0, index) : relationships[i];
-        String localname = (index != -1) ? relationships[i].substring(index + 1, relationships[i].length()) : null;
-        Enumeration e = currElement.getElements(rel);
-        Element targetElement = null;
-        if (localname != null)
-        {
-          Element firstElement = null;
-          while (e.hasMoreElements())
-          {
-            Element nextElement = (Element) e.nextElement();
-            if (firstElement == null)
-              firstElement = nextElement;
-            if (localname.equals(nextElement.getName()))
-            {
-              targetElement = nextElement;
-              break;
-            }
-          }
-          if (targetElement == null)
-            targetElement = firstElement;
-        }
-        else
-        {
-          if (e.hasMoreElements())
-            targetElement = (Element) e.nextElement();
-        }
-        if (targetElement != null)
-        {
-          currElement = (Element) targetElement;
-          Node parentNode = currNode.getParent();
-          if (parentNode != null && parentNode.getTreeElement() == currElement)
-            currNode = parentNode;
-          else
-            currNode = currNode.getChildNode((TreeElement) currElement);
-        }
-      }
-    }
-    properties.put(ActionInputs.NODEID, String.valueOf(currNode.getNodeId()));
-    return properties;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/ViewSelectionTransformer.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/ViewSelectionTransformer.java
deleted file mode 100644
index d6bd1359a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/ViewSelectionTransformer.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.ws.internal.explorer.platform.engine.transformer;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListManager;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class ViewSelectionTransformer implements ITransformer
-{
-  protected Controller controller;
-  protected String listManagerKey;
-  protected String viewKey;
-
-  public ViewSelectionTransformer(Controller controller, String listManagerKey, String viewKey)
-  {
-    this.controller = controller;
-    this.listManagerKey = listManagerKey;
-    this.viewKey = viewKey;
-  }
-
-  public Hashtable normalize(Hashtable properties)
-  {
-    Vector normalizedViewIds = new Vector();
-    NodeManager nodeManager = controller.getCurrentPerspective().getNodeManager();
-    Node currNode = nodeManager.getSelectedNode();
-    TreeElement currElement = currNode.getTreeElement();
-    Object listManagerObj = currElement.getPropertyAsObject(listManagerKey);
-    if (listManagerObj instanceof ListManager)
-    {
-      ListManager listManager = (ListManager) listManagerObj;
-      String[] viewIds = getViewValues(properties);
-      for (int i = 0; i < viewIds.length; i++)
-      {
-        ListElement listElement = null;
-        try
-        {
-          listElement = listManager.getElementWithViewId(Integer.parseInt(viewIds[i]));
-        }
-        catch (NumberFormatException nfe)
-        {
-        }
-        if (listElement != null)
-        {
-          Object object = listElement.getObject();
-          if (object != null && object instanceof Element)
-          {
-            Element element = (Element) object;
-            normalizedViewIds.add(element.getName());
-          }
-        }
-      }
-    }
-    properties.put(viewKey, normalizedViewIds.toArray(new String[0]));
-    return properties;
-  }
-
-  public Hashtable deNormalize(Hashtable properties)
-  {
-    Vector viewIds = new Vector();
-    Node currNode = controller.getCurrentPerspective().getNodeManager().getSelectedNode();
-    if (currNode != null)
-    {
-      TreeElement currElement = currNode.getTreeElement();
-      Object listManagerObj = currElement.getPropertyAsObject(listManagerKey);
-      if (listManagerObj instanceof ListManager)
-      {
-        ListManager listManager = (ListManager) listManagerObj;
-        String[] normalizedViewIds = getViewValues(properties);
-        for (int i = 0; i < normalizedViewIds.length; i++)
-        {
-          Enumeration e = listManager.getListElements();
-          while (e.hasMoreElements())
-          {
-            ListElement listElement = (ListElement) e.nextElement();
-            Element element = (Element) listElement.getObject();
-            if (element != null && normalizedViewIds[i].equals(element.getName()))
-            {
-              viewIds.add(String.valueOf(listElement.getViewId()));
-              break;
-            }
-          }
-        }
-      }
-    }
-    int size = viewIds.size();
-    if (size == 1)
-      properties.put(viewKey, viewIds.get(0));
-    else if (size > 1)
-      properties.put(viewKey, viewIds.toArray(new String[0]));
-    return properties;
-  }
-
-  private String[] getViewValues(Hashtable properties)
-  {
-    Object viewValueObj = properties.get(viewKey);
-    String[] viewValues;
-    if (viewValueObj == null)
-      viewValues = new String[0];
-    else if (viewValueObj.getClass().isArray())
-      viewValues = (String[]) viewValueObj;
-    else
-      viewValues = new String[]{(String) viewValueObj};
-    return viewValues;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddBusinessToUDDIPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddBusinessToUDDIPerspectiveAction.java
deleted file mode 100644
index 3e85712df..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddBusinessToUDDIPerspectiveAction.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.ws.internal.explorer.platform.favorites.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIBusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.RegFindBusinessUUIDAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-
-public class AddBusinessToUDDIPerspectiveAction extends AddToUDDIPerspectiveAction
-{
-  public AddBusinessToUDDIPerspectiveAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  protected boolean executeSingleLinkAction()
-  {
-    int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
-    FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    NodeManager nodeManager = favPerspective.getNodeManager();
-    Node selectedNode = nodeManager.getNode(nodeID);
-    TreeElement selectedElement = selectedNode.getTreeElement();
-    FavoritesUDDIBusinessElement busElement = (FavoritesUDDIBusinessElement) selectedElement;
-    String businessName = busElement.getName();
-    String inquiryAPI = busElement.getInquiryURL();
-    String businessKey = busElement.getBusinessKey();
-    // create the registry in the UDDI perspective
-    if (!createRegistryInUDDIPerspective(inquiryAPI, null, inquiryAPI, null, true))
-      return false;
-    RegFindBusinessUUIDAction action = new RegFindBusinessUUIDAction(controller_);
-    Hashtable propertyTable = action.getPropertyTable();
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY, businessKey);
-    propertyTable.put(UDDIActionInputs.QUERY_NAME, businessName);
-    if (!action.run())
-    {
-      favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_ERROR_ADD_TO_UDDI_PERSPECTIVE", businessName));
-      return false;
-    }
-    uddiPerspective.getNavigatorManager().getSelectedNode().setVisibilityOfChildren(true);
-    favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_INFO_ADD_TO_UDDI_PERSPECTIVE_SUCCESSFUL", businessName));
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddRegistryToUDDIPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddRegistryToUDDIPerspectiveAction.java
deleted file mode 100644
index a5fdc5601..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddRegistryToUDDIPerspectiveAction.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIRegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class AddRegistryToUDDIPerspectiveAction extends AddToUDDIPerspectiveAction
-{
-  public AddRegistryToUDDIPerspectiveAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  protected boolean executeSingleLinkAction()
-  {
-    int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
-    FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
-    NodeManager nodeManager = favPerspective.getNodeManager();
-    Node selectedNode = nodeManager.getNode(nodeID);
-    TreeElement selectedElement = selectedNode.getTreeElement();
-    FavoritesUDDIRegistryElement regElement = (FavoritesUDDIRegistryElement) selectedElement;
-    String registryName = regElement.getName();
-    String inquiryAPI = regElement.getInquiryURL();
-    String publishAPI = regElement.getPublishURL();
-    String registrationURL = regElement.getRegistrationURL();
-    if (!createRegistryInUDDIPerspective(inquiryAPI, publishAPI, registryName, registrationURL, false))
-      return false;
-    favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_INFO_ADD_TO_UDDI_PERSPECTIVE_SUCCESSFUL", registryName));
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddServiceInterfaceToUDDIPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddServiceInterfaceToUDDIPerspectiveAction.java
deleted file mode 100644
index 93337f4ca..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddServiceInterfaceToUDDIPerspectiveAction.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.ws.internal.explorer.platform.favorites.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIServiceInterfaceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.RegFindServiceInterfaceUUIDAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-
-public class AddServiceInterfaceToUDDIPerspectiveAction extends AddToUDDIPerspectiveAction
-{
-  public AddServiceInterfaceToUDDIPerspectiveAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  protected boolean executeSingleLinkAction()
-  {
-    int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
-    FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    NodeManager nodeManager = favPerspective.getNodeManager();
-    Node selectedNode = nodeManager.getNode(nodeID);
-    TreeElement selectedElement = selectedNode.getTreeElement();
-    FavoritesUDDIServiceInterfaceElement serIntElement = (FavoritesUDDIServiceInterfaceElement) selectedElement;
-    String serIntName = serIntElement.getName();
-    String inquiryAPI = serIntElement.getInquiryURL();
-    String serIntKey = serIntElement.getServiceInterfaceKey();
-    // create the registry in the UDDI perspective
-    if (!createRegistryInUDDIPerspective(inquiryAPI, null, inquiryAPI, null, true))
-      return false;
-    RegFindServiceInterfaceUUIDAction action = new RegFindServiceInterfaceUUIDAction(controller_);
-    Hashtable propertyTable = action.getPropertyTable();
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY, serIntKey);
-    propertyTable.put(UDDIActionInputs.QUERY_NAME, serIntName);
-    if (!action.run())
-    {
-      favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_ERROR_ADD_TO_UDDI_PERSPECTIVE", serIntName));
-      return false;
-    }
-    uddiPerspective.getNavigatorManager().getSelectedNode().setVisibilityOfChildren(true);
-    favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_INFO_ADD_TO_UDDI_PERSPECTIVE_SUCCESSFUL", serIntName));
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddServiceToUDDIPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddServiceToUDDIPerspectiveAction.java
deleted file mode 100644
index 1db7f592e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddServiceToUDDIPerspectiveAction.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.ws.internal.explorer.platform.favorites.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.RegFindServiceUUIDAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-
-public class AddServiceToUDDIPerspectiveAction extends AddToUDDIPerspectiveAction
-{
-  public AddServiceToUDDIPerspectiveAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  protected boolean executeSingleLinkAction()
-  {
-    int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
-    FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    NodeManager nodeManager = favPerspective.getNodeManager();
-    Node selectedNode = nodeManager.getNode(nodeID);
-    TreeElement selectedElement = selectedNode.getTreeElement();
-    FavoritesUDDIServiceElement serElement = (FavoritesUDDIServiceElement) selectedElement;
-    String serviceName = serElement.getName();
-    String inquiryAPI = serElement.getInquiryURL();
-    String serviceKey = serElement.getServiceKey();
-    // create the registry in the UDDI perspective
-    if (!createRegistryInUDDIPerspective(inquiryAPI, null, inquiryAPI, null, true))
-      return false;
-    RegFindServiceUUIDAction action = new RegFindServiceUUIDAction(controller_);
-    Hashtable propertyTable = action.getPropertyTable();
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY, serviceKey);
-    propertyTable.put(UDDIActionInputs.QUERY_NAME, serviceName);
-    if (!action.run())
-    {
-      favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_ERROR_ADD_TO_UDDI_PERSPECTIVE", serviceName));
-      return false;
-    }
-    uddiPerspective.getNavigatorManager().getSelectedNode().setVisibilityOfChildren(true);
-    favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_INFO_ADD_TO_UDDI_PERSPECTIVE_SUCCESSFUL", serviceName));
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddToUDDIPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddToUDDIPerspectiveAction.java
deleted file mode 100644
index 22cca6149..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddToUDDIPerspectiveAction.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.favorites.actions;
-
-import java.io.File;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIBusinessFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIRegistryFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIServiceFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIServiceInterfaceFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUserDefUDDIRegistryFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.OpenRegistryAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.CategoryModel;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegistryNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIMainNode;
-import org.eclipse.wst.ws.internal.explorer.platform.util.URLUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy;
-
-public abstract class AddToUDDIPerspectiveAction extends MultipleLinkAction {
-    public AddToUDDIPerspectiveAction(Controller controller) {
-        super(controller);
-    }
-
-    public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID) {
-        StringBuffer actionLink = new StringBuffer("favorites/actions/FavoritesAddToUDDIPerspectiveActionJSP.jsp?");
-        actionLink.append(ActionInputs.NODEID);
-        actionLink.append('=');
-        actionLink.append(nodeID);
-        actionLink.append('&');
-        actionLink.append(ActionInputs.TOOLID);
-        actionLink.append('=');
-        actionLink.append(toolID);
-        actionLink.append('&');
-        actionLink.append(ActionInputs.VIEWID);
-        actionLink.append('=');
-        actionLink.append(viewID);
-        actionLink.append('&');
-        actionLink.append(ActionInputs.VIEWTOOLID);
-        actionLink.append('=');
-        actionLink.append(viewToolID);
-        return actionLink.toString();
-    }
-
-    public static String getBaseActionLink() {
-        return "favorites/actions/FavoritesAddToUDDIPerspectiveActionJSP.jsp";
-    }
-
-    protected boolean createRegistryInUDDIPerspective(String inquiryAPI, String publishAPI, String registryName, String registrationURL, boolean useExisting)
-    {
-      return createRegistryInUDDIPerspective(inquiryAPI, publishAPI, registryName, registrationURL, null, null, null, useExisting);
-    }
-
-    protected boolean createRegistryInUDDIPerspective(String inquiryAPI, String publishAPI, String registryName, String registrationURL, String defaultLogin, String defaultPassword, Taxonomy[] taxonomies, boolean useExisting) {
-      Vector registryNodes = getRegistryNodesByInquiryURL(inquiryAPI);
-        if (registryNodes != null)
-        {
-          if (useExisting)
-          {
-            Node registryNode = (Node)registryNodes.elementAt(0);
-            NodeManager nodeManager = registryNode.getNodeManager();
-            nodeManager.setSelectedNodeId(registryNode.getNodeId());
-            return true;
-          }
-        }
-        
-        // open the registry if it is not already opened in the UDDI perspective
-        OpenRegistryAction openRegAction = new OpenRegistryAction(controller_);
-
-        // populate the property table
-        Hashtable propertyTable = openRegAction.getPropertyTable();
-        if (Validator.validateString(registryName))
-            propertyTable.put(UDDIActionInputs.REGISTRY_NAME,registryName);
-        else
-            return false;
-
-        if (Validator.validateURL(inquiryAPI))
-            propertyTable.put(UDDIActionInputs.INQUIRY_URL,inquiryAPI);
-        else
-            return false;
-
-        if (Validator.validateURL(publishAPI))
-            propertyTable.put(UDDIActionInputs.PUBLISH_URL,publishAPI);
-
-        if (Validator.validateURL(registrationURL))
-            propertyTable.put(UDDIActionInputs.REGISTRATION_URL,registrationURL);
-
-        if (defaultLogin != null)
-          propertyTable.put(UDDIActionInputs.UDDI_USERNAME, defaultLogin);
-
-        if (defaultPassword != null)
-          propertyTable.put(UDDIActionInputs.UDDI_PASSWORD, defaultPassword);
-            
-        // If user-defined category metadata exists, search and make the associations.
-        StringBuffer directoryBuffer = new StringBuffer();
-        FavoritesUDDIRegistryFolderElement.formCategoriesDirectory(directoryBuffer,controller_.getServletEngineStateLocation(),registryName);
-        File categoriesDirectory = new File(directoryBuffer.toString());
-        File[] categoryFiles = null;
-        if (categoriesDirectory.exists())
-        {
-          categoryFiles = categoriesDirectory.listFiles();
-          if (categoryFiles.length > 0)
-            propertyTable.put(UDDIActionInputs.CHECK_USER_DEFINED_CATEGORIES,Boolean.TRUE);
-        }
-
-        // run the action
-        if (!openRegAction.run())
-            return false;
-        
-        if (taxonomies != null)
-        {
-          Hashtable taxonomyTable = new Hashtable();
-          for (int i=0; i<taxonomies.length; i++)
-          {
-            Taxonomy taxonomy = taxonomies[i];
-            String name = taxonomy.getName();
-            String tmodelKey = taxonomy.getTmodelKey();
-            CategoryModel catModel = new CategoryModel();
-            catModel.setDisplayName(name);
-            catModel.setCategoryKey(name);
-            catModel.setTModelKey(tmodelKey);
-            catModel.loadFromTaxonomy(taxonomy);
-            taxonomyTable.put(tmodelKey, catModel);
-          }
-          RegistryElement regElement = (RegistryElement)(controller_.getUDDIPerspective().getNavigatorManager().getSelectedNode().getTreeElement());
-          regElement.setUserDefinedCategories(taxonomyTable);
-        }
-        
-        if (categoryFiles != null && categoryFiles.length > 0)
-        {
-          RegistryElement regElement = (RegistryElement)(controller_.getUDDIPerspective().getNavigatorManager().getSelectedNode().getTreeElement());
-          regElement.setCheckForUserDefinedCategories(true);
-          regElement.getUserDefinedCategories();
-          linkCategoryModelsWithSavedData(registryName,regElement.getUserDefinedCategories());
-        }
-        return true;
-    }
-    
-    public final void linkCategoryModelsWithSavedData(String registryName,Enumeration userDefinedCategories)
-    {
-      StringBuffer directoryBuffer = new StringBuffer();
-      FavoritesUDDIRegistryFolderElement.formCategoriesDirectory(directoryBuffer,controller_.getServletEngineStateLocation(),registryName);
-      linkCategoryModelsWithSavedData(userDefinedCategories,directoryBuffer.toString());
-    }
-    
-    public final void linkCategoryModelsWithSavedData(Enumeration userDefinedCategories,String categoriesDirectory)
-    {
-      File categoriesDirectoryFile = new File(categoriesDirectory);
-      File[] categoryFiles = null;
-      if (categoriesDirectoryFile.exists())
-      {
-        categoryFiles = categoriesDirectoryFile.listFiles(); 
-        if (userDefinedCategories != null)
-        {
-          while (userDefinedCategories.hasMoreElements())
-          {
-            CategoryModel categoryModel = (CategoryModel)userDefinedCategories.nextElement();
-            String categoryKey = categoryModel.getCategoryKey();
-            for (int i=0;i<categoryFiles.length;i++)
-            {
-              String categoryPropertiesFileName = categoryFiles[i].getName();
-              int lastDotPos = categoryPropertiesFileName.lastIndexOf(".");
-              String decodedCategoryPropertiesFileNameBase = URLUtils.decode(categoryPropertiesFileName.substring(0,lastDotPos));
-              if (lastDotPos > 0 && categoryPropertiesFileName.endsWith(".properties") && categoryKey.equals(decodedCategoryPropertiesFileNameBase))
-              {
-                categoryModel.setDefaultDataFile(categoryFiles[i].getAbsolutePath());
-                categoryModel.loadFromDelimiterFile();
-                break;
-              }
-            }            
-          }
-        }
-      }
-    }
-
-    protected Vector getRegistryNodesByInquiryURL(String inquiryURL)
-    {
-      Vector registryNodes = null;
-      NodeManager navigatorManager = controller_.getUDDIPerspective().getNavigatorManager();
-      UDDIMainNode uddiMainNode = (UDDIMainNode)(navigatorManager.getRootNode());
-      Vector childNodes = uddiMainNode.getChildNodes();
-      for (int i=0;i<childNodes.size();i++)
-      {
-        Node childNode = (Node)childNodes.elementAt(i);
-        if (childNode instanceof RegistryNode)
-        {
-          RegistryElement regElement = (RegistryElement)childNode.getTreeElement();
-          String currInquiryURL = regElement.getInquiryURL();
-          if (currInquiryURL != null && currInquiryURL.equals(inquiryURL))
-          {
-            if (registryNodes == null)
-              registryNodes = new Vector();
-            registryNodes.addElement(childNode);
-          }
-        }        
-      }
-      return registryNodes;
-    }
-    
-    public static AddToUDDIPerspectiveAction newAction(Controller controller) {
-        TreeElement selectedElement = controller.getFavoritesPerspective().getNodeManager().getSelectedNode().getTreeElement();
-        FavoritesFolderElement favoritesFolderElement = null;
-
-        if (selectedElement instanceof FavoritesFolderElement) {
-            favoritesFolderElement = (FavoritesFolderElement)selectedElement;
-        }
-        else if (selectedElement instanceof FavoritesElement) {
-            favoritesFolderElement = ((FavoritesElement)selectedElement).getParentFolderElement();
-        }
-        else {
-            return null;
-        }
-
-        // return an instance of AddToUDDIPerspectiveAction depending on the type of
-        // favorites folder element being selected.
-        if (favoritesFolderElement instanceof FavoritesUDDIRegistryFolderElement)
-            return new AddRegistryToUDDIPerspectiveAction(controller);
-        else if (favoritesFolderElement instanceof FavoritesUserDefUDDIRegistryFolderElement)
-            return new AddUserDefRegistryToUDDIPerspectiveAction(controller);
-        else if (favoritesFolderElement instanceof FavoritesUDDIBusinessFolderElement)
-            return new AddBusinessToUDDIPerspectiveAction(controller);
-        else if (favoritesFolderElement instanceof FavoritesUDDIServiceFolderElement)
-            return new AddServiceToUDDIPerspectiveAction(controller);
-        else if (favoritesFolderElement instanceof FavoritesUDDIServiceInterfaceFolderElement)
-            return new AddServiceInterfaceToUDDIPerspectiveAction(controller);
-        else
-            return null;
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddUserDefRegistryToUDDIPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddUserDefRegistryToUDDIPerspectiveAction.java
deleted file mode 100644
index 7809538e4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddUserDefRegistryToUDDIPerspectiveAction.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.explorer.platform.favorites.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUserDefUDDIRegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy;
-
-public class AddUserDefRegistryToUDDIPerspectiveAction extends AddToUDDIPerspectiveAction
-{
-  public AddUserDefRegistryToUDDIPerspectiveAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  protected boolean executeSingleLinkAction()
-  {
-    int nodeID = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-    FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
-    NodeManager nodeManager = favPerspective.getNodeManager();
-    Node selectedNode = nodeManager.getNode(nodeID);
-    TreeElement selectedElement = selectedNode.getTreeElement();
-    FavoritesUserDefUDDIRegistryElement regElement = (FavoritesUserDefUDDIRegistryElement)selectedElement;
-    String registryName = regElement.getName();
-    String inquiryAPI = regElement.getInquiryURL();
-    String publishAPI = regElement.getPublishURL();
-    String defaultLogin = regElement.getDefaultLogin();
-    String defaultPassword = regElement.getDefaultPassword();
-    Taxonomy[] taxonomies = regElement.getTaxonomies();
-    if (!createRegistryInUDDIPerspective(inquiryAPI, publishAPI, registryName, null, defaultLogin, defaultPassword, taxonomies, false))
-      return false;
-    favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_INFO_ADD_TO_UDDI_PERSPECTIVE_SUCCESSFUL", registryName));
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddWSILToWSILPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddWSILToWSILPerspectiveAction.java
deleted file mode 100644
index d249eef65..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddWSILToWSILPerspectiveAction.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.wst.ws.internal.explorer.platform.favorites.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesWSILElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.OpenWSILAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilActionInputs;
-
-public class AddWSILToWSILPerspectiveAction extends MultipleLinkAction
-{
-  public AddWSILToWSILPerspectiveAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID)
-  {
-    StringBuffer actionLink = new StringBuffer("favorites/actions/AddWSILToWSILPerspectiveActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID);
-    actionLink.append('=');
-    actionLink.append(nodeID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.TOOLID);
-    actionLink.append('=');
-    actionLink.append(toolID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.VIEWID);
-    actionLink.append('=');
-    actionLink.append(viewID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.VIEWTOOLID);
-    actionLink.append('=');
-    actionLink.append(viewToolID);
-    return actionLink.toString();
-  }
-
-  public static String getBaseActionLink()
-  {
-    return "favorites/actions/AddWSILToWSILPerspectiveActionJSP.jsp";
-  }
-
-  protected boolean executeSingleLinkAction()
-  {
-    int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
-    FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
-    NodeManager nodeManager = favPerspective.getNodeManager();
-    Node selectedNode = nodeManager.getNode(nodeID);
-    TreeElement selectedElement = selectedNode.getTreeElement();
-    FavoritesWSILElement wsilElement = (FavoritesWSILElement) selectedElement;
-    String wsilURL = wsilElement.getWsilUrl();
-    OpenWSILAction openWSILAction = new OpenWSILAction(controller_);
-    Hashtable propertyTable = openWSILAction.getPropertyTable();
-    propertyTable.put(WsilActionInputs.WSIL_URL, wsilURL);
-    propertyTable.put(WsilActionInputs.WSIL_INSPECTION_TYPE, String.valueOf(WsilActionInputs.WSIL_DETAILS));
-    boolean actionResult = openWSILAction.run();
-    if (actionResult)
-      favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_INFO_ADD_WSIL_TO_WSIL_PERSPECTIVE_SUCCESSFUL", wsilURL));
-    else
-      favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_ERROR_ADD_WSIL_TO_WSIL_PERSPECTIVE", wsilURL));
-    return actionResult;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesAddToWSDLPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesAddToWSDLPerspectiveAction.java
deleted file mode 100644
index 568b21776..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesAddToWSDLPerspectiveAction.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.ws.internal.explorer.platform.favorites.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesWSDLServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.OpenWSDLAction;
-
-public class FavoritesAddToWSDLPerspectiveAction extends MultipleLinkAction
-{
-  public FavoritesAddToWSDLPerspectiveAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID)
-  {
-    StringBuffer actionLink = new StringBuffer("favorites/actions/FavoritesAddToWSDLPerspectiveActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID);
-    actionLink.append('=');
-    actionLink.append(nodeID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.TOOLID);
-    actionLink.append('=');
-    actionLink.append(toolID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.VIEWID);
-    actionLink.append('=');
-    actionLink.append(viewID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.VIEWTOOLID);
-    actionLink.append('=');
-    actionLink.append(viewToolID);
-    return actionLink.toString();
-  }
-
-  public static String getBaseActionLink()
-  {
-    return "favorites/actions/FavoritesAddToWSDLPerspectiveActionJSP.jsp";
-  }
-
-  protected boolean executeSingleLinkAction()
-  {
-    int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
-    FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
-    NodeManager nodeManager = favPerspective.getNodeManager();
-    Node selectedNode = nodeManager.getNode(nodeID);
-    FavoritesWSDLServiceElement wsdlElement = (FavoritesWSDLServiceElement) selectedNode.getTreeElement();
-    String wsdlUrl = wsdlElement.getWsdlUrl();
-    OpenWSDLAction openWSDLAction = new OpenWSDLAction(controller_);
-    Hashtable propertyTable = openWSDLAction.getPropertyTable();
-    propertyTable.put(ActionInputs.QUERY_INPUT_WSDL_URL, wsdlUrl);
-    boolean actionResult = openWSDLAction.run();
-    if (actionResult)
-      favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_INFO_ADD_WSDL_TO_WSDL_PERSPECTIVE_SUCCESSFUL", wsdlUrl));
-    else
-      favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_ERROR_ADD_WSDL_TO_WSDL_PERSPECTIVE", wsdlUrl));
-    return actionResult;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesImportToFileSystemAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesImportToFileSystemAction.java
deleted file mode 100644
index 632814c7b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesImportToFileSystemAction.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.ws.internal.explorer.platform.favorites.actions;
-
-import java.io.OutputStream;
-import javax.wsdl.Definition;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToFileSystemAction;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.WSDLFileNameHelper;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesWSDLServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper;
-
-public class FavoritesImportToFileSystemAction extends ImportToFileSystemAction {
-
-    private Definition def_;
-    private String wsdlFileName_;
-
-    public FavoritesImportToFileSystemAction(Controller controller) {
-        super(controller);
-    }
-
-    public static final String getActionLink(int nodeId,int toolId,int viewId,int viewToolId)
-    {
-      return ImportToFileSystemAction.getActionLink(nodeId,toolId,viewId,viewToolId,"favorites/actions/FavortiesImportToFileSystemActionJSP.jsp");
-    }
-
-    public boolean write(OutputStream os) {
-        if (def_ != null) {
-            return writeWSDLDefinition(os, def_);
-        }
-        else {
-            return false;
-        }
-    }
-
-    public String getDefaultFileName() {
-        return wsdlFileName_;
-    }
-
-    public boolean run() {
-        int nodeID = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-
-        // return false if nodeID == 0, that is the main node
-        if (nodeID == 0)
-            return false;
-
-        FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
-        NodeManager nodeManager = favPerspective.getNodeManager();
-        Node selectedNode = nodeManager.getNode(nodeID);
-        TreeElement selectedElement = selectedNode.getTreeElement();
-
-        String wsdlURL = ((FavoritesWSDLServiceElement)selectedElement).getWsdlUrl();
-        wsdlFileName_ = WSDLFileNameHelper.getWSDLFileName(wsdlURL);
-        try {
-          def_ = (new Uddi4jHelper()).getWSDLDefinition(wsdlURL);
-        }
-        catch (Throwable t) {
-            favPerspective.getMessageQueue().addMessage(t.getMessage());
-            return false;
-        }
-        return true;
-    }
-
-    public final String getStatusContentVar()
-    {
-      return controller_.getFavoritesPerspective().getStatusContentVar();
-    }
-
-    public final String getStatusContentPage()
-    {
-      return controller_.getFavoritesPerspective().getStatusContentPage();
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesImportToWorkbenchAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesImportToWorkbenchAction.java
deleted file mode 100644
index 58663dbb9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesImportToWorkbenchAction.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.ws.internal.explorer.platform.favorites.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToFileSystemAction;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToWorkbenchAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesImportToWorkbenchAction extends ImportToWorkbenchAction {
-    public FavoritesImportToWorkbenchAction(Controller controller) {
-        super(controller);
-    }
-
-    public FormTool getSelectedFormTool() {
-        FavoritesPerspective favoritesPerspective = controller_.getFavoritesPerspective();
-        return (FormTool)favoritesPerspective.getNodeManager().getSelectedNode().getToolManager().getSelectedTool();
-    }
-
-    public ImportToFileSystemAction newImportToFileSystemAction() {
-        FavoritesImportToFileSystemAction action = new FavoritesImportToFileSystemAction(controller_);
-        Hashtable table = action.getPropertyTable();
-
-        FavoritesPerspective favoritesPerspective = controller_.getFavoritesPerspective();
-        NodeManager nodeManager = favoritesPerspective.getNodeManager();
-        Node selectedNode = nodeManager.getSelectedNode();
-
-        table.put(ActionInputs.NODEID, String.valueOf(selectedNode.getNodeId()));
-        table.put(ActionInputs.VIEWID, String.valueOf(selectedNode.getViewId()));
-
-        return action;
-    }
-
-    public final String getStatusContentVar()
-    {
-      return controller_.getFavoritesPerspective().getStatusContentVar();
-    }
-
-    public final String getStatusContentPage()
-    {
-      return controller_.getFavoritesPerspective().getStatusContentPage();
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesLaunchWebServiceWizardAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesLaunchWebServiceWizardAction.java
deleted file mode 100644
index 54917460c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesLaunchWebServiceWizardAction.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.ws.internal.explorer.platform.favorites.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.LaunchWebServiceWizardAction;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesWSDLServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesLaunchWebServiceWizardAction extends LaunchWebServiceWizardAction {
-
-    public FavoritesLaunchWebServiceWizardAction(Controller controller) {
-        super(controller);
-    }
-
-    public static LaunchWebServiceWizardAction newAction(Controller controller) {
-        return new FavoritesLaunchWebServiceWizardAction(controller);
-    }
-
-    public FormTool getSelectedFormTool() {
-        FavoritesPerspective favoritesPerspective = controller_.getFavoritesPerspective();
-        return (FormTool)favoritesPerspective.getNodeManager().getSelectedNode().getToolManager().getSelectedTool();
-    }
-
-    public boolean run() {
-        FavoritesPerspective favoritesPerspective = controller_.getFavoritesPerspective();
-        NodeManager nodeManager = favoritesPerspective.getNodeManager();
-        Node selectedNode = nodeManager.getSelectedNode();
-        TreeElement selectedElement = selectedNode.getTreeElement();
-        if (selectedElement instanceof FavoritesWSDLServiceElement)
-            return launchWizard(((FavoritesWSDLServiceElement)selectedElement).getWsdlUrl());
-        else
-            return false;
-    }
-    
-    public final String getStatusContentVar()
-    {
-      return controller_.getFavoritesPerspective().getStatusContentVar();
-    }
-    
-    public final String getStatusContentPage()
-    {
-      return controller_.getFavoritesPerspective().getStatusContentPage();
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesRestoreDefaultFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesRestoreDefaultFavoritesAction.java
deleted file mode 100644
index 48076eb40..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesRestoreDefaultFavoritesAction.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.ws.internal.explorer.platform.favorites.actions;
-
-import java.util.Vector;
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.LinkAction;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesMainElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesRestoreDefaultFavoritesAction extends LinkAction
-{
-  public FavoritesRestoreDefaultFavoritesAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID)
-  {
-    StringBuffer actionLink = new StringBuffer("favorites/actions/RestoreDefaultFavoritesConfirmJSP.jsp");
-    return actionLink.toString();
-  }
-
-  protected boolean processLinkParameters(HttpServletRequest request)
-  {
-    return true;
-  }
-
-  public boolean run()
-  {
-    FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
-    NodeManager nodeManager = favPerspective.getNodeManager();
-    Node mainNode = nodeManager.getRootNode();
-    FavoritesMainElement mainElement = (FavoritesMainElement)mainNode.getTreeElement();
-    boolean actionResult = mainElement.restoreFavoritesDefault();
-    if (actionResult)
-    {
-      Vector folderNodes = mainNode.getChildNodes();
-      for (int i = 0; i < folderNodes.size(); i++)
-      {
-        Node folderNode = (Node)folderNodes.elementAt(i);
-        TreeElement treeElement = folderNode.getTreeElement();
-        if (treeElement instanceof FavoritesFolderElement)
-        {
-          FavoritesFolderElement folderElement = (FavoritesFolderElement)treeElement;
-          folderElement.removeAllFavorites(controller_.getServletEngineStateLocation());
-          folderElement.init(mainElement);
-        }
-      }
-      favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_INFO_FAVORITES_RESTORED_TO_DEFAULT"));
-      return true;
-    }
-    else
-    {
-      favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_ERROR_OPEN_FAVORITES_BACKUP"));
-      return false;
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesToggleNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesToggleNodeAction.java
deleted file mode 100644
index bafa64d9b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesToggleNodeAction.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.ws.internal.explorer.platform.favorites.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ToggleNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ToolTypes;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesToggleNodeAction extends ToggleNodeAction {
-    public FavoritesToggleNodeAction(Controller controller) {
-        super(controller, controller.getFavoritesPerspective().getNodeManager());
-    }
-
-    public static String getActionLink(int nodeId, boolean open) {
-        StringBuffer actionLink = new StringBuffer("favorites/actions/FavoritesToggleNodeActionJSP.jsp?");
-        actionLink.append(ActionInputs.NODEID);
-        actionLink.append('=');
-        actionLink.append(nodeId);
-        actionLink.append('&');
-        actionLink.append(ActionInputs.OPEN);
-        actionLink.append('=');
-        if (open)
-            actionLink.append(ActionInputs.OPEN_NODE);
-        else
-            actionLink.append(ActionInputs.CLOSE_NODE);
-        return actionLink.toString();
-    }
-
-    public final String getActionLinkForHistory() {
-        ToolManager toolManager = toggledNode_.getToolManager();
-        Tool selectedTool = toolManager.getSelectedTool();
-        int nodeId = toggledNode_.getNodeId();
-        int toolId = selectedTool.getToolId();
-        int viewId = toggledNode_.getViewId();
-        int viewToolId = toggledNode_.getViewToolId();
-        if (selectedTool.getToolType() != ToolTypes.ACTION)
-            return SelectFavoritesToolAction.getActionLink(nodeId, toolId, viewId, viewToolId, true);
-        else
-            return SelectFavoritesNodeAction.getActionLink(nodeId, true);
-    }
-
-  public final String getTreeContentVar()
-  {
-    return controller_.getFavoritesPerspective().getTreeContentVar();
-  }
-
-  public final String getTreeContentPage()
-  {
-    return controller_.getFavoritesPerspective().getTreeContentPage();
-  }
-
-  public final String getPropertiesContainerVar()
-  {
-    return controller_.getFavoritesPerspective().getPropertiesContainerVar();
-  }
-
-  public final String getPropertiesContainerPage()
-  {
-    return controller_.getFavoritesPerspective().getPropertiesContainerPage();
-  }
-  
-  public final int getPerspectiveId()
-  {
-    return ActionInputs.PERSPECTIVE_FAVORITES;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/MultipleLinkAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/MultipleLinkAction.java
deleted file mode 100644
index aa5aa09dc..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/MultipleLinkAction.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.favorites.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.LinkAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.MassNodeIdTransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-
-public abstract class MultipleLinkAction extends LinkAction
-{
-  public MultipleLinkAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  protected boolean processLinkParameters(HttpServletRequest request)
-  {
-    String isMultipleLinkAction = request.getParameter(FavoritesActionInputs.MULTIPLE_LINK_ACTION);
-    if (isMultipleLinkAction != null)
-    {
-      propertyTable_.put(FavoritesActionInputs.MULTIPLE_LINK_ACTION, isMultipleLinkAction);
-      return processMultipleLinkActionParameters(request);
-    }
-    else
-    {
-      propertyTable_.remove(FavoritesActionInputs.MULTIPLE_LINK_ACTION);
-      String nodeIDString = request.getParameter(ActionInputs.NODEID);
-      String toolIDString = request.getParameter(ActionInputs.TOOLID);
-      String viewIDString = request.getParameter(ActionInputs.VIEWID);
-      String viewToolIDString = request.getParameter(ActionInputs.VIEWTOOLID);
-      if (nodeIDString != null)
-        propertyTable_.put(ActionInputs.NODEID, nodeIDString);
-      if (toolIDString != null)
-        propertyTable_.put(ActionInputs.TOOLID, toolIDString);
-      if (viewIDString != null)
-        propertyTable_.put(ActionInputs.VIEWID, viewIDString);
-      if (viewToolIDString != null)
-        propertyTable_.put(ActionInputs.VIEWTOOLID, viewToolIDString);
-      return true;
-    }
-  }
-
-  protected boolean processMultipleLinkActionParameters(HttpServletRequest request)
-  {
-    String[] massActionNodeIDs = request.getParameterValues(FavoritesActionInputs.MASS_ACTION_NODE_ID);
-    propertyTable_.put(FavoritesActionInputs.MASS_ACTION_NODE_ID, massActionNodeIDs);
-    if (massActionNodeIDs.length == 0)
-      return false;
-    else
-      return true;
-  }
-
-  public ITransformer[] getTransformers()
-  {
-    return new ITransformer[] {new MassNodeIdTransformer(controller_, FavoritesActionInputs.MASS_ACTION_NODE_ID)};
-  }
-
-  protected boolean isMultipleLinkAction()
-  {
-    return propertyTable_.containsKey(FavoritesActionInputs.MULTIPLE_LINK_ACTION);
-  }
-
-  protected String[] getMassActionNodeIds()
-  {
-    Object object = propertyTable_.get(FavoritesActionInputs.MASS_ACTION_NODE_ID);
-    if (object == null)
-      return new String[0];
-    else if (object.getClass().isArray())
-      return (String[])object;
-    else
-      return new String[] {(String)object};
-  }
-
-  public boolean run()
-  {
-    return (isMultipleLinkAction()) ? executeMultipleLinkAction() : executeSingleLinkAction();
-  }
-
-  protected boolean executeMultipleLinkAction()
-  {
-    boolean result = false;
-    String[] massActionNodeIDs = getMassActionNodeIds();
-    if (massActionNodeIDs != null)
-    {
-      for (int i = 0; i < massActionNodeIDs.length; i++)
-      {
-        propertyTable_.put(ActionInputs.NODEID, massActionNodeIDs[i]);
-        if (executeSingleLinkAction())
-          result = true;
-      }
-      propertyTable_.remove(ActionInputs.NODEID);
-    }
-    return result;
-  }
-
-  protected abstract boolean executeSingleLinkAction();
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/RemoveFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/RemoveFavoritesAction.java
deleted file mode 100644
index 877c72e06..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/RemoveFavoritesAction.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.ws.internal.explorer.platform.favorites.actions;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesMainElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class RemoveFavoritesAction extends MultipleLinkAction
-{
-  public RemoveFavoritesAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID)
-  {
-    StringBuffer actionLink = new StringBuffer("favorites/actions/RemoveFavoritesActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID);
-    actionLink.append('=');
-    actionLink.append(nodeID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.TOOLID);
-    actionLink.append('=');
-    actionLink.append(toolID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.VIEWID);
-    actionLink.append('=');
-    actionLink.append(viewID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.VIEWTOOLID);
-    actionLink.append('=');
-    actionLink.append(viewToolID);
-    return actionLink.toString();
-  }
-
-  public static String getBaseActionLink()
-  {
-    return "favorites/actions/RemoveFavoritesActionJSP.jsp";
-  }
-
-  protected boolean executeSingleLinkAction()
-  {
-    FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
-    NodeManager nodeManager = favPerspective.getNodeManager();
-    String nodeIDString = (String) propertyTable_.get(ActionInputs.NODEID);
-    int nodeID;
-    try
-    {
-      nodeID = Integer.parseInt(nodeIDString);
-    }
-    catch (NumberFormatException nfe)
-    {
-      nodeID = nodeManager.getSelectedNodeId();
-    }
-    Node selectedNode = nodeManager.getNode(nodeID);
-    if (selectedNode == null)
-      return false;
-    TreeElement selectedElement = selectedNode.getTreeElement();
-    String pluginMetadataDirectory = controller_.getServletEngineStateLocation();
-    boolean actionResult;
-    if (selectedElement instanceof FavoritesElement)
-      actionResult = ((FavoritesElement) selectedElement).getParentFolderElement().removeFavoriteByNodeID(nodeID, pluginMetadataDirectory);
-    else if (selectedElement instanceof FavoritesFolderElement)
-      actionResult = ((FavoritesFolderElement) selectedElement).removeAllFavorites(pluginMetadataDirectory);
-    else if (selectedElement instanceof FavoritesMainElement)
-    {
-      Enumeration e;
-      FavoritesMainElement mainElement = (FavoritesMainElement) selectedElement;
-      e = mainElement.getElements(FavoritesModelConstants.REL_WSIL_FOLDER_NODE);
-      actionResult = ((FavoritesFolderElement) e.nextElement()).removeAllFavorites(pluginMetadataDirectory);
-      e = mainElement.getElements(FavoritesModelConstants.REL_WSDL_SERVICE_FOLDER_NODE);
-      actionResult = actionResult && ((FavoritesFolderElement) e.nextElement()).removeAllFavorites(pluginMetadataDirectory);
-      e = mainElement.getElements(FavoritesModelConstants.REL_UDDI_SERVICE_FOLDER_NODE);
-      actionResult = actionResult && ((FavoritesFolderElement) e.nextElement()).removeAllFavorites(pluginMetadataDirectory);
-      e = mainElement.getElements(FavoritesModelConstants.REL_UDDI_BUSINESS_FOLDER_NODE);
-      actionResult = actionResult && ((FavoritesFolderElement) e.nextElement()).removeAllFavorites(pluginMetadataDirectory);
-      e = mainElement.getElements(FavoritesModelConstants.REL_UDDI_SERVICE_INTERFACE_FOLDER_NODE);
-      actionResult = actionResult && ((FavoritesFolderElement) e.nextElement()).removeAllFavorites(pluginMetadataDirectory);
-      e = mainElement.getElements(FavoritesModelConstants.REL_UDDI_REGISTRY_FOLDER_NODE);
-      actionResult = actionResult && ((FavoritesFolderElement) e.nextElement()).removeAllFavorites(pluginMetadataDirectory);
-    }
-    else
-      actionResult = false;
-    if (actionResult)
-      favPerspective.getMessageQueue().addMessage(controller_.getMessage("MSG_INFO_NODE_CLEARED", selectedNode.getNodeName()));
-    return actionResult;
-  }
-
-  public String getTreeContentVar()
-  {
-    return "favNavigatorContent";
-  }
-
-  public String getTreeContentPage()
-  {
-    return "favorites/fav_navigator_content.jsp";
-  }
-
-  public String getPropertiesContainerVar()
-  {
-    return "favPropertiesContainer";
-  }
-
-  public String getPropertiesContainerPage()
-  {
-    return "favorites/fav_properties_container.jsp";
-  }
-
-  public String getStatusContentVar()
-  {
-    return "favStatusContent";
-  }
-
-  public String getStatusContentPage()
-  {
-    return "favorites/fav_status_content.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/ResizeFavoritesFramesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/ResizeFavoritesFramesAction.java
deleted file mode 100644
index 00ffe421b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/ResizeFavoritesFramesAction.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.favorites.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ResizeFramesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesFrameNames;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-
-public class ResizeFavoritesFramesAction extends ResizeFramesAction
-{
-  public ResizeFavoritesFramesAction(Controller controller)
-  {
-    super(controller);
-  }
-  
-  protected boolean processOthers(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    String perspectiveContentFramesetCols = parser.getParameter(FavoritesActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
-    String actionsContainerFramesetRows = parser.getParameter(FavoritesActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
-    if (perspectiveContentFramesetCols != null && actionsContainerFramesetRows != null)
-    {
-      propertyTable_.put(FavoritesActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT,perspectiveContentFramesetCols);
-      propertyTable_.put(FavoritesActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER,actionsContainerFramesetRows);
-      return true;
-    }
-    return false;
-  }
-  
-  public final boolean run()
-  {
-    // Save the current frameset sizes.
-    String frameName = (String)propertyTable_.get(ActionInputs.FRAME_NAME);
-    String perspectiveContentFramesetCols = (String)propertyTable_.get(FavoritesActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
-    String actionsContainerFramesetRows = (String)propertyTable_.get(FavoritesActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
-    FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
-    
-    // Set the new frameset sizes.
-    if (frameName.equals(FavoritesFrameNames.NAVIGATOR_CONTAINER))
-    {
-      favPerspective.setActionsContainerFramesetRows(actionsContainerFramesetRows);
-      favPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
-      if (perspectiveContentFramesetCols.startsWith("100%"))
-      {
-        // Restore.
-        favPerspective.setPerspectiveContentFramesetCols(favPerspective.getSavedPerspectiveContentFramesetCols());
-      }
-      else
-      {
-        // Maximize.
-        favPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-        favPerspective.setPerspectiveContentFramesetCols("100%,0%");
-      }
-    }
-    else if (frameName.equals(FavoritesFrameNames.PROPERTIES_CONTAINER))
-    {
-      if (actionsContainerFramesetRows.startsWith("100%"))
-      {
-        if (perspectiveContentFramesetCols.endsWith("100%"))
-        {
-          // Restore.
-          favPerspective.setPerspectiveContentFramesetCols(favPerspective.getSavedPerspectiveContentFramesetCols());
-          favPerspective.setActionsContainerFramesetRows(favPerspective.getSavedActionsContainerFramesetRows());
-        }
-        else
-        {
-          // Maximize.
-          favPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-          favPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
-          favPerspective.setPerspectiveContentFramesetCols("0%,100%");
-        }
-      }
-      else
-      {
-        // Maximize.
-        favPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
-        favPerspective.setActionsContainerFramesetRows("100%,0%");
-        if (!perspectiveContentFramesetCols.endsWith("100%"))
-        {
-          favPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-          favPerspective.setPerspectiveContentFramesetCols("0%,100%");
-        }
-      }
-    }
-    else if (frameName.equals(FavoritesFrameNames.STATUS_CONTAINER))
-    {
-      if (actionsContainerFramesetRows.endsWith("100%"))
-      {
-        if (perspectiveContentFramesetCols.endsWith("100%"))
-        {
-          // Restore.
-          favPerspective.setPerspectiveContentFramesetCols(favPerspective.getSavedPerspectiveContentFramesetCols());
-          favPerspective.setActionsContainerFramesetRows(favPerspective.getSavedActionsContainerFramesetRows());
-        }
-        else
-        {
-          // Maximize.
-          favPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-          favPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
-          favPerspective.setPerspectiveContentFramesetCols("0%,100%");
-        }
-      }
-      else
-      {
-        // Maximize.
-        favPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
-        favPerspective.setActionsContainerFramesetRows("0%,100%");
-        if (!perspectiveContentFramesetCols.endsWith("100%"))
-        {
-          favPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-          favPerspective.setPerspectiveContentFramesetCols("0%,100%");
-        }
-      }
-    }
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SelectFavoritesNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SelectFavoritesNodeAction.java
deleted file mode 100644
index f4dfe1693..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SelectFavoritesNodeAction.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.ws.internal.explorer.platform.favorites.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.SelectNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ToolTypes;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-
-public class SelectFavoritesNodeAction extends SelectNodeAction
-{
-    public SelectFavoritesNodeAction(Controller controller)
-    {
-        super(controller, controller.getFavoritesPerspective().getNodeManager());
-    }
-
-    public static String getActionLink(int nodeID, boolean keepHistory)
-    {
-        StringBuffer actionLink = new StringBuffer("favorites/actions/SelectFavoritesNodeActionJSP.jsp?");
-        actionLink.append(ActionInputs.NODEID);
-        actionLink.append('=');
-        actionLink.append(nodeID);
-        if (keepHistory) {
-            actionLink.append('&');
-            actionLink.append(ActionInputs.ISHISTORY);
-            actionLink.append("=1");
-        }
-        return actionLink.toString();
-    }
-
-    protected String getActionLinkForHistory()
-    {
-        Node selectedNode = getSelectedNode();
-        Tool selectedTool = selectedNode.getToolManager().getSelectedTool();
-        if (selectedTool == null)
-            return null;
-        else if (selectedTool.getToolType() != ToolTypes.ACTION)
-            return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), selectedTool.getToolId(), selectedNode.getViewId(), selectedNode.getViewToolId(), true);
-        else
-            return getActionLink(selectedNode.getNodeId(), true);
-    }
-
-    public final String getTreeContentVar() {
-        return controller_.getFavoritesPerspective().getTreeContentVar();
-    }
-
-    public final String getTreeContentPage() {
-        return controller_.getFavoritesPerspective().getTreeContentPage();
-    }
-
-    public final String getPropertiesContainerVar() {
-        return controller_.getFavoritesPerspective().getPropertiesContainerVar();
-    }
-
-    public final String getPropertiesContainerPage() {
-        return controller_.getFavoritesPerspective().getPropertiesContainerPage();
-    }
-    
-    public final int getPerspectiveId()
-    {
-      return ActionInputs.PERSPECTIVE_FAVORITES;
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SelectFavoritesToolAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SelectFavoritesToolAction.java
deleted file mode 100644
index 295b76eaa..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SelectFavoritesToolAction.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.ws.internal.explorer.platform.favorites.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.SelectNodeToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ToolTypes;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-
-public class SelectFavoritesToolAction extends SelectNodeToolAction
-{
-    public SelectFavoritesToolAction(Controller controller)
-    {
-        super(controller, controller.getFavoritesPerspective().getNodeManager());
-    }
-
-    public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID, boolean keepHistory)
-    {
-        StringBuffer actionLink = new StringBuffer("favorites/actions/SelectFavoritesToolActionJSP.jsp?");
-        actionLink.append(ActionInputs.NODEID);
-        actionLink.append('=');
-        actionLink.append(nodeID);
-        actionLink.append('&');
-        actionLink.append(ActionInputs.TOOLID);
-        actionLink.append('=');
-        actionLink.append(toolID);
-        if (viewID != ActionInputs.VIEWID_DEFAULT) {
-            actionLink.append('&');
-            actionLink.append(ActionInputs.VIEWID);
-            actionLink.append('=');
-            actionLink.append(viewID);
-            actionLink.append('&');
-            actionLink.append(ActionInputs.VIEWTOOLID);
-            actionLink.append('=');
-            actionLink.append(viewToolID);
-        }
-        if (keepHistory) {
-            actionLink.append('&');
-            actionLink.append(ActionInputs.ISHISTORY);
-            actionLink.append("=1");
-        }
-        return actionLink.toString();
-    }
-
-    protected String getActionLinkForHistory()
-    {
-        if (getSelectedTool().getToolType() != ToolTypes.ACTION) {
-            Node selectedNode = getSelectedNode();
-            return getActionLink(selectedNode.getNodeId(), getSelectedTool().getToolId(), selectedNode.getViewId(), selectedNode.getViewToolId(), true);
-        }
-        else
-            return null;
-    }
-
-    public final String getTreeContentVar() {
-        return controller_.getFavoritesPerspective().getTreeContentVar();
-    }
-
-    public final String getTreeContentPage() {
-        return controller_.getFavoritesPerspective().getTreeContentPage();
-    }
-
-    public final String getPropertiesContainerVar() {
-        return controller_.getFavoritesPerspective().getPropertiesContainerVar();
-    }
-
-    public final String getPropertiesContainerPage() {
-        return controller_.getFavoritesPerspective().getPropertiesContainerPage();
-    }
-
-    public final String getPropertiesContentVar() {
-        return controller_.getFavoritesPerspective().getPropertiesContentVar();
-    }
-
-    public final String getPropertiesContentPage() {
-        return controller_.getFavoritesPerspective().getPropertiesContentPage();
-    }
-    
-    public final int getPerspectiveId()
-    {
-      return ActionInputs.PERSPECTIVE_FAVORITES;
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SwitchPerspectiveFromFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SwitchPerspectiveFromFavoritesAction.java
deleted file mode 100644
index 46dc69997..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SwitchPerspectiveFromFavoritesAction.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.ws.internal.explorer.platform.favorites.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ShowPerspectiveAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-
-public final class SwitchPerspectiveFromFavoritesAction extends ShowPerspectiveAction
-{
-  public SwitchPerspectiveFromFavoritesAction(Controller controller)
-  {
-    super(controller);
-  }
-  
-  protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    String perspectiveContentFramesetCols = parser.getParameter(FavoritesActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
-    String actionsContainerFramesetRows = parser.getParameter(FavoritesActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
-    if (perspectiveContentFramesetCols != null && actionsContainerFramesetRows != null)
-    {
-      propertyTable_.put(FavoritesActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT,perspectiveContentFramesetCols);
-      propertyTable_.put(FavoritesActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER,actionsContainerFramesetRows);
-      return true;
-    }
-    return false;
-  }
-  
-  public final boolean run()
-  {
-    String perspectiveContentFramesetCols = (String)propertyTable_.get(FavoritesActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
-    String actionsContainerFramesetRows = (String)propertyTable_.get(FavoritesActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
-    
-    // Save the frameset sizes iff no frame is maximized.
-    FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
-    if (!perspectiveContentFramesetCols.startsWith("100%") && !perspectiveContentFramesetCols.endsWith("100%"))
-      favPerspective.setPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-      
-    if (!actionsContainerFramesetRows.startsWith("100%") && !actionsContainerFramesetRows.endsWith("100%"))
-      favPerspective.setActionsContainerFramesetRows(actionsContainerFramesetRows);
-      
-    return super.run();
-  }
-  
-  public static final String getFormActionLink(int targetPerspectiveId,boolean forHistory)
-  {
-    StringBuffer formLink = new StringBuffer("wsdl/actions/SwitchPerspectiveFromWSDLActionJSP.jsp?");
-    formLink.append(ActionInputs.PERSPECTIVE).append('=').append(targetPerspectiveId);
-    if (forHistory)
-      formLink.append('&').append(ActionInputs.ISHISTORY).append("=1");    
-    return formLink.toString();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/constants/FavoritesActionInputs.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/constants/FavoritesActionInputs.java
deleted file mode 100644
index c4ca64187..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/constants/FavoritesActionInputs.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.ws.internal.explorer.platform.favorites.constants;
-
-public class FavoritesActionInputs
-{
-    // mass actions
-    public final static String MULTIPLE_LINK_ACTION = "multipleLinkAction";
-    public final static String MASS_ACTION_NODE_ID = "massActionNodeID";
-
-    // resize favorites frames action
-    public final static String FRAMESET_COLS_PERSPECTIVE_CONTENT = "framesetColsPerspectiveContent";
-    public final static String FRAMESET_ROWS_ACTIONS_CONTAINER = "framesetRowsActionsContainer";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/constants/FavoritesFrameNames.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/constants/FavoritesFrameNames.java
deleted file mode 100644
index 5a2622049..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/constants/FavoritesFrameNames.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.ws.internal.explorer.platform.favorites.constants;
-
-public class FavoritesFrameNames
-{
-  public final static String NAVIGATOR_CONTAINER = "fav_navigator_container";
-  public final static String NAVIGATOR_TOOLBAR = "fav_navigator_toolbar";
-  public final static String NAVIGATOR_CONTENT = "fav_navigator_content";
-  public final static String ACTIONS_CONTAINER = "fav_actions_container";
-  public final static String PROPERTIES_CONTAINER = "fav_properties_container";
-  public final static String PROPERTIES_TOOLBAR = "fav_properties_toolbar";
-  public final static String PROPERTIES_CONTENT = "fav_properties_content";
-  public final static String STATUS_CONTAINER = "fav_status_container";
-  public final static String STATUS_TOOLBAR = "fav_status_toolbar";
-  public final static String STATUS_CONTENT = "fav_status_content";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/constants/FavoritesModelConstants.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/constants/FavoritesModelConstants.java
deleted file mode 100644
index f67252d95..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/constants/FavoritesModelConstants.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.ws.internal.explorer.platform.favorites.constants;
-
-public class FavoritesModelConstants {
-    // Relations
-    public final static String REL_WSIL_FOLDER_NODE = "relWSILFolderNode";
-    public final static String REL_WSDL_SERVICE_FOLDER_NODE = "relWSDLServiceFolderNode";
-    public final static String REL_UDDI_SERVICE_FOLDER_NODE = "relUDDIServiceFolderNode";
-    public final static String REL_UDDI_BUSINESS_FOLDER_NODE = "relUDDIBusinessFolderNode";
-    public final static String REL_UDDI_SERVICE_INTERFACE_FOLDER_NODE = "relUDDIServiceInterfaceFolderNode";
-    public final static String REL_UDDI_REGISTRY_FOLDER_NODE = "relUDDIRegistryFolerNode";
-    public final static String REL_USER_DEF_UDDI_REGISTRY_FOLDER_NODE = "relUserDefUDDIRegistryFolderNode";
-    public final static String REL_WSIL_NODE = "relWSILNode";
-    public final static String REL_WSDL_SERVICE_NODE = "relWSDLServiceNode";
-    public final static String REL_UDDI_SERVICE_NODE = "relUDDIServiceNode";
-    public final static String REL_UDDI_BUSINESS_NODE = "relUDDIBusinessNode";
-    public final static String REL_UDDI_SERVICE_INTERFACE_NODE = "relUDDIServiceInterfaceNode";
-    public final static String REL_UDDI_REGISTRY_NODE = "relUDDIRegistryNode";
-    public final static String REL_USER_DEF_UDDI_REGISTRY_NODE = "relUserDefUDDIRegistryNode";
-
-    // Properties
-    public final static String PROP_PLUGIN_METADATA_DIRECTORY = "pluginMetadataDirectory";
-    public final static String PROP_WSIL_URL = "wsilURL";
-    public final static String PROP_WSDL_URL = "wsdlURL";
-    public final static String PROP_UDDI_SERVICE_NAME = "UDDIServiceName";
-    public final static String PROP_UDDI_SERVICE_INQUIRY_API = "UDDIServiceInquiryAPI";
-    public final static String PROP_UDDI_SERVICE_KEY = "UDDIServiceKey";
-    public final static String PROP_UDDI_BUSINESS_NAME = "UDDIBusinessName";
-    public final static String PROP_UDDI_BUSINESS_INQUIRY_API = "UDDIBusinessInquiryAPI";
-    public final static String PROP_UDDI_BUSINESS_KEY = "UDDIBusinessKey";
-    public final static String PROP_UDDI_SERVICE_INTERFACE_NAME = "UDDIServiceInterfaceName";
-    public final static String PROP_UDDI_SERVICE_INTERFACE_INQUIRY_API = "UDDIServiceInterfaceInquiryAPI";
-    public final static String PROP_UDDI_SERVICE_INTERFACE_KEY = "UDDIServiceInterfaceKey";
-    public final static String PROP_UDDI_REGISTRY_NAME = "UDDIRegistryName";
-    public final static String PROP_UDDI_REGISTRY_INQUIRY_API = "UDDIRegistryInquiryAPI";
-    public final static String PROP_UDDI_REGISTRY_PUBLISH_API = "UDDIRegistryPublishAPI";
-    public final static String PROP_UDDI_REGISTRY_REGISTRATION_URL = "UDDIRegistryRegistrationURL";
-    public final static String PROP_UDDI_REGISTRY_CATEGORIES_ENUM = "UDDIRegistryCategoriesEnum";
-
-    // List Managers for Favorites
-    public final static String LIST_MANAGER_WSDL_SERVICES = "wsdlServices";
-    public final static String LIST_MANAGER_UDDI_SERVICES = "uddiServices";
-    public final static String LIST_MANAGER_UDDI_BUSINESS = "uddiBusiness";
-    public final static String LIST_MANAGER_WSIL_LINKS = "wsilLinks";
-    public final static String LIST_MANAGER_UDDI_REGISTRY = "uddiRegistry";
-    public final static String LIST_MANAGER_UDDI_SERVICE_INTERFACE = "uddiServiceInterface";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesElement.java
deleted file mode 100644
index 07102a268..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesElement.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.ws.internal.explorer.platform.favorites.datamodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-
-/**
-* The data model element that represents 
-* a WSIL document
-*/
-public class FavoritesElement extends TreeElement {
-
-  public FavoritesElement(String name, Model model) {
-    super(name, model);
-  }
-
-  public FavoritesFolderElement getParentFolderElement() {
-    Enumeration e = getElements(ModelConstants.REL_OWNER);
-    if (!e.hasMoreElements())
-      return null;
-    else
-      return (FavoritesFolderElement)e.nextElement();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesFolderElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesFolderElement.java
deleted file mode 100644
index 2e637d3d8..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesFolderElement.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.ws.internal.explorer.platform.favorites.datamodel;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-/**
-* The data model element that represents 
-* a WSIL document
-*/
-public abstract class FavoritesFolderElement extends TreeElement
-{
-    protected NodeManager nodeManager_;
-    
-    public FavoritesFolderElement(String name, Model model, NodeManager nodeManager) {
-        super(name, model);
-        nodeManager_ = nodeManager;
-    }
-
-    protected FavoritesMainElement getFavoritesMainElement() {
-        return (FavoritesMainElement)nodeManager_.getRootNode().getTreeElement();
-    }
-
-    public abstract void init(FavoritesMainElement favMainElement);
-
-    public abstract boolean removeFavoriteByNodeID(int nodeID,String pluginMetadataDirectory);
-
-    public abstract boolean removeAllFavorites(String pluginMetadataDirectory);
-
-    public abstract boolean addFavorite(Hashtable table);
-
-    public abstract boolean favoriteExists(Hashtable table);
-
-    public abstract Enumeration getAllFavorites();
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesMainElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesMainElement.java
deleted file mode 100644
index daeb65688..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesMainElement.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.ws.internal.explorer.platform.favorites.datamodel;
-
-import org.apache.wsil.Link;
-import org.apache.wsil.Service;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.favorites.FavoritesRegistryTypeWSE;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-
-/**
-* The data model element that represents 
-* a WSIL document
-*/
-public class FavoritesMainElement extends TreeElement
-{
-  private Controller controller_;
-  private FavoritesRegistryTypeWSE favRegistry_;
-
-  public FavoritesMainElement(String name, Model model, Controller controller)
-  {
-    super(name, model);
-    controller_ = controller;
-    favRegistry_ = new FavoritesRegistryTypeWSE(
-			controller.getDefaultFavoritesLocation(),
-			controller.getServletEngineStateLocation()
-	);
-  }
-
-  public boolean restoreFavoritesDefault()
-  {
-    favRegistry_.restoreFavoritesDefault();
-    return saveFavorites();
-  }
-
-  public boolean saveFavorites()
-  {
-    try
-    {
-      favRegistry_.save();
-      return true;
-    }
-    catch (Throwable t)
-    {
-      FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
-      favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_ERROR_SAVE_FAVORITES_WSIL", favRegistry_.getWriteLocation()));
-      return false;
-    }
-  }
-
-  public Link addUDDIRegistry(String registryName, String inquiryAPI, String publishAPI, String registrationURL)
-  {
-    return favRegistry_.addUDDIRegistry(registryName, inquiryAPI, publishAPI, registrationURL);
-  }
-
-  public Link addUDDIBusiness(String businessName, String inquiryAPI, String businessKey)
-  {
-    return favRegistry_.addUDDIBusiness(businessName, inquiryAPI, businessKey);
-  }
-
-  public Service addUDDIService(String serviceName, String inquiryAPI, String serviceKey)
-  {
-    return favRegistry_.addUDDIService(serviceName, inquiryAPI, serviceKey);
-  }
-
-  public Service addUDDIServiceInterface(String serIntName, String inquiryAPI, String serIntKey)
-  {
-    return favRegistry_.addUDDIServiceInterface(serIntName, inquiryAPI, serIntKey);
-  }
-
-  public Service addWSDLService(String url)
-  {
-    return favRegistry_.addWSDLService(url);
-  }
-
-  public Link addWSILLink(String url)
-  {
-    return favRegistry_.addWSILLink(url);
-  }
-
-  public boolean removeService(Service service) {
-    favRegistry_.removeService(service);
-    return true;
-  }
-
-  public boolean removeLink(Link link) {
-    favRegistry_.removeLink(link);
-    return true;
-  }
-
-  public Link[] loadUDDIRegistries()
-  {
-    return favRegistry_.loadUDDIRegistries();
-  }
-    
-  public Link[] loadUDDIBusinesses()
-  {
-    return favRegistry_.loadUDDIBusinesses();
-  }
-
-  public Service[] loadUDDIServices()
-  {
-    return favRegistry_.loadUDDIServices();
-  }
-
-  public Service[] loadUDDIServiceInterfaces()
-  {
-    return favRegistry_.loadUDDIServiceInterfaces();
-  }
-
-  public Service[] loadWSDLServices()
-  {
-    return favRegistry_.loadWSDLServices();
-  }
-
-  public Link[] loadWSILs()
-  {
-    return favRegistry_.loadWSILs();
-  }
-  
-  public final FavoritesUDDIRegistryFolderElement getFavoritesUDDIRegistryFolderElement()
-  {
-    return (FavoritesUDDIRegistryFolderElement)(getElements(FavoritesModelConstants.REL_UDDI_REGISTRY_FOLDER_NODE).nextElement());
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIBusinessElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIBusinessElement.java
deleted file mode 100644
index e9a148e08..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIBusinessElement.java
+++ /dev/null
@@ -1,47 +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.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import org.apache.wsil.Link;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.parser.favorites.FavoritesUDDIBusiness;
-
-public class FavoritesUDDIBusinessElement extends FavoritesElement {
-
-  private FavoritesUDDIBusiness uddiBusiness_;
-
-  public FavoritesUDDIBusinessElement(String name, Model model, Link link) {
-    super(name, model);
-    uddiBusiness_ = new FavoritesUDDIBusiness();
-    uddiBusiness_.setLink(link);
-  }
-
-  public Link getLink() {
-    return uddiBusiness_.getLink();
-  }
-
-  public String getName() {
-    return uddiBusiness_.getName();
-  }
-
-  public String getInquiryURL() {
-    return uddiBusiness_.getInquiryURL();
-  }
-
-  public String getBusinessKey() {
-    return uddiBusiness_.getBusinessKey();
-  }
-
-  public String toString() {
-    return getName();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIBusinessFolderElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIBusinessFolderElement.java
deleted file mode 100644
index 903ec86fb..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIBusinessFolderElement.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.ws.internal.explorer.platform.favorites.datamodel;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import org.apache.wsil.Link;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-/**
-* The data model element that represents 
-* a WSIL document
-*/
-public class FavoritesUDDIBusinessFolderElement extends FavoritesFolderElement
-{
-  public FavoritesUDDIBusinessFolderElement(String name, Model model, NodeManager nodeManager) {
-    super(name, model, nodeManager);
-  }
-
-  public void init(FavoritesMainElement favMainElement) {
-    Link[] links = favMainElement.loadUDDIBusinesses();
-    for (int i = 0; i < links.length; i++) {
-      Link link = links[i];
-      FavoritesUDDIBusinessElement favUDDIBusinessElement = new FavoritesUDDIBusinessElement((link.getAbstracts())[0].getText(), getModel(), link);
-      connect(favUDDIBusinessElement, FavoritesModelConstants.REL_UDDI_BUSINESS_NODE, ModelConstants.REL_OWNER);
-    }
-  }
-
-  public boolean addFavorite(Hashtable table) {
-    String businessName = (String)table.get(FavoritesModelConstants.PROP_UDDI_BUSINESS_NAME);
-    String inquiryAPI = (String)table.get(FavoritesModelConstants.PROP_UDDI_BUSINESS_INQUIRY_API);
-    String businessKey = (String)table.get(FavoritesModelConstants.PROP_UDDI_BUSINESS_KEY);
-    if (businessName == null || inquiryAPI == null || businessKey == null)
-      return false;
-    FavoritesUDDIBusinessElement e = getFavorite(inquiryAPI, businessKey);
-    if (e != null)
-      removeFavorite(e);
-    FavoritesMainElement favMainElement = getFavoritesMainElement();
-    Link link = favMainElement.addUDDIBusiness(businessName, inquiryAPI, businessKey);
-    boolean saved = favMainElement.saveFavorites();
-    if (saved) {
-      FavoritesUDDIBusinessElement favUDDIBusinessElement = new FavoritesUDDIBusinessElement(businessName, getModel(), link);
-      connect(favUDDIBusinessElement, FavoritesModelConstants.REL_UDDI_BUSINESS_NODE, ModelConstants.REL_OWNER);
-    }
-    return saved;
-  }
-
-  public boolean favoriteExists(Hashtable table) {
-    String inquiryAPI = (String)table.get(FavoritesModelConstants.PROP_UDDI_BUSINESS_INQUIRY_API);
-    String businessKey = (String)table.get(FavoritesModelConstants.PROP_UDDI_BUSINESS_KEY);
-    if (inquiryAPI == null || businessKey == null)
-      return false;
-    return (getFavorite(inquiryAPI, businessKey) != null);
-  }
-
-  public boolean removeFavoriteByNodeID(int nodeID,String pluginMetadataDirectory) {
-    Node selectedNode = nodeManager_.getNode(nodeID);
-    TreeElement selectedElement = selectedNode.getTreeElement();
-    FavoritesMainElement favMainElement = getFavoritesMainElement();
-    if (selectedElement instanceof FavoritesUDDIBusinessElement)
-      return (removeFavorite((FavoritesUDDIBusinessElement)selectedElement) && favMainElement.saveFavorites());
-    else
-      return false;
-  }
-
-  private boolean removeFavorite(FavoritesUDDIBusinessElement element) {
-    Link link = element.getLink();
-    FavoritesMainElement favMainElement = getFavoritesMainElement();
-    if (favMainElement.removeLink(link)) {
-      element.disconnectAll();
-      return true;
-    }
-    else
-      return false;
-  }
-
-  public boolean removeAllFavorites(String pluginMetadataDirectory) {
-    FavoritesMainElement favMainElement = getFavoritesMainElement();
-    Enumeration e = getAllFavorites();
-    while(e.hasMoreElements()) {
-      FavoritesUDDIBusinessElement favUDDIBusinessElement = (FavoritesUDDIBusinessElement)e.nextElement();
-      Link link = favUDDIBusinessElement.getLink();
-      favMainElement.removeLink(link);
-    }
-    disconnectRel(FavoritesModelConstants.REL_UDDI_BUSINESS_NODE);
-    return favMainElement.saveFavorites();
-  }
-
-  public Enumeration getAllFavorites() {
-    return getElements(FavoritesModelConstants.REL_UDDI_BUSINESS_NODE);
-  }
-
-  private FavoritesUDDIBusinessElement getFavorite(String inquiryAPI, String businessKey) {
-    Enumeration e = getAllFavorites();
-    while (e.hasMoreElements()) {
-      FavoritesUDDIBusinessElement busElement = (FavoritesUDDIBusinessElement)e.nextElement();
-      if (inquiryAPI.equals(busElement.getInquiryURL()) &&
-          businessKey.equals(busElement.getBusinessKey()))
-        return busElement;
-    }
-    return null;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIRegistryElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIRegistryElement.java
deleted file mode 100644
index 00a339723..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIRegistryElement.java
+++ /dev/null
@@ -1,58 +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.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import org.apache.wsil.Link;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.parser.favorites.FavoritesUDDIRegistry;
-import org.eclipse.wst.ws.internal.parser.favorites.IFavoritesUDDIRegistry;
-
-public class FavoritesUDDIRegistryElement extends FavoritesElement {
-
-  private FavoritesUDDIRegistry uddiReg_;
-
-  public FavoritesUDDIRegistryElement(String name, Model model, Link link) {
-    super(name, model);
-    uddiReg_ = new FavoritesUDDIRegistry();
-    uddiReg_.setLink(link);
-  }
-
-  public Link getLink() {
-    return uddiReg_.getLink();
-  }
-
-  public String getName() {
-    return uddiReg_.getName();
-  }
-
-  public String getInquiryURL() {
-    return uddiReg_.getInquiryURL();
-  }
-
-  public String getPublishURL() {
-    return uddiReg_.getPublishURL();
-  }
-
-  public String getRegistrationURL() {
-    return uddiReg_.getRegistrationURL();
-  }
-
-  public String toString() {
-    return getName();
-  }
-  
-  public IFavoritesUDDIRegistry getIFavoritesUDDIRegistryInterface()
-  {
-    return uddiReg_;
-  }
-}
-  
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIRegistryFolderElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIRegistryFolderElement.java
deleted file mode 100644
index c8c5b118d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIRegistryFolderElement.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.ws.internal.explorer.platform.favorites.datamodel;
-
-import java.io.File;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import org.apache.wsil.Link;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.CategoryModel;
-import org.eclipse.wst.ws.internal.explorer.platform.util.URLUtils;
-
-/**
-* The data model element that represents 
-* a WSIL document
-*/
-public class FavoritesUDDIRegistryFolderElement extends FavoritesFolderElement
-{
-  public FavoritesUDDIRegistryFolderElement(String name, Model model, NodeManager nodeManager) {
-    super(name, model, nodeManager);
-  }
-
-  public void init(FavoritesMainElement favMainElement) {
-    Link[] links = favMainElement.loadUDDIRegistries();
-    for (int i = 0; i < links.length; i++) {
-      Link link = links[i];
-      FavoritesUDDIRegistryElement favUDDIRegsitryElement = new FavoritesUDDIRegistryElement((link.getAbstracts())[0].getText(), getModel(), link);
-      connect(favUDDIRegsitryElement, FavoritesModelConstants.REL_UDDI_REGISTRY_NODE, ModelConstants.REL_OWNER);
-    }
-  }
-  
-  public boolean addFavorite(Hashtable table) {
-    String registryName = (String)table.get(FavoritesModelConstants.PROP_UDDI_REGISTRY_NAME);
-    String inquiryAPI = (String)table.get(FavoritesModelConstants.PROP_UDDI_REGISTRY_INQUIRY_API);
-    String publishAPI = (String)table.get(FavoritesModelConstants.PROP_UDDI_REGISTRY_PUBLISH_API);
-    String registrationURL = (String)table.get(FavoritesModelConstants.PROP_UDDI_REGISTRY_REGISTRATION_URL);
-    Enumeration userDefinedCategories = (Enumeration)table.get(FavoritesModelConstants.PROP_UDDI_REGISTRY_CATEGORIES_ENUM);
-    // Save the category data first and undo if necessary.
-    if (userDefinedCategories != null)
-    {
-      String pluginMetadataDirectory = (String)table.get(FavoritesModelConstants.PROP_PLUGIN_METADATA_DIRECTORY);
-      StringBuffer directoryBuffer = new StringBuffer();
-      formCategoriesDirectory(directoryBuffer,pluginMetadataDirectory,registryName);
-      File categoriesDirectoryFile = new File(directoryBuffer.toString());
-      categoriesDirectoryFile.mkdirs();
-      StringBuffer categoryFileName = new StringBuffer();
-      while (userDefinedCategories.hasMoreElements())
-      {
-        CategoryModel categoryModel = (CategoryModel)userDefinedCategories.nextElement();        
-        categoryFileName.setLength(0);
-        String encodedCategoryKey = URLUtils.encode(categoryModel.getCategoryKey());
-        categoryFileName.append(categoriesDirectoryFile.getAbsolutePath()).append(File.separatorChar).append(encodedCategoryKey).append(".txt");
-        byte rc = categoryModel.saveData(categoryFileName.toString());
-        if (rc != CategoryModel.OPERATION_SUCCESSFUL)
-        {
-          // Delete the category file if it exists.
-          File categoryFile = new File(categoryFileName.toString());
-          if (categoryFile.exists())
-            categoryFile.delete();
-        }
-      }
-      cleanupCategoryDirectories(categoriesDirectoryFile);
-    }
-    if (registryName == null || inquiryAPI == null || publishAPI == null)
-      return false;
-    FavoritesUDDIRegistryElement e = getFavorite(registryName);
-    if (e != null)
-      removeFavorite(e);
-    FavoritesMainElement favMainElement = getFavoritesMainElement();
-    Link link = favMainElement.addUDDIRegistry(registryName, inquiryAPI, publishAPI, registrationURL);
-    boolean saved = favMainElement.saveFavorites();
-    if (saved) {
-      FavoritesUDDIRegistryElement favUDDIRegsitryElement = new FavoritesUDDIRegistryElement(registryName, getModel(), link);
-      connect(favUDDIRegsitryElement, FavoritesModelConstants.REL_UDDI_REGISTRY_NODE, ModelConstants.REL_OWNER);
-    }
-    return saved;
-  }
-  
-  public static final void formCategoriesDirectory(StringBuffer categoriesDirectory,String pluginMetadataDirectory,String registryName)
-  {
-    // <metadata>/uddi/<registryId>/categories
-	String encodedRegistryName = URLUtils.encode(registryName);
-    categoriesDirectory.append(pluginMetadataDirectory).append("uddi").append(File.separatorChar).append(encodedRegistryName).append(File.separatorChar).append("categories");    
-  }
-  
-  private final void clearRegistryMetadata(String pluginMetadataDirectory,String registryName)
-  {
-    StringBuffer categoriesDirectory = new StringBuffer();
-    formCategoriesDirectory(categoriesDirectory,pluginMetadataDirectory,registryName);
-    File categoriesDirectoryFile = new File(categoriesDirectory.toString());
-    File[] categoryFiles = categoriesDirectoryFile.listFiles();
-    if (categoryFiles != null)
-    {
-      for (int i=0;i<categoryFiles.length;i++)
-        categoryFiles[i].delete();
-    }
-    cleanupCategoryDirectories(categoriesDirectoryFile);
-  }
-  
-  private final void cleanupCategoryDirectories(File categoriesDirectoryFile)
-  {
-    // Delete the categories subdirectory if it is empty.
-    String[] fileList;
-    fileList = categoriesDirectoryFile.list();
-    if (fileList == null || fileList.length == 0)
-      categoriesDirectoryFile.delete();
-    // Delete the <registryId> subdirectory if it is empty.
-    File registryIdDirectoryFile = categoriesDirectoryFile.getParentFile();
-    fileList = registryIdDirectoryFile.list();
-    if (fileList == null || fileList.length == 0)
-      registryIdDirectoryFile.delete();
-    // Delete the uddi subdirectory if it is empty.
-    File uddiDirectoryFile = registryIdDirectoryFile.getParentFile();
-    fileList = uddiDirectoryFile.list();
-    if (fileList == null || fileList.length == 0)
-      uddiDirectoryFile.delete();
-  }
-
-  public boolean favoriteExists(Hashtable table) {
-    String registryName = (String)table.get(FavoritesModelConstants.PROP_UDDI_REGISTRY_NAME);
-    if (registryName == null)
-      return false;
-    return (getFavorite(registryName) != null);
-  }
-
-  public boolean removeFavoriteByNodeID(int nodeID,String pluginMetadataDirectory) {
-    Node selectedNode = nodeManager_.getNode(nodeID);
-    TreeElement selectedElement = selectedNode.getTreeElement();
-    FavoritesMainElement favMainElement = getFavoritesMainElement();
-    if (selectedElement instanceof FavoritesUDDIRegistryElement)
-    {
-      clearRegistryMetadata(pluginMetadataDirectory,selectedElement.getName());
-      boolean rc = removeFavorite((FavoritesUDDIRegistryElement)selectedElement);
-      rc = rc && favMainElement.saveFavorites();
-      return rc;
-    }
-    else
-      return false;
-  }
-
-  private boolean removeFavorite(FavoritesUDDIRegistryElement element) {
-    Link link = ((FavoritesUDDIRegistryElement)element).getLink();
-    FavoritesMainElement favMainElement = getFavoritesMainElement();
-    if (favMainElement.removeLink(link)) {
-      element.disconnectAll();
-      return true;
-    }
-    else
-      return false;
-  }
-
-  public boolean removeAllFavorites(String pluginMetadataDirectory) {
-    FavoritesMainElement favMainElement = getFavoritesMainElement();
-    Enumeration e = getAllFavorites();
-    while(e.hasMoreElements()) {
-      FavoritesUDDIRegistryElement favUDDIRegistryElement = (FavoritesUDDIRegistryElement)e.nextElement();
-      clearRegistryMetadata(pluginMetadataDirectory,favUDDIRegistryElement.getName());
-      Link link = favUDDIRegistryElement.getLink();
-      favMainElement.removeLink(link);
-    }
-    disconnectRel(FavoritesModelConstants.REL_UDDI_REGISTRY_NODE);
-    return favMainElement.saveFavorites();
-  }
-
-  public Enumeration getAllFavorites() {
-    return getElements(FavoritesModelConstants.REL_UDDI_REGISTRY_NODE);
-  }
-
-  private FavoritesUDDIRegistryElement getFavorite(String registryName) {
-    Enumeration e = getAllFavorites();
-    while (e.hasMoreElements()) {
-      FavoritesUDDIRegistryElement regElement = (FavoritesUDDIRegistryElement)e.nextElement();
-      if (registryName.equals(regElement.getName()))
-        return regElement;
-    }
-    return null;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceElement.java
deleted file mode 100644
index 2a86ed19b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceElement.java
+++ /dev/null
@@ -1,47 +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.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import org.apache.wsil.Service;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.parser.favorites.FavoritesUDDIService;
-
-public class FavoritesUDDIServiceElement extends FavoritesElement {
-
-  private FavoritesUDDIService uddiService_;
-
-  public FavoritesUDDIServiceElement(String name, Model model, Service service) {
-    super(name, model);
-    uddiService_ = new FavoritesUDDIService();
-    uddiService_.setService(service);
-  }
-
-  public Service getService() {
-    return uddiService_.getService();
-  }
-
-  public String getName() {
-    return uddiService_.getName();
-  }
-
-  public String getInquiryURL() {
-    return uddiService_.getInquiryURL();
-  }
-
-  public String getServiceKey() {
-    return uddiService_.getServiceKey();
-  }
-
-  public String toString() {
-    return getName();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceFolderElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceFolderElement.java
deleted file mode 100644
index 0b8597651..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceFolderElement.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.favorites.datamodel;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import org.apache.wsil.Service;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-/**
-* The data model element that represents 
-* a WSIL document
-*/
-public class FavoritesUDDIServiceFolderElement extends FavoritesFolderElement
-{
-
-  public FavoritesUDDIServiceFolderElement(String name, Model model, NodeManager nodeManager) {
-    super(name, model, nodeManager);
-  }
-
-  public void init(FavoritesMainElement favMainElement) {
-    Service[] services = favMainElement.loadUDDIServices();
-    for (int i = 0; i < services.length; i++) {
-      Service service = services[i];
-      FavoritesUDDIServiceElement favUDDIServiceElement = new FavoritesUDDIServiceElement((service.getServiceNames())[0].getText(), getModel(), service);
-      connect(favUDDIServiceElement, FavoritesModelConstants.REL_UDDI_SERVICE_NODE, ModelConstants.REL_OWNER);
-    }
-  }
-
-  public boolean addFavorite(Hashtable table) {
-    String serviceName = (String)table.get(FavoritesModelConstants.PROP_UDDI_SERVICE_NAME);
-    String inquiryAPI = (String)table.get(FavoritesModelConstants.PROP_UDDI_SERVICE_INQUIRY_API);
-    String serviceKey = (String)table.get(FavoritesModelConstants.PROP_UDDI_SERVICE_KEY);
-    if (serviceName == null || inquiryAPI == null || serviceKey == null)
-      return false;
-    FavoritesUDDIServiceElement e = getFavorite(inquiryAPI, serviceKey);
-    if (e != null)
-      removeFavorite(e);
-    FavoritesMainElement favMainElement = getFavoritesMainElement();
-    Service service = favMainElement.addUDDIService(serviceName, inquiryAPI, serviceKey);
-    boolean saved = favMainElement.saveFavorites();
-    if (saved) {
-      FavoritesUDDIServiceElement favUDDIServiceElement = new FavoritesUDDIServiceElement(serviceName, getModel(), service);
-      connect(favUDDIServiceElement, FavoritesModelConstants.REL_UDDI_SERVICE_NODE, ModelConstants.REL_OWNER);
-    }
-    return saved;
-  }
-
-  public boolean favoriteExists(Hashtable table) {
-    String inquiryAPI = (String)table.get(FavoritesModelConstants.PROP_UDDI_SERVICE_INQUIRY_API);
-    String serviceKey = (String)table.get(FavoritesModelConstants.PROP_UDDI_SERVICE_KEY);
-    if (inquiryAPI == null || serviceKey == null)
-      return false;
-    return (getFavorite(inquiryAPI, serviceKey) != null);
-  }
-
-  public boolean removeFavoriteByNodeID(int nodeID,String pluginMetadataDirectory) {
-    Node selectedNode = nodeManager_.getNode(nodeID);
-    TreeElement selectedElement = selectedNode.getTreeElement();
-    FavoritesMainElement favMainElement = getFavoritesMainElement();
-    if (selectedElement instanceof FavoritesUDDIServiceElement)
-      return (removeFavorite((FavoritesUDDIServiceElement)selectedElement) && favMainElement.saveFavorites());
-    else
-      return false;
-  }
-
-  private boolean removeFavorite(FavoritesUDDIServiceElement element) {
-    Service service = ((FavoritesUDDIServiceElement)element).getService();
-    FavoritesMainElement favMainElement = getFavoritesMainElement();
-    if (favMainElement.removeService(service)) {
-      element.disconnectAll();
-      return true;
-    }
-    else
-      return false;
-  }
-
-  public boolean removeAllFavorites(String pluginMetadataDirectory) {
-    FavoritesMainElement favMainElement = getFavoritesMainElement();
-    Enumeration e = getAllFavorites();
-    while(e.hasMoreElements()) {
-      FavoritesUDDIServiceElement favUDDIServiceElement = (FavoritesUDDIServiceElement)e.nextElement();
-      Service service = favUDDIServiceElement.getService();
-      favMainElement.removeService(service);
-    }
-    disconnectRel(FavoritesModelConstants.REL_UDDI_SERVICE_NODE);
-    return favMainElement.saveFavorites();
-  }
-
-  public Enumeration getAllFavorites() {
-    return getElements(FavoritesModelConstants.REL_UDDI_SERVICE_NODE);
-  }
-
-  private FavoritesUDDIServiceElement getFavorite(String inquiryAPI, String serviceKey) {
-    Enumeration e = getAllFavorites();
-    while (e.hasMoreElements()) {
-      FavoritesUDDIServiceElement serElement = (FavoritesUDDIServiceElement)e.nextElement();
-      if (inquiryAPI.equals(serElement.getInquiryURL()) &&
-          serviceKey.equals(serElement.getServiceKey()))
-        return serElement;
-    }
-    return null;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceInterfaceElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceInterfaceElement.java
deleted file mode 100644
index 81e8beb8d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceInterfaceElement.java
+++ /dev/null
@@ -1,47 +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.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import org.apache.wsil.Service;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.parser.favorites.FavoritesUDDIServiceInterface;
-
-public class FavoritesUDDIServiceInterfaceElement extends FavoritesElement {
-
-  private FavoritesUDDIServiceInterface uddiSerInt_;
-
-  public FavoritesUDDIServiceInterfaceElement(String name, Model model, Service service) {
-    super(name, model);
-    uddiSerInt_ = new FavoritesUDDIServiceInterface();
-    uddiSerInt_.setService(service);
-  }
-
-  public Service getService() {
-    return uddiSerInt_.getService();
-  }
-
-  public String getName() {
-    return uddiSerInt_.getName();
-  }
-
-  public String getInquiryURL() {
-    return uddiSerInt_.getInquiryURL();
-  }
-
-  public String getServiceInterfaceKey() {
-    return uddiSerInt_.getServiceInterfaceKey();
-  }
-
-  public String toString() {
-    return getName();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceInterfaceFolderElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceInterfaceFolderElement.java
deleted file mode 100644
index dee62cb36..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceInterfaceFolderElement.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.favorites.datamodel;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import org.apache.wsil.Service;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-/**
-* The data model element that represents 
-* a WSIL document
-*/
-public class FavoritesUDDIServiceInterfaceFolderElement extends FavoritesFolderElement
-{
-
-  public FavoritesUDDIServiceInterfaceFolderElement(String name, Model model, NodeManager nodeManager) {
-    super(name, model, nodeManager);
-  }
-
-  public void init(FavoritesMainElement favMainElement) {
-    Service[] services = favMainElement.loadUDDIServiceInterfaces();
-    for (int i = 0; i < services.length; i++) {
-      Service service = services[i];
-      FavoritesUDDIServiceInterfaceElement favUDDISerIntElement = new FavoritesUDDIServiceInterfaceElement((service.getServiceNames())[0].getText(), getModel(), service);
-      connect(favUDDISerIntElement, FavoritesModelConstants.REL_UDDI_SERVICE_INTERFACE_NODE, ModelConstants.REL_OWNER);
-    }
-  }
-
-  public boolean addFavorite(Hashtable table) {
-    String serIntName = (String)table.get(FavoritesModelConstants.PROP_UDDI_SERVICE_INTERFACE_NAME);
-    String inquiryAPI = (String)table.get(FavoritesModelConstants.PROP_UDDI_SERVICE_INTERFACE_INQUIRY_API);
-    String serIntKey = (String)table.get(FavoritesModelConstants.PROP_UDDI_SERVICE_INTERFACE_KEY);
-    if (serIntName == null || inquiryAPI == null || serIntKey == null)
-      return false;
-    FavoritesUDDIServiceInterfaceElement e = getFavorite(inquiryAPI, serIntKey);
-    if (e != null)
-      removeFavorite(e);
-    FavoritesMainElement favMainElement = getFavoritesMainElement();
-    Service service = favMainElement.addUDDIServiceInterface(serIntName, inquiryAPI, serIntKey);
-    boolean saved = favMainElement.saveFavorites();
-    if (saved) {
-      FavoritesUDDIServiceInterfaceElement favUDDISerIntElement = new FavoritesUDDIServiceInterfaceElement(serIntName, getModel(), service);
-      connect(favUDDISerIntElement, FavoritesModelConstants.REL_UDDI_SERVICE_INTERFACE_NODE, ModelConstants.REL_OWNER);
-    }
-    return saved;
-  }
-
-  public boolean favoriteExists(Hashtable table) {
-    String inquiryAPI = (String)table.get(FavoritesModelConstants.PROP_UDDI_SERVICE_INTERFACE_INQUIRY_API);
-    String serIntKey = (String)table.get(FavoritesModelConstants.PROP_UDDI_SERVICE_INTERFACE_KEY);
-    if (inquiryAPI == null || serIntKey == null)
-      return false;
-    return (getFavorite(inquiryAPI, serIntKey) != null);
-  }
-
-  public boolean removeFavoriteByNodeID(int nodeID,String pluginMetadataDirectory) {
-    Node selectedNode = nodeManager_.getNode(nodeID);
-    TreeElement selectedElement = selectedNode.getTreeElement();
-    FavoritesMainElement favMainElement = getFavoritesMainElement();
-    if (selectedElement instanceof FavoritesUDDIServiceInterfaceElement)
-      return (removeFavorite((FavoritesUDDIServiceInterfaceElement)selectedElement) && favMainElement.saveFavorites());
-    else
-      return false;
-  }
-
-  private boolean removeFavorite(FavoritesUDDIServiceInterfaceElement element) {
-    Service service = ((FavoritesUDDIServiceInterfaceElement)element).getService();
-    FavoritesMainElement favMainElement = getFavoritesMainElement();
-    if (favMainElement.removeService(service)) {
-      element.disconnectAll();
-      return true;
-    }
-    else
-      return false;
-  }
-
-  public boolean removeAllFavorites(String pluginMetadataDirectory) {
-    FavoritesMainElement favMainElement = getFavoritesMainElement();
-    Enumeration e = getAllFavorites();
-    while(e.hasMoreElements()) {
-      FavoritesUDDIServiceInterfaceElement favUDDISerIntElement = (FavoritesUDDIServiceInterfaceElement)e.nextElement();
-      Service service = favUDDISerIntElement.getService();
-      favMainElement.removeService(service);
-    }
-    disconnectRel(FavoritesModelConstants.REL_UDDI_SERVICE_INTERFACE_NODE);
-    return favMainElement.saveFavorites();
-  }
-
-  public Enumeration getAllFavorites() {
-    return getElements(FavoritesModelConstants.REL_UDDI_SERVICE_INTERFACE_NODE);
-  }
-
-  private FavoritesUDDIServiceInterfaceElement getFavorite(String inquiryAPI, String serIntKey) {
-    Enumeration e = getAllFavorites();
-    while (e.hasMoreElements()) {
-      FavoritesUDDIServiceInterfaceElement serIntElement = (FavoritesUDDIServiceInterfaceElement)e.nextElement();
-      if (inquiryAPI.equals(serIntElement.getInquiryURL()) &&
-           serIntKey.equals(serIntElement.getServiceInterfaceKey()))
-        return serIntElement;
-    }
-    return null;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUserDefUDDIRegistryElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUserDefUDDIRegistryElement.java
deleted file mode 100644
index 19df57778..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUserDefUDDIRegistryElement.java
+++ /dev/null
@@ -1,141 +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.explorer.platform.favorites.datamodel;
-
-import java.util.List;
-
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy;
-
-public class FavoritesUserDefUDDIRegistryElement extends FavoritesElement
-{
-  private List names;
-  private List descs;
-  private String version;
-  private String defaultLogin;
-  private String defaultPassword;
-  private String inquiryURL;
-  private String publishURL;
-  private String secureInquiryURL;
-  private String securePublishURL;
-  private Taxonomy[] taxonomies;
-
-  public String getDefaultLogin()
-  {
-    return defaultLogin;
-  }
-
-  public void setDefaultLogin(String defaultLogin)
-  {
-    this.defaultLogin = defaultLogin;
-  }
-
-  public String getDefaultPassword()
-  {
-    return defaultPassword;
-  }
-
-  public void setDefaultPassword(String defaultPassword)
-  {
-    this.defaultPassword = defaultPassword;
-  }
-
-  public Taxonomy[] getTaxonomies()
-  {
-    return taxonomies;
-  }
-
-  public void setTaxonomies(Taxonomy[] taxonomies)
-  {
-    this.taxonomies = taxonomies;
-  }
-
-  public FavoritesUserDefUDDIRegistryElement(String name, Model model)
-  {
-    super(name, model);
-  }
-
-  public List getDescs()
-  {
-    return descs;
-  }
-
-  public void setDescs(List descs)
-  {
-    this.descs = descs;
-  }
-
-  public String getInquiryURL()
-  {
-    return inquiryURL;
-  }
-
-  public void setInquiryURL(String inquiryURL)
-  {
-    this.inquiryURL = inquiryURL;
-  }
-
-  public List getNames()
-  {
-    return names;
-  }
-
-  public void setNames(List names)
-  {
-    this.names = names;
-  }
-
-  public String getPublishURL()
-  {
-    return publishURL;
-  }
-
-  public void setPublishURL(String publishURL)
-  {
-    this.publishURL = publishURL;
-  }
-
-  public String getSecureInquiryURL()
-  {
-    return secureInquiryURL;
-  }
-
-  public void setSecureInquiryURL(String secureInquiryURL)
-  {
-    this.secureInquiryURL = secureInquiryURL;
-  }
-
-  public String getSecurePublishURL()
-  {
-    return securePublishURL;
-  }
-
-  public void setSecurePublishURL(String securePublishURL)
-  {
-    this.securePublishURL = securePublishURL;
-  }
-
-  public String getVersion()
-  {
-    return version;
-  }
-
-  public void setVersion(String version)
-  {
-    this.version = version;
-  }
-
-  public String toString()
-  {
-    return getName();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUserDefUDDIRegistryFolderElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUserDefUDDIRegistryFolderElement.java
deleted file mode 100644
index d99a3cd21..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUserDefUDDIRegistryFolderElement.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.favorites.datamodel;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.model.v10.registry.Name;
-import org.eclipse.wst.ws.internal.model.v10.registry.Registry;
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy;
-import org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistry;
-import org.eclipse.wst.ws.internal.registry.IRegistryManager;
-import org.eclipse.wst.ws.internal.registry.RegistryService;
-import org.eclipse.wst.ws.internal.registry.UDDIRegistryService;
-
-/**
- * The data model element that represents a WSIL document
- */
-public class FavoritesUserDefUDDIRegistryFolderElement extends FavoritesFolderElement
-{
-  public FavoritesUserDefUDDIRegistryFolderElement(String name, Model model, NodeManager nodeManager)
-  {
-    super(name, model, nodeManager);
-  }
-
-  public void init(FavoritesMainElement favMainElement)
-  {
-    RegistryService regService = RegistryService.instance();
-    IRegistryManager regManager = regService.getDefaultRegistryManager();
-    try
-    {
-      String[] regURIs = regManager.getRegistryURIs();
-      for (int i = 0; i < regURIs.length; i++)
-      {
-        Registry reg = regManager.loadRegistry(regURIs[i]);
-        if (reg instanceof UDDIRegistry)
-        {
-          UDDIRegistry uddiReg = (UDDIRegistry)reg;
-          List names = uddiReg.getName();
-          String displayName = names != null && !names.isEmpty() ? ((Name)names.get(0)).getValue() : "";
-          FavoritesUserDefUDDIRegistryElement favUserDefUDDIRegElement = new FavoritesUserDefUDDIRegistryElement(displayName, getModel());
-          favUserDefUDDIRegElement.setNames(names);
-          favUserDefUDDIRegElement.setDescs(uddiReg.getDescription());
-          favUserDefUDDIRegElement.setVersion(uddiReg.getVersion());
-          favUserDefUDDIRegElement.setDefaultLogin(uddiReg.getDefaultLogin());
-          favUserDefUDDIRegElement.setDefaultPassword(uddiReg.getDefaultPassword());
-          favUserDefUDDIRegElement.setInquiryURL(uddiReg.getDiscoveryURL());
-          favUserDefUDDIRegElement.setPublishURL(uddiReg.getPublicationURL());
-          favUserDefUDDIRegElement.setSecureInquiryURL(uddiReg.getSecuredDiscoveryURL());
-          favUserDefUDDIRegElement.setSecurePublishURL(uddiReg.getSecuredPublicationURL());
-          Taxonomy[] taxonomies = regManager.loadTaxonomies(UDDIRegistryService.instance().getTaxonomyURIs(uddiReg));
-          favUserDefUDDIRegElement.setTaxonomies(taxonomies);
-          connect(favUserDefUDDIRegElement, FavoritesModelConstants.REL_USER_DEF_UDDI_REGISTRY_NODE, ModelConstants.REL_OWNER);
-        }
-      }
-    }
-    catch (CoreException ce)
-    {
-      // TODO: Better error reporting
-      ce.printStackTrace();
-    }
-  }
-
-  public boolean addFavorite(Hashtable table)
-  {
-    // do nothing
-    return true;
-  }
-
-  public boolean favoriteExists(Hashtable table)
-  {
-    // do nothing
-    return true;
-  }
-
-  public boolean removeFavoriteByNodeID(int nodeID, String pluginMetadataDirectory)
-  {
-    // do nothing
-    return true;
-  }
-
-  public boolean removeAllFavorites(String pluginMetadataDirectory)
-  {
-    // do nothing
-    return true;
-  }
-
-  public Enumeration getAllFavorites()
-  {
-    return getElements(FavoritesModelConstants.REL_USER_DEF_UDDI_REGISTRY_NODE);
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSDLServiceElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSDLServiceElement.java
deleted file mode 100644
index b842ff6f8..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSDLServiceElement.java
+++ /dev/null
@@ -1,39 +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.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import org.apache.wsil.Service;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.parser.favorites.FavoritesWSDL;
-
-public class FavoritesWSDLServiceElement extends FavoritesElement {
-
-  private FavoritesWSDL wsdl_;
-
-  public FavoritesWSDLServiceElement(String name, Model model, Service service) {
-    super(name, model);
-    wsdl_ = new FavoritesWSDL();
-    wsdl_.setService(service);
-  }
-
-  public Service getService() {
-    return wsdl_.getService();
-  }
-
-  public String getWsdlUrl() {
-    return wsdl_.getWsdlUrl();
-  }
-
-  public String toString() {
-    return getWsdlUrl();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSDLServiceFolderElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSDLServiceFolderElement.java
deleted file mode 100644
index 0e95e3e67..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSDLServiceFolderElement.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.ws.internal.explorer.platform.favorites.datamodel;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import org.apache.wsil.Service;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesWSDLServiceFolderElement extends FavoritesFolderElement
-{
-
-  public FavoritesWSDLServiceFolderElement(String name, Model model, NodeManager nodeManager) {
-    super(name, model, nodeManager);
-  }
-
-  public void init(FavoritesMainElement favMainElement) {
-    Service[] services = favMainElement.loadWSDLServices();
-    for (int i = 0; i < services.length; i++) {
-      Service service = services[i];
-      FavoritesWSDLServiceElement favWSDLServiceElement = new FavoritesWSDLServiceElement((service.getDescriptions())[0].getLocation(), getModel(), service);
-      connect(favWSDLServiceElement, FavoritesModelConstants.REL_WSDL_SERVICE_NODE, ModelConstants.REL_OWNER);
-    }
-  }
-
-  public boolean addFavorite(Hashtable table) {
-    String wsdlURL = (String)table.get(FavoritesModelConstants.PROP_WSDL_URL);
-    if (wsdlURL == null)
-      return false;
-    FavoritesWSDLServiceElement e = getFavorite(wsdlURL);
-    if (e != null)
-      removeFavorite(e);
-    FavoritesMainElement favMainElement = getFavoritesMainElement();
-    Service service = favMainElement.addWSDLService(wsdlURL);
-    boolean saved = favMainElement.saveFavorites();
-    if (saved) {
-      FavoritesWSDLServiceElement favWSDLServiceElement = new FavoritesWSDLServiceElement(wsdlURL, getModel(), service);
-      connect(favWSDLServiceElement, FavoritesModelConstants.REL_WSDL_SERVICE_NODE, ModelConstants.REL_OWNER);
-    }
-    return saved;
-  }
-
-  public boolean favoriteExists(Hashtable table) {
-    String wsdlURL = (String)table.get(FavoritesModelConstants.PROP_WSDL_URL);
-    if (wsdlURL == null)
-      return false;
-    return (getFavorite(wsdlURL) != null);
-  }
-
-  public boolean removeFavoriteByNodeID(int nodeID,String pluginMetadataDirectory) {
-    Node selectedNode = nodeManager_.getNode(nodeID);
-    TreeElement selectedElement = selectedNode.getTreeElement();
-    FavoritesMainElement favMainElement = getFavoritesMainElement();
-    if (selectedElement instanceof FavoritesWSDLServiceElement)
-      return (removeFavorite((FavoritesWSDLServiceElement)selectedElement) && favMainElement.saveFavorites());
-    else
-      return false;
-    }
-
-  private boolean removeFavorite(FavoritesWSDLServiceElement element) {
-    Service service = ((FavoritesWSDLServiceElement)element).getService();
-    FavoritesMainElement favMainElement = getFavoritesMainElement();
-    if (favMainElement.removeService(service)) {
-      element.disconnectAll();
-      return true;
-    }
-    else
-      return false;
-  }
-
-  public boolean removeAllFavorites(String pluginMetadataDirectory) {
-    FavoritesMainElement favMainElement = getFavoritesMainElement();
-    Enumeration e = getAllFavorites();
-    while(e.hasMoreElements()) {
-      FavoritesWSDLServiceElement favWSDLServiceElement = (FavoritesWSDLServiceElement)e.nextElement();
-      Service service = favWSDLServiceElement.getService();
-      favMainElement.removeService(service);
-    }
-    disconnectRel(FavoritesModelConstants.REL_WSDL_SERVICE_NODE);
-    return favMainElement.saveFavorites();
-  }
-
-  public Enumeration getAllFavorites() {
-    return getElements(FavoritesModelConstants.REL_WSDL_SERVICE_NODE);
-  }
-
-  private FavoritesWSDLServiceElement getFavorite(String wsdlUrl) {
-    Enumeration e = getAllFavorites();
-    while (e.hasMoreElements()) {
-      FavoritesWSDLServiceElement wsdlElement = (FavoritesWSDLServiceElement)e.nextElement();
-      if (wsdlUrl.equals(wsdlElement.getWsdlUrl()))
-        return wsdlElement;
-    }
-    return null;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSILElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSILElement.java
deleted file mode 100644
index fb5d38dff..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSILElement.java
+++ /dev/null
@@ -1,39 +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.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import org.apache.wsil.Link;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.parser.favorites.FavoritesWSIL;
-
-public class FavoritesWSILElement extends FavoritesElement {
-
-  private FavoritesWSIL wsil_;
-
-  public FavoritesWSILElement(String name, Model model, Link link) {
-    super(name, model);
-    wsil_ = new FavoritesWSIL();
-    wsil_.setLink(link);
-  }
-
-  public Link getLink() {
-    return wsil_.getLink();
-  }
-
-  public String getWsilUrl() {
-    return wsil_.getWsilUrl();
-  }
-
-  public String toString() {
-    return getWsilUrl();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSILFolderElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSILFolderElement.java
deleted file mode 100644
index f6fb2c12f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSILFolderElement.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import org.apache.wsil.Link;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesWSILFolderElement extends FavoritesFolderElement {
-
-  public FavoritesWSILFolderElement(String name, Model model, NodeManager nodeManager) {
-    super(name, model, nodeManager);
-  }
-
-  public void init(FavoritesMainElement favMainElement) {
-    Link[] links = favMainElement.loadWSILs();
-    for (int i = 0; i < links.length; i++) {
-      Link link = links[i];
-      FavoritesWSILElement favWSILElement = new FavoritesWSILElement(link.getLocation(), getModel(), link);
-      connect(favWSILElement, FavoritesModelConstants.REL_WSIL_NODE, ModelConstants.REL_OWNER);
-    }
-  }
-
-  public boolean addFavorite(Hashtable table) {
-    String wsilURL = (String)table.get(FavoritesModelConstants.PROP_WSIL_URL);
-    if (wsilURL == null)
-      return false;
-    FavoritesWSILElement e = getFavorite(wsilURL);
-    if (e != null)
-      removeFavorite(e);
-    FavoritesMainElement favMainElement = getFavoritesMainElement();
-    Link link = favMainElement.addWSILLink(wsilURL);
-    boolean saved = favMainElement.saveFavorites();
-    if (saved) {
-      FavoritesWSILElement favWSILElement = new FavoritesWSILElement(wsilURL, getModel(), link);
-      connect(favWSILElement, FavoritesModelConstants.REL_WSIL_NODE, ModelConstants.REL_OWNER);
-    }
-    return saved;
-  }
-
-  public boolean favoriteExists(Hashtable table) {
-    String wsilURL = (String)table.get(FavoritesModelConstants.PROP_WSIL_URL);
-    if (wsilURL == null)
-      return false;
-    return (getFavorite(wsilURL) != null);
-  }
-
-  public boolean removeFavoriteByNodeID(int nodeID,String pluginMetadataDirectory) {
-    Node selectedNode = nodeManager_.getNode(nodeID);
-    TreeElement selectedElement = selectedNode.getTreeElement();
-    FavoritesMainElement favMainElement = getFavoritesMainElement();
-    if (selectedElement instanceof FavoritesWSILElement)
-      return (removeFavorite((FavoritesWSILElement)selectedElement) && favMainElement.saveFavorites());
-    else
-      return false;
-  }
-
-  private boolean removeFavorite(FavoritesWSILElement element) {
-    Link link = element.getLink();
-    FavoritesMainElement favMainElement = getFavoritesMainElement();
-    if (favMainElement.removeLink(link)) {
-      element.disconnectAll();
-      return true;
-    }
-    else
-      return false;
-  }
-
-  public boolean removeAllFavorites(String pluginMetadataDirectory) {
-    FavoritesMainElement favMainElement = getFavoritesMainElement();
-    Enumeration e = getAllFavorites();
-    while(e.hasMoreElements()) {
-      FavoritesWSILElement favWSILElement = (FavoritesWSILElement)e.nextElement();
-      Link link = favWSILElement.getLink();
-      favMainElement.removeLink(link);
-    }
-    disconnectRel(FavoritesModelConstants.REL_WSIL_NODE);
-    return favMainElement.saveFavorites();
-  }
-
-  public Enumeration getAllFavorites() {
-    return getElements(FavoritesModelConstants.REL_WSIL_NODE);
-  }
-
-  private FavoritesWSILElement getFavorite(String wsilUrl) {
-    Enumeration e = getAllFavorites();
-    while (e.hasMoreElements()) {
-      FavoritesWSILElement wsilElement = (FavoritesWSILElement)e.nextElement();
-      if (wsilUrl.equals(wsilElement.getWsilUrl()))
-        return wsilElement;
-    }
-    return null;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/AddToUDDIPerspectiveTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/AddToUDDIPerspectiveTool.java
deleted file mode 100644
index a12366d7f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/AddToUDDIPerspectiveTool.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.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.AddToUDDIPerspectiveAction;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class AddToUDDIPerspectiveTool extends ActionTool {
-
-    public AddToUDDIPerspectiveTool(ToolManager toolManager, String alt) {
-        super(toolManager, "favorites/images/add_to_uddi_perspective_enabled.gif", "favorites/images/add_to_uddi_perspective_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public String getActionLink() {
-        Node selectedNode = toolManager_.getNode();
-        return AddToUDDIPerspectiveAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId());
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/AddWSILToWSILPerspectiveTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/AddWSILToWSILPerspectiveTool.java
deleted file mode 100644
index dbb35d5ff..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/AddWSILToWSILPerspectiveTool.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.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.AddWSILToWSILPerspectiveAction;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class AddWSILToWSILPerspectiveTool extends ActionTool {
-
-    public AddWSILToWSILPerspectiveTool(ToolManager toolManager, String alt) {
-        super(toolManager, "favorites/images/add_to_wsil_perspective_enabled.gif", "favorites/images/add_to_wsil_perspective_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public String getActionLink() {
-        Node selectedNode = toolManager_.getNode();
-        return AddWSILToWSILPerspectiveAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId());
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesAddToWSDLPerspectiveTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesAddToWSDLPerspectiveTool.java
deleted file mode 100644
index bdeba4a7d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesAddToWSDLPerspectiveTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.FavoritesAddToWSDLPerspectiveAction;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.AddToWSDLPerspectiveTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesAddToWSDLPerspectiveTool extends AddToWSDLPerspectiveTool {
-
-  public FavoritesAddToWSDLPerspectiveTool(ToolManager toolManager, String alt) {
-    super(toolManager,alt);
-  }
-
-  public String getSelectToolActionHref(boolean forHistory) {
-    Node selectedNode = toolManager_.getNode();
-    return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-  }
-
-  public String getActionLink() {
-    Node selectedNode = toolManager_.getNode();
-    return FavoritesAddToWSDLPerspectiveAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId());
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesImportToFileSystemTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesImportToFileSystemTool.java
deleted file mode 100644
index 311099907..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesImportToFileSystemTool.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.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToFileSystemAction;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ImportToFileSystemTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesImportToFileSystemTool extends ImportToFileSystemTool {
-
-    public FavoritesImportToFileSystemTool(ToolManager toolManager, String alt) {
-        super(toolManager, alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public String getActionLink() {
-        Node selectedNode = toolManager_.getNode();
-        return ImportToFileSystemAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(),"favorites/actions/FavoritesImportToFileSystemActionJSP.jsp");
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesImportToWorkbenchTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesImportToWorkbenchTool.java
deleted file mode 100644
index 035334da6..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesImportToWorkbenchTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ImportToWorkbenchTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesImportToWorkbenchTool extends ImportToWorkbenchTool {
-
-    public FavoritesImportToWorkbenchTool(ToolManager toolManager, String alt) {
-        super(toolManager, alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public final String getFormLink()
-    {
-      return "favorites/forms/FavoritesImportToWorkbenchForm.jsp";
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesLaunchWebServiceWizardTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesLaunchWebServiceWizardTool.java
deleted file mode 100644
index 915467d88..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesLaunchWebServiceWizardTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.LaunchWebServiceWizardTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesLaunchWebServiceWizardTool extends LaunchWebServiceWizardTool {
-
-    public FavoritesLaunchWebServiceWizardTool(ToolManager toolManager, String alt) {
-        super(toolManager, alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public final String getFormLink()
-    {
-      return "favorites/forms/FavoritesLaunchWebServiceWizardForm.jsp";
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesMainNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesMainNode.java
deleted file mode 100644
index b2bafd907..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesMainNode.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.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesMainElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIBusinessFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIRegistryFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIServiceFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIServiceInterfaceFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUserDefUDDIRegistryFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesWSDLServiceFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesWSILFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesMainNode extends FavoritesNavigatorNode {
-    public FavoritesMainNode(TreeElement treeElement, NodeManager nodeManager) {
-        super(treeElement, nodeManager, 1, "images/root_main.gif");
-
-        // Create UDDI Registry Folder Node
-        FavoritesUDDIRegistryFolderElement favUDDIRegistryFolderElement = new FavoritesUDDIRegistryFolderElement(getMessage("FAVORITES_UDDI_REGISTRIES_FOLDER_NODE"), treeElement.getModel(), nodeManager);
-        treeElement.connect(favUDDIRegistryFolderElement, FavoritesModelConstants.REL_UDDI_REGISTRY_FOLDER_NODE, ModelConstants.REL_OWNER);
-        FavoritesUDDIRegistryFolderNode favUDDIRegistryFolderNode = new FavoritesUDDIRegistryFolderNode(favUDDIRegistryFolderElement, nodeManager, nodeDepth_ + 1);
-        addChild(favUDDIRegistryFolderNode);
-        favUDDIRegistryFolderNode.setVisibilityOfChildren(false);
-        favUDDIRegistryFolderElement.init((FavoritesMainElement)treeElement);
-
-        // Create User defined UDDI Registry Folder Node
-        FavoritesUserDefUDDIRegistryFolderElement favUserDefUDDIFolderElement = new FavoritesUserDefUDDIRegistryFolderElement(getMessage("FAVORITES_USER_DEF_UDDI_REGISTRIES_FOLDER_NODE"), treeElement.getModel(), nodeManager);
-        treeElement.connect(favUserDefUDDIFolderElement, FavoritesModelConstants.REL_USER_DEF_UDDI_REGISTRY_FOLDER_NODE, ModelConstants.REL_OWNER);
-        FavoritesUserDefUDDIRegistryFolderNode favUserDefUDDIFolderNode = new FavoritesUserDefUDDIRegistryFolderNode(favUserDefUDDIFolderElement, nodeManager, nodeDepth_ + 1);
-        addChild(favUserDefUDDIFolderNode);
-        favUserDefUDDIFolderNode.setVisibilityOfChildren(false);
-        favUserDefUDDIFolderElement.init((FavoritesMainElement)treeElement);
-
-        // Create UDDI Business Folder Node
-        FavoritesUDDIBusinessFolderElement favUDDIBusinessFolderElement = new FavoritesUDDIBusinessFolderElement(getMessage("FAVORITES_UDDI_BUSINESSES_FOLDER_NODE"), treeElement.getModel(), nodeManager);
-        treeElement.connect(favUDDIBusinessFolderElement, FavoritesModelConstants.REL_UDDI_BUSINESS_FOLDER_NODE, ModelConstants.REL_OWNER);
-        FavoritesUDDIBusinessFolderNode favUDDIBusinessFolderNode = new FavoritesUDDIBusinessFolderNode(favUDDIBusinessFolderElement, nodeManager, nodeDepth_ + 1);
-        addChild(favUDDIBusinessFolderNode);
-        favUDDIBusinessFolderNode.setVisibilityOfChildren(false);
-        favUDDIBusinessFolderElement.init((FavoritesMainElement)treeElement);
-
-        // Create UDDI Service Folder Node
-        FavoritesUDDIServiceFolderElement favUDDIServiceFolderElement = new FavoritesUDDIServiceFolderElement(getMessage("FAVORITES_UDDI_SERVICE_FOLDER_NODE"), treeElement.getModel(), nodeManager);
-        treeElement.connect(favUDDIServiceFolderElement, FavoritesModelConstants.REL_UDDI_SERVICE_FOLDER_NODE, ModelConstants.REL_OWNER);
-        FavoritesUDDIServiceFolderNode favUDDIServiceFolderNode = new FavoritesUDDIServiceFolderNode(favUDDIServiceFolderElement, nodeManager, nodeDepth_ + 1);
-        addChild(favUDDIServiceFolderNode);
-        favUDDIServiceFolderNode.setVisibilityOfChildren(false);
-        favUDDIServiceFolderElement.init((FavoritesMainElement)treeElement);
-
-        // Create UDDI Service Interface Folder Node
-        FavoritesUDDIServiceInterfaceFolderElement favUDDIServiceInterfaceFolderElement = new FavoritesUDDIServiceInterfaceFolderElement(getMessage("FAVORITES_UDDI_SERVICE_INTERFACES_FOLDER_NODE"), treeElement.getModel(), nodeManager);
-        treeElement.connect(favUDDIServiceInterfaceFolderElement, FavoritesModelConstants.REL_UDDI_SERVICE_INTERFACE_FOLDER_NODE, ModelConstants.REL_OWNER);
-        FavoritesUDDIServiceInterfaceFolderNode favUDDIServiceInterfaceFolderNode = new FavoritesUDDIServiceInterfaceFolderNode(favUDDIServiceInterfaceFolderElement, nodeManager, nodeDepth_ + 1);
-        addChild(favUDDIServiceInterfaceFolderNode);
-        favUDDIServiceInterfaceFolderNode.setVisibilityOfChildren(false);
-        favUDDIServiceInterfaceFolderElement.init((FavoritesMainElement)treeElement);
-
-        // Create WSIL Folder Node
-        FavoritesWSILFolderElement favWSILFolderElement = new FavoritesWSILFolderElement(getMessage("FAVORITES_WSIL_FOLDER_NODE"), treeElement.getModel(), nodeManager);
-        treeElement.connect(favWSILFolderElement, FavoritesModelConstants.REL_WSIL_FOLDER_NODE, ModelConstants.REL_OWNER);
-        FavoritesWSILFolderNode favWSILFolderNode = new FavoritesWSILFolderNode(favWSILFolderElement, nodeManager, nodeDepth_ + 1);
-        addChild(favWSILFolderNode);
-        favWSILFolderNode.setVisibilityOfChildren(false);
-        favWSILFolderElement.init((FavoritesMainElement)treeElement);
-
-        // Create WSDL Service Folder Node
-        FavoritesWSDLServiceFolderElement favWSDLServiceFolderElement = new FavoritesWSDLServiceFolderElement(getMessage("FAVORITES_WSDL_SERVICE_FOLDER_NODE"), treeElement.getModel(), nodeManager);
-        treeElement.connect(favWSDLServiceFolderElement, FavoritesModelConstants.REL_WSDL_SERVICE_FOLDER_NODE, ModelConstants.REL_OWNER);
-        FavoritesWSDLServiceFolderNode favWSDLServiceFolderNode = new FavoritesWSDLServiceFolderNode(favWSDLServiceFolderElement, nodeManager, nodeDepth_ + 1);
-        addChild(favWSDLServiceFolderNode);
-        favWSDLServiceFolderNode.setVisibilityOfChildren(false);
-        favWSDLServiceFolderElement.init((FavoritesMainElement)treeElement);
-
-    }
-
-    protected void initTools() {
-    }
-
-    private String getMessage(String msg) {
-        Controller controller = nodeManager_.getController();
-        FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
-        return favPerspective.getMessage(msg);
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesNavigatorFolderNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesNavigatorFolderNode.java
deleted file mode 100644
index 6af9d73aa..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesNavigatorFolderNode.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.FavoritesToggleNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FolderNode;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public abstract class FavoritesNavigatorFolderNode extends FolderNode {
-
-    public FavoritesNavigatorFolderNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) {
-        super(treeElement, nodeManager, nodeDepth);
-    }
-
-    protected String getToggleNodeActionHref() {
-        return FavoritesToggleNodeAction.getActionLink(nodeId_,isOpen_);
-    }
-
-    protected String getLinkActionHref() {
-        return SelectFavoritesNodeAction.getActionLink(nodeId_, false);
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesNavigatorNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesNavigatorNode.java
deleted file mode 100644
index 1a3368405..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesNavigatorNode.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.FavoritesToggleNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public abstract class FavoritesNavigatorNode extends Node {
-
-    public FavoritesNavigatorNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth, String imagePath) {
-        super(treeElement, nodeManager, nodeDepth, imagePath);
-    }
-
-    protected String getToggleNodeActionHref() {
-        return FavoritesToggleNodeAction.getActionLink(nodeId_,isOpen_);
-    }
-
-    protected String getLinkActionHref() {
-        return SelectFavoritesNodeAction.getActionLink(nodeId_, false);
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesPerspective.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesPerspective.java
deleted file mode 100644
index 53d6cdd63..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesPerspective.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.ws.internal.explorer.platform.favorites.perspective;
-
-import javax.servlet.ServletContext;
-import org.eclipse.wst.ws.internal.datamodel.BasicModel;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SwitchPerspectiveFromFavoritesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesMainElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Perspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils;
-
-public class FavoritesPerspective extends Perspective
-{
-    private BasicModel model_;
-    private NodeManager nodeManager_;
-    private String perspectiveContentFramesetCols_;
-    private String savedPerspectiveContentFramesetCols_;
-    private String actionsContainerFramesetRows_;
-    private String savedActionsContainerFramesetRows_;
-
-    public FavoritesPerspective(Controller controller)
-    {
-        super("favorites",controller);
-    }
-
-    public final void initPerspective(ServletContext application)
-    {
-        model_ = new BasicModel("FavoritesModel");
-        FavoritesMainElement favoritesMainElement = new FavoritesMainElement(getMessage("FAVORITES_MAIN_NODE"), model_, controller_);
-        model_.setRootElement(favoritesMainElement);
-        nodeManager_ = new NodeManager(controller_);
-        FavoritesMainNode favMainNode = new FavoritesMainNode(favoritesMainElement, nodeManager_);
-        nodeManager_.setRootNode(favMainNode);
-        
-        // Starting frameset sizes.
-        if (!DirUtils.isRTL())
-          perspectiveContentFramesetCols_ = "30%,*";
-        else
-          perspectiveContentFramesetCols_ = "*,30%";
-        savedPerspectiveContentFramesetCols_ = perspectiveContentFramesetCols_;
-        actionsContainerFramesetRows_ = "75%,*";
-        savedActionsContainerFramesetRows_ = actionsContainerFramesetRows_;        
-    }
-
-    public NodeManager getNodeManager() {
-        return nodeManager_;
-    }
-
-    public String getPerspectiveContentPage()
-    {
-        return "favorites/fav_perspective_content.jsp";
-    }
-
-    public int getPerspectiveId()
-    {
-        return ActionInputs.PERSPECTIVE_FAVORITES;
-    }
-
-    public String getPanesFile() {
-        return "favorites/scripts/favoritesPanes.jsp";
-    }
-    
-    public String getProcessFramesetsForm()
-    {
-      return "favorites/forms/ProcessFavoritesFramesetsForm.jsp";
-    }
-    
-    public String getFramesetsFile()
-    {
-      return "favorites/scripts/favoritesframesets.jsp";
-    }
-
-    public String getTreeContentVar() {
-        return "favNavigatorContent";
-    }
-
-    public String getTreeContentPage() {
-        return "favorites/fav_navigator_content.jsp";
-    }
-
-    public String getPropertiesContainerVar() {
-        return "favPropertiesContainer";
-    }
-
-    public String getPropertiesContainerPage() {
-        return "favorites/fav_properties_container.jsp";
-    }
-
-    public String getStatusContentVar() {
-        return "favStatusContent";
-    }
-
-    public String getStatusContentPage() {
-        return "favorites/fav_status_content.jsp";
-    }
-
-    public String getPropertiesContentVar() {
-        return "favPropertiesContent";
-    }
-
-    public String getPropertiesContentPage() {
-        return "favorites/fav_properties_content.jsp";
-    }
-
-    public final String getPerspectiveContentFramesetCols()
-    {
-      return perspectiveContentFramesetCols_;
-    }
-    
-    public final void setPerspectiveContentFramesetCols(String cols)
-    {
-      perspectiveContentFramesetCols_ = cols;
-    }
-    
-    public final String getSavedPerspectiveContentFramesetCols()
-    {
-      return savedPerspectiveContentFramesetCols_;
-    }
-    
-    public final void setSavedPerspectiveContentFramesetCols(String cols)
-    {
-      savedPerspectiveContentFramesetCols_ = cols;
-    }
-    
-    public final String getActionsContainerFramesetRows()
-    {
-      return actionsContainerFramesetRows_;
-    }
-    
-    public final void setActionsContainerFramesetRows(String rows)
-    {
-      actionsContainerFramesetRows_ = rows;
-    }
-    
-    public final String getSavedActionsContainerFramesetRows()
-    {
-      return savedActionsContainerFramesetRows_;
-    }
-    
-    public final void setSavedActionsContainerFramesetRows(String rows)
-    {
-      savedActionsContainerFramesetRows_ = rows;
-    }
-    
-    public final String getSwitchPerspectiveFormActionLink(int targetPerspectiveId,boolean forHistory)
-    {
-      return SwitchPerspectiveFromFavoritesAction.getFormActionLink(targetPerspectiveId,forHistory);
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesRestoreDefaultFavoritesTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesRestoreDefaultFavoritesTool.java
deleted file mode 100644
index d5040863b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesRestoreDefaultFavoritesTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.FavoritesRestoreDefaultFavoritesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesRestoreDefaultFavoritesTool extends ActionTool {
-    public FavoritesRestoreDefaultFavoritesTool(ToolManager toolManager, String alt) {
-        super(toolManager, "images/refresh_enabled.gif", "images/refresh_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public String getActionLink() {
-        Node selectedNode = toolManager_.getNode();
-        return FavoritesRestoreDefaultFavoritesAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId());
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesSetDefaultViewTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesSetDefaultViewTool.java
deleted file mode 100644
index c5fd41b59..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesSetDefaultViewTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.SetDefaultViewTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesSetDefaultViewTool extends SetDefaultViewTool {
-    public FavoritesSetDefaultViewTool(ToolManager toolManager, String alt) {
-        super(toolManager, alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), ActionInputs.VIEWID_DEFAULT, ActionInputs.VIEWTOOLID_DEFAULT, forHistory);
-    }
-
-    public String getActionLink() {
-        Node selectedNode = toolManager_.getNode();
-        return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), ActionInputs.VIEWID_DEFAULT, ActionInputs.VIEWTOOLID_DEFAULT, false);
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIBusinessDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIBusinessDetailsTool.java
deleted file mode 100644
index ad9a2f043..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIBusinessDetailsTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesUDDIBusinessDetailsTool extends FormTool {
-
-    public FavoritesUDDIBusinessDetailsTool(ToolManager toolManager, String alt) {
-        super(toolManager, "images/details_enabled.gif", "images/details_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public final String getFormLink()
-    {
-      return "favorites/forms/FavoritesUDDIBusinessDetailsPage.jsp";
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIBusinessFolderNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIBusinessFolderNode.java
deleted file mode 100644
index ff57fe5a8..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIBusinessFolderNode.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesUDDIBusinessFolderNode extends FavoritesNavigatorFolderNode {
-    public FavoritesUDDIBusinessFolderNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) {
-        super(treeElement, nodeManager, nodeDepth);
-        treeElement.addListener(new ElementAdapter() {
-                                                   public void relAdded(RelAddEvent event) {
-                                                       String rel = event.getOutBoundRelName();
-                                                       if (rel.equals(FavoritesModelConstants.REL_UDDI_BUSINESS_NODE)) {
-                                                           FavoritesUDDIBusinessNode favoritesUDDIBusinessNode = new FavoritesUDDIBusinessNode((TreeElement)event.getParentElement(), nodeManager_, nodeDepth_ + 1);
-                                                           addChild(favoritesUDDIBusinessNode);
-                                                       }
-                                                   }
-
-                                                   public void relRemoved(RelRemoveEvent event) {
-                                                       TreeElement childElement = null;
-                                                       if (event.getInBoundRelName().equals(FavoritesModelConstants.REL_UDDI_BUSINESS_NODE)) {
-                                                           childElement = (TreeElement)event.getInboundElement();
-                                                       }
-                                                       if (event.getOutBoundRelName().equals(FavoritesModelConstants.REL_UDDI_BUSINESS_NODE)) {
-                                                           childElement = (TreeElement)event.getOutBoundElement();
-                                                       }
-                                                       removeChildNode(childElement);
-                                                   }
-                                               });
-    }
-
-    protected void initTools() {
-        FavoritesPerspective favPerspective = nodeManager_.getController().getFavoritesPerspective();
-        new ListFavoriteUDDIBusinessTool(toolManager_, favPerspective.getMessage("ALT_LIST_FAVORITE_UDDI_BUSINESS"));
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIBusinessNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIBusinessNode.java
deleted file mode 100644
index 4f5dfcb36..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIBusinessNode.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesUDDIBusinessNode extends FavoritesNavigatorNode {
-    public FavoritesUDDIBusinessNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) {
-        super(treeElement, nodeManager, nodeDepth, "favorites/images/uddi_business_node.gif");
-    }
-
-    protected void initTools() {
-        FavoritesPerspective favPerspective = nodeManager_.getController().getFavoritesPerspective();
-        new FavoritesUDDIBusinessDetailsTool(toolManager_, favPerspective.getMessage("ALT_FAVORITES_UDDI_BUSINESS_DETAILS"));
-        new AddToUDDIPerspectiveTool(toolManager_, favPerspective.getMessage("ALT_ADD_TO_UDDI_PERSPECTIVE"));
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIRegistryDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIRegistryDetailsTool.java
deleted file mode 100644
index b979945fc..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIRegistryDetailsTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesUDDIRegistryDetailsTool extends FormTool {
-
-    public FavoritesUDDIRegistryDetailsTool(ToolManager toolManager, String alt) {
-        super(toolManager, "images/details_enabled.gif", "images/details_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public final String getFormLink()
-    {
-      return "favorites/forms/FavoritesUDDIRegistryDetailsPage.jsp";
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIRegistryFolderNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIRegistryFolderNode.java
deleted file mode 100644
index 26aec8a58..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIRegistryFolderNode.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.explorer.platform.favorites.perspective;
-
-import java.io.File;
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIRegistryFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesUDDIRegistryFolderNode extends FavoritesNavigatorFolderNode {
-    public FavoritesUDDIRegistryFolderNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) {
-        super(treeElement, nodeManager, nodeDepth);
-        treeElement.addListener(new ElementAdapter() {
-                                                   public void relAdded(RelAddEvent event) {
-                                                       String rel = event.getOutBoundRelName();
-                                                       if (rel.equals(FavoritesModelConstants.REL_UDDI_REGISTRY_NODE)) {
-                                                           TreeElement regElement = (TreeElement)event.getParentElement();
-                                                           String imagePath;
-                                                           StringBuffer categoriesDirectory = new StringBuffer();
-                                                           FavoritesUDDIRegistryFolderElement.formCategoriesDirectory(categoriesDirectory,nodeManager_.getController().getServletEngineStateLocation(),regElement.getName());
-                                                           File categoryDirectoryFile = new File(categoriesDirectory.toString());
-                                                           String[] categoryFiles = categoryDirectoryFile.list();
-                                                           if (categoryFiles != null && categoryFiles.length > 0)
-                                                             imagePath = "favorites/images/uddi_registry_cat_node.gif";
-                                                           else
-                                                             imagePath = "favorites/images/uddi_registry_node.gif";
-                                                           FavoritesUDDIRegistryNode favoritesUDDIRegistryNode = new FavoritesUDDIRegistryNode(regElement, nodeManager_, nodeDepth_ + 1, imagePath);
-                                                           addChild(favoritesUDDIRegistryNode);
-                                                       }
-                                                   }
-
-                                                   public void relRemoved(RelRemoveEvent event) {
-                                                       TreeElement childElement = null;
-                                                       if (event.getInBoundRelName().equals(FavoritesModelConstants.REL_UDDI_REGISTRY_NODE)) {
-                                                           childElement = (TreeElement)event.getInboundElement();
-                                                       }
-                                                       if (event.getOutBoundRelName().equals(FavoritesModelConstants.REL_UDDI_REGISTRY_NODE)) {
-                                                           childElement = (TreeElement)event.getOutBoundElement();
-                                                       }
-                                                       removeChildNode(childElement);
-                                                   }
-                                               });
-    }
-
-    protected void initTools() {
-        FavoritesPerspective favPerspective = nodeManager_.getController().getFavoritesPerspective();
-        new ListFavoriteUDDIRegistryTool(toolManager_, favPerspective.getMessage("ALT_LIST_FAVORITE_UDDI_REGISTRY"));
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIRegistryNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIRegistryNode.java
deleted file mode 100644
index ec7fc94ef..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIRegistryNode.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesUDDIRegistryNode extends FavoritesNavigatorNode {
-    public FavoritesUDDIRegistryNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth,String imagePath) {
-        super(treeElement, nodeManager, nodeDepth, imagePath);
-    }
-
-    protected void initTools() {
-        FavoritesPerspective favPerspective = nodeManager_.getController().getFavoritesPerspective();
-        new FavoritesUDDIRegistryDetailsTool(toolManager_, favPerspective.getMessage("ALT_FAVORITES_UDDI_REGISTRY_DETAILS"));
-        new AddToUDDIPerspectiveTool(toolManager_, favPerspective.getMessage("ALT_ADD_TO_UDDI_PERSPECTIVE"));
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceDetailsTool.java
deleted file mode 100644
index 8e8bf4367..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceDetailsTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesUDDIServiceDetailsTool extends FormTool {
-
-    public FavoritesUDDIServiceDetailsTool(ToolManager toolManager, String alt) {
-        super(toolManager, "images/details_enabled.gif", "images/details_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public final String getFormLink()
-    {
-      return "favorites/forms/FavoritesUDDIServiceDetailsPage.jsp";
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceFolderNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceFolderNode.java
deleted file mode 100644
index 4a555ba47..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceFolderNode.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesUDDIServiceFolderNode extends FavoritesNavigatorFolderNode {
-    public FavoritesUDDIServiceFolderNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) {
-        super(treeElement, nodeManager, nodeDepth);
-        treeElement.addListener(new ElementAdapter() {
-                                                   public void relAdded(RelAddEvent event) {
-                                                       String rel = event.getOutBoundRelName();
-                                                       if (rel.equals(FavoritesModelConstants.REL_UDDI_SERVICE_NODE)) {
-                                                           FavoritesUDDIServiceNode favoritesUDDIServiceNode = new FavoritesUDDIServiceNode((TreeElement)event.getParentElement(), nodeManager_, nodeDepth_ + 1);
-                                                           addChild(favoritesUDDIServiceNode);
-                                                       }
-                                                   }
-
-                                                   public void relRemoved(RelRemoveEvent event) {
-                                                       TreeElement childElement = null;
-                                                       if (event.getInBoundRelName().equals(FavoritesModelConstants.REL_UDDI_SERVICE_NODE)) {
-                                                           childElement = (TreeElement)event.getInboundElement();
-                                                       }
-                                                       if (event.getOutBoundRelName().equals(FavoritesModelConstants.REL_UDDI_SERVICE_NODE)) {
-                                                           childElement = (TreeElement)event.getOutBoundElement();
-                                                       }
-                                                       removeChildNode(childElement);
-                                                   }
-                                               });
-    }
-
-    protected void initTools() {
-        FavoritesPerspective favPerspective = nodeManager_.getController().getFavoritesPerspective();
-        new ListFavoriteUDDIServiceTool(toolManager_, favPerspective.getMessage("ALT_LIST_FAVORITE_UDDI_SERVICE"));
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceInterfaceDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceInterfaceDetailsTool.java
deleted file mode 100644
index 8e18df13a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceInterfaceDetailsTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesUDDIServiceInterfaceDetailsTool extends FormTool {
-
-    public FavoritesUDDIServiceInterfaceDetailsTool(ToolManager toolManager, String alt) {
-        super(toolManager, "images/details_enabled.gif", "images/details_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public final String getFormLink()
-    {
-      return "favorites/forms/FavoritesUDDIServiceIntDetailsPage.jsp";
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceInterfaceFolderNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceInterfaceFolderNode.java
deleted file mode 100644
index 9e8b19b7b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceInterfaceFolderNode.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesUDDIServiceInterfaceFolderNode extends FavoritesNavigatorFolderNode {
-    public FavoritesUDDIServiceInterfaceFolderNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) {
-        super(treeElement, nodeManager, nodeDepth);
-        treeElement.addListener(new ElementAdapter() {
-                                                   public void relAdded(RelAddEvent event) {
-                                                       String rel = event.getOutBoundRelName();
-                                                       if (rel.equals(FavoritesModelConstants.REL_UDDI_SERVICE_INTERFACE_NODE)) {
-                                                           FavoritesUDDIServiceInterfaceNode favoritesUDDIServiceInterfaceNode = new FavoritesUDDIServiceInterfaceNode((TreeElement)event.getParentElement(), nodeManager_, nodeDepth_ + 1);
-                                                           addChild(favoritesUDDIServiceInterfaceNode);
-                                                       }
-                                                   }
-
-                                                   public void relRemoved(RelRemoveEvent event) {
-                                                       TreeElement childElement = null;
-                                                       if (event.getInBoundRelName().equals(FavoritesModelConstants.REL_UDDI_SERVICE_INTERFACE_NODE)) {
-                                                           childElement = (TreeElement)event.getInboundElement();
-                                                       }
-                                                       if (event.getOutBoundRelName().equals(FavoritesModelConstants.REL_UDDI_SERVICE_INTERFACE_NODE)) {
-                                                           childElement = (TreeElement)event.getOutBoundElement();
-                                                       }
-                                                       removeChildNode(childElement);
-                                                   }
-                                               });
-    }
-
-    protected void initTools() {
-        FavoritesPerspective favPerspective = nodeManager_.getController().getFavoritesPerspective();
-        new ListFavoriteUDDIServiceInterfaceTool(toolManager_, favPerspective.getMessage("ALT_LIST_FAVORITE_UDDI_SERVICE_INTERFACE"));
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceInterfaceNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceInterfaceNode.java
deleted file mode 100644
index fd4223f76..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceInterfaceNode.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesUDDIServiceInterfaceNode extends FavoritesNavigatorNode {
-    public FavoritesUDDIServiceInterfaceNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) {
-        super(treeElement, nodeManager, nodeDepth, "favorites/images/uddi_service_interface_node.gif");
-    }
-
-    protected void initTools() {
-        FavoritesPerspective favPerspective = nodeManager_.getController().getFavoritesPerspective();
-        new FavoritesUDDIServiceInterfaceDetailsTool(toolManager_, favPerspective.getMessage("ALT_FAVORITES_UDDI_SERVICE_INTERFACE_DETAILS"));
-        new AddToUDDIPerspectiveTool(toolManager_, favPerspective.getMessage("ALT_ADD_TO_UDDI_PERSPECTIVE"));
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceNode.java
deleted file mode 100644
index 7eee38c22..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceNode.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesUDDIServiceNode extends FavoritesNavigatorNode {
-    public FavoritesUDDIServiceNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) {
-        super(treeElement, nodeManager, nodeDepth, "favorites/images/uddi_service_node.gif");
-    }
-
-    protected void initTools() {
-        FavoritesPerspective favPerspective = nodeManager_.getController().getFavoritesPerspective();
-        new FavoritesUDDIServiceDetailsTool(toolManager_, favPerspective.getMessage("ALT_FAVORITES_UDDI_SERVICE_DETAILS"));
-        new AddToUDDIPerspectiveTool(toolManager_, favPerspective.getMessage("ALT_ADD_TO_UDDI_PERSPECTIVE"));
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUserDefUDDIRegistryDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUserDefUDDIRegistryDetailsTool.java
deleted file mode 100644
index d495724b3..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUserDefUDDIRegistryDetailsTool.java
+++ /dev/null
@@ -1,36 +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.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesUserDefUDDIRegistryDetailsTool extends FormTool
-{
-  public FavoritesUserDefUDDIRegistryDetailsTool(ToolManager toolManager, String alt)
-  {
-    super(toolManager, "images/details_enabled.gif", "images/details_highlighted.gif", alt);
-  }
-
-  public String getSelectToolActionHref(boolean forHistory)
-  {
-    Node selectedNode = toolManager_.getNode();
-    return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-  }
-
-  public final String getFormLink()
-  {
-    return "favorites/forms/FavoritesUserDefUDDIRegistryDetailsPage.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUserDefUDDIRegistryFolderNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUserDefUDDIRegistryFolderNode.java
deleted file mode 100644
index e35279229..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUserDefUDDIRegistryFolderNode.java
+++ /dev/null
@@ -1,61 +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.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesUserDefUDDIRegistryFolderNode extends FavoritesNavigatorFolderNode
-{
-  public FavoritesUserDefUDDIRegistryFolderNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth)
-  {
-    super(treeElement, nodeManager, nodeDepth);
-    treeElement.addListener(new ElementAdapter()
-    {
-      public void relAdded(RelAddEvent event)
-      {
-        String rel = event.getOutBoundRelName();
-        if (rel.equals(FavoritesModelConstants.REL_USER_DEF_UDDI_REGISTRY_NODE))
-        {
-          TreeElement regElement = (TreeElement)event.getParentElement();
-          String imagePath = "favorites/images/uddi_registry_node.gif";
-          FavoritesUserDefUDDIRegistryNode favUserDefUDDIRegistryNode = new FavoritesUserDefUDDIRegistryNode(regElement, nodeManager_, nodeDepth_ + 1, imagePath);
-          addChild(favUserDefUDDIRegistryNode);
-        }
-      }
-
-      public void relRemoved(RelRemoveEvent event)
-      {
-        TreeElement childElement = null;
-        if (event.getInBoundRelName().equals(FavoritesModelConstants.REL_USER_DEF_UDDI_REGISTRY_NODE))
-        {
-          childElement = (TreeElement)event.getInboundElement();
-        }
-        if (event.getOutBoundRelName().equals(FavoritesModelConstants.REL_USER_DEF_UDDI_REGISTRY_NODE))
-        {
-          childElement = (TreeElement)event.getOutBoundElement();
-        }
-        removeChildNode(childElement);
-      }
-    });
-  }
-
-  protected void initTools()
-  {
-    FavoritesPerspective favPerspective = nodeManager_.getController().getFavoritesPerspective();
-    new ListFavoriteUserDefUDDIRegistryTool(toolManager_, favPerspective.getMessage("ALT_LIST_FAVORITE_USER_DEF_UDDI_REGISTRY"));
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUserDefUDDIRegistryNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUserDefUDDIRegistryNode.java
deleted file mode 100644
index 1261756a9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUserDefUDDIRegistryNode.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.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesUserDefUDDIRegistryNode extends FavoritesNavigatorNode
-{
-  public FavoritesUserDefUDDIRegistryNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth, String imagePath)
-  {
-    super(treeElement, nodeManager, nodeDepth, imagePath);
-  }
-
-  protected void initTools()
-  {
-    FavoritesPerspective favPerspective = nodeManager_.getController().getFavoritesPerspective();
-    new FavoritesUserDefUDDIRegistryDetailsTool(toolManager_, favPerspective.getMessage("ALT_FAVORITES_USER_DEF_UDDI_REGISTRY_DETAILS"));
-    new AddToUDDIPerspectiveTool(toolManager_, favPerspective.getMessage("ALT_ADD_TO_UDDI_PERSPECTIVE"));
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSDLDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSDLDetailsTool.java
deleted file mode 100644
index d809f42de..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSDLDetailsTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesWSDLDetailsTool extends FormTool {
-
-    public FavoritesWSDLDetailsTool(ToolManager toolManager, String alt) {
-        super(toolManager, "images/details_enabled.gif", "images/details_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public final String getFormLink()
-    {
-      return "favorites/forms/FavoritesWSDLDetailsPage.jsp";
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSDLServiceFolderNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSDLServiceFolderNode.java
deleted file mode 100644
index 39230ede4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSDLServiceFolderNode.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesWSDLServiceFolderNode extends FavoritesNavigatorFolderNode {
-    public FavoritesWSDLServiceFolderNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) {
-        super(treeElement, nodeManager, nodeDepth);
-        treeElement.addListener(new ElementAdapter() {
-                                                   public void relAdded(RelAddEvent event) {
-                                                       String rel = event.getOutBoundRelName();
-                                                       if (rel.equals(FavoritesModelConstants.REL_WSDL_SERVICE_NODE)) {
-                                                           FavoritesWSDLServiceNode favoritesWSDLServiceNode = new FavoritesWSDLServiceNode((TreeElement)event.getParentElement(), nodeManager_, nodeDepth_ + 1);
-                                                           addChild(favoritesWSDLServiceNode);
-                                                       }
-                                                   }
-
-                                                   public void relRemoved(RelRemoveEvent event) {
-                                                       TreeElement childElement = null;
-                                                       if (event.getInBoundRelName().equals(FavoritesModelConstants.REL_WSDL_SERVICE_NODE)) {
-                                                           childElement = (TreeElement)event.getInboundElement();
-                                                       }
-                                                       if (event.getOutBoundRelName().equals(FavoritesModelConstants.REL_WSDL_SERVICE_NODE)) {
-                                                           childElement = (TreeElement)event.getOutBoundElement();
-                                                       }
-                                                       removeChildNode(childElement);
-                                                   }
-                                               });
-    }
-
-    protected void initTools() {
-        FavoritesPerspective favPerspective = nodeManager_.getController().getFavoritesPerspective();
-        new ListFavoriteWSDLServiceTool(toolManager_, favPerspective.getMessage("ALT_LIST_FAVORITE_WSDL_SERVICE"));
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSDLServiceNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSDLServiceNode.java
deleted file mode 100644
index 311957a3e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSDLServiceNode.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesWSDLServiceNode extends FavoritesNavigatorNode {
-    public FavoritesWSDLServiceNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) {
-        super(treeElement, nodeManager, nodeDepth, "favorites/images/wsdl_service_node.gif");
-    }
-
-    protected void initTools() {
-        Controller controller = nodeManager_.getController();
-        FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
-        new FavoritesWSDLDetailsTool(toolManager_, favPerspective.getMessage("ALT_FAVORITES_WSDL_DETAILS"));
-        new FavoritesImportToWorkbenchTool(toolManager_, controller.getMessage("ALT_IMPORT_WSDL_TO_WORKBENCH"));
-        new FavoritesImportToFileSystemTool(toolManager_, controller.getMessage("ALT_WSDL_IMPORT_TO_FS"));
-        new FavoritesLaunchWebServiceWizardTool(toolManager_, controller.getMessage("ALT_LAUNCH_WEB_SERVICE_WIZARD"));
-        new FavoritesAddToWSDLPerspectiveTool(toolManager_, favPerspective.getMessage("ALT_ADD_WSDL_TO_WSDL_PERSPECTIVE"));
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSILDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSILDetailsTool.java
deleted file mode 100644
index e995aa5c4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSILDetailsTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesWSILDetailsTool extends FormTool {
-
-    public FavoritesWSILDetailsTool(ToolManager toolManager, String alt) {
-        super(toolManager, "images/details_enabled.gif", "images/details_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public final String getFormLink()
-    {
-      return "favorites/forms/FavoritesWSILDetailsPage.jsp";
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSILFolderNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSILFolderNode.java
deleted file mode 100644
index 14f3ea324..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSILFolderNode.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesWSILFolderNode extends FavoritesNavigatorFolderNode {
-    public FavoritesWSILFolderNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) {
-        super(treeElement, nodeManager, nodeDepth);
-        treeElement.addListener(new ElementAdapter() {
-                                                   public void relAdded(RelAddEvent event) {
-                                                       String rel = event.getOutBoundRelName();
-                                                       if (rel.equals(FavoritesModelConstants.REL_WSIL_NODE)) {
-                                                           FavoritesWSILNode favoritesWSILNode = new FavoritesWSILNode((TreeElement)event.getParentElement(), nodeManager_, nodeDepth_ + 1);
-                                                           addChild(favoritesWSILNode);
-                                                       }
-                                                   }
-
-                                                   public void relRemoved(RelRemoveEvent event) {
-                                                       TreeElement childElement = null;
-                                                       if (event.getInBoundRelName().equals(FavoritesModelConstants.REL_WSIL_NODE)) {
-                                                           childElement = (TreeElement)event.getInboundElement();
-                                                       }
-                                                       if (event.getOutBoundRelName().equals(FavoritesModelConstants.REL_WSIL_NODE)) {
-                                                           childElement = (TreeElement)event.getOutBoundElement();
-                                                       }
-                                                       removeChildNode(childElement);
-                                                   }
-                                               });
-    }
-
-    protected void initTools() {
-        FavoritesPerspective favPerspective = nodeManager_.getController().getFavoritesPerspective();
-        new ListFavoriteWSILTool(toolManager_, favPerspective.getMessage("ALT_LIST_FAVORITE_WSIL"));
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSILNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSILNode.java
deleted file mode 100644
index 5969d9572..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSILNode.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesWSILNode extends FavoritesNavigatorNode {
-    public FavoritesWSILNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) {
-        super(treeElement, nodeManager, nodeDepth, "favorites/images/wsil_node.gif");
-    }
-
-    protected void initTools() {
-        FavoritesPerspective favPerspective = nodeManager_.getController().getFavoritesPerspective();
-        new FavoritesWSILDetailsTool(toolManager_, favPerspective.getMessage("ALT_FAVORITES_WSIL_DETAILS"));
-        new AddWSILToWSILPerspectiveTool(toolManager_, favPerspective.getMessage("ALT_ADD_WSIL_TO_WSIL_PERSPECTIVE"));
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIBusinessTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIBusinessTool.java
deleted file mode 100644
index 281fce8c6..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIBusinessTool.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.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class ListFavoriteUDDIBusinessTool extends FormTool {
-    public ListFavoriteUDDIBusinessTool(ToolManager toolManager, String alt) {
-        super(toolManager, "favorites/images/list_business_enabled.gif", "favorites/images/list_business_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public String getFormLink() {
-        return "favorites/views/ListFavoriteUDDIBusinessView.jsp";
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIRegistryTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIRegistryTool.java
deleted file mode 100644
index 1b016dd08..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIRegistryTool.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.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class ListFavoriteUDDIRegistryTool extends FormTool {
-    public ListFavoriteUDDIRegistryTool(ToolManager toolManager, String alt) {
-        super(toolManager, "favorites/images/list_registry_enabled.gif", "favorites/images/list_registry_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public String getFormLink() {
-        return "favorites/views/ListFavoriteUDDIRegistryView.jsp";
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIServiceInterfaceTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIServiceInterfaceTool.java
deleted file mode 100644
index d4233f560..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIServiceInterfaceTool.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.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class ListFavoriteUDDIServiceInterfaceTool extends FormTool {
-    public ListFavoriteUDDIServiceInterfaceTool(ToolManager toolManager, String alt) {
-        super(toolManager, "favorites/images/list_service_interface_enabled.gif", "favorites/images/list_service_interface_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public String getFormLink() {
-        return "favorites/views/ListFavoriteUDDIServiceInterfaceView.jsp";
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIServiceTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIServiceTool.java
deleted file mode 100644
index f432bf8f2..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIServiceTool.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.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class ListFavoriteUDDIServiceTool extends FormTool {
-    public ListFavoriteUDDIServiceTool(ToolManager toolManager, String alt) {
-        super(toolManager, "favorites/images/list_service_enabled.gif", "favorites/images/list_service_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public String getFormLink() {
-        return "favorites/views/ListFavoriteUDDIServiceView.jsp";
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUserDefUDDIRegistryTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUserDefUDDIRegistryTool.java
deleted file mode 100644
index dab8c9563..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUserDefUDDIRegistryTool.java
+++ /dev/null
@@ -1,36 +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.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class ListFavoriteUserDefUDDIRegistryTool extends FormTool
-{
-  public ListFavoriteUserDefUDDIRegistryTool(ToolManager toolManager, String alt)
-  {
-    super(toolManager, "favorites/images/list_registry_enabled.gif", "favorites/images/list_registry_highlighted.gif", alt);
-  }
-
-  public String getSelectToolActionHref(boolean forHistory)
-  {
-    Node selectedNode = toolManager_.getNode();
-    return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-  }
-
-  public String getFormLink()
-  {
-    return "favorites/views/ListFavoriteUserDefUDDIRegistryView.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteWSDLServiceTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteWSDLServiceTool.java
deleted file mode 100644
index 4e5e2c171..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteWSDLServiceTool.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.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class ListFavoriteWSDLServiceTool extends FormTool {
-    public ListFavoriteWSDLServiceTool(ToolManager toolManager, String alt) {
-        super(toolManager, "favorites/images/list_wsdl_enabled.gif", "favorites/images/list_wsdl_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public String getFormLink() {
-        return "favorites/views/ListFavoriteWSDLServiceView.jsp";
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteWSILTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteWSILTool.java
deleted file mode 100644
index ede83f1d6..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteWSILTool.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.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class ListFavoriteWSILTool extends FormTool {
-    public ListFavoriteWSILTool(ToolManager toolManager, String alt) {
-        super(toolManager, "favorites/images/list_WSIL_enabled.gif", "favorites/images/list_WSIL_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public String getFormLink() {
-        return "favorites/views/ListFavoriteWSILView.jsp";
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/RemoveFavoritesTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/RemoveFavoritesTool.java
deleted file mode 100644
index 424a6e0a6..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/RemoveFavoritesTool.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.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.RemoveFavoritesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class RemoveFavoritesTool extends ActionTool {
-
-    public RemoveFavoritesTool(ToolManager toolManager, String alt) {
-        super(toolManager, "images/clear_enabled.gif", "images/clear_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public String getActionLink() {
-        Node selectedNode = toolManager_.getNode();
-        return RemoveFavoritesAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId());
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ActionTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ActionTool.java
deleted file mode 100644
index 98e5622bb..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ActionTool.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ToolTypes;
-
-public abstract class ActionTool extends Tool
-{
-  public ActionTool(ToolManager toolManager,String enabledImageLink,String highlightedImageLink,String alt)
-  {
-    super(toolManager,enabledImageLink,highlightedImageLink,alt,ToolTypes.ACTION);
-  }
-
-  public String getFormLink()
-  {
-    return null;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/AddToWSDLPerspectiveTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/AddToWSDLPerspectiveTool.java
deleted file mode 100644
index 1282a97e1..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/AddToWSDLPerspectiveTool.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-public abstract class AddToWSDLPerspectiveTool extends ActionTool
-{
-  public AddToWSDLPerspectiveTool(ToolManager toolManager,String alt)
-  {
-    super(toolManager,"images/add_to_wsdl_perspective_enabled.gif","images/add_to_wsdl_perspective_highlighted.gif",alt);
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/BreadCrumb.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/BreadCrumb.java
deleted file mode 100644
index 2d211dc0b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/BreadCrumb.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.ws.internal.explorer.platform.perspective;
-
-// A class used to represent a brower breadcrumb. Each breadcrumb encapsulates
-// a navigated URL.
-public class BreadCrumb
-{
-  private int perspectiveId_;
-  private String url_;
-
-  public BreadCrumb(int perspectiveId,String url)
-  {
-    perspectiveId_ = perspectiveId;
-    url_ = url;
-  }
-
-  /**
-  * Get the URL associated with this breadcrumb.
-  * @return String The URL.
-  */
-  public String getURL()
-  {
-    return url_;
-  }
-
-  /**
-  * Get the ID of the perspective where this breadcrumb belongs.
-  * @return int The perspectiveID as defined in ActionInputs.
-  */
-  public int getPerspectiveId()
-  {
-    return perspectiveId_;
-  }
-
-  /**
-  * Test equality between this breadcrumb and another. Both the URLs and perspective
-  * IDs must be equal for two breadcrumbs to be equal.
-  * @param BreadCrumb A breadcrumb.
-  * @return boolean The result of the equality test.
-  */
-  public boolean equals(BreadCrumb b)
-  {
-    return ((url_.equals(b.getURL())) && (perspectiveId_ == b.getPerspectiveId()));
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Controller.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Controller.java
deleted file mode 100644
index 783cfdcab..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Controller.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.perspective;
-
-import javax.servlet.ServletContext;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.ActionEngine;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-
-public class Controller extends MessageProvider
-{
-  private String sessionId_;
-  private String stateLocation_;
-  private String defaultFavoritesLocation_;
-  private String contextPath_;
-  private int historyDirection_;
-  private History history_;
-  private UDDIPerspective uddiPerspective_;
-  private WSILPerspective wsilPerspective_;
-  private WSDLPerspective wsdlPerspective_;
-  private FavoritesPerspective favoritesPerspective_;
-  private Perspective currentPerspective_;
-  private boolean isPerspectiveContentBlank_;
-  private ActionEngine actionEngine;
-  
-  // WSDL Browser
-  private int wsdlType_;
-
-  public Controller()
-  {
-    super("explorer");
-    contextPath_ = null;
-	stateLocation_ = null;
-    history_ = new History();
-    uddiPerspective_ = new UDDIPerspective(this);
-    wsilPerspective_ = new WSILPerspective(this);
-    wsdlPerspective_ = new WSDLPerspective(this);
-    favoritesPerspective_ = new FavoritesPerspective(this);
-    // Set the default perspective to UDDI.
-    currentPerspective_ = uddiPerspective_;
-    historyDirection_ = ActionInputs.JUMP_BACK;
-    wsdlType_ = ActionInputs.WSDL_TYPE_SERVICE_INTERFACE;
-    isPerspectiveContentBlank_ = true;
-    actionEngine = new ActionEngine(this);
-  }
-  
-  public final void setStateLocation(String stateLocation)
-  {
-	stateLocation_ = stateLocation;
-  }
-
-  public final void setDefaultFavoritesLocation(String defaultFavoritesLocation)
-  {
-	  defaultFavoritesLocation_ = defaultFavoritesLocation;
-  }
-  
-  // This method should be called immediately after the Controller bean is instantiated.
-  private final void setContextPath(String contextPath)
-  {
-    if (contextPath_ == null)
-      contextPath_ = contextPath;
-  }
-  
-  public final String getPathWithContext(String relativePath)
-  {
-    if (relativePath == null)
-      return relativePath;
-    StringBuffer path = new StringBuffer(relativePath);
-    if (contextPath_ != null)
-      path.insert(0,'/').insert(0,contextPath_);
-    return path.toString();
-  }
-
-  public final String getSessionId()
-  {
-    return sessionId_;
-  }
-  
-  public final String getContextPath()
-  {
-    return contextPath_;
-  }
-  
-  public final String getServletEngineStateLocation() {
-	return stateLocation_;
-  }
-  
-  public final String getDefaultFavoritesLocation () {
-	return defaultFavoritesLocation_;
-  }
-  
-  public final void init(String sessionId,ServletContext application,String contextPath)
-  {
-    sessionId_ = sessionId;
-    setContextPath(contextPath);
-    uddiPerspective_.initPerspective(application);
-    wsilPerspective_.initPerspective(application);
-    wsdlPerspective_.initPerspective(application);
-    favoritesPerspective_.initPerspective(application);
-  }
-
-  // Setter for the current perspective.
-  public final void setCurrentPerspective(int perspective)
-  {
-    switch (perspective)
-    {
-      case ActionInputs.PERSPECTIVE_UDDI:
-        currentPerspective_ = uddiPerspective_;
-        break;
-      case ActionInputs.PERSPECTIVE_WSIL:
-        currentPerspective_ = wsilPerspective_;
-        break;
-      case ActionInputs.PERSPECTIVE_WSDL:
-        currentPerspective_ = wsdlPerspective_;
-        break;
-      case ActionInputs.PERSPECTIVE_FAVORITES:
-        currentPerspective_ = favoritesPerspective_;
-        break;
-    }
-  }
-
-  // Getter for the current perspective.
-  public final Perspective getCurrentPerspective()
-  {
-    return currentPerspective_;
-  }
-
-  // Getter for the UDDI perspective.
-  public final UDDIPerspective getUDDIPerspective()
-  {
-    return uddiPerspective_;
-  }
-
-  // Getter for the WSIL perspective.
-  public final WSILPerspective getWSILPerspective()
-  {
-    return wsilPerspective_;
-  }
-  
-  // Getter for the WSDL perspective.
-  public final WSDLPerspective getWSDLPerspective()
-  {
-    return wsdlPerspective_;
-  }
-
-  // Getter for the Favorites perspective.
-  public final FavoritesPerspective getFavoritesPerspective() {
-    return favoritesPerspective_;
-  }
-  
-  // Getter for the action engine
-  public final ActionEngine getActionEngine() {
-    return actionEngine;
-  }
-
-  public final boolean addToHistory(int perspectiveId,String url)
-  {
-    if (url != null)
-      return history_.addBreadCrumb(new BreadCrumb(perspectiveId,url));
-    return false;
-  }
-
-  // Wrapper for moving forward in the history list and obtaining the breadcrumb.
-  public final BreadCrumb forward()
-  {
-    historyDirection_ = ActionInputs.JUMP_FORWARD;
-    return history_.forward();
-  }
-
-  // Wrapper for moving back in the history list and obtaining the breadcrumb.
-  public final BreadCrumb back()
-  {
-    historyDirection_ = ActionInputs.JUMP_BACK;
-    return history_.back();
-  }
-
-  public final int getHistoryDirection()
-  {
-    return historyDirection_;
-  }
-
-  public final void processStaleBreadCrumb()
-  {
-    history_.removeCurrentBreadCrumb();
-  }
-  
-  // WSDL Browser
-  public final void setWSDLType(int wsdlType)
-  {
-    wsdlType_ = wsdlType;
-  }
-
-  public final int getWSDLType()
-  {
-    return wsdlType_;
-  }
-  
-  public final boolean isPerspectiveContentBlank()
-  {
-    return isPerspectiveContentBlank_;
-  }
-  
-  public final void enablePerspectiveContentBlank(boolean isPerspectiveContentBlank)
-  {
-    isPerspectiveContentBlank_ = isPerspectiveContentBlank;
-  }
-  
-  public final void dumpHistory()
-  {
-    history_.dump();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FolderNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FolderNode.java
deleted file mode 100644
index 52fc4b8f8..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FolderNode.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-
-public abstract class FolderNode extends Node
-{
-  public FolderNode(TreeElement element,NodeManager nodeManager,int nodeDepth)
-  {
-    super(element,nodeManager,nodeDepth,"images/folder_closed.gif");
-  }
-
-  public String getOpenImagePath()
-  {
-    return "images/folder_open.gif";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormTool.java
deleted file mode 100644
index 51f95c5bb..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormTool.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.ws.internal.explorer.platform.perspective;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ToolTypes;
-
-public abstract class FormTool extends Tool implements FormToolPropertiesInterface
-{
-  protected FormToolProperties formToolProperties_;
-
-  public FormTool(ToolManager toolManager,String enabledImageLink,String highlightedImageLink,String alt)
-  {
-    super(toolManager,enabledImageLink,highlightedImageLink,alt,ToolTypes.FORM);
-    formToolProperties_ = new FormToolProperties();
-    initDefaultProperties();
-  }
-
-  protected void initDefaultProperties()
-  {
-  }
-
-  public final Object getProperty(Object key)
-  {
-    return formToolProperties_.getProperty(key);
-  }
-
-  public final void setProperty(Object key,Object value)
-  {
-    formToolProperties_.setProperty(key,value);
-  }
-
-  public final void removeProperty(Object key)
-  {
-    formToolProperties_.removeProperty(key);
-  }
-
-  public final void clearPropertyTable()
-  {
-    formToolProperties_.clearPropertyTable();
-  }
-
-  public final void updatePropertyTable(Hashtable newPropertyTable)
-  {
-    formToolProperties_.updatePropertyTable(newPropertyTable);
-  }
-
-  public final void setPropertyTable(Hashtable newPropertyTable)
-  {
-    formToolProperties_.setPropertyTable(newPropertyTable);
-  }
-
-  public final void flagError(Object inputKey)
-  {
-    formToolProperties_.flagError(inputKey);
-  }
-
-  public final void flagRowError(Object inputKey,int rowNumber)
-  {
-    formToolProperties_.flagRowError(inputKey,rowNumber);
-  }
-  
-  public final void flagRowError(Object inputKey,Object rowId)
-  {
-    formToolProperties_.flagRowError(inputKey,rowId);
-  }
-
-  public final void clearErrors()
-  {
-    formToolProperties_.clearErrors();
-  }
-
-  public final boolean isInputValid(Object inputKey)
-  {
-    return formToolProperties_.isInputValid(inputKey);
-  }
-
-  public final boolean isRowInputValid(Object inputKey,int rowNumber)
-  {
-    return formToolProperties_.isRowInputValid(inputKey,String.valueOf(rowNumber));
-  }
-  
-  // The row number may also be represented by a unique object (e.g. UUID)
-  public final boolean isRowInputValid(Object inputKey,Object rowId)
-  {
-    return formToolProperties_.isRowInputValid(inputKey,rowId);
-  }
-
-  public final String getActionLink()
-  {
-    return null;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormToolProperties.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormToolProperties.java
deleted file mode 100644
index f0e58383b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormToolProperties.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-public class FormToolProperties implements FormToolPropertiesInterface
-{
-  private Hashtable propertyTable_;
-  private Hashtable errantValues_;
-
-  public FormToolProperties()
-  {
-    propertyTable_ = new Hashtable();
-    errantValues_ = new Hashtable();
-  }
-
-  public final Object getProperty(Object key)
-  {
-    return propertyTable_.get(key);
-  }
-
-  public final void setProperty(Object key,Object value)
-  {
-    propertyTable_.put(key,value);
-  }
-
-  public final void removeProperty(Object key)
-  {
-    propertyTable_.remove(key);
-  }
-
-  public final void clearPropertyTable()
-  {
-    propertyTable_.clear();
-  }
-
-  public final void updatePropertyTable(Hashtable newPropertyTable)
-  {
-    Enumeration e = newPropertyTable.keys();
-    while (e.hasMoreElements())
-    {
-      String key = (String)e.nextElement();
-      propertyTable_.put(key,newPropertyTable.get(key));
-    }
-  }
-
-  public final void setPropertyTable(Hashtable newPropertyTable)
-  {
-    clearPropertyTable();
-    updatePropertyTable(newPropertyTable);
-  }
-
-  public final void flagError(Object inputKey)
-  {
-    if (isInputValid(inputKey))
-      errantValues_.put(inputKey,Boolean.TRUE);
-  }
-
-  public final void flagRowError(Object inputKey,int rowNumber)
-  {
-    flagRowError(inputKey,String.valueOf(rowNumber));
-  }
-  
-  public final void flagRowError(Object inputKey,Object rowId)
-  {
-    Object errorObject = errantValues_.get(inputKey);
-    Hashtable rowHash;
-    if (errorObject instanceof Hashtable)
-      rowHash = (Hashtable)errorObject;
-    else
-      rowHash = new Hashtable();
-    rowHash.put(rowId,Boolean.TRUE);
-    errantValues_.put(inputKey,rowHash);
-  }
-  
-  public final void clearErrors()
-  {
-    errantValues_.clear();
-  }
-
-  public final boolean isInputValid(Object inputKey)
-  {
-    return (errantValues_.get(inputKey) == null);
-  }
-
-  public final boolean isRowInputValid(Object inputKey,int rowNumber)
-  {
-    return isRowInputValid(inputKey,String.valueOf(rowNumber));
-  }
-  
-  public final boolean isRowInputValid(Object inputKey,Object rowId)
-  {
-    Hashtable rowHash = (Hashtable)errantValues_.get(inputKey);
-    if (rowHash == null)
-      return true;
-    return (rowHash.get(rowId) == null);
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormToolPropertiesInterface.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormToolPropertiesInterface.java
deleted file mode 100644
index accd0d3d6..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormToolPropertiesInterface.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.ws.internal.explorer.platform.perspective;
-
-import java.util.Hashtable;
-
-public abstract interface FormToolPropertiesInterface
-{
-  // Getter and Setter for a property.
-  public abstract Object getProperty(Object key);
-  public abstract void setProperty(Object key,Object value);
-  public abstract void removeProperty(Object key);
-
-  // Property table operators.
-  public abstract void clearPropertyTable();
-  public abstract void updatePropertyTable(Hashtable propertyTable);
-  public abstract void setPropertyTable(Hashtable propertyTable);
-
-  // Error handling.
-  public abstract void flagError(Object inputKey);
-  public abstract void flagRowError(Object inputKey,int rowNumber);
-  public abstract void flagRowError(Object inputKey,Object rowId);
-  public abstract void clearErrors();
-  public abstract boolean isInputValid(Object inputKey);
-  public abstract boolean isRowInputValid(Object inputKey,int rowNumber);
-  public abstract boolean isRowInputValid(Object inputKey,Object rowId);
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/History.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/History.java
deleted file mode 100644
index 44491de41..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/History.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-import java.util.Vector;
-
-// A class representing a Vector of breadcrumbs. A position index is used
-// to navigate through the data structure.
-public class History
-{
-  private Vector items_;
-  private int position_;
-
-  public History()
-  {
-    items_ = new Vector();
-    position_ = -1;
-  }
-
-  // Add a new breadcrumb to the history list. When adding a new breadcrumb
-  // within the current list, all breadcrumbs after the newly added one are
-  // removed.
-  public boolean addBreadCrumb(BreadCrumb b)
-  {
-    int numberOfItems = items_.size();
-    if (numberOfItems == 0)
-    {
-      position_++;
-      items_.addElement(b);
-      return true;
-    }
-    else
-    {
-      BreadCrumb currentBreadCrumb = (BreadCrumb)items_.elementAt(position_);
-      if (!currentBreadCrumb.equals(b))
-      {
-        position_++;
-        items_.insertElementAt(b,position_);
-        for (int i=items_.size()-1;i>position_;i--)
-          items_.removeElementAt(i);
-        return true;
-      }
-    }
-    return false;
-  }
-
-  // Move forward within the history list and obtain the breadcrumb.
-  public BreadCrumb forward()
-  {
-    if (position_ < items_.size()-1)
-    {
-      position_++;
-      BreadCrumb b = (BreadCrumb)items_.elementAt(position_);
-      return b;
-    }
-    return null;
-  }
-
-  // Move back within the history list and obtain the breadcrumb.
-  public BreadCrumb back()
-  {
-    if (position_ > 0)
-    {
-      position_--;
-      BreadCrumb b = (BreadCrumb)items_.elementAt(position_);
-      return b;
-    }
-    return null;
-  }
-
-  public void removeCurrentBreadCrumb()
-  {
-    items_.removeElementAt(position_);
-    if (position_ > items_.size()-1)
-      position_--;
-  }
-  
-  public void dump()
-  {
-    for (int i=0;i<items_.size();i++)
-    {
-      items_.elementAt(i);
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ImportToFileSystemTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ImportToFileSystemTool.java
deleted file mode 100644
index 9b53c4eb9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ImportToFileSystemTool.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-public abstract class ImportToFileSystemTool extends ActionTool {
-    public ImportToFileSystemTool(ToolManager toolManager, String alt) {
-        super(toolManager, "images/import_fs_enabled.gif", "images/import_fs_highlighted.gif", alt);
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ImportToWorkbenchTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ImportToWorkbenchTool.java
deleted file mode 100644
index af740540f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ImportToWorkbenchTool.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.ws.internal.explorer.platform.perspective;
-
-public abstract class ImportToWorkbenchTool extends FormTool {
-    public ImportToWorkbenchTool(ToolManager toolManager, String alt) {
-        super(toolManager, "images/import_to_workbench_enabled.gif", "images/import_to_workbench_highlighted.gif", alt);
-    }
-
-    public String getFormLink() {
-        return "forms/ImportToWorkbenchForm.jsp";
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/LaunchOptionsManager.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/LaunchOptionsManager.java
deleted file mode 100644
index f219e2634..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/LaunchOptionsManager.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.perspective;
-
-import java.util.Hashtable;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
-import org.eclipse.wst.ws.internal.explorer.LaunchOptions;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-
-public class LaunchOptionsManager
-{
-  private static LaunchOptionsManager instance_;
-
-  private Hashtable optionsTable_;
-
-  private LaunchOptionsManager()
-  {
-    optionsTable_ = new Hashtable();
-  }
-
-  public static LaunchOptionsManager getInstance()
-  {
-    if (instance_ == null)
-      instance_ = new LaunchOptionsManager();
-    return instance_;
-  }
-
-  public synchronized void manage(String key, Object value, ServletContext application)
-  {
-    if (value instanceof String)
-      manageSession(key, (String)value, application);
-    else if (value instanceof Hashtable)
-      manageOptions(key, (Hashtable)value, application);
-  }
-
-  private void manageSession(String key, String sessionId, ServletContext application)
-  {
-    Object obj = optionsTable_.remove(key);
-    if (obj != null && (obj instanceof Hashtable))
-      loadOptions(sessionId, (Hashtable)obj, application);
-    else
-      optionsTable_.put(key, sessionId);
-  }
-
-  private void manageOptions(String key, Hashtable options, ServletContext application)
-  {
-    Object obj = optionsTable_.remove(key);
-    if (obj != null && (obj instanceof String))
-      loadOptions((String)obj, options, application);
-    else
-      optionsTable_.put(key, options);
-  }
-
-  private void loadOptions(String sessionId, Hashtable options, ServletContext application)
-  {
-    HttpSession httpSession = (HttpSession)application.getAttribute(sessionId);
-    if (httpSession != null)
-    {
-      Controller controller = (Controller)httpSession.getAttribute("controller");
-	  String[] stateLocations = (String[])options.get(LaunchOptions.STATE_LOCATION);
-	  String[] defaultFavoritesLocations = (String[])options.get(LaunchOptions.DEFAULT_FAVORITES_LOCATION);
-      String[] inquiryURLs = (String[])options.get(LaunchOptions.INQUIRY_URL);
-      String[] publishURLs = (String[])options.get(LaunchOptions.PUBLISH_URL);
-      String[] serviceNames = (String[])options.get(LaunchOptions.SERVICE_NAME);
-      String[] serviceKeys = (String[])options.get(LaunchOptions.SERVICE_KEY);
-      String[] wsdlURLs = (String[])options.get(LaunchOptions.WSDL_URL);
-      String[] endpoints = (String[])options.get(LaunchOptions.WEB_SERVICE_ENDPOINT);
-      String[] serviceQNameStrings = (String[])options.get(LaunchOptions.SERVICE_QNAME_STRING);
-      String[] bindingNameStrings = (String[])options.get(LaunchOptions.BINDING_NAME_STRING);
-	  String stateLocation = (stateLocations == null || stateLocations.length == 0) ? null : stateLocations[0];
-	  controller.setStateLocation(stateLocation);
-	  String defaultFavoritesLocation = (defaultFavoritesLocations == null || defaultFavoritesLocations.length == 0) ? null : defaultFavoritesLocations[0];
-	  controller.setDefaultFavoritesLocation(defaultFavoritesLocation);
-      UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-      uddiPerspective.preloadUDDIRegistries(inquiryURLs, publishURLs);
-      uddiPerspective.preloadServices(inquiryURLs,serviceNames,serviceKeys);
-      WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-      wsdlPerspective.preloadWSDL(wsdlURLs);
-      wsdlPerspective.preloadEndpoints(wsdlURLs, endpoints);
-      wsdlPerspective.preselectServiceOrBinding(wsdlURLs,serviceQNameStrings,bindingNameStrings);
-    }
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/LaunchWebServiceWizardTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/LaunchWebServiceWizardTool.java
deleted file mode 100644
index 1b3ea8d02..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/LaunchWebServiceWizardTool.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.ws.internal.explorer.platform.perspective;
-
-public abstract class LaunchWebServiceWizardTool extends FormTool {
-    public LaunchWebServiceWizardTool(ToolManager toolManager, String alt) {
-        super(toolManager, "images/launch_wswizard_enabled.gif", "images/launch_wswizard_highlighted.gif", alt);
-    }
-
-    public String getFormLink() {
-        return "forms/LaunchWebServiceWizardForm.jsp";
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageBundle.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageBundle.java
deleted file mode 100644
index 834bc71e3..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageBundle.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
-* An message bundle is a collection of messages drawn from some
-* set of properties.
-*/
-public class MessageBundle
-{
-  private ResourceBundle fResourceBundle;
-
-  /**
-  * Constructs a new MessageBundle from the given ResourceBundle.
-  */
-  public MessageBundle ( ResourceBundle resourceBundle )
-  {
-    fResourceBundle = resourceBundle;
-  }
-
-  /**
-  * Returns the message identified by messageId.
-  * @param messageId The message ID.
-  * @return String The message text.
-  */
-  public String getMessage ( String messageId )
-  {
-    try
-    {
-      return fResourceBundle.getString(messageId);
-    }
-    catch (MissingResourceException e)
-    {
-      return messageId;
-    }
-  }
-
-  /**
-  * Returns the message identified by messageId.
-  * @param messageId The message ID.
-  * @param sub A substitution value for "%1" in the message.
-  * @return String The message text.
-  */
-  public String getMessage ( String messageId, String sub )
-  {
-    String[] s = {sub};
-    return getMessage(messageId,s);
-  }
-
-  /**
-  * Returns the message identified by messageId.
-  * @param messageId The message ID.
-  * @param sub Substitution values for "%1..%n" (sub[0]..sub[n-1]) in
-  * the message.
-  * @return String The message text.
-  */
-  public String getMessage ( String messageId, String[] sub )
-  {
-    String m = getMessage(messageId);
-    int len = m.length();
-    int max = sub.length;
-    StringBuffer b = new StringBuffer();
-    int pos = 0;
-    while (pos >= 0)
-    {
-      int pct = m.indexOf('%',pos);
-      if (pct >= 0)
-      {
-        b.append(m.substring(pos,pct));
-        pos = pct + 1;
-        if (pos < len)
-        {
-          char d = m.charAt(pos);
-          if (Character.isDigit(d) && d != '0')
-          {
-            int v = Integer.parseInt(new Character(d).toString());
-            if (v <= max)
-            {
-              b.append(sub[v-1]);
-            }
-            else
-            {
-              b.append('?');
-            }
-            pos++;
-          }
-          else
-          {
-            b.append('%');
-            b.append(d);
-            pos++;
-          }
-        }
-        else
-        {
-          b.append('%');
-          pos = -1;
-        }
-      }
-      else
-      {
-        b.append(m.substring(pos));
-        pos = -1;
-      }
-    }
-    return b.toString();
-  }
-
-  public ResourceBundle getResourceBundle()
-  {
-    return fResourceBundle;
-  }
-}
-
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageProvider.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageProvider.java
deleted file mode 100644
index 4e08507f8..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageProvider.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.ws.internal.explorer.platform.perspective;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-// A Class which provides String messages.
-public class MessageProvider
-{
-  protected MessageBundle messageBundle_;
-  private String messageProviderName_;
-
-  public MessageProvider(String messageBundleFileName)
-  {
-    try
-    {
-      // Load the message bundle from the WEB-INF\classes subdirectory.
-      messageProviderName_ = messageBundleFileName;
-      messageBundle_ = new MessageBundle(ResourceBundle.getBundle(messageBundleFileName));
-    }
-    catch (MissingResourceException e)
-    {
-    	System.err.println("Could not load "+messageBundleFileName);
-    	e.printStackTrace();
-    }
-  }
-
-  public String getMessage(String messageId)
-  {
-    return messageBundle_.getMessage(messageId);
-  }
-
-  public String getMessage(String messageId,String sub)
-  {
-    return messageBundle_.getMessage(messageId,sub);
-  }
-
-  public String getMessage(String messageId,String[] sub)
-  {
-    return messageBundle_.getMessage(messageId,sub);
-  }
-  
-  public String getMessageProviderName()
-  {
-    return messageProviderName_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageQueue.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageQueue.java
deleted file mode 100644
index f28c81c5a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageQueue.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.ws.internal.explorer.platform.perspective;
-
-import java.util.Enumeration;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.util.HTMLUtils;
-
-public class MessageQueue
-{
-  protected Vector messageList_;
-
-  public MessageQueue()
-  {
-    messageList_ = new Vector();
-  }
-
-  public void addMessage(String message)
-  {
-    messageList_.addElement(message);
-  }
-
-  public String getMessagesFromList()
-  {
-    StringBuffer messages = new StringBuffer();
-
-    if (messageList_.size()==0)
-      return "";
-
-    Enumeration e = messageList_.elements();
-    while (e.hasMoreElements())
-    {
-      String thisMessage = (String)e.nextElement();
-      messages.append(thisMessage);
-      messages.append(HTMLUtils.LINE_SEPARATOR);
-    }
-    messageList_.removeAllElements();
-    return messages.toString();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Node.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Node.java
deleted file mode 100644
index ec413795b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Node.java
+++ /dev/null
@@ -1,450 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.perspective;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-import javax.servlet.http.HttpServletResponse;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.FrameNames;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.util.HTMLUtils;
-
-public abstract class Node
-{
-  protected TreeElement element_;
-  protected NodeManager nodeManager_;
-  protected int nodeId_;
-  protected int nodeDepth_;
-  protected String imagePath_;
-  protected boolean isOpen_;
-  protected Vector childNodes_;
-  protected ToolManager toolManager_;
-  protected Node parent_;
-  private String anchorName_;
-  private int viewId_;
-
-  public Node(TreeElement element,NodeManager nodeManager,int nodeDepth,String imagePath)
-  {
-    element_ = element;
-    nodeManager_ = nodeManager;
-    nodeId_ = nodeManager.addToNodeTable(this);
-    nodeDepth_ = nodeDepth;
-    Controller controller = nodeManager_.getController();
-    if (imagePath == null)
-      imagePath_ = controller.getPathWithContext(NodeManager.PATH_SPACE);
-    else
-      imagePath_ = imagePath;
-    isOpen_ = true;
-    childNodes_ = new Vector();
-    toolManager_ = new ToolManager(this);
-    initTools();
-    anchorName_ = (new StringBuffer("action")).append(nodeId_).toString();
-    parent_ = null;
-    viewId_ = ActionInputs.VIEWID_DEFAULT;
-  }
-
-  /**
-  * Returns the TreeElement associated with this node.
-  * @return TreeElement The element associated with this node.
-  */
-  public TreeElement getTreeElement()
-  {
-    return element_;
-  }
-
-  /**
-  * Returns the name of the node.
-  * @return String
-  */
-  public String getNodeName()
-  {
-    return element_.getName();
-  }
-
-  /**
-  * Returns the NodeManager managing this node.
-  * @return NodeManager
-  */
-  public NodeManager getNodeManager()
-  {
-    return nodeManager_;
-  }
-
-  /**
-  * Returns the id of this node.
-  * @return int
-  */
-  public int getNodeId()
-  {
-    return nodeId_;
-  }
-
-  /**
-  * Returns the depth in the tree of this node relative to the root node
-  * @return int
-  */
-  public int getNodeDepth()
-  {
-    return nodeDepth_;
-  }
-
-  /**
-  * Set the path of the image representing this class of Node.
-  * @param String The path.
-  */
-  public void setImagePath(String path)
-  {
-    imagePath_ = path;
-  }
-
-  /**
-  * Returns true if the children of this node are visible. Returns false
-  * if they are not.
-  * @return boolean
-  */
-  public boolean isOpen()
-  {
-    return isOpen_;
-  }
-
-  public boolean isVisible()
-  {
-    Node parentNode = parent_;
-    while (parentNode != null)
-    {
-      if (!parentNode.isOpen())
-        return false;
-      parentNode = parentNode.getParent();
-    }
-    return true;
-  }
-
-  /**
-  * Sets the visibility of this node's children to the specified value.
-  * Updates the NodeManager's record of the maximum depth visible in the tree.
-  * @param boolean
-  */
-  public final void setVisibilityOfChildren(boolean open)
-  {
-    isOpen_ = open;
-    nodeManager_.updateMaxDepthVisible();
-  }
-
-  /**
-  * Gets the maximum depth displayed in this node's branch of the tree
-  * Used by NodeManager for html display purposes.
-  * @return int
-  */
-  public int getMaxDepthVisible()
-  {
-    if (!isOpen_)
-      return nodeDepth_;
-    else
-    {
-      int currentDepth = nodeDepth_;
-      Enumeration e = childNodes_.elements();
-      while (e.hasMoreElements())
-      {
-        Node thisNode = (Node)e.nextElement();
-        int depth = thisNode.getMaxDepthVisible();
-        if (depth>currentDepth)
-          currentDepth=depth;
-      }
-      return currentDepth;
-    }
-  }
-
-  public final void setParent(Node node)
-  {
-    parent_ = node;
-  }
-
-  public final Node getParent()
-  {
-    return parent_;
-  }
-
-  public final void setViewId(int viewId)
-  {
-    viewId_ = viewId;
-  }
-
-  public final int getViewId()
-  {
-    return viewId_;
-  }
-
-  public final int getViewToolId()
-  {
-    ToolManager viewToolManager = getViewToolManager();
-    if (viewToolManager != null)
-      return viewToolManager.getSelectedToolId();
-    return ActionInputs.VIEWTOOLID_DEFAULT;
-  }
-
-  /**
-  * Adds the specified node as a child of this node.
-  * @param Node The child being added.
-  * @return boolean Always true.
-  */
-  public final boolean addChild(Node childNode)
-  {
-    childNode.setParent(this);
-    childNodes_.addElement(childNode);
-    nodeManager_.updateMaxDepthVisible();
-    return true;
-  }
-
-  /**
-  * Returns the child nodes of this node. If this node has no children, an
-  * empty vector is returned.
-  * @return Vector
-  */
-  public Vector getChildNodes()
-  {
-    return childNodes_;
-  }
-
-  public final Node getChildNode(TreeElement element)
-  {
-    Enumeration e = childNodes_.elements();
-    while (e.hasMoreElements())
-    {
-      Node presentNode = (Node)e.nextElement();
-      if (presentNode.getTreeElement() == element)
-        return presentNode;
-    }
-    return null;
-  }
-
-  public final void removeChildNodes(boolean isEntry)
-  {
-    int numberOfChildNodes = childNodes_.size();
-    for (int i=numberOfChildNodes-1;i>=0;i--)
-    {
-      Node childNode = (Node)childNodes_.elementAt(i);
-      childNode.removeChildNodes(false);
-      nodeManager_.removeFromNodeTable(childNode.getNodeId());
-    }
-    if (numberOfChildNodes > 0)
-    {
-      childNodes_.removeAllElements();
-      if (isEntry)
-        nodeManager_.updateMaxDepthVisible();
-    }
-  }
-
-  public final boolean removeChildNode(TreeElement element)
-  {
-    Node childNode = getChildNode(element);
-    if (childNode != null)
-    {
-      int childNodeId = childNode.getNodeId();
-      if (nodeManager_.getSelectedNodeId() == childNodeId)
-        nodeManager_.setSelectedNodeId(nodeId_);
-      childNodes_.removeElement(childNode);
-      nodeManager_.removeFromNodeTable(childNodeId);
-      nodeManager_.updateMaxDepthVisible();
-      return true;
-    }
-    return false;
-  }
-
-  /**
-  * Get the name of the HTML anchor associated with this node.
-  * @return String The name of the anchor.
-  */
-  public String getAnchorName()
-  {
-    return anchorName_;
-  }
-
-  public ToolManager getToolManager()
-  {
-    return toolManager_;
-  }
-
-  public ToolManager getViewToolManager()
-  {
-    if (viewId_ != ActionInputs.VIEWID_DEFAULT)
-    {
-      ViewTool viewTool = (ViewTool)toolManager_.getSelectedTool();
-      return viewTool.getToolManager(viewId_);
-    }
-    return null;
-  }
-  
-  public ToolManager getCurrentToolManager()
-  {
-    ToolManager toolManager = getViewToolManager();
-    if (toolManager == null)
-      toolManager = toolManager_;
-    return toolManager;
-  }
-
-  protected abstract void initTools();
-
-  protected abstract String getToggleNodeActionHref();
-
-  protected String getToggleNodeActionTarget()
-  {
-    return FrameNames.PERSPECTIVE_WORKAREA;
-  }
-
-  protected void addToggle(HttpServletResponse response,StringBuffer treeView,boolean isLastChild)
-  {
-    if (nodeDepth_ != 1)
-    {
-      treeView.append("    <td align=\"left\" width=16 height=16 nowrap>");
-      String toggleImageTag;
-      if (childNodes_.size() > 0)
-      {
-        // <a href="..." target="...">toggleImageTag</a>
-        String href = nodeManager_.getController().getPathWithContext(getToggleNodeActionHref());
-        if (isOpen_)
-        {
-          String toggleAlt = nodeManager_.getController().getMessage("ALT_CLOSE");
-          if (isLastChild)
-            toggleImageTag = HTMLUtils.getHTMLImageTag(response,nodeManager_.getController().getPathWithContext(NodeManager.PATH_MINUS_LAST),toggleAlt,"16","16",null);
-          else
-            toggleImageTag = HTMLUtils.getHTMLImageTag(response,nodeManager_.getController().getPathWithContext(NodeManager.PATH_MINUS_NOTLAST),toggleAlt,"16","16",null);
-        }
-        else
-        {
-          String toggleAlt = nodeManager_.getController().getMessage("ALT_OPEN");
-          if (isLastChild)
-            toggleImageTag = HTMLUtils.getHTMLImageTag(response,nodeManager_.getController().getPathWithContext(NodeManager.PATH_PLUS_LAST),toggleAlt,"16","16",null);
-          else
-            toggleImageTag = HTMLUtils.getHTMLImageTag(response,nodeManager_.getController().getPathWithContext(NodeManager.PATH_PLUS_NOTLAST),toggleAlt,"16","16",null);
-        }
-        String linkTag = HTMLUtils.getHTMLLinkTag(response,href,getToggleNodeActionTarget(),String.valueOf(nodeId_),toggleImageTag,null);
-        treeView.append(linkTag);
-      }
-      else
-      {
-        // <img...>
-        if (isLastChild)
-          toggleImageTag = HTMLUtils.getHTMLImageTag(response,nodeManager_.getController().getPathWithContext(NodeManager.PATH_LINE_LAST),"","16","16",null);
-        else
-          toggleImageTag = HTMLUtils.getHTMLImageTag(response,nodeManager_.getController().getPathWithContext(NodeManager.PATH_LINE_NOTLAST),"","16","16",null);
-        treeView.append(toggleImageTag);
-      }
-      treeView.append("</td>").append(HTMLUtils.LINE_SEPARATOR);
-    }
-  }
-
-  protected abstract String getLinkActionHref();
-
-  protected String getLinkActionTarget()
-  {
-    return FrameNames.PERSPECTIVE_WORKAREA;
-  }
-
-  public String getOpenImagePath()
-  {
-    return imagePath_;
-  }
-
-  public String getClosedImagePath()
-  {
-    return imagePath_;
-  }
-
-  protected void addHTMLLabel(HttpServletResponse response,StringBuffer treeView,boolean isLastChild)
-  {
-    // <a href="..." target="..." onClick="selectNode('...')"><img...></a>
-    Hashtable additionalAttributes = new Hashtable();
-    additionalAttributes.put("name",anchorName_);
-    String imagePath = (nodeManager_.getSelectedNodeId() == nodeId_)?getOpenImagePath():getClosedImagePath();
-
-    String imageTag = HTMLUtils.getHTMLImageTag(response,nodeManager_.getController().getPathWithContext(imagePath),"","16","16",additionalAttributes);
-    String baseHref = getLinkActionHref();
-    String href = ((baseHref == null)?baseHref:nodeManager_.getController().getPathWithContext(baseHref));
-    String target = getLinkActionTarget();
-    additionalAttributes.clear();
-
-    treeView.append("    <td align=\"left\" width=16 height=16 nowrap>");
-    if (href != null)
-      treeView.append(HTMLUtils.getHTMLLinkTag(response,href,target,null,imageTag,additionalAttributes));
-    else
-      treeView.append(imageTag);
-    treeView.append("</td>").append(HTMLUtils.LINE_SEPARATOR);
-    treeView.append("    <td align=\"left\" width=3 height=10 nowrap>").append(HTMLUtils.getHTMLImageTag(response,nodeManager_.getController().getPathWithContext(NodeManager.PATH_SPACE),"","3","10",null)).append("</td>").append(HTMLUtils.LINE_SEPARATOR);
-
-    // <a name="..." href="..." target="...">label</a>
-    treeView.append("    <td align=\"left\" nowrap>").append(HTMLUtils.LINE_SEPARATOR);
-    treeView.append("      ");
-    if (href != null)
-    {
-      String textAnchorClass;
-      if (nodeManager_.getSelectedNodeId() == nodeId_)
-        textAnchorClass="selectedTextAnchor";
-      else
-        textAnchorClass="unselectedTextAnchor";
-      additionalAttributes.put("class",textAnchorClass);
-      treeView.append(HTMLUtils.getHTMLLinkTag(response,href,target,anchorName_,getNodeName(),additionalAttributes));
-    }
-    else
-      treeView.append("<strong>").append(getNodeName()).append("</strong>");
-    treeView.append(HTMLUtils.LINE_SEPARATOR).append("    </td>").append(HTMLUtils.LINE_SEPARATOR);
-  }
-
-  public void renderNode(HttpServletResponse response,StringBuffer treeView,String prefixColumns,boolean isLastChild)
-  {
-    String space_16x16 = HTMLUtils.getHTMLImageTag(response,nodeManager_.getController().getPathWithContext(NodeManager.PATH_SPACE),"","16","16",null);
-    String line_16x16 = HTMLUtils.getHTMLImageTag(response,nodeManager_.getController().getPathWithContext(NodeManager.PATH_LINE),"","16","16",null);
-
-    // Use border=1 to help with debugging.
-    treeView.append("<table cellspacing=0 cellpadding=0 border=0>").append(HTMLUtils.LINE_SEPARATOR);
-    treeView.append("  <tr>").append(HTMLUtils.LINE_SEPARATOR);
-    treeView.append("    <td align=\"left\" width=16 height=16 nowrap>").append(space_16x16).append("</td>").append(HTMLUtils.LINE_SEPARATOR);
-    StringBuffer newPrefixColumns = new StringBuffer(prefixColumns);
-    if (nodeDepth_ >= 2)
-    {
-      if (prefixColumns.length() > 0)
-        treeView.append(prefixColumns).append(HTMLUtils.LINE_SEPARATOR);
-      // generate a new prefix columns.
-      newPrefixColumns.append("    <td align=\"left\" width=16 height=16 nowrap>");
-      if (isLastChild)
-        newPrefixColumns.append(space_16x16);
-      else
-        newPrefixColumns.append(line_16x16);
-      newPrefixColumns.append("</td>").append(HTMLUtils.LINE_SEPARATOR);
-    }
-    addToggle(response,treeView,isLastChild);
-    addHTMLLabel(response,treeView,isLastChild);
-    treeView.append("  </tr>").append(HTMLUtils.LINE_SEPARATOR);
-    treeView.append("</table>").append(HTMLUtils.LINE_SEPARATOR);
-    int numberOfChildNodes = childNodes_.size();
-    if (numberOfChildNodes > 0)
-    {
-      if (isOpen_)
-      {
-        for (int i=0;i<numberOfChildNodes-1;i++)
-        {
-          Node childNode = (Node)childNodes_.elementAt(i);
-          childNode.renderNode(response,treeView,newPrefixColumns.toString(),false);
-        }
-        Node lastChildNode = (Node)childNodes_.elementAt(numberOfChildNodes-1);
-        lastChildNode.renderNode(response,treeView,newPrefixColumns.toString(),true);
-      }
-    }
-  }
-
-  // For sorting purposes.  
-  public final String toString()
-  {
-    return getNodeName();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/NodeManager.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/NodeManager.java
deleted file mode 100644
index 6b23801e3..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/NodeManager.java
+++ /dev/null
@@ -1,253 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.perspective;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Vector;
-import javax.servlet.http.HttpServletResponse;
-
-public class NodeManager
-{
-  // paths to icon images
-  public static final String PATH_PLUS_NOTLAST = "images/plus_notlast.gif";
-  public static final String PATH_PLUS_LAST = "images/plus_last.gif";
-  public static final String PATH_MINUS_NOTLAST = "images/minus_notlast.gif";
-  public static final String PATH_MINUS_LAST = "images/minus_last.gif";
-  public static final String PATH_LINE = "images/line.gif";
-  public static final String PATH_LINE_NOTLAST = "images/line_notlast.gif";
-  public static final String PATH_LINE_LAST = "images/line_last.gif";
-  public static final String PATH_SPACE = "images/space.gif";
-
-  private Controller controller_;
-  private Node rootNode_;
-  private Hashtable nodeTable_;
-  private int focusedNodeId_;
-  private int selectedNodeId_;
-  private int previousSelectedNodeId_;
-  private int maxDepthVisible_;
-  private int nextId_;
-
-  public NodeManager(Controller controller)
-  {
-    controller_ = controller;
-    rootNode_ = null;
-    nodeTable_ = new Hashtable();
-    focusedNodeId_ = -1;
-    selectedNodeId_ = -1;
-    previousSelectedNodeId_ = -1;
-    maxDepthVisible_ = 1;
-    nextId_ = 0;
-  }
-
-  /**
-  * Hook for the controller.
-  * @return Controller The perspective controller.
-  */
-  public Controller getController()
-  {
-    return controller_;
-  }
-
-  /**
-  * Sets the root node of the tree.
-  * @param rootNode The node being designated as the root node.
-  */
-  public void setRootNode(Node rootNode)
-  {
-    rootNode_ = rootNode;
-  }
-
-  /**
-  * Returns the root node of the tree managed by this NodeManager.
-  * @return Node The root node.
-  */
-  public Node getRootNode()
-  {
-    return rootNode_;
-  }
-
-  /**
-  * @param Integer The id of the node being added.
-  * @param Node The node being added.
-  * @return The nodeId assigned to this node.
-  */
-  public int addToNodeTable(Node node)
-  {
-    int assignedNodeId = nextId_;
-    nodeTable_.put(String.valueOf(assignedNodeId),node);
-    nextId_++;
-    return assignedNodeId;
-  }
-
-  public void removeFromNodeTable(int nodeId)
-  {
-    Vector nodesToRemove = new Vector();
-    Node node = getNode(nodeId);
-    gatherNodesToRemove(nodesToRemove, node);
-    for (Iterator it = nodesToRemove.iterator(); it.hasNext();) {
-      nodeTable_.remove(String.valueOf(((Node)it.next()).getNodeId()));
-    }
-  }
-
-  private void gatherNodesToRemove(Vector nodesToRemove, Node node) {
-    if (node != null) {
-      nodesToRemove.add(node);
-      Vector childNodes = node.getChildNodes();
-      for (Iterator it = childNodes.iterator(); it.hasNext();) {
-        gatherNodesToRemove(nodesToRemove, (Node)it.next());
-      }
-    }
-  }
-
-  /**
-  * Returns the depth of the deepest visible node in the tree.
-  * @return int
-  */
-  public int getMaxDepthVisible()
-  {
-    return maxDepthVisible_;
-  }
-
-  /**
-  * Updates the depth of the deepest visible node in the tree. Nodes
-  * must call this when the visibility of their children changes.
-  * (e.g. expand/collapse of a parent node).
-  */
-  public void updateMaxDepthVisible()
-  {
-    if (rootNode_ != null)
-      maxDepthVisible_ = rootNode_.getMaxDepthVisible();
-  }
-
-  /**
-  * Returns the next available id for a newly created node.
-  * @return int
-  */
-  public int getNextNodeId()
-  {
-    return nextId_;
-  }
-
-  /**
-  * Returns the id of the currently focused node in the tree. A node
-  * becomes focused when any of the following events occur:
-  * 1) The node's icon or image are selected by a user.
-  * 2) The node's expand/collapse icon is clicked.
-  * 3) Programmatically set by the programmer.
-  * The treeview will always scroll to the current focused node when loaded.
-  * @return int The id.
-  */
-  public int getFocusedNodeId()
-  {
-    return focusedNodeId_;
-  }
-
-  /**
-  * Allows modification of the focused node.
-  * @param int The id of the node that is in focus.
-  */
-  public void setFocusedNodeId(int nodeId)
-  {
-    focusedNodeId_ = nodeId;
-  }
-
-  public Node getFocusedNode()
-  {
-    return getNode(focusedNodeId_);
-  }
-
-  /**
-  * Returns the id of the currently selected node in the tree.
-  * @return int The id.
-  */
-  public int getSelectedNodeId()
-  {
-    return selectedNodeId_;
-  }
-
-  public Node getSelectedNode()
-  {
-    return getNode(selectedNodeId_);
-  }
-
-  /**
-  * Retrieve a reference to a Node in this manager's node table.
-  * @return Node The node.
-  */
-  public Node getNode(int nodeId)
-  {
-    return (Node)nodeTable_.get(String.valueOf(nodeId));
-  }
-
-  /**
-  * Allows modification of the selected Node. Note that setting a node to become
-  * selected automatically makes it the focused node. However, this is only a one
-  * way relationship.
-  * @param int The id of the node that is being selected.
-  */
-  public void setSelectedNodeId(int nodeId)
-  {
-    previousSelectedNodeId_ = selectedNodeId_;
-    selectedNodeId_ = nodeId;
-    setFocusedNodeId(selectedNodeId_);
-  }
-
-  public int getPreviousSelectedNodeId()
-  {
-    return previousSelectedNodeId_;
-  }
-
-  public Node getPreviousSelectedNode()
-  {
-    return (Node)nodeTable_.get(String.valueOf(previousSelectedNodeId_));
-  }
-
-  /**
-  * Render the HTML tree view for this node.
-  * @param HttpServletResponse For encoding URLs.
-  * @return String The HTML representing the tree view.
-  */
-  public String renderTreeView(HttpServletResponse response)
-  {
-    StringBuffer treeView = new StringBuffer();
-    rootNode_.renderNode(response,treeView,"",false);
-    return treeView.toString();
-  }
-  
-  /**
-  * Make the provided node is visible by ensuring that its ancestors are visible.
-  * @param Node The node to be made visible.
-  * @return boolean Indicator for whether or not the treeview needs refreshing (i.e. an ancestor was not visible).
-  */
-  public final boolean makeNodeVisible(Node node)
-  {
-    boolean requiresTreeViewRefresh = false;
-    while ((node = node.getParent()) != null)
-    {
-      if (!node.isOpen())
-      {
-        requiresTreeViewRefresh = true;
-        node.setVisibilityOfChildren(true);
-      }
-    }
-    return requiresTreeViewRefresh;
-  }
-  
-  /**
-  * Make the currently selected node visible by ensuring that its ancestors are visible.
-  */
-  public final boolean makeSelectedNodeVisible()
-  {
-    return makeNodeVisible(getSelectedNode());
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Perspective.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Perspective.java
deleted file mode 100644
index e3f44222b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Perspective.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.perspective;
-
-import javax.servlet.ServletContext;
-
-public abstract class Perspective extends MessageProvider
-{
-  protected Controller controller_;
-  protected MessageQueue messageQueue_;
-
-  public Perspective(String messageBundleFileName,Controller controller)
-  {
-    super(messageBundleFileName);
-    controller_ = controller;
-    messageQueue_ = new MessageQueue();
-  }
-
-  public MessageQueue getMessageQueue()
-  {
-    return messageQueue_;
-  }
-
-  public Controller getController()
-  {
-    return controller_;
-  }
-
-  public abstract String getPanesFile();
-  public abstract String getFramesetsFile();
-  public abstract String getProcessFramesetsForm();
-
-  public abstract String getTreeContentVar();
-  public abstract String getTreeContentPage();
-  public abstract String getPropertiesContainerVar();
-  public abstract String getPropertiesContainerPage();
-  public abstract String getStatusContentVar();
-  public abstract String getStatusContentPage();
-
-  public abstract String getSwitchPerspectiveFormActionLink(int targetPerspectiveId,boolean forHistory);
-  public abstract String getPerspectiveContentPage();
-  public abstract int getPerspectiveId();
-
-  // This should only be called after the perspective has been successfully instantiated.
-  public abstract void initPerspective(ServletContext application);
-  
-  // Node manager for the navigator/tree content page
-  public abstract NodeManager getNodeManager();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/SectionHeaderInfo.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/SectionHeaderInfo.java
deleted file mode 100644
index 105f395c3..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/SectionHeaderInfo.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.ws.internal.explorer.platform.perspective;
-
-public class SectionHeaderInfo
-{
-  private String containerId_;
-  private boolean dynamic_;
-  private Object otherProperties_;
-
-  public SectionHeaderInfo()
-  {
-    clear();
-  }
-
-  public final void clear()
-  {
-    containerId_ = "";
-    dynamic_ = true;
-    otherProperties_ = null;
-  }
-
-  public final void setContainerId(String containerId)
-  {
-    containerId_ = containerId;
-  }
-
-  public final String getContainerId()
-  {
-    return containerId_;
-  }
-
-  public final void enableDynamic(boolean isEnabled)
-  {
-    dynamic_ = isEnabled;
-  }
-
-  public final boolean isDynamic()
-  {
-    return dynamic_;
-  }
-
-  public final void setOtherProperties(Object object)
-  {
-    otherProperties_ = object;
-  }
-
-  public final Object getOtherProperties()
-  {
-    return otherProperties_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/SetDefaultViewTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/SetDefaultViewTool.java
deleted file mode 100644
index b3ef1e7a0..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/SetDefaultViewTool.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-public abstract class SetDefaultViewTool extends ActionTool
-{
-  public SetDefaultViewTool(ToolManager viewToolManager,String alt)
-  {
-    super(viewToolManager,"images/top_enabled.gif","images/top_highlighted.gif",alt);
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Tool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Tool.java
deleted file mode 100644
index 6710fa319..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Tool.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.perspective;
-
-import java.util.Hashtable;
-import javax.servlet.http.HttpServletResponse;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.FrameNames;
-import org.eclipse.wst.ws.internal.explorer.platform.util.HTMLUtils;
-
-// A class for representing toolbar tools.
-public abstract class Tool
-{
-  protected ToolManager toolManager_;
-  private String enabledImageLink_;
-  private String highlightedImageLink_;
-  private String alt_;
-  protected int toolId_;
-  protected byte toolType_;
-
-  public Tool(ToolManager toolManager,String enabledImageLink,String highlightedImageLink,String alt,byte toolType)
-  {
-    toolManager_ = toolManager;
-    enabledImageLink_ = enabledImageLink;
-    highlightedImageLink_ = highlightedImageLink;
-    alt_ = alt;
-    toolId_ = toolManager_.addTool(this);
-    toolType_ = toolType;
-  }
-
-  public abstract String getSelectToolActionHref(boolean forHistory);
-
-  public String getSelectToolActionTarget()
-  {
-    return FrameNames.PERSPECTIVE_WORKAREA;
-  }
-
-  private final void generateOnMouseValue(StringBuffer value,HttpServletResponse response,String fullImageLink)
-  {
-    value.append("src='").append(response.encodeURL(fullImageLink)).append('\'');
-  }
-
-  public String renderTool(HttpServletResponse response,Controller controller)
-  {
-    Hashtable jsImageProperties = new Hashtable();
-    StringBuffer propertyValue = new StringBuffer();
-    String fullEnabledImageLink = controller.getPathWithContext(enabledImageLink_);
-    generateOnMouseValue(propertyValue,response,fullEnabledImageLink);
-    int propertyValueLength = propertyValue.length();
-    jsImageProperties.put("class","normal");
-    jsImageProperties.put("onMouseOut",propertyValue.append(";mouseout(this)").toString());
-    propertyValue.delete(propertyValueLength,propertyValue.length());
-    jsImageProperties.put("onMouseUp",propertyValue.append(";mouseup(this)").toString());
-    propertyValue.setLength(0);
-    generateOnMouseValue(propertyValue,response,controller.getPathWithContext(highlightedImageLink_));
-    propertyValueLength = propertyValue.length();
-    jsImageProperties.put("onMouseOver",propertyValue.append(";mouseover(this)").toString());
-    propertyValue.delete(propertyValueLength,propertyValue.length());
-    jsImageProperties.put("onMouseDOwn",propertyValue.append(";mousedown(this)").toString());
-
-    String imageTag = HTMLUtils.getHTMLImageTag(response,fullEnabledImageLink,alt_,"16","16",jsImageProperties);
-    return HTMLUtils.getHTMLLinkTag(response,controller.getPathWithContext(getSelectToolActionHref(false)),getSelectToolActionTarget(),null,imageTag,null);
-  }
-
-  public final ToolManager getToolManager()
-  {
-    return toolManager_;
-  }
-
-  public final int getToolId()
-  {
-    return toolId_;
-  }
-
-  public final byte getToolType()
-  {
-    return toolType_;
-  }
-  
-  public final String getEnabledImageLink()
-  {
-    return enabledImageLink_;
-  }
-  
-  public final String getHighlightedImageLink()
-  {
-    return highlightedImageLink_;
-  }
-  
-  public final String getAltText()
-  {
-    return alt_;
-  }
-
-  public abstract String getFormLink();
-  public abstract String getActionLink();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ToolManager.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ToolManager.java
deleted file mode 100644
index b5e24eb7c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ToolManager.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.ws.internal.explorer.platform.perspective;
-
-import java.util.List;
-import java.util.Vector;
-
-public class ToolManager
-{
-  private Vector tools_;
-  private int selectedToolId_;
-  private Node node_;
-
-  public ToolManager(Node node)
-  {
-    tools_ = new Vector();
-    selectedToolId_ = 0;
-    node_ = node;
-  }
-
-  public final int getSelectedToolId()
-  {
-    return selectedToolId_;
-  }
-
-  public final int setSelectedToolId(int toolId)
-  {
-    if (toolId >= 0 && toolId < tools_.size())
-      selectedToolId_ = toolId;
-    return selectedToolId_;
-  }
-
-  public final int addTool(Tool tool)
-  {
-    tools_.addElement(tool);
-    return tools_.size()-1;
-  }
-
-  public final Tool getTool(int toolId)
-  {
-    if (toolId >=0 && toolId < getNumberOfTools())
-      return (Tool)tools_.elementAt(toolId);
-    return null;
-  }
-  
-  public final List getTools()
-  {
-    return tools_;
-  }
-
-  public final Tool getSelectedTool()
-  {
-    if (selectedToolId_ >=0 && selectedToolId_ < getNumberOfTools())
-      return (Tool)tools_.elementAt(selectedToolId_);
-    return null;
-  }
-
-  public final int getNumberOfTools()
-  {
-    return tools_.size();
-  }
-
-  public final Node getNode()
-  {
-    return node_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ViewTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ViewTool.java
deleted file mode 100644
index 829013e91..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ViewTool.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ToolTypes;
-
-public abstract class ViewTool extends FormTool
-{
-  private Hashtable viewToolManagers_;
-
-  public ViewTool(ToolManager toolManager,String enabledImageLink,String highlightedImageLink,String alt)
-  {
-    super(toolManager,enabledImageLink,highlightedImageLink,alt);
-    toolType_ = ToolTypes.VIEW;
-    viewToolManagers_ = new Hashtable();
-  }
-
-  protected abstract void addSetDefaultViewTool(ToolManager viewToolManager,int index);
-  protected abstract void addTools(ToolManager viewToolManager,int index);
-
-  public final ToolManager createToolManager(int viewId)
-  {
-    ToolManager viewToolManager = new ToolManager(toolManager_.getNode());
-    addTools(viewToolManager,viewId);
-    addSetDefaultViewTool(viewToolManager,viewId);
-    viewToolManagers_.put(String.valueOf(viewId),viewToolManager);
-    return viewToolManager;
-  }
-
-  public final ToolManager getToolManager(int viewId)
-  {
-    return (ToolManager)(viewToolManagers_.get(String.valueOf(viewId)));
-  }
-
-  public final void clearViewToolManager(int viewId)
-  {
-    viewToolManagers_.remove(String.valueOf(viewId));
-  }
-
-  public final void clearViewToolManagers()
-  {
-    viewToolManagers_.clear();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddItemsToFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddItemsToFavoritesAction.java
deleted file mode 100644
index 09f0fc254..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddItemsToFavoritesAction.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.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-
-public class AddItemsToFavoritesAction extends UDDIPropertiesFormAction
-{
-  public AddItemsToFavoritesAction(Controller controller)
-  {
-    super(controller);
-  }
-  
-  protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    String[] selectedNodeIds = parser.getParameterValues(ActionInputs.NODEID);
-    // The client Javascript enforces the rule that at least one item was selected before the form can be submitted.
-    propertyTable_.put(UDDIActionInputs.SELECTED_NODEIDS,selectedNodeIds);
-    return true;
-  }
-  
-  public final boolean run()
-  {
-    String[] selectedNodeIds = (String[])propertyTable_.get(UDDIActionInputs.SELECTED_NODEIDS);
-    AddToFavoritesAction action = new AddToFavoritesAction(controller_);
-    Hashtable propertyTable = action.getPropertyTable();
-    for (int i=0;i<selectedNodeIds.length;i++)
-    {
-      propertyTable.put(ActionInputs.NODEID,selectedNodeIds[i]);
-      if (action.favoriteExists()) {
-        UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-        Node node = uddiPerspective.getNavigatorManager().getNode(Integer.parseInt(selectedNodeIds[i]));
-        String nodeName = node.getNodeName();
-        uddiPerspective.getMessageQueue().addMessage(uddiPerspective.getMessage("MSG_ERROR_FAVORITE_ALREADY_EXISTS",nodeName));
-      }
-      else
-        action.run();
-    }
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddPublisherAssertionsAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddPublisherAssertionsAction.java
deleted file mode 100644
index 081d6bfb2..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddPublisherAssertionsAction.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.ws.internal.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.MultipleFormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.assertion.PublisherAssertion;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.response.DispositionReport;
-import org.uddi4j.response.Result;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.util.KeyedReference;
-
-public class AddPublisherAssertionsAction extends CommonPublisherAssertionsAction
-{
-  public AddPublisherAssertionsAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  protected final boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    if (registryNode_ == null)
-      return false;
-
-    boolean inputsValid = true;
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    FormTool formTool = getSelectedFormTool();
-
-    // ids from uddiObjects_table.jsp
-    String[] selectedBusIds = parser.getParameterValues(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID);
-    if (selectedBusIds == null || selectedBusIds.length == 0) {
-      // Synchronize client view and server model (uddiObject_table.jsp)
-      synchronizeUDDIObjectTable();
-      inputsValid = false;
-    }
-    else {
-      propertyTable_.put(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID, selectedBusIds);
-      // Synchronize client view and server model (uddiObject_table.jsp)
-      synchronizeUDDIObjectTable();
-    }
-
-    String[] assertionTypes = parser.getParameterValues(UDDIActionInputs.PUBLISHER_ASSERTIONS_TYPE);
-    if (assertionTypes != null && assertionTypes.length > 0)
-      propertyTable_.put(UDDIActionInputs.PUBLISHER_ASSERTIONS_TYPE, assertionTypes);
-    else
-      inputsValid = false;
-
-    String[] directions = parser.getParameterValues(UDDIActionInputs.PUBLISHER_ASSERTIONS_DIRECTION);
-    if (directions != null && directions.length > 0)
-      propertyTable_.put(UDDIActionInputs.PUBLISHER_ASSERTIONS_DIRECTION, directions);
-    else
-      inputsValid = false;
-
-    // if not yet logged in, validate the parameters needed to log in
-    if (!isLoggedIn_) {
-      String publishURL = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-      String userID = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-      String password = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-
-      if (publishURL != null)
-      {
-        propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
-        formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
-      }
-  
-      if (!Validator.validateString(publishURL))
-      {
-        inputsValid = false;
-        formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_PUBLISH_URL"));
-      }
-
-      if (userID != null)
-      {
-        propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userID);
-        formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userID);
-      }
-  
-      if (!Validator.validateString(userID))
-      {
-        inputsValid = false;
-        formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_USERID"));
-      }
-
-      if (password != null)
-      {
-        propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
-        formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
-      }
-    }
-
-    return inputsValid;
-  }
-
-  public boolean run()
-  {
-    if (registryNode_ == null)
-      return false;
-
-    RegistryElement registryElement = (RegistryElement)registryNode_.getTreeElement();
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
-    Node selectedNode = navigatorManager.getSelectedNode();
-    TreeElement selectedElement = selectedNode.getTreeElement();
-
-    // if not yet logged in, log in first
-    if (!isLoggedIn_) {
-      String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-      String userID = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-      String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-
-      try {
-        registryElement.performLogin(publishURL, userID, password);
-      }
-      catch (TransportException te) {
-        messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-        messageQueue.addMessage("TransportException");
-        messageQueue.addMessage(te.getMessage());
-        return false;
-      }
-      catch (UDDIException uddie) {
-        messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-        messageQueue.addMessage("UDDIException");
-        messageQueue.addMessage(uddie.toString());
-        return false;
-      }
-      catch (MalformedURLException me) {
-        messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-        messageQueue.addMessage("MalformedURLException");
-        messageQueue.addMessage(me.getMessage());
-        return false;
-      }
-    }
-
-    UDDIProxy proxy = registryElement.getProxy();
-    registryElement.getUserId();
-    registryElement.getCred();
-    BusinessElement busElement = (BusinessElement)selectedElement;
-
-    // determine whether this is a owned business
-    // if not, the AddPublisherAssertionsAction cannot be performed
-    if (!isBusinessOwned(busElement)) {
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_NOT_OWNED_BUSINESS"));
-        return false;
-    }
-
-    try {
-      String[] assertionTypes = (String[])propertyTable_.get(UDDIActionInputs.PUBLISHER_ASSERTIONS_TYPE);
-      String[] directions = (String[])propertyTable_.get(UDDIActionInputs.PUBLISHER_ASSERTIONS_DIRECTION);
-      String thisBusinessKey = busElement.getBusinessEntity().getBusinessKey();
-
-      // get all selected businesses
-      FormTool formTool = (FormTool)(selectedNode.getCurrentToolManager().getSelectedTool());
-      String subQueryKey = (String)formTool.getProperty(UDDIActionInputs.SUBQUERY_KEY);
-      FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKey);
-      Vector selectedBusinesses = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADD_PUBLISHER_ASSERTIONS);
-      Enumeration e = selectedBusinesses.elements();
-      if (!e.hasMoreElements())
-        return true;
-
-      // create a vector of publisher assertions based on all the selected businesses
-      Vector pubAssertionVector = new Vector();
-      int i = 0;
-      while (e.hasMoreElements()) {
-        ListElement le = (ListElement)e.nextElement();
-        BusinessEntity sp = (BusinessEntity)le.getObject();
-        KeyedReference keyedRef = new KeyedReference(assertionTypes[i], assertionTypes[i], TModel.RELATIONSHIPS_TMODEL_KEY);
-        if (Integer.parseInt(directions[i]) == UDDIActionInputs.DIRECTION_TO)
-          pubAssertionVector.add(new PublisherAssertion(sp.getBusinessKey(), thisBusinessKey, keyedRef));
-        else
-          pubAssertionVector.add(new PublisherAssertion(thisBusinessKey, sp.getBusinessKey(), keyedRef));
-        i++;
-      }
-
-      // proxy.add_publisherAssertions(...)
-      DispositionReport report = proxy.add_publisherAssertions(registryElement.getAuthInfoString(), pubAssertionVector);
-
-      // refresh publisher assertions iff proxy reports success
-      if (report.success()) {
-        selectedBusinesses.removeAllElements();
-        ShowPublisherAssertionsAction showPAAction = new ShowPublisherAssertionsAction(controller_);
-        Hashtable propertyTable = showPAAction.getPropertyTable();
-        Object ids = propertyTable_.get(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID);
-        if (ids != null)
-          propertyTable.put(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID, ids);
-        showPAAction.run();
-      }
-
-      return report.success();
-    }
-    catch (UDDIException uddie) {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("UDDIException");
-      DispositionReport report = uddie.getDispositionReport();
-	  Vector reportErrInfo = report.getResultVector();
-      for (int i = 0; i < reportErrInfo.size(); i++) {
-        messageQueue.addMessage(((Result) reportErrInfo.get(i)).getErrInfo().getText());
-      }
-      return false;
-    }
-    catch(Exception e) {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("Exception");
-      messageQueue.addMessage(e.getMessage());
-      return false;
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddToFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddToFavoritesAction.java
deleted file mode 100644
index b3d8b0f6a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddToFavoritesAction.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.ws.internal.explorer.platform.uddi.actions;
-
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.CategoryModel;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceInterfaceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.BusinessNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegistryNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.ServiceInterfaceNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.ServiceNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-
-public class AddToFavoritesAction extends UDDINodeAction
-{
-  public AddToFavoritesAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  public static String getActionLink(int nodeId)
-  {
-    StringBuffer actionLink = new StringBuffer("uddi/actions/CheckFavoriteExistsActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
-    return actionLink.toString();
-  }
-
-  public final boolean registryExists(String registryName,Node registryNode)
-  {
-    registryNode.getTreeElement();
-    Hashtable table = new Hashtable();
-    table.put(FavoritesModelConstants.PROP_UDDI_REGISTRY_NAME,registryName);
-    return favoriteExists(table,FavoritesModelConstants.REL_UDDI_REGISTRY_FOLDER_NODE);
-  }
-
-  public final boolean businessExists(String businessName,Node businessNode)
-  {
-    BusinessElement busElement = (BusinessElement)businessNode.getTreeElement();
-    RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-    String businessKey = busElement.getBusinessEntity().getBusinessKey();
-    String inquiryURL = regElement.getInquiryURL();
-    Hashtable table = new Hashtable();
-    table.put(FavoritesModelConstants.PROP_UDDI_BUSINESS_NAME,businessName);
-    table.put(FavoritesModelConstants.PROP_UDDI_BUSINESS_INQUIRY_API,inquiryURL);
-    table.put(FavoritesModelConstants.PROP_UDDI_BUSINESS_KEY, businessKey);
-    return favoriteExists(table,FavoritesModelConstants.REL_UDDI_BUSINESS_FOLDER_NODE);
-  }
-
-   public final boolean serviceExists(String serviceName,Node serviceNode)
-  {
-    ServiceElement serviceElement = (ServiceElement)serviceNode.getTreeElement();
-    RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-    String serviceKey = serviceElement.getBusinessService().getServiceKey();
-    String inquiryURL = regElement.getInquiryURL();
-    Hashtable table = new Hashtable();
-    table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_NAME,serviceName);
-    table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_INQUIRY_API,inquiryURL);
-    table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_KEY,serviceKey);
-    return favoriteExists(table,FavoritesModelConstants.REL_UDDI_SERVICE_FOLDER_NODE);
-  }
-
-  public final boolean serviceInterfaceExists(String siName,Node siNode)
-  {
-    ServiceInterfaceElement siElement = (ServiceInterfaceElement)siNode.getTreeElement();
-    RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-    String tModelKey = siElement.getTModel().getTModelKey();
-    String inquiryURL = regElement.getInquiryURL();
-    Hashtable table = new Hashtable();
-    table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_INTERFACE_NAME,siName);
-    table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_INTERFACE_INQUIRY_API,inquiryURL);
-    table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_INTERFACE_KEY,tModelKey);
-    return favoriteExists(table,FavoritesModelConstants.REL_UDDI_SERVICE_INTERFACE_FOLDER_NODE);
-  }
-
-  public final boolean addRegistryToFavorites(String registryName,Node registryNode)
-  {
-    RegistryElement regElement = (RegistryElement)registryNode.getTreeElement();
-    String inquiryURL = regElement.getInquiryURL();
-    String publishURL = regElement.getPublishURL();
-    if (publishURL == null)
-      publishURL = "";
-    Hashtable table = new Hashtable();
-    table.put(FavoritesModelConstants.PROP_UDDI_REGISTRY_PUBLISH_API,publishURL);
-    table.put(FavoritesModelConstants.PROP_UDDI_REGISTRY_INQUIRY_API,inquiryURL);
-    table.put(FavoritesModelConstants.PROP_UDDI_REGISTRY_NAME,registryName);
-    Enumeration userDefinedCategoriesEnum = regElement.getUserDefinedCategories();
-    if (userDefinedCategoriesEnum != null)
-    {
-      table.put(FavoritesModelConstants.PROP_UDDI_REGISTRY_CATEGORIES_ENUM,userDefinedCategoriesEnum);
-      table.put(FavoritesModelConstants.PROP_PLUGIN_METADATA_DIRECTORY,controller_.getServletEngineStateLocation());
-    }
-    return addToFavorites(table,FavoritesModelConstants.REL_UDDI_REGISTRY_FOLDER_NODE);
-  }
-
-  public final boolean addBusinessToFavorites(String businessName,Node businessNode)
-  {
-    BusinessElement busElement = (BusinessElement)businessNode.getTreeElement();
-    RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-    String businessKey = busElement.getBusinessEntity().getBusinessKey();
-    String inquiryURL = regElement.getInquiryURL();
-    Hashtable table = new Hashtable();
-    table.put(FavoritesModelConstants.PROP_UDDI_BUSINESS_NAME,businessName);
-    table.put(FavoritesModelConstants.PROP_UDDI_BUSINESS_INQUIRY_API,inquiryURL);
-    table.put(FavoritesModelConstants.PROP_UDDI_BUSINESS_KEY, businessKey);
-    return addToFavorites(table,FavoritesModelConstants.REL_UDDI_BUSINESS_FOLDER_NODE);
-  }
-  
-  public final boolean addServiceToFavorites(String serviceName,Node serviceNode)
-  {
-    ServiceElement serviceElement = (ServiceElement)serviceNode.getTreeElement();
-    RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-    String serviceKey = serviceElement.getBusinessService().getServiceKey();
-    String inquiryURL = regElement.getInquiryURL();
-    Hashtable table = new Hashtable();
-    table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_NAME,serviceName);
-    table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_INQUIRY_API,inquiryURL);
-    table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_KEY,serviceKey);
-    return addToFavorites(table,FavoritesModelConstants.REL_UDDI_SERVICE_FOLDER_NODE);
-  }
-  
-  public final boolean addServiceInterfaceToFavorites(String siName,Node siNode)
-  {
-    ServiceInterfaceElement siElement = (ServiceInterfaceElement)siNode.getTreeElement();
-    RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-    String tModelKey = siElement.getTModel().getTModelKey();
-    String inquiryURL = regElement.getInquiryURL();
-    Hashtable table = new Hashtable();
-    table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_INTERFACE_NAME,siName);
-    table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_INTERFACE_INQUIRY_API,inquiryURL);
-    table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_INTERFACE_KEY,tModelKey);
-    return addToFavorites(table,FavoritesModelConstants.REL_UDDI_SERVICE_INTERFACE_FOLDER_NODE);
-  }
-
-  public boolean favoriteExists()
-  {
-    int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-    Node node = nodeManager_.getNode(nodeId);
-    String nodeName = node.getNodeName();
-    if (node instanceof RegistryNode)
-      return registryExists(nodeName,node);
-    else if (node instanceof BusinessNode)
-      return businessExists(nodeName,node);
-    else if (node instanceof ServiceNode)
-      return serviceExists(nodeName,node);
-    else if (node instanceof ServiceInterfaceNode)
-      return serviceInterfaceExists(nodeName,node);
-    else
-      return false;
-  }
-
-  public boolean run()
-  {
-    int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-    Node node = nodeManager_.getNode(nodeId);
-    String nodeName = node.getNodeName();
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    boolean addToFavoritesResult = false;
-    if (node instanceof RegistryNode)
-    {
-      addToFavoritesResult = addRegistryToFavorites(nodeName,node);
-      RegistryElement regElement = (RegistryElement)node.getTreeElement();
-      Enumeration e = regElement.getUserDefinedCategories();
-      if (e != null)
-      {
-        while (e.hasMoreElements())
-        {
-          CategoryModel categoryModel = (CategoryModel)e.nextElement();
-          Throwable errorException = categoryModel.getErrorException();
-          if (errorException != null)
-          {
-            String[] args = {categoryModel.getDisplayName(),errorException.getMessage()};
-            messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_SAVING_CATEGORY_DATA",args));
-          }
-        }
-      }
-    }
-    else if (node instanceof BusinessNode)
-      addToFavoritesResult = addBusinessToFavorites(nodeName,node);
-    else if (node instanceof ServiceNode)
-      addToFavoritesResult = addServiceToFavorites(nodeName,node);
-    else if (node instanceof ServiceInterfaceNode)
-      addToFavoritesResult = addServiceInterfaceToFavorites(nodeName,node);
-    if (addToFavoritesResult)
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_FAVORITE_ADDED",nodeName));
-    else
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_FAVORITE_NOT_ADDED",nodeName));
-    return addToFavoritesResult;      
-  }
-  
-  protected boolean addToFavorites(Hashtable table, String rel)
-  {
-    FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
-    NodeManager favNodeManager = favPerspective.getNodeManager();
-    TreeElement favRootElement = favNodeManager.getRootNode().getTreeElement();
-    Enumeration e = favRootElement.getElements(rel);
-    if (!e.hasMoreElements())
-      return false;
-    FavoritesFolderElement favFolderElement = (FavoritesFolderElement)e.nextElement();
-    return favFolderElement.addFavorite(table);
-  }
-
-  protected boolean favoriteExists(Hashtable table, String rel)
-  {
-    FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
-    NodeManager favNodeManager = favPerspective.getNodeManager();
-    TreeElement favRootElement = favNodeManager.getRootNode().getTreeElement();
-    Enumeration e = favRootElement.getElements(rel);
-    if (!e.hasMoreElements())
-      return false;
-    FavoritesFolderElement favFolderElement = (FavoritesFolderElement)e.nextElement();
-    return favFolderElement.favoriteExists(table);
-  }
-  
-  public final String getActionLinkForHistory()
-  {
-    return null;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusPublishServiceAdvancedAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusPublishServiceAdvancedAction.java
deleted file mode 100644
index 4a8dc5072..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusPublishServiceAdvancedAction.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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.uddi4j.datatype.business.BusinessEntity;
-
-public class BusPublishServiceAdvancedAction extends PublishAction
-{
-  private RegPublishServiceAdvancedAction regPublishServiceAdvancedAction_;
-  public BusPublishServiceAdvancedAction(Controller controller)
-  {
-    super(controller);
-    regPublishServiceAdvancedAction_ = new RegPublishServiceAdvancedAction(controller);
-    propertyTable_ = regPublishServiceAdvancedAction_.getPropertyTable();
-  }
-
-  protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
-  {
-    Node businessNode = getSelectedNavigatorNode();
-    BusinessElement businessElement = (BusinessElement)businessNode.getTreeElement();
-    BusinessEntity businessEntity = businessElement.getBusinessEntity();
-    ListElement busListElement = new ListElement(businessEntity);
-    Vector serviceBusinessCopy = new Vector();
-    serviceBusinessCopy.addElement(busListElement);
-    formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS_COPY,serviceBusinessCopy);
-    boolean result = regPublishServiceAdvancedAction_.processOthers(parser,formToolPI);
-    if (!propertyTable_.containsKey(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_PROVIDER))
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_PROVIDER,businessEntity);
-    return result;
-  }
-
-  public final boolean run()
-  {
-    return regPublishServiceAdvancedAction_.run();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusPublishServiceSimpleAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusPublishServiceSimpleAction.java
deleted file mode 100644
index 31c369166..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusPublishServiceSimpleAction.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.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.uddi4j.datatype.business.BusinessEntity;
-
-public class BusPublishServiceSimpleAction extends PublishAction
-{
-  private RegPublishServiceSimpleAction regPublishServiceSimpleAction_;
-
-  public BusPublishServiceSimpleAction(Controller controller)
-  {
-    super(controller);
-    regPublishServiceSimpleAction_ = new RegPublishServiceSimpleAction(controller);
-    propertyTable_ = regPublishServiceSimpleAction_.getPropertyTable();
-  }
-
-  protected boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
-  {
-    Node businessNode = getSelectedNavigatorNode();
-    BusinessElement businessElement = (BusinessElement)businessNode.getTreeElement();
-    BusinessEntity businessEntity = businessElement.getBusinessEntity();
-    ListElement busListElement = new ListElement(businessEntity);
-    Vector serviceBusinessCopy = new Vector();
-    serviceBusinessCopy.addElement(busListElement);
-    formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_BUSINESS_COPY,serviceBusinessCopy); 
-    boolean result = regPublishServiceSimpleAction_.processOthers(parser,formToolPI);
-    if (!propertyTable_.containsKey(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_SERVICE_PROVIDER))
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_SERVICE_PROVIDER,businessEntity);
-    return result;
-  }
-
-  public final boolean run()
-  {
-    return regPublishServiceSimpleAction_.run();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusinessGetServicesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusinessGetServicesAction.java
deleted file mode 100644
index f15ee0d33..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusinessGetServicesAction.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.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.BusinessNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.uddi4j.datatype.business.BusinessEntity;
-
-public class BusinessGetServicesAction extends UDDINodeAction
-{
-  private BusinessNode busNode_;
-  public BusinessGetServicesAction(Controller controller)
-  {
-    super(controller);
-    busNode_ = null;
-  }
-
-  // uddi/actions/BusinessGetServicesActionJSP.jsp?nodeId=...
-  public static String getActionLink(int nodeId)
-  {
-    StringBuffer actionLink = new StringBuffer("uddi/actions/BusinessGetServicesActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
-    return actionLink.toString();
-  }
-
-  public final boolean validateBusiness()
-  {
-    int busNodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-    busNode_ = (BusinessNode)nodeManager_.getNode(busNodeId);
-    BusinessElement busElement = (BusinessElement)busNode_.getTreeElement();
-    RegFindBusinessUUIDAction verifyAction = new RegFindBusinessUUIDAction(controller_);
-    Hashtable propertyTable = verifyAction.getPropertyTable();
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE,Boolean.TRUE);
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY,busElement.getBusinessEntity().getBusinessKey());
-    boolean result = verifyAction.run();
-    if (result)
-      propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,propertyTable.get(UDDIActionInputs.LATEST_OBJECT));
-    return result;
-  }
-    
-  public final String getActionLinkForHistory()
-  {
-    return null;
-  }
-
-  public final boolean run()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    BusinessEntity sp = (BusinessEntity)propertyTable_.get(UDDIActionInputs.LATEST_OBJECT);
-
-    RegFindServicesAdvancedAction action = new RegFindServicesAdvancedAction(controller_);
-    Hashtable propertyTable = action.getPropertyTable();
-    propertyTable.put(UDDIActionInputs.QUERY_NAME,uddiPerspective.getMessage("NODE_NAME_BUSINESS_SERVICES",busNode_.getNodeName()));
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_PROVIDER,sp);    
-    
-    ListElement businessListElement = new ListElement(sp);
-    businessListElement.setTargetViewToolInfo(busNode_.getNodeId(),busNode_.getToolManager().getSelectedToolId(),busNode_.getViewId());
-    Vector businessListVector = new Vector();
-    businessListVector.addElement(businessListElement);
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS,businessListVector);
-    
-    
-    return action.run();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorFolderNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorFolderNodeAction.java
deleted file mode 100644
index d58061fb7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorFolderNodeAction.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-
-public class ClearNavigatorFolderNodeAction extends ClearNavigatorNodeAction
-{
-  public ClearNavigatorFolderNodeAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  // uddi/actions/ClearNavigatorFolderNodeAction.jsp?nodeId=...
-  public static String getActionLink(int nodeId)
-  {
-    StringBuffer actionLink = new StringBuffer("uddi/actions/ClearNavigatorFolderNodeActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
-    return actionLink.toString();
-  }
-
-  public final boolean run()
-  {
-    int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-    if (!isStaleNode(nodeId))
-    {
-      Node node = nodeManager_.getNode(nodeId);
-      TreeElement element = node.getTreeElement();
-      element.disconnectRel(element.getPropertyAsString(ModelConstants.REL_CHILDREN));
-    }
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorNodeAction.java
deleted file mode 100644
index c9bdf423e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorNodeAction.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ClearNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-
-public class ClearNavigatorNodeAction extends ClearNodeAction
-{
-  public ClearNavigatorNodeAction(Controller controller)
-  {
-    super(controller,controller.getUDDIPerspective().getNavigatorManager());
-    propertyTable_.put(ActionInputs.NODEID,String.valueOf(controller.getUDDIPerspective().getNavigatorManager().getSelectedNodeId()));
-  }
-
-  // uddi/actions/ClearNavigatorNodeAction.jsp?nodeId=...
-  public static String getActionLink(int nodeId)
-  {
-    StringBuffer actionLink = new StringBuffer("uddi/actions/ClearNavigatorNodeActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
-    return actionLink.toString();
-  }
-
-  public final String getTreeContentVar()
-  {
-    return "navigatorContent";
-  }
-
-  public final String getTreeContentPage()
-  {
-    return "uddi/navigator_content.jsp";
-  }
-
-  public final String getPropertiesContainerVar()
-  {
-    return "propertiesContainer";
-  }
-
-  public final String getPropertiesContainerPage()
-  {
-    return "uddi/properties_container.jsp";
-  }
-
-  public final String getStatusContentVar()
-  {
-    return "statusContent";
-  }
-
-  public final String getStatusContentPage()
-  {
-    return "uddi/status_content.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorNodesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorNodesAction.java
deleted file mode 100644
index 5ba7b22f6..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorNodesAction.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.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-
-public class ClearNavigatorNodesAction extends UDDIPropertiesFormAction
-{
-  public ClearNavigatorNodesAction(Controller controller)
-  {
-    super(controller);
-  }
-  
-  protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    String[] selectedNodeIds = parser.getParameterValues(ActionInputs.NODEID);
-    if (selectedNodeIds != null)
-      propertyTable_.put(UDDIActionInputs.SELECTED_NODEIDS,selectedNodeIds);
-    else
-      removeProperty(UDDIActionInputs.SELECTED_NODEIDS);
-    return true;
-  }
-  
-  public final boolean run()
-  {
-    String[] selectedNodeIds = (String[])propertyTable_.get(UDDIActionInputs.SELECTED_NODEIDS);
-    if (selectedNodeIds != null)
-    {
-      ClearNavigatorNodeAction action = new ClearNavigatorNodeAction(controller_);
-      Hashtable propertyTable = action.getPropertyTable();
-      for (int i=0;i<selectedNodeIds.length;i++)
-      {
-        propertyTable.put(ActionInputs.NODEID,selectedNodeIds[i]);
-        action.run();
-      }
-    }
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/CommonPublisherAssertionsAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/CommonPublisherAssertionsAction.java
deleted file mode 100644
index 1920119e2..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/CommonPublisherAssertionsAction.java
+++ /dev/null
@@ -1,103 +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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.MultipleFormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegistryNode;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.response.BusinessInfo;
-import org.uddi4j.response.RegisteredInfo;
-
-public abstract class CommonPublisherAssertionsAction extends UDDIPropertiesFormAction
-{
-
-  protected RegistryNode registryNode_;
-  protected boolean isLoggedIn_;
-
-  public CommonPublisherAssertionsAction(Controller controller)
-  {
-    super(controller);
-
-    registryNode_ = getRegistryNode();
-    if (registryNode_ != null)
-      isLoggedIn_ = ((RegistryElement)registryNode_.getTreeElement()).isLoggedIn();
-  }
-
-  protected void synchronizeUDDIObjectTable() {
-    String[] selectedBusIds = (String[])propertyTable_.get(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID);
-    Node selectedNode = controller_.getUDDIPerspective().getNavigatorManager().getSelectedNode();
-    FormTool formTool = (FormTool)(selectedNode.getCurrentToolManager().getSelectedTool());
-    String subQueryKey = (String)formTool.getProperty(UDDIActionInputs.SUBQUERY_KEY);
-    FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKey);
-    Vector businessVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADD_PUBLISHER_ASSERTIONS);
-    ListManager businessCopy = (ListManager)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADD_PUBLISHER_ASSERTIONS_COPY);
-    if (selectedBusIds == null || selectedBusIds.length <= 0) {
-      businessVector.removeAllElements();
-      businessCopy.clear();
-    }
-    Enumeration e = businessCopy.getListElements();
-    while (e.hasMoreElements()) {
-      boolean isIdFound = false;
-      ListElement le = (ListElement)e.nextElement();
-      int listElementViewId = le.getViewId();
-      for (int i = 0; i < selectedBusIds.length; i++) {
-        if (listElementViewId == Integer.parseInt(selectedBusIds[i])) {
-          isIdFound = true;
-          break;
-        }
-      }
-      if (!isIdFound)
-        businessVector.remove(le);
-    }
-  }
-
-  protected boolean isBusinessOwned(BusinessElement busElement) {
-    boolean isBusinessOwned = false;
-    String isBusinessOwnedString = busElement.getPropertyAsString(UDDIModelConstants.IS_BUSINESS_OWNED);
-    if (isBusinessOwnedString != null) {
-      isBusinessOwned = Boolean.valueOf(isBusinessOwnedString).booleanValue();
-    }
-    else if (isLoggedIn_) {
-      try {
-        RegistryElement regElement = (RegistryElement)registryNode_.getTreeElement();
-        UDDIProxy proxy = regElement.getProxy();
-        RegisteredInfo ri = proxy.get_registeredInfo(regElement.getAuthInfoString());
-        Vector beVector = ri.getBusinessInfos().getBusinessInfoVector();
-        for (Iterator it = beVector.iterator(); it.hasNext();)
-        { 
-          BusinessInfo bi = (BusinessInfo)it.next();
-          if (bi.getBusinessKey().equals(busElement.getBusinessEntity().getBusinessKey()))
-          {  
-            isBusinessOwned = true;
-            break;
-          }
-        }
-        busElement.setPropertyAsString(UDDIModelConstants.IS_BUSINESS_OWNED, String.valueOf(isBusinessOwned));
-      }
-      catch (Exception e) {}
-    }
-    return isBusinessOwned;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/CompletePublisherAssertionsAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/CompletePublisherAssertionsAction.java
deleted file mode 100644
index 6a00853d7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/CompletePublisherAssertionsAction.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListManager;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.PublisherAssertionElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.response.CompletionStatus;
-import org.uddi4j.response.DispositionReport;
-import org.uddi4j.response.Result;
-import org.uddi4j.transport.TransportException;
-
-public class CompletePublisherAssertionsAction extends CommonPublisherAssertionsAction
-{
-  public CompletePublisherAssertionsAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  protected final boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    if (registryNode_ == null)
-      return false;
-
-    boolean inputsValid = true;
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    FormTool formTool = getSelectedFormTool();
-
-    // ids from uddiObjects_table
-    String[] selectedBusIds = parser.getParameterValues(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID);
-    if (selectedBusIds != null && selectedBusIds.length > 0)
-      propertyTable_.put(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID, selectedBusIds);
-    // Synchronize client view and server model (uddiObject_table.jsp)
-    synchronizeUDDIObjectTable();
-
-    // if not yet logged in, validate the parameters needed to log in
-    if (!isLoggedIn_) {
-      String publishURL = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-      String userID = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-      String password = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-
-      if (publishURL != null)
-      {
-        propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
-        formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
-      }
-  
-      if (!Validator.validateString(publishURL))
-      {
-        inputsValid = false;
-        formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_PUBLISH_URL"));
-      }
-
-      if (userID != null)
-      {
-        propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userID);
-        formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userID);
-      }
-  
-      if (!Validator.validateString(userID))
-      {
-        inputsValid = false;
-        formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_USERID"));
-      }
-
-      if (password != null)
-      {
-        propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
-        formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
-      }
-    }
-
-    // ids from publisher assertion table
-    String[] pubAssertionsViewIds = parser.getParameterValues(UDDIActionInputs.PUBLISHER_ASSERTIONS_VIEWID);
-    if (pubAssertionsViewIds == null || pubAssertionsViewIds.length == 0)
-      inputsValid = false;
-    else
-      propertyTable_.put(UDDIActionInputs.PUBLISHER_ASSERTIONS_VIEWID, pubAssertionsViewIds);
-
-    return inputsValid;
-  }
-
-  public boolean run()
-  {
-    if (registryNode_ == null)
-      return false;
-
-    RegistryElement registryElement = (RegistryElement)registryNode_.getTreeElement();
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
-    Node selectedNode = navigatorManager.getSelectedNode();
-    TreeElement selectedElement = selectedNode.getTreeElement();
-
-    // if not yet logged in, log in first
-    if (!isLoggedIn_) {
-      String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-      String userID = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-      String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-
-      try {
-        registryElement.performLogin(publishURL, userID, password);
-      }
-      catch (TransportException te) {
-        messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-        messageQueue.addMessage("TransportException");
-        messageQueue.addMessage(te.getMessage());
-        return false;
-      }
-      catch (UDDIException uddie) {
-        messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-        messageQueue.addMessage("UDDIException");
-        messageQueue.addMessage(uddie.toString());
-        return false;
-      }
-      catch (MalformedURLException me) {
-        messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-        messageQueue.addMessage("MalformedURLException");
-        messageQueue.addMessage(me.getMessage());
-        return false;
-      }      
-    }
-
-    UDDIProxy proxy = registryElement.getProxy();
-    registryElement.getUserId();
-    registryElement.getCred();
-    BusinessElement busElement = (BusinessElement)selectedElement;
-    ListManager pubAssertions = busElement.getPublisherAssertions();
-
-    // determine whether this is a owned business
-    // if not, the AddPublisherAssertionsAction cannot be performed
-    if (!isBusinessOwned(busElement)) {
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_NOT_OWNED_BUSINESS"));
-        return false;
-    }
-
-    try {
-      String[] pubAssertionViewIds = (String[])propertyTable_.get(UDDIActionInputs.PUBLISHER_ASSERTIONS_VIEWID);
-      Vector pubAssertionVector = new Vector();
-
-      for (int i = 0; i < pubAssertionViewIds.length; i++) {
-        int viewID = Integer.parseInt(pubAssertionViewIds[i]);
-        ListElement listElement = pubAssertions.getElementWithViewId(viewID);
-        PublisherAssertionElement pubAssertionElement = (PublisherAssertionElement)listElement.getObject();
-        if (!(pubAssertionElement.getStatus().equals(CompletionStatus.COMPLETE)))
-          pubAssertionVector.add(pubAssertionElement.getPublisherAssertion());
-      }
-
-      if (pubAssertionVector.size() <= 0) {
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_NO_INCOMPLETE_ASSERTION_SELECTED"));
-        return false;
-      }
-
-      DispositionReport report = proxy.add_publisherAssertions(registryElement.getAuthInfoString(), pubAssertionVector);
-      //report status
-	  Vector reportErrInfo = report.getResultVector();
-      for (int j = 0; j < reportErrInfo.size(); j++) {
-        messageQueue.addMessage(((Result) reportErrInfo.get(j)).getErrInfo().getText());
-      }
-
-      ShowPublisherAssertionsAction showPAAction = new ShowPublisherAssertionsAction(controller_);
-      Hashtable propertyTable = showPAAction.getPropertyTable();
-      Object ids = propertyTable_.get(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID);
-      if (ids != null)
-        propertyTable.put(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID, ids);
-      showPAAction.run();
-
-      return report.success();
-    }
-    catch (UDDIException uddie) {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("UDDIException");
-      DispositionReport report = uddie.getDispositionReport();
-	  Vector reportErrInfo = report.getResultVector();
-      for (int j = 0; j < reportErrInfo.size(); j++) {
-        messageQueue.addMessage(((Result) reportErrInfo.get(j)).getErrInfo().getText());
-      }
-      return false;
-    }
-    catch (Exception e) {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("Exception");
-      messageQueue.addMessage(e.getMessage());
-      return false;
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/FindAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/FindAction.java
deleted file mode 100644
index 2cde5503b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/FindAction.java
+++ /dev/null
@@ -1,266 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.uddi.actions;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.MultipartFormDataParserTransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryParentElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.MultipleFormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.QueryNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegistryNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.SubQueryTransferTarget;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-
-public abstract class FindAction extends UDDIPropertiesFormAction
-{
-  protected QueryElement queryElement_;
-  protected String subQueryKey_;
-  protected boolean isSubQueryGet_;
-  protected String newSubQuery_;
-  protected String newSubQueryItem_;
-  protected boolean subQueryInitiated_;
-  protected RegistryNode regNode_;
-  private boolean isRefreshAction_;
-
-  public FindAction(Controller controller)
-  {
-    super(controller);
-    queryElement_ = null;
-    subQueryKey_ = null;
-    isSubQueryGet_ = false;
-    subQueryInitiated_ = false;
-    regNode_ = getRegistryNode();
-    isRefreshAction_ = false;
-  }
-
-  protected abstract boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException;
-
-  protected final boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    // Setup for MultipartFormDataParserTransformer
-    propertyTable_.put(ActionInputs.MULTIPART_FORM_DATA_PARSER, parser);
-
-    newSubQuery_ = parser.getParameter(UDDIActionInputs.NEW_SUBQUERY_INITIATED);
-    String isSubQueryGetString = parser.getParameter(UDDIActionInputs.SUBQUERY_GET);
-    newSubQueryItem_ = parser.getParameter(UDDIActionInputs.NEW_SUBQUERY_QUERY_ITEM);
-    subQueryKey_ = parser.getParameter(UDDIActionInputs.SUBQUERY_KEY);
-    String queryName = parser.getParameter(UDDIActionInputs.QUERY_NAME);
-
-    // Validate the data.
-    boolean inputsValid = true;
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
-    FormTool formTool = getSelectedFormTool();
-    FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKey_);
-    formToolPI.clearErrors();
-
-    if (newSubQuery_ != null && newSubQuery_.length() > 0)
-      subQueryInitiated_ = true;
-    else
-      subQueryInitiated_ = false;
-      
-    if (isSubQueryGetString != null)
-      isSubQueryGet_ = Boolean.valueOf(isSubQueryGetString).booleanValue();
-
-    if (queryName != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_NAME,queryName);
-
-    if (!Validator.validateString(queryName) && !subQueryInitiated_)
-    {
-      inputsValid = false;
-      formToolPI.flagError(UDDIActionInputs.QUERY_NAME);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_QUERY_NAME"));
-    }
-
-    if (!processOthers(parser,formToolPI) && !subQueryInitiated_)
-      inputsValid = false;
-      
-    for (int i=0;i<removedProperties_.size();i++)
-      formToolPI.removeProperty(removedProperties_.elementAt(i));
-    formToolPI.updatePropertyTable(propertyTable_);
-      
-    // Process authentication information. If valid, these should be set in the formTool (not the formToolPI).
-    String ownedChecked = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_OWNED);
-    String publishURL = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-    String userId = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-    String password = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-    RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-
-    boolean validateAuthentication = (ownedChecked != null) && (!regElement.isLoggedIn()) && !overrideAuthenticationValidation();
-
-    if (publishURL != null)
-    {
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
-      formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
-    }      
-
-    if (!subQueryInitiated_ && validateAuthentication && !Validator.validateString(publishURL))
-    {
-      inputsValid = false;
-      formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_PUBLISH_URL"));
-    }
-
-    if (userId != null)
-    {
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
-      formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
-    }
-
-    if (!subQueryInitiated_ && validateAuthentication && !Validator.validateString(userId))
-    {
-      inputsValid = false;
-      formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_USERID"));
-    }
-
-    if (password != null)
-    {
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
-      formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
-    }        
-      
-    return inputsValid;
-  }
-
-  protected boolean overrideAuthenticationValidation()
-  {
-    return false;
-  }
-  
-  public final boolean isSubQueryInitiated()
-  {
-    return subQueryInitiated_;
-  }
-  
-  public final boolean isSubQueryGet()
-  {
-    return isSubQueryGet_;
-  }    
-
-  public final String getSubQueryKey()
-  {
-    return subQueryKey_;
-  }
-
-  public final String getNewSubQuery()
-  {
-    return newSubQuery_;
-  }
-
-  public final String getNewSubQueryItem()
-  {
-    return newSubQueryItem_;
-  }
-  
-  public final void setRefreshAction(boolean isRefreshAction)
-  {
-    isRefreshAction_ = isRefreshAction;
-  }
-  
-  public final boolean isRefreshAction()
-  {
-    return isRefreshAction_;
-  }
-
-  protected final void addQueryNode()
-  {
-    // If the queryElement already exists, remove it first.
-    String queryName = queryElement_.getName();
-    RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-    QueryParentElement queryParentElement = regElement.getQueryParentElement();
-    Enumeration e = queryParentElement.getQueries();
-    while (e.hasMoreElements())
-    {
-      QueryElement qe = (QueryElement)e.nextElement();
-      if (qe.getName().equals(queryName))
-      {
-        SubQueryTransferTarget subQueryTransferTarget = (SubQueryTransferTarget)qe.getPropertyAsObject(UDDIModelConstants.SUBQUERY_TRANSFER_TARGET);
-        if (subQueryTransferTarget != null && (qe.getQueryType() == queryElement_.getQueryType()))
-          queryElement_.setPropertyAsObject(UDDIModelConstants.SUBQUERY_TRANSFER_TARGET,subQueryTransferTarget);
-        qe.disconnectAll();
-        break;
-      }
-    }
-    if (!isRefreshAction_)
-    {
-      // We can make safe assumptions about the node that is currently selected.
-      if (subQueryKey_ != null && subQueryKey_.length() > 0)
-      {
-        String parentQueryKey;
-        int lastSeparatorPos = subQueryKey_.lastIndexOf(':');
-        if (lastSeparatorPos == -1)
-          parentQueryKey = "";
-        else
-          parentQueryKey = subQueryKey_.substring(0,lastSeparatorPos);
-        FormToolPropertiesInterface parentFormToolPI = ((MultipleFormToolPropertiesInterface)getSelectedFormTool()).getFormToolProperties(parentQueryKey);
-        Object queryItem = parentFormToolPI.getProperty(UDDIActionInputs.QUERY_ITEM);
-        Object queryStyleBus = parentFormToolPI.getProperty(UDDIActionInputs.QUERY_STYLE_BUSINESSES);
-        Object queryStyleSer = parentFormToolPI.getProperty(UDDIActionInputs.QUERY_STYLE_SERVICES);
-        Object queryStyleSerInt = parentFormToolPI.getProperty(UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES);
-        Hashtable parentQueryData = new Hashtable();
-        if (queryItem != null)
-          parentQueryData.put(UDDIActionInputs.QUERY_ITEM, queryItem);
-        if (queryStyleBus != null)
-          parentQueryData.put(UDDIActionInputs.QUERY_STYLE_BUSINESSES, queryStyleBus);
-        if (queryStyleSer != null)
-          parentQueryData.put(UDDIActionInputs.QUERY_STYLE_SERVICES, queryStyleSer);
-        if (queryStyleSerInt != null)
-          parentQueryData.put(UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES, queryStyleSerInt);
-        queryElement_.setPropertyAsObject(UDDIModelConstants.SUBQUERY_TRANSFER_TARGET,new SubQueryTransferTarget(getSelectedNavigatorNode(),subQueryKey_,parentQueryData));
-      }
-    }
-    queryParentElement.connect(queryElement_,UDDIModelConstants.REL_QUERIES,ModelConstants.REL_OWNER);
-    QueryNode queryNode = (QueryNode)(regNode_.getChildNode(queryParentElement).getChildNode(queryElement_));
-    int newSelectedNodeId;
-    // If there is only 1 result, select the result. Otherwise, select the query node to present a summary.
-    if (queryNode.getChildNodes().size() == 1 && (subQueryKey_ == null || subQueryKey_.length() == 0))
-      newSelectedNodeId = ((Node)(queryNode.getChildNodes().elementAt(0))).getNodeId();
-    else
-      newSelectedNodeId = queryNode.getNodeId();
-    NodeManager nodeManager = regNode_.getNodeManager();
-    nodeManager.setSelectedNodeId(newSelectedNodeId);
-    queryNode.setFindToolProperties(this);
-    Node selectedNode = nodeManager.getSelectedNode();
-    ToolManager toolManager = selectedNode.getCurrentToolManager();
-    Tool selectedTool = toolManager.getSelectedTool();
-    addToHistory(ActionInputs.PERSPECTIVE_UDDI,selectedTool.getSelectToolActionHref(true));
-  }
-  
-  public ITransformer[] getTransformers()
-  {
-    ITransformer[] parentTransformers = super.getTransformers();
-    ITransformer[] transformers = new ITransformer[parentTransformers.length + 1];
-    System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
-    transformers[transformers.length - 1] = new MultipartFormDataParserTransformer(controller_);
-    return transformers;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ManageReferencedServicesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ManageReferencedServicesAction.java
deleted file mode 100644
index 8a53f3679..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ManageReferencedServicesAction.java
+++ /dev/null
@@ -1,374 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Perspective;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.MultipleFormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegistryNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.service.BusinessServices;
-import org.uddi4j.transport.TransportException;
-
-public class ManageReferencedServicesAction extends UDDIPropertiesFormAction
-{
-  protected String subQueryKey_;
-  protected boolean isSubQueryGet_;
-  protected String newSubQuery_;
-  protected String newSubQueryItem_;
-  protected boolean subQueryInitiated_;
-  protected RegistryNode regNode_;
-
-  public ManageReferencedServicesAction(Controller controller)
-  {
-    super(controller);
-    subQueryKey_ = null;
-    isSubQueryGet_ = false;
-    subQueryInitiated_ = false;
-    regNode_ = getRegistryNode();
-  }
-
-  protected final boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    newSubQuery_ = parser.getParameter(UDDIActionInputs.NEW_SUBQUERY_INITIATED);
-    String isSubQueryGetString = parser.getParameter(UDDIActionInputs.SUBQUERY_GET);
-    newSubQueryItem_ = parser.getParameter(UDDIActionInputs.NEW_SUBQUERY_QUERY_ITEM);
-    subQueryKey_ = parser.getParameter(UDDIActionInputs.SUBQUERY_KEY);
-    String[] referencedServicesCheckboxes = parser.getParameterValues(UDDIActionInputs.REFERENCED_SERVICE_SELECT_STATE);
-    String[] serviceNodeIds = parser.getParameterValues(UDDIActionInputs.NODEID_SERVICE);
-    String operation = parser.getParameter(UDDIActionInputs.MANAGE_REFERENCED_SERVICES_OPERATION);
-    String publishURL = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-    String userId = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-    String password = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-
-    // Validate the data.
-    boolean inputsValid = true;
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
-    FormTool formTool = getSelectedFormTool();
-    FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKey_);
-    formToolPI.clearErrors();
-
-    if (newSubQuery_ != null && newSubQuery_.length() > 0)
-      subQueryInitiated_ = true;
-    else
-      subQueryInitiated_ = false;
-
-    if (isSubQueryGetString != null)
-      isSubQueryGet_ = Boolean.valueOf(isSubQueryGetString).booleanValue();
-
-    if (operation != null)
-      propertyTable_.put(UDDIActionInputs.MANAGE_REFERENCED_SERVICES_OPERATION,operation);
-    else
-      removeProperty(UDDIActionInputs.MANAGE_REFERENCED_SERVICES_OPERATION);
-
-    if (referencedServicesCheckboxes != null)
-      propertyTable_.put(UDDIActionInputs.REFERENCED_SERVICE_SELECT_STATE,referencedServicesCheckboxes);
-    else
-      removeProperty(UDDIActionInputs.REFERENCED_SERVICE_SELECT_STATE);
-
-    if (serviceNodeIds != null)
-    {
-      Vector services = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_SERVICES);
-      if (services == null)
-        services = new Vector();
-      Hashtable resultHash = new Hashtable();
-      for (int i=0;i<serviceNodeIds.length;i++)
-        resultHash.put(serviceNodeIds[i],Boolean.TRUE);
-      for (int i=0;i<services.size();i++)
-      {
-        ListElement listElement = (ListElement)services.elementAt(i);
-        if (resultHash.get(String.valueOf(listElement.getTargetNodeId())) == null)
-        {
-          services.removeElementAt(i);
-          i--;
-        }
-      }
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SERVICES,services);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_SERVICES);
-
-    RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-    if (!regElement.isLoggedIn())
-    {
-      if (publishURL != null)
-      {
-        propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
-        formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
-      }
-
-      if (!subQueryInitiated_ && !Validator.validateString(publishURL))
-      {
-        inputsValid = false;
-        formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_PUBLISH_URL"));
-      }
-
-      if (userId != null)
-      {
-        propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
-        formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
-      }
-
-      if (!subQueryInitiated_ && !Validator.validateString(userId))
-      {
-        inputsValid = false;
-        formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_USERID"));
-      }
-
-      if (password != null)
-      {
-        propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
-        formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
-      }
-    }
-
-    for (int i=0;i<removedProperties_.size();i++)
-      formToolPI.removeProperty(removedProperties_.elementAt(i));
-    formToolPI.updatePropertyTable(propertyTable_);
-
-    return inputsValid;
-  }
-
-  public boolean run()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    String operationString = (String)propertyTable_.get(UDDIActionInputs.MANAGE_REFERENCED_SERVICES_OPERATION);
-    int operation = Integer.parseInt(operationString);
-    RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-    BusinessElement busElement = (BusinessElement)(getSelectedNavigatorNode().getTreeElement());
-    FormTool formTool = getSelectedFormTool();
-    FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKey_);
-    Vector referencedServices = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_REFERENCED_SERVICES);
-    boolean operationResult = true;
-    try
-    {
-      String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-      String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-      String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-      UDDIProxy proxy = regElement.getProxy();
-      BusinessEntity currentSP = busElement.getBusinessEntity();
-      BusinessEntity sp = (BusinessEntity)proxy.get_businessDetail(currentSP.getBusinessKey()).getBusinessEntityVector().get(0);
-      
-      if (!regElement.isLoggedIn())
-        regElement.performLogin(publishURL,userId,password);
-        
-      Hashtable servicesHash = new Hashtable();
-      Vector backupBusServiceVector = new Vector();
-      switch (operation)
-      {
-        case UDDIActionInputs.MANAGE_REFERENCED_SERVICES_OPERATION_ADD:
-          Vector services = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_SERVICES);          
-          for (int i=0;i<services.size();i++)
-          {
-            ListElement serviceListElement = (ListElement)services.elementAt(i);
-            BusinessService bs = (BusinessService)serviceListElement.getObject();
-            servicesHash.put(bs.getServiceKey(),bs);
-          }
-          
-          // Save the current list of BusinessServices for rollback operations.
-          backupAndUpdateBusinessServices(backupBusServiceVector,sp,servicesHash,true);
-                    
-          try
-          {
-            Vector beVector = new Vector();
-            beVector.add(sp);
-            sp = (BusinessEntity)proxy.save_business(regElement.getAuthInfoString(), beVector).getBusinessEntityVector().get(0);
-            for (int i=0;i<services.size();i++)
-            {
-              ListElement serviceElement = (ListElement)services.elementAt(i);
-              BusinessService bs = (BusinessService)serviceElement.getObject();
-              String bsName = bs.getDefaultNameString();
-              messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_REFERENCED",bsName));
-              services.removeElementAt(i);
-              i--;
-            }
-          }
-          catch (TransportException e)
-          {
-            // Roll back and restore the old list of services.
-            rollbackBusinessServices(sp,backupBusServiceVector,services,uddiPerspective,messageQueue,"MSG_ERROR_SERVICE_NOT_REFERENCED");
-            handleUnexpectedException(uddiPerspective,messageQueue,"TransportException",e);
-            operationResult = false;
-          }
-          catch (UDDIException e)
-          {
-            // Roll back and restore the old list of services.
-            rollbackBusinessServices(sp,backupBusServiceVector,services,uddiPerspective,messageQueue,"MSG_ERROR_SERVICE_NOT_REFERENCED");
-            messageQueue.addMessage(uddiPerspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
-            messageQueue.addMessage("UDDIException");
-            messageQueue.addMessage(e.toString());
-            operationResult = false;
-          }
-          formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_SERVICES,services);
-          break;
-        case UDDIActionInputs.MANAGE_REFERENCED_SERVICES_OPERATION_REMOVE:
-          String[] referencedServicesCheckboxes = (String[])propertyTable_.get(UDDIActionInputs.REFERENCED_SERVICE_SELECT_STATE);
-          Vector selectedReferencedServiceVector = new Vector();
-          for (int i=0;i<referencedServicesCheckboxes.length;i++)
-          {
-            boolean isChecked = Boolean.valueOf(referencedServicesCheckboxes[i]).booleanValue();
-            if (isChecked)
-            {
-              ListElement referencedServiceListElement = (ListElement)referencedServices.elementAt(i);
-              BusinessService bs = (BusinessService)referencedServiceListElement.getObject();
-              servicesHash.put(bs.getServiceKey(),bs);
-              selectedReferencedServiceVector.addElement(bs);
-            }
-          }          
-          
-          // Save the current list of business services for rollback operations.
-          backupAndUpdateBusinessServices(backupBusServiceVector,sp,servicesHash,false);
-          
-          try
-          {
-            Vector beVector = new Vector();
-            beVector.add(sp);
-            sp = (BusinessEntity)proxy.save_business(regElement.getAuthInfoString(), beVector).getBusinessEntityVector().get(0);
-            for (int i=0;i<selectedReferencedServiceVector.size();i++)
-            {
-              BusinessService bs = (BusinessService)selectedReferencedServiceVector.elementAt(i);
-              String bsName = bs.getDefaultNameString();
-              messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_REFERENCE_REMOVED",bsName));
-            }
-          }
-          catch (TransportException e)
-          {
-            // Roll back and restore the old list of services.
-            rollbackBusinessServices(sp,backupBusServiceVector,selectedReferencedServiceVector,uddiPerspective,messageQueue,"MSG_ERROR_REFERENCE_NOT_REMOVED");
-            handleUnexpectedException(uddiPerspective,messageQueue,"TransportException",e);
-            operationResult = false;
-          }
-          catch (UDDIException e)
-          {
-            // Roll back and restore the old list of services.
-            rollbackBusinessServices(sp,backupBusServiceVector,selectedReferencedServiceVector,uddiPerspective,messageQueue,"MSG_ERROR_REFERENCE_NOT_REMOVED");
-            messageQueue.addMessage(uddiPerspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
-            messageQueue.addMessage("UDDIException");
-            messageQueue.addMessage(e.toString());
-            operationResult = false;
-          }
-      }
-      // Ensure that the referenced services are refreshed when the form reloads.
-      formToolPI.removeProperty(UDDIActionInputs.QUERY_INPUT_REFERENCED_SERVICES);
-      busElement.setBusinessEntity(sp);
-      return operationResult;
-    }
-    catch (TransportException e)
-    {
-      handleUnexpectedException(uddiPerspective,messageQueue,"TransportException",e);
-      operationResult = false;
-    }
-    catch (UDDIException e)
-    {
-      messageQueue.addMessage(uddiPerspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("UDDIException");
-      messageQueue.addMessage(e.toString());
-      operationResult = false;
-    }
-    catch (MalformedURLException e)
-    {
-      handleUnexpectedException(uddiPerspective,messageQueue,"MalformedURLException",e);
-      operationResult = false;
-    }
-    return operationResult;
-  }
-
-  public final boolean isSubQueryInitiated()
-  {
-    return subQueryInitiated_;
-  }
-
-  public final boolean isSubQueryGet()
-  {
-    return isSubQueryGet_;
-  }
-
-  public final String getSubQueryKey()
-  {
-    return subQueryKey_;
-  }
-
-  public final String getNewSubQuery()
-  {
-    return newSubQuery_;
-  }
-
-  public final String getNewSubQueryItem()
-  {
-    return newSubQueryItem_;
-  }
-  
-  // Backup the business services and remove those in serviceHash from the current list. Return the updated list of business services
-  private final void backupAndUpdateBusinessServices(Vector backupBusServiceVector,BusinessEntity be,Hashtable servicesHash,boolean isAdd)
-  {
-    // Save the current list of business services for rollback operations.
-    BusinessServices currentBusServices = be.getBusinessServices();
-    if (currentBusServices == null)
-      currentBusServices = new BusinessServices();
-    Vector currentBusServiceVector = currentBusServices.getBusinessServiceVector();
-    for (int i=0;i<currentBusServiceVector.size();i++)
-    {
-      BusinessService currentBusService = (BusinessService)currentBusServiceVector.elementAt(i);
-      backupBusServiceVector.addElement(currentBusService);
-      // If the current business service is a member of the list to be removed/added, remove it now.
-      if (servicesHash.get(currentBusService.getServiceKey()) != null)
-      {
-        currentBusServiceVector.removeElementAt(i);
-        i--;
-      }
-    }
-    
-    if (isAdd)
-    {
-      Enumeration e = servicesHash.elements();
-      while (e.hasMoreElements())
-        currentBusServiceVector.addElement((BusinessService)e.nextElement());
-    }
-    be.setBusinessServices(currentBusServices);
-  }
-  
-  private final void rollbackBusinessServices(BusinessEntity be,Vector backupBusServiceVector,Vector operatedServices,Perspective perspective,MessageQueue messageQueue,String errorMessageKey)
-  {
-    // Roll back and restore the old list of services.
-    be.getBusinessServices().setBusinessServiceVector(backupBusServiceVector);
-    for (int i=0;i<operatedServices.size();i++)
-    {
-      ListElement serviceListElement = (ListElement)operatedServices.elementAt(i);
-      BusinessService bs = (BusinessService)serviceListElement.getObject();
-      String bsName = bs.getDefaultNameString();
-      messageQueue.addMessage(perspective.getMessage(errorMessageKey,bsName));
-    }    
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/OpenCategoryBrowserAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/OpenCategoryBrowserAction.java
deleted file mode 100644
index 3d1b1fd48..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/OpenCategoryBrowserAction.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.ws.internal.explorer.platform.uddi.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.Action;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-
-public class OpenCategoryBrowserAction extends Action
-{
-  public OpenCategoryBrowserAction()
-  {
-  }
-
-  private static final void addSessionAndTModelKey(StringBuffer result,String sessionId,String categoryTModelKey)
-  {
-    result.append(ActionInputs.SESSIONID).append('=').append(sessionId).append('&').append(UDDIActionInputs.CATEGORY_TMODEL_KEY).append('=').append(categoryTModelKey);
-  }
-  
-  // uddi/category_browser.jsp?sessionId=...&categoryTModelKey=...
-  public static final String getActionLink(String sessionId,String categoryTModelKey)
-  {
-    StringBuffer actionLink = new StringBuffer("uddi/category_browser.jsp?");
-    addSessionAndTModelKey(actionLink,sessionId,categoryTModelKey);
-    return actionLink.toString();
-  }
-  
-  public static final String getCategoryContentPage(String sessionId,String categoryTModelKey)
-  {
-    StringBuffer actionLink = new StringBuffer("uddi/category_content.jsp?");
-    addSessionAndTModelKey(actionLink,sessionId,categoryTModelKey);
-    return actionLink.toString();
-  }
-  
-  public static final String getWildCardActionLink(String sessionId)
-  {
-    return getActionLink(sessionId,"%");
-  }
-  
-  public final boolean populatePropertyTable(HttpServletRequest request)
-  {
-    return true;
-  }
-
-  public final boolean run()
-  {
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/OpenRegistryAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/OpenRegistryAction.java
deleted file mode 100644
index 891ff4f48..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/OpenRegistryAction.java
+++ /dev/null
@@ -1,249 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Hashtable;
-import java.util.Properties;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.CategoryModel;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.UDDIMainElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIMainNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.response.TModelDetail;
-import org.uddi4j.response.TModelInfo;
-import org.uddi4j.response.TModelInfos;
-import org.uddi4j.response.TModelList;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.util.CategoryBag;
-import org.uddi4j.util.KeyedReference;
-
-public class OpenRegistryAction extends UDDIPropertiesFormAction
-{
-  public OpenRegistryAction(Controller controller)
-  {
-    super(controller);
-    // Select UDDI Main.
-  }
-
-  protected final boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    String registryName = parser.getParameter(UDDIActionInputs.REGISTRY_NAME);
-    String inquiryURL = parser.getParameter(UDDIActionInputs.INQUIRY_URL);
-    String publishURL = parser.getParameter(UDDIActionInputs.PUBLISH_URL);
-    String username = parser.getParameter(UDDIActionInputs.UDDI_USERNAME);
-    String password = parser.getParameter(UDDIActionInputs.UDDI_PASSWORD);
-    String checkUserDefinedCategoriesChecked = parser.getParameter(UDDIActionInputs.CHECK_USER_DEFINED_CATEGORIES);
-    String categoriesDirectory = parser.getParameter(UDDIActionInputs.CATEGORIES_DIRECTORY);
-
-    // Validate the data.
-    boolean inputsValid = true;
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    FormTool formTool = getSelectedFormTool();
-    if (registryName != null)
-      propertyTable_.put(UDDIActionInputs.REGISTRY_NAME,registryName);
-
-    if (!Validator.validateString(registryName))
-    {
-      inputsValid = false;
-      formTool.flagError(UDDIActionInputs.REGISTRY_NAME);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_REGISTRY_NAME"));
-    }
-
-    if (inquiryURL != null)
-      propertyTable_.put(UDDIActionInputs.INQUIRY_URL,inquiryURL);
-    if (!Validator.validateURL(inquiryURL))
-    {
-      inputsValid = false;
-      formTool.flagError(UDDIActionInputs.INQUIRY_URL);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_INQUIRY_URL"));
-    }
-
-    if (publishURL != null)
-      propertyTable_.put(UDDIActionInputs.PUBLISH_URL, publishURL);
-    
-    if (username != null)
-      propertyTable_.put(UDDIActionInputs.UDDI_USERNAME, username);
-
-    if (password != null)
-      propertyTable_.put(UDDIActionInputs.UDDI_PASSWORD, password);
-
-    if (checkUserDefinedCategoriesChecked != null)
-      propertyTable_.put(UDDIActionInputs.CHECK_USER_DEFINED_CATEGORIES,checkUserDefinedCategoriesChecked);
-    else
-      removeProperty(UDDIActionInputs.CHECK_USER_DEFINED_CATEGORIES);
-      
-    if (categoriesDirectory != null)
-      propertyTable_.put(UDDIActionInputs.CATEGORIES_DIRECTORY,categoriesDirectory);
-    else
-      removeProperty(UDDIActionInputs.CATEGORIES_DIRECTORY);
-
-    formTool.updatePropertyTable(propertyTable_);
-    return inputsValid;
-  }
-
-  public final void gatherWSUserDefinedCategories(UDDIProxy proxy,Hashtable categoryModels)
-  {
-    try
-    {
-      CategoryBag categoryBag = new CategoryBag();
-      categoryBag.add(new KeyedReference("","categorization",TModel.TYPES_TMODEL_KEY));
-      TModelList tModelList = proxy.find_tModel("%",categoryBag,null,null,100);
-      TModelInfos tModelInfos = tModelList.getTModelInfos();
-      Vector tModelKeyVector = new Vector();
-      for (int i=0;i<tModelInfos.size();i++)
-      {
-        TModelInfo tModelInfo = tModelInfos.get(i);
-        tModelKeyVector.addElement(tModelInfo.getTModelKey());
-      }
-      TModelDetail tModelDetail = proxy.get_tModelDetail(tModelKeyVector);
-      Vector tModelVector = tModelDetail.getTModelVector();
-      for (int i=0;i<tModelVector.size();i++)
-      {
-        TModel tModel = (TModel)tModelVector.elementAt(i);
-        boolean checked = false;
-        String displayName = null;
-        String categoryKey = null;
-        categoryBag = tModel.getCategoryBag();
-        for (int j=0;j<categoryBag.size();j++)
-        {
-          KeyedReference kr = categoryBag.get(j);
-          String krTModelKey = kr.getTModelKey();
-          if (krTModelKey.equalsIgnoreCase(TModel.GENERAL_KEYWORDS_TMODEL_KEY))
-          {
-            String krKeyName = kr.getKeyName();
-            if (krKeyName.equals("urn:x-ibm:uddi:customTaxonomy:key"))
-              categoryKey = kr.getKeyValue();
-            else if (krKeyName.equals("urn:x-ibm:uddi:customTaxonomy:displayName"))
-              displayName = kr.getKeyValue();
-          }
-          else if (krTModelKey.equalsIgnoreCase(TModel.TYPES_TMODEL_KEY))
-            checked = kr.getKeyValue().equals("checked");            
-        }
-        if (categoryKey != null)
-        {
-          if (displayName == null)
-            displayName = tModel.getNameString();
-          CategoryModel categoryModel = new CategoryModel();
-          categoryModel.setCategoryKey(categoryKey);
-          categoryModel.enableChecked(checked);
-          categoryModel.setDisplayName(displayName);
-          String tModelKey = tModel.getTModelKey();
-          categoryModel.setTModelKey(tModelKey);
-          categoryModels.put(tModelKey,categoryModel);
-        }
-      }
-    }
-    catch (UDDIException e)
-    {
-    }
-    catch (TransportException e)
-    {
-    }
-  }
-  
-  public final boolean run()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    try
-    {
-      String registryName = (String)propertyTable_.get(UDDIActionInputs.REGISTRY_NAME);
-      String inquiryURL = (String)propertyTable_.get(UDDIActionInputs.INQUIRY_URL);
-      String publishURL = (String)propertyTable_.get(UDDIActionInputs.PUBLISH_URL);
-      String registrationURL = (String)propertyTable_.get(UDDIActionInputs.REGISTRATION_URL);
-      String username = (String)propertyTable_.get(UDDIActionInputs.UDDI_USERNAME);
-      String password = (String)propertyTable_.get(UDDIActionInputs.UDDI_PASSWORD);
-      boolean checkForUserDefinedCategoriesChecked = (propertyTable_.get(UDDIActionInputs.CHECK_USER_DEFINED_CATEGORIES) != null);
-      String categoriesDirectory = (String)propertyTable_.get(UDDIActionInputs.CATEGORIES_DIRECTORY);
-
-      String recognizedPublishURL = uddiPerspective.getKnownRegistryPublishURL(inquiryURL);
-      String recognizedRegistrationURL = uddiPerspective.getKnownRegistryRegistrationURL(inquiryURL);
-      
-      if (publishURL == null)
-        publishURL = recognizedPublishURL;
-      if (registrationURL == null)
-        registrationURL = recognizedRegistrationURL;
-        
-      UDDIMainNode uddiMainNode = (UDDIMainNode)(controller_.getUDDIPerspective().getNavigatorManager().getRootNode());
-      UDDIMainElement uddiMainElement = (UDDIMainElement)uddiMainNode.getTreeElement();
-      Properties props = new Properties();
-      props.put(ActionInputs.TRANSPORT_CLASS_NAME, ActionInputs.TRASPORT_CLASS);
-      UDDIProxy proxy = new UDDIProxy(props);
-      proxy.setInquiryURL(new URL(inquiryURL));
-      RegistryElement registryElement = new RegistryElement(proxy,inquiryURL,registryName,uddiMainElement.getModel());
-      // Set registry element's publish URL and registration URL provided by external callers (e.g. favorites).
-      if (publishURL != null)
-        registryElement.setCachedPublishURL(publishURL);
-      if (registrationURL != null)
-        registryElement.setRegistrationURL(registrationURL);
-      if (username != null)
-      	registryElement.setUserId(username);
-      if (password != null)
-      	registryElement.setCred(password);
-      registryElement.setCheckForUserDefinedCategories(checkForUserDefinedCategoriesChecked);
-      if (checkForUserDefinedCategoriesChecked)
-      {
-        Hashtable categoryModels = new Hashtable();
-        gatherWSUserDefinedCategories(proxy,categoryModels);
-        if (categoryModels.size() > 0)
-          registryElement.setUserDefinedCategories(categoryModels);
-        else
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_NO_USER_DEFINED_CATEGORIES_FOUND"));
-      }
-      registryElement.setCategoriesDirectory(categoriesDirectory);
-      uddiMainElement.connect(registryElement,UDDIModelConstants.REL_REGISTRIES,ModelConstants.REL_OWNER);
-      NodeManager nodeManager = uddiMainNode.getNodeManager();
-      int newRegistryNodeId = uddiMainNode.getChildNode(registryElement).getNodeId();
-      // Select the new registry node and add the select action to the history.
-      nodeManager.setSelectedNodeId(newRegistryNodeId);
-      Node registryNode = nodeManager.getSelectedNode();
-      ToolManager toolManager = registryNode.getCurrentToolManager();
-      addToHistory(ActionInputs.PERSPECTIVE_UDDI,toolManager.getSelectedTool().getSelectToolActionHref(true));
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_REGISTRY_OPENED",new String[]{registryName,inquiryURL}));
-      return true;
-    }
-    catch (MalformedURLException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("MalformedURLException");
-      messageQueue.addMessage(e.getMessage());
-      FormTool formTool = getSelectedFormTool();
-      formTool.flagError(UDDIActionInputs.INQUIRY_URL);
-    }
-    /*
-    catch (FormInputException e)
-    {
-      messageQueue.addMessage(e.getMessage());
-    }
-    */
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/PublishAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/PublishAction.java
deleted file mode 100644
index 22c9d8e9d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/PublishAction.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.uddi.actions;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.MultipartFormDataParserTransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.PublishedItemsElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceInterfaceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.MultipleFormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegistryNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-
-public abstract class PublishAction extends UDDIPropertiesFormAction
-{
-  protected String subQueryKey_;
-  protected boolean subQueryInitiated_;
-  protected String newSubQuery_;
-  protected boolean isSubQueryGet_;
-  protected String newSubQueryItem_;
-  protected RegistryNode regNode_;
-
-  public PublishAction(Controller controller)
-  {
-    super(controller);
-    subQueryKey_ = null;
-    isSubQueryGet_ = false;
-    subQueryInitiated_ = false;
-    regNode_ = getRegistryNode();
-  }
-
-  protected abstract boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException;
-
-  protected final boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    // Setup for MultipartFormDataParserTransformer
-    propertyTable_.put(ActionInputs.MULTIPART_FORM_DATA_PARSER, parser);
- 
-    newSubQuery_ = parser.getParameter(UDDIActionInputs.NEW_SUBQUERY_INITIATED);
-    String isSubQueryGetString = parser.getParameter(UDDIActionInputs.SUBQUERY_GET);
-    newSubQueryItem_ = parser.getParameter(UDDIActionInputs.NEW_SUBQUERY_QUERY_ITEM);
-    subQueryKey_ = parser.getParameter(UDDIActionInputs.SUBQUERY_KEY);
-
-    // Validate the data.
-    boolean inputsValid = true;
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    FormTool formTool = getSelectedFormTool();
-    FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKey_);
-    formToolPI.clearErrors();
-
-    if (newSubQuery_ != null && newSubQuery_.length() > 0)
-      subQueryInitiated_ = true;
-    else
-      subQueryInitiated_ = false;
-
-    if (isSubQueryGetString != null)
-      isSubQueryGet_ = Boolean.valueOf(isSubQueryGetString).booleanValue();
-
-    if (!processOthers(parser,formToolPI) && !subQueryInitiated_)
-      inputsValid = false;
-
-    for (int i=0;i<removedProperties_.size();i++)
-      formToolPI.removeProperty(removedProperties_.elementAt(i));
-    formToolPI.updatePropertyTable(propertyTable_);
-
-    String publishURL = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-    String userId = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-    String password = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-    RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-
-    boolean validateAuthentication = !regElement.isLoggedIn();
-
-    if (publishURL != null)
-    {
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
-      formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
-    }
-
-    if (!subQueryInitiated_ && validateAuthentication && !Validator.validateString(publishURL))
-    {
-      inputsValid = false;
-      formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_PUBLISH_URL"));
-    }
-
-    if (userId != null)
-    {
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
-      formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
-    }
-
-    if (!subQueryInitiated_ && validateAuthentication && !Validator.validateString(userId))
-    {
-      inputsValid = false;
-      formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_USERID"));
-    }
-
-    if (password != null)
-    {
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
-      formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
-    }
-
-    return inputsValid;
-  }
-
-  protected final void addPublishedItemNode(BusinessEntity be,RegistryElement regElement)
-  {
-    BusinessElement beElement = new BusinessElement(be,regElement.getModel());
-    PublishedItemsElement publishedBusinessesElement = regElement.getPublishedBusinessesElement();
-    Enumeration e = publishedBusinessesElement.getItems();
-    while (e.hasMoreElements())
-    {
-      BusinessElement element = (BusinessElement)e.nextElement();
-      BusinessEntity elementBE = element.getBusinessEntity();
-      if (elementBE.getBusinessKey().equals(be.getBusinessKey()))
-      {
-        element.disconnectAll();
-        break;
-      }
-    }
-    connectElements(publishedBusinessesElement,beElement);
-  }
-
-  protected final void addPublishedItemNode(BusinessService bs,RegistryElement regElement)
-  {
-    ServiceElement sElement = new ServiceElement(bs,regElement.getModel());
-    PublishedItemsElement publishedServicesElement = regElement.getPublishedServicesElement();
-    Enumeration e = publishedServicesElement.getItems();
-    while (e.hasMoreElements())
-    {
-      ServiceElement element = (ServiceElement)e.nextElement();
-      BusinessService elementBS = element.getBusinessService();
-      if (elementBS.getServiceKey().equals(bs.getServiceKey()))
-      {
-        element.disconnectAll();
-        break;
-      }
-    }
-    connectElements(publishedServicesElement,sElement);
-  }
-
-  protected final void addPublishedItemNode(TModel tModel,RegistryElement regElement)
-  {
-    ServiceInterfaceElement siElement = new ServiceInterfaceElement(tModel,regElement.getModel());
-    PublishedItemsElement publishedServiceInterfacesElement = regElement.getPublishedServiceInterfacesElement();
-    Enumeration e = publishedServiceInterfacesElement.getItems();
-    while (e.hasMoreElements())
-    {
-      ServiceInterfaceElement element = (ServiceInterfaceElement)e.nextElement();
-      TModel elementTModel = element.getTModel();
-      if (tModel.getTModelKey().equals(elementTModel.getTModelKey()))
-      {
-        element.disconnectAll();
-        break;
-      }
-    }
-    connectElements(publishedServiceInterfacesElement,siElement);
-  }
-
-  private final void connectElements(PublishedItemsElement publishedItemsElement,TreeElement itemElement)
-  {
-    publishedItemsElement.connect(itemElement,UDDIModelConstants.REL_PUBLISHED_ITEMS,ModelConstants.REL_OWNER);
-    int newNodeId = regNode_.getChildNode(publishedItemsElement).getChildNode(itemElement).getNodeId();
-    NodeManager nodeManager = regNode_.getNodeManager();
-    nodeManager.setSelectedNodeId(newNodeId);
-    Node newNode = nodeManager.getSelectedNode();
-    ToolManager toolManager = newNode.getToolManager();
-    Tool selectedTool = toolManager.getSelectedTool();
-    addToHistory(ActionInputs.PERSPECTIVE_UDDI,selectedTool.getSelectToolActionHref(true));
-  }
-
-  public final boolean isSubQueryInitiated()
-  {
-    return subQueryInitiated_;
-  }
-
-  public final boolean isSubQueryGet()
-  {
-    return isSubQueryGet_;
-  }
-
-  public final String getSubQueryKey()
-  {
-    return subQueryKey_;
-  }
-
-  public final String getNewSubQuery()
-  {
-    return newSubQuery_;
-  }
-
-  public final String getNewSubQueryItem()
-  {
-    return newSubQueryItem_;
-  }
-  
-  public ITransformer[] getTransformers()
-  {
-    ITransformer[] parentTransformers = super.getTransformers();
-    ITransformer[] transformers = new ITransformer[parentTransformers.length + 1];
-    System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
-    transformers[transformers.length - 1] = new MultipartFormDataParserTransformer(controller_);
-    return transformers;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RefreshUDDINodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RefreshUDDINodeAction.java
deleted file mode 100644
index 1ca92f5ce..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RefreshUDDINodeAction.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.uddi.actions;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.AddRegistryToUDDIPerspectiveAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceInterfaceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.BusinessNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.PublishedItemsNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.QueryNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.QueryParentNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegistryNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.ServiceInterfaceNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.ServiceNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-
-public class RefreshUDDINodeAction extends UDDINodeAction
-{
-  private Vector staleNodes_;
-  public RefreshUDDINodeAction(Controller controller)
-  {
-    super(controller);
-    propertyTable_.put(ActionInputs.NODEID,String.valueOf(controller.getUDDIPerspective().getNavigatorManager().getSelectedNodeId()));
-    staleNodes_ = new Vector();
-  }
-
-  // uddi/actions/RefreshUDDINodeActionJSP.jsp?nodeId=...
-  public static String getActionLink(int nodeId)
-  {
-    StringBuffer actionLink = new StringBuffer("uddi/actions/RefreshUDDINodeActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
-    return actionLink.toString();
-  }
-
-  public final boolean verifyNodeData()
-  {
-    int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-    Node node = nodeManager_.getNode(nodeId);
-    if (node instanceof BusinessNode)
-      return refreshBusinessElement((BusinessNode)node);
-    else if (node instanceof ServiceNode)
-      return refreshServiceElement((ServiceNode)node);
-    else if (node instanceof ServiceInterfaceNode)
-      return refreshServiceInterfaceElement((ServiceInterfaceNode)node);
-    else if (node instanceof QueryNode)
-    {
-      // Nothing to verify
-      return true;
-    }
-    else if (node != null)
-    {
-      // RegistryNode
-      if (node instanceof RegistryNode)
-        refreshRegistryElement((RegistryNode)node);
-        
-      // FolderNodes
-      Vector childNodes = node.getChildNodes();
-      Vector refreshActions = new Vector();
-      for (int i=0;i<childNodes.size();i++)
-      {
-        Node childNode = (Node)childNodes.elementAt(i);
-        RefreshUDDINodeAction action = new RefreshUDDINodeAction(controller_);
-        action.setStaleNodes(staleNodes_);
-        Hashtable propertyTable = action.getPropertyTable();
-        String childNodeIdString = String.valueOf(childNode.getNodeId());
-        propertyTable.put(ActionInputs.NODEID,childNodeIdString);
-        if (!action.verifyNodeData())
-          staleNodes_.addElement(childNode);
-        else
-          refreshActions.addElement(action);
-      }
-      propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,refreshActions);
-      return true;
-    }
-    return true;
-  }
-  
-  private final void refreshRegistryElement(RegistryNode regNode)
-  {
-    RegistryElement regElement = (RegistryElement)regNode.getTreeElement();
-    Hashtable userDefinedCategories = null;
-    if (regElement.getCheckForUserDefinedCategories())
-    {
-      userDefinedCategories = new Hashtable();
-      OpenRegistryAction openRegAction = new OpenRegistryAction(controller_);
-      openRegAction.gatherWSUserDefinedCategories(regElement.getProxy(),userDefinedCategories);
-      if (!userDefinedCategories.keys().hasMoreElements())
-      {
-        userDefinedCategories = null;
-        regNode.setImagePath(RegistryNode.IMAGE_PATH_STANDARD);
-      }
-      else
-      {
-        String categoriesDirectory = regElement.getCategoriesDirectory();
-        AddRegistryToUDDIPerspectiveAction addAction = new AddRegistryToUDDIPerspectiveAction(controller_);
-        if (categoriesDirectory != null)
-          addAction.linkCategoryModelsWithSavedData(userDefinedCategories.elements(),categoriesDirectory);
-        else
-          addAction.linkCategoryModelsWithSavedData(regElement.getName(),userDefinedCategories.elements());
-        regNode.setImagePath(RegistryNode.IMAGE_PATH_WITH_USER_DEFINED_CATEGORIES);
-      }
-    }
-    regElement.setUserDefinedCategories(userDefinedCategories);
-  }
-
-  private final boolean refreshBusinessElement(BusinessNode busNode)
-  {
-    BusinessElement busElement = (BusinessElement)busNode.getTreeElement();
-    String uuidKey = busElement.getBusinessEntity().getBusinessKey();
-    RegFindBusinessUUIDAction verifyAction = new RegFindBusinessUUIDAction(controller_);
-    Hashtable propertyTable = verifyAction.getPropertyTable();
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY,uuidKey);
-    propertyTable.put(UDDIActionInputs.REFRESH_NODE,busNode);
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE,Boolean.TRUE);
-    boolean verifyResult = verifyAction.run();
-    if (verifyResult)
-      propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,new BusinessElement((BusinessEntity)propertyTable.get(UDDIActionInputs.LATEST_OBJECT),busElement.getModel()));
-    return verifyResult;
-  }
-
-  private final boolean refreshServiceElement(ServiceNode serviceNode)
-  {
-    ServiceElement serviceElement = (ServiceElement)serviceNode.getTreeElement();
-    String uuidKey = serviceElement.getBusinessService().getServiceKey();
-    RegFindServiceUUIDAction verifyAction = new RegFindServiceUUIDAction(controller_);
-    Hashtable propertyTable = verifyAction.getPropertyTable();
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY,uuidKey);
-    propertyTable.put(UDDIActionInputs.REFRESH_NODE,serviceNode);
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE,Boolean.TRUE);
-    boolean verifyResult = verifyAction.run();
-    if (verifyResult)
-      propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,new ServiceElement((BusinessService)propertyTable.get(UDDIActionInputs.LATEST_OBJECT),serviceElement.getModel()));
-    return verifyResult;
-  }
-
-  private final boolean refreshServiceInterfaceElement(ServiceInterfaceNode siNode)
-  {
-    ServiceInterfaceElement siElement = (ServiceInterfaceElement)siNode.getTreeElement();
-    String uuidKey = siElement.getTModel().getTModelKey();
-    RegFindServiceInterfaceUUIDAction verifyAction = new RegFindServiceInterfaceUUIDAction(controller_);
-    Hashtable propertyTable = verifyAction.getPropertyTable();
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY,uuidKey);
-    propertyTable.put(UDDIActionInputs.REFRESH_NODE,siNode);
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE,Boolean.TRUE);
-    boolean verifyResult = verifyAction.run();
-    if (verifyResult)
-      propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,new ServiceInterfaceElement((TModel)propertyTable.get(UDDIActionInputs.LATEST_OBJECT),siElement.getModel()));
-    return verifyResult;
-  }
-
-  public final void connectElements(Node parentNode,TreeElement newElement)
-  {
-    TreeElement parentElement = parentNode.getTreeElement();
-    String rel = null;
-    if (parentNode instanceof PublishedItemsNode)
-      rel = UDDIModelConstants.REL_PUBLISHED_ITEMS;
-    else if (parentNode instanceof QueryNode)
-      rel = UDDIModelConstants.REL_QUERY_RESULTS;
-    else if (parentNode instanceof QueryParentNode)
-      rel = UDDIModelConstants.REL_QUERIES;
-    parentElement.connect(newElement,rel,ModelConstants.REL_OWNER);
-    Node newNode = parentNode.getChildNode(newElement);
-    int newNodeId = newNode.getNodeId();
-    nodeManager_.setSelectedNodeId(newNodeId);
-    ToolManager toolManager = newNode.getToolManager();
-    Tool selectedTool = toolManager.getSelectedTool();
-    addToHistory(ActionInputs.PERSPECTIVE_UDDI,selectedTool.getSelectToolActionHref(true));
-  }
-
-  public final String getActionLinkForHistory()
-  {
-    return null;
-  }
-
-  public final boolean run()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-    if (!isStaleNode(nodeId))
-    {
-      Node node = nodeManager_.getNode(nodeId);
-      Object latestObject = propertyTable_.get(UDDIActionInputs.LATEST_OBJECT);
-      if (latestObject != null)
-      {
-        if (latestObject instanceof Vector)
-        {
-          Vector refreshActions = (Vector)propertyTable_.get(UDDIActionInputs.LATEST_OBJECT);
-          for (int i=0;i<refreshActions.size();i++)
-          {
-            RefreshUDDINodeAction refreshAction = (RefreshUDDINodeAction)refreshActions.elementAt(i);
-            refreshAction.run();
-          }
-          nodeManager_.setSelectedNodeId(nodeId);        
-        }
-        else
-        {
-          TreeElement oldElement = node.getTreeElement();
-          oldElement.disconnectAll();
-          connectElements(node.getParent(),(TreeElement)propertyTable_.get(UDDIActionInputs.LATEST_OBJECT));
-        }
-      }
-      else
-      {
-        // QueryNodes
-        QueryNode queryNode = (QueryNode)node;
-        FindAction findAction = queryNode.getFindAction();
-        findAction.setRefreshAction(true);
-        if (!findAction.run())
-          queryNode.removeChildNodes(true);
-        findAction.setRefreshAction(false);
-      }
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_NODE_REFRESHED",node.getNodeName()));
-      return true;
-    }
-    return false;
-  }
-  
-  public final Vector getStaleNodes()
-  {
-    return staleNodes_;
-  }
-  
-  public final void setStaleNodes(Vector staleNodes)
-  {
-    staleNodes_ = staleNodes;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RefreshUDDINodesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RefreshUDDINodesAction.java
deleted file mode 100644
index 9feb1f184..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RefreshUDDINodesAction.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.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-
-public class RefreshUDDINodesAction extends UDDIPropertiesFormAction
-{
-  private Vector staleNodes_;
-
-  public RefreshUDDINodesAction(Controller controller)
-  {
-    super(controller);
-    staleNodes_ = new Vector();
-  }
-
-  protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    String[] selectedNodeIds = parser.getParameterValues(ActionInputs.NODEID);
-    // The client Javascript enforces the rule that at least one item was selected before the form can be submitted.
-    propertyTable_.put(UDDIActionInputs.SELECTED_NODEIDS,selectedNodeIds);
-    return true;
-  }
-
-  public final boolean run()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    int collectorNodeId = getSelectedNavigatorNode().getNodeId();
-    String[] selectedNodeIds = (String[])propertyTable_.get(UDDIActionInputs.SELECTED_NODEIDS);
-    RefreshUDDINodeAction action = new RefreshUDDINodeAction(controller_);
-    Hashtable propertyTable = action.getPropertyTable();
-    for (int i=0;i<selectedNodeIds.length;i++)
-    {
-      propertyTable.put(ActionInputs.NODEID,selectedNodeIds[i]);
-      if (action.verifyNodeData())
-        action.run();
-      else
-      {
-        int nodeId = Integer.parseInt(selectedNodeIds[i]);
-        staleNodes_.addElement(navigatorManager.getNode(nodeId));
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_NODE_DATA_VALIDATION_FAILED",navigatorManager.getNode(nodeId).getNodeName()));
-      }
-    }
-    navigatorManager.setSelectedNodeId(collectorNodeId);
-    return true;
-  }
-
-  public final Vector getStaleNodes()
-  {
-    return staleNodes_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessUUIDAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessUUIDAction.java
deleted file mode 100644
index 4e3d8a2e3..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessUUIDAction.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.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.FormInputException;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.transport.TransportException;
-
-public class RegFindBusinessUUIDAction extends FindAction
-{
-  public RegFindBusinessUUIDAction(Controller controller)
-  {
-    super(controller);
-    propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_BUSINESSES));
-    propertyTable_.put(UDDIActionInputs.QUERY_STYLE_BUSINESSES,String.valueOf(UDDIActionInputs.QUERY_STYLE_UUID));    
-  }
-
-  protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
-  {
-    String uuidKey = parser.getParameter(UDDIActionInputs.QUERY_INPUT_UUID_KEY);
-
-    // Validate the data.
-    boolean inputsValid = true;
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    
-    if (uuidKey != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY,uuidKey);
-      
-    if (!subQueryInitiated_ && !Validator.validateString(uuidKey))
-    {
-      inputsValid = false;
-      formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_UUID_KEY"));
-    }
-    return inputsValid;
-  }
-
-  public final boolean run()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    try
-    {
-      boolean shouldAddQueryNode = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE) == null);      
-      String uuidKey = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY);
-      
-      // The action can be run under the context of either a registry or a query node or even UDDIMainNode.
-      if (regNode_ == null)
-        regNode_ = getRegistryNode((Node)propertyTable_.get(UDDIActionInputs.REFRESH_NODE));
-      RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-      UDDIProxy proxy = regElement.getProxy();
-      BusinessEntity[] beList = new BusinessEntity[1];
-      Vector beVector = proxy.get_businessDetail(uuidKey).getBusinessEntityVector();
-      if (beVector.size() > 0)
-      {
-        beVector.toArray(beList);
-        if (shouldAddQueryNode)
-        {
-          String queryName = (String)propertyTable_.get(UDDIActionInputs.QUERY_NAME);
-          queryElement_ = new QueryElement(beList,queryName,regElement.getModel());
-          addQueryNode();
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_BUSINESSES_FOUND",String.valueOf(beList.length)));
-        }
-        propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,beList[0]);
-        return true;
-      }
-      else
-        throw new FormInputException(uddiPerspective.getMessage("MSG_ERROR_NO_BUSINESSES_FOUND"));
-    }
-    catch (TransportException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("TransportException");
-      messageQueue.addMessage(e.getMessage());
-    }
-    catch (UDDIException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("UDDIException");
-      messageQueue.addMessage(e.toString());
-    }
-    catch (FormInputException e)
-    {
-      messageQueue.addMessage(e.getMessage());
-    }
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessesAdvancedAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessesAdvancedAction.java
deleted file mode 100644
index 771abc9ea..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessesAdvancedAction.java
+++ /dev/null
@@ -1,315 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.FormInputException;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.Name;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.response.BusinessInfo;
-import org.uddi4j.response.BusinessInfos;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.util.CategoryBag;
-import org.uddi4j.util.DiscoveryURL;
-import org.uddi4j.util.DiscoveryURLs;
-import org.uddi4j.util.FindQualifier;
-import org.uddi4j.util.FindQualifiers;
-import org.uddi4j.util.IdentifierBag;
-import org.uddi4j.util.KeyedReference;
-import org.uddi4j.util.TModelBag;
-
-public class RegFindBusinessesAdvancedAction extends FindAction
-{
-  public RegFindBusinessesAdvancedAction(Controller controller)
-  {
-    super(controller);
-    propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_BUSINESSES));
-    propertyTable_.put(UDDIActionInputs.QUERY_STYLE_BUSINESSES,String.valueOf(UDDIActionInputs.QUERY_STYLE_ADVANCED));    
-    propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_MAX_SEARCH_SET,String.valueOf(UDDIActionInputs.QUERY_MAX_SEARCH_SET));
-    propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_MAX_RESULTS,String.valueOf(UDDIActionInputs.QUERY_MAX_RESULTS));
-  }
-
-  protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
-  {
-    String ownedChecked = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_OWNED);
-    String[] languages = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME_LANGUAGE);
-    String[] names = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME);
-    String[] idTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_TYPE);
-    String[] idKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_NAME);
-    String[] idKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_VALUE);
-    String[] catTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_TYPE);
-    String[] catKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_NAME);
-    String[] catKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_VALUE);
-    String[] siNodeIds = parser.getParameterValues(UDDIActionInputs.NODEID_SERVICE_INTERFACE);
-    String[] discoveryURLValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DISCOVERYURL);
-    String[] findQualifierValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_FINDQUALIFIER);
-    String maxSearchSet = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_MAX_SEARCH_SET);
-    String maxResults = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_MAX_RESULTS);
-
-    // Validate the data.
-    boolean inputsValid = true;
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    getSelectedNavigatorNode();
-    getRegistryNode();
-    regNode_.getTreeElement();
-
-    if (ownedChecked != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_OWNED,ownedChecked);
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_OWNED);
-
-    if (languages != null && names != null)
-    {
-      Vector nameVector = new Vector();
-      for (int i=0;i<names.length;i++)
-      {
-        Name uddi4jName;
-        if (languages[i].length() > 0)
-          uddi4jName = new Name(names[i],languages[i]);
-        else
-          uddi4jName = new Name(names[i]);
-        nameVector.addElement(uddi4jName);
-      }
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES,nameVector);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES);
-
-    if (idTypes != null && idKeyNames != null && idKeyValues != null)
-    {
-      IdentifierBag idBag = new IdentifierBag();
-      for (int i=0;i<idKeyNames.length;i++)
-      {
-        KeyedReference kr = new KeyedReference(idKeyNames[i],idKeyValues[i],idTypes[i]);
-        idBag.add(kr);
-      }
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS,idBag);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS);
-
-    if (catTypes != null && catKeyNames != null && catKeyValues != null)
-    {
-      CategoryBag catBag = new CategoryBag();
-      for (int i=0;i<catTypes.length;i++)
-      {
-        KeyedReference kr = new KeyedReference(catKeyNames[i],catKeyValues[i],catTypes[i]);
-        catBag.add(kr);
-      }
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES,catBag);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES);
-
-    if (siNodeIds != null)
-    {
-      // Although we already have the "submitted" data, deletions occur on the client side and thus the need to track this using hidden form elements.
-      Vector busServiceInterfaces = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_SERVICE_INTERFACES);
-      if (busServiceInterfaces == null)
-        busServiceInterfaces = new Vector();
-      else
-        busServiceInterfaces.removeAllElements();
-      Vector busServiceInterfacesCopy = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_SERVICE_INTERFACES_COPY);
-      Vector tModelKeyStringVector = new Vector();
-      Hashtable resultHash = new Hashtable();
-      for (int i=0;i<siNodeIds.length;i++)
-        resultHash.put(siNodeIds[i],Boolean.TRUE);
-      for (int i=0;i<busServiceInterfacesCopy.size();i++)
-      {
-        ListElement listElement = (ListElement)busServiceInterfacesCopy.elementAt(i);
-        if (resultHash.get(String.valueOf(listElement.getTargetNodeId())) != null)
-        {
-          busServiceInterfaces.addElement(listElement);
-          TModel tModel = (TModel)listElement.getObject();
-          tModelKeyStringVector.addElement(tModel.getTModelKey());
-        }
-      }
-      TModelBag tModelBag = new TModelBag(tModelKeyStringVector);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_SERVICE_INTERFACES,busServiceInterfaces);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_TMODELBAG,tModelBag);
-    }
-    else
-    {
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_SERVICE_INTERFACES);
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_TMODELBAG);
-    }
-
-    if (discoveryURLValues != null)
-    {
-      DiscoveryURLs discoveryURLs = new DiscoveryURLs();
-      Vector discoveryURLVector = new Vector();
-      for (int i=0;i<discoveryURLValues.length;i++)
-      {
-        DiscoveryURL discoveryURL = new DiscoveryURL(discoveryURLValues[i],"");
-        discoveryURLVector.addElement(discoveryURL);
-      }
-      discoveryURLs.setDiscoveryURLVector(discoveryURLVector);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS,discoveryURLs);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS);
-
-    if (findQualifierValues != null)
-    {
-      FindQualifiers findQualifiers = new FindQualifiers();
-      Vector findQualifierVector = new Vector();
-      for (int i=0;i<findQualifierValues.length;i++)
-      {
-        FindQualifier findQualifier = new FindQualifier(findQualifierValues[i]);
-        findQualifierVector.addElement(findQualifier);
-      }
-      findQualifiers.setFindQualifierVector(findQualifierVector);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_FINDQUALIFIERS,findQualifiers);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_FINDQUALIFIERS);
-
-    if (maxSearchSet != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_MAX_SEARCH_SET,maxSearchSet);
-    if (!subQueryInitiated_ && !Validator.validateInteger(maxSearchSet))
-    {
-      formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_MAX_SEARCH_SET);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_MAX_SEARCH_SET"));
-      inputsValid = false;
-    }
-
-    if (maxResults != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_MAX_RESULTS,maxResults);
-    if (!subQueryInitiated_ && !Validator.validateInteger(maxResults))
-    {
-      formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_MAX_RESULTS);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_MAX_RESULTS"));
-      inputsValid = false;
-    }
-    return inputsValid;
-  }
-
-  private DiscoveryURLs dupDiscoveryURLs(DiscoveryURLs discoveryURLs, String useType, String dupUseType) {
-    if (discoveryURLs == null)
-      return discoveryURLs;
-    Vector discoveryURLVector = discoveryURLs.getDiscoveryURLVector();
-    if (discoveryURLVector == null)
-      return discoveryURLs;
-    Vector newDiscoveryURLVector = new Vector(discoveryURLVector);
-    Enumeration e = discoveryURLVector.elements();
-    while (e.hasMoreElements()) {
-      DiscoveryURL discoveryURL = (DiscoveryURL)e.nextElement();
-      if (discoveryURL.getUseType().equals(useType)) {
-        newDiscoveryURLVector.add(new DiscoveryURL(discoveryURL.getText(), dupUseType));
-      }
-    }
-    DiscoveryURLs newDiscoveryURLs = new DiscoveryURLs();
-    newDiscoveryURLs.setDiscoveryURLVector(newDiscoveryURLVector);
-    return newDiscoveryURLs;
-  }
-
-  public final boolean run()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    try
-    {
-      boolean shouldAddQueryNode = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE) == null);      
-      FindQualifiers findQualifiers = (FindQualifiers)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_FINDQUALIFIERS);
-      Vector nameVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES);
-      DiscoveryURLs discoveryURLs = (DiscoveryURLs)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS);
-      IdentifierBag identifierBag = (IdentifierBag)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS);
-      CategoryBag categoryBag = (CategoryBag)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES);
-      TModelBag tModelBag = (TModelBag)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_TMODELBAG);
-      boolean owned = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_OWNED) != null);
-      String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-      String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-      String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-      int maxSearchSet = Integer.parseInt((String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_MAX_SEARCH_SET));
-      int maxResults = Integer.parseInt((String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_MAX_RESULTS));
-
-      // The action can be run under the context of either a registry or a query node.
-      RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-      if (owned && !regElement.isLoggedIn())
-        regElement.performLogin(publishURL,userId,password);
-
-      UDDIProxy proxy = regElement.getProxy();
-
-      BusinessInfos busInfos = null;
-      if (owned)
-        busInfos = proxy.get_registeredInfo(regElement.getAuthInfoString()).getBusinessInfos();
-      else
-        busInfos = proxy.find_business(nameVector, dupDiscoveryURLs(discoveryURLs,"",UDDIActionInputs.DISCOVERY_URL_TYPE), identifierBag, categoryBag, tModelBag, findQualifiers, maxSearchSet).getBusinessInfos();
-      
-      int finalNumberOfBusinessEntities = Math.min(maxResults, busInfos.size());
-      Vector businessKeys = new Vector();
-      for (int i = 0; i < finalNumberOfBusinessEntities; i++)
-      {
-        BusinessInfo busInfo = (BusinessInfo)busInfos.get(i);
-        businessKeys.addElement(busInfo.getBusinessKey());
-      }
-
-      if (finalNumberOfBusinessEntities > 0)
-      {
-        if (shouldAddQueryNode)
-        {
-          Vector beVector = proxy.get_businessDetail(businessKeys).getBusinessEntityVector();
-          BusinessEntity[] beList = new BusinessEntity[beVector.size()];
-          beVector.toArray(beList);
-          String queryName = (String)propertyTable_.get(UDDIActionInputs.QUERY_NAME);
-          queryElement_ = new QueryElement(beList,queryName,regElement.getModel());
-          addQueryNode();
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_BUSINESSES_FOUND",String.valueOf(beList.length)));
-        }
-        return true;
-      }
-      else
-        throw new FormInputException(uddiPerspective.getMessage("MSG_ERROR_NO_BUSINESSES_FOUND"));
-    }
-    catch (TransportException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("TransportException");
-      messageQueue.addMessage(e.getMessage());
-    }
-    catch (UDDIException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("UDDIException");
-      messageQueue.addMessage(e.toString());
-    }
-    catch (FormInputException e)
-    {
-      messageQueue.addMessage(e.getMessage());
-    }
-    catch (MalformedURLException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("MalformedURLException");
-      messageQueue.addMessage(e.getMessage());
-    }
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessesSimpleAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessesSimpleAction.java
deleted file mode 100644
index d2438b24e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessesSimpleAction.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.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.FormInputException;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.Name;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.response.BusinessInfo;
-import org.uddi4j.response.BusinessInfos;
-import org.uddi4j.transport.TransportException;
-
-public class RegFindBusinessesSimpleAction extends FindAction
-{
-  public RegFindBusinessesSimpleAction(Controller controller)
-  {
-    super(controller);
-    propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_BUSINESSES));
-    propertyTable_.put(UDDIActionInputs.QUERY_STYLE_BUSINESSES,String.valueOf(UDDIActionInputs.QUERY_STYLE_SIMPLE));    
-  }
-
-  protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
-  {
-    String name = parser.getParameter(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_NAME);
-
-    // Validate the data.
-    boolean inputsValid = true;
-
-    if (name != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_NAME,name);
-    else
-    {
-      // This shouldn't occur.
-      inputsValid = false;
-    }
-    return inputsValid;
-  }
-
-  public final boolean run()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    try
-    {
-      boolean shouldAddQueryNode = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE) == null);
-      String name = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_NAME);
-      Vector nameVector = new Vector();
-      nameVector.addElement(new Name(name));
-
-      // The action can be run under the context of either a registry or a query node.
-      getSelectedNavigatorNode();
-      RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-      UDDIProxy proxy = regElement.getProxy();
-      
-      BusinessInfos busInfos = proxy.find_business(nameVector, null, null, null, null, null, UDDIActionInputs.QUERY_MAX_SEARCH_SET).getBusinessInfos();
-      int finalNumberOfBusinessEntities = Math.min(UDDIActionInputs.QUERY_MAX_RESULTS, busInfos.size());
-      Vector businessKeys = new Vector();
-      for (int i = 0; i < finalNumberOfBusinessEntities; i++)
-      {
-        BusinessInfo busInfo = busInfos.get(i);
-        businessKeys.addElement(busInfo.getBusinessKey());
-      }
-
-      if (finalNumberOfBusinessEntities > 0)
-      {
-        if (shouldAddQueryNode)
-        {
-          Vector beVector = proxy.get_businessDetail(businessKeys).getBusinessEntityVector();
-          BusinessEntity[] beList = new BusinessEntity[beVector.size()];
-          beVector.toArray(beList);
-          String queryName = (String)propertyTable_.get(UDDIActionInputs.QUERY_NAME);
-          queryElement_ = new QueryElement(beList,queryName,regElement.getModel());
-          addQueryNode();
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_BUSINESSES_FOUND",String.valueOf(beList.length)));
-        }
-        return true;
-      }
-      else
-        throw new FormInputException(uddiPerspective.getMessage("MSG_ERROR_NO_BUSINESSES_FOUND"));
-    }
-    catch (TransportException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("TransportException");
-      messageQueue.addMessage(e.getMessage());
-    }
-    catch (UDDIException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("UDDIException");
-      messageQueue.addMessage(e.toString());
-    }
-    catch (FormInputException e)
-    {
-      messageQueue.addMessage(e.getMessage());
-    }
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfaceUUIDAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfaceUUIDAction.java
deleted file mode 100644
index 58f86e685..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfaceUUIDAction.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.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.FormInputException;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.response.TModelDetail;
-import org.uddi4j.transport.TransportException;
-
-public class RegFindServiceInterfaceUUIDAction extends FindAction
-{
-  public RegFindServiceInterfaceUUIDAction(Controller controller)
-  {
-    super(controller);
-    propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES));
-    propertyTable_.put(UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES,String.valueOf(UDDIActionInputs.QUERY_STYLE_UUID));    
-  }
-
-  protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
-  {
-    String uuidKey = parser.getParameter(UDDIActionInputs.QUERY_INPUT_UUID_KEY);
-    // Validate the data.
-    boolean inputsValid = true;
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
-    if (uuidKey != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY,uuidKey);
-
-    if (!subQueryInitiated_ && !Validator.validateString(uuidKey))
-    {
-      inputsValid = false;
-      formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_UUID_KEY"));
-    }
-    return inputsValid;
-  }
-
-  public final boolean run()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    try
-    {
-      boolean shouldAddQueryNode = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE) == null);      
-      String uuidKey = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY);
-
-      // The action can be run under the context of either a registry or a query node or even UDDIMainNode.
-      if (regNode_ == null)
-        regNode_ = getRegistryNode((Node)propertyTable_.get(UDDIActionInputs.REFRESH_NODE));
-      RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-      UDDIProxy proxy = regElement.getProxy();
-      TModelDetail tModelDetail = proxy.get_tModelDetail(uuidKey);
-      Vector tModelVector = tModelDetail.getTModelVector();
-      if (tModelVector.size() > 0)
-      {
-        TModel tModel = (TModel)tModelVector.elementAt(0);
-        if (shouldAddQueryNode)
-        {
-          TModel[] tModelArray = new TModel[1];
-          tModelArray[0] = tModel;
-          String queryName = (String)propertyTable_.get(UDDIActionInputs.QUERY_NAME);
-          queryElement_ = new QueryElement(tModelArray,queryName,regElement.getModel());
-          addQueryNode();
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_INTERFACES_FOUND",String.valueOf(tModelArray.length)));
-        }
-        propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,tModel);
-        return true;
-      }
-      else
-        throw new FormInputException(uddiPerspective.getMessage("MSG_ERROR_NO_SERVICE_INTERFACES_FOUND"));
-    }
-    catch (UDDIException e)
-    {
-      messageQueue.addMessage(uddiPerspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("UDDIException");
-      messageQueue.addMessage(e.toString());
-    }
-    catch (TransportException e)
-    {
-      handleUnexpectedException(uddiPerspective,messageQueue,"TransportException",e);
-    }
-    catch (FormInputException e)
-    {
-      messageQueue.addMessage(e.getMessage());
-    }
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfacesAdvancedAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfacesAdvancedAction.java
deleted file mode 100644
index 40d2781c4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfacesAdvancedAction.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.ws.internal.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.FormInputException;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.binding.BindingTemplate;
-import org.uddi4j.datatype.binding.BindingTemplates;
-import org.uddi4j.datatype.binding.TModelInstanceDetails;
-import org.uddi4j.datatype.binding.TModelInstanceInfo;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.response.DispositionReport;
-import org.uddi4j.response.RegisteredInfo;
-import org.uddi4j.response.Result;
-import org.uddi4j.response.TModelDetail;
-import org.uddi4j.response.TModelInfo;
-import org.uddi4j.response.TModelInfos;
-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.IdentifierBag;
-import org.uddi4j.util.KeyedReference;
-
-public class RegFindServiceInterfacesAdvancedAction extends FindAction
-{
-  public RegFindServiceInterfacesAdvancedAction(Controller controller)
-  {
-    super(controller);
-    propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES));
-    propertyTable_.put(UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES,String.valueOf(UDDIActionInputs.QUERY_STYLE_ADVANCED));
-    propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_SEARCH_SET,String.valueOf(UDDIActionInputs.QUERY_MAX_SEARCH_SET));
-    propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_RESULTS,String.valueOf(UDDIActionInputs.QUERY_MAX_RESULTS));
-  }
-
-  protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
-  {
-    String useServiceChecked = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_USE_SERVICE);
-    String[] serviceNodeIds = parser.getParameterValues(UDDIActionInputs.NODEID_SERVICE);
-    String ownedChecked = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_OWNED);
-    String name = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME);
-    String[] idTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_TYPE);
-    String[] idKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_NAME);
-    String[] idKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_VALUE);
-    String[] catTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_TYPE);
-    String[] catKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_NAME);
-    String[] catKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_VALUE);
-    String[] findQualifierValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_FINDQUALIFIER);
-    String maxSearchSet = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_MAX_SEARCH_SET);
-    String maxResults = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_MAX_RESULTS);
-
-    // Validate the data.
-    boolean inputsValid = true;
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    regNode_.getTreeElement();
-
-    if (useServiceChecked != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_USE_SERVICE,useServiceChecked);
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_USE_SERVICE);
-    
-    if (serviceNodeIds != null)
-    {
-      // Although we already have the "submitted" data, deletions occur on the client side and thus the need to track this using hidden form elements.
-      Vector siService = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_SERVICE);
-      if (siService == null)
-        siService = new Vector();
-      else
-        siService.removeAllElements();
-      Vector siServiceCopy = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_SERVICE_COPY);
-      // The browser will enforce the rule of having only one service in this list.
-      ListElement listElement = (ListElement)siServiceCopy.elementAt(0);
-      siService.addElement(listElement);
-      BusinessService bs = (BusinessService)listElement.getObject();
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_SERVICE,siService);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_BUSINESS_SERVICE,bs);
-    }
-    else
-    {
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_SERVICE);
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_BUSINESS_SERVICE);
-      if (!subQueryInitiated_ && useServiceChecked != null)
-      {
-        inputsValid = false;
-        formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_SERVICE);
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_SERVICE"));
-      }
-    }
-    
-    if (ownedChecked != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_OWNED,ownedChecked);
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_OWNED);
-
-    if (name != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME,name);
-
-    if (idTypes != null && idKeyNames != null && idKeyValues != null)
-    {
-      IdentifierBag idBag = new IdentifierBag();
-      for (int i=0;i<idKeyNames.length;i++)
-      {
-        KeyedReference kr = new KeyedReference(idKeyNames[i],idKeyValues[i],idTypes[i]);
-        idBag.add(kr);
-      }
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS,idBag);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS);
-
-    if (catTypes != null && catKeyNames != null && catKeyValues != null)
-    {
-      CategoryBag catBag = new CategoryBag();
-      for (int i=0;i<catTypes.length;i++)
-      {
-        KeyedReference kr = new KeyedReference(catKeyNames[i],catKeyValues[i],catTypes[i]);
-        catBag.add(kr);
-      }
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES,catBag);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES);
-
-    if (findQualifierValues != null)
-    {
-      FindQualifiers findQualifiers = new FindQualifiers();
-      Vector findQualifierVector = new Vector();
-      for (int i=0;i<findQualifierValues.length;i++)
-      {
-        FindQualifier findQualifier = new FindQualifier(findQualifierValues[i]);
-        findQualifierVector.addElement(findQualifier);
-      }
-      findQualifiers.setFindQualifierVector(findQualifierVector);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_FINDQUALIFIERS,findQualifiers);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_FINDQUALIFIERS);
-
-    if (maxSearchSet != null)
-    {
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_MAX_SEARCH_SET,maxSearchSet);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_SEARCH_SET,maxSearchSet);
-    }
-    if (!subQueryInitiated_ && !Validator.validateInteger(maxSearchSet))
-    {
-      formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_SEARCH_SET);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_MAX_SEARCH_SET"));
-      inputsValid = false;
-    }
-
-    if (maxResults != null)
-    {
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_MAX_RESULTS,maxResults);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_RESULTS,maxResults);
-    }
-    if (!subQueryInitiated_ && !Validator.validateInteger(maxResults))
-    {
-      formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_RESULTS);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_MAX_RESULTS"));
-      inputsValid = false;
-    }
-    return inputsValid;
-  }
-  
-  public final boolean overrideAuthenticationValidation()
-  {
-    return (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_USE_SERVICE) != null);
-  }
-
-  public final boolean run()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    try
-    {
-      boolean shouldAddQueryNode = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE) == null);      
-      boolean useService = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_USE_SERVICE) != null);
-      BusinessService bs = (BusinessService)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_BUSINESS_SERVICE);
-      String name = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME);
-      FindQualifiers findQualifiers = (FindQualifiers)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_FINDQUALIFIERS);
-      IdentifierBag identifierBag = (IdentifierBag)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS);
-      CategoryBag categoryBag = (CategoryBag)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES);
-      boolean owned = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_OWNED) != null);
-      String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-      String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-      String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-      int maxSearchSet = Integer.parseInt((String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_SEARCH_SET));
-      int maxResults = Integer.parseInt((String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_RESULTS));
-
-      // The action can be run under the context of either a registry or a query node.
-      RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-      UDDIProxy proxy = regElement.getProxy();
-      Vector tModelKeyVector = new Vector();
-      
-      if (owned)
-      {
-        if (!regElement.isLoggedIn())
-          regElement.performLogin(publishURL,userId,password);
-        tModelKeyVector = findAllOwnedTModels(proxy, regElement.getAuthInfoString(), maxResults);
-      }
-      if (useService)
-      {
-        BindingTemplates bindingTemplates = bs.getBindingTemplates();
-        boolean endSearch = false;
-        if (bindingTemplates != null)
-        {
-          for (int i=0;i<bindingTemplates.size();i++)
-          {
-            BindingTemplate bt = bindingTemplates.get(i);
-            TModelInstanceDetails tModelInstanceDetails = bt.getTModelInstanceDetails();
-            for (int j=0;j<tModelInstanceDetails.size();j++)
-            {
-              TModelInstanceInfo tModelInstanceInfo = tModelInstanceDetails.get(j);
-              if (tModelKeyVector.size() < maxResults)
-                tModelKeyVector.addElement(tModelInstanceInfo.getTModelKey());
-              else
-              {
-                endSearch = true;
-                break;
-              }
-            }
-            if (endSearch)
-              break;
-          }
-        }
-      }
-      else
-      {  
-        TModelList tModelList = proxy.find_tModel(name,categoryBag,identifierBag,findQualifiers,maxSearchSet);
-        TModelInfos tModelInfos = tModelList.getTModelInfos();
-        for (int i=0;i<tModelInfos.size();i++)
-        {
-          TModelInfo tModelInfo = tModelInfos.get(i);
-          if (tModelKeyVector.size() < maxResults)
-            tModelKeyVector.addElement(tModelInfo.getTModelKey());
-          else
-            break;
-        }
-      }
-      
-      int finalNumberOfTModelKeys = tModelKeyVector.size();
-      if (finalNumberOfTModelKeys > 0)
-      {
-        if (shouldAddQueryNode)
-        {
-          Vector finalTModelVector = new Vector();
-          int currentIndex = 0;
-          int windowSize = finalNumberOfTModelKeys;
-          while (currentIndex < tModelKeyVector.size())
-          {
-            int subListToIndex = Math.min(currentIndex+windowSize,tModelKeyVector.size());
-            try
-            {
-              TModelDetail tModelDetail = proxy.get_tModelDetail(new Vector(tModelKeyVector.subList(currentIndex,subListToIndex)));
-              Vector tModelVector = tModelDetail.getTModelVector();
-              for (int i=0;i<tModelVector.size();i++)
-                finalTModelVector.addElement(tModelVector.elementAt(i));
-              if (tModelDetail.getTruncatedBoolean())
-                windowSize = tModelVector.size();
-              currentIndex += windowSize;
-            }
-            catch (UDDIException e)
-            {
-              DispositionReport dr = e.getDispositionReport();
-              if (((Result) dr.getResultVector().get(0)).getErrInfo().getErrCode() == DispositionReport.E_invalidKeyPassed)
-              {
-                String errInfoText = ((Result) dr.getResultVector().get(0)).getErrInfo().getText();
-                for (int i=currentIndex;i<subListToIndex;i++)
-                {
-                  String tModelKey = (String)tModelKeyVector.elementAt(i);
-                  if (errInfoText.indexOf(tModelKey) != -1 || errInfoText.indexOf(tModelKey.toUpperCase()) != -1 || errInfoText.indexOf(tModelKey.toLowerCase()) != -1)
-                  {
-                    tModelKeyVector.removeElementAt(i);
-                    break;
-                  }
-                }
-              }
-              else
-                throw e;
-            }
-            catch (TransportException e)
-            {
-              throw e;
-            }
-          }
-          
-          int finalNumberOfTModels = finalTModelVector.size();
-          if (finalNumberOfTModels > 0)
-          {
-            TModel[] tModelArray = new TModel[finalNumberOfTModels];
-            finalTModelVector.toArray(tModelArray);
-            String queryName = (String)propertyTable_.get(UDDIActionInputs.QUERY_NAME);
-            queryElement_ = new QueryElement(tModelArray,queryName,regElement.getModel());
-            addQueryNode();
-            messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_INTERFACES_FOUND",String.valueOf(tModelArray.length)));
-          }
-          else
-            throw new FormInputException(uddiPerspective.getMessage("MSG_ERROR_NO_SERVICE_INTERFACES_FOUND"));
-        }
-        return true;
-      }
-      else
-        throw new FormInputException(uddiPerspective.getMessage("MSG_ERROR_NO_SERVICE_INTERFACES_FOUND"));
-    }
-    catch (UDDIException e)
-    {
-      messageQueue.addMessage(uddiPerspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("UDDIException");
-      messageQueue.addMessage(e.toString());
-    }
-    catch (TransportException e)
-    {
-      handleUnexpectedException(uddiPerspective,messageQueue,"TransportException",e);
-    }
-    catch (MalformedURLException e)
-    {
-      handleUnexpectedException(uddiPerspective,messageQueue,"MalformedURLException",e);
-    }
-    catch (FormInputException e)
-    {
-      messageQueue.addMessage(e.getMessage());
-    }
-    return false;
-  }
-  
-  // Copied directly from UDDIWSDLProxy's findAllServiceInterfaces() method with minor modifications. The hardcoded strings should NOT be translated.
-  private final Vector findAllOwnedTModels(UDDIProxy proxy, String authInfoString, int maxResults) throws UDDIException, TransportException
-  {
-    RegisteredInfo registeredInfo = null;
-
-    // Get the complete list of owned (registered) info.
-    // (A RegisteredInfo consists of BusinessInfos and TModelInfos.
-    // BusinessInfos also contain ServiceInfos.)
-    registeredInfo = proxy.get_registeredInfo(authInfoString);
-
-    //Create a Vector to add the TModelKeys from the registeredInfo.
-    Vector tModelKeyList = new Vector();
-
-    //Get the TModelInfos from the registeredInfo.
-    TModelInfos tModelInfos = registeredInfo.getTModelInfos();
-
-    //Get all the TModelKeys from within the TModelInfos
-    for (int i = 0; i < tModelInfos.size(); i++)
-    {
-      TModelInfo tModelInfo = tModelInfos.get(i);
-      if (tModelKeyList.size() < maxResults)
-        tModelKeyList.addElement(tModelInfo.getTModelKey());
-      else
-        break;
-    }    
-    return tModelKeyList;
-  }  
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfacesSimpleAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfacesSimpleAction.java
deleted file mode 100644
index 420359821..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfacesSimpleAction.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.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.FormInputException;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.response.TModelDetail;
-import org.uddi4j.response.TModelInfo;
-import org.uddi4j.response.TModelInfos;
-import org.uddi4j.response.TModelList;
-import org.uddi4j.transport.TransportException;
-
-public class RegFindServiceInterfacesSimpleAction extends FindAction
-{
-  public RegFindServiceInterfacesSimpleAction(Controller controller)
-  {
-    super(controller);
-    propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES));
-    propertyTable_.put(UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES,String.valueOf(UDDIActionInputs.QUERY_STYLE_SIMPLE));    
-  }
-
-  protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
-  {
-    String name = parser.getParameter(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME);
-
-    // Validate the data.
-    boolean inputsValid = true;
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    uddiPerspective.getMessageQueue();
-    if (name != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME,name);
-    else
-    {
-      // This should never occur.
-      inputsValid = false;
-    }
-    return inputsValid;
-  }
-
-  public final boolean run()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    try
-    {
-      boolean shouldAddQueryNode = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE) == null);      
-      String name = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME);
-      // The action can be run under the context of either a registry or a query node.
-      RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-      UDDIProxy proxy = regElement.getProxy();
-      TModelList tModelList = proxy.find_tModel(name,null,null,null,UDDIActionInputs.QUERY_MAX_SEARCH_SET);
-      TModelInfos tModelInfos = tModelList.getTModelInfos();
-      Vector tModelKeyVector = new Vector();
-      
-      for (int i=0;i<tModelInfos.size();i++)
-      {
-        TModelInfo tModelInfo = tModelInfos.get(i);
-        if (tModelKeyVector.size() < UDDIActionInputs.QUERY_MAX_RESULTS)
-          tModelKeyVector.addElement(tModelInfo.getTModelKey());
-        else
-          break;
-      }
-      
-      if (tModelKeyVector.size() > 0)
-      {
-        if (shouldAddQueryNode)
-        {
-          TModelDetail tModelDetail = proxy.get_tModelDetail(tModelKeyVector);
-          Vector tModelVector = tModelDetail.getTModelVector();
-          TModel[] tModelArray = new TModel[tModelVector.size()];
-          tModelVector.toArray(tModelArray);
-          String queryName = (String)propertyTable_.get(UDDIActionInputs.QUERY_NAME);
-          queryElement_ = new QueryElement(tModelArray,queryName,regElement.getModel());
-          addQueryNode();
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_INTERFACES_FOUND",String.valueOf(tModelArray.length)));        
-        }
-        return true;
-      }
-      else
-        throw new FormInputException(uddiPerspective.getMessage("MSG_ERROR_NO_SERVICE_INTERFACES_FOUND"));
-    }
-    catch (UDDIException e)
-    {
-      messageQueue.addMessage(uddiPerspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("UDDIException");
-      messageQueue.addMessage(e.toString());
-    }
-    catch (TransportException e)
-    {
-      handleUnexpectedException(uddiPerspective,messageQueue,"TransportException",e);
-    }
-    catch (FormInputException e)
-    {
-      messageQueue.addMessage(e.getMessage());
-    }
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceUUIDAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceUUIDAction.java
deleted file mode 100644
index 9cbc0358c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceUUIDAction.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.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.FormInputException;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.response.ServiceDetail;
-import org.uddi4j.transport.TransportException;
-
-public class RegFindServiceUUIDAction extends FindAction
-{
-  public RegFindServiceUUIDAction(Controller controller)
-  {
-    super(controller);
-    propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICES));
-    propertyTable_.put(UDDIActionInputs.QUERY_STYLE_SERVICES,String.valueOf(UDDIActionInputs.QUERY_STYLE_UUID));    
-  }
-
-  protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
-  {
-    String uuidKey = parser.getParameter(UDDIActionInputs.QUERY_INPUT_UUID_KEY);
-
-    // Validate the data.
-    boolean inputsValid = true;
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
-    if (uuidKey != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY,uuidKey);
-
-    if (!subQueryInitiated_ && !Validator.validateString(uuidKey))
-    {
-      inputsValid = false;
-      formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_UUID_KEY"));
-    }
-    return inputsValid;
-  }
-
-  public final boolean run()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    try
-    {
-      boolean shouldAddQueryNode = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE) == null);
-      String uuidKey = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY);
-
-      // The action can be run under the context of either a registry or a query node or even UDDIMainNode.
-      if (regNode_ == null)
-        regNode_ = getRegistryNode((Node)propertyTable_.get(UDDIActionInputs.REFRESH_NODE));
-      RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-      UDDIProxy proxy = regElement.getProxy();
-      BusinessService[] bsArray = new BusinessService[1];
-      ServiceDetail serviceDetail = proxy.get_serviceDetail(uuidKey);
-      Vector bsVector = serviceDetail.getBusinessServiceVector();
-      if (bsVector.size() > 0)
-      {
-        bsVector.toArray(bsArray);
-        if (shouldAddQueryNode)
-        {
-          String queryName = (String)propertyTable_.get(UDDIActionInputs.QUERY_NAME);
-          queryElement_ = new QueryElement(bsArray,queryName,regElement.getModel());
-          addQueryNode();
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICES_FOUND",String.valueOf(bsArray.length)));
-        }
-        propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,bsArray[0]);
-        return true;
-      }
-      else
-        throw new FormInputException(uddiPerspective.getMessage("MSG_ERROR_NO_SERVICES_FOUND"));
-    }
-    catch (UDDIException e)
-    {
-      messageQueue.addMessage(uddiPerspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("UDDIException");
-      messageQueue.addMessage(e.toString());
-    }
-    catch (TransportException e)
-    {
-      handleUnexpectedException(uddiPerspective,messageQueue,"TransportException",e);
-    }
-    catch (FormInputException e)
-    {
-      messageQueue.addMessage(e.getMessage());
-    }
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServicesAdvancedAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServicesAdvancedAction.java
deleted file mode 100644
index 8556db5c8..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServicesAdvancedAction.java
+++ /dev/null
@@ -1,392 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.FormInputException;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.Name;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.response.BusinessInfo;
-import org.uddi4j.response.BusinessInfos;
-import org.uddi4j.response.DispositionReport;
-import org.uddi4j.response.RegisteredInfo;
-import org.uddi4j.response.Result;
-import org.uddi4j.response.ServiceDetail;
-import org.uddi4j.response.ServiceInfo;
-import org.uddi4j.response.ServiceInfos;
-import org.uddi4j.response.ServiceList;
-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;
-import org.uddi4j.util.TModelBag;
-
-public class RegFindServicesAdvancedAction extends FindAction
-{
-  public RegFindServicesAdvancedAction(Controller controller)
-  {
-    super(controller);
-    propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICES));
-    propertyTable_.put(UDDIActionInputs.QUERY_STYLE_SERVICES,String.valueOf(UDDIActionInputs.QUERY_STYLE_ADVANCED));
-    propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_MAX_SEARCH_SET,String.valueOf(UDDIActionInputs.QUERY_MAX_SEARCH_SET));
-    propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_MAX_RESULTS,String.valueOf(UDDIActionInputs.QUERY_MAX_RESULTS));
-  }
-
-  protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
-  {
-    String ownedChecked = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_OWNED);
-    String[] busNodeIds = parser.getParameterValues(UDDIActionInputs.NODEID_BUSINESS);
-    String[] languages = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME_LANGUAGE);
-    String[] names = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME);
-    String[] catTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_TYPE);
-    String[] catKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_NAME);
-    String[] catKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_VALUE);
-    String[] siNodeIds = parser.getParameterValues(UDDIActionInputs.NODEID_SERVICE_INTERFACE);
-    String[] findQualifierValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_FINDQUALIFIER);
-    String maxSearchSet = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_MAX_SEARCH_SET);
-    String maxResults = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_MAX_RESULTS);
-
-    // Validate the data.
-    boolean inputsValid = true;
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    regNode_.getTreeElement();
-
-    if (ownedChecked != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_OWNED,ownedChecked);
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_OWNED);
-
-    if (busNodeIds != null)
-    {
-      // Although we already have the "submitted" data, deletions occur on the client side and thus the need to track this using hidden form elements.
-      Vector serviceBusiness = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS);
-      if (serviceBusiness == null)
-        serviceBusiness = new Vector();
-      else
-        serviceBusiness.removeAllElements();
-      Vector serviceBusinessCopy = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS_COPY);
-      // The browser will enforce the rule of having only one business in this list.
-      ListElement listElement = (ListElement)serviceBusinessCopy.elementAt(0);
-      serviceBusiness.addElement(listElement);
-      BusinessEntity sp = (BusinessEntity)listElement.getObject();
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS,serviceBusiness);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_PROVIDER,sp);
-    }
-    else
-    {
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS);
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_PROVIDER);
-    }
-
-    if (languages != null && names != null)
-    {
-      Vector nameVector = new Vector();
-      for (int i=0;i<names.length;i++)
-      {
-        Name uddi4jName;
-        if (languages[i].length() > 0)
-          uddi4jName = new Name(names[i],languages[i]);
-        else
-          uddi4jName = new Name(names[i]);
-        nameVector.addElement(uddi4jName);
-      }
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES,nameVector);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES);
-
-    if (catTypes != null && catKeyNames != null && catKeyValues != null)
-    {
-      CategoryBag catBag = new CategoryBag();
-      for (int i=0;i<catTypes.length;i++)
-      {
-        KeyedReference kr = new KeyedReference(catKeyNames[i],catKeyValues[i],catTypes[i]);
-        catBag.add(kr);
-      }
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES,catBag);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES);
-
-    if (siNodeIds != null)
-    {
-      // Although we already have the "submitted" data, deletions occur on the client side and thus the need to track this using hidden form elements.
-      Vector serviceServiceInterfaces = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES);
-      if (serviceServiceInterfaces == null)
-        serviceServiceInterfaces = new Vector();
-      else
-        serviceServiceInterfaces.removeAllElements();
-      Vector serviceServiceInterfacesCopy = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES_COPY);
-      Vector tModelKeyStringVector = new Vector();
-      Hashtable resultHash = new Hashtable();
-      for (int i=0;i<siNodeIds.length;i++)
-        resultHash.put(siNodeIds[i],Boolean.TRUE);
-      for (int i=0;i<serviceServiceInterfacesCopy.size();i++)
-      {
-        ListElement listElement = (ListElement)serviceServiceInterfacesCopy.elementAt(i);
-        if (resultHash.get(String.valueOf(listElement.getTargetNodeId())) != null)
-        {
-          serviceServiceInterfaces.addElement(listElement);
-          TModel tModel = (TModel)listElement.getObject();
-          tModelKeyStringVector.addElement(tModel.getTModelKey());
-        }
-      }
-      TModelBag tModelBag = new TModelBag(tModelKeyStringVector);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES,serviceServiceInterfaces);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_TMODELBAG,tModelBag);
-    }
-    else
-    {
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES);
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_TMODELBAG);
-    }
-
-    if (findQualifierValues != null)
-    {
-      FindQualifiers findQualifiers = new FindQualifiers();
-      Vector findQualifierVector = new Vector();
-      for (int i=0;i<findQualifierValues.length;i++)
-      {
-        FindQualifier findQualifier = new FindQualifier(findQualifierValues[i]);
-        findQualifierVector.addElement(findQualifier);
-      }
-      findQualifiers.setFindQualifierVector(findQualifierVector);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_FINDQUALIFIERS,findQualifiers);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_FINDQUALIFIERS);
-
-    if (maxSearchSet != null)
-    {
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_MAX_SEARCH_SET,maxSearchSet);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_MAX_SEARCH_SET,maxSearchSet);
-    }
-    if (!subQueryInitiated_ && !Validator.validateInteger(maxSearchSet))
-    {
-      formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_MAX_SEARCH_SET);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_MAX_SEARCH_SET"));
-      inputsValid = false;
-    }
-
-    if (maxResults != null)
-    {
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_MAX_RESULTS,maxResults);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_MAX_RESULTS,maxResults);
-    }
-    if (!subQueryInitiated_ && !Validator.validateInteger(maxResults))
-    {
-      formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_MAX_RESULTS);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_MAX_RESULTS"));
-      inputsValid = false;
-    }
-    return inputsValid;
-  }
-
-  public final boolean run()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    try
-    {
-      boolean shouldAddQueryNode = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE) == null);      
-      FindQualifiers findQualifiers = (FindQualifiers)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_FINDQUALIFIERS);
-      BusinessEntity sp = (BusinessEntity)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_PROVIDER);
-      Vector nameVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES);
-      CategoryBag categoryBag = (CategoryBag)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES);
-      TModelBag tModelBag = (TModelBag)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_TMODELBAG);
-      boolean owned = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_OWNED) != null);
-      String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-      String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-      String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-      int maxSearchSet = Integer.parseInt((String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_MAX_SEARCH_SET));
-      int maxResults = Integer.parseInt((String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_MAX_RESULTS));
-
-      // The action can be run under the context of either a registry or a query node.
-      RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-      if (owned && !regElement.isLoggedIn())
-        regElement.performLogin(publishURL,userId,password);
-        
-      UDDIProxy proxy = regElement.getProxy();
-      String businessKey;
-      if (sp != null)
-        businessKey = sp.getBusinessKey();
-      else
-        businessKey = "";
-
-      int finalNumberOfServiceKeys;
-      Vector serviceKeyVector;
-      if (owned)
-      {
-        serviceKeyVector = findAllOwnedServices(proxy,regElement.getAuthInfoString(),businessKey,maxResults);
-        finalNumberOfServiceKeys = serviceKeyVector.size();
-      }
-      else
-      {
-        ServiceList serviceList = proxy.find_service(businessKey,nameVector,categoryBag,tModelBag,findQualifiers,maxSearchSet);
-        ServiceInfos sInfos = serviceList.getServiceInfos();
-        finalNumberOfServiceKeys = Math.min(maxResults,sInfos.size());
-        serviceKeyVector = new Vector();
-        for (int i=0;i<finalNumberOfServiceKeys;i++)
-        {
-          ServiceInfo sInfo = sInfos.get(i);
-          serviceKeyVector.addElement(sInfo.getServiceKey());
-        }
-      }
-      
-      if (finalNumberOfServiceKeys > 0)
-      {      
-        if (shouldAddQueryNode)
-        {
-          Vector finalBusServiceVector = new Vector();
-          int currentIndex = 0;
-          int windowSize = finalNumberOfServiceKeys;
-          while (currentIndex < serviceKeyVector.size())
-          {
-            int subListToIndex = Math.min(currentIndex+windowSize,serviceKeyVector.size());
-            try
-            {
-              ServiceDetail serviceDetail = proxy.get_serviceDetail(new Vector(serviceKeyVector.subList(currentIndex,subListToIndex)));
-              Vector busServiceVector = serviceDetail.getBusinessServiceVector();
-              for (int i=0;i<busServiceVector.size();i++)
-                finalBusServiceVector.addElement(busServiceVector.elementAt(i));
-              if (serviceDetail.getTruncatedBoolean())
-                windowSize = busServiceVector.size();
-              currentIndex += windowSize;
-            }
-            catch (UDDIException e)
-            {
-              DispositionReport dr = e.getDispositionReport();
-              if (((Result) dr.getResultVector().get(0)).getErrInfo().getErrCode() == DispositionReport.E_invalidKeyPassed)
-              {
-                String errInfoText = ((Result) dr.getResultVector().get(0)).getErrInfo().getText();
-                for (int i=currentIndex;i<subListToIndex;i++)
-                {
-                  String serviceKey = (String)serviceKeyVector.elementAt(i);
-                  if (errInfoText.indexOf(serviceKey) != -1 || errInfoText.indexOf(serviceKey.toUpperCase()) != -1 || errInfoText.indexOf(serviceKey.toLowerCase()) != -1)
-                  {
-                    serviceKeyVector.removeElementAt(i);
-                    break;
-                  }
-                }
-              }
-              else
-                throw e;
-            }
-            catch (TransportException e)
-            {
-              throw e;
-            }            
-          }
-          
-          int finalNumberOfBusinessServices = finalBusServiceVector.size();
-          if (finalNumberOfBusinessServices > 0)
-          {
-            BusinessService[] bsArray = new BusinessService[finalNumberOfBusinessServices];
-            finalBusServiceVector.toArray(bsArray);
-            String queryName = (String)propertyTable_.get(UDDIActionInputs.QUERY_NAME);
-            queryElement_ = new QueryElement(bsArray,queryName,regElement.getModel());
-            addQueryNode();
-            messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICES_FOUND",String.valueOf(bsArray.length)));
-          }
-          else
-            throw new FormInputException(uddiPerspective.getMessage("MSG_ERROR_NO_SERVICES_FOUND"));
-        }
-        return true;
-      }
-      else
-        throw new FormInputException(uddiPerspective.getMessage("MSG_ERROR_NO_SERVICES_FOUND"));
-    }   
-    catch (UDDIException e)
-    {
-      messageQueue.addMessage(uddiPerspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("UDDIException");
-      messageQueue.addMessage(e.toString());
-    }
-    catch (TransportException e)
-    {
-      handleUnexpectedException(uddiPerspective,messageQueue,"TransportException",e);
-    } 
-    catch (FormInputException e)
-    {
-      messageQueue.addMessage(e.getMessage());
-    }
-    catch (MalformedURLException e)
-    {
-      handleUnexpectedException(uddiPerspective,messageQueue,"MalformedURLException",e);
-    }
-    return false;
-  }
-  
-  // Copied directly from UDDIWSDLProxy's findAllOwnedServices() method with minor modifications. The hardcoded strings should NOT be translated.
-  private final Vector findAllOwnedServices(UDDIProxy proxy,String authInfoString,String businessKey,int maxResults) throws UDDIException, TransportException
-  {
-    RegisteredInfo registeredInfo = null;
-
-    // Get the complete list of owned (registered) info.
-    // (A RegisteredInfo consists of BusinessInfos and TModelInfos.
-    // BusinessInfos also contain ServiceInfos.)
-    registeredInfo = proxy.get_registeredInfo(authInfoString);
-
-    //Create a vector to add the serviceKeys from the registeredInfo to.
-    Vector serviceKeyList = new Vector();
-
-    //Get the businessInfos from the registeredInfo.
-    BusinessInfos businessInfos = registeredInfo.getBusinessInfos();
-
-    //Get all the serviceKeys from the serviceInfos within the businessInfos,
-    //and add them to the serviceKeyList.
-    boolean endSearch = false;
-    for (int i = 0; i < businessInfos.size(); i++)
-    {
-      BusinessInfo businessInfo = businessInfos.get(i);
-      String currentBusinessKey = businessInfo.getBusinessKey();
-      if (businessKey.length() > 0 && currentBusinessKey.equals(businessKey))
-        endSearch = true;
-      ServiceInfos serviceInfos = businessInfo.getServiceInfos();
-      for (int j = 0; j < serviceInfos.size(); j++)
-      {
-        ServiceInfo serviceInfo = serviceInfos.get(j);
-        if (serviceInfo.getBusinessKey().equals(currentBusinessKey))
-        {
-          if (serviceKeyList.size() < maxResults)
-            serviceKeyList.add(serviceInfo.getServiceKey());
-          else
-          {
-            endSearch = true;
-            break;
-          }
-        }
-      }
-      if (endSearch)
-        break;
-    }    
-    return serviceKeyList;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServicesSimpleAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServicesSimpleAction.java
deleted file mode 100644
index 5eaef0de7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServicesSimpleAction.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.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.FormInputException;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.Name;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.response.ServiceDetail;
-import org.uddi4j.response.ServiceInfo;
-import org.uddi4j.response.ServiceInfos;
-import org.uddi4j.response.ServiceList;
-import org.uddi4j.transport.TransportException;
-
-public class RegFindServicesSimpleAction extends FindAction
-{
-  public RegFindServicesSimpleAction(Controller controller)
-  {
-    super(controller);
-    propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICES));
-    propertyTable_.put(UDDIActionInputs.QUERY_STYLE_SERVICES,String.valueOf(UDDIActionInputs.QUERY_STYLE_SIMPLE));    
-  }
-
-  protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
-  {
-    String name = parser.getParameter(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME);
-
-    // Validate the data.
-    boolean inputsValid = true;
-
-    if (name != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME,name);
-    else
-    {
-      // This shouldn't occur.
-      inputsValid = false;
-    }
-    return inputsValid;
-  }
-
-  public final boolean run()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    try
-    {
-      boolean shouldAddQueryNode = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE) == null);
-      String name = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME);
-      Vector nameVector = new Vector();
-      nameVector.addElement(new Name(name));
-
-      // The action can be run under the context of either a registry or a query node.
-      getSelectedNavigatorNode();
-      RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-      UDDIProxy proxy = regElement.getProxy();
-      ServiceList serviceList = proxy.find_service("",nameVector,null,null,null,UDDIActionInputs.QUERY_MAX_SEARCH_SET);
-      
-      ServiceInfos sInfos = serviceList.getServiceInfos();
-      int finalNumberOfBusinessServices = Math.min(UDDIActionInputs.QUERY_MAX_RESULTS,sInfos.size());
-      Vector serviceKeyVector = new Vector();
-      for (int i=0;i<finalNumberOfBusinessServices;i++)
-      {
-        ServiceInfo sInfo = sInfos.get(i);
-        serviceKeyVector.addElement(sInfo.getServiceKey());
-      }
-        
-      if (finalNumberOfBusinessServices > 0)
-      {
-        if (shouldAddQueryNode)
-        {
-          ServiceDetail serviceDetail = proxy.get_serviceDetail(serviceKeyVector);
-          Vector businessServiceVector = serviceDetail.getBusinessServiceVector();
-          String queryName = (String)propertyTable_.get(UDDIActionInputs.QUERY_NAME);
-          BusinessService[] bsArray = new BusinessService[finalNumberOfBusinessServices];
-          businessServiceVector.toArray(bsArray);
-          queryElement_ = new QueryElement(bsArray,queryName,regElement.getModel());
-          addQueryNode();
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICES_FOUND",String.valueOf(bsArray.length)));
-        }
-        return true;
-      }
-      else
-        throw new FormInputException(uddiPerspective.getMessage("MSG_ERROR_NO_SERVICES_FOUND"));
-    }
-    catch (UDDIException e)
-    {
-      messageQueue.addMessage(uddiPerspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("UDDIException");
-      messageQueue.addMessage(e.toString());
-    }
-    catch (TransportException e)
-    {
-      handleUnexpectedException(uddiPerspective,messageQueue,"TransportException",e);
-    }
-    catch (FormInputException e)
-    {
-      messageQueue.addMessage(e.getMessage());
-    }
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishBusinessAdvancedAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishBusinessAdvancedAction.java
deleted file mode 100644
index 5ae3a8a73..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishBusinessAdvancedAction.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.Description;
-import org.uddi4j.datatype.Name;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.util.CategoryBag;
-import org.uddi4j.util.DiscoveryURL;
-import org.uddi4j.util.DiscoveryURLs;
-import org.uddi4j.util.IdentifierBag;
-import org.uddi4j.util.KeyedReference;
-
-public class RegPublishBusinessAdvancedAction extends PublishAction
-{
-  public RegPublishBusinessAdvancedAction(Controller controller)
-  {
-    super(controller);
-    propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_BUSINESSES));
-    propertyTable_.put(UDDIActionInputs.QUERY_STYLE_BUSINESSES,String.valueOf(UDDIActionInputs.QUERY_STYLE_ADVANCED));    
-  }
-
-  protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
-  {
-    String[] nameLanguages = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME_LANGUAGE);
-    String[] names = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME);
-    String[] descriptionLanguages = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION_LANGUAGE);
-    String[] descriptions = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION);
-    String[] idTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_TYPE);
-    String[] idKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_NAME);
-    String[] idKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_VALUE);
-    String[] catTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_TYPE);
-    String[] catKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_NAME);
-    String[] catKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_VALUE);
-    String[] discoveryURLValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DISCOVERYURL);
-
-    // Validate the data.
-    boolean inputsValid = true;
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
-    Hashtable languageHash = new Hashtable();
-    if (nameLanguages != null && names != null)
-    {
-      Vector nameVector = new Vector();
-      // UDDI's save API (Appendix C of the UDDI V2 Programmers API Specification) requires the following:
-      // 1) Only the first row can have a blank language.
-      // 2) Only 1 name per language.
-      String[] parameters = new String[2];
-      parameters[0] = uddiPerspective.getMessage("FORM_LABEL_NAME");
-      for (int i=0;i<names.length;i++)
-      {
-        parameters[1] = String.valueOf(i+1);
-        Name uddi4jName;
-        if (nameLanguages[i].length() > 0)
-          uddi4jName = new Name(names[i],nameLanguages[i]);
-        else
-        {
-          uddi4jName = new Name(names[i]);
-          if (i != 0 && !subQueryInitiated_)
-          {
-            inputsValid = false;
-            formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES,i);
-            messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_BLANK_LANGUAGE",parameters));
-          }
-        }
-        if (languageHash.get(nameLanguages[i]) != null)
-        {
-          inputsValid = false;
-          formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES,i);
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_DUPLICATE_LANGUAGE",parameters));
-        }
-        else
-          languageHash.put(nameLanguages[i],Boolean.TRUE);
-        if (names[i].trim().length() < 1)
-        {
-          inputsValid = false;
-          formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES,i);
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_INVALID_TEXT",parameters));
-        }
-        nameVector.addElement(uddi4jName);
-      }
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES,nameVector);
-    }
-    else
-    {
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES);
-      if (!subQueryInitiated_)
-      {
-        inputsValid = false;
-        formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES);
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_NO_NAMES"));
-      }
-    }
-
-    if (descriptionLanguages != null && descriptions != null)
-    {
-      Vector descriptionVector = new Vector();
-      String[] parameters = new String[2];
-      parameters[0] = uddiPerspective.getMessage("FORM_LABEL_DESCRIPTION");
-      languageHash.clear();
-      for (int i=0;i<descriptions.length;i++)
-      {
-        parameters[1] = String.valueOf(i+1);
-        Description uddi4jDescription;
-        if (descriptionLanguages[i].length() > 0)
-          uddi4jDescription = new Description(descriptions[i],descriptionLanguages[i]);
-        else
-        {
-          uddi4jDescription = new Description(descriptions[i]);
-          if (i != 0 && !subQueryInitiated_)
-          {
-            inputsValid = false;
-            formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS,i);
-            messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_BLANK_LANGUAGE",parameters));
-          }
-        }
-        if (languageHash.get(descriptionLanguages[i]) != null)
-        {
-          inputsValid = false;
-          formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS,i);
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_DUPLICATE_LANGUAGE",parameters));
-        }
-        else
-          languageHash.put(descriptionLanguages[i],Boolean.TRUE);
-        if (descriptions[i].trim().length() < 1)
-        {
-          inputsValid = false;
-          formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS,i);
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_INVALID_TEXT",parameters));
-        }
-        descriptionVector.addElement(uddi4jDescription);
-      }
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS,descriptionVector);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS);
-
-    if (idTypes != null && idKeyNames != null && idKeyValues != null)
-    {
-      IdentifierBag idBag = new IdentifierBag();
-      for (int i=0;i<idKeyNames.length;i++)
-      {
-        KeyedReference kr = new KeyedReference(idKeyNames[i],idKeyValues[i],idTypes[i]);
-        idBag.add(kr);
-      }
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS,idBag);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS);
-
-    if (catTypes != null && catKeyNames != null && catKeyValues != null)
-    {
-      CategoryBag catBag = new CategoryBag();
-      for (int i=0;i<catTypes.length;i++)
-      {
-        KeyedReference kr = new KeyedReference(catKeyNames[i],catKeyValues[i],catTypes[i]);
-        catBag.add(kr);
-      }
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES,catBag);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES);
-      
-    if (discoveryURLValues != null)
-    {
-      DiscoveryURLs discoveryURLs = new DiscoveryURLs();
-      String[] parameters = new String[2];
-      parameters[0] = uddiPerspective.getMessage("FORM_LABEL_DISCOVERYURL");
-      for (int i=0;i<discoveryURLValues.length;i++)
-      {
-        parameters[1] = String.valueOf(i+1);
-        if (!subQueryInitiated_ && !Validator.validateURL(discoveryURLValues[i]))
-        {
-          inputsValid = false;
-          formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS,i);
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_INVALID_TEXT",parameters));
-        }
-        discoveryURLs.add(new DiscoveryURL(discoveryURLValues[i],""));
-      }
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS,discoveryURLs);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS);      
-
-    return inputsValid;
-  }
-
-  public final boolean run()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    try
-    {
-      String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-      String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-      String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-      Vector nameVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES);
-      Vector descriptionVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS);
-      IdentifierBag identifierBag = (IdentifierBag)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS);
-      CategoryBag categoryBag = (CategoryBag)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES);
-      DiscoveryURLs discoveryURLs = (DiscoveryURLs)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS);
-
-      // The action can be run under the context of either a registry or a query node.
-      RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-      if (!regElement.isLoggedIn())
-        regElement.performLogin(publishURL,userId,password);
-      UDDIProxy proxy = regElement.getProxy();
-
-      BusinessEntity be = new BusinessEntity();
-      be.setBusinessKey("");
-      be.setNameVector(nameVector);
-      be.setDescriptionVector(descriptionVector);
-      be.setIdentifierBag(identifierBag);
-      be.setCategoryBag(categoryBag);
-      be.setDiscoveryURLs(discoveryURLs);
-      Vector beVector = new Vector();
-      beVector.add(be);
-
-      be = (BusinessEntity)proxy.save_business(regElement.getAuthInfoString(), beVector).getBusinessEntityVector().get(0);
-      addPublishedItemNode(be,regElement);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_BUSINESS_PUBLISHED",be.getDefaultNameString()));
-      return true;
-    }
-    catch (TransportException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("TransportException");
-      messageQueue.addMessage(e.getMessage());
-    }
-    catch (UDDIException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("UDDIException");
-      messageQueue.addMessage(e.toString());
-    }
-    catch (MalformedURLException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("MalformedURLException");
-      messageQueue.addMessage(e.getMessage());
-    }
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishBusinessSimpleAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishBusinessSimpleAction.java
deleted file mode 100644
index 57dd64ded..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishBusinessSimpleAction.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.Name;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.transport.TransportException;
-
-public class RegPublishBusinessSimpleAction extends PublishAction
-{
-  public RegPublishBusinessSimpleAction(Controller controller)
-  {
-    super(controller);
-    propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_BUSINESSES));
-    propertyTable_.put(UDDIActionInputs.QUERY_STYLE_BUSINESSES,String.valueOf(UDDIActionInputs.QUERY_STYLE_SIMPLE));    
-  }
-
-  protected boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
-  {
-    String name = parser.getParameter(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_NAME);
-    String description = parser.getParameter(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_DESCRIPTION);
-
-    boolean inputsValid = true;
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
-    if (name != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_NAME,name);
-
-    if (!subQueryInitiated_ && !Validator.validateString(name))
-    {
-      inputsValid = false;
-      formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_NAME);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_NAME"));
-    }
-
-    if (description != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_DESCRIPTION,description);
-
-    return inputsValid;
-  }
-
-  public final boolean run()
-  {
-    String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-    String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-    String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-    String name = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_NAME);
-    String description = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_DESCRIPTION);
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-    try
-    {
-      UDDIProxy proxy = regElement.getProxy();
-      if (!regElement.isLoggedIn())
-        regElement.performLogin(publishURL,userId,password);
-
-      BusinessEntity be = new BusinessEntity();
-      be.setBusinessKey("");
-      be.setDefaultName(new Name(name));
-      be.setDefaultDescriptionString(description);
-      Vector beVector = new Vector();
-      beVector.add(be);
-
-      be = (BusinessEntity)proxy.save_business(regElement.getAuthInfoString(), beVector).getBusinessEntityVector().get(0);
-      addPublishedItemNode(be,regElement);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_BUSINESS_PUBLISHED",be.getDefaultNameString()));
-      return true;
-    }
-    catch (TransportException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("TransportException");
-      messageQueue.addMessage(e.getMessage());
-    }
-    catch (UDDIException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("UDDIException");
-      messageQueue.addMessage(e.toString());
-    }
-    catch (MalformedURLException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("MalformedURLException");
-      messageQueue.addMessage(e.getMessage());
-    }
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceAdvancedAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceAdvancedAction.java
deleted file mode 100644
index 8cb48a616..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceAdvancedAction.java
+++ /dev/null
@@ -1,370 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Vector;
-import javax.wsdl.Definition;
-import javax.wsdl.WSDLException;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.Description;
-import org.uddi4j.datatype.Name;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.util.CategoryBag;
-import org.uddi4j.util.KeyedReference;
-
-public class RegPublishServiceAdvancedAction extends PublishAction
-{
-  public RegPublishServiceAdvancedAction(Controller controller)
-  {
-    super(controller);
-    propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICES));
-    propertyTable_.put(UDDIActionInputs.QUERY_STYLE_SERVICES,String.valueOf(UDDIActionInputs.QUERY_STYLE_ADVANCED));    
-  }
-
-  protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
-  {
-    String busNodeIds = parser.getParameter(UDDIActionInputs.NODEID_BUSINESS);
-    String[] serIntIds = parser.getParameterValues(UDDIActionInputs.NODEID_SERVICE_INTERFACE);
-    String wsdlURL = parser.getParameter(ActionInputs.QUERY_INPUT_WSDL_URL);
-    String[] nameLanguages = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME_LANGUAGE);
-    String[] names = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME);    
-    String[] descriptionLanguages = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION_LANGUAGE);
-    String[] descriptions = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION);
-    String[] catTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_TYPE);
-    String[] catKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_NAME);
-    String[] catKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_VALUE);
-
-    // Validate the data.
-    boolean inputsValid = true;
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
-    if (busNodeIds != null)
-    {
-      Vector serviceBusiness = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS);
-      if (serviceBusiness == null)
-        serviceBusiness = new Vector();
-      else
-        serviceBusiness.removeAllElements();
-      Vector serviceBusinessCopy = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS_COPY);
-      // The browser will enforce the rule of having only one business in this list.
-      ListElement listElement = (ListElement)serviceBusinessCopy.elementAt(0);
-      serviceBusiness.addElement(listElement);
-      BusinessEntity sp = (BusinessEntity)listElement.getObject();
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS,serviceBusiness);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_PROVIDER,sp);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY,sp.getBusinessKey());
-    }
-    else
-    {
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS);
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_PROVIDER);
-      if (!subQueryInitiated_)
-      {
-        inputsValid = false;
-        formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS);
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_BUSINESS"));
-      }      
-    }
-    
-    if (serIntIds != null && serIntIds.length > 0)
-    {
-      Vector serviceInterfaces = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES);
-      if (serviceInterfaces == null)
-        serviceInterfaces = new Vector();
-      else
-        serviceInterfaces.removeAllElements();
-      Vector serviceInterfacesCopy = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES_COPY);
-      Vector tmodels = new Vector();
-      for (Iterator it = serviceInterfacesCopy.iterator(); it.hasNext();)
-      {
-        ListElement listElement = (ListElement)it.next();
-        int targetNodeId = listElement.getTargetNodeId();
-        for (int i = 0; i < serIntIds.length; i++)
-        {
-          try
-          {
-            if (targetNodeId == Integer.parseInt(serIntIds[i]))
-            {
-              serviceInterfaces.add(listElement);
-              tmodels.add(listElement.getObject());
-              break;
-            }
-          }
-          catch (NumberFormatException nfe)
-          {
-          }
-        }
-      }
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES, serviceInterfaces);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_TMODEL, tmodels);
-    }
-    else
-    {
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES);
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_TMODEL);
-    }
-    
-    if (wsdlURL != null)
-    {
-      propertyTable_.put(ActionInputs.QUERY_INPUT_WSDL_URL,wsdlURL);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL,wsdlURL);
-    }
-
-    if (!subQueryInitiated_ && !Validator.validateString(wsdlURL))
-    {
-      inputsValid = false;
-      formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_WSDL_URL"));
-    }
-
-    Hashtable languageHash = new Hashtable();
-    if (nameLanguages != null && names != null)
-    {
-      Vector nameVector = new Vector();
-      // UDDI's save API (Appendix C of the UDDI V2 Programmers API Specification) requires the following:
-      // 1) Only the first row can have a blank language.
-      // 2) Only 1 name per language.
-      String[] parameters = new String[2];
-      parameters[0] = uddiPerspective.getMessage("FORM_LABEL_NAME");
-      for (int i=0;i<names.length;i++)
-      {
-        parameters[1] = String.valueOf(i+1);
-        Name uddi4jName;
-        if (nameLanguages[i].length() > 0)
-          uddi4jName = new Name(names[i],nameLanguages[i]);
-        else
-        {
-          uddi4jName = new Name(names[i]);
-          if (i != 0 && !subQueryInitiated_)
-          {
-            inputsValid = false;
-            formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES,i);
-            messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_BLANK_LANGUAGE",parameters));
-          }
-        }
-        if (languageHash.get(nameLanguages[i]) != null)
-        {
-          inputsValid = false;
-          formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES,i);
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_DUPLICATE_LANGUAGE",parameters));
-        }
-        else
-          languageHash.put(nameLanguages[i],Boolean.TRUE);
-        if (names[i].trim().length() < 1)
-        {
-          inputsValid = false;
-          formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES,i);
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_INVALID_TEXT",parameters));
-        }
-        nameVector.addElement(uddi4jName);
-      }
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES,nameVector);
-    }
-    else
-    {
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES);
-      if (!subQueryInitiated_)
-      {
-        inputsValid = false;
-        formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES);
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_NO_NAMES"));
-      }
-    }
-
-    if (descriptionLanguages != null && descriptions != null)
-    {
-      Vector descriptionVector = new Vector();
-      String[] parameters = new String[2];
-      parameters[0] = uddiPerspective.getMessage("FORM_LABEL_DESCRIPTION");
-      languageHash.clear();
-      for (int i=0;i<descriptions.length;i++)
-      {
-        parameters[1] = String.valueOf(i+1);
-        Description uddi4jDescription;
-        if (descriptionLanguages[i].length() > 0)
-          uddi4jDescription = new Description(descriptions[i],descriptionLanguages[i]);
-        else
-        {
-          uddi4jDescription = new Description(descriptions[i]);
-          if (i != 0 && !subQueryInitiated_)
-          {
-            inputsValid = false;
-            formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS,i);
-            messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_BLANK_LANGUAGE",parameters));
-          }
-        }
-        if (languageHash.get(descriptionLanguages[i]) != null)
-        {
-          inputsValid = false;
-          formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS,i);
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_DUPLICATE_LANGUAGE",parameters));
-        }
-        else
-          languageHash.put(descriptionLanguages[i],Boolean.TRUE);
-        if (descriptions[i].trim().length() < 1)
-        {
-          inputsValid = false;
-          formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS,i);
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_INVALID_TEXT",parameters));
-        }
-        descriptionVector.addElement(uddi4jDescription);
-      }
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS,descriptionVector);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS);
-
-    if (catTypes != null && catKeyNames != null && catKeyValues != null)
-    {
-      CategoryBag catBag = new CategoryBag();
-      for (int i=0;i<catTypes.length;i++)
-      {
-        KeyedReference kr = new KeyedReference(catKeyNames[i],catKeyValues[i],catTypes[i]);
-        catBag.add(kr);
-      }
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES,catBag);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES);
-
-    return inputsValid;
-  }
-
-  public final boolean run()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    try
-    {
-      String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-      String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-      String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-      BusinessEntity be = (BusinessEntity)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_PROVIDER);
-      String businessKey = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY);
-      Vector tModelVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_TMODEL);
-      String wsdlURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL);
-      Vector nameVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES);
-      Vector descriptionVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS);
-      CategoryBag categoryBag = (CategoryBag)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES);
-
-      // The action can be run under the context of either a registry or a query node.
-      RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-      if (!regElement.isLoggedIn())
-        regElement.performLogin(publishURL,userId,password);
-      UDDIProxy proxy = regElement.getProxy();
-
-      Uddi4jHelper uddi4jHelper = new Uddi4jHelper();
-      Definition def = uddi4jHelper.getWSDLDefinition(wsdlURL);
-
-      BusinessService bs;
-      if (tModelVector != null && tModelVector.size() > 0)
-        bs = uddi4jHelper.newBusinessService(wsdlURL, def, (TModel[])tModelVector.toArray(new TModel[0]));
-      else
-      {
-        RegPublishServiceInterfaceSimpleAction regPublishSIAction = new RegPublishServiceInterfaceSimpleAction(controller_);
-        int currentNodeId = getSelectedNavigatorNode().getNodeId();
-        NodeManager nodeManager = regNode_.getNodeManager();
-        TModel[] tModels = null;
-        if (uddi4jHelper.isMonolithicWSDL(def))
-        {
-          tModels = new TModel[1];
-          tModels[0] = uddi4jHelper.newTModel(wsdlURL, def);
-        }
-        else
-        {
-          String[] imports = uddi4jHelper.getImports(def, wsdlURL);
-          tModels = new TModel[imports.length];
-          for (int i = 0; i < tModels.length; i++)
-            tModels[i] = uddi4jHelper.newTModel(imports[i]);
-        }
-        Hashtable tModelsTable = new Hashtable();
-        if (tModels != null)
-        {
-          for (int i=0;i<tModels.length;i++)
-          {
-            boolean inputsValid = regPublishSIAction.populatePropertyTable(uddi4jHelper.getWSDL(tModels[i]), tModels[i]);
-            if (inputsValid)
-            {
-              regPublishSIAction.run();
-              Object savedTModel = regPublishSIAction.getPropertyTable().get(UDDIActionInputs.QUERY_OUTPUT_SAVED_TMODEL);
-              if (savedTModel != null)
-                tModelsTable.put(((TModel)savedTModel).getNameString(), savedTModel);
-              // Reselect the current node.
-              nodeManager.setSelectedNodeId(currentNodeId);
-            }
-          }
-        }
-        bs = uddi4jHelper.newBusinessService(wsdlURL, def, tModelsTable);
-      }
-      
-      if (be != null)
-        bs.setBusinessKey(be.getBusinessKey());
-      else if (businessKey != null)
-        bs.setBusinessKey(businessKey);
-      bs.setNameVector(nameVector);
-      bs.setDescriptionVector(descriptionVector);
-      bs.setCategoryBag(categoryBag);
-      Vector bsVector = new Vector();
-      bsVector.add(bs);
-      regElement.handlePreInvocation(bs);
-      bs = (BusinessService)proxy.save_service(regElement.getAuthInfoString(), bsVector).getBusinessServiceVector().get(0);
-      addPublishedItemNode(bs,regElement);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_PUBLISHED",bs.getDefaultNameString()));
-      return true;
-    }
-    catch (WSDLException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("WSDLException");
-      messageQueue.addMessage(e.getMessage());
-    }
-    catch (TransportException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("TransportException");
-      messageQueue.addMessage(e.getMessage());
-    }
-    catch (UDDIException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("UDDIException");
-      messageQueue.addMessage(e.toString());
-    }
-    catch (MalformedURLException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("MalformedURLException");
-      messageQueue.addMessage(e.getMessage());      
-    }
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceInterfaceAdvancedAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceInterfaceAdvancedAction.java
deleted file mode 100644
index 9af4270b2..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceInterfaceAdvancedAction.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Hashtable;
-import java.util.Vector;
-import javax.wsdl.WSDLException;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.Description;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.util.CategoryBag;
-import org.uddi4j.util.IdentifierBag;
-import org.uddi4j.util.KeyedReference;
-
-public class RegPublishServiceInterfaceAdvancedAction extends PublishAction
-{
-  public RegPublishServiceInterfaceAdvancedAction(Controller controller)
-  {
-    super(controller);
-    propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES));
-    propertyTable_.put(UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES,String.valueOf(UDDIActionInputs.QUERY_STYLE_ADVANCED));    
-  }
-
-  protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
-  {
-    String wsdlURL = parser.getParameter(ActionInputs.QUERY_INPUT_WSDL_URL);
-    String name = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME);
-    String[] descriptionLanguages = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION_LANGUAGE);
-    String[] descriptions = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION);
-    String[] idTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_TYPE);
-    String[] idKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_NAME);
-    String[] idKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_VALUE);
-    String[] catTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_TYPE);
-    String[] catKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_NAME);
-    String[] catKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_VALUE);
-
-    // Validate the data.
-    boolean inputsValid = true;
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
-    Hashtable languageHash = new Hashtable();
-
-    if (wsdlURL != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL,wsdlURL);
-
-    if (!subQueryInitiated_ && !Validator.validateString(wsdlURL))
-    {
-      inputsValid = false;
-      formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_WSDL_URL"));
-    }
-
-    if (name != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME,name);
-
-    if (!subQueryInitiated_ && !Validator.validateString(name))
-    {
-      inputsValid = false;
-      formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_NAME"));
-    }
-
-    if (descriptionLanguages != null && descriptions != null)
-    {
-      Vector descriptionVector = new Vector();
-      String[] parameters = new String[2];
-      parameters[0] = uddiPerspective.getMessage("FORM_LABEL_DESCRIPTION");
-      languageHash.clear();
-      for (int i=0;i<descriptions.length;i++)
-      {
-        parameters[1] = String.valueOf(i+1);
-        Description uddi4jDescription;
-        if (descriptionLanguages[i].length() > 0)
-          uddi4jDescription = new Description(descriptions[i],descriptionLanguages[i]);
-        else
-        {
-          uddi4jDescription = new Description(descriptions[i]);
-          if (i != 0 && !subQueryInitiated_)
-          {
-            inputsValid = false;
-            formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS,i);
-            messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_BLANK_LANGUAGE",parameters));
-          }
-        }
-        if (languageHash.get(descriptionLanguages[i]) != null)
-        {
-          inputsValid = false;
-          formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS,i);
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_DUPLICATE_LANGUAGE",parameters));
-        }
-        else
-          languageHash.put(descriptionLanguages[i],Boolean.TRUE);
-        if (descriptions[i].trim().length() < 1)
-        {
-          inputsValid = false;
-          formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS,i);
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_INVALID_TEXT",parameters));
-        }
-        descriptionVector.addElement(uddi4jDescription);
-      }
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS,descriptionVector);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS);
-
-    if (idTypes != null && idKeyNames != null && idKeyValues != null)
-    {
-      IdentifierBag idBag = new IdentifierBag();
-      for (int i=0;i<idKeyNames.length;i++)
-      {
-        KeyedReference kr = new KeyedReference(idKeyNames[i],idKeyValues[i],idTypes[i]);
-        idBag.add(kr);
-      }
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS,idBag);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS);
-
-    if (catTypes != null && catKeyNames != null && catKeyValues != null)
-    {
-      CategoryBag catBag = new CategoryBag();
-      for (int i=0;i<catTypes.length;i++)
-      {
-        KeyedReference kr = new KeyedReference(catKeyNames[i],catKeyValues[i],catTypes[i]);
-        catBag.add(kr);
-      }
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES,catBag);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES);
-
-    return inputsValid;
-  }
-
-  public final boolean run()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    try
-    {
-      String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-      String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-      String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-      String wsdlURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL);
-      String name = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME);
-      Vector descriptionVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS);
-      IdentifierBag identifierBag = (IdentifierBag)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS);
-      CategoryBag categoryBag = (CategoryBag)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES);
-
-      // The action can be run under the context of either a registry or a query node.
-      RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-      if (!regElement.isLoggedIn())
-        regElement.performLogin(publishURL,userId,password);
-      UDDIProxy proxy = regElement.getProxy();
-
-      TModel tModel = (new Uddi4jHelper()).newTModel(wsdlURL);
-      tModel.setName(name);
-      tModel.setDescriptionVector(descriptionVector);
-      tModel.setIdentifierBag(identifierBag);
-      
-      // The category bag may contain wsdlSpec.
-      CategoryBag defaultCategoryBag = tModel.getCategoryBag();
-      Vector defaultKeyedReferenceVector = null;
-      if (defaultCategoryBag != null)
-      {
-        if (categoryBag == null)
-          categoryBag = defaultCategoryBag;
-        else
-        {
-          defaultKeyedReferenceVector = defaultCategoryBag.getKeyedReferenceVector();
-          for (int i=0;i<defaultKeyedReferenceVector.size();i++)
-          {
-            KeyedReference kr = (KeyedReference)defaultKeyedReferenceVector.elementAt(i);
-            if (categoryBag != null)
-              categoryBag.add(kr);
-          }
-        }
-      }
-      tModel.setCategoryBag(categoryBag);
-
-      Vector tModelVector = new Vector();
-      tModelVector.add(tModel);
-      tModel = (TModel)proxy.save_tModel(regElement.getAuthInfoString(), tModelVector).getTModelVector().get(0);
-      propertyTable_.put(UDDIActionInputs.QUERY_OUTPUT_SAVED_TMODEL, tModel);
-      addPublishedItemNode(tModel,regElement);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_INTERFACE_PUBLISHED",tModel.getNameString()));
-      return true;
-    }
-    catch (WSDLException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("WSDLException");
-      messageQueue.addMessage(e.getMessage());
-    }
-    catch (TransportException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("TransportException");
-      messageQueue.addMessage(e.getMessage());
-    }
-    catch (UDDIException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("UDDIException");
-      messageQueue.addMessage(e.toString());
-    }
-    catch (MalformedURLException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("MalformedURLException");
-      messageQueue.addMessage(e.getMessage());
-    }    
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceInterfaceSimpleAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceInterfaceSimpleAction.java
deleted file mode 100644
index 6e6657c58..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceInterfaceSimpleAction.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Vector;
-import javax.wsdl.WSDLException;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.transport.TransportException;
-
-public class RegPublishServiceInterfaceSimpleAction extends PublishAction
-{
-  public RegPublishServiceInterfaceSimpleAction(Controller controller)
-  {
-    super(controller);
-    propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES));
-    propertyTable_.put(UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES,String.valueOf(UDDIActionInputs.QUERY_STYLE_SIMPLE));    
-  }
-
-  protected boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
-  {
-    String wsdlURL = parser.getParameter(ActionInputs.QUERY_INPUT_WSDL_URL);
-    String name = parser.getParameter(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME);
-    String description = parser.getParameter(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_DESCRIPTION);
-
-    boolean inputsValid = true;
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
-    if (wsdlURL != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_WSDL_URL,wsdlURL);
-
-    if (!subQueryInitiated_ && !Validator.validateString(wsdlURL))
-    {
-      inputsValid = false;
-      formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_WSDL_URL);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_WSDL_URL"));
-    }
-
-    if (name != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME,name);
-
-    if (!subQueryInitiated_ && !Validator.validateString(name))
-    {
-      inputsValid = false;
-      formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_NAME"));
-    }
-
-    if (description != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_DESCRIPTION,description);
-
-    return inputsValid;
-  }
-  
-  public final boolean populatePropertyTable(String wsdlURL, TModel tModel)
-  {
-    boolean inputsValid = true;
-    String name = tModel.getNameString();
-    String description = tModel.getDefaultDescriptionString();
-    if (wsdlURL != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_WSDL_URL,wsdlURL);
-    else
-      inputsValid = false;
-    
-    if (name != null) 
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME,name);
-    else
-      inputsValid = false;
-    
-    if (description != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_DESCRIPTION,description);
-    else
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_DESCRIPTION,"");
-    return inputsValid;
-  }
-
-  public final boolean run()
-  {
-    String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-    String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-    String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-    String wsdlURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_WSDL_URL);
-    String name = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME);
-    String description = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_DESCRIPTION);
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-    try
-    {
-      UDDIProxy proxy = regElement.getProxy();
-      if (!regElement.isLoggedIn())
-        regElement.performLogin(publishURL,userId,password);
-
-      TModel tModel = (new Uddi4jHelper()).newTModel(wsdlURL);
-      tModel.setName(name);
-      tModel.setDefaultDescriptionString(description);
-
-      Vector tModelVector = new Vector();
-      tModelVector.add(tModel);
-      tModel = (TModel)proxy.save_tModel(regElement.getAuthInfoString(), tModelVector).getTModelVector().get(0);
-      propertyTable_.put(UDDIActionInputs.QUERY_OUTPUT_SAVED_TMODEL, tModel);
-      addPublishedItemNode(tModel,regElement);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_INTERFACE_PUBLISHED",tModel.getNameString()));
-      return true;
-    }
-    catch (WSDLException e)
-    {
-      e.printStackTrace();
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("WSDLException");
-      messageQueue.addMessage(e.getMessage());
-    }
-    catch (TransportException e)
-    {
-      e.printStackTrace();
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("TransportException");
-      messageQueue.addMessage(e.getMessage());
-    }
-    catch (UDDIException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("UDDIException");
-      messageQueue.addMessage(e.toString());
-    }
-    catch (MalformedURLException e)
-    {
-      e.printStackTrace();
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("MalformedURLException");
-      messageQueue.addMessage(e.getMessage());
-    }    
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceSimpleAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceSimpleAction.java
deleted file mode 100644
index cc5c222c9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceSimpleAction.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Hashtable;
-import java.util.Vector;
-import javax.wsdl.Definition;
-import javax.wsdl.WSDLException;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.Name;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.transport.TransportException;
-
-public class RegPublishServiceSimpleAction extends PublishAction
-{
-  public RegPublishServiceSimpleAction(Controller controller)
-  {
-    super(controller);
-    propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICES));
-    propertyTable_.put(UDDIActionInputs.QUERY_STYLE_SERVICES,String.valueOf(UDDIActionInputs.QUERY_STYLE_SIMPLE));    
-  }
-
-  protected boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
-  {    
-    String busNodeIds = parser.getParameter(UDDIActionInputs.NODEID_BUSINESS);
-    String wsdlURL = parser.getParameter(ActionInputs.QUERY_INPUT_WSDL_URL);
-    String name = parser.getParameter(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME);
-    String description = parser.getParameter(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_DESCRIPTION);
-
-    boolean inputsValid = true;
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
-    if (busNodeIds != null)
-    {
-      Vector serviceBusiness = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_BUSINESS);
-      if (serviceBusiness == null)
-        serviceBusiness = new Vector();
-      else
-        serviceBusiness.removeAllElements();
-      Vector serviceBusinessCopy = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_BUSINESS_COPY);
-      // The browser will enforce the rule of having only one business in this list.
-      ListElement listElement = (ListElement)serviceBusinessCopy.elementAt(0);
-      serviceBusiness.addElement(listElement);
-      BusinessEntity be = (BusinessEntity)listElement.getObject();
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_BUSINESS,serviceBusiness);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_SERVICE_PROVIDER,be);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY,be.getBusinessKey());
-    }
-    else
-    {
-      removeProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_BUSINESS);
-      removeProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_SERVICE_PROVIDER);
-      if (!subQueryInitiated_)
-      {
-        inputsValid = false;
-        formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_BUSINESS);
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_BUSINESS"));
-      }
-    }
-
-    if (wsdlURL != null)
-    {
-      propertyTable_.put(ActionInputs.QUERY_INPUT_WSDL_URL,wsdlURL);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_WSDL_URL,wsdlURL);
-    }
-
-    if (!subQueryInitiated_ && !Validator.validateString(wsdlURL))
-    {
-      inputsValid = false;
-      formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_WSDL_URL);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_WSDL_URL"));
-    }
-
-    if (name != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME,name);
-
-    if (!subQueryInitiated_ && !Validator.validateString(name))
-    {
-      inputsValid = false;
-      formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_NAME"));
-    }
-
-    if (description != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_DESCRIPTION,description);
-
-    return inputsValid;
-  }
-
-  public final boolean run()
-  {
-    String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-    String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-    String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-    BusinessEntity be = (BusinessEntity)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_SERVICE_PROVIDER);
-    String businessKey = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY);
-    String wsdlURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_WSDL_URL);
-    String name = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME);
-    String description = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_DESCRIPTION);
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-    try
-    {
-      UDDIProxy proxy = regElement.getProxy();
-      if (!regElement.isLoggedIn())
-        regElement.performLogin(publishURL,userId,password);
-      
-      Uddi4jHelper uddi4jHelper = new Uddi4jHelper();
-      Definition def = uddi4jHelper.getWSDLDefinition(wsdlURL);
-      RegPublishServiceInterfaceSimpleAction regPublishSIAction = new RegPublishServiceInterfaceSimpleAction(controller_);
-      int currentNodeId = getSelectedNavigatorNode().getNodeId();
-      NodeManager nodeManager = regNode_.getNodeManager();
-
-      Hashtable tModelsTable = new Hashtable();
-      TModel[] tModels = null;
-      if (uddi4jHelper.isMonolithicWSDL(def))
-      {
-        tModels = new TModel[1];
-        tModels[0] = uddi4jHelper.newTModel(wsdlURL, def);
-      }
-      else
-      {
-        String[] imports = uddi4jHelper.getImports(def, wsdlURL);
-        tModels = new TModel[imports.length];
-        for (int i = 0; i < tModels.length; i++)
-          tModels[i] = uddi4jHelper.newTModel(imports[i]);
-      }
-
-      if (tModels != null)
-      {
-        for (int i=0;i<tModels.length;i++)
-        {
-          boolean inputsValid = regPublishSIAction.populatePropertyTable(uddi4jHelper.getWSDL(tModels[i]), tModels[i]);
-          if (inputsValid)
-          {
-            regPublishSIAction.run();
-            Object savedTModel = regPublishSIAction.getPropertyTable().get(UDDIActionInputs.QUERY_OUTPUT_SAVED_TMODEL);
-            if (savedTModel != null)
-            {
-              tModelsTable.put(((TModel)savedTModel).getNameString(), savedTModel);
-            }
-            // Reselect the current node.
-            nodeManager.setSelectedNodeId(currentNodeId);
-          }
-        }
-      }
-
-      BusinessService bs = uddi4jHelper.newBusinessService(wsdlURL, def, tModelsTable);
-      if (be != null)
-        bs.setBusinessKey(be.getBusinessKey());
-      else if (businessKey != null)
-        bs.setBusinessKey(businessKey);
-      bs.setDefaultName(new Name(name));
-      bs.setDefaultDescriptionString(description);
-      Vector bsVector = new Vector();
-      bsVector.add(bs);
-      regElement.handlePreInvocation(bs);
-      bs = (BusinessService)proxy.save_service(regElement.getAuthInfoString(), bsVector).getBusinessServiceVector().get(0);
-      addPublishedItemNode(bs,regElement);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_PUBLISHED",bs.getDefaultNameString()));
-      return true;
-    }
-    catch (WSDLException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("WSDLException");
-      messageQueue.addMessage(e.getMessage());
-    }
-    catch (TransportException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("TransportException");
-      messageQueue.addMessage(e.getMessage());
-    }
-    catch (UDDIException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("UDDIException");
-      messageQueue.addMessage(e.toString());
-    }
-    catch (MalformedURLException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("MalformedURLException");
-      messageQueue.addMessage(e.getMessage());
-    }    
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RemovePublisherAssertionsAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RemovePublisherAssertionsAction.java
deleted file mode 100644
index e6f615ca3..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RemovePublisherAssertionsAction.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListManager;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.PublisherAssertionElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.assertion.PublisherAssertion;
-import org.uddi4j.response.CompletionStatus;
-import org.uddi4j.response.DispositionReport;
-import org.uddi4j.response.Result;
-import org.uddi4j.transport.TransportException;
-
-public class RemovePublisherAssertionsAction extends CommonPublisherAssertionsAction
-{
-  public RemovePublisherAssertionsAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  protected final boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    if (registryNode_ == null)
-      return false;
-
-    boolean inputsValid = true;
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    FormTool formTool = getSelectedFormTool();
-
-    // ids from uddiObjects_table
-    String[] selectedBusIds = parser.getParameterValues(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID);
-    if (selectedBusIds != null && selectedBusIds.length > 0)
-      propertyTable_.put(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID, selectedBusIds);
-    // Synchronize client view and server model (uddiObject_table.jsp)
-    synchronizeUDDIObjectTable();
-
-    // if not yet logged in, validate the parameters needed to log in
-    if (!isLoggedIn_) {
-      String publishURL = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-      String userID = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-      String password = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-
-      if (publishURL != null)
-      {
-        propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
-        formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
-      }
-  
-      if (!Validator.validateURL(publishURL))
-      {
-        inputsValid = false;
-        formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_PUBLISH_URL"));
-      }
-
-      if (userID!= null)
-      {
-        propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userID);
-        formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userID);
-      }
-  
-      if (!Validator.validateString(userID))
-      {
-        inputsValid = false;
-        formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_USERID"));
-      }
-
-      if (password != null)
-      {
-        propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
-        formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
-      }
-    }
-
-    // ids from publisher assertion table
-    String[] pubAssertionsViewIds = parser.getParameterValues(UDDIActionInputs.PUBLISHER_ASSERTIONS_VIEWID);
-    if (pubAssertionsViewIds == null || pubAssertionsViewIds.length == 0)
-      inputsValid = false;
-    else
-      propertyTable_.put(UDDIActionInputs.PUBLISHER_ASSERTIONS_VIEWID, pubAssertionsViewIds);
-
-    return inputsValid;
-  }
-
-  public boolean run()
-  {
-    if (registryNode_ == null)
-      return false;
-
-    RegistryElement registryElement = (RegistryElement)registryNode_.getTreeElement();
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
-    Node selectedNode = navigatorManager.getSelectedNode();
-    TreeElement selectedElement = selectedNode.getTreeElement();
-
-    if (!(selectedElement instanceof BusinessElement))
-      return false;
-
-    // if not yet logged in, log in first
-    if (!isLoggedIn_) {
-      String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-      String userID = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-      String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-
-      try {
-        registryElement.performLogin(publishURL, userID, password);
-      }
-      catch (TransportException te) {
-        messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-        messageQueue.addMessage("TransportException");
-        messageQueue.addMessage(te.getMessage());
-        return false;
-      }
-      catch (UDDIException uddie) {
-        messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-        messageQueue.addMessage("UDDIException");
-        messageQueue.addMessage(uddie.toString());
-        return false;
-      }
-      catch (MalformedURLException me) {
-        messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-        messageQueue.addMessage("MalformedURLException");
-        messageQueue.addMessage(me.getMessage());
-        return false;
-      }      
-    }
-
-    UDDIProxy proxy = registryElement.getProxy();
-    registryElement.getUserId();
-    registryElement.getCred();
-    BusinessElement busElement = (BusinessElement)selectedElement;
-    ListManager pubAssertions = busElement.getPublisherAssertions();
-
-    // determine whether this is a owned business
-    // if not, the AddPublisherAssertionsAction cannot be performed
-    if (!isBusinessOwned(busElement)) {
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_NOT_OWNED_BUSINESS"));
-        return false;
-    }
-
-    try {
-      String[] pubAssertionViewIds = (String[])propertyTable_.get(UDDIActionInputs.PUBLISHER_ASSERTIONS_VIEWID);
-      Vector pubAssertionVector = new Vector();
-      boolean refreshRequired = false;
-
-      for (int i = 0; i < pubAssertionViewIds.length; i++) {
-        int viewID = Integer.parseInt(pubAssertionViewIds[i]);
-        ListElement listElement = pubAssertions.getElementWithViewId(viewID);
-        PublisherAssertionElement pubAssertionElement = (PublisherAssertionElement)listElement.getObject();
-        PublisherAssertion pubAssertion = pubAssertionElement.getPublisherAssertion();
-        pubAssertionVector.add(pubAssertion);
-        if (pubAssertionElement.getStatus().equals(CompletionStatus.COMPLETE))
-          refreshRequired = true;
-      }
-
-      DispositionReport report = proxy.delete_publisherAssertions(registryElement.getAuthInfoString(), pubAssertionVector);
-      //report status
-	  Vector reportErrInfo = report.getResultVector();
-      for (int i = 0; i < reportErrInfo.size(); i++) {
-        messageQueue.addMessage(((Result) reportErrInfo.get(i)).getErrInfo().getText());
-      }
-
-      // refresh is required, refresh the whole publisher assertion table
-      if (refreshRequired) {
-        ShowPublisherAssertionsAction showPAAction = new ShowPublisherAssertionsAction(controller_);
-        Hashtable propertyTable = showPAAction.getPropertyTable();
-        Object ids = propertyTable_.get(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID);
-        if (ids != null)
-          propertyTable.put(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID, ids);
-        showPAAction.run();
-      }
-      // refresh is not required, delete the selected publisher assertion elements
-      else {
-        for (int k = 0; k < pubAssertionViewIds.length; k++) {
-          pubAssertions.removeElementWithViewId(Integer.parseInt(pubAssertionViewIds[k]));
-        }
-      }
-
-      return report.success();
-    }
-    catch (UDDIException uddie) {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("UDDIException");
-      DispositionReport report = uddie.getDispositionReport();
-	  Vector reportErrInfo = report.getResultVector();
-      for (int i = 0; i < reportErrInfo.size(); i++) {
-        messageQueue.addMessage(((Result) reportErrInfo.get(i)).getErrInfo().getText());
-      }
-      return false;
-    }
-    catch (Exception e) {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("Exception");
-      messageQueue.addMessage(e.getMessage());
-      return false;
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RemoveSubQueryItemAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RemoveSubQueryItemAction.java
deleted file mode 100644
index 01bb1f7f8..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RemoveSubQueryItemAction.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.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Vector;
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.Action;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.MultipleFormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-
-public class RemoveSubQueryItemAction extends Action
-{
-  private Controller controller_;
-  
-  public RemoveSubQueryItemAction(Controller controller)
-  {
-    super();
-    controller_ = controller;
-  }
-  
-  // uddi/actions/RemoveSubQueryItemActionJSP.jsp?subQueryKey=...&subQueryListKey=...&subQueryListItemId=...
-  public static final String getActionLink(String subQueryKey,String subQueryListKey,int subQueryListItemId)
-  {
-    StringBuffer actionLink = new StringBuffer("uddi/actions/RemoveSubQueryItemActionJSP.jsp?");
-    actionLink.append(UDDIActionInputs.SUBQUERY_KEY).append('=').append(subQueryKey);
-    actionLink.append('&').append(UDDIActionInputs.SUBQUERY_LIST_KEY).append('=').append(subQueryListKey);
-    actionLink.append('&').append(UDDIActionInputs.SUBQUERY_LIST_ITEMID).append('=').append(subQueryListItemId);
-    return actionLink.toString();
-  }
-  
-  public boolean populatePropertyTable(HttpServletRequest request)
-  {
-    String subQueryKey = request.getParameter(UDDIActionInputs.SUBQUERY_KEY);
-    String subQueryListKey = request.getParameter(UDDIActionInputs.SUBQUERY_LIST_KEY);
-    String subQueryListItemId = request.getParameter(UDDIActionInputs.SUBQUERY_LIST_ITEMID);
-    
-    if (subQueryKey != null)
-      propertyTable_.put(UDDIActionInputs.SUBQUERY_KEY,subQueryKey);
-      
-    if (subQueryListKey != null)
-      propertyTable_.put(UDDIActionInputs.SUBQUERY_LIST_KEY,subQueryListKey);
-      
-    if (subQueryListItemId != null)
-      propertyTable_.put(UDDIActionInputs.SUBQUERY_LIST_ITEMID,subQueryListItemId);
-      
-    return true;
-  }
-  
-  public boolean run()
-  {
-    propertyTable_.get(UDDIActionInputs.SUBQUERY_KEY);
-    propertyTable_.get(UDDIActionInputs.SUBQUERY_LIST_KEY);
-    int subQueryListItemId = Integer.parseInt((String)propertyTable_.get(UDDIActionInputs.SUBQUERY_LIST_ITEMID));
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
-    Node currentNode = navigatorManager.getSelectedNode();
-    FormTool formTool = (FormTool)(currentNode.getCurrentToolManager().getSelectedTool());
-    FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties((String)propertyTable_.get(UDDIActionInputs.SUBQUERY_KEY));
-    Vector list = (Vector)formToolPI.getProperty((String)propertyTable_.get(UDDIActionInputs.SUBQUERY_LIST_KEY));
-    list.removeElementAt(subQueryListItemId);
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ResizeUDDIFramesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ResizeUDDIFramesAction.java
deleted file mode 100644
index 8d37a9620..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ResizeUDDIFramesAction.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ResizeFramesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIFrameNames;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-
-public class ResizeUDDIFramesAction extends ResizeFramesAction
-{
-  public ResizeUDDIFramesAction(Controller controller)
-  {
-    super(controller);
-  }
-  
-  protected boolean processOthers(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    String perspectiveContentFramesetCols = parser.getParameter(UDDIActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
-    String actionsContainerFramesetRows = parser.getParameter(UDDIActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
-    if (perspectiveContentFramesetCols != null && actionsContainerFramesetRows != null)
-    {
-      propertyTable_.put(UDDIActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT,perspectiveContentFramesetCols);
-      propertyTable_.put(UDDIActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER,actionsContainerFramesetRows);
-      return true;
-    }
-    return false;
-  }
-  
-  public final boolean run()
-  {
-    // Save the current frameset sizes.
-    String frameName = (String)propertyTable_.get(ActionInputs.FRAME_NAME);
-    String perspectiveContentFramesetCols = (String)propertyTable_.get(UDDIActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
-    String actionsContainerFramesetRows = (String)propertyTable_.get(UDDIActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    
-    // Set the new frameset sizes.
-    if (frameName.equals(UDDIFrameNames.NAVIGATOR_CONTAINER))
-    {
-      uddiPerspective.setActionsContainerFramesetRows(actionsContainerFramesetRows);
-      uddiPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
-      if (perspectiveContentFramesetCols.startsWith("100%"))
-      {
-        // Restore.
-        uddiPerspective.setPerspectiveContentFramesetCols(uddiPerspective.getSavedPerspectiveContentFramesetCols());
-      }
-      else
-      {
-        // Maximize.
-        uddiPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-        uddiPerspective.setPerspectiveContentFramesetCols("100%,0%");
-      }
-    }
-    else if (frameName.equals(UDDIFrameNames.PROPERTIES_CONTAINER))
-    {
-      if (actionsContainerFramesetRows.startsWith("100%"))
-      {
-        if (perspectiveContentFramesetCols.endsWith("100%"))
-        {
-          // Restore.
-          uddiPerspective.setPerspectiveContentFramesetCols(uddiPerspective.getSavedPerspectiveContentFramesetCols());
-          uddiPerspective.setActionsContainerFramesetRows(uddiPerspective.getSavedActionsContainerFramesetRows());
-        }
-        else
-        {
-          // Maximize.
-          uddiPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-          uddiPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
-          uddiPerspective.setPerspectiveContentFramesetCols("0%,100%");
-        }
-      }
-      else
-      {
-        // Maximize.
-        uddiPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
-        uddiPerspective.setActionsContainerFramesetRows("100%,0%");
-        if (!perspectiveContentFramesetCols.endsWith("100%"))
-        {
-          uddiPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-          uddiPerspective.setPerspectiveContentFramesetCols("0%,100%");
-        }
-      }
-    }
-    else if (frameName.equals(UDDIFrameNames.STATUS_CONTAINER))
-    {
-      if (actionsContainerFramesetRows.endsWith("100%"))
-      {
-        if (perspectiveContentFramesetCols.endsWith("100%"))
-        {
-          // Restore.
-          uddiPerspective.setPerspectiveContentFramesetCols(uddiPerspective.getSavedPerspectiveContentFramesetCols());
-          uddiPerspective.setActionsContainerFramesetRows(uddiPerspective.getSavedActionsContainerFramesetRows());
-        }
-        else
-        {
-          // Maximize.
-          uddiPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-          uddiPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
-          uddiPerspective.setPerspectiveContentFramesetCols("0%,100%");
-        }
-      }
-      else
-      {
-        // Maximize.
-        uddiPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
-        uddiPerspective.setActionsContainerFramesetRows("0%,100%");
-        if (!perspectiveContentFramesetCols.endsWith("100%"))
-        {
-          uddiPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-          uddiPerspective.setPerspectiveContentFramesetCols("0%,100%");
-        }
-      }
-    }
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectCategoryNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectCategoryNodeAction.java
deleted file mode 100644
index 2088d3d76..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectCategoryNodeAction.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.SelectNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-
-public class SelectCategoryNodeAction extends SelectNodeAction
-{
-  public SelectCategoryNodeAction(Controller controller)
-  {
-    super(controller,controller.getUDDIPerspective().getCategoryManager());
-  }
-
-  // uddi/actions/SelectCategoryNodeAction.jsp?sessionId=...&nodeId=...
-  public static String getActionLink(String sessionId,int nodeId)
-  {
-    StringBuffer actionLink = new StringBuffer("uddi/actions/SelectCategoryNodeActionJSP.jsp?");
-    actionLink.append(ActionInputs.SESSIONID).append('=').append(sessionId);
-    actionLink.append('&').append(ActionInputs.NODEID).append('=').append(nodeId);
-    return actionLink.toString();
-  }
-  
-  public final String getActionLinkForHistory()
-  {
-    // Do not add this action to the history.
-    return null;
-  }
-  
-  public final boolean run()
-  {
-    int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-    performBaseAction(nodeId);
-    return true;
-  }
-
-  public final String getTreeContentVar()
-  {
-    return "categoryBrowserWindowContent";
-  }
-
-  public final String getTreeContentPage()
-  {
-    return null;
-  }
-
-  public final String getPropertiesContainerVar()
-  {
-    return null;
-  }
-
-  public final String getPropertiesContainerPage()
-  {
-    return null;
-  }
-  
-  public final int getPerspectiveId()
-  {
-    return ActionInputs.PERSPECTIVE_UDDI;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectFindToolAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectFindToolAction.java
deleted file mode 100644
index 896d0cacf..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectFindToolAction.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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-
-public class SelectFindToolAction extends SelectPropertiesToolAction
-{
-  protected String subQueryKey_;
-  protected boolean toolLinkChanged_;
-
-  public SelectFindToolAction(Controller controller)
-  {
-    super(controller);
-    subQueryKey_ = null;
-    toolLinkChanged_ = false;
-  }
-
-  public boolean processLinkParameters(HttpServletRequest request)
-  {
-    boolean result = super.processLinkParameters(request);
-    subQueryKey_ = request.getParameter(UDDIActionInputs.SUBQUERY_KEY);
-    return result;
-  }
-
-  // /uddi/actions/SelectFindToolAction.jsp?nodeId=...&toolId=...<&viewId=...&viewToolId=...>&subQueryKey=...<&isHistory=1>
-  public static final String getActionLink(int nodeId,int toolId,int viewId,int viewToolId,String subQueryKey,boolean forHistory)
-  {
-    StringBuffer actionLink = new StringBuffer("uddi/actions/SelectFindToolActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
-    actionLink.append('&').append(ActionInputs.TOOLID).append('=').append(toolId);
-    if (viewId != ActionInputs.VIEWID_DEFAULT)
-    {
-      actionLink.append('&').append(ActionInputs.VIEWID).append('=').append(viewId);
-      actionLink.append('&').append(ActionInputs.VIEWTOOLID).append('=').append(viewToolId);
-    }
-    actionLink.append('&').append(UDDIActionInputs.SUBQUERY_KEY).append('=').append(subQueryKey);
-
-    if (forHistory)
-      actionLink.append('&').append(ActionInputs.ISHISTORY).append("=1");
-    return actionLink.toString();
-  }
-
-  public boolean run()
-  {
-    if (!super.run())
-      return false;
-    FormTool formTool = (FormTool)(selectedNode_.getCurrentToolManager().getSelectedTool());
-    String currentSubQueryKey = (String)formTool.getProperty(UDDIActionInputs.SUBQUERY_KEY);
-    if (subQueryKey_ != null && !subQueryKey_.equals(currentSubQueryKey))
-    {
-      toolLinkChanged_ = true;
-      formTool.setProperty(UDDIActionInputs.SUBQUERY_KEY,subQueryKey_);
-    }
-    return true;
-  }
-
-  public boolean requiresViewSelection()
-  {
-    return toolLinkChanged_;
-  }
-
-  protected String getActionLinkForHistory()
-  {
-    int nodeId = selectedNode_.getNodeId();
-    int toolId = selectedTool_.getToolId();
-    int viewId = selectedNode_.getViewId();
-    int viewToolId = selectedNode_.getViewToolId();
-    return getActionLink(nodeId,toolId,viewId,viewToolId,subQueryKey_,true);
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectNavigatorNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectNavigatorNodeAction.java
deleted file mode 100644
index 8b8ddbaa3..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectNavigatorNodeAction.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.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.SelectNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ToolTypes;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class SelectNavigatorNodeAction extends SelectNodeAction
-{
-  public SelectNavigatorNodeAction(Controller controller)
-  {
-    super(controller,controller.getUDDIPerspective().getNavigatorManager());
-  }
-
-  // uddi/actions/SelectNavigatorNodeAction.jsp?nodeId=...<&isHistory=1>
-  public static String getActionLink(int nodeId,boolean forHistory)
-  {
-    StringBuffer actionLink = new StringBuffer("uddi/actions/SelectNavigatorNodeActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
-    if (forHistory)
-      actionLink.append('&').append(ActionInputs.ISHISTORY).append("=1");
-    return actionLink.toString();
-  }
-
-  public String getActionLinkForHistory()
-  {
-    ToolManager toolManager = selectedNode_.getToolManager();
-    Tool selectedTool = toolManager.getSelectedTool();
-    int nodeId = selectedNode_.getNodeId();
-    selectedTool.getToolId();
-    selectedNode_.getViewId();
-    selectedNode_.getViewToolId();
-    if (selectedTool.getToolType() != ToolTypes.ACTION)
-      return selectedTool.getSelectToolActionHref(true);
-    else
-      return getActionLink(nodeId,true);
-  }
-
-  public final String getTreeContentVar()
-  {
-    return "navigatorContent";
-  }
-
-  public final String getTreeContentPage()
-  {
-    return "uddi/navigator_content.jsp";
-  }
-
-  public final String getPropertiesContainerVar()
-  {
-    return "propertiesContainer";
-  }
-
-  public final String getPropertiesContainerPage()
-  {
-    return "uddi/properties_container.jsp";
-  }
-  
-  public final int getPerspectiveId()
-  {
-    return ActionInputs.PERSPECTIVE_UDDI;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectPropertiesToolAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectPropertiesToolAction.java
deleted file mode 100644
index 821784add..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectPropertiesToolAction.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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.SelectNodeToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-
-public class SelectPropertiesToolAction extends SelectNodeToolAction
-{
-  public SelectPropertiesToolAction(Controller controller)
-  {
-    super(controller, controller.getUDDIPerspective().getNavigatorManager());
-  }
-
-  // /uddi/actions/SelectPropertiesToolAction.jsp?nodeId=...&toolId=...<&viewId=...&viewToolId=...><&isHistory=1>
-  public static final String getActionLink(int nodeId,int toolId,int viewId,int viewToolId,boolean forHistory)
-  {
-    StringBuffer actionLink = new StringBuffer("uddi/actions/SelectPropertiesToolActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
-    actionLink.append('&').append(ActionInputs.TOOLID).append('=').append(toolId);
-    if (viewId != ActionInputs.VIEWID_DEFAULT)
-    {
-      actionLink.append('&').append(ActionInputs.VIEWID).append('=').append(viewId);
-      actionLink.append('&').append(ActionInputs.VIEWTOOLID).append('=').append(viewToolId);
-    }
-    if (forHistory)
-      actionLink.append('&').append(ActionInputs.ISHISTORY).append("=1");
-    return actionLink.toString();
-  }
-
-  protected String getActionLinkForHistory()
-  {
-    int nodeId = selectedNode_.getNodeId();
-    int toolId = selectedTool_.getToolId();
-    int viewId = selectedNode_.getViewId();
-    int viewToolId = selectedNode_.getViewToolId();
-    return getActionLink(nodeId,toolId,viewId,viewToolId,true);
-  }
-
-  public final String getTreeContentVar()
-  {
-    return "navigatorContent";
-  }
-
-  public final String getTreeContentPage()
-  {
-    return "uddi/navigator_content.jsp";
-  }
-
-  public final String getPropertiesContainerVar()
-  {
-    return "propertiesContainer";
-  }
-
-  public final String getPropertiesContainerPage()
-  {
-    return "uddi/properties_container.jsp";
-  }
-
-  public final String getPropertiesContentVar()
-  {
-    return "propertiesContent";
-  }
-
-  public final String getPropertiesContentPage()
-  {
-    return "uddi/properties_content.jsp";
-  }
-  
-  public final int getPerspectiveId()
-  {
-    return ActionInputs.PERSPECTIVE_UDDI;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectSubQueryItemAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectSubQueryItemAction.java
deleted file mode 100644
index 490fb96bf..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectSubQueryItemAction.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.uddi.actions;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ViewTool;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.MultipleFormToolPropertiesInterface;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-
-public class SelectSubQueryItemAction extends SelectPropertiesToolAction
-{
-  private boolean requiresTreeViewRefresh_;
-  private boolean requiresViewSelection_;
-  private boolean newUUIDQueryCreated_;
-  private String itemName_;
-  public SelectSubQueryItemAction(Controller controller)
-  {
-    super(controller);
-    requiresTreeViewRefresh_ = false;
-    requiresViewSelection_ = false;
-    newUUIDQueryCreated_ = false;
-    itemName_ = null;
-  }
-
-  // /uddi/actions/SelectSubQueryItemAction.jsp?nodeId=...&toolId=...<&viewId=...>&subQueryKey=...&subQueryListKey=...&subQueryListItemId=...&queryItem=...<&isHistory=1>
-  public static final String getActionLink(int nodeId,int toolId,int viewId,String subQueryKey,String subQueryListKey,int subQueryListItemId,int queryItem,boolean forHistory)
-  {
-    StringBuffer actionLink = new StringBuffer("uddi/actions/SelectSubQueryItemActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
-    actionLink.append('&').append(ActionInputs.TOOLID).append('=').append(toolId);
-    if (viewId != ActionInputs.VIEWID_DEFAULT)
-      actionLink.append('&').append(ActionInputs.VIEWID).append('=').append(viewId);
-    actionLink.append('&').append(UDDIActionInputs.SUBQUERY_KEY).append('=').append(subQueryKey);
-    actionLink.append('&').append(UDDIActionInputs.SUBQUERY_LIST_KEY).append('=').append(subQueryListKey);
-    actionLink.append('&').append(UDDIActionInputs.SUBQUERY_LIST_ITEMID).append('=').append(subQueryListItemId);
-    actionLink.append('&').append(UDDIActionInputs.QUERY_ITEM).append('=').append(queryItem);
-
-    if (forHistory)
-      actionLink.append('&').append(ActionInputs.ISHISTORY).append("=1");
-    return actionLink.toString();
-  }
-
-  public boolean processLinkParameters(HttpServletRequest request)
-  {
-    boolean result = super.processLinkParameters(request);
-    String subQueryKey = request.getParameter(UDDIActionInputs.SUBQUERY_KEY);
-    String subQueryListKey = request.getParameter(UDDIActionInputs.SUBQUERY_LIST_KEY);
-    String subQueryListItemId = request.getParameter(UDDIActionInputs.SUBQUERY_LIST_ITEMID);
-    String queryItemString = request.getParameter(UDDIActionInputs.QUERY_ITEM);
-
-    if (subQueryKey != null)
-      propertyTable_.put(UDDIActionInputs.SUBQUERY_KEY,subQueryKey);
-
-    if (subQueryListKey != null)
-      propertyTable_.put(UDDIActionInputs.SUBQUERY_LIST_KEY,subQueryListKey);
-
-    if (subQueryListItemId != null)
-      propertyTable_.put(UDDIActionInputs.SUBQUERY_LIST_ITEMID,subQueryListItemId);
-
-    if (queryItemString != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_ITEM,queryItemString);
-    return result;
-  }
-
-  private final boolean findByUUID()
-  {
-    Node currentNode = nodeManager_.getSelectedNode();
-    FormTool formTool = (FormTool)(currentNode.getCurrentToolManager().getSelectedTool());
-    FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties((String)propertyTable_.get(UDDIActionInputs.SUBQUERY_KEY));
-    Vector list = (Vector)formToolPI.getProperty((String)propertyTable_.get(UDDIActionInputs.SUBQUERY_LIST_KEY));
-    ListElement listElement = (ListElement)list.elementAt(Integer.parseInt((String)propertyTable_.get(UDDIActionInputs.SUBQUERY_LIST_ITEMID)));
-    int queryItem = Integer.parseInt((String)propertyTable_.get(UDDIActionInputs.QUERY_ITEM));
-    FindAction findAction = null;
-    String uuidKey = null;
-    String uuidKeyValue = null;
-    switch (queryItem)
-    {
-      case UDDIActionInputs.QUERY_ITEM_BUSINESSES:
-        findAction = new RegFindBusinessUUIDAction(controller_);
-        uuidKey = UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY;
-        BusinessEntity sp = (BusinessEntity)listElement.getObject();
-        uuidKeyValue = sp.getBusinessKey();
-        itemName_ = sp.getDefaultNameString();
-        break;
-      case UDDIActionInputs.QUERY_ITEM_SERVICES:
-        findAction = new RegFindServiceUUIDAction(controller_);
-        uuidKey = UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY;
-        BusinessService bs = (BusinessService)listElement.getObject();
-        uuidKeyValue = bs.getServiceKey();
-        itemName_ = bs.getDefaultNameString();
-        break;
-      case UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES:
-      default:
-        findAction = new RegFindServiceInterfaceUUIDAction(controller_);
-        uuidKey = UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY;
-        TModel tModel = (TModel)listElement.getObject();
-        uuidKeyValue = tModel.getTModelKey();
-        itemName_ = tModel.getNameString();
-    }
-    Hashtable propertyTable = findAction.getPropertyTable();
-    propertyTable.put(UDDIActionInputs.QUERY_NAME,uuidKeyValue);
-    propertyTable.put(uuidKey,uuidKeyValue);
-    boolean result = findAction.run();
-    if (result)
-    {
-      Node itemNode = nodeManager_.getSelectedNode();
-      int nodeId = itemNode.getNodeId();
-      int toolId = itemNode.getToolManager().getSelectedToolId();
-      int viewId = ActionInputs.VIEWID_DEFAULT;
-      int viewToolId = ActionInputs.VIEWTOOLID_DEFAULT;
-      propertyTable_.put(ActionInputs.NODEID,String.valueOf(nodeId));
-      propertyTable_.put(ActionInputs.TOOLID,String.valueOf(toolId));
-      propertyTable_.put(ActionInputs.VIEWID,String.valueOf(viewId));
-      propertyTable_.put(ActionInputs.VIEWTOOLID,String.valueOf(viewToolId));
-      super.run();
-      requiresTreeViewRefresh_ = true;
-      requiresViewSelection_ = true;
-      newUUIDQueryCreated_ = true;
-      listElement.setTargetViewToolInfo(nodeId,toolId,viewId);
-      return true;
-    }
-    else
-    {
-      // The item is no longer in the registry.
-      return false;
-    }
-  }
-
-  public final String getItemName()
-  {
-    return itemName_;
-  }
-  
-  public boolean run()
-  {
-    // Given the nodeId, toolId and viewId, check if the node or view is stale.
-    int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-    int toolId = Integer.parseInt((String)propertyTable_.get(ActionInputs.TOOLID));
-    int viewId = ActionInputs.VIEWID_DEFAULT;
-    try
-    {
-      viewId = Integer.parseInt((String)propertyTable_.get(ActionInputs.VIEWID));
-    }
-    catch (NumberFormatException e)
-    {
-    }
-    int viewToolId = 0;
-    if (!isStaleNode(nodeId))
-    {
-      // Enusre the node is visible.
-      requiresTreeViewRefresh_ = makeNodeVisible(nodeManager_.getNode(nodeId));
-
-      Node node = nodeManager_.getNode(nodeId);
-      if (viewId != ActionInputs.VIEWID_DEFAULT)
-      {
-        ViewTool viewTool = (ViewTool)(node.getToolManager().getTool(toolId));
-        ToolManager elementToolManager = viewTool.getToolManager(viewId);
-        if (elementToolManager != null)
-          viewToolId = elementToolManager.getSelectedToolId();
-        else
-        {
-          // Stale view
-          return findByUUID();
-        }
-      }
-      propertyTable_.put(ActionInputs.VIEWTOOLID,String.valueOf(viewToolId));
-      return super.run();
-    }
-    else
-    {
-      // Stale node
-      return findByUUID();
-    }
-  }
-
-  protected String getActionLinkForHistory()
-  {
-    int nodeId = selectedNode_.getNodeId();
-    int toolId = selectedTool_.getToolId();
-    int viewId = selectedNode_.getViewId();
-    int viewToolId = selectedNode_.getViewToolId();
-    return SelectPropertiesToolAction.getActionLink(nodeId,toolId,viewId,viewToolId,true);
-  }
-
-  public boolean requiresTreeViewRefresh()
-  {
-    return super.requiresTreeViewRefresh()|requiresTreeViewRefresh_;
-  }
-
-  public boolean requiresViewSelection()
-  {
-    return super.requiresViewSelection()|requiresViewSelection_;
-  }
-
-  public boolean requiresStatusUpdate()
-  {
-    return newUUIDQueryCreated_;
-  }
-
-  public final String getStatusContentVar()
-  {
-    return "statusContent";
-  }
-
-  public final String getStatusContentPage()
-  {
-    return "uddi/status_content.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceGetBusinessAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceGetBusinessAction.java
deleted file mode 100644
index cf5234668..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceGetBusinessAction.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.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.NodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.ServiceNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.uddi4j.datatype.service.BusinessService;
-
-public class ServiceGetBusinessAction extends NodeAction
-{
-  private ServiceNode serviceNode_;
-  public ServiceGetBusinessAction(Controller controller)
-  {
-    super(controller,controller.getUDDIPerspective().getNavigatorManager());
-    serviceNode_ = null;
-  }
-
-  // uddi/actions/ServiceGetBusinessActionJSP.jsp?nodeId=...
-  public static String getActionLink(int nodeId)
-  {
-    StringBuffer actionLink = new StringBuffer("uddi/actions/ServiceGetBusinessActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
-    return actionLink.toString();
-  }
-
-  public final boolean validateService()
-  {
-    int serviceNodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-    serviceNode_ = (ServiceNode)nodeManager_.getNode(serviceNodeId);
-    ServiceElement serviceElement = (ServiceElement)serviceNode_.getTreeElement();
-    RegFindServiceUUIDAction verifyAction = new RegFindServiceUUIDAction(controller_);
-    Hashtable propertyTable = verifyAction.getPropertyTable();
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE,Boolean.TRUE);
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY,serviceElement.getBusinessService().getServiceKey());
-    boolean result = verifyAction.run();
-    if (result)
-      propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,propertyTable.get(UDDIActionInputs.LATEST_OBJECT));
-    return result;
-  }
-
-  public final String getActionLinkForHistory()
-  {
-    return null;
-  }
-
-  public final boolean run()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    BusinessService bs = (BusinessService)propertyTable_.get(UDDIActionInputs.LATEST_OBJECT);
-
-    RegFindBusinessUUIDAction action = new RegFindBusinessUUIDAction(controller_);
-    Hashtable propertyTable = action.getPropertyTable();
-    propertyTable.put(UDDIActionInputs.QUERY_NAME,uddiPerspective.getMessage("NODE_NAME_SERVICE_BUSINESS",serviceNode_.getNodeName()));
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY,bs.getBusinessKey());
-
-    return action.run();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceGetServiceInterfacesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceGetServiceInterfacesAction.java
deleted file mode 100644
index 61f8124ea..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceGetServiceInterfacesAction.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.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.ServiceNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.uddi4j.datatype.service.BusinessService;
-
-public class ServiceGetServiceInterfacesAction extends UDDINodeAction
-{
-  private ServiceNode serviceNode_;
-  public ServiceGetServiceInterfacesAction(Controller controller)
-  {
-    super(controller);
-    serviceNode_ = null;
-  }
-
-  // uddi/actions/ServiceGetServiceInterfacesActionJSP.jsp?nodeId=...
-  public static String getActionLink(int nodeId)
-  {
-    StringBuffer actionLink = new StringBuffer("uddi/actions/ServiceGetServiceInterfacesActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
-    return actionLink.toString();
-  }
-
-  public final boolean validateService()
-  {
-    int serviceNodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-    serviceNode_ = (ServiceNode)nodeManager_.getNode(serviceNodeId);
-    ServiceElement serviceElement = (ServiceElement)serviceNode_.getTreeElement();
-    RegFindServiceUUIDAction verifyAction = new RegFindServiceUUIDAction(controller_);
-    Hashtable propertyTable = verifyAction.getPropertyTable();
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE,Boolean.TRUE);
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY,serviceElement.getBusinessService().getServiceKey());
-    boolean result = verifyAction.run();
-    if (result)
-      propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,propertyTable.get(UDDIActionInputs.LATEST_OBJECT));
-    return result;
-  }
-    
-  public final String getActionLinkForHistory()
-  {
-    return null;
-  }
-
-  public final boolean run()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    BusinessService bs = (BusinessService)propertyTable_.get(UDDIActionInputs.LATEST_OBJECT);
-    RegFindServiceInterfacesAdvancedAction action = new RegFindServiceInterfacesAdvancedAction(controller_);
-    Hashtable propertyTable = action.getPropertyTable();
-    propertyTable.put(UDDIActionInputs.QUERY_NAME,uddiPerspective.getMessage("NODE_NAME_SERVICE_SERVICE_INTERFACES",serviceNode_.getNodeName()));
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_USE_SERVICE,Boolean.TRUE);
-    ListElement serviceListElement = new ListElement(bs);
-    serviceListElement.setTargetViewToolInfo(serviceNode_.getNodeId(),serviceNode_.getToolManager().getSelectedToolId(),serviceNode_.getViewId());
-    Vector serviceListVector = new Vector();
-    serviceListVector.addElement(serviceListElement);
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_SERVICE,serviceListVector);
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_BUSINESS_SERVICE,bs);
-    return action.run();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceInterfaceGetBusinessesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceInterfaceGetBusinessesAction.java
deleted file mode 100644
index d80035921..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceInterfaceGetBusinessesAction.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.uddi.actions;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceInterfaceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.ServiceInterfaceNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.util.TModelBag;
-
-public class ServiceInterfaceGetBusinessesAction extends UDDINodeAction
-{
-  private ServiceInterfaceNode siNode_;
-  public ServiceInterfaceGetBusinessesAction(Controller controller)
-  {
-    super(controller);
-    siNode_ = null;
-  }
-
-  // uddi/actions/ServiceInterfacGetBusinessesActionJSP.jsp?nodeId=...
-  public static String getActionLink(int nodeId)
-  {
-    StringBuffer actionLink = new StringBuffer("uddi/actions/ServiceInterfaceGetBusinessesActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
-    return actionLink.toString();
-  }
-
-  public final boolean validateServiceInterface()
-  {
-    int siNodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-    siNode_ = (ServiceInterfaceNode)nodeManager_.getNode(siNodeId);
-    ServiceInterfaceElement siElement = (ServiceInterfaceElement)siNode_.getTreeElement();
-    RegFindServiceInterfaceUUIDAction verifyAction = new RegFindServiceInterfaceUUIDAction(controller_);
-    Hashtable propertyTable = verifyAction.getPropertyTable();
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE,Boolean.TRUE);
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY,siElement.getTModel().getTModelKey());
-    boolean result = verifyAction.run();
-    if (result)
-      propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,propertyTable.get(UDDIActionInputs.LATEST_OBJECT));
-    return result;
-  }
-    
-  public final String getActionLinkForHistory()
-  {
-    return null;
-  }
-
-  public final boolean run()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    TModel tModel = (TModel)propertyTable_.get(UDDIActionInputs.LATEST_OBJECT);
-
-    RegFindBusinessesAdvancedAction action = new RegFindBusinessesAdvancedAction(controller_);
-    Hashtable propertyTable = action.getPropertyTable();
-    propertyTable.put(UDDIActionInputs.QUERY_NAME,uddiPerspective.getMessage("NODE_NAME_SI_BUSINESSES",siNode_.getNodeName()));
-    
-    ListElement siListElement = new ListElement(tModel);
-    siListElement.setTargetViewToolInfo(siNode_.getNodeId(),siNode_.getToolManager().getSelectedToolId(),siNode_.getViewId());
-    Vector siListVector = new Vector();
-    siListVector.addElement(siListElement);
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_SERVICE_INTERFACES,siListVector);
-    
-    Vector tModelKeyStringVector = new Vector();
-    tModelKeyStringVector.addElement(tModel.getTModelKey());
-    TModelBag tModelBag = new TModelBag(tModelKeyStringVector);
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_TMODELBAG,tModelBag);
-    
-    return action.run();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceInterfaceGetServicesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceInterfaceGetServicesAction.java
deleted file mode 100644
index bb23f274c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceInterfaceGetServicesAction.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.uddi.actions;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceInterfaceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.ServiceInterfaceNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.util.TModelBag;
-
-public class ServiceInterfaceGetServicesAction extends UDDINodeAction
-{
-  private ServiceInterfaceNode siNode_;
-  public ServiceInterfaceGetServicesAction(Controller controller)
-  {
-    super(controller);
-    siNode_ = null;
-  }
-
-  // uddi/actions/ServiceInterfacGetServicesActionJSP.jsp?nodeId=...
-  public static String getActionLink(int nodeId)
-  {
-    StringBuffer actionLink = new StringBuffer("uddi/actions/ServiceInterfaceGetServicesActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
-    return actionLink.toString();
-  }
-
-  public final boolean validateServiceInterface()
-  {
-    int siNodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-    siNode_ = (ServiceInterfaceNode)nodeManager_.getNode(siNodeId);
-    ServiceInterfaceElement siElement = (ServiceInterfaceElement)siNode_.getTreeElement();
-    RegFindServiceInterfaceUUIDAction verifyAction = new RegFindServiceInterfaceUUIDAction(controller_);
-    Hashtable propertyTable = verifyAction.getPropertyTable();
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE,Boolean.TRUE);
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY,siElement.getTModel().getTModelKey());
-    boolean result = verifyAction.run();
-    if (result)
-      propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,propertyTable.get(UDDIActionInputs.LATEST_OBJECT));
-    return result;
-  }
-    
-  public final String getActionLinkForHistory()
-  {
-    return null;
-  }
-
-  public final boolean run()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    TModel tModel = (TModel)propertyTable_.get(UDDIActionInputs.LATEST_OBJECT);
-
-    RegFindServicesAdvancedAction action = new RegFindServicesAdvancedAction(controller_);
-    Hashtable propertyTable = action.getPropertyTable();
-    propertyTable.put(UDDIActionInputs.QUERY_NAME,uddiPerspective.getMessage("NODE_NAME_SI_SERVICES",siNode_.getNodeName()));
-    
-    ListElement siListElement = new ListElement(tModel);
-    siListElement.setTargetViewToolInfo(siNode_.getNodeId(),siNode_.getToolManager().getSelectedToolId(),siNode_.getViewId());
-    Vector siListVector = new Vector();
-    siListVector.addElement(siListElement);
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES,siListVector);
-    
-    Vector tModelKeyStringVector = new Vector();
-    tModelKeyStringVector.addElement(tModel.getTModelKey());
-    TModelBag tModelBag = new TModelBag(tModelKeyStringVector);
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_TMODELBAG,tModelBag);
-    
-    return action.run();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ShowPublisherAssertionsAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ShowPublisherAssertionsAction.java
deleted file mode 100644
index 44a6a9805..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ShowPublisherAssertionsAction.java
+++ /dev/null
@@ -1,425 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListManager;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.PublisherAssertionElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.MultipleFormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.response.AssertionStatusItem;
-import org.uddi4j.response.AssertionStatusReport;
-import org.uddi4j.response.CompletionStatus;
-import org.uddi4j.response.DispositionReport;
-import org.uddi4j.response.RelatedBusinessInfo;
-import org.uddi4j.response.RelatedBusinessesList;
-import org.uddi4j.response.Result;
-import org.uddi4j.response.SharedRelationships;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.util.FindQualifiers;
-import org.uddi4j.util.KeyedReference;
-
-public class ShowPublisherAssertionsAction extends CommonPublisherAssertionsAction
-{
-
-  protected String subQueryKey_;
-  protected boolean isSubQueryGet_;
-  protected boolean subQueryInitiated_;
-  protected String newSubQuery_;
-  protected String newSubQueryItem_;
-
-  public ShowPublisherAssertionsAction(Controller controller)
-  {
-    super(controller);
-
-    subQueryKey_ = null;
-    isSubQueryGet_ = false;
-    subQueryInitiated_ = false;
-  }
-
-  protected final boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    if (registryNode_ == null)
-      return false;
-
-    // ids from uddiObjects_table
-    String[] selectedBusIds = parser.getParameterValues(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID);
-    if (selectedBusIds != null && selectedBusIds.length > 0)
-      propertyTable_.put(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID, selectedBusIds);
-
-    newSubQuery_ = parser.getParameter(UDDIActionInputs.NEW_SUBQUERY_INITIATED);
-    String isSubQueryGetString = parser.getParameter(UDDIActionInputs.SUBQUERY_GET);
-    newSubQueryItem_ = parser.getParameter(UDDIActionInputs.NEW_SUBQUERY_QUERY_ITEM);
-    subQueryKey_ = parser.getParameter(UDDIActionInputs.SUBQUERY_KEY);
-
-    // Validate the data.
-    controller_.getUDDIPerspective();
-    FormTool formTool = getSelectedFormTool();
-    FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKey_);
-    formToolPI.clearErrors();
-
-    if (newSubQuery_ != null && newSubQuery_.length() > 0)
-      subQueryInitiated_ = true;
-    else
-      subQueryInitiated_ = false;
-
-    if (isSubQueryGetString != null)
-      isSubQueryGet_ = Boolean.valueOf(isSubQueryGetString).booleanValue();
-
-    // if not yet logged in, validate the parameters needed to log in
-    // NOTE: This action does NOT require the user to be logged in.
-    if (!isLoggedIn_) {
-      String publishURL = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-      String userID = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-      String password = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-
-      if (publishURL != null)
-      {
-        propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
-        formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
-      }
-
-      if (userID != null)
-      {
-        propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userID);
-        formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userID);
-      }
-
-      if (password != null)
-      {
-        propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
-        formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
-      }
-    }
-
-    return true;
-  }
-
-  public final boolean isSubQueryInitiated()
-  {
-    return subQueryInitiated_;
-  }
-
-  public final boolean isSubQueryGet()
-  {
-    return isSubQueryGet_;
-  }
-
-  public final String getSubQueryKey()
-  {
-    return subQueryKey_;
-  }
-
-  public final String getNewSubQuery()
-  {
-    return newSubQuery_;
-  }
-
-  public final String getNewSubQueryItem()
-  {
-    return newSubQueryItem_;
-  }
-
-  public boolean run()
-  {
-    // Synchronize client view and server model (uddiObject_table.jsp)
-    synchronizeUDDIObjectTable();
-
-    if (registryNode_ == null)
-      return false;
-
-    RegistryElement registryElement = (RegistryElement)registryNode_.getTreeElement();
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
-    Node selectedNode = navigatorManager.getSelectedNode();
-    TreeElement selectedElement = selectedNode.getTreeElement();
-
-    if (!(selectedElement instanceof BusinessElement))
-      return false;
-
-    // if not yet logged in, log in first
-    if (!isLoggedIn_) {
-      String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-      String userID = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-      String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-
-      try {
-        if (Validator.validateURL(publishURL) &&
-            Validator.validateString(userID) &&
-            password != null) {
-          registryElement.performLogin(publishURL, userID, password);
-          isLoggedIn_ = registryElement.isLoggedIn();
-        }
-      }
-      catch (TransportException te) {
-        messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-        messageQueue.addMessage("TransportException");
-        messageQueue.addMessage(te.getMessage());
-        return false;
-      }
-      catch (UDDIException uddie) {
-        messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-        messageQueue.addMessage("UDDIException");
-        messageQueue.addMessage(uddie.toString());
-        return false;
-      }
-      catch (MalformedURLException me) {
-        messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-        messageQueue.addMessage("MalformedURLException");
-        messageQueue.addMessage(me.getMessage());
-        return false;
-      }      
-    }
-
-    // show all assertion iff is logged in and business is owned
-    // else show only completed ones
-    BusinessElement busElement = (BusinessElement)selectedElement;
-    if (isLoggedIn_ && isBusinessOwned(busElement))
-      return showPublisherAssertionsForOwnedBus(busElement);
-    else
-      return showPublisherAssertionsForNonOwnedBus(busElement);
-  }
-
-  private boolean showPublisherAssertionsForOwnedBus(BusinessElement busElement) {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
-    // try to get a list of all publisher assertion based on the current registry's authToken
-    ListManager listManager = new ListManager();
-    FormTool formTool = getSelectedFormTool();
-    FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKey_);
-    formToolPI.removeProperty(UDDIActionInputs.QUERY_INPUT_EXISTING_PUBLISHER_ASSERTIONS);
-    Vector queryInputVector = new Vector();
-    RegistryElement registryElement = (RegistryElement)registryNode_.getTreeElement();
-    registryElement.getUserId();
-    registryElement.getCred();
-
-    // show all publisher assertions
-    UDDIProxy proxy = ((RegistryElement)registryNode_.getTreeElement()).getProxy();
-    AssertionStatusReport assertionReport;
-    try {
-      assertionReport = proxy.get_assertionStatusReport(registryElement.getAuthInfoString(), (CompletionStatus)null);
-    }
-    catch (UDDIException uddie) {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("UDDIException");
-      DispositionReport report = uddie.getDispositionReport();
-	  Vector reportErrInfo = report.getResultVector();
-      for (int i = 0; i < reportErrInfo.size(); i++) {
-        messageQueue.addMessage(((Result) reportErrInfo.get(i)).getErrInfo().getText());
-      }
-      return false;
-    }
-    catch (Exception e) {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("Exception");
-      messageQueue.addMessage(e.getMessage());
-      return false;
-    }
-    Vector assertionVector = assertionReport.getAssertionStatusItemVector();
-    Vector otherBusinessKeys = new Vector();
-    Vector pubAssertionElements = new Vector();
-
-    for (int i = 0; i < assertionVector.size(); i++) {
-      AssertionStatusItem assertionItem = (AssertionStatusItem)assertionVector.elementAt(i);
-      // determine the from/to business keys
-      String fromKey = assertionItem.getFromKey().getText();
-      String toKey = assertionItem.getToKey().getText();
-      String owningBusinessKey = busElement.getBusinessEntity().getBusinessKey();
-      // ignore this assertion if neither the from key nor the to key equals to this business's key
-      if (!owningBusinessKey.equals(fromKey) && !owningBusinessKey.equals(toKey))
-        continue;
-      String otherBusinessKey = ((owningBusinessKey.equals(fromKey)) ? toKey : fromKey);
-      // retrieve the information of the "other business"
-      otherBusinessKeys.add(otherBusinessKey);
-
-      // retrieve the status of the publisher assertion
-      String status = assertionItem.getCompletionStatus().getText();
-      KeyedReference keyedRef = assertionItem.getKeyedReference();
-      PublisherAssertionElement pubAssertionElement = new PublisherAssertionElement(
-                                                                                    fromKey,
-                                                                                    toKey,
-                                                                                    owningBusinessKey,
-                                                                                    null,
-                                                                                    -1,
-                                                                                    status,
-                                                                                    keyedRef);
-      pubAssertionElements.add(pubAssertionElement);
-    }
-    if (otherBusinessKeys.size() > 0) {
-      Vector busEntities;
-      try {
-        busEntities = proxy.get_businessDetail(otherBusinessKeys).getBusinessEntityVector();
-      }
-      catch (Exception ex) {
-        busEntities = new Vector();
-        if (otherBusinessKeys.size() > 1) {
-          for (int j = 0; j < otherBusinessKeys.size(); j++) {
-            try {
-              busEntities.add(proxy.get_businessDetail((String)otherBusinessKeys.get(j)).getBusinessEntityVector().get(0));
-            }
-            catch (Exception exception) {
-              pubAssertionElements.remove(j);
-            }
-          }
-        }
-        else
-          pubAssertionElements.remove(0);
-      }
-      for (int j = 0; j < busEntities.size(); j++) {
-        BusinessEntity be = (BusinessEntity)busEntities.get(j);
-        PublisherAssertionElement pubAssertionElement = (PublisherAssertionElement)pubAssertionElements.get(j);
-        ListElement le = new ListElement(be);
-        queryInputVector.add(le);
-        int subQueryItemId = queryInputVector.indexOf(le);
-        pubAssertionElement.setServiceProvider(le);
-        pubAssertionElement.setSubQueryItemId(subQueryItemId);
-        listManager.add(new ListElement(pubAssertionElement));
-      }
-    }
-    busElement.setPublisherAssertions(listManager);
-    formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_EXISTING_PUBLISHER_ASSERTIONS, queryInputVector);
-    messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_PUBLISHER_ASSERTIONS_REFRESHED"));
-    return true;
-  }
-
-  private boolean showPublisherAssertionsForNonOwnedBus(BusinessElement busElement) {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
-    // try to get a list of publisher assertions based on the business key
-    ListManager listManager = new ListManager();
-    FormTool formTool = getSelectedFormTool();
-    FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKey_);
-    formToolPI.removeProperty(UDDIActionInputs.QUERY_INPUT_EXISTING_PUBLISHER_ASSERTIONS);
-    Vector queryInputVector = new Vector();
-    UDDIProxy proxy = ((RegistryElement)registryNode_.getTreeElement()).getProxy();
-    RelatedBusinessesList relatedBusList;
-    try {
-      relatedBusList = proxy.find_relatedBusinesses(busElement.getBusinessEntity().getBusinessKey(),
-                                                                                                         (KeyedReference)null,
-                                                                                                         (FindQualifiers)null);
-    }
-    catch (UDDIException uddie) {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("UDDIException");
-      DispositionReport report = uddie.getDispositionReport();
-	  Vector reportErrInfo = report.getResultVector();
-      for (int i = 0; i < reportErrInfo.size(); i++) {
-        messageQueue.addMessage(((Result) reportErrInfo.get(i)).getErrInfo().getText());
-      }
-      return false;
-    }
-    catch (Exception e) {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("Exception");
-      messageQueue.addMessage(e.getMessage());
-      return false;
-    }
-    Vector relatedBusVector = relatedBusList.getRelatedBusinessInfos().getRelatedBusinessInfoVector();
-    Vector otherBusinessKeys = new Vector();
-    Vector pubAssertionElements = new Vector();
-    for (int i  = 0; i < relatedBusVector.size(); i++) {
-      RelatedBusinessInfo relatedBusInfo = (RelatedBusinessInfo)relatedBusVector.elementAt(i);
-      // determine the from/to business keys
-      String fromKey;
-      String toKey;
-      String owningBusinessKey;
-      if (relatedBusInfo.getDefaultSharedRelationships().getDirection().equals(SharedRelationships.DIRECTION_FROMKEY)) {
-        fromKey = busElement.getBusinessEntity().getBusinessKey();
-        toKey = relatedBusInfo.getBusinessKey();
-        owningBusinessKey = fromKey;
-        otherBusinessKeys.add(toKey);
-      }
-      else {
-        fromKey = relatedBusInfo.getBusinessKey();
-        toKey = busElement.getBusinessEntity().getBusinessKey();
-        owningBusinessKey = toKey;
-        otherBusinessKeys.add(fromKey);
-      }
-
-      Vector keyedRefVector = relatedBusInfo.getDefaultSharedRelationships().getKeyedReferenceVector();
-      PublisherAssertionElement[] pubAssertionElementArray = new PublisherAssertionElement[keyedRefVector.size()];
-      for (int k = 0; k < keyedRefVector.size(); k++) {
-        // retrieve the status of the publisher assertion
-        String status = CompletionStatus.COMPLETE;
-        KeyedReference keyedRef = (KeyedReference)keyedRefVector.elementAt(k);
-        PublisherAssertionElement pubAssertionElement = new PublisherAssertionElement(
-                                                                                      fromKey,
-                                                                                      toKey,
-                                                                                      owningBusinessKey,
-                                                                                      null,
-                                                                                      -1,
-                                                                                      status,
-                                                                                      keyedRef);
-        pubAssertionElementArray[k] = pubAssertionElement;
-      }
-      pubAssertionElements.add(pubAssertionElementArray);
-    }
-    if (otherBusinessKeys.size() > 0) {
-      Vector busEntities;
-      try {
-        busEntities = proxy.get_businessDetail(otherBusinessKeys).getBusinessEntityVector();
-      }
-      catch (Exception ex) {
-        busEntities = new Vector();
-        if (otherBusinessKeys.size() > 1) {
-          for (int j = 0; j < otherBusinessKeys.size(); j++) {
-            try {
-              busEntities.add(proxy.get_businessDetail((String)otherBusinessKeys.get(j)).getBusinessEntityVector().get(0));
-            }
-            catch (Exception exception) {
-              pubAssertionElements.remove(j);
-            }
-          }
-        }
-        else
-          pubAssertionElements.remove(0);
-      }
-      for (int j  = 0; j < busEntities.size(); j++) {
-        BusinessEntity be = (BusinessEntity)busEntities.get(j);
-        ListElement le = new ListElement(be);
-        queryInputVector.add(le);
-        int subQueryItemId = queryInputVector.indexOf(le);
-        PublisherAssertionElement[] pubAssertionElementArray = (PublisherAssertionElement[])pubAssertionElements.get(j);
-        for (int k = 0; k < pubAssertionElementArray.length; k++) {
-          pubAssertionElementArray[k].setServiceProvider(le);
-          pubAssertionElementArray[k].setSubQueryItemId(subQueryItemId);
-          listManager.add(new ListElement(pubAssertionElementArray[k]));
-        }
-      }
-    }
-    busElement.setPublisherAssertions(listManager);
-    formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_EXISTING_PUBLISHER_ASSERTIONS, queryInputVector);
-    messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_PUBLISHER_ASSERTIONS_REFRESHED"));
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SwitchPerspectiveFromUDDIAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SwitchPerspectiveFromUDDIAction.java
deleted file mode 100644
index 5cc79e6be..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SwitchPerspectiveFromUDDIAction.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.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ShowPerspectiveAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-
-public final class SwitchPerspectiveFromUDDIAction extends ShowPerspectiveAction
-{
-  public SwitchPerspectiveFromUDDIAction(Controller controller)
-  {
-    super(controller);
-  }
-  
-  protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    String perspectiveContentFramesetCols = parser.getParameter(UDDIActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
-    String actionsContainerFramesetRows = parser.getParameter(UDDIActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
-    if (perspectiveContentFramesetCols != null && actionsContainerFramesetRows != null)
-    {
-      propertyTable_.put(UDDIActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT,perspectiveContentFramesetCols);
-      propertyTable_.put(UDDIActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER,actionsContainerFramesetRows);
-      return true;
-    }
-    return false;
-  }
-  
-  public final boolean run()
-  {
-    String perspectiveContentFramesetCols = (String)propertyTable_.get(UDDIActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
-    String actionsContainerFramesetRows = (String)propertyTable_.get(UDDIActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
-    
-    // Save the frameset sizes iff no frame is maximized.
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    if (!perspectiveContentFramesetCols.startsWith("100%") && !perspectiveContentFramesetCols.endsWith("100%"))
-      uddiPerspective.setPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-      
-    if (!actionsContainerFramesetRows.startsWith("100%") && !actionsContainerFramesetRows.endsWith("100%"))
-      uddiPerspective.setActionsContainerFramesetRows(actionsContainerFramesetRows);
-      
-    return super.run();
-  }
-  
-  public static final String getFormActionLink(int targetPerspectiveId,boolean forHistory)
-  {
-    StringBuffer formLink = new StringBuffer("uddi/actions/SwitchPerspectiveFromUDDIActionJSP.jsp?");
-    formLink.append(ActionInputs.PERSPECTIVE).append('=').append(targetPerspectiveId);
-    if (forHistory)
-      formLink.append('&').append(ActionInputs.ISHISTORY).append("=1");
-    return formLink.toString();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ToggleCategoryNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ToggleCategoryNodeAction.java
deleted file mode 100644
index 85a089d3d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ToggleCategoryNodeAction.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.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ToggleNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-
-public class ToggleCategoryNodeAction extends ToggleNodeAction
-{
-  public ToggleCategoryNodeAction(Controller controller)
-  {
-    super(controller,controller.getUDDIPerspective().getCategoryManager());
-  }
-
-  // uddi/actions/ToggleNavigatorNodeAction.jsp?sId=...&nodeId=...&open=...
-  public static final String getActionLink(String sessionId,int nodeId,boolean open)
-  {
-    StringBuffer actionLink = new StringBuffer("uddi/actions/ToggleCategoryNodeActionJSP.jsp?");
-    actionLink.append(ActionInputs.SESSIONID).append('=').append(sessionId);
-    actionLink.append('&').append(ActionInputs.NODEID).append('=').append(nodeId);
-    actionLink.append('&').append(ActionInputs.OPEN).append('=').append(open?ActionInputs.OPEN_NODE:ActionInputs.CLOSE_NODE);
-    return actionLink.toString();
-  }
-
-  public final boolean run()
-  {
-    int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-    performBaseAction(nodeId);
-    return true;
-  }
-
-  public final String getActionLinkForHistory()
-  {
-    return null;
-  }
-
-  public final String getTreeContentVar()
-  {
-    return "categoryBrowserWindowContent";
-  }
-
-  public final String getTreeContentPage()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    return OpenCategoryBrowserAction.getCategoryContentPage(controller_.getSessionId(),uddiPerspective.getCategoryTModelKey());
-  }
-
-  public final String getTreeContainerPage()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    return OpenCategoryBrowserAction.getActionLink(controller_.getSessionId(),uddiPerspective.getCategoryTModelKey());
-  }
-
-  public final String getPropertiesContainerVar()
-  {
-    return null;
-  }
-
-  public final String getPropertiesContainerPage()
-  {
-    return null;
-  }
-  
-  public final int getPerspectiveId()
-  {
-    return ActionInputs.PERSPECTIVE_UDDI;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ToggleNavigatorNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ToggleNavigatorNodeAction.java
deleted file mode 100644
index 0a8045bd5..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ToggleNavigatorNodeAction.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.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ToggleNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ToolTypes;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class ToggleNavigatorNodeAction extends ToggleNodeAction
-{
-  public ToggleNavigatorNodeAction(Controller controller)
-  {
-    super(controller,controller.getUDDIPerspective().getNavigatorManager());
-  }
-
-  // uddi/actions/ToggleNavigatorNodeAction.jsp?nodeId=...&open=...
-  public static String getActionLink(int nodeId,boolean open)
-  {
-    StringBuffer actionLink = new StringBuffer("uddi/actions/ToggleNavigatorNodeActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
-    actionLink.append('&').append(ActionInputs.OPEN).append('=').append(open?ActionInputs.OPEN_NODE:ActionInputs.CLOSE_NODE);
-    return actionLink.toString();
-  }
-
-  // This should be called only to select the toggled node when, at the time of
-  // the collapse event, a descendant node was selected.
-  public final String getActionLinkForHistory()
-  {
-    ToolManager toolManager = toggledNode_.getToolManager();
-    Tool selectedTool = toolManager.getSelectedTool();
-    int nodeId = toggledNode_.getNodeId();
-    int toolId = selectedTool.getToolId();
-    int viewId = toggledNode_.getViewId();
-    int viewToolId = toggledNode_.getViewToolId();
-    if (selectedTool.getToolType() != ToolTypes.ACTION)
-      return SelectPropertiesToolAction.getActionLink(nodeId,toolId,viewId,viewToolId,true);
-    else
-      return SelectNavigatorNodeAction.getActionLink(nodeId,true);
-  }
-
-  public final String getTreeContentVar()
-  {
-    return "navigatorContent";
-  }
-
-  public final String getTreeContentPage()
-  {
-    return "uddi/navigator_content.jsp";
-  }
-
-  public final String getPropertiesContainerVar()
-  {
-    return "propertiesContainer";
-  }
-
-  public final String getPropertiesContainerPage()
-  {
-    return "uddi/properties_container.jsp";
-  }
-  
-  public final int getPerspectiveId()
-  {
-    return ActionInputs.PERSPECTIVE_UDDI;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/TransferSubQueryResultsAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/TransferSubQueryResultsAction.java
deleted file mode 100644
index 0b20134de..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/TransferSubQueryResultsAction.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceInterfaceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.MultipleFormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.SubQueryTransferTarget;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-
-public class TransferSubQueryResultsAction extends UDDIPropertiesFormAction
-{
-  private Node targetNode_;
-  public TransferSubQueryResultsAction(Controller controller)
-  {
-    super(controller);
-    targetNode_ = null;
-  }
-
-  protected final boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    String[] selectedNodeIds = parser.getParameterValues(ActionInputs.NODEID);
-    // The client Javascript enforces the rule that at least one item was selected before the form can be submitted.
-    propertyTable_.put(UDDIActionInputs.SELECTED_NODEIDS,selectedNodeIds);
-    return true;
-  }
-
-  public static final String getActionLinkForReturn()
-  {
-    StringBuffer actionLink = new StringBuffer("uddi/actions/TransferSubQueryResultsActionJSP.jsp?");
-    actionLink.append(UDDIActionInputs.SHOW_RESULTS_TARGET).append("=1");
-    return actionLink.toString();
-  }
-
-  public final void enableShowResultsTarget()
-  {
-    // This should only be called if the user clicks on the target link on the query results page. Insert a zero element
-    // array so that no results are transferred but the jump back to the correct query and its info occurs.
-    propertyTable_.put(UDDIActionInputs.SELECTED_NODEIDS,new String[0]);
-  }
-
-  public final boolean run()
-  {
-    // Transfer the results in this Query node into the property expected by the originating node.
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    uddiPerspective.getMessageQueue();
-
-    String[] selectedNodeIds = (String[])propertyTable_.get(UDDIActionInputs.SELECTED_NODEIDS);
-    Node currentNode = getSelectedNavigatorNode();
-    TreeElement currentElement = currentNode.getTreeElement();
-    SubQueryTransferTarget target = (SubQueryTransferTarget)(currentElement.getPropertyAsObject(UDDIModelConstants.SUBQUERY_TRANSFER_TARGET));
-    String subQueryKey = target.getSubQueryKey();
-    String targetQueryKey;
-
-    int lastSeparatorPos = subQueryKey.lastIndexOf(':');
-    if (lastSeparatorPos == -1)
-      targetQueryKey = "";
-    else
-      targetQueryKey = subQueryKey.substring(0,lastSeparatorPos);
-
-    String targetProperty = subQueryKey.substring(lastSeparatorPos+1,subQueryKey.length());
-    FormTool targetFormTool = target.getTargetFormTool();
-    ((MultipleFormToolPropertiesInterface)targetFormTool).getFormToolProperties(subQueryKey);
-    FormToolPropertiesInterface targetQueryFormToolPI = ((MultipleFormToolPropertiesInterface)targetFormTool).getFormToolProperties(targetQueryKey);
-    Vector targetList = (Vector)targetQueryFormToolPI.getProperty(targetProperty);
-    if (targetList == null)
-      targetList = new Vector();
-
-    NodeManager nodeManager = currentNode.getNodeManager();
-    for (int i=0;i<selectedNodeIds.length;i++)
-    {
-      int selectedNodeId = Integer.parseInt(selectedNodeIds[i]);
-      Node selectedNode = nodeManager.getNode(selectedNodeId);
-      TreeElement treeElement = selectedNode.getTreeElement();
-      Object object;
-      if (treeElement instanceof BusinessElement)
-        object = ((BusinessElement)treeElement).getBusinessEntity();
-      else if (treeElement instanceof ServiceElement)
-        object = ((ServiceElement)treeElement).getBusinessService();
-      else
-      {
-        // Service interface
-        object = ((ServiceInterfaceElement)treeElement).getTModel();
-      }
-      ListElement targetListElement = new ListElement(object);
-      targetListElement.setTargetViewToolInfo(selectedNodeId,selectedNode.getToolManager().getSelectedToolId(),selectedNode.getViewId());
-      if (targetProperty.equals(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_BUSINESS) || targetProperty.equals(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS) || targetProperty.equals(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_SERVICE))
-      {
-        // Clear the manager so a replacement occurs.
-        targetList.removeAllElements();
-      }
-      targetList.addElement(targetListElement);
-    }
-    targetQueryFormToolPI.setProperty(targetProperty,targetList);
-    Hashtable savedParentQueryProperties = target.getParentQueryData();
-    Enumeration e = savedParentQueryProperties.keys();
-    while (e.hasMoreElements())
-    {
-      String key = (String)e.nextElement();
-      targetQueryFormToolPI.setProperty(key,savedParentQueryProperties.get(key));
-    }
-
-    // Select the node and the datastructure which is the target of the subquery.
-    int targetNodeId = target.getNodeId();
-    int targetToolId = target.getToolId();
-    int targetViewId = target.getViewId();
-    int targetViewToolId = target.getViewToolId();
-    nodeManager.setSelectedNodeId(targetNodeId);
-    targetNode_ = nodeManager.getSelectedNode();
-    targetNode_.getToolManager().setSelectedToolId(targetToolId);
-    targetNode_.setViewId(targetViewId);
-    if (targetViewId != ActionInputs.VIEWID_DEFAULT)
-      targetNode_.getViewToolManager().setSelectedToolId(targetViewToolId);
-    targetFormTool.setProperty(UDDIActionInputs.SUBQUERY_KEY,targetQueryKey);
-    addToHistory(ActionInputs.PERSPECTIVE_UDDI,SelectFindToolAction.getActionLink(targetNodeId,targetToolId,targetViewId,targetViewToolId,targetQueryKey,true));
-    return true;
-  }
-
-  public final Node getTargetNode()
-  {
-    return targetNode_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/TransferToAddCategoryDataAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/TransferToAddCategoryDataAction.java
deleted file mode 100644
index 025265d55..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/TransferToAddCategoryDataAction.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.Action;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-
-public class TransferToAddCategoryDataAction extends Action
-{
-  public TransferToAddCategoryDataAction()
-  {
-  }
-
-  // uddi/actions/TransferToAddCategoryDataActionJSP.jsp?sessionId=...&categoryTModelKey=...
-  public static final String getActionLink(String sessionId,String categoryTModelKey)
-  {
-    StringBuffer actionLink = new StringBuffer("uddi/actions/TransferToAddCategoryDataActionJSP.jsp?");
-    actionLink.append(ActionInputs.SESSIONID).append('=').append(sessionId).append('&').append(UDDIActionInputs.CATEGORY_TMODEL_KEY).append('=').append(categoryTModelKey);
-    return actionLink.toString();
-  }
-  
-  public final boolean populatePropertyTable(HttpServletRequest request)
-  {
-    return true;
-  }
-
-  public final boolean run()
-  {
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIAddToWSDLPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIAddToWSDLPerspectiveAction.java
deleted file mode 100644
index 5f0659a28..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIAddToWSDLPerspectiveAction.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.util.Hashtable;
-import javax.servlet.http.HttpServletRequest;
-import javax.wsdl.Definition;
-import javax.wsdl.WSDLException;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.LinkAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.OpenWSDLAction;
-import org.uddi4j.datatype.service.BusinessService;
-
-public class UDDIAddToWSDLPerspectiveAction extends LinkAction
-{
-  public UDDIAddToWSDLPerspectiveAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  public static final String getActionLink(int nodeId,int toolId,int viewId,int viewToolId)
-  {
-    StringBuffer actionLink = new StringBuffer("uddi/actions/UDDIAddToWSDLPerspectiveActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID);
-    actionLink.append('=');
-    actionLink.append(nodeId);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.TOOLID);
-    actionLink.append('=');
-    actionLink.append(toolId);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.VIEWID);
-    actionLink.append('=');
-    actionLink.append(viewId);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.VIEWTOOLID);
-    actionLink.append('=');
-    actionLink.append(viewToolId);
-    return actionLink.toString();
-  }
-
-  protected boolean processLinkParameters(HttpServletRequest request)
-  {
-    String nodeIdString = request.getParameter(ActionInputs.NODEID);
-    // Perform data validation.
-    try
-    {
-      Integer.parseInt(nodeIdString);
-    }
-    catch (NumberFormatException e)
-    {
-      // Validation failed!
-      return false;
-    }
-    propertyTable_.put(ActionInputs.NODEID,nodeIdString);
-    return true;
-  }
-
-  public boolean run()
-  {
-    int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    NodeManager nodeManager = uddiPerspective.getNavigatorManager();
-    Node node = nodeManager.getNode(nodeId);
-    TreeElement element = node.getTreeElement();
-    if (element instanceof ServiceElement)
-    {
-      ServiceElement serviceElement = (ServiceElement)element;
-      BusinessService bs = serviceElement.getBusinessService();
-      Uddi4jHelper uddi4jHelper = new Uddi4jHelper();
-      String wsdlURL = uddi4jHelper.getWSDL(bs, serviceElement.getRegistryElement().getProxy());
-      if (wsdlURL == null)
-      {
-        try
-        {
-          Definition def = uddi4jHelper.getWSDLDefinition(wsdlURL);
-          File tempFile = File.createTempFile("temp",".wsdl");
-          UDDIImportWSDLToFileSystemAction action = new UDDIImportWSDLToFileSystemAction(controller_);
-          action.writeWSDLDefinition(new FileOutputStream(tempFile),def);
-          wsdlURL = tempFile.toURL().toString();
-        }
-        catch (WSDLException e)
-        {
-          wsdlURL = null;
-        }
-        catch (MalformedURLException e)
-        {
-          wsdlURL = null;
-        }
-        catch (IOException e)
-        {
-          wsdlURL = null;
-        }
-      }
-        
-      if (wsdlURL != null)
-      {
-        OpenWSDLAction openWSDLAction = new OpenWSDLAction(controller_);
-        Hashtable propertyTable = openWSDLAction.getPropertyTable();
-        propertyTable.put(ActionInputs.QUERY_INPUT_WSDL_URL,wsdlURL);
-        boolean actionResult = openWSDLAction.run();
-        if (actionResult) {
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_WSDL_ADDED_TO_WSDL_PERSPECTIVE",wsdlURL));
-          return true;
-        }
-      }
-    }
-    messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_WSDL_NOT_ADDED_TO_WSDL_PERSPECTIVE"));
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIImportWSDLToFileSystemAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIImportWSDLToFileSystemAction.java
deleted file mode 100644
index 3c49d5f7c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIImportWSDLToFileSystemAction.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.uddi.actions;
-
-import java.io.OutputStream;
-import javax.wsdl.Definition;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToFileSystemAction;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.WSDLFileNameHelper;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceInterfaceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-
-public class UDDIImportWSDLToFileSystemAction extends ImportToFileSystemAction
-{
-  private NodeManager nodeManager_;
-  private Definition def_;
-  private String defaultWSDLFileName_;
-
-  public UDDIImportWSDLToFileSystemAction(Controller controller)
-  {
-    super(controller);
-    nodeManager_ = controller.getUDDIPerspective().getNavigatorManager();
-    def_ = null;
-    defaultWSDLFileName_ = "temp.wsdl";
-  }
-
-  public static final String getActionLink(int nodeId,int toolId,int viewId,int viewToolId)
-  {
-    return ImportToFileSystemAction.getActionLink(nodeId,toolId,viewId,viewToolId,"uddi/actions/UDDIImportWSDLToFileSystemActionJSP.jsp");
-  }
-
-  public final boolean write(OutputStream os)
-  {
-    return writeWSDLDefinition(os,def_);
-  }
-
-  public final String getDefaultFileName()
-  {
-    return defaultWSDLFileName_;
-  }
-
-  public final boolean run()
-  {
-    MessageQueue messageQueue = controller_.getUDDIPerspective().getMessageQueue();
-    int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-    Node node = nodeManager_.getNode(nodeId);
-    Uddi4jHelper uddi4jHelper = new Uddi4jHelper();
-    String wsdlUrl = null;
-    if (node != null)
-    {
-      TreeElement element = node.getTreeElement();
-      if (element instanceof ServiceElement)
-      {
-        ServiceElement serviceElement = (ServiceElement)element;
-        BusinessService bs = serviceElement.getBusinessService();
-        wsdlUrl = uddi4jHelper.getWSDL(bs, serviceElement.getRegistryElement().getProxy());
-      }
-      else if (element instanceof ServiceInterfaceElement)
-      {
-        TModel tModel = ((ServiceInterfaceElement)element).getTModel();
-        wsdlUrl = uddi4jHelper.getWSDL(tModel);
-      }
-    }
-    if (wsdlUrl != null)
-    {
-      try
-      {
-        def_ = uddi4jHelper.getWSDLDefinition(wsdlUrl);
-        if (def_ != null)
-        {
-          String wsdlPathname;
-          int index = wsdlUrl.indexOf('/');
-          if (index != -1)
-            wsdlPathname = wsdlUrl.substring(index+1, wsdlUrl.length());
-          else
-            wsdlPathname = wsdlUrl;
-          defaultWSDLFileName_ = WSDLFileNameHelper.getWSDLFileName(wsdlPathname);
-        }
-        return true;
-      }
-      catch (Throwable t)
-      {
-        messageQueue.addMessage(controller_.getMessage("MSG_ERROR_RETRIEVING_WSDL_DOC"));
-      }
-    }
-    return false;
-  }
-
-  public final String getStatusContentVar()
-  {
-    return controller_.getUDDIPerspective().getStatusContentVar();
-  }
-
-  public final String getStatusContentPage()
-  {
-    return controller_.getUDDIPerspective().getStatusContentPage();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIImportWSDLToWorkbenchAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIImportWSDLToWorkbenchAction.java
deleted file mode 100644
index 4ab1cac49..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIImportWSDLToWorkbenchAction.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.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToFileSystemAction;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToWorkbenchAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-
-public class UDDIImportWSDLToWorkbenchAction extends ImportToWorkbenchAction
-{
-  public UDDIImportWSDLToWorkbenchAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  public FormTool getSelectedFormTool()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    return (FormTool)uddiPerspective.getNavigatorManager().getSelectedNode().getCurrentToolManager().getSelectedTool();
-  }
-
-    public ImportToFileSystemAction newImportToFileSystemAction() {
-        UDDIImportWSDLToFileSystemAction action = new UDDIImportWSDLToFileSystemAction(controller_);
-        Hashtable table = action.getPropertyTable();
-
-        UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-        NodeManager nodeManager = uddiPerspective.getNavigatorManager();
-        Node selectedNode = nodeManager.getSelectedNode();
-
-        table.put(ActionInputs.NODEID, String.valueOf(selectedNode.getNodeId()));
-
-        return action;
-    }
-
-  public final String getStatusContentVar()
-  {
-    return controller_.getUDDIPerspective().getStatusContentVar();
-  }
-
-  public final String getStatusContentPage()
-  {
-    return controller_.getUDDIPerspective().getStatusContentPage();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDILaunchWebServiceWizardAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDILaunchWebServiceWizardAction.java
deleted file mode 100644
index 6a65f46fd..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDILaunchWebServiceWizardAction.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import javax.wsdl.Definition;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.LaunchWebServiceWizardAction;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceInterfaceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-
-public class UDDILaunchWebServiceWizardAction extends LaunchWebServiceWizardAction
-{
-  public UDDILaunchWebServiceWizardAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  public FormTool getSelectedFormTool()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    return (FormTool)uddiPerspective.getNavigatorManager().getSelectedNode().getCurrentToolManager().getSelectedTool();
-  }
-
-  public boolean run()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    NodeManager nodeManager = uddiPerspective.getNavigatorManager();
-    Node node = nodeManager.getSelectedNode();
-    TreeElement element = node.getTreeElement();
-    Uddi4jHelper uddi4jHelper = new Uddi4jHelper();
-    String wsdlUrl = null;
-    if (element instanceof ServiceElement)
-    {
-      ServiceElement serviceElement = (ServiceElement)element;
-      BusinessService bs = serviceElement.getBusinessService();
-      wsdlUrl = uddi4jHelper.getWSDL(bs, serviceElement.getRegistryElement().getProxy());
-    }
-    else if (element instanceof ServiceInterfaceElement)
-    {
-      TModel tModel = ((ServiceInterfaceElement)element).getTModel();
-      wsdlUrl = uddi4jHelper.getWSDL(tModel);
-    }
-
-    try
-    {
-      if (wsdlUrl != null)
-      {
-        Definition def = uddi4jHelper.getWSDLDefinition(wsdlUrl);
-        File tempFile = File.createTempFile("temp",".wsdl");
-        UDDIImportWSDLToFileSystemAction action = new UDDIImportWSDLToFileSystemAction(controller_);
-        action.writeWSDLDefinition(new FileOutputStream(tempFile),def);
-        wsdlUrl = tempFile.toURL().toString();
-        return launchWizard(wsdlUrl);
-      }
-    }
-    catch (Throwable t)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_RETRIEVING_WSDL_DOC"));
-    }
-    return false;
-  }
-
-  public final String getStatusContentVar()
-  {
-    return controller_.getUDDIPerspective().getStatusContentVar();
-  }
-
-  public final String getStatusContentPage()
-  {
-    return controller_.getUDDIPerspective().getStatusContentPage();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDINodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDINodeAction.java
deleted file mode 100644
index 4387ffc95..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDINodeAction.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.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.NodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegistryNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIMainNode;
-
-public abstract class UDDINodeAction extends NodeAction
-{
-  protected RegistryNode regNode_;
-  public UDDINodeAction(Controller controller)
-  {
-    super(controller,controller.getUDDIPerspective().getNavigatorManager());
-    regNode_ = getRegistryNode();
-  }
-
-  public final Node getSelectedNavigatorNode()
-  {
-    Node selectedNavigatorNode = nodeManager_.getSelectedNode();
-    return selectedNavigatorNode;
-  }
-
-  public final RegistryNode getRegistryNode()
-  {
-    UDDIMainNode uddiMainNode = (UDDIMainNode)nodeManager_.getRootNode();
-    return uddiMainNode.getRegistryNode(getSelectedNavigatorNode());
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIPropertiesFormAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIPropertiesFormAction.java
deleted file mode 100644
index 1078b291a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIPropertiesFormAction.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.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.FormAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegistryNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIMainNode;
-
-public abstract class UDDIPropertiesFormAction extends FormAction
-{
-  protected NodeManager navigatorManager_;
-  public UDDIPropertiesFormAction(Controller controller)
-  {
-    super(controller);
-    navigatorManager_ = controller.getUDDIPerspective().getNavigatorManager();
-  }
-
-  public final Node getSelectedNavigatorNode()
-  {
-    return navigatorManager_.getSelectedNode();
-  }
-
-  public final FormTool getSelectedFormTool()
-  {
-    return (FormTool)(getSelectedNavigatorNode().getCurrentToolManager().getSelectedTool());
-  }
-
-  public final RegistryNode getRegistryNode()
-  {
-    return getRegistryNode(getSelectedNavigatorNode());
-  }
-
-  public final RegistryNode getRegistryNode(Node registryChildNode)
-  {
-    UDDIMainNode uddiMainNode = (UDDIMainNode)navigatorManager_.getRootNode();
-    return uddiMainNode.getRegistryNode(registryChildNode);
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UnpublishAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UnpublishAction.java
deleted file mode 100644
index 9a9af761f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UnpublishAction.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceInterfaceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegistryNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.response.DispositionReport;
-import org.uddi4j.transport.TransportException;
-
-public class UnpublishAction extends UDDIPropertiesFormAction
-{
-  protected RegistryNode registryNode_;
-  protected boolean isLoggedIn_;
-
-  public UnpublishAction(Controller controller)
-  {
-    super(controller);
-    registryNode_ = getRegistryNode();
-  }
-
-  protected final boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    RegistryElement regElement = (RegistryElement)registryNode_.getTreeElement();
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    FormTool formTool = getSelectedFormTool();
-
-    // if not yet logged in, validate the parameters needed to log in
-    if (!regElement.isLoggedIn())
-    {
-      String publishURL = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-      String userId = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-      String password = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-
-      boolean inputsValid = true;
-      if (publishURL != null)
-        propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL, publishURL);
-        
-      if (!Validator.validateURL(publishURL))
-      {
-        formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-        inputsValid = false;
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_PUBLISH_URL"));
-      }
-
-      if (userId != null)
-        propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
-        
-      if (!Validator.validateString(userId))
-      {
-        formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-        inputsValid = false;
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_USERID"));
-      }
-
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD, password);
-      
-      formTool.updatePropertyTable(propertyTable_);
-
-      return inputsValid;
-    }
-
-    return true;
-  }
-
-  public boolean run()
-  {
-    RegistryElement registryElement = (RegistryElement)registryNode_.getTreeElement();
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
-    Node selectedNode = navigatorManager.getSelectedNode();
-    TreeElement selectedElement = selectedNode.getTreeElement();
-
-    try
-    {
-      if (!registryElement.isLoggedIn())
-      {
-        // if not yet logged in, log in first
-        String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-        String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-        String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-        
-        registryElement.performLogin(publishURL,userId,password);
-      }
-
-      String selectedElementKey = selectedElement.getKey();
-      String unpublishTypeMessageKey = null;
-      UDDIProxy proxy = registryElement.getProxy();
-      String authInfo = registryElement.getAuthInfoString();
-      DispositionReport dr = null;
-      if (selectedElement instanceof BusinessElement)
-      {
-        unpublishTypeMessageKey = "MSG_INFO_BUSINESS_UNPUBLISHED";
-        dr = proxy.delete_business(authInfo,selectedElementKey);
-      }
-      else if (selectedElement instanceof ServiceElement)
-      {
-        unpublishTypeMessageKey = "MSG_INFO_SERVICE_UNPUBLISHED";
-        dr = proxy.delete_service(authInfo,selectedElementKey);
-      }
-      else if (selectedElement instanceof ServiceInterfaceElement)
-      {
-        unpublishTypeMessageKey = "MSG_INFO_SERVICE_INTERFACE_UNPUBLISHED";
-        dr = proxy.delete_tModel(authInfo,selectedElementKey);
-      }
-      if (!dr.success())
-        throw new Exception(dr.toString());
-      else
-      {
-        selectedElement.disconnectAll();
-        messageQueue.addMessage(uddiPerspective.getMessage(unpublishTypeMessageKey,selectedElement.getName()));
-        return true;
-      }
-    }
-    catch (TransportException e)
-    {
-      handleUnexpectedException(uddiPerspective,messageQueue,"TransportException",e);
-      return false;
-    }
-    catch (UDDIException e)
-    {
-      messageQueue.addMessage(uddiPerspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("UDDIException");
-      messageQueue.addMessage(e.toString());
-      return false;
-    }
-    catch (MalformedURLException e)
-    {
-      handleUnexpectedException(uddiPerspective,messageQueue,"MalformedURLException",e);
-      return false;
-    }
-    catch (Exception e)
-    {
-      handleUnexpectedException(uddiPerspective, messageQueue, "Exception", e);
-      return false;
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateAction.java
deleted file mode 100644
index 6f6365007..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateAction.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.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.MultipartFormDataParserTransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceInterfaceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.PublishedItemsNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegistryNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-
-public abstract class UpdateAction extends UDDIPropertiesFormAction
-{
-  protected RegistryNode regNode_;
-  private boolean requiresAuthentication_;
-  public UpdateAction(Controller controller,boolean requiresAuthentication)
-  {
-    super(controller);
-    regNode_ = getRegistryNode();
-    requiresAuthentication_ = requiresAuthentication;
-  }
-  
-  protected abstract boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException;
-  
-  protected final boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    // Setup for MultipartFormDataParserTransformer
-    propertyTable_.put(ActionInputs.MULTIPART_FORM_DATA_PARSER, parser);
-
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    FormTool formTool = getSelectedFormTool();
-    FormToolPropertiesInterface formToolPI = formTool;
-    formToolPI.clearErrors();
-    boolean inputsValid = processOthers(parser,formToolPI);
-    for (int i=0;i<removedProperties_.size();i++)
-      formToolPI.removeProperty(removedProperties_.elementAt(i));
-    formToolPI.updatePropertyTable(propertyTable_);
-    
-    String publishURL = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-    String userId = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-    String password = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-    RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-    
-    boolean validateAuthentication = !regElement.isLoggedIn() & requiresAuthentication_;
-    
-    if (publishURL != null)
-    {
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
-      formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
-    }
-    
-    if (validateAuthentication && !Validator.validateString(publishURL))
-    {
-      inputsValid = false;
-      formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_PUBLISH_URL"));
-    }
-    
-    if (userId != null)
-    {
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
-      formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
-    }
-    
-    if (validateAuthentication && !Validator.validateString(userId))
-    {
-      inputsValid = false;
-      formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_USERID"));
-    }
-    
-    if (password != null)
-    {
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
-      formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
-    }
-    
-    return inputsValid;
-  }
-
-  public abstract boolean refreshFromRegistry();
-  
-  protected final void refreshNode(BusinessEntity be)
-  {
-    Node node = getSelectedNavigatorNode();
-    Node parentNode = node.getParent();
-    TreeElement element = node.getTreeElement();
-    element.disconnectAll();
-    BusinessElement newBusinessElement = new BusinessElement(be,regNode_.getTreeElement().getModel());
-    connectElements(parentNode,newBusinessElement);
-  }
-  
-  protected final void refreshNode(BusinessService bs)
-  {
-    Node node = getSelectedNavigatorNode();
-    Node parentNode = node.getParent();
-    TreeElement element = node.getTreeElement();
-    element.disconnectAll();
-    ServiceElement newServiceElement = new ServiceElement(bs,regNode_.getTreeElement().getModel());
-    connectElements(parentNode,newServiceElement);
-  }
-  
-  protected final void refreshNode(TModel tModel)
-  {
-    Node node = getSelectedNavigatorNode();
-    Node parentNode = node.getParent();
-    TreeElement element = node.getTreeElement();
-    element.disconnectAll();
-    ServiceInterfaceElement newServiceInterfaceElement = new ServiceInterfaceElement(tModel,regNode_.getTreeElement().getModel());
-    connectElements(parentNode,newServiceInterfaceElement);
-  }
-  
-  private final void connectElements(Node parentNode,TreeElement newElement)
-  {
-    TreeElement parentElement = parentNode.getTreeElement();
-    String rel = null;
-    if (parentNode instanceof PublishedItemsNode)
-      rel = UDDIModelConstants.REL_PUBLISHED_ITEMS;
-    else
-    {
-      // QueryNode
-      rel = UDDIModelConstants.REL_QUERY_RESULTS;
-    }
-    parentElement.connect(newElement,rel,ModelConstants.REL_OWNER);
-    Node newNode = parentNode.getChildNode(newElement);
-    int newNodeId = newNode.getNodeId();
-    NodeManager nodeManager = parentNode.getNodeManager();
-    nodeManager.setSelectedNodeId(newNodeId);
-    ToolManager toolManager = newNode.getToolManager();
-    Tool selectedTool = toolManager.getSelectedTool();
-    addToHistory(ActionInputs.PERSPECTIVE_UDDI,selectedTool.getSelectToolActionHref(true));
-  }
-    
-  protected final void reindexListElementVector(Vector v)
-  {
-    for (int i=0;i<v.size();i++)
-    {
-      ListElement listElement = (ListElement)v.elementAt(i);
-      listElement.setViewId(i);
-      // targetViewId determines whether or not a successfully validated list element remains in edit state.
-    }
-  }
-  
-  public ITransformer[] getTransformers()
-  {
-    ITransformer[] parentTransformers = super.getTransformers();
-    ITransformer[] transformers = new ITransformer[parentTransformers.length + 1];
-    System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
-    transformers[transformers.length - 1] = new MultipartFormDataParserTransformer(controller_);
-    return transformers;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateBusinessAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateBusinessAction.java
deleted file mode 100644
index 0c30fcf54..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateBusinessAction.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.ws.internal.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.Description;
-import org.uddi4j.datatype.Name;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.util.CategoryBag;
-import org.uddi4j.util.DiscoveryURL;
-import org.uddi4j.util.DiscoveryURLs;
-import org.uddi4j.util.IdentifierBag;
-import org.uddi4j.util.KeyedReference;
-
-public class UpdateBusinessAction extends UpdateAction
-{
-  private boolean isUpdate_;
-  public UpdateBusinessAction(Controller controller)
-  {
-    super(controller,true);
-    isUpdate_ = true;
-  }
-  
-  protected boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
-  {
-    String uuidKey = parser.getParameter(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY);
-    String[] discoveryURLModifiedStates = parser.getParameterValues(UDDIActionInputs.DISCOVERYURL_MODIFIED);
-    String[] discoveryURLViewIds = parser.getParameterValues(UDDIActionInputs.DISCOVERYURL_VIEWID);
-    String[] discoveryURLs = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DISCOVERYURL);
-    String[] nameModifiedStates = parser.getParameterValues(UDDIActionInputs.NAME_MODIFIED);
-    String[] nameViewIds = parser.getParameterValues(UDDIActionInputs.NAME_VIEWID);
-    String[] nameLanguages = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME_LANGUAGE);
-    String[] names = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME);
-    String[] descriptionModifiedStates = parser.getParameterValues(UDDIActionInputs.DESCRIPTION_MODIFIED);
-    String[] descriptionViewIds = parser.getParameterValues(UDDIActionInputs.DESCRIPTION_VIEWID);
-    String[] descriptionLanguages = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION_LANGUAGE);
-    String[] descriptions = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION);
-    String[] idModifiedStates = parser.getParameterValues(UDDIActionInputs.IDENTIFIER_MODIFIED);
-    String[] idViewIds = parser.getParameterValues(UDDIActionInputs.IDENTIFIER_VIEWID);
-    String[] idTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_TYPE);
-    String[] idKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_NAME);
-    String[] idKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_VALUE);
-    String[] catModifiedStates = parser.getParameterValues(UDDIActionInputs.CATEGORY_MODIFIED);
-    String[] catViewIds = parser.getParameterValues(UDDIActionInputs.CATEGORY_VIEWID);
-    String[] catTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_TYPE);
-    String[] catKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_NAME);
-    String[] catKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_VALUE);
-    
-    boolean inputsValid = true;
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    
-    if (uuidKey != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY,uuidKey);
-    
-    
-    if (discoveryURLModifiedStates != null && discoveryURLViewIds != null && discoveryURLs != null)
-    {
-      Vector oldDiscoveryURLListElementVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS);
-      Vector newDiscoveryURLListElementVector = new Vector();
-      String[] parameters = new String[2];
-      parameters[0] = uddiPerspective.getMessage("FORM_LABEL_DISCOVERYURL");
-      for (int i=0;i<discoveryURLs.length;i++)
-      {
-        parameters[1] = String.valueOf(i+1);
-        DiscoveryURL discoveryURL = new DiscoveryURL(discoveryURLs[i],"");
-        if (!Validator.validateURL(discoveryURLs[i]))
-        {
-          inputsValid = false;
-          formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS,i);
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_INVALID_TEXT",parameters));
-        }
-        
-        int discoveryURLViewId = Integer.parseInt(discoveryURLViewIds[i]);
-        boolean isModified = Boolean.valueOf(discoveryURLModifiedStates[i]).booleanValue();
-        
-        if (discoveryURLViewId == -1 || isModified)
-          newDiscoveryURLListElementVector.addElement(new ListElement(discoveryURL));
-        else
-          newDiscoveryURLListElementVector.addElement(oldDiscoveryURLListElementVector.elementAt(discoveryURLViewId));     
-      }
-      reindexListElementVector(newDiscoveryURLListElementVector);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS,newDiscoveryURLListElementVector);       
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS);
-    
-    Hashtable languageHash = new Hashtable();
-    if (nameModifiedStates != null && nameViewIds != null && nameLanguages != null && names != null)
-    {
-      Vector oldNameListElementVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES);
-      Vector newNameListElementVector = new Vector();
-      // UDDI's save API (Appendix C of the UDDI V2 Programmers API Specification) requires the following:
-      // 1) Only the first row can have a blank language.
-      // 2) Only 1 name per language.
-      String[] parameters = new String[2];
-      parameters[0] = uddiPerspective.getMessage("FORM_LABEL_NAME");
-      for (int i=0;i<names.length;i++)
-      {
-        parameters[1] = String.valueOf(i+1);
-        Name uddi4jName;
-        if (nameLanguages[i].length() > 0)
-          uddi4jName = new Name(names[i],nameLanguages[i]);
-        else
-        {
-          uddi4jName = new Name(names[i]);
-          if (i != 0)
-          {
-            inputsValid = false;
-            formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES,i);
-            messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_BLANK_LANGUAGE",parameters));
-          }
-        }
-        if (languageHash.get(nameLanguages[i]) != null)
-        {
-          inputsValid = false;
-          formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES,i);
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_DUPLICATE_LANGUAGE",parameters));
-        }
-        else
-          languageHash.put(nameLanguages[i],Boolean.TRUE);
-        if (!Validator.validateString(names[i]))
-        {
-          inputsValid = false;
-          formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES,i);
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_INVALID_TEXT",parameters));
-        }
-        
-        int nameViewId = Integer.parseInt(nameViewIds[i]);
-        boolean isModified = Boolean.valueOf(nameModifiedStates[i]).booleanValue();
-      
-        if (nameViewId == -1 || isModified)
-          newNameListElementVector.addElement(new ListElement(uddi4jName));
-        else
-          newNameListElementVector.addElement(oldNameListElementVector.elementAt(nameViewId));
-      }
-      reindexListElementVector(newNameListElementVector);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES,newNameListElementVector);
-    }
-    else
-    {
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES);
-      inputsValid = false;
-      formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_NO_NAMES"));
-    }
-    
-    if (descriptionModifiedStates != null && descriptionViewIds != null && descriptionLanguages != null && descriptions != null)
-    {
-      Vector oldDescriptionListElementVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS);
-      Vector newDescriptionListElementVector = new Vector();
-      String[] parameters = new String[2];
-      parameters[0] = uddiPerspective.getMessage("FORM_LABEL_DESCRIPTION");
-      languageHash.clear();
-      for (int i=0;i<descriptions.length;i++)
-      {
-        parameters[1] = String.valueOf(i+1);
-        Description uddi4jDescription;
-        if (descriptionLanguages[i].length() > 0)
-          uddi4jDescription = new Description(descriptions[i],descriptionLanguages[i]);
-        else
-        {
-          uddi4jDescription = new Description(descriptions[i]);
-          if (i != 0)
-          {
-            inputsValid = false;
-            formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS,i);
-            messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_BLANK_LANGUAGE",parameters));
-          }
-        }
-        if (languageHash.get(descriptionLanguages[i]) != null)
-        {
-          inputsValid = false;
-          formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS,i);
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_DUPLICATE_LANGUAGE",parameters));
-        }
-        else
-          languageHash.put(descriptionLanguages[i],Boolean.TRUE);
-        if (!Validator.validateString(descriptions[i]))
-        {
-          inputsValid = false;
-          formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS,i);
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_INVALID_TEXT",parameters));
-        }
-        
-        int descriptionViewId = Integer.parseInt(descriptionViewIds[i]);
-        boolean isModified = Boolean.valueOf(descriptionModifiedStates[i]).booleanValue();
-      
-        if (descriptionViewId == -1 || isModified)
-          newDescriptionListElementVector.addElement(new ListElement(uddi4jDescription));
-        else
-          newDescriptionListElementVector.addElement(oldDescriptionListElementVector.elementAt(descriptionViewId));
-      }
-      reindexListElementVector(newDescriptionListElementVector);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS,newDescriptionListElementVector);      
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS);
-      
-    if (idModifiedStates != null && idViewIds != null && idTypes != null && idKeyNames != null && idKeyValues != null)
-    {
-      Vector oldIdListElementVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS);
-      Vector newIdListElementVector = new Vector();
-      for (int i=0;i<idKeyNames.length;i++)
-      {
-        KeyedReference kr = new KeyedReference(idKeyNames[i],idKeyValues[i],idTypes[i]);
-        int idViewId = Integer.parseInt(idViewIds[i]);
-        boolean isModified = Boolean.valueOf(idModifiedStates[i]).booleanValue();
-        if (idViewId == -1 || isModified)
-          newIdListElementVector.addElement(new ListElement(kr));
-        else
-          newIdListElementVector.addElement(oldIdListElementVector.elementAt(idViewId));
-      }
-      reindexListElementVector(newIdListElementVector);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS,newIdListElementVector);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS);
-      
-    if (catModifiedStates != null && catViewIds != null && catTypes != null && catKeyNames != null && catKeyValues != null)
-    {
-      Vector oldCatListElementVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES);
-      Vector newCatListElementVector = new Vector();
-      for (int i=0;i<catTypes.length;i++)
-      {
-        KeyedReference kr = new KeyedReference(catKeyNames[i],catKeyValues[i],catTypes[i]);
-        int catViewId = Integer.parseInt(catViewIds[i]);
-        boolean isModified = Boolean.valueOf(catModifiedStates[i]).booleanValue();
-        if (catViewId == -1 || isModified)
-          newCatListElementVector.addElement(new ListElement(kr));
-        else
-          newCatListElementVector.addElement(oldCatListElementVector.elementAt(catViewId));
-      }
-      reindexListElementVector(newCatListElementVector);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES,newCatListElementVector);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES);            
-    return inputsValid;
-  }
-
-  public final boolean refreshFromRegistry()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    uddiPerspective.getMessageQueue();
-    try
-    {
-      String uuidKey = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY);
-      RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-      UDDIProxy proxy = regElement.getProxy();
-      Vector beVector = proxy.get_businessDetail(uuidKey).getBusinessEntityVector();
-      BusinessEntity be;
-      if (beVector.size() > 0)
-        be = (BusinessEntity)beVector.get(0);
-      else
-        be = null;
-      if (be != null)
-      {
-        propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,be);
-        return true;
-      }
-    }
-    catch (TransportException e)
-    {
-      // Feedback via Javascript popups.
-    }
-    catch (UDDIException e)
-    {
-      // Feedback via Javascript popups.
-    }
-    isUpdate_ = false;
-    return false;
-  }
-    
-  public final boolean run()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    try
-    {
-      BusinessEntity be = (BusinessEntity)propertyTable_.get(UDDIActionInputs.LATEST_OBJECT);
-      String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-      String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-      String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-      Vector discoveryURLListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS);
-      Vector nameListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES);
-      Vector descriptionListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS);
-      Vector idListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS);
-      Vector catListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES);
-      
-      Vector discoveryURLVector = new Vector();
-      if (discoveryURLListElementVector != null)
-      {
-        for (int i=0;i<discoveryURLListElementVector.size();i++)
-        {
-          ListElement listElement = (ListElement)discoveryURLListElementVector.elementAt(i);
-          DiscoveryURL discoveryURL = (DiscoveryURL)listElement.getObject();
-          discoveryURLVector.addElement(discoveryURL);
-        }
-      }
-        
-      Vector nameVector = new Vector();
-      for (int i=0;i<nameListElementVector.size();i++)
-      {
-        ListElement listElement = (ListElement)nameListElementVector.elementAt(i);
-        Name name = (Name)listElement.getObject();
-        nameVector.addElement(name);
-      }
-      
-      Vector descriptionVector = null;
-      if (descriptionListElementVector != null)
-      {
-        descriptionVector = new Vector();
-        for (int i=0;i<descriptionListElementVector.size();i++)
-        {
-          ListElement listElement = (ListElement)descriptionListElementVector.elementAt(i);
-          Description description = (Description)listElement.getObject();
-          descriptionVector.addElement(description);
-        }
-      }
-      
-      IdentifierBag idBag = null;
-      if (idListElementVector != null)
-      {
-        idBag = new IdentifierBag();
-        for (int i=0;i<idListElementVector.size();i++)
-        {
-          ListElement listElement = (ListElement)idListElementVector.elementAt(i);
-          KeyedReference kr = (KeyedReference)listElement.getObject();
-          idBag.add(kr);
-        }
-      }
-      
-      CategoryBag catBag = null;
-      if (catListElementVector != null)
-      {
-        catBag = new CategoryBag();
-        for (int i=0;i<catListElementVector.size();i++)
-        {
-          ListElement listElement = (ListElement)catListElementVector.elementAt(i);
-          KeyedReference kr = (KeyedReference)listElement.getObject();
-          catBag.add(kr);
-        }
-      }
-
-      if (discoveryURLVector.size() > 0)
-        be.setDiscoveryURLs(new DiscoveryURLs(discoveryURLVector));
-      else
-        be.setDiscoveryURLs(null);
-      be.setNameVector(nameVector);
-      be.setDescriptionVector(descriptionVector);
-      be.setIdentifierBag(idBag);
-      be.setCategoryBag(catBag);
-      
-      RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-      if (!regElement.isLoggedIn())
-        regElement.performLogin(publishURL,userId,password);
-      UDDIProxy proxy = regElement.getProxy();
-      Vector beVector = new Vector();
-      beVector.add(be);
-      be = (BusinessEntity)proxy.save_business(regElement.getAuthInfoString(), beVector).getBusinessEntityVector().get(0);
-      refreshNode(be);
-      if (isUpdate_)      
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_BUSINESS_UPDATED",be.getDefaultNameString()));
-      else
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_BUSINESS_PUBLISHED",be.getDefaultNameString()));
-      return true;
-    }
-    catch (TransportException e)
-    {
-      handleUnexpectedException(uddiPerspective,messageQueue,"TransportException",e);
-    }
-    catch (UDDIException e)
-    {
-      messageQueue.addMessage(uddiPerspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("UDDIException");
-      messageQueue.addMessage(e.toString());
-    }
-    catch (MalformedURLException e)
-    {
-      handleUnexpectedException(uddiPerspective,messageQueue,"MalformedURLException",e);
-    }    
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateRegistryAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateRegistryAction.java
deleted file mode 100644
index 4edc31d69..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateRegistryAction.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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.io.BufferedReader;
-import java.io.StringReader;
-import java.text.ParseException;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.CategoryModel;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-
-public class UpdateRegistryAction extends UpdateAction
-{
-  public UpdateRegistryAction(Controller controller)
-  {
-    super(controller,false);
-  }
-  
-  protected boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
-  {
-    String nameModifiedState = parser.getParameter(UDDIActionInputs.NAME_MODIFIED);
-    String name = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_REGISTRY_NAME);
-    String[] userDefinedCategoryTModelKeys = parser.getParameterValues(UDDIActionInputs.CATEGORY_TMODEL_KEY);
-    String[] userDefinedCategoryData = parser.getParameterValues(UDDIActionInputs.CATEGORY_FILENAME);
-    
-    boolean inputsValid = true;
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    
-    if (nameModifiedState != null && name != null)
-    {
-      boolean isModified = Boolean.valueOf(nameModifiedState).booleanValue();
-      String newName;
-      if (isModified)
-        newName = name;
-      else
-        newName = (String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_REGISTRY_NAME);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_REGISTRY_NAME,newName);
-      if (!Validator.validateString(name))
-      {
-        inputsValid = false;
-        formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_REGISTRY_NAME);
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_NAME"));
-      }
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_REGISTRY_NAME);
-    
-    if (userDefinedCategoryTModelKeys != null && userDefinedCategoryData != null)
-    {
-      RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-      for (int i=0;i<userDefinedCategoryTModelKeys.length;i++)
-      {
-        CategoryModel userDefinedCategory = regElement.getUserDefinedCategory(userDefinedCategoryTModelKeys[i]);
-//      TODO: Move UDDIPreferenceContext down to org.eclipse.wst.ws 
-//      UDDIPreferenceContext context = WebServicePlugin.getInstance().getUDDIPreferenceContext();        
-//      userDefinedCategory.setColumnDelimiter(context.getUddiCatDataColumnDelimiter());
-//      userDefinedCategory.setStringDelimiter(context.getUddiCatDataStringDelimiter());
-        userDefinedCategory.setColumnDelimiter("#");
-        userDefinedCategory.setStringDelimiter("\"");
-        String displayName = userDefinedCategory.getDisplayName();
-        if (userDefinedCategoryData[i] == null || userDefinedCategoryData[i].length() < 1)
-        {
-          inputsValid = false;
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_USER_DEFINED_CATEGORY_DATA_FILE",displayName));
-          formToolPI.flagRowError(UDDIActionInputs.USER_DEFINED_CATEGORIES,userDefinedCategoryTModelKeys[i]);
-        }
-        else
-        {
-          byte rc = userDefinedCategory.loadData(new BufferedReader(new StringReader(userDefinedCategoryData[i])));
-          switch (rc)
-          {
-            case CategoryModel.OPERATION_SUCCESSFUL:
-              messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_USER_DEFINED_CATEGORY_DATA_LOADED",displayName));
-              break;
-            case CategoryModel.ERROR_FILE:
-              inputsValid = false;
-              ParseException pe = (ParseException)userDefinedCategory.getErrorException();
-              String[] args1 = {String.valueOf(pe.getErrorOffset()),displayName,pe.getMessage(),userDefinedCategory.getCategoryKey()};
-              messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_USER_DEFINED_CATEGORY_DATA_FILE_FORMAT",args1));
-              formToolPI.flagRowError(UDDIActionInputs.USER_DEFINED_CATEGORIES,userDefinedCategoryTModelKeys[i]);
-              break;              
-            case CategoryModel.ERROR_CATEGORY_KEY:
-            default:
-              inputsValid = false;
-              String[] args2 = {displayName,userDefinedCategory.getErrorException().getMessage(),userDefinedCategory.getCategoryKey()};
-              messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_USER_DEFINED_CATEGORY_DATA_FILE_KEY",args2));
-              formToolPI.flagRowError(UDDIActionInputs.USER_DEFINED_CATEGORIES,userDefinedCategoryTModelKeys[i]);              
-          }
-        }
-      }
-    }
-    return inputsValid;
-  }
-
-  public final boolean refreshFromRegistry()
-  {
-    return true;
-  }
-  
-  public final boolean run()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    String name = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_REGISTRY_NAME);
-    RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-    regElement.setName(name);
-    regNode_.getTreeElement().setName(name);
-    messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_REGISTRY_UPDATED",name));
-    return true;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateServiceAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateServiceAction.java
deleted file mode 100644
index 41bfc586d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateServiceAction.java
+++ /dev/null
@@ -1,490 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Hashtable;
-import java.util.Vector;
-import javax.wsdl.Definition;
-import javax.wsdl.WSDLException;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegPublishTool;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.Description;
-import org.uddi4j.datatype.Name;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.response.ServiceDetail;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.util.CategoryBag;
-import org.uddi4j.util.KeyedReference;
-
-public class UpdateServiceAction extends UpdateAction
-{
-  private boolean isUpdate_;
-  public UpdateServiceAction(Controller controller)
-  {
-    super(controller,true);
-    isUpdate_ = true;
-  }
-
-  protected boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
-  {
-    String uuidBusinessKey = parser.getParameter(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY);
-    String uuidServiceKey = parser.getParameter(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY);
-    String wsdlURLModifiedState = parser.getParameter(UDDIActionInputs.WSDL_URL_MODIFIED);
-    String wsdlURL = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL);
-    String[] nameModifiedStates = parser.getParameterValues(UDDIActionInputs.NAME_MODIFIED);
-    String[] nameViewIds = parser.getParameterValues(UDDIActionInputs.NAME_VIEWID);
-    String[] nameLanguages = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME_LANGUAGE);
-    String[] names = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME);
-    String[] descriptionModifiedStates = parser.getParameterValues(UDDIActionInputs.DESCRIPTION_MODIFIED);
-    String[] descriptionViewIds = parser.getParameterValues(UDDIActionInputs.DESCRIPTION_VIEWID);
-    String[] descriptionLanguages = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION_LANGUAGE);
-    String[] descriptions = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION);
-    String[] catModifiedStates = parser.getParameterValues(UDDIActionInputs.CATEGORY_MODIFIED);
-    String[] catViewIds = parser.getParameterValues(UDDIActionInputs.CATEGORY_VIEWID);
-    String[] catTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_TYPE);
-    String[] catKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_NAME);
-    String[] catKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_VALUE);
-
-    boolean inputsValid = true;
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
-    if (uuidBusinessKey != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY,uuidBusinessKey);
-
-    if (uuidServiceKey != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY,uuidServiceKey);
-
-    if (wsdlURLModifiedState != null && wsdlURL != null)
-    {
-      ListElement wsdlURLListElement = (ListElement)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL);
-      boolean isModified = Boolean.valueOf(wsdlURLModifiedState).booleanValue();
-      if (isModified)
-        wsdlURLListElement = new ListElement(wsdlURL);
-      else
-        wsdlURL = (String)wsdlURLListElement.getObject();
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL,wsdlURLListElement);
-      if (!Validator.validateURL(wsdlURL))
-      {
-        inputsValid = false;
-        formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL);
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_WSDL_URL"));
-      }
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL);
-
-    Hashtable languageHash = new Hashtable();
-    if (nameModifiedStates != null && nameViewIds != null && nameLanguages != null && names != null)
-    {
-      Vector oldNameListElementVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES);
-      Vector newNameListElementVector = new Vector();
-      // UDDI's save API (Appendix C of the UDDI V2 Programmers API Specification) requires the following:
-      // 1) Only the first row can have a blank language.
-      // 2) Only 1 name per language.
-      String[] parameters = new String[2];
-      parameters[0] = uddiPerspective.getMessage("FORM_LABEL_NAME");
-      for (int i=0;i<names.length;i++)
-      {
-        parameters[1] = String.valueOf(i+1);
-        Name uddi4jName;
-        if (nameLanguages[i].length() > 0)
-          uddi4jName = new Name(names[i],nameLanguages[i]);
-        else
-        {
-          uddi4jName = new Name(names[i]);
-          if (i != 0)
-          {
-            inputsValid = false;
-            formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES,i);
-            messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_BLANK_LANGUAGE",parameters));
-          }
-        }
-        if (languageHash.get(nameLanguages[i]) != null)
-        {
-          inputsValid = false;
-          formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES,i);
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_DUPLICATE_LANGUAGE",parameters));
-        }
-        else
-          languageHash.put(nameLanguages[i],Boolean.TRUE);
-        if (!Validator.validateString(names[i]))
-        {
-          inputsValid = false;
-          formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES,i);
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_INVALID_TEXT",parameters));
-        }
-
-        int nameViewId = Integer.parseInt(nameViewIds[i]);
-        boolean isModified = Boolean.valueOf(nameModifiedStates[i]).booleanValue();
-
-        if (nameViewId == -1 || isModified)
-          newNameListElementVector.addElement(new ListElement(uddi4jName));
-        else
-          newNameListElementVector.addElement(oldNameListElementVector.elementAt(nameViewId));
-      }
-      reindexListElementVector(newNameListElementVector);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES,newNameListElementVector);
-    }
-    else
-    {
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES);
-      inputsValid = false;
-      formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_NO_NAMES"));
-    }
-
-    if (descriptionModifiedStates != null && descriptionViewIds != null && descriptionLanguages != null && descriptions != null)
-    {
-      Vector oldDescriptionListElementVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS);
-      Vector newDescriptionListElementVector = new Vector();
-      String[] parameters = new String[2];
-      parameters[0] = uddiPerspective.getMessage("FORM_LABEL_DESCRIPTION");
-      languageHash.clear();
-      for (int i=0;i<descriptions.length;i++)
-      {
-        parameters[1] = String.valueOf(i+1);
-        Description uddi4jDescription;
-        if (descriptionLanguages[i].length() > 0)
-          uddi4jDescription = new Description(descriptions[i],descriptionLanguages[i]);
-        else
-        {
-          uddi4jDescription = new Description(descriptions[i]);
-          if (i != 0)
-          {
-            inputsValid = false;
-            formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS,i);
-            messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_BLANK_LANGUAGE",parameters));
-          }
-        }
-        if (languageHash.get(descriptionLanguages[i]) != null)
-        {
-          inputsValid = false;
-          formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS,i);
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_DUPLICATE_LANGUAGE",parameters));
-        }
-        else
-          languageHash.put(descriptionLanguages[i],Boolean.TRUE);
-        if (!Validator.validateString(descriptions[i]))
-        {
-          inputsValid = false;
-          formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS,i);
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_INVALID_TEXT",parameters));
-        }
-
-        int descriptionViewId = Integer.parseInt(descriptionViewIds[i]);
-        boolean isModified = Boolean.valueOf(descriptionModifiedStates[i]).booleanValue();
-
-        if (descriptionViewId == -1 || isModified)
-          newDescriptionListElementVector.addElement(new ListElement(uddi4jDescription));
-        else
-          newDescriptionListElementVector.addElement(oldDescriptionListElementVector.elementAt(descriptionViewId));
-      }
-      reindexListElementVector(newDescriptionListElementVector);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS,newDescriptionListElementVector);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS);
-
-    if (catModifiedStates != null && catViewIds != null && catTypes != null && catKeyNames != null && catKeyValues != null)
-    {
-      Vector oldCatListElementVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES);
-      Vector newCatListElementVector = new Vector();
-      for (int i=0;i<catTypes.length;i++)
-      {
-        KeyedReference kr = new KeyedReference(catKeyNames[i],catKeyValues[i],catTypes[i]);
-        int catViewId = Integer.parseInt(catViewIds[i]);
-        boolean isModified = Boolean.valueOf(catModifiedStates[i]).booleanValue();
-        if (catViewId == -1 || isModified)
-          newCatListElementVector.addElement(new ListElement(kr));
-        else
-          newCatListElementVector.addElement(oldCatListElementVector.elementAt(catViewId));
-      }
-      reindexListElementVector(newCatListElementVector);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES,newCatListElementVector);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES);
-    return inputsValid;
-  }
-
-  public final boolean refreshBusinessFromRegistry()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    uddiPerspective.getMessageQueue();
-    try
-    {
-      String uuidBusinessKey = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY);
-      RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-      UDDIProxy proxy = regElement.getProxy();
-      Vector beVector = proxy.get_businessDetail(uuidBusinessKey).getBusinessEntityVector();
-      BusinessEntity be;
-      if (beVector.size() > 0)
-        be = (BusinessEntity)beVector.get(0);
-      else
-        be = null;
-      if (be != null)
-      {
-        propertyTable_.put(UDDIActionInputs.LATEST_BUSINESS,be);
-        return true;
-      }
-    }
-    catch (TransportException e)
-    {
-      // Feedback via Javascript popups.
-    }
-    catch (UDDIException e)
-    {
-      // Feedback via Javascript popups.
-    }
-    return false;
-  }
-  
-  public final boolean refreshFromRegistry()
-  {
-    controller_.getUDDIPerspective();
-    try
-    {
-      String uuidServiceKey = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY);
-      RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-      UDDIProxy proxy = regElement.getProxy();
-      ServiceDetail serviceDetail = proxy.get_serviceDetail(uuidServiceKey);
-      Vector businessServiceVector = serviceDetail.getBusinessServiceVector();
-      if (businessServiceVector.size() > 0)
-      {
-        propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,businessServiceVector.elementAt(0));
-        return true;
-      }
-    }
-    catch (UDDIException e)
-    {
-      // Feedback via Javascript popups.
-    }
-    catch (TransportException e)
-    {
-      // Feedback via Javascript popups.
-    }
-    isUpdate_ = false;
-    return false;
-  }
-  
-  public final RegPublishTool setupRegPublishTool()
-  {
-    // Prepare for re-publishing a now-stale service whose business has also been eliminated.
-    RegPublishTool regPublishTool = regNode_.getRegPublishTool();
-    regPublishTool.setProperty(UDDIActionInputs.SUBQUERY_KEY,"");
-    regPublishTool.setProperty(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICES));
-    regPublishTool.setProperty(UDDIActionInputs.QUERY_STYLE_SERVICES,String.valueOf(UDDIActionInputs.QUERY_STYLE_ADVANCED));
-    
-    regPublishTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL,propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL));
-    
-    Vector nameListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES);
-    Vector descriptionListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS);
-    Vector catListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES);
-    
-    Vector nameVector = new Vector();
-    for (int i=0;i<nameListElementVector.size();i++)
-    {
-      ListElement listElement = (ListElement)nameListElementVector.elementAt(i);
-      Name name = (Name)listElement.getObject();
-      nameVector.addElement(name);
-    }
-    
-    Vector descriptionVector = null;
-    if (descriptionListElementVector != null)
-    {
-      descriptionVector = new Vector();
-      for (int i=0;i<descriptionListElementVector.size();i++)
-      {
-        ListElement listElement = (ListElement)descriptionListElementVector.elementAt(i);
-        Description description = (Description)listElement.getObject();
-        descriptionVector.addElement(description);
-      }
-    }
-    else
-      regPublishTool.removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS);
-    
-    CategoryBag catBag = null;
-    if (catListElementVector != null)
-    {
-      catBag = new CategoryBag();
-      for (int i=0;i<catListElementVector.size();i++)
-      {
-        ListElement listElement = (ListElement)catListElementVector.elementAt(i);
-        KeyedReference kr = (KeyedReference)listElement.getObject();
-        catBag.add(kr);
-      }
-    }
-    else
-      regPublishTool.removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES);
-    
-    regPublishTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES,nameVector);
-    if (descriptionVector != null)
-      regPublishTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS,descriptionVector);
-    if (catBag != null)
-      regPublishTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES,catBag);
-    return regPublishTool;
-  }
-
-  public final boolean run()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();    
-    try
-    {
-      BusinessEntity be = (BusinessEntity)propertyTable_.get(UDDIActionInputs.LATEST_BUSINESS);
-      String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-      String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-      String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-      String uuidServiceKey = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY);
-      ListElement wsdlURLListElement = (ListElement)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL);
-      Vector nameListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES);
-      Vector descriptionListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS);
-      Vector catListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES);
-
-      String wsdlURL = (String)wsdlURLListElement.getObject();
-            
-      Vector nameVector = new Vector();
-      for (int i=0;i<nameListElementVector.size();i++)
-      {
-        ListElement listElement = (ListElement)nameListElementVector.elementAt(i);
-        Name name = (Name)listElement.getObject();
-        nameVector.addElement(name);
-      }
-
-      Vector descriptionVector = null;
-      if (descriptionListElementVector != null)
-      {
-        descriptionVector = new Vector();
-        for (int i=0;i<descriptionListElementVector.size();i++)
-        {
-          ListElement listElement = (ListElement)descriptionListElementVector.elementAt(i);
-          Description description = (Description)listElement.getObject();
-          descriptionVector.addElement(description);
-        }
-      }
-
-      CategoryBag catBag = null;
-      if (catListElementVector != null)
-      {
-        catBag = new CategoryBag();
-        for (int i=0;i<catListElementVector.size();i++)
-        {
-          ListElement listElement = (ListElement)catListElementVector.elementAt(i);
-          KeyedReference kr = (KeyedReference)listElement.getObject();
-          catBag.add(kr);
-        }
-      }
-
-      if (!regElement.isLoggedIn())
-      	regElement.performLogin(publishURL,userId,password);
-      UDDIProxy proxy = regElement.getProxy();
-
-      // Note: The JSP will prevent this routine from executing if be is null.
-      Uddi4jHelper uddi4jHelper = new Uddi4jHelper();
-      Definition def = uddi4jHelper.getWSDLDefinition(wsdlURL);
-      
-      // Publish/update the service interfaces first.
-      RegPublishServiceInterfaceSimpleAction regPublishSIAction = new RegPublishServiceInterfaceSimpleAction(controller_);
-      int currentNodeId = getSelectedNavigatorNode().getNodeId();
-      NodeManager nodeManager = regNode_.getNodeManager();
-
-      Hashtable tModelsTable = new Hashtable();
-      TModel[] tModels = null;
-      if (uddi4jHelper.isMonolithicWSDL(def))
-      {
-      	tModels = new TModel[1];
-      	tModels[0] = uddi4jHelper.newTModel(wsdlURL, def);
-      }
-      else
-      {
-      	String[] imports = uddi4jHelper.getImports(def, wsdlURL);
-      	tModels = new TModel[imports.length];
-      	for (int i = 0; i < tModels.length; i++)
-      	  tModels[i] = uddi4jHelper.newTModel(imports[i]);
-      }
-      
-      if (tModels != null)
-      {
-      	for (int i=0;i<tModels.length;i++)
-      	{
-      	  boolean inputsValid = regPublishSIAction.populatePropertyTable(uddi4jHelper.getWSDL(tModels[i]), tModels[i]);
-      	  if (inputsValid)
-      	  {
-      	    regPublishSIAction.run();
-      	    Object savedTModel = regPublishSIAction.getPropertyTable().get(UDDIActionInputs.QUERY_OUTPUT_SAVED_TMODEL);
-      	    if (savedTModel != null)
-            {
-      	      tModelsTable.put(((TModel)savedTModel).getNameString(), savedTModel);
-      	    }
-            // Reselect the current node.
-      	    nodeManager.setSelectedNodeId(currentNodeId);
-          }
-      	}
-      }
-      
-      BusinessService busService = uddi4jHelper.newBusinessService(wsdlURL, def, tModelsTable);
-      if (isUpdate_)
-        busService.setServiceKey(uuidServiceKey);
-      busService.setBusinessKey(be.getBusinessKey());
-      busService.setNameVector(nameVector);
-      busService.setDescriptionVector(descriptionVector);
-      busService.setCategoryBag(catBag);
-      regElement.handlePreInvocation(busService);      
-      Vector bsVector = new Vector();
-      bsVector.add(busService);
-      busService = (BusinessService)proxy.save_service(regElement.getAuthInfoString(), bsVector).getBusinessServiceVector().get(0);
-      refreshNode(busService);
-      if (isUpdate_)
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_UPDATED",busService.getDefaultNameString()));
-      else
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_PUBLISHED",busService.getDefaultNameString()));
-      return true;
-    }
-    catch (WSDLException e)
-    {
-      handleUnexpectedException(uddiPerspective,messageQueue,"WSDLException",e);
-    }
-    catch (TransportException e)
-    {
-      handleUnexpectedException(uddiPerspective,messageQueue,"TransportException",e);
-    }
-    catch (UDDIException e)
-    {
-      messageQueue.addMessage(uddiPerspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("UDDIException");
-      messageQueue.addMessage(e.toString());
-    }
-    catch (MalformedURLException e)
-    {
-      handleUnexpectedException(uddiPerspective,messageQueue,"MalformedURLException",e);
-    }    
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateServiceInterfaceAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateServiceInterfaceAction.java
deleted file mode 100644
index a042a2003..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateServiceInterfaceAction.java
+++ /dev/null
@@ -1,336 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Hashtable;
-import java.util.Vector;
-import javax.wsdl.WSDLException;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.Description;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.response.TModelDetail;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.util.CategoryBag;
-import org.uddi4j.util.IdentifierBag;
-import org.uddi4j.util.KeyedReference;
-
-public class UpdateServiceInterfaceAction extends UpdateAction
-{
-  private boolean isUpdate_;
-  public UpdateServiceInterfaceAction(Controller controller)
-  {
-    super(controller,true);
-    isUpdate_ = true;
-  }
-  
-  protected boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
-  {
-    String uuidKey = parser.getParameter(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY);
-    String wsdlURLModifiedState = parser.getParameter(UDDIActionInputs.WSDL_URL_MODIFIED);
-    String wsdlURL = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL);
-    String nameModifiedState = parser.getParameter(UDDIActionInputs.NAME_MODIFIED);
-    String name = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME);
-    String[] descriptionModifiedStates = parser.getParameterValues(UDDIActionInputs.DESCRIPTION_MODIFIED);
-    String[] descriptionViewIds = parser.getParameterValues(UDDIActionInputs.DESCRIPTION_VIEWID);
-    String[] descriptionLanguages = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION_LANGUAGE);
-    String[] descriptions = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION);
-    String[] idModifiedStates = parser.getParameterValues(UDDIActionInputs.IDENTIFIER_MODIFIED);
-    String[] idViewIds = parser.getParameterValues(UDDIActionInputs.IDENTIFIER_VIEWID);
-    String[] idTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_TYPE);
-    String[] idKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_NAME);
-    String[] idKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_VALUE);
-    String[] catModifiedStates = parser.getParameterValues(UDDIActionInputs.CATEGORY_MODIFIED);
-    String[] catViewIds = parser.getParameterValues(UDDIActionInputs.CATEGORY_VIEWID);
-    String[] catTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_TYPE);
-    String[] catKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_NAME);
-    String[] catKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_VALUE);
-    
-    boolean inputsValid = true;
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    
-    if (uuidKey != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY,uuidKey);
-    
-    if (wsdlURLModifiedState != null && wsdlURL != null)
-    {
-      ListElement wsdlURLListElement = (ListElement)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL);      
-      boolean isModified = Boolean.valueOf(wsdlURLModifiedState).booleanValue();
-      if (isModified)
-        wsdlURLListElement = new ListElement(wsdlURL);
-      else
-        wsdlURL = (String)wsdlURLListElement.getObject();
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL,wsdlURLListElement);
-      if (!Validator.validateURL(wsdlURL))
-      {
-        inputsValid = false;
-        formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL);
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_WSDL_URL"));
-      }
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL);
-    
-    if (nameModifiedState != null && name != null)
-    {
-      ListElement nameListElement = (ListElement)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME);
-      boolean isModified = Boolean.valueOf(nameModifiedState).booleanValue();
-      if (isModified)
-        nameListElement = new ListElement(name);
-      else
-        name = (String)nameListElement.getObject();
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME,nameListElement);
-      if (!Validator.validateString(name))
-      {
-        inputsValid = false;
-        formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME);
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_NAME"));
-      }
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME);
-      
-    Hashtable languageHash = new Hashtable();
-    if (descriptionModifiedStates != null && descriptionViewIds != null && descriptionLanguages != null && descriptions != null)
-    {
-      Vector oldDescriptionListElementVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS);
-      Vector newDescriptionListElementVector = new Vector();
-      String[] parameters = new String[2];
-      parameters[0] = uddiPerspective.getMessage("FORM_LABEL_DESCRIPTION");
-      languageHash.clear();
-      for (int i=0;i<descriptions.length;i++)
-      {
-        parameters[1] = String.valueOf(i+1);
-        Description uddi4jDescription;
-        if (descriptionLanguages[i].length() > 0)
-          uddi4jDescription = new Description(descriptions[i],descriptionLanguages[i]);
-        else
-        {
-          uddi4jDescription = new Description(descriptions[i]);
-          if (i != 0)
-          {
-            inputsValid = false;
-            formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS,i);
-            messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_BLANK_LANGUAGE",parameters));
-          }
-        }
-        if (languageHash.get(descriptionLanguages[i]) != null)
-        {
-          inputsValid = false;
-          formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS,i);
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_DUPLICATE_LANGUAGE",parameters));
-        }
-        else
-          languageHash.put(descriptionLanguages[i],Boolean.TRUE);
-        if (!Validator.validateString(descriptions[i]))
-        {
-          inputsValid = false;
-          formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS,i);
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_INVALID_TEXT",parameters));
-        }
-        
-        int descriptionViewId = Integer.parseInt(descriptionViewIds[i]);
-        boolean isModified = Boolean.valueOf(descriptionModifiedStates[i]).booleanValue();
-      
-        if (descriptionViewId == -1 || isModified)
-          newDescriptionListElementVector.addElement(new ListElement(uddi4jDescription));
-        else
-          newDescriptionListElementVector.addElement(oldDescriptionListElementVector.elementAt(descriptionViewId));
-      }
-      reindexListElementVector(newDescriptionListElementVector);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS,newDescriptionListElementVector);      
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS);
-      
-    if (idModifiedStates != null && idViewIds != null && idTypes != null && idKeyNames != null && idKeyValues != null)
-    {
-      Vector oldIdListElementVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS);
-      Vector newIdListElementVector = new Vector();
-      for (int i=0;i<idKeyNames.length;i++)
-      {
-        KeyedReference kr = new KeyedReference(idKeyNames[i],idKeyValues[i],idTypes[i]);
-        int idViewId = Integer.parseInt(idViewIds[i]);
-        boolean isModified = Boolean.valueOf(idModifiedStates[i]).booleanValue();
-        if (idViewId == -1 || isModified)
-          newIdListElementVector.addElement(new ListElement(kr));
-        else
-          newIdListElementVector.addElement(oldIdListElementVector.elementAt(idViewId));
-      }
-      reindexListElementVector(newIdListElementVector);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS,newIdListElementVector);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS);
-      
-    if (catModifiedStates != null && catViewIds != null && catTypes != null && catKeyNames != null && catKeyValues != null)
-    {
-      Vector oldCatListElementVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES);
-      Vector newCatListElementVector = new Vector();
-      for (int i=0;i<catTypes.length;i++)
-      {
-        KeyedReference kr = new KeyedReference(catKeyNames[i],catKeyValues[i],catTypes[i]);
-        int catViewId = Integer.parseInt(catViewIds[i]);
-        boolean isModified = Boolean.valueOf(catModifiedStates[i]).booleanValue();
-        if (catViewId == -1 || isModified)
-          newCatListElementVector.addElement(new ListElement(kr));
-        else
-          newCatListElementVector.addElement(oldCatListElementVector.elementAt(catViewId));
-      }
-      reindexListElementVector(newCatListElementVector);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES,newCatListElementVector);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES);            
-    return inputsValid;
-  }
-
-  public final boolean refreshFromRegistry()
-  {
-    controller_.getUDDIPerspective();
-    try
-    {
-      String uuidKey = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY);
-      RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-      UDDIProxy proxy = regElement.getProxy();
-      TModelDetail tModelDetail = proxy.get_tModelDetail(uuidKey);
-      Vector tModelVector = tModelDetail.getTModelVector();
-      if (tModelVector.size() > 0)
-      {
-        propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,tModelVector.elementAt(0));
-        return true;
-      }
-    }
-    catch (UDDIException e)
-    {
-      // Feedback via Javascript popups.
-    }
-    catch (TransportException e)
-    {
-      // Feedback via Javascript popups.
-    }
-    isUpdate_ = false;
-    return false;
-  }
-    
-  public final boolean run()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    try
-    {
-      String uuidKey = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY);      
-      String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-      String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-      String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-      ListElement wsdlURLListElement = (ListElement)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL);
-      ListElement nameListElement = (ListElement)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME);
-      Vector descriptionListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS);
-      Vector idListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS);
-      Vector catListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES);
-      
-      String wsdlURL = (String)wsdlURLListElement.getObject();
-      
-      String name = (String)nameListElement.getObject();
-      
-      Vector descriptionVector = null;
-      if (descriptionListElementVector != null)
-      {
-        descriptionVector = new Vector();
-        for (int i=0;i<descriptionListElementVector.size();i++)
-        {
-          ListElement listElement = (ListElement)descriptionListElementVector.elementAt(i);
-          Description description = (Description)listElement.getObject();
-          descriptionVector.addElement(description);
-        }
-      }
-      
-      IdentifierBag idBag = null;
-      if (idListElementVector != null)
-      {
-        idBag = new IdentifierBag();
-        for (int i=0;i<idListElementVector.size();i++)
-        {
-          ListElement listElement = (ListElement)idListElementVector.elementAt(i);
-          KeyedReference kr = (KeyedReference)listElement.getObject();
-          idBag.add(kr);
-        }
-      }
-      
-      CategoryBag catBag = null;
-      if (catListElementVector != null)
-      {
-        catBag = new CategoryBag();
-        for (int i=0;i<catListElementVector.size();i++)
-        {
-          ListElement listElement = (ListElement)catListElementVector.elementAt(i);
-          KeyedReference kr = (KeyedReference)listElement.getObject();
-          catBag.add(kr);
-        }
-      }
-
-      TModel tModel = (new Uddi4jHelper()).newTModel(wsdlURL);
-      if (isUpdate_)
-        tModel.setTModelKey(uuidKey);
-      tModel.setName(name);      
-      tModel.setDescriptionVector(descriptionVector);
-      tModel.setIdentifierBag(idBag);
-      tModel.setCategoryBag(catBag);
-      
-      RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-      if (!regElement.isLoggedIn())
-        regElement.performLogin(publishURL,userId,password);
-      UDDIProxy proxy = regElement.getProxy();
-      Vector tModelVector = new Vector();
-      tModelVector.add(tModel);
-      tModel = (TModel)proxy.save_tModel(regElement.getAuthInfoString(), tModelVector).getTModelVector().get(0);
-      refreshNode(tModel);
-      if (isUpdate_)      
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_INTERFACE_UPDATED",tModel.getNameString()));
-      else
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_INTERFACE_PUBLISHED",tModel.getNameString()));
-      return true;
-    }
-    catch (WSDLException e)
-    {
-      handleUnexpectedException(uddiPerspective,messageQueue,"WSDLException",e);
-    }
-    catch (TransportException e)
-    {
-      handleUnexpectedException(uddiPerspective,messageQueue,"TransportException",e);
-    }
-    catch (UDDIException e)
-    {
-      messageQueue.addMessage(uddiPerspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("UDDIException");
-      messageQueue.addMessage(e.toString());
-    }
-    catch (MalformedURLException e)
-    {
-      handleUnexpectedException(uddiPerspective,messageQueue,"MalformedURLException",e);
-    }
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/constants/UDDIActionInputs.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/constants/UDDIActionInputs.java
deleted file mode 100644
index 2ee6dde85..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/constants/UDDIActionInputs.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.explorer.platform.uddi.constants;
-
-public class UDDIActionInputs
-{
-  // OpenRegistryAction
-  public static final String REGISTRY_NAME = "registryName";
-  public static final String INQUIRY_URL = "inquiryURL";
-  public static final String PUBLISH_URL = "publishURL";
-  public static final String REGISTRATION_URL = "registrationURL";
-  public static final String CHECK_USER_DEFINED_CATEGORIES = "checkUserDefinedCategories";
-  public static final String UDDI_USERNAME = "uddiUsername";
-  public static final String UDDI_PASSWORD = "uddiPassword";
-
-  // Fixed and user-defined categories
-  public static final String CATEGORIES_DIRECTORY = "categoriesDirectory";
-  public static final String CATEGORY_TMODEL_KEY = "categoryTModelKey";
-  public static final String CATEGORY_FILENAME = "categoryFileName";
-  public static final String USER_DEFINED_CATEGORIES = "userDefinedCategories";
-
-  // Discovery URL use type
-  public static final String DISCOVERY_URL_TYPE = "businessEntity";
-
-  // Results (NODEID)
-  public static final String NODEID_SERVICE_INTERFACE = "nodeId_ServiceInterface";
-  public static final String NODEID_SERVICE = "nodeId_Service";
-  public static final String NODEID_BUSINESS = "nodeId_Business";
-
-  // RegFind..Actions/RegPublish..Actions
-  public static final String QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE = "overrideAddQueryNode";
-  public static final String QUERY_NAME = "queryName";
-  public static final String QUERY_ITEM = "queryItem";
-  public static final int QUERY_ITEM_QUERIES = -1;
-  public static final int QUERY_ITEM_BUSINESSES = 0;
-  public static final int QUERY_ITEM_SERVICES = 1;
-  public static final int QUERY_ITEM_SERVICE_INTERFACES = 2;
-  public static final int QUERY_STYLE_SIMPLE = 0;
-  public static final int QUERY_STYLE_ADVANCED = 1;
-  public static final int QUERY_STYLE_UUID = 2;
-  public static final String QUERY_INPUT_ADVANCED_OWNED = "advancedOwned";
-  public static final String QUERY_INPUT_ADVANCED_PUBLISH_URL = "advancedPublishURL";
-  public static final String QUERY_INPUT_ADVANCED_USERID = "advancedUserId";
-  public static final String QUERY_INPUT_ADVANCED_PASSWORD = "advancedPassword";
-  public static final String QUERY_INPUT_ADVANCED_NAME_LANGUAGE = "advancedNameLanguage";
-  public static final String QUERY_INPUT_ADVANCED_NAME = "advancedName";
-  public static final String QUERY_INPUT_ADVANCED_IDENTIFIER_TYPE = "advancedIdentifierType";
-  public static final String QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_NAME = "advancedIdentifierKeyName";
-  public static final String QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_VALUE = "advancedIdentifierKeyValue";
-  public static final String QUERY_INPUT_ADVANCED_CATEGORY_TYPE = "advancedCategoryType";
-  public static final String QUERY_INPUT_ADVANCED_CATEGORY_KEY_NAME = "advancedCategoryKeyName";
-  public static final String QUERY_INPUT_ADVANCED_CATEGORY_KEY_VALUE = "advancedCategoryKeyValue";
-  public static final String QUERY_INPUT_ADVANCED_DISCOVERYURL = "advancedDiscoveryURL";
-  public static final String QUERY_INPUT_ADVANCED_FINDQUALIFIER = "advancedFindQualifier";
-  public static final String QUERY_INPUT_ADVANCED_SORT_BY_NAME = "advancedSortByName";
-  public static final String QUERY_INPUT_ADVANCED_SORT_BY_DATE = "advancedSortByDate";
-  public static final String QUERY_INPUT_ADVANCED_MAX_SEARCH_SET = "advancedMaxSearchSet";
-  public static final int QUERY_MAX_SEARCH_SET = 100;
-  public static final String QUERY_INPUT_ADVANCED_MAX_RESULTS = "advancedMaxResults";
-  public static final int QUERY_MAX_RESULTS = 10;
-
-  public static final String QUERY_STYLE_BUSINESSES = "queryStyleBusinesses";
-  public static final String QUERY_INPUT_SIMPLE_BUSINESS_NAME = "simpleBusinessName";
-  public static final String QUERY_INPUT_ADVANCED_BUSINESS_OWNED = "advancedBusinessOwned";
-  public static final String QUERY_INPUT_ADVANCED_BUSINESS_NAMES = "advancedBusinessNames";
-  public static final String QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS = "advancedBusinessIdentifiers";
-  public static final String QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES = "advancedBusinessCategories";
-  public static final String QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS = "advancedBusinessDiscoveryURLs";
-  public static final String QUERY_INPUT_ADVANCED_BUSINESS_SERVICE_INTERFACES = "advancedBusinessServiceInterfaces";
-  public static final String QUERY_INPUT_ADVANCED_BUSINESS_SERVICE_INTERFACES_COPY = "advancedBusinessServiceInterfacesCopy";
-  public static final String QUERY_INPUT_ADVANCED_BUSINESS_TMODELBAG = "advancedBusinessTModelBag";
-  public static final String QUERY_INPUT_ADVANCED_BUSINESS_FINDQUALIFIERS = "advancedBusinessFindQualifiers";
-  public static final String QUERY_INPUT_ADVANCED_BUSINESS_MAX_SEARCH_SET = "advancedBusinessMaxSearchSet";
-  public static final String QUERY_INPUT_ADVANCED_BUSINESS_MAX_RESULTS = "advancedBusinessMaxResults";
-
-  public static final String QUERY_STYLE_SERVICES = "queryStyleServices";
-  public static final String QUERY_INPUT_SIMPLE_SERVICE_NAME = "simpleServiceName";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_OWNED = "advancedServiceOwned";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_BUSINESS = "advancedServiceBusiness";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_BUSINESS_COPY = "advancedServiceBusinessCopy";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_SERVICE_PROVIDER = "advancedServiceServiceProvider";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_NAMES = "advancedServiceNames";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES = "advancedServiceCategories";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES = "advancedServiceServiceInterfaces";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES_COPY = "advancedServiceServiceInterfacesCopy";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_TMODEL = "advancedServiceTModel";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_TMODELBAG = "advancedServiceTModelBag";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_FINDQUALIFIERS = "advancedServiceFindQualifiers";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_MAX_SEARCH_SET = "advancedServiceMaxSearchSet";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_MAX_RESULTS = "advancedServiceMaxResults";
-
-  public static final String QUERY_STYLE_SERVICE_INTERFACES = "queryStyleServiceInterfaces";
-  public static final String QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME = "simpleServiceInterfaceName";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_USE_SERVICE = "advancedUseService";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_SERVICE = "advancedServiceInterfaceService";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_SERVICE_COPY = "advancedServiceInterfaceServiceCopy";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_BUSINESS_SERVICE = "advancedServiceInterfaceBusinessService";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_OWNED = "advancedServiceInterfaceOwned";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME = "advancedServiceInterfaceName";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS = "advancedServiceInterfaceIdentifiers";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES = "advancedServiceInterfaceCategories";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_FINDQUALIFIERS = "advancedServiceInterfaceFindQualifiers";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_SEARCH_SET = "advancedServiceInterfaceMaxSearchSet";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_RESULTS = "advancedServiceInterfaceMaxResults";
-  
-  public static final String QUERY_INPUT_ADVANCED_REGISTRY_NAME = "advancedRegistryName";
-
-  public static final String QUERY_INPUT_UUID_KEY = "uuidKey";
-  public static final String QUERY_INPUT_UUID_BUSINESS_KEY = "uuidBusinessKey";
-  public static final String QUERY_INPUT_UUID_SERVICE_KEY = "uuidServiceKey";
-  public static final String QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY = "uuidServiceInterfaceKey";
-  
-  public static final String QUERY_OUTPUT_SAVED_TMODEL = "savedTModel";
-
-  // Sub Queries:
-  public static final String SUBQUERIES_PROPERTIES = "subQueriesProperties";
-  public static final String SUBQUERY_KEY = "subQueryKey";
-  public static final String NEW_SUBQUERY_INITIATED = "newSubQueryInitiated";
-  public static final String NEW_SUBQUERY_QUERY_ITEM = "newSubQueryQueryItem";
-  public static final String SELECTED_NODEIDS = "selectedNodeIds";
-  public static final String SUBQUERY_LIST_KEY = "subQueryListKey";
-  public static final String SUBQUERY_LIST_ITEMID = "subQueryListItemId";
-  public static final String SHOW_RESULTS_TARGET = "showResultsTarget";
-  public static final String SUBQUERY_GET = "subQueryGet";
-
-  // RegPublish..Actions (some constants from the RegFind...Actions will be reused.
-  public static final String QUERY_INPUT_SIMPLE_BUSINESS_DESCRIPTION = "simpleBusinessDescription";
-
-  public static final String QUERY_INPUT_ADVANCED_DESCRIPTION_LANGUAGE = "advancedDescriptionLanguage";
-  public static final String QUERY_INPUT_ADVANCED_DESCRIPTION = "advancedDescription";
-  public static final String QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS = "advancedBusinessDescriptions";
-
-  public static final String QUERY_INPUT_WSDL_URL = "wsdlURL";
-  public static final String QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_WSDL_URL = "simpleServiceInterfaceWSDLURL";
-  public static final String QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_DESCRIPTION = "simpleServiceInterfaceDescription";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL = "advancedServiceInterfaceWSDLURL";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS = "advancedServiceInterfaceDescriptions";
-
-  public static final String QUERY_INPUT_SIMPLE_SERVICE_BUSINESS = "simpleServiceBusiness";
-  public static final String QUERY_INPUT_SIMPLE_SERVICE_BUSINESS_COPY = "simpleServiceBusinessCopy";
-  public static final String QUERY_INPUT_SIMPLE_SERVICE_SERVICE_PROVIDER = "simpleServiceServiceProvider";
-  public static final String QUERY_INPUT_SIMPLE_SERVICE_WSDL_URL = "simpleServiceWSDLURL";
-  public static final String QUERY_INPUT_SIMPLE_SERVICE_DESCRIPTION = "simpleServiceDescription";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL = "advancedServiceWSDLURL";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS = "advancedServiceDescriptions";
-
-  // WSDL Browser
-  public static final String PROJECT = "project";
-  public static final String WSDL_TYPE = "wsdlType";
-  public static final int WSDL_TYPE_SERVICE_INTERFACE = 0;
-  public static final int WSDL_TYPE_SERVICE = 1;
-  public static final String QUERY_INPUT_WEBPROJECT_WSDL_URL = "webProjectWSDLURL";
-  public static final String QUERY_INPUT_FAVORITE_WSDL_URL = "favoriteWSDLURL";
-
-  // Details
-  public static final String LATEST_OBJECT = "latestObject";
-  public static final String DISCOVERYURL_MODIFIED = "discoveryURLModified";
-  public static final String DISCOVERYURL_VIEWID = "discoveryURLViewId";
-  public static final String NAME_MODIFIED = "nameModified";
-  public static final String NAME_VIEWID = "businessViewId";
-  public static final String DESCRIPTION_MODIFIED = "descriptionModified";
-  public static final String DESCRIPTION_VIEWID = "descriptionViewId";
-  public static final String IDENTIFIER_MODIFIED = "identifierModified";
-  public static final String IDENTIFIER_VIEWID = "identifierViewId";
-  public static final String CATEGORY_MODIFIED = "categoryModified";
-  public static final String CATEGORY_VIEWID = "categoryViewId";
-  public static final String WSDL_URL_MODIFIED = "wsdlURLModified";
-  public static final String PUBLISH_ACTION = "publishAction";
-  public static final String LATEST_BUSINESS = "latestBusiness";
-
-  // Refresh action
-  public static final String REFRESH_NODE = "refreshNode";
-
-  // Manage PublisherAssertions
-  // "To" means from another business to my owning business
-  public static final int DIRECTION_TO = 0;
-  // "From" means from my owning business to another business
-  public static final int DIRECTION_FROM = 1;
-  public static final String PUBLISHER_ASSERTIONS_VIEWID = "publisherAssertionsViewId";
-  public static final String PUBLISHER_ASSERTIONS_SELECTED_BUS_ID = "publisherAssertionsSelectedBusID";
-  public static final String PUBLISHER_ASSERTIONS_DIRECTION = "publisherAssertionsDirection";
-  public static final String QUERY_INPUT_ADD_PUBLISHER_ASSERTIONS = "queryInputAddPublisherAssertions";
-  public static final String QUERY_INPUT_ADD_PUBLISHER_ASSERTIONS_COPY = "queryInputAddPublisherAssertionsCopy";
-  public static final String QUERY_INPUT_EXISTING_PUBLISHER_ASSERTIONS = "queryInputExistingPublisherAssertions";
-  public static final String PUBLISHER_ASSERTIONS_TYPE = "publisherAssertionsType";
-  public static final String PUBLISHER_ASSERTIONS_TYPE_PARENT_CHILD = "parent-child";
-  public static final String PUBLISHER_ASSERTIONS_TYPE_PEER_TO_PEER = "peer-peer";
-  public static final String PUBLISHER_ASSERTIONS_TYPE_IDENTITY = "identity";
-
-  // Manage Referenced Services
-  public static final String QUERY_INPUT_REFERENCED_SERVICES = "referencedServices";
-  public static final String QUERY_INPUT_SERVICES = "services";
-  public static final String MANAGE_REFERENCED_SERVICES_OPERATION = "managedReferencedServicesOperation";
-  public static final int MANAGE_REFERENCED_SERVICES_OPERATION_ADD = 0;
-  public static final int MANAGE_REFERENCED_SERVICES_OPERATION_REMOVE = 1;
-  public static final String REFERENCED_SERVICE_SELECT_STATE = "referencedServiceSelectState";
-  
-  // ResizeUDDIFrameAction
-  public static final String FRAMESET_COLS_PERSPECTIVE_CONTENT = "framesetColsPerspectiveContent";
-  public static final String FRAMESET_ROWS_ACTIONS_CONTAINER = "framesetRowsActionsContainer";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/constants/UDDIFrameNames.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/constants/UDDIFrameNames.java
deleted file mode 100644
index 970fff747..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/constants/UDDIFrameNames.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.constants;
-
-public class UDDIFrameNames
-{
-  public final static String NAVIGATOR_CONTAINER = "uddi_navigator_container";
-  public final static String NAVIGATOR_TOOLBAR = "uddi_navigator_toolbar";
-  public final static String NAVIGATOR_CONTENT = "uddi_navigator_content";
-  public final static String ACTIONS_CONTAINER = "uddi_actions_container";
-  public final static String PROPERTIES_CONTAINER = "uddi_properties_container";
-  public final static String PROPERTIES_TOOLBAR = "uddi_properties_toolbar";
-  public final static String PROPERTIES_CONTENT = "uddi_properties_content";
-  public final static String STATUS_CONTAINER = "uddi_status_container";
-  public final static String STATUS_TOOLBAR = "uddi_status_toolbar";
-  public final static String STATUS_CONTENT = "uddi_status_content";
-
-  public final static String CATEGORIES_WORKAREA = "categories_workarea";
-  public final static String CATEGORIES_TOOLBAR = "categories_toolbar";
-  public final static String CATEGORIES_CONTENT = "categories_content";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/constants/UDDIModelConstants.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/constants/UDDIModelConstants.java
deleted file mode 100644
index b344fe9c2..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/constants/UDDIModelConstants.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.uddi.constants;
-
-public class UDDIModelConstants
-{
-  // Registries under UDDIMain.
-  public static final String REL_REGISTRIES = "registries";
-
-  // Executed Queries folder under a registry.
-  public static final String REL_QUERIES_PARENT = "queriesParent";
-
-  // Published Businesses folder under a registry.
-  public static final String REL_PUBLISHED_BUSINESSES_PARENT = "publishedBusinessesParent";
-
-  // Published Services folder under a registry.
-  public static final String REL_PUBLISHED_SERVICES_PARENT = "publishedServicesParent";
-
-  // Published Service interfaces folder under a registry.
-  public static final String REL_PUBLISHED_SERVICE_INTERFACES_PARENT = "publishedServiceInterfacesParent";
-
-  // Queries under the Queries folder.
-  public static final String REL_QUERIES = "queries";
-  public static final String INITIAL_RESULTS = "initialResults";
-  public static final String QUERY_TYPE = "queryType";
-  public static final String SUBQUERY_TRANSFER_TARGET = "subQueryTransferTarget";
-
-  // Objects under a Query node.
-  public static final String REL_QUERY_RESULTS = "queryResults";
-
-  // Categories
-  public static final String REL_SUBCATEGORIES = "subCategories";
-
-  // Published items inside the Published items folder.
-  public static final String REL_PUBLISHED_ITEMS = "publishedItems";
-
-  // Businesses
-  public static final String IS_BUSINESS_OWNED = "isBusinessOwned";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/AbstractUDDIElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/AbstractUDDIElement.java
deleted file mode 100644
index a40b239d9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/AbstractUDDIElement.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.uddi.datamodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-
-public abstract class AbstractUDDIElement extends TreeElement
-{
-  public AbstractUDDIElement(String name, Model model)
-  {
-    super(name, model);
-  }
-
-  public final TreeElement getParentElement()
-  {
-    return getParentElement(this);
-  }
-
-  public final TreeElement getParentElement(TreeElement child)
-  {
-    Enumeration e = child.getElements(ModelConstants.REL_OWNER);
-    if (e.hasMoreElements())
-      return (TreeElement)e.nextElement();
-    else
-      return null;
-  }
-
-  public final RegistryElement getRegistryElement()
-  {
-    if (this instanceof RegistryElement)
-      return (RegistryElement)this;
-    else
-    {
-      TreeElement childElement = this;
-      TreeElement parentElement = getParentElement(childElement);
-      while (parentElement != null && parentElement != childElement)
-      {
-        if (parentElement instanceof RegistryElement)
-          return (RegistryElement)parentElement;
-        childElement = parentElement;
-        parentElement = getParentElement(childElement);
-      }
-      return null;
-    }
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/BusinessElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/BusinessElement.java
deleted file mode 100644
index f6fcc6a4f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/BusinessElement.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.ws.internal.explorer.platform.uddi.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListManager;
-import org.uddi4j.datatype.business.BusinessEntity;
-
-public class BusinessElement extends AbstractUDDIElement
-{
-  private BusinessEntity be_;
-  private ListManager publisherAssertions_;
-  
-  public BusinessElement(BusinessEntity be,Model model)
-  {
-    super(be.getDefaultNameString(),model);
-    be_ = be;
-    setKey(be_.getBusinessKey());
-    publisherAssertions_ = null;
-  }
-
-  public final BusinessEntity getBusinessEntity()
-  {
-    return be_;
-  }
-  
-  public final void setBusinessEntity(BusinessEntity be)
-  {
-    be_ = be;
-    setKey(be_.getBusinessKey());
-  }
-
-  public ListManager getPublisherAssertions()
-  {
-    return publisherAssertions_;
-  }
-
-  public void setPublisherAssertions(ListManager listManager)
-  {
-    publisherAssertions_ = listManager;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/CategoryElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/CategoryElement.java
deleted file mode 100644
index b111b246f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/CategoryElement.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.wst.ws.internal.explorer.platform.uddi.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.uddi4j.util.KeyedReference;
-
-public class CategoryElement extends AbstractUDDIElement
-{
-  private KeyedReference category_;
-
-  public CategoryElement(String name,KeyedReference category,Model model)
-  {
-    super(name,model);
-    category_ = category;
-    saveCategoryProperties();
-  }
-
-  private final void saveCategoryProperties()
-  {
-    if (category_ != null)
-    {
-      String keyName = category_.getKeyName();
-      if (keyName != null)
-        setName(keyName);
-    }
-  }
-
-  public final KeyedReference getCategory()
-  {
-    return category_;
-  }
-
-  public final String getNameForTree()
-  {
-    StringBuffer nameForTree = new StringBuffer("[");
-    nameForTree.append(category_.getKeyValue()).append("] ").append(category_.getKeyName());
-    return nameForTree.toString();
-  }
-
-  public final void updateCategory(String keyName,String keyValue,String tModelKey)
-  {
-    category_.setKeyName(keyName);
-    category_.setKeyValue(keyValue);
-    category_.setTModelKey(tModelKey);
-    saveCategoryProperties();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/CategoryModel.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/CategoryModel.java
deleted file mode 100644
index aa4d07cbd..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/CategoryModel.java
+++ /dev/null
@@ -1,569 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.uddi.datamodel;
-
-import java.io.BufferedReader;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
-import java.text.ParseException;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Properties;
-import java.util.Vector;
-import javax.servlet.ServletContext;
-import org.eclipse.wst.ws.internal.datamodel.BasicModel;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.util.HTMLUtils;
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.Category;
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy;
-import org.uddi4j.util.KeyedReference;
-
-public class CategoryModel extends BasicModel
-{
-  private ServletContext application_;
-  private String defaultDataFile_;
-  private Hashtable categoryElements_;
-  private String columnDelimiter_;
-  private String stringDelimiter_;
-  private String categoryKey_;
-  private boolean checked_;
-  private String displayName_;
-  private String tModelKey_;
-  private Throwable errorException_;
-  
-  // Return codes for loading and saving category data.
-  public static final byte OPERATION_SUCCESSFUL = 0x00;
-  public static final byte ERROR_FILE = 0x01;
-  public static final byte ERROR_SECURITY = 0x02;
-  public static final byte ERROR_ENCODING = 0x03;
-  public static final byte ERROR_IO = 0x04;
-  public static final byte ERROR_CATEGORY_KEY = 0x05;
-  
-  private final String defaultColumnDelimiter_ = "#";
-  private final String defaultStringDelimiter_ = "\"";
-  
-  public CategoryModel()
-  {
-    super("categories");
-    application_ = null;
-	defaultDataFile_ = null;
-    columnDelimiter_ = defaultColumnDelimiter_;
-    stringDelimiter_ = defaultStringDelimiter_;
-    categoryElements_ = null;
-    categoryKey_ = null;
-    checked_ = true;
-    displayName_ = null;
-    tModelKey_ = null;
-    errorException_ = null;
-  }
-  
-  /**
-   * CategoryModels load their data from the file named via the
-   * {@link #setDefaultDataFile(String)} method. The data file
-   * name is interpretted as either a physical pathname or a
-   * context-root relative pathname depending on whether the
-   * servlet context or "application" is null (default) or not.
-   * @param application The application context, null by default.
-   * Value can be the ServletContext of the WSExplorer or null.
-   */
-  public final void setServletContext(ServletContext application)
-  {
-	application_ = application;
-  }
-  
-  public final void setDefaultDataFile(String defaultDataFile)
-  {
-    defaultDataFile_ = defaultDataFile;
-  }
-
-  public final void setCategoryKey(String categoryKey)
-  {
-    categoryKey_ = categoryKey;
-  }
-  
-  public final String getCategoryKey()
-  {
-    return categoryKey_;
-  }
-  
-  public final void setColumnDelimiter(String columnDelimiter)
-  {
-    columnDelimiter_ = columnDelimiter;
-  }
-  
-  public final String getColumnDelimiter()
-  {
-    return columnDelimiter_;
-  }
-  
-  public final void setStringDelimiter(String stringDelimiter)
-  {
-    stringDelimiter_ = stringDelimiter;
-  }
-  
-  public final String getStringDelimiter()
-  {
-    return stringDelimiter_;
-  }
-  
-  public final void enableChecked(boolean isChecked)
-  {
-    checked_ = isChecked;
-  }
-  
-  public final boolean isChecked()
-  {
-    return checked_;
-  }
-  
-  public final void setDisplayName(String displayName)
-  {
-    displayName_ = displayName;
-  }
-  
-  public final String getDisplayName()
-  {
-    return displayName_;
-  }
-  
-  public final void setTModelKey(String tModelKey)
-  {
-    tModelKey_ = tModelKey;
-  }
-  
-  public final String getTModelKey()
-  {
-    return tModelKey_;
-  }
-  
-  public final boolean isDataLoaded()
-  {
-    return (categoryElements_ != null);
-  }
-  
-  public final Throwable getErrorException()
-  {
-    return errorException_;
-  }
-  
-  private final boolean isEnclosedInQuotes(String string)
-  {
-    return string.startsWith("\"") && string.endsWith("\"");
-  }
-
-  public final void loadFromTaxonomy(Taxonomy taxonomy)
-  {
-    String name = taxonomy.getName();
-    CategoryElement root = new CategoryElement(name,null,this);
-    setRootElement(root);
-    categoryElements_ = new Hashtable();
-    for (Iterator it = taxonomy.getCategory().iterator(); it.hasNext();)
-    {
-      addCategory(root, (Category)it.next());
-    }
-  }
-
-  private void addCategory(CategoryElement parent, Category category)
-  {
-    String keyName = category.getName();
-    String keyValue = category.getCode();
-    CategoryElement child = new CategoryElement(keyName,new KeyedReference(keyName,keyValue,tModelKey_),this);
-    parent.connect(child,UDDIModelConstants.REL_SUBCATEGORIES,ModelConstants.REL_OWNER);
-    categoryElements_.put(keyValue, child);   
-    for (Iterator it = category.getCategory().iterator(); it.hasNext();)
-    {
-      addCategory(child, (Category)it.next());
-    }
-  }
-
-  public final byte loadFromDefaultDataFile()
-  {
-    try
-    {
-      if (defaultDataFile_ == null)
-        throw new FileNotFoundException();
-	  BufferedReader br = null;
-	  if (application_ == null)
-		br = new BufferedReader(new InputStreamReader(new FileInputStream(defaultDataFile_),HTMLUtils.UTF8_ENCODING));
-	  else
-	    br = new BufferedReader(new InputStreamReader(application_.getResourceAsStream(defaultDataFile_),HTMLUtils.UTF8_ENCODING));
-      return loadData(br);
-    }
-    catch (FileNotFoundException e)
-    {
-      errorException_ = e;
-      return ERROR_FILE;
-    }
-    catch (SecurityException e)
-    {
-      errorException_ = e;
-      return ERROR_SECURITY;
-    }
-    catch (UnsupportedEncodingException e)
-    {
-      errorException_ = e;
-      return ERROR_ENCODING;
-    }
-  }
-  
-  public final byte loadFromDelimiterFile()
-  {
-    // Get the associated .properties file and set the delimiters. The defaultDataFile_ is set to the delimiter file in this case.
-    // The properties file contains the following keys:
-    // wsad.dataFile - location of the category data file.
-    // wsad.checked - whether or not the category is checked.
-    // wsad.name - the display name of the category.
-    // column.delimiter - the delimiter character used for separating columns.
-    // string.delimiter - the delimiter character used to encapsulate data such that column delimiter characters are treated as data.
-    try
-    {
-      Properties p = new Properties();
-      InputStream fin = null;
-	  if (application_ == null)
-	    fin = new FileInputStream(defaultDataFile_);
-	  else
-		fin = application_.getResourceAsStream(defaultDataFile_);
-      p.load(fin);
-      fin.close();
-      columnDelimiter_ = p.getProperty("column.delimiter");
-      stringDelimiter_ = p.getProperty("string.delimiter");
-      defaultDataFile_ = p.getProperty("wsad.dataFile");
-      return loadFromDefaultDataFile();
-    }
-    catch (FileNotFoundException e)
-    {
-      errorException_ = e;
-      return ERROR_FILE;
-    }
-    catch (SecurityException e)
-    {
-      errorException_ = e;
-      return ERROR_SECURITY;
-    }
-    catch (IOException e)
-    {
-      errorException_ = e;
-      return ERROR_IO;
-    }        
-  }
-  
-  public final byte loadData(BufferedReader br)
-  {
-    errorException_ = null;
-    CategoryElement rootElement = null;
-    categoryElements_ = new Hashtable();
-    byte returnCode = OPERATION_SUCCESSFUL;
-    String line = null;
-    int lineNumber = 0;
-    try
-    {
-      char columnDelimiterChar = columnDelimiter_.charAt(0);
-      char stringDelimiterChar = stringDelimiter_.charAt(0);
-      Vector values = new Vector();
-      while((line = br.readLine()) != null)
-      {
-        lineNumber++;
-        // Ignore blank lines.
-        if (line.trim().length() == 0)
-          continue;
-        int index = 0;
-        int length = line.length();
-        boolean inStringDelimiters = false;
-        values.removeAllElements();
-        StringBuffer currentToken = new StringBuffer();
-        while (index < length)
-        {
-          char currentChar = line.charAt(index);
-          if (inStringDelimiters)
-          {
-            // In quote so ignoring delimiters
-            if (currentChar == stringDelimiterChar)
-            {
-              if (index < length - 1)
-              {
-                // currentChar could be a closing string delimiter or escape
-                // Need to look ahead to be sure...
-                char followingChar = line.charAt(index + 1);
-                if (followingChar == stringDelimiterChar)
-                {
-                  // There is an escaped quote
-                  currentToken.append(stringDelimiterChar);
-                  // jump forward two characters.
-                  index += 2;
-                }
-                else
-                {
-                  // There was a closing string delimiter...jump forward to the next delimiter
-                  inStringDelimiters = false;
-                  //look for the next column delimiter character
-                  int nextDelimiter = line.indexOf(columnDelimiterChar, index);
-                  if (nextDelimiter == -1)
-                  {
-                    // There were no more delimiters so break out of the loop
-                    break;
-                  }
-                  else
-                  {
-                    values.addElement(currentToken.toString());
-                    //values[tokenCount++] = currentToken.toString();
-                    currentToken.setLength(0);
-                    inStringDelimiters = false;
-                    index = nextDelimiter + 1;
-                  }
-                }
-              }
-              else
-              {
-                // This is the last character and it's a closing string delimiter.
-                index++;
-                inStringDelimiters = false;
-              }
-            }
-            else
-            {
-              currentToken.append(currentChar);
-              index++;
-            }
-          }
-          else if (currentChar == columnDelimiterChar)
-          {
-            // There was a delimiter outside of quotes
-            values.addElement(currentToken.toString());
-            //values[tokenCount++] = currentToken.toString();
-            currentToken.setLength(0);
-            index++;
-          }
-          else if (currentChar == stringDelimiterChar)
-          {
-            // A quote appearing outside of quotes must be a opening quote
-            inStringDelimiters = true;
-            index++;
-          }
-          else
-          {
-            // There is a normal char outside of quotes
-            currentToken.append(currentChar);
-            index++;
-          }
-        }
-        // Expect token count to be values.length - 1 at this point if everything is ok
-        if (inStringDelimiters)
-        {
-          br.close();
-          throw new ParseException(line,lineNumber);
-        }
-        
-        // Add the final token.
-        values.addElement(currentToken.toString());
-
-        // 3 columns format. From left to right, these are:
-        // 1) category's key value
-        // 2) category's key name
-        // 3) category's parent key value
-        // Convert to 4 columns format.
-        if (values.size() == 3)
-        {
-          if (categoryKey_ != null)
-            values.insertElementAt(categoryKey_, 0);
-          else
-            values.insertElementAt(tModelKey_, 0);
-        }
-
-        // 4 columns format. From left to right, these are:
-        // 1) type of category (categoryKey)
-        // 2) category's key value
-        // 3) category's key name
-        // 4) category's parent key value
-        if (values.size() == 4)
-        {
-          String categoryKey = (String)values.elementAt(0);
-          if (categoryKey_ == null)
-            categoryKey_ = categoryKey;
-          else if (!categoryKey_.equals(categoryKey))
-            throw new Exception(categoryKey);
-          String keyValue = (String)values.elementAt(1);
-          String keyName = (String)values.elementAt(2);
-          String parentKeyValue = (String)values.elementAt(3);
-          if (rootElement == null)
-          {
-            rootElement = new CategoryElement(displayName_,null,this);
-            setRootElement(rootElement);
-          }
-          if (isEnclosedInQuotes(keyName))
-            keyName = keyName.substring(1,keyName.length()-1);
-          // Check if the CategoryElement already exists. If it does, refresh the Category.
-          CategoryElement categoryElement = (CategoryElement)categoryElements_.get(keyValue);
-          if (categoryElement != null)
-            categoryElement.updateCategory(keyName,keyValue,tModelKey_);
-          else
-            categoryElement = new CategoryElement(keyName,new KeyedReference(keyName,keyValue,tModelKey_),this);
-          Element parentElement;
-          if (parentKeyValue.equals(keyValue))
-            parentElement = rootElement;
-          else
-            parentElement = (Element)categoryElements_.get(parentKeyValue);
-          if (parentElement == null)
-          {
-            parentElement = new CategoryElement("temp",new KeyedReference("",parentKeyValue,tModelKey_),this);
-            categoryElements_.put(parentKeyValue,parentElement);
-          }
-          else
-            parentElement.connect(categoryElement,UDDIModelConstants.REL_SUBCATEGORIES,ModelConstants.REL_OWNER);
-          categoryElements_.put(keyValue,categoryElement);          
-        }
-        else
-        {
-          br.close();
-          throw new ParseException(line,lineNumber);
-        }
-      }
-      br.close();
-      return returnCode;
-    }
-    catch (IOException e)
-    {
-      errorException_ = e;
-      returnCode = ERROR_IO;
-    }
-    catch (ParseException e)
-    {
-      errorException_ = e;
-      returnCode = ERROR_FILE;
-    }
-    catch (Exception e)
-    {
-      errorException_ = e;
-      returnCode = ERROR_CATEGORY_KEY;
-    }
-    categoryElements_ = null;
-    return returnCode;
-  }
-  
-  private final void saveData(PrintWriter pw,CategoryElement categoryElement,CategoryElement parentElement,boolean isFirst)
-  {
-    // File format:
-    // <categoryKey>#<keyValue>#<keyName>#<parentKeyValue>
-    KeyedReference kr = categoryElement.getCategory();
-    // Check if this is not the root element.
-    if (kr != null)
-    {
-      String keyName = kr.getKeyName();
-      String keyValue = kr.getKeyValue();
-      String parentKeyValue;
-      if (parentElement == null)
-        parentKeyValue = keyValue;
-      else
-      {
-        KeyedReference parentKr = parentElement.getCategory();
-        // Check if the parent is the root element.
-        if (parentKr == null)
-          parentKeyValue = keyValue;
-        else
-          parentKeyValue = parentKr.getKeyValue();
-      }
-      if (!isFirst)
-        pw.println();
-      else
-        isFirst = false;
-      pw.print(mangle(categoryKey_));
-      pw.print(columnDelimiter_);
-      pw.print(mangle(keyValue));
-      pw.print(columnDelimiter_);
-      pw.print(mangle(keyName));
-      pw.print(columnDelimiter_);
-      pw.print(mangle(parentKeyValue));
-    }
-    Enumeration e = categoryElement.getElements(UDDIModelConstants.REL_SUBCATEGORIES);
-    if (e != null)
-    {
-      while (e.hasMoreElements())
-        saveData(pw,(CategoryElement)e.nextElement(),categoryElement,isFirst);
-    }
-  }
-  
-  // Mangle an input string if it contains default column delimiter characters by surrounding it with the string delimiters.
-  private final String mangle(String input)
-  {
-    if (input != null && input.indexOf(columnDelimiter_) != -1)
-    {
-      StringBuffer s = new StringBuffer(input);
-      s.insert(0,stringDelimiter_).append(stringDelimiter_);
-      return s.toString();
-    }
-    return input;
-  }
-  
-  public final byte saveData(String fileName)
-  {
-    // The fileName should already be URLEncoded.
-    byte returnCode = OPERATION_SUCCESSFUL;
-    errorException_ = null;
-    if (isDataLoaded())
-    {
-      try
-      {
-        PrintWriter pw = new PrintWriter(new OutputStreamWriter(new FileOutputStream(fileName),HTMLUtils.UTF8_ENCODING),true);
-        CategoryElement rootElement = (CategoryElement)getRootElement();
-        saveData(pw,rootElement,null,true);
-        pw.flush();
-        pw.close();
-        // Save the properties file.
-        Properties p = new Properties();
-        p.setProperty("wsad.dataFile",fileName);
-        p.setProperty("wsad.checked",String.valueOf(checked_));
-        p.setProperty("wsad.name",displayName_);
-        p.setProperty("column.delimiter",columnDelimiter_);
-        p.setProperty("string.delimiter",stringDelimiter_);
-        StringBuffer propertiesFileName = new StringBuffer(fileName.substring(0,fileName.lastIndexOf('.')));
-        propertiesFileName.append(".properties");
-        FileOutputStream fout = new FileOutputStream(propertiesFileName.toString());
-        p.store(fout,null);
-        fout.close();
-      }
-      catch (FileNotFoundException e)
-      {
-        errorException_ = e;
-        returnCode = ERROR_FILE;
-      }
-      catch (SecurityException e)
-      {
-        errorException_ = e;
-        returnCode = ERROR_SECURITY;
-      }
-      catch (UnsupportedEncodingException e)
-      {
-        errorException_ = e;
-        returnCode = ERROR_ENCODING;
-      }
-      catch (IOException e)
-      {
-        errorException_ = e;
-        returnCode = ERROR_IO;
-      }
-    }
-    return returnCode;
-  }
-  
-  public String toString()
-  {
-    return displayName_;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/PublishedItemsElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/PublishedItemsElement.java
deleted file mode 100644
index f24b27c8b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/PublishedItemsElement.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.ws.internal.explorer.platform.uddi.datamodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-
-public class PublishedItemsElement extends AbstractUDDIElement
-{
-  public PublishedItemsElement(int type,String name,Model model)
-  {
-    super(name,model);
-    setPropertyAsString(ModelConstants.REL_CHILDREN,UDDIModelConstants.REL_PUBLISHED_ITEMS);
-    setPropertyAsString(UDDIModelConstants.QUERY_TYPE,String.valueOf(type));
-  }
-
-  public final int getType()
-  {
-    return Integer.parseInt(getPropertyAsString(UDDIModelConstants.QUERY_TYPE));
-  }
-
-  public Enumeration getItems()
-  {
-    return getElements(UDDIModelConstants.REL_PUBLISHED_ITEMS);
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/PublisherAssertionElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/PublisherAssertionElement.java
deleted file mode 100644
index eac7d6154..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/PublisherAssertionElement.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.uddi4j.datatype.assertion.PublisherAssertion;
-import org.uddi4j.util.KeyedReference;
-
-public class PublisherAssertionElement {
-
-  // owningBusinessKey_ is the key of the business element that owns this
-  // publisherAssertionElement
-  private String fromKey_;
-  private String toKey_;
-  private String owningBusinessKey_;
-
-  // the other business that the containing business is asserted from or to
-  private ListElement sp_;
-  private int subQueryItemId_;
-
-  // status of this publisherAssertion
-  private String status_;
-  private KeyedReference keyedReference_;
-
-  public PublisherAssertionElement(String fromKey, String toKey, String owningBusinessKey, ListElement sp, int subQueryItemId, String status, KeyedReference keyedRef) {
-    fromKey_ = fromKey;
-    toKey_ = toKey;
-    owningBusinessKey_ = owningBusinessKey;
-    sp_ = sp;
-    subQueryItemId_ = subQueryItemId;
-    status_ = status;
-    keyedReference_ = keyedRef;
-  }
-
-  public void setFromKey(String fromKey) {
-    fromKey_ = fromKey;
-  }
-
-  public String getFromKey() {
-    return fromKey_;
-  }
-
-  public void setToKey(String toKey) {
-    toKey_ = toKey;
-  }
-
-  public String getToKey() {
-    return toKey_;
-  }
-
-  public void setOwningBusinessKey(String key) {
-    owningBusinessKey_ = key;
-  }
-
-  public String getOwningBusinessKey() {
-    return owningBusinessKey_;
-  }
-
-  public void setServiceProvider(ListElement sp) {
-    sp_ = sp;
-  }
-
-  public ListElement getServiceProvider() {
-    return sp_;
-  }
-
-  public void setSubQueryItemId(int id) {
-    subQueryItemId_ = id;
-  }
-
-  public int getSubQueryItemId() {
-    return subQueryItemId_;
-  }
-
-  public void setStatus(String status) {
-    status_ = status;
-  }
-
-  public String getStatus() {
-    return status_;
-  }
-
-  public void setKeyedRef(KeyedReference keyedRef) {
-    keyedReference_ = keyedRef;
-  }
-
-  public KeyedReference getKeyedRef() {
-    return keyedReference_;
-  }
-
-  public PublisherAssertion getPublisherAssertion() {
-    if (fromKey_ == null ||
-        toKey_ == null ||
-        keyedReference_ == null) {
-      return null;
-    }
-
-    PublisherAssertion pubAssertion = new PublisherAssertion(fromKey_, toKey_, keyedReference_);
-    return pubAssertion;
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/QueryElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/QueryElement.java
deleted file mode 100644
index 59bed5068..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/QueryElement.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.uddi.datamodel;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-
-public class QueryElement extends AbstractUDDIElement
-{
-  private final void initQueryProperties(int itemType,Object[] results)
-  {
-    Vector resultsVector = new Vector();
-    for (int i=0;i<results.length;i++)
-      resultsVector.addElement(results[i]);
-    setPropertyAsString(ModelConstants.REL_CHILDREN,UDDIModelConstants.REL_QUERY_RESULTS);
-    setPropertyAsObject(UDDIModelConstants.INITIAL_RESULTS,resultsVector);
-    setPropertyAsString(UDDIModelConstants.QUERY_TYPE,String.valueOf(itemType));
-  }
-  
-  public QueryElement(BusinessEntity[] spList,String name,Model model)
-  {
-    super(name,model);
-    initQueryProperties(UDDIActionInputs.QUERY_ITEM_BUSINESSES,spList);
-  }
-
-  public QueryElement(BusinessService[] bsList,String name,Model model)
-  {
-    super(name,model);
-    initQueryProperties(UDDIActionInputs.QUERY_ITEM_SERVICES,bsList);
-  }
-
-  public QueryElement(TModel[] tModelList,String name,Model model)
-  {
-    super(name,model);
-    initQueryProperties(UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES,tModelList);
-  }
-
-  public int getQueryType()
-  {
-    return Integer.parseInt(getPropertyAsString(UDDIModelConstants.QUERY_TYPE));
-  }
-
-  public QueryParentElement getQueryParentElement()
-  {
-    return (QueryParentElement)getParentElement();
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/QueryParentElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/QueryParentElement.java
deleted file mode 100644
index c2d822c44..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/QueryParentElement.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.ws.internal.explorer.platform.uddi.datamodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-
-public class QueryParentElement extends AbstractUDDIElement
-{
-  public QueryParentElement(String name,Model model)
-  {
-    super(name,model);
-    setPropertyAsString(ModelConstants.REL_CHILDREN,UDDIModelConstants.REL_QUERIES);
-  }
-
-  public Enumeration getQueries()
-  {
-    return getElements(UDDIModelConstants.REL_QUERIES);
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/RegistryElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/RegistryElement.java
deleted file mode 100644
index 24c336d2a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/RegistryElement.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.uddi.datamodel;
-
-import java.net.MalformedURLException;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-import org.eclipse.wst.ws.internal.parser.discovery.NetUtils;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.Description;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.response.AuthToken;
-import org.uddi4j.transport.TransportException;
-
-public class RegistryElement extends AbstractUDDIElement
-{
-  private final long AUTH_INFO_TIMEOUT = 3000000;
-  private UDDIProxy proxy_;
-  private long authTokenTimestamp_;
-  private AuthToken authToken_;
-  private String id_;
-  private String password_;
-  private String inquiryURL_;
-  private String publishURL_;
-  private String cachedPublishURL_;
-  private String registrationURL_;
-  private Hashtable userDefinedCategories_;
-  private boolean checkForUserDefinedCategories_;
-  private String categoriesDirectory_;
-
-  public RegistryElement(UDDIProxy proxy, String inquiryURL, String name, Model model)
-  {
-    super(name, model);
-    proxy_ = proxy;
-    inquiryURL_ = inquiryURL;
-    publishURL_ = null;
-    authTokenTimestamp_ = -1;
-    authToken_ = null;
-    id_ = null;
-    password_ = null;
-    cachedPublishURL_ = null;
-    registrationURL_ = null;
-    userDefinedCategories_ = null;
-    checkForUserDefinedCategories_ = false;
-    categoriesDirectory_ = null;
-  }
-
-  public final UDDIProxy getProxy()
-  {
-    return proxy_;
-  }
-
-  public final String getInquiryURL()
-  {
-    return inquiryURL_;
-  }
-
-  public final QueryParentElement getQueryParentElement()
-  {
-    return (QueryParentElement) (getElements(UDDIModelConstants.REL_QUERIES_PARENT).nextElement());
-  }
-
-  public final PublishedItemsElement getPublishedBusinessesElement()
-  {
-    return (PublishedItemsElement) (getElements(UDDIModelConstants.REL_PUBLISHED_BUSINESSES_PARENT).nextElement());
-  }
-
-  public final PublishedItemsElement getPublishedServicesElement()
-  {
-    return (PublishedItemsElement) (getElements(UDDIModelConstants.REL_PUBLISHED_SERVICES_PARENT).nextElement());
-  }
-
-  public final PublishedItemsElement getPublishedServiceInterfacesElement()
-  {
-    return (PublishedItemsElement) (getElements(UDDIModelConstants.REL_PUBLISHED_SERVICE_INTERFACES_PARENT).nextElement());
-  }
-
-  public final void performLogin(String publishURL, String userId, String password) throws TransportException, UDDIException, MalformedURLException
-  {
-    publishURL_ = publishURL;
-    proxy_.setPublishURL(NetUtils.createURL(publishURL));
-    authToken_ = proxy_.get_authToken(userId, password);
-    authTokenTimestamp_ = System.currentTimeMillis();
-    id_ = userId;
-    password_ = password;
-  }
-
-  public final String getAuthInfoString()
-  {
-    if (!isLoggedIn())
-      return null;
-    if ((System.currentTimeMillis() - authTokenTimestamp_) > AUTH_INFO_TIMEOUT)
-    {
-      try
-      {
-        authToken_ = proxy_.get_authToken(id_, password_);
-        authTokenTimestamp_ = System.currentTimeMillis();
-      }
-      catch (Throwable t)
-      {
-      }
-    }
-    return authToken_.getAuthInfoString();
-  }
-
-  public final boolean isLoggedIn()
-  {
-    return authToken_ != null;
-  }
-
-  public final void setCachedPublishURL(String publishURL)
-  {
-    cachedPublishURL_ = publishURL;
-  }
-
-  public final String getPublishURL()
-  {
-    if (isLoggedIn() && publishURL_ != null)
-      return publishURL_;
-    return cachedPublishURL_;
-  }
-
-  public final void setRegistrationURL(String registrationURL)
-  {
-    registrationURL_ = registrationURL;
-  }
-
-  public final String getRegistrationURL()
-  {
-    return registrationURL_;
-  }
-
-  public final String getUserId()
-  {
-    return id_;
-  }
-
-  public final void setUserId(String userId)
-  {
-    id_ = userId;
-  }
-
-  public final String getCred()
-  {
-    return password_;
-  }
-
-  public final void setCred(String cred)
-  {
-    password_ = cred;
-  }
-
-  public final void setUserDefinedCategories(Hashtable userDefinedCategories)
-  {
-    userDefinedCategories_ = userDefinedCategories;
-  }
-
-  public final Enumeration getUserDefinedCategories()
-  {
-    if (userDefinedCategories_ != null)
-      return userDefinedCategories_.elements();
-    else
-      return null;
-  }
-
-  public final CategoryModel getUserDefinedCategory(String tModelKey)
-  {
-    return (CategoryModel) userDefinedCategories_.get(tModelKey);
-  }
-
-  // Special handler to be invoked before sending a message to the registry.
-  public final void handlePreInvocation(BusinessService busService)
-  {
-    // For XMethods, business services must contain a description of the form:
-    // IMPLEMENTATION: ibmws
-    if (getInquiryURL().equals("http://uddi.xmethods.net/inquire"))
-    {
-      Vector descriptionVector = busService.getDescriptionVector();
-      if (descriptionVector == null)
-        descriptionVector = new Vector();
-      boolean containsImplementationDescription = false;
-      for (int i = 0; i < descriptionVector.size(); i++)
-      {
-        Description description = (Description) descriptionVector.elementAt(i);
-        if (description.getText().startsWith("IMPLEMENTATION: "))
-        {
-          containsImplementationDescription = true;
-          break;
-        }
-      }
-      if (!containsImplementationDescription)
-      {
-        descriptionVector.addElement(new Description("IMPLEMENTATION: ibmws"));
-        busService.setDescriptionVector(descriptionVector);
-      }
-    }
-  }
-
-  public final void setCheckForUserDefinedCategories(boolean checkForUserDefinedCategories)
-  {
-    checkForUserDefinedCategories_ = checkForUserDefinedCategories;
-  }
-
-  public final boolean getCheckForUserDefinedCategories()
-  {
-    return checkForUserDefinedCategories_;
-  }
-
-  public final void setCategoriesDirectory(String directory)
-  {
-    categoriesDirectory_ = directory;
-  }
-
-  public final String getCategoriesDirectory()
-  {
-    return categoriesDirectory_;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/ServiceElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/ServiceElement.java
deleted file mode 100644
index cc10e2c00..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/ServiceElement.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.wst.ws.internal.explorer.platform.uddi.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.uddi4j.datatype.service.BusinessService;
-
-public class ServiceElement extends AbstractUDDIElement
-{
-  private BusinessService bs_;
-  
-  public ServiceElement(BusinessService bs,Model model)
-  {
-    super(bs.getDefaultNameString(),model);
-    setKey(bs.getServiceKey());
-    bs_ = bs;
-  }
-  
-  public final BusinessService getBusinessService()
-  {
-    return bs_;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/ServiceInterfaceElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/ServiceInterfaceElement.java
deleted file mode 100644
index 108142d3b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/ServiceInterfaceElement.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.wst.ws.internal.explorer.platform.uddi.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.uddi4j.datatype.tmodel.TModel;
-
-public class ServiceInterfaceElement extends AbstractUDDIElement
-{
-  private TModel tModel_;
-    
-  public ServiceInterfaceElement(TModel tModel,Model model)
-  {
-    super(tModel.getNameString(),model);
-    tModel_ = tModel;
-    setKey(tModel.getTModelKey());
-  }
-
-  public final TModel getTModel()
-  {
-    return tModel_;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/UDDIMainElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/UDDIMainElement.java
deleted file mode 100644
index ef72f68dd..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/UDDIMainElement.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.ws.internal.explorer.platform.uddi.datamodel;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-
-public class UDDIMainElement extends TreeElement
-{
-  private Hashtable registryNames_;
-
-  public UDDIMainElement(String name,Model model)
-  {
-    super(name,model);
-    registryNames_ = new Hashtable();
-  }
-
-  public final boolean containsRegistryName(String name)
-  {
-    return (registryNames_.get(name) != null);
-  }
-
-  public final void addRegistryName(String name)
-  {
-    registryNames_.put(name,Boolean.TRUE);
-  }
-
-  public final void removeRegistryName(String name)
-  {
-    registryNames_.remove(name);
-  }
-
-  public final void clearRegistryNames()
-  {
-    registryNames_.clear();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/AddToFavoritesTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/AddToFavoritesTool.java
deleted file mode 100644
index b94222ddd..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/AddToFavoritesTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.AddToFavoritesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction;
-
-public class AddToFavoritesTool extends ActionTool {
-    public AddToFavoritesTool(ToolManager toolManager, String alt) {
-        super(toolManager, "images/favorites_enabled.gif", "images/favorites_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectPropertiesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public String getActionLink() {
-        Node selectedNode = toolManager_.getNode();
-        return AddToFavoritesAction.getActionLink(selectedNode.getNodeId());
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/BusPublishServiceTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/BusPublishServiceTool.java
deleted file mode 100644
index aa2a61707..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/BusPublishServiceTool.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.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectFindToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-
-public class BusPublishServiceTool extends FormTool implements MultipleFormToolPropertiesInterface
-{
-  private RegFindTool regFindTool_;
-
-  public BusPublishServiceTool(ToolManager toolManager,String alt)
-  {
-    super(toolManager,"uddi/images/publish_service_enabled.gif","uddi/images/publish_service_highlighted.gif",alt);
-    regFindTool_ = new RegFindTool(new ToolManager(toolManager.getNode()), "");
-  }
-
-  protected final void initDefaultProperties()
-  {
-    toolManager_.getNode().getNodeManager().getController().getUDDIPerspective();
-
-    setProperty(UDDIActionInputs.SUBQUERY_KEY,"");
-
-    setProperty(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICES));
-    String simpleStyleString = String.valueOf(UDDIActionInputs.QUERY_STYLE_SIMPLE);
-    setProperty(UDDIActionInputs.QUERY_STYLE_SERVICES,simpleStyleString);
-
-    // RegPublishServiceSimpleAction inputs
-    setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_WSDL_URL,"");
-    setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME,"");
-    setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_DESCRIPTION,"");
-
-    // RegPublishServiceAdvancedAction inputs
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL,"");
-  }
-
-  public final void addAuthenticationProperties(RegistryElement regElement)
-  {
-    String publishURL = regElement.getPublishURL();
-    String userId = regElement.getUserId();
-    String password = regElement.getCred();
-
-    if (publishURL == null)
-      publishURL = "";
-    if (userId == null)
-      userId = "";
-    if (password == null)
-      password = "";
-
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
-    regFindTool_.addAuthenticationProperties(regElement);
-  }
-
-  public final FormToolPropertiesInterface getFormToolProperties(Object subQueryKeyObject)
-  {
-    // Empty/Non-existent subquerykey implies publish form. All else implies query form.
-    String subQueryKey = (String)subQueryKeyObject;
-    if (subQueryKey == null || subQueryKey.length() < 1)
-      return this;
-    else
-      return regFindTool_.getFormToolProperties(subQueryKeyObject);
-  }
-
-  public String getSelectToolActionHref(boolean forHistory)
-  {
-    Node node = toolManager_.getNode();
-    String subQueryKey = (String)getProperty(UDDIActionInputs.SUBQUERY_KEY);
-    return SelectFindToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),subQueryKey,forHistory);
-  }
-
-  public String getFormLink()
-  {
-    Object subQueryKeyObject = getProperty(UDDIActionInputs.SUBQUERY_KEY);
-    String subQueryKey = null;
-    if (subQueryKeyObject != null)
-    {
-      getProperty(UDDIActionInputs.SUBQUERIES_PROPERTIES);
-      FormToolPropertiesInterface subQueryProperties = getFormToolProperties(subQueryKeyObject);
-      Object subQueryGetObject = subQueryProperties.getProperty(UDDIActionInputs.SUBQUERY_GET);
-      if (subQueryGetObject != null)
-      {
-        boolean isSubQueryGet = ((Boolean)subQueryGetObject).booleanValue();
-        if (isSubQueryGet)
-          return "uddi/forms/GetForm.jsp";
-      }
-      subQueryKey = (String)subQueryKeyObject;
-    }
-      
-    if (subQueryKey == null || subQueryKey.length() < 1)
-      return "uddi/forms/BusPublishServiceForm.jsp";
-    else
-      return regFindTool_.getFormLink();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/BusinessDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/BusinessDetailsTool.java
deleted file mode 100644
index b05a85380..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/BusinessDetailsTool.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ProxyLoadPageAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.util.CategoryBag;
-import org.uddi4j.util.DiscoveryURLs;
-import org.uddi4j.util.IdentifierBag;
-
-public class BusinessDetailsTool extends DetailsTool
-{
-  public BusinessDetailsTool(ToolManager toolManager,String alt)
-  {
-    super(toolManager,alt,ProxyLoadPageAction.getActionLink("uddi/forms/BusinessDetailsForm.jsp"));
-  }
-
-  public final void initDefaultProperties()
-  {
-    clearPropertyTable();
-    BusinessElement busElement = (BusinessElement)(toolManager_.getNode().getTreeElement());
-    BusinessEntity be = busElement.getBusinessEntity();
-
-    setProperty(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY,be.getBusinessKey());
-
-    Vector nameVector = new Vector();
-    copyIndexVector(be.getNameVector(),nameVector);
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES,nameVector);
-
-    Vector descriptionVector = new Vector();
-    copyIndexVector(be.getDescriptionVector(),descriptionVector);
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS,descriptionVector);
-
-    IdentifierBag idBag = be.getIdentifierBag();
-    if (idBag != null)
-    {
-      Vector idVector = new Vector();
-      copyIndexVector(idBag.getKeyedReferenceVector(),idVector);
-      setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS,idVector);
-    }
-
-    CategoryBag catBag = be.getCategoryBag();
-    if (catBag != null)
-    {
-      Vector catVector = new Vector();
-      copyIndexVector(catBag.getKeyedReferenceVector(),catVector);
-      setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES,catVector);
-    }
-
-    DiscoveryURLs discoveryURLs = be.getDiscoveryURLs();
-    if (discoveryURLs != null)
-    {
-      Vector discoveryURLVector = new Vector();
-      copyIndexVector(discoveryURLs.getDiscoveryURLVector(),discoveryURLVector);
-      setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS,discoveryURLVector);
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/BusinessNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/BusinessNode.java
deleted file mode 100644
index 41023b64a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/BusinessNode.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.BusinessGetServicesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-
-public class BusinessNode extends UDDINavigatorNode
-{
-  private DetailsTool detailsTool_;
-  private BusPublishServiceTool publishServiceTool_;
-  private ManagePublisherAssertionsTool managePublisherAssertionsTool_;
-  private ManageReferencedServicesTool manageReferencedServicesTool_;
-  private UnpublishTool unpublishTool_;
-
-  public BusinessNode(TreeElement element,NodeManager nodeManager,int nodeDepth)
-  {
-    super(element,nodeManager,nodeDepth,"uddi/images/business_highlighted.gif");
-  }
-
-  protected final void initTools()
-  {
-    Controller controller = nodeManager_.getController();
-    UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-    detailsTool_ = new BusinessDetailsTool(toolManager_,uddiPerspective.getMessage("ALT_BUSINESS_DETAILS"));
-    new GetServicesTool(toolManager_,uddiPerspective.getMessage("ALT_GET_SERVICES"),BusinessGetServicesAction.getActionLink(nodeId_));    
-    publishServiceTool_ = new BusPublishServiceTool(toolManager_,uddiPerspective.getMessage("ALT_PUBLISH_SERVICE"));
-    manageReferencedServicesTool_ = new ManageReferencedServicesTool(toolManager_,uddiPerspective.getMessage("ALT_MANAGE_REFERENCED_SERVICES"));
-    managePublisherAssertionsTool_ = new ManagePublisherAssertionsTool(toolManager_,uddiPerspective.getMessage("ALT_MANAGE_PUBLISHER_ASSERTIONS"));
-    new AddToFavoritesTool(toolManager_, uddiPerspective.getMessage("ALT_ADD_TO_FAVORITES"));
-    unpublishTool_ = new UnpublishTool(toolManager_,"uddi/images/unpublish_bus_enabled.gif","uddi/images/unpublish_bus_highlighted.gif",uddiPerspective.getMessage("ALT_UNPUBLISH_BUSINESS"));
-  }
-
-  public void addAuthenticationProperties(RegistryElement regElement)
-  {
-    detailsTool_.addAuthenticationProperties(regElement);
-    publishServiceTool_.addAuthenticationProperties(regElement);
-    manageReferencedServicesTool_.addAuthenticationProperties(regElement);
-    managePublisherAssertionsTool_.addAuthenticationProperties(regElement);
-    unpublishTool_.addAuthenticationProperties(regElement);
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/CategoryNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/CategoryNode.java
deleted file mode 100644
index 9c4ac3e79..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/CategoryNode.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.ws.internal.explorer.platform.uddi.perspective;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectCategoryNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.ToggleCategoryNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIFrameNames;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.CategoryElement;
-
-public class CategoryNode extends Node
-{
-  public CategoryNode(TreeElement element,NodeManager nodeManager,int nodeDepth)
-  {
-    super(element,nodeManager,nodeDepth,"uddi/images/category.gif");
-    setVisibilityOfChildren(false);
-  }
-
-  public final void createChildren()
-  {
-    Enumeration children = element_.getElements(UDDIModelConstants.REL_SUBCATEGORIES);
-    if (children != null)
-    {
-      while (children.hasMoreElements())
-      {
-        CategoryElement categoryElement = (CategoryElement)children.nextElement();
-        CategoryNode categoryNode = new CategoryNode(categoryElement,nodeManager_,nodeDepth_+1);
-        addChild(categoryNode);
-        categoryNode.createChildren();
-      }
-    }
-  }
-
-  public final String getNodeName()
-  {
-    CategoryElement categoryElement = (CategoryElement)element_;
-    return categoryElement.getNameForTree();
-  }
-
-  protected final String getToggleNodeActionHref()
-  {
-    return ToggleCategoryNodeAction.getActionLink(getNodeManager().getController().getSessionId(),nodeId_,isOpen_);
-  }
-
-  protected final String getLinkActionHref()
-  {
-    return SelectCategoryNodeAction.getActionLink(getNodeManager().getController().getSessionId(),nodeId_);
-  }
-
-  protected final String getToggleNodeActionTarget()
-  {
-    return UDDIFrameNames.CATEGORIES_WORKAREA;
-  }
-
-  protected final String getLinkActionTarget()
-  {
-    return UDDIFrameNames.CATEGORIES_WORKAREA;
-  }
-
-  protected final void initTools()
-  {
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/DetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/DetailsTool.java
deleted file mode 100644
index 4571f14d7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/DetailsTool.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.ws.internal.explorer.platform.uddi.perspective;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-
-public class DetailsTool extends FormTool
-{
-  private String formLink_;
-
-  public DetailsTool(ToolManager toolManager,String alt,String formLink)
-  {
-    super(toolManager,"images/details_enabled.gif","images/details_highlighted.gif",alt);
-    formLink_ = formLink;
-  }
-
-  public void initDefaultProperties()
-  {
-  }
-
-  public String getSelectToolActionHref(boolean forHistory)
-  {
-    Node node = toolManager_.getNode();
-    return SelectPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
-  }
-
-  public String getFormLink()
-  {
-    return formLink_;
-  }
-
-  protected final void copyIndexVector(Vector source,Vector destination)
-  {
-    destination.removeAllElements();
-    for (int i=0;i<source.size();i++)
-    {
-      ListElement listElement = new ListElement(source.elementAt(i));
-      listElement.setViewId(i);
-      // The next item indicates that this element is to be in non-edit state.
-      listElement.setTargetViewToolInfo(-1,-1,i);
-      destination.addElement(listElement);
-    }
-  }
-
-  public void addAuthenticationProperties(RegistryElement regElement)
-  {
-    String publishURL = regElement.getPublishURL();
-    String userId = regElement.getUserId();
-    String password = regElement.getCred();
-
-    if (publishURL == null)
-      publishURL = "";
-    if (userId == null)
-      userId = "";
-    if (password == null)
-      password = "";
-
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetBusinessesTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetBusinessesTool.java
deleted file mode 100644
index ac040de73..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetBusinessesTool.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.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction;
-
-public class GetBusinessesTool extends ActionTool
-{
-  private String actionLink_;
-  public GetBusinessesTool(ToolManager toolManager,String enabledImagePath,String highlightedImagePath,String alt,String actionLink)
-  {
-    super(toolManager,enabledImagePath,highlightedImagePath,alt);
-    actionLink_ = actionLink;
-  }
-
-  public String getSelectToolActionHref(boolean forHistory)
-  {
-    Node node = toolManager_.getNode();
-    return SelectPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
-  }
-
-  public String getActionLink()
-  {
-    return actionLink_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetServiceInterfacesTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetServiceInterfacesTool.java
deleted file mode 100644
index 8ed766311..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetServiceInterfacesTool.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.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction;
-
-public class GetServiceInterfacesTool extends ActionTool
-{
-  private String actionLink_;
-  public GetServiceInterfacesTool(ToolManager toolManager,String alt,String actionLink)
-  {
-    super(toolManager,"uddi/images/service_interfaces_closed_enabled.gif","uddi/images/service_interfaces_closed_highlighted.gif",alt);
-    actionLink_ = actionLink;
-  }
-
-  public String getSelectToolActionHref(boolean forHistory)
-  {
-    Node node = toolManager_.getNode();
-    return SelectPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
-  }
-
-  public String getActionLink()
-  {
-    return actionLink_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetServicesTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetServicesTool.java
deleted file mode 100644
index e14e65568..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetServicesTool.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.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction;
-
-public class GetServicesTool extends ActionTool
-{
-  private String actionLink_;
-  public GetServicesTool(ToolManager toolManager,String alt,String actionLink)
-  {
-    super(toolManager,"uddi/images/services_closed_enabled.gif","uddi/images/services_closed_highlighted.gif",alt);
-    actionLink_ = actionLink;
-  }
-
-  public String getSelectToolActionHref(boolean forHistory)
-  {
-    Node node = toolManager_.getNode();
-    return SelectPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
-  }
-
-  public String getActionLink()
-  {
-    return actionLink_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ItemsSummaryTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ItemsSummaryTool.java
deleted file mode 100644
index e8ef3ee1a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ItemsSummaryTool.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.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ProxyLoadPageAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.util.URLUtils;
-
-public class ItemsSummaryTool extends FormTool
-{
-  private String formLink_;
-
-  public ItemsSummaryTool(ToolManager toolManager,String enabledImage,String highlightedImage,String alt,int queryItem)
-  {
-    super(toolManager,enabledImage,highlightedImage,alt);
-    StringBuffer formLink = new StringBuffer("uddi/forms/ItemsSummaryForm.jsp?");
-    formLink.append(UDDIActionInputs.QUERY_ITEM).append('=').append(queryItem);
-	String encodedFormLink = URLUtils.encode(formLink.toString());
-    formLink_ = ProxyLoadPageAction.getActionLink(encodedFormLink);
-  }
-
-  public final void initDefaultProperties()
-  {
-  }
-
-  public String getSelectToolActionHref(boolean forHistory)
-  {
-    Node node = toolManager_.getNode();
-    return SelectPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
-  }
-
-  public String getFormLink()
-  {
-    return formLink_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ManagePublisherAssertionsTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ManagePublisherAssertionsTool.java
deleted file mode 100644
index ec551e6d2..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ManagePublisherAssertionsTool.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.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ProxyLoadPageAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectFindToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-
-public class ManagePublisherAssertionsTool extends FormTool implements MultipleFormToolPropertiesInterface
-{
-  ToolManager invisibleToolManager_;
-  private RegFindTool regFindTool_;
-
-  public ManagePublisherAssertionsTool(ToolManager toolManager, String alt)
-  {
-    super(toolManager, "uddi/images/publisher_assertions_enabled.gif", "uddi/images/publisher_assertions_highlighted.gif", alt);
-    invisibleToolManager_ = new ToolManager(toolManager.getNode());
-    regFindTool_ = new RegFindTool(invisibleToolManager_,"");
-  }
-
-  protected final void initDefaultProperties()
-  {
-    setProperty(UDDIActionInputs.SUBQUERY_KEY,"");
-    setProperty(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_BUSINESSES));
-    String simpleStyleString = String.valueOf(UDDIActionInputs.QUERY_STYLE_SIMPLE);
-    setProperty(UDDIActionInputs.QUERY_STYLE_BUSINESSES,simpleStyleString);
-    setProperty(UDDIActionInputs.QUERY_STYLE_SERVICES,simpleStyleString);
-    setProperty(UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES,simpleStyleString);
-  }
-
-  public final FormToolPropertiesInterface getFormToolProperties(Object subQueryKeyObject)
-  {
-    // Empty/Non-existent subquerykey implies publish form. All else implies query form.
-    String subQueryKey = (String)subQueryKeyObject;
-    if (subQueryKey == null || subQueryKey.length() < 1)
-      return this;
-    else
-      return regFindTool_.getFormToolProperties(subQueryKeyObject);
-  }
-
-  public String getSelectToolActionHref(boolean forHistory)
-  {
-    Node node = toolManager_.getNode();
-    String subQueryKey = (String)getProperty(UDDIActionInputs.SUBQUERY_KEY);
-    return SelectFindToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),subQueryKey,forHistory);
-  }
-
-  public final void addAuthenticationProperties(RegistryElement regElement)
-  {
-    String publishURL = regElement.getPublishURL();
-    String userId = regElement.getUserId();
-    String password = regElement.getCred();
-
-    if (publishURL == null)
-      publishURL = "";
-    if (userId == null)
-      userId = "";
-    if (password == null)
-      password = "";
-
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
-    regFindTool_.addAuthenticationProperties(regElement);
-  }
-
-  public String getFormLink()
-  {
-    Object subQueryKeyObject = getProperty(UDDIActionInputs.SUBQUERY_KEY);
-    String subQueryKey = null;
-    if (subQueryKeyObject != null)
-    {
-      getProperty(UDDIActionInputs.SUBQUERIES_PROPERTIES);
-      FormToolPropertiesInterface subQueryProperties = getFormToolProperties(subQueryKeyObject);
-      Object subQueryGetObject = subQueryProperties.getProperty(UDDIActionInputs.SUBQUERY_GET);
-      if (subQueryGetObject != null)
-      {
-        boolean isSubQueryGet = ((Boolean)subQueryGetObject).booleanValue();
-        if (isSubQueryGet)
-          return "uddi/forms/GetForm.jsp";
-      }
-      subQueryKey = (String)subQueryKeyObject;
-    }
-
-    if (subQueryKey == null || subQueryKey.length() < 1)
-      return ProxyLoadPageAction.getActionLink("uddi/forms/ManagePublisherAssertionsForm.jsp");
-    else
-      return regFindTool_.getFormLink();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ManageReferencedServicesTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ManageReferencedServicesTool.java
deleted file mode 100644
index 17f2c650d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ManageReferencedServicesTool.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.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectFindToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-
-public class ManageReferencedServicesTool extends FormTool implements MultipleFormToolPropertiesInterface
-{
-  ToolManager invisibleToolManager_;
-  private RegFindTool regFindTool_;
-
-  public ManageReferencedServicesTool(ToolManager toolManager, String alt)
-  {
-    super(toolManager, "uddi/images/referenced_services_enabled.gif", "uddi/images/referenced_services_highlighted.gif", alt);
-    invisibleToolManager_ = new ToolManager(toolManager.getNode());
-    regFindTool_ = new RegFindTool(invisibleToolManager_,"");
-  }
-
-  protected final void initDefaultProperties()
-  {
-    setProperty(UDDIActionInputs.SUBQUERY_KEY,"");
-    setProperty(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICES));
-    String simpleStyleString = String.valueOf(UDDIActionInputs.QUERY_STYLE_SIMPLE);
-    setProperty(UDDIActionInputs.QUERY_STYLE_BUSINESSES,simpleStyleString);
-    setProperty(UDDIActionInputs.QUERY_STYLE_SERVICES,simpleStyleString);
-    setProperty(UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES,simpleStyleString);
-  }
-
-  public final FormToolPropertiesInterface getFormToolProperties(Object subQueryKeyObject)
-  {
-    // Empty/Non-existent subquerykey implies publish form. All else implies query form.
-    String subQueryKey = (String)subQueryKeyObject;
-    if (subQueryKey == null || subQueryKey.length() < 1)
-      return this;
-    else
-      return regFindTool_.getFormToolProperties(subQueryKeyObject);
-  }
-
-  public String getSelectToolActionHref(boolean forHistory)
-  {
-    Node node = toolManager_.getNode();
-    String subQueryKey = (String)getProperty(UDDIActionInputs.SUBQUERY_KEY);
-    return SelectFindToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),subQueryKey,forHistory);
-  }
-  
-  public final void addAuthenticationProperties(RegistryElement regElement)
-  {
-    String publishURL = regElement.getPublishURL();
-    String userId = regElement.getUserId();
-    String password = regElement.getCred();
-    
-    if (publishURL == null)
-      publishURL = "";
-    if (userId == null)
-      userId = "";
-    if (password == null)
-      password = "";
-      
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
-    regFindTool_.addAuthenticationProperties(regElement);
-  }
-
-  public String getFormLink()
-  {
-    Object subQueryKeyObject = getProperty(UDDIActionInputs.SUBQUERY_KEY);
-    String subQueryKey = null;
-    if (subQueryKeyObject != null)
-    {
-      getProperty(UDDIActionInputs.SUBQUERIES_PROPERTIES);
-      FormToolPropertiesInterface subQueryProperties = getFormToolProperties(subQueryKeyObject);
-      Object subQueryGetObject = subQueryProperties.getProperty(UDDIActionInputs.SUBQUERY_GET);
-      if (subQueryGetObject != null)
-      {
-        boolean isSubQueryGet = ((Boolean)subQueryGetObject).booleanValue();
-        if (isSubQueryGet)
-          return "uddi/forms/GetForm.jsp";
-      }
-      subQueryKey = (String)subQueryKeyObject;
-    }
-
-    if (subQueryKey == null || subQueryKey.length() < 1)
-      return "uddi/forms/ManageReferencedServicesForm.jsp";
-    else
-      return regFindTool_.getFormLink();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/MultipleFormToolPropertiesInterface.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/MultipleFormToolPropertiesInterface.java
deleted file mode 100644
index d14fbe2aa..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/MultipleFormToolPropertiesInterface.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-
-public abstract interface MultipleFormToolPropertiesInterface
-{
-  public abstract FormToolPropertiesInterface getFormToolProperties(Object key);
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/OpenRegistryTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/OpenRegistryTool.java
deleted file mode 100644
index a2aee33f6..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/OpenRegistryTool.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.explorer.platform.uddi.perspective;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-
-public class OpenRegistryTool extends FormTool
-{
-  private Controller controller_;
-  
-  public OpenRegistryTool(ToolManager toolManager,String alt)
-  {
-    super(toolManager,"uddi/images/open_registry_enabled.gif","uddi/images/open_registry_highlighted.gif",alt);
-  }
-
-  protected final void initDefaultProperties()
-  {
-    controller_ = toolManager_.getNode().getNodeManager().getController();
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    setProperty(UDDIActionInputs.REGISTRY_NAME,uddiPerspective.getMessage("DEFAULT_REGISTRY_NAME"));
-    setProperty(UDDIActionInputs.INQUIRY_URL,uddiPerspective.getIBMPublicUDDITestRegistry().getInquiryURL());
-  }
-
-  public String getSelectToolActionHref(boolean forHistory)
-  {
-    Node node = toolManager_.getNode();
-    return SelectPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
-  }
-
-  public String getFormLink()
-  {
-    return "uddi/forms/OpenRegistryForm.jsp";
-  }
-  
-  public final Enumeration getFavoriteRegistryElements()
-  {
-    FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
-    NodeManager favoritesNodeManager = favPerspective.getNodeManager();
-    TreeElement favoritesMainElement = favoritesNodeManager.getRootNode().getTreeElement();
-    TreeElement favoriteRegistriesElement = (TreeElement)(favoritesMainElement.getElements(FavoritesModelConstants.REL_UDDI_REGISTRY_FOLDER_NODE).nextElement());
-    return favoriteRegistriesElement.getElements(FavoritesModelConstants.REL_UDDI_REGISTRY_NODE);
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/PublishedItemsNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/PublishedItemsNode.java
deleted file mode 100644
index 6539d9a60..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/PublishedItemsNode.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.PublishedItemsElement;
-
-public class PublishedItemsNode extends UDDINavigatorFolderNode
-{
-  public PublishedItemsNode(TreeElement element,NodeManager nodeManager,int nodeDepth)
-  {
-    super(element,nodeManager,nodeDepth);
-    element.addListener(new ElementAdapter()
-    {
-      public void relAdded(RelAddEvent event)
-      {
-        String rel = event.getOutBoundRelName();
-        if (rel.equals(UDDIModelConstants.REL_PUBLISHED_ITEMS))
-        {
-          TreeElement treeElement = (TreeElement)event.getParentElement();
-          createChildNode(treeElement);
-        }
-      }
-
-      public void relRemoved(RelRemoveEvent event)
-      {
-        TreeElement treeElement = null;
-        if (event.getInBoundRelName().equals(UDDIModelConstants.REL_PUBLISHED_ITEMS))
-          treeElement = (TreeElement)event.getInboundElement();
-        else if (event.getOutBoundRelName().equals(UDDIModelConstants.REL_PUBLISHED_ITEMS))
-          treeElement = (TreeElement)event.getOutBoundElement();
-
-        if (treeElement != null)
-          removeChildNode(treeElement);
-      }
-    });
-  }
-
-  private final void createChildNode(TreeElement element)
-  {
-    PublishedItemsElement publishedItemsElement = (PublishedItemsElement)element_;
-    Node childNode = null;
-    switch (publishedItemsElement.getType())
-    {
-      case UDDIActionInputs.QUERY_ITEM_BUSINESSES:
-        childNode = new BusinessNode(element,nodeManager_,nodeDepth_+1);
-        break;
-      case UDDIActionInputs.QUERY_ITEM_SERVICES:
-        childNode = new ServiceNode(element,nodeManager_,nodeDepth_+1);
-        break;
-      case UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES:
-        childNode = new ServiceInterfaceNode(element,nodeManager_,nodeDepth_+1);
-    }
-    if (childNode != null)
-      addChild(childNode);
-  }
-  
-  protected final void initTools()
-  {
-    PublishedItemsElement publishedItemsElement = (PublishedItemsElement)element_;
-    UDDIPerspective uddiPerspective = nodeManager_.getController().getUDDIPerspective();
-    int publishedItemsType = publishedItemsElement.getType();
-    switch (publishedItemsType)
-    {
-      case UDDIActionInputs.QUERY_ITEM_BUSINESSES:
-        new ItemsSummaryTool(toolManager_,"uddi/images/businesses_closed_enabled.gif","uddi/images/businesses_closed_highlighted.gif",uddiPerspective.getMessage("ALT_SUMMARY_BUSINESSES"),publishedItemsType);
-        break;
-      case UDDIActionInputs.QUERY_ITEM_SERVICES:
-        new ItemsSummaryTool(toolManager_,"uddi/images/services_closed_enabled.gif","uddi/images/services_closed_highlighted.gif",uddiPerspective.getMessage("ALT_SUMMARY_SERVICES"),publishedItemsType);
-        break;
-      case UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES:
-      default:
-        new ItemsSummaryTool(toolManager_,"uddi/images/service_interfaces_closed_enabled.gif","uddi/images/service_interfaces_closed_highlighted.gif",uddiPerspective.getMessage("ALT_SUMMARY_SERVICE_INTERFACES"),publishedItemsType);
-    }
-  }
-  
-  public String getOpenImagePath()
-  {
-    PublishedItemsElement publishedItemsElement = (PublishedItemsElement)element_;
-    int publishedItemsType = publishedItemsElement.getType();
-    switch (publishedItemsType)
-    {
-      case UDDIActionInputs.QUERY_ITEM_BUSINESSES:
-        return "uddi/images/businesses_open_highlighted.gif";
-      case UDDIActionInputs.QUERY_ITEM_SERVICES:
-        return "uddi/images/services_open_highlighted.gif";
-      case UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES:
-        return "uddi/images/service_interfaces_open_highlighted.gif";
-    }
-    return super.getOpenImagePath();
-  }
-  
-  public String getClosedImagePath()
-  {
-    PublishedItemsElement publishedItemsElement = (PublishedItemsElement)element_;
-    int publishedItemsType = publishedItemsElement.getType();
-    switch (publishedItemsType)
-    {
-      case UDDIActionInputs.QUERY_ITEM_BUSINESSES:
-        return "uddi/images/businesses_closed_highlighted.gif";
-      case UDDIActionInputs.QUERY_ITEM_SERVICES:
-        return "uddi/images/services_closed_highlighted.gif";
-      case UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES:
-        return "uddi/images/service_interfaces_closed_highlighted.gif";
-    }
-    return super.getClosedImagePath();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/QueryNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/QueryNode.java
deleted file mode 100644
index 3b014f7fb..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/QueryNode.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.uddi.perspective;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.FindAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceInterfaceElement;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-
-public class QueryNode extends UDDINavigatorNode
-{
-  private FormTool regFindTool_;
-  private FindAction findAction_;
-  public QueryNode(TreeElement element,NodeManager nodeManager,int nodeDepth)
-  {
-    super(element,nodeManager,nodeDepth,"uddi/images/query.gif");
-    element.addListener(new ElementAdapter()
-    {
-      public void relAdded(RelAddEvent event)
-      {
-        String rel = event.getOutBoundRelName();
-        if (rel.equals(UDDIModelConstants.REL_QUERY_RESULTS))
-        {
-          TreeElement treeElement = (TreeElement)event.getParentElement();
-          createChildNode(treeElement);
-        }
-      }
-
-      public void relRemoved(RelRemoveEvent event)
-      {
-        TreeElement treeElement = null;
-        if (event.getInBoundRelName().equals(UDDIModelConstants.REL_QUERY_RESULTS))
-          treeElement = (TreeElement)event.getInboundElement();
-        else if (event.getOutBoundRelName().equals(UDDIModelConstants.REL_QUERY_RESULTS))
-          treeElement = (TreeElement)event.getOutBoundElement();
-
-        if (treeElement != null)
-          removeChildNode(treeElement);
-      }
-    });
-    createChildren();
-    setVisibilityOfChildren(false);
-    findAction_ = null;
-  }
-
-  private final void createChildren()
-  {
-    Vector initialResults = (Vector)element_.getPropertyAsObject(UDDIModelConstants.INITIAL_RESULTS);
-    for (int i=0;i<initialResults.size();i++)
-    {
-      Object object = initialResults.elementAt(i);
-      TreeElement childElement = null;
-      if (object instanceof BusinessEntity)
-        childElement = new BusinessElement((BusinessEntity)object,element_.getModel());
-      else if (object instanceof BusinessService)
-        childElement = new ServiceElement((BusinessService)object,element_.getModel());
-      else if (object instanceof TModel)
-        childElement = new ServiceInterfaceElement((TModel)object,element_.getModel());
-      if (childElement != null)
-        element_.connect(childElement,UDDIModelConstants.REL_QUERY_RESULTS,ModelConstants.REL_OWNER);
-    }
-  }
-
-  private final void createChildNode(TreeElement element)
-  {
-    Node childNode = null;
-    if (element instanceof BusinessElement)
-      childNode = new BusinessNode(element,nodeManager_,nodeDepth_+1);
-    else if (element instanceof ServiceElement)
-      childNode = new ServiceNode(element,nodeManager_,nodeDepth_+1);
-    else if (element instanceof ServiceInterfaceElement)
-      childNode = new ServiceInterfaceNode(element,nodeManager_,nodeDepth_+1);
-    if (childNode != null)
-      addChild(childNode);
-  }
-
-  protected final void initTools()
-  {
-    Controller controller = nodeManager_.getController();
-    UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-    new ResultsTool(toolManager_,controller.getMessage("ALT_RESULTS"));
-    regFindTool_ = new RegFindTool(toolManager_,uddiPerspective.getMessage("ALT_FIND"));
-  }
-
-  public final void setFindToolProperties(FindAction findAction)
-  {
-    findAction_ = findAction;
-    regFindTool_.updatePropertyTable(findAction.getPropertyTable());
-  }
-
-  public void addAuthenticationProperties(RegistryElement regElement)
-  {
-    ((RegFindTool)regFindTool_).addAuthenticationProperties(regElement);
-    Vector childNodes = getChildNodes();
-    for (int i=0;i<childNodes.size();i++)
-    {
-      UDDINavigatorNode navigatorNode = (UDDINavigatorNode)childNodes.elementAt(i);
-      navigatorNode.addAuthenticationProperties(regElement);
-    }
-  }
-
-  public final FindAction getFindAction()
-  {
-    return findAction_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/QueryParentNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/QueryParentNode.java
deleted file mode 100644
index d482fe1c8..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/QueryParentNode.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.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-
-public class QueryParentNode extends UDDINavigatorFolderNode
-{
-  public QueryParentNode(TreeElement element,NodeManager nodeManager,int nodeDepth)
-  {
-    super(element,nodeManager,nodeDepth);
-    element.addListener(new ElementAdapter()
-    {
-      public void relAdded(RelAddEvent event)
-      {
-        String rel = event.getOutBoundRelName();
-        if (rel.equals(UDDIModelConstants.REL_QUERIES))
-        {
-          QueryElement queryElement = (QueryElement)event.getParentElement();
-          createChildNode(queryElement);
-        }
-      }
-
-      public void relRemoved(RelRemoveEvent event)
-      {
-        QueryElement queryElement = null;
-        if (event.getInBoundRelName().equals(UDDIModelConstants.REL_QUERIES))
-          queryElement = (QueryElement)event.getInboundElement();
-        else if (event.getOutBoundRelName().equals(UDDIModelConstants.REL_QUERIES))
-          queryElement = (QueryElement)event.getOutBoundElement();
-
-        if (queryElement != null)
-          removeChildNode(queryElement);
-      }
-    });
-  }
-
-  private final void createChildNode(QueryElement element)
-  {
-    QueryNode queryNode = new QueryNode(element,nodeManager_,nodeDepth_+1);
-    // Add registry authentication properties.
-    RegistryElement regElement = (RegistryElement)(getParent().getTreeElement());
-    queryNode.addAuthenticationProperties(regElement);
-    addChild(queryNode);
-  }
-  
-  protected final void initTools()
-  {
-    UDDIPerspective uddiPerspective = nodeManager_.getController().getUDDIPerspective();
-    new ItemsSummaryTool(toolManager_,"uddi/images/queries_closed_enabled.gif","uddi/images/queries_closed_highlighted.gif",uddiPerspective.getMessage("ALT_SUMMARY_QUERIES"),UDDIActionInputs.QUERY_ITEM_QUERIES);
-    new ItemsSummaryTool(toolManager_,"uddi/images/businesses_closed_enabled.gif","uddi/images/businesses_closed_highlighted.gif",uddiPerspective.getMessage("ALT_SUMMARY_BUSINESSES"),UDDIActionInputs.QUERY_ITEM_BUSINESSES);
-    new ItemsSummaryTool(toolManager_,"uddi/images/services_closed_enabled.gif","uddi/images/services_closed_highlighted.gif",uddiPerspective.getMessage("ALT_SUMMARY_SERVICES"),UDDIActionInputs.QUERY_ITEM_SERVICES);
-    new ItemsSummaryTool(toolManager_,"uddi/images/service_interfaces_closed_enabled.gif","uddi/images/service_interfaces_closed_highlighted.gif",uddiPerspective.getMessage("ALT_SUMMARY_SERVICE_INTERFACES"),UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES);
-  }
-  
-  public String getOpenImagePath()
-  {
-    return "uddi/images/queries_open_highlighted.gif";
-  }
-  
-  public String getClosedImagePath()
-  {
-    return "uddi/images/queries_closed_highlighted.gif";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RefreshTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RefreshTool.java
deleted file mode 100644
index 233f8c920..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RefreshTool.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.RefreshUDDINodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction;
-
-public class RefreshTool extends ActionTool
-{
-  public RefreshTool(ToolManager toolManager,String alt)
-  {
-    super(toolManager,"images/refresh_enabled.gif","images/refresh_highlighted.gif",alt);
-  }
-
-  public String getSelectToolActionHref(boolean forHistory)
-  {
-    Node node = toolManager_.getNode();
-    return SelectPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
-  }
-
-  public String getActionLink()
-  {
-    return RefreshUDDINodeAction.getActionLink(toolManager_.getNode().getNodeId());
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegFindTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegFindTool.java
deleted file mode 100644
index 7dc9ae806..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegFindTool.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolProperties;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectFindToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-
-public class RegFindTool extends FormTool implements MultipleFormToolPropertiesInterface
-{
-  public RegFindTool(ToolManager toolManager,String alt)
-  {
-    super(toolManager,"uddi/images/find_enabled.gif","uddi/images/find_highlighted.gif",alt);
-  }
-
-  protected final void initDefaultProperties()
-  {
-    initDefaultProperties(this);
-    setProperty(UDDIActionInputs.SUBQUERY_KEY,"");
-    setProperty(UDDIActionInputs.SUBQUERIES_PROPERTIES,new Hashtable());
-    UDDIPerspective uddiPerspective = toolManager_.getNode().getNodeManager().getController().getUDDIPerspective();
-    setProperty(UDDIActionInputs.QUERY_NAME,uddiPerspective.getMessage("DEFAULT_QUERY_NAME"));
-  }
-
-  private final void initDefaultProperties(FormToolPropertiesInterface formToolPI)
-  {
-    toolManager_.getNode().getNodeManager().getController().getUDDIPerspective();
-
-    formToolPI.setProperty(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_BUSINESSES));
-    String simpleStyleString = String.valueOf(UDDIActionInputs.QUERY_STYLE_SIMPLE);
-    formToolPI.setProperty(UDDIActionInputs.QUERY_STYLE_BUSINESSES,simpleStyleString);
-    formToolPI.setProperty(UDDIActionInputs.QUERY_STYLE_SERVICES,simpleStyleString);
-    formToolPI.setProperty(UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES,simpleStyleString);
-
-    String maxSearchSet = String.valueOf(UDDIActionInputs.QUERY_MAX_SEARCH_SET);
-    String maxResults = String.valueOf(UDDIActionInputs.QUERY_MAX_RESULTS);
-
-    // RegFindBusinessesSimpleAction inputs
-    formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_NAME,"");
-
-    // RegFindBusinessesAdvancedAction inputs
-    // The authentication inputs must be added later as this method is called before we can get a valid handle
-    // to the RegistryElement in the case of a query node.
-    formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_MAX_SEARCH_SET,maxSearchSet);
-    formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_MAX_RESULTS,maxResults);
-
-    // RegFindServicesSimpleAction inputs
-    formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME,"");
-
-    // RegFindServicesAdvancedAction inputs
-    // The authentication inputs must be added later as this method is called before we can get a valid handle
-    // to the RegistryElement in the case of a query node.
-    formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_MAX_SEARCH_SET,maxSearchSet);
-    formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_MAX_RESULTS,maxResults);
-
-    // RegFindServiceInterfacesSimpleAction inputs
-    formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME,"");
-
-    // RegFindServiceInterfacesAdvancedAction inputs
-    // The authentication inputs must be added later as this method is called before we can get a valid handle
-    // to the RegistryElement in the case of a query node.
-    formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME,"");
-    formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_SEARCH_SET,maxSearchSet);
-    formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_RESULTS,maxResults);
-  }
-
-  public final void addAuthenticationProperties(RegistryElement regElement)
-  {
-    String publishURL = regElement.getPublishURL();
-    String userId = regElement.getUserId();
-    String password = regElement.getCred();
-
-    if (publishURL == null)
-      publishURL = "";
-    if (userId == null)
-      userId = "";
-    if (password == null)
-      password = "";
-
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
-  }
-
-  public final FormToolPropertiesInterface getFormToolProperties(Object subQueryKeyObject)
-  {
-    String subQueryKey = (String)subQueryKeyObject;
-    if (subQueryKey == null || subQueryKey.length() < 1)
-      return this;
-    Hashtable subQueriesProperties = (Hashtable)getProperty(UDDIActionInputs.SUBQUERIES_PROPERTIES);
-    FormToolPropertiesInterface subQueryProperties = (FormToolPropertiesInterface)subQueriesProperties.get(subQueryKey);
-    if (subQueryProperties == null)
-    {
-      subQueryProperties = new FormToolProperties();
-      initDefaultProperties(subQueryProperties);
-      subQueriesProperties.put(subQueryKey,subQueryProperties);
-    }
-    return subQueryProperties;
-  }
-
-  public String getSelectToolActionHref(boolean forHistory)
-  {
-    Node node = toolManager_.getNode();
-    String subQueryKey = (String)getProperty(UDDIActionInputs.SUBQUERY_KEY);
-    return SelectFindToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),subQueryKey,forHistory);
-  }
-
-  public String getFormLink()
-  {
-    Object subQueryKeyObject = getProperty(UDDIActionInputs.SUBQUERY_KEY);
-    if (subQueryKeyObject != null)
-    {
-      getProperty(UDDIActionInputs.SUBQUERIES_PROPERTIES);
-      FormToolPropertiesInterface subQueryProperties = getFormToolProperties(subQueryKeyObject);
-      Object subQueryGetObject = subQueryProperties.getProperty(UDDIActionInputs.SUBQUERY_GET);
-      if (subQueryGetObject != null)
-      {
-        boolean isSubQueryGet = ((Boolean)subQueryGetObject).booleanValue();
-        if (isSubQueryGet)
-          return "uddi/forms/GetForm.jsp";
-      }
-    }
-    return "uddi/forms/RegFindForm.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegPublishTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegPublishTool.java
deleted file mode 100644
index fc9ac2029..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegPublishTool.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectFindToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-
-public class RegPublishTool extends FormTool implements MultipleFormToolPropertiesInterface
-{
-  ToolManager invisibleToolManager_;
-  private RegFindTool regFindTool_;
-  public RegPublishTool(ToolManager toolManager,String alt)
-  {
-    super(toolManager,"uddi/images/publish_enabled.gif","uddi/images/publish_highlighted.gif",alt);
-    invisibleToolManager_ = new ToolManager(toolManager.getNode());
-    regFindTool_ = new RegFindTool(invisibleToolManager_,"");
-  }
-
-  protected final void initDefaultProperties()
-  {
-    toolManager_.getNode().getNodeManager().getController().getUDDIPerspective();
-
-    setProperty(UDDIActionInputs.SUBQUERY_KEY,"");
-
-    setProperty(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_BUSINESSES));
-    String simpleStyleString = String.valueOf(UDDIActionInputs.QUERY_STYLE_SIMPLE);
-    setProperty(UDDIActionInputs.QUERY_STYLE_BUSINESSES,simpleStyleString);
-    setProperty(UDDIActionInputs.QUERY_STYLE_SERVICES,simpleStyleString);
-    setProperty(UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES,simpleStyleString);
-
-    // RegPublishBusinessSimpleAction inputs
-    setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_NAME,"");
-    setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_DESCRIPTION,"");
-
-    // RegPublishServiceSimpleAction inputs
-    setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_WSDL_URL,"");
-    setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME,"");
-    setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_DESCRIPTION,"");
-
-    // RegPublishServiceAdvancedAction inputs
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL,"");
-
-    // RegPublishServiceInterfaceSimpleAction inputs
-    setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_WSDL_URL,"");
-    setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME,"");
-    setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_DESCRIPTION,"");
-
-    // RegPublishServiceInterfaceAdvancedAction inputs
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL,"");
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME,"");
-  }
-
-  public final void addAuthenticationProperties(RegistryElement regElement)
-  {
-    String publishURL = regElement.getPublishURL();
-    String userId = regElement.getUserId();
-    String password = regElement.getCred();
-
-    if (publishURL == null)
-      publishURL = "";
-    if (userId == null)
-      userId = "";
-    if (password == null)
-      password = "";
-
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
-    regFindTool_.addAuthenticationProperties(regElement);
-  }
-
-  public final FormToolPropertiesInterface getFormToolProperties(Object subQueryKeyObject)
-  {
-    // Empty/Non-existent subquerykey implies publish form. All else implies query form.
-    String subQueryKey = (String)subQueryKeyObject;
-    if (subQueryKey == null || subQueryKey.length() < 1)
-      return this;
-    else
-      return regFindTool_.getFormToolProperties(subQueryKeyObject);
-  }
-
-  public String getSelectToolActionHref(boolean forHistory)
-  {
-    Node node = toolManager_.getNode();
-    String subQueryKey = (String)getProperty(UDDIActionInputs.SUBQUERY_KEY);
-    return SelectFindToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),subQueryKey,forHistory);
-  }
-
-  public String getFormLink()
-  {
-    Object subQueryKeyObject = getProperty(UDDIActionInputs.SUBQUERY_KEY);
-    String subQueryKey = null;
-    if (subQueryKeyObject != null)
-    {
-      getProperty(UDDIActionInputs.SUBQUERIES_PROPERTIES);
-      FormToolPropertiesInterface subQueryProperties = getFormToolProperties(subQueryKeyObject);
-      Object subQueryGetObject = subQueryProperties.getProperty(UDDIActionInputs.SUBQUERY_GET);
-      if (subQueryGetObject != null)
-      {
-        boolean isSubQueryGet = ((Boolean)subQueryGetObject).booleanValue();
-        if (isSubQueryGet)
-          return "uddi/forms/GetForm.jsp";
-      }
-      subQueryKey = (String)subQueryKeyObject;
-    }
-      
-    if (subQueryKey == null || subQueryKey.length() < 1)
-      return "uddi/forms/RegPublishForm.jsp";
-    else
-      return regFindTool_.getFormLink();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegistryDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegistryDetailsTool.java
deleted file mode 100644
index ce960f00a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegistryDetailsTool.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.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ProxyLoadPageAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-
-public class RegistryDetailsTool extends DetailsTool
-{
-  public RegistryDetailsTool(ToolManager toolManager,String alt)
-  {
-    super(toolManager,alt,ProxyLoadPageAction.getActionLink("uddi/forms/RegDetailsForm.jsp"));
-  }
-
-  public final void initDefaultProperties()
-  {
-    clearPropertyTable();
-    toolManager_.getNode().getNodeManager().getController();
-    RegistryElement regElement = (RegistryElement)(toolManager_.getNode().getTreeElement());
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_REGISTRY_NAME,regElement.getName());
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegistryNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegistryNode.java
deleted file mode 100644
index ccf029751..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegistryNode.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.uddi.perspective;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.PublishedItemsElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryParentElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-
-public class RegistryNode extends UDDINavigatorNode
-{
-  private RegistryDetailsTool regDetailsTool_;
-  private RegPublishTool regPublishTool_;
-  
-  public static final String IMAGE_PATH_STANDARD = "uddi/images/registry.gif";
-  public static final String IMAGE_PATH_WITH_USER_DEFINED_CATEGORIES = "uddi/images/regstrycat_obj.gif";
-  
-  public RegistryNode(TreeElement element,NodeManager nodeManager,int nodeDepth,String imagePath)
-  {
-    super(element,nodeManager,nodeDepth,imagePath);
-    element.addListener(new ElementAdapter()
-    {
-      public void relAdded(RelAddEvent event)
-      {
-        String rel = event.getOutBoundRelName();
-        if (rel.equals(UDDIModelConstants.REL_QUERIES_PARENT))
-        {
-          QueryParentElement queryParentElement = (QueryParentElement)event.getParentElement();
-          createChildNode(queryParentElement);
-        }
-        else if (isPublishedItemsRel(rel))
-        {
-          PublishedItemsElement publishedItemsElement = (PublishedItemsElement)event.getParentElement();
-          createChildNode(publishedItemsElement);
-        }
-      }
-      public void relRemoved(RelRemoveEvent event)
-      {
-        TreeElement childElement = null;
-        String inBoundRelName = event.getInBoundRelName();
-        String outBoundRelName = event.getOutBoundRelName();
-        if (inBoundRelName.equals(UDDIModelConstants.REL_QUERIES_PARENT) || isPublishedItemsRel(inBoundRelName))
-          childElement = (TreeElement)event.getInboundElement();
-        else if (outBoundRelName.equals(UDDIModelConstants.REL_QUERIES_PARENT) || isPublishedItemsRel(outBoundRelName))
-          childElement = (TreeElement)event.getOutBoundElement();
-
-        if (childElement != null)
-          removeChildNode(childElement);
-      }
-    });
-    UDDIPerspective uddiPerspective = nodeManager_.getController().getUDDIPerspective();
-    element.connect(new QueryParentElement(uddiPerspective.getMessage("NODE_NAME_QUERIES_FOLDER"),element_.getModel()),UDDIModelConstants.REL_QUERIES_PARENT,ModelConstants.REL_OWNER);
-    element.connect(new PublishedItemsElement(UDDIActionInputs.QUERY_ITEM_BUSINESSES,uddiPerspective.getMessage("NODE_NAME_PUBLISHED_BUSINESSES_FOLDER"),element_.getModel()),UDDIModelConstants.REL_PUBLISHED_BUSINESSES_PARENT,ModelConstants.REL_OWNER);
-    element.connect(new PublishedItemsElement(UDDIActionInputs.QUERY_ITEM_SERVICES,uddiPerspective.getMessage("NODE_NAME_PUBLISHED_SERVICES_FOLDER"),element_.getModel()),UDDIModelConstants.REL_PUBLISHED_SERVICES_PARENT,ModelConstants.REL_OWNER);
-    element.connect(new PublishedItemsElement(UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES,uddiPerspective.getMessage("NODE_NAME_PUBLISHED_SERVICE_INTERFACES_FOLDER"),element_.getModel()),UDDIModelConstants.REL_PUBLISHED_SERVICE_INTERFACES_PARENT,ModelConstants.REL_OWNER);
-    setVisibilityOfChildren(false);
-  }
-
-  private final boolean isPublishedItemsRel(String rel)
-  {
-    return rel.equals(UDDIModelConstants.REL_PUBLISHED_BUSINESSES_PARENT) || rel.equals(UDDIModelConstants.REL_PUBLISHED_SERVICES_PARENT) || rel.equals(UDDIModelConstants.REL_PUBLISHED_SERVICE_INTERFACES_PARENT);
-  }
-
-  private final void createChildNode(QueryParentElement queryParentElement)
-  {
-    QueryParentNode queryParentNode = new QueryParentNode(queryParentElement,nodeManager_,nodeDepth_+1);
-    addChild(queryParentNode);
-  }
-
-  private final void createChildNode(PublishedItemsElement publishedItemsElement)
-  {
-    PublishedItemsNode publishedItemsNode = new PublishedItemsNode(publishedItemsElement,nodeManager_,nodeDepth_+1);
-    addChild(publishedItemsNode);
-  }
-
-  protected final void initTools()
-  {
-    nodeManager_.getController();
-    UDDIPerspective uddiPerspective = nodeManager_.getController().getUDDIPerspective();
-    regDetailsTool_ = new RegistryDetailsTool(toolManager_ ,uddiPerspective.getMessage("ALT_REGISTRY_DETAILS"));
-    RegFindTool regFindTool = new RegFindTool(toolManager_,uddiPerspective.getMessage("ALT_FIND"));
-    regPublishTool_ = new RegPublishTool(toolManager_,uddiPerspective.getMessage("ALT_PUBLISH"));
-    new AddToFavoritesTool(toolManager_,uddiPerspective.getMessage("ALT_ADD_TO_FAVORITES"));
-    regFindTool.addAuthenticationProperties((RegistryElement)element_);
-    regPublishTool_.addAuthenticationProperties((RegistryElement)element_);
-  }
-  
-  public final RegistryDetailsTool getRegDetailsTool()
-  {
-    return regDetailsTool_;
-  }
-
-  public final RegPublishTool getRegPublishTool()
-  {
-    return regPublishTool_;
-  }
-
-  private final void addDiscoveredNodes(Vector allNodes,Node queryParentNode,int queryType)
-  {
-    Vector queryNodes = queryParentNode.getChildNodes();
-    for (int i=0;i<queryNodes.size();i++)
-    {
-      QueryNode queryNode = (QueryNode)queryNodes.elementAt(i);
-      QueryElement queryElement = (QueryElement)queryNode.getTreeElement();
-      if (queryType == UDDIActionInputs.QUERY_ITEM_QUERIES)
-        allNodes.addElement(queryNode);
-      else if (queryElement.getQueryType() == queryType)
-      {
-        Vector discoveredNodes = queryNode.getChildNodes();
-        for (int j=0;j<discoveredNodes.size();j++)
-          allNodes.addElement(discoveredNodes.elementAt(j));
-      }
-    }
-  }
-
-  private final void addPublishedNodes(Vector allNodes,Node publishedItemsNode)
-  {
-    Vector itemNodes = publishedItemsNode.getChildNodes();
-    for (int i=0;i<itemNodes.size();i++)
-      allNodes.addElement(itemNodes.elementAt(i));
-  }
-
-  public final void getAllBusinessNodes(Vector allBusinessNodes)
-  {
-    RegistryElement regElement = (RegistryElement)element_;
-    Node queryParentNode = getChildNode(regElement.getQueryParentElement());
-    Node publishedBusinessesNode = getChildNode(regElement.getPublishedBusinessesElement());
-    addDiscoveredNodes(allBusinessNodes,queryParentNode,UDDIActionInputs.QUERY_ITEM_BUSINESSES);
-    addPublishedNodes(allBusinessNodes,publishedBusinessesNode);
-  }
-
-  public final void getAllServiceNodes(Vector allServicesNodes)
-  {
-    RegistryElement regElement = (RegistryElement)element_;
-    Node queryParentNode = getChildNode(regElement.getQueryParentElement());
-    Node publishedServicesNode = getChildNode(regElement.getPublishedServicesElement());
-    addDiscoveredNodes(allServicesNodes,queryParentNode,UDDIActionInputs.QUERY_ITEM_SERVICES);
-    addPublishedNodes(allServicesNodes,publishedServicesNode);
-  }
-
-  public final void getAllServiceInterfaceNodes(Vector allServiceInterfaceNodes)
-  {
-    RegistryElement regElement = (RegistryElement)element_;
-    Node queryParentNode = getChildNode(regElement.getQueryParentElement());
-    Node publishedServiceInterfacesNode = getChildNode(regElement.getPublishedServiceInterfacesElement());
-    addDiscoveredNodes(allServiceInterfaceNodes,queryParentNode,UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES);
-    addPublishedNodes(allServiceInterfaceNodes,publishedServiceInterfacesNode);
-  }
-
-  public final void getPublishedBusinessNodes(Vector publishedBusinessNodes)
-  {
-    RegistryElement regElement = (RegistryElement)element_;
-    Node publishedBusinessesNode = getChildNode(regElement.getPublishedBusinessesElement());
-    addPublishedNodes(publishedBusinessNodes,publishedBusinessesNode);
-  }
-
-  public final void getPublishedServiceNodes(Vector publishedServiceNodes)
-  {
-    RegistryElement regElement = (RegistryElement)element_;
-    Node publishedServicesNode = getChildNode(regElement.getPublishedServicesElement());
-    addPublishedNodes(publishedServiceNodes,publishedServicesNode);
-  }
-
-  public final void getPublishedServiceInterfaceNodes(Vector publishedServiceInterfaceNodes)
-  {
-    RegistryElement regElement = (RegistryElement)element_;
-    Node publishedServiceInterfacesNode = getChildNode(regElement.getPublishedServiceInterfacesElement());
-    addPublishedNodes(publishedServiceInterfaceNodes,publishedServiceInterfacesNode);
-  }
-
-  public final void getDiscoveredNodes(Vector discoveredNodes,int queryItem)
-  {
-    RegistryElement regElement = (RegistryElement)element_;
-    Node queryParentNode = getChildNode(regElement.getQueryParentElement());
-    addDiscoveredNodes(discoveredNodes,queryParentNode,queryItem);
-  }
-
-  private final boolean hasQueryResults(Node queryParentNode,int queryType)
-  {
-    Vector queries = queryParentNode.getChildNodes();
-    for (int i=0;i<queries.size();i++)
-    {
-      QueryNode queryNode = (QueryNode)queries.elementAt(i);
-      if (queryNode.getChildNodes().size() > 0)
-      {
-        QueryElement queryElement = (QueryElement)queryNode.getTreeElement();
-        if (queryElement.getQueryType() == queryType)
-          return true;
-      }
-    }
-    return false;
-  }
-
-  public final boolean hasBusiness()
-  {
-    RegistryElement regElement = (RegistryElement)element_;
-    Node publishedBusinessesNode = getChildNode(regElement.getPublishedBusinessesElement());
-    if (publishedBusinessesNode.getChildNodes().size() > 0)
-      return true;
-    return hasQueryResults(getChildNode(regElement.getQueryParentElement()),UDDIActionInputs.QUERY_ITEM_BUSINESSES);
-  }
-
-  public final boolean hasService()
-  {
-    RegistryElement regElement = (RegistryElement)element_;
-    Node publishedServicesNode = getChildNode(regElement.getPublishedServicesElement());
-    if (publishedServicesNode.getChildNodes().size() > 0)
-      return true;
-    return hasQueryResults(getChildNode(regElement.getQueryParentElement()),UDDIActionInputs.QUERY_ITEM_SERVICES);
-  }
-
-  public final boolean hasServiceInterface()
-  {
-    RegistryElement regElement = (RegistryElement)element_;
-    Node publishedServiceInterfacesNode = getChildNode(regElement.getPublishedServiceInterfacesElement());
-    if (publishedServiceInterfacesNode.getChildNodes().size() > 0)
-      return true;
-    return hasQueryResults(getChildNode(regElement.getQueryParentElement()),UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES);
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ResultsTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ResultsTool.java
deleted file mode 100644
index 99a765a7e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ResultsTool.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.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ProxyLoadPageAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction;
-
-public class ResultsTool extends FormTool
-{
-  private String formLink_;
-
-  public ResultsTool(ToolManager toolManager,String alt)
-  {
-    super(toolManager,"images/details_enabled.gif","images/details_highlighted.gif",alt);
-    formLink_ = ProxyLoadPageAction.getActionLink("uddi/forms/ResultsForm.jsp");
-  }
-
-  public final void initDefaultProperties()
-  {
-  }
-
-  public String getSelectToolActionHref(boolean forHistory)
-  {
-    Node node = toolManager_.getNode();
-    return SelectPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
-  }
-
-  public String getFormLink()
-  {
-    return formLink_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RootCategoryNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RootCategoryNode.java
deleted file mode 100644
index c0c4233cd..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RootCategoryNode.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.ws.internal.explorer.platform.uddi.perspective;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.CategoryElement;
-
-public class RootCategoryNode extends Node
-{
-  public RootCategoryNode(TreeElement element,NodeManager nodeManager)
-  {
-    super(element,nodeManager,1,"images/root_main.gif");
-    setVisibilityOfChildren(true);
-  }
-
-  public final void createChildren()
-  {
-    Enumeration children = element_.getElements(UDDIModelConstants.REL_SUBCATEGORIES);
-    if (children != null)
-    {
-      while (children.hasMoreElements())
-      {
-        CategoryElement categoryElement = (CategoryElement)children.nextElement();
-        CategoryNode categoryNode = new CategoryNode(categoryElement,nodeManager_,nodeDepth_+1);
-        addChild(categoryNode);
-        categoryNode.createChildren();
-      }
-    }
-  }
-
-  // Root node: no need for toggle action.
-  protected final String getToggleNodeActionHref()
-  {
-    return null;
-  }
-  
-  // Text only node.
-  protected final String getLinkActionHref()
-  {
-    return null;
-  }
-  
-  protected final void initTools()
-  {
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceDetailsTool.java
deleted file mode 100644
index 4f70b4099..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceDetailsTool.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.ws.internal.explorer.platform.uddi.perspective;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ProxyLoadPageAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceElement;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.util.CategoryBag;
-
-public class ServiceDetailsTool extends DetailsTool
-{
-  public ServiceDetailsTool(ToolManager toolManager,String alt)
-  {
-    super(toolManager,alt,ProxyLoadPageAction.getActionLink("uddi/forms/ServiceDetailsForm.jsp"));
-  }
-
-  public final void initDefaultProperties()
-  {
-    clearPropertyTable();
-    toolManager_.getNode().getNodeManager().getController();
-    ServiceElement serviceElement = (ServiceElement)(toolManager_.getNode().getTreeElement());
-    BusinessService busService = serviceElement.getBusinessService();
-
-    setProperty(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY,busService.getServiceKey());
-    setProperty(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY,busService.getBusinessKey());
-
-    Vector nameVector = new Vector();
-    copyIndexVector(busService.getNameVector(),nameVector);
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES,nameVector);
-
-    Vector descriptionVector = new Vector();
-    copyIndexVector(busService.getDescriptionVector(),descriptionVector);
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS,descriptionVector);
-
-    CategoryBag catBag = busService.getCategoryBag();
-    if (catBag != null)
-    {
-      Vector catVector = new Vector();
-      copyIndexVector(catBag.getKeyedReferenceVector(),catVector);
-      setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES,catVector);
-    }
-  }
-  
-  public void addAuthenticationProperties(RegistryElement regElement)
-  {
-    String publishURL = regElement.getPublishURL();
-    String userId = regElement.getUserId();
-    String password = regElement.getCred();
-
-    if (publishURL == null)
-      publishURL = "";
-    if (userId == null)
-      userId = "";
-    if (password == null)
-      password = "";
-
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceInterfaceDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceInterfaceDetailsTool.java
deleted file mode 100644
index 4e70e98a7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceInterfaceDetailsTool.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.ws.internal.explorer.platform.uddi.perspective;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ProxyLoadPageAction;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceInterfaceElement;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.util.CategoryBag;
-import org.uddi4j.util.IdentifierBag;
-
-public class ServiceInterfaceDetailsTool extends DetailsTool
-{
-  public ServiceInterfaceDetailsTool(ToolManager toolManager,String alt)
-  {
-    super(toolManager,alt,ProxyLoadPageAction.getActionLink("uddi/forms/ServiceInterfaceDetailsForm.jsp"));
-  }
-
-  public final void initDefaultProperties()
-  {
-    clearPropertyTable();
-    toolManager_.getNode().getNodeManager().getController();
-    ServiceInterfaceElement siElement = (ServiceInterfaceElement)(toolManager_.getNode().getTreeElement());
-    TModel tModel = siElement.getTModel();
-
-    setProperty(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY,tModel.getTModelKey());
-    ListElement nameListElement = new ListElement(tModel.getNameString());
-    nameListElement.setTargetViewToolInfo(-1,-1,0);
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME,nameListElement);
-
-    Vector descriptionVector = new Vector();
-    copyIndexVector(tModel.getDescriptionVector(),descriptionVector);
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS,descriptionVector);
-
-    IdentifierBag idBag = tModel.getIdentifierBag();
-    if (idBag != null)
-    {
-      Vector idVector = new Vector();
-      copyIndexVector(idBag.getKeyedReferenceVector(),idVector);
-      setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS,idVector);
-    }
-
-    CategoryBag catBag = tModel.getCategoryBag();
-    if (catBag != null)
-    {
-      Vector catVector = new Vector();
-      copyIndexVector(catBag.getKeyedReferenceVector(),catVector);
-      setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES,catVector);
-    }
-  }
-
-  public void addAuthenticationProperties(RegistryElement regElement)
-  {
-    String publishURL = regElement.getPublishURL();
-    String userId = regElement.getUserId();
-    String password = regElement.getCred();
-
-    if (publishURL == null)
-      publishURL = "";
-    if (userId == null)
-      userId = "";
-    if (password == null)
-      password = "";
-
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
-  }  
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceInterfaceNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceInterfaceNode.java
deleted file mode 100644
index b3fca7c49..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceInterfaceNode.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.ServiceInterfaceGetBusinessesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.ServiceInterfaceGetServicesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-
-public class ServiceInterfaceNode extends UDDINavigatorNode
-{
-  private DetailsTool detailsTool_;
-  private UnpublishTool unpublishTool_;
-  public ServiceInterfaceNode(TreeElement element,NodeManager nodeManager,int nodeDepth)
-  {
-    super(element,nodeManager,nodeDepth,"uddi/images/service_interface_highlighted.gif");
-  }
-
-  protected final void initTools()
-  {
-    Controller controller = nodeManager_.getController();
-    UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-    detailsTool_ = new ServiceInterfaceDetailsTool(toolManager_,uddiPerspective.getMessage("ALT_SERVICE_INTERFACE_DETAILS"));
-    new GetServicesTool(toolManager_,uddiPerspective.getMessage("ALT_GET_SERVICES"),ServiceInterfaceGetServicesAction.getActionLink(nodeId_));
-    new GetBusinessesTool(toolManager_,"uddi/images/businesses_closed_enabled.gif","uddi/images/businesses_closed_highlighted.gif",uddiPerspective.getMessage("ALT_GET_BUSINESSES"),ServiceInterfaceGetBusinessesAction.getActionLink(nodeId_));
-    new UDDIImportWSDLToWorkbenchTool(toolManager_,controller.getMessage("ALT_IMPORT_WSDL_TO_WORKBENCH"));
-    new UDDIImportWSDLToFileSystemTool(toolManager_,controller.getMessage("ALT_WSDL_IMPORT_TO_FS"));
-    new UDDILaunchWebServiceWizardTool(toolManager_,controller.getMessage("ALT_LAUNCH_WEB_SERVICE_WIZARD"));
-    new AddToFavoritesTool(toolManager_, uddiPerspective.getMessage("ALT_ADD_TO_FAVORITES"));
-    unpublishTool_ = new UnpublishTool(toolManager_,"uddi/images/unpublish_service_interface_enabled.gif","uddi/images/unpublish_service_interface_highlighted.gif",uddiPerspective.getMessage("ALT_UNPUBLISH_SERVICE_INTERFACE"));
-  }
-  
-  public void addAuthenticationProperties(RegistryElement regElement)
-  {
-    detailsTool_.addAuthenticationProperties(regElement);
-    unpublishTool_.addAuthenticationProperties(regElement);
-  }
-  
-  public String getWSDLURLFromDetailsTool()
-  {
-    ListElement wsdlURLListElement = (ListElement)detailsTool_.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL);
-    if (wsdlURLListElement != null)
-      return (String)wsdlURLListElement.getObject();
-    else
-      return "temp.wsdl";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceNode.java
deleted file mode 100644
index f2c0a5717..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceNode.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.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.ServiceGetBusinessAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.ServiceGetServiceInterfacesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-
-public class ServiceNode extends UDDINavigatorNode
-{
-  private DetailsTool detailsTool_;
-  private UnpublishTool unpublishTool_;
-  public ServiceNode(TreeElement element,NodeManager nodeManager,int nodeDepth)
-  {
-    super(element,nodeManager,nodeDepth,"uddi/images/service_highlighted.gif");
-  }
-
-  protected final void initTools()
-  {
-    Controller controller = nodeManager_.getController();
-    UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-    detailsTool_ = new ServiceDetailsTool(toolManager_,uddiPerspective.getMessage("ALT_SERVICE_DETAILS"));
-    new GetBusinessesTool(toolManager_,"uddi/images/business_enabled.gif","uddi/images/business_highlighted.gif",uddiPerspective.getMessage("ALT_GET_BUSINESS"),ServiceGetBusinessAction.getActionLink(nodeId_));
-    new GetServiceInterfacesTool(toolManager_,uddiPerspective.getMessage("ALT_GET_SERVICE_INTERFACES"),ServiceGetServiceInterfacesAction.getActionLink(nodeId_));
-    new UDDIImportWSDLToWorkbenchTool(toolManager_,controller.getMessage("ALT_IMPORT_WSDL_TO_WORKBENCH"));
-    new UDDIImportWSDLToFileSystemTool(toolManager_,controller.getMessage("ALT_WSDL_IMPORT_TO_FS"));
-    new UDDILaunchWebServiceWizardTool(toolManager_,controller.getMessage("ALT_LAUNCH_WEB_SERVICE_WIZARD"));
-    new UDDIAddToWSDLPerspectiveTool(toolManager_,uddiPerspective.getMessage("ALT_ADD_TO_WSDL_PERSPECTIVE"));
-    new AddToFavoritesTool(toolManager_,uddiPerspective.getMessage("ALT_ADD_TO_FAVORITES"));
-    unpublishTool_ = new UnpublishTool(toolManager_,"uddi/images/unpublish_service_enabled.gif","uddi/images/unpublish_service_highlighted.gif",uddiPerspective.getMessage("ALT_UNPUBLISH_SERVICE"));
-  }
-  
-  public void addAuthenticationProperties(RegistryElement regElement)
-  {
-    detailsTool_.addAuthenticationProperties(regElement);
-    unpublishTool_.addAuthenticationProperties(regElement);
-  }
-
-  public String getWSDLURLFromDetailsTool()
-  {
-    ListElement wsdlURLListElement = (ListElement)detailsTool_.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL);
-    if (wsdlURLListElement != null)
-      return (String)wsdlURLListElement.getObject();
-    else
-      return "temp.wsdl";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/SubQueryKeyProperty.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/SubQueryKeyProperty.java
deleted file mode 100644
index 1c1154f26..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/SubQueryKeyProperty.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-public class SubQueryKeyProperty
-{
-  private String subQueryKey_;
-
-  public SubQueryKeyProperty()
-  {
-    subQueryKey_ = "";
-  }
-
-  public final void setSubQueryKey(String subQueryKey)
-  {
-    subQueryKey_ = subQueryKey;
-  }
-
-  public final String getSubQueryKey()
-  {
-    return subQueryKey_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/SubQueryTransferTarget.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/SubQueryTransferTarget.java
deleted file mode 100644
index acd82748d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/SubQueryTransferTarget.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ViewTool;
-
-public class SubQueryTransferTarget
-{
-  private int nodeId_;
-  private int toolId_;
-  private int viewId_;
-  private int viewToolId_;
-  private String subQueryKey_;
-  private NodeManager nodeManager_;
-  Hashtable parentQueryData_;
-
-  public SubQueryTransferTarget(Node node,String subQueryKey,Hashtable parentQueryData)
-  {
-    nodeId_ = node.getNodeId();
-    toolId_ = node.getToolManager().getSelectedToolId();
-    viewId_ = node.getViewId();
-    viewToolId_ = node.getViewToolId();
-    subQueryKey_ = subQueryKey;
-    nodeManager_ = node.getNodeManager();
-    parentQueryData_ = parentQueryData;
-  }
-
-  public final int getNodeId()
-  {
-    return nodeId_;
-  }
-
-  public final int getToolId()
-  {
-    return toolId_;
-  }
-
-  public final int getViewId()
-  {
-    return viewId_;
-  }
-
-  public final int getViewToolId()
-  {
-    return viewToolId_;
-  }
-
-  public final String getSubQueryKey()
-  {
-    return subQueryKey_;
-  }
-
-  public final FormTool getTargetFormTool()
-  {
-    Node node = nodeManager_.getNode(nodeId_);
-    if (node == null)
-      return null;
-
-    Tool tool = node.getToolManager().getTool(toolId_);
-
-    if (viewId_ != ActionInputs.VIEWID_DEFAULT)
-    {
-      ViewTool viewTool = (ViewTool)tool;
-      ToolManager viewToolManager = viewTool.getToolManager(viewId_);
-      if (viewToolManager != null)
-        tool = viewToolManager.getTool(viewToolId_);
-      else
-        tool = null;
-    }
-    return (FormTool)tool;
-  }
-  
-  public final Hashtable getParentQueryData()
-  {
-    return parentQueryData_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIAddToWSDLPerspectiveTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIAddToWSDLPerspectiveTool.java
deleted file mode 100644
index 97a68a3c0..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIAddToWSDLPerspectiveTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.AddToWSDLPerspectiveTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.UDDIAddToWSDLPerspectiveAction;
-
-public class UDDIAddToWSDLPerspectiveTool extends AddToWSDLPerspectiveTool {
-  public UDDIAddToWSDLPerspectiveTool(ToolManager toolManager, String alt) {
-    super(toolManager,alt);
-  }
-
-  public String getSelectToolActionHref(boolean forHistory) {
-    Node selectedNode = toolManager_.getNode();
-    return SelectPropertiesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-  }
-
-  public String getActionLink() {
-    Node selectedNode = toolManager_.getNode();
-    return UDDIAddToWSDLPerspectiveAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId());
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIImportWSDLToFileSystemTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIImportWSDLToFileSystemTool.java
deleted file mode 100644
index cba7ba0e0..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIImportWSDLToFileSystemTool.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.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ImportToFileSystemTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.UDDIImportWSDLToFileSystemAction;
-
-public class UDDIImportWSDLToFileSystemTool extends ImportToFileSystemTool
-{
-  public UDDIImportWSDLToFileSystemTool(ToolManager toolManager,String alt)
-  {
-    super(toolManager,alt);
-  }
-
-  public final String getSelectToolActionHref(boolean forHistory)
-  {
-    Node node = toolManager_.getNode();
-    return SelectPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
-  }
-
-  public final String getActionLink()
-  {
-    Node node = toolManager_.getNode();
-    return UDDIImportWSDLToFileSystemAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId());
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIImportWSDLToWorkbenchTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIImportWSDLToWorkbenchTool.java
deleted file mode 100644
index 627683b9c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIImportWSDLToWorkbenchTool.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.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ImportToWorkbenchTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction;
-
-public class UDDIImportWSDLToWorkbenchTool extends ImportToWorkbenchTool
-{
-  public UDDIImportWSDLToWorkbenchTool(ToolManager toolManager,String alt)
-  {
-    super(toolManager,alt);
-  }
-
-  public String getSelectToolActionHref(boolean forHistory)
-  {
-    Node node = toolManager_.getNode();
-    return SelectPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
-  }
-
-  public final String getFormLink()
-  {
-    return "uddi/forms/UDDIImportWSDLToWorkbenchForm.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDILaunchWebServiceWizardTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDILaunchWebServiceWizardTool.java
deleted file mode 100644
index 3f432c28f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDILaunchWebServiceWizardTool.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.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.LaunchWebServiceWizardTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction;
-
-public class UDDILaunchWebServiceWizardTool extends LaunchWebServiceWizardTool
-{
-  public UDDILaunchWebServiceWizardTool(ToolManager toolManager,String alt)
-  {
-    super(toolManager,alt);
-  }
-
-  public String getSelectToolActionHref(boolean forHistory)
-  {
-    Node node = toolManager_.getNode();
-    return SelectPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
-  }
-
-  public final String getFormLink()
-  {
-    return "uddi/forms/UDDILaunchWebServiceWizardForm.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIMainNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIMainNode.java
deleted file mode 100644
index f2ed89ee8..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIMainNode.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.uddi.perspective;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.UDDIMainElement;
-
-// Root node for the UDDI Navigator Tree View
-public class UDDIMainNode extends UDDINavigatorNode
-{
-  public UDDIMainNode(TreeElement element,NodeManager nodeManager)
-  {
-    super(element,nodeManager,1,"images/root_main.gif");
-    element.addListener(new ElementAdapter()
-    {
-      public void relAdded(RelAddEvent event)
-      {
-        String rel = event.getOutBoundRelName();
-        if (rel.equals(UDDIModelConstants.REL_REGISTRIES))
-        {
-          RegistryElement registryElement = (RegistryElement)event.getParentElement();
-          UDDIMainElement uddiMainElement = (UDDIMainElement)element_;
-          uddiMainElement.addRegistryName(registryElement.getName());
-          createChildNode(registryElement);
-        }
-      }
-
-      public void relRemoved(RelRemoveEvent event)
-      {
-        RegistryElement childElement = null;
-        if (event.getInBoundRelName().equals(UDDIModelConstants.REL_REGISTRIES))
-          childElement = (RegistryElement)event.getInboundElement();
-        else if (event.getOutBoundRelName().equals(UDDIModelConstants.REL_REGISTRIES))
-          childElement = (RegistryElement)event.getOutBoundElement();
-
-        if (childElement != null)
-        {
-          UDDIMainElement uddiMainElement = (UDDIMainElement)element_;
-          uddiMainElement.removeRegistryName(childElement.getName());
-          removeChildNode(childElement);
-        }
-      }
-    });
-  }
-
-  private final void createChildNode(TreeElement element)
-  {
-    RegistryElement regElement = (RegistryElement)element;
-    Enumeration userDefinedCategories = regElement.getUserDefinedCategories();
-    String imagePath;
-    if (userDefinedCategories != null && userDefinedCategories.hasMoreElements())
-      imagePath = RegistryNode.IMAGE_PATH_WITH_USER_DEFINED_CATEGORIES;
-    else
-      imagePath = RegistryNode.IMAGE_PATH_STANDARD;
-    
-    RegistryNode regNode = new RegistryNode(element,nodeManager_,nodeDepth_+1,imagePath);
-    addChild(regNode);
-  }
-
-  protected final void initTools()
-  {
-    Controller controller = nodeManager_.getController();
-    UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-    new OpenRegistryTool(toolManager_,uddiPerspective.getMessage("ALT_OPEN_REGISTRY"));
-  }
-  
-  // Given a node under a particular registry node, obtain the registry node.
-  public final RegistryNode getRegistryNode(Node currentNode)
-  {
-    RegistryNode regNode = null;
-    if (currentNode instanceof RegistryNode)
-    {
-      regNode = (RegistryNode)currentNode;
-    }
-    else if (currentNode instanceof QueryNode)
-    {
-      // Query -> Query folder -> Registry
-      regNode = (RegistryNode)(currentNode.getParent().getParent());
-    }
-    else if (currentNode instanceof QueryParentNode || currentNode instanceof PublishedItemsNode)
-    {
-      // Query folder -> Registry
-      regNode = (RegistryNode)(currentNode.getParent());
-    }
-    else if (currentNode instanceof BusinessNode || currentNode instanceof ServiceNode || currentNode instanceof ServiceInterfaceNode)
-    {
-      // itemNode -> Published Items folder -> Registry
-      // OR:
-      // itemNode -> QueryNode -> Query folder -> Registry
-      Node parentNode = currentNode.getParent();
-      if (parentNode instanceof QueryNode)
-        regNode = (RegistryNode)(parentNode.getParent().getParent());
-      else
-        regNode = (RegistryNode)parentNode.getParent();
-    }
-    return regNode;    
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDINavigatorFolderNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDINavigatorFolderNode.java
deleted file mode 100644
index 6bbf4cc5d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDINavigatorFolderNode.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.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FolderNode;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectNavigatorNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.ToggleNavigatorNodeAction;
-
-public abstract class UDDINavigatorFolderNode extends FolderNode
-{
-  public UDDINavigatorFolderNode(TreeElement element,NodeManager nodeManager,int nodeDepth)
-  {
-    super(element,nodeManager,nodeDepth);
-  }
-
-  // uddi/actions/ToggleNavigatorNodeAction.jsp?nodeId=...
-  public final String getToggleNodeActionHref()
-  {
-    return ToggleNavigatorNodeAction.getActionLink(nodeId_,isOpen_);
-  }
-
-  // uddi/actions/SelectNavigatorNodeAction.jsp?nodeId=...
-  public final String getLinkActionHref()
-  {
-    return SelectNavigatorNodeAction.getActionLink(nodeId_,false);
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDINavigatorNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDINavigatorNode.java
deleted file mode 100644
index bf59abf1d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDINavigatorNode.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.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectNavigatorNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.ToggleNavigatorNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-
-public abstract class UDDINavigatorNode extends Node
-{
-  public UDDINavigatorNode(TreeElement element,NodeManager nodeManager,int nodeDepth,String imagePath)
-  {
-    super(element,nodeManager,nodeDepth,imagePath);
-  }
-
-  // uddi/actions/ToggleNavigatorNodeAction.jsp?nodeId=...
-  public final String getToggleNodeActionHref()
-  {
-    return ToggleNavigatorNodeAction.getActionLink(nodeId_,isOpen_);
-  }
-
-  // uddi/actions/SelectNavigatorNodeAction.jsp?nodeId=...
-  public final String getLinkActionHref()
-  {
-    return SelectNavigatorNodeAction.getActionLink(nodeId_,false);
-  }
-
-  public void addAuthenticationProperties(RegistryElement regElement)
-  {
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIPerspective.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIPerspective.java
deleted file mode 100644
index 7285e22eb..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIPerspective.java
+++ /dev/null
@@ -1,501 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.uddi.perspective;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Properties;
-import java.util.Vector;
-import javax.servlet.ServletContext;
-import org.eclipse.wst.ws.internal.datamodel.BasicModel;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.favorites.FavoritesRegistryTypeDefault;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.AddRegistryToUDDIPerspectiveAction;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesMainElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIRegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIRegistryFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Perspective;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.OpenRegistryAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.RegFindServiceUUIDAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SwitchPerspectiveFromUDDIAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.CategoryModel;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.UDDIMainElement;
-import org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.util.URLUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.eclipse.wst.ws.internal.parser.favorites.IFavoritesUDDIRegistry;
-import org.uddi4j.datatype.tmodel.TModel;
-
-public class UDDIPerspective extends Perspective
-{
-  private Hashtable knownRegistries_;
-  private IFavoritesUDDIRegistry ibmPublicUDDITestRegistry_;
-  private Model navigatorModel_;
-  private NodeManager navigatorManager_;
-  private int wsdlType_;
-  private Hashtable categoryManagers_;
-  String categoryTModelKey_;
-  
-  // Window sizes
-  private String perspectiveContentFramesetCols_;
-  private String savedPerspectiveContentFramesetCols_;
-  private String actionsContainerFramesetRows_;
-  private String savedActionsContainerFramesetRows_;
-
-  private final String IBM_TEST_REG_INQUIRY_URL = "http://uddi.ibm.com/testregistry/inquiryapi";
-  private final String IBM_TEST_REG_PUBLISH_URL = "https://uddi.ibm.com/testregistry/publishapi";
-
-  public UDDIPerspective(Controller controller)
-  {
-    super("uddi",controller);
-  }
-
-  public final void initPerspective(ServletContext application)
-  {
-    String defaultFavorites = controller_.getDefaultFavoritesLocation();
-	FavoritesRegistryTypeDefault favRegTypeDefault = new FavoritesRegistryTypeDefault(defaultFavorites);
-    IFavoritesUDDIRegistry[] favRegistriesDefault = favRegTypeDefault.getFavoritesUDDIRegistries();
-    knownRegistries_ = new Hashtable();
-    for (int i=0;i<favRegistriesDefault.length;i++)
-    {
-      if (favRegistriesDefault[i].getInquiryURL().equals(IBM_TEST_REG_INQUIRY_URL) && favRegistriesDefault[i].getPublishURL().equals(IBM_TEST_REG_PUBLISH_URL))
-        ibmPublicUDDITestRegistry_ = favRegistriesDefault[i];
-      knownRegistries_.put(favRegistriesDefault[i].getInquiryURL(),favRegistriesDefault[i]);
-    }
-    if (ibmPublicUDDITestRegistry_ == null && favRegistriesDefault.length > 0)
-      ibmPublicUDDITestRegistry_ = favRegistriesDefault[0];
-    
-    navigatorModel_ = new BasicModel("uddiModel");
-    UDDIMainElement uddiMainElement = new UDDIMainElement(getMessage("NODE_NAME_UDDI_MAIN"),navigatorModel_);
-    navigatorModel_.setRootElement(uddiMainElement);
-    navigatorManager_ = new NodeManager(controller_);
-    UDDIMainNode uddiMainNode = new UDDIMainNode(uddiMainElement,navigatorManager_);
-    navigatorManager_.setRootNode(uddiMainNode);
-
-    wsdlType_ = UDDIActionInputs.WSDL_TYPE_SERVICE_INTERFACE;
-    categoryManagers_ = new Hashtable();
-    
-    // Initialize the default category models.
-    if (application.getAttribute("commonCategoryModels") == null)
-    {
-      synchronized (application)
-      {
-        if (application.getAttribute("commonCategoryModels") == null)
-        {
-          Hashtable commonCategoryModels = new Hashtable();
-		  
-          CategoryModel naicsModel = new CategoryModel();
-          naicsModel.setServletContext(application);
-          naicsModel.setDefaultDataFile("/uddi/data/naics-data.txt");
-          naicsModel.setDisplayName(getMessage("FORM_OPTION_CATEGORY_NAICS"));
-          naicsModel.setTModelKey(TModel.NAICS_TMODEL_KEY);
-          commonCategoryModels.put(TModel.NAICS_TMODEL_KEY,naicsModel);
-          
-          CategoryModel unspscModel = new CategoryModel();
-		  unspscModel.setServletContext(application);
-          unspscModel.setDefaultDataFile("/uddi/data/unspsc-data.txt");
-          unspscModel.setDisplayName(getMessage("FORM_OPTION_CATEGORY_UNSPSC_73"));
-          unspscModel.setTModelKey(TModel.UNSPSC_73_TMODEL_KEY);
-          commonCategoryModels.put(TModel.UNSPSC_73_TMODEL_KEY,unspscModel);
-          
-          CategoryModel geoModel = new CategoryModel();
-		  geoModel.setServletContext(application);
-          geoModel.setDefaultDataFile("/uddi/data/geo-data.txt");
-          geoModel.setDisplayName(getMessage("FORM_OPTION_CATEGORY_GEO"));
-          geoModel.setTModelKey(TModel.ISO_CH_TMODEL_KEY);
-          commonCategoryModels.put(TModel.ISO_CH_TMODEL_KEY,geoModel);
-          
-          application.setAttribute("commonCategoryModels",commonCategoryModels);
-        }
-      }
-    }
-    categoryTModelKey_ = null;
-    
-    // Starting frameset sizes.
-    if (!DirUtils.isRTL())
-      perspectiveContentFramesetCols_ = "30%,*";
-    else
-      perspectiveContentFramesetCols_ = "*,30%";
-    savedPerspectiveContentFramesetCols_ = perspectiveContentFramesetCols_;
-    actionsContainerFramesetRows_ = "75%,*";
-    savedActionsContainerFramesetRows_ = actionsContainerFramesetRows_;
-  }
-  
-  public final Hashtable getKnownRegistries()
-  {
-    // We must always query the favorites to see if additional registries were added over time. This property cannot be cached.
-    FavoritesMainElement favMainElement = (FavoritesMainElement)(controller_.getFavoritesPerspective().getNodeManager().getRootNode().getTreeElement());
-    FavoritesUDDIRegistryFolderElement favRegFolderElement = favMainElement.getFavoritesUDDIRegistryFolderElement();
-    Enumeration e = favRegFolderElement.getAllFavorites();
-    while (e.hasMoreElements())
-    {
-      FavoritesUDDIRegistryElement favRegElement = (FavoritesUDDIRegistryElement)e.nextElement();
-      String inquiryURL = favRegElement.getInquiryURL();
-      if (knownRegistries_.get(inquiryURL) == null)
-        knownRegistries_.put(inquiryURL,favRegElement.getIFavoritesUDDIRegistryInterface());
-    }
-    return knownRegistries_;
-  }
-
-  public final String getKnownRegistryPublishURL(String inquiryURL)
-  {
-    IFavoritesUDDIRegistry knownRegistry = (IFavoritesUDDIRegistry)getKnownRegistries().get(inquiryURL);
-    if (knownRegistry != null)
-    {
-      String publishURL = knownRegistry.getPublishURL();
-      if (Validator.validateURL(publishURL))
-        return publishURL;
-    }
-    return null;
-  }
-
-  public final String getKnownRegistryRegistrationURL(String inquiryURL)
-  {
-    IFavoritesUDDIRegistry knownRegistry = (IFavoritesUDDIRegistry)getKnownRegistries().get(inquiryURL);
-    if (knownRegistry != null)
-    {
-      String registrationURL = knownRegistry.getRegistrationURL();
-      if (Validator.validateURL(registrationURL))
-        return registrationURL;
-    }
-    return null;    
-  }
-
-  public final IFavoritesUDDIRegistry getIBMPublicUDDITestRegistry()
-  {
-    return ibmPublicUDDITestRegistry_;
-  }
-  
-  public final void preloadUDDIRegistries(String[] inquiryURLs, String[] publishURLs)
-  {
-    if (inquiryURLs != null)
-    {
-      Hashtable knownRegistries = getKnownRegistries();
-      StringBuffer directoryBuffer = new StringBuffer();
-      for (int i = 0; i < inquiryURLs.length; i++)
-      {
-		String inquiryURL = URLUtils.decode(inquiryURLs[i]);
-        String publishURL = null;
-        String regName = null;
-        String registrationURL = null;
-        // continue to the next registry if inquiryURL does not exist
-        if (!Validator.validateURL(inquiryURL))
-          continue;
-        // populate and run an OpenRegistryAction
-        OpenRegistryAction action = new OpenRegistryAction(controller_);
-        Hashtable propertyTable = action.getPropertyTable();
-        IFavoritesUDDIRegistry knownRegistry = (IFavoritesUDDIRegistry)knownRegistries.get(inquiryURL);
-        boolean checkForUserDefinedCategories = false;
-        File directoryFile = null;
-        if (knownRegistry != null)
-        {
-          publishURL = knownRegistry.getPublishURL();
-          regName = knownRegistry.getName();
-          registrationURL = knownRegistry.getRegistrationURL();
-          directoryBuffer.setLength(0);
-          FavoritesUDDIRegistryFolderElement.formCategoriesDirectory(directoryBuffer,controller_.getServletEngineStateLocation(),regName);
-          directoryFile = new File(directoryBuffer.toString());
-          if (directoryFile.exists() && directoryFile.listFiles().length > 0)
-            checkForUserDefinedCategories = true;
-        }
-        if (regName == null)
-          regName = inquiryURL;
-        if (publishURL == null && publishURLs != null && i < publishURLs.length && publishURLs[i] != null) {
-          publishURL = URLUtils.decode(publishURLs[i]);
-        }  
-        // populate the action
-        propertyTable.put(UDDIActionInputs.INQUIRY_URL, inquiryURL);
-        propertyTable.put(UDDIActionInputs.REGISTRY_NAME, regName);
-        if (Validator.validateURL(publishURL))
-          propertyTable.put(UDDIActionInputs.PUBLISH_URL, publishURL);
-        if (Validator.validateURL(registrationURL))
-          propertyTable.put(UDDIActionInputs.REGISTRATION_URL, registrationURL);
-          
-        // Check if private registry category information is available for this registry.
-        directoryBuffer.setLength(0);
-        String encodedInquiryURL = URLUtils.encode(inquiryURL);
-        directoryBuffer.append(controller_.getServletEngineStateLocation()).append(encodedInquiryURL).append(".properties");
-        directoryFile = new File(directoryBuffer.toString());
-        if (directoryFile.exists())
-        {
-          try
-          {
-            Properties p = new Properties();
-            FileInputStream fin = new FileInputStream(directoryFile);
-            p.load(fin);
-            fin.close();
-            directoryFile.delete();
-            String dataDirectory = p.getProperty(UDDIActionInputs.CATEGORIES_DIRECTORY);
-            if (dataDirectory != null)
-              propertyTable.put(UDDIActionInputs.CATEGORIES_DIRECTORY,dataDirectory);
-            checkForUserDefinedCategories = true;
-          }
-          catch (IOException e)
-          {
-            checkForUserDefinedCategories = false;
-          }
-        }
-
-        if (checkForUserDefinedCategories)
-          propertyTable.put(UDDIActionInputs.CHECK_USER_DEFINED_CATEGORIES,Boolean.TRUE);
-        else
-          propertyTable.remove(UDDIActionInputs.CHECK_USER_DEFINED_CATEGORIES);
-                
-        // run the action
-        action.run();
-        
-        RegistryElement regElement = (RegistryElement)(navigatorManager_.getSelectedNode().getTreeElement());
-        Enumeration userDefinedCategories = regElement.getUserDefinedCategories();
-        if (userDefinedCategories != null && userDefinedCategories.hasMoreElements())
-        {
-          AddRegistryToUDDIPerspectiveAction action2 = new AddRegistryToUDDIPerspectiveAction(controller_);
-          String categoriesDirectory = regElement.getCategoriesDirectory();
-          if (categoriesDirectory != null)
-            action2.linkCategoryModelsWithSavedData(userDefinedCategories,categoriesDirectory);
-          else
-            action2.linkCategoryModelsWithSavedData(regElement.getName(),userDefinedCategories);
-        }
-      }
-      if (inquiryURLs.length > 0)
-        controller_.setCurrentPerspective(ActionInputs.PERSPECTIVE_UDDI);
-    }
-  }
-  
-  // Preconditions: 
-  // serviceNames and serviceKeys have length >= 1.
-  // regNode != null
-  private final void preloadServicesForRegistry(RegistryNode regNode,String[] serviceNames,String[] serviceKeys)
-  {
-    int regNodeId = regNode.getNodeId();
-    for (int i=0;i<serviceKeys.length;i++)
-    {
-      navigatorManager_.setSelectedNodeId(regNodeId);
-      RegFindServiceUUIDAction action = new RegFindServiceUUIDAction(controller_);
-      Hashtable propertyTable = action.getPropertyTable();
-      propertyTable.put(UDDIActionInputs.QUERY_NAME,serviceNames[i]);
-      propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY,serviceKeys[i]);
-      action.run();
-      navigatorManager_.makeSelectedNodeVisible();
-    }
-  }
-  
-  public final void preloadServices(String[] inquiryURLs,String[] serviceNames,String[] serviceKeys)
-  {
-    // The algorithm will search for each service key in each inquiry URL.
-    if (serviceKeys != null && serviceNames != null && serviceNames.length == serviceKeys.length)
-    {
-      for (int i=0;i<serviceKeys.length;i++)
-      {
-        if (inquiryURLs != null)
-        {
-          // Eliminate duplicate inquiry URLs.
-          Hashtable inquiryURLsHash = new Hashtable();
-          for (int j=0;j<inquiryURLs.length;j++)
-            inquiryURLsHash.put(inquiryURLs[j],Boolean.TRUE);
-          // Loop through all the available registries and use them if possible.
-          Node uddiMainNode = navigatorManager_.getRootNode();
-          Vector registryNodes = uddiMainNode.getChildNodes();
-          for (int k=0;k<registryNodes.size();k++)
-          {
-            RegistryNode regNode = (RegistryNode)registryNodes.elementAt(k);
-            RegistryElement regElement = (RegistryElement)regNode.getTreeElement();
-            String existingRegistryInquiryURL = regElement.getInquiryURL();
-            if (inquiryURLsHash.get(existingRegistryInquiryURL) != null)
-            {
-              preloadServicesForRegistry(regNode,serviceNames,serviceKeys);
-              inquiryURLsHash.remove(existingRegistryInquiryURL);
-            }
-          }
-          Enumeration inquiryURLsEnum = inquiryURLsHash.keys();
-          while (inquiryURLsEnum.hasMoreElements())
-          {
-            String inquiryURL = (String)inquiryURLsEnum.nextElement();
-            preloadUDDIRegistries(new String[] {inquiryURL},null);
-            RegistryNode regNode = (RegistryNode)navigatorManager_.getSelectedNode();
-            preloadServicesForRegistry(regNode,serviceNames,serviceKeys);
-          }
-        }
-      }
-    }
-  }
-
-  public final void setCategoryTModelKey(String categoryTModelKey)
-  {
-    categoryTModelKey_ = categoryTModelKey;
-  }
-  
-  public final String getCategoryTModelKey()
-  {
-    return categoryTModelKey_;
-  }
-  
-  private final void initCategoryBrowser(CategoryModel categoryModel,NodeManager nodeManager)
-  {
-    TreeElement categoryRootElement = (TreeElement)categoryModel.getRootElement();
-    RootCategoryNode rootCategoryNode = new RootCategoryNode(categoryRootElement,nodeManager);
-    nodeManager.setRootNode(rootCategoryNode);
-    rootCategoryNode.createChildren();
-  }
-  
-  public final NodeManager getCategoryManager()
-  {
-    return (NodeManager)categoryManagers_.get(categoryTModelKey_);
-  }
-  
-  public final NodeManager getCategoryManager(CategoryModel categoryModel)
-  {
-    String tModelKey = categoryModel.getTModelKey();
-    NodeManager categoryManager = (NodeManager)categoryManagers_.get(tModelKey);
-    if (categoryManager == null)
-    {
-      categoryManager = new NodeManager(controller_);
-      initCategoryBrowser(categoryModel,categoryManager);
-      categoryManagers_.put(tModelKey,categoryManager);      
-    }
-    return categoryManager;
-  }
-
-  public final NodeManager getNavigatorManager()
-  {
-    return navigatorManager_;
-  }
-  
-  public final NodeManager getNodeManager()
-  {
-    return getNavigatorManager();
-  }
-
-  public final void setWSDLType(int wsdlType)
-  {
-    wsdlType_ = wsdlType;
-  }
-
-  public final int getWSDLType()
-  {
-    return wsdlType_;
-  }
-
-  public final String getPerspectiveContentPage()
-  {
-    return "uddi/uddi_perspective_content.jsp";
-  }
-
-  public final int getPerspectiveId()
-  {
-    return ActionInputs.PERSPECTIVE_UDDI;
-  }
-  
-  public final String getFramesetsFile()
-  {
-    return "uddi/scripts/uddiframesets.jsp";
-  }
-  
-  public final String getProcessFramesetsForm()
-  {
-    return "uddi/forms/ProcessUDDIFramesetsForm.jsp";
-  }
-
-  public final String getPanesFile()
-  {
-    return "uddi/scripts/uddipanes.jsp";
-  }
-  
-  public final String getTreeContentVar()
-  {
-    return "navigatorContent";
-  }
-
-  public final String getTreeContentPage()
-  {
-    return "uddi/navigator_content.jsp";
-  }
-
-  public final String getPropertiesContainerVar()
-  {
-    return "propertiesContainer";
-  }
-
-  public final String getPropertiesContainerPage()
-  {
-    return "uddi/properties_container.jsp";
-  }
-
-  public final String getStatusContentVar()
-  {
-    return "statusContent";
-  }
-
-  public final String getStatusContentPage()
-  {
-    return "uddi/status_content.jsp";
-  }
-  
-  public final String getSavePerspectiveActionLink()
-  {
-    //return SaveUDDIPerspectiveAction.getActionLink();
-    return "";
-  }
-  
-  public final String getPerspectiveContentFramesetCols()
-  {
-    return perspectiveContentFramesetCols_;
-  }
-  
-  public final void setPerspectiveContentFramesetCols(String cols)
-  {
-    perspectiveContentFramesetCols_ = cols;
-  }
-  
-  public final void setSavedPerspectiveContentFramesetCols(String cols)
-  {
-    savedPerspectiveContentFramesetCols_ = cols;
-  }
-  
-  public final String getSavedPerspectiveContentFramesetCols()
-  {
-    return savedPerspectiveContentFramesetCols_;
-  }
-  
-  public final String getActionsContainerFramesetRows()
-  {
-    return actionsContainerFramesetRows_;
-  }
-  
-  public final void setActionsContainerFramesetRows(String rows)
-  {
-    actionsContainerFramesetRows_ = rows;
-  }
-  
-  public final void setSavedActionsContainerFramesetRows(String rows)
-  {
-    savedActionsContainerFramesetRows_ = rows;
-  }
-  
-  public final String getSavedActionsContainerFramesetRows()
-  {
-    return savedActionsContainerFramesetRows_;
-  }
-  
-  public final String getSwitchPerspectiveFormActionLink(int targetPerspectiveId,boolean forHistory)
-  {
-    return SwitchPerspectiveFromUDDIAction.getFormActionLink(targetPerspectiveId,forHistory);
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UnpublishTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UnpublishTool.java
deleted file mode 100644
index 8cfcd0575..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UnpublishTool.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.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-
-public class UnpublishTool extends FormTool
-{
-  public UnpublishTool(ToolManager toolManager, String enableImage, String highlightImage, String alt)
-  {
-    super(toolManager, enableImage, highlightImage, alt);
-  }
-
-  public String getSelectToolActionHref(boolean forHistory)
-  {
-    Node node = toolManager_.getNode();
-    return SelectPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
-  }
-
-  public void addAuthenticationProperties(RegistryElement regElement)
-  {
-    String publishURL = regElement.getPublishURL();
-    String userId = regElement.getUserId();
-    String password = regElement.getCred();
-
-    if (publishURL == null)
-      publishURL = "";
-    if (userId == null)
-      userId = "";
-    if (password == null)
-      password = "";
-
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
-  }
-
-  public String getFormLink()
-  {
-    return "uddi/forms/UnpublishForm.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/util/Uddi4jHelper.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/util/Uddi4jHelper.java
deleted file mode 100644
index 10e3b8c88..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/util/Uddi4jHelper.java
+++ /dev/null
@@ -1,396 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.uddi.util;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-import javax.wsdl.Binding;
-import javax.wsdl.Definition;
-import javax.wsdl.Import;
-import javax.wsdl.Message;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-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.internal.parser.discovery.WebServicesParserExt;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.OverviewDoc;
-import org.uddi4j.datatype.OverviewURL;
-import org.uddi4j.datatype.binding.AccessPoint;
-import org.uddi4j.datatype.binding.BindingTemplate;
-import org.uddi4j.datatype.binding.BindingTemplates;
-import org.uddi4j.datatype.binding.InstanceDetails;
-import org.uddi4j.datatype.binding.TModelInstanceDetails;
-import org.uddi4j.datatype.binding.TModelInstanceInfo;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.response.TModelDetail;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.util.CategoryBag;
-import org.uddi4j.util.KeyedReference;
-import org.w3c.dom.CharacterData;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class Uddi4jHelper
-{
-  public final KeyedReference getWSDLKeyedReference()
-  {
-    KeyedReference keyRef = new KeyedReference("types", "wsdlSpec");
-    keyRef.setTModelKey("UUID:C1ACF26D-9672-4404-9D70-39B756E62AB4");
-    return keyRef;
-  }
-
-  public final TModel newTModel(String wsdlUrl) throws WSDLException
-  {
-    return newTModel(wsdlUrl, getWSDLDefinition(wsdlUrl));
-  }
-
-  public final TModel newTModel(String wsdlUrl, Definition def) throws WSDLException
-  {
-    TModel tModel = new TModel();
-    tModel.setTModelKey("");
-    tModel.setName(def.getTargetNamespace());
-    tModel.setDefaultDescriptionString("");
-    OverviewDoc overviewDoc = new OverviewDoc();
-    overviewDoc.setOverviewURL(wsdlUrl);
-    tModel.setOverviewDoc(overviewDoc);
-    CategoryBag catBag = new CategoryBag();
-    Vector keyRefVector = new Vector();
-    keyRefVector.add(getWSDLKeyedReference());
-    catBag.setKeyedReferenceVector(keyRefVector);
-    tModel.setCategoryBag(catBag);
-    return tModel;
-  }
-
-  public final BusinessService newBusinessService(String wsdlUrl, Hashtable tModelsTable) throws WSDLException
-  {
-    return newBusinessService(wsdlUrl, getWSDLDefinition(wsdlUrl), tModelsTable);
-  }
-
-  public final BusinessService newBusinessService(String wsdlUrl, Definition def, Hashtable tModelsTable) throws WSDLException
-  {
-    BusinessService bs = new BusinessService();
-    bs.setServiceKey("");
-    BindingTemplates bindingTemplates = new BindingTemplates();
-    Vector bindingTemplateVector = new Vector();
-    Service[] services = (Service[])def.getServices().values().toArray(new Service[0]);
-    if (services.length > 0)
-    {
-      Port[] ports = (Port[])services[0].getPorts().values().toArray(new Port[0]);
-      for (int i = 0; i < ports.length; i++)
-      {
-        TModelInstanceDetails tModelDetails = new TModelInstanceDetails();
-        Vector tModelInfoVector = new Vector();
-        TModel tModel = (TModel)tModelsTable.get(ports[i].getBinding().getPortType().getQName().getNamespaceURI());
-        tModelInfoVector.add(createTModelInstanceInfo(wsdlUrl, ports[i], tModel.getTModelKey()));
-        tModelDetails.setTModelInstanceInfoVector(tModelInfoVector);
-        BindingTemplate bindingTemplate = new BindingTemplate();
-        bindingTemplate.setDefaultDescriptionString(createDescription(ports[i]));
-        bindingTemplate.setAccessPoint(createAccessPoint(ports[i]));
-        bindingTemplate.setTModelInstanceDetails(tModelDetails);
-        bindingTemplate.setBindingKey("");
-        bindingTemplateVector.add(bindingTemplate);
-      }
-    }
-    bindingTemplates.setBindingTemplateVector(bindingTemplateVector);
-    bs.setBindingTemplates(bindingTemplates);
-    return bs;
-  }
-  
-  public final BusinessService newBusinessService(String wsdlUrl, Definition def, TModel[] tModels) throws WSDLException
-  {
-    BusinessService bs = new BusinessService();
-    bs.setServiceKey("");
-    BindingTemplates bindingTemplates = new BindingTemplates();
-    Vector bindingTemplateVector = new Vector();
-    Service[] services = (Service[])def.getServices().values().toArray(new Service[0]);
-    if (services.length > 0)
-    {
-      Port[] ports = (Port[])services[0].getPorts().values().toArray(new Port[0]);
-      for (int i = 0; i < ports.length; i++)
-      {
-        for (int j = 0; j < tModels.length; j++)
-        {
-          TModelInstanceDetails tModelDetails = new TModelInstanceDetails();
-          Vector tModelInfoVector = new Vector();
-          tModelInfoVector.add(createTModelInstanceInfo(wsdlUrl, ports[i], tModels[j].getTModelKey()));
-          tModelDetails.setTModelInstanceInfoVector(tModelInfoVector);
-          BindingTemplate bindingTemplate = new BindingTemplate();
-          bindingTemplate.setDefaultDescriptionString(createDescription(ports[i]));
-          bindingTemplate.setAccessPoint(createAccessPoint(ports[i]));
-          bindingTemplate.setTModelInstanceDetails(tModelDetails);
-          bindingTemplate.setBindingKey("");
-          bindingTemplateVector.add(bindingTemplate);
-        }
-      }
-    }
-    bindingTemplates.setBindingTemplateVector(bindingTemplateVector);
-    bs.setBindingTemplates(bindingTemplates);
-    return bs;
-  }
-
-  public Definition getWSDLDefinition(String wsdlUrl) throws WSDLException
-  {
-    try
-    {
-      WebServicesParserExt parser = new WebServicesParserExt();
-      String proxySet = System.getProperty("http.proxySet");
-      if (proxySet != null && proxySet.equals("true"))
-      {
-        parser.setHTTPBasicAuthUsername(System.getProperty("http.proxyUserName"));
-        parser.setHTTPBasicAuthPassword(System.getProperty("http.proxyPassword"));
-      }
-      return parser.getWSDLDefinitionVerbose(wsdlUrl);
-    }
-    catch (Exception e)
-    {
-      throw new WSDLException(WSDLException.PARSER_ERROR, e.getMessage(), e);
-    }
-  }
-
-  private final String createDescription(Port port)
-  {
-    String desc = null;
-    Element e = port.getDocumentationElement();
-    if (e != null)
-    {
-      Node node = e.getFirstChild();
-      StringBuffer sb = new StringBuffer();
-      while (node != null)
-      {
-        switch (node.getNodeType())
-        {
-          case Node.TEXT_NODE:
-          case Node.CDATA_SECTION_NODE:
-            sb.append(((CharacterData)node).getData());
-          default:
-            node = node.getNextSibling();
-            break;
-        }
-      }
-      desc = sb.toString();
-    }
-    return desc;
-  }
-  
-  private final TModelInstanceInfo createTModelInstanceInfo(String wsdlUrl, Port port, String tModelKey)
-  {
-    InstanceDetails details = new InstanceDetails();
-    OverviewDoc overviewDoc = new OverviewDoc();
-    TModelInstanceInfo tModelInfo = new TModelInstanceInfo();
-    StringBuffer overviewURLString = new StringBuffer(wsdlUrl);
-    String portName = port.getName();
-    if (portName != null)
-    {  
-      overviewURLString.append("#");
-      overviewURLString.append(portName);
-    }
-    overviewDoc.setOverviewURL(new OverviewURL(overviewURLString.toString()));
-    details.setOverviewDoc(overviewDoc);
-    tModelInfo.setInstanceDetails(details);
-    if (tModelKey != null)
-      tModelInfo.setTModelKey(tModelKey);
-    return tModelInfo;
-  }
-  
-  private final AccessPoint createAccessPoint(Port port)
-  {
-    AccessPoint accessPoint = null;
-    List list = port.getExtensibilityElements();
-    for (int j = 0; j < list.size(); j++)
-     {
-      ExtensibilityElement extElement = (ExtensibilityElement)list.get(j);
-      if (extElement instanceof SOAPAddress)
-       {  
-        String locationURI = ((SOAPAddress)extElement).getLocationURI();
-        accessPoint = new AccessPoint(locationURI, getURLType(locationURI));
-        break;
-      }
-      else if (extElement instanceof HTTPAddress)
-       {
-        String locationURI = ((HTTPAddress)extElement).getLocationURI();
-        accessPoint = new AccessPoint(locationURI, getURLType(locationURI));
-        break;
-      }
-    }
-    return accessPoint;
-  }
-  
-  private final String URL_TYPE_OTHER = "other";
-  private final String URL_TYPES = "http https mail ftp fax phone other";
-  
-  private final String getURLType(String url)
-  {
-    int i = url.indexOf(":");
-    String type;
-    if (i == -1)
-      type = URL_TYPE_OTHER;
-    else
-    {
-      type = url.substring(0, i);
-      if (type.equals("") || URL_TYPES.indexOf(type) == -1)
-        type = URL_TYPE_OTHER;
-    }
-    return type;
-  }
-  
-  public boolean isMonolithicWSDL(Definition def)
-  {
-    return hasMessage(def) && hasPortType(def) && hasBinding(def) && hasService(def);
-  }
-  
-  public boolean isServiceImplement(Definition def)
-  {
-    return hasImport(def) && hasService(def);
-  }
-  
-  public boolean isServiceInterface(Definition def)
-  {
-    return hasMessage(def) && hasPortType(def) && hasBinding(def);
-  }
-  
-  public boolean isServiceInterfaceWithBindingsOnly(Definition def)
-  {
-    return !hasService(def) && hasBinding(def);
-  }
-
-  private boolean hasMessage(Definition def)
-  {
-    for(Iterator it = def.getMessages().values().iterator(); it.hasNext();)
-      if (!((Message)it.next()).isUndefined())
-        return true;
-    return false;
-  }
-  
-  private boolean hasPortType(Definition def)
-  {
-    for(Iterator it = def.getPortTypes().values().iterator(); it.hasNext();)
-      if (!((PortType)it.next()).isUndefined())
-        return true;
-    return false;
-  }
-  
-  private boolean hasBinding(Definition def)
-  {
-    for(Iterator it = def.getBindings().values().iterator(); it.hasNext();)
-      if (!((Binding)it.next()).isUndefined())
-        return true;
-    return false;
-  }
-  
-  private boolean hasService(Definition def)
-  {
-    return !def.getServices().isEmpty();
-  }
-
-  private boolean hasImport(Definition def)
-  {
-    return !def.getImports().isEmpty();
-  }
-  
-  public String[] getImports(Definition def, String wsdlUrl)
-  {
-    Import[] imports = (Import [])def.getImports().values().toArray(new Import[0]);
-    String[] importStrings = new String[imports.length];
-    String s;
-    if (wsdlUrl != null && wsdlUrl.indexOf('/') != -1)
-      s = wsdlUrl.substring(0, wsdlUrl.lastIndexOf('/')+1);
-    else
-      s = "";
-    for (int i = 0; i < importStrings.length; i++)
-    {
-      StringBuffer sb = new StringBuffer();
-      String locationURI = imports[i].getLocationURI();
-      if (locationURI.indexOf(':') != -1)
-        sb.append(locationURI);
-      else
-        sb.append(s).append(locationURI);
-      importStrings[i] = sb.toString();
-    }
-    return importStrings;
-  }
-
-  public String getWSDL(BusinessService bs, UDDIProxy proxy)
-  {
-    Vector bindingTemplateVector = bs.getBindingTemplates().getBindingTemplateVector();
-    if (bindingTemplateVector.size() > 0)
-    {
-      BindingTemplate bt = (BindingTemplate)bindingTemplateVector.get(0);
-      TModelInstanceDetails tModelDetails = bt.getTModelInstanceDetails();
-      if (tModelDetails != null)
-      {
-        Vector tModelInfoVector = tModelDetails.getTModelInstanceInfoVector();
-        if (tModelInfoVector.size() > 0)
-        {
-          TModelInstanceInfo tModelInfo = (TModelInstanceInfo)tModelInfoVector.get(0);
-          InstanceDetails details = tModelInfo.getInstanceDetails();
-          if (details != null)
-          {
-            OverviewDoc overviewDoc = details.getOverviewDoc();
-            if (overviewDoc != null)
-              return parse(overviewDoc.getOverviewURLString());
-          }
-          else if (proxy != null)
-          {
-          	String tModelKey = tModelInfo.getTModelKey();
-          	if (tModelKey != null)
-          	{
-          	  try
-			  {
-          	    TModelDetail t = proxy.get_tModelDetail(tModelKey);
-          	    if (t != null)
-          	    {
-                  Vector tModelVector = t.getTModelVector();
-                  if (tModelVector != null && tModelVector.size() > 0)
-                    return getWSDL((TModel)tModelVector.get(0));
-          	    }
-              }
-          	  catch (UDDIException uddie)
-			  {
-          	  }
-          	  catch (TransportException te)
-			  {
-          	  }
-          	}
-          }
-        }
-      }
-    }
-    return null;
-  }
-  
-  public String getWSDL(TModel tModel)
-  {
-    OverviewDoc overviewDoc = tModel.getOverviewDoc();
-    if (overviewDoc != null)
-      return parse(overviewDoc.getOverviewURLString());
-    else
-      return null;
-  }
-  
-  private String parse(String s)
-  {
-    if (s != null && s.length() > 0)
-    {
-      int index = s.indexOf('#');
-      if (index != -1)
-        return s.substring(0, index);
-    }
-    return s;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/CharArrayWrapper.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/CharArrayWrapper.java
deleted file mode 100644
index d54f81c26..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/CharArrayWrapper.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.ws.internal.explorer.platform.util;
-
-import java.io.CharArrayWriter;
-import java.io.PrintWriter;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
-
-public class CharArrayWrapper extends HttpServletResponseWrapper
-{
-	private CharArrayWriter charArrayWriter_;
-	
-	public CharArrayWrapper(HttpServletResponse response)
-	{
-		super(response);
-	  charArrayWriter_ = new CharArrayWriter();
-	}
-	
-	public PrintWriter getWriter()
-	{
-		return new PrintWriter(charArrayWriter_);
-	}
-	
-	public String toString()
-	{
-		return charArrayWriter_.toString();
-	}
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/DirUtils.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/DirUtils.java
deleted file mode 100644
index 2ba8bc5d6..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/DirUtils.java
+++ /dev/null
@@ -1,69 +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.explorer.platform.util;
-
-import java.util.Locale;
-import org.eclipse.core.runtime.Platform;
-
-public final class DirUtils
-{
-  public static boolean isRTL()
-  {
-    return "rtl".equals(getDir());
-  }
-
-  public static String getDir()
-  {
-    String rtl = "rtl";
-    String ltr = "ltr";
-
-    // from system property
-    String orientation = System.getProperty("eclipse.orientation"); //$NON-NLS-1$
-    if (rtl.equals(orientation)) //$NON-NLS-1$
-      return rtl;
-    else if (ltr.equals(orientation)) //$NON-NLS-1$
-      return ltr;
-
-    // from command line
-    String[] args = Platform.getCommandLineArgs();
-    for (int i = 0; i < args.length; i++)
-    {
-      if ("-dir".equalsIgnoreCase(args[i])) //$NON-NLS-1$
-      {
-        if ((i + 1) < args.length && "rtl".equalsIgnoreCase(args[i + 1])) //$NON-NLS-1$
-        {
-          return rtl;
-        }
-        return ltr;
-      }
-    }
-
-    // Check if the user property is set. If not do not
-    // rely on the vm.
-    if (System.getProperty("osgi.nl.user") == null) //$NON-NLS-1$
-      return ltr;
-
-    // guess from default locale
-    String locale = Platform.getNL();
-    if (locale == null)
-    {
-      locale = Locale.getDefault().toString();
-    }
-    if (locale.startsWith("ar") || locale.startsWith("fa") //$NON-NLS-1$//$NON-NLS-2$
-        || locale.startsWith("he") || locale.startsWith("iw") //$NON-NLS-1$//$NON-NLS-2$
-        || locale.startsWith("ur")) //$NON-NLS-1$
-    {
-      return rtl;
-    }
-    return ltr;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/HTMLUtils.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/HTMLUtils.java
deleted file mode 100644
index 7ebcb0ab9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/HTMLUtils.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.util;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import javax.servlet.http.HttpServletResponse;
-
-public final class HTMLUtils
-{
-  public static final String UTF8_ENCODING = "UTF-8";
-  public static final String LINE_BREAK = "<br>";
-  public static final String LINE_SEPARATOR = System.getProperties().getProperty("line.separator");
-
-  /**
-  * Get the HTML tag for an image.
-  * @return String The HTML tag for this image.
-  * @param HttpServletResponse To encode the src attribute.
-  * @param String src attribute defining the path to the image file. This must include the context path.
-  * @param String Optional alt text to be displayed with the image. Set this to null to disable the attribute.
-  * @param String Optional width of the rendered image. Set this to null to disable the attribute.
-  * @param String Optional height of the rendered imag. Set this to null to disable the attribute.
-  * @param Hashtable Optional key-value pairs of additional strings to be added as-is to the tag. Set this to null to disable.
-  * @return String The image tag.
-  */
-  public static final String getHTMLImageTag(HttpServletResponse response,String src,String alt,String width,String height,Hashtable additionalAttributes)
-  {
-    StringBuffer tag = new StringBuffer("<img src=\"");
-    tag.append(response.encodeURL(src)).append('\"');
-    if (alt != null)
-    {
-      tag.append(" alt=\"").append(alt).append('\"');
-      tag.append(" title=\"").append(alt).append('\"');
-    }
-    if (width != null)
-      tag.append(" width=").append(width);
-    if (height != null)
-      tag.append(" height=").append(height);
-    tag.append(" border=0");
-    if (additionalAttributes != null)
-    {
-      Enumeration keys = additionalAttributes.keys();
-      while (keys.hasMoreElements())
-      {
-        String key = (String)keys.nextElement();
-        tag.append(' ').append(key).append("=\"").append((String)additionalAttributes.get(key)).append('\"');
-      }
-    }
-    tag.append('>');
-    return tag.toString();
-  }
-
-  /**
-  * Get the HTML tag for this link. The complete tag consists of the open tag <a> followed by a subelement and, finally, by an end tag </a>.
-  * @return String The HTML tag of the link.
-  * @param HttpServletResponse To encode the href attribute.
-  * @param String The href attribute of the link. This must include the context path.
-  * @param String target Optional target attribute for the link. Set this to null to disable the attribute.
-  * @param String Optional name for the link. Set this to null to disable the attribute.
-  * @param String The label which acts as the subelement. i.e. <a>label</a>.
-  * @param Hashtable Optional key-value pairs of additional string attributes to be added as-is to the open tag. Set this to null to disable.
-  */
-  public static final String getHTMLLinkTag(HttpServletResponse response,String href,String target,String name,String label,Hashtable additionalAttributes)
-  {
-    StringBuffer tag = new StringBuffer("<a href=\"");
-    tag.append(response.encodeURL(href)).append('\"');
-    if (target != null)
-      tag.append(" target=\"").append(target).append('\"');
-    if (name != null)
-      tag.append(" name=\"").append(name).append('\"');
-    if (additionalAttributes != null)
-    {
-      Enumeration keys = additionalAttributes.keys();
-      while (keys.hasMoreElements())
-      {
-        String key = (String)keys.nextElement();
-        tag.append(' ').append(key).append("=\"").append((String)additionalAttributes.get(key)).append('\"');
-      }
-    }
-    tag.append('>');
-    tag.append(label);
-    tag.append("</a>");
-    return tag.toString();
-  }
-
-  /**
-  * Get the HTML tag for a red asterist.
-  * @return String The HTML tag for the red asterisk.
-  */
-  public static final String redAsterisk()
-  {
-    return "<font color=\"#ff0000\">*</font>";
-  }
-
-  /**
-  * Get the Javascript mangled version of a given input String.
-  * @return String The Javascript mangled String.
-  */
-  public static final String JSMangle(String input)
-  {
-    if (input == null)
-      return "";
-
-    StringBuffer mangledOutput = new StringBuffer();
-    for (int i=0;i<input.length();i++)
-    {
-      char c = input.charAt(i);
-      switch (c)
-      {
-        case '\n':
-          mangledOutput.append("\\n");
-          break;
-        case '\r':
-          mangledOutput.append("\\r");
-          break;
-        case '\\':
-        case '\"':
-        case '\'':
-          mangledOutput.append('\\');
-        default:
-          mangledOutput.append(c);
-      }
-    }
-    return mangledOutput.toString();
-  }
-
-  private static final String LESS_THAN = "<";
-  private static final String LESS_THAN_HTML_ENTITY = "&lt;";
-  private static final String GREATER_THAN = ">";
-  private static final String GREATER_THAN_HTML_ENTITY = "&gt;";
-  private static final String SPACE = " ";
-  private static final String SPACE_HTML_ENTITY = "&nbsp;";
-  private static final String AMPERSAND = "&";
-  private static final String AMPERSAND_HTML_ENTITY = "&amp;";
-  private static final String QUOTATION = "\"";
-  private static final String QUOTATION_HTML_ENTITY = "&quot;";
-
-  /**
-  * Replace special characters with HTML entities representing these characters.
-  * @return String The converted String. Note: Order is important so that corrected entity references are not re-mangled.
-  */
-  public static final String charactersToHTMLEntities(String s) {
-    s = stringReplace(s, AMPERSAND, AMPERSAND_HTML_ENTITY);
-    s = stringReplace(s, LESS_THAN, LESS_THAN_HTML_ENTITY);
-    s = stringReplace(s, GREATER_THAN, GREATER_THAN_HTML_ENTITY);
-    s = stringReplace(s, SPACE, SPACE_HTML_ENTITY);
-    s = stringReplace(s, QUOTATION, QUOTATION_HTML_ENTITY);
-    return s;
-  }
-
-  /**
-  * Replace HTML character entities with their associated characters.
-  * @return String The converted String.
-  */
-  public static final String htmlEntitiesToCharacters(String s) {
-    s = stringReplace(s, LESS_THAN_HTML_ENTITY, LESS_THAN);
-    s = stringReplace(s, GREATER_THAN_HTML_ENTITY, GREATER_THAN);
-    s = stringReplace(s, SPACE_HTML_ENTITY, SPACE);
-    s = stringReplace(s, AMPERSAND_HTML_ENTITY, AMPERSAND);
-    s = stringReplace(s, QUOTATION_HTML_ENTITY, QUOTATION);
-    return s;
-  }
-
-  private static final String stringReplace(String s, String oldString, String newString) {
-    String sCopy = s;
-    int fromIndex = 0;
-    int oldStringIndex = sCopy.indexOf(oldString, fromIndex);
-    StringBuffer sb = new StringBuffer();
-    while (oldStringIndex != -1) {
-      sb.setLength(0);
-      sb.append(sCopy.substring(0, oldStringIndex));
-      sb.append(newString);
-      sb.append(sCopy.substring(oldStringIndex + oldString.length(), sCopy.length()));
-      sCopy = sb.toString();
-      fromIndex = oldStringIndex + newString.length();
-      oldStringIndex = sCopy.indexOf(oldString, fromIndex);
-    }
-    return sCopy;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/MultipartFormDataException.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/MultipartFormDataException.java
deleted file mode 100644
index 39008b18c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/MultipartFormDataException.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.util;
-
-public final class MultipartFormDataException extends Throwable
-{
-  /**
-	 * Comment for <code>serialVersionUID</code>
-	 */
-	private static final long serialVersionUID = 3257845472227110961L;
-
-public MultipartFormDataException(String message)
-  {
-    super(message);
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/MultipartFormDataParser.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/MultipartFormDataParser.java
deleted file mode 100644
index 193036d21..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/MultipartFormDataParser.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.util;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-import javax.servlet.http.HttpServletRequest;
-
-public final class MultipartFormDataParser
-{
-  private Hashtable paramTable_;
-
-  private static final String HEADER_CONTENT_TYPE        = "Content-Type";
-  private static final String HEADER_MULTIPART           = "multipart";
-  private static final String HEADER_BOUNDARY            = "boundary=";
-  private static final String HEADER_CONTENT_DISPOSITION = "Content-Disposition: form-data";
-  private static final String HEADER_NAME                = "name=\"";
-
-  private static final byte PARSER_STATE_INITIAL         = 0;
-  private static final byte PARSER_STATE_BOUNDARY        = 1;
-  private static final byte PARSER_STATE_PARAMETER       = 2;
-  private static final byte PARSER_STATE_BLANK           = 3;
-  private static final byte PARSER_STATE_DATA            = 4;
-
-  private static String parserStates[] = {"initial","boundary","parameter name","blank line","data"};
-
-  public MultipartFormDataParser()
-  {
-  }
-  
-  public MultipartFormDataParser(Hashtable parameters)
-  {
-    paramTable_ = new Hashtable();
-    for (Iterator it = parameters.keySet().iterator(); it.hasNext();)
-    {
-      Object key = it.next();
-      Object value = parameters.get(key);
-      if (value instanceof List)
-      {
-        List list = (List)value;
-        for (Iterator it2 = list.iterator(); it2.hasNext();)
-          saveData(key.toString(), it2.next().toString());
-      }
-      else if (value.getClass().isArray())
-      {
-        Object[] array = (Object[])value;
-        for (int i = 0; i < array.length; i++)
-          saveData(key.toString(), array[i].toString());
-      }
-      else
-      {
-        saveData(key.toString(), value.toString());
-      }
-    }
-  }
-
-  /**
-   * Parse a multipart/form-data encoded post request with a given encoding.
-   * If the encoding is null, use the system default encoding. utf-8 is not a
-   * bad choice for the encoding.
-   */
-  public final void parseRequest(HttpServletRequest request,String encoding) throws MultipartFormDataException
-  {
-    // Content-Type header should have the form:
-    // multipart/form-data; boundary=...
-    //
-    // RFC2046 5.1.1 page 19, paragraph 2:
-    // The Content-Type field for multipart entities requires one parameter, "boundary" (no quotes)
-    String contentType = request.getHeader(HEADER_CONTENT_TYPE);
-    if (contentType == null || !contentType.startsWith(HEADER_MULTIPART) || contentType.indexOf(HEADER_BOUNDARY) == -1)
-      throw new MultipartFormDataException("Content-Type is not multipart/form-data");
-
-    // RFC2046 5.1.1 page 19, paragraph 4:
-    // The boundary value may be enclosed in double quotes. Strip these if they are present.
-    String boundary = contentType.substring(contentType.indexOf(HEADER_BOUNDARY)+HEADER_BOUNDARY.length(),contentType.length());
-    if (boundary.charAt(0) == '\"' && boundary.charAt(boundary.length()-1) == '\"')
-      boundary = boundary.substring(1,boundary.length()-1);
-
-    // RFC2046 5.1.1 page 19, paragraph 2:
-    // The boundary delimiter line is then defined as a line consisting entirely
-    // of two hyphen characters.
-    String delimiter = "--"+boundary;
-
-    if (paramTable_ == null)
-      paramTable_ = new Hashtable();
-    else
-      paramTable_.clear();
-
-    try
-    {
-      BufferedReader br = new BufferedReader(new InputStreamReader(request.getInputStream(),encoding));
-      String line = null;
-      String parameterName = null;
-      StringBuffer parameterValue = new StringBuffer();
-      byte currentParserState = PARSER_STATE_INITIAL;
-      while ((line = br.readLine()) != null)
-      {
-        // Lines appear in the following sequence.
-        // 1) boundary indicating the start of a new parameter and end of a data segment.
-        // 2) Content-Disposition: form-data; name="..." - the name of a new parameter.
-        // 3) a blank line
-        // 4) data
-        //
-        // For each parameter, the sequence is repeated.
-        if (line.startsWith(delimiter))
-        {
-          byte[] expectedParserStates = {PARSER_STATE_INITIAL,PARSER_STATE_DATA};
-          if (isValidParserState(currentParserState,expectedParserStates))
-          {
-            // Save any current data and prepare for a new parameter name.
-            if (parameterName != null)
-            {
-              saveData(parameterName,parameterValue.toString());
-              parameterName = null;
-              parameterValue.setLength(0);
-            }
-            currentParserState = PARSER_STATE_BOUNDARY;
-          }
-          else
-            throw new MultipartFormDataException(getParserExceptionMessage(currentParserState,expectedParserStates));
-        }
-        else if (line.startsWith(HEADER_CONTENT_DISPOSITION))
-        {
-          byte[] expectedParserStates = {PARSER_STATE_BOUNDARY};
-          if (isValidParserState(currentParserState,expectedParserStates))
-          {
-            // Obtain the parameter name without the surrounding double quotes. Accounts for RFC 1867 too.
-            int parameterNameStartingPosition = line.indexOf(HEADER_NAME)+HEADER_NAME.length();
-            parameterName = line.substring(parameterNameStartingPosition,+parameterNameStartingPosition+line.substring(parameterNameStartingPosition).indexOf('\"'));
-            currentParserState = PARSER_STATE_PARAMETER;
-          }
-        }
-        else if (currentParserState == PARSER_STATE_PARAMETER)
-        {
-          // A blank line should follow the PARAMETER. Discard the line and move on.
-          currentParserState = PARSER_STATE_BLANK;
-        }
-        else
-        {
-          // Expect the line to contain data.
-          if (parameterValue.length() > 0)
-            parameterValue.append('\n');
-          parameterValue.append(line);
-          currentParserState = PARSER_STATE_DATA;
-        }
-      }
-    }
-    catch (Throwable t)
-    {
-      throw new MultipartFormDataException(t.getMessage());
-    }
-    //dumpParamTable();
-  }
-
-  /**
-   * Returns the value of a request parameter as a String, or null if the parameter does not exist.
-   * If the parameter has multiple values, only the first value is returned. Use getParameterValues()
-   * for parameters with multiple values.
-   */
-  public final String getParameter(String parameter) throws MultipartFormDataException
-  {
-    if (paramTable_ == null)
-      throw new MultipartFormDataException("Parser contains no parsed data");
-    Vector values = (Vector)paramTable_.get(parameter);
-    return ((values != null)?((String)values.elementAt(0)):null);
-  }
-
-  public final String[] getParameterValues(String parameter) throws MultipartFormDataException
-  {
-    if (paramTable_ == null)
-      throw new MultipartFormDataException("Parser contains no parsed data");
-    Vector valuesVector = (Vector)paramTable_.get(parameter);
-    if (valuesVector == null)
-      return null;
-    String[] valuesArray = new String[valuesVector.size()];
-    for (int i=0;i<valuesArray.length;i++)
-      valuesArray[i] = (String)valuesVector.elementAt(i);
-    return valuesArray;
-  }
-
-  public final String[] getParameterNames() throws MultipartFormDataException
-  {
-    if (paramTable_ == null)
-      throw new MultipartFormDataException("Parser contains no parsed data");
-
-    int size = paramTable_.size();
-    if (size == 0)
-      return null;
-    String[] names = new String[size];
-    Enumeration keys = paramTable_.keys();
-    for (int i=0;i<size;i++)
-      names[i] = (String)keys.nextElement();
-    return names;
-  }
-
-  private final void saveData(String parameterName,String parameterValue)
-  {
-    Vector values = (Vector)paramTable_.get(parameterName);
-    if (values == null)
-      values = new Vector();
-    values.addElement(parameterValue);
-    paramTable_.put(parameterName,values);
-  }
-
-  private final boolean isValidParserState(byte currentState,byte[] expectedStates)
-  {
-    boolean validity = false;
-    for (int i=0;i<expectedStates.length;i++)
-    {
-      if (currentState == expectedStates[i])
-      {
-        validity = true;
-        break;
-      }
-    }
-    return validity;
-  }
-
-  private final String getParserExceptionMessage(byte currentState,byte[] expectedStates)
-  {
-    StringBuffer msg = new StringBuffer("Parser state inconsistency!");
-    msg.append('\n');
-    msg.append("Current state    : ").append(parserStates[currentState]).append('\n');
-    msg.append("Expected state(s): ");
-    for (int i=0;i<expectedStates.length;i++)
-    {
-      msg.append(parserStates[expectedStates[i]]);
-      if (i != expectedStates.length-1)
-        msg.append(", ");
-    }
-    msg.append('\n');
-    return msg.toString();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/QuickSort.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/QuickSort.java
deleted file mode 100644
index 9fa7e2e08..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/QuickSort.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.ws.internal.explorer.platform.util;
-
-import java.text.Collator;
-import java.util.Vector;
-
-public class QuickSort
-{
-  public static final void sort(Object[] a,int lo,int hi)
-  {
-    Object tmp;
-    int i = lo;
-    int j = hi;
-    Object x = a[(lo+hi)/2];
-    Collator collator = Collator.getInstance();
-
-    do
-    {
-      while (collator.compare(a[i].toString(),x.toString()) < 0) i++;
-      while (collator.compare(a[j].toString(),x.toString()) > 0) j--;
-      if (i <= j)
-      {
-        tmp = a[i];
-        a[i] = a[j];
-        a[j] = tmp;
-        i++;
-        j--;
-      }
-    } while (i <= j);
-
-    if (lo < j)
-      sort(a,lo,j);
-    if (i < hi)
-      sort(a,i,hi);
-  }
-
-  /*
-  * This method will use the same algorithm as above
-  * with the exception that any nulls will be attached
-  * at the end
-  */
-  public static final void sort(Vector v)
-  {
-    // do not sort if vector contains less than 2 elements
-    if (v.size() < 2)
-        return;
-  
-    // pulls out the nulls
-    Vector nulls = new Vector();
-    for (int i = 0; i < v.size(); i++) {
-      Object obj = v.elementAt(i);
-      if (obj == null || obj.toString() == null) {
-        nulls.add(obj);
-        v.remove(i);
-        i--;
-      }
-    }
-
-    // sort the not null objects
-    Object[] objs = v.toArray();
-    // do not sort if array contains less than 2 objects
-    if (objs.length >= 2)
-        sort(objs, 0, objs.length-1);
-
-    // re-construct the vector from the sorted objects, then the nulls
-    v.clear();
-    for (int j = 0; j < objs.length; j++) {
-        v.add(objs[j]);
-    }
-    v.addAll(nulls);
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/TrimFilter.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/TrimFilter.java
deleted file mode 100644
index 03160dd53..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/TrimFilter.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.util;
-
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletResponse;
-
-public class TrimFilter implements Filter
-{
-
-  /* (non-Javadoc)
-   * @see javax.servlet.Filter#init(javax.servlet.FilterConfig)
-   */
-  public void init(FilterConfig arg0) throws ServletException
-  {
-    // TODO Auto-generated method stub
-
-  }
-
-  /* (non-Javadoc)
-   * @see javax.servlet.Filter#doFilter(javax.servlet.ServletRequest, javax.servlet.ServletResponse, javax.servlet.FilterChain)
-   */
-  public void doFilter(ServletRequest req, ServletResponse resp, FilterChain fc) throws IOException, ServletException
-  {
-    // TODO Auto-generated method stub
-    CharArrayWrapper responseWrapper = new CharArrayWrapper((HttpServletResponse)resp);
-    // Hack for Tomcat performance problem with filters.
-    OutputStreamWriter osw = new OutputStreamWriter(resp.getOutputStream(),HTMLUtils.UTF8_ENCODING);
-    fc.doFilter(req,responseWrapper);
-    String responseString = responseWrapper.toString();
-    osw.write(responseString.trim());
-    osw.close();
-  }
-
-  /* (non-Javadoc)
-   * @see javax.servlet.Filter#destroy()
-   */
-  public void destroy()
-  {
-    // TODO Auto-generated method stub
-
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/URLUtils.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/URLUtils.java
deleted file mode 100644
index b7070b348..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/URLUtils.java
+++ /dev/null
@@ -1,101 +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.explorer.platform.util;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
-
-/**
- * This class contains utility methods for managing URLs
- * as used by the Web Services Explorer Web application.
- * @author cbrealey@ca.ibm.com
- */
-public final class URLUtils
-{
-	/**
-	 * Objects of this class should not be constructed.
-	 */
-	private URLUtils ()
-	{
-	}
-
-	/**
-	 * UTF-8
-	 */
-	public static final String UTF8 = "UTF-8";
-
-	/**
-	 * Equivalent to {@link #encode(String,String)}
-	 * with second parameter set to the "UTF-8" encoding.
-	 * @param s The string to encode.
-	 * @return The encoded string.
-	 */
-	public static String encode(String s)
-	{
-		return encode(s,UTF8);
-	}
-	
-	/**
-	 * Equivalent to {@link URLEncoder#encode(String,String)},
-	 * only throws an unchecked {@link RuntimeException} wrapped
-	 * around an {@link UnsupportedEncodingException} instead of
-	 * an {@link UnsupportedEncodingException}.
-	 * @param s The string to encode.
-	 * @param enc The encoding to use.
-	 * @return The encoded string.
-	 */
-	public static String encode(String s, String enc)
-	{
-		try
-		{
-			return URLEncoder.encode(s,enc);
-		}
-		catch (UnsupportedEncodingException e)
-		{
-			// TODO: MSG_BROKEN_VM_DOES_NOT_SUPPORT_UTF-8
-			throw new RuntimeException("%MSG_BROKEN_VM_DOES_NOT_SUPPORT_UTF-8",e);
-		}
-	}
-	
-	/**
-	 * Equivalent to {@link #decode(String,String)}
-	 * with second parameter set to the "UTF-8" encoding.
-	 * @param s The string to decode.
-	 * @return The decoded string.
-	 */
-	public static String decode(String s)
-	{
-		return decode(s,UTF8);
-	}
-	
-	/**
-	 * Equivalent to {@link URLEncoder#decode(String,String)},
-	 * only throws an unchecked {@link RuntimeException} wrapped
-	 * around an {@link UnsupportedEncodingException} instead of
-	 * an {@link UnsupportedEncodingException}.
-	 * @param s The string to decode.
-	 * @param enc The encoding to use.
-	 * @return The decoded string.
-	 */
-	public static String decode(String s, String enc)
-	{
-		try
-		{
-			return URLDecoder.decode(s,enc);
-		}
-		catch (UnsupportedEncodingException e)
-		{
-			// TODO: MSG_BROKEN_VM_DOES_NOT_SUPPORT_UTF-8
-			throw new RuntimeException("%MSG_BROKEN_VM_DOES_NOT_SUPPORT_UTF-8",e);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/Validator.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/Validator.java
deleted file mode 100644
index 6a6de221f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/Validator.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.ws.internal.explorer.platform.util;
-
-public class Validator
-{
-  public static final boolean validateString(String input)
-  {
-    return ((input != null) && (input.trim().length() > 0));
-  }
-
-  public static final boolean validateURL(String input)
-  {
-    return ((input != null) && (input.indexOf("://") != -1));
-  }
-  
-  public static final boolean validateInteger(String input)
-  {
-    try
-    {
-      Integer.parseInt(input);
-      return true;
-    }
-    catch (NumberFormatException e)
-    {
-      return false;
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/XMLUtils.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/XMLUtils.java
deleted file mode 100644
index df2e1207a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/XMLUtils.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.wst.ws.internal.explorer.platform.util;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-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.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentFragment;
-import org.w3c.dom.Element;
-import org.xml.sax.SAXException;
-
-public final class XMLUtils
-{
-  /**
-   * Serialize an XML Element into a String.
-   * @param e Element to be serialized.
-   * @param omitXMLDeclaration boolean representing whether or not to omit the XML declaration.
-   * @return String representation of the XML document fragment.
-   */
-  public static final String serialize(Element e,boolean omitXMLDeclaration)
-  {
-    if (e != null)
-    {
-      try
-      {
-		DOMSource domSource = new DOMSource(e);
-		Transformer serializer = TransformerFactory.newInstance().newTransformer();
-		serializer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, ((omitXMLDeclaration) ? "yes" : "no"));
-		serializer.setOutputProperty(OutputKeys.INDENT, "yes");
-		serializer.setOutputProperty(OutputKeys.ENCODING, HTMLUtils.UTF8_ENCODING);
-		serializer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		serializer.transform(domSource, new	StreamResult(baos));
-		baos.close();
-		return new String(baos.toByteArray(), HTMLUtils.UTF8_ENCODING);
-      }
-      catch (Throwable t)
-      {
-      }
-    }
-    return null;
-  }
-    
-  /**
-   * Serialize an XML Element into a String.
-   * @param df DocumentFragment to be serialized.
-   * @param omitXMLDeclaration boolean representing whether or not to omit the XML declaration.
-   * @return String representation of the XML document fragment.
-   */  
-  public static final String serialize(DocumentFragment df,boolean omitXMLDeclaration)
-  {
-    if (df != null)
-    {
-      try
-      {
-		DOMSource domSource = new DOMSource(df);
-		Transformer serializer = TransformerFactory.newInstance().newTransformer();
-		serializer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, ((omitXMLDeclaration) ? "yes" : "no"));
-		serializer.setOutputProperty(OutputKeys.INDENT, "yes");
-		serializer.setOutputProperty(OutputKeys.ENCODING, HTMLUtils.UTF8_ENCODING);
-		serializer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		serializer.transform(domSource, new	StreamResult(baos));
-		baos.close();
-		return new String(baos.toByteArray(), HTMLUtils.UTF8_ENCODING);
-      }
-      catch (Throwable t)
-      {
-      }
-    }
-    return null;
-  }
-  
-  /**
-   * Create a new XML Document.
-   * @param docBuilder DocumentBuilder. Setting this to null will create a new DocumentBuilder.
-   * @return Document
-   */
-  public static final Document createNewDocument(DocumentBuilder docBuilder) throws ParserConfigurationException
-  {
-    if (docBuilder == null)
-    {
-      DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-      factory.setNamespaceAware(false);
-      factory.setValidating(false);
-      docBuilder = factory.newDocumentBuilder();
-    }
-    Document doc = docBuilder.newDocument();
-    return doc;
-  }
-
-  /**
-   * Convert the String representation of an Element into an Element
-   * @param String representation of an Element.
-   * @return Element
-   */
-  public static Element stringToElement(String s) throws ParserConfigurationException, SAXException, UnsupportedEncodingException, IOException {
-    return stringToElement(s, false);
-  }
-
-  /**
-   * Convert the String representation of an Element into an Element
-   * @param String representation of an Element.
-   * @param boolean set whether the return Element should be namespace aware.
-   * @return Element
-   */
-  public static Element stringToElement(String s, boolean namespaceAware) throws ParserConfigurationException, SAXException, UnsupportedEncodingException, IOException
-  {
-    return byteArrayToElement(s.getBytes(HTMLUtils.UTF8_ENCODING), namespaceAware);
-  }
-
-  /**
-   * Convert the byte array representation of an Element into an Element
-   * @param byte[] representation of an Element.
-   * @param boolean set whether the return Element should be namespace aware.
-   * @return Element
-   */
-  public static Element byteArrayToElement(byte[] b, boolean namespaceAware) throws ParserConfigurationException, SAXException, UnsupportedEncodingException, IOException
-  {
-    DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
-    docBuilderFactory.setNamespaceAware(namespaceAware);
-    docBuilderFactory.setValidating(false);
-    DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder();
-    Document doc = docBuilder.parse(new ByteArrayInputStream(b));
-    return doc.getDocumentElement();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ClearWSDLAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ClearWSDLAction.java
deleted file mode 100644
index 51f2c29d6..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ClearWSDLAction.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.ws.internal.explorer.platform.wsdl.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ClearNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLMainNode;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLNode;
-
-public class ClearWSDLAction extends ClearNodeAction {
-
-  public ClearWSDLAction(Controller controller) {
-    super(controller, controller.getWSDLPerspective().getNodeManager());
-  }
-
-  public static String getActionLink(int nodeID) {
-    StringBuffer actionLink = new StringBuffer("wsdl/actions/ClearWSDLActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID);
-    actionLink.append('=');
-    actionLink.append(nodeID);
-    return actionLink.toString();
-  }
-
-  protected boolean processLinkParameters(HttpServletRequest request) {
-    String nodeIDString = request.getParameter(ActionInputs.NODEID);
-    int nodeID;
-    try {
-      nodeID = Integer.parseInt(nodeIDString);
-    }
-    catch (NumberFormatException nfe) {
-      nodeID = nodeManager_.getSelectedNodeId();
-    }
-    boolean paramValid = false;
-    Node node = nodeManager_.getNode(nodeID);
-    if (node instanceof WSDLMainNode)
-      paramValid = true;
-    else if (node instanceof WSDLNode)
-      paramValid = true;
-    else {
-      while (node != null && !(node instanceof WSDLMainNode)) {
-        node = node.getParent();
-        if (node instanceof WSDLNode) {
-          nodeID = node.getNodeId();
-          paramValid = true;
-          break;
-        }
-      }
-    }
-    propertyTable_.put(ActionInputs.NODEID, String.valueOf(nodeID));
-    return paramValid;
-  }
-
-  public boolean run() {
-    if (super.run()) {
-      nodeManager_.setSelectedNodeId(nodeManager_.getRootNode().getNodeId());
-      return true;
-    }
-    else
-      return false;
-  }
-
-  public String getTreeContentVar() {
-    return "wsdlNavigatorContent";
-  }
-
-  public String getTreeContentPage() {
-    return "wsdl/wsdl_navigator_content.jsp";
-  }
-
-  public String getPropertiesContainerVar() {
-    return "wsdlPropertiesContainer";
-  }
-
-  public String getPropertiesContainerPage() {
-    return "wsdl/wsdl_properties_container.jsp";
-  }
-
-  public String getStatusContentVar() {
-    return "wsdlStatusContent";
-  }
-
-  public String getStatusContentPage() {
-    return "wsdl/wsdl_status_content.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/CreateInstanceAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/CreateInstanceAction.java
deleted file mode 100644
index cf0d25bcd..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/CreateInstanceAction.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.wsdl.actions;
-
-import java.util.Iterator;
-import javax.wsdl.Part;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLOperationElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDMapFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.InvokeWSDLOperationTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-
-public class CreateInstanceAction extends WSDLPropertiesFormAction
-{
-  public CreateInstanceAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    super.processParsedResults(parser);
-    WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
-    NodeManager nodeManager = wsdlPerspective.getNodeManager();
-    Node selectedNode = nodeManager.getSelectedNode();
-    InvokeWSDLOperationTool invokeWSDLOperationTool = (InvokeWSDLOperationTool)(selectedNode.getCurrentToolManager().getSelectedTool());
-    WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-    Iterator it = operElement.getOrderedBodyParts().iterator();
-    boolean resultsValid = true;
-    while (it.hasNext())
-    {
-      Part part = (Part)it.next();
-      IXSDFragment frag = operElement.getFragment(part);
-      if (!frag.processParameterValues(parser))
-        resultsValid = false;
-    }
-    String fragmentID = parser.getParameter(FragmentConstants.FRAGMENT_ID);
-    if (fragmentID != null && fragmentID.length() > 0)
-      propertyTable_.put(FragmentConstants.FRAGMENT_ID, fragmentID);
-    else
-    {
-      propertyTable_.remove(FragmentConstants.FRAGMENT_ID);
-      resultsValid = false;
-    }
-    String nameAnchorID = parser.getParameter(FragmentConstants.NAME_ANCHOR_ID);
-    invokeWSDLOperationTool.setFragmentNameAnchorID(nameAnchorID);
-    return resultsValid;
-  }
-
-  public FormTool getSelectedFormTool()
-  {
-    WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
-    return (FormTool)wsdlPerspective.getNodeManager().getSelectedNode().getToolManager().getSelectedTool();
-  }
-
-  public boolean run()
-  {
-    String fragmentID = (String)propertyTable_.get(FragmentConstants.FRAGMENT_ID);
-    if (fragmentID != null && fragmentID.length() > 0)
-    {
-      WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
-      NodeManager nodeManager = wsdlPerspective.getNodeManager();
-      Node selectedNode = nodeManager.getSelectedNode();
-      WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-      IXSDFragment frag = operElement.getFragmentByID(fragmentID);
-      if ((frag instanceof IXSDMapFragment) && ((IXSDMapFragment)frag).createInstance() != null)
-        return true;
-      else
-        return false;
-    }
-    else
-      return false;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpGetOperationFormAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpGetOperationFormAction.java
deleted file mode 100644
index 3b4f8b1a2..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpGetOperationFormAction.java
+++ /dev/null
@@ -1,55 +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.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import java.io.IOException;
-import java.net.URLConnection;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-import org.eclipse.wst.ws.internal.parser.discovery.NetUtils;
-
-public class InvokeWSDLHttpGetOperationFormAction extends InvokeWSDLHttpOperationFormAction
-{
-  public InvokeWSDLHttpGetOperationFormAction(Controller controller)
-  {
-    super(controller);
-  }
-    
-  public boolean run()
-  {
-    WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
-    MessageQueue messageQueue = wsdlPerspective.getMessageQueue();
-    StringBuffer endPoint = new StringBuffer(getEndPoint());
-    endPoint.append('?');
-    addParameters(endPoint);
-    String endPointString = endPoint.toString();
-    boolean result = false;
-    try
-    {
-      URLConnection conn = NetUtils.getURLConnection(endPointString);
-      if (conn != null)
-      {
-        recordHttpResponse(conn,messageQueue);
-        wsdlPerspective.setOperationNode(getSelectedNavigatorNode());
-        result = true;
-      }
-      else
-        throw new IOException(wsdlPerspective.getMessage("MSG_ERROR_UNABLE_TO_CONNECT",endPointString));
-    }
-    catch (IOException e)
-    {
-      handleUnexpectedException(wsdlPerspective,messageQueue,"IOException",e);
-    }
-    return result;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpOperationFormAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpOperationFormAction.java
deleted file mode 100644
index 6a6168ed8..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpOperationFormAction.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.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.URLConnection;
-import java.util.Iterator;
-import javax.wsdl.Part;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLOperationElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.HTTPUtil;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.InvokeWSDLOperationTool;
-
-public abstract class InvokeWSDLHttpOperationFormAction extends WSDLPropertiesFormAction
-{
-  private static final String CONTENT_TYPE_CHARSETEQ = "charset=";
-  
-  public InvokeWSDLHttpOperationFormAction(Controller controller)
-  {
-    super(controller);
-  }
-  
-  protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    super.processParsedResults(parser);
-    String endPoint = parser.getParameter(WSDLActionInputs.END_POINT);
-    Node selectedNode = getSelectedNavigatorNode();
-    InvokeWSDLOperationTool invokeWSDLOperationTool = (InvokeWSDLOperationTool)(selectedNode.getCurrentToolManager().getSelectedTool());
-    invokeWSDLOperationTool.setEndPoint(endPoint);
-    WSDLOperationElement operElement = (WSDLOperationElement)(selectedNode.getTreeElement());
-    propertyTable_.put(WSDLActionInputs.OPERATION_ELEMENT,operElement);
-    Iterator it = operElement.getOrderedBodyParts().iterator();
-    boolean resultsValid = true;
-    while (it.hasNext()) {
-      Part part = (Part)it.next();
-      IFragment frag = operElement.getFragment(part);
-      if (!frag.processParameterValues(parser))
-        resultsValid = false;
-    }
-    return resultsValid;
-  }  
-  
-  protected String getEndPoint()
-  {
-    StringBuffer endPoint = new StringBuffer((String)propertyTable_.get(WSDLActionInputs.END_POINT));
-    WSDLOperationElement operElement = (WSDLOperationElement)propertyTable_.get(WSDLActionInputs.OPERATION_ELEMENT);
-    if (endPoint.charAt(endPoint.length()-1) != '/')
-      endPoint.append('/');
-    endPoint.append(operElement.getName());
-    return endPoint.toString();    
-  }
-  
-  protected void addParameters(StringBuffer buffer)
-  {
-    WSDLOperationElement operElement = (WSDLOperationElement)propertyTable_.get(WSDLActionInputs.OPERATION_ELEMENT);
-    Iterator it = operElement.getOrderedBodyParts().iterator();
-    while (it.hasNext())
-    {
-      Part part = (Part)it.next();
-      IXSDFragment frag = operElement.getFragment(part);
-      buffer.append(HTTPUtil.genURLEncodedParameters(frag));
-      if (it.hasNext())
-        buffer.append('&');
-    }
-  }
-  
-  protected void recordHttpResponse(URLConnection conn,MessageQueue messageQueue) throws IOException
-  {
-    BufferedReader br = null;
-    try
-    {
-      InputStreamReader in = null;
-      String contentType = conn.getContentType();
-      if (contentType != null)
-      {
-        int charsetEqPos = contentType.indexOf(CONTENT_TYPE_CHARSETEQ);
-        if (charsetEqPos != -1)
-          in = new InputStreamReader(conn.getInputStream(),contentType.substring(charsetEqPos+CONTENT_TYPE_CHARSETEQ.length()));
-      }
-      if (in == null)
-        in = new InputStreamReader(conn.getInputStream());
-      br = new BufferedReader(in);
-      String s;
-      while ((s = br.readLine()) != null)
-        messageQueue.addMessage(s);
-      br.close();
-      br = null;
-    }
-    catch (IOException e)
-    {
-      if (br != null)
-        br.close();
-      throw e;
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpPostOperationFormAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpPostOperationFormAction.java
deleted file mode 100644
index 4d7562b5e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpPostOperationFormAction.java
+++ /dev/null
@@ -1,67 +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.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.net.URLConnection;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-import org.eclipse.wst.ws.internal.parser.discovery.NetUtils;
-
-public class InvokeWSDLHttpPostOperationFormAction extends InvokeWSDLHttpOperationFormAction
-{
-
-  public InvokeWSDLHttpPostOperationFormAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  public boolean run()
-  {
-    WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
-    MessageQueue messageQueue = wsdlPerspective.getMessageQueue();
-    boolean result = false;
-    String endPointString = getEndPoint();
-    URLConnection conn = NetUtils.getURLConnection(endPointString);
-    if (conn != null)
-    {
-      StringBuffer parameters = new StringBuffer();
-      addParameters(parameters);
-      conn.setDoOutput(true);
-      PrintWriter out = null;
-      try
-      {
-        out = new PrintWriter(conn.getOutputStream());
-        out.print(parameters);
-        out.close();
-        out = null;
-        recordHttpResponse(conn,messageQueue);
-        wsdlPerspective.setOperationNode(getSelectedNavigatorNode());
-        result = true;
-      }
-      catch (IOException e)
-      {
-        handleUnexpectedException(wsdlPerspective,messageQueue,"IOException",e);
-      }
-      finally
-      {
-        if (out != null)
-          out.close();
-      }
-    }
-    else
-      handleUnexpectedException(wsdlPerspective,messageQueue,"Exception",new IOException(wsdlPerspective.getMessage("MSG_ERROR_UNABLE_TO_CONNECT",endPointString)));
-    return result;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationAction.java
deleted file mode 100644
index bdca4ed43..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationAction.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.wsdl.actions;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-import javax.servlet.http.HttpServletResponse;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.Definition;
-import javax.wsdl.Part;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import org.apache.axis.Constants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.XMLUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.Endpoint;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLBindingElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLOperationElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.InvokeWSDLOperationTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.SOAPMessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.transport.HTTPException;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.transport.HTTPTransport;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.util.SoapHelper;
-import org.eclipse.wst.ws.internal.parser.discovery.NetUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public abstract class InvokeWSDLSOAPOperationAction extends WSDLPropertiesFormAction
-{
-  public InvokeWSDLSOAPOperationAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    super.processParsedResults(parser);
-    String endPoint = parser.getParameter(WSDLActionInputs.END_POINT);
-    InvokeWSDLOperationTool invokeWSDLOperationTool = (InvokeWSDLOperationTool)(getSelectedNavigatorNode().getCurrentToolManager().getSelectedTool());
-    invokeWSDLOperationTool.setEndPoint(endPoint);
-    return true;
-  }
-
-  protected final void addRPCWrapper(Vector bodyEntries,WSDLElement wsdlElement,WSDLOperationElement operElement,Hashtable soapEnvelopeNamespaceTable) throws ParserConfigurationException
-  {
-    // Must be RPC style.
-    String encodingNamespaceURI = null;
-    /*
-     * WS-I: In a rpc-literal SOAP binding, the serialized child element of the 
-     * soap:Body element consists of a wrapper element, whose namespace is the value 
-     * of the namespace attribute of the soapbind:body element and whose local name is 
-     * either the name of the operation or the name of the operation suffixed 
-     * with "Response". The namespace attribute is required, as opposed to being 
-     * optional, to ensure that the children of the soap:Body element are namespace-
-     * qualified.
-     */
-    BindingOperation bindingOperation = operElement.getBindingOperation();
-    if (bindingOperation != null)
-    {
-      BindingInput bindingInput = bindingOperation.getBindingInput();
-      if (bindingInput != null)
-      {
-        List extElements = bindingInput.getExtensibilityElements();
-        for (Iterator it = extElements.iterator(); it.hasNext();)
-        {
-          ExtensibilityElement extElement = (ExtensibilityElement)it.next();
-          if (extElement instanceof SOAPBody)
-          {
-            encodingNamespaceURI = ((SOAPBody)extElement).getNamespaceURI();
-            break;
-          }
-        }
-      }
-    }
-    // If the namespace of the soapbind:body element is not set, get it from the operation element
-    if (encodingNamespaceURI == null)
-      encodingNamespaceURI = operElement.getEncodingNamespace();
-    // If the namespace of the operation element is not set, get it from the definition element
-    if (encodingNamespaceURI == null)
-    {
-      Definition definition = wsdlElement.getDefinition();
-      encodingNamespaceURI = definition.getTargetNamespace();
-    }
-    // Generate an RPC style wrapper element.
-    Document doc = XMLUtils.createNewDocument(null);
-    String encodingStyle = (operElement.isUseLiteral() ? null : operElement.getEncodingStyle());
-    Element wrapperElement = SoapHelper.createRPCWrapperElement(doc,soapEnvelopeNamespaceTable,encodingNamespaceURI,operElement.getOperation().getName(),encodingStyle);
-    for (int i=0;i<bodyEntries.size();i++)
-      wrapperElement.appendChild(doc.importNode((Element)bodyEntries.elementAt(i),true));
-    bodyEntries.removeAllElements();
-    bodyEntries.addElement(wrapperElement);
-  }
-
-  /**
-   * Generate a Vector of the elements inside the Soap Body.
-   * @param soapEnvelopeNamespaceTable - Hashtable containing a map of the namespace URIs to prefixes.
-   * @param operElement - WSDLOperationElement encapsulating the WSDL operation.
-   */
-  protected Vector getBodyEntries(Hashtable soapEnvelopeNamespaceTable,WSDLOperationElement operElement,WSDLBindingElement bindingElement,WSDLServiceElement serviceElement) throws ParserConfigurationException,Exception
-  {
-    Vector bodyEntries = new Vector();
-    boolean isUseLiteral = operElement.isUseLiteral();
-    String encodingStyle = operElement.getEncodingStyle();
-    boolean addEncodingStyle = (!isUseLiteral && !Constants.URI_SOAP11_ENC.equals(encodingStyle));
-    Iterator it = operElement.getOrderedBodyParts().iterator();
-    while (it.hasNext())
-    {
-      Part part = (Part)it.next();
-      IXSDFragment frag = (IXSDFragment)operElement.getFragment(part);
-      Element[] instanceDocuments = frag.genInstanceDocumentsFromParameterValues(!isUseLiteral,soapEnvelopeNamespaceTable, XMLUtils.createNewDocument(null));
-      for (int j=0;j<instanceDocuments.length;j++)
-      {
-        if (instanceDocuments[j] == null)
-          continue;
-        if (addEncodingStyle)
-          instanceDocuments[j].setAttribute("soapenv:encodingStyle",encodingStyle);
-        bodyEntries.addElement(instanceDocuments[j]);
-      }
-    }
-
-    if (!operElement.isDocumentStyle())
-    {
-      try
-      {
-        addRPCWrapper(bodyEntries,(WSDLElement)serviceElement.getParentElement(),operElement,soapEnvelopeNamespaceTable);
-      }
-      catch (ParserConfigurationException e)
-      {
-        throw e;
-      }
-    }
-    return bodyEntries;
-  }
-
-  protected Element getSOAPEnvelope(Hashtable soapEnvelopeNamespaceTable, Vector bodyEntries) throws ParserConfigurationException
-  {
-    DocumentBuilder docBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-    Document doc = XMLUtils.createNewDocument(docBuilder);
-    Element soapEnvelopeElement = SoapHelper.createSoapEnvelopeElement(doc,soapEnvelopeNamespaceTable);
-    Element soapBodyElement = SoapHelper.createSoapBodyElement(doc);
-    for (int i=0;i<bodyEntries.size();i++)
-      soapBodyElement.appendChild(doc.importNode((Element)bodyEntries.elementAt(i),true));
-    soapEnvelopeElement.appendChild(soapBodyElement);
-    return soapEnvelopeElement;
-  }
-
-  private final void recordSoapRequest(SOAPMessageQueue soapRequestQueue,Hashtable soapEnvelopeNamespaceTable,Element soapEnvelope) throws ParserConfigurationException,IOException
-  {
-    soapRequestQueue.clear();
-    soapRequestQueue.addMessage(XMLUtils.serialize(soapEnvelope,false));
-  }
-
-  private final void recordSOAPResponse(SOAPMessageQueue soapResponseQueue,BufferedReader responseReader) throws IOException
-  {
-    soapResponseQueue.clear();
-    if (responseReader != null)
-    {
-      String line = null;
-      while ((line = responseReader.readLine()) != null)
-        soapResponseQueue.addMessage(line);
-      responseReader.close();
-    }
-  }
-
-  public boolean run()
-  {
-    String soapAddressLocation = (String)propertyTable_.get(WSDLActionInputs.END_POINT);
-    WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
-    MessageQueue messageQueue = wsdlPerspective.getMessageQueue();
-    WSDLOperationElement operElement = (WSDLOperationElement)getSelectedNavigatorNode().getTreeElement();
-    WSDLBindingElement bindingElement = (WSDLBindingElement)operElement.getParentElement();
-    WSDLServiceElement serviceElement = (WSDLServiceElement)bindingElement.getParentElement();
-    operElement.setPropertyAsObject(WSDLActionInputs.SOAP_RESPONSE_CACHED, new Boolean(false));
-    try
-    {
-      // Generate the SOAP envelope and its children. We need to create a DOM element version to display and the object version to execute.
-      // <SOAP-ENV:Envelope
-      //    xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
-      //    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      //    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-      // ...
-      Hashtable soapEnvelopeNamespaceTable = new Hashtable();
-      SoapHelper.addDefaultSoapEnvelopeNamespaces(soapEnvelopeNamespaceTable);
-      Vector bodyEntries = getBodyEntries(soapEnvelopeNamespaceTable,operElement,bindingElement,serviceElement);
-      Element soapEnvelope = getSOAPEnvelope(soapEnvelopeNamespaceTable, bodyEntries);
-      recordSoapRequest(wsdlPerspective.getSOAPRequestQueue(),soapEnvelopeNamespaceTable,soapEnvelope);
-
-      // Execute the SOAP operation.
-      if (soapAddressLocation != null)
-      {
-        // Send the message and record the SOAP Response Envelope.
-        HTTPTransport transport = createTransport(bindingElement, soapAddressLocation);
-        transport.send(NetUtils.createURL(soapAddressLocation),operElement.getSoapAction(),XMLUtils.serialize(soapEnvelope, true));
-        recordSOAPResponse(wsdlPerspective.getSOAPResponseQueue(),transport.receive());
-        wsdlPerspective.setOperationNode(getSelectedNavigatorNode());
-        return true;
-      }
-      throw new IOException(wsdlPerspective.getMessage("MSG_ERROR_UNABLE_TO_CONNECT",soapAddressLocation));
-    }
-    catch (ParserConfigurationException e)
-    {
-      handleUnexpectedException(wsdlPerspective,messageQueue,"ParserConfigurationException",e);
-    }
-    catch (IOException e)
-    {
-      handleUnexpectedException(wsdlPerspective,messageQueue,"IOException",e);
-    }
-    catch (HTTPException httpe)
-    {
-      throwHTTPException(bindingElement, soapAddressLocation, httpe);
-    }
-    catch (Exception e)
-    {
-      handleUnexpectedException(wsdlPerspective,messageQueue,"Exception",e);
-    }
-    return false;
-  }
-  
-  private void throwHTTPException(WSDLBindingElement bindingElement, String endpointString, HTTPException httpException) throws HTTPException
-  {
-    if (httpException.getStatusCode() == HttpServletResponse.SC_UNAUTHORIZED)
-    {
-      Endpoint endpoint = bindingElement.getEndpoint(endpointString);
-      if (endpoint != null)
-      {
-        endpoint.setRequireHTTPBasicAuth(true);
-        endpoint.setHttpBasicAuthUsername(null);
-        endpoint.setHttpBasicAuthPassword(null);
-      }
-    }
-    throw httpException;
-  }
-  
-  private HTTPTransport createTransport(WSDLBindingElement bindingElement, String endpointString)
-  {
-    HTTPTransport transport = new HTTPTransport();
-    Endpoint endpoint = bindingElement.getEndpoint(endpointString);
-    if (endpoint != null)
-    {
-      if (endpoint.isRequireHTTPBasicAuth())
-      {
-        String httpBasicAuthUsername = endpoint.getHttpBasicAuthUsername();
-        String httpBasicAuthPassword = endpoint.getHttpBasicAuthPassword();
-        if (httpBasicAuthUsername == null || httpBasicAuthPassword == null)
-        {
-          httpBasicAuthUsername = (String)propertyTable_.get(WSDLActionInputs.HTTP_BASIC_AUTH_USERNAME);
-          httpBasicAuthPassword = (String)propertyTable_.get(WSDLActionInputs.HTTP_BASIC_AUTH_PASSWORD);
-          endpoint.setHttpBasicAuthUsername(httpBasicAuthUsername);
-          endpoint.setHttpBasicAuthPassword(httpBasicAuthPassword);
-        }
-        if (httpBasicAuthUsername != null && httpBasicAuthPassword != null)
-        {
-          transport.setHttpBasicAuthUsername(httpBasicAuthUsername);
-          transport.setHttpBasicAuthPassword(httpBasicAuthPassword);
-        }
-      }
-    }
-    return transport;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationFormAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationFormAction.java
deleted file mode 100644
index 105363956..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationFormAction.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.wsdl.actions;
-
-import java.util.Iterator;
-import javax.wsdl.Part;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLOperationElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.transformer.FragmentTransformer;
-
-public class InvokeWSDLSOAPOperationFormAction extends InvokeWSDLSOAPOperationAction
-{
-  public InvokeWSDLSOAPOperationFormAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    boolean resultsValid = true;
-    super.processParsedResults(parser);
-    String sourceContent = parser.getParameter(FragmentConstants.SOURCE_CONTENT);
-    if (sourceContent == null)
-    {
-      WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
-      MessageQueue messageQueue = wsdlPerspective.getMessageQueue();
-      WSDLOperationElement operElement = (WSDLOperationElement) getSelectedNavigatorNode().getTreeElement();
-      Iterator it = operElement.getOrderedBodyParts().iterator();
-      while (it.hasNext())
-      {
-        Part part = (Part) it.next();
-        IFragment frag = operElement.getFragment(part);
-        if (!frag.processParameterValues(parser))
-        {
-          messageQueue.addMessage(wsdlPerspective.getMessage("MSG_ERROR_VALIDATING_PARAMETER", part.getName()));
-          resultsValid = false;
-        }
-      }
-    }
-    return resultsValid;
-  }
-
-  public ITransformer[] getTransformers()
-  {
-    ITransformer[] parentTransformers = super.getTransformers();
-    ITransformer[] transformers = new ITransformer[parentTransformers.length + 1];
-    System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
-    transformers[transformers.length - 1] = new FragmentTransformer(controller_);
-    return transformers;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationSourceAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationSourceAction.java
deleted file mode 100644
index 1257f406b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationSourceAction.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.wsdl.actions;
-
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.util.Hashtable;
-import java.util.Vector;
-import javax.xml.parsers.ParserConfigurationException;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.XMLUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLBindingElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLOperationElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.util.SoapHelper;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-public class InvokeWSDLSOAPOperationSourceAction extends InvokeWSDLSOAPOperationAction
-{
-  private boolean newFileSelected_;
-  private boolean saveAsSelected_;
-  private static final String DUMMY_WRAPPER_START_TAG = "<dummyWrapper>";
-  private static final String DUMMY_WRAPPER_END_TAG = "</dummyWrapper>";
-  
-  public InvokeWSDLSOAPOperationSourceAction(Controller controller)
-  {
-    super(controller);
-    newFileSelected_ = false;
-    saveAsSelected_ = false;
-  }
-
-  protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    super.processParsedResults(parser);
-    WSDLOperationElement operElement = (WSDLOperationElement)getSelectedNavigatorNode().getTreeElement();
-    newFileSelected_ = false;
-    saveAsSelected_ = false;
-    /*  try and catch is needed if we are doing fragmentization.
-    try
-    {
-    */
-      String submissionAction = parser.getParameter(WSDLActionInputs.SUBMISSION_ACTION);
-      String sourceContents = parser.getParameter(FragmentConstants.SOURCE_CONTENT);
-      if (sourceContents != null)
-        operElement.setPropertyAsString(WSDLModelConstants.PROP_SOURCE_CONTENT,sourceContents);
-      if (WSDLActionInputs.SUBMISSION_ACTION_BROWSE_FILE.equals(submissionAction))
-      {
-        newFileSelected_ = true;
-        String fileContents = parser.getParameter(WSDLActionInputs.SELECTED_FILE);
-        if (fileContents != null)
-          operElement.setPropertyAsString(WSDLModelConstants.PROP_SOURCE_CONTENT,fileContents);
-      }
-      else
-      {
-        if (WSDLActionInputs.SUBMISSION_ACTION_SAVE_AS.equals(submissionAction))
-        {
-          // Save As... action
-          saveAsSelected_ = true;
-        }
-        else
-        {
-          // Fragmentize on Go action.
-          // fragmentize(new StringBuffer(sourceContents));
-          String[] nsDeclarations = parser.getParameterValues(FragmentConstants.SOURCE_CONTENT_NAMESPACE);
-          if (nsDeclarations != null)
-            operElement.setPropertyAsObject(WSDLModelConstants.PROP_SOURCE_CONTENT_NAMESPACE,nsDeclarations);
-        }
-      }
-      return true;
-    /*
-    }       
-    catch (ParserConfigurationException e)
-    {
-      handleUnexpectedException(wsdlPerspective,messageQueue,"ParserConfigurationException",e);
-    }
-    catch (SAXException e)
-    {
-      handleUnexpectedException(wsdlPerspective,messageQueue,"SAXException",e);
-    }
-    catch (UnsupportedEncodingException e)
-    {
-      handleUnexpectedException(wsdlPerspective,messageQueue,"UnsupportedEncodingException",e);
-    }
-    catch (IOException e)
-    {
-      handleUnexpectedException(wsdlPerspective,messageQueue,"IOException",e);
-    }
-    return false;
-    */
-  }
-
-  /**
-   * Generate a Vector of the elements inside the Soap Body.
-   * @param soapEnvelopeNamespaceTable - Hashtable containing a map of the namespace URIs to prefixes.
-   * @param operElement - WSDLOperationElement encapsulating the WSDL operation.
-   */
-  protected Vector getBodyEntries(Hashtable soapEnvelopeNamespaceTable,WSDLOperationElement operElement,WSDLBindingElement bindingElement,WSDLServiceElement serviceElement) throws ParserConfigurationException,Exception
-  {
-    Vector bodyEntries = new Vector();
-    String[] nsDeclarations = (String[])operElement.getPropertyAsObject(WSDLModelConstants.PROP_SOURCE_CONTENT_NAMESPACE);
-    for (int i = 0; i < nsDeclarations.length; i++)
-    {
-      String[] prefix_ns = SoapHelper.decodeNamespaceDeclaration(nsDeclarations[i]);
-      if (!soapEnvelopeNamespaceTable.contains(prefix_ns[1]))
-        soapEnvelopeNamespaceTable.put(prefix_ns[1], prefix_ns[0]);
-    }
-    StringBuffer sourceContent = new StringBuffer(operElement.getPropertyAsString(WSDLModelConstants.PROP_SOURCE_CONTENT));
-    sourceContent.insert(0,DUMMY_WRAPPER_START_TAG).append(DUMMY_WRAPPER_END_TAG);
-    Element dummyWrapperElement = XMLUtils.stringToElement(sourceContent.toString());          
-    NodeList nl = dummyWrapperElement.getChildNodes();
-    for (int i = 0; i < nl.getLength(); i++)
-    {
-      if (nl.item(i) instanceof Element)
-        bodyEntries.add(nl.item(i));
-    }
-    if (!operElement.isDocumentStyle())
-    {
-      try
-      {
-        addRPCWrapper(bodyEntries,(WSDLElement)serviceElement.getParentElement(),operElement,soapEnvelopeNamespaceTable);
-      }
-      catch (ParserConfigurationException e)
-      {
-        throw e;
-      }
-    }
-    return bodyEntries;
-  }
-
-  public final boolean wasNewFileSelected()
-  {
-    return newFileSelected_;
-  }
-  
-  public final boolean wasSaveAsSelected()
-  {
-    return saveAsSelected_;
-  }
-  
-  public final String getDefaultSaveAsFileName()
-  {
-    WSDLOperationElement operElement = (WSDLOperationElement)(getSelectedNavigatorNode().getTreeElement());
-    return (new StringBuffer(operElement.getOperation().getName())).append(".txt").toString();
-  }
-  
-  public final void writeSourceContent(OutputStream os)
-  {
-    WSDLOperationElement operElement = (WSDLOperationElement)(getSelectedNavigatorNode().getTreeElement());
-    PrintWriter pw = new PrintWriter(os); 
-    pw.println(operElement.getPropertyAsString(WSDLModelConstants.PROP_SOURCE_CONTENT));
-    pw.close();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/OpenWSDLAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/OpenWSDLAction.java
deleted file mode 100644
index 764f15b5a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/OpenWSDLAction.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.ws.internal.explorer.platform.wsdl.actions;
-
-import java.util.Vector;
-import javax.wsdl.WSDLException;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-
-public class OpenWSDLAction extends WSDLPropertiesFormAction {
-
-  public OpenWSDLAction(Controller controller) {
-    super(controller);
-  }
-
-  protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException {
-    String wsdlUrl = parser.getParameter(ActionInputs.QUERY_INPUT_WSDL_URL);
-    FormTool formTool = getSelectedFormTool();
-    propertyTable_.put(ActionInputs.QUERY_INPUT_WSDL_URL, wsdlUrl);
-    formTool.updatePropertyTable(propertyTable_);
-    return true;
-  }
-
-  public boolean run() {
-    String wsdlUrl = (String)propertyTable_.get(ActionInputs.QUERY_INPUT_WSDL_URL);
-    WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
-    MessageQueue messageQueue = wsdlPerspective.getMessageQueue();
-    NodeManager nodeManager = wsdlPerspective.getNodeManager();
-    Node rootNode = nodeManager.getRootNode();
-    TreeElement rootElement = rootNode.getTreeElement();
-
-    // create a WSDLElement representing the WSDL
-    WSDLElement wsdlElement = new WSDLElement(wsdlUrl, rootElement.getModel(), wsdlUrl);
-    try
-    {
-      // open WSDL
-      Vector errorMessages = wsdlElement.loadWSDL();
-      if (errorMessages.size() > 0)
-      {
-        messageQueue.addMessage(wsdlPerspective.getMessage("MSG_ERROR_XSD_VALIDATION"));
-        for (int i=0;i<errorMessages.size();i++)
-          messageQueue.addMessage((String)errorMessages.elementAt(i));
-      }            
-    }
-    catch (WSDLException e)
-    {
-      messageQueue.addMessage(wsdlPerspective.getMessage("MSG_ERROR_OPEN_WSDL",wsdlUrl));          
-      handleUnexpectedException(wsdlPerspective,messageQueue,"WSDLException",e);
-      return false;
-    }
-    rootElement.connect(wsdlElement,WSDLModelConstants.REL_WSDL, ModelConstants.REL_OWNER);
-
-    // build the datamodel for this WSDLElement
-    wsdlElement.buildModel();
-
-    // If there is more than 1 service node, select the WSDL node. If there is more than 1 binding node, select the service node.
-    // If there is just the one service and binding node, select the binding node.
-    // select the new WSDL node
-    Node wsdlNode = rootNode.getChildNode(wsdlElement);
-    Vector serviceNodes = wsdlNode.getChildNodes();
-    int newSelectedNodeId = wsdlNode.getNodeId();
-    if (serviceNodes.size() == 1)
-    {
-      Node serviceNode = (Node)serviceNodes.elementAt(0);
-      Vector bindingNodes = serviceNode.getChildNodes();
-      if (bindingNodes.size() == 1)
-      {
-        Node bindingNode = (Node)bindingNodes.elementAt(0);
-        newSelectedNodeId = bindingNode.getNodeId();
-      }
-      else
-        newSelectedNodeId = serviceNode.getNodeId();
-    }
-    nodeManager.setSelectedNodeId(newSelectedNodeId);
-    nodeManager.makeNodeVisible(nodeManager.getNode(newSelectedNodeId));
-    addToHistory(ActionInputs.PERSPECTIVE_WSDL,SelectWSDLPropertiesToolAction.getActionLink(newSelectedNodeId, 0, ActionInputs.VIEWID_DEFAULT, ActionInputs.VIEWTOOLID_DEFAULT, true));
-    messageQueue.addMessage(wsdlPerspective.getMessage("MSG_INFO_OPEN_WSDL_SUCCESSFUL", wsdlUrl));
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/OpenXSDInfoDialogAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/OpenXSDInfoDialogAction.java
deleted file mode 100644
index dd38afcd4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/OpenXSDInfoDialogAction.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.ws.internal.explorer.platform.wsdl.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.Action;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLActionInputs;
-
-public class OpenXSDInfoDialogAction extends Action
-{
-  public OpenXSDInfoDialogAction()
-  {
-  }
-
-  public static final String getActionLink(String sessionId,int nodeId,String fragId)
-  {
-    StringBuffer actionLink = new StringBuffer("wsdl/fragment/XSDInfoDialog.jsp?");
-    actionLink.append(ActionInputs.SESSIONID).append('=').append(sessionId);
-    actionLink.append('&').append(ActionInputs.NODEID).append('=').append(nodeId);
-    actionLink.append('&').append(WSDLActionInputs.FRAGMENT_ID).append('=').append(fragId);
-    return actionLink.toString();
-  }
-
-  public final boolean populatePropertyTable(HttpServletRequest request)
-  {
-    return true;
-  }
-
-  public final boolean run()
-  {
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/RefreshWSDLAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/RefreshWSDLAction.java
deleted file mode 100644
index a522eff88..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/RefreshWSDLAction.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.ws.internal.explorer.platform.wsdl.actions;
-
-import java.util.Vector;
-import javax.servlet.http.HttpServletRequest;
-import javax.wsdl.Definition;
-import javax.wsdl.WSDLException;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.LinkAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLMainNode;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLNode;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-
-public class RefreshWSDLAction extends LinkAction {
-
-  public RefreshWSDLAction(Controller controller) {
-    super(controller);
-  }
-
-  public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID) {
-    StringBuffer actionLink = new StringBuffer("wsdl/actions/WSDLRefreshActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID);
-    actionLink.append('=');
-    actionLink.append(nodeID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.TOOLID);
-    actionLink.append('=');
-    actionLink.append(toolID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.VIEWID);
-    actionLink.append('=');
-    actionLink.append(viewID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.VIEWTOOLID);
-    actionLink.append('=');
-    actionLink.append(viewToolID);
-    return actionLink.toString();
-  }
-
-  protected boolean processLinkParameters(HttpServletRequest request) {
-    NodeManager nodeManager = controller_.getWSDLPerspective().getNodeManager();
-    String nodeIDString = request.getParameter(ActionInputs.NODEID);
-    int nodeID;
-    try {
-      nodeID = Integer.parseInt(nodeIDString);
-    }
-    catch (NumberFormatException nfe) {
-      nodeID = nodeManager.getSelectedNodeId();
-    }
-    Node node = nodeManager.getNode(nodeID);
-    while (node != null && !(node instanceof WSDLMainNode)) {
-      if (node instanceof WSDLNode) {
-        propertyTable_.put(ActionInputs.NODEID, String.valueOf(node.getNodeId()));
-        return true;
-      }
-      node = node.getParent();
-    }
-    return false;
-  }
-
-  public boolean run() {
-    int nodeID = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-    WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
-    MessageQueue messageQueue = wsdlPerspective.getMessageQueue();
-    NodeManager nodeManager = wsdlPerspective.getNodeManager();
-    Node wsdlNode = nodeManager.getNode(nodeID);
-    WSDLElement wsdlElement = (WSDLElement)wsdlNode.getTreeElement();
-    Definition definitionCopy = wsdlElement.getDefinition();
-    Vector schemaListCopy = wsdlElement.getSchemaList();
-    wsdlElement.setDefinition(null);
-    wsdlElement.setSchemaList(new Vector());
-    int selectedNodeID = nodeManager.getSelectedNode().getNodeId();
-
-    try {
-      // open WSDL
-      Vector errorMessages = wsdlElement.loadWSDL();
-      if (errorMessages.size() > 0) {
-        messageQueue.addMessage(wsdlPerspective.getMessage("MSG_ERROR_XSD_VALIDATION"));
-        for (int i=0;i<errorMessages.size();i++)
-          messageQueue.addMessage((String)errorMessages.elementAt(i));
-      }            
-    }
-    catch (WSDLException e)
-    {
-      messageQueue.addMessage(wsdlPerspective.getMessage("MSG_ERROR_OPEN_WSDL",wsdlElement.getWsdlUrl()));          
-      handleUnexpectedException(wsdlPerspective,messageQueue,"WSDLException",e);
-      wsdlElement.setDefinition(definitionCopy);
-      wsdlElement.setSchemaList(schemaListCopy);
-      return false;
-    }
-
-    // build the datamodel for this WSDLElement
-    wsdlElement.buildModel();
-
-    // Select a new node if the previous selected node no longer exists
-    // If there is more than 1 service node, select the WSDL node. If there is more than 1 binding node, select the service node.
-    // If there is just the one service and binding node, select the binding node.
-    Node node = nodeManager.getNode(selectedNodeID);
-    if (node == null) {
-      selectedNodeID = wsdlNode.getNodeId();
-      Vector serviceNodes = wsdlNode.getChildNodes();
-      if (serviceNodes.size() == 1)
-      {
-        Node serviceNode = (Node)serviceNodes.elementAt(0);
-        Vector bindingNodes = serviceNode.getChildNodes();
-        if (bindingNodes.size() == 1)
-        {
-          Node bindingNode = (Node)bindingNodes.elementAt(0);
-          selectedNodeID = bindingNode.getNodeId();
-        }
-        else
-          selectedNodeID = serviceNode.getNodeId();
-      }
-      nodeManager.setSelectedNodeId(selectedNodeID);
-      nodeManager.makeNodeVisible(nodeManager.getNode(selectedNodeID));
-    }
-    messageQueue.addMessage(wsdlPerspective.getMessage("MSG_INFO_REFRESH_WSDL_SUCCESSFUL", wsdlElement.getWsdlUrl()));
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ResizeWSDLFramesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ResizeWSDLFramesAction.java
deleted file mode 100644
index db773fa3f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ResizeWSDLFramesAction.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.wsdl.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ResizeFramesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLFrameNames;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-
-public class ResizeWSDLFramesAction extends ResizeFramesAction
-{
-  public ResizeWSDLFramesAction(Controller controller)
-  {
-    super(controller);
-  }
-  
-  protected boolean processOthers(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    String perspectiveContentFramesetCols = parser.getParameter(WSDLActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
-    String actionsContainerFramesetRows = parser.getParameter(WSDLActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
-    if (perspectiveContentFramesetCols != null && actionsContainerFramesetRows != null)
-    {
-      propertyTable_.put(WSDLActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT,perspectiveContentFramesetCols);
-      propertyTable_.put(WSDLActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER,actionsContainerFramesetRows);
-      return true;
-    }
-    return false;
-  }
-  
-  public final boolean run()
-  {
-    // Save the current frameset sizes.
-    String frameName = (String)propertyTable_.get(ActionInputs.FRAME_NAME);
-    String perspectiveContentFramesetCols = (String)propertyTable_.get(WSDLActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
-    String actionsContainerFramesetRows = (String)propertyTable_.get(WSDLActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
-    WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
-    
-    // Set the new frameset sizes.
-    if (frameName.equals(WSDLFrameNames.WSDL_NAVIGATOR_CONTAINER))
-    {
-      wsdlPerspective.setActionsContainerFramesetRows(actionsContainerFramesetRows);
-      wsdlPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
-      if (perspectiveContentFramesetCols.startsWith("100%"))
-      {
-        // Restore.
-        wsdlPerspective.setPerspectiveContentFramesetCols(wsdlPerspective.getSavedPerspectiveContentFramesetCols());
-      }
-      else
-      {
-        // Maximize.
-        wsdlPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-        wsdlPerspective.setPerspectiveContentFramesetCols("100%,0%");
-      }
-    }
-    else if (frameName.equals(WSDLFrameNames.WSDL_PROPERTIES_CONTAINER))
-    {
-      if (actionsContainerFramesetRows.startsWith("100%"))
-      {
-        if (perspectiveContentFramesetCols.endsWith("100%"))
-        {
-          // Restore.
-          wsdlPerspective.setPerspectiveContentFramesetCols(wsdlPerspective.getSavedPerspectiveContentFramesetCols());
-          wsdlPerspective.setActionsContainerFramesetRows(wsdlPerspective.getSavedActionsContainerFramesetRows());
-        }
-        else
-        {
-          // Maximize.
-          wsdlPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-          wsdlPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
-          wsdlPerspective.setPerspectiveContentFramesetCols("0%,100%");
-        }
-      }
-      else
-      {
-        // Maximize.
-        wsdlPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
-        wsdlPerspective.setActionsContainerFramesetRows("100%,0%");
-        if (!perspectiveContentFramesetCols.endsWith("100%"))
-        {
-          wsdlPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-          wsdlPerspective.setPerspectiveContentFramesetCols("0%,100%");
-        }
-      }
-    }
-    else if (frameName.equals(WSDLFrameNames.WSDL_STATUS_CONTAINER))
-    {
-      if (actionsContainerFramesetRows.endsWith("100%"))
-      {
-        if (perspectiveContentFramesetCols.endsWith("100%"))
-        {
-          // Restore.
-          wsdlPerspective.setPerspectiveContentFramesetCols(wsdlPerspective.getSavedPerspectiveContentFramesetCols());
-          wsdlPerspective.setActionsContainerFramesetRows(wsdlPerspective.getSavedActionsContainerFramesetRows());
-        }
-        else
-        {
-          // Maximize.
-          wsdlPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-          wsdlPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
-          wsdlPerspective.setPerspectiveContentFramesetCols("0%,100%");
-        }
-      }
-      else
-      {
-        // Maximize.
-        wsdlPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
-        wsdlPerspective.setActionsContainerFramesetRows("0%,100%");
-        if (!perspectiveContentFramesetCols.endsWith("100%"))
-        {
-          wsdlPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-          wsdlPerspective.setPerspectiveContentFramesetCols("0%,100%");
-        }
-      }
-    }
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SelectWSDLNavigatorNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SelectWSDLNavigatorNodeAction.java
deleted file mode 100644
index 02b9fc74a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SelectWSDLNavigatorNodeAction.java
+++ /dev/null
@@ -1,70 +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.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.SelectNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ToolTypes;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class SelectWSDLNavigatorNodeAction extends SelectNodeAction
-{
-
-    public SelectWSDLNavigatorNodeAction(Controller controller)
-    {
-        super(controller,controller.getWSDLPerspective().getNodeManager());
-    }
-
-    public static String getActionLink(int nodeID, boolean forHistory)
-    {
-        StringBuffer actionLink = new StringBuffer("wsdl/actions/SelectWSDLNavigatorNodeActionJSP.jsp?");
-        actionLink.append(ActionInputs.NODEID).append('=').append(nodeID);
-        if (forHistory)
-            actionLink.append('&').append(ActionInputs.ISHISTORY).append("=1");
-        return actionLink.toString();
-    }
-
-    protected String getActionLinkForHistory()
-    {
-      ToolManager toolManager = selectedNode_.getToolManager();
-      Tool selectedTool = toolManager.getSelectedTool();
-      int nodeId = selectedNode_.getNodeId();
-      
-      if (selectedTool.getToolType() != ToolTypes.ACTION)
-        return selectedTool.getSelectToolActionHref(true);
-      else
-        return getActionLink(nodeId,true);
-    }
-
-    public final String getTreeContentVar() {
-        return "wsdlNavigatorContent";
-    }
-
-    public final String getTreeContentPage() {
-        return "wsdl/wsdl_navigator_content.jsp";
-    }
-
-    public final String getPropertiesContainerVar() {
-        return "wsdlPropertiesContainer";
-    }
-
-    public final String getPropertiesContainerPage() {
-        return "wsdl/wsdl_properties_container.jsp";
-    }
-    
-    public final int getPerspectiveId()
-    {
-      return ActionInputs.PERSPECTIVE_WSDL;
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SelectWSDLPropertiesToolAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SelectWSDLPropertiesToolAction.java
deleted file mode 100644
index aedd18c7f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SelectWSDLPropertiesToolAction.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.ws.internal.explorer.platform.wsdl.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.SelectNodeToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-
-public class SelectWSDLPropertiesToolAction extends SelectNodeToolAction
-{
-
-    public SelectWSDLPropertiesToolAction(Controller controller)
-    {
-        super(controller, controller.getWSDLPerspective().getNodeManager());
-    }
-
-    public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID, boolean keepHistory)
-    {
-        StringBuffer actionLink = new StringBuffer("wsdl/actions/SelectWSDLPropertiesToolActionJSP.jsp?");
-        actionLink.append(ActionInputs.NODEID);
-        actionLink.append('=');
-        actionLink.append(nodeID);
-        actionLink.append('&');
-        actionLink.append(ActionInputs.TOOLID);
-        actionLink.append('=');
-        actionLink.append(toolID);
-        if (viewID != ActionInputs.VIEWID_DEFAULT) {
-            actionLink.append('&');
-            actionLink.append(ActionInputs.VIEWID);
-            actionLink.append('=');
-            actionLink.append(viewID);
-            actionLink.append('&');
-            actionLink.append(ActionInputs.VIEWTOOLID);
-            actionLink.append('=');
-            actionLink.append(viewToolID);
-        }
-        if (keepHistory) {
-            actionLink.append('&');
-            actionLink.append(ActionInputs.ISHISTORY);
-            actionLink.append("=1");
-        }
-        return actionLink.toString();
-    }
-
-    protected String getActionLinkForHistory()
-    {
-        int nodeId = selectedNode_.getNodeId();
-        int toolId = selectedTool_.getToolId();
-        int viewId = selectedNode_.getViewId();
-        int viewToolId = selectedNode_.getViewToolId();
-        return getActionLink(nodeId,toolId,viewId,viewToolId,true);
-    }
-
-    public final String getTreeContentVar() {
-        return "wsdlNavigatorContent";
-    }
-
-    public final String getTreeContentPage() {
-        return "wsdl/wsdl_navigator_content.jsp";
-    }
-
-    public final String getPropertiesContainerVar() {
-        return "wsdlPropertiesContainer";
-    }
-
-    public final String getPropertiesContainerPage() {
-        return "wsdl/wsdl_properties_container.jsp";
-    }
-
-    public final String getPropertiesContentVar() {
-        return "wsdlPropertiesContent";
-    }
-
-    public final String getPropertiesContentPage() {
-        return "wsdl/wsdl_properties_content.jsp";
-    }
-    
-    public final int getPerspectiveId()
-    {
-      return ActionInputs.PERSPECTIVE_WSDL;
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SwitchPerspectiveFromWSDLAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SwitchPerspectiveFromWSDLAction.java
deleted file mode 100644
index 7b5574885..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SwitchPerspectiveFromWSDLAction.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.ws.internal.explorer.platform.wsdl.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ShowPerspectiveAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-
-public final class SwitchPerspectiveFromWSDLAction extends ShowPerspectiveAction
-{
-  public SwitchPerspectiveFromWSDLAction(Controller controller)
-  {
-    super(controller);
-  }
-  
-  protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    String perspectiveContentFramesetCols = parser.getParameter(WSDLActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
-    String actionsContainerFramesetRows = parser.getParameter(WSDLActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
-    if (perspectiveContentFramesetCols != null && actionsContainerFramesetRows != null)
-    {
-      propertyTable_.put(WSDLActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT,perspectiveContentFramesetCols);
-      propertyTable_.put(WSDLActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER,actionsContainerFramesetRows);
-      return true;
-    }
-    return false;
-  }
-  
-  public final boolean run()
-  {
-    String perspectiveContentFramesetCols = (String)propertyTable_.get(WSDLActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
-    String actionsContainerFramesetRows = (String)propertyTable_.get(WSDLActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
-    
-    // Save the frameset sizes iff no frame is maximized.
-    WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
-    if (!perspectiveContentFramesetCols.startsWith("100%") && !perspectiveContentFramesetCols.endsWith("100%"))
-      wsdlPerspective.setPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-      
-    if (!actionsContainerFramesetRows.startsWith("100%") && !actionsContainerFramesetRows.endsWith("100%"))
-      wsdlPerspective.setActionsContainerFramesetRows(actionsContainerFramesetRows);
-      
-    return super.run();
-  }
-  
-  public static final String getFormActionLink(int targetPerspectiveId,boolean forHistory)
-  {
-    StringBuffer formLink = new StringBuffer("wsdl/actions/SwitchPerspectiveFromWSDLActionJSP.jsp?");
-    formLink.append(ActionInputs.PERSPECTIVE).append('=').append(targetPerspectiveId);
-    if (forHistory)
-      formLink.append('&').append(ActionInputs.ISHISTORY).append("=1");    
-    return formLink.toString();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SynchronizeFragmentViewsAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SynchronizeFragmentViewsAction.java
deleted file mode 100644
index 7c531e446..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SynchronizeFragmentViewsAction.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.wsdl.actions;
-
-import java.util.Iterator;
-import java.util.Vector;
-import javax.wsdl.Part;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.XMLUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLOperationElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.InvokeWSDLOperationTool;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-public class SynchronizeFragmentViewsAction extends WSDLPropertiesFormAction
-{
-  public SynchronizeFragmentViewsAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    super.processParsedResults(parser);
-    Node selectedNode = getSelectedNavigatorNode();
-    WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-    Iterator it = operElement.getOrderedBodyParts().iterator();
-    InvokeWSDLOperationTool invokeWSDLOperationTool = (InvokeWSDLOperationTool)(selectedNode.getCurrentToolManager().getSelectedTool());
-    String viewID = parser.getParameter(FragmentConstants.FRAGMENT_VIEW_ID);
-    propertyTable_.put(FragmentConstants.FRAGMENT_VIEW_ID, viewID);
-    if (viewID.equals(FragmentConstants.FRAGMENT_VIEW_SWITCH_FORM_TO_SOURCE))
-    {
-      invokeWSDLOperationTool.setFragmentViewID(FragmentConstants.FRAGMENT_VIEW_SWITCH_FORM_TO_SOURCE);
-      return processFormViewParsedResults(parser, operElement, it);
-    }
-    else
-    {
-      invokeWSDLOperationTool.setFragmentViewID(FragmentConstants.FRAGMENT_VIEW_SWITCH_SOURCE_TO_FORM);
-      return processSourceViewParsedResults(parser, operElement, it);
-    }
-  }
-
-  private boolean processFormViewParsedResults(MultipartFormDataParser parser, WSDLOperationElement operElement, Iterator it) throws MultipartFormDataException
-  {
-    operElement.setPropertyAsObject(WSDLModelConstants.PROP_SOURCE_CONTENT, null);
-    operElement.setPropertyAsObject(WSDLModelConstants.PROP_SOURCE_CONTENT_NAMESPACE, null);
-    boolean resultsValid = true;
-    while (it.hasNext())
-    {
-      Part part = (Part)it.next();
-      IXSDFragment frag = operElement.getFragment(part);
-      if (!frag.processParameterValues(parser))
-        resultsValid = false;
-    }
-    if (resultsValid)
-      operElement.setPropertyAsString(WSDLModelConstants.PROP_SOURCE_CONTENT,null);
-    return resultsValid;
-  }
-
-  private boolean processSourceViewParsedResults(MultipartFormDataParser parser, WSDLOperationElement operElement, Iterator it) throws MultipartFormDataException
-  {
-    String sourceContent = parser.getParameter(FragmentConstants.SOURCE_CONTENT);
-    if (sourceContent != null)
-      operElement.setPropertyAsString(WSDLModelConstants.PROP_SOURCE_CONTENT, sourceContent);
-    String[] nsDeclarations = parser.getParameterValues(FragmentConstants.SOURCE_CONTENT_NAMESPACE);
-    if (nsDeclarations != null)
-      operElement.setPropertyAsObject(WSDLModelConstants.PROP_SOURCE_CONTENT_NAMESPACE,nsDeclarations);
-    sourceContent = addRootElement(sourceContent);
-    try
-    {
-      Element sourceElements = XMLUtils.stringToElement(sourceContent);
-      NodeList nl = sourceElements.getChildNodes();
-      Vector elementsVector = new Vector();
-      for (int i = 0; i < nl.getLength(); i++)
-      {
-        org.w3c.dom.Node node = nl.item(i);
-        if (node != null && node instanceof Element)
-          elementsVector.add(node);
-      }
-      Element[] instanceDocuments = new Element[elementsVector.size()];
-      elementsVector.copyInto(instanceDocuments);
-      boolean sourceElementsValid = true;
-      while (it.hasNext())
-      {
-        Part part = (Part)it.next();
-        IXSDFragment frag = operElement.getFragment(part);
-        if (!frag.setParameterValuesFromInstanceDocuments(instanceDocuments))
-          sourceElementsValid = false;
-      }
-      return sourceElementsValid;
-    }
-    catch (Throwable t)
-    {
-      return false;
-    }
-  }
-
-  private String addRootElement(String element)
-  {
-    StringBuffer sb = new StringBuffer();
-    sb.append(FragmentConstants.ROOT_ELEMENT_START_TAG);
-    sb.append(element);
-    sb.append(FragmentConstants.ROOT_ELEMENT_END_TAG);
-    return sb.toString();
-  }
-
-  public boolean run() {
-    return true;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ToggleWSDLNavigatorNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ToggleWSDLNavigatorNodeAction.java
deleted file mode 100644
index d4e680102..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ToggleWSDLNavigatorNodeAction.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.ws.internal.explorer.platform.wsdl.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ToggleNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ToolTypes;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class ToggleWSDLNavigatorNodeAction extends ToggleNodeAction
-{
-  public ToggleWSDLNavigatorNodeAction(Controller controller)
-  {
-    super(controller,controller.getWSDLPerspective().getNodeManager());
-  }
-
-  // uddi/actions/ToggleNavigatorNodeAction.jsp?nodeId=...&open=...
-  public static String getActionLink(int nodeId,boolean open)
-  {
-    StringBuffer actionLink = new StringBuffer("wsdl/actions/ToggleWSDLNavigatorNodeActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
-    actionLink.append('&').append(ActionInputs.OPEN).append('=').append(open?ActionInputs.OPEN_NODE:ActionInputs.CLOSE_NODE);
-    return actionLink.toString();
-  }
-
-  // This should be called only to select the toggled node when, at the time of
-  // the collapse event, a descendant node was selected.
-  public final String getActionLinkForHistory()
-  {
-    ToolManager toolManager = toggledNode_.getToolManager();
-    Tool selectedTool = toolManager.getSelectedTool();
-    int nodeId = toggledNode_.getNodeId();
-    int toolId = selectedTool.getToolId();
-    int viewId = toggledNode_.getViewId();
-    int viewToolId = toggledNode_.getViewToolId();
-    if (selectedTool.getToolType() != ToolTypes.ACTION)
-      return SelectWSDLPropertiesToolAction.getActionLink(nodeId,toolId,viewId,viewToolId,true);
-    else
-      return SelectWSDLNavigatorNodeAction.getActionLink(nodeId,true);
-  }
-
-    public final String getTreeContentVar()
-    {
-      return "wsdlNavigatorContent";
-    }
-
-    public final String getTreeContentPage()
-    {
-      return "wsdl/wsdl_navigator_content.jsp";
-    }
-
-    public final String getPropertiesContainerVar()
-    {
-      return "wsdlPropertiesContainer";
-    }
-
-    public final String getPropertiesContainerPage()
-    {
-      return "wsdl/wsdl_properties_container.jsp";
-    }
-    
-    public final int getPerspectiveId()
-    {
-      return ActionInputs.PERSPECTIVE_WSDL;
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/UpdateWSDLBindingAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/UpdateWSDLBindingAction.java
deleted file mode 100644
index c02dc5b32..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/UpdateWSDLBindingAction.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.wsdl.actions;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLBindingElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.InvokeWSDLOperationTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLBindingNode;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-
-public class UpdateWSDLBindingAction extends WSDLPropertiesFormAction
-{
-  public UpdateWSDLBindingAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    String[] nodeIds = parser.getParameterValues(ActionInputs.NODEID);
-    if (nodeIds == null)
-      nodeIds = new String[0];
-    propertyTable_.put(ActionInputs.NODEID, nodeIds);
-    String[] endpoints = parser.getParameterValues(WSDLActionInputs.END_POINT);
-    if (endpoints == null)
-      endpoints = new String[0];
-    propertyTable_.put(WSDLActionInputs.END_POINT, endpoints);
-    return true;
-  }
-
-  public boolean run()
-  {
-    String[] nodeIds = getPropertyAsStringArray(ActionInputs.NODEID);
-    String[] endpoints = getPropertyAsStringArray(WSDLActionInputs.END_POINT);
-    WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
-    NodeManager nodeManager = wsdlPerspective.getNodeManager();
-    for (int i = 0; i < nodeIds.length; i++)
-    {
-      try
-      {
-        Node bindingNode = nodeManager.getNode(Integer.parseInt(nodeIds[i]));
-        if (bindingNode instanceof WSDLBindingNode)
-        {
-          WSDLBindingElement bindingElement = (WSDLBindingElement)bindingNode.getTreeElement();
-          String[] endpointsCopy = endpoints;
-          bindingElement.setEndPoints(endpointsCopy);
-          if (endpointsCopy.length <= 0)
-            endpointsCopy = bindingElement.getEndPoints();
-          if (endpointsCopy.length > 0)
-          {
-            Vector operationNodes = bindingNode.getChildNodes();
-            for (Iterator it = operationNodes.iterator(); it.hasNext();)
-            {
-              Node operationNode = (Node)it.next();
-              List tools = operationNode.getCurrentToolManager().getTools();
-              for (Iterator toolsIterator = tools.iterator(); toolsIterator.hasNext();)
-              {
-                Tool tool = (Tool)toolsIterator.next();
-                if (tool instanceof InvokeWSDLOperationTool)
-                  ((InvokeWSDLOperationTool)tool).setEndPoint(endpointsCopy[0]);
-              }
-            }
-          }
-        }
-      }
-      catch (NumberFormatException nfe)
-      {
-      }
-    }
-    MessageQueue messageQueue = wsdlPerspective.getMessageQueue();
-    messageQueue.addMessage(wsdlPerspective.getMessage("MSG_INFO_UPDATE_WSDL_BINDING_SUCCESSFUL"));
-    return true;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLAddToFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLAddToFavoritesAction.java
deleted file mode 100644
index 16bcb04c1..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLAddToFavoritesAction.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.wsdl.actions;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.LinkAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-
-public class WSDLAddToFavoritesAction extends LinkAction {
-  public WSDLAddToFavoritesAction(Controller controller) {
-    super(controller);
-  }
-
-  protected boolean processLinkParameters(HttpServletRequest request) {
-    String nodeID = request.getParameter(ActionInputs.NODEID);
-    try {
-      Integer.parseInt(nodeID);
-      propertyTable_.put(ActionInputs.NODEID, nodeID);
-      return true;
-    }
-    catch (Throwable t) {
-      return false;
-    }
-  }
-
-  public static String getActionLink(int nodeID) {
-    StringBuffer actionLink = new StringBuffer("wsdl/actions/WSDLCheckFavoriteExistsActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID);
-    actionLink.append('=');
-    actionLink.append(nodeID);
-    return actionLink.toString();
-  }
-
-  public boolean favoriteExists() {
-    String wsdlUrl = getWsdlUrl();
-    Hashtable table = new Hashtable();
-    table.put(FavoritesModelConstants.PROP_WSDL_URL, wsdlUrl);
-    FavoritesFolderElement favFolderElement = getFavWSDLFolderElement();
-    return favFolderElement.favoriteExists(table);
-  }
-
-  public boolean run() {
-    WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
-    String wsdlUrl = getWsdlUrl();
-    Hashtable table = new Hashtable();
-    table.put(FavoritesModelConstants.PROP_WSDL_URL, wsdlUrl);
-    FavoritesFolderElement favFolderElement = getFavWSDLFolderElement();
-    if (favFolderElement.addFavorite(table)) {
-      wsdlPerspective.getMessageQueue().addMessage(wsdlPerspective.getMessage("MSG_INFO_ADD_TO_FAVORITES_SUCCESSFUL", wsdlUrl));
-      return true;
-    }
-    else {
-      wsdlPerspective.getMessageQueue().addMessage(wsdlPerspective.getMessage("MSG_ERROR_ADD_TO_FAVORITES", wsdlUrl));
-      return false;
-    }
-  }
-
-  private String getWsdlUrl() {
-    String nodeID = (String)propertyTable_.get(ActionInputs.NODEID);
-    WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
-    NodeManager wsdlNodeManager = wsdlPerspective.getNodeManager();
-    WSDLElement selectedElement = (WSDLElement)wsdlNodeManager.getNode(Integer.parseInt(nodeID)).getTreeElement();
-    return selectedElement.getWsdlUrl();
-  }
-
-  private FavoritesFolderElement getFavWSDLFolderElement() {
-    FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
-    NodeManager favNodeManager = favPerspective.getNodeManager();
-    TreeElement favRootElement = favNodeManager.getRootNode().getTreeElement();
-    Enumeration e = favRootElement.getElements(FavoritesModelConstants.REL_WSDL_SERVICE_FOLDER_NODE);
-    return (FavoritesFolderElement)e.nextElement();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLImportWSDLToFileSystemAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLImportWSDLToFileSystemAction.java
deleted file mode 100644
index 403fcc3bb..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLImportWSDLToFileSystemAction.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import java.io.OutputStream;
-import javax.wsdl.Definition;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToFileSystemAction;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.WSDLFileNameHelper;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-
-public class WSDLImportWSDLToFileSystemAction extends ImportToFileSystemAction {
-  private Definition definition_;
-  private String defaultWSDLFileName_;
-
-  public WSDLImportWSDLToFileSystemAction(Controller controller) {
-    super(controller);
-    definition_ = null;
-    defaultWSDLFileName_ = "temp.wsdl";
-  }
-
-  public static final String getActionLink(int nodeId,int toolId,int viewId,int viewToolId) {
-    return ImportToFileSystemAction.getActionLink(nodeId,toolId,viewId,viewToolId,"wsdl/actions/WSDLImportWSDLToFileSystemActionJSP.jsp");
-  }
-
-  public final boolean write(OutputStream os) {
-    return writeWSDLDefinition(os, definition_);
-  }
-
-  public final String getDefaultFileName() {
-    return defaultWSDLFileName_;
-  }
-
-  public final boolean run() {
-    int nodeID;
-    try {
-      nodeID = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-    }
-    catch (NumberFormatException nfe) {
-        return false;
-    }
-    WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
-    NodeManager nodeManager = wsdlPerspective.getNodeManager();
-    Node node = nodeManager.getNode(nodeID);
-    WSDLElement wsdlElement = (WSDLElement)node.getTreeElement();
-    definition_ = wsdlElement.getDefinition();
-    defaultWSDLFileName_ = WSDLFileNameHelper.getWSDLFileName(wsdlElement.getWsdlUrl());
-    return (definition_ != null);
-  }
-
-  public final String getStatusContentVar() {
-    return controller_.getWSDLPerspective().getStatusContentVar();
-  }
-
-  public final String getStatusContentPage() {
-    return controller_.getWSDLPerspective().getStatusContentPage();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLImportWSDLToWorkbenchAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLImportWSDLToWorkbenchAction.java
deleted file mode 100644
index d7d8b0202..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLImportWSDLToWorkbenchAction.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.ws.internal.explorer.platform.wsdl.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToFileSystemAction;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToWorkbenchAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-
-public class WSDLImportWSDLToWorkbenchAction extends ImportToWorkbenchAction {
-  public WSDLImportWSDLToWorkbenchAction(Controller controller) {
-    super(controller);
-  }
-
-  public FormTool getSelectedFormTool() {
-    WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
-    return (FormTool)wsdlPerspective.getNodeManager().getSelectedNode().getCurrentToolManager().getSelectedTool();
-  }
-
-  public ImportToFileSystemAction newImportToFileSystemAction() {
-    WSDLImportWSDLToFileSystemAction action = new WSDLImportWSDLToFileSystemAction(controller_);
-    Hashtable table = action.getPropertyTable();
-    WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
-    NodeManager nodeManager = wsdlPerspective.getNodeManager();
-    Node selectedNode = nodeManager.getSelectedNode();
-    table.put(ActionInputs.NODEID, String.valueOf(selectedNode.getNodeId()));
-    return action;
-  }
-
-  public final String getStatusContentVar() {
-    return controller_.getWSDLPerspective().getStatusContentVar();
-  }
-
-  public final String getStatusContentPage() {
-    return controller_.getWSDLPerspective().getStatusContentPage();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLLaunchWebServiceWizardAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLLaunchWebServiceWizardAction.java
deleted file mode 100644
index b4ade72a8..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLLaunchWebServiceWizardAction.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.wsdl.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.LaunchWebServiceWizardAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-
-public class WSDLLaunchWebServiceWizardAction extends LaunchWebServiceWizardAction {
-
-  public WSDLLaunchWebServiceWizardAction(Controller controller) {
-    super(controller);
-  }
-
-  public FormTool getSelectedFormTool() {
-    WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
-    return (FormTool)wsdlPerspective.getNodeManager().getSelectedNode().getCurrentToolManager().getSelectedTool();
-  }
-
-  public boolean run() {
-    WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
-    NodeManager nodeManager = wsdlPerspective.getNodeManager();
-    Node node = nodeManager.getSelectedNode();
-    WSDLElement element = (WSDLElement)node.getTreeElement();
-    return launchWizard(element.getWsdlUrl());
-  }
-
-  public final String getStatusContentVar() {
-    return controller_.getWSDLPerspective().getStatusContentVar();
-  }
-
-  public final String getStatusContentPage() {
-    return controller_.getWSDLPerspective().getStatusContentPage();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLPropertiesFormAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLPropertiesFormAction.java
deleted file mode 100644
index f2c3cf4a0..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLPropertiesFormAction.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.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.FormAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-
-public abstract class WSDLPropertiesFormAction extends FormAction
-{
-  protected NodeManager navigatorManager_;
-  public WSDLPropertiesFormAction(Controller controller)
-  {
-    super(controller);
-    navigatorManager_ = controller.getWSDLPerspective().getNodeManager();
-  }
-
-  protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    String[] keys = parser.getParameterNames();
-    for (int i = 0; i < keys.length; i++)
-    {
-      String[] values = parser.getParameterValues(keys[i]);
-      if (values != null)
-      {
-        if (values.length == 1)
-          propertyTable_.put(keys[i], values[0]);
-        else if (values.length > 1)
-          propertyTable_.put(keys[i], values);
-      }
-    }
-    return true;
-  }
-
-  public Node getSelectedNavigatorNode()
-  {
-    return navigatorManager_.getSelectedNode();
-  }
-
-  public FormTool getSelectedFormTool()
-  {
-    return (FormTool)(getSelectedNavigatorNode().getCurrentToolManager().getSelectedTool());
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/BindingTypes.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/BindingTypes.java
deleted file mode 100644
index ed8af597f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/BindingTypes.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.ws.internal.explorer.platform.wsdl.constants;
-
-public class BindingTypes
-{
-  public static final int UNSUPPORTED = -1;
-  public static final int SOAP = 0;
-  public static final int HTTP_GET = 1;
-  public static final int HTTP_POST = 2;
-  
-  public static final String HTTP_VERB_GET = "GET";
-  public static final String HTTP_VERB_POST = "POST";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/FragmentConstants.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/FragmentConstants.java
deleted file mode 100644
index 145d9dad1..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/FragmentConstants.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.wsdl.constants;
-
-public class FragmentConstants
-{
-  // XSD minOccurs and maxOccurs
-  public static final int DEFAULT_MIN_OCCURS = 1;
-  public static final int DEFAULT_MAX_OCCURS = 1;
-  public static final int UNBOUNDED = -1;
-
-  // WSDL style
-  public static final int STYLE_DOCUMENT = 0;
-  public static final int STYLE_RPC = 1;
-
-  // WSDL Encoding styles
-  public static final int ENCODING_LITERAL = 0;
-  public static final int ENCODING_SOAP = 1;
-  public static final int ENCODING_URL = 2; // HTTP Get/Post
-
-  // IDs used by the fragment model
-  public static final String ID_SEPERATOR = "::";
-  public static final String INPUT_ID = "::input";
-  public static final String OUTPUT_ID = "::output";
-  public static final String TABLE_ID = "::tableID";
-  public static final String FRAGMENT_ID = "::fragmentID";
-  public static final String NAME_ANCHOR_ID = "::nameAnchorID";
-  public static final String FRAGMENT_VIEW_ID = "::fragmentViewID";
-  public static final String XSD_ATOMIC_ENUM_ID = "::xsdAtomicEnumID";
-  public static final String XSD_ALL_GROUP_ID = "::xsdAllGroupID";
-
-  // Fragment view IDs
-  public static final String FRAGMENT_VIEW_SWITCH_FORM_TO_SOURCE = "::fragmentViewSwitchFormToSource";
-  public static final String FRAGMENT_VIEW_SWITCH_SOURCE_TO_FORM = "::fragmentViewSwitchSourceToForm";
-  public static final String SOURCE_CONTENT = "::sourceContent";
-  public static final String SOURCE_CONTENT_NAMESPACE = "::sourceContentNS";
-
-  // Action input constants
-  public static final String NAME_ANCHOR = "nameAnchor";
-
-  // Namespaces contants
-  public static final String URI_XSD = "http://www.w3.org/2001/XMLSchema";
-  public static final String URI_SOAP = "http://schemas.xmlsoap.org/soap/encoding/";
-  public static final String URI_SOAP_ENV = "http://schemas.xmlsoap.org/soap/envelope/";
-  public static final String URI_WSDL = "http://schemas.xmlsoap.org/wsdl/";
-  public static final String URI_XSI = "http://www.w3.org/2001/XMLSchema-instance";
-  public static final String SOAP_ENC_ARRAY_TYPE = "arrayType";
-  public static final String XSI_TYPE = "type";
-  public static final String QNAME_PREFIX = "q";
-  public static final String QNAME_LOCAL_NAME_ARRAY_TYPE = "arrayType";
-  public static final String QNAME_LOCAL_NAME_ARRAY = "Array";
-  public static final String COLON = ":";
-  public static final String QNAME_LOCAL_NAME_BODY = "Body";
-  public static final String QNAME_LOCAL_NAME_FAULT = "Fault";
-
-  // List
-  public static final String LIST_SEPERATOR = " ";
-
-  // SOAP-ENC:Array
-  public static final String LEFT_SQUARE_BRACKET = "[";
-  public static final String RIGHT_SQUARE_BRACKET = "]";
-
-  // XSDDefaultFragment
-  public static final String ROOT_ELEMENT_START_TAG = "<root>";
-  public static final String ROOT_ELEMENT_END_TAG = "</root>";
-
-  // Namespace URIs.
-  public static final String NS_URI_XMLNS = "http://www.w3.org/2000/xmlns/";
-  public static final String NS_URI_SOAP_ENV = "http://schemas.xmlsoap.org/soap/envelope/";
-  public static final String NS_URI_SOAP_ENC = "http://schemas.xmlsoap.org/soap/encoding/";
-  public static final String NS_URI_1999_SCHEMA_XSI = "http://www.w3.org/1999/XMLSchema-instance";
-  public static final String NS_URI_1999_SCHEMA_XSD = "http://www.w3.org/1999/XMLSchema";
-  public static final String NS_URI_2000_SCHEMA_XSI = "http://www.w3.org/2000/10/XMLSchema-instance";
-  public static final String NS_URI_2000_SCHEMA_XSD = "http://www.w3.org/2000/10/XMLSchema";
-  public static final String NS_URI_2001_SCHEMA_XSI = "http://www.w3.org/2001/XMLSchema-instance";
-  public static final String NS_URI_2001_SCHEMA_XSD = "http://www.w3.org/2001/XMLSchema";
-  public static final String NS_URI_CURRENT_SCHEMA_XSI = NS_URI_2001_SCHEMA_XSI;
-  public static final String NS_URI_CURRENT_SCHEMA_XSD = NS_URI_2001_SCHEMA_XSD;
-  public static final String NS_URI_XML_SOAP = "http://xml.apache.org/xml-soap";
-  public static final String NS_URI_XML_SOAP_DEPLOYMENT = "http://xml.apache.org/xml-soap/deployment";
-  public static final String NS_URI_LITERAL_XML = "http://xml.apache.org/xml-soap/literalxml";
-  public static final String NS_URI_XMI_ENC = "http://www.ibm.com/namespaces/xmi";
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/WSDLActionInputs.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/WSDLActionInputs.java
deleted file mode 100644
index 341de9105..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/WSDLActionInputs.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.ws.internal.explorer.platform.wsdl.constants;
-
-public class WSDLActionInputs
-{
-  public static final String FRAMESET_COLS_PERSPECTIVE_CONTENT = "framesetColsPerspectiveContent";
-  public static final String FRAMESET_ROWS_ACTIONS_CONTAINER = "framesetRowsActionsContainer";
-
-  public static final String SESSION_ID = "sessionID";
-  public static final String FRAGMENT_ID = "fragmentID";
-
-  public static final String SOAP_ENVELOPE_TYPE = "soapEnvelopeType";
-  public static final int SOAP_ENVELOPE_TYPE_REQUEST = 0;
-  public static final int SOAP_ENVELOPE_TYPE_RESPONSE = 1;
-  public static final String SOAP_RESPONSE_CACHED = "soapResponseCached";
-
-  public static final String SUBMISSION_ACTION = "submissionAction";
-  public static final String SUBMISSION_ACTION_FORM = "submissionActionForm";
-  public static final String SUBMISSION_ACTION_BROWSE_FILE = "submissionActionBrowseFile";
-  public static final String SUBMISSION_ACTION_SAVE_AS = "submissionActionSaveAs";
-  public static final String SELECTED_FILE = "selectedFile";
-  public static final String OPERATION_ELEMENT = "operationElement";
-
-  public static final String END_POINT = "::endPoint";
-  public static final String HTTP_BASIC_AUTH_USERNAME = "httpBasicAuthUsername";
-  public static final String HTTP_BASIC_AUTH_PASSWORD = "httpBasicAuthPassword";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/WSDLFrameNames.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/WSDLFrameNames.java
deleted file mode 100644
index 29f7137e8..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/WSDLFrameNames.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants;
-
-public class WSDLFrameNames
-{
-  public final static String WSDL_NAVIGATOR_CONTAINER = "wsdl_navigator_container";
-  public final static String WSDL_NAVIGATOR_TOOLBAR = "wsdl_navigator_toolbar";
-  public final static String WSDL_NAVIGATOR_CONTENT = "wsdl_navigator_content";
-  public final static String WSDL_ACTIONS_CONTAINER = "wsdl_actions_container";
-  public final static String WSDL_PROPERTIES_CONTAINER = "wsdl_properties_container";
-  public final static String WSDL_PROPERTIES_TOOLBAR = "wsdl_properties_toolbar";
-  public final static String WSDL_PROPERTIES_CONTENT = "wsdl_properties_content";
-  public final static String WSDL_STATUS_CONTAINER = "wsdl_status_container";
-  public final static String WSDL_STATUS_TOOLBAR = "wsdl_status_toolbar";
-  public final static String WSDL_STATUS_CONTENT = "wsdl_status_content";
-
-  // XSD Info Dialog
-  public final static String XSD_INFO_TOOLBAR = "xsd_info_toolbar";
-  public final static String XSD_INFO_CONTENT = "xsd_info_content";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/WSDLModelConstants.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/WSDLModelConstants.java
deleted file mode 100644
index 13b19b674..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/WSDLModelConstants.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants;
-
-public class WSDLModelConstants
-{
-    // Relation
-    public final static String REL_WSDL = "relWSDL";
-    public final static String REL_WSDL_SERVICE = "relWSDLService";
-    public final static String REL_WSDL_BINDING = "relWSDLBinding";
-    public final static String REL_WSDL_OPERATION = "relWSDLOperation";
-
-    // Documentation
-    public final static String PROP_DOCUMENTATION = "propDocumentation";
-
-    // Source Content
-    public final static String PROP_SOURCE_CONTENT = "propSourceContent";
-    public final static String PROP_SOURCE_CONTENT_NAMESPACE = "propSourceContentNS";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/Endpoint.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/Endpoint.java
deleted file mode 100644
index ea3c92fd9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/Endpoint.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel;
-
-public class Endpoint
-{
-  private String endpoint;
-  private boolean requireHTTPBasicAuth;
-  private String httpBasicAuthUsername;
-  private String httpBasicAuthPassword;
-  
-  public Endpoint()
-  {
-    endpoint = null;
-    requireHTTPBasicAuth = false;
-    httpBasicAuthUsername = null;
-    httpBasicAuthPassword = null;
-  }
-
-  public String getEndpoint()
-  {
-    return endpoint;
-  }
-  
-  public void setEndpoint(String endpoint)
-  {
-    this.endpoint = endpoint;
-  }
-  
-  public boolean isRequireHTTPBasicAuth()
-  {
-    return requireHTTPBasicAuth;
-  }
-  
-  public void setRequireHTTPBasicAuth(boolean requireHTTPBasicAuth)
-  {
-    this.requireHTTPBasicAuth = requireHTTPBasicAuth;
-  }
-  
-  public String getHttpBasicAuthUsername()
-  {
-    return httpBasicAuthUsername;
-  }
-  
-  public void setHttpBasicAuthUsername(String httpBasicAuthUsername)
-  {
-    this.httpBasicAuthUsername = httpBasicAuthUsername;
-  }
-  
-  public String getHttpBasicAuthPassword()
-  {
-    return httpBasicAuthPassword;
-  }
-  
-  public void setHttpBasicAuthPassword(String httpBasicAuthPassword)
-  {
-    this.httpBasicAuthPassword = httpBasicAuthPassword;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLBindingElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLBindingElement.java
deleted file mode 100644
index e10fe7e6f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLBindingElement.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.wsdl.datamodel;
-
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-import javax.wsdl.Binding;
-import javax.wsdl.Input;
-import javax.wsdl.Operation;
-import javax.wsdl.Output;
-import javax.wsdl.PortType;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.http.HTTPBinding;
-import javax.wsdl.extensions.soap.SOAPBinding;
-import javax.xml.namespace.QName;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.BindingTypes;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLModelConstants;
-
-public class WSDLBindingElement extends WSDLCommonElement
-{
-  private int bindingType_;
-  private Binding binding_;
-  private ExtensibilityElement bindingExtensibilityElement_;
-  private Vector endPoints_;
-
-  private final void setBindingExtensibilityElement()
-  {
-    bindingExtensibilityElement_ = null;
-    bindingType_ = BindingTypes.UNSUPPORTED;
-    List extensibilityElements = binding_.getExtensibilityElements();
-    for (Iterator i = extensibilityElements.iterator();i.hasNext();)
-    {
-      ExtensibilityElement e = (ExtensibilityElement)i.next();
-      if (e instanceof HTTPBinding)
-      {
-        HTTPBinding binding = (HTTPBinding)e;
-        String verb = binding.getVerb();
-        if (BindingTypes.HTTP_VERB_GET.equals(verb))
-          bindingType_ = BindingTypes.HTTP_GET;
-        else if (BindingTypes.HTTP_VERB_POST.equals(verb))
-          bindingType_ = BindingTypes.HTTP_POST;
-      }
-      else if (e instanceof SOAPBinding)
-        bindingType_ = BindingTypes.SOAP;
-      if (bindingType_ != BindingTypes.UNSUPPORTED)
-      {
-        bindingExtensibilityElement_ = e;
-        break;
-      }
-    }
-  }
-  
-  public WSDLBindingElement(String name, Model model, Binding binding)
-  {
-    super(name, model);
-    setBinding(binding);
-    endPoints_ = new Vector();
-  }
-
-  public void setBinding(Binding binding) {
-    binding_ = binding;
-    setDocumentation(binding.getDocumentationElement());
-    setBindingExtensibilityElement();
-  }
-
-  public Binding getBinding() {
-    return binding_;
-  }
-  
-  public ExtensibilityElement getBindingExtensibilityElement()
-  {
-    return bindingExtensibilityElement_;
-  }
-  
-  public int getBindingType()
-  {
-    return bindingType_;
-  }
-
-  private void resetEndPoints()
-  {
-    WSDLServiceElement serviceElement = (WSDLServiceElement)getParentElement();
-    String fixedEndpointString = serviceElement.getAddressLocation(binding_);
-    Endpoint fixedEndpoint = getEndpoint(fixedEndpointString);
-    if (fixedEndpoint == null)
-    {
-      fixedEndpoint = new Endpoint();
-      fixedEndpoint.setEndpoint(fixedEndpointString);
-    }
-    endPoints_.clear();
-    endPoints_.add(fixedEndpoint);
-  }
-
-  public String[] getEndPoints()
-  {
-    String[] endPoints = new String[endPoints_.size()];
-    for (int i = 0; i < endPoints.length; i++)
-      endPoints[i] = ((Endpoint)endPoints_.get(i)).getEndpoint();
-    return endPoints;
-  }
-  
-  public Endpoint getEndpoint(String endpointString)
-  {
-    if (endpointString != null && endpointString.length() > 0)
-    {
-      for (Iterator it = endPoints_.iterator(); it.hasNext();)
-      {
-        Endpoint endpoint = (Endpoint)it.next();
-        if (endpointString.equals(endpoint.getEndpoint()))
-          return endpoint;
-      }
-    }
-    return null;
-  }
-
-  public void setEndPoints(String[] endpoints)
-  {
-    Vector endpointVector = new Vector();
-    for (int i = 0; i < endpoints.length; i++)
-    {
-      Endpoint endpoint = getEndpoint(endpoints[i]);
-      if (endpoint == null)
-      {
-        endpoint = new Endpoint();
-        endpoint.setEndpoint(endpoints[i]);
-      }
-      endpointVector.add(endpoint);
-    }
-    resetEndPoints();
-    endPoints_.addAll(endpointVector);
-  }
-
-  public void addEndPoint(String endpointString)
-  {
-    if (endpointString != null && endpointString.length() > 0)
-    {
-      Endpoint endpoint = new Endpoint();
-      endpoint.setEndpoint(endpointString);
-      endPoints_.add(endpoint);
-    }
-  }
-
-  public void removeEndPoint(String endpointString)
-  {
-    if (endpointString != null && endpointString.length() > 0)
-    {
-      WSDLServiceElement serviceElement = (WSDLServiceElement)getParentElement();
-      String fixedEndpointString = serviceElement.getAddressLocation(binding_);
-      if (fixedEndpointString == null || !fixedEndpointString.equals(endpointString))
-      {
-        for (int i = 0; i < endPoints_.size(); i++)
-        {
-          if (endpointString.equals(((Endpoint)endPoints_.get(i)).getEndpoint()))
-          {
-            endPoints_.remove(i);
-            break;
-          }
-        }
-      }
-    }
-  }
-
-  public void buildModel() {
-    resetEndPoints();
-    if (binding_ != null) {
-      PortType pt = binding_.getPortType();
-      if (pt != null) {
-        List operations = pt.getOperations();
-        HashMap operationsMap = new HashMap();
-        for (Iterator it = operations.iterator();it.hasNext();) {
-          Operation operation = (Operation)it.next();
-          operationsMap.put(createOperationUniqueName(operation), operation);
-        }
-        WSDLOperationElement[] wsdlOperationElements = new WSDLOperationElement[getNumberOfElements(WSDLModelConstants.REL_WSDL_OPERATION)];
-        Enumeration e = getElements(WSDLModelConstants.REL_WSDL_OPERATION);
-        for (int i = 0; i < wsdlOperationElements.length; i++) {
-          wsdlOperationElements[i] = (WSDLOperationElement)e.nextElement();
-        }
-        for (int j = 0; j < wsdlOperationElements.length; j++) {
-          String operationName = createOperationUniqueName(wsdlOperationElements[j].getOperation());
-          Operation operation = (Operation)operationsMap.get(operationName);
-          if (operation != null) {
-            operationsMap.remove(operationName);
-            wsdlOperationElements[j].setOperation(this, operation);
-          }
-          else
-            disconnect(wsdlOperationElements[j], WSDLModelConstants.REL_WSDL_OPERATION);
-        }
-        for (Iterator it = operationsMap.values().iterator();it.hasNext();) {
-          Operation oper = (Operation)it.next();
-          WSDLOperationElement wsdlOperationElement = new WSDLOperationElement(oper.getName(), this, oper);
-          connect(wsdlOperationElement,WSDLModelConstants.REL_WSDL_OPERATION,ModelConstants.REL_OWNER);
-        }
-      }
-    }
-  }
-
-  private String createOperationUniqueName(Operation operation)
-  {
-    StringBuffer name = new StringBuffer();
-    name.append(operation.getName());
-    Input inputMsg = operation.getInput();
-    if (inputMsg != null)
-    {
-      QName qname = inputMsg.getMessage().getQName();
-      name.append(qname.getNamespaceURI());
-      name.append(":");
-      name.append(qname.getLocalPart());
-    }
-    Output outputMsg = operation.getOutput();
-    if (outputMsg != null)
-    {
-      QName qname = outputMsg.getMessage().getQName();
-      name.append(qname.getNamespaceURI());
-      name.append(":");
-      name.append(qname.getLocalPart());
-    }
-    return name.toString();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLCommonElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLCommonElement.java
deleted file mode 100644
index ef90e3b09..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLCommonElement.java
+++ /dev/null
@@ -1,55 +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.wst.ws.internal.explorer.platform.wsdl.datamodel;
-
-import javax.xml.parsers.ParserConfigurationException;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.util.XMLUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLModelConstants;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentFragment;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class WSDLCommonElement extends TreeElement
-{
-
-  public WSDLCommonElement(String name, Model model) {
-    super(name, model);
-  }
-
-  public final TreeElement getParentElement() {
-      return (TreeElement)getElements(ModelConstants.REL_OWNER).nextElement();
-  }
-  
-  protected final void setDocumentation(Node documentationElement)
-  {
-    String documentation = "";
-    try
-    {
-      if (documentationElement != null)
-      {
-        Document doc = XMLUtils.createNewDocument(null);
-        DocumentFragment df = doc.createDocumentFragment();
-        NodeList documentationNodes = documentationElement.getChildNodes();
-        for (int i=0;i<documentationNodes.getLength();i++)
-          df.appendChild(doc.importNode(documentationNodes.item(i),true));
-        documentation = XMLUtils.serialize(df,true);
-      }
-    }
-    catch (ParserConfigurationException e)
-    {
-    }
-    setPropertyAsString(WSDLModelConstants.PROP_DOCUMENTATION,documentation);
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLElement.java
deleted file mode 100644
index 320e7d536..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLElement.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.wst.ws.internal.explorer.platform.wsdl.datamodel;
-
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.Vector;
-import javax.wsdl.Definition;
-import javax.wsdl.Import;
-import javax.wsdl.Service;
-import javax.wsdl.Types;
-import javax.wsdl.WSDLException;
-import javax.wsdl.extensions.UnknownExtensibilityElement;
-import javax.xml.namespace.QName;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.wst.common.uriresolver.internal.util.URIEncoder;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLModelConstants;
-import org.eclipse.wst.ws.internal.parser.discovery.NetUtils;
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.wsdl.internal.impl.XSDSchemaExtensibilityElementImpl;
-import org.eclipse.xsd.XSDDiagnostic;
-import org.eclipse.xsd.XSDDiagnosticSeverity;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSchemaDirective;
-import org.eclipse.xsd.impl.XSDSchemaImpl;
-import org.eclipse.xsd.util.XSDParser;
-
-public class WSDLElement extends WSDLCommonElement
-{
-
-  private String wsdlUrl_;
-  private Definition definition_;
-  private Vector schemaList_;
-  private Vector schemaURI_;
-
-  private static Vector w3SchemaQNameList_;
-  private static Vector constantSchemaList_;
-
-  static
-  {
-    // w3 schema URI list:
-    // http://www.w3.org/2001/XMLSchema
-    // http://www.w3.org/2000/10/XMLSchema
-    // http://www.w3.org/1999/XMLSchema
-    w3SchemaQNameList_ = new Vector();
-    w3SchemaQNameList_.addElement(new QName(FragmentConstants.NS_URI_CURRENT_SCHEMA_XSD,"schema"));
-    w3SchemaQNameList_.addElement(new QName(FragmentConstants.NS_URI_2000_SCHEMA_XSD,"schema"));
-    w3SchemaQNameList_.addElement(new QName(FragmentConstants.NS_URI_1999_SCHEMA_XSD,"schema"));
-
-    // Constant schema URI list:
-    // http://www.w3.org/2001/XMLSchema
-    // http://www.w3.org/2000/10/XMLSchema
-    // http://www.w3.org/1999/XMLSchema
-    // http://schemas.xmlsoap.org/soap/encoding/
-    // http://schemas.xmlsoap.org/wsdl/
-    constantSchemaList_ = new Vector();
-    constantSchemaList_.addElement(XSDSchemaImpl.getSchemaForSchema(FragmentConstants.NS_URI_CURRENT_SCHEMA_XSD));
-    constantSchemaList_.addElement(XSDSchemaImpl.getSchemaForSchema(FragmentConstants.NS_URI_2000_SCHEMA_XSD));
-    constantSchemaList_.addElement(XSDSchemaImpl.getSchemaForSchema(FragmentConstants.NS_URI_1999_SCHEMA_XSD));
-    constantSchemaList_.addElement(XSDSchemaImpl.getSchemaForSchema(FragmentConstants.NS_URI_SOAP_ENC));
-    constantSchemaList_.addElement(XSDSchemaImpl.getSchemaForSchema(FragmentConstants.URI_WSDL));
-  }
-
-  public WSDLElement(String name, Model model, String wsdlUrl)
-  {
-    super(name, model);
-    wsdlUrl_ = wsdlUrl;
-    definition_ = null;
-    schemaList_ = new Vector();
-	schemaURI_ = new Vector();
-  }
-
-  public void setWsdlUrl(String wsdlUrl) {
-    wsdlUrl_ = wsdlUrl;
-  }
-
-  public String getWsdlUrl() {
-    return wsdlUrl_;
-  }
-
-  public void setSchemaList(Vector schemaList)
-  {
-    schemaList_ = schemaList;
-  }
-
-  public Vector getSchemaList()
-  {
-    return schemaList_;
-  }
-  
-  private final Definition loadWSDL(String wsdlURL) throws WSDLException
-  {
-    WebServicesParser parser = new WebServicesParserExt();
-    try
-    {
-      return parser.getWSDLDefinitionVerbose(wsdlURL);
-    }
-    catch (WSDLException wsdle)
-    {
-      throw wsdle;
-    }
-    catch (Throwable t)
-    {
-      throw new WSDLException(WSDLException.OTHER_ERROR , t.getMessage(), t);
-    }
-  }
-
-  public Vector loadWSDL() throws WSDLException
-  {
-    Vector errorMessages = new Vector();
-    definition_ = loadWSDL(wsdlUrl_);
-    if (definition_ != null)
-    {
-      setDocumentation(definition_.getDocumentationElement());
-      gatherSchemas(definition_, wsdlUrl_);
-      // Validate the schemas.
-      for (int i=0;i<schemaList_.size();i++)
-      {
-        XSDSchema xsdSchema = (XSDSchema)schemaList_.elementAt(i);
-        xsdSchema.validate();
-        EList errors = xsdSchema.getAllDiagnostics();
-        if (!errors.isEmpty())
-        {
-          for (ListIterator li = errors.listIterator();li.hasNext();)
-          {
-            XSDDiagnostic xd = (XSDDiagnostic)li.next();
-            String msg = xd.getMessage();
-            // do not report low severity diagnostics or erroneous array reference errors.
-            if (xd.getSeverity().getValue() == XSDDiagnosticSeverity.FATAL_LITERAL.getValue() || (msg != null && msg.length() > 0 && msg.toLowerCase().indexOf("#array") != -1))
-              li.remove();
-            else
-            {
-              if (msg != null && msg.length() > 0)
-                errorMessages.addElement(xd.getMessage());
-            }
-          }
-        }
-      }
-
-      for (int i=0;i<constantSchemaList_.size();i++)
-        schemaList_.addElement(constantSchemaList_.elementAt(i));
-      
-	}
-    return errorMessages;
-  }
-
-  private final void gatherSchemas(Definition definition, String definitionURL)
-  {
-    Types types = definition.getTypes();
-    if (types != null)
-    {
-      List extTypes = types.getExtensibilityElements();
-      if (extTypes != null)
-      {
-        for (int i=0;i<extTypes.size();i++)
-        {
-          Object obj = extTypes.get(i);
-          if (obj instanceof UnknownExtensibilityElement)
-          {
-            UnknownExtensibilityElement schemaElement = (UnknownExtensibilityElement)obj;
-            if (isW3SchemaElementType(schemaElement.getElementType()))
-            {
-              XSDSchema xsdSchema = XSDSchemaImpl.createSchema(schemaElement.getElement());
-			  if(!checkSchemaURI(definitionURL)){
-				  schemaList_.addElement(xsdSchema);
-				  gatherSchemaDirective(xsdSchema, definitionURL);
-              }
-          	}
-          } 	
-          else if (obj instanceof XSDSchemaExtensibilityElementImpl)
-          {
-            XSDSchemaExtensibilityElementImpl schemaElement = (XSDSchemaExtensibilityElementImpl)obj;
-            XSDSchema xsdSchema = XSDSchemaImpl.createSchema(schemaElement.getElement());
-			if(!checkSchemaURI(definitionURL)){
-				schemaList_.addElement(xsdSchema);
-				gatherSchemaDirective(xsdSchema, definitionURL);
-			}
-		  }
-        }
-      }
-    }
-    Map imports = definition.getImports();
-    if (imports != null)
-      gatherImportedSchemas(definition,imports);
-  }
-
-  private final void gatherSchemaDirective(XSDSchema xsdSchema, String xsdSchemaURL)
-  {
-    if (xsdSchema != null)
-    {
-      EList xsdSchemaContents = xsdSchema.getContents();
-      for (Iterator it = xsdSchemaContents.iterator(); it.hasNext();)
-      {
-        Object content = it.next();
-        if (content instanceof XSDSchemaDirective)
-        {
-          XSDSchemaDirective xsdSchemaDirective = (XSDSchemaDirective)content;
-          StringBuffer xsdSchemaDirectiveURL = new StringBuffer();
-          String xsdSchemaDirectiveLocation = xsdSchemaDirective.getSchemaLocation();
-          if (xsdSchemaDirectiveLocation != null && xsdSchemaDirectiveLocation.indexOf(':') == -1 && xsdSchemaURL != null && xsdSchemaURL.indexOf(':') != -1)
-          {
-            // relative URL
-            int index = xsdSchemaURL.lastIndexOf('/');
-            if (index != -1)
-              xsdSchemaDirectiveURL.append(xsdSchemaURL.substring(0, index+1));
-            else
-            {
-              xsdSchemaDirectiveURL.append(xsdSchemaURL);
-              xsdSchemaDirectiveURL.append('/');
-            }
-          }
-          xsdSchemaDirectiveURL.append(xsdSchemaDirectiveLocation);
-          // resolve schema directive
-          XSDSchema resolvedSchema = xsdSchemaDirective.getResolvedSchema();
-          if (resolvedSchema == null && xsdSchemaDirectiveURL.length() > 0)
-            resolvedSchema = getSchema(xsdSchemaDirectiveURL.toString());
-          if (resolvedSchema != null)
-          {
-			if(!checkSchemaURI(xsdSchemaDirectiveURL.toString())){
-				schemaList_.addElement(resolvedSchema);
-				gatherSchemaDirective(resolvedSchema, xsdSchemaDirectiveURL.toString());
-      		}
-      	  }
-        }
-	  }
-    }
-  }
-
-  private boolean checkSchemaURI(String schemaURI){
-	  	boolean found = false;
-	  	 	
-		
-		schemaURI = normalize(schemaURI); 
-		if(schemaURI.equals(normalize(wsdlUrl_)))return false;
-		Enumeration e = schemaURI_.elements();
-		while(e.hasMoreElements()){
-			String uri = (String)e.nextElement();	
-			if(schemaURI.equals(uri)){ 
-				found = true;
-				break;
-			}	
-		}
-		
-	    if (!found){
-	    	schemaURI_.addElement(schemaURI);
-	    }
-	    return found;
-	  
-	  }
-	  
-  private String normalize(String uri )
-  {
-	  try {
-		  String encodedURI = URIEncoder.encode(uri,"UTF-8");
-		  URI normalizedURI = new URI(encodedURI);
-		  normalizedURI = normalizedURI.normalize();
-		  return normalizedURI.toString();
-	  } catch (URISyntaxException e) {
-		  return uri;
-	  } catch (UnsupportedEncodingException e) {
-		  return uri;
-	  }
-  }
-  
-  private final boolean isW3SchemaElementType(QName qname)
-  {
-    for (int i=0;i<w3SchemaQNameList_.size();i++)
-    {
-      QName w3SchemaQName = (QName)w3SchemaQNameList_.elementAt(i);
-      if (w3SchemaQName.equals(qname))
-        return true;
-    }
-    return false;
-  }
-
-  private final void gatherImportedSchemas(Definition definition,Map imports)
-  {
-    for (Iterator iterator = imports.keySet().iterator();iterator.hasNext();)
-    {
-      List importList = (List)imports.get(iterator.next());
-      for (int i=0;i<importList.size();i++)
-      {
-        Import imp = (Import)importList.get(i);
-        StringBuffer locURI = new StringBuffer(imp.getLocationURI());
-        if (!Validator.validateURL(locURI.toString()))
-        {
-          String base = definition.getDocumentBaseURI();
-          locURI.insert(0,base.substring(0,base.lastIndexOf('/')+1));
-        }
-        try
-        {
-          Definition importDef = loadWSDL(locURI.toString());
-          gatherSchemas(importDef, locURI.toString());
-        }
-        catch (WSDLException e)
-        {
-          // May be an XSD file.
-          gatherSchema(locURI.toString());
-        }
-      }
-    }
-  }
-
-  private final void gatherSchema(String locURI)
-  {
-    XSDSchema xsdSchema = getSchema(locURI);
-    if (xsdSchema != null)
-    {
-      schemaList_.addElement(xsdSchema);
-      gatherSchemaDirective(xsdSchema, locURI);
-    }
-  }
-
-  private final XSDSchema getSchema(String locURI)
-  {
-    XSDSchema xsdSchema = XSDSchemaImpl.getSchemaForSchema(locURI);
-    if (xsdSchema == null)
-    {
-      XSDParser p = new XSDParser();
-      InputStream is = NetUtils.getURLInputStream(locURI);
-      if (is != null)
-      {
-        p.parse(is);
-        xsdSchema = p.getSchema();
-      }
-    }
-    return xsdSchema;
-  }
-
-  public void setDefinition(Definition definition)
-  {
-    definition_ = definition;
-  }
-
-  public Definition getDefinition()
-  {
-    return definition_;
-  }
-
-  public void buildModel() {
-    if (definition_ != null) {
-      Map services = new HashMap(definition_.getServices());
-      WSDLServiceElement[] wsdlServiceElements = new WSDLServiceElement[getNumberOfElements(WSDLModelConstants.REL_WSDL_SERVICE)];
-      Enumeration e = getElements(WSDLModelConstants.REL_WSDL_SERVICE);
-      for (int i = 0; i < wsdlServiceElements.length; i++) {
-        wsdlServiceElements[i] = (WSDLServiceElement)e.nextElement();
-      }
-      for (int j = 0; j < wsdlServiceElements.length; j++) {
-        QName qname = wsdlServiceElements[j].getService().getQName();
-        Service service = (Service)services.get(qname);
-        if (service != null) {
-          services.remove(qname);
-          wsdlServiceElements[j].setService(service);
-          wsdlServiceElements[j].buildModel();
-        }
-        else
-          disconnect(wsdlServiceElements[j], WSDLModelConstants.REL_WSDL_SERVICE);
-      }
-      for (Iterator it = services.values().iterator();it.hasNext();) {
-        Service service = (Service)it.next();
-        WSDLServiceElement wsdlServiceElement = new WSDLServiceElement(service.getQName().getLocalPart(), getModel(), service);
-        connect(wsdlServiceElement,WSDLModelConstants.REL_WSDL_SERVICE,ModelConstants.REL_OWNER);
-        wsdlServiceElement.buildModel();
-      }
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLOperationElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLOperationElement.java
deleted file mode 100644
index 36c434289..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLOperationElement.java
+++ /dev/null
@@ -1,271 +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.wst.ws.internal.explorer.platform.wsdl.datamodel;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-import javax.wsdl.Binding;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.Input;
-import javax.wsdl.Operation;
-import javax.wsdl.Output;
-import javax.wsdl.Part;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPBinding;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.wsdl.extensions.soap.SOAPOperation;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.BindingTypes;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.WSDLPartsToXSDTypeMapper;
-import org.eclipse.xsd.XSDNamedComponent;
-
-public class WSDLOperationElement extends WSDLCommonElement
-{
-  public static final int OPERATION_TYPE_SOAP = 0;
-  public static final int OPERATION_TYPE_HTTP_GET = 1;
-  public static final int OPERATION_TYPE_HTTP_POST = 2;
-
-  private int operationType_;
-  private Operation operation_;
-  private WSDLPartsToXSDTypeMapper wsdlPartsToXsdTypeMapper_;
-  private XSDToFragmentController fragController_;
-  private boolean isDocumentStyle_;
-  private boolean isUseLiteral_;
-  private String soapAction_;
-  private String encodingStyle_;
-  private String encodingNamespace_;
-
-  private final void gatherSoapInformation(WSDLBindingElement bindingElement,SOAPBinding soapBinding)
-  {
-    // Initialize defaults.
-    isDocumentStyle_ = true;
-    soapAction_ = "";
-    isUseLiteral_ = true;
-    encodingStyle_ = null;
-    encodingNamespace_ = null;
-
-    if (soapBinding != null)
-      isDocumentStyle_ = "document".equals(soapBinding.getStyle());
-    BindingOperation bindingOperation = getBindingOperation(bindingElement);
-    SOAPOperation soapOperation = null;
-    
-    for (Iterator i = bindingOperation.getExtensibilityElements().iterator();i.hasNext();)
-    {
-      ExtensibilityElement e = (ExtensibilityElement)i.next();
-      if (e instanceof SOAPOperation)
-      {
-        soapOperation = (SOAPOperation)e;
-        soapAction_ = soapOperation.getSoapActionURI();
-        String style = soapOperation.getStyle();
-        if (style != null)
-          isDocumentStyle_ = style.equals("document");
-        break;
-      }
-    }
-
-    BindingInput bindingInput = bindingOperation.getBindingInput();
-    SOAPBody soapBody = null;
-    for (Iterator i = bindingInput.getExtensibilityElements().iterator();i.hasNext();)
-    {
-      ExtensibilityElement e = (ExtensibilityElement)i.next();
-      if (e instanceof SOAPBody)
-      {
-        soapBody = (SOAPBody)e;
-        isUseLiteral_ = "literal".equals(soapBody.getUse());
-        if (!isUseLiteral_)
-        {
-          // Encoded.
-          for (Iterator j = soapBody.getEncodingStyles().iterator();j.hasNext();)
-          {
-            encodingStyle_ = (String)j.next();
-            encodingNamespace_ = soapBody.getNamespaceURI();
-            break;
-          }
-        }
-        break;
-      }
-    }
-  }
-
-  public WSDLOperationElement(String name,WSDLBindingElement bindingElement,Operation operation)
-  {
-    super(name, bindingElement.getModel());
-    // Set the default operation type to be SOAP.
-    setOperation(bindingElement,operation);
-  }
-
-  public void setOperation(WSDLBindingElement bindingElement,Operation operation) {
-    operation_ = operation;
-    setDocumentation(operation.getDocumentationElement());
-    fragController_ = null;
-    wsdlPartsToXsdTypeMapper_ = null;
-    operationType_ = bindingElement.getBindingType();
-    ExtensibilityElement bindingExtensibilityElement = bindingElement.getBindingExtensibilityElement();
-    switch (operationType_)
-    {
-      case BindingTypes.SOAP:
-        gatherSoapInformation(bindingElement,(SOAPBinding)bindingExtensibilityElement);
-      case BindingTypes.HTTP_GET:
-      case BindingTypes.HTTP_POST:
-      default:
-        break;
-    }
-  }
-
-  public Operation getOperation() {
-    return operation_;
-  }
-
-  public BindingOperation getBindingOperation()
-  {
-    return getBindingOperation((WSDLBindingElement)getParentElement());
-  }
-
-  private BindingOperation getBindingOperation(WSDLBindingElement bindingElement)
-  {
-    Binding binding = bindingElement.getBinding();
-    String operationInputName = null;
-    String operationOutputName = null;
-    Input operationInput = operation_.getInput();
-    Output operationOutput = operation_.getOutput();
-    if (operationInput != null)
-      operationInputName = operationInput.getName();
-    if (operationOutput != null)
-      operationOutputName = operationOutput.getName();
-    BindingOperation bindingOperation = binding.getBindingOperation(operation_.getName(),operationInputName,operationOutputName);
-    if (bindingOperation == null)
-      bindingOperation = binding.getBindingOperation(operation_.getName(),null,null);
-    return bindingOperation;
-  }
-
-  public List getOrderedBodyParts()
-  {
-    List parts = new Vector(operation_.getInput().getMessage().getOrderedParts(operation_.getParameterOrdering()));
-    BindingOperation bindingOperation = getBindingOperation();
-    BindingInput bindingInput = bindingOperation.getBindingInput();
-    for (Iterator it = bindingInput.getExtensibilityElements().iterator(); it.hasNext();)
-    {
-      ExtensibilityElement e = (ExtensibilityElement)it.next();
-      if (e instanceof SOAPBody)
-      {
-        SOAPBody soapBody = (SOAPBody)e;
-        List bodyParts = soapBody.getParts();
-        if (bodyParts != null)
-        {
-          for (int i = 0; i < parts.size(); i++)
-          {
-            Part part = (Part)parts.get(i);
-            if (!bodyParts.contains(part) && !bodyParts.contains(part.getName()))
-            {
-              parts.remove(i);
-              i--;
-            }
-          }
-        }
-        break;
-      }
-    }
-    return parts;
-  }
-
-  private XSDToFragmentController getXSDToFragmentController() {
-    if (fragController_ == null) {
-      fragController_ = new XSDToFragmentController();
-      fragController_.setWSDLPartsToXSDTypeMapper(wsdlPartsToXsdTypeMapper_);
-    }
-    return fragController_;
-  }
-
-  private XSDNamedComponent getSchema(Part part, String id) {
-    if (wsdlPartsToXsdTypeMapper_ == null) {
-      wsdlPartsToXsdTypeMapper_ = new WSDLPartsToXSDTypeMapper();
-      WSDLBindingElement bindingElement = (WSDLBindingElement)getParentElement();
-      WSDLServiceElement serviceElement = (WSDLServiceElement)bindingElement.getParentElement();
-      WSDLElement wsdlElement = (WSDLElement)serviceElement.getParentElement();
-      wsdlPartsToXsdTypeMapper_.addSchemas(wsdlElement.getSchemaList());
-    }
-    return wsdlPartsToXsdTypeMapper_.getXSDType(part, id);
-  }
-
-  public IXSDFragment getFragment(Part part) {
-    return getFragment(part, true);
-  }
-
-  public IXSDFragment getFragment(Part part, boolean isInput) {
-    StringBuffer id = new StringBuffer();
-    if (isInput)
-      id.append(FragmentConstants.INPUT_ID);
-    else
-      id.append(FragmentConstants.OUTPUT_ID);
-    String partName = part.getName();
-    id.append(partName);
-    XSDToFragmentConfiguration config = new XSDToFragmentConfiguration();
-    config.setIsWSDLPart(true);
-    config.setWSDLPartName(partName);
-    config.setXSDComponent(getSchema(part, id.toString()));
-    if (isDocumentStyle())
-      config.setStyle(FragmentConstants.STYLE_DOCUMENT);
-    else
-      config.setStyle(FragmentConstants.STYLE_RPC);
-    if (operationType_ == BindingTypes.SOAP)
-    {
-      if (!isUseLiteral_)
-        config.setPartEncoding(FragmentConstants.ENCODING_SOAP);
-    }
-    else
-      config.setPartEncoding(FragmentConstants.ENCODING_URL);
-    IXSDFragment fragment = getXSDToFragmentController().getFragment(config, id.toString(), part.getName());
-    return fragment;
-  }
-
-  public IXSDFragment getFragmentByID(String id) {
-    return getXSDToFragmentController().getCachedFragment(id);
-  }
-
-  public void removeAllFragment() {
-    getXSDToFragmentController().emptyCache();
-  }
-
-  public boolean isDocumentStyle()
-  {
-    return isDocumentStyle_;
-  }
-
-  public String getSoapAction()
-  {
-    return soapAction_;
-  }
-
-  public boolean isUseLiteral()
-  {
-    return isUseLiteral_;
-  }
-
-  public String getEncodingStyle()
-  {
-    return encodingStyle_;
-  }
-
-  public String getEncodingNamespace()
-  {
-    return encodingNamespace_;
-  }
-
-  public int getOperationType()
-  {
-    return operationType_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLServiceElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLServiceElement.java
deleted file mode 100644
index e6d1a2fdb..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLServiceElement.java
+++ /dev/null
@@ -1,113 +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.wst.ws.internal.explorer.platform.wsdl.datamodel;
-
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import javax.wsdl.Binding;
-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 javax.xml.namespace.QName;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLModelConstants;
-
-public class WSDLServiceElement extends WSDLCommonElement
-{
-
-  private Service service_;
-
-  public WSDLServiceElement(String name, Model model, Service service)
-  {
-    super(name, model);
-    setService(service);
-  }
-  
-  public void setService(Service service) {
-    service_ = service;
-    setDocumentation(service.getDocumentationElement());
-  }
-
-  public Service getService() {
-    return service_;
-  }
-  
-  public String getAddressLocation(Binding binding)
-  {
-    Map ports = service_.getPorts();
-    for (Iterator i = ports.values().iterator();i.hasNext();)
-    {
-      Port port = (Port)i.next();
-      if (port.getBinding().getQName().equals(binding.getQName()))
-      {
-        List extensibilityElements = port.getExtensibilityElements();
-        for (Iterator j = extensibilityElements.iterator();j.hasNext();)
-        {
-          ExtensibilityElement element = (ExtensibilityElement)j.next();
-          if (element instanceof SOAPAddress)
-          {
-            SOAPAddress soapAddress = (SOAPAddress)element;
-            return soapAddress.getLocationURI();
-          }
-          else if (element instanceof HTTPAddress)
-          {
-            HTTPAddress httpAddress = (HTTPAddress)element;
-            return httpAddress.getLocationURI();
-          }
-        }
-      }
-    }
-    return null;
-  }
-
-  public void buildModel() {
-    if (service_ != null) {
-      Map ports = service_.getPorts();
-      Map bindings = new HashMap();
-      for (Iterator it = ports.values().iterator();it.hasNext();) {
-        Port port = (Port)it.next();
-        Binding binding = port.getBinding();
-        if (binding.getPortType() == null)
-          continue;
-        else
-          bindings.put(binding.getQName(), binding);
-      }
-      WSDLBindingElement[] wsdlBindingElements = new WSDLBindingElement[getNumberOfElements(WSDLModelConstants.REL_WSDL_BINDING)];
-      Enumeration e = getElements(WSDLModelConstants.REL_WSDL_BINDING);
-      for (int i = 0; i < wsdlBindingElements.length; i++) {
-        wsdlBindingElements[i] = (WSDLBindingElement)e.nextElement();
-      }
-      for (int j = 0; j < wsdlBindingElements.length; j++) {
-        QName qname = wsdlBindingElements[j].getBinding().getQName();
-        Binding binding = (Binding)bindings.get(qname);
-        if (binding != null) {
-          bindings.remove(qname);
-          wsdlBindingElements[j].setBinding(binding);
-          wsdlBindingElements[j].buildModel();
-        }
-        else
-          disconnect(wsdlBindingElements[j], WSDLModelConstants.REL_WSDL_BINDING);
-      }
-      for (Iterator it = bindings.values().iterator();it.hasNext();) {
-        Binding binding = (Binding)it.next();
-        WSDLBindingElement wsdlBindingElement = new WSDLBindingElement(binding.getQName().getLocalPart(), getModel(), binding);
-        connect(wsdlBindingElement,WSDLModelConstants.REL_WSDL_BINDING,ModelConstants.REL_OWNER);
-        wsdlBindingElement.buildModel();
-      }
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IFragment.java
deleted file mode 100644
index 6695a41fa..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IFragment.java
+++ /dev/null
@@ -1,38 +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.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-
-public interface IFragment {
-  public void setID(String id);
-  public String getID();
-
-  public void setName(String name);
-  public String getName();
-
-  public boolean processParameterValues(MultipartFormDataParser parser) throws MultipartFormDataException;
-
-  public void setParameterValues(String paramKey, String[] params);
-    public void setParameterValues(String paramKey, Vector params);
-  public String[] getParameterValues(String paramKey);
-  public String getParameterValue(String paramKey, int paramIndex);
-
-  public boolean validateAllParameterValues();
-  public boolean validateParameterValues(String paramKey);
-  public boolean validateParameterValue(String paramKey, int paramIndex);
-
-  public String getInformationFragment();
-  public String getWriteFragment();
-  public String getReadFragment();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/ISOAPEncArrayFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/ISOAPEncArrayFragment.java
deleted file mode 100644
index d30dbd5b4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/ISOAPEncArrayFragment.java
+++ /dev/null
@@ -1,15 +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.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-public interface ISOAPEncArrayFragment extends IXSDGroupSeqFragment {
-  public String createSOAPEncArrayInstance();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/ISOAPEncodingWrapperFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/ISOAPEncodingWrapperFragment.java
deleted file mode 100644
index 65013d94b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/ISOAPEncodingWrapperFragment.java
+++ /dev/null
@@ -1,18 +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.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import java.util.Hashtable;
-
-public interface ISOAPEncodingWrapperFragment extends IXSDDelegationFragment
-{
-  public void setURIReferences(Hashtable uriReferences);
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDComplexFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDComplexFragment.java
deleted file mode 100644
index dca6da2be..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDComplexFragment.java
+++ /dev/null
@@ -1,15 +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.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-public interface IXSDComplexFragment extends IXSDMapFragment {
-  public String createComplexInstance();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDDelegationFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDDelegationFragment.java
deleted file mode 100644
index eb43be581..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDDelegationFragment.java
+++ /dev/null
@@ -1,16 +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.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-public interface IXSDDelegationFragment extends IXSDFragment {
-  public void setXSDDelegationFragment(IXSDFragment xsdFragment);
-  public IXSDFragment getXSDDelegationFragment();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDElementFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDElementFragment.java
deleted file mode 100644
index 19b872b0f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDElementFragment.java
+++ /dev/null
@@ -1,16 +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.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-public interface IXSDElementFragment extends IXSDDelegationFragment {
-  public int getMinOccurs();
-  public int getMaxOccurs();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDFragment.java
deleted file mode 100644
index 42926b3f1..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDFragment.java
+++ /dev/null
@@ -1,29 +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.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import java.util.Hashtable;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public interface IXSDFragment extends IFragment {
-  public void setXSDToFragmentConfiguration(XSDToFragmentConfiguration config);
-  public XSDToFragmentConfiguration getXSDToFragmentConfiguration();
-
-  public void setXSDTypeDefinition(XSDTypeDefinition typeDef);
-  public XSDTypeDefinition getXSDTypeDefinition();
-
-  public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments);
-  public Element[] genInstanceDocumentsFromParameterValues(boolean genXSIType, Hashtable namespaceTable, Document doc);
-
-  public String genID();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupAllFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupAllFragment.java
deleted file mode 100644
index 9bd54e66e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupAllFragment.java
+++ /dev/null
@@ -1,15 +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.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-public interface IXSDGroupAllFragment extends IXSDGroupFragment {
-  public String getGroupAllInstance();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupChoiceFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupChoiceFragment.java
deleted file mode 100644
index 864837cc2..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupChoiceFragment.java
+++ /dev/null
@@ -1,20 +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.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import org.eclipse.xsd.XSDParticle;
-
-public interface IXSDGroupChoiceFragment extends IXSDGroupFragment {
-  public XSDParticle[] getChoices();
-  public String createGroupChoiceInstance(int choiceIndex);
-  public int getChoiceIndex(String groupID);
-  public void setChoiceIndex(String groupID, int choiceIndex);
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupFragment.java
deleted file mode 100644
index 9da875972..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupFragment.java
+++ /dev/null
@@ -1,22 +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.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import org.eclipse.xsd.XSDModelGroup;
-
-public interface IXSDGroupFragment extends IXSDMapFragment {
-  public void setXSDModelGroup(XSDModelGroup xsdModelGroup);
-  public XSDModelGroup getXSDModelGroup();
-
-  public String[] getGroupIDs();
-  public String[] getGroupMemberIDs(String groupID);
-  public IXSDFragment[] getGroupMemberFragments(String groupID);
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupSeqFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupSeqFragment.java
deleted file mode 100644
index 614433eee..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupSeqFragment.java
+++ /dev/null
@@ -1,15 +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.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-public interface IXSDGroupSeqFragment extends IXSDGroupFragment {
-  public String createGroupSeqInstance();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDMapFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDMapFragment.java
deleted file mode 100644
index 1a9fd3b9a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDMapFragment.java
+++ /dev/null
@@ -1,23 +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.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-public interface IXSDMapFragment extends IXSDFragment {
-  public void setXSDToFragmentController(XSDToFragmentController controller);
-  public XSDToFragmentController getXSDToFragmentController();
-
-  public String createInstance();
-
-  public String[] getFragmentsOrder();
-  public IXSDFragment getFragment(String id);
-  public IXSDFragment[] getFragments(String[] ids);
-  public IXSDFragment[] getAllFragments();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDSimpleAtomicFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDSimpleAtomicFragment.java
deleted file mode 100644
index 33f97da25..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDSimpleAtomicFragment.java
+++ /dev/null
@@ -1,14 +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.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-public interface IXSDSimpleAtomicFragment extends IXSDFragment {
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDSimpleListFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDSimpleListFragment.java
deleted file mode 100644
index 00925a379..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDSimpleListFragment.java
+++ /dev/null
@@ -1,15 +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.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-public interface IXSDSimpleListFragment extends IXSDMapFragment {
-  public String createListInstance();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDSimpleUnionFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDSimpleUnionFragment.java
deleted file mode 100644
index ba86a1232..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDSimpleUnionFragment.java
+++ /dev/null
@@ -1,18 +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.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-
-public interface IXSDSimpleUnionFragment extends IXSDMapFragment {
-  public XSDSimpleTypeDefinition[] getMemberTypeDefinitions();
-  public String createUnionInstance(int memberTypeIndex);
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDComplexTypeToFragmentMapper.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDComplexTypeToFragmentMapper.java
deleted file mode 100644
index ce5bac7a4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDComplexTypeToFragmentMapper.java
+++ /dev/null
@@ -1,45 +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.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDComplexFixFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDComplexRangeFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.XSDTypeDefinitionUtil;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.WSDLPartsToXSDTypeMapper;
-import org.eclipse.xsd.XSDComplexTypeContent;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-
-public class XSDComplexTypeToFragmentMapper extends XSDToFragmentMapper {
-  public XSDComplexTypeToFragmentMapper(XSDToFragmentController controller, WSDLPartsToXSDTypeMapper wsdlToXSDMapper) {
-    super(controller, wsdlToXSDMapper);
-  }
-
-  public IXSDFragment getFragment(XSDToFragmentConfiguration config, String id, String name) {
-    XSDComplexTypeDefinition complexType = (XSDComplexTypeDefinition)config.getXSDComponent();
-    if (complexType != null && complexType.isMixed())
-      return getXSDDefaultFragment(config, id, name);
-    XSDComplexTypeContent complexTypeContent = XSDTypeDefinitionUtil.getXSDComplexTypeContent(complexType);
-    if (complexTypeContent != null)
-      return getXSDComplexFragment(config, id, name);
-    else
-      return getXSDEmptyFragment(config, id, name);
-  }
-
-  private IXSDFragment getXSDComplexFragment(XSDToFragmentConfiguration config, String id, String name) {
-    int minOccurs = config.getMinOccurs();
-    int maxOccurs = config.getMaxOccurs();
-    
-    if (minOccurs == maxOccurs)
-      return new XSDComplexFixFragment(id, name, config, getController());
-    else
-      return new XSDComplexRangeFragment(id, name, config, getController());
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDElementDeclarationToFragmentMapper.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDElementDeclarationToFragmentMapper.java
deleted file mode 100644
index 939623b6e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDElementDeclarationToFragmentMapper.java
+++ /dev/null
@@ -1,91 +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.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDElementFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.WSDLPartsToXSDTypeMapper;
-import org.eclipse.xsd.XSDComponent;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDTypeDefinition;
-
-
-public class XSDElementDeclarationToFragmentMapper extends XSDToFragmentMapper {
-  public XSDElementDeclarationToFragmentMapper(XSDToFragmentController controller, WSDLPartsToXSDTypeMapper wsdlToXSDMapper) {
-    super(controller, wsdlToXSDMapper);
-  }
-
-  public IXSDFragment getFragment(XSDToFragmentConfiguration config, String id, String name) {
-    XSDElementDeclaration element = (XSDElementDeclaration)config.getXSDComponent();
-    if (element != null) {
-      XSDElementDeclaration resolvedElement = resolveXSDElementDeclaration(element);
-      XSDTypeDefinition typeDef = getXSDTypeDefinition(resolvedElement);
-      if (typeDef != null) {
-        int minOccurs = FragmentConstants.DEFAULT_MIN_OCCURS;
-        int maxOccurs = FragmentConstants.DEFAULT_MAX_OCCURS;
-        XSDConcreteComponent concreteComponent = element.getContainer();
-        if (concreteComponent != null && concreteComponent instanceof XSDParticle) {
-          XSDParticle particle = (XSDParticle)concreteComponent;
-          if (particle.isSetMinOccurs())
-            minOccurs = particle.getMinOccurs();
-          if (particle.isSetMaxOccurs())
-            maxOccurs = particle.getMaxOccurs();
-        }
-        config.setMinOccurs(minOccurs);
-        config.setMaxOccurs(maxOccurs);
-        IXSDElementFragment elementFrag = new XSDElementFragment(id, resolvedElement.getName(), config);
-        elementFrag.setXSDTypeDefinition(typeDef);
-        XSDToFragmentConfiguration elementTypeConfig = new XSDToFragmentConfiguration();
-        elementTypeConfig.setXSDComponent(typeDef);
-        elementTypeConfig.setMinOccurs(minOccurs);
-        elementTypeConfig.setMaxOccurs(maxOccurs);
-        elementTypeConfig.setStyle(config.getStyle());
-        elementTypeConfig.setPartEncoding(config.getPartEncoding());
-        elementTypeConfig.setWSDLPartName(config.getWSDLPartName());
-        IXSDFragment xsdFragment = getController().getFragment(elementTypeConfig, elementFrag.genID(), resolvedElement.getName());
-        elementFrag.setXSDDelegationFragment(xsdFragment);
-        return elementFrag;
-      }
-    }
-    return getXSDDefaultFragment(config, id, name);
-  }
-
-  private XSDElementDeclaration resolveXSDElementDeclaration(XSDElementDeclaration element) {
-    // port to org.eclipse.xsd
-    if (element.getResolvedElementDeclaration() != null)
-    {
-      XSDElementDeclaration resolvedElement = element.getResolvedElementDeclaration();
-      if (!isComponentResolvable(resolvedElement))
-      {
-        XSDComponent resolvedComponent = getWSDLPartsToXSDTypeMapper().resolveXSDNamedComponent(resolvedElement);
-        if (resolvedComponent != null && (resolvedComponent instanceof XSDElementDeclaration))
-          resolvedElement = (XSDElementDeclaration)resolvedComponent;
-      }
-      return resolvedElement;
-    }
-    else
-      return element;
-  }
-
-  private XSDTypeDefinition getXSDTypeDefinition(XSDElementDeclaration element) {
-    // port to org.eclipse.xsd
-    if (element.getTypeDefinition() != null)
-      return element.getTypeDefinition();
-    // port to org.eclipse.xsd
-    else if (element.getAnonymousTypeDefinition() != null)
-      return element.getAnonymousTypeDefinition();
-    else
-      return null;
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDLiteralXMLEncodingToFragmentMapper.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDLiteralXMLEncodingToFragmentMapper.java
deleted file mode 100644
index 31aa8316e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDLiteralXMLEncodingToFragmentMapper.java
+++ /dev/null
@@ -1,77 +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.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.WSDLPartsToXSDTypeMapper;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDComponent;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDParticleContent;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-
-public class XSDLiteralXMLEncodingToFragmentMapper extends XSDToFragmentMapper {
-  private XSDSimpleTypeToFragmentMapper xsdSimpleMapper_;
-  private XSDComplexTypeToFragmentMapper xsdComplexMapper_;
-  private XSDElementDeclarationToFragmentMapper xsdElementMapper_;
-  private XSDParticleToFragmentMapper xsdParticleMapper_;
-
-  public XSDLiteralXMLEncodingToFragmentMapper(XSDToFragmentController controller, WSDLPartsToXSDTypeMapper wsdlToXSDMapper) {
-    super(controller, wsdlToXSDMapper);
-    xsdSimpleMapper_ = null;
-    xsdComplexMapper_ = null;
-    xsdElementMapper_ = null;
-    xsdParticleMapper_= null;
-  }
-
-  private XSDSimpleTypeToFragmentMapper getXSDSimpleMapper() {
-    if (xsdSimpleMapper_ == null)
-      xsdSimpleMapper_ = new XSDSimpleTypeToFragmentMapper(getController(), getWSDLPartsToXSDTypeMapper());
-    return xsdSimpleMapper_;
-  }
-
-  private XSDComplexTypeToFragmentMapper getXSDComplexMapper() {
-    if (xsdComplexMapper_ == null)
-      xsdComplexMapper_ = new XSDComplexTypeToFragmentMapper(getController(), getWSDLPartsToXSDTypeMapper());
-    return xsdComplexMapper_;
-  }
-
-  private XSDElementDeclarationToFragmentMapper getXSDElementMapper() {
-    if (xsdElementMapper_ == null)
-      xsdElementMapper_ = new XSDElementDeclarationToFragmentMapper(getController(), getWSDLPartsToXSDTypeMapper());
-    return xsdElementMapper_;
-  }
-
-  private XSDParticleToFragmentMapper getXSDParticleMapper() {
-    if (xsdParticleMapper_ == null)
-      xsdParticleMapper_ = new XSDParticleToFragmentMapper(getController(), getWSDLPartsToXSDTypeMapper());
-    return xsdParticleMapper_;
-  }
-
-  public IXSDFragment getFragment(XSDToFragmentConfiguration config, String id, String name) {
-    config = resolveXSDComponent(config);
-    XSDComponent component = config.getXSDComponent();
-    if (!isComponentResolvable(component))
-      return getXSDDefaultFragment(config, id, name);
-    else if (component instanceof XSDElementDeclaration)
-      return getXSDElementMapper().getFragment(config, id, name);
-    else if (component instanceof XSDSimpleTypeDefinition)
-      return getXSDSimpleMapper().getFragment(config, id, name);
-    else if (component instanceof XSDComplexTypeDefinition)
-      return getXSDComplexMapper().getFragment(config, id, name);
-    else if (component instanceof XSDParticle)
-      return getXSDParticleMapper().getFragment(config, id, name);
-    else if (component instanceof XSDParticleContent)
-      return getXSDParticleMapper().getFragment(config, id, name);
-    else
-      return getXSDDefaultFragment(config, id, name);
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDParticleToFragmentMapper.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDParticleToFragmentMapper.java
deleted file mode 100644
index bd4579730..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDParticleToFragmentMapper.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.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDGroupAllFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDGroupChoiceFixFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDGroupChoiceRangeFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDGroupSeqFixFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDGroupSeqRangeFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.WSDLPartsToXSDTypeMapper;
-import org.eclipse.xsd.XSDComponent;
-import org.eclipse.xsd.XSDCompositor;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDModelGroupDefinition;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDParticleContent;
-import org.eclipse.xsd.XSDWildcard;
-
-
-public class XSDParticleToFragmentMapper extends XSDToFragmentMapper {
-  public XSDParticleToFragmentMapper(XSDToFragmentController controller, WSDLPartsToXSDTypeMapper wsdlToXSDMapper) {
-    super(controller, wsdlToXSDMapper);
-  }
-
-  public IXSDFragment getFragment(XSDToFragmentConfiguration config, String id, String name) {
-    XSDComponent component = config.getXSDComponent();
-    XSDParticleContent xsdParticleContent;
-    if (component instanceof XSDParticle)
-      xsdParticleContent = ((XSDParticle)component).getContent();
-    else if (component instanceof XSDParticleContent)
-      xsdParticleContent = (XSDParticleContent)component;
-    else
-      xsdParticleContent = null;
-    if (xsdParticleContent != null) {
-      if (xsdParticleContent instanceof XSDModelGroupDefinition)
-        return getXSDModelGroupDefFragment(config, id, name, (XSDModelGroupDefinition)xsdParticleContent);
-      else if (xsdParticleContent instanceof XSDModelGroup)
-        return getXSDModelGroupFragment(config, id, name, (XSDModelGroup)xsdParticleContent);
-      else if (xsdParticleContent instanceof XSDWildcard)
-        return getXSDWildcardFragment(config, id, name, (XSDWildcard)xsdParticleContent);
-      else
-        return getXSDDefaultFragment(config, id, name);
-    }
-    else
-      return getXSDDefaultFragment(config, id, name);
-  }
-
-  private IXSDFragment getXSDModelGroupDefFragment(XSDToFragmentConfiguration config, String id, String name, XSDModelGroupDefinition xsdModelGroupDef) {
-    XSDModelGroupDefinition resolvedXSDModelGroupDef = xsdModelGroupDef;
-    if (xsdModelGroupDef.isModelGroupDefinitionReference())
-      resolvedXSDModelGroupDef = xsdModelGroupDef.getResolvedModelGroupDefinition();
-    XSDModelGroup xsdModelGroup = resolvedXSDModelGroupDef.getModelGroup();
-    if (xsdModelGroup == null)
-      return getXSDDefaultFragment(config, id, name);
-    else
-      return getXSDModelGroupFragment(config, id, name, xsdModelGroup);
-  }
-
-  private IXSDFragment getXSDModelGroupFragment(XSDToFragmentConfiguration config, String id, String name, XSDModelGroup xsdModelGroup) {
-    int minOccurs = FragmentConstants.DEFAULT_MIN_OCCURS;
-    int maxOccurs = FragmentConstants.DEFAULT_MAX_OCCURS;
-    XSDConcreteComponent concreteComponent = xsdModelGroup.getContainer();
-    if (concreteComponent != null && concreteComponent instanceof XSDParticle) {
-      XSDParticle particle = (XSDParticle)concreteComponent;
-      if (particle.isSetMinOccurs())
-        minOccurs = particle.getMinOccurs();
-      if (particle.isSetMaxOccurs())
-        maxOccurs = particle.getMaxOccurs();
-    }
-    config.setMinOccurs(minOccurs);
-    config.setMaxOccurs(maxOccurs);
-    
-    switch (xsdModelGroup.getCompositor().getValue()) {
-      case XSDCompositor.SEQUENCE: 
-        if (minOccurs == maxOccurs)
-          return new XSDGroupSeqFixFragment(id, name, config, getController(), xsdModelGroup);
-        else
-          return new XSDGroupSeqRangeFragment(id, name, config, getController(), xsdModelGroup);
-      case XSDCompositor.CHOICE:
-        if (minOccurs == maxOccurs)
-          return new XSDGroupChoiceFixFragment(id, name, config, getController(), xsdModelGroup);
-        else
-          return new XSDGroupChoiceRangeFragment(id, name, config, getController(), xsdModelGroup);
-      case XSDCompositor.ALL:
-        return new XSDGroupAllFragment(id, name, config, getController(), xsdModelGroup);
-      default:
-        return getXSDDefaultFragment(config, id, name);
-    }
-  }
-
-  private IXSDFragment getXSDWildcardFragment(XSDToFragmentConfiguration config, String id, String name, XSDWildcard xsdParticleContent) {
-    return getXSDDefaultFragment(config, id, name);
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDSOAPEncodingToFragmentMapper.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDSOAPEncodingToFragmentMapper.java
deleted file mode 100644
index 5fafacc4c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDSOAPEncodingToFragmentMapper.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.SOAPEncArrayFixFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.SOAPEncArrayRangeFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.SOAPEncodingWrapperFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.XSDTypeDefinitionUtil;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.WSDLPartsToXSDTypeMapper;
-import org.eclipse.xsd.XSDAttributeGroupContent;
-import org.eclipse.xsd.XSDComplexTypeContent;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDComponent;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDParticleContent;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.w3c.dom.Element;
-
-public class XSDSOAPEncodingToFragmentMapper extends XSDToFragmentMapper {
-  private XSDLiteralXMLEncodingToFragmentMapper xsdLiteralMapper_;
-  private XSDComplexTypeToFragmentMapper xsdComplexMapper_;
-
-  public XSDSOAPEncodingToFragmentMapper(XSDToFragmentController controller, WSDLPartsToXSDTypeMapper wsdlToXSDMapper) {
-    super(controller, wsdlToXSDMapper);
-    xsdLiteralMapper_ = null;
-    xsdComplexMapper_ = null;
-  }
-
-  private XSDLiteralXMLEncodingToFragmentMapper getXSDLiteralMapper() {
-    if (xsdLiteralMapper_ == null)
-      xsdLiteralMapper_ = new XSDLiteralXMLEncodingToFragmentMapper(getController(), getWSDLPartsToXSDTypeMapper());
-    return xsdLiteralMapper_;
-  }
-
-  private XSDComplexTypeToFragmentMapper getXSDComplexMapper() {
-    if (xsdComplexMapper_ == null)
-      xsdComplexMapper_ = new XSDComplexTypeToFragmentMapper(getController(), getWSDLPartsToXSDTypeMapper());
-     return xsdComplexMapper_;
-  }
-
-  public IXSDFragment getFragment(XSDToFragmentConfiguration config, String id, String name) {
-    if (config.getIsWSDLPart()) {
-      ISOAPEncodingWrapperFragment wrapperFragment = new SOAPEncodingWrapperFragment(id, name, null);
-      String delegationFragId = wrapperFragment.genID();
-      IXSDFragment delegationFragment = getFragmentDelegate(config, delegationFragId, name);
-      wrapperFragment.setXSDDelegationFragment(delegationFragment);
-      getController().addToCache(delegationFragId, delegationFragment);
-      return wrapperFragment;
-    }
-    else
-      return getFragmentDelegate(config, id, name);
-  }
-
-  public IXSDFragment getFragmentDelegate(XSDToFragmentConfiguration config, String id, String name) {
-    config = resolveXSDComponent(config);
-    XSDComponent component = config.getXSDComponent();
-    if (!isComponentResolvable(component))
-      return getXSDDefaultFragment(config, id, name);
-    else if (component instanceof XSDComplexTypeDefinition) {
-      XSDComplexTypeDefinition complexType = (XSDComplexTypeDefinition)component;
-      if (XSDTypeDefinitionUtil.isSoapEncArray(complexType))
-        return getSOAPEncArrayFragment(config, id, name, complexType);
-      else
-        return getXSDComplexMapper().getFragment(config, id, name);
-    }
-    else
-      return getXSDLiteralMapper().getFragment(config, id, name);
-  }
-
-  private IXSDFragment getSOAPEncArrayFragment(XSDToFragmentConfiguration config, String id, String name, XSDComplexTypeDefinition complexType) {
-    EList xsdAttrContents = complexType.getAttributeContents();
-    for (int i = 0; i < xsdAttrContents.size(); i++) {
-      String soapEncArrayTypeNamespaceURI = null;
-      String soapEncArrayTypeLocalName = null;
-      int soapEncArrayDimension = 0;
-      XSDAttributeGroupContent xsdAttrContent = (XSDAttributeGroupContent)xsdAttrContents.get(i);
-      Element element = xsdAttrContent.getElement();
-      String arrayTypeAttr = element.getAttributeNS(FragmentConstants.URI_WSDL, FragmentConstants.QNAME_LOCAL_NAME_ARRAY_TYPE);
-      if (arrayTypeAttr != null && arrayTypeAttr.length() > 0) {
-        int colon = arrayTypeAttr.indexOf(FragmentConstants.COLON);
-        String nsPrefix = (colon > 0) ? arrayTypeAttr.substring(0, colon) : null;
-        soapEncArrayTypeNamespaceURI = (String)xsdAttrContent.getSchema().getQNamePrefixToNamespaceMap().get(nsPrefix);
-        int dimensionIndex = arrayTypeAttr.indexOf(FragmentConstants.LEFT_SQUARE_BRACKET);
-        soapEncArrayTypeLocalName = arrayTypeAttr.substring(colon + 1, dimensionIndex);
-        String dimensionString = arrayTypeAttr.substring(dimensionIndex, arrayTypeAttr.length());
-        for (int j = 0; j < dimensionString.length() - 1; j++) {
-          if (dimensionString.charAt(j) == FragmentConstants.LEFT_SQUARE_BRACKET.charAt(0) && dimensionString.charAt(j + 1) == FragmentConstants.RIGHT_SQUARE_BRACKET.charAt(0)) {
-            soapEncArrayDimension++;
-            j++;
-          }
-          else {
-            soapEncArrayDimension = 0;
-            break;
-          }
-        }
-      }
-      if (soapEncArrayTypeNamespaceURI != null && soapEncArrayTypeLocalName != null && soapEncArrayDimension == 1) {
-        XSDComponent soapEncArrayType = getWSDLPartsToXSDTypeMapper().getXSDTypeFromSchema(soapEncArrayTypeNamespaceURI, soapEncArrayTypeLocalName, false);
-        if (soapEncArrayType != null && soapEncArrayType instanceof XSDTypeDefinition) {
-          XSDModelGroup sequence = null;
-          XSDComplexTypeContent complexTypeContent = XSDTypeDefinitionUtil.getXSDComplexTypeContent(complexType);
-          if (complexTypeContent != null && (complexTypeContent instanceof XSDParticle)) {
-            XSDParticleContent xsdParticleContent = ((XSDParticle)complexTypeContent).getContent();
-            if (xsdParticleContent instanceof XSDModelGroup)
-              sequence = (XSDModelGroup)xsdParticleContent;
-          }
-          ISOAPEncArrayFragment frag;
-          if (config.getMinOccurs() == config.getMaxOccurs())
-            frag = new SOAPEncArrayFixFragment(id, name, config, getController(), sequence);
-          else
-            frag = new SOAPEncArrayRangeFragment(id, name, config, getController(), sequence);
-          frag.setXSDTypeDefinition((XSDTypeDefinition)soapEncArrayType);
-          return frag;
-        }
-      }
-    }
-    return getXSDComplexMapper().getFragment(config, id, name);
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDSimpleTypeToFragmentMapper.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDSimpleTypeToFragmentMapper.java
deleted file mode 100644
index e62489231..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDSimpleTypeToFragmentMapper.java
+++ /dev/null
@@ -1,174 +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.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDSimpleAtomicDateTimeFixFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDSimpleAtomicDateTimeRangeFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDSimpleAtomicEnumFixFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDSimpleAtomicEnumRangeFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDSimpleAtomicFixFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDSimpleAtomicFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDSimpleAtomicRangeFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDSimpleListFixFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDSimpleListRangeFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDSimpleUnionFixFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDSimpleUnionRangeFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.OptionVector;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.XSDTypeDefinitionUtil;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.WSDLPartsToXSDTypeMapper;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.XSDVariety;
-
-public class XSDSimpleTypeToFragmentMapper extends XSDToFragmentMapper {
-  public XSDSimpleTypeToFragmentMapper(XSDToFragmentController controller, WSDLPartsToXSDTypeMapper wsdlToXSDMapper) {
-    super(controller, wsdlToXSDMapper);
-  }
-
-  public IXSDFragment getFragment(XSDToFragmentConfiguration config, String id, String name) {
-    XSDSimpleTypeDefinition simpleType = (XSDSimpleTypeDefinition)config.getXSDComponent();
-    if (simpleType != null && simpleType.getVariety() != null) {
-      switch (simpleType.getVariety().getValue()) {
-        case XSDVariety.ATOMIC:
-          return getXSDSimpleAtomicFragment(config, id, name);
-        case XSDVariety.LIST:
-          return getXSDSimpleListFragment(config, id, name);
-        case XSDVariety.UNION:
-          return getXSDSimpleUnionFragment(config, id, name);
-        default:
-          return getXSDDefaultFragment(config, id, name);
-      }
-    }
-    else
-      return getXSDDefaultFragment(config, id, name);
-  }
-
-  private IXSDFragment getXSDSimpleAtomicFragment(XSDToFragmentConfiguration config, String id, String name) {
-    boolean isFixed = ((config.getMinOccurs() == config.getMaxOccurs()) && config.getMaxOccurs() != FragmentConstants.UNBOUNDED);
-    XSDSimpleTypeDefinition xsdSimpleTypeDef = (XSDSimpleTypeDefinition)config.getXSDComponent();
-    XSDSimpleTypeDefinition xsdBaseSimpleTypeDef = (XSDSimpleTypeDefinition)XSDTypeDefinitionUtil.resolveToXSDBuiltInTypeDefinition(xsdSimpleTypeDef);
-    String baseSimpleTypeDefNS = null;
-    String baseSimpleTypeDefName = null;
-    if (xsdBaseSimpleTypeDef != null)
-    {
-      baseSimpleTypeDefNS = xsdBaseSimpleTypeDef.getTargetNamespace();
-      baseSimpleTypeDefName = xsdBaseSimpleTypeDef.getName();
-    }
-    boolean isEnum = isSimpleTypeEnumeration(xsdSimpleTypeDef);
-    if (FragmentConstants.URI_XSD.equals(baseSimpleTypeDefNS))
-    {
-      if (baseSimpleTypeDefName.equals("date"))
-        return getXSDSimpleDateTimeFragment(id, name, config, ActionInputs.CALENDAR_TYPE_DATE,xsdSimpleTypeDef,isEnum,isFixed);
-      else if (baseSimpleTypeDefName.equals("dateTime"))
-        return getXSDSimpleDateTimeFragment(id, name, config, ActionInputs.CALENDAR_TYPE_DATETIME,xsdSimpleTypeDef,isEnum,isFixed);
-      else if (baseSimpleTypeDefName.equals("gYearMonth"))
-        return getXSDSimpleDateTimeFragment(id, name, config, ActionInputs.CALENDAR_TYPE_GYEARMONTH,xsdSimpleTypeDef,isEnum,isFixed);
-      else if (baseSimpleTypeDefName.equals("gMonthDay"))
-        return getXSDSimpleDateTimeFragment(id, name, config, ActionInputs.CALENDAR_TYPE_GMONTHDAY,xsdSimpleTypeDef,isEnum,isFixed);
-      else if (baseSimpleTypeDefName.equals("gDay"))
-        return getXSDSimpleGDayFragment(id, name, config, xsdSimpleTypeDef,isEnum,isFixed);        
-      else if (baseSimpleTypeDefName.equals("boolean"))
-        return getXSDSimpleBooleanFragment(id, name, config, xsdSimpleTypeDef,isEnum,isFixed);
-    }
-
-    if (isEnum)
-    {
-      if (isFixed)
-        return new XSDSimpleAtomicEnumFixFragment(id, name, config, xsdSimpleTypeDef.getEnumerationFacets());
-      else
-        return new XSDSimpleAtomicEnumRangeFragment(id, name, config, xsdSimpleTypeDef.getEnumerationFacets());
-    }
-    else
-    {
-      if (isFixed)
-        return new XSDSimpleAtomicFixFragment(id, name, config);
-      else
-        return new XSDSimpleAtomicRangeFragment(id, name, config);
-    }
-  }
-
-  private XSDSimpleAtomicFragment getXSDSimpleDateTimeFragment(String id, String name, XSDToFragmentConfiguration config, int calendarType,XSDSimpleTypeDefinition xsdDateTimeType,boolean isEnum,boolean isFixed)
-  {
-    if (isEnum)
-    {
-      if (isFixed)
-        return new XSDSimpleAtomicEnumFixFragment(id, name, config, xsdDateTimeType.getEnumerationFacets());
-      else
-        return new XSDSimpleAtomicEnumRangeFragment(id, name, config, xsdDateTimeType.getEnumerationFacets());
-    }
-    else
-    {
-      if (isFixed)
-        return new XSDSimpleAtomicDateTimeFixFragment(id, name, config, calendarType);
-      else
-        return new XSDSimpleAtomicDateTimeRangeFragment(id, name, config, calendarType);
-    }
-  }
-  
-  private XSDSimpleAtomicFragment getXSDSimpleGDayFragment(String id, String name, XSDToFragmentConfiguration config, XSDSimpleTypeDefinition xsdDateTimeType,boolean isEnum,boolean isFixed)
-  {
-    if (isEnum)
-      return null;
-    OptionVector optionVector = new OptionVector();
-    StringBuffer value = new StringBuffer();
-    for (int i=1;i<=31;i++)
-    {
-      value.setLength(0);
-      value.append("---");
-      if (i<10)
-        value.append(0);
-      value.append(i);
-      optionVector.addOption(String.valueOf(i),value.toString());
-    }
-    if (isFixed)
-      return new XSDSimpleAtomicEnumFixFragment(id, name, config, optionVector);
-    else
-      return new XSDSimpleAtomicEnumRangeFragment(id, name, config, optionVector);
-  }
-
-  private XSDSimpleAtomicFragment getXSDSimpleBooleanFragment(String id, String name, XSDToFragmentConfiguration config, XSDSimpleTypeDefinition xsdBooleanType,boolean isEnum,boolean isFixed)
-  {
-    if (isEnum)
-      return null;
-    OptionVector optionVector = new OptionVector();
-    optionVector.addOption("true","true");
-    optionVector.addOption("false","false");
-    if (isFixed)
-      return new XSDSimpleAtomicEnumFixFragment(id, name, config, optionVector);
-    else
-      return new XSDSimpleAtomicEnumRangeFragment(id, name, config, optionVector);
-  }
-
-  private IXSDFragment getXSDSimpleListFragment(XSDToFragmentConfiguration config, String id, String name) {
-    
-    boolean isFixed = ((config.getMinOccurs() == config.getMaxOccurs()) && config.getMaxOccurs() != FragmentConstants.UNBOUNDED);
-    if (isFixed)
-      return new XSDSimpleListFixFragment(id, name, config, getController());
-    else
-      return new XSDSimpleListRangeFragment(id, name, config, getController());
-  }
-
-  private IXSDFragment getXSDSimpleUnionFragment(XSDToFragmentConfiguration config, String id, String name) {
-    
-    boolean isFixed = ((config.getMinOccurs() == config.getMaxOccurs()) && config.getMaxOccurs() != FragmentConstants.UNBOUNDED);
-    if (isFixed)
-      return new XSDSimpleUnionFixFragment(id, name, config, getController());
-    else
-      return new XSDSimpleUnionRangeFragment(id, name, config, getController());
-  }
-
-  private boolean isSimpleTypeEnumeration(XSDSimpleTypeDefinition simpleType) {
-    EList e = simpleType.getEnumerationFacets();
-    return (e != null && e.size() > 0);
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDToFragmentConfiguration.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDToFragmentConfiguration.java
deleted file mode 100644
index 0537da155..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDToFragmentConfiguration.java
+++ /dev/null
@@ -1,90 +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.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.xsd.XSDComponent;
-
-public class XSDToFragmentConfiguration {
-  private XSDComponent component_;
-  private int minOccurs_;
-  private int maxOccurs_;
-  private int style_;
-  private int partEncoding_;
-  private boolean isWSDLPart_;
-  private String wsdlPartName_;
-
-  public XSDToFragmentConfiguration() {
-    component_ = null;
-    minOccurs_ = FragmentConstants.DEFAULT_MIN_OCCURS;
-    maxOccurs_ = FragmentConstants.DEFAULT_MAX_OCCURS;
-    style_ = FragmentConstants.STYLE_DOCUMENT;
-    partEncoding_ = FragmentConstants.ENCODING_LITERAL;
-    isWSDLPart_ = false;
-    wsdlPartName_ = null;
-  }
-
-  public void setXSDComponent(XSDComponent component) {
-    component_ = component;
-  }
-
-  public XSDComponent getXSDComponent() {
-    return component_;
-  }
-
-  public void setMinOccurs(int minOccurs) {
-    minOccurs_ = minOccurs;
-  }
-
-  public int getMinOccurs() {
-    return minOccurs_;
-  }
-
-  public void setMaxOccurs(int maxOccurs) {
-    maxOccurs_ = maxOccurs;
-  }
-
-  public int getMaxOccurs() {
-    return maxOccurs_;
-  }
-  
-  public void setStyle(int style) {
-    style_ = style;
-  }
-  
-  public int getStyle() {
-    return style_;
-  }
-
-  public void setPartEncoding(int partEncoding) {
-    partEncoding_ = partEncoding;
-  }
-
-  public int getPartEncoding() {
-    return partEncoding_;
-  }
-
-  public void setIsWSDLPart(boolean isWSDLPart) {
-    isWSDLPart_ = isWSDLPart;
-  }
-
-  public boolean getIsWSDLPart() {
-    return isWSDLPart_;
-  }
-  
-  public void setWSDLPartName(String wsdlPartName) {
-    wsdlPartName_ = wsdlPartName;
-  }
-  
-  public String getWSDLPartName() {
-    return wsdlPartName_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDToFragmentController.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDToFragmentController.java
deleted file mode 100644
index ce323c1ec..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDToFragmentController.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.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.WSDLPartsToXSDTypeMapper;
-
-public class XSDToFragmentController {
-  private WSDLPartsToXSDTypeMapper wsdlToXSDMapper_;
-  private XSDLiteralXMLEncodingToFragmentMapper xsdLiteralMapper_;
-  private XSDSOAPEncodingToFragmentMapper xsdSoapMapper_;
-  private Hashtable xsdToFragmentCache_;
-
-  public XSDToFragmentController() {
-    wsdlToXSDMapper_ = null;
-    xsdLiteralMapper_ = null;
-    xsdSoapMapper_ = null;
-    xsdToFragmentCache_ = new Hashtable();
-  }
-
-  public void setWSDLPartsToXSDTypeMapper(WSDLPartsToXSDTypeMapper wsdlToXSDMapper) {
-    wsdlToXSDMapper_ = wsdlToXSDMapper;
-  }
-
-  public WSDLPartsToXSDTypeMapper getWSDLPartsToXSDTypeMapper() {
-    return wsdlToXSDMapper_;
-  }
-
-  private XSDLiteralXMLEncodingToFragmentMapper getXSDLiteralMapper() {
-    if (xsdLiteralMapper_ == null)
-      xsdLiteralMapper_ = new XSDLiteralXMLEncodingToFragmentMapper(this, wsdlToXSDMapper_);
-    return xsdLiteralMapper_;
-  }
-
-  private XSDSOAPEncodingToFragmentMapper getXSDSOAPMapper() {
-    if (xsdSoapMapper_ == null)
-      xsdSoapMapper_ = new XSDSOAPEncodingToFragmentMapper(this, wsdlToXSDMapper_);
-    return xsdSoapMapper_;
-  }
-
-  public IXSDFragment getFragment(XSDToFragmentConfiguration config, String id, String name) {
-    IXSDFragment frag = getCachedFragment(id);
-    if (frag != null)
-      return frag;
-    frag = getNewFragment(config, id, name);
-    if (frag != null)
-      addToCache(id, frag);
-    return frag;
-  }
-
-  public IXSDFragment getCachedFragment(String id) {
-    return (IXSDFragment)xsdToFragmentCache_.get(id);
-  }
-
-  public IXSDFragment getNewFragment(XSDToFragmentConfiguration config, String id, String name) {
-    switch (config.getPartEncoding())
-    {
-      case FragmentConstants.ENCODING_SOAP:
-        return getXSDSOAPMapper().getFragment(config,id,name);      
-      case FragmentConstants.ENCODING_LITERAL:
-      case FragmentConstants.ENCODING_URL:
-      default:
-        return getXSDLiteralMapper().getFragment(config,id,name);
-    }
-  }
-
-  public void addToCache(String id, IXSDFragment frag) {
-    xsdToFragmentCache_.put(id, frag);
-  }
-
-  public void removeFromCache(String id) {
-    xsdToFragmentCache_.remove(id);
-  }
-
-  public void emptyCache() {
-    xsdToFragmentCache_.clear();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDToFragmentMapper.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDToFragmentMapper.java
deleted file mode 100644
index 1cfc58fe3..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDToFragmentMapper.java
+++ /dev/null
@@ -1,78 +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.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDDefaultFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDEmptyFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.WSDLPartsToXSDTypeMapper;
-import org.eclipse.xsd.XSDComponent;
-import org.eclipse.xsd.XSDNamedComponent;
-import org.eclipse.xsd.XSDSchema;
-
-public abstract class XSDToFragmentMapper {
-  private XSDToFragmentController controller_;
-  private WSDLPartsToXSDTypeMapper wsdlToXSDMapper_;
-
-  public XSDToFragmentMapper(XSDToFragmentController controller, WSDLPartsToXSDTypeMapper wsdlToXSDMapper) {
-    controller_ = controller;
-    wsdlToXSDMapper_ = wsdlToXSDMapper;
-  }
-
-  public void setController(XSDToFragmentController controller) {
-    controller_ = controller;
-  }
-
-  public XSDToFragmentController getController() {
-    return controller_;
-  }
-
-  public void setWSDLPartsToXSDTypeMapper(WSDLPartsToXSDTypeMapper wsdlToXSDMapper) {
-    wsdlToXSDMapper_ = wsdlToXSDMapper;
-  }
-
-  public WSDLPartsToXSDTypeMapper getWSDLPartsToXSDTypeMapper() {
-    return wsdlToXSDMapper_;
-  }
-
-  protected IXSDFragment getXSDDefaultFragment(XSDToFragmentConfiguration config, String id, String name) {
-    return new XSDDefaultFragment(id, name, config);
-  }
-
-  protected IXSDFragment getXSDEmptyFragment(XSDToFragmentConfiguration config, String id, String name) {
-    return new XSDEmptyFragment(id, name, config);
-  }
-
-  public abstract IXSDFragment getFragment(XSDToFragmentConfiguration config, String id, String name);
-
-  protected XSDToFragmentConfiguration resolveXSDComponent(XSDToFragmentConfiguration config)
-  {
-    XSDComponent component = config.getXSDComponent();
-    if (!isComponentResolvable(component) && (component instanceof XSDNamedComponent))
-    {
-      XSDComponent resolvedComponent = getWSDLPartsToXSDTypeMapper().resolveXSDNamedComponent((XSDNamedComponent)component);
-      if (resolvedComponent != null)
-        config.setXSDComponent(resolvedComponent);
-    }
-    return config;
-  }
-
-  protected boolean isComponentResolvable(XSDComponent component)
-  {
-    if (component == null)
-      return false;
-    XSDSchema schema = component.getSchema();
-    if (schema == null)
-      return false;
-    if (schema.getTargetNamespace() == null)
-      return false;
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/Fragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/Fragment.java
deleted file mode 100644
index 5371e2501..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/Fragment.java
+++ /dev/null
@@ -1,102 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IFragment;
-
-public abstract class Fragment implements IFragment {
-  private String id_;
-  private String name_;
-  private Hashtable params_;
-
-  public Fragment(String id, String name) {
-    id_ = id;
-    name_ = name;
-    params_ = new Hashtable();
-  }
-
-  public void setID(String id) {
-    id_ = id;
-  }
-
-  public String getID() {
-    return id_;
-  }
-
-  public void setName(String name) {
-    name_ = name;
-  }
-
-  public String getName() {
-    return name_;
-  }
-
-  public boolean processParameterValues(MultipartFormDataParser parser) throws MultipartFormDataException {
-    String[] params = parser.getParameterValues(getID());
-    setParameterValues(getID(), params);
-    return validateAllParameterValues();
-  }
-
-  public void setParameterValues(String paramKey, String[] params) {
-    if (params == null)
-      params_.remove(paramKey);
-    else
-      params_.put(paramKey, params);
-  }
-
-  public void setParameterValues(String paramKey, Vector params) {
-    if (params == null)
-      params_.remove(paramKey);
-    else {
-      String[] paramsArray = new String[params.size()];
-      for (int i = 0; i < paramsArray.length; i++) {
-        paramsArray[i] = params.get(i).toString();
-      }
-      setParameterValues(paramKey, paramsArray);
-    }
-  }
-
-  public String[] getParameterValues(String paramKey) {
-    return (String[])params_.get(paramKey);
-  }
-
-  public String getParameterValue(String paramKey, int paramIndex) {
-    String[] params = getParameterValues(paramKey);
-    if (params != null && paramIndex < params.length)
-      return params[paramIndex];
-    else
-      return null;
-  }
-
-  public boolean validateAllParameterValues() {
-    Enumeration paramKeys = params_.keys();
-    while (paramKeys != null && paramKeys.hasMoreElements()) {
-      if (!validateParameterValues((String)paramKeys.nextElement()))
-        return false;
-    }
-    return true;
-  }
-
-  public boolean validateParameterValues(String paramKey) {
-    String[] params = getParameterValues(paramKey);
-    for (int i = 0; params != null && i < params.length; i++) {
-      if (!validateParameterValue(paramKey, i))
-        return false;
-    }
-    return true;
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncArrayFixFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncArrayFixFragment.java
deleted file mode 100644
index c6459dec5..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncArrayFixFragment.java
+++ /dev/null
@@ -1,33 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.xsd.XSDModelGroup;
-
-public class SOAPEncArrayFixFragment extends SOAPEncArrayFragment {
-  public SOAPEncArrayFixFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller, XSDModelGroup xsdModelGroup) {
-    super(id, name, config, controller, xsdModelGroup);
-  }
-
-  public String getInformationFragment() {
-    return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
-  }
-
-  public String getReadFragment() {
-    return "/wsdl/fragment/SOAPEncArrayRFragmentJSP.jsp";
-  }
-
-  public String getWriteFragment() {
-    return "/wsdl/fragment/SOAPEncArrayFixWFragmentJSP.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncArrayFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncArrayFragment.java
deleted file mode 100644
index d085dff16..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncArrayFragment.java
+++ /dev/null
@@ -1,188 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.ISOAPEncArrayFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDParticleContent;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public abstract class SOAPEncArrayFragment extends XSDGroupSeqFragment implements ISOAPEncArrayFragment
-{
-  public SOAPEncArrayFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller, XSDModelGroup xsdModelGroup)
-  {
-    super(id, name, config, controller, xsdModelGroup);
-  }
-
-  public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments)
-  {
-    Element[] instanceDocumentsCopy = getInstanceDocumentsByTagName(instanceDocuments, getName());
-    removeGroupIDs();
-    boolean paramsValid = internalEquals(instanceDocumentsCopy, instanceDocuments);
-    for (int i = 0; i < instanceDocumentsCopy.length; i++)
-    {
-      IXSDFragment soapEncArrayTypeFrag = (getGroupMemberFragments(createSOAPEncArrayInstance()))[0];
-      Vector instancesVector = new Vector();
-      NodeList nl = instanceDocumentsCopy[i].getChildNodes();
-      for (int j = 0; j < nl.getLength(); j++)
-      {
-        Node node = nl.item(j);
-        if (node instanceof Element)
-          instancesVector.add(node);
-        else
-          paramsValid = false;
-      }
-      Element[] childInstanceDocuments = new Element[instancesVector.size()];
-      instancesVector.copyInto(childInstanceDocuments);
-      if (!soapEncArrayTypeFrag.setParameterValuesFromInstanceDocuments(setElementsTagName(childInstanceDocuments, soapEncArrayTypeFrag.getName())))
-        paramsValid = false;
-    }
-    return paramsValid;
-  }
-
-  public Element[] genInstanceDocumentsFromParameterValues(boolean genXSIType, Hashtable namespaceTable, Document doc)
-  {
-    String[] groupIDs = getGroupIDs();
-    Element[] instanceDocument = new Element[groupIDs.length];
-    StringBuffer attrName = new StringBuffer();
-    StringBuffer attrValue = new StringBuffer();
-//    StringBuffer attrArrayTypeName = new StringBuffer();
-//    StringBuffer attrArrayTypeValue = new StringBuffer();
-    for (int i = 0; i < instanceDocument.length; i++)
-    {
-      int numInstances = 0;
-      instanceDocument[i] = doc.createElement(getInstanceDocumentTagName(namespaceTable));
-      IXSDFragment fragment = (getGroupMemberFragments(groupIDs[i]))[0];
-      Element[] fragmentInstanceDocuments = fragment.genInstanceDocumentsFromParameterValues(genXSIType, namespaceTable, doc);
-      for (int j = 0; j < fragmentInstanceDocuments.length; j++)
-      {
-        if (fragmentInstanceDocuments[j] != null)
-          instanceDocument[i].appendChild(fragmentInstanceDocuments[j]);
-        numInstances++;
-      }
-      String soapURI = FragmentConstants.URI_SOAP;
-      String soapPrefix = getPrefixFromNamespaceURI(soapURI, namespaceTable);
-      String soapEncArrayTypeURI = getXSDTypeDefinition().getTargetNamespace();
-      String soapEncArrayTypePrefix = getPrefixFromNamespaceURI(soapEncArrayTypeURI, namespaceTable);
-      // Set the arrayType attribute
-      attrName.setLength(0);
-      attrName.setLength(0);
-      attrName.append(soapPrefix);
-      attrName.append(FragmentConstants.COLON);
-      attrName.append(FragmentConstants.SOAP_ENC_ARRAY_TYPE);
-      attrValue.setLength(0);
-      attrValue.append(soapEncArrayTypePrefix);
-      attrValue.append(FragmentConstants.COLON);
-      attrValue.append(getXSDTypeDefinition().getName());
-      attrValue.append(FragmentConstants.LEFT_SQUARE_BRACKET);
-      attrValue.append(numInstances);
-      attrValue.append(FragmentConstants.RIGHT_SQUARE_BRACKET);
-      instanceDocument[i].setAttribute(attrName.toString(), attrValue.toString());
-    }
-    if (genXSIType)
-    {
-//	  TODO: Used to call the plugin's ignoreSchemaForSOAPArrays()method.
-	  boolean ignoreSchemaForSOAPArrays = true;
-      if (ignoreSchemaForSOAPArrays)
-      {
-        for (int i = 0; i < instanceDocument.length; i++)
-        {
-          String xsiURI = FragmentConstants.URI_XSI;
-          String xsiPrefix = getPrefixFromNamespaceURI(xsiURI, namespaceTable);
-          String xsiTypeURI = FragmentConstants.URI_SOAP;
-          String xsiTypePrefix = getPrefixFromNamespaceURI(xsiTypeURI, namespaceTable);
-          attrName.setLength(0);
-          attrName.append(xsiPrefix).append(FragmentConstants.COLON).append(FragmentConstants.XSI_TYPE);
-          attrValue.setLength(0);
-          attrValue.append(xsiTypePrefix).append(FragmentConstants.COLON);
-          attrValue.append(FragmentConstants.QNAME_LOCAL_NAME_ARRAY);
-          instanceDocument[i].setAttribute(attrName.toString(), attrValue.toString());
-        }
-      }
-      else
-        return addXSIType(instanceDocument, namespaceTable);
-    }
-    return instanceDocument;
-  }
-
-  public String createSOAPEncArrayInstance()
-  {
-    if (getXSDTypeDefinition() != null)
-    {
-      String groupID = genID();
-      String[] groupMemberID = {genID()};
-      int minOccurs = 0;
-      int maxOccurs = FragmentConstants.UNBOUNDED;
-      XSDElementDeclaration elementDecl = null;
-      if (getXSDModelGroup() != null)
-      {
-        XSDParticle groupOwner = (XSDParticle)getXSDModelGroup().getContainer();
-        int groupMin = groupOwner.getMinOccurs();
-        int groupMax = groupOwner.getMaxOccurs();
-        int elementMin = 0;
-        int elementMax = FragmentConstants.UNBOUNDED;
-        EList xsdParticles = getXSDModelGroup().getParticles();
-        if (xsdParticles.size() > 0)
-        {
-          XSDParticleContent xsdParticleContent = ((XSDParticle)xsdParticles.get(0)).getContent();
-          if (xsdParticleContent instanceof XSDElementDeclaration)
-          {
-            elementDecl = (XSDElementDeclaration)xsdParticleContent;
-            XSDParticle elementOwner = (XSDParticle)elementDecl.getContainer();
-            elementMin = elementOwner.getMinOccurs();
-            elementMax = elementOwner.getMaxOccurs();
-          }
-        }
-        if (groupMin >= 0 && elementMin >= 0)
-          minOccurs = groupMin * elementMin;
-        if (groupMax >= 0 && groupMax != FragmentConstants.UNBOUNDED && elementMax >= 0 && elementMax != FragmentConstants.UNBOUNDED)
-          maxOccurs = groupMax * elementMax;
-      }
-      XSDToFragmentConfiguration thisConfig = getXSDToFragmentConfiguration();
-      XSDToFragmentConfiguration xsdConfig = new XSDToFragmentConfiguration();
-      xsdConfig.setXSDComponent(getXSDTypeDefinition());
-      xsdConfig.setMinOccurs(minOccurs);
-      xsdConfig.setMaxOccurs(maxOccurs);
-      xsdConfig.setStyle(thisConfig.getStyle());
-      xsdConfig.setPartEncoding(thisConfig.getPartEncoding());
-      xsdConfig.setWSDLPartName(thisConfig.getWSDLPartName());
-      String name = (elementDecl != null) ? elementDecl.getName() : getXSDTypeDefinition().getName();
-      IXSDFragment frag = getXSDToFragmentController().getFragment(xsdConfig, groupMemberID[0], name);
-      addFragment(groupMemberID[0], frag);
-      setGroupMemberIDs(groupID, groupMemberID);
-      return groupID;
-    }
-    else
-      return null;
-  }
-
-  public String createGroupSeqInstance()
-  {
-    return createSOAPEncArrayInstance();
-  }
-
-  public String createInstance()
-  {
-    return createSOAPEncArrayInstance();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncArrayRangeFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncArrayRangeFragment.java
deleted file mode 100644
index f177ee62b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncArrayRangeFragment.java
+++ /dev/null
@@ -1,33 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.xsd.XSDModelGroup;
-
-public class SOAPEncArrayRangeFragment extends SOAPEncArrayFragment {
-  public SOAPEncArrayRangeFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller, XSDModelGroup xsdModelGroup) {
-    super(id, name, config, controller, xsdModelGroup);
-  }
-
-  public String getInformationFragment() {
-    return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
-  }
-
-  public String getReadFragment() {
-    return "/wsdl/fragment/SOAPEncArrayRFragmentJSP.jsp";
-  }
-
-  public String getWriteFragment() {
-    return "/wsdl/fragment/SOAPEncArrayRangeWFragmentJSP.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncodingWrapperFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncodingWrapperFragment.java
deleted file mode 100644
index fb8abf22d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncodingWrapperFragment.java
+++ /dev/null
@@ -1,189 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.ISOAPEncodingWrapperFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class SOAPEncodingWrapperFragment extends XSDDelegationFragment implements ISOAPEncodingWrapperFragment
-{
-  private static final String ID = "id";
-  private static final String HREF = "href";
-  private static final String POUND = "#";
-
-  private Hashtable uriReferenceTable_;
-
-  public SOAPEncodingWrapperFragment(String id, String name, XSDToFragmentConfiguration config)
-  {
-    super(id, name, null);
-    uriReferenceTable_ = null;
-  }
-
-  public void setXSDToFragmentConfiguration(XSDToFragmentConfiguration config)
-  {
-    getXSDDelegationFragment().setXSDToFragmentConfiguration(config);
-  }
-
-  public XSDToFragmentConfiguration getXSDToFragmentConfiguration()
-  {
-    return getXSDDelegationFragment().getXSDToFragmentConfiguration();
-  }
-
-  public void setXSDTypeDefinition(XSDTypeDefinition typeDef)
-  {
-    getXSDDelegationFragment().setXSDTypeDefinition(typeDef);
-  }
-
-  public XSDTypeDefinition getXSDTypeDefinition()
-  {
-    return getXSDDelegationFragment().getXSDTypeDefinition();
-  }
-
-  public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments)
-  {
-    for (int i = 0; i < instanceDocuments.length; i++)
-      instanceDocuments[i] = resolveURIReferences(uriReferenceTable_, instanceDocuments[i]);
-    return getXSDDelegationFragment().setParameterValuesFromInstanceDocuments(instanceDocuments);
-  }
-
-  public void setURIReferences(Hashtable uriReferences)
-  {
-    uriReferenceTable_ = uriReferences;
-  }
-
-  public static Hashtable parseURIReferences(Element element, boolean overwrites)
-  {
-    Hashtable uriReferences = new Hashtable();
-    parseURIReferences(uriReferences, element, overwrites);
-    return uriReferences;
-  }
-
-  private static boolean parseURIReferences(Hashtable uriReferences, Element element, boolean overwrites)
-  {
-    boolean resolved = true;
-    if (element != null)
-    {
-      URIReference ref = null;
-      String id = element.getAttribute(ID);
-      resolved = !element.hasAttribute(HREF);
-      if (id != null && id.length() > 0 && (overwrites || !uriReferences.contains(id)))
-      {
-        ref = new URIReference(element, true);
-        uriReferences.put(id, ref);
-      }
-      NodeList nl = element.getChildNodes();
-      for (int i = 0; i < nl.getLength(); i++)
-      {
-        Node node = nl.item(i);
-        if (node instanceof Element)
-          resolved = parseURIReferences(uriReferences, (Element)node, overwrites) && resolved;
-      }
-      if (ref != null)
-        ref.setResolved(resolved);
-    }
-    return resolved;
-  }
-
-  public static Element resolveURIReferences(Hashtable uriReferences, Element element)
-  {
-    if (uriReferences != null && !uriReferences.isEmpty())
-      return resolveURIReferences(uriReferences, element.getOwnerDocument(), element, new Vector());
-    else
-      return element;
-  }
-
-  private static Element resolveURIReferences(Hashtable uriReferences, Document doc, Element element, Vector usedIds)
-  {
-    String href = element.getAttribute(HREF);
-    Element resolvedElement = element;
-    boolean resolved = false;
-    if (href != null && href.length() > 0)
-    {
-      URIReference ref = null;
-      if (href.indexOf(POUND) != -1)
-        href = href.substring(1, href.length());
-      if (!usedIds.contains(href))
-      {
-        ref = (URIReference)uriReferences.get(href);
-        if (ref != null)
-        {
-          usedIds.add(href);
-          Element elementRef = ref.getRefElement();
-          resolved = ref.getResolved();
-          resolvedElement = doc.createElement(element.getTagName());
-          NodeList nl = elementRef.getChildNodes();
-          for (int i = 0; i < nl.getLength(); i++)
-          {
-            Node node = nl.item(i);
-            if (node != null)
-              resolvedElement.appendChild(doc.importNode(node, true));
-          }
-        }
-      }
-    }
-    if (!resolved)
-    {
-      NodeList nl = resolvedElement.getChildNodes();
-      for (int i = 0; i < nl.getLength(); i++)
-      {
-        Node node = nl.item(i);
-        if (node instanceof Element)
-        {
-          Element child = resolveURIReferences(uriReferences, resolvedElement.getOwnerDocument(), (Element)node, usedIds);
-		  if (child != node)
-            resolvedElement.replaceChild(child, node);
-        }
-      }
-    }
-    if (href != null)
-      usedIds.remove(href);
-    return resolvedElement;
-  }
-
-  private static class URIReference
-  {
-    private Element ref_;
-    private boolean resolved_;
-
-    public URIReference(Element ref, boolean resolved)
-    {
-      ref_ = ref;
-      resolved_ = resolved;
-    }
-
-    public Element getRefElement()
-    {
-      return ref_;
-    }
-
-    public void setRefElement(Element ref)
-    {
-      ref_ = ref;
-    }
-
-    public boolean getResolved()
-    {
-      return resolved_;
-    }
-
-    public void setResolved(boolean resolved)
-    {
-      resolved_ = resolved;
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexFixFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexFixFragment.java
deleted file mode 100644
index 9b3fd0941..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexFixFragment.java
+++ /dev/null
@@ -1,32 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-
-public class XSDComplexFixFragment extends XSDComplexFragment {
-  public XSDComplexFixFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller) {
-    super(id, name, config, controller);
-  }
-
-  public String getInformationFragment() {
-    return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
-  }
-
-  public String getReadFragment() {
-    return "/wsdl/fragment/XSDComplexRFragmentJSP.jsp";
-  }
-
-  public String getWriteFragment() {
-    return "/wsdl/fragment/XSDComplexFixWFragmentJSP.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexFragment.java
deleted file mode 100644
index 34cba83a5..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexFragment.java
+++ /dev/null
@@ -1,238 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDComplexFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.XSDTypeDefinitionUtil;
-import org.eclipse.xsd.XSDComplexFinal;
-import org.eclipse.xsd.XSDComplexTypeContent;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDModelGroupDefinition;
-import org.eclipse.xsd.XSDNamedComponent;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDParticleContent;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public abstract class XSDComplexFragment extends XSDMapFragment implements IXSDComplexFragment
-{
-  public XSDComplexFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller)
-  {
-    super(id, name, config, controller);
-  }
-
-  public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments)
-  {
-    Element[] instanceDocumentsCopy = getInstanceDocumentsByTagName(instanceDocuments, getName());
-    boolean paramsValid = internalEquals(instanceDocumentsCopy, instanceDocuments);
-    XSDComplexTypeDefinition complexType = (XSDComplexTypeDefinition)getXSDTypeDefinition();
-    XSDComplexTypeContent complexTypeContent = XSDTypeDefinitionUtil.getXSDComplexTypeContent(complexType);
-    if (complexTypeContent instanceof XSDTypeDefinition)
-      return setParamsForXSDTypeDef(instanceDocumentsCopy) && paramsValid;
-    else
-      return setParamsForXSDParticle(instanceDocumentsCopy) && paramsValid;
-  }
-
-  private boolean setParamsForXSDTypeDef(Element[] instanceDocuments)
-  {
-    boolean paramsValid = true;
-    removeAllFragments();
-    for (int i = 0; i < instanceDocuments.length; i++)
-    {
-      IXSDFragment childFrag = getFragment(createInstance());
-      Element[] childInstanceDocuments = new Element[1];
-      childInstanceDocuments[0] = instanceDocuments[i];
-      if (!childFrag.setParameterValuesFromInstanceDocuments(setElementsTagName(childInstanceDocuments, childFrag.getName())))
-        paramsValid = false;
-    }
-    return paramsValid;
-  }
-
-  private boolean setParamsForXSDParticle(Element[] instanceDocuments)
-  {
-    boolean paramsValid = true;
-    removeAllFragments();
-    for (int i = 0; i < instanceDocuments.length; i++)
-    {
-      IXSDFragment childFrag = getFragment(createInstance());
-      Vector instancesVector = new Vector();
-      NodeList nl = instanceDocuments[i].getChildNodes();
-      for (int j = 0; j < nl.getLength(); j++)
-      {
-        Node node = nl.item(j);
-        if (node instanceof Element)
-          instancesVector.add(node);
-        else
-          paramsValid = false;
-      }
-      Element[] childInstanceDocuments = new Element[instancesVector.size()];
-      instancesVector.copyInto(childInstanceDocuments);
-      if (!childFrag.setParameterValuesFromInstanceDocuments(childInstanceDocuments))
-        paramsValid = false;
-    }
-    return paramsValid;
-  }
-
-  public Element[] genInstanceDocumentsFromParameterValues(boolean genXSIType, Hashtable namespaceTable, Document doc)
-  {
-    XSDComplexTypeDefinition complexType = (XSDComplexTypeDefinition)getXSDTypeDefinition();
-    XSDComplexTypeContent complexTypeContent = XSDTypeDefinitionUtil.getXSDComplexTypeContent(complexType);
-    Element[] instanceDocuments;
-    String tagName = getInstanceDocumentTagName(namespaceTable);
-    if (complexTypeContent instanceof XSDTypeDefinition)
-      instanceDocuments = genInstancesForXSDTypeDef(genXSIType, namespaceTable, tagName, doc);
-    else
-      instanceDocuments = genInstancesForXSDParticle(genXSIType, namespaceTable, tagName, doc);
-    return (genXSIType ? addXSIType(instanceDocuments, namespaceTable) : instanceDocuments);
-  }
-
-  private Element[] genInstancesForXSDTypeDef(boolean genXSIType, Hashtable namespaceTable, String tagName, Document doc)
-  {
-    IXSDFragment[] fragments = getAllFragments();
-    Vector instanceDocumentsCopy = new Vector();
-    for (int i = 0; i < fragments.length; i++)
-    {
-      Element[] fragmentInstances = fragments[i].genInstanceDocumentsFromParameterValues(genXSIType, namespaceTable, doc);
-      if (fragmentInstances.length > 0)
-        instanceDocumentsCopy.add(fragmentInstances[0]);
-    }
-    Element[] instanceDocuments = new Element[instanceDocumentsCopy.size()];
-    for (int i = 0; i < instanceDocuments.length; i++)
-    {
-      instanceDocuments[i] = (Element)instanceDocumentsCopy.get(i);
-    }
-    return setElementsTagName(instanceDocuments, tagName);
-  }
-
-  private Element[] genInstancesForXSDParticle(boolean genXSIType, Hashtable namespaceTable, String tagName, Document doc)
-  {
-    IXSDFragment[] childFrags = getAllFragments();
-    Element[] instanceDocuments = new Element[childFrags.length];
-    for (int i = 0; i < instanceDocuments.length; i++)
-    {
-      Element[] childInstances = childFrags[i].genInstanceDocumentsFromParameterValues(genXSIType, namespaceTable, doc);
-      Element instanceDocument = doc.createElement(tagName);
-      for (int j = 0; j < childInstances.length; j++)
-      {
-        if (childInstances[j] != null)
-          instanceDocument.appendChild(childInstances[j]);
-      }
-      instanceDocuments[i] = instanceDocument;
-    }
-    return instanceDocuments;
-  }
-
-  private XSDModelGroup getXSDModelGroup(XSDParticle xsdParticle)
-  {
-    if (xsdParticle != null)
-    {
-      XSDParticleContent xsdParticleContent = xsdParticle.getContent();
-      if (xsdParticleContent != null)
-      {
-        if (xsdParticleContent instanceof XSDModelGroupDefinition)
-        {
-          XSDModelGroupDefinition xsdModelGroupDef = (XSDModelGroupDefinition)xsdParticleContent;
-          if (xsdModelGroupDef.isModelGroupDefinitionReference())
-            xsdModelGroupDef = xsdModelGroupDef.getResolvedModelGroupDefinition();
-          return xsdModelGroupDef.getModelGroup();
-        }
-        else if (xsdParticleContent instanceof XSDModelGroup)
-          return (XSDModelGroup)xsdParticleContent;
-      }
-    }
-    return null;
-  }
-
-  private List getInheritedParticles(XSDComplexTypeDefinition complexType)
-  {
-    Vector v = new Vector();
-    if (complexType.getDerivationMethod().getValue() == XSDComplexFinal.EXTENSION)
-    {
-      XSDTypeDefinition extType = complexType.getBaseType();
-      if (extType != null && !(extType instanceof XSDComplexTypeDefinition))
-      {
-        String namespace = extType.getTargetNamespace();
-        String localname = extType.getName();
-        if (namespace != null && localname != null)
-        {
-          XSDNamedComponent xsdNamedComp = getXSDToFragmentController().getWSDLPartsToXSDTypeMapper().getXSDTypeFromSchema(namespace, localname, false);
-          if (xsdNamedComp instanceof XSDComplexTypeDefinition)
-          {
-            extType = (XSDComplexTypeDefinition)xsdNamedComp;
-          }
-        }
-      }
-      if (extType != null && extType != complexType && extType instanceof XSDComplexTypeDefinition)
-      {
-        XSDComplexTypeContent extTypeContent = XSDTypeDefinitionUtil.getXSDComplexTypeContent((XSDComplexTypeDefinition)extType);
-        if (extTypeContent instanceof XSDParticle)
-        {
-          XSDModelGroup xsdModelGroup = getXSDModelGroup((XSDParticle)extTypeContent);
-          if (xsdModelGroup != null)
-          {
-            v.addAll(getInheritedParticles((XSDComplexTypeDefinition)extType));
-            v.addAll(xsdModelGroup.getParticles());
-          }
-        }
-      }
-    }
-    return v;
-  }
-
-  private void gatherInheritedParticles(XSDComplexTypeDefinition complexType)
-  {
-    if (complexType.getDerivationMethod().getValue() == XSDComplexFinal.EXTENSION)
-    {
-      XSDComplexTypeContent complexTypeContent = XSDTypeDefinitionUtil.getXSDComplexTypeContent(complexType);
-      if (complexTypeContent instanceof XSDParticle)
-      {
-        XSDModelGroup xsdModelGroup = getXSDModelGroup((XSDParticle)complexTypeContent);
-        if (xsdModelGroup != null)
-        {
-          List inheritedParticles = getInheritedParticles(complexType);
-          List particles = xsdModelGroup.getParticles();
-          particles.addAll(0, inheritedParticles);
-        }
-      }
-    }
-  }
-
-  public String createComplexInstance()
-  {
-    XSDComplexTypeDefinition complexType = (XSDComplexTypeDefinition)getXSDTypeDefinition();
-    gatherInheritedParticles(complexType);
-    XSDComplexTypeContent complexTypeContent = XSDTypeDefinitionUtil.getXSDComplexTypeContent(complexType);
-    XSDToFragmentConfiguration thisConfig = getXSDToFragmentConfiguration();
-    XSDToFragmentConfiguration xsdConfig = new XSDToFragmentConfiguration();
-    xsdConfig.setXSDComponent(complexTypeContent);
-    xsdConfig.setStyle(thisConfig.getStyle());
-    xsdConfig.setPartEncoding(thisConfig.getPartEncoding());
-    xsdConfig.setWSDLPartName(thisConfig.getWSDLPartName());
-    String newID = genID();
-    addFragment(newID, getXSDToFragmentController().getFragment(xsdConfig, newID, newID));
-    return newID;
-  }
-
-  public String createInstance()
-  {
-    return createComplexInstance();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexRangeFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexRangeFragment.java
deleted file mode 100644
index c3453ce18..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexRangeFragment.java
+++ /dev/null
@@ -1,32 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-
-public class XSDComplexRangeFragment extends XSDComplexFragment {
-  public XSDComplexRangeFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller) {
-    super(id, name, config, controller);
-  }
-
-  public String getInformationFragment() {
-    return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
-  }
-
-  public String getReadFragment() {
-    return "/wsdl/fragment/XSDComplexRFragmentJSP.jsp";
-  }
-
-  public String getWriteFragment() {
-    return "/wsdl/fragment/XSDComplexRangeWFragmentJSP.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDDefaultFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDDefaultFragment.java
deleted file mode 100644
index bdce00449..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDDefaultFragment.java
+++ /dev/null
@@ -1,120 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.XMLUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class XSDDefaultFragment extends XSDFragment {
-  public XSDDefaultFragment(String id, String name, XSDToFragmentConfiguration config) {
-    super(id, name, config);
-  }
-
-  public boolean processParameterValues(MultipartFormDataParser parser) throws MultipartFormDataException {
-    String[] param = new String[1];
-    param[0] = parser.getParameter(getID());
-    setParameterValues(getID(), param);
-    return isElement(addRootElement(param[0]));
-  }
-
-  private String addRootElement(String element) {
-    StringBuffer sb = new StringBuffer();
-    sb.append(FragmentConstants.ROOT_ELEMENT_START_TAG);
-    sb.append(element);
-    sb.append(FragmentConstants.ROOT_ELEMENT_END_TAG);
-    return sb.toString();
-  }
-
-  private boolean isElement(String elementString) {
-    try {
-      return (XMLUtils.stringToElement(elementString) != null);
-    }
-    catch (Throwable t) {
-      return false;
-    }
-  }
-
-  public boolean validateAllParameterValues() {
-    String param = getParameterValue(getID(), 0);
-    return (param == null || isElement(addRootElement(param)));
-  }
-
-  public boolean validateParameterValues(String paramKey) {
-    String param = getParameterValue(getID(), 0);
-    return (param == null || isElement(addRootElement(param)));
-  }
-
-  public boolean validateParameterValue(String paramKey, int paramIndex) {
-    String param = getParameterValue(getID(), 0);
-    return (param == null || isElement(addRootElement(param)));
-  }
-
-  public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments) {
-    StringBuffer sb = new StringBuffer();
-    boolean paramValid = true;
-    for (int i = 0; i < instanceDocuments.length; i++) {
-      String instanceString = XMLUtils.serialize(instanceDocuments[i], true);
-      if (instanceString != null && instanceString.length() > 0)
-        sb.append(instanceString);
-      else
-        paramValid = false;
-    }
-    String[] param = {sb.toString()};
-    setParameterValues(getID(), param);
-    return paramValid;
-  }
-
-  public Element[] genInstanceDocumentsFromParameterValues(boolean genXSIType, Hashtable namespaceTable, Document doc) {
-    String param = getParameterValue(getID(), 0);
-    if (param == null)
-      return new Element[0];
-    Element root;
-    try {
-      root = (Element)doc.importNode(XMLUtils.stringToElement(addRootElement(param)), true);
-    }
-    catch (Throwable t) {
-      return new Element[0];
-    }
-    NodeList nl = root.getChildNodes();
-    Vector instanceDocumentVector = new Vector();
-    for (int i = 0; i < nl.getLength(); i++) {
-      Node node = nl.item(i);
-      if (node instanceof Element)
-        instanceDocumentVector.add(node);
-    }
-    Element[] instanceDocuments = new Element[instanceDocumentVector.size()];
-    for (int i = 0; i < instanceDocuments.length; i++) {
-      instanceDocuments[i] = (Element)instanceDocumentVector.get(i);
-    }
-    return instanceDocuments;
-  }
-
-  public String getInformationFragment() {
-    return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
-  }
-
-  public String getReadFragment() {
-    return "/wsdl/fragment/XSDDefaultRFragmentJSP.jsp";
-  }
-
-  public String getWriteFragment() {
-    return "/wsdl/fragment/XSDDefaultWFragmentJSP.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDDelegationFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDDelegationFragment.java
deleted file mode 100644
index 43b229e53..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDDelegationFragment.java
+++ /dev/null
@@ -1,113 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDDelegationFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class XSDDelegationFragment extends XSDFragment implements IXSDDelegationFragment
-{
-  private IXSDFragment xsdFragment_;
-
-  public XSDDelegationFragment(String id, String name, XSDToFragmentConfiguration config)
-  {
-    super(id, name, config);
-    xsdFragment_ = null;
-  }
-
-  public void setName(String name) {
-    super.setName(name);
-    if (xsdFragment_ != null)
-      xsdFragment_.setName(name);
-  }
-
-  public boolean processParameterValues(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    return xsdFragment_.processParameterValues(parser);
-  }
-
-  public void setParameterValues(String paramKey, String[] params)
-  {
-    xsdFragment_.setParameterValues(paramKey, params);
-  }
-
-  public void setParameterValues(String paramKey, Vector params)
-  {
-    xsdFragment_.setParameterValues(paramKey, params);
-  }
-
-  public String[] getParameterValues(String paramKey)
-  {
-    return xsdFragment_.getParameterValues(paramKey);
-  }
-
-  public String getParameterValue(String paramKey, int paramIndex)
-  {
-    return xsdFragment_.getParameterValue(paramKey, paramIndex);
-  }
-
-  public boolean validateAllParameterValues()
-  {
-    return xsdFragment_.validateAllParameterValues();
-  }
-
-  public boolean validateParameterValues(String paramKey)
-  {
-    return xsdFragment_.validateParameterValues(paramKey);
-  }
-
-  public boolean validateParameterValue(String paramKey, int paramIndex)
-  {
-    return xsdFragment_.validateParameterValue(paramKey, paramIndex);
-  }
-
-  public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments)
-  {
-    return xsdFragment_.setParameterValuesFromInstanceDocuments(instanceDocuments);
-  }
-
-  public Element[] genInstanceDocumentsFromParameterValues(boolean genXSIType, Hashtable namespaceTable, Document doc)
-  {
-    return xsdFragment_.genInstanceDocumentsFromParameterValues(genXSIType, namespaceTable, doc);
-  }
-
-  public String getInformationFragment()
-  {
-    return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
-  }
-
-  public String getReadFragment()
-  {
-    return "/wsdl/fragment/XSDDelegationRFragmentJSP.jsp";
-  }
-
-  public String getWriteFragment()
-  {
-    return "/wsdl/fragment/XSDDelegationWFragmentJSP.jsp";
-  }
-
-  public void setXSDDelegationFragment(IXSDFragment xsdFragment)
-  {
-    xsdFragment_ = xsdFragment;
-  }
-
-  public IXSDFragment getXSDDelegationFragment()
-  {
-    return xsdFragment_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDElementFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDElementFragment.java
deleted file mode 100644
index e560d90a7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDElementFragment.java
+++ /dev/null
@@ -1,227 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDElementFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDForm;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class XSDElementFragment extends XSDDelegationFragment implements IXSDElementFragment
-{
-  private int minOccurs_;
-  private int maxOccurs_;
-
-  public XSDElementFragment(String id, String name, XSDToFragmentConfiguration config)
-  {
-    super(id, name, config);
-    if (config != null)
-    {
-      minOccurs_ = config.getMinOccurs();
-      maxOccurs_ = config.getMaxOccurs();
-    }
-    else
-    {
-      minOccurs_ = FragmentConstants.DEFAULT_MIN_OCCURS;
-      maxOccurs_ = FragmentConstants.DEFAULT_MAX_OCCURS;
-    }
-  }
-
-  public boolean processParameterValues(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    IXSDFragment elementTypeFragment = getXSDDelegationFragment();
-    if (!elementTypeFragment.processParameterValues(parser))
-      return false;
-    String[] params = getParameterValues(elementTypeFragment.getID());
-    if (params != null && !withinRange(params.length))
-      return false;
-    return true;
-  }
-
-  public boolean validateAllParameterValues()
-  {
-    IXSDFragment elementTypeFragment = getXSDDelegationFragment();
-    String[] params = getParameterValues(elementTypeFragment.getID());
-    if (params != null && !withinRange(params.length))
-      return false;
-    if (!elementTypeFragment.validateAllParameterValues())
-      return false;
-    return true;
-  }
-
-  public boolean validateParameterValues(String paramKey)
-  {
-    String[] params = getParameterValues(paramKey);
-    if (params != null && !withinRange(params.length))
-      return false;
-    if (!getXSDDelegationFragment().validateParameterValues(paramKey))
-      return false;
-    return true;
-  }
-
-  public boolean validateParameterValue(String paramKey, int paramIndex)
-  {
-    if (!withinRange(paramIndex + 1))
-      return false;
-    XSDElementDeclaration xsdElement = (XSDElementDeclaration)getXSDToFragmentConfiguration().getXSDComponent();
-    String param = getParameterValue(paramKey, paramIndex);
-    if (param != null && param.length() <= 0 && !xsdElement.isNillable())
-      return false;
-    if (!getXSDDelegationFragment().validateParameterValue(paramKey, paramIndex))
-      return false;
-    return true;
-  }
-
-  public void setXSDToFragmentConfiguration(XSDToFragmentConfiguration config)
-  {
-    super.setXSDToFragmentConfiguration(config);
-    minOccurs_ = config.getMinOccurs();
-    maxOccurs_ = config.getMaxOccurs();
-  }
-
-  public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments)
-  {
-    Element[] instanceDocumentsCopy = instanceDocuments;
-    XSDToFragmentConfiguration config = getXSDToFragmentConfiguration();
-    String wsdlPartName = config.getWSDLPartName();
-    if (config.getIsWSDLPart() && config.getStyle() == FragmentConstants.STYLE_RPC && wsdlPartName != null && wsdlPartName.length() > 0 && instanceDocumentsCopy.length == 1 && wsdlPartName.equals(instanceDocumentsCopy[0].getTagName()))
-    {
-      NodeList nl = instanceDocumentsCopy[0].getChildNodes();
-      Vector childElements = new Vector();
-      for (int i = 0; i < nl.getLength(); i++)
-      {
-        Node node = nl.item(i);
-        if (node.getNodeType() == Node.ELEMENT_NODE)
-          childElements.add(node);
-      }
-      instanceDocumentsCopy = (Element[])childElements.toArray(new Element[0]);
-    }
-    IXSDFragment elementTypeFragment = getXSDDelegationFragment();
-    instanceDocumentsCopy = getInstanceDocumentsByTagName(instanceDocumentsCopy, getName());
-    return elementTypeFragment.setParameterValuesFromInstanceDocuments(setElementsTagName(instanceDocumentsCopy, elementTypeFragment.getName()));
-  }
-
-  public Element[] genInstanceDocumentsFromParameterValues(boolean genXSIType, Hashtable namespaceTable, Document doc)
-  {
-    Element[] instanceDocuments = getXSDDelegationFragment().genInstanceDocumentsFromParameterValues(genXSIType, namespaceTable, doc);
-    instanceDocuments = setElementsTagName(instanceDocuments, getInstanceDocumentTagName(namespaceTable));
-    XSDToFragmentConfiguration config = getXSDToFragmentConfiguration();
-    String wsdlPartName = config.getWSDLPartName();
-    if (config.getIsWSDLPart() && config.getStyle() == FragmentConstants.STYLE_RPC && wsdlPartName != null && wsdlPartName.length() > 0)
-    {
-      Element[] instanceDocumentsCopy = instanceDocuments;
-      instanceDocuments = new Element[1];
-      instanceDocuments[0] = doc.createElement(wsdlPartName);
-      for (int i = 0; i < instanceDocumentsCopy.length; i++)
-      {
-        if (instanceDocumentsCopy[i] != null)
-          instanceDocuments[0].appendChild(instanceDocumentsCopy[i]);
-      }
-    }
-    return instanceDocuments;
-  }
-
-  protected boolean isInstanceNamespaceQualified()
-  {
-    XSDToFragmentConfiguration config = getXSDToFragmentConfiguration();
-    if (config.getPartEncoding() == FragmentConstants.ENCODING_LITERAL)
-    {
-      XSDElementDeclaration xsdElement = (XSDElementDeclaration)config.getXSDComponent();
-      // Try to resolve the element, since an element with a ref can never be global
-      if (xsdElement.getResolvedElementDeclaration() != null)
-        xsdElement = xsdElement.getResolvedElementDeclaration();
-      
-      if (xsdElement.isGlobal())
-        return true;
-      else
-      {
-        if (xsdElement.isSetForm())
-          return (xsdElement.getForm().getValue() == XSDForm.QUALIFIED);
-        else
-          return (xsdElement.getSchema().getElementFormDefault().getValue() == XSDForm.QUALIFIED);
-      }
-    }
-    else
-      return false;
-  }
-
-  protected String getInstanceDocumentTagName(Hashtable namespaceTable)
-  {
-    XSDToFragmentConfiguration config = getXSDToFragmentConfiguration();
-    XSDElementDeclaration xsdElement = (XSDElementDeclaration)config.getXSDComponent();
-    StringBuffer tagName = new StringBuffer();
-    if (isInstanceNamespaceQualified())
-    {
-      String nsURI = null;
-      // port to org.eclipse.xsd
-      if (xsdElement.getResolvedElementDeclaration() != null)
-        nsURI = xsdElement.getResolvedElementDeclaration().getTargetNamespace();
-      else
-        nsURI = xsdElement.getTargetNamespace();
-      if (nsURI != null && nsURI.length() > 0)
-      {
-        String prefix = getPrefixFromNamespaceURI(nsURI, namespaceTable);
-        tagName.append(prefix);
-        tagName.append(FragmentConstants.COLON);
-      }
-    }
-    String xsdElementName = xsdElement.getName();
-    if (xsdElementName == null || xsdElementName.length() <= 0)
-    {
-      // port to org.eclipse.xsd
-      if (xsdElement.getResolvedElementDeclaration() != null)
-        xsdElementName = xsdElement.getResolvedElementDeclaration().getName();
-      else
-        xsdElementName = getName();
-    }
-    tagName.append(xsdElementName);
-    return tagName.toString();
-  }
-
-  private boolean withinRange(int size)
-  {
-    if (size < minOccurs_)
-      return false;
-    if (maxOccurs_ != FragmentConstants.UNBOUNDED && size > maxOccurs_)
-      return false;
-    return true;
-  }
-
-  public void setMinOccurs(int minOccurs)
-  {
-    minOccurs_ = minOccurs;
-  }
-
-  public int getMinOccurs()
-  {
-    return minOccurs_;
-  }
-
-  public void setMaxOccurs(int maxOccurs)
-  {
-    maxOccurs_ = maxOccurs;
-  }
-
-  public int getMaxOccurs()
-  {
-    return maxOccurs_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDEmptyFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDEmptyFragment.java
deleted file mode 100644
index 67abf8bf3..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDEmptyFragment.java
+++ /dev/null
@@ -1,119 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class XSDEmptyFragment extends XSDFragment {
-  private int occurance_;
-
-  public XSDEmptyFragment(String id, String name, XSDToFragmentConfiguration config) {
-    super(id, name, config);
-    occurance_ = 0;
-  }
-
-  public boolean processParameterValues(MultipartFormDataParser parser) throws MultipartFormDataException {
-    String occurance = parser.getParameter(getID());
-    try {
-      occurance_ = Integer.parseInt(occurance);
-      return validateAllParameterValues();
-    }
-    catch (Throwable t) {
-      occurance_ = -1;
-      return false;
-    }
-  }
-
-  public void setParameterValues(String paramKey, String[] params) {
-  }
-
-  public void setParameterValues(String paramKey, Vector params) {
-  }
-
-  public String[] getParameterValues(String paramKey) {
-    if (occurance_ < 0)
-      return null;
-    else {
-      String[] params = new String[occurance_];
-      for (int i = 0; i < params.length; i++) {
-        params[i] = "";
-      }
-      return params;
-    }
-  }
-
-  public String getParameterValue(String paramKey, int paramIndex) {
-    if (paramIndex >= 0 && paramIndex < occurance_)
-      return "";
-    else
-      return null;
-  }
-
-  public boolean validateAllParameterValues() {
-    XSDToFragmentConfiguration xsdConfig = getXSDToFragmentConfiguration();
-    int min = xsdConfig.getMinOccurs();
-    int max = xsdConfig.getMaxOccurs();
-    return (occurance_ >= 0 && occurance_ >= min && (max == FragmentConstants.UNBOUNDED || occurance_ <= max));
-  }
-
-  public boolean validateParameterValues(String paramKey) {
-    return validateAllParameterValues();
-  }
-
-  public boolean validateParameterValue(String paramKey, int paramIndex) {
-    return validateAllParameterValues();
-  }
-
-  public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments) {
-    Element[] instanceDocumentsCopy = getInstanceDocumentsByTagName(instanceDocuments, getName());
-    boolean paramsValid = true;
-    for (int i = 0; i < instanceDocumentsCopy.length; i++) {
-      NodeList nodeList = instanceDocumentsCopy[i].getChildNodes();
-      if (nodeList.getLength() > 1)
-        paramsValid = false;
-      else if (nodeList.getLength() != 0) {
-        Node node = nodeList.item(0);
-        if (node.getNodeType() != Node.TEXT_NODE || !isWhitespace(node.getNodeValue()))
-          paramsValid = false;
-      }
-    }
-    occurance_ = instanceDocumentsCopy.length;
-    return paramsValid && validateAllParameterValues();
-  }
-
-  private boolean isWhitespace(String s) {
-    char[] chars = s.toCharArray();
-    for (int i = 0; i < chars.length; i++) {
-      if (!Character.isWhitespace(chars[i]) || !Character.isSpaceChar(chars[i]))
-        return false;
-    }
-    return true;
-  }
-
-  public String getInformationFragment() {
-    return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
-  }
-
-  public String getWriteFragment() {
-    return "/wsdl/fragment/XSDEmptyWFragmentJSP.jsp";
-  }
-
-  public String getReadFragment() {
-    return "/wsdl/fragment/XSDEmptyRFragmentJSP.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDFragment.java
deleted file mode 100644
index 822442ac0..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDFragment.java
+++ /dev/null
@@ -1,298 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.xsd.XSDComponent;
-import org.eclipse.xsd.XSDForm;
-import org.eclipse.xsd.XSDNamedComponent;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDTypeDefinition;
-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;
-
-public abstract class XSDFragment extends Fragment implements IXSDFragment
-{
-  private XSDToFragmentConfiguration config_;
-  private XSDTypeDefinition typeDef_;
-  private int seed_;
-
-  public XSDFragment(String id, String name, XSDToFragmentConfiguration config)
-  {
-    super(id, name);
-    config_ = config;
-    if (config_ != null)
-    {
-      XSDComponent component = config.getXSDComponent();
-      if (component instanceof XSDTypeDefinition)
-        typeDef_ = (XSDTypeDefinition)component;
-      else
-        typeDef_ = null;
-    }
-    seed_ = 0;
-  }
-
-  public void setXSDToFragmentConfiguration(XSDToFragmentConfiguration config)
-  {
-    config_ = config;
-    if (config_ != null)
-    {
-      XSDComponent component = config.getXSDComponent();
-      if (component instanceof XSDTypeDefinition)
-        setXSDTypeDefinition((XSDTypeDefinition)component);
-    }
-  }
-
-  public XSDToFragmentConfiguration getXSDToFragmentConfiguration()
-  {
-    return config_;
-  }
-
-  public void setXSDTypeDefinition(XSDTypeDefinition typeDef)
-  {
-    typeDef_ = typeDef;
-  }
-
-  public XSDTypeDefinition getXSDTypeDefinition()
-  {
-    return typeDef_;
-  }
-
-  public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments)
-  {
-    Element[] instanceDocumentsCopy = getInstanceDocumentsByTagName(instanceDocuments, getName());
-    String[] params = new String[instanceDocumentsCopy.length];
-    boolean paramsValid = internalEquals(instanceDocumentsCopy, instanceDocuments);
-    for (int i = 0; i < instanceDocumentsCopy.length; i++)
-    {
-      params[i] = "";
-      NodeList nodeList = instanceDocumentsCopy[i].getChildNodes();
-      if (nodeList.getLength() > 0)
-      {
-        Node node = nodeList.item(0);
-        if (nodeList.getLength() > 1)
-          paramsValid = false;
-        if (node.getNodeType() != Node.TEXT_NODE)
-          paramsValid = false;
-        else
-          params[i] = node.getNodeValue();
-      }
-      else
-        paramsValid = false;
-    }
-    setParameterValues(getID(), params);
-    return paramsValid && validateAllParameterValues();
-  }
-
-  protected Element[] getInstanceDocumentsByTagName(Element[] instanceDocuments, String tagName)
-  {
-    if (instanceDocuments == null)
-      return new Element[0];
-    Vector instancesCopy = new Vector();
-    for (int i = 0; i < instanceDocuments.length; i++)
-    {
-      if (instanceDocuments[i] == null)
-        continue;
-      String instanceTagName = trimPrefix(instanceDocuments[i].getTagName());
-      if (instanceTagName.equals(tagName))
-        instancesCopy.add(instanceDocuments[i]);
-    }
-    Element[] instances = new Element[instancesCopy.size()];
-    instancesCopy.copyInto(instances);
-    return instances;
-  }
-
-  protected String trimPrefix(String s)
-  {
-    String sCopy = new String(s);
-    int colonIndex = sCopy.indexOf(FragmentConstants.COLON);
-    if (colonIndex != -1 && colonIndex + 1 < sCopy.length() && !((String.valueOf(sCopy.charAt(colonIndex + 1))).equals(FragmentConstants.COLON)))
-      sCopy = sCopy.substring(colonIndex + 1, sCopy.length());
-    return sCopy;
-  }
-
-  public Element[] genInstanceDocumentsFromParameterValues(boolean genXSIType, Hashtable namespaceTable, Document doc)
-  {
-    String[] params = getParameterValues(getID());
-    if (params == null)
-      return new Element[0];
-    Element[] instanceDocuments = new Element[params.length];
-    String tagName = getInstanceDocumentTagName(namespaceTable);
-    for (int i = 0; i < instanceDocuments.length; i++)
-    {
-      Element instanceDocument = doc.createElement(tagName);
-      Node textNode = doc.createTextNode(params[i]);
-      instanceDocument.appendChild(textNode);
-      instanceDocuments[i] = instanceDocument;
-    }
-    return (genXSIType ? addXSIType(instanceDocuments, namespaceTable) : instanceDocuments);
-  }
-
-  public String genID()
-  {
-    StringBuffer newID = new StringBuffer();
-    newID.append(getID());
-    newID.append(FragmentConstants.ID_SEPERATOR);
-    newID.append(seed_++);
-    return newID.toString();
-  }
-
-  protected boolean isInstanceNamespaceQualified()
-  {
-    XSDSchema xsdSchema = config_.getXSDComponent().getSchema();
-    return (!config_.getIsWSDLPart() && config_.getPartEncoding() == FragmentConstants.ENCODING_LITERAL && xsdSchema.getElementFormDefault().getValue() == XSDForm.QUALIFIED);
-  }
-
-  protected String getInstanceDocumentTagName(Hashtable namespaceTable)
-  {
-    StringBuffer tagName = new StringBuffer();
-    if (isInstanceNamespaceQualified())
-    {
-      String nsURI = config_.getXSDComponent().getSchema().getTargetNamespace();
-      String prefix = getPrefixFromNamespaceURI(nsURI, namespaceTable);
-      tagName.append(prefix);
-      tagName.append(FragmentConstants.COLON);
-    }
-    tagName.append(getName());
-    return tagName.toString();
-  }
-
-  protected Element[] addXSIType(Element[] instanceDocuments, Hashtable namespaceTable)
-  {
-    XSDComponent xsdComponent = config_.getXSDComponent();
-    if (instanceDocuments != null && (xsdComponent instanceof XSDNamedComponent))
-    {
-      String xsdComponentName = ((XSDNamedComponent)xsdComponent).getName();
-      if (xsdComponentName != null && xsdComponentName.length() > 0)
-      {
-        for (int i = 0; i < instanceDocuments.length; i++)
-        {
-          if (instanceDocuments[i] == null)
-            continue;
-          String xsiURI = FragmentConstants.URI_XSI;
-          String xsiPrefix = getPrefixFromNamespaceURI(xsiURI, namespaceTable);
-          String xsiTypeURI = xsdComponent.getSchema().getTargetNamespace();
-          String xsiTypePrefix = getPrefixFromNamespaceURI(xsiTypeURI, namespaceTable);
-          ;
-          StringBuffer attrName = new StringBuffer();
-          attrName.append(xsiPrefix);
-          attrName.append(FragmentConstants.COLON);
-          attrName.append(FragmentConstants.XSI_TYPE);
-          StringBuffer attrValue = new StringBuffer();
-          attrValue.append(xsiTypePrefix);
-          attrValue.append(FragmentConstants.COLON);
-          attrValue.append(xsdComponentName);
-          instanceDocuments[i].setAttribute(attrName.toString(), attrValue.toString());
-        }
-      }
-    }
-    return instanceDocuments;
-  }
-
-  public boolean validateAllParameterValues()
-  {
-    if (!super.validateAllParameterValues())
-      return false;
-    String[] params = getParameterValues(getID());
-    int length = (params != null) ? params.length : 0;
-    int min = config_.getMinOccurs();
-    int max = config_.getMaxOccurs();
-    return (length >= min && (max == FragmentConstants.UNBOUNDED || length <= max));
-  }
-
-  protected String getPrefixFromNamespaceURI(String nsURI, Hashtable namespaceTable)
-  {
-    String prefix = (String)namespaceTable.get(nsURI);
-    int i = 0;
-    while (prefix == null || prefix.length() <= 0)
-    {
-      StringBuffer prefixCopy = new StringBuffer();
-      prefixCopy.append(FragmentConstants.QNAME_PREFIX);
-      prefixCopy.append(String.valueOf(i));
-      i++;
-      if (!namespaceTable.contains(prefixCopy.toString()))
-      {
-        namespaceTable.put(nsURI, prefixCopy.toString());
-        prefix = prefixCopy.toString();
-      }
-    }
-    return prefix;
-  }
-
-  protected Element setElementTagName(Element e, String tagName)
-  {
-    if (!e.getTagName().equals(tagName))
-    {
-      try
-      {
-        Document doc = e.getOwnerDocument();
-        NodeList children = e.getChildNodes();
-        NamedNodeMap attributes = e.getAttributes();
-        Element eCopy = doc.createElement(tagName);
-        for (int i = 0; i < children.getLength(); i++)
-        {
-          Node child = children.item(i);
-          if (child != null)
-          {
-            eCopy.appendChild(child);
-            // When you append a node from one element to another,
-            // the original element will lose its reference to this node,
-            // therefore, the size of the node list will decrease by 1.
-            i--;
-          }
-        }
-        for (int j = 0; j < attributes.getLength(); j++)
-        {
-          Node attr = attributes.item(j);
-          if (attr != null && (attr instanceof Attr))
-          {
-            Attr attribute = (Attr)attr;
-            eCopy.setAttribute(attribute.getName(), attribute.getValue());
-          }
-        }
-        return eCopy;
-      }
-      catch (Exception exception)
-      {
-      }
-    }
-    return e;
-  }
-
-  protected Element[] setElementsTagName(Element[] e, String tagName)
-  {
-    Element[] eCopy = new Element[e.length];
-    for (int i = 0; i < eCopy.length; i++)
-    {
-      eCopy[i] = setElementTagName(e[i], tagName);
-    }
-    return eCopy;
-  }
-
-  protected boolean internalEquals(Element[] instanceDocumentsCopy, Element[] instanceDocuments)
-  {
-    if (!config_.getIsWSDLPart())
-    {
-      int length = (instanceDocuments != null) ? instanceDocuments.length : 0;
-      int lengthCopy = (instanceDocumentsCopy != null) ? instanceDocumentsCopy.length : 0;
-      return (length == lengthCopy);
-    }
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupAllFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupAllFragment.java
deleted file mode 100644
index 6ed6df191..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupAllFragment.java
+++ /dev/null
@@ -1,167 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDGroupAllFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.xsd.XSDModelGroup;
-import org.w3c.dom.Element;
-
-public class XSDGroupAllFragment extends XSDGroupFragment implements IXSDGroupAllFragment {
-  private String groupID_;
-
-  public XSDGroupAllFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller, XSDModelGroup xsdModelGroup) {
-    super(id, name, config, controller, xsdModelGroup);
-    groupID_ = null;
-  }
-
-  public boolean processParameterValues(MultipartFormDataParser parser) throws MultipartFormDataException {
-    String groupID = parser.getParameter(getID());
-    if (groupID_ != null && groupID != null && groupID_.equals(groupID)) {
-      setGroupMemberIDsOrdering(parser.getParameterValues(groupID_));
-      boolean valuesValid = true;
-      IXSDFragment[] groupMemberFragments = getGroupMemberFragments(groupID_);
-      for (int i = 0; i < groupMemberFragments.length; i++) {
-        if (groupMemberFragments[i] != null && !groupMemberFragments[i].processParameterValues(parser))
-          valuesValid = false;
-      }
-      return valuesValid;
-    }
-    else {
-      groupID_ = null;
-      removeGroupIDs();
-      return true;
-    }
-  }
-
-  public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments) {
-    removeGroupIDs();
-    boolean paramsValid = true;
-    if (instanceDocuments != null && instanceDocuments.length > 0) {
-      groupID_ = createInstance();
-      IXSDFragment[] groupMemberFrags = getGroupMemberFragments(groupID_);
-      String[] groupMemberIDsOrder = new String[groupMemberFrags.length];
-      int orderIndex = 0;
-      for (int i = 0; i < instanceDocuments.length; i++) {
-        boolean paramsAssigned = false;
-        for (int j = 0; j < groupMemberFrags.length; j++) {
-          if (groupMemberFrags[j] != null && groupMemberFrags[j].getName().equals(trimPrefix(instanceDocuments[i].getTagName()))) {
-            Element[] childInstance = {instanceDocuments[i]};
-            if (!groupMemberFrags[j].setParameterValuesFromInstanceDocuments(childInstance))
-              paramsValid = false;
-            groupMemberIDsOrder[orderIndex] = groupMemberFrags[j].getID();
-            orderIndex++;
-            paramsAssigned = true;
-            groupMemberFrags[j] = null;
-            break;
-          }
-        }
-        if (!paramsAssigned)
-          paramsValid = false;
-      }
-      for (int k = 0; k < groupMemberFrags.length; k++) {
-        if (groupMemberFrags[k] != null) {
-          groupMemberIDsOrder[orderIndex] = groupMemberFrags[k].getID();
-          orderIndex++;
-        }
-      }
-      setGroupMemberIDsOrdering(groupMemberIDsOrder);
-    }
-    return paramsValid;
-  }
-
-  public String getGroupAllInstance() {
-    if (groupID_ == null)
-      groupID_ = createGroupInstance();
-    return groupID_;
-  }
-
-  public String createInstance() {
-    return getGroupAllInstance();
-  }
-
-  public boolean setGroupMemberIDsOrdering(String[] groupMemberIDs) {
-    if (groupMemberIDs == null)
-      return false;
-    String[] existingGroupMemberIDs = getGroupMemberIDs(groupID_);
-    if (existingGroupMemberIDs.length != groupMemberIDs.length)
-      return false;
-    Vector existingGroupMemberIDsVector = new Vector();
-    for (int i = 0; i < existingGroupMemberIDs.length; i++) {
-      existingGroupMemberIDsVector.add(existingGroupMemberIDs[i]);
-    }
-    for (int j = 0; j < groupMemberIDs.length; j++) {
-      if (!existingGroupMemberIDsVector.remove(groupMemberIDs[j]))
-        return false;
-    }
-    if (setFragmentsOrder(groupMemberIDs)) {
-      setGroupMemberIDs(groupID_, groupMemberIDs);
-      return true;
-    }
-    else
-      return false;
-  }
-
-  public boolean moveUpGroupMemberID(String groupMemberID) {
-    String[] groupMemberIDs = getGroupMemberIDs(groupID_);
-    if (groupMemberID.equals(groupMemberIDs[0]))
-      return false;
-    for (int i = 1; i < groupMemberIDs.length; i++) {
-      if (groupMemberID.equals(groupMemberIDs[i])) {
-        groupMemberIDs[i] = groupMemberIDs[i - 1];
-        groupMemberIDs[i - 1] = groupMemberID;
-        if (setFragmentsOrder(groupMemberIDs)) {
-          setGroupMemberIDs(groupID_, groupMemberIDs);
-          return true;
-        }
-        else
-          return false;
-      }
-    }
-    return false;
-  }
-
-  public boolean moveDownGroupMemberID(String groupMemberID) {
-    String[] groupMemberIDs = getGroupMemberIDs(groupID_);
-    if (groupMemberID.equals(groupMemberIDs[groupMemberIDs.length - 1]))
-      return false;
-    for (int i = 0; i < groupMemberIDs.length - 1; i++) {
-      if (groupMemberID.equals(groupMemberIDs[i])) {
-        groupMemberIDs[i] = groupMemberIDs[i + 1];
-        groupMemberIDs[i + 1] = groupMemberID;
-        if (setFragmentsOrder(groupMemberIDs)) {
-          setGroupMemberIDs(groupID_, groupMemberIDs);
-          return true;
-        }
-        else
-          return false;
-      }
-    }
-    return false;
-  }
-
-  public String getInformationFragment() {
-    return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
-  }
-
-  public String getReadFragment() {
-    return "/wsdl/fragment/XSDGroupRFragmentJSP.jsp";
-  }
-
-  public String getWriteFragment() {
-    return "/wsdl/fragment/XSDGroupAllWFragmentJSP.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupChoiceFixFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupChoiceFixFragment.java
deleted file mode 100644
index 4f6d724cc..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupChoiceFixFragment.java
+++ /dev/null
@@ -1,33 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.xsd.XSDModelGroup;
-
-public class XSDGroupChoiceFixFragment extends XSDGroupChoiceFragment {
-  public XSDGroupChoiceFixFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller, XSDModelGroup xsdModelGroup) {
-    super(id, name, config, controller, xsdModelGroup);
-  }
-
-  public String getInformationFragment() {
-    return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
-  }
-
-  public String getReadFragment() {
-    return "/wsdl/fragment/XSDGroupChoiceRFragmentJSP.jsp";
-  }
-
-  public String getWriteFragment() {
-    return "/wsdl/fragment/XSDGroupChoiceFixWFragmentJSP.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupChoiceFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupChoiceFragment.java
deleted file mode 100644
index bd8edc753..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupChoiceFragment.java
+++ /dev/null
@@ -1,168 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDGroupChoiceFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDParticle;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public abstract class XSDGroupChoiceFragment extends XSDGroupFragment implements IXSDGroupChoiceFragment {
-  private XSDParticle[] choices_;
-  private Hashtable choiceIndexes_;
-
-  public XSDGroupChoiceFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller, XSDModelGroup xsdModelGroup) {
-    super(id, name, config, controller, xsdModelGroup);
-    choices_ = null;
-    choiceIndexes_ = new Hashtable();
-  }
-
-  public boolean processParameterValues(MultipartFormDataParser parser) throws MultipartFormDataException {
-    super.processParameterValues(parser);
-    String[] groupIDs = getGroupIDs();
-    choiceIndexes_.clear();
-    boolean paramsValid = true;
-    for (int i = 0; i < groupIDs.length; i++) {
-      String selectedChoiceFragID = parser.getParameter(groupIDs[i]);
-      int choiceIndex = 0;
-      IXSDFragment[] choiceFrags = getGroupMemberFragments(groupIDs[i]);
-      for (int j = 0; j < choiceFrags.length; j++) {
-        if (choiceFrags[j].getID().equals(selectedChoiceFragID)) {
-          choiceIndex = j;
-          paramsValid = (paramsValid && choiceFrags[j].validateAllParameterValues());
-          break;
-        }
-      }
-      setChoiceIndex(groupIDs[i], choiceIndex);
-    }
-    return paramsValid;
-  }
-
-  public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments) {
-    removeGroupIDs();
-    choiceIndexes_.clear();
-    boolean paramsValid = true;
-    if (instanceDocuments != null) {
-      for (int i = 0; i < instanceDocuments.length; i++) {
-        String groupID = createGroupChoiceInstance(0);
-        IXSDFragment[] choiceFrags = getGroupMemberFragments(groupID);
-        for (int j = 0; j < choiceFrags.length; j++) {
-          if (choiceFrags[j].getName().equals(trimPrefix(instanceDocuments[i].getTagName()))) {
-            XSDToFragmentConfiguration xsdConfig = choiceFrags[j].getXSDToFragmentConfiguration();
-            Element[] childInstances = getInstanceDocumentPartition(instanceDocuments, i, xsdConfig.getMinOccurs(), xsdConfig.getMaxOccurs());
-            if (!choiceFrags[j].setParameterValuesFromInstanceDocuments(childInstances))
-              paramsValid = false;
-            setChoiceIndex(groupID, j);
-            if (childInstances.length > 0)
-              i = i + childInstances.length - 1; // minus 1 because there's an i++ in the outer for loop
-            break;
-          }
-        }
-      }
-    }
-    return paramsValid;
-  }
-
-  private Element[] getInstanceDocumentPartition(Element[] instanceDocuments, int start, int minSize, int maxSize) {
-    String tagName = instanceDocuments[start].getTagName();
-    int size = 1;
-    for (int i = start + 1; i < instanceDocuments.length; i++) {
-      if (instanceDocuments[i].getTagName().equals(tagName))
-        size++;
-      else
-        break;
-    }
-    if (maxSize != FragmentConstants.UNBOUNDED && size > maxSize) {
-      size = size - minSize;
-      if (size > maxSize)
-        size = maxSize;
-    }
-    Element[] subset = new Element[size];
-    for (int j = 0; j < subset.length; j++) {
-      subset[j] = instanceDocuments[start + j];
-    }
-    return subset;
-  }
-
-  public Element[] genInstanceDocumentsFromParameterValues(boolean genXSIType, Hashtable namespaceTable, Document doc) {
-    Vector instanceDocumentsCopy = new Vector();
-    String[] groupIDs = getGroupIDs();
-    for (int i = 0; i < groupIDs.length; i++) {
-      IXSDFragment[] choiceFrags = getGroupMemberFragments(groupIDs[i]);
-      int choiceIndex = getChoiceIndex(groupIDs[i]);
-      Element[] choiceFragInstances = choiceFrags[choiceIndex].genInstanceDocumentsFromParameterValues(genXSIType, namespaceTable, doc);
-      for (int j = 0; j < choiceFragInstances.length; j++) {
-        instanceDocumentsCopy.add(choiceFragInstances[j]);
-      }
-    }
-    Element[] instanceDocuments = new Element[instanceDocumentsCopy.size()];
-    instanceDocumentsCopy.copyInto(instanceDocuments);
-    return instanceDocuments;
-  }
-
-  public XSDParticle[] getChoices() {
-    if (choices_ == null) {
-      EList particles = getXSDModelGroup().getParticles();
-      choices_ = new XSDParticle[particles.size()];
-      for (int i = 0; i < choices_.length; i++) {
-        choices_[i] = (XSDParticle)particles.get(i);
-      }
-    }
-    return choices_;
-  }
-
-  public String createGroupChoiceInstance(int choiceIndex) {
-    getChoices();
-    if (choiceIndex < 0 || choiceIndex > choices_.length - 1)
-      return null;
-    String groupID = createGroupInstance();
-    setChoiceIndex(groupID, choiceIndex);
-    return groupID;
-  }
-
-  public String createInstance() {
-    return createGroupChoiceInstance(0);
-  }
-
-  public int getChoiceIndex(String groupID) {
-    Integer index = (Integer)choiceIndexes_.get(groupID);
-    if (index != null)
-      return index.intValue();
-    else
-      return 0;
-  }
-
-  public void setChoiceIndex(String groupID, int choiceIndex) {
-    choiceIndexes_.put(groupID, new Integer(choiceIndex));
-  }
-
-  public boolean validateAllParameterValues()
-  {
-    String[] groupIDs = getGroupIDs();
-    for (int i = 0; i < groupIDs.length; i++)
-    {
-      int selectionIndex = getChoiceIndex(groupIDs[i]);
-      if (!getGroupMemberFragments(groupIDs[i])[selectionIndex].validateAllParameterValues())
-        return false;
-    }
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupChoiceRangeFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupChoiceRangeFragment.java
deleted file mode 100644
index ca3bffb4c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupChoiceRangeFragment.java
+++ /dev/null
@@ -1,33 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.xsd.XSDModelGroup;
-
-public class XSDGroupChoiceRangeFragment extends XSDGroupChoiceFragment {
-  public XSDGroupChoiceRangeFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller, XSDModelGroup xsdModelGroup) {
-    super(id, name, config, controller, xsdModelGroup);
-  }
-
-  public String getInformationFragment() {
-    return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
-  }
-
-  public String getReadFragment() {
-    return "/wsdl/fragment/XSDGroupChoiceRFragmentJSP.jsp";
-  }
-
-  public String getWriteFragment() {
-    return "/wsdl/fragment/XSDGroupChoiceRangeWFragmentJSP.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupFragment.java
deleted file mode 100644
index 682a2f363..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupFragment.java
+++ /dev/null
@@ -1,261 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDGroupFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.xsd.XSDComponent;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDParticleContent;
-import org.eclipse.xsd.XSDWildcard;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public abstract class XSDGroupFragment extends XSDMapFragment implements IXSDGroupFragment {
-  private XSDModelGroup xsdModelGroup_;
-  private Vector groupIDsOrder_;
-  private Hashtable groupIDs_;
-  
-  public XSDGroupFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller, XSDModelGroup xsdModelGroup) {
-    super(id, name, config, controller);
-    xsdModelGroup_ = xsdModelGroup;
-    groupIDsOrder_ = new Vector();
-    groupIDs_ = new Hashtable();
-  }
-
-  public boolean processParameterValues(MultipartFormDataParser parser) throws MultipartFormDataException {
-    boolean valuesValid = true;
-    String[] params = parser.getParameterValues(getID());
-    Vector frags = new Vector();
-    Vector groupIDsOrderCopy = new Vector();
-    Hashtable groupIDsCopy = new Hashtable();
-    for (int i = 0; params != null && i < params.length; i++) {
-      if (params[i] != null) {
-        groupIDsOrderCopy.add(params[i]);
-        groupIDsCopy.put(params[i], getGroupMemberIDs(params[i]));
-        IXSDFragment[] groupMemberFragments = getGroupMemberFragments(params[i]);
-        for (int j = 0; j < groupMemberFragments.length; j++) {
-          if (groupMemberFragments[j] != null) {
-            frags.add(groupMemberFragments[j]);
-            if (!groupMemberFragments[j].processParameterValues(parser))
-              valuesValid = false;
-          }
-        }
-      }
-    }
-    groupIDsOrder_ = groupIDsOrderCopy;
-    groupIDs_ = groupIDsCopy;
-    removeAllFragments();
-    addFragments(frags);
-    return valuesValid;
-  }
-
-  public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments) {
-    removeGroupIDs();
-    boolean paramsValid = true;
-    String prevGroupID = null;
-    String currGroupID = null;
-    int groupMemberIndex = 0;
-    for (int i = 0; i < instanceDocuments.length; ) {
-      if (currGroupID == null) {
-        String newGroupID = createInstance();
-        prevGroupID = currGroupID;
-        currGroupID = newGroupID;
-      }
-      Element[] instancePartition = null;
-      int j = groupMemberIndex;
-      boolean paramsAssigned = false;
-      int wildcardFragIndex = -1;
-      do {
-        IXSDFragment[] groupMemberFrags = getGroupMemberFragments(currGroupID);
-        XSDComponent xsdComponent = groupMemberFrags[j].getXSDToFragmentConfiguration().getXSDComponent();
-        if (xsdComponent instanceof XSDWildcard) {
-          if (wildcardFragIndex < 0)
-            wildcardFragIndex = j;
-        }
-        else if (groupMemberFrags[j].getName().equals(trimPrefix(instanceDocuments[i].getTagName()))) {
-          instancePartition = getInstanceDocumentPartition(instanceDocuments, i, groupMemberFrags[j].getXSDToFragmentConfiguration().getMaxOccurs());
-          if (!groupMemberFrags[j].setParameterValuesFromInstanceDocuments(instancePartition))
-            paramsValid = false;
-          paramsAssigned = true;
-        }
-        if (j == groupMemberFrags.length - 1) {
-          j = 0;
-          String newGroupID;
-          if (!paramsAssigned)
-            newGroupID = createInstance();
-          else
-            newGroupID = null;
-          prevGroupID = currGroupID;
-          currGroupID = newGroupID;
-        }
-        else
-          j++;
-      } while (!paramsAssigned && j != groupMemberIndex);
-      groupMemberIndex = j;
-      if (!paramsAssigned) {
-        instancePartition = getInstanceDocumentPartition(instanceDocuments, i, FragmentConstants.UNBOUNDED);
-        if (wildcardFragIndex >= 0) {
-          if (wildcardFragIndex >= groupMemberIndex) {
-            removeGroupID(currGroupID);
-            currGroupID = prevGroupID;
-          }
-          groupMemberIndex = wildcardFragIndex;
-          IXSDFragment[] groupMemberFrags = getGroupMemberFragments(currGroupID);
-          if (!groupMemberFrags[wildcardFragIndex].setParameterValuesFromInstanceDocuments(instancePartition))
-            paramsValid = false;
-          paramsAssigned = true;
-        }
-        else if (currGroupID != null && (prevGroupID == null || !currGroupID.equals(prevGroupID))) {
-          paramsValid = false;
-          removeGroupID(currGroupID);
-          currGroupID = prevGroupID;
-        }
-      }
-      i = i + instancePartition.length;
-    }
-    return paramsValid;
-  }
-
-  private Element[] getInstanceDocumentPartition(Element[] instanceDocuments, int start, int maxSize) {
-    String tagName = instanceDocuments[start].getTagName();
-    int size = 1;
-    for (int i = start + 1; i < instanceDocuments.length; i++) {
-      if (maxSize != FragmentConstants.UNBOUNDED && size >= maxSize)
-        break;
-      else if (instanceDocuments[i].getTagName().equals(tagName))
-        size++;
-      else
-        break;
-    }
-    Element[] subset = new Element[size];
-    for (int j = 0; j < subset.length; j++) {
-      subset[j] = instanceDocuments[start + j];
-    }
-    return subset;
-  }
-
-  public Element[] genInstanceDocumentsFromParameterValues(boolean genXSIType, Hashtable namespaceTable, Document doc) {
-    IXSDFragment[] groupMemberFragments = getAllFragments();
-    Vector instanceDocumentsCopy = new Vector();
-    for (int i = 0; i < groupMemberFragments.length; i++) {
-      Element[] fragmentInstances = groupMemberFragments[i].genInstanceDocumentsFromParameterValues(genXSIType, namespaceTable, doc);
-      for (int j = 0; j < fragmentInstances.length; j++) {
-        instanceDocumentsCopy.add(fragmentInstances[j]);
-      }
-    }
-    Element[] instanceDocuments = new Element[instanceDocumentsCopy.size()];
-    for (int k = 0; k < instanceDocuments.length; k++) {
-      instanceDocuments[k] = (Element)instanceDocumentsCopy.get(k);
-    }
-    return instanceDocuments;
-  }
-
-  public void setXSDModelGroup(XSDModelGroup xsdModelGroup) {
-    xsdModelGroup_ = xsdModelGroup;
-  }
-
-  public XSDModelGroup getXSDModelGroup() {
-    return xsdModelGroup_;
-  }
-
-  public String[] getGroupIDs() {
-    String[] groupIDs = new String[groupIDsOrder_.size()];
-    for (int i = 0; i < groupIDs.length; i++) {
-      groupIDs[i] = (String)groupIDsOrder_.get(i);
-    }
-    return groupIDs;
-  }
-
-  protected void removeGroupIDs() {
-    removeAllFragments();
-    groupIDsOrder_.clear();
-    groupIDs_.clear();
-  }
-
-  protected void removeGroupID(String groupID) {
-    String[] memberFragIDs = getGroupMemberIDs(groupID);
-    removeFragments(memberFragIDs);
-    groupIDsOrder_.remove(groupID);
-    groupIDs_.remove(groupID);
-  }
-
-  protected void setGroupMemberIDs(String groupID, String[] groupMemberIDs) {
-    if (groupID != null) {
-      if (!groupIDsOrder_.contains(groupID))
-        groupIDsOrder_.add(groupID);
-      if (groupMemberIDs != null)
-        groupIDs_.put(groupID, groupMemberIDs);
-      else
-        groupIDs_.put(groupID, new String[0]);
-    }
-  }
-
-  protected void setGroupMemberFragments(String groupID, IXSDFragment[] groupMemberFragments) {
-    addFragments(groupMemberFragments);
-    String[] ids = new String[groupMemberFragments.length];
-    for (int i = 0; i < ids.length; i++) {
-      ids[i] = groupMemberFragments[i].getID();
-    }
-    setGroupMemberIDs(groupID, ids);
-  }
-
-  public String[] getGroupMemberIDs(String groupID) {
-    if (groupID != null) {
-      String[] groupMemberIDs = (String[])groupIDs_.get(groupID);
-      if (groupMemberIDs != null)
-        return groupMemberIDs;
-    }
-    return new String[0];
-  }
-
-  public IXSDFragment[] getGroupMemberFragments(String groupID) {
-    String[] groupMemberIDs = getGroupMemberIDs(groupID);
-    IXSDFragment[] groupMemberFragments = new IXSDFragment[groupMemberIDs.length];
-    for (int i = 0; i < groupMemberFragments.length; i++) {
-      groupMemberFragments[i] = getFragment(groupMemberIDs[i]);
-    }
-    return groupMemberFragments;
-  }
-
-  protected String createGroupInstance() {
-    String groupID = genID();
-    EList particles = getXSDModelGroup().getParticles();
-    String[] groupMemberIDs = new String[particles.size()];
-    for (int i = 0; i < particles.size(); i++) {
-      XSDParticle xsdParticle = (XSDParticle)particles.get(i);
-      XSDParticleContent xsdParticleContent = xsdParticle.getContent();
-      XSDToFragmentConfiguration thisConfig = getXSDToFragmentConfiguration();
-      XSDToFragmentConfiguration xsdConfig = new XSDToFragmentConfiguration();
-      if (xsdParticleContent instanceof XSDComponent)
-        xsdConfig.setXSDComponent((XSDComponent)xsdParticleContent);
-      else
-        xsdConfig.setXSDComponent(null);
-      xsdConfig.setStyle(thisConfig.getStyle());
-      xsdConfig.setPartEncoding(thisConfig.getPartEncoding());
-      xsdConfig.setWSDLPartName(thisConfig.getWSDLPartName());
-      groupMemberIDs[i] = genID();
-      addFragment(groupMemberIDs[i], getXSDToFragmentController().getFragment(xsdConfig, groupMemberIDs[i], groupMemberIDs[i]));
-    }
-    setGroupMemberIDs(groupID, groupMemberIDs);
-    return groupID;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupSeqFixFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupSeqFixFragment.java
deleted file mode 100644
index 31a1a372c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupSeqFixFragment.java
+++ /dev/null
@@ -1,33 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.xsd.XSDModelGroup;
-
-public class XSDGroupSeqFixFragment extends XSDGroupSeqFragment {
-  public XSDGroupSeqFixFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller, XSDModelGroup xsdModelGroup) {
-    super(id, name, config, controller, xsdModelGroup);
-  }
-
-  public String getInformationFragment() {
-    return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
-  }
-
-  public String getReadFragment() {
-    return "/wsdl/fragment/XSDGroupRFragmentJSP.jsp";
-  }
-
-  public String getWriteFragment() {
-    return "/wsdl/fragment/XSDGroupSeqFixWFragmentJSP.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupSeqFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupSeqFragment.java
deleted file mode 100644
index e30813040..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupSeqFragment.java
+++ /dev/null
@@ -1,30 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDGroupSeqFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.xsd.XSDModelGroup;
-
-public abstract class XSDGroupSeqFragment extends XSDGroupFragment implements IXSDGroupSeqFragment {
-  public XSDGroupSeqFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller, XSDModelGroup xsdModelGroup) {
-    super(id, name, config, controller, xsdModelGroup);
-  }
-
-  public String createGroupSeqInstance() {
-    return createGroupInstance();
-  }
-
-  public String createInstance() {
-    return createGroupSeqInstance();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupSeqRangeFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupSeqRangeFragment.java
deleted file mode 100644
index afb6a59fb..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupSeqRangeFragment.java
+++ /dev/null
@@ -1,33 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.xsd.XSDModelGroup;
-
-public class XSDGroupSeqRangeFragment extends XSDGroupSeqFragment {
-  public XSDGroupSeqRangeFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller, XSDModelGroup xsdModelGroup) {
-    super(id, name, config, controller, xsdModelGroup);
-  }
-
-  public String getInformationFragment() {
-    return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
-  }
-
-  public String getReadFragment() {
-    return "/wsdl/fragment/XSDGroupRFragmentJSP.jsp";
-  }
-
-  public String getWriteFragment() {
-    return "/wsdl/fragment/XSDGroupSeqRangeWFragmentJSP.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDMapFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDMapFragment.java
deleted file mode 100644
index 1c5404f49..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDMapFragment.java
+++ /dev/null
@@ -1,229 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDMapFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-
-public abstract class XSDMapFragment extends XSDFragment implements IXSDMapFragment {
-  private XSDToFragmentController controller_;
-  private Vector fragmentsOrder_;
-  private Hashtable fragments_;
-
-  public XSDMapFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller) {
-    super(id, name, config);
-    controller_ = controller;
-    fragmentsOrder_ = new Vector();
-    fragments_ = new Hashtable();
-  }
-
-  public boolean processParameterValues(MultipartFormDataParser parser) throws MultipartFormDataException {
-    boolean valuesValid = true;
-    String[] params = parser.getParameterValues(getID());
-    Vector frags = new Vector();
-    if (params != null) {
-      for (int i = 0; i < params.length; i++) {
-        if (params[i] != null) {
-          IXSDFragment frag = getFragment(params[i]);
-          if (frag != null) {
-            frags.add(frag);
-            if (!frag.processParameterValues(parser))
-              valuesValid = false;
-          }
-        }
-      }
-    }
-    removeAllFragments();
-    addFragments(frags);
-    return valuesValid;
-  }
-
-  public void setParameterValues(String paramKey, String[] params) {
-    IXSDFragment frag = getFragment(paramKey);
-    if (frag != null)
-      frag.setParameterValues(paramKey, params);
-  }
-
-  public String[] getParameterValues(String paramKey) {
-    IXSDFragment frag = getFragment(paramKey);
-    return (frag != null) ? frag.getParameterValues(paramKey) : null;
-  }
-
-  public boolean validateAllParameterValues() {
-    IXSDFragment[] fragments = getAllFragments();
-    for (int i = 0; i < fragments.length; i++) {
-      if (!fragments[i].validateAllParameterValues())
-        return false;
-    }
-    return true;
-  }
-
-  public boolean validateParameterValues(String paramKey) {
-    IXSDFragment frag = getFragment(paramKey);
-    return (frag != null) ? frag.validateParameterValues(paramKey) : true;
-  }
-
-  public boolean validateParameterValue(String paramKey, int paramIndex) {
-    IXSDFragment frag = getFragment(paramKey);
-    return (frag != null) ? frag.validateParameterValue(paramKey, paramIndex) : true;
-  }
-
-  public void setXSDToFragmentController(XSDToFragmentController controller) {
-    controller_ = controller;
-  }
-
-  public XSDToFragmentController getXSDToFragmentController() {
-    return controller_;
-  }
-
-  protected void addFragment(String id, IXSDFragment frag) {
-    addFragment(id, frag, true);
-  }
-
-  protected void addFragments(String[] id, IXSDFragment[] frags) {
-    addFragments(id, frags, true);
-  }
-
-  protected void addFragment(IXSDFragment frag) {
-    addFragment(frag, true);
-  }
-
-  protected void addFragments(IXSDFragment[] frags) {
-    addFragments(frags, true);
-  }
-
-  protected void addFragments(Vector frags) {
-    addFragments(frags, true);
-  }
-
-  protected void addFragment(String id, IXSDFragment frag, boolean addToController) {
-    fragmentsOrder_.add(id);
-    fragments_.put(id, frag);
-    controller_.addToCache(id, frag);
-  }
-
-  protected void addFragments(String[] id, IXSDFragment[] frags, boolean addToController) {
-    for (int i = 0; i < id.length && i < frags.length; i++) {
-      addFragment(id[i], frags[i], addToController);
-    }
-  }
-
-  protected void addFragment(IXSDFragment frag, boolean addToController) {
-    addFragment(frag.getID(), frag, addToController);
-  }
-
-  protected void addFragments(IXSDFragment[] frags, boolean addToController) {
-    for (int i = 0; i < frags.length; i++) {
-      addFragment(frags[i].getID(), frags[i], addToController);
-    }
-  }
-
-  protected void addFragments(Vector frags, boolean addToController) {
-    Iterator it = frags.iterator();
-    while (it.hasNext()) {
-      Object obj = it.next();
-      if (obj instanceof IXSDFragment) {
-        IXSDFragment frag = (IXSDFragment)obj;
-        addFragment(frag.getID(), frag, addToController);
-      }
-    }
-  }
-
-  public String[] getFragmentsOrder() {
-    String[] fragmentsOrder = new String[fragmentsOrder_.size()];
-    for (int i = 0; i < fragmentsOrder.length; i++) {
-      fragmentsOrder[i] = (String)fragmentsOrder_.get(i);
-    }
-    return fragmentsOrder;
-  }
-
-  protected boolean setFragmentsOrder(String[] fragmentsOrder) {
-    if (fragmentsOrder.length != fragmentsOrder_.size())
-      return false;
-    Vector fragmentsOrderCopy = new Vector(fragmentsOrder_);
-    for (int i = 0; i < fragmentsOrder.length; i++) {
-      if (!fragmentsOrderCopy.remove(fragmentsOrder[i]))
-        return false;
-    }
-    fragmentsOrder_.clear();
-    for (int j = 0; j < fragmentsOrder.length; j++) {
-      fragmentsOrder_.add(fragmentsOrder[j]);
-    }
-    return true;
-  }
-
-  public IXSDFragment getFragment(String id) {
-    return (IXSDFragment)fragments_.get(id);
-  }
-
-  public IXSDFragment[] getFragments(String[] ids) {
-    IXSDFragment[] frags = new IXSDFragment[ids.length];
-    for (int i = 0; i < frags.length; i++) {
-      frags[i] = getFragment(ids[i]);
-    }
-    return frags;
-  }
-
-  public IXSDFragment[] getAllFragments() {
-    IXSDFragment[] fragments = new IXSDFragment[fragmentsOrder_.size()];
-    for (int i = 0; i < fragmentsOrder_.size(); i++) {
-      fragments[i] = getFragment((String)fragmentsOrder_.get(i));
-    }
-    return fragments;
-  }
-
-  protected void removeFragment(String id) {
-    removeFragment(id, true);
-  }
-
-  protected void removeFragments(String[] ids) {
-    removeFragments(ids, true);
-  }
-
-  protected void removeAllFragments() {
-    removeAllFragments(true);
-  }
-
-  protected void removeFragment(String id, boolean removeFromController) {
-    fragmentsOrder_.remove(id);
-    fragments_.remove(id);
-    if (removeFromController)
-      controller_.removeFromCache(id);
-  }
-
-  protected void removeFragments(String[] ids, boolean removeFromController) {
-    for (int i = 0; i < ids.length; i++) {
-      removeFragment(ids[i], removeFromController);
-    }
-  }
-
-  protected void removeAllFragments(boolean removeFromController) {
-    if (removeFromController)
-    {
-      Enumeration ids = fragments_.keys();
-      while (ids.hasMoreElements())
-      {
-        String id = (String)ids.nextElement();
-        controller_.removeFromCache(id);
-      }
-    }
-    fragmentsOrder_.clear();
-    fragments_.clear();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicDateTimeFixFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicDateTimeFixFragment.java
deleted file mode 100644
index 3be533708..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicDateTimeFixFragment.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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-
-public class XSDSimpleAtomicDateTimeFixFragment extends XSDSimpleAtomicFixFragment {
-  private int calendarType_;
-  public XSDSimpleAtomicDateTimeFixFragment(String id, String name, XSDToFragmentConfiguration config, int calendarType) {
-    super(id, name, config);
-    calendarType_ = calendarType;
-  }
-  
-  public String getWriteFragment() {
-    StringBuffer fragmentLink = new StringBuffer("/wsdl/fragment/XSDSimpleAtomicDateTimeFixWFragmentJSP.jsp?");
-    fragmentLink.append(ActionInputs.CALENDAR_TYPE).append('=').append(calendarType_);
-    return fragmentLink.toString();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicDateTimeRangeFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicDateTimeRangeFragment.java
deleted file mode 100644
index 6fb2f2cc4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicDateTimeRangeFragment.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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-
-public class XSDSimpleAtomicDateTimeRangeFragment extends XSDSimpleAtomicRangeFragment {
-  private int calendarType_;
-  public XSDSimpleAtomicDateTimeRangeFragment(String id, String name, XSDToFragmentConfiguration config, int calendarType) {
-    super(id, name, config);
-    calendarType_ = calendarType;
-  }
-
-  public String getWriteFragment() {
-    StringBuffer fragmentLink = new StringBuffer("/wsdl/fragment/XSDSimpleAtomicDateTimeRangeWFragmentJSP.jsp?");
-    fragmentLink.append(ActionInputs.CALENDAR_TYPE).append('=').append(calendarType_);
-    return fragmentLink.toString();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumFixFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumFixFragment.java
deleted file mode 100644
index 796bd862a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumFixFragment.java
+++ /dev/null
@@ -1,38 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.OptionVector;
-
-public class XSDSimpleAtomicEnumFixFragment extends XSDSimpleAtomicEnumFragment {
-  public XSDSimpleAtomicEnumFixFragment(String id, String name, XSDToFragmentConfiguration config, EList elist) {
-    super(id, name, config, elist);
-  }
-  
-  public XSDSimpleAtomicEnumFixFragment(String id, String name, XSDToFragmentConfiguration config, OptionVector v)
-  {
-    super(id, name, config, v);
-  }
-
-  public String getInformationFragment() {
-    return "/wsdl/fragment/XSDSimpleAtomicInfoFragmentJSP.jsp";
-  }
-
-  public String getReadFragment() {
-    return "/wsdl/fragment/XSDSimpleAtomicRFragmentJSP.jsp";
-  }
-
-  public String getWriteFragment() {
-    return "/wsdl/fragment/XSDSimpleAtomicEnumFixWFragmentJSP.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumFragment.java
deleted file mode 100644
index 96387f551..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumFragment.java
+++ /dev/null
@@ -1,42 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.OptionVector;
-import org.eclipse.xsd.XSDEnumerationFacet;
-
-public abstract class XSDSimpleAtomicEnumFragment extends XSDSimpleAtomicFragment {
-  private OptionVector optionVector_;
-  public XSDSimpleAtomicEnumFragment(String id, String name, XSDToFragmentConfiguration config, EList elist) {
-    super(id, name, config);
-    optionVector_ = new OptionVector();
-    for (int i=0;i<elist.size();i++)
-    {
-      String enumValue = ((XSDEnumerationFacet)elist.get(i)).getLexicalValue();
-      optionVector_.addOption(enumValue,enumValue);
-    }
-  }
-  
-  public XSDSimpleAtomicEnumFragment(String id, String name, XSDToFragmentConfiguration config, OptionVector v)
-  {
-    super(id, name, config);
-    optionVector_ = new OptionVector();
-    for (int i=0;i<v.size();i++)
-      optionVector_.addOption(v.getDisplayValue(i),v.getValue(i));
-  }
-  
-  public final OptionVector getOptionVector()
-  {
-    return optionVector_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumRangeFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumRangeFragment.java
deleted file mode 100644
index 4ed3c814b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumRangeFragment.java
+++ /dev/null
@@ -1,38 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.OptionVector;
-
-public class XSDSimpleAtomicEnumRangeFragment extends XSDSimpleAtomicEnumFragment {
-  public XSDSimpleAtomicEnumRangeFragment(String id, String name, XSDToFragmentConfiguration config, EList elist) {
-    super(id, name, config, elist);
-  }
-  
-  public XSDSimpleAtomicEnumRangeFragment(String id, String name, XSDToFragmentConfiguration config, OptionVector v)
-  {
-    super(id, name, config, v);
-  }
-
-  public String getInformationFragment() {
-    return "/wsdl/fragment/XSDSimpleAtomicInfoFragmentJSP.jsp";
-  }
-
-  public String getReadFragment() {
-    return "/wsdl/fragment/XSDSimpleAtomicRFragmentJSP.jsp";
-  }
-
-  public String getWriteFragment() {
-    return "/wsdl/fragment/XSDSimpleAtomicEnumRangeWFragmentJSP.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicFixFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicFixFragment.java
deleted file mode 100644
index 5c8dddfcf..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicFixFragment.java
+++ /dev/null
@@ -1,31 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-
-public class XSDSimpleAtomicFixFragment extends XSDSimpleAtomicFragment {
-  public XSDSimpleAtomicFixFragment(String id, String name, XSDToFragmentConfiguration config) {
-    super(id, name, config);
-  }
-
-  public String getInformationFragment() {
-    return "/wsdl/fragment/XSDSimpleAtomicInfoFragmentJSP.jsp";
-  }
-
-  public String getReadFragment() {
-    return "/wsdl/fragment/XSDSimpleAtomicRFragmentJSP.jsp";
-  }
-
-  public String getWriteFragment() {
-    return "/wsdl/fragment/XSDSimpleAtomicFixWFragmentJSP.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicFragment.java
deleted file mode 100644
index 132f6f6db..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicFragment.java
+++ /dev/null
@@ -1,29 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDSimpleAtomicFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-
-public abstract class XSDSimpleAtomicFragment extends XSDFragment implements IXSDSimpleAtomicFragment {
-  public XSDSimpleAtomicFragment(String id, String name, XSDToFragmentConfiguration config) {
-    super(id, name, config);
-  }
-
-  public boolean validateParameterValue(String paramKey, int paramIndex) {
-    String param = getParameterValue(paramKey, paramIndex);
-    if (param != null && !((XSDSimpleTypeDefinition)getXSDTypeDefinition()).isValidLiteral(param))
-      return false;
-    else
-      return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicRangeFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicRangeFragment.java
deleted file mode 100644
index e3bbd7600..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicRangeFragment.java
+++ /dev/null
@@ -1,31 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-
-public class XSDSimpleAtomicRangeFragment extends XSDSimpleAtomicFragment {
-  public XSDSimpleAtomicRangeFragment(String id, String name, XSDToFragmentConfiguration config) {
-    super(id, name, config);
-  }
-
-  public String getInformationFragment() {
-    return "/wsdl/fragment/XSDSimpleAtomicInfoFragmentJSP.jsp";
-  }
-
-  public String getReadFragment() {
-    return "/wsdl/fragment/XSDSimpleAtomicRFragmentJSP.jsp";
-  }
-
-  public String getWriteFragment() {
-    return "/wsdl/fragment/XSDSimpleAtomicRangeWFragmentJSP.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleListFixFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleListFixFragment.java
deleted file mode 100644
index e265bac5b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleListFixFragment.java
+++ /dev/null
@@ -1,33 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-
-public class XSDSimpleListFixFragment extends XSDSimpleListFragment {
-  public XSDSimpleListFixFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller) {
-    super(id, name, config, controller);
-  }
-
-  public String getInformationFragment() {
-    return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
-  }
-
-  public String getReadFragment() {
-    return "/wsdl/fragment/XSDSimpleListRFragmentJSP.jsp";
-  }
-
-  public String getWriteFragment() {
-    return "/wsdl/fragment/XSDSimpleListFixWFragmentJSP.jsp";
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleListFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleListFragment.java
deleted file mode 100644
index 764f84255..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleListFragment.java
+++ /dev/null
@@ -1,149 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import java.util.Hashtable;
-import java.util.StringTokenizer;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDSimpleListFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.xsd.XSDLengthFacet;
-import org.eclipse.xsd.XSDMaxLengthFacet;
-import org.eclipse.xsd.XSDMinLengthFacet;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public abstract class XSDSimpleListFragment extends XSDMapFragment implements IXSDSimpleListFragment
-{
-  public XSDSimpleListFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller)
-  {
-    super(id, name, config, controller);
-  }
-
-  public void setName(String name)
-  {
-    super.setName(name);
-    IXSDFragment[] fragments = getAllFragments();
-    for (int i = 0; i < fragments.length; i++)
-    {
-      fragments[i].setName(name);
-    }
-  }
-
-  public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments)
-  {
-    Element[] instanceDocumentsCopy = getInstanceDocumentsByTagName(instanceDocuments, getName());
-    String[] params = new String[instanceDocumentsCopy.length];
-    boolean paramsValid = internalEquals(instanceDocumentsCopy, instanceDocuments);
-    for (int i = 0; i < instanceDocumentsCopy.length; i++)
-    {
-      params[i] = "";
-      NodeList nodeList = instanceDocumentsCopy[i].getChildNodes();
-      if (nodeList.getLength() > 0)
-      {
-        Node node = nodeList.item(0);
-        if (nodeList.getLength() > 1)
-          paramsValid = false;
-        if (node.getNodeType() != Node.TEXT_NODE)
-          paramsValid = false;
-        else
-          params[i] = node.getNodeValue();
-      }
-      else
-        paramsValid = false;
-    }
-    removeAllFragments();
-    for (int i = 0; i < params.length; i++)
-    {
-      IXSDFragment childFrag = getFragment(createListInstance());
-      StringTokenizer st = new StringTokenizer(params[i].trim());
-      String[] childParams = new String[st.countTokens()];
-      for (int j = 0; j < childParams.length; j++)
-      {
-        childParams[j] = st.nextToken();
-      }
-      childFrag.setParameterValues(childFrag.getID(), childParams);
-      paramsValid = paramsValid && childFrag.validateAllParameterValues();
-    }
-    return paramsValid;
-  }
-
-  public Element[] genInstanceDocumentsFromParameterValues(boolean genXSIType, Hashtable namespaceTable, Document doc)
-  {
-    IXSDFragment[] fragments = getAllFragments();
-    Element[] instanceDocuments = new Element[fragments.length];
-    String tagName = getInstanceDocumentTagName(namespaceTable);
-    for (int i = 0; i < fragments.length; i++)
-    {
-      Element instanceDocument = doc.createElement(tagName);
-      StringBuffer listValue = new StringBuffer();
-      String[] params = fragments[i].getParameterValues(fragments[i].getID());
-      for (int j = 0; params != null && j < params.length; j++)
-      {
-        if (j != 0)
-          listValue.append(FragmentConstants.LIST_SEPERATOR);
-        listValue.append(params[j]);
-      }
-      Node textNode = doc.createTextNode(listValue.toString());
-      instanceDocument.appendChild(textNode);
-      instanceDocuments[i] = instanceDocument;
-    }
-    return (genXSIType ? addXSIType(instanceDocuments, namespaceTable) : instanceDocuments);
-  }
-
-  public String createListInstance()
-  {
-    String newID = genID();
-    XSDSimpleTypeDefinition simpleType = (XSDSimpleTypeDefinition)getXSDTypeDefinition();
-    int min = 0;
-    int max = FragmentConstants.UNBOUNDED;
-    XSDLengthFacet xsdLengthFacet = simpleType.getLengthFacet();
-    // port to org.eclipse.xsd
-    if (xsdLengthFacet != null)
-    {
-      min = xsdLengthFacet.getValue();
-      max = xsdLengthFacet.getValue();
-    }
-    else
-    {
-      XSDMinLengthFacet xsdMinLengthFacet = simpleType.getMinLengthFacet();
-      XSDMaxLengthFacet xsdMaxLengthFacet = simpleType.getMaxLengthFacet();
-      // port to org.eclipse.xsd
-      if (xsdMinLengthFacet != null)
-        min = xsdMinLengthFacet.getValue();
-      if (xsdMaxLengthFacet != null)
-        max = xsdMaxLengthFacet.getValue();
-    }
-    XSDToFragmentConfiguration thisConfig = getXSDToFragmentConfiguration();
-    XSDToFragmentConfiguration xsdConfig = new XSDToFragmentConfiguration();
-    xsdConfig.setXSDComponent(simpleType.getItemTypeDefinition());
-    xsdConfig.setStyle(thisConfig.getStyle());
-    xsdConfig.setPartEncoding(thisConfig.getPartEncoding());
-    xsdConfig.setWSDLPartName(thisConfig.getWSDLPartName());
-    xsdConfig.setMinOccurs(min);
-    xsdConfig.setMaxOccurs(max);
-    IXSDFragment frag = getXSDToFragmentController().getFragment(xsdConfig, newID, getName());
-    frag.setID(newID);
-    frag.setName(getName());
-    addFragment(newID, frag);
-    return newID;
-  }
-
-  public String createInstance()
-  {
-    return createListInstance();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleListRangeFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleListRangeFragment.java
deleted file mode 100644
index aeb95054f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleListRangeFragment.java
+++ /dev/null
@@ -1,33 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-
-public class XSDSimpleListRangeFragment extends XSDSimpleListFragment {
-  public XSDSimpleListRangeFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller) {
-    super(id, name, config, controller);
-  }
-
-  public String getInformationFragment() {
-    return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
-  }
-
-  public String getReadFragment() {
-    return "/wsdl/fragment/XSDSimpleListRFragmentJSP.jsp";
-  }
-
-  public String getWriteFragment() {
-    return "/wsdl/fragment/XSDSimpleListRangeWFragmentJSP.jsp";
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleUnionFixFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleUnionFixFragment.java
deleted file mode 100644
index b6c2242f8..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleUnionFixFragment.java
+++ /dev/null
@@ -1,32 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-
-public class XSDSimpleUnionFixFragment extends XSDSimpleUnionFragment {
-  public XSDSimpleUnionFixFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller) {
-    super(id, name, config, controller);
-  }
-
-  public String getInformationFragment() {
-    return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
-  }
-
-  public String getReadFragment() {
-    return "/wsdl/fragment/XSDSimpleUnionRFragmentJSP.jsp";
-  }
-
-  public String getWriteFragment() {
-    return "/wsdl/fragment/XSDSimpleUnionFixWFragmentJSP.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleUnionFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleUnionFragment.java
deleted file mode 100644
index 1a20e373e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleUnionFragment.java
+++ /dev/null
@@ -1,119 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDSimpleUnionFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public abstract class XSDSimpleUnionFragment extends XSDMapFragment implements IXSDSimpleUnionFragment {
-  private XSDSimpleTypeDefinition[] memberTypes_;
-
-  public XSDSimpleUnionFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller) {
-    super(id, name, config, controller);
-    memberTypes_ = null;
-  }
-
-  public void setName(String name) {
-    super.setName(name);
-    IXSDFragment[] fragments = getAllFragments();
-    for (int i = 0; i < fragments.length; i++) {
-      fragments[i].setName(name);
-    }
-  }
-
-  public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments) {
-    Element[] instanceDocumentsCopy = getInstanceDocumentsByTagName(instanceDocuments, getName());
-    int numTypes = getMemberTypeDefinitions().length;
-    boolean paramsValid = internalEquals(instanceDocumentsCopy, instanceDocuments);
-    Vector memberFragments = new Vector();
-    for (int i = 0; i < instanceDocumentsCopy.length; i++) {
-      IXSDFragment compatibleFrag = null;
-      for (int j = 0; j < numTypes; j++) {
-        IXSDFragment memberFrag = getFragment(createUnionInstance(j));
-        Element[] memberInstanceDocument = new Element[1];
-        memberInstanceDocument[0] = setElementTagName(instanceDocumentsCopy[i], memberFrag.getName());
-        if (memberFrag.setParameterValuesFromInstanceDocuments(memberInstanceDocument)) {
-          if (memberFrag.validateAllParameterValues()) {
-            compatibleFrag = memberFrag;
-            break;
-          }
-          else if (compatibleFrag == null)
-            compatibleFrag = memberFrag;
-        }
-      }
-      if (compatibleFrag != null)
-        memberFragments.add(compatibleFrag);
-      else
-        paramsValid = false;
-    }
-    removeAllFragments();
-    addFragments(memberFragments);
-    return paramsValid;
-  }
-
-  public Element[] genInstanceDocumentsFromParameterValues(boolean genXSIType, Hashtable namespaceTable, Document doc) {
-    IXSDFragment[] fragments = getAllFragments();
-    Vector instanceDocumentsCopy = new Vector();
-    for (int i = 0; i < fragments.length; i++) {
-      Element[] fragmentInstances = fragments[i].genInstanceDocumentsFromParameterValues(genXSIType, namespaceTable, doc);
-      if (fragmentInstances.length > 0)
-        instanceDocumentsCopy.add(fragmentInstances[0]);
-    }
-    Element[] instanceDocuments = new Element[instanceDocumentsCopy.size()];
-    for (int i = 0; i < instanceDocuments.length; i++) {
-      instanceDocuments[i] = (Element)instanceDocumentsCopy.get(i);
-    }
-    return setElementsTagName(instanceDocuments, getInstanceDocumentTagName(namespaceTable));
-  }
-
-  public XSDSimpleTypeDefinition[] getMemberTypeDefinitions() {
-    if (memberTypes_ == null) {
-      EList memberTypes = ((XSDSimpleTypeDefinition)getXSDTypeDefinition()).getMemberTypeDefinitions();
-      memberTypes_ = new XSDSimpleTypeDefinition[memberTypes.size()];
-      for (int i = 0; i < memberTypes_.length; i++) {
-        memberTypes_[i] = (XSDSimpleTypeDefinition)memberTypes.get(i);
-      }
-    }
-    return memberTypes_;
-  }
-
-  public String createUnionInstance(int memberTypeIndex) {
-    getMemberTypeDefinitions();
-    if (memberTypeIndex < 0 || memberTypeIndex > memberTypes_.length - 1)
-      return null;
-    String newID = genID();
-    XSDToFragmentConfiguration thisConfig = getXSDToFragmentConfiguration();
-    XSDToFragmentConfiguration xsdConfig = new XSDToFragmentConfiguration();
-    xsdConfig.setXSDComponent(memberTypes_[memberTypeIndex]);
-    xsdConfig.setStyle(thisConfig.getStyle());
-    xsdConfig.setPartEncoding(thisConfig.getPartEncoding());
-    xsdConfig.setWSDLPartName(thisConfig.getWSDLPartName());
-    IXSDFragment frag = getXSDToFragmentController().getFragment(xsdConfig, newID, getName());
-    frag.setID(newID);
-    frag.setName(getName());
-    addFragment(newID, frag);
-    return newID;
-  }
-
-  public String createInstance() {
-    return createUnionInstance(0);
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleUnionRangeFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleUnionRangeFragment.java
deleted file mode 100644
index ec2bb8d02..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleUnionRangeFragment.java
+++ /dev/null
@@ -1,32 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-
-public class XSDSimpleUnionRangeFragment extends XSDSimpleUnionFragment {
-  public XSDSimpleUnionRangeFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller) {
-    super(id, name, config, controller);
-  }
-
-  public String getInformationFragment() {
-    return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
-  }
-
-  public String getReadFragment() {
-    return "/wsdl/fragment/XSDSimpleUnionRFragmentJSP.jsp";
-  }
-
-  public String getWriteFragment() {
-    return "/wsdl/fragment/XSDSimpleUnionRangeWFragmentJSP.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/HTTPUtil.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/HTTPUtil.java
deleted file mode 100644
index 1d487e333..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/HTTPUtil.java
+++ /dev/null
@@ -1,103 +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.wst.ws.internal.explorer.platform.wsdl.fragment.util;
-
-import java.util.Hashtable;
-import javax.xml.parsers.ParserConfigurationException;
-import org.apache.axis.Constants;
-import org.eclipse.wst.ws.internal.explorer.platform.util.URLUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.util.XMLUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDSimpleAtomicFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDSimpleListFragment;
-import org.w3c.dom.Element;
-
-public class HTTPUtil
-{
-  private HTTPUtil()
-  {
-  }
-
-  public static String genURLEncodedParameters(IXSDFragment fragment)
-  {
-    if (fragment instanceof IXSDSimpleListFragment)
-      return genURLEncodedParamsFromListFragment((IXSDSimpleListFragment)fragment);
-    else if (fragment instanceof IXSDSimpleAtomicFragment)
-      return genURLEncodedParamsFromAtomicFragment((IXSDSimpleAtomicFragment)fragment);
-    else
-      return genURLEncodedXMLParameters(fragment);
-  }
-
-  private static String genURLEncodedParamsFromAtomicFragment(IXSDSimpleAtomicFragment fragment)
-  {
-    StringBuffer urlEncodedParam = new StringBuffer();
-    String[] params = fragment.getParameterValues(fragment.getID());
-    for (int i = 0; i < params.length; i++)
-    {
-      urlEncodedParam.append(URLUtils.encode(fragment.getName()));
-      urlEncodedParam.append("=");
-      urlEncodedParam.append(URLUtils.encode(params[i]));
-      if (i < params.length - 1)
-        urlEncodedParam.append("&");
-    }
-    return urlEncodedParam.toString();
-  }
-
-  private static String genURLEncodedParamsFromListFragment(IXSDSimpleListFragment fragment)
-  {
-    StringBuffer urlEncodedParam = new StringBuffer();
-    IXSDFragment[] childFrags = fragment.getAllFragments();
-    for (int i = 0; i < childFrags.length; i++)
-    {
-      urlEncodedParam.append(URLUtils.encode(fragment.getName()));
-      urlEncodedParam.append("=");
-      String[] params = childFrags[i].getParameterValues(childFrags[i].getID());
-      StringBuffer paramBuffer = new StringBuffer();
-      for (int j = 0; j < params.length; j++)
-      {
-        paramBuffer.append(params[j]);
-        if (j < params.length - 1)
-          paramBuffer.append(FragmentConstants.LIST_SEPERATOR);
-      }
-      urlEncodedParam.append(URLUtils.encode(paramBuffer.toString()));
-      if (i < childFrags.length - 1)
-        urlEncodedParam.append("&");
-    }
-    return urlEncodedParam.toString();
-  }
-
-  private static String genURLEncodedXMLParameters(IXSDFragment fragment)
-  {
-    StringBuffer urlEncodedParam = new StringBuffer();
-    Hashtable soapEnvelopeNamespaceTable = new Hashtable();
-    soapEnvelopeNamespaceTable.put(Constants.URI_SOAP11_ENV, Constants.NS_PREFIX_SOAP_ENV);
-    soapEnvelopeNamespaceTable.put(Constants.URI_2001_SCHEMA_XSI, Constants.NS_PREFIX_SCHEMA_XSI);
-    soapEnvelopeNamespaceTable.put(Constants.URI_2001_SCHEMA_XSD, Constants.NS_PREFIX_SCHEMA_XSD);
-    Element[] instanceDocuments = new Element[0];
-    try
-    {
-      instanceDocuments = fragment.genInstanceDocumentsFromParameterValues(true, soapEnvelopeNamespaceTable, XMLUtils.createNewDocument(null));
-    }
-    catch (ParserConfigurationException pce)
-    {
-    }
-    for (int i = 0; i < instanceDocuments.length; i++)
-    {
-      urlEncodedParam.append(URLUtils.encode(fragment.getName()));
-      urlEncodedParam.append("=");
-      urlEncodedParam.append(URLUtils.encode(XMLUtils.serialize(instanceDocuments[i], true)));
-      if (i < instanceDocuments.length - 1)
-        urlEncodedParam.append("&");
-    }
-    return urlEncodedParam.toString();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/OptionVector.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/OptionVector.java
deleted file mode 100644
index 412881df3..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/OptionVector.java
+++ /dev/null
@@ -1,66 +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.wst.ws.internal.explorer.platform.wsdl.fragment.util;
-
-import java.util.Vector;
-
-public class OptionVector
-{
-  private Vector options_;
-  
-  public OptionVector()
-  {
-    options_ = new Vector();
-  }
-  
-  public void addOption(String displayValue,String value)
-  {
-    options_.addElement(new Option(displayValue,value));
-  }
-  
-  public String getDisplayValue(int position)
-  {
-    Option option = (Option)options_.elementAt(position);
-    return option.getDisplayValue();
-  }
-  
-  public String getValue(int position)
-  {
-    Option option = (Option)options_.elementAt(position);
-    return option.getValue();
-  }
-  
-  public int size()
-  {
-    return options_.size();
-  }
-  
-  private final class Option
-  {
-    private String displayValue_;
-    private String value_;
-    public Option(String displayValue,String value)
-    {
-      displayValue_ = displayValue;
-      value_ = value;
-    }
-    
-    public final String getDisplayValue()
-    {
-      return displayValue_;
-    }
-    
-    public final String getValue()
-    {
-      return value_;
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/XSDTypeDefinitionUtil.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/XSDTypeDefinitionUtil.java
deleted file mode 100644
index a8e250f87..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/XSDTypeDefinitionUtil.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.xsd.XSDComplexTypeContent;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDTypeDefinition;
-
-public class XSDTypeDefinitionUtil {
-  private XSDTypeDefinitionUtil() {
-  }
-
-  public static boolean isXSDBuiltInTypeDefinition(XSDTypeDefinition type) {
-    if (type == null)
-      return false;
-    String ns = type.getTargetNamespace();
-    return (ns != null && ns.equals(FragmentConstants.URI_XSD));
-  }
-  
-  public static boolean isRootTypeDefinition(XSDTypeDefinition type) {
-    if (type == null)
-      return true;
-    XSDTypeDefinition baseType = type.getBaseType();
-    if (baseType == null)
-      return true;
-    String typeNS = type.getTargetNamespace();
-    String baseTypeNS = baseType.getTargetNamespace();
-    String typeName = type.getName();
-    String baseTypeName = baseType.getName();
-    boolean sameNS;
-    boolean sameName;
-    if (typeNS == null && baseTypeNS == null)
-      sameNS = true;
-    else if (typeNS != null && baseTypeNS != null && typeNS.equals(baseTypeNS))
-      sameNS = true;
-    else
-      sameNS = false;
-    if (typeName == null && baseTypeName == null)
-      sameName = true;
-    else if (typeName != null && baseTypeName != null && typeName.equals(baseTypeName))
-      sameName = true;
-    else
-      sameName = false;
-    return (sameNS && sameName);
-  }
-  
-  public static XSDTypeDefinition resolveToXSDBuiltInTypeDefinition(XSDTypeDefinition type) {
-    if (type == null)
-      return null;
-    XSDTypeDefinition currType = type;
-    while (!isXSDBuiltInTypeDefinition(currType)) {
-      if (isRootTypeDefinition(currType))
-        return null;
-      currType = currType.getBaseType();
-    }
-    return currType;
-  }
-
-  public static boolean isSoapEncArray(XSDTypeDefinition type) {
-    XSDTypeDefinition currType = type;
-    if (currType != null)
-    while(currType != null) {
-      String ns = currType.getTargetNamespace();
-      String name = currType.getName();
-      if (FragmentConstants.URI_SOAP.equals(ns) && FragmentConstants.QNAME_LOCAL_NAME_ARRAY.equals(name))
-        return true;
-      else if (isRootTypeDefinition(currType))
-        return false;
-      else
-        currType = currType.getBaseType();
-    }
-    return false;
-  }
-
-  /**
-   * Returns the complex type content given a complex type.
-   * If complexType is a user defined type:
-   *   This method will return the user defined complex content of this type or the content of the extended
-   *   or derived type iff the extended or derived type is not a built-in XSD type (for example, xsd:anyType).
-   * If complexType is a built-in XSD type:
-   *   It will return the complex content of this built-in XSD complex type.  It will not return the
-   *   complex content of its extended or derived type.
-   * @param complexType XSDComplexTypeDefinition complex type.
-   * @return XSDComplexTypeContent XSDComplexTypeContent the resolved complex type content.
-  **/
-  public static XSDComplexTypeContent getXSDComplexTypeContent(XSDComplexTypeDefinition complexType)
-  {
-    if (!isXSDBuiltInTypeDefinition(complexType))
-    {
-      XSDTypeDefinition type = complexType;
-      while (!isXSDBuiltInTypeDefinition(type) && (type instanceof XSDComplexTypeDefinition))
-      {
-        XSDComplexTypeContent complexTypeContent = ((XSDComplexTypeDefinition)type).getContent();
-        if (complexTypeContent != null)
-          return complexTypeContent;
-        if (isRootTypeDefinition(type))
-          return null;
-        type = type.getBaseType();
-      }
-      return null;
-    }
-    else
-      return complexType.getContent();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/DetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/DetailsTool.java
deleted file mode 100644
index e60ca2e9a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/DetailsTool.java
+++ /dev/null
@@ -1,39 +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.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.SelectWSDLPropertiesToolAction;
-
-public abstract class DetailsTool extends FormTool {
-
-  public String formLink_;
-
-  public DetailsTool(ToolManager toolManager, String alt, String formLink) {
-    super(toolManager, "images/details_enabled.gif", "images/details_highlighted.gif", alt);
-    formLink_ = formLink;
-  }
-
-  protected void initDefaultProperties() {
-  }
-
-  public String getSelectToolActionHref(boolean forHistory) {
-    Node selectedNode = toolManager_.getNode();
-    return SelectWSDLPropertiesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-  }
-
-  public String getFormLink() {
-    return formLink_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/InvokeWSDLOperationTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/InvokeWSDLOperationTool.java
deleted file mode 100644
index 17cc13ea4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/InvokeWSDLOperationTool.java
+++ /dev/null
@@ -1,96 +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.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.SelectWSDLPropertiesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLOperationElement;
-
-public class InvokeWSDLOperationTool extends FormTool {
-
-  private String fragmentViewID_;
-  private String fragmentNameAnchorID_;
-  private String endPoint_;
-
-  public InvokeWSDLOperationTool(ToolManager toolManager, String alt) {
-    super(toolManager, "wsdl/images/invoke_wsdl_operation_enabled.gif", "wsdl/images/invoke_wsdl_operation_highlighted.gif", alt);
-    fragmentViewID_ = FragmentConstants.FRAGMENT_VIEW_SWITCH_SOURCE_TO_FORM;
-    fragmentNameAnchorID_ = null;
-    endPoint_ = null;
-  }
-
-  protected void initDefaultProperties() {
-  }
-
-  public String getSelectToolActionHref(boolean forHistory) {
-    Node selectedNode = toolManager_.getNode();
-    return SelectWSDLPropertiesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-  }
-
-  public String getFormLink() {
-    StringBuffer formLink = new StringBuffer();
-    formLink.append("wsdl/forms/InvokeWSDLOperationForm.jsp");
-    String nameAnchorID = getFragmentNameAnchorID();
-    if (nameAnchorID != null && nameAnchorID.length() > 0) {
-      formLink.append("#");
-      formLink.append(nameAnchorID);
-      setFragmentNameAnchorID(null);
-    }
-    return formLink.toString();
-  }
-
-  public String getFormActionLink(int operationType,String fragmentViewID)
-  {
-    switch (operationType)
-    {
-      case WSDLOperationElement.OPERATION_TYPE_SOAP:
-        if (fragmentViewID.equals(FragmentConstants.FRAGMENT_VIEW_SWITCH_FORM_TO_SOURCE))
-          return "wsdl/actions/InvokeWSDLSOAPOperationSourceActionJSP.jsp";
-        else
-          return "wsdl/actions/InvokeWSDLSOAPOperationFormActionJSP.jsp";
-      case WSDLOperationElement.OPERATION_TYPE_HTTP_GET:
-        return "wsdl/actions/InvokeWSDLHttpGetOperationFormActionJSP.jsp";
-      case WSDLOperationElement.OPERATION_TYPE_HTTP_POST:
-      default:
-        return "wsdl/actions/InvokeWSDLHttpPostOperationFormActionJSP.jsp";
-    }
-  }
-
-  public String getFragmentViewID() {
-    return fragmentViewID_;
-  }
-
-  public void setFragmentViewID(String fragmentViewID) {
-    fragmentViewID_ = fragmentViewID;
-  }
-
-  public String getFragmentNameAnchorID() {
-    return fragmentNameAnchorID_;
-  }
-
-  public void setFragmentNameAnchorID(String fragmentNameAnchorID) {
-    fragmentNameAnchorID_ = fragmentNameAnchorID;
-  }
-
-  public String getEndPoint()
-  {
-    return endPoint_;
-  }
-
-  public void setEndPoint(String endPoint)
-  {
-    endPoint_ = endPoint;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/OpenWSDLTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/OpenWSDLTool.java
deleted file mode 100644
index d352109b5..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/OpenWSDLTool.java
+++ /dev/null
@@ -1,37 +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.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.SelectWSDLPropertiesToolAction;
-
-public class OpenWSDLTool extends FormTool {
-
-    public OpenWSDLTool(ToolManager toolManager, String alt) {
-        super(toolManager, "wsdl/images/open_wsdl_enabled.gif", "wsdl/images/open_wsdl_highlighted.gif", alt);
-    }
-
-    protected void initDefaultProperties() {
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSDLPropertiesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public String getFormLink() {
-        return "wsdl/forms/OpenWSDLForm.jsp";
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/SOAPMessageQueue.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/SOAPMessageQueue.java
deleted file mode 100644
index c854ebeb2..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/SOAPMessageQueue.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.ws.internal.explorer.platform.wsdl.perspective;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-
-public class SOAPMessageQueue extends MessageQueue
-{
-  private Vector cachedMessageList_;
-
-  public SOAPMessageQueue()
-  {
-    super();
-    cachedMessageList_ = new Vector();
-  }
-
-  public void clear()
-  {
-    cachedMessageList_.removeAllElements();
-    messageList_.removeAllElements();
-  }
-
-  public String getMessagesFromList()
-  {
-    if (messageList_.size() == 0)
-      copyMessages(cachedMessageList_,messageList_);
-    else
-      copyMessages(messageList_,cachedMessageList_);
-    return super.getMessagesFromList();
-  }
-
-  private final void copyMessages(Vector sourceList,Vector destList)
-  {
-    for (int i=0;i<sourceList.size();i++)
-      destList.addElement(sourceList.elementAt(i));
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLAddToFavoritesTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLAddToFavoritesTool.java
deleted file mode 100644
index 271d671b7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLAddToFavoritesTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.SelectWSDLPropertiesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.WSDLAddToFavoritesAction;
-
-public class WSDLAddToFavoritesTool extends ActionTool {
-  public WSDLAddToFavoritesTool(ToolManager toolManager, String alt) {
-    super(toolManager, "images/favorites_enabled.gif", "images/favorites_highlighted.gif", alt);
-  }
-
-  public String getSelectToolActionHref(boolean forHistory) {
-    Node selectedNode = toolManager_.getNode();
-    return SelectWSDLPropertiesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-  }
-
-  public String getActionLink() {
-    Node selectedNode = toolManager_.getNode();
-    return WSDLAddToFavoritesAction.getActionLink(selectedNode.getNodeId());
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLBindingDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLBindingDetailsTool.java
deleted file mode 100644
index 4b90d81e6..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLBindingDetailsTool.java
+++ /dev/null
@@ -1,21 +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.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class WSDLBindingDetailsTool extends DetailsTool {
-
-  public WSDLBindingDetailsTool(ToolManager toolManager, String alt) {
-    super(toolManager, alt, "wsdl/forms/WSDLBindingDetailsForm.jsp");
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLBindingNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLBindingNode.java
deleted file mode 100644
index 93c04b961..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLBindingNode.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.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLModelConstants;
-
-// WSDL binding node for the WSDL Navigator Tree View
-public class WSDLBindingNode extends WSDLNavigatorNode
-{
-  public WSDLBindingNode(TreeElement element,NodeManager nodeManager,int nodeDepth)
-  {
-    super(element,nodeManager,nodeDepth,"wsdl/images/wsdl_binding_node.gif");
-    element.addListener(new ElementAdapter()
-    {
-      public void relAdded(RelAddEvent event)
-      {
-        String rel = event.getOutBoundRelName();
-        if (rel.equals(WSDLModelConstants.REL_WSDL_OPERATION)) {
-          WSDLOperationNode wsdlOperationNode = new WSDLOperationNode((TreeElement)event.getParentElement(), nodeManager_, nodeDepth_ + 1);
-          addChild(wsdlOperationNode);
-        }
-      }
-
-      public void relRemoved(RelRemoveEvent event)
-      {
-        TreeElement childElement = null;
-        if (event.getInBoundRelName().equals(WSDLModelConstants.REL_WSDL_OPERATION)) {
-          childElement = (TreeElement)event.getInboundElement();
-        }
-        if (event.getOutBoundRelName().equals(WSDLModelConstants.REL_WSDL_OPERATION)) {
-          childElement = (TreeElement)event.getOutBoundElement();
-        }
-        removeChildNode(childElement);
-      }
-    });
-    setVisibilityOfChildren(false);
-  }
-
-  protected final void initTools()
-  {
-    Controller controller = nodeManager_.getController();
-    WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-    new WSDLBindingDetailsTool(toolManager_, wsdlPerspective.getMessage("ALT_WSDL_BINDING_DETAILS"));
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLDetailsTool.java
deleted file mode 100644
index 279eadff7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLDetailsTool.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.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class WSDLDetailsTool extends DetailsTool {
-
-  public static final int FORM_VIEW_ID = 0;
-  public static final int SOURCE_VIEW_ID = 1;
-
-  private int viewId_;
-
-  public WSDLDetailsTool(ToolManager toolManager, String alt) {
-    super(toolManager, alt, "wsdl/forms/WSDLDetailsForm.jsp");
-    viewId_ = FORM_VIEW_ID;
-  }
-
-  public int getViewId() {
-    return viewId_;
-  }
-
-  public void setViewId(int viewId) {
-    if (viewId == FORM_VIEW_ID || viewId == SOURCE_VIEW_ID)
-      viewId_ = viewId;
-  }
-
-  public void toggleViewId() {
-    if (viewId_ == FORM_VIEW_ID)
-      viewId_ = SOURCE_VIEW_ID;
-    else
-      viewId_ = FORM_VIEW_ID;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLImportWSDLToFileSystemTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLImportWSDLToFileSystemTool.java
deleted file mode 100644
index 3b191a3b4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLImportWSDLToFileSystemTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ImportToFileSystemTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.SelectWSDLPropertiesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.WSDLImportWSDLToFileSystemAction;
-
-public class WSDLImportWSDLToFileSystemTool extends ImportToFileSystemTool {
-  public WSDLImportWSDLToFileSystemTool(ToolManager toolManager,String alt) {
-    super(toolManager,alt);
-  }
-
-  public final String getSelectToolActionHref(boolean forHistory) {
-    Node node = toolManager_.getNode();
-    return SelectWSDLPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
-  }
-
-  public final String getActionLink() {
-    Node node = toolManager_.getNode();
-    return WSDLImportWSDLToFileSystemAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId());
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLImportWSDLToWorkbenchTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLImportWSDLToWorkbenchTool.java
deleted file mode 100644
index 5dccc9500..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLImportWSDLToWorkbenchTool.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ImportToWorkbenchTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.SelectWSDLPropertiesToolAction;
-
-public class WSDLImportWSDLToWorkbenchTool extends ImportToWorkbenchTool {
-  public WSDLImportWSDLToWorkbenchTool(ToolManager toolManager,String alt) {
-    super(toolManager,alt);
-  }
-
-  public String getSelectToolActionHref(boolean forHistory) {
-    Node node = toolManager_.getNode();
-    return SelectWSDLPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
-  }
-
-  public final String getFormLink() {
-    return "wsdl/forms/WSDLImportWSDLToWorkbenchForm.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLLaunchWebServiceWizardTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLLaunchWebServiceWizardTool.java
deleted file mode 100644
index 36f9780eb..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLLaunchWebServiceWizardTool.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.LaunchWebServiceWizardTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.SelectWSDLPropertiesToolAction;
-
-public class WSDLLaunchWebServiceWizardTool extends LaunchWebServiceWizardTool {
-  public WSDLLaunchWebServiceWizardTool(ToolManager toolManager,String alt) {
-    super(toolManager,alt);
-  }
-
-  public String getSelectToolActionHref(boolean forHistory) {
-    Node node = toolManager_.getNode();
-    return SelectWSDLPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
-  }
-
-  public final String getFormLink() {
-    return "wsdl/forms/WSDLLaunchWebServiceWizardForm.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLMainNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLMainNode.java
deleted file mode 100644
index 5d54922fb..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLMainNode.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLModelConstants;
-
-// Root node for the WSDL Navigator Tree View
-public class WSDLMainNode extends WSDLNavigatorNode
-{
-  public WSDLMainNode(TreeElement element,NodeManager nodeManager)
-  {
-    super(element,nodeManager,1,"images/root_main.gif");
-    element.addListener(new ElementAdapter()
-    {
-      public void relAdded(RelAddEvent event)
-      {
-        String rel = event.getOutBoundRelName();
-        if (rel.equals(WSDLModelConstants.REL_WSDL)) {
-          WSDLNode wsdlNode = new WSDLNode((TreeElement)event.getParentElement(), nodeManager_, nodeDepth_ + 1);
-          addChild(wsdlNode);
-        }
-      }
-
-      public void relRemoved(RelRemoveEvent event)
-      {
-        TreeElement childElement = null;
-        if (event.getInBoundRelName().equals(WSDLModelConstants.REL_WSDL)) {
-          childElement = (TreeElement)event.getInboundElement();
-        }
-        if (event.getOutBoundRelName().equals(WSDLModelConstants.REL_WSDL)) {
-          childElement = (TreeElement)event.getOutBoundElement();
-        }
-        removeChildNode(childElement);
-      }
-    });
-  }
-
-  protected final void initTools()
-  {
-    Controller controller = nodeManager_.getController();
-    WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-    new OpenWSDLTool(toolManager_, wsdlPerspective.getMessage("ALT_OPEN_WSDL"));
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLNavigatorNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLNavigatorNode.java
deleted file mode 100644
index 45ef58b8f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLNavigatorNode.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.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.SelectWSDLNavigatorNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.ToggleWSDLNavigatorNodeAction;
-
-public abstract class WSDLNavigatorNode extends Node
-{
-  public WSDLNavigatorNode(TreeElement element,NodeManager nodeManager,int nodeDepth,String imagePath)
-  {
-    super(element,nodeManager,nodeDepth,imagePath);
-  }
-
-  // wsdl/actions/ToggleWSDLNavigatorNodeAction.jsp?nodeId=...
-  public final String getToggleNodeActionHref()
-  {
-    return ToggleWSDLNavigatorNodeAction.getActionLink(nodeId_,isOpen_);
-  }
-
-  // wsdl/actions/SelectWSDLNavigatorNodeAction.jsp?nodeId=...
-  public final String getLinkActionHref()
-  {
-    return SelectWSDLNavigatorNodeAction.getActionLink(nodeId_,false);
-  } 
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLNode.java
deleted file mode 100644
index 4144a86c9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLNode.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLModelConstants;
-
-// WSDL node for the WSDL Navigator Tree View
-public class WSDLNode extends WSDLNavigatorNode
-{
-  public WSDLNode(TreeElement element,NodeManager nodeManager,int nodeDepth)
-  {
-    super(element,nodeManager,nodeDepth,"images/wsdl.gif");
-    element.addListener(new ElementAdapter()
-    {
-      public void relAdded(RelAddEvent event)
-      {
-        String rel = event.getOutBoundRelName();
-        if (rel.equals(WSDLModelConstants.REL_WSDL_SERVICE)) {
-          WSDLServiceNode wsdlServiceNode = new WSDLServiceNode((TreeElement)event.getParentElement(), nodeManager_, nodeDepth_ + 1);
-          addChild(wsdlServiceNode);
-        }
-      }
-
-      public void relRemoved(RelRemoveEvent event)
-      {
-        TreeElement childElement = null;
-        if (event.getInBoundRelName().equals(WSDLModelConstants.REL_WSDL_SERVICE)) {
-          childElement = (TreeElement)event.getInboundElement();
-        }
-        if (event.getOutBoundRelName().equals(WSDLModelConstants.REL_WSDL_SERVICE)) {
-          childElement = (TreeElement)event.getOutBoundElement();
-        }
-        removeChildNode(childElement);
-      }
-    });
-    setVisibilityOfChildren(false);
-  }
-
-  protected final void initTools()
-  {
-    Controller controller = nodeManager_.getController();
-    WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-    new WSDLDetailsTool(toolManager_, wsdlPerspective.getMessage("ALT_WSDL_DETAILS"));
-    new WSDLImportWSDLToWorkbenchTool(toolManager_, controller.getMessage("ALT_IMPORT_WSDL_TO_WORKBENCH"));
-    new WSDLImportWSDLToFileSystemTool(toolManager_, controller.getMessage("ALT_WSDL_IMPORT_TO_FS"));
-    new WSDLLaunchWebServiceWizardTool(toolManager_, controller.getMessage("ALT_LAUNCH_WEB_SERVICE_WIZARD"));
-    new WSDLAddToFavoritesTool(toolManager_, wsdlPerspective.getMessage("ALT_ADD_WSDL_TO_FAVORITES"));
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLOperationNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLOperationNode.java
deleted file mode 100644
index c03a0263a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLOperationNode.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-// WSDL operation node for the WSDL Navigator Tree View
-public class WSDLOperationNode extends WSDLNavigatorNode
-{
-  public WSDLOperationNode(TreeElement element,NodeManager nodeManager,int nodeDepth)
-  {
-    super(element,nodeManager,nodeDepth,"wsdl/images/wsdl_operation_node.gif");
-    element.addListener(new ElementAdapter()
-    {
-      public void relAdded(RelAddEvent event)
-      {
-      }
-
-      public void relRemoved(RelRemoveEvent event)
-      {
-      }
-    });
-  }
-
-  protected final void initTools()
-  {
-    Controller controller = nodeManager_.getController();
-    WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-    new InvokeWSDLOperationTool(toolManager_, wsdlPerspective.getMessage("ALT_INVOKE_WSDL_OPERATION"));
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLPerspective.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLPerspective.java
deleted file mode 100644
index 9f69b2f3c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLPerspective.java
+++ /dev/null
@@ -1,370 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.wsdl.perspective;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Vector;
-import javax.servlet.ServletContext;
-import javax.wsdl.Service;
-import org.eclipse.emf.ecore.impl.EcorePackageImpl;
-import org.eclipse.emf.ecore.resource.impl.ResourceFactoryRegistryImpl;
-import org.eclipse.wst.ws.internal.datamodel.BasicModel;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Perspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.util.URLUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.OpenWSDLAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.SwitchPerspectiveFromWSDLAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.UpdateWSDLBindingAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.BindingTypes;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLBindingElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLServiceElement;
-import org.eclipse.xsd.impl.XSDPackageImpl;
-import org.eclipse.xsd.util.XSDResourceFactoryImpl;
-
-public class WSDLPerspective extends Perspective
-{
-  public static final int STATUS_CONTENT_DEFAULT = 0;
-  public static final int STATUS_CONTENT_RESULT_FORM = 1;
-  public static final int STATUS_CONTENT_RESULT_SOURCE = 2;
-
-  private BasicModel model_;
-  private NodeManager nodeManager_;
-  private String perspectiveContentFramesetCols_;
-  private String savedPerspectiveContentFramesetCols_;
-  private String actionsContainerFramesetRows_;
-  private String savedActionsContainerFramesetRows_;
-  private int statusContentType_;
-
-  private SOAPMessageQueue soapRequestQueue_;
-  private SOAPMessageQueue soapResponseQueue_;
-  private Node operationNode_;
-
-  static
-  {
-    // Initialize the XSD subsystem.
-    (new ResourceFactoryRegistryImpl()).getExtensionToFactoryMap().put("xsd",new XSDResourceFactoryImpl());
-    // port to org.eclipse.xsd
-    // Init.init();
-    EcorePackageImpl.init();
-    XSDPackageImpl.init();
-  }
-
-  public WSDLPerspective(Controller controller)
-  {
-    super("wsdl",controller);
-  }
-
-  public final void initPerspective(ServletContext application)
-  {
-    model_ = new BasicModel("wsdlModel");
-    TreeElement treeElement = new TreeElement(getMessage("NODE_NAME_WSDL_MAIN"), model_);
-    model_.setRootElement(treeElement);
-    nodeManager_ = new NodeManager(controller_);
-    WSDLMainNode wsdlMainNode = new WSDLMainNode(treeElement, nodeManager_);
-    nodeManager_.setRootNode(wsdlMainNode);
-
-    // Starting frameset sizes.
-    if (!DirUtils.isRTL())
-      perspectiveContentFramesetCols_ = "30%,*";
-    else
-      perspectiveContentFramesetCols_ = "*,30%";
-    savedPerspectiveContentFramesetCols_ = perspectiveContentFramesetCols_;
-    actionsContainerFramesetRows_ = "75%,*";
-    savedActionsContainerFramesetRows_ = actionsContainerFramesetRows_;
-
-    // Message status pane
-    statusContentType_ = STATUS_CONTENT_DEFAULT;
-    soapRequestQueue_ = new SOAPMessageQueue();
-    soapResponseQueue_ = new SOAPMessageQueue();
-    operationNode_ = null;
-  }
-
-  public final void preloadWSDL(String[] wsdlURLs) {
-    if (wsdlURLs != null) {
-      for (int i = 0; i < wsdlURLs.length; i++) {
-        OpenWSDLAction openWSDLAction = new OpenWSDLAction(controller_);
-        Hashtable propertyTable = openWSDLAction.getPropertyTable();
-        String decodedWSDLURL = URLUtils.decode(wsdlURLs[i]);
-        propertyTable.put(ActionInputs.QUERY_INPUT_WSDL_URL, decodedWSDLURL);
-        openWSDLAction.run();
-      }
-      if (wsdlURLs.length > 0)
-        controller_.setCurrentPerspective(ActionInputs.PERSPECTIVE_WSDL);
-    }
-  }
-  
-  public final void preloadEndpoints(String[] wsdlURLs, String[] endpoints)
-  {
-    if (wsdlURLs != null && wsdlURLs.length > 0 && endpoints != null && endpoints.length > 0)
-    {
-      String wsdlURL = wsdlURLs[0];
-      Vector wsdlNodes = nodeManager_.getRootNode().getChildNodes();
-      for (Iterator wsdlNodesIterator = wsdlNodes.iterator(); wsdlNodesIterator.hasNext();)
-      {
-        Node wsdlNode = (Node)wsdlNodesIterator.next();
-        if (wsdlNode.getNodeName().equals(wsdlURL))
-        {
-          Vector serviceNodes = wsdlNode.getChildNodes();
-          for (Iterator serviceNodesIterator = serviceNodes.iterator(); serviceNodesIterator.hasNext();)
-          {
-            Node serviceNode = (Node)serviceNodesIterator.next();
-            Vector bindingNodes = serviceNode.getChildNodes();
-            String[] nodeIds = new String[bindingNodes.size()];
-            for (int i = 0; i < nodeIds.length; i++)
-              nodeIds[i] = String.valueOf(((Node)bindingNodes.get(i)).getNodeId());
-            UpdateWSDLBindingAction action = new UpdateWSDLBindingAction(controller_);
-            Hashtable propertyTable = new Hashtable();
-            propertyTable.put(ActionInputs.NODEID, nodeIds);
-            propertyTable.put(WSDLActionInputs.END_POINT, endpoints);
-            action.setPropertyTable(propertyTable);
-            action.execute(false);
-          }
-          return;
-        }
-      }
-    }
-  }
-  
-  public final void preselectServiceOrBinding(String[] wsdlURLs,String[] serviceQNameStrings,String[] bindingNameStrings)
-  {
-    if (wsdlURLs != null && wsdlURLs.length > 0)
-    {
-      String wsdlURL = wsdlURLs[0];
-      if (serviceQNameStrings != null && serviceQNameStrings.length > 0)
-        preselectService(wsdlURL,serviceQNameStrings[0]);
-      else
-      {
-        if (bindingNameStrings != null && bindingNameStrings.length > 0)
-          preselectBinding(wsdlURL,bindingNameStrings[0]);
-      }
-    }
-  }
-  
-  private final void preselectService(String wsdlURL,String serviceQNameString)
-  {
-    Vector wsdlNodes = nodeManager_.getRootNode().getChildNodes();
-    for (int i=0;i<wsdlNodes.size();i++)
-    {
-      Node wsdlNode = (Node)wsdlNodes.elementAt(i);
-      if (wsdlNode.getNodeName().equals(wsdlURL))
-      {
-        Vector serviceNodes = wsdlNode.getChildNodes();
-        for (int j=0;j<serviceNodes.size();j++)
-        {
-          Node serviceNode = (Node)serviceNodes.elementAt(j);
-          WSDLServiceElement serviceElement = (WSDLServiceElement)serviceNode.getTreeElement();
-          Service service = serviceElement.getService();
-          if (service.getQName().toString().equals(serviceQNameString))
-          {
-            nodeManager_.setSelectedNodeId(serviceNode.getNodeId());
-            nodeManager_.makeSelectedNodeVisible();
-            controller_.setCurrentPerspective(ActionInputs.PERSPECTIVE_WSDL);
-            return;
-          }
-        }
-      }
-    }
-  }
-  
-  private final void preselectBinding(String wsdlURL,String bindingNameString)
-  {
-    Vector wsdlNodes = nodeManager_.getRootNode().getChildNodes();
-    for (int i=0;i<wsdlNodes.size();i++)
-    {
-      Node wsdlNode = (Node)wsdlNodes.elementAt(i);
-      if (wsdlNode.getNodeName().equals(wsdlURL))
-      {
-        Vector serviceNodes = wsdlNode.getChildNodes();
-        for (int j=0;j<serviceNodes.size();j++)
-        {
-          Node serviceNode = (Node)serviceNodes.elementAt(j);
-          Vector bindingNodes = serviceNode.getChildNodes();
-          for (int k=0;k<bindingNodes.size();k++)
-          {
-            Node bindingNode = (Node)bindingNodes.elementAt(k);
-            WSDLBindingElement bindingElement = (WSDLBindingElement)bindingNode.getTreeElement();
-            if (bindingElement.getBinding().getQName().toString().equals(bindingNameString))
-            {
-              nodeManager_.setSelectedNodeId(bindingNode.getNodeId());
-              nodeManager_.makeSelectedNodeVisible();
-              controller_.setCurrentPerspective(ActionInputs.PERSPECTIVE_WSDL);
-              return;
-            }
-          }
-        }          
-      }
-    }    
-  }
-
-  public NodeManager getNodeManager()
-  {
-    return nodeManager_;
-  }
-
-  public String getPerspectiveContentPage()
-  {
-    return "wsdl/wsdl_perspective_content.jsp";
-  }
-
-  public int getPerspectiveId()
-  {
-    return ActionInputs.PERSPECTIVE_WSDL;
-  }
-
-  public String getPanesFile()
-  {
-    return "wsdl/scripts/wsdlpanes.jsp";
-  }
-
-  public String getFramesetsFile()
-  {
-    return "wsdl/scripts/wsdlframesets.jsp";
-  }
-
-  public String getProcessFramesetsForm()
-  {
-    return "wsdl/forms/ProcessWSDLFramesetsForm.jsp";
-  }
-
-  public String getTreeContentVar()
-  {
-    return "wsdlNavigatorContent";
-  }
-
-  public String getTreeContentPage()
-  {
-    return "wsdl/wsdl_navigator_content.jsp";
-  }
-
-  public String getPropertiesContainerVar()
-  {
-    return "wsdlPropertiesContainer";
-  }
-
-  public String getPropertiesContainerPage()
-  {
-    return "wsdl/wsdl_properties_container.jsp";
-  }
-
-  public String getStatusContentVar()
-  {
-    return "wsdlStatusContent";
-  }
-
-  public String getStatusContentPage()
-  {
-    return "wsdl/wsdl_status_content.jsp";
-  }
-
-  public final String getPerspectiveContentFramesetCols()
-  {
-    return perspectiveContentFramesetCols_;
-  }
-
-  public final void setPerspectiveContentFramesetCols(String cols)
-  {
-    perspectiveContentFramesetCols_ = cols;
-  }
-
-  public final void setSavedPerspectiveContentFramesetCols(String cols)
-  {
-    savedPerspectiveContentFramesetCols_ = cols;
-  }
-
-  public final String getSavedPerspectiveContentFramesetCols()
-  {
-    return savedPerspectiveContentFramesetCols_;
-  }
-
-  public final String getActionsContainerFramesetRows()
-  {
-    return actionsContainerFramesetRows_;
-  }
-
-  public final void setActionsContainerFramesetRows(String rows)
-  {
-    actionsContainerFramesetRows_ = rows;
-  }
-
-  public final void setSavedActionsContainerFramesetRows(String rows)
-  {
-    savedActionsContainerFramesetRows_ = rows;
-  }
-
-  public final String getSavedActionsContainerFramesetRows()
-  {
-    return savedActionsContainerFramesetRows_;
-  }
-
-  public final String getSwitchPerspectiveFormActionLink(int targetPerspectiveId,boolean forHistory)
-  {
-    return SwitchPerspectiveFromWSDLAction.getFormActionLink(targetPerspectiveId,forHistory);
-  }
-
-  public final int getStatusContentType()
-  {
-    return statusContentType_;
-  }
-
-  public final void setStatusContentType(int statusContentType)
-  {
-    statusContentType_ = statusContentType;
-  }
-
-  public final SOAPMessageQueue getSOAPRequestQueue()
-  {
-    return soapRequestQueue_;
-  }
-
-  public final SOAPMessageQueue getSOAPResponseQueue()
-  {
-    return soapResponseQueue_;
-  }
-
-  public final Node getOperationNode()
-  {
-    return operationNode_;
-  }
-
-  public final void setOperationNode(Node operationNode)
-  {
-    operationNode_ = operationNode;
-  }
-
-  public final String getSOAPEnvelopeXMLLink(int soapEnvelopeType)
-  {
-    StringBuffer link = new StringBuffer("wsdl/soap_envelope_xml.jsp?");
-    link.append(WSDLActionInputs.SOAP_ENVELOPE_TYPE).append('=').append(soapEnvelopeType);
-    return link.toString();
-  }
-
-  public final String getBindingTypeString(int bindingType)
-  {
-    switch (bindingType)
-    {
-      case BindingTypes.SOAP:
-        return getMessage("FORM_LABEL_BINDING_TYPE_SOAP");
-      case BindingTypes.HTTP_GET:
-        return getMessage("FORM_LABEL_BINDING_TYPE_HTTP_GET");
-      case BindingTypes.HTTP_POST:
-        return getMessage("FORM_LABEL_BINDING_TYPE_HTTP_POST");
-      default:
-        return getMessage("FORM_LABEL_BINDING_TYPE_UNSUPPORTED");
-    }
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLServiceDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLServiceDetailsTool.java
deleted file mode 100644
index 457fe9b61..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLServiceDetailsTool.java
+++ /dev/null
@@ -1,21 +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.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class WSDLServiceDetailsTool extends DetailsTool {
-
-  public WSDLServiceDetailsTool(ToolManager toolManager, String alt) {
-    super(toolManager, alt, "wsdl/forms/WSDLServiceDetailsForm.jsp");
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLServiceNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLServiceNode.java
deleted file mode 100644
index ae9268678..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLServiceNode.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.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLModelConstants;
-
-// WSDL service node for the WSDL Navigator Tree View
-public class WSDLServiceNode extends WSDLNavigatorNode
-{
-  public WSDLServiceNode(TreeElement element,NodeManager nodeManager,int nodeDepth)
-  {
-    super(element,nodeManager,nodeDepth,"wsdl/images/wsdl_service_node.gif");
-    element.addListener(new ElementAdapter()
-    {
-      public void relAdded(RelAddEvent event)
-      {
-        String rel = event.getOutBoundRelName();
-        if (rel.equals(WSDLModelConstants.REL_WSDL_BINDING)) {
-          WSDLBindingNode wsdlBindingNode = new WSDLBindingNode((TreeElement)event.getParentElement(), nodeManager_, nodeDepth_ + 1);
-          addChild(wsdlBindingNode);
-        }
-      }
-
-      public void relRemoved(RelRemoveEvent event)
-      {
-        TreeElement childElement = null;
-        if (event.getInBoundRelName().equals(WSDLModelConstants.REL_WSDL_BINDING)) {
-          childElement = (TreeElement)event.getInboundElement();
-        }
-        if (event.getOutBoundRelName().equals(WSDLModelConstants.REL_WSDL_BINDING)) {
-          childElement = (TreeElement)event.getOutBoundElement();
-        }
-        removeChildNode(childElement);
-      }
-    });
-    setVisibilityOfChildren(false);
-  }
-
-  protected final void initTools()
-  {
-    Controller controller = nodeManager_.getController();
-    WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-    new WSDLServiceDetailsTool(toolManager_, wsdlPerspective.getMessage("ALT_WSDL_SERVICE_DETAILS"));
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transformer/FragmentTransformer.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transformer/FragmentTransformer.java
deleted file mode 100644
index beb4bf25c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transformer/FragmentTransformer.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.wst.ws.internal.explorer.platform.wsdl.transformer;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Vector;
-import javax.wsdl.Part;
-import javax.xml.parsers.ParserConfigurationException;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.util.XMLUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLOperationElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class FragmentTransformer implements ITransformer
-{
-  protected Controller controller;
-
-  public FragmentTransformer(Controller controller)
-  {
-    this.controller = controller;
-  }
-
-  public Hashtable normalize(Hashtable properties)
-  {
-    StringBuffer sb = new StringBuffer();
-    sb.append("<root>");
-    WSDLOperationElement operElement = (WSDLOperationElement)controller.getWSDLPerspective().getNodeManager().getSelectedNode().getTreeElement();
-    Iterator it = operElement.getOrderedBodyParts().iterator();
-    while (it.hasNext())
-    {
-      Part part = (Part)it.next();
-      IXSDFragment frag = (IXSDFragment)operElement.getFragment(part);
-      Element[] elements = new Element[0];
-      try
-      {
-        elements = frag.genInstanceDocumentsFromParameterValues(!operElement.isUseLiteral(), new Hashtable(), XMLUtils.createNewDocument(null));
-      }
-      catch (ParserConfigurationException pce)
-      {
-      }
-      for (int i = 0; i < elements.length; i++)
-        sb.append(XMLUtils.serialize(elements[i], true));
-    }
-    sb.append("</root>");
-    properties.put(FragmentConstants.SOURCE_CONTENT, sb.toString());
-    return properties;
-  }
-
-  public Hashtable deNormalize(Hashtable properties)
-  {
-    String source = (String) properties.get(FragmentConstants.SOURCE_CONTENT);
-    if (source != null)
-    {
-      try
-      {
-        Element root = XMLUtils.stringToElement(source);
-        if (root != null)
-        {
-          NodeList childNodes = root.getChildNodes();
-          Vector childrenVector = new Vector();
-          for (int i = 0; i < childNodes.getLength(); i++)
-          {
-            Node child = childNodes.item(i);
-            if (child instanceof Element)
-              childrenVector.add(child);
-          }
-          Element[] children = (Element[])childrenVector.toArray(new Element[0]);
-          WSDLOperationElement operElement = (WSDLOperationElement) controller.getWSDLPerspective().getNodeManager().getSelectedNode().getTreeElement();
-          Iterator it = operElement.getOrderedBodyParts().iterator();
-          while (it.hasNext())
-          {
-            Part part = (Part)it.next();
-            IXSDFragment frag = (IXSDFragment)operElement.getFragment(part);
-            frag.setParameterValuesFromInstanceDocuments(children);
-          }
-        }
-      }
-      catch (Throwable t)
-      {
-      }
-    }
-    return properties;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/ChunkedInputStream.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/ChunkedInputStream.java
deleted file mode 100644
index 8724cf363..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/ChunkedInputStream.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.ws.internal.explorer.platform.wsdl.transport;
-
-import java.io.FilterInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-public class ChunkedInputStream extends FilterInputStream
-{
-  protected long chunkSize = 0l;
-  protected volatile boolean closed = false;
-  private static final int maxCharLong = (Long.toHexString(Long.MAX_VALUE)).toString().length();
-
-  private ChunkedInputStream()
-  {
-    super(null);
-  }
-
-  public ChunkedInputStream(InputStream is)
-  {
-    super(is);
-  }
-
-  public int read() throws IOException
-  {
-    byte[] d = new byte[1];
-    int rc = read(d, 0, 1);
-    return rc > 0 ? (d[0] & 0xFF) : rc;
-  }
-
-  public int read(byte[] b) throws IOException
-  {
-    return read(b, 0, b.length);
-  }
-
-  public synchronized int read(byte[] b, int off, int len) throws IOException
-  {
-    if (closed)
-      return -1;
-
-    int totalread = 0;
-    int bytesread = 0;
-    try
-    {
-      do
-      {
-        if (chunkSize < 1L)
-        {
-          if (0l == getChunked())
-          {
-            if (totalread == 0)
-              return -1;
-            else
-              return totalread;
-          }
-        }
-        bytesread = in.read(b, off + totalread, Math.min(len - totalread, (int) Math.min(chunkSize, Integer.MAX_VALUE)));
-        if (bytesread > 0)
-        {
-          totalread += bytesread;
-          chunkSize -= bytesread;
-        }
-      }
-      while (len - totalread > 0 && bytesread > -1);
-    }
-    catch (IOException e)
-    {
-      closed = true;
-      throw e;
-    }
-    return totalread;
-  }
-
-  public long skip(final long n) throws IOException
-  {
-    if (closed)
-      return 0;
-    long skipped = 0l;
-    byte[] b = new byte[1024];
-    int bread = -1;
-    do
-    {
-      bread = read(b, 0, b.length);
-      if (bread > 0)
-        skipped += bread;
-    }
-    while (bread != -1 && skipped < n);
-    return skipped;
-  }
-
-  public int available() throws IOException
-  {
-    if (closed)
-      return 0;
-    int rc = (int) Math.min(chunkSize, Integer.MAX_VALUE);
-    return Math.min(rc, in.available());
-  }
-
-  protected long getChunked() throws IOException
-  {
-    //StringBuffer buf= new StringBuffer(1024);
-    byte[] buf = new byte[maxCharLong + 2];
-    int bufsz = 0;
-    chunkSize = -1L;
-    int c = -1;
-    do
-    {
-      c = in.read();
-      if (c > -1)
-      {
-        if (c != '\r' && c != '\n' && c != ' ' && c != '\t')
-        {
-          buf[bufsz++] = ((byte) c);
-        }
-      }
-    }
-    while (c > -1 && (c != '\n' || bufsz == 0) && bufsz < buf.length);
-    if (c < 0)
-    {
-      closed = true;
-    }
-    String sbuf = new String(buf, 0, bufsz);
-    if (bufsz > maxCharLong)
-    {
-      closed = true;
-      throw new IOException("Chunked input stream failed to receive valid chunk size:" + sbuf);
-    }
-    try
-    {
-      chunkSize = Long.parseLong(sbuf, 16);
-    }
-    catch (NumberFormatException ne)
-    {
-      closed = true;
-      throw new IOException("'" + sbuf + "' " + ne.getMessage());
-    }
-    if (chunkSize < 1L)
-      closed = true;
-    if (chunkSize != 0L && c < 0)
-    {
-      //If chunk size is zero try and be tolerant that there maybe no cr or lf
-      // at the end.
-      throw new IOException("HTTP Chunked stream closed in middle of chunk.");
-    }
-    if (chunkSize < 0L)
-      throw new IOException("HTTP Chunk size received " + chunkSize + " is less than zero.");
-    return chunkSize;
-  }
-
-  public void close() throws IOException
-  {
-    synchronized (this)
-    {
-      if (closed)
-        return;
-      closed = true;
-    }
-    byte[] b = new byte[1024];
-    int bread = -1;
-    do
-    {
-      bread = read(b, 0, b.length);
-    }
-    while (bread != -1);
-  }
-
-  /*
-   * public void mark(int readlimit)
-   * {
-   * }
-   */
-
-  public void reset() throws IOException
-  {
-    throw new IOException("Don't support marked streams");
-  }
-
-  public boolean markSupported()
-  {
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/HTTPException.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/HTTPException.java
deleted file mode 100644
index 28588328d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/HTTPException.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.wst.ws.internal.explorer.platform.wsdl.transport;
-
-import java.util.Map;
-
-public class HTTPException extends RuntimeException
-{
-  /**
-	 * Comment for <code>serialVersionUID</code>
-	 */
-	private static final long serialVersionUID = 3256438105900134961L;
-private int statusCode;
-  private String statusMessage;
-  private Map headers;
-  
-  public HTTPException(int statusCode, String statusMessage, Map headers)
-  {
-    super(statusMessage);
-    this.statusCode = statusCode;
-    this.statusMessage = statusMessage;
-    this.headers = headers;
-  }
-  
-  public int getStatusCode()
-  {
-    return statusCode;
-  }
-  
-  public String getStatusMessage()
-  {
-    return statusMessage;
-  }
-  
-  public Map getHeaders()
-  {
-    return headers;
-  }
-  
-  public String getHeader(String key)
-  {
-    Object value = headers.get(key);
-    if (value != null)
-      return value.toString();
-    else
-      return null;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/HTTPResponse.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/HTTPResponse.java
deleted file mode 100644
index 65b61afd4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/HTTPResponse.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.wsdl.transport;
-
-import java.util.Hashtable;
-import java.util.Map;
-
-public class HTTPResponse
-{
-  private boolean statusSet;
-  private int statusCode;
-  private String statusMessage;
-  private Hashtable headers;
-  private byte[] payload;
-
-  public HTTPResponse()
-  {
-    reset();
-  }
-
-  public void reset()
-  {
-    statusSet = false;
-    statusCode = -1;
-    statusMessage = null;
-    if (headers != null)
-      headers.clear();
-    else
-      headers = new Hashtable();
-    payload = new byte[0];
-  }
-
-  public boolean isStatusSet()
-  {
-    return statusSet;
-  }
-
-  public int getStatusCode()
-  {
-    return statusCode;
-  }
-
-  public void setStatusCode(int statusCode)
-  {
-    statusSet = true;
-    this.statusCode = statusCode;
-  }
-
-  public String getStatusMessage()
-  {
-    return statusMessage;
-  }
-
-  public void setStatusMessage(String statusMessage)
-  {
-    this.statusMessage = statusMessage;
-  }
-
-  public void addHeader(String key, String value)
-  {
-    headers.put(key, value);
-  }
-
-  public String getHeader(String key)
-  {
-    return (String) headers.get(key);
-  }
-
-  public Map getHeaders()
-  {
-    return headers;
-  }
-
-  public byte[] getPayload()
-  {
-    return payload;
-  }
-
-  public void setPayload(byte[] payload)
-  {
-    this.payload = payload;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/HTTPTransport.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/HTTPTransport.java
deleted file mode 100644
index 7d5c2c429..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/HTTPTransport.java
+++ /dev/null
@@ -1,501 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060131   125777 jesper@selskabet.org - Jesper S Moller
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.transport;
-
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.net.Socket;
-import java.net.SocketTimeoutException;
-import java.net.URL;
-import java.net.UnknownHostException;
-import java.util.Hashtable;
-import javax.net.ssl.SSLSocketFactory;
-import org.eclipse.wst.ws.internal.explorer.platform.util.XMLUtils;
-import org.w3c.dom.Element;
-import sun.misc.BASE64Encoder;
-
-public class HTTPTransport
-{
-  private final String SYS_PROP_HTTPS_PROXY_HOST = "https.proxyHost";
-  private final String SYS_PROP_HTTPS_PROXY_PORT = "https.proxyPort";
-  private final String SYS_PROP_HTTP_PROXY_HOST = "http.proxyHost";
-  private final String SYS_PROP_HTTP_PROXY_PORT = "http.proxyPort";
-  private final String SYS_PROP_HTTP_PROXY_USER_NAME = "http.proxyUserName";
-  private final String SYS_PROP_HTTP_PROXY_PASSWORD = "http.proxyPassword";
-
-  private final String HTTP_METHOD = "POST";
-  private final String HTTP_VERSION = "HTTP/1.1";
-  private final String HTTP_HEADER_SOAP_ACTION = "SOAPAction";
-  public static final String HTTP_HEADER_AUTH = "Authorization";
-  public static final String HTTP_HEADER_WWW_AUTH = "WWW-Authenticate";
-  private final String HTTP_HEADER_PROXY_AUTH = "Proxy-authorization";
-  private final String HTTP_HEADER_COOKIE = "Cookie";
-  private final String HTTP_HEADER_COOKIE2 = "Cookie2";
-  private final String HTTP_HEADER_HOST = "Host";
-  private final String HTTP_HEADER_CONTENT_TYPE = "Content-Type";
-  public static final String HTTP_HEADER_CONTENT_LENGTH = "Content-Length";
-  private final String HTTP_HEADER_ACCEPT = "Accept";
-  private final String HTTP_HEADER_USER_AGENT = "User-Agent";
-  private final String HTTP_HEADER_CACHE_CONTROL = "Cache-Control";
-  private final String HTTP_HEADER_PRAGMA = "Pragma";
-  private final String HTTP_HEADER_TRANSFER_ENCODEING = "Transfer-Encoding";
-  private final String HTTP_HEADER_CONNECTION = "Connection";
-  
-  private final int HTTP_CODE_CONTINUE = 100;
-  //private final int HTTP_CODE_OK = 200;
-  private final int HTTP_CODE_EXCEPTION = 300;
-
-  private final String IBM_WEB_SERVICES_EXPLORER = "IBM Web Services Explorer";
-  private final String TEXT_XML = "text/xml";
-  private final String CONTENT_TYPE_VALUE = "text/xml; charset=utf-8";
-  private final String ACCEPT_VALUE = "application/soap+xml, application/dime, multipart/related, text/*";
-  public static final String BASIC = "Basic";
-  private final String NO_CACHE = "no-cache";
-  private final String CHUNKED = "chunked";
-  private final String CLOSE = "close";
-  private final String HTTPS = "https";
-  private final char QUOTE = '\"';
-  public static final char COLON = ':';
-  private final char SPACE = ' ';
-  private final char TAB = '\t';
-  private final char R = '\r';
-  private final char N = '\n';
-  private final char ROOT = '/';
-  private final String NEW_LINE = "\r\n";
-  private final String EMPTY_STRING = "";
-
-  private final int DEFAULT_HTTP_PORT = 80;
-  private final int DEFAULT_HTTPS_PORT = 443;
-  private final String DEFAULT_SOAP_ENCODING = "UTF-8";
-  private final String DEFAULT_HTTP_HEADER_ENCODING = "iso-8859-1";
-
-  private String httpBasicAuthUsername;
-  private String httpBasicAuthPassword;
-  private boolean maintainSession = false;
-  private String cookie;
-  private String cookie2;
-  private HTTPResponse httpResponse;
-
-  public String getHttpBasicAuthUsername()
-  {
-    return httpBasicAuthUsername;
-  }
-  
-  public void setHttpBasicAuthUsername(String httpBasicAuthUsername)
-  {
-    this.httpBasicAuthUsername = httpBasicAuthUsername;
-  }
-  
-  public String getHttpBasicAuthPassword()
-  {
-    return httpBasicAuthPassword;
-  }
-  
-  public void setHttpBasicAuthPassword(String httpBasicAuthPassword)
-  {
-    this.httpBasicAuthPassword = httpBasicAuthPassword;
-  }
-
-  private String getMethod(URL url)
-  {
-    StringBuffer sb = new StringBuffer(HTTP_METHOD);
-    sb.append(SPACE);
-    String protocol = url.getProtocol();
-    String httpProxyHost = System.getProperty(SYS_PROP_HTTP_PROXY_HOST);
-    String httpsProxyHost = System.getProperty(SYS_PROP_HTTPS_PROXY_HOST);
-    if (protocol.equalsIgnoreCase("http") && httpProxyHost != null && httpProxyHost.length() > 0)
-    {
-      sb.append(url.toString());
-    }
-    else if (protocol.equalsIgnoreCase("https") && httpsProxyHost != null && httpsProxyHost.length() > 0)
-    {
-      sb.append(url.toString());
-    }
-    else
-    {
-      String file = url.getFile();
-      if (file != null && file.length() > 0)
-        sb.append(file);
-      else
-        sb.append(ROOT);
-    }
-    sb.append(SPACE);
-    sb.append(HTTP_VERSION);
-    sb.append(NEW_LINE);
-    return sb.toString();
-  }
-
-  private String getHost(URL url)
-  {
-    StringBuffer sb = new StringBuffer(HTTP_HEADER_HOST);
-    sb.append(COLON);
-    sb.append(SPACE);
-    sb.append(url.getHost());
-    sb.append(COLON);
-    int port = url.getPort();
-    if (port > 0)
-      sb.append(String.valueOf(port));
-    else if (url.getProtocol().equalsIgnoreCase(HTTPS))
-      sb.append(DEFAULT_HTTPS_PORT);
-    else
-      sb.append(DEFAULT_HTTP_PORT);
-    sb.append(NEW_LINE);
-    return sb.toString();
-  }
-  
-  private String getContentType()
-  {
-    return getHTTPHeader(HTTP_HEADER_CONTENT_TYPE, CONTENT_TYPE_VALUE);
-  }
-  
-  private String getContentLength(String payload)
-  {
-    return getHTTPHeader(HTTP_HEADER_CONTENT_LENGTH, String.valueOf(payload.length()));
-  }
-
-  private String getSOAPAction(String soapAction)
-  {
-    StringBuffer sb = new StringBuffer(HTTP_HEADER_SOAP_ACTION);
-    sb.append(COLON);
-    sb.append(SPACE);
-    sb.append(QUOTE);
-    if (soapAction != null)
-      sb.append(soapAction);
-    sb.append(QUOTE);
-    sb.append(NEW_LINE);
-    return sb.toString();
-  }
-  
-  private String getCookie()
-  {
-    if (maintainSession)
-      return getHTTPHeader(HTTP_HEADER_COOKIE, cookie);
-    else
-      return EMPTY_STRING;
-  }
-  
-  private String getCookie2()
-  {
-    if (maintainSession)
-      return getHTTPHeader(HTTP_HEADER_COOKIE2, cookie2);
-    else
-      return EMPTY_STRING;
-  }
-  
-  private String getWWWAuthentication()
-  {
-    if (httpBasicAuthUsername != null && httpBasicAuthPassword != null)
-    {
-      StringBuffer sb = new StringBuffer(httpBasicAuthUsername);
-      sb.append(COLON);
-      sb.append(httpBasicAuthPassword);
-      BASE64Encoder encoder = new BASE64Encoder();
-      String encodedUserNamePassword = encoder.encode(sb.toString().getBytes());
-      sb.setLength(0);
-      sb.append(HTTP_HEADER_AUTH);
-      sb.append(COLON);
-      sb.append(SPACE);
-      sb.append(BASIC);
-      sb.append(SPACE);
-      sb.append(encodedUserNamePassword);
-      sb.append(NEW_LINE);
-      return sb.toString();
-    }
-    else
-      return EMPTY_STRING;
-  }
-  
-  private String getProxyAuthentication()
-  {
-    String proxyUserName = System.getProperty(SYS_PROP_HTTP_PROXY_USER_NAME);
-    String proxyPassword = System.getProperty(SYS_PROP_HTTP_PROXY_PASSWORD);
-    if (proxyUserName != null && proxyPassword != null)
-    {
-      StringBuffer sb = new StringBuffer(proxyUserName);
-      sb.append(COLON);
-      sb.append(proxyPassword);
-      BASE64Encoder encoder = new BASE64Encoder();
-      String encodedUserNamePassword = encoder.encode(sb.toString().getBytes());
-      sb.setLength(0);
-      sb.append(HTTP_HEADER_PROXY_AUTH);
-      sb.append(COLON);
-      sb.append(SPACE);
-      sb.append(BASIC);
-      sb.append(SPACE);
-      sb.append(encodedUserNamePassword);
-      sb.append(NEW_LINE);
-      return sb.toString();
-    }
-    else
-      return EMPTY_STRING;
-  }
-  
-  private String getAccept()
-  {
-    return getHTTPHeader(HTTP_HEADER_ACCEPT, ACCEPT_VALUE);
-  }
-  
-  private String getUserAgent()
-  {
-    return getHTTPHeader(HTTP_HEADER_USER_AGENT, IBM_WEB_SERVICES_EXPLORER);
-  }
-  
-  private String getCacheControl()
-  {
-    return getHTTPHeader(HTTP_HEADER_CACHE_CONTROL, NO_CACHE);
-  }
-  
-  private String getPragma()
-  {
-    return getHTTPHeader(HTTP_HEADER_PRAGMA, NO_CACHE);
-  }
-  
-  private String getConnection()
-  {
-    return getHTTPHeader(HTTP_HEADER_CONNECTION, CLOSE);
-  }
-  
-  private String getHTTPHeader(String key, String value)
-  {
-    if (value != null)
-    {
-      StringBuffer sb = new StringBuffer(key);
-      sb.append(COLON);
-      sb.append(SPACE);
-      sb.append(value);
-      sb.append(NEW_LINE);
-      return sb.toString();
-    }
-    else
-      return EMPTY_STRING;
-  }
-
-  public void send(URL url, String soapAction, String payload) throws UnknownHostException, IOException
-  {
-    StringBuffer httpHeader = new StringBuffer();
-    httpHeader.append(getMethod(url));
-    httpHeader.append(getHost(url));
-    httpHeader.append(getContentType());
-    httpHeader.append(getContentLength(payload));
-    httpHeader.append(getAccept());
-    httpHeader.append(getUserAgent());
-    httpHeader.append(getCacheControl());
-    httpHeader.append(getPragma());
-    httpHeader.append(getSOAPAction(soapAction));
-    httpHeader.append(getWWWAuthentication());
-    httpHeader.append(getProxyAuthentication());
-    httpHeader.append(getCookie());
-    httpHeader.append(getCookie2());
-    httpHeader.append(getConnection());
-    httpHeader.append(NEW_LINE); // new line between the HTTP header and the payload
-    Socket socket = buildSocket(url);
-    InputStream is = socket.getInputStream();
-    OutputStream os = socket.getOutputStream();
-    os.write(httpHeader.toString().getBytes(DEFAULT_HTTP_HEADER_ENCODING));
-    os.write(payload.getBytes(DEFAULT_SOAP_ENCODING));
-    os.flush();
-    httpResponse = new HTTPResponse();
-    readHTTPResponseHeader(is, httpResponse);
-    int code = httpResponse.getStatusCode();
-    if (code == HTTP_CODE_CONTINUE)
-    {
-      httpResponse.reset();
-      readHTTPResponseHeader(is, httpResponse);
-    }
-    readHTTPResponsePayload(is, httpResponse);
-    os.close();
-    is.close();
-    socket.close();
-    code = httpResponse.getStatusCode();
-    String contentType = httpResponse.getHeader(HTTP_HEADER_CONTENT_TYPE.toLowerCase());
-    if (code >= HTTP_CODE_EXCEPTION && (contentType == null || contentType.toLowerCase().indexOf(TEXT_XML.toLowerCase()) == -1))
-      throw new HTTPException(code, httpResponse.getStatusMessage(), httpResponse.getHeaders());
-  }
-
-  private void readHTTPResponseHeader(InputStream is, HTTPResponse resp) throws IOException
-  {
-    byte b = 0;
-    int len = 0;
-    int colonIndex = -1;
-    String key;
-    String value;
-    boolean readTooMuch = false;
-    ByteArrayOutputStream baos;
-    for (baos = new ByteArrayOutputStream(4096);;)
-    {
-      if (!readTooMuch)
-        b = (byte)is.read();
-      if (b == -1)
-        break;
-      readTooMuch = false;
-      if ((b != R) && (b != N))
-      {
-        if ((b == COLON) && (colonIndex == -1))
-          colonIndex = len;
-        len++;
-        baos.write(b);
-      }
-      else if (b == R)
-        continue;
-      else // b == N
-      {
-        if (len == 0)
-          break;
-        b = (byte)is.read();
-        readTooMuch = true;
-        // A space or tab at the begining of a line means the header continues.
-        if ((b == SPACE) || (b == TAB))
-          continue;
-        baos.close();
-        byte[] bArray = baos.toByteArray();
-        baos.reset();
-        if (colonIndex != -1)
-        {
-          key = new String(bArray, 0, colonIndex, DEFAULT_HTTP_HEADER_ENCODING);
-          value = new String(bArray, colonIndex + 1, len - 1 - colonIndex, DEFAULT_HTTP_HEADER_ENCODING);
-          colonIndex = -1;
-        }
-        else
-        {
-          key = new String(bArray, 0, len, DEFAULT_HTTP_HEADER_ENCODING);
-          value = EMPTY_STRING;
-        }
-        if (!resp.isStatusSet())
-        {
-          // Reader status code
-          int start = key.indexOf(SPACE) + 1;
-          String s = key.substring(start).trim();
-          int end = s.indexOf(SPACE);
-          if (end != -1)
-            s = s.substring(0, end);
-          try
-          {
-            resp.setStatusCode(Integer.parseInt(s));
-          }
-          catch (NumberFormatException nfe)
-          {
-            resp.setStatusCode(-1);
-          }
-          resp.setStatusMessage(key.substring(start + end + 1));
-        }
-        else
-          resp.addHeader(key.toLowerCase().trim(), value.trim());
-        len = 0;
-      }
-    }
-    baos.close();
-  }
-
-  private void readHTTPResponsePayload(InputStream is, HTTPResponse resp) throws IOException
-  {
-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    try
-    {
-      byte b = (byte)is.read();
-      while (b != -1)
-      {
-        baos.write(b);
-        b = (byte)is.read();
-      }
-    }
-    catch (SocketTimeoutException ste)
-    {
-    }
-    baos.close();
-    resp.setPayload(baos.toByteArray());
-  }
-
-  public BufferedReader receive()
-  {
-    if (httpResponse != null)
-    {
-      try
-      {
-        byte[] payload = httpResponse.getPayload();
-        Element soapEnvelope = null;
-        if (CHUNKED.equalsIgnoreCase(httpResponse.getHeader(HTTP_HEADER_TRANSFER_ENCODEING.toLowerCase())))
-        {
-          ByteArrayInputStream bais = new ByteArrayInputStream(payload);
-          ChunkedInputStream cis = new ChunkedInputStream(bais);
-          ByteArrayOutputStream baos = new ByteArrayOutputStream();
-          byte b;
-          while ((b = (byte)cis.read()) != -1)
-            baos.write(b);
-          baos.close();
-          cis.close();
-          bais.close();
-          soapEnvelope = XMLUtils.byteArrayToElement(baos.toByteArray(), false);
-        }
-        else
-        {
-          soapEnvelope = XMLUtils.byteArrayToElement(payload, false);
-        }
-        // remove XML namespace declaration
-        if (soapEnvelope != null)
-          return new BufferedReader(new InputStreamReader(new ByteArrayInputStream(XMLUtils.serialize(soapEnvelope, true).getBytes(DEFAULT_SOAP_ENCODING)), DEFAULT_SOAP_ENCODING));
-      }
-      catch (Throwable t)
-      {
-      }
-    }
-    return null;
-  }
-
-  public Hashtable getHeaders()
-  {
-    Hashtable headers = new Hashtable();
-    if (httpResponse != null)
-      headers.putAll(httpResponse.getHeaders());
-    return headers;
-  }
-
-  private Socket buildSocket(URL url) throws UnknownHostException, IOException
-  {
-    Socket s = null;
-    String host = url.getHost();
-    int port = url.getPort();
-    String proxyHost = System.getProperty(SYS_PROP_HTTP_PROXY_HOST);
-    int proxyPort = Integer.getInteger(SYS_PROP_HTTP_PROXY_PORT, DEFAULT_HTTP_PORT).intValue();
-//    String proxyUserName = System.getProperty(SYS_PROP_HTTP_PROXY_USER_NAME);
-//    String proxyPassword = System.getProperty(SYS_PROP_HTTP_PROXY_PASSWORD);
-    if (url.getProtocol().equalsIgnoreCase(HTTPS))
-    {
-      proxyHost = System.getProperty(SYS_PROP_HTTPS_PROXY_HOST);
-      proxyPort = Integer.getInteger(SYS_PROP_HTTPS_PROXY_PORT, DEFAULT_HTTPS_PORT).intValue();
-      if (proxyHost != null && proxyHost.length() > 0)
-      {
-        // TODO:
-        // SSL with proxy server
-      }
-      else
-        s = SSLSocketFactory.getDefault().createSocket(host, (port > 0 ? port : DEFAULT_HTTPS_PORT));
-      // Removing dependency on soap.jar
-      //  s = SSLUtils.buildSSLSocket(host, (port > 0 ? port : DEFAULT_HTTPS_PORT), proxyHost, proxyPort);
-      // TODO:
-      // Build an SSL socket that supports proxyUser and proxyPassword,
-      // as demonstrated in the following (original) line of code:
-      //  s = SSLUtils.buildSSLSocket(host, (port > 0 ? port : DEFAULT_HTTPS_PORT), proxyHost, proxyPort, proxyUserName, proxyPassword);
-    }
-    else if (proxyHost != null && proxyHost.length() > 0)
-      s = new Socket(proxyHost, proxyPort);
-    else
-      s = new Socket(host, (port > 0 ? port : DEFAULT_HTTP_PORT));
-    return s;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/util/SoapHelper.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/util/SoapHelper.java
deleted file mode 100644
index 9fe9f2d51..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/util/SoapHelper.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.util;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import org.apache.axis.Constants;
-import org.eclipse.wst.ws.internal.explorer.platform.util.URLUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class SoapHelper
-{
-  private static Hashtable defaultSoapEnvelopeNamespaces_ = null;
-  
-  private static final void initDefaultSoapEnvelopeNamespaces()
-  {
-    defaultSoapEnvelopeNamespaces_ = new Hashtable();
-    defaultSoapEnvelopeNamespaces_.put(Constants.URI_SOAP11_ENV,Constants.NS_PREFIX_SOAP_ENV);
-    defaultSoapEnvelopeNamespaces_.put(Constants.URI_2001_SCHEMA_XSI,Constants.NS_PREFIX_SCHEMA_XSI);
-    defaultSoapEnvelopeNamespaces_.put(Constants.URI_2001_SCHEMA_XSD,Constants.NS_PREFIX_SCHEMA_XSD);
-  }
-  
-  public static final void addDefaultSoapEnvelopeNamespaces(Hashtable soapEnvelopeNamespaces)
-  {
-    if (defaultSoapEnvelopeNamespaces_ == null)
-      initDefaultSoapEnvelopeNamespaces();
-    Enumeration defaultSoapEnvelopeNamespaceURIs = defaultSoapEnvelopeNamespaces_.keys();
-    while (defaultSoapEnvelopeNamespaceURIs.hasMoreElements())
-    {
-      String defaultSoapEnvelopeNamespaceURI = (String)defaultSoapEnvelopeNamespaceURIs.nextElement();
-      soapEnvelopeNamespaces.put(defaultSoapEnvelopeNamespaceURI,(String)defaultSoapEnvelopeNamespaces_.get(defaultSoapEnvelopeNamespaceURI));
-    }
-  }
-  
-  public static final boolean isDefaultSoapEnvelopeNamespace(String namespaceURI,String namespacePrefix)
-  {
-    if (defaultSoapEnvelopeNamespaces_ == null)
-      initDefaultSoapEnvelopeNamespaces();
-    if (defaultSoapEnvelopeNamespaces_.get(namespaceURI) != null)
-      return true;
-    return false;
-  }  
-  
-  public static final Element createSoapEnvelopeElement(Document doc,Hashtable soapEnvelopeNamespaceTable)
-  {
-    Element soapEnvelopeElement = doc.createElement("soapenv:Envelope");
-    Enumeration e = soapEnvelopeNamespaceTable.keys();
-    while (e.hasMoreElements())
-    {
-      String soapEnvelopeNamespaceURI = (String)e.nextElement();
-      StringBuffer soapEnvelopeNamespaceAttr = new StringBuffer("xmlns:");
-      soapEnvelopeNamespaceAttr.append((String)soapEnvelopeNamespaceTable.get(soapEnvelopeNamespaceURI));
-      soapEnvelopeElement.setAttribute(soapEnvelopeNamespaceAttr.toString(),soapEnvelopeNamespaceURI);      
-    }    
-    return soapEnvelopeElement;
-  }
-  
-  public static final Element createSoapBodyElement(Document doc)
-  {
-    return doc.createElement("soapenv:Body");
-  }
-  
-  public static final Element createRPCWrapperElement(Document doc,Hashtable soapEnvelopeNamespaceTable,String encodingNamespaceURI,String operationName, String encodingStyle)
-  {
-    int nsId = 0;
-    StringBuffer wrapperElementName = new StringBuffer();
-    String encodingNamespacePrefix = (String)soapEnvelopeNamespaceTable.get(encodingNamespaceURI);
-    if (encodingNamespacePrefix != null)
-      wrapperElementName.append(encodingNamespacePrefix);
-    else
-    {
-      // Loop until we generate a unique prefix.
-      do
-      {
-        wrapperElementName.setLength(0);
-        wrapperElementName.append("ns").append(nsId);
-        if (!soapEnvelopeNamespaceTable.containsValue(wrapperElementName.toString()))
-          break;
-        nsId++;
-      } while (true);
-    }    
-    String wrapperElementNamePrefix = wrapperElementName.toString();
-    wrapperElementName.append(':').append(operationName);
-    Element wrapperElement = doc.createElement(wrapperElementName.toString());
-    StringBuffer namespaceAttrName = new StringBuffer("xmlns:");
-    namespaceAttrName.append(wrapperElementNamePrefix);
-    wrapperElement.setAttribute(namespaceAttrName.toString(),encodingNamespaceURI);
-    if (encodingStyle != null)
-      wrapperElement.setAttribute("soapenv:encodingStyle",encodingStyle);
-    return wrapperElement;
-  }
-
-  public static final String encodeNamespaceDeclaration(String prefix, String uri)
-  {
-    StringBuffer sb = new StringBuffer();
-    sb.append(prefix);
-    sb.append(" ");
-    sb.append(uri);
-    String result = URLUtils.encode(sb.toString());
-    return result;
-  }
-
-  public static final String[] decodeNamespaceDeclaration(String s)
-  {
-    String sCopy = URLUtils.decode(s);
-    int index = sCopy.indexOf(" ");
-    String[] nsDecl = new String[2];
-    if (index != -1)
-    {
-      nsDecl[0] = sCopy.substring(0, index);
-      nsDecl[1] = sCopy.substring(index+1, sCopy.length());
-    }
-    else
-    {
-      nsDecl[0] = null;
-      nsDecl[1] = sCopy;
-    }
-    return nsDecl;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/xsd/WSDLPartsToXSDTypeMapper.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/xsd/WSDLPartsToXSDTypeMapper.java
deleted file mode 100644
index 13f3d7ec1..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/xsd/WSDLPartsToXSDTypeMapper.java
+++ /dev/null
@@ -1,143 +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.wst.ws.internal.explorer.platform.wsdl.xsd;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Vector;
-import javax.wsdl.Part;
-import javax.xml.namespace.QName;
-import org.eclipse.xsd.XSDComponent;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDModelGroupDefinition;
-import org.eclipse.xsd.XSDNamedComponent;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDTypeDefinition;
-
-public class WSDLPartsToXSDTypeMapper
-{
-  private final char POUND = '#';
-  private Vector xsdSchemaList_;
-  private Hashtable partToXSDCache_;
-
-  public WSDLPartsToXSDTypeMapper() {
-    xsdSchemaList_ = new Vector();
-    partToXSDCache_ = new Hashtable();
-  }
-
-  public void addSchemas(Vector schemaList) {
-    for (int i=0;i<schemaList.size();i++) {
-      Object schema = schemaList.elementAt(i);
-      if (schema != null)
-        xsdSchemaList_.addElement(schema);
-    }
-  }
-
-  public XSDNamedComponent getXSDType(Part part, String id) {
-    XSDNamedComponent component = getXSDTypeFromCache(id);
-    if (component != null)
-      return component;
-    component = getXSDTypeFromSchema(part);
-    if (component != null)
-      addToCache(id, component);
-    return component;
-  }
-
-  public XSDNamedComponent getXSDTypeFromCache(String id) {
-    return (XSDNamedComponent)partToXSDCache_.get(id);
-  }
-
-  public XSDNamedComponent getXSDTypeFromSchema(Part part) {
-    boolean isElementDeclaration = (part.getTypeName() == null);
-    QName qName = isElementDeclaration ? part.getElementName() : part.getTypeName();
-    return getXSDTypeFromSchema(qName.getNamespaceURI(), qName.getLocalPart(), isElementDeclaration);
-  }
-
-  public XSDNamedComponent getXSDTypeFromSchema(String namespaceURI, String localName, boolean isElementDeclaration) {
-    for (int i = 0; i < xsdSchemaList_.size(); i++) {
-      XSDSchema xsdSchema = (XSDSchema)xsdSchemaList_.elementAt(i);
-      Vector components = new Vector();
-      if (isElementDeclaration)
-        components.addAll(xsdSchema.getElementDeclarations());
-      else
-        components.addAll(xsdSchema.getTypeDefinitions());
-      for (Iterator it = components.iterator(); it.hasNext(); ) {
-        XSDNamedComponent component  = (XSDNamedComponent)it.next();
-        String compNSURI = component.getTargetNamespace();
-        String compLocalname = component.getName();
-        if (compNSURI != null && compLocalname != null && compNSURI.equals(namespaceURI) && compLocalname.equals(localName))
-          return component;
-      }
-    }
-    return null;
-  }
-
-  public XSDNamedComponent resolveXSDNamedComponent(XSDNamedComponent component)
-  {
-    if (component != null)
-    {
-      String uri = component.getURI();
-      String qname = component.getQName();
-      for (int i = 0; i < xsdSchemaList_.size(); i++)
-      {
-        XSDSchema xsdSchema = (XSDSchema)xsdSchemaList_.elementAt(i);
-        if (xsdSchema != null)
-        {
-          String targetNS = xsdSchema.getTargetNamespace();
-          if (targetNS != null && targetNS.equals(trimQName(uri, qname)))
-          {
-            XSDNamedComponent resolvedComponent = null;
-            if (component instanceof XSDTypeDefinition)
-              resolvedComponent = xsdSchema.resolveTypeDefinition(qname);
-            else if (component instanceof XSDElementDeclaration)
-              resolvedComponent = xsdSchema.resolveElementDeclaration(qname);
-            else if (component instanceof XSDModelGroupDefinition)
-              resolvedComponent = xsdSchema.resolveModelGroupDefinition(qname);
-            if (isComponentResolvable(resolvedComponent))
-              return resolvedComponent;
-          }
-        }
-      }
-    }
-    return null;
-  }
-
-  private String trimQName(String uri, String qname)
-  {
-    int index = uri.indexOf(qname);
-    if (index != -1)
-    {
-      String ns = uri.substring(0, index);
-      if (ns.charAt(index-1) == POUND)
-        return ns.substring(0, index-1);
-      else
-        return ns;
-    }
-    else
-      return uri;
-  }
-
-  private void addToCache(String id, XSDNamedComponent component) {
-    partToXSDCache_.put(id,component);
-  }
-
-  protected boolean isComponentResolvable(XSDComponent component)
-  {
-    if (component == null)
-      return false;
-    XSDSchema schema = component.getSchema();
-    if (schema == null)
-      return false;
-    if (schema.getTargetNamespace() == null)
-      return false;
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddBusinessToFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddBusinessToFavoritesAction.java
deleted file mode 100644
index 242458e32..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddBusinessToFavoritesAction.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.wst.ws.internal.explorer.platform.wsil.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilUddiBusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer.WSILViewSelectionTransformer;
-
-public class AddBusinessToFavoritesAction extends AddToFavoritesAction
-{
-  public AddBusinessToFavoritesAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  public boolean favoriteExists()
-  {
-    int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
-    int viewID = Integer.parseInt((String) propertyTable_.get(ActionInputs.VIEWID));
-    Node selectedNode = nodeManager_.getNode(nodeID);
-    WsilElement selectedElement = (WsilElement) selectedNode.getTreeElement();
-    Object obj = selectedElement.getAllUDDILinks().getElementWithViewId(viewID).getObject();
-    WsilUddiBusinessElement wsilUddiBusinessElement = (WsilUddiBusinessElement) obj;
-    String businessName = wsilUddiBusinessElement.getName();
-    String inquiryAPI = wsilUddiBusinessElement.getUDDILinkInquiryAPI();
-    String businessKey = wsilUddiBusinessElement.getUDDILinkBusinessKey();
-    if (businessName == null)
-      businessName = businessKey;
-    Hashtable table = new Hashtable();
-    table.put(FavoritesModelConstants.PROP_UDDI_BUSINESS_NAME, businessName);
-    table.put(FavoritesModelConstants.PROP_UDDI_BUSINESS_INQUIRY_API, inquiryAPI);
-    table.put(FavoritesModelConstants.PROP_UDDI_BUSINESS_KEY, businessKey);
-    return favoriteExists(table, FavoritesModelConstants.REL_UDDI_BUSINESS_FOLDER_NODE);
-  }
-
-  public ITransformer[] getTransformers()
-  {
-    ITransformer[] parentTransformers = super.getTransformers();
-    ITransformer[] transformers = new ITransformer[parentTransformers.length+1];
-    System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
-    transformers[transformers.length-1] = new WSILViewSelectionTransformer(controller_, WsilModelConstants.LIST_MANAGER_UDDI_LINKS, ActionInputs.VIEWID, WSILViewSelectionTransformer.UDDI_BUSINESS);
-    return transformers;
-  }
-
-  public boolean executeSingleLinkAction()
-  {
-    int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
-    int viewID = Integer.parseInt((String) propertyTable_.get(ActionInputs.VIEWID));
-    WSILPerspective wsilPerspective = controller_.getWSILPerspective();
-    Node selectedNode = nodeManager_.getNode(nodeID);
-    WsilElement selectedElement = (WsilElement) selectedNode.getTreeElement();
-    Object obj = selectedElement.getAllUDDILinks().getElementWithViewId(viewID).getObject();
-    WsilUddiBusinessElement wsilUddiBusinessElement = (WsilUddiBusinessElement) obj;
-    String businessName = wsilUddiBusinessElement.getName();
-    String inquiryAPI = wsilUddiBusinessElement.getUDDILinkInquiryAPI();
-    String businessKey = wsilUddiBusinessElement.getUDDILinkBusinessKey();
-    if (businessName == null)
-      businessName = businessKey;
-    Hashtable table = new Hashtable();
-    table.put(FavoritesModelConstants.PROP_UDDI_BUSINESS_NAME, businessName);
-    table.put(FavoritesModelConstants.PROP_UDDI_BUSINESS_INQUIRY_API, inquiryAPI);
-    table.put(FavoritesModelConstants.PROP_UDDI_BUSINESS_KEY, businessKey);
-    if (isMultipleLinkAction() && favoriteExists(table, FavoritesModelConstants.REL_UDDI_BUSINESS_FOLDER_NODE))
-    {
-      wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_FAVORITES_ALREADY_EXISTS", businessName));
-      return false;
-    }
-    if (addToFavorites(table, FavoritesModelConstants.REL_UDDI_BUSINESS_FOLDER_NODE))
-    {
-      wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_INFO_ADD_TO_FAVORITES_SUCCESSFUL", businessName));
-      return true;
-    }
-    else
-    {
-      wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_ADD_TO_FAVORITES", businessName));
-      return false;
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddBusinessToUDDIPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddBusinessToUDDIPerspectiveAction.java
deleted file mode 100644
index f262b83fd..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddBusinessToUDDIPerspectiveAction.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.wsil.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.RegFindBusinessUUIDAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilUddiBusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer.WSILViewSelectionTransformer;
-
-public class AddBusinessToUDDIPerspectiveAction extends AddToUDDIPerspectiveAction
-{
-  public AddBusinessToUDDIPerspectiveAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  public ITransformer[] getTransformers()
-  {
-    ITransformer[] parentTransformers = super.getTransformers();
-    ITransformer[] transformers = new ITransformer[parentTransformers.length+1];
-    System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
-    transformers[transformers.length-1] = new WSILViewSelectionTransformer(controller_, WsilModelConstants.LIST_MANAGER_UDDI_LINKS, ActionInputs.VIEWID, WSILViewSelectionTransformer.UDDI_BUSINESS);
-    return transformers;
-  }
-
-  public boolean executeSingleLinkAction()
-  {
-    int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
-    int viewID = Integer.parseInt((String) propertyTable_.get(ActionInputs.VIEWID));
-    WSILPerspective wsilPerspective = controller_.getWSILPerspective();
-    Node selectedNode = wsilPerspective.getNodeManager().getNode(nodeID);
-    TreeElement selectedElement = selectedNode.getTreeElement();
-    String inquiryURL = null;
-    String businessKey = null;
-    String businessName = null;
-    if (selectedElement instanceof WsilElement)
-    {
-      ListElement le = ((WsilElement) selectedElement).getAllUDDILinks().getElementWithViewId(viewID);
-      WsilUddiBusinessElement wsilUddiBusinessElement = (WsilUddiBusinessElement) le.getObject();
-      inquiryURL = wsilUddiBusinessElement.getUDDILinkInquiryAPI();
-      businessKey = wsilUddiBusinessElement.getUDDILinkBusinessKey();
-      businessName = wsilUddiBusinessElement.getName();
-      if (businessName == null)
-        businessName = businessKey;
-    }
-    else
-      return false;
-    // return false if unable to find or create a registry node/element in the
-    // UDDI perspective
-    if (!createRegistryInUDDIPerspective(inquiryURL, null, inquiryURL))
-    {
-      wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_ADD_TO_UDDI_PERSPECTIVE", businessName));
-      return false;
-    }
-    // prepare the action
-    RegFindBusinessUUIDAction action = new RegFindBusinessUUIDAction(controller_);
-    // populate property table
-    Hashtable propertyTable = action.getPropertyTable();
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY, businessKey);
-    propertyTable.put(UDDIActionInputs.QUERY_NAME, businessName);
-    // run the action
-    if (!action.run())
-    {
-      wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_BUSINESS_NOT_FOUND", businessName));
-      return false;
-    }
-    else
-    {
-      wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_INFO_ADD_TO_UDDI_PERSPECTIVE_SUCCESSFUL", businessName));
-      return true;
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddServiceToFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddServiceToFavoritesAction.java
deleted file mode 100644
index 466d94574..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddServiceToFavoritesAction.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.wst.ws.internal.explorer.platform.wsil.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilUddiServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer.WSILViewSelectionTransformer;
-
-public class AddServiceToFavoritesAction extends AddToFavoritesAction
-{
-  public AddServiceToFavoritesAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  public boolean favoriteExists()
-  {
-    int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
-    int viewID = Integer.parseInt((String) propertyTable_.get(ActionInputs.VIEWID));
-    Node selectedNode = nodeManager_.getNode(nodeID);
-    WsilElement selectedElement = (WsilElement) selectedNode.getTreeElement();
-    Object obj = selectedElement.getAllUDDIServices().getElementWithViewId(viewID).getObject();
-    WsilUddiServiceElement wsilUddiServiceElement = (WsilUddiServiceElement) obj;
-    String serviceName = wsilUddiServiceElement.getName();
-    String inquiryAPI = wsilUddiServiceElement.getUDDIServiceInquiryAPI();
-    String serviceKey = wsilUddiServiceElement.getUDDIServiceKey();
-    if (serviceName == null)
-      serviceName = serviceKey;
-    Hashtable table = new Hashtable();
-    table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_NAME, serviceName);
-    table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_INQUIRY_API, inquiryAPI);
-    table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_KEY, serviceKey);
-    return favoriteExists(table, FavoritesModelConstants.REL_UDDI_SERVICE_FOLDER_NODE);
-  }
-
-  public ITransformer[] getTransformers()
-  {
-    ITransformer[] parentTransformers = super.getTransformers();
-    ITransformer[] transformers = new ITransformer[parentTransformers.length+1];
-    System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
-    transformers[transformers.length-1] = new WSILViewSelectionTransformer(controller_, WsilModelConstants.LIST_MANAGER_UDDI_SERVICES, ActionInputs.VIEWID, WSILViewSelectionTransformer.UDDI_SERVICE);
-    return transformers;
-  }
-
-  public boolean executeSingleLinkAction()
-  {
-    int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
-    int viewID = Integer.parseInt((String) propertyTable_.get(ActionInputs.VIEWID));
-    WSILPerspective wsilPerspective = controller_.getWSILPerspective();
-    Node selectedNode = nodeManager_.getNode(nodeID);
-    WsilElement selectedElement = (WsilElement) selectedNode.getTreeElement();
-    Object obj = selectedElement.getAllUDDIServices().getElementWithViewId(viewID).getObject();
-    WsilUddiServiceElement wsilUddiServiceElement = (WsilUddiServiceElement) obj;
-    String serviceName = wsilUddiServiceElement.getName();
-    String inquiryAPI = wsilUddiServiceElement.getUDDIServiceInquiryAPI();
-    String serviceKey = wsilUddiServiceElement.getUDDIServiceKey();
-    if (serviceName == null)
-      serviceName = serviceKey;
-    Hashtable table = new Hashtable();
-    table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_NAME, serviceName);
-    table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_INQUIRY_API, inquiryAPI);
-    table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_KEY, serviceKey);
-    if (isMultipleLinkAction() && favoriteExists(table, FavoritesModelConstants.REL_UDDI_SERVICE_FOLDER_NODE))
-    {
-      wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_FAVORITES_ALREADY_EXISTS", serviceName));
-      return false;
-    }
-    if (addToFavorites(table, FavoritesModelConstants.REL_UDDI_SERVICE_FOLDER_NODE))
-    {
-      wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_INFO_ADD_TO_FAVORITES_SUCCESSFUL", serviceName));
-      return true;
-    }
-    else
-    {
-      wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_ADD_TO_FAVORITES", serviceName));
-      return false;
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddServiceToUDDIPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddServiceToUDDIPerspectiveAction.java
deleted file mode 100644
index e37eab15b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddServiceToUDDIPerspectiveAction.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.wsil.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.RegFindServiceUUIDAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilUddiServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer.WSILViewSelectionTransformer;
-
-public class AddServiceToUDDIPerspectiveAction extends AddToUDDIPerspectiveAction
-{
-  public AddServiceToUDDIPerspectiveAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  public ITransformer[] getTransformers()
-  {
-    ITransformer[] parentTransformers = super.getTransformers();
-    ITransformer[] transformers = new ITransformer[parentTransformers.length+1];
-    System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
-    transformers[transformers.length-1] = new WSILViewSelectionTransformer(controller_, WsilModelConstants.LIST_MANAGER_UDDI_SERVICES, ActionInputs.VIEWID, WSILViewSelectionTransformer.UDDI_SERVICE);
-    return transformers;
-  }
-
-  public boolean executeSingleLinkAction()
-  {
-    int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
-    int viewID = Integer.parseInt((String) propertyTable_.get(ActionInputs.VIEWID));
-    WSILPerspective wsilPerspective = controller_.getWSILPerspective();
-    Node selectedNode = wsilPerspective.getNodeManager().getNode(nodeID);
-    TreeElement selectedElement = selectedNode.getTreeElement();
-    String inquiryURL = null;
-    String serviceKey = null;
-    String serviceName = null;
-    if (selectedElement instanceof WsilElement)
-    {
-      ListElement le = ((WsilElement) selectedElement).getAllUDDIServices().getElementWithViewId(viewID);
-      WsilUddiServiceElement wsilUddiServiceElement = (WsilUddiServiceElement) le.getObject();
-      inquiryURL = wsilUddiServiceElement.getUDDIServiceInquiryAPI();
-      serviceKey = wsilUddiServiceElement.getUDDIServiceKey();
-      serviceName = wsilUddiServiceElement.getName();
-      if (serviceName == null)
-        serviceName = serviceKey;
-    }
-    else
-      return false;
-    // return false if unable to find or create a registry node/element in the
-    // UDDI perspective
-    if (!createRegistryInUDDIPerspective(inquiryURL, null, inquiryURL))
-    {
-      wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_ADD_TO_UDDI_PERSPECTIVE", serviceName));
-      return false;
-    }
-    // prepare the action
-    RegFindServiceUUIDAction action = new RegFindServiceUUIDAction(controller_);
-    // populate property table
-    Hashtable propertyTable = action.getPropertyTable();
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY, serviceKey);
-    propertyTable.put(UDDIActionInputs.QUERY_NAME, serviceName);
-    // run the action
-    if (!action.run())
-    {
-      wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_SERVICE_NOT_FOUND", serviceName));
-      return false;
-    }
-    else
-    {
-      wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_INFO_ADD_TO_UDDI_PERSPECTIVE_SUCCESSFUL", serviceName));
-      return true;
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddToFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddToFavoritesAction.java
deleted file mode 100644
index 575882402..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddToFavoritesAction.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.ws.internal.explorer.platform.wsil.actions;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListUDDIBusinessTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListUDDIServicesTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListWSDLServicesTool;
-
-public abstract class AddToFavoritesAction extends MultipleLinkAction {
-    protected NodeManager nodeManager_;
-
-    public AddToFavoritesAction(Controller controller)
-    {
-        super(controller);
-        nodeManager_ = controller.getWSILPerspective().getNodeManager();
-    }
-
-    public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID)
-    {
-        StringBuffer actionLink = new StringBuffer("wsil/actions/WsilCheckFavoriteExistsActionJSP.jsp?");
-        actionLink.append(ActionInputs.NODEID);
-        actionLink.append('=');
-        actionLink.append(nodeID);
-        actionLink.append('&');
-        actionLink.append(ActionInputs.TOOLID);
-        actionLink.append('=');
-        actionLink.append(toolID);
-        actionLink.append('&');
-        actionLink.append(ActionInputs.VIEWID);
-        actionLink.append('=');
-        actionLink.append(viewID);
-        actionLink.append('&');
-        actionLink.append(ActionInputs.VIEWTOOLID);
-        actionLink.append('=');
-        actionLink.append(viewToolID);
-        return actionLink.toString();
-    }
-
-    public static String getBaseActionLink() {
-        return "wsil/actions/WsilCheckFavoriteExistsActionJSP.jsp";
-    }
-
-    public static AddToFavoritesAction newAction(HttpServletRequest request, Controller controller) {
-      String nodeID = request.getParameter(ActionInputs.NODEID);
-      NodeManager nodeManager = controller.getWSILPerspective().getNodeManager();
-      Tool selectedTool = nodeManager.getNode(Integer.parseInt(nodeID)).getToolManager().getSelectedTool();
-      if (selectedTool instanceof ListWSDLServicesTool)
-        return new AddWSDLServiceToFavoritesAction(controller);
-      else if (selectedTool instanceof ListUDDIServicesTool)
-        return new AddServiceToFavoritesAction(controller);
-      else if (selectedTool instanceof ListUDDIBusinessTool)
-        return new AddBusinessToFavoritesAction(controller);
-      else
-        return new AddWSILToFavoritesAction(controller);
-    }
-
-    protected boolean addToFavorites(Hashtable table, String rel) {
-        FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
-        NodeManager favNodeManager = favPerspective.getNodeManager();
-        TreeElement favRootElement = favNodeManager.getRootNode().getTreeElement();
-        Enumeration e = favRootElement.getElements(rel);
-        if (!e.hasMoreElements()) return false;
-        FavoritesFolderElement favFolderElement = (FavoritesFolderElement)e.nextElement();
-        return favFolderElement.addFavorite(table);
-    }
-
-    protected boolean favoriteExists(Hashtable table, String rel) {
-        FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
-        NodeManager favNodeManager = favPerspective.getNodeManager();
-        TreeElement favRootElement = favNodeManager.getRootNode().getTreeElement();
-        Enumeration e = favRootElement.getElements(rel);
-        if (!e.hasMoreElements()) return false;
-        FavoritesFolderElement favFolderElement = (FavoritesFolderElement)e.nextElement();
-        return favFolderElement.favoriteExists(table);
-    }
-
-    public abstract boolean favoriteExists();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddToUDDIPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddToUDDIPerspectiveAction.java
deleted file mode 100644
index 246fea5af..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddToUDDIPerspectiveAction.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.Action;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.OpenRegistryAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegistryNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIMainNode;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListUDDIBusinessTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListUDDIServicesTool;
-
-public abstract class AddToUDDIPerspectiveAction extends MultipleLinkAction
-{
-  public AddToUDDIPerspectiveAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID)
-  {
-    StringBuffer actionLink = new StringBuffer("wsil/actions/WsilAddToUDDIPerspectiveActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID);
-    actionLink.append('=');
-    actionLink.append(nodeID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.TOOLID);
-    actionLink.append('=');
-    actionLink.append(toolID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.VIEWID);
-    actionLink.append('=');
-    actionLink.append(viewID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.VIEWTOOLID);
-    actionLink.append('=');
-    actionLink.append(viewToolID);
-    return actionLink.toString();
-  }
-
-  public static String getBaseActionLink()
-  {
-    return "wsil/actions/WsilAddToUDDIPerspectiveActionJSP.jsp";
-  }
-
-  public static Action newAction(HttpServletRequest request, Controller controller)
-  {
-    String nodeID = request.getParameter(ActionInputs.NODEID);
-    NodeManager nodeManager = controller.getWSILPerspective().getNodeManager();
-    Tool selectedTool = nodeManager.getNode(Integer.parseInt(nodeID)).getToolManager().getSelectedTool();
-    if (selectedTool instanceof ListUDDIServicesTool)
-      return new AddServiceToUDDIPerspectiveAction(controller);
-    else if (selectedTool instanceof ListUDDIBusinessTool)
-      return new AddBusinessToUDDIPerspectiveAction(controller);
-    else
-      return new NullAction();
-  }
-
-  protected boolean createRegistryInUDDIPerspective(String inquiryAPI, String publishAPI, String registryName)
-  {
-    Vector registryNodes = getRegistryNodesByInquiryURL(inquiryAPI);
-    if (registryNodes != null)
-    {
-      // Always attempt to use an existing registry.
-      Node registryNode = (Node) registryNodes.elementAt(0);
-      NodeManager nodeManager = registryNode.getNodeManager();
-      nodeManager.setSelectedNodeId(registryNode.getNodeId());
-      return true;
-    }
-    // open the registry if it is not already opened in the UDDI perspective
-    OpenRegistryAction openRegAction = new OpenRegistryAction(controller_);
-    // populate the property table
-    Hashtable propertyTable = openRegAction.getPropertyTable();
-    if (Validator.validateString(registryName))
-      propertyTable.put(UDDIActionInputs.REGISTRY_NAME, registryName);
-    else
-      return false;
-    if (Validator.validateURL(inquiryAPI))
-      propertyTable.put(UDDIActionInputs.INQUIRY_URL, inquiryAPI);
-    else
-      return false;
-    // run the action
-    if (!openRegAction.run())
-      return false;
-    return true;
-  }
-
-  protected Vector getRegistryNodesByInquiryURL(String inquiryURL)
-  {
-    Vector registryNodes = null;
-    NodeManager navigatorManager = controller_.getUDDIPerspective().getNavigatorManager();
-    UDDIMainNode uddiMainNode = (UDDIMainNode) (navigatorManager.getRootNode());
-    Vector childNodes = uddiMainNode.getChildNodes();
-    for (int i = 0; i < childNodes.size(); i++)
-    {
-      Node childNode = (Node) childNodes.elementAt(i);
-      if (childNode instanceof RegistryNode)
-      {
-        RegistryElement regElement = (RegistryElement) childNode.getTreeElement();
-        if (regElement.getInquiryURL().equals(inquiryURL))
-        {
-          if (registryNodes == null)
-            registryNodes = new Vector();
-          registryNodes.addElement(childNode);
-        }
-      }
-    }
-    return registryNodes;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddWSDLServiceToFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddWSDLServiceToFavoritesAction.java
deleted file mode 100644
index a39cfece8..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddWSDLServiceToFavoritesAction.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.wst.ws.internal.explorer.platform.wsil.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilWsdlServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer.WSILViewSelectionTransformer;
-
-public class AddWSDLServiceToFavoritesAction extends AddToFavoritesAction
-{
-  public AddWSDLServiceToFavoritesAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  public boolean favoriteExists()
-  {
-    String wsdlURL = getWsdlUrl();
-    Hashtable table = new Hashtable();
-    table.put(FavoritesModelConstants.PROP_WSDL_URL, wsdlURL);
-    return favoriteExists(table, FavoritesModelConstants.REL_WSDL_SERVICE_FOLDER_NODE);
-  }
-
-  public ITransformer[] getTransformers()
-  {
-    ITransformer[] parentTransformers = super.getTransformers();
-    ITransformer[] transformers = new ITransformer[parentTransformers.length+1];
-    System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
-    transformers[transformers.length-1] = new WSILViewSelectionTransformer(controller_, WsilModelConstants.LIST_MANAGER_WSDL_SERVICES, ActionInputs.VIEWID, WSILViewSelectionTransformer.WSDL_SERVICE);
-    return transformers;
-  }
-
-  public boolean executeSingleLinkAction()
-  {
-    WSILPerspective wsilPerspective = controller_.getWSILPerspective();
-    String wsdlURL = getWsdlUrl();
-    Hashtable table = new Hashtable();
-    table.put(FavoritesModelConstants.PROP_WSDL_URL, wsdlURL);
-    if (isMultipleLinkAction() && favoriteExists(table, FavoritesModelConstants.REL_WSDL_SERVICE_FOLDER_NODE))
-    {
-      wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_FAVORITES_ALREADY_EXISTS", wsdlURL));
-      return false;
-    }
-    if (addToFavorites(table, FavoritesModelConstants.REL_WSDL_SERVICE_FOLDER_NODE))
-    {
-      wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_INFO_ADD_TO_FAVORITES_SUCCESSFUL", wsdlURL));
-      return true;
-    }
-    else
-    {
-      wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_ADD_TO_FAVORITES", wsdlURL));
-      return false;
-    }
-  }
-
-  private String getWsdlUrl()
-  {
-    int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
-    int viewID = Integer.parseInt((String) propertyTable_.get(ActionInputs.VIEWID));
-    Node selectedNode = nodeManager_.getNode(nodeID);
-    WsilElement selectedElement = (WsilElement) selectedNode.getTreeElement();
-    WsilWsdlServiceElement wsilWsdlServiceElement;
-    Object obj = selectedElement.getAllWSDLServices().getElementWithViewId(viewID).getObject();
-    wsilWsdlServiceElement = (WsilWsdlServiceElement) obj;
-    return wsilWsdlServiceElement.getWSDLServiceURL();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddWSILToFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddWSILToFavoritesAction.java
deleted file mode 100644
index 81be94bfa..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddWSILToFavoritesAction.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.wsil.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-
-public class AddWSILToFavoritesAction extends AddToFavoritesAction
-{
-  public AddWSILToFavoritesAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  public boolean favoriteExists()
-  {
-    String wsilURL = getWsilUrl();
-    Hashtable table = new Hashtable();
-    table.put(FavoritesModelConstants.PROP_WSIL_URL, wsilURL);
-    return favoriteExists(table, FavoritesModelConstants.REL_WSIL_FOLDER_NODE);
-  }
-
-  public boolean executeSingleLinkAction()
-  {
-    WSILPerspective wsilPerspective = controller_.getWSILPerspective();
-    String wsilURL = getWsilUrl();
-    Hashtable table = new Hashtable();
-    table.put(FavoritesModelConstants.PROP_WSIL_URL, wsilURL);
-    if (isMultipleLinkAction() && favoriteExists(table, FavoritesModelConstants.REL_WSIL_FOLDER_NODE))
-    {
-      wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_FAVORITES_ALREADY_EXISTS", wsilURL));
-      return false;
-    }
-    if (addToFavorites(table, FavoritesModelConstants.REL_WSIL_FOLDER_NODE))
-    {
-      wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_INFO_ADD_TO_FAVORITES_SUCCESSFUL", wsilURL));
-      return true;
-    }
-    else
-    {
-      wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_ADD_TO_FAVORITES", wsilURL));
-      return false;
-    }
-  }
-
-  private String getWsilUrl()
-  {
-    int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
-    Node selectedNode = nodeManager_.getNode(nodeID);
-    WsilElement selectedElement = (WsilElement) selectedNode.getTreeElement();
-    return selectedElement.getWsilUrl();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ClearWSILAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ClearWSILAction.java
deleted file mode 100644
index d789c0340..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ClearWSILAction.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.wsil.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ClearNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-
-public class ClearWSILAction extends ClearNodeAction {
-
-    public ClearWSILAction(Controller controller)
-    {
-        super(controller, controller.getWSILPerspective().getNodeManager());
-        propertyTable_.put(ActionInputs.NODEID, String.valueOf(controller.getWSILPerspective().getNodeManager().getSelectedNodeId()));
-    }
-
-    public static String getActionLink(int nodeID)
-    {
-        StringBuffer actionLink = new StringBuffer("wsil/actions/ClearWSILActionJSP.jsp?");
-        actionLink.append(ActionInputs.NODEID);
-        actionLink.append('=');
-        actionLink.append(nodeID);
-        return actionLink.toString();
-    }
-
-    public String getTreeContentVar() {
-        return "wsilNavigatorContent";
-    }
-
-    public String getTreeContentPage() {
-        return "wsil/wsil_navigator_content.jsp";
-    }
-
-    public String getPropertiesContainerVar() {
-        return "wsilPropertiesContainer";
-    }
-
-    public String getPropertiesContainerPage() {
-        return "wsil/wsil_properties_container.jsp";
-    }
-
-    public String getStatusContentVar() {
-        return "wsilStatusContent";
-    }
-
-    public String getStatusContentPage() {
-        return "wsil/wsil_status_content.jsp";
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ImportWSDLToFileSystemAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ImportWSDLToFileSystemAction.java
deleted file mode 100644
index bd0ffb4b7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ImportWSDLToFileSystemAction.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.wsil.actions;
-
-import java.io.OutputStream;
-import javax.wsdl.Definition;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToFileSystemAction;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.WSDLFileNameHelper;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilUddiServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilWsdlServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListUDDIServicesTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListWSDLServicesTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-import org.uddi4j.client.UDDIProxy;
-
-public class ImportWSDLToFileSystemAction extends ImportToFileSystemAction
-{
-  private Definition def_;
-  private String wsdlFileName_;
-  private NodeManager nodeManager_;
-
-  public ImportWSDLToFileSystemAction(Controller controller)
-  {
-    super(controller);
-    nodeManager_ = controller.getWSILPerspective().getNodeManager();
-  }
-
-  public static final String getActionLink(int nodeId, int toolId, int viewId, int viewToolId)
-  {
-    return ImportToFileSystemAction.getActionLink(nodeId, toolId, viewId, viewToolId, "wsil/actions/ImportWSDLToFileSystemActionJSP.jsp");
-  }
-
-  public boolean write(OutputStream os)
-  {
-    if (def_ != null)
-    {
-      return writeWSDLDefinition(os, def_);
-    }
-    else
-    {
-      return false;
-    }
-  }
-
-  public String getDefaultFileName()
-  {
-    return wsdlFileName_;
-  }
-
-  private boolean getWSDLFromURL()
-  {
-    int nodeID = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-    int viewID = Integer.parseInt((String)propertyTable_.get(ActionInputs.VIEWID));
-    Node selectedNode = nodeManager_.getNode(nodeID);
-    WsilElement wsilElement = (WsilElement)selectedNode.getTreeElement();
-    ListManager wsilServices = wsilElement.getAllWSDLServices();
-    ListElement le = wsilServices.getElementWithViewId(viewID);
-    WsilWsdlServiceElement service = (WsilWsdlServiceElement)le.getObject();
-    String wsdlURL = service.getWSDLServiceURL();
-    wsdlFileName_ = WSDLFileNameHelper.getWSDLFileName(wsdlURL);
-    try
-    {
-      def_ = (new Uddi4jHelper()).getWSDLDefinition(wsdlURL);
-    }
-    catch (Exception e)
-    {
-      WSILPerspective wsilPerspective = controller_.getWSILPerspective();
-      wsilPerspective.getMessageQueue().addMessage(e.getMessage());
-      return false;
-    }
-    return true;
-  }
-
-  private boolean getWSDLFromUDDIRegistry()
-  {
-    int nodeID = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-    int viewID = Integer.parseInt((String)propertyTable_.get(ActionInputs.VIEWID));
-    Node selectedNode = nodeManager_.getNode(nodeID);
-    WsilElement wsilElement = (WsilElement)selectedNode.getTreeElement();
-    ListManager wsilServices = wsilElement.getAllUDDIServices();
-    ListElement le = wsilServices.getElementWithViewId(viewID);
-    WsilUddiServiceElement service = (WsilUddiServiceElement)le.getObject();
-    WSILPerspective wsilPerspective = controller_.getWSILPerspective();
-    wsdlFileName_ = service.getName() + ".wsdl";
-    Uddi4jHelper uddi4jHelper = new Uddi4jHelper();
-    try
-    {
-      UDDIProxy proxy = null;
-      String inquiryURL = service.getUDDIServiceInquiryAPI();
-      if (inquiryURL != null)
-      {
-        proxy = new UDDIProxy();
-        proxy.setInquiryURL(inquiryURL);
-      }
-      def_ = uddi4jHelper.getWSDLDefinition(uddi4jHelper.getWSDL(service.getServiceDefinition(), proxy));
-    }
-    catch (Exception e)
-    {
-      // the wsdl representing this service is unreachable through the UDDI
-      // registry. We will try using the discovery URL instead.
-      try
-      {
-        def_ = uddi4jHelper.getWSDLDefinition(service.getUDDIServiceDiscoveryURL());
-        return true;
-      }
-      catch (Exception e2)
-      {
-      }
-      // if the discoveryURL also fails, return an error
-      wsilPerspective.getMessageQueue().addMessage(e.getMessage());
-      return false;
-    }
-    return true;
-  }
-
-  public boolean run()
-  {
-    int nodeID = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-    Node selectedNode = nodeManager_.getNode(nodeID);
-    Tool selectedTool = selectedNode.getToolManager().getSelectedTool();
-    if (selectedTool instanceof ListWSDLServicesTool)
-      return getWSDLFromURL();
-    else if (selectedTool instanceof ListUDDIServicesTool)
-      return getWSDLFromUDDIRegistry();
-    else
-      return false;
-  }
-
-  public final String getStatusContentVar()
-  {
-    return controller_.getWSILPerspective().getStatusContentVar();
-  }
-
-  public final String getStatusContentPage()
-  {
-    return controller_.getWSILPerspective().getStatusContentPage();
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ImportWSILToFileSystemAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ImportWSILToFileSystemAction.java
deleted file mode 100644
index 3335c1050..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ImportWSILToFileSystemAction.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.ws.internal.explorer.platform.wsil.actions;
-
-import java.io.OutputStream;
-import org.apache.wsil.WSILDocument;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToFileSystemAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-
-public class ImportWSILToFileSystemAction extends ImportToFileSystemAction {
-    private WSILDocument wsilDoc_;
-    private WsilElement wsilElement_;
-    private NodeManager nodeManager_;
-
-    public ImportWSILToFileSystemAction(Controller controller) {
-        super(controller);
-        nodeManager_ = controller.getWSILPerspective().getNodeManager();
-    }
-
-    public static final String getActionLink(int nodeId,int toolId,int viewId,int viewToolId)
-    {
-      return ImportToFileSystemAction.getActionLink(nodeId,toolId,viewId,viewToolId,"wsil/actions/ImportWSILToFileSystemActionJSP.jsp");
-    }
-
-    public boolean write(OutputStream os) {
-        if (wsilDoc_ != null) {
-            return writeWSILDocument(os, wsilDoc_);
-        }
-        else {
-            return false;
-        }
-    }
-
-    public String getDefaultFileName() {
-        String wsilFileName = wsilElement_.getWsilUrl();
-        return wsilFileName.substring(wsilFileName.lastIndexOf('/') + 1, wsilFileName.length());
-    }
-
-    public boolean run() {
-        int nodeID = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-
-        Node selectedNode = nodeManager_.getNode(nodeID);
-        TreeElement selectedElement = selectedNode.getTreeElement();
-        if (selectedElement instanceof WsilElement) {
-            wsilElement_ = (WsilElement)selectedElement;
-            wsilDoc_ = ((WsilElement)selectedElement).getWSILDocument();
-            return true;
-        }
-        else {
-            return false;
-        }
-    }
-
-    public final String getStatusContentVar()
-    {
-      return controller_.getWSILPerspective().getStatusContentVar();
-    }
-
-    public final String getStatusContentPage()
-    {
-      return controller_.getWSILPerspective().getStatusContentPage();
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/MultipleLinkAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/MultipleLinkAction.java
deleted file mode 100644
index 3ee054349..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/MultipleLinkAction.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.LinkAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilActionInputs;
-
-public abstract class MultipleLinkAction extends LinkAction
-{
-  public MultipleLinkAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  protected boolean processLinkParameters(HttpServletRequest request)
-  {
-    String isMultipleLinkAction = request.getParameter(WsilActionInputs.MULTIPLE_LINK_ACTION);
-    if (isMultipleLinkAction != null)
-    {
-      propertyTable_.put(WsilActionInputs.MULTIPLE_LINK_ACTION, isMultipleLinkAction);
-      return processMultipleLinkActionParameters(request);
-    }
-    else
-    {
-      propertyTable_.remove(WsilActionInputs.MULTIPLE_LINK_ACTION);
-      String nodeIDString = request.getParameter(ActionInputs.NODEID);
-      String toolIDString = request.getParameter(ActionInputs.TOOLID);
-      String viewIDString = request.getParameter(ActionInputs.VIEWID);
-      String viewToolIDString = request.getParameter(ActionInputs.VIEWTOOLID);
-      if (nodeIDString != null)
-        propertyTable_.put(ActionInputs.NODEID, nodeIDString);
-      if (toolIDString != null)
-        propertyTable_.put(ActionInputs.TOOLID, toolIDString);
-      if (viewIDString != null)
-        propertyTable_.put(ActionInputs.VIEWID, viewIDString);
-      if (viewToolIDString != null)
-        propertyTable_.put(ActionInputs.VIEWTOOLID, viewToolIDString);
-      return true;
-    }
-  }
-
-  protected boolean processMultipleLinkActionParameters(HttpServletRequest request)
-  {
-    String nodeID = request.getParameter(ActionInputs.NODEID);
-    String[] viewIDs = request.getParameterValues(ActionInputs.VIEWID);
-    propertyTable_.put(ActionInputs.NODEID, nodeID);
-    propertyTable_.put(ActionInputs.VIEWID, viewIDs);
-    if (viewIDs.length == 0)
-      return false;
-    else
-      return true;
-  }
-  
-  protected boolean isMultipleLinkAction()
-  {
-    return propertyTable_.containsKey(WsilActionInputs.MULTIPLE_LINK_ACTION);
-  }
-  
-  protected String[] getViewIds()
-  {
-    Object object = propertyTable_.get(ActionInputs.VIEWID);
-    if (object == null)
-      return new String[0];
-    else if (object.getClass().isArray())
-      return (String[])object;
-    else
-      return new String[] {(String)object};
-  }
-
-  public boolean run()
-  {
-    return (isMultipleLinkAction()) ? executeMultipleLinkAction() : executeSingleLinkAction();
-  }
-
-  protected boolean executeMultipleLinkAction()
-  {
-    boolean result = false;
-    String[] viewIds = getViewIds();
-    if (viewIds != null && viewIds.length > 0)
-    {
-      for (int i = 0; i < viewIds.length; i++)
-      {
-        propertyTable_.put(ActionInputs.VIEWID, viewIds[i]);
-        if (executeSingleLinkAction())
-          result = true;
-      }
-    }
-    propertyTable_.put(ActionInputs.VIEWID, viewIds);
-    return result;
-  }
-
-  protected abstract boolean executeSingleLinkAction();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/NullAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/NullAction.java
deleted file mode 100644
index 038296a39..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/NullAction.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.Action;
-
-public class NullAction extends Action
-{
-  public NullAction()
-  {
-  }
-
-  public boolean populatePropertyTable(HttpServletRequest request)
-  {
-    return true;
-  }
-
-  public boolean run()
-  {
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/OpenWSILAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/OpenWSILAction.java
deleted file mode 100644
index 0ca36009d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/OpenWSILAction.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.wsil.actions;
-
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.List;
-import org.apache.wsil.WSILDocument;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.FormAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServiceEntity;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-public class OpenWSILAction extends FormAction
-{
-
-  public OpenWSILAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    String wsilURL = parser.getParameter(WsilActionInputs.WSIL_URL);
-    String inspectionType = parser.getParameter(WsilActionInputs.WSIL_INSPECTION_TYPE);
-    FormTool formTool = getSelectedFormTool();
-    propertyTable_.put(WsilActionInputs.WSIL_URL, wsilURL);
-    if (inspectionType != null && inspectionType.length() > 0)
-      propertyTable_.put(WsilActionInputs.WSIL_INSPECTION_TYPE, inspectionType);
-    formTool.updatePropertyTable(propertyTable_);
-    return true;
-  }
-
-  public FormTool getSelectedFormTool()
-  {
-    WSILPerspective wsilPerspective = controller_.getWSILPerspective();
-    return (FormTool)wsilPerspective.getNodeManager().getSelectedNode().getToolManager().getSelectedTool();
-  }
-
-  public boolean run()
-  {
-    String wsilURL = (String)propertyTable_.get(WsilActionInputs.WSIL_URL);
-    int inspectionType = Integer.parseInt((String)propertyTable_.get(WsilActionInputs.WSIL_INSPECTION_TYPE));
-    WSILPerspective wsilPerspective = controller_.getWSILPerspective();
-    MessageQueue msgQueue = wsilPerspective.getMessageQueue();
-    NodeManager nodeManager = wsilPerspective.getNodeManager();
-    Node rootNode = nodeManager.getRootNode();
-    TreeElement root = rootNode.getTreeElement();
-    WsilElement wsilElement = getOpenedWSIL(root, wsilURL);
-    if (wsilElement == null)
-    {
-      WebServicesParserExt parser = new WebServicesParserExt(wsilURL);
-      try
-      {
-        parser.parse(WebServicesParser.PARSE_NONE);
-        WebServiceEntity wsEntity = parser.getWebServiceEntityByURI(wsilURL);
-        int type = wsEntity.getType();
-        if (type == WebServiceEntity.TYPE_HTML)
-          return openHTML(wsEntity.getChildren(), inspectionType);
-        else if (type == WebServiceEntity.TYPE_WSIL)
-          return openWSIL(wsilURL, parser.getWSILDocument(wsilURL), inspectionType);
-        else
-          msgQueue.addMessage(wsilPerspective.getMessage("MSG_ERROR_INVALID_WSIL_URL", wsilURL));
-      }
-      catch (Throwable t)
-      {
-        msgQueue.addMessage(t.getMessage());
-      }
-      return false;
-    }
-    else
-    {
-      preselectWSILNode(nodeManager, rootNode.getChildNode(wsilElement).getNodeId(), inspectionType);
-      msgQueue.addMessage(wsilPerspective.getMessage("MSG_ERROR_WSIL_ALREADY_OPENED", wsilURL));
-      return true;
-    }
-  }
-
-  private boolean openHTML(List wsils, int inspectionType)
-  {
-    int nodeId = -1;
-    WSILPerspective wsilPerspective = controller_.getWSILPerspective();
-    MessageQueue msgQueue = wsilPerspective.getMessageQueue();
-    NodeManager nodeManager = wsilPerspective.getNodeManager();
-    Node rootNode = nodeManager.getRootNode();
-    TreeElement root = rootNode.getTreeElement();
-    for (Iterator it = wsils.iterator(); it.hasNext();)
-    {
-      WebServiceEntity wsilEntity = (WebServiceEntity)it.next();
-      String wsilURL = wsilEntity.getURI();
-      WsilElement wsilElement = getOpenedWSIL(root, wsilURL);
-      if (wsilElement == null)
-      {
-        try
-        {
-          WSILDocument wsilDoc = WSILDocument.newInstance();
-          wsilDoc.read(wsilURL);
-          wsilElement = new WsilElement(wsilURL, root.getModel(), wsilDoc, wsilURL);
-          root.connect(wsilElement, WsilModelConstants.REL_WSIL, ModelConstants.REL_OWNER);
-          nodeId = rootNode.getChildNode(wsilElement).getNodeId();
-          msgQueue.addMessage(wsilPerspective.getMessage("MSG_INFO_OPEN_WSIL_SUCCESSFUL", wsilURL));
-        }
-        catch (Throwable t)
-        {
-          msgQueue.addMessage(t.getMessage());
-        }
-      }
-      else
-      {
-        msgQueue.addMessage(wsilPerspective.getMessage("MSG_ERROR_WSIL_ALREADY_OPENED", wsilURL));
-        nodeId = rootNode.getChildNode(wsilElement).getNodeId();
-      }
-    }
-    if (nodeId != -1)
-    {
-      preselectWSILNode(nodeManager, nodeId, inspectionType);
-      return true;
-    }
-    else
-      return false;
-  }
-
-  private boolean openWSIL(String wsilURL, WSILDocument wsilDoc, int inspectionType)
-  {
-    WSILPerspective wsilPerspective = controller_.getWSILPerspective();
-    MessageQueue msgQueue = wsilPerspective.getMessageQueue();
-    NodeManager nodeManager = wsilPerspective.getNodeManager();
-    Node rootNode = nodeManager.getRootNode();
-    TreeElement root = rootNode.getTreeElement();
-    WsilElement wsilElement = new WsilElement(wsilURL, root.getModel(), wsilDoc, wsilURL);
-    root.connect(wsilElement, WsilModelConstants.REL_WSIL, ModelConstants.REL_OWNER);
-    int nodeId = rootNode.getChildNode(wsilElement).getNodeId();
-    msgQueue.addMessage(wsilPerspective.getMessage("MSG_INFO_OPEN_WSIL_SUCCESSFUL", wsilURL));
-    preselectWSILNode(nodeManager, nodeId, inspectionType);
-    return true;
-  }
-
-  private void preselectWSILNode(NodeManager nodeManager, int nodeId, int inspectionType)
-  {
-    nodeManager.setSelectedNodeId(nodeId);
-    Node selectedNode = nodeManager.getNode(nodeId);
-    selectedNode.setViewId(ActionInputs.VIEWTOOLID_DEFAULT);
-    ToolManager toolManager = selectedNode.getToolManager();
-    toolManager.setSelectedToolId(inspectionType);
-    addToHistory(ActionInputs.PERSPECTIVE_WSIL, SelectWSILToolAction.getActionLink(nodeId, inspectionType, ActionInputs.VIEWID_DEFAULT, ActionInputs.VIEWTOOLID_DEFAULT, true));        
-  }
-
-  private WsilElement getOpenedWSIL(TreeElement root, String wsilURL)
-  {
-    Enumeration e = root.getElements(WsilModelConstants.REL_WSIL);
-    while (e.hasMoreElements())
-    {
-      WsilElement wsilElement = (WsilElement)e.nextElement();
-      if (wsilElement.getWsilUrl().equals(wsilURL))
-        return wsilElement;
-    }
-    return null;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/OpenWSILLinkAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/OpenWSILLinkAction.java
deleted file mode 100644
index b2a88124a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/OpenWSILLinkAction.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.ws.internal.explorer.platform.wsil.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilWsilLinkElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer.WSILViewSelectionTransformer;
-
-public class OpenWSILLinkAction extends MultipleLinkAction
-{
-  public OpenWSILLinkAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID)
-  {
-    StringBuffer actionLink = new StringBuffer("wsil/actions/OpenWSILLinkActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID);
-    actionLink.append('=');
-    actionLink.append(nodeID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.TOOLID);
-    actionLink.append('=');
-    actionLink.append(toolID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.VIEWID);
-    actionLink.append('=');
-    actionLink.append(viewID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.VIEWTOOLID);
-    actionLink.append('=');
-    actionLink.append(viewToolID);
-    return actionLink.toString();
-  }
-
-  public static String getBaseActionLink()
-  {
-    return "wsil/actions/OpenWSILLinkActionJSP.jsp";
-  }
-
-  public ITransformer[] getTransformers()
-  {
-    ITransformer[] parentTransformers = super.getTransformers();
-    ITransformer[] transformers = new ITransformer[parentTransformers.length+1];
-    System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
-    transformers[transformers.length-1] = new WSILViewSelectionTransformer(controller_, WsilModelConstants.LIST_MANAGER_WSIL_LINKS, ActionInputs.VIEWID, WSILViewSelectionTransformer.WSIL_LINK);
-    return transformers;
-  }
-
-  protected boolean executeSingleLinkAction()
-  {
-    int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
-    int viewID = Integer.parseInt((String) propertyTable_.get(ActionInputs.VIEWID));
-    WSILPerspective wsilPerspective = controller_.getWSILPerspective();
-    NodeManager nodeManager = wsilPerspective.getNodeManager();
-    Node selectedNode = nodeManager.getNode(nodeID);
-    TreeElement selectedElement = selectedNode.getTreeElement();
-    if (!(selectedElement instanceof WsilElement))
-      return false;
-    ListElement le = ((WsilElement) selectedElement).getAllWSILLinks().getElementWithViewId(viewID);
-    WsilWsilLinkElement link = (WsilWsilLinkElement) le.getObject();
-    String wsilURL = link.getWSILLinkLocation();
-    // populate and run the OpenWSILAction
-    OpenWSILAction action = new OpenWSILAction(controller_);
-    Hashtable table = action.getPropertyTable();
-    table.put(WsilActionInputs.WSIL_URL, wsilURL);
-    table.put(WsilActionInputs.WSIL_INSPECTION_TYPE, String.valueOf(WsilActionInputs.WSIL_DETAILS));
-    return action.run();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshAction.java
deleted file mode 100644
index 9e5e18698..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshAction.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.wsil.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.Action;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListUDDIBusinessTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListUDDIServicesTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WsilNode;
-
-public abstract class RefreshAction extends MultipleLinkAction
-{
-  protected NodeManager nodeManager_;
-
-  public RefreshAction(Controller controller)
-  {
-    super(controller);
-    nodeManager_ = controller.getWSILPerspective().getNodeManager();
-  }
-
-  public static Action newAction(HttpServletRequest request, Controller controller)
-  {
-    NodeManager nodeManager = controller.getWSILPerspective().getNodeManager();
-    String nodeIDString = request.getParameter(ActionInputs.NODEID);
-    String viewIDString = request.getParameter(ActionInputs.VIEWID);
-    int nodeID;
-    try
-    {
-      nodeID = Integer.parseInt(nodeIDString);
-    }
-    catch (NumberFormatException nfe)
-    {
-      nodeID = nodeManager.getSelectedNodeId();
-    }
-    Node selectedNode = controller.getWSILPerspective().getNodeManager().getNode(nodeID);
-    if (selectedNode == null || !(selectedNode instanceof WsilNode))
-      return new NullAction();
-    else
-    {
-      Tool selectedTool = selectedNode.getToolManager().getSelectedTool();
-      RefreshAction action;
-      if (viewIDString == null)
-        action = new RefreshWSILAction(controller);
-      else if (selectedTool instanceof ListUDDIServicesTool)
-        action = new RefreshUDDIServiceAction(controller);
-      else if (selectedTool instanceof ListUDDIBusinessTool)
-        action = new RefreshUDDIBusinessAction(controller);
-      else
-        return new NullAction();
-      action.getPropertyTable().put(ActionInputs.NODEID, String.valueOf(nodeID));
-      return action;
-    }
-  }
-
-  public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID)
-  {
-    StringBuffer actionLink = new StringBuffer("wsil/actions/RefreshActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID);
-    actionLink.append('=');
-    actionLink.append(nodeID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.TOOLID);
-    actionLink.append('=');
-    actionLink.append(toolID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.VIEWID);
-    actionLink.append('=');
-    actionLink.append(viewID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.VIEWTOOLID);
-    actionLink.append('=');
-    actionLink.append(viewToolID);
-    return actionLink.toString();
-  }
-
-  public static String getBaseActionLink()
-  {
-    return "wsil/actions/RefreshActionJSP.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshUDDIBusinessAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshUDDIBusinessAction.java
deleted file mode 100644
index 02193d098..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshUDDIBusinessAction.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.wsil.actions;
-
-import java.util.Iterator;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListManager;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilUddiBusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer.WSILViewSelectionTransformer;
-
-public class RefreshUDDIBusinessAction extends RefreshAction
-{
-  public RefreshUDDIBusinessAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  public ITransformer[] getTransformers()
-  {
-    ITransformer[] parentTransformers = super.getTransformers();
-    ITransformer[] transformers = new ITransformer[parentTransformers.length+1];
-    System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
-    transformers[transformers.length-1] = new WSILViewSelectionTransformer(controller_, WsilModelConstants.LIST_MANAGER_UDDI_LINKS, ActionInputs.VIEWID, WSILViewSelectionTransformer.UDDI_BUSINESS);
-    return transformers;
-  }
-
-  public boolean run()
-  {
-    return executeSingleLinkAction();
-  }
-
-  protected boolean executeMultipleLinkAction()
-  {
-    return executeSingleLinkAction();
-  }
-
-  public boolean executeSingleLinkAction()
-  {
-    boolean result = true;
-    int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
-    Node selectedNode = nodeManager_.getNode(nodeID);
-    TreeElement selectedElement = selectedNode.getTreeElement();
-    WSILPerspective wsilPerspective = controller_.getWSILPerspective();
-    MessageQueue messageQueue = wsilPerspective.getMessageQueue();
-    if (selectedElement instanceof WsilElement)
-    {
-      WsilElement wsilElement = (WsilElement) selectedElement;
-      ListManager lm = wsilElement.getAllUDDILinks();
-      Vector uddiBusinessElements = new Vector();
-      String[] viewIDs = getViewIds();
-      for (int i = 0; i < viewIDs.length; i++)
-      {
-        int viewID = Integer.parseInt(viewIDs[i]);
-        WsilUddiBusinessElement uddiBusinessElement = (WsilUddiBusinessElement) lm.getElementWithViewId(viewID).getObject();
-        uddiBusinessElements.add(uddiBusinessElement);
-      }
-      wsilElement.refreshServiceProvidersFromRegistry(uddiBusinessElements);
-      for (Iterator it = uddiBusinessElements.iterator(); it.hasNext();)
-      {
-        WsilUddiBusinessElement uddiBusinessElement = (WsilUddiBusinessElement) it.next();
-        String name = uddiBusinessElement.getName();
-        if (name == null || name.length() <= 0)
-          name = uddiBusinessElement.getUDDILinkBusinessKey();
-        if (uddiBusinessElement.getServiceProvider() != null)
-          messageQueue.addMessage(wsilPerspective.getMessage("MSG_INFO_REFRESH_SUCCESSFUL", name));
-        else
-        {
-          messageQueue.addMessage(wsilPerspective.getMessage("MSG_ERROR_BUSINESS_NOT_FOUND", name));
-          result = false;
-        }
-      }
-    }
-    else
-      result = false;
-    return result;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshUDDIServiceAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshUDDIServiceAction.java
deleted file mode 100644
index e918c3ad9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshUDDIServiceAction.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.wsil.actions;
-
-import java.util.Iterator;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListManager;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilUddiServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer.WSILViewSelectionTransformer;
-
-public class RefreshUDDIServiceAction extends RefreshAction
-{
-  public RefreshUDDIServiceAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  public ITransformer[] getTransformers()
-  {
-    ITransformer[] parentTransformers = super.getTransformers();
-    ITransformer[] transformers = new ITransformer[parentTransformers.length+1];
-    System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
-    transformers[transformers.length-1] = new WSILViewSelectionTransformer(controller_, WsilModelConstants.LIST_MANAGER_UDDI_SERVICES, ActionInputs.VIEWID, WSILViewSelectionTransformer.UDDI_SERVICE);
-    return transformers;
-  }
-
-  public boolean run()
-  {
-    return executeSingleLinkAction();
-  }
-
-  protected boolean executeMultipleLinkAction()
-  {
-    return executeSingleLinkAction();
-  }
-
-  public boolean executeSingleLinkAction()
-  {
-    boolean result = true;
-    int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
-    Node selectedNode = nodeManager_.getNode(nodeID);
-    TreeElement selectedElement = selectedNode.getTreeElement();
-    WSILPerspective wsilPerspective = controller_.getWSILPerspective();
-    MessageQueue messageQueue = wsilPerspective.getMessageQueue();
-    if (selectedElement instanceof WsilElement)
-    {
-      WsilElement wsilElement = (WsilElement) selectedElement;
-      ListManager lm = wsilElement.getAllUDDIServices();
-      Vector uddiServiceElements = new Vector();
-      String[] viewIDs = getViewIds();
-      for (int i = 0; i < viewIDs.length; i++)
-      {
-        int viewID = Integer.parseInt(viewIDs[i]);
-        WsilUddiServiceElement uddiServiceElement = (WsilUddiServiceElement) lm.getElementWithViewId(viewID).getObject();
-        uddiServiceElements.add(uddiServiceElement);
-      }
-      wsilElement.refreshServiceDefinitionsFromRegistry(uddiServiceElements);
-      for (Iterator it = uddiServiceElements.iterator(); it.hasNext();)
-      {
-        WsilUddiServiceElement uddiServiceElement = (WsilUddiServiceElement) it.next();
-        String name = uddiServiceElement.getName();
-        if (name == null || name.length() <= 0)
-          name = uddiServiceElement.getUDDIServiceKey();
-        if (uddiServiceElement.getServiceDefinition() != null)
-          messageQueue.addMessage(wsilPerspective.getMessage("MSG_INFO_REFRESH_SUCCESSFUL", name));
-        else
-        {
-          messageQueue.addMessage(wsilPerspective.getMessage("MSG_ERROR_SERVICE_NOT_FOUND", name));
-          result = false;
-        }
-      }
-    }
-    else
-      result = false;
-    return result;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshWSILAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshWSILAction.java
deleted file mode 100644
index 7f55d9534..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshWSILAction.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-
-public class RefreshWSILAction extends RefreshAction
-{
-  public RefreshWSILAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  public boolean executeSingleLinkAction()
-  {
-    int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
-    Node selectedNode = nodeManager_.getNode(nodeID);
-    TreeElement selectedElement = selectedNode.getTreeElement();
-    WSILPerspective wsilPerspective = controller_.getWSILPerspective();
-    if (selectedElement instanceof WsilElement)
-    {
-      String wsilURL = ((WsilElement) selectedElement).getWsilUrl();
-      if (((WsilElement) selectedElement).refresh())
-      {
-        wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_INFO_REFRESH_SUCCESSFUL", wsilURL));
-        return true;
-      }
-      else
-        wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_WSIL_NOT_FOUND", wsilURL));
-    }
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ResizeWSILFramesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ResizeWSILFramesAction.java
deleted file mode 100644
index 9a52a14f6..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ResizeWSILFramesAction.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.wsil.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ResizeFramesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilFrameNames;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-
-public class ResizeWSILFramesAction extends ResizeFramesAction
-{
-  public ResizeWSILFramesAction(Controller controller)
-  {
-    super(controller);
-  }
-  
-  protected boolean processOthers(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    String perspectiveContentFramesetCols = parser.getParameter(WsilActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
-    String actionsContainerFramesetRows = parser.getParameter(WsilActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
-    if (perspectiveContentFramesetCols != null && actionsContainerFramesetRows != null)
-    {
-      propertyTable_.put(WsilActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT,perspectiveContentFramesetCols);
-      propertyTable_.put(WsilActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER,actionsContainerFramesetRows);
-      return true;
-    }
-    return false;
-  }
-  
-  public final boolean run()
-  {
-    // Save the current frameset sizes.
-    String frameName = (String)propertyTable_.get(ActionInputs.FRAME_NAME);
-    String perspectiveContentFramesetCols = (String)propertyTable_.get(WsilActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
-    String actionsContainerFramesetRows = (String)propertyTable_.get(WsilActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
-    WSILPerspective wsilPerspective = controller_.getWSILPerspective();
-    
-    // Set the new frameset sizes.
-    if (frameName.equals(WsilFrameNames.WSIL_NAVIGATOR_CONTAINER))
-    {
-      wsilPerspective.setActionsContainerFramesetRows(actionsContainerFramesetRows);
-      wsilPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
-      if (perspectiveContentFramesetCols.startsWith("100%"))
-      {
-        // Restore.
-        wsilPerspective.setPerspectiveContentFramesetCols(wsilPerspective.getSavedPerspectiveContentFramesetCols());
-      }
-      else
-      {
-        // Maximize.
-        wsilPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-        wsilPerspective.setPerspectiveContentFramesetCols("100%,0%");
-      }
-    }
-    else if (frameName.equals(WsilFrameNames.WSIL_PROPERTIES_CONTAINER))
-    {
-      if (actionsContainerFramesetRows.startsWith("100%"))
-      {
-        if (perspectiveContentFramesetCols.endsWith("100%"))
-        {
-          // Restore.
-          wsilPerspective.setPerspectiveContentFramesetCols(wsilPerspective.getSavedPerspectiveContentFramesetCols());
-          wsilPerspective.setActionsContainerFramesetRows(wsilPerspective.getSavedActionsContainerFramesetRows());
-        }
-        else
-        {
-          // Maximize.
-          wsilPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-          wsilPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
-          wsilPerspective.setPerspectiveContentFramesetCols("0%,100%");
-        }
-      }
-      else
-      {
-        // Maximize.
-        wsilPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
-        wsilPerspective.setActionsContainerFramesetRows("100%,0%");
-        if (!perspectiveContentFramesetCols.endsWith("100%"))
-        {
-          wsilPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-          wsilPerspective.setPerspectiveContentFramesetCols("0%,100%");
-        }
-      }
-    }
-    else if (frameName.equals(WsilFrameNames.WSIL_STATUS_CONTAINER))
-    {
-      if (actionsContainerFramesetRows.endsWith("100%"))
-      {
-        if (perspectiveContentFramesetCols.endsWith("100%"))
-        {
-          // Restore.
-          wsilPerspective.setPerspectiveContentFramesetCols(wsilPerspective.getSavedPerspectiveContentFramesetCols());
-          wsilPerspective.setActionsContainerFramesetRows(wsilPerspective.getSavedActionsContainerFramesetRows());
-        }
-        else
-        {
-          // Maximize.
-          wsilPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-          wsilPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
-          wsilPerspective.setPerspectiveContentFramesetCols("0%,100%");
-        }
-      }
-      else
-      {
-        // Maximize.
-        wsilPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
-        wsilPerspective.setActionsContainerFramesetRows("0%,100%");
-        if (!perspectiveContentFramesetCols.endsWith("100%"))
-        {
-          wsilPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-          wsilPerspective.setPerspectiveContentFramesetCols("0%,100%");
-        }
-      }
-    }
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SelectWSILNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SelectWSILNodeAction.java
deleted file mode 100644
index 201abad2a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SelectWSILNodeAction.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.ws.internal.explorer.platform.wsil.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.SelectNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ToolTypes;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-
-public class SelectWSILNodeAction extends SelectNodeAction
-{
-    public SelectWSILNodeAction(Controller controller)
-    {
-        super(controller, controller.getWSILPerspective().getNodeManager());
-    }
-
-    public static String getActionLink(int nodeID, boolean keepHistory)
-    {
-        StringBuffer actionLink = new StringBuffer("wsil/actions/SelectWSILNodeActionJSP.jsp?");
-        actionLink.append(ActionInputs.NODEID);
-        actionLink.append('=');
-        actionLink.append(nodeID);
-        if (keepHistory) {
-            actionLink.append('&');
-            actionLink.append(ActionInputs.ISHISTORY);
-            actionLink.append("=1");
-        }
-        return actionLink.toString();
-    }
-
-    protected String getActionLinkForHistory()
-    {
-        Node selectedNode = getSelectedNode();
-        Tool selectedTool = selectedNode.getToolManager().getSelectedTool();
-        if (selectedTool.getToolType() != ToolTypes.ACTION)
-            return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedTool.getToolId(), selectedNode.getViewId(), selectedNode.getViewToolId(), true);
-        else
-            return getActionLink(selectedNode.getNodeId(), true);
-    }
-
-    public final String getTreeContentVar() {
-        return "wsilNavigatorContent";
-    }
-
-    public final String getTreeContentPage() {
-        return "wsil/wsil_navigator_content.jsp";
-    }
-
-    public final String getPropertiesContainerVar() {
-        return "wsilPropertiesContainer";
-    }
-
-    public final String getPropertiesContainerPage() {
-        return "wsil/wsil_properties_container.jsp";
-    }
-    
-    public final int getPerspectiveId()
-    {
-      return ActionInputs.PERSPECTIVE_WSIL;
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SelectWSILToolAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SelectWSILToolAction.java
deleted file mode 100644
index 3e19c959d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SelectWSILToolAction.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.wst.ws.internal.explorer.platform.wsil.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.SelectNodeToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ToolTypes;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ViewTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer.WSILViewSelectionTransformer;
-
-public class SelectWSILToolAction extends SelectNodeToolAction
-{
-  public SelectWSILToolAction(Controller controller)
-  {
-    super(controller, controller.getWSILPerspective().getNodeManager());
-  }
-
-  public ITransformer[] getTransformers()
-  {
-    ITransformer[] parentTransformers = super.getTransformers();
-    ITransformer[] transformers = new ITransformer[parentTransformers.length + 1];
-    System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
-    transformers[transformers.length - 1] = new WSILViewSelectionTransformer(controller_);
-    return transformers;
-  }
-
-  public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID, boolean keepHistory)
-  {
-    StringBuffer actionLink = new StringBuffer("wsil/actions/SelectWSILToolActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID);
-    actionLink.append('=');
-    actionLink.append(nodeID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.TOOLID);
-    actionLink.append('=');
-    actionLink.append(toolID);
-    if (viewID != ActionInputs.VIEWID_DEFAULT)
-    {
-      actionLink.append('&');
-      actionLink.append(ActionInputs.VIEWID);
-      actionLink.append('=');
-      actionLink.append(viewID);
-      actionLink.append('&');
-      actionLink.append(ActionInputs.VIEWTOOLID);
-      actionLink.append('=');
-      actionLink.append(viewToolID);
-    }
-    if (keepHistory)
-    {
-      actionLink.append('&');
-      actionLink.append(ActionInputs.ISHISTORY);
-      actionLink.append("=1");
-    }
-    return actionLink.toString();
-  }
-
-  protected String getActionLinkForHistory()
-  {
-    boolean keepHistory = false;
-    Node selectedNode = getSelectedNode();
-    Tool selectedTool = getSelectedTool();
-    int toolType = getSelectedTool().getToolType();
-    if (toolType == ToolTypes.FORM)
-      keepHistory = true;
-    else if (toolType == ToolTypes.VIEW)
-    {
-      int viewID = selectedNode.getViewId();
-      if (viewID == ActionInputs.VIEWID_DEFAULT)
-        keepHistory = true;
-      else
-      {
-        if (((ViewTool) selectedTool).getToolManager(viewID).getTool(selectedNode.getViewToolId()).getToolType() != ToolTypes.ACTION)
-          keepHistory = true;
-      }
-    }
-    if (keepHistory)
-    {
-      return getActionLink(selectedNode.getNodeId(), selectedTool.getToolId(), selectedNode.getViewId(), selectedNode.getViewToolId(), true);
-    }
-    else
-      return null;
-  }
-
-  public final String getTreeContentVar()
-  {
-    return "wsilNavigatorContent";
-  }
-
-  public final String getTreeContentPage()
-  {
-    return "wsil/wsil_navigator_content.jsp";
-  }
-
-  public final String getPropertiesContainerVar()
-  {
-    return "wsilPropertiesContainer";
-  }
-
-  public final String getPropertiesContainerPage()
-  {
-    return "wsil/wsil_properties_container.jsp";
-  }
-
-  public final String getPropertiesContentVar()
-  {
-    return "wsilPropertiesContent";
-  }
-
-  public final String getPropertiesContentPage()
-  {
-    return "wsil/wsil_properties_content.jsp";
-  }
-
-  public final int getPerspectiveId()
-  {
-    return ActionInputs.PERSPECTIVE_WSIL;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SwitchPerspectiveFromWSILAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SwitchPerspectiveFromWSILAction.java
deleted file mode 100644
index 0ebdb51fa..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SwitchPerspectiveFromWSILAction.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.ws.internal.explorer.platform.wsil.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ShowPerspectiveAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-
-public final class SwitchPerspectiveFromWSILAction extends ShowPerspectiveAction
-{
-  public SwitchPerspectiveFromWSILAction(Controller controller)
-  {
-    super(controller);
-  }
-  
-  protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    String perspectiveContentFramesetCols = parser.getParameter(WsilActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
-    String actionsContainerFramesetRows = parser.getParameter(WsilActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
-    if (perspectiveContentFramesetCols != null && actionsContainerFramesetRows != null)
-    {
-      propertyTable_.put(WsilActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT,perspectiveContentFramesetCols);
-      propertyTable_.put(WsilActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER,actionsContainerFramesetRows);
-      return true;
-    }
-    return false;
-  }
-  
-  public final boolean run()
-  {
-    String perspectiveContentFramesetCols = (String)propertyTable_.get(WsilActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
-    String actionsContainerFramesetRows = (String)propertyTable_.get(WsilActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
-    
-    // Save the frameset sizes iff no frame is maximized.
-    WSILPerspective wsilPerspective = controller_.getWSILPerspective();
-    if (!perspectiveContentFramesetCols.startsWith("100%") && !perspectiveContentFramesetCols.endsWith("100%"))
-      wsilPerspective.setPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-      
-    if (!actionsContainerFramesetRows.startsWith("100%") && !actionsContainerFramesetRows.endsWith("100%"))
-      wsilPerspective.setActionsContainerFramesetRows(actionsContainerFramesetRows);
-      
-    return super.run();
-  }
-  
-  public static final String getFormActionLink(int targetPerspectiveId,boolean forHistory)
-  {
-    StringBuffer formLink = new StringBuffer("wsil/actions/SwitchPerspectiveFromWSILActionJSP.jsp?");
-    formLink.append(ActionInputs.PERSPECTIVE).append('=').append(targetPerspectiveId);
-    if (forHistory)
-      formLink.append('&').append(ActionInputs.ISHISTORY).append("=1");
-    return formLink.toString();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WSILImportWSILToWorkbenchAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WSILImportWSILToWorkbenchAction.java
deleted file mode 100644
index aff146f7a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WSILImportWSILToWorkbenchAction.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.ws.internal.explorer.platform.wsil.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToFileSystemAction;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToWorkbenchAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-
-public class WSILImportWSILToWorkbenchAction extends ImportToWorkbenchAction
-{
-  public WSILImportWSILToWorkbenchAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  public FormTool getSelectedFormTool()
-  {
-    WSILPerspective wsilPerspective = controller_.getWSILPerspective();
-    return (FormTool)wsilPerspective.getNodeManager().getSelectedNode().getToolManager().getSelectedTool();
-  }
-
-  public ImportToFileSystemAction newImportToFileSystemAction()
-  {
-    ImportWSILToFileSystemAction action = new ImportWSILToFileSystemAction(controller_);
-    Hashtable table = action.getPropertyTable();
-    WSILPerspective wsilPerspective = controller_.getWSILPerspective();
-    NodeManager nodeManager = wsilPerspective.getNodeManager();
-    Node selectedNode = nodeManager.getSelectedNode();
-    table.put(ActionInputs.NODEID, String.valueOf(selectedNode.getNodeId()));
-    return action;
-  }
-
-  public final String getStatusContentVar()
-  {
-    return controller_.getWSILPerspective().getStatusContentVar();
-  }
-    
-  public final String getStatusContentPage()
-  {
-    return controller_.getWSILPerspective().getStatusContentPage();
-  }    
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilAddToWSDLPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilAddToWSDLPerspectiveAction.java
deleted file mode 100644
index f534e5452..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilAddToWSDLPerspectiveAction.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.wst.ws.internal.explorer.platform.wsil.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.OpenWSDLAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilWsdlServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer.WSILViewSelectionTransformer;
-
-public class WsilAddToWSDLPerspectiveAction extends MultipleLinkAction
-{
-  public WsilAddToWSDLPerspectiveAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID)
-  {
-    StringBuffer actionLink = new StringBuffer("wsil/actions/WsilAddToWSDLPerspectiveActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID);
-    actionLink.append('=');
-    actionLink.append(nodeID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.TOOLID);
-    actionLink.append('=');
-    actionLink.append(toolID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.VIEWID);
-    actionLink.append('=');
-    actionLink.append(viewID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.VIEWTOOLID);
-    actionLink.append('=');
-    actionLink.append(viewToolID);
-    return actionLink.toString();
-  }
-
-  public static String getBaseActionLink()
-  {
-    return "wsil/actions/WsilAddToWSDLPerspectiveActionJSP.jsp";
-  }
-
-  public ITransformer[] getTransformers()
-  {
-    ITransformer[] parentTransformers = super.getTransformers();
-    ITransformer[] transformers = new ITransformer[parentTransformers.length+1];
-    System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
-    transformers[transformers.length-1] = new WSILViewSelectionTransformer(controller_, WsilModelConstants.LIST_MANAGER_WSDL_SERVICES, ActionInputs.VIEWID, WSILViewSelectionTransformer.WSDL_SERVICE);
-    return transformers;
-  }
-
-  protected boolean executeSingleLinkAction()
-  {
-    int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
-    int viewID = Integer.parseInt((String) propertyTable_.get(ActionInputs.VIEWID));
-    WSILPerspective wsilPerspective = controller_.getWSILPerspective();
-    Node selectedNode = wsilPerspective.getNodeManager().getNode(nodeID);
-    WsilElement wsilElement = (WsilElement) selectedNode.getTreeElement();
-    WsilWsdlServiceElement wsilWsdlServiceElement = (WsilWsdlServiceElement) wsilElement.getAllWSDLServices().getElementWithViewId(viewID).getObject();
-    String wsdlUrl = wsilWsdlServiceElement.getWSDLServiceURL();
-    OpenWSDLAction openWSDLAction = new OpenWSDLAction(controller_);
-    Hashtable propertyTable = openWSDLAction.getPropertyTable();
-    propertyTable.put(ActionInputs.QUERY_INPUT_WSDL_URL, wsdlUrl);
-    boolean actionResult = openWSDLAction.run();
-    if (actionResult)
-      wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_INFO_ADD_WSDL_TO_WSDL_PERSPECTIVE_SUCCESSFUL", wsdlUrl));
-    else
-      wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_ADD_WSDL_TO_WSDL_PERSPECTIVE", wsdlUrl));
-    return actionResult;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilImportWSDLToWorkbenchAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilImportWSDLToWorkbenchAction.java
deleted file mode 100644
index 95abee37c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilImportWSDLToWorkbenchAction.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.ws.internal.explorer.platform.wsil.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToFileSystemAction;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToWorkbenchAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-
-public class WsilImportWSDLToWorkbenchAction extends ImportToWorkbenchAction {
-    public WsilImportWSDLToWorkbenchAction(Controller controller) {
-        super(controller);
-    }
-
-    public FormTool getSelectedFormTool() {
-        WSILPerspective wsilPerspective = controller_.getWSILPerspective();
-        return (FormTool)wsilPerspective.getNodeManager().getSelectedNode().getToolManager().getSelectedTool();
-    }
-
-    public ImportToFileSystemAction newImportToFileSystemAction() {
-        ImportWSDLToFileSystemAction action = new ImportWSDLToFileSystemAction(controller_);
-        Hashtable table = action.getPropertyTable();
-
-        WSILPerspective wsilPerspective = controller_.getWSILPerspective();
-        NodeManager nodeManager = wsilPerspective.getNodeManager();
-        Node selectedNode = nodeManager.getSelectedNode();
-
-        table.put(ActionInputs.NODEID, String.valueOf(selectedNode.getNodeId()));
-        table.put(ActionInputs.TOOLID, String.valueOf(selectedNode.getToolManager().getSelectedToolId()));
-        table.put(ActionInputs.VIEWID, String.valueOf(selectedNode.getViewId()));
-
-        return action;
-    }
-
-    public final String getStatusContentVar()
-    {
-      return controller_.getWSILPerspective().getStatusContentVar();
-    }
-    
-    public final String getStatusContentPage()
-    {
-      return controller_.getWSILPerspective().getStatusContentPage();
-    }    
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilLaunchWebServiceWizardAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilLaunchWebServiceWizardAction.java
deleted file mode 100644
index a968afacf..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilLaunchWebServiceWizardAction.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.ws.internal.explorer.platform.wsil.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.LaunchWebServiceWizardAction;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilUddiServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilWsdlServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListUDDIServicesTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListWSDLServicesTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-
-public class WsilLaunchWebServiceWizardAction extends LaunchWebServiceWizardAction {
-    public WsilLaunchWebServiceWizardAction(Controller controller) {
-        super(controller);
-    }
-
-    public static LaunchWebServiceWizardAction newAction(Controller controller) {
-        return new WsilLaunchWebServiceWizardAction(controller);
-    }
-
-    public FormTool getSelectedFormTool() {
-        WSILPerspective wsilPerspective = controller_.getWSILPerspective();
-        return (FormTool)wsilPerspective.getNodeManager().getSelectedNode().getToolManager().getSelectedTool();
-    }
-
-    public boolean run() {
-        WSILPerspective wsilPerspective = controller_.getWSILPerspective();
-        NodeManager nodeManager = wsilPerspective.getNodeManager();
-        Node selectedNode = nodeManager.getSelectedNode();
-        TreeElement selectedElement = selectedNode.getTreeElement();
-        Tool selectedTool = selectedNode.getToolManager().getSelectedTool();
-        int viewID = selectedNode.getViewId();
-
-        ListElement le = null;
-        String url = null;
-        if (selectedTool instanceof ListWSDLServicesTool) {
-            le = ((WsilElement)selectedElement).getAllWSDLServices().getElementWithViewId(viewID);
-            url = ((WsilWsdlServiceElement)le.getObject()).getWSDLServiceURL();
-        }
-        else if (selectedTool instanceof ListUDDIServicesTool) {
-            le = ((WsilElement)selectedElement).getAllUDDIServices().getElementWithViewId(viewID);
-            url = ((WsilUddiServiceElement)le.getObject()).getWsdlUrl();
-        }
-        else
-            return false;
-        return launchWizard(url);
-    }
-
-    public final String getStatusContentVar()
-    {
-      return controller_.getWSILPerspective().getStatusContentVar();
-    }
-    
-    public final String getStatusContentPage()
-    {
-      return controller_.getWSILPerspective().getStatusContentPage();
-    }    
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilToggleNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilToggleNodeAction.java
deleted file mode 100644
index 9ab8a22a4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilToggleNodeAction.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.ws.internal.explorer.platform.wsil.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ToggleNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ToolTypes;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class WsilToggleNodeAction extends ToggleNodeAction {
-    public WsilToggleNodeAction(Controller controller) {
-        super(controller, controller.getFavoritesPerspective().getNodeManager());
-    }
-
-    public static String getActionLink(int nodeId, boolean open) {
-        StringBuffer actionLink = new StringBuffer("wsil/actions/WsilToggleNodeActionJSP.jsp?");
-        actionLink.append(ActionInputs.NODEID);
-        actionLink.append('=');
-        actionLink.append(nodeId);
-        actionLink.append('&');
-        actionLink.append(ActionInputs.OPEN);
-        actionLink.append('=');
-        if (open)
-            actionLink.append(ActionInputs.OPEN_NODE);
-        else
-            actionLink.append(ActionInputs.CLOSE_NODE);
-        return actionLink.toString();
-    }
-
-    public final String getActionLinkForHistory() {
-        ToolManager toolManager = toggledNode_.getToolManager();
-        Tool selectedTool = toolManager.getSelectedTool();
-        int nodeId = toggledNode_.getNodeId();
-        int toolId = selectedTool.getToolId();
-        int viewId = toggledNode_.getViewId();
-        int viewToolId = toggledNode_.getViewToolId();
-        if (selectedTool.getToolType() != ToolTypes.ACTION)
-            return SelectWSILToolAction.getActionLink(nodeId, toolId, viewId, viewToolId, true);
-        else
-            return SelectWSILNodeAction.getActionLink(nodeId, true);
-    }
-
-  public final String getTreeContentVar()
-  {
-    return controller_.getWSILPerspective().getTreeContentVar();
-  }
-
-  public final String getTreeContentPage()
-  {
-    return controller_.getWSILPerspective().getTreeContentPage();
-  }
-
-  public final String getPropertiesContainerVar()
-  {
-    return controller_.getWSILPerspective().getPropertiesContainerVar();
-  }
-
-  public final String getPropertiesContainerPage()
-  {
-    return controller_.getWSILPerspective().getPropertiesContainerPage();
-  }
-  
-  public final int getPerspectiveId()
-  {
-    return ActionInputs.PERSPECTIVE_WSIL;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/constants/WsilActionInputs.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/constants/WsilActionInputs.java
deleted file mode 100644
index aeb3c55b6..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/constants/WsilActionInputs.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.internal.explorer.platform.wsil.constants;
-
-public class WsilActionInputs
-{
-    // open WSIL form
-    public final static String WSIL_URL = "wsilURL";
-    public final static String WSIL_INSPECTION_TYPE = "wsilInspectionType";
-    public final static int WSIL_DETAILS = 0;
-    public final static int WSDL_SERVICES = 1;
-    public final static int UDDI_SERVICES = 2;
-    public final static int UDDI_BUSINESSES = 3;
-    public final static int WSIL_LINKS = 4;
-
-    // mass action
-    public final static String MULTIPLE_LINK_ACTION = "multipleLinkAction";
-
-    // resize WSIL frames action
-    public final static String FRAMESET_COLS_PERSPECTIVE_CONTENT = "framesetColsPerspectiveContent";
-    public final static String FRAMESET_ROWS_ACTIONS_CONTAINER = "framesetRowsActionsContainer";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/constants/WsilFrameNames.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/constants/WsilFrameNames.java
deleted file mode 100644
index be2d25c31..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/constants/WsilFrameNames.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.ws.internal.explorer.platform.wsil.constants;
-
-public class WsilFrameNames
-{
-  public final static String WSIL_NAVIGATOR_CONTAINER = "wsil_navigator_container";
-  public final static String WSIL_NAVIGATOR_TOOLBAR = "wsil_navigator_toolbar";
-  public final static String WSIL_NAVIGATOR_CONTENT = "wsil_navigator_content";
-  public final static String WSIL_ACTIONS_CONTAINER = "wsil_actions_container";
-  public final static String WSIL_PROPERTIES_CONTAINER = "wsil_properties_container";
-  public final static String WSIL_PROPERTIES_TOOLBAR = "wsil_properties_toolbar";
-  public final static String WSIL_PROPERTIES_CONTENT = "wsil_properties_content";
-  public final static String WSIL_STATUS_CONTAINER = "wsil_status_container";
-  public final static String WSIL_STATUS_TOOLBAR = "wsil_status_toolbar";
-  public final static String WSIL_STATUS_CONTENT = "wsil_status_content";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/constants/WsilModelConstants.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/constants/WsilModelConstants.java
deleted file mode 100644
index 5bb694b82..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/constants/WsilModelConstants.java
+++ /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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.constants;
-
-public class WsilModelConstants
-{
-    // Relation
-    public final static String REL_WSIL = "relWSIL";
-
-    // List Managers for WsilElement
-    public final static String LIST_MANAGER_WSDL_SERVICES = "wsdlServices";
-    public final static String LIST_MANAGER_UDDI_SERVICES = "uddiServices";
-    public final static String LIST_MANAGER_UDDI_LINKS = "uddiLinks";
-    public final static String LIST_MANAGER_WSIL_LINKS = "wsilLinks";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilCommonElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilCommonElement.java
deleted file mode 100644
index 52d28de68..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilCommonElement.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.wst.ws.internal.explorer.platform.wsil.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-public class WsilCommonElement extends BasicElement
-{
-  private String baseWsilURL;
-  private String relativeURIBase;
-
-  public WsilCommonElement(String name, Model model)
-  {
-    super(name, model);
-  }
-  
-  public String getBaseWsilURL()
-  {
-    return baseWsilURL;
-  }
-  
-  public void setBaseWsilURL(String baseWsilURL)
-  {
-    this.baseWsilURL = baseWsilURL;
-  }
-  
-  private final char FWD_SLASH = '/';
-  private final char BWD_SLASH = '\\';
-  private final char PROTOCOL_INDICATOR = ':';
-  
-  public String makeAbsolute(String uri)
-  {
-    if (baseWsilURL != null && uri != null && uri.indexOf(PROTOCOL_INDICATOR) == -1)
-    {
-      if (relativeURIBase == null)
-      {
-        relativeURIBase = baseWsilURL.replace(BWD_SLASH, FWD_SLASH);
-        int index = relativeURIBase.lastIndexOf(FWD_SLASH);
-        relativeURIBase = baseWsilURL.substring(0, index + 1);
-      }
-      StringBuffer sb = new StringBuffer(relativeURIBase);
-      sb.append(uri);
-      return sb.toString();
-    }
-    return uri;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilElement.java
deleted file mode 100644
index 74828efbf..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilElement.java
+++ /dev/null
@@ -1,460 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.wsil.datamodel;
-
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Properties;
-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.WSILDocument;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListManager;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.service.BusinessService;
-
-/**
- * The data model element that represents a WSIL document
- */
-public class WsilElement extends TreeElement
-{
-  private WSILDocument wsilDoc_;
-  private String thisWsilUrl_;
-  /** ****************** Namespace ********** */
-  private static final String NAMESPACE_WSDL = "http://schemas.xmlsoap.org/wsdl/";
-  private static final String NAMESPACE_UDDI_V1 = "urn:uddi-org:api";
-  private static final String NAMESPACE_UDDI_V2 = "urn:uddi-org:api_v2";
-  //private static final String NAMESPACE_UDDI_BINDING = "http://schemas.xmlsoap.org/ws/2001/10/inspection/uddi/";
-  private static final String NAMESPACE_WSIL_INSPECTION = "http://schemas.xmlsoap.org/ws/2001/10/inspection/";
-  /** ****************** Rels **************** */
-  // Relation for a WSIL doucment and its link nodes
-  public static final String REL_WSIL_LINK = "wsil link nodes";
-
-  public WsilElement(String name, Model model, WSILDocument wsilDocument, String wsilURL)
-  {
-    super(name, model);
-    wsilDoc_ = wsilDocument;
-    thisWsilUrl_ = wsilURL;
-    ListManager wsdlServices_ = null;
-    ListManager uddiServices_ = null;
-    ListManager wsilLinks_ = null;
-    ListManager uddiLinks_ = null;
-    setPropertyAsObject(WsilModelConstants.LIST_MANAGER_WSDL_SERVICES, wsdlServices_);
-    setPropertyAsObject(WsilModelConstants.LIST_MANAGER_UDDI_SERVICES, uddiServices_);
-    setPropertyAsObject(WsilModelConstants.LIST_MANAGER_UDDI_LINKS, wsilLinks_);
-    setPropertyAsObject(WsilModelConstants.LIST_MANAGER_WSIL_LINKS, uddiLinks_);
-  }
-
-  /*
-   * Refresh the WSIL document
-   */
-  public boolean refresh()
-  {
-    try
-    {
-      WSILDocument newWSILDoc = WSILDocument.newInstance();
-      newWSILDoc.read(getWsilUrl());
-      wsilDoc_ = newWSILDoc;
-      ListManager wsdlServices_ = null;
-      ListManager uddiServices_ = null;
-      ListManager wsilLinks_ = null;
-      ListManager uddiLinks_ = null;
-      setPropertyAsObject(WsilModelConstants.LIST_MANAGER_WSDL_SERVICES, wsdlServices_);
-      setPropertyAsObject(WsilModelConstants.LIST_MANAGER_UDDI_SERVICES, uddiServices_);
-      setPropertyAsObject(WsilModelConstants.LIST_MANAGER_UDDI_LINKS, wsilLinks_);
-      setPropertyAsObject(WsilModelConstants.LIST_MANAGER_WSIL_LINKS, uddiLinks_);
-      return true;
-    }
-    catch (Exception e)
-    {
-      return false;
-    }
-  }
-
-  /*
-   * Returns the WSIL's URL
-   */
-  public String getWsilUrl()
-  {
-    return thisWsilUrl_;
-  }
-
-  /*
-   * Returns the WSIL document
-   */
-  public WSILDocument getWSILDocument()
-  {
-    return wsilDoc_;
-  }
-
-  /*
-   * Returns all abstract languages
-   */
-  public Vector getWSILAbstractLangs()
-  {
-    Vector v = new Vector();
-    Abstract[] abstracts = wsilDoc_.getInspection().getAbstracts();
-    for (int i = 0; i < abstracts.length; i++)
-    {
-      v.add(abstracts[i].getLang());
-    }
-    return v;
-  }
-
-  /*
-   * Returns all abstracts
-   */
-  public Vector getWSILAbstracts()
-  {
-    Vector v = new Vector();
-    Abstract[] abstracts = wsilDoc_.getInspection().getAbstracts();
-    for (int i = 0; i < abstracts.length; i++)
-    {
-      v.add(abstracts[i].getText());
-    }
-    return v;
-  }
-
-  public ListManager getAllWSDLServices()
-  {
-    ListManager wsdlServices_ = (ListManager) getPropertyAsObject(WsilModelConstants.LIST_MANAGER_WSDL_SERVICES);
-    if (wsdlServices_ == null)
-    {
-      initAllWSDLServices();
-      wsdlServices_ = (ListManager) getPropertyAsObject(WsilModelConstants.LIST_MANAGER_WSDL_SERVICES);
-    }
-    return wsdlServices_;
-  }
-
-  public ListManager getAllUDDIServices()
-  {
-    ListManager uddiServices_ = (ListManager) getPropertyAsObject(WsilModelConstants.LIST_MANAGER_UDDI_SERVICES);
-    if (uddiServices_ == null)
-    {
-      initAllUDDIServices();
-      uddiServices_ = (ListManager) getPropertyAsObject(WsilModelConstants.LIST_MANAGER_UDDI_SERVICES);
-    }
-    return uddiServices_;
-  }
-
-  private void initAllWSDLServices()
-  {
-    ListManager wsdlServices_ = new ListManager();
-    Inspection inspection = wsilDoc_.getInspection();
-    Service[] serviceList = inspection.getServices();
-    for (int i = 0; i < serviceList.length; i++)
-    {
-      // skip any service without a wsdl namespace
-      // and invalid descriptions
-      Description[] descList = serviceList[i].getDescriptions();
-      if (descList.length < 1)
-        continue;
-      String namespace = descList[0].getReferencedNamespace();
-      if (namespace == null)
-        continue;
-      else if (namespace.equals(NAMESPACE_WSDL))
-      {
-        WsilWsdlServiceElement wsdlServiceElement = new WsilWsdlServiceElement(namespace, getModel(), serviceList[i]);
-        wsdlServiceElement.setBaseWsilURL(getWsilUrl());
-        if (wsdlServiceElement.validateWSDLService())
-        {
-          wsdlServiceElement.setName(wsdlServiceElement.getWSDLServiceURL());
-          wsdlServices_.add(new ListElement(wsdlServiceElement));
-        }
-      }
-    }
-    setPropertyAsObject(WsilModelConstants.LIST_MANAGER_WSDL_SERVICES, wsdlServices_);
-  }
-
-  private void initAllUDDIServices()
-  {
-    ListManager uddiServices_ = new ListManager();
-    Inspection inspection = wsilDoc_.getInspection();
-    Service[] serviceList = inspection.getServices();
-    Vector uddiServiceElements = new Vector();
-    for (int i = 0; i < serviceList.length; i++)
-    {
-      // skip any service without a wsdl namespace
-      // and invalid descriptions
-      Description[] descList = serviceList[i].getDescriptions();
-      if (descList.length < 1)
-        continue;
-      String namespace = descList[0].getReferencedNamespace();
-      if (namespace == null)
-        continue;
-      else if ((namespace.equals(NAMESPACE_UDDI_V1) || namespace.equals(NAMESPACE_UDDI_V2)))
-      {
-        WsilUddiServiceElement uddiServiceElement = new WsilUddiServiceElement(namespace, getModel(), serviceList[i]);
-        uddiServiceElement.setBaseWsilURL(getWsilUrl());
-        if (uddiServiceElement.validateUDDIService())
-        {
-          uddiServiceElement.setName(uddiServiceElement.getName());
-          uddiServiceElements.add(uddiServiceElement);
-        }
-      }
-    }
-    refreshServiceDefinitionsFromRegistry(uddiServiceElements);
-    for (Iterator it = uddiServiceElements.iterator(); it.hasNext();)
-    {
-      uddiServices_.add(new ListElement(it.next()));
-    }
-    setPropertyAsObject(WsilModelConstants.LIST_MANAGER_UDDI_SERVICES, uddiServices_);
-  }
-
-  public void refreshServiceDefinitionsFromRegistry(Vector uddiServiceElements)
-  {
-    HashMap inquiryAPIToServices = new HashMap();
-    for (int i = 0; i < uddiServiceElements.size(); i++)
-    {
-      WsilUddiServiceElement uddiServiceElement = (WsilUddiServiceElement) uddiServiceElements.get(i);
-      String inquiryAPI = uddiServiceElement.getUDDIServiceInquiryAPI();
-      if (Validator.validateURL(inquiryAPI))
-      {
-        Vector services = (Vector) inquiryAPIToServices.get(inquiryAPI);
-        if (services == null)
-        {
-          services = new Vector();
-          inquiryAPIToServices.put(inquiryAPI, services);
-        }
-        services.add(uddiServiceElement);
-      }
-      else
-        uddiServiceElement.setServiceDefinition(null);
-    }
-    for (Iterator it = inquiryAPIToServices.keySet().iterator(); it.hasNext();)
-    {
-      String inquiryAPI = (String) it.next();
-      Vector services = (Vector) inquiryAPIToServices.get(inquiryAPI);
-      UDDIProxy proxy;
-      try
-      {
-        Properties props = new Properties();
-        props.put(ActionInputs.TRANSPORT_CLASS_NAME, ActionInputs.TRASPORT_CLASS);
-        proxy = new UDDIProxy(props);
-        proxy.setInquiryURL(new URL(inquiryAPI));
-      }
-      catch (Throwable t)
-      {
-        for (int j = 0; j < services.size(); j++)
-        {
-          WsilUddiServiceElement uddiServiceElement = (WsilUddiServiceElement) services.get(j);
-          uddiServiceElement.setServiceDefinition(null);
-        }
-        continue;
-      }
-      Vector serviceKeys = new Vector();
-      for (int j = 0; j < services.size(); j++)
-      {
-        serviceKeys.add(((WsilUddiServiceElement) services.get(j)).getUDDIServiceKey());
-      }
-      Vector businessServices;
-      try
-      {
-        businessServices = proxy.get_serviceDetail(serviceKeys).getBusinessServiceVector();
-      }
-      catch (Exception ex)
-      {
-        businessServices = new Vector();
-        if (serviceKeys.size() > 1)
-        {
-          for (int k = 0; k < serviceKeys.size(); k++)
-          {
-            try
-            {
-              businessServices.add((BusinessService) proxy.get_serviceDetail((String) serviceKeys.get(k)).getBusinessServiceVector().get(0));
-            }
-            catch (Exception exception)
-            {
-              businessServices.add(null);
-            }
-          }
-        }
-        else
-          businessServices.add(null);
-      }
-      for (int k = 0; k < services.size(); k++)
-      {
-        BusinessService bs = (BusinessService) businessServices.get(k);
-        WsilUddiServiceElement uddiServiceElement = (WsilUddiServiceElement) services.get(k);
-        uddiServiceElement.setServiceDefinition(bs);
-      }
-    }
-  }
-
-  public ListManager getAllWSILLinks()
-  {
-    ListManager wsilLinks_ = (ListManager) getPropertyAsObject(WsilModelConstants.LIST_MANAGER_WSIL_LINKS);
-    if (wsilLinks_ == null)
-    {
-      initAllWSILLinks();
-      wsilLinks_ = (ListManager) getPropertyAsObject(WsilModelConstants.LIST_MANAGER_WSIL_LINKS);
-    }
-    return wsilLinks_;
-  }
-
-  public ListManager getAllUDDILinks()
-  {
-    ListManager uddiLinks_ = (ListManager) getPropertyAsObject(WsilModelConstants.LIST_MANAGER_UDDI_LINKS);
-    if (uddiLinks_ == null)
-    {
-      initAllUDDILinks();
-      uddiLinks_ = (ListManager) getPropertyAsObject(WsilModelConstants.LIST_MANAGER_UDDI_LINKS);
-    }
-    return uddiLinks_;
-  }
-
-  private void initAllUDDILinks()
-  {
-    ListManager uddiLinks_ = new ListManager();
-    Inspection inspection = wsilDoc_.getInspection();
-    Link[] linkList = inspection.getLinks();
-    Vector uddiBusinessElements = new Vector();
-    for (int i = 0; i < linkList.length; i++)
-    {
-      // process any links with UDDI namespace
-      String namespace = linkList[i].getReferencedNamespace();
-      if (namespace == null)
-        continue;
-      else if ((namespace.equals(NAMESPACE_UDDI_V1) || namespace.equals(NAMESPACE_UDDI_V2)))
-      {
-        WsilUddiBusinessElement uddiBusinessElement = new WsilUddiBusinessElement(namespace, getModel(), linkList[i]);
-        uddiBusinessElement.setBaseWsilURL(getWsilUrl());
-        if (uddiBusinessElement.validateUDDILink())
-        {
-          uddiBusinessElement.setName(uddiBusinessElement.getName());
-          uddiBusinessElements.add(uddiBusinessElement);
-        }
-      }
-    }
-    refreshServiceProvidersFromRegistry(uddiBusinessElements);
-    for (Iterator it = uddiBusinessElements.iterator(); it.hasNext();)
-    {
-      uddiLinks_.add(new ListElement(it.next()));
-    }
-    setPropertyAsObject(WsilModelConstants.LIST_MANAGER_UDDI_LINKS, uddiLinks_);
-  }
-
-  public void refreshServiceProvidersFromRegistry(Vector uddiBusinessElements)
-  {
-    HashMap inquiryAPIToBusinesses = new HashMap();
-    for (int i = 0; i < uddiBusinessElements.size(); i++)
-    {
-      WsilUddiBusinessElement uddiBusinessElement = (WsilUddiBusinessElement) uddiBusinessElements.get(i);
-      String inquiryAPI = uddiBusinessElement.getUDDILinkInquiryAPI();
-      if (Validator.validateURL(inquiryAPI))
-      {
-        Vector businesses = (Vector) inquiryAPIToBusinesses.get(inquiryAPI);
-        if (businesses == null)
-        {
-          businesses = new Vector();
-          inquiryAPIToBusinesses.put(inquiryAPI, businesses);
-        }
-        businesses.add(uddiBusinessElement);
-      }
-      else
-        uddiBusinessElement.setServiceProvider(null);
-    }
-    for (Iterator it = inquiryAPIToBusinesses.keySet().iterator(); it.hasNext();)
-    {
-      String inquiryAPI = (String) it.next();
-      Vector businesses = (Vector) inquiryAPIToBusinesses.get(inquiryAPI);
-      UDDIProxy proxy;
-      try
-      {
-        Properties props = new Properties();
-        props.put(ActionInputs.TRANSPORT_CLASS_NAME, ActionInputs.TRASPORT_CLASS);
-        proxy = new UDDIProxy(props);
-        proxy.setInquiryURL(new URL(inquiryAPI));
-      }
-      catch (Exception e)
-      {
-        for (int j = 0; j < businesses.size(); j++)
-        {
-          WsilUddiBusinessElement uddiBusinessElement = (WsilUddiBusinessElement) businesses.get(j);
-          uddiBusinessElement.setServiceProvider(null);
-        }
-        continue;
-      }
-      Vector businessKeys = new Vector();
-      for (int j = 0; j < businesses.size(); j++)
-      {
-        businessKeys.add(((WsilUddiBusinessElement) businesses.get(j)).getUDDILinkBusinessKey());
-      }
-      Vector businessEntities;
-      try
-      {
-        businessEntities = proxy.get_businessDetail(businessKeys).getBusinessEntityVector();
-      }
-      catch (Exception ex)
-      {
-        businessEntities = new Vector();
-        if (businessKeys.size() > 1)
-        {
-          for (int k = 0; k < businessKeys.size(); k++)
-          {
-            try
-            {
-              businessEntities.add((BusinessEntity) proxy.get_businessDetail((String) businessKeys.get(k)).getBusinessEntityVector().get(0));
-            }
-            catch (Exception exception)
-            {
-              businessEntities.add(null);
-            }
-          }
-        }
-        else
-          businessEntities.add(null);
-      }
-      for (int k = 0; k < businesses.size(); k++)
-      {
-        BusinessEntity be = (BusinessEntity) businessEntities.get(k);
-        WsilUddiBusinessElement uddiBusinessElement = (WsilUddiBusinessElement) businesses.get(k);
-        uddiBusinessElement.setServiceProvider(be);
-      }
-    }
-  }
-
-  private void initAllWSILLinks()
-  {
-    ListManager wsilLinks_ = new ListManager();
-    Inspection inspection = wsilDoc_.getInspection();
-    Link[] linkList = inspection.getLinks();
-    for (int i = 0; i < linkList.length; i++)
-    {
-      // process any links with UDDI namespace
-      String namespace = linkList[i].getReferencedNamespace();
-      if (namespace == null)
-        continue;
-      else if (namespace.equals(NAMESPACE_WSIL_INSPECTION))
-      {
-        WsilWsilLinkElement wsilLinkElement = new WsilWsilLinkElement(namespace, getModel(), linkList[i]);
-        wsilLinkElement.setBaseWsilURL(getWsilUrl());
-        if (wsilLinkElement.validateWSILLink())
-        {
-          wsilLinkElement.setName(wsilLinkElement.getWSILLinkLocation());
-          wsilLinks_.add(new ListElement(wsilLinkElement));
-        }
-      }
-    }
-    setPropertyAsObject(WsilModelConstants.LIST_MANAGER_WSIL_LINKS, wsilLinks_);
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilLinkElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilLinkElement.java
deleted file mode 100644
index f3f72f1fd..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilLinkElement.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.wst.ws.internal.explorer.platform.wsil.datamodel;
-
-import java.util.Vector;
-import org.apache.wsil.Abstract;
-import org.apache.wsil.Link;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-/**
-* The data model element that represents 
-* a WSIL Link
-*/
-public class WsilLinkElement extends WsilCommonElement
-{
-  protected Link link_;
-
-  public WsilLinkElement(String name, Model model, Link link)
-  {
-    super(name, model);
-    link_ = link;
-  }
-
-  public Vector getLinkAbstractLangs()
-  {
-    Vector v = new Vector();
-    Abstract[] abstracts = link_.getAbstracts();
-    for (int i = 0; i < abstracts.length; i++)
-    {
-      v.add(abstracts[i].getLang());
-    }
-    return v;
-  }
-
-  public Vector getLinkAbstracts()
-  {
-    Vector v = new Vector();
-    Abstract[] abstracts = link_.getAbstracts();
-    for (int i = 0; i < abstracts.length; i++)
-    {
-      v.add(abstracts[i].getText());
-    }
-    return v;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilServiceElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilServiceElement.java
deleted file mode 100644
index a63a279e4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilServiceElement.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel;
-
-import java.util.Vector;
-import org.apache.wsil.Abstract;
-import org.apache.wsil.Service;
-import org.apache.wsil.ServiceName;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-/**
-* The data model element that represents 
-* a WSIL Service
-*/
-public class WsilServiceElement extends WsilCommonElement
-{
-    protected Service service_;
-
-    public WsilServiceElement(String name, Model model, Service service) {
-        super(name, model);
-        service_ = service;
-    }
-
-    public Vector getServiceNameLangs() {
-        Vector v = new Vector();
-        ServiceName[] serviceNames = service_.getServiceNames();
-        for (int i = 0; i < serviceNames.length; i++) {
-            v.add(serviceNames[i].getLang());
-        }
-        return v;
-    }
-
-    public Vector getServiceNames() {
-        Vector v = new Vector();
-        ServiceName[] serviceNames = service_.getServiceNames();
-        for (int i = 0; i < serviceNames.length; i++) {
-            v.add(serviceNames[i].getText());
-        }
-        return v;
-    }
-
-    public Vector getServiceAbstractLangs() {
-        Vector v = new Vector();
-        Abstract[] abstracts = service_.getAbstracts();
-        for (int i = 0; i < abstracts.length; i++) {
-            v.add(abstracts[i].getLang());
-        }
-        return v;
-    }
-
-    public Vector getServiceAbstracts() {
-        Vector v = new Vector();
-        Abstract[] abstracts = service_.getAbstracts();
-        for (int i = 0; i < abstracts.length; i++) {
-            v.add(abstracts[i].getText());
-        }
-        return v;
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilUddiBusinessElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilUddiBusinessElement.java
deleted file mode 100644
index 182d33ab1..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilUddiBusinessElement.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel;
-
-import org.apache.wsil.Link;
-import org.apache.wsil.extension.ExtensionElement;
-import org.apache.wsil.extension.uddi.BusinessDescription;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.util.DiscoveryURL;
-
-/**
-* The data model element that represents 
-* a UDDI service in a WSIL document
-*/
-public class WsilUddiBusinessElement extends WsilLinkElement
-{
-    private BusinessEntity busEntity_;
-
-    public WsilUddiBusinessElement(String name, Model model, Link link) {
-        super(name, model, link);
-        busEntity_ = null;
-    }
-
-    public void setServiceProvider(BusinessEntity be) {
-      busEntity_ = be;
-    }
-
-    public BusinessEntity getServiceProvider() {
-        return busEntity_;
-    }
-
-    public String getName() {
-        return (busEntity_  == null) ? null : busEntity_.getDefaultNameString();
-    }
-
-    public String getDescription() {
-        return (busEntity_ == null) ? null : busEntity_.getDefaultDescriptionString();
-    }
-
-    public String getUDDILinkInquiryAPI() {
-        BusinessDescription bd = getValidUDDIBusinessDescription();
-        return (bd == null) ? null : bd.getLocation();
-    }
-
-    public String getUDDILinkBusinessKey() {
-        BusinessDescription bd = getValidUDDIBusinessDescription();
-        return (bd == null) ? null : bd.getBusinessKey().getText();
-    }
-
-    public String getUDDILinkDiscoveryURL() {
-        BusinessDescription bd = getValidUDDIBusinessDescription();
-        if (bd == null)
-            return null;
-        else {
-            DiscoveryURL discoveryURL = bd.getDiscoveryURL();
-            return (discoveryURL == null) ? null : discoveryURL.getText();
-        }
-    }
-
-    public boolean validateUDDILink() {
-        BusinessDescription bd = getValidUDDIBusinessDescription();
-        return (bd != null);
-    }
-
-    private BusinessDescription getValidUDDIBusinessDescription() {
-        ExtensionElement extElement = link_.getExtensionElement();
-        // The extension element of a UDDI link
-        // must be a BusinessDescription element
-        if (!(extElement instanceof BusinessDescription))
-            return null;
-        // A valid BusinessDescription must have an inquiry API
-        String inquiryAPI = ((BusinessDescription)extElement).getLocation();
-        if (!Validator.validateURL(inquiryAPI))
-            return null;
-        // A valid BusinessDescription must have a business key
-        String businessKey = ((BusinessDescription)extElement).getBusinessKey().getText();
-        if (businessKey == null || businessKey.length() <= 0)
-            return null;
-        return (BusinessDescription)extElement;
-    }
-
-    public String toString() {
-        return getName();
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilUddiServiceElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilUddiServiceElement.java
deleted file mode 100644
index e7f9d643b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilUddiServiceElement.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.wsil.datamodel;
-
-import org.apache.wsil.Description;
-import org.apache.wsil.Service;
-import org.apache.wsil.extension.ExtensionElement;
-import org.apache.wsil.extension.uddi.ServiceDescription;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.util.DiscoveryURL;
-
-/**
-* The data model element that represents 
-* a UDDI service in a WSIL document
-*/
-public class WsilUddiServiceElement extends WsilServiceElement
-{
-    private BusinessService busService_;
-
-    public WsilUddiServiceElement(String name, Model model, Service service) {
-        super(name, model, service);
-        busService_ = null;
-    }
-
-    public void setServiceDefinition(BusinessService busService) {
-        busService_ = busService;
-    }
-
-    public BusinessService getServiceDefinition() {
-        return busService_;
-    }
-
-    public String getName() {
-        return (busService_ == null) ? null : busService_.getDefaultNameString();
-    }
-
-    public String getDescription() {
-        return (busService_ == null) ? null : busService_.getDefaultDescriptionString();
-    }
-
-    public String getUDDIServiceInquiryAPI() {
-        ServiceDescription sd = getValidUDDIServiceDescription();
-        return (sd == null) ? null : sd.getLocation();
-    }
-
-    public String getUDDIServiceKey() {
-        ServiceDescription sd = getValidUDDIServiceDescription();
-        return (sd == null) ? null : sd.getServiceKey().getText();
-    }
-
-    public String getUDDIServiceDiscoveryURL() {
-        ServiceDescription sd = getValidUDDIServiceDescription();
-        if (sd == null)
-            return null;
-        else {
-            DiscoveryURL discoveryURL = sd.getDiscoveryURL();
-            return (discoveryURL == null) ? null : discoveryURL.getText();
-        }
-    }
-
-    private ServiceDescription getValidUDDIServiceDescription() {
-        Description[] descList = service_.getDescriptions();
-        for (int i = 0; i < descList.length; i++) {
-            ExtensionElement extElement = descList[i].getExtensionElement();
-            // The extension element of a UDDI service description
-            // must be a ServiceDescription element
-            if (!(extElement instanceof ServiceDescription))
-                continue;
-            // A valid ServiceDescription must have an inquiry API
-            if (!Validator.validateURL(((ServiceDescription)extElement).getLocation()))
-                continue;
-            // A valid ServiceDescription must have a service key
-            String serviceKey = ((ServiceDescription)extElement).getServiceKey().getText();
-            if (serviceKey == null || serviceKey.length() <= 0)
-                continue;
-            return (ServiceDescription)extElement;
-        }
-        return null;
-    }
-
-    public boolean validateUDDIService() {
-        ServiceDescription sd = getValidUDDIServiceDescription();
-        return (sd != null);
-    }
-
-    public String getWsdlUrl() {
-        return (new Uddi4jHelper()).getWSDL(getServiceDefinition(), null);
-    }
-
-    public String toString() {
-        return getName();
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilWsdlServiceElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilWsdlServiceElement.java
deleted file mode 100644
index 1966cd0c2..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilWsdlServiceElement.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.wst.ws.internal.explorer.platform.wsil.datamodel;
-
-import java.util.Vector;
-import org.apache.wsil.Description;
-import org.apache.wsil.Service;
-import org.apache.wsil.extension.ExtensionElement;
-import org.apache.wsil.extension.wsdl.ImplementedBinding;
-import org.apache.wsil.extension.wsdl.Reference;
-import org.apache.wsil.extension.wsdl.ReferencedService;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-/**
-* The data model element that represents 
-* a WSDL service in a WSIL document
-*/
-public class WsilWsdlServiceElement extends WsilServiceElement
-{
-    public WsilWsdlServiceElement(String name, Model model, Service service) {
-        super(name, model, service);
-    }
-
-    public String getWSDLServiceURL() {
-        Description desc = getValidWSDLDescription();
-        return (desc == null) ? null : makeAbsolute(desc.getLocation());
-    }
-
-    public Vector getWSDLBinding() {
-        Vector v = new Vector();
-        Description[] descList = service_.getDescriptions();
-        for (int i = 0; i < descList.length; i++) {
-            ExtensionElement extElement = descList[i].getExtensionElement();
-            if (extElement != null && extElement instanceof Reference) {
-                ReferencedService refService = ((Reference)extElement).getReferencedService();
-                if (refService != null) {
-                    v.add(refService.getReferencedServiceName());
-                }
-                ImplementedBinding[] implBindingList = ((Reference)extElement).getImplementedBindings();
-                for (int j = 0; j < implBindingList.length; j++) {
-                    v.add(implBindingList[j].getBindingName());
-                }
-            }
-        }
-        return v;
-    }
-    
-    private Description getValidWSDLDescription() {
-        Description[] descList = service_.getDescriptions();
-        for (int i = 0; i < descList.length; i++) {
-            // skip this description if the locatioin attribute is a malformed URL
-            String location = descList[i].getLocation();
-            if (location == null || location.length() <= 0)
-                continue;
-            // skip this description if the extension element indicates
-            // that the description's location contains only the wsdl binding
-            ExtensionElement extElement = descList[i].getExtensionElement();
-            if (extElement != null && extElement instanceof Reference) {
-                Boolean endpointPresent = ((Reference)extElement).getEndpointPresent();
-                if (endpointPresent != null && endpointPresent.booleanValue() == false)
-                    continue;
-            }
-            // a valid description is found
-            return descList[i];
-        }
-        // no valid description is found for this service
-        return null;
-    }
-
-    public boolean validateWSDLService() {
-        Description desc = getValidWSDLDescription();
-        return (desc != null);
-    }
-
-    public String toString() {
-        return getWSDLServiceURL();
-    }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilWsilLinkElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilWsilLinkElement.java
deleted file mode 100644
index 4ee2d55bc..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilWsilLinkElement.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.wst.ws.internal.explorer.platform.wsil.datamodel;
-
-import org.apache.wsil.Link;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-/**
-* The data model element that represents 
-* a WSIL link in a WSIL document
-*/
-public class WsilWsilLinkElement extends WsilLinkElement
-{
-  public WsilWsilLinkElement(String name, Model model, Link link)
-  {
-    super(name, model, link);
-  }
-
-  public String getWSILLinkLocation()
-  {
-    return makeAbsolute(link_.getLocation());
-  }
-
-  public boolean validateWSILLink()
-  {
-    return (link_.getLocation() != null);
-  }
-
-  public String toString()
-  {
-    return getWSILLinkLocation();
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddBusinessToFavoritesTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddBusinessToFavoritesTool.java
deleted file mode 100644
index f924206e6..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddBusinessToFavoritesTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.AddToFavoritesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class AddBusinessToFavoritesTool extends ActionTool {
-    public AddBusinessToFavoritesTool(ToolManager toolManager, String alt) {
-        super(toolManager, "images/favorites_enabled.gif", "images/favorites_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
-    }
-
-    public String getActionLink() {
-        Node selectedNode = toolManager_.getNode();
-        return AddToFavoritesAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_);
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddBusinessToUDDIPerspectiveTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddBusinessToUDDIPerspectiveTool.java
deleted file mode 100644
index d89451d1d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddBusinessToUDDIPerspectiveTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.AddBusinessToUDDIPerspectiveAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class AddBusinessToUDDIPerspectiveTool extends ActionTool {
-    public AddBusinessToUDDIPerspectiveTool(ToolManager toolManager, String alt) {
-        super(toolManager, "wsil/images/add_to_UDDI_perspective_enabled.gif", "wsil/images/add_to_UDDI_perspective_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
-    }
-
-    public String getActionLink() {
-        Node selectedNode = toolManager_.getNode();
-        return AddBusinessToUDDIPerspectiveAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_);
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddServiceToFavoritesTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddServiceToFavoritesTool.java
deleted file mode 100644
index b98c2c6e3..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddServiceToFavoritesTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.AddToFavoritesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class AddServiceToFavoritesTool extends ActionTool {
-    public AddServiceToFavoritesTool(ToolManager toolManager, String alt) {
-        super(toolManager, "images/favorites_enabled.gif", "images/favorites_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
-    }
-
-    public String getActionLink() {
-        Node selectedNode = toolManager_.getNode();
-        return AddToFavoritesAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_);
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddServiceToUDDIPerspectiveTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddServiceToUDDIPerspectiveTool.java
deleted file mode 100644
index c4a921ce8..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddServiceToUDDIPerspectiveTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.AddServiceToUDDIPerspectiveAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class AddServiceToUDDIPerspectiveTool extends ActionTool {
-    public AddServiceToUDDIPerspectiveTool(ToolManager toolManager, String alt) {
-        super(toolManager, "wsil/images/add_to_UDDI_perspective_enabled.gif", "wsil/images/add_to_UDDI_perspective_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
-    }
-
-    public String getActionLink() {
-        Node selectedNode = toolManager_.getNode();
-        return AddServiceToUDDIPerspectiveAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_);
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddWSDLServiceToFavoritesTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddWSDLServiceToFavoritesTool.java
deleted file mode 100644
index 5f0316a91..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddWSDLServiceToFavoritesTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.AddToFavoritesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class AddWSDLServiceToFavoritesTool extends ActionTool {
-    public AddWSDLServiceToFavoritesTool(ToolManager toolManager, String alt) {
-        super(toolManager, "images/favorites_enabled.gif", "images/favorites_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
-    }
-
-    public String getActionLink() {
-        Node selectedNode = toolManager_.getNode();
-        return AddToFavoritesAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_);
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddWSILToFavoritesTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddWSILToFavoritesTool.java
deleted file mode 100644
index da3cb45ce..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddWSILToFavoritesTool.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.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.AddToFavoritesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class AddWSILToFavoritesTool extends ActionTool {
-    public AddWSILToFavoritesTool(ToolManager toolManager, String alt) {
-        super(toolManager, "images/favorites_enabled.gif", "images/favorites_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public String getActionLink() {
-        Node selectedNode = toolManager_.getNode();
-        return AddToFavoritesAction.getActionLink(selectedNode.getNodeId(), toolId_, ActionInputs.VIEWID_DEFAULT, ActionInputs.VIEWTOOLID_DEFAULT);
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ClearWSILTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ClearWSILTool.java
deleted file mode 100644
index 4acc5fdbc..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ClearWSILTool.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.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.ClearWSILAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class ClearWSILTool extends ActionTool {
-    public ClearWSILTool(ToolManager toolManager, String alt) {
-        super(toolManager, "images/clear_enabled.gif", "images/clear_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public String getActionLink() {
-        return ClearWSILAction.getActionLink(toolManager_.getNode().getNodeId());
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ImportWSDLToFileSystemTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ImportWSDLToFileSystemTool.java
deleted file mode 100644
index b871050e3..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ImportWSDLToFileSystemTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ImportToFileSystemTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.ImportWSDLToFileSystemAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class ImportWSDLToFileSystemTool extends ImportToFileSystemTool {
-    public ImportWSDLToFileSystemTool(ToolManager toolManager, String alt) {
-        super(toolManager, alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
-    }
-
-    public String getActionLink() {
-        Node selectedNode = toolManager_.getNode();
-        return ImportWSDLToFileSystemAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_);
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ImportWSILToFileSystemTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ImportWSILToFileSystemTool.java
deleted file mode 100644
index dd00c2820..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ImportWSILToFileSystemTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ImportToFileSystemTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.ImportWSILToFileSystemAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class ImportWSILToFileSystemTool extends ImportToFileSystemTool {
-    public ImportWSILToFileSystemTool(ToolManager toolManager, String alt) {
-        super(toolManager, alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public String getActionLink() {
-        return ImportWSILToFileSystemAction.getActionLink(toolManager_.getNode().getNodeId(), toolId_, ActionInputs.VIEWID_DEFAULT, ActionInputs.VIEWTOOLID_DEFAULT);
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListUDDIBusinessTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListUDDIBusinessTool.java
deleted file mode 100644
index 1c7c092c0..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListUDDIBusinessTool.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.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ProxyLoadPageAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ViewTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class ListUDDIBusinessTool extends ViewTool {
-    public ListUDDIBusinessTool(ToolManager toolManager, String alt) {
-        super(toolManager, "wsil/images/list_business_enabled.gif", "wsil/images/list_business_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    protected void addSetDefaultViewTool(ToolManager viewToolManager, int index) {
-        new WsilSetDefaultViewTool(viewToolManager,  toolManager_.getNode().getNodeManager().getController().getMessage("ALT_BACK_TO_TOP"));
-    }
-
-    protected void addTools(ToolManager viewToolManager, int index) {
-        new UddiBusinessDetailsTool(viewToolManager, toolManager_.getNode().getNodeManager().getController().getWSILPerspective().getMessage("ALT_UDDI_LINK_DETAILS"));
-        new AddBusinessToUDDIPerspectiveTool(viewToolManager, toolManager_.getNode().getNodeManager().getController().getWSILPerspective().getMessage("ALT_ADD_BUSINESS_TO_UDDI_PERSPECTIVE"));
-        new AddBusinessToFavoritesTool(viewToolManager, toolManager_.getNode().getNodeManager().getController().getWSILPerspective().getMessage("ALT_ADD_UDDI_BUSINESS_TO_FAVORITES"));
-        new RefreshUDDIBusinessTool(viewToolManager, toolManager_.getNode().getNodeManager().getController().getWSILPerspective().getMessage("ALT_REFRESH_UDDI_BUSINESS"));
-    }
-
-    public String getFormLink() {
-        return ProxyLoadPageAction.getActionLink("wsil/views/UddiBusinessView.jsp");
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListUDDIServicesTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListUDDIServicesTool.java
deleted file mode 100644
index 18884f6a7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListUDDIServicesTool.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.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ProxyLoadPageAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ViewTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class ListUDDIServicesTool extends ViewTool {
-    public ListUDDIServicesTool(ToolManager toolManager, String alt) {
-        super(toolManager, "wsil/images/list_UDDI_service_enabled.gif", "wsil/images/list_UDDI_service_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    protected void addSetDefaultViewTool(ToolManager viewToolManager, int index) {
-        new WsilSetDefaultViewTool(viewToolManager,  toolManager_.getNode().getNodeManager().getController().getMessage("ALT_BACK_TO_TOP"));
-    }
-
-    protected void addTools(ToolManager viewToolManager, int index) {
-        Controller controller = toolManager_.getNode().getNodeManager().getController();
-        WSILPerspective wsilPerspective = controller.getWSILPerspective();
-        new UddiServiceDetailsTool(viewToolManager, wsilPerspective.getMessage("ALT_WSIL_SERVICE_DETAILS"));
-        new WsilImportWSDLToWorkbenchTool(viewToolManager, controller.getMessage("ALT_IMPORT_WSDL_TO_WORKBENCH"));
-        new ImportWSDLToFileSystemTool(viewToolManager, controller.getMessage("ALT_WSDL_IMPORT_TO_FS"));
-        new WsilLaunchWebServiceWizardTool(viewToolManager, controller.getMessage("ALT_LAUNCH_WEB_SERVICE_WIZARD"));
-        new AddServiceToUDDIPerspectiveTool(viewToolManager, wsilPerspective.getMessage("ALT_ADD_SERVICE_TO_UDDI_PERSPECTIVE"));
-        new AddServiceToFavoritesTool(viewToolManager, wsilPerspective.getMessage("ALT_ADD_SERVICE_TO_FAVORITES"));
-        new RefreshUDDIServiceTool(viewToolManager, wsilPerspective.getMessage("ALT_REFRESH_UDDI_SERVICE"));
-    }
-
-    public String getFormLink() {
-        return ProxyLoadPageAction.getActionLink("wsil/views/UddiServicesView.jsp");
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListWSDLServicesTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListWSDLServicesTool.java
deleted file mode 100644
index 1f7760880..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListWSDLServicesTool.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ViewTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class ListWSDLServicesTool extends ViewTool {
-    public ListWSDLServicesTool(ToolManager toolManager, String alt) {
-        super(toolManager, "wsil/images/list_WSDL_service_enabled.gif", "wsil/images/list_WSDL_service_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    protected void addSetDefaultViewTool(ToolManager viewToolManager, int index) {
-        new WsilSetDefaultViewTool(viewToolManager,  toolManager_.getNode().getNodeManager().getController().getMessage("ALT_BACK_TO_TOP"));
-    }
-
-    protected void addTools(ToolManager viewToolManager, int index) {
-        Controller controller = toolManager_.getNode().getNodeManager().getController();
-        WSILPerspective wsilPerspective = controller.getWSILPerspective();
-        new WsdlServiceDetailsTool(viewToolManager, wsilPerspective.getMessage("ALT_WSIL_SERVICE_DETAILS"));
-        new WsilImportWSDLToWorkbenchTool(viewToolManager, controller.getMessage("ALT_IMPORT_WSDL_TO_WORKBENCH"));
-        new ImportWSDLToFileSystemTool(viewToolManager, controller.getMessage("ALT_WSDL_IMPORT_TO_FS"));
-        new WsilLaunchWebServiceWizardTool(viewToolManager, controller.getMessage("ALT_LAUNCH_WEB_SERVICE_WIZARD"));
-        new WsilAddToWSDLPerspectiveTool(viewToolManager, wsilPerspective.getMessage("ALT_ADD_WSDL_TO_WSDL_PERSPECTIVE"));
-        new AddWSDLServiceToFavoritesTool(viewToolManager, wsilPerspective.getMessage("ALT_ADD_WSDL_SERVICE_TO_FAVORITES"));
-    }
-
-    public String getFormLink() {
-        return "wsil/views/WsdlServicesView.jsp";
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListWSILLinksTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListWSILLinksTool.java
deleted file mode 100644
index 3ae52fb46..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListWSILLinksTool.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.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ViewTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class ListWSILLinksTool extends ViewTool {
-    public ListWSILLinksTool(ToolManager toolManager, String alt) {
-        super(toolManager, "wsil/images/list_WSIL_enabled.gif", "wsil/images/list_WSIL_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    protected void addSetDefaultViewTool(ToolManager viewToolManager, int index) {
-        new WsilSetDefaultViewTool(viewToolManager,  toolManager_.getNode().getNodeManager().getController().getMessage("ALT_BACK_TO_TOP"));
-    }
-
-    protected void addTools(ToolManager viewToolManager, int index) {
-        new WsilLinkDetailsTool(viewToolManager, toolManager_.getNode().getNodeManager().getController().getWSILPerspective().getMessage("ALT_WSIL_LINK_DETAILS"));
-        new OpenWSILLinkTool(viewToolManager, toolManager_.getNode().getNodeManager().getController().getWSILPerspective().getMessage("ALT_OPEN_WSIL_LINK"));
-    }
-
-    public String getFormLink() {
-        return "wsil/views/WsilLinksView.jsp";
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/OpenWSILLinkTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/OpenWSILLinkTool.java
deleted file mode 100644
index c0c61fba4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/OpenWSILLinkTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.OpenWSILLinkAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class OpenWSILLinkTool extends ActionTool {
-    public OpenWSILLinkTool(ToolManager toolManager, String alt) {
-        super(toolManager, "wsil/images/open_wsil_enabled.gif", "wsil/images/open_wsil_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
-    }
-
-    public String getActionLink() {
-        Node selectedNode = toolManager_.getNode();
-        return OpenWSILLinkAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_);
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/OpenWSILTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/OpenWSILTool.java
deleted file mode 100644
index d9d500934..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/OpenWSILTool.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.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class OpenWSILTool extends FormTool {
-    public OpenWSILTool(ToolManager toolManager, String alt) {
-        super(toolManager, "wsil/images/open_wsil_enabled.gif", "wsil/images/open_wsil_highlighted.gif", alt);
-    }
-
-    protected void initDefaultProperties() {
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public String getFormLink() {
-        return "wsil/forms/OpenWSILForm.jsp";
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/RefreshUDDIBusinessTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/RefreshUDDIBusinessTool.java
deleted file mode 100644
index 5b22a8612..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/RefreshUDDIBusinessTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.RefreshAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class RefreshUDDIBusinessTool extends ActionTool {
-    public RefreshUDDIBusinessTool(ToolManager toolManager, String alt) {
-        super(toolManager, "images/refresh_enabled.gif", "images/refresh_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
-    }
-
-    public String getActionLink() {
-        Node selectedNode = toolManager_.getNode();
-        return RefreshAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_);
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/RefreshUDDIServiceTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/RefreshUDDIServiceTool.java
deleted file mode 100644
index cc98791be..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/RefreshUDDIServiceTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.RefreshAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class RefreshUDDIServiceTool extends ActionTool {
-    public RefreshUDDIServiceTool(ToolManager toolManager, String alt) {
-        super(toolManager, "images/refresh_enabled.gif", "images/refresh_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
-    }
-
-    public String getActionLink() {
-        Node selectedNode = toolManager_.getNode();
-        return RefreshAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_);
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/RefreshWSILTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/RefreshWSILTool.java
deleted file mode 100644
index 00a3c5b3a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/RefreshWSILTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.RefreshAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class RefreshWSILTool extends ActionTool {
-    public RefreshWSILTool(ToolManager toolManager, String alt) {
-        super(toolManager, "images/refresh_enabled.gif", "images/refresh_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public String getActionLink() {
-        return RefreshAction.getActionLink(toolManager_.getNode().getNodeId(), toolId_, ActionInputs.VIEWID_DEFAULT, ActionInputs.VIEWTOOLID_DEFAULT);
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/UddiBusinessDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/UddiBusinessDetailsTool.java
deleted file mode 100644
index f9db177b6..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/UddiBusinessDetailsTool.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.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class UddiBusinessDetailsTool extends FormTool {
-    public UddiBusinessDetailsTool(ToolManager toolManager, String alt) {
-        super(toolManager, "images/details_enabled.gif", "images/details_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
-    }
-
-    public String getFormLink() {
-        return "wsil/forms/UddiBusinessDetailsPage.jsp";
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/UddiServiceDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/UddiServiceDetailsTool.java
deleted file mode 100644
index 5d3f5cdc1..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/UddiServiceDetailsTool.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.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class UddiServiceDetailsTool extends FormTool {
-    public UddiServiceDetailsTool(ToolManager toolManager, String alt) {
-        super(toolManager, "images/details_enabled.gif", "images/details_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
-    }
-
-    public String getFormLink() {
-        return "wsil/forms/UddiServiceDetailsPage.jsp";
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WSILImportWSILToWorkbenchTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WSILImportWSILToWorkbenchTool.java
deleted file mode 100644
index be28ec8e2..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WSILImportWSILToWorkbenchTool.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.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ImportToWorkbenchTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class WSILImportWSILToWorkbenchTool extends ImportToWorkbenchTool
-{
-  public WSILImportWSILToWorkbenchTool(ToolManager toolManager, String alt)
-  {
-    super(toolManager, alt);
-  }
-
-  public String getSelectToolActionHref(boolean forHistory)
-  {
-    Node selectedNode = toolManager_.getNode();
-    return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-  }
-
-  public final String getFormLink()
-  {
-    return "wsil/forms/WSILImportWSILToWorkbenchForm.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WSILPerspective.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WSILPerspective.java
deleted file mode 100644
index 3940f62ee..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WSILPerspective.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.ws.internal.explorer.platform.wsil.perspective;
-
-import javax.servlet.ServletContext;
-import org.eclipse.wst.ws.internal.datamodel.BasicModel;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Perspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SwitchPerspectiveFromWSILAction;
-
-public class WSILPerspective extends Perspective
-{
-    private BasicModel model_;
-    private NodeManager nodeManager_;
-    private String perspectiveContentFramesetCols_;
-    private String savedPerspectiveContentFramesetCols_;
-    private String actionsContainerFramesetRows_;
-    private String savedActionsContainerFramesetRows_;
-
-    public WSILPerspective(Controller controller)
-    {
-        super("wsil",controller);
-    }
-
-    public final void initPerspective(ServletContext application)
-    {
-        model_ = new BasicModel("WsilModel");
-        TreeElement treeElement = new TreeElement(getMessage("WSIL_MAIN_NODE"), model_);
-        model_.setRootElement(treeElement);
-        nodeManager_ = new NodeManager(controller_);
-        WsilMainNode wsilMainNode = new WsilMainNode(treeElement, nodeManager_);
-        nodeManager_.setRootNode(wsilMainNode);
-
-        // Starting frameset sizes.
-        if (!DirUtils.isRTL())
-          perspectiveContentFramesetCols_ = "30%,*";
-        else
-          perspectiveContentFramesetCols_ = "*,30%";
-        savedPerspectiveContentFramesetCols_ = perspectiveContentFramesetCols_;
-        actionsContainerFramesetRows_ = "75%,*";
-        savedActionsContainerFramesetRows_ = actionsContainerFramesetRows_;
-    }
-
-    public NodeManager getNodeManager() {
-        return nodeManager_;
-    }
-
-    public String getPerspectiveContentPage()
-    {
-        return "wsil/wsil_perspective_content.jsp";
-    }
-
-    public int getPerspectiveId()
-    {
-        return ActionInputs.PERSPECTIVE_WSIL;
-    }
-
-    public String getPanesFile() {
-        return "wsil/scripts/wsilPanes.jsp";
-    }
-    
-    public String getFramesetsFile()
-    {
-      return "wsil/scripts/wsilframesets.jsp";
-    }
-    
-    public String getProcessFramesetsForm()
-    {
-      return "wsil/forms/ProcessWSILFramesetsForm.jsp";
-    }
-
-    public String getTreeContentVar() {
-        return "wsilNavigatorContent";
-    }
-
-    public String getTreeContentPage() {
-        return "wsil/wsil_navigator_content.jsp";
-    }
-
-    public String getPropertiesContainerVar() {
-        return "wsilPropertiesContainer";
-    }
-
-    public String getPropertiesContainerPage() {
-        return "wsil/wsil_properties_container.jsp";
-    }
-
-    public String getStatusContentVar() {
-        return "wsilStatusContent";
-    }
-
-    public String getStatusContentPage() {
-        return "wsil/wsil_status_content.jsp";
-    }
-    
-    public final String getPerspectiveContentFramesetCols()
-    {
-      return perspectiveContentFramesetCols_;
-    }
-    
-    public final void setPerspectiveContentFramesetCols(String cols)
-    {
-      perspectiveContentFramesetCols_ = cols;
-    }
-    
-    public final String getSavedPerspectiveContentFramesetCols()
-    {
-      return savedPerspectiveContentFramesetCols_;
-    }
-    
-    public final void setSavedPerspectiveContentFramesetCols(String cols)
-    {
-      savedPerspectiveContentFramesetCols_ = cols;
-    }
-    
-    public final String getActionsContainerFramesetRows()
-    {
-      return actionsContainerFramesetRows_;
-    }
-    
-    public final void setActionsContainerFramesetRows(String rows)
-    {
-      actionsContainerFramesetRows_ = rows;
-    }
-    
-    public final String getSavedActionsContainerFramesetRows()
-    {
-      return savedActionsContainerFramesetRows_;
-    }
-    
-    public final void setSavedActionsContainerFramesetRows(String rows)
-    {
-      savedActionsContainerFramesetRows_ = rows;
-    }
-    
-    public final String getSwitchPerspectiveFormActionLink(int targetPerspectiveId,boolean forHistory)
-    {
-      return SwitchPerspectiveFromWSILAction.getFormActionLink(targetPerspectiveId,forHistory);
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsdlServiceDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsdlServiceDetailsTool.java
deleted file mode 100644
index 7efdfe6de..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsdlServiceDetailsTool.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.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class WsdlServiceDetailsTool extends FormTool {
-    public WsdlServiceDetailsTool(ToolManager toolManager, String alt) {
-        super(toolManager, "images/details_enabled.gif", "images/details_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
-    }
-
-    public String getFormLink() {
-        return "wsil/forms/WsdlServiceDetailsPage.jsp";
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilAddToWSDLPerspectiveTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilAddToWSDLPerspectiveTool.java
deleted file mode 100644
index b8fba6bd9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilAddToWSDLPerspectiveTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.AddToWSDLPerspectiveTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.WsilAddToWSDLPerspectiveAction;
-
-public class WsilAddToWSDLPerspectiveTool extends AddToWSDLPerspectiveTool {
-
-  public WsilAddToWSDLPerspectiveTool(ToolManager toolManager, String alt) {
-    super(toolManager,alt);
-  }
-
-  public String getSelectToolActionHref(boolean forHistory) {
-    Node selectedNode = toolManager_.getNode();
-    return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
-  }
-
-  public String getActionLink() {
-    Node selectedNode = toolManager_.getNode();
-    return WsilAddToWSDLPerspectiveAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_);
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilDetailsTool.java
deleted file mode 100644
index caecb8d96..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilDetailsTool.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.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class WsilDetailsTool extends FormTool {
-    public WsilDetailsTool(ToolManager toolManager, String alt) {
-        super(toolManager, "images/details_enabled.gif", "images/details_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public String getFormLink() {
-        return "wsil/forms/WsilDetailsPage.jsp";
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilImportWSDLToWorkbenchTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilImportWSDLToWorkbenchTool.java
deleted file mode 100644
index 0371249ec..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilImportWSDLToWorkbenchTool.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.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ImportToWorkbenchTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class WsilImportWSDLToWorkbenchTool extends ImportToWorkbenchTool {
-    public WsilImportWSDLToWorkbenchTool(ToolManager toolManager, String alt) {
-        super(toolManager, alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
-    }
-
-    public final String getFormLink()
-    {
-      return "wsil/forms/WsilImportWSDLToWorkbenchForm.jsp";
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilLaunchWebServiceWizardTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilLaunchWebServiceWizardTool.java
deleted file mode 100644
index cd3110a6b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilLaunchWebServiceWizardTool.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.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.LaunchWebServiceWizardTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class WsilLaunchWebServiceWizardTool extends LaunchWebServiceWizardTool {
-    public WsilLaunchWebServiceWizardTool(ToolManager toolManager, String alt) {
-        super(toolManager, alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
-    }
-
-    public final String getFormLink()
-    {
-      return "wsil/forms/WsilLaunchWebServiceWizardForm.jsp";
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilLinkDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilLinkDetailsTool.java
deleted file mode 100644
index 786540471..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilLinkDetailsTool.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.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class WsilLinkDetailsTool extends FormTool {
-    public WsilLinkDetailsTool(ToolManager toolManager, String alt) {
-        super(toolManager, "images/details_enabled.gif", "images/details_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
-    }
-
-    public String getFormLink() {
-        return "wsil/forms/WsilLinkDetailsPage.jsp";
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilMainNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilMainNode.java
deleted file mode 100644
index 3e55b4a5c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilMainNode.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.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants;
-
-public class WsilMainNode extends WsilNavigatorNode {
-
-    public WsilMainNode(TreeElement treeElement, NodeManager nodeManager) {
-        super(treeElement, nodeManager, 1, "images/root_main.gif");
-        treeElement.addListener(new ElementAdapter() {
-                                                   public void relAdded(RelAddEvent event) {
-                                                       String rel = event.getOutBoundRelName();
-                                                       if (rel.equals(WsilModelConstants.REL_WSIL)) {
-                                                           WsilNode wsilNode = new WsilNode((TreeElement)event.getParentElement(), nodeManager_, nodeDepth_ + 1);
-                                                           addChild(wsilNode);
-                                                       }
-                                                   }
-
-                                                   public void relRemoved(RelRemoveEvent event) {
-                                                       TreeElement childElement = null;
-                                                       if (event.getInBoundRelName().equals(WsilModelConstants.REL_WSIL)) {
-                                                           childElement = (TreeElement)event.getInboundElement();
-                                                       }
-                                                       if (event.getOutBoundRelName().equals(WsilModelConstants.REL_WSIL)) {
-                                                           childElement = (TreeElement)event.getOutBoundElement();
-                                                       }
-                                                       removeChildNode(childElement);
-                                                   }
-                                               });
-    }
-
-    protected void initTools() {
-        WSILPerspective wsilPerspective = nodeManager_.getController().getWSILPerspective();
-        new OpenWSILTool(toolManager_, wsilPerspective.getMessage("ALT_OPEN_WSIL"));
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilNavigatorNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilNavigatorNode.java
deleted file mode 100644
index 6a22957ee..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilNavigatorNode.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.WsilToggleNodeAction;
-
-public abstract class WsilNavigatorNode extends Node {
-
-    public WsilNavigatorNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth, String imagePath) {
-        super(treeElement, nodeManager, nodeDepth, imagePath);
-    }
-
-    protected String getToggleNodeActionHref() {
-        return WsilToggleNodeAction.getActionLink(nodeId_,isOpen_);
-    }
-
-    protected String getLinkActionHref() {
-        return SelectWSILNodeAction.getActionLink(nodeId_, false);
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilNode.java
deleted file mode 100644
index aa869edff..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilNode.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.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class WsilNode extends WsilNavigatorNode {
-
-    public WsilNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) {
-        super(treeElement, nodeManager, nodeDepth, "wsil/images/wsil_node.gif");
-    }
-
-    protected void initTools() {
-        Controller controller = nodeManager_.getController();
-        WSILPerspective wsilPerspective = controller.getWSILPerspective();
-        new WsilDetailsTool(toolManager_, wsilPerspective.getMessage("ALT_WSIL_DETAILS"));
-        new ListWSDLServicesTool(toolManager_, wsilPerspective.getMessage("ALT_LIST_WSDL_SERVICES"));
-        new ListUDDIServicesTool(toolManager_, wsilPerspective.getMessage("ALT_LIST_UDDI_SERVICES"));
-        new ListUDDIBusinessTool(toolManager_, wsilPerspective.getMessage("ALT_LIST_UDDI_LINKS"));
-        new ListWSILLinksTool(toolManager_, wsilPerspective.getMessage("ALT_LIST_WSIL_LINKS"));
-        new WSILImportWSILToWorkbenchTool(toolManager_, wsilPerspective.getMessage("ATL_IMPORT_WSIL_TO_WORKBENCH"));
-        new ImportWSILToFileSystemTool(toolManager_, controller.getMessage("ALT_WSIL_IMPORT_TO_FS"));
-        new AddWSILToFavoritesTool(toolManager_, wsilPerspective.getMessage("ALT_ADD_WSIL_TO_FAVORITES"));
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilSetDefaultViewTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilSetDefaultViewTool.java
deleted file mode 100644
index 39f63382e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilSetDefaultViewTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.SetDefaultViewTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class WsilSetDefaultViewTool extends SetDefaultViewTool {
-    public WsilSetDefaultViewTool(ToolManager toolManager, String alt) {
-        super(toolManager, alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), ActionInputs.VIEWID_DEFAULT, ActionInputs.VIEWTOOLID_DEFAULT, forHistory);
-    }
-
-    public String getActionLink() {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), ActionInputs.VIEWID_DEFAULT, ActionInputs.VIEWTOOLID_DEFAULT, false);
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/transformer/WSILViewSelectionTransformer.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/transformer/WSILViewSelectionTransformer.java
deleted file mode 100644
index eb349ec89..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/transformer/WSILViewSelectionTransformer.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.explorer.platform.wsil.transformer;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ViewSelectionTransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListUDDIBusinessTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListUDDIServicesTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListWSDLServicesTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListWSILLinksTool;
-
-public class WSILViewSelectionTransformer extends ViewSelectionTransformer
-{
-  public static final byte NONE = 0;
-  public static final byte WSDL_SERVICE = 1;
-  public static final byte UDDI_SERVICE = 2;
-  public static final byte UDDI_BUSINESS = 3;
-  public static final byte WSIL_LINK = 4;
-  public static final byte FROM_TOOLID = 5;
-  private byte type;
-
-  public WSILViewSelectionTransformer(Controller controller)
-  {
-    this(controller, "", ActionInputs.VIEWID, FROM_TOOLID);
-  }
-
-  public WSILViewSelectionTransformer(Controller controller, String listManagerKey, String viewKey, byte type)
-  {
-    super(controller, listManagerKey, viewKey);
-    this.type = type;
-  }
-
-  public Hashtable normalize(Hashtable properties)
-  {
-    if (type == FROM_TOOLID)
-    {
-      Node currNode = controller.getCurrentPerspective().getNodeManager().getSelectedNode();
-      if (currNode != null)
-      {
-        try
-        {
-          int toolId = Integer.parseInt((String) properties.get(ActionInputs.TOOLID));
-          ToolManager toolManager = currNode.getToolManager();
-          Tool tool = toolManager.getTool(toolId);
-          if (tool instanceof ListWSDLServicesTool)
-            listManagerKey = WsilModelConstants.LIST_MANAGER_WSDL_SERVICES;
-          else if (tool instanceof ListUDDIServicesTool)
-            listManagerKey = WsilModelConstants.LIST_MANAGER_UDDI_SERVICES;
-          else if (tool instanceof ListUDDIBusinessTool)
-            listManagerKey = WsilModelConstants.LIST_MANAGER_UDDI_LINKS;
-          else if (tool instanceof ListWSILLinksTool)
-            listManagerKey = WsilModelConstants.LIST_MANAGER_WSIL_LINKS;
-        }
-        catch (NumberFormatException nfe)
-        {
-        }
-      }
-    }
-    return super.normalize(properties);
-  }
-
-  public Hashtable deNormalize(Hashtable properties)
-  {
-    Node currNode = controller.getCurrentPerspective().getNodeManager().getSelectedNode();
-    if (currNode != null)
-    {
-      TreeElement currElement = currNode.getTreeElement();
-      if (currElement instanceof WsilElement)
-      {
-        WsilElement wsilElement = (WsilElement) currElement;
-        switch (type)
-        {
-          case WSDL_SERVICE :
-            wsilElement.getAllWSDLServices();
-            break;
-          case UDDI_SERVICE :
-            wsilElement.getAllUDDIServices();
-            break;
-          case UDDI_BUSINESS :
-            wsilElement.getAllUDDILinks();
-            break;
-          case WSIL_LINK :
-            wsilElement.getAllWSILLinks();
-            break;
-          case FROM_TOOLID :
-            try
-            {
-              int toolId = Integer.parseInt((String) properties.get(ActionInputs.TOOLID));
-              ToolManager toolManager = currNode.getToolManager();
-              Tool tool = toolManager.getTool(toolId);
-              if (tool instanceof ListWSDLServicesTool)
-              {
-                listManagerKey = WsilModelConstants.LIST_MANAGER_WSDL_SERVICES;
-                wsilElement.getAllWSDLServices();
-              }
-              else if (tool instanceof ListUDDIServicesTool)
-              {
-                listManagerKey = WsilModelConstants.LIST_MANAGER_UDDI_SERVICES;
-                wsilElement.getAllUDDIServices();
-              }
-              else if (tool instanceof ListUDDIBusinessTool)
-              {
-                listManagerKey = WsilModelConstants.LIST_MANAGER_UDDI_LINKS;
-                wsilElement.getAllUDDILinks();
-              }
-              else if (tool instanceof ListWSILLinksTool)
-              {
-                listManagerKey = WsilModelConstants.LIST_MANAGER_WSIL_LINKS;
-                wsilElement.getAllWSILLinks();
-              }
-            }
-            catch (NumberFormatException nfe)
-            {
-            }
-            break;
-          default :
-            break;
-        }
-      }
-    }
-    return super.deNormalize(properties);
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/actions/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/actions/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/actions/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/actions/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/actions/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/actions/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/forms/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/forms/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/forms/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/scripts/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/scripts/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/scripts/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/views/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/views/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/views/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/forms/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/forms/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/forms/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/scripts/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/scripts/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/scripts/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/uddi/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/uddi/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/uddi/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/uddi/actions/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/uddi/actions/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/uddi/actions/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/uddi/forms/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/uddi/forms/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/uddi/forms/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/uddi/scripts/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/uddi/scripts/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/uddi/scripts/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/actions/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/actions/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/actions/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/forms/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/forms/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/forms/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/fragment/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/fragment/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/fragment/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/scripts/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/scripts/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/scripts/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/actions/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/actions/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/actions/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/forms/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/forms/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/forms/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/scripts/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/scripts/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/scripts/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/views/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/views/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/views/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/lib/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/lib/.cvsignore
deleted file mode 100644
index 40b582992..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/lib/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.jar
-wsexplorersrc.zip
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/web.xml b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/web.xml
deleted file mode 100644
index 5802e33b5..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/web.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-    "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<web-app>
-</web-app>
-
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actionengine.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actionengine.jsp
deleted file mode 100644
index a90b044fc..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actionengine.jsp
+++ /dev/null
@@ -1,91 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.engine.ActionEngine,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.engine.ActionDataParser,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.engine.data.ScenarioDescriptor,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.engine.data.TransactionDescriptor,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.engine.data.ActionDescriptor,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.XMLUtils,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.HTMLUtils,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser,
-                                                        java.util.List,
-                                                        java.util.Iterator" %>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-String mode = request.getParameter(ActionInputs.ACTION_ENGINE_MODE);
-String scenario = null;
-try
-{
-  MultipartFormDataParser parser = new MultipartFormDataParser();
-  parser.parseRequest(request, HTMLUtils.UTF8_ENCODING);
-  scenario = parser.getParameter(ActionInputs.ACTION_ENGINE_SCENARIO);
-}
-catch (Throwable t)
-{
-}
-ActionEngine actionEngine = controller.getActionEngine();
-if (mode != null)
-{
-  actionEngine.setMode(ActionEngine.MODE_DISABLED);
-  try
-  {
-    actionEngine.setMode(Byte.parseByte(mode));
-  }
-  catch (NumberFormatException nfe)
-  {
-  }
-}
-if (scenario != null && scenario.length() > 0)
-{
-  ScenarioDescriptor scenarioDescriptor = null;
-  try
-  {
-    ActionDataParser parser = new ActionDataParser();
-    scenarioDescriptor = parser.parseScenario(XMLUtils.stringToElement(scenario));
-    actionEngine.executeScenario(scenarioDescriptor);
-  }
-  catch (Throwable t)
-  {
-  }
-  if (scenarioDescriptor != null)
-  {
-    TransactionDescriptor[] transactionDescriptors = scenarioDescriptor.getTransactionDescriptors();
-    for (int i = 0; i < transactionDescriptors.length; i++)
-    {
-      ActionDescriptor[] actionDescriptors = transactionDescriptors[i].getActionDescriptors();
-      for (int j = 0; j < actionDescriptors.length; j++)
-      {
-        %>
-        <!--
-        <%=actionDescriptors[j].getId()%>
-        <%=actionDescriptors[j].getStatusId()%>
-        <%
-        List status = actionDescriptors[j].getStatus();
-        if (status != null)
-        {
-          for (Iterator it = status.iterator(); it.hasNext();)
-          {
-            %>
-            <%=it.next().toString()%>
-            <%
-          }
-        }
-        %>
-        -->
-        <%
-      }
-    }
-  }
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actionengine_container.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actionengine_container.jsp
deleted file mode 100644
index f9fc6cf1e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actionengine_container.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.engine.ActionEngine,
-                                                        java.net.*" %>
-<%
-String sessionId = request.getParameter(ActionInputs.SESSIONID);
-HttpSession currentSession = (HttpSession)application.getAttribute(sessionId);
-Controller controller = (Controller)currentSession.getAttribute("controller");
-ActionEngine actionEngine = controller.getActionEngine();
-String modeString = request.getParameter(ActionInputs.ACTION_ENGINE_MODE);
-if (modeString != null && modeString.length() > 0)
-{
-  try
-  {
-    byte mode = Byte.parseByte(modeString);
-    actionEngine.setMode(mode);
-  }
-  catch (Throwable t)
-  {
-  }
-}
-String playFileId = "playFileId";
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=controller.getMessage("TITLE_ACTION_RECORDER")%></title>
-  <script language="javascript">
-    function setMode(mode)
-    {
-      <%
-      StringBuffer formAction = new StringBuffer(response.encodeURL(controller.getPathWithContext("actionengine_container.jsp?")));
-      formAction.append(ActionInputs.SESSIONID);
-      formAction.append("=");
-      formAction.append(sessionId);
-      formAction.append("&");
-      formAction.append(ActionInputs.ACTION_ENGINE_MODE);
-      formAction.append("=");
-      %>
-      var form = document.forms[0];
-      form.action = '<%=formAction.toString()%>' + mode;
-      form.target = "_self";
-      form.submit();
-    }
-
-    function play()
-    {
-      var playFile = document.getElementById("<%=playFileId%>");
-      if (playFile.value != null && playFile.value.length > 0)
-      {
-        var form = document.forms[0];
-        form.action = '<%=response.encodeURL(controller.getPathWithContext("wsexplorer.jsp"))%>';
-        form.target = "<%=FrameNames.WINDOW_NAME_WSEXPLORER_JSP%>";
-        form.enctype = "multipart/form-data";
-        // for backward compatibility
-        form.encoding = "multipart/form-data";
-        form.submit();
-        setMode('<%=ActionEngine.MODE_PLAY%>');
-      }
-      else
-        alert('<%=controller.getMessage("MSG_ERROR_INVALID_PLAY_FILE")%>');
-    }
-
-    function save()
-    {
-      var form = document.forms[0];
-      form.action = '<%=response.encodeURL(controller.getPathWithContext("actions/SaveActionEngineScenario.jsp"))%>';
-      form.target = "_self";
-      form.submit();
-    }
-  </script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-  <form method="post">
-    <%
-    String labelModePlay = controller.getMessage("FORM_LABEL_MODE_PLAY");
-    String labelModeStop = controller.getMessage("FORM_LABEL_MODE_STOP");
-    String labelModeRecord = controller.getMessage("FORM_LABEL_MODE_RECORD");
-    String labelSave = controller.getMessage("FORM_LABEL_SAVE");
-    byte mode = actionEngine.getMode();
-    String imgPlay = (mode == ActionEngine.MODE_PLAY) ? "images/elcl16/actionengine_play.gif" : "images/dlcl16/actionengine_play.gif";
-    String imgStop = (mode == ActionEngine.MODE_STOP) ? "images/elcl16/actionengine_stop.gif" : "images/dlcl16/actionengine_stop.gif";
-    String imgRecord = (mode == ActionEngine.MODE_RECORD) ? "images/elcl16/actionengine_record.gif" : "images/dlcl16/actionengine_record.gif";
-    String imgSave = "images/dlcl16/actionengine_save.gif";
-    %>
-    <table border=0 cellpadding=3 cellspacing=3>
-      <tr>
-        <td valign="middle" align="left" class="labels" nowrap>
-          <a href="javascript:play()">
-            <img class="normal" border=0 alt="<%=labelModePlay%>" title="<%=labelModePlay%>" src="<%=response.encodeURL(controller.getPathWithContext(imgPlay))%>">
-            <%=controller.getMessage("FORM_LABEL_MODE_PLAY")%>
-          </a>
-        </td>
-        <td valign="middle" align="left" class="labels" nowrap>
-          <a href="javascript:setMode('<%=String.valueOf(ActionEngine.MODE_STOP)%>')">
-            <img class="normal" border=0 alt="<%=labelModeStop%>" title="<%=labelModeStop%>" src="<%=response.encodeURL(controller.getPathWithContext(imgStop))%>">
-            <%=controller.getMessage("FORM_LABEL_MODE_STOP")%>
-          </a>
-        </td>
-        <td valign="middle" align="left" class="labels" nowrap>
-          <a href="javascript:setMode('<%=String.valueOf(ActionEngine.MODE_RECORD)%>')">
-            <img class="normal" border=0 alt="<%=labelModeRecord%>" title="<%=labelModeRecord%>" src="<%=response.encodeURL(controller.getPathWithContext(imgRecord))%>">
-            <%=controller.getMessage("FORM_LABEL_MODE_RECORD")%>
-          </a>
-        </td>
-        <td valign="middle" align="left" class="labels" nowrap>
-          <a href="javascript:save()">
-            <img class="normal" border=0 alt="<%=labelSave%>" title="<%=labelSave%>" src="<%=response.encodeURL(controller.getPathWithContext(imgSave))%>">
-            <%=controller.getMessage("FORM_LABEL_SAVE")%>
-          </a>
-        </td>
-      </tr>
-    </table>
-    <table border=0 cellpadding=3 cellspacing=3>
-      <tr>
-        <td valign="center" align="left" class="labels" nowrap><%=controller.getMessage("FORM_LABEL_PLAY_FILE")%></td>
-        <td valign="center" align="left" class="labels">
-          <input type="file" id="<%=playFileId%>" name="<%=ActionInputs.ACTION_ENGINE_SCENARIO%>">
-        </td>
-      </tr>
-    </table>
-  </form>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/CheckWorkbenchFileReadOnlyActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/CheckWorkbenchFileReadOnlyActionJSP.jsp
deleted file mode 100644
index a8a9a783d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/CheckWorkbenchFileReadOnlyActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>                                                        
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<%
-   StringBuffer panesFile = new StringBuffer("/");
-   panesFile.append(controller.getCurrentPerspective().getPanesFile());
-%>
-<jsp:include page="<%=panesFile.toString()%>" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<script language="javascript">
-<%
-   ImportToWorkbenchAction action = (ImportToWorkbenchAction)session.getAttribute(ActionInputs.IMPORT_ACTION);
-   if (action.isTargetFileResourceReadOnly())
-   {
-%>
-  var proceed = true;
-<%   
-     if (!action.isCheckoutFilesEnabled())
-     {
-%>
-  proceed = confirm("<%=HTMLUtils.JSMangle(action.getWebServicePluginFileMessage("MSG_ERROR_FILE_CHECKOUT_DISABLED"))%>");
-<%     
-     }
-%>
-  if (proceed)
-    perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(ValidateEditAction.getActionLink()))%>";
-<%     
-   }
-   else
-   {
-%>
-  perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(WriteWSDLToWorkbenchAction.getActionLink()))%>";
-<%
-   }
-%>     
-</script>
-</body>
-</html>   
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ClearNodeAction.inc b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ClearNodeAction.inc
deleted file mode 100644
index 18f981dc0..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ClearNodeAction.inc
+++ /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
- *******************************************************************************/
-%>
-<%
-   Perspective currentPerspective = controller.getCurrentPerspective();
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<%
-   StringBuffer panesFile = new StringBuffer("/");
-   panesFile.append(currentPerspective.getPanesFile());
-%>
-<jsp:include page="<%=panesFile.toString()%>" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<script language="javascript">
-  if (isMicrosoftInternetExplorer())
-  {    
-<%
-   String treeContentVar = action.getTreeContentVar();
-   if (treeContentVar != null)
-   {
-%>
-    <%=treeContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getTreeContentPage()))%>";
-<%
-   }
-   String propertiesContainerVar = action.getPropertiesContainerVar();
-   if (propertiesContainerVar != null)
-   {
-%>
-    <%=propertiesContainerVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getPropertiesContainerPage()))%>";
-<%   
-   }
-   String statusContentVar = action.getStatusContentVar();
-   if (statusContentVar != null)
-   {
-%>
-    <%=statusContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getStatusContentPage()))%>";
-<%
-   }
-%>
-  }
-  else
-    perspectiveContent.location = "<%=response.encodeURL(controller.getPathWithContext(currentPerspective.getPerspectiveContentPage()))%>";
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ClearViewElementAction.inc b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ClearViewElementAction.inc
deleted file mode 100644
index 24ee121ef..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ClearViewElementAction.inc
+++ /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
- *******************************************************************************/
-%>
-<%
-   Perspective currentPerspective = controller.getCurrentPerspective();
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<%
-   StringBuffer panesFile = new StringBuffer("/");
-   panesFile.append(currentPerspective.getPanesFile());
-%>
-<jsp:include page="<%=panesFile.toString()%>" flush="true"/>
-<head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<script language="javascript">
-<%
-   String propertiesContainerVar = action.getPropertiesContainerVar();
-   if (propertiesContainerVar != null)
-   {
-%>
-  <%=propertiesContainerVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getPropertiesContainerPage()))%>";
-<%
-   }
-   String statusContentVar = action.getStatusContentVar();
-   if (statusContentVar != null)
-   {
-%>
-  <%=statusContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getStatusContentPage()))%>";
-<%
-   }
-%>
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ImportToFileSystemAction.inc b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ImportToFileSystemAction.inc
deleted file mode 100644
index 6086b903d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ImportToFileSystemAction.inc
+++ /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
- *******************************************************************************/
-%>
-<%
-   // Load the parameters for the action from the servlet request.
-   action.populatePropertyTable(request);
-
-   // run the action
-   boolean actionResult = action.run();
-   boolean written = false;
-
-   if (actionResult)
-   {
-     // write to file system
-     response.setContentType("application/octet-stream");
-     response.setHeader("Content-Disposition","attachment;filename="+action.getDefaultFileName());
-     action.write(response.getOutputStream());
-     written = true;
-   }
-
-   if (!written)
-   {
-%>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<%
-      StringBuffer panesFile = new StringBuffer("/");
-      panesFile.append(controller.getCurrentPerspective().getPanesFile());
-%>
-<jsp:include page="<%=panesFile.toString()%>" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-      if (action.getStatusContentVar() != null)
-      {
-%>
-<script language="javascript">
-  <%=action.getStatusContentVar()%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getStatusContentPage()))%>";
-</script>
-<%
-      }
-%>      
-</body>
-</html>
-<%
-   }
-%>  
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ImportToWorkbenchAction.inc b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ImportToWorkbenchAction.inc
deleted file mode 100644
index 812ad18c8..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ImportToWorkbenchAction.inc
+++ /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
- *******************************************************************************/
-%>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<%
-   StringBuffer panesFile = new StringBuffer("/");
-   panesFile.append(controller.getCurrentPerspective().getPanesFile());
-%>
-<jsp:include page="<%=panesFile.toString()%>" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<script language="javascript">
-<%
-   //Load the parameters for the action from the servlet request.
-   boolean inputsValid = action.populatePropertyTable(request);
-   if (!inputsValid)
-   {
-     String statusContentVar = action.getStatusContentVar();
-     if (statusContentVar != null)
-     {
-%>
-  <%=statusContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getStatusContentPage()))%>";
-<%
-     }
-   }
-   else
-   {
-     session.setAttribute(ActionInputs.IMPORT_ACTION,action);   
-     if (action.fileExists())
-     {
-%>
-  var proceed = true;
-<%        
-       if (!action.isOverwriteFilesEnabled())
-       {
-%>
-  proceed = confirm("<%=HTMLUtils.JSMangle(action.getWebServicePluginFileMessage("MSG_ERROR_FILE_OVERWRITE_DISABLED"))%>");
-<%
-       }
-%>
-  if (proceed)
-    perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(CheckWorkbenchFileReadOnlyAction.getActionLink()))%>";
-<%
-     }
-     else
-     {
-%>
-  perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(WriteWSDLToWorkbenchAction.getActionLink()))%>";
-<%
-     }
-   }
-%>
-</script>   
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/LaunchWebServiceWizardAction.inc b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/LaunchWebServiceWizardAction.inc
deleted file mode 100644
index 1dbdeb68e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/LaunchWebServiceWizardAction.inc
+++ /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
- *******************************************************************************/
-%>
-<%
-   //Load the parameters for the action from the servlet request.
-   boolean inputsValid = action.populatePropertyTable(request);
-
-   // Run the action and obtain the return code (fail/success).
-   boolean actionResult = action.run();
-%>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<%
-   StringBuffer panesFile = new StringBuffer("/");
-   panesFile.append(controller.getCurrentPerspective().getPanesFile());
-%>
-<jsp:include page="<%=panesFile.toString()%>" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-   if (!actionResult)
-   {
-     String statusContentVar = action.getStatusContentVar();
-     if (statusContentVar != null)
-     {
-%>    
-<script language="javascript">
-  <%=statusContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getStatusContentPage()))%>";
-</script>
-<%
-     }
-   }
-%>   
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/RetrieveHistoryActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/RetrieveHistoryActionJSP.jsp
deleted file mode 100644
index 9ae19b3f8..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/RetrieveHistoryActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.actions.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   // Prepare the action.
-   RetrieveHistoryAction action = new RetrieveHistoryAction(controller);
-
-   // Load the parameters for the action from the servlet request.
-   action.populatePropertyTable(request);
-
-   // Run the action and obtain the return code (fail/success).
-   boolean actionResult = action.run();
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; UTF-8">
-  <jsp:include page="/scripts/panes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<script language="javascript">
-<%
-   BreadCrumb b = action.getBreadCrumb();
-   if (b != null)
-   {
-     int breadCrumbPerspectiveId = b.getPerspectiveId();
-     if (breadCrumbPerspectiveId != controller.getCurrentPerspective().getPerspectiveId())
-     {
-       // Switch the perspective.
-%>
-  perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(ShowPerspectiveAction.getActionLink(breadCrumbPerspectiveId,true)))%>";
-<%
-     }
-     else
-     {
-       // Jump to the page retrieved from history.
-%>
-  perspectiveWorkArea.location="<%=response.encodeURL(controller.getPathWithContext(b.getURL()))%>";
-<%
-     }
-   }
-%>
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/SaveActionEngineScenario.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/SaveActionEngineScenario.jsp
deleted file mode 100644
index 700b9d73b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/SaveActionEngineScenario.jsp
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.engine.data.ScenarioDescriptor,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.engine.ActionDataParser,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.XMLUtils,
-                                                        java.io.PrintWriter,
-                                                        org.w3c.dom.Element"%>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-response.setContentType("application/octet-stream");
-response.setHeader("Content-Disposition","attachment;filename=scenario.xml");
-ScenarioDescriptor scenarioDescriptor = controller.getActionEngine().getScenario();
-ActionDataParser parser = new ActionDataParser();
-Element scenario = parser.toElement(scenarioDescriptor);
-if (scenario != null)
-{
-  try
-  {
-    String scenarioString = XMLUtils.serialize(scenario, false);
-    if (scenarioString != null)
-    {
-      PrintWriter pw = new PrintWriter(response.getOutputStream());
-      pw.println(scenarioString);
-      pw.close();
-    }
-  }
-  catch (Throwable t)
-  {
-  }
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/SelectNodeAction.inc b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/SelectNodeAction.inc
deleted file mode 100644
index b2f3efe63..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/SelectNodeAction.inc
+++ /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
- *******************************************************************************/
-%>
-<%
-   Perspective currentPerspective = controller.getCurrentPerspective();
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; UTF-8">
-<%
-   StringBuffer panesFile = new StringBuffer("/");
-   panesFile.append(currentPerspective.getPanesFile());
-%>
-<jsp:include page="<%=panesFile.toString()%>" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-   if (!actionResult)
-   {
-     if (action.isStaleBreadCrumb())
-     {
-%>
-<script language="javascript">
-  // Rerun the history action to get the next available item.
-  perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(action.getNextHistoryActionLink()))%>";
-</script>
-<%
-     }
-   }
-   else
-   {
-     String treeContentVar = action.getTreeContentVar();
-     String propertiesContainerVar = action.getPropertiesContainerVar();
-     if (action.requiresTreeViewRefresh())
-     {
-       if (treeContentVar != null)
-       {
-%>
-<script language="javascript">
-  if (isMicrosoftInternetExplorer())
-  {
-    // Update the treeview.
-    <%=treeContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getTreeContentPage()))%>";
-  }
-  else
-    perspectiveContent.location = "<%=response.encodeURL(controller.getPathWithContext(currentPerspective.getPerspectiveContentPage()))%>";  
-</script>
-<%
-       }
-       if (propertiesContainerVar != null)
-       {
-%>
-<script language="javascript">
-  if (isMicrosoftInternetExplorer())
-    <%=propertiesContainerVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getPropertiesContainerPage()))%>";
-</script>
-<%
-       }
-     }
-     else
-     {
-       Node selectedNode = action.getSelectedNode();
-       NodeManager nodeManager = selectedNode.getNodeManager();
-       Node previousSelectedNode = nodeManager.getPreviousSelectedNode();
-       int selectedNodeId = selectedNode.getNodeId();
-       if (treeContentVar != null)
-       {
-%>
-<script language="javascript">
-  // Update the perspective.
-<%
-         if (previousSelectedNode != null && previousSelectedNode.isVisible())
-         {
-%>
-  <%=treeContentVar%>.alterImage('<%=previousSelectedNode.getAnchorName()%>','<%=response.encodeURL(controller.getPathWithContext(previousSelectedNode.getClosedImagePath()))%>');
-<%
-         }
-         String selectedNodeAnchorName = selectedNode.getAnchorName();
-%>
-  <%=treeContentVar%>.selectNode('<%=selectedNodeAnchorName%>','<%=response.encodeURL(controller.getPathWithContext(selectedNode.getOpenImagePath()))%>');
-  <%=treeContentVar%>.location.hash = '#<%=selectedNodeAnchorName%>';
-<%
-       }
-       if (propertiesContainerVar != null)
-       {
-%>
-  <%=propertiesContainerVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getPropertiesContainerPage()))%>";
-<%
-       }
-%>
-</script>
-<%
-     }
-   }
-%>
-</body>
-<html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/SelectNodeToolAction.inc b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/SelectNodeToolAction.inc
deleted file mode 100644
index b337f2b20..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/SelectNodeToolAction.inc
+++ /dev/null
@@ -1,182 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (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
- *******************************************************************************/
-%>
-<%
-   Perspective currentPerspective = controller.getCurrentPerspective();
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; UTF-8">
-<%
-   StringBuffer panesFile = new StringBuffer("/");
-   panesFile.append(currentPerspective.getPanesFile());
-%>
-<jsp:include page="<%=panesFile.toString()%>" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-   if (!actionResult)
-   {
-     if (action.isStaleBreadCrumb())
-     {
-%>
-<script language="javascript">
-  // Rerun the history action to get the next available item.
-  perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(action.getNextHistoryActionLink()))%>";
-</script>
-<%
-     }
-   }
-   else
-   {
-     if (action.requiresStatusUpdate())
-     {
-       String statusContentVar = action.getStatusContentVar();
-       if (statusContentVar != null)
-       {
-%>
-<script language="javascript">
-  // Update the status content with any messages arising from this action.
-  <%=statusContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getStatusContentPage()))%>";
-</script>  
-<%    
-       }
-     } 
-        
-     String treeContentVar = action.getTreeContentVar();
-     String propertiesContainerVar = action.getPropertiesContainerVar();
-     if (action.requiresTreeViewRefresh())
-     {
-%>
-<script language="javascript">
-<%
-       if (treeContentVar != null)
-       {
-%>
-  if (isMicrosoftInternetExplorer())
-  {
-    // Reload the navigator tree view to show the structural change.
-    <%=treeContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getTreeContentPage()))%>";
-  }
-  else
-  {
-    perspectiveContent.location = "<%=response.encodeURL(controller.getPathWithContext(currentPerspective.getPerspectiveContentPage()))%>";
-  }
-<%
-       }
-       if (propertiesContainerVar != null)
-       {
-%>
-  if (isMicrosoftInternetExplorer())
-    <%=propertiesContainerVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getPropertiesContainerPage()))%>";
-<%
-       }
-%>
-</script>
-<%
-     }
-     else if (action.requiresNodeSelection())
-     {
-       Node selectedNode = action.getSelectedNode();
-       NodeManager nodeManager = selectedNode.getNodeManager();
-       Node previousSelectedNode = nodeManager.getPreviousSelectedNode();
-       int selectedNodeId = selectedNode.getNodeId();
-%>
-<script language="javascript">
-<%
-       if (treeContentVar != null)
-       {
-%>
-  // Update the navigator tree to show the selection.
-<%
-         if (previousSelectedNode != null)
-         {
-%>
-  <%=treeContentVar%>.alterImage('<%=previousSelectedNode.getAnchorName()%>','<%=response.encodeURL(controller.getPathWithContext(previousSelectedNode.getClosedImagePath()))%>');
-<%
-         }
-         String selectedNodeAnchorName = selectedNode.getAnchorName();
-%>
-  <%=treeContentVar%>.selectNode('<%=selectedNodeAnchorName%>','<%=response.encodeURL(controller.getPathWithContext(selectedNode.getOpenImagePath()))%>');
-  <%=treeContentVar%>.location.hash = '#<%=selectedNodeAnchorName%>';
-<%
-       }
-       if (propertiesContainerVar != null)
-       {
-%>
-  <%=propertiesContainerVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getPropertiesContainerPage()))%>";
-<%
-       }
-%>
-</script>
-<%
-     }
-     else if (action.requiresViewSelection())
-     {
-       if (propertiesContainerVar != null)
-       {
-%>
-<script language="javascript">
-  // Update the properties container to show the view.
-  <%=propertiesContainerVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getPropertiesContainerPage()))%>";
-</script>
-<%
-       }
-     }
-     else
-     {
-       String propertiesContentVar = action.getPropertiesContentVar();
-       Tool tool = action.getSelectedViewTool();
-       if (tool == null)
-         tool = action.getSelectedTool();
-       if (tool.getToolType() != ToolTypes.ACTION)
-       {
-         if (propertiesContentVar != null)
-         {
-%>
-<script language="javascript">
-  // Update the properties content with the tool's form.
-  <%=propertiesContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(tool.getFormLink()))%>";
-</script>
-<%
-         }
-       }
-       else
-       {
-         if (!action.isHistoryAction())
-         {
-%>
-<script language="javascript">
-  // Run the tool's action only if it is not from the history.
-  perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(tool.getActionLink()))%>";
-</script>
-<%
-         }
-         else
-         {
-           if (propertiesContentVar != null)
-           {
-%>
-<script language="javascript">
-  <%=propertiesContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getPropertiesContentPage()))%>";
-</script>
-<%
-           }
-         }
-       }
-     }
-   }
-%>
-</body>
-<html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ShowPerspectiveActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ShowPerspectiveActionJSP.jsp
deleted file mode 100644
index c01dde3ca..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ShowPerspectiveActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.actions.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   Perspective currentPerspective = controller.getCurrentPerspective();
-   StringBuffer framesetsFile = new StringBuffer("/");
-   framesetsFile.append(currentPerspective.getFramesetsFile());
-   
-   StringBuffer framesetsForm = new StringBuffer("/");
-   framesetsForm.append(currentPerspective.getProcessFramesetsForm());
-   
-   int targetPerspectiveId;
-   boolean isHistory;
-   try
-   {
-     targetPerspectiveId = Integer.parseInt(request.getParameter(ActionInputs.PERSPECTIVE));
-     isHistory = ("1".equals(request.getParameter(ActionInputs.ISHISTORY)));
-   }
-   catch (NumberFormatException e)
-   {
-     targetPerspectiveId = ActionInputs.PERSPECTIVE_UDDI;
-     isHistory = false;
-   }
-   
-   if (controller.isPerspectiveContentBlank())
-   {
-     controller.enablePerspectiveContentBlank(false);
-     controller.addToHistory(currentPerspective.getPerspectiveId(),ShowPerspectiveAction.getActionLink(targetPerspectiveId,true));
-%>
-<jsp:include page="/scripts/switchperspective.jsp" flush="true"/>
-<%
-   }
-   else
-   {
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <jsp:include page="<%=framesetsFile.toString()%>" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<jsp:useBean id="formAction" class="java.lang.StringBuffer" scope="request">
-<%
-   formAction.append(currentPerspective.getSwitchPerspectiveFormActionLink(targetPerspectiveId,isHistory));
-%>
-</jsp:useBean>
-<jsp:useBean id="formFrameName" class="java.lang.StringBuffer" scope="request"/>
-<jsp:include page="<%=framesetsForm.toString()%>" flush="true"/>
-<script language="javascript">
-  processFramesetSizes(document.forms[0]);
-</script>
-</body>
-</html>
-<%
-   }
-%>   
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ToggleNodeAction.inc b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ToggleNodeAction.inc
deleted file mode 100644
index 506fe918a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ToggleNodeAction.inc
+++ /dev/null
@@ -1,77 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (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
- *******************************************************************************/
-%>
-<%
-   Perspective currentPerspective = controller.getCurrentPerspective();
-%>   
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; UTF-8">
-<%
-   StringBuffer panesFile = new StringBuffer("/");
-   panesFile.append(currentPerspective.getPanesFile());
-%>     
-<jsp:include page="<%=panesFile.toString()%>" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>  
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-   if (!actionResult)
-   {
-     if (action.isStaleBreadCrumb())
-     {
-%>
-<script language="javascript">
-  // Rerun the history action to get the next available item.
-  perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(action.getNextHistoryActionLink()))%>";
-</script>
-<%
-     }
-   }
-   else
-   {
-     String treeContentVar = action.getTreeContentVar();
-     if (treeContentVar != null)
-     {
-%>
-<script language="javascript">
-  if (isMicrosoftInternetExplorer())
-  {
-    // Update the perspective.
-    <%=treeContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getTreeContentPage()))%>";
-  }
-  else
-    perspectiveContent.location = "<%=response.encodeURL(controller.getPathWithContext(currentPerspective.getPerspectiveContentPage()))%>";
-</script>
-<%
-     }
-     if (action.requiresNodeSelection())
-     {
-       String propertiesContainerVar = action.getPropertiesContainerVar();
-       if (propertiesContainerVar != null)
-       {
-%>
-<script language="javascript">
-  if (isMicrosoftInternetExplorer())
-  {
-    // Update the properties container.
-    <%=propertiesContainerVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getPropertiesContainerPage()))%>";
-  }
-</script>
-<%
-       }
-     }
-   }
-%>
-</body>
-<html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ValidateEditActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ValidateEditActionJSP.jsp
deleted file mode 100644
index b05383099..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ValidateEditActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>                                                        
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<%
-   StringBuffer panesFile = new StringBuffer("/");
-   panesFile.append(controller.getCurrentPerspective().getPanesFile());
-%>
-<jsp:include page="<%=panesFile.toString()%>" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-   ImportToWorkbenchAction action = (ImportToWorkbenchAction)session.getAttribute(ActionInputs.IMPORT_ACTION);
-   boolean result = action.validateEdit();
-%>
-<script language="javascript">
-  if (<%=result%>)
-    perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(WriteWSDLToWorkbenchAction.getActionLink()))%>";
-  else
-  {
-<%  
-   String statusContentVar = action.getStatusContentVar();
-   if (statusContentVar != null)
-   {
-%>    
-    <%=statusContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getStatusContentPage()))%>";
-<%
-   }
-%>
-  }
-</script>
-</body>
-</html> 
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/WriteWSDLToWorkbenchActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/WriteWSDLToWorkbenchActionJSP.jsp
deleted file mode 100644
index 93cd580cd..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/WriteWSDLToWorkbenchActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>                                                        
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<%
-   StringBuffer panesFile = new StringBuffer("/");
-   panesFile.append(controller.getCurrentPerspective().getPanesFile());
-%>
-<jsp:include page="<%=panesFile.toString()%>" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-   ImportToWorkbenchAction action = (ImportToWorkbenchAction)session.getAttribute(ActionInputs.IMPORT_ACTION);
-   action.run();
-   String statusContentVar = action.getStatusContentVar();
-   if (statusContentVar != null)
-   {
-%>
-<script language="javascript">
-  <%=statusContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getStatusContentPage()))%>";
-</script>  
-<%
-   }
-%>
-</script>
-</body>
-</html> 
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/calendar_browser.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/calendar_browser.jsp
deleted file mode 100644
index a5c1e8881..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/calendar_browser.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.actions.*,
-                                                        java.net.*" %>
-
-<%
-   String sessionId = request.getParameter(ActionInputs.SESSIONID);
-   HttpSession currentSession = (HttpSession)application.getAttribute(sessionId);
-   Controller controller = (Controller)currentSession.getAttribute("controller");
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>
-    <%=controller.getMessage("TITLE_CALENDAR_BROWSER")%>
-  </title>
-</head>
-<frameset rows="33,*" border=0 bgcolor="#ECE9D8">
-<%
-   StringBuffer link = new StringBuffer("calendar_toolbar.jsp?");
-   link.append(ActionInputs.SESSIONID).append('=').append(sessionId);
-%>   
-  <frame name="<%=FrameNames.CALENDAR_TOOLBAR%>" title="<%=controller.getMessage("FRAME_TITLE_CALENDAR_TOOLBAR")%>" src="<%=response.encodeURL(controller.getPathWithContext(link.toString()))%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-<%
-   link.setLength(0);
-   link.append("calendar_content.jsp?");
-   link.append(ActionInputs.SESSIONID).append('=').append(sessionId);
-   link.append('&').append(ActionInputs.CALENDAR_TYPE).append('=').append(request.getParameter(ActionInputs.CALENDAR_TYPE));
-%>     
-  <frame name="<%=FrameNames.CALENDAR_CONTENT%>" title="<%=controller.getMessage("FRAME_TITLE_CALENDAR_CONTENT")%>" src="<%=response.encodeURL(controller.getPathWithContext(link.toString()))%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-</frameset>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/calendar_content.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/calendar_content.jsp
deleted file mode 100644
index 36c6cd488..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/calendar_content.jsp
+++ /dev/null
@@ -1,626 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<%
-   String sessionId = request.getParameter(ActionInputs.SESSIONID);
-   HttpSession currentSession = (HttpSession)application.getAttribute(sessionId);
-   Controller controller = (Controller)currentSession.getAttribute("controller");
-   int calendarType = Integer.parseInt(request.getParameter(ActionInputs.CALENDAR_TYPE));
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-  <title><%=controller.getMessage("FRAME_TITLE_CALENDAR_CONTENT")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/calendar.css"))%>">
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<script language="javascript">
-  var days = new Array("<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_SH_SUNDAY"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_SH_MONDAY"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_SH_TUESDAY"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_SH_WEDNESDAY"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_SH_THURSDAY"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_SH_FRIDAY"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_SH_SATURDAY"))%>");
-  var months = new Array("<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_JANUARY"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_FEBRUARY"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_MARCH"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_APRIL"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_MAY"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_JUNE"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_JULY"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_AUGUST"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_SEPTEMBER"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_OCTOBER"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_NOVEMBER"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_DECEMBER"))%>");
-  var engMonths = new Array("January","February","March","April","May","June","July","August","September","October","November","December");
-  var currentDate;
-  var calendarBodySet = false;
-  var calendarBody;
-  var savedYearTextValue = "";
-
-<%
-   // Regular expressions
-   // time       - HH:MM:SS[.SSS]
-   // year       - Y*
-   // date       - YYYY+-MM-DD
-   // dateTime   - YYYY+-MM-DDTHH:MM:SS[.SSS]Z
-   // gYearMonth - YYYY+-MM 
-   // gDay       - ---DD
-   // gMonthDay  - --MM-DD
-%>
-  var timeRegExp = /^(\d{2}):(\d{2}):(\d{2})(\.\d{3})?$/;
-  var yearRegExp = /^(\d*)$/;
-  var dateRegExp = /^(\d{4,})-(\d{2})-(\d{2})$/;
-  var dateTimeRegExp = /^(\d{4,})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})(\.\d{3})?Z$/;
-  var gYearMonthRegExp = /^(\d{4,})-(\d{2})$/;
-  var gDayRegExp = /^-{3}(\d{2})$/;
-  var gMonthDayRegExp = /^-{2}(\d{2})-(\d{2})$/;
-
-  function validateYearString(yearString)
-  {
-    return yearRegExp.test(yearString);
-  }
-
-  function getTimeParameters(timeString)
-  {
-    return timeRegExp.exec(timeString);
-  }
-
-  function getDateParameters(dateString)
-  {
-    return dateRegExp.exec(dateString);
-  }
-
-  function getDateTimeParameters(dateTimeString)
-  {
-    return dateTimeRegExp.exec(dateTimeString);
-  }
-  
-  function getGYearMonthParameters(gYearMonthString)
-  {
-    return gYearMonthRegExp.exec(gYearMonthString);
-  }
-  
-  function getGDayParameters(gDayString)
-  {
-    return gDayRegExp.exec(gDayString);
-  }
-  
-  function getGMonthDayParameters(gMonthDayString)
-  {
-    return gMonthDayRegExp.exec(gMonthDayString);
-  }
-  
-<%
-   // HH:MM:SS[.SSS]
-%>
-  function serializeTime(hours,minutes,seconds,milliseconds)
-  {
-    var timeString = "";
-    if (hours < 10)
-      timeString += "0";
-    timeString += hours + ":";
-    if (minutes < 10)
-      timeString += "0";
-    timeString += minutes + ":";
-    if (seconds < 10)
-      timeString += "0";
-    timeString += seconds;
-    if (milliseconds > 0)
-    {
-      timeString += ".";
-      if (milliseconds < 100)
-      {
-        if (milliseconds < 10)
-          timeString += "00";
-        else
-          timeString += "0";
-      }
-      timeString += milliseconds;
-    }
-    return timeString;
-  }
-
-<%
-   // YYYY+-MM
-%>   
-  function serializeGYearMonth(fullYear,month)
-  {
-    var gYearMonthString = "";
-    if (fullYear < 1000)
-    {
-      if (fullYear < 100)
-      {
-        if (fullYear < 10)
-          gYearMonthString += "000";
-        else
-          gYearMonthString += "00";
-      }
-      else
-        gYearMonthString += "0";
-    }
-    gYearMonthString += fullYear+"-";
-    if (month < 10)
-      gYearMonthString += "0";
-    gYearMonthString += month;
-    return gYearMonthString;    
-  }
-  
-<%
-   // YYYY+-MM-DD
-%>
-  function serializeDate(fullYear,month,date)
-  {
-    var dateString = serializeGYearMonth(fullYear,month) + "-";
-    if (date < 10)
-      dateString += "0";
-    dateString += date;
-    return dateString;
-  }
-  
-  function serializeGDay(date)
-  {
-    var gDayString = "---";
-    if (date < 10)
-      gDayString += "0";
-    gDayString += date;
-    return gDayString;
-  }
-  
-  function serializeGMonthDay(month,date)
-  {
-    var gMonthDayString = "--";
-    if (month < 10)
-      gMonthDayString += "0";
-    gMonthDayString += month+"-";
-    if (date < 10)
-      gMonthDayString += "0";
-    gMonthDayString += date;
-    return gMonthDayString;
-  }    
-
-  function setDateUsingGDayParameters(gDayParameters,dateObj)
-  {
-    if (gDayParameters != null)
-      dateObj.setDate(gDayParameters[1]);
-  }
-  
-  function setDateUsingGMonthDayParameters(gMonthDayParameters,dateObj)
-  {
-    if (gMonthDayParameters != null)
-    {
-      dateObj.setMonth(gMonthDayParameters[1]-1);
-      dateObj.setDate(gMonthDayParameters[2]);
-    }
-  }
-  
-  function setDateUsingGYearMonthParameters(gYearMonthParameters,dateObj)
-  {
-    if (gYearMonthParameters != null)
-    {
-      dateObj.setFullYear(gYearMonthParameters[1]);
-      dateObj.setMonth(gYearMonthParameters[2]-1);
-    }
-  }
-  
-  function setDateUsingDateParameters(dateParameters,dateObj)
-  {
-    if (dateParameters != null)
-    {
-      setDateUsingGYearMonthParameters(dateParameters,dateObj);
-      dateObj.setDate(dateParameters[3]);
-    }
-  }
-
-  function setDateUsingDateTimeParameters(dateTimeParameters,dateObj)
-  {
-    if (dateTimeParameters != null)
-    {
-      setDateUsingDateParameters(dateTimeParameters,dateObj);
-      dateObj.setUTCHours(dateTimeParameters[4]);
-      dateObj.setUTCMinutes(dateTimeParameters[5]);
-      dateObj.setUTCSeconds(dateTimeParameters[6]);
-      var milliseconds = dateTimeParameters[7];
-      if (milliseconds.length > 0)
-<%
-   // Eliminate the decimal point
-%>
-        dateObj.setUTCMilliseconds(milliseconds.substr(1));
-      else
-        dateObj.setUTCMilliseconds(0);
-    }
-  }
-
-  function setDateUsingTimeParameters(timeParameters,dateObj)
-  {
-    if (timeParameters != null)
-    {
-      dateObj.setHours(timeParameters[1]);
-      dateObj.setMinutes(timeParameters[2]);
-      dateObj.setSeconds(timeParameters[3]);
-      var milliseconds = timeParameters[4];
-      if (milliseconds.length > 0)
-<%
-   // Eliminate the decimal point
-%>
-        dateObj.setMilliseconds(milliseconds.substr(1));
-      else
-        dateObj.setMilliseconds(0);
-    }
-  }
-
-  function init()
-  {
-    var d = new Date();
-<%
-   switch (calendarType)
-   {
-     case ActionInputs.CALENDAR_TYPE_DATE:
-%>
-    setDateUsingDateParameters(getDateParameters(top.opener.calendarTarget.value),d);
-<%
-       break;
-     case ActionInputs.CALENDAR_TYPE_DATETIME:
-%>
-    setDateUsingDateTimeParameters(getDateTimeParameters(top.opener.calendarTarget.value),d);
-<%
-       break;
-     case ActionInputs.CALENDAR_TYPE_GYEARMONTH:
-%>
-    setDateUsingGYearMonthParameters(getGYearMonthParameters(top.opener.calendarTarget.value),d);
-<%     
-     case ActionInputs.CALENDAR_TYPE_GDAY:
-%>
-    setDateUsingGDayParameters(getGDayParameters(top.opener.calendarTarget.value),d);
-<%   
-     case ActionInputs.CALENDAR_TYPE_GMONTHDAY:
-%>
-    setDateUsingGMonthDayParameters(getGMonthDayParameters(top.opener.calendarTarget.value),d);
-<%       
-     default:
-       break;
-   }
-%>
-    generateCalendar(d);
-    var monthSelector = document.getElementById("monthSelector");
-    for (var i=0;i<months.length;i++)
-      monthSelector.options[i] = new Option(months[i],i);
-    generateCalendar(d);
-  }
-
-  function initCalendarHeader(table)
-  {
-    calendarBody = document.createElement("TBODY");
-    var headerRow = document.createElement("tr");
-    for (var i=0;i<days.length;i++)
-    {
-      var header = document.createElement("th");
-      header.appendChild(document.createTextNode(days[i]));
-      header.className="headercolor";
-      headerRow.appendChild(header);
-    }
-    calendarBody.appendChild(headerRow);
-    table.appendChild(calendarBody);
-    calendarBodySet = true;
-  }
-
-  function generateCalendar(date)
-  {
-    var table = document.getElementById("calendar");
-    var dateDate = date.getDate();
-    var dateMonth = date.getMonth();
-    var dateFullYear = date.getFullYear();
-    var dateIterator = new Date();
-    dateIterator.setTime(Date.parse(engMonths[dateMonth]+" 1, "+dateFullYear));
-    var startingDate = dateIterator.getDate(); // 1,2,3...
-    var startingDay = dateIterator.getDay(); // Sun,Mon,Tues...
-    clearCalendar();
-    for (var rows=0;rows<6;rows++)
-    {
-      var row = document.createElement("tr");
-      for (var columns=0;columns<days.length;columns++)
-      {
-        var column = document.createElement("td");
-        var dateIteratorDate = dateIterator.getDate();
-        var dateIteratorMonth = dateIterator.getMonth();
-        var dateIteratorFullYear = dateIterator.getFullYear();
-        column.width = 24;
-        column.height = 24;
-        column.align = "center";
-        column.valign = "center";
-        column.className = "calendartablecells";
-        if ((dateIteratorDate == startingDate && columns < startingDay) || (dateIteratorMonth != dateMonth))
-          column.innerHTML = "&nbsp;";
-        else if (dateIteratorMonth == dateMonth)
-        {
-          var link = document.createElement("a");
-          switch (<%=calendarType%>)
-          {
-            case <%=ActionInputs.CALENDAR_TYPE_DATE%>:
-              link.href = "javascript:transferDate("+dateIteratorDate+")";
-              break;
-            case <%=ActionInputs.CALENDAR_TYPE_DATETIME%>:
-              link.href = "javascript:transferDateTime("+dateIteratorDate+")";
-              break;
-            case <%=ActionInputs.CALENDAR_TYPE_GYEARMONTH%>:
-              link.href = "javascript:transferGYearMonth()";
-              break;
-            case <%=ActionInputs.CALENDAR_TYPE_GDAY%>:
-              link.href = "javascript:transferGDay("+dateIteratorDate+")";
-              break;
-            case <%=ActionInputs.CALENDAR_TYPE_GMONTHDAY%>:
-              link.href = "javascript:transferGMonthDay("+dateIteratorDate+")";
-              break;
-          }
-          link.appendChild(document.createTextNode(dateIteratorDate));
-          column.appendChild(link);
-          if (dateIteratorDate == dateDate && dateIteratorFullYear == dateFullYear)
-            column.className = "todaytablecell";
-          dateIteratorDate++;
-          dateIterator.setTime(Date.parse(engMonths[dateIteratorMonth]+" "+dateIteratorDate+", "+dateIterator.getFullYear()));
-        }
-        row.appendChild(column);
-      }
-      calendarBody.appendChild(row);
-    }
-    var monthSelector = document.getElementById("monthSelector");
-    for (var i=0;i<monthSelector.options.length;i++)
-    {
-      if (monthSelector.options[i].value == dateMonth)
-      {
-        monthSelector.selectedIndex = i;
-        break;
-      }
-    }
-    var yearText = document.getElementById("yearText");
-    yearText.value = dateFullYear;
-    savedYearTextValue = yearText.value;
-<%
-   if (calendarType == ActionInputs.CALENDAR_TYPE_DATETIME)
-   {
-%>
-    var timeText = document.getElementById("timeText");
-    timeText.value = serializeTime(date.getHours(),date.getMinutes(),date.getSeconds(),date.getMilliseconds());
-<%
-   }
-%>
-    currentDate = date;
-  }
-
-  function clearCalendar()
-  {
-    var table = document.getElementById("calendar");
-    if (!calendarBodySet)
-      initCalendarHeader(table);
-    for (var i=1;i<table.rows.length;i++)
-    {
-      table.deleteRow(i);
-      i--;
-    }
-  }
-
-  function updateCalendar(newMonth,newFullYear)
-  {
-    var d = new Date();
-    if (newMonth > months.length)
-    {
-      newFullYear++;
-      newMonth = 0;
-    }
-    else if (newMonth < 0)
-    {
-      newFullYear--;
-      newMonth = months.length-1;
-    }
-    d.setMonth(newMonth);
-    d.setFullYear(newFullYear);
-<%
-   if (calendarType == ActionInputs.CALENDAR_TYPE_DATETIME)
-   {
-%>
-    setDateUsingTimeParameters(getTimeParameters(document.getElementById("timeText").value),d);
-<%
-   }
-%>
-    generateCalendar(d);
-  }
-
-  function jumpToPreviousYear()
-  {
-    updateCalendar(currentDate.getMonth(),currentDate.getFullYear()-1)
-  }
-
-  function jumpToPreviousMonth()
-  {
-    updateCalendar(currentDate.getMonth()-1,currentDate.getFullYear());
-  }
-
-  function jumpToNextMonth()
-  {
-    updateCalendar(currentDate.getMonth()+1,currentDate.getFullYear());
-  }
-
-  function jumpToNextYear()
-  {
-    updateCalendar(currentDate.getMonth(),currentDate.getFullYear()+1);
-  }
-
-  function jumpToToday()
-  {
-    generateCalendar(new Date());
-  }
-
-  function setNewDate()
-  {
-    var monthSelector = document.getElementById("monthSelector");
-    var newMonth = monthSelector.options[monthSelector.selectedIndex].value;
-    var newFullYear = document.getElementById("yearText").value;
-<%
-   // YYYY+
-%>
-    var d = new Date();
-    if (validateYearString(newFullYear))
-    {
-      // The year string contains only digits and is hence a valid year.
-      d.setFullYear(newFullYear);
-      d.setMonth(newMonth);
-    }
-    generateCalendar(d);
-  }
-
-  function handleYearTextKeyUpEvent()
-  {
-    var currentYearTextValue = document.getElementById("yearText").value;
-    if (currentYearTextValue == savedYearTextValue)
-      return false;
-    setNewDate();
-  }
-
-<%
-   // YYYY+-MM-DD
-%>
-  function transferDate(date)
-  {
-    var fullYear = document.getElementById("yearText").value;
-    var month = document.getElementById("monthSelector").selectedIndex+1;
-    top.opener.calendarTarget.value = serializeDate(fullYear,month,date);
-    top.opener.closeCalendarBrowser();
-  }
-
-<%
-   // YYYY+-MM-DDTHH:MM:SS[.SSS]Z
-%>
-  function transferDateTime(date)
-  {
-    var fullYear = document.getElementById("yearText").value;
-    var month = document.getElementById("monthSelector").selectedIndex+1;
-    var serializedDate = serializeDate(fullYear,month,date);
-    var d = new Date();
-    setDateUsingDateParameters(getDateParameters(serializedDate),d);
-    var timeValue = document.getElementById("timeText").value;
-    var timeParameters = getTimeParameters(timeValue);
-    if (timeParameters == null)
-    {
-      if (!confirm("<%=HTMLUtils.JSMangle(controller.getMessage("MSG_ERROR_INVALID_TIME_FORMAT"))%>"))
-        return;
-    }
-    else
-      setDateUsingTimeParameters(timeParameters,d);
-    top.opener.calendarTarget.value = serializedDate + "T" + serializeTime(d.getUTCHours(),d.getUTCMinutes(),d.getUTCSeconds(),d.getUTCMilliseconds()) + "Z";
-    top.opener.closeCalendarBrowser();
-  }
-  
-<%
-   // YYYY+-MM
-%>
-  function transferGYearMonth()
-  {
-    var fullYear = document.getElementById("yearText").value;
-    var month = document.getElementById("monthSelector").selectedIndex+1;
-    var serializedGYearMonth = serializeGYearMonth(fullYear,month);
-    var d = new Date();
-    setDateUsingGYearMonthParameters(getGYearMonthParameters(serializedGYearMonth),d);
-    top.opener.calendarTarget.value = serializedGYearMonth;
-    top.opener.closeCalendarBrowser();
-  }     
-  
-<%
-   // ---DD
-%>
-  function transferGDay(date)     
-  {
-    top.opener.calendarTarget.value = serializeGDay(date);
-    top.opener.closeCalendarBrowser();
-  }
-<%
-   // --MM-DD
-%>  
-  function transferGMonthDay(date)
-  {
-    var month = document.getElementById("monthSelector").selectedIndex+1;
-    top.opener.calendarTarget.value = serializeGMonthDay(month,date);
-    top.opener.closeCalendarBrowser();
-  }
-</script>
-</head>
-<body class="contentbodymargin">
-  <div id="contentborder">
-    <table border=0>
-      <tr>
-        <td align="center" valign="top">
-          <table>
-            <tr>
-              <td align="left" valign="top" class="labels">
-                <label for="monthSelector"><%=controller.getMessage("FORM_LABEL_MONTH")%></label>
-              </td>
-              <td width="20%">&nbsp;</td>
-              <td align="left" valign="top" class="labels">
-                <label for="yearText"><%=controller.getMessage("FORM_LABEL_YEAR")%></label>
-              </td>
-            </tr>
-            <tr>
-              <td align="left" valign="center">
-                <select id="monthSelector" onChange="setNewDate()" class="selectlist">
-                </select>
-              </td>
-              <td width="20%">&nbsp;</td>
-              <td width="30%" align="left" valign="center">
-                <input id="yearText" size=6 onkeyup="handleYearTextKeyUpEvent()" class="tabletextenter">
-              </td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-      <tr>
-        <td align="center" valign="top">
-          <table id="calendar" border=0 cellspacing=0 cellpadding=3 class="tableborder">
-          </table>
-        </td>
-      </tr>
-<%
-   if (calendarType == ActionInputs.CALENDAR_TYPE_DATETIME)
-   {
-%>
-      <tr>
-        <td align="center" valign="top">
-          <table border=0>
-            <td align="center" valign="center" class="labels">
-              <label for="timeText"><%=controller.getMessage("FORM_LABEL_TIME")%></label>
-            </td>
-            <td align="center" valign="center" width="80%">
-              <input id="timeText" type="text" class="tabletextenter" size=12 maxlength=12>
-            </td>
-            <td width="10%">&nbsp;</td>
-          </table>
-        </td>
-      </tr>
-<%
-   }
-%>
-      <tr>
-        <td align="center" valign="top">
-          <table border=0>
-            <tr>
-              <td>
-                <a href="javascript:jumpToPreviousYear()" title="<%=controller.getMessage("ALT_PREVIOUS_YEAR")%>"><%=controller.getMessage("FORM_LINK_PREVIOUS_YEAR")%></a>
-              </td>
-              <td>
-                <a href="javascript:jumpToPreviousMonth()" title="<%=controller.getMessage("ALT_PREVIOUS_MONTH")%>"><%=controller.getMessage("FORM_LINK_PREVIOUS_MONTH")%></a>
-              </td>
-              <td>
-                <a href="javascript:jumpToToday()" title="<%=controller.getMessage("ALT_TODAY")%>"><%=controller.getMessage("FORM_LINK_TODAY")%></a>
-              </td>
-              <td>
-                <a href="javascript:jumpToNextMonth()" title="<%=controller.getMessage("ALT_NEXT_MONTH")%>"><%=controller.getMessage("FORM_LINK_NEXT_MONTH")%></a>
-              </td>
-              <td>
-                <a href="javascript:jumpToNextYear()" title="<%=controller.getMessage("ALT_NEXT_YEAR")%>"><%=controller.getMessage("FORM_LINK_NEXT_YEAR")%></a>
-              </td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-    </table>
-  </div>
-<script language="javascript">
-  init();
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/calendar_toolbar.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/calendar_toolbar.jsp
deleted file mode 100644
index ea55fb639..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/calendar_toolbar.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<%
-   String sessionId = request.getParameter(ActionInputs.SESSIONID);
-   HttpSession currentSession = (HttpSession)application.getAttribute(sessionId);
-   Controller controller = (Controller)currentSession.getAttribute("controller");
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=controller.getMessage("FRAME_TITLE_CALENDAR_TOOLBAR")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/toolbar.css"))%>">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" onUnload="top.opener.calendarBrowserClosed=true" class="toolbarbodymargin">
-<div id="toolbarborder">
-  <div id="toolbar">
-    <table width="100%" height=25 cellpadding=0 cellspacing=0 border=0>
-      <tr>
-        <td valign="middle" align="center" width=25 height=25><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/calendar.gif"))%>" width=16 height=16></td>
-        <td valign="middle" align="left" width="*" height=25 nowrap class="text"><%=controller.getMessage("ALT_CALENDAR_BROWSER")%></td>
-      </tr>
-    </table>
-  </div>
-</div>
-<script language="javascript">
-  top.opener.calendarBrowserClosed = false;
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/calendar.css b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/calendar.css
deleted file mode 100644
index 383880605..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/calendar.css
+++ /dev/null
@@ -1,2 +0,0 @@
-.calendartablecells { border-left:1px solid #B8B4A3; border-right:0px solid #B8B4A3; border-top:0px solid #B8B4A3; border-bottom:1px solid #B8B4A3; font: icon; font-size: 11px; text-align:center}
-.todaytablecell { background-color:yellow; border-left:1px solid #B8B4A3; border-right:0px solid #B8B4A3; border-top:0px solid #B8B4A3; border-bottom:1px solid #B8B4A3; font: icon; font-size: 11px; text-align:center}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/toolbar.css b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/toolbar.css
deleted file mode 100644
index 485ea123c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/toolbar.css
+++ /dev/null
@@ -1,20 +0,0 @@
-#toolbar { width:100%; height:25px; background:#ECE9D8; border-color:white;  border-style:solid;  border-width:1 1 1 1px; border-bottom-color:#848284; border-right-color:#848284; margin:0 0 0 0px;}
-#toolbarborder { height:26px; width:100%; border-style:solid; border-width:1 0 0 1px; border-color:#848284; }
-
-/* iframe Spacing Contol */
-.toolbarbodymargin { margin: 5 5 0 5; background: #ECE9D8; }
-
-/* Toolbar Styles */
-.text {font-size:12px; font: icon;}
-a:link {color: black;}
-
-/* JS Rollover Style */
-IMG { border-width:2px; border-style:solid;}
-.normal { border-color : #ECE9D8; border-style: solid; border-width:1px; border-left-width: 1px; border-bottom-color :#ECE9D8; border-right-color :#ECE9D8;}
-.hover { border-color : white; border-style: solid; border-width:1px; border-left-width: 1px; border-bottom-color :#8C8E8C; border-right-color :#8C8E8C; }
-.down { border-color : #8C8E8C; border-style: solid; border-width:1px; border-left-width: 1px; border-bottom-color:white; border-right-color:white;}
-
-/* GlobalToolbar */
-.gtoolbarbodymargin {margin : 0 1 3 0; background: #ECE9D8}
-#globaltoolbar{height:100%; background: #ECE9D8; border-color : white; border-style: solid; border-width:1px; border-left-width: 1px; border-bottom-color :black; border-right-width: 1px; border-right-color :#848284;}
-
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/treeview.css b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/treeview.css
deleted file mode 100644
index da1e6a5b1..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/treeview.css
+++ /dev/null
@@ -1,5 +0,0 @@
-a {text-decoration: none;}
-a:hover {text-decoration: underline;}
-td {font: icon; font-size: 12px; color: Black;}
-.unselectedTextAnchor {color:blue; background-color:document.backgroundColor}
-.selectedTextAnchor {color:white; background-color:navy}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/windows.css b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/windows.css
deleted file mode 100644
index 4e15f8452..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/windows.css
+++ /dev/null
@@ -1,45 +0,0 @@
-#contentborder { border-left:1px solid #848284; border-right:1px solid #848284; border-top:0px solid #848284; border-bottom:1px solid #848284; height:100%; width:100%; background:white; overflow:auto; padding-left:10px; padding-right:0; padding-top:10; padding-bottom:10}
-#treecontentborder { border-left:1px solid #848284; border-right:1px solid #848284; border-top:0px solid #848284; border-bottom:1px solid #848284; height:100%; width:100%; background:white; overflow:auto; padding-top:5px}
-
-/* iframe Spacing Contol */
-.contentbodymargin { margin: 0 5 12 5; background:#ECE9D8; }
-
-/* Document Styles  */
-.labels { font: icon; font-size: 12px; color:black; font-weight: normal;}
-
-/* fieldset+legend Styles */
-.keylinefieldset { border-color:#8080FF; border-width:1px; border-style:solid; }
-
-/* table Styles */
-.tableborder {border-left:0px solid #B8B4A3; border-right:1px solid #B8B4A3; border-top:1px solid #B8B4A3; border-bottom:0px solid #B8B4A3; }
-.tablecells { border-left:1px solid #B8B4A3; border-right:0px solid #B8B4A3; border-top:0px solid #B8B4A3; border-bottom:1px solid #B8B4A3; font: icon; font-size: 11px; text-align:left}
-.checkboxcells { border-left:1px solid #B8B4A3; border-right:0px solid #B8B4A3; border-top:0px solid #B8B4A3; border-bottom:1px solid #B8B4A3; font: icon; font-size: 11px; background-color: #ECE9D8}
-th.headercolor { border-left:1px solid #B8B4A3; border-right:0px solid #B8B4A3; border-top:0px solid #B8B4A3; border-bottom:1px solid #B8B4A3; font-style: normal; font: icon; font-size: 11px; background-color:#4977B4; color:#FFFFFF; text-align:center}
-th.singleheadercolor { border-left:1px solid #B8B4A3; border-right:0px solid #B8B4A3; border-top:0px solid #B8B4A3; border-bottom:1px solid #B8B4A3; font-style: normal; font: icon; font-size: 11px; background-color:#4977B4; color:#FFFFFF; text-align:left}
-.firstcolumnerrantrowcolor { border-left:1px solid red; border-right:0px solid #B7B4A3; border-top:1px solid red; border-bottom:1px solid red; font: icon; font-size: 11px; background-color:#E6EAD8; text-align:left}
-.middleerrantrowcolor { border-left:1px solid #B7B4A3; border-right:0px solid #B7B4A3; border-top:1px solid red; border-bottom:1px solid red; font: icon; font-size: 11px; background-color:#E6EAD8; text-align:left}
-.lastcolumnerrantrowcolor { border-left:1px solid #B7B4A3; border-right:1px solid red; border-top:1px solid red; border-bottom:1px solid red; font: icon; font-size: 11px; background-color:#E6EAD8; text-align:left}
-.rowcolor { border-left:1px solid #B8B4A3; border-right:0px solid #B8B4A3; border-top:0px solid #B8B4A3; border-bottom:1px solid #B8B4A3; font: icon; font-size: 11px; background-color:#E6EAD8; text-align:left}
-
-/* Form elements and status contents */
-td { font: icon; font-size: 12px; }
-th { font: icon; font-size: 12px; }
-input { font: icon; font-size: 12px; }
-.selectlist {font: icon; font-size: 12px; color: Black; border-style:solid; border-width : 1px;  border-color:#C7C5B2;}
-select { font: icon; font-size: 12px; }
-pre { font: icon; font-size: 12px; }
-.smtextenter {font: icon; font-size: 14px; color: Black; border-style:solid; border-width : 1px; border-color: #C7C5B2; width:10%; }
-.textenter {font: icon; font-size: 14px; color: Black; border-style:solid; border-width : 1px; border-color: #C7C5B2; width:90%; }
-.tabletextenter {font: icon; font-size: 14px; color: Black; border-style:solid; border-width : 1px; border-color: #C7C5B2; width:100%; }
-.tablefilebrowse {width:100%; border-style:solid; border-width:1px; font-size: 14px; border-color: #C7C5B2; font: icon; }
-input.button {font: icon; font-size: 11px; border-width : 1px; border-style:outset; height:22px;}
-input.radio {font: icon; font-size: 11px;}
-img.twist {border-width:0 0 0 0px; height:10px; width:11px;}
-
-/* Fragment Styles */
-.fixfragtable {width:95%; border:0px none; }
-.innerfixfragtable {width:100%; border:0px none; }
-.rangefragtable {width:95%; border-left:0px solid #B8B4A3; border-right:1px solid #B8B4A3; border-top:1px solid #B8B4A3; border-bottom:0px solid #B8B4A3;}
-.innerrangefragtable {width:100%; border-left:0px solid #B8B4A3; border-right:1px solid #B8B4A3; border-top:1px solid #B8B4A3; border-bottom:0px solid #B8B4A3;}
-.textareaenter {font: icon; font-size: 14px; color: Black; border-style:solid; border-width : 1px; border-color: #C7C5B2; width:100%; height:150px; }
-.bigtextareaenter {font: icon; font-size: 14px; color: Black; border-style:solid; border-width : 1px; border-color: #C7C5B2; width:100%; height:300px; }
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/AddWSILToWSILPerspectiveActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/AddWSILToWSILPerspectiveActionJSP.jsp
deleted file mode 100644
index 24dfde4ce..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/AddWSILToWSILPerspectiveActionJSP.jsp
+++ /dev/null
@@ -1,60 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.AddWSILToWSILPerspectiveAction"%>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/scripts/panes.jsp" flush="true"/>
-<jsp:include page="/favorites/scripts/favoritesPanes.jsp" flush="true"/>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-  // Prepare the action.
-  AddWSILToWSILPerspectiveAction action = new AddWSILToWSILPerspectiveAction(controller);
-
-  // Load the parameters for the action from the servlet request.
-  boolean inputsValid = action.populatePropertyTable(request);
-
-  // Run the action and obtain the return code (fail/success).
-  boolean actionResult = action.execute();
-
-  if (actionResult) {
-%>
-    <script language="javascript">
-      perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(ShowPerspectiveAction.getActionLink(ActionInputs.PERSPECTIVE_WSIL,false)))%>";
-    </script>
-<%
-  }
-  else {
-    if (request.getParameter(FavoritesActionInputs.MULTIPLE_LINK_ACTION) == null) {
-%>
-      <jsp:include page="/favorites/actions/RemoveFavoritesConfirmJSP.jsp" flush="true"/>
-<%
-    }
-    else {
-%>
-      <script language="javascript">
-        favPropertiesContainer.location = "<%=response.encodeURL(controller.getPathWithContext("favorites/fav_properties_container.jsp"))%>";
-        favStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("favorites/fav_status_content.jsp"))%>";
-      </script>
-<%
-    }
-  }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesAddToUDDIPerspectiveActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesAddToUDDIPerspectiveActionJSP.jsp
deleted file mode 100644
index 0fb010f93..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesAddToUDDIPerspectiveActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.AddToUDDIPerspectiveAction"%>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/scripts/panes.jsp" flush="true"/>
-<jsp:include page="/favorites/scripts/favoritesPanes.jsp" flush="true"/>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-  // Prepare the action.
-  AddToUDDIPerspectiveAction action = AddToUDDIPerspectiveAction.newAction(controller);
-
-  // Load the parameters for the action from the servlet request.
-  boolean inputsValid = action.populatePropertyTable(request);
-
-  // Run the action and obtain the return code (fail/success).
-  boolean actionResult = action.execute();
-
-  if (actionResult) {
-    controller.getUDDIPerspective().getNavigatorManager().makeSelectedNodeVisible();
-%>
-    <script language="javascript">
-      perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(ShowPerspectiveAction.getActionLink(ActionInputs.PERSPECTIVE_UDDI,false)))%>";
-    </script>
-<%
-  }
-  else {
-    if (request.getParameter(FavoritesActionInputs.MULTIPLE_LINK_ACTION) == null) {
-%>
-      <jsp:include page="/favorites/actions/RemoveFavoritesConfirmJSP.jsp" flush="true"/>
-<%
-    }
-    else {
-%>
-      <script language="javascript">
-        favPropertiesContainer.location = "<%=response.encodeURL(controller.getPathWithContext("favorites/fav_properties_container.jsp"))%>";
-        favStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("favorites/fav_status_content.jsp"))%>";
-      </script>
-<%
-    }
-  }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesAddToWSDLPerspectiveActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesAddToWSDLPerspectiveActionJSP.jsp
deleted file mode 100644
index 9fb21cbda..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesAddToWSDLPerspectiveActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesActionInputs,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.actions.ShowPerspectiveAction,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.FavoritesAddToWSDLPerspectiveAction"%>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-
-<jsp:include page="/scripts/panes.jsp" flush="true"/>
-<jsp:include page="/favorites/scripts/favoritesPanes.jsp" flush="true"/>
-
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-// Prepare the action.
-FavoritesAddToWSDLPerspectiveAction action = new FavoritesAddToWSDLPerspectiveAction(controller);
-
-// Load the parameters for the action from the servlet request.
-boolean inputsValid = action.populatePropertyTable(request);
-
-// Run the action and obtain the return code (fail/success).
-boolean actionResult = action.execute();
-
-if (actionResult) {
-%>
-<script language="javascript">
-  perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(ShowPerspectiveAction.getActionLink(ActionInputs.PERSPECTIVE_WSDL,false)))%>";
-</script>
-<%
-}
-else {
-  if (request.getParameter(FavoritesActionInputs.MULTIPLE_LINK_ACTION) == null) {
-%>
-    <jsp:include page="/favorites/actions/RemoveFavoritesConfirmJSP.jsp" flush="true"/>
-<%
-  }
-  else {
-%>
-    <script language="javascript">
-      favPropertiesContainer.location = "<%=response.encodeURL(controller.getPathWithContext("favorites/fav_properties_container.jsp"))%>";
-      favStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("favorites/fav_status_content.jsp"))%>";
-    </script>
-<%
-  }
-}
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesImportToFileSystemActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesImportToFileSystemActionJSP.jsp
deleted file mode 100644
index 9e99421fd..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesImportToFileSystemActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.actions.*,
-                                                        java.io.*" %>
-
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-  // Prepare the action.
-  FavoritesImportToFileSystemAction action = new FavoritesImportToFileSystemAction(controller);
-%>
-<%@ include file="/actions/ImportToFileSystemAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesImportToWorkbenchActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesImportToWorkbenchActionJSP.jsp
deleted file mode 100644
index 51935b4b5..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesImportToWorkbenchActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   FavoritesImportToWorkbenchAction action = new FavoritesImportToWorkbenchAction(controller);
-%>
-<%@ include file="/actions/ImportToWorkbenchAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesLaunchWebServiceWizardActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesLaunchWebServiceWizardActionJSP.jsp
deleted file mode 100644
index ea033b110..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesLaunchWebServiceWizardActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   FavoritesLaunchWebServiceWizardAction action = new FavoritesLaunchWebServiceWizardAction(controller);
-%>
-<%@ include file="/actions/LaunchWebServiceWizardAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesToggleNodeActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesToggleNodeActionJSP.jsp
deleted file mode 100644
index 3e8d15645..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesToggleNodeActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   // Prepare the action.
-   FavoritesToggleNodeAction action = new FavoritesToggleNodeAction(controller);
-
-   // Load the parameters for the action from the servlet request.
-   action.populatePropertyTable(request);
-
-   // Run the action and obtain the return code (fail/success).
-   boolean actionResult = action.execute();
-
-   // Determine if the action was added to the history list.
-   boolean isAddedToHistory = action.isAddedToHistory();
-%>
-<%@ include file="/actions/ToggleNodeAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/RemoveFavoritesActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/RemoveFavoritesActionJSP.jsp
deleted file mode 100644
index 0fa1b2bdd..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/RemoveFavoritesActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                   					                    org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.RemoveFavoritesAction"%>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/favorites/scripts/favoritesPanes.jsp" flush="true"/>
-<%
-    // Prepare the action.
-    RemoveFavoritesAction action = new RemoveFavoritesAction(controller);
-
-    // Load the parameters for the action from the servlet request.
-    boolean inputsValid = action.populatePropertyTable(request);
-
-    // Run the action and obtain the return code (fail/success).
-    boolean actionResult = action.execute();
-%>
-<%@ include file="/actions/ClearNodeAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/RemoveFavoritesConfirmJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/RemoveFavoritesConfirmJSP.jsp
deleted file mode 100644
index d2d89c92c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/RemoveFavoritesConfirmJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                   					                    org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.RemoveFavoritesAction"%>
-
-<jsp:include page="/favorites/scripts/favoritesPanes.jsp" flush="true"/>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<html>
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-    <script language="javascript">
-        if (confirm("<%=controller.getFavoritesPerspective().getMessage("MSG_CONFIRM_REMOVE_NODE", controller.getFavoritesPerspective().getNodeManager().getSelectedNode().getNodeName())%>")) {
-            <%
-            Node selectedNode = controller.getFavoritesPerspective().getNodeManager().getSelectedNode();
-            %>
-            perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(RemoveFavoritesAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), ActionInputs.VIEWID_DEFAULT, ActionInputs.VIEWTOOLID_DEFAULT)))%>";
-        }
-        else {
-            favPropertiesContainer.location = "<%=response.encodeURL(controller.getPathWithContext("favorites/fav_properties_container.jsp"))%>";
-            favStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("favorites/fav_status_content.jsp"))%>";
-        }
-    </script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/ResizeFavoritesFramesActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/ResizeFavoritesFramesActionJSP.jsp
deleted file mode 100644
index dd7591db7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/ResizeFavoritesFramesActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   // Create the action.
-   ResizeFavoritesFramesAction action = new ResizeFavoritesFramesAction(controller);
-   
-   // Populate the action with the request properties.
-   boolean result = action.populatePropertyTable(request);
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<jsp:include page="/favorites/scripts/favoritesframesets.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-   if (result)
-   {
-     action.execute(false);
-     FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
-%>
-<script language="javascript">
-  if (isMicrosoftInternetExplorer())
-  {
-    var perspectiveContentFrameset = getPerspectiveContentFrameset();
-    var actionsContainerFrameset = getActionsContainerFrameset();
-    perspectiveContentFrameset.setAttribute("cols","<%=favPerspective.getPerspectiveContentFramesetCols()%>");
-    actionsContainerFrameset.setAttribute("rows","<%=favPerspective.getActionsContainerFramesetRows()%>");
-  }
-  else
-    perspectiveContent.location = "<%=response.encodeURL(controller.getPathWithContext("favorites/fav_perspective_content.jsp"))%>";
-</script>
-<%
-   }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/RestoreDefaultFavoritesActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/RestoreDefaultFavoritesActionJSP.jsp
deleted file mode 100644
index afe4b1766..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/RestoreDefaultFavoritesActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.FavoritesRestoreDefaultFavoritesAction"%>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/scripts/panes.jsp" flush="true"/>
-<jsp:include page="/favorites/scripts/favoritesPanes.jsp" flush="true"/>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-    // Prepare the action.
-    FavoritesRestoreDefaultFavoritesAction action = new FavoritesRestoreDefaultFavoritesAction(controller);
-
-    // Load the parameters for the action from the servlet request.
-    boolean inputsValid = action.populatePropertyTable(request);
-
-    // Run the action and obtain the return code (fail/success).
-    boolean actionResult = action.execute();
-
-    if (actionResult) {
-%>
-    <script language="javascript">
-        perspectiveContent.location = "<%=response.encodeURL(controller.getPathWithContext("favorites/fav_perspective_content.jsp"))%>";
-    </script>
-<%
-    }
-    else {
-%>
-    <script language="javascript">
-        favStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("favorites/fav_status_content.jsp"))%>";
-    </script>
-<%
-    }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/RestoreDefaultFavoritesConfirmJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/RestoreDefaultFavoritesConfirmJSP.jsp
deleted file mode 100644
index a5c539d40..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/RestoreDefaultFavoritesConfirmJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/scripts/panes.jsp" flush="true"/>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-    <script language="javascript">
-        if (confirm("<%=controller.getFavoritesPerspective().getMessage("MSG_CONFIRM_RESTORE_DEFAULT_FAVORITES")%>"))
-            perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext("favorites/actions/RestoreDefaultFavoritesActionJSP.jsp"))%>";
-    </script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/SelectFavoritesNodeActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/SelectFavoritesNodeActionJSP.jsp
deleted file mode 100644
index 9556e0612..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/SelectFavoritesNodeActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesNodeAction" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-// Prepare the action.
-SelectFavoritesNodeAction action = new SelectFavoritesNodeAction(controller);
-
-// Load the parameters for the action from the servlet request.
-action.populatePropertyTable(request);
-
-// Run the action and obtain the return code (fail/success).
-boolean actionResult = action.execute();
-
-// Determine if the action was added to the history list.
-boolean isAddedToHistory = action.isAddedToHistory();
-%>
-<%@ include file="/actions/SelectNodeAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/SelectFavoritesToolActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/SelectFavoritesToolActionJSP.jsp
deleted file mode 100644
index f1b7d200d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/SelectFavoritesToolActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-// Prepare the action.
-SelectFavoritesToolAction action = new SelectFavoritesToolAction(controller);
-
-// Load the parameters for the action from the servlet request.
-action.populatePropertyTable(request);
-
-// Run the action and obtain the return code (fail/success).
-boolean actionResult = action.execute();
-
-// Determine if the action was added to the history list.
-boolean isAddedToHistory = action.isAddedToHistory();
-%>
-<%@ include file="/actions/SelectNodeToolAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/SwitchPerspectiveFromFavoritesActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/SwitchPerspectiveFromFavoritesActionJSP.jsp
deleted file mode 100644
index 0ba0cde9c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/SwitchPerspectiveFromFavoritesActionJSP.jsp
+++ /dev/null
@@ -1,30 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-// Prepare the action
-SwitchPerspectiveFromFavoritesAction action = new SwitchPerspectiveFromFavoritesAction(controller);
-
-// Load the parameters for the action from the servlet request.
-action.populatePropertyTable(request);
-
-// Run the action and obtain the return code (fail/success).
-boolean actionResult = action.execute();
-
-// Determine if the action was added to the history list.
-boolean isAddedToHistory = action.isAddedToHistory();
-%>
-<jsp:include page="/scripts/switchperspective.jsp" flush="true"/>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_actions_container.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_actions_container.jsp
deleted file mode 100644
index 64a4ee558..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_actions_container.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
-%>   
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=favPerspective.getMessage("FRAME_TITLE_ACTIONS_CONTAINER")%></title>
-</head>
-<frameset rows="<%=favPerspective.getActionsContainerFramesetRows()%>" bgcolor="#ECE9D8">
-  <frame name="<%=FavoritesFrameNames.PROPERTIES_CONTAINER%>" src="<%=response.encodeURL(controller.getPathWithContext("favorites/fav_properties_container.jsp"))%>" scrolling="no" frameborder=1 marginwidth=0 marginheight=0>
-  <frame name="<%=FavoritesFrameNames.STATUS_CONTAINER%>" src="<%=response.encodeURL(controller.getPathWithContext("favorites/fav_status_container.jsp"))%>" scrolling="no" frameborder=1 marginwidth=0 marginheight=0>
-</frameset>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_navigator_container.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_navigator_container.jsp
deleted file mode 100644
index 26e401a76..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_navigator_container.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
-%>   
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-</head>
-<frameset rows="33,*" border=0 bgcolor="#ECE9D8">
-  <frame name="<%=FavoritesFrameNames.NAVIGATOR_TOOLBAR%>" title="<%=favPerspective.getMessage("FRAME_TITLE_NAVIGATOR_TOOLBAR")%>" src="<%=response.encodeURL(controller.getPathWithContext("favorites/fav_navigator_toolbar.jsp"))%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-  <frame name="<%=FavoritesFrameNames.NAVIGATOR_CONTENT%>" title="<%=favPerspective.getMessage("FRAME_TITLE_NAVIGATOR_CONTENT")%>" src="<%=response.encodeURL(controller.getPathWithContext("favorites/fav_navigator_content.jsp"))%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-</frameset>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_navigator_content.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_navigator_content.jsp
deleted file mode 100644
index 2406ce836..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_navigator_content.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=favPerspective.getMessage("FRAME_TITLE_NAVIGATOR_CONTENT")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/treeview.css"))%>">
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-  <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-  </script>
-  <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/treeview.js"))%>">
-  </script>
-</head>
-<%
-    String selectedAnchorName = "";
-    NodeManager nodeManager = favPerspective.getNodeManager();
-    int focusedNodeId = nodeManager.getFocusedNodeId();
-    String focusedAnchorName = String.valueOf(focusedNodeId);
-    Node selectedNode = nodeManager.getSelectedNode();
-    if (selectedNode != null) {
-        selectedAnchorName = selectedNode.getAnchorName();
-        if (focusedNodeId == selectedNode.getNodeId())
-            focusedAnchorName = selectedAnchorName;
-    }
-%>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" onLoad="self.location.hash='#<%=focusedAnchorName%>';setSelectedAnchorName('<%=selectedAnchorName%>')" class="contentbodymargin">
-<div id="treecontentborder">
-    <%=nodeManager.renderTreeView(response)%>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_navigator_toolbar.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_navigator_toolbar.jsp
deleted file mode 100644
index 24a372305..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_navigator_toolbar.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
-%>   
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=favPerspective.getMessage("FRAME_TITLE_NAVIGATOR_TOOLBAR")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/toolbar.css"))%>">
-<jsp:include page="/favorites/scripts/favoritesframesets.jsp" flush="true"/>  
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/toolbar.js"))%>">
-</script>  
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="toolbarbodymargin">
-<div id="toolbarborder">
-  <div id="toolbar" ondblclick="processFramesetSizes(document.forms[0])">
-<jsp:useBean id="formAction" class="java.lang.StringBuffer" scope="request">
-<%
-  formAction.append("favorites/actions/ResizeFavoritesFramesActionJSP.jsp");
-%>  
-</jsp:useBean>
-<jsp:useBean id="formFrameName" class="java.lang.StringBuffer" scope="request">
-<%
-   formFrameName.append(FavoritesFrameNames.NAVIGATOR_CONTAINER);
-%>
-</jsp:useBean>
-<jsp:include page="/favorites/forms/ProcessFavoritesFramesetsForm.jsp" flush="true"/>
-    <table width="100%" height=25 cellpadding=0 cellspacing=0 border=0>
-      <tr>
-        <td valign="middle" align="center" width=25 height=25><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/navigator.gif"))%>" width=16 height=16></td>
-<%
-   String doubleClickColumnTitle = null;
-   if (favPerspective.getPerspectiveContentFramesetCols().startsWith("100%"))
-     doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_RESTORE");
-   else
-     doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_MAXIMIZE");
-%>        
-        <td id="doubleclickcolumn" title="<%=doubleClickColumnTitle%>" valign="middle" align="left" width="*" height=25 nowrap class="text"><%=controller.getMessage("ALT_NAVIGATOR")%></td>
-<%
-   String altRestore = favPerspective.getMessage("ALT_RESTORE_DEFAULT_FAVORITES");
-   String altRemove = favPerspective.getMessage("ALT_REMOVE_FAVORITE");
-%>   
-        <td valign="middle" align="center" width=25 height=25><a href="<%=response.encodeURL(controller.getPathWithContext("favorites/actions/RestoreDefaultFavoritesConfirmJSP.jsp"))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/refresh_enabled.gif"))%>" width=16 height=16 onMouseOver="src='<%=response.encodeURL(controller.getPathWithContext("images/refresh_highlighted.gif"))%>';mouseover(this)" onMouseOut="src='<%=response.encodeURL(controller.getPathWithContext("images/refresh_enabled.gif"))%>';mouseout(this)" onMouseDown="src='<%=response.encodeURL(controller.getPathWithContext("images/refresh_highlighted.gif"))%>';mousedown(this)" onMouseUp="src='<%=response.encodeURL(controller.getPathWithContext("images/refresh_enabled.gif"))%>';mouseup(this)" alt="<%=altRestore%>" title="<%=altRestore%>"></a></td>
-        <td valign="middle" align="center" width=25 height=25><a href="<%=response.encodeURL(controller.getPathWithContext("favorites/actions/RemoveFavoritesActionJSP.jsp"))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>" width=16 height=16 onMouseOver="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_highlighted.gif"))%>';mouseover(this)" onMouseOut="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>';mouseout(this)" onMouseDown="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_highlighted.gif"))%>';mousedown(this)" onMouseUp="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>';mouseup(this)" alt="<%=altRemove%>" title="<%=altRemove%>"></a></td>
-      </tr>
-    </table>
-  </div>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_perspective_content.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_perspective_content.jsp
deleted file mode 100644
index ad319ab0a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_perspective_content.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
-%>   
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=favPerspective.getMessage("FRAME_TITLE_PERSPECTIVE_CONTENT")%></title>
-</head>
-<frameset cols="<%=favPerspective.getPerspectiveContentFramesetCols()%>" bgcolor=#ECE9D8>
-  <%
-  if (org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.isRTL())
-  {
-  %>
-  <frame name="<%=FavoritesFrameNames.ACTIONS_CONTAINER%>" title="<%=favPerspective.getMessage("FRAME_TITLE_ACTIONS_CONTAINER")%>" src="<%=response.encodeURL(controller.getPathWithContext("favorites/fav_actions_container.jsp"))%>" marginwidth=0 marginheight=0 scrolling="no" frameborder=1>
-  <frame name="<%=FavoritesFrameNames.NAVIGATOR_CONTAINER%>" title="<%=favPerspective.getMessage("FRAME_TITLE_NAVIGATOR_CONTAINER")%>" src="<%=response.encodeURL(controller.getPathWithContext("favorites/fav_navigator_container.jsp"))%>" marginwidth=0 marginheight=0 scrolling="no" frameborder=1>
-  <%
-  }
-  else
-  {
-  %>
-  <frame name="<%=FavoritesFrameNames.NAVIGATOR_CONTAINER%>" title="<%=favPerspective.getMessage("FRAME_TITLE_NAVIGATOR_CONTAINER")%>" src="<%=response.encodeURL(controller.getPathWithContext("favorites/fav_navigator_container.jsp"))%>" marginwidth=0 marginheight=0 scrolling="no" frameborder=1>
-  <frame name="<%=FavoritesFrameNames.ACTIONS_CONTAINER%>" title="<%=favPerspective.getMessage("FRAME_TITLE_ACTIONS_CONTAINER")%>" src="<%=response.encodeURL(controller.getPathWithContext("favorites/fav_actions_container.jsp"))%>" marginwidth=0 marginheight=0 scrolling="no" frameborder=1>
-  <%
-  }
-  %>
-</frameset>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_properties_container.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_properties_container.jsp
deleted file mode 100644
index 58a8be9a9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_properties_container.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
-%>   
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=favPerspective.getMessage("FRAME_TITLE_PROPERTIES_CONTAINER")%></title>
-</head>
-<frameset rows="33,*" border=0 bgcolor="#ECE9D8">
-  <frame name="<%=FavoritesFrameNames.PROPERTIES_TOOLBAR%>" title="<%=favPerspective.getMessage("FRAME_TITLE_PROPERTIES_TOOLBAR")%>" src="<%=response.encodeURL(controller.getPathWithContext("favorites/fav_properties_toolbar.jsp"))%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-  <frame name="<%=FavoritesFrameNames.PROPERTIES_CONTENT%>" title="<%=favPerspective.getMessage("FRAME_TITLE_PROPERTIES_CONTENT")%>" src="<%=response.encodeURL(controller.getPathWithContext("favorites/fav_properties_content.jsp"))%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-</frameset>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_properties_content.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_properties_content.jsp
deleted file mode 100644
index e572c122f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_properties_content.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
-%>   
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=favPerspective.getMessage("FRAME_TITLE_PROPERTIES_CONTENT")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-<%
-    NodeManager nodeManager = favPerspective.getNodeManager();
-    Node selectedNode = nodeManager.getSelectedNode();
-    if (selectedNode != null)
-    {
-        ToolManager toolManager;
-        if (selectedNode.getViewId() == ActionInputs.VIEWID_DEFAULT)
-            toolManager = selectedNode.getToolManager();
-        else
-            toolManager = selectedNode.getViewToolManager();
-        Tool selectedTool = toolManager.getSelectedTool();
-        if (selectedTool != null && selectedTool.getToolType() != ToolTypes.ACTION) {
-        %>
-        <script language="javascript">
-            location="<%=response.encodeURL(controller.getPathWithContext(selectedTool.getFormLink()))%>";
-        </script>
-        <%
-        }
-        else {
-        %>
-<table>
-  <tr>
-    <td>
-      <%=controller.getMessage("MSG_ERROR_NO_ACTION_SELECTED")%>
-    </td>
-  </tr>
-</table>
-        <%
-        }
-    }
-    else {
-    %>
-<table>
-  <tr>
-    <td>
-      <%=controller.getMessage("MSG_ERROR_NO_NODE_SELECTED")%>
-    </td>
-  </tr>
-</table>
-    <%
-    }
-%>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_properties_toolbar.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_properties_toolbar.jsp
deleted file mode 100644
index 3b9464e0e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_properties_toolbar.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
-%>   
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=favPerspective.getMessage("FRAME_TITLE_PROPERTIES_TOOLBAR")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/toolbar.css"))%>">
-<jsp:include page="/favorites/scripts/favoritesframesets.jsp" flush="true"/>  
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/toolbar.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="toolbarbodymargin">
-<div id="toolbarborder">
-  <div id="toolbar" ondblclick="processFramesetSizes(document.forms[0])">
-<jsp:useBean id="formAction" class="java.lang.StringBuffer" scope="request">
-<%
-  formAction.append("favorites/actions/ResizeFavoritesFramesActionJSP.jsp");
-%>  
-</jsp:useBean>
-<jsp:useBean id="formFrameName" class="java.lang.StringBuffer" scope="request">
-<%
-   formFrameName.append(FavoritesFrameNames.PROPERTIES_CONTAINER);
-%>
-</jsp:useBean>
-<jsp:include page="/favorites/forms/ProcessFavoritesFramesetsForm.jsp" flush="true"/>
-    <table width="100%" height=25 cellpadding=0 cellspacing=0 border=0>
-      <tr>
-        <td valign="middle" align="center" width=25 height=25><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/actions.gif"))%>" width=16 height=16></td>
-<%
-   String doubleClickColumnTitle = null;
-   if (favPerspective.getPerspectiveContentFramesetCols().endsWith("100%"))
-   {
-     if (favPerspective.getActionsContainerFramesetRows().startsWith("100%"))
-       doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_RESTORE");
-   }
-   if (doubleClickColumnTitle == null)
-     doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_MAXIMIZE");
-%>        
-        <td id="doubleclickcolumn" title="<%=doubleClickColumnTitle%>" valign="middle" align="left" width="*" height=25 nowrap class="text"><%=controller.getMessage("ALT_ACTIONS")%></td>
-<%
-    NodeManager nodeManager = favPerspective.getNodeManager();
-    Node selectedNode = nodeManager.getSelectedNode();
-    if (selectedNode != null) {
-        ToolManager toolManager;
-        if (selectedNode.getViewId() == ActionInputs.VIEWID_DEFAULT)
-            toolManager = selectedNode.getToolManager();
-        else
-            toolManager = selectedNode.getViewToolManager();
-        for(int i=0; i<toolManager.getNumberOfTools(); i++) {
-            Tool tool = (Tool)toolManager.getTool(i);
-            %>
-        <td valign="middle" align="center" width=25 height=25><%=tool.renderTool(response,controller)%></td>
-            <%
-        }
-    }
-%>
-      </tr>
-    </table>
-  </div>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_status_container.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_status_container.jsp
deleted file mode 100644
index ec4d66082..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_status_container.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
-%>   
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=favPerspective.getMessage("FRAME_TITLE_STATUS_CONTAINER")%></title>
-</head>
-<frameset rows="33,*" border=0 bgcolor="#ECE9D8">
-  <frame name="<%=FavoritesFrameNames.STATUS_TOOLBAR%>" title="<%=favPerspective.getMessage("FRAME_TITLE_STATUS_TOOLBAR")%>" src="<%=response.encodeURL(controller.getPathWithContext("favorites/fav_status_toolbar.jsp"))%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-  <frame name="<%=FavoritesFrameNames.STATUS_CONTENT%>" title="<%=favPerspective.getMessage("FRAME_TITLE_STATUS_CONTENT")%>" src="<%=response.encodeURL(controller.getPathWithContext("favorites/fav_status_content.jsp"))%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-</frameset>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_status_content.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_status_content.jsp
deleted file mode 100644
index f6e1493ac..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_status_content.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
-%>   
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=favPerspective.getMessage("FRAME_TITLE_STATUS_CONTENT")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-  <table>
-    <tr>
-      <td>
-        <pre>
-<%=favPerspective.getMessageQueue().getMessagesFromList()%>
-        </pre>
-      </td>
-    </tr>
-  </table>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_status_toolbar.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_status_toolbar.jsp
deleted file mode 100644
index 4f466a79d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_status_toolbar.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
-%>   
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=favPerspective.getMessage("FRAME_TITLE_STATUS_TOOLBAR")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/toolbar.css"))%>">
-<jsp:include page="/favorites/scripts/favoritesframesets.jsp" flush="true"/>  
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/toolbar.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="toolbarbodymargin">
-<div id="toolbarborder">
-  <div id="toolbar" ondblclick="processFramesetSizes(document.forms[0])">
-<jsp:useBean id="formAction" class="java.lang.StringBuffer" scope="request">
-<%
-  formAction.append("favorites/actions/ResizeFavoritesFramesActionJSP.jsp");
-%>  
-</jsp:useBean>
-<jsp:useBean id="formFrameName" class="java.lang.StringBuffer" scope="request">
-<%
-   formFrameName.append(FavoritesFrameNames.STATUS_CONTAINER);
-%>
-</jsp:useBean>
-<jsp:include page="/favorites/forms/ProcessFavoritesFramesetsForm.jsp" flush="true"/>
-    <table width="100%" height=25 cellpadding=0 cellspacing=0 border=0>
-      <tr>
-        <td valign="middle" align="center" width=25 height=25><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/status.gif"))%>" width=16 height=16></td>
-<%
-   String doubleClickColumnTitle = null;
-   if (favPerspective.getPerspectiveContentFramesetCols().endsWith("100%"))
-   {
-     if (favPerspective.getActionsContainerFramesetRows().endsWith("100%"))
-       doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_RESTORE");       
-   }
-   if (doubleClickColumnTitle == null)
-     doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_MAXIMIZE");
-%>        
-        <td id="doubleclickcolumn" title="<%=doubleClickColumnTitle%>" valign="middle" align="left" width="*" height=25 nowrap class="text"><%=controller.getMessage("ALT_STATUS")%></td>
-<%
-   String altClear = controller.getMessage("ALT_CLEAR");
-%>           
-        <td valign="middle" align="center" width=25 height=25><a href="<%=response.encodeURL(controller.getPathWithContext("favorites/fav_status_content.jsp"))%>" target="<%=FavoritesFrameNames.STATUS_CONTENT%>"><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>" width=16 height=16 onMouseOver="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_highlighted.gif"))%>';mouseover(this)" onMouseOut="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>';mouseout(this)" onMouseDown="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_highlighted.gif"))%>';mousedown(this)" onMouseUp="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>';mouseup(this)" alt="<%=altClear%>" title="<%=altClear%>"></a></td>
-      </tr>
-    </table>
-  </div>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesImportToWorkbenchForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesImportToWorkbenchForm.jsp
deleted file mode 100644
index 48b418436..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesImportToWorkbenchForm.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="formProperties" class="java.util.Hashtable" scope="request">
-<%
-   FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
-   NodeManager nodeManager = favPerspective.getNodeManager();
-   // The selected node must be a FavoritesWSDLServiceNode.
-   Node selectedNode = nodeManager.getSelectedNode();
-   FavoritesWSDLServiceElement wsdlElement = (FavoritesWSDLServiceElement)selectedNode.getTreeElement();
-   formProperties.put("formActionLink","favorites/actions/FavoritesImportToWorkbenchActionJSP.jsp");
-   formProperties.put("wsdlURL",wsdlElement.getWsdlUrl());
-%>
-</jsp:useBean>
-<jsp:include page="/forms/ImportWSDLAndWSILToWorkbenchForm.jsp" flush="true"/>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesLaunchWebServiceWizardForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesLaunchWebServiceWizardForm.jsp
deleted file mode 100644
index e9323df91..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesLaunchWebServiceWizardForm.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" %>
-
-<jsp:useBean id="formActionLink" class="java.lang.StringBuffer" scope="request">
-<%
-   formActionLink.append("favorites/actions/FavoritesLaunchWebServiceWizardActionJSP.jsp");
-%>
-</jsp:useBean>
-<jsp:include page="/forms/LaunchWebServiceWizardForm.jsp" flush="true"/>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUDDIBusinessDetailsPage.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUDDIBusinessDetailsPage.jsp
deleted file mode 100644
index fa4aac5f6..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUDDIBusinessDetailsPage.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*,
-                                                                                          org.apache.wsil.extension.uddi.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-        FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
-        NodeManager nodeManager = favPerspective.getNodeManager();
-        Node selectedNode = nodeManager.getSelectedNode();
-        ToolManager currentToolManager = selectedNode.getCurrentToolManager();
-        TreeElement selectedElement = selectedNode.getTreeElement();
-%>
-<html>
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <title><%=favPerspective.getMessage("FORM_TITLE_UDDI_BUSINESS_DETAILS")%></title>
-    <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-
-    <%
-    String titleImagePath = "images/details_highlighted.gif";
-    String title = favPerspective.getMessage("ALT_FAVORITES_UDDI_BUSINESS_DETAILS");
-    %>
-    <%@ include file = "/forms/formheader.inc" %>
-    <%
-    if (selectedElement instanceof FavoritesUDDIBusinessElement) {
-        FavoritesUDDIBusinessElement busElement = (FavoritesUDDIBusinessElement)selectedElement;
-    %>
-
-        <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
-            <tr>
-                <th class="singleheadercolor" height=20 valign="bottom" align="left">
-                    <%=favPerspective.getMessage("FORM_LABEL_BUSINESS_NAME")%>
-                </th>
-            </tr>
-            <tr>
-                <td class="tablecells">
-                    <%=busElement.getName()%>
-                </td>
-            </tr>
-        </table>
-
-        <br>
-        <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
-            <tr>
-                <th class="singleheadercolor" height=20 valign="bottom" align="left">
-                    <%=favPerspective.getMessage("FORM_LABEL_INQUIRY_URL")%>
-                </th>
-            </tr>
-            <tr>
-                <td class="tablecells">
-                    <%=busElement.getInquiryURL()%>
-                </td>
-            </tr>
-        </table>
-
-        <br>
-        <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
-            <tr>
-                <th class="singleheadercolor" height=20 valign="bottom" align="left">
-                    <%=favPerspective.getMessage("FORM_LABEL_BUSINESS_KEY")%>
-                </th>
-            </tr>
-            <tr>
-                <td class="tablecells">
-                    <%=busElement.getBusinessKey()%>
-                </td>
-            </tr>
-        </table>
-<jsp:useBean id="currentToolManagerHash" class="java.util.Hashtable" scope="request">
-<%
-  currentToolManagerHash.put(ActionInputs.CURRENT_TOOL_MANAGER,currentToolManager);
-%>
-</jsp:useBean>
-<jsp:include page="/forms/otherActions.jsp" flush="true"/>        
-
-    <%
-    }
-    %>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUDDIRegistryDetailsPage.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUDDIRegistryDetailsPage.jsp
deleted file mode 100644
index 432425f3a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUDDIRegistryDetailsPage.jsp
+++ /dev/null
@@ -1,154 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*,
-                                                        org.apache.wsil.extension.uddi.*,
-                                                        java.io.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-        FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
-        NodeManager nodeManager = favPerspective.getNodeManager();
-        Node selectedNode = nodeManager.getSelectedNode();
-        ToolManager currentToolManager = selectedNode.getCurrentToolManager();
-        TreeElement selectedElement = selectedNode.getTreeElement();
-%>
-<html>
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <title><%=favPerspective.getMessage("FORM_TITLE_UDDI_REGISTRY_DETAILS")%></title>
-    <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-
-    <%
-    String titleImagePath = "images/details_highlighted.gif";
-    String title = favPerspective.getMessage("ALT_FAVORITES_UDDI_REGISTRY_DETAILS");
-    %>
-    <%@ include file = "/forms/formheader.inc" %>
-    <%
-    if (selectedElement instanceof FavoritesUDDIRegistryElement) {
-        FavoritesUDDIRegistryElement regElement = (FavoritesUDDIRegistryElement)selectedElement;
-        String registryName = regElement.getName();
-    %>
-
-        <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
-            <tr>
-                <th class="singleheadercolor" height=20 valign="bottom" align="left">
-                    <%=favPerspective.getMessage("FORM_LABEL_REGISTRY_NAME")%>
-                </th>
-            </tr>
-            <tr>
-                <td class="tablecells">
-                    <%=registryName%>
-                </td>
-            </tr>
-        </table>
-
-        <br>
-        <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
-            <tr>
-                <th class="singleheadercolor" height=20 valign="bottom" align="left">
-                    <%=favPerspective.getMessage("FORM_LABEL_INQUIRY_URL")%>
-                </th>
-            </tr>
-            <tr>
-                <td class="tablecells">
-                    <%=regElement.getInquiryURL()%>
-                </td>
-            </tr>
-        </table>
-<%
-     String publishURL = regElement.getPublishURL();
-     if (Validator.validateURL(publishURL))
-     {
-%>
-        <br>
-        <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
-            <tr>
-                <th class="singleheadercolor" height=20 valign="bottom" align="left">
-                    <%=favPerspective.getMessage("FORM_LABEL_PUBLISH_URL")%>
-                </th>
-            </tr>
-            <tr>
-                <td class="tablecells">
-                    <%=publishURL%>
-                </td>
-            </tr>
-        </table>
-<%
-     }
-   
-     String registryURL = regElement.getRegistrationURL();
-     if (Validator.validateURL(registryURL))
-     {
-%>
-            <br>
-            <table>
-                <tr>
-                    <td align="left">
-                        <%=favPerspective.getMessage("FORM_LABEL_REGISTRY_URL",registryURL)%>
-                    </td>
-                </tr>
-            </table>
-<%
-      }
-      
-      StringBuffer categoryDirectory = new StringBuffer();
-      FavoritesUDDIRegistryFolderElement.formCategoriesDirectory(categoryDirectory,controller.getServletEngineStateLocation(),registryName);
-      File categoryDirectoryFile = new File(categoryDirectory.toString());
-      String[] categoryFiles = categoryDirectoryFile.list();
-      if (categoryFiles != null)
-      {
-%>
-<br>
-<table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
-  <tr>
-    <th class="singleheadercolor" height=20 valign="bottom" align="left">
-      <%=favPerspective.getMessage("FORM_LABEL_USER_DEFINED_CATEGORY_DATA_FILES")%>
-    </th>
-  </tr>
-<%      
-        for (int i=0;i<categoryFiles.length;i++)
-        {
-%>
-  <tr>
-    <td class="tablecells">
-      <%=categoryFiles[i]%>
-    </td>
-  </tr>
-<%        
-        }
-%>
-</table>
-<%        
-      }      
-%>
-<jsp:useBean id="currentToolManagerHash" class="java.util.Hashtable" scope="request">
-<%
-  currentToolManagerHash.put(ActionInputs.CURRENT_TOOL_MANAGER,currentToolManager);
-%>
-</jsp:useBean>
-<jsp:include page="/forms/otherActions.jsp" flush="true"/>
-<%      
-    }
-%>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUDDIServiceDetailsPage.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUDDIServiceDetailsPage.jsp
deleted file mode 100644
index 3c56f58ca..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUDDIServiceDetailsPage.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*,
-                                                                                          org.apache.wsil.extension.uddi.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-        FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
-        NodeManager nodeManager = favPerspective.getNodeManager();
-        Node selectedNode = nodeManager.getSelectedNode();
-        ToolManager currentToolManager = selectedNode.getCurrentToolManager();
-        TreeElement selectedElement = selectedNode.getTreeElement();
-%>
-<html>
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <title><%=favPerspective.getMessage("FORM_TITLE_UDDI_SERVICE_DETAILS")%></title>
-    <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-
-    <%
-    String titleImagePath = "images/details_highlighted.gif";
-    String title = favPerspective.getMessage("ALT_FAVORITES_UDDI_SERVICE_DETAILS");
-    %>
-    <%@ include file = "/forms/formheader.inc" %>
-    <%
-    if (selectedElement instanceof FavoritesUDDIServiceElement) {
-        FavoritesUDDIServiceElement serElement = (FavoritesUDDIServiceElement)selectedElement;
-    %>
-
-        <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
-            <tr>
-                <th class="singleheadercolor" height=20 valign="bottom" align="left">
-                    <%=favPerspective.getMessage("FORM_LABEL_SERVICE_NAME")%>
-                </th>
-            </tr>
-            <tr>
-                <td class="tablecells">
-                    <%=serElement.getName()%>
-                </td>
-            </tr>
-        </table>
-
-        <br>
-        <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
-            <tr>
-                <th class="singleheadercolor" height=20 valign="bottom" align="left">
-                    <%=favPerspective.getMessage("FORM_LABEL_INQUIRY_URL")%>
-                </th>
-            </tr>
-            <tr>
-                <td class="tablecells">
-                    <%=serElement.getInquiryURL()%>
-                </td>
-            </tr>
-        </table>
-
-        <br>
-        <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
-            <tr>
-                <th class="singleheadercolor" height=20 valign="bottom" align="left">
-                    <%=favPerspective.getMessage("FORM_LABEL_SERVICE_KEY")%>
-                </th>
-            </tr>
-            <tr>
-                <td class="tablecells">
-                    <%=serElement.getServiceKey()%>
-                </td>
-            </tr>
-        </table>
-<jsp:useBean id="currentToolManagerHash" class="java.util.Hashtable" scope="request">
-<%
-  currentToolManagerHash.put(ActionInputs.CURRENT_TOOL_MANAGER,currentToolManager);
-%>
-</jsp:useBean>
-<jsp:include page="/forms/otherActions.jsp" flush="true"/>        
-
-    <%
-    }
-    %>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUDDIServiceIntDetailsPage.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUDDIServiceIntDetailsPage.jsp
deleted file mode 100644
index d31a0f415..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUDDIServiceIntDetailsPage.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*,
-                                                                                          org.apache.wsil.extension.uddi.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-        FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
-        NodeManager nodeManager = favPerspective.getNodeManager();
-        Node selectedNode = nodeManager.getSelectedNode();
-        ToolManager currentToolManager = selectedNode.getCurrentToolManager();
-        TreeElement selectedElement = selectedNode.getTreeElement();
-%>
-<html>
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <title><%=favPerspective.getMessage("FORM_TITLE_UDDI_SERVICE_INTERFACE_DETAILS")%></title>
-    <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-
-    <%
-    String titleImagePath = "images/details_highlighted.gif";
-    String title = favPerspective.getMessage("ALT_FAVORITES_UDDI_SERVICE_INTERFACE_DETAILS");
-    %>
-    <%@ include file = "/forms/formheader.inc" %>
-    <%
-    if (selectedElement instanceof FavoritesUDDIServiceInterfaceElement) {
-        FavoritesUDDIServiceInterfaceElement serIntElement = (FavoritesUDDIServiceInterfaceElement)selectedElement;
-    %>
-
-        <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
-            <tr>
-                <th class="singleheadercolor" height=20 valign="bottom" align="left">
-                    <%=favPerspective.getMessage("FORM_LABEL_SERVICE_INTERFACE_NAME")%>
-                </th>
-            </tr>
-            <tr>
-                <td class="tablecells">
-                    <%=serIntElement.getName()%>
-                </td>
-            </tr>
-        </table>
-
-        <br>
-        <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
-            <tr>
-                <th class="singleheadercolor" height=20 valign="bottom" align="left">
-                    <%=favPerspective.getMessage("FORM_LABEL_INQUIRY_URL")%>
-                </th>
-            </tr>
-            <tr>
-                <td class="tablecells">
-                    <%=serIntElement.getInquiryURL()%>
-                </td>
-            </tr>
-        </table>
-
-        <br>
-        <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
-            <tr>
-                <th class="singleheadercolor" height=20 valign="bottom" align="left">
-                    <%=favPerspective.getMessage("FORM_LABEL_SERVICE_INTERFACE_KEY")%>
-                </th>
-            </tr>
-            <tr>
-                <td class="tablecells">
-                    <%=serIntElement.getServiceInterfaceKey()%>
-                </td>
-            </tr>
-        </table>
-<jsp:useBean id="currentToolManagerHash" class="java.util.Hashtable" scope="request">
-<%
-  currentToolManagerHash.put(ActionInputs.CURRENT_TOOL_MANAGER,currentToolManager);
-%>
-</jsp:useBean>
-<jsp:include page="/forms/otherActions.jsp" flush="true"/>        
-
-    <%
-    }
-    %>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUserDefUDDIRegistryDetailsPage.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUserDefUDDIRegistryDetailsPage.jsp
deleted file mode 100644
index eba10a089..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUserDefUDDIRegistryDetailsPage.jsp
+++ /dev/null
@@ -1,309 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*,
-                                                        org.apache.wsil.extension.uddi.*,
-                                                        java.io.*,
-                                                        java.util.*,
-                                                        org.eclipse.wst.ws.internal.model.v10.registry.Name,
-                                                        org.eclipse.wst.ws.internal.model.v10.registry.Description,
-                                                        org.eclipse.wst.ws.internal.model.v10.uddiregistry.Taxonomies,
-                                                        org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-        FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
-        NodeManager nodeManager = favPerspective.getNodeManager();
-        Node selectedNode = nodeManager.getSelectedNode();
-        ToolManager currentToolManager = selectedNode.getCurrentToolManager();
-        TreeElement selectedElement = selectedNode.getTreeElement();
-%>
-<html>
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <title><%=favPerspective.getMessage("FORM_TITLE_USER_DEF_UDDI_REGISTRY_DETAILS")%></title>
-    <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-
-    <%
-    String titleImagePath = "images/details_highlighted.gif";
-    String title = favPerspective.getMessage("ALT_FAVORITES_USER_DEF_UDDI_REGISTRY_DETAILS");
-    %>
-    <%@ include file = "/forms/formheader.inc" %>
-    <%
-    if (selectedElement instanceof FavoritesUserDefUDDIRegistryElement) {
-        FavoritesUserDefUDDIRegistryElement regElement = (FavoritesUserDefUDDIRegistryElement)selectedElement;
-    %>
-
-        <%
-        String version = regElement.getVersion();
-        if (version != null)
-        {
-        %>
-        <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
-            <tr>
-                <th class="singleheadercolor" height=20 valign="bottom" align="left">
-                    <%=favPerspective.getMessage("FORM_LABEL_UDDI_VERSION")%>
-                </th>
-            </tr>
-            <tr>
-                <td class="tablecells">
-                    <%=version%>
-                </td>
-            </tr>
-        </table>
-        <%
-        }
-        %>
-
-        <%
-        List names = regElement.getNames();
-        if (names != null && !names.isEmpty())
-        {
-        %>
-        <br>
-        <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
-            <tr>
-                <th class="singleheadercolor" height=20 valign="bottom" align="left" width="1" nowrap>
-                    <%=favPerspective.getMessage("FORM_LABEL_LANGUAGE")%>
-                </th>
-                <th class="singleheadercolor" height=20 valign="bottom" align="left">
-                    <%=favPerspective.getMessage("FORM_LABEL_REGISTRY_NAME")%>
-                </th>
-            </tr>
-            <%
-            for (Iterator it = names.iterator(); it.hasNext();)
-            {
-              Name name = (Name)it.next();
-              String lang = name.getLang();
-              %>
-              <tr>
-                <td class="tablecells"><%=lang != null ? lang : "--"%></td>
-                <td class="tablecells"><%=name.getValue()%></td>
-              </tr>
-              <%
-            }
-            %>
-        </table>
-        <%
-        }
-        %>
-
-        <%
-        List descs = regElement.getDescs();
-        if (descs != null && !descs.isEmpty())
-        {
-        %>
-        <br>
-        <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
-            <tr>
-                <th class="singleheadercolor" height=20 valign="bottom" align="left" width="1" nowrap>
-                    <%=favPerspective.getMessage("FORM_LABEL_LANGUAGE")%>
-                </th>
-                <th class="singleheadercolor" height=20 valign="bottom" align="left">
-                    <%=favPerspective.getMessage("FORM_LABEL_DESC")%>
-                </th>
-            </tr>
-            <%
-            for (Iterator it = descs.iterator(); it.hasNext();)
-            {
-              Description desc = (Description)it.next();
-              String lang = desc.getLang();
-              %>
-              <tr>
-                <td class="tablecells"><%=lang != null ? lang : "--"%></td>
-                <td class="tablecells"><%=desc.getValue()%></td>
-              </tr>
-              <%
-            }
-            %>
-        </table>
-        <%
-        }
-        %>
-
-        <%
-        String defaultLogin = regElement.getDefaultLogin();
-        if (defaultLogin != null)
-        {
-        %>
-        <br>
-        <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
-            <tr>
-                <th class="singleheadercolor" height=20 valign="bottom" align="left">
-                    <%=favPerspective.getMessage("FORM_LABEL_DEFAULT_LOGIN")%>
-                </th>
-            </tr>
-            <tr>
-                <td class="tablecells">
-                    <%=defaultLogin%>
-                </td>
-            </tr>
-        </table>
-        <%
-        }
-        %>
-
-        <%
-        String defaultPassword = regElement.getDefaultPassword();
-        if (defaultPassword != null)
-        {
-        %>
-        <br>
-        <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
-            <tr>
-                <th class="singleheadercolor" height=20 valign="bottom" align="left">
-                    <%=favPerspective.getMessage("FORM_LABEL_DEFAULT_PASSWORD")%>
-                </th>
-            </tr>
-            <tr>
-                <td class="tablecells">
-                    <%=defaultPassword%>
-                </td>
-            </tr>
-        </table>
-        <%
-        }
-        %>
-
-        <%
-        String inquiryURL = regElement.getInquiryURL();
-        if (inquiryURL != null)
-        {
-        %>
-        <br>
-        <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
-            <tr>
-                <th class="singleheadercolor" height=20 valign="bottom" align="left">
-                    <%=favPerspective.getMessage("FORM_LABEL_INQUIRY_URL")%>
-                </th>
-            </tr>
-            <tr>
-                <td class="tablecells">
-                    <%=inquiryURL%>
-                </td>
-            </tr>
-        </table>
-        <%
-        }
-        %>
-
-     <%
-     String publishURL = regElement.getPublishURL();
-     if (Validator.validateURL(publishURL))
-     {
-     %>
-        <br>
-        <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
-            <tr>
-                <th class="singleheadercolor" height=20 valign="bottom" align="left">
-                    <%=favPerspective.getMessage("FORM_LABEL_PUBLISH_URL")%>
-                </th>
-            </tr>
-            <tr>
-                <td class="tablecells">
-                    <%=publishURL%>
-                </td>
-            </tr>
-        </table>
-     <%
-     }
-
-     String secureInquiryURL = regElement.getSecureInquiryURL();
-     if (Validator.validateURL(secureInquiryURL))
-     {
-     %>
-        <br>
-        <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
-            <tr>
-                <th class="singleheadercolor" height=20 valign="bottom" align="left">
-                    <%=favPerspective.getMessage("FORM_LABEL_SECURE_INQUIRY_URL")%>
-                </th>
-            </tr>
-            <tr>
-                <td class="tablecells">
-                    <%=secureInquiryURL%>
-                </td>
-            </tr>
-        </table>
-     <%
-     }
-
-     String securePublishURL = regElement.getSecurePublishURL();
-     if (Validator.validateURL(securePublishURL))
-     {
-     %>
-        <br>
-        <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
-            <tr>
-                <th class="singleheadercolor" height=20 valign="bottom" align="left">
-                    <%=favPerspective.getMessage("FORM_LABEL_SECURE_PUBLISH_URL")%>
-                </th>
-            </tr>
-            <tr>
-                <td class="tablecells">
-                    <%=securePublishURL%>
-                </td>
-            </tr>
-        </table>
-     <%
-     }
-     %>
-     
-     <%
-     Taxonomy[] taxonomies = regElement.getTaxonomies();
-     if (taxonomies != null && taxonomies.length > 0)
-     {
-     %>
-       <br>
-       <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
-         <tr>
-           <th class="singleheadercolor" height=20 valign="bottom" align="left">
-             <%=favPerspective.getMessage("FORM_LABEL_TAXONOMY")%>
-           </th>
-         </tr>
-         <%
-         for (int i=0; i<taxonomies.length; i++)
-         {
-           Taxonomy taxonomy = taxonomies[i];
-         %>
-         <tr>
-           <td class="tablecells"><%=taxonomy.getName()%></td>
-         </tr>
-         <%
-         }
-         %>
-       </table>
-       <%
-     }
-     %>
-
-<jsp:useBean id="currentToolManagerHash" class="java.util.Hashtable" scope="request">
-<%
-  currentToolManagerHash.put(ActionInputs.CURRENT_TOOL_MANAGER,currentToolManager);
-%>
-</jsp:useBean>
-<jsp:include page="/forms/otherActions.jsp" flush="true"/>
-<%      
-    }
-%>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesWSDLDetailsPage.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesWSDLDetailsPage.jsp
deleted file mode 100644
index 9906f4719..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesWSDLDetailsPage.jsp
+++ /dev/null
@@ -1,71 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-        FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
-        NodeManager nodeManager = favPerspective.getNodeManager();
-        Node selectedNode = nodeManager.getSelectedNode();
-        ToolManager currentToolManager = selectedNode.getCurrentToolManager();
-        TreeElement selectedElement = selectedNode.getTreeElement();
-%>
-<html>
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <title><%=favPerspective.getMessage("FORM_TITLE_WSDL_DETAILS")%></title>
-    <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-
-    <%
-    String titleImagePath = "images/details_highlighted.gif";
-    String title = favPerspective.getMessage("ALT_FAVORITES_WSDL_DETAILS");
-    %>
-    <%@ include file = "/forms/formheader.inc" %>
-    <%
-    if (selectedElement instanceof FavoritesWSDLServiceElement) {
-        FavoritesWSDLServiceElement wsdlElement = (FavoritesWSDLServiceElement)selectedElement;
-    %>
-
-        <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
-            <tr>
-                <th class="headercolor" height=20 valign="bottom" align="left">
-                    <%=favPerspective.getMessage("FORM_LABEL_URL")%>
-                </th>
-            </tr>
-            <tr>
-                <td class="tablecells">
-                    <%=wsdlElement.getWsdlUrl()%>
-                </td>
-            </tr>
-        </table>
-<jsp:useBean id="currentToolManagerHash" class="java.util.Hashtable" scope="request">
-<%
-  currentToolManagerHash.put(ActionInputs.CURRENT_TOOL_MANAGER,currentToolManager);
-%>
-</jsp:useBean>
-<jsp:include page="/forms/otherActions.jsp" flush="true"/>        
-
-    <%
-    }
-    %>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesWSILDetailsPage.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesWSILDetailsPage.jsp
deleted file mode 100644
index 6c0dcf471..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesWSILDetailsPage.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*,
-                                                                                          org.apache.wsil.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-        FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
-        NodeManager nodeManager = favPerspective.getNodeManager();
-        Node selectedNode = nodeManager.getSelectedNode();
-        ToolManager currentToolManager = selectedNode.getCurrentToolManager();
-        TreeElement selectedElement = selectedNode.getTreeElement();
-%>
-<html>
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <title><%=favPerspective.getMessage("FORM_TITLE_WSIL_DETAILS")%></title>
-    <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-
-    <%
-    String titleImagePath = "images/details_highlighted.gif";
-    String title = favPerspective.getMessage("ALT_FAVORITES_WSIL_DETAILS");
-    %>
-    <%@ include file = "/forms/formheader.inc" %>
-    <%
-    if (selectedElement instanceof FavoritesWSILElement) {
-        FavoritesWSILElement wsilElement = (FavoritesWSILElement)selectedElement;
-        %>
-
-        <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
-            <tr>
-                <th class="singleheadercolor" height=20 valign="bottom" align="left">
-                    <%=favPerspective.getMessage("FORM_LABEL_URL")%>
-                </th>
-            </tr>
-            <tr>
-                <td class="tablecells">
-                    <%=wsilElement.getWsilUrl()%>
-                </td>
-            </tr>
-        </table>
-<jsp:useBean id="currentToolManagerHash" class="java.util.Hashtable" scope="request">
-<%
-  currentToolManagerHash.put(ActionInputs.CURRENT_TOOL_MANAGER,currentToolManager);
-%>
-</jsp:useBean>
-<jsp:include page="/forms/otherActions.jsp" flush="true"/>        
-
-        <%
-    }
-    %>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/ProcessFavoritesFramesetsForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/ProcessFavoritesFramesetsForm.jsp
deleted file mode 100644
index 2f9a71ca9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/ProcessFavoritesFramesetsForm.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
-%>   
-<jsp:useBean id="formAction" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="formFrameName" class="java.lang.StringBuffer" scope="request"/>
-<form action="<%=response.encodeURL(controller.getPathWithContext(formAction.toString()))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" style="margin-top:0;margin-bottom:0">
-  <input name="<%=ActionInputs.FRAME_NAME%>" type="hidden" value="<%=formFrameName%>">
-  <input name="<%=FavoritesActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT%>" type="hidden" value="<%=favPerspective.getPerspectiveContentFramesetCols()%>">
-  <input name="<%=FavoritesActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER%>" type="hidden" value="<%=favPerspective.getActionsContainerFramesetRows()%>">
-</form>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/add_to_uddi_perspective_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/add_to_uddi_perspective_enabled.gif
deleted file mode 100644
index e65d19a11..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/add_to_uddi_perspective_enabled.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/add_to_uddi_perspective_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/add_to_uddi_perspective_highlighted.gif
deleted file mode 100644
index 4aa3ddcb5..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/add_to_uddi_perspective_highlighted.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/add_to_wsil_perspective_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/add_to_wsil_perspective_enabled.gif
deleted file mode 100644
index 074184164..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/add_to_wsil_perspective_enabled.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/add_to_wsil_perspective_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/add_to_wsil_perspective_highlighted.gif
deleted file mode 100644
index 362b8cb5a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/add_to_wsil_perspective_highlighted.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_WSIL_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_WSIL_enabled.gif
deleted file mode 100644
index 0fa09842f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_WSIL_enabled.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_WSIL_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_WSIL_highlighted.gif
deleted file mode 100644
index 18a4ceb03..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_WSIL_highlighted.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_business_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_business_enabled.gif
deleted file mode 100644
index bd1e37adc..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_business_enabled.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_business_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_business_highlighted.gif
deleted file mode 100644
index d51b97517..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_business_highlighted.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_registry_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_registry_enabled.gif
deleted file mode 100644
index ef2aa155f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_registry_enabled.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_registry_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_registry_highlighted.gif
deleted file mode 100644
index d91ecb55f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_registry_highlighted.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_service_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_service_enabled.gif
deleted file mode 100644
index c351daff7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_service_enabled.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_service_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_service_highlighted.gif
deleted file mode 100644
index 53e1335da..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_service_highlighted.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_service_interface_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_service_interface_enabled.gif
deleted file mode 100644
index 446986a1a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_service_interface_enabled.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_service_interface_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_service_interface_highlighted.gif
deleted file mode 100644
index 815312251..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_service_interface_highlighted.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_wsdl_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_wsdl_enabled.gif
deleted file mode 100644
index 6dc028508..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_wsdl_enabled.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_wsdl_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_wsdl_highlighted.gif
deleted file mode 100644
index 428c8ea5e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_wsdl_highlighted.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/uddi_business_node.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/uddi_business_node.gif
deleted file mode 100644
index d3d6a778b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/uddi_business_node.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/uddi_registry_cat_node.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/uddi_registry_cat_node.gif
deleted file mode 100644
index feec281b1..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/uddi_registry_cat_node.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/uddi_registry_node.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/uddi_registry_node.gif
deleted file mode 100644
index 5b43cae7b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/uddi_registry_node.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/uddi_service_interface_node.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/uddi_service_interface_node.gif
deleted file mode 100644
index 21325ca77..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/uddi_service_interface_node.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/uddi_service_node.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/uddi_service_node.gif
deleted file mode 100644
index 8c0252a2f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/uddi_service_node.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/wsdl_service_node.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/wsdl_service_node.gif
deleted file mode 100644
index 8fb844f5b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/wsdl_service_node.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/wsil_node.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/wsil_node.gif
deleted file mode 100644
index 7c5916fb6..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/wsil_node.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/scripts/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/scripts/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/scripts/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/scripts/favoritesFormSubmit.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/scripts/favoritesFormSubmit.jsp
deleted file mode 100644
index 915fe97eb..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/scripts/favoritesFormSubmit.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/scripts/formsubmit.jsp" flush="true"/>
-<jsp:include page="/favorites/scripts/favoritesTable.jsp" flush="true"/>
-<script language="javascript">
-    function isSomethingSelected(tableContainerId) {
-        var table = getTable(tableContainerId);
-        for (var i=numberOfHeaderRows; i<table.rows.length; i++) {
-            var rowCheckboxCell = table.rows[i].getElementsByTagName("td").item(0);
-            var rowCheckbox = rowCheckboxCell.childNodes[0];
-            if (rowCheckbox.checked)
-                return true;
-        }
-        alert("<%=controller.getFavoritesPerspective().getMessage("MSG_ERROR_NOTHING_SELECTED")%>");
-        return false;
-    }
-
-    function setFormLocationAndSubmit(tableContainerId, form, location) {
-        if (isSomethingSelected(tableContainerId))
-            setLocationAndSubmit(form, location);
-    }
-
-    function setLocationAndSubmit(form, location) {
-        if (handleSubmit(form))
-        {
-          form.action = location;
-          form.submit();
-        }
-    }
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/scripts/favoritesPanes.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/scripts/favoritesPanes.jsp
deleted file mode 100644
index 7ca588e60..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/scripts/favoritesPanes.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page import="org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
-                 org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:include page="/scripts/panes.jsp" flush="true"/>
-<script language="javascript">
-  var favNavigatorContainer = perspectiveContent.frames["<%=FavoritesFrameNames.NAVIGATOR_CONTAINER%>"];
-  var favNavigatorToolbar = favNavigatorContainer.frames["<%=FavoritesFrameNames.NAVIGATOR_TOOLBAR%>"];
-  var favNavigatorContent = favNavigatorContainer.frames["<%=FavoritesFrameNames.NAVIGATOR_CONTENT%>"];
-  var favActionsContainer = perspectiveContent.frames["<%=FavoritesFrameNames.ACTIONS_CONTAINER%>"];
-  var favPropertiesContainer = favActionsContainer.frames["<%=FavoritesFrameNames.PROPERTIES_CONTAINER%>"];
-  var favPropertiesToolbar = favPropertiesContainer.frames["<%=FavoritesFrameNames.PROPERTIES_TOOLBAR%>"];
-  var favPropertiesContent = favPropertiesContainer.frames["<%=FavoritesFrameNames.PROPERTIES_CONTENT%>"];
-  var favStatusContainer = favActionsContainer.frames["<%=FavoritesFrameNames.STATUS_CONTAINER%>"];
-  var favStatusToolbar = favStatusContainer.frames["<%=FavoritesFrameNames.STATUS_TOOLBAR%>"];
-  var favStatusContent = favStatusContainer.frames["<%=FavoritesFrameNames.STATUS_CONTENT%>"];
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/scripts/favoritesTable.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/scripts/favoritesTable.jsp
deleted file mode 100644
index e76ad2b22..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/scripts/favoritesTable.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.constants.*"%>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/scripts/tables.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<script language="javascript">
-
-    function favHandleCheckAllClick(tableContainerId, checkAllCheckbox) {
-        var table = getTable(tableContainerId);
-        for (var i=numberOfHeaderRows; i<table.rows.length; i++) {
-            var rowCheckboxCell = table.rows[i].getElementsByTagName("td").item(0);
-            var rowCheckbox = rowCheckboxCell.childNodes[0];
-            rowCheckbox.checked = checkAllCheckbox.checked;
-            if (rowCheckbox.checked) {
-                highlightRow(table.rows[i],"rowcolor");
-                rowCheckbox.name = "<%=FavoritesActionInputs.MASS_ACTION_NODE_ID%>";
-            }
-            else {
-                highlightRow(table.rows[i],"tablecells");
-                rowCheckbox.name = "";
-            }
-        }
-    }
-
-    function validateCheckBoxInput(checkbox, isChecked) {
-        if (isChecked) {
-            checkbox.name = "<%=FavoritesActionInputs.MASS_ACTION_NODE_ID%>";
-        }
-        else {
-            checkbox.name = "";
-        }
-        handleRowCheckboxClick();
-    }
-
-    function twistInit(tableContainerId,twistImageName) {
-        var tableContainer = document.getElementById(tableContainerId);
-        var table = getTable(tableContainerId);
-        if (table.rows.length > numberOfHeaderRows) {
-            tableContainer.style.display = "none";
-            twist(tableContainerId, twistImageName);
-        }
-        else {
-            tableContainer.style.display = "";
-            twist(tableContainerId, twistImageName);
-        }
-    }
-
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/scripts/favoritesframesets.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/scripts/favoritesframesets.jsp
deleted file mode 100644
index 4fbe09025..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/scripts/favoritesframesets.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:include page="/scripts/panes.jsp" flush="true"/>
-<script language="javascript">
-  function getActionsContainerFrameset()
-  {
-    return perspectiveContent.frames["<%=FavoritesFrameNames.ACTIONS_CONTAINER%>"].document.getElementsByTagName("frameset").item(0);
-  }
-
-  function processFramesetSizes(framesetSizesForm)
-  {
-    toggleDoubleClickColumnTitle();
-    var perspectiveContentFrameset = getPerspectiveContentFrameset();
-    var actionsContainerFrameset = getActionsContainerFrameset();
-    framesetSizesForm.<%=FavoritesActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT%>.value = perspectiveContentFrameset.cols;
-    framesetSizesForm.<%=FavoritesActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER%>.value = actionsContainerFrameset.rows;
-    framesetSizesForm.submit();
-  }
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUDDIBusinessView.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUDDIBusinessView.jsp
deleted file mode 100644
index f2d170a75..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUDDIBusinessView.jsp
+++ /dev/null
@@ -1,126 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="java.util.Enumeration,
-                                                                                          java.util.Vector,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.util.QuickSort,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-    String divFavoriteUDDIBusinessTable = "divFavoriteUDDIBusinessTable";
-    String xdivFavoriteUDDIBusinessTable = "xdivFavoriteUDDIBusinessTable";
-
-    FavoritesPerspective favoritesPerspective = controller.getFavoritesPerspective();
-    NodeManager nodeManager = favoritesPerspective.getNodeManager();
-    Node selectedNode = nodeManager.getSelectedNode();
-    TreeElement selectedElement = selectedNode.getTreeElement();
-%>
-<html>
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <title><%=favoritesPerspective.getMessage("VIEW_TITLE_UDDI_BUSINESS_LIST")%></title>
-    <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-    <jsp:include page="/favorites/scripts/favoritesFormSubmit.jsp" flush="true"/>
-    <jsp:include page="/favorites/scripts/favoritesTable.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-<%
-   String titleImagePath = "wsil/images/list_business_highlighted.gif";
-   String title = favoritesPerspective.getMessage("ALT_LIST_FAVORITE_UDDI_BUSINESS");
-%>
-<%@ include file="/forms/formheader.inc" %>
-  <table>
-    <tr>
-      <td class="labels">
-        <%=favoritesPerspective.getMessage("FORM_LABEL_LIST_FAVORITE_UDDI_BUSINESS_DESC")%>
-      </td>
-    </tr>
-  </table>
-    <form action="<%=response.encodeURL(controller.getPathWithContext(RemoveFavoritesAction.getBaseActionLink()))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" style="margin-top:10px;">
-    <%
-    if (selectedElement instanceof FavoritesUDDIBusinessFolderElement) {
-    %>
-      <input type="hidden" name="<%=FavoritesActionInputs.MULTIPLE_LINK_ACTION%>" value="1">
-        <table width="95%" border=0 cellpadding=6 cellspacing=0>
-            <tr>
-                <td height=20 valign="bottom" align="left" nowrap width=11>
-                    <a href="javascript:twist('<%=divFavoriteUDDIBusinessTable%>','<%=xdivFavoriteUDDIBusinessTable%>')"><img name="<%=xdivFavoriteUDDIBusinessTable%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a>
-                </td>
-                <td height=20 valign="bottom" align="left" nowrap class="labels">
-                    <strong><%=favoritesPerspective.getMessage("FORM_LABEL_FAVORITE_UDDI_BUSINESS")%></strong>
-                </td>
-            </tr>
-        </table>
-
-        <table width="95%" border=0 cellpadding=0 cellspacing=0>
-            <tr>
-                <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" height=2 width="100%"></td>
-            </tr>
-        </table>
-
-        <div id="<%=divFavoriteUDDIBusinessTable%>">
-        <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
-            <tr>
-                <th class="checkboxcells" width=10><input type="checkbox" onClick="favHandleCheckAllClick('<%=divFavoriteUDDIBusinessTable%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
-                <th class="headercolor"><%=favoritesPerspective.getMessage("FORM_LABEL_NAME")%></th>
-            </tr>
-            <%
-                Enumeration e = ((FavoritesUDDIBusinessFolderElement)selectedElement).getAllFavorites();
-                Vector sortedVector = new Vector();
-                while (e.hasMoreElements()) {
-                	sortedVector.add(e.nextElement());
-             	  }
-                QuickSort.sort(sortedVector);
-                e = sortedVector.elements();
-                while (e.hasMoreElements()) {
-                    FavoritesUDDIBusinessElement favUDDIBusinessElement = (FavoritesUDDIBusinessElement)e.nextElement();
-                    %>
-                    <tr>
-                        <td class="checkboxcells" width=10><input type="checkbox"  name="<%=FavoritesActionInputs.MASS_ACTION_NODE_ID%>" value="<%=selectedNode.getChildNode(favUDDIBusinessElement).getNodeId()%>" onClick="validateCheckBoxInput(this, this.checked)"  title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ROW_CHECK_BOX")%>"></td>
-                        <td class="tablecells" nowrap><a href="<%=response.encodeURL(controller.getPathWithContext(SelectFavoritesNodeAction.getActionLink(selectedNode.getChildNode(favUDDIBusinessElement).getNodeId(), false)))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><%=favUDDIBusinessElement.getName()%></a></td>
-                    </tr>
-                    <%
-                }
-            %>
-        </table>
-        </div>
-        <script language="javascript">
-            twistInit('<%=divFavoriteUDDIBusinessTable%>','<%=xdivFavoriteUDDIBusinessTable%>');
-        </script>
-
-        <table border=0 cellpadding=2 cellspacing=0>
-            <tr>
-                <td height=40 valign="bottom" nowrap>
-                    <input type="button" value="<%=favoritesPerspective.getMessage("FORM_LABEL_IMPORT_TO_UDDI_PERSPECTIVE")%>" onClick="setFormLocationAndSubmit('<%=divFavoriteUDDIBusinessTable%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(AddToUDDIPerspectiveAction.getBaseActionLink()))%>')" class="button">
-                </td>
-                <td height=40 valign="bottom" nowrap>
-                    <input type="button" value="<%=favoritesPerspective.getMessage("FORM_LABEL_REMOVE")%>" onClick="setFormLocationAndSubmit('<%=divFavoriteUDDIBusinessTable%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(RemoveFavoritesAction.getBaseActionLink()))%>')" class="button">
-                </td>
-                <td nowrap width="90%">&nbsp;</td>
-            </tr>
-        </table>
-
-    <%
-    }
-%>
-    </form>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUDDIRegistryView.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUDDIRegistryView.jsp
deleted file mode 100644
index 9841b59af..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUDDIRegistryView.jsp
+++ /dev/null
@@ -1,126 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="java.util.Enumeration,
-                                                                                          java.util.Vector,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.util.QuickSort,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-    String divFavoriteUDDIRegistryTable = "divFavoriteUDDIRegistryTable";
-    String xdivFavoriteUDDIRegistryTable = "xdivFavoriteUDDIRegistryTable";
-
-    FavoritesPerspective favoritesPerspective = controller.getFavoritesPerspective();
-    NodeManager nodeManager = favoritesPerspective.getNodeManager();
-    Node selectedNode = nodeManager.getSelectedNode();
-    TreeElement selectedElement = selectedNode.getTreeElement();
-%>
-<html>
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <title><%=favoritesPerspective.getMessage("VIEW_TITLE_UDDI_REGISTRY_LIST")%></title>
-    <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-    <jsp:include page="/favorites/scripts/favoritesFormSubmit.jsp" flush="true"/>
-    <jsp:include page="/favorites/scripts/favoritesTable.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-    <%
-    String titleImagePath = "favorites/images/list_registry_highlighted.gif";
-    String title = favoritesPerspective.getMessage("ALT_LIST_FAVORITE_UDDI_REGISTRY");
-    %>
-    <%@ include file = "/forms/formheader.inc" %>
-    <table>
-      <tr>
-        <td class="labels">
-          <%=favoritesPerspective.getMessage("FORM_LABEL_LIST_FAVORITE_UDDI_REGISTRY_DESC")%>
-        </td>
-      </tr>
-    </table>    
-    <form action="<%=response.encodeURL(controller.getPathWithContext(RemoveFavoritesAction.getBaseActionLink()))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" style="margin-top:10px;">
-    <%
-    if (selectedElement instanceof FavoritesUDDIRegistryFolderElement) {
-    %>
-        <input type="hidden" name="<%=FavoritesActionInputs.MULTIPLE_LINK_ACTION%>" value="1">
-        <table width="95%" border=0 cellpadding=6 cellspacing=0>
-            <tr>
-                <td height=20 valign="bottom" align="left" nowrap width=11>
-                    <a href="javascript:twist('<%=divFavoriteUDDIRegistryTable%>','<%=xdivFavoriteUDDIRegistryTable%>')"><img name="<%=xdivFavoriteUDDIRegistryTable%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a>
-                </td>
-                <td height=20 valign="bottom" align="left" nowrap class="labels">
-                    <strong><%=favoritesPerspective.getMessage("FORM_LABEL_FAVORITE_UDDI_REGISTRY")%></strong>
-                </td>
-            </tr>
-        </table>
-
-        <table width="95%" border=0 cellpadding=0 cellspacing=0>
-            <tr>
-                <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" height=2 width="100%"></td>
-            </tr>
-        </table>
-
-        <div id="<%=divFavoriteUDDIRegistryTable%>">
-        <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
-            <tr>
-                <th class="checkboxcells" width=10><input type="checkbox" onClick="favHandleCheckAllClick('<%=divFavoriteUDDIRegistryTable%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
-                <th class="headercolor"><%=favoritesPerspective.getMessage("FORM_LABEL_NAME")%></th>
-            </tr>
-            <%
-                Enumeration e = ((FavoritesUDDIRegistryFolderElement)selectedElement).getAllFavorites();
-                Vector sortedVector = new Vector();
-                while (e.hasMoreElements()) {
-                	sortedVector.add(e.nextElement());
-             	  }
-                QuickSort.sort(sortedVector);
-                e = sortedVector.elements();
-                while (e.hasMoreElements()) {
-                    FavoritesUDDIRegistryElement favUDDIRegistryElement = (FavoritesUDDIRegistryElement)e.nextElement();
-                    %>
-                    <tr>
-                        <td class="checkboxcells" width=10><input type="checkbox"  name="<%=FavoritesActionInputs.MASS_ACTION_NODE_ID%>" value="<%=selectedNode.getChildNode(favUDDIRegistryElement).getNodeId()%>" onClick="validateCheckBoxInput(this, this.checked)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ROW_CHECK_BOX")%>"></td>
-                        <td class="tablecells" nowrap><a href="<%=response.encodeURL(controller.getPathWithContext(SelectFavoritesNodeAction.getActionLink(selectedNode.getChildNode(favUDDIRegistryElement).getNodeId(), false)))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><%=favUDDIRegistryElement.getName()%></a></td>
-                    </tr>
-                    <%
-                }
-            %>
-        </table>
-        </div>
-        <script language="javascript">
-            twistInit('<%=divFavoriteUDDIRegistryTable%>','<%=xdivFavoriteUDDIRegistryTable%>');
-        </script>
-
-        <table border=0 cellpadding=2 cellspacing=0>
-            <tr>
-                <td height=40 valign="bottom" nowrap>
-                    <input type="button" value="<%=favoritesPerspective.getMessage("FORM_LABEL_IMPORT_TO_UDDI_PERSPECTIVE")%>" onClick="setFormLocationAndSubmit('<%=divFavoriteUDDIRegistryTable%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(AddToUDDIPerspectiveAction.getBaseActionLink()))%>')" class="button">
-                </td>
-                <td height=40 valign="bottom" nowrap>
-                    <input type="button" value="<%=favoritesPerspective.getMessage("FORM_LABEL_REMOVE")%>" onClick="setFormLocationAndSubmit('<%=divFavoriteUDDIRegistryTable%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(RemoveFavoritesAction.getBaseActionLink()))%>')" class="button">
-                </td>
-                <td nowrap width="90%">&nbsp;</td>
-            </tr>
-        </table>
-
-    <%
-    }
-%>
-    </form>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUDDIServiceInterfaceView.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUDDIServiceInterfaceView.jsp
deleted file mode 100644
index f73424b76..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUDDIServiceInterfaceView.jsp
+++ /dev/null
@@ -1,126 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="java.util.Enumeration,
-                                                                                          java.util.Vector,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.util.QuickSort,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-    String divFavoriteUDDIServiceIntTable = "divFavoriteUDDIServiceIntTable";
-    String xdivFavoriteUDDIServiceIntTable = "xdivFavoriteUDDIServiceIntTable";
-
-    FavoritesPerspective favoritesPerspective = controller.getFavoritesPerspective();
-    NodeManager nodeManager = favoritesPerspective.getNodeManager();
-    Node selectedNode = nodeManager.getSelectedNode();
-    TreeElement selectedElement = selectedNode.getTreeElement();
-%>
-<html>
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <title><%=favoritesPerspective.getMessage("VIEW_TITLE_UDDI_SERVICE_INTERFACE_LIST")%></title>
-    <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-    <jsp:include page="/favorites/scripts/favoritesFormSubmit.jsp" flush="true"/>
-    <jsp:include page="/favorites/scripts/favoritesTable.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-    <%
-    String titleImagePath = "favorites/images/list_service_interface_highlighted.gif";
-    String title = favoritesPerspective.getMessage("ALT_LIST_FAVORITE_UDDI_SERVICE_INTERFACE");
-    %>
-    <%@ include file = "/forms/formheader.inc" %>
-    <table>
-      <tr>
-        <td class="labels">
-          <%=favoritesPerspective.getMessage("FORM_LABEL_LIST_FAVORITE_UDDI_SERVICE_INTERFACE_DESC")%>
-        </td>
-      </tr>
-    </table>    
-    <form action="<%=response.encodeURL(controller.getPathWithContext(RemoveFavoritesAction.getBaseActionLink()))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" style="margin-top:10px;">
-    <%
-    if (selectedElement instanceof FavoritesUDDIServiceInterfaceFolderElement) {
-    %>
-        <input type="hidden" name="<%=FavoritesActionInputs.MULTIPLE_LINK_ACTION%>" value="1">
-        <table width="95%" border=0 cellpadding=6 cellspacing=0>
-            <tr>
-                <td height=20 valign="bottom" align="left" nowrap width=11>
-                    <a href="javascript:twist('<%=divFavoriteUDDIServiceIntTable%>','<%=xdivFavoriteUDDIServiceIntTable%>')"><img name="<%=xdivFavoriteUDDIServiceIntTable%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a>
-                </td>
-                <td height=20 valign="bottom" align="left" nowrap class="labels">
-                    <strong><%=favoritesPerspective.getMessage("FORM_LABEL_FAVORITE_UDDI_SERVICE_INTERFACE")%></strong>
-                </td>
-            </tr>
-        </table>
-
-        <table width="95%" border=0 cellpadding=0 cellspacing=0>
-            <tr>
-                <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" height=2 width="100%"></td>
-            </tr>
-        </table>
-
-        <div id="<%=divFavoriteUDDIServiceIntTable%>">
-        <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
-            <tr>
-                <th class="checkboxcells" width=10><input type="checkbox" onClick="favHandleCheckAllClick('<%=divFavoriteUDDIServiceIntTable%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
-                <th class="headercolor"><%=favoritesPerspective.getMessage("FORM_LABEL_NAME")%></th>
-            </tr>
-            <%
-                Enumeration e = ((FavoritesUDDIServiceInterfaceFolderElement)selectedElement).getAllFavorites();
-                Vector sortedVector = new Vector();
-                while (e.hasMoreElements()) {
-                	sortedVector.add(e.nextElement());
-             	  }
-                QuickSort.sort(sortedVector);
-                e = sortedVector.elements();
-                while (e.hasMoreElements()) {
-                    FavoritesUDDIServiceInterfaceElement favUDDISerIntElement = (FavoritesUDDIServiceInterfaceElement)e.nextElement();
-                    %>
-                    <tr>
-                        <td class="checkboxcells" width=10><input type="checkbox"  name="<%=FavoritesActionInputs.MASS_ACTION_NODE_ID%>" value="<%=selectedNode.getChildNode(favUDDISerIntElement).getNodeId()%>" onClick="validateCheckBoxInput(this, this.checked)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ROW_CHECK_BOX")%>"></td>
-                        <td class="tablecells" nowrap><a href="<%=response.encodeURL(controller.getPathWithContext(SelectFavoritesNodeAction.getActionLink(selectedNode.getChildNode(favUDDISerIntElement).getNodeId(), false)))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><%=favUDDISerIntElement.getName()%></a></td>
-                    </tr>
-                    <%
-                }
-            %>
-        </table>
-        </div>
-        <script language="javascript">
-            twistInit('<%=divFavoriteUDDIServiceIntTable%>','<%=xdivFavoriteUDDIServiceIntTable%>');
-        </script>
-
-        <table border=0 cellpadding=2 cellspacing=0>
-            <tr>
-                <td height=40 valign="bottom" nowrap>
-                    <input type="button" value="<%=favoritesPerspective.getMessage("FORM_LABEL_IMPORT_TO_UDDI_PERSPECTIVE")%>" onClick="setFormLocationAndSubmit('<%=divFavoriteUDDIServiceIntTable%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(AddToUDDIPerspectiveAction.getBaseActionLink()))%>')" class="button">
-                </td>
-                <td height=40 valign="bottom" nowrap>
-                    <input type="button" value="<%=favoritesPerspective.getMessage("FORM_LABEL_REMOVE")%>" onClick="setFormLocationAndSubmit('<%=divFavoriteUDDIServiceIntTable%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(RemoveFavoritesAction.getBaseActionLink()))%>')" class="button">
-                </td>
-                <td nowrap width="90%">&nbsp;</td>
-            </tr>
-        </table>
-
-    <%
-    }
-%>
-    </form>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUDDIServiceView.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUDDIServiceView.jsp
deleted file mode 100644
index 54f53669b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUDDIServiceView.jsp
+++ /dev/null
@@ -1,126 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="java.util.Enumeration,
-                                                                                          java.util.Vector,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.util.QuickSort,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-    String divFavoriteUDDIServiceTable = "divFavoriteUDDIServiceTable";
-    String xdivFavoriteUDDIServiceTable = "xdivFavoriteUDDIServiceTable";
-
-    FavoritesPerspective favoritesPerspective = controller.getFavoritesPerspective();
-    NodeManager nodeManager = favoritesPerspective.getNodeManager();
-    Node selectedNode = nodeManager.getSelectedNode();
-    TreeElement selectedElement = selectedNode.getTreeElement();
-%>
-<html>
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <title><%=favoritesPerspective.getMessage("VIEW_TITLE_UDDI_SERVICE_LIST")%></title>
-    <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-    <jsp:include page="/favorites/scripts/favoritesFormSubmit.jsp" flush="true"/>
-    <jsp:include page="/favorites/scripts/favoritesTable.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-    <%
-    String titleImagePath = "wsil/images/list_UDDI_service_highlighted.gif";
-    String title = favoritesPerspective.getMessage("ALT_LIST_FAVORITE_UDDI_SERVICE");
-    %>
-    <%@ include file = "/forms/formheader.inc" %>
-    <table>
-      <tr>
-        <td class="labels">
-          <%=favoritesPerspective.getMessage("FORM_LABEL_LIST_FAVORITE_UDDI_SERVICE_DESC")%>
-        </td>
-      </tr>
-    </table>    
-    <form action="<%=response.encodeURL(controller.getPathWithContext(RemoveFavoritesAction.getBaseActionLink()))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" style="margin-top:10px;">
-    <%
-    if (selectedElement instanceof FavoritesUDDIServiceFolderElement) {
-    %>
-        <input type="hidden" name="<%=FavoritesActionInputs.MULTIPLE_LINK_ACTION%>" value="1">
-        <table width="95%" border=0 cellpadding=6 cellspacing=0>
-            <tr>
-                <td height=20 valign="bottom" align="left" nowrap width=11>
-                    <a href="javascript:twist('<%=divFavoriteUDDIServiceTable%>','<%=xdivFavoriteUDDIServiceTable%>')"><img name="<%=xdivFavoriteUDDIServiceTable%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a>
-                </td>
-                <td height=20 valign="bottom" align="left" nowrap class="labels">
-                    <strong><%=favoritesPerspective.getMessage("FORM_LABEL_FAVORITE_UDDI_SERVICE")%></strong>
-                </td>
-            </tr>
-        </table>
-
-        <table width="95%" border=0 cellpadding=0 cellspacing=0>
-            <tr>
-                <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" height=2 width="100%"></td>
-            </tr>
-        </table>
-
-        <div id="<%=divFavoriteUDDIServiceTable%>">
-        <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
-            <tr>
-                <th class="checkboxcells" width=10><input type="checkbox" onClick="favHandleCheckAllClick('<%=divFavoriteUDDIServiceTable%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
-                <th class="headercolor"><%=favoritesPerspective.getMessage("FORM_LABEL_NAME")%></th>
-            </tr>
-            <%
-                Enumeration e = ((FavoritesUDDIServiceFolderElement)selectedElement).getAllFavorites();
-                Vector sortedVector = new Vector();
-                while (e.hasMoreElements()) {
-                	sortedVector.add(e.nextElement());
-             	  }
-                QuickSort.sort(sortedVector);
-                e = sortedVector.elements();
-                while (e.hasMoreElements()) {
-                    FavoritesUDDIServiceElement favUDDIServiceElement = (FavoritesUDDIServiceElement)e.nextElement();
-                    %>
-                    <tr>
-                        <td class="checkboxcells" width=10><input type="checkbox"  name="<%=FavoritesActionInputs.MASS_ACTION_NODE_ID%>" value="<%=selectedNode.getChildNode(favUDDIServiceElement).getNodeId()%>" onClick="validateCheckBoxInput(this, this.checked)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ROW_CHECK_BOX")%>"></td>
-                        <td class="tablecells" nowrap><a href="<%=response.encodeURL(controller.getPathWithContext(SelectFavoritesNodeAction.getActionLink(selectedNode.getChildNode(favUDDIServiceElement).getNodeId(), false)))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><%=favUDDIServiceElement.getName()%></a></td>
-                    </tr>
-                    <%
-                }
-            %>
-        </table>
-        </div>
-        <script language="javascript">
-            twistInit('<%=divFavoriteUDDIServiceTable%>','<%=xdivFavoriteUDDIServiceTable%>');
-        </script>
-
-        <table border=0 cellpadding=2 cellspacing=0>
-            <tr>
-                <td height=40 valign="bottom" nowrap>
-                    <input type="button" value="<%=favoritesPerspective.getMessage("FORM_LABEL_IMPORT_TO_UDDI_PERSPECTIVE")%>" onClick="setFormLocationAndSubmit('<%=divFavoriteUDDIServiceTable%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(AddToUDDIPerspectiveAction.getBaseActionLink()))%>')" class="button">
-                </td>
-                <td height=40 valign="bottom" nowrap>
-                    <input type="button" value="<%=favoritesPerspective.getMessage("FORM_LABEL_REMOVE")%>" onClick="setFormLocationAndSubmit('<%=divFavoriteUDDIServiceTable%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(RemoveFavoritesAction.getBaseActionLink()))%>')" class="button">
-                </td>
-                <td nowrap width="90%">&nbsp;</td>
-            </tr>
-        </table>
-
-    <%
-    }
-%>
-    </form>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUserDefUDDIRegistryView.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUserDefUDDIRegistryView.jsp
deleted file mode 100644
index 8da77a979..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUserDefUDDIRegistryView.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="java.util.Enumeration,
-                                                                                          java.util.Vector,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.util.QuickSort,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-    String divFavoriteUDDIRegistryTable = "divFavoriteUDDIRegistryTable";
-    String xdivFavoriteUDDIRegistryTable = "xdivFavoriteUDDIRegistryTable";
-
-    FavoritesPerspective favoritesPerspective = controller.getFavoritesPerspective();
-    NodeManager nodeManager = favoritesPerspective.getNodeManager();
-    Node selectedNode = nodeManager.getSelectedNode();
-    TreeElement selectedElement = selectedNode.getTreeElement();
-%>
-<html>
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <title><%=favoritesPerspective.getMessage("VIEW_TITLE_USER_DEF_UDDI_REGISTRY_LIST")%></title>
-    <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-    <jsp:include page="/favorites/scripts/favoritesFormSubmit.jsp" flush="true"/>
-    <jsp:include page="/favorites/scripts/favoritesTable.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-    <%
-    String titleImagePath = "favorites/images/list_registry_highlighted.gif";
-    String title = favoritesPerspective.getMessage("ALT_LIST_FAVORITE_USER_DEF_UDDI_REGISTRY");
-    %>
-    <%@ include file = "/forms/formheader.inc" %>
-    <table>
-      <tr>
-        <td class="labels">
-          <%=favoritesPerspective.getMessage("FORM_LABEL_LIST_FAVORITE_USER_DEF_UDDI_REGISTRY_DESC")%>
-        </td>
-      </tr>
-    </table>    
-    <form action="<%=response.encodeURL(controller.getPathWithContext(RemoveFavoritesAction.getBaseActionLink()))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" style="margin-top:10px;">
-    <%
-    if (selectedElement instanceof FavoritesUserDefUDDIRegistryFolderElement) {
-    %>
-        <input type="hidden" name="<%=FavoritesActionInputs.MULTIPLE_LINK_ACTION%>" value="1">
-        <table width="95%" border=0 cellpadding=6 cellspacing=0>
-            <tr>
-                <td height=20 valign="bottom" align="left" nowrap width=11>
-                    <a href="javascript:twist('<%=divFavoriteUDDIRegistryTable%>','<%=xdivFavoriteUDDIRegistryTable%>')"><img name="<%=xdivFavoriteUDDIRegistryTable%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a>
-                </td>
-                <td height=20 valign="bottom" align="left" nowrap class="labels">
-                    <strong><%=favoritesPerspective.getMessage("FORM_LABEL_FAVORITE_USER_DEF_UDDI_REGISTRY")%></strong>
-                </td>
-            </tr>
-        </table>
-
-        <table width="95%" border=0 cellpadding=0 cellspacing=0>
-            <tr>
-                <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" height=2 width="100%"></td>
-            </tr>
-        </table>
-
-        <div id="<%=divFavoriteUDDIRegistryTable%>">
-        <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
-            <tr>
-                <th class="checkboxcells" width=10><input type="checkbox" onClick="favHandleCheckAllClick('<%=divFavoriteUDDIRegistryTable%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
-                <th class="headercolor"><%=favoritesPerspective.getMessage("FORM_LABEL_NAME")%></th>
-            </tr>
-            <%
-                Enumeration e = ((FavoritesUserDefUDDIRegistryFolderElement)selectedElement).getAllFavorites();
-                Vector sortedVector = new Vector();
-                while (e.hasMoreElements()) {
-                	sortedVector.add(e.nextElement());
-             	  }
-                QuickSort.sort(sortedVector);
-                e = sortedVector.elements();
-                while (e.hasMoreElements()) {
-                    FavoritesUserDefUDDIRegistryElement favUDDIRegistryElement = (FavoritesUserDefUDDIRegistryElement)e.nextElement();
-                    %>
-                    <tr>
-                        <td class="checkboxcells" width=10><input type="checkbox"  name="<%=FavoritesActionInputs.MASS_ACTION_NODE_ID%>" value="<%=selectedNode.getChildNode(favUDDIRegistryElement).getNodeId()%>" onClick="validateCheckBoxInput(this, this.checked)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ROW_CHECK_BOX")%>"></td>
-                        <td class="tablecells" nowrap><a href="<%=response.encodeURL(controller.getPathWithContext(SelectFavoritesNodeAction.getActionLink(selectedNode.getChildNode(favUDDIRegistryElement).getNodeId(), false)))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><%=favUDDIRegistryElement.getName()%></a></td>
-                    </tr>
-                    <%
-                }
-            %>
-        </table>
-        </div>
-        <script language="javascript">
-            twistInit('<%=divFavoriteUDDIRegistryTable%>','<%=xdivFavoriteUDDIRegistryTable%>');
-        </script>
-
-        <table border=0 cellpadding=2 cellspacing=0>
-            <tr>
-                <td height=40 valign="bottom" nowrap>
-                    <input type="button" value="<%=favoritesPerspective.getMessage("FORM_LABEL_IMPORT_TO_UDDI_PERSPECTIVE")%>" onClick="setFormLocationAndSubmit('<%=divFavoriteUDDIRegistryTable%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(AddToUDDIPerspectiveAction.getBaseActionLink()))%>')" class="button">
-                </td>
-                <td nowrap width="90%">&nbsp;</td>
-            </tr>
-        </table>
-
-    <%
-    }
-%>
-    </form>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteWSDLServiceView.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteWSDLServiceView.jsp
deleted file mode 100644
index fe51ac386..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteWSDLServiceView.jsp
+++ /dev/null
@@ -1,126 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="java.util.Enumeration,
-                                                                                          java.util.Vector,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.util.QuickSort,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-    String divFavoriteWSDLTable = "divFavoriteWSDLTable";
-    String xdivFavoriteWSDLTable = "xdivFavoriteWSDLTable";
-
-    FavoritesPerspective favoritesPerspective = controller.getFavoritesPerspective();
-    NodeManager nodeManager = favoritesPerspective.getNodeManager();
-    Node selectedNode = nodeManager.getSelectedNode();
-    TreeElement selectedElement = selectedNode.getTreeElement();
-%>
-<html>
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <title><%=favoritesPerspective.getMessage("VIEW_TITLE_WSDL_SERVICE_LIST")%></title>
-    <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-    <jsp:include page="/favorites/scripts/favoritesFormSubmit.jsp" flush="true"/>
-    <jsp:include page="/favorites/scripts/favoritesTable.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-    <%
-    String titleImagePath = "wsil/images/list_WSDL_service_highlighted.gif";
-    String title = favoritesPerspective.getMessage("ALT_LIST_FAVORITE_WSDL_SERVICE");
-    %>
-    <%@ include file = "/forms/formheader.inc" %>
-    <table>
-      <tr>
-        <td class="labels">
-          <%=favoritesPerspective.getMessage("FORM_LABEL_LIST_FAVORITE_WSDL_SERVICE_DESC")%>
-        </td>
-      </tr>
-    </table>    
-    <form action="<%=response.encodeURL(controller.getPathWithContext(RemoveFavoritesAction.getBaseActionLink()))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" style="margin-top:10px;">
-    <%
-    if (selectedElement instanceof FavoritesWSDLServiceFolderElement) {
-    %>
-        <input type="hidden" name="<%=FavoritesActionInputs.MULTIPLE_LINK_ACTION%>" value="1">
-        <table width="95%" border=0 cellpadding=6 cellspacing=0>
-            <tr>
-                <td height=20 valign="bottom" align="left" nowrap width=11>
-                    <a href="javascript:twist('<%=divFavoriteWSDLTable%>','<%=xdivFavoriteWSDLTable%>')"><img name="<%=xdivFavoriteWSDLTable%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a>
-                </td>
-                <td height=20 valign="bottom" align="left" nowrap class="labels">
-                    <strong><%=favoritesPerspective.getMessage("FORM_LABEL_FAVORITE_WSDL")%></strong>
-                </td>
-            </tr>
-        </table>
-
-        <table width="95%" border=0 cellpadding=0 cellspacing=0>
-            <tr>
-                <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" height=2 width="100%"></td>
-            </tr>
-        </table>
-
-        <div id="<%=divFavoriteWSDLTable%>">
-        <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
-            <tr>
-                <th class="checkboxcells" width=10><input type="checkbox" onClick="favHandleCheckAllClick('<%=divFavoriteWSDLTable%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
-                <th class="headercolor"><%=favoritesPerspective.getMessage("FORM_LABEL_URL")%></th>
-            </tr>
-            <%
-                Enumeration e = ((FavoritesWSDLServiceFolderElement)selectedElement).getAllFavorites();
-                Vector sortedVector = new Vector();
-                while (e.hasMoreElements()) {
-                	sortedVector.add(e.nextElement());
-             	  }
-                QuickSort.sort(sortedVector);
-                e = sortedVector.elements();
-                while (e.hasMoreElements()) {
-                    FavoritesWSDLServiceElement favWSDLServiceElement = (FavoritesWSDLServiceElement)e.nextElement();
-                    %>
-                    <tr>
-                        <td class="checkboxcells" width=10><input type="checkbox"  name="<%=FavoritesActionInputs.MASS_ACTION_NODE_ID%>" value="<%=selectedNode.getChildNode(favWSDLServiceElement).getNodeId()%>" onClick="validateCheckBoxInput(this, this.checked)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ROW_CHECK_BOX")%>"></td>
-                        <td class="tablecells" nowrap><a href="<%=response.encodeURL(controller.getPathWithContext(SelectFavoritesNodeAction.getActionLink(selectedNode.getChildNode(favWSDLServiceElement).getNodeId(), false)))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><%=favWSDLServiceElement.getWsdlUrl()%></a></td>
-                    </tr>
-                    <%
-                }
-            %>
-        </table>
-        </div>
-        <script language="javascript">
-            twistInit('<%=divFavoriteWSDLTable%>','<%=xdivFavoriteWSDLTable%>');
-        </script>
-
-        <table border=0 cellpadding=2 cellspacing=0>
-            <tr>
-                <td height=40 valign="bottom" nowrap>
-                    <input type="button" value="<%=favoritesPerspective.getMessage("FORM_LABEL_IMPORT_TO_WSDL_PERSPECTIVE")%>" onClick="setFormLocationAndSubmit('<%=divFavoriteWSDLTable%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(FavoritesAddToWSDLPerspectiveAction.getBaseActionLink()))%>')" class="button">
-                </td>
-                <td height=40 valign="bottom" nowrap>
-                    <input type="button" value="<%=favoritesPerspective.getMessage("FORM_LABEL_REMOVE")%>" onClick="setFormLocationAndSubmit('<%=divFavoriteWSDLTable%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(RemoveFavoritesAction.getBaseActionLink()))%>')" class="button">
-                </td>
-                <td nowrap width="90%">&nbsp;</td>
-            </tr>
-        </table>
-
-    <%
-    }
-%>
-    </form>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteWSILView.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteWSILView.jsp
deleted file mode 100644
index 00451245a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteWSILView.jsp
+++ /dev/null
@@ -1,128 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="java.util.Enumeration,
-                                                                                          java.util.Vector,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.util.QuickSort,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-    String divFavoriteWSILTable = "divFavoriteWSILTable";
-    String xdivFavoriteWSILTable = "xdivFavoriteWSILTable";
-
-    FavoritesPerspective favoritesPerspective = controller.getFavoritesPerspective();
-    NodeManager nodeManager = favoritesPerspective.getNodeManager();
-    Node selectedNode = nodeManager.getSelectedNode();
-    TreeElement selectedElement = selectedNode.getTreeElement();
-%>
-<html>
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <title><%=favoritesPerspective.getMessage("VIEW_TITLE_WSIL_LIST")%></title>
-    <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-    <jsp:include page="/favorites/scripts/favoritesFormSubmit.jsp" flush="true"/>
-    <jsp:include page="/favorites/scripts/favoritesTable.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-    <%
-    String titleImagePath = "favorites/images/list_WSIL_highlighted.gif";
-    String title = favoritesPerspective.getMessage("ALT_LIST_FAVORITE_WSIL");
-    %>
-    <%@ include file = "/forms/formheader.inc" %>
-    <table>
-      <tr>
-        <td class="labels">
-          <%=favoritesPerspective.getMessage("FORM_LABEL_LIST_FAVORITE_WSIL_DESC")%>
-        </td>
-      </tr>
-    </table>    
-    <form action="<%=response.encodeURL(controller.getPathWithContext(RemoveFavoritesAction.getBaseActionLink()))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" style="margin-top:10px;">
-    <%
-    if (selectedElement instanceof FavoritesWSILFolderElement) {
-    %>
-        <input type="hidden" name="<%=FavoritesActionInputs.MULTIPLE_LINK_ACTION%>" value="1">
-        <table width="95%" border=0 cellpadding=6 cellspacing=0>
-            <tr>
-                <td height=20 valign="bottom" align="left" nowrap width=11>
-                    <a href="javascript:twist('<%=divFavoriteWSILTable%>','<%=xdivFavoriteWSILTable%>')"><img name="<%=xdivFavoriteWSILTable%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a>
-                </td>
-                <td height=20 valign="bottom" align="left" nowrap class="labels">
-                    <strong><%=favoritesPerspective.getMessage("FORM_LABEL_FAVORITE_WSIL")%></strong>
-                </td>
-            </tr>
-        </table>
-
-        <table width="95%" border=0 cellpadding=0 cellspacing=0>
-            <tr>
-                <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" height=2 width="100%"></td>
-            </tr>
-        </table>
-
-        <div id="<%=divFavoriteWSILTable%>">
-        <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
-            <tr>
-                <th class="checkboxcells" width=10><input type="checkbox" onClick="favHandleCheckAllClick('<%=divFavoriteWSILTable%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
-                <th class="headercolor"><%=favoritesPerspective.getMessage("FORM_LABEL_URL")%></th>
-            </tr>
-            <%
-            FavoritesWSILFolderElement favWSILFolderElement = (FavoritesWSILFolderElement)selectedElement;
-            Enumeration e = favWSILFolderElement.getAllFavorites();
-            Vector sortedVector = new Vector();
-            while (e.hasMoreElements()) {
-                sortedVector.add(e.nextElement());
-            }
-            QuickSort.sort(sortedVector);
-            e = sortedVector.elements();
-            while (e.hasMoreElements()) {
-                FavoritesWSILElement favWSILElement = (FavoritesWSILElement)e.nextElement();
-                %>
-                <tr>
-                    <td class="checkboxcells" width=10><input type="checkbox"  name="<%=FavoritesActionInputs.MASS_ACTION_NODE_ID%>" value="<%=selectedNode.getChildNode(favWSILElement).getNodeId()%>" onClick="validateCheckBoxInput(this, this.checked)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ROW_CHECK_BOX")%>"></td>
-                    <td class="tablecells" nowrap><a href="<%=response.encodeURL(controller.getPathWithContext(SelectFavoritesNodeAction.getActionLink(selectedNode.getChildNode(favWSILElement).getNodeId(), false)))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><%=favWSILElement.getWsilUrl()%></a></td>
-                </tr>
-                <%
-            }
-            %>
-        </table>
-        </div>
-        <script language="javascript">
-            twistInit('<%=divFavoriteWSILTable%>','<%=xdivFavoriteWSILTable%>');
-        </script>
-
-
-        <table border=0 cellpadding=2 cellspacing=0>
-            <tr>
-                <td height=40 valign="bottom" nowrap>
-                    <input type="button" value="<%=favoritesPerspective.getMessage("FORM_LABEL_IMPORT_TO_WSIL_PERSPECTIVE")%>" onClick="setFormLocationAndSubmit('<%=divFavoriteWSILTable%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(AddWSILToWSILPerspectiveAction.getBaseActionLink()))%>')" class="button">
-                </td>
-                <td height=40 valign="bottom" nowrap>
-                    <input type="button" value="<%=favoritesPerspective.getMessage("FORM_LABEL_REMOVE")%>" onClick="setFormLocationAndSubmit('<%=divFavoriteWSILTable%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(RemoveFavoritesAction.getBaseActionLink()))%>')" class="button">
-                </td>
-                <td nowrap width="90%">&nbsp;</td>
-            </tr>
-        </table>
-
-    <%
-    }
-    %>
-    </form>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/ImportToWorkbenchForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/ImportToWorkbenchForm.jsp
deleted file mode 100644
index 8ded4196a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/ImportToWorkbenchForm.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.util.*,
-                                                                                          org.eclipse.core.resources.*,
-                                                                                          org.eclipse.core.runtime.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="formProperties" class="java.util.Hashtable" scope="request"/>
-<html>
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <title><%=controller.getMessage("FORM_TITLE_IMPORT_TO_WORKBENCH")%></title>
-    <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<jsp:include page="/scripts/formsubmit.jsp" flush="true"/>
-<jsp:include page="/scripts/formutils.jsp" flush="true"/>    
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-
-    <form action="<%=response.encodeURL(controller.getPathWithContext((String)formProperties.get("formActionLink")))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data">
-    <input type="hidden" name="<%=ActionInputs.IMPORT_FILE%>" value="<%=ActionInputs.IMPORT_FILE%>">
-
-    <%
-    String titleImagePath = "images/import_to_workbench_highlighted.gif";
-    String title = controller.getMessage("ALT_IMPORT_WSDL_TO_WORKBENCH");
-    %>
-    <%@ include file = "/forms/formheader.inc" %>
-    <table>
-      <tr>
-        <td>
-          <%=controller.getMessage("FORM_LABEL_IMPORT_TO_WORKBENCH_DESC")%>
-        </td>
-      </tr>
-    </table>
-    <table>
-        <tr>
-            <td class="labels" height=40 valign="center">
-                <label for="select_workbench_project_name"><%=controller.getMessage("WORKBENCH_PROJECT_NAME")%></label>
-            </td>
-            <td class="labels" height=40 valign="center" nowrap>
-                <%
-                IWorkspaceRoot iWorkspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
-                IProject[] projects = iWorkspaceRoot.getProjects();
-                %>
-                <select id="select_workbench_project_name" name="<%=ActionInputs.WORKBENCH_PROJECT_NAME%>" class="selectlist">
-                <%
-                for (int i = 0; i < projects.length; i++) {
-                    try {
-                        if (!projects[i].isOpen()) continue;
-                          String projectName = projects[i].getName();
-                %>
-                            <option value="<%=projectName%>"><%=projectName%>
-                <%
-                    }
-                    catch (Exception e) {}
-                }
-                %>
-                </select>
-            </td>
-        </tr>
-    </table>
-    <table width="95%" border=0 cellpadding=3 cellspacing=0>
-        <tr>
-          <td class="labels" height=10 valign="bottom">
-            <label for="input_imported_file_name"><%=controller.getMessage("IMPORTED_WSDL_FILE_NAME")%></label>
-          </td>
-        </tr>
-        <tr>
-          <td height=10 valign="bottom" width="60%">
-<%
-   String wsdlFileName="temp.wsdl";
-   String wsdlURL = (String)formProperties.get("wsdlURL");
-   if (wsdlURL != null && wsdlURL.endsWith(".wsdl"))
-   {
-     int lastSeparatorPos = Math.max(wsdlURL.lastIndexOf("/"),wsdlURL.lastIndexOf("\\"));
-     if (lastSeparatorPos > 0)
-       wsdlFileName = wsdlURL.substring(lastSeparatorPos+1,wsdlURL.length());
-   }
-%>   
-            <input type="text" id="input_imported_file_name" name="<%=ActionInputs.IMPORTED_FILE_NAME%>" value="<%=wsdlFileName%>" size=50 class="textenter">
-          </td>
-        </tr>
-    </table>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>    
-    </form>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/ImportWSDLAndWSILToWorkbenchForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/ImportWSDLAndWSILToWorkbenchForm.jsp
deleted file mode 100644
index 2122afea5..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/ImportWSDLAndWSILToWorkbenchForm.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.util.*,
-                                                                                          org.eclipse.core.resources.*,
-                                                                                          org.eclipse.core.runtime.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="formProperties" class="java.util.Hashtable" scope="request"/>
-<script language="javascript">
-  function toggleDivContainer(divId)
-  {
-    var divContainer = document.getElementById(divId);
-    if (divContainer.style.display == "none")
-      divContainer.style.display = "";
-    else
-      divContainer.style.display = "none";
-  }
-</script>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=controller.getMessage("FORM_TITLE_IMPORT_TO_WORKBENCH")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-  <jsp:include page="/scripts/formsubmit.jsp" flush="true"/>
-  <jsp:include page="/scripts/formutils.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-
-  <form action="<%=response.encodeURL(controller.getPathWithContext((String)formProperties.get("formActionLink")))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data">
-
-  <%
-  String titleImagePath = "images/import_to_workbench_highlighted.gif";
-  String title = controller.getMessage("ALT_IMPORT_WSDL_TO_WORKBENCH");
-  %>
-  <%@ include file = "/forms/formheader.inc" %>
-  <table>
-    <tr>
-      <td>
-        <%=controller.getMessage("FORM_LABEL_IMPORT_TO_WORKBENCH_DESC")%>
-      </td>
-    </tr>
-  </table>
-  <table>
-    <tr>
-      <td class="labels" height=40 valign="center">
-        <label for="select_workbench_project_name"><%=controller.getMessage("WORKBENCH_PROJECT_NAME")%></label>
-      </td>
-      <td class="labels" height=40 valign="center" nowrap>
-        <%
-        IWorkspaceRoot iWorkspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
-        IProject[] projects = iWorkspaceRoot.getProjects();
-        %>
-        <select id="select_workbench_project_name" name="<%=ActionInputs.WORKBENCH_PROJECT_NAME%>" class="selectlist">
-        <%
-        for (int i = 0; i < projects.length; i++) {
-          try {
-            if (!projects[i].isOpen())
-              continue;
-            String projectName = projects[i].getName();
-        %>
-        <option value="<%=projectName%>"><%=projectName%>
-        <%
-          }
-          catch (Exception e) {}
-        }
-        %>
-        </select>
-      </td>
-    </tr>
-  </table>
-
-  <table width="95%" border=0 cellpadding=3 cellspacing=0>
-    <tr>
-      <td class="labels" height=10 valign="bottom">
-        <input type="checkbox" checked id="input_import_wsdl" name="<%=ActionInputs.IMPORT_FILE%>" value="<%=ActionInputs.IMPORT_FILE%>" onClick="toggleDivContainer('div_import_wsdl')">
-        <label for="input_import_wsdl"><%=controller.getMessage("LABEL_IMPORT_WSDL")%></label>
-      </td>
-    </tr>
-  </table>
-  <div id="div_import_wsdl">
-    <table width="95%" border=0 cellpadding=3 cellspacing=0>
-      <tr>
-        <td>
-          <label for="input_imported_wsdl_file_name"><%=controller.getMessage("IMPORTED_WSDL_FILE_NAME")%></label>
-        </td>
-      </tr>
-      <tr>
-        <td height=10 valign="bottom" width="60%">
-<%
- String wsdlFileName="temp.wsdl";
- String wsdlURL = (String)formProperties.get("wsdlURL");
- if (wsdlURL != null && wsdlURL.endsWith(".wsdl"))
- {
-   int lastSeparatorPos = Math.max(wsdlURL.lastIndexOf("/"),wsdlURL.lastIndexOf("\\"));
-   if (lastSeparatorPos > 0)
-     wsdlFileName = wsdlURL.substring(lastSeparatorPos+1,wsdlURL.length());
- }
-%>   
-          <input type="text" id="input_imported_wsdl_file_name" name="<%=ActionInputs.IMPORTED_FILE_NAME%>" value="<%=wsdlFileName%>" size=50 class="textenter">
-        </td>
-      </tr>
-    </table>
-  </div>
-
-  <table width="95%" border=0 cellpadding=3 cellspacing=0>
-    <tr>
-      <td class="labels" height=10 valign="bottom">&nbsp;</td>
-    </tr>
-  </table>
-
-  <input type="hidden" name="<%=ActionInputs.IMPORTED_WSDL_URL%>" value="<%=wsdlURL%>">
-  <table width="95%" border=0 cellpadding=3 cellspacing=0>
-    <tr>
-      <td class="labels" height=10 valign="bottom">
-        <input type="checkbox" id="input_import_wsil" name="<%=ActionInputs.IMPORT_TO_WSIL%>" value="<%=ActionInputs.IMPORT_TO_WSIL%>" onClick="toggleDivContainer('div_import_wsil')">
-        <label for="input_import_wsil"><%=controller.getMessage("LABEL_IMPORT_TO_WSIL")%></label>
-      </td>
-    </tr>
-  </table>
-  <div id="div_import_wsil" style="display:none;">
-    <table width="95%" border=0 cellpadding=3 cellspacing=0>
-      <tr>
-        <td class="labels" height=10 valign="bottom">
-          <label for="input_imported_wsil_file_name"><%=controller.getMessage("WSIL_FILE_NAME")%></label>
-        </td>
-      </tr>
-      <tr>
-        <td height=10 valign="bottom" width="60%">
-<%
- String wsilFileName = (String)formProperties.get("wsilFileName");
- if (wsilFileName == null || wsilFileName.length() <= 0)
-   wsilFileName = wsdlFileName.substring(0, wsdlFileName.length()-4) + "wsil";
-%>   
-          <input type="text" id="input_imported_wsil_file_name" name="<%=ActionInputs.WSIL_FILE_NAME%>" value="<%=wsilFileName%>" size=50 class="textenter">
-        </td>
-      </tr>
-    </table>
-  </div>
-
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>    
-  </form>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/LaunchWebServiceWizardForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/LaunchWebServiceWizardForm.jsp
deleted file mode 100644
index 704131819..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/LaunchWebServiceWizardForm.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.HTMLUtils" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="formActionLink" class="java.lang.StringBuffer" scope="request"/>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=controller.getMessage("FORM_TITLE_LAUNCH_WEBSERVICE_WIZARD")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<jsp:include page="/scripts/formsubmit.jsp" flush="true"/>
-<jsp:include page="/scripts/formutils.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-  <form action="<%=response.encodeURL(controller.getPathWithContext(formActionLink.toString()))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data">
-
-<%
-   String titleImagePath = "images/launch_wswizard_highlighted.gif";
-   String title = controller.getMessage("ALT_LAUNCH_WEB_SERVICE_WIZARD");
-%>
-<%@ include file = "/forms/formheader.inc" %>
-    <table>
-      <tr>
-        <td class="labels" height=20 valign="bottom">
-          <%=controller.getMessage("FORM_LABEL_CHOOSE_WIZARD")%>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input type="radio" id="radio_ws_client_wizard" class="radio" name="<%=ActionInputs.WEB_SERVICE_WIZARD%>" checked=true value="<%=String.valueOf(ActionInputs.WEB_SERVICE_CLIENT_WIZARD)%>"><label for="radio_ws_client_wizard"><%=controller.getMessage("FORM_RADIO_WEB_SERVICE_CLIENT_WIZARD")%></label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input type="radio" id="radio_ws_skeleton_wizard" class="radio" name="<%=ActionInputs.WEB_SERVICE_WIZARD%>" value="<%=String.valueOf(ActionInputs.WEB_SERVICE_SKELETON_WIZARD)%>"><label for="radio_ws_skeleton_wizard"><%=controller.getMessage("FORM_RADIO_WEB_SERVICE_SKELETON_WIZARD")%></label>
-        </td>
-      </tr>
-    </table>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>    
-  </form>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/ProxyLoadContent.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/ProxyLoadContent.jsp
deleted file mode 100644
index 918e5703f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/ProxyLoadContent.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<%
-   String sessionId = request.getParameter(ActionInputs.SESSIONID);
-   Controller controller;
-   StringBuffer targetContentLink = new StringBuffer(request.getParameter(ActionInputs.TARGET_PAGE));
-   if (sessionId != null)
-   {
-     HttpSession currentSession = (HttpSession)application.getAttribute(sessionId);
-     controller = (Controller)currentSession.getAttribute("controller");
-     if (targetContentLink.toString().indexOf("?") != -1)
-       targetContentLink.append('&');
-     else
-       targetContentLink.append('?');
-     targetContentLink.append(ActionInputs.SESSIONID).append('=').append(sessionId);
-   }
-   else
-     controller = (Controller)session.getAttribute("controller");
-   
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=controller.getMessage("FORM_TITLE_PAGE_LOADER")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<script language="javascript">
-  function loadContent()
-  {
-    var frameset = parent.document.getElementById("proxyPage");
-    var contentFrame = frameset.getElementsByTagName("frame").item(1);
-    contentFrame.src = "<%=response.encodeURL(controller.getPathWithContext(targetContentLink.toString()))%>";  
-  }
-  
-  function handleCompletion()
-  {
-    var table = document.getElementsByTagName("table").item(0);
-    var tBody = table.getElementsByTagName("TBODY").item(0);
-    var doneRow = document.createElement("tr");
-    var doneColumn = document.createElement("td");
-    doneColumn.appendChild(document.createTextNode("Page loaded."));
-    doneRow.appendChild(doneColumn);
-    tBody.appendChild(doneRow);   
-  }
-</script>  
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-  <div id="contentborder">
-    <table>
-      <tr>
-        <td class="labels">
-          <%=controller.getMessage("MSG_LOAD_IN_PROGRESS")%>
-        </td>
-      </tr>
-    </table>
-  </div>
-<script language="javascript">
-  loadContent();
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/ProxyLoadPage.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/ProxyLoadPage.jsp
deleted file mode 100644
index a62462e0d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/ProxyLoadPage.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.URLUtils,
-                                                        java.util.*,
-                                                        java.net.*" %>
-
-<%
-   String sessionId = request.getParameter(ActionInputs.SESSIONID);
-   Controller controller;
-   StringBuffer loadContentLink = new StringBuffer("forms/ProxyLoadContent.jsp?");
-   if (sessionId != null)
-   {
-     HttpSession currentSession = (HttpSession)application.getAttribute(sessionId);
-     controller = (Controller)currentSession.getAttribute("controller");
-     loadContentLink.append(ActionInputs.SESSIONID).append('=').append(sessionId).append('&');
-   }
-   else
-     controller = (Controller)session.getAttribute("controller");
-   loadContentLink.append(ActionInputs.TARGET_PAGE).append('=').append(URLUtils.encode(request.getParameter(ActionInputs.TARGET_PAGE)));
-%>
-<frameset id="proxyPage" rows="100%,*" border=0>
-  <frame src="<%=controller.getPathWithContext(loadContentLink.toString())%>" title="<%=controller.getMessage("FORM_TITLE_PAGE_LOADER")%>" marginwidth=0 marginheight=0 scrolling="no" frameborder=0 noresize>
-  <frame title="<%=controller.getMessage("FORM_TITLE_PAGE_CONTENT")%>" marginwidth=0 marginheight=0 scrolling="no" frameborder=0 noresize>
-</frameset>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/copyright.inc b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/copyright.inc
deleted file mode 100644
index a7fdcef6e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/copyright.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/formheader.inc b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/formheader.inc
deleted file mode 100644
index 0d1c98f04..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/formheader.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (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
- *******************************************************************************/
-%>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
-  <tr>
-    <td>
-      <img src="<%=response.encodeURL(controller.getPathWithContext(titleImagePath))%>" alt="">
-      <strong><%=title%></strong>
-    </td>
-  </tr>
-  <tr>
-    <td height=20> <img height=2 width="100%" align="top" src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>"> </td>
-  </tr>
-</table>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/otherActions.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/otherActions.jsp
deleted file mode 100644
index 944e3ffda..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/otherActions.jsp
+++ /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
- *******************************************************************************/
-%>
-
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="currentToolManagerHash" class="java.util.Hashtable" scope="request"/>
-<%
-   ToolManager currentToolManager = (ToolManager)currentToolManagerHash.get(ActionInputs.CURRENT_TOOL_MANAGER);
-   int numberOfTools = currentToolManager.getNumberOfTools();
-   if (numberOfTools > 1)
-   {
-%>
-<table>
-  <tr>
-    <td height=20>&nbsp;</td>
-  </tr>
-</table>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
-  <tr>
-    <td>
-      <strong><%=controller.getMessage("ALT_OTHER_ACTIONS")%></strong>
-    </td>
-  </tr>
-  <tr>
-    <td height=20> <img height=2 width="100%" align="top" src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>"> </td>
-  </tr>
-</table>
-<table>
-<%
-     for (int i=1;i<numberOfTools;i++)
-     {
-       Tool t = currentToolManager.getTool(i);
-%>
-  <tr>
-    <td><a href="<%=response.encodeURL(controller.getPathWithContext(t.getSelectToolActionHref(false)))%>" target="<%=t.getSelectToolActionTarget()%>"><%=t.getAltText()%></a></td>
-  </tr>
-<%
-     }
-%>
-</table>
-<%
-   }
-%>       
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/simpleCommon_table.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/simpleCommon_table.jsp
deleted file mode 100644
index 6dfe8a8d4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/simpleCommon_table.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<table border=0 cellpadding=2 cellspacing=0>
-  <tr>
-    <td height=30 valign="bottom" align="left" nowrap>
-      <input type="submit" value="<%=controller.getMessage("FORM_BUTTON_GO")%>" class="button">
-    </td>
-    <td height=30 valign="bottom" align="left" nowrap>
-      <input type="button" value="<%=controller.getMessage("FORM_BUTTON_RESET")%>" onClick="resetFormInputs()" class="button">
-    </td>
-    <td nowrap width="90%">&nbsp;</td>
-  </tr>
-</table>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/actions.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/actions.gif
deleted file mode 100644
index d5aed7aa0..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/actions.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/add_to_wsdl_perspective_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/add_to_wsdl_perspective_enabled.gif
deleted file mode 100644
index 55ce561af..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/add_to_wsdl_perspective_enabled.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/add_to_wsdl_perspective_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/add_to_wsdl_perspective_highlighted.gif
deleted file mode 100644
index 8ead667de..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/add_to_wsdl_perspective_highlighted.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/back_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/back_enabled.gif
deleted file mode 100644
index 1a46673a1..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/back_enabled.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/back_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/back_highlighted.gif
deleted file mode 100644
index 4fb415010..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/back_highlighted.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/calendar.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/calendar.gif
deleted file mode 100644
index be2817bf1..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/calendar.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/clear_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/clear_enabled.gif
deleted file mode 100644
index 5798483df..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/clear_enabled.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/clear_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/clear_highlighted.gif
deleted file mode 100644
index 6bc10f9d0..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/clear_highlighted.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/details_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/details_enabled.gif
deleted file mode 100644
index 333327302..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/details_enabled.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/details_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/details_highlighted.gif
deleted file mode 100644
index 98a2ba04e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/details_highlighted.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/dlcl16/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/dlcl16/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/dlcl16/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/dlcl16/actionengine_play.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/dlcl16/actionengine_play.gif
deleted file mode 100644
index eb17c1103..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/dlcl16/actionengine_play.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/dlcl16/actionengine_record.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/dlcl16/actionengine_record.gif
deleted file mode 100644
index 03004f54e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/dlcl16/actionengine_record.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/dlcl16/actionengine_save.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/dlcl16/actionengine_save.gif
deleted file mode 100644
index fe0048bed..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/dlcl16/actionengine_save.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/dlcl16/actionengine_stop.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/dlcl16/actionengine_stop.gif
deleted file mode 100644
index 3aee9aa1b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/dlcl16/actionengine_stop.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/elcl16/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/elcl16/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/elcl16/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/elcl16/actionengine_play.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/elcl16/actionengine_play.gif
deleted file mode 100644
index b88fb72d5..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/elcl16/actionengine_play.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/elcl16/actionengine_record.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/elcl16/actionengine_record.gif
deleted file mode 100644
index 26ccfe22c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/elcl16/actionengine_record.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/elcl16/actionengine_save.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/elcl16/actionengine_save.gif
deleted file mode 100644
index c6e7b9d6a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/elcl16/actionengine_save.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/elcl16/actionengine_stop.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/elcl16/actionengine_stop.gif
deleted file mode 100644
index 0dc366d0e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/elcl16/actionengine_stop.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/eview16/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/eview16/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/eview16/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/eview16/actionengine.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/eview16/actionengine.gif
deleted file mode 100644
index bf64bc22f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/eview16/actionengine.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/favorites_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/favorites_enabled.gif
deleted file mode 100644
index acb026872..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/favorites_enabled.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/favorites_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/favorites_highlighted.gif
deleted file mode 100644
index fa6221852..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/favorites_highlighted.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/favorites_perspective_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/favorites_perspective_enabled.gif
deleted file mode 100644
index 39004bf62..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/favorites_perspective_enabled.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/favorites_perspective_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/favorites_perspective_highlighted.gif
deleted file mode 100644
index 1965b847b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/favorites_perspective_highlighted.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/folder_closed.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/folder_closed.gif
deleted file mode 100644
index 42e027c93..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/folder_closed.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/folder_open.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/folder_open.gif
deleted file mode 100644
index 21322e0aa..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/folder_open.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/forward_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/forward_enabled.gif
deleted file mode 100644
index 4231431ef..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/forward_enabled.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/forward_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/forward_highlighted.gif
deleted file mode 100644
index e2f8c3e1f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/forward_highlighted.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/import_fs_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/import_fs_enabled.gif
deleted file mode 100644
index a70c7a7c4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/import_fs_enabled.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/import_fs_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/import_fs_highlighted.gif
deleted file mode 100644
index 946d3e71b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/import_fs_highlighted.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/import_to_workbench_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/import_to_workbench_enabled.gif
deleted file mode 100644
index b64a07d3a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/import_to_workbench_enabled.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/import_to_workbench_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/import_to_workbench_highlighted.gif
deleted file mode 100644
index d38085ad9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/import_to_workbench_highlighted.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/keyline.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/keyline.gif
deleted file mode 100644
index de8069e64..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/keyline.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/launch_wswizard_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/launch_wswizard_enabled.gif
deleted file mode 100644
index d258dc5c2..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/launch_wswizard_enabled.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/launch_wswizard_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/launch_wswizard_highlighted.gif
deleted file mode 100644
index 5f097d561..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/launch_wswizard_highlighted.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/line.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/line.gif
deleted file mode 100644
index 881e5b7f9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/line.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/line_last.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/line_last.gif
deleted file mode 100644
index 8f0ef83e0..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/line_last.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/line_notlast.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/line_notlast.gif
deleted file mode 100644
index 8292ce2df..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/line_notlast.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/minus_last.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/minus_last.gif
deleted file mode 100644
index 19ebb73bd..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/minus_last.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/minus_notlast.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/minus_notlast.gif
deleted file mode 100644
index cd6431bf9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/minus_notlast.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/navigator.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/navigator.gif
deleted file mode 100644
index 88c056795..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/navigator.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/plus_last.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/plus_last.gif
deleted file mode 100644
index e00c89a0b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/plus_last.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/plus_notlast.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/plus_notlast.gif
deleted file mode 100644
index 257bd1653..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/plus_notlast.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/refresh_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/refresh_enabled.gif
deleted file mode 100644
index 5bd5d19de..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/refresh_enabled.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/refresh_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/refresh_highlighted.gif
deleted file mode 100644
index 42904295e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/refresh_highlighted.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/root_main.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/root_main.gif
deleted file mode 100644
index 27ade02c4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/root_main.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/space.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/space.gif
deleted file mode 100644
index 481191560..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/space.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/status.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/status.gif
deleted file mode 100644
index 2da001e3e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/status.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/top_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/top_enabled.gif
deleted file mode 100644
index 7b5bc9d04..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/top_enabled.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/top_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/top_highlighted.gif
deleted file mode 100644
index 07164754e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/top_highlighted.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/twistclosed.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/twistclosed.gif
deleted file mode 100644
index 264331e46..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/twistclosed.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/twistopened.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/twistopened.gif
deleted file mode 100644
index 4c2c5f2fb..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/twistopened.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/uddi_perspective_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/uddi_perspective_enabled.gif
deleted file mode 100644
index 9acab3dba..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/uddi_perspective_enabled.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/uddi_perspective_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/uddi_perspective_highlighted.gif
deleted file mode 100644
index 7cfc0af65..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/uddi_perspective_highlighted.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/wsdl.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/wsdl.gif
deleted file mode 100644
index 8fb844f5b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/wsdl.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/wsdl_perspective_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/wsdl_perspective_enabled.gif
deleted file mode 100644
index 932acfed6..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/wsdl_perspective_enabled.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/wsdl_perspective_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/wsdl_perspective_highlighted.gif
deleted file mode 100644
index ae8efc903..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/wsdl_perspective_highlighted.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/wsil_perspective_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/wsil_perspective_enabled.gif
deleted file mode 100644
index 7af88fcb0..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/wsil_perspective_enabled.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/wsil_perspective_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/wsil_perspective_highlighted.gif
deleted file mode 100644
index 23b35a615..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/wsil_perspective_highlighted.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/launch_options_registry.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/launch_options_registry.jsp
deleted file mode 100644
index 1005b456f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/launch_options_registry.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-  org.eclipse.wst.ws.internal.explorer.WSExplorerContext,
-  java.util.Enumeration,
-  java.util.Hashtable,
-  org.eclipse.wst.ws.internal.explorer.platform.util.URLUtils" %>
-
-<%
-  String key = null;
-  Hashtable options = new Hashtable();
-  Enumeration paramNames = request.getParameterNames();
-  while (paramNames.hasMoreElements())
-  {
-    String paramName = (String)paramNames.nextElement();
-    String[] paramValues = request.getParameterValues(paramName);
-    if (paramValues != null && paramValues.length > 0)
-    {
-      if (key == null && URLUtils.decode(paramName).equals(WSExplorerContext.ID))
-        key = paramValues[0];
-      else
-        options.put(paramName, paramValues);
-    }
-  }
-  if (key != null)
-  {
-    LaunchOptionsManager manager = LaunchOptionsManager.getInstance();
-    manager.manage(key, options, application);
-  }
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/perspective_content.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/perspective_content.jsp
deleted file mode 100644
index 41f07ec28..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/perspective_content.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.actions.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=controller.getMessage("FRAME_TITLE_PERSPECTIVE_CONTENT")%></title>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<jsp:include page="/scripts/panes.jsp" flush="true"/>
-<script language="javascript">
-  perspectiveWorkArea.location="<%=response.encodeURL(controller.getPathWithContext(ShowPerspectiveAction.getActionLink(controller.getCurrentPerspective().getPerspectiveId(),false)))%>";
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/perspective_toolbar.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/perspective_toolbar.jsp
deleted file mode 100644
index 95dc0d38a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/perspective_toolbar.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.engine.ActionEngine" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-StringBuffer hrefActionEngine = new StringBuffer();
-hrefActionEngine.append(response.encodeURL(controller.getPathWithContext("actionengine_container.jsp")));
-hrefActionEngine.append("?");
-hrefActionEngine.append(ActionInputs.SESSIONID);
-hrefActionEngine.append("=");
-hrefActionEngine.append(session.getId());
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=controller.getMessage("FRAME_TITLE_PERSPECTIVE_TOOLBAR")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/toolbar.css"))%>">
-  <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/toolbar.js"))%>">
-  </script>
-  <script language="javascript">
-    function openActionEngineContainer()
-    {
-      var link = "<%=hrefActionEngine.toString()%>";
-      var actionEngineContainer = window.open(link,"actionEngineContainer","height=100,width=350,status=yes,scrollbars=yes,resizable=yes");
-      if (actionEngineContainer.focus)
-        actionEngineContainer.focus();
-    }
-  </script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="gtoolbarbodymargin">
-<div id="globaltoolbar">
-<table width="100%" cellpadding=3 cellspacing=0 border=0>
-  <tr>
-    <td class="text" nowrap valign="middle" align="left" width="100%" height=25><%=controller.getMessage("TITLE_WSEXPLORER")%></td>
-    <%
-    String altHistoryBack = controller.getMessage("ALT_BACK");
-    String altHistoryForward = controller.getMessage("ALT_FORWARD");
-    String altActionEngine = controller.getMessage("ALT_ACTION_ENGINE");
-    String altUDDI = controller.getMessage("ALT_UDDI_PERSPECTIVE");
-    String altWSIL = controller.getMessage("ALT_WSIL_PERSPECTIVE");
-    String altWSDL = controller.getMessage("ALT_WSDL_PERSPECTIVE");
-    String altFavorites = controller.getMessage("ALT_FAVORITES_PERSPECTIVE");
-    %>   
-    <td class="text" nowrap valign="middle" align="center" width=16 height=26><a href="<%=response.encodeURL(controller.getPathWithContext(RetrieveHistoryAction.getActionLink(ActionInputs.JUMP_BACK)))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><img class="normal" alt="<%=altHistoryBack%>" title="<%=altHistoryBack%>" src="<%=response.encodeURL(controller.getPathWithContext("images/back_enabled.gif"))%>" onMouseOver="src='<%=response.encodeURL(controller.getPathWithContext("images/back_highlighted.gif"))%>';mouseover(this);" onMouseOut="src='<%=response.encodeURL(controller.getPathWithContext("images/back_enabled.gif"))%>';mouseout(this)" onMouseDown="src='<%=response.encodeURL(controller.getPathWithContext("images/back_highlighted.gif"))%>';mousedown(this)" onMouseUp="src='<%=response.encodeURL(controller.getPathWithContext("images/back_enabled.gif"))%>';mouseup(this)"></a></td>
-    <td class="text" nowrap valign="middle" align="left" height=25><a href="<%=response.encodeURL(controller.getPathWithContext(RetrieveHistoryAction.getActionLink(ActionInputs.JUMP_FORWARD)))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><img class="normal" alt="<%=altHistoryForward%>" title="<%=altHistoryForward%>" src="<%=response.encodeURL(controller.getPathWithContext("images/forward_enabled.gif"))%>" onMouseOver="src='<%=response.encodeURL(controller.getPathWithContext("images/forward_highlighted.gif"))%>';mouseover(this);" onMouseOut="src='<%=response.encodeURL(controller.getPathWithContext("images/forward_enabled.gif"))%>';mouseout(this)" onMouseDown="src='<%=response.encodeURL(controller.getPathWithContext("images/forward_highlighted.gif"))%>';mousedown(this)" onMouseUp="src='<%=response.encodeURL(controller.getPathWithContext("images/forward_enabled.gif"))%>';mouseup(this)"></a></td>
-    <%
-    ActionEngine actionEngine = controller.getActionEngine();
-    if (actionEngine != null && actionEngine.getMode() != ActionEngine.MODE_DISABLED)
-    {
-    %>
-      <td class="text" nowrap valign="middle" align="left" height=25><a href="javascript:openActionEngineContainer()"><img class="normal" alt="<%=altActionEngine%>" title="<%=altActionEngine%>" src="<%=response.encodeURL(controller.getPathWithContext("images/eview16/actionengine.gif"))%>" onMouseOver="src='<%=response.encodeURL(controller.getPathWithContext("images/eview16/actionengine.gif"))%>';mouseover(this);" onMouseOut="src='<%=response.encodeURL(controller.getPathWithContext("images/eview16/actionengine.gif"))%>';mouseout(this)" onMouseDown="src='<%=response.encodeURL(controller.getPathWithContext("images/eview16/actionengine.gif"))%>';mousedown(this)" onMouseUp="src='<%=response.encodeURL(controller.getPathWithContext("images/eview16/actionengine.gif"))%>';mouseup(this)"></a></td>
-    <%
-    }
-    %>
-    <td class="text" nowrap valign="middle" align="left" height=25><a href="<%=response.encodeURL(controller.getPathWithContext(ShowPerspectiveAction.getActionLink(ActionInputs.PERSPECTIVE_UDDI,false)))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><img class="normal" alt="<%=altUDDI%>" title="<%=altUDDI%>" src="<%=response.encodeURL(controller.getPathWithContext("images/uddi_perspective_enabled.gif"))%>" onMouseOver="src='<%=response.encodeURL(controller.getPathWithContext("images/uddi_perspective_highlighted.gif"))%>';mouseover(this);" onMouseOut="src='<%=response.encodeURL(controller.getPathWithContext("images/uddi_perspective_enabled.gif"))%>';mouseout(this)" onMouseDown="src='<%=response.encodeURL(controller.getPathWithContext("images/uddi_perspective_highlighted.gif"))%>';mousedown(this)" onMouseUp="src='<%=response.encodeURL(controller.getPathWithContext("images/uddi_perspective_enabled.gif"))%>';mouseup(this)"></a></td>
-    <td class="text" nowrap valign="middle" align="left" height=25><a href="<%=response.encodeURL(controller.getPathWithContext(ShowPerspectiveAction.getActionLink(ActionInputs.PERSPECTIVE_WSIL,false)))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><img class="normal" alt="<%=altWSIL%>" title="<%=altWSIL%>" src="<%=response.encodeURL(controller.getPathWithContext("images/wsil_perspective_enabled.gif"))%>" onMouseOver="src='<%=response.encodeURL(controller.getPathWithContext("images/wsil_perspective_highlighted.gif"))%>';mouseover(this);" onMouseOut="src='<%=response.encodeURL(controller.getPathWithContext("images/wsil_perspective_enabled.gif"))%>';mouseout(this)" onMouseDown="src='<%=response.encodeURL(controller.getPathWithContext("images/wsil_perspective_highlighted.gif"))%>';mousedown(this)" onMouseUp="src='<%=response.encodeURL(controller.getPathWithContext("images/wsil_perspective_enabled.gif"))%>';mouseup(this)"></a></td>
-    <td class="text" nowrap valign="middle" align="left" height=25><a href="<%=response.encodeURL(controller.getPathWithContext(ShowPerspectiveAction.getActionLink(ActionInputs.PERSPECTIVE_WSDL,false)))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><img class="normal" alt="<%=altWSDL%>" title="<%=altWSDL%>" src="<%=response.encodeURL(controller.getPathWithContext("images/wsdl_perspective_enabled.gif"))%>" onMouseOver="src='<%=response.encodeURL(controller.getPathWithContext("images/wsdl_perspective_highlighted.gif"))%>';mouseover(this);" onMouseOut="src='<%=response.encodeURL(controller.getPathWithContext("images/wsdl_perspective_enabled.gif"))%>';mouseout(this)" onMouseDown="src='<%=response.encodeURL(controller.getPathWithContext("images/wsdl_perspective_highlighted.gif"))%>';mousedown(this)" onMouseUp="src='<%=response.encodeURL(controller.getPathWithContext("images/wsdl_perspective_enabled.gif"))%>';mouseup(this)"></a></td>    
-    <td class="text" nowrap valign="middle" align="left" height=25><a href="<%=response.encodeURL(controller.getPathWithContext(ShowPerspectiveAction.getActionLink(ActionInputs.PERSPECTIVE_FAVORITES,false)))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><img class="normal" alt="<%=altFavorites%>" title="<%=altFavorites%>" src="<%=response.encodeURL(controller.getPathWithContext("images/favorites_perspective_enabled.gif"))%>" onMouseOver="src='<%=response.encodeURL(controller.getPathWithContext("images/favorites_perspective_highlighted.gif"))%>';mouseover(this);" onMouseOut="src='<%=response.encodeURL(controller.getPathWithContext("images/favorites_perspective_enabled.gif"))%>';mouseout(this)" onMouseDown="src='<%=response.encodeURL(controller.getPathWithContext("images/favorites_perspective_highlighted.gif"))%>';mousedown(this)" onMouseUp="src='<%=response.encodeURL(controller.getPathWithContext("images/favorites_perspective_enabled.gif"))%>';mouseup(this)"></a></td>
-  </tr>
-</table>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/browserdetect.js b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/browserdetect.js
deleted file mode 100644
index 6b8135867..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/browserdetect.js
+++ /dev/null
@@ -1,15 +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
-//
-
-function isMicrosoftInternetExplorer()
-{
-  return navigator.appName == "Microsoft Internet Explorer";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/calendarbrowser.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/calendarbrowser.jsp
deleted file mode 100644
index 79b9ca265..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/calendarbrowser.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.actions.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   String sessionId = session.getId();
-%>
-<script language="javascript">
-  var calendarBrowser;
-  var calendarBrowserClosed = true;
-  var calendarTargetRow = -1;
-  var calendarTarget;
-
-  function openCalendarBrowser(type,formContainerId,elementName,index)
-  {
-    var form = document.getElementById(formContainerId).getElementsByTagName("form").item(0);
-    var elements = form.elements[elementName];
-    if (index == 0 && elements.length == undefined)
-<%
-   // Only one element.
-%>
-      calendarTarget = elements;
-    else
-    {
-      calendarTargetRow = index;
-      calendarTarget = elements.item(index);
-    }
-    var link;
-    switch (type)
-    {
-      case <%=ActionInputs.CALENDAR_TYPE_DATE%>:
-        link = "<%=response.encodeURL(controller.getPathWithContext(OpenCalendarBrowserAction.getActionLinkForDate(sessionId)))%>";
-        break;
-      case <%=ActionInputs.CALENDAR_TYPE_DATETIME%>:
-        link = "<%=response.encodeURL(controller.getPathWithContext(OpenCalendarBrowserAction.getActionLinkForDateTime(sessionId)))%>";
-        break;
-      case <%=ActionInputs.CALENDAR_TYPE_GYEARMONTH%>:
-        link = "<%=response.encodeURL(controller.getPathWithContext(OpenCalendarBrowserAction.getActionLinkForGYearMonth(sessionId)))%>";
-        break;
-      case <%=ActionInputs.CALENDAR_TYPE_GDAY%>:
-        link = "<%=response.encodeURL(controller.getPathWithContext(OpenCalendarBrowserAction.getActionLinkForGDay(sessionId)))%>";
-        break;
-      case <%=ActionInputs.CALENDAR_TYPE_GMONTHDAY%>:
-        link = "<%=response.encodeURL(controller.getPathWithContext(OpenCalendarBrowserAction.getActionLinkForGMonthDay(sessionId)))%>";
-        break;
-    }
-    calendarBrowser = window.open(link,"calendarBrowser","height=350,width=264,status=yes,scrollbars=yes,resizable=yes");
-    if (calendarBrowser.focus)
-      calendarBrowser.focus();
-  }
-
-  function closeCalendarBrowser()
-  {
-    if (!calendarBrowserClosed)
-      calendarBrowser.close();
-  }
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/formsubmit.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/formsubmit.jsp
deleted file mode 100644
index 3b3b4f36a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/formsubmit.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<script language="javascript">
-  var requestSubmitted = false;
-
-  function handleSubmit(form)
-  {
-    if (requestSubmitted)
-    {
-      alert("<%=HTMLUtils.JSMangle(controller.getMessage("MSG_SUBMIT_IN_PROGRESS"))%>");
-      return false;
-    }
-    requestSubmitted = true;
-    return true;
-  }
-
-  function resetSubmission()
-  {
-    requestSubmitted = false;
-  }
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/formutils.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/formutils.jsp
deleted file mode 100644
index 2dec80569..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/formutils.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" %>
-
-<script language="javascript">
-  <%// Requires browserdetect.js%>
-  function createHiddenElement(elementName,value)
-  {
-    var hiddenInput;
-    if (elementName.length > 0)
-    {
-      if (isMicrosoftInternetExplorer())
-        hiddenInput = document.createElement("<input name='"+elementName+"'>");
-      else
-      {
-        hiddenInput = document.createElement("input");
-        hiddenInput.setAttribute("name",elementName);
-      }
-    }
-    else
-      hiddenInput = document.createElement("input");
-    hiddenInput.type = "hidden";
-    hiddenInput.value = value;
-    return hiddenInput;
-  }
-
-  function resetFormInputs()
-  {
-    document.location.reload();
-  }
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/panes.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/panes.jsp
deleted file mode 100644
index aa69c2ca7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/panes.jsp
+++ /dev/null
@@ -1,39 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<script language="javascript">
-  var perspectiveWorkArea = top.frames["<%=FrameNames.PERSPECTIVE_WORKAREA%>"];
-  var perspectiveToolbar = top.frames["<%=FrameNames.PERSPECTIVE_TOOLBAR%>"];
-  var perspectiveContent = top.frames["<%=FrameNames.PERSPECTIVE_CONTENT%>"];
-
-  function getPerspectiveContentFrameset()
-  {
-    return perspectiveContent.document.getElementsByTagName("frameset").item(0);
-  }
-
-  function toggleDoubleClickColumnTitle()
-  {
-    var doubleClickColumn = document.getElementById("doubleclickcolumn");
-    if (doubleClickColumn == null)
-      return;
-<%
-   String jsAltRestore = HTMLUtils.JSMangle(controller.getMessage("ALT_DOUBLE_CLICK_TO_RESTORE"));
-%>
-    if (doubleClickColumn.title == "<%=jsAltRestore%>")
-      doubleClickColumn.title = "<%=HTMLUtils.JSMangle(controller.getMessage("ALT_DOUBLE_CLICK_TO_MAXIMIZE"))%>";
-    else
-      doubleClickColumn.title = "<%=jsAltRestore%>";
-  }
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/resumeproxyloadpage.js b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/resumeproxyloadpage.js
deleted file mode 100644
index d5e1549fa..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/resumeproxyloadpage.js
+++ /dev/null
@@ -1,17 +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
-//
-
-function resumeProxyLoadPage()
-{
-  var proxyPage = parent.document.getElementById("proxyPage");
-  proxyPage.setAttribute("rows", "0,100%");
-  parent.frames[0].handleCompletion();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/switchperspective.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/switchperspective.jsp
deleted file mode 100644
index 2a0fc3814..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/switchperspective.jsp
+++ /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
- *******************************************************************************/
-%>
-
-<%@ page contentType="text/html; charset=UTF-8" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<jsp:include page="/scripts/panes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<script language="javascript">
-  perspectiveContent.location = "<%=response.encodeURL(controller.getPathWithContext(controller.getCurrentPerspective().getPerspectiveContentPage()))%>";
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/tables.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/tables.jsp
deleted file mode 100644
index 99a24eefe..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/tables.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<script language="javascript">
-  var numberOfHeaderRows = 1;
-  function getTable(tableContainerId)
-  {
-    var container = document.getElementById(tableContainerId);
-    return container.getElementsByTagName("table").item(0);
-  }
-
-  function setSelect(select,value)
-  {
-    for (var i=0;i<select.options.length;i++)
-    {
-      if (select.options[i].value == value)
-      {
-        select.selectedIndex = i;
-        return select.options[i].text;
-      }
-    }
-  }
-
-  function removeSelectedRows(tableContainerId)
-  {
-    var table = getTable(tableContainerId);
-    for (var i=numberOfHeaderRows;i<table.rows.length;i++)
-    {
-      var rowCheckbox = table.rows[i].getElementsByTagName("input").item(0);
-      if (rowCheckbox.checked)
-      {
-        table.deleteRow(i);
-        i--;
-      }
-    }
-    var checkAllCheckboxRow = table.rows[0];
-    var checkAllCheckbox = checkAllCheckboxRow.getElementsByTagName("input").item(0);
-    if (checkAllCheckbox.checked)
-      checkAllCheckbox.checked = false;
-  }
-
-  function handleRowCheckboxClick(e)
-  {
-    var checkbox;
-    if (isMicrosoftInternetExplorer())
-      checkbox = event.srcElement;
-    else
-      checkbox = e.target;
-    var cell = checkbox.parentNode;
-    var row = cell.parentNode;
-    if (checkbox.checked)
-      highlightRow(row,"rowcolor");
-    else
-      highlightRow(row,"tablecells");
-
-    var tbody = row.parentNode;
-    var table = tbody.parentNode;
-    var checkAllCheckbox = table.rows[0].getElementsByTagName("input").item(0);
-    if (checkAllCheckbox.checked)
-      checkAllCheckbox.checked = false;
-  }
-
-  function createRowCheckbox()
-  {
-    var rowCheckbox = document.createElement("input");
-    rowCheckbox.setAttribute("name",rowCheckboxName);
-    rowCheckbox.type = "checkbox";
-    rowCheckbox.title = "<%=HTMLUtils.JSMangle(controller.getMessage("FORM_CONTROL_TITLE_SELECT_ROW_CHECK_BOX"))%>";
-    rowCheckbox.onclick = handleRowCheckboxClick;
-    return rowCheckbox;
-  }
-
-  function handleCheckAllClick(tableContainerId,checkAllCheckbox)
-  {
-    var table = getTable(tableContainerId);
-    for (var i=numberOfHeaderRows;i<table.rows.length;i++)
-    {
-      var rowCheckboxCell = table.rows[i].getElementsByTagName("td").item(0);
-      var rowCheckbox = rowCheckboxCell.childNodes[0];
-      rowCheckbox.checked = checkAllCheckbox.checked;
-      if (rowCheckbox.checked)
-        highlightRow(table.rows[i],"rowcolor");
-      else
-        highlightRow(table.rows[i],"tablecells");
-    }
-  }
-
-  function highlightRow(row,className)
-  {
-    var rowColumns = row.getElementsByTagName("td");
-    for (var i=1;i<rowColumns.length;i++)
-      rowColumns.item(i).className = className;
-  }
-
-  function highlightErrantRow(row,className)
-  {
-    var rowColumns = row.getElementsByTagName("td");
-    var column0 = rowColumns.item(0);
-    var column0Control = column0.childNodes[0];
-    var start;
-    if (column0Control.type == "checkbox")
-    {
-      column0Control.checked = true;
-      rowColumns.item(1).className = "firstcolumnerrantrowcolor";
-      start = 2;
-    }
-    else
-    {
-      column0.className = "firstcolumnerrantrowcolor";
-      start = 1;
-    }
-    rowColumns.item(rowColumns.length-1).className = "lastcolumnerrantrowcolor";
-    for (var i=start;i<rowColumns.length-1;i++)
-      rowColumns.item(i).className = "middleerrantrowcolor";
-  }
-
-  function twist(tableContainerId,twistImageName)
-  {
-    var tableContainer = document.getElementById(tableContainerId);
-    var twistImage = document.images[twistImageName];
-    if (tableContainer.style.display == "none")
-    {
-      tableContainer.style.display = "";
-      twistImage.src = "<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>";
-      twistImage.alt = "<%=HTMLUtils.JSMangle(controller.getMessage("ALT_TWIST_OPENED"))%>";
-    }
-    else
-    {
-      tableContainer.style.display = "none";
-      twistImage.src = "<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>";
-      twistImage.alt = "<%=HTMLUtils.JSMangle(controller.getMessage("ALT_TWIST_CLOSED"))%>";
-    }
-  }
-
-  function twistOpen(tableContainerId)
-  {
-    if (document.getElementById(tableContainerId).style.display == "none")
-      twist(tableContainerId,"x"+tableContainerId);
-  }
-
-  function getDefaultDisplayString(inputValue)
-  {
-    if (inputValue == null || inputValue.length < 1)
-      return "<%=HTMLUtils.JSMangle(controller.getMessage("TABLE_BLANK_PLACEHOLDER"))%>";
-    return inputValue;
-  }
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/toolbar.js b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/toolbar.js
deleted file mode 100644
index bab1b2dbb..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/toolbar.js
+++ /dev/null
@@ -1,30 +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
-//
-
-function mouseover(img)
-{
-  img.className = "hover";
-}
-
-function mouseout(img)
-{
-  img.className = "normal";
-}
-
-function mousedown(img)
-{
-  img.className = "down";
-}
-
-function mouseup(img)
-{
-  return mouseout(img);
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/treeview.js b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/treeview.js
deleted file mode 100644
index 0e843fb42..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/treeview.js
+++ /dev/null
@@ -1,50 +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
-//
-
-// Requires browserdetect.js
-
-var selectedAnchorName = "";
-
-function setSelectedAnchorName(anchorName)
-{
-  selectedAnchorName = anchorName;
-}
-
-function selectNode(anchorName,openImagePath)
-{
-  var isIE = isMicrosoftInternetExplorer();
-  if (selectedAnchorName.length > 0)
-  {
-    var selectedAnchor;
-    if (isIE)
-      selectedAnchor = document.anchors(selectedAnchorName);
-    else
-      selectedAnchor = document.anchors[selectedAnchorName];
-    if (selectedAnchor)
-      selectedAnchor.className = "unselectedTextAnchor";
-  }
-  if (anchorName.indexOf("-1") == -1)
-  {
-    if (isIE)
-      document.anchors(anchorName).className = "selectedTextAnchor";
-    else
-      document.anchors[anchorName].className = "selectedTextAnchor";
-    setSelectedAnchorName(anchorName);
-    alterImage(anchorName,openImagePath);
-  }
-  else
-    setSelectedAnchorName("");
-}
-
-function alterImage(imageName,imagePath)
-{
-  document.images[imageName].src = imagePath;
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/wsdlbrowser.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/wsdlbrowser.jsp
deleted file mode 100644
index 4e45a7fbd..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/wsdlbrowser.jsp
+++ /dev/null
@@ -1,48 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.actions.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   String sessionId = session.getId();
-%>
-<script language="javascript">
-  var wsdlWindow;
-  var wsdlWindowClosed = true;
-  var targetWSDLURLElement;
-  function openWSDLBrowser(formContainerId,type)
-  {
-    var form = document.getElementById(formContainerId).getElementsByTagName("form").item(0);
-    targetWSDLURLElement = form.<%=ActionInputs.QUERY_INPUT_WSDL_URL%>;
-    var link;
-    switch (type)
-    {
-      case <%=ActionInputs.WSDL_TYPE_SERVICE%>:
-        link = "<%=response.encodeURL(controller.getPathWithContext(OpenWSDLBrowserAction.getActionLinkForService(sessionId)))%>";
-        break;
-      case <%=ActionInputs.WSDL_TYPE_SERVICE_INTERFACE%>:
-      default:
-        link = "<%=response.encodeURL(controller.getPathWithContext(OpenWSDLBrowserAction.getActionLinkForServiceInterface(sessionId)))%>";
-    }
-    wsdlWindow = window.open(link,"wsdlWindow","height=300,width=450,status=yes,scrollbars=yes,resizable=yes");
-    if (wsdlWindow.focus)
-      wsdlWindow.focus();
-  }
-
-  function closeWSDLBrowser()
-  {
-    if (!wsdlWindowClosed)
-      wsdlWindow.close();
-  }
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/AddItemsToFavoritesActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/AddItemsToFavoritesActionJSP.jsp
deleted file mode 100644
index b6797918f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/AddItemsToFavoritesActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   // Prepare the action.
-   AddItemsToFavoritesAction action = new AddItemsToFavoritesAction(controller);
-
-   // Load the parameters for the action from the servlet request.
-   action.populatePropertyTable(request);
-
-   // Run the action and obtain the return code (fail/success).
-   boolean actionResult = action.execute();
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<script language="javascript">
-  propertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/properties_content.jsp"))%>";
-  statusContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/status_content.jsp"))%>";
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/AddPublisherAssertionsActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/AddPublisherAssertionsActionJSP.jsp
deleted file mode 100644
index 3dac339fe..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/AddPublisherAssertionsActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-   // Prepare the action.
-   AddPublisherAssertionsAction action = new AddPublisherAssertionsAction(controller);
-
-   // Load the parameters for the action from the servlet request.
-   boolean inputsValid = action.populatePropertyTable(request);
-
-   if (inputsValid)
-   {
-     // Run the action and obtain the return code (fail/success).
-     boolean actionResult = action.execute();
-   }
-%>
-
-   <script language="javascript">
-     propertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/properties_content.jsp"))%>";
-     statusContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/status_content.jsp"))%>";
-   </script>
-
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/AddToFavoritesActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/AddToFavoritesActionJSP.jsp
deleted file mode 100644
index 0e0d1a534..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/AddToFavoritesActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.AddToFavoritesAction"%>
-
-
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   // Prepare the action.
-   AddToFavoritesAction action = new AddToFavoritesAction(controller);
-
-   // Load the parameters for the action from the servlet request.
-   action.populatePropertyTable(request);
-
-   // Run the action and obtain the return code (fail/success).
-   boolean actionResult = action.execute();
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<script language="javascript">
-  propertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/properties_content.jsp"))%>";
-  statusContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/status_content.jsp"))%>";
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/BusPublishServiceAdvancedActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/BusPublishServiceAdvancedActionJSP.jsp
deleted file mode 100644
index 55752203c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/BusPublishServiceAdvancedActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-   // Prepare the action
-   BusPublishServiceAdvancedAction action = new BusPublishServiceAdvancedAction(controller);
-
-   // Load the parameters for the action from the servlet request.
-   boolean inputsValid = action.populatePropertyTable(request);
-
-   if (!action.isSubQueryInitiated())
-   {
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-<%
-   }
-   else
-   {
-%>
-<%@ include file="/uddi/actions/LaunchSubQueryAction.inc" %>
-<%
-   }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/BusPublishServiceSimpleActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/BusPublishServiceSimpleActionJSP.jsp
deleted file mode 100644
index 1070025e5..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/BusPublishServiceSimpleActionJSP.jsp
+++ /dev/null
@@ -1,37 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-   // Prepare the action.
-   BusPublishServiceSimpleAction action = new BusPublishServiceSimpleAction(controller);
-
-   // Load the parameters for the action from the servlet request.
-   boolean inputsValid = action.populatePropertyTable(request);
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/BusinessGetServicesActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/BusinessGetServicesActionJSP.jsp
deleted file mode 100644
index 3ee5d2463..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/BusinessGetServicesActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<%
-   // Prepare the action.
-   BusinessGetServicesAction action = new BusinessGetServicesAction(controller);
-
-   // Load the parameters for the action from the servlet request.
-   boolean inputsValid = action.populatePropertyTable(request);
-
-   boolean businessExists = action.validateBusiness();
-
-   if (!businessExists)
-   {
-     int nodeId = Integer.parseInt((String)(action.getPropertyTable().get(ActionInputs.NODEID)));
-     UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<script language="javascript">
-  if (confirm("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("MSG_QUESTION_REMOVE_BUSINESS_NODE"))%>"))
-    perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(ClearNavigatorNodeAction.getActionLink(nodeId)))%>";
-</script>
-<%
-   }
-   else
-   {
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-<%
-   }
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/CheckFavoriteExistsActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/CheckFavoriteExistsActionJSP.jsp
deleted file mode 100644
index 4f033e5ea..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/CheckFavoriteExistsActionJSP.jsp
+++ /dev/null
@@ -1,65 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                   					                    org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.AddToFavoritesAction,
-                                   					                    org.eclipse.wst.ws.internal.explorer.platform.util.*,
-                                   					                    java.util.*"%>
-
-
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/AddToFavoritesActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>">
-<%
-Enumeration paramNames = request.getParameterNames();
-while (paramNames.hasMoreElements()) {
-  String paramName = (String)paramNames.nextElement();
-  String[] paramValues = request.getParameterValues(paramName);
-  for (int i = 0; i < paramValues.length; i++) {
-%>
-    <input type="hidden" name="<%=paramName%>" value="<%=paramValues[i]%>">
-<%
-  }
-}
-%>
-</form>
-</body>
-</html>
-
-<%
-// Prepare the action.
-AddToFavoritesAction action = new AddToFavoritesAction(controller);
-// Load the parameters for the action from the servlet request.
-action.populatePropertyTable(request);
-if (action.favoriteExists()) {
-%>
-  <script language="javascript">
-    if (confirm("<%=HTMLUtils.JSMangle(controller.getUDDIPerspective().getMessage("MSG_QUESTION_OVERWRITE_FAVORITES"))%>"))
-      document.forms[0].submit();
-  </script>
-<%
-}
-else {
-%>
-  <script language="javascript">
-    document.forms[0].submit();
-  </script>
-<%
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ClearNavigatorNodeActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ClearNavigatorNodeActionJSP.jsp
deleted file mode 100644
index c9dec4361..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ClearNavigatorNodeActionJSP.jsp
+++ /dev/null
@@ -1,35 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   // Prepare the action.
-   NodeManager navigatorManager = controller.getUDDIPerspective().getNavigatorManager();
-   Node selectedNode = navigatorManager.getSelectedNode();
-   ClearNavigatorNodeAction action;
-   if (selectedNode instanceof FolderNode)
-     action = new ClearNavigatorFolderNodeAction(controller);
-   else
-     action = new ClearNavigatorNodeAction(controller);
-
-   // The action may be executed programmed link.
-   action.populatePropertyTable(request);
-   
-   boolean inputsValid = true;
-   
-   // Run the action and obtain the return code (fail/success).
-   boolean actionResult = action.execute();
-%>
-<%@ include file="/actions/ClearNodeAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ClearNavigatorNodesActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ClearNavigatorNodesActionJSP.jsp
deleted file mode 100644
index 5dbf188e4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ClearNavigatorNodesActionJSP.jsp
+++ /dev/null
@@ -1,35 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-   // Prepare the action.
-   ClearNavigatorNodesAction action = new ClearNavigatorNodesAction(controller);
-
-   // Load the parameters for the action from the servlet request.
-   boolean inputsValid = action.populatePropertyTable(request);
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/CompletePublisherAssertionsActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/CompletePublisherAssertionsActionJSP.jsp
deleted file mode 100644
index 8904ba9d8..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/CompletePublisherAssertionsActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-   // Prepare the action.
-   CompletePublisherAssertionsAction action = new CompletePublisherAssertionsAction(controller);
-
-   // Load the parameters for the action from the servlet request.
-   boolean inputsValid = action.populatePropertyTable(request);
-
-   if (inputsValid)
-   {
-     // Run the action and obtain the return code (fail/success).
-     boolean actionResult = action.execute();
-   }
-%>
-
-   <script language="javascript">
-     propertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/properties_content.jsp"))%>";
-     statusContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/status_content.jsp"))%>";
-   </script>
-
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/LaunchSubQueryAction.inc b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/LaunchSubQueryAction.inc
deleted file mode 100644
index c3bfee0d4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/LaunchSubQueryAction.inc
+++ /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
- *******************************************************************************/
-%>
-<%
-   String subQueryKey = action.getSubQueryKey();
-   StringBuffer newSubQueryKey = new StringBuffer();
-   if (subQueryKey != null && subQueryKey.length() > 0)
-     newSubQueryKey.append(action.getSubQueryKey()).append(':');
-   newSubQueryKey.append(action.getNewSubQuery());
-   FormTool formTool = (FormTool)action.getSelectedFormTool();
-   FormToolPropertiesInterface parentFormToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKey);
-   FormToolPropertiesInterface subQueryFormToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(newSubQueryKey.toString());
-   String newSubQueryItemString = action.getNewSubQueryItem();
-   subQueryFormToolPI.setProperty(UDDIActionInputs.QUERY_ITEM,newSubQueryItemString);
-   subQueryFormToolPI.setProperty(UDDIActionInputs.SUBQUERY_GET,new Boolean(action.isSubQueryGet()));
-   
-   // Always initialize the query name so the subquery makes sense.
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-   String parentQueryName = (String)parentFormToolPI.getProperty(UDDIActionInputs.QUERY_NAME);
-   if (parentQueryName == null)
-     parentQueryName = uddiPerspective.getMessage("DEFAULT_QUERY_NAME");
-   int newSubQueryItem = Integer.parseInt(newSubQueryItemString);
-   String newSubQueryItemTypeString = null;
-   switch (newSubQueryItem)
-   {
-     case UDDIActionInputs.QUERY_ITEM_BUSINESSES:
-       newSubQueryItemTypeString = uddiPerspective.getMessage("FORM_OPTION_BUSINESSES");
-       break;
-     case UDDIActionInputs.QUERY_ITEM_SERVICES:
-       newSubQueryItemTypeString = uddiPerspective.getMessage("FORM_OPTION_SERVICES");
-       break;
-     case UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES:
-     default:
-       newSubQueryItemTypeString = uddiPerspective.getMessage("FORM_OPTION_SERVICE_INTERFACES");
-   }
-   String[] messageParameters = {parentQueryName,newSubQueryItemTypeString};
-   subQueryFormToolPI.setProperty(UDDIActionInputs.QUERY_NAME,uddiPerspective.getMessage("DEFAULT_SUBQUERY_NAME",messageParameters));
-   
-   Node node = action.getSelectedNavigatorNode();
-   int nodeId = node.getNodeId();
-   int toolId = node.getToolManager().getSelectedToolId();
-   int viewId = node.getViewId();
-   int viewToolId = node.getViewToolId();
-%>
-<script language="javascript">
-  perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(SelectFindToolAction.getActionLink(nodeId,toolId,viewId,viewToolId,newSubQueryKey.toString(),false)))%>";
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ManageReferencedServicesActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ManageReferencedServicesActionJSP.jsp
deleted file mode 100644
index a5d55534d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ManageReferencedServicesActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        java.util.*" %>
-
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-   // Prepare the action.
-   ManageReferencedServicesAction action = new ManageReferencedServicesAction(controller);
-
-   // Load the parameters for the action from the servlet request.
-   boolean inputsValid = action.populatePropertyTable(request);
-
-   if (!inputsValid)
-   {
-%>
-<script language="javascript">
-  propertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/properties_content.jsp"))%>";
-  statusContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/status_content.jsp"))%>";
-</script>
-<%
-   }
-   else
-   {
-     if (!action.isSubQueryInitiated())
-     {
-       action.execute();
-%>
-<script language="javascript">
-  propertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/properties_content.jsp"))%>";
-  statusContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/status_content.jsp"))%>";
-</script>
-<%
-     }
-     else
-     {
-%>
-<%@ include file="/uddi/actions/LaunchSubQueryAction.inc" %>
-<%
-     }
-   }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/NewNodeAction.inc b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/NewNodeAction.inc
deleted file mode 100644
index 2f9e480d1..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/NewNodeAction.inc
+++ /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
- *******************************************************************************/
-%>
-<%
-   if (!inputsValid)
-   {
-%>
-<script language="javascript">
-  propertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/properties_content.jsp"))%>";
-  statusContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/status_content.jsp"))%>";
-</script>
-<%
-   }
-   else
-   {
-     // Run the action and obtain the return code (fail/success).
-     boolean actionResult = action.execute();
-
-     if (actionResult)
-     {
-       // Ensure that the selected node is visible.
-       controller.getUDDIPerspective().getNavigatorManager().makeSelectedNodeVisible();
-%>
-<script language="javascript">
-  if (isMicrosoftInternetExplorer())
-  {
-    navigatorContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/navigator_content.jsp"))%>";
-    propertiesContainer.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/properties_container.jsp"))%>";
-    statusContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/status_content.jsp"))%>";
-  }
-  else
-    perspectiveContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/uddi_perspective_content.jsp"))%>";
-</script>
-<%
-     }
-     else
-     {
-%>
-<script language="javascript">
-  propertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/properties_content.jsp"))%>";
-  statusContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/status_content.jsp"))%>";
-</script>
-<%
-     }
-   }
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/OpenRegistryActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/OpenRegistryActionJSP.jsp
deleted file mode 100644
index 2472eb3f3..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/OpenRegistryActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-   // Prepare the action.
-
-   OpenRegistryAction action = new OpenRegistryAction(controller);
-
-   // Load the parameters for the action from the servlet request.
-   boolean inputsValid = action.populatePropertyTable(request);
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RefreshUDDINodeActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RefreshUDDINodeActionJSP.jsp
deleted file mode 100644
index 303be5040..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RefreshUDDINodeActionJSP.jsp
+++ /dev/null
@@ -1,90 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*,
-                                                        java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-<jsp:include page="/scripts/formutils.jsp" flush="true"/>
-<%
-   // Prepare the action.
-   RefreshUDDINodeAction action = new RefreshUDDINodeAction(controller);
-
-   // The action may be executed via program link.
-   action.populatePropertyTable(request);
-   boolean isNodeDataValid = action.verifyNodeData();
-
-   boolean inputsValid = true;
-   String onLoadAction;
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>   
-<script language="javascript">
-  function processClearNodesForm()
-  {
-    var clearNodesForm = document.forms[0];
-    var submitClearNodesForm = false;
-<%
-     Vector staleNodes = action.getStaleNodes();
-     for (int i=0;i<staleNodes.size();i++)
-     {
-       Node staleNode = (Node)staleNodes.elementAt(i);
-%>
-    if (confirm("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("MSG_QUESTION_REMOVE_NODE",staleNode.getNodeName()))%>"))
-    {
-      clearNodesForm.appendChild(createHiddenElement("<%=ActionInputs.NODEID%>",<%=staleNode.getNodeId()%>));
-      submitClearNodesForm = true;
-    }
-<%
-     }
-%>
-    if (submitClearNodesForm)
-      clearNodesForm.submit();
-  }
-</script>    
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/ClearNavigatorNodesActionJSP.jsp"))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" method="post" enctype="multipart/form-data">
-</form>
-<%
-   if (!isNodeDataValid)
-   {
-     int nodeId = Integer.parseInt((String)(action.getPropertyTable().get(ActionInputs.NODEID)));
-     String nodeName = uddiPerspective.getNavigatorManager().getNode(nodeId).getNodeName();
-%>
-<script language="javascript">
-  if (confirm("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("MSG_QUESTION_REMOVE_NODE",nodeName))%>"))
-    perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(ClearNavigatorNodeAction.getActionLink(nodeId)))%>";
-</script>    
-<%
-   }
-   else
-   {
-%>
-<script language="javascript">
-  processClearNodesForm();
-</script>
-<%@ include file = "/uddi/actions/NewNodeAction.inc" %>
-<%
-   }
-%>   
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RefreshUDDINodesActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RefreshUDDINodesActionJSP.jsp
deleted file mode 100644
index e3762946f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RefreshUDDINodesActionJSP.jsp
+++ /dev/null
@@ -1,65 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*,
-                                                        java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-<jsp:include page="/scripts/formutils.jsp" flush="true"/>
-<%
-   // Prepare the action.
-   RefreshUDDINodesAction action = new RefreshUDDINodesAction(controller);
-
-   // Load the parameters for the action from the servlet request.
-   boolean inputsValid = action.populatePropertyTable(request);
-   
-   // Run the action
-   boolean actionResult = action.execute();
-%>
-<script language="javascript">
-  function processClearNodesForm()
-  {
-    var clearNodesForm = document.forms[0];
-<%
-     Vector staleNodes = action.getStaleNodes();
-     UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-     for (int i=0;i<staleNodes.size();i++)
-     {
-       Node staleNode = (Node)staleNodes.elementAt(i);
-%>
-    if (confirm("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("MSG_QUESTION_REMOVE_NODE",staleNode.getNodeName()))%>"))
-      clearNodesForm.appendChild(createHiddenElement("<%=ActionInputs.NODEID%>",<%=staleNode.getNodeId()%>));
-<%    
-     }
-%>
-    clearNodesForm.submit();
-  }         
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/ClearNavigatorNodesActionJSP.jsp"))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" method="post" enctype="multipart/form-data">
-</form>
-<script language="javascript">
-  processClearNodesForm();
-</script>  
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindBusinessUUIDActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindBusinessUUIDActionJSP.jsp
deleted file mode 100644
index 435459c88..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindBusinessUUIDActionJSP.jsp
+++ /dev/null
@@ -1,37 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-   // Prepare the action.
-   RegFindBusinessUUIDAction action = new RegFindBusinessUUIDAction(controller);
-
-   // Load the parameters for the action from the servlet request.
-   boolean inputsValid = action.populatePropertyTable(request);
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindBusinessesAdvancedActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindBusinessesAdvancedActionJSP.jsp
deleted file mode 100644
index e18b6b357..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindBusinessesAdvancedActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        java.util.*" %>
-
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-   // Prepare the action.
-   RegFindBusinessesAdvancedAction action = new RegFindBusinessesAdvancedAction(controller);
-
-   // Load the parameters for the action from the servlet request.
-   boolean inputsValid = action.populatePropertyTable(request);
-
-   if (!action.isSubQueryInitiated())
-   {
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-<%
-   }
-   else
-   {
-%>
-<%@ include file="/uddi/actions/LaunchSubQueryAction.inc" %>
-<%
-   }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindBusinessesSimpleActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindBusinessesSimpleActionJSP.jsp
deleted file mode 100644
index d5716b0f5..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindBusinessesSimpleActionJSP.jsp
+++ /dev/null
@@ -1,37 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-   // Prepare the action.
-   RegFindBusinessesSimpleAction action = new RegFindBusinessesSimpleAction(controller);
-
-   // Load the parameters for the action from the servlet request.
-   boolean inputsValid = action.populatePropertyTable(request);
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServiceInterfaceUUIDActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServiceInterfaceUUIDActionJSP.jsp
deleted file mode 100644
index 2b44c9f44..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServiceInterfaceUUIDActionJSP.jsp
+++ /dev/null
@@ -1,37 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-   // Prepare the action.
-   RegFindServiceInterfaceUUIDAction action = new RegFindServiceInterfaceUUIDAction(controller);
-
-   // Load the parameters for the action from the servlet request.
-   boolean inputsValid = action.populatePropertyTable(request);
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServiceInterfacesAdvancedActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServiceInterfacesAdvancedActionJSP.jsp
deleted file mode 100644
index 16d324ed7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServiceInterfacesAdvancedActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-   // Prepare the action.
-   RegFindServiceInterfacesAdvancedAction action = new RegFindServiceInterfacesAdvancedAction(controller);
-
-   // Load the parameters for the action from the servlet request.
-   boolean inputsValid = action.populatePropertyTable(request);
-
-   if (!action.isSubQueryInitiated())
-   {
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-<%
-   }
-   else
-   {
-%>
-<%@ include file="/uddi/actions/LaunchSubQueryAction.inc" %>
-<%
-   }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServiceInterfacesSimpleActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServiceInterfacesSimpleActionJSP.jsp
deleted file mode 100644
index fcace6d14..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServiceInterfacesSimpleActionJSP.jsp
+++ /dev/null
@@ -1,37 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-   // Prepare the action.
-   RegFindServiceInterfacesSimpleAction action = new RegFindServiceInterfacesSimpleAction(controller);
-
-   // Load the parameters for the action from the servlet request.
-   boolean inputsValid = action.populatePropertyTable(request);
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServiceUUIDActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServiceUUIDActionJSP.jsp
deleted file mode 100644
index 5ca5e67f4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServiceUUIDActionJSP.jsp
+++ /dev/null
@@ -1,37 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-   // Prepare the action.
-   RegFindServiceUUIDAction action = new RegFindServiceUUIDAction(controller);
-
-   // Load the parameters for the action from the servlet request.
-   boolean inputsValid = action.populatePropertyTable(request);
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServicesAdvancedActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServicesAdvancedActionJSP.jsp
deleted file mode 100644
index 9838de258..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServicesAdvancedActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        java.util.*" %>
-
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-   // Prepare the action.
-   RegFindServicesAdvancedAction action = new RegFindServicesAdvancedAction(controller);
-
-   // Load the parameters for the action from the servlet request.
-   boolean inputsValid = action.populatePropertyTable(request);
-
-   if (!action.isSubQueryInitiated())
-   {
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-<%
-   }
-   else
-   {
-%>
-<%@ include file="/uddi/actions/LaunchSubQueryAction.inc" %>
-<%
-   }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServicesSimpleActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServicesSimpleActionJSP.jsp
deleted file mode 100644
index 62ad59053..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServicesSimpleActionJSP.jsp
+++ /dev/null
@@ -1,37 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-   // Prepare the action.
-   RegFindServicesSimpleAction action = new RegFindServicesSimpleAction(controller);
-
-   // Load the parameters for the action from the servlet request.
-   boolean inputsValid = action.populatePropertyTable(request);
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishBusinessAdvancedActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishBusinessAdvancedActionJSP.jsp
deleted file mode 100644
index af639c19f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishBusinessAdvancedActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-   // Prepare the action.
-   RegPublishBusinessAdvancedAction action = new RegPublishBusinessAdvancedAction(controller);
-
-   // Load the parameters for the action from the servlet request.
-   boolean inputsValid = action.populatePropertyTable(request);
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishBusinessSimpleActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishBusinessSimpleActionJSP.jsp
deleted file mode 100644
index 6f012c6a8..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishBusinessSimpleActionJSP.jsp
+++ /dev/null
@@ -1,37 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-   // Prepare the action.
-   RegPublishBusinessSimpleAction action = new RegPublishBusinessSimpleAction(controller);
-
-   // Load the parameters for the action from the servlet request.
-   boolean inputsValid = action.populatePropertyTable(request);
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishServiceAdvancedActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishServiceAdvancedActionJSP.jsp
deleted file mode 100644
index f066ba735..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishServiceAdvancedActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-   // Prepare the action.
-   RegPublishServiceAdvancedAction action = new RegPublishServiceAdvancedAction(controller);
-
-   // Load the parameters for the action from the servlet request.
-   boolean inputsValid = action.populatePropertyTable(request);
-
-   if (!action.isSubQueryInitiated())
-   {
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-<%
-   }
-   else
-   {
-%>
-<%@ include file="/uddi/actions/LaunchSubQueryAction.inc" %>
-<%
-   }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishServiceInterfaceAdvancedActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishServiceInterfaceAdvancedActionJSP.jsp
deleted file mode 100644
index 765275fe3..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishServiceInterfaceAdvancedActionJSP.jsp
+++ /dev/null
@@ -1,37 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-   // Prepare the action.
-   RegPublishServiceInterfaceAdvancedAction action = new RegPublishServiceInterfaceAdvancedAction(controller);
-
-   // Load the parameters for the action from the servlet request.
-   boolean inputsValid = action.populatePropertyTable(request);
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishServiceInterfaceSimpleActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishServiceInterfaceSimpleActionJSP.jsp
deleted file mode 100644
index 025dc57bf..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishServiceInterfaceSimpleActionJSP.jsp
+++ /dev/null
@@ -1,37 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-   // Prepare the action.
-   RegPublishServiceInterfaceSimpleAction action = new RegPublishServiceInterfaceSimpleAction(controller);
-
-   // Load the parameters for the action from the servlet request.
-   boolean inputsValid = action.populatePropertyTable(request);
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishServiceSimpleActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishServiceSimpleActionJSP.jsp
deleted file mode 100644
index 01b04f8a3..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishServiceSimpleActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-   // Prepare the action.
-   RegPublishServiceSimpleAction action = new RegPublishServiceSimpleAction(controller);
-
-   // Load the parameters for the action from the servlet request.
-   boolean inputsValid = action.populatePropertyTable(request);
-
-   if (!action.isSubQueryInitiated())
-   {
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-<%
-   }
-   else
-   {
-%>
-<%@ include file="/uddi/actions/LaunchSubQueryAction.inc" %>
-<%
-   }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RemovePublisherAssertionsActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RemovePublisherAssertionsActionJSP.jsp
deleted file mode 100644
index b66cefd9f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RemovePublisherAssertionsActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-   // Prepare the action.
-   RemovePublisherAssertionsAction action = new RemovePublisherAssertionsAction(controller);
-
-   // Load the parameters for the action from the servlet request.
-   boolean inputsValid = action.populatePropertyTable(request);
-
-   if (inputsValid)
-   {
-     // Run the action and obtain the return code (fail/success).
-     boolean actionResult = action.execute();
-   }
-%>
-
-   <script language="javascript">
-     propertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/properties_content.jsp"))%>";
-     statusContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/status_content.jsp"))%>";
-   </script>
-
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RemoveSubQueryItemActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RemoveSubQueryItemActionJSP.jsp
deleted file mode 100644
index d65f63fa6..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RemoveSubQueryItemActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-   // Prepare the action.
-   RemoveSubQueryItemAction action = new RemoveSubQueryItemAction(controller);
-
-   // Load the parameters for the action from the servlet request.
-   action.populatePropertyTable(request);
-
-   // Run the action and obtain the return code (fail/success).
-   boolean actionResult = action.execute();
-%>
-<script language="javascript">
-  propertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/properties_content.jsp"))%>";
-  statusContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/status_content.jsp"))%>";
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ResizeUDDIFramesActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ResizeUDDIFramesActionJSP.jsp
deleted file mode 100644
index d2722231c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ResizeUDDIFramesActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   // Create the action.
-   ResizeUDDIFramesAction action = new ResizeUDDIFramesAction(controller);
-   
-   // Populate the action with the request properties.
-   boolean result = action.populatePropertyTable(request);
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<jsp:include page="/uddi/scripts/uddiframesets.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-   if (result)
-   {
-     action.execute(false);
-     
-     UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<script language="javascript">
-  if (isMicrosoftInternetExplorer())
-  {
-    var perspectiveContentFrameset = getPerspectiveContentFrameset();
-    var actionsContainerFrameset = getActionsContainerFrameset();
-    perspectiveContentFrameset.setAttribute("cols","<%=uddiPerspective.getPerspectiveContentFramesetCols()%>");
-    actionsContainerFrameset.setAttribute("rows","<%=uddiPerspective.getActionsContainerFramesetRows()%>");
-  }
-  else
-    perspectiveContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/uddi_perspective_content.jsp"))%>";
-</script>
-<%
-   }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/SelectCategoryNodeActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/SelectCategoryNodeActionJSP.jsp
deleted file mode 100644
index 1b84f63e5..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/SelectCategoryNodeActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*,
-                                                        org.uddi4j.util.*" %>
-
-<%
-   String sessionId = request.getParameter(ActionInputs.SESSIONID);
-   HttpSession currentSession = (HttpSession)application.getAttribute(sessionId);
-   Controller controller = (Controller)currentSession.getAttribute("controller");
-%>   
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<jsp:include page="/uddi/scripts/cbpanes.jsp" flush="true"/>
-<%
-   // Prepare the action.
-   SelectCategoryNodeAction action = new SelectCategoryNodeAction(controller);
-
-   // Load the parameters for the action from the servlet request.
-   action.populatePropertyTable(request);
-
-   // Run the action and obtain the return code (fail/success).
-   boolean actionResult = action.execute(false);
-
-   CategoryNode selectedNode = (CategoryNode)action.getSelectedNode();
-   NodeManager nodeManager = selectedNode.getNodeManager();
-   Node previousSelectedNode = nodeManager.getPreviousSelectedNode();
-   int selectedNodeId = selectedNode.getNodeId();
-%>
-<script language="javascript">
-<%
-   String treeContentVar = action.getTreeContentVar();
-   if (previousSelectedNode != null)
-   {
-     if (treeContentVar != null)
-     {
-%>
-  <%=treeContentVar%>.alterImage('<%=previousSelectedNode.getAnchorName()%>','<%=response.encodeURL(controller.getPathWithContext(previousSelectedNode.getClosedImagePath()))%>');
-<%
-     }
-   }
-   String selectedNodeAnchorName = selectedNode.getAnchorName();
-   if (treeContentVar != null)
-   {
-%>     
-  <%=treeContentVar%>.selectNode('<%=selectedNodeAnchorName%>','<%=response.encodeURL(controller.getPathWithContext(selectedNode.getOpenImagePath()))%>');
-  <%=treeContentVar%>.location.hash = '#<%=selectedNodeAnchorName%>';
-<%  
-   }
-   
-   CategoryElement categoryElement = (CategoryElement)selectedNode.getTreeElement();
-   KeyedReference kr = categoryElement.getCategory();
-%>
-  categoryBrowserWindow.opener.targetCategoryKeyNameElement.value = "<%=kr.getKeyName()%>";
-  categoryBrowserWindow.opener.targetCategoryKeyValueElement.value = "<%=kr.getKeyValue()%>";
-  categoryBrowserWindow.opener.closeCategoryBrowser();
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/SelectFindToolActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/SelectFindToolActionJSP.jsp
deleted file mode 100644
index 063cf1f65..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/SelectFindToolActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   // Prepare the action.
-   SelectFindToolAction action = new SelectFindToolAction(controller);
-
-   // Load the parameters for the action from the servlet request.
-   action.populatePropertyTable(request);
-
-   // Run the action and obtain the return code (fail/success).
-   boolean actionResult = action.execute();
-
-   // Determine if the action was added to the history list.
-   boolean isAddedToHistory = action.isAddedToHistory();
-%>
-<%@ include file="/actions/SelectNodeToolAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/SelectNavigatorNodeActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/SelectNavigatorNodeActionJSP.jsp
deleted file mode 100644
index 8cb7d0ddb..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/SelectNavigatorNodeActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   // Prepare the action.
-   SelectNavigatorNodeAction action = new SelectNavigatorNodeAction(controller);
-
-   // Load the parameters for the action from the servlet request.
-   action.populatePropertyTable(request);
-
-   // Run the action and obtain the return code (fail/success).
-   boolean actionResult = action.execute();
-
-   // Determine if the action was added to the history list.
-   boolean isAddedToHistory = action.isAddedToHistory();
-%>
-<%@ include file="/actions/SelectNodeAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/SelectPropertiesToolActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/SelectPropertiesToolActionJSP.jsp
deleted file mode 100644
index 474a40fa9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/SelectPropertiesToolActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-// Prepare the action.
-SelectPropertiesToolAction action = new SelectPropertiesToolAction(controller);
-
-// Load the parameters for the action from the servlet request.
-action.populatePropertyTable(request);
-
-// Run the action and obtain the return code (fail/success).
-boolean actionResult = action.execute();
-
-// Determine if the action was added to the history list.
-boolean isAddedToHistory = action.isAddedToHistory();
-%>
-<%@ include file="/actions/SelectNodeToolAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/SelectSubQueryItemActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/SelectSubQueryItemActionJSP.jsp
deleted file mode 100644
index 3600eebfe..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/SelectSubQueryItemActionJSP.jsp
+++ /dev/null
@@ -1,51 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*,
-                                                        java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   // Prepare the action.
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-   SelectSubQueryItemAction action = new SelectSubQueryItemAction(controller);
-
-   // Load the parameters for the action from the servlet request.
-   action.populatePropertyTable(request);
-
-   // Run the action and obtain the return code (fail/success).
-   boolean actionResult = action.execute(false);
-   
-   if (!actionResult)
-   {
-     Hashtable propertyTable = action.getPropertyTable();
-     String subQueryKey = (String)propertyTable.get(UDDIActionInputs.SUBQUERY_KEY);
-     String subQueryListKey = (String)propertyTable.get(UDDIActionInputs.SUBQUERY_LIST_KEY);
-     int subQueryListItemId = Integer.parseInt((String)propertyTable.get(UDDIActionInputs.SUBQUERY_LIST_ITEMID));
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; UTF-8">
-<jsp:include page="/scripts/panes.jsp" flush="true"/>  
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<script language="javascript">
-  if (confirm("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("MSG_QUESTION_ITEM_VALIDATION_FAILED",action.getItemName()))%>"))
-    perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(RemoveSubQueryItemAction.getActionLink(subQueryKey,subQueryListKey,subQueryListItemId)))%>";
-</script>
-</body>
-</html>
-<%
-   }
-   else
-   {
-     // Determine if the action was added to the history list.
-     boolean isAddedToHistory = action.isAddedToHistory();
-%>
-<%@ include file="/actions/SelectNodeToolAction.inc" %>
-<%
-   }
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ServiceGetBusinessActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ServiceGetBusinessActionJSP.jsp
deleted file mode 100644
index 939e71b79..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ServiceGetBusinessActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<%
-   // Prepare the action.
-   ServiceGetBusinessAction action = new ServiceGetBusinessAction(controller);
-
-   // Load the parameters for the action from the servlet request.
-   boolean inputsValid = action.populatePropertyTable(request);
-
-   boolean serviceExists = action.validateService();
-
-   if (!serviceExists)
-   {
-     int nodeId = Integer.parseInt((String)(action.getPropertyTable().get(ActionInputs.NODEID)));
-     UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<script language="javascript">
-  if (confirm("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("MSG_QUESTION_REMOVE_SERVICE_NODE"))%>"))
-    perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(ClearNavigatorNodeAction.getActionLink(nodeId)))%>";
-</script>
-<%
-   }
-   else
-   {
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-<%
-   }
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ServiceGetServiceInterfacesActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ServiceGetServiceInterfacesActionJSP.jsp
deleted file mode 100644
index 9cb5f9968..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ServiceGetServiceInterfacesActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<%
-   // Prepare the action.
-   ServiceGetServiceInterfacesAction action = new ServiceGetServiceInterfacesAction(controller);
-
-   // Load the parameters for the action from the servlet request.
-   boolean inputsValid = action.populatePropertyTable(request);
-
-   boolean serviceExists = action.validateService();
-
-   if (!serviceExists)
-   {
-     int nodeId = Integer.parseInt((String)(action.getPropertyTable().get(ActionInputs.NODEID)));
-     UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<script language="javascript">
-  if (confirm("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("MSG_QUESTION_REMOVE_SERVICE_NODE"))%>"))
-    perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(ClearNavigatorNodeAction.getActionLink(nodeId)))%>";
-</script>
-<%
-   }
-   else
-   {
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-<%
-   }
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ServiceInterfaceGetBusinessesActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ServiceInterfaceGetBusinessesActionJSP.jsp
deleted file mode 100644
index e5b287902..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ServiceInterfaceGetBusinessesActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<%
-   // Prepare the action.
-   ServiceInterfaceGetBusinessesAction action = new ServiceInterfaceGetBusinessesAction(controller);
-
-   // Load the parameters for the action from the servlet request.
-   boolean inputsValid = action.populatePropertyTable(request);
-
-   boolean siExists = action.validateServiceInterface();
-
-   if (!siExists)
-   {
-     int nodeId = Integer.parseInt((String)(action.getPropertyTable().get(ActionInputs.NODEID)));
-     UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<script language="javascript">
-  if (confirm("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("MSG_QUESTION_REMOVE_SI_NODE"))%>"))
-    perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(ClearNavigatorNodeAction.getActionLink(nodeId)))%>";
-</script>
-<%
-   }
-   else
-   {
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-<%
-   }
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ServiceInterfaceGetServicesActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ServiceInterfaceGetServicesActionJSP.jsp
deleted file mode 100644
index 12967b16c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ServiceInterfaceGetServicesActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<%
-   // Prepare the action.
-   ServiceInterfaceGetServicesAction action = new ServiceInterfaceGetServicesAction(controller);
-
-   // Load the parameters for the action from the servlet request.
-   boolean inputsValid = action.populatePropertyTable(request);
-
-   boolean siExists = action.validateServiceInterface();
-
-   if (!siExists)
-   {
-     int nodeId = Integer.parseInt((String)(action.getPropertyTable().get(ActionInputs.NODEID)));
-     UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<script language="javascript">
-  if (confirm("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("MSG_QUESTION_REMOVE_SI_NODE"))%>"))
-    perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(ClearNavigatorNodeAction.getActionLink(nodeId)))%>";
-</script>
-<%
-   }
-   else
-   {
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-<%
-   }
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ShowPublisherAssertionsActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ShowPublisherAssertionsActionJSP.jsp
deleted file mode 100644
index e46d18e24..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ShowPublisherAssertionsActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-   // Prepare the action.
-   ShowPublisherAssertionsAction action = new ShowPublisherAssertionsAction(controller);
-
-   // Load the parameters for the action from the servlet request.
-   boolean inputsValid = action.populatePropertyTable(request);
-
-   if (!action.isSubQueryInitiated())
-   {
-     if (inputsValid)
-     {
-       // Run the action and obtain the return code (fail/success).
-       boolean actionResult = action.execute();
-     }
-%>
-   <script language="javascript">
-     propertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/properties_content.jsp"))%>";
-     statusContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/status_content.jsp"))%>";
-   </script>
-<%
-   }
-   else
-   {
-%>
-<%@ include file="/uddi/actions/LaunchSubQueryAction.inc" %>
-<%
-   }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/SwitchPerspectiveFromUDDIActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/SwitchPerspectiveFromUDDIActionJSP.jsp
deleted file mode 100644
index 5ce374bba..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/SwitchPerspectiveFromUDDIActionJSP.jsp
+++ /dev/null
@@ -1,30 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-// Prepare the action
-SwitchPerspectiveFromUDDIAction action = new SwitchPerspectiveFromUDDIAction(controller);
-   
-// Load the parameters for the action from the servlet request.
-action.populatePropertyTable(request);
-   
-// Run the action and obtain the return code (fail/success).
-boolean actionResult = action.execute();
-   
-// Determine if the action was added to the history list.
-boolean isAddedToHistory = action.isAddedToHistory();
-%>
-<jsp:include page="/scripts/switchperspective.jsp" flush="true"/>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ToggleCategoryNodeActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ToggleCategoryNodeActionJSP.jsp
deleted file mode 100644
index 15753aef6..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ToggleCategoryNodeActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<%
-   String sessionId = request.getParameter(ActionInputs.SESSIONID);
-   HttpSession currentSession = (HttpSession)application.getAttribute(sessionId);
-   Controller controller = (Controller)currentSession.getAttribute("controller");
-%>   
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/cbpanes.jsp" flush="true"/>
-<%
-   // Prepare the action.
-   ToggleCategoryNodeAction action = new ToggleCategoryNodeAction(controller);
-
-   // Load the parameters for the action from the servlet request.
-   action.populatePropertyTable(request);
-
-   // Run the action and obtain the return code (fail/success).
-   boolean actionResult = action.execute(false);
-
-   String treeContentVar = action.getTreeContentVar();
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<script language="javascript">
-<%
-   if (treeContentVar != null)
-   {
-%>
-  if (isMicrosoftInternetExplorer())
-    <%=treeContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getTreeContentPage()))%>";
-  else
-    categoryBrowserWindow.location = "<%=response.encodeURL(controller.getPathWithContext(action.getTreeContainerPage()))%>";
-<%
-   }
-%>
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ToggleNavigatorNodeActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ToggleNavigatorNodeActionJSP.jsp
deleted file mode 100644
index adee74004..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ToggleNavigatorNodeActionJSP.jsp
+++ /dev/null
@@ -1,21 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-// Prepare the action.
-ToggleNavigatorNodeAction action = new ToggleNavigatorNodeAction(controller);
-
-// Load the parameters for the action from the servlet request.
-action.populatePropertyTable(request);
-
-// Run the action and obtain the return code (fail/success).
-boolean actionResult = action.execute();
-
-// Determine if the action was added to the history list.
-boolean isAddedToHistory = action.isAddedToHistory();
-%>
-<%@ include file="/actions/ToggleNodeAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/TransferSubQueryResultsActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/TransferSubQueryResultsActionJSP.jsp
deleted file mode 100644
index b6b28030c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/TransferSubQueryResultsActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-   TransferSubQueryResultsAction action = new TransferSubQueryResultsAction(controller);
-
-   if (request.getParameter(UDDIActionInputs.SHOW_RESULTS_TARGET) != null)
-     action.enableShowResultsTarget();
-   else
-     action.populatePropertyTable(request);
-
-   boolean actionResult = action.execute();
-   Node targetNode = action.getTargetNode();
-   String targetNodeAnchorName = targetNode.getAnchorName();
-%>
-<script language="javascript">
-  navigatorContent.selectNode('<%=targetNodeAnchorName%>','<%=response.encodeURL(controller.getPathWithContext(targetNode.getOpenImagePath()))%>');
-  navigatorContent.location.hash='#<%=targetNodeAnchorName%>';
-  propertiesContainer.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/properties_container.jsp"))%>";
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/TransferToAddCategoryDataActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/TransferToAddCategoryDataActionJSP.jsp
deleted file mode 100644
index 4bd6353aa..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/TransferToAddCategoryDataActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-<%
-   String sessionId = request.getParameter(ActionInputs.SESSIONID);
-   String categoryTModelKey = request.getParameter(UDDIActionInputs.CATEGORY_TMODEL_KEY);
-   HttpSession currentSession = (HttpSession)application.getAttribute(sessionId);
-   Controller controller = (Controller)currentSession.getAttribute("controller");
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-   NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
-   UDDIMainNode uddiMainNode = (UDDIMainNode)navigatorManager.getRootNode();
-   RegistryNode regNode = uddiMainNode.getRegistryNode(navigatorManager.getSelectedNode());
-   RegistryDetailsTool regDetailsTool = regNode.getRegDetailsTool();
-   regDetailsTool.flagRowError(UDDIActionInputs.USER_DEFINED_CATEGORIES,categoryTModelKey);
-   regNode.getCurrentToolManager().setSelectedToolId(regDetailsTool.getToolId());
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<script language="javascript">
-  perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(SelectNavigatorNodeAction.getActionLink(regNode.getNodeId(),false)))%>";
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UDDIAddToWSDLPerspectiveActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UDDIAddToWSDLPerspectiveActionJSP.jsp
deleted file mode 100644
index 6484df46a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UDDIAddToWSDLPerspectiveActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.actions.ShowPerspectiveAction,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.UDDIAddToWSDLPerspectiveAction"%>
-
-
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-// Prepare the action.
-UDDIAddToWSDLPerspectiveAction action = new UDDIAddToWSDLPerspectiveAction(controller);
-
-// Load the parameters for the action from the servlet request.
-boolean paramValid = action.populatePropertyTable(request);
-
-if (paramValid) {
-  // Run the action and obtain the return code (fail/success).
-  boolean actionResult = action.execute();
-  if (actionResult) {
-%>
-    <script language="javascript">
-      perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(ShowPerspectiveAction.getActionLink(ActionInputs.PERSPECTIVE_WSDL,false)))%>";
-    </script>
-<%
-  }
-  else {
-%>
-    <script language="javascript">
-      propertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/properties_content.jsp"))%>";
-      statusContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/status_content.jsp"))%>";
-    </script>
-<%
-  }
-}
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UDDIImportWSDLToFileSystemActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UDDIImportWSDLToFileSystemActionJSP.jsp
deleted file mode 100644
index 9103ff736..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UDDIImportWSDLToFileSystemActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.actions.*,
-                                                        java.io.*" %>
-
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-  // Prepare the action.
-  UDDIImportWSDLToFileSystemAction action = new UDDIImportWSDLToFileSystemAction(controller);
-%>
-<%@ include file="/actions/ImportToFileSystemAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UDDIImportWSDLToWorkbenchActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UDDIImportWSDLToWorkbenchActionJSP.jsp
deleted file mode 100644
index 245820b3b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UDDIImportWSDLToWorkbenchActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   UDDIImportWSDLToWorkbenchAction action = new UDDIImportWSDLToWorkbenchAction(controller);
-%>
-<%@ include file="/actions/ImportToWorkbenchAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UDDILaunchWebServiceWizardActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UDDILaunchWebServiceWizardActionJSP.jsp
deleted file mode 100644
index c331f6357..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UDDILaunchWebServiceWizardActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   UDDILaunchWebServiceWizardAction action = new UDDILaunchWebServiceWizardAction(controller);
-%>
-<%@ include file="/actions/LaunchWebServiceWizardAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UnpublishActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UnpublishActionJSP.jsp
deleted file mode 100644
index f0358e3cc..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UnpublishActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-   // Prepare the action.
-   UnpublishAction action = new UnpublishAction(controller);
-
-   // Load the parameters for the action from the servlet request.
-   boolean inputsValid = action.populatePropertyTable(request);
-
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateAction.inc b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateAction.inc
deleted file mode 100644
index 08f402a31..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateAction.inc
+++ /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
- *******************************************************************************/
-%>
-<%
-   if (!inputsValid)
-   {
-%>
-<script language="javascript">
-  propertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/properties_content.jsp"))%>";
-  statusContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/status_content.jsp"))%>";
-</script>
-<%
-   }
-   else
-   {
-     boolean refreshResult = action.refreshFromRegistry();
-     
-     if (!refreshResult)
-     {
-       session.setAttribute(UDDIActionInputs.PUBLISH_ACTION,action);
-%>
-<script language="javascript">
-  statusContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/status_content.jsp"))%>";
-  if (confirm("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("MSG_QUESTION_PUBLISH_ITEM"))%>"))
-    perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/actions/UpdateNewPublishActionJSP.jsp"))%>";
-  else
-    propertiesContent.requestSubmitted = false;
-</script>
-<%
-     }
-     else
-     {
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-<%
-     }
-   }
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateBusinessActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateBusinessActionJSP.jsp
deleted file mode 100644
index 0f47ab072..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateBusinessActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-   // Prepare the action.
-   UpdateBusinessAction action = new UpdateBusinessAction(controller);
-
-   // Load the parameters for the action from the servlet request.
-   boolean inputsValid = action.populatePropertyTable(request);
-%>
-<%@ include file="/uddi/actions/UpdateAction.inc" %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateNewPublishActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateNewPublishActionJSP.jsp
deleted file mode 100644
index 4fa57eff9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateNewPublishActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-   UpdateAction action = (UpdateAction)session.getAttribute(UDDIActionInputs.PUBLISH_ACTION);
-   session.removeAttribute(UDDIActionInputs.PUBLISH_ACTION);
-   boolean inputsValid = true;
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateRegistryActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateRegistryActionJSP.jsp
deleted file mode 100644
index 4f7ebbdbe..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateRegistryActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-   // Prepare the action.
-   UpdateRegistryAction action = new UpdateRegistryAction(controller);
-
-   // Load the parameters for the action from the servlet request.
-   boolean inputsValid = action.populatePropertyTable(request);
-%>
-<%@ include file="/uddi/actions/UpdateAction.inc" %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateServiceActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateServiceActionJSP.jsp
deleted file mode 100644
index 5514f4901..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateServiceActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-   // Prepare the action.
-   UpdateServiceAction action = new UpdateServiceAction(controller);
-
-   // Load the parameters for the action from the servlet request.
-   boolean inputsValid = action.populatePropertyTable(request);
-
-   if (!inputsValid)
-   {
-%>
-<script language="javascript">
-  propertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/properties_content.jsp"))%>";
-  statusContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/status_content.jsp"))%>";
-</script>
-<%
-   }
-   else
-   {
-     boolean refreshServiceResult = action.refreshFromRegistry();
-     boolean refreshBusinessResult = action.refreshBusinessFromRegistry();
-     if (!refreshServiceResult)
-     {
-       session.setAttribute(UDDIActionInputs.PUBLISH_ACTION,action);
-       if (!refreshBusinessResult)
-       {
-%>
-<script language="javascript">
-  if (confirm("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("MSG_QUESTION_SERVICE_PUBLISH_BUSINESS"))%>"))
-    perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/actions/UpdateServiceNewPublishBusinessActionJSP.jsp"))%>";
-  else
-    propertiesContent.requestSubmitted = false;
-</script>
-<%
-       }
-       else
-       {
-%>
-<script language="javascript">
-  if (confirm("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("MSG_QUESTION_PUBLISH_ITEM"))%>"))
-    perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/actions/UpdateNewPublishActionJSP.jsp"))%>";
-  else
-    propertiesContent.requestSubmitted = false;
-</script>
-<%
-       }
-     }
-     else
-     {
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-<%
-     }
-   }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateServiceInterfaceActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateServiceInterfaceActionJSP.jsp
deleted file mode 100644
index 4618bc805..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateServiceInterfaceActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-   // Prepare the action.
-   UpdateServiceInterfaceAction action = new UpdateServiceInterfaceAction(controller);
-
-   // Load the parameters for the action from the servlet request.
-   boolean inputsValid = action.populatePropertyTable(request);
-%>
-<%@ include file="/uddi/actions/UpdateAction.inc" %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateServiceNewPublishBusinessActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateServiceNewPublishBusinessActionJSP.jsp
deleted file mode 100644
index cad4e1d95..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateServiceNewPublishBusinessActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-   UpdateServiceAction action = (UpdateServiceAction)session.getAttribute(UDDIActionInputs.PUBLISH_ACTION);
-   session.removeAttribute(UDDIActionInputs.PUBLISH_ACTION);
-
-   RegPublishTool regPublishTool = action.setupRegPublishTool();
-%>
-<script language="javascript">
-  perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(regPublishTool.getSelectToolActionHref(false)))%>";
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions_container.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions_container.jsp
deleted file mode 100644
index c11ac2730..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions_container.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>   
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=uddiPerspective.getMessage("FRAME_TITLE_ACTIONS_CONTAINER")%></title>
-</head>
-<frameset rows="<%=uddiPerspective.getActionsContainerFramesetRows()%>" bgcolor="#ECE9D8">
-  <frame name="<%=UDDIFrameNames.PROPERTIES_CONTAINER%>" title="<%=uddiPerspective.getMessage("FRAME_TITLE_PROPERTIES_CONTAINER")%>" src="<%=response.encodeURL(controller.getPathWithContext("uddi/properties_container.jsp"))%>" scrolling="no" frameborder=1 marginwidth=0 marginheight=0>
-  <frame name="<%=UDDIFrameNames.STATUS_CONTAINER%>" title="<%=uddiPerspective.getMessage("FRAME_TITLE_STATUS_CONTAINER")%>" src="<%=response.encodeURL(controller.getPathWithContext("uddi/status_container.jsp"))%>" scrolling="no" frameborder=1 marginwidth=0 marginheight=0>
-</frameset>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/category_browser.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/category_browser.jsp
deleted file mode 100644
index 45637778e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/category_browser.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<%
-   String sessionId = request.getParameter(ActionInputs.SESSIONID);
-   String categoryTModelKey = request.getParameter(UDDIActionInputs.CATEGORY_TMODEL_KEY);
-   HttpSession currentSession = (HttpSession)application.getAttribute(sessionId);
-   Controller controller = (Controller)currentSession.getAttribute("controller");
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-   uddiPerspective.setCategoryTModelKey(categoryTModelKey);
-   
-   StringBuffer toolbarLink = new StringBuffer("uddi/category_toolbar.jsp?");
-   toolbarLink.append(ActionInputs.SESSIONID).append('=').append(sessionId);
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=uddiPerspective.getMessage("TITLE_CATEGORY_BROWSER")%></title>
-</head>
-<frameset rows="0,33,*" border=0 bgcolor="#ECE9D8">
-  <frame name="<%=UDDIFrameNames.CATEGORIES_WORKAREA%>" title="<%=uddiPerspective.getMessage("FRAME_TITLE_CATEGORIES_WORKAREA")%>" frameborder=0 noresize>
-  <frame name="<%=UDDIFrameNames.CATEGORIES_TOOLBAR%>" title="<%=uddiPerspective.getMessage("FRAME_TITLE_CATEGORIES_TOOLBAR")%>" src="<%=response.encodeURL(controller.getPathWithContext(toolbarLink.toString()))%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-  <frame name="<%=UDDIFrameNames.CATEGORIES_CONTENT%>" title="<%=uddiPerspective.getMessage("FRAME_TITLE_CATEGORIES_CONTENT")%>" src="<%=response.encodeURL(controller.getPathWithContext(OpenCategoryBrowserAction.getCategoryContentPage(sessionId,categoryTModelKey)))%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-</frameset>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/category_content.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/category_content.jsp
deleted file mode 100644
index 076b7cff1..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/category_content.jsp
+++ /dev/null
@@ -1,113 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*" %>
-                                                        
-<jsp:useBean id="commonCategoryModels" class="java.util.Hashtable" scope="application"/>
-<%
-   String sessionId = request.getParameter(ActionInputs.SESSIONID);
-   String categoryTModelKey = request.getParameter(UDDIActionInputs.CATEGORY_TMODEL_KEY);
-   HttpSession currentSession = (HttpSession)application.getAttribute(sessionId);
-   Controller controller = (Controller)currentSession.getAttribute("controller");
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=uddiPerspective.getMessage("FRAME_TITLE_CATEGORIES_CONTENT")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/treeview.css"))%>">
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-  <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-  </script>
-  <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/treeview.js"))%>">
-  </script>
-<script language="javascript">
-  function transferToAddCategoryData()
-  {
-    top.opener.top.frames["<%=FrameNames.PERSPECTIVE_WORKAREA%>"].location = "<%=response.encodeURL(controller.getPathWithContext(TransferToAddCategoryDataAction.getActionLink(sessionId,categoryTModelKey)))%>";
-  }  
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<%   
-   // Check if the category is a common category.
-   CategoryModel categoryModel = (CategoryModel)commonCategoryModels.get(categoryTModelKey);
-   if (categoryModel == null)
-   {
-     // The category is user-defined.     
-     NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
-     UDDIMainNode uddiMainNode = (UDDIMainNode)navigatorManager.getRootNode();
-     RegistryNode regNode = uddiMainNode.getRegistryNode(navigatorManager.getSelectedNode());
-     RegistryElement regElement = (RegistryElement)regNode.getTreeElement();   
-     categoryModel = (CategoryModel)regElement.getUserDefinedCategory(categoryTModelKey);
-   }
-   byte rc = CategoryModel.OPERATION_SUCCESSFUL;
-   if (!categoryModel.isDataLoaded())
-   {
-     synchronized(categoryModel)
-     {
-       if (!categoryModel.isDataLoaded())
-         rc = categoryModel.loadFromDefaultDataFile();
-     }
-   }
-   if (rc != CategoryModel.OPERATION_SUCCESSFUL)
-   {
-%>
-<div id="contentborder">
-  <table>
-    <tr>
-      <td>
-        <%=uddiPerspective.getMessage("MSG_INFO_NO_CATEGORY_DATA",categoryModel.getDisplayName())%>
-      </td>
-    </tr>
-      <td height=10 valign="bottom">&nbsp;</td>
-    </tr>
-    <tr>
-      <td>
-        <%=uddiPerspective.getMessage("FORM_LABEL_ADD_CATEGORY_DATA","javascript:transferToAddCategoryData()")%>
-      </td>
-    </tr>
-  </table>
-</div>
-<%   
-   }
-   else
-   {
-     NodeManager categoryManager = uddiPerspective.getCategoryManager(categoryModel);
-     String selectedAnchorName = "";
-     int focusedNodeId = categoryManager.getFocusedNodeId();
-     String focusedAnchorName = String.valueOf(focusedNodeId);
-     Node selectedNode = categoryManager.getSelectedNode();
-     if (selectedNode != null)
-     {
-       selectedAnchorName = selectedNode.getAnchorName();
-       if (focusedNodeId == selectedNode.getNodeId())
-         focusedAnchorName = selectedAnchorName;
-     }
-%>
-<div id="treecontentborder">
-<%=categoryManager.renderTreeView(response)%>
-</div>
-<script language="javascript">
-  self.location.hash="#<%=focusedAnchorName%>"
-  setSelectedAnchorName("<%=selectedAnchorName%>");
-</script>
-<%
-   }
-%>   
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/category_toolbar.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/category_toolbar.jsp
deleted file mode 100644
index a5e6b49db..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/category_toolbar.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<%
-   String sessionId = request.getParameter(ActionInputs.SESSIONID);
-   HttpSession currentSession = (HttpSession)application.getAttribute(sessionId);
-   Controller controller = (Controller)currentSession.getAttribute("controller");
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=uddiPerspective.getMessage("FRAME_TITLE_CATEGORIES_TOOLBAR")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/toolbar.css"))%>">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="toolbarbodymargin" onUnload="top.opener.categoryWindowClosed=true">
-<div id="toolbarborder">
-  <div id="toolbar">
-    <table width="100%" height=25 cellpadding=0 cellspacing=0 border=0>
-      <tr>
-        <td valign="middle" align="center" width=25 height=25><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("uddi/images/category.gif"))%>" width=16 height=16></td>
-        <td valign="middle" align="left" width="*" height=25 nowrap class="text"><%=uddiPerspective.getMessage("ALT_CATEGORIES")%></td>
-      </tr>
-    </table>
-  </div>
-</div>
-<script language="javascript">
-  top.opener.categoryWindowClosed=false;
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/data/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/data/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/data/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/data/geo-data.txt b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/data/geo-data.txt
deleted file mode 100644
index f978abdaa..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/data/geo-data.txt
+++ /dev/null
@@ -1,1383 +0,0 @@
-geo#--#World#--
-geo#AE#United Arab Emirates#--
-geo#AF#Afghanistan#--
-geo#AG#Antigua And Barbuda#--
-geo#AI#Anguilla#--
-geo#AL#Albania#--
-geo#AM#Armenia#--
-geo#AN#Netherlands Antilles#--
-geo#AO#Angola#--
-geo#AQ#Antarctica#--
-geo#AR#Argentina#--
-geo#AR-A#Salta#AR
-geo#AR-B#Buenos Aires#AR
-geo#AR-C#Distrito Federal#AR
-geo#AR-D#San Luis#AR
-geo#AR-E#Entre Rios#AR
-geo#AR-F#La Rioja#AR
-geo#AR-G#Santiago Del Estero#AR
-geo#AR-H#Chaco#AR
-geo#AR-J#San Juan#AR
-geo#AR-K#Catamarca#AR
-geo#AR-L#La Pampa#AR
-geo#AR-M#Mendoza#AR
-geo#AR-N#Misiones#AR
-geo#AR-P#Formosa#AR
-geo#AR-Q#Neuquen#AR
-geo#AR-R#Rio Negro#AR
-geo#AR-S#Santa Fe#AR
-geo#AR-T#Tucuman#AR
-geo#AR-U#Chubut#AR
-geo#AR-V#Tierra Del Fuego#AR
-geo#AR-W#Corrientes#AR
-geo#AR-X#Cordoba#AR
-geo#AR-Y#Jujuy#AR
-geo#AR-Z#Santa Cruz#AR
-geo#AS#American Samoa#--
-geo#AT#Austria#--
-geo#AU#Australia#--
-geo#AU-CT#Australian Capital Territory#AU
-geo#AU-NS#New South Wales#AU
-geo#AU-NT#Northern Territory#AU
-geo#AU-QL#Queensland#AU
-geo#AU-SA#South Australia#AU
-geo#AU-TS#Tasmania#AU
-geo#AU-VI#Victoria#AU
-geo#AU-WA#Western Australia#AU
-geo#AW#Aruba#--
-geo#AZ#Azerbaijan#--
-geo#BA#Bosnia-Hercegovina#--
-geo#BB#Barbados#--
-geo#BD#Bangladesh#--
-geo#BE#Belgium#--
-geo#BF#Burkina Faso#--
-geo#BG#Bulgaria#--
-geo#BH#Bahrain#--
-geo#BI#Burundi#--
-geo#BJ#Benin#--
-geo#BM#Bermuda#--
-geo#BN#Brunei Darussalam#--
-geo#BO#Bolivia#--
-geo#BR#Brazil#--
-geo#BR-AC#Acre#BR
-geo#BR-AL#Alagoas#BR
-geo#BR-AM#Amazonas#BR
-geo#BR-AP#Amapa#BR
-geo#BR-BA#Bahia#BR
-geo#BR-CE#Ceara#BR
-geo#BR-DF#Distrito Federal#BR
-geo#BR-ES#Espirito Santo#BR
-geo#BR-GO#Goias#BR
-geo#BR-MA#Maranhao#BR
-geo#BR-MG#Minas Gerais#BR
-geo#BR-MS#Mato Grosso Do Sul#BR
-geo#BR-MT#Mato Grosso#BR
-geo#BR-PA#Para#BR
-geo#BR-PB#Paraiba#BR
-geo#BR-PE#Pernambuco#BR
-geo#BR-PI#Piaui#BR
-geo#BR-PR#Parana#BR
-geo#BR-RJ#Rio De Janeiro#BR
-geo#BR-RN#Rio Grande Do Norte#BR
-geo#BR-RO#Rondonia#BR
-geo#BR-RR#Roraima#BR
-geo#BR-RS#Rio Grande Do Sul#BR
-geo#BR-SC#Santa Catarina#BR
-geo#BR-SE#Sergipe#BR
-geo#BR-SP#Sao Paulo#BR
-geo#BR-TO#Tocantina#BR
-geo#BS#Bahamas#--
-geo#BT#Bhutan#--
-geo#BU#Burma (See MM Myanmar)#--
-geo#BW#Botswana#--
-geo#BY#Belarus#--
-geo#BY-BR#Brestskaya voblasts'#BY
-geo#BY-HO#Homyel'skaya voblasts'#BY
-geo#BY-HR#Hrodzenskaya voblasts'#BY
-geo#BY-MA#Mahilyowskaya voblasts'#BY
-geo#BY-MI#Minskaya voblasts'#BY
-geo#BY-VI#Vitsyebskaya voblasts'#BY
-geo#BZ#Belize#--
-geo#CA#Canada#--
-geo#CA-AB#Alberta#CA
-geo#CA-BC#British Columbia#CA
-geo#CA-MB#Manitoba#CA
-geo#CA-NB#New Brunswick#CA
-geo#CA-NF#Newfoundland#CA
-geo#CA-NS#Nova Scotia#CA
-geo#CA-NT#Northwest Territories#CA
-geo#CA-NU#Nunavut#CA
-geo#CA-ON#Ontario#CA
-geo#CA-PE#Prince Edward Island#CA
-geo#CA-QC#Quebec#CA
-geo#CA-SK#Saskatchewan#CA
-geo#CA-YT#Yukon Territory#CA
-geo#CC#Cocos (Keeling) Islands#--
-geo#CD#"Congo, Democratic Republic of"#--
-geo#CF#Central African Republic#--
-geo#CG#Congo#--
-geo#CH#Switzerland#--
-geo#CH-AG#Aargau#CH
-geo#CH-AI#Appenzell Inner-Rhoden#CH
-geo#CH-AR#Appenzell Ausser-Rhoden#CH
-geo#CH-BE#Bern#CH
-geo#CH-BL#Basel-Landschaft#CH
-geo#CH-BS#Basel-Stadt#CH
-geo#CH-FR#Fribourg#CH
-geo#CH-GE#Genève#CH
-geo#CH-GL#Glarus#CH
-geo#CH-GR#Graubünden#CH
-geo#CH-JU#Jura#CH
-geo#CH-LU#Luzern#CH
-geo#CH-NE#Neuchatel#CH
-geo#CH-NW#Nidwalden#CH
-geo#CH-OW#Obwalden#CH
-geo#CH-SG#St Gallen#CH
-geo#CH-SH#Schaffhausen#CH
-geo#CH-SO#Solothurn#CH
-geo#CH-SZ#Schwyz#CH
-geo#CH-TG#Thurgau#CH
-geo#CH-TI#Ticino#CH
-geo#CH-UR#Uri#CH
-geo#CH-VD#Vaud#CH
-geo#CH-VS#Valais#CH
-geo#CH-ZG#Zug#CH
-geo#CH-ZH#Zürich#CH
-geo#CI#Cote D'Ivoire#--
-geo#CK#Cook Islands#--
-geo#CL#Chile#--
-geo#CM#Cameroon#--
-geo#CN#China#--
-geo#CN-11#Beijing#CN
-geo#CN-12#Tianjin#CN
-geo#CN-13#Hebei#CN
-geo#CN-14#Shanxi#CN
-geo#CN-15#Nei Mongol#CN
-geo#CN-21#Liaoning#CN
-geo#CN-22#Jilin#CN
-geo#CN-23#Heilongjiang#CN
-geo#CN-31#Shanghai#CN
-geo#CN-32#Jiangsu#CN
-geo#CN-33#Zhejiang#CN
-geo#CN-34#Anhui#CN
-geo#CN-35#Fujian#CN
-geo#CN-36#Jiangxi#CN
-geo#CN-37#Shandong#CN
-geo#CN-41#Henan#CN
-geo#CN-42#Hubei#CN
-geo#CN-43#Hunan#CN
-geo#CN-44#Guangdong#CN
-geo#CN-45#Guangxi#CN
-geo#CN-46#Hainan#CN
-geo#CN-51#Sichuan#CN
-geo#CN-52#Guizhou#CN
-geo#CN-53#Yunnan#CN
-geo#CN-54#Xizang#CN
-geo#CN-61#Shaanxi#CN
-geo#CN-62#Gansu#CN
-geo#CN-63#Qinghai#CN
-geo#CN-64#Ningxia#CN
-geo#CN-65#Xinjiang#CN
-geo#CN-71#Taiwan#CN
-geo#CN-91#Xianggang (Hong Kong)#CN
-geo#CN-92#Aomen (Macau)#CN
-geo#CO#Colombia#--
-geo#CR#Costa Rica#--
-geo#CS#Former Czechoslovakia#--
-geo#CU#Cuba#--
-geo#CV#Cape Verde#--
-geo#CX#Christmas Islands#--
-geo#CY#Cyprus#--
-geo#CZ#Czech Republic#--
-geo#DE#"Germany, Federal Republic of"#--
-geo#DE-BE#Berlin#DE
-geo#DE-BR#Brandenburg#DE
-geo#DE-BW#Baden-Württemberg#DE
-geo#DE-BY#Bayern#DE
-geo#DE-HB#Bremen (Hansestadt)#DE
-geo#DE-HE#Hessen#DE
-geo#DE-HH#Hamburg (Hansestadt)#DE
-geo#DE-MV#Mecklenburg-Vorpommern#DE
-geo#DE-NI#Niedersachsen#DE
-geo#DE-NW#Nordrhein-Westfalen#DE
-geo#DE-RP#Rheinland-Pfalz#DE
-geo#DE-SH#Schleswig-Holstein#DE
-geo#DE-SL#Saarland#DE
-geo#DE-SN#Sachsen#DE
-geo#DE-ST#Sachsen-Anhalt#DE
-geo#DE-TH#Thüringen#DE
-geo#DJ#Djibouti#--
-geo#DK#Denmark#--
-geo#DM#Dominica#--
-geo#DO#Dominican Republic#--
-geo#DO-02#Azua#DO
-geo#DO-03#Bahoruco#DO
-geo#DO-04#Barahona#DO
-geo#DO-05#Dajabón#DO
-geo#DO-06#Duarte#DO
-geo#DO-08#El Seybo#DO
-geo#DO-09#Espaillat#DO
-geo#DO-30#Hato Mayor#DO
-geo#DO-10#Independencia#DO
-geo#DO-11#La Altagracia#DO
-geo#DO-07#La Estrelleta#DO
-geo#DO-12#La Romana#DO
-geo#DO-13#La Vega#DO
-geo#DO-14#María Trinidad Sánchez#DO
-geo#DO-28#Monsenor Nouel#DO
-geo#DO-15#Monte Cristi#DO
-geo#DO-29#Monte Plata#DO
-geo#DO-16#Pedernales#DO
-geo#DO-17#Peravia#DO
-geo#DO-18#Puerto Plata#DO
-geo#DO-19#Solcedo#DO
-geo#DO-20#Samaná#DO
-geo#DO-21#San Cristóbal#DO
-geo#DO-22#San Juan#DO
-geo#DO-23#San Pedro de Macorís#DO
-geo#DO-24#Sánchez Ramírez#DO
-geo#DO-25#Santiago#DO
-geo#DO-26#Santiago Rodríguez#DO
-geo#DO-27#Valverde#DO
-geo#DZ#Algeria#--
-geo#EC#Ecuador#--
-geo#EE#Estonia#--
-geo#EG#Egypt#--
-geo#EH#Western Sahara#--
-geo#ER#Eritrea#--
-geo#ER-AN#Anseba#ER
-geo#ER-DU#Debub#ER
-geo#ER-DK#Debubawi Keyih Bahri [Debub-Keih-Bahri]#ER
-geo#ER-GB#Gash-Barka#ER
-geo#ER-MA#Maakel [Maekel]#ER
-geo#ER-SK#Semenawi Keyih Bahri [Semien-Keih-Bahri]#ER
-geo#ES#Spain#--
-geo#ES-AN#Andalucía#ES
-geo#ES-AL#Almería#ES-AN
-geo#ES-CA#Cádiz#ES-AN
-geo#ES-CO#Córdoba#ES-AN
-geo#ES-GR#Granada#ES-AN
-geo#ES-H#Huelva#ES-AN
-geo#ES-J#Jaén#ES-AN
-geo#ES-MA#Málaga#ES-AN
-geo#ES-SE#Sevilla#ES-AN
-geo#ES-AR#Aragón#ES
-geo#ES-HU#Huesca#ES-AR
-geo#ES-TE#Teruel#ES-AR
-geo#ES-Z#Zaragoza#ES-AR
-geo#ES-O#"Asturias, Principado de"#ES
-geo#ES-CN#Canarias#ES
-geo#ES-GC#Las Palmas#ES-CN
-geo#ES-TF#Santa Cruz de Tenerife#ES-CN
-geo#ES-S#Cantabria#ES
-geo#ES-CM#Castilla-La Mancha#ES
-geo#ES-AB#Albacete#ES-CM
-geo#ES-CR#Cuidad Real#ES-CM
-geo#ES-CU#Cuenca#ES-CM
-geo#ES-GU#Guadalajara#ES-CM
-geo#ES-TO#Toledo#ES-CM
-geo#ES-CL#Castilla y León#ES
-geo#ES-AV#Ávila#ES-CL
-geo#ES-BU#Burgos#ES-CL
-geo#ES-LE#León#ES-CL
-geo#ES-P#Palencia#ES-CL
-geo#ES-SA#Salamanca#ES-CL
-geo#ES-SG#Segovia#ES-CL
-geo#ES-SO#Soria#ES-CL
-geo#ES-VA#Valladolid#ES-CL
-geo#ES-ZA#Zamora#ES-CL
-geo#ES-CT#Cataluna#ES
-geo#ES-B#Barcelona#ES-CT
-geo#ES-GE#Girona [Gerona]#ES-CT
-geo#ES-L#Lleida [Léruda]#ES-CT
-geo#ES-T#Tarragona#ES-CT
-geo#ES-EX#Extremadura#ES
-geo#ES-BA#Badajoz#ES-EX
-geo#ES-CC#Cáceres#ES-EX
-geo#ES-GA#Galicia#ES
-geo#ES-C#La Coruna#ES-GA
-geo#ES-LU#Lugo#ES-GA
-geo#ES-OR#Orense#ES-GA
-geo#ES-PO#Pontevedra#ES-GA
-geo#ES-PM#Islas Baleares#ES
-geo#ES-LO#La Rioja#ES
-geo#ES-M#"Madrid, Comunidad de"#ES
-geo#ES-MU#"Murcia, Región de"#ES
-geo#ES-NA#"Navarra, Comunidad Foral de"#ES
-geo#ES-PV#País Vasci#ES
-geo#ES-VI#Álava#ES-PV
-geo#ES-SS#Guipúzcoa#ES-PV
-geo#ES-BI#Vizcaya#ES-PV
-geo#ES-VC#"Valenciana, Comunidad"#ES
-geo#ES-A#Alicante#ES-VC
-geo#ES-CS#Castellón#ES-VC
-geo#ES-V#Valencia#ES-VC
-geo#ES-CE#Ceuta#ES
-geo#ES-ML#Melilla#ES
-geo#ET#Ethiopia#--
-geo#FI#Finland#--
-geo#FI-AL#Ahvenanmaan Maakunta (Fi) Ålands Län (Sv)#FI
-geo#FI-ES#Etelä-Suomen Lääni (Fi) Södra Finlands Län (Sv)#FI
-geo#FI-IS#Itä-Suomen Lääni (Fi) Östra Finlands Län (Sv)#FI
-geo#FI-LL#Lapin Lääni (Fi) Laplands Län (Sv)#FI
-geo#FI-LS#Länsi-Suomen Lääni (Fi) Västra Finlands Län (Sv)#FI
-geo#FI-OL#Oulun Lääni (Fi) Uleåborgs Län (Sv)#FI
-geo#FJ#Fiji#--
-geo#FK#Falkland Islands (Malvinas)#--
-geo#FM#Federated States Of Micronesia#--
-geo#FO#Faeroe Islands#--
-geo#FR#France#--
-geo#FR-01#Ain#FR-V
-geo#FR-02#Aisne#FR-S
-geo#FR-03#Allier#FR-C
-geo#FR-04#Alpes-De-Haute-Provence#FR-U
-geo#FR-05#Hautes-Alpes#FR-U
-geo#FR-06#Alpes-Maritimes#FR-U
-geo#FR-07#Ardèche#FR-V
-geo#FR-08#Ardennes#FR-G
-geo#FR-09#Ariège#FR-N
-geo#FR-10#Aube#FR-G
-geo#FR-11#Aude#FR-K
-geo#FR-12#Aveyron#FR-N
-geo#FR-13#Bouches-Du-Rhône#FR-U
-geo#FR-14#Calvados#FR-P
-geo#FR-15#Cantal#FR-C
-geo#FR-16#Charente#FR-T
-geo#FR-17#Charente-Maritime#FR-T
-geo#FR-18#Cher#FR-F
-geo#FR-19#Corrèze#FR-L
-geo#FR-21#Côte-D'Or#FR-D
-geo#FR-22#Côtes-D'Armor#FR-E
-geo#FR-23#Creuse#FR-L
-geo#FR-24#Dordogne#FR-B
-geo#FR-25#Doubs#FR-I
-geo#FR-26#Drôme#FR-V
-geo#FR-27#Eure#FR-Q
-geo#FR-28#Eure-Et-Loir#FR-F
-geo#FR-29#Finistère#FR-E
-geo#FR-2A#Corse-Du-Sud#FR-H
-geo#FR-2B#Haute-Corse#FR-H
-geo#FR-30#Gard#FR-K
-geo#FR-31#Haute-Garonne#FR-N
-geo#FR-32#Gers#FR-N
-geo#FR-33#Gironde#FR-B
-geo#FR-34#Hérault#FR-K
-geo#FR-35#Ille-Et-Vilaine#FR-E
-geo#FR-36#Indre#FR-F
-geo#FR-37#Indre-Et-Loire#FR-F
-geo#FR-38#Isère#FR-V
-geo#FR-39#Jura#FR-I
-geo#FR-40#Landes#FR-B
-geo#FR-41#Loir-Et-Cher#FR-F
-geo#FR-42#Loire#FR-V
-geo#FR-43#Haute-Loire#FR-C
-geo#FR-44#Loire-Atlantique#FR-R
-geo#FR-45#Loiret#FR-F
-geo#FR-46#Lot#FR-N
-geo#FR-47#Lot-Et-Garonne#FR-B
-geo#FR-48#Lozère#FR-K
-geo#FR-49#Maine-Et-Loire#FR-R
-geo#FR-50#Manche#FR-P
-geo#FR-51#Marne#FR-G
-geo#FR-52#Haute-Marne#FR-G
-geo#FR-53#Mayenne#FR-R
-geo#FR-54#Meurthe-Et-Moselle#FR-M
-geo#FR-55#Meuse#FR-M
-geo#FR-56#Morbihan#FR-E
-geo#FR-57#Moselle#FR-M
-geo#FR-58#Nièvre#FR-D
-geo#FR-59#Nord#FR-O
-geo#FR-60#Oise#FR-S
-geo#FR-61#Orne#FR-P
-geo#FR-62#Pas-De-Calais#FR-O
-geo#FR-63#Puy-De-Dôme#FR-C
-geo#FR-64#Pyrénées-Atlantiques#FR-B
-geo#FR-65#Hautes-Pyrénées#FR-N
-geo#FR-66#Pyrénées-Orientales#FR-K
-geo#FR-67#Bas-Rhin#FR-A
-geo#FR-68#Haut-Rhin#FR-A
-geo#FR-69#Rhône#FR-V
-geo#FR-70#Haute-Saône#FR-I
-geo#FR-71#Saône-Et-Loire#FR-D
-geo#FR-72#Sarthe#FR-R
-geo#FR-73#Savoie#FR-V
-geo#FR-74#Haute-Savoie#FR-V
-geo#FR-75#Paris#FR-J
-geo#FR-76#Seine-Maritime#FR-Q
-geo#FR-77#Seine-Et-Marne#FR-J
-geo#FR-78#Yvelines#FR-J
-geo#FR-79#Deux-Sèvres#FR-B
-geo#FR-80#Somme#FR-S
-geo#FR-81#Tarn#FR-N
-geo#FR-82#Tarn-Et-Garonne#FR-N
-geo#FR-83#Var#FR-U
-geo#FR-84#Vaucluse#FR-U
-geo#FR-85#Vendée#FR-R
-geo#FR-86#Vienne#FR-T
-geo#FR-87#Haute-Vienne#FR-L
-geo#FR-88#Vosges#FR-M
-geo#FR-89#Yonne#FR-D
-geo#FR-90#Territoire De Belfort#FR-I
-geo#FR-91#Essonne#FR-J
-geo#FR-92#Hauts-De-Seine#FR-J
-geo#FR-93#Seine-Saint-Denis#FR-J
-geo#FR-94#Val-De-Marne#FR-J
-geo#FR-95#Val-D'Oise#FR-J
-geo#FR-A#Alsace#FR
-geo#FR-B#Aquitaine#FR
-geo#FR-C#Auvergne#FR
-geo#FR-D#Bourgogne#FR
-geo#FR-E#Bretagne#FR
-geo#FR-F#Centre#FR
-geo#FR-G#Champagne-Ardenne#FR
-geo#FR-H#Corse#FR
-geo#FR-I#Franche-Comté#FR
-geo#FR-J#Ile-De-France#FR
-geo#FR-K#Languedoc-Roussillon#FR
-geo#FR-L#Limousin#FR
-geo#FR-M#Lorraine#FR
-geo#FR-N#Midi-Pyrénées#FR
-geo#FR-O#Nord-Pas-De-Calais#FR
-geo#FR-P#Basse-Normandie#FR
-geo#FR-Q#Haute-Normandie#FR
-geo#FR-R#Pays De La Loire#FR
-geo#FR-S#Picardie#FR
-geo#FR-T#Poitou-Charentes#FR
-geo#FR-U#Provence-Alpes-Côte D'Azur#FR
-geo#FR-V#Rhône-Alpes#FR
-geo#GA#Gabon#--
-geo#GB#United Kingdom#--
-geo#GB-ANT#Antrim#GB-NIR
-geo#GB-ARD#Ards#GB-NIR
-geo#GB-ARM#Armagh#GB-NIR
-geo#GB-AVN#Avon#GB-ENG
-geo#GB-BDF#Bedfordshire#GB-ENG
-geo#GB-BFS#Belfast#GB-NIR
-geo#GB-BKM#Buckinghamshire#GB-ENG
-geo#GB-BLA#Ballymena#GB-NIR
-geo#GB-BLY#Ballymoney#GB-NIR
-geo#GB-BNB#Banbridge#GB-NIR
-geo#GB-BOR#Borders Region#GB-SCT
-geo#GB-BRK#Berkshire#GB-ENG
-geo#GB-CAM#Cambridgeshire#GB-ENG
-geo#GB-CEN#Central Region#GB-SCT
-geo#GB-CGV#Craigavon#GB-NIR
-geo#GB-CHA#Channel Islands#GB
-geo#GB-CHS#Cheshire#GB-ENG
-geo#GB-CKF#Carrickfergus#GB-NIR
-geo#GB-CKT#Cookstown#GB-NIR
-geo#GB-CLR#Coleraine#GB-NIR
-geo#GB-CLV#Cleveland#GB-ENG
-geo#GB-CMA#Cumbria#GB-ENG
-geo#GB-CON#Cornwall#GB-ENG
-geo#GB-CSR#Castlereagh#GB-NIR
-geo#GB-CWD#Clwyd#GB-WLS
-geo#GB-DBY#Derbyshire#GB-ENG
-geo#GB-DFD#Dyfed#GB-WLS
-geo#GB-DGN#Dungannon#GB-NIR
-geo#GB-DGY#Dumfries & Galloway Region#GB-SCT
-geo#GB-DOR#Dorset#GB-ENG
-geo#GB-DOW#Down#GB-NIR
-geo#GB-DRY#Derry#GB-NIR
-geo#GB-DUR#Durham#GB-ENG
-geo#GB-DVV#Devon#GB-ENG
-geo#GB-ENG#England#GB
-geo#GB-ESS#Essex#GB-ENG
-geo#GB-ESX#East Sussex#GB-ENG
-geo#GB-FER#Fermanagh#GB-NIR
-geo#GB-FIF#Fife Region#GB-SCT
-geo#GB-GLS#Gloucestershire#GB-ENG
-geo#GB-GMP#Grampian Region#GB-SCT
-geo#GB-GNT#Gwent#GB-WLS
-geo#GB-GSY#Guernsey#GB-CHA
-geo#GB-GTL#Greater London#GB-ENG
-geo#GB-GTM#Greater Manchester#GB-ENG
-geo#GB-GWN#Gwynedd#GB-WLS
-geo#GB-HAM#Hampshire#GB-ENG
-geo#GB-HLD#Highland Region#GB-SCT
-geo#GB-HRT#Hertfordshire#GB-ENG
-geo#GB-HUM#Humberside#GB-ENG
-geo#GB-HWR#Hereford And Worcester#GB-ENG
-geo#GB-IOM#Isle Of Man#GB
-geo#GB-IOS#Isles Of Scilly#GB-ENG
-geo#GB-IOW#Isle Of Wight#GB-ENG
-geo#GB-JSY#Jersey#GB-CHA
-geo#GB-KEN#Kent#GB-ENG
-geo#GB-LAN#Lancashire#GB-ENG
-geo#GB-LEC#Leicestershire#GB-ENG
-geo#GB-LIN#Lincolnshire#GB-ENG
-geo#GB-LMV#Limavady#GB-NIR
-geo#GB-LRN#Larne#GB-NIR
-geo#GB-LSB#Lisburn#GB-NIR
-geo#GB-LTN#Lothian Region#GB-SCT
-geo#GB-MFT#Magherafelt#GB-NIR
-geo#GB-MGM#Mid Glamorgan#GB-WLS
-geo#GB-MSY#Merseyside#GB-ENG
-geo#GB-MYL#Moyle#GB-NIR
-geo#GB-NBL#Northumberland#GB-ENG
-geo#GB-NDN#North Down#GB-NIR
-geo#GB-NFK#Norfolk#GB-ENG
-geo#GB-NIR#Northern Ireland#GB
-geo#GB-NTA#Newtonabbey#GB-NIR
-geo#GB-NTH#Northamptonshire#GB-ENG
-geo#GB-NTT#Nottinghamshire#GB-ENG
-geo#GB-NYK#North Yorkshire#GB-ENG
-geo#GB-NYM#Newry And Mourne#GB-NIR
-geo#GB-OMH#Omagh#GB-NIR
-geo#GB-ORK#Orkney#GB-SCT
-geo#GB-OXF#Oxfordshire#GB-ENG
-geo#GB-POW#Powys#GB-WLS
-geo#GB-SCT#Scotland#GB
-geo#GB-SFK#Suffolk#GB-ENG
-geo#GB-SGM#South Glamorgan#GB-WLS
-geo#GB-SHR#Shropshire#GB-ENG
-geo#GB-SOM#Somerset#GB-ENG
-geo#GB-SRY#Surrey#GB-ENG
-geo#GB-STB#Strabane#GB-NIR
-geo#GB-STD#Strathclyde Region#GB-SCT
-geo#GB-STS#Staffordshire#GB-ENG
-geo#GB-SYK#South Yorkshire#GB-ENG
-geo#GB-TAY#Tayside Region#GB-SCT
-geo#GB-TWR#Tyne And Wear#GB-ENG
-geo#GB-WAR#Warwickshire#GB-ENG
-geo#GB-WGM#West Glamorgan#GB-WLS
-geo#GB-WIL#Wiltshire#GB-ENG
-geo#GB-WIS#Western Isles#GB-SCT
-geo#GB-WLS#Wales#GB
-geo#GB-WMD#West Midlands#GB-ENG
-geo#GB-WSX#West Sussex#GB-ENG
-geo#GB-WYK#West Yorkshire#GB-ENG
-geo#GB-ZET#Shetland (Zetland)#GB-SCT
-geo#GD#Grenada#--
-geo#GE#Georgia#--
-geo#GF#French Guiana#--
-geo#GH#Ghana#--
-geo#GI#Gibraltar#--
-geo#GL#Greenland#--
-geo#GM#Gambia#--
-geo#GN#Guinea#--
-geo#GP#Guadeloupe#--
-geo#GQ#Equatorial Guinea#--
-geo#GR#Greece#--
-geo#GS#Georgia & Sandwich Islands#--
-geo#GT#Guatemala#--
-geo#GU#Guam#--
-geo#GW#Guinea-Bissau#--
-geo#GY#Guyana#--
-geo#HK#Hong Kong#--
-geo#HN#Honduras#--
-geo#HR#Croatia#--
-geo#HT#Haiti#--
-geo#HU#Hungary#--
-geo#ID#Indonesia#--
-geo#IE#Ireland#--
-geo#IL#Israel#--
-geo#IN#India#--
-geo#IO#Indian Ocean Territory#--
-geo#IQ#Iraq#--
-geo#IR#"Iran, Islamic Republic of"#--
-geo#IS#Iceland#--
-geo#IT#Italy#--
-geo#IT-21#Piemonte#IT
-geo#IT-AL#Alessandria#IT-21
-geo#IT-AT#Asti#IT-22
-geo#IT-BI#Biella#IT-23
-geo#IT-AO#Aosta Aoste (fr)#IT-23
-geo#IT-CN#Cuneo#IT-24
-geo#IT-NO#Novara#IT-25
-geo#IT-BG#Bergamo#IT-25
-geo#IT-BS#Brescia#IT-25
-geo#IT-CO#Como#IT-25
-geo#IT-CR#Cremona#IT-25
-geo#IT-LC#Lecco#IT-25
-geo#IT-LO#Lodi#IT-25
-geo#IT-MN#Mantova#IT-25
-geo#IT-MI#Milano#IT-25
-geo#IT-PV#Pavia#IT-25
-geo#IT-SO#Sondrio#IT-25
-geo#IT-VA#Varese#IT-25
-geo#IT-TO#Torino#IT-26
-geo#IT-VB#Verbano-Cusio-Ossola#IT-27
-geo#IT-VC#Vercelli#IT-28
-geo#IT-23#Valle d'Aosta#IT
-geo#IT-25#Lombardia#IT
-geo#IT-32#Trentino-Alto Adige#IT
-geo#IT-BZ#Bolzano Bozen (de)#IT-32
-geo#IT-TN#Trento#IT-32
-geo#IT-34#Veneto#IT
-geo#IT-BL#Belluno#IT-34
-geo#IT-PD#Padova#IT-34
-geo#IT-RO#Rovigo#IT-34
-geo#IT-TV#Treviso#IT-34
-geo#IT-VE#Venezia#IT-34
-geo#IT-VR#Verona#IT-34
-geo#IT-VI#Vicenza#IT-34
-geo#IT-36#Friuli-Venezia Giulia#IT
-geo#IT-GO#Gorizia#IT-36
-geo#IT-PN#Pordenone#IT-36
-geo#IT-TS#Trieste#IT-36
-geo#IT-UD#Udine#IT-36
-geo#IT-42#Liguria#IT
-geo#IT-GE#Genova#IT-42
-geo#IT-IM#Imperia#IT-42
-geo#IT-SP#La Spezia#IT-42
-geo#IT-SV#Savona#IT-42
-geo#IT-45#Emilia-Romagna#IT
-geo#IT-BO#Bologna#IT-45
-geo#IT-FE#Ferrara#IT-45
-geo#IT-FO#Forlì#IT-45
-geo#IT-MO#Modena#IT-45
-geo#IT-PR#Parma#IT-45
-geo#IT-PC#Piacenza#IT-45
-geo#IT-RA#Ravenna#IT-45
-geo#IT-RE#Reggio Emilia#IT-45
-geo#IT-RN#Rimini#IT-45
-geo#IT-52#Toscana#IT
-geo#IT-AR#Arezzo#IT-52
-geo#IT-FI#Firenze#IT-52
-geo#IT-GR#Grosseto#IT-52
-geo#IT-LI#Livorno#IT-52
-geo#IT-LU#Lucca#IT-52
-geo#IT-MS#Massa-Carrara#IT-52
-geo#IT-PI#Pisa#IT-52
-geo#IT-PT#Pistoia#IT-52
-geo#IT-PO#Prato#IT-52
-geo#IT-SI#Siena#IT-52
-geo#IT-55#Umbria#IT
-geo#IT-PG#Perugia#IT-55
-geo#IT-TR#Terni#IT-55
-geo#IT-57#Marche#IT
-geo#IT-AN#Ancona#IT-57
-geo#IT-AP#Ascoli Piceno#IT-57
-geo#IT-MC#Macerata#IT-57
-geo#IT-PS#Pesaro e Urbino#IT-57
-geo#IT-62#Lazio#IT
-geo#IT-FR#Frosinone#IT-62
-geo#IT-LT#Latina#IT-62
-geo#IT-RI#Rieti#IT-62
-geo#IT-RM#Roma#IT-62
-geo#IT-VT#Viterbo#IT-62
-geo#IT-65#Abruzzo#IT
-geo#IT-CH#Chieti#IT-65
-geo#IT-AQ#L'Aquila#IT-65
-geo#IT-PE#Pescara#IT-65
-geo#IT-TE#Teramo#IT-65
-geo#IT-67#Molise#IT
-geo#IT-CB#Campobasso#IT-67
-geo#IT-IS#Isernia#IT-67
-geo#IT-72#Campania#IT
-geo#IT-BN#Benevento#IT-72
-geo#IT-CE#Caserta#IT-72
-geo#IT-NA#Napoli#IT-72
-geo#IT-SA#Salerno#IT-72
-geo#IT-AV#Avellino#IT-72
-geo#IT-75#Puglia#IT
-geo#IT-BA#Bari#IT-75
-geo#IT-BR#Brindisi#IT-75
-geo#IT-FG#Foggia#IT-75
-geo#IT-LE#Lecce#IT-75
-geo#IT-TA#Taranto#IT-75
-geo#IT-77#Basilicata#IT
-geo#IT-MT#Matera#IT-77
-geo#IT-PZ#Potenza#IT-77
-geo#IT-78#Calabria#IT
-geo#IT-CZ#Catanzaro#IT-78
-geo#IT-CS#Cosenza#IT-78
-geo#IT-KR#Crotone#IT-78
-geo#IT-RC#Reggio Calabria#IT-78
-geo#IT-VV#Vibo Valentia#IT-78
-geo#IT-82#Sicilia#IT
-geo#IT-AG#Agrigento#IT-82
-geo#IT-CL#Caltanissetta#IT-82
-geo#IT-CT#Catania#IT-82
-geo#IT-EN#Enna#IT-82
-geo#IT-ME#Messina#IT-82
-geo#IT-PA#Palermo#IT-82
-geo#IT-RG#Ragusa#IT-82
-geo#IT-SR#Siracusa#IT-82
-geo#IT-TP#Trapani#IT-82
-geo#IT-88#Sardegna#IT
-geo#IT-CA#Cagliari#IT-88
-geo#IT-NU#Nuoro#IT-88
-geo#IT-OR#Oristano#IT-88
-geo#IT-SS#Sassari#IT-88
-geo#JM#Jamaica#--
-geo#JO#Jordan#--
-geo#JP#Japan#--
-geo#JP-01#Hokkaido#JP
-geo#JP-02#Aomori#JP
-geo#JP-03#Iwate#JP
-geo#JP-04#Miyagi#JP
-geo#JP-05#Akita#JP
-geo#JP-06#Yamagata#JP
-geo#JP-07#Hukusima (Fukushima)#JP
-geo#JP-08#Ibaraki#JP
-geo#JP-09#Totigi (Tochigi)#JP
-geo#JP-10#Gunma#JP
-geo#JP-11#Saitama#JP
-geo#JP-12#Tiba (Chiba)#JP
-geo#JP-13#Tokyo#JP
-geo#JP-14#Kanagawa#JP
-geo#JP-15#Niigata#JP
-geo#JP-16#Toyama#JP
-geo#JP-17#Isikawa (Ishikawa)#JP
-geo#JP-18#Hukui (Fukui)#JP
-geo#JP-19#Yamanasi (Yamanashi)#JP
-geo#JP-20#Nagano#JP
-geo#JP-21#Gihu (Gifu)#JP
-geo#JP-22#Sizuoka (Shizuoka)#JP
-geo#JP-23#Aiti (Aichi)#JP
-geo#JP-24#Mie#JP
-geo#JP-25#Siga (Shiga)#JP
-geo#JP-26#Kyoto#JP
-geo#JP-27#Osaka#JP
-geo#JP-28#Hyogo#JP
-geo#JP-29#Nara#JP
-geo#JP-30#Wakayama#JP
-geo#JP-31#Tottori#JP
-geo#JP-32#Simane (Shimane)#JP
-geo#JP-33#Okayama#JP
-geo#JP-34#Hirosima (Hiroshima)#JP
-geo#JP-35#Yamaguti (Yamaguchi)#JP
-geo#JP-36#Tokusima (Tokushima)#JP
-geo#JP-37#Kagawa#JP
-geo#JP-38#Ehime#JP
-geo#JP-39#Koti (Kochi)#JP
-geo#JP-40#Hukuoka (Fukuoka)#JP
-geo#JP-41#Saga#JP
-geo#JP-42#Nagasaki#JP
-geo#JP-43#Kumamoto#JP
-geo#JP-44#Oita#JP
-geo#JP-45#Miyazaki#JP
-geo#JP-46#Kagosima (Kagoshima)#JP
-geo#JP-47#Okinawa#JP
-geo#KE#Kenya#--
-geo#KG#Kyrgyzstan#--
-geo#KH#Cambodia#--
-geo#KI#Kiribati#--
-geo#KM#Comoros#--
-geo#KN#St Kitts-Nevis#--
-geo#KP#"Korea, Dem People's Republic"#--
-geo#KR#"Korea, Republic of"#--
-geo#KR-11#Seoul Teugbyeolsi#KR
-geo#KR-26#Busan Gwang'yeogsi#KR
-geo#KR-27#Daegu Gwang'yeogsi#KR
-geo#KR-30#Daejeon Gwang'yeogsi#KR
-geo#KR-29#Gwangju Gwang'yeogsi#KR
-geo#KR-28#Incheon Gwang'yeogsi#KR
-geo#KR-31#Ulsan Gwang'yeogsi#KR
-geo#KR-43#Chungcheongbugdo#KR
-geo#KR-44#Chungcheongnamdo#KR
-geo#KR-42#Gang'weondo#KR
-geo#KR-41#Gyeonggido#KR
-geo#KR-47#Gyeongsangbugdo#KR
-geo#KR-48#Gyeongsangnamdo#KR
-geo#KR-49#Jejudo#KR
-geo#KR-45#Jeonrabugdo#KR
-geo#KR-46#Jeonranamdo#KR
-geo#KW#Kuwait#--
-geo#KY#Cayman Islands#--
-geo#KZ#Kazakhstan#--
-geo#LA#Lao People's Democratic Republic#--
-geo#LB#Lebanon#--
-geo#LC#Saint Lucia#--
-geo#LI#Liechtenstein#--
-geo#LK#Sri Lanka#--
-geo#LR#Liberia#--
-geo#LS#Lesotho#--
-geo#LT#Lithuania#--
-geo#LU#Luxembourg#--
-geo#LV#Latvia#--
-geo#LY#Lybian Arab Jamahiriya#--
-geo#MA#Morocco#--
-geo#MC#Monaco#--
-geo#MD#Moldova#--
-geo#MG#Madagascar#--
-geo#MH#Marshall Islands#--
-geo#MK#Former Yugoslav Republic Of Macedonia#--
-geo#ML#Mali#--
-geo#MM#Myanmar (Former Burma)#--
-geo#MN#Mongolia#--
-geo#MO#Macau#--
-geo#MP#Northern Marianas#--
-geo#MQ#Martinique#--
-geo#MR#Mauritania#--
-geo#MS#Montserrat#--
-geo#MT#Malta#--
-geo#MU#Mauritius#--
-geo#MV#Maldives#--
-geo#MW#Malawi#--
-geo#MX#Mexico#--
-geo#MX-AGU#Aguascalientes#MX
-geo#MX-BCN#Baja California#MX
-geo#MX-BCS#Baja California Sur#MX
-geo#MX-CAM#Campeche#MX
-geo#MX-CHH#Chihuahua#MX
-geo#MX-CHP#Chiapas#MX
-geo#MX-COA#Coahuila#MX
-geo#MX-COL#Colima#MX
-geo#MX-DF#Distrito Federal#MX
-geo#MX-DUR#Durango#MX
-geo#MX-GRO#Guerrero#MX
-geo#MX-GUA#Guanajuato#MX
-geo#MX-HID#Hidalgo#MX
-geo#MX-JAL#Jalisco#MX
-geo#MX-MEX#Mexico#MX
-geo#MX-MIC#Michoacan#MX
-geo#MX-MOR#Morelos#MX
-geo#MX-NAY#Nayarit#MX
-geo#MX-NLE#Nuevo Leon#MX
-geo#MX-OAX#Oaxaca#MX
-geo#MX-PUE#Puebla#MX
-geo#MX-QUE#Queretaro#MX
-geo#MX-ROO#Quintana Roo#MX
-geo#MX-SIN#Sinaloa#MX
-geo#MX-SLP#San Luis Potosi#MX
-geo#MX-SON#Sonora#MX
-geo#MX-TAB#Tabasco#MX
-geo#MX-TAM#Tamaulipas#MX
-geo#MX-TLA#Tlaxcala#MX
-geo#MX-VER#Veracruz#MX
-geo#MX-YUC#Yucatan#MX
-geo#MX-ZAC#Zacatecas#MX
-geo#MY#Malaysia#--
-geo#MZ#Mozambique#--
-geo#NA#Namibia#--
-geo#NC#New Caledonia#--
-geo#NE#Niger#--
-geo#NF#Norfolk Island#--
-geo#NG#Nigeria#--
-geo#NG-FC#Abuja Capital Territory#NG
-geo#NG-AB#Abia#NG
-geo#NG-AD#Adamawa#NG
-geo#NG-AK#Akwa Ibom#NG
-geo#NG-AN#Anambra#NG
-geo#NG-BA#Bauchi#NG
-geo#NG-BY#Bayelsa#NG
-geo#NG-BE#Benue#NG
-geo#NG-BO#Borno#NG
-geo#NG-CR#Cross River#NG
-geo#NG-DE#Delta#NG
-geo#NG-EB#Ebonyi#NG
-geo#NG-ED#Edo#NG
-geo#NG-EK#Ekiti#NG
-geo#NG-EN#Enugu#NG
-geo#NG-GO#Gombe#NG
-geo#NG-IM#Imo#NG
-geo#NG-JI#Jigawa#NG
-geo#NG-KD#Kaduna#NG
-geo#NG-KN#Kano#NG
-geo#NG-KT#Katsina#NG
-geo#NG-KE#Kebbi#NG
-geo#NG-KO#Kogi#NG
-geo#NG-KW#Kwara#NG
-geo#NG-LA#Lagos#NG
-geo#NG-NA#Nassarawa#NG
-geo#NG-NI#Niger#NG
-geo#NG-OG#Ogun#NG
-geo#NG-ON#Ondo#NG
-geo#NG-OS#Osun#NG
-geo#NG-OY#Oyo#NG
-geo#NG-PL#Plateau#NG
-geo#NG-RI#Rivers#NG
-geo#NG-SO#Sokoto#NG
-geo#NG-TA#Taraba#NG
-geo#NG-YO#Yobe#NG
-geo#NG-ZA#Zamfara#NG
-geo#NI#Nicaragua#--
-geo#NL#Netherlands#--
-geo#NO#Norway#--
-geo#NO-01#Østfold#NO
-geo#NO-02#Akershus#NO
-geo#NO-03#Oslo#NO
-geo#NO-04#Hedmark#NO
-geo#NO-05#Oppland#NO
-geo#NO-06#Buskerud#NO
-geo#NO-07#Vestfold#NO
-geo#NO-08#Telemark#NO
-geo#NO-09#Aust-Agder#NO
-geo#NO-10#Vest-Agder#NO
-geo#NO-11#Rogaland#NO
-geo#NO-12#Nordaland#NO
-geo#NO-14#Sogn Og Fjordane#NO
-geo#NO-15#Møre Og Romsdal#NO
-geo#NO-16#Sør-Trøndelag#NO
-geo#NO-17#Nord-Trøndelag#NO
-geo#NO-18#Nordland#NO
-geo#NO-19#Troms#NO
-geo#NO-20#Finnmark#NO
-geo#NP#Nepal#--
-geo#NR#Nauru#--
-geo#NU#Niue#--
-geo#NZ#New Zealand#--
-geo#NZ-AUK#Auckland#NZ-N
-geo#NZ-BOP#Bay Of Plenty#NZ-N
-geo#NZ-CAN#Canterbury#NZ-S
-geo#NZ-GIS#Gisborne#NZ-N
-geo#NZ-HKB#Hawkes'S Bay#NZ-N
-geo#NZ-MBH#Marlborough#NZ-S
-geo#NZ-MWT#Manawatu-Wanganui#NZ-N
-geo#NZ-N#North Island#NZ
-geo#NZ-NSN#Nelson#NZ-S
-geo#NZ-NTL#Northland#NZ-N
-geo#NZ-OTA#Otago#NZ-S
-geo#NZ-S#South Island#NZ
-geo#NZ-STL#Southland#NZ-S
-geo#NZ-TAS#Tasman#NZ-S
-geo#NZ-TKI#Taranaki#NZ-N
-geo#NZ-WGN#Wellington#NZ-N
-geo#NZ-WKO#Waikato#NZ-N
-geo#NZ-WTC#West Coast#NZ-S
-geo#OM#Oman#--
-geo#PA#Panama#--
-geo#PE#Peru#--
-geo#PF#French Polynesia#--
-geo#PG#Papua New Guinea#--
-geo#PH#Philippines#--
-geo#PK#Pakistan#--
-geo#PL#Poland#--
-geo#PL-DS#Dolnośląskie#PL
-geo#PL-KP#Kujawsko-pomorskie#PL
-geo#PL-LU#Lubelskie#PL
-geo#PL-LB#Lubuskie#PL
-geo#PL-LD#Łódzkie#PL
-geo#PL-MA#Małopolskie#PL
-geo#PL-MZ#Mazowieckie#PL
-geo#PL-OP#Opolskie#PL
-geo#PL-PK#Podkarpackie#PL
-geo#PL-PD#Podlaskie#PL
-geo#PL-PM#Pomorskie#PL
-geo#PL-SL#Śląskie#PL
-geo#PL-SK#Świętokrzyskie#PL
-geo#PL-WN#Warmińsko-mazurskie#PL
-geo#PL-WP#Wielkopolskie#PL
-geo#PL-ZP#Zachodniopomorskie#PL
-geo#PM#St Pierre And Miquelon#--
-geo#PN#Pitcairn#--
-geo#PR#Puerto Rico#--
-geo#PS#"Palestinian Territory, Occupied"#--
-geo#PT#Portugal#--
-geo#PW#Palau#--
-geo#PY#Paraguay#--
-geo#QA#Qatar#--
-geo#RE#Reunion#--
-geo#RO#Romania#--
-geo#RO-B#Bucureşti#RO
-geo#RO-AB#Alba#RO
-geo#RO-AR#Arad#RO
-geo#RO-AG#Argeş#RO
-geo#RO-BC#Bacău#RO
-geo#RO-BH#Bihor#RO
-geo#RO-BN#Bistriţa-Năsăud#RO
-geo#RO-BT#Botoşani#RO
-geo#RO-BV#Braşov#RO
-geo#RO-BR#Brăila#RO
-geo#RO-BZ#Buzău#RO
-geo#RO-CS#Caraş-Severin#RO
-geo#RO-CL#Călăraşi#RO
-geo#RO-CJ#Cluj#RO
-geo#RO-CT#Constanţa#RO
-geo#RO-CV#Covasna#RO
-geo#RO-DB#Dâmboviţa#RO
-geo#RO-DJ#Dolj#RO
-geo#RO-GL#Galaţi#RO
-geo#RO-GR#Giurgiu#RO
-geo#RO-GJ#Gorj#RO
-geo#RO-HR#Harghita#RO
-geo#RO-HD#Hunedoara#RO
-geo#RO-IL#Ialomiţa#RO
-geo#RO-IS#Iaşi#RO
-geo#RO-MM#Maramureş#RO
-geo#RO-MH#Mehedinţi#RO
-geo#RO-MS#Mureş#RO
-geo#RO-NT#Neamţ#RO
-geo#RO-OT#Olt#RO
-geo#RO-PH#Prahova#RO
-geo#RO-SM#Satu Mare#RO
-geo#RO-SJ#Sălaj#RO
-geo#RO-SB#Sibiu#RO
-geo#RO-SV#Suceava#RO
-geo#RO-TR#Teleorman#RO
-geo#RO-TM#Timiş#RO
-geo#RO-TL#Tulcea#RO
-geo#RO-VS#Vaslui#RO
-geo#RO-VL#Vâlcea#RO
-geo#RO-VN#Vrancea#RO
-geo#RU#Russian Federation#--
-geo#RU-AD#"Adygeja, Respublika"#RU
-geo#RU-AL#"Altaj, Respublika"#RU
-geo#RU-BA#"Baškortostan, Respublika"#RU
-geo#RU-BU#"Burjatija, Respublika"#RU
-geo#RU-CE#Čečenskaja Respublika#RU
-geo#RU-CU#Čuvašskaja Respublika#RU
-geo#RU-DA#"Dagestan, Respublika"#RU
-geo#RU-IN#Ingušskaja Respublika [Respublika Ingušetija]#RU
-geo#RU-KB#Kabardino-Balkarskaja Respublika#RU
-geo#RU-KL#"Kalmykija, Respublika"#RU
-geo#RU-KC#Karačajevo-Čerkesskaja Respublika#RU
-geo#RU-KR#"Karelija, Respublika"#RU
-geo#RU-KK#"Hakasija, Respublika"#RU
-geo#RU-KO#"Komi, Respublika"#RU
-geo#RU-ME#"Marij Èl, Respublika"#RU
-geo#RU-MO#"Mordovija, Respublika"#RU
-geo#RU-SA#"Saha, Respublika [Jakutija]"#RU
-geo#RU-SE#"Severnaja Osetija, Respublika [Alanija] [Respublika Severnaja Osetija-Alanija]"#RU
-geo#RU-TA#"Tatarstan, Respublika"#RU
-geo#RU-TY#"Tyva, Respublika [Tuva]"#RU
-geo#RU-UD#Udmurtskaja Respublika#RU
-geo#RU-ALT#Altajskij kraj#RU
-geo#RU-KHA#Habarovskij kraj#RU
-geo#RU-KDA#Krasnodarskij kraj#RU
-geo#RU-KYA#Krasnojarskij kraj#RU
-geo#RU-PRI#Primorskij kraj#RU
-geo#RU-STA#Stavropol'skij kraj#RU
-geo#RU-AMU#Amurskaja oblast'#RU
-geo#RU-ARK#Arhangel'skaja oblast'#RU
-geo#RU-AST#Astrahanskaja oblast'#RU
-geo#RU-BEL#Belgorodskaja oblast'#RU
-geo#RU-BRY#Brjanskaja oblast'#RU
-geo#RU-CHE#Čeljabinskaja oblast'#RU
-geo#RU-CHI#Čitinskaja oblast'#RU
-geo#RU-IRK#Irkutskaja oblast'#RU
-geo#RU-IVA#Ivanovskaja oblast'#RU
-geo#RU-KGD#Kaliningradskaja oblast'#RU
-geo#RU-KLU#Kalužskaja oblast'#RU
-geo#RU-KAM#Kamčatskaja oblast'#RU
-geo#RU-KEM#Kemerovskaja oblast'#RU
-geo#RU-KIR#Kirovskaja oblast'#RU
-geo#RU-KOS#Kostromskaja oblast'#RU
-geo#RU-KGN#Kurganskaja oblast'#RU
-geo#RU-KRS#Kurskaja oblast'#RU
-geo#RU-LEN#Leningradskaja oblast'#RU
-geo#RU-LIP#Lipetskaja oblast'#RU
-geo#RU-MAG#Magadanskaja oblast'#RU
-geo#RU-MOS#Moskovskaja oblast'#RU
-geo#RU-MUR#Murmanskaja oblast'#RU
-geo#RU-NIZ#Nižegorodskaja oblast'#RU
-geo#RU-NGR#Novgorodskaja oblast'#RU
-geo#RU-NVS#Novosibirskaja oblast'#RU
-geo#RU-OMS#Omskaja oblast'#RU
-geo#RU-ORE#Orenburgskaja oblast'#RU
-geo#RU-ORL#Orlovskaja oblast'#RU
-geo#RU-PNZ#Penzenskaja oblast'#RU
-geo#RU-PER#Permskaja oblast'#RU
-geo#RU-PSK#Pskovskaja oblast'#RU
-geo#RU-ROS#Rostovskaja oblast'#RU
-geo#RU-RYA#Rjazanskaja oblast'#RU
-geo#RU-SAK#Sahalinskaja oblast'#RU
-geo#RU-SAM#Samarskaja oblast'#RU
-geo#RU-SAR#Saratovskaja oblast'#RU
-geo#RU-SMO#Smolenskaja oblast'#RU
-geo#RU-SVE#Sverdlovskaja oblast'#RU
-geo#RU-TAM#Tambovskaja oblast'#RU
-geo#RU-TOM#Tomskaja oblast'#RU
-geo#RU-TUL#Tul'skaja oblast'#RU
-geo#RU-TVE#Tverskaja oblast'#RU
-geo#RU-TYU#Tjumenskaja oblast'#RU
-geo#RU-ULY#Ul'janovskaja oblast'#RU
-geo#RU-VLA#Vladimirskaja oblast'#RU
-geo#RU-VGG#Volgogradskaja oblast'#RU
-geo#RU-VLG#Vologodskaja oblast'#RU
-geo#RU-VOR#Voronežskaja oblast'#RU
-geo#RU-YAR#Jaroslavskaja oblast'#RU
-geo#RU-MOW#Moskva#RU
-geo#RU-SPE#Sankt-Peterburg#RU
-geo#RU-YEV#Evrejskaja avtonomnaja oblast'#RU
-geo#RU-AGB#Aginskij Burjatskij avtonomnyj okrug#RU
-geo#RU-CHU#Čukotskij avtonomnyj okrug#RU
-geo#RU-EVE#Èvenkijskij avtonomnyj okrug#RU
-geo#RU-KHM#Hanty-Mansijskij avtonomnyj okrug#RU
-geo#RU-KOP#Komi-Permjatskij avtonomnyj okrug#RU
-geo#RU-KOR#Korjakskij avtonomnyj okrug#RU
-geo#RU-NEN#Nenetskij avtonomnyj okrug#RU
-geo#RU-TAY#Tajmyrskij (Dolgano-Nenetskij) avtonomnyj okrug#RU
-geo#RU-UOB#Ust'-Ordynskij Burjatskij avtonomnyj okrug#RU
-geo#RU-YAN#Jamalo-Nenetskij avtonomnyj okrug#RU
-geo#RW#Rwanda#--
-geo#SA#Saudi Arabia#--
-geo#SB#Solomon Islands#--
-geo#SC#Seychelles#--
-geo#SD#Sudan#--
-geo#SE#Sweden#--
-geo#SE-AB#Stockholms Län#SE
-geo#SE-AC#Västerbottens Län#SE
-geo#SE-BD#Norrbottens Län#SE
-geo#SE-C#Uppsala Län#SE
-geo#SE-D#Södermanlands Län#SE
-geo#SE-E#Östergötlands Län#SE
-geo#SE-F#Jönköpings Län#SE
-geo#SE-G#Kronoborgs Län#SE
-geo#SE-H#Kalmar Län#SE
-geo#SE-I#Gotlands Län#SE
-geo#SE-K#Blekinge Län#SE
-geo#SE-M#Skåne Län#SE
-geo#SE-N#Hallands Län#SE
-geo#SE-O#Västra Götalands Län#SE
-geo#SE-S#Värmlands Län#SE
-geo#SE-T#Örebro Län#SE
-geo#SE-U#Västmanlands Län#SE
-geo#SE-W#Dalarnes Län#SE
-geo#SE-X#Gävleborgs Län#SE
-geo#SE-Y#Västernorrlands Län#SE
-geo#SE-Z#Jämtlands Län#SE
-geo#SG#Singapore#--
-geo#SH#St Helena#--
-geo#SI#Slovenia#--
-geo#SJ#Svalbard And Jan Mayen#--
-geo#SK#Slovakia#--
-geo#SL#Sierra Leone#--
-geo#SM#San Marino#--
-geo#SN#Senegal#--
-geo#SO#Somalia#--
-geo#SR#Suriname#--
-geo#ST#Sao Tome And Principe#--
-geo#SV#El Salvador#--
-geo#SY#Syrian Arab Republic#--
-geo#SZ#Swaziland#--
-geo#TC#Turks And Caicos Islands#--
-geo#TD#Chad#--
-geo#TF#French Southern Territories#--
-geo#TG#Togo#--
-geo#TH#Thailand#--
-geo#TJ#Tajikistan#--
-geo#TM#Turkmenistan#--
-geo#TN#Tunisia#--
-geo#TO#Tonga#--
-geo#TP#East Timor#--
-geo#TR#Turkey#--
-geo#TR-01#Adana#TR
-geo#TR-02#Adıyaman#TR
-geo#TR-03#Afyon#TR
-geo#TR-04#Ağrı#TR
-geo#TR-05#Amasya#TR
-geo#TR-06#Ankara#TR
-geo#TR-07#Antalya#TR
-geo#TR-08#Artvin#TR
-geo#TR-09#Aydın#TR
-geo#TR-10#Balıkesir#TR
-geo#TR-11#Bilecik#TR
-geo#TR-12#Bingöl#TR
-geo#TR-13#Bitlis#TR
-geo#TR-14#Bolu#TR
-geo#TR-15#Burdur#TR
-geo#TR-16#Bursa#TR
-geo#TR-17#Çanakkale#TR
-geo#TR-18#Çankırı#TR
-geo#TR-19#Çorum#TR
-geo#TR-20#Denizli#TR
-geo#TR-21#Diyarbakır#TR
-geo#TR-22#Edirne#TR
-geo#TR-23#Elazıg#TR
-geo#TR-24#Erzincan#TR
-geo#TR-25#Erzurum#TR
-geo#TR-26#Eskişehir#TR
-geo#TR-27#Gaziantep#TR
-geo#TR-28#Giresun#TR
-geo#TR-29#Gümüşhane#TR
-geo#TR-30#Hakkâri#TR
-geo#TR-31#Hatay#TR
-geo#TR-32#Isparta#TR
-geo#TR-33#İçel#TR
-geo#TR-34#İstanbul#TR
-geo#TR-35#İzmir#TR
-geo#TR-36#Kars#TR
-geo#TR-37#Kastamonu#TR
-geo#TR-38#Kayseri#TR
-geo#TR-39#Kırklareli#TR
-geo#TR-40#Kırşehir#TR
-geo#TR-41#Kocaeli#TR
-geo#TR-42#Konya#TR
-geo#TR-43#Kütahya#TR
-geo#TR-44#Malatya#TR
-geo#TR-45#Manisa#TR
-geo#TR-46#Kahramanmaraş#TR
-geo#TR-47#Mardin#TR
-geo#TR-48#Muğla#TR
-geo#TR-49#Muş#TR
-geo#TR-50#Nevşehir#TR
-geo#TR-51#Niğde#TR
-geo#TR-52#Ordu#TR
-geo#TR-53#Rize#TR
-geo#TR-54#Sakarya#TR
-geo#TR-55#Samsun#TR
-geo#TR-56#Siirt#TR
-geo#TR-57#Sinop#TR
-geo#TR-58#Sivas#TR
-geo#TR-59#Tekirdağ#TR
-geo#TR-60#Tokat#TR
-geo#TR-61#Trabzon#TR
-geo#TR-62#Tunceli#TR
-geo#TR-63#Şanlıurfa#TR
-geo#TR-64#Uşak#TR
-geo#TR-65#Van#TR
-geo#TR-66#Yozgat#TR
-geo#TR-67#Zonguldak#TR
-geo#TR-68#Aksaray#TR
-geo#TR-69#Bayburt#TR
-geo#TR-70#Karaman#TR
-geo#TR-71#Kırıkkale#TR
-geo#TR-72#Batman#TR
-geo#TR-73#Şırnak#TR
-geo#TR-74#Bartın#TR
-geo#TR-75#Ardahan#TR
-geo#TR-76#Iğdır#TR
-geo#TR-77#Yalova#TR
-geo#TR-78#Karabük#TR
-geo#TR-79#Kilis#TR
-geo#TR-80#Osmaniye#TR
-geo#TT#Trinidad And Tobago#--
-geo#TV#Tuvalu#--
-geo#TW#"Taiwan, Province Of China"#--
-geo#TZ#"Tanzania, United Republic of"#--
-geo#UA#Ukraine#--
-geo#UG#Uganda#--
-geo#UM#US Minor Outlying Islands#--
-geo#UM-67#Johnston Atoll#UM
-geo#UM-71#Midway Islands#UM
-geo#UM-76#Navassa Island#UM
-geo#UM-79#Wake Island#UM
-geo#UM-81#Baker Island#UM
-geo#UM-84#Howland Island#UM
-geo#UM-86#Jarvis Island#UM
-geo#UM-89#Kingman Reef#UM
-geo#UM-95#Palmyra Atoll#UM
-geo#US#United States#--
-geo#US-AK#Alaska#US
-geo#US-AL#Alabama#US
-geo#US-AR#Arkansas#US
-geo#US-AS#American Samoa#US
-geo#US-AZ#Arizona#US
-geo#US-CA#California#US
-geo#US-CO#Colorado#US
-geo#US-CT#Connecticut#US
-geo#US-DC#District Of Columbia#US
-geo#US-DE#Delaware#US
-geo#US-FL#Florida#US
-geo#US-GA#Georgia#US
-geo#US-GU#Guam#US
-geo#US-HI#Hawaii#US
-geo#US-IA#Iowa#US
-geo#US-ID#Idaho#US
-geo#US-IL#Illinois#US
-geo#US-IN#Indiana#US
-geo#US-KS#Kansas#US
-geo#US-KY#Kentucky#US
-geo#US-LA#Louisiana#US
-geo#US-MA#Massachusetts#US
-geo#US-MD#Maryland#US
-geo#US-ME#Maine#US
-geo#US-MI#Michigan#US
-geo#US-MN#Minnesota#US
-geo#US-MO#Missouri#US
-geo#US-MP#Northern Mariana Islands#US
-geo#US-MS#Mississippi#US
-geo#US-MT#Montana#US
-geo#US-NC#North Carolina#US
-geo#US-ND#North Dakota#US
-geo#US-NE#Nebraska#US
-geo#US-NH#New Hampshire#US
-geo#US-NJ#New Jersey#US
-geo#US-NM#New Mexico#US
-geo#US-NV#Nevada#US
-geo#US-NY#New York#US
-geo#US-OH#Ohio#US
-geo#US-OK#Oklahoma#US
-geo#US-OR#Oregon#US
-geo#US-PA#Pennsylvania#US
-geo#US-PR#Puerto Rico#US
-geo#US-RI#Rhode Island#US
-geo#US-SC#South Carolina#US
-geo#US-SD#South Dakota#US
-geo#US-TN#Tennessee#US
-geo#US-TX#Texas#US
-geo#US-UM#U.S. Minor Outlying Islands#US
-geo#US-UT#Utah#US
-geo#US-VA#Virginia#US
-geo#US-VI#Virgin Islands Of The U.S.#US
-geo#US-VT#Vermont#US
-geo#US-WA#Washington#US
-geo#US-WI#Wisconsin#US
-geo#US-WV#West Virginia#US
-geo#US-WY#Wyoming#US
-geo#UY#Uruguay#--
-geo#UZ#Uzbekistan#--
-geo#VA#Vatican City State#--
-geo#VC#St Vincent And Grenadines#--
-geo#VE#Venezuela#--
-geo#VG#"Virgin Islands, British"#--
-geo#VI#United States Virgin Islands#--
-geo#VN#Viet Nam#--
-geo#VN-01#Lai Chau#VN
-geo#VN-02#Lao Cai#VN
-geo#VN-03#Ha Giang#VN
-geo#VN-04#Cao Bang#VN
-geo#VN-05#Son La#VN
-geo#VN-06#Yen Bai#VN
-geo#VN-07#Tuyen Quang#VN
-geo#VN-09#Lang Son#VN
-geo#VN-13#Quang Ninh#VN
-geo#VN-14#Hoa Binh#VN
-geo#VN-15#Ha Tay#VN
-geo#VN-18#Ninh Binh#VN
-geo#VN-20#Thai Binh#VN
-geo#VN-21#Thanh Hoa#VN
-geo#VN-22#Nghe An#VN
-geo#VN-23#Ha Tinh#VN
-geo#VN-24#Quang Binh#VN
-geo#VN-25#Quang Tri#VN
-geo#VN-26#Thua Thien-Hue#VN
-geo#VN-27#Quang Nam#VN
-geo#VN-28#Kon Tum#VN
-geo#VN-29#Quang Ngai#VN
-geo#VN-30#Gia Lai#VN
-geo#VN-31#Binh Dinh#VN
-geo#VN-32#Phu Yen#VN
-geo#VN-33#Dac Lac#VN
-geo#VN-34#Khanh Hoa#VN
-geo#VN-35#Lam Dong#VN
-geo#VN-36#Ninh Thuan#VN
-geo#VN-37#Tay Ninh#VN
-geo#VN-39#Dong Nai#VN
-geo#VN-40#Binh Thuan#VN
-geo#VN-41#Long An#VN
-geo#VN-43#Ba Ria - Vung Tau#VN
-geo#VN-44#An Giang#VN
-geo#VN-45#Dong Thap#VN
-geo#VN-46#Tien Giang#VN
-geo#VN-47#Kien Giang#VN
-geo#VN-48#Can Tho#VN
-geo#VN-49#Vinh Long#VN
-geo#VN-50#Ben Tre#VN
-geo#VN-51#Tra Vinh#VN
-geo#VN-52#Soc Trang#VN
-geo#VN-53#Bac Can#VN
-geo#VN-54#Bac Giang#VN
-geo#VN-55#Bac Lieu#VN
-geo#VN-56#Bac Ninh#VN
-geo#VN-57#Binh Duong#VN
-geo#VN-58#Binh Phuoc#VN
-geo#VN-59#Ca Mau#VN
-geo#VN-60#"Da Nang, thanh pho"#VN
-geo#VN-61#Hai Duong#VN
-geo#VN-62#"Hai Phong, thanh pho"#VN
-geo#VN-63#Ha Nam#VN
-geo#VN-64#"Ha Noi, thu do"#VN
-geo#VN-65#"Ho Chi Minh, thanh po [Sai Gon]"#VN
-geo#VN-66#Hung Yen#VN
-geo#VN-67#Nam Dinh#VN
-geo#VN-68#Phu Tho#VN
-geo#VN-69#Thai Nguyen#VN
-geo#VN-70#Vinh Phuc#VN
-geo#VU#Vanuatu#--
-geo#WF#Wallis And Futuna Islands#--
-geo#WS#Samoa#--
-geo#YE#Yemen#--
-geo#YT#Mayotte#--
-geo#YU#Yugoslavia (Fed Rep Of)#--
-geo#YU-CG#Crna Gora#YU
-geo#YU-SR#Srbija#YU
-geo#YU-KM#Kosovo-Metohija#YU-SR
-geo#YU-VO#Vojvodina#YU-SR
-geo#ZA#South Africa#--
-geo#ZM#Zambia#--
-geo#ZW#Zimbabwe#--
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/data/naics-data.txt b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/data/naics-data.txt
deleted file mode 100644
index b46f905a9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/data/naics-data.txt
+++ /dev/null
@@ -1,1814 +0,0 @@
-naics#11#Agriculture, Forestry, Fishing and Hunting#11
-naics#111#Crop Production#11
-naics#1111#Oilseed and Grain Farming#111
-naics#11111#Soybean Farming#1111
-naics#11112#Oilseed (except Soybean) Farming#1111
-naics#11113#Dry Pea and Bean Farming#1111
-naics#11114#Wheat Farming#1111
-naics#11115#Corn Farming#1111
-naics#11116#Rice Farming#1111
-naics#11119#Other Grain Farming#1111
-naics#111191#Oilseed and Grain Combination Farming#11119
-naics#111199#All Other Grain Farming#11119
-naics#1112#Vegetable and Melon Farming#111
-naics#11121#Vegetable and Melon Farming#1112
-naics#111211#Potato Farming#11121
-naics#111219#Other Vegetable (except Potato) and Melon Farming#11121
-naics#1113#Fruit and Tree Nut Farming#111
-naics#11131#Orange Groves#1113
-naics#11132#Citrus (except Orange) Groves#1113
-naics#11133#Noncitrus Fruit and Tree Nut Farming#1113
-naics#111331#Apple Orchards#11133
-naics#111332#Grape Vineyards#11133
-naics#111333#Strawberry Farming#11133
-naics#111334#Berry (except Strawberry) Farming#11133
-naics#111335#Tree Nut Farming#11133
-naics#111336#Fruit and Tree Nut Combination Farming#11133
-naics#111339#Other Noncitrus Fruit Farming#11133
-naics#1114#Greenhouse, Nursery, and Floriculture Production#111
-naics#11141#Food Crops Grown Under Cover#1114
-naics#111411#Mushroom Production#11141
-naics#111419#Other Food Crops Grown Under Cover#11141
-naics#11142#Nursery and Floriculture Production#1114
-naics#111421#Nursery and Tree Production#11142
-naics#111422#Floriculture Production#11142
-naics#1119#Other Crop Farming#111
-naics#11191#Tobacco Farming#1119
-naics#11192#Cotton Farming#1119
-naics#11193#Sugarcane Farming#1119
-naics#11194#Hay Farming#1119
-naics#11199#All Other Crop Farming#1119
-naics#111991#Sugar Beet Farming#11199
-naics#111992#Peanut Farming#11199
-naics#111998#All Other Miscellaneous Crop Farming#11199
-naics#112#Animal Production#11
-naics#1121#Cattle Ranching and Farming#112
-naics#11211#Beef Cattle Ranching and Farming, including Feedlots#1121
-naics#112111#Beef Cattle Ranching and Farming#11211
-naics#112112#Cattle Feedlots#11211
-naics#11212#Dairy Cattle and Milk Production#1121
-naics#11213#Dual Purpose Cattle Ranching and Farming#1121
-naics#1122#Hog and Pig Farming#112
-naics#11221#Hog and Pig Farming#1122
-naics#1123#Poultry and Egg Production#112
-naics#11231#Chicken Egg Production#1123
-naics#11232#Broilers and Other Meat Type Chicken Production#1123
-naics#11233#Turkey Production#1123
-naics#11234#Poultry Hatcheries#1123
-naics#11239#Other Poultry Production#1123
-naics#1124#Sheep and Goat Farming#112
-naics#11241#Sheep Farming#1124
-naics#11242#Goat Farming#1124
-naics#1125#Animal Aquaculture#112
-naics#11251#Animal Aquaculture#1125
-naics#112511#Finfish Farming and Fish Hatcheries#11251
-naics#112512#Shellfish Farming#11251
-naics#112519#Other Animal Aquaculture#11251
-naics#1129#Other Animal Production#112
-naics#11291#Apiculture#1129
-naics#11292#Horse and Other Equine Production#1129
-naics#11293#Fur-Bearing Animal and Rabbit Production#1129
-naics#11299#All Other Animal Production#1129
-naics#113#Forestry and Logging#11
-naics#1131#Timber Tract Operations#113
-naics#11311#Timber Tract Operations#1131
-naics#1132#Forest Nurseries and Gathering of Forest Products#113
-naics#11321#Forest Nurseries and Gathering of Forest Products#1132
-naics#1133#Logging#113
-naics#11331#Logging#1133
-naics#114#Fishing, Hunting and Trapping#11
-naics#1141#Fishing#114
-naics#11411#Fishing#1141
-naics#114111#Finfish Fishing#11411
-naics#114112#Shellfish Fishing#11411
-naics#114119#Other Marine Fishing#11411
-naics#1142#Hunting and Trapping#114
-naics#11421#Hunting and Trapping#1142
-naics#115#Support Activities for Agriculture and Forestry#11
-naics#1151#Support Activities for Crop Production#115
-naics#11511#Support Activities for Crop Production#1151
-naics#115111#Cotton Ginning#11511
-naics#115112#Soil Preparation, Planting, and Cultivating#11511
-naics#115113#Crop Harvesting, Primarily by Machine#11511
-naics#115114#Postharvest Crop Activities (except Cotton Ginning)#11511
-naics#115115#Farm Labor Contractors and Crew Leaders#11511
-naics#115116#Farm Management Services#11511
-naics#1152#Support Activities for Animal Production#115
-naics#11521#Support Activities for Animal Production#1152
-naics#1153#Support Activities for Forestry#115
-naics#11531#Support Activities for Forestry#1153
-naics#21#Mining#21
-naics#211#Oil and Gas Extraction#21
-naics#2111#Oil and Gas Extraction#211
-naics#21111#Oil and Gas Extraction#2111
-naics#211111#Crude Petroleum and Natural Gas Extraction#21111
-naics#211112#Natural Gas Liquid Extraction#21111
-naics#212#Mining (except Oil and Gas)#21
-naics#2121#Coal Mining#212
-naics#21211#Coal Mining#2121
-naics#212111#Bituminous Coal and Lignite Surface Mining#21211
-naics#212112#Bituminous Coal Underground Mining#21211
-naics#212113#Anthracite Mining#21211
-naics#2122#Metal Ore Mining#212
-naics#21221#Iron Ore Mining#2122
-naics#21222#Gold Ore and Silver Ore Mining#2122
-naics#212221#Gold Ore Mining#21222
-naics#212222#Silver Ore Mining#21222
-naics#21223#Copper, Nickel, Lead, and Zinc Mining#2122
-naics#212231#Lead Ore and Zinc Ore Mining#21223
-naics#212234#Copper Ore and Nickel Ore Mining#21223
-naics#21229#Other Metal Ore Mining#2122
-naics#212291#Uranium-Radium-Vanadium Ore Mining#21229
-naics#212299#All Other Metal Ore Mining#21229
-naics#2123#Nonmetallic Mineral Mining and Quarrying#212
-naics#21231#Stone Mining and Quarrying#2123
-naics#212311#Dimension Stone Mining and Quarrying#21231
-naics#212312#Crushed and Broken Limestone Mining and Quarrying#21231
-naics#212313#Crushed and Broken Granite Mining and Quarrying#21231
-naics#212319#Other Crushed and Broken Stone Mining and Quarrying#21231
-naics#21232#Sand, Gravel, Clay, and Ceramic and Refractory Minerals Mining and Quarrying#2123
-naics#212321#Construction Sand and Gravel Mining#21232
-naics#212322#Industrial Sand Mining#21232
-naics#212324#Kaolin and Ball Clay Mining#21232
-naics#212325#Clay and Ceramic and Refractory Minerals Mining#21232
-naics#21239#Other Nonmetallic Mineral Mining and Quarrying#2123
-naics#212391#Potash, Soda, and Borate Mineral Mining#21239
-naics#212392#Phosphate Rock Mining#21239
-naics#212393#Other Chemical and Fertilizer Mineral Mining#21239
-naics#212399#All Other Nonmetallic Mineral Mining#21239
-naics#213#Support Activities for Mining#21
-naics#2131#Support Activities for Mining#213
-naics#21311#Support Activities for Mining#2131
-naics#213111#Drilling Oil and Gas Wells#21311
-naics#213112#Support Activities for Oil and Gas Operations#21311
-naics#213113#Support Activities for Coal Mining#21311
-naics#213114#Support Activities for Metal Mining#21311
-naics#213115#Support Activities for Nonmetallic Minerals (except Fuels)#21311
-naics#22#Utilities#22
-naics#221#Utilities#22
-naics#2211#Electric Power Generation, Transmission and Distribution#221
-naics#22111#Electric Power Generation#2211
-naics#221111#Hydroelectric Power Generation#22111
-naics#221112#Fossil Fuel Electric Power Generation#22111
-naics#221113#Nuclear Electric Power Generation#22111
-naics#221119#Other Electric Power Generation#22111
-naics#22112#Electric Power Transmission, Control, and Distribution#2211
-naics#221121#Electric Bulk Power Transmission and Control#22112
-naics#221122#Electric Power Distribution#22112
-naics#2212#Natural Gas Distribution#221
-naics#22121#Natural Gas Distribution#2212
-naics#2213#Water, Sewage and Other Systems#221
-naics#22131#Water Supply and Irrigation Systems#2213
-naics#22132#Sewage Treatment Facilities#2213
-naics#22133#Steam and Air-Conditioning Supply#2213
-naics#23#Construction#23
-naics#233#Building, Developing, and General Contracting#23
-naics#2331#Land Subdivision and Land Development#233
-naics#23311#Land Subdivision and Land Development#2331
-naics#2332#Residential Building Construction#233
-naics#23321#Single Family Housing Construction#2332
-naics#23322#Multifamily Housing Construction#2332
-naics#2333#Nonresidential Building Construction#233
-naics#23331#Manufacturing and Industrial Building Construction#2333
-naics#23332#Commercial and Institutional Building Construction#2333
-naics#234#Heavy Construction#23
-naics#2341#Highway, Street, Bridge, and Tunnel Construction#234
-naics#23411#Highway and Street Construction#2341
-naics#23412#Bridge and Tunnel Construction#2341
-naics#2349#Other Heavy Construction#234
-naics#23491#Water, Sewer, and Pipeline Construction#2349
-naics#23492#Power and Communication Transmission Line Construction#2349
-naics#23493#Industrial Nonbuilding Structure Construction#2349
-naics#23499#All Other Heavy Construction#2349
-naics#235#Special Trade Contractors#23
-naics#2351#Plumbing, Heating, and Air-Conditioning Contractors#235
-naics#23511#Plumbing, Heating, and Air-Conditioning Contractors#2351
-naics#2352#Painting and Wall Covering Contractors#235
-naics#23521#Painting and Wall Covering Contractors#2352
-naics#2353#Electrical Contractors#235
-naics#23531#Electrical Contractors#2353
-naics#2354#Masonry, Drywall, Insulation, and Tile Contractors#235
-naics#23541#Masonry and Stone Contractors#2354
-naics#23542#Drywall, Plastering, Acoustical, and Insulation Contractors#2354
-naics#23543#Tile, Marble, Terrazzo, and Mosaic Contractors#2354
-naics#2355#Carpentry and Floor Contractors#235
-naics#23551#Carpentry Contractors#2355
-naics#23552#Floor Laying and Other Floor Contractors#2355
-naics#2356#Roofing, Siding, and Sheet Metal Contractors#235
-naics#23561#Roofing, Siding, and Sheet Metal Contractors#2356
-naics#2357#Concrete Contractors#235
-naics#23571#Concrete Contractors#2357
-naics#2358#Water Well Drilling Contractors#235
-naics#23581#Water Well Drilling Contractors#2358
-naics#2359#Other Special Trade Contractors#235
-naics#23591#Structural Steel Erection Contractors#2359
-naics#23592#Glass and Glazing Contractors#2359
-naics#23593#Excavation Contractors#2359
-naics#23594#Wrecking and Demolition Contractors#2359
-naics#23595#Building Equipment and Other Machinery Installation Contractors#2359
-naics#23599#All Other Special Trade Contractors#2359
-naics#31#Manufacturing#31
-naics#311#Food Manufacturing#31
-naics#3111#Animal Food Manufacturing#311
-naics#31111#Animal Food Manufacturing#3111
-naics#311111#Dog and Cat Food Manufacturing#31111
-naics#311119#Other Animal Food Manufacturing#31111
-naics#3112#Grain and Oilseed Milling#311
-naics#31121#Flour Milling and Malt Manufacturing#3112
-naics#311211#Flour Milling#31121
-naics#311212#Rice Milling#31121
-naics#311213#Malt Manufacturing#31121
-naics#31122#Starch and Vegetable Fats and Oils Manufacturing#3112
-naics#311221#Wet Corn Milling#31122
-naics#311222#Soybean Processing#31122
-naics#311223#Other Oilseed Processing#31122
-naics#311225#Fats and Oils Refining and Blending#31122
-naics#31123#Breakfast Cereal Manufacturing#3112
-naics#3113#Sugar and Confectionery Product Manufacturing#311
-naics#31131#Sugar Manufacturing#3113
-naics#311311#Sugarcane Mills#31131
-naics#311312#Cane Sugar Refining#31131
-naics#311313#Beet Sugar Manufacturing#31131
-naics#31132#Chocolate and Confectionery Manufacturing from Cacao Beans#3113
-naics#31133#Confectionery Manufacturing from Purchased Chocolate#3113
-naics#31134#Nonchocolate Confectionery Manufacturing#3113
-naics#3114#Fruit and Vegetable Preserving and Specialty Food Manufacturing#311
-naics#31141#Frozen Food Manufacturing#3114
-naics#311411#Frozen Fruit, Juice, and Vegetable Manufacturing#31141
-naics#311412#Frozen Specialty Food Manufacturing#31141
-naics#31142#Fruit and Vegetable Canning, Pickling, and Drying#3114
-naics#311421#Fruit and Vegetable Canning#31142
-naics#311422#Specialty Canning#31142
-naics#311423#Dried and Dehydrated Food Manufacturing#31142
-naics#3115#Dairy Product Manufacturing#311
-naics#31151#Dairy Product (except Frozen) Manufacturing#3115
-naics#311511#Fluid Milk Manufacturing#31151
-naics#311512#Creamery Butter Manufacturing#31151
-naics#311513#Cheese Manufacturing#31151
-naics#311514#Dry, Condensed, and Evaporated Dairy Product Manufacturing#31151
-naics#31152#Ice Cream and Frozen Dessert Manufacturing#3115
-naics#3116#Animal Slaughtering and Processing#311
-naics#31161#Animal Slaughtering and Processing#3116
-naics#311611#Animal (except Poultry) Slaughtering#31161
-naics#311612#Meat Processed from Carcasses#31161
-naics#311613#Rendering and Meat Byproduct Processing#31161
-naics#311615#Poultry Processing#31161
-naics#3117#Seafood Product Preparation and Packaging#311
-naics#31171#Seafood Product Preparation and Packaging#3117
-naics#311711#Seafood Canning#31171
-naics#311712#Fresh and Frozen Seafood Processing#31171
-naics#3118#Bakeries and Tortilla Manufacturing#311
-naics#31181#Bread and Bakery Product Manufacturing#3118
-naics#311811#Retail Bakeries#31181
-naics#311812#Commercial Bakeries#31181
-naics#311813#Frozen Cakes, Pies, and Other Pastries Manufacturing#31181
-naics#31182#Cookie, Cracker, and Pasta Manufacturing#3118
-naics#311821#Cookie and Cracker Manufacturing#31182
-naics#311822#Flour Mixes and Dough Manufacturing from Purchased Flour#31182
-naics#311823#Dry Pasta Manufacturing#31182
-naics#31183#Tortilla Manufacturing#3118
-naics#3119#Other Food Manufacturing#311
-naics#31191#Snack Food Manufacturing#3119
-naics#311911#Roasted Nuts and Peanut Butter Manufacturing#31191
-naics#311919#Other Snack Food Manufacturing#31191
-naics#31192#Coffee and Tea Manufacturing#3119
-naics#31193#Flavoring Syrup and Concentrate Manufacturing#3119
-naics#31194#Seasoning and Dressing Manufacturing#3119
-naics#311941#Mayonnaise, Dressing, and Other Prepared Sauce Manufacturing#31194
-naics#311942#Spice and Extract Manufacturing#31194
-naics#31199#All Other Food Manufacturing#3119
-naics#311991#Perishable Prepared Food Manufacturing#31199
-naics#311999#All Other Miscellaneous Food Manufacturing#31199
-naics#312#Beverage and Tobacco Product Manufacturing#31
-naics#3121#Beverage Manufacturing#312
-naics#31211#Soft Drink and Ice Manufacturing#3121
-naics#312111#Soft Drink Manufacturing#31211
-naics#312112#Bottled Water Manufacturing#31211
-naics#312113#Ice Manufacturing#31211
-naics#31212#Breweries#3121
-naics#31213#Wineries#3121
-naics#31214#Distilleries#3121
-naics#3122#Tobacco Manufacturing#312
-naics#31221#Tobacco Stemming and Redrying#3122
-naics#31222#Tobacco Product Manufacturing#3122
-naics#312221#Cigarette Manufacturing#31222
-naics#312229#Other Tobacco Product Manufacturing#31222
-naics#313#Textile Mills#31
-naics#3131#Fiber, Yarn, and Thread Mills#313
-naics#31311#Fiber, Yarn, and Thread Mills#3131
-naics#313111#Yarn Spinning Mills#31311
-naics#313112#Yarn Texturizing, Throwing, and Twisting Mills#31311
-naics#313113#Thread Mills#31311
-naics#3132#Fabric Mills#313
-naics#31321#Broadwoven Fabric Mills#3132
-naics#31322#Narrow Fabric Mills and Schiffli Machine Embroidery#3132
-naics#313221#Narrow Fabric Mills#31322
-naics#313222#Schiffli Machine Embroidery#31322
-naics#31323#Nonwoven Fabric Mills#3132
-naics#31324#Knit Fabric Mills#3132
-naics#313241#Weft Knit Fabric Mills#31324
-naics#313249#Other Knit Fabric and Lace Mills#31324
-naics#3133#Textile and Fabric Finishing and Fabric Coating Mills#313
-naics#31331#Textile and Fabric Finishing Mills#3133
-naics#313311#Broadwoven Fabric Finishing Mills#31331
-naics#313312#Textile and Fabric Finishing (except Broadwoven Fabric) Mills#31331
-naics#31332#Fabric Coating Mills#3133
-naics#314#Textile Product Mills#31
-naics#3141#Textile Furnishings Mills#314
-naics#31411#Carpet and Rug Mills#3141
-naics#31412#Curtain and Linen Mills#3141
-naics#314121#Curtain and Drapery Mills#31412
-naics#314129#Other Household Textile Product Mills#31412
-naics#3149#Other Textile Product Mills#314
-naics#31491#Textile Bag and Canvas Mills#3149
-naics#314911#Textile Bag Mills#31491
-naics#314912#Canvas and Related Product Mills#31491
-naics#31499#All Other Textile Product Mills#3149
-naics#314991#Rope, Cordage, and Twine Mills#31499
-naics#314992#Tire Cord and Tire Fabric Mills#31499
-naics#314999#All Other Miscellaneous Textile Product Mills#31499
-naics#315#Apparel Manufacturing#31
-naics#3151#Apparel Knitting Mills#315
-naics#31511#Hosiery and Sock Mills#3151
-naics#315111#Sheer Hosiery Mills#31511
-naics#315119#Other Hosiery and Sock Mills#31511
-naics#31519#Other Apparel Knitting Mills#3151
-naics#315191#Outerwear Knitting Mills#31519
-naics#315192#Underwear and Nightwear Knitting Mills#31519
-naics#3152#Cut and Sew Apparel Manufacturing#315
-naics#31521#Cut and Sew Apparel Contractors#3152
-naics#315211#Men's and Boys' Cut and Sew Apparel Contractors#31521
-naics#315212#Women's, Girls', and Infants' Cut and Sew Apparel Contractors#31521
-naics#31522#Men's and Boys' Cut and Sew Apparel Manufacturing#3152
-naics#315221#Men's and Boys' Cut and Sew Underwear and Nightwear Manufacturing#31522
-naics#315222#Men's and Boys' Cut and Sew Suit, Coat, and Overcoat Manufacturing#31522
-naics#315223#Men's and Boys' Cut and Sew Shirt (except Work Shirt) Manufacturing#31522
-naics#315224#Men's and Boys' Cut and Sew Trouser, Slack, and Jean Manufacturing#31522
-naics#315225#Men's and Boys' Cut and Sew Work Clothing Manufacturing#31522
-naics#315228#Men's and Boys' Cut and Sew Other Outerwear Manufacturing#31522
-naics#31523#Women's and Girls' Cut and Sew Apparel Manufacturing#3152
-naics#315231#Women's and Girls' Cut and Sew Lingerie, Loungewear, and Nightwear Manufacturing#31523
-naics#315232#Women's and Girls' Cut and Sew Blouse and Shirt Manufacturing#31523
-naics#315233#Women's and Girls' Cut and Sew Dress Manufacturing#31523
-naics#315234#Women's and Girls' Cut and Sew Suit, Coat, Tailored Jacket, and Skirt Manufacturing#31523
-naics#315239#Women's and Girls' Cut and Sew Other Outerwear Manufacturing#31523
-naics#31529#Other Cut and Sew Apparel Manufacturing#3152
-naics#315291#Infants' Cut and Sew Apparel Manufacturing#31529
-naics#315292#Fur and Leather Apparel Manufacturing#31529
-naics#315299#All Other Cut and Sew Apparel Manufacturing#31529
-naics#3159#Apparel Accessories and Other Apparel Manufacturing#315
-naics#31599#Apparel Accessories and Other Apparel Manufacturing#3159
-naics#315991#Hat, Cap, and Millinery Manufacturing#31599
-naics#315992#Glove and Mitten Manufacturing#31599
-naics#315993#Men's and Boys' Neckwear Manufacturing#31599
-naics#315999#Other Apparel Accessories and Other Apparel Manufacturing#31599
-naics#316#Leather and Allied Product Manufacturing#31
-naics#3161#Leather and Hide Tanning and Finishing#316
-naics#31611#Leather and Hide Tanning and Finishing#3161
-naics#3162#Footwear Manufacturing#316
-naics#31621#Footwear Manufacturing#3162
-naics#316211#Rubber and Plastics Footwear Manufacturing#31621
-naics#316212#House Slipper Manufacturing#31621
-naics#316213#Men's Footwear (except Athletic) Manufacturing#31621
-naics#316214#Women's Footwear (except Athletic) Manufacturing#31621
-naics#316219#Other Footwear Manufacturing#31621
-naics#3169#Other Leather and Allied Product Manufacturing#316
-naics#31699#Other Leather and Allied Product Manufacturing#3169
-naics#316991#Luggage Manufacturing#31699
-naics#316992#Women's Handbag and Purse Manufacturing#31699
-naics#316993#Personal Leather Good (except Women's Handbag and Purse) Manufacturing#31699
-naics#316999#All Other Leather Good Manufacturing#31699
-naics#32#Manufacturing#32
-naics#321#Wood Product Manufacturing#32
-naics#3211#Sawmills and Wood Preservation#321
-naics#32111#Sawmills and Wood Preservation#3211
-naics#321113#Sawmills#32111
-naics#321114#Wood Preservation#32111
-naics#3212#Veneer, Plywood, and Engineered Wood Product Manufacturing#321
-naics#32121#Veneer, Plywood, and Engineered Wood Product Manufacturing#3212
-naics#321211#Hardwood Veneer and Plywood Manufacturing#32121
-naics#321212#Softwood Veneer and Plywood Manufacturing#32121
-naics#321213#Engineered Wood Member (except Truss) Manufacturing#32121
-naics#321214#Truss Manufacturing#32121
-naics#321219#Reconstituted Wood Product Manufacturing#32121
-naics#3219#Other Wood Product Manufacturing#321
-naics#32191#Millwork#3219
-naics#321911#Wood Window and Door Manufacturing#32191
-naics#321912#Cut Stock, Resawing Lumber, and Planing#32191
-naics#321918#Other Millwork (including Flooring)#32191
-naics#32192#Wood Container and Pallet Manufacturing#3219
-naics#32199#All Other Wood Product Manufacturing#3219
-naics#321991#Manufactured Home (Mobile Home) Manufacturing#32199
-naics#321992#Prefabricated Wood Building Manufacturing#32199
-naics#321999#All Other Miscellaneous Wood Product Manufacturing#32199
-naics#322#Paper Manufacturing#32
-naics#3221#Pulp, Paper, and Paperboard Mills#322
-naics#32211#Pulp Mills#3221
-naics#32212#Paper Mills#3221
-naics#322121#Paper (except Newsprint) Mills#32212
-naics#322122#Newsprint Mills#32212
-naics#32213#Paperboard Mills#3221
-naics#3222#Converted Paper Product Manufacturing#322
-naics#32221#Paperboard Container Manufacturing#3222
-naics#322211#Corrugated and Solid Fiber Box Manufacturing#32221
-naics#322212#Folding Paperboard Box Manufacturing#32221
-naics#322213#Setup Paperboard Box Manufacturing#32221
-naics#322214#Fiber Can, Tube, Drum, and Similar Products Manufacturing#32221
-naics#322215#Nonfolding Sanitary Food Container Manufacturing#32221
-naics#32222#Paper Bag and Coated and Treated Paper Manufacturing#3222
-naics#322221#Coated and Laminated Packaging Paper and Plastics Film Manufacturing#32222
-naics#322222#Coated and Laminated Paper Manufacturing#32222
-naics#322223#Plastics, Foil, and Coated Paper Bag Manufacturing#32222
-naics#322224#Uncoated Paper and Multiwall Bag Manufacturing#32222
-naics#322225#Laminated Aluminum Foil Manufacturing for Flexible Packaging Uses#32222
-naics#322226#Surface-Coated Paperboard Manufacturing#32222
-naics#32223#Stationery Product Manufacturing#3222
-naics#322231#Die-Cut Paper and Paperboard Office Supplies Manufacturing#32223
-naics#322232#Envelope Manufacturing#32223
-naics#322233#Stationery, Tablet, and Related Product Manufacturing#32223
-naics#32229#Other Converted Paper Product Manufacturing#3222
-naics#322291#Sanitary Paper Product Manufacturing#32229
-naics#322299#All Other Converted Paper Product Manufacturing#32229
-naics#323#Printing and Related Support Activities#32
-naics#3231#Printing and Related Support Activities#323
-naics#32311#Printing#3231
-naics#323110#Commercial Lithographic Printing#32311
-naics#323111#Commercial Gravure Printing#32311
-naics#323112#Commercial Flexographic Printing#32311
-naics#323113#Commercial Screen Printing#32311
-naics#323114#Quick Printing#32311
-naics#323115#Digital Printing#32311
-naics#323116#Manifold Business Forms Printing#32311
-naics#323117#Books Printing#32311
-naics#323118#Blankbook, Looseleaf Binders, and Devices Manufacturing#32311
-naics#323119#Other Commercial Printing#32311
-naics#32312#Support Activities for Printing#3231
-naics#323121#Tradebinding and Related Work#32312
-naics#323122#Prepress Services#32312
-naics#324#Petroleum and Coal Products Manufacturing#32
-naics#3241#Petroleum and Coal Products Manufacturing#324
-naics#32411#Petroleum Refineries#3241
-naics#32412#Asphalt Paving, Roofing, and Saturated Materials Manufacturing#3241
-naics#324121#Asphalt Paving Mixture and Block Manufacturing#32412
-naics#324122#Asphalt Shingle and Coating Materials Manufacturing#32412
-naics#32419#Other Petroleum and Coal Products Manufacturing#3241
-naics#324191#Petroleum Lubricating Oil and Grease Manufacturing#32419
-naics#324199#All Other Petroleum and Coal Products Manufacturing#32419
-naics#325#Chemical Manufacturing#32
-naics#3251#Basic Chemical Manufacturing#325
-naics#32511#Petrochemical Manufacturing#3251
-naics#32512#Industrial Gas Manufacturing#3251
-naics#32513#Synthetic Dye and Pigment Manufacturing#3251
-naics#325131#Inorganic Dye and Pigment Manufacturing#32513
-naics#325132#Synthetic Organic Dye and Pigment Manufacturing#32513
-naics#32518#Other Basic Inorganic Chemical Manufacturing#3251
-naics#325181#Alkalies and Chlorine Manufacturing#32518
-naics#325182#Carbon Black Manufacturing#32518
-naics#325188#All Other Basic Inorganic Chemical Manufacturing#32518
-naics#32519#Other Basic Organic Chemical Manufacturing#3251
-naics#325191#Gum and Wood Chemical Manufacturing#32519
-naics#325192#Cyclic Crude and Intermediate Manufacturing#32519
-naics#325193#Ethyl Alcohol Manufacturing#32519
-naics#325199#All Other Basic Organic Chemical Manufacturing#32519
-naics#3252#Resin, Synthetic Rubber, and Artificial and Synthetic Fibers and Filaments Manufacturing#325
-naics#32521#Resin and Synthetic Rubber Manufacturing#3252
-naics#325211#Plastics Material and Resin Manufacturing#32521
-naics#325212#Synthetic Rubber Manufacturing#32521
-naics#32522#Artificial and Synthetic Fibers and Filaments Manufacturing#3252
-naics#325221#Cellulosic Organic Fiber Manufacturing#32522
-naics#325222#Noncellulosic Organic Fiber Manufacturing#32522
-naics#3253#Pesticide, Fertilizer, and Other Agricultural Chemical Manufacturing#325
-naics#32531#Fertilizer Manufacturing#3253
-naics#325311#Nitrogenous Fertilizer Manufacturing#32531
-naics#325312#Phosphatic Fertilizer Manufacturing#32531
-naics#325314#Fertilizer (Mixing Only) Manufacturing#32531
-naics#32532#Pesticide and Other Agricultural Chemical Manufacturing#3253
-naics#3254#Pharmaceutical and Medicine Manufacturing#325
-naics#32541#Pharmaceutical and Medicine Manufacturing#3254
-naics#325411#Medicinal and Botanical Manufacturing#32541
-naics#325412#Pharmaceutical Preparation Manufacturing#32541
-naics#325413#In-Vitro Diagnostic Substance Manufacturing#32541
-naics#325414#Biological Product (except Diagnostic) Manufacturing#32541
-naics#3255#Paint, Coating, and Adhesive Manufacturing#325
-naics#32551#Paint and Coating Manufacturing#3255
-naics#32552#Adhesive Manufacturing#3255
-naics#3256#Soap, Cleaning Compound, and Toilet Preparation Manufacturing#325
-naics#32561#Soap and Cleaning Compound Manufacturing#3256
-naics#325611#Soap and Other Detergent Manufacturing#32561
-naics#325612#Polish and Other Sanitation Good Manufacturing#32561
-naics#325613#Surface Active Agent Manufacturing#32561
-naics#32562#Toilet Preparation Manufacturing#3256
-naics#3259#Other Chemical Product and Preparation Manufacturing#325
-naics#32591#Printing Ink Manufacturing#3259
-naics#32592#Explosives Manufacturing#3259
-naics#32599#All Other Chemical Product and Preparation Manufacturing#3259
-naics#325991#Custom Compounding of Purchased Resins#32599
-naics#325992#Photographic Film, Paper, Plate, and Chemical Manufacturing#32599
-naics#325998#All Other Miscellaneous Chemical Product and Preparation Manufacturing#32599
-naics#326#Plastics and Rubber Products Manufacturing#32
-naics#3261#Plastics Product Manufacturing#326
-naics#32611#Unsupported Plastics Film, Sheet, and Bag Manufacturing#3261
-naics#326111#Unsupported Plastics Bag Manufacturing#32611
-naics#326112#Unsupported Plastics Packaging Film and Sheet Manufacturing#32611
-naics#326113#Unsupported Plastics Film and Sheet (except Packaging) Manufacturing#32611
-naics#32612#Plastics Pipe, Pipe Fitting, and Unsupported Profile Shape Manufacturing#3261
-naics#326121#Unsupported Plastics Profile Shape Manufacturing#32612
-naics#326122#Plastics Pipe and Pipe Fitting Manufacturing#32612
-naics#32613#Laminated Plastics Plate, Sheet, and Shape Manufacturing#3261
-naics#32614#Polystyrene Foam Product Manufacturing#3261
-naics#32615#Urethane and Other Foam Product (except Polystyrene) Manufacturing#3261
-naics#32616#Plastics Bottle Manufacturing#3261
-naics#32619#Other Plastics Product Manufacturing#3261
-naics#326191#Plastics Plumbing Fixture Manufacturing#32619
-naics#326192#Resilient Floor Covering Manufacturing#32619
-naics#326199#All Other Plastics Product Manufacturing#32619
-naics#3262#Rubber Product Manufacturing#326
-naics#32621#Tire Manufacturing#3262
-naics#326211#Tire Manufacturing (except Retreading)#32621
-naics#326212#Tire Retreading#32621
-naics#32622#Rubber and Plastics Hoses and Belting Manufacturing#3262
-naics#32629#Other Rubber Product Manufacturing#3262
-naics#326291#Rubber Product Manufacturing for Mechanical Use#32629
-naics#326299#All Other Rubber Product Manufacturing#32629
-naics#327#Nonmetallic Mineral Product Manufacturing#32
-naics#3271#Clay Product and Refractory Manufacturing#327
-naics#32711#Pottery, Ceramics, and Plumbing Fixture Manufacturing#3271
-naics#327111#Vitreous China Plumbing Fixture and China and Earthenware Bathroom Accessories Manufacturing#32711
-naics#327112#Vitreous China, Fine Earthenware, and Other Pottery Product Manufacturing#32711
-naics#327113#Porcelain Electrical Supply Manufacturing#32711
-naics#32712#Clay Building Material and Refractories Manufacturing#3271
-naics#327121#Brick and Structural Clay Tile Manufacturing#32712
-naics#327122#Ceramic Wall and Floor Tile Manufacturing#32712
-naics#327123#Other Structural Clay Product Manufacturing#32712
-naics#327124#Clay Refractory Manufacturing#32712
-naics#327125#Nonclay Refractory Manufacturing#32712
-naics#3272#Glass and Glass Product Manufacturing#327
-naics#32721#Glass and Glass Product Manufacturing#3272
-naics#327211#Flat Glass Manufacturing#32721
-naics#327212#Other Pressed and Blown Glass and Glassware Manufacturing#32721
-naics#327213#Glass Container Manufacturing#32721
-naics#327215#Glass Product Manufacturing Made of Purchased Glass#32721
-naics#3273#Cement and Concrete Product Manufacturing#327
-naics#32731#Cement Manufacturing#3273
-naics#32732#Ready-Mix Concrete Manufacturing#3273
-naics#32733#Concrete Pipe, Brick, and Block Manufacturing#3273
-naics#327331#Concrete Block and Brick Manufacturing#32733
-naics#327332#Concrete Pipe Manufacturing#32733
-naics#32739#Other Concrete Product Manufacturing#3273
-naics#3274#Lime and Gypsum Product Manufacturing#327
-naics#32741#Lime Manufacturing#3274
-naics#32742#Gypsum Product Manufacturing#3274
-naics#3279#Other Nonmetallic Mineral Product Manufacturing#327
-naics#32791#Abrasive Product Manufacturing#3279
-naics#32799#All Other Nonmetallic Mineral Product Manufacturing#3279
-naics#327991#Cut Stone and Stone Product Manufacturing#32799
-naics#327992#Ground or Treated Mineral and Earth Manufacturing#32799
-naics#327993#Mineral Wool Manufacturing#32799
-naics#327999#All Other Miscellaneous Nonmetallic Mineral Product Manufacturing#32799
-naics#33#Manufacturing#33
-naics#331#Primary Metal Manufacturing#33
-naics#3311#Iron and Steel Mills and Ferroalloy Manufacturing#331
-naics#33111#Iron and Steel Mills and Ferroalloy Manufacturing#3311
-naics#331111#Iron and Steel Mills#33111
-naics#331112#Electrometallurgical Ferroalloy Product Manufacturing#33111
-naics#3312#Steel Product Manufacturing from Purchased Steel#331
-naics#33121#Iron and Steel Pipe and Tube Manufacturing from Purchased Steel#3312
-naics#33122#Rolling and Drawing of Purchased Steel#3312
-naics#331221#Rolled Steel Shape Manufacturing#33122
-naics#331222#Steel Wire Drawing#33122
-naics#3313#Alumina and Aluminum Production and Processing#331
-naics#33131#Alumina and Aluminum Production and Processing#3313
-naics#331311#Alumina Refining#33131
-naics#331312#Primary Aluminum Production#33131
-naics#331314#Secondary Smelting and Alloying of Aluminum#33131
-naics#331315#Aluminum Sheet, Plate, and Foil Manufacturing#33131
-naics#331316#Aluminum Extruded Product Manufacturing#33131
-naics#331319#Other Aluminum Rolling and Drawing#33131
-naics#3314#Nonferrous Metal (except Aluminum) Production and Processing#331
-naics#33141#Nonferrous Metal (except Aluminum) Smelting and Refining#3314
-naics#331411#Primary Smelting and Refining of Copper#33141
-naics#331419#Primary Smelting and Refining of Nonferrous Metal (except Copper and Aluminum)#33141
-naics#33142#Copper Rolling, Drawing, Extruding, and Alloying#3314
-naics#331421#Copper Rolling, Drawing, and Extruding#33142
-naics#331422#Copper Wire (except Mechanical) Drawing#33142
-naics#331423#Secondary Smelting, Refining, and Alloying of Copper#33142
-naics#33149#Nonferrous Metal (except Copper and Aluminum) Rolling, Drawing, Extruding, and Alloying#3314
-naics#331491#Nonferrous Metal (except Copper and Aluminum) Rolling, Drawing, and Extruding#33149
-naics#331492#Secondary Smelting, Refining, and Alloying of Nonferrous Metal (except Copper and Aluminum)#33149
-naics#3315#Foundries#331
-naics#33151#Ferrous Metal Foundries#3315
-naics#331511#Iron Foundries#33151
-naics#331512#Steel Investment Foundries#33151
-naics#331513#Steel Foundries (except Investment)#33151
-naics#33152#Nonferrous Metal Foundries#3315
-naics#331521#Aluminum Die-Casting Foundries#33152
-naics#331522#Nonferrous (except Aluminum) Die-Casting Foundries#33152
-naics#331524#Aluminum Foundries (except Die-Casting)#33152
-naics#331525#Copper Foundries (except Die-Casting)#33152
-naics#331528#Other Nonferrous Foundries (except Die-Casting)#33152
-naics#332#Fabricated Metal Product Manufacturing#33
-naics#3321#Forging and Stamping#332
-naics#33211#Forging and Stamping#3321
-naics#332111#Iron and Steel Forging#33211
-naics#332112#Nonferrous Forging#33211
-naics#332114#Custom Roll Forming#33211
-naics#332115#Crown and Closure Manufacturing#33211
-naics#332116#Metal Stamping#33211
-naics#332117#Powder Metallurgy Part Manufacturing#33211
-naics#3322#Cutlery and Handtool Manufacturing#332
-naics#33221#Cutlery and Handtool Manufacturing#3322
-naics#332211#Cutlery and Flatware (except Precious) Manufacturing#33221
-naics#332212#Hand and Edge Tool Manufacturing#33221
-naics#332213#Saw Blade and Handsaw Manufacturing#33221
-naics#332214#Kitchen Utensil, Pot, and Pan Manufacturing#33221
-naics#3323#Architectural and Structural Metals Manufacturing#332
-naics#33231#Plate Work and Fabricated Structural Product Manufacturing#3323
-naics#332311#Prefabricated Metal Building and Component Manufacturing#33231
-naics#332312#Fabricated Structural Metal Manufacturing#33231
-naics#332313#Plate Work Manufacturing#33231
-naics#33232#Ornamental and Architectural Metal Products Manufacturing#3323
-naics#332321#Metal Window and Door Manufacturing#33232
-naics#332322#Sheet Metal Work Manufacturing#33232
-naics#332323#Ornamental and Architectural Metal Work Manufacturing#33232
-naics#3324#Boiler, Tank, and Shipping Container Manufacturing#332
-naics#33241#Power Boiler and Heat Exchanger Manufacturing#3324
-naics#33242#Metal Tank (Heavy Gauge) Manufacturing#3324
-naics#33243#Metal Can, Box, and Other Metal Container (Light Gauge) Manufacturing#3324
-naics#332431#Metal Can Manufacturing#33243
-naics#332439#Other Metal Container Manufacturing#33243
-naics#3325#Hardware Manufacturing#332
-naics#33251#Hardware Manufacturing#3325
-naics#3326#Spring and Wire Product Manufacturing#332
-naics#33261#Spring and Wire Product Manufacturing#3326
-naics#332611#Spring (Heavy Gauge) Manufacturing#33261
-naics#332612#Spring (Light Gauge) Manufacturing#33261
-naics#332618#Other Fabricated Wire Product Manufacturing#33261
-naics#3327#Machine Shops; Turned Product; and Screw, Nut, and Bolt Manufacturing#332
-naics#33271#Machine Shops#3327
-naics#33272#Turned Product and Screw, Nut, and Bolt Manufacturing#3327
-naics#332721#Precision Turned Product Manufacturing#33272
-naics#332722#Bolt, Nut, Screw, Rivet, and Washer Manufacturing#33272
-naics#3328#Coating, Engraving, Heat Treating, and Allied Activities#332
-naics#33281#Coating, Engraving, Heat Treating, and Allied Activities#3328
-naics#332811#Metal Heat Treating#33281
-naics#332812#Metal Coating, Engraving (except Jewelry and Silverware), and Allied Services to Manufacturers#33281
-naics#332813#Electroplating, Plating, Polishing, Anodizing, and Coloring#33281
-naics#3329#Other Fabricated Metal Product Manufacturing#332
-naics#33291#Metal Valve Manufacturing#3329
-naics#332911#Industrial Valve Manufacturing#33291
-naics#332912#Fluid Power Valve and Hose Fitting Manufacturing#33291
-naics#332913#Plumbing Fixture Fitting and Trim Manufacturing#33291
-naics#332919#Other Metal Valve and Pipe Fitting Manufacturing#33291
-naics#33299#All Other Fabricated Metal Product Manufacturing#3329
-naics#332991#Ball and Roller Bearing Manufacturing#33299
-naics#332992#Small Arms Ammunition Manufacturing#33299
-naics#332993#Ammunition (except Small Arms) Manufacturing#33299
-naics#332994#Small Arms Manufacturing#33299
-naics#332995#Other Ordnance and Accessories Manufacturing#33299
-naics#332996#Fabricated Pipe and Pipe Fitting Manufacturing#33299
-naics#332997#Industrial Pattern Manufacturing#33299
-naics#332998#Enameled Iron and Metal Sanitary Ware Manufacturing#33299
-naics#332999#All Other Miscellaneous Fabricated Metal Product Manufacturing#33299
-naics#333#Machinery Manufacturing#33
-naics#3331#Agriculture, Construction, and Mining Machinery Manufacturing#333
-naics#33311#Agricultural Implement Manufacturing#3331
-naics#333111#Farm Machinery and Equipment Manufacturing#33311
-naics#333112#Lawn and Garden Tractor and Home Lawn and Garden Equipment Manufacturing#33311
-naics#33312#Construction Machinery Manufacturing#3331
-naics#33313#Mining and Oil and Gas Field Machinery Manufacturing#3331
-naics#333131#Mining Machinery and Equipment Manufacturing#33313
-naics#333132#Oil and Gas Field Machinery and Equipment Manufacturing#33313
-naics#3332#Industrial Machinery Manufacturing#333
-naics#33321#Sawmill and Woodworking Machinery Manufacturing#3332
-naics#33322#Plastics and Rubber Industry Machinery Manufacturing#3332
-naics#33329#Other Industrial Machinery Manufacturing#3332
-naics#333291#Paper Industry Machinery Manufacturing#33329
-naics#333292#Textile Machinery Manufacturing#33329
-naics#333293#Printing Machinery and Equipment Manufacturing#33329
-naics#333294#Food Product Machinery Manufacturing#33329
-naics#333295#Semiconductor Machinery Manufacturing#33329
-naics#333298#All Other Industrial Machinery Manufacturing#33329
-naics#3333#Commercial and Service Industry Machinery Manufacturing#333
-naics#33331#Commercial and Service Industry Machinery Manufacturing#3333
-naics#333311#Automatic Vending Machine Manufacturing#33331
-naics#333312#Commercial Laundry, Drycleaning, and Pressing Machine Manufacturing#33331
-naics#333313#Office Machinery Manufacturing#33331
-naics#333314#Optical Instrument and Lens Manufacturing#33331
-naics#333315#Photographic and Photocopying Equipment Manufacturing#33331
-naics#333319#Other Commercial and Service Industry Machinery Manufacturing#33331
-naics#3334#Ventilation, Heating, Air-Conditioning, and Commercial Refrigeration Equipment Manufacturing#333
-naics#33341#Ventilation, Heating, Air-Conditioning, and Commercial Refrigeration Equipment Manufacturing#3334
-naics#333411#Air Purification Equipment Manufacturing#33341
-naics#333412#Industrial and Commercial Fan and Blower Manufacturing#33341
-naics#333414#Heating Equipment (except Warm Air Furnaces) Manufacturing#33341
-naics#333415#Air-Conditioning and Warm Air Heating Equipment and Commercial and Industrial Refrigeration Equipment Manufacturing#33341
-naics#3335#Metalworking Machinery Manufacturing#333
-naics#33351#Metalworking Machinery Manufacturing#3335
-naics#333511#Industrial Mold Manufacturing#33351
-naics#333512#Machine Tool (Metal Cutting Types) Manufacturing#33351
-naics#333513#Machine Tool (Metal Forming Types) Manufacturing#33351
-naics#333514#Special Die and Tool, Die Set, Jig, and Fixture Manufacturing#33351
-naics#333515#Cutting Tool and Machine Tool Accessory Manufacturing#33351
-naics#333516#Rolling Mill Machinery and Equipment Manufacturing#33351
-naics#333518#Other Metalworking Machinery Manufacturing#33351
-naics#3336#Engine, Turbine, and Power Transmission Equipment Manufacturing#333
-naics#33361#Engine, Turbine, and Power Transmission Equipment Manufacturing#3336
-naics#333611#Turbine and Turbine Generator Set Units Manufacturing#33361
-naics#333612#Speed Changer, Industrial High-Speed Drive, and Gear Manufacturing#33361
-naics#333613#Mechanical Power Transmission Equipment Manufacturing#33361
-naics#333618#Other Engine Equipment Manufacturing#33361
-naics#3339#Other General Purpose Machinery Manufacturing#333
-naics#33391#Pump and Compressor Manufacturing#3339
-naics#333911#Pump and Pumping Equipment Manufacturing#33391
-naics#333912#Air and Gas Compressor Manufacturing#33391
-naics#333913#Measuring and Dispensing Pump Manufacturing#33391
-naics#33392#Material Handling Equipment Manufacturing#3339
-naics#333921#Elevator and Moving Stairway Manufacturing#33392
-naics#333922#Conveyor and Conveying Equipment Manufacturing#33392
-naics#333923#Overhead Traveling Crane, Hoist, and Monorail System Manufacturing#33392
-naics#333924#Industrial Truck, Tractor, Trailer, and Stacker Machinery Manufacturing#33392
-naics#33399#All Other General Purpose Machinery Manufacturing#3339
-naics#333991#Power-Driven Handtool Manufacturing#33399
-naics#333992#Welding and Soldering Equipment Manufacturing#33399
-naics#333993#Packaging Machinery Manufacturing#33399
-naics#333994#Industrial Process Furnace and Oven Manufacturing#33399
-naics#333995#Fluid Power Cylinder and Actuator Manufacturing#33399
-naics#333996#Fluid Power Pump and Motor Manufacturing#33399
-naics#333997#Scale and Balance (except Laboratory) Manufacturing#33399
-naics#333999#All Other Miscellaneous General Purpose Machinery Manufacturing#33399
-naics#334#Computer and Electronic Product Manufacturing#33
-naics#3341#Computer and Peripheral Equipment Manufacturing#334
-naics#33411#Computer and Peripheral Equipment Manufacturing#3341
-naics#334111#Electronic Computer Manufacturing#33411
-naics#334112#Computer Storage Device Manufacturing#33411
-naics#334113#Computer Terminal Manufacturing#33411
-naics#334119#Other Computer Peripheral Equipment Manufacturing#33411
-naics#3342#Communications Equipment Manufacturing#334
-naics#33421#Telephone Apparatus Manufacturing#3342
-naics#33422#Radio and Television Broadcasting and Wireless Communications Equipment Manufacturing#3342
-naics#33429#Other Communications Equipment Manufacturing#3342
-naics#3343#Audio and Video Equipment Manufacturing#334
-naics#33431#Audio and Video Equipment Manufacturing#3343
-naics#3344#Semiconductor and Other Electronic Component Manufacturing#334
-naics#33441#Semiconductor and Other Electronic Component Manufacturing#3344
-naics#334411#Electron Tube Manufacturing#33441
-naics#334412#Bare Printed Circuit Board Manufacturing#33441
-naics#334413#Semiconductor and Related Device Manufacturing#33441
-naics#334414#Electronic Capacitor Manufacturing#33441
-naics#334415#Electronic Resistor Manufacturing#33441
-naics#334416#Electronic Coil, Transformer, and Other Inductor Manufacturing#33441
-naics#334417#Electronic Connector Manufacturing#33441
-naics#334418#Printed Circuit Assembly (Electronic Assembly) Manufacturing#33441
-naics#334419#Other Electronic Component Manufacturing#33441
-naics#3345#Navigational, Measuring, Electromedical, and Control Instruments Manufacturing#334
-naics#33451#Navigational, Measuring, Electromedical, and Control Instruments Manufacturing#3345
-naics#334510#Electromedical and Electrotherapeutic Apparatus Manufacturing#33451
-naics#334511#Search, Detection, Navigation, Guidance, Aeronautical, and Nautical System and Instrument Manufacturing#33451
-naics#334512#Automatic Environmental Control Manufacturing for Residential, Commercial, and Appliance Use#33451
-naics#334513#Instruments and Related Products Manufacturing for Measuring, Displaying, and Controlling Industrial Process Variables#33451
-naics#334514#Totalizing Fluid Meter and Counting Device Manufacturing#33451
-naics#334515#Instrument Manufacturing for Measuring and Testing Electricity and Electrical Signals#33451
-naics#334516#Analytical Laboratory Instrument Manufacturing#33451
-naics#334517#Irradiation Apparatus Manufacturing#33451
-naics#334518#Watch, Clock, and Part Manufacturing#33451
-naics#334519#Other Measuring and Controlling Device Manufacturing#33451
-naics#3346#Manufacturing and Reproducing Magnetic and Optical Media#334
-naics#33461#Manufacturing and Reproducing Magnetic and Optical Media#3346
-naics#334611#Software Reproducing#33461
-naics#334612#Prerecorded Compact Disc (except Software), Tape, and Record Reproducing#33461
-naics#334613#Magnetic and Optical Recording Media Manufacturing#33461
-naics#335#Electrical Equipment, Appliance, and Component Manufacturing#33
-naics#3351#Electric Lighting Equipment Manufacturing#335
-naics#33511#Electric Lamp Bulb and Part Manufacturing#3351
-naics#33512#Lighting Fixture Manufacturing#3351
-naics#335121#Residential Electric Lighting Fixture Manufacturing#33512
-naics#335122#Commercial, Industrial, and Institutional Electric Lighting Fixture Manufacturing#33512
-naics#335129#Other Lighting Equipment Manufacturing#33512
-naics#3352#Household Appliance Manufacturing#335
-naics#33521#Small Electrical Appliance Manufacturing#3352
-naics#335211#Electric Housewares and Household Fan Manufacturing#33521
-naics#335212#Household Vacuum Cleaner Manufacturing#33521
-naics#33522#Major Appliance Manufacturing#3352
-naics#335221#Household Cooking Appliance Manufacturing#33522
-naics#335222#Household Refrigerator and Home Freezer Manufacturing#33522
-naics#335224#Household Laundry Equipment Manufacturing#33522
-naics#335228#Other Major Household Appliance Manufacturing#33522
-naics#3353#Electrical Equipment Manufacturing#335
-naics#33531#Electrical Equipment Manufacturing#3353
-naics#335311#Power, Distribution, and Specialty Transformer Manufacturing#33531
-naics#335312#Motor and Generator Manufacturing#33531
-naics#335313#Switchgear and Switchboard Apparatus Manufacturing#33531
-naics#335314#Relay and Industrial Control Manufacturing#33531
-naics#3359#Other Electrical Equipment and Component Manufacturing#335
-naics#33591#Battery Manufacturing#3359
-naics#335911#Storage Battery Manufacturing#33591
-naics#335912#Primary Battery Manufacturing#33591
-naics#33592#Communication and Energy Wire and Cable Manufacturing#3359
-naics#335921#Fiber Optic Cable Manufacturing#33592
-naics#335929#Other Communication and Energy Wire Manufacturing#33592
-naics#33593#Wiring Device Manufacturing#3359
-naics#335931#Current-Carrying Wiring Device Manufacturing#33593
-naics#335932#Noncurrent-Carrying Wiring Device Manufacturing#33593
-naics#33599#All Other Electrical Equipment and Component Manufacturing#3359
-naics#335991#Carbon and Graphite Product Manufacturing#33599
-naics#335999#All Other Miscellaneous Electrical Equipment and Component Manufacturing#33599
-naics#336#Transportation Equipment Manufacturing#33
-naics#3361#Motor Vehicle Manufacturing#336
-naics#33611#Automobile and Light Duty Motor Vehicle Manufacturing#3361
-naics#336111#Automobile Manufacturing#33611
-naics#336112#Light Truck and Utility Vehicle Manufacturing#33611
-naics#33612#Heavy Duty Truck Manufacturing#3361
-naics#3362#Motor Vehicle Body and Trailer Manufacturing#336
-naics#33621#Motor Vehicle Body and Trailer Manufacturing#3362
-naics#336211#Motor Vehicle Body Manufacturing#33621
-naics#336212#Truck Trailer Manufacturing#33621
-naics#336213#Motor Home Manufacturing#33621
-naics#336214#Travel Trailer and Camper Manufacturing#33621
-naics#3363#Motor Vehicle Parts Manufacturing#336
-naics#33631#Motor Vehicle Gasoline Engine and Engine Parts Manufacturing#3363
-naics#336311#Carburetor, Piston, Piston Ring, and Valve Manufacturing#33631
-naics#336312#Gasoline Engine and Engine Parts Manufacturing#33631
-naics#33632#Motor Vehicle Electrical and Electronic Equipment Manufacturing#3363
-naics#336321#Vehicular Lighting Equipment Manufacturing#33632
-naics#336322#Other Motor Vehicle Electrical and Electronic Equipment Manufacturing#33632
-naics#33633#Motor Vehicle Steering and Suspension Components (except Spring) Manufacturing#3363
-naics#33634#Motor Vehicle Brake System Manufacturing#3363
-naics#33635#Motor Vehicle Transmission and Power Train Parts Manufacturing#3363
-naics#33636#Motor Vehicle Seating and Interior Trim Manufacturing#3363
-naics#33637#Motor Vehicle Metal Stamping#3363
-naics#33639#Other Motor Vehicle Parts Manufacturing#3363
-naics#336391#Motor Vehicle Air-Conditioning Manufacturing#33639
-naics#336399#All Other Motor Vehicle Parts Manufacturing#33639
-naics#3364#Aerospace Product and Parts Manufacturing#336
-naics#33641#Aerospace Product and Parts Manufacturing#3364
-naics#336411#Aircraft Manufacturing#33641
-naics#336412#Aircraft Engine and Engine Parts Manufacturing#33641
-naics#336413#Other Aircraft Parts and Auxiliary Equipment Manufacturing#33641
-naics#336414#Guided Missile and Space Vehicle Manufacturing#33641
-naics#336415#Guided Missile and Space Vehicle Propulsion Unit and Propulsion Unit Parts Manufacturing#33641
-naics#336419#Other Guided Missile and Space Vehicle Parts and Auxiliary Equipment Manufacturing#33641
-naics#3365#Railroad Rolling Stock Manufacturing#336
-naics#33651#Railroad Rolling Stock Manufacturing#3365
-naics#3366#Ship and Boat Building#336
-naics#33661#Ship and Boat Building#3366
-naics#336611#Ship Building and Repairing#33661
-naics#336612#Boat Building#33661
-naics#3369#Other Transportation Equipment Manufacturing#336
-naics#33699#Other Transportation Equipment Manufacturing#3369
-naics#336991#Motorcycle, Bicycle, and Parts Manufacturing#33699
-naics#336992#Military Armored Vehicle, Tank, and Tank Component Manufacturing#33699
-naics#336999#All Other Transportation Equipment Manufacturing#33699
-naics#337#Furniture and Related Product Manufacturing#33
-naics#3371#Household and Institutional Furniture and Kitchen Cabinet Manufacturing#337
-naics#33711#Wood Kitchen Cabinet and Countertop Manufacturing#3371
-naics#33712#Household and Institutional Furniture Manufacturing#3371
-naics#337121#Upholstered Household Furniture Manufacturing#33712
-naics#337122#Nonupholstered Wood Household Furniture Manufacturing#33712
-naics#337124#Metal Household Furniture Manufacturing#33712
-naics#337125#Household Furniture (except Wood and Metal) Manufacturing#33712
-naics#337127#Institutional Furniture Manufacturing#33712
-naics#337129#Wood Television, Radio, and Sewing Machine Cabinet Manufacturing#33712
-naics#3372#Office Furniture (including Fixtures) Manufacturing#337
-naics#33721#Office Furniture (including Fixtures) Manufacturing#3372
-naics#337211#Wood Office Furniture Manufacturing#33721
-naics#337212#Custom Architectural Woodwork and Millwork Manufacturing#33721
-naics#337214#Office Furniture (except Wood) Manufacturing#33721
-naics#337215#Showcase, Partition, Shelving, and Locker Manufacturing#33721
-naics#3379#Other Furniture Related Product Manufacturing#337
-naics#33791#Mattress Manufacturing#3379
-naics#33792#Blind and Shade Manufacturing#3379
-naics#339#Miscellaneous Manufacturing#33
-naics#3391#Medical Equipment and Supplies Manufacturing#339
-naics#33911#Medical Equipment and Supplies Manufacturing#3391
-naics#339111#Laboratory Apparatus and Furniture Manufacturing#33911
-naics#339112#Surgical and Medical Instrument Manufacturing#33911
-naics#339113#Surgical Appliance and Supplies Manufacturing#33911
-naics#339114#Dental Equipment and Supplies Manufacturing#33911
-naics#339115#Ophthalmic Goods Manufacturing#33911
-naics#339116#Dental Laboratories#33911
-naics#3399#Other Miscellaneous Manufacturing#339
-naics#33991#Jewelry and Silverware Manufacturing#3399
-naics#339911#Jewelry (except Costume) Manufacturing#33991
-naics#339912#Silverware and Hollowware Manufacturing#33991
-naics#339913#Jewelers' Material and Lapidary Work Manufacturing#33991
-naics#339914#Costume Jewelry and Novelty Manufacturing#33991
-naics#33992#Sporting and Athletic Goods Manufacturing#3399
-naics#33993#Doll, Toy, and Game Manufacturing#3399
-naics#339931#Doll and Stuffed Toy Manufacturing#33993
-naics#339932#Game, Toy, and Children's Vehicle Manufacturing#33993
-naics#33994#Office Supplies (except Paper) Manufacturing#3399
-naics#339941#Pen and Mechanical Pencil Manufacturing#33994
-naics#339942#Lead Pencil and Art Good Manufacturing#33994
-naics#339943#Marking Device Manufacturing#33994
-naics#339944#Carbon Paper and Inked Ribbon Manufacturing#33994
-naics#33995#Sign Manufacturing#3399
-naics#33999#All Other Miscellaneous Manufacturing#3399
-naics#339991#Gasket, Packing, and Sealing Device Manufacturing#33999
-naics#339992#Musical Instrument Manufacturing#33999
-naics#339993#Fastener, Button, Needle, and Pin Manufacturing#33999
-naics#339994#Broom, Brush, and Mop Manufacturing#33999
-naics#339995#Burial Casket Manufacturing#33999
-naics#339999#All Other Miscellaneous Manufacturing#33999
-naics#42#Wholesale Trade#42
-naics#421#Wholesale Trade, Durable Goods#42
-naics#4211#Motor Vehicle and Motor Vehicle Parts and Supplies Wholesalers#421
-naics#42111#Automobile and Other Motor Vehicle Wholesalers#4211
-naics#42112#Motor Vehicle Supplies and New Parts Wholesalers#4211
-naics#42113#Tire and Tube Wholesalers#4211
-naics#42114#Motor Vehicle Parts (Used) Wholesalers#4211
-naics#4212#Furniture and Home Furnishing Wholesalers#421
-naics#42121#Furniture Wholesalers#4212
-naics#42122#Home Furnishing Wholesalers#4212
-naics#4213#Lumber and Other Construction Materials Wholesalers#421
-naics#42131#Lumber, Plywood, Millwork, and Wood Panel Wholesalers#4213
-naics#42132#Brick, Stone, and Related Construction Material Wholesalers#4213
-naics#42133#Roofing, Siding, and Insulation Material Wholesalers#4213
-naics#42139#Other Construction Material Wholesalers#4213
-naics#4214#Professional and Commercial Equipment and Supplies Wholesalers#421
-naics#42141#Photographic Equipment and Supplies Wholesalers#4214
-naics#42142#Office Equipment Wholesalers#4214
-naics#42143#Computer and Computer Peripheral Equipment and Software Wholesalers#4214
-naics#42144#Other Commercial Equipment Wholesalers#4214
-naics#42145#Medical, Dental, and Hospital Equipment and Supplies Wholesalers#4214
-naics#42146#Ophthalmic Goods Wholesalers#4214
-naics#42149#Other Professional Equipment and Supplies Wholesalers#4214
-naics#4215#Metal and Mineral (except Petroleum) Wholesalers#421
-naics#42151#Metal Service Centers and Offices#4215
-naics#42152#Coal and Other Mineral and Ore Wholesalers#4215
-naics#4216#Electrical Goods Wholesalers#421
-naics#42161#Electrical Apparatus and Equipment, Wiring Supplies, and Construction Material Wholesalers#4216
-naics#42162#Electrical Appliance, Television, and Radio Set Wholesalers#4216
-naics#42169#Other Electronic Parts and Equipment Wholesalers#4216
-naics#4217#Hardware, and Plumbing and Heating Equipment and Supplies Wholesalers#421
-naics#42171#Hardware Wholesalers#4217
-naics#42172#Plumbing and Heating Equipment and Supplies (Hydronics) Wholesalers#4217
-naics#42173#Warm Air Heating and Air-Conditioning Equipment and Supplies Wholesalers#4217
-naics#42174#Refrigeration Equipment and Supplies Wholesalers#4217
-naics#4218#Machinery, Equipment, and Supplies Wholesalers#421
-naics#42181#Construction and Mining (except Oil Well) Machinery and Equipment Wholesalers#4218
-naics#42182#Farm and Garden Machinery and Equipment Wholesalers#4218
-naics#42183#Industrial Machinery and Equipment Wholesalers#4218
-naics#42184#Industrial Supplies Wholesalers#4218
-naics#42185#Service Establishment Equipment and Supplies Wholesalers#4218
-naics#42186#Transportation Equipment and Supplies (except Motor Vehicle) Wholesalers#4218
-naics#4219#Miscellaneous Durable Goods Wholesalers#421
-naics#42191#Sporting and Recreational Goods and Supplies Wholesalers#4219
-naics#42192#Toy and Hobby Goods and Supplies Wholesalers#4219
-naics#42193#Recyclable Material Wholesalers#4219
-naics#42194#Jewelry, Watch, Precious Stone, and Precious Metal Wholesalers#4219
-naics#42199#Other Miscellaneous Durable Goods Wholesalers#4219
-naics#422#Wholesale Trade, Nondurable Goods#42
-naics#4221#Paper and Paper Product Wholesalers#422
-naics#42211#Printing and Writing Paper Wholesalers#4221
-naics#42212#Stationery and Office Supplies Wholesalers#4221
-naics#42213#Industrial and Personal Service Paper Wholesalers#4221
-naics#4222#Drugs and Druggists' Sundries Wholesalers#422
-naics#42221#Drugs and Druggists' Sundries Wholesalers#4222
-naics#4223#Apparel, Piece Goods, and Notions Wholesalers#422
-naics#42231#Piece Goods, Notions, and Other Dry Goods Wholesalers#4223
-naics#42232#Men's and Boys' Clothing and Furnishings Wholesalers#4223
-naics#42233#Women's, Children's, and Infants' Clothing and Accessories Wholesalers#4223
-naics#42234#Footwear Wholesalers#4223
-naics#4224#Grocery and Related Product Wholesalers#422
-naics#42241#General Line Grocery Wholesalers#4224
-naics#42242#Packaged Frozen Food Wholesalers#4224
-naics#42243#Dairy Product (except Dried or Canned) Wholesalers#4224
-naics#42244#Poultry and Poultry Product Wholesalers#4224
-naics#42245#Confectionery Wholesalers#4224
-naics#42246#Fish and Seafood Wholesalers#4224
-naics#42247#Meat and Meat Product Wholesalers#4224
-naics#42248#Fresh Fruit and Vegetable Wholesalers#4224
-naics#42249#Other Grocery and Related Products Wholesalers#4224
-naics#4225#Farm Product Raw Material Wholesalers#422
-naics#42251#Grain and Field Bean Wholesalers#4225
-naics#42252#Livestock Wholesalers#4225
-naics#42259#Other Farm Product Raw Material Wholesalers#4225
-naics#4226#Chemical and Allied Products Wholesalers#422
-naics#42261#Plastics Materials and Basic Forms and Shapes Wholesalers#4226
-naics#42269#Other Chemical and Allied Products Wholesalers#4226
-naics#4227#Petroleum and Petroleum Products Wholesalers#422
-naics#42271#Petroleum Bulk Stations and Terminals#4227
-naics#42272#Petroleum and Petroleum Products Wholesalers (except Bulk Stations and Terminals)#4227
-naics#4228#Beer, Wine, and Distilled Alcoholic Beverage Wholesalers#422
-naics#42281#Beer and Ale Wholesalers#4228
-naics#42282#Wine and Distilled Alcoholic Beverage Wholesalers#4228
-naics#4229#Miscellaneous Nondurable Goods Wholesalers#422
-naics#42291#Farm Supplies Wholesalers#4229
-naics#42292#Book, Periodical, and Newspaper Wholesalers#4229
-naics#42293#Flower, Nursery Stock, and Florists' Supplies Wholesalers#4229
-naics#42294#Tobacco and Tobacco Product Wholesalers#4229
-naics#42295#Paint, Varnish, and Supplies Wholesalers#4229
-naics#42299#Other Miscellaneous Nondurable Goods Wholesalers#4229
-naics#44#Retail Trade#44
-naics#441#Motor Vehicle and Parts Dealers#44
-naics#4411#Automobile Dealers#441
-naics#44111#New Car Dealers#4411
-naics#44112#Used Car Dealers#4411
-naics#4412#Other Motor Vehicle Dealers#441
-naics#44121#Recreational Vehicle Dealers#4412
-naics#44122#Motorcycle, Boat, and Other Motor Vehicle Dealers#4412
-naics#441221#Motorcycle Dealers#44122
-naics#441222#Boat Dealers#44122
-naics#441229#All Other Motor Vehicle Dealers#44122
-naics#4413#Automotive Parts, Accessories, and Tire Stores#441
-naics#44131#Automotive Parts and Accessories Stores#4413
-naics#44132#Tire Dealers#4413
-naics#442#Furniture and Home Furnishings Stores#44
-naics#4421#Furniture Stores#442
-naics#44211#Furniture Stores#4421
-naics#4422#Home Furnishings Stores#442
-naics#44221#Floor Covering Stores#4422
-naics#44229#Other Home Furnishings Stores#4422
-naics#442291#Window Treatment Stores#44229
-naics#442299#All Other Home Furnishings Stores#44229
-naics#443#Electronics and Appliance Stores#44
-naics#4431#Electronics and Appliance Stores#443
-naics#44311#Appliance, Television, and Other Electronics Stores#4431
-naics#443111#Household Appliance Stores#44311
-naics#443112#Radio, Television, and Other Electronics Stores#44311
-naics#44312#Computer and Software Stores#4431
-naics#44313#Camera and Photographic Supplies Stores#4431
-naics#444#Building Material and Garden Equipment and Supplies Dealers#44
-naics#4441#Building Material and Supplies Dealers#444
-naics#44411#Home Centers#4441
-naics#44412#Paint and Wallpaper Stores#4441
-naics#44413#Hardware Stores#4441
-naics#44419#Other Building Material Dealers#4441
-naics#4442#Lawn and Garden Equipment and Supplies Stores#444
-naics#44421#Outdoor Power Equipment Stores#4442
-naics#44422#Nursery and Garden Centers#4442
-naics#445#Food and Beverage Stores#44
-naics#4451#Grocery Stores#445
-naics#44511#Supermarkets and Other Grocery (except Convenience) Stores#4451
-naics#44512#Convenience Stores#4451
-naics#4452#Specialty Food Stores#445
-naics#44521#Meat Markets#4452
-naics#44522#Fish and Seafood Markets#4452
-naics#44523#Fruit and Vegetable Markets#4452
-naics#44529#Other Specialty Food Stores#4452
-naics#445291#Baked Goods Stores#44529
-naics#445292#Confectionery and Nut Stores#44529
-naics#445299#All Other Specialty Food Stores#44529
-naics#4453#Beer, Wine, and Liquor Stores#445
-naics#44531#Beer, Wine, and Liquor Stores#4453
-naics#446#Health and Personal Care Stores#44
-naics#4461#Health and Personal Care Stores#446
-naics#44611#Pharmacies and Drug Stores#4461
-naics#44612#Cosmetics, Beauty Supplies, and Perfume Stores#4461
-naics#44613#Optical Goods Stores#4461
-naics#44619#Other Health and Personal Care Stores#4461
-naics#446191#Food (Health) Supplement Stores#44619
-naics#446199#All Other Health and Personal Care Stores#44619
-naics#447#Gasoline Stations#44
-naics#4471#Gasoline Stations#447
-naics#44711#Gasoline Stations with Convenience Stores#4471
-naics#44719#Other Gasoline Stations#4471
-naics#448#Clothing and Clothing Accessories Stores#44
-naics#4481#Clothing Stores#448
-naics#44811#Men's Clothing Stores#4481
-naics#44812#Women's Clothing Stores#4481
-naics#44813#Children's and Infants' Clothing Stores#4481
-naics#44814#Family Clothing Stores#4481
-naics#44815#Clothing Accessories Stores#4481
-naics#44819#Other Clothing Stores#4481
-naics#4482#Shoe Stores#448
-naics#44821#Shoe Stores#4482
-naics#4483#Jewelry, Luggage, and Leather Goods Stores#448
-naics#44831#Jewelry Stores#4483
-naics#44832#Luggage and Leather Goods Stores#4483
-naics#45#Retail Trade#45
-naics#451#Sporting Goods, Hobby, Book, and Music Stores#45
-naics#4511#Sporting Goods, Hobby, and Musical Instrument Stores#451
-naics#45111#Sporting Goods Stores#4511
-naics#45112#Hobby, Toy, and Game Stores#4511
-naics#45113#Sewing, Needlework, and Piece Goods Stores#4511
-naics#45114#Musical Instrument and Supplies Stores#4511
-naics#4512#Book, Periodical, and Music Stores#451
-naics#45121#Book Stores and News Dealers#4512
-naics#451211#Book Stores#45121
-naics#451212#News Dealers and Newsstands#45121
-naics#45122#Prerecorded Tape, Compact Disc, and Record Stores#4512
-naics#452#General Merchandise Stores#45
-naics#4521#Department Stores#452
-naics#45211#Department Stores#4521
-naics#4529#Other General Merchandise Stores#452
-naics#45291#Warehouse Clubs and Superstores#4529
-naics#45299#All Other General Merchandise Stores#4529
-naics#453#Miscellaneous Store Retailers#45
-naics#4531#Florists#453
-naics#45311#Florists#4531
-naics#4532#Office Supplies, Stationery, and Gift Stores#453
-naics#45321#Office Supplies and Stationery Stores#4532
-naics#45322#Gift, Novelty, and Souvenir Stores#4532
-naics#4533#Used Merchandise Stores#453
-naics#45331#Used Merchandise Stores#4533
-naics#4539#Other Miscellaneous Store Retailers#453
-naics#45391#Pet and Pet Supplies Stores#4539
-naics#45392#Art Dealers#4539
-naics#45393#Manufactured (Mobile) Home Dealers#4539
-naics#45399#All Other Miscellaneous Store Retailers#4539
-naics#453991#Tobacco Stores#45399
-naics#453998#All Other Miscellaneous Store Retailers (except Tobacco Stores)#45399
-naics#454#Nonstore Retailers#45
-naics#4541#Electronic Shopping and Mail-Order Houses#454
-naics#45411#Electronic Shopping and Mail-Order Houses#4541
-naics#4542#Vending Machine Operators#454
-naics#45421#Vending Machine Operators#4542
-naics#4543#Direct Selling Establishments#454
-naics#45431#Fuel Dealers#4543
-naics#454311#Heating Oil Dealers#45431
-naics#454312#Liquefied Petroleum Gas (Bottled Gas) Dealers#45431
-naics#454319#Other Fuel Dealers#45431
-naics#45439#Other Direct Selling Establishments#4543
-naics#48#Transportation and Warehousing#48
-naics#481#Air Transportation#48
-naics#4811#Scheduled Air Transportation#481
-naics#48111#Scheduled Air Transportation#4811
-naics#481111#Scheduled Passenger Air Transportation#48111
-naics#481112#Scheduled Freight Air Transportation#48111
-naics#4812#Nonscheduled Air Transportation#481
-naics#48121#Nonscheduled Air Transportation#4812
-naics#481211#Nonscheduled Chartered Passenger Air Transportation#48121
-naics#481212#Nonscheduled Chartered Freight Air Transportation#48121
-naics#481219#Other Nonscheduled Air Transportation#48121
-naics#482#Rail Transportation#48
-naics#4821#Rail Transportation#482
-naics#48211#Rail Transportation#4821
-naics#482111#Line-Haul Railroads#48211
-naics#482112#Short Line Railroads#48211
-naics#483#Water Transportation#48
-naics#4831#Deep Sea, Coastal, and Great Lakes Water Transportation#483
-naics#48311#Deep Sea, Coastal, and Great Lakes Water Transportation#4831
-naics#483111#Deep Sea Freight Transportation#48311
-naics#483112#Deep Sea Passenger Transportation#48311
-naics#483113#Coastal and Great Lakes Freight Transportation#48311
-naics#483114#Coastal and Great Lakes Passenger Transportation#48311
-naics#4832#Inland Water Transportation#483
-naics#48321#Inland Water Transportation#4832
-naics#483211#Inland Water Freight Transportation#48321
-naics#483212#Inland Water Passenger Transportation#48321
-naics#484#Truck Transportation#48
-naics#4841#General Freight Trucking#484
-naics#48411#General Freight Trucking, Local#4841
-naics#48412#General Freight Trucking, Long-Distance#4841
-naics#484121#General Freight Trucking, Long-Distance, Truckload#48412
-naics#484122#General Freight Trucking, Long-Distance, Less Than Truckload#48412
-naics#4842#Specialized Freight Trucking#484
-naics#48421#Used Household and Office Goods Moving#4842
-naics#48422#Specialized Freight (except Used Goods) Trucking, Local#4842
-naics#48423#Specialized Freight (except Used Goods) Trucking, Long-Distance#4842
-naics#485#Transit and Ground Passenger Transportation#48
-naics#4851#Urban Transit Systems#485
-naics#48511#Urban Transit Systems#4851
-naics#485111#Mixed Mode Transit Systems#48511
-naics#485112#Commuter Rail Systems#48511
-naics#485113#Bus and Other Motor Vehicle Transit Systems#48511
-naics#485119#Other Urban Transit Systems#48511
-naics#4852#Interurban and Rural Bus Transportation#485
-naics#48521#Interurban and Rural Bus Transportation#4852
-naics#4853#Taxi and Limousine Service#485
-naics#48531#Taxi Service#4853
-naics#48532#Limousine Service#4853
-naics#4854#School and Employee Bus Transportation#485
-naics#48541#School and Employee Bus Transportation#4854
-naics#4855#Charter Bus Industry#485
-naics#48551#Charter Bus Industry#4855
-naics#4859#Other Transit and Ground Passenger Transportation#485
-naics#48599#Other Transit and Ground Passenger Transportation#4859
-naics#485991#Special Needs Transportation#48599
-naics#485999#All Other Transit and Ground Passenger Transportation#48599
-naics#486#Pipeline Transportation#48
-naics#4861#Pipeline Transportation of Crude Oil#486
-naics#48611#Pipeline Transportation of Crude Oil#4861
-naics#4862#Pipeline Transportation of Natural Gas#486
-naics#48621#Pipeline Transportation of Natural Gas#4862
-naics#4869#Other Pipeline Transportation#486
-naics#48691#Pipeline Transportation of Refined Petroleum Products#4869
-naics#48699#All Other Pipeline Transportation#4869
-naics#487#Scenic and Sightseeing Transportation#48
-naics#4871#Scenic and Sightseeing Transportation, Land#487
-naics#48711#Scenic and Sightseeing Transportation, Land#4871
-naics#4872#Scenic and Sightseeing Transportation, Water#487
-naics#48721#Scenic and Sightseeing Transportation, Water#4872
-naics#4879#Scenic and Sightseeing Transportation, Other#487
-naics#48799#Scenic and Sightseeing Transportation, Other#4879
-naics#488#Support Activities for Transportation#48
-naics#4881#Support Activities for Air Transportation#488
-naics#48811#Airport Operations#4881
-naics#488111#Air Traffic Control#48811
-naics#488119#Other Airport Operations#48811
-naics#48819#Other Support Activities for Air Transportation#4881
-naics#4882#Support Activities for Rail Transportation#488
-naics#48821#Support Activities for Rail Transportation#4882
-naics#4883#Support Activities for Water Transportation#488
-naics#48831#Port and Harbor Operations#4883
-naics#48832#Marine Cargo Handling#4883
-naics#48833#Navigational Services to Shipping#4883
-naics#48839#Other Support Activities for Water Transportation#4883
-naics#4884#Support Activities for Road Transportation#488
-naics#48841#Motor Vehicle Towing#4884
-naics#48849#Other Support Activities for Road Transportation#4884
-naics#4885#Freight Transportation Arrangement#488
-naics#48851#Freight Transportation Arrangement#4885
-naics#4889#Other Support Activities for Transportation#488
-naics#48899#Other Support Activities for Transportation#4889
-naics#488991#Packing and Crating#48899
-naics#488999#All Other Support Activities for Transportation#48899
-naics#49#Transportation and Warehousing#49
-naics#491#Postal Service#49
-naics#4911#Postal Service#491
-naics#49111#Postal Service#4911
-naics#492#Couriers and Messengers#49
-naics#4921#Couriers#492
-naics#49211#Couriers#4921
-naics#4922#Local Messengers and Local Delivery#492
-naics#49221#Local Messengers and Local Delivery#4922
-naics#493#Warehousing and Storage#49
-naics#4931#Warehousing and Storage#493
-naics#49311#General Warehousing and Storage#4931
-naics#49312#Refrigerated Warehousing and Storage#4931
-naics#49313#Farm Product Warehousing and Storage#4931
-naics#49319#Other Warehousing and Storage#4931
-naics#51#Information#51
-naics#511#Publishing Industries#51
-naics#5111#Newspaper, Periodical, Book, and Database Publishers#511
-naics#51111#Newspaper Publishers#5111
-naics#51112#Periodical Publishers#5111
-naics#51113#Book Publishers#5111
-naics#51114#Database and Directory Publishers#5111
-naics#51119#Other Publishers#5111
-naics#511191#Greeting Card Publishers#51119
-naics#511199#All Other Publishers#51119
-naics#5112#Software Publishers#511
-naics#51121#Software Publishers#5112
-naics#512#Motion Picture and Sound Recording Industries#51
-naics#5121#Motion Picture and Video Industries#512
-naics#51211#Motion Picture and Video Production#5121
-naics#51212#Motion Picture and Video Distribution#5121
-naics#51213#Motion Picture and Video Exhibition#5121
-naics#512131#Motion Picture Theaters (except Drive-Ins)#51213
-naics#512132#Drive-In Motion Picture Theaters#51213
-naics#51219#Postproduction Services and Other Motion Picture and Video Industries#5121
-naics#512191#Teleproduction and Other Postproduction Services#51219
-naics#512199#Other Motion Picture and Video Industries#51219
-naics#5122#Sound Recording Industries#512
-naics#51221#Record Production#5122
-naics#51222#Integrated Record Production/Distribution#5122
-naics#51223#Music Publishers#5122
-naics#51224#Sound Recording Studios#5122
-naics#51229#Other Sound Recording Industries#5122
-naics#513#Broadcasting and Telecommunications#51
-naics#5131#Radio and Television Broadcasting#513
-naics#51311#Radio Broadcasting#5131
-naics#513111#Radio Networks#51311
-naics#513112#Radio Stations#51311
-naics#51312#Television Broadcasting#5131
-naics#5132#Cable Networks and Program Distribution#513
-naics#51321#Cable Networks#5132
-naics#51322#Cable and Other Program Distribution#5132
-naics#5133#Telecommunications#513
-naics#51331#Wired Telecommunications Carriers#5133
-naics#51332#Wireless Telecommunications Carriers (except Satellite)#5133
-naics#513321#Paging#51332
-naics#513322#Cellular and Other Wireless Telecommunications#51332
-naics#51333#Telecommunications Resellers#5133
-naics#51334#Satellite Telecommunications#5133
-naics#51339#Other Telecommunications#5133
-naics#514#Information Services and Data Processing Services#51
-naics#5141#Information Services#514
-naics#51411#News Syndicates#5141
-naics#51412#Libraries and Archives#5141
-naics#51419#Other Information Services#5141
-naics#514191#On-Line Information Services#51419
-naics#514199#All Other Information Services#51419
-naics#5142#Data Processing Services#514
-naics#51421#Data Processing Services#5142
-naics#52#Finance and Insurance#52
-naics#521#Monetary Authorities - Central Bank#52
-naics#5211#Monetary Authorities - Central Bank#521
-naics#52111#Monetary Authorities - Central Bank#5211
-naics#522#Credit Intermediation and Related Activities#52
-naics#5221#Depository Credit Intermediation#522
-naics#52211#Commercial Banking#5221
-naics#52212#Savings Institutions#5221
-naics#52213#Credit Unions#5221
-naics#52219#Other Depository Credit Intermediation#5221
-naics#5222#Nondepository Credit Intermediation#522
-naics#52221#Credit Card Issuing#5222
-naics#52222#Sales Financing#5222
-naics#52229#Other Nondepository Credit Intermediation#5222
-naics#522291#Consumer Lending#52229
-naics#522292#Real Estate Credit#52229
-naics#522293#International Trade Financing#52229
-naics#522294#Secondary Market Financing#52229
-naics#522298#All Other Nondepository Credit Intermediation#52229
-naics#5223#Activities Related to Credit Intermediation#522
-naics#52231#Mortgage and Nonmortgage Loan Brokers#5223
-naics#52232#Financial Transactions Processing, Reserve, and Clearinghouse Activities#5223
-naics#52239#Other Activities Related to Credit Intermediation#5223
-naics#523#Securities, Commodity Contracts, and Other Financial Investments and Related Activities#52
-naics#5231#Securities and Commodity Contracts Intermediation and Brokerage#523
-naics#52311#Investment Banking and Securities Dealing#5231
-naics#52312#Securities Brokerage#5231
-naics#52313#Commodity Contracts Dealing#5231
-naics#52314#Commodity Contracts Brokerage#5231
-naics#5232#Securities and Commodity Exchanges#523
-naics#52321#Securities and Commodity Exchanges#5232
-naics#5239#Other Financial Investment Activities#523
-naics#52391#Miscellaneous Intermediation#5239
-naics#52392#Portfolio Management#5239
-naics#52393#Investment Advice#5239
-naics#52399#All Other Financial Investment Activities#5239
-naics#523991#Trust, Fiduciary, and Custody Activities#52399
-naics#523999#Miscellaneous Financial Investment Activities#52399
-naics#524#Insurance Carriers and Related Activities#52
-naics#5241#Insurance Carriers#524
-naics#52411#Direct Life, Health, and Medical Insurance Carriers#5241
-naics#524113#Direct Life Insurance Carriers#52411
-naics#524114#Direct Health and Medical Insurance Carriers#52411
-naics#52412#Direct Insurance (except Life, Health, and Medical) Carriers#5241
-naics#524126#Direct Property and Casualty Insurance Carriers#52412
-naics#524127#Direct Title Insurance Carriers#52412
-naics#524128#Other Direct Insurance (except Life, Health, and Medical) Carriers#52412
-naics#52413#Reinsurance Carriers#5241
-naics#5242#Agencies, Brokerages, and Other Insurance Related Activities#524
-naics#52421#Insurance Agencies and Brokerages#5242
-naics#52429#Other Insurance Related Activities#5242
-naics#524291#Claims Adjusting#52429
-naics#524292#Third Party Administration of Insurance and Pension Funds#52429
-naics#524298#All Other Insurance Related Activities#52429
-naics#525#Funds, Trusts, and Other Financial Vehicles#52
-naics#5251#Insurance and Employee Benefit Funds#525
-naics#52511#Pension Funds#5251
-naics#52512#Health and Welfare Funds#5251
-naics#52519#Other Insurance Funds#5251
-naics#5259#Other Investment Pools and Funds#525
-naics#52591#Open-End Investment Funds#5259
-naics#52592#Trusts, Estates, and Agency Accounts#5259
-naics#52593#Real Estate Investment Trusts#5259
-naics#52599#Other Financial Vehicles#5259
-naics#53#Real Estate and Rental and Leasing#53
-naics#531#Real Estate#53
-naics#5311#Lessors of Real Estate#531
-naics#53111#Lessors of Residential Buildings and Dwellings#5311
-naics#53112#Lessors of Nonresidential Buildings (except Miniwarehouses)#5311
-naics#53113#Lessors of Miniwarehouses and Self-Storage Units#5311
-naics#53119#Lessors of Other Real Estate Property#5311
-naics#5312#Offices of Real Estate Agents and Brokers#531
-naics#53121#Offices of Real Estate Agents and Brokers#5312
-naics#5313#Activities Related to Real Estate#531
-naics#53131#Real Estate Property Managers#5313
-naics#531311#Residential Property Managers#53131
-naics#531312#Nonresidential Property Managers#53131
-naics#53132#Offices of Real Estate Appraisers#5313
-naics#53139#Other Activities Related to Real Estate#5313
-naics#532#Rental and Leasing Services#53
-naics#5321#Automotive Equipment Rental and Leasing#532
-naics#53211#Passenger Car Rental and Leasing#5321
-naics#532111#Passenger Car Rental#53211
-naics#532112#Passenger Car Leasing#53211
-naics#53212#Truck, Utility Trailer, and RV (Recreational Vehicle) Rental and Leasing#5321
-naics#5322#Consumer Goods Rental#532
-naics#53221#Consumer Electronics and Appliances Rental#5322
-naics#53222#Formal Wear and Costume Rental#5322
-naics#53223#Video Tape and Disc Rental#5322
-naics#53229#Other Consumer Goods Rental#5322
-naics#532291#Home Health Equipment Rental#53229
-naics#532292#Recreational Goods Rental#53229
-naics#532299#All Other Consumer Goods Rental#53229
-naics#5323#General Rental Centers#532
-naics#53231#General Rental Centers#5323
-naics#5324#Commercial and Industrial Machinery and Equipment Rental and Leasing#532
-naics#53241#Construction, Transportation, Mining, and Forestry Machinery and Equipment Rental and Leasing#5324
-naics#532411#Commercial Air, Rail, and Water Transportation Equipment Rental and Leasing#53241
-naics#532412#Construction, Mining, and Forestry Machinery and Equipment Rental and Leasing#53241
-naics#53242#Office Machinery and Equipment Rental and Leasing#5324
-naics#53249#Other Commercial and Industrial Machinery and Equipment Rental and Leasing#5324
-naics#533#Lessors of Nonfinancial Intangible Assets (except Copyrighted Works)#53
-naics#5331#Lessors of Nonfinancial Intangible Assets (except Copyrighted Works)#533
-naics#53311#Lessors of Nonfinancial Intangible Assets (except Copyrighted Works)#5331
-naics#54#Professional, Scientific, and Technical Services#54
-naics#541#Professional, Scientific, and Technical Services#54
-naics#5411#Legal Services#541
-naics#54111#Offices of Lawyers#5411
-naics#54112#Offices of Notaries#5411
-naics#54119#Other Legal Services#5411
-naics#541191#Title Abstract and Settlement Offices#54119
-naics#541199#All Other Legal Services#54119
-naics#5412#Accounting, Tax Preparation, Bookkeeping, and Payroll Services#541
-naics#54121#Accounting, Tax Preparation, Bookkeeping, and Payroll Services#5412
-naics#541211#Offices of Certified Public Accountants#54121
-naics#541213#Tax Preparation Services#54121
-naics#541214#Payroll Services#54121
-naics#541219#Other Accounting Services#54121
-naics#5413#Architectural, Engineering, and Related Services#541
-naics#54131#Architectural Services#5413
-naics#54132#Landscape Architectural Services#5413
-naics#54133#Engineering Services#5413
-naics#54134#Drafting Services#5413
-naics#54135#Building Inspection Services#5413
-naics#54136#Geophysical Surveying and Mapping Services#5413
-naics#54137#Surveying and Mapping (except Geophysical) Services#5413
-naics#54138#Testing Laboratories#5413
-naics#5414#Specialized Design Services#541
-naics#54141#Interior Design Services#5414
-naics#54142#Industrial Design Services#5414
-naics#54143#Graphic Design Services#5414
-naics#54149#Other Specialized Design Services#5414
-naics#5415#Computer Systems Design and Related Services#541
-naics#54151#Computer Systems Design and Related Services#5415
-naics#541511#Custom Computer Programming Services#54151
-naics#541512#Computer Systems Design Services#54151
-naics#541513#Computer Facilities Management Services#54151
-naics#541519#Other Computer Related Services#54151
-naics#5416#Management, Scientific, and Technical Consulting Services#541
-naics#54161#Management Consulting Services#5416
-naics#541611#Administrative Management and General Management Consulting Services#54161
-naics#541612#Human Resources and Executive Search Consulting Services#54161
-naics#541613#Marketing Consulting Services#54161
-naics#541614#Process, Physical Distribution, and Logistics Consulting Services#54161
-naics#541618#Other Management Consulting Services#54161
-naics#54162#Environmental Consulting Services#5416
-naics#54169#Other Scientific and Technical Consulting Services#5416
-naics#5417#Scientific Research and Development Services#541
-naics#54171#Research and Development in the Physical, Engineering, and Life Sciences#5417
-naics#54172#Research and Development in the Social Sciences and Humanities#5417
-naics#5418#Advertising and Related Services#541
-naics#54181#Advertising Agencies#5418
-naics#54182#Public Relations Agencies#5418
-naics#54183#Media Buying Agencies#5418
-naics#54184#Media Representatives#5418
-naics#54185#Display Advertising#5418
-naics#54186#Direct Mail Advertising#5418
-naics#54187#Advertising Material Distribution Services#5418
-naics#54189#Other Services Related to Advertising#5418
-naics#5419#Other Professional, Scientific, and Technical Services#541
-naics#54191#Marketing Research and Public Opinion Polling#5419
-naics#54192#Photographic Services#5419
-naics#541921#Photography Studios, Portrait#54192
-naics#541922#Commercial Photography#54192
-naics#54193#Translation and Interpretation Services#5419
-naics#54194#Veterinary Services#5419
-naics#54199#All Other Professional, Scientific, and Technical Services#5419
-naics#55#Management of Companies and Enterprises#55
-naics#551#Management of Companies and Enterprises#55
-naics#5511#Management of Companies and Enterprises#551
-naics#55111#Management of Companies and Enterprises#5511
-naics#551111#Offices of Bank Holding Companies#55111
-naics#551112#Offices of Other Holding Companies#55111
-naics#551114#Corporate, Subsidiary, and Regional Managing Offices#55111
-naics#56#Administrative and Support and Waste Management and Remediation Services#56
-naics#561#Administrative and Support Services#56
-naics#5611#Office Administrative Services#561
-naics#56111#Office Administrative Services#5611
-naics#5612#Facilities Support Services#561
-naics#56121#Facilities Support Services#5612
-naics#5613#Employment Services#561
-naics#56131#Employment Placement Agencies#5613
-naics#56132#Temporary Help Services#5613
-naics#56133#Employee Leasing Services#5613
-naics#5614#Business Support Services#561
-naics#56141#Document Preparation Services#5614
-naics#56142#Telephone Call Centers#5614
-naics#561421#Telephone Answering Services#56142
-naics#561422#Telemarketing Bureaus#56142
-naics#56143#Business Service Centers#5614
-naics#561431#Private Mail Centers#56143
-naics#561439#Other Business Service Centers (including Copy Shops)#56143
-naics#56144#Collection Agencies#5614
-naics#56145#Credit Bureaus#5614
-naics#56149#Other Business Support Services#5614
-naics#561491#Repossession Services#56149
-naics#561492#Court Reporting and Stenotype Services#56149
-naics#561499#All Other Business Support Services#56149
-naics#5615#Travel Arrangement and Reservation Services#561
-naics#56151#Travel Agencies#5615
-naics#56152#Tour Operators#5615
-naics#56159#Other Travel Arrangement and Reservation Services#5615
-naics#561591#Convention and Visitors Bureaus#56159
-naics#561599#All Other Travel Arrangement and Reservation Services#56159
-naics#5616#Investigation and Security Services#561
-naics#56161#Investigation, Guard, and Armored Car Services#5616
-naics#561611#Investigation Services#56161
-naics#561612#Security Guards and Patrol Services#56161
-naics#561613#Armored Car Services#56161
-naics#56162#Security Systems Services#5616
-naics#561621#Security Systems Services (except Locksmiths)#56162
-naics#561622#Locksmiths#56162
-naics#5617#Services to Buildings and Dwellings#561
-naics#56171#Exterminating and Pest Control Services#5617
-naics#56172#Janitorial Services#5617
-naics#56173#Landscaping Services#5617
-naics#56174#Carpet and Upholstery Cleaning Services#5617
-naics#56179#Other Services to Buildings and Dwellings#5617
-naics#5619#Other Support Services#561
-naics#56191#Packaging and Labeling Services#5619
-naics#56192#Convention and Trade Show Organizers#5619
-naics#56199#All Other Support Services#5619
-naics#562#Waste Management and Remediation Services#56
-naics#5621#Waste Collection#562
-naics#56211#Waste Collection#5621
-naics#562111#Solid Waste Collection#56211
-naics#562112#Hazardous Waste Collection#56211
-naics#562119#Other Waste Collection#56211
-naics#5622#Waste Treatment and Disposal#562
-naics#56221#Waste Treatment and Disposal#5622
-naics#562211#Hazardous Waste Treatment and Disposal#56221
-naics#562212#Solid Waste Landfill#56221
-naics#562213#Solid Waste Combustors and Incinerators#56221
-naics#562219#Other Nonhazardous Waste Treatment and Disposal#56221
-naics#5629#Remediation and Other Waste Management Services#562
-naics#56291#Remediation Services#5629
-naics#56292#Materials Recovery Facilities#5629
-naics#56299#All Other Waste Management Services#5629
-naics#562991#Septic Tank and Related Services#56299
-naics#562998#All Other Miscellaneous Waste Management Services#56299
-naics#61#Educational Services#61
-naics#611#Educational Services#61
-naics#6111#Elementary and Secondary Schools#611
-naics#61111#Elementary and Secondary Schools#6111
-naics#6112#Junior Colleges#611
-naics#61121#Junior Colleges#6112
-naics#6113#Colleges, Universities, and Professional Schools#611
-naics#61131#Colleges, Universities, and Professional Schools#6113
-naics#6114#Business Schools and Computer and Management Training#611
-naics#61141#Business and Secretarial Schools#6114
-naics#61142#Computer Training#6114
-naics#61143#Professional and Management Development Training#6114
-naics#6115#Technical and Trade Schools#611
-naics#61151#Technical and Trade Schools#6115
-naics#611511#Cosmetology and Barber Schools#61151
-naics#611512#Flight Training#61151
-naics#611513#Apprenticeship Training#61151
-naics#611519#Other Technical and Trade Schools#61151
-naics#6116#Other Schools and Instruction#611
-naics#61161#Fine Arts Schools#6116
-naics#61162#Sports and Recreation Instruction#6116
-naics#61163#Language Schools#6116
-naics#61169#All Other Schools and Instruction#6116
-naics#611691#Exam Preparation and Tutoring#61169
-naics#611692#Automobile Driving Schools#61169
-naics#611699#All Other Miscellaneous Schools and Instruction#61169
-naics#6117#Educational Support Services#611
-naics#61171#Educational Support Services#6117
-naics#62#Health Care and Social Assistance#62
-naics#621#Ambulatory Health Care Services#62
-naics#6211#Offices of Physicians#621
-naics#62111#Offices of Physicians#6211
-naics#621111#Offices of Physicians (except Mental Health Specialists)#62111
-naics#621112#Offices of Physicians, Mental Health Specialists#62111
-naics#6212#Offices of Dentists#621
-naics#62121#Offices of Dentists#6212
-naics#6213#Offices of Other Health Practitioners#621
-naics#62131#Offices of Chiropractors#6213
-naics#62132#Offices of Optometrists#6213
-naics#62133#Offices of Mental Health Practitioners (except Physicians)#6213
-naics#62134#Offices of Physical, Occupational and Speech Therapists, and Audiologists#6213
-naics#62139#Offices of All Other Health Practitioners#6213
-naics#621391#Offices of Podiatrists#62139
-naics#621399#Offices of All Other Miscellaneous Health Practitioners#62139
-naics#6214#Outpatient Care Centers#621
-naics#62141#Family Planning Centers#6214
-naics#62142#Outpatient Mental Health and Substance Abuse Centers#6214
-naics#62149#Other Outpatient Care Centers#6214
-naics#621491#HMO Medical Centers#62149
-naics#621492#Kidney Dialysis Centers#62149
-naics#621493#Freestanding Ambulatory Surgical and Emergency Centers#62149
-naics#621498#All Other Outpatient Care Centers#62149
-naics#6215#Medical and Diagnostic Laboratories#621
-naics#62151#Medical and Diagnostic Laboratories#6215
-naics#621511#Medical Laboratories#62151
-naics#621512#Diagnostic Imaging Centers#62151
-naics#6216#Home Health Care Services#621
-naics#62161#Home Health Care Services#6216
-naics#6219#Other Ambulatory Health Care Services#621
-naics#62191#Ambulance Services#6219
-naics#62199#All Other Ambulatory Health Care Services#6219
-naics#621991#Blood and Organ Banks#62199
-naics#621999#All Other Miscellaneous Ambulatory Health Care Services#62199
-naics#622#Hospitals#62
-naics#6221#General Medical and Surgical Hospitals#622
-naics#62211#General Medical and Surgical Hospitals#6221
-naics#6222#Psychiatric and Substance Abuse Hospitals#622
-naics#62221#Psychiatric and Substance Abuse Hospitals#6222
-naics#6223#Specialty (except Psychiatric and Substance Abuse) Hospitals#622
-naics#62231#Specialty (except Psychiatric and Substance Abuse) Hospitals#6223
-naics#623#Nursing and Residential Care Facilities#62
-naics#6231#Nursing Care Facilities#623
-naics#62311#Nursing Care Facilities#6231
-naics#6232#Residential Mental Retardation, Mental Health and Substance Abuse Facilities#623
-naics#62321#Residential Mental Retardation Facilities#6232
-naics#62322#Residential Mental Health and Substance Abuse Facilities#6232
-naics#6233#Community Care Facilities for the Elderly#623
-naics#62331#Community Care Facilities for the Elderly#6233
-naics#623311#Continuing Care Retirement Communities#62331
-naics#623312#Homes for the Elderly#62331
-naics#6239#Other Residential Care Facilities#623
-naics#62399#Other Residential Care Facilities#6239
-naics#624#Social Assistance#62
-naics#6241#Individual and Family Services#624
-naics#62411#Child and Youth Services#6241
-naics#62412#Services for the Elderly and Persons with Disabilities#6241
-naics#62419#Other Individual and Family Services#6241
-naics#6242#Community Food and Housing, and Emergency and Other Relief Services#624
-naics#62421#Community Food Services#6242
-naics#62422#Community Housing Services#6242
-naics#624221#Temporary Shelters#62422
-naics#624229#Other Community Housing Services#62422
-naics#62423#Emergency and Other Relief Services#6242
-naics#6243#Vocational Rehabilitation Services#624
-naics#62431#Vocational Rehabilitation Services#6243
-naics#6244#Child Day Care Services#624
-naics#62441#Child Day Care Services#6244
-naics#71#Arts, Entertainment, and Recreation#71
-naics#711#Performing Arts, Spectator Sports, and Related Industries#71
-naics#7111#Performing Arts Companies#711
-naics#71111#Theater Companies and Dinner Theaters#7111
-naics#71112#Dance Companies#7111
-naics#71113#Musical Groups and Artists#7111
-naics#71119#Other Performing Arts Companies#7111
-naics#7112#Spectator Sports#711
-naics#71121#Spectator Sports#7112
-naics#711211#Sports Teams and Clubs#71121
-naics#711212#Racetracks#71121
-naics#711219#Other Spectator Sports#71121
-naics#7113#Promoters of Performing Arts, Sports, and Similar Events#711
-naics#71131#Promoters of Performing Arts, Sports, and Similar Events with Facilities#7113
-naics#71132#Promoters of Performing Arts, Sports, and Similar Events without Facilities#7113
-naics#7114#Agents and Managers for Artists, Athletes, Entertainers, and Other Public Figures#711
-naics#71141#Agents and Managers for Artists, Athletes, Entertainers, and Other Public Figures#7114
-naics#7115#Independent Artists, Writers, and Performers#711
-naics#71151#Independent Artists, Writers, and Performers#7115
-naics#712#Museums, Historical Sites, and Similar Institutions#71
-naics#7121#Museums, Historical Sites, and Similar Institutions#712
-naics#71211#Museums#7121
-naics#71212#Historical Sites#7121
-naics#71213#Zoos and Botanical Gardens#7121
-naics#71219#Nature Parks and Other Similar Institutions#7121
-naics#713#Amusement, Gambling, and Recreation Industries#71
-naics#7131#Amusement Parks and Arcades#713
-naics#71311#Amusement and Theme Parks#7131
-naics#71312#Amusement Arcades#7131
-naics#7132#Gambling Industries#713
-naics#71321#Casinos (except Casino Hotels)#7132
-naics#71329#Other Gambling Industries#7132
-naics#7139#Other Amusement and Recreation Industries#713
-naics#71391#Golf Courses and Country Clubs#7139
-naics#71392#Skiing Facilities#7139
-naics#71393#Marinas#7139
-naics#71394#Fitness and Recreational Sports Centers#7139
-naics#71395#Bowling Centers#7139
-naics#71399#All Other Amusement and Recreation Industries#7139
-naics#72#Accommodation and Food Services#72
-naics#721#Accommodation#72
-naics#7211#Traveler Accommodation#721
-naics#72111#Hotels (except Casino Hotels) and Motels#7211
-naics#72112#Casino Hotels#7211
-naics#72119#Other Traveler Accommodation#7211
-naics#721191#Bed-and-Breakfast Inns#72119
-naics#721199#All Other Traveler Accommodation#72119
-naics#7212#RV (Recreational Vehicle) Parks and Recreational Camps#721
-naics#72121#RV (Recreational Vehicle) Parks and Recreational Camps#7212
-naics#721211#RV (Recreational Vehicle) Parks and Campgrounds#72121
-naics#721214#Recreational and Vacation Camps (except Campgrounds)#72121
-naics#7213#Rooming and Boarding Houses#721
-naics#72131#Rooming and Boarding Houses#7213
-naics#722#Food Services and Drinking Places#72
-naics#7221#Full-Service Restaurants#722
-naics#72211#Full-Service Restaurants#7221
-naics#7222#Limited-Service Eating Places#722
-naics#72221#Limited-Service Eating Places#7222
-naics#722211#Limited-Service Restaurants#72221
-naics#722212#Cafeterias#72221
-naics#722213#Snack and Nonalcoholic Beverage Bars#72221
-naics#7223#Special Food Services#722
-naics#72231#Food Service Contractors#7223
-naics#72232#Caterers#7223
-naics#72233#Mobile Food Services#7223
-naics#7224#Drinking Places (Alcoholic Beverages)#722
-naics#72241#Drinking Places (Alcoholic Beverages)#7224
-naics#81#Other Services (except Public Administration)#81
-naics#811#Repair and Maintenance#81
-naics#8111#Automotive Repair and Maintenance#811
-naics#81111#Automotive Mechanical and Electrical Repair and Maintenance#8111
-naics#811111#General Automotive Repair#81111
-naics#811112#Automotive Exhaust System Repair#81111
-naics#811113#Automotive Transmission Repair#81111
-naics#811118#Other Automotive Mechanical and Electrical Repair and Maintenance#81111
-naics#81112#Automotive Body, Paint, Interior, and Glass Repair#8111
-naics#811121#Automotive Body, Paint, and Interior Repair and Maintenance#81112
-naics#811122#Automotive Glass Replacement Shops#81112
-naics#81119#Other Automotive Repair and Maintenance#8111
-naics#811191#Automotive Oil Change and Lubrication Shops#81119
-naics#811192#Car Washes#81119
-naics#811198#All Other Automotive Repair and Maintenance#81119
-naics#8112#Electronic and Precision Equipment Repair and Maintenance#811
-naics#81121#Electronic and Precision Equipment Repair and Maintenance#8112
-naics#811211#Consumer Electronics Repair and Maintenance#81121
-naics#811212#Computer and Office Machine Repair and Maintenance#81121
-naics#811213#Communication Equipment Repair and Maintenance#81121
-naics#811219#Other Electronic and Precision Equipment Repair and Maintenance#81121
-naics#8113#Commercial and Industrial Machinery and Equipment (except Automotive and Electronic) Repair and Maintenance#811
-naics#81131#Commercial and Industrial Machinery and Equipment (except Automotive and Electronic) Repair and Maintenance#8113
-naics#8114#Personal and Household Goods Repair and Maintenance#811
-naics#81141#Home and Garden Equipment and Appliance Repair and Maintenance#8114
-naics#811411#Home and Garden Equipment Repair and Maintenance#81141
-naics#811412#Appliance Repair and Maintenance#81141
-naics#81142#Reupholstery and Furniture Repair#8114
-naics#81143#Footwear and Leather Goods Repair#8114
-naics#81149#Other Personal and Household Goods Repair and Maintenance#8114
-naics#812#Personal and Laundry Services#81
-naics#8121#Personal Care Services#812
-naics#81211#Hair, Nail, and Skin Care Services#8121
-naics#812111#Barber Shops#81211
-naics#812112#Beauty Salons#81211
-naics#812113#Nail Salons#81211
-naics#81219#Other Personal Care Services#8121
-naics#812191#Diet and Weight Reducing Centers#81219
-naics#812199#Other Personal Care Services#81219
-naics#8122#Death Care Services#812
-naics#81221#Funeral Homes and Funeral Services#8122
-naics#81222#Cemeteries and Crematories#8122
-naics#8123#Drycleaning and Laundry Services#812
-naics#81231#Coin-Operated Laundries and Drycleaners#8123
-naics#81232#Drycleaning and Laundry Services (except Coin-Operated)#8123
-naics#81233#Linen and Uniform Supply#8123
-naics#812331#Linen Supply#81233
-naics#812332#Industrial Launderers#81233
-naics#8129#Other Personal Services#812
-naics#81291#Pet Care (except Veterinary) Services#8129
-naics#81292#Photofinishing#8129
-naics#812921#Photofinishing Laboratories (except One-Hour)#81292
-naics#812922#One-Hour Photofinishing#81292
-naics#81293#Parking Lots and Garages#8129
-naics#81299#All Other Personal Services#8129
-naics#813#Religious, Grantmaking, Civic, Professional, and Similar Organizations#81
-naics#8131#Religious Organizations#813
-naics#81311#Religious Organizations#8131
-naics#8132#Grantmaking and Giving Services#813
-naics#81321#Grantmaking and Giving Services#8132
-naics#813211#Grantmaking Foundations#81321
-naics#813212#Voluntary Health Organizations#81321
-naics#813219#Other Grantmaking and Giving Services#81321
-naics#8133#Social Advocacy Organizations#813
-naics#81331#Social Advocacy Organizations#8133
-naics#813311#Human Rights Organizations#81331
-naics#813312#Environment, Conservation and Wildlife Organizations#81331
-naics#813319#Other Social Advocacy Organizations#81331
-naics#8134#Civic and Social Organizations#813
-naics#81341#Civic and Social Organizations#8134
-naics#8139#Business, Professional, Labor, Political, and Similar Organizations#813
-naics#81391#Business Associations#8139
-naics#81392#Professional Organizations#8139
-naics#81393#Labor Unions and Similar Labor Organizations#8139
-naics#81394#Political Organizations#8139
-naics#81399#Other Similar Organizations (except Business, Professional, Labor, and Political Organizations)#8139
-naics#814#Private Households#81
-naics#8141#Private Households#814
-naics#81411#Private Households#8141
-naics#92#Public Administration#92
-naics#921#Executive, Legislative, and Other General Government Support#92
-naics#9211#Executive, Legislative, and Other General Government Support#921
-naics#92111#Executive Offices#9211
-naics#92112#Legislative Bodies#9211
-naics#92113#Public Finance Activities#9211
-naics#92114#Executive and Legislative Offices, Combined#9211
-naics#92115#American Indian and Alaska Native Tribal Governments#9211
-naics#92119#Other General Government Support#9211
-naics#922#Justice, Public Order, and Safety Activities#92
-naics#9221#Justice, Public Order, and Safety Activities#922
-naics#92211#Courts#9221
-naics#92212#Police Protection#9221
-naics#92213#Legal Counsel and Prosecution#9221
-naics#92214#Correctional Institutions#9221
-naics#92215#Parole Offices and Probation Offices#9221
-naics#92216#Fire Protection#9221
-naics#92219#Other Justice, Public Order, and Safety Activities#9221
-naics#923#Administration of Human Resource Programs#92
-naics#9231#Administration of Human Resource Programs#923
-naics#92311#Administration of Education Programs#9231
-naics#92312#Administration of Public Health Programs#9231
-naics#92313#Administration of Human Resource Programs (except Education, Public Health, and Veterans' Affairs Programs)#9231
-naics#92314#Administration of Veterans' Affairs#9231
-naics#924#Administration of Environmental Quality Programs#92
-naics#9241#Administration of Environmental Quality Programs#924
-naics#92411#Administration of Air and Water Resource and Solid Waste Management Programs#9241
-naics#92412#Administration of Conservation Programs#9241
-naics#925#Administration of Housing Programs, Urban Planning, and Community Development#92
-naics#9251#Administration of Housing Programs, Urban Planning, and Community Development#925
-naics#92511#Administration of Housing Programs#9251
-naics#92512#Administration of Urban Planning and Community and Rural Development#9251
-naics#926#Administration of Economic Programs#92
-naics#9261#Administration of Economic Programs#926
-naics#92611#Administration of General Economic Programs#9261
-naics#92612#Regulation and Administration of Transportation Programs#9261
-naics#92613#Regulation and Administration of Communications, Electric, Gas, and Other Utilities#9261
-naics#92614#Regulation of Agricultural Marketing and Commodities#9261
-naics#92615#Regulation, Licensing, and Inspection of Miscellaneous Commercial Sectors#9261
-naics#927#Space Research and Technology#92
-naics#9271#Space Research and Technology#927
-naics#92711#Space Research and Technology#9271
-naics#928#National Security and International Affairs#92
-naics#9281#National Security and International Affairs#928
-naics#92811#National Security#9281
-naics#92812#International Affairs#9281
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/data/unspsc-data.txt b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/data/unspsc-data.txt
deleted file mode 100644
index 17835141a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/data/unspsc-data.txt
+++ /dev/null
@@ -1,17054 +0,0 @@
-unspsc7#10.00.00.00.00#Live Plant and Animal Material and Accessories and Supplies#10.00.00.00.00
-unspsc7#10.10.00.00.00#Live animals#10.00.00.00.00
-unspsc7#10.10.15.00.00#Livestock#10.10.00.00.00
-unspsc7#10.10.15.01.00#Cats#10.10.15.00.00
-unspsc7#10.10.15.02.00#Dogs#10.10.15.00.00
-unspsc7#10.10.15.04.00#Mink#10.10.15.00.00
-unspsc7#10.10.15.05.00#Rats#10.10.15.00.00
-unspsc7#10.10.15.06.00#Horses#10.10.15.00.00
-unspsc7#10.10.15.07.00#Sheep#10.10.15.00.00
-unspsc7#10.10.15.08.00#Goats#10.10.15.00.00
-unspsc7#10.10.15.09.00#Asses#10.10.15.00.00
-unspsc7#10.10.15.10.00#Mice#10.10.15.00.00
-unspsc7#10.10.15.11.00#Swine#10.10.15.00.00
-unspsc7#10.10.15.12.00#Rabbits#10.10.15.00.00
-unspsc7#10.10.15.13.00#Guinea pigs#10.10.15.00.00
-unspsc7#10.10.15.14.00#Primates#10.10.15.00.00
-unspsc7#10.10.15.15.00#Armadillos#10.10.15.00.00
-unspsc7#10.10.15.16.00#Cattle#10.10.15.00.00
-unspsc7#10.10.15.17.00#Camels#10.10.15.00.00
-unspsc7#10.10.16.00.00#Birds and fowl#10.10.00.00.00
-unspsc7#10.10.16.01.00#Live chickens#10.10.16.00.00
-unspsc7#10.10.16.02.00#Live ducks#10.10.16.00.00
-unspsc7#10.10.16.03.00#Live turkeys#10.10.16.00.00
-unspsc7#10.10.16.04.00#Live geese#10.10.16.00.00
-unspsc7#10.10.16.05.00#Live pheasants#10.10.16.00.00
-unspsc7#10.10.17.00.00#Live fish#10.10.00.00.00
-unspsc7#10.10.17.01.00#Live salmon#10.10.17.00.00
-unspsc7#10.10.17.02.00#Live trout#10.10.17.00.00
-unspsc7#10.10.17.03.00#Live talapia#10.10.17.00.00
-unspsc7#10.10.17.04.00#Live carp#10.10.17.00.00
-unspsc7#10.10.17.05.00#Live eels#10.10.17.00.00
-unspsc7#10.10.18.00.00#Shellfish and aquatic invertebrates#10.10.00.00.00
-unspsc7#10.10.18.01.00#Live shrimp#10.10.18.00.00
-unspsc7#10.10.18.02.00#Live clams#10.10.18.00.00
-unspsc7#10.10.18.03.00#Live mussels#10.10.18.00.00
-unspsc7#10.10.18.04.00#Live oysters#10.10.18.00.00
-unspsc7#10.10.18.05.00#Live crabs#10.10.18.00.00
-unspsc7#10.10.18.06.00#Live abalone#10.10.18.00.00
-unspsc7#10.10.18.07.00#Live octopi#10.10.18.00.00
-unspsc7#10.10.18.08.00#Live squid#10.10.18.00.00
-unspsc7#10.10.19.00.00#Insects#10.10.00.00.00
-unspsc7#10.10.19.01.00#Butterflies#10.10.19.00.00
-unspsc7#10.10.19.02.00#Beetles#10.10.19.00.00
-unspsc7#10.10.19.03.00#Bees#10.10.19.00.00
-unspsc7#10.10.19.04.00#Silkworms#10.10.19.00.00
-unspsc7#10.10.20.00.00#Wild animals#10.10.00.00.00
-unspsc7#10.10.20.01.00#Elephants#10.10.20.00.00
-unspsc7#10.10.20.02.00#Live foxes#10.10.20.00.00
-unspsc7#10.11.00.00.00#Domestic pet products#10.00.00.00.00
-unspsc7#10.11.11.00.00#Pet food bowls or equipment#10.11.00.00.00
-unspsc7#10.11.12.00.00#Medicated pet treatments#10.11.00.00.00
-unspsc7#10.11.13.00.00#Domestic pet treatments and accessories and equipment#10.11.00.00.00
-unspsc7#10.11.13.01.00#Pet toys#10.11.13.00.00
-unspsc7#10.11.13.02.00#Pet grooming products#10.11.13.00.00
-unspsc7#10.11.13.03.00#Pet litter or equipment for pet waste management#10.11.13.00.00
-unspsc7#10.11.13.04.00#Pet food bowls or equipment#10.11.13.00.00
-unspsc7#10.11.13.05.00#Medicated pet treatments#10.11.13.00.00
-unspsc7#10.12.00.00.00#Animal feed#10.00.00.00.00
-unspsc7#10.12.15.00.00#Livestock feed#10.12.00.00.00
-unspsc7#10.12.15.01.00#Pure wheat bran#10.12.15.00.00
-unspsc7#10.12.15.02.00#Feed oats#10.12.15.00.00
-unspsc7#10.12.15.03.00#Feed corn#10.12.15.00.00
-unspsc7#10.12.15.04.00#Feed sorghum#10.12.15.00.00
-unspsc7#10.12.15.05.00#Hay#10.12.15.00.00
-unspsc7#10.12.15.06.00#Oil cake#10.12.15.00.00
-unspsc7#10.12.16.00.00#Bird and fowl food#10.12.00.00.00
-unspsc7#10.12.16.01.00#Live food for birds#10.12.16.00.00
-unspsc7#10.12.16.02.00#Bird seed#10.12.16.00.00
-unspsc7#10.12.16.03.00#Bird treats or snacks#10.12.16.00.00
-unspsc7#10.12.16.04.00#Poultry food#10.12.16.00.00
-unspsc7#10.12.17.00.00#Fish food#10.12.00.00.00
-unspsc7#10.12.17.01.00#Fresh or frozen brine#10.12.17.00.00
-unspsc7#10.12.17.02.00#Fish food pellets#10.12.17.00.00
-unspsc7#10.12.17.03.00#Fish food flakes#10.12.17.00.00
-unspsc7#10.12.18.00.00#Dog and cat food#10.12.00.00.00
-unspsc7#10.12.18.01.00#Dry food for dogs#10.12.18.00.00
-unspsc7#10.12.18.02.00#Moist food for dogs#10.12.18.00.00
-unspsc7#10.12.18.03.00#Milk for dogs or cats#10.12.18.00.00
-unspsc7#10.12.18.04.00#Dry food for cats#10.12.18.00.00
-unspsc7#10.12.18.05.00#Moist food for cats#10.12.18.00.00
-unspsc7#10.12.18.06.00#Treats or snacks for cats or dogs#10.12.18.00.00
-unspsc7#10.12.19.00.00#Rodent food#10.12.00.00.00
-unspsc7#10.12.19.01.00#Pelletized food for rodents#10.12.19.00.00
-unspsc7#10.12.20.00.00#Reptile food#10.12.00.00.00
-unspsc7#10.12.20.01.00#Pelletized food for reptiles#10.12.20.00.00
-unspsc7#10.12.20.02.00#Moist food for reptiles#10.12.20.00.00
-unspsc7#10.12.20.03.00#Live food for reptiles#10.12.20.00.00
-unspsc7#10.13.00.00.00#Animal containment and habitats#10.00.00.00.00
-unspsc7#10.13.15.00.00#Animal shelters#10.13.00.00.00
-unspsc7#10.13.15.06.00#Livestock stables#10.13.15.00.00
-unspsc7#10.13.15.07.00#Domesticized pet houses#10.13.15.00.00
-unspsc7#10.13.15.08.00#Pet beds#10.13.15.00.00
-unspsc7#10.13.16.00.00#Animal containment#10.13.00.00.00
-unspsc7#10.13.16.01.00#Cages#10.13.16.00.00
-unspsc7#10.13.16.02.00#Kennels#10.13.16.00.00
-unspsc7#10.13.16.03.00#Animal carrying cases#10.13.16.00.00
-unspsc7#10.13.16.04.00#Dog runs#10.13.16.00.00
-unspsc7#10.13.17.00.00#Animal habitats#10.13.00.00.00
-unspsc7#10.13.17.01.00#Terrariums#10.13.17.00.00
-unspsc7#10.13.17.02.00#Aquariums#10.13.17.00.00
-unspsc7#10.14.00.00.00#Saddlery and harness goods#10.00.00.00.00
-unspsc7#10.14.15.00.00#Saddlery#10.14.00.00.00
-unspsc7#10.14.15.01.00#Saddles#10.14.15.00.00
-unspsc7#10.14.15.02.00#Whips#10.14.15.00.00
-unspsc7#10.14.16.00.00#Harness goods#10.14.00.00.00
-unspsc7#10.14.16.01.00#Bridles#10.14.16.00.00
-unspsc7#10.14.16.02.00#Yokes#10.14.16.00.00
-unspsc7#10.14.16.03.00#Horse bits#10.14.16.00.00
-unspsc7#10.14.16.04.00#Reins#10.14.16.00.00
-unspsc7#10.14.16.05.00#Stirrups#10.14.16.00.00
-unspsc7#10.14.16.06.00#Leashes or leads#10.14.16.00.00
-unspsc7#10.14.16.07.00#Collars#10.14.16.00.00
-unspsc7#10.14.16.08.00#Harnesses#10.14.16.00.00
-unspsc7#10.14.16.09.00#Restraints#10.14.16.00.00
-unspsc7#10.15.00.00.00#Seeds and bulbs and seedlings and cuttings#10.00.00.00.00
-unspsc7#10.15.15.00.00#Vegetable seeds and seedlings#10.15.00.00.00
-unspsc7#10.15.15.01.00#Bean seeds or seedlings#10.15.15.00.00
-unspsc7#10.15.15.02.00#Carrot seeds or seedlings#10.15.15.00.00
-unspsc7#10.15.15.03.00#Celery seeds or seedlings#10.15.15.00.00
-unspsc7#10.15.15.04.00#Chili seeds or seedlings#10.15.15.00.00
-unspsc7#10.15.15.05.00#Courgette seeds or seedlings#10.15.15.00.00
-unspsc7#10.15.15.06.00#Cow pea seeds or seedlings#10.15.15.00.00
-unspsc7#10.15.15.07.00#Cucumber seeds or seedlings#10.15.15.00.00
-unspsc7#10.15.15.08.00#Eggplant seeds or seedlings#10.15.15.00.00
-unspsc7#10.15.15.09.00#Endive seeds or seedlings#10.15.15.00.00
-unspsc7#10.15.15.10.00#Garlic seeds or seedlings#10.15.15.00.00
-unspsc7#10.15.15.11.00#Leek seeds or seedlings#10.15.15.00.00
-unspsc7#10.15.15.12.00#Lettuce seeds or seedlings#10.15.15.00.00
-unspsc7#10.15.15.13.00#Corn seeds or seedlings#10.15.15.00.00
-unspsc7#10.15.15.14.00#Melon seeds or seedlings#10.15.15.00.00
-unspsc7#10.15.15.15.00#Onion seeds or seedlings#10.15.15.00.00
-unspsc7#10.15.15.16.00#Soya seeds or seedlings#10.15.15.00.00
-unspsc7#10.15.15.17.00#Spinach seeds or seedlings#10.15.15.00.00
-unspsc7#10.15.15.18.00#Tomato seeds or seedlings#10.15.15.00.00
-unspsc7#10.15.15.19.00#Turnip seeds or seedlings#10.15.15.00.00
-unspsc7#10.15.15.20.00#Chard seeds or seedlings#10.15.15.00.00
-unspsc7#10.15.15.21.00#Sweet pepper seeds or seedlings#10.15.15.00.00
-unspsc7#10.15.15.22.00#Beet seeds or seedlings#10.15.15.00.00
-unspsc7#10.15.15.23.00#Cauliflower seeds or seedlings#10.15.15.00.00
-unspsc7#10.15.15.24.00#Parsely seeds or seedlings#10.15.15.00.00
-unspsc7#10.15.16.00.00#Cereal seeds#10.15.00.00.00
-unspsc7#10.15.16.01.00#Wheat seeds#10.15.16.00.00
-unspsc7#10.15.16.02.00#Colza seeds#10.15.16.00.00
-unspsc7#10.15.16.03.00#Barley seeds#10.15.16.00.00
-unspsc7#10.15.16.04.00#Millet seeds#10.15.16.00.00
-unspsc7#10.15.16.05.00#Oat seeds#10.15.16.00.00
-unspsc7#10.15.16.06.00#Sesame seeds#10.15.16.00.00
-unspsc7#10.15.16.07.00#Linseed seeds#10.15.16.00.00
-unspsc7#10.15.16.08.00#Castor oil seeds#10.15.16.00.00
-unspsc7#10.15.16.09.00#Maize seeds#10.15.16.00.00
-unspsc7#10.15.16.10.00#Rye seeds#10.15.16.00.00
-unspsc7#10.15.16.11.00#Sorghum seeds#10.15.16.00.00
-unspsc7#10.15.17.00.00#Grass and forage seeds and seedlings#10.15.00.00.00
-unspsc7#10.15.17.01.00#Rice seeds or seedlings#10.15.17.00.00
-unspsc7#10.15.17.02.00#Clover seeds or seedling#10.15.17.00.00
-unspsc7#10.15.17.03.00#Alfalfa seeds or seedlings#10.15.17.00.00
-unspsc7#10.15.17.04.00#Grass seeds or seedlings#10.15.17.00.00
-unspsc7#10.15.18.00.00#Spice crop seeds and seedlings#10.15.00.00.00
-unspsc7#10.15.18.01.00#Pepper seeds or seedlings#10.15.18.00.00
-unspsc7#10.15.18.02.00#Vanilla seeds or seedlings#10.15.18.00.00
-unspsc7#10.15.18.03.00#Cinnamon seeds or seedlings#10.15.18.00.00
-unspsc7#10.15.18.04.00#Clove seeds or seedlings#10.15.18.00.00
-unspsc7#10.15.18.05.00#Coriander seeds or seedlings#10.15.18.00.00
-unspsc7#10.15.18.06.00#Ginger seeds or seedlings#10.15.18.00.00
-unspsc7#10.15.18.07.00#Saffron seeds or seedlings#10.15.18.00.00
-unspsc7#10.15.18.08.00#Thyme seeds or seedlings#10.15.18.00.00
-unspsc7#10.15.18.09.00#Curry seeds or seedlings#10.15.18.00.00
-unspsc7#10.15.18.10.00#Mustard seeds or seedlings#10.15.18.00.00
-unspsc7#10.15.18.11.00#Ginseng roots or seedlings#10.15.18.00.00
-unspsc7#10.15.19.00.00#Flower seeds and bulbs and seedlings and cuttings#10.15.00.00.00
-unspsc7#10.15.19.01.00#Tulip seeds or bulbs or seedlings or cuttings#10.15.19.00.00
-unspsc7#10.15.19.02.00#Rose seeds or seedlings or cuttings#10.15.19.00.00
-unspsc7#10.15.19.03.00#Daffodil seeds or bulbs or seedlings or cuttings#10.15.19.00.00
-unspsc7#10.15.19.04.00#Sunflower seeds#10.15.19.00.00
-unspsc7#10.15.19.05.00#Hyacinth bulbs or shoots#10.15.19.00.00
-unspsc7#10.15.19.06.00#Lily Bulbs#10.15.19.00.00
-unspsc7#10.15.20.00.00#Tree and shrub seeds and cuttings#10.15.00.00.00
-unspsc7#10.15.20.01.00#Fruit tree seeds or cuttings#10.15.20.00.00
-unspsc7#10.15.20.02.00#Conifer tree seeds or cuttings#10.15.20.00.00
-unspsc7#10.15.20.03.00#Nut tree seeds or cuttings#10.15.20.00.00
-unspsc7#10.15.21.00.00#Residues other than animal feed#10.15.00.00.00
-unspsc7#10.15.21.01.00#Residues babool seed extraction#10.15.21.00.00
-unspsc7#10.15.21.02.00#Residues of rape seeds#10.15.21.00.00
-unspsc7#10.15.21.03.00#Residue of linseed#10.15.21.00.00
-unspsc7#10.15.21.04.00#Oil cake of neem#10.15.21.00.00
-unspsc7#10.15.22.00.00#Fibrous crop seeds and seedlings#10.15.00.00.00
-unspsc7#10.15.22.01.00#Cotton seeds or seedlings#10.15.22.00.00
-unspsc7#10.16.00.00.00#Floriculture and silviculture products#10.00.00.00.00
-unspsc7#10.16.15.00.00#Trees and shrubs#10.16.00.00.00
-unspsc7#10.16.15.01.00#Olive trees#10.16.15.00.00
-unspsc7#10.16.15.02.00#Coffee shrubs#10.16.15.00.00
-unspsc7#10.16.15.03.00#Cocoa trees#10.16.15.00.00
-unspsc7#10.16.15.04.00#Apple trees#10.16.15.00.00
-unspsc7#10.16.15.05.00#Peach trees#10.16.15.00.00
-unspsc7#10.16.15.06.00#Orange trees#10.16.15.00.00
-unspsc7#10.16.15.07.00#Rhodendron shrubs#10.16.15.00.00
-unspsc7#10.16.15.08.00#Tea shrubs#10.16.15.00.00
-unspsc7#10.16.15.09.00#Conifer trees#10.16.15.00.00
-unspsc7#10.16.15.10.00#Spruce trees#10.16.15.00.00
-unspsc7#10.16.15.11.00#Pine trees#10.16.15.00.00
-unspsc7#10.16.15.12.00#Fir trees#10.16.15.00.00
-unspsc7#10.16.16.00.00#Floral plants#10.16.00.00.00
-unspsc7#10.16.16.01.00#Rose plants#10.16.16.00.00
-unspsc7#10.16.16.02.00#Poinsettias plants#10.16.16.00.00
-unspsc7#10.16.16.03.00#Orchids plants#10.16.16.00.00
-unspsc7#10.16.16.04.00#Azaleas plants#10.16.16.00.00
-unspsc7#10.16.16.05.00#Cactus plants#10.16.16.00.00
-unspsc7#10.16.17.00.00#Cut flowers#10.16.00.00.00
-unspsc7#10.16.17.01.00#Cut gladiolus#10.16.17.00.00
-unspsc7#10.16.17.02.00#Cut lilies#10.16.17.00.00
-unspsc7#10.16.17.03.00#Cut carnations#10.16.17.00.00
-unspsc7#10.16.17.04.00#Cut tulips#10.16.17.00.00
-unspsc7#10.16.17.05.00#Cut roses#10.16.17.00.00
-unspsc7#10.16.18.00.00#Non flowering plants#10.16.00.00.00
-unspsc7#10.16.18.01.00#Ferns#10.16.18.00.00
-unspsc7#10.16.18.02.00#Ivies#10.16.18.00.00
-unspsc7#10.16.18.03.00#Philodendrons#10.16.18.00.00
-unspsc7#10.16.19.00.00#Dried floral products#10.16.00.00.00
-unspsc7#10.16.19.01.00#Dried pods#10.16.19.00.00
-unspsc7#10.16.19.02.00#Dried leafy greenery#10.16.19.00.00
-unspsc7#10.16.19.03.00#Dried fern greenery#10.16.19.00.00
-unspsc7#10.16.19.04.00#Dried full flowers#10.16.19.00.00
-unspsc7#10.16.19.05.00#Dried twigs or sticks#10.16.19.00.00
-unspsc7#10.16.19.06.00#Dried grass plumes#10.16.19.00.00
-unspsc7#10.16.19.07.00#Dried pressed flowers#10.16.19.00.00
-unspsc7#10.16.19.08.00#Dried flower petals#10.16.19.00.00
-unspsc7#10.17.00.00.00#Fertilizers and plant nutrients and herbicides#10.00.00.00.00
-unspsc7#10.17.15.00.00#Organic fertilizers and plant nutrients#10.17.00.00.00
-unspsc7#10.17.15.01.00#Manure or guano#10.17.15.00.00
-unspsc7#10.17.15.02.00#Plant hormones#10.17.15.00.00
-unspsc7#10.17.15.03.00#Fish meal#10.17.15.00.00
-unspsc7#10.17.16.00.00#Chemical fertilizers and plant nutrients#10.17.00.00.00
-unspsc7#10.17.16.01.00#Nitrogenous fertilizer#10.17.16.00.00
-unspsc7#10.17.16.02.00#Potassic fertilizer#10.17.16.00.00
-unspsc7#10.17.16.03.00#Phosphatic fertilizer#10.17.16.00.00
-unspsc7#10.17.16.04.00#Sulphuric fertilizer#10.17.16.00.00
-unspsc7#10.17.16.05.00#Nitrogen Phosphorous Potassium Mixtures (NPK)#10.17.16.00.00
-unspsc7#10.17.17.00.00#Herbicides#10.17.00.00.00
-unspsc7#10.17.17.01.00#Weed killer#10.17.17.00.00
-unspsc7#10.17.17.02.00#Fungicides#10.17.17.00.00
-unspsc7#10.19.00.00.00#Pest control products#10.00.00.00.00
-unspsc7#10.19.15.00.00#Insecticides and insect control traps#10.19.00.00.00
-unspsc7#10.19.15.01.00#Spray insecticides#10.19.15.00.00
-unspsc7#10.19.15.02.00#Bait insecticides#10.19.15.00.00
-unspsc7#10.19.15.03.00#Silicic acid#10.19.15.00.00
-unspsc7#10.19.15.04.00#Flying insect control traps#10.19.15.00.00
-unspsc7#10.19.16.00.00#Rodenticides#10.19.00.00.00
-unspsc7#10.19.16.01.00#Extruded baits#10.19.16.00.00
-unspsc7#10.19.16.02.00#Meal or pellet or seed baits#10.19.16.00.00
-unspsc7#10.19.16.03.00#Liquid baits#10.19.16.00.00
-unspsc7#10.19.16.04.00#Tracking powders#10.19.16.00.00
-unspsc7#10.19.17.00.00#Animal control traps#10.19.00.00.00
-unspsc7#10.19.17.01.00#Mouse or rat traps#10.19.17.00.00
-unspsc7#10.19.17.02.00#Wire cage traps#10.19.17.00.00
-unspsc7#11.00.00.00.00#Mineral and Textile and Inedible Plant and Animal Materials#11.00.00.00.00
-unspsc7#11.10.00.00.00#Minerals and ores and metals#11.00.00.00.00
-unspsc7#11.10.15.00.00#Minerals#11.10.00.00.00
-unspsc7#11.10.15.01.00#Mica#11.10.15.00.00
-unspsc7#11.10.15.02.00#Emery#11.10.15.00.00
-unspsc7#11.10.15.03.00#Quartz#11.10.15.00.00
-unspsc7#11.10.15.04.00#Pyrite#11.10.15.00.00
-unspsc7#11.10.15.05.00#Sulphur#11.10.15.00.00
-unspsc7#11.10.15.06.00#Chalk#11.10.15.00.00
-unspsc7#11.10.15.07.00#Graphite#11.10.15.00.00
-unspsc7#11.10.15.08.00#Dolomite#11.10.15.00.00
-unspsc7#11.10.15.09.00#Magnesite#11.10.15.00.00
-unspsc7#11.10.15.10.00#Asbestos#11.10.15.00.00
-unspsc7#11.10.15.11.00#Calcium#11.10.15.00.00
-unspsc7#11.10.15.12.00#Borate#11.10.15.00.00
-unspsc7#11.10.15.13.00#Cryolite#11.10.15.00.00
-unspsc7#11.10.15.14.00#Feldspar#11.10.15.00.00
-unspsc7#11.10.15.15.00#Leucite#11.10.15.00.00
-unspsc7#11.10.15.16.00#Nephelite#11.10.15.00.00
-unspsc7#11.10.15.17.00#Steatite#11.10.15.00.00
-unspsc7#11.10.15.18.00#Talc#11.10.15.00.00
-unspsc7#11.10.15.19.00#Diamonds#11.10.15.00.00
-unspsc7#11.10.15.20.00#Garnets#11.10.15.00.00
-unspsc7#11.10.15.21.00#Silicon carbide#11.10.15.00.00
-unspsc7#11.10.15.22.00#Activated carbon#11.10.15.00.00
-unspsc7#11.10.15.23.00#Mulite#11.10.15.00.00
-unspsc7#11.10.15.24.00#Flourospar#11.10.15.00.00
-unspsc7#11.10.15.25.00#Keiserite#11.10.15.00.00
-unspsc7#11.10.15.26.00#Carnallite#11.10.15.00.00
-unspsc7#11.10.16.00.00#Ores#11.10.00.00.00
-unspsc7#11.10.16.01.00#Iron ore#11.10.16.00.00
-unspsc7#11.10.16.02.00#Titanium ore#11.10.16.00.00
-unspsc7#11.10.16.03.00#Uranium ore#11.10.16.00.00
-unspsc7#11.10.16.04.00#Copper ore#11.10.16.00.00
-unspsc7#11.10.16.05.00#Aluminum ore#11.10.16.00.00
-unspsc7#11.10.16.06.00#Nickel ore#11.10.16.00.00
-unspsc7#11.10.16.07.00#Silver ore#11.10.16.00.00
-unspsc7#11.10.16.08.00#Lead ore#11.10.16.00.00
-unspsc7#11.10.16.09.00#Zinc ore#11.10.16.00.00
-unspsc7#11.10.16.10.00#Tin ore#11.10.16.00.00
-unspsc7#11.10.16.11.00#Manganese ore#11.10.16.00.00
-unspsc7#11.10.16.12.00#Chromium ore#11.10.16.00.00
-unspsc7#11.10.16.13.00#Tungsten or wolfram ore#11.10.16.00.00
-unspsc7#11.10.16.14.00#Molybdenum ore#11.10.16.00.00
-unspsc7#11.10.16.15.00#Cobalt ore#11.10.16.00.00
-unspsc7#11.10.16.16.00#Gold ore#11.10.16.00.00
-unspsc7#11.10.16.17.00#Tantalum ore#11.10.16.00.00
-unspsc7#11.10.16.18.00#Platinum ore#11.10.16.00.00
-unspsc7#11.10.16.19.00#Vermiculite ore#11.10.16.00.00
-unspsc7#11.10.16.20.00#Thorium ore#11.10.16.00.00
-unspsc7#11.10.16.21.00#Kyanite ore#11.10.16.00.00
-unspsc7#11.10.16.22.00#Antimony ores#11.10.16.00.00
-unspsc7#11.10.16.23.00#Zirconium ores#11.10.16.00.00
-unspsc7#11.10.17.00.00#Base metals#11.10.00.00.00
-unspsc7#11.10.17.01.00#Slag or ash#11.10.17.00.00
-unspsc7#11.10.17.02.00#Natural graphite#11.10.17.00.00
-unspsc7#11.10.17.03.00#Titanium#11.10.17.00.00
-unspsc7#11.10.17.04.00#Steel#11.10.17.00.00
-unspsc7#11.10.17.05.00#Aluminum#11.10.17.00.00
-unspsc7#11.10.17.06.00#Nickel#11.10.17.00.00
-unspsc7#11.10.17.07.00#Magnesium#11.10.17.00.00
-unspsc7#11.10.17.08.00#Bismuth#11.10.17.00.00
-unspsc7#11.10.17.09.00#Antimony#11.10.17.00.00
-unspsc7#11.10.17.10.00#Cadmium#11.10.17.00.00
-unspsc7#11.10.17.11.00#Non ferrous alloy#11.10.17.00.00
-unspsc7#11.10.17.12.00#Ferrous alloy#11.10.17.00.00
-unspsc7#11.10.17.13.00#Iron#11.10.17.00.00
-unspsc7#11.10.17.14.00#Lead#11.10.17.00.00
-unspsc7#11.10.17.15.00#Copper#11.10.17.00.00
-unspsc7#11.10.18.00.00#Precious metals#11.10.00.00.00
-unspsc7#11.10.18.01.00#Gold#11.10.18.00.00
-unspsc7#11.10.18.02.00#Silver#11.10.18.00.00
-unspsc7#11.10.18.03.00#Platinum#11.10.18.00.00
-unspsc7#11.11.00.00.00#Earth and stone#11.00.00.00.00
-unspsc7#11.11.15.00.00#Dirt and soil#11.11.00.00.00
-unspsc7#11.11.15.01.00#Soil#11.11.15.00.00
-unspsc7#11.11.15.02.00#Fill dirt#11.11.15.00.00
-unspsc7#11.11.15.03.00#Topsoil#11.11.15.00.00
-unspsc7#11.11.16.00.00#Stone#11.11.00.00.00
-unspsc7#11.11.16.01.00#Gypsum#11.11.16.00.00
-unspsc7#11.11.16.02.00#Travertine#11.11.16.00.00
-unspsc7#11.11.16.03.00#Ecaussine or alabaster#11.11.16.00.00
-unspsc7#11.11.16.04.00#Granite#11.11.16.00.00
-unspsc7#11.11.16.05.00#Marble#11.11.16.00.00
-unspsc7#11.11.16.06.00#Slate#11.11.16.00.00
-unspsc7#11.11.16.07.00#Sandstone#11.11.16.00.00
-unspsc7#11.11.16.08.00#Limestone#11.11.16.00.00
-unspsc7#11.11.16.09.00#Basalt#11.11.16.00.00
-unspsc7#11.11.16.10.00#Pumice stone#11.11.16.00.00
-unspsc7#11.11.17.00.00#Sand#11.11.00.00.00
-unspsc7#11.11.17.01.00#Silica sand#11.11.17.00.00
-unspsc7#11.11.18.00.00#Clays#11.11.00.00.00
-unspsc7#11.11.18.01.00#Terra cotta#11.11.18.00.00
-unspsc7#11.11.18.02.00#Fireclay#11.11.18.00.00
-unspsc7#11.11.18.03.00#Kaolin or other kaolinic clays#11.11.18.00.00
-unspsc7#11.11.18.04.00#Bentonite#11.11.18.00.00
-unspsc7#11.11.18.05.00#Andalusite#11.11.18.00.00
-unspsc7#11.11.18.06.00#Mullite#11.11.18.00.00
-unspsc7#11.11.18.07.00#Chamotte#11.11.18.00.00
-unspsc7#11.11.18.08.00#Common clay#11.11.18.00.00
-unspsc7#11.11.18.09.00#Ball clay#11.11.18.00.00
-unspsc7#11.11.18.10.00#Fullers earth#11.11.18.00.00
-unspsc7#11.12.00.00.00#Non edible plant and forestry products#11.00.00.00.00
-unspsc7#11.12.15.00.00#Sap#11.12.00.00.00
-unspsc7#11.12.15.02.00#Rosin#11.12.15.00.00
-unspsc7#11.12.15.03.00#Lac#11.12.15.00.00
-unspsc7#11.12.16.00.00#Wood#11.12.00.00.00
-unspsc7#11.12.16.03.00#Logs#11.12.16.00.00
-unspsc7#11.12.16.04.00#Soft timber#11.12.16.00.00
-unspsc7#11.12.16.05.00#Rattan#11.12.16.00.00
-unspsc7#11.12.16.06.00#Cork#11.12.16.00.00
-unspsc7#11.12.16.07.00#Wood pulp#11.12.16.00.00
-unspsc7#11.12.16.08.00#Bamboo#11.12.16.00.00
-unspsc7#11.12.16.09.00#Plywood#11.12.16.00.00
-unspsc7#11.12.16.10.00#Hardwoods#11.12.16.00.00
-unspsc7#11.12.17.00.00#Forestry by products#11.12.00.00.00
-unspsc7#11.12.17.01.00#Saw dust#11.12.17.00.00
-unspsc7#11.12.17.02.00#Wood chips#11.12.17.00.00
-unspsc7#11.12.17.03.00#Peat moss#11.12.17.00.00
-unspsc7#11.12.17.04.00#Wood shavings#11.12.17.00.00
-unspsc7#11.12.17.05.00#Bark#11.12.17.00.00
-unspsc7#11.12.17.06.00#Mulch#11.12.17.00.00
-unspsc7#11.12.17.07.00#Wood wool#11.12.17.00.00
-unspsc7#11.12.17.08.00#Wood flour#11.12.17.00.00
-unspsc7#11.12.17.09.00#Balsams#11.12.17.00.00
-unspsc7#11.12.18.00.00#Plant fibers#11.12.00.00.00
-unspsc7#11.12.18.01.00#Hemp#11.12.18.00.00
-unspsc7#11.12.18.02.00#Cotton#11.12.18.00.00
-unspsc7#11.12.18.03.00#Flax#11.12.18.00.00
-unspsc7#11.12.18.04.00#Jute#11.12.18.00.00
-unspsc7#11.12.18.05.00#Sisal#11.12.18.00.00
-unspsc7#11.12.18.06.00#Coconut fibres or coir#11.12.18.00.00
-unspsc7#11.12.18.07.00#Abaca fibers#11.12.18.00.00
-unspsc7#11.12.18.08.00#Ramie#11.12.18.00.00
-unspsc7#11.12.18.09.00#Straw#11.12.18.00.00
-unspsc7#11.12.18.10.00#Broom corn or istle or piassava#11.12.18.00.00
-unspsc7#11.12.19.00.00#Perfumery products#11.12.00.00.00
-unspsc7#11.12.19.01.00#Licorice roots#11.12.19.00.00
-unspsc7#11.13.00.00.00#Non edible animal products#11.00.00.00.00
-unspsc7#11.13.15.00.00#Animal hides and skins and animal textile materials#11.13.00.00.00
-unspsc7#11.13.15.01.00#Feathers#11.13.15.00.00
-unspsc7#11.13.15.02.00#Furs#11.13.15.00.00
-unspsc7#11.13.15.03.00#Animal hair#11.13.15.00.00
-unspsc7#11.13.15.04.00#Hides#11.13.15.00.00
-unspsc7#11.13.15.05.00#Unprocessed mohair#11.13.15.00.00
-unspsc7#11.13.15.06.00#Unprocessed wool#11.13.15.00.00
-unspsc7#11.13.15.07.00#Suede#11.13.15.00.00
-unspsc7#11.13.15.08.00#Full grain leather#11.13.15.00.00
-unspsc7#11.13.16.00.00#Other animal products#11.13.00.00.00
-unspsc7#11.13.16.01.00#Ivory#11.13.16.00.00
-unspsc7#11.13.16.02.00#Semen#11.13.16.00.00
-unspsc7#11.13.16.03.00#Excretions#11.13.16.00.00
-unspsc7#11.13.16.04.00#Fish eggs#11.13.16.00.00
-unspsc7#11.13.16.05.00#Bones#11.13.16.00.00
-unspsc7#11.13.16.06.00#Animal horns#11.13.16.00.00
-unspsc7#11.13.16.07.00#Embryos#11.13.16.00.00
-unspsc7#11.13.16.08.00#Shell articles#11.13.16.00.00
-unspsc7#11.14.00.00.00#Scrap and waste materials#11.00.00.00.00
-unspsc7#11.14.15.00.00#Metal waste and scrap#11.14.00.00.00
-unspsc7#11.14.15.01.00#Ferrous metal waste or scrap#11.14.15.00.00
-unspsc7#11.14.15.02.00#Non ferrous metal waste or scrap#11.14.15.00.00
-unspsc7#11.14.15.03.00#Automotive wrecking for waste or scrap#11.14.15.00.00
-unspsc7#11.14.16.00.00#Non metallic waste and scrap#11.14.00.00.00
-unspsc7#11.14.16.01.00#Textile waste or scrap#11.14.16.00.00
-unspsc7#11.14.16.02.00#Plastic waste or scrap#11.14.16.00.00
-unspsc7#11.14.16.03.00#Oil wastes#11.14.16.00.00
-unspsc7#11.14.16.04.00#Paper wastes#11.14.16.00.00
-unspsc7#11.14.16.05.00#Glass waste or scrap#11.14.16.00.00
-unspsc7#11.14.16.06.00#Wood waste or scrap#11.14.16.00.00
-unspsc7#11.14.16.07.00#Rubber waste or scrap#11.14.16.00.00
-unspsc7#11.14.16.08.00#Hazardous waste or scrap#11.14.16.00.00
-unspsc7#11.14.16.09.00#Composition leather#11.14.16.00.00
-unspsc7#11.14.16.10.00#Leather waste and scrap#11.14.16.00.00
-unspsc7#11.14.17.00.00#Food and tobacco waste and scrap#11.14.00.00.00
-unspsc7#11.14.17.01.00#Food waste or scrap#11.14.17.00.00
-unspsc7#11.14.17.02.00#Tobacco waste or scrap#11.14.17.00.00
-unspsc7#11.15.00.00.00#Fibers and threads and yarns#11.00.00.00.00
-unspsc7#11.15.15.00.00#Fibers#11.15.00.00.00
-unspsc7#11.15.15.01.00#Acetate fibers#11.15.15.00.00
-unspsc7#11.15.15.02.00#Nylon fibers#11.15.15.00.00
-unspsc7#11.15.15.03.00#Polyester fibers#11.15.15.00.00
-unspsc7#11.15.15.04.00#Acrylic fibers#11.15.15.00.00
-unspsc7#11.15.15.05.00#Viscose fibers#11.15.15.00.00
-unspsc7#11.15.15.06.00#Rayon fibers#11.15.15.00.00
-unspsc7#11.15.15.07.00#Cotton fibers#11.15.15.00.00
-unspsc7#11.15.15.08.00#Wool fibers#11.15.15.00.00
-unspsc7#11.15.15.09.00#Silk fibers#11.15.15.00.00
-unspsc7#11.15.15.10.00#Vegetable fibers#11.15.15.00.00
-unspsc7#11.15.15.11.00#Polypropylene fibers#11.15.15.00.00
-unspsc7#11.15.15.12.00#Glass fibers#11.15.15.00.00
-unspsc7#11.15.15.13.00#Ceramic fibers#11.15.15.00.00
-unspsc7#11.15.15.14.00#Polymer aramid fibers#11.15.15.00.00
-unspsc7#11.15.15.15.00#Asbestos fibers#11.15.15.00.00
-unspsc7#11.15.16.00.00#Threads#11.15.00.00.00
-unspsc7#11.15.16.01.00#Cotton thread#11.15.16.00.00
-unspsc7#11.15.16.02.00#Silk thread#11.15.16.00.00
-unspsc7#11.15.16.03.00#Polyester thread#11.15.16.00.00
-unspsc7#11.15.16.04.00#Polyamide thread#11.15.16.00.00
-unspsc7#11.15.16.05.00#Bismalemide thread#11.15.16.00.00
-unspsc7#11.15.16.06.00#Fiberglass thread#11.15.16.00.00
-unspsc7#11.15.16.07.00#Graphite thread#11.15.16.00.00
-unspsc7#11.15.16.08.00#Nylon thread#11.15.16.00.00
-unspsc7#11.15.16.09.00#Resin impregnated thread#11.15.16.00.00
-unspsc7#11.15.16.10.00#Rubber or latex thread#11.15.16.00.00
-unspsc7#11.15.16.11.00#Spandex thread#11.15.16.00.00
-unspsc7#11.15.17.00.00#Yarns#11.15.00.00.00
-unspsc7#11.15.17.01.00#Wool yarn#11.15.17.00.00
-unspsc7#11.15.17.02.00#Cotton yarn#11.15.17.00.00
-unspsc7#11.15.17.03.00#Polyester yarn#11.15.17.00.00
-unspsc7#11.15.17.04.00#Acrylic yarn#11.15.17.00.00
-unspsc7#11.15.17.05.00#Silk yarn#11.15.17.00.00
-unspsc7#11.15.17.06.00#Ramie yarn#11.15.17.00.00
-unspsc7#11.15.17.07.00#Flax yarn#11.15.17.00.00
-unspsc7#11.15.17.08.00#Animal hair yarn#11.15.17.00.00
-unspsc7#11.15.17.09.00#Synthetic yarn#11.15.17.00.00
-unspsc7#11.15.17.10.00#Jute yarn#11.15.17.00.00
-unspsc7#11.15.17.11.00#Coir yarn#11.15.17.00.00
-unspsc7#11.15.17.12.00#Paper yarn#11.15.17.00.00
-unspsc7#11.15.17.13.00#Hemp yarn#11.15.17.00.00
-unspsc7#11.16.00.00.00#Fabrics and leather materials#11.00.00.00.00
-unspsc7#11.16.15.00.00#Silk fabrics#11.16.00.00.00
-unspsc7#11.16.15.01.00#Plain weave silk fabrics#11.16.15.00.00
-unspsc7#11.16.15.02.00#Jacquard weave silk fabrics#11.16.15.00.00
-unspsc7#11.16.15.03.00#Knit silk fabrics#11.16.15.00.00
-unspsc7#11.16.15.04.00#Silk velvets fabrics#11.16.15.00.00
-unspsc7#11.16.16.00.00#Wool fabrics#11.16.00.00.00
-unspsc7#11.16.16.01.00#Plain weave wool fabrics#11.16.16.00.00
-unspsc7#11.16.16.02.00#Jacquard weave wool fabrics#11.16.16.00.00
-unspsc7#11.16.16.03.00#Knit wool fabrics#11.16.16.00.00
-unspsc7#11.16.17.00.00#Cotton fabrics#11.16.00.00.00
-unspsc7#11.16.17.01.00#Plain weave cotton fabrics#11.16.17.00.00
-unspsc7#11.16.17.02.00#Twill weave cotton fabrics#11.16.17.00.00
-unspsc7#11.16.17.03.00#Cotton oxford cloths#11.16.17.00.00
-unspsc7#11.16.17.04.00#Knit cotton fabrics#11.16.17.00.00
-unspsc7#11.16.17.05.00#Cotton velvet fabrics#11.16.17.00.00
-unspsc7#11.16.18.00.00#Synthetic fabrics#11.16.00.00.00
-unspsc7#11.16.18.01.00#Plain weave synthetic fabrics#11.16.18.00.00
-unspsc7#11.16.18.02.00#Jacquard weave synthetic fabrics#11.16.18.00.00
-unspsc7#11.16.18.03.00#Dobby weave synthetic fabrics#11.16.18.00.00
-unspsc7#11.16.18.04.00#Knit synthetic fabrics#11.16.18.00.00
-unspsc7#11.16.18.05.00#Synthetic velvet fabrics#11.16.18.00.00
-unspsc7#11.16.19.00.00#Artificial fabrics#11.16.00.00.00
-unspsc7#11.16.19.01.00#Plain weave artificial fabrics#11.16.19.00.00
-unspsc7#11.16.19.02.00#Jacquard weave artificial fabrics#11.16.19.00.00
-unspsc7#11.16.19.03.00#Dobby weave artificial fabrics#11.16.19.00.00
-unspsc7#11.16.19.04.00#Knit artificial fabrics#11.16.19.00.00
-unspsc7#11.16.19.05.00#Artifical velvet fabrics#11.16.19.00.00
-unspsc7#11.16.20.00.00#Fabrics of vegetable material other than cotton#11.16.00.00.00
-unspsc7#11.16.20.01.00#Plain weave non cotton vegetable fiber fabrics#11.16.20.00.00
-unspsc7#11.16.20.02.00#Knit non cotton vegetable fiber fabrics#11.16.20.00.00
-unspsc7#11.16.20.03.00#Hessian or hemp or jute cloth#11.16.20.00.00
-unspsc7#11.16.21.00.00#Specialty fabrics or cloth#11.16.00.00.00
-unspsc7#11.16.21.01.00#Cheese cloth or fabric#11.16.21.00.00
-unspsc7#11.16.21.02.00#Bismalemide fabric or cloth#11.16.21.00.00
-unspsc7#11.16.21.03.00#Fiberglass fabric or cloth#11.16.21.00.00
-unspsc7#11.16.21.04.00#Graphite fabric or cloth#11.16.21.00.00
-unspsc7#11.16.21.05.00#Glass fabric or cloth#11.16.21.00.00
-unspsc7#11.16.21.07.00#Resin impregnated fabric or cloth#11.16.21.00.00
-unspsc7#11.16.21.08.00#Wire mesh fabric or cloth#11.16.21.00.00
-unspsc7#11.16.21.09.00#Lace#11.16.21.00.00
-unspsc7#11.16.21.10.00#Netting#11.16.21.00.00
-unspsc7#11.16.21.11.00#Mesh#11.16.21.00.00
-unspsc7#11.16.21.12.00#Coated fabrics#11.16.21.00.00
-unspsc7#11.16.21.13.00#Upholstery fabrics#11.16.21.00.00
-unspsc7#11.16.21.14.00#Hook and loop fabrics or tapes#11.16.21.00.00
-unspsc7#11.16.21.15.00#Elastic braid#11.16.21.00.00
-unspsc7#11.16.21.16.00#Burlap cloth#11.16.21.00.00
-unspsc7#11.16.21.17.00#Rubber fabrics#11.16.21.00.00
-unspsc7#11.16.21.18.00#Paper yarn fabric#11.16.21.00.00
-unspsc7#11.16.21.19.00#Tracing cloth#11.16.21.00.00
-unspsc7#11.16.21.20.00#Bolting cloth#11.16.21.00.00
-unspsc7#11.16.21.21.00#Ornamental trimmings#11.16.21.00.00
-unspsc7#11.16.22.00.00#Nonwoven fabrics#11.16.00.00.00
-unspsc7#11.16.22.01.00#Spunbonded nonwovens#11.16.22.00.00
-unspsc7#11.16.22.02.00#Spunlaced nonwovens#11.16.22.00.00
-unspsc7#11.16.23.00.00#Leathers#11.16.00.00.00
-unspsc7#11.16.23.01.00#Chamois leather#11.16.23.00.00
-unspsc7#11.16.23.02.00#Goat leather#11.16.23.00.00
-unspsc7#11.16.23.03.00#Sheep leather#11.16.23.00.00
-unspsc7#11.16.23.04.00#Patent leather#11.16.23.00.00
-unspsc7#11.16.23.05.00#Cow leather#11.16.23.00.00
-unspsc7#11.16.23.06.00#Pig leather#11.16.23.00.00
-unspsc7#11.16.23.07.00#Synthetic or imitation leather#11.16.23.00.00
-unspsc7#11.16.23.08.00#Buffalo leather#11.16.23.00.00
-unspsc7#11.16.23.09.00#Reptile leather#11.16.23.00.00
-unspsc7#12.00.00.00.00#Chemicals including Bio Chemicals and Gas Materials#12.00.00.00.00
-unspsc7#12.10.00.00.00#Organic chemicals#12.00.00.00.00
-unspsc7#12.10.15.00.00#Alcohol#12.10.00.00.00
-unspsc7#12.10.15.01.00#Saturated monohydric alcohol#12.10.15.00.00
-unspsc7#12.10.15.02.00#Isopropyl alcohol#12.10.15.00.00
-unspsc7#12.10.15.03.00#Unsaturated monohydric alcohol#12.10.15.00.00
-unspsc7#12.10.15.04.00#Cyclic alcohol or their halogenated or sulphonated or nitrated derivatives#12.10.15.00.00
-unspsc7#12.10.15.05.00#Phenol alcohol#12.10.15.00.00
-unspsc7#12.10.15.06.00#Halogenated or sulphonated or nitrated or nitrosated derivatives of phenols#12.10.15.00.00
-unspsc7#12.10.15.07.00#Methylated spirit#12.10.15.00.00
-unspsc7#12.10.16.00.00#Ethers and alcohol peroxides and ether peroxides and other organic compounds#12.10.00.00.00
-unspsc7#12.10.16.01.00#Acyclic ethers#12.10.16.00.00
-unspsc7#12.10.16.02.00#Cyclonic or cyclenic or cycloterpenic ethers#12.10.16.00.00
-unspsc7#12.10.16.03.00#Ether or aromatic ether#12.10.16.00.00
-unspsc7#12.10.16.04.00#Ether alcohol#12.10.16.00.00
-unspsc7#12.10.16.05.00#Ether phenols or ether alcohol phenols#12.10.16.00.00
-unspsc7#12.10.16.06.00#Alcohol peroxides#12.10.16.00.00
-unspsc7#12.10.16.07.00#Oxirane or ethylene oxide#12.10.16.00.00
-unspsc7#12.10.16.08.00#Epichlorohydrin or 1 chloro 2 or 3 epoxypropane#12.10.16.00.00
-unspsc7#12.10.16.09.00#Epoxides or epoxyalcohols or epoxyphenols or epoxyethers#12.10.16.00.00
-unspsc7#12.10.16.10.00#Acetals or kemiacetals#12.10.16.00.00
-unspsc7#12.10.16.11.00#Acyclic aldehydes without other oxygen function#12.10.16.00.00
-unspsc7#12.10.16.12.00#Cyclic aldehydes without other oxygen function#12.10.16.00.00
-unspsc7#12.10.16.13.00#Alcohol aldehyde#12.10.16.00.00
-unspsc7#12.10.16.14.00#Paraformaldehyde#12.10.16.00.00
-unspsc7#12.10.16.15.00#Aldehydes#12.10.16.00.00
-unspsc7#12.10.16.16.00#Acyclic ketones without other oxygen function#12.10.16.00.00
-unspsc7#12.10.16.17.00#Cyclonic or cyclenic or cycloterpenic ketones without other oxygen function#12.10.16.00.00
-unspsc7#12.10.16.18.00#Ketones or aromatic without other oxygen function#12.10.16.00.00
-unspsc7#12.10.16.19.00#Ketone alcohol or ketone aldehydes#12.10.16.00.00
-unspsc7#12.10.16.20.00#Ketone phenols or ketones with other oxygen function#12.10.16.00.00
-unspsc7#12.10.16.21.00#Quinones#12.10.16.00.00
-unspsc7#12.10.16.22.00#Rennet tablets#12.10.16.00.00
-unspsc7#12.10.16.23.00#Enzymes#12.10.16.00.00
-unspsc7#12.10.17.00.00#Monocarboxylic fatty acids or industrial acid oils from refining#12.10.00.00.00
-unspsc7#12.10.17.01.00#Oleic acid#12.10.17.00.00
-unspsc7#12.10.17.02.00#Industrial fatty alcohols#12.10.17.00.00
-unspsc7#12.10.17.03.00#Stearic acid#12.10.17.00.00
-unspsc7#12.10.17.04.00#Tall oil fatty acids#12.10.17.00.00
-unspsc7#12.10.17.05.00#Acid oils from refining#12.10.17.00.00
-unspsc7#12.10.18.00.00#Carboxylic acids and their anhydrides and halides and peroxides and peroxyacids#12.10.00.00.00
-unspsc7#12.10.18.01.00#Formic acid or its salts or esters#12.10.18.00.00
-unspsc7#12.10.18.02.00#Acetic acid or its salts or  acetic anhydride#12.10.18.00.00
-unspsc7#12.10.18.03.00#Esters of acetic acid#12.10.18.00.00
-unspsc7#12.10.18.04.00#Mono or di trichloracetic acid or their salts or esters#12.10.18.00.00
-unspsc7#12.10.18.05.00#Propionic acid or its salts or esters#12.10.18.00.00
-unspsc7#12.10.18.06.00#Butyric acids or valeric acids or their salts or esters#12.10.18.00.00
-unspsc7#12.10.18.07.00#Palmitic acids or stearic acids or their salts or esters#12.10.18.00.00
-unspsc7#12.10.18.08.00#Saturated acrylic monocarboxylic acids#12.10.18.00.00
-unspsc7#12.10.18.09.00#Unsaturated acyclic monocarboxylic acids#12.10.18.00.00
-unspsc7#12.10.18.10.00#Cyclonic or cyclenic or cycloterpenic monocarboxylic acids#12.10.18.00.00
-unspsc7#12.10.18.11.00#Aromatic monocarboxylic acids#12.10.18.00.00
-unspsc7#12.10.18.12.00#Acyclic polycarboxylic acids#12.10.18.00.00
-unspsc7#12.10.18.13.00#Cyclonic or cyclenic or cycloterpenic polycarboxylic acids#12.10.18.00.00
-unspsc7#12.10.18.14.00#Aromatic polycarboxylic acids#12.10.18.00.00
-unspsc7#12.10.18.15.00#Lactic acid or its salts or esters#12.10.18.00.00
-unspsc7#12.10.18.16.00#Tartaric acid or its salts or esters#12.10.18.00.00
-unspsc7#12.10.18.17.00#Atric acid or ts salts or esters#12.10.18.00.00
-unspsc7#12.10.18.18.00#Glucaric acid or its salts or esters#12.10.18.00.00
-unspsc7#12.10.18.19.00#Phenylglyocolic acid or mandelic acid or its salts or esters#12.10.18.00.00
-unspsc7#12.10.18.20.00#Carboxylic acids with alcohol function but without other oxygen function#12.10.18.00.00
-unspsc7#12.10.18.21.00#Carboxylic acids with phenol function but without other oxygen function#12.10.18.00.00
-unspsc7#12.10.18.22.00#Carboxylic acids with aldehyde or ketone function#12.10.18.00.00
-unspsc7#12.10.19.00.00#Amine and oxygen function amino compounds and ureines#12.10.00.00.00
-unspsc7#12.10.19.01.00#Glutamic acid or its salts#12.10.19.00.00
-unspsc7#12.10.20.00.00#Organo sulfur compounds and other organo inorganic compounds#12.10.00.00.00
-unspsc7#12.10.20.01.00#Organo sulfur compounds#12.10.20.00.00
-unspsc7#12.10.20.02.00#Other organo inorganic compounds#12.10.20.00.00
-unspsc7#12.10.20.03.00#Compounds containing an unfused furan ring in the structure#12.10.20.00.00
-unspsc7#12.10.20.04.00#Lactines#12.10.20.00.00
-unspsc7#12.10.20.05.00#Compounds containing an unfused imidazole ring in the structure#12.10.20.00.00
-unspsc7#12.10.20.06.00#Compounds containing an unfused pyridine ring in the structure#12.10.20.00.00
-unspsc7#12.10.20.07.00#Compounds containing a quinoline or isoquinoline ring system#12.10.20.00.00
-unspsc7#12.10.20.08.00#Lactams#12.10.20.00.00
-unspsc7#12.10.20.09.00#Heterocyclic compounds with nitrogen hetero atom only#12.10.20.00.00
-unspsc7#12.10.20.10.00#Compounds containing an unfused thiazole ring in the structure#12.10.20.00.00
-unspsc7#12.10.21.00.00#Hydrocarbons and their halogenated and sulphonated and nitrosated derivatives#12.10.00.00.00
-unspsc7#12.10.21.01.00#Saturated acyclic hydrocarbons#12.10.21.00.00
-unspsc7#12.10.21.02.00#Unsaturated acyclic hydrocarbons#12.10.21.00.00
-unspsc7#12.10.21.03.00#Cyclic hydrocarbons#12.10.21.00.00
-unspsc7#12.10.21.04.00#Halogentated derivatives of hydrocarbons#12.10.21.00.00
-unspsc7#12.10.21.05.00#Refrigerants#12.10.21.00.00
-unspsc7#12.10.21.06.00#Sulphonated or nitrated or nitrosated derivatives of hydrocarbons#12.10.21.00.00
-unspsc7#12.10.21.07.00#Paraffin#12.10.21.00.00
-unspsc7#12.10.22.00.00#Phosphoric esters and their salts and esters of other organic acids#12.10.00.00.00
-unspsc7#12.10.22.01.00#Phosphoric esters or their salts#12.10.22.00.00
-unspsc7#12.11.00.00.00#Inorganic chemicals#12.00.00.00.00
-unspsc7#12.11.16.00.00#Chemical elements#12.11.00.00.00
-unspsc7#12.11.16.01.00#Chlorine#12.11.16.00.00
-unspsc7#12.11.16.02.00#Fluorine or bromine#12.11.16.00.00
-unspsc7#12.11.16.03.00#Chlorine liquid gas#12.11.16.00.00
-unspsc7#12.11.16.04.00#Sublimes or precipitated sulphur or colloidal sulphur#12.11.16.00.00
-unspsc7#12.11.16.05.00#Boron or tellurium#12.11.16.00.00
-unspsc7#12.11.16.06.00#Silicon#12.11.16.00.00
-unspsc7#12.11.16.07.00#Alkali metals#12.11.16.00.00
-unspsc7#12.11.16.08.00#Alkaline earth metals#12.11.16.00.00
-unspsc7#12.11.16.09.00#Mercury#12.11.16.00.00
-unspsc7#12.11.16.10.00#Hydrogen chloride or hydrochloric acid#12.11.16.00.00
-unspsc7#12.11.16.11.00#Chlorosulfuric acid#12.11.16.00.00
-unspsc7#12.11.16.12.00#Sulphuric acid#12.11.16.00.00
-unspsc7#12.11.16.13.00#Phosphorus pentaoxide or phosphoric acid or polyphosphoric acids#12.11.16.00.00
-unspsc7#12.11.16.14.00#Oxides of boron or boric acids#12.11.16.00.00
-unspsc7#12.11.16.15.00#Hydrogen fluoride or hydrofluoric acid#12.11.16.00.00
-unspsc7#12.11.16.16.00#Silicon dioxide#12.11.16.00.00
-unspsc7#12.11.16.17.00#Sulphur dioxide#12.11.16.00.00
-unspsc7#12.11.16.18.00#Hydrocyanic acid#12.11.16.00.00
-unspsc7#12.11.16.19.00#Halides or halide oxides of non metals#12.11.16.00.00
-unspsc7#12.11.16.20.00#Sulphides of non metals#12.11.16.00.00
-unspsc7#12.11.16.21.00#Sodium or potassium hydroxide#12.11.16.00.00
-unspsc7#12.11.16.22.00#Hydroxide or peroxide of magnesium or oxides#12.11.16.00.00
-unspsc7#12.11.16.23.00#Aluminum hydroxide#12.11.16.00.00
-unspsc7#12.11.16.24.00#Hydroxide or hydroxylamine or their inorganic salts#12.11.16.00.00
-unspsc7#12.11.17.00.00#Metal oxides and hydroxides and peroxides#12.11.00.00.00
-unspsc7#12.11.17.01.00#Zinc oxide or zinc peroxide#12.11.17.00.00
-unspsc7#12.11.17.02.00#Chromium oxides or hydroxides#12.11.17.00.00
-unspsc7#12.11.17.03.00#Manganese oxides#12.11.17.00.00
-unspsc7#12.11.17.04.00#Iron oxides or hydroxides or earth colours#12.11.17.00.00
-unspsc7#12.11.17.05.00#Cobalt oxides or hydroxides or commercial cobalt oxides#12.11.17.00.00
-unspsc7#12.11.17.06.00#Titanium oxides#12.11.17.00.00
-unspsc7#12.11.17.07.00#Lead oxides or red lead or orange lead#12.11.17.00.00
-unspsc7#12.11.17.08.00#Lithium oxide or hydroxide#12.11.17.00.00
-unspsc7#12.11.17.09.00#Vanadium oxides or hydroxides#12.11.17.00.00
-unspsc7#12.11.17.10.00#Nickel oxides or hydroxides#12.11.17.00.00
-unspsc7#12.11.17.11.00#Copper oxides or hydroxides#12.11.17.00.00
-unspsc7#12.11.17.12.00#Germanium oxides or zirconium dioxide#12.11.17.00.00
-unspsc7#12.11.17.13.00#Molybdenum oxides or hydroxides#12.11.17.00.00
-unspsc7#12.11.17.14.00#Antimony oxides#12.11.17.00.00
-unspsc7#12.11.18.00.00#Salts of oxometallic and peroxometallic acids and other inorganic acids#12.11.00.00.00
-unspsc7#12.11.18.01.00#Aluminates#12.11.18.00.00
-unspsc7#12.11.18.02.00#Zinc or lead chromate#12.11.18.00.00
-unspsc7#12.11.18.03.00#Sodium dichromate#12.11.18.00.00
-unspsc7#12.11.18.04.00#Potassium dichromate#12.11.18.00.00
-unspsc7#12.11.18.05.00#Other chromate or dichromate or peroxochromates#12.11.18.00.00
-unspsc7#12.11.18.06.00#Manganites or manganates or permanganates#12.11.18.00.00
-unspsc7#12.11.18.07.00#Molybdates#12.11.18.00.00
-unspsc7#12.11.18.08.00#Tungstates or wolframates#12.11.18.00.00
-unspsc7#12.11.18.09.00#Silver compounds#12.11.18.00.00
-unspsc7#12.11.18.10.00#Gold compounds#12.11.18.00.00
-unspsc7#12.11.18.11.00#Other compounds or amalgams#12.11.18.00.00
-unspsc7#12.11.18.12.00#Amalgams other than amalgams of precious metals#12.11.18.00.00
-unspsc7#12.11.19.00.00#Salts and peroxysalts of inorganic acids and metal#12.11.00.00.00
-unspsc7#12.11.19.01.00#Fluorides or fluorosilicates or fluoroaluminates#12.11.19.00.00
-unspsc7#12.11.19.02.00#Chlorides#12.11.19.00.00
-unspsc7#12.11.19.03.00#Sodium chloride#12.11.19.00.00
-unspsc7#12.11.19.04.00#Sal ammoniac blocks#12.11.19.00.00
-unspsc7#12.11.19.05.00#Potassium iodinate#12.11.19.00.00
-unspsc7#12.11.19.06.00#Sulphides or polysulfides or dithionites or  sulfoxylates#12.11.19.00.00
-unspsc7#12.11.19.07.00#Sulphites or thiosulfates#12.11.19.00.00
-unspsc7#12.11.19.08.00#Aluminum sulphate#12.11.19.00.00
-unspsc7#12.11.19.09.00#Colloidal precious metals#12.11.19.00.00
-unspsc7#12.11.19.10.00#Ferrous sulphate#12.11.19.00.00
-unspsc7#12.11.19.11.00#Silver nitrate#12.11.19.00.00
-unspsc7#12.11.19.12.00#Sodium dihydrogernorthophosphate#12.11.19.00.00
-unspsc7#12.11.19.13.00#Sodium phosphate dibasic#12.11.19.00.00
-unspsc7#12.11.19.14.00#Sodium bicarbonate#12.11.19.00.00
-unspsc7#12.11.19.15.00#Tri sodium citrate di hydrate#12.11.19.00.00
-unspsc7#12.11.19.16.00#Sodium carbonate#12.11.19.00.00
-unspsc7#12.11.19.17.00#Metallic sodium#12.11.19.00.00
-unspsc7#12.11.19.18.00#Sodium silicate liquids#12.11.19.00.00
-unspsc7#12.11.19.19.00#Sodium silicate binders#12.11.19.00.00
-unspsc7#12.11.20.00.00#Hydrogen peroxide and hydrides and nitrides and asides and silicides and borides#12.11.00.00.00
-unspsc7#12.11.20.01.00#Hydrogen peroxide#12.11.20.00.00
-unspsc7#12.11.20.02.00#Phosphides#12.11.20.00.00
-unspsc7#12.11.20.03.00#Carbides#12.11.20.00.00
-unspsc7#12.11.20.04.00#Calcium carbide#12.11.20.00.00
-unspsc7#12.11.20.05.00#Bromides#12.11.20.00.00
-unspsc7#12.11.21.00.00#Isotopes and their compounds inorganic and organic#12.11.00.00.00
-unspsc7#12.11.21.01.00#Deuterium#12.11.21.00.00
-unspsc7#12.11.21.02.00#Deuterated solvents#12.11.21.00.00
-unspsc7#12.11.21.03.00#Heavy water#12.11.21.00.00
-unspsc7#12.11.21.04.00#Alpha sources#12.11.21.00.00
-unspsc7#12.11.21.05.00#Beta sources#12.11.21.00.00
-unspsc7#12.11.21.06.00#Cobalt sources#12.11.21.00.00
-unspsc7#12.11.21.07.00#Gamma sources#12.11.21.00.00
-unspsc7#12.11.21.08.00#Neutron sources#12.11.21.00.00
-unspsc7#12.11.21.09.00#Radioisotope sources#12.11.21.00.00
-unspsc7#12.11.21.10.00#Calibration sources#12.11.21.00.00
-unspsc7#12.11.21.11.00#In vivo products#12.11.21.00.00
-unspsc7#12.11.21.12.00#Radiochemical isotopes#12.11.21.00.00
-unspsc7#12.11.21.13.00#Radiographic source#12.11.21.00.00
-unspsc7#12.11.21.14.00#Radioimmunoassay isotopes#12.11.21.00.00
-unspsc7#12.11.21.15.00#Tritium targets#12.11.21.00.00
-unspsc7#12.11.21.16.00#Excitation source or annular#12.11.21.00.00
-unspsc7#12.11.21.17.00#Radiopharmaceutical compounds for labelling#12.11.21.00.00
-unspsc7#12.11.21.18.00#Chemicals labelled C14#12.11.21.00.00
-unspsc7#12.11.21.19.00#Fissionable isotopes#12.11.21.00.00
-unspsc7#12.11.21.20.00#In vivo radioactive isotope products#12.11.21.00.00
-unspsc7#12.11.22.00.00#Cyanides#12.11.00.00.00
-unspsc7#12.11.22.01.00#Cyanides or cyanide oxides of sodium#12.11.22.00.00
-unspsc7#12.11.22.02.00#Complex cyanides or thiocyanates#12.11.22.00.00
-unspsc7#12.11.22.03.00#Cyanides or cyanide oxides#12.11.22.00.00
-unspsc7#12.12.00.00.00#Gases#12.00.00.00.00
-unspsc7#12.12.15.00.00#Industrial gases#12.12.00.00.00
-unspsc7#12.12.15.01.00#Nitrous oxide gas#12.12.15.00.00
-unspsc7#12.12.15.02.00#Helium gas#12.12.15.00.00
-unspsc7#12.12.15.04.00#Carbon monoxide#12.12.15.00.00
-unspsc7#12.12.15.05.00#Hydrogen gas#12.12.15.00.00
-unspsc7#12.12.15.06.00#Carbon dioxide#12.12.15.00.00
-unspsc7#12.12.15.07.00#Nitrogen gas#12.12.15.00.00
-unspsc7#12.12.15.08.00#Neon gas#12.12.15.00.00
-unspsc7#12.12.15.10.00#Oxygen#12.12.15.00.00
-unspsc7#12.12.16.00.00#Rare gases#12.12.00.00.00
-unspsc7#12.12.16.01.00#Xenon gas#12.12.16.00.00
-unspsc7#12.12.16.02.00#Radon gas#12.12.16.00.00
-unspsc7#12.12.16.03.00#Krypton gas#12.12.16.00.00
-unspsc7#12.12.16.04.00#Argon gas#12.12.16.00.00
-unspsc7#12.12.16.09.00#Xenon gas#12.12.16.00.00
-unspsc7#12.12.16.10.00#Radon gas#12.12.16.00.00
-unspsc7#12.12.16.11.00#Krypton gas#12.12.16.00.00
-unspsc7#12.12.16.12.00#Argon gas#12.12.16.00.00
-unspsc7#12.13.00.00.00#Explosive materials#12.00.00.00.00
-unspsc7#12.13.15.00.00#Explosives#12.13.00.00.00
-unspsc7#12.13.15.01.00#Dynamite#12.13.15.00.00
-unspsc7#12.13.15.02.00#Explosive cartridges#12.13.15.00.00
-unspsc7#12.13.15.03.00#Propellant explosives#12.13.15.00.00
-unspsc7#12.13.15.04.00#Explosive charges#12.13.15.00.00
-unspsc7#12.13.15.05.00#Plastic explosives#12.13.15.00.00
-unspsc7#12.13.15.06.00#Aluminized explosives#12.13.15.00.00
-unspsc7#12.13.15.07.00#Ammonium nitrate explosives#12.13.15.00.00
-unspsc7#12.13.15.08.00#Nitroglycerin powder explosives#12.13.15.00.00
-unspsc7#12.13.16.00.00#Pyrotechnics#12.13.00.00.00
-unspsc7#12.13.16.01.00#Fireworks#12.13.16.00.00
-unspsc7#12.13.16.02.00#Fog signals#12.13.16.00.00
-unspsc7#12.13.16.03.00#Rain rockets#12.13.16.00.00
-unspsc7#12.13.16.04.00#Flares#12.13.16.00.00
-unspsc7#12.13.16.05.00#Pyrotechnic materials for theater or television#12.13.16.00.00
-unspsc7#12.13.17.00.00#Igniters#12.13.00.00.00
-unspsc7#12.13.17.01.00#Blasting caps#12.13.17.00.00
-unspsc7#12.13.17.02.00#Detonators#12.13.17.00.00
-unspsc7#12.13.17.03.00#Explosives fuses#12.13.17.00.00
-unspsc7#12.13.17.04.00#Explosive initiators#12.13.17.00.00
-unspsc7#12.13.17.05.00#Explosive primers#12.13.17.00.00
-unspsc7#12.13.17.06.00#Matches#12.13.17.00.00
-unspsc7#12.13.17.07.00#Lighters#12.13.17.00.00
-unspsc7#12.13.18.00.00#Propellants#12.13.00.00.00
-unspsc7#12.13.18.01.00#Powder propellants#12.13.18.00.00
-unspsc7#12.13.18.02.00#Solid propellants#12.13.18.00.00
-unspsc7#12.13.18.03.00#Gun propellants#12.13.18.00.00
-unspsc7#12.13.18.04.00#High energy propellants#12.13.18.00.00
-unspsc7#12.13.18.05.00#Gelled propellants#12.13.18.00.00
-unspsc7#12.13.18.06.00#Hybrid propellants#12.13.18.00.00
-unspsc7#12.14.00.00.00#Elements and gases#12.00.00.00.00
-unspsc7#12.14.15.00.00#Earth metals#12.14.00.00.00
-unspsc7#12.14.15.01.00#Beryllium (Be)#12.14.15.00.00
-unspsc7#12.14.15.02.00#Magnesium (Mg)#12.14.15.00.00
-unspsc7#12.14.15.03.00#Calcium (Ca)#12.14.15.00.00
-unspsc7#12.14.15.04.00#Strontium (Sr)#12.14.15.00.00
-unspsc7#12.14.15.05.00#Barium (Ba)#12.14.15.00.00
-unspsc7#12.14.15.06.00#Radium (Ra)#12.14.15.00.00
-unspsc7#12.14.16.00.00#Rare earth metals#12.14.00.00.00
-unspsc7#12.14.16.01.00#Cerium (Ce)#12.14.16.00.00
-unspsc7#12.14.16.02.00#Dysprosium (Dy)#12.14.16.00.00
-unspsc7#12.14.16.03.00#Erbium (Er)#12.14.16.00.00
-unspsc7#12.14.16.04.00#Europium (Eu)#12.14.16.00.00
-unspsc7#12.14.16.05.00#Gadolinium (Gd)#12.14.16.00.00
-unspsc7#12.14.16.06.00#Holmium (Ho)#12.14.16.00.00
-unspsc7#12.14.16.07.00#Lanthanum (La)#12.14.16.00.00
-unspsc7#12.14.16.08.00#Lutetium (Lu)#12.14.16.00.00
-unspsc7#12.14.16.09.00#Neodymium (Nd)#12.14.16.00.00
-unspsc7#12.14.16.10.00#Praseodymium (Pr)#12.14.16.00.00
-unspsc7#12.14.16.11.00#Promethium (Pr)#12.14.16.00.00
-unspsc7#12.14.16.12.00#Samarium (Sm)#12.14.16.00.00
-unspsc7#12.14.16.13.00#Scandium (Sc)#12.14.16.00.00
-unspsc7#12.14.16.14.00#Terbium (Tb)#12.14.16.00.00
-unspsc7#12.14.16.15.00#Thulium (Tm)#12.14.16.00.00
-unspsc7#12.14.16.16.00#Ytterbium (Yb)#12.14.16.00.00
-unspsc7#12.14.16.17.00#Yttrium (Y)#12.14.16.00.00
-unspsc7#12.14.17.00.00#Transition metals#12.14.00.00.00
-unspsc7#12.14.17.01.00#Actinium (Ac)#12.14.17.00.00
-unspsc7#12.14.17.02.00#Aluminum (Al)#12.14.17.00.00
-unspsc7#12.14.17.03.00#Americium (Am)#12.14.17.00.00
-unspsc7#12.14.17.04.00#Antimony (Sb)#12.14.17.00.00
-unspsc7#12.14.17.05.00#Berkelium (Bk)#12.14.17.00.00
-unspsc7#12.14.17.06.00#Bismuth (Bi)#12.14.17.00.00
-unspsc7#12.14.17.07.00#Cadmium (Ca)#12.14.17.00.00
-unspsc7#12.14.17.08.00#Californium (Cf)#12.14.17.00.00
-unspsc7#12.14.17.09.00#Chromium (Cr)#12.14.17.00.00
-unspsc7#12.14.17.10.00#Cobalt (Co)#12.14.17.00.00
-unspsc7#12.14.17.11.00#Copper (Cu)#12.14.17.00.00
-unspsc7#12.14.17.12.00#Curium (Cm)#12.14.17.00.00
-unspsc7#12.14.17.13.00#Einsteinium (Es)#12.14.17.00.00
-unspsc7#12.14.17.14.00#Fermium (Fm)#12.14.17.00.00
-unspsc7#12.14.17.15.00#Gallium (Ga)#12.14.17.00.00
-unspsc7#12.14.17.16.00#Germanium (Ge)#12.14.17.00.00
-unspsc7#12.14.17.17.00#Gold (Au)#12.14.17.00.00
-unspsc7#12.14.17.18.00#Hafnium (Hf)#12.14.17.00.00
-unspsc7#12.14.17.19.00#Indium (In)#12.14.17.00.00
-unspsc7#12.14.17.20.00#Iridium (Ir)#12.14.17.00.00
-unspsc7#12.14.17.21.00#Iron (Fe)#12.14.17.00.00
-unspsc7#12.14.17.22.00#Lawrencium (Lr)#12.14.17.00.00
-unspsc7#12.14.17.23.00#Lead (Pb)#12.14.17.00.00
-unspsc7#12.14.17.24.00#Manganese (Mn)#12.14.17.00.00
-unspsc7#12.14.17.25.00#Mendelevium (Md)#12.14.17.00.00
-unspsc7#12.14.17.26.00#Mercury (Hg)#12.14.17.00.00
-unspsc7#12.14.17.27.00#Molybdenum (Mo)#12.14.17.00.00
-unspsc7#12.14.17.28.00#Neptunium (Np)#12.14.17.00.00
-unspsc7#12.14.17.29.00#Nickel (Ni)#12.14.17.00.00
-unspsc7#12.14.17.30.00#Niobium (Nb)#12.14.17.00.00
-unspsc7#12.14.17.31.00#Nobelium (No)#12.14.17.00.00
-unspsc7#12.14.17.32.00#Osmium (Os)#12.14.17.00.00
-unspsc7#12.14.17.33.00#Palladium (Pd)#12.14.17.00.00
-unspsc7#12.14.17.34.00#Platinum (Pt)#12.14.17.00.00
-unspsc7#12.14.17.35.00#Plutonium (Pu)#12.14.17.00.00
-unspsc7#12.14.17.36.00#Protactinium (Pa)#12.14.17.00.00
-unspsc7#12.14.17.37.00#Rhenium (Re)#12.14.17.00.00
-unspsc7#12.14.17.38.00#Rhodium (Rh)#12.14.17.00.00
-unspsc7#12.14.17.39.00#Ruthenium (Ru)#12.14.17.00.00
-unspsc7#12.14.17.40.00#Silver (Ag)#12.14.17.00.00
-unspsc7#12.14.17.41.00#Tantalum (Ta)#12.14.17.00.00
-unspsc7#12.14.17.42.00#Technetium (Te)#12.14.17.00.00
-unspsc7#12.14.17.43.00#Thallium (Tl)#12.14.17.00.00
-unspsc7#12.14.17.44.00#Thorium (Th)#12.14.17.00.00
-unspsc7#12.14.17.45.00#Tin (Sn)#12.14.17.00.00
-unspsc7#12.14.17.46.00#Titanium (Ti)#12.14.17.00.00
-unspsc7#12.14.17.47.00#Tungsten (W)#12.14.17.00.00
-unspsc7#12.14.17.48.00#Uranium (U)#12.14.17.00.00
-unspsc7#12.14.17.49.00#Vanadium (V)#12.14.17.00.00
-unspsc7#12.14.17.50.00#Zinc (Zn)#12.14.17.00.00
-unspsc7#12.14.17.51.00#Zirconium (Zr)#12.14.17.00.00
-unspsc7#12.14.17.52.00#Bohrium (Bh)#12.14.17.00.00
-unspsc7#12.14.17.53.00#Dubnium (Db)#12.14.17.00.00
-unspsc7#12.14.17.54.00#Hassium (Hs)#12.14.17.00.00
-unspsc7#12.14.17.55.00#Rutherfordium (Rf)#12.14.17.00.00
-unspsc7#12.14.17.56.00#Seaborgium (Sg)#12.14.17.00.00
-unspsc7#12.14.17.57.00#Ununnilium (Uum)#12.14.17.00.00
-unspsc7#12.14.17.58.00#Unununium (Uuu)#12.14.17.00.00
-unspsc7#12.14.17.59.00#Ununbium (Uub)#12.14.17.00.00
-unspsc7#12.14.17.60.00#Polonium ((Po)#12.14.17.00.00
-unspsc7#12.14.18.00.00#Alkali metals#12.14.00.00.00
-unspsc7#12.14.18.01.00#Cesium (Cs)#12.14.18.00.00
-unspsc7#12.14.18.02.00#Francium (Fm)#12.14.18.00.00
-unspsc7#12.14.18.03.00#Lithium (Li)#12.14.18.00.00
-unspsc7#12.14.18.04.00#Potassium (K)#12.14.18.00.00
-unspsc7#12.14.18.05.00#Rubidium (Rb)#12.14.18.00.00
-unspsc7#12.14.18.06.00#Sodium (Na)#12.14.18.00.00
-unspsc7#12.14.19.00.00#Non metals and pure and elemental gases#12.14.00.00.00
-unspsc7#12.14.19.01.00#Chlorine  (Cl)#12.14.19.00.00
-unspsc7#12.14.19.02.00#Hydrogen (H)#12.14.19.00.00
-unspsc7#12.14.19.03.00#Nitrogen  (N)#12.14.19.00.00
-unspsc7#12.14.19.04.00#Oxygen (O)#12.14.19.00.00
-unspsc7#12.14.19.05.00#Fluorine  (F)#12.14.19.00.00
-unspsc7#12.14.19.06.00#Arsenic (As)#12.14.19.00.00
-unspsc7#12.14.19.07.00#Boron (Bh)#12.14.19.00.00
-unspsc7#12.14.19.08.00#Carbon (C)#12.14.19.00.00
-unspsc7#12.14.19.09.00#Phosphorus (P)#12.14.19.00.00
-unspsc7#12.14.19.10.00#Selenium (Se)#12.14.19.00.00
-unspsc7#12.14.19.11.00#Silicon (Si)#12.14.19.00.00
-unspsc7#12.14.19.12.00#Sulfur (S)#12.14.19.00.00
-unspsc7#12.14.19.13.00#Tellurium (Te)#12.14.19.00.00
-unspsc7#12.14.19.14.00#Astatine (At)#12.14.19.00.00
-unspsc7#12.14.19.15.00#Bromine Br#12.14.19.00.00
-unspsc7#12.14.19.16.00#Iodine (I)#12.14.19.00.00
-unspsc7#12.14.20.00.00#Noble gases#12.14.00.00.00
-unspsc7#12.14.20.01.00#Xenon gas  (Xe)#12.14.20.00.00
-unspsc7#12.14.20.02.00#Radon gas (Rn)#12.14.20.00.00
-unspsc7#12.14.20.03.00#Krypton gas (Kr)#12.14.20.00.00
-unspsc7#12.14.20.04.00#Argon gas (Ar)#12.14.20.00.00
-unspsc7#12.14.20.05.00#Helium gas (He)#12.14.20.00.00
-unspsc7#12.14.20.06.00#Neon gas (Ne)#12.14.20.00.00
-unspsc7#12.14.21.00.00#Industrial use gases#12.14.00.00.00
-unspsc7#12.14.21.01.00#Hydrogen compound gases#12.14.21.00.00
-unspsc7#12.14.21.02.00#Chlorinated mixed gases#12.14.21.00.00
-unspsc7#12.14.21.03.00#Ammonia#12.14.21.00.00
-unspsc7#12.14.21.04.00#Carbon dioxide gas (CO2)#12.14.21.00.00
-unspsc7#12.14.21.05.00#Industrial air#12.14.21.00.00
-unspsc7#12.14.21.06.00#Inert gas mixtures#12.14.21.00.00
-unspsc7#12.15.00.00.00#Acids and their salts and esters#12.00.00.00.00
-unspsc7#12.15.15.00.00#Carboxylic acids and their salts and esters#12.15.00.00.00
-unspsc7#12.15.15.01.00#Acetic acid or its salts#12.15.15.00.00
-unspsc7#12.15.15.02.00#Acyclic acids#12.15.15.00.00
-unspsc7#12.15.15.03.00#Aldehydic acids#12.15.15.00.00
-unspsc7#12.15.15.04.00#Butyric acids#12.15.15.00.00
-unspsc7#12.15.15.05.00#Carbocylic acids#12.15.15.00.00
-unspsc7#12.15.15.06.00#Hydroxy acids#12.15.15.00.00
-unspsc7#12.15.15.07.00#Keto acids#12.15.15.00.00
-unspsc7#12.15.15.08.00#Propionic acids#12.15.15.00.00
-unspsc7#12.15.15.09.00#Acrylic acid esters#12.15.15.00.00
-unspsc7#12.15.15.10.00#Esters of methacrylic acid#12.15.15.00.00
-unspsc7#12.15.16.00.00#Heterocyclic acids and their salts and esters#12.15.00.00.00
-unspsc7#12.15.16.01.00#Indoleacetic acids#12.15.16.00.00
-unspsc7#12.15.16.02.00#Isonicotinic acids#12.15.16.00.00
-unspsc7#12.15.16.03.00#Isonipecotic acids#12.15.16.00.00
-unspsc7#12.15.16.04.00#Nicotinic acids#12.15.16.00.00
-unspsc7#12.15.16.05.00#Nipecotic acids#12.15.16.00.00
-unspsc7#12.15.16.06.00#Orotic acids#12.15.16.00.00
-unspsc7#12.15.16.07.00#Picolinic acids#12.15.16.00.00
-unspsc7#12.15.16.08.00#Pipecolic acids#12.15.16.00.00
-unspsc7#12.15.17.00.00#Fatty acids and their salts and esters#12.15.00.00.00
-unspsc7#12.15.17.01.00#Decanoic acids#12.15.17.00.00
-unspsc7#12.15.17.02.00#Unsaturated fatty acids#12.15.17.00.00
-unspsc7#12.15.17.03.00#Volatile fatty acids#12.15.17.00.00
-unspsc7#12.15.17.04.00#Heptanoic acids#12.15.17.00.00
-unspsc7#12.15.17.05.00#Lauric acids#12.15.17.00.00
-unspsc7#12.15.17.06.00#Mycolic acids#12.15.17.00.00
-unspsc7#12.15.17.07.00#Myristic acids#12.15.17.00.00
-unspsc7#12.15.17.08.00#Palmitic acids#12.15.17.00.00
-unspsc7#12.15.17.09.00#Stearic acids#12.15.17.00.00
-unspsc7#12.15.18.00.00#Non carboxylic acids and their salts#12.15.00.00.00
-unspsc7#12.15.18.01.00#Carbonic acids#12.15.18.00.00
-unspsc7#12.15.18.02.00#Nitric acids#12.15.18.00.00
-unspsc7#12.15.18.03.00#Phosphorous acids#12.15.18.00.00
-unspsc7#12.15.18.04.00#Sulfur acids#12.15.18.00.00
-unspsc7#12.15.18.05.00#Chlorides#12.15.18.00.00
-unspsc7#12.15.18.06.00#Hydrochlorides#12.15.18.00.00
-unspsc7#12.15.18.07.00#Nitrates or nitrites#12.15.18.00.00
-unspsc7#12.15.18.08.00#Silicates#12.15.18.00.00
-unspsc7#12.15.18.09.00#Phosphates or phosphides#12.15.18.00.00
-unspsc7#12.15.18.10.00#Bicarbonates or carbides or carbonates#12.15.18.00.00
-unspsc7#12.15.18.11.00#Fluorides#12.15.18.00.00
-unspsc7#12.15.18.12.00#Bromides or bromates#12.15.18.00.00
-unspsc7#12.15.18.13.00#Iodides or iodates#12.15.18.00.00
-unspsc7#12.15.19.00.00#Inorganic sulfur compounds#12.15.00.00.00
-unspsc7#12.15.19.01.00#Hydrogen sulfide#12.15.19.00.00
-unspsc7#12.15.19.02.00#Sulfuric Acid#12.15.19.00.00
-unspsc7#12.15.19.03.00#Sodium sulfate#12.15.19.00.00
-unspsc7#12.16.00.00.00#Additives#12.00.00.00.00
-unspsc7#12.16.15.00.00#Indicators and Reagents#12.16.00.00.00
-unspsc7#12.16.15.01.00#Affinity labels#12.16.15.00.00
-unspsc7#12.16.15.02.00#Cross linking agents#12.16.15.00.00
-unspsc7#12.16.15.03.00#Reagent kits#12.16.15.00.00
-unspsc7#12.16.15.04.00#Sulfhydryl reagents#12.16.15.00.00
-unspsc7#12.16.15.05.00#Intercalating agents#12.16.15.00.00
-unspsc7#12.16.15.06.00#Diverting agents#12.16.15.00.00
-unspsc7#12.16.16.00.00#Catalysts#12.16.00.00.00
-unspsc7#12.16.16.01.00#Acid catalysts#12.16.16.00.00
-unspsc7#12.16.16.02.00#Combustion catalysts#12.16.16.00.00
-unspsc7#12.16.16.03.00#Custom catalysts#12.16.16.00.00
-unspsc7#12.16.16.04.00#Cracking catalysts#12.16.16.00.00
-unspsc7#12.16.17.00.00#Buffers#12.16.00.00.00
-unspsc7#12.16.17.01.00#Ampholyte mixtures#12.16.17.00.00
-unspsc7#12.16.17.02.00#Bicarbonate buffers#12.16.17.00.00
-unspsc7#12.16.17.03.00#Other buffers#12.16.17.00.00
-unspsc7#12.16.17.04.00#Acid buffers#12.16.17.00.00
-unspsc7#12.16.17.05.00#Basic buffers#12.16.17.00.00
-unspsc7#12.16.17.06.00#Neutral buffers#12.16.17.00.00
-unspsc7#12.16.18.00.00#Colloids#12.16.00.00.00
-unspsc7#12.16.18.01.00#Gels#12.16.18.00.00
-unspsc7#12.16.18.02.00#Suspensions#12.16.18.00.00
-unspsc7#12.16.18.03.00#Aerosols#12.16.18.00.00
-unspsc7#12.16.18.04.00#Emulsions#12.16.18.00.00
-unspsc7#12.16.18.05.00#Natural gelling agents#12.16.18.00.00
-unspsc7#12.16.18.06.00#Synthetic gelling agents#12.16.18.00.00
-unspsc7#12.16.18.07.00#Gel stabilizers#12.16.18.00.00
-unspsc7#12.16.18.08.00#Suspending agents#12.16.18.00.00
-unspsc7#12.16.19.00.00#Surfactants#12.16.00.00.00
-unspsc7#12.16.19.01.00#Anti foaming agents#12.16.19.00.00
-unspsc7#12.16.19.02.00#Detergent surfactants#12.16.19.00.00
-unspsc7#12.16.19.03.00#Foaming agents#12.16.19.00.00
-unspsc7#12.16.19.04.00#Dispersing agents#12.16.19.00.00
-unspsc7#12.16.19.05.00#Flushes#12.16.19.00.00
-unspsc7#12.16.19.06.00#Wetting agents#12.16.19.00.00
-unspsc7#12.16.19.07.00#Water flood additives#12.16.19.00.00
-unspsc7#12.16.20.00.00#Plasticizers#12.16.00.00.00
-unspsc7#12.16.20.01.00#Phthalates#12.16.20.00.00
-unspsc7#12.16.20.02.00#Polymerics#12.16.20.00.00
-unspsc7#12.16.20.03.00#Agricultural oils#12.16.20.00.00
-unspsc7#12.16.20.04.00#Sulfonamides#12.16.20.00.00
-unspsc7#12.16.20.05.00#Glutarates#12.16.20.00.00
-unspsc7#12.16.21.00.00#Flame retardants#12.16.00.00.00
-unspsc7#12.16.21.01.00#Brominated#12.16.21.00.00
-unspsc7#12.16.22.00.00#Anti oxidants#12.16.00.00.00
-unspsc7#12.16.22.01.00#Ascorbic acid#12.16.22.00.00
-unspsc7#12.16.22.02.00#Beta carotene#12.16.22.00.00
-unspsc7#12.16.22.03.00#Butylated hydroxyanisole#12.16.22.00.00
-unspsc7#12.16.22.04.00#Butylated hydroxytoluene#12.16.22.00.00
-unspsc7#12.16.22.05.00#Calcium citrate#12.16.22.00.00
-unspsc7#12.16.22.06.00#Canthaxanthin#12.16.22.00.00
-unspsc7#12.16.22.07.00#Melatonin#12.16.22.00.00
-unspsc7#12.16.22.08.00#Nordihydroguaiaretic acid#12.16.22.00.00
-unspsc7#12.16.22.09.00#Propyl gallate#12.16.22.00.00
-unspsc7#12.16.22.10.00#Silymarin#12.16.22.00.00
-unspsc7#12.16.22.11.00#Sulfur dioxide#12.16.22.00.00
-unspsc7#12.16.23.00.00#Curing agents#12.16.00.00.00
-unspsc7#12.16.23.01.00#Waterborne curing agents#12.16.23.00.00
-unspsc7#12.16.23.02.00#Cement accelerators#12.16.23.00.00
-unspsc7#12.16.23.03.00#Cement retarders#12.16.23.00.00
-unspsc7#12.16.24.00.00#Polymer breakers#12.16.00.00.00
-unspsc7#12.16.24.01.00#Acidic polymer breakers#12.16.24.00.00
-unspsc7#12.16.24.02.00#Organic polymer breakers#12.16.24.00.00
-unspsc7#12.16.25.00.00#Emulsion breakers#12.16.00.00.00
-unspsc7#12.16.25.01.00#Water in oil emulsion breakers#12.16.25.00.00
-unspsc7#12.16.25.02.00#Oil in water emulsion breakers#12.16.25.00.00
-unspsc7#12.16.25.03.00#Flotation aids#12.16.25.00.00
-unspsc7#12.16.26.00.00#Clay stabilizers#12.16.00.00.00
-unspsc7#12.16.26.01.00#Inorganic clay stabilizers#12.16.26.00.00
-unspsc7#12.16.26.02.00#Organic clay stabilizers#12.16.26.00.00
-unspsc7#12.16.27.00.00#Fluid loss additives#12.16.00.00.00
-unspsc7#12.16.27.01.00#Natural polymer fluid loss additives#12.16.27.00.00
-unspsc7#12.16.27.02.00#Modified polymer fluid loss additives#12.16.27.00.00
-unspsc7#12.16.28.00.00#Friction reducers#12.16.00.00.00
-unspsc7#12.16.28.01.00#Anionic friction reducers#12.16.28.00.00
-unspsc7#12.16.28.02.00#Cationic friction reducers#12.16.28.00.00
-unspsc7#12.16.29.00.00#Paraffin asphaltene control agents#12.16.00.00.00
-unspsc7#12.16.29.01.00#Solvent type paraffin asphaltene control agents#12.16.29.00.00
-unspsc7#12.16.29.02.00#Crystal modified paraffin asphaltene control agents#12.16.29.00.00
-unspsc7#12.16.29.03.00#Dispersant type paraffin asphaltene control agents#12.16.29.00.00
-unspsc7#12.16.30.00.00#Mud removal mixtures#12.16.00.00.00
-unspsc7#12.16.30.01.00#Mud cleanout agents#12.16.30.00.00
-unspsc7#12.16.31.00.00#Anti sludgers#12.16.00.00.00
-unspsc7#12.16.31.01.00#Anti sludge additives#12.16.31.00.00
-unspsc7#12.16.32.00.00#Anti gas migration agents#12.16.00.00.00
-unspsc7#12.16.32.01.00#Anti gas migration additives#12.16.32.00.00
-unspsc7#12.16.33.00.00#Expanding agents#12.16.00.00.00
-unspsc7#12.16.33.01.00#Cement expanding agents#12.16.33.00.00
-unspsc7#12.16.34.00.00#Extenders#12.16.00.00.00
-unspsc7#12.16.34.01.00#Cement extenders#12.16.34.00.00
-unspsc7#12.16.35.00.00#Oil well sealants#12.16.00.00.00
-unspsc7#12.16.35.01.00#Cementing sealants#12.16.35.00.00
-unspsc7#12.16.36.00.00#Corrosion inhibitors#12.16.00.00.00
-unspsc7#12.16.36.01.00#Oil production corrosion inhibitors#12.16.36.00.00
-unspsc7#12.16.36.02.00#Gas production corrosion inhibitors#12.16.36.00.00
-unspsc7#12.16.37.00.00#Gas hydrate controllers#12.16.00.00.00
-unspsc7#12.16.37.01.00#Kinetic hydrate controllers#12.16.37.00.00
-unspsc7#12.16.38.00.00#Scavengers#12.16.00.00.00
-unspsc7#12.16.38.01.00#Hydrogen sulfide scavengers#12.16.38.00.00
-unspsc7#12.16.38.02.00#Oxygen scavengers#12.16.38.00.00
-unspsc7#12.16.39.00.00#Scale controllers#12.16.00.00.00
-unspsc7#12.16.39.01.00#Scale inhibitor#12.16.39.00.00
-unspsc7#12.16.39.02.00#Scale removers and converters#12.16.39.00.00
-unspsc7#12.16.40.00.00#Bactericides#12.16.00.00.00
-unspsc7#12.16.40.01.00#Registered microbiocides#12.16.40.00.00
-unspsc7#12.16.41.00.00#In situ#12.16.00.00.00
-unspsc7#12.16.41.01.00#In situ additives#12.16.41.00.00
-unspsc7#12.16.41.02.00#Acid additives#12.16.41.00.00
-unspsc7#12.16.42.00.00#Retarders#12.16.00.00.00
-unspsc7#12.16.42.01.00#Acid corrosion inhibitors#12.16.42.00.00
-unspsc7#12.16.43.00.00#Iron controllers#12.16.00.00.00
-unspsc7#12.16.43.01.00#Iron control additives#12.16.43.00.00
-unspsc7#12.16.44.00.00#Non emulsifiers#12.16.00.00.00
-unspsc7#12.16.44.01.00#Non emulsifying additives#12.16.44.00.00
-unspsc7#12.17.00.00.00#Colorants#12.00.00.00.00
-unspsc7#12.17.15.00.00#Dyes#12.17.00.00.00
-unspsc7#12.17.15.01.00#Fluorescent dyes#12.17.15.00.00
-unspsc7#12.17.15.02.00#Phthalein dyes#12.17.15.00.00
-unspsc7#12.17.15.03.00#Rosaniline dyes#12.17.15.00.00
-unspsc7#12.17.15.04.00#Food or drug or cosmetic safe (FDC) dyes#12.17.15.00.00
-unspsc7#12.17.15.05.00#Laked#12.17.15.00.00
-unspsc7#12.17.15.06.00#Natural dyes#12.17.15.00.00
-unspsc7#12.17.16.00.00#Pigments#12.17.00.00.00
-unspsc7#12.17.16.01.00#Natural pigments#12.17.16.00.00
-unspsc7#12.17.16.02.00#Inorganic metal oxides#12.17.16.00.00
-unspsc7#12.17.16.03.00#Carbon black#12.17.16.00.00
-unspsc7#12.17.16.04.00#Titanium dioxide#12.17.16.00.00
-unspsc7#12.17.16.05.00#Organic pigments#12.17.16.00.00
-unspsc7#12.17.17.00.00#Color compounds and dispersions#12.17.00.00.00
-unspsc7#12.17.17.01.00#Polymer masterbatches#12.17.17.00.00
-unspsc7#12.17.17.02.00#Pigment dispersions#12.17.17.00.00
-unspsc7#12.17.17.03.00#Inks#12.17.17.00.00
-unspsc7#12.18.00.00.00#Waxes and oils#12.00.00.00.00
-unspsc7#12.18.15.00.00#Waxes#12.18.00.00.00
-unspsc7#12.18.15.01.00#Synthetic waxes#12.18.15.00.00
-unspsc7#12.18.15.02.00#Natural waxes#12.18.15.00.00
-unspsc7#12.18.15.03.00#Paraffins#12.18.15.00.00
-unspsc7#12.18.15.04.00#Petrolatums#12.18.15.00.00
-unspsc7#12.18.16.00.00#Oils#12.18.00.00.00
-unspsc7#12.18.16.01.00#Synthetic oils#12.18.16.00.00
-unspsc7#12.18.16.02.00#Natural oils#12.18.16.00.00
-unspsc7#12.19.00.00.00#Solvents#12.00.00.00.00
-unspsc7#12.19.15.00.00#Hydrocarbonated solvents#12.19.00.00.00
-unspsc7#12.19.15.01.00#Aromatic solvents#12.19.15.00.00
-unspsc7#12.19.15.02.00#Aliphatic solvents#12.19.15.00.00
-unspsc7#12.19.16.00.00#Oxygenated solvents#12.19.00.00.00
-unspsc7#12.19.16.01.00#Alcohol solvents#12.19.16.00.00
-unspsc7#12.19.16.02.00#Active solvents#12.19.16.00.00
-unspsc7#12.20.00.00.00#Chemical intermediates and fixatives#12.00.00.00.00
-unspsc7#12.20.15.00.00#Intermediates#12.20.00.00.00
-unspsc7#12.20.15.01.00#Ether intermediates#12.20.15.00.00
-unspsc7#12.20.15.02.00#Ketone intermediates#12.20.15.00.00
-unspsc7#12.20.15.03.00#Aldehyde intermediates#12.20.15.00.00
-unspsc7#12.20.15.04.00#Peroxide intermediates#12.20.15.00.00
-unspsc7#12.20.15.05.00#Acrylate or methacrylate intermediates#12.20.15.00.00
-unspsc7#12.20.16.00.00#Fixatives#12.20.00.00.00
-unspsc7#12.20.16.01.00#Formaldehydes#12.20.16.00.00
-unspsc7#12.20.16.02.00#Glutrals#12.20.16.00.00
-unspsc7#12.20.16.03.00#Tannins#12.20.16.00.00
-unspsc7#12.20.17.00.00#Amines and amides and imines and imides#12.20.00.00.00
-unspsc7#12.20.17.01.00#Primary#12.20.17.00.00
-unspsc7#12.20.17.02.00#Secondary#12.20.17.00.00
-unspsc7#12.20.17.03.00#Tertiary#12.20.17.00.00
-unspsc7#12.20.17.04.00#Specialty#12.20.17.00.00
-unspsc7#12.20.17.05.00#Sulphonated#12.20.17.00.00
-unspsc7#12.21.00.00.00#Carbon based chemicals and compounded chemicals#12.00.00.00.00
-unspsc7#12.21.15.00.00#Alcohols#12.21.00.00.00
-unspsc7#12.21.15.01.00#Amino alcohols#12.21.15.00.00
-unspsc7#12.21.15.02.00#Benzyl alcohols#12.21.15.00.00
-unspsc7#12.21.15.03.00#Chlorohydrins#12.21.15.00.00
-unspsc7#12.21.15.04.00#Ethanol#12.21.15.00.00
-unspsc7#12.21.15.05.00#Fatty alcohols#12.21.15.00.00
-unspsc7#12.21.15.06.00#Glycols#12.21.15.00.00
-unspsc7#12.21.15.07.00#Hexanols#12.21.15.00.00
-unspsc7#12.21.15.08.00#Methanol#12.21.15.00.00
-unspsc7#12.21.15.09.00#Poly vinyl or PV  alcohol#12.21.15.00.00
-unspsc7#12.21.15.10.00#Propanols#12.21.15.00.00
-unspsc7#12.21.15.11.00#Sugar alcohols#12.21.15.00.00
-unspsc7#12.21.15.12.00#Butyl alcohols#12.21.15.00.00
-unspsc7#12.21.15.13.00#Isopropyl alcohol#12.21.15.00.00
-unspsc7#12.21.16.00.00#Hydrocarbons#12.21.00.00.00
-unspsc7#12.21.16.01.00#Acyclic or cyclic or polycyclic hydrocarbons#12.21.16.00.00
-unspsc7#12.21.16.02.00#Halogenated hydrocarbons#12.21.16.00.00
-unspsc7#12.21.16.03.00#Sulphonated hydrocarbons#12.21.16.00.00
-unspsc7#12.21.16.04.00#Nitrosated hydrocarbons#12.21.16.00.00
-unspsc7#12.21.17.00.00#Aldehydes#12.21.00.00.00
-unspsc7#12.21.17.01.00#Acetalaldehyes#12.21.17.00.00
-unspsc7#12.21.17.02.00#Glyoxals#12.21.17.00.00
-unspsc7#12.21.18.00.00#Ethers#12.21.00.00.00
-unspsc7#12.21.18.01.00#Acetal ethers#12.21.18.00.00
-unspsc7#12.21.18.02.00#Ethyl ethers#12.21.18.00.00
-unspsc7#12.21.18.03.00#Methyl ethers#12.21.18.00.00
-unspsc7#12.21.18.04.00#Phenyl ethers#12.21.18.00.00
-unspsc7#12.21.18.05.00#Methyl tetra butyl ether#12.21.18.00.00
-unspsc7#12.21.19.00.00#Ketones#12.21.00.00.00
-unspsc7#12.21.19.01.00#Acetones#12.21.19.00.00
-unspsc7#12.21.19.02.00#Camphors#12.21.19.00.00
-unspsc7#12.21.19.03.00#Ketone bodies#12.21.19.00.00
-unspsc7#12.21.19.04.00#Mannich bases#12.21.19.00.00
-unspsc7#12.21.20.00.00#Phenols#12.21.00.00.00
-unspsc7#12.21.20.01.00#Bromphenol blue#12.21.20.00.00
-unspsc7#12.21.20.02.00#Cresols#12.21.20.00.00
-unspsc7#12.21.21.00.00#Carbohydrates#12.21.00.00.00
-unspsc7#12.21.21.01.00#Simple sugars or its derivatives#12.21.21.00.00
-unspsc7#12.21.21.02.00#Gum resins#12.21.21.00.00
-unspsc7#12.21.21.03.00#Starches#12.21.21.00.00
-unspsc7#12.21.22.00.00#Compounds#12.21.00.00.00
-unspsc7#12.21.22.01.00#Chemical alloys#12.21.22.00.00
-unspsc7#12.21.22.02.00#Cyanides or cyanates#12.21.22.00.00
-unspsc7#12.21.22.03.00#Aluminum compounds#12.21.22.00.00
-unspsc7#12.21.22.04.00#Barium compounds#12.21.22.00.00
-unspsc7#12.21.22.05.00#Boron compounds#12.21.22.00.00
-unspsc7#12.21.22.06.00#Bromine compounds#12.21.22.00.00
-unspsc7#12.21.22.07.00#Calcium compounds#12.21.22.00.00
-unspsc7#12.21.22.08.00#Carbon compounds#12.21.22.00.00
-unspsc7#12.21.22.09.00#Chlorine compounds#12.21.22.00.00
-unspsc7#12.21.22.10.00#Fluorine compounds#12.21.22.00.00
-unspsc7#12.21.22.11.00#Gold compounds#12.21.22.00.00
-unspsc7#12.21.22.12.00#Iodine compounds#12.21.22.00.00
-unspsc7#12.21.22.13.00#Iron compounds#12.21.22.00.00
-unspsc7#12.21.22.14.00#Magnesium compounds#12.21.22.00.00
-unspsc7#12.21.22.15.00#Nitrogen compounds#12.21.22.00.00
-unspsc7#12.21.22.16.00#Nitrile compounds#12.21.22.00.00
-unspsc7#12.21.22.17.00#Oxygen compounds#12.21.22.00.00
-unspsc7#12.21.22.18.00#Phosphorous compounds#12.21.22.00.00
-unspsc7#12.21.22.19.00#Potassium compounds#12.21.22.00.00
-unspsc7#12.21.22.20.00#Selenium compounds#12.21.22.00.00
-unspsc7#12.21.22.21.00#Silicon or silicone or silicane compounds#12.21.22.00.00
-unspsc7#12.21.22.22.00#Sodium compounds#12.21.22.00.00
-unspsc7#12.21.22.23.00#Sulfur compounds#12.21.22.00.00
-unspsc7#12.21.22.24.00#Tin compounds#12.21.22.00.00
-unspsc7#12.21.22.25.00#Zinc compounds#12.21.22.00.00
-unspsc7#12.21.22.26.00#Heterocyclic compounds#12.21.22.00.00
-unspsc7#12.21.22.27.00#Cobalt compounds#12.21.22.00.00
-unspsc7#12.21.22.28.00#Antimony compounds#12.21.22.00.00
-unspsc7#12.21.22.29.00#Titanium compounds#12.21.22.00.00
-unspsc7#12.21.23.00.00#Oxides includes all oxided substances#12.21.00.00.00
-unspsc7#12.21.23.01.00#Aluminum oxides#12.21.23.00.00
-unspsc7#12.21.23.02.00#Carbon oxides#12.21.23.00.00
-unspsc7#12.21.23.03.00#Hypochlorous acid#12.21.23.00.00
-unspsc7#12.21.23.04.00#Magnesium oxides#12.21.23.00.00
-unspsc7#12.21.23.05.00#Nitrogen oxides#12.21.23.00.00
-unspsc7#12.21.23.06.00#Osmium oxides#12.21.23.00.00
-unspsc7#12.21.23.07.00#Peroxides#12.21.23.00.00
-unspsc7#12.21.23.08.00#Silicon oxides#12.21.23.00.00
-unspsc7#12.21.23.09.00#Sulfur oxides#12.21.23.00.00
-unspsc7#12.21.23.10.00#Thorium oxides#12.21.23.00.00
-unspsc7#12.21.23.11.00#Water oxides#12.21.23.00.00
-unspsc7#12.21.23.12.00#Zinc oxides#12.21.23.00.00
-unspsc7#12.21.23.13.00#Hydroxides#12.21.23.00.00
-unspsc7#12.21.23.14.00#Metal oxides#12.21.23.00.00
-unspsc7#12.21.23.15.00#Non metal oxides#12.21.23.00.00
-unspsc7#12.21.23.16.00#Ethylene oxide#12.21.23.00.00
-unspsc7#12.21.24.00.00#Isotopes#12.21.00.00.00
-unspsc7#12.21.24.01.00#Deuterated solvents#12.21.24.00.00
-unspsc7#12.21.24.02.00#Heavy water#12.21.24.00.00
-unspsc7#12.21.24.03.00#Alpha sources#12.21.24.00.00
-unspsc7#12.21.24.04.00#Beta sources#12.21.24.00.00
-unspsc7#12.21.24.05.00#Cobalt sources#12.21.24.00.00
-unspsc7#12.21.24.06.00#Gamma sources#12.21.24.00.00
-unspsc7#12.21.24.07.00#Radioisotope sources#12.21.24.00.00
-unspsc7#12.21.24.08.00#Calibration sources#12.21.24.00.00
-unspsc7#12.22.00.00.00#Bio chemicals#12.00.00.00.00
-unspsc7#12.22.15.00.00#Proteins#12.22.00.00.00
-unspsc7#12.22.15.01.00#Albumins#12.22.15.00.00
-unspsc7#12.22.15.02.00#Bacterial proteins#12.22.15.00.00
-unspsc7#12.22.15.03.00#Blood proteins#12.22.15.00.00
-unspsc7#12.22.15.04.00#Bone morphogenetic proteins#12.22.15.00.00
-unspsc7#12.22.15.05.00#Carrier proteins#12.22.15.00.00
-unspsc7#12.22.15.06.00#Contractile proteins#12.22.15.00.00
-unspsc7#12.22.15.07.00#Dietary proteins#12.22.15.00.00
-unspsc7#12.22.15.08.00#Deoxyribonucleic acid (DNA) binding proteins#12.22.15.00.00
-unspsc7#12.22.15.09.00#Egg proteins#12.22.15.00.00
-unspsc7#12.22.15.10.00#Globulins#12.22.15.00.00
-unspsc7#12.22.15.11.00#Glycoproteins#12.22.15.00.00
-unspsc7#12.22.15.12.00#Hemeproteins#12.22.15.00.00
-unspsc7#12.22.15.13.00#Interferons#12.22.15.00.00
-unspsc7#12.22.15.14.00#Lectins#12.22.15.00.00
-unspsc7#12.22.15.15.00#Lipoproteins#12.22.15.00.00
-unspsc7#12.22.15.16.00#Membrane proteins#12.22.15.00.00
-unspsc7#12.22.15.17.00#Metalloproteins#12.22.15.00.00
-unspsc7#12.22.15.18.00#Nerve tissue proteins#12.22.15.00.00
-unspsc7#12.22.15.19.00#Neculeoproteins#12.22.15.00.00
-unspsc7#12.22.15.20.00#Peptones#12.22.15.00.00
-unspsc7#12.22.15.21.00#Plant proteins#12.22.15.00.00
-unspsc7#12.22.15.22.00#Prions#12.22.15.00.00
-unspsc7#12.22.15.23.00#Cytoplasmic or nuclear receptors#12.22.15.00.00
-unspsc7#12.22.15.24.00#Recombinant proteins#12.22.15.00.00
-unspsc7#12.22.15.25.00#Serpins#12.22.15.00.00
-unspsc7#12.22.15.26.00#Transcription factors#12.22.15.00.00
-unspsc7#12.22.15.27.00#Viral proteins#12.22.15.00.00
-unspsc7#12.22.15.28.00#Scleroprotein#12.22.15.00.00
-unspsc7#12.22.16.00.00#Antibodies#12.22.00.00.00
-unspsc7#12.22.16.01.00#Viral antibodies#12.22.16.00.00
-unspsc7#12.22.16.02.00#Antitoxins#12.22.16.00.00
-unspsc7#12.22.16.03.00#Bacterial antibodies#12.22.16.00.00
-unspsc7#12.22.16.04.00#Autoantibodies#12.22.16.00.00
-unspsc7#12.22.16.05.00#Immune sera#12.22.16.00.00
-unspsc7#12.22.16.06.00#Immunoglobulins#12.22.16.00.00
-unspsc7#12.22.17.00.00#Nutrients#12.22.00.00.00
-unspsc7#12.22.17.01.00#Vitamins#12.22.17.00.00
-unspsc7#12.22.18.00.00#Enzymes#12.22.00.00.00
-unspsc7#12.22.18.01.00#Hydrolases#12.22.18.00.00
-unspsc7#12.22.18.02.00#Isoenzymes#12.22.18.00.00
-unspsc7#12.22.18.03.00#Isomerases#12.22.18.00.00
-unspsc7#12.22.18.04.00#Ligases#12.22.18.00.00
-unspsc7#12.22.18.05.00#Lyases#12.22.18.00.00
-unspsc7#12.22.18.06.00#Multienzyme complexes#12.22.18.00.00
-unspsc7#12.22.18.07.00#Oxidoreductases#12.22.18.00.00
-unspsc7#12.22.18.08.00#Permeases#12.22.18.00.00
-unspsc7#12.22.18.09.00#Transfereases#12.22.18.00.00
-unspsc7#12.22.18.10.00#Catalase#12.22.18.00.00
-unspsc7#12.22.19.00.00#Tissues#12.22.00.00.00
-unspsc7#12.22.19.01.00#Connective tissues#12.22.19.00.00
-unspsc7#12.22.19.02.00#Epitheliums#12.22.19.00.00
-unspsc7#12.22.19.03.00#Exocrine glands#12.22.19.00.00
-unspsc7#12.22.19.04.00#Lymphoid tissues#12.22.19.00.00
-unspsc7#12.22.19.05.00#Membranes#12.22.19.00.00
-unspsc7#12.22.19.06.00#Muscles#12.22.19.00.00
-unspsc7#12.22.19.07.00#Nerve tissues#12.22.19.00.00
-unspsc7#12.22.20.00.00#Cultures and fluids#12.22.00.00.00
-unspsc7#12.22.20.01.00#Agar#12.22.20.00.00
-unspsc7#12.22.20.02.00#Broth#12.22.20.00.00
-unspsc7#12.22.20.03.00#Serum free culture media#12.22.20.00.00
-unspsc7#12.22.20.04.00#Conditioned culture media#12.22.20.00.00
-unspsc7#12.22.20.05.00#Bacteria cultures#12.22.20.00.00
-unspsc7#12.22.20.06.00#Blood#12.22.20.00.00
-unspsc7#12.22.20.07.00#Urea#12.22.20.00.00
-unspsc7#12.22.20.08.00#Bile#12.22.20.00.00
-unspsc7#12.22.20.09.00#Plasma#12.22.20.00.00
-unspsc7#12.22.20.10.00#Semen cultures#12.22.20.00.00
-unspsc7#12.22.21.00.00#Nucleic acids#12.22.00.00.00
-unspsc7#12.22.21.01.00#Ribonucleic acid (RNA)#12.22.21.00.00
-unspsc7#12.22.21.02.00#Deoxyribonucleic acid (DNA)#12.22.21.00.00
-unspsc7#12.22.22.00.00#Amino acids#12.22.00.00.00
-unspsc7#12.22.22.01.00#Branched chain amino acids#12.22.22.00.00
-unspsc7#12.22.22.02.00#Cyclic amino acids#12.22.22.00.00
-unspsc7#12.22.22.03.00#Diamino amino acids#12.22.22.00.00
-unspsc7#12.22.22.04.00#Dicarboxylic amino acids#12.22.22.00.00
-unspsc7#12.22.22.05.00#Essential amino acids#12.22.22.00.00
-unspsc7#12.22.22.06.00#Sulfur amino acids#12.22.22.00.00
-unspsc7#12.22.22.07.00#Aminobutyric acids#12.22.22.00.00
-unspsc7#12.22.22.08.00#Aminocaproic acids#12.22.22.00.00
-unspsc7#12.22.22.09.00#Oxamic acids#12.22.22.00.00
-unspsc7#12.22.22.10.00#Phosphoamino acids#12.22.22.00.00
-unspsc7#12.22.22.11.00#Quisqualic acids#12.22.22.00.00
-unspsc7#12.22.23.00.00#Amines and amides and imines and imides#12.22.00.00.00
-unspsc7#12.22.23.01.00#Primary#12.22.23.00.00
-unspsc7#12.22.23.02.00#Secondary#12.22.23.00.00
-unspsc7#12.22.23.03.00#Tertiary#12.22.23.00.00
-unspsc7#12.22.23.04.00#Specialty#12.22.23.00.00
-unspsc7#12.22.23.05.00#Sulphonated#12.22.23.00.00
-unspsc7#12.23.00.00.00#Inorganic compounds#12.00.00.00.00
-unspsc7#12.23.10.00.00#Mineral acids#12.23.00.00.00
-unspsc7#12.23.10.01.00#Hydrofloric acid#12.23.10.00.00
-unspsc7#12.23.10.02.00#Hydrofluorosilicic acid#12.23.10.00.00
-unspsc7#12.23.10.03.00#Hydroflouric acid#12.23.10.00.00
-unspsc7#12.23.11.00.00#Bases#12.23.00.00.00
-unspsc7#12.23.11.01.00#Sodium hydroxide#12.23.11.00.00
-unspsc7#12.23.11.02.00#Potassium hydroxide#12.23.11.00.00
-unspsc7#12.23.12.00.00#Salts#12.23.00.00.00
-unspsc7#12.23.12.01.00#Ammonium nitrate#12.23.12.00.00
-unspsc7#12.23.13.00.00#Sulphates#12.23.00.00.00
-unspsc7#12.23.13.01.00#Ferric sulphate#12.23.13.00.00
-unspsc7#12.23.13.02.00#Copper sulphate#12.23.13.00.00
-unspsc7#12.23.13.03.00#Aluminium sulphate#12.23.13.00.00
-unspsc7#12.23.13.04.00#Sodium sulphate#12.23.13.00.00
-unspsc7#12.23.13.05.00#Sodium thiosulphate#12.23.13.00.00
-unspsc7#12.23.14.00.00#Chlorides chlorates and perchlorates#12.23.00.00.00
-unspsc7#12.23.14.01.00#Sodium chlorite#12.23.14.00.00
-unspsc7#12.23.14.02.00#Ferric Chloride#12.23.14.00.00
-unspsc7#12.23.14.03.00#Aluminium chloride#12.23.14.00.00
-unspsc7#12.23.14.04.00#Poly aluminium chloride#12.23.14.00.00
-unspsc7#12.23.14.05.00#Aluminium chlorohydrate#12.23.14.00.00
-unspsc7#12.23.14.06.00#Sodium hypochlorite#12.23.14.00.00
-unspsc7#12.23.15.00.00#Borides and borates#12.23.00.00.00
-unspsc7#12.23.15.01.00#Sodium borate#12.23.15.00.00
-unspsc7#12.23.16.00.00#Hydrides#12.23.00.00.00
-unspsc7#12.23.16.01.00#Aluminium hydrite#12.23.16.00.00
-unspsc7#12.23.16.02.00#Magnesium hydrite#12.23.16.00.00
-unspsc7#12.23.17.00.00#Sulphides#12.23.00.00.00
-unspsc7#12.23.17.01.00#Hydrogen sulphide#12.23.17.00.00
-unspsc7#12.23.17.02.00#Poly sulphide#12.23.17.00.00
-unspsc7#12.23.17.03.00#Sodium sulphide#12.23.17.00.00
-unspsc7#12.23.17.04.00#Iron sulphide#12.23.17.00.00
-unspsc7#12.23.18.00.00#Inorganic oxidising agents#12.23.00.00.00
-unspsc7#12.23.18.01.00#Potassium permanganate#12.23.18.00.00
-unspsc7#12.23.18.02.00#Potassium dichromate#12.23.18.00.00
-unspsc7#12.23.18.03.00#Manganese dioxide#12.23.18.00.00
-unspsc7#12.24.00.00.00#Alcohols#12.00.00.00.00
-unspsc7#12.24.10.00.00#Monohydric alcohols#12.24.00.00.00
-unspsc7#12.24.10.01.00#Ethanol#12.24.10.00.00
-unspsc7#12.24.10.02.00#Isopropanol#12.24.10.00.00
-unspsc7#12.24.10.03.00#Methanol#12.24.10.00.00
-unspsc7#12.24.10.04.00#Pentanols#12.24.10.00.00
-unspsc7#12.24.10.05.00#Octanols#12.24.10.00.00
-unspsc7#12.24.10.06.00#Inositols#12.24.10.00.00
-unspsc7#12.24.10.07.00#Fatty alcohols#12.24.10.00.00
-unspsc7#12.24.10.08.00#Allyl alcohol#12.24.10.00.00
-unspsc7#12.24.11.00.00#Polyhydric alcohols#12.24.00.00.00
-unspsc7#12.24.11.01.00#Glycol#12.24.11.00.00
-unspsc7#12.24.11.02.00#Glycerol#12.24.11.00.00
-unspsc7#12.24.12.00.00#Thio alcohols#12.24.00.00.00
-unspsc7#12.24.12.01.00#Ethane thiol#12.24.12.00.00
-unspsc7#12.24.12.02.00#Methane thiol#12.24.12.00.00
-unspsc7#12.25.00.00.00#Alkanes Alkenes Alkynes and Aromatics#12.00.00.00.00
-unspsc7#12.25.10.00.00#Alkanes#12.25.00.00.00
-unspsc7#12.25.10.01.00#Pentane#12.25.10.00.00
-unspsc7#12.25.10.02.00#Hexane#12.25.10.00.00
-unspsc7#12.25.11.00.00#Cyclic hydrocarbons#12.25.00.00.00
-unspsc7#12.25.11.01.00#Toluene#12.25.11.00.00
-unspsc7#12.25.11.02.00#Xylenes#12.25.11.00.00
-unspsc7#12.25.11.03.00#Benzene#12.25.11.00.00
-unspsc7#12.25.12.00.00#Alkenes#12.25.00.00.00
-unspsc7#12.25.12.01.00#Propene#12.25.12.00.00
-unspsc7#12.25.12.02.00#Butene#12.25.12.00.00
-unspsc7#12.25.12.03.00#Styrene#12.25.12.00.00
-unspsc7#12.25.13.00.00#Alkynes#12.25.00.00.00
-unspsc7#12.25.13.01.00#Acytelene#12.25.13.00.00
-unspsc7#12.26.00.00.00#Aromatic derivatives#12.00.00.00.00
-unspsc7#12.26.10.00.00#Aromatic sulphonic acids#12.26.00.00.00
-unspsc7#12.26.10.01.00#Benzene sulphonic acids#12.26.10.00.00
-unspsc7#12.26.10.02.00#Halogenated sulphonic acids#12.26.10.00.00
-unspsc7#12.26.10.03.00#Nitrosulphonic acids#12.26.10.00.00
-unspsc7#12.26.10.04.00#Amino sulphonic acids#12.26.10.00.00
-unspsc7#12.26.10.05.00#Sulphonyl chlorides#12.26.10.00.00
-unspsc7#12.26.11.00.00#Aromatic nitro compounds#12.26.00.00.00
-unspsc7#12.26.11.01.00#Nitro benzenes#12.26.11.00.00
-unspsc7#12.26.11.02.00#Nitro toluenes#12.26.11.00.00
-unspsc7#12.26.11.03.00#Caprolactam#12.26.11.00.00
-unspsc7#12.26.12.00.00#Cyclic alcohols#12.26.00.00.00
-unspsc7#12.26.12.01.00#Hexanols#12.26.12.00.00
-unspsc7#12.26.12.02.00#Napthols#12.26.12.00.00
-unspsc7#12.26.12.03.00#Xylenols#12.26.12.00.00
-unspsc7#12.26.12.04.00#Benzyl alcohols#12.26.12.00.00
-unspsc7#12.26.13.00.00#Phthalates#12.26.00.00.00
-unspsc7#12.26.13.01.00#Di octyl Phthalate#12.26.13.00.00
-unspsc7#12.26.13.02.00#Di ethyl phthalates#12.26.13.00.00
-unspsc7#13.00.00.00.00#Resin and Rosin and Rubber and Foam and Film and Elastomeric Materials#13.00.00.00.00
-unspsc7#13.10.00.00.00#Rubber and elastomers#13.00.00.00.00
-unspsc7#13.10.15.00.00#Natural rubber#13.10.00.00.00
-unspsc7#13.10.15.01.00#Latex rubber#13.10.15.00.00
-unspsc7#13.10.15.02.00#Crepe rubber#13.10.15.00.00
-unspsc7#13.10.15.03.00#Smoked sheet rubber#13.10.15.00.00
-unspsc7#13.10.15.04.00#Natural foam rubber#13.10.15.00.00
-unspsc7#13.10.15.05.00#Block or crumb rubber#13.10.15.00.00
-unspsc7#13.10.16.00.00#Processed and synthetic rubber#13.10.00.00.00
-unspsc7#13.10.16.01.00#Vulcanized rubber#13.10.16.00.00
-unspsc7#13.10.16.02.00#Chlorinated rubber#13.10.16.00.00
-unspsc7#13.10.16.03.00#Hydrochloride rubber#13.10.16.00.00
-unspsc7#13.10.16.04.00#Cyclized rubber#13.10.16.00.00
-unspsc7#13.10.16.05.00#Isomerized rubber#13.10.16.00.00
-unspsc7#13.10.16.06.00#Thermplastic rubber#13.10.16.00.00
-unspsc7#13.10.16.07.00#Rubber compound#13.10.16.00.00
-unspsc7#13.10.17.00.00#Elastomers#13.10.00.00.00
-unspsc7#13.10.17.01.00#Acrylonitrile butadiene (NBR)#13.10.17.00.00
-unspsc7#13.10.17.02.00#Highly saturated nitrile (HNBR)#13.10.17.00.00
-unspsc7#13.10.17.03.00#Fluorocarbon (FKM)#13.10.17.00.00
-unspsc7#13.10.17.04.00#Ethylene propylene (EP)#13.10.17.00.00
-unspsc7#13.10.17.05.00#Styrene butadiene (SBR)#13.10.17.00.00
-unspsc7#13.10.17.06.00#Chloroprene (CR)#13.10.17.00.00
-unspsc7#13.10.17.07.00#Isobutylene isoprene (IIR/XIIR)#13.10.17.00.00
-unspsc7#13.10.17.08.00#Silicone (VMQ and PMQ and PVMQ)#13.10.17.00.00
-unspsc7#13.10.17.09.00#Fluorosilicone (FVMQ)#13.10.17.00.00
-unspsc7#13.10.17.10.00#Polyacrylate (ACM)#13.10.17.00.00
-unspsc7#13.10.17.11.00#Ethylene acrylic (AEM)#13.10.17.00.00
-unspsc7#13.10.17.12.00#Chlorosulfonated polyethylene (CSM)#13.10.17.00.00
-unspsc7#13.10.17.13.00#Chloropolyethylene (CM)#13.10.17.00.00
-unspsc7#13.10.17.14.00#Epichlorohydrin (ECO)#13.10.17.00.00
-unspsc7#13.10.17.15.00#Natural polyisoprene (NR)#13.10.17.00.00
-unspsc7#13.10.17.16.00#Synthetic polyisoprene (IR)#13.10.17.00.00
-unspsc7#13.10.17.17.00#Polyester urethane (AU)#13.10.17.00.00
-unspsc7#13.10.17.18.00#Polyether urethane (EU)#13.10.17.00.00
-unspsc7#13.10.17.19.00#Polybutadiene (BR)#13.10.17.00.00
-unspsc7#13.10.17.20.00#Polyether block amide (PEBA)#13.10.17.00.00
-unspsc7#13.10.17.21.00#Styrene block coploymer (TES)#13.10.17.00.00
-unspsc7#13.10.17.22.00#Copolyester#13.10.17.00.00
-unspsc7#13.10.17.23.00#Thermoplastic#13.10.17.00.00
-unspsc7#13.10.17.24.00#Polyolenfinic#13.10.17.00.00
-unspsc7#13.10.18.00.00#Thermoplastic elastomers#13.10.00.00.00
-unspsc7#13.10.18.01.00#Polyether block amide (PEBA)#13.10.18.00.00
-unspsc7#13.10.18.02.00#Polyolenfinic (TPO)#13.10.18.00.00
-unspsc7#13.10.18.03.00#Ether ester block coploymer (TEEE)#13.10.18.00.00
-unspsc7#13.10.18.04.00#Thermoplastic elastomer polyurethane (TPUR)#13.10.18.00.00
-unspsc7#13.10.18.05.00#Styrene block coploymer (TES)#13.10.18.00.00
-unspsc7#13.10.19.00.00#Thermoset plastics#13.10.00.00.00
-unspsc7#13.10.19.01.00#Epoxy (EP)#13.10.19.00.00
-unspsc7#13.10.19.02.00#Phenolic (PF)#13.10.19.00.00
-unspsc7#13.10.19.03.00#Unsaturate polyester (UP)#13.10.19.00.00
-unspsc7#13.10.19.04.00#Urea (UF)#13.10.19.00.00
-unspsc7#13.10.19.05.00#Melamine (MF)#13.10.19.00.00
-unspsc7#13.10.19.06.00#Thermoset polyurethane (PUR)#13.10.19.00.00
-unspsc7#13.10.20.00.00#Thermoplastic plastics#13.10.00.00.00
-unspsc7#13.10.20.01.00#Acrylonitrile butadiene styrene (ABS)#13.10.20.00.00
-unspsc7#13.10.20.02.00#Acrylonitrile butadiene styrene (ABS) alloys#13.10.20.00.00
-unspsc7#13.10.20.03.00#Acetal polymer#13.10.20.00.00
-unspsc7#13.10.20.04.00#Acrylic#13.10.20.00.00
-unspsc7#13.10.20.05.00#Acrylonitrile styrene acrylic (ASA)#13.10.20.00.00
-unspsc7#13.10.20.06.00#Acrylonitrile styrene acrylic (ASA) alloys#13.10.20.00.00
-unspsc7#13.10.20.07.00#Cellulosics#13.10.20.00.00
-unspsc7#13.10.20.08.00#Fluoropolymers (PTFE)#13.10.20.00.00
-unspsc7#13.10.20.09.00#Ethylene vinyl acetate (EVA)#13.10.20.00.00
-unspsc7#13.10.20.10.00#Liquid crystal polymer (LCP)#13.10.20.00.00
-unspsc7#13.10.20.11.00#Polyamide nylons (PA)#13.10.20.00.00
-unspsc7#13.10.20.12.00#Polybutylene terepthalate (PBT)#13.10.20.00.00
-unspsc7#13.10.20.13.00#Polycarbonate (PC)#13.10.20.00.00
-unspsc7#13.10.20.14.00#Polyetheretherketone (PEEK)#13.10.20.00.00
-unspsc7#13.10.20.15.00#Polyetherimid (PEI)#13.10.20.00.00
-unspsc7#13.10.20.16.00#Polyethersulfone (PES)#13.10.20.00.00
-unspsc7#13.10.20.17.00#High density polyethylene (HDPE)#13.10.20.00.00
-unspsc7#13.10.20.18.00#Low density polyethylene (LDPE)#13.10.20.00.00
-unspsc7#13.10.20.19.00#Medium density polyethylene (MDPE)#13.10.20.00.00
-unspsc7#13.10.20.20.00#Polyethylene terepthalate (PET)#13.10.20.00.00
-unspsc7#13.10.20.21.00#Polyimide (PI)#13.10.20.00.00
-unspsc7#13.10.20.22.00#Polypropylene (PP)#13.10.20.00.00
-unspsc7#13.10.20.23.00#Polyphthalamide (PPA)#13.10.20.00.00
-unspsc7#13.10.20.24.00#Polythenylene oxide (PPO)#13.10.20.00.00
-unspsc7#13.10.20.25.00#Polyphenylene sulfide (PPS)#13.10.20.00.00
-unspsc7#13.10.20.26.00#Polystyrene (PS)#13.10.20.00.00
-unspsc7#13.10.20.27.00#High impact polystyrene (HIPS)#13.10.20.00.00
-unspsc7#13.10.20.28.00#Polysulfone (PSU)#13.10.20.00.00
-unspsc7#13.10.20.29.00#Rigid thermoplastic polyurethane (RPTU)#13.10.20.00.00
-unspsc7#13.10.20.30.00#Polyvinyl chloride (PVC)#13.10.20.00.00
-unspsc7#13.10.20.31.00#Styrene acrylonitrile (SAN)#13.10.20.00.00
-unspsc7#13.10.21.00.00#Resins#13.10.00.00.00
-unspsc7#13.10.21.01.00#Plastic resins#13.10.21.00.00
-unspsc7#13.10.21.02.00#Indene resins#13.10.21.00.00
-unspsc7#13.10.21.03.00#Urea resins#13.10.21.00.00
-unspsc7#13.10.21.04.00#Phenolic resins#13.10.21.00.00
-unspsc7#13.10.21.05.00#Thermoplastic resins#13.10.21.00.00
-unspsc7#13.10.21.06.00#Alkyd resins#13.10.21.00.00
-unspsc7#13.10.21.07.00#Melamine resins#13.10.21.00.00
-unspsc7#13.10.21.08.00#Polyacetal resins#13.10.21.00.00
-unspsc7#13.10.21.09.00#Polyamide resins#13.10.21.00.00
-unspsc7#13.10.21.10.00#Polycarbonate resins#13.10.21.00.00
-unspsc7#13.10.21.11.00#Polyethylene terephthalate resins#13.10.21.00.00
-unspsc7#13.10.21.12.00#Polyether resins#13.10.21.00.00
-unspsc7#13.10.21.13.00#Allyl resins#13.10.21.00.00
-unspsc7#13.10.21.14.00#Polyurethane resins#13.10.21.00.00
-unspsc7#13.10.21.15.00#Epoxy resins#13.10.21.00.00
-unspsc7#13.10.21.16.00#Petroleum resins#13.10.21.00.00
-unspsc7#13.10.22.00.00#Plastic films#13.10.00.00.00
-unspsc7#13.10.22.01.00#Polyurethane films#13.10.22.00.00
-unspsc7#13.10.22.02.00#Silicone coated films#13.10.22.00.00
-unspsc7#13.11.00.00.00#Resins and rosins and other resin derived materials#13.00.00.00.00
-unspsc7#13.11.10.00.00#Resins#13.11.00.00.00
-unspsc7#13.11.10.01.00#Epoxy#13.11.10.00.00
-unspsc7#13.11.10.02.00#Phenolic#13.11.10.00.00
-unspsc7#13.11.10.03.00#Unsaturated polyester#13.11.10.00.00
-unspsc7#13.11.10.04.00#Acrylonitrile butadiene styrene#13.11.10.00.00
-unspsc7#13.11.10.05.00#Acrylonitrile styrene acrylic#13.11.10.00.00
-unspsc7#13.11.10.06.00#Acrylonitrile styrene acrylic alloys#13.11.10.00.00
-unspsc7#13.11.10.07.00#Fluoropolymers#13.11.10.00.00
-unspsc7#13.11.10.08.00#Ethylene vinyl acetate#13.11.10.00.00
-unspsc7#13.11.10.09.00#Liquid crystal polymer#13.11.10.00.00
-unspsc7#13.11.10.10.00#Nylon#13.11.10.00.00
-unspsc7#13.11.10.11.00#Polybutylene terepthatlate#13.11.10.00.00
-unspsc7#13.11.10.12.00#Polycarbonate#13.11.10.00.00
-unspsc7#13.11.10.13.00#Polyetheretherketone#13.11.10.00.00
-unspsc7#13.11.10.14.00#Polyetherimide#13.11.10.00.00
-unspsc7#13.11.10.15.00#Polyethersulfone#13.11.10.00.00
-unspsc7#13.11.10.16.00#Polyethylene#13.11.10.00.00
-unspsc7#13.11.10.17.00#Polyethylene terpthalate#13.11.10.00.00
-unspsc7#13.11.10.18.00#Polyimide#13.11.10.00.00
-unspsc7#13.11.10.19.00#Polypropylene#13.11.10.00.00
-unspsc7#13.11.10.20.00#Polyphthalamide#13.11.10.00.00
-unspsc7#13.11.10.21.00#Polyethylene oxide#13.11.10.00.00
-unspsc7#13.11.10.22.00#Polyphenylene sulfide#13.11.10.00.00
-unspsc7#13.11.10.23.00#Polystyrene#13.11.10.00.00
-unspsc7#13.11.10.24.00#Polysulfone#13.11.10.00.00
-unspsc7#13.11.10.25.00#Polyvinyl chloride#13.11.10.00.00
-unspsc7#13.11.10.26.00#Styrene acrylonitrile#13.11.10.00.00
-unspsc7#13.11.10.27.00#Urea formaldehyde#13.11.10.00.00
-unspsc7#13.11.10.28.00#Alkyd#13.11.10.00.00
-unspsc7#13.11.10.29.00#Melamine formaldehyde#13.11.10.00.00
-unspsc7#13.11.10.30.00#Polyacetal#13.11.10.00.00
-unspsc7#13.11.10.31.00#Polyamide#13.11.10.00.00
-unspsc7#13.11.10.32.00#Allyl#13.11.10.00.00
-unspsc7#13.11.10.33.00#Ethylene acrylic acid#13.11.10.00.00
-unspsc7#13.11.10.34.00#Polyvinyl chloride compound#13.11.10.00.00
-unspsc7#13.11.10.35.00#Solution vinyl#13.11.10.00.00
-unspsc7#13.11.10.36.00#Phenoxy#13.11.10.00.00
-unspsc7#13.11.10.37.00#Compounded resins#13.11.10.00.00
-unspsc7#13.11.10.38.00#Polyvinly pyrolidine#13.11.10.00.00
-unspsc7#13.11.10.39.00#Polyethylene terephthalate or glycol modified#13.11.10.00.00
-unspsc7#13.11.10.40.00#Hydrocarbon tackifier#13.11.10.00.00
-unspsc7#13.11.10.41.00#Polycarbonate blends#13.11.10.00.00
-unspsc7#13.11.10.42.00#Polyvinyl alcohol#13.11.10.00.00
-unspsc7#13.11.10.43.00#Polyvinyl butyral#13.11.10.00.00
-unspsc7#13.11.10.44.00#Polyester molding compounds#13.11.10.00.00
-unspsc7#13.11.10.45.00#Polyvinyl acetate#13.11.10.00.00
-unspsc7#13.11.10.46.00#Polyvinyl ether#13.11.10.00.00
-unspsc7#13.11.10.47.00#Polyvinyl formal#13.11.10.00.00
-unspsc7#13.11.10.48.00#Styrene acrylic#13.11.10.00.00
-unspsc7#13.11.10.49.00#Ethylene propylene polymers#13.11.10.00.00
-unspsc7#13.11.10.50.00#Polypropylene oxide#13.11.10.00.00
-unspsc7#13.11.10.51.00#Polypropylene ether#13.11.10.00.00
-unspsc7#13.11.10.52.00#Polypropylene sulfone#13.11.10.00.00
-unspsc7#13.11.10.53.00#Polymethylacrylate#13.11.10.00.00
-unspsc7#13.11.10.54.00#Styrene maleic anhydride#13.11.10.00.00
-unspsc7#13.11.10.55.00#Syndiotatic polystyrene#13.11.10.00.00
-unspsc7#13.11.10.56.00#Chlorinated polyvinyl chloride#13.11.10.00.00
-unspsc7#13.11.10.57.00#Thermoplastic polyester#13.11.10.00.00
-unspsc7#13.11.10.58.00#Indene resins#13.11.10.00.00
-unspsc7#13.11.10.59.00#Plastic resins#13.11.10.00.00
-unspsc7#13.11.10.60.00#Petroleum resins#13.11.10.00.00
-unspsc7#13.11.10.61.00#Polyurethane resins#13.11.10.00.00
-unspsc7#13.11.10.62.00#Polyether resins#13.11.10.00.00
-unspsc7#13.11.11.00.00#Rosins#13.11.00.00.00
-unspsc7#13.11.11.01.00#Wood rosin#13.11.11.00.00
-unspsc7#13.11.11.02.00#Gum rosin#13.11.11.00.00
-unspsc7#13.11.11.03.00#Tall oil rosin#13.11.11.00.00
-unspsc7#13.11.12.00.00#Films#13.11.00.00.00
-unspsc7#13.11.12.01.00#Polyethylene films#13.11.12.00.00
-unspsc7#13.11.12.02.00#Polyurethane films#13.11.12.00.00
-unspsc7#13.11.12.03.00#Acetate films#13.11.12.00.00
-unspsc7#13.11.12.04.00#Acrylic films#13.11.12.00.00
-unspsc7#13.11.12.05.00#Coextruded films#13.11.12.00.00
-unspsc7#13.11.12.06.00#Flouropolymer films#13.11.12.00.00
-unspsc7#13.11.12.07.00#Metalized films#13.11.12.00.00
-unspsc7#13.11.12.08.00#Nylon films#13.11.12.00.00
-unspsc7#13.11.12.09.00#Polycarbonate films#13.11.12.00.00
-unspsc7#13.11.12.10.00#Polyester films#13.11.12.00.00
-unspsc7#13.11.12.11.00#Polypropylene films#13.11.12.00.00
-unspsc7#13.11.12.12.00#Biaxially orientated polypropylene#13.11.12.00.00
-unspsc7#13.11.12.13.00#Polymide films#13.11.12.00.00
-unspsc7#13.11.12.14.00#Polystyrene films#13.11.12.00.00
-unspsc7#13.11.12.15.00#Flexible polyvinyl chloride film#13.11.12.00.00
-unspsc7#13.11.12.16.00#Rigid polyvinyl chloride film#13.11.12.00.00
-unspsc7#13.11.12.17.00#Ethylene vinyl alcohol film#13.11.12.00.00
-unspsc7#13.11.12.18.00#Polyvinylidene chloride#13.11.12.00.00
-unspsc7#13.11.12.19.00#Polyvinyl alcohol films#13.11.12.00.00
-unspsc7#13.11.13.00.00#Foams#13.11.00.00.00
-unspsc7#13.11.13.01.00#Polyolefin foam#13.11.13.00.00
-unspsc7#13.11.13.02.00#Polyether foam#13.11.13.00.00
-unspsc7#13.11.13.03.00#Silicone foam#13.11.13.00.00
-unspsc7#13.11.13.04.00#Ethylene propylene terpolymer foam#13.11.13.00.00
-unspsc7#13.11.13.05.00#Neoprene foam#13.11.13.00.00
-unspsc7#13.11.13.06.00#Polyvinyl chloride foam#13.11.13.00.00
-unspsc7#13.11.13.07.00#Rubber foam#13.11.13.00.00
-unspsc7#13.11.13.08.00#Polystyrene foam#13.11.13.00.00
-unspsc7#14.00.00.00.00#Paper Materials and Products#14.00.00.00.00
-unspsc7#14.10.00.00.00#Paper materials#14.00.00.00.00
-unspsc7#14.10.15.00.00#Raw materials#14.10.00.00.00
-unspsc7#14.10.15.01.00#Paper pulp#14.10.15.00.00
-unspsc7#14.11.00.00.00#Paper products#14.00.00.00.00
-unspsc7#14.11.15.00.00#Printing and writing paper#14.11.00.00.00
-unspsc7#14.11.15.01.00#Onion skin paper#14.11.15.00.00
-unspsc7#14.11.15.02.00#Vellum paper#14.11.15.00.00
-unspsc7#14.11.15.03.00#Parchment paper#14.11.15.00.00
-unspsc7#14.11.15.04.00#Tractor feed paper#14.11.15.00.00
-unspsc7#14.11.15.05.00#Mimeograph paper#14.11.15.00.00
-unspsc7#14.11.15.06.00#Computer printout paper#14.11.15.00.00
-unspsc7#14.11.15.07.00#Printer or copier paper#14.11.15.00.00
-unspsc7#14.11.15.08.00#Facsimile paper#14.11.15.00.00
-unspsc7#14.11.15.09.00#Stationery#14.11.15.00.00
-unspsc7#14.11.15.10.00#Plotter paper#14.11.15.00.00
-unspsc7#14.11.15.11.00#Writing paper#14.11.15.00.00
-unspsc7#14.11.15.12.00#Graph paper#14.11.15.00.00
-unspsc7#14.11.15.13.00#Ledger paper#14.11.15.00.00
-unspsc7#14.11.15.14.00#Paper pads or notebooks#14.11.15.00.00
-unspsc7#14.11.15.15.00#Calculator or cash register paper#14.11.15.00.00
-unspsc7#14.11.15.16.00#Notebook filler paper#14.11.15.00.00
-unspsc7#14.11.15.17.00#Business forms#14.11.15.00.00
-unspsc7#14.11.15.18.00#Index cards#14.11.15.00.00
-unspsc7#14.11.15.19.00#Cardstock papers#14.11.15.00.00
-unspsc7#14.11.15.20.00#Blotter paper#14.11.15.00.00
-unspsc7#14.11.15.21.00#Laser paper#14.11.15.00.00
-unspsc7#14.11.15.22.00#Inkjet paper#14.11.15.00.00
-unspsc7#14.11.15.23.00#Tracing paper#14.11.15.00.00
-unspsc7#14.11.15.24.00#Foolscap sheets#14.11.15.00.00
-unspsc7#14.11.15.25.00#Multipurpose paper#14.11.15.00.00
-unspsc7#14.11.15.26.00#Telephone message pads or books#14.11.15.00.00
-unspsc7#14.11.15.28.00#Magnet paper#14.11.15.00.00
-unspsc7#14.11.15.29.00#Telex rolls#14.11.15.00.00
-unspsc7#14.11.15.30.00#Self adhesive note paper#14.11.15.00.00
-unspsc7#14.11.16.00.00#Novelty paper#14.11.00.00.00
-unspsc7#14.11.16.01.00#Gift wrapping paper or bags or boxes#14.11.16.00.00
-unspsc7#14.11.16.04.00#Business cards#14.11.16.00.00
-unspsc7#14.11.16.05.00#Greeting or note or post cards#14.11.16.00.00
-unspsc7#14.11.16.06.00#Art or craft paper#14.11.16.00.00
-unspsc7#14.11.16.07.00#Poster boards#14.11.16.00.00
-unspsc7#14.11.16.08.00#Gift certificate#14.11.16.00.00
-unspsc7#14.11.16.09.00#Cover paper#14.11.16.00.00
-unspsc7#14.11.17.00.00#Personal paper products#14.11.00.00.00
-unspsc7#14.11.17.01.00#Facial tissues#14.11.17.00.00
-unspsc7#14.11.17.02.00#Toilet seat covers#14.11.17.00.00
-unspsc7#14.11.17.03.00#Paper towels#14.11.17.00.00
-unspsc7#14.11.17.04.00#Toilet tissue#14.11.17.00.00
-unspsc7#14.11.17.05.00#Paper napkins or serviettes#14.11.17.00.00
-unspsc7#14.11.17.06.00#Paper table cloth#14.11.17.00.00
-unspsc7#14.11.18.00.00#Business use papers#14.11.00.00.00
-unspsc7#14.11.18.01.00#Tickets or ticket rolls#14.11.18.00.00
-unspsc7#14.11.18.02.00#Receipts or receipt books#14.11.18.00.00
-unspsc7#14.11.18.03.00#Vouchers#14.11.18.00.00
-unspsc7#14.11.18.04.00#Bills or bill books#14.11.18.00.00
-unspsc7#14.11.18.05.00#Checks or check books#14.11.18.00.00
-unspsc7#14.12.00.00.00#Industrial use papers#14.00.00.00.00
-unspsc7#14.12.15.00.00#Paperboard and packaging papers#14.12.00.00.00
-unspsc7#14.12.15.01.00#Bleached paperboard#14.12.15.00.00
-unspsc7#14.12.15.02.00#Unbleached paperboard#14.12.15.00.00
-unspsc7#14.12.15.03.00#Cardboard#14.12.15.00.00
-unspsc7#14.12.15.04.00#Packaging paper#14.12.15.00.00
-unspsc7#14.12.16.00.00#Tissue papers#14.12.00.00.00
-unspsc7#14.12.16.01.00#Unbleached crepe papers#14.12.16.00.00
-unspsc7#14.12.16.02.00#Semi bleached crepe papers#14.12.16.00.00
-unspsc7#14.12.16.03.00#Wet strength tissue papers#14.12.16.00.00
-unspsc7#14.12.16.04.00#Acid free tissue papers#14.12.16.00.00
-unspsc7#14.12.16.05.00#Kraft tissue paper#14.12.16.00.00
-unspsc7#14.12.17.00.00#Laminated papers#14.12.00.00.00
-unspsc7#14.12.17.01.00#Papers bonded with film#14.12.17.00.00
-unspsc7#14.12.17.02.00#Cylinder papers or multi layer heavyweight paper#14.12.17.00.00
-unspsc7#14.12.18.00.00#Coated papers#14.12.00.00.00
-unspsc7#14.12.18.01.00#Clay coated papers#14.12.18.00.00
-unspsc7#14.12.18.02.00#Polyethylene coated papers#14.12.18.00.00
-unspsc7#14.12.18.03.00#Polyester coated papers#14.12.18.00.00
-unspsc7#14.12.18.04.00#Silicone coated papers#14.12.18.00.00
-unspsc7#14.12.18.05.00#Latex treated coated paper#14.12.18.00.00
-unspsc7#14.12.18.06.00#Waxed paper#14.12.18.00.00
-unspsc7#14.12.18.07.00#Butcher papers#14.12.18.00.00
-unspsc7#14.12.18.08.00#Freezer paper#14.12.18.00.00
-unspsc7#14.12.18.09.00#Masking paper#14.12.18.00.00
-unspsc7#14.12.18.10.00#Carbon papers#14.12.18.00.00
-unspsc7#14.12.19.00.00#Newsprint and offset papers#14.12.00.00.00
-unspsc7#14.12.19.01.00#Standard newsprint#14.12.19.00.00
-unspsc7#14.12.19.02.00#Colored newsprint#14.12.19.00.00
-unspsc7#14.12.19.03.00#High brightness newsprint#14.12.19.00.00
-unspsc7#14.12.19.04.00#Offset paper#14.12.19.00.00
-unspsc7#14.12.20.00.00#Specialty coated papers#14.12.00.00.00
-unspsc7#14.12.20.01.00#Butcher papers#14.12.20.00.00
-unspsc7#14.12.20.02.00#Freezer paper#14.12.20.00.00
-unspsc7#14.12.21.00.00#Uncoated base papers#14.12.00.00.00
-unspsc7#14.12.21.01.00#Super calendared kraft paper#14.12.21.00.00
-unspsc7#14.12.21.02.00#Machine finished or glazed kraft paper#14.12.21.00.00
-unspsc7#14.12.21.03.00#Non treated uncoated paper#14.12.21.00.00
-unspsc7#14.12.21.04.00#Non treated crepe paper#14.12.21.00.00
-unspsc7#14.12.21.05.00#Latex treated crepe paper#14.12.21.00.00
-unspsc7#14.12.21.06.00#Latex treated uncoated paper#14.12.21.00.00
-unspsc7#15.00.00.00.00#Fuels and Fuel Additives and Lubricants and Anti corrosive Materials#15.00.00.00.00
-unspsc7#15.10.00.00.00#Fuels#15.00.00.00.00
-unspsc7#15.10.15.00.00#Petroleum and distillates#15.10.00.00.00
-unspsc7#15.10.15.01.00#Fuel oil#15.10.15.00.00
-unspsc7#15.10.15.02.00#Kerosene#15.10.15.00.00
-unspsc7#15.10.15.03.00#Naphtha#15.10.15.00.00
-unspsc7#15.10.15.04.00#Aviation fuel#15.10.15.00.00
-unspsc7#15.10.15.05.00#Diesel fuel#15.10.15.00.00
-unspsc7#15.10.15.06.00#Gasoline#15.10.15.00.00
-unspsc7#15.10.15.07.00#Petrol#15.10.15.00.00
-unspsc7#15.10.15.08.00#Crude oil#15.10.15.00.00
-unspsc7#15.10.15.09.00#Marine fuel#15.10.15.00.00
-unspsc7#15.10.15.10.00#Condensate#15.10.15.00.00
-unspsc7#15.10.16.00.00#Coal and lignite and peat#15.10.00.00.00
-unspsc7#15.10.16.01.00#Coal#15.10.16.00.00
-unspsc7#15.10.16.02.00#Lignite#15.10.16.00.00
-unspsc7#15.10.16.03.00#Peat#15.10.16.00.00
-unspsc7#15.10.16.04.00#Coke#15.10.16.00.00
-unspsc7#15.10.16.05.00#Charcoal#15.10.16.00.00
-unspsc7#15.11.00.00.00#Gaseous fuels and additives#15.00.00.00.00
-unspsc7#15.11.15.00.00#Gaseous fuels#15.11.00.00.00
-unspsc7#15.11.15.01.00#Propane#15.11.15.00.00
-unspsc7#15.11.15.02.00#Methane#15.11.15.00.00
-unspsc7#15.11.15.03.00#Propylene#15.11.15.00.00
-unspsc7#15.11.15.04.00#Ethylene#15.11.15.00.00
-unspsc7#15.11.15.05.00#Butane#15.11.15.00.00
-unspsc7#15.11.15.06.00#Acetylene#15.11.15.00.00
-unspsc7#15.11.15.07.00#Water gas or producer gas#15.11.15.00.00
-unspsc7#15.11.15.08.00#Coal gas#15.11.15.00.00
-unspsc7#15.11.15.09.00#Liquified petroleum gas#15.11.15.00.00
-unspsc7#15.11.15.10.00#Fuel additives#15.11.15.00.00
-unspsc7#15.11.16.00.00#Fuel additives#15.11.00.00.00
-unspsc7#15.11.16.01.00#Ethanol#15.11.16.00.00
-unspsc7#15.11.16.02.00#Methanol#15.11.16.00.00
-unspsc7#15.12.00.00.00#Lubricants and oils and greases and anti corrosives#15.00.00.00.00
-unspsc7#15.12.15.00.00#Lubricating preparations#15.12.00.00.00
-unspsc7#15.12.15.01.00#Engine oil#15.12.15.00.00
-unspsc7#15.12.15.02.00#Cutting oil#15.12.15.00.00
-unspsc7#15.12.15.03.00#Gear oil#15.12.15.00.00
-unspsc7#15.12.15.04.00#Hydraulic oil#15.12.15.00.00
-unspsc7#15.12.15.05.00#Transformer oil#15.12.15.00.00
-unspsc7#15.12.15.07.00#Lithium grease#15.12.15.00.00
-unspsc7#15.12.15.08.00#Transmission oil#15.12.15.00.00
-unspsc7#15.12.15.09.00#Brake oil#15.12.15.00.00
-unspsc7#15.12.15.10.00#Antigalling#15.12.15.00.00
-unspsc7#15.12.15.11.00#Assembly pastes#15.12.15.00.00
-unspsc7#15.12.15.12.00#Anti adhesives#15.12.15.00.00
-unspsc7#15.12.15.13.00#Graphite lubricants#15.12.15.00.00
-unspsc7#15.12.15.14.00#Spray lubricants#15.12.15.00.00
-unspsc7#15.12.15.15.00#Anti seize or anti stain compounds#15.12.15.00.00
-unspsc7#15.12.15.16.00#Leak stop#15.12.15.00.00
-unspsc7#15.12.16.00.00#Waxes#15.12.00.00.00
-unspsc7#15.12.16.01.00#Paraffin wax#15.12.16.00.00
-unspsc7#15.12.16.02.00#Sealing wax#15.12.16.00.00
-unspsc7#15.12.16.03.00#Olefin wax#15.12.16.00.00
-unspsc7#15.12.17.00.00#Specialty lubricants#15.12.00.00.00
-unspsc7#15.12.17.01.00#Petrolatum#15.12.17.00.00
-unspsc7#15.12.18.00.00#Anti corrosives#15.12.00.00.00
-unspsc7#15.12.18.01.00#Moisture repellent#15.12.18.00.00
-unspsc7#15.12.18.02.00#Anti corrosion lubricant#15.12.18.00.00
-unspsc7#15.12.18.03.00#Rust remover#15.12.18.00.00
-unspsc7#15.12.18.04.00#Rust proofing preparation#15.12.18.00.00
-unspsc7#15.12.18.05.00#Anti weld pastes#15.12.18.00.00
-unspsc7#15.12.19.00.00#Greases#15.12.00.00.00
-unspsc7#15.12.19.01.00#Silicone grease#15.12.19.00.00
-unspsc7#15.12.19.02.00#Grease#15.12.19.00.00
-unspsc7#15.12.19.03.00#Teflon grease#15.12.19.00.00
-unspsc7#15.12.19.04.00#Wool grease#15.12.19.00.00
-unspsc7#15.13.00.00.00#Fuel for nuclear reactors#15.00.00.00.00
-unspsc7#15.13.15.00.00#Nuclear fuel#15.13.00.00.00
-unspsc7#15.13.15.02.00#Depleted uranium#15.13.15.00.00
-unspsc7#15.13.15.03.00#Enriched uranium#15.13.15.00.00
-unspsc7#15.13.15.04.00#Iridium#15.13.15.00.00
-unspsc7#15.13.15.05.00#Enriched plutonium#15.13.15.00.00
-unspsc7#15.13.15.06.00#Depleted plutonium#15.13.15.00.00
-unspsc7#15.13.16.00.00#Fission fuel assemblies#15.13.00.00.00
-unspsc7#15.13.16.01.00#Nuclear fuel rod#15.13.16.00.00
-unspsc7#20.00.00.00.00#Mining Machinery and Accessories#20.00.00.00.00
-unspsc7#20.10.00.00.00#Mining and quarrying machinery and equipment#20.00.00.00.00
-unspsc7#20.10.15.00.00#Cutting equipment#20.10.00.00.00
-unspsc7#20.10.15.01.00#Continuous mining equipment#20.10.15.00.00
-unspsc7#20.10.15.02.00#Longwall shears#20.10.15.00.00
-unspsc7#20.10.15.03.00#Coal cutters#20.10.15.00.00
-unspsc7#20.10.15.04.00#Rock cutters#20.10.15.00.00
-unspsc7#20.10.16.00.00#Screens and feeding equipment#20.10.00.00.00
-unspsc7#20.10.16.01.00#Screens#20.10.16.00.00
-unspsc7#20.10.16.02.00#Feeders#20.10.16.00.00
-unspsc7#20.10.17.00.00#Crushers and breakers and grinders#20.10.00.00.00
-unspsc7#20.10.17.01.00#Rock crushers#20.10.17.00.00
-unspsc7#20.10.17.02.00#Roll crushers#20.10.17.00.00
-unspsc7#20.10.17.03.00#Cone crushers#20.10.17.00.00
-unspsc7#20.10.17.04.00#Gyratory crushers#20.10.17.00.00
-unspsc7#20.10.17.05.00#Impact crushers#20.10.17.00.00
-unspsc7#20.10.17.06.00#Jaw crushers#20.10.17.00.00
-unspsc7#20.10.17.07.00#Crushing plants#20.10.17.00.00
-unspsc7#20.10.17.08.00#Rod mills#20.10.17.00.00
-unspsc7#20.10.17.09.00#Ball mills#20.10.17.00.00
-unspsc7#20.10.17.10.00#Pulverizing machinery#20.10.17.00.00
-unspsc7#20.10.17.11.00#Rock breakers#20.10.17.00.00
-unspsc7#20.10.17.12.00#Earth grinders#20.10.17.00.00
-unspsc7#20.10.17.13.00#Cyclone or vortex grinders#20.10.17.00.00
-unspsc7#20.11.00.00.00#Well drilling and operation equipment#20.00.00.00.00
-unspsc7#20.11.15.00.00#Drilling and exploration equipment#20.11.00.00.00
-unspsc7#20.11.15.01.00#Gas well drilling equipment#20.11.15.00.00
-unspsc7#20.11.15.02.00#Oil well drilling equipment#20.11.15.00.00
-unspsc7#20.11.15.03.00#Subsea system equipment#20.11.15.00.00
-unspsc7#20.11.15.04.00#Water well drilling equipment#20.11.15.00.00
-unspsc7#20.11.15.05.00#Uranium exploration equipment#20.11.15.00.00
-unspsc7#20.11.15.06.00#Wellhead equipment#20.11.15.00.00
-unspsc7#20.11.15.07.00#Mud or workover fluid equipment#20.11.15.00.00
-unspsc7#20.11.15.08.00#Seismic equipment#20.11.15.00.00
-unspsc7#20.11.16.00.00#Drilling and operation machinery#20.11.00.00.00
-unspsc7#20.11.16.01.00#Boring or sinking machinery#20.11.16.00.00
-unspsc7#20.11.16.02.00#Downhole assembly machinery#20.11.16.00.00
-unspsc7#20.11.16.03.00#Hammer drills#20.11.16.00.00
-unspsc7#20.11.16.04.00#Crawler drills#20.11.16.00.00
-unspsc7#20.11.16.05.00#Rock drills#20.11.16.00.00
-unspsc7#20.11.16.06.00#Pneumatic vibrators#20.11.16.00.00
-unspsc7#20.11.16.07.00#Tunneling machinery#20.11.16.00.00
-unspsc7#20.11.16.08.00#Striking hammers#20.11.16.00.00
-unspsc7#20.11.16.09.00#Sinker drills#20.11.16.00.00
-unspsc7#20.11.16.10.00#Sewer inspection machinery#20.11.16.00.00
-unspsc7#20.11.16.11.00#Rotary drills#20.11.16.00.00
-unspsc7#20.11.16.12.00#Drilling rigs#20.11.16.00.00
-unspsc7#20.11.16.13.00#Long hole drills#20.11.16.00.00
-unspsc7#20.11.16.14.00#Industrial drill bits#20.11.16.00.00
-unspsc7#20.11.16.15.00#Drifters#20.11.16.00.00
-unspsc7#20.11.16.16.00#Derricks#20.11.16.00.00
-unspsc7#20.11.16.17.00#Drilling carriages#20.11.16.00.00
-unspsc7#20.11.16.18.00#Downhole fishing poles#20.11.16.00.00
-unspsc7#20.11.16.19.00#Well drilling bit cones#20.11.16.00.00
-unspsc7#20.11.17.00.00#Drilling and operation accessories#20.11.00.00.00
-unspsc7#20.11.17.01.00#Audio visual instruments for well inspection#20.11.17.00.00
-unspsc7#20.11.17.02.00#Packers or tubing anchors#20.11.17.00.00
-unspsc7#20.11.17.03.00#Drilling casings#20.11.17.00.00
-unspsc7#20.11.17.04.00#Drilling screens#20.11.17.00.00
-unspsc7#20.12.00.00.00#Oil and gas drilling and exploration equipment#20.00.00.00.00
-unspsc7#20.12.10.00.00#Acidizing equipment#20.12.00.00.00
-unspsc7#20.12.10.01.00#Acidizing blending units#20.12.10.00.00
-unspsc7#20.12.10.02.00#Acidizing density sensors#20.12.10.00.00
-unspsc7#20.12.10.03.00#Acidizing pumping units#20.12.10.00.00
-unspsc7#20.12.10.04.00#Acidizing units#20.12.10.00.00
-unspsc7#20.12.10.05.00#Acidizing air piping#20.12.10.00.00
-unspsc7#20.12.10.06.00#Acidizing ball injectors#20.12.10.00.00
-unspsc7#20.12.10.07.00#Bulk liquid acid equipment#20.12.10.00.00
-unspsc7#20.12.10.08.00#Acidizing drop boxes#20.12.10.00.00
-unspsc7#20.12.10.09.00#Acidizing flow meters#20.12.10.00.00
-unspsc7#20.12.10.10.00#Acidizing junction boxes#20.12.10.00.00
-unspsc7#20.12.10.11.00#Acidizing pressure sensors#20.12.10.00.00
-unspsc7#20.12.10.12.00#Acidizing process piping#20.12.10.00.00
-unspsc7#20.12.10.13.00#Acidizing straight joints#20.12.10.00.00
-unspsc7#20.12.10.14.00#Acidizing swivels#20.12.10.00.00
-unspsc7#20.12.10.15.00#Acidizing treating irons#20.12.10.00.00
-unspsc7#20.12.10.16.00#Acidizing tree savers#20.12.10.00.00
-unspsc7#20.12.11.00.00#Cementing equipment#20.12.00.00.00
-unspsc7#20.12.11.01.00#Blending units#20.12.11.00.00
-unspsc7#20.12.11.02.00#Bridge plugs#20.12.11.00.00
-unspsc7#20.12.11.03.00#Bulk liquid cement equipment#20.12.11.00.00
-unspsc7#20.12.11.04.00#Cement bulk material equipment#20.12.11.00.00
-unspsc7#20.12.11.05.00#Cement density sensors#20.12.11.00.00
-unspsc7#20.12.11.06.00#Cement floating bulk units#20.12.11.00.00
-unspsc7#20.12.11.07.00#Cement floating equipment stage tools#20.12.11.00.00
-unspsc7#20.12.11.08.00#Cement floating equipment wiper plugs#20.12.11.00.00
-unspsc7#20.12.11.09.00#Cement pumping units#20.12.11.00.00
-unspsc7#20.12.11.10.00#Cement retainers#20.12.11.00.00
-unspsc7#20.12.11.11.00#Centralizers#20.12.11.00.00
-unspsc7#20.12.11.12.00#Express latch couplers#20.12.11.00.00
-unspsc7#20.12.11.13.00#Float collars#20.12.11.00.00
-unspsc7#20.12.11.14.00#Float shoes#20.12.11.00.00
-unspsc7#20.12.11.15.00#Oilfield cementing tools#20.12.11.00.00
-unspsc7#20.12.11.16.00#Retrievable cementing packers#20.12.11.00.00
-unspsc7#20.12.11.17.00#Safety slings#20.12.11.00.00
-unspsc7#20.12.11.18.00#Subsea cement heads#20.12.11.00.00
-unspsc7#20.12.11.19.00#Surface cement heads#20.12.11.00.00
-unspsc7#20.12.12.00.00#Fracturing equipment#20.12.00.00.00
-unspsc7#20.12.12.01.00#Bulk liquid fracturing equipment#20.12.12.00.00
-unspsc7#20.12.12.02.00#Fracturing bulk proppant equipment#20.12.12.00.00
-unspsc7#20.12.12.03.00#Fracturing control units#20.12.12.00.00
-unspsc7#20.12.12.04.00#Fracturing density sensors#20.12.12.00.00
-unspsc7#20.12.12.05.00#Fracturing manifold units#20.12.12.00.00
-unspsc7#20.12.12.06.00#Fracturing proppant conveying equipment#20.12.12.00.00
-unspsc7#20.12.12.07.00#Fracturing pumping units#20.12.12.00.00
-unspsc7#20.12.12.08.00#Fracturing slurry blending units#20.12.12.00.00
-unspsc7#20.12.12.09.00#Gel blending units#20.12.12.00.00
-unspsc7#20.12.12.10.00#Fracturing missiles#20.12.12.00.00
-unspsc7#20.12.12.11.00#Pump integrity monitors#20.12.12.00.00
-unspsc7#20.12.12.12.00#Fracturing service packers#20.12.12.00.00
-unspsc7#20.12.12.13.00#Stimulation pumping units#20.12.12.00.00
-unspsc7#20.12.13.00.00#Sand control equipment#20.12.00.00.00
-unspsc7#20.12.13.01.00#Blanking plugs#20.12.13.00.00
-unspsc7#20.12.13.02.00#Floaters#20.12.13.00.00
-unspsc7#20.12.13.03.00#Frac pack systems#20.12.13.00.00
-unspsc7#20.12.13.04.00#Gravel pack systems#20.12.13.00.00
-unspsc7#20.12.13.05.00#Guide shoes#20.12.13.00.00
-unspsc7#20.12.13.06.00#Hook up nipples#20.12.13.00.00
-unspsc7#20.12.13.07.00#Make up subs#20.12.13.00.00
-unspsc7#20.12.13.08.00#Production tubing overshots#20.12.13.00.00
-unspsc7#20.12.13.09.00#Sand control blanks#20.12.13.00.00
-unspsc7#20.12.13.10.00#Sand control bulk liquid equipment#20.12.13.00.00
-unspsc7#20.12.13.11.00#Sand control bulk proppant equipment#20.12.13.00.00
-unspsc7#20.12.13.12.00#Sand control density sensors#20.12.13.00.00
-unspsc7#20.12.13.13.00#Sand control manifold units#20.12.13.00.00
-unspsc7#20.12.13.14.00#Sand control proppant conveying equipment#20.12.13.00.00
-unspsc7#20.12.13.15.00#Sand control pumping units#20.12.13.00.00
-unspsc7#20.12.13.16.00#Sand control screens#20.12.13.00.00
-unspsc7#20.12.13.17.00#Sand control slurry blending units#20.12.13.00.00
-unspsc7#20.12.13.18.00#Sand detectors#20.12.13.00.00
-unspsc7#20.12.13.19.00#Seal assembly locators#20.12.13.00.00
-unspsc7#20.12.13.20.00#Shear joints#20.12.13.00.00
-unspsc7#20.12.13.21.00#Sleeve shifting tools#20.12.13.00.00
-unspsc7#20.12.13.22.00#Sliding sleeves#20.12.13.00.00
-unspsc7#20.12.13.23.00#Velocity strings#20.12.13.00.00
-unspsc7#20.12.14.00.00#Completion tools and equipment#20.12.00.00.00
-unspsc7#20.12.14.01.00#Ball catcher subs#20.12.14.00.00
-unspsc7#20.12.14.02.00#Blast joints#20.12.14.00.00
-unspsc7#20.12.14.03.00#Blast nipples#20.12.14.00.00
-unspsc7#20.12.14.04.00#Completion bull plugs#20.12.14.00.00
-unspsc7#20.12.14.05.00#Circulation production devices#20.12.14.00.00
-unspsc7#20.12.14.06.00#Completion test equipment#20.12.14.00.00
-unspsc7#20.12.14.07.00#Control line protectors#20.12.14.00.00
-unspsc7#20.12.14.08.00#Deflection tools#20.12.14.00.00
-unspsc7#20.12.14.09.00#Completion expansion joints#20.12.14.00.00
-unspsc7#20.12.14.10.00#Flow couplings#20.12.14.00.00
-unspsc7#20.12.14.11.00#Gas lift equipment#20.12.14.00.00
-unspsc7#20.12.14.12.00#Hanger landing tools#20.12.14.00.00
-unspsc7#20.12.14.13.00#Completion hydraulic pumps#20.12.14.00.00
-unspsc7#20.12.14.14.00#Hydraulic setting tools#20.12.14.00.00
-unspsc7#20.12.14.15.00#Injection systems#20.12.14.00.00
-unspsc7#20.12.14.16.00#Landing nipples#20.12.14.00.00
-unspsc7#20.12.14.17.00#Liner hangers#20.12.14.00.00
-unspsc7#20.12.14.18.00#Packer pulling tools#20.12.14.00.00
-unspsc7#20.12.14.19.00#Packer running tools#20.12.14.00.00
-unspsc7#20.12.14.20.00#Production packers#20.12.14.00.00
-unspsc7#20.12.14.21.00#Pump down through flow line equipment#20.12.14.00.00
-unspsc7#20.12.14.22.00#Completion safety joints#20.12.14.00.00
-unspsc7#20.12.14.23.00#Completion seal assemblies#20.12.14.00.00
-unspsc7#20.12.14.24.00#Seal bores or polished bores#20.12.14.00.00
-unspsc7#20.12.14.25.00#Side pocket mandrels#20.12.14.00.00
-unspsc7#20.12.14.26.00#Sliding sleeves#20.12.14.00.00
-unspsc7#20.12.14.27.00#Subsurface safety valves#20.12.14.00.00
-unspsc7#20.12.14.28.00#Travel joints#20.12.14.00.00
-unspsc7#20.12.14.29.00#Tubing anchors#20.12.14.00.00
-unspsc7#20.12.14.30.00#Twin flow assemblies#20.12.14.00.00
-unspsc7#20.12.15.00.00#Conventional drilling tools#20.12.00.00.00
-unspsc7#20.12.15.01.00#Blowout preventers#20.12.15.00.00
-unspsc7#20.12.15.02.00#Blowout preventer controls#20.12.15.00.00
-unspsc7#20.12.15.03.00#Casing scrapers#20.12.15.00.00
-unspsc7#20.12.15.04.00#Drill collars#20.12.15.00.00
-unspsc7#20.12.15.05.00#Coring equipment#20.12.15.00.00
-unspsc7#20.12.15.06.00#Drill pipe thread protectors#20.12.15.00.00
-unspsc7#20.12.15.07.00#Drill pipe tool joints#20.12.15.00.00
-unspsc7#20.12.15.08.00#Drill pipe#20.12.15.00.00
-unspsc7#20.12.15.09.00#Gauge rings#20.12.15.00.00
-unspsc7#20.12.15.10.00#Hole openers#20.12.15.00.00
-unspsc7#20.12.15.11.00#Hole reamers#20.12.15.00.00
-unspsc7#20.12.15.12.00#Fishing jars#20.12.15.00.00
-unspsc7#20.12.15.13.00#Downhole shock absorbers#20.12.15.00.00
-unspsc7#20.12.15.14.00#Downhole stabilizers#20.12.15.00.00
-unspsc7#20.12.15.15.00#Drilling subs#20.12.15.00.00
-unspsc7#20.12.15.16.00#Thrusters#20.12.15.00.00
-unspsc7#20.12.16.00.00#Drilling bits#20.12.00.00.00
-unspsc7#20.12.16.01.00#Fixed cutter drill bits#20.12.16.00.00
-unspsc7#20.12.16.02.00#Natural diamond drill bits#20.12.16.00.00
-unspsc7#20.12.16.03.00#Nozzle drill bits#20.12.16.00.00
-unspsc7#20.12.16.04.00#PDC bits#20.12.16.00.00
-unspsc7#20.12.16.05.00#Roller cone button insert drill bits#20.12.16.00.00
-unspsc7#20.12.16.06.00#Roller steel tooth drill bits#20.12.16.00.00
-unspsc7#20.12.17.00.00#Fishing tools#20.12.00.00.00
-unspsc7#20.12.17.01.00#Bumper subs#20.12.17.00.00
-unspsc7#20.12.17.02.00#Casing patches#20.12.17.00.00
-unspsc7#20.12.17.03.00#Jar boosters#20.12.17.00.00
-unspsc7#20.12.17.04.00#Junk subs#20.12.17.00.00
-unspsc7#20.12.17.05.00#Mills or burning shoes#20.12.17.00.00
-unspsc7#20.12.17.06.00#Overshots#20.12.17.00.00
-unspsc7#20.12.17.07.00#Oilfield fishing spears#20.12.17.00.00
-unspsc7#20.12.17.08.00#Unspecified fishing tools#20.12.17.00.00
-unspsc7#20.12.18.00.00#Directional drilling equipment#20.12.00.00.00
-unspsc7#20.12.18.01.00#Geosteering tools#20.12.18.00.00
-unspsc7#20.12.18.02.00#Mud motors#20.12.18.00.00
-unspsc7#20.12.18.03.00#Rotary steerable tools#20.12.18.00.00
-unspsc7#20.12.18.04.00#Directional drilling surface control systems#20.12.18.00.00
-unspsc7#20.12.18.05.00#Straight hole directional drilling tools#20.12.18.00.00
-unspsc7#20.12.19.00.00#Well measurement and logging equipment#20.12.00.00.00
-unspsc7#20.12.19.01.00#Acoustic tools#20.12.19.00.00
-unspsc7#20.12.19.02.00#Drilling or mud control instruments#20.12.19.00.00
-unspsc7#20.12.19.03.00#Drilling performance measurement tools#20.12.19.00.00
-unspsc7#20.12.19.04.00#Flow measurement equipment#20.12.19.00.00
-unspsc7#20.12.19.05.00#Nuclear magnetic resonance tools#20.12.19.00.00
-unspsc7#20.12.19.06.00#Nuclear tools#20.12.19.00.00
-unspsc7#20.12.19.07.00#Production logging equipment#20.12.19.00.00
-unspsc7#20.12.19.08.00#Resistivity tools#20.12.19.00.00
-unspsc7#20.12.19.09.00#Surveying systems#20.12.19.00.00
-unspsc7#20.12.19.10.00#Telemetry systems#20.12.19.00.00
-unspsc7#20.12.19.11.00#Ultrasonic tools#20.12.19.00.00
-unspsc7#20.12.19.12.00#Well logging bottom hole pressure equipment#20.12.19.00.00
-unspsc7#20.12.19.13.00#Well logging downhole test equipment#20.12.19.00.00
-unspsc7#20.12.19.14.00#Well logging units#20.12.19.00.00
-unspsc7#20.12.20.00.00#Fixturing and test equipment#20.12.00.00.00
-unspsc7#20.12.20.01.00#Drift bars#20.12.20.00.00
-unspsc7#20.12.20.02.00#Drift sleeves#20.12.20.00.00
-unspsc7#20.12.20.03.00#Drift rabbits#20.12.20.00.00
-unspsc7#20.12.20.04.00#Test fixtures#20.12.20.00.00
-unspsc7#20.12.20.05.00#Test nipples#20.12.20.00.00
-unspsc7#20.12.20.06.00#Test plugs#20.12.20.00.00
-unspsc7#20.12.21.00.00#Perforating equipment#20.12.00.00.00
-unspsc7#20.12.21.01.00#Capsule guns#20.12.21.00.00
-unspsc7#20.12.21.02.00#Casing guns#20.12.21.00.00
-unspsc7#20.12.21.03.00#Deployment heads#20.12.21.00.00
-unspsc7#20.12.21.04.00#Perforating explosives#20.12.21.00.00
-unspsc7#20.12.21.05.00#Firing heads#20.12.21.00.00
-unspsc7#20.12.21.06.00#Gun adapters#20.12.21.00.00
-unspsc7#20.12.21.07.00#High shot density guns#20.12.21.00.00
-unspsc7#20.12.21.08.00#Perforating bull plugs#20.12.21.00.00
-unspsc7#20.12.21.09.00#Plug setting tools#20.12.21.00.00
-unspsc7#20.12.21.10.00#Perforating positioning equipment#20.12.21.00.00
-unspsc7#20.12.21.11.00#Scalloped guns#20.12.21.00.00
-unspsc7#20.12.21.12.00#Tandem subs#20.12.21.00.00
-unspsc7#20.12.21.13.00#Through tubing perforation gun accessories#20.12.21.00.00
-unspsc7#20.12.21.14.00#Through tubing perforation guns#20.12.21.00.00
-unspsc7#20.12.21.15.00#Under balance vent subs#20.12.21.00.00
-unspsc7#20.12.22.00.00#Well testing equipment#20.12.00.00.00
-unspsc7#20.12.22.01.00#Flare booms#20.12.22.00.00
-unspsc7#20.12.22.02.00#Flare burners#20.12.22.00.00
-unspsc7#20.12.22.03.00#Cased hole test tools#20.12.22.00.00
-unspsc7#20.12.22.04.00#Choke manifolds#20.12.22.00.00
-unspsc7#20.12.22.05.00#Diverting manifolds#20.12.22.00.00
-unspsc7#20.12.22.06.00#Flowhead baskets#20.12.22.00.00
-unspsc7#20.12.22.07.00#Flowhead swivels#20.12.22.00.00
-unspsc7#20.12.22.08.00#Flowheads#20.12.22.00.00
-unspsc7#20.12.22.09.00#Formation shut in tools#20.12.22.00.00
-unspsc7#20.12.22.10.00#Gas flares#20.12.22.00.00
-unspsc7#20.12.22.11.00#Mud gas analyzers#20.12.22.00.00
-unspsc7#20.12.22.12.00#Oil samplers#20.12.22.00.00
-unspsc7#20.12.22.13.00#Well testing separators#20.12.22.00.00
-unspsc7#20.12.22.14.00#Well testing surface piping#20.12.22.00.00
-unspsc7#20.12.22.15.00#Surge tanks#20.12.22.00.00
-unspsc7#20.12.22.16.00#Well testing downhole tools#20.12.22.00.00
-unspsc7#20.12.23.00.00#Slickline equipment#20.12.00.00.00
-unspsc7#20.12.23.01.00#Slickline adapter heads#20.12.23.00.00
-unspsc7#20.12.23.02.00#Slickline backoffs#20.12.23.00.00
-unspsc7#20.12.23.03.00#Slickline bell guides#20.12.23.00.00
-unspsc7#20.12.23.04.00#Slickline blind boxes#20.12.23.00.00
-unspsc7#20.12.23.05.00#Slickline bottom hole pressure equipment#20.12.23.00.00
-unspsc7#20.12.23.06.00#Slickline caliper tools#20.12.23.00.00
-unspsc7#20.12.23.07.00#Slickline cement dump bailing equipment#20.12.23.00.00
-unspsc7#20.12.23.08.00#Slickline chemical cutters#20.12.23.00.00
-unspsc7#20.12.23.09.00#Slickline clamp on tool string centralizers#20.12.23.00.00
-unspsc7#20.12.23.10.00#Slickline clamp on wireline centralizers#20.12.23.00.00
-unspsc7#20.12.23.11.00#Slickline collar locators#20.12.23.00.00
-unspsc7#20.12.23.12.00#Slickline collectors#20.12.23.00.00
-unspsc7#20.12.23.13.00#Slickline colliding tools#20.12.23.00.00
-unspsc7#20.12.23.14.00#Slickline crossovers#20.12.23.00.00
-unspsc7#20.12.23.15.00#Slickline depth measurement equipment#20.12.23.00.00
-unspsc7#20.12.23.16.00#Slickline dewar flasks#20.12.23.00.00
-unspsc7#20.12.23.17.00#Slickline dipmeter tools#20.12.23.00.00
-unspsc7#20.12.23.18.00#Slickline directional tools#20.12.23.00.00
-unspsc7#20.12.23.19.00#Slickline go devil tools#20.12.23.00.00
-unspsc7#20.12.23.20.00#Slickline hole punchers#20.12.23.00.00
-unspsc7#20.12.23.21.00#Slickline jet cutters#20.12.23.00.00
-unspsc7#20.12.23.22.00#Slickline junk shots#20.12.23.00.00
-unspsc7#20.12.23.23.00#Slickline kickover tools#20.12.23.00.00
-unspsc7#20.12.23.24.00#Slickline knuckle joints#20.12.23.00.00
-unspsc7#20.12.23.25.00#Slickline lead impression blocks#20.12.23.00.00
-unspsc7#20.12.23.26.00#Slickline locator mandrels#20.12.23.00.00
-unspsc7#20.12.23.27.00#Slickline lock mandrels#20.12.23.00.00
-unspsc7#20.12.23.28.00#Slickline lubricators#20.12.23.00.00
-unspsc7#20.12.23.29.00#Slickline mechanical bailers#20.12.23.00.00
-unspsc7#20.12.23.30.00#Slickline mechanical plugbacks#20.12.23.00.00
-unspsc7#20.12.23.31.00#Other Slickline Tools#20.12.23.00.00
-unspsc7#20.12.23.32.00#Slickline paraffin scrappers#20.12.23.00.00
-unspsc7#20.12.23.33.00#Slickline rope sockets#20.12.23.00.00
-unspsc7#20.12.23.34.00#Slickline running or pulling prongs#20.12.23.00.00
-unspsc7#20.12.23.35.00#Slickline severing tools#20.12.23.00.00
-unspsc7#20.12.23.36.00#Slickline sheaves or floor blocks#20.12.23.00.00
-unspsc7#20.12.23.37.00#Slickline bottom hole pressure equipment#20.12.23.00.00
-unspsc7#20.12.23.38.00#Slickline pulling tool accessories#20.12.23.00.00
-unspsc7#20.12.23.39.00#Slickline pulling tools#20.12.23.00.00
-unspsc7#20.12.23.40.00#Slickline running tools#20.12.23.00.00
-unspsc7#20.12.23.41.00#Slickline units#20.12.23.00.00
-unspsc7#20.12.23.42.00#Slickline wire#20.12.23.00.00
-unspsc7#20.12.23.43.00#Slickline sonic tools#20.12.23.00.00
-unspsc7#20.12.23.44.00#Slickline spacer bars#20.12.23.00.00
-unspsc7#20.12.23.45.00#Slickline swages#20.12.23.00.00
-unspsc7#20.12.23.46.00#Slickline tension devices#20.12.23.00.00
-unspsc7#20.12.23.47.00#Slickline tubing plugs#20.12.23.00.00
-unspsc7#20.12.23.48.00#Slickline ultrasonic tools#20.12.23.00.00
-unspsc7#20.12.23.49.00#Wireline Grabs#20.12.23.00.00
-unspsc7#20.12.23.50.00#Wireline Jars#20.12.23.00.00
-unspsc7#20.12.23.51.00#Wireline Scrapers#20.12.23.00.00
-unspsc7#20.12.23.52.00#Wireline Spear#20.12.23.00.00
-unspsc7#20.12.23.53.00#Wireline Stems#20.12.23.00.00
-unspsc7#20.12.23.54.00#Wireline Valves#20.12.23.00.00
-unspsc7#20.12.24.00.00#Production systems equipment#20.12.00.00.00
-unspsc7#20.12.24.01.00#Cable thumpers#20.12.24.00.00
-unspsc7#20.12.24.02.00#Oilfield production evaporators#20.12.24.00.00
-unspsc7#20.12.24.03.00#Hipot testers#20.12.24.00.00
-unspsc7#20.12.24.04.00#Oilfield lapping machines#20.12.24.00.00
-unspsc7#20.12.24.05.00#Motor end lifts#20.12.24.00.00
-unspsc7#20.12.24.06.00#Oil dielectric testers#20.12.24.00.00
-unspsc7#20.12.24.07.00#Oil vacuum filling units#20.12.24.00.00
-unspsc7#20.12.24.08.00#Oilfield production shaft straighteners#20.12.24.00.00
-unspsc7#20.12.24.09.00#Oilfield production spoolers#20.12.24.00.00
-unspsc7#20.12.24.10.00#Vibration analyzers#20.12.24.00.00
-unspsc7#20.12.25.00.00#Coiled tubing equipment#20.12.00.00.00
-unspsc7#20.12.25.01.00#Blaster tools#20.12.25.00.00
-unspsc7#20.12.25.02.00#Coiled tubing truck crane units#20.12.25.00.00
-unspsc7#20.12.25.03.00#Coiled tubing units#20.12.25.00.00
-unspsc7#20.12.25.04.00#Coiled tubing hose packages#20.12.25.00.00
-unspsc7#20.12.25.05.00#Coiled tubing inflatable systems#20.12.25.00.00
-unspsc7#20.12.25.06.00#Coiled tubing injector heads#20.12.25.00.00
-unspsc7#20.12.25.07.00#Coiled tubing lifting equipment#20.12.25.00.00
-unspsc7#20.12.25.08.00#Operator houses#20.12.25.00.00
-unspsc7#20.12.25.09.00#Coiled tubing power packs#20.12.25.00.00
-unspsc7#20.12.25.10.00#Coiled tubing reels#20.12.25.00.00
-unspsc7#20.12.25.11.00#Coiled tubing spooling reels#20.12.25.00.00
-unspsc7#20.12.25.12.00#Tubing guides#20.12.25.00.00
-unspsc7#20.12.25.13.00#Wellhead hookups#20.12.25.00.00
-unspsc7#20.12.25.14.00#Wellhead support structures#20.12.25.00.00
-unspsc7#20.12.25.15.00#Oilfield coiled tubing#20.12.25.00.00
-unspsc7#20.12.26.00.00#Seismic equipment#20.12.00.00.00
-unspsc7#20.12.26.01.00#Seismic analog sensors#20.12.26.00.00
-unspsc7#20.12.26.02.00#Seismic arrays#20.12.26.00.00
-unspsc7#20.12.26.03.00#Seismic streamer cable birds#20.12.26.00.00
-unspsc7#20.12.26.04.00#Seismic drill tankers#20.12.26.00.00
-unspsc7#20.12.26.05.00#Seismic geophones#20.12.26.00.00
-unspsc7#20.12.26.06.00#Seismic gravity systems#20.12.26.00.00
-unspsc7#20.12.26.07.00#Seismic gun winch systems#20.12.26.00.00
-unspsc7#20.12.26.08.00#Seismic hydrophones#20.12.26.00.00
-unspsc7#20.12.26.09.00#Seismic impulse sources#20.12.26.00.00
-unspsc7#20.12.26.10.00#Seismic marine streamer cables#20.12.26.00.00
-unspsc7#20.12.26.11.00#Seismic ocean bottom cables#20.12.26.00.00
-unspsc7#20.12.26.12.00#Seismic magnetic systems#20.12.26.00.00
-unspsc7#20.12.26.13.00#Seismic positioning equipment#20.12.26.00.00
-unspsc7#20.12.26.14.00#Seismic rams#20.12.26.00.00
-unspsc7#20.12.26.15.00#Seismic receivers#20.12.26.00.00
-unspsc7#20.12.26.16.00#Seismic refraction systems#20.12.26.00.00
-unspsc7#20.12.26.17.00#Seismic source controllers#20.12.26.00.00
-unspsc7#20.12.26.18.00#Seismic spooling devices#20.12.26.00.00
-unspsc7#20.12.26.19.00#Seismic tow blocks#20.12.26.00.00
-unspsc7#20.12.26.20.00#Seismic tow points#20.12.26.00.00
-unspsc7#20.12.26.21.00#Seismic vibrators#20.12.26.00.00
-unspsc7#20.12.26.22.00#Seismic recording systems#20.12.26.00.00
-unspsc7#20.12.26.23.00#Seismic data processing systems#20.12.26.00.00
-unspsc7#20.12.27.00.00#Oil country tubular goods#20.12.00.00.00
-unspsc7#20.12.27.01.00#Oil country casing#20.12.27.00.00
-unspsc7#20.12.27.02.00#Oil country couplings#20.12.27.00.00
-unspsc7#20.12.27.03.00#Oil country pup joints#20.12.27.00.00
-unspsc7#20.12.27.04.00#Oil country tubing#20.12.27.00.00
-unspsc7#20.12.27.05.00#Oil country pipe coatings#20.12.27.00.00
-unspsc7#20.12.27.06.00#Conductor casing#20.12.27.00.00
-unspsc7#20.12.27.07.00#Conductor casing running equipment#20.12.27.00.00
-unspsc7#20.12.27.08.00#Drill pipe crossovers#20.12.27.00.00
-unspsc7#20.12.27.09.00#Oil country thread protectors#20.12.27.00.00
-unspsc7#20.12.28.00.00#Drilling and workover rigs and equipment#20.12.00.00.00
-unspsc7#20.12.28.01.00#Mud agitators#20.12.28.00.00
-unspsc7#20.12.28.02.00#Mud tanks#20.12.28.00.00
-unspsc7#20.12.28.03.00#Air drilling equipment#20.12.28.00.00
-unspsc7#20.12.28.04.00#Barge rigs#20.12.28.00.00
-unspsc7#20.12.28.05.00#Blow out preventers#20.12.28.00.00
-unspsc7#20.12.28.06.00#Fluid diverters#20.12.28.00.00
-unspsc7#20.12.28.07.00#Drawworks#20.12.28.00.00
-unspsc7#20.12.28.08.00#Drill floor equipment#20.12.28.00.00
-unspsc7#20.12.28.09.00#Drill swivels#20.12.28.00.00
-unspsc7#20.12.28.10.00#Drilling rig ships#20.12.28.00.00
-unspsc7#20.12.28.11.00#Drill rig elevators#20.12.28.00.00
-unspsc7#20.12.28.12.00#Drill rig bails#20.12.28.00.00
-unspsc7#20.12.28.13.00#Hydraulic workover units#20.12.28.00.00
-unspsc7#20.12.28.14.00#Drill rig jacking systems#20.12.28.00.00
-unspsc7#20.12.28.15.00#Jackup marine drilling rigs#20.12.28.00.00
-unspsc7#20.12.28.16.00#Kelly bushings#20.12.28.00.00
-unspsc7#20.12.28.17.00#Kelly valves#20.12.28.00.00
-unspsc7#20.12.28.18.00#Kelly wipers#20.12.28.00.00
-unspsc7#20.12.28.19.00#Kellys#20.12.28.00.00
-unspsc7#20.12.28.20.00#Land drilling rigs#20.12.28.00.00
-unspsc7#20.12.28.21.00#Mud cleaning equipment#20.12.28.00.00
-unspsc7#20.12.28.22.00#Mud manifolds#20.12.28.00.00
-unspsc7#20.12.28.23.00#Mud mixers#20.12.28.00.00
-unspsc7#20.12.28.24.00#Pipe handling equipment#20.12.28.00.00
-unspsc7#20.12.28.25.00#Platform drilling rigs#20.12.28.00.00
-unspsc7#20.12.28.26.00#Power swivel or top drives#20.12.28.00.00
-unspsc7#20.12.28.27.00#Rig skids#20.12.28.00.00
-unspsc7#20.12.28.28.00#Drill rig risers#20.12.28.00.00
-unspsc7#20.12.28.29.00#Drill rig rotary tables#20.12.28.00.00
-unspsc7#20.12.28.30.00#Self elevating workover platforms#20.12.28.00.00
-unspsc7#20.12.28.31.00#Semi submersible drilling rigs#20.12.28.00.00
-unspsc7#20.12.28.32.00#Drill floor slips#20.12.28.00.00
-unspsc7#20.12.28.33.00#Makeup tongs#20.12.28.00.00
-unspsc7#20.12.28.34.00#Iron roughnecks#20.12.28.00.00
-unspsc7#20.12.28.35.00#Traveling equipment#20.12.28.00.00
-unspsc7#20.12.28.36.00#Workover boats#20.12.28.00.00
-unspsc7#20.12.28.37.00#Workover rigs#20.12.28.00.00
-unspsc7#20.12.29.00.00#Surface data logging equipment#20.12.00.00.00
-unspsc7#20.12.29.01.00#Surface data logging conduits#20.12.29.00.00
-unspsc7#20.12.29.02.00#Surface data logging sensors#20.12.29.00.00
-unspsc7#20.12.29.03.00#Surface data logging units#20.12.29.00.00
-unspsc7#20.12.30.00.00#Multilateral equipment#20.12.00.00.00
-unspsc7#20.12.30.01.00#Multilateral casing#20.12.30.00.00
-unspsc7#20.12.30.02.00#Multilateral junctions#20.12.30.00.00
-unspsc7#20.12.30.03.00#Multilateral packers#20.12.30.00.00
-unspsc7#20.13.00.00.00#Oil and gas drilling and operation materials#20.00.00.00.00
-unspsc7#20.13.10.00.00#Drilling mud and materials#20.13.00.00.00
-unspsc7#20.13.10.01.00#Filtration control agents#20.13.10.00.00
-unspsc7#20.13.10.02.00#Fluid spacers#20.13.10.00.00
-unspsc7#20.13.10.03.00#Lost circulation agents#20.13.10.00.00
-unspsc7#20.13.10.04.00#Oil based muds#20.13.10.00.00
-unspsc7#20.13.10.05.00#Rate of penetration enhancers#20.13.10.00.00
-unspsc7#20.13.10.06.00#Spotting fluids#20.13.10.00.00
-unspsc7#20.13.10.07.00#Synthetic based muds#20.13.10.00.00
-unspsc7#20.13.10.08.00#Mud thinning agents#20.13.10.00.00
-unspsc7#20.13.10.09.00#Water based muds#20.13.10.00.00
-unspsc7#20.13.10.10.00#Mud weighting agents#20.13.10.00.00
-unspsc7#20.13.11.00.00#Well fracturing proppants#20.13.00.00.00
-unspsc7#20.13.11.01.00#Ceramic proppants#20.13.11.00.00
-unspsc7#20.13.11.02.00#Fracturing sands#20.13.11.00.00
-unspsc7#20.13.11.03.00#Resin coated ceramic proppants#20.13.11.00.00
-unspsc7#20.13.11.04.00#Resin coated fracturing sands#20.13.11.00.00
-unspsc7#20.13.11.05.00#Resin coated sintered bauxites#20.13.11.00.00
-unspsc7#20.13.11.06.00#Sintered bauxites#20.13.11.00.00
-unspsc7#20.13.12.00.00#Completion fluids#20.13.00.00.00
-unspsc7#20.13.12.01.00#Divalent brines#20.13.12.00.00
-unspsc7#20.13.12.02.00#Monovalent brines#20.13.12.00.00
-unspsc7#20.13.13.00.00#Oil well cement#20.13.00.00.00
-unspsc7#20.13.13.01.00#Oil well bulk cement#20.13.13.00.00
-unspsc7#20.13.13.02.00#Oil well class a type I cement#20.13.13.00.00
-unspsc7#20.13.13.03.00#Oil well class b type II cement#20.13.13.00.00
-unspsc7#20.13.13.04.00#Oil well class c cement#20.13.13.00.00
-unspsc7#20.13.13.05.00#Oil well class g cement#20.13.13.00.00
-unspsc7#20.13.13.06.00#Oil well class h cement#20.13.13.00.00
-unspsc7#20.13.13.07.00#Oil well lightweight cement#20.13.13.00.00
-unspsc7#20.13.13.08.00#Oil well standard fine type III cement#20.13.13.00.00
-unspsc7#20.14.00.00.00#Oil and gas operating and production equipment#20.00.00.00.00
-unspsc7#20.14.10.00.00#Wellhead equipment#20.14.00.00.00
-unspsc7#20.14.10.01.00#Wellhead actuators#20.14.10.00.00
-unspsc7#20.14.10.02.00#Wellhead beam pumps#20.14.10.00.00
-unspsc7#20.14.10.03.00#Wellhead flow lines#20.14.10.00.00
-unspsc7#20.14.10.04.00#Wellhead gate valves#20.14.10.00.00
-unspsc7#20.14.10.05.00#Wellhead production chokes#20.14.10.00.00
-unspsc7#20.14.10.06.00#Wellhead sub surface flow or christmas trees#20.14.10.00.00
-unspsc7#20.14.10.07.00#Wellhead surface flow or christmas trees#20.14.10.00.00
-unspsc7#20.14.10.08.00#Wellhead surface safety valves#20.14.10.00.00
-unspsc7#20.14.11.00.00#Chemical injection systems#20.14.00.00.00
-unspsc7#20.14.11.01.00#Paraffin injection systems#20.14.11.00.00
-unspsc7#20.14.12.00.00#Desanding equipment#20.14.00.00.00
-unspsc7#20.14.12.01.00#Production desanding equipment#20.14.12.00.00
-unspsc7#20.14.13.00.00#Downhole jet pumps and anchors#20.14.00.00.00
-unspsc7#20.14.13.01.00#Downhole jet pumps#20.14.13.00.00
-unspsc7#20.14.14.00.00#Downhole production accessories#20.14.00.00.00
-unspsc7#20.14.14.01.00#Tubing stops#20.14.14.00.00
-unspsc7#20.14.15.00.00#Downhole pumps#20.14.00.00.00
-unspsc7#20.14.15.01.00#Electric downhole pumps#20.14.15.00.00
-unspsc7#20.14.16.00.00#Export pumps#20.14.00.00.00
-unspsc7#20.14.16.01.00#Pneumatic export pumps#20.14.16.00.00
-unspsc7#20.14.17.00.00#Offshore production and storage platforms#20.14.00.00.00
-unspsc7#20.14.17.01.00#Fixed offshore production platforms#20.14.17.00.00
-unspsc7#20.14.17.02.00#Floating offshore production platforms#20.14.17.00.00
-unspsc7#20.14.17.03.00#Floating offshore storage platforms#20.14.17.00.00
-unspsc7#20.14.17.04.00#Floating offshore tension leg  production platforms#20.14.17.00.00
-unspsc7#20.14.17.05.00#Floating offshore tension leg storage platforms#20.14.17.00.00
-unspsc7#20.14.18.00.00#Well production flow measurement meters#20.14.00.00.00
-unspsc7#20.14.18.01.00#Well production gas turbine meters#20.14.18.00.00
-unspsc7#20.14.19.00.00#Gas treating equipment#20.14.00.00.00
-unspsc7#20.14.19.01.00#Oil well production gas treating equipment#20.14.19.00.00
-unspsc7#20.14.20.00.00#Glycol regenerators#20.14.00.00.00
-unspsc7#20.14.20.01.00#Oil well glycol regenerators#20.14.20.00.00
-unspsc7#20.14.21.00.00#Heater treaters#20.14.00.00.00
-unspsc7#20.14.21.01.00#Oil well heater treaters#20.14.21.00.00
-unspsc7#20.14.22.00.00#Line heaters#20.14.00.00.00
-unspsc7#20.14.22.01.00#Electrical line heaters#20.14.22.00.00
-unspsc7#20.14.23.00.00#Production injection skids#20.14.00.00.00
-unspsc7#20.14.23.01.00#Pneumatic methanol injections skids#20.14.23.00.00
-unspsc7#20.14.24.00.00#Ocean floor equipment#20.14.00.00.00
-unspsc7#20.14.24.01.00#Subsea production wellhead equipment#20.14.24.00.00
-unspsc7#20.14.25.00.00#Produced water treating equipment#20.14.00.00.00
-unspsc7#20.14.25.01.00#Oil field water oil centrifuges#20.14.25.00.00
-unspsc7#20.14.26.00.00#Production control system instrumentation#20.14.00.00.00
-unspsc7#20.14.26.01.00#Wireless production control systems#20.14.26.00.00
-unspsc7#20.14.27.00.00#Pumping units#20.14.00.00.00
-unspsc7#20.14.27.01.00#Sucker rod pump jacks#20.14.27.00.00
-unspsc7#20.14.27.02.00#Rod pumps#20.14.27.00.00
-unspsc7#20.14.27.03.00#Mechanical rod pumps#20.14.27.00.00
-unspsc7#20.14.28.00.00#Production separators#20.14.00.00.00
-unspsc7#20.14.28.01.00#Oil water separators#20.14.28.00.00
-unspsc7#20.14.29.00.00#Storage vessels and tanks#20.14.00.00.00
-unspsc7#20.14.29.01.00#Oil storage tanks#20.14.29.00.00
-unspsc7#20.14.30.00.00#Sucker rods#20.14.00.00.00
-unspsc7#20.14.30.01.00#Alloy steel sucker rods#20.14.30.00.00
-unspsc7#20.14.30.02.00#Pony rods#20.14.30.00.00
-unspsc7#21.00.00.00.00#Farming and Fishing and Forestry and Wildlife Machinery and Accessories#21.00.00.00.00
-unspsc7#21.10.00.00.00#Agricultural and forestry and landscape machinery and equipment#21.00.00.00.00
-unspsc7#21.10.15.00.00#Agricultural machinery for soil preparation#21.10.00.00.00
-unspsc7#21.10.15.01.00#Ploughs#21.10.15.00.00
-unspsc7#21.10.15.02.00#Harrows#21.10.15.00.00
-unspsc7#21.10.15.03.00#Cultivators#21.10.15.00.00
-unspsc7#21.10.15.04.00#Weeders#21.10.15.00.00
-unspsc7#21.10.15.05.00#Hoeing machines#21.10.15.00.00
-unspsc7#21.10.15.06.00#Graders or land levelers#21.10.15.00.00
-unspsc7#21.10.15.07.00#Agricultural rollers#21.10.15.00.00
-unspsc7#21.10.15.08.00#Rollers for lawn or sports grounds#21.10.15.00.00
-unspsc7#21.10.15.09.00#Trencher drainage machine#21.10.15.00.00
-unspsc7#21.10.15.10.00#Irrigation pipes or tubes#21.10.15.00.00
-unspsc7#21.10.15.11.00#Irrigation trickles#21.10.15.00.00
-unspsc7#21.10.15.12.00#Irrigation overheads#21.10.15.00.00
-unspsc7#21.10.15.13.00#Disks#21.10.15.00.00
-unspsc7#21.10.15.14.00#Subsoilers#21.10.15.00.00
-unspsc7#21.10.15.15.00#Hedge clippers#21.10.15.00.00
-unspsc7#21.10.15.16.00#Dibblers#21.10.15.00.00
-unspsc7#21.10.16.00.00#Agricultural machinery for planting and seeding#21.10.00.00.00
-unspsc7#21.10.16.01.00#Planters#21.10.16.00.00
-unspsc7#21.10.16.02.00#Transplanters#21.10.16.00.00
-unspsc7#21.10.16.03.00#Grain drills#21.10.16.00.00
-unspsc7#21.10.16.04.00#Seed drills#21.10.16.00.00
-unspsc7#21.10.16.05.00#Seed treating equipment#21.10.16.00.00
-unspsc7#21.10.16.06.00#Hole diggers#21.10.16.00.00
-unspsc7#21.10.17.00.00#Agricultural machinery for harvesting#21.10.00.00.00
-unspsc7#21.10.17.01.00#Mowers#21.10.17.00.00
-unspsc7#21.10.17.02.00#Haymaking machinery#21.10.17.00.00
-unspsc7#21.10.17.03.00#Harvesters#21.10.17.00.00
-unspsc7#21.10.17.04.00#Combine harvesters#21.10.17.00.00
-unspsc7#21.10.17.05.00#Threshing machines#21.10.17.00.00
-unspsc7#21.10.18.00.00#Dispersing and spraying appliances for agriculture#21.10.00.00.00
-unspsc7#21.10.18.01.00#Sprayers#21.10.18.00.00
-unspsc7#21.10.18.02.00#Dusters#21.10.18.00.00
-unspsc7#21.10.18.03.00#Water sprinklers#21.10.18.00.00
-unspsc7#21.10.18.04.00#Fertilizer spreaders or distributors#21.10.18.00.00
-unspsc7#21.10.18.05.00#Fog or mist generators#21.10.18.00.00
-unspsc7#21.10.18.06.00#Composter#21.10.18.00.00
-unspsc7#21.10.18.07.00#Pollination equipment or supplies#21.10.18.00.00
-unspsc7#21.10.18.08.00#Frost protection equipment#21.10.18.00.00
-unspsc7#21.10.19.00.00#Poultry and livestock equipment#21.10.00.00.00
-unspsc7#21.10.19.01.00#Milking machines#21.10.19.00.00
-unspsc7#21.10.19.02.00#Animal husbandry equipment#21.10.19.00.00
-unspsc7#21.10.19.03.00#Incubators or brooders for poultry#21.10.19.00.00
-unspsc7#21.10.19.04.00#Feed mixers#21.10.19.00.00
-unspsc7#21.10.19.05.00#Livestock identification equipment#21.10.19.00.00
-unspsc7#21.10.19.06.00#Egg inspection or collecting equipment#21.10.19.00.00
-unspsc7#21.10.19.07.00#Animal watering machines#21.10.19.00.00
-unspsc7#21.10.19.08.00#Milk cooling tanks#21.10.19.00.00
-unspsc7#21.10.19.09.00#Animal shearing or clipping equipment#21.10.19.00.00
-unspsc7#21.10.20.00.00#Agricultural machinery for cleaning and sorting and grading#21.10.00.00.00
-unspsc7#21.10.20.01.00#Cleaning machines for seed or grain or dried leguminous vegetables#21.10.20.00.00
-unspsc7#21.10.20.02.00#Sorting machines for seed or grain or dried leguminous vegetables#21.10.20.00.00
-unspsc7#21.10.20.03.00#Grading machines for seed or grain or dried leguminous vegetables#21.10.20.00.00
-unspsc7#21.10.20.04.00#Rice cleaning or hulling equipment#21.10.20.00.00
-unspsc7#21.10.20.05.00#Grinding mills#21.10.20.00.00
-unspsc7#21.10.20.06.00#Hammer mills#21.10.20.00.00
-unspsc7#21.10.21.00.00#Agricultural processing machinery and equipment#21.10.00.00.00
-unspsc7#21.10.21.01.00#Agricultural briquetting or pelting machines#21.10.21.00.00
-unspsc7#21.10.22.00.00#Forestry machinery and equipment#21.10.00.00.00
-unspsc7#21.10.22.01.00#Decorticators#21.10.22.00.00
-unspsc7#21.10.22.02.00#Lumbering equipment#21.10.22.00.00
-unspsc7#21.10.22.03.00#Reforestation equipment#21.10.22.00.00
-unspsc7#21.10.22.04.00#Forestry saws#21.10.22.00.00
-unspsc7#21.10.22.05.00#Forestry skidders#21.10.22.00.00
-unspsc7#21.10.22.06.00#Forestry increment borers#21.10.22.00.00
-unspsc7#21.10.22.07.00#Forestry ipsometer#21.10.22.00.00
-unspsc7#21.10.23.00.00#Greenhouse equipment#21.10.00.00.00
-unspsc7#21.10.23.01.00#Greenhouse irrigation equipment#21.10.23.00.00
-unspsc7#21.10.23.02.00#Greenhouse pots#21.10.23.00.00
-unspsc7#21.10.23.03.00#Greenhouse ventilation equipment#21.10.23.00.00
-unspsc7#21.10.23.04.00#Greenhouse isolation equipment#21.10.23.00.00
-unspsc7#21.10.24.00.00#Insect equipment#21.10.00.00.00
-unspsc7#21.10.24.01.00#Beekeeping equipment#21.10.24.00.00
-unspsc7#21.10.24.02.00#Silkworm equipment#21.10.24.00.00
-unspsc7#21.10.24.03.00#Butterfly breeding equipment#21.10.24.00.00
-unspsc7#21.10.24.04.00#Beetle breeding equipment#21.10.24.00.00
-unspsc7#21.11.00.00.00#Fishing and aquaculture equipment#21.00.00.00.00
-unspsc7#21.11.15.00.00#Commercial fishing equipment#21.11.00.00.00
-unspsc7#21.11.15.01.00#Commercial fish hooks#21.11.15.00.00
-unspsc7#21.11.15.02.00#Commercial fishing reels#21.11.15.00.00
-unspsc7#21.11.15.03.00#Commercial fishing line tackle#21.11.15.00.00
-unspsc7#21.11.15.04.00#Commercial fishing nets#21.11.15.00.00
-unspsc7#21.11.15.06.00#Commercial fishing floats#21.11.15.00.00
-unspsc7#21.11.15.07.00#Commercial sinkers or weights#21.11.15.00.00
-unspsc7#21.11.15.08.00#Fishing net haulers#21.11.15.00.00
-unspsc7#21.11.16.00.00#Aquaculture equipment#21.11.00.00.00
-unspsc7#21.11.16.01.00#Marine hatchery equipment#21.11.16.00.00
-unspsc7#21.11.16.02.00#Pisciculture supplies#21.11.16.00.00
-unspsc7#22.00.00.00.00#Building and Construction Machinery and Accessories#22.00.00.00.00
-unspsc7#22.10.00.00.00#Heavy construction machinery and equipment#22.00.00.00.00
-unspsc7#22.10.15.00.00#Earth moving machinery#22.10.00.00.00
-unspsc7#22.10.15.01.00#Front end loaders#22.10.15.00.00
-unspsc7#22.10.15.02.00#Graders#22.10.15.00.00
-unspsc7#22.10.15.03.00#Loaders#22.10.15.00.00
-unspsc7#22.10.15.04.00#Pile drivers#22.10.15.00.00
-unspsc7#22.10.15.05.00#Rollers#22.10.15.00.00
-unspsc7#22.10.15.06.00#Earthmoving scrapers#22.10.15.00.00
-unspsc7#22.10.15.07.00#Tampers#22.10.15.00.00
-unspsc7#22.10.15.08.00#Trenching machines#22.10.15.00.00
-unspsc7#22.10.15.09.00#Backhoes#22.10.15.00.00
-unspsc7#22.10.15.10.00#Bulldozers#22.10.15.00.00
-unspsc7#22.10.15.11.00#Compactors#22.10.15.00.00
-unspsc7#22.10.15.13.00#Draglines#22.10.15.00.00
-unspsc7#22.10.15.14.00#Dredgers#22.10.15.00.00
-unspsc7#22.10.15.15.00#Excavators#22.10.15.00.00
-unspsc7#22.10.15.16.00#Ditchers#22.10.15.00.00
-unspsc7#22.10.15.17.00#Cherry pickers#22.10.15.00.00
-unspsc7#22.10.15.18.00#Elevating scrapers#22.10.15.00.00
-unspsc7#22.10.15.19.00#Twin engine open bowl scrapers#22.10.15.00.00
-unspsc7#22.10.15.20.00#Twin engine elevating scrapers#22.10.15.00.00
-unspsc7#22.10.15.21.00#Pulled scrapers#22.10.15.00.00
-unspsc7#22.10.15.22.00#Track bulldozers#22.10.15.00.00
-unspsc7#22.10.15.23.00#Wheel bulldozers#22.10.15.00.00
-unspsc7#22.10.15.24.00#Mobile excavators#22.10.15.00.00
-unspsc7#22.10.15.25.00#Wheel excavators#22.10.15.00.00
-unspsc7#22.10.15.26.00#Track excavators#22.10.15.00.00
-unspsc7#22.10.15.27.00#Integrated tool carriers#22.10.15.00.00
-unspsc7#22.10.15.28.00#Wheel loaders#22.10.15.00.00
-unspsc7#22.10.15.29.00#Skid steer loaders#22.10.15.00.00
-unspsc7#22.10.15.30.00#Open bowl scrapers#22.10.15.00.00
-unspsc7#22.10.15.31.00#Snow blowers#22.10.15.00.00
-unspsc7#22.10.15.32.00#Track loaders#22.10.15.00.00
-unspsc7#22.10.16.00.00#Paving equipment#22.10.00.00.00
-unspsc7#22.10.16.02.00#Ramming equipment#22.10.16.00.00
-unspsc7#22.10.16.03.00#Road wideners#22.10.16.00.00
-unspsc7#22.10.16.04.00#Vibratory plates#22.10.16.00.00
-unspsc7#22.10.16.05.00#Asphalt finishers#22.10.16.00.00
-unspsc7#22.10.16.06.00#Chip Spreaders#22.10.16.00.00
-unspsc7#22.10.17.00.00#Heavy equipment components#22.10.00.00.00
-unspsc7#22.10.17.01.00#Earthmoving shovels#22.10.17.00.00
-unspsc7#22.10.17.02.00#Earthmoving buckets#22.10.17.00.00
-unspsc7#22.10.17.03.00#Earthmoving blades#22.10.17.00.00
-unspsc7#22.10.17.04.00#Scarifiers#22.10.17.00.00
-unspsc7#22.10.18.00.00#Aerial lifts#22.10.00.00.00
-unspsc7#22.10.18.01.00#Manlift or personnel lift#22.10.18.00.00
-unspsc7#22.10.18.02.00#Platform lift#22.10.18.00.00
-unspsc7#22.10.18.03.00#Articulating boom lift#22.10.18.00.00
-unspsc7#22.10.18.04.00#Telescoping boom lift#22.10.18.00.00
-unspsc7#23.00.00.00.00#Industrial Manufacturing and Processing Machinery and Accessories#23.00.00.00.00
-unspsc7#23.10.00.00.00#Raw materials processing machinery#23.00.00.00.00
-unspsc7#23.10.15.00.00#Machinery for working wood and stone and ceramic and the like#23.10.00.00.00
-unspsc7#23.10.15.01.00#Coping machines#23.10.15.00.00
-unspsc7#23.10.15.02.00#Drilling machines#23.10.15.00.00
-unspsc7#23.10.15.03.00#Broaching machines#23.10.15.00.00
-unspsc7#23.10.15.04.00#Bending machines#23.10.15.00.00
-unspsc7#23.10.15.05.00#Boring machines#23.10.15.00.00
-unspsc7#23.10.15.06.00#Grinding machines#23.10.15.00.00
-unspsc7#23.10.15.07.00#Molding machines#23.10.15.00.00
-unspsc7#23.10.15.08.00#Cutting machines#23.10.15.00.00
-unspsc7#23.10.15.09.00#Sanding machines#23.10.15.00.00
-unspsc7#23.10.15.10.00#Polishing machines#23.10.15.00.00
-unspsc7#23.10.15.11.00#Turning machines#23.10.15.00.00
-unspsc7#23.10.15.12.00#Sawing machines#23.10.15.00.00
-unspsc7#23.10.15.13.00#Milling machines#23.10.15.00.00
-unspsc7#23.10.15.14.00#Planing machines#23.10.15.00.00
-unspsc7#23.10.15.15.00#Engraving machines#23.10.15.00.00
-unspsc7#23.10.15.16.00#Glass bead peener machines#23.10.15.00.00
-unspsc7#23.10.15.17.00#Grit blast machines#23.10.15.00.00
-unspsc7#23.10.15.18.00#Shot peen machine#23.10.15.00.00
-unspsc7#23.10.15.19.00#Robot machines#23.10.15.00.00
-unspsc7#23.10.15.20.00#Ram electro discharge machines#23.10.15.00.00
-unspsc7#23.10.15.21.00#Wire cathode electrode discharge machine#23.10.15.00.00
-unspsc7#23.10.15.22.00#Chip breaker#23.10.15.00.00
-unspsc7#23.11.00.00.00#Petroleum processing machinery#23.00.00.00.00
-unspsc7#23.11.15.00.00#Petroleum distilling and processing machinery and equipment#23.11.00.00.00
-unspsc7#23.11.15.01.00#Distillate hydroprocessing equipment#23.11.15.00.00
-unspsc7#23.11.15.02.00#Crude distilling machinery#23.11.15.00.00
-unspsc7#23.11.15.03.00#Catalytic cracking equipment#23.11.15.00.00
-unspsc7#23.11.15.04.00#Hydrocracking equipment#23.11.15.00.00
-unspsc7#23.11.15.05.00#Isomerization machinery#23.11.15.00.00
-unspsc7#23.11.15.06.00#Coking machinery#23.11.15.00.00
-unspsc7#23.11.15.07.00#Gas recovery machinery#23.11.15.00.00
-unspsc7#23.11.16.00.00#Hydrotreating machinery#23.11.00.00.00
-unspsc7#23.11.16.01.00#Naptha hydrotreater#23.11.16.00.00
-unspsc7#23.11.16.02.00#Distillate hydrotreater#23.11.16.00.00
-unspsc7#23.11.16.03.00#Catalytic feed hydrotreater#23.11.16.00.00
-unspsc7#23.11.16.04.00#Lube hydrotreater#23.11.16.00.00
-unspsc7#23.11.16.05.00#Gasoline hydrotreater#23.11.16.00.00
-unspsc7#23.11.16.06.00#Resid hydrotreater#23.11.16.00.00
-unspsc7#23.12.00.00.00#Textile and fabric machinery and accessories#23.00.00.00.00
-unspsc7#23.12.15.00.00#Textile processing machinery and accessories#23.12.00.00.00
-unspsc7#23.12.15.01.00#Embroidery making machines#23.12.15.00.00
-unspsc7#23.12.15.02.00#Felting machines#23.12.15.00.00
-unspsc7#23.12.15.03.00#Winding or reeling or spooling machines#23.12.15.00.00
-unspsc7#23.12.15.04.00#Twisting machines#23.12.15.00.00
-unspsc7#23.12.15.05.00#Stitch bonding machines#23.12.15.00.00
-unspsc7#23.12.15.06.00#Knitting machines#23.12.15.00.00
-unspsc7#23.12.15.07.00#Weaving machines#23.12.15.00.00
-unspsc7#23.12.15.08.00#Finishing machines#23.12.15.00.00
-unspsc7#23.12.15.09.00#Spinning machines#23.12.15.00.00
-unspsc7#23.12.15.10.00#Lace making machines#23.12.15.00.00
-unspsc7#23.12.16.00.00#Textile working machinery and equipment and accessories#23.12.00.00.00
-unspsc7#23.12.16.01.00#Button covering machines#23.12.16.00.00
-unspsc7#23.12.16.02.00#Button sewing machines#23.12.16.00.00
-unspsc7#23.12.16.03.00#Buttonhole machines#23.12.16.00.00
-unspsc7#23.12.16.04.00#Cloth cutting machines#23.12.16.00.00
-unspsc7#23.12.16.05.00#Cushion filling machines#23.12.16.00.00
-unspsc7#23.12.16.06.00#Folding or rewinding machines#23.12.16.00.00
-unspsc7#23.12.16.07.00#Bleaching machines#23.12.16.00.00
-unspsc7#23.12.16.08.00#Fabric or cloth folding machines#23.12.16.00.00
-unspsc7#23.12.16.09.00#Reeling or unreeling machines#23.12.16.00.00
-unspsc7#23.12.16.10.00#Dyeing machines#23.12.16.00.00
-unspsc7#23.12.16.11.00#Cutting or pinking machines#23.12.16.00.00
-unspsc7#23.12.16.12.00#Sewing machine needles#23.12.16.00.00
-unspsc7#23.12.16.13.00#Silk processing machines#23.12.16.00.00
-unspsc7#23.12.16.14.00#Sewing machines#23.12.16.00.00
-unspsc7#23.12.16.15.00#Fabric cutting tables#23.12.16.00.00
-unspsc7#23.13.00.00.00#Lapidary machinery and equipment#23.00.00.00.00
-unspsc7#23.13.15.00.00#Grinding and sanding and polishing equipment and supplies#23.13.00.00.00
-unspsc7#23.13.15.01.00#Abrasive compounds#23.13.15.00.00
-unspsc7#23.13.15.02.00#Felt wheels#23.13.15.00.00
-unspsc7#23.13.15.03.00#Grinding wheels#23.13.15.00.00
-unspsc7#23.13.15.04.00#Polishing compounds#23.13.15.00.00
-unspsc7#23.13.15.05.00#Polishing heads#23.13.15.00.00
-unspsc7#23.13.15.06.00#Polishing wheels#23.13.15.00.00
-unspsc7#23.13.15.07.00#Sanding cloths#23.13.15.00.00
-unspsc7#23.13.15.08.00#Sanding drums#23.13.15.00.00
-unspsc7#23.13.15.09.00#Tumblers or polishers#23.13.15.00.00
-unspsc7#23.13.15.10.00#Tumbling supplies or media#23.13.15.00.00
-unspsc7#23.13.15.11.00#Water swivels#23.13.15.00.00
-unspsc7#23.13.15.12.00#Water trays#23.13.15.00.00
-unspsc7#23.13.15.13.00#Sanding blocks#23.13.15.00.00
-unspsc7#23.13.15.14.00#Mounted stones#23.13.15.00.00
-unspsc7#23.13.15.15.00#Grinding wheel dressers#23.13.15.00.00
-unspsc7#23.13.16.00.00#Faceting equipment and accessories#23.13.00.00.00
-unspsc7#23.13.16.01.00#Faceting accessories#23.13.16.00.00
-unspsc7#23.13.16.02.00#Faceting machines#23.13.16.00.00
-unspsc7#23.13.16.03.00#Faceting laps#23.13.16.00.00
-unspsc7#23.13.16.04.00#Faceting saws#23.13.16.00.00
-unspsc7#23.13.17.00.00#Cabbing equipment#23.13.00.00.00
-unspsc7#23.13.17.01.00#Cabbing accessories#23.13.17.00.00
-unspsc7#23.13.17.02.00#Cabbing belts#23.13.17.00.00
-unspsc7#23.13.17.03.00#Cabbing discs#23.13.17.00.00
-unspsc7#23.13.17.04.00#Cabochon machines#23.13.17.00.00
-unspsc7#23.14.00.00.00#Leatherworking repairing machinery and equipment#23.00.00.00.00
-unspsc7#23.14.16.00.00#Leather preparing machinery and accessories#23.14.00.00.00
-unspsc7#23.14.16.01.00#Leather fleshing machines#23.14.16.00.00
-unspsc7#23.14.16.02.00#Leather tanning machines#23.14.16.00.00
-unspsc7#23.14.16.03.00#Leather dyeing machines#23.14.16.00.00
-unspsc7#23.14.16.04.00#Leather degreasing machines#23.14.16.00.00
-unspsc7#23.14.16.05.00#Leather presses#23.14.16.00.00
-unspsc7#23.14.17.00.00#Leather working and repairing machinery and accessories#23.14.00.00.00
-unspsc7#23.14.17.01.00#Leather cutting machines#23.14.17.00.00
-unspsc7#23.14.17.02.00#Leather riveting machines#23.14.17.00.00
-unspsc7#23.14.17.03.00#Leather nailing machines#23.14.17.00.00
-unspsc7#23.14.17.04.00#Leatherworking workshop equipment#23.14.17.00.00
-unspsc7#23.15.00.00.00#Industrial process machinery and equipment and supplies#23.00.00.00.00
-unspsc7#23.15.15.00.00#Rubber and plastic processing machinery and equipment and supplies#23.15.00.00.00
-unspsc7#23.15.15.01.00#Blow molding machines#23.15.15.00.00
-unspsc7#23.15.15.02.00#Coating machines#23.15.15.00.00
-unspsc7#23.15.15.03.00#Extruders#23.15.15.00.00
-unspsc7#23.15.15.04.00#Injection molding machines#23.15.15.00.00
-unspsc7#23.15.15.05.00#Rubber or plastic mixers#23.15.15.00.00
-unspsc7#23.15.15.06.00#Rubber or plastic presses#23.15.15.00.00
-unspsc7#23.15.15.07.00#Thermo forming machines#23.15.15.00.00
-unspsc7#23.15.15.08.00#Vacuum molding machines#23.15.15.00.00
-unspsc7#23.15.15.09.00#Vulcanizing machines#23.15.15.00.00
-unspsc7#23.15.15.10.00#Plastic cutting machinery#23.15.15.00.00
-unspsc7#23.15.15.11.00#Plastic grinding machinery#23.15.15.00.00
-unspsc7#23.15.15.12.00#Rubber or plastic mills#23.15.15.00.00
-unspsc7#23.15.15.13.00#Rubber or plastic extrusion dies#23.15.15.00.00
-unspsc7#23.15.15.14.00#Plastic injection molds#23.15.15.00.00
-unspsc7#23.15.15.15.00#Thermoforming molds#23.15.15.00.00
-unspsc7#23.15.15.16.00#Ejector pins#23.15.15.00.00
-unspsc7#23.15.16.00.00#Cement and ceramics and glass industry machinery and equipment and supplies#23.15.00.00.00
-unspsc7#23.15.16.01.00#Blowers or dryers#23.15.16.00.00
-unspsc7#23.15.16.02.00#Crushers#23.15.16.00.00
-unspsc7#23.15.16.03.00#Fusion welding or glass drawing machines#23.15.16.00.00
-unspsc7#23.15.16.04.00#Grinding or polishing machines#23.15.16.00.00
-unspsc7#23.15.16.05.00#Mixing or kneading machines#23.15.16.00.00
-unspsc7#23.15.16.06.00#Cement or ceramic or glass or similar material molding machines#23.15.16.00.00
-unspsc7#23.15.16.07.00#Presses#23.15.16.00.00
-unspsc7#23.15.16.08.00#Sifters#23.15.16.00.00
-unspsc7#23.15.17.00.00#Optical industry machinery and equipment and supplies#23.15.00.00.00
-unspsc7#23.15.17.01.00#Lens grinding machines#23.15.17.00.00
-unspsc7#23.15.17.02.00#Lens measuring equipment#23.15.17.00.00
-unspsc7#23.15.17.03.00#Lens polishing equipment#23.15.17.00.00
-unspsc7#23.15.17.04.00#Lens testing equipment#23.15.17.00.00
-unspsc7#23.15.17.05.00#Optical vacuum coating equipment#23.15.17.00.00
-unspsc7#23.15.18.00.00#Pharmaceutical industry machinery and equipment and supplies#23.15.00.00.00
-unspsc7#23.15.18.01.00#Ampoule filling equipment#23.15.18.00.00
-unspsc7#23.15.18.02.00#Bottle cappers or cotton inserters or safety seal applicators#23.15.18.00.00
-unspsc7#23.15.18.03.00#Capsulating machines#23.15.18.00.00
-unspsc7#23.15.18.04.00#Reactors or fermenters or digesters#23.15.18.00.00
-unspsc7#23.15.18.05.00#Filling or sealing auger dose machines#23.15.18.00.00
-unspsc7#23.15.18.06.00#Pharmaceutical filters or ultra filters#23.15.18.00.00
-unspsc7#23.15.18.07.00#Freezedryers or lyophilzers#23.15.18.00.00
-unspsc7#23.15.18.08.00#Pharmaceutical granulators#23.15.18.00.00
-unspsc7#23.15.18.09.00#Phamaceutical sieve or screening machines#23.15.18.00.00
-unspsc7#23.15.18.10.00#Sterile or aseptic processing or filling machines#23.15.18.00.00
-unspsc7#23.15.18.11.00#Tablet or capsule testing machines#23.15.18.00.00
-unspsc7#23.15.18.12.00#Tablet counters#23.15.18.00.00
-unspsc7#23.15.18.13.00#Tabletting machines#23.15.18.00.00
-unspsc7#23.15.18.14.00#Vaccine production equipment#23.15.18.00.00
-unspsc7#23.15.18.15.00#Vessel mixers#23.15.18.00.00
-unspsc7#23.15.19.00.00#Paper making and paper processing machinery and equipment and supplies#23.15.00.00.00
-unspsc7#23.15.19.01.00#Cutters#23.15.19.00.00
-unspsc7#23.15.19.02.00#Slitters#23.15.19.00.00
-unspsc7#23.15.19.03.00#Washing or dewatering machines#23.15.19.00.00
-unspsc7#23.15.19.04.00#Winders#23.15.19.00.00
-unspsc7#23.15.19.05.00#Wood pulp or dissolver machines#23.15.19.00.00
-unspsc7#23.15.19.06.00#Calenders for paper or cardboard making#23.15.19.00.00
-unspsc7#23.15.20.00.00#Web handling and control machinery and equipment and supplies#23.15.00.00.00
-unspsc7#23.15.20.01.00#Corona treaters#23.15.20.00.00
-unspsc7#23.15.20.02.00#Flame treaters#23.15.20.00.00
-unspsc7#23.15.21.00.00#Separation machinery and equipment#23.15.00.00.00
-unspsc7#23.15.21.01.00#Vibratory separation equipment and parts and screens#23.15.21.00.00
-unspsc7#23.15.21.02.00#Stationary separation equipment and parts and screens#23.15.21.00.00
-unspsc7#23.15.21.03.00#Air classification equipment and parts and screens#23.15.21.00.00
-unspsc7#23.15.21.04.00#Centifugal separation equipment or parts or screens#23.15.21.00.00
-unspsc7#23.15.22.00.00#Manufacturing tables and stands#23.15.00.00.00
-unspsc7#23.15.22.01.00#Rotary tables#23.15.22.00.00
-unspsc7#23.15.22.02.00#Stack stands#23.15.22.00.00
-unspsc7#23.15.22.03.00#Engine and component test stands#23.15.22.00.00
-unspsc7#23.15.22.04.00#Machine guarding#23.15.22.00.00
-unspsc7#23.15.23.00.00#Rotary tables#23.15.00.00.00
-unspsc7#23.15.24.00.00#Stack stands#23.15.00.00.00
-unspsc7#23.15.25.00.00#Engine and component test stands#23.15.00.00.00
-unspsc7#23.15.26.00.00#Machine guarding#23.15.00.00.00
-unspsc7#23.15.27.00.00#Air classification equipment and parts and screens#23.15.00.00.00
-unspsc7#23.15.28.00.00#Centifugal separation equipment or parts or screens#23.15.00.00.00
-unspsc7#23.15.29.00.00#Packaging machinery#23.15.00.00.00
-unspsc7#23.15.29.01.00#Wrapping machinery#23.15.29.00.00
-unspsc7#23.15.29.02.00#Form or fill or seal machinery#23.15.29.00.00
-unspsc7#23.15.29.03.00#Packaging vacuum#23.15.29.00.00
-unspsc7#23.15.30.00.00#Holding and positioning and guiding systems and devices#23.15.00.00.00
-unspsc7#23.15.30.01.00#Calibration jig#23.15.30.00.00
-unspsc7#23.15.30.02.00#Guide jig#23.15.30.00.00
-unspsc7#23.15.30.03.00#Master jig#23.15.30.00.00
-unspsc7#23.15.30.04.00#Needle jig#23.15.30.00.00
-unspsc7#23.15.30.05.00#Shaft jig#23.15.30.00.00
-unspsc7#23.15.30.06.00#Checking jig#23.15.30.00.00
-unspsc7#23.15.30.07.00#Setting jig#23.15.30.00.00
-unspsc7#23.15.30.08.00#Camera jig#23.15.30.00.00
-unspsc7#23.15.30.09.00#Pickup jig#23.15.30.00.00
-unspsc7#23.15.30.10.00#Removal jig#23.15.30.00.00
-unspsc7#23.15.30.11.00#Nozzle jig#23.15.30.00.00
-unspsc7#23.15.30.12.00#Sliding jig#23.15.30.00.00
-unspsc7#23.15.30.13.00#Centering jig#23.15.30.00.00
-unspsc7#23.15.30.14.00#Inspecting jig#23.15.30.00.00
-unspsc7#23.15.30.15.00#Feeder jig#23.15.30.00.00
-unspsc7#23.15.30.16.00#Clutch jig#23.15.30.00.00
-unspsc7#23.15.30.17.00#Alignment jig#23.15.30.00.00
-unspsc7#23.15.30.18.00#Positioning jig#23.15.30.00.00
-unspsc7#23.15.30.19.00#Lifter plate#23.15.30.00.00
-unspsc7#23.15.30.20.00#Tape guide#23.15.30.00.00
-unspsc7#23.15.30.21.00#Tape feed jaw#23.15.30.00.00
-unspsc7#23.15.30.22.00#Power feeder#23.15.30.00.00
-unspsc7#23.15.30.23.00#Feeder harness#23.15.30.00.00
-unspsc7#23.15.30.24.00#Feed jaw#23.15.30.00.00
-unspsc7#23.15.30.25.00#Mechanical gripper#23.15.30.00.00
-unspsc7#23.15.30.26.00#Holder jaw#23.15.30.00.00
-unspsc7#23.15.30.27.00#Jaw assembly#23.15.30.00.00
-unspsc7#23.15.30.28.00#Stationary jaw#23.15.30.00.00
-unspsc7#23.15.30.29.00#Jig block#23.15.30.00.00
-unspsc7#23.15.30.30.00#Linear motion guides#23.15.30.00.00
-unspsc7#23.15.30.31.00#Measuring jigs#23.15.30.00.00
-unspsc7#23.15.30.32.00#Ring jigs#23.15.30.00.00
-unspsc7#23.15.31.00.00#Industrial machinery components#23.15.00.00.00
-unspsc7#23.15.31.01.00#Pitch stopper#23.15.31.00.00
-unspsc7#23.15.31.02.00#Paper stopper#23.15.31.00.00
-unspsc7#23.15.31.03.00#Stopper pad#23.15.31.00.00
-unspsc7#23.16.00.00.00#Foundry  machines and equipment and supplies#23.00.00.00.00
-unspsc7#23.16.15.00.00#Foundry machines and equipment#23.16.00.00.00
-unspsc7#23.16.15.01.00#Foundry blowers#23.16.15.00.00
-unspsc7#23.16.15.02.00#Foundry burners#23.16.15.00.00
-unspsc7#23.16.15.03.00#Core drying ovens#23.16.15.00.00
-unspsc7#23.16.15.04.00#Forging presses#23.16.15.00.00
-unspsc7#23.16.15.05.00#Hot metal mixers#23.16.15.00.00
-unspsc7#23.16.15.06.00#Foundry crucibles#23.16.15.00.00
-unspsc7#23.16.15.07.00#Foundry converters#23.16.15.00.00
-unspsc7#23.16.15.08.00#Open die forging press#23.16.15.00.00
-unspsc7#23.16.15.09.00#Forging stamping machines#23.16.15.00.00
-unspsc7#23.16.15.10.00#Casting machines#23.16.15.00.00
-unspsc7#23.16.15.11.00#Forging rolls#23.16.15.00.00
-unspsc7#23.16.15.12.00#Radial forging machines#23.16.15.00.00
-unspsc7#23.16.15.13.00#Cold forming presses#23.16.15.00.00
-unspsc7#23.16.15.14.00#Sizing or embossing presses#23.16.15.00.00
-unspsc7#23.16.15.15.00#End forging machines#23.16.15.00.00
-unspsc7#23.16.16.00.00#Foundry supplies#23.16.00.00.00
-unspsc7#23.16.16.01.00#Foundry bellows#23.16.16.00.00
-unspsc7#23.16.16.02.00#Foundry clays#23.16.16.00.00
-unspsc7#23.16.16.03.00#Foundry flasks#23.16.16.00.00
-unspsc7#23.16.16.04.00#Foundry fluxes#23.16.16.00.00
-unspsc7#23.16.16.05.00#Foundry ladles#23.16.16.00.00
-unspsc7#23.16.16.06.00#Foundry molds#23.16.16.00.00
-unspsc7#23.16.16.07.00#Foundry sand#23.16.16.00.00
-unspsc7#23.16.16.08.00#Foundry shovels#23.16.16.00.00
-unspsc7#23.17.00.00.00#Workshop machinery and equipment and supplies#23.00.00.00.00
-unspsc7#23.17.15.00.00#Soldering and brazing and welding machinery and supplies#23.17.00.00.00
-unspsc7#23.17.15.01.00#Anti spatter sprays#23.17.15.00.00
-unspsc7#23.17.15.02.00#Gas welding or brazing rods#23.17.15.00.00
-unspsc7#23.17.15.03.00#Filler metal#23.17.15.00.00
-unspsc7#23.17.15.04.00#Blow pipes#23.17.15.00.00
-unspsc7#23.17.15.05.00#Iron powder#23.17.15.00.00
-unspsc7#23.17.15.06.00#Soldering fluid#23.17.15.00.00
-unspsc7#23.17.15.07.00#Soldering irons or guns#23.17.15.00.00
-unspsc7#23.17.15.08.00#Welders#23.17.15.00.00
-unspsc7#23.17.15.09.00#Solder#23.17.15.00.00
-unspsc7#23.17.15.10.00#Welding wire#23.17.15.00.00
-unspsc7#23.17.15.11.00#Welding tools#23.17.15.00.00
-unspsc7#23.17.15.12.00#Welding rods#23.17.15.00.00
-unspsc7#23.17.15.13.00#Welding rectifiers#23.17.15.00.00
-unspsc7#23.17.15.14.00#Welding generators#23.17.15.00.00
-unspsc7#23.17.15.15.00#Welding electrodes#23.17.15.00.00
-unspsc7#23.17.15.17.00#Blow torches#23.17.15.00.00
-unspsc7#23.17.15.18.00#Plasma welding machinery#23.17.15.00.00
-unspsc7#23.17.15.19.00#Tungsten inert gas (TIG) welding machinery#23.17.15.00.00
-unspsc7#23.17.15.20.00#Ultrasound welding machinery#23.17.15.00.00
-unspsc7#23.17.15.21.00#Laser welding machinery#23.17.15.00.00
-unspsc7#23.17.15.22.00#Soldering fluxes#23.17.15.00.00
-unspsc7#23.17.15.23.00#Temperature indicating sticks#23.17.15.00.00
-unspsc7#23.17.15.24.00#Braze rings#23.17.15.00.00
-unspsc7#23.17.15.25.00#Soldering tips#23.17.15.00.00
-unspsc7#23.17.15.26.00#Desoldering tips#23.17.15.00.00
-unspsc7#23.17.15.27.00#Desoldering braid#23.17.15.00.00
-unspsc7#23.17.15.28.00#Welding screens or curtains#23.17.15.00.00
-unspsc7#23.17.15.29.00#Welding or soldering kit#23.17.15.00.00
-unspsc7#23.17.15.30.00#Soldering or desoldering or combined stations#23.17.15.00.00
-unspsc7#23.17.15.31.00#Desoldering Gun#23.17.15.00.00
-unspsc7#23.17.16.00.00#Machine tools#23.17.00.00.00
-unspsc7#23.17.16.01.00#Boring tools#23.17.16.00.00
-unspsc7#23.17.16.02.00#Bar or rod cutters#23.17.16.00.00
-unspsc7#23.17.16.03.00#Pipe or tube cutters#23.17.16.00.00
-unspsc7#23.17.16.04.00#Wire or cable cutters#23.17.16.00.00
-unspsc7#23.17.16.05.00#Deburring equipment#23.17.16.00.00
-unspsc7#23.17.16.06.00#Lathes#23.17.16.00.00
-unspsc7#23.17.16.07.00#Lathe tools or dies#23.17.16.00.00
-unspsc7#23.17.16.08.00#Laser cutting tools#23.17.16.00.00
-unspsc7#23.17.16.09.00#Twist drills#23.17.16.00.00
-unspsc7#23.17.16.10.00#Reamers#23.17.16.00.00
-unspsc7#23.17.16.11.00#Counterbores#23.17.16.00.00
-unspsc7#23.17.16.12.00#Milling cutters#23.17.16.00.00
-unspsc7#23.17.16.13.00#Hobs#23.17.16.00.00
-unspsc7#23.17.16.14.00#Gear shapers#23.17.16.00.00
-unspsc7#23.17.16.15.00#Shaving cutters#23.17.16.00.00
-unspsc7#23.17.16.16.00#Water jet cutting machines#23.17.16.00.00
-unspsc7#23.17.16.17.00#Broaching tools#23.17.16.00.00
-unspsc7#23.17.16.18.00#Indexable inserts#23.17.16.00.00
-unspsc7#23.17.16.19.00#Boring tools#23.17.16.00.00
-unspsc7#23.17.16.20.00#Broaches#23.17.16.00.00
-unspsc7#23.17.16.21.00#Insertion tools#23.17.16.00.00
-unspsc7#23.17.16.22.00#Workshop presses#23.17.16.00.00
-unspsc7#23.17.17.00.00#Metal bending and forming machinery#23.17.00.00.00
-unspsc7#23.17.17.01.00#Tangent benders#23.17.17.00.00
-unspsc7#23.17.17.02.00#Wing benders#23.17.17.00.00
-unspsc7#23.17.17.03.00#Tube bending machinery#23.17.17.00.00
-unspsc7#23.17.17.04.00#Pipe bending mandrels#23.17.17.00.00
-unspsc7#23.17.17.05.00#Die bends#23.17.17.00.00
-unspsc7#23.17.17.06.00#Sequential forming machines#23.17.17.00.00
-unspsc7#23.17.17.07.00#Tube end finishers#23.17.17.00.00
-unspsc7#23.17.17.08.00#Machine mounting#23.17.17.00.00
-unspsc7#23.17.18.00.00#Metal fabricating dies#23.17.00.00.00
-unspsc7#23.17.18.01.00#Stamping or forming dies#23.17.18.00.00
-unspsc7#23.17.18.02.00#Die casting dies#23.17.18.00.00
-unspsc7#23.17.18.03.00#Metal extrusion dies#23.17.18.00.00
-unspsc7#23.17.18.04.00#Cutting dies or tooling#23.17.18.00.00
-unspsc7#23.17.18.05.00#Rotary dies#23.17.18.00.00
-unspsc7#23.17.18.06.00#Steel rule dies#23.17.18.00.00
-unspsc7#23.17.19.00.00#Special tooling fixtures#23.17.00.00.00
-unspsc7#23.17.19.01.00#Holding fixtures#23.17.19.00.00
-unspsc7#23.17.19.02.00#Gauges and inspection fixtures#23.17.19.00.00
-unspsc7#23.17.19.03.00#Fabricated tooling fixtures#23.17.19.00.00
-unspsc7#23.17.19.04.00#Casting tooling#23.17.19.00.00
-unspsc7#23.17.19.05.00#Forging tooling#23.17.19.00.00
-unspsc7#23.17.19.06.00#Assembly or disassembly tooling#23.17.19.00.00
-unspsc7#23.17.20.00.00#Metal working machinery attachments#23.17.00.00.00
-unspsc7#23.17.20.01.00#Burrs#23.17.20.00.00
-unspsc7#23.17.20.02.00#Form Relief#23.17.20.00.00
-unspsc7#23.17.20.03.00#Machine threading taps#23.17.20.00.00
-unspsc7#23.17.20.04.00#Machine threading dies#23.17.20.00.00
-unspsc7#23.17.20.05.00#Machine end mills#23.17.20.00.00
-unspsc7#23.17.20.06.00#Metal stamps or punches#23.17.20.00.00
-unspsc7#23.17.20.07.00#Metal cutting band saw blades#23.17.20.00.00
-unspsc7#23.17.20.08.00#Metal cutting circular saw blades#23.17.20.00.00
-unspsc7#23.17.20.09.00#Carbide inserts#23.17.20.00.00
-unspsc7#23.17.20.10.00#Ceramic inserts#23.17.20.00.00
-unspsc7#23.17.20.11.00#Steel inserts#23.17.20.00.00
-unspsc7#23.17.20.12.00#Diamond inserts#23.17.20.00.00
-unspsc7#23.17.20.13.00#Threading mills#23.17.20.00.00
-unspsc7#23.17.21.00.00#Holding fixtures#23.17.00.00.00
-unspsc7#23.17.22.00.00#Gauges and inspection fixtures#23.17.00.00.00
-unspsc7#23.17.23.00.00#Fabricated tooling fixtures#23.17.00.00.00
-unspsc7#23.17.24.00.00#Casting tooling#23.17.00.00.00
-unspsc7#23.17.25.00.00#Forging tooling#23.17.00.00.00
-unspsc7#23.17.26.00.00#Assembly or disassembly tooling#23.17.00.00.00
-unspsc7#23.18.00.00.00#Industrial food and beverage equipment#23.00.00.00.00
-unspsc7#23.18.15.00.00#Food preparation machinery#23.18.00.00.00
-unspsc7#23.18.15.01.00#Filling machinery#23.18.15.00.00
-unspsc7#23.18.15.02.00#Milling machinery#23.18.15.00.00
-unspsc7#23.18.15.03.00#Mixing machinery#23.18.15.00.00
-unspsc7#23.18.15.04.00#Sifting machinery#23.18.15.00.00
-unspsc7#23.18.15.05.00#Dehydrating machinery#23.18.15.00.00
-unspsc7#23.18.15.06.00#Washing machinery#23.18.15.00.00
-unspsc7#23.18.15.07.00#Crushing machinery#23.18.15.00.00
-unspsc7#23.18.15.08.00#Blanching machinery#23.18.15.00.00
-unspsc7#23.18.15.09.00#Sorting machinery#23.18.15.00.00
-unspsc7#23.18.15.10.00#Meat tyers#23.18.15.00.00
-unspsc7#23.18.16.00.00#Food cutting machinery#23.18.00.00.00
-unspsc7#23.18.16.01.00#Dicing machinery#23.18.16.00.00
-unspsc7#23.18.16.02.00#Slicing machinery#23.18.16.00.00
-unspsc7#23.18.16.03.00#Chopping machinery#23.18.16.00.00
-unspsc7#23.18.16.04.00#Cutting machinery#23.18.16.00.00
-unspsc7#23.18.16.05.00#Grating machinery#23.18.16.00.00
-unspsc7#23.18.16.06.00#Peeling machinery#23.18.16.00.00
-unspsc7#23.18.17.00.00#Food cooking and smoking machinery#23.18.00.00.00
-unspsc7#23.18.17.01.00#Smoking machinery#23.18.17.00.00
-unspsc7#23.18.17.02.00#Roasting machinery#23.18.17.00.00
-unspsc7#23.18.17.03.00#Cooking machinery#23.18.17.00.00
-unspsc7#23.18.17.04.00#Steaming machinery#23.18.17.00.00
-unspsc7#23.18.18.00.00#Industrial beverage processing machinery#23.18.00.00.00
-unspsc7#23.18.18.01.00#Coffee brewing equipment or supplies#23.18.18.00.00
-unspsc7#23.18.18.02.00#Juicing machinery#23.18.18.00.00
-unspsc7#23.18.18.03.00#Ice making machines#23.18.18.00.00
-unspsc7#23.18.18.04.00#Ice cream machines#23.18.18.00.00
-unspsc7#23.19.00.00.00#Mixers and their parts and accessories#23.00.00.00.00
-unspsc7#23.19.10.00.00#Batch mixers#23.19.00.00.00
-unspsc7#23.19.10.01.00#Change can mixers#23.19.10.00.00
-unspsc7#23.19.10.02.00#Helical blade mixer#23.19.10.00.00
-unspsc7#23.19.10.03.00#Double arm kneading mixers#23.19.10.00.00
-unspsc7#23.19.10.04.00#Intensive mixers#23.19.10.00.00
-unspsc7#23.19.10.05.00#Roll mixers#23.19.10.00.00
-unspsc7#23.19.11.00.00#Continuous mixers#23.19.00.00.00
-unspsc7#23.19.11.01.00#Single screw mixers#23.19.11.00.00
-unspsc7#23.19.11.02.00#Twin screw extruder#23.19.11.00.00
-unspsc7#23.20.00.00.00#Mass transfer equipment#23.00.00.00.00
-unspsc7#23.20.10.00.00#Gas liquid contacting systems#23.20.00.00.00
-unspsc7#23.20.10.01.00#Plate columns#23.20.10.00.00
-unspsc7#23.20.10.02.00#Packed columns#23.20.10.00.00
-unspsc7#23.20.10.03.00#Liquid dispersed contactor#23.20.10.00.00
-unspsc7#23.20.10.04.00#Wetted wall column#23.20.10.00.00
-unspsc7#23.20.10.05.00#Bubble columns#23.20.10.00.00
-unspsc7#23.20.11.00.00#Adsorption and ion exchange#23.20.00.00.00
-unspsc7#23.20.11.01.00#Adsorber vessel#23.20.11.00.00
-unspsc7#23.20.11.02.00#Ambient pressure adsorber vessel#23.20.11.00.00
-unspsc7#23.21.00.00.00#Electronic manufacturing machinery and equipment and accessories#23.00.00.00.00
-unspsc7#23.21.10.00.00#Electronic assembly machinery and support equipment#23.21.00.00.00
-unspsc7#23.21.10.01.00#Chip placers#23.21.10.00.00
-unspsc7#23.21.10.02.00#Glue dispensing machinery#23.21.10.00.00
-unspsc7#24.00.00.00.00#Material Handling and Conditioning and Storage Machinery and their Accessories and Supplies#24.00.00.00.00
-unspsc7#24.10.00.00.00#Material handling machinery and equipment#24.00.00.00.00
-unspsc7#24.10.15.00.00#Industrial trucks#24.10.00.00.00
-unspsc7#24.10.15.01.00#Carts#24.10.15.00.00
-unspsc7#24.10.15.02.00#Bulk transporters#24.10.15.00.00
-unspsc7#24.10.15.03.00#Dollies#24.10.15.00.00
-unspsc7#24.10.15.04.00#Hand trucks or accessories#24.10.15.00.00
-unspsc7#24.10.15.05.00#Pallet trucks#24.10.15.00.00
-unspsc7#24.10.15.06.00#Pushcarts#24.10.15.00.00
-unspsc7#24.10.15.07.00#Wheelbarrows#24.10.15.00.00
-unspsc7#24.10.15.08.00#Creepers#24.10.15.00.00
-unspsc7#24.10.15.09.00#Wagons#24.10.15.00.00
-unspsc7#24.10.15.10.00#Tilt trucks#24.10.15.00.00
-unspsc7#24.10.15.11.00#Shelf trolleys#24.10.15.00.00
-unspsc7#24.10.16.00.00#Lifting equipment and accessories#24.10.00.00.00
-unspsc7#24.10.16.01.00#Elevators#24.10.16.00.00
-unspsc7#24.10.16.02.00#Hoists#24.10.16.00.00
-unspsc7#24.10.16.03.00#Forklifts#24.10.16.00.00
-unspsc7#24.10.16.04.00#Lifts#24.10.16.00.00
-unspsc7#24.10.16.05.00#Loading equipment#24.10.16.00.00
-unspsc7#24.10.16.06.00#Stackers#24.10.16.00.00
-unspsc7#24.10.16.07.00#Cranes#24.10.16.00.00
-unspsc7#24.10.16.08.00#Winches#24.10.16.00.00
-unspsc7#24.10.16.09.00#Tilts#24.10.16.00.00
-unspsc7#24.10.16.10.00#Manipulators#24.10.16.00.00
-unspsc7#24.10.16.11.00#Slings#24.10.16.00.00
-unspsc7#24.10.16.12.00#Jacks#24.10.16.00.00
-unspsc7#24.10.16.13.00#Blocks or pulleys#24.10.16.00.00
-unspsc7#24.10.16.14.00#Air bags for loading#24.10.16.00.00
-unspsc7#24.10.16.15.00#Loading ramps#24.10.16.00.00
-unspsc7#24.10.16.16.00#Below the hook device#24.10.16.00.00
-unspsc7#24.10.16.17.00#Scissor lift#24.10.16.00.00
-unspsc7#24.10.16.18.00#Pipe layer#24.10.16.00.00
-unspsc7#24.10.16.19.00#Bridge cranes#24.10.16.00.00
-unspsc7#24.10.16.20.00#Track cranes#24.10.16.00.00
-unspsc7#24.10.16.21.00#All terrain cranes#24.10.16.00.00
-unspsc7#24.10.16.22.00#Rough terrain cranes#24.10.16.00.00
-unspsc7#24.10.16.23.00#Tower cranes#24.10.16.00.00
-unspsc7#24.10.16.24.00#Hydraulic truck cranes#24.10.16.00.00
-unspsc7#24.10.16.25.00#Conventional truck cranes#24.10.16.00.00
-unspsc7#24.10.16.26.00#Escalator or walkways#24.10.16.00.00
-unspsc7#24.10.16.27.00#Girder trolleys#24.10.16.00.00
-unspsc7#24.10.16.28.00#Adjustable forks#24.10.16.00.00
-unspsc7#24.10.16.29.00#Forklift accessories or supplies#24.10.16.00.00
-unspsc7#24.10.16.30.00#Workshop cranes#24.10.16.00.00
-unspsc7#24.10.16.31.00#Suction cups#24.10.16.00.00
-unspsc7#24.10.16.32.00#Side shifts#24.10.16.00.00
-unspsc7#24.10.17.00.00#Conveyors and accessories#24.10.00.00.00
-unspsc7#24.10.17.01.00#Conveyor roller#24.10.17.00.00
-unspsc7#24.10.17.02.00#Ball transfer tables#24.10.17.00.00
-unspsc7#24.10.17.03.00#Rock bins#24.10.17.00.00
-unspsc7#24.10.17.04.00#Conveyor feeders#24.10.17.00.00
-unspsc7#24.10.17.05.00#Conveyor screw#24.10.17.00.00
-unspsc7#24.10.17.06.00#Trolleys or accessories#24.10.17.00.00
-unspsc7#24.10.17.07.00#Conveyor rails#24.10.17.00.00
-unspsc7#24.10.17.08.00#Extendable conveyors#24.10.17.00.00
-unspsc7#24.10.17.09.00#Roller conveyors#24.10.17.00.00
-unspsc7#24.10.17.10.00#Package stops#24.10.17.00.00
-unspsc7#24.10.17.11.00#Turntables#24.10.17.00.00
-unspsc7#24.10.17.12.00#Belt conveyors#24.10.17.00.00
-unspsc7#24.10.17.13.00#Bucket conveyors#24.10.17.00.00
-unspsc7#24.10.17.14.00#Air conveyors#24.10.17.00.00
-unspsc7#24.10.17.15.00#Conveyor belting#24.10.17.00.00
-unspsc7#24.10.17.16.00#Conveyor pulleys#24.10.17.00.00
-unspsc7#24.10.17.17.00#Conveyor idlers#24.10.17.00.00
-unspsc7#24.10.17.18.00#Conveyor belt lacing or fasteners#24.10.17.00.00
-unspsc7#24.10.17.19.00#Conveyor belt brushes#24.10.17.00.00
-unspsc7#24.10.17.20.00#Wear strips#24.10.17.00.00
-unspsc7#24.10.17.21.00#Trolley lid#24.10.17.00.00
-unspsc7#24.10.17.22.00#Chain conveyors#24.10.17.00.00
-unspsc7#24.10.18.00.00#Dock equipment#24.10.00.00.00
-unspsc7#24.10.18.01.00#Dock levelers#24.10.18.00.00
-unspsc7#24.10.18.02.00#Dock seals#24.10.18.00.00
-unspsc7#24.10.18.03.00#Dock ramps#24.10.18.00.00
-unspsc7#24.10.18.04.00#Strip doors#24.10.18.00.00
-unspsc7#24.10.18.05.00#Dock bumpers#24.10.18.00.00
-unspsc7#24.10.18.06.00#Dock ladders#24.10.18.00.00
-unspsc7#24.10.18.07.00#Dock plates#24.10.18.00.00
-unspsc7#24.10.18.08.00#Wheel chocks#24.10.18.00.00
-unspsc7#24.10.18.09.00#Dock rails and accessories#24.10.18.00.00
-unspsc7#24.10.19.00.00#Drum handling equipment#24.10.00.00.00
-unspsc7#24.10.19.01.00#Drum openers#24.10.19.00.00
-unspsc7#24.10.19.02.00#Drum grabs#24.10.19.00.00
-unspsc7#24.10.19.03.00#Drum lifters#24.10.19.00.00
-unspsc7#24.10.19.04.00#Drum cradles#24.10.19.00.00
-unspsc7#24.10.19.05.00#Spill deck#24.10.19.00.00
-unspsc7#24.10.19.06.00#Drum recuperators#24.10.19.00.00
-unspsc7#24.10.19.07.00#Spill containment supports#24.10.19.00.00
-unspsc7#24.10.20.00.00#Shelving and storage#24.10.00.00.00
-unspsc7#24.10.20.01.00#Rack systems for rack mount electronic equipment#24.10.20.00.00
-unspsc7#24.10.20.02.00#Bin handlers#24.10.20.00.00
-unspsc7#24.10.20.03.00#Pallets#24.10.20.00.00
-unspsc7#24.10.20.04.00#Storage racks or shelves#24.10.20.00.00
-unspsc7#24.10.20.05.00#Automated storage or retrieval systems#24.10.20.00.00
-unspsc7#24.10.20.06.00#Work benches#24.10.20.00.00
-unspsc7#24.10.20.07.00#Reel storage shelves#24.10.20.00.00
-unspsc7#24.10.20.08.00#Portable reel holders#24.10.20.00.00
-unspsc7#24.10.21.00.00#Warehousing equipment and supplies#24.10.00.00.00
-unspsc7#24.10.21.01.00#Cargo handling equipment#24.10.21.00.00
-unspsc7#24.10.21.02.00#Warehouse carousels#24.10.21.00.00
-unspsc7#24.10.21.03.00#Warehouse casers#24.10.21.00.00
-unspsc7#24.10.21.04.00#Depalletizers#24.10.21.00.00
-unspsc7#24.10.21.05.00#Palletizers#24.10.21.00.00
-unspsc7#24.10.21.06.00#Industrial shrink wrap equipment#24.10.21.00.00
-unspsc7#24.10.21.07.00#Cartoning machinery#24.10.21.00.00
-unspsc7#24.10.21.08.00#Packaging compactors#24.10.21.00.00
-unspsc7#24.10.22.00.00#Packing tools#24.10.00.00.00
-unspsc7#24.10.22.01.00#Stretch film dispensers#24.10.22.00.00
-unspsc7#24.10.22.02.00#Box sealing tape dispensers#24.10.22.00.00
-unspsc7#24.10.22.03.00#Bag sealing tools and equipment#24.10.22.00.00
-unspsc7#24.10.22.04.00#Strapping dispenser#24.10.22.00.00
-unspsc7#24.10.22.05.00#Strapping tensioners or sealers#24.10.22.00.00
-unspsc7#24.10.22.06.00#Carton forming machines#24.10.22.00.00
-unspsc7#24.10.22.07.00#Taping machines#24.10.22.00.00
-unspsc7#24.11.00.00.00#Containers and storage#24.00.00.00.00
-unspsc7#24.11.15.00.00#Bags#24.11.00.00.00
-unspsc7#24.11.15.01.00#Canvas bags#24.11.15.00.00
-unspsc7#24.11.15.02.00#Paper bags#24.11.15.00.00
-unspsc7#24.11.15.03.00#Plastic bags#24.11.15.00.00
-unspsc7#24.11.15.04.00#Pouches#24.11.15.00.00
-unspsc7#24.11.15.05.00#Flexible intermediate bulk containers#24.11.15.00.00
-unspsc7#24.11.15.06.00#Laundry nets or bags#24.11.15.00.00
-unspsc7#24.11.15.07.00#Tool bags#24.11.15.00.00
-unspsc7#24.11.15.08.00#Tent bag#24.11.15.00.00
-unspsc7#24.11.16.00.00#Covers and caps#24.11.00.00.00
-unspsc7#24.11.18.00.00#Tanks and cylinders and their accessories#24.11.00.00.00
-unspsc7#24.11.18.01.00#Reservoirs#24.11.18.00.00
-unspsc7#24.11.18.02.00#Air or gas tanks or cylinders#24.11.18.00.00
-unspsc7#24.11.18.03.00#Storage tanks#24.11.18.00.00
-unspsc7#24.11.18.04.00#Calibrating tanks#24.11.18.00.00
-unspsc7#24.11.18.05.00#Chemical tanks#24.11.18.00.00
-unspsc7#24.11.18.06.00#Dip tanks#24.11.18.00.00
-unspsc7#24.11.18.07.00#Expansion tanks#24.11.18.00.00
-unspsc7#24.11.18.08.00#Fuel storage tanks#24.11.18.00.00
-unspsc7#24.11.18.09.00#Processing tanks#24.11.18.00.00
-unspsc7#24.11.18.10.00#Water storage tanks#24.11.18.00.00
-unspsc7#24.11.18.11.00#Carboys#24.11.18.00.00
-unspsc7#24.11.18.12.00#Containment basin#24.11.18.00.00
-unspsc7#24.11.18.13.00#Rinse tanks#24.11.18.00.00
-unspsc7#24.11.20.00.00#Bins and baskets#24.11.00.00.00
-unspsc7#24.11.20.01.00#Bins#24.11.20.00.00
-unspsc7#24.11.20.02.00#Baskets#24.11.20.00.00
-unspsc7#24.11.20.03.00#Non metallic bins#24.11.20.00.00
-unspsc7#24.11.20.04.00#Metallic bins#24.11.20.00.00
-unspsc7#24.11.20.05.00#Metallic baskets#24.11.20.00.00
-unspsc7#24.11.20.06.00#Non metallic baskets#24.11.20.00.00
-unspsc7#24.11.21.00.00#Casks and barrels and drums#24.11.00.00.00
-unspsc7#24.11.21.01.00#Casks#24.11.21.00.00
-unspsc7#24.11.21.02.00#Barrels#24.11.21.00.00
-unspsc7#24.11.21.03.00#Stainless steel drums#24.11.21.00.00
-unspsc7#24.11.21.04.00#Steel drums#24.11.21.00.00
-unspsc7#24.11.21.05.00#Polyethylene drums#24.11.21.00.00
-unspsc7#24.11.21.06.00#Composite drums#24.11.21.00.00
-unspsc7#24.11.21.07.00#Fiber drums#24.11.21.00.00
-unspsc7#24.11.21.08.00#Metallic drums#24.11.21.00.00
-unspsc7#24.11.21.09.00#Non metallic drums#24.11.21.00.00
-unspsc7#24.11.21.10.00#Intermediate bulk containers#24.11.21.00.00
-unspsc7#24.11.21.11.00#Stabilizer#24.11.21.00.00
-unspsc7#24.11.21.12.00#Drum lid#24.11.21.00.00
-unspsc7#24.11.22.00.00#Cans and pails#24.11.00.00.00
-unspsc7#24.11.22.01.00#Steel pails#24.11.22.00.00
-unspsc7#24.11.22.02.00#Gasoline cans#24.11.22.00.00
-unspsc7#24.11.22.03.00#Plastic pails#24.11.22.00.00
-unspsc7#24.11.22.04.00#Metallic pails#24.11.22.00.00
-unspsc7#24.11.22.05.00#Non metallic pails#24.11.22.00.00
-unspsc7#24.11.22.06.00#Metallic flammable liquid cans#24.11.22.00.00
-unspsc7#24.11.22.07.00#Non metallic flammable liquid cans#24.11.22.00.00
-unspsc7#24.11.22.08.00#Spray kit#24.11.22.00.00
-unspsc7#24.11.22.09.00#Jerrycans#24.11.22.00.00
-unspsc7#24.11.24.00.00#Storage chests and cabinets and trunks#24.11.00.00.00
-unspsc7#24.11.24.01.00#Tool chests or boxes or cabinets#24.11.24.00.00
-unspsc7#24.11.24.02.00#Hazardous materials cabinets#24.11.24.00.00
-unspsc7#24.11.24.03.00#Tool belts#24.11.24.00.00
-unspsc7#24.11.24.04.00#Box#24.11.24.00.00
-unspsc7#24.11.24.05.00#Drawers#24.11.24.00.00
-unspsc7#24.11.24.06.00#Box or shelf partitions#24.11.24.00.00
-unspsc7#24.11.24.07.00#Mail boxes#24.11.24.00.00
-unspsc7#24.11.24.08.00#Antistatic boxes#24.11.24.00.00
-unspsc7#24.11.24.09.00#Box lids#24.11.24.00.00
-unspsc7#24.11.25.00.00#Corrugated and other boxes for distribution#24.11.00.00.00
-unspsc7#24.11.25.01.00#Slotted corrugated cartons#24.11.25.00.00
-unspsc7#24.11.25.02.00#One piece die cut shipping cartons#24.11.25.00.00
-unspsc7#24.11.25.03.00#Die cut corrugated shipping cartons with separate lids#24.11.25.00.00
-unspsc7#24.11.25.04.00#Molded boxes#24.11.25.00.00
-unspsc7#24.11.25.05.00#Rigid boxes#24.11.25.00.00
-unspsc7#24.11.25.06.00#Flexible intermediate bulk containers#24.11.25.00.00
-unspsc7#24.11.25.07.00#Intermediate bulk containers#24.11.25.00.00
-unspsc7#24.11.26.00.00#Liquid containers#24.11.00.00.00
-unspsc7#24.11.26.01.00#Jugs#24.11.26.00.00
-unspsc7#24.11.26.02.00#Jars#24.11.26.00.00
-unspsc7#24.12.00.00.00#Packaging materials#24.00.00.00.00
-unspsc7#24.12.15.00.00#Packaging boxes and bags and pouches#24.12.00.00.00
-unspsc7#24.12.15.01.00#Poly bags#24.12.15.00.00
-unspsc7#24.12.15.02.00#Packaging pouches or bags#24.12.15.00.00
-unspsc7#24.12.15.03.00#Packaging boxes#24.12.15.00.00
-unspsc7#24.12.15.04.00#Carded packaging#24.12.15.00.00
-unspsc7#24.12.15.05.00#Tarpaulins#24.12.15.00.00
-unspsc7#24.12.15.06.00#Conductive boxes#24.12.15.00.00
-unspsc7#24.12.15.07.00#Rigid set up boxes#24.12.15.00.00
-unspsc7#24.12.15.08.00#Egg trays#24.12.15.00.00
-unspsc7#24.12.18.00.00#Packaging cans#24.12.00.00.00
-unspsc7#24.12.18.01.00#Aerosol cans#24.12.18.00.00
-unspsc7#24.12.18.02.00#Paint or varnish cans#24.12.18.00.00
-unspsc7#24.12.18.03.00#Beverage cans#24.12.18.00.00
-unspsc7#24.12.18.04.00#Food cans#24.12.18.00.00
-unspsc7#24.12.18.05.00#Steel cans#24.12.18.00.00
-unspsc7#24.12.18.06.00#Aluminum cans#24.12.18.00.00
-unspsc7#24.12.20.00.00#Bottles#24.12.00.00.00
-unspsc7#24.12.20.01.00#Squeeze bottles#24.12.20.00.00
-unspsc7#24.12.20.02.00#Plastic bottles#24.12.20.00.00
-unspsc7#24.12.20.03.00#Glass bottles#24.12.20.00.00
-unspsc7#24.12.20.04.00#Caps or tops#24.12.20.00.00
-unspsc7#24.12.20.05.00#Applicator bottles#24.12.20.00.00
-unspsc7#24.12.20.06.00#Applicators#24.12.20.00.00
-unspsc7#24.13.00.00.00#Industrial refrigeration#24.00.00.00.00
-unspsc7#24.13.15.00.00#Industrial refrigerators#24.13.00.00.00
-unspsc7#24.13.15.01.00#Combined refrigerator freezers#24.13.15.00.00
-unspsc7#24.13.15.02.00#Liquid nitrogen refrigerators#24.13.15.00.00
-unspsc7#24.13.15.03.00#Walk in refrigerators#24.13.15.00.00
-unspsc7#24.13.15.04.00#Refrigerated containers#24.13.15.00.00
-unspsc7#24.13.15.05.00#Refrigerated vessels#24.13.15.00.00
-unspsc7#24.13.15.06.00#Refrigerated tanks#24.13.15.00.00
-unspsc7#24.13.16.00.00#Industrial freezers#24.13.00.00.00
-unspsc7#24.13.16.01.00#Chest freezers#24.13.16.00.00
-unspsc7#24.13.16.02.00#Upright freezers#24.13.16.00.00
-unspsc7#24.13.16.03.00#Low temperature freezers#24.13.16.00.00
-unspsc7#24.13.16.04.00#Freeze drying equipment#24.13.16.00.00
-unspsc7#24.13.16.05.00#Walk in freezers#24.13.16.00.00
-unspsc7#24.13.16.06.00#Plate freezers#24.13.16.00.00
-unspsc7#24.13.16.07.00#Blast freezers#24.13.16.00.00
-unspsc7#24.13.19.00.00#Ice makers#24.13.00.00.00
-unspsc7#24.13.19.01.00#Ice cube makers#24.13.19.00.00
-unspsc7#24.13.19.02.00#Ice block makers#24.13.19.00.00
-unspsc7#24.14.00.00.00#Packing supplies#24.00.00.00.00
-unspsc7#24.14.15.00.00#Securing and protecting supplies#24.14.00.00.00
-unspsc7#24.14.15.01.00#Stretch wrap films#24.14.15.00.00
-unspsc7#24.14.15.02.00#Shrink wrap films#24.14.15.00.00
-unspsc7#24.14.15.03.00#Polyethylene films#24.14.15.00.00
-unspsc7#24.14.15.04.00#Tamper proof or security seals#24.14.15.00.00
-unspsc7#24.14.15.05.00#Polyethylene films#24.14.15.00.00
-unspsc7#24.14.15.06.00#Tarpaulins#24.14.15.00.00
-unspsc7#24.14.15.07.00#Anti static packaging films#24.14.15.00.00
-unspsc7#24.14.15.08.00#Carton corner support#24.14.15.00.00
-unspsc7#24.14.15.09.00#Rubber cord#24.14.15.00.00
-unspsc7#24.14.15.10.00#Cable protectors#24.14.15.00.00
-unspsc7#24.14.15.11.00#Load binders#24.14.15.00.00
-unspsc7#24.14.16.00.00#Cushioning supplies#24.14.00.00.00
-unspsc7#24.14.16.01.00#Bubble wrap#24.14.16.00.00
-unspsc7#24.14.16.02.00#Thermoforming materials#24.14.16.00.00
-unspsc7#24.14.16.03.00#Cushioning#24.14.16.00.00
-unspsc7#24.14.16.04.00#Wadding materials#24.14.16.00.00
-unspsc7#24.14.16.05.00#Air filled packing materials#24.14.16.00.00
-unspsc7#24.14.16.06.00#Packing peanuts#24.14.16.00.00
-unspsc7#24.14.16.07.00#Cardboard inserts#24.14.16.00.00
-unspsc7#24.14.16.08.00#Protective ends#24.14.16.00.00
-unspsc7#24.14.17.00.00#Packaging tubes and cores and labels and accessories#24.14.00.00.00
-unspsc7#24.14.17.01.00#Paper tubes or cores#24.14.17.00.00
-unspsc7#24.14.17.02.00#Tube or core end plugs#24.14.17.00.00
-unspsc7#24.14.17.03.00#Paper pieces#24.14.17.00.00
-unspsc7#24.14.17.04.00#Printed inserts or instructions#24.14.17.00.00
-unspsc7#24.14.17.05.00#Collapsible tubes#24.14.17.00.00
-unspsc7#24.14.17.06.00#Spool#24.14.17.00.00
-unspsc7#24.14.17.07.00#Reel#24.14.17.00.00
-unspsc7#25.00.00.00.00#Commercial and Military and Private Vehicles and their Accessories and Components#25.00.00.00.00
-unspsc7#25.10.00.00.00#Motor vehicles#25.00.00.00.00
-unspsc7#25.10.15.00.00#Passenger motor vehicles#25.10.00.00.00
-unspsc7#25.10.15.01.00#Minibuses#25.10.15.00.00
-unspsc7#25.10.15.02.00#Busses#25.10.15.00.00
-unspsc7#25.10.15.03.00#Automobiles or cars#25.10.15.00.00
-unspsc7#25.10.15.04.00#Station wagons#25.10.15.00.00
-unspsc7#25.10.15.05.00#Minivans or vans#25.10.15.00.00
-unspsc7#25.10.15.06.00#Limousines#25.10.15.00.00
-unspsc7#25.10.15.07.00#Light trucks or sport utility vehicles#25.10.15.00.00
-unspsc7#25.10.16.00.00#Product and material transport vehicles#25.10.00.00.00
-unspsc7#25.10.16.01.00#Dump trucks#25.10.16.00.00
-unspsc7#25.10.16.02.00#Tow trucks#25.10.16.00.00
-unspsc7#25.10.16.04.00#Delivery trucks#25.10.16.00.00
-unspsc7#25.10.16.09.00#Sludge or sewage handling trucks#25.10.16.00.00
-unspsc7#25.10.17.00.00#Safety and rescue vehicles#25.10.00.00.00
-unspsc7#25.10.17.01.00#Fire or rescue trucks#25.10.17.00.00
-unspsc7#25.10.17.02.00#Police vehicles#25.10.17.00.00
-unspsc7#25.10.17.03.00#Ambulances#25.10.17.00.00
-unspsc7#25.10.18.00.00#Motorized cycles#25.10.00.00.00
-unspsc7#25.10.18.01.00#Motorcycles#25.10.18.00.00
-unspsc7#25.10.18.02.00#Scooters#25.10.18.00.00
-unspsc7#25.10.18.03.00#Mopeds#25.10.18.00.00
-unspsc7#25.10.19.00.00#Specialized and recreational vehicles#25.10.00.00.00
-unspsc7#25.10.19.01.00#Agricultural tractors#25.10.19.00.00
-unspsc7#25.10.19.02.00#Motor homes#25.10.19.00.00
-unspsc7#25.10.19.03.00#Snowmobiles or snow scooter#25.10.19.00.00
-unspsc7#25.10.19.04.00#Golf carts#25.10.19.00.00
-unspsc7#25.10.19.05.00#All terrain vehicles tracked or wheeled#25.10.19.00.00
-unspsc7#25.10.19.06.00#Go cart#25.10.19.00.00
-unspsc7#25.10.20.00.00#War vehicles#25.10.00.00.00
-unspsc7#25.10.20.01.00#Tanks#25.10.20.00.00
-unspsc7#25.10.20.02.00#Armored fighting vehicles#25.10.20.00.00
-unspsc7#25.10.20.03.00#Self propelled artillery#25.10.20.00.00
-unspsc7#25.10.21.00.00#Truck tractors#25.10.00.00.00
-unspsc7#25.10.21.01.00#Low cab forward tractors#25.10.21.00.00
-unspsc7#25.10.21.02.00#Long nose tractors with sleeper#25.10.21.00.00
-unspsc7#25.10.21.03.00#Long nose tractors without sleeper#25.10.21.00.00
-unspsc7#25.10.21.04.00#Cab over engine tractors with sleeper#25.10.21.00.00
-unspsc7#25.10.21.05.00#Cab over engine tractors without sleeper#25.10.21.00.00
-unspsc7#25.11.00.00.00#Marine transport#25.00.00.00.00
-unspsc7#25.11.15.00.00#Commercial marine craft#25.11.00.00.00
-unspsc7#25.11.15.01.00#Trawlers#25.11.15.00.00
-unspsc7#25.11.15.02.00#Fishing boats#25.11.15.00.00
-unspsc7#25.11.15.03.00#Cargo or container ships#25.11.15.00.00
-unspsc7#25.11.15.04.00#Dredging craft#25.11.15.00.00
-unspsc7#25.11.15.05.00#Tankers#25.11.15.00.00
-unspsc7#25.11.15.06.00#Tug boats#25.11.15.00.00
-unspsc7#25.11.15.07.00#Barges#25.11.15.00.00
-unspsc7#25.11.15.08.00#Passenger or automobile ferries#25.11.15.00.00
-unspsc7#25.11.15.09.00#Cruise ships#25.11.15.00.00
-unspsc7#25.11.15.10.00#Salvage ships#25.11.15.00.00
-unspsc7#25.11.15.11.00#Oil or gas crew boat#25.11.15.00.00
-unspsc7#25.11.15.12.00#Oil or gas workboat#25.11.15.00.00
-unspsc7#25.11.15.13.00#Seismic vessel#25.11.15.00.00
-unspsc7#25.11.16.00.00#Safety and rescue water craft#25.11.00.00.00
-unspsc7#25.11.16.01.00#Lifeboats or liferafts#25.11.16.00.00
-unspsc7#25.11.16.02.00#Fire fighting watercraft#25.11.16.00.00
-unspsc7#25.11.16.03.00#Rescue ships or boats#25.11.16.00.00
-unspsc7#25.11.17.00.00#Military watercraft#25.11.00.00.00
-unspsc7#25.11.17.01.00#Submarines#25.11.17.00.00
-unspsc7#25.11.17.02.00#Aircraft carriers#25.11.17.00.00
-unspsc7#25.11.17.03.00#Ammunition ships#25.11.17.00.00
-unspsc7#25.11.17.04.00#Amphibious assault ships#25.11.17.00.00
-unspsc7#25.11.17.05.00#Amphibious transport docks#25.11.17.00.00
-unspsc7#25.11.17.06.00#Amphibious command ships#25.11.17.00.00
-unspsc7#25.11.17.07.00#Command ships#25.11.17.00.00
-unspsc7#25.11.17.08.00#Cruisers#25.11.17.00.00
-unspsc7#25.11.17.09.00#Destroyers#25.11.17.00.00
-unspsc7#25.11.17.10.00#Dock landing ships#25.11.17.00.00
-unspsc7#25.11.17.11.00#Fast combat support ships#25.11.17.00.00
-unspsc7#25.11.17.12.00#Frigates#25.11.17.00.00
-unspsc7#25.11.17.13.00#Fleet oilers#25.11.17.00.00
-unspsc7#25.11.17.14.00#Utility landing watercraft#25.11.17.00.00
-unspsc7#25.11.17.15.00#Mechanized or utility watercraft#25.11.17.00.00
-unspsc7#25.11.17.16.00#Mine hunting ships#25.11.17.00.00
-unspsc7#25.11.17.17.00#Mine countermeasures ships#25.11.17.00.00
-unspsc7#25.11.17.18.00#Coastal patrol watercraft#25.11.17.00.00
-unspsc7#25.11.17.19.00#Submarine tenders#25.11.17.00.00
-unspsc7#25.11.17.20.00#Tank landing ships#25.11.17.00.00
-unspsc7#25.11.17.21.00#Air cushioned landing watercraft#25.11.17.00.00
-unspsc7#25.11.18.00.00#Recreational watercraft#25.11.00.00.00
-unspsc7#25.11.18.01.00#Recreational sailboats#25.11.18.00.00
-unspsc7#25.11.18.02.00#Recreational motorboats#25.11.18.00.00
-unspsc7#25.11.18.03.00#Recreational rowboats#25.11.18.00.00
-unspsc7#25.11.18.04.00#Canoes or kayaks#25.11.18.00.00
-unspsc7#25.11.18.05.00#Personal motorized watercraft#25.11.18.00.00
-unspsc7#25.11.18.06.00#Rafts#25.11.18.00.00
-unspsc7#25.11.19.00.00#Marine craft systems and subassemblies#25.11.00.00.00
-unspsc7#25.11.19.01.00#Marine craft communications systems#25.11.19.00.00
-unspsc7#25.11.19.02.00#Marine propellers#25.11.19.00.00
-unspsc7#25.11.19.03.00#Sails#25.11.19.00.00
-unspsc7#25.11.19.04.00#Paddles#25.11.19.00.00
-unspsc7#25.11.19.05.00#Marine ballast systems#25.11.19.00.00
-unspsc7#25.12.00.00.00#Railway and tramway machinery and equipment#25.00.00.00.00
-unspsc7#25.12.15.00.00#Locomotives and electric trolleys#25.12.00.00.00
-unspsc7#25.12.15.01.00#Diesel freight locomotives#25.12.15.00.00
-unspsc7#25.12.15.02.00#Electric freight locomotives#25.12.15.00.00
-unspsc7#25.12.15.03.00#Diesel passenger locomotives#25.12.15.00.00
-unspsc7#25.12.15.04.00#Electric passenger locomotives#25.12.15.00.00
-unspsc7#25.12.16.00.00#Railway and tramway cars#25.12.00.00.00
-unspsc7#25.12.16.01.00#Freight rail cars#25.12.16.00.00
-unspsc7#25.12.16.02.00#Tanker rail cars#25.12.16.00.00
-unspsc7#25.12.16.03.00#Passenger rail cars#25.12.16.00.00
-unspsc7#25.12.16.04.00#Hopper rail cars#25.12.16.00.00
-unspsc7#25.12.16.05.00#Streetcars or tramway cars#25.12.16.00.00
-unspsc7#25.12.17.00.00#Railroad support equipment and systems#25.12.00.00.00
-unspsc7#25.12.17.01.00#Rail switching systems#25.12.17.00.00
-unspsc7#25.12.17.02.00#Railway sleepers#25.12.17.00.00
-unspsc7#25.12.17.03.00#Railway tracks#25.12.17.00.00
-unspsc7#25.12.17.04.00#Railway frogs or fish plates#25.12.17.00.00
-unspsc7#25.13.00.00.00#Aircraft#25.00.00.00.00
-unspsc7#25.13.15.00.00#Powered fixed wing aircraft#25.13.00.00.00
-unspsc7#25.13.15.01.00#Fixed wing agricultural aircraft#25.13.15.00.00
-unspsc7#25.13.15.02.00#Cargo propeller aircraft#25.13.15.00.00
-unspsc7#25.13.15.03.00#Seaplanes#25.13.15.00.00
-unspsc7#25.13.15.04.00#Commercial passenger propeller aircraft#25.13.15.00.00
-unspsc7#25.13.15.05.00#Cargo jet aircraft#25.13.15.00.00
-unspsc7#25.13.15.06.00#Commercial passenger jet aircraft#25.13.15.00.00
-unspsc7#25.13.15.07.00#Private or business propeller aircraft#25.13.15.00.00
-unspsc7#25.13.15.08.00#Private or business jet aircraft#25.13.15.00.00
-unspsc7#25.13.16.00.00#Civilian and commercial rotary wing aircraft#25.13.00.00.00
-unspsc7#25.13.16.01.00#Passenger transport helicopters#25.13.16.00.00
-unspsc7#25.13.16.02.00#Cargo transport helicopters#25.13.16.00.00
-unspsc7#25.13.16.03.00#Agricultural helicopters#25.13.16.00.00
-unspsc7#25.13.16.04.00#Medical or rescue helicopters#25.13.16.00.00
-unspsc7#25.13.17.00.00#Military fixed wing aircraft#25.13.00.00.00
-unspsc7#25.13.17.01.00#Bomber aircraft#25.13.17.00.00
-unspsc7#25.13.17.02.00#Fighter bomber aircraft#25.13.17.00.00
-unspsc7#25.13.17.03.00#Fighter aircraft#25.13.17.00.00
-unspsc7#25.13.17.04.00#Attack aircraft#25.13.17.00.00
-unspsc7#25.13.17.05.00#Target or reconnaissance drones#25.13.17.00.00
-unspsc7#25.13.17.06.00#Military seaplanes#25.13.17.00.00
-unspsc7#25.13.17.07.00#Reconnaissance or surveillance aircraft#25.13.17.00.00
-unspsc7#25.13.17.08.00#Anti submarine aircraft#25.13.17.00.00
-unspsc7#25.13.17.09.00#Military transport aircraft#25.13.17.00.00
-unspsc7#25.13.18.00.00#Specialty aircraft#25.13.00.00.00
-unspsc7#25.13.18.01.00#Airships#25.13.18.00.00
-unspsc7#25.13.19.00.00#Military rotary wing aircraft#25.13.00.00.00
-unspsc7#25.13.19.02.00#Military transport helicopters#25.13.19.00.00
-unspsc7#25.13.19.03.00#Attack helicopters#25.13.19.00.00
-unspsc7#25.13.19.04.00#Reconnaissance helicopters#25.13.19.00.00
-unspsc7#25.13.19.05.00#Anti submarine helicopters#25.13.19.00.00
-unspsc7#25.13.19.06.00#Tilt rotor wing aircraft#25.13.19.00.00
-unspsc7#25.13.20.00.00#Recreational aircraft#25.13.00.00.00
-unspsc7#25.13.20.01.00#Hang gliders#25.13.20.00.00
-unspsc7#25.13.20.02.00#Hot air balloons#25.13.20.00.00
-unspsc7#25.13.20.03.00#Gliders#25.13.20.00.00
-unspsc7#25.13.20.04.00#Paragliders#25.13.20.00.00
-unspsc7#25.13.20.05.00#Ultra light aircraft#25.13.20.00.00
-unspsc7#25.13.21.00.00#Aircraft management services#25.13.00.00.00
-unspsc7#25.13.21.01.00#Aircraft pilots#25.13.21.00.00
-unspsc7#25.13.21.02.00#Aircraft maintenance or services#25.13.21.00.00
-unspsc7#25.15.00.00.00#Spacecraft#25.00.00.00.00
-unspsc7#25.15.15.00.00#Spaceships#25.15.00.00.00
-unspsc7#25.15.15.01.00#Manned spacecraft#25.15.15.00.00
-unspsc7#25.15.15.02.00#Spacecraft structures#25.15.15.00.00
-unspsc7#25.15.17.00.00#Satellites#25.15.00.00.00
-unspsc7#25.15.17.01.00#Communication satellites#25.15.17.00.00
-unspsc7#25.15.17.02.00#Weather satellites#25.15.17.00.00
-unspsc7#25.15.17.03.00#Military satellites#25.15.17.00.00
-unspsc7#25.15.17.04.00#Scientific or research satellites#25.15.17.00.00
-unspsc7#25.15.17.05.00#Navigation satellites#25.15.17.00.00
-unspsc7#25.15.17.06.00#Geostationary satellites#25.15.17.00.00
-unspsc7#25.15.17.07.00#Low earth orbit satellites#25.15.17.00.00
-unspsc7#25.15.17.08.00#Sun synchronous orbit satellites#25.15.17.00.00
-unspsc7#25.15.17.09.00#Geosynchronous satellites#25.15.17.00.00
-unspsc7#25.16.00.00.00#Non motorized cycles#25.00.00.00.00
-unspsc7#25.16.15.00.00#Pedal powered vehicles#25.16.00.00.00
-unspsc7#25.16.15.01.00#Touring bicycles#25.16.15.00.00
-unspsc7#25.16.15.02.00#Unicycles#25.16.15.00.00
-unspsc7#25.16.15.03.00#Tricycles#25.16.15.00.00
-unspsc7#25.16.15.04.00#Tandem bicycles#25.16.15.00.00
-unspsc7#25.16.15.05.00#Mountain bicycles#25.16.15.00.00
-unspsc7#25.16.15.06.00#Racing bicycles#25.16.15.00.00
-unspsc7#25.16.15.07.00#Bicycles#25.16.15.00.00
-unspsc7#25.16.15.08.00#Recumbent bicycles#25.16.15.00.00
-unspsc7#25.16.15.09.00#Childrens bicycles#25.16.15.00.00
-unspsc7#25.17.00.00.00#Transportation components and systems#25.00.00.00.00
-unspsc7#25.17.15.00.00#Windshield wipers#25.17.00.00.00
-unspsc7#25.17.15.01.00#Aircraft windshield wipers#25.17.15.00.00
-unspsc7#25.17.15.02.00#Automotive windshield wipers#25.17.15.00.00
-unspsc7#25.17.15.03.00#Locomotive windshield wipers#25.17.15.00.00
-unspsc7#25.17.15.04.00#Marine windshield wipers#25.17.15.00.00
-unspsc7#25.17.15.05.00#Truck windshield wipers#25.17.15.00.00
-unspsc7#25.17.15.06.00#Windshield wiper pump#25.17.15.00.00
-unspsc7#25.17.16.00.00#Defrosting and defogging systems#25.17.00.00.00
-unspsc7#25.17.16.01.00#Aircraft onboard defrosting or defogging systems#25.17.16.00.00
-unspsc7#25.17.16.02.00#Automotive defrosting or defogging systems#25.17.16.00.00
-unspsc7#25.17.16.03.00#Train defrosting or defogging systems#25.17.16.00.00
-unspsc7#25.17.17.00.00#Braking systems and components#25.17.00.00.00
-unspsc7#25.17.17.01.00#Aircraft braking systems#25.17.17.00.00
-unspsc7#25.17.17.02.00#Automotive braking systems#25.17.17.00.00
-unspsc7#25.17.17.03.00#Train braking systems#25.17.17.00.00
-unspsc7#25.17.17.04.00#Drag chutes#25.17.17.00.00
-unspsc7#25.17.17.05.00#Rotors#25.17.17.00.00
-unspsc7#25.17.17.06.00#Brake calipers#25.17.17.00.00
-unspsc7#25.17.17.07.00#Drum brake#25.17.17.00.00
-unspsc7#25.17.17.08.00#Disc brake#25.17.17.00.00
-unspsc7#25.17.17.09.00#Liquid cooled brake#25.17.17.00.00
-unspsc7#25.17.17.10.00#Master cylindars#25.17.17.00.00
-unspsc7#25.17.17.11.00#Slave cylinders#25.17.17.00.00
-unspsc7#25.17.17.12.00#Drum brake shoes#25.17.17.00.00
-unspsc7#25.17.17.13.00#Disc brake pads#25.17.17.00.00
-unspsc7#25.17.17.14.00#Brake drum#25.17.17.00.00
-unspsc7#25.17.17.15.00#Disc brake rotors#25.17.17.00.00
-unspsc7#25.17.17.16.00#Brake lines#25.17.17.00.00
-unspsc7#25.17.19.00.00#Wheels and wheel trims#25.17.00.00.00
-unspsc7#25.17.19.01.00#Automobile rims or wheels#25.17.19.00.00
-unspsc7#25.17.19.02.00#Train wheels#25.17.19.00.00
-unspsc7#25.17.19.03.00#Truck rims or wheels#25.17.19.00.00
-unspsc7#25.17.19.04.00#Aircraft wheels#25.17.19.00.00
-unspsc7#25.17.19.05.00#Tire valves#25.17.19.00.00
-unspsc7#25.17.20.00.00#Suspension system components#25.17.00.00.00
-unspsc7#25.17.20.01.00#Automobile suspension systems#25.17.20.00.00
-unspsc7#25.17.20.02.00#Truck suspension systems#25.17.20.00.00
-unspsc7#25.17.20.03.00#Truck shock absorbers#25.17.20.00.00
-unspsc7#25.17.20.04.00#Automobile shock absorbers#25.17.20.00.00
-unspsc7#25.17.20.05.00#Train suspension systems#25.17.20.00.00
-unspsc7#25.17.20.06.00#Steering systems#25.17.20.00.00
-unspsc7#25.17.20.07.00#Struts#25.17.20.00.00
-unspsc7#25.17.20.08.00#Ball joints#25.17.20.00.00
-unspsc7#25.17.20.09.00#Automotive bushings#25.17.20.00.00
-unspsc7#25.17.20.10.00#Sway bars#25.17.20.00.00
-unspsc7#25.17.20.11.00#Shock absorber#25.17.20.00.00
-unspsc7#25.17.21.00.00#Vehicle safety systems and components#25.17.00.00.00
-unspsc7#25.17.21.01.00#Airbags#25.17.21.00.00
-unspsc7#25.17.21.02.00#Aircraft lapbelts#25.17.21.00.00
-unspsc7#25.17.21.03.00#Aircraft harness restraints#25.17.21.00.00
-unspsc7#25.17.21.04.00#Seatbelts#25.17.21.00.00
-unspsc7#25.17.21.05.00#Collision avoidance systems#25.17.21.00.00
-unspsc7#25.17.21.06.00#Impact sensing systems#25.17.21.00.00
-unspsc7#25.17.21.07.00#Automotive seatbelts#25.17.21.00.00
-unspsc7#25.17.21.08.00#Head restraints#25.17.21.00.00
-unspsc7#25.17.22.00.00#Vehicle doors#25.17.00.00.00
-unspsc7#25.17.22.01.00#Removable automotive doors#25.17.22.00.00
-unspsc7#25.17.22.02.00#Aircraft doors#25.17.22.00.00
-unspsc7#25.17.22.03.00#Automotive doors#25.17.22.00.00
-unspsc7#25.17.22.04.00#Roll up truck doors#25.17.22.00.00
-unspsc7#25.17.22.05.00#Tailgates or liftgates#25.17.22.00.00
-unspsc7#25.17.23.00.00#Vehicle windows and windshields#25.17.00.00.00
-unspsc7#25.17.23.01.00#Automotive windshields#25.17.23.00.00
-unspsc7#25.17.23.02.00#Aircraft windows#25.17.23.00.00
-unspsc7#25.17.23.03.00#Automotive windows#25.17.23.00.00
-unspsc7#25.17.23.04.00#Aircraft windshields#25.17.23.00.00
-unspsc7#25.17.24.00.00#Fuel tanks and systems#25.17.00.00.00
-unspsc7#25.17.24.01.00#Aircraft internal fuel tanks#25.17.24.00.00
-unspsc7#25.17.24.02.00#Aircraft fuel drop tanks#25.17.24.00.00
-unspsc7#25.17.24.03.00#Aircraft propellent tanks#25.17.24.00.00
-unspsc7#25.17.24.04.00#Hybrid fuel storage systems#25.17.24.00.00
-unspsc7#25.17.24.05.00#Fuel injection systems#25.17.24.00.00
-unspsc7#25.17.24.06.00#Fuel tanks#25.17.24.00.00
-unspsc7#25.17.24.07.00#Breather elements#25.17.24.00.00
-unspsc7#25.17.24.08.00#Fuel or oil caps#25.17.24.00.00
-unspsc7#25.17.25.00.00#Tires and tire tubes#25.17.00.00.00
-unspsc7#25.17.25.01.00#Aircraft tires#25.17.25.00.00
-unspsc7#25.17.25.02.00#Automobile tire tubes#25.17.25.00.00
-unspsc7#25.17.25.03.00#Heavy truck tires#25.17.25.00.00
-unspsc7#25.17.25.04.00#Automobile or light truck tires#25.17.25.00.00
-unspsc7#25.17.25.05.00#Bicycle tubes#25.17.25.00.00
-unspsc7#25.17.25.06.00#Bicycle tires#25.17.25.00.00
-unspsc7#25.17.25.07.00#Tire cord#25.17.25.00.00
-unspsc7#25.17.25.08.00#Tire treads#25.17.25.00.00
-unspsc7#25.17.26.00.00#Vehicle trim and exterior covering#25.17.00.00.00
-unspsc7#25.17.26.01.00#Automotive trim#25.17.26.00.00
-unspsc7#25.17.26.02.00#Automotive fenders#25.17.26.00.00
-unspsc7#25.17.26.03.00#Vehicle bumpers#25.17.26.00.00
-unspsc7#25.17.26.04.00#Vehicle mirrors#25.17.26.00.00
-unspsc7#25.17.26.05.00#Vehicle grilles#25.17.26.00.00
-unspsc7#25.17.26.06.00#Vehicle hoods#25.17.26.00.00
-unspsc7#25.17.26.07.00#Vehicle side panels#25.17.26.00.00
-unspsc7#25.17.26.08.00#Fascias#25.17.26.00.00
-unspsc7#25.17.27.00.00#Environmental control systems#25.17.00.00.00
-unspsc7#25.17.27.01.00#Aircraft environmental control systems#25.17.27.00.00
-unspsc7#25.17.27.02.00#Space environmental control systems#25.17.27.00.00
-unspsc7#25.17.27.03.00#Marine environmental control systems#25.17.27.00.00
-unspsc7#25.17.27.04.00#Vehicle climate control systems#25.17.27.00.00
-unspsc7#25.17.28.00.00#Hydraulic systems and components#25.17.00.00.00
-unspsc7#25.17.28.01.00#Aircraft hydraulic systems#25.17.28.00.00
-unspsc7#25.17.28.02.00#Automotive hydraulic systems#25.17.28.00.00
-unspsc7#25.17.28.03.00#Marine hydraulic systems#25.17.28.00.00
-unspsc7#25.17.29.00.00#Exterior vehicle lighting#25.17.00.00.00
-unspsc7#25.17.29.01.00#Exterior automobile lighting#25.17.29.00.00
-unspsc7#25.17.29.02.00#Exterior aircraft lighting#25.17.29.00.00
-unspsc7#25.17.29.03.00#Exterior railcar lighting#25.17.29.00.00
-unspsc7#25.17.29.04.00#Exterior ship or boat lighting#25.17.29.00.00
-unspsc7#25.17.29.05.00#Headlamp wiper or washer systems#25.17.29.00.00
-unspsc7#25.17.29.06.00#Reflectors#25.17.29.00.00
-unspsc7#25.17.30.00.00#Interior vehicle lighting#25.17.00.00.00
-unspsc7#25.17.30.01.00#Interior automobile lighting#25.17.30.00.00
-unspsc7#25.17.30.02.00#Interior aircraft lighting#25.17.30.00.00
-unspsc7#25.17.30.03.00#Interior railcar lighting#25.17.30.00.00
-unspsc7#25.17.30.04.00#Interior ship or boat lighting#25.17.30.00.00
-unspsc7#25.17.30.05.00#Light plate assemblies#25.17.30.00.00
-unspsc7#25.17.31.00.00#Location and navigation systems and components#25.17.00.00.00
-unspsc7#25.17.31.01.00#Aircraft digital altitude control systems#25.17.31.00.00
-unspsc7#25.17.31.02.00#Aircraft navigation beacons#25.17.31.00.00
-unspsc7#25.17.31.03.00#Terrain following systems#25.17.31.00.00
-unspsc7#25.17.31.04.00#Aircraft guidance systems#25.17.31.00.00
-unspsc7#25.17.31.05.00#Aircraft steering controls#25.17.31.00.00
-unspsc7#25.17.31.06.00#Spacecraft attitude control systems#25.17.31.00.00
-unspsc7#25.17.31.07.00#Vehicular global positioning systems#25.17.31.00.00
-unspsc7#25.17.32.00.00#Communications related systems#25.17.00.00.00
-unspsc7#25.17.32.01.00#Aircraft communication systems#25.17.32.00.00
-unspsc7#25.17.32.02.00#Flight recorders#25.17.32.00.00
-unspsc7#25.17.32.03.00#Aircraft countermeasures#25.17.32.00.00
-unspsc7#25.17.32.04.00#Aircraft encryption or decryption systems#25.17.32.00.00
-unspsc7#25.17.32.05.00#Aircraft telemetry systems#25.17.32.00.00
-unspsc7#25.17.32.06.00#Aircraft interface electronics#25.17.32.00.00
-unspsc7#25.17.33.00.00#Master control systems#25.17.00.00.00
-unspsc7#25.17.33.01.00#Flight computer systems#25.17.33.00.00
-unspsc7#25.17.33.02.00#Spacecraft command modules#25.17.33.00.00
-unspsc7#25.17.33.03.00#Automotive computer systems#25.17.33.00.00
-unspsc7#25.17.33.04.00#Electronic ignition systems#25.17.33.00.00
-unspsc7#25.17.34.00.00#Vehicle emergency systems#25.17.00.00.00
-unspsc7#25.17.34.01.00#Aircraft fire control or extinguishing systems#25.17.34.00.00
-unspsc7#25.17.34.02.00#Aircraft escape or ejection systems#25.17.34.00.00
-unspsc7#25.17.34.03.00#Aircraft warning systems#25.17.34.00.00
-unspsc7#25.17.35.00.00#Vehicle power systems#25.17.00.00.00
-unspsc7#25.17.35.01.00#Spacecraft solar cells#25.17.35.00.00
-unspsc7#25.17.35.02.00#Spacecraft solar arrays#25.17.35.00.00
-unspsc7#25.17.36.00.00#Vehicle instrumentation#25.17.00.00.00
-unspsc7#25.17.36.01.00#Aircraft cockpit displays#25.17.36.00.00
-unspsc7#25.17.37.00.00#Exhaust and emission controls#25.17.00.00.00
-unspsc7#25.17.37.01.00#Catalytic converters#25.17.37.00.00
-unspsc7#25.17.37.02.00#Mufflers#25.17.37.00.00
-unspsc7#25.17.37.03.00#Exhaust manifolds#25.17.37.00.00
-unspsc7#25.17.38.00.00#Drivetrain systems#25.17.00.00.00
-unspsc7#25.17.38.01.00#Driving axles#25.17.38.00.00
-unspsc7#25.17.38.02.00#Non driving axles#25.17.38.00.00
-unspsc7#25.17.38.03.00#Axle housings#25.17.38.00.00
-unspsc7#25.17.38.04.00#Axle spindles#25.17.38.00.00
-unspsc7#25.17.38.05.00#Differentials#25.17.38.00.00
-unspsc7#25.17.38.06.00#Constant velocity joints#25.17.38.00.00
-unspsc7#25.17.38.07.00#Axle shafts#25.17.38.00.00
-unspsc7#25.17.38.08.00#Axle repair kits#25.17.38.00.00
-unspsc7#25.17.38.09.00#Axle hubs#25.17.38.00.00
-unspsc7#25.17.38.10.00#Universal joints#25.17.38.00.00
-unspsc7#25.17.38.11.00#Drive shafts#25.17.38.00.00
-unspsc7#25.17.38.12.00#Manual transmissions#25.17.38.00.00
-unspsc7#25.17.38.13.00#Automatic transmissions#25.17.38.00.00
-unspsc7#25.17.38.14.00#Power take offs#25.17.38.00.00
-unspsc7#25.17.38.15.00#Clutch cables#25.17.38.00.00
-unspsc7#25.17.38.16.00#Hydraulic clutch parts#25.17.38.00.00
-unspsc7#25.17.38.17.00#Drivetrain chains#25.17.38.00.00
-unspsc7#25.17.39.00.00#Electrical components#25.17.00.00.00
-unspsc7#25.17.39.01.00#Ignition#25.17.39.00.00
-unspsc7#25.17.40.00.00#Engine coolant system#25.17.00.00.00
-unspsc7#25.17.40.01.00#Fan#25.17.40.00.00
-unspsc7#25.17.40.02.00#Vehicle radiators#25.17.40.00.00
-unspsc7#25.17.40.03.00#Radiator caps#25.17.40.00.00
-unspsc7#25.17.40.04.00#Engine coolant#25.17.40.00.00
-unspsc7#25.17.41.00.00#Roof systems#25.17.00.00.00
-unspsc7#25.17.41.01.00#Emergency vehicle exits#25.17.41.00.00
-unspsc7#25.17.41.02.00#Permanent convertible roof tops#25.17.41.00.00
-unspsc7#25.17.41.03.00#Removable hard roof tops#25.17.41.00.00
-unspsc7#25.17.41.04.00#Removable soft roof tops#25.17.41.00.00
-unspsc7#25.17.41.05.00#Roof rack systems#25.17.41.00.00
-unspsc7#25.17.41.06.00#Sunroofs or moonroofs#25.17.41.00.00
-unspsc7#25.17.41.07.00#Wind deflectors#25.17.41.00.00
-unspsc7#25.17.42.00.00#Steering system#25.17.00.00.00
-unspsc7#25.17.42.01.00#Steering sacks#25.17.42.00.00
-unspsc7#25.17.42.02.00#Steering suspension#25.17.42.00.00
-unspsc7#25.17.42.03.00#Ball joint#25.17.42.00.00
-unspsc7#25.17.42.04.00#Power steering system#25.17.42.00.00
-unspsc7#25.17.42.05.00#Tie Rods#25.17.42.00.00
-unspsc7#25.17.42.06.00#Drag link#25.17.42.00.00
-unspsc7#25.17.42.07.00#Steering linkage#25.17.42.00.00
-unspsc7#25.17.42.08.00#Hublock#25.17.42.00.00
-unspsc7#25.17.42.09.00#Pinions#25.17.42.00.00
-unspsc7#25.17.42.10.00#Power steering tuning cable#25.17.42.00.00
-unspsc7#25.17.43.00.00#Vehicle exhaust systems#25.17.00.00.00
-unspsc7#25.17.43.01.00#Catalytic converters#25.17.43.00.00
-unspsc7#25.17.43.02.00#Mufflers or resonators#25.17.43.00.00
-unspsc7#25.17.44.00.00#Vehicle interior systems#25.17.00.00.00
-unspsc7#25.17.44.01.00#Bezels#25.17.44.00.00
-unspsc7#25.17.44.02.00#Consoles#25.17.44.00.00
-unspsc7#25.17.44.03.00#Door panels#25.17.44.00.00
-unspsc7#25.17.44.04.00#Headliners#25.17.44.00.00
-unspsc7#25.17.44.05.00#Instrument clusters#25.17.44.00.00
-unspsc7#25.17.44.06.00#Instrument panels#25.17.44.00.00
-unspsc7#25.17.44.07.00#Pedals#25.17.44.00.00
-unspsc7#25.17.44.08.00#Power ports or lighters#25.17.44.00.00
-unspsc7#25.17.44.09.00#Sun visors#25.17.44.00.00
-unspsc7#25.17.45.00.00#Vehicle safety and security systems#25.17.00.00.00
-unspsc7#25.17.45.01.00#Air bag propellant canisters#25.17.45.00.00
-unspsc7#25.17.45.02.00#Air bags#25.17.45.00.00
-unspsc7#25.17.45.03.00#Vehicle horns#25.17.45.00.00
-unspsc7#25.17.45.04.00#Remote locking system#25.17.45.00.00
-unspsc7#25.17.45.05.00#Vehicle stability control systems#25.17.45.00.00
-unspsc7#25.17.45.06.00#Vehicle traction control systems#25.17.45.00.00
-unspsc7#25.17.45.07.00#Vehicle navigation systems#25.17.45.00.00
-unspsc7#25.17.45.08.00#Wheel clamps#25.17.45.00.00
-unspsc7#25.17.46.00.00#Vehicle seating systems#25.17.00.00.00
-unspsc7#25.17.46.01.00#Seat covers#25.17.46.00.00
-unspsc7#25.17.46.02.00#Seat cushions or bolsters#25.17.46.00.00
-unspsc7#25.17.46.03.00#Seat frames#25.17.46.00.00
-unspsc7#25.18.00.00.00#Vehicle bodies and trailers#25.00.00.00.00
-unspsc7#25.18.15.00.00#Aircraft fuselage and components#25.18.00.00.00
-unspsc7#25.18.15.01.00#Aircraft spoilers#25.18.15.00.00
-unspsc7#25.18.15.02.00#Aircraft fins#25.18.15.00.00
-unspsc7#25.18.15.03.00#Aircraft horizontal stabilizers#25.18.15.00.00
-unspsc7#25.18.15.04.00#Aircraft canards#25.18.15.00.00
-unspsc7#25.18.15.05.00#Aircraft slats#25.18.15.00.00
-unspsc7#25.18.15.06.00#Aircraft flaps#25.18.15.00.00
-unspsc7#25.18.15.07.00#Aircraft rudders#25.18.15.00.00
-unspsc7#25.18.15.08.00#Aircraft elevators#25.18.15.00.00
-unspsc7#25.18.15.09.00#Aircraft ailerons#25.18.15.00.00
-unspsc7#25.18.15.10.00#Aircraft propeller#25.18.15.00.00
-unspsc7#25.18.15.11.00#Aircraft wings#25.18.15.00.00
-unspsc7#25.18.15.12.00#Aircraft fuselage#25.18.15.00.00
-unspsc7#25.18.15.13.00#Aircraft radomes#25.18.15.00.00
-unspsc7#25.18.15.14.00#Aircraft rotors#25.18.15.00.00
-unspsc7#25.18.15.15.00#Aircraft lift fans#25.18.15.00.00
-unspsc7#25.18.15.16.00#Aircraft canopies#25.18.15.00.00
-unspsc7#25.18.15.17.00#Aircraft furnishings#25.18.15.00.00
-unspsc7#25.18.16.00.00#Automotive chassis#25.18.00.00.00
-unspsc7#25.18.16.01.00#Automobile chassis#25.18.16.00.00
-unspsc7#25.18.16.02.00#Truck chassis#25.18.16.00.00
-unspsc7#25.18.16.03.00#Motorcycle frames#25.18.16.00.00
-unspsc7#25.18.16.04.00#Truck chassis#25.18.16.00.00
-unspsc7#25.18.17.00.00#Product and material trailers#25.18.00.00.00
-unspsc7#25.18.17.01.00#Container trailers#25.18.17.00.00
-unspsc7#25.18.17.02.00#Flatbed trailers#25.18.17.00.00
-unspsc7#25.18.17.03.00#Livestock trailers#25.18.17.00.00
-unspsc7#25.18.17.04.00#Non temperature controlled tanker trailers#25.18.17.00.00
-unspsc7#25.18.17.05.00#Temperature controlled tanker trailers#25.18.17.00.00
-unspsc7#25.18.17.06.00#Temperature controlled container trailers#25.18.17.00.00
-unspsc7#25.18.17.07.00#Automobile carrier trailers#25.18.17.00.00
-unspsc7#25.18.17.08.00#Trailer hitches#25.18.17.00.00
-unspsc7#25.18.17.09.00#Skip loader#25.18.17.00.00
-unspsc7#25.18.17.10.00#Trailer end plates#25.18.17.00.00
-unspsc7#25.18.17.11.00#Snowmobile trailer#25.18.17.00.00
-unspsc7#25.18.17.12.00#Motorcycle trailer#25.18.17.00.00
-unspsc7#25.18.17.13.00#Boat Trailer#25.18.17.00.00
-unspsc7#25.19.00.00.00#Transportation services equipment#25.00.00.00.00
-unspsc7#25.19.15.00.00#Air transportation support systems and equipment#25.19.00.00.00
-unspsc7#25.19.15.01.00#Ground support training systems#25.19.15.00.00
-unspsc7#25.19.15.02.00#Ground support test or maintenance systems#25.19.15.00.00
-unspsc7#25.19.15.03.00#Integrated maintenance information systems#25.19.15.00.00
-unspsc7#25.19.15.04.00#Aircraft flight simulators or trainers#25.19.15.00.00
-unspsc7#25.19.15.05.00#Aircraft cargo handling equipment#25.19.15.00.00
-unspsc7#25.19.15.06.00#Aircraft refueling equipment#25.19.15.00.00
-unspsc7#25.19.15.07.00#Aircraft deicing equipment#25.19.15.00.00
-unspsc7#25.19.15.08.00#Jetways#25.19.15.00.00
-unspsc7#25.19.15.09.00#Aircraft pushback or tow tractors#25.19.15.00.00
-unspsc7#25.19.15.10.00#Ground power units for aircraft#25.19.15.00.00
-unspsc7#25.19.15.11.00#Lavatory service equipment for aircraft#25.19.15.00.00
-unspsc7#25.19.15.12.00#Airstairs or stair trucks#25.19.15.00.00
-unspsc7#25.19.16.00.00#Space transportation support systems and equipment#25.19.00.00.00
-unspsc7#25.19.16.01.00#Spacecraft flight simulators#25.19.16.00.00
-unspsc7#25.19.16.02.00#Payload delivery systems for spacecraft#25.19.16.00.00
-unspsc7#25.19.16.03.00#Liquid launch vehicles#25.19.16.00.00
-unspsc7#25.19.16.04.00#Solid launch vehicles#25.19.16.00.00
-unspsc7#25.19.16.05.00#Spacecraft service modules#25.19.16.00.00
-unspsc7#25.19.17.00.00#Vehicle servicing equipment#25.19.00.00.00
-unspsc7#25.19.17.01.00#Wheel balancing equipment#25.19.17.00.00
-unspsc7#25.19.17.02.00#Wheel alignment equipment#25.19.17.00.00
-unspsc7#25.19.17.03.00#Tire changing machines#25.19.17.00.00
-unspsc7#25.19.17.04.00#Engine or vehicle stands#25.19.17.00.00
-unspsc7#25.20.00.00.00#Aerospace systems and components and equipment#25.00.00.00.00
-unspsc7#25.20.15.00.00#Aircraft fuselage and components#25.20.00.00.00
-unspsc7#25.20.15.01.00#Aircraft spoilers#25.20.15.00.00
-unspsc7#25.20.15.02.00#Aircraft fins#25.20.15.00.00
-unspsc7#25.20.15.03.00#Aircraft horizontal stabilizers#25.20.15.00.00
-unspsc7#25.20.15.04.00#Aircraft canards#25.20.15.00.00
-unspsc7#25.20.15.05.00#Aircraft slats#25.20.15.00.00
-unspsc7#25.20.15.06.00#Aircraft flaps or flap drives#25.20.15.00.00
-unspsc7#25.20.15.07.00#Aircraft rudders#25.20.15.00.00
-unspsc7#25.20.15.08.00#Aircraft elevators#25.20.15.00.00
-unspsc7#25.20.15.09.00#Aircraft ailerons#25.20.15.00.00
-unspsc7#25.20.15.10.00#Aircraft propellers#25.20.15.00.00
-unspsc7#25.20.15.11.00#Aircraft wings#25.20.15.00.00
-unspsc7#25.20.15.12.00#Aircraft fuselages#25.20.15.00.00
-unspsc7#25.20.15.13.00#Aircraft radomes#25.20.15.00.00
-unspsc7#25.20.15.14.00#Aircraft rotors#25.20.15.00.00
-unspsc7#25.20.15.15.00#Aircraft lift fans#25.20.15.00.00
-unspsc7#25.20.15.16.00#Aircraft canopies#25.20.15.00.00
-unspsc7#25.20.15.17.00#Aircraft furnishings#25.20.15.00.00
-unspsc7#25.20.16.00.00#Aerospace location and navigation systems and components#25.20.00.00.00
-unspsc7#25.20.16.01.00#Aircraft digital altitude control systems#25.20.16.00.00
-unspsc7#25.20.16.02.00#Aircraft navigation beacons#25.20.16.00.00
-unspsc7#25.20.16.03.00#Air to ground terrain following systems#25.20.16.00.00
-unspsc7#25.20.16.04.00#Aircraft guidance systems#25.20.16.00.00
-unspsc7#25.20.16.05.00#Aircraft steering controls#25.20.16.00.00
-unspsc7#25.20.16.06.00#Spacecraft altitude control systems#25.20.16.00.00
-unspsc7#25.20.17.00.00#Flight communications related systems#25.20.00.00.00
-unspsc7#25.20.17.01.00#Aircraft communication systems#25.20.17.00.00
-unspsc7#25.20.17.02.00#Flight data recorders#25.20.17.00.00
-unspsc7#25.20.17.03.00#Aircraft countermeasures#25.20.17.00.00
-unspsc7#25.20.17.04.00#Encryption or decryption systems#25.20.17.00.00
-unspsc7#25.20.17.05.00#Aircraft telemetry systems#25.20.17.00.00
-unspsc7#25.20.17.06.00#Aircraft interface electronics#25.20.17.00.00
-unspsc7#25.20.17.07.00#Aircraft gyros#25.20.17.00.00
-unspsc7#25.20.17.08.00#Aircraft cameras#25.20.17.00.00
-unspsc7#25.20.17.09.00#Aircraft probes or sensors#25.20.17.00.00
-unspsc7#25.20.17.10.00#Aircraft waveguides#25.20.17.00.00
-unspsc7#25.20.18.00.00#Aircraft master control systems#25.20.00.00.00
-unspsc7#25.20.18.01.00#Flight computer systems#25.20.18.00.00
-unspsc7#25.20.18.02.00#Spacecraft command modules#25.20.18.00.00
-unspsc7#25.20.19.00.00#Aircraft emergency systems#25.20.00.00.00
-unspsc7#25.20.19.01.00#Aircraft fire control or extinguishing systems#25.20.19.00.00
-unspsc7#25.20.19.02.00#Aircraft escape or ejection systems#25.20.19.00.00
-unspsc7#25.20.19.03.00#Aircraft warning systems#25.20.19.00.00
-unspsc7#25.20.19.04.00#Parachutes#25.20.19.00.00
-unspsc7#25.20.20.00.00#Aircraft power systems#25.20.00.00.00
-unspsc7#25.20.20.01.00#Spacecraft solar cells#25.20.20.00.00
-unspsc7#25.20.20.02.00#Spacecraft solar arrays#25.20.20.00.00
-unspsc7#25.20.20.03.00#Aircraft power supply units#25.20.20.00.00
-unspsc7#25.20.20.04.00#Auxilliary power unit systems (APUs)#25.20.20.00.00
-unspsc7#25.20.21.00.00#Flight instrumentation#25.20.00.00.00
-unspsc7#25.20.21.01.00#Aerospace cockpit indicators#25.20.21.00.00
-unspsc7#25.20.21.02.00#Aerospace cockpit gauges#25.20.21.00.00
-unspsc7#25.20.21.03.00#Aerospace cockpit display panels#25.20.21.00.00
-unspsc7#25.20.21.04.00#Aerospace cockpit switch panels#25.20.21.00.00
-unspsc7#25.20.21.05.00#Aerospace head up display (HUDs)#25.20.21.00.00
-unspsc7#25.20.22.00.00#Aircraft landing and braking systems#25.20.00.00.00
-unspsc7#25.20.22.01.00#Aircraft braking systems#25.20.22.00.00
-unspsc7#25.20.22.02.00#Aircraft drag chutes#25.20.22.00.00
-unspsc7#25.20.22.03.00#Aircraft wheels#25.20.22.00.00
-unspsc7#25.20.22.04.00#Landing gear assemblies#25.20.22.00.00
-unspsc7#25.20.22.05.00#Aircraft tires#25.20.22.00.00
-unspsc7#25.20.22.06.00#Aicraft anti skid controls#25.20.22.00.00
-unspsc7#25.20.23.00.00#Aircraft passenger restraints#25.20.00.00.00
-unspsc7#25.20.23.01.00#Aircraft lapbelts#25.20.23.00.00
-unspsc7#25.20.23.02.00#Aircraft harness restraints#25.20.23.00.00
-unspsc7#25.20.24.00.00#Aircraft fuel tanks and systems#25.20.00.00.00
-unspsc7#25.20.24.01.00#Aircraft internal fuel tanks#25.20.24.00.00
-unspsc7#25.20.24.02.00#Aircraft fuel drop tanks#25.20.24.00.00
-unspsc7#25.20.24.03.00#Aircraft propellant tanks#25.20.24.00.00
-unspsc7#25.20.24.04.00#Aircraft hybrid fuel storage systems#25.20.24.00.00
-unspsc7#25.20.24.05.00#Aircraft fuel management systems#25.20.24.00.00
-unspsc7#25.20.24.06.00#Postboosters#25.20.24.00.00
-unspsc7#25.20.25.00.00#Aircraft equipment#25.20.00.00.00
-unspsc7#25.20.25.01.00#Aircraft hydraulic systems#25.20.25.00.00
-unspsc7#25.20.25.02.00#Exterior aircraft lighting#25.20.25.00.00
-unspsc7#25.20.25.03.00#Interior aircraft lighting#25.20.25.00.00
-unspsc7#25.20.25.04.00#Aircraft windshield wipers#25.20.25.00.00
-unspsc7#25.20.25.05.00#Aircraft onboard defrosting or defogging systems#25.20.25.00.00
-unspsc7#25.20.25.06.00#Aircraft doors#25.20.25.00.00
-unspsc7#25.20.25.07.00#Aircraft windows#25.20.25.00.00
-unspsc7#25.20.25.08.00#Aircraft windshields#25.20.25.00.00
-unspsc7#25.20.25.09.00#Aircraft shock mounts#25.20.25.00.00
-unspsc7#25.20.25.10.00#Aircraft slip ring assemblies#25.20.25.00.00
-unspsc7#25.20.26.00.00#Aircraft environmental control systems and components#25.20.00.00.00
-unspsc7#25.20.26.01.00#Aircraft environment controllers#25.20.26.00.00
-unspsc7#25.20.26.02.00#Aircraft environment regulators#25.20.26.00.00
-unspsc7#25.20.26.03.00#Aircraft cooling turbines#25.20.26.00.00
-unspsc7#25.20.26.04.00#Aircraft cooling fans#25.20.26.00.00
-unspsc7#25.20.26.05.00#Aircraft heat exchangers#25.20.26.00.00
-unspsc7#25.20.26.06.00#Aircraft water separators#25.20.26.00.00
-unspsc7#25.20.26.07.00#Aircraft oxygen equipment#25.20.26.00.00
-unspsc7#25.20.27.00.00#Aircraft accumulators#25.20.00.00.00
-unspsc7#25.20.27.01.00#Hydraulic aircraft accumulators#25.20.27.00.00
-unspsc7#25.20.27.02.00#Pneumatic aircraft accumulators#25.20.27.00.00
-unspsc7#26.00.00.00.00#Power Generation and Distribution Machinery and Accessories#26.00.00.00.00
-unspsc7#26.10.00.00.00#Power sources#26.00.00.00.00
-unspsc7#26.10.15.00.00#Engines#26.10.00.00.00
-unspsc7#26.10.15.01.00#Hydraulic engines#26.10.15.00.00
-unspsc7#26.10.15.02.00#Pneumatic engines#26.10.15.00.00
-unspsc7#26.10.15.03.00#Gas engines#26.10.15.00.00
-unspsc7#26.10.15.04.00#Diesel engines#26.10.15.00.00
-unspsc7#26.10.15.05.00#Steam engines#26.10.15.00.00
-unspsc7#26.10.15.06.00#Turbine engines#26.10.15.00.00
-unspsc7#26.10.15.07.00#Turbofan engines#26.10.15.00.00
-unspsc7#26.10.15.08.00#Thermal engines#26.10.15.00.00
-unspsc7#26.10.15.09.00#Hydroelectric engines#26.10.15.00.00
-unspsc7#26.10.15.10.00#Rotary engines#26.10.15.00.00
-unspsc7#26.10.15.11.00#Hydraulic turbine engines#26.10.15.00.00
-unspsc7#26.10.15.12.00#Turboprop engines#26.10.15.00.00
-unspsc7#26.10.15.13.00#Engine Repair Kit#26.10.15.00.00
-unspsc7#26.10.16.00.00#Motors#26.10.00.00.00
-unspsc7#26.10.16.01.00#Induction motors#26.10.16.00.00
-unspsc7#26.10.16.02.00#Alternating current (AC) motors#26.10.16.00.00
-unspsc7#26.10.16.03.00#Direct current (DC) motors#26.10.16.00.00
-unspsc7#26.10.16.04.00#Alternating current or direct current (AC/DC) motors#26.10.16.00.00
-unspsc7#26.10.16.05.00#Dynamotors#26.10.16.00.00
-unspsc7#26.10.16.06.00#Servomotors#26.10.16.00.00
-unspsc7#26.10.16.07.00#Torque motors#26.10.16.00.00
-unspsc7#26.10.16.08.00#Liquid rocket motors#26.10.16.00.00
-unspsc7#26.10.16.09.00#Synchronous motors#26.10.16.00.00
-unspsc7#26.10.16.10.00#Solid rocket motors#26.10.16.00.00
-unspsc7#26.10.16.11.00#Single phase motors#26.10.16.00.00
-unspsc7#26.10.16.12.00#Multi phase motors#26.10.16.00.00
-unspsc7#26.10.16.13.00#Hydraulic motors#26.10.16.00.00
-unspsc7#26.10.16.14.00#Step motors#26.10.16.00.00
-unspsc7#26.10.16.15.00#Alternators#26.10.16.00.00
-unspsc7#26.10.16.16.00#Carbon Brushes#26.10.16.00.00
-unspsc7#26.10.17.00.00#Engine components#26.10.00.00.00
-unspsc7#26.10.17.01.00#Aircraft burners#26.10.17.00.00
-unspsc7#26.10.17.02.00#Aircraft engine compressors#26.10.17.00.00
-unspsc7#26.10.17.03.00#Aircraft engine diffusers#26.10.17.00.00
-unspsc7#26.10.17.04.00#Engine mounts#26.10.17.00.00
-unspsc7#26.10.17.05.00#Aircraft drive shafts power take offs or screw jacks#26.10.17.00.00
-unspsc7#26.10.17.06.00#Aircraft transmission units#26.10.17.00.00
-unspsc7#26.10.17.07.00#Balance shafts#26.10.17.00.00
-unspsc7#26.10.17.08.00#Cam followers#26.10.17.00.00
-unspsc7#26.10.17.09.00#Camshaft lifters#26.10.17.00.00
-unspsc7#26.10.17.10.00#Carburetors#26.10.17.00.00
-unspsc7#26.10.17.11.00#Connecting rods#26.10.17.00.00
-unspsc7#26.10.17.12.00#Crankcase ventillation valves#26.10.17.00.00
-unspsc7#26.10.17.13.00#Cylinder heads#26.10.17.00.00
-unspsc7#26.10.17.14.00#Engine coolant radiators#26.10.17.00.00
-unspsc7#26.10.17.15.00#Engine covers or pans#26.10.17.00.00
-unspsc7#26.10.17.16.00#Engine forgings#26.10.17.00.00
-unspsc7#26.10.17.17.00#Engine heaters#26.10.17.00.00
-unspsc7#26.10.17.18.00#Engine ignition systems#26.10.17.00.00
-unspsc7#26.10.17.19.00#Supercharger#26.10.17.00.00
-unspsc7#26.10.17.20.00#Turbocharger#26.10.17.00.00
-unspsc7#26.10.17.21.00#Engine pulleys#26.10.17.00.00
-unspsc7#26.10.17.22.00#Fuel injection systems#26.10.17.00.00
-unspsc7#26.10.17.23.00#Fuel vapor canister#26.10.17.00.00
-unspsc7#26.10.17.24.00#Glow plugs#26.10.17.00.00
-unspsc7#26.10.17.25.00#Oil dip sticks and tubes#26.10.17.00.00
-unspsc7#26.10.17.26.00#Oil strainers#26.10.17.00.00
-unspsc7#26.10.17.27.00#Piston rings#26.10.17.00.00
-unspsc7#26.10.17.28.00#Push rod tubes#26.10.17.00.00
-unspsc7#26.10.17.29.00#Rocker arm balls#26.10.17.00.00
-unspsc7#26.10.17.30.00#Rocker arm shafts#26.10.17.00.00
-unspsc7#26.10.17.31.00#Rocker arms#26.10.17.00.00
-unspsc7#26.10.17.32.00#Spark plugs#26.10.17.00.00
-unspsc7#26.10.17.33.00#Carburetor jet#26.10.17.00.00
-unspsc7#26.10.17.34.00#Carburetor diaphragms#26.10.17.00.00
-unspsc7#26.10.17.35.00#Oil pan#26.10.17.00.00
-unspsc7#26.10.17.36.00#Pistons#26.10.17.00.00
-unspsc7#26.10.17.37.00#Timing chain#26.10.17.00.00
-unspsc7#26.10.17.38.00#Intake manifolds#26.10.17.00.00
-unspsc7#26.10.17.39.00#Exhaust manifolds#26.10.17.00.00
-unspsc7#26.10.17.40.00#Fuel injectors#26.10.17.00.00
-unspsc7#26.10.17.41.00#Engine sleeves#26.10.17.00.00
-unspsc7#26.10.17.42.00#Fuel injection manifolds#26.10.17.00.00
-unspsc7#26.10.17.43.00#Engine valves#26.10.17.00.00
-unspsc7#26.10.17.44.00#Turbocharger#26.10.17.00.00
-unspsc7#26.10.17.45.00#camshaft#26.10.17.00.00
-unspsc7#26.10.17.46.00#Cylinder head#26.10.17.00.00
-unspsc7#26.10.17.47.00#Push rods#26.10.17.00.00
-unspsc7#26.10.17.48.00#Engine flywheel#26.10.17.00.00
-unspsc7#26.10.17.49.00#Crankshaft#26.10.17.00.00
-unspsc7#26.10.17.50.00#Throttle#26.10.17.00.00
-unspsc7#26.10.17.51.00#Electronic engine controls#26.10.17.00.00
-unspsc7#26.10.17.52.00#Vibration dampers#26.10.17.00.00
-unspsc7#26.10.18.00.00#Motor or generator components#26.10.00.00.00
-unspsc7#26.10.18.01.00#Motor brushes#26.10.18.00.00
-unspsc7#26.10.18.02.00#Armatures#26.10.18.00.00
-unspsc7#26.10.18.03.00#Rotors or stators#26.10.18.00.00
-unspsc7#26.10.18.04.00#Motor mounts or bases#26.10.18.00.00
-unspsc7#26.10.19.00.00#Internal combustion engine components#26.10.00.00.00
-unspsc7#26.10.19.01.00#Crank shafts#26.10.19.00.00
-unspsc7#26.10.19.02.00#Spark plugs#26.10.19.00.00
-unspsc7#26.10.19.03.00#Camshaft#26.10.19.00.00
-unspsc7#26.10.19.04.00#Fuel injection nozzle#26.10.19.00.00
-unspsc7#26.10.19.05.00#Cylinder block#26.10.19.00.00
-unspsc7#26.11.00.00.00#Batteries and generators and kinetic power transmission#26.00.00.00.00
-unspsc7#26.11.15.00.00#Kinetic power transmission#26.11.00.00.00
-unspsc7#26.11.15.01.00#Commutators#26.11.15.00.00
-unspsc7#26.11.15.03.00#Adjustable speed drives#26.11.15.00.00
-unspsc7#26.11.15.04.00#Belt drives#26.11.15.00.00
-unspsc7#26.11.15.05.00#Chain drives#26.11.15.00.00
-unspsc7#26.11.15.06.00#Linear motion devices#26.11.15.00.00
-unspsc7#26.11.15.07.00#Clutches#26.11.15.00.00
-unspsc7#26.11.15.08.00#Power take offs#26.11.15.00.00
-unspsc7#26.11.15.09.00#Transmission yokes#26.11.15.00.00
-unspsc7#26.11.15.10.00#Transmission shafts#26.11.15.00.00
-unspsc7#26.11.15.11.00#Universal joints#26.11.15.00.00
-unspsc7#26.11.15.12.00#Axles#26.11.15.00.00
-unspsc7#26.11.15.13.00#Power transmission chains#26.11.15.00.00
-unspsc7#26.11.15.14.00#Knuckle joints#26.11.15.00.00
-unspsc7#26.11.15.15.00#Servo controller#26.11.15.00.00
-unspsc7#26.11.15.16.00#Step drive or stepper drive or step indexer#26.11.15.00.00
-unspsc7#26.11.15.17.00#Planet carrier#26.11.15.00.00
-unspsc7#26.11.15.18.00#Tension strut#26.11.15.00.00
-unspsc7#26.11.15.19.00#Torque converters#26.11.15.00.00
-unspsc7#26.11.15.20.00#Trunnions#26.11.15.00.00
-unspsc7#26.11.15.21.00#Pusher head#26.11.15.00.00
-unspsc7#26.11.15.22.00#Pusher assembly#26.11.15.00.00
-unspsc7#26.11.15.23.00#Backstops#26.11.15.00.00
-unspsc7#26.11.16.00.00#Power generators#26.11.00.00.00
-unspsc7#26.11.16.01.00#Diesel generators#26.11.16.00.00
-unspsc7#26.11.16.02.00#Hydro electric generators#26.11.16.00.00
-unspsc7#26.11.16.03.00#Wind generators#26.11.16.00.00
-unspsc7#26.11.16.04.00#Gas generators#26.11.16.00.00
-unspsc7#26.11.16.05.00#Thermal generators#26.11.16.00.00
-unspsc7#26.11.16.06.00#Hydraulic generators#26.11.16.00.00
-unspsc7#26.11.16.07.00#Solar generators#26.11.16.00.00
-unspsc7#26.11.17.00.00#Batteries and accessories#26.11.00.00.00
-unspsc7#26.11.17.01.00#Rechargeable batteries#26.11.17.00.00
-unspsc7#26.11.17.02.00#Alkaline batteries#26.11.17.00.00
-unspsc7#26.11.17.03.00#Vehicle batteries#26.11.17.00.00
-unspsc7#26.11.17.04.00#Battery chargers#26.11.17.00.00
-unspsc7#26.11.17.05.00#Dry cell batteries#26.11.17.00.00
-unspsc7#26.11.17.06.00#Electronic batteries#26.11.17.00.00
-unspsc7#26.11.17.07.00#Lead acid batteries#26.11.17.00.00
-unspsc7#26.11.17.08.00#Nickel iron batteries#26.11.17.00.00
-unspsc7#26.11.17.09.00#Nickel cadmium batteries#26.11.17.00.00
-unspsc7#26.11.17.10.00#Product specific battery packs#26.11.17.00.00
-unspsc7#26.11.17.11.00#Lithium batteries#26.11.17.00.00
-unspsc7#26.11.17.12.00#Nickel hydrogen batteries#26.11.17.00.00
-unspsc7#26.11.17.13.00#Thermal batteries#26.11.17.00.00
-unspsc7#26.11.17.14.00#Zync air#26.11.17.00.00
-unspsc7#26.11.17.15.00#Zinc coal battery#26.11.17.00.00
-unspsc7#26.11.17.16.00#Mercury oxide battery#26.11.17.00.00
-unspsc7#26.11.17.17.00#Manganese batteries#26.11.17.00.00
-unspsc7#26.11.17.18.00#Silver oxide batteries#26.11.17.00.00
-unspsc7#26.11.17.19.00#Battery testers#26.11.17.00.00
-unspsc7#26.11.18.00.00#Drive components#26.11.00.00.00
-unspsc7#26.11.18.01.00#V belts#26.11.18.00.00
-unspsc7#26.11.18.02.00#Geared timing belts#26.11.18.00.00
-unspsc7#26.11.18.03.00#Round belts#26.11.18.00.00
-unspsc7#26.11.18.04.00#Flat belts#26.11.18.00.00
-unspsc7#26.11.18.05.00#Belt tensioners#26.11.18.00.00
-unspsc7#26.11.18.06.00#Transmission pulleys#26.11.18.00.00
-unspsc7#26.11.18.07.00#Timing pulley#26.11.18.00.00
-unspsc7#26.11.18.08.00#Trantorque#26.11.18.00.00
-unspsc7#26.11.18.09.00#Belt guards#26.11.18.00.00
-unspsc7#26.11.19.00.00#Clutches#26.11.00.00.00
-unspsc7#26.11.19.01.00#Plate clutches#26.11.19.00.00
-unspsc7#26.11.19.02.00#Diaphragm clutch#26.11.19.00.00
-unspsc7#26.11.19.03.00#Centrifugal clutch#26.11.19.00.00
-unspsc7#26.11.19.04.00#Semi centrifugal clutch#26.11.19.00.00
-unspsc7#26.11.19.05.00#Free wheel clutch#26.11.19.00.00
-unspsc7#26.11.19.06.00#Torque converter#26.11.19.00.00
-unspsc7#26.11.19.07.00#Fluid coupling#26.11.19.00.00
-unspsc7#26.11.19.08.00#Cam clutches#26.11.19.00.00
-unspsc7#26.11.20.00.00#Clutch parts and accessories#26.11.00.00.00
-unspsc7#26.11.20.01.00#Pressure plate#26.11.20.00.00
-unspsc7#26.11.20.02.00#Driven plate#26.11.20.00.00
-unspsc7#26.11.20.03.00#Clutch plates#26.11.20.00.00
-unspsc7#26.11.21.00.00#Industrial braking systems#26.11.00.00.00
-unspsc7#26.11.21.01.00#Air or pneumatic braking systems#26.11.21.00.00
-unspsc7#26.11.21.02.00#Hydraulic braking systems#26.11.21.00.00
-unspsc7#26.11.21.03.00#Mechanical braking systems#26.11.21.00.00
-unspsc7#26.11.21.04.00#Braking clutch assemblies#26.11.21.00.00
-unspsc7#26.12.00.00.00#Electrical wire and cable and harness#26.00.00.00.00
-unspsc7#26.12.15.00.00#Electrical wire#26.12.00.00.00
-unspsc7#26.12.15.01.00#Heating wire#26.12.15.00.00
-unspsc7#26.12.15.05.00#Fixture wire#26.12.15.00.00
-unspsc7#26.12.15.07.00#Radio or television wire#26.12.15.00.00
-unspsc7#26.12.15.08.00#Automotive or aircraft wire#26.12.15.00.00
-unspsc7#26.12.15.09.00#Magnet wire#26.12.15.00.00
-unspsc7#26.12.15.10.00#Trolley wire#26.12.15.00.00
-unspsc7#26.12.15.14.00#Underground wire#26.12.15.00.00
-unspsc7#26.12.15.15.00#Silicon asbestos (SA) wire#26.12.15.00.00
-unspsc7#26.12.15.17.00#Copper wire#26.12.15.00.00
-unspsc7#26.12.15.19.00#Copper clad aluminum wire#26.12.15.00.00
-unspsc7#26.12.15.20.00#Copper steel wire#26.12.15.00.00
-unspsc7#26.12.15.21.00#Bronze wire#26.12.15.00.00
-unspsc7#26.12.15.22.00#Bare wire#26.12.15.00.00
-unspsc7#26.12.15.23.00#Covered but not insulated wire#26.12.15.00.00
-unspsc7#26.12.15.24.00#Insulated or covered wire#26.12.15.00.00
-unspsc7#26.12.15.32.00#Inter connect wire#26.12.15.00.00
-unspsc7#26.12.15.33.00#Kaptan wire#26.12.15.00.00
-unspsc7#26.12.15.34.00#Polymide wire#26.12.15.00.00
-unspsc7#26.12.15.35.00#Extension cord#26.12.15.00.00
-unspsc7#26.12.15.36.00#Extension cord#26.12.15.00.00
-unspsc7#26.12.15.37.00#Wire assembly#26.12.15.00.00
-unspsc7#26.12.15.38.00#Wire assembly#26.12.15.00.00
-unspsc7#26.12.16.00.00#Electrical cable#26.12.00.00.00
-unspsc7#26.12.16.01.00#Heating cable#26.12.16.00.00
-unspsc7#26.12.16.02.00#Submarine cable#26.12.16.00.00
-unspsc7#26.12.16.03.00#Control cable#26.12.16.00.00
-unspsc7#26.12.16.04.00#Signal cable#26.12.16.00.00
-unspsc7#26.12.16.05.00#Automotive or aircraft cable#26.12.16.00.00
-unspsc7#26.12.16.06.00#Coaxial cable#26.12.16.00.00
-unspsc7#26.12.16.07.00#Fiber optic cable#26.12.16.00.00
-unspsc7#26.12.16.08.00#Aerial cable#26.12.16.00.00
-unspsc7#26.12.16.09.00#Network cable#26.12.16.00.00
-unspsc7#26.12.16.10.00#Bronze cable#26.12.16.00.00
-unspsc7#26.12.16.11.00#Bare cable#26.12.16.00.00
-unspsc7#26.12.16.12.00#Covered but not insulated cable#26.12.16.00.00
-unspsc7#26.12.16.13.00#Insulated or covered cable#26.12.16.00.00
-unspsc7#26.12.16.14.00#Building cable#26.12.16.00.00
-unspsc7#26.12.16.15.00#Power cable for direct burial#26.12.16.00.00
-unspsc7#26.12.16.16.00#Telecommunications cable#26.12.16.00.00
-unspsc7#26.12.16.17.00#Triaxial cable#26.12.16.00.00
-unspsc7#26.12.16.18.00#Crosslinked polykaene cable#26.12.16.00.00
-unspsc7#26.12.16.19.00#Floropolymer cable#26.12.16.00.00
-unspsc7#26.12.16.20.00#Inter connect cable#26.12.16.00.00
-unspsc7#26.12.16.21.00#Kaptan cable#26.12.16.00.00
-unspsc7#26.12.16.22.00#Polymide cable#26.12.16.00.00
-unspsc7#26.12.16.23.00#Radio frequency (RF) cable#26.12.16.00.00
-unspsc7#26.12.16.24.00#Ribbon or flat cable#26.12.16.00.00
-unspsc7#26.12.16.25.00#Copper cable#26.12.16.00.00
-unspsc7#26.12.17.00.00#Wiring harness#26.12.00.00.00
-unspsc7#26.12.17.01.00#Panel wiring harness#26.12.17.00.00
-unspsc7#26.12.17.02.00#Trunk wiring harness#26.12.17.00.00
-unspsc7#26.12.17.03.00#Communication wiring harness#26.12.17.00.00
-unspsc7#26.12.17.04.00#Specialty wiring harness#26.12.17.00.00
-unspsc7#26.13.00.00.00#Power generation#26.00.00.00.00
-unspsc7#26.13.15.00.00#Power plants#26.13.00.00.00
-unspsc7#26.13.15.01.00#Diesel power plants#26.13.15.00.00
-unspsc7#26.13.15.02.00#Geothermal power plants#26.13.15.00.00
-unspsc7#26.13.15.03.00#Hydro power plants#26.13.15.00.00
-unspsc7#26.13.15.04.00#Gas power plants#26.13.15.00.00
-unspsc7#26.13.15.05.00#Marine power plants#26.13.15.00.00
-unspsc7#26.13.15.06.00#Petrol power plants#26.13.15.00.00
-unspsc7#26.13.15.07.00#Solar power plants#26.13.15.00.00
-unspsc7#26.13.15.08.00#Steam power plants#26.13.15.00.00
-unspsc7#26.13.15.09.00#Wind power plants#26.13.15.00.00
-unspsc7#26.13.15.10.00#Thermal power plants#26.13.15.00.00
-unspsc7#26.14.00.00.00#Atomic and nuclear energy machinery and equipment#26.00.00.00.00
-unspsc7#26.14.16.00.00#Subcritical assembly equipment#26.14.00.00.00
-unspsc7#26.14.16.01.00#Subcritical assembly fuel#26.14.16.00.00
-unspsc7#26.14.16.02.00#Subcritical assembly components#26.14.16.00.00
-unspsc7#26.14.16.03.00#Subcritical assembly moderator#26.14.16.00.00
-unspsc7#26.14.17.00.00#Dosimetry equipment#26.14.00.00.00
-unspsc7#26.14.17.01.00#Ionization chamber dosimeters#26.14.17.00.00
-unspsc7#26.14.17.02.00#Dosimeters#26.14.17.00.00
-unspsc7#26.14.17.03.00#Secondary standard dosimetry systems#26.14.17.00.00
-unspsc7#26.14.17.04.00#Phantom dosimeters#26.14.17.00.00
-unspsc7#26.14.18.00.00#Hot cell devices#26.14.00.00.00
-unspsc7#26.14.18.01.00#Hot cell remote handling equipment#26.14.18.00.00
-unspsc7#26.14.18.02.00#Hot cell remote viewing device#26.14.18.00.00
-unspsc7#26.14.18.03.00#Hot cell shielding doors#26.14.18.00.00
-unspsc7#26.14.18.04.00#Hot cell samplers#26.14.18.00.00
-unspsc7#26.14.18.05.00#Hot cell sample processing equipment#26.14.18.00.00
-unspsc7#26.14.18.06.00#Hot cell special tools#26.14.18.00.00
-unspsc7#26.14.18.07.00#Hot cell lead glass windows#26.14.18.00.00
-unspsc7#26.14.18.08.00#Hot cell decontamination systems#26.14.18.00.00
-unspsc7#26.14.18.09.00#Hot cell penetration devices#26.14.18.00.00
-unspsc7#26.14.19.00.00#Industrial nucleonic instruments#26.14.00.00.00
-unspsc7#26.14.19.01.00#Industrial nucleonic airborne dust measuring systems#26.14.19.00.00
-unspsc7#26.14.19.02.00#Beta gauge measuring systems#26.14.19.00.00
-unspsc7#26.14.19.04.00#Industrial nucleonic liquid level gauges#26.14.19.00.00
-unspsc7#26.14.19.05.00#Industrial nucleonic mass per unit ore measuring systems#26.14.19.00.00
-unspsc7#26.14.19.06.00#Industrial nucleonic moisture measuring systems#26.14.19.00.00
-unspsc7#26.14.19.07.00#Industrial nucleonic thickness measuring systems#26.14.19.00.00
-unspsc7#26.14.19.08.00#Industrial nucleonic flow measuring systems#26.14.19.00.00
-unspsc7#26.14.19.09.00#Isotope separators#26.14.19.00.00
-unspsc7#26.14.19.10.00#Isotope production facilities#26.14.19.00.00
-unspsc7#26.14.19.11.00#Isotope calibrator activity meters#26.14.19.00.00
-unspsc7#26.14.20.00.00#Irradiation equipment#26.14.00.00.00
-unspsc7#26.14.20.01.00#Irradiation gamma sources#26.14.20.00.00
-unspsc7#26.14.20.02.00#Magnet systems#26.14.20.00.00
-unspsc7#26.14.20.03.00#NIM nuclear electronic units#26.14.20.00.00
-unspsc7#26.14.20.04.00#Neutron irradiators#26.14.20.00.00
-unspsc7#26.14.20.05.00#Irradiation testing capsules#26.14.20.00.00
-unspsc7#26.14.20.06.00#Irradiation sample transfer system#26.14.20.00.00
-unspsc7#26.14.20.07.00#Neutron generators#26.14.20.00.00
-unspsc7#26.14.21.00.00#Nuclear reactor equipment#26.14.00.00.00
-unspsc7#26.14.21.01.00#Nuclear reactor specimen irradiation containers#26.14.21.00.00
-unspsc7#26.14.21.06.00#Nuclear reactor control rod systems#26.14.21.00.00
-unspsc7#26.14.21.08.00#Nuclear reactor in core neutron flux instrumentation#26.14.21.00.00
-unspsc7#26.14.21.17.00#Nuclear reactor earthquake instrumentation#26.14.21.00.00
-unspsc7#26.14.22.00.00#Nuclear fuel equipment#26.14.00.00.00
-unspsc7#26.14.22.01.00#Nuclear fuel cladding tubes#26.14.22.00.00
-unspsc7#26.14.22.02.00#Nuclear fuel element failure detection systems#26.14.22.00.00
-unspsc7#26.14.23.00.00#Radiation shielding equipment#26.14.00.00.00
-unspsc7#26.14.23.02.00#Lead screens#26.14.23.00.00
-unspsc7#26.14.23.03.00#Film badges#26.14.23.00.00
-unspsc7#26.14.23.04.00#Radiographic equipment#26.14.23.00.00
-unspsc7#26.14.23.06.00#Shielded containers for radiation protection#26.14.23.00.00
-unspsc7#26.14.23.07.00#Lead chambers or safes for radiation protection#26.14.23.00.00
-unspsc7#26.14.23.08.00#Lead bricks for radiation protection#26.14.23.00.00
-unspsc7#26.14.23.10.00#Glove boxes for radiation protection#26.14.23.00.00
-unspsc7#26.14.23.11.00#Radiation shielding windows#26.14.23.00.00
-unspsc7#26.14.23.12.00#Lead for radiation shielding#26.14.23.00.00
-unspsc7#26.14.24.00.00#Radioactive waste equipment#26.14.00.00.00
-unspsc7#26.14.24.01.00#Radioactive waste treatment compactors or incinerators#26.14.24.00.00
-unspsc7#26.14.24.02.00#Nuclear radiation absorbers#26.14.24.00.00
-unspsc7#26.14.24.03.00#Atomic energy evaporators or concentrators or dryers#26.14.24.00.00
-unspsc7#26.14.24.04.00#Door interlocking systems#26.14.24.00.00
-unspsc7#26.14.24.05.00#Radioactive waste dosage systems#26.14.24.00.00
-unspsc7#26.14.24.06.00#Radioactive waste solidification systems#26.14.24.00.00
-unspsc7#26.14.24.07.00#Radioactive waste disposal systems#26.14.24.00.00
-unspsc7#26.14.24.08.00#Radioactive waste treatment facilities#26.14.24.00.00
-unspsc7#27.00.00.00.00#Tools and General Machinery#27.00.00.00.00
-unspsc7#27.11.00.00.00#Hand tools#27.00.00.00.00
-unspsc7#27.11.15.00.00#Cutting and crimping and punching tools#27.11.00.00.00
-unspsc7#27.11.15.01.00#Knife blades#27.11.15.00.00
-unspsc7#27.11.15.02.00#Razor knives#27.11.15.00.00
-unspsc7#27.11.15.03.00#Utility knives#27.11.15.00.00
-unspsc7#27.11.15.04.00#Pocket knives#27.11.15.00.00
-unspsc7#27.11.15.05.00#Punches or nail sets or drifts#27.11.15.00.00
-unspsc7#27.11.15.06.00#Shears#27.11.15.00.00
-unspsc7#27.11.15.07.00#Metal cutters#27.11.15.00.00
-unspsc7#27.11.15.08.00#Saws#27.11.15.00.00
-unspsc7#27.11.15.09.00#Augers#27.11.15.00.00
-unspsc7#27.11.15.10.00#Stripping tools#27.11.15.00.00
-unspsc7#27.11.15.11.00#Wire cutters#27.11.15.00.00
-unspsc7#27.11.15.12.00#Bolt cutters#27.11.15.00.00
-unspsc7#27.11.15.13.00#Hose cutter#27.11.15.00.00
-unspsc7#27.11.15.14.00#Glass cutters#27.11.15.00.00
-unspsc7#27.11.15.15.00#Hand or push drill#27.11.15.00.00
-unspsc7#27.11.15.16.00#Punching pliers#27.11.15.00.00
-unspsc7#27.11.15.17.00#Knife blade sets or dispensers#27.11.15.00.00
-unspsc7#27.11.15.20.00#Nut splitters#27.11.15.00.00
-unspsc7#27.11.15.21.00#Nibblers#27.11.15.00.00
-unspsc7#27.11.16.00.00#Forming tools#27.11.00.00.00
-unspsc7#27.11.16.01.00#Mallets#27.11.16.00.00
-unspsc7#27.11.16.02.00#Hammers#27.11.16.00.00
-unspsc7#27.11.16.03.00#Anvils#27.11.16.00.00
-unspsc7#27.11.16.04.00#Hatchets#27.11.16.00.00
-unspsc7#27.11.16.05.00#Picks#27.11.16.00.00
-unspsc7#27.11.16.06.00#Bolt cutters#27.11.16.00.00
-unspsc7#27.11.16.07.00#Swaging tools#27.11.16.00.00
-unspsc7#27.11.17.00.00#Wrenches and drivers#27.11.00.00.00
-unspsc7#27.11.17.01.00#Screwdrivers#27.11.17.00.00
-unspsc7#27.11.17.02.00#Nut drivers#27.11.17.00.00
-unspsc7#27.11.17.03.00#Socket sets#27.11.17.00.00
-unspsc7#27.11.17.04.00#Sockets#27.11.17.00.00
-unspsc7#27.11.17.05.00#Box end wrenches#27.11.17.00.00
-unspsc7#27.11.17.06.00#Open end wrenches#27.11.17.00.00
-unspsc7#27.11.17.07.00#Adjustable wrenches#27.11.17.00.00
-unspsc7#27.11.17.08.00#Pipe wrenches#27.11.17.00.00
-unspsc7#27.11.17.09.00#Screw extractors#27.11.17.00.00
-unspsc7#27.11.17.10.00#Hex keys#27.11.17.00.00
-unspsc7#27.11.17.11.00#Ratchets#27.11.17.00.00
-unspsc7#27.11.17.12.00#Pullers#27.11.17.00.00
-unspsc7#27.11.17.13.00#Combination wrenches#27.11.17.00.00
-unspsc7#27.11.17.14.00#Specialty wrenches#27.11.17.00.00
-unspsc7#27.11.17.15.00#Torque wrenches#27.11.17.00.00
-unspsc7#27.11.17.16.00#Torx keys#27.11.17.00.00
-unspsc7#27.11.17.17.00#Pipe extractors#27.11.17.00.00
-unspsc7#27.11.17.18.00#Tap extractors#27.11.17.00.00
-unspsc7#27.11.17.19.00#Torque wrench#27.11.17.00.00
-unspsc7#27.11.17.20.00#T handle tap wrenches#27.11.17.00.00
-unspsc7#27.11.17.21.00#Cranks#27.11.17.00.00
-unspsc7#27.11.17.22.00#Die stocks#27.11.17.00.00
-unspsc7#27.11.17.23.00#Tube wrenches#27.11.17.00.00
-unspsc7#27.11.17.24.00#Hook wrenches#27.11.17.00.00
-unspsc7#27.11.17.25.00#Offset socket wrenches#27.11.17.00.00
-unspsc7#27.11.17.26.00#Spanner wrenches#27.11.17.00.00
-unspsc7#27.11.18.00.00#Measuring and layout tools#27.11.00.00.00
-unspsc7#27.11.18.01.00#Tape measures#27.11.18.00.00
-unspsc7#27.11.18.02.00#Levels#27.11.18.00.00
-unspsc7#27.11.18.03.00#Squares#27.11.18.00.00
-unspsc7#27.11.18.04.00#Plumb bobs#27.11.18.00.00
-unspsc7#27.11.18.05.00#Protractors#27.11.18.00.00
-unspsc7#27.11.18.06.00#Nail or router gauges#27.11.18.00.00
-unspsc7#27.11.18.07.00#Straight edges#27.11.18.00.00
-unspsc7#27.11.18.08.00#Rules#27.11.18.00.00
-unspsc7#27.11.18.09.00#Bevels#27.11.18.00.00
-unspsc7#27.11.18.10.00#Stud finders#27.11.18.00.00
-unspsc7#27.11.18.11.00#Calipers#27.11.18.00.00
-unspsc7#27.11.19.00.00#Rough and finishing tools#27.11.00.00.00
-unspsc7#27.11.19.01.00#Cold chisels#27.11.19.00.00
-unspsc7#27.11.19.02.00#Files#27.11.19.00.00
-unspsc7#27.11.19.03.00#Planes#27.11.19.00.00
-unspsc7#27.11.19.04.00#Rasps#27.11.19.00.00
-unspsc7#27.11.19.05.00#Grinders#27.11.19.00.00
-unspsc7#27.11.19.06.00#Wood chisels#27.11.19.00.00
-unspsc7#27.11.19.07.00#Wire brushes#27.11.19.00.00
-unspsc7#27.11.19.08.00#Sharpening tools or kits#27.11.19.00.00
-unspsc7#27.11.19.09.00#Spatulas#27.11.19.00.00
-unspsc7#27.11.19.11.00#Cross cut chisels#27.11.19.00.00
-unspsc7#27.11.20.00.00#Garden tools#27.11.00.00.00
-unspsc7#27.11.20.01.00#Machetes#27.11.20.00.00
-unspsc7#27.11.20.02.00#Spades#27.11.20.00.00
-unspsc7#27.11.20.03.00#Rakes#27.11.20.00.00
-unspsc7#27.11.20.04.00#Shovels#27.11.20.00.00
-unspsc7#27.11.20.05.00#Axes#27.11.20.00.00
-unspsc7#27.11.20.06.00#Scythes#27.11.20.00.00
-unspsc7#27.11.20.07.00#Secateurs or pruning shears#27.11.20.00.00
-unspsc7#27.11.20.08.00#Hoes#27.11.20.00.00
-unspsc7#27.11.20.09.00#Scrapers#27.11.20.00.00
-unspsc7#27.11.20.10.00#Garden forks#27.11.20.00.00
-unspsc7#27.11.20.11.00#Tool handles#27.11.20.00.00
-unspsc7#27.11.20.12.00#Garden riddles#27.11.20.00.00
-unspsc7#27.11.20.13.00#Post hole digger#27.11.20.00.00
-unspsc7#27.11.20.14.00#Lawnmowers#27.11.20.00.00
-unspsc7#27.11.20.15.00#Lawn scarifiers#27.11.20.00.00
-unspsc7#27.11.20.16.00#Hedge clippers#27.11.20.00.00
-unspsc7#27.11.20.17.00#Digging bars#27.11.20.00.00
-unspsc7#27.11.21.00.00#Holding and clamping tools#27.11.00.00.00
-unspsc7#27.11.21.01.00#Pipe vises#27.11.21.00.00
-unspsc7#27.11.21.02.00#Bench vises#27.11.21.00.00
-unspsc7#27.11.21.03.00#Hand clamps#27.11.21.00.00
-unspsc7#27.11.21.04.00#Tongs#27.11.21.00.00
-unspsc7#27.11.21.05.00#Tweezers#27.11.21.00.00
-unspsc7#27.11.21.06.00#Linemans pliers#27.11.21.00.00
-unspsc7#27.11.21.07.00#Adjustable widemouth pliers#27.11.21.00.00
-unspsc7#27.11.21.08.00#Needlenose pliers#27.11.21.00.00
-unspsc7#27.11.21.09.00#Magnetic tools#27.11.21.00.00
-unspsc7#27.11.21.10.00#Retaining ring pliers#27.11.21.00.00
-unspsc7#27.11.21.11.00#Alligator pliers#27.11.21.00.00
-unspsc7#27.11.21.12.00#Tongue and groove pliers#27.11.21.00.00
-unspsc7#27.11.21.13.00#Slip or groove joint pliers#27.11.21.00.00
-unspsc7#27.11.21.14.00#Diagonal cut pliers#27.11.21.00.00
-unspsc7#27.11.21.15.00#Locking pliers#27.11.21.00.00
-unspsc7#27.11.21.16.00#Fence pliers#27.11.21.00.00
-unspsc7#27.11.21.17.00#End cut pliers#27.11.21.00.00
-unspsc7#27.11.21.18.00#Wire lug crimping tool#27.11.21.00.00
-unspsc7#27.11.21.19.00#Light bulb changer#27.11.21.00.00
-unspsc7#27.11.21.20.00#C clamps#27.11.21.00.00
-unspsc7#27.11.21.21.00#Corner clamps#27.11.21.00.00
-unspsc7#27.11.21.22.00#Sheet metal pliers#27.11.21.00.00
-unspsc7#27.11.21.23.00#Bench dog#27.11.21.00.00
-unspsc7#27.11.21.24.00#Tensioners#27.11.21.00.00
-unspsc7#27.11.21.25.00#Round nose pliers#27.11.21.00.00
-unspsc7#27.11.21.26.00#Flat nose pliers#27.11.21.00.00
-unspsc7#27.11.21.27.00#Strap wrenches#27.11.21.00.00
-unspsc7#27.11.22.00.00#Masonry and concrete tools#27.11.00.00.00
-unspsc7#27.11.22.01.00#Trowels#27.11.22.00.00
-unspsc7#27.11.22.02.00#Floats#27.11.22.00.00
-unspsc7#27.11.22.03.00#Edgers#27.11.22.00.00
-unspsc7#27.11.22.04.00#Cement mixers#27.11.22.00.00
-unspsc7#27.11.23.00.00#Marking tools#27.11.00.00.00
-unspsc7#27.11.23.01.00#Branders#27.11.23.00.00
-unspsc7#27.11.23.02.00#Awls#27.11.23.00.00
-unspsc7#27.11.23.03.00#Scribers#27.11.23.00.00
-unspsc7#27.11.23.04.00#Chalk lines#27.11.23.00.00
-unspsc7#27.11.23.05.00#Metal markers or holders#27.11.23.00.00
-unspsc7#27.11.23.06.00#Metal stamps#27.11.23.00.00
-unspsc7#27.11.24.00.00#Fastener setting tools#27.11.00.00.00
-unspsc7#27.11.24.01.00#Staple guns#27.11.24.00.00
-unspsc7#27.11.24.02.00#Rivet tools#27.11.24.00.00
-unspsc7#27.11.24.03.00#Banders#27.11.24.00.00
-unspsc7#27.11.24.04.00#Anchor setting tools#27.11.24.00.00
-unspsc7#27.11.24.05.00#Bolt heaters#27.11.24.00.00
-unspsc7#27.11.25.00.00#Prying and bending tools#27.11.00.00.00
-unspsc7#27.11.25.01.00#Pipe bending tools#27.11.25.00.00
-unspsc7#27.11.25.02.00#Pry bars#27.11.25.00.00
-unspsc7#27.11.25.03.00#Conduit benders#27.11.25.00.00
-unspsc7#27.11.25.04.00#Wedges#27.11.25.00.00
-unspsc7#27.11.25.05.00#Packing hooks#27.11.25.00.00
-unspsc7#27.11.25.06.00#Hickeys#27.11.25.00.00
-unspsc7#27.11.26.00.00#Sealing tools#27.11.00.00.00
-unspsc7#27.11.26.01.00#Putty knives#27.11.26.00.00
-unspsc7#27.11.26.02.00#Caulking tools#27.11.26.00.00
-unspsc7#27.11.27.00.00#Power tools#27.11.00.00.00
-unspsc7#27.11.27.01.00#Power blowers#27.11.27.00.00
-unspsc7#27.11.27.02.00#Power buffers#27.11.27.00.00
-unspsc7#27.11.27.03.00#Power drills#27.11.27.00.00
-unspsc7#27.11.27.04.00#Power grinders#27.11.27.00.00
-unspsc7#27.11.27.05.00#Demolition hammers#27.11.27.00.00
-unspsc7#27.11.27.06.00#Power planes#27.11.27.00.00
-unspsc7#27.11.27.07.00#Power routers#27.11.27.00.00
-unspsc7#27.11.27.08.00#Power sanders#27.11.27.00.00
-unspsc7#27.11.27.09.00#Power saws#27.11.27.00.00
-unspsc7#27.11.27.10.00#Power screwguns#27.11.27.00.00
-unspsc7#27.11.27.11.00#Power staple guns#27.11.27.00.00
-unspsc7#27.11.27.12.00#Power trimmers#27.11.27.00.00
-unspsc7#27.11.27.13.00#Impact wrenches#27.11.27.00.00
-unspsc7#27.11.27.14.00#Power caulking guns#27.11.27.00.00
-unspsc7#27.11.27.15.00#Power chippers#27.11.27.00.00
-unspsc7#27.11.27.16.00#Power nail guns#27.11.27.00.00
-unspsc7#27.11.27.17.00#Heat guns#27.11.27.00.00
-unspsc7#27.11.27.18.00#Engravers#27.11.27.00.00
-unspsc7#27.11.27.19.00#Glue guns#27.11.27.00.00
-unspsc7#27.11.27.20.00#Torque tools#27.11.27.00.00
-unspsc7#27.11.27.21.00#Biscuit jointers#27.11.27.00.00
-unspsc7#27.11.28.00.00#Tool attachments#27.11.00.00.00
-unspsc7#27.11.28.01.00#Drill bits#27.11.28.00.00
-unspsc7#27.11.28.02.00#Saw blades#27.11.28.00.00
-unspsc7#27.11.28.03.00#End mills#27.11.28.00.00
-unspsc7#27.11.28.04.00#Stamping dies or punches#27.11.28.00.00
-unspsc7#27.11.28.05.00#Threading dies#27.11.28.00.00
-unspsc7#27.11.28.06.00#Threading taps#27.11.28.00.00
-unspsc7#27.11.28.07.00#Chucks#27.11.28.00.00
-unspsc7#27.11.28.08.00#Collets#27.11.28.00.00
-unspsc7#27.11.28.09.00#Tool holders#27.11.28.00.00
-unspsc7#27.11.28.10.00#Thread repair kits#27.11.28.00.00
-unspsc7#27.11.28.11.00#Arbors#27.11.28.00.00
-unspsc7#27.11.28.12.00#Countersinks#27.11.28.00.00
-unspsc7#27.11.28.13.00#Extension pole#27.11.28.00.00
-unspsc7#27.11.28.14.00#Screwdriver bits#27.11.28.00.00
-unspsc7#27.11.28.15.00#Nut driver bits#27.11.28.00.00
-unspsc7#27.11.28.16.00#Abrasive disk#27.11.28.00.00
-unspsc7#27.11.28.17.00#Hole saws#27.11.28.00.00
-unspsc7#27.11.28.18.00#Vise jaw liners or caps#27.11.28.00.00
-unspsc7#27.11.28.19.00#Skiving tool cutter blades#27.11.28.00.00
-unspsc7#27.11.28.21.00#Router bits#27.11.28.00.00
-unspsc7#27.11.29.00.00#Dispensing tools#27.11.00.00.00
-unspsc7#27.11.29.01.00#Grease guns#27.11.29.00.00
-unspsc7#27.11.29.02.00#Industrial funnels#27.11.29.00.00
-unspsc7#27.11.29.03.00#Hand sprayers#27.11.29.00.00
-unspsc7#27.11.29.04.00#Resin guns#27.11.29.00.00
-unspsc7#27.11.29.05.00#Oil can#27.11.29.00.00
-unspsc7#27.11.29.06.00#Caulking guns#27.11.29.00.00
-unspsc7#27.11.29.07.00#Broadcast spreaders#27.11.29.00.00
-unspsc7#27.11.30.00.00#Brushes#27.11.00.00.00
-unspsc7#27.11.30.01.00#Scratch brushes#27.11.30.00.00
-unspsc7#27.11.30.02.00#Tube brushes#27.11.30.00.00
-unspsc7#27.11.30.03.00#Applicator brushes#27.11.30.00.00
-unspsc7#27.11.31.00.00#Pulling tools#27.11.00.00.00
-unspsc7#27.11.31.01.00#Fish tape#27.11.31.00.00
-unspsc7#27.11.31.02.00#Fuse pullers#27.11.31.00.00
-unspsc7#27.11.32.00.00#Tool kits#27.11.00.00.00
-unspsc7#27.11.32.01.00#General tool kits#27.11.32.00.00
-unspsc7#27.11.32.02.00#Bearing fitting tool kits#27.11.32.00.00
-unspsc7#27.11.32.03.00#Computer tool kits#27.11.32.00.00
-unspsc7#27.11.32.04.00#Electrician kits#27.11.32.00.00
-unspsc7#27.12.00.00.00#Hydraulic machinery and equipment#27.00.00.00.00
-unspsc7#27.12.15.00.00#Hydraulic presses#27.12.00.00.00
-unspsc7#27.12.15.01.00#Press return springs#27.12.15.00.00
-unspsc7#27.12.16.00.00#Hydraulic cylinders and pistons#27.12.00.00.00
-unspsc7#27.12.16.01.00#Cylinder pistons#27.12.16.00.00
-unspsc7#27.12.16.02.00#Hydraulic cylinders#27.12.16.00.00
-unspsc7#27.12.17.00.00#Hydraulic hose and tube fittings#27.12.00.00.00
-unspsc7#27.12.17.01.00#Hydraulic quick connectors#27.12.17.00.00
-unspsc7#27.12.17.02.00#Hydraulic tees or crosses#27.12.17.00.00
-unspsc7#27.12.17.03.00#Ferrules#27.12.17.00.00
-unspsc7#27.12.17.04.00#Hydraulic unions#27.12.17.00.00
-unspsc7#27.12.17.05.00#Hydraulic or compression elbows#27.12.17.00.00
-unspsc7#27.12.17.06.00#Ferrule nuts#27.12.17.00.00
-unspsc7#27.12.17.07.00#Crimp connectors#27.12.17.00.00
-unspsc7#27.12.18.00.00#Hydraulic quick connectors#27.12.00.00.00
-unspsc7#27.12.19.00.00#Hydraulic tees or crosses#27.12.00.00.00
-unspsc7#27.12.20.00.00#Ferrules#27.12.00.00.00
-unspsc7#27.12.30.00.00#Hydraulic unions#27.12.00.00.00
-unspsc7#27.12.40.00.00#Hydraulic or compression elbows#27.12.00.00.00
-unspsc7#27.12.50.00.00#Ferrule nuts#27.12.00.00.00
-unspsc7#27.12.60.00.00#Crimp connectors#27.12.00.00.00
-unspsc7#27.12.61.00.00#Hydraulic tools#27.12.00.00.00
-unspsc7#27.12.61.01.00#Manhole cover lifters#27.12.61.00.00
-unspsc7#27.13.00.00.00#Pneumatic machinery and equipment#27.00.00.00.00
-unspsc7#27.13.15.00.00#Pneumatic tools#27.13.00.00.00
-unspsc7#27.13.15.01.00#Pneumatic impact wrenches#27.13.15.00.00
-unspsc7#27.13.15.02.00#Compressed air gun#27.13.15.00.00
-unspsc7#27.13.15.03.00#Pneumatic screwdriver#27.13.15.00.00
-unspsc7#27.13.15.04.00#Pneumatic hammer#27.13.15.00.00
-unspsc7#27.13.15.05.00#Pneumatic drill#27.13.15.00.00
-unspsc7#27.13.15.06.00#Pneumatic nail drivers#27.13.15.00.00
-unspsc7#27.13.15.07.00#Pneumatic sanding machines#27.13.15.00.00
-unspsc7#27.13.16.00.00#Air fittings and connectors#27.13.00.00.00
-unspsc7#27.13.16.01.00#Air manifolds#27.13.16.00.00
-unspsc7#27.13.16.02.00#Filters#27.13.16.00.00
-unspsc7#27.13.16.03.00#Regulator#27.13.16.00.00
-unspsc7#27.13.16.04.00#Lubricator#27.13.16.00.00
-unspsc7#27.13.16.05.00#Air curtain#27.13.16.00.00
-unspsc7#27.13.16.06.00#Air coupling#27.13.16.00.00
-unspsc7#30.00.00.00.00#Structures and Building and Construction and Manufacturing Components and Supplies#30.00.00.00.00
-unspsc7#30.10.00.00.00#Structural materials and basic shapes#30.00.00.00.00
-unspsc7#30.10.15.00.00#Angles#30.10.00.00.00
-unspsc7#30.10.15.01.00#Ferrous alloy angles#30.10.15.00.00
-unspsc7#30.10.15.02.00#Non ferrous alloy angles#30.10.15.00.00
-unspsc7#30.10.15.03.00#Iron angles#30.10.15.00.00
-unspsc7#30.10.15.04.00#Steel angles#30.10.15.00.00
-unspsc7#30.10.15.05.00#Stainless steel angles#30.10.15.00.00
-unspsc7#30.10.15.06.00#Aluminum angles#30.10.15.00.00
-unspsc7#30.10.15.07.00#Magnesium angles#30.10.15.00.00
-unspsc7#30.10.15.08.00#Titanium angles#30.10.15.00.00
-unspsc7#30.10.15.09.00#Copper angles#30.10.15.00.00
-unspsc7#30.10.15.10.00#Brass angles#30.10.15.00.00
-unspsc7#30.10.15.11.00#Bronze angles#30.10.15.00.00
-unspsc7#30.10.15.12.00#Zinc angles#30.10.15.00.00
-unspsc7#30.10.15.13.00#Tin angles#30.10.15.00.00
-unspsc7#30.10.15.14.00#Lead angles#30.10.15.00.00
-unspsc7#30.10.15.15.00#Plastic angles#30.10.15.00.00
-unspsc7#30.10.15.16.00#Rubber angles#30.10.15.00.00
-unspsc7#30.10.15.17.00#Precious metal angles#30.10.15.00.00
-unspsc7#30.10.16.00.00#Bar#30.10.00.00.00
-unspsc7#30.10.16.01.00#Ferrous alloy bars#30.10.16.00.00
-unspsc7#30.10.16.02.00#Non ferrous alloy bars#30.10.16.00.00
-unspsc7#30.10.16.03.00#Iron bars#30.10.16.00.00
-unspsc7#30.10.16.04.00#Steel bars#30.10.16.00.00
-unspsc7#30.10.16.05.00#Stainless steel bars#30.10.16.00.00
-unspsc7#30.10.16.06.00#Aluminum bars#30.10.16.00.00
-unspsc7#30.10.16.07.00#Magnesium bars#30.10.16.00.00
-unspsc7#30.10.16.08.00#Titanium bars#30.10.16.00.00
-unspsc7#30.10.16.09.00#Copper bars#30.10.16.00.00
-unspsc7#30.10.16.10.00#Brass bars#30.10.16.00.00
-unspsc7#30.10.16.11.00#Bronze bars#30.10.16.00.00
-unspsc7#30.10.16.12.00#Zinc bars#30.10.16.00.00
-unspsc7#30.10.16.13.00#Tin bars#30.10.16.00.00
-unspsc7#30.10.16.14.00#Lead bars#30.10.16.00.00
-unspsc7#30.10.16.15.00#Plastic bars#30.10.16.00.00
-unspsc7#30.10.16.16.00#Precious metal bars#30.10.16.00.00
-unspsc7#30.10.16.17.00#Wooden bars#30.10.16.00.00
-unspsc7#30.10.17.00.00#Beams#30.10.00.00.00
-unspsc7#30.10.17.01.00#Ferrous alloy beams#30.10.17.00.00
-unspsc7#30.10.17.02.00#Non ferrous alloy beams#30.10.17.00.00
-unspsc7#30.10.17.03.00#Iron beams#30.10.17.00.00
-unspsc7#30.10.17.04.00#Steel beams#30.10.17.00.00
-unspsc7#30.10.17.05.00#Stainless steel beams#30.10.17.00.00
-unspsc7#30.10.17.06.00#Aluminum beams#30.10.17.00.00
-unspsc7#30.10.17.07.00#Magnesium beams#30.10.17.00.00
-unspsc7#30.10.17.08.00#Titanium beams#30.10.17.00.00
-unspsc7#30.10.17.09.00#Copper beams#30.10.17.00.00
-unspsc7#30.10.17.10.00#Brass beams#30.10.17.00.00
-unspsc7#30.10.17.11.00#Bronze beams#30.10.17.00.00
-unspsc7#30.10.17.12.00#Zinc beams#30.10.17.00.00
-unspsc7#30.10.17.13.00#Tin beams#30.10.17.00.00
-unspsc7#30.10.17.14.00#Lead beams#30.10.17.00.00
-unspsc7#30.10.17.15.00#Plastic beams#30.10.17.00.00
-unspsc7#30.10.17.16.00#Rubber beams#30.10.17.00.00
-unspsc7#30.10.17.17.00#Concrete beams#30.10.17.00.00
-unspsc7#30.10.17.18.00#Precious metal beams#30.10.17.00.00
-unspsc7#30.10.18.00.00#Channels#30.10.00.00.00
-unspsc7#30.10.18.01.00#Ferrous alloy channels#30.10.18.00.00
-unspsc7#30.10.18.02.00#Non ferrous alloy channels#30.10.18.00.00
-unspsc7#30.10.18.03.00#Iron channels#30.10.18.00.00
-unspsc7#30.10.18.04.00#Steel channels#30.10.18.00.00
-unspsc7#30.10.18.05.00#Stainless steel channels#30.10.18.00.00
-unspsc7#30.10.18.06.00#Aluminum channels#30.10.18.00.00
-unspsc7#30.10.18.07.00#Magnesium channels#30.10.18.00.00
-unspsc7#30.10.18.08.00#Titanium channnels#30.10.18.00.00
-unspsc7#30.10.18.09.00#Copper channels#30.10.18.00.00
-unspsc7#30.10.18.10.00#Brass channels#30.10.18.00.00
-unspsc7#30.10.18.11.00#Bronze channels#30.10.18.00.00
-unspsc7#30.10.18.12.00#Zinc channels#30.10.18.00.00
-unspsc7#30.10.18.13.00#Tin channels#30.10.18.00.00
-unspsc7#30.10.18.14.00#Lead channels#30.10.18.00.00
-unspsc7#30.10.18.15.00#Plastic channels#30.10.18.00.00
-unspsc7#30.10.18.16.00#Rubber channels#30.10.18.00.00
-unspsc7#30.10.18.17.00#Precious metal channels#30.10.18.00.00
-unspsc7#30.10.19.00.00#Coil#30.10.00.00.00
-unspsc7#30.10.19.01.00#Ferrous alloy coil#30.10.19.00.00
-unspsc7#30.10.19.02.00#Non ferrous alloy coil#30.10.19.00.00
-unspsc7#30.10.19.03.00#Iron coil#30.10.19.00.00
-unspsc7#30.10.19.04.00#Steel coil#30.10.19.00.00
-unspsc7#30.10.19.05.00#Stainless steel coil#30.10.19.00.00
-unspsc7#30.10.19.06.00#Aluminum coil#30.10.19.00.00
-unspsc7#30.10.19.07.00#Magnesium coil#30.10.19.00.00
-unspsc7#30.10.19.08.00#Titanium coil#30.10.19.00.00
-unspsc7#30.10.19.09.00#Copper coil#30.10.19.00.00
-unspsc7#30.10.19.10.00#Brass coil#30.10.19.00.00
-unspsc7#30.10.19.11.00#Bronze coil#30.10.19.00.00
-unspsc7#30.10.19.12.00#Zinc coil#30.10.19.00.00
-unspsc7#30.10.19.13.00#Tin coil#30.10.19.00.00
-unspsc7#30.10.19.14.00#Lead coil#30.10.19.00.00
-unspsc7#30.10.19.15.00#Plastic coil#30.10.19.00.00
-unspsc7#30.10.19.16.00#Precious metal coils#30.10.19.00.00
-unspsc7#30.10.19.17.00#Non metallic coils#30.10.19.00.00
-unspsc7#30.10.19.18.00#Perforated steel#30.10.19.00.00
-unspsc7#30.10.19.19.00#Embossed steel#30.10.19.00.00
-unspsc7#30.10.19.20.00#Compressed fiber coil#30.10.19.00.00
-unspsc7#30.10.19.21.00#Fiber and rubber coil#30.10.19.00.00
-unspsc7#30.10.19.22.00#Graphite coil#30.10.19.00.00
-unspsc7#30.10.20.00.00#Foil#30.10.00.00.00
-unspsc7#30.10.20.01.00#Ferrous alloy foil#30.10.20.00.00
-unspsc7#30.10.20.02.00#Non ferrous alloy foil#30.10.20.00.00
-unspsc7#30.10.20.03.00#Iron foil#30.10.20.00.00
-unspsc7#30.10.20.04.00#Steel foil#30.10.20.00.00
-unspsc7#30.10.20.05.00#Stainless steel foil#30.10.20.00.00
-unspsc7#30.10.20.06.00#Aluminum foil#30.10.20.00.00
-unspsc7#30.10.20.07.00#Magnesium foil#30.10.20.00.00
-unspsc7#30.10.20.08.00#Titanium foil#30.10.20.00.00
-unspsc7#30.10.20.09.00#Copper foil#30.10.20.00.00
-unspsc7#30.10.20.10.00#Brass foil#30.10.20.00.00
-unspsc7#30.10.20.11.00#Bronze foil#30.10.20.00.00
-unspsc7#30.10.20.12.00#Zinc foil#30.10.20.00.00
-unspsc7#30.10.20.13.00#Tin foil#30.10.20.00.00
-unspsc7#30.10.20.14.00#Lead foil#30.10.20.00.00
-unspsc7#30.10.20.15.00#Plastic foil#30.10.20.00.00
-unspsc7#30.10.21.00.00#Pipe#30.10.00.00.00
-unspsc7#30.10.21.01.00#Ferrous alloy pipe#30.10.21.00.00
-unspsc7#30.10.21.02.00#Non ferrous alloy pipe#30.10.21.00.00
-unspsc7#30.10.21.03.00#Iron pipe#30.10.21.00.00
-unspsc7#30.10.21.04.00#Steel pipe#30.10.21.00.00
-unspsc7#30.10.21.05.00#Stainless steel pipe#30.10.21.00.00
-unspsc7#30.10.21.06.00#Aluminum pipe#30.10.21.00.00
-unspsc7#30.10.21.07.00#Magnesium pipe#30.10.21.00.00
-unspsc7#30.10.21.08.00#Titanium pipe#30.10.21.00.00
-unspsc7#30.10.21.09.00#Copper pipe#30.10.21.00.00
-unspsc7#30.10.21.10.00#Brass pipe#30.10.21.00.00
-unspsc7#30.10.21.11.00#Bronze pipe#30.10.21.00.00
-unspsc7#30.10.21.12.00#Zinc pipe#30.10.21.00.00
-unspsc7#30.10.21.13.00#Tin pipe#30.10.21.00.00
-unspsc7#30.10.21.14.00#Lead pipe#30.10.21.00.00
-unspsc7#30.10.21.15.00#Plastic pipe#30.10.21.00.00
-unspsc7#30.10.21.16.00#Rubber pipe#30.10.21.00.00
-unspsc7#30.10.21.17.00#Concrete pipe#30.10.21.00.00
-unspsc7#30.10.22.00.00#Plate#30.10.00.00.00
-unspsc7#30.10.22.01.00#Ferrous alloy plate#30.10.22.00.00
-unspsc7#30.10.22.02.00#Non ferrous plate#30.10.22.00.00
-unspsc7#30.10.22.03.00#Iron plate#30.10.22.00.00
-unspsc7#30.10.22.04.00#Steel plate#30.10.22.00.00
-unspsc7#30.10.22.05.00#Stainless steel plate#30.10.22.00.00
-unspsc7#30.10.22.06.00#Aluminum plate#30.10.22.00.00
-unspsc7#30.10.22.07.00#Magnesium plate#30.10.22.00.00
-unspsc7#30.10.22.08.00#Titanium plate#30.10.22.00.00
-unspsc7#30.10.22.09.00#Copper plate#30.10.22.00.00
-unspsc7#30.10.22.10.00#Brass plate#30.10.22.00.00
-unspsc7#30.10.22.11.00#Bronze plate#30.10.22.00.00
-unspsc7#30.10.22.12.00#Zinc plate#30.10.22.00.00
-unspsc7#30.10.22.13.00#Tin plate#30.10.22.00.00
-unspsc7#30.10.22.14.00#Lead plate#30.10.22.00.00
-unspsc7#30.10.22.15.00#Plastic plate#30.10.22.00.00
-unspsc7#30.10.22.16.00#Rubber plate#30.10.22.00.00
-unspsc7#30.10.22.17.00#Concrete plate#30.10.22.00.00
-unspsc7#30.10.22.18.00#Precious metal plate#30.10.22.00.00
-unspsc7#30.10.22.19.00#Non metallic plates#30.10.22.00.00
-unspsc7#30.10.23.00.00#Profiles#30.10.00.00.00
-unspsc7#30.10.23.01.00#Ferrous alloy profiles#30.10.23.00.00
-unspsc7#30.10.23.02.00#Non ferrous alloy profiles#30.10.23.00.00
-unspsc7#30.10.23.03.00#Iron profiles#30.10.23.00.00
-unspsc7#30.10.23.04.00#Steel profiles#30.10.23.00.00
-unspsc7#30.10.23.05.00#Stainless steel profiles#30.10.23.00.00
-unspsc7#30.10.23.06.00#Aluminum profiles#30.10.23.00.00
-unspsc7#30.10.23.07.00#Magnesium profiles#30.10.23.00.00
-unspsc7#30.10.23.08.00#Titanium profiles#30.10.23.00.00
-unspsc7#30.10.23.09.00#Copper profiles#30.10.23.00.00
-unspsc7#30.10.23.10.00#Brass profiles#30.10.23.00.00
-unspsc7#30.10.23.11.00#Bronze profiles#30.10.23.00.00
-unspsc7#30.10.23.12.00#Zinc profiles#30.10.23.00.00
-unspsc7#30.10.23.13.00#Tin profiles#30.10.23.00.00
-unspsc7#30.10.23.14.00#Lead profiles#30.10.23.00.00
-unspsc7#30.10.23.15.00#Plastic profiles#30.10.23.00.00
-unspsc7#30.10.23.16.00#Rubber profiles#30.10.23.00.00
-unspsc7#30.10.24.00.00#Rod#30.10.00.00.00
-unspsc7#30.10.24.01.00#Ferrous alloy rods#30.10.24.00.00
-unspsc7#30.10.24.02.00#Non ferrous alloy rods#30.10.24.00.00
-unspsc7#30.10.24.03.00#Iron rods#30.10.24.00.00
-unspsc7#30.10.24.04.00#Steel rods#30.10.24.00.00
-unspsc7#30.10.24.05.00#Stainless steel rods#30.10.24.00.00
-unspsc7#30.10.24.06.00#Aluminum rods#30.10.24.00.00
-unspsc7#30.10.24.07.00#Magnesium rods#30.10.24.00.00
-unspsc7#30.10.24.08.00#Titanium rods#30.10.24.00.00
-unspsc7#30.10.24.09.00#Copper rods#30.10.24.00.00
-unspsc7#30.10.24.10.00#Brass rods#30.10.24.00.00
-unspsc7#30.10.24.11.00#Bronze rods#30.10.24.00.00
-unspsc7#30.10.24.12.00#Zinc rods#30.10.24.00.00
-unspsc7#30.10.24.13.00#Tin rods#30.10.24.00.00
-unspsc7#30.10.24.14.00#Lead rods#30.10.24.00.00
-unspsc7#30.10.24.15.00#Plastic rods#30.10.24.00.00
-unspsc7#30.10.24.16.00#Rubber rods#30.10.24.00.00
-unspsc7#30.10.25.00.00#Sheet#30.10.00.00.00
-unspsc7#30.10.25.01.00#Ferrous alloy sheet#30.10.25.00.00
-unspsc7#30.10.25.02.00#Non ferrous alloy sheet#30.10.25.00.00
-unspsc7#30.10.25.03.00#Iron sheet#30.10.25.00.00
-unspsc7#30.10.25.04.00#Steel sheet#30.10.25.00.00
-unspsc7#30.10.25.05.00#Stainless steel sheet#30.10.25.00.00
-unspsc7#30.10.25.06.00#Aluminum sheet#30.10.25.00.00
-unspsc7#30.10.25.07.00#Magnesium sheet#30.10.25.00.00
-unspsc7#30.10.25.08.00#Titanium sheet#30.10.25.00.00
-unspsc7#30.10.25.09.00#Copper sheet#30.10.25.00.00
-unspsc7#30.10.25.10.00#Brass sheet#30.10.25.00.00
-unspsc7#30.10.25.11.00#Bronze sheet#30.10.25.00.00
-unspsc7#30.10.25.12.00#Zinc sheet#30.10.25.00.00
-unspsc7#30.10.25.13.00#Tin sheet#30.10.25.00.00
-unspsc7#30.10.25.14.00#Lead sheet#30.10.25.00.00
-unspsc7#30.10.25.15.00#Plastic sheet#30.10.25.00.00
-unspsc7#30.10.25.16.00#Rubber sheet#30.10.25.00.00
-unspsc7#30.10.25.17.00#Armor sheet#30.10.25.00.00
-unspsc7#30.10.25.18.00#Beryllium alloy sheet#30.10.25.00.00
-unspsc7#30.10.25.19.00#Composite metal sheet#30.10.25.00.00
-unspsc7#30.10.25.20.00#Nickel sheet#30.10.25.00.00
-unspsc7#30.10.25.21.00#Foam Rubber Sheet#30.10.25.00.00
-unspsc7#30.10.25.22.00#Cork and rubber sheet#30.10.25.00.00
-unspsc7#30.10.25.23.00#Compressed fiber sheet#30.10.25.00.00
-unspsc7#30.10.25.24.00#Metal inserted compressed fiber sheet#30.10.25.00.00
-unspsc7#30.10.25.25.00#Fiber and rubber sheet#30.10.25.00.00
-unspsc7#30.10.25.26.00#Asbestos sheets#30.10.25.00.00
-unspsc7#30.10.26.00.00#Strip#30.10.00.00.00
-unspsc7#30.10.26.01.00#Ferrous alloy strip#30.10.26.00.00
-unspsc7#30.10.26.02.00#Non ferrous alloy strip#30.10.26.00.00
-unspsc7#30.10.26.03.00#Iron strip#30.10.26.00.00
-unspsc7#30.10.26.04.00#Steel strip#30.10.26.00.00
-unspsc7#30.10.26.05.00#Stainless steel strip#30.10.26.00.00
-unspsc7#30.10.26.06.00#Aluminum strip#30.10.26.00.00
-unspsc7#30.10.26.07.00#Magnesium strip#30.10.26.00.00
-unspsc7#30.10.26.08.00#Titanium strip#30.10.26.00.00
-unspsc7#30.10.26.09.00#Copper strip#30.10.26.00.00
-unspsc7#30.10.26.10.00#Brass strip#30.10.26.00.00
-unspsc7#30.10.26.11.00#Bronze strip#30.10.26.00.00
-unspsc7#30.10.26.12.00#Zinc strip#30.10.26.00.00
-unspsc7#30.10.26.13.00#Tin strip#30.10.26.00.00
-unspsc7#30.10.26.14.00#Lead strip#30.10.26.00.00
-unspsc7#30.10.26.15.00#Plastic strip#30.10.26.00.00
-unspsc7#30.10.26.16.00#Rubber strip#30.10.26.00.00
-unspsc7#30.10.27.00.00#Tube and tubing#30.10.00.00.00
-unspsc7#30.10.27.01.00#Ferrous alloy tubing#30.10.27.00.00
-unspsc7#30.10.27.02.00#Copper tubing#30.10.27.00.00
-unspsc7#30.10.27.03.00#Titanium tubing#30.10.27.00.00
-unspsc7#30.10.27.04.00#Magnesium tubing#30.10.27.00.00
-unspsc7#30.10.27.05.00#Tin tubing#30.10.27.00.00
-unspsc7#30.10.27.06.00#Brass tubing#30.10.27.00.00
-unspsc7#30.10.27.07.00#Lead tubing#30.10.27.00.00
-unspsc7#30.10.27.08.00#Bronze tubing#30.10.27.00.00
-unspsc7#30.10.27.09.00#Zinc tubing#30.10.27.00.00
-unspsc7#30.10.27.10.00#Steel tubing#30.10.27.00.00
-unspsc7#30.10.27.11.00#Iron tubing#30.10.27.00.00
-unspsc7#30.10.27.12.00#Cement tubing#30.10.27.00.00
-unspsc7#30.10.27.13.00#Plastic tubing#30.10.27.00.00
-unspsc7#30.10.27.14.00#Rubber tubing#30.10.27.00.00
-unspsc7#30.10.27.15.00#Glass tubing#30.10.27.00.00
-unspsc7#30.10.27.16.00#Stone tubing#30.10.27.00.00
-unspsc7#30.10.27.17.00#Non ferrous alloy tubing#30.10.27.00.00
-unspsc7#30.10.27.18.00#Aluminum tubing#30.10.27.00.00
-unspsc7#30.10.27.19.00#Stainless steel tubing#30.10.27.00.00
-unspsc7#30.10.27.20.00#Precious metal tubing#30.10.27.00.00
-unspsc7#30.10.28.00.00#Piling#30.10.00.00.00
-unspsc7#30.10.28.01.00#Aluminum pilings#30.10.28.00.00
-unspsc7#30.10.28.02.00#Concrete pilings#30.10.28.00.00
-unspsc7#30.10.28.03.00#Steel pilings#30.10.28.00.00
-unspsc7#30.10.29.00.00#Post#30.10.00.00.00
-unspsc7#30.10.29.01.00#Cement or concrete posts#30.10.29.00.00
-unspsc7#30.10.29.02.00#Steel posts#30.10.29.00.00
-unspsc7#30.10.29.03.00#Metal posts#30.10.29.00.00
-unspsc7#30.10.29.04.00#Wooden posts#30.10.29.00.00
-unspsc7#30.10.29.05.00#Plastic posts#30.10.29.00.00
-unspsc7#30.10.29.06.00#Fiberglass posts#30.10.29.00.00
-unspsc7#30.10.30.00.00#Shafting#30.10.00.00.00
-unspsc7#30.10.30.01.00#Steel shafting#30.10.30.00.00
-unspsc7#30.10.30.02.00#Stainless steel shafting#30.10.30.00.00
-unspsc7#30.10.31.00.00#Rails#30.10.00.00.00
-unspsc7#30.10.31.01.00#Steel rail#30.10.31.00.00
-unspsc7#30.10.31.02.00#Aluminum rail#30.10.31.00.00
-unspsc7#30.10.31.03.00#Metal rail#30.10.31.00.00
-unspsc7#30.10.32.00.00#Grating#30.10.00.00.00
-unspsc7#30.10.32.01.00#Steel grating#30.10.32.00.00
-unspsc7#30.10.32.02.00#Stainless steel grating#30.10.32.00.00
-unspsc7#30.10.32.03.00#Aluminum grating#30.10.32.00.00
-unspsc7#30.10.32.04.00#Fiberglass grating#30.10.32.00.00
-unspsc7#30.10.32.05.00#Iron grating#30.10.32.00.00
-unspsc7#30.10.33.00.00#Billets#30.10.00.00.00
-unspsc7#30.10.33.01.00#Aluminum billet#30.10.33.00.00
-unspsc7#30.10.33.02.00#Brass billet#30.10.33.00.00
-unspsc7#30.10.33.03.00#Bronze billets#30.10.33.00.00
-unspsc7#30.10.33.04.00#Copper billets#30.10.33.00.00
-unspsc7#30.10.33.05.00#Lead billets#30.10.33.00.00
-unspsc7#30.10.33.06.00#Zinc billets#30.10.33.00.00
-unspsc7#30.10.33.07.00#Steel billets#30.10.33.00.00
-unspsc7#30.10.33.08.00#Titanium billets#30.10.33.00.00
-unspsc7#30.10.33.09.00#Magnesium billets#30.10.33.00.00
-unspsc7#30.10.33.10.00#Precious metal billets#30.10.33.00.00
-unspsc7#30.10.33.11.00#Non ferrous metal billets#30.10.33.00.00
-unspsc7#30.10.33.12.00#Ferrous metal billets#30.10.33.00.00
-unspsc7#30.10.33.13.00#Non metallic billets#30.10.33.00.00
-unspsc7#30.10.34.00.00#Ingots#30.10.00.00.00
-unspsc7#30.10.34.01.00#Aluminum ingots#30.10.34.00.00
-unspsc7#30.10.34.02.00#Brass ingots#30.10.34.00.00
-unspsc7#30.10.34.03.00#Lead ingots#30.10.34.00.00
-unspsc7#30.10.34.04.00#Zinc ingots#30.10.34.00.00
-unspsc7#30.10.34.05.00#Steel ingots#30.10.34.00.00
-unspsc7#30.10.34.06.00#Magnesium ingots#30.10.34.00.00
-unspsc7#30.10.34.07.00#Bronze ingots#30.10.34.00.00
-unspsc7#30.10.34.08.00#Copper ingots#30.10.34.00.00
-unspsc7#30.10.34.09.00#Titanium ingots#30.10.34.00.00
-unspsc7#30.10.34.10.00#Precious metal ingots#30.10.34.00.00
-unspsc7#30.10.34.11.00#Ferrous alloy extrusion ingots#30.10.34.00.00
-unspsc7#30.10.34.12.00#Non ferrous alloy extrusion ingots#30.10.34.00.00
-unspsc7#30.10.34.13.00#Non metallic ingots#30.10.34.00.00
-unspsc7#30.10.35.00.00#Honeycomb core#30.10.00.00.00
-unspsc7#30.10.35.01.00#Aluminum honeycomb core#30.10.35.00.00
-unspsc7#30.10.35.02.00#Magnesium honeycomb core#30.10.35.00.00
-unspsc7#30.10.35.03.00#Foam honeycomb core#30.10.35.00.00
-unspsc7#30.10.35.04.00#Plastic honeycomb core#30.10.35.00.00
-unspsc7#30.10.35.05.00#Wooden honeycomb core#30.10.35.00.00
-unspsc7#30.10.35.06.00#Ferrous metal honeycomb core#30.10.35.00.00
-unspsc7#30.10.35.07.00#Bronze honeycomb core#30.10.35.00.00
-unspsc7#30.10.35.08.00#Copper honeycomb core#30.10.35.00.00
-unspsc7#30.10.35.09.00#Steel honeycomb core#30.10.35.00.00
-unspsc7#30.10.35.10.00#Lead honeycomb core#30.10.35.00.00
-unspsc7#30.10.35.11.00#Zinc honeycomb core#30.10.35.00.00
-unspsc7#30.10.35.12.00#Titanium honeycomb core#30.10.35.00.00
-unspsc7#30.10.35.13.00#Brass honeycomb core#30.10.35.00.00
-unspsc7#30.10.35.14.00#Non ferrous metal honeycomb core#30.10.35.00.00
-unspsc7#30.10.35.15.00#Precious metal honeycomb core#30.10.35.00.00
-unspsc7#30.10.36.00.00#Structural products#30.10.00.00.00
-unspsc7#30.10.36.01.00#Wood beams#30.10.36.00.00
-unspsc7#30.10.36.02.00#Wood composite beams#30.10.36.00.00
-unspsc7#30.10.36.03.00#Framing lumber#30.10.36.00.00
-unspsc7#30.10.36.04.00#Wood sheathing or sheets#30.10.36.00.00
-unspsc7#30.10.36.05.00#Wood planks#30.10.36.00.00
-unspsc7#30.10.36.06.00#Wood trusses#30.10.36.00.00
-unspsc7#30.10.36.07.00#Wood joists#30.10.36.00.00
-unspsc7#30.10.37.00.00#Braid#30.10.00.00.00
-unspsc7#30.10.37.01.00#Stainless steel braid#30.10.37.00.00
-unspsc7#30.11.00.00.00#Concrete and cement and plaster#30.00.00.00.00
-unspsc7#30.11.15.00.00#Concrete and mortars#30.11.00.00.00
-unspsc7#30.11.15.01.00#Foamed concrete#30.11.15.00.00
-unspsc7#30.11.15.02.00#Conductive concrete#30.11.15.00.00
-unspsc7#30.11.15.03.00#Insulating concrete#30.11.15.00.00
-unspsc7#30.11.15.04.00#Mortars#30.11.15.00.00
-unspsc7#30.11.16.00.00#Cement and lime#30.11.00.00.00
-unspsc7#30.11.16.01.00#Cement#30.11.16.00.00
-unspsc7#30.11.16.02.00#Chlorinated lime#30.11.16.00.00
-unspsc7#30.11.16.03.00#Hydraulic lime#30.11.16.00.00
-unspsc7#30.11.16.04.00#Hydrated lime#30.11.16.00.00
-unspsc7#30.11.16.05.00#Lean lime#30.11.16.00.00
-unspsc7#30.11.16.06.00#Grout#30.11.16.00.00
-unspsc7#30.11.16.07.00#Unslaked lime#30.11.16.00.00
-unspsc7#30.11.17.00.00#Plasters#30.11.00.00.00
-unspsc7#30.11.17.01.00#Gypsum plaster#30.11.17.00.00
-unspsc7#30.12.00.00.00#Roads and landscape#30.00.00.00.00
-unspsc7#30.12.15.00.00#Bituminous derivatives#30.12.00.00.00
-unspsc7#30.12.15.01.00#Coal tar#30.12.15.00.00
-unspsc7#30.12.15.02.00#Tars#30.12.15.00.00
-unspsc7#30.12.15.03.00#Cresote#30.12.15.00.00
-unspsc7#30.12.16.00.00#Asphalts#30.12.00.00.00
-unspsc7#30.12.16.01.00#Asphalt#30.12.16.00.00
-unspsc7#30.12.16.02.00#Pitch#30.12.16.00.00
-unspsc7#30.12.16.03.00#Gilsonite#30.12.16.00.00
-unspsc7#30.12.16.04.00#Cutback products#30.12.16.00.00
-unspsc7#30.12.16.05.00#Manhole frames with covers#30.12.16.00.00
-unspsc7#30.13.00.00.00#Structural building products#30.00.00.00.00
-unspsc7#30.13.15.00.00#Blocks#30.13.00.00.00
-unspsc7#30.13.15.01.00#Cement blocks#30.13.15.00.00
-unspsc7#30.13.15.02.00#Concrete blocks#30.13.15.00.00
-unspsc7#30.13.15.03.00#Stone blocks#30.13.15.00.00
-unspsc7#30.13.15.04.00#Ceramic blocks#30.13.15.00.00
-unspsc7#30.13.16.00.00#Bricks#30.13.00.00.00
-unspsc7#30.13.16.01.00#Cement bricks#30.13.16.00.00
-unspsc7#30.13.16.02.00#Ceramic bricks#30.13.16.00.00
-unspsc7#30.13.16.03.00#Concrete bricks#30.13.16.00.00
-unspsc7#30.13.16.04.00#Stone bricks#30.13.16.00.00
-unspsc7#30.13.17.00.00#Tiles and flagstones#30.13.00.00.00
-unspsc7#30.13.17.01.00#Cement tiles or flagstones#30.13.17.00.00
-unspsc7#30.13.17.02.00#Stone tiles or flagstones#30.13.17.00.00
-unspsc7#30.13.17.03.00#Concrete tiles or flagstones#30.13.17.00.00
-unspsc7#30.13.17.04.00#Ceramic tiles or flagstones#30.13.17.00.00
-unspsc7#30.13.17.05.00#Head stones#30.13.17.00.00
-unspsc7#30.14.00.00.00#Insulation#30.00.00.00.00
-unspsc7#30.14.15.00.00#Thermal insulation#30.14.00.00.00
-unspsc7#30.14.15.01.00#Weather stripping#30.14.15.00.00
-unspsc7#30.14.15.02.00#Insulation blankets#30.14.15.00.00
-unspsc7#30.14.15.03.00#Foam insulation#30.14.15.00.00
-unspsc7#30.14.15.04.00#Insulation batts#30.14.15.00.00
-unspsc7#30.14.15.05.00#Thermal insulation sleeving#30.14.15.00.00
-unspsc7#30.14.15.06.00#Loose fill insulation#30.14.15.00.00
-unspsc7#30.14.15.07.00#Rigid board insulation#30.14.15.00.00
-unspsc7#30.14.15.08.00#Fiber insulation#30.14.15.00.00
-unspsc7#30.14.15.09.00#Refractories#30.14.15.00.00
-unspsc7#30.14.15.10.00#Door sweep#30.14.15.00.00
-unspsc7#30.14.15.11.00#Window film#30.14.15.00.00
-unspsc7#30.14.16.00.00#Specialty insulation#30.14.00.00.00
-unspsc7#30.14.16.01.00#Acoustical insulation#30.14.16.00.00
-unspsc7#30.14.16.02.00#Non thermal insulation sleeving#30.14.16.00.00
-unspsc7#30.14.16.03.00#Heat Shields#30.14.16.00.00
-unspsc7#30.15.00.00.00#Exterior finishing materials#30.00.00.00.00
-unspsc7#30.15.15.00.00#Roofing materials#30.15.00.00.00
-unspsc7#30.15.15.01.00#Roll roofing#30.15.15.00.00
-unspsc7#30.15.15.02.00#Roof valleys#30.15.15.00.00
-unspsc7#30.15.15.03.00#Roofing fabrics#30.15.15.00.00
-unspsc7#30.15.15.04.00#Roofing felts#30.15.15.00.00
-unspsc7#30.15.15.05.00#Roofing membranes#30.15.15.00.00
-unspsc7#30.15.15.06.00#Roofing tiles#30.15.15.00.00
-unspsc7#30.15.15.07.00#Shakes#30.15.15.00.00
-unspsc7#30.15.15.08.00#Shingles#30.15.15.00.00
-unspsc7#30.15.15.09.00#Trusses#30.15.15.00.00
-unspsc7#30.15.15.10.00#Slate roofing#30.15.15.00.00
-unspsc7#30.15.16.00.00#Roofing accessories#30.15.00.00.00
-unspsc7#30.15.16.01.00#Roof fascias#30.15.16.00.00
-unspsc7#30.15.16.02.00#Flashings#30.15.16.00.00
-unspsc7#30.15.16.03.00#Gravel stops#30.15.16.00.00
-unspsc7#30.15.16.04.00#Roofing brushes#30.15.16.00.00
-unspsc7#30.15.16.05.00#Roofing drains#30.15.16.00.00
-unspsc7#30.15.16.06.00#Roofing mops#30.15.16.00.00
-unspsc7#30.15.16.07.00#Roofing vents#30.15.16.00.00
-unspsc7#30.15.16.08.00#Soffits#30.15.16.00.00
-unspsc7#30.15.16.09.00#Roof curbs#30.15.16.00.00
-unspsc7#30.15.16.10.00#Roof rippers#30.15.16.00.00
-unspsc7#30.15.17.00.00#Rain gutters and accessories#30.15.00.00.00
-unspsc7#30.15.17.01.00#Downspouts#30.15.17.00.00
-unspsc7#30.15.17.02.00#Drip caps#30.15.17.00.00
-unspsc7#30.15.17.03.00#Gutters#30.15.17.00.00
-unspsc7#30.15.17.04.00#Splashblocks#30.15.17.00.00
-unspsc7#30.15.18.00.00#Siding and exterior wall materials#30.15.00.00.00
-unspsc7#30.15.18.01.00#Shutters#30.15.18.00.00
-unspsc7#30.15.18.02.00#Siding#30.15.18.00.00
-unspsc7#30.15.18.03.00#Siding butt joints#30.15.18.00.00
-unspsc7#30.15.18.04.00#Siding corners#30.15.18.00.00
-unspsc7#30.15.18.05.00#Stucco#30.15.18.00.00
-unspsc7#30.15.18.06.00#Glass curtainwalling#30.15.18.00.00
-unspsc7#30.15.19.00.00#Finishing materials and products#30.15.00.00.00
-unspsc7#30.15.19.01.00#Awnings#30.15.19.00.00
-unspsc7#30.15.19.02.00#Exterior trim materials#30.15.19.00.00
-unspsc7#30.15.20.00.00#Fencing#30.15.00.00.00
-unspsc7#30.15.20.01.00#Metal fencing#30.15.20.00.00
-unspsc7#30.15.20.02.00#Wood fencing#30.15.20.00.00
-unspsc7#30.15.21.00.00#Surface#30.15.00.00.00
-unspsc7#30.15.21.01.00#Shot steel#30.15.21.00.00
-unspsc7#30.16.00.00.00#Interior finishing materials#30.00.00.00.00
-unspsc7#30.16.15.00.00#Wall finishing materials#30.16.00.00.00
-unspsc7#30.16.15.01.00#Wallboard#30.16.15.00.00
-unspsc7#30.16.15.02.00#Wallpapers#30.16.15.00.00
-unspsc7#30.16.15.03.00#Drywall#30.16.15.00.00
-unspsc7#30.16.15.04.00#Corner guards#30.16.15.00.00
-unspsc7#30.16.15.05.00#Panels or panelling#30.16.15.00.00
-unspsc7#30.16.15.06.00#Plaster#30.16.15.00.00
-unspsc7#30.16.15.07.00#Drywall joint compounds#30.16.15.00.00
-unspsc7#30.16.15.08.00#Wallpaper roller#30.16.15.00.00
-unspsc7#30.16.16.00.00#Ceiling materials#30.16.00.00.00
-unspsc7#30.16.16.01.00#Acoustic ceiling tiles#30.16.16.00.00
-unspsc7#30.16.16.02.00#Ceiling panels#30.16.16.00.00
-unspsc7#30.16.16.03.00#Coffers#30.16.16.00.00
-unspsc7#30.16.16.04.00#Suspended ceiling systems#30.16.16.00.00
-unspsc7#30.16.17.00.00#Flooring#30.16.00.00.00
-unspsc7#30.16.17.01.00#Carpeting#30.16.17.00.00
-unspsc7#30.16.17.02.00#Wood flooring#30.16.17.00.00
-unspsc7#30.16.17.03.00#Linoleum#30.16.17.00.00
-unspsc7#30.16.17.05.00#Rubber flooring#30.16.17.00.00
-unspsc7#30.16.17.06.00#Stone or tile flooring#30.16.17.00.00
-unspsc7#30.16.17.07.00#Vinyl flooring#30.16.17.00.00
-unspsc7#30.16.17.08.00#Knotted carpeting#30.16.17.00.00
-unspsc7#30.16.17.09.00#Tufted carpeting#30.16.17.00.00
-unspsc7#30.16.17.10.00#Laminate flooring#30.16.17.00.00
-unspsc7#30.16.17.11.00#Outdoor carpeting#30.16.17.00.00
-unspsc7#30.16.17.12.00#Flooring joists#30.16.17.00.00
-unspsc7#30.16.17.13.00#Carpet pads#30.16.17.00.00
-unspsc7#30.16.17.14.00#Cork flooring#30.16.17.00.00
-unspsc7#30.16.17.15.00#Duckboards#30.16.17.00.00
-unspsc7#30.16.17.16.00#Tile spacers#30.16.17.00.00
-unspsc7#30.16.18.00.00#Cabinetry#30.16.00.00.00
-unspsc7#30.16.18.01.00#Cabinets#30.16.18.00.00
-unspsc7#30.16.18.02.00#Countertops#30.16.18.00.00
-unspsc7#30.16.19.00.00#Molding and millwork#30.16.00.00.00
-unspsc7#30.16.19.01.00#Louvers#30.16.19.00.00
-unspsc7#30.16.19.02.00#Columns#30.16.19.00.00
-unspsc7#30.16.19.03.00#Wainscoting#30.16.19.00.00
-unspsc7#30.16.19.04.00#Cornices#30.16.19.00.00
-unspsc7#30.16.19.05.00#Door surrounds#30.16.19.00.00
-unspsc7#30.16.19.06.00#Molding#30.16.19.00.00
-unspsc7#30.16.19.07.00#Stairs#30.16.19.00.00
-unspsc7#30.16.19.08.00#Stair parts#30.16.19.00.00
-unspsc7#30.17.00.00.00#Doors and windows and glass#30.00.00.00.00
-unspsc7#30.17.15.00.00#Doors#30.17.00.00.00
-unspsc7#30.17.15.01.00#Glass doors#30.17.15.00.00
-unspsc7#30.17.15.02.00#Screen doors#30.17.15.00.00
-unspsc7#30.17.15.03.00#Rolling doors#30.17.15.00.00
-unspsc7#30.17.15.04.00#Wooden doors#30.17.15.00.00
-unspsc7#30.17.15.05.00#Metal doors#30.17.15.00.00
-unspsc7#30.17.15.06.00#Storm doors#30.17.15.00.00
-unspsc7#30.17.15.07.00#Door frames#30.17.15.00.00
-unspsc7#30.17.15.08.00#Pocket doors#30.17.15.00.00
-unspsc7#30.17.15.09.00#Revolving doors#30.17.15.00.00
-unspsc7#30.17.15.10.00#Automatic doors#30.17.15.00.00
-unspsc7#30.17.15.11.00#Swing door#30.17.15.00.00
-unspsc7#30.17.15.12.00#Door openers#30.17.15.00.00
-unspsc7#30.17.16.00.00#Windows#30.17.00.00.00
-unspsc7#30.17.16.04.00#Double hung windows#30.17.16.00.00
-unspsc7#30.17.16.05.00#Single hung windows#30.17.16.00.00
-unspsc7#30.17.16.06.00#Casement windows#30.17.16.00.00
-unspsc7#30.17.16.07.00#Horizontal slider windows#30.17.16.00.00
-unspsc7#30.17.16.08.00#Tilt or transom windows#30.17.16.00.00
-unspsc7#30.17.16.09.00#Fixed windows#30.17.16.00.00
-unspsc7#30.17.16.10.00#Bay windows#30.17.16.00.00
-unspsc7#30.17.16.11.00#Bow windows#30.17.16.00.00
-unspsc7#30.17.16.12.00#Projected windows#30.17.16.00.00
-unspsc7#30.17.16.13.00#Window walls#30.17.16.00.00
-unspsc7#30.17.16.14.00#Window screens#30.17.16.00.00
-unspsc7#30.17.16.15.00#French windows#30.17.16.00.00
-unspsc7#30.17.17.00.00#Glass products#30.17.00.00.00
-unspsc7#30.17.17.01.00#Paving blocks#30.17.17.00.00
-unspsc7#30.17.17.03.00#Beveled glass#30.17.17.00.00
-unspsc7#30.17.17.04.00#Leaded glass#30.17.17.00.00
-unspsc7#30.17.17.05.00#Laminated glass#30.17.17.00.00
-unspsc7#30.17.17.06.00#Tempered glass#30.17.17.00.00
-unspsc7#30.17.17.07.00#Safety glass#30.17.17.00.00
-unspsc7#30.17.17.08.00#Float glass#30.17.17.00.00
-unspsc7#30.17.17.09.00#Wired glass#30.17.17.00.00
-unspsc7#30.17.18.00.00#Skylights#30.17.00.00.00
-unspsc7#30.17.18.01.00#Fixed skylights#30.17.18.00.00
-unspsc7#30.17.18.02.00#Vented skylights#30.17.18.00.00
-unspsc7#30.17.18.03.00#Tube skylights#30.17.18.00.00
-unspsc7#30.17.19.00.00#Window frames#30.17.00.00.00
-unspsc7#30.17.19.01.00#Double hung window frames#30.17.19.00.00
-unspsc7#30.17.19.02.00#Single hung window frames#30.17.19.00.00
-unspsc7#30.17.19.03.00#Casement window frames#30.17.19.00.00
-unspsc7#30.17.19.04.00#Horizontal slider window frames#30.17.19.00.00
-unspsc7#30.17.19.05.00#Tilt or transom window frames#30.17.19.00.00
-unspsc7#30.17.19.06.00#Fixed window frames#30.17.19.00.00
-unspsc7#30.17.20.00.00#Gates#30.17.00.00.00
-unspsc7#30.17.20.01.00#Single bar gate#30.17.20.00.00
-unspsc7#30.17.20.02.00#Double bar gate#30.17.20.00.00
-unspsc7#30.18.00.00.00#Plumbing fixtures#30.00.00.00.00
-unspsc7#30.18.15.00.00#Sanitary ware#30.18.00.00.00
-unspsc7#30.18.15.01.00#Bathtubs#30.18.15.00.00
-unspsc7#30.18.15.02.00#Bidets#30.18.15.00.00
-unspsc7#30.18.15.03.00#Showers#30.18.15.00.00
-unspsc7#30.18.15.04.00#Sinks#30.18.15.00.00
-unspsc7#30.18.15.05.00#Toilets#30.18.15.00.00
-unspsc7#30.18.15.06.00#Urinals#30.18.15.00.00
-unspsc7#30.18.15.07.00#Bathtub or shower enclosures#30.18.15.00.00
-unspsc7#30.18.15.08.00#Restroom partitions#30.18.15.00.00
-unspsc7#30.18.15.09.00#Soap dishes#30.18.15.00.00
-unspsc7#30.18.15.10.00#Napkin rings#30.18.15.00.00
-unspsc7#30.19.00.00.00#Construction and maintenance support equipment#30.00.00.00.00
-unspsc7#30.19.15.00.00#Ladders and scaffolding#30.19.00.00.00
-unspsc7#30.19.15.01.00#Ladders#30.19.15.00.00
-unspsc7#30.19.15.02.00#Scaffolding#30.19.15.00.00
-unspsc7#30.19.15.03.00#Step stool#30.19.15.00.00
-unspsc7#30.19.15.04.00#Step stool#30.19.15.00.00
-unspsc7#30.19.15.05.00#Step stool#30.19.15.00.00
-unspsc7#30.19.16.00.00#Ladders and scaffolding accessories#30.19.00.00.00
-unspsc7#30.19.16.01.00#Handrails#30.19.16.00.00
-unspsc7#30.19.16.02.00#Scaffolding stabilizers#30.19.16.00.00
-unspsc7#30.19.16.03.00#Scaffolding flooring#30.19.16.00.00
-unspsc7#30.20.00.00.00#Prefabricated structures#30.00.00.00.00
-unspsc7#30.20.15.00.00#Prefabricated farm structures#30.20.00.00.00
-unspsc7#30.20.15.01.00#Silos#30.20.15.00.00
-unspsc7#30.20.15.02.00#Greenhouses#30.20.15.00.00
-unspsc7#30.20.16.00.00#Prefabricated residential structures#30.20.00.00.00
-unspsc7#30.20.16.01.00#Houses#30.20.16.00.00
-unspsc7#30.20.16.02.00#Mobile homes#30.20.16.00.00
-unspsc7#30.20.16.03.00#Cabins#30.20.16.00.00
-unspsc7#30.20.16.04.00#Garages#30.20.16.00.00
-unspsc7#30.20.16.05.00#Gazebo#30.20.16.00.00
-unspsc7#30.20.17.00.00#Prefabricated commercial and industrial structures#30.20.00.00.00
-unspsc7#30.20.17.01.00#In plant offices#30.20.17.00.00
-unspsc7#30.20.17.02.00#Spray booths#30.20.17.00.00
-unspsc7#30.20.17.03.00#Storage sheds#30.20.17.00.00
-unspsc7#30.20.17.04.00#Clean rooms#30.20.17.00.00
-unspsc7#30.20.17.05.00#Guardhouses#30.20.17.00.00
-unspsc7#30.20.17.06.00#Portable toilettes#30.20.17.00.00
-unspsc7#30.20.17.07.00#Warehouses#30.20.17.00.00
-unspsc7#30.20.17.08.00#Auditorium#30.20.17.00.00
-unspsc7#30.20.17.09.00#Conservatory#30.20.17.00.00
-unspsc7#30.20.17.10.00#Office kitchens#30.20.17.00.00
-unspsc7#30.20.18.00.00#Prefabricated emergency relief structures#30.20.00.00.00
-unspsc7#30.20.18.01.00#Shelters#30.20.18.00.00
-unspsc7#30.20.18.02.00#Emergency tent halls#30.20.18.00.00
-unspsc7#30.20.18.03.00#Container units#30.20.18.00.00
-unspsc7#30.20.19.00.00#Prefabricated medical structures#30.20.00.00.00
-unspsc7#30.20.19.01.00#Medical units#30.20.19.00.00
-unspsc7#30.20.19.02.00#Laboratory units#30.20.19.00.00
-unspsc7#30.20.19.03.00#Dental units#30.20.19.00.00
-unspsc7#30.20.19.04.00#Surgical units#30.20.19.00.00
-unspsc7#30.21.00.00.00#Electrical equipment and components and supplies#30.00.00.00.00
-unspsc7#30.21.15.00.00#Power conversion#30.21.00.00.00
-unspsc7#30.21.15.01.00#Transformers#30.21.15.00.00
-unspsc7#30.21.15.02.00#Power supply units#30.21.15.00.00
-unspsc7#30.21.15.03.00#Power distribution units (PDUs)#30.21.15.00.00
-unspsc7#30.21.15.04.00#Power adapters or inverters#30.21.15.00.00
-unspsc7#30.21.15.05.00#Frequency converters#30.21.15.00.00
-unspsc7#30.21.15.06.00#Signal converters#30.21.15.00.00
-unspsc7#30.21.15.07.00#Transducers#30.21.15.00.00
-unspsc7#30.21.15.08.00#Regulators#30.21.15.00.00
-unspsc7#30.21.15.09.00#Magnetic coils#30.21.15.00.00
-unspsc7#30.21.15.10.00#Uninterruptible power supplies#30.21.15.00.00
-unspsc7#30.21.15.11.00#Solenoids#30.21.15.00.00
-unspsc7#30.21.15.12.00#Chokes#30.21.15.00.00
-unspsc7#30.21.15.13.00#Electric rotary converters#30.21.15.00.00
-unspsc7#30.21.15.14.00#Capacitor banks#30.21.15.00.00
-unspsc7#30.21.15.15.00#Reactors#30.21.15.00.00
-unspsc7#30.21.16.00.00#Conduits and raceways#30.21.00.00.00
-unspsc7#30.21.16.01.00#Cable trays#30.21.16.00.00
-unspsc7#30.21.16.02.00#Electrical conduit#30.21.16.00.00
-unspsc7#30.21.16.03.00#Electrical raceways#30.21.16.00.00
-unspsc7#30.21.16.04.00#Wiring ducts#30.21.16.00.00
-unspsc7#30.21.16.05.00#Wireways#30.21.16.00.00
-unspsc7#30.21.16.06.00#Wiring troughs#30.21.16.00.00
-unspsc7#30.21.17.00.00#Electrical boxes and enclosures and fittings#30.21.00.00.00
-unspsc7#30.21.17.01.00#Electrical boxes#30.21.17.00.00
-unspsc7#30.21.17.02.00#Electrical box covers#30.21.17.00.00
-unspsc7#30.21.17.03.00#Weatherproof boxes#30.21.17.00.00
-unspsc7#30.21.17.04.00#Switch boxes#30.21.17.00.00
-unspsc7#30.21.17.05.00#Floor boxes#30.21.17.00.00
-unspsc7#30.21.17.06.00#Outlet boxes#30.21.17.00.00
-unspsc7#30.21.17.07.00#Specialty electrical boxes#30.21.17.00.00
-unspsc7#30.21.17.08.00#Utility boxes#30.21.17.00.00
-unspsc7#30.21.17.09.00#Electrical fittings#30.21.17.00.00
-unspsc7#30.21.17.10.00#Electrical bushings#30.21.17.00.00
-unspsc7#30.21.17.11.00#Ceiling flanges#30.21.17.00.00
-unspsc7#30.21.18.00.00#Lugs connectors and terminals#30.21.00.00.00
-unspsc7#30.21.18.01.00#Electrical terminals#30.21.18.00.00
-unspsc7#30.21.18.02.00#Electrical plugs#30.21.18.00.00
-unspsc7#30.21.18.03.00#Twist lock plugs#30.21.18.00.00
-unspsc7#30.21.18.04.00#Electrical sleeves#30.21.18.00.00
-unspsc7#30.21.18.05.00#Cable or wire lugs#30.21.18.00.00
-unspsc7#30.21.18.06.00#Electrical receptacles#30.21.18.00.00
-unspsc7#30.21.18.07.00#Terminal strips#30.21.18.00.00
-unspsc7#30.21.18.08.00#Mechanical connectors#30.21.18.00.00
-unspsc7#30.21.18.09.00#Ring or flag terminals#30.21.18.00.00
-unspsc7#30.21.18.10.00#Wire connectors#30.21.18.00.00
-unspsc7#30.21.18.11.00#Terminal blocks#30.21.18.00.00
-unspsc7#30.21.18.12.00#Fuse blocks#30.21.18.00.00
-unspsc7#30.21.18.13.00#Backshell connectors#30.21.18.00.00
-unspsc7#30.21.18.14.00#Circular connectors#30.21.18.00.00
-unspsc7#30.21.18.15.00#Coaxial connectors#30.21.18.00.00
-unspsc7#30.21.18.16.00#Flat connectors#30.21.18.00.00
-unspsc7#30.21.18.17.00#Electronic connector caps#30.21.18.00.00
-unspsc7#30.21.18.18.00#Radio frequency (RF) connectors#30.21.18.00.00
-unspsc7#30.21.18.19.00#Electrical metallic tubing (EMT) connectors#30.21.18.00.00
-unspsc7#30.21.18.20.00#Compression connectors#30.21.18.00.00
-unspsc7#30.21.18.21.00#Set screw couplings#30.21.18.00.00
-unspsc7#30.21.18.22.00#Flex connectors#30.21.18.00.00
-unspsc7#30.21.18.23.00#Liquid tight connectors#30.21.18.00.00
-unspsc7#30.21.18.24.00#Connector assemblies#30.21.18.00.00
-unspsc7#30.21.18.25.00#Mechanical couplings#30.21.18.00.00
-unspsc7#30.21.18.26.00#Spring jaw connectors#30.21.18.00.00
-unspsc7#30.21.18.27.00#Terminal block covers#30.21.18.00.00
-unspsc7#30.21.18.28.00#Terminal block separator#30.21.18.00.00
-unspsc7#30.21.18.29.00#Jumper bar#30.21.18.00.00
-unspsc7#30.21.18.30.00#Wiring taps#30.21.18.00.00
-unspsc7#30.21.18.31.00#Electrical taps#30.21.18.00.00
-unspsc7#30.21.18.32.00#Fiber optic connector#30.21.18.00.00
-unspsc7#30.21.19.00.00#Switches and controls and relays#30.21.00.00.00
-unspsc7#30.21.19.01.00#Safety switches#30.21.19.00.00
-unspsc7#30.21.19.02.00#Dimmer switches#30.21.19.00.00
-unspsc7#30.21.19.03.00#Drum switches#30.21.19.00.00
-unspsc7#30.21.19.04.00#Time switches#30.21.19.00.00
-unspsc7#30.21.19.05.00#Snap switches#30.21.19.00.00
-unspsc7#30.21.19.06.00#Mechanical switches#30.21.19.00.00
-unspsc7#30.21.19.07.00#Pressure switches#30.21.19.00.00
-unspsc7#30.21.19.08.00#Toggle switches#30.21.19.00.00
-unspsc7#30.21.19.09.00#Slide switches#30.21.19.00.00
-unspsc7#30.21.19.10.00#Limit switches#30.21.19.00.00
-unspsc7#30.21.19.11.00#Controller switches#30.21.19.00.00
-unspsc7#30.21.19.12.00#Variable switches#30.21.19.00.00
-unspsc7#30.21.19.13.00#Push button switches#30.21.19.00.00
-unspsc7#30.21.19.14.00#Rotary switches#30.21.19.00.00
-unspsc7#30.21.19.15.00#Power relays#30.21.19.00.00
-unspsc7#30.21.19.16.00#General purpose relays#30.21.19.00.00
-unspsc7#30.21.19.17.00#Socket relays#30.21.19.00.00
-unspsc7#30.21.19.18.00#Alternating voltage relays#30.21.19.00.00
-unspsc7#30.21.19.19.00#Mercury relays#30.21.19.00.00
-unspsc7#30.21.19.20.00#Time relays#30.21.19.00.00
-unspsc7#30.21.19.21.00#Overload relays#30.21.19.00.00
-unspsc7#30.21.19.22.00#Motor starter controls#30.21.19.00.00
-unspsc7#30.21.19.23.00#Electrical contacts#30.21.19.00.00
-unspsc7#30.21.19.24.00#Timer controls#30.21.19.00.00
-unspsc7#30.21.19.25.00#Photocontrols#30.21.19.00.00
-unspsc7#30.21.19.26.00#Non fusible switches#30.21.19.00.00
-unspsc7#30.21.19.27.00#Radio frequency (RF) switches#30.21.19.00.00
-unspsc7#30.21.19.28.00#Proximity switches#30.21.19.00.00
-unspsc7#30.21.19.29.00#Encoders#30.21.19.00.00
-unspsc7#30.21.19.30.00#Photoelectric sensors#30.21.19.00.00
-unspsc7#30.21.19.31.00#Contactors#30.21.19.00.00
-unspsc7#30.21.20.00.00#Circuit protection devices and accessories#30.21.00.00.00
-unspsc7#30.21.20.01.00#Circuit breakers#30.21.20.00.00
-unspsc7#30.21.20.02.00#Magnetic circuit breakers#30.21.20.00.00
-unspsc7#30.21.20.03.00#Miniature circuit breakers#30.21.20.00.00
-unspsc7#30.21.20.04.00#Time delay fuses#30.21.20.00.00
-unspsc7#30.21.20.05.00#Plug fuses#30.21.20.00.00
-unspsc7#30.21.20.06.00#Cartridge fuses#30.21.20.00.00
-unspsc7#30.21.20.07.00#Glass body fuses#30.21.20.00.00
-unspsc7#30.21.20.08.00#Class type fuses#30.21.20.00.00
-unspsc7#30.21.20.09.00#Midget fuses#30.21.20.00.00
-unspsc7#30.21.20.10.00#Surge suppressers#30.21.20.00.00
-unspsc7#30.21.20.11.00#Ceramic fuses#30.21.20.00.00
-unspsc7#30.21.20.12.00#Blade fuses#30.21.20.00.00
-unspsc7#30.21.21.00.00#Electrical hardware and supplies#30.21.00.00.00
-unspsc7#30.21.21.01.00#Electrical hangers#30.21.21.00.00
-unspsc7#30.21.21.02.00#Cable clips#30.21.21.00.00
-unspsc7#30.21.21.03.00#Cable ties#30.21.21.00.00
-unspsc7#30.21.21.04.00#Wallplates#30.21.21.00.00
-unspsc7#30.21.21.05.00#Switchplates#30.21.21.00.00
-unspsc7#30.21.21.06.00#Cable clamps#30.21.21.00.00
-unspsc7#30.21.21.07.00#Transformer bushings#30.21.21.00.00
-unspsc7#30.21.21.08.00#Harness board nails#30.21.21.00.00
-unspsc7#30.21.21.09.00#Din Rail#30.21.21.00.00
-unspsc7#30.21.21.10.00#Handle tie#30.21.21.00.00
-unspsc7#30.21.21.11.00#Electrical receptacle multipliers#30.21.21.00.00
-unspsc7#30.21.21.12.00#Tubings#30.21.21.00.00
-unspsc7#30.21.21.13.00#End caps#30.21.21.00.00
-unspsc7#30.21.21.14.00#Spiral wrapping#30.21.21.00.00
-unspsc7#30.21.21.15.00#Grommet edging#30.21.21.00.00
-unspsc7#30.21.21.16.00#Corrugated loom tubes#30.21.21.00.00
-unspsc7#30.21.21.17.00#Expandable braided sleeve#30.21.21.00.00
-unspsc7#30.21.21.18.00#Cable tie mounts#30.21.21.00.00
-unspsc7#30.22.00.00.00#Permanent structures#30.00.00.00.00
-unspsc7#30.22.10.00.00#Commercial and entertainment structures#30.22.00.00.00
-unspsc7#30.22.10.01.00#Shopping malls#30.22.10.00.00
-unspsc7#30.22.10.02.00#Parking structures#30.22.10.00.00
-unspsc7#30.22.10.03.00#Cafeteria#30.22.10.00.00
-unspsc7#30.22.10.04.00#Shop buildings#30.22.10.00.00
-unspsc7#30.22.10.05.00#Shopping center#30.22.10.00.00
-unspsc7#30.22.10.06.00#Canteen#30.22.10.00.00
-unspsc7#30.22.10.07.00#Theater#30.22.10.00.00
-unspsc7#30.22.10.08.00#Auditorium#30.22.10.00.00
-unspsc7#30.22.10.09.00#Market#30.22.10.00.00
-unspsc7#30.22.10.10.00#Childrens play area#30.22.10.00.00
-unspsc7#30.22.10.11.00#Zoo#30.22.10.00.00
-unspsc7#30.22.10.12.00#Gardens#30.22.10.00.00
-unspsc7#30.22.10.13.00#Parks#30.22.10.00.00
-unspsc7#30.22.10.14.00#Waterside leisure facilities#30.22.10.00.00
-unspsc7#30.22.20.00.00#Transport structures#30.22.00.00.00
-unspsc7#30.22.20.01.00#Steel bridges#30.22.20.00.00
-unspsc7#30.22.20.02.00#Dry dock#30.22.20.00.00
-unspsc7#30.22.20.03.00#Bus station#30.22.20.00.00
-unspsc7#30.22.20.04.00#Bus garage#30.22.20.00.00
-unspsc7#30.22.20.05.00#Service area building#30.22.20.00.00
-unspsc7#30.22.20.06.00#Railway station#30.22.20.00.00
-unspsc7#30.22.20.07.00#Railway depot#30.22.20.00.00
-unspsc7#30.22.20.08.00#Underground railway station#30.22.20.00.00
-unspsc7#30.22.20.09.00#Rail terminal building#30.22.20.00.00
-unspsc7#30.22.20.10.00#Tramway depot#30.22.20.00.00
-unspsc7#30.22.20.11.00#Tramway platforms#30.22.20.00.00
-unspsc7#30.22.20.12.00#Airport buildings#30.22.20.00.00
-unspsc7#30.22.20.13.00#Airport control tower#30.22.20.00.00
-unspsc7#30.22.20.14.00#Airfield#30.22.20.00.00
-unspsc7#30.22.20.15.00#Runway#30.22.20.00.00
-unspsc7#30.22.20.16.00#Quay#30.22.20.00.00
-unspsc7#30.22.20.17.00#Pier#30.22.20.00.00
-unspsc7#30.22.20.18.00#Dock#30.22.20.00.00
-unspsc7#30.22.20.19.00#Wharf#30.22.20.00.00
-unspsc7#30.22.20.20.00#Marina#30.22.20.00.00
-unspsc7#30.22.20.21.00#Yacht harbor#30.22.20.00.00
-unspsc7#30.22.20.22.00#Breakwater#30.22.20.00.00
-unspsc7#30.22.20.23.00#Seawall#30.22.20.00.00
-unspsc7#30.22.20.24.00#Ferry terminal building#30.22.20.00.00
-unspsc7#30.22.20.25.00#Ro ro terminal#30.22.20.00.00
-unspsc7#30.22.20.26.00#Lighthouse#30.22.20.00.00
-unspsc7#30.22.20.27.00#Road bridge#30.22.20.00.00
-unspsc7#30.22.20.28.00#Railway bridge#30.22.20.00.00
-unspsc7#30.22.20.29.00#Footbridge#30.22.20.00.00
-unspsc7#30.22.20.30.00#Road viaduct#30.22.20.00.00
-unspsc7#30.22.20.31.00#Railway viaduct#30.22.20.00.00
-unspsc7#30.22.20.32.00#Underpass#30.22.20.00.00
-unspsc7#30.22.20.33.00#Overpass#30.22.20.00.00
-unspsc7#30.22.20.34.00#Subway#30.22.20.00.00
-unspsc7#30.22.20.35.00#Culverts#30.22.20.00.00
-unspsc7#30.22.20.36.00#Road tunnel#30.22.20.00.00
-unspsc7#30.22.20.37.00#Railway tunnel#30.22.20.00.00
-unspsc7#30.22.20.38.00#Pedestrian tunnel#30.22.20.00.00
-unspsc7#30.22.20.39.00#Canal tunnel#30.22.20.00.00
-unspsc7#30.22.20.40.00#Under river tunnel#30.22.20.00.00
-unspsc7#30.22.20.41.00#Undersea tunnel#30.22.20.00.00
-unspsc7#30.22.20.42.00#Highways#30.22.20.00.00
-unspsc7#30.22.20.43.00#Crossroad#30.22.20.00.00
-unspsc7#30.22.20.44.00#Ring road#30.22.20.00.00
-unspsc7#30.22.20.45.00#Trunk road#30.22.20.00.00
-unspsc7#30.22.20.46.00#Secondary road#30.22.20.00.00
-unspsc7#30.22.20.47.00#Access road#30.22.20.00.00
-unspsc7#30.22.20.48.00#Slip road#30.22.20.00.00
-unspsc7#30.22.20.49.00#Dual carriageway#30.22.20.00.00
-unspsc7#30.22.20.50.00#Single carriageway#30.22.20.00.00
-unspsc7#30.22.20.51.00#Road junction#30.22.20.00.00
-unspsc7#30.22.20.52.00#Pedestrian ways#30.22.20.00.00
-unspsc7#30.22.20.53.00#Pedestrian overpass#30.22.20.00.00
-unspsc7#30.22.20.54.00#Footpath#30.22.20.00.00
-unspsc7#30.22.20.55.00#Cycle path#30.22.20.00.00
-unspsc7#30.22.20.56.00#Pipeline carrying bridge#30.22.20.00.00
-unspsc7#30.22.20.57.00#Pipelines#30.22.20.00.00
-unspsc7#30.22.20.58.00#Pumping station#30.22.20.00.00
-unspsc7#30.22.20.59.00#Sewage pumping stations#30.22.20.00.00
-unspsc7#30.22.20.60.00#Sewage outfall#30.22.20.00.00
-unspsc7#30.22.20.61.00#Parking lot#30.22.20.00.00
-unspsc7#30.22.20.62.00#Parking structures#30.22.20.00.00
-unspsc7#30.22.20.63.00#Motorway service area#30.22.20.00.00
-unspsc7#30.22.21.00.00#Public structures#30.22.00.00.00
-unspsc7#30.22.21.01.00#Post office#30.22.21.00.00
-unspsc7#30.22.21.02.00#Bank#30.22.21.00.00
-unspsc7#30.22.21.03.00#Police station#30.22.21.00.00
-unspsc7#30.22.21.04.00#Court building#30.22.21.00.00
-unspsc7#30.22.21.05.00#Prison building#30.22.21.00.00
-unspsc7#30.22.21.06.00#Fire station#30.22.21.00.00
-unspsc7#30.22.21.07.00#Ambulance station#30.22.21.00.00
-unspsc7#30.22.21.08.00#Mountain rescue building#30.22.21.00.00
-unspsc7#30.22.21.09.00#Lifeboat station#30.22.21.00.00
-unspsc7#30.22.21.10.00#Coastguard building#30.22.21.00.00
-unspsc7#30.22.21.11.00#Rescue service station#30.22.21.00.00
-unspsc7#30.22.21.12.00#Civic center#30.22.21.00.00
-unspsc7#30.22.21.13.00#Crematorium#30.22.21.00.00
-unspsc7#30.22.21.14.00#Art gallery#30.22.21.00.00
-unspsc7#30.22.21.15.00#Prehistoric monument#30.22.21.00.00
-unspsc7#30.22.21.16.00#Ticket offices#30.22.21.00.00
-unspsc7#30.22.22.00.00#Utilities structures#30.22.00.00.00
-unspsc7#30.22.22.01.00#Radar station#30.22.22.00.00
-unspsc7#30.22.22.02.00#Substation#30.22.22.00.00
-unspsc7#30.22.22.03.00#Nuclear power station#30.22.22.00.00
-unspsc7#30.22.22.04.00#Water tower#30.22.22.00.00
-unspsc7#30.22.22.05.00#Wells#30.22.22.00.00
-unspsc7#30.22.22.06.00#Mobile telephone base stations#30.22.22.00.00
-unspsc7#30.22.22.07.00#Dam#30.22.22.00.00
-unspsc7#30.22.22.08.00#Oil or gas platforms#30.22.22.00.00
-unspsc7#30.22.23.00.00#Educational and research structures#30.22.00.00.00
-unspsc7#30.22.23.01.00#Schools#30.22.23.00.00
-unspsc7#30.22.23.02.00#Polytechnic#30.22.23.00.00
-unspsc7#30.22.23.03.00#Vocational college#30.22.23.00.00
-unspsc7#30.22.23.04.00#Lecture theater#30.22.23.00.00
-unspsc7#30.22.23.05.00#Library#30.22.23.00.00
-unspsc7#30.22.23.06.00#Language laboratory#30.22.23.00.00
-unspsc7#30.22.23.07.00#Laboratory building#30.22.23.00.00
-unspsc7#30.22.23.08.00#Meteorological stations#30.22.23.00.00
-unspsc7#30.22.23.09.00#Research or testing facilities#30.22.23.00.00
-unspsc7#30.22.24.00.00#Hospital structures#30.22.00.00.00
-unspsc7#30.22.24.01.00#Clinic#30.22.24.00.00
-unspsc7#30.22.24.02.00#Nursing home#30.22.24.00.00
-unspsc7#30.22.24.03.00#Operating theater#30.22.24.00.00
-unspsc7#30.22.24.04.00#Intensive care unit#30.22.24.00.00
-unspsc7#30.22.24.05.00#Diagnostic screening room#30.22.24.00.00
-unspsc7#30.22.24.06.00#Screening rooms#30.22.24.00.00
-unspsc7#30.22.24.07.00#Fluoroscopy room#30.22.24.00.00
-unspsc7#30.22.24.08.00#Pathology room#30.22.24.00.00
-unspsc7#30.22.24.09.00#Catheter room#30.22.24.00.00
-unspsc7#30.22.25.00.00#Accommodation structures#30.22.00.00.00
-unspsc7#30.22.25.01.00#Residential homes#30.22.25.00.00
-unspsc7#30.22.25.02.00#Flats#30.22.25.00.00
-unspsc7#30.22.25.03.00#Childrens home#30.22.25.00.00
-unspsc7#30.22.25.04.00#Daycare center#30.22.25.00.00
-unspsc7#30.22.25.05.00#Retirement home#30.22.25.00.00
-unspsc7#30.22.25.06.00#Old peoples home#30.22.25.00.00
-unspsc7#30.22.25.07.00#Hostel#30.22.25.00.00
-unspsc7#30.22.26.00.00#Sports and health structures#30.22.00.00.00
-unspsc7#30.22.26.01.00#Stadium#30.22.26.00.00
-unspsc7#30.22.26.02.00#Sports ground#30.22.26.00.00
-unspsc7#30.22.26.03.00#Running track#30.22.26.00.00
-unspsc7#30.22.26.04.00#Sports hall#30.22.26.00.00
-unspsc7#30.22.26.05.00#Spa#30.22.26.00.00
-unspsc7#30.22.26.06.00#Gymnasium#30.22.26.00.00
-unspsc7#30.22.26.07.00#Swimming pool#30.22.26.00.00
-unspsc7#30.22.26.08.00#Water sports facilities#30.22.26.00.00
-unspsc7#30.22.27.00.00#Industrial structures#30.22.00.00.00
-unspsc7#30.22.27.01.00#Workshops#30.22.27.00.00
-unspsc7#30.22.27.02.00#Cold storage installations#30.22.27.00.00
-unspsc7#30.22.27.03.00#Warehouse stores#30.22.27.00.00
-unspsc7#30.22.28.00.00#Agricultural and farming and fishing structures#30.22.00.00.00
-unspsc7#30.22.28.01.00#Barn#30.22.28.00.00
-unspsc7#30.22.28.02.00#Cowsheds#30.22.28.00.00
-unspsc7#30.22.28.03.00#Irrigation channel#30.22.28.00.00
-unspsc7#30.22.29.00.00#Defense structures#30.22.00.00.00
-unspsc7#30.22.29.01.00#Military bunker#30.22.29.00.00
-unspsc7#30.22.29.02.00#Military shelter#30.22.29.00.00
-unspsc7#30.22.29.03.00#Barracks#30.22.29.00.00
-unspsc7#30.22.29.04.00#Military mess#30.22.29.00.00
-unspsc7#30.22.30.00.00#Religious structures#30.22.00.00.00
-unspsc7#30.22.30.01.00#Churches#30.22.30.00.00
-unspsc7#30.22.30.02.00#Temples#30.22.30.00.00
-unspsc7#30.22.30.03.00#Mosques#30.22.30.00.00
-unspsc7#31.00.00.00.00#Manufacturing Components and Supplies#31.00.00.00.00
-unspsc7#31.10.00.00.00#Castings#31.00.00.00.00
-unspsc7#31.10.15.00.00#Die castings#31.10.00.00.00
-unspsc7#31.10.15.01.00#Aluminum die castings#31.10.15.00.00
-unspsc7#31.10.15.02.00#Ferrous alloy die castings#31.10.15.00.00
-unspsc7#31.10.15.03.00#Iron die castings#31.10.15.00.00
-unspsc7#31.10.15.04.00#Non ferrous alloy die castings#31.10.15.00.00
-unspsc7#31.10.15.05.00#Stainless steel die castings#31.10.15.00.00
-unspsc7#31.10.15.06.00#Steel die castings#31.10.15.00.00
-unspsc7#31.10.15.07.00#Magnesium die castings#31.10.15.00.00
-unspsc7#31.10.15.08.00#Zinc die castings#31.10.15.00.00
-unspsc7#31.10.15.09.00#Tin die castings#31.10.15.00.00
-unspsc7#31.10.15.10.00#Titanium die castings#31.10.15.00.00
-unspsc7#31.10.15.11.00#Beryllium die castings#31.10.15.00.00
-unspsc7#31.10.15.12.00#Precious metal die castings#31.10.15.00.00
-unspsc7#31.10.15.13.00#Copper die castings#31.10.15.00.00
-unspsc7#31.10.15.14.00#Lead die castings#31.10.15.00.00
-unspsc7#31.10.15.15.00#Brass die castings#31.10.15.00.00
-unspsc7#31.10.15.16.00#Bronze die castings#31.10.15.00.00
-unspsc7#31.10.16.00.00#Sand castings#31.10.00.00.00
-unspsc7#31.10.16.01.00#Non ferrous alloy sand castings#31.10.16.00.00
-unspsc7#31.10.16.02.00#Ferrous alloy sand castings#31.10.16.00.00
-unspsc7#31.10.16.03.00#Steel sand castings#31.10.16.00.00
-unspsc7#31.10.16.04.00#Stainless steel sand castings#31.10.16.00.00
-unspsc7#31.10.16.05.00#Iron sand castings#31.10.16.00.00
-unspsc7#31.10.16.06.00#Aluminum sand castings#31.10.16.00.00
-unspsc7#31.10.16.07.00#Magnesium sand castings#31.10.16.00.00
-unspsc7#31.10.16.08.00#Titanium sand castings#31.10.16.00.00
-unspsc7#31.10.16.09.00#Beryllium sand castings#31.10.16.00.00
-unspsc7#31.10.16.10.00#Copper sand castings#31.10.16.00.00
-unspsc7#31.10.16.11.00#Brass sand castings#31.10.16.00.00
-unspsc7#31.10.16.12.00#Bronze sand castings#31.10.16.00.00
-unspsc7#31.10.16.13.00#Zinc sand castings#31.10.16.00.00
-unspsc7#31.10.16.14.00#Tin sand castings#31.10.16.00.00
-unspsc7#31.10.16.15.00#Lead sand castings#31.10.16.00.00
-unspsc7#31.10.16.16.00#Precious metal sand castings#31.10.16.00.00
-unspsc7#31.10.17.00.00#Permanent mold castings#31.10.00.00.00
-unspsc7#31.10.17.01.00#Non ferrous alloy permanent mold castings#31.10.17.00.00
-unspsc7#31.10.17.02.00#Ferrous alloy permanent mold castings#31.10.17.00.00
-unspsc7#31.10.17.03.00#Steel permanent mold castings#31.10.17.00.00
-unspsc7#31.10.17.04.00#Stainless steel permanent mold castings#31.10.17.00.00
-unspsc7#31.10.17.05.00#Iron permanent mold castings#31.10.17.00.00
-unspsc7#31.10.17.06.00#Aluminum permanent mold castings#31.10.17.00.00
-unspsc7#31.10.17.07.00#Magnesium permanent mold castings#31.10.17.00.00
-unspsc7#31.10.17.08.00#Titanium permanent mold castings#31.10.17.00.00
-unspsc7#31.10.17.09.00#Beryllium permanent mold castings#31.10.17.00.00
-unspsc7#31.10.17.10.00#Copper permanent mold castings#31.10.17.00.00
-unspsc7#31.10.17.11.00#Brass permanent mold castings#31.10.17.00.00
-unspsc7#31.10.17.12.00#Bronze permanent mold castings#31.10.17.00.00
-unspsc7#31.10.17.13.00#Zinc permanent mold castings#31.10.17.00.00
-unspsc7#31.10.17.14.00#Tin permanent mold castings#31.10.17.00.00
-unspsc7#31.10.17.15.00#Lead permanent mold castings#31.10.17.00.00
-unspsc7#31.10.17.16.00#Precious metal permanent mold castings#31.10.17.00.00
-unspsc7#31.10.18.00.00#Shell mold castings#31.10.00.00.00
-unspsc7#31.10.18.01.00#Non ferrous alloy shell mold castings#31.10.18.00.00
-unspsc7#31.10.18.02.00#Ferrous alloy shell mold castings#31.10.18.00.00
-unspsc7#31.10.18.03.00#Steel shell mold castings#31.10.18.00.00
-unspsc7#31.10.18.04.00#Stainless steel shell mold castings#31.10.18.00.00
-unspsc7#31.10.18.05.00#Iron shell mold castings#31.10.18.00.00
-unspsc7#31.10.18.06.00#Aluminum shell mold castings#31.10.18.00.00
-unspsc7#31.10.18.07.00#Magnesium shell mold castings#31.10.18.00.00
-unspsc7#31.10.18.08.00#Titanium shell mold castings#31.10.18.00.00
-unspsc7#31.10.18.09.00#Beryllium shell mold castings#31.10.18.00.00
-unspsc7#31.10.18.10.00#Copper shell mold castings#31.10.18.00.00
-unspsc7#31.10.18.11.00#Brass shell mold castings#31.10.18.00.00
-unspsc7#31.10.18.12.00#Bronze shell mold castings#31.10.18.00.00
-unspsc7#31.10.18.13.00#Zinc shell mold castings#31.10.18.00.00
-unspsc7#31.10.18.14.00#Tin shell mold castings#31.10.18.00.00
-unspsc7#31.10.18.15.00#Lead shell mold castings#31.10.18.00.00
-unspsc7#31.10.18.16.00#Precious shell mold castings#31.10.18.00.00
-unspsc7#31.10.19.00.00#Investment castings#31.10.00.00.00
-unspsc7#31.10.19.01.00#Non ferrous alloy investment castings#31.10.19.00.00
-unspsc7#31.10.19.02.00#Ferrous alloy investment castings#31.10.19.00.00
-unspsc7#31.10.19.03.00#Steel investment castings#31.10.19.00.00
-unspsc7#31.10.19.04.00#Stainless steel investment castings#31.10.19.00.00
-unspsc7#31.10.19.05.00#Iron investment castings#31.10.19.00.00
-unspsc7#31.10.19.06.00#Aluminum investment castings#31.10.19.00.00
-unspsc7#31.10.19.07.00#Magnesium investment castings#31.10.19.00.00
-unspsc7#31.10.19.08.00#Zinc investment castings#31.10.19.00.00
-unspsc7#31.10.19.09.00#Tin investment castings#31.10.19.00.00
-unspsc7#31.10.19.10.00#Lead investment castings#31.10.19.00.00
-unspsc7#31.10.19.11.00#Precious metal investment castings#31.10.19.00.00
-unspsc7#31.10.19.12.00#Titanium investment castings#31.10.19.00.00
-unspsc7#31.10.20.00.00#Centrifugal castings#31.10.00.00.00
-unspsc7#31.10.20.01.00#Non ferrous alloy centrifugal castings#31.10.20.00.00
-unspsc7#31.10.20.02.00#Ferrous alloy centrifugal castings#31.10.20.00.00
-unspsc7#31.10.20.03.00#Steel centrifugal castings#31.10.20.00.00
-unspsc7#31.10.20.04.00#Stainless steel centrifugal castings#31.10.20.00.00
-unspsc7#31.10.20.05.00#Iron centrifugal castings#31.10.20.00.00
-unspsc7#31.10.20.06.00#Aluminum centrifugal castings#31.10.20.00.00
-unspsc7#31.10.20.07.00#Magnesium centrifugal castings#31.10.20.00.00
-unspsc7#31.10.20.08.00#Titanium centrifugal castings#31.10.20.00.00
-unspsc7#31.10.20.09.00#Beryllium centrifugal castings#31.10.20.00.00
-unspsc7#31.10.20.10.00#Copper centrifugal castings#31.10.20.00.00
-unspsc7#31.10.20.11.00#Brass centrifugal castings#31.10.20.00.00
-unspsc7#31.10.20.12.00#Bronze centrifugal castings#31.10.20.00.00
-unspsc7#31.10.20.13.00#Zinc centrifugal castings#31.10.20.00.00
-unspsc7#31.10.20.14.00#Tin centrifugal castings#31.10.20.00.00
-unspsc7#31.10.20.15.00#Lead centrifugal castings#31.10.20.00.00
-unspsc7#31.10.20.16.00#Precious metal centrifugal castings#31.10.20.00.00
-unspsc7#31.10.21.00.00#Ceramic mold castings#31.10.00.00.00
-unspsc7#31.10.21.01.00#Non ferrous alloy ceramic mold castings#31.10.21.00.00
-unspsc7#31.10.21.02.00#Ferrous alloy ceramic mold castings#31.10.21.00.00
-unspsc7#31.10.21.03.00#Steel ceramic mold castings#31.10.21.00.00
-unspsc7#31.10.21.04.00#Stainless steel ceramic mold castings#31.10.21.00.00
-unspsc7#31.10.21.05.00#Iron ceramic mold castings#31.10.21.00.00
-unspsc7#31.10.21.06.00#Aluminum ceramic mold castings#31.10.21.00.00
-unspsc7#31.10.21.07.00#Magnesium ceramic mold castings#31.10.21.00.00
-unspsc7#31.10.21.08.00#Titanium ceramic mold castings#31.10.21.00.00
-unspsc7#31.10.21.09.00#Beryllium ceramic mold castings#31.10.21.00.00
-unspsc7#31.10.21.10.00#Copper ceramic mold castings#31.10.21.00.00
-unspsc7#31.10.21.11.00#Brass ceramic mold castings#31.10.21.00.00
-unspsc7#31.10.21.12.00#Bronze ceramic mold castings#31.10.21.00.00
-unspsc7#31.10.21.13.00#Zinc ceramic mold castings#31.10.21.00.00
-unspsc7#31.10.21.14.00#Tin ceramic mold castings#31.10.21.00.00
-unspsc7#31.10.21.15.00#Lead ceramic mold castings#31.10.21.00.00
-unspsc7#31.10.21.16.00#Precious metal ceramic mold castings#31.10.21.00.00
-unspsc7#31.10.22.00.00#Graphite mold castings#31.10.00.00.00
-unspsc7#31.10.22.01.00#Non ferrous alloy graphite mold castings#31.10.22.00.00
-unspsc7#31.10.22.02.00#Ferrrous alloy graphite mold castings#31.10.22.00.00
-unspsc7#31.10.22.03.00#Steel graphite mold castings#31.10.22.00.00
-unspsc7#31.10.22.04.00#Stainless steel graphite mold castings#31.10.22.00.00
-unspsc7#31.10.22.05.00#Iron graphite mold castings#31.10.22.00.00
-unspsc7#31.10.22.06.00#Aluminum graphite mold castings#31.10.22.00.00
-unspsc7#31.10.22.07.00#Magnesium graphite mold castings#31.10.22.00.00
-unspsc7#31.10.22.08.00#Titanium graphite mold castings#31.10.22.00.00
-unspsc7#31.10.22.09.00#Beryllium graphite mold castings#31.10.22.00.00
-unspsc7#31.10.22.10.00#Copper graphite mold castings#31.10.22.00.00
-unspsc7#31.10.22.11.00#Brass graphite mold castings#31.10.22.00.00
-unspsc7#31.10.22.12.00#Bronze graphite mold castings#31.10.22.00.00
-unspsc7#31.10.22.13.00#Zinc graphite mold castings#31.10.22.00.00
-unspsc7#31.10.22.14.00#Tin graphite mold castings#31.10.22.00.00
-unspsc7#31.10.22.15.00#Lead graphite mold castings#31.10.22.00.00
-unspsc7#31.10.22.16.00#Precious metal graphite mold castings#31.10.22.00.00
-unspsc7#31.10.23.00.00#Plaster mold castings#31.10.00.00.00
-unspsc7#31.10.23.01.00#Non ferrous alloy plaster mold castings#31.10.23.00.00
-unspsc7#31.10.23.02.00#Ferrous alloy plaster mold castings#31.10.23.00.00
-unspsc7#31.10.23.03.00#Steel plaster mold castings#31.10.23.00.00
-unspsc7#31.10.23.04.00#Stainless steel plaster mold castings#31.10.23.00.00
-unspsc7#31.10.23.05.00#Iron plaster mold castings#31.10.23.00.00
-unspsc7#31.10.23.06.00#Aluminum plaster mold castings#31.10.23.00.00
-unspsc7#31.10.23.07.00#Magnesium plaster mold castings#31.10.23.00.00
-unspsc7#31.10.23.08.00#Titanium plaster mold castings#31.10.23.00.00
-unspsc7#31.10.23.09.00#Beryllium plaster mold castings#31.10.23.00.00
-unspsc7#31.10.23.10.00#Copper plaster mold castings#31.10.23.00.00
-unspsc7#31.10.23.11.00#Brass plaster mold castings#31.10.23.00.00
-unspsc7#31.10.23.12.00#Bronze plaster mold castings#31.10.23.00.00
-unspsc7#31.10.23.13.00#Zinc plaster mold castings#31.10.23.00.00
-unspsc7#31.10.23.14.00#Tin plaster mold castings#31.10.23.00.00
-unspsc7#31.10.23.15.00#Lead plaster mold castings#31.10.23.00.00
-unspsc7#31.10.23.16.00#Precious metal plaster mold castings#31.10.23.00.00
-unspsc7#31.10.24.00.00#V process castings#31.10.00.00.00
-unspsc7#31.10.24.01.00#Non ferrous alloy v process castings#31.10.24.00.00
-unspsc7#31.10.24.02.00#Ferrous alloy v process castings#31.10.24.00.00
-unspsc7#31.10.24.03.00#Steel v process castings#31.10.24.00.00
-unspsc7#31.10.24.04.00#Stainless steel v process castings#31.10.24.00.00
-unspsc7#31.10.24.05.00#Iron v process castings#31.10.24.00.00
-unspsc7#31.10.24.06.00#Aluminum v process castings#31.10.24.00.00
-unspsc7#31.10.24.07.00#Magnesium v process castings#31.10.24.00.00
-unspsc7#31.10.24.08.00#Titanium v process castings#31.10.24.00.00
-unspsc7#31.10.24.09.00#Beryllium v process castings#31.10.24.00.00
-unspsc7#31.10.24.10.00#Copper v process castings#31.10.24.00.00
-unspsc7#31.10.24.11.00#Brass v process castings#31.10.24.00.00
-unspsc7#31.10.24.12.00#Bronze v process castings#31.10.24.00.00
-unspsc7#31.10.24.13.00#Zinc v process castings#31.10.24.00.00
-unspsc7#31.10.24.14.00#Tin v process castings#31.10.24.00.00
-unspsc7#31.10.24.15.00#Lead v process castings#31.10.24.00.00
-unspsc7#31.10.24.16.00#Precious metal v process castings#31.10.24.00.00
-unspsc7#31.11.00.00.00#Extrusions#31.00.00.00.00
-unspsc7#31.11.15.00.00#Profile extrusions#31.11.00.00.00
-unspsc7#31.11.15.01.00#Aluminum profile extrusions#31.11.15.00.00
-unspsc7#31.11.15.02.00#Beryllium profile extrusions#31.11.15.00.00
-unspsc7#31.11.15.03.00#Brass profile extrusions#31.11.15.00.00
-unspsc7#31.11.15.04.00#Bronze profile extrusions#31.11.15.00.00
-unspsc7#31.11.15.05.00#Copper profile extrusions#31.11.15.00.00
-unspsc7#31.11.15.06.00#Ferrous alloy profile extrusions#31.11.15.00.00
-unspsc7#31.11.15.07.00#Lead profile extrusions#31.11.15.00.00
-unspsc7#31.11.15.08.00#Magnesium profile extrusions#31.11.15.00.00
-unspsc7#31.11.15.09.00#Non ferrous alloy profile extrusions#31.11.15.00.00
-unspsc7#31.11.15.10.00#Plastic profile extrusions#31.11.15.00.00
-unspsc7#31.11.15.11.00#Precious metal profile extrusions#31.11.15.00.00
-unspsc7#31.11.15.12.00#Rubber profile extrusions#31.11.15.00.00
-unspsc7#31.11.15.13.00#Stainless steel profile extrusions#31.11.15.00.00
-unspsc7#31.11.15.14.00#Steel profile extrusions#31.11.15.00.00
-unspsc7#31.11.15.15.00#Tin profile extrusions#31.11.15.00.00
-unspsc7#31.11.15.16.00#Titanium profile extrusions#31.11.15.00.00
-unspsc7#31.11.15.17.00#Zinc profile extrusions#31.11.15.00.00
-unspsc7#31.11.16.00.00#Impact extrusions#31.11.00.00.00
-unspsc7#31.11.16.01.00#Aluminum impact extrusions#31.11.16.00.00
-unspsc7#31.11.16.02.00#Beryllium impact extrusions#31.11.16.00.00
-unspsc7#31.11.16.03.00#Brass impact extrusions#31.11.16.00.00
-unspsc7#31.11.16.04.00#Bronze impact extrusions#31.11.16.00.00
-unspsc7#31.11.16.05.00#Copper impact extrusions#31.11.16.00.00
-unspsc7#31.11.16.06.00#Ferrous alloy impact extrusions#31.11.16.00.00
-unspsc7#31.11.16.07.00#Lead impact extrusions#31.11.16.00.00
-unspsc7#31.11.16.08.00#Magnesium impact extrusions#31.11.16.00.00
-unspsc7#31.11.16.09.00#Non ferrous alloy impact extrusions#31.11.16.00.00
-unspsc7#31.11.16.10.00#Plastic impact extrusions#31.11.16.00.00
-unspsc7#31.11.16.11.00#Precious metal impact extrusions#31.11.16.00.00
-unspsc7#31.11.16.12.00#Rubber impact extrusions#31.11.16.00.00
-unspsc7#31.11.16.13.00#Stainless steel impact extrusions#31.11.16.00.00
-unspsc7#31.11.16.14.00#Steel impact extrusions#31.11.16.00.00
-unspsc7#31.11.16.15.00#Tin impact extrusions#31.11.16.00.00
-unspsc7#31.11.16.16.00#Titanium impact extrusions#31.11.16.00.00
-unspsc7#31.11.16.17.00#Zinc impact extrusions#31.11.16.00.00
-unspsc7#31.11.17.00.00#Cold extrusions#31.11.00.00.00
-unspsc7#31.11.17.01.00#Aluminum cold extrusions#31.11.17.00.00
-unspsc7#31.11.17.02.00#Beryllium cold extrusions#31.11.17.00.00
-unspsc7#31.11.17.03.00#Brass cold extrusions#31.11.17.00.00
-unspsc7#31.11.17.04.00#Bronze cold extrusions#31.11.17.00.00
-unspsc7#31.11.17.05.00#Copper cold extrusions#31.11.17.00.00
-unspsc7#31.11.17.06.00#Ferrous alloy cold extrusions#31.11.17.00.00
-unspsc7#31.11.17.07.00#Lead cold extrusions#31.11.17.00.00
-unspsc7#31.11.17.08.00#Magnesium cold extrusions#31.11.17.00.00
-unspsc7#31.11.17.09.00#Non ferrous alloy cold extrusions#31.11.17.00.00
-unspsc7#31.11.17.10.00#Plastic cold extrusions#31.11.17.00.00
-unspsc7#31.11.17.11.00#Precious metal cold extrusions#31.11.17.00.00
-unspsc7#31.11.17.12.00#Rubber cold extrusions#31.11.17.00.00
-unspsc7#31.11.17.13.00#Stainless steel cold extrusions#31.11.17.00.00
-unspsc7#31.11.17.14.00#Steel cold extrusions#31.11.17.00.00
-unspsc7#31.11.17.15.00#Tin cold extrusions#31.11.17.00.00
-unspsc7#31.11.17.16.00#Titanium cold extrusions#31.11.17.00.00
-unspsc7#31.11.17.17.00#Zinc cold extrusions#31.11.17.00.00
-unspsc7#31.12.00.00.00#Machined castings#31.00.00.00.00
-unspsc7#31.12.10.00.00#Machined v process castings#31.12.00.00.00
-unspsc7#31.12.10.01.00#Non ferrous alloy v process machined castings#31.12.10.00.00
-unspsc7#31.12.10.02.00#Ferrous alloy v process machined castings#31.12.10.00.00
-unspsc7#31.12.10.03.00#Steel v process machined castings#31.12.10.00.00
-unspsc7#31.12.10.04.00#Stainless steel v process machined castings#31.12.10.00.00
-unspsc7#31.12.10.05.00#Iron v process machined castings#31.12.10.00.00
-unspsc7#31.12.10.06.00#Aluminum v process machined castings#31.12.10.00.00
-unspsc7#31.12.10.07.00#Magnesium v process machined castings#31.12.10.00.00
-unspsc7#31.12.10.08.00#Titanium v process machined castings#31.12.10.00.00
-unspsc7#31.12.10.09.00#Beryllium v process machined castings#31.12.10.00.00
-unspsc7#31.12.10.10.00#Copper v process machined castings#31.12.10.00.00
-unspsc7#31.12.10.11.00#Brass v process machined castings#31.12.10.00.00
-unspsc7#31.12.10.12.00#Bronze v process machined castings#31.12.10.00.00
-unspsc7#31.12.10.13.00#Zinc v process machined castings#31.12.10.00.00
-unspsc7#31.12.10.14.00#Tin v process machined castings#31.12.10.00.00
-unspsc7#31.12.10.15.00#Lead v process machined castings#31.12.10.00.00
-unspsc7#31.12.10.16.00#Precious metal v process machined castings#31.12.10.00.00
-unspsc7#31.12.10.17.00#Composite v process machined castings#31.12.10.00.00
-unspsc7#31.12.10.18.00#Nickel alloy v process machined castings#31.12.10.00.00
-unspsc7#31.12.10.19.00#Non metallic v process machined castings#31.12.10.00.00
-unspsc7#31.12.11.00.00#Machined die castings#31.12.00.00.00
-unspsc7#31.12.11.01.00#Aluminum die machined castings#31.12.11.00.00
-unspsc7#31.12.11.02.00#Ferrous alloy die machined castings#31.12.11.00.00
-unspsc7#31.12.11.03.00#Iron die machined castings#31.12.11.00.00
-unspsc7#31.12.11.04.00#Non ferrous alloy die machined castings#31.12.11.00.00
-unspsc7#31.12.11.05.00#Stainless steel die machined castings#31.12.11.00.00
-unspsc7#31.12.11.06.00#Steel die machined castings#31.12.11.00.00
-unspsc7#31.12.11.07.00#Magnesium die machined castings#31.12.11.00.00
-unspsc7#31.12.11.08.00#Zinc die machined castings#31.12.11.00.00
-unspsc7#31.12.11.09.00#Tin die machined castings#31.12.11.00.00
-unspsc7#31.12.11.10.00#Titanium die machined castings#31.12.11.00.00
-unspsc7#31.12.11.11.00#Beryllium die machined castings#31.12.11.00.00
-unspsc7#31.12.11.12.00#Precious metal die machined castings#31.12.11.00.00
-unspsc7#31.12.11.13.00#Copper die machined castings#31.12.11.00.00
-unspsc7#31.12.11.14.00#Lead die machined castings#31.12.11.00.00
-unspsc7#31.12.11.15.00#Brass die machined castings#31.12.11.00.00
-unspsc7#31.12.11.16.00#Bronze die machined castings#31.12.11.00.00
-unspsc7#31.12.11.17.00#Composite die machined castings#31.12.11.00.00
-unspsc7#31.12.11.18.00#Nickel Alloy die machined castings#31.12.11.00.00
-unspsc7#31.12.11.19.00#Non metallic die machined castings#31.12.11.00.00
-unspsc7#31.12.12.00.00#Machined sand castings#31.12.00.00.00
-unspsc7#31.12.12.01.00#Non ferrous alloy sand machined castings#31.12.12.00.00
-unspsc7#31.12.12.02.00#Ferrous alloy sand machined castings#31.12.12.00.00
-unspsc7#31.12.12.03.00#Steel sand machined castings#31.12.12.00.00
-unspsc7#31.12.12.04.00#Stainless steel sand machined castings#31.12.12.00.00
-unspsc7#31.12.12.05.00#Iron sand machined castings#31.12.12.00.00
-unspsc7#31.12.12.06.00#Aluminum sand machined castings#31.12.12.00.00
-unspsc7#31.12.12.07.00#Magnesium sand machined castings#31.12.12.00.00
-unspsc7#31.12.12.08.00#Titanium sand machined castings#31.12.12.00.00
-unspsc7#31.12.12.09.00#Beryllium sand machined castings#31.12.12.00.00
-unspsc7#31.12.12.10.00#Copper sand machined castings#31.12.12.00.00
-unspsc7#31.12.12.11.00#Brass sand machined castings#31.12.12.00.00
-unspsc7#31.12.12.12.00#Bronze sand machined castings#31.12.12.00.00
-unspsc7#31.12.12.13.00#Zinc sand machined castings#31.12.12.00.00
-unspsc7#31.12.12.14.00#Tin sand machined castings#31.12.12.00.00
-unspsc7#31.12.12.15.00#Lead sand machined castings#31.12.12.00.00
-unspsc7#31.12.12.16.00#Precious metal sand machined castings#31.12.12.00.00
-unspsc7#31.12.12.17.00#Composite sand machined castings#31.12.12.00.00
-unspsc7#31.12.12.18.00#Nickel Alloy sand machined castings#31.12.12.00.00
-unspsc7#31.12.12.19.00#Non metallic sand machined castings#31.12.12.00.00
-unspsc7#31.12.13.00.00#Machined permanent mold castings#31.12.00.00.00
-unspsc7#31.12.13.01.00#Non ferrous alloy permanent mold machined castings#31.12.13.00.00
-unspsc7#31.12.13.02.00#Ferrous alloy permanent mold machined castings#31.12.13.00.00
-unspsc7#31.12.13.03.00#Steel permanent mold machined castings#31.12.13.00.00
-unspsc7#31.12.13.04.00#Stainless steel permanent mold machined castings#31.12.13.00.00
-unspsc7#31.12.13.05.00#Iron permanent mold machined castings#31.12.13.00.00
-unspsc7#31.12.13.06.00#Aluminum permanent mold machined castings#31.12.13.00.00
-unspsc7#31.12.13.07.00#Magnesium permanent mold machined castings#31.12.13.00.00
-unspsc7#31.12.13.08.00#Titanium permanent mold machined castings#31.12.13.00.00
-unspsc7#31.12.13.09.00#Beryllium permanent mold machined castings#31.12.13.00.00
-unspsc7#31.12.13.10.00#Copper permanent mold machined castings#31.12.13.00.00
-unspsc7#31.12.13.11.00#Brass permanent mold machined castings#31.12.13.00.00
-unspsc7#31.12.13.12.00#Bronze permanent mold machined castings#31.12.13.00.00
-unspsc7#31.12.13.13.00#Zinc permanent mold machined castings#31.12.13.00.00
-unspsc7#31.12.13.14.00#Tin permanent mold machined castings#31.12.13.00.00
-unspsc7#31.12.13.15.00#Lead permanent mold machined castings#31.12.13.00.00
-unspsc7#31.12.13.16.00#Precious metal permanent mold machined castings#31.12.13.00.00
-unspsc7#31.12.13.17.00#Composite permanent mold machined castings#31.12.13.00.00
-unspsc7#31.12.13.18.00#Nickel alloy permanent mold machined castings#31.12.13.00.00
-unspsc7#31.12.13.19.00#Non metallic permanent mold machined castings#31.12.13.00.00
-unspsc7#31.12.14.00.00#Machined plaster mold castings#31.12.00.00.00
-unspsc7#31.12.14.01.00#Non ferrous alloy plaster mold machined castings#31.12.14.00.00
-unspsc7#31.12.14.02.00#Ferrous alloy plaster mold machined castings#31.12.14.00.00
-unspsc7#31.12.14.03.00#Steel plaster mold machined castings#31.12.14.00.00
-unspsc7#31.12.14.04.00#Stainless steel plaster mold machined castings#31.12.14.00.00
-unspsc7#31.12.14.05.00#Iron plaster mold machined castings#31.12.14.00.00
-unspsc7#31.12.14.06.00#Aluminum plaster mold machined castings#31.12.14.00.00
-unspsc7#31.12.14.07.00#Magnesium plaster mold machined castings#31.12.14.00.00
-unspsc7#31.12.14.08.00#Titanium plaster mold machined castings#31.12.14.00.00
-unspsc7#31.12.14.09.00#Beryllium plaster mold machined castings#31.12.14.00.00
-unspsc7#31.12.14.10.00#Copper plaster mold machined castings#31.12.14.00.00
-unspsc7#31.12.14.11.00#Brass plaster mold machined castings#31.12.14.00.00
-unspsc7#31.12.14.12.00#Bronze plaster mold machined castings#31.12.14.00.00
-unspsc7#31.12.14.13.00#Zinc plaster mold machined castings#31.12.14.00.00
-unspsc7#31.12.14.14.00#Tin plaster mold machined castings#31.12.14.00.00
-unspsc7#31.12.14.15.00#Lead plaster mold machined castings#31.12.14.00.00
-unspsc7#31.12.14.16.00#Precious metal plaster mold machined castings#31.12.14.00.00
-unspsc7#31.12.14.17.00#Composite plaster mold machined castings#31.12.14.00.00
-unspsc7#31.12.14.18.00#Nickel alloy plaster mold machined castings#31.12.14.00.00
-unspsc7#31.12.14.19.00#Non metallic plaster mold machined castings#31.12.14.00.00
-unspsc7#31.12.15.00.00#Machined shell mold castings#31.12.00.00.00
-unspsc7#31.12.15.01.00#Non ferrous alloy shell mold machined castings#31.12.15.00.00
-unspsc7#31.12.15.02.00#Ferrous alloy shell mold machined castings#31.12.15.00.00
-unspsc7#31.12.15.03.00#Steel shell mold machined castings#31.12.15.00.00
-unspsc7#31.12.15.04.00#Stainless steel shell mold machined castings#31.12.15.00.00
-unspsc7#31.12.15.05.00#Iron shell mold machined castings#31.12.15.00.00
-unspsc7#31.12.15.06.00#Aluminum shell mold machined castings#31.12.15.00.00
-unspsc7#31.12.15.07.00#Magnesium shell mold machined castings#31.12.15.00.00
-unspsc7#31.12.15.08.00#Titanium shell mold machined castings#31.12.15.00.00
-unspsc7#31.12.15.09.00#Beryllium shell mold machined castings#31.12.15.00.00
-unspsc7#31.12.15.10.00#Copper shell mold machined castings#31.12.15.00.00
-unspsc7#31.12.15.11.00#Brass shell mold machined castings#31.12.15.00.00
-unspsc7#31.12.15.12.00#Bronze shell mold machined castings#31.12.15.00.00
-unspsc7#31.12.15.13.00#Zinc shell mold machined castings#31.12.15.00.00
-unspsc7#31.12.15.14.00#Tin shell mold machined castings#31.12.15.00.00
-unspsc7#31.12.15.15.00#Lead shell mold machined castings#31.12.15.00.00
-unspsc7#31.12.15.16.00#Precious shell mold machined castings#31.12.15.00.00
-unspsc7#31.12.15.17.00#Composite shell mold machined castings#31.12.15.00.00
-unspsc7#31.12.15.18.00#Nickel alloy shell mold machined castings#31.12.15.00.00
-unspsc7#31.12.15.19.00#Non metallic shell mold machined castings#31.12.15.00.00
-unspsc7#31.12.16.00.00#Machined investment castings#31.12.00.00.00
-unspsc7#31.12.16.01.00#Non ferrous alloy investment machined castings#31.12.16.00.00
-unspsc7#31.12.16.02.00#Ferrous alloy investment machined castings#31.12.16.00.00
-unspsc7#31.12.16.03.00#Steel investment machined castings#31.12.16.00.00
-unspsc7#31.12.16.04.00#Stainless steel investment machined castings#31.12.16.00.00
-unspsc7#31.12.16.05.00#Iron investment machined castings#31.12.16.00.00
-unspsc7#31.12.16.06.00#Aluminum investment machined castings#31.12.16.00.00
-unspsc7#31.12.16.07.00#Magnesium investment machined castings#31.12.16.00.00
-unspsc7#31.12.16.08.00#Zinc investment machined castings#31.12.16.00.00
-unspsc7#31.12.16.09.00#Tin investment machined castings#31.12.16.00.00
-unspsc7#31.12.16.10.00#Lead investment machined castings#31.12.16.00.00
-unspsc7#31.12.16.11.00#Precious metal investment machined castings#31.12.16.00.00
-unspsc7#31.12.16.12.00#Titanium investment machined castings#31.12.16.00.00
-unspsc7#31.12.16.13.00#Composite investment machined castings#31.12.16.00.00
-unspsc7#31.12.16.14.00#Nickel alloy investment machined castings#31.12.16.00.00
-unspsc7#31.12.16.15.00#Non metallic investment machined castings#31.12.16.00.00
-unspsc7#31.12.17.00.00#Machined centrifugal castings#31.12.00.00.00
-unspsc7#31.12.17.01.00#Non ferrous alloy centrifugal machined castings#31.12.17.00.00
-unspsc7#31.12.17.02.00#Ferrous alloy centrifugal machined castings#31.12.17.00.00
-unspsc7#31.12.17.03.00#Steel centrifugal machined castings#31.12.17.00.00
-unspsc7#31.12.17.04.00#Stainless steel centrifugal machined castings#31.12.17.00.00
-unspsc7#31.12.17.05.00#Iron centrifugal machined castings#31.12.17.00.00
-unspsc7#31.12.17.06.00#Aluminum centrifugal machined castings#31.12.17.00.00
-unspsc7#31.12.17.07.00#Magnesium centrifugal machined castings#31.12.17.00.00
-unspsc7#31.12.17.08.00#Titanium centrifugal machined castings#31.12.17.00.00
-unspsc7#31.12.17.09.00#Beryllium centrifugal machined castings#31.12.17.00.00
-unspsc7#31.12.17.10.00#Copper centrifugal machined castings#31.12.17.00.00
-unspsc7#31.12.17.11.00#Brass centrifugal machined castings#31.12.17.00.00
-unspsc7#31.12.17.12.00#Bronze centrifugal machined castings#31.12.17.00.00
-unspsc7#31.12.17.13.00#Zinc centrifugal machined castings#31.12.17.00.00
-unspsc7#31.12.17.14.00#Tin centrifugal machined castings#31.12.17.00.00
-unspsc7#31.12.17.15.00#Lead centrifugal machined castings#31.12.17.00.00
-unspsc7#31.12.17.16.00#Precious metal centrifugal machined castings#31.12.17.00.00
-unspsc7#31.12.17.17.00#Composite centrifugal machined castings#31.12.17.00.00
-unspsc7#31.12.17.18.00#Nickel alloy centrifugal machined castings#31.12.17.00.00
-unspsc7#31.12.17.19.00#Non metallic centrifugal machined castings#31.12.17.00.00
-unspsc7#31.12.18.00.00#Machined ceramic mold castings#31.12.00.00.00
-unspsc7#31.12.18.01.00#Non ferrous alloy ceramic mold machined castings#31.12.18.00.00
-unspsc7#31.12.18.02.00#Ferrous alloy ceramic mold machined castings#31.12.18.00.00
-unspsc7#31.12.18.03.00#Steel ceramic mold machined castings#31.12.18.00.00
-unspsc7#31.12.18.04.00#Stainless steel ceramic mold machined castings#31.12.18.00.00
-unspsc7#31.12.18.05.00#Iron ceramic mold machined castings#31.12.18.00.00
-unspsc7#31.12.18.06.00#Aluminum ceramic mold machined castings#31.12.18.00.00
-unspsc7#31.12.18.07.00#Magnesium ceramic mold machined castings#31.12.18.00.00
-unspsc7#31.12.18.08.00#Titanium ceramic mold machined castings#31.12.18.00.00
-unspsc7#31.12.18.09.00#Beryllium ceramic mold machined castings#31.12.18.00.00
-unspsc7#31.12.18.10.00#Copper ceramic mold machined castings#31.12.18.00.00
-unspsc7#31.12.18.11.00#Brass ceramic mold machined castings#31.12.18.00.00
-unspsc7#31.12.18.12.00#Bronze ceramic mold machined castings#31.12.18.00.00
-unspsc7#31.12.18.13.00#Zinc ceramic mold machined castings#31.12.18.00.00
-unspsc7#31.12.18.14.00#Tin ceramic mold machined castings#31.12.18.00.00
-unspsc7#31.12.18.15.00#Lead ceramic mold machined castings#31.12.18.00.00
-unspsc7#31.12.18.16.00#Precious metal ceramic mold machined castings#31.12.18.00.00
-unspsc7#31.12.18.17.00#Composite ceramic mold machined castings#31.12.18.00.00
-unspsc7#31.12.18.18.00#Nickel alloy ceramic mold machined castings#31.12.18.00.00
-unspsc7#31.12.18.19.00#Non metallic ceramic mold machined castings#31.12.18.00.00
-unspsc7#31.12.19.00.00#Machined graphite mold castings#31.12.00.00.00
-unspsc7#31.12.19.01.00#Non ferrous alloy graphite mold machined castings#31.12.19.00.00
-unspsc7#31.12.19.02.00#Ferrrous alloy graphite mold machined castings#31.12.19.00.00
-unspsc7#31.12.19.03.00#Steel graphite mold machined castings#31.12.19.00.00
-unspsc7#31.12.19.04.00#Stainless steel graphite mold machined castings#31.12.19.00.00
-unspsc7#31.12.19.05.00#Iron graphite mold machined castings#31.12.19.00.00
-unspsc7#31.12.19.06.00#Aluminum graphite mold machined castings#31.12.19.00.00
-unspsc7#31.12.19.07.00#Magnesium graphite mold machined castings#31.12.19.00.00
-unspsc7#31.12.19.08.00#Titanium graphite mold machined castings#31.12.19.00.00
-unspsc7#31.12.19.09.00#Beryllium graphite mold machined castings#31.12.19.00.00
-unspsc7#31.12.19.10.00#Copper graphite mold machined castings#31.12.19.00.00
-unspsc7#31.12.19.11.00#Brass graphite mold machined castings#31.12.19.00.00
-unspsc7#31.12.19.12.00#Bronze graphite mold machined castings#31.12.19.00.00
-unspsc7#31.12.19.13.00#Zinc graphite mold machined castings#31.12.19.00.00
-unspsc7#31.12.19.14.00#Tin graphite mold machined castings#31.12.19.00.00
-unspsc7#31.12.19.15.00#Lead graphite mold machined castings#31.12.19.00.00
-unspsc7#31.12.19.16.00#Precious metal graphite mold machined castings#31.12.19.00.00
-unspsc7#31.12.19.17.00#Composite graphite mold machined castings#31.12.19.00.00
-unspsc7#31.12.19.18.00#Nickel alloy metal graphite mold machined castings#31.12.19.00.00
-unspsc7#31.12.19.19.00#Non metallic graphite mold machined castings#31.12.19.00.00
-unspsc7#31.13.00.00.00#Forgings#31.00.00.00.00
-unspsc7#31.13.15.00.00#Open die forgings#31.13.00.00.00
-unspsc7#31.13.15.01.00#Non ferrous alloy open die forgings#31.13.15.00.00
-unspsc7#31.13.15.02.00#Ferrous alloy open die forgings#31.13.15.00.00
-unspsc7#31.13.15.03.00#Steel open die forgings#31.13.15.00.00
-unspsc7#31.13.15.04.00#Stainless steel open die forgings#31.13.15.00.00
-unspsc7#31.13.15.05.00#Iron open die forgings#31.13.15.00.00
-unspsc7#31.13.15.06.00#Aluminum open die forgings#31.13.15.00.00
-unspsc7#31.13.15.07.00#Magnesium open die forgings#31.13.15.00.00
-unspsc7#31.13.15.08.00#Titanium open die forgings#31.13.15.00.00
-unspsc7#31.13.15.09.00#Beryllium open die forgings#31.13.15.00.00
-unspsc7#31.13.15.10.00#Copper open die forgings#31.13.15.00.00
-unspsc7#31.13.15.11.00#Brass open die forgings#31.13.15.00.00
-unspsc7#31.13.15.12.00#Bronze open die forgings#31.13.15.00.00
-unspsc7#31.13.15.13.00#Zinc open die forgings#31.13.15.00.00
-unspsc7#31.13.15.14.00#Tin open die forgings#31.13.15.00.00
-unspsc7#31.13.15.15.00#Lead open die forgings#31.13.15.00.00
-unspsc7#31.13.15.16.00#Precious metal open die forgings#31.13.15.00.00
-unspsc7#31.13.16.00.00#Closed die forgings#31.13.00.00.00
-unspsc7#31.13.16.01.00#Non ferrous alloy closed die forgings#31.13.16.00.00
-unspsc7#31.13.16.02.00#Ferrous alloy closed die forgings#31.13.16.00.00
-unspsc7#31.13.16.03.00#Steel closed die forgings#31.13.16.00.00
-unspsc7#31.13.16.04.00#Stainless steel closed die forgings#31.13.16.00.00
-unspsc7#31.13.16.05.00#Iron closed die forgings#31.13.16.00.00
-unspsc7#31.13.16.06.00#Aluminum closed die forgings#31.13.16.00.00
-unspsc7#31.13.16.07.00#Magnesium closed die forgings#31.13.16.00.00
-unspsc7#31.13.16.08.00#Titanium closed die forgings#31.13.16.00.00
-unspsc7#31.13.16.09.00#Beryllium closed die forgings#31.13.16.00.00
-unspsc7#31.13.16.10.00#Copper closed die forgings#31.13.16.00.00
-unspsc7#31.13.16.11.00#Brass closed die forgings#31.13.16.00.00
-unspsc7#31.13.16.12.00#Bronze closed die forgings#31.13.16.00.00
-unspsc7#31.13.16.13.00#Zinc closed die forgings#31.13.16.00.00
-unspsc7#31.13.16.14.00#Tin closed die forgings#31.13.16.00.00
-unspsc7#31.13.16.15.00#Lead closed die forgings#31.13.16.00.00
-unspsc7#31.13.16.16.00#Precious metal closed die forgings#31.13.16.00.00
-unspsc7#31.13.17.00.00#Impression die forgings#31.13.00.00.00
-unspsc7#31.13.17.01.00#Non ferrous alloy impression die forgings#31.13.17.00.00
-unspsc7#31.13.17.02.00#Ferrous alloy impression die forgings#31.13.17.00.00
-unspsc7#31.13.17.03.00#Steel impression die forgings#31.13.17.00.00
-unspsc7#31.13.17.04.00#Stainless steel impression die forgings#31.13.17.00.00
-unspsc7#31.13.17.05.00#Iron impression die forgings#31.13.17.00.00
-unspsc7#31.13.17.06.00#Aluminum impression die forgings#31.13.17.00.00
-unspsc7#31.13.17.07.00#Magnesium impression die forgings#31.13.17.00.00
-unspsc7#31.13.17.08.00#Titanium impression die forgings#31.13.17.00.00
-unspsc7#31.13.17.09.00#Beryllium impression die forgings#31.13.17.00.00
-unspsc7#31.13.17.10.00#Copper impression die forgings#31.13.17.00.00
-unspsc7#31.13.17.11.00#Brass impression die forgings#31.13.17.00.00
-unspsc7#31.13.17.12.00#Bronze impression die forgings#31.13.17.00.00
-unspsc7#31.13.17.13.00#Zinc impression die forgings#31.13.17.00.00
-unspsc7#31.13.17.14.00#Tin impression die forgings#31.13.17.00.00
-unspsc7#31.13.17.15.00#Lead impression die forgings#31.13.17.00.00
-unspsc7#31.13.17.16.00#Precious metal impression die forgings#31.13.17.00.00
-unspsc7#31.13.18.00.00#Drop forgings#31.13.00.00.00
-unspsc7#31.13.18.01.00#Non ferrous alloy drop forgings#31.13.18.00.00
-unspsc7#31.13.18.02.00#Zinc drop forgings#31.13.18.00.00
-unspsc7#31.13.18.03.00#Ferrous alloy drop forgings#31.13.18.00.00
-unspsc7#31.13.18.04.00#Tin drop forgings#31.13.18.00.00
-unspsc7#31.13.18.05.00#Lead drop forgings#31.13.18.00.00
-unspsc7#31.13.18.06.00#Steel drop forgings#31.13.18.00.00
-unspsc7#31.13.18.07.00#Precious metal drop forgings#31.13.18.00.00
-unspsc7#31.13.18.08.00#Stainless steel drop forgings#31.13.18.00.00
-unspsc7#31.13.18.09.00#Iron drop forgings#31.13.18.00.00
-unspsc7#31.13.18.10.00#Aluminum drop forgings#31.13.18.00.00
-unspsc7#31.13.18.11.00#Magnesium drop forgings#31.13.18.00.00
-unspsc7#31.13.18.12.00#Titanium drop forgings#31.13.18.00.00
-unspsc7#31.13.18.13.00#Beryllium drop forgings#31.13.18.00.00
-unspsc7#31.13.18.14.00#Copper drop forgings#31.13.18.00.00
-unspsc7#31.13.18.15.00#Brass drop forgings#31.13.18.00.00
-unspsc7#31.13.18.16.00#Bronze drop forgings#31.13.18.00.00
-unspsc7#31.13.18.17.00#Cold steel drop forgings#31.13.18.00.00
-unspsc7#31.13.18.18.00#Semi finished drop forgings#31.13.18.00.00
-unspsc7#31.13.19.00.00#Rolled ring forgings#31.13.00.00.00
-unspsc7#31.13.19.01.00#Aluminum rolled ring forgings#31.13.19.00.00
-unspsc7#31.13.19.02.00#Beryllium rolled ring forgings#31.13.19.00.00
-unspsc7#31.13.19.03.00#Brass rolled ring forgings#31.13.19.00.00
-unspsc7#31.13.19.04.00#Bronze rolled ring forgings#31.13.19.00.00
-unspsc7#31.13.19.05.00#Copper rolled ring forgings#31.13.19.00.00
-unspsc7#31.13.19.06.00#Iron rolled ring forgings#31.13.19.00.00
-unspsc7#31.13.19.07.00#Lead rolled ring forgings#31.13.19.00.00
-unspsc7#31.13.19.08.00#Magnesium rolled ring forgings#31.13.19.00.00
-unspsc7#31.13.19.09.00#Precious metal rolled ring forgings#31.13.19.00.00
-unspsc7#31.13.19.10.00#Stainless steel rolled ring forgings#31.13.19.00.00
-unspsc7#31.13.19.11.00#Tin rolled ring forgings#31.13.19.00.00
-unspsc7#31.13.19.12.00#Titanium rolled ring forgings#31.13.19.00.00
-unspsc7#31.13.19.13.00#Zinc rolled ring forgings#31.13.19.00.00
-unspsc7#31.13.19.14.00#Non ferrous alloy rolled ring forgings#31.13.19.00.00
-unspsc7#31.13.19.15.00#Ferrous alloy rolled ring forgings#31.13.19.00.00
-unspsc7#31.13.19.16.00#Steel rolled ring forgings#31.13.19.00.00
-unspsc7#31.13.20.00.00#Powdered metal components#31.13.00.00.00
-unspsc7#31.13.20.01.00#Ferrous powdered metal components#31.13.20.00.00
-unspsc7#31.13.20.02.00#Non ferrous powdered metal parts#31.13.20.00.00
-unspsc7#31.14.00.00.00#Moldings#31.00.00.00.00
-unspsc7#31.14.15.00.00#Injection moldings#31.14.00.00.00
-unspsc7#31.14.15.01.00#Plastic injection moldings#31.14.15.00.00
-unspsc7#31.14.15.02.00#Rubber injection moldings#31.14.15.00.00
-unspsc7#31.14.15.03.00#Glass injection moldings#31.14.15.00.00
-unspsc7#31.14.16.00.00#Vacuum moldings#31.14.00.00.00
-unspsc7#31.14.16.01.00#Plastic vacuum moldings#31.14.16.00.00
-unspsc7#31.14.16.02.00#Rubber vacuum moldings#31.14.16.00.00
-unspsc7#31.14.16.03.00#Glass vacuum moldings#31.14.16.00.00
-unspsc7#31.14.17.00.00#Blow moldings#31.14.00.00.00
-unspsc7#31.14.17.01.00#Plastic blow moldings#31.14.17.00.00
-unspsc7#31.14.17.02.00#Rubber blow moldings#31.14.17.00.00
-unspsc7#31.14.18.00.00#Reaction injection moldings (RIM)#31.14.00.00.00
-unspsc7#31.14.18.01.00#Plastic reaction injection moldings#31.14.18.00.00
-unspsc7#31.14.18.02.00#Rubber reaction injection moldings#31.14.18.00.00
-unspsc7#31.15.00.00.00#Rope and chain and cable and wire and strap#31.00.00.00.00
-unspsc7#31.15.15.00.00#Ropes#31.15.00.00.00
-unspsc7#31.15.15.01.00#Cotton rope#31.15.15.00.00
-unspsc7#31.15.15.02.00#Polyester rope#31.15.15.00.00
-unspsc7#31.15.15.03.00#Polypropylene rope#31.15.15.00.00
-unspsc7#31.15.15.04.00#Nylon rope#31.15.15.00.00
-unspsc7#31.15.15.05.00#Wire rope#31.15.15.00.00
-unspsc7#31.15.15.06.00#Hemp rope#31.15.15.00.00
-unspsc7#31.15.15.07.00#String or twine#31.15.15.00.00
-unspsc7#31.15.15.08.00#Sisal rope#31.15.15.00.00
-unspsc7#31.15.16.00.00#Chains#31.15.00.00.00
-unspsc7#31.15.16.01.00#Safety chains#31.15.16.00.00
-unspsc7#31.15.16.02.00#Skid chains#31.15.16.00.00
-unspsc7#31.15.16.03.00#Roller chains#31.15.16.00.00
-unspsc7#31.15.16.04.00#Proof coil chains#31.15.16.00.00
-unspsc7#31.15.16.05.00#Sash chain#31.15.16.00.00
-unspsc7#31.15.16.06.00#Jack chains#31.15.16.00.00
-unspsc7#31.15.16.07.00#Coil chains#31.15.16.00.00
-unspsc7#31.15.16.08.00#Ball chains#31.15.16.00.00
-unspsc7#31.15.16.09.00#Chain links#31.15.16.00.00
-unspsc7#31.15.17.00.00#Mechanical cable#31.15.00.00.00
-unspsc7#31.15.17.01.00#Mechanical cables#31.15.17.00.00
-unspsc7#31.15.17.02.00#Non electric control cables#31.15.17.00.00
-unspsc7#31.15.17.03.00#Lifting cables#31.15.17.00.00
-unspsc7#31.15.17.04.00#Track cables#31.15.17.00.00
-unspsc7#31.15.17.05.00#Non electrical steel cables#31.15.17.00.00
-unspsc7#31.15.17.06.00#Non electrical copper cables#31.15.17.00.00
-unspsc7#31.15.17.07.00#Non electrical aluminum cables#31.15.17.00.00
-unspsc7#31.15.18.00.00#Mechanical wire#31.15.00.00.00
-unspsc7#31.15.18.01.00#Mechanical wire#31.15.18.00.00
-unspsc7#31.15.18.02.00#Barbed wire#31.15.18.00.00
-unspsc7#31.15.18.03.00#Piano steel wire#31.15.18.00.00
-unspsc7#31.15.19.00.00#Straps#31.15.00.00.00
-unspsc7#31.15.19.01.00#Metal straps#31.15.19.00.00
-unspsc7#31.15.19.02.00#Leather straps#31.15.19.00.00
-unspsc7#31.15.19.03.00#Fiber straps#31.15.19.00.00
-unspsc7#31.15.19.04.00#Plastic straps#31.15.19.00.00
-unspsc7#31.15.20.00.00#Security wire#31.15.00.00.00
-unspsc7#31.15.20.01.00#Razor wire#31.15.20.00.00
-unspsc7#31.15.20.02.00#Barbed wire#31.15.20.00.00
-unspsc7#31.15.21.00.00#Electrical wire#31.15.00.00.00
-unspsc7#31.15.21.01.00#Wire assembly#31.15.21.00.00
-unspsc7#31.16.00.00.00#Hardware#31.00.00.00.00
-unspsc7#31.16.15.00.00#Screws#31.16.00.00.00
-unspsc7#31.16.15.01.00#Cap screws#31.16.15.00.00
-unspsc7#31.16.15.02.00#Anchor screws#31.16.15.00.00
-unspsc7#31.16.15.03.00#Drive screws#31.16.15.00.00
-unspsc7#31.16.15.04.00#Machine screws#31.16.15.00.00
-unspsc7#31.16.15.05.00#Set screws#31.16.15.00.00
-unspsc7#31.16.15.06.00#Sheet metal screws#31.16.15.00.00
-unspsc7#31.16.15.07.00#Tapping screws#31.16.15.00.00
-unspsc7#31.16.15.08.00#Wood screws#31.16.15.00.00
-unspsc7#31.16.15.09.00#Drywall screws#31.16.15.00.00
-unspsc7#31.16.15.10.00#Captive screw#31.16.15.00.00
-unspsc7#31.16.15.11.00#Locking screws#31.16.15.00.00
-unspsc7#31.16.15.12.00#Thread rolling screws#31.16.15.00.00
-unspsc7#31.16.15.13.00#Flathead screws#31.16.15.00.00
-unspsc7#31.16.15.14.00#Weld screws#31.16.15.00.00
-unspsc7#31.16.15.15.00#Flat head screws#31.16.15.00.00
-unspsc7#31.16.15.16.00#Thumb screws#31.16.15.00.00
-unspsc7#31.16.15.17.00#Shoulder screws#31.16.15.00.00
-unspsc7#31.16.16.00.00#Bolts#31.16.00.00.00
-unspsc7#31.16.16.01.00#Anchor bolts#31.16.16.00.00
-unspsc7#31.16.16.02.00#Blind bolts#31.16.16.00.00
-unspsc7#31.16.16.03.00#Carriage bolts#31.16.16.00.00
-unspsc7#31.16.16.04.00#Clevis bolts#31.16.16.00.00
-unspsc7#31.16.16.05.00#Cylinder bolts#31.16.16.00.00
-unspsc7#31.16.16.06.00#Door bolts#31.16.16.00.00
-unspsc7#31.16.16.07.00#Expansion bolts#31.16.16.00.00
-unspsc7#31.16.16.08.00#Lag bolts#31.16.16.00.00
-unspsc7#31.16.16.09.00#Toggle bolts#31.16.16.00.00
-unspsc7#31.16.16.10.00#Eye bolts#31.16.16.00.00
-unspsc7#31.16.16.11.00#Locking bolts#31.16.16.00.00
-unspsc7#31.16.16.12.00#Pin or collar bolts#31.16.16.00.00
-unspsc7#31.16.16.13.00#Tension bolts#31.16.16.00.00
-unspsc7#31.16.16.14.00#Structural bolts#31.16.16.00.00
-unspsc7#31.16.16.15.00#Torque bolts#31.16.16.00.00
-unspsc7#31.16.16.16.00#U bolts#31.16.16.00.00
-unspsc7#31.16.16.17.00#Wing bolts#31.16.16.00.00
-unspsc7#31.16.16.18.00#Threaded rod#31.16.16.00.00
-unspsc7#31.16.16.19.00#Stud bolts#31.16.16.00.00
-unspsc7#31.16.16.20.00#Hexagonal bolts#31.16.16.00.00
-unspsc7#31.16.17.00.00#Nuts#31.16.00.00.00
-unspsc7#31.16.17.01.00#Anchor nuts#31.16.17.00.00
-unspsc7#31.16.17.02.00#Bearing nuts#31.16.17.00.00
-unspsc7#31.16.17.03.00#Blind nuts#31.16.17.00.00
-unspsc7#31.16.17.04.00#Barrel nuts#31.16.17.00.00
-unspsc7#31.16.17.05.00#Cap nuts#31.16.17.00.00
-unspsc7#31.16.17.06.00#Captive nuts#31.16.17.00.00
-unspsc7#31.16.17.07.00#Castle nuts#31.16.17.00.00
-unspsc7#31.16.17.08.00#Channel nuts#31.16.17.00.00
-unspsc7#31.16.17.09.00#Clamping nuts#31.16.17.00.00
-unspsc7#31.16.17.10.00#Expansion nuts#31.16.17.00.00
-unspsc7#31.16.17.11.00#Eye nuts#31.16.17.00.00
-unspsc7#31.16.17.12.00#Flange nuts#31.16.17.00.00
-unspsc7#31.16.17.13.00#Hose nuts#31.16.17.00.00
-unspsc7#31.16.17.14.00#Insert nuts#31.16.17.00.00
-unspsc7#31.16.17.15.00#Self locking nuts#31.16.17.00.00
-unspsc7#31.16.17.16.00#Locknuts#31.16.17.00.00
-unspsc7#31.16.17.17.00#Wing nuts#31.16.17.00.00
-unspsc7#31.16.17.18.00#Toggle nuts#31.16.17.00.00
-unspsc7#31.16.17.19.00#Swivel nuts#31.16.17.00.00
-unspsc7#31.16.17.20.00#Stop nuts#31.16.17.00.00
-unspsc7#31.16.17.21.00#Spring nuts#31.16.17.00.00
-unspsc7#31.16.17.22.00#Union nuts#31.16.17.00.00
-unspsc7#31.16.17.23.00#Nutplate nuts#31.16.17.00.00
-unspsc7#31.16.17.24.00#Press nuts#31.16.17.00.00
-unspsc7#31.16.17.25.00#Clip nuts#31.16.17.00.00
-unspsc7#31.16.17.26.00#Dome nuts#31.16.17.00.00
-unspsc7#31.16.17.27.00#Hexagonal nuts#31.16.17.00.00
-unspsc7#31.16.17.28.00#Coupling nuts#31.16.17.00.00
-unspsc7#31.16.17.29.00#Knurled nuts#31.16.17.00.00
-unspsc7#31.16.18.00.00#Washers#31.16.00.00.00
-unspsc7#31.16.18.01.00#Locking washers#31.16.18.00.00
-unspsc7#31.16.18.02.00#Bevel washers#31.16.18.00.00
-unspsc7#31.16.18.03.00#Binding washers#31.16.18.00.00
-unspsc7#31.16.18.04.00#Curved washers#31.16.18.00.00
-unspsc7#31.16.18.05.00#Electrical insulating washers#31.16.18.00.00
-unspsc7#31.16.18.06.00#Finishing washers#31.16.18.00.00
-unspsc7#31.16.18.07.00#Flat washers#31.16.18.00.00
-unspsc7#31.16.18.08.00#Open washers#31.16.18.00.00
-unspsc7#31.16.18.09.00#Reducing washers#31.16.18.00.00
-unspsc7#31.16.18.10.00#Shim washers#31.16.18.00.00
-unspsc7#31.16.18.11.00#Spring washers#31.16.18.00.00
-unspsc7#31.16.18.12.00#Square washers#31.16.18.00.00
-unspsc7#31.16.18.13.00#Swivel washers#31.16.18.00.00
-unspsc7#31.16.18.14.00#Thrust washers#31.16.18.00.00
-unspsc7#31.16.18.15.00#Shoulder washers#31.16.18.00.00
-unspsc7#31.16.18.16.00#Spacers or standoffs#31.16.18.00.00
-unspsc7#31.16.18.17.00#Conical washers#31.16.18.00.00
-unspsc7#31.16.19.00.00#Springs#31.16.00.00.00
-unspsc7#31.16.19.01.00#Helical springs#31.16.19.00.00
-unspsc7#31.16.19.02.00#Leaf springs#31.16.19.00.00
-unspsc7#31.16.19.03.00#Spiral springs#31.16.19.00.00
-unspsc7#31.16.19.04.00#Compression springs#31.16.19.00.00
-unspsc7#31.16.19.05.00#Die springs#31.16.19.00.00
-unspsc7#31.16.19.06.00#Disk springs#31.16.19.00.00
-unspsc7#31.16.19.07.00#Extension springs#31.16.19.00.00
-unspsc7#31.16.19.08.00#Torsion springs#31.16.19.00.00
-unspsc7#31.16.20.00.00#Nails#31.16.00.00.00
-unspsc7#31.16.20.01.00#Brads#31.16.20.00.00
-unspsc7#31.16.20.02.00#Cap nails#31.16.20.00.00
-unspsc7#31.16.20.03.00#Finishing nails#31.16.20.00.00
-unspsc7#31.16.20.04.00#Masonry nails#31.16.20.00.00
-unspsc7#31.16.20.05.00#Roofing nails#31.16.20.00.00
-unspsc7#31.16.20.06.00#Wire nails#31.16.20.00.00
-unspsc7#31.16.20.07.00#Upholstery nails#31.16.20.00.00
-unspsc7#31.16.20.08.00#Drive pins#31.16.20.00.00
-unspsc7#31.16.21.00.00#Anchors#31.16.00.00.00
-unspsc7#31.16.21.01.00#Concrete anchors#31.16.21.00.00
-unspsc7#31.16.21.02.00#Wedge anchors#31.16.21.00.00
-unspsc7#31.16.21.03.00#Wall anchors#31.16.21.00.00
-unspsc7#31.16.21.04.00#Screw anchors#31.16.21.00.00
-unspsc7#31.16.21.05.00#Resin anchors#31.16.21.00.00
-unspsc7#31.16.21.06.00#Pipe anchors#31.16.21.00.00
-unspsc7#31.16.21.07.00#Nail expansion anchors#31.16.21.00.00
-unspsc7#31.16.21.08.00#Tie down anchors#31.16.21.00.00
-unspsc7#31.16.22.00.00#Rivets#31.16.00.00.00
-unspsc7#31.16.22.01.00#Blind rivets#31.16.22.00.00
-unspsc7#31.16.22.02.00#Crownhead rivets#31.16.22.00.00
-unspsc7#31.16.22.03.00#Flat head rivets#31.16.22.00.00
-unspsc7#31.16.22.04.00#Full rivets#31.16.22.00.00
-unspsc7#31.16.22.05.00#Ratchet rivets#31.16.22.00.00
-unspsc7#31.16.22.06.00#Tinners rivets#31.16.22.00.00
-unspsc7#31.16.22.07.00#Compression rivets#31.16.22.00.00
-unspsc7#31.16.22.08.00#Coopers rivets#31.16.22.00.00
-unspsc7#31.16.22.09.00#Button head rivets#31.16.22.00.00
-unspsc7#31.16.23.00.00#Mounting hardware#31.16.00.00.00
-unspsc7#31.16.23.01.00#Mounting profiles#31.16.23.00.00
-unspsc7#31.16.23.03.00#Mounting bars#31.16.23.00.00
-unspsc7#31.16.23.04.00#Mounting strips#31.16.23.00.00
-unspsc7#31.16.23.05.00#Mounting clips#31.16.23.00.00
-unspsc7#31.16.23.06.00#Mounting hangers#31.16.23.00.00
-unspsc7#31.16.23.07.00#Mounting plates#31.16.23.00.00
-unspsc7#31.16.23.08.00#Mounting panels#31.16.23.00.00
-unspsc7#31.16.23.09.00#Mounting racks#31.16.23.00.00
-unspsc7#31.16.23.10.00#Mounting straps#31.16.23.00.00
-unspsc7#31.16.23.11.00#Wall bushings#31.16.23.00.00
-unspsc7#31.16.24.00.00#Miscellaneous fasteners#31.16.00.00.00
-unspsc7#31.16.24.01.00#Grommets#31.16.24.00.00
-unspsc7#31.16.24.02.00#Hasps#31.16.24.00.00
-unspsc7#31.16.24.03.00#Hinges#31.16.24.00.00
-unspsc7#31.16.24.04.00#Hardware staples#31.16.24.00.00
-unspsc7#31.16.24.05.00#Turnbuckles#31.16.24.00.00
-unspsc7#31.16.24.06.00#Strapping or banding buckles#31.16.24.00.00
-unspsc7#31.16.24.07.00#Latch#31.16.24.00.00
-unspsc7#31.16.24.08.00#Cotter pins#31.16.24.00.00
-unspsc7#31.16.25.00.00#Brackets and braces#31.16.00.00.00
-unspsc7#31.16.25.01.00#Shelf brackets#31.16.25.00.00
-unspsc7#31.16.25.02.00#Angle brackets#31.16.25.00.00
-unspsc7#31.16.25.03.00#Braces#31.16.25.00.00
-unspsc7#31.16.25.04.00#Electrical fixture brackets#31.16.25.00.00
-unspsc7#31.16.25.05.00#Magnetic mounting brackets#31.16.25.00.00
-unspsc7#31.16.26.00.00#Hooks#31.16.00.00.00
-unspsc7#31.16.26.01.00#Swivel hooks#31.16.26.00.00
-unspsc7#31.16.26.02.00#Spring hooks#31.16.26.00.00
-unspsc7#31.16.26.03.00#S hooks#31.16.26.00.00
-unspsc7#31.16.26.04.00#Safety hooks#31.16.26.00.00
-unspsc7#31.16.26.05.00#Lifting hooks#31.16.26.00.00
-unspsc7#31.16.26.06.00#J hooks#31.16.26.00.00
-unspsc7#31.16.26.07.00#Guy wire hooks#31.16.26.00.00
-unspsc7#31.16.26.08.00#Grab hooks#31.16.26.00.00
-unspsc7#31.16.26.09.00#Screw hooks#31.16.26.00.00
-unspsc7#31.16.26.10.00#Peg board hooks#31.16.26.00.00
-unspsc7#31.16.26.11.00#Slip hooks#31.16.26.00.00
-unspsc7#31.16.27.00.00#Rolling hardware#31.16.00.00.00
-unspsc7#31.16.27.01.00#Casters#31.16.27.00.00
-unspsc7#31.16.27.02.00#Wheels#31.16.27.00.00
-unspsc7#31.16.27.03.00#Sliders#31.16.27.00.00
-unspsc7#31.16.28.00.00#Miscellaneous hardware#31.16.00.00.00
-unspsc7#31.16.28.01.00#Handles or knobs#31.16.28.00.00
-unspsc7#31.16.28.02.00#Inserts#31.16.28.00.00
-unspsc7#31.16.28.03.00#Shackles#31.16.28.00.00
-unspsc7#31.16.28.04.00#Door stops#31.16.28.00.00
-unspsc7#31.16.28.05.00#Cable thimble#31.16.28.00.00
-unspsc7#31.16.28.06.00#Screw covers#31.16.28.00.00
-unspsc7#31.16.28.07.00#Levers#31.16.28.00.00
-unspsc7#31.16.28.08.00#Panic bars#31.16.28.00.00
-unspsc7#31.16.29.00.00#Clamps#31.16.00.00.00
-unspsc7#31.16.29.01.00#Ear clamps#31.16.29.00.00
-unspsc7#31.16.29.02.00#Spring clamps#31.16.29.00.00
-unspsc7#31.16.29.03.00#Screw clamps#31.16.29.00.00
-unspsc7#31.16.29.04.00#Wire rope clamps#31.16.29.00.00
-unspsc7#31.16.29.05.00#Beam clamps#31.16.29.00.00
-unspsc7#31.16.30.00.00#Couplings#31.16.00.00.00
-unspsc7#31.16.30.01.00#Elastomeric couplings#31.16.30.00.00
-unspsc7#31.16.30.02.00#Gear couplings#31.16.30.00.00
-unspsc7#31.16.30.03.00#Metallic couplings#31.16.30.00.00
-unspsc7#31.16.30.04.00#Miniature couplings#31.16.30.00.00
-unspsc7#31.16.31.00.00#Connectors#31.16.00.00.00
-unspsc7#31.16.31.01.00#Quick disconnects#31.16.31.00.00
-unspsc7#31.16.31.02.00#Ferrule#31.16.31.00.00
-unspsc7#31.16.31.03.00#Trailer Connector#31.16.31.00.00
-unspsc7#31.16.32.00.00#Retaining hardware#31.16.00.00.00
-unspsc7#31.16.32.01.00#Spring pins#31.16.32.00.00
-unspsc7#31.16.32.02.00#Retaining rings#31.16.32.00.00
-unspsc7#31.16.32.03.00#Dowel pin#31.16.32.00.00
-unspsc7#31.16.32.04.00#Cotter pin#31.16.32.00.00
-unspsc7#31.16.32.05.00#Taper pins#31.16.32.00.00
-unspsc7#31.16.32.06.00#Grooved pins#31.16.32.00.00
-unspsc7#31.16.32.07.00#Shaft or woodruff keys#31.16.32.00.00
-unspsc7#31.16.32.08.00#Keystock#31.16.32.00.00
-unspsc7#31.16.32.09.00#Bearing holders or retainers#31.16.32.00.00
-unspsc7#31.16.32.10.00#Retaining collars#31.16.32.00.00
-unspsc7#31.16.33.00.00#Spacer#31.16.00.00.00
-unspsc7#31.16.33.01.00#Shim#31.16.33.00.00
-unspsc7#31.17.00.00.00#Bearings and bushings and wheels and gears#31.00.00.00.00
-unspsc7#31.17.15.00.00#Bearings#31.17.00.00.00
-unspsc7#31.17.15.01.00#Flanged bearings#31.17.15.00.00
-unspsc7#31.17.15.02.00#Radial bearings#31.17.15.00.00
-unspsc7#31.17.15.03.00#Wheel bearings#31.17.15.00.00
-unspsc7#31.17.15.04.00#Ball bearings#31.17.15.00.00
-unspsc7#31.17.15.05.00#Roller bearings#31.17.15.00.00
-unspsc7#31.17.15.06.00#Linear bearings#31.17.15.00.00
-unspsc7#31.17.15.07.00#Thrust bearings#31.17.15.00.00
-unspsc7#31.17.15.08.00#Rod end bearings#31.17.15.00.00
-unspsc7#31.17.15.09.00#Sleeve bearings#31.17.15.00.00
-unspsc7#31.17.15.10.00#Spherical bearings#31.17.15.00.00
-unspsc7#31.17.15.11.00#Pillow block bearings#31.17.15.00.00
-unspsc7#31.17.15.12.00#Needle bearings#31.17.15.00.00
-unspsc7#31.17.15.13.00#Hanger bearings#31.17.15.00.00
-unspsc7#31.17.15.14.00#Door closers#31.17.15.00.00
-unspsc7#31.17.15.15.00#Plain bearings#31.17.15.00.00
-unspsc7#31.17.15.16.00#Tapered bearings#31.17.15.00.00
-unspsc7#31.17.15.17.00#Needle bearings#31.17.15.00.00
-unspsc7#31.17.15.18.00#Bearing Cage#31.17.15.00.00
-unspsc7#31.17.15.19.00#Bearing blocks or housings#31.17.15.00.00
-unspsc7#31.17.15.20.00#Bearing journals#31.17.15.00.00
-unspsc7#31.17.15.21.00#Bearing rollers or balls#31.17.15.00.00
-unspsc7#31.17.16.00.00#Bushings#31.17.00.00.00
-unspsc7#31.17.16.01.00#Transformer bushings#31.17.16.00.00
-unspsc7#31.17.16.02.00#Wall bushings#31.17.16.00.00
-unspsc7#31.17.16.03.00#Drill bushings#31.17.16.00.00
-unspsc7#31.17.16.04.00#Pilot bushings#31.17.16.00.00
-unspsc7#31.17.16.05.00#Shaft bushings#31.17.16.00.00
-unspsc7#31.17.17.00.00#Gears#31.17.00.00.00
-unspsc7#31.17.17.01.00#Gear boxes#31.17.17.00.00
-unspsc7#31.17.17.02.00#Rack or pinion gears#31.17.17.00.00
-unspsc7#31.17.17.03.00#Differential gears#31.17.17.00.00
-unspsc7#31.17.17.04.00#Friction gears#31.17.17.00.00
-unspsc7#31.17.17.05.00#Helical gears#31.17.17.00.00
-unspsc7#31.17.17.06.00#Conical gears#31.17.17.00.00
-unspsc7#31.17.17.07.00#Spur gears#31.17.17.00.00
-unspsc7#31.17.17.08.00#Bevel gears#31.17.17.00.00
-unspsc7#31.17.17.09.00#Rack gears#31.17.17.00.00
-unspsc7#31.17.17.10.00#Pinion gears#31.17.17.00.00
-unspsc7#31.17.17.11.00#Ring gears#31.17.17.00.00
-unspsc7#31.17.17.12.00#Worm gears#31.17.17.00.00
-unspsc7#31.17.17.13.00#Side Gears#31.17.17.00.00
-unspsc7#31.17.17.14.00#Helical gears#31.17.17.00.00
-unspsc7#31.17.18.00.00#Industrial wheels#31.17.00.00.00
-unspsc7#31.17.18.01.00#Cog wheels#31.17.18.00.00
-unspsc7#31.17.18.02.00#Impeller wheels#31.17.18.00.00
-unspsc7#31.17.18.03.00#Flywheels#31.17.18.00.00
-unspsc7#31.17.18.04.00#Sheaves#31.17.18.00.00
-unspsc7#31.17.18.05.00#Wheel brushes#31.17.18.00.00
-unspsc7#31.17.19.00.00#Sprockets#31.17.00.00.00
-unspsc7#31.17.19.01.00#Roller chain sprockets#31.17.19.00.00
-unspsc7#31.17.19.02.00#Split sprockets#31.17.19.00.00
-unspsc7#31.18.00.00.00#Gaskets and seals#31.00.00.00.00
-unspsc7#31.18.15.00.00#Gaskets#31.18.00.00.00
-unspsc7#31.18.15.01.00#Plastic gaskets#31.18.15.00.00
-unspsc7#31.18.15.02.00#Rubber gaskets#31.18.15.00.00
-unspsc7#31.18.15.03.00#Metal gaskets#31.18.15.00.00
-unspsc7#31.18.15.04.00#Textile gaskets#31.18.15.00.00
-unspsc7#31.18.15.05.00#Cork gaskets#31.18.15.00.00
-unspsc7#31.18.15.06.00#O ring gaskets#31.18.15.00.00
-unspsc7#31.18.15.07.00#Electromagnetic interference (EMI) gaskets#31.18.15.00.00
-unspsc7#31.18.15.08.00#Bolted gaskets#31.18.15.00.00
-unspsc7#31.18.15.09.00#Gasket kits#31.18.15.00.00
-unspsc7#31.18.15.10.00#Silicone gaskets#31.18.15.00.00
-unspsc7#31.18.15.11.00#Liquid gaskets#31.18.15.00.00
-unspsc7#31.18.16.00.00#Seals#31.18.00.00.00
-unspsc7#31.18.16.01.00#Plastic seals#31.18.16.00.00
-unspsc7#31.18.16.02.00#Rubber seals#31.18.16.00.00
-unspsc7#31.18.16.03.00#Metallic seals#31.18.16.00.00
-unspsc7#31.18.16.04.00#Seal mechanical#31.18.16.00.00
-unspsc7#31.18.17.00.00#Packings and glands#31.18.00.00.00
-unspsc7#31.18.17.01.00#Packings#31.18.17.00.00
-unspsc7#31.18.17.02.00#Glands#31.18.17.00.00
-unspsc7#31.19.00.00.00#Grinding and polishing and smoothing materials#31.00.00.00.00
-unspsc7#31.19.15.00.00#Abrasives and abrasive media#31.19.00.00.00
-unspsc7#31.19.15.01.00#Abrasive papers#31.19.15.00.00
-unspsc7#31.19.15.02.00#Buffs#31.19.15.00.00
-unspsc7#31.19.15.03.00#Abrasive wheels#31.19.15.00.00
-unspsc7#31.19.15.04.00#Abrasive cloth#31.19.15.00.00
-unspsc7#31.19.15.05.00#Abrasive pads#31.19.15.00.00
-unspsc7#31.19.15.06.00#Abrasive discs#31.19.15.00.00
-unspsc7#31.19.15.07.00#Abrasive belts#31.19.15.00.00
-unspsc7#31.19.15.08.00#Bort#31.19.15.00.00
-unspsc7#31.19.15.09.00#Abrasive polishers#31.19.15.00.00
-unspsc7#31.19.15.10.00#Abrasive stones#31.19.15.00.00
-unspsc7#31.19.15.11.00#Steel wool#31.19.15.00.00
-unspsc7#31.19.15.12.00#Shot blast#31.19.15.00.00
-unspsc7#31.19.15.13.00#Glass bead#31.19.15.00.00
-unspsc7#31.19.15.14.00#Tumble media#31.19.15.00.00
-unspsc7#31.19.15.15.00#Abrasive mesh#31.19.15.00.00
-unspsc7#31.19.15.16.00#Abrasive cartridge rolls#31.19.15.00.00
-unspsc7#31.19.15.17.00#Emery boards#31.19.15.00.00
-unspsc7#31.19.16.00.00#Abrasive wheels#31.19.00.00.00
-unspsc7#31.19.16.01.00#Abrasive cubic borozon nitrate wheels#31.19.16.00.00
-unspsc7#31.19.16.02.00#Abrasive diamond wheels#31.19.16.00.00
-unspsc7#31.19.16.03.00#Tungsten carbide abrasive wheels#31.19.16.00.00
-unspsc7#31.20.00.00.00#Adhesives and sealants#31.00.00.00.00
-unspsc7#31.20.15.00.00#Tape#31.20.00.00.00
-unspsc7#31.20.15.01.00#Duct tape#31.20.15.00.00
-unspsc7#31.20.15.02.00#Electrical insulating tape#31.20.15.00.00
-unspsc7#31.20.15.03.00#Masking tape#31.20.15.00.00
-unspsc7#31.20.15.04.00#Carpet tape#31.20.15.00.00
-unspsc7#31.20.15.05.00#Double sided tape#31.20.15.00.00
-unspsc7#31.20.15.06.00#Bismalemide tape#31.20.15.00.00
-unspsc7#31.20.15.07.00#Fiberglass tape#31.20.15.00.00
-unspsc7#31.20.15.08.00#Graphite tape#31.20.15.00.00
-unspsc7#31.20.15.09.00#Nylon tape#31.20.15.00.00
-unspsc7#31.20.15.10.00#Resin impregnated tape#31.20.15.00.00
-unspsc7#31.20.15.11.00#Wire mesh tape#31.20.15.00.00
-unspsc7#31.20.15.12.00#Transparent tape#31.20.15.00.00
-unspsc7#31.20.15.13.00#Non skid safety tapes#31.20.15.00.00
-unspsc7#31.20.15.14.00#Polytetrafluoroethylene (PTFE) thread sealing tape#31.20.15.00.00
-unspsc7#31.20.15.15.00#Paper tapes#31.20.15.00.00
-unspsc7#31.20.15.16.00#Reflective tape#31.20.15.00.00
-unspsc7#31.20.15.17.00#Packaging tape#31.20.15.00.00
-unspsc7#31.20.15.18.00#Electrically conductive tape#31.20.15.00.00
-unspsc7#31.20.15.19.00#Pipe or hose repair tape#31.20.15.00.00
-unspsc7#31.20.15.20.00#Aisle marking tape#31.20.15.00.00
-unspsc7#31.20.15.21.00#Foil tape#31.20.15.00.00
-unspsc7#31.20.15.22.00#Adhesive transfer tape#31.20.15.00.00
-unspsc7#31.20.15.23.00#Cloth tape#31.20.15.00.00
-unspsc7#31.20.15.24.00#Color coding tape#31.20.15.00.00
-unspsc7#31.20.15.25.00#Vinyl tape#31.20.15.00.00
-unspsc7#31.20.15.26.00#Magnetic tape#31.20.15.00.00
-unspsc7#31.20.16.00.00#Other adhesives and sealants#31.20.00.00.00
-unspsc7#31.20.16.01.00#Chemical adhesives#31.20.16.00.00
-unspsc7#31.20.16.02.00#Pastes#31.20.16.00.00
-unspsc7#31.20.16.03.00#Gums#31.20.16.00.00
-unspsc7#31.20.16.04.00#Rubber cements#31.20.16.00.00
-unspsc7#31.20.16.05.00#Putties#31.20.16.00.00
-unspsc7#31.20.16.06.00#Caulks#31.20.16.00.00
-unspsc7#31.20.16.07.00#Epoxy bond#31.20.16.00.00
-unspsc7#31.20.16.08.00#Foam adhesives#31.20.16.00.00
-unspsc7#31.20.16.09.00#Hot melt adhesives#31.20.16.00.00
-unspsc7#31.20.16.10.00#Glues#31.20.16.00.00
-unspsc7#31.20.16.11.00#Film adhesives#31.20.16.00.00
-unspsc7#31.20.16.12.00#Thread sealants#31.20.16.00.00
-unspsc7#31.20.16.13.00#Re usable adhesive#31.20.16.00.00
-unspsc7#31.20.16.14.00#Sealing waxes#31.20.16.00.00
-unspsc7#31.21.00.00.00#Paints and primers and finishes#31.00.00.00.00
-unspsc7#31.21.15.00.00#Paints and primers#31.21.00.00.00
-unspsc7#31.21.15.01.00#Enamel paints#31.21.15.00.00
-unspsc7#31.21.15.02.00#Water based paints#31.21.15.00.00
-unspsc7#31.21.15.03.00#Pigment paints#31.21.15.00.00
-unspsc7#31.21.15.04.00#Coating paints#31.21.15.00.00
-unspsc7#31.21.15.05.00#Oil based paints#31.21.15.00.00
-unspsc7#31.21.15.06.00#Latex paints#31.21.15.00.00
-unspsc7#31.21.15.07.00#Spray paints#31.21.15.00.00
-unspsc7#31.21.15.08.00#Acrylic paints#31.21.15.00.00
-unspsc7#31.21.15.09.00#Enamel primers#31.21.15.00.00
-unspsc7#31.21.15.10.00#Polyurethane primers#31.21.15.00.00
-unspsc7#31.21.15.11.00#Urethane primers#31.21.15.00.00
-unspsc7#31.21.15.12.00#Latex primers#31.21.15.00.00
-unspsc7#31.21.16.00.00#Paint additives#31.21.00.00.00
-unspsc7#31.21.16.01.00#Calcimines#31.21.16.00.00
-unspsc7#31.21.16.02.00#Texturing materials#31.21.16.00.00
-unspsc7#31.21.16.03.00#Paint driers#31.21.16.00.00
-unspsc7#31.21.16.04.00#Paint extenders#31.21.16.00.00
-unspsc7#31.21.16.05.00#Anti slip agents#31.21.16.00.00
-unspsc7#31.21.16.06.00#Leveling agents#31.21.16.00.00
-unspsc7#31.21.16.07.00#Anti foaming agents#31.21.16.00.00
-unspsc7#31.21.17.00.00#Miscellaneous finishes#31.21.00.00.00
-unspsc7#31.21.17.01.00#Glazes#31.21.17.00.00
-unspsc7#31.21.17.02.00#Lusters#31.21.17.00.00
-unspsc7#31.21.17.03.00#Lacquers#31.21.17.00.00
-unspsc7#31.21.17.04.00#Sealers#31.21.17.00.00
-unspsc7#31.21.17.05.00#Shellacs#31.21.17.00.00
-unspsc7#31.21.17.06.00#Stains#31.21.17.00.00
-unspsc7#31.21.17.07.00#Varnishes#31.21.17.00.00
-unspsc7#31.21.17.08.00#Powder coat#31.21.17.00.00
-unspsc7#31.21.18.00.00#Paint solvents and thinners#31.21.00.00.00
-unspsc7#31.21.18.01.00#Paint or varnish removers#31.21.18.00.00
-unspsc7#31.21.18.02.00#Paint or varnish strippers#31.21.18.00.00
-unspsc7#31.21.18.03.00#Paint or varnish thinners#31.21.18.00.00
-unspsc7#31.21.19.00.00#Paint applicators and painting accessories#31.21.00.00.00
-unspsc7#31.21.19.01.00#Drop cloths#31.21.19.00.00
-unspsc7#31.21.19.02.00#Edging tools#31.21.19.00.00
-unspsc7#31.21.19.03.00#Masking equipment#31.21.19.00.00
-unspsc7#31.21.19.04.00#Paint brushes#31.21.19.00.00
-unspsc7#31.21.19.05.00#Paint mixers#31.21.19.00.00
-unspsc7#31.21.19.06.00#Paint rollers#31.21.19.00.00
-unspsc7#31.21.19.08.00#Paint sprayers#31.21.19.00.00
-unspsc7#31.21.19.09.00#Paint trays#31.21.19.00.00
-unspsc7#31.21.19.10.00#Paint mitts#31.21.19.00.00
-unspsc7#31.21.19.12.00#Telescoping poles#31.21.19.00.00
-unspsc7#31.21.19.13.00#Paint nozzles#31.21.19.00.00
-unspsc7#31.21.19.14.00#Air brushes#31.21.19.00.00
-unspsc7#31.21.19.15.00#Paint strainers#31.21.19.00.00
-unspsc7#31.22.00.00.00#Dyeing and tanning extracts#31.00.00.00.00
-unspsc7#31.22.15.00.00#Dyeing products#31.22.00.00.00
-unspsc7#31.22.15.01.00#Inorganic dyes#31.22.15.00.00
-unspsc7#31.22.15.02.00#Organic dyes of animal origin#31.22.15.00.00
-unspsc7#31.22.15.03.00#Organic dyes of vegetable origin#31.22.15.00.00
-unspsc7#31.22.16.00.00#Tanning products#31.22.00.00.00
-unspsc7#31.22.16.01.00#Inorganic tanning extracts#31.22.16.00.00
-unspsc7#31.22.16.02.00#Organic tanning extracts of animal origin#31.22.16.00.00
-unspsc7#31.22.16.03.00#Organic tanning extracts of vegetable origin#31.22.16.00.00
-unspsc7#31.23.00.00.00#Machined raw stock#31.00.00.00.00
-unspsc7#31.23.11.00.00#Machined bar stock#31.23.00.00.00
-unspsc7#31.23.11.01.00#Aluminum machined bar stock#31.23.11.00.00
-unspsc7#31.23.11.02.00#Beryllium machined bar stock#31.23.11.00.00
-unspsc7#31.23.11.03.00#Brass machined bar stock#31.23.11.00.00
-unspsc7#31.23.11.04.00#Bronze machined bar stock#31.23.11.00.00
-unspsc7#31.23.11.05.00#Copper machined bar stock#31.23.11.00.00
-unspsc7#31.23.11.06.00#Iron machined bar stock#31.23.11.00.00
-unspsc7#31.23.11.07.00#Lead machined bar stock#31.23.11.00.00
-unspsc7#31.23.11.08.00#Magnesium machined bar stock#31.23.11.00.00
-unspsc7#31.23.11.09.00#Precious metal machined bar stock#31.23.11.00.00
-unspsc7#31.23.11.10.00#Stainless steel machined bar stock#31.23.11.00.00
-unspsc7#31.23.11.11.00#Tin machined bar stock#31.23.11.00.00
-unspsc7#31.23.11.12.00#Titanium machined bar stock#31.23.11.00.00
-unspsc7#31.23.11.13.00#Zinc machined bar stock#31.23.11.00.00
-unspsc7#31.23.11.14.00#Non ferrous alloy machined bar stock#31.23.11.00.00
-unspsc7#31.23.11.15.00#Ferrous alloy machined bar stock#31.23.11.00.00
-unspsc7#31.23.11.16.00#Steel machined bar stock#31.23.11.00.00
-unspsc7#31.23.11.17.00#Composite machined bar stock#31.23.11.00.00
-unspsc7#31.23.11.18.00#Nickel alloy machined bar stock#31.23.11.00.00
-unspsc7#31.23.11.19.00#Non metallic machined bar stock#31.23.11.00.00
-unspsc7#31.23.12.00.00#Machined plate stock#31.23.00.00.00
-unspsc7#31.23.12.01.00#Aluminum machined plate stock#31.23.12.00.00
-unspsc7#31.23.12.02.00#Beryllium machined plate stock#31.23.12.00.00
-unspsc7#31.23.12.03.00#Brass machined plate stock#31.23.12.00.00
-unspsc7#31.23.12.04.00#Bronze machined plate stock#31.23.12.00.00
-unspsc7#31.23.12.05.00#Copper machined plate stock#31.23.12.00.00
-unspsc7#31.23.12.06.00#Iron machined plate stock#31.23.12.00.00
-unspsc7#31.23.12.07.00#Lead machined plate stock#31.23.12.00.00
-unspsc7#31.23.12.08.00#Magnesium machined plate stock#31.23.12.00.00
-unspsc7#31.23.12.09.00#Precious metal machined plate stock#31.23.12.00.00
-unspsc7#31.23.12.10.00#Stainless steel machined plate stock#31.23.12.00.00
-unspsc7#31.23.12.11.00#Tin machined plate stock#31.23.12.00.00
-unspsc7#31.23.12.12.00#Titanium machined plate stock#31.23.12.00.00
-unspsc7#31.23.12.13.00#Zinc machined plate stock#31.23.12.00.00
-unspsc7#31.23.12.14.00#Non ferrous alloy machined plate stock#31.23.12.00.00
-unspsc7#31.23.12.15.00#Ferrous alloy machined plate stock#31.23.12.00.00
-unspsc7#31.23.12.16.00#Steel machined plate stock#31.23.12.00.00
-unspsc7#31.23.12.17.00#Composite machined plate stock#31.23.12.00.00
-unspsc7#31.23.12.18.00#Nickel alloy machined plate stock#31.23.12.00.00
-unspsc7#31.23.12.19.00#Non metallic machined plate stock#31.23.12.00.00
-unspsc7#31.23.13.00.00#Shim stock#31.23.00.00.00
-unspsc7#31.23.13.01.00#Brass shim stock#31.23.13.00.00
-unspsc7#31.23.13.02.00#Steel shim stock#31.23.13.00.00
-unspsc7#31.23.13.03.00#Stainless steel shim stock#31.23.13.00.00
-unspsc7#31.23.13.04.00#Aluminum shim stock#31.23.13.00.00
-unspsc7#31.23.13.05.00#Copper shim stock#31.23.13.00.00
-unspsc7#31.24.00.00.00#Industrial optics#31.00.00.00.00
-unspsc7#31.24.15.00.00#Lenses and prisms#31.24.00.00.00
-unspsc7#31.24.15.01.00#Lenses#31.24.15.00.00
-unspsc7#31.24.15.02.00#Prisms#31.24.15.00.00
-unspsc7#31.24.16.00.00#Optical blanks#31.24.00.00.00
-unspsc7#31.24.16.01.00#Filter blanks#31.24.16.00.00
-unspsc7#31.24.16.02.00#Glass disks#31.24.16.00.00
-unspsc7#31.24.16.03.00#Molded glass#31.24.16.00.00
-unspsc7#31.24.16.04.00#Prism blanks#31.24.16.00.00
-unspsc7#31.24.16.05.00#Silicon blanks#31.24.16.00.00
-unspsc7#31.24.16.06.00#Germanium blanks#31.24.16.00.00
-unspsc7#31.24.16.07.00#Round bar stock#31.24.16.00.00
-unspsc7#31.24.16.08.00#Square bar stock#31.24.16.00.00
-unspsc7#31.24.16.09.00#Witness sample blanks#31.24.16.00.00
-unspsc7#31.24.16.10.00#Infrared optical material blanks#31.24.16.00.00
-unspsc7#31.24.17.00.00#Mirrors#31.24.00.00.00
-unspsc7#31.24.17.01.00#Diamond turned mirrors#31.24.17.00.00
-unspsc7#31.24.17.02.00#Metallic mirrors#31.24.17.00.00
-unspsc7#31.24.17.03.00#Parabolic mirrors#31.24.17.00.00
-unspsc7#31.24.17.04.00#Uncoated mirrors#31.24.17.00.00
-unspsc7#31.24.18.00.00#Optical filters#31.24.00.00.00
-unspsc7#31.24.18.01.00#Broad band filters#31.24.18.00.00
-unspsc7#31.24.18.02.00#Gradient filters#31.24.18.00.00
-unspsc7#31.24.18.03.00#Infrared filters#31.24.18.00.00
-unspsc7#31.24.18.04.00#Laser filters#31.24.18.00.00
-unspsc7#31.24.18.05.00#Narrow band filters#31.24.18.00.00
-unspsc7#31.24.18.06.00#Pelicle filters#31.24.18.00.00
-unspsc7#31.24.18.07.00#Visual filters#31.24.18.00.00
-unspsc7#31.24.19.00.00#Optical domes#31.24.00.00.00
-unspsc7#31.24.19.01.00#Specialty domes#31.24.19.00.00
-unspsc7#31.24.19.02.00#Diamond turned domes#31.24.19.00.00
-unspsc7#31.24.19.03.00#Metallic domes#31.24.19.00.00
-unspsc7#31.24.19.04.00#Molded glass domes#31.24.19.00.00
-unspsc7#31.24.19.05.00#Molded polycarbonate domes#31.24.19.00.00
-unspsc7#31.24.19.06.00#Replicated domes#31.24.19.00.00
-unspsc7#31.24.19.07.00#Shaped domes#31.24.19.00.00
-unspsc7#31.24.19.08.00#Frangible domes#31.24.19.00.00
-unspsc7#31.24.20.00.00#Lens and laser windows#31.24.00.00.00
-unspsc7#31.24.20.01.00#External lens or laser windows#31.24.20.00.00
-unspsc7#31.24.20.02.00#Infrared lens or laser windows#31.24.20.00.00
-unspsc7#31.24.20.03.00#Visual lens or laser windows#31.24.20.00.00
-unspsc7#31.24.21.00.00#Optical device accessories#31.24.00.00.00
-unspsc7#31.24.21.01.00#Prism holders#31.24.21.00.00
-unspsc7#31.24.21.02.00#Lens holders#31.24.21.00.00
-unspsc7#31.24.21.03.00#Optical slits#31.24.21.00.00
-unspsc7#31.25.00.00.00#Pneumatic and hydraulic and electric control systems#31.00.00.00.00
-unspsc7#31.25.15.00.00#Actuators#31.25.00.00.00
-unspsc7#31.25.15.01.00#Electric actuators#31.25.15.00.00
-unspsc7#31.25.15.02.00#Electronic actuators#31.25.15.00.00
-unspsc7#31.25.15.03.00#Hydraulic actuators#31.25.15.00.00
-unspsc7#31.25.15.04.00#Pneumatic actuators#31.25.15.00.00
-unspsc7#31.25.15.05.00#Valve actuators#31.25.15.00.00
-unspsc7#31.25.15.06.00#Gear actuators#31.25.15.00.00
-unspsc7#31.25.15.07.00#Rotary actuators#31.25.15.00.00
-unspsc7#31.25.15.08.00#Photoelectric actuators#31.25.15.00.00
-unspsc7#31.25.15.09.00#Electromagnetic actuators#31.25.15.00.00
-unspsc7#31.25.15.10.00#Solenoids#31.25.15.00.00
-unspsc7#31.25.15.11.00#Linear actuators#31.25.15.00.00
-unspsc7#31.26.00.00.00#Housings and cabinets and casings#31.00.00.00.00
-unspsc7#31.26.15.00.00#Housings and cabinets#31.26.00.00.00
-unspsc7#31.26.15.01.00#Plastic housings or cabinets#31.26.15.00.00
-unspsc7#31.26.15.02.00#Metal housings or cabinets#31.26.15.00.00
-unspsc7#31.26.15.03.00#Steel housings or cabinets#31.26.15.00.00
-unspsc7#31.26.15.04.00#Gear boxes or housings#31.26.15.00.00
-unspsc7#31.26.16.00.00#Shells and casings#31.26.00.00.00
-unspsc7#31.26.16.01.00#Plastic shells or casings#31.26.16.00.00
-unspsc7#31.26.16.02.00#Metal shells or casings#31.26.16.00.00
-unspsc7#31.26.16.03.00#Steel shells or casings#31.26.16.00.00
-unspsc7#31.27.00.00.00#Machine made parts#31.00.00.00.00
-unspsc7#31.27.15.00.00#General machine made parts#31.27.00.00.00
-unspsc7#31.27.15.01.00#Metal general machine made parts#31.27.15.00.00
-unspsc7#31.27.15.02.00#Non metal general machine made parts#31.27.15.00.00
-unspsc7#31.27.16.00.00#Screw machine made parts#31.27.00.00.00
-unspsc7#31.27.16.01.00#Metal screw machine made parts#31.27.16.00.00
-unspsc7#31.27.16.02.00#Non metal screw machine made parts#31.27.16.00.00
-unspsc7#31.28.00.00.00#Stampings and sheet components#31.00.00.00.00
-unspsc7#31.28.15.00.00#Stamped components#31.28.00.00.00
-unspsc7#31.28.15.01.00#Stamped metal components#31.28.15.00.00
-unspsc7#31.28.15.02.00#Aluminum stamped components#31.28.15.00.00
-unspsc7#31.28.15.03.00#Ferrous alloy stamped components#31.28.15.00.00
-unspsc7#31.28.15.04.00#Iron stamped components#31.28.15.00.00
-unspsc7#31.28.15.05.00#Non ferrous alloy stamped components#31.28.15.00.00
-unspsc7#31.28.15.06.00#Stainless steel stamped components#31.28.15.00.00
-unspsc7#31.28.15.07.00#Carbon Steel stamped components#31.28.15.00.00
-unspsc7#31.28.15.08.00#Magnesium stamped components#31.28.15.00.00
-unspsc7#31.28.15.09.00#Zinc stamped components#31.28.15.00.00
-unspsc7#31.28.15.10.00#Tin stamped components#31.28.15.00.00
-unspsc7#31.28.15.11.00#Titanium stamped components#31.28.15.00.00
-unspsc7#31.28.15.12.00#Beryllium stamped components#31.28.15.00.00
-unspsc7#31.28.15.13.00#Precious metal stamped components#31.28.15.00.00
-unspsc7#31.28.15.14.00#Copper stamped components#31.28.15.00.00
-unspsc7#31.28.15.15.00#Lead stamped components#31.28.15.00.00
-unspsc7#31.28.15.16.00#Brass stamped components#31.28.15.00.00
-unspsc7#31.28.15.17.00#Bronze stamped components#31.28.15.00.00
-unspsc7#31.28.15.18.00#Composite stamped components#31.28.15.00.00
-unspsc7#31.28.15.19.00#Nickel alloy stamped components#31.28.15.00.00
-unspsc7#31.28.15.20.00#Non metallic stamped components#31.28.15.00.00
-unspsc7#31.28.15.21.00#Coated Stampings#31.28.15.00.00
-unspsc7#31.28.16.00.00#Formed components#31.28.00.00.00
-unspsc7#31.28.16.01.00#Formed metal components#31.28.16.00.00
-unspsc7#31.28.17.00.00#Welded components#31.28.00.00.00
-unspsc7#31.28.17.01.00#Welded metal components#31.28.17.00.00
-unspsc7#31.28.18.00.00#Punched components#31.28.00.00.00
-unspsc7#31.28.18.01.00#Aluminum punched components#31.28.18.00.00
-unspsc7#31.28.18.02.00#Ferrous alloy punched components#31.28.18.00.00
-unspsc7#31.28.18.03.00#Iron punched components#31.28.18.00.00
-unspsc7#31.28.18.04.00#Non ferrous alloy punched components#31.28.18.00.00
-unspsc7#31.28.18.05.00#Stainless steel punched components#31.28.18.00.00
-unspsc7#31.28.18.06.00#Carbon Steel punched components#31.28.18.00.00
-unspsc7#31.28.18.07.00#Composite punched components#31.28.18.00.00
-unspsc7#31.28.18.08.00#Nickel alloy punched components#31.28.18.00.00
-unspsc7#31.28.18.09.00#Non metallic punched components#31.28.18.00.00
-unspsc7#31.28.18.10.00#Titanium punched components#31.28.18.00.00
-unspsc7#31.28.18.11.00#Beryllium punched components#31.28.18.00.00
-unspsc7#31.28.18.12.00#Precious metal punched components#31.28.18.00.00
-unspsc7#31.28.18.13.00#Copper punched components#31.28.18.00.00
-unspsc7#31.28.18.14.00#Lead punched components#31.28.18.00.00
-unspsc7#31.28.18.15.00#Brass punched components#31.28.18.00.00
-unspsc7#31.28.18.16.00#Bronze punched components#31.28.18.00.00
-unspsc7#31.28.18.17.00#Magnesium punched components#31.28.18.00.00
-unspsc7#31.28.18.18.00#Zinc punched components#31.28.18.00.00
-unspsc7#31.28.18.19.00#Tin punched components#31.28.18.00.00
-unspsc7#31.28.19.00.00#Draw formed components#31.28.00.00.00
-unspsc7#31.28.19.01.00#Aluminum draw formed components#31.28.19.00.00
-unspsc7#31.28.19.02.00#Beryllium draw formed components#31.28.19.00.00
-unspsc7#31.28.19.03.00#Brass draw formed components#31.28.19.00.00
-unspsc7#31.28.19.04.00#Bronze draw formed components#31.28.19.00.00
-unspsc7#31.28.19.05.00#Composite draw formed components#31.28.19.00.00
-unspsc7#31.28.19.06.00#Copper draw formed components#31.28.19.00.00
-unspsc7#31.28.19.07.00#Ferrous alloy draw formed components#31.28.19.00.00
-unspsc7#31.28.19.08.00#Iron draw formed components#31.28.19.00.00
-unspsc7#31.28.19.09.00#Lead draw formed components#31.28.19.00.00
-unspsc7#31.28.19.10.00#Magnesium draw formed components#31.28.19.00.00
-unspsc7#31.28.19.11.00#Nickel alloy draw formed components#31.28.19.00.00
-unspsc7#31.28.19.12.00#Non ferrous alloy draw formed components#31.28.19.00.00
-unspsc7#31.28.19.13.00#Non metallic draw formed components#31.28.19.00.00
-unspsc7#31.28.19.14.00#Precious metal draw formed components#31.28.19.00.00
-unspsc7#31.28.19.15.00#Stainless steel draw formed components#31.28.19.00.00
-unspsc7#31.28.19.16.00#Steel draw formed components#31.28.19.00.00
-unspsc7#31.28.19.17.00#Tin draw formed components#31.28.19.00.00
-unspsc7#31.28.19.18.00#Titanium draw formed components#31.28.19.00.00
-unspsc7#31.28.19.19.00#Zinc draw formed components#31.28.19.00.00
-unspsc7#31.28.20.00.00#Hydro formed components#31.28.00.00.00
-unspsc7#31.28.20.01.00#Aluminum hydro formed components#31.28.20.00.00
-unspsc7#31.28.20.02.00#Beryllium hydro formed components#31.28.20.00.00
-unspsc7#31.28.20.03.00#Brass hydro formed components#31.28.20.00.00
-unspsc7#31.28.20.04.00#Bronze hydro formed components#31.28.20.00.00
-unspsc7#31.28.20.05.00#Composite hydro formed components#31.28.20.00.00
-unspsc7#31.28.20.06.00#Copper hydro formed components#31.28.20.00.00
-unspsc7#31.28.20.07.00#Ferrous alloy hydro formed components#31.28.20.00.00
-unspsc7#31.28.20.08.00#Iron hydro formed components#31.28.20.00.00
-unspsc7#31.28.20.09.00#Lead hydro formed components#31.28.20.00.00
-unspsc7#31.28.20.10.00#Magnesium hydro formed components#31.28.20.00.00
-unspsc7#31.28.20.11.00#Nickel alloy hydro formed components#31.28.20.00.00
-unspsc7#31.28.20.12.00#Non ferrous alloy hydro formed components#31.28.20.00.00
-unspsc7#31.28.20.13.00#Non metallic hydro formed components#31.28.20.00.00
-unspsc7#31.28.20.14.00#Precious metal hydro formed components#31.28.20.00.00
-unspsc7#31.28.20.15.00#Stainless steel hydro formed components#31.28.20.00.00
-unspsc7#31.28.20.16.00#Steel hydro formed components#31.28.20.00.00
-unspsc7#31.28.20.17.00#Tin hydro formed components#31.28.20.00.00
-unspsc7#31.28.20.18.00#Titanium hydro formed components#31.28.20.00.00
-unspsc7#31.28.20.19.00#Zinc hydro formed components#31.28.20.00.00
-unspsc7#31.28.21.00.00#Spin formed components#31.28.00.00.00
-unspsc7#31.28.21.01.00#Aluminum spin formed components#31.28.21.00.00
-unspsc7#31.28.21.02.00#Beryllium spin formed components#31.28.21.00.00
-unspsc7#31.28.21.03.00#Brass spin formed components#31.28.21.00.00
-unspsc7#31.28.21.04.00#Bronze spin formed components#31.28.21.00.00
-unspsc7#31.28.21.05.00#Composite spin formed components#31.28.21.00.00
-unspsc7#31.28.21.06.00#Copper spin formed components#31.28.21.00.00
-unspsc7#31.28.21.07.00#Ferrous alloy spin formed components#31.28.21.00.00
-unspsc7#31.28.21.08.00#Iron spin formed components#31.28.21.00.00
-unspsc7#31.28.21.09.00#Lead spin formed components#31.28.21.00.00
-unspsc7#31.28.21.10.00#Magnesium spin formed components#31.28.21.00.00
-unspsc7#31.28.21.11.00#Nickel alloy spin formed components#31.28.21.00.00
-unspsc7#31.28.21.12.00#Non ferrous alloy spin formed components#31.28.21.00.00
-unspsc7#31.28.21.13.00#Non metallic spin formed components#31.28.21.00.00
-unspsc7#31.28.21.14.00#Precious metal spin formed components#31.28.21.00.00
-unspsc7#31.28.21.15.00#Stainless steel spin formed components#31.28.21.00.00
-unspsc7#31.28.21.16.00#Steel spin formed components#31.28.21.00.00
-unspsc7#31.28.21.17.00#Tin spin formed components#31.28.21.00.00
-unspsc7#31.28.21.18.00#Titanium spin formed components#31.28.21.00.00
-unspsc7#31.28.21.19.00#Zinc spin formed components#31.28.21.00.00
-unspsc7#31.28.22.00.00#Roll formed components#31.28.00.00.00
-unspsc7#31.28.22.01.00#Aluminum roll formed components#31.28.22.00.00
-unspsc7#31.28.22.02.00#Beryllium roll formed components#31.28.22.00.00
-unspsc7#31.28.22.03.00#Brass roll formed components#31.28.22.00.00
-unspsc7#31.28.22.04.00#Bronze roll formed components#31.28.22.00.00
-unspsc7#31.28.22.05.00#Composite roll formed components#31.28.22.00.00
-unspsc7#31.28.22.06.00#Copper roll formed components#31.28.22.00.00
-unspsc7#31.28.22.07.00#Ferrous alloy roll formed components#31.28.22.00.00
-unspsc7#31.28.22.08.00#Iron roll formed components#31.28.22.00.00
-unspsc7#31.28.22.09.00#Lead roll formed components#31.28.22.00.00
-unspsc7#31.28.22.10.00#Magnesium roll formed components#31.28.22.00.00
-unspsc7#31.28.22.11.00#Nickel alloy roll formed components#31.28.22.00.00
-unspsc7#31.28.22.12.00#Non ferrous alloy roll formed components#31.28.22.00.00
-unspsc7#31.28.22.13.00#Non metallic roll formed components#31.28.22.00.00
-unspsc7#31.28.22.14.00#Precious metal roll formed components#31.28.22.00.00
-unspsc7#31.28.22.15.00#Stainless steel roll formed components#31.28.22.00.00
-unspsc7#31.28.22.16.00#Steel roll formed components#31.28.22.00.00
-unspsc7#31.28.22.17.00#Tin roll formed components#31.28.22.00.00
-unspsc7#31.28.22.18.00#Titanium roll formed components#31.28.22.00.00
-unspsc7#31.28.22.19.00#Zinc roll formed components#31.28.22.00.00
-unspsc7#31.28.23.00.00#Stretch formed components#31.28.00.00.00
-unspsc7#31.28.23.01.00#Aluminum stretch formed components#31.28.23.00.00
-unspsc7#31.28.23.02.00#Beryllium stretch formed components#31.28.23.00.00
-unspsc7#31.28.23.03.00#Brass stretch formed components#31.28.23.00.00
-unspsc7#31.28.23.04.00#Bronze stretch formed components#31.28.23.00.00
-unspsc7#31.28.23.05.00#Composite stretch formed components#31.28.23.00.00
-unspsc7#31.28.23.06.00#Copper stretch formed components#31.28.23.00.00
-unspsc7#31.28.23.07.00#Ferrous alloy stretch formed components#31.28.23.00.00
-unspsc7#31.28.23.08.00#Iron stretch formed components#31.28.23.00.00
-unspsc7#31.28.23.09.00#Lead stretch formed components#31.28.23.00.00
-unspsc7#31.28.23.10.00#Magnesium stretch formed components#31.28.23.00.00
-unspsc7#31.28.23.11.00#Nickel alloy stretch formed components#31.28.23.00.00
-unspsc7#31.28.23.12.00#Non ferrous alloy stretch formed components#31.28.23.00.00
-unspsc7#31.28.23.13.00#Non metallic stretch formed components#31.28.23.00.00
-unspsc7#31.28.23.14.00#Precious metal stretch formed components#31.28.23.00.00
-unspsc7#31.28.23.15.00#Stainless steel stretch formed components#31.28.23.00.00
-unspsc7#31.28.23.16.00#Steel stretch formed components#31.28.23.00.00
-unspsc7#31.28.23.17.00#Tin stretch formed components#31.28.23.00.00
-unspsc7#31.28.23.18.00#Titanium stretch formed components#31.28.23.00.00
-unspsc7#31.28.23.19.00#Zinc stretch formed components#31.28.23.00.00
-unspsc7#31.28.24.00.00#Explosive formed components#31.28.00.00.00
-unspsc7#31.28.24.01.00#Aluminum explosive formed components#31.28.24.00.00
-unspsc7#31.28.24.02.00#Beryllium explosive formed components#31.28.24.00.00
-unspsc7#31.28.24.03.00#Brass explosive formed components#31.28.24.00.00
-unspsc7#31.28.24.04.00#Bronze explosive formed components#31.28.24.00.00
-unspsc7#31.28.24.05.00#Composite explosive formed components#31.28.24.00.00
-unspsc7#31.28.24.06.00#Copper explosive formed components#31.28.24.00.00
-unspsc7#31.28.24.07.00#Ferrous alloy explosive formed components#31.28.24.00.00
-unspsc7#31.28.24.08.00#Iron explosive formed components#31.28.24.00.00
-unspsc7#31.28.24.09.00#Lead explosive formed components#31.28.24.00.00
-unspsc7#31.28.24.10.00#Magnesium explosive formed components#31.28.24.00.00
-unspsc7#31.28.24.11.00#Nickel alloy explosive formed components#31.28.24.00.00
-unspsc7#31.28.24.12.00#Non ferrous alloy explosive formed components#31.28.24.00.00
-unspsc7#31.28.24.13.00#Non metallic explosive formed components#31.28.24.00.00
-unspsc7#31.28.24.14.00#Precious metal explosive formed components#31.28.24.00.00
-unspsc7#31.28.24.15.00#Stainless steel explosive formed components#31.28.24.00.00
-unspsc7#31.28.24.16.00#Steel explosive formed components#31.28.24.00.00
-unspsc7#31.28.24.17.00#Tin explosive formed components#31.28.24.00.00
-unspsc7#31.28.24.18.00#Titanium explosive formed components#31.28.24.00.00
-unspsc7#31.28.24.19.00#Zinc explosive formed components#31.28.24.00.00
-unspsc7#31.29.00.00.00#Machined extrusions#31.00.00.00.00
-unspsc7#31.29.11.00.00#Machined hydro static extrusions#31.29.00.00.00
-unspsc7#31.29.11.01.00#Aluminum machined hydro static extrusions#31.29.11.00.00
-unspsc7#31.29.11.02.00#Beryllium machined hydro static extrusions#31.29.11.00.00
-unspsc7#31.29.11.03.00#Brass machined hydro static extrusions#31.29.11.00.00
-unspsc7#31.29.11.04.00#Bronze machined hydro static extrusions#31.29.11.00.00
-unspsc7#31.29.11.05.00#Copper machined hydro static extrusions#31.29.11.00.00
-unspsc7#31.29.11.06.00#Ferrous alloy machined hydro static extrusions#31.29.11.00.00
-unspsc7#31.29.11.07.00#Lead machined hydro static extrusions#31.29.11.00.00
-unspsc7#31.29.11.08.00#Magnesium machined hydro static extrusions#31.29.11.00.00
-unspsc7#31.29.11.09.00#Non ferrous alloy machined hydro static extrusions#31.29.11.00.00
-unspsc7#31.29.11.10.00#Plastic machined hydro static extrusions#31.29.11.00.00
-unspsc7#31.29.11.11.00#Precious metal machined hydro static extrusions#31.29.11.00.00
-unspsc7#31.29.11.12.00#Rubber machined hydro static extrusions#31.29.11.00.00
-unspsc7#31.29.11.13.00#Stainless steel machined hydro static extrusions#31.29.11.00.00
-unspsc7#31.29.11.14.00#Steel machined hydro static extrusions#31.29.11.00.00
-unspsc7#31.29.11.15.00#Tin machined hydro static extrusions#31.29.11.00.00
-unspsc7#31.29.11.16.00#Titanium machined hydro static extrusions#31.29.11.00.00
-unspsc7#31.29.11.17.00#Zinc machined hydro static extrusions#31.29.11.00.00
-unspsc7#31.29.11.18.00#Composite machined hydro static extrusions#31.29.11.00.00
-unspsc7#31.29.11.19.00#Nickel alloy machined hydro static extrusions#31.29.11.00.00
-unspsc7#31.29.11.20.00#Non metallic machined hydro static extrusions#31.29.11.00.00
-unspsc7#31.29.12.00.00#Machined impact extrusions#31.29.00.00.00
-unspsc7#31.29.12.01.00#Aluminum machined impact extrusions#31.29.12.00.00
-unspsc7#31.29.12.02.00#Beryllium machined impact extrusions#31.29.12.00.00
-unspsc7#31.29.12.03.00#Brass machined impact extrusions#31.29.12.00.00
-unspsc7#31.29.12.04.00#Bronze machined impact extrusions#31.29.12.00.00
-unspsc7#31.29.12.05.00#Copper machined impact extrusions#31.29.12.00.00
-unspsc7#31.29.12.06.00#Ferrous alloy machined impact extrusions#31.29.12.00.00
-unspsc7#31.29.12.07.00#Lead machined impact extrusions#31.29.12.00.00
-unspsc7#31.29.12.08.00#Magnesium machined impact extrusions#31.29.12.00.00
-unspsc7#31.29.12.09.00#Non ferrous alloy machined impact extrusions#31.29.12.00.00
-unspsc7#31.29.12.10.00#Plastic machined impact extrusions#31.29.12.00.00
-unspsc7#31.29.12.11.00#Precious metal machined impact extrusions#31.29.12.00.00
-unspsc7#31.29.12.12.00#Rubber machined impact extrusions#31.29.12.00.00
-unspsc7#31.29.12.13.00#Stainless steel machined impact extrusions#31.29.12.00.00
-unspsc7#31.29.12.14.00#Steel machined impact extrusions#31.29.12.00.00
-unspsc7#31.29.12.15.00#Tin machined impact extrusions#31.29.12.00.00
-unspsc7#31.29.12.16.00#Titanium machined impact extrusions#31.29.12.00.00
-unspsc7#31.29.12.17.00#Zinc machined impact extrusions#31.29.12.00.00
-unspsc7#31.29.12.18.00#Composite machined impact extrusions#31.29.12.00.00
-unspsc7#31.29.12.19.00#Nickel alloy machined impact extrusions#31.29.12.00.00
-unspsc7#31.29.12.20.00#Non metallic machined impact extrusions#31.29.12.00.00
-unspsc7#31.29.13.00.00#Machined cold extrusions#31.29.00.00.00
-unspsc7#31.29.13.01.00#Aluminum machined cold extrusions#31.29.13.00.00
-unspsc7#31.29.13.02.00#Beryllium machined cold extrusions#31.29.13.00.00
-unspsc7#31.29.13.03.00#Brass machined cold extrusions#31.29.13.00.00
-unspsc7#31.29.13.04.00#Bronze machined cold extrusions#31.29.13.00.00
-unspsc7#31.29.13.05.00#Copper machined cold extrusions#31.29.13.00.00
-unspsc7#31.29.13.06.00#Ferrous alloy machined cold extrusions#31.29.13.00.00
-unspsc7#31.29.13.07.00#Lead machined cold extrusions#31.29.13.00.00
-unspsc7#31.29.13.08.00#Magnesium machined cold extrusions#31.29.13.00.00
-unspsc7#31.29.13.09.00#Non ferrous alloy machined cold extrusions#31.29.13.00.00
-unspsc7#31.29.13.10.00#Plastic machined cold extrusions#31.29.13.00.00
-unspsc7#31.29.13.11.00#Precious metal machined cold extrusions#31.29.13.00.00
-unspsc7#31.29.13.12.00#Rubber machined cold extrusions#31.29.13.00.00
-unspsc7#31.29.13.13.00#Stainless steel machined cold extrusions#31.29.13.00.00
-unspsc7#31.29.13.14.00#Steel machined cold extrusions#31.29.13.00.00
-unspsc7#31.29.13.15.00#Tin machined cold extrusions#31.29.13.00.00
-unspsc7#31.29.13.16.00#Titanium machined cold extrusions#31.29.13.00.00
-unspsc7#31.29.13.17.00#Zinc machined cold extrusions#31.29.13.00.00
-unspsc7#31.29.13.18.00#Composite machined cold extrusions#31.29.13.00.00
-unspsc7#31.29.13.19.00#Nickel alloy machined cold extrusions#31.29.13.00.00
-unspsc7#31.29.13.20.00#Non metallic machined cold extrusions#31.29.13.00.00
-unspsc7#31.29.14.00.00#Machined hot extrusions#31.29.00.00.00
-unspsc7#31.29.14.01.00#Aluminum machined hot extrusions#31.29.14.00.00
-unspsc7#31.29.14.02.00#Beryllium machined hot extrusions#31.29.14.00.00
-unspsc7#31.29.14.03.00#Brass machined hot extrusions#31.29.14.00.00
-unspsc7#31.29.14.04.00#Bronze machined hot extrusions#31.29.14.00.00
-unspsc7#31.29.14.05.00#Copper machined hot extrusions#31.29.14.00.00
-unspsc7#31.29.14.06.00#Ferrous alloy machined hot extrusions#31.29.14.00.00
-unspsc7#31.29.14.07.00#Lead machined hot extrusions#31.29.14.00.00
-unspsc7#31.29.14.08.00#Magnesium machined hot extrusions#31.29.14.00.00
-unspsc7#31.29.14.09.00#Non ferrous alloy machined hot extrusions#31.29.14.00.00
-unspsc7#31.29.14.10.00#Plastic machined hot extrusions#31.29.14.00.00
-unspsc7#31.29.14.11.00#Precious metal machined hot extrusions#31.29.14.00.00
-unspsc7#31.29.14.12.00#Rubber machined hot extrusions#31.29.14.00.00
-unspsc7#31.29.14.13.00#Stainless steel machined hot extrusions#31.29.14.00.00
-unspsc7#31.29.14.14.00#Steel machined hot extrusions#31.29.14.00.00
-unspsc7#31.29.14.15.00#Tin machined hot extrusions#31.29.14.00.00
-unspsc7#31.29.14.16.00#Titanium machined hot extrusions#31.29.14.00.00
-unspsc7#31.29.14.17.00#Zinc machined hot extrusions#31.29.14.00.00
-unspsc7#31.29.14.18.00#Composite machined hot extrusions#31.29.14.00.00
-unspsc7#31.29.14.19.00#Nickel alloy machined hot extrusions#31.29.14.00.00
-unspsc7#31.29.14.20.00#Non   metallic machined hot extrusions#31.29.14.00.00
-unspsc7#31.29.15.00.00#Machined impact extrusions#31.29.00.00.00
-unspsc7#31.29.16.00.00#Machined cold extrusions#31.29.00.00.00
-unspsc7#31.29.17.00.00#Machined hot extrusions#31.29.00.00.00
-unspsc7#31.29.18.00.00#Machined hydro static extrusions#31.29.00.00.00
-unspsc7#31.30.00.00.00#Machined forgings#31.00.00.00.00
-unspsc7#31.30.10.00.00#Machined rolled ring forgings#31.30.00.00.00
-unspsc7#31.30.11.00.00#Machined open die forgings#31.30.00.00.00
-unspsc7#31.30.11.01.00#Non ferrous alloy open die machined forgings#31.30.11.00.00
-unspsc7#31.30.11.02.00#Ferrous alloy open die machined forgings#31.30.11.00.00
-unspsc7#31.30.11.03.00#Steel open die machined forgings#31.30.11.00.00
-unspsc7#31.30.11.04.00#Stainless steel open die machined forgings#31.30.11.00.00
-unspsc7#31.30.11.05.00#Iron open die machined forgings#31.30.11.00.00
-unspsc7#31.30.11.06.00#Aluminum open die machined forgings#31.30.11.00.00
-unspsc7#31.30.11.07.00#Magnesium open die machined forgings#31.30.11.00.00
-unspsc7#31.30.11.08.00#Titanium open die machined forgings#31.30.11.00.00
-unspsc7#31.30.11.09.00#Beryllium open die machined forgings#31.30.11.00.00
-unspsc7#31.30.11.10.00#Copper open die machined forgings#31.30.11.00.00
-unspsc7#31.30.11.11.00#Brass open die machined forgings#31.30.11.00.00
-unspsc7#31.30.11.12.00#Bronze open die machined forgings#31.30.11.00.00
-unspsc7#31.30.11.13.00#Zinc open die machined forgings#31.30.11.00.00
-unspsc7#31.30.11.14.00#Tin open die machined forgings#31.30.11.00.00
-unspsc7#31.30.11.15.00#Lead open die machined forgings#31.30.11.00.00
-unspsc7#31.30.11.16.00#Precious metal open die machined forgings#31.30.11.00.00
-unspsc7#31.30.11.17.00#Composite open die machined forgings#31.30.11.00.00
-unspsc7#31.30.11.18.00#Nickel alloy open die machined forgings#31.30.11.00.00
-unspsc7#31.30.11.19.00#Non metallic open die machined forgings#31.30.11.00.00
-unspsc7#31.30.12.00.00#Machined closed die forgings#31.30.00.00.00
-unspsc7#31.30.12.01.00#Non ferrous alloy closed die machined forgings#31.30.12.00.00
-unspsc7#31.30.12.02.00#Ferrous alloy closed die machined forgings#31.30.12.00.00
-unspsc7#31.30.12.03.00#Steel closed die machined forgings#31.30.12.00.00
-unspsc7#31.30.12.04.00#Stainless steel closed die machined forgings#31.30.12.00.00
-unspsc7#31.30.12.05.00#Iron closed die machined forgings#31.30.12.00.00
-unspsc7#31.30.12.06.00#Aluminum closed die machined forgings#31.30.12.00.00
-unspsc7#31.30.12.07.00#Magnesium closed die machined forgings#31.30.12.00.00
-unspsc7#31.30.12.08.00#Titanium closed die machined forgings#31.30.12.00.00
-unspsc7#31.30.12.09.00#Beryllium closed die machined forgings#31.30.12.00.00
-unspsc7#31.30.12.10.00#Copper closed die machined forgings#31.30.12.00.00
-unspsc7#31.30.12.11.00#Brass closed die machined forgings#31.30.12.00.00
-unspsc7#31.30.12.12.00#Bronze closed die machined forgings#31.30.12.00.00
-unspsc7#31.30.12.13.00#Zinc closed die machined forgings#31.30.12.00.00
-unspsc7#31.30.12.14.00#Tin closed die machined forgings#31.30.12.00.00
-unspsc7#31.30.12.15.00#Lead closed die machined forgings#31.30.12.00.00
-unspsc7#31.30.12.16.00#Precious metal closed die machined forgings#31.30.12.00.00
-unspsc7#31.30.12.17.00#Composite closed die machined forgings#31.30.12.00.00
-unspsc7#31.30.12.18.00#Nickel alloy closed die machined forgings#31.30.12.00.00
-unspsc7#31.30.12.19.00#Non metallic closed die machined forgings#31.30.12.00.00
-unspsc7#31.30.13.00.00#Machined impression die forgings#31.30.00.00.00
-unspsc7#31.30.13.01.00#Non ferrous alloy impression die machined forgings#31.30.13.00.00
-unspsc7#31.30.13.02.00#Ferrous alloy impression die machined forgings#31.30.13.00.00
-unspsc7#31.30.13.03.00#Steel impression die machined forgings#31.30.13.00.00
-unspsc7#31.30.13.04.00#Stainless steel impression die machined forgings#31.30.13.00.00
-unspsc7#31.30.13.05.00#Iron impression die machined forgings#31.30.13.00.00
-unspsc7#31.30.13.06.00#Aluminum impression die machined forgings#31.30.13.00.00
-unspsc7#31.30.13.07.00#Magnesium impression die machined forgings#31.30.13.00.00
-unspsc7#31.30.13.08.00#Titanium impression die machined forgings#31.30.13.00.00
-unspsc7#31.30.13.09.00#Beryllium impression die machined forgings#31.30.13.00.00
-unspsc7#31.30.13.10.00#Copper impression die machined forgings#31.30.13.00.00
-unspsc7#31.30.13.11.00#Brass impression die machined forgings#31.30.13.00.00
-unspsc7#31.30.13.12.00#Bronze impression die machined forgings#31.30.13.00.00
-unspsc7#31.30.13.13.00#Zinc impression die machined forgings#31.30.13.00.00
-unspsc7#31.30.13.14.00#Tin impression die machined forgings#31.30.13.00.00
-unspsc7#31.30.13.15.00#Lead impression die machined forgings#31.30.13.00.00
-unspsc7#31.30.13.16.00#Precious metal impression die machined forgings#31.30.13.00.00
-unspsc7#31.30.13.17.00#Composite impression die machined forgings#31.30.13.00.00
-unspsc7#31.30.13.18.00#Nickel alloy impression die machined forgings#31.30.13.00.00
-unspsc7#31.30.13.19.00#Non metallic impression die machined forgings#31.30.13.00.00
-unspsc7#31.30.14.00.00#Machined drop forgings#31.30.00.00.00
-unspsc7#31.30.14.01.00#Non ferrous alloy drop machined forgings#31.30.14.00.00
-unspsc7#31.30.14.02.00#Zinc drop machined forgings#31.30.14.00.00
-unspsc7#31.30.14.03.00#Ferrous alloy drop machined forgings#31.30.14.00.00
-unspsc7#31.30.14.04.00#Tin drop machined forgings#31.30.14.00.00
-unspsc7#31.30.14.05.00#Lead drop machined forgings#31.30.14.00.00
-unspsc7#31.30.14.06.00#Steel drop machined forgings#31.30.14.00.00
-unspsc7#31.30.14.07.00#Precious metal drop machined forgings#31.30.14.00.00
-unspsc7#31.30.14.08.00#Stainless steel drop machined forgings#31.30.14.00.00
-unspsc7#31.30.14.09.00#Iron drop machined forgings#31.30.14.00.00
-unspsc7#31.30.14.10.00#Aluminum drop machined forgings#31.30.14.00.00
-unspsc7#31.30.14.11.00#Magnesium drop machined forgings#31.30.14.00.00
-unspsc7#31.30.14.12.00#Titanium drop machined forgings#31.30.14.00.00
-unspsc7#31.30.14.13.00#Beryllium drop machined forgings#31.30.14.00.00
-unspsc7#31.30.14.14.00#Copper drop machined forgings#31.30.14.00.00
-unspsc7#31.30.14.15.00#Brass drop machined forgings#31.30.14.00.00
-unspsc7#31.30.14.16.00#Bronze drop machined forgings#31.30.14.00.00
-unspsc7#31.30.14.17.00#Composite drop machined forgings#31.30.14.00.00
-unspsc7#31.30.14.18.00#Nickel alloy drop machined forgings#31.30.14.00.00
-unspsc7#31.30.14.19.00#Non metallic drop machined forgings#31.30.14.00.00
-unspsc7#31.30.15.00.00#Machined rolled ring forgings#31.30.00.00.00
-unspsc7#31.30.15.01.00#Aluminum rolled ring machined forgings#31.30.15.00.00
-unspsc7#31.30.15.02.00#Beryllium rolled ring machined forgings#31.30.15.00.00
-unspsc7#31.30.15.03.00#Brass rolled ring machined forgings#31.30.15.00.00
-unspsc7#31.30.15.04.00#Bronze rolled ring machined forgings#31.30.15.00.00
-unspsc7#31.30.15.05.00#Copper rolled ring machined forgings#31.30.15.00.00
-unspsc7#31.30.15.06.00#Iron rolled ring machined forgings#31.30.15.00.00
-unspsc7#31.30.15.07.00#Lead rolled ring machined forgings#31.30.15.00.00
-unspsc7#31.30.15.08.00#Magnesium rolled ring machined forgings#31.30.15.00.00
-unspsc7#31.30.15.09.00#Precious metal rolled ring machined forgings#31.30.15.00.00
-unspsc7#31.30.15.10.00#Stainless steel rolled ring machined forgings#31.30.15.00.00
-unspsc7#31.30.15.11.00#Tin rolled ring machined forgings#31.30.15.00.00
-unspsc7#31.30.15.12.00#Titanium rolled ring machined forgings#31.30.15.00.00
-unspsc7#31.30.15.13.00#Zinc rolled ring machined forgings#31.30.15.00.00
-unspsc7#31.30.15.14.00#Non ferrous alloy rolled ring machined forgings#31.30.15.00.00
-unspsc7#31.30.15.15.00#Ferrous alloy rolled ring machined forgings#31.30.15.00.00
-unspsc7#31.30.15.16.00#Steel rolled ring machined forgings#31.30.15.00.00
-unspsc7#31.30.15.17.00#Composite rolled ring machined forgings#31.30.15.00.00
-unspsc7#31.30.15.18.00#Nickel alloy rolled ring machined forgings#31.30.15.00.00
-unspsc7#31.30.15.19.00#Non metallic rolled ring machined forgings#31.30.15.00.00
-unspsc7#31.30.16.00.00#Machined open die forgings#31.30.00.00.00
-unspsc7#31.30.17.00.00#Machined closed die forgings#31.30.00.00.00
-unspsc7#31.30.18.00.00#Machined impression die forgings#31.30.00.00.00
-unspsc7#31.30.19.00.00#Machined drop forgings#31.30.00.00.00
-unspsc7#31.31.00.00.00#Fabricated pipe assemblies#31.00.00.00.00
-unspsc7#31.31.11.00.00#Solvent welded pipe assemblies#31.31.00.00.00
-unspsc7#31.31.11.01.00#Aluminum solvent welded pipe assemblies#31.31.11.00.00
-unspsc7#31.31.11.02.00#Carbon steel solvent welded pipe assemblies#31.31.11.00.00
-unspsc7#31.31.11.03.00#Hastalloy X solvent welded pipe assemblies#31.31.11.00.00
-unspsc7#31.31.11.04.00#Inconel solvent welded pipe assemblies#31.31.11.00.00
-unspsc7#31.31.11.05.00#Low alloy steel solvent welded pipe assemblies#31.31.11.00.00
-unspsc7#31.31.11.06.00#Non metallic solvent welded pipe assemblies#31.31.11.00.00
-unspsc7#31.31.11.07.00#Other ferrous solvent welded pipe assemblies#31.31.11.00.00
-unspsc7#31.31.11.08.00#Other non ferrous solvent welded pipe assemblies#31.31.11.00.00
-unspsc7#31.31.11.09.00#Stainless steel solvent welded pipe assemblies#31.31.11.00.00
-unspsc7#31.31.11.10.00#Titanium solvent welded pipe assemblies#31.31.11.00.00
-unspsc7#31.31.11.11.00#Waspalloy solvent welded pipe assemblies#31.31.11.00.00
-unspsc7#31.31.11.12.00#Copper solvent welded pipe assemblies#31.31.11.00.00
-unspsc7#31.31.11.13.00#Brass solvent welded pipe assemblies#31.31.11.00.00
-unspsc7#31.31.12.00.00#Riveted pipe assemblies#31.31.00.00.00
-unspsc7#31.31.12.01.00#Aluminum riveted pipe assemblies#31.31.12.00.00
-unspsc7#31.31.12.02.00#Carbon steel riveted pipe assemblies#31.31.12.00.00
-unspsc7#31.31.12.03.00#Hastalloy X riveted pipe assemblies#31.31.12.00.00
-unspsc7#31.31.12.04.00#Inconel riveted pipe assemblies#31.31.12.00.00
-unspsc7#31.31.12.05.00#Low alloy steel riveted pipe assemblies#31.31.12.00.00
-unspsc7#31.31.12.06.00#Non metallic riveted pipe assemblies#31.31.12.00.00
-unspsc7#31.31.12.07.00#Other ferrous riveted pipe assemblies#31.31.12.00.00
-unspsc7#31.31.12.08.00#Other non ferrous riveted pipe assemblies#31.31.12.00.00
-unspsc7#31.31.12.09.00#Stainless steel riveted pipe assemblies#31.31.12.00.00
-unspsc7#31.31.12.10.00#Titanium riveted pipe assemblies#31.31.12.00.00
-unspsc7#31.31.12.11.00#Waspalloy riveted pipe assemblies#31.31.12.00.00
-unspsc7#31.31.12.12.00#Copper riveted pipe assemblies#31.31.12.00.00
-unspsc7#31.31.12.13.00#Brass riveted pipe assemblies#31.31.12.00.00
-unspsc7#31.31.13.00.00#Bolted pipe assemblies#31.31.00.00.00
-unspsc7#31.31.13.01.00#Aluminum bolted pipe assemblies#31.31.13.00.00
-unspsc7#31.31.13.02.00#Carbon steel bolted pipe assemblies#31.31.13.00.00
-unspsc7#31.31.13.03.00#Hastalloy X bolted pipe assemblies#31.31.13.00.00
-unspsc7#31.31.13.04.00#Inconel bolted pipe assemblies#31.31.13.00.00
-unspsc7#31.31.13.05.00#Low alloy steel bolted pipe assemblies#31.31.13.00.00
-unspsc7#31.31.13.06.00#Non metallic bolted pipe assemblies#31.31.13.00.00
-unspsc7#31.31.13.07.00#Other ferrous bolted pipe assemblies#31.31.13.00.00
-unspsc7#31.31.13.08.00#Other non ferrous bolted pipe assemblies#31.31.13.00.00
-unspsc7#31.31.13.09.00#Stainless steel bolted pipe assemblies#31.31.13.00.00
-unspsc7#31.31.13.10.00#Titanium bolted pipe assemblies#31.31.13.00.00
-unspsc7#31.31.13.11.00#Waspalloy bolted pipe assemblies#31.31.13.00.00
-unspsc7#31.31.13.12.00#Copper bolted pipe assemblies#31.31.13.00.00
-unspsc7#31.31.13.13.00#Brass bolted pipe assemblies#31.31.13.00.00
-unspsc7#31.31.14.00.00#Ultra violet welded (UV) pipe assemblies#31.31.00.00.00
-unspsc7#31.31.14.01.00#Aluminum ultra violet welded pipe assemblies#31.31.14.00.00
-unspsc7#31.31.14.02.00#Carbon steel ultra violet welded pipe assemblies#31.31.14.00.00
-unspsc7#31.31.14.03.00#Hastalloy X ultra violet welded pipe assemblies#31.31.14.00.00
-unspsc7#31.31.14.04.00#Inconel ultra violet welded pipe assemblies#31.31.14.00.00
-unspsc7#31.31.14.05.00#Low alloy steel ultra violet welded pipe assemblies#31.31.14.00.00
-unspsc7#31.31.14.06.00#Non metallic ultra violet welded pipe assemblies#31.31.14.00.00
-unspsc7#31.31.14.07.00#Other ferrous ultra violet welded pipe assemblies#31.31.14.00.00
-unspsc7#31.31.14.08.00#Other non ferrous ultra violet welded pipe assemblies#31.31.14.00.00
-unspsc7#31.31.14.09.00#Stainless steel ultra violet welded pipe assemblies#31.31.14.00.00
-unspsc7#31.31.14.10.00#Titanium ultra violet welded pipe assemblies#31.31.14.00.00
-unspsc7#31.31.14.11.00#Waspalloy ultra violet welded pipe assemblies#31.31.14.00.00
-unspsc7#31.31.14.12.00#Copper ultra violet welded pipe assemblies#31.31.14.00.00
-unspsc7#31.31.14.13.00#Brass ultra violet welded pipe assemblies#31.31.14.00.00
-unspsc7#31.31.15.00.00#Welded or brazed pipe assemblies#31.31.00.00.00
-unspsc7#31.31.15.01.00#Aluminum welded or brazed pipe assemblies#31.31.15.00.00
-unspsc7#31.31.15.02.00#Carbon steel welded or brazed pipe assemblies#31.31.15.00.00
-unspsc7#31.31.15.03.00#Hastalloy X welded or brazed pipe assemblies#31.31.15.00.00
-unspsc7#31.31.15.04.00#Inconel welded or brazed pipe assemblies#31.31.15.00.00
-unspsc7#31.31.15.05.00#Low alloy steel welded or brazed pipe assemblies#31.31.15.00.00
-unspsc7#31.31.15.06.00#Non metallic welded or brazed pipe assemblies#31.31.15.00.00
-unspsc7#31.31.15.07.00#Other ferrous welded or brazed pipe assemblies#31.31.15.00.00
-unspsc7#31.31.15.08.00#Other non ferrous welded or brazed pipe assemblies#31.31.15.00.00
-unspsc7#31.31.15.09.00#Stainless steel welded or brazed pipe assemblies#31.31.15.00.00
-unspsc7#31.31.15.10.00#Titanium welded or brazed pipe assemblies#31.31.15.00.00
-unspsc7#31.31.15.11.00#Waspalloy welded or brazed pipe assemblies#31.31.15.00.00
-unspsc7#31.31.15.12.00#Copper welded or brazed pipe assemblies#31.31.15.00.00
-unspsc7#31.31.15.13.00#Brass welded or brazed pipe assemblies#31.31.15.00.00
-unspsc7#31.31.16.00.00#Sonic welded pipe assemblies#31.31.00.00.00
-unspsc7#31.31.16.01.00#Aluminum sonic welded pipe assemblies#31.31.16.00.00
-unspsc7#31.31.16.02.00#Carbon steel sonic welded pipe assemblies#31.31.16.00.00
-unspsc7#31.31.16.03.00#Hastalloy X sonic welded pipe assemblies#31.31.16.00.00
-unspsc7#31.31.16.04.00#Inconel sonic welded pipe assemblies#31.31.16.00.00
-unspsc7#31.31.16.05.00#Low alloy steel sonic welded pipe assemblies#31.31.16.00.00
-unspsc7#31.31.16.06.00#Non metallic sonic welded pipe assemblies#31.31.16.00.00
-unspsc7#31.31.16.07.00#Other ferrous sonic welded pipe assemblies#31.31.16.00.00
-unspsc7#31.31.16.08.00#Other non ferrous sonic welded pipe assemblies#31.31.16.00.00
-unspsc7#31.31.16.09.00#Stainless steel sonic welded pipe assemblies#31.31.16.00.00
-unspsc7#31.31.16.10.00#Titanium sonic welded pipe assemblies#31.31.16.00.00
-unspsc7#31.31.16.11.00#Waspalloy sonic welded pipe assemblies#31.31.16.00.00
-unspsc7#31.31.16.12.00#Copper sonic welded pipe assemblies#31.31.16.00.00
-unspsc7#31.31.16.13.00#Brass sonic welded pipe assemblies#31.31.16.00.00
-unspsc7#31.31.17.00.00#Bonded pipe assemblies#31.31.00.00.00
-unspsc7#31.31.17.01.00#Aluminum bonded pipe assemblies#31.31.17.00.00
-unspsc7#31.31.17.02.00#Carbon steel bonded pipe assemblies#31.31.17.00.00
-unspsc7#31.31.17.03.00#Hastalloy X bonded pipe assemblies#31.31.17.00.00
-unspsc7#31.31.17.04.00#Inconel bonded pipe assemblies#31.31.17.00.00
-unspsc7#31.31.17.05.00#Low alloy steel bonded pipe assemblies#31.31.17.00.00
-unspsc7#31.31.17.06.00#Non metallic bonded pipe assemblies#31.31.17.00.00
-unspsc7#31.31.17.07.00#Other ferrous bonded pipe assemblies#31.31.17.00.00
-unspsc7#31.31.17.08.00#Other non ferrous bonded pipe assemblies#31.31.17.00.00
-unspsc7#31.31.17.09.00#Stainless steel bonded pipe assemblies#31.31.17.00.00
-unspsc7#31.31.17.10.00#Titanium bonded pipe assemblies#31.31.17.00.00
-unspsc7#31.31.17.11.00#Waspalloy bonded pipe assemblies#31.31.17.00.00
-unspsc7#31.31.17.12.00#Copper bonded pipe assemblies#31.31.17.00.00
-unspsc7#31.31.17.13.00#Brass bonded pipe assemblies#31.31.17.00.00
-unspsc7#31.32.00.00.00#Fabricated bar stock assemblies#31.00.00.00.00
-unspsc7#31.32.11.00.00#Bonded bar stock assemblies#31.32.00.00.00
-unspsc7#31.32.11.01.00#Aluminum bonded bar stock assemblies#31.32.11.00.00
-unspsc7#31.32.11.02.00#Carbon steel bonded bar stock assemblies#31.32.11.00.00
-unspsc7#31.32.11.03.00#Hastalloy X bonded bar stock assemblies#31.32.11.00.00
-unspsc7#31.32.11.04.00#Inconel bonded bar stock assemblies#31.32.11.00.00
-unspsc7#31.32.11.05.00#Low alloy steel bonded bar stock assemblies#31.32.11.00.00
-unspsc7#31.32.11.06.00#Non metallic bonded bar stock assemblies#31.32.11.00.00
-unspsc7#31.32.11.07.00#Other ferrous bonded bar stock assemblies#31.32.11.00.00
-unspsc7#31.32.11.08.00#Other non ferrous bonded bar stock assemblies#31.32.11.00.00
-unspsc7#31.32.11.09.00#Stainless steel bonded bar stock assemblies#31.32.11.00.00
-unspsc7#31.32.11.10.00#Titanium bonded bar stock assemblies#31.32.11.00.00
-unspsc7#31.32.11.11.00#Waspalloy bonded bar stock assemblies#31.32.11.00.00
-unspsc7#31.32.11.12.00#Copper bonded bar stock assemblies#31.32.11.00.00
-unspsc7#31.32.11.13.00#Brass bonded bar stock assemblies#31.32.11.00.00
-unspsc7#31.32.12.00.00#Solvent welded bar stock assemblies#31.32.00.00.00
-unspsc7#31.32.12.01.00#Aluminum solvent welded bar stock assemblies#31.32.12.00.00
-unspsc7#31.32.12.02.00#Carbon steel solvent welded bar stock assemblies#31.32.12.00.00
-unspsc7#31.32.12.03.00#Hastalloy X solvent welded bar stock assemblies#31.32.12.00.00
-unspsc7#31.32.12.04.00#Inconel solvent welded bar stock assemblies#31.32.12.00.00
-unspsc7#31.32.12.05.00#Low alloy steel solvent welded bar stock assemblies#31.32.12.00.00
-unspsc7#31.32.12.06.00#Non metallic solvent welded bar stock assemblies#31.32.12.00.00
-unspsc7#31.32.12.07.00#Other ferrous solvent welded bar stock assemblies#31.32.12.00.00
-unspsc7#31.32.12.08.00#Other non ferrous solvent welded bar stock assemblies#31.32.12.00.00
-unspsc7#31.32.12.09.00#Stainless steel solvent welded bar stock assemblies#31.32.12.00.00
-unspsc7#31.32.12.10.00#Titanium solvent welded bar stock assemblies#31.32.12.00.00
-unspsc7#31.32.12.11.00#Waspalloy solvent welded bar stock assemblies#31.32.12.00.00
-unspsc7#31.32.12.12.00#Copper solvent welded bar stock assemblies#31.32.12.00.00
-unspsc7#31.32.12.13.00#Brass solvent welded bar stock assemblies#31.32.12.00.00
-unspsc7#31.32.13.00.00#Riveted bar stock assemblies#31.32.00.00.00
-unspsc7#31.32.13.01.00#Aluminum riveted bar stock assemblies#31.32.13.00.00
-unspsc7#31.32.13.02.00#Carbon steel riveted bar stock assemblies#31.32.13.00.00
-unspsc7#31.32.13.03.00#Hastalloy X riveted bar stock assemblies#31.32.13.00.00
-unspsc7#31.32.13.04.00#Inconel riveted bar stock assemblies#31.32.13.00.00
-unspsc7#31.32.13.05.00#Low alloy steel riveted bar stock assemblies#31.32.13.00.00
-unspsc7#31.32.13.06.00#Non metallic riveted bar stock assemblies#31.32.13.00.00
-unspsc7#31.32.13.07.00#Other ferrous riveted bar stock assemblies#31.32.13.00.00
-unspsc7#31.32.13.08.00#Other non ferrous riveted bar stock assemblies#31.32.13.00.00
-unspsc7#31.32.13.09.00#Stainless steel riveted bar stock assemblies#31.32.13.00.00
-unspsc7#31.32.13.10.00#Titanium riveted bar stock assemblies#31.32.13.00.00
-unspsc7#31.32.13.11.00#Waspalloy riveted bar stock assemblies#31.32.13.00.00
-unspsc7#31.32.13.12.00#Copper riveted bar stock assemblies#31.32.13.00.00
-unspsc7#31.32.13.13.00#Brass riveted bar stock assemblies#31.32.13.00.00
-unspsc7#31.32.14.00.00#Welded or brazed bar stock assemblies#31.32.00.00.00
-unspsc7#31.32.14.01.00#Aluminum welded or brazed bar stock assemblies#31.32.14.00.00
-unspsc7#31.32.14.02.00#Carbon steel welded or brazed bar stock assemblies#31.32.14.00.00
-unspsc7#31.32.14.03.00#Hastalloy X welded or brazed bar stock assemblies#31.32.14.00.00
-unspsc7#31.32.14.04.00#Inconel welded or brazed bar stock assemblies#31.32.14.00.00
-unspsc7#31.32.14.05.00#Low alloy steel welded or brazed bar stock assemblies#31.32.14.00.00
-unspsc7#31.32.14.06.00#Non metallic welded or brazed bar stock assemblies#31.32.14.00.00
-unspsc7#31.32.14.07.00#Other ferrous welded or brazed bar stock assemblies#31.32.14.00.00
-unspsc7#31.32.14.08.00#Other non ferrous welded or brazed bar stock assemblies#31.32.14.00.00
-unspsc7#31.32.14.09.00#Stainless steel welded or brazed bar stock assemblies#31.32.14.00.00
-unspsc7#31.32.14.10.00#Titanium welded or brazed bar stock assemblies#31.32.14.00.00
-unspsc7#31.32.14.11.00#Waspalloy welded or brazed bar stock assemblies#31.32.14.00.00
-unspsc7#31.32.14.12.00#Copper welded or brazed bar stock assemblies#31.32.14.00.00
-unspsc7#31.32.14.13.00#Brass welded or brazed bar stock assemblies#31.32.14.00.00
-unspsc7#31.32.15.00.00#Ultra violet welded (UV) bar stock assemblies#31.32.00.00.00
-unspsc7#31.32.15.01.00#Aluminum ultra violet welded bar stock assemblies#31.32.15.00.00
-unspsc7#31.32.15.02.00#Carbon steel ultra violet welded bar stock assemblies#31.32.15.00.00
-unspsc7#31.32.15.03.00#Hastalloy X ultra violet welded bar stock assemblies#31.32.15.00.00
-unspsc7#31.32.15.04.00#Inconel ultra violet welded bar stock assemblies#31.32.15.00.00
-unspsc7#31.32.15.05.00#Low alloy steel ultra violet welded bar stock assemblies#31.32.15.00.00
-unspsc7#31.32.15.06.00#Non metallic ultra violet welded bar stock assemblies#31.32.15.00.00
-unspsc7#31.32.15.07.00#Other ferrous ultra violet welded bar stock assemblies#31.32.15.00.00
-unspsc7#31.32.15.08.00#Other non ferrous ultra violet welded bar stock assemblies#31.32.15.00.00
-unspsc7#31.32.15.09.00#Stainless steel ultra violet welded bar stock assemblies#31.32.15.00.00
-unspsc7#31.32.15.10.00#Titanium ultra violet welded bar stock assemblies#31.32.15.00.00
-unspsc7#31.32.15.11.00#Waspalloy ultra violet welded bar stock assemblies#31.32.15.00.00
-unspsc7#31.32.15.12.00#Copper ultra violet welded bar stock assemblies#31.32.15.00.00
-unspsc7#31.32.15.13.00#Brass ultra violet welded bar stock assemblies#31.32.15.00.00
-unspsc7#31.32.16.00.00#Sonic welded bar stock assemblies#31.32.00.00.00
-unspsc7#31.32.16.01.00#Aluminum sonic welded bar stock assemblies#31.32.16.00.00
-unspsc7#31.32.16.02.00#Carbon steel sonic welded bar stock assemblies#31.32.16.00.00
-unspsc7#31.32.16.03.00#Hastalloy X sonic welded bar stock assemblies#31.32.16.00.00
-unspsc7#31.32.16.04.00#Inconel sonic welded bar stock assemblies#31.32.16.00.00
-unspsc7#31.32.16.05.00#Low alloy steel sonic welded bar stock assemblies#31.32.16.00.00
-unspsc7#31.32.16.06.00#Non metallic sonic welded bar stock assemblies#31.32.16.00.00
-unspsc7#31.32.16.07.00#Other ferrous sonic welded bar stock assemblies#31.32.16.00.00
-unspsc7#31.32.16.08.00#Other non ferrous sonic welded bar stock assemblies#31.32.16.00.00
-unspsc7#31.32.16.09.00#Stainless steel sonic welded bar stock assemblies#31.32.16.00.00
-unspsc7#31.32.16.10.00#Titanium sonic welded bar stock assemblies#31.32.16.00.00
-unspsc7#31.32.16.11.00#Waspalloy sonic welded bar stock assemblies#31.32.16.00.00
-unspsc7#31.32.16.12.00#Copper sonic welded bar stock assemblies#31.32.16.00.00
-unspsc7#31.32.16.13.00#Brass sonic welded bar stock assemblies#31.32.16.00.00
-unspsc7#31.32.17.00.00#Bolted bar stock assemblies#31.32.00.00.00
-unspsc7#31.32.17.01.00#Aluminum bolted bar stock assemblies#31.32.17.00.00
-unspsc7#31.32.17.02.00#Carbon steel bolted bar stock assemblies#31.32.17.00.00
-unspsc7#31.32.17.03.00#Hastalloy X bolted bar stock assemblies#31.32.17.00.00
-unspsc7#31.32.17.04.00#Inconel bolted bar stock assemblies#31.32.17.00.00
-unspsc7#31.32.17.05.00#Low alloy steel bolted bar stock assemblies#31.32.17.00.00
-unspsc7#31.32.17.06.00#Non metallic bolted bar stock assemblies#31.32.17.00.00
-unspsc7#31.32.17.07.00#Other ferrous bolted bar stock assemblies#31.32.17.00.00
-unspsc7#31.32.17.08.00#Other non ferrous bolted bar stock assemblies#31.32.17.00.00
-unspsc7#31.32.17.09.00#Stainless steel bolted bar stock assemblies#31.32.17.00.00
-unspsc7#31.32.17.10.00#Titanium bolted bar stock assemblies#31.32.17.00.00
-unspsc7#31.32.17.11.00#Waspalloy bolted bar stock assemblies#31.32.17.00.00
-unspsc7#31.32.17.12.00#Copper bolted bar stock assemblies#31.32.17.00.00
-unspsc7#31.32.17.13.00#Brass bolted bar stock assemblies#31.32.17.00.00
-unspsc7#31.33.00.00.00#Fabricated structural assemblies#31.00.00.00.00
-unspsc7#31.33.11.00.00#Bonded structural assemblies#31.33.00.00.00
-unspsc7#31.33.11.01.00#Aluminum bonded structural assemblies#31.33.11.00.00
-unspsc7#31.33.11.02.00#Carbon steel bonded structural assemblies#31.33.11.00.00
-unspsc7#31.33.11.03.00#Hastalloy X bonded structural assemblies#31.33.11.00.00
-unspsc7#31.33.11.04.00#Inconel bonded structural assemblies#31.33.11.00.00
-unspsc7#31.33.11.05.00#Low alloy steel bonded structural assemblies#31.33.11.00.00
-unspsc7#31.33.11.06.00#Non metallic bonded structural assemblies#31.33.11.00.00
-unspsc7#31.33.11.07.00#Other ferrous bonded structural assemblies#31.33.11.00.00
-unspsc7#31.33.11.08.00#Other non ferrous bonded structural assemblies#31.33.11.00.00
-unspsc7#31.33.11.09.00#Stainless steel bonded structural assemblies#31.33.11.00.00
-unspsc7#31.33.11.10.00#Titanium bonded structural assemblies#31.33.11.00.00
-unspsc7#31.33.11.11.00#Waspalloy bonded structural assemblies#31.33.11.00.00
-unspsc7#31.33.11.12.00#Copper bonded structural assemblies#31.33.11.00.00
-unspsc7#31.33.11.13.00#Brass bonded structural assemblies#31.33.11.00.00
-unspsc7#31.33.12.00.00#Bolted structural assemblies#31.33.00.00.00
-unspsc7#31.33.12.01.00#Aluminum bolted structural assemblies#31.33.12.00.00
-unspsc7#31.33.12.02.00#Carbon steel bolted structural assemblies#31.33.12.00.00
-unspsc7#31.33.12.03.00#Hastalloy X bolted structural assemblies#31.33.12.00.00
-unspsc7#31.33.12.04.00#Inconel bolted structural assemblies#31.33.12.00.00
-unspsc7#31.33.12.05.00#Low alloy steel bolted structural assemblies#31.33.12.00.00
-unspsc7#31.33.12.06.00#Non metallic bolted structural assemblies#31.33.12.00.00
-unspsc7#31.33.12.07.00#Other ferrous bolted structural assemblies#31.33.12.00.00
-unspsc7#31.33.12.08.00#Other non ferrous bolted structural assemblies#31.33.12.00.00
-unspsc7#31.33.12.09.00#Stainless steel bolted structural assemblies#31.33.12.00.00
-unspsc7#31.33.12.10.00#Titanium bolted structural assemblies#31.33.12.00.00
-unspsc7#31.33.12.11.00#Waspalloy bolted structural assemblies#31.33.12.00.00
-unspsc7#31.33.12.12.00#Copper bolted structural assemblies#31.33.12.00.00
-unspsc7#31.33.12.13.00#Brass bolted structural assemblies#31.33.12.00.00
-unspsc7#31.33.13.00.00#Sonic welded structural assemblies#31.33.00.00.00
-unspsc7#31.33.13.01.00#Aluminum sonic welded structural assemblies#31.33.13.00.00
-unspsc7#31.33.13.02.00#Carbon steel sonic welded structural assemblies#31.33.13.00.00
-unspsc7#31.33.13.03.00#Hastalloy X sonic welded structural assemblies#31.33.13.00.00
-unspsc7#31.33.13.04.00#Inconel sonic welded structural assemblies#31.33.13.00.00
-unspsc7#31.33.13.05.00#Low alloy steel sonic welded structural assemblies#31.33.13.00.00
-unspsc7#31.33.13.06.00#Non metallic sonic welded structural assemblies#31.33.13.00.00
-unspsc7#31.33.13.07.00#Other ferrous sonic welded structural assemblies#31.33.13.00.00
-unspsc7#31.33.13.08.00#Other non ferrous sonic welded structural assemblies#31.33.13.00.00
-unspsc7#31.33.13.09.00#Stainless steel sonic welded structural assemblies#31.33.13.00.00
-unspsc7#31.33.13.10.00#Titanium sonic welded structural assemblies#31.33.13.00.00
-unspsc7#31.33.13.11.00#Waspalloy sonic welded structural assemblies#31.33.13.00.00
-unspsc7#31.33.13.12.00#Copper sonic welded structural assemblies#31.33.13.00.00
-unspsc7#31.33.13.13.00#Brass sonic welded structural assemblies#31.33.13.00.00
-unspsc7#31.33.14.00.00#Ultra violet welded (UV) structural assemblies#31.33.00.00.00
-unspsc7#31.33.14.01.00#Aluminum ultra violet welded structural assemblies#31.33.14.00.00
-unspsc7#31.33.14.02.00#Carbon steel ultra violet welded structural assemblies#31.33.14.00.00
-unspsc7#31.33.14.03.00#Hastalloy X ultra violet welded structural assemblies#31.33.14.00.00
-unspsc7#31.33.14.04.00#Inconel ultra violet welded structural assemblies#31.33.14.00.00
-unspsc7#31.33.14.05.00#Low alloy steel ultra violet welded structural assemblies#31.33.14.00.00
-unspsc7#31.33.14.06.00#Non metallic ultra violet welded structural assemblies#31.33.14.00.00
-unspsc7#31.33.14.07.00#Other ferrous ultra violet welded structural assemblies#31.33.14.00.00
-unspsc7#31.33.14.08.00#Other non ferrous ultra violet welded structural assemblies#31.33.14.00.00
-unspsc7#31.33.14.09.00#Stainless steel ultra violet welded structural assemblies#31.33.14.00.00
-unspsc7#31.33.14.10.00#Titanium ultra violet welded structural assemblies#31.33.14.00.00
-unspsc7#31.33.14.11.00#Waspalloy ultra violet welded structural assemblies#31.33.14.00.00
-unspsc7#31.33.14.12.00#Copper ultra violet welded structural assemblies#31.33.14.00.00
-unspsc7#31.33.14.13.00#Brass ultra violet welded structural assemblies#31.33.14.00.00
-unspsc7#31.33.15.00.00#Solvent welded structural assemblies#31.33.00.00.00
-unspsc7#31.33.15.01.00#Aluminum solvent welded structural assemblies#31.33.15.00.00
-unspsc7#31.33.15.02.00#Carbon steel solvent welded structural assemblies#31.33.15.00.00
-unspsc7#31.33.15.03.00#Hastalloy X solvent welded structural assemblies#31.33.15.00.00
-unspsc7#31.33.15.04.00#Inconel solvent welded structural assemblies#31.33.15.00.00
-unspsc7#31.33.15.05.00#Low alloy steel solvent welded structural assemblies#31.33.15.00.00
-unspsc7#31.33.15.06.00#Non metallic solvent welded structural assemblies#31.33.15.00.00
-unspsc7#31.33.15.07.00#Other ferrous solvent welded structural assemblies#31.33.15.00.00
-unspsc7#31.33.15.08.00#Other non ferrous solvent welded structural assemblies#31.33.15.00.00
-unspsc7#31.33.15.09.00#Stainless steel solvent welded structural assemblies#31.33.15.00.00
-unspsc7#31.33.15.10.00#Titanium solvent welded structural assemblies#31.33.15.00.00
-unspsc7#31.33.15.11.00#Waspalloy solvent welded structural assemblies#31.33.15.00.00
-unspsc7#31.33.15.12.00#Copper solvent welded structural assemblies#31.33.15.00.00
-unspsc7#31.33.15.13.00#Brass solvent welded structural assemblies#31.33.15.00.00
-unspsc7#31.33.16.00.00#Welded or brazed structural assemblies#31.33.00.00.00
-unspsc7#31.33.16.01.00#Aluminum welded or brazed structural assemblies#31.33.16.00.00
-unspsc7#31.33.16.02.00#Carbon steel welded or brazed structural assemblies#31.33.16.00.00
-unspsc7#31.33.16.03.00#Hastalloy X welded or brazed structural assemblies#31.33.16.00.00
-unspsc7#31.33.16.04.00#Inconel welded or brazed structural assemblies#31.33.16.00.00
-unspsc7#31.33.16.05.00#Low alloy steel welded or brazed structural assemblies#31.33.16.00.00
-unspsc7#31.33.16.06.00#Non metallic welded or brazed structural assemblies#31.33.16.00.00
-unspsc7#31.33.16.07.00#Other ferrous welded or brazed structural assemblies#31.33.16.00.00
-unspsc7#31.33.16.08.00#Other non ferrous welded or brazed structural assemblies#31.33.16.00.00
-unspsc7#31.33.16.09.00#Stainless steel welded or brazed structural assemblies#31.33.16.00.00
-unspsc7#31.33.16.10.00#Titanium welded or brazed structural assemblies#31.33.16.00.00
-unspsc7#31.33.16.11.00#Waspalloy welded or brazed structural assemblies#31.33.16.00.00
-unspsc7#31.33.16.12.00#Copper welded or brazed structural assemblies#31.33.16.00.00
-unspsc7#31.33.16.13.00#Brass welded or brazed structural assemblies#31.33.16.00.00
-unspsc7#31.33.17.00.00#Riveted structural assemblies#31.33.00.00.00
-unspsc7#31.33.17.01.00#Aluminum riveted structural assemblies#31.33.17.00.00
-unspsc7#31.33.17.02.00#Carbon steel riveted structural assemblies#31.33.17.00.00
-unspsc7#31.33.17.03.00#Hastalloy X riveted structural assemblies#31.33.17.00.00
-unspsc7#31.33.17.04.00#Inconel riveted structural assemblies#31.33.17.00.00
-unspsc7#31.33.17.05.00#Low alloy steel riveted structural assemblies#31.33.17.00.00
-unspsc7#31.33.17.06.00#Non metallic riveted structural assemblies#31.33.17.00.00
-unspsc7#31.33.17.07.00#Other ferrous riveted structural assemblies#31.33.17.00.00
-unspsc7#31.33.17.08.00#Other non ferrous riveted structural assemblies#31.33.17.00.00
-unspsc7#31.33.17.09.00#Stainless steel riveted structural assemblies#31.33.17.00.00
-unspsc7#31.33.17.10.00#Titanium riveted structural assemblies#31.33.17.00.00
-unspsc7#31.33.17.11.00#Waspalloy riveted structural assemblies#31.33.17.00.00
-unspsc7#31.33.17.12.00#Copper riveted structural assemblies#31.33.17.00.00
-unspsc7#31.33.17.13.00#Brass riveted structural assemblies#31.33.17.00.00
-unspsc7#31.34.00.00.00#Fabricated sheet assemblies#31.00.00.00.00
-unspsc7#31.34.11.00.00#Welded or brazed sheet assemblies#31.34.00.00.00
-unspsc7#31.34.11.01.00#Aluminum welded or brazed sheet assemblies#31.34.11.00.00
-unspsc7#31.34.11.02.00#Carbon steel welded or brazed sheet assemblies#31.34.11.00.00
-unspsc7#31.34.11.03.00#Hastalloy X welded or brazed sheet assemblies#31.34.11.00.00
-unspsc7#31.34.11.04.00#Inconel welded or brazed sheet assemblies#31.34.11.00.00
-unspsc7#31.34.11.05.00#Low alloy steel welded or brazed sheet assemblies#31.34.11.00.00
-unspsc7#31.34.11.06.00#Non metallic welded or brazed sheet assemblies#31.34.11.00.00
-unspsc7#31.34.11.07.00#Other ferrous welded or brazed sheet assemblies#31.34.11.00.00
-unspsc7#31.34.11.08.00#Other non ferrous welded or brazed sheet assemblies#31.34.11.00.00
-unspsc7#31.34.11.09.00#Stainless steel welded or brazed sheet assemblies#31.34.11.00.00
-unspsc7#31.34.11.10.00#Titanium welded or brazed sheet assemblies#31.34.11.00.00
-unspsc7#31.34.11.11.00#Waspalloy welded or brazed sheet assemblies#31.34.11.00.00
-unspsc7#31.34.11.12.00#Copper welded or brazed sheet assemblies#31.34.11.00.00
-unspsc7#31.34.11.13.00#Brass welded or brazed sheet assemblies#31.34.11.00.00
-unspsc7#31.34.12.00.00#Riveted sheet assemblies#31.34.00.00.00
-unspsc7#31.34.12.01.00#Aluminum riveted sheet assemblies#31.34.12.00.00
-unspsc7#31.34.12.02.00#Carbon steel riveted sheet assemblies#31.34.12.00.00
-unspsc7#31.34.12.03.00#Hastalloy X riveted sheet assemblies#31.34.12.00.00
-unspsc7#31.34.12.04.00#Inconel riveted sheet assemblies#31.34.12.00.00
-unspsc7#31.34.12.05.00#Low alloy steel riveted sheet assemblies#31.34.12.00.00
-unspsc7#31.34.12.06.00#Non metallic riveted sheet assemblies#31.34.12.00.00
-unspsc7#31.34.12.07.00#Other ferrous riveted sheet assemblies#31.34.12.00.00
-unspsc7#31.34.12.08.00#Other non ferrous riveted sheet assemblies#31.34.12.00.00
-unspsc7#31.34.12.09.00#Stainless steel riveted sheet assemblies#31.34.12.00.00
-unspsc7#31.34.12.10.00#Titanium riveted sheet assemblies#31.34.12.00.00
-unspsc7#31.34.12.11.00#Waspalloy riveted sheet assemblies#31.34.12.00.00
-unspsc7#31.34.12.12.00#Copper riveted sheet assemblies#31.34.12.00.00
-unspsc7#31.34.12.13.00#Brass riveted sheet assemblies#31.34.12.00.00
-unspsc7#31.34.13.00.00#Ultra violet welded (UV) sheet assemblies#31.34.00.00.00
-unspsc7#31.34.13.01.00#Aluminum ultra violet welded sheet assemblies#31.34.13.00.00
-unspsc7#31.34.13.02.00#Carbon steel ultra violet welded sheet assemblies#31.34.13.00.00
-unspsc7#31.34.13.03.00#Hastalloy X ultra violet welded sheet assemblies#31.34.13.00.00
-unspsc7#31.34.13.04.00#Inconel ultra violet welded sheet assemblies#31.34.13.00.00
-unspsc7#31.34.13.05.00#Low alloy steel ultra violet welded sheet assemblies#31.34.13.00.00
-unspsc7#31.34.13.06.00#Non metallic ultra violet welded sheet assemblies#31.34.13.00.00
-unspsc7#31.34.13.07.00#Other ferrous ultra violet welded sheet assemblies#31.34.13.00.00
-unspsc7#31.34.13.08.00#Other non ferrous ultra violet welded sheet assemblies#31.34.13.00.00
-unspsc7#31.34.13.09.00#Stainless steel ultra violet welded sheet assemblies#31.34.13.00.00
-unspsc7#31.34.13.10.00#Titanium ultra violet welded sheet assemblies#31.34.13.00.00
-unspsc7#31.34.13.11.00#Waspalloy ultra violet welded sheet assemblies#31.34.13.00.00
-unspsc7#31.34.13.12.00#Copper ultra violet welded sheet assemblies#31.34.13.00.00
-unspsc7#31.34.13.13.00#Brass ultra violet welded sheet assemblies#31.34.13.00.00
-unspsc7#31.34.14.00.00#Sonic welded sheet assemblies#31.34.00.00.00
-unspsc7#31.34.14.01.00#Aluminum sonic welded sheet assemblies#31.34.14.00.00
-unspsc7#31.34.14.02.00#Carbon steel sonic welded sheet assemblies#31.34.14.00.00
-unspsc7#31.34.14.03.00#Hastalloy X sonic welded sheet assemblies#31.34.14.00.00
-unspsc7#31.34.14.04.00#Inconel sonic welded sheet assemblies#31.34.14.00.00
-unspsc7#31.34.14.05.00#Low alloy steel sonic welded sheet assemblies#31.34.14.00.00
-unspsc7#31.34.14.06.00#Non metallic sonic welded sheet assemblies#31.34.14.00.00
-unspsc7#31.34.14.07.00#Other ferrous sonic welded sheet assemblies#31.34.14.00.00
-unspsc7#31.34.14.08.00#Other non ferrous sonic welded sheet assemblies#31.34.14.00.00
-unspsc7#31.34.14.09.00#Stainless steel sonic welded sheet assemblies#31.34.14.00.00
-unspsc7#31.34.14.10.00#Titanium sonic welded sheet assemblies#31.34.14.00.00
-unspsc7#31.34.14.11.00#Waspalloy sonic welded sheet assemblies#31.34.14.00.00
-unspsc7#31.34.14.12.00#Copper sonic welded sheet assemblies#31.34.14.00.00
-unspsc7#31.34.14.13.00#Brass sonic welded sheet assemblies#31.34.14.00.00
-unspsc7#31.34.15.00.00#Solvent welded sheet assemblies#31.34.00.00.00
-unspsc7#31.34.15.01.00#Aluminum solvent welded sheet assemblies#31.34.15.00.00
-unspsc7#31.34.15.02.00#Carbon steel solvent welded sheet assemblies#31.34.15.00.00
-unspsc7#31.34.15.03.00#Hastalloy X solvent welded sheet assemblies#31.34.15.00.00
-unspsc7#31.34.15.04.00#Inconel solvent welded sheet assemblies#31.34.15.00.00
-unspsc7#31.34.15.05.00#Low alloy steel solvent welded sheet assemblies#31.34.15.00.00
-unspsc7#31.34.15.06.00#Non metallic solvent welded sheet assemblies#31.34.15.00.00
-unspsc7#31.34.15.07.00#Other ferrous solvent welded sheet assemblies#31.34.15.00.00
-unspsc7#31.34.15.08.00#Other non ferrous solvent welded sheet assemblies#31.34.15.00.00
-unspsc7#31.34.15.09.00#Stainless steel solvent welded sheet assemblies#31.34.15.00.00
-unspsc7#31.34.15.10.00#Titanium solvent welded sheet assemblies#31.34.15.00.00
-unspsc7#31.34.15.11.00#Waspalloy solvent welded sheet assemblies#31.34.15.00.00
-unspsc7#31.34.15.12.00#Copper solvent welded sheet assemblies#31.34.15.00.00
-unspsc7#31.34.15.13.00#Brass solvent welded sheet assemblies#31.34.15.00.00
-unspsc7#31.34.16.00.00#Bonded sheet assemblies#31.34.00.00.00
-unspsc7#31.34.16.01.00#Aluminum bonded sheet assemblies#31.34.16.00.00
-unspsc7#31.34.16.02.00#Carbon steel bonded sheet assemblies#31.34.16.00.00
-unspsc7#31.34.16.03.00#Hastalloy X bonded sheet assemblies#31.34.16.00.00
-unspsc7#31.34.16.04.00#Inconel bonded sheet assemblies#31.34.16.00.00
-unspsc7#31.34.16.05.00#Low alloy steel bonded sheet assemblies#31.34.16.00.00
-unspsc7#31.34.16.06.00#Non metallic bonded sheet assemblies#31.34.16.00.00
-unspsc7#31.34.16.07.00#Other ferrous bonded sheet assemblies#31.34.16.00.00
-unspsc7#31.34.16.08.00#Other non ferrous bonded sheet assemblies#31.34.16.00.00
-unspsc7#31.34.16.09.00#Stainless steel bonded sheet assemblies#31.34.16.00.00
-unspsc7#31.34.16.10.00#Titanium bonded sheet assemblies#31.34.16.00.00
-unspsc7#31.34.16.11.00#Waspalloy bonded sheet assemblies#31.34.16.00.00
-unspsc7#31.34.16.12.00#Copper bonded sheet assemblies#31.34.16.00.00
-unspsc7#31.34.16.13.00#Brass bonded sheet assemblies#31.34.16.00.00
-unspsc7#31.34.17.00.00#Bolted sheet assemblies#31.34.00.00.00
-unspsc7#31.34.17.01.00#Aluminum bolted sheet assemblies#31.34.17.00.00
-unspsc7#31.34.17.02.00#Carbon steel bolted sheet assemblies#31.34.17.00.00
-unspsc7#31.34.17.03.00#Hastalloy X bolted sheet assemblies#31.34.17.00.00
-unspsc7#31.34.17.04.00#Inconel bolted sheet assemblies#31.34.17.00.00
-unspsc7#31.34.17.05.00#Low alloy steel bolted sheet assemblies#31.34.17.00.00
-unspsc7#31.34.17.06.00#Non metallic bolted sheet assemblies#31.34.17.00.00
-unspsc7#31.34.17.07.00#Other ferrous bolted sheet assemblies#31.34.17.00.00
-unspsc7#31.34.17.08.00#Other non ferrous bolted sheet assemblies#31.34.17.00.00
-unspsc7#31.34.17.09.00#Stainless steel bolted sheet assemblies#31.34.17.00.00
-unspsc7#31.34.17.10.00#Titanium bolted sheet assemblies#31.34.17.00.00
-unspsc7#31.34.17.11.00#Waspalloy bolted sheet assemblies#31.34.17.00.00
-unspsc7#31.34.17.12.00#Copper bolted sheet assemblies#31.34.17.00.00
-unspsc7#31.34.17.13.00#Brass bolted sheet assemblies#31.34.17.00.00
-unspsc7#31.35.00.00.00#Fabricated tube assemblies#31.00.00.00.00
-unspsc7#31.35.11.00.00#Ultra violet welded (UV) tube assemblies#31.35.00.00.00
-unspsc7#31.35.11.01.00#Aluminum ultra violet welded tube assemblies#31.35.11.00.00
-unspsc7#31.35.11.02.00#Carbon steel ultra violet welded tube assemblies#31.35.11.00.00
-unspsc7#31.35.11.03.00#Hastalloy X ultra violet welded tube assemblies#31.35.11.00.00
-unspsc7#31.35.11.04.00#Inconel ultra violet welded tube assemblies#31.35.11.00.00
-unspsc7#31.35.11.05.00#Low alloy steel ultra violet welded tube assemblies#31.35.11.00.00
-unspsc7#31.35.11.06.00#Non metallic ultra violet welded tube assemblies#31.35.11.00.00
-unspsc7#31.35.11.07.00#Other ferrous ultra violet welded tube assemblies#31.35.11.00.00
-unspsc7#31.35.11.08.00#Other non ferrous ultra violet welded tube assemblies#31.35.11.00.00
-unspsc7#31.35.11.09.00#Stainless steel ultra violet welded tube assemblies#31.35.11.00.00
-unspsc7#31.35.11.10.00#Titanium ultra violet welded tube assemblies#31.35.11.00.00
-unspsc7#31.35.11.11.00#Waspalloy ultra violet welded tube assemblies#31.35.11.00.00
-unspsc7#31.35.11.12.00#Copper ultra violet welded tube assemblies#31.35.11.00.00
-unspsc7#31.35.11.13.00#Brass ultra violet welded tube assemblies#31.35.11.00.00
-unspsc7#31.35.12.00.00#Welded or brazed tube assemblies#31.35.00.00.00
-unspsc7#31.35.12.01.00#Aluminum welded or brazed tube assemblies#31.35.12.00.00
-unspsc7#31.35.12.02.00#Carbon steel welded or brazed tube assemblies#31.35.12.00.00
-unspsc7#31.35.12.03.00#Hastalloy X welded or brazed tube assemblies#31.35.12.00.00
-unspsc7#31.35.12.04.00#Inconel welded or brazed tube assemblies#31.35.12.00.00
-unspsc7#31.35.12.05.00#Low alloy steel welded or brazed tube assemblies#31.35.12.00.00
-unspsc7#31.35.12.06.00#Non metallic welded or brazed tube assemblies#31.35.12.00.00
-unspsc7#31.35.12.07.00#Other ferrous welded or brazed tube assemblies#31.35.12.00.00
-unspsc7#31.35.12.08.00#Other non ferrous welded or brazed tube assemblies#31.35.12.00.00
-unspsc7#31.35.12.09.00#Stainless steel welded or brazed tube assemblies#31.35.12.00.00
-unspsc7#31.35.12.10.00#Titanium welded or brazed tube assemblies#31.35.12.00.00
-unspsc7#31.35.12.11.00#Waspalloy welded or brazed tube assemblies#31.35.12.00.00
-unspsc7#31.35.12.12.00#Copper welded or brazed tube assemblies#31.35.12.00.00
-unspsc7#31.35.12.13.00#Brass welded or brazed tube assemblies#31.35.12.00.00
-unspsc7#31.35.13.00.00#Riveted tube assemblies#31.35.00.00.00
-unspsc7#31.35.13.01.00#Aluminum riveted tube assemblies#31.35.13.00.00
-unspsc7#31.35.13.02.00#Carbon steel riveted tube assemblies#31.35.13.00.00
-unspsc7#31.35.13.03.00#Hastalloy X riveted tube assemblies#31.35.13.00.00
-unspsc7#31.35.13.04.00#Inconel riveted tube assemblies#31.35.13.00.00
-unspsc7#31.35.13.05.00#Low alloy steel riveted tube assemblies#31.35.13.00.00
-unspsc7#31.35.13.06.00#Non metallic riveted tube assemblies#31.35.13.00.00
-unspsc7#31.35.13.07.00#Other ferrous riveted tube assemblies#31.35.13.00.00
-unspsc7#31.35.13.08.00#Other non ferrous riveted tube assemblies#31.35.13.00.00
-unspsc7#31.35.13.09.00#Stainless steel riveted tube assemblies#31.35.13.00.00
-unspsc7#31.35.13.10.00#Titanium riveted tube assemblies#31.35.13.00.00
-unspsc7#31.35.13.11.00#Waspalloy riveted tube assemblies#31.35.13.00.00
-unspsc7#31.35.13.12.00#Copper riveted tube assemblies#31.35.13.00.00
-unspsc7#31.35.13.13.00#Brass riveted tube assemblies#31.35.13.00.00
-unspsc7#31.35.14.00.00#Bonded tube assemblies#31.35.00.00.00
-unspsc7#31.35.14.01.00#Aluminum bonded tube assemblies#31.35.14.00.00
-unspsc7#31.35.14.02.00#Carbon steel bonded tube assemblies#31.35.14.00.00
-unspsc7#31.35.14.03.00#Hastalloy X bonded tube assemblies#31.35.14.00.00
-unspsc7#31.35.14.04.00#Inconel bonded tube assemblies#31.35.14.00.00
-unspsc7#31.35.14.05.00#Low alloy steel bonded tube assemblies#31.35.14.00.00
-unspsc7#31.35.14.06.00#Non metallic bonded tube assemblies#31.35.14.00.00
-unspsc7#31.35.14.07.00#Other ferrous bonded tube assemblies#31.35.14.00.00
-unspsc7#31.35.14.08.00#Other non ferrous bonded tube assemblies#31.35.14.00.00
-unspsc7#31.35.14.09.00#Stainless steel bonded tube assemblies#31.35.14.00.00
-unspsc7#31.35.14.10.00#Titanium bonded tube assemblies#31.35.14.00.00
-unspsc7#31.35.14.11.00#Waspalloy bonded tube assemblies#31.35.14.00.00
-unspsc7#31.35.14.12.00#Copper bonded tube assemblies#31.35.14.00.00
-unspsc7#31.35.14.13.00#Brass bonded tube assemblies#31.35.14.00.00
-unspsc7#31.35.15.00.00#Bolted tube assemblies#31.35.00.00.00
-unspsc7#31.35.15.01.00#Aluminum bolted tube assemblies#31.35.15.00.00
-unspsc7#31.35.15.02.00#Carbon steel bolted tube assemblies#31.35.15.00.00
-unspsc7#31.35.15.03.00#Hastalloy X bolted tube assemblies#31.35.15.00.00
-unspsc7#31.35.15.04.00#Inconel bolted tube assemblies#31.35.15.00.00
-unspsc7#31.35.15.05.00#Low alloy steel bolted tube assemblies#31.35.15.00.00
-unspsc7#31.35.15.06.00#Non metallic bolted tube assemblies#31.35.15.00.00
-unspsc7#31.35.15.07.00#Other ferrous bolted tube assemblies#31.35.15.00.00
-unspsc7#31.35.15.08.00#Other non ferrous bolted tube assemblies#31.35.15.00.00
-unspsc7#31.35.15.09.00#Stainless steel bolted tube assemblies#31.35.15.00.00
-unspsc7#31.35.15.10.00#Titanium bolted tube assemblies#31.35.15.00.00
-unspsc7#31.35.15.11.00#Waspalloy bolted tube assemblies#31.35.15.00.00
-unspsc7#31.35.15.12.00#Copper bolted tube assemblies#31.35.15.00.00
-unspsc7#31.35.15.13.00#Brass bolted tube assemblies#31.35.15.00.00
-unspsc7#31.35.16.00.00#Solvent welded tube assemblies#31.35.00.00.00
-unspsc7#31.35.16.01.00#Aluminum solvent welded tube assemblies#31.35.16.00.00
-unspsc7#31.35.16.02.00#Carbon steel solvent welded tube assemblies#31.35.16.00.00
-unspsc7#31.35.16.03.00#Hastalloy X solvent welded tube assemblies#31.35.16.00.00
-unspsc7#31.35.16.04.00#Inconel solvent welded tube assemblies#31.35.16.00.00
-unspsc7#31.35.16.05.00#Low alloy steel solvent welded tube assemblies#31.35.16.00.00
-unspsc7#31.35.16.06.00#Non metallic solvent welded tube assemblies#31.35.16.00.00
-unspsc7#31.35.16.07.00#Other ferrous solvent welded tube assemblies#31.35.16.00.00
-unspsc7#31.35.16.08.00#Other non ferrous solvent welded tube assemblies#31.35.16.00.00
-unspsc7#31.35.16.09.00#Stainless steel solvent welded tube assemblies#31.35.16.00.00
-unspsc7#31.35.16.10.00#Titanium solvent welded tube assemblies#31.35.16.00.00
-unspsc7#31.35.16.11.00#Waspalloy solvent welded tube assemblies#31.35.16.00.00
-unspsc7#31.35.16.12.00#Copper solvent welded tube assemblies#31.35.16.00.00
-unspsc7#31.35.16.13.00#Brass solvent welded tube assemblies#31.35.16.00.00
-unspsc7#31.35.17.00.00#Sonic welded tube assemblies#31.35.00.00.00
-unspsc7#31.35.17.01.00#Aluminum sonic welded tube assemblies#31.35.17.00.00
-unspsc7#31.35.17.02.00#Carbon steel sonic welded tube assemblies#31.35.17.00.00
-unspsc7#31.35.17.03.00#Hastalloy X sonic welded tube assemblies#31.35.17.00.00
-unspsc7#31.35.17.04.00#Inconel sonic welded tube assemblies#31.35.17.00.00
-unspsc7#31.35.17.05.00#Low alloy steel sonic welded tube assemblies#31.35.17.00.00
-unspsc7#31.35.17.06.00#Non metallic sonic welded tube assemblies#31.35.17.00.00
-unspsc7#31.35.17.07.00#Other ferrous sonic welded tube assemblies#31.35.17.00.00
-unspsc7#31.35.17.08.00#Other non ferrous sonic welded tube assemblies#31.35.17.00.00
-unspsc7#31.35.17.09.00#Stainless steel sonic welded tube assemblies#31.35.17.00.00
-unspsc7#31.35.17.10.00#Titanium sonic welded tube assemblies#31.35.17.00.00
-unspsc7#31.35.17.11.00#Waspalloy sonic welded tube assemblies#31.35.17.00.00
-unspsc7#31.35.17.12.00#Copper sonic welded tube assemblies#31.35.17.00.00
-unspsc7#31.35.17.13.00#Brass sonic welded tube assemblies#31.35.17.00.00
-unspsc7#31.36.00.00.00#Fabricated plate assemblies#31.00.00.00.00
-unspsc7#31.36.11.00.00#Bonded plate assemblies#31.36.00.00.00
-unspsc7#31.36.11.01.00#Aluminum bonded plate assemblies#31.36.11.00.00
-unspsc7#31.36.11.02.00#Carbon steel bonded plate assemblies#31.36.11.00.00
-unspsc7#31.36.11.03.00#Hastalloy X bonded plate assemblies#31.36.11.00.00
-unspsc7#31.36.11.04.00#Inconel bonded plate assemblies#31.36.11.00.00
-unspsc7#31.36.11.05.00#Low alloy steel bonded plate assemblies#31.36.11.00.00
-unspsc7#31.36.11.06.00#Non metallic bonded plate assemblies#31.36.11.00.00
-unspsc7#31.36.11.07.00#Other ferrous bonded plate assemblies#31.36.11.00.00
-unspsc7#31.36.11.08.00#Other non ferrous bonded plate assemblies#31.36.11.00.00
-unspsc7#31.36.11.09.00#Stainless steel bonded plate assemblies#31.36.11.00.00
-unspsc7#31.36.11.10.00#Titanium bonded plate assemblies#31.36.11.00.00
-unspsc7#31.36.11.11.00#Waspalloy bonded plate assemblies#31.36.11.00.00
-unspsc7#31.36.11.12.00#Copper bonded plate assemblies#31.36.11.00.00
-unspsc7#31.36.11.13.00#Brass bonded plate assemblies#31.36.11.00.00
-unspsc7#31.36.12.00.00#Bolted plate assemblies#31.36.00.00.00
-unspsc7#31.36.12.01.00#Aluminum bolted plate assemblies#31.36.12.00.00
-unspsc7#31.36.12.02.00#Carbon steel bolted plate assemblies#31.36.12.00.00
-unspsc7#31.36.12.03.00#Hastalloy X bolted plate assemblies#31.36.12.00.00
-unspsc7#31.36.12.04.00#Inconel bolted plate assemblies#31.36.12.00.00
-unspsc7#31.36.12.05.00#Low alloy steel bolted plate assemblies#31.36.12.00.00
-unspsc7#31.36.12.06.00#Non metallic bolted plate assemblies#31.36.12.00.00
-unspsc7#31.36.12.07.00#Other ferrous bolted plate assemblies#31.36.12.00.00
-unspsc7#31.36.12.08.00#Other non ferrous bolted plate assemblies#31.36.12.00.00
-unspsc7#31.36.12.09.00#Stainless steel bolted plate assemblies#31.36.12.00.00
-unspsc7#31.36.12.10.00#Titanium bolted plate assemblies#31.36.12.00.00
-unspsc7#31.36.12.11.00#Waspalloy bolted plate assemblies#31.36.12.00.00
-unspsc7#31.36.12.12.00#Copper bolted plate assemblies#31.36.12.00.00
-unspsc7#31.36.12.13.00#Brass bolted plate assemblies#31.36.12.00.00
-unspsc7#31.36.13.00.00#Solvent welded plate assemblies#31.36.00.00.00
-unspsc7#31.36.13.01.00#Aluminum solvent welded plate assemblies#31.36.13.00.00
-unspsc7#31.36.13.02.00#Carbon steel solvent welded plate assemblies#31.36.13.00.00
-unspsc7#31.36.13.03.00#Hastalloy X solvent welded plate assemblies#31.36.13.00.00
-unspsc7#31.36.13.04.00#Inconel solvent welded plate assemblies#31.36.13.00.00
-unspsc7#31.36.13.05.00#Low alloy steel solvent welded plate assemblies#31.36.13.00.00
-unspsc7#31.36.13.06.00#Non metallic solvent welded plate assemblies#31.36.13.00.00
-unspsc7#31.36.13.07.00#Other ferrous solvent welded plate assemblies#31.36.13.00.00
-unspsc7#31.36.13.08.00#Other non ferrous solvent welded plate assemblies#31.36.13.00.00
-unspsc7#31.36.13.09.00#Stainless steel solvent welded plate assemblies#31.36.13.00.00
-unspsc7#31.36.13.10.00#Titanium solvent welded plate assemblies#31.36.13.00.00
-unspsc7#31.36.13.11.00#Waspalloy solvent welded plate assemblies#31.36.13.00.00
-unspsc7#31.36.13.12.00#Copper solvent welded plate assemblies#31.36.13.00.00
-unspsc7#31.36.13.13.00#Brass solvent welded plate assemblies#31.36.13.00.00
-unspsc7#31.36.14.00.00#Welded or brazed plate assemblies#31.36.00.00.00
-unspsc7#31.36.14.01.00#Aluminum welded or brazed plate assemblies#31.36.14.00.00
-unspsc7#31.36.14.02.00#Carbon steel welded or brazed plate assemblies#31.36.14.00.00
-unspsc7#31.36.14.03.00#Hastalloy X welded or brazed plate assemblies#31.36.14.00.00
-unspsc7#31.36.14.04.00#Inconel welded or brazed plate assemblies#31.36.14.00.00
-unspsc7#31.36.14.05.00#Low alloy steel welded or brazed plate assemblies#31.36.14.00.00
-unspsc7#31.36.14.06.00#Non metallic welded or brazed plate assemblies#31.36.14.00.00
-unspsc7#31.36.14.07.00#Other ferrous welded or brazed plate assemblies#31.36.14.00.00
-unspsc7#31.36.14.08.00#Other non ferrous welded or brazed plate assemblies#31.36.14.00.00
-unspsc7#31.36.14.09.00#Stainless steel welded or brazed plate assemblies#31.36.14.00.00
-unspsc7#31.36.14.10.00#Titanium welded or brazed plate assemblies#31.36.14.00.00
-unspsc7#31.36.14.11.00#Waspalloy welded or brazed plate assemblies#31.36.14.00.00
-unspsc7#31.36.14.12.00#Copper welded or brazed plate assemblies#31.36.14.00.00
-unspsc7#31.36.14.13.00#Brass welded or brazed plate assemblies#31.36.14.00.00
-unspsc7#31.36.15.00.00#Ultra violet welded (UV) plate assemblies#31.36.00.00.00
-unspsc7#31.36.15.01.00#Aluminum ultra violet welded plate assemblies#31.36.15.00.00
-unspsc7#31.36.15.02.00#Carbon steel ultra violet welded plate assemblies#31.36.15.00.00
-unspsc7#31.36.15.03.00#Hastalloy X ultra violet welded plate assemblies#31.36.15.00.00
-unspsc7#31.36.15.04.00#Inconel ultra violet welded plate assemblies#31.36.15.00.00
-unspsc7#31.36.15.05.00#Low alloy steel ultra violet welded plate assemblies#31.36.15.00.00
-unspsc7#31.36.15.06.00#Non metallic ultra violet welded plate assemblies#31.36.15.00.00
-unspsc7#31.36.15.07.00#Other ferrous ultra violet welded plate assemblies#31.36.15.00.00
-unspsc7#31.36.15.08.00#Other non ferrous ultra violet welded plate assemblies#31.36.15.00.00
-unspsc7#31.36.15.09.00#Stainless steel ultra violet welded plate assemblies#31.36.15.00.00
-unspsc7#31.36.15.10.00#Titanium ultra violet welded plate assemblies#31.36.15.00.00
-unspsc7#31.36.15.11.00#Waspalloy ultra violet welded plate assemblies#31.36.15.00.00
-unspsc7#31.36.15.12.00#Copper ultra violet welded plate assemblies#31.36.15.00.00
-unspsc7#31.36.15.13.00#Brass ultra violet welded plate assemblies#31.36.15.00.00
-unspsc7#31.36.16.00.00#Sonic welded plate assemblies#31.36.00.00.00
-unspsc7#31.36.16.01.00#Aluminum sonic welded plate assemblies#31.36.16.00.00
-unspsc7#31.36.16.02.00#Carbon steel sonic welded plate assemblies#31.36.16.00.00
-unspsc7#31.36.16.03.00#Hastalloy X sonic welded plate assemblies#31.36.16.00.00
-unspsc7#31.36.16.04.00#Inconel sonic welded plate assemblies#31.36.16.00.00
-unspsc7#31.36.16.05.00#Low alloy steel sonic welded plate assemblies#31.36.16.00.00
-unspsc7#31.36.16.06.00#Non metallic sonic welded plate assemblies#31.36.16.00.00
-unspsc7#31.36.16.07.00#Other ferrous sonic welded plate assemblies#31.36.16.00.00
-unspsc7#31.36.16.08.00#Other non ferrous sonic welded plate assemblies#31.36.16.00.00
-unspsc7#31.36.16.09.00#Stainless steel sonic welded plate assemblies#31.36.16.00.00
-unspsc7#31.36.16.10.00#Titanium sonic welded plate assemblies#31.36.16.00.00
-unspsc7#31.36.16.11.00#Waspalloy sonic welded plate assemblies#31.36.16.00.00
-unspsc7#31.36.16.12.00#Copper sonic welded plate assemblies#31.36.16.00.00
-unspsc7#31.36.16.13.00#Brass sonic welded plate assemblies#31.36.16.00.00
-unspsc7#31.36.17.00.00#Riveted plate assemblies#31.36.00.00.00
-unspsc7#31.36.17.01.00#Aluminum riveted plate assemblies#31.36.17.00.00
-unspsc7#31.36.17.02.00#Carbon steel riveted plate assemblies#31.36.17.00.00
-unspsc7#31.36.17.03.00#Hastalloy X riveted plate assemblies#31.36.17.00.00
-unspsc7#31.36.17.04.00#Inconel riveted plate assemblies#31.36.17.00.00
-unspsc7#31.36.17.05.00#Low alloy steel riveted plate assemblies#31.36.17.00.00
-unspsc7#31.36.17.06.00#Non metallic riveted plate assemblies#31.36.17.00.00
-unspsc7#31.36.17.07.00#Other ferrous riveted plate assemblies#31.36.17.00.00
-unspsc7#31.36.17.08.00#Other non ferrous riveted plate assemblies#31.36.17.00.00
-unspsc7#31.36.17.09.00#Stainless steel riveted plate assemblies#31.36.17.00.00
-unspsc7#31.36.17.10.00#Titanium riveted plate assemblies#31.36.17.00.00
-unspsc7#31.36.17.11.00#Waspalloy riveted plate assemblies#31.36.17.00.00
-unspsc7#31.36.17.12.00#Copper riveted plate assemblies#31.36.17.00.00
-unspsc7#31.36.17.13.00#Brass riveted plate assemblies#31.36.17.00.00
-unspsc7#31.37.00.00.00#Refractories#31.00.00.00.00
-unspsc7#31.37.10.00.00#Ceramic fibre products#31.37.00.00.00
-unspsc7#31.37.10.01.00#Insulation boards#31.37.10.00.00
-unspsc7#31.37.10.02.00#Insulating wool#31.37.10.00.00
-unspsc7#31.37.11.00.00#Refractory bricks#31.37.00.00.00
-unspsc7#31.37.11.01.00#Mullite bricks#31.37.11.00.00
-unspsc7#31.37.11.02.00#Sillimanite bricks#31.37.11.00.00
-unspsc7#31.37.11.03.00#Acid resistant bricks#31.37.11.00.00
-unspsc7#31.37.11.04.00#Silica bricks#31.37.11.00.00
-unspsc7#31.37.11.05.00#High alumina bricks#31.37.11.00.00
-unspsc7#31.37.11.06.00#Calcium silicate blocks#31.37.11.00.00
-unspsc7#31.37.11.07.00#Shaped bricks#31.37.11.00.00
-unspsc7#31.37.12.00.00#Castables#31.37.00.00.00
-unspsc7#31.37.12.01.00#Dense castables#31.37.12.00.00
-unspsc7#31.37.12.02.00#Insulating castables#31.37.12.00.00
-unspsc7#31.37.12.03.00#Low cement castables#31.37.12.00.00
-unspsc7#31.37.12.04.00#Acid or alkali resistant castable#31.37.12.00.00
-unspsc7#31.37.12.05.00#Abrasion resistant castable#31.37.12.00.00
-unspsc7#31.37.12.06.00#Sic castable#31.37.12.00.00
-unspsc7#31.37.12.07.00#Self flow castable#31.37.12.00.00
-unspsc7#31.37.12.08.00#Tabular alumina castable#31.37.12.00.00
-unspsc7#31.37.12.09.00#Erosion resistant castable#31.37.12.00.00
-unspsc7#31.37.13.00.00#Shaped refractories#31.37.00.00.00
-unspsc7#31.37.13.01.00#Porous blocks#31.37.13.00.00
-unspsc7#31.37.13.02.00#Zircon nozzles#31.37.13.00.00
-unspsc7#31.38.00.00.00#Magnets and magnetic materials#31.00.00.00.00
-unspsc7#31.38.10.00.00#Permanent magnets#31.38.00.00.00
-unspsc7#31.38.10.01.00#Lode stone#31.38.10.00.00
-unspsc7#31.38.10.02.00#Alnico magnets#31.38.10.00.00
-unspsc7#32.00.00.00.00#Electronic Components and Supplies#32.00.00.00.00
-unspsc7#32.10.00.00.00#Printed circuits and integrated circuits and microassemblies#32.00.00.00.00
-unspsc7#32.10.15.00.00#Printed circuits and circuit card assemblies#32.10.00.00.00
-unspsc7#32.10.15.01.00#Bare printed circuit boards#32.10.15.00.00
-unspsc7#32.10.15.02.00#Printed circuit assemblies (PCAs)#32.10.15.00.00
-unspsc7#32.10.15.03.00#Mixed circuit assemblies#32.10.15.00.00
-unspsc7#32.10.15.04.00#Surface mount circuit assemblies#32.10.15.00.00
-unspsc7#32.10.15.05.00#Plated through circuit assemblies#32.10.15.00.00
-unspsc7#32.10.15.06.00#Double sided circuit cards#32.10.15.00.00
-unspsc7#32.10.15.07.00#Backplane circuit cards#32.10.15.00.00
-unspsc7#32.10.15.08.00#Multilayer circuit cards#32.10.15.00.00
-unspsc7#32.10.15.09.00#Single sided circuit cards#32.10.15.00.00
-unspsc7#32.10.15.10.00#Printed wire boards#32.10.15.00.00
-unspsc7#32.10.16.00.00#Electronic components for memory or smart cards#32.10.00.00.00
-unspsc7#32.10.16.01.00#Random access memory (RAM)#32.10.16.00.00
-unspsc7#32.10.16.02.00#Dynamic random access memory (DRAM)#32.10.16.00.00
-unspsc7#32.10.16.03.00#Static random access memory (SRAM)#32.10.16.00.00
-unspsc7#32.10.16.04.00#Programmable read only memory (PROM)#32.10.16.00.00
-unspsc7#32.10.16.05.00#Eraseable programmable read only memory (EPROM)#32.10.16.00.00
-unspsc7#32.10.16.06.00#Electronically eraseable programmable read only memory (EEPROM)#32.10.16.00.00
-unspsc7#32.10.16.07.00#Monolitihc memory integrated circuits (MMIC)#32.10.16.00.00
-unspsc7#32.10.16.08.00#Read only memory (ROM)#32.10.16.00.00
-unspsc7#32.10.16.09.00#Application specific integrated circuits (ASIC)#32.10.16.00.00
-unspsc7#32.10.16.10.00#Thin quad flat pack (TQFP)#32.10.16.00.00
-unspsc7#32.10.16.11.00#Programmable array logic (PAL)#32.10.16.00.00
-unspsc7#32.10.16.12.00#Gate array logic (GAL)#32.10.16.00.00
-unspsc7#32.10.16.13.00#Transistor transistor logic (TTL)#32.10.16.00.00
-unspsc7#32.10.16.14.00#Emitter coupled logic (ECL)#32.10.16.00.00
-unspsc7#32.10.16.15.00#Bipolar or metal oxide semiconductor technology (BIMOS)#32.10.16.00.00
-unspsc7#32.10.16.16.00#Bipolar complementary metal oxide semiconductor technology (BICMOS)#32.10.16.00.00
-unspsc7#32.10.16.17.00#Smart cards#32.10.16.00.00
-unspsc7#32.10.16.18.00#Upscreened integrated circuits#32.10.16.00.00
-unspsc7#32.10.16.19.00#Linear integrated circuits#32.10.16.00.00
-unspsc7#32.10.16.20.00#Digital integrated circuits#32.10.16.00.00
-unspsc7#32.10.16.21.00#Synchronous dynamic random access memory (SDRAM)#32.10.16.00.00
-unspsc7#32.10.16.22.00#Flash memory#32.10.16.00.00
-unspsc7#32.10.16.23.00#Rambus dynamic random access memoryRDRAM#32.10.16.00.00
-unspsc7#32.10.16.24.00#Synchronous graphic random access memory SGRAM#32.10.16.00.00
-unspsc7#32.10.17.00.00#Hybrid integrated circuits#32.10.00.00.00
-unspsc7#32.10.17.01.00#Microprocessors#32.10.17.00.00
-unspsc7#32.10.17.02.00#Clock oscillators#32.10.17.00.00
-unspsc7#32.10.17.03.00#Microcontrollers#32.10.17.00.00
-unspsc7#32.10.18.00.00#Unmounted integrated circuits#32.10.00.00.00
-unspsc7#32.10.18.01.00#Unmounted dies#32.10.18.00.00
-unspsc7#32.10.18.02.00#Unmounted wafers#32.10.18.00.00
-unspsc7#32.10.18.03.00#Unmounted chips#32.10.18.00.00
-unspsc7#32.11.00.00.00#Diodes and transistors and semiconductor devices#32.00.00.00.00
-unspsc7#32.11.15.00.00#Diodes#32.11.00.00.00
-unspsc7#32.11.15.01.00#Microwave diodes#32.11.15.00.00
-unspsc7#32.11.15.02.00#Zener diodes#32.11.15.00.00
-unspsc7#32.11.15.03.00#Light emitting diodes (LEDs)#32.11.15.00.00
-unspsc7#32.11.15.04.00#Schottky diodes#32.11.15.00.00
-unspsc7#32.11.15.05.00#Tunnel diodes#32.11.15.00.00
-unspsc7#32.11.15.06.00#Photosensitive diodes#32.11.15.00.00
-unspsc7#32.11.15.07.00#Variable capacitance diodes#32.11.15.00.00
-unspsc7#32.11.15.08.00#Solar diodes#32.11.15.00.00
-unspsc7#32.11.15.09.00#Power diodes#32.11.15.00.00
-unspsc7#32.11.15.10.00#Radio frequency (RF) diodes#32.11.15.00.00
-unspsc7#32.11.15.11.00#Small signal diodes#32.11.15.00.00
-unspsc7#32.11.16.00.00#Transistors#32.11.00.00.00
-unspsc7#32.11.16.01.00#Photo sensitive transistors#32.11.16.00.00
-unspsc7#32.11.16.02.00#Field effect transistors (FET)#32.11.16.00.00
-unspsc7#32.11.16.03.00#Metal oxide silicone field effect transistors (MOSFET)#32.11.16.00.00
-unspsc7#32.11.16.04.00#Transistor chips#32.11.16.00.00
-unspsc7#32.11.16.05.00#Transistor dies#32.11.16.00.00
-unspsc7#32.11.16.06.00#Transistor wafers#32.11.16.00.00
-unspsc7#32.11.16.07.00#Bipolar darlington or radio frequency (RF) transistors#32.11.16.00.00
-unspsc7#32.11.16.08.00#Unijunction transistors#32.11.16.00.00
-unspsc7#32.11.16.09.00#Insulated gate bipolar transistors (IGBT)#32.11.16.00.00
-unspsc7#32.11.16.10.00#Junction field effect transistors (JFET)#32.11.16.00.00
-unspsc7#32.11.17.00.00#Semiconductor devices#32.11.00.00.00
-unspsc7#32.11.17.01.00#Photovoltaic cells#32.11.17.00.00
-unspsc7#32.11.17.02.00#Thyristors#32.11.17.00.00
-unspsc7#32.11.17.03.00#Diacs#32.11.17.00.00
-unspsc7#32.11.17.04.00#Triacs#32.11.17.00.00
-unspsc7#32.11.17.05.00#Optical coupled isolators#32.11.17.00.00
-unspsc7#32.11.17.06.00#Crystal oscillators#32.11.17.00.00
-unspsc7#32.11.18.00.00#Integrated circuit components#32.11.00.00.00
-unspsc7#32.11.18.01.00#Intergrated circuit lids#32.11.18.00.00
-unspsc7#32.11.18.02.00#Integrated circuit packages#32.11.18.00.00
-unspsc7#32.11.18.03.00#Substrates#32.11.18.00.00
-unspsc7#32.11.19.00.00#Radio frequency (RF) components#32.11.00.00.00
-unspsc7#32.11.19.01.00#Amplifiers#32.11.19.00.00
-unspsc7#32.11.19.02.00#Attenuators#32.11.19.00.00
-unspsc7#32.11.19.03.00#Circulators#32.11.19.00.00
-unspsc7#32.11.19.04.00#Couplers#32.11.19.00.00
-unspsc7#32.11.19.05.00#Delay lines#32.11.19.00.00
-unspsc7#32.11.19.06.00#Detectors#32.11.19.00.00
-unspsc7#32.11.19.07.00#Dummy loads#32.11.19.00.00
-unspsc7#32.11.19.08.00#Radio frequency (RF) filters#32.11.19.00.00
-unspsc7#32.11.19.09.00#Isolators#32.11.19.00.00
-unspsc7#32.11.19.10.00#Mixers#32.11.19.00.00
-unspsc7#32.11.19.11.00#Phase shifters#32.11.19.00.00
-unspsc7#32.11.19.12.00#Power dividers#32.11.19.00.00
-unspsc7#32.11.19.13.00#Wave tube amplifiers#32.11.19.00.00
-unspsc7#32.11.19.14.00#Terminations#32.11.19.00.00
-unspsc7#32.11.19.15.00#Modulators#32.11.19.00.00
-unspsc7#32.12.00.00.00#Printed components#32.00.00.00.00
-unspsc7#32.12.15.00.00#Capacitors#32.12.00.00.00
-unspsc7#32.12.15.01.00#Fixed capacitors#32.12.15.00.00
-unspsc7#32.12.15.02.00#Variable capacitors or varactors#32.12.15.00.00
-unspsc7#32.12.15.03.00#Adjustable pre set capacitors#32.12.15.00.00
-unspsc7#32.12.15.04.00#Capacitor networks#32.12.15.00.00
-unspsc7#32.12.16.00.00#Resistors#32.12.00.00.00
-unspsc7#32.12.16.01.00#Thermistors#32.12.16.00.00
-unspsc7#32.12.16.02.00#Fusistors#32.12.16.00.00
-unspsc7#32.12.16.03.00#Variable resistors or varistors#32.12.16.00.00
-unspsc7#32.12.16.04.00#Fixed carbon resistors#32.12.16.00.00
-unspsc7#32.12.16.05.00#Fixed thick film resistors#32.12.16.00.00
-unspsc7#32.12.16.06.00#Fixed thin film resistors#32.12.16.00.00
-unspsc7#32.12.16.07.00#Resistor networks#32.12.16.00.00
-unspsc7#32.12.16.08.00#Wire wound resistors#32.12.16.00.00
-unspsc7#32.12.17.00.00#Discrete components#32.12.00.00.00
-unspsc7#32.12.17.01.00#Rectifiers#32.12.17.00.00
-unspsc7#32.12.17.02.00#Inductors#32.12.17.00.00
-unspsc7#32.12.17.03.00#Ferrites#32.12.17.00.00
-unspsc7#32.12.17.04.00#Static converters#32.12.17.00.00
-unspsc7#32.12.17.05.00#Inverters#32.12.17.00.00
-unspsc7#32.12.17.06.00#Resistor or capacitor (R/C) networks#32.12.17.00.00
-unspsc7#32.13.00.00.00#Passive components#32.00.00.00.00
-unspsc7#32.13.10.00.00#Temperature controls#32.13.00.00.00
-unspsc7#32.13.10.01.00#Heat sinks#32.13.10.00.00
-unspsc7#39.00.00.00.00#Lighting and Electrical Accessories and Supplies#39.00.00.00.00
-unspsc7#39.10.00.00.00#Lamps and lightbulbs and lamp components#39.00.00.00.00
-unspsc7#39.10.16.00.00#Lamps#39.10.00.00.00
-unspsc7#39.10.16.01.00#Halogen lamps#39.10.16.00.00
-unspsc7#39.10.16.02.00#Medical lamps#39.10.16.00.00
-unspsc7#39.10.16.03.00#Solar lamps#39.10.16.00.00
-unspsc7#39.10.16.04.00#Alcohol lamps#39.10.16.00.00
-unspsc7#39.10.16.05.00#Fluorescent lamps#39.10.16.00.00
-unspsc7#39.10.16.06.00#Arc lamps#39.10.16.00.00
-unspsc7#39.10.16.08.00#Shadowless or scialytic operation light#39.10.16.00.00
-unspsc7#39.10.16.09.00#Stage or studio lamps#39.10.16.00.00
-unspsc7#39.10.16.10.00#Filament lamps#39.10.16.00.00
-unspsc7#39.10.16.11.00#High intensity discharge (HID) lamps#39.10.16.00.00
-unspsc7#39.10.16.12.00#Incandescent lamps#39.10.16.00.00
-unspsc7#39.10.16.13.00#Infrared lamps#39.10.16.00.00
-unspsc7#39.10.16.14.00#Metal halide lamps#39.10.16.00.00
-unspsc7#39.10.16.15.00#Vapor lamps#39.10.16.00.00
-unspsc7#39.10.16.16.00#Ultraviolet (UV) lamps#39.10.16.00.00
-unspsc7#39.10.16.17.00#High pressure sodium lamps#39.10.16.00.00
-unspsc7#39.10.17.00.00#Bulb glass#39.10.00.00.00
-unspsc7#39.10.17.01.00#Fluorescent tubes#39.10.17.00.00
-unspsc7#39.10.18.00.00#Lamp components#39.10.00.00.00
-unspsc7#39.10.18.01.00#Lamp filament#39.10.18.00.00
-unspsc7#39.10.19.00.00#Mobile and fixed floodlighting#39.10.00.00.00
-unspsc7#39.10.19.01.00#Light tower#39.10.19.00.00
-unspsc7#39.10.19.02.00#Light cart#39.10.19.00.00
-unspsc7#39.10.19.03.00#Light stand#39.10.19.00.00
-unspsc7#39.11.00.00.00#Lighting and fixtures and accessories#39.00.00.00.00
-unspsc7#39.11.15.00.00#Interior lighting and fixtures#39.11.00.00.00
-unspsc7#39.11.15.01.00#Fluorescent fixtures#39.11.15.00.00
-unspsc7#39.11.15.02.00#Vanity lighting#39.11.15.00.00
-unspsc7#39.11.15.03.00#Wall fixtures#39.11.15.00.00
-unspsc7#39.11.15.04.00#Stage or studio lighting systems#39.11.15.00.00
-unspsc7#39.11.15.05.00#Recessed lighting#39.11.15.00.00
-unspsc7#39.11.15.06.00#Chandeliers#39.11.15.00.00
-unspsc7#39.11.15.07.00#Desk fixtures#39.11.15.00.00
-unspsc7#39.11.15.08.00#Track lighting#39.11.15.00.00
-unspsc7#39.11.15.09.00#Floor torchiere#39.11.15.00.00
-unspsc7#39.11.15.10.00#Table lamps#39.11.15.00.00
-unspsc7#39.11.15.11.00#Decorative lighting#39.11.15.00.00
-unspsc7#39.11.15.12.00#Laboratory bench lights#39.11.15.00.00
-unspsc7#39.11.15.13.00#Interior solar lighting#39.11.15.00.00
-unspsc7#39.11.15.14.00#Tree lights#39.11.15.00.00
-unspsc7#39.11.15.15.00#Downlighting fixtures#39.11.15.00.00
-unspsc7#39.11.15.16.00#Task lighting fixtures#39.11.15.00.00
-unspsc7#39.11.15.17.00#Wax candles#39.11.15.00.00
-unspsc7#39.11.15.18.00#Hand or extension light#39.11.15.00.00
-unspsc7#39.11.15.19.00#Candle holders#39.11.15.00.00
-unspsc7#39.11.15.20.00#Halogen lighting fixtures#39.11.15.00.00
-unspsc7#39.11.16.00.00#Exterior lighting and fixtures#39.11.00.00.00
-unspsc7#39.11.16.03.00#Roadway or highway lighting#39.11.16.00.00
-unspsc7#39.11.16.05.00#Landscape or area lighting#39.11.16.00.00
-unspsc7#39.11.16.06.00#Underwater lighting#39.11.16.00.00
-unspsc7#39.11.16.08.00#Residential street lights#39.11.16.00.00
-unspsc7#39.11.16.09.00#Kerosene or propane or butane lanterns#39.11.16.00.00
-unspsc7#39.11.17.00.00#Emergency lighting#39.11.00.00.00
-unspsc7#39.11.17.02.00#Flashlights#39.11.17.00.00
-unspsc7#39.11.17.03.00#Storm lights#39.11.17.00.00
-unspsc7#39.11.17.04.00#Flood lights#39.11.17.00.00
-unspsc7#39.11.17.05.00#Light sticks#39.11.17.00.00
-unspsc7#39.11.18.00.00#Lighting accessories#39.11.00.00.00
-unspsc7#39.11.18.01.00#Lamp ballasts#39.11.18.00.00
-unspsc7#39.11.18.02.00#Lamp housings#39.11.18.00.00
-unspsc7#39.11.18.03.00#Lamp sockets#39.11.18.00.00
-unspsc7#39.11.18.04.00#Lamp bases#39.11.18.00.00
-unspsc7#39.11.18.05.00#Lamp brackets#39.11.18.00.00
-unspsc7#39.11.18.06.00#Light boxes#39.11.18.00.00
-unspsc7#39.11.18.08.00#Grilles#39.11.18.00.00
-unspsc7#39.11.18.09.00#Light conditioner filters#39.11.18.00.00
-unspsc7#39.11.18.10.00#Lamp starter#39.11.18.00.00
-unspsc7#39.11.18.11.00#Electrified tracks#39.11.18.00.00
-unspsc7#39.11.18.12.00#Lamp covers#39.11.18.00.00
-unspsc7#39.11.19.00.00#Hazardous location lighting and fixtures#39.11.00.00.00
-unspsc7#39.11.19.01.00#Hazardous location flourescent fixtures#39.11.19.00.00
-unspsc7#39.11.19.02.00#Hazardous location incandescent fixtures#39.11.19.00.00
-unspsc7#40.00.00.00.00#Distribution and Conditioning Systems and Equipment and Components#40.00.00.00.00
-unspsc7#40.10.00.00.00#Heating and ventilation and air circulation#40.00.00.00.00
-unspsc7#40.10.15.00.00#Ventilation#40.10.00.00.00
-unspsc7#40.10.15.01.00#Air collectors#40.10.15.00.00
-unspsc7#40.10.15.02.00#Air exhausters#40.10.15.00.00
-unspsc7#40.10.15.03.00#Vents#40.10.15.00.00
-unspsc7#40.10.15.04.00#Ventilation dampers#40.10.15.00.00
-unspsc7#40.10.15.05.00#Air diffusers#40.10.15.00.00
-unspsc7#40.10.15.06.00#Ventilation pipes#40.10.15.00.00
-unspsc7#40.10.16.00.00#Air circulation#40.10.00.00.00
-unspsc7#40.10.16.01.00#Blowers#40.10.16.00.00
-unspsc7#40.10.16.02.00#Air circulators#40.10.16.00.00
-unspsc7#40.10.16.03.00#Impellers#40.10.16.00.00
-unspsc7#40.10.16.04.00#Fans#40.10.16.00.00
-unspsc7#40.10.17.00.00#Cooling#40.10.00.00.00
-unspsc7#40.10.17.01.00#Air conditioners#40.10.17.00.00
-unspsc7#40.10.17.02.00#Cooling exchangers#40.10.17.00.00
-unspsc7#40.10.17.03.00#Evaporative coolers#40.10.17.00.00
-unspsc7#40.10.17.04.00#Condensing units#40.10.17.00.00
-unspsc7#40.10.18.00.00#Heating equipment#40.10.00.00.00
-unspsc7#40.10.18.01.00#Radiators#40.10.18.00.00
-unspsc7#40.10.18.02.00#Heat exchangers#40.10.18.00.00
-unspsc7#40.10.18.03.00#Fireplaces#40.10.18.00.00
-unspsc7#40.10.18.04.00#Heaters#40.10.18.00.00
-unspsc7#40.10.18.05.00#Furnaces#40.10.18.00.00
-unspsc7#40.10.18.06.00#Heat pumps#40.10.18.00.00
-unspsc7#40.10.18.07.00#Solar heating units#40.10.18.00.00
-unspsc7#40.10.18.08.00#Heating stoves#40.10.18.00.00
-unspsc7#40.10.18.09.00#Circulation heaters#40.10.18.00.00
-unspsc7#40.10.18.10.00#Coil duct heaters#40.10.18.00.00
-unspsc7#40.10.18.11.00#Convection heaters#40.10.18.00.00
-unspsc7#40.10.18.12.00#Divided exchangers#40.10.18.00.00
-unspsc7#40.10.18.13.00#Double split exchangers#40.10.18.00.00
-unspsc7#40.10.18.14.00#Finned tubular heaters#40.10.18.00.00
-unspsc7#40.10.18.15.00#Immersion heaters#40.10.18.00.00
-unspsc7#40.10.18.16.00#Kettle exchangers#40.10.18.00.00
-unspsc7#40.10.18.17.00#One pass exchangers#40.10.18.00.00
-unspsc7#40.10.18.18.00#Process air heaters#40.10.18.00.00
-unspsc7#40.10.18.19.00#Space heaters#40.10.18.00.00
-unspsc7#40.10.18.20.00#Split exchangers#40.10.18.00.00
-unspsc7#40.10.18.21.00#Strip heaters#40.10.18.00.00
-unspsc7#40.10.18.22.00#Tubular heaters#40.10.18.00.00
-unspsc7#40.10.18.23.00#Two pass exchangers#40.10.18.00.00
-unspsc7#40.10.18.24.00#Quartz heater#40.10.18.00.00
-unspsc7#40.10.18.25.00#Domestic water heaters#40.10.18.00.00
-unspsc7#40.10.18.26.00#Commercial water heaters#40.10.18.00.00
-unspsc7#40.10.19.00.00#Humidity control#40.10.00.00.00
-unspsc7#40.10.19.01.00#Vaporizers#40.10.19.00.00
-unspsc7#40.10.19.02.00#Dehumidifiers#40.10.19.00.00
-unspsc7#40.10.19.03.00#Humidifiers#40.10.19.00.00
-unspsc7#40.10.20.00.00#Boilers#40.10.00.00.00
-unspsc7#40.10.20.01.00#Fire tube boilers#40.10.20.00.00
-unspsc7#40.10.20.02.00#Water tube boiler#40.10.20.00.00
-unspsc7#40.10.20.03.00#Electric boilers#40.10.20.00.00
-unspsc7#40.14.00.00.00#Fluid and gas distribution#40.00.00.00.00
-unspsc7#40.14.15.00.00#Fluid and gas conduits#40.14.00.00.00
-unspsc7#40.14.15.02.00#Ducts#40.14.15.00.00
-unspsc7#40.14.15.04.00#Hoses#40.14.15.00.00
-unspsc7#40.14.16.00.00#Valves#40.14.00.00.00
-unspsc7#40.14.16.01.00#Check valves#40.14.16.00.00
-unspsc7#40.14.16.02.00#Needle valves#40.14.16.00.00
-unspsc7#40.14.16.03.00#Pneumatic valves#40.14.16.00.00
-unspsc7#40.14.16.04.00#Safety valves#40.14.16.00.00
-unspsc7#40.14.16.05.00#Solenoid valves#40.14.16.00.00
-unspsc7#40.14.16.06.00#Relief valves#40.14.16.00.00
-unspsc7#40.14.16.07.00#Ball valves#40.14.16.00.00
-unspsc7#40.14.16.08.00#Hydraulic valves#40.14.16.00.00
-unspsc7#40.14.16.09.00#Control valves#40.14.16.00.00
-unspsc7#40.14.16.10.00#Float valves#40.14.16.00.00
-unspsc7#40.14.16.11.00#Globe valves#40.14.16.00.00
-unspsc7#40.14.16.12.00#Expansion valves#40.14.16.00.00
-unspsc7#40.14.16.13.00#Gate valves#40.14.16.00.00
-unspsc7#40.14.16.14.00#Butterfly valves#40.14.16.00.00
-unspsc7#40.14.16.15.00#Flap valves#40.14.16.00.00
-unspsc7#40.14.16.16.00#Valve parts and accessories#40.14.16.00.00
-unspsc7#40.14.16.17.00#Angle globe valves#40.14.16.00.00
-unspsc7#40.14.16.18.00#Ball check valves#40.14.16.00.00
-unspsc7#40.14.16.19.00#Butterfly lug pattern valves#40.14.16.00.00
-unspsc7#40.14.16.20.00#Butterfly wafer pattern valves#40.14.16.00.00
-unspsc7#40.14.16.21.00#Diaphragm valves#40.14.16.00.00
-unspsc7#40.14.16.22.00#Inline check valves#40.14.16.00.00
-unspsc7#40.14.16.23.00#Knife gate valves#40.14.16.00.00
-unspsc7#40.14.16.24.00#Lubricated plug valves#40.14.16.00.00
-unspsc7#40.14.16.25.00#Mud or slush valves#40.14.16.00.00
-unspsc7#40.14.16.26.00#Nonlubricated plug valves#40.14.16.00.00
-unspsc7#40.14.16.27.00#Orifice valves#40.14.16.00.00
-unspsc7#40.14.16.28.00#Pilot valves#40.14.16.00.00
-unspsc7#40.14.16.29.00#Pinch valves#40.14.16.00.00
-unspsc7#40.14.16.30.00#Piston check valves#40.14.16.00.00
-unspsc7#40.14.16.31.00#Pump valves#40.14.16.00.00
-unspsc7#40.14.16.32.00#Sentinel valves#40.14.16.00.00
-unspsc7#40.14.16.33.00#Slider valves#40.14.16.00.00
-unspsc7#40.14.16.34.00#Swing check valves#40.14.16.00.00
-unspsc7#40.14.16.35.00#Turbine valves#40.14.16.00.00
-unspsc7#40.14.16.36.00#Valve kits#40.14.16.00.00
-unspsc7#40.14.16.37.00#Wafer check valves#40.14.16.00.00
-unspsc7#40.14.17.00.00#Hardware and fittings#40.14.00.00.00
-unspsc7#40.14.17.01.00#Drains#40.14.17.00.00
-unspsc7#40.14.17.02.00#Faucets#40.14.17.00.00
-unspsc7#40.14.17.03.00#Shower heads#40.14.17.00.00
-unspsc7#40.14.17.04.00#Spigots#40.14.17.00.00
-unspsc7#40.14.17.05.00#Spouts#40.14.17.00.00
-unspsc7#40.14.17.06.00#Pipe plugs#40.14.17.00.00
-unspsc7#40.14.17.07.00#Pipe clamps#40.14.17.00.00
-unspsc7#40.14.17.08.00#Liquid traps#40.14.17.00.00
-unspsc7#40.14.17.09.00#Steam traps#40.14.17.00.00
-unspsc7#40.14.17.10.00#Plumbing flanges#40.14.17.00.00
-unspsc7#40.14.17.11.00#Metal or rubber expansion joints#40.14.17.00.00
-unspsc7#40.14.17.12.00#Pipe caps#40.14.17.00.00
-unspsc7#40.14.17.13.00#Plumbing unions#40.14.17.00.00
-unspsc7#40.14.17.14.00#Plumbing crosses#40.14.17.00.00
-unspsc7#40.14.17.15.00#Plumbing nipples#40.14.17.00.00
-unspsc7#40.14.17.16.00#P traps#40.14.17.00.00
-unspsc7#40.14.17.17.00#Pipe bends#40.14.17.00.00
-unspsc7#40.14.17.18.00#Plumbing elbows#40.14.17.00.00
-unspsc7#40.14.17.19.00#Plumbing adapters#40.14.17.00.00
-unspsc7#40.14.17.20.00#Plumbing connectors#40.14.17.00.00
-unspsc7#40.14.17.21.00#Plumbing couplings#40.14.17.00.00
-unspsc7#40.14.17.22.00#Half couplings#40.14.17.00.00
-unspsc7#40.14.17.23.00#Reducing couplings#40.14.17.00.00
-unspsc7#40.14.17.24.00#Plumbing bushings#40.14.17.00.00
-unspsc7#40.14.17.25.00#Plumbing hangers#40.14.17.00.00
-unspsc7#40.14.17.26.00#Hydrants#40.14.17.00.00
-unspsc7#40.14.17.27.00#Plumbing vents#40.14.17.00.00
-unspsc7#40.14.17.28.00#Fluid regulators#40.14.17.00.00
-unspsc7#40.14.17.29.00#Plumbing tees#40.14.17.00.00
-unspsc7#40.14.17.30.00#Strainers#40.14.17.00.00
-unspsc7#40.14.17.31.00#Nozzles#40.14.17.00.00
-unspsc7#40.14.17.32.00#Plumbing spiders#40.14.17.00.00
-unspsc7#40.14.17.33.00#Pipe fitting#40.14.17.00.00
-unspsc7#40.14.17.34.00#Hose fitting#40.14.17.00.00
-unspsc7#40.14.17.35.00#Funnels#40.14.17.00.00
-unspsc7#40.14.17.36.00#Grease fitting#40.14.17.00.00
-unspsc7#40.14.17.37.00#Diaphragms#40.14.17.00.00
-unspsc7#40.14.18.00.00#Tube and tubing#40.14.00.00.00
-unspsc7#40.14.18.01.00#Ferrous alloy tubing#40.14.18.00.00
-unspsc7#40.14.18.02.00#Copper tubing#40.14.18.00.00
-unspsc7#40.14.18.03.00#Titanium tubing#40.14.18.00.00
-unspsc7#40.14.18.04.00#Magnesium tubing#40.14.18.00.00
-unspsc7#40.14.18.05.00#Tin tubing#40.14.18.00.00
-unspsc7#40.14.18.06.00#Brass tubing#40.14.18.00.00
-unspsc7#40.14.18.07.00#Lead tubing#40.14.18.00.00
-unspsc7#40.14.18.08.00#Bronze tubing#40.14.18.00.00
-unspsc7#40.14.18.09.00#Zinc tubing#40.14.18.00.00
-unspsc7#40.14.18.10.00#Steel tubing#40.14.18.00.00
-unspsc7#40.14.18.11.00#Iron tubing#40.14.18.00.00
-unspsc7#40.14.18.12.00#Cement tubing#40.14.18.00.00
-unspsc7#40.14.18.13.00#Plastic tubing#40.14.18.00.00
-unspsc7#40.14.18.14.00#Rubber tubing#40.14.18.00.00
-unspsc7#40.14.18.15.00#Glass tubing#40.14.18.00.00
-unspsc7#40.14.18.16.00#Stone tubing#40.14.18.00.00
-unspsc7#40.14.18.17.00#Non ferrous alloy tubing#40.14.18.00.00
-unspsc7#40.14.18.18.00#Aluminum tubing#40.14.18.00.00
-unspsc7#40.14.18.19.00#Stainless steel tubing#40.14.18.00.00
-unspsc7#40.14.18.20.00#Precious metal tubing#40.14.18.00.00
-unspsc7#40.14.18.21.00#Nylon tubing#40.14.18.00.00
-unspsc7#40.14.19.00.00#Ducts#40.14.00.00.00
-unspsc7#40.14.19.01.00#Flexible ducts#40.14.19.00.00
-unspsc7#40.14.19.02.00#Rigid ducts#40.14.19.00.00
-unspsc7#40.14.20.00.00#Hoses#40.14.00.00.00
-unspsc7#40.14.20.01.00#Acid hoses#40.14.20.00.00
-unspsc7#40.14.20.02.00#Air hoses#40.14.20.00.00
-unspsc7#40.14.20.03.00#Drill hoses#40.14.20.00.00
-unspsc7#40.14.20.04.00#Marine hoses#40.14.20.00.00
-unspsc7#40.14.20.05.00#Material handling hoses#40.14.20.00.00
-unspsc7#40.14.20.06.00#Oil hoses#40.14.20.00.00
-unspsc7#40.14.20.07.00#Special hoses#40.14.20.00.00
-unspsc7#40.14.20.08.00#Water hoses#40.14.20.00.00
-unspsc7#40.14.20.09.00#Air water gas multipurpose hoses#40.14.20.00.00
-unspsc7#40.14.20.10.00#Teflon lined hoses#40.14.20.00.00
-unspsc7#40.14.21.00.00#Pipe#40.14.00.00.00
-unspsc7#40.14.21.01.00#Carbon steel pipe#40.14.21.00.00
-unspsc7#40.14.21.02.00#Ductile iron pipe#40.14.21.00.00
-unspsc7#40.14.21.03.00#High nickel alloy pipe#40.14.21.00.00
-unspsc7#40.14.21.04.00#High yield steel pipe#40.14.21.00.00
-unspsc7#40.14.21.05.00#Ferritic alloy pipe#40.14.21.00.00
-unspsc7#40.14.21.06.00#Aluminum pipe#40.14.21.00.00
-unspsc7#40.14.21.07.00#Brass pipe#40.14.21.00.00
-unspsc7#40.14.21.08.00#Bronze pipe#40.14.21.00.00
-unspsc7#40.14.21.09.00#Concrete pipe#40.14.21.00.00
-unspsc7#40.14.21.10.00#Copper pipe#40.14.21.00.00
-unspsc7#40.14.21.11.00#Cast iron pipe#40.14.21.00.00
-unspsc7#40.14.21.12.00#Lead pipe#40.14.21.00.00
-unspsc7#40.14.21.13.00#Magnesium pipe#40.14.21.00.00
-unspsc7#40.14.21.14.00#Non ferrous pipe#40.14.21.00.00
-unspsc7#40.14.21.15.00#Plastic pipe#40.14.21.00.00
-unspsc7#40.14.21.16.00#Rubber pipe#40.14.21.00.00
-unspsc7#40.14.21.17.00#Stainless steel pipe#40.14.21.00.00
-unspsc7#40.14.21.18.00#Tin pipe#40.14.21.00.00
-unspsc7#40.14.21.19.00#Titanium pipe#40.14.21.00.00
-unspsc7#40.14.21.20.00#Zinc pipe#40.14.21.00.00
-unspsc7#40.14.21.21.00#Hose reels#40.14.21.00.00
-unspsc7#40.14.22.00.00#Fluid and gas regulators#40.14.00.00.00
-unspsc7#40.14.22.01.00#Gas regulators#40.14.22.00.00
-unspsc7#40.14.22.02.00#Fluid regulators#40.14.22.00.00
-unspsc7#40.14.23.00.00#Pipe fittings#40.14.00.00.00
-unspsc7#40.14.23.01.00#Pipe angle face rings#40.14.23.00.00
-unspsc7#40.14.23.02.00#Pipe branch outlets#40.14.23.00.00
-unspsc7#40.14.23.03.00#Pipe laterals#40.14.23.00.00
-unspsc7#40.14.23.04.00#Pipe inserts#40.14.23.00.00
-unspsc7#40.14.23.05.00#Pipe reducers#40.14.23.00.00
-unspsc7#40.14.23.06.00#Pipe saddles#40.14.23.00.00
-unspsc7#40.14.23.07.00#Pipe stubends#40.14.23.00.00
-unspsc7#40.14.23.08.00#Pipe wyes#40.14.23.00.00
-unspsc7#40.14.23.09.00#Pipe bends#40.14.23.00.00
-unspsc7#40.14.23.10.00#Pipe caps#40.14.23.00.00
-unspsc7#40.14.23.11.00#Pipe half couplings#40.14.23.00.00
-unspsc7#40.14.23.12.00#Pipe expansion joints#40.14.23.00.00
-unspsc7#40.14.23.13.00#Pipe plugs#40.14.23.00.00
-unspsc7#40.14.23.14.00#Pipe bushings#40.14.23.00.00
-unspsc7#40.14.23.15.00#Pipe couplings#40.14.23.00.00
-unspsc7#40.14.23.16.00#Pipe crosses#40.14.23.00.00
-unspsc7#40.14.23.17.00#Pipe elbows#40.14.23.00.00
-unspsc7#40.14.23.18.00#Pipe nipples#40.14.23.00.00
-unspsc7#40.14.23.19.00#Pipe tees#40.14.23.00.00
-unspsc7#40.14.23.20.00#Pipe unions#40.14.23.00.00
-unspsc7#40.14.23.21.00#Pipe reducing couplings#40.14.23.00.00
-unspsc7#40.14.23.22.00#Pipe repair clamps#40.14.23.00.00
-unspsc7#40.14.23.23.00#Rupture disk#40.14.23.00.00
-unspsc7#40.14.24.00.00#Pipe flanges#40.14.00.00.00
-unspsc7#40.14.24.01.00#Ammonia flanges#40.14.24.00.00
-unspsc7#40.14.24.02.00#Backup flanges#40.14.24.00.00
-unspsc7#40.14.24.03.00#Blind flanges#40.14.24.00.00
-unspsc7#40.14.24.04.00#Lapjoint flanges#40.14.24.00.00
-unspsc7#40.14.24.05.00#Long weldneck flanges#40.14.24.00.00
-unspsc7#40.14.24.06.00#Orifice flanges#40.14.24.00.00
-unspsc7#40.14.24.07.00#Plate flanges#40.14.24.00.00
-unspsc7#40.14.24.08.00#Slipon flanges#40.14.24.00.00
-unspsc7#40.14.24.09.00#Socketweld flanges#40.14.24.00.00
-unspsc7#40.14.24.10.00#Spectacle blind flanges#40.14.24.00.00
-unspsc7#40.14.24.11.00#Threaded flanges#40.14.24.00.00
-unspsc7#40.14.24.12.00#Weldneck flanges#40.14.24.00.00
-unspsc7#40.14.25.00.00#Traps and strainers#40.14.00.00.00
-unspsc7#40.14.25.01.00#Liquid strainers#40.14.25.00.00
-unspsc7#40.14.25.02.00#Liquid traps#40.14.25.00.00
-unspsc7#40.14.25.03.00#Steam traps#40.14.25.00.00
-unspsc7#40.14.25.04.00#Steam strainers#40.14.25.00.00
-unspsc7#40.14.26.00.00#Tube fittings#40.14.00.00.00
-unspsc7#40.14.26.01.00#Brass tube fittings#40.14.26.00.00
-unspsc7#40.14.26.02.00#Carbon steel tube fittings#40.14.26.00.00
-unspsc7#40.14.26.03.00#Stainless steel tube fittings#40.14.26.00.00
-unspsc7#40.15.00.00.00#Industrial pumps and compressors#40.00.00.00.00
-unspsc7#40.15.15.00.00#Pumps#40.15.00.00.00
-unspsc7#40.15.15.01.00#Air pumps#40.15.15.00.00
-unspsc7#40.15.15.02.00#Vacuum pumps#40.15.15.00.00
-unspsc7#40.15.15.03.00#Centrifugal pumps#40.15.15.00.00
-unspsc7#40.15.15.04.00#Circulating pumps#40.15.15.00.00
-unspsc7#40.15.15.05.00#Dosing pumps#40.15.15.00.00
-unspsc7#40.15.15.06.00#Hand pumps#40.15.15.00.00
-unspsc7#40.15.15.07.00#Irrigation pumps#40.15.15.00.00
-unspsc7#40.15.15.08.00#Mud pumps#40.15.15.00.00
-unspsc7#40.15.15.09.00#Reciprocating pumps#40.15.15.00.00
-unspsc7#40.15.15.10.00#Water pumps#40.15.15.00.00
-unspsc7#40.15.15.11.00#Well pumps#40.15.15.00.00
-unspsc7#40.15.15.12.00#Sump pumps#40.15.15.00.00
-unspsc7#40.15.15.13.00#Submersible pumps#40.15.15.00.00
-unspsc7#40.15.15.14.00#Steam pumps#40.15.15.00.00
-unspsc7#40.15.15.15.00#Solenoid pumps#40.15.15.00.00
-unspsc7#40.15.15.16.00#Shear pumps#40.15.15.00.00
-unspsc7#40.15.15.17.00#Sewage pumps#40.15.15.00.00
-unspsc7#40.15.15.18.00#Sealless pumps#40.15.15.00.00
-unspsc7#40.15.15.19.00#Sanitary pumps#40.15.15.00.00
-unspsc7#40.15.15.20.00#Sampling pumps#40.15.15.00.00
-unspsc7#40.15.15.21.00#Rotary pumps#40.15.15.00.00
-unspsc7#40.15.15.22.00#Reverse osmosis pumps#40.15.15.00.00
-unspsc7#40.15.15.23.00#Positive displacement pumps#40.15.15.00.00
-unspsc7#40.15.15.24.00#Oil pumps#40.15.15.00.00
-unspsc7#40.15.15.25.00#Sludge pumps#40.15.15.00.00
-unspsc7#40.15.15.26.00#Turbine pumps#40.15.15.00.00
-unspsc7#40.15.15.27.00#Plunger pumps#40.15.15.00.00
-unspsc7#40.15.15.28.00#Oscillating pumps#40.15.15.00.00
-unspsc7#40.15.15.29.00#Drum pumps#40.15.15.00.00
-unspsc7#40.15.15.30.00#Dredge pumps#40.15.15.00.00
-unspsc7#40.15.15.31.00#Dewatering pumps#40.15.15.00.00
-unspsc7#40.15.15.32.00#Fuel pumps#40.15.15.00.00
-unspsc7#40.15.15.33.00#Hydraulic pumps#40.15.15.00.00
-unspsc7#40.15.15.34.00#Cryogenic pumps#40.15.15.00.00
-unspsc7#40.15.15.35.00#Sludge pump spare parts#40.15.15.00.00
-unspsc7#40.15.15.36.00#Sewage pump spare parts#40.15.15.00.00
-unspsc7#40.15.15.37.00#Submersible pump spare parts#40.15.15.00.00
-unspsc7#40.15.15.38.00#Water pump spare parts#40.15.15.00.00
-unspsc7#40.15.15.39.00#Well pump spare parts#40.15.15.00.00
-unspsc7#40.15.15.40.00#Sump pump spare parts#40.15.15.00.00
-unspsc7#40.15.15.41.00#Dosing pump spare parts#40.15.15.00.00
-unspsc7#40.15.15.42.00#Centrifugal pump spare parts#40.15.15.00.00
-unspsc7#40.15.15.43.00#Circulation pump spare parts#40.15.15.00.00
-unspsc7#40.15.15.44.00#Rotary pump spare parts#40.15.15.00.00
-unspsc7#40.15.15.45.00#Pump parts and accessories#40.15.15.00.00
-unspsc7#40.15.15.46.00#Axial split pumps#40.15.15.00.00
-unspsc7#40.15.15.47.00#Deepwell pumps#40.15.15.00.00
-unspsc7#40.15.15.48.00#Diaphragm pumps#40.15.15.00.00
-unspsc7#40.15.15.49.00#Double diaphragm pumps#40.15.15.00.00
-unspsc7#40.15.15.50.00#Duplex pumps#40.15.15.00.00
-unspsc7#40.15.15.51.00#Gear pumps#40.15.15.00.00
-unspsc7#40.15.15.52.00#Metering or injection or proportioning pumps#40.15.15.00.00
-unspsc7#40.15.15.53.00#Progressive cavity pumps#40.15.15.00.00
-unspsc7#40.15.15.54.00#Ram pumps#40.15.15.00.00
-unspsc7#40.15.15.55.00#Rotary cam pumps#40.15.15.00.00
-unspsc7#40.15.15.56.00#Rotary lobe pumps#40.15.15.00.00
-unspsc7#40.15.15.57.00#Rotating piston pumps#40.15.15.00.00
-unspsc7#40.15.15.58.00#Screw Pumps#40.15.15.00.00
-unspsc7#40.15.15.59.00#Simplex pumps#40.15.15.00.00
-unspsc7#40.15.15.60.00#Sliding vane pumps#40.15.15.00.00
-unspsc7#40.15.15.61.00#Triplex pumps#40.15.15.00.00
-unspsc7#40.15.15.62.00#Worm pumps#40.15.15.00.00
-unspsc7#40.15.16.00.00#Compressors#40.15.00.00.00
-unspsc7#40.15.16.01.00#Air compressors#40.15.16.00.00
-unspsc7#40.15.16.02.00#Axial flow compressors#40.15.16.00.00
-unspsc7#40.15.16.03.00#Diaphragm compressors#40.15.16.00.00
-unspsc7#40.15.16.04.00#Gas compressors#40.15.16.00.00
-unspsc7#40.15.16.05.00#Motor compressors#40.15.16.00.00
-unspsc7#40.15.16.06.00#Reciprocating compressors#40.15.16.00.00
-unspsc7#40.15.16.07.00#Refrigerant compressors#40.15.16.00.00
-unspsc7#40.15.16.08.00#Rotary compressors#40.15.16.00.00
-unspsc7#40.15.16.09.00#Screw compressors#40.15.16.00.00
-unspsc7#40.15.16.10.00#Compressor parts and accessories#40.15.16.00.00
-unspsc7#40.15.16.11.00#Barrel compressors#40.15.16.00.00
-unspsc7#40.15.16.12.00#Centrifugal compressors#40.15.16.00.00
-unspsc7#40.15.16.13.00#Combination compressors#40.15.16.00.00
-unspsc7#40.15.16.14.00#Semi radial compressors#40.15.16.00.00
-unspsc7#40.15.16.15.00#Turbo compressors#40.15.16.00.00
-unspsc7#40.15.16.16.00#Compressor kits#40.15.16.00.00
-unspsc7#40.15.17.00.00#Pump parts and accessories#40.15.00.00.00
-unspsc7#40.15.17.01.00#Pump casings#40.15.17.00.00
-unspsc7#40.15.17.02.00#Pump packings#40.15.17.00.00
-unspsc7#40.16.00.00.00#Industrial filtering and purification#40.00.00.00.00
-unspsc7#40.16.15.00.00#Filters#40.16.00.00.00
-unspsc7#40.16.15.01.00#Vacuum filters#40.16.15.00.00
-unspsc7#40.16.15.02.00#Water filters#40.16.15.00.00
-unspsc7#40.16.15.03.00#Dust collectors#40.16.15.00.00
-unspsc7#40.16.15.04.00#Oil filters#40.16.15.00.00
-unspsc7#40.16.15.05.00#Air filters#40.16.15.00.00
-unspsc7#40.16.15.06.00#Filtering machinery#40.16.15.00.00
-unspsc7#40.16.15.07.00#Filter membranes#40.16.15.00.00
-unspsc7#40.16.15.08.00#Bag filters#40.16.15.00.00
-unspsc7#40.16.15.09.00#Absorption filters#40.16.15.00.00
-unspsc7#40.16.15.10.00#Bag filters#40.16.15.00.00
-unspsc7#40.16.15.11.00#Coalescing filters#40.16.15.00.00
-unspsc7#40.16.15.12.00#Electronic filters#40.16.15.00.00
-unspsc7#40.16.15.13.00#Fuel filters#40.16.15.00.00
-unspsc7#40.16.15.14.00#Gas pipeline filters#40.16.15.00.00
-unspsc7#40.16.15.15.00#Hydraulic filters#40.16.15.00.00
-unspsc7#40.16.15.16.00#In line filters#40.16.15.00.00
-unspsc7#40.16.15.17.00#Light filters#40.16.15.00.00
-unspsc7#40.16.15.18.00#Microfiber filters#40.16.15.00.00
-unspsc7#40.16.15.19.00#Panel filters#40.16.15.00.00
-unspsc7#40.16.15.20.00#Radial fin filters#40.16.15.00.00
-unspsc7#40.16.15.21.00#Filter Base#40.16.15.00.00
-unspsc7#40.16.15.22.00#Filter Fins#40.16.15.00.00
-unspsc7#40.16.15.23.00#Fuel#40.16.15.00.00
-unspsc7#40.16.15.24.00#Paint#40.16.15.00.00
-unspsc7#40.16.16.00.00#Purification#40.16.00.00.00
-unspsc7#40.16.16.01.00#Air scrubbers#40.16.16.00.00
-unspsc7#40.16.16.02.00#Air cleaners#40.16.16.00.00
-unspsc7#40.16.17.00.00#Separators#40.16.00.00.00
-unspsc7#40.16.17.01.00#Centrifuges#40.16.17.00.00
-unspsc7#40.16.17.02.00#Wet scrubbers#40.16.17.00.00
-unspsc7#40.16.17.03.00#Mist eliminators#40.16.17.00.00
-unspsc7#40.16.18.00.00#Filter media#40.16.00.00.00
-unspsc7#40.16.18.01.00#Metal fabric media#40.16.18.00.00
-unspsc7#40.16.18.02.00#Pressed felts#40.16.18.00.00
-unspsc7#40.16.18.03.00#Filter papers#40.16.18.00.00
-unspsc7#40.16.18.05.00#Filter cloth#40.16.18.00.00
-unspsc7#41.00.00.00.00#Laboratory and Measuring and Observing and Testing Equipment#41.00.00.00.00
-unspsc7#41.10.00.00.00#Laboratory and scientific equipment#41.00.00.00.00
-unspsc7#41.10.15.00.00#Laboratory blending and dispersing and homogenizing and mixing and stirring equipment#41.10.00.00.00
-unspsc7#41.10.15.01.00#Mixers or blenders or emulsifiers#41.10.15.00.00
-unspsc7#41.10.15.02.00#Stomachers#41.10.15.00.00
-unspsc7#41.10.15.03.00#Laboratory sprayers#41.10.15.00.00
-unspsc7#41.10.15.04.00#Homogenisers#41.10.15.00.00
-unspsc7#41.10.15.05.00#French pressure cells#41.10.15.00.00
-unspsc7#41.10.15.06.00#Roller mixers#41.10.15.00.00
-unspsc7#41.10.15.07.00#Rotators#41.10.15.00.00
-unspsc7#41.10.15.08.00#Vibrators#41.10.15.00.00
-unspsc7#41.10.15.10.00#Magnetic spin bars or retrievers#41.10.15.00.00
-unspsc7#41.10.15.11.00#Stirring tables#41.10.15.00.00
-unspsc7#41.10.15.12.00#Multi bank or flocculation equipment#41.10.15.00.00
-unspsc7#41.10.15.13.00#Shakers#41.10.15.00.00
-unspsc7#41.10.15.14.00#Laboratory centrifuges#41.10.15.00.00
-unspsc7#41.10.15.15.00#Liquid measuring cans#41.10.15.00.00
-unspsc7#41.10.15.16.00#Liquid dispensers#41.10.15.00.00
-unspsc7#41.10.16.00.00#Laboratory fixtures and accessories#41.10.00.00.00
-unspsc7#41.10.16.03.00#Laboratory stands or clamps or tongs#41.10.16.00.00
-unspsc7#41.10.16.04.00#Slide containers#41.10.16.00.00
-unspsc7#41.10.16.05.00#Slide drying plates#41.10.16.00.00
-unspsc7#41.10.16.07.00#Microslide making equipment#41.10.16.00.00
-unspsc7#41.10.16.08.00#Microslide storage equipment#41.10.16.00.00
-unspsc7#41.10.16.09.00#Static eliminators#41.10.16.00.00
-unspsc7#41.10.16.11.00#Slide warmers#41.10.16.00.00
-unspsc7#41.10.17.00.00#Laboratory boring and grinding and cutting and crushing and pressing equipment#41.10.00.00.00
-unspsc7#41.10.17.01.00#Mills#41.10.17.00.00
-unspsc7#41.10.17.02.00#Pestle or mortars#41.10.17.00.00
-unspsc7#41.10.17.03.00#Tissue grinders#41.10.17.00.00
-unspsc7#41.10.17.04.00#Microtomes#41.10.17.00.00
-unspsc7#41.10.17.05.00#Crushers or pulverisers#41.10.17.00.00
-unspsc7#41.10.17.06.00#Disintegrators#41.10.17.00.00
-unspsc7#41.10.17.07.00#Laboratory presses#41.10.17.00.00
-unspsc7#41.10.18.00.00#Laboratory electron and solid state physics equipment#41.10.00.00.00
-unspsc7#41.10.18.01.00#Electron guns#41.10.18.00.00
-unspsc7#41.10.18.02.00#X ray generators#41.10.18.00.00
-unspsc7#41.10.18.03.00#Coulometers#41.10.18.00.00
-unspsc7#41.10.18.04.00#Electroscopes#41.10.18.00.00
-unspsc7#41.10.18.05.00#Fluxmeters#41.10.18.00.00
-unspsc7#41.10.18.06.00#Magnetometers#41.10.18.00.00
-unspsc7#41.10.18.07.00#Electron diffraction apparatus#41.10.18.00.00
-unspsc7#41.10.18.08.00#Neutron diffraction apparatus#41.10.18.00.00
-unspsc7#41.10.18.09.00#Optical diffraction apparatus#41.10.18.00.00
-unspsc7#41.10.18.10.00#Diffractometers#41.10.18.00.00
-unspsc7#41.10.19.00.00#Laboratory ionic equipment#41.10.00.00.00
-unspsc7#41.10.19.01.00#Ion sources#41.10.19.00.00
-unspsc7#41.10.19.02.00#Ion exchange apparatus#41.10.19.00.00
-unspsc7#41.10.19.03.00#Ion implantation equipment#41.10.19.00.00
-unspsc7#41.10.20.00.00#Sampling and purification equipment#41.10.00.00.00
-unspsc7#41.10.20.01.00#Sample changers#41.10.20.00.00
-unspsc7#41.10.20.02.00#Sample oxidiser#41.10.20.00.00
-unspsc7#41.10.20.03.00#Sample preparation line#41.10.20.00.00
-unspsc7#41.10.20.04.00#Sample preparation bombs#41.10.20.00.00
-unspsc7#41.10.20.05.00#Water samplers#41.10.20.00.00
-unspsc7#41.10.20.06.00#Air samplers or collectors#41.10.20.00.00
-unspsc7#41.10.20.07.00#Reagent kits for use with air samplers#41.10.20.00.00
-unspsc7#41.10.20.08.00#Filters or other spare parts for samplers#41.10.20.00.00
-unspsc7#41.10.20.09.00#Dust fall holders or jars#41.10.20.00.00
-unspsc7#41.10.20.11.00#Sulphur dioxide or smoke samplers#41.10.20.00.00
-unspsc7#41.10.20.12.00#Sample applicators#41.10.20.00.00
-unspsc7#41.10.20.13.00#Plant samples analysis equipment#41.10.20.00.00
-unspsc7#41.10.20.14.00#Air pollutant samplers#41.10.20.00.00
-unspsc7#41.10.20.15.00#Water purification reagents#41.10.20.00.00
-unspsc7#41.10.20.16.00#Deionisation or demineralisation equipment#41.10.20.00.00
-unspsc7#41.10.20.17.00#Base exchange equipment#41.10.20.00.00
-unspsc7#41.10.20.18.00#Reverse osmosis equipment#41.10.20.00.00
-unspsc7#41.10.20.19.00#Ultra violet water purification units#41.10.20.00.00
-unspsc7#41.10.20.20.00#Ultra pure water systems#41.10.20.00.00
-unspsc7#41.10.20.21.00#Water analysis systems#41.10.20.00.00
-unspsc7#41.10.20.22.00#Dehydrators#41.10.20.00.00
-unspsc7#41.10.20.23.00#Deoxiders#41.10.20.00.00
-unspsc7#41.10.20.24.00#Dissolvers#41.10.20.00.00
-unspsc7#41.10.20.25.00#Specimen holders#41.10.20.00.00
-unspsc7#41.10.20.26.00#Specimen collectors#41.10.20.00.00
-unspsc7#41.10.20.27.00#Sample holders#41.10.20.00.00
-unspsc7#41.10.20.28.00#Lubricant samplers#41.10.20.00.00
-unspsc7#41.10.23.00.00#Laboratory fermentation and incubating equipment#41.10.00.00.00
-unspsc7#41.10.23.01.00#Standard fermentation units#41.10.23.00.00
-unspsc7#41.10.23.02.00#Continuous culture apparatus#41.10.23.00.00
-unspsc7#41.10.23.03.00#Anaerobic jars#41.10.23.00.00
-unspsc7#41.10.23.04.00#Digestion systems#41.10.23.00.00
-unspsc7#41.10.23.05.00#Water jacketed incubators#41.10.23.00.00
-unspsc7#41.10.23.06.00#CO2 incubators#41.10.23.00.00
-unspsc7#41.10.23.07.00#Tissue culture incubators#41.10.23.00.00
-unspsc7#41.10.23.08.00#Incubator ovens#41.10.23.00.00
-unspsc7#41.10.23.09.00#Cooled incubators (BOD)#41.10.23.00.00
-unspsc7#41.10.23.10.00#Shaking incubators#41.10.23.00.00
-unspsc7#41.10.23.11.00#Inspissators#41.10.23.00.00
-unspsc7#41.10.23.12.00#Plate incubators#41.10.23.00.00
-unspsc7#41.10.23.13.00#In vitro culture equipment#41.10.23.00.00
-unspsc7#41.10.23.14.00#Bacteria equipment#41.10.23.00.00
-unspsc7#41.10.24.00.00#Laboratory heating and drying equipment#41.10.00.00.00
-unspsc7#41.10.24.01.00#Gas burners#41.10.24.00.00
-unspsc7#41.10.24.02.00#Spirit burners#41.10.24.00.00
-unspsc7#41.10.24.03.00#Laboratory incinerators#41.10.24.00.00
-unspsc7#41.10.24.04.00#Laboratory heaters#41.10.24.00.00
-unspsc7#41.10.24.05.00#Mantles or tapes#41.10.24.00.00
-unspsc7#41.10.24.06.00#Hot plates#41.10.24.00.00
-unspsc7#41.10.24.07.00#Warming cabinets#41.10.24.00.00
-unspsc7#41.10.24.08.00#Drying ovens#41.10.24.00.00
-unspsc7#41.10.24.09.00#Induction dryers#41.10.24.00.00
-unspsc7#41.10.24.10.00#Infrared dryers#41.10.24.00.00
-unspsc7#41.10.24.11.00#Spray dryers#41.10.24.00.00
-unspsc7#41.10.24.12.00#Hot air blowers#41.10.24.00.00
-unspsc7#41.10.24.13.00#Drying cabinets#41.10.24.00.00
-unspsc7#41.10.24.14.00#Freeze dryers#41.10.24.00.00
-unspsc7#41.10.24.15.00#Laboratory furnaces#41.10.24.00.00
-unspsc7#41.10.24.16.00#Ageing ovens#41.10.24.00.00
-unspsc7#41.10.24.18.00#Quartz oven pots#41.10.24.00.00
-unspsc7#41.10.24.19.00#Microwave or radiant heat ovens#41.10.24.00.00
-unspsc7#41.10.24.20.00#Desiccators#41.10.24.00.00
-unspsc7#41.10.24.21.00#Temperature cycling chambers#41.10.24.00.00
-unspsc7#41.10.25.00.00#Laboratory entomological equipment and accessories#41.10.00.00.00
-unspsc7#41.10.25.01.00#Insect containers#41.10.25.00.00
-unspsc7#41.10.25.02.00#Rearing facilities for entomology#41.10.25.00.00
-unspsc7#41.10.25.03.00#Fabric or netting for entomology#41.10.25.00.00
-unspsc7#41.10.25.04.00#Entomological pinning equipment#41.10.25.00.00
-unspsc7#41.10.25.05.00#Entomological mounting materials#41.10.25.00.00
-unspsc7#41.10.25.06.00#Entomological trays#41.10.25.00.00
-unspsc7#41.10.25.07.00#Entomological catching equipment#41.10.25.00.00
-unspsc7#41.10.25.08.00#Entomological aspirators#41.10.25.00.00
-unspsc7#41.10.25.09.00#Entomological dippers#41.10.25.00.00
-unspsc7#41.10.25.10.00#Entomological monocups#41.10.25.00.00
-unspsc7#41.10.25.11.00#Entomological sticky traps#41.10.25.00.00
-unspsc7#41.10.25.12.00#Insect test kits#41.10.25.00.00
-unspsc7#41.10.25.13.00#Entomological display units#41.10.25.00.00
-unspsc7#41.10.26.00.00#Animal laboratory equipment and accessories#41.10.00.00.00
-unspsc7#41.10.26.01.00#Cages for small animals#41.10.26.00.00
-unspsc7#41.10.26.02.00#Aquaria equipment#41.10.26.00.00
-unspsc7#41.10.26.03.00#Animal identification supplies#41.10.26.00.00
-unspsc7#41.10.26.04.00#Animal catching devices#41.10.26.00.00
-unspsc7#41.10.26.05.00#Fish aeration systems#41.10.26.00.00
-unspsc7#41.10.26.06.00#Animal feeding needles#41.10.26.00.00
-unspsc7#41.10.27.00.00#Crystallography equipment#41.10.00.00.00
-unspsc7#41.10.27.01.00#Crystal lattice models#41.10.27.00.00
-unspsc7#41.10.27.02.00#Scintillation crystal assemblies#41.10.27.00.00
-unspsc7#41.10.27.03.00#Light scattering equipment#41.10.27.00.00
-unspsc7#41.10.27.04.00#X ray diffraction equipment#41.10.27.00.00
-unspsc7#41.10.27.05.00#Crystallisers#41.10.27.00.00
-unspsc7#41.10.27.06.00#Crystal growing equipment#41.10.27.00.00
-unspsc7#41.10.29.00.00#Histology equipment#41.10.00.00.00
-unspsc7#41.10.29.01.00#Tissue embedding stations#41.10.29.00.00
-unspsc7#41.10.29.02.00#Embedding molds#41.10.29.00.00
-unspsc7#41.10.29.03.00#Embedding capsules#41.10.29.00.00
-unspsc7#41.10.29.04.00#Embedding compounds#41.10.29.00.00
-unspsc7#41.10.29.05.00#Histological staining apparatus#41.10.29.00.00
-unspsc7#41.10.29.09.00#Tissue processors#41.10.29.00.00
-unspsc7#41.10.29.10.00#Tissue culture apparatus#41.10.29.00.00
-unspsc7#41.10.29.11.00#Histological knives or knife holders#41.10.29.00.00
-unspsc7#41.10.29.12.00#Histological glass knife makers#41.10.29.00.00
-unspsc7#41.10.29.13.00#Histological hones or straps or compounds#41.10.29.00.00
-unspsc7#41.10.29.14.00#Ultrasonic disintegrators#41.10.29.00.00
-unspsc7#41.10.30.00.00#Laboratory cooling equipment#41.10.00.00.00
-unspsc7#41.10.30.01.00#Refrigerated cooling plate probes#41.10.30.00.00
-unspsc7#41.10.30.02.00#Freezing spray aerosols#41.10.30.00.00
-unspsc7#41.10.30.03.00#Cryostats#41.10.30.00.00
-unspsc7#41.10.30.04.00#Fan circulated ovens#41.10.30.00.00
-unspsc7#41.10.30.05.00#Ultra cold cabinets#41.10.30.00.00
-unspsc7#41.10.30.06.00#Cryogenic freezers#41.10.30.00.00
-unspsc7#41.10.30.07.00#Chilling units or cold water circulation#41.10.30.00.00
-unspsc7#41.10.30.08.00#Refrigerated cooling modules#41.10.30.00.00
-unspsc7#41.10.30.09.00#Cadaver storage refrigerators#41.10.30.00.00
-unspsc7#41.10.31.00.00#Laboratory supplies#41.10.00.00.00
-unspsc7#41.10.31.01.00#Test tubes#41.10.31.00.00
-unspsc7#41.10.31.03.00#Pipettes or accessories#41.10.31.00.00
-unspsc7#41.10.31.04.00#Flasks#41.10.31.00.00
-unspsc7#41.10.31.05.00#Beakers#41.10.31.00.00
-unspsc7#41.10.31.06.00#Stirring rods#41.10.31.00.00
-unspsc7#41.10.31.07.00#Laboratory or sampling syringes#41.10.31.00.00
-unspsc7#41.10.31.08.00#Desiccants#41.10.31.00.00
-unspsc7#41.10.31.09.00#Watch glasses#41.10.31.00.00
-unspsc7#41.10.31.10.00#Burets#41.10.31.00.00
-unspsc7#41.10.31.11.00#Measuring cylinder#41.10.31.00.00
-unspsc7#41.10.31.12.00#Laboratory dishes#41.10.31.00.00
-unspsc7#41.10.31.13.00#Slides#41.10.31.00.00
-unspsc7#41.10.31.14.00#Stoppers#41.10.31.00.00
-unspsc7#41.10.31.15.00#Tubing connectors#41.10.31.00.00
-unspsc7#41.10.31.16.00#Laboratory cases#41.10.31.00.00
-unspsc7#41.10.31.17.00#Laboratory scoops or spatulas#41.10.31.00.00
-unspsc7#41.10.32.00.00#Laboratory cleaning equipment#41.10.00.00.00
-unspsc7#41.10.32.01.00#Chemical engineering washers#41.10.32.00.00
-unspsc7#41.10.32.02.00#Laboratory washing machines#41.10.32.00.00
-unspsc7#41.10.32.03.00#Pipette washers#41.10.32.00.00
-unspsc7#41.10.32.04.00#Ultrasonic cleaners#41.10.32.00.00
-unspsc7#41.10.33.00.00#Fluid mechanics equipment#41.10.00.00.00
-unspsc7#41.10.33.01.00#Liquid scintillation counters#41.10.33.00.00
-unspsc7#41.10.33.02.00#Battery acid hydrometers#41.10.33.00.00
-unspsc7#41.10.33.03.00#Densitometers#41.10.33.00.00
-unspsc7#41.10.33.04.00#Vacuum ovens#41.10.33.00.00
-unspsc7#41.10.33.05.00#High vacuum equipment#41.10.33.00.00
-unspsc7#41.10.33.06.00#Pneumatic vacuum equipment#41.10.33.00.00
-unspsc7#41.10.33.07.00#Vacuum or mercury vapour equipment#41.10.33.00.00
-unspsc7#41.10.33.08.00#High vacuum combustion apparatus#41.10.33.00.00
-unspsc7#41.10.33.09.00#Flow injection analysis equipment#41.10.33.00.00
-unspsc7#41.10.33.10.00#Gas or vapour concentration measuring instruments#41.10.33.00.00
-unspsc7#41.10.33.11.00#Manometers#41.10.33.00.00
-unspsc7#41.10.33.12.00#Viscosimeters#41.10.33.00.00
-unspsc7#41.10.33.13.00#Depth indicators#41.10.33.00.00
-unspsc7#41.10.33.14.00#Microscopic structure estimation apparatus#41.10.33.00.00
-unspsc7#41.10.33.15.00#Solution strength estimation apparatus#41.10.33.00.00
-unspsc7#41.10.34.00.00#Laboratory environmental conditioning equipment#41.10.00.00.00
-unspsc7#41.10.34.01.00#Contamination control screens#41.10.34.00.00
-unspsc7#41.10.34.02.00#Environmental chambers#41.10.34.00.00
-unspsc7#41.10.34.03.00#Microbiological aircontrol#41.10.34.00.00
-unspsc7#41.10.34.04.00#Growth chambers#41.10.34.00.00
-unspsc7#41.10.34.05.00#Walk in chambers#41.10.34.00.00
-unspsc7#41.10.34.06.00#Glove boxes#41.10.34.00.00
-unspsc7#41.10.35.00.00#Laboratory ventilating equipment#41.10.00.00.00
-unspsc7#41.10.35.01.00#Ebuliometer#41.10.35.00.00
-unspsc7#41.10.35.02.00#Fume hoods#41.10.35.00.00
-unspsc7#41.10.35.03.00#Fume cupboards#41.10.35.00.00
-unspsc7#41.10.35.04.00#Laminar flow cabinets or stations#41.10.35.00.00
-unspsc7#41.10.36.00.00#Laboratory decanting and distilling and evaporating and filtering equipment and supplies#41.10.00.00.00
-unspsc7#41.10.36.01.00#Flask or retort units#41.10.36.00.00
-unspsc7#41.10.36.02.00#Bi distillation units#41.10.36.00.00
-unspsc7#41.10.36.03.00#Evaporators#41.10.36.00.00
-unspsc7#41.10.36.04.00#Vacuum evaporators#41.10.36.00.00
-unspsc7#41.10.36.05.00#Extracting equipment#41.10.36.00.00
-unspsc7#41.10.36.06.00#Line filters#41.10.36.00.00
-unspsc7#41.10.36.07.00#Gel filtration equipment#41.10.36.00.00
-unspsc7#41.10.36.08.00#Ultra filtration equipment#41.10.36.00.00
-unspsc7#41.10.36.09.00#Sintered cell filters#41.10.36.00.00
-unspsc7#41.10.36.10.00#Thin channel filtration equipment#41.10.36.00.00
-unspsc7#41.10.36.11.00#Reverse osmosis filtration equipment#41.10.36.00.00
-unspsc7#41.10.36.12.00#Molecular filtration equipment#41.10.36.00.00
-unspsc7#41.10.36.13.00#Cartridge element filters#41.10.36.00.00
-unspsc7#41.10.36.14.00#Filter holders or cyclones#41.10.36.00.00
-unspsc7#41.10.36.15.00#Multi sheet or press or filter#41.10.36.00.00
-unspsc7#41.10.36.16.00#Air filtration systems#41.10.36.00.00
-unspsc7#41.10.36.17.00#Hepa filters#41.10.36.00.00
-unspsc7#41.10.36.18.00#Fluid presses filter#41.10.36.00.00
-unspsc7#41.10.36.19.00#Sedimentological analyzing unit#41.10.36.00.00
-unspsc7#41.10.36.20.00#Laboratory separators#41.10.36.00.00
-unspsc7#41.10.36.21.00#Laboratory sifting equipment#41.10.36.00.00
-unspsc7#41.10.36.22.00#Test sieves#41.10.36.00.00
-unspsc7#41.10.36.23.00#Laboratory scrubbers#41.10.36.00.00
-unspsc7#41.10.36.24.00#Titration equipment#41.10.36.00.00
-unspsc7#41.10.36.25.00#Laboratory diluters#41.10.36.00.00
-unspsc7#41.10.36.26.00#Fractionation apparatus#41.10.36.00.00
-unspsc7#41.10.36.27.00#Distillation pipings or columns or fittings#41.10.36.00.00
-unspsc7#41.10.36.28.00#Reflux components#41.10.36.00.00
-unspsc7#41.10.36.29.00#Heat exchange condensers#41.10.36.00.00
-unspsc7#41.10.37.00.00#Laboratory baths#41.10.00.00.00
-unspsc7#41.10.37.01.00#Circulating baths#41.10.37.00.00
-unspsc7#41.10.37.02.00#Thermostatic baths#41.10.37.00.00
-unspsc7#41.10.37.03.00#Multiple baths#41.10.37.00.00
-unspsc7#41.10.37.04.00#Biological baths#41.10.37.00.00
-unspsc7#41.10.37.05.00#Organ baths#41.10.37.00.00
-unspsc7#41.10.37.06.00#Water baths#41.10.37.00.00
-unspsc7#41.10.37.07.00#Oil baths#41.10.37.00.00
-unspsc7#41.10.37.08.00#Sand baths#41.10.37.00.00
-unspsc7#41.10.37.09.00#Refrigerated baths#41.10.37.00.00
-unspsc7#41.11.00.00.00#Measuring and observing and testing instruments#41.00.00.00.00
-unspsc7#41.11.15.00.00#Weight measuring instruments#41.11.00.00.00
-unspsc7#41.11.15.01.00#Electronic toploading balances#41.11.15.00.00
-unspsc7#41.11.15.02.00#Laboratory balances#41.11.15.00.00
-unspsc7#41.11.15.03.00#Mechanical balances#41.11.15.00.00
-unspsc7#41.11.15.04.00#Pull spring balances#41.11.15.00.00
-unspsc7#41.11.15.05.00#Calibration weights or weight sets#41.11.15.00.00
-unspsc7#41.11.15.06.00#Animal weighing scales#41.11.15.00.00
-unspsc7#41.11.15.07.00#Bench scales#41.11.15.00.00
-unspsc7#41.11.15.08.00#Bodyweight measuring scales#41.11.15.00.00
-unspsc7#41.11.15.09.00#Floor or platform scales#41.11.15.00.00
-unspsc7#41.11.15.10.00#Postal scales#41.11.15.00.00
-unspsc7#41.11.15.11.00#Truck or rail scales#41.11.15.00.00
-unspsc7#41.11.16.00.00#Length and thickness and distance measuring instruments#41.11.00.00.00
-unspsc7#41.11.16.01.00#Micrometers#41.11.16.00.00
-unspsc7#41.11.16.02.00#Pedometers#41.11.16.00.00
-unspsc7#41.11.16.03.00#Rangefinders#41.11.16.00.00
-unspsc7#41.11.16.04.00#Rulers#41.11.16.00.00
-unspsc7#41.11.16.05.00#Strain gauges#41.11.16.00.00
-unspsc7#41.11.16.06.00#Tellurometers#41.11.16.00.00
-unspsc7#41.11.16.07.00#Thread counters or gauges#41.11.16.00.00
-unspsc7#41.11.16.08.00#Calipers#41.11.16.00.00
-unspsc7#41.11.16.13.00#Distance meters#41.11.16.00.00
-unspsc7#41.11.16.14.00#Height gauges#41.11.16.00.00
-unspsc7#41.11.16.15.00#Laser measuring systems#41.11.16.00.00
-unspsc7#41.11.16.16.00#Measuring wheels for distance#41.11.16.00.00
-unspsc7#41.11.16.17.00#Feeler gauges#41.11.16.00.00
-unspsc7#41.11.16.18.00#Gage block set#41.11.16.00.00
-unspsc7#41.11.16.19.00#Go or no go gauge#41.11.16.00.00
-unspsc7#41.11.16.20.00#Etalon wedge#41.11.16.00.00
-unspsc7#41.11.17.00.00#Viewing and observing instruments and accessories#41.11.00.00.00
-unspsc7#41.11.17.01.00#Ion microscopes#41.11.17.00.00
-unspsc7#41.11.17.02.00#Monocular microscopes#41.11.17.00.00
-unspsc7#41.11.17.03.00#Stereo microscopes#41.11.17.00.00
-unspsc7#41.11.17.04.00#Illuminators for microscopes#41.11.17.00.00
-unspsc7#41.11.17.05.00#Objectives for microscopes#41.11.17.00.00
-unspsc7#41.11.17.06.00#Photo attachments for microscopes#41.11.17.00.00
-unspsc7#41.11.17.07.00#Profile projectors#41.11.17.00.00
-unspsc7#41.11.17.08.00#Video attachments for microscopes#41.11.17.00.00
-unspsc7#41.11.17.09.00#Binocular microscope#41.11.17.00.00
-unspsc7#41.11.17.10.00#Combination electron and light microscopes#41.11.17.00.00
-unspsc7#41.11.17.11.00#Electron microscopes#41.11.17.00.00
-unspsc7#41.11.17.12.00#Inverted microscopes#41.11.17.00.00
-unspsc7#41.11.17.13.00#Magnifiers#41.11.17.00.00
-unspsc7#41.11.17.14.00#Loupes#41.11.17.00.00
-unspsc7#41.11.17.15.00#Telescopes#41.11.17.00.00
-unspsc7#41.11.17.16.00#Borescope inspection equipment#41.11.17.00.00
-unspsc7#41.11.17.17.00#Binoculars#41.11.17.00.00
-unspsc7#41.11.18.00.00#Non destructive examination equipment#41.11.00.00.00
-unspsc7#41.11.18.01.00#Eddy current examination equipment#41.11.18.00.00
-unspsc7#41.11.18.02.00#Liquid penetrant examination equipment#41.11.18.00.00
-unspsc7#41.11.18.03.00#Magnetic particle examination equipment#41.11.18.00.00
-unspsc7#41.11.18.04.00#Ultrasonic examination equipment#41.11.18.00.00
-unspsc7#41.11.18.05.00#CO 60 radiography examination equipment#41.11.18.00.00
-unspsc7#41.11.18.06.00#CS 137 radiography examination equipment#41.11.18.00.00
-unspsc7#41.11.18.07.00#IR 192 radiography examination equipment#41.11.18.00.00
-unspsc7#41.11.18.08.00#X ray radiography examination equipment#41.11.18.00.00
-unspsc7#41.11.19.00.00#Indicating and recording instruments#41.11.00.00.00
-unspsc7#41.11.19.01.00#Counters#41.11.19.00.00
-unspsc7#41.11.19.02.00#Electronic counters#41.11.19.00.00
-unspsc7#41.11.19.03.00#Metal detectors#41.11.19.00.00
-unspsc7#41.11.19.04.00#Electronic columns#41.11.19.00.00
-unspsc7#41.11.19.05.00#Electronic measuring probes#41.11.19.00.00
-unspsc7#41.11.19.06.00#Chart recorders#41.11.19.00.00
-unspsc7#41.11.19.07.00#Digital readout recorders#41.11.19.00.00
-unspsc7#41.11.19.08.00#Graphic recorders#41.11.19.00.00
-unspsc7#41.11.19.09.00#Magnetic tape recorders#41.11.19.00.00
-unspsc7#41.11.19.10.00#Multipen recorders#41.11.19.00.00
-unspsc7#41.11.19.11.00#Oscillographic recorders#41.11.19.00.00
-unspsc7#41.11.19.12.00#Physiological recorders#41.11.19.00.00
-unspsc7#41.11.19.13.00#Point plotting recorders#41.11.19.00.00
-unspsc7#41.11.19.14.00#Servo recorders#41.11.19.00.00
-unspsc7#41.11.19.15.00#Bi metallic sensors#41.11.19.00.00
-unspsc7#41.11.19.16.00#Non contact sensors#41.11.19.00.00
-unspsc7#41.11.19.17.00#Digital testers#41.11.19.00.00
-unspsc7#41.11.19.18.00#Gyroscopic instruments#41.11.19.00.00
-unspsc7#41.11.19.19.00#Detection apparatus for non metalic objects#41.11.19.00.00
-unspsc7#41.11.19.20.00#Coordinate measuring machines (CMM)#41.11.19.00.00
-unspsc7#41.11.19.21.00#Speed sensors#41.11.19.00.00
-unspsc7#41.11.19.22.00#Lamp failure sensor#41.11.19.00.00
-unspsc7#41.11.19.23.00#Pre ignition knock sensor#41.11.19.00.00
-unspsc7#41.11.19.24.00#Oxygen sensors#41.11.19.00.00
-unspsc7#41.11.19.25.00#Speed sensors#41.11.19.00.00
-unspsc7#41.11.19.26.00#Proximity sensors#41.11.19.00.00
-unspsc7#41.11.19.27.00#Pressure sensors#41.11.19.00.00
-unspsc7#41.11.19.28.00#Current sensors#41.11.19.00.00
-unspsc7#41.11.20.00.00#Light and wave and sound generating and  measuring equipment#41.11.00.00.00
-unspsc7#41.11.20.01.00#Light absorptionmeters#41.11.20.00.00
-unspsc7#41.11.20.02.00#Acoustic testing rooms#41.11.20.00.00
-unspsc7#41.11.20.03.00#Anechoic chambers#41.11.20.00.00
-unspsc7#41.11.20.04.00#Frequency analyzers#41.11.20.00.00
-unspsc7#41.11.20.05.00#Frequency counters or timer or dividers#41.11.20.00.00
-unspsc7#41.11.20.06.00#Electrical frequency meters#41.11.20.00.00
-unspsc7#41.11.20.07.00#Interferometers#41.11.20.00.00
-unspsc7#41.11.20.08.00#Lasers#41.11.20.00.00
-unspsc7#41.11.20.09.00#Lightmeters#41.11.20.00.00
-unspsc7#41.11.20.10.00#Luxmeters#41.11.20.00.00
-unspsc7#41.11.20.11.00#Optical callibration sets#41.11.20.00.00
-unspsc7#41.11.20.12.00#Photometers#41.11.20.00.00
-unspsc7#41.11.20.13.00#Polarimeters#41.11.20.00.00
-unspsc7#41.11.20.14.00#Polariscopes#41.11.20.00.00
-unspsc7#41.11.20.15.00#Reflectometers#41.11.20.00.00
-unspsc7#41.11.20.16.00#Sonars#41.11.20.00.00
-unspsc7#41.11.20.17.00#Sonometers#41.11.20.00.00
-unspsc7#41.11.20.18.00#Sound measuring apparatus or decibel meter#41.11.20.00.00
-unspsc7#41.11.20.19.00#Spectrofluorimeters#41.11.20.00.00
-unspsc7#41.11.20.20.00#Spectrographs#41.11.20.00.00
-unspsc7#41.11.20.21.00#Spectrometers#41.11.20.00.00
-unspsc7#41.11.20.22.00#Mass spectrometers#41.11.20.00.00
-unspsc7#41.11.20.23.00#Proton spectrometers#41.11.20.00.00
-unspsc7#41.11.20.24.00#Spectrophotometers#41.11.20.00.00
-unspsc7#41.11.20.25.00#Stroboscopes#41.11.20.00.00
-unspsc7#41.11.20.26.00#Sound velocity analyzers#41.11.20.00.00
-unspsc7#41.11.20.27.00#Thickness measuring devices#41.11.20.00.00
-unspsc7#41.11.21.00.00#Transducers#41.11.00.00.00
-unspsc7#41.11.21.01.00#Piezo electric crystals#41.11.21.00.00
-unspsc7#41.11.21.02.00#Strain gauges#41.11.21.00.00
-unspsc7#41.11.21.03.00#Fiber sensors#41.11.21.00.00
-unspsc7#41.11.22.00.00#Temperature and heat measuring instruments#41.11.00.00.00
-unspsc7#41.11.22.01.00#Calorimeters#41.11.22.00.00
-unspsc7#41.11.22.02.00#Heat tracing equipment#41.11.22.00.00
-unspsc7#41.11.22.03.00#Melting point recorders#41.11.22.00.00
-unspsc7#41.11.22.04.00#Pyrometers#41.11.22.00.00
-unspsc7#41.11.22.05.00#Temperature regulators#41.11.22.00.00
-unspsc7#41.11.22.06.00#Thermocouples#41.11.22.00.00
-unspsc7#41.11.22.07.00#Thermographs#41.11.22.00.00
-unspsc7#41.11.22.09.00#Thermostats#41.11.22.00.00
-unspsc7#41.11.22.10.00#Remote reading thermometers#41.11.22.00.00
-unspsc7#41.11.22.11.00#Resistance thermometers#41.11.22.00.00
-unspsc7#41.11.22.12.00#Surface thermometers#41.11.22.00.00
-unspsc7#41.11.22.13.00#Handheld thermometer#41.11.22.00.00
-unspsc7#41.11.23.00.00#Humidity measuring instruments#41.11.00.00.00
-unspsc7#41.11.23.01.00#Hygrometers#41.11.23.00.00
-unspsc7#41.11.23.02.00#Psychrometers#41.11.23.00.00
-unspsc7#41.11.23.03.00#Temperature humidity testers#41.11.23.00.00
-unspsc7#41.11.24.00.00#Pressure measuring and control instruments#41.11.00.00.00
-unspsc7#41.11.24.01.00#Depth gauges#41.11.24.00.00
-unspsc7#41.11.24.02.00#Manostats#41.11.24.00.00
-unspsc7#41.11.24.03.00#Pressure reading indicators#41.11.24.00.00
-unspsc7#41.11.24.04.00#Pressure regulator#41.11.24.00.00
-unspsc7#41.11.24.05.00#Pressure or vacuum recorders#41.11.24.00.00
-unspsc7#41.11.24.06.00#Vacuum gauges#41.11.24.00.00
-unspsc7#41.11.24.07.00#Liquid level controls or instruments#41.11.24.00.00
-unspsc7#41.11.25.00.00#Flow measuring instruments#41.11.00.00.00
-unspsc7#41.11.25.01.00#Flowmeters#41.11.25.00.00
-unspsc7#41.11.25.02.00#Rheometers#41.11.25.00.00
-unspsc7#41.11.25.03.00#Rotameters#41.11.25.00.00
-unspsc7#41.11.25.04.00#Water meters#41.11.25.00.00
-unspsc7#41.11.25.05.00#Water meter spares#41.11.25.00.00
-unspsc7#41.11.25.06.00#Venturis#41.11.25.00.00
-unspsc7#41.11.27.00.00#Seed and feed equipment#41.11.00.00.00
-unspsc7#41.11.27.01.00#Grain analyzers#41.11.27.00.00
-unspsc7#41.11.27.02.00#Seed counters#41.11.27.00.00
-unspsc7#41.11.27.03.00#Fiber apparatus for feed sample analysis#41.11.27.00.00
-unspsc7#41.11.28.00.00#Transportation related equipment and instruments#41.11.00.00.00
-unspsc7#41.11.28.01.00#Speedometers#41.11.28.00.00
-unspsc7#41.11.28.02.00#Tachometers#41.11.28.00.00
-unspsc7#41.11.29.00.00#Navigational equipment and instruments#41.11.00.00.00
-unspsc7#41.11.29.01.00#Direction finding compasses#41.11.29.00.00
-unspsc7#41.11.29.02.00#Radio navigation instruments#41.11.29.00.00
-unspsc7#41.11.29.03.00#Sextants#41.11.29.00.00
-unspsc7#41.11.29.04.00#Complex controlling devices#41.11.29.00.00
-unspsc7#41.11.30.00.00#Chemical evaluation instruments and supplies#41.11.00.00.00
-unspsc7#41.11.30.01.00#Digital analyzer controllers#41.11.30.00.00
-unspsc7#41.11.30.02.00#Chemiluminescence or bioluminescence analyzers#41.11.30.00.00
-unspsc7#41.11.30.03.00#Electrogravimetry analyzers#41.11.30.00.00
-unspsc7#41.11.30.04.00#Flame ionization analyzers#41.11.30.00.00
-unspsc7#41.11.30.05.00#Ion analyzers#41.11.30.00.00
-unspsc7#41.11.30.06.00#Radiometry analyzers#41.11.30.00.00
-unspsc7#41.11.30.07.00#Random access analyzers#41.11.30.00.00
-unspsc7#41.11.30.08.00#Cintigraphic analyzers#41.11.30.00.00
-unspsc7#41.11.30.09.00#Thermal differential analyzers#41.11.30.00.00
-unspsc7#41.11.30.10.00#Thermo gravimetry analyzers#41.11.30.00.00
-unspsc7#41.11.30.11.00#Chromatographic detectors#41.11.30.00.00
-unspsc7#41.11.30.12.00#Chromatographic scanners#41.11.30.00.00
-unspsc7#41.11.30.13.00#Gas chromatographs#41.11.30.00.00
-unspsc7#41.11.30.14.00#Ion chromatographs#41.11.30.00.00
-unspsc7#41.11.30.15.00#Liquid chromatographs#41.11.30.00.00
-unspsc7#41.11.30.16.00#Thinlayer chromatographs#41.11.30.00.00
-unspsc7#41.11.30.18.00#High pressure liquid chromatograph chromatography#41.11.30.00.00
-unspsc7#41.11.30.19.00#High pressure thin layer chromatograph (TLC)#41.11.30.00.00
-unspsc7#41.11.30.20.00#Colorimeters#41.11.30.00.00
-unspsc7#41.11.30.21.00#Conductimetric instruments#41.11.30.00.00
-unspsc7#41.11.30.22.00#Fluorimeters#41.11.30.00.00
-unspsc7#41.11.30.23.00#Gel partition equipment#41.11.30.00.00
-unspsc7#41.11.30.24.00#Hydrometers#41.11.30.00.00
-unspsc7#41.11.30.25.00#Monochromators#41.11.30.00.00
-unspsc7#41.11.30.26.00#Nephelometers#41.11.30.00.00
-unspsc7#41.11.30.27.00#Osmometers#41.11.30.00.00
-unspsc7#41.11.30.28.00#pH meters#41.11.30.00.00
-unspsc7#41.11.30.29.00#Polarographs#41.11.30.00.00
-unspsc7#41.11.30.30.00#Radiochromatographic scanner#41.11.30.00.00
-unspsc7#41.11.30.31.00#Saccharometers#41.11.30.00.00
-unspsc7#41.11.30.32.00#Salinity meter#41.11.30.00.00
-unspsc7#41.11.30.33.00#Volumeters#41.11.30.00.00
-unspsc7#41.11.31.00.00#Gas analyzers#41.11.00.00.00
-unspsc7#41.11.31.01.00#Automotive exhaust emission analyzers#41.11.31.00.00
-unspsc7#41.11.31.02.00#Catalytic combustion analyzers#41.11.31.00.00
-unspsc7#41.11.31.03.00#Chemical absorption gas analyzers#41.11.31.00.00
-unspsc7#41.11.31.04.00#Explosimeters#41.11.31.00.00
-unspsc7#41.11.31.05.00#Hydrocarbons analyzers or detectors#41.11.31.00.00
-unspsc7#41.11.31.06.00#Infra red or ultra violet absorption analyzers#41.11.31.00.00
-unspsc7#41.11.31.07.00#Nitrogen analyzers#41.11.31.00.00
-unspsc7#41.11.31.08.00#Nitrogen oxide analyzers#41.11.31.00.00
-unspsc7#41.11.31.09.00#ORSAT equipment#41.11.31.00.00
-unspsc7#41.11.31.10.00#Oxygen gas analyzers#41.11.31.00.00
-unspsc7#41.11.31.11.00#Ozone analyzers#41.11.31.00.00
-unspsc7#41.11.31.12.00#Paramagnetic susceptibility analyzers#41.11.31.00.00
-unspsc7#41.11.31.13.00#Sulfur dioxide analyzers or detectors#41.11.31.00.00
-unspsc7#41.11.31.14.00#Thermal conductivity analyzers#41.11.31.00.00
-unspsc7#41.11.31.15.00#Radon detectors#41.11.31.00.00
-unspsc7#41.11.31.16.00#Gas detector tubes#41.11.31.00.00
-unspsc7#41.11.33.00.00#Liquid and solid analyzers#41.11.00.00.00
-unspsc7#41.11.33.01.00#Acid or base analyzers#41.11.33.00.00
-unspsc7#41.11.33.02.00#Albuminometers#41.11.33.00.00
-unspsc7#41.11.33.03.00#Amino acid analyzers#41.11.33.00.00
-unspsc7#41.11.33.04.00#Bauxite analyzers#41.11.33.00.00
-unspsc7#41.11.33.05.00#Calcium analyzers#41.11.33.00.00
-unspsc7#41.11.33.06.00#Chloride analyzers#41.11.33.00.00
-unspsc7#41.11.33.07.00#Dissolved oxygen measurement meter#41.11.33.00.00
-unspsc7#41.11.33.08.00#Electrolyte analyzers#41.11.33.00.00
-unspsc7#41.11.33.09.00#Enzyme analyzers#41.11.33.00.00
-unspsc7#41.11.33.10.00#Fatty acid analyzers#41.11.33.00.00
-unspsc7#41.11.33.11.00#Halide detector lamp#41.11.33.00.00
-unspsc7#41.11.33.12.00#Lactate analyzers#41.11.33.00.00
-unspsc7#41.11.33.13.00#Mineral oil testing instruments#41.11.33.00.00
-unspsc7#41.11.33.14.00#Oil content monitors analyzers#41.11.33.00.00
-unspsc7#41.11.33.15.00#Organic carbon analyzers#41.11.33.00.00
-unspsc7#41.11.33.16.00#Petroleum testing equipment#41.11.33.00.00
-unspsc7#41.11.33.17.00#Protein analyzers#41.11.33.00.00
-unspsc7#41.11.33.18.00#Uranium analyzers#41.11.33.00.00
-unspsc7#41.11.33.19.00#Water analyzers#41.11.33.00.00
-unspsc7#41.11.33.20.00#Lubricating oil testing kit#41.11.33.00.00
-unspsc7#41.11.33.21.00#Paint tester#41.11.33.00.00
-unspsc7#41.11.34.00.00#Nuclear evaluation instruments#41.11.00.00.00
-unspsc7#41.11.34.01.00#Alpha counters#41.11.34.00.00
-unspsc7#41.11.34.02.00#Alpha beta counters#41.11.34.00.00
-unspsc7#41.11.34.03.00#Beta counters#41.11.34.00.00
-unspsc7#41.11.34.04.00#Beta gamma counters#41.11.34.00.00
-unspsc7#41.11.34.05.00#Gamma counters#41.11.34.00.00
-unspsc7#41.11.34.06.00#KVP meters#41.11.34.00.00
-unspsc7#41.11.34.07.00#X ray microanalysers#41.11.34.00.00
-unspsc7#41.11.36.00.00#Electrical measuring and testing equipment#41.11.00.00.00
-unspsc7#41.11.36.01.00#Ammeters#41.11.36.00.00
-unspsc7#41.11.36.02.00#Phasemeters#41.11.36.00.00
-unspsc7#41.11.36.03.00#Bridges#41.11.36.00.00
-unspsc7#41.11.36.04.00#Capacitance meters#41.11.36.00.00
-unspsc7#41.11.36.05.00#Thermoanalysis derivatographs#41.11.36.00.00
-unspsc7#41.11.36.06.00#Freeze watch indicators#41.11.36.00.00
-unspsc7#41.11.36.07.00#Heat stress monitors#41.11.36.00.00
-unspsc7#41.11.36.08.00#Coincidence or anticoincidence counters#41.11.36.00.00
-unspsc7#41.11.36.09.00#Conductivity cells#41.11.36.00.00
-unspsc7#41.11.36.10.00#Conductivity meters#41.11.36.00.00
-unspsc7#41.11.36.11.00#Cross talk meters#41.11.36.00.00
-unspsc7#41.11.36.12.00#Earth resistance testers#41.11.36.00.00
-unspsc7#41.11.36.13.00#Electrical value recorders#41.11.36.00.00
-unspsc7#41.11.36.14.00#Electromagnetic field meters#41.11.36.00.00
-unspsc7#41.11.36.15.00#Electrometers#41.11.36.00.00
-unspsc7#41.11.36.16.00#Electronic loads#41.11.36.00.00
-unspsc7#41.11.36.17.00#Field strength measuring equipment#41.11.36.00.00
-unspsc7#41.11.36.18.00#Gain measuring instruments#41.11.36.00.00
-unspsc7#41.11.36.19.00#Galvanometers#41.11.36.00.00
-unspsc7#41.11.36.20.00#High voltage cable detection#41.11.36.00.00
-unspsc7#41.11.36.21.00#Impedance meters#41.11.36.00.00
-unspsc7#41.11.36.22.00#Calibrated inductance coils or boxes#41.11.36.00.00
-unspsc7#41.11.36.23.00#Insulation resistance meters#41.11.36.00.00
-unspsc7#41.11.36.24.00#Insulation testers#41.11.36.00.00
-unspsc7#41.11.36.25.00#Ionization chambers#41.11.36.00.00
-unspsc7#41.11.36.26.00#Ionmeters#41.11.36.00.00
-unspsc7#41.11.36.27.00#Line earth loop testers#41.11.36.00.00
-unspsc7#41.11.36.28.00#Megohmmeters#41.11.36.00.00
-unspsc7#41.11.36.29.00#Microwave leakage meters#41.11.36.00.00
-unspsc7#41.11.36.30.00#Multimeters#41.11.36.00.00
-unspsc7#41.11.36.31.00#Ohmmeters#41.11.36.00.00
-unspsc7#41.11.36.32.00#Oscillographs#41.11.36.00.00
-unspsc7#41.11.36.33.00#Potentiometers#41.11.36.00.00
-unspsc7#41.11.36.34.00#Q meters#41.11.36.00.00
-unspsc7#41.11.36.35.00#Calibrated resistance measuring equipment#41.11.36.00.00
-unspsc7#41.11.36.36.00#Level generators#41.11.36.00.00
-unspsc7#41.11.36.37.00#Voltage or current meters#41.11.36.00.00
-unspsc7#41.11.36.38.00#Oscilloscopes#41.11.36.00.00
-unspsc7#41.11.36.39.00#Accelerometers#41.11.36.00.00
-unspsc7#41.11.36.40.00#Wattmeters#41.11.36.00.00
-unspsc7#41.11.36.41.00#GFI circuit testors#41.11.36.00.00
-unspsc7#41.11.36.42.00#Circuit tester#41.11.36.00.00
-unspsc7#41.11.36.43.00#Demand meters or registers#41.11.36.00.00
-unspsc7#41.11.36.44.00#Circuit tracers#41.11.36.00.00
-unspsc7#41.11.37.00.00#Electronic and communication measuring and testing instruments#41.11.00.00.00
-unspsc7#41.11.37.01.00#Cathode ray tube tester#41.11.37.00.00
-unspsc7#41.11.37.02.00#Comparators#41.11.37.00.00
-unspsc7#41.11.37.03.00#Directional coupler#41.11.37.00.00
-unspsc7#41.11.37.04.00#Integrated circuit testers#41.11.37.00.00
-unspsc7#41.11.37.05.00#Logic state testers#41.11.37.00.00
-unspsc7#41.11.37.06.00#Semiconductor testers#41.11.37.00.00
-unspsc7#41.11.37.07.00#Transistor circuit testers#41.11.37.00.00
-unspsc7#41.11.37.08.00#Power meters#41.11.37.00.00
-unspsc7#41.11.37.09.00#Modulation meters#41.11.37.00.00
-unspsc7#41.11.37.10.00#Level meter#41.11.37.00.00
-unspsc7#41.11.37.11.00#Network analyzers#41.11.37.00.00
-unspsc7#41.11.37.12.00#Tape testers#41.11.37.00.00
-unspsc7#41.11.37.13.00#Tapespeed testers#41.11.37.00.00
-unspsc7#41.11.37.14.00#Differentiator#41.11.37.00.00
-unspsc7#41.11.38.00.00#Geophysical and geotechnical instruments#41.11.00.00.00
-unspsc7#41.11.38.01.00#Geological compasses#41.11.38.00.00
-unspsc7#41.11.38.02.00#Geological prospecting apparatus#41.11.38.00.00
-unspsc7#41.11.38.03.00#Electromagnetic geophysical instruments#41.11.38.00.00
-unspsc7#41.11.38.04.00#Gravity geophysical instruments#41.11.38.00.00
-unspsc7#41.11.38.05.00#Induced polarization (IP) geophysical instruments#41.11.38.00.00
-unspsc7#41.11.38.06.00#Magnetometer geophysical instruments#41.11.38.00.00
-unspsc7#41.11.38.07.00#Resistivity geophysical instruments#41.11.38.00.00
-unspsc7#41.11.38.08.00#Gravimeters#41.11.38.00.00
-unspsc7#41.11.39.00.00#Soil measuring equipment#41.11.00.00.00
-unspsc7#41.11.39.01.00#Bore measuring instruments#41.11.39.00.00
-unspsc7#41.11.39.02.00#Dissolution or disintegration testers#41.11.39.00.00
-unspsc7#41.11.39.03.00#Particle size measuring apparatus#41.11.39.00.00
-unspsc7#41.11.39.04.00#Penetrometers#41.11.39.00.00
-unspsc7#41.11.39.05.00#Permeability testing apparatus#41.11.39.00.00
-unspsc7#41.11.39.06.00#Permeability or porosity estimation apparatus#41.11.39.00.00
-unspsc7#41.11.39.07.00#Porosimeters#41.11.39.00.00
-unspsc7#41.11.39.08.00#Sand testing apparatus#41.11.39.00.00
-unspsc7#41.11.39.09.00#Soil core sampling apparatus#41.11.39.00.00
-unspsc7#41.11.39.10.00#Soil testing kits#41.11.39.00.00
-unspsc7#41.11.40.00.00#Rock and strata measuring equipment#41.11.00.00.00
-unspsc7#41.11.40.01.00#Clinometers#41.11.40.00.00
-unspsc7#41.11.41.00.00#Seismological instruments#41.11.00.00.00
-unspsc7#41.11.41.02.00#Earthquake simulators#41.11.41.00.00
-unspsc7#41.11.41.03.00#Seismic alarm modules#41.11.41.00.00
-unspsc7#41.11.41.04.00#Seismic amplifiers#41.11.41.00.00
-unspsc7#41.11.41.05.00#Portable seismic apparatus#41.11.41.00.00
-unspsc7#41.11.41.06.00#Seismic recorders or seismographs#41.11.41.00.00
-unspsc7#41.11.41.07.00#Seismometers#41.11.41.00.00
-unspsc7#41.11.41.08.00#Vibrometers#41.11.41.00.00
-unspsc7#41.11.42.00.00#Land surveying instruments#41.11.00.00.00
-unspsc7#41.11.42.01.00#Measuring tapes#41.11.42.00.00
-unspsc7#41.11.42.02.00#Measuring rods#41.11.42.00.00
-unspsc7#41.11.42.03.00#Measuring tables#41.11.42.00.00
-unspsc7#41.11.42.04.00#Theodolites#41.11.42.00.00
-unspsc7#41.11.42.05.00#Location stake#41.11.42.00.00
-unspsc7#41.11.42.06.00#Location hub#41.11.42.00.00
-unspsc7#41.11.43.00.00#Hydrological instruments#41.11.00.00.00
-unspsc7#41.11.43.01.00#Open stream current meters#41.11.43.00.00
-unspsc7#41.11.43.02.00#Logging instruments for water wells#41.11.43.00.00
-unspsc7#41.11.43.03.00#Open stream water level recorders#41.11.43.00.00
-unspsc7#41.11.44.00.00#Meteorological instruments#41.11.00.00.00
-unspsc7#41.11.44.01.00#Anemometers#41.11.44.00.00
-unspsc7#41.11.44.02.00#Barometers#41.11.44.00.00
-unspsc7#41.11.44.03.00#Precipitation or evaporation recorders#41.11.44.00.00
-unspsc7#41.11.44.04.00#Radiosonde apparatus#41.11.44.00.00
-unspsc7#41.11.44.05.00#Rainfall recorders#41.11.44.00.00
-unspsc7#41.11.44.06.00#Precipitation or evaporation surface observing apparatus#41.11.44.00.00
-unspsc7#41.11.44.07.00#Solar radiation surface observing apparatus#41.11.44.00.00
-unspsc7#41.11.44.08.00#Temperature or humidity surface observing apparatus#41.11.44.00.00
-unspsc7#41.11.44.09.00#Wind surface observing apparatus#41.11.44.00.00
-unspsc7#41.11.44.10.00#Weather stations#41.11.44.00.00
-unspsc7#41.11.44.11.00#Meteorology instrument accessories#41.11.44.00.00
-unspsc7#41.11.45.00.00#Mechanical instruments#41.11.00.00.00
-unspsc7#41.11.45.01.00#Dynamometers#41.11.45.00.00
-unspsc7#41.11.45.02.00#Elastometers#41.11.45.00.00
-unspsc7#41.11.45.03.00#Extensometers#41.11.45.00.00
-unspsc7#41.11.45.04.00#Pitch measuring instruments#41.11.45.00.00
-unspsc7#41.11.45.05.00#Roundness testing instruments#41.11.45.00.00
-unspsc7#41.11.45.06.00#Spherometers#41.11.45.00.00
-unspsc7#41.11.45.07.00#Spring testing machines#41.11.45.00.00
-unspsc7#41.11.45.08.00#Surface testers#41.11.45.00.00
-unspsc7#41.11.45.09.00#Tensiometers#41.11.45.00.00
-unspsc7#41.11.45.10.00#Torque limiter#41.11.45.00.00
-unspsc7#41.11.46.00.00#Metals and metallurgy and structural materials testing instruments#41.11.00.00.00
-unspsc7#41.11.46.01.00#Abrasion testers#41.11.46.00.00
-unspsc7#41.11.46.02.00#Compression testers#41.11.46.00.00
-unspsc7#41.11.46.03.00#Concrete or cement testing instruments#41.11.46.00.00
-unspsc7#41.11.46.04.00#Corrosion testers#41.11.46.00.00
-unspsc7#41.11.46.05.00#Crack or corrosion detectors#41.11.46.00.00
-unspsc7#41.11.46.06.00#Creep testers#41.11.46.00.00
-unspsc7#41.11.46.07.00#Ductility testing machines#41.11.46.00.00
-unspsc7#41.11.46.08.00#Fatigue testers#41.11.46.00.00
-unspsc7#41.11.46.09.00#Forging testing apparatus#41.11.46.00.00
-unspsc7#41.11.46.10.00#Foundry testing apparatus#41.11.46.00.00
-unspsc7#41.11.46.11.00#Hardness testers#41.11.46.00.00
-unspsc7#41.11.46.12.00#Impact testers#41.11.46.00.00
-unspsc7#41.11.46.13.00#Load frame#41.11.46.00.00
-unspsc7#41.11.46.14.00#Metal testing instruments#41.11.46.00.00
-unspsc7#41.11.46.15.00#Photoelastic testing instruments#41.11.46.00.00
-unspsc7#41.11.46.16.00#Proofstress indicators#41.11.46.00.00
-unspsc7#41.11.46.17.00#Relaxation testers#41.11.46.00.00
-unspsc7#41.11.46.18.00#Roughness measuring instruments#41.11.46.00.00
-unspsc7#41.11.46.19.00#Shear strength testers#41.11.46.00.00
-unspsc7#41.11.46.20.00#Shock testing apparatus#41.11.46.00.00
-unspsc7#41.11.46.21.00#Tension testers#41.11.46.00.00
-unspsc7#41.11.46.22.00#Torsion testers#41.11.46.00.00
-unspsc7#41.11.46.23.00#Flexure or transverse testing machines#41.11.46.00.00
-unspsc7#41.11.46.24.00#Vibration testers#41.11.46.00.00
-unspsc7#41.11.46.25.00#Wear testers#41.11.46.00.00
-unspsc7#41.11.46.26.00#Welding testing apparatus#41.11.46.00.00
-unspsc7#41.11.47.00.00#Paper and wood and textile testing instruments#41.11.00.00.00
-unspsc7#41.11.47.01.00#Cardboard testing instruments#41.11.47.00.00
-unspsc7#41.11.47.02.00#Textiles fastness testers#41.11.47.00.00
-unspsc7#41.11.47.03.00#Leather testing instruments#41.11.47.00.00
-unspsc7#41.11.47.04.00#Paper testing instruments#41.11.47.00.00
-unspsc7#41.11.47.05.00#Textile testing instruments#41.11.47.00.00
-unspsc7#41.11.47.06.00#Wood testing instruments#41.11.47.00.00
-unspsc7#41.11.48.00.00#Ceramics and glass testing instruments#41.11.00.00.00
-unspsc7#41.11.48.01.00#Ceramics testing instruments#41.11.48.00.00
-unspsc7#41.11.48.02.00#Glass testing instruments#41.11.48.00.00
-unspsc7#41.11.48.03.00#Pottery testing instruments#41.11.48.00.00
-unspsc7#41.11.51.00.00#Coal and ore testing instruments#41.11.00.00.00
-unspsc7#41.11.51.01.00#Coal testing instruments#41.11.51.00.00
-unspsc7#41.11.52.00.00#Radar and sonar systems and components#41.11.00.00.00
-unspsc7#41.11.52.01.00#Radarbased surveillance systems#41.11.52.00.00
-unspsc7#41.11.52.02.00#Feed horns#41.11.52.00.00
-unspsc7#42.00.00.00.00#Medical Equipment and Accessories and Supplies#42.00.00.00.00
-unspsc7#42.10.00.00.00#Hospital and medical and dental equipment#42.00.00.00.00
-unspsc7#42.10.15.00.00#Anesthesia equipment and instruments and accessories#42.10.00.00.00
-unspsc7#42.10.15.02.00#Healthcare gas machines#42.10.15.00.00
-unspsc7#42.10.15.03.00#Anesthesia machines#42.10.15.00.00
-unspsc7#42.10.15.04.00#Regional anaesthesia kits or needles#42.10.15.00.00
-unspsc7#42.10.16.00.00#Medical equipment and instruments#42.10.00.00.00
-unspsc7#42.10.16.01.00#Medical thermometers#42.10.16.00.00
-unspsc7#42.10.16.02.00#Speculums#42.10.16.00.00
-unspsc7#42.10.16.03.00#Otoscopes#42.10.16.00.00
-unspsc7#42.10.16.04.00#Audiometers or tympanometers#42.10.16.00.00
-unspsc7#42.10.16.05.00#Stethoscopes#42.10.16.00.00
-unspsc7#42.10.16.06.00#Ergonometers#42.10.16.00.00
-unspsc7#42.10.16.07.00#Electro therapy apparatus#42.10.16.00.00
-unspsc7#42.10.16.08.00#Photo therapy apparatus#42.10.16.00.00
-unspsc7#42.10.16.09.00#Hydrotherapy supplies or accessories#42.10.16.00.00
-unspsc7#42.10.16.10.00#Acupuncture units#42.10.16.00.00
-unspsc7#42.10.16.11.00#Stethographs#42.10.16.00.00
-unspsc7#42.10.16.12.00#Medical pumps#42.10.16.00.00
-unspsc7#42.10.16.13.00#Medical valves#42.10.16.00.00
-unspsc7#42.10.16.14.00#Endoscopes#42.10.16.00.00
-unspsc7#42.10.17.00.00#Medical testing and analyzing and diagnostic equipment#42.10.00.00.00
-unspsc7#42.10.17.01.00#Skin test strips#42.10.17.00.00
-unspsc7#42.10.17.02.00#Blood analyzers#42.10.17.00.00
-unspsc7#42.10.17.03.00#Blood cell counters#42.10.17.00.00
-unspsc7#42.10.17.04.00#Haemoglobinometers#42.10.17.00.00
-unspsc7#42.10.17.05.00#Bilirubin meters#42.10.17.00.00
-unspsc7#42.10.17.06.00#Haemacytometers#42.10.17.00.00
-unspsc7#42.10.17.07.00#Colony counters#42.10.17.00.00
-unspsc7#42.10.17.08.00#Ferritin test kits#42.10.17.00.00
-unspsc7#42.10.17.09.00#Enzyme linked immunosorbent assay (ELISA) test kit#42.10.17.00.00
-unspsc7#42.10.17.10.00#Human immune deficiency (HIV) test kits#42.10.17.00.00
-unspsc7#42.10.17.11.00#Syfacard syphilis tests#42.10.17.00.00
-unspsc7#42.10.17.12.00#Pregnancy test kits#42.10.17.00.00
-unspsc7#42.10.17.13.00#Radio immunoassay (RIA) test kits#42.10.17.00.00
-unspsc7#42.10.17.14.00#Polio case investigation kit#42.10.17.00.00
-unspsc7#42.10.17.15.00#Urine blood test strips#42.10.17.00.00
-unspsc7#42.10.17.16.00#Cell size analyzers#42.10.17.00.00
-unspsc7#42.10.17.17.00#Whole body counters#42.10.17.00.00
-unspsc7#42.10.17.18.00#Biomedical counters#42.10.17.00.00
-unspsc7#42.10.17.19.00#Medical multiprobe system counters#42.10.17.00.00
-unspsc7#42.10.17.20.00#Allergy or diagnostic kits#42.10.17.00.00
-unspsc7#42.10.17.21.00#Urinary test set#42.10.17.00.00
-unspsc7#42.10.17.22.00#Differential cell counters#42.10.17.00.00
-unspsc7#42.10.17.23.00#Plasma viscosity measurement#42.10.17.00.00
-unspsc7#42.10.17.24.00#Platelet analysis#42.10.17.00.00
-unspsc7#42.10.17.25.00#Blood glucose meters#42.10.17.00.00
-unspsc7#42.10.17.26.00#Hemoculture tests#42.10.17.00.00
-unspsc7#42.10.17.27.00#Bodyfat analysers#42.10.17.00.00
-unspsc7#42.10.17.28.00#Sample collection systems#42.10.17.00.00
-unspsc7#42.10.18.00.00#X ray and alpha and beta and gamma radiation apparatus#42.10.00.00.00
-unspsc7#42.10.18.01.00#Diagnostic x ray equipment#42.10.18.00.00
-unspsc7#42.10.18.02.00#Radiotherapy simulator#42.10.18.00.00
-unspsc7#42.10.18.03.00#Calibration equipment#42.10.18.00.00
-unspsc7#42.10.18.04.00#Biomedical research support units#42.10.18.00.00
-unspsc7#42.10.18.05.00#Computed tomography (CT) scanners#42.10.18.00.00
-unspsc7#42.10.18.06.00#Water phantoms#42.10.18.00.00
-unspsc7#42.10.18.07.00#Radiobiological instruments#42.10.18.00.00
-unspsc7#42.10.18.08.00#Gamma scintillators#42.10.18.00.00
-unspsc7#42.10.18.09.00#Gamma cameras#42.10.18.00.00
-unspsc7#42.10.18.10.00#Linear accelerators#42.10.18.00.00
-unspsc7#42.10.18.11.00#Radiotherapy brachytherapy equipment#42.10.18.00.00
-unspsc7#42.10.18.12.00#Radiotherapy teletherapy cobalt 60 machine#42.10.18.00.00
-unspsc7#42.10.18.13.00#Radiotherapy teletherapy superficial x ray machine#42.10.18.00.00
-unspsc7#42.10.18.14.00#Radiotherapy teletherapy orthovoltage x ray machine#42.10.18.00.00
-unspsc7#42.10.18.15.00#Radiotherapy teletherapy linear accelerators#42.10.18.00.00
-unspsc7#42.10.18.16.00#Radioisotope scanners for medical purposes#42.10.18.00.00
-unspsc7#42.10.18.17.00#Dental x ray units#42.10.18.00.00
-unspsc7#42.10.18.18.00#Angiography supplies#42.10.18.00.00
-unspsc7#42.10.18.19.00#Angiography devices#42.10.18.00.00
-unspsc7#42.10.18.20.00#Angioplasty supplies#42.10.18.00.00
-unspsc7#42.10.18.21.00#Angioplasty devices#42.10.18.00.00
-unspsc7#42.10.19.00.00#Oxygen therapy equipment#42.10.00.00.00
-unspsc7#42.10.19.01.00#Inhalation equipment#42.10.19.00.00
-unspsc7#42.10.19.02.00#Medical humidifiers#42.10.19.00.00
-unspsc7#42.10.19.03.00#Resuscitators or respirators#42.10.19.00.00
-unspsc7#42.10.19.04.00#Aspirators#42.10.19.00.00
-unspsc7#42.10.19.05.00#Insufflators#42.10.19.00.00
-unspsc7#42.10.19.06.00#Resuscitation emergency outfits#42.10.19.00.00
-unspsc7#42.10.19.07.00#Nebulizers#42.10.19.00.00
-unspsc7#42.10.19.08.00#Aerosol therapy apparatus#42.10.19.00.00
-unspsc7#42.10.19.09.00#Medical ventilation systems#42.10.19.00.00
-unspsc7#42.10.19.10.00#Masks or breathing bags#42.10.19.00.00
-unspsc7#42.10.19.11.00#Heart lung apparatus#42.10.19.00.00
-unspsc7#42.10.19.12.00#Breathing device with hygienic barrier#42.10.19.00.00
-unspsc7#42.10.19.13.00#Oxygen masks#42.10.19.00.00
-unspsc7#42.10.19.14.00#Mobile suction unit#42.10.19.00.00
-unspsc7#42.10.19.15.00#Hyperbaric treatment chamber#42.10.19.00.00
-unspsc7#42.10.19.16.00#Oxygenators#42.10.19.00.00
-unspsc7#42.10.19.17.00#Air oxygen units#42.10.19.00.00
-unspsc7#42.10.20.00.00#Medical and surgical and laboratory sterilizers#42.10.00.00.00
-unspsc7#42.10.20.01.00#Autoclaves#42.10.20.00.00
-unspsc7#42.10.20.02.00#Steam sterilizers#42.10.20.00.00
-unspsc7#42.10.20.03.00#Boiling disinfectors#42.10.20.00.00
-unspsc7#42.10.20.04.00#Hot air sterilizers#42.10.20.00.00
-unspsc7#42.10.20.05.00#Chemical sterilizers#42.10.20.00.00
-unspsc7#42.10.20.06.00#Laboratory sterilizers#42.10.20.00.00
-unspsc7#42.10.20.07.00#Sterilization ovens#42.10.20.00.00
-unspsc7#42.10.20.08.00#Germicidal lamps#42.10.20.00.00
-unspsc7#42.10.20.09.00#Sterilizing lamps#42.10.20.00.00
-unspsc7#42.10.20.10.00#Decontamination washing equipment#42.10.20.00.00
-unspsc7#42.10.21.00.00#Surgical sets and instruments#42.10.00.00.00
-unspsc7#42.10.21.01.00#Cryo surgery equipment#42.10.21.00.00
-unspsc7#42.10.21.02.00#Autopsy instruments#42.10.21.00.00
-unspsc7#42.10.21.03.00#Suction units or parts#42.10.21.00.00
-unspsc7#42.10.21.04.00#Surgical lasers#42.10.21.00.00
-unspsc7#42.10.21.05.00#Electro cautery surgical equipment#42.10.21.00.00
-unspsc7#42.10.21.06.00#Ear or nose or throat (ENT) surgery instruments#42.10.21.00.00
-unspsc7#42.10.21.07.00#Gynecological surgery instruments#42.10.21.00.00
-unspsc7#42.10.21.08.00#Cardiology surgery instruments#42.10.21.00.00
-unspsc7#42.10.21.09.00#Micro surgery instruments#42.10.21.00.00
-unspsc7#42.10.21.10.00#Orthopedic surgery instruments#42.10.21.00.00
-unspsc7#42.10.21.11.00#Suture clips#42.10.21.00.00
-unspsc7#42.10.21.12.00#Dissecting instruments#42.10.21.00.00
-unspsc7#42.10.21.13.00#Dissecting pins#42.10.21.00.00
-unspsc7#42.10.21.14.00#Implant systems#42.10.21.00.00
-unspsc7#42.10.21.15.00#Blood lancets#42.10.21.00.00
-unspsc7#42.10.21.16.00#Scalpels#42.10.21.00.00
-unspsc7#42.10.21.17.00#Surgical blades#42.10.21.00.00
-unspsc7#42.10.21.18.00#Cranioclasts#42.10.21.00.00
-unspsc7#42.10.21.19.00#Surgical scissors#42.10.21.00.00
-unspsc7#42.10.21.20.00#Surgical shears#42.10.21.00.00
-unspsc7#42.10.21.21.00#Surgical drills#42.10.21.00.00
-unspsc7#42.10.21.22.00#Surgical wire saws#42.10.21.00.00
-unspsc7#42.10.21.23.00#Surgical perforators#42.10.21.00.00
-unspsc7#42.10.21.24.00#Curettes#42.10.21.00.00
-unspsc7#42.10.21.25.00#Surgical clamps#42.10.21.00.00
-unspsc7#42.10.21.26.00#Surgical instrument holders#42.10.21.00.00
-unspsc7#42.10.21.27.00#Surgical elevators#42.10.21.00.00
-unspsc7#42.10.21.28.00#Raspatory instruments#42.10.21.00.00
-unspsc7#42.10.21.29.00#Forceps#42.10.21.00.00
-unspsc7#42.10.21.30.00#Surgical retractors#42.10.21.00.00
-unspsc7#42.10.21.31.00#Surgical spreaders#42.10.21.00.00
-unspsc7#42.10.21.32.00#Uterine sound instruments#42.10.21.00.00
-unspsc7#42.10.21.33.00#Dilators#42.10.21.00.00
-unspsc7#42.10.21.34.00#Surgical dishes or pots#42.10.21.00.00
-unspsc7#42.10.21.35.00#Surgical probes#42.10.21.00.00
-unspsc7#42.10.21.36.00#Surgical mallets#42.10.21.00.00
-unspsc7#42.10.21.37.00#Decapitation hooks#42.10.21.00.00
-unspsc7#42.10.21.38.00#Sutures#42.10.21.00.00
-unspsc7#42.10.21.39.00#Catgut chromic sutures#42.10.21.00.00
-unspsc7#42.10.21.40.00#Laryngoscopes#42.10.21.00.00
-unspsc7#42.10.21.41.00#Surgical shaving kits#42.10.21.00.00
-unspsc7#42.10.22.00.00#Rehabilitation equipment and accessories#42.10.00.00.00
-unspsc7#42.10.22.01.00#Splints#42.10.22.00.00
-unspsc7#42.10.22.02.00#Psychological aptitude testing apparatus#42.10.22.00.00
-unspsc7#42.10.22.03.00#Massage apparatus#42.10.22.00.00
-unspsc7#42.10.22.04.00#Traction pulleys or belts or weights#42.10.22.00.00
-unspsc7#42.10.22.05.00#Physical therapy rehabilitation equipment or accessories#42.10.22.00.00
-unspsc7#42.10.22.06.00#Overbed frames#42.10.22.00.00
-unspsc7#42.10.22.07.00#Rehabilitation stimulators#42.10.22.00.00
-unspsc7#42.10.22.08.00#Patient lifters#42.10.22.00.00
-unspsc7#42.10.22.09.00#Short wave diathermy equipment#42.10.22.00.00
-unspsc7#42.10.22.10.00#Moist heat therapy equipment#42.10.22.00.00
-unspsc7#42.10.22.11.00#Heat or cold packs#42.10.22.00.00
-unspsc7#42.10.22.12.00#Physiological equipment#42.10.22.00.00
-unspsc7#42.10.22.13.00#Stimulators#42.10.22.00.00
-unspsc7#42.10.22.14.00#Rehabilitation supplies for the blind#42.10.22.00.00
-unspsc7#42.10.22.15.00#Electromyograph#42.10.22.00.00
-unspsc7#42.10.22.16.00#Rehabilitation supplies for speech handicapped#42.10.22.00.00
-unspsc7#42.10.22.17.00#Electro sleep apparatus#42.10.22.00.00
-unspsc7#42.10.22.18.00#Visual exercise training aids#42.10.22.00.00
-unspsc7#42.10.22.19.00#Orthopedic cushions#42.10.22.00.00
-unspsc7#42.10.23.00.00#Ophthalmology instruments and appliances#42.10.00.00.00
-unspsc7#42.10.23.01.00#Opthalmological punches#42.10.23.00.00
-unspsc7#42.10.23.02.00#Photocoagulators#42.10.23.00.00
-unspsc7#42.10.23.03.00#Slit lamps#42.10.23.00.00
-unspsc7#42.10.23.04.00#Perimeters#42.10.23.00.00
-unspsc7#42.10.23.05.00#Tonometers#42.10.23.00.00
-unspsc7#42.10.23.06.00#Retinometers#42.10.23.00.00
-unspsc7#42.10.23.07.00#Eyewashers#42.10.23.00.00
-unspsc7#42.10.23.08.00#Ophthalmometers#42.10.23.00.00
-unspsc7#42.10.23.09.00#Ophthalmoscopes#42.10.23.00.00
-unspsc7#42.10.23.10.00#Emergency eye care equipment#42.10.23.00.00
-unspsc7#42.10.23.11.00#Keratometers#42.10.23.00.00
-unspsc7#42.10.23.12.00#Vision testers#42.10.23.00.00
-unspsc7#42.10.23.13.00#Synotoscopes#42.10.23.00.00
-unspsc7#42.10.23.14.00#Ophthalmic operation instruments#42.10.23.00.00
-unspsc7#42.10.24.00.00#Gynecological and obstetrical instruments#42.10.00.00.00
-unspsc7#42.10.24.01.00#Intra uterine device (IUD) insertion kits#42.10.24.00.00
-unspsc7#42.10.24.02.00#Tubal ligation kits#42.10.24.00.00
-unspsc7#42.10.24.03.00#Vasectomy kits#42.10.24.00.00
-unspsc7#42.10.24.04.00#Laparoscopic equipment#42.10.24.00.00
-unspsc7#42.10.24.05.00#Silastic bands#42.10.24.00.00
-unspsc7#42.10.24.06.00#Menstruation regulation kits#42.10.24.00.00
-unspsc7#42.10.24.07.00#Spermokinesemeter#42.10.24.00.00
-unspsc7#42.10.24.08.00#Uterine or gynecological tests#42.10.24.00.00
-unspsc7#42.10.24.09.00#Obstetrical retractors#42.10.24.00.00
-unspsc7#42.10.24.10.00#Umbilical tapes#42.10.24.00.00
-unspsc7#42.10.24.11.00#Breast pumps or accessories#42.10.24.00.00
-unspsc7#42.10.24.12.00#Midwife equipment or kits#42.10.24.00.00
-unspsc7#42.10.24.13.00#Hysteroscopic equipment#42.10.24.00.00
-unspsc7#42.10.24.14.00#Vaginoscope#42.10.24.00.00
-unspsc7#42.10.24.15.00#Urethroscope cysterscope#42.10.24.00.00
-unspsc7#42.10.24.16.00#Umbilical cord clamps#42.10.24.00.00
-unspsc7#42.10.24.17.00#Vacuum extractors#42.10.24.00.00
-unspsc7#42.10.24.18.00#In vitro fertilization equipment or supplies#42.10.24.00.00
-unspsc7#42.10.24.19.00#Endometrial biopsy equipment#42.10.24.00.00
-unspsc7#42.10.24.20.00#Intrauterine insemination catheters#42.10.24.00.00
-unspsc7#42.10.24.21.00#Pelvimeters#42.10.24.00.00
-unspsc7#42.10.25.00.00#Fiber optic examination instruments#42.10.00.00.00
-unspsc7#42.10.25.01.00#Light sources#42.10.25.00.00
-unspsc7#42.10.25.02.00#Endoscopy equipment#42.10.25.00.00
-unspsc7#42.10.25.03.00#Protoscopes#42.10.25.00.00
-unspsc7#42.10.25.04.00#Culdoscopes#42.10.25.00.00
-unspsc7#42.10.25.05.00#Gastroscopes#42.10.25.00.00
-unspsc7#42.10.25.06.00#Esophagoscope#42.10.25.00.00
-unspsc7#42.10.25.07.00#Sigmoidoscope#42.10.25.00.00
-unspsc7#42.10.25.08.00#Bronchoscope#42.10.25.00.00
-unspsc7#42.10.25.09.00#Colonoscope#42.10.25.00.00
-unspsc7#42.10.25.10.00#Arthroscope#42.10.25.00.00
-unspsc7#42.10.26.00.00#Electro diagnostic apparatus#42.10.00.00.00
-unspsc7#42.10.26.01.00#Electrocardiographs (ECGs)#42.10.26.00.00
-unspsc7#42.10.26.02.00#Cardioscopes#42.10.26.00.00
-unspsc7#42.10.26.03.00#Stereotactic systems#42.10.26.00.00
-unspsc7#42.10.26.04.00#Achillean reflexometer#42.10.26.00.00
-unspsc7#42.10.26.05.00#Thesiometer#42.10.26.00.00
-unspsc7#42.10.26.06.00#Pneumotachographs#42.10.26.00.00
-unspsc7#42.10.26.07.00#Biovideographs#42.10.26.00.00
-unspsc7#42.10.26.08.00#Physiological levers#42.10.26.00.00
-unspsc7#42.10.26.09.00#Nerve chamber equipment#42.10.26.00.00
-unspsc7#42.10.26.10.00#Ultrasonic diagnostic equipment#42.10.26.00.00
-unspsc7#42.10.26.11.00#Ultrasound scanners#42.10.26.00.00
-unspsc7#42.10.26.12.00#Doppler ultrasound equipment#42.10.26.00.00
-unspsc7#42.10.26.13.00#Ultrasonic surgery equipment or ultrasonic aspiration#42.10.26.00.00
-unspsc7#42.10.26.14.00#Ultrasound physiotherapy equipment#42.10.26.00.00
-unspsc7#42.10.26.15.00#Cardio sonars#42.10.26.00.00
-unspsc7#42.10.26.16.00#Short wave medical apparatus#42.10.26.00.00
-unspsc7#42.10.26.17.00#Blood pressure measuring equipment#42.10.26.00.00
-unspsc7#42.10.26.18.00#Electroencephalographs (EEGs)#42.10.26.00.00
-unspsc7#42.10.26.19.00#Spirometers#42.10.26.00.00
-unspsc7#42.10.26.20.00#Gynecological diagnostic equipment#42.10.26.00.00
-unspsc7#42.10.26.21.00#Colposcopes#42.10.26.00.00
-unspsc7#42.10.26.22.00#Amnioscopes#42.10.26.00.00
-unspsc7#42.10.26.23.00#Fetal monitors#42.10.26.00.00
-unspsc7#42.10.26.24.00#Delivery monitors#42.10.26.00.00
-unspsc7#42.10.26.25.00#Neonatal monitors#42.10.26.00.00
-unspsc7#42.10.26.26.00#Heart monitor systems#42.10.26.00.00
-unspsc7#42.10.26.27.00#Intensive care monitors#42.10.26.00.00
-unspsc7#42.10.26.28.00#Electromedical testing equipment#42.10.26.00.00
-unspsc7#42.10.26.29.00#Defibrillator tester#42.10.26.00.00
-unspsc7#42.10.26.30.00#Audiometer calibration tester#42.10.26.00.00
-unspsc7#42.10.26.31.00#Electrode or electromedical tester#42.10.26.00.00
-unspsc7#42.10.26.32.00#Ventilator test meters#42.10.26.00.00
-unspsc7#42.10.26.33.00#ECG patient simulators#42.10.26.00.00
-unspsc7#42.10.26.34.00#Electrosurgical analyzers#42.10.26.00.00
-unspsc7#42.10.26.35.00#Electromedical safety analyzers#42.10.26.00.00
-unspsc7#42.10.26.36.00#Electromedical test systems#42.10.26.00.00
-unspsc7#42.10.26.37.00#Electronic pulse monitors#42.10.26.00.00
-unspsc7#42.10.26.38.00#Vaginal ultrasound probe#42.10.26.00.00
-unspsc7#42.10.26.39.00#Medical conductive gels#42.10.26.00.00
-unspsc7#42.10.27.00.00#Dialysis equipment and instruments#42.10.00.00.00
-unspsc7#42.10.27.01.00#Blood bag sampler#42.10.27.00.00
-unspsc7#42.10.27.02.00#Blood warmer#42.10.27.00.00
-unspsc7#42.10.27.03.00#Dialysis instrument sets#42.10.27.00.00
-unspsc7#42.10.27.04.00#Peritoneal dialysis units#42.10.27.00.00
-unspsc7#42.10.27.05.00#Haemodialysis units#42.10.27.00.00
-unspsc7#42.10.27.06.00#Blood filters#42.10.27.00.00
-unspsc7#42.10.27.07.00#Blood separator stand#42.10.27.00.00
-unspsc7#42.10.27.08.00#Plasmaphoresis equipment#42.10.27.00.00
-unspsc7#42.10.27.09.00#Angiographic injectors#42.10.27.00.00
-unspsc7#42.10.27.10.00#Hemafilters#42.10.27.00.00
-unspsc7#42.10.27.11.00#Dialysis tubing or membranes#42.10.27.00.00
-unspsc7#42.10.27.12.00#Blood oxygen demand apparatus#42.10.27.00.00
-unspsc7#42.10.27.13.00#Clot coagulation detection systems#42.10.27.00.00
-unspsc7#42.10.27.14.00#Medical drains or drainage kits#42.10.27.00.00
-unspsc7#42.10.27.15.00#Kymographs#42.10.27.00.00
-unspsc7#42.10.27.16.00#Blood sampling equipment#42.10.27.00.00
-unspsc7#42.10.28.00.00#Dental instruments and appliances#42.10.00.00.00
-unspsc7#42.10.28.01.00#Dental mixing slabs#42.10.28.00.00
-unspsc7#42.10.28.02.00#Bands for dental matrix#42.10.28.00.00
-unspsc7#42.10.28.03.00#Dental retainers#42.10.28.00.00
-unspsc7#42.10.28.04.00#Dental handpieces#42.10.28.00.00
-unspsc7#42.10.28.05.00#Dental cryosurgical instrumentation#42.10.28.00.00
-unspsc7#42.10.28.06.00#Dental formers#42.10.28.00.00
-unspsc7#42.10.28.07.00#Periodontium control instruments or periotest#42.10.28.00.00
-unspsc7#42.10.28.08.00#Dental trays#42.10.28.00.00
-unspsc7#42.10.28.09.00#Dental probes#42.10.28.00.00
-unspsc7#42.10.28.10.00#Dental scales#42.10.28.00.00
-unspsc7#42.10.28.11.00#Dental spatulas#42.10.28.00.00
-unspsc7#42.10.28.12.00#Dental elevators#42.10.28.00.00
-unspsc7#42.10.28.13.00#Dental excavators#42.10.28.00.00
-unspsc7#42.10.28.14.00#Dental finger protectors#42.10.28.00.00
-unspsc7#42.10.28.15.00#Dental tweezers#42.10.28.00.00
-unspsc7#42.10.28.16.00#Dental scissors#42.10.28.00.00
-unspsc7#42.10.28.17.00#Dental forceps#42.10.28.00.00
-unspsc7#42.10.28.18.00#Dental mirrors#42.10.28.00.00
-unspsc7#42.10.28.19.00#Orthodontic appliances#42.10.28.00.00
-unspsc7#42.10.28.20.00#Dental impression trays#42.10.28.00.00
-unspsc7#42.10.28.21.00#Dental syringes or needles#42.10.28.00.00
-unspsc7#42.10.28.22.00#Dental drills#42.10.28.00.00
-unspsc7#42.10.28.23.00#Endodontics accessories#42.10.28.00.00
-unspsc7#42.10.29.00.00#Cardiology equipment and supplies#42.10.00.00.00
-unspsc7#42.10.29.01.00#Heart valves#42.10.29.00.00
-unspsc7#42.10.29.02.00#Heart catheters#42.10.29.00.00
-unspsc7#42.10.29.03.00#Defribilators#42.10.29.00.00
-unspsc7#42.10.29.04.00#Aortic balloon equipment#42.10.29.00.00
-unspsc7#42.10.29.05.00#Pacemakers#42.10.29.00.00
-unspsc7#42.10.30.00.00#Medical consumables#42.10.00.00.00
-unspsc7#42.10.30.01.00#Blood or intravenous (IV) bottles or bags#42.10.30.00.00
-unspsc7#42.10.30.02.00#Tongue depressors#42.10.30.00.00
-unspsc7#42.10.30.03.00#Suture needles#42.10.30.00.00
-unspsc7#42.10.30.04.00#Biopsy needles#42.10.30.00.00
-unspsc7#42.10.30.05.00#Biopsy capsules or punches#42.10.30.00.00
-unspsc7#42.10.30.06.00#Dissecting needles#42.10.30.00.00
-unspsc7#42.10.30.07.00#Acupuncture needles#42.10.30.00.00
-unspsc7#42.10.30.08.00#Medical disposal containers#42.10.30.00.00
-unspsc7#42.10.30.09.00#Haematocrit tubes#42.10.30.00.00
-unspsc7#42.10.30.10.00#Swabs#42.10.30.00.00
-unspsc7#42.10.30.11.00#Blood transfusion needles or cannulae#42.10.30.00.00
-unspsc7#42.10.30.12.00#Transfer swabs or applicators#42.10.30.00.00
-unspsc7#42.10.30.13.00#Urine bags#42.10.30.00.00
-unspsc7#42.10.30.14.00#Specimen containers#42.10.30.00.00
-unspsc7#42.10.30.15.00#Plaster of paris#42.10.30.00.00
-unspsc7#42.10.30.16.00#Sterile strips#42.10.30.00.00
-unspsc7#42.10.30.17.00#Gauze cloth#42.10.30.00.00
-unspsc7#42.10.30.18.00#Cotton wool#42.10.30.00.00
-unspsc7#42.10.30.19.00#Sterile surgical compresses#42.10.30.00.00
-unspsc7#42.10.30.20.00#Bandages#42.10.30.00.00
-unspsc7#42.10.30.21.00#First aid kits or kit refills#42.10.30.00.00
-unspsc7#42.10.30.22.00#Hypodermic syringes#42.10.30.00.00
-unspsc7#42.10.30.23.00#Cotton swabs on sticks#42.10.30.00.00
-unspsc7#42.10.30.24.00#Infusion sets#42.10.30.00.00
-unspsc7#42.10.30.25.00#Nasogastric tubes#42.10.30.00.00
-unspsc7#42.10.30.26.00#Destruction clips#42.10.30.00.00
-unspsc7#42.10.30.27.00#Dressings#42.10.30.00.00
-unspsc7#42.10.30.28.00#Implantable drug delivery systems#42.10.30.00.00
-unspsc7#42.10.30.29.00#Automatic mass vaccinators#42.10.30.00.00
-unspsc7#42.10.30.30.00#Pipetting syringes#42.10.30.00.00
-unspsc7#42.10.30.31.00#Scalp vein needles or stopcocks#42.10.30.00.00
-unspsc7#42.10.30.32.00#Hypodermic needles#42.10.30.00.00
-unspsc7#42.10.30.33.00#Medical jet injectors#42.10.30.00.00
-unspsc7#42.10.30.34.00#Lancets#42.10.30.00.00
-unspsc7#42.10.30.35.00#Catheter for infusion#42.10.30.00.00
-unspsc7#42.10.30.36.00#Intavenous (IV) equipment tubes#42.10.30.00.00
-unspsc7#42.10.30.37.00#Eyewash solutions#42.10.30.00.00
-unspsc7#42.10.30.38.00#Examination gloves#42.10.30.00.00
-unspsc7#42.10.30.39.00#Pathogen cleanup kits#42.10.30.00.00
-unspsc7#42.10.30.40.00#Diabetic syringes#42.10.30.00.00
-unspsc7#42.10.30.41.00#Diabetic pen needles#42.10.30.00.00
-unspsc7#42.10.30.42.00#Lancet device#42.10.30.00.00
-unspsc7#42.11.00.00.00#Assistive and corrective devices for people with disabilities#42.00.00.00.00
-unspsc7#42.11.15.00.00#Prostheses and parts thereof#42.11.00.00.00
-unspsc7#42.11.15.01.00#Ankle or foot orthoses#42.11.15.00.00
-unspsc7#42.11.15.02.00#Cervical orthoses#42.11.15.00.00
-unspsc7#42.11.15.03.00#Cervico thoratic orthoses#42.11.15.00.00
-unspsc7#42.11.15.04.00#Cervico thoratic lumbo sacral orthoses#42.11.15.00.00
-unspsc7#42.11.15.05.00#Elbow orthoses#42.11.15.00.00
-unspsc7#42.11.15.06.00#Elbow wrist orthoses#42.11.15.00.00
-unspsc7#42.11.15.07.00#Finger orthoses#42.11.15.00.00
-unspsc7#42.11.15.08.00#Foot orthoses#42.11.15.00.00
-unspsc7#42.11.15.09.00#Hand orthoses#42.11.15.00.00
-unspsc7#42.11.15.10.00#Hip orthoses#42.11.15.00.00
-unspsc7#42.11.15.11.00#Hip knee ankle foot orthoses#42.11.15.00.00
-unspsc7#42.11.15.12.00#Hip or knee or ankle orthoses joints#42.11.15.00.00
-unspsc7#42.11.15.13.00#Shoulder or elbow or wrist orthoses joints#42.11.15.00.00
-unspsc7#42.11.15.14.00#Knee orthoses#42.11.15.00.00
-unspsc7#42.11.15.15.00#Knee ankle foot orthoses#42.11.15.00.00
-unspsc7#42.11.15.16.00#Lumbo or sacral orthoses#42.11.15.00.00
-unspsc7#42.11.15.17.00#Sacro iliac orthoses#42.11.15.00.00
-unspsc7#42.11.15.18.00#Shoulder or elbow or wrist or hand orthoses#42.11.15.00.00
-unspsc7#42.11.15.19.00#Thoraco or lumbo or sacral orthoses#42.11.15.00.00
-unspsc7#42.11.15.20.00#Wrist orthoses#42.11.15.00.00
-unspsc7#42.11.15.21.00#Wrist or hand orthoses#42.11.15.00.00
-unspsc7#42.11.15.22.00#Wrist or hand or finger orthoses#42.11.15.00.00
-unspsc7#42.11.15.23.00#Ankle disarticulation prostheses#42.11.15.00.00
-unspsc7#42.11.15.24.00#Aural prostheses#42.11.15.00.00
-unspsc7#42.11.15.25.00#Cosmetic or skin covering prostheses#42.11.15.00.00
-unspsc7#42.11.15.26.00#Elbow disarticulation prostheses#42.11.15.00.00
-unspsc7#42.11.15.27.00#Hip disarticulation prostheses#42.11.15.00.00
-unspsc7#42.11.15.28.00#Hook or functional tool prostheses#42.11.15.00.00
-unspsc7#42.11.15.29.00#Knee or hip joint prostheses or torque reducers#42.11.15.00.00
-unspsc7#42.11.15.30.00#Wrist or elbow joint prostheses#42.11.15.00.00
-unspsc7#42.11.15.31.00#Knee disarticulation prostheses#42.11.15.00.00
-unspsc7#42.11.15.32.00#Mammary prostheses#42.11.15.00.00
-unspsc7#42.11.15.33.00#Nasal prostheses#42.11.15.00.00
-unspsc7#42.11.15.34.00#Ocular prostheses#42.11.15.00.00
-unspsc7#42.11.15.35.00#Back filler prostheses#42.11.15.00.00
-unspsc7#42.11.15.36.00#Palate prostheses#42.11.15.00.00
-unspsc7#42.11.15.37.00#Partial foot including toe prostheses#42.11.15.00.00
-unspsc7#42.11.15.38.00#Partial hand including finger prostheses#42.11.15.00.00
-unspsc7#42.11.15.39.00#Shoulder disarticulation prostheses#42.11.15.00.00
-unspsc7#42.11.15.40.00#Socket or alignment unit prostheses#42.11.15.00.00
-unspsc7#42.11.15.41.00#Temporary prostheses for early mobilization of lower limb amputees#42.11.15.00.00
-unspsc7#42.11.15.42.00#Transfemoral prostheses#42.11.15.00.00
-unspsc7#42.11.15.43.00#Transhumeral prostheses#42.11.15.00.00
-unspsc7#42.11.15.44.00#Transradial prostheses#42.11.15.00.00
-unspsc7#42.11.15.45.00#Transtibial including ankle or foot device prostheses#42.11.15.00.00
-unspsc7#42.11.15.46.00#Wrist disarticulation prostheses#42.11.15.00.00
-unspsc7#42.11.15.47.00#Prosthetic hands#42.11.15.00.00
-unspsc7#42.11.15.48.00#Vascular prostheses#42.11.15.00.00
-unspsc7#42.11.16.00.00#Communication and educational material for people with disabilities#42.11.00.00.00
-unspsc7#42.11.16.01.00#Braille writing paper or plastic#42.11.16.00.00
-unspsc7#42.11.16.02.00#Switchboards for people with disabilities#42.11.16.00.00
-unspsc7#42.11.16.03.00#Character reading machines for people with disabilities#42.11.16.00.00
-unspsc7#42.11.16.04.00#Synthetic speech devices for people with disabilities#42.11.16.00.00
-unspsc7#42.11.16.05.00#Tactile displays for people with disabilities#42.11.16.00.00
-unspsc7#42.11.16.06.00#Letter or symbol boards for people with disabilities#42.11.16.00.00
-unspsc7#42.11.16.07.00#Dialogue units for people with disabilities#42.11.16.00.00
-unspsc7#42.11.16.08.00#Voice generators for people with disabilities#42.11.16.00.00
-unspsc7#42.11.16.09.00#Voice amplifiers for people with disabilities#42.11.16.00.00
-unspsc7#42.11.16.10.00#Hearing aids#42.11.16.00.00
-unspsc7#42.11.16.11.00#Writing frames for people with disabilities#42.11.16.00.00
-unspsc7#42.11.16.12.00#Rain indicators for people with disabilities#42.11.16.00.00
-unspsc7#42.11.16.13.00#Light indicators for people with disabilities#42.11.16.00.00
-unspsc7#42.11.16.14.00#Sound indicators for people with disabilities#42.11.16.00.00
-unspsc7#42.11.16.15.00#Speech training aids for people with disabilities#42.11.16.00.00
-unspsc7#42.11.16.16.00#Language training aids for people with disabilities#42.11.16.00.00
-unspsc7#42.11.16.17.00#Braille equipment#42.11.16.00.00
-unspsc7#42.11.16.18.00#Book or manuscript holders for people with disabilities#42.11.16.00.00
-unspsc7#42.11.16.19.00#Page turners for people with disabilities#42.11.16.00.00
-unspsc7#42.11.16.20.00#Signature guides or stamps for people with disabilities#42.11.16.00.00
-unspsc7#42.11.16.21.00#Ergonomically designed stationery aids for people with disabilities#42.11.16.00.00
-unspsc7#42.11.17.00.00#Furniture and accessories for people with disabilities#42.11.00.00.00
-unspsc7#42.11.17.01.00#Pressure sore prevention furniture#42.11.17.00.00
-unspsc7#42.11.17.02.00#Pressure sore prevention mattresses or coverings#42.11.17.00.00
-unspsc7#42.11.17.03.00#Backpads or backrests or similar adaptations for people with disabilities#42.11.17.00.00
-unspsc7#42.11.17.04.00#Arm rests for people with disabilities#42.11.17.00.00
-unspsc7#42.11.17.05.00#Bed extensions for people with disabilities#42.11.17.00.00
-unspsc7#42.11.17.06.00#Bed lifts for people with disabilities#42.11.17.00.00
-unspsc7#42.11.17.07.00#Bed shortening aids for people with disabilities#42.11.17.00.00
-unspsc7#42.11.17.08.00#Ergonomicall designed beds for people with disabilities#42.11.17.00.00
-unspsc7#42.11.17.09.00#Blanket supports for people with disabilities#42.11.17.00.00
-unspsc7#42.11.17.10.00#Mechanized chairs to assist with sitting or standing for people with disabilities#42.11.17.00.00
-unspsc7#42.11.17.11.00#Coxit or arthrodesis chairs for people with disabilities#42.11.17.00.00
-unspsc7#42.11.17.12.00#Leg extenders for people with disabilities#42.11.17.00.00
-unspsc7#42.11.17.13.00#Leg supports for people with disabilities#42.11.17.00.00
-unspsc7#42.11.17.14.00#Modular or special sitting furniture systems for people with disabilities#42.11.17.00.00
-unspsc7#42.11.17.15.00#Height adjustable plinths or brackets for people with disabilities#42.11.17.00.00
-unspsc7#42.11.17.16.00#Ergonomically designed tables for people with disabilities#42.11.17.00.00
-unspsc7#42.11.18.00.00#Personal care devices for people with disabilities#42.11.00.00.00
-unspsc7#42.11.18.01.00#Aids to assist in dressing ones self for people with disabilities#42.11.18.00.00
-unspsc7#42.11.18.02.00#Aids for washing ones self for people with disabilities#42.11.18.00.00
-unspsc7#42.11.18.03.00#Aids for drying ones self for people with disabilities#42.11.18.00.00
-unspsc7#42.11.18.04.00#Bathing stretchers or shower tables for people with disabilities#42.11.18.00.00
-unspsc7#42.11.18.05.00#Diaper changing tables for people with disabilities#42.11.18.00.00
-unspsc7#42.11.18.06.00#Bedpans or commode chairs for people with disabilities#42.11.18.00.00
-unspsc7#42.11.18.07.00#Buttoning or fastening devices for people with disabilities#42.11.18.00.00
-unspsc7#42.11.18.08.00#Extended handle combs or brushes for people with disabilities#42.11.18.00.00
-unspsc7#42.11.18.09.00#Toilet attached douches or air dryers for people with disabilities#42.11.18.00.00
-unspsc7#42.11.18.10.00#Toilet seats for people with disabilities#42.11.18.00.00
-unspsc7#42.11.18.11.00#Hand grip toothbrushes for people with disabilities#42.11.18.00.00
-unspsc7#42.11.18.12.00#Body worn urine absorbing aids for people with disabilities#42.11.18.00.00
-unspsc7#42.11.18.13.00#Urine collection systems for people with disabilities#42.11.18.00.00
-unspsc7#42.11.18.14.00#Incontinence alarms for people with disabilities#42.11.18.00.00
-unspsc7#42.11.18.15.00#Ostomy bags or accessories for people with disabilities#42.11.18.00.00
-unspsc7#42.11.19.00.00#Protection and mobility devices for people with disabilities#42.11.00.00.00
-unspsc7#42.11.19.01.00#Crutches#42.11.19.00.00
-unspsc7#42.11.19.02.00#Tripods or quadropods#42.11.19.00.00
-unspsc7#42.11.19.03.00#Walking sticks accessories or parts thereof#42.11.19.00.00
-unspsc7#42.11.19.04.00#Rollators#42.11.19.00.00
-unspsc7#42.11.19.05.00#Walkers#42.11.19.00.00
-unspsc7#42.11.19.06.00#Wheelchairs#42.11.19.00.00
-unspsc7#42.11.19.07.00#Wheelchair accessories#42.11.19.00.00
-unspsc7#42.11.19.08.00#Support rails for people with disabilities#42.11.19.00.00
-unspsc7#42.11.19.09.00#Rope ladders or lifting belts or harnesses for people with disabilities#42.11.19.00.00
-unspsc7#42.11.19.10.00#Lifting or turning cushions carpets or sheets for people with disabilities#42.11.19.00.00
-unspsc7#42.11.19.11.00#Hoists or trolleys for people with disabities#42.11.19.00.00
-unspsc7#42.11.19.12.00#Wheelchair ramps#42.11.19.00.00
-unspsc7#42.11.19.13.00#Wheelchair lifting platforms#42.11.19.00.00
-unspsc7#42.11.19.14.00#Navigation or orientation aids for people with disabilities#42.11.19.00.00
-unspsc7#42.11.19.15.00#Chair lifts or chair transporters for people with disabilities#42.11.19.00.00
-unspsc7#42.11.19.16.00#Warning or alarm devices for people with disabilities#42.11.19.00.00
-unspsc7#42.11.19.17.00#Airway protection aids for people with disabilities#42.11.19.00.00
-unspsc7#42.11.19.18.00#Ear or hearing protection aids for people with disabilities#42.11.19.00.00
-unspsc7#42.11.19.19.00#Face or eye protection aids for people with disabilities#42.11.19.00.00
-unspsc7#42.11.19.20.00#Hand or arm or elbow protection aids for people with disabilities#42.11.19.00.00
-unspsc7#42.11.19.21.00#Head protection aids for people with disabilities#42.11.19.00.00
-unspsc7#42.11.19.22.00#Lower extremity protection aids for people with disabilities#42.11.19.00.00
-unspsc7#42.11.19.23.00#Bathtub length or width reduction aids for people with disabilities#42.11.19.00.00
-unspsc7#42.11.19.24.00#Trunk or whole body protection aids for people with disabilities#42.11.19.00.00
-unspsc7#42.11.19.25.00#Body support units for hoists for people with disabilities#42.11.19.00.00
-unspsc7#42.11.19.26.00#Door warners for people with disabilities#42.11.19.00.00
-unspsc7#42.11.19.27.00#Floatation or swmming aids for people with disabilities#42.11.19.00.00
-unspsc7#42.11.19.28.00#Relief maps for people with disabilities#42.11.19.00.00
-unspsc7#42.11.19.29.00#Non cosmetic skin cleaning or protective products for people with disabilities#42.11.19.00.00
-unspsc7#42.11.19.30.00#Stationary hoists for people with disabilities#42.11.19.00.00
-unspsc7#42.11.19.31.00#Stoma shields or protectors#42.11.19.00.00
-unspsc7#42.11.19.32.00#Tactile sticks for people with disabilities#42.11.19.00.00
-unspsc7#42.11.19.33.00#Toilet arm or backrests for people with disabilities#42.11.19.00.00
-unspsc7#42.11.20.00.00#Recreational and training aids for people with disabilities#42.11.00.00.00
-unspsc7#42.11.20.01.00#Camping equipment for people with disabilities#42.11.20.00.00
-unspsc7#42.11.20.02.00#Tilting tables for balance training for people with disabilities#42.11.20.00.00
-unspsc7#42.11.20.03.00#Biofeedback devices for movement strength or balance for people with disabilities#42.11.20.00.00
-unspsc7#42.11.20.04.00#Sports exercise aids for people with disabilities#42.11.20.00.00
-unspsc7#42.11.20.05.00#Fishing or hunting aids for people with disabilities#42.11.20.00.00
-unspsc7#42.11.20.06.00#Playing or training balls for people with disabilities#42.11.20.00.00
-unspsc7#42.11.20.07.00#Chess for people with disabilities#42.11.20.00.00
-unspsc7#42.11.20.08.00#Playing cards or holders for people with disabilities#42.11.20.00.00
-unspsc7#42.11.20.09.00#Gardening tools or aids for people with disabilities#42.11.20.00.00
-unspsc7#42.11.20.10.00#Handicraft tools materials or equipment for people with disabilities#42.11.20.00.00
-unspsc7#42.11.20.11.00#Photographic equipment or aids for people with disabilities#42.11.20.00.00
-unspsc7#42.11.20.12.00#Caravanning equipment for people with disabilities#42.11.20.00.00
-unspsc7#42.11.20.13.00#Vibrating chairs for training deaf people#42.11.20.00.00
-unspsc7#42.11.21.00.00#Specialized aids for housekeeping and handling goods and measuring for people with disabilities#42.11.00.00.00
-unspsc7#42.11.21.01.00#Weighing or measuring aids or people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.02.00#Cutting or chopping or dividing aids or people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.03.00#Cleaning or peeling aids for people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.04.00#Baking or cooking or frying aids for people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.05.00#Food or drink service aids for people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.06.00#Food stoppers or funnels for people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.07.00#Tableware for people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.08.00#Pusher edges or plate buffers for people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.09.00#Feeding apparatus for people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.10.00#Feeding probes for people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.11.00#Shoe cleaning apparatus for people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.12.00#Sewing or knitting or crocheting or darning aids for people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.13.00#Bottle or can or container openers for people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.14.00#Tube squeezing keys for people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.15.00#Grasping aids to assist or replace hand or finger function for people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.16.00#Grip adapters or attachments for people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.17.00#Body worn holders to assist hand or finger function for people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.18.00#Stands to assist hand or finger function for people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.19.00#Operating sticks such as head or chin or mouth sticks for people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.20.00#Extenders without grip function for people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.21.00#Fixed positioning systems for people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.22.00#Balances or equipment for hoisting or balancing objects for people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.23.00#Manipulators for people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.24.00#Robots to assist people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.25.00#Indicators such as signal lights or buzzers for people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.26.00#Pointing lamps for people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.27.00#Measuring aids or tools for people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.28.00#Object positioning lifting or tilting systems for people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.29.00#Manual extended reach gripping tongs for people with disabilities#42.11.21.00.00
-unspsc7#42.12.00.00.00#Veterinary equipment and supplies#42.00.00.00.00
-unspsc7#42.12.15.00.00#Veterinary equipment#42.12.00.00.00
-unspsc7#42.12.15.01.00#Veterinary blood pressure testers#42.12.15.00.00
-unspsc7#42.12.15.02.00#Veterinary kymograph tester#42.12.15.00.00
-unspsc7#42.12.15.03.00#Veterinary pyrogenic tester#42.12.15.00.00
-unspsc7#42.12.15.04.00#Veterinary stereotoxic equipment#42.12.15.00.00
-unspsc7#42.12.15.05.00#Veterinary electrocardiograph (ECG)#42.12.15.00.00
-unspsc7#42.12.16.00.00#Veterinary products#42.12.00.00.00
-unspsc7#42.12.16.01.00#Gastrointestinal veterinary products#42.12.16.00.00
-unspsc7#42.12.16.02.00#Blood or blood forming veterinary products#42.12.16.00.00
-unspsc7#42.12.16.03.00#Respiratory system veterinary products#42.12.16.00.00
-unspsc7#42.12.16.04.00#Musculo skeletal or nervous system veterinary products#42.12.16.00.00
-unspsc7#42.12.16.05.00#Cardiovascular system veterinary products#42.12.16.00.00
-unspsc7#42.12.16.06.00#Dermatologicals or antiprotozoa veterinary products#42.12.16.00.00
-unspsc7#42.12.16.07.00#Genito urinary system sex or hormone veterinary products#42.12.16.00.00
-unspsc7#43.00.00.00.00#Communications and Computer Equipment and Peripherals and Components and Supplies#43.00.00.00.00
-unspsc7#43.16.00.00.00#Software#43.00.00.00.00
-unspsc7#43.16.15.00.00#Database systems#43.16.00.00.00
-unspsc7#43.16.15.01.00#Database software#43.16.15.00.00
-unspsc7#43.16.16.00.00#Operating systems#43.16.00.00.00
-unspsc7#43.16.16.01.00#Mainframe operating system software#43.16.16.00.00
-unspsc7#43.16.16.02.00#Personal computer (PC) operating system software#43.16.16.00.00
-unspsc7#43.16.16.03.00#Open systems operating systems#43.16.16.00.00
-unspsc7#43.16.16.04.00#Clustering software#43.16.16.00.00
-unspsc7#43.16.17.00.00#Business transaction and personal business software#43.16.00.00.00
-unspsc7#43.16.17.01.00#Investment management software#43.16.17.00.00
-unspsc7#43.16.17.02.00#Tax preparation software#43.16.17.00.00
-unspsc7#43.16.17.03.00#Facilities management software#43.16.17.00.00
-unspsc7#43.16.17.04.00#Software suites#43.16.17.00.00
-unspsc7#43.16.17.05.00#Inventory management software#43.16.17.00.00
-unspsc7#43.16.17.06.00#Financial analysis software#43.16.17.00.00
-unspsc7#43.16.17.07.00#Accounting software#43.16.17.00.00
-unspsc7#43.16.17.08.00#Time accounting or human resources software#43.16.17.00.00
-unspsc7#43.16.17.09.00#Analytical or scientific software#43.16.17.00.00
-unspsc7#43.16.17.10.00#Mathematical or forecasting software#43.16.17.00.00
-unspsc7#43.16.17.11.00#Auction software#43.16.17.00.00
-unspsc7#43.16.17.12.00#Sales or marketing software#43.16.17.00.00
-unspsc7#43.16.18.00.00#Document creation software#43.16.00.00.00
-unspsc7#43.16.18.01.00#Document management software#43.16.18.00.00
-unspsc7#43.16.18.02.00#Electronic publishing software#43.16.18.00.00
-unspsc7#43.16.18.03.00#Optical character reader (OCR) software#43.16.18.00.00
-unspsc7#43.16.18.04.00#Voice recognition software#43.16.18.00.00
-unspsc7#43.16.18.05.00#Desktop publishing software#43.16.18.00.00
-unspsc7#43.16.18.06.00#Presentation software#43.16.18.00.00
-unspsc7#43.16.18.07.00#Word processing software#43.16.18.00.00
-unspsc7#43.16.18.08.00#Scanner software#43.16.18.00.00
-unspsc7#43.16.18.09.00#Spell checkers#43.16.18.00.00
-unspsc7#43.16.19.00.00#Drawing and imaging software#43.16.00.00.00
-unspsc7#43.16.19.01.00#Computer aided design (CAD) software#43.16.19.00.00
-unspsc7#43.16.19.02.00#Graphics software#43.16.19.00.00
-unspsc7#43.16.19.03.00#Educational software#43.16.19.00.00
-unspsc7#43.16.19.04.00#Computer aided manufacturing (CAM) software#43.16.19.00.00
-unspsc7#43.16.19.05.00#Charting software#43.16.19.00.00
-unspsc7#43.16.19.06.00#Form making software#43.16.19.00.00
-unspsc7#43.16.19.07.00#Mapping software#43.16.19.00.00
-unspsc7#43.16.20.00.00#Scheduling and productivity software#43.16.00.00.00
-unspsc7#43.16.20.01.00#Project management software#43.16.20.00.00
-unspsc7#43.16.20.02.00#Scheduling software#43.16.20.00.00
-unspsc7#43.16.20.03.00#Contact management software#43.16.20.00.00
-unspsc7#43.16.21.00.00#Spreadsheets and enhancement software#43.16.00.00.00
-unspsc7#43.16.21.01.00#Spreadsheet software#43.16.21.00.00
-unspsc7#43.16.22.00.00#Multimedia software#43.16.00.00.00
-unspsc7#43.16.22.01.00#Music or sound editing software#43.16.22.00.00
-unspsc7#43.16.23.00.00#Print shop software#43.16.00.00.00
-unspsc7#43.16.23.01.00#Address book making software#43.16.23.00.00
-unspsc7#43.16.23.02.00#Label making software#43.16.23.00.00
-unspsc7#43.16.24.00.00#Programming languages and tools#43.16.00.00.00
-unspsc7#43.16.24.01.00#Compiling softwares#43.16.24.00.00
-unspsc7#43.16.24.02.00#Configuration management software#43.16.24.00.00
-unspsc7#43.16.24.03.00#Development software#43.16.24.00.00
-unspsc7#43.16.24.04.00#Graphical user interface (GUI) tools#43.16.24.00.00
-unspsc7#43.16.24.05.00#Programming languages#43.16.24.00.00
-unspsc7#43.16.24.06.00#Program testing software#43.16.24.00.00
-unspsc7#43.16.25.00.00#Software utilities#43.16.00.00.00
-unspsc7#43.16.25.01.00#Backup or recovery software#43.16.25.00.00
-unspsc7#43.16.25.02.00#Bar coding software#43.16.25.00.00
-unspsc7#43.16.25.03.00#File security or data security software#43.16.25.00.00
-unspsc7#43.16.25.04.00#Foreign language translation software#43.16.25.00.00
-unspsc7#43.16.25.05.00#Print utility software#43.16.25.00.00
-unspsc7#43.16.25.06.00#Storage media loading software#43.16.25.00.00
-unspsc7#43.16.25.07.00#Virus protection software#43.16.25.00.00
-unspsc7#43.16.25.08.00#General utility software#43.16.25.00.00
-unspsc7#43.16.25.09.00#Compression utilities#43.16.25.00.00
-unspsc7#43.16.25.10.00#System management software#43.16.25.00.00
-unspsc7#43.16.25.11.00#Storage management software#43.16.25.00.00
-unspsc7#43.16.25.12.00#Version checker software#43.16.25.00.00
-unspsc7#43.16.26.00.00#Networking software#43.16.00.00.00
-unspsc7#43.16.26.01.00#Platform interconnectivity software#43.16.26.00.00
-unspsc7#43.16.26.02.00#Optical jukebox server software#43.16.26.00.00
-unspsc7#43.16.26.03.00#Operating system enhancement software#43.16.26.00.00
-unspsc7#43.16.26.04.00#Network operating system software#43.16.26.00.00
-unspsc7#43.16.26.05.00#Networking developers software#43.16.26.00.00
-unspsc7#43.16.26.06.00#Network connectivity terminal emulation software#43.16.26.00.00
-unspsc7#43.16.26.07.00#Mainframe transaction processing software#43.16.26.00.00
-unspsc7#43.16.26.08.00#License management software#43.16.26.00.00
-unspsc7#43.16.26.09.00#Gateway software#43.16.26.00.00
-unspsc7#43.16.26.10.00#Compact disc (CD) server software#43.16.26.00.00
-unspsc7#43.16.26.11.00#Administration software#43.16.26.00.00
-unspsc7#43.16.26.12.00#Transaction server software#43.16.26.00.00
-unspsc7#43.16.26.13.00#Switch or router software#43.16.26.00.00
-unspsc7#43.16.26.14.00#Multiplexer software#43.16.26.00.00
-unspsc7#43.16.26.15.00#Communications server software#43.16.26.00.00
-unspsc7#43.16.26.16.00#Bridge software#43.16.26.00.00
-unspsc7#43.16.27.00.00#Communication Software#43.16.00.00.00
-unspsc7#43.16.27.01.00#Desktop communications software#43.16.27.00.00
-unspsc7#43.16.27.02.00#Server communications software#43.16.27.00.00
-unspsc7#43.16.27.03.00#Interactive voice response software#43.16.27.00.00
-unspsc7#43.16.27.04.00#Modem software#43.16.27.00.00
-unspsc7#43.16.27.05.00#Remote access software#43.16.27.00.00
-unspsc7#43.16.27.06.00#Video conferencing software#43.16.27.00.00
-unspsc7#43.16.27.07.00#Exchange software#43.16.27.00.00
-unspsc7#43.16.28.00.00#Internet and intranet software#43.16.00.00.00
-unspsc7#43.16.28.01.00#Internet browsing software#43.16.28.00.00
-unspsc7#43.16.28.02.00#Web server software#43.16.28.00.00
-unspsc7#43.16.29.00.00#Miscellaneous software#43.16.00.00.00
-unspsc7#43.16.29.01.00#Computer game software#43.16.29.00.00
-unspsc7#43.16.29.02.00#Screen savers#43.16.29.00.00
-unspsc7#43.16.29.03.00#Training software#43.16.29.00.00
-unspsc7#43.16.29.04.00#Entertainment software#43.16.29.00.00
-unspsc7#43.16.29.05.00#Family titles#43.16.29.00.00
-unspsc7#43.16.29.06.00#Educational software#43.16.29.00.00
-unspsc7#43.16.30.00.00#Industry specific software#43.16.00.00.00
-unspsc7#43.16.30.01.00#Point of sale (POS) software#43.16.30.00.00
-unspsc7#43.16.30.02.00#Flight control software#43.16.30.00.00
-unspsc7#43.16.30.03.00#Aviation ground support software#43.16.30.00.00
-unspsc7#43.16.30.04.00#Aviation test software#43.16.30.00.00
-unspsc7#43.16.30.05.00#Industrial control software#43.16.30.00.00
-unspsc7#43.16.30.06.00#Library software#43.16.30.00.00
-unspsc7#43.16.30.07.00#Compliance software#43.16.30.00.00
-unspsc7#43.16.31.00.00#Drivers and system software#43.16.00.00.00
-unspsc7#43.16.31.01.00#Ethernet drivers#43.16.31.00.00
-unspsc7#43.16.31.02.00#Graphics card drivers#43.16.31.00.00
-unspsc7#43.17.00.00.00#Hardware and accessories#43.00.00.00.00
-unspsc7#43.17.15.00.00#Telephony equipment#43.17.00.00.00
-unspsc7#43.17.15.01.00#Exchange components (CODEC)#43.17.15.00.00
-unspsc7#43.17.15.02.00#Exchange data interface cards#43.17.15.00.00
-unspsc7#43.17.15.03.00#Exchange datacom modules#43.17.15.00.00
-unspsc7#43.17.15.04.00#Phone exchange interfaces or components#43.17.15.00.00
-unspsc7#43.17.15.05.00#Exchange trunk interface or card components#43.17.15.00.00
-unspsc7#43.17.15.06.00#Premise branch exchange (PBX) systems#43.17.15.00.00
-unspsc7#43.17.15.07.00#Telephone switching equipment#43.17.15.00.00
-unspsc7#43.17.15.08.00#Switchboard equipment#43.17.15.00.00
-unspsc7#43.17.15.09.00#Punch down blocks#43.17.15.00.00
-unspsc7#43.17.15.10.00#Analog or digital telephones#43.17.15.00.00
-unspsc7#43.17.15.11.00#Analog or digital cellular telephones#43.17.15.00.00
-unspsc7#43.17.15.12.00#Mobile telephones#43.17.15.00.00
-unspsc7#43.17.15.13.00#Cordless telephones#43.17.15.00.00
-unspsc7#43.17.15.14.00#Pay telephones#43.17.15.00.00
-unspsc7#43.17.15.15.00#Answering machines#43.17.15.00.00
-unspsc7#43.17.15.16.00#Telephone headsets#43.17.15.00.00
-unspsc7#43.17.15.17.00#Voice mail systems#43.17.15.00.00
-unspsc7#43.17.15.18.00#Call management system#43.17.15.00.00
-unspsc7#43.17.15.19.00#Cellular telephone accessories#43.17.15.00.00
-unspsc7#43.17.15.20.00#Telephone rests#43.17.15.00.00
-unspsc7#43.17.15.21.00#Telephone adapters#43.17.15.00.00
-unspsc7#43.17.15.22.00#Telephone line multipliers#43.17.15.00.00
-unspsc7#43.17.15.23.00#Telephone line modular couplers#43.17.15.00.00
-unspsc7#43.17.15.24.00#Videophones#43.17.15.00.00
-unspsc7#43.17.15.25.00#Dialers#43.17.15.00.00
-unspsc7#43.17.15.26.00#Telephone amplifiers#43.17.15.00.00
-unspsc7#43.17.15.27.00#Telephone stands or holders#43.17.15.00.00
-unspsc7#43.17.15.28.00#Integrated services digital network exchanges ISDN#43.17.15.00.00
-unspsc7#43.17.15.29.00#Telephone jacks#43.17.15.00.00
-unspsc7#43.17.16.00.00#Antennas#43.17.00.00.00
-unspsc7#43.17.16.01.00#Transmitters#43.17.16.00.00
-unspsc7#43.17.16.02.00#Receivers#43.17.16.00.00
-unspsc7#43.17.16.03.00#Tuners#43.17.16.00.00
-unspsc7#43.17.16.04.00#Short wave equipment#43.17.16.00.00
-unspsc7#43.17.16.05.00#Aircraft antennas#43.17.16.00.00
-unspsc7#43.17.16.06.00#Automotive antennas#43.17.16.00.00
-unspsc7#43.17.16.07.00#Broadcast antennas#43.17.16.00.00
-unspsc7#43.17.16.08.00#Microwave antennas#43.17.16.00.00
-unspsc7#43.17.16.09.00#Television antennas#43.17.16.00.00
-unspsc7#43.17.16.10.00#Satellite antennas#43.17.16.00.00
-unspsc7#43.17.16.11.00#Radio antennas#43.17.16.00.00
-unspsc7#43.17.16.12.00#Radar antennas#43.17.16.00.00
-unspsc7#43.17.16.13.00#Communications antennas#43.17.16.00.00
-unspsc7#43.17.16.14.00#Communication towers or support#43.17.16.00.00
-unspsc7#43.17.17.00.00#Telecommunications equipment#43.17.00.00.00
-unspsc7#43.17.17.01.00#Wireless base stations#43.17.17.00.00
-unspsc7#43.17.17.02.00#Telegraph equipment#43.17.17.00.00
-unspsc7#43.17.17.03.00#Teletype equipment#43.17.17.00.00
-unspsc7#43.17.17.04.00#Teleconferencing equipment#43.17.17.00.00
-unspsc7#43.17.17.05.00#Satellite communication equipment#43.17.17.00.00
-unspsc7#43.17.17.06.00#Pagers or beepers#43.17.17.00.00
-unspsc7#43.17.17.07.00#Intercommunications or paging systems#43.17.17.00.00
-unspsc7#43.17.17.08.00#Public address equipment#43.17.17.00.00
-unspsc7#43.17.17.09.00#Electronic sound equipment#43.17.17.00.00
-unspsc7#43.17.17.10.00#Dictating machines#43.17.17.00.00
-unspsc7#43.17.17.11.00#Line conditioners#43.17.17.00.00
-unspsc7#43.17.17.12.00#Channel service unit or data service unit (CSU or DSU)#43.17.17.00.00
-unspsc7#43.17.18.00.00#Computers#43.17.00.00.00
-unspsc7#43.17.18.01.00#Notebook computers#43.17.18.00.00
-unspsc7#43.17.18.02.00#Docking stations#43.17.18.00.00
-unspsc7#43.17.18.03.00#Workstations or desktop computers#43.17.18.00.00
-unspsc7#43.17.18.04.00#Personal digital assistants (PDAs) or pen based computers#43.17.18.00.00
-unspsc7#43.17.18.05.00#Mainframe computers#43.17.18.00.00
-unspsc7#43.17.18.06.00#Servers#43.17.18.00.00
-unspsc7#43.17.18.07.00#Port replicators#43.17.18.00.00
-unspsc7#43.17.18.08.00#Minicomputers#43.17.18.00.00
-unspsc7#43.17.18.09.00#Point of sale (POS) terminals#43.17.18.00.00
-unspsc7#43.17.18.10.00#Programmable logic controller (PLC)#43.17.18.00.00
-unspsc7#43.17.18.11.00#Console  mainframe#43.17.18.00.00
-unspsc7#43.17.18.12.00#Console controller  mainframe#43.17.18.00.00
-unspsc7#43.17.18.13.00#Channel converter#43.17.18.00.00
-unspsc7#43.17.18.14.00#Channel to channel interface mainframe#43.17.18.00.00
-unspsc7#43.17.18.15.00#Control unit#43.17.18.00.00
-unspsc7#43.17.18.16.00#Coupler facility  mainframe#43.17.18.00.00
-unspsc7#43.17.18.17.00#Power cooler unit  mainframe#43.17.18.00.00
-unspsc7#43.17.18.18.00#Thin client or diskless workstations#43.17.18.00.00
-unspsc7#43.17.18.19.00#Console extenders#43.17.18.00.00
-unspsc7#43.17.19.00.00#Memory and central processing units CPUs and accessories#43.17.00.00.00
-unspsc7#43.17.19.01.00#Cache memory modules#43.17.19.00.00
-unspsc7#43.17.19.02.00#Central processing unit (CPU) processors#43.17.19.00.00
-unspsc7#43.17.19.03.00#Cental processing unit (CPU) motherboards or daughterboards#43.17.19.00.00
-unspsc7#43.17.19.04.00#Memory modules#43.17.19.00.00
-unspsc7#43.17.19.05.00#Central processing unit coolers#43.17.19.00.00
-unspsc7#43.17.20.00.00#Computer control and interface boards and cards and cables#43.17.00.00.00
-unspsc7#43.17.20.01.00#Parallel to small computer system interface converters#43.17.20.00.00
-unspsc7#43.17.20.02.00#Parallel to serial converters#43.17.20.00.00
-unspsc7#43.17.20.03.00#Serial infrared ports#43.17.20.00.00
-unspsc7#43.17.20.04.00#Video accelerator cards#43.17.20.00.00
-unspsc7#43.17.20.05.00#Graphic accelerator cards#43.17.20.00.00
-unspsc7#43.17.20.06.00#Network interface cards#43.17.20.00.00
-unspsc7#43.17.20.07.00#Audio cards#43.17.20.00.00
-unspsc7#43.17.20.08.00#Emulation adapters#43.17.20.00.00
-unspsc7#43.17.20.09.00#Serial port cards#43.17.20.00.00
-unspsc7#43.17.20.10.00#Parallel port cards#43.17.20.00.00
-unspsc7#43.17.20.11.00#Small computer system interface (SCSI) controller cards#43.17.20.00.00
-unspsc7#43.17.20.12.00#Decoder#43.17.20.00.00
-unspsc7#43.17.20.13.00#Programmable logic controller input module#43.17.20.00.00
-unspsc7#43.17.20.14.00#Programmable logic controller counter module#43.17.20.00.00
-unspsc7#43.17.20.15.00#Programmable logic controller communication module#43.17.20.00.00
-unspsc7#43.17.20.16.00#Wireless network interface cards#43.17.20.00.00
-unspsc7#43.17.20.17.00#Timekeeping card machine and computer interface device#43.17.20.00.00
-unspsc7#43.17.20.18.00#Processor cards#43.17.20.00.00
-unspsc7#43.17.21.00.00#Audio and visual accessories#43.17.00.00.00
-unspsc7#43.17.21.01.00#Musical instrument digital interface (MIDI) interfaces or adapters#43.17.21.00.00
-unspsc7#43.17.21.02.00#Signal processor upgrades#43.17.21.00.00
-unspsc7#43.17.21.03.00#Video capture boards#43.17.21.00.00
-unspsc7#43.17.21.04.00#Television cards#43.17.21.00.00
-unspsc7#43.17.21.05.00#Radio cards#43.17.21.00.00
-unspsc7#43.17.21.06.00#Multimedia kits#43.17.21.00.00
-unspsc7#43.17.21.07.00#Computer speakers#43.17.21.00.00
-unspsc7#43.17.21.08.00#Computer headset#43.17.21.00.00
-unspsc7#43.17.21.09.00#Set top boxes#43.17.21.00.00
-unspsc7#43.17.21.10.00#Video cassette containers#43.17.21.00.00
-unspsc7#43.17.22.00.00#Input devices#43.17.00.00.00
-unspsc7#43.17.22.01.00#Bar code readers#43.17.22.00.00
-unspsc7#43.17.22.02.00#Graphics tablets or digitizers#43.17.22.00.00
-unspsc7#43.17.22.03.00#Joysticks or game pads#43.17.22.00.00
-unspsc7#43.17.22.04.00#Keyboards or keypads#43.17.22.00.00
-unspsc7#43.17.22.05.00#Computer mouse#43.17.22.00.00
-unspsc7#43.17.22.06.00#Remote user interfaces#43.17.22.00.00
-unspsc7#43.17.22.07.00#Scanners#43.17.22.00.00
-unspsc7#43.17.22.08.00#Touch pads#43.17.22.00.00
-unspsc7#43.17.22.09.00#Touch screens#43.17.22.00.00
-unspsc7#43.17.22.10.00#Trackballs#43.17.22.00.00
-unspsc7#43.17.22.11.00#Voice microphones for computers#43.17.22.00.00
-unspsc7#43.17.22.12.00#Punch card readers#43.17.22.00.00
-unspsc7#43.17.22.13.00#Light pen#43.17.22.00.00
-unspsc7#43.17.22.14.00#Stylus pen for mobile computers#43.17.22.00.00
-unspsc7#43.17.22.15.00#Mouse pad#43.17.22.00.00
-unspsc7#43.17.22.16.00#Programmable logic controller handheld programmer#43.17.22.00.00
-unspsc7#43.17.22.17.00#EGR  Electronic gate reader#43.17.22.00.00
-unspsc7#43.17.22.18.00#Dumb terminal#43.17.22.00.00
-unspsc7#43.17.22.19.00#Punched cards#43.17.22.00.00
-unspsc7#43.17.23.00.00#Electronic data storage equipment#43.17.00.00.00
-unspsc7#43.17.23.01.00#Read only compact disc (CD) drives#43.17.23.00.00
-unspsc7#43.17.23.02.00#Compact disc (CD) jukeboxes or changers#43.17.23.00.00
-unspsc7#43.17.23.03.00#Combination floppy drives#43.17.23.00.00
-unspsc7#43.17.23.04.00#Disk arrays#43.17.23.00.00
-unspsc7#43.17.23.05.00#Floppy drives#43.17.23.00.00
-unspsc7#43.17.23.06.00#High capacity removable media drives#43.17.23.00.00
-unspsc7#43.17.23.07.00#Multi drive hard drive towers#43.17.23.00.00
-unspsc7#43.17.23.08.00#Recordable compact disc (CD) drives#43.17.23.00.00
-unspsc7#43.17.23.09.00#Reel to reel tape drives#43.17.23.00.00
-unspsc7#43.17.23.10.00#Single optical drives#43.17.23.00.00
-unspsc7#43.17.23.11.00#Tape arrays#43.17.23.00.00
-unspsc7#43.17.23.12.00#Tape drive auto loaders or libraries#43.17.23.00.00
-unspsc7#43.17.23.13.00#Hard drives#43.17.23.00.00
-unspsc7#43.17.23.14.00#Computer DVD drives#43.17.23.00.00
-unspsc7#43.17.23.15.00#Array controller#43.17.23.00.00
-unspsc7#43.17.23.16.00#MP3 player#43.17.23.00.00
-unspsc7#43.17.23.17.00#Memory card readers#43.17.23.00.00
-unspsc7#43.17.23.18.00#Peripheral component microchannel interconnect architecture  reader and writer drives#43.17.23.00.00
-unspsc7#43.17.24.00.00#Monitors and displays#43.17.00.00.00
-unspsc7#43.17.24.01.00#Monitors#43.17.24.00.00
-unspsc7#43.17.24.02.00#Flat panel displays#43.17.24.00.00
-unspsc7#43.17.24.03.00#Touch screen monitors#43.17.24.00.00
-unspsc7#43.17.24.04.00#Monitor accessories#43.17.24.00.00
-unspsc7#43.17.25.00.00#Printers#43.17.00.00.00
-unspsc7#43.17.25.01.00#Plotters#43.17.25.00.00
-unspsc7#43.17.25.02.00#Band printers#43.17.25.00.00
-unspsc7#43.17.25.03.00#Dot matrix printers#43.17.25.00.00
-unspsc7#43.17.25.04.00#Label printers#43.17.25.00.00
-unspsc7#43.17.25.05.00#Large format printers#43.17.25.00.00
-unspsc7#43.17.25.06.00#Line matrix printers#43.17.25.00.00
-unspsc7#43.17.25.07.00#Page printers#43.17.25.00.00
-unspsc7#43.17.25.08.00#Thermal tape printers#43.17.25.00.00
-unspsc7#43.17.25.09.00#Inkjet printers#43.17.25.00.00
-unspsc7#43.17.25.10.00#Laser printers#43.17.25.00.00
-unspsc7#43.17.25.11.00#Bubble jet printers#43.17.25.00.00
-unspsc7#43.17.25.12.00#Bag tag printer#43.17.25.00.00
-unspsc7#43.17.25.13.00#Printer seperator#43.17.25.00.00
-unspsc7#43.17.25.14.00#Multi function printers#43.17.25.00.00
-unspsc7#43.17.25.15.00#ATB airline ticket or boarding pass printer#43.17.25.00.00
-unspsc7#43.17.26.00.00#Enclosures and frames and backplanes#43.17.00.00.00
-unspsc7#43.17.26.01.00#Chassis#43.17.26.00.00
-unspsc7#43.17.26.02.00#Network chassis#43.17.26.00.00
-unspsc7#43.17.26.03.00#Drive cabinets#43.17.26.00.00
-unspsc7#43.17.26.04.00#Expansion slot expander#43.17.26.00.00
-unspsc7#43.17.26.05.00#Racks#43.17.26.00.00
-unspsc7#43.17.26.06.00#Programmable logic controller rack or base#43.17.26.00.00
-unspsc7#43.17.26.07.00#Removable drive frames#43.17.26.00.00
-unspsc7#43.17.27.00.00#Network hardware and components and accessories#43.17.00.00.00
-unspsc7#43.17.27.01.00#Hubs or concentrators#43.17.27.00.00
-unspsc7#43.17.27.02.00#Routers#43.17.27.00.00
-unspsc7#43.17.27.03.00#Repeaters#43.17.27.00.00
-unspsc7#43.17.27.04.00#Network bridges#43.17.27.00.00
-unspsc7#43.17.27.05.00#Switches#43.17.27.00.00
-unspsc7#43.17.27.06.00#Media filters#43.17.27.00.00
-unspsc7#43.17.27.07.00#Wide area network (WAN) cards#43.17.27.00.00
-unspsc7#43.17.27.08.00#Multistation access units (MAUs)#43.17.27.00.00
-unspsc7#43.17.27.09.00#Data service units (DSUs)#43.17.27.00.00
-unspsc7#43.17.27.10.00#Network adapters#43.17.27.00.00
-unspsc7#43.17.27.11.00#Load balancer#43.17.27.00.00
-unspsc7#43.17.27.12.00#Printer  accumulator#43.17.27.00.00
-unspsc7#43.17.27.13.00#Enterprise System Connectivity ESCON Director#43.17.27.00.00
-unspsc7#43.17.27.14.00#Network management system#43.17.27.00.00
-unspsc7#43.17.27.15.00#Firewall firewall appliance#43.17.27.00.00
-unspsc7#43.17.27.16.00#Cable network testers#43.17.27.00.00
-unspsc7#43.17.27.17.00#Data synchronization device#43.17.27.00.00
-unspsc7#43.17.27.18.00#Digital cross connects equipment#43.17.27.00.00
-unspsc7#43.17.27.19.00#Optical cross connects equipment#43.17.27.00.00
-unspsc7#43.17.27.20.00#Screen amplifier#43.17.27.00.00
-unspsc7#43.17.27.21.00#Time divisional multiplex#43.17.27.00.00
-unspsc7#43.17.27.22.00#Connection panels#43.17.27.00.00
-unspsc7#43.17.27.23.00#Voice echo cancellers#43.17.27.00.00
-unspsc7#43.17.27.24.00#Patch panel#43.17.27.00.00
-unspsc7#43.17.28.00.00#Modems and related hardware#43.17.00.00.00
-unspsc7#43.17.28.01.00#Modems or network combo cards#43.17.28.00.00
-unspsc7#43.17.28.02.00#Modems#43.17.28.00.00
-unspsc7#43.17.28.03.00#Integrated services digital network (ISDN) adapters#43.17.28.00.00
-unspsc7#43.17.28.04.00#Modem banks#43.17.28.00.00
-unspsc7#43.17.28.05.00#Modem teleadaptors#43.17.28.00.00
-unspsc7#43.17.28.06.00#Multiplexor MUXs#43.17.28.00.00
-unspsc7#43.17.28.07.00#Add drop multiplexer#43.17.28.00.00
-unspsc7#43.17.29.00.00#Network switches#43.17.00.00.00
-unspsc7#43.17.29.01.00#Local area network (LAN) switches#43.17.29.00.00
-unspsc7#43.17.29.02.00#Asynchronous transfer mode (ATM) switches#43.17.29.00.00
-unspsc7#43.17.29.03.00#Fiber distributed data interface (FDDI)  switches#43.17.29.00.00
-unspsc7#43.17.29.04.00#Wide area network (WAN) switches#43.17.29.00.00
-unspsc7#43.17.29.05.00#Intelligent network switching system#43.17.29.00.00
-unspsc7#43.17.30.00.00#Network repeaters#43.17.00.00.00
-unspsc7#43.17.30.01.00#Attached resource computer network (ARCnet) repeaters#43.17.30.00.00
-unspsc7#43.17.30.02.00#Ethernet repeaters#43.17.30.00.00
-unspsc7#43.17.30.03.00#Fiber distributed data interface (FDDI) repeaters#43.17.30.00.00
-unspsc7#43.17.30.04.00#Token ring repeaters#43.17.30.00.00
-unspsc7#43.17.31.00.00#Radio systems#43.17.00.00.00
-unspsc7#43.17.31.01.00#Transmitters#43.17.31.00.00
-unspsc7#43.17.31.02.00#Receivers#43.17.31.00.00
-unspsc7#43.17.31.03.00#Transceivers#43.17.31.00.00
-unspsc7#43.17.31.04.00#Tuners#43.17.31.00.00
-unspsc7#43.17.31.05.00#Short wave equipment#43.17.31.00.00
-unspsc7#43.17.32.00.00#Automated data collection equipment#43.17.00.00.00
-unspsc7#43.17.32.01.00#Bar code equipment#43.17.32.00.00
-unspsc7#43.17.32.02.00#Radio frequency identification (ID) equipment#43.17.32.00.00
-unspsc7#43.17.32.03.00#Radio frequency data communication equipment#43.17.32.00.00
-unspsc7#43.17.32.04.00#Camera based vision systems for automated data collection#43.17.32.00.00
-unspsc7#43.17.32.05.00#Currency recognition equipment#43.17.32.00.00
-unspsc7#43.17.32.06.00#Magnetic card readers#43.17.32.00.00
-unspsc7#43.17.33.00.00#Computer data switches#43.17.00.00.00
-unspsc7#43.17.33.01.00#Serial data switches#43.17.33.00.00
-unspsc7#43.17.33.02.00#Keyboard video mouse (KVM) switch boxes#43.17.33.00.00
-unspsc7#43.17.33.03.00#Manual printer switches#43.17.33.00.00
-unspsc7#43.17.33.04.00#Automatic printer switches#43.17.33.00.00
-unspsc7#43.17.33.05.00#Console switch#43.17.33.00.00
-unspsc7#43.17.33.06.00#Parallel data switches#43.17.33.00.00
-unspsc7#43.17.34.00.00#Computer accessory covers#43.17.00.00.00
-unspsc7#43.17.34.01.00#Key board skins#43.17.34.00.00
-unspsc7#43.17.34.02.00#Notebook or palmtop skins#43.17.34.00.00
-unspsc7#43.17.35.00.00#Key board skins#43.17.00.00.00
-unspsc7#43.17.36.00.00#Computer cables and accessories#43.17.00.00.00
-unspsc7#43.17.36.01.00#Mouse adapter#43.17.36.00.00
-unspsc7#43.17.36.02.00#Keyboard extension cables#43.17.36.00.00
-unspsc7#43.17.36.03.00#Modem cables#43.17.36.00.00
-unspsc7#43.17.36.04.00#Cord covers#43.17.36.00.00
-unspsc7#43.17.36.05.00#Parallel cables#43.17.36.00.00
-unspsc7#43.17.36.06.00#Serial cables#43.17.36.00.00
-unspsc7#43.17.36.07.00#Universal serial bus USB cables#43.17.36.00.00
-unspsc7#43.17.36.08.00#Network patch cables#43.17.36.00.00
-unspsc7#43.17.36.09.00#Computer audio cables#43.17.36.00.00
-unspsc7#43.17.36.10.00#Computer video cables#43.17.36.00.00
-unspsc7#43.17.36.11.00#Inter device link cables#43.17.36.00.00
-unspsc7#43.17.36.12.00#Computer cable kits#43.17.36.00.00
-unspsc7#43.17.36.13.00#Cable jacks or connectors#43.17.36.00.00
-unspsc7#43.17.37.00.00#Storage drive components#43.17.00.00.00
-unspsc7#43.17.37.01.00#Head assemblies or parts#43.17.37.00.00
-unspsc7#43.17.37.02.00#Lead assemblies#43.17.37.00.00
-unspsc7#43.17.37.03.00#Head stack assemblies#43.17.37.00.00
-unspsc7#43.17.37.04.00#Comb assemblies#43.17.37.00.00
-unspsc7#43.17.37.05.00#Crash stops#43.17.37.00.00
-unspsc7#43.17.37.06.00#Platters or disks#43.17.37.00.00
-unspsc7#43.17.37.07.00#Head mounting arms#43.17.37.00.00
-unspsc7#43.17.37.08.00#Read write heads#43.17.37.00.00
-unspsc7#43.17.37.09.00#Motor drives#43.17.37.00.00
-unspsc7#43.18.00.00.00#Communications and computer supplies#43.00.00.00.00
-unspsc7#43.18.15.00.00#Audio recording media#43.18.00.00.00
-unspsc7#43.18.15.01.00#Blank audio tapes#43.18.15.00.00
-unspsc7#43.18.16.00.00#Data storage media#43.18.00.00.00
-unspsc7#43.18.16.01.00#Floppy diskettes#43.18.16.00.00
-unspsc7#43.18.16.02.00#Recordable compact discs (CDs)#43.18.16.00.00
-unspsc7#43.18.16.03.00#Blank data tapes#43.18.16.00.00
-unspsc7#43.18.16.04.00#High density removable media blank disks#43.18.16.00.00
-unspsc7#43.18.16.05.00#Blank digital video discs DVD#43.18.16.00.00
-unspsc7#43.18.16.06.00#Data storage cards#43.18.16.00.00
-unspsc7#43.18.16.07.00#Magneto optical disks#43.18.16.00.00
-unspsc7#43.18.17.00.00#Multimedia storage#43.18.00.00.00
-unspsc7#43.18.17.01.00#Multimedia towers#43.18.17.00.00
-unspsc7#43.18.17.02.00#Multimedia drawers#43.18.17.00.00
-unspsc7#43.18.17.03.00#Compact disc (CD) cases#43.18.17.00.00
-unspsc7#43.18.17.04.00#Diskette holders#43.18.17.00.00
-unspsc7#43.18.17.05.00#Diskette storage#43.18.17.00.00
-unspsc7#43.18.17.06.00#Multimedia trays or organizers#43.18.17.00.00
-unspsc7#43.18.17.07.00#Zip mailers#43.18.17.00.00
-unspsc7#43.18.18.00.00#Monitor stands or risers#43.18.00.00.00
-unspsc7#43.18.19.00.00#Monitor arms#43.18.00.00.00
-unspsc7#44.00.00.00.00#Office Equipment and Accessories and Supplies#44.00.00.00.00
-unspsc7#44.10.00.00.00#Office machines and their supplies and accessories#44.00.00.00.00
-unspsc7#44.10.15.00.00#Duplicating machines#44.10.00.00.00
-unspsc7#44.10.15.01.00#Photocopiers#44.10.15.00.00
-unspsc7#44.10.15.02.00#Facsimile machines#44.10.15.00.00
-unspsc7#44.10.15.03.00#Multifunction machines#44.10.15.00.00
-unspsc7#44.10.16.00.00#Paper processing machines#44.10.00.00.00
-unspsc7#44.10.16.01.00#Paper cutting machines#44.10.16.00.00
-unspsc7#44.10.16.02.00#Paper punching or binding machines#44.10.16.00.00
-unspsc7#44.10.16.03.00#Paper shredding machines or accessories#44.10.16.00.00
-unspsc7#44.10.17.00.00#Printer and photocopier and facsimile accessories#44.10.00.00.00
-unspsc7#44.10.17.01.00#Color options or upgrades#44.10.17.00.00
-unspsc7#44.10.17.02.00#Duplexer trays#44.10.17.00.00
-unspsc7#44.10.17.03.00#Duplexer units#44.10.17.00.00
-unspsc7#44.10.17.04.00#Facsimile handsets#44.10.17.00.00
-unspsc7#44.10.17.05.00#Printer trays or feeders#44.10.17.00.00
-unspsc7#44.10.17.06.00#Photoconductor or imaging units#44.10.17.00.00
-unspsc7#44.10.17.07.00#Stapler units#44.10.17.00.00
-unspsc7#44.10.18.00.00#Calculating machines#44.10.00.00.00
-unspsc7#44.10.18.01.00#Calculators#44.10.18.00.00
-unspsc7#44.10.18.02.00#Adding machines#44.10.18.00.00
-unspsc7#44.10.18.03.00#Accounting machines#44.10.18.00.00
-unspsc7#44.10.18.04.00#Cash registers#44.10.18.00.00
-unspsc7#44.10.19.00.00#Check endorsing and writing machines#44.10.00.00.00
-unspsc7#44.10.19.01.00#Check endorsing machines#44.10.19.00.00
-unspsc7#44.10.19.02.00#Check writing machines#44.10.19.00.00
-unspsc7#44.10.20.00.00#Laminating supplies#44.10.00.00.00
-unspsc7#44.10.20.01.00#Lamination film#44.10.20.00.00
-unspsc7#44.10.20.02.00#Laminator pouches#44.10.20.00.00
-unspsc7#44.10.21.00.00#Mail machines#44.10.00.00.00
-unspsc7#44.10.21.01.00#Franking or postage machines#44.10.21.00.00
-unspsc7#44.10.21.02.00#Mail opening machines#44.10.21.00.00
-unspsc7#44.10.21.03.00#Mail sealing machines#44.10.21.00.00
-unspsc7#44.10.21.04.00#Stamp canceling machines#44.10.21.00.00
-unspsc7#44.10.21.05.00#Addressing machines#44.10.21.00.00
-unspsc7#44.10.21.06.00#Letter folders#44.10.21.00.00
-unspsc7#44.10.22.00.00#Scanner accessories#44.10.00.00.00
-unspsc7#44.10.22.01.00#Endorsers#44.10.22.00.00
-unspsc7#44.10.23.00.00#Packing machines#44.10.00.00.00
-unspsc7#44.10.23.01.00#Bundling machines#44.10.23.00.00
-unspsc7#44.10.23.02.00#Parcel wrapping machines#44.10.23.00.00
-unspsc7#44.10.23.03.00#Seal presses#44.10.23.00.00
-unspsc7#44.10.23.04.00#Sealing machines#44.10.23.00.00
-unspsc7#44.10.23.05.00#Strapping tensioners or sealers#44.10.23.00.00
-unspsc7#44.10.23.06.00#Tying machines#44.10.23.00.00
-unspsc7#44.10.24.00.00#Labeling machines#44.10.00.00.00
-unspsc7#44.10.24.01.00#Tape label makers#44.10.24.00.00
-unspsc7#44.10.24.02.00#Dating or numbering machines#44.10.24.00.00
-unspsc7#44.10.24.03.00#Identification (ID) press machines#44.10.24.00.00
-unspsc7#44.10.24.04.00#Label applying machines#44.10.24.00.00
-unspsc7#44.10.24.05.00#Label making machines#44.10.24.00.00
-unspsc7#44.10.24.06.00#Lettering equipment#44.10.24.00.00
-unspsc7#44.10.24.07.00#Tape embosser#44.10.24.00.00
-unspsc7#44.10.24.08.00#Automatic labeling systems#44.10.24.00.00
-unspsc7#44.10.24.09.00#Semi automatic labeling systems#44.10.24.00.00
-unspsc7#44.10.24.11.00#Label dispensers#44.10.24.00.00
-unspsc7#44.10.25.00.00#Sorting machines#44.10.00.00.00
-unspsc7#44.10.25.01.00#Money counting machines#44.10.25.00.00
-unspsc7#44.10.25.02.00#Sorters#44.10.25.00.00
-unspsc7#44.10.26.00.00#Typing machines and accessories#44.10.00.00.00
-unspsc7#44.10.26.02.00#Typewriters#44.10.26.00.00
-unspsc7#44.10.26.03.00#Printwheels#44.10.26.00.00
-unspsc7#44.10.26.04.00#Stenotype machines#44.10.26.00.00
-unspsc7#44.10.26.05.00#Dictation machines#44.10.26.00.00
-unspsc7#44.10.26.06.00#Typerwriter ribbons#44.10.26.00.00
-unspsc7#44.10.26.07.00#Word processors#44.10.26.00.00
-unspsc7#44.10.26.08.00#Typewriter printing elements#44.10.26.00.00
-unspsc7#44.10.28.00.00#Binding and lamination machines#44.10.00.00.00
-unspsc7#44.10.28.01.00#Laminators#44.10.28.00.00
-unspsc7#44.10.29.00.00#Office machine accessories#44.10.00.00.00
-unspsc7#44.10.29.01.00#Travel kits for office machines#44.10.29.00.00
-unspsc7#44.10.29.02.00#Storage accessories for office machines#44.10.29.00.00
-unspsc7#44.10.29.03.00#Tape cleaners#44.10.29.00.00
-unspsc7#44.10.29.04.00#Air compressed spray#44.10.29.00.00
-unspsc7#44.10.29.05.00#Small paper bags of wet absorbing salts#44.10.29.00.00
-unspsc7#44.10.29.06.00#Computer or office equipment cleaning kit#44.10.29.00.00
-unspsc7#44.10.29.07.00#Equipment dust covers#44.10.29.00.00
-unspsc7#44.10.29.08.00#Compact disc cleaners or scratch removers#44.10.29.00.00
-unspsc7#44.10.29.09.00#Compact disc drive cleaner#44.10.29.00.00
-unspsc7#44.10.29.10.00#Laminator trays#44.10.29.00.00
-unspsc7#44.10.29.11.00#Cleaning wipes for office machines#44.10.29.00.00
-unspsc7#44.10.29.12.00#Cleaning solutions for office equipment#44.10.29.00.00
-unspsc7#44.10.29.13.00#Compact disc destroyer#44.10.29.00.00
-unspsc7#44.10.30.00.00#Fusers and accessories#44.10.00.00.00
-unspsc7#44.10.30.01.00#Fuser cleaning pads#44.10.30.00.00
-unspsc7#44.10.30.02.00#Fuser oil#44.10.30.00.00
-unspsc7#44.10.30.03.00#Fuser wiper#44.10.30.00.00
-unspsc7#44.10.30.04.00#Fusers#44.10.30.00.00
-unspsc7#44.10.31.00.00#Printer and facsimile and photocopier supplies#44.10.00.00.00
-unspsc7#44.10.31.01.00#Printer or facsimile or photocopier belts#44.10.31.00.00
-unspsc7#44.10.31.02.00#Printer or facsimile or photocopier ribbons#44.10.31.00.00
-unspsc7#44.10.31.03.00#Toner#44.10.31.00.00
-unspsc7#44.10.31.04.00#Transfer rolls#44.10.31.00.00
-unspsc7#44.10.31.05.00#Ink cartridges#44.10.31.00.00
-unspsc7#44.10.31.06.00#Ink sticks#44.10.31.00.00
-unspsc7#44.10.31.07.00#Printer or facsimile or photocopier cleaning supplies#44.10.31.00.00
-unspsc7#44.10.31.08.00#Developer for printers or photocopiers#44.10.31.00.00
-unspsc7#44.10.31.09.00#Printer or facsimile or photocopier drums#44.10.31.00.00
-unspsc7#44.10.31.10.00#Print heads#44.10.31.00.00
-unspsc7#44.10.31.11.00#Ink rolls#44.10.31.00.00
-unspsc7#44.10.31.12.00#Printer ribbon#44.10.31.00.00
-unspsc7#44.10.31.13.00#Phasers or inkjet kits#44.10.31.00.00
-unspsc7#44.10.31.14.00#Laserjet coating kits#44.10.31.00.00
-unspsc7#44.10.31.15.00#Imaging films#44.10.31.00.00
-unspsc7#44.10.31.16.00#Kit for printer#44.10.31.00.00
-unspsc7#44.10.31.17.00#Facsimile ribbons#44.10.31.00.00
-unspsc7#44.10.32.00.00#Office time recording machines and accessories#44.10.00.00.00
-unspsc7#44.10.32.01.00#Time card machines#44.10.32.00.00
-unspsc7#44.10.32.02.00#Time stamping machines#44.10.32.00.00
-unspsc7#44.10.32.03.00#Time card machine replacement ribbon#44.10.32.00.00
-unspsc7#44.10.32.04.00#Time card racks#44.10.32.00.00
-unspsc7#44.10.32.05.00#Time cards or sheets#44.10.32.00.00
-unspsc7#44.10.33.00.00#Time card machines#44.10.00.00.00
-unspsc7#44.10.34.00.00#Time stamping machines#44.10.00.00.00
-unspsc7#44.10.35.00.00#Binding machine suplies#44.10.00.00.00
-unspsc7#44.10.35.01.00#Wire binding elements or combs#44.10.35.00.00
-unspsc7#44.10.35.02.00#Binding covers#44.10.35.00.00
-unspsc7#44.11.00.00.00#Office and desk accessories#44.00.00.00.00
-unspsc7#44.11.15.00.00#Organizers and accessories#44.11.00.00.00
-unspsc7#44.11.15.01.00#Message holders or dispensers#44.11.15.00.00
-unspsc7#44.11.15.02.00#Desk drawer organizers#44.11.15.00.00
-unspsc7#44.11.15.03.00#Desktop trays or organizers#44.11.15.00.00
-unspsc7#44.11.15.04.00#Diskette holders#44.11.15.00.00
-unspsc7#44.11.15.05.00#Copy holders#44.11.15.00.00
-unspsc7#44.11.15.06.00#Paper or pad holder#44.11.15.00.00
-unspsc7#44.11.15.07.00#Book ends#44.11.15.00.00
-unspsc7#44.11.15.08.00#Stay put pen or holder#44.11.15.00.00
-unspsc7#44.11.15.09.00#Pen or pencil holders#44.11.15.00.00
-unspsc7#44.11.15.10.00#Hanging organizers or accessories#44.11.15.00.00
-unspsc7#44.11.15.11.00#Display racks or accessories#44.11.15.00.00
-unspsc7#44.11.15.12.00#Literature rack#44.11.15.00.00
-unspsc7#44.11.15.13.00#Supports for diaries or calendars#44.11.15.00.00
-unspsc7#44.11.15.14.00#Stamp racks or organizers#44.11.15.00.00
-unspsc7#44.11.15.15.00#File storage boxes or organizers#44.11.15.00.00
-unspsc7#44.11.16.00.00#Cash handling supplies#44.11.00.00.00
-unspsc7#44.11.16.01.00#Currency bags or wallets#44.11.16.00.00
-unspsc7#44.11.16.02.00#Counterfeit bill detector pens#44.11.16.00.00
-unspsc7#44.11.16.03.00#Coin sorters#44.11.16.00.00
-unspsc7#44.11.16.04.00#Coin wrappers or bill straps#44.11.16.00.00
-unspsc7#44.11.16.05.00#Cash or ticket boxes#44.11.16.00.00
-unspsc7#44.11.16.06.00#Cash box trays#44.11.16.00.00
-unspsc7#44.11.16.07.00#Check files#44.11.16.00.00
-unspsc7#44.11.16.08.00#Coin banks#44.11.16.00.00
-unspsc7#44.11.16.09.00#Counterfeit bill detectors or supplies#44.11.16.00.00
-unspsc7#44.11.18.00.00#Drafting supplies#44.11.00.00.00
-unspsc7#44.11.18.01.00#Stencils or lettering aids#44.11.18.00.00
-unspsc7#44.11.18.02.00#Drafting films#44.11.18.00.00
-unspsc7#44.11.18.03.00#Compasses#44.11.18.00.00
-unspsc7#44.11.18.04.00#Drafting papers#44.11.18.00.00
-unspsc7#44.11.18.05.00#Curves#44.11.18.00.00
-unspsc7#44.11.18.06.00#Protractors#44.11.18.00.00
-unspsc7#44.11.18.07.00#Scales#44.11.18.00.00
-unspsc7#44.11.18.08.00#T squares#44.11.18.00.00
-unspsc7#44.11.18.09.00#Templates#44.11.18.00.00
-unspsc7#44.11.18.10.00#Triangles#44.11.18.00.00
-unspsc7#44.11.18.11.00#Color charts#44.11.18.00.00
-unspsc7#44.11.18.12.00#Drafting kits or sets#44.11.18.00.00
-unspsc7#44.11.18.13.00#Drafting dots or tapes#44.11.18.00.00
-unspsc7#44.11.19.00.00#Boards#44.11.00.00.00
-unspsc7#44.11.19.01.00#Planning boards or accessories#44.11.19.00.00
-unspsc7#44.11.19.02.00#Electronic copyboards or accessories#44.11.19.00.00
-unspsc7#44.11.19.03.00#Easels or accessories#44.11.19.00.00
-unspsc7#44.11.19.04.00#Letter boards or accessories#44.11.19.00.00
-unspsc7#44.11.19.05.00#Dry erase boards or accessories#44.11.19.00.00
-unspsc7#44.11.19.06.00#Chalk boards or accessories#44.11.19.00.00
-unspsc7#44.11.19.07.00#Bulletin boards or accessories#44.11.19.00.00
-unspsc7#44.11.19.08.00#Magnetic boards or accessories#44.11.19.00.00
-unspsc7#44.11.19.09.00#Board cleaning kits or accessories#44.11.19.00.00
-unspsc7#44.11.20.00.00#Planning systems#44.11.00.00.00
-unspsc7#44.11.20.01.00#Address books or refills#44.11.20.00.00
-unspsc7#44.11.20.02.00#Calendars#44.11.20.00.00
-unspsc7#44.11.20.04.00#Meeting planners#44.11.20.00.00
-unspsc7#44.11.20.05.00#Appointment books or refills#44.11.20.00.00
-unspsc7#44.11.20.06.00#Diaries or refills#44.11.20.00.00
-unspsc7#44.11.20.07.00#Suggestion box#44.11.20.00.00
-unspsc7#44.11.20.08.00#Wall planners or refills#44.11.20.00.00
-unspsc7#44.12.00.00.00#Office supplies#44.00.00.00.00
-unspsc7#44.12.15.00.00#Mailing supplies#44.12.00.00.00
-unspsc7#44.12.15.01.00#Mailer tubes#44.12.15.00.00
-unspsc7#44.12.15.03.00#Mailers#44.12.15.00.00
-unspsc7#44.12.15.04.00#Window envelopes#44.12.15.00.00
-unspsc7#44.12.15.05.00#Specialty envelopes#44.12.15.00.00
-unspsc7#44.12.15.06.00#Standard envelopes#44.12.15.00.00
-unspsc7#44.12.15.07.00#Catalog or clasp envelopes#44.12.15.00.00
-unspsc7#44.12.15.08.00#Message droppers#44.12.15.00.00
-unspsc7#44.12.15.09.00#Mailing bags#44.12.15.00.00
-unspsc7#44.12.15.10.00#Mailing seals#44.12.15.00.00
-unspsc7#44.12.15.11.00#Mailing boxes#44.12.15.00.00
-unspsc7#44.12.16.00.00#Desk supplies#44.12.00.00.00
-unspsc7#44.12.16.04.00#Stamps#44.12.16.00.00
-unspsc7#44.12.16.05.00#Tape dispensers#44.12.16.00.00
-unspsc7#44.12.16.06.00#Finger stalls#44.12.16.00.00
-unspsc7#44.12.16.11.00#Paper or eyelet punches#44.12.16.00.00
-unspsc7#44.12.16.12.00#Paper cutters or refills#44.12.16.00.00
-unspsc7#44.12.16.13.00#Staple removers#44.12.16.00.00
-unspsc7#44.12.16.14.00#Call bells#44.12.16.00.00
-unspsc7#44.12.16.15.00#Staplers#44.12.16.00.00
-unspsc7#44.12.16.17.00#Manual letter openers#44.12.16.00.00
-unspsc7#44.12.16.18.00#Scissors#44.12.16.00.00
-unspsc7#44.12.16.19.00#Pencil sharpeners#44.12.16.00.00
-unspsc7#44.12.16.20.00#Finger stalls#44.12.16.00.00
-unspsc7#44.12.16.21.00#Desk pads#44.12.16.00.00
-unspsc7#44.12.16.22.00#Moisteners#44.12.16.00.00
-unspsc7#44.12.16.23.00#Mechanical letter opener#44.12.16.00.00
-unspsc7#44.12.16.24.00#Embossing tools#44.12.16.00.00
-unspsc7#44.12.16.25.00#Paper weights#44.12.16.00.00
-unspsc7#44.12.16.26.00#Adhesive remover#44.12.16.00.00
-unspsc7#44.12.16.27.00#Bookmarks#44.12.16.00.00
-unspsc7#44.12.16.28.00#Clip holders or dispensers#44.12.16.00.00
-unspsc7#44.12.16.29.00#Paper clip dispenser or holder#44.12.16.00.00
-unspsc7#44.12.16.30.00#Stapler kit#44.12.16.00.00
-unspsc7#44.12.16.31.00#Glue dispensers or refills#44.12.16.00.00
-unspsc7#44.12.17.00.00#Writing instruments#44.12.00.00.00
-unspsc7#44.12.17.01.00#Rollerball pens#44.12.17.00.00
-unspsc7#44.12.17.02.00#Pen or pencil sets#44.12.17.00.00
-unspsc7#44.12.17.03.00#Fountain pens#44.12.17.00.00
-unspsc7#44.12.17.04.00#Ball point pens#44.12.17.00.00
-unspsc7#44.12.17.05.00#Mechanical pencils#44.12.17.00.00
-unspsc7#44.12.17.06.00#Wooden pencils#44.12.17.00.00
-unspsc7#44.12.17.07.00#Colored pencils#44.12.17.00.00
-unspsc7#44.12.17.08.00#Markers#44.12.17.00.00
-unspsc7#44.12.17.09.00#Crayons#44.12.17.00.00
-unspsc7#44.12.17.10.00#Writing chalk or accessories#44.12.17.00.00
-unspsc7#44.12.17.11.00#Felt pen#44.12.17.00.00
-unspsc7#44.12.17.12.00#Marker refills#44.12.17.00.00
-unspsc7#44.12.17.13.00#Pen nibs#44.12.17.00.00
-unspsc7#44.12.17.14.00#Pencil or pen grips#44.12.17.00.00
-unspsc7#44.12.17.15.00#Combination pen or pencil#44.12.17.00.00
-unspsc7#44.12.18.00.00#Correction media#44.12.00.00.00
-unspsc7#44.12.18.01.00#Correction film or tape#44.12.18.00.00
-unspsc7#44.12.18.02.00#Correction fluid#44.12.18.00.00
-unspsc7#44.12.18.04.00#Erasers#44.12.18.00.00
-unspsc7#44.12.18.05.00#Correction pens#44.12.18.00.00
-unspsc7#44.12.18.06.00#Correction pen refills#44.12.18.00.00
-unspsc7#44.12.18.07.00#Eraser refills#44.12.18.00.00
-unspsc7#44.12.19.00.00#Ink and lead refills#44.12.00.00.00
-unspsc7#44.12.19.01.00#India ink#44.12.19.00.00
-unspsc7#44.12.19.02.00#Lead refills#44.12.19.00.00
-unspsc7#44.12.19.03.00#Pen refills#44.12.19.00.00
-unspsc7#44.12.19.04.00#Ink refills#44.12.19.00.00
-unspsc7#44.12.19.05.00#Ink or stamp pads#44.12.19.00.00
-unspsc7#44.12.20.00.00#Folders and binders and indexes#44.12.00.00.00
-unspsc7#44.12.20.01.00#Index card files#44.12.20.00.00
-unspsc7#44.12.20.02.00#Sheet protectors#44.12.20.00.00
-unspsc7#44.12.20.03.00#Binders#44.12.20.00.00
-unspsc7#44.12.20.04.00#Data binders#44.12.20.00.00
-unspsc7#44.12.20.05.00#Magazine or book covers#44.12.20.00.00
-unspsc7#44.12.20.06.00#Hanging file folders#44.12.20.00.00
-unspsc7#44.12.20.07.00#Presentation binders#44.12.20.00.00
-unspsc7#44.12.20.08.00#Tab indexes#44.12.20.00.00
-unspsc7#44.12.20.09.00#Rotary or business card files#44.12.20.00.00
-unspsc7#44.12.20.10.00#Dividers#44.12.20.00.00
-unspsc7#44.12.20.11.00#Folders#44.12.20.00.00
-unspsc7#44.12.20.12.00#Clipboards#44.12.20.00.00
-unspsc7#44.12.20.13.00#Report covers#44.12.20.00.00
-unspsc7#44.12.20.14.00#Sheet lifters#44.12.20.00.00
-unspsc7#44.12.20.15.00#File backers#44.12.20.00.00
-unspsc7#44.12.20.16.00#Document holder#44.12.20.00.00
-unspsc7#44.12.20.17.00#Hanging folders or accessories#44.12.20.00.00
-unspsc7#44.12.20.18.00#File inserts or tabs#44.12.20.00.00
-unspsc7#44.12.20.19.00#File pockets or accessories#44.12.20.00.00
-unspsc7#44.12.20.20.00#Card pockets#44.12.20.00.00
-unspsc7#44.12.20.21.00#Postage stamp albums#44.12.20.00.00
-unspsc7#44.12.20.22.00#Binding bars#44.12.20.00.00
-unspsc7#44.12.21.00.00#Fastening supplies#44.12.00.00.00
-unspsc7#44.12.21.01.00#Rubber bands#44.12.21.00.00
-unspsc7#44.12.21.02.00#Prongs#44.12.21.00.00
-unspsc7#44.12.21.03.00#Clasp fasteners#44.12.21.00.00
-unspsc7#44.12.21.04.00#Paper clips#44.12.21.00.00
-unspsc7#44.12.21.05.00#Binder or bulldog clips#44.12.21.00.00
-unspsc7#44.12.21.06.00#Pins or tacks#44.12.21.00.00
-unspsc7#44.12.21.07.00#Staples#44.12.21.00.00
-unspsc7#44.12.21.08.00#Filing pockets#44.12.21.00.00
-unspsc7#44.12.21.09.00#Velcro fasteners#44.12.21.00.00
-unspsc7#44.12.21.10.00#Adhesive mounts#44.12.21.00.00
-unspsc7#44.12.21.11.00#Hole reinforcements#44.12.21.00.00
-unspsc7#44.12.21.12.00#Round head fasteners#44.12.21.00.00
-unspsc7#44.12.21.13.00#Tag fasteners#44.12.21.00.00
-unspsc7#44.12.21.14.00#Screw posts#44.12.21.00.00
-unspsc7#44.12.21.15.00#Adhesive corners#44.12.21.00.00
-unspsc7#44.12.21.16.00#Bag clips#44.12.21.00.00
-unspsc7#44.12.21.17.00#Book rings#44.12.21.00.00
-unspsc7#45.00.00.00.00#Printing and Photographic and Audio and Visual Equipment and Supplies#45.00.00.00.00
-unspsc7#45.10.00.00.00#Printing and publishing equipment#45.00.00.00.00
-unspsc7#45.10.15.00.00#Printing machinery and equipment#45.10.00.00.00
-unspsc7#45.10.15.01.00#Heliographic printers#45.10.15.00.00
-unspsc7#45.10.15.02.00#Offset printing presses#45.10.15.00.00
-unspsc7#45.10.15.03.00#Letterpress equipment#45.10.15.00.00
-unspsc7#45.10.15.04.00#Lithographic equipment#45.10.15.00.00
-unspsc7#45.10.15.05.00#Photogravure printing machines#45.10.15.00.00
-unspsc7#45.10.15.06.00#Silk screen printing machines#45.10.15.00.00
-unspsc7#45.10.15.07.00#Printing presses#45.10.15.00.00
-unspsc7#45.10.15.08.00#Perforating machines#45.10.15.00.00
-unspsc7#45.10.15.09.00#Ultraviolet (UV) rotary printer#45.10.15.00.00
-unspsc7#45.10.15.10.00#Flexographic printer#45.10.15.00.00
-unspsc7#45.10.15.11.00#Inkjet printer for commercial printing applications#45.10.15.00.00
-unspsc7#45.10.15.12.00#Thermal transfer printer for commercial printing applications#45.10.15.00.00
-unspsc7#45.10.15.13.00#Hot stamp printer#45.10.15.00.00
-unspsc7#45.10.15.14.00#Pad printer#45.10.15.00.00
-unspsc7#45.10.15.15.00#Core printer#45.10.15.00.00
-unspsc7#45.10.16.00.00#Printing machinery accessories#45.10.00.00.00
-unspsc7#45.10.16.02.00#Offset darkroom equipment#45.10.16.00.00
-unspsc7#45.10.16.03.00#Offset printing consumables#45.10.16.00.00
-unspsc7#45.10.16.04.00#Offset printing plate processors#45.10.16.00.00
-unspsc7#45.10.16.05.00#Offset plates#45.10.16.00.00
-unspsc7#45.10.16.06.00#Offset film processors#45.10.16.00.00
-unspsc7#45.10.16.07.00#Silk screen arc lamps#45.10.16.00.00
-unspsc7#45.10.16.08.00#Silk screen screens#45.10.16.00.00
-unspsc7#45.10.16.09.00#Silk screen printing racks#45.10.16.00.00
-unspsc7#45.10.16.10.00#Silk screen vacuum printing frames#45.10.16.00.00
-unspsc7#45.10.16.11.00#Silk screen squeegees#45.10.16.00.00
-unspsc7#45.10.17.00.00#Printing accessories#45.10.00.00.00
-unspsc7#45.10.17.01.00#Printing assemblers#45.10.17.00.00
-unspsc7#45.10.17.02.00#Printing guillotines#45.10.17.00.00
-unspsc7#45.10.17.03.00#Printing collators or decollators#45.10.17.00.00
-unspsc7#45.10.17.04.00#Printing cutters#45.10.17.00.00
-unspsc7#45.10.17.05.00#Printing trimmers#45.10.17.00.00
-unspsc7#45.10.17.06.00#Printing punches#45.10.17.00.00
-unspsc7#45.10.17.07.00#Printing plates#45.10.17.00.00
-unspsc7#45.10.17.08.00#Printing awls#45.10.17.00.00
-unspsc7#45.10.18.00.00#Book binding and sewing machinery#45.10.00.00.00
-unspsc7#45.10.18.01.00#Book creasing machines#45.10.18.00.00
-unspsc7#45.10.18.02.00#Book cutting machines#45.10.18.00.00
-unspsc7#45.10.18.03.00#Book punching machines#45.10.18.00.00
-unspsc7#45.10.18.04.00#Book stitching machines#45.10.18.00.00
-unspsc7#45.10.18.05.00#Book jogging machines#45.10.18.00.00
-unspsc7#45.10.18.06.00#Book gathering machines#45.10.18.00.00
-unspsc7#45.10.18.07.00#Book folding machines#45.10.18.00.00
-unspsc7#45.10.19.00.00#Printing laboratory equipment and accessories#45.10.00.00.00
-unspsc7#45.10.19.01.00#Banding machines#45.10.19.00.00
-unspsc7#45.10.19.02.00#Platemakers#45.10.19.00.00
-unspsc7#45.10.19.03.00#Paper drilling machines#45.10.19.00.00
-unspsc7#45.10.19.04.00#Enlargers#45.10.19.00.00
-unspsc7#45.10.19.05.00#Drawing or retouching boards#45.10.19.00.00
-unspsc7#45.10.20.00.00#Composing machines and accessories#45.10.00.00.00
-unspsc7#45.10.20.01.00#Intertype composing machines#45.10.20.00.00
-unspsc7#45.10.20.02.00#Linotype composing machines#45.10.20.00.00
-unspsc7#45.10.20.03.00#Photocomposition materials#45.10.20.00.00
-unspsc7#45.10.20.04.00#Monotype composing machines#45.10.20.00.00
-unspsc7#45.10.20.05.00#Phototypesetting machines#45.10.20.00.00
-unspsc7#45.11.00.00.00#Audio and visual presentation equipment#45.00.00.00.00
-unspsc7#45.11.15.00.00#Lecterns and sound systems and accessories#45.11.00.00.00
-unspsc7#45.11.15.01.00#Free standing lecterns#45.11.15.00.00
-unspsc7#45.11.15.02.00#Table top lecterns#45.11.15.00.00
-unspsc7#45.11.16.00.00#Projectors and supplies#45.11.00.00.00
-unspsc7#45.11.16.01.00#Pointers#45.11.16.00.00
-unspsc7#45.11.16.02.00#Projection bulbs#45.11.16.00.00
-unspsc7#45.11.16.03.00#Projection screens#45.11.16.00.00
-unspsc7#45.11.16.04.00#Slide projectors#45.11.16.00.00
-unspsc7#45.11.16.05.00#Transparency equipment or supplies#45.11.16.00.00
-unspsc7#45.11.16.06.00#Liquid crystal display projection panels#45.11.16.00.00
-unspsc7#45.11.16.07.00#Overhead projectors#45.11.16.00.00
-unspsc7#45.11.16.08.00#Film projectors#45.11.16.00.00
-unspsc7#45.11.16.09.00#Computer screen projector#45.11.16.00.00
-unspsc7#45.11.16.10.00#Epidiascopes#45.11.16.00.00
-unspsc7#45.11.16.11.00#Microfiche or microfilm viewers#45.11.16.00.00
-unspsc7#45.11.16.12.00#Dissolve controls#45.11.16.00.00
-unspsc7#45.11.16.13.00#Cathode ray tube data#45.11.16.00.00
-unspsc7#45.11.16.14.00#Liquid crystal display data or video projector#45.11.16.00.00
-unspsc7#45.11.16.15.00#Projection lenses#45.11.16.00.00
-unspsc7#45.11.16.16.00#Video projectors#45.11.16.00.00
-unspsc7#45.11.16.18.00#Presentation light boxes#45.11.16.00.00
-unspsc7#45.11.17.00.00#Audio presentation equipment and hardware and controllers#45.11.00.00.00
-unspsc7#45.11.17.01.00#Assistive listening devices#45.11.17.00.00
-unspsc7#45.11.17.02.00#Audio jack boxes#45.11.17.00.00
-unspsc7#45.11.17.03.00#Listening centers#45.11.17.00.00
-unspsc7#45.11.18.00.00#Video and combination video and audio presentation equipment and hardware and controllers#45.11.00.00.00
-unspsc7#45.11.18.01.00#Media control systems#45.11.18.00.00
-unspsc7#45.11.18.02.00#Television mounts#45.11.18.00.00
-unspsc7#45.11.18.03.00#Scan converters#45.11.18.00.00
-unspsc7#45.11.18.04.00#Line doublers#45.11.18.00.00
-unspsc7#45.11.18.05.00#Video editors#45.11.18.00.00
-unspsc7#45.11.18.06.00#Distance learning systems#45.11.18.00.00
-unspsc7#45.11.18.07.00#Interfaces#45.11.18.00.00
-unspsc7#45.11.18.08.00#Lighting controls#45.11.18.00.00
-unspsc7#45.11.19.00.00#Phone and video conference equipment and hardware and controllers#45.11.00.00.00
-unspsc7#45.11.19.01.00#Audioconferencing systems#45.11.19.00.00
-unspsc7#45.11.19.02.00#Videoconferencing systems#45.11.19.00.00
-unspsc7#45.12.00.00.00#Photographic equipment#45.00.00.00.00
-unspsc7#45.12.15.00.00#Cameras#45.12.00.00.00
-unspsc7#45.12.15.01.00#Still cameras#45.12.15.00.00
-unspsc7#45.12.15.02.00#Instant print cameras#45.12.15.00.00
-unspsc7#45.12.15.03.00#Disposable cameras#45.12.15.00.00
-unspsc7#45.12.15.04.00#Digital cameras#45.12.15.00.00
-unspsc7#45.12.15.05.00#Cinematographic cameras#45.12.15.00.00
-unspsc7#45.12.15.06.00#Video conference cameras#45.12.15.00.00
-unspsc7#45.12.15.08.00#Microfilm cameras#45.12.15.00.00
-unspsc7#45.12.15.10.00#Aerial cameras#45.12.15.00.00
-unspsc7#45.12.15.11.00#High speed cameras#45.12.15.00.00
-unspsc7#45.12.15.12.00#Underwater cameras#45.12.15.00.00
-unspsc7#45.12.15.13.00#Offset cameras#45.12.15.00.00
-unspsc7#45.12.15.14.00#Photocopier cameras#45.12.15.00.00
-unspsc7#45.12.15.15.00#Hand held camcorders#45.12.15.00.00
-unspsc7#45.12.15.16.00#Digital camcorder#45.12.15.00.00
-unspsc7#45.12.15.17.00#Document camera#45.12.15.00.00
-unspsc7#45.12.15.18.00#Camera kits#45.12.15.00.00
-unspsc7#45.12.16.00.00#Camera accessories#45.12.00.00.00
-unspsc7#45.12.16.01.00#Camera flashes or lighting#45.12.16.00.00
-unspsc7#45.12.16.02.00#Camera tripods#45.12.16.00.00
-unspsc7#45.12.16.03.00#Camera lenses or filters#45.12.16.00.00
-unspsc7#45.12.16.04.00#Camera shutters#45.12.16.00.00
-unspsc7#45.12.16.05.00#Screen frames#45.12.16.00.00
-unspsc7#45.12.16.06.00#Camera harnesses#45.12.16.00.00
-unspsc7#45.12.16.07.00#Camera blocks or holders#45.12.16.00.00
-unspsc7#45.12.16.08.00#Camera assemblies#45.12.16.00.00
-unspsc7#45.12.16.09.00#Camera brackets#45.12.16.00.00
-unspsc7#45.12.16.10.00#Camera cables#45.12.16.00.00
-unspsc7#45.12.16.11.00#Lens cover#45.12.16.00.00
-unspsc7#45.12.16.12.00#Camera tables#45.12.16.00.00
-unspsc7#45.12.16.13.00#Camera enclosures or covers#45.12.16.00.00
-unspsc7#45.12.16.14.00#Retrofit kits#45.12.16.00.00
-unspsc7#45.12.16.15.00#Camera rings#45.12.16.00.00
-unspsc7#45.12.16.16.00#Pan heads#45.12.16.00.00
-unspsc7#45.12.17.00.00#Photographic processing equipment#45.12.00.00.00
-unspsc7#45.12.17.01.00#Film driers#45.12.17.00.00
-unspsc7#45.12.17.02.00#Film washers#45.12.17.00.00
-unspsc7#45.12.17.03.00#Film splicers#45.12.17.00.00
-unspsc7#45.12.17.04.00#Film editors#45.12.17.00.00
-unspsc7#45.12.17.05.00#Photographic enlargers#45.12.17.00.00
-unspsc7#45.13.00.00.00#Photographic and recording media#45.00.00.00.00
-unspsc7#45.13.15.00.00#Still picture film#45.13.00.00.00
-unspsc7#45.13.15.01.00#Color film#45.13.15.00.00
-unspsc7#45.13.15.02.00#Black and white film#45.13.15.00.00
-unspsc7#45.13.15.03.00#Instant picture film#45.13.15.00.00
-unspsc7#45.13.15.04.00#Microfilm#45.13.15.00.00
-unspsc7#45.13.15.05.00#X ray film#45.13.15.00.00
-unspsc7#45.13.15.06.00#Photography paper#45.13.15.00.00
-unspsc7#45.13.16.00.00#Moving picture media#45.13.00.00.00
-unspsc7#45.13.16.01.00#Motion picture camera film#45.13.16.00.00
-unspsc7#45.13.16.04.00#Blank video tapes#45.13.16.00.00
-unspsc7#45.13.17.00.00#Media storage#45.13.00.00.00
-unspsc7#45.13.17.01.00#Slide trays#45.13.17.00.00
-unspsc7#45.14.00.00.00#Photographic filmmaking supplies#45.00.00.00.00
-unspsc7#45.14.15.00.00#Photographic processing chemicals#45.14.00.00.00
-unspsc7#45.14.15.01.00#Developer solution#45.14.15.00.00
-unspsc7#45.14.15.02.00#Fixative#45.14.15.00.00
-unspsc7#45.14.16.00.00#Darkroom supplies#45.14.00.00.00
-unspsc7#45.14.16.01.00#Developing trays#45.14.16.00.00
-unspsc7#45.14.16.02.00#Developing tanks#45.14.16.00.00
-unspsc7#45.14.16.03.00#Developing tongs#45.14.16.00.00
-unspsc7#46.00.00.00.00#Defense and Law Enforcement and Security and Safety Equipment and Supplies#46.00.00.00.00
-unspsc7#46.10.00.00.00#Light weapons and ammunition#46.00.00.00.00
-unspsc7#46.10.15.00.00#Firearms#46.10.00.00.00
-unspsc7#46.10.15.01.00#Machine guns#46.10.15.00.00
-unspsc7#46.10.15.02.00#Police or security shotguns#46.10.15.00.00
-unspsc7#46.10.15.03.00#Military rifles#46.10.15.00.00
-unspsc7#46.10.15.04.00#Handguns#46.10.15.00.00
-unspsc7#46.10.15.05.00#Air rifles or air handguns#46.10.15.00.00
-unspsc7#46.10.15.06.00#Parts of guns or pistols#46.10.15.00.00
-unspsc7#46.10.16.00.00#Ammunition#46.10.00.00.00
-unspsc7#46.10.16.01.00#Defense or law enforcement ammunition#46.10.16.00.00
-unspsc7#46.10.17.00.00#Ammunition handling systems#46.10.00.00.00
-unspsc7#46.10.17.01.00#Tank ammunition handling systems#46.10.17.00.00
-unspsc7#46.10.17.02.00#Aircraft ammunition handling systems#46.10.17.00.00
-unspsc7#46.10.18.00.00#Arms and ammunition accessories#46.10.00.00.00
-unspsc7#46.10.18.01.00#Gun cases#46.10.18.00.00
-unspsc7#46.11.00.00.00#Conventional war weapons#46.00.00.00.00
-unspsc7#46.11.15.00.00#Bombs and grenades#46.11.00.00.00
-unspsc7#46.11.15.01.00#Grenades#46.11.15.00.00
-unspsc7#46.11.15.02.00#Mines#46.11.15.00.00
-unspsc7#46.11.15.03.00#Mortar bombs#46.11.15.00.00
-unspsc7#46.11.16.00.00#Gun systems#46.11.00.00.00
-unspsc7#46.11.16.01.00#Chain gun systems#46.11.16.00.00
-unspsc7#46.11.16.02.00#Gatling gun systems#46.11.16.00.00
-unspsc7#46.11.17.00.00#Infrared (IR) sensors#46.11.00.00.00
-unspsc7#46.11.17.01.00#Infrared (IR) coolers#46.11.17.00.00
-unspsc7#46.11.17.02.00#Infrared (IR) detectors#46.11.17.00.00
-unspsc7#46.11.18.00.00#Naval weapons#46.11.00.00.00
-unspsc7#46.11.18.01.00#Torpedoes#46.11.18.00.00
-unspsc7#46.12.00.00.00#Missiles#46.00.00.00.00
-unspsc7#46.12.15.00.00#Guided missiles#46.12.00.00.00
-unspsc7#46.12.15.01.00#Air to air missiles#46.12.15.00.00
-unspsc7#46.12.15.02.00#Antiaircraft missiles#46.12.15.00.00
-unspsc7#46.12.15.03.00#Antimissile missiles#46.12.15.00.00
-unspsc7#46.12.15.04.00#Antiship missiles#46.12.15.00.00
-unspsc7#46.12.15.05.00#Antitank missiles#46.12.15.00.00
-unspsc7#46.12.15.06.00#Ballistic missiles#46.12.15.00.00
-unspsc7#46.12.15.07.00#Cruise missiles#46.12.15.00.00
-unspsc7#46.12.15.08.00#Surface to air missiles#46.12.15.00.00
-unspsc7#46.12.15.09.00#Antiballistic missiles#46.12.15.00.00
-unspsc7#46.12.15.10.00#Surface to surface missiles#46.12.15.00.00
-unspsc7#46.12.15.11.00#Air to surface missiles#46.12.15.00.00
-unspsc7#46.12.15.12.00#Training missiles#46.12.15.00.00
-unspsc7#46.12.16.00.00#Missile subsystems#46.12.00.00.00
-unspsc7#46.12.16.01.00#Electronic safe or arm devices#46.12.16.00.00
-unspsc7#46.12.16.02.00#Solid missile boosters#46.12.16.00.00
-unspsc7#46.12.16.03.00#Missile warheads#46.12.16.00.00
-unspsc7#46.12.16.04.00#Safety pin pullers#46.12.16.00.00
-unspsc7#46.12.16.05.00#Jet reaction control assemblies#46.12.16.00.00
-unspsc7#46.13.00.00.00#Rockets and subsystems#46.00.00.00.00
-unspsc7#46.13.15.00.00#Launch vehicles and rockets#46.13.00.00.00
-unspsc7#46.13.15.01.00#Multi stage rockets#46.13.15.00.00
-unspsc7#46.13.15.02.00#Reusable rockets#46.13.15.00.00
-unspsc7#46.13.15.03.00#Single stage rockets#46.13.15.00.00
-unspsc7#46.13.15.04.00#Liquid rockets#46.13.15.00.00
-unspsc7#46.13.15.05.00#Solid rockets#46.13.15.00.00
-unspsc7#46.13.16.00.00#Boosters#46.13.00.00.00
-unspsc7#46.13.16.01.00#Reusable boosters#46.13.16.00.00
-unspsc7#46.13.16.02.00#Solid boosters#46.13.16.00.00
-unspsc7#46.13.16.03.00#Multi stage boosters#46.13.16.00.00
-unspsc7#46.13.16.04.00#Liquid boosters#46.13.16.00.00
-unspsc7#46.14.00.00.00#Launchers#46.00.00.00.00
-unspsc7#46.14.15.00.00#Missile and rocket launchers#46.14.00.00.00
-unspsc7#46.14.15.01.00#Missile launchers#46.14.15.00.00
-unspsc7#46.14.15.02.00#Rocket launchers#46.14.15.00.00
-unspsc7#46.15.00.00.00#Law enforcement#46.00.00.00.00
-unspsc7#46.15.15.00.00#Crowd control equipment#46.15.00.00.00
-unspsc7#46.15.15.01.00#Barricades#46.15.15.00.00
-unspsc7#46.15.15.02.00#Riot helmets#46.15.15.00.00
-unspsc7#46.15.15.03.00#Riot shields#46.15.15.00.00
-unspsc7#46.15.15.04.00#Body armour#46.15.15.00.00
-unspsc7#46.15.15.05.00#Barriers#46.15.15.00.00
-unspsc7#46.15.16.00.00#Security and control equipment#46.15.00.00.00
-unspsc7#46.15.16.01.00#Handcuffs#46.15.16.00.00
-unspsc7#46.15.16.02.00#Night sticks#46.15.16.00.00
-unspsc7#46.15.16.03.00#Fingerprint equipment#46.15.16.00.00
-unspsc7#46.15.16.04.00#Alcohol analysers#46.15.16.00.00
-unspsc7#46.15.16.05.00#Weapons or explosives detectors#46.15.16.00.00
-unspsc7#46.15.16.06.00#Narcotic test kits#46.15.16.00.00
-unspsc7#46.16.00.00.00#Public safety and control#46.00.00.00.00
-unspsc7#46.16.15.00.00#Traffic control#46.16.00.00.00
-unspsc7#46.16.15.01.00#Airport signaling systems#46.16.15.00.00
-unspsc7#46.16.15.02.00#Railway signaling systems#46.16.15.00.00
-unspsc7#46.16.15.03.00#Marine signaling systems#46.16.15.00.00
-unspsc7#46.16.15.04.00#Traffic signals#46.16.15.00.00
-unspsc7#46.16.15.05.00#Parking meters#46.16.15.00.00
-unspsc7#46.16.15.06.00#Snow or ice melter#46.16.15.00.00
-unspsc7#46.16.15.07.00#Barrier tape#46.16.15.00.00
-unspsc7#46.16.15.08.00#Traffic or floor cones#46.16.15.00.00
-unspsc7#46.16.15.09.00#Speed stoppers#46.16.15.00.00
-unspsc7#46.16.16.00.00#Water safety#46.16.00.00.00
-unspsc7#46.16.16.01.00#Rope float lines#46.16.16.00.00
-unspsc7#46.16.16.02.00#Life rings#46.16.16.00.00
-unspsc7#46.16.16.03.00#Pool alarms#46.16.16.00.00
-unspsc7#46.16.16.04.00#Life vests or preservers#46.16.16.00.00
-unspsc7#46.17.00.00.00#Security surveillance and detection#46.00.00.00.00
-unspsc7#46.17.15.00.00#Locks and security hardware#46.17.00.00.00
-unspsc7#46.17.15.01.00#Padlocks#46.17.15.00.00
-unspsc7#46.17.15.02.00#Cable locks#46.17.15.00.00
-unspsc7#46.17.15.03.00#Lock sets#46.17.15.00.00
-unspsc7#46.17.15.04.00#Pushbutton locks#46.17.15.00.00
-unspsc7#46.17.15.05.00#Keys or accessories#46.17.15.00.00
-unspsc7#46.17.15.06.00#Safes#46.17.15.00.00
-unspsc7#46.17.15.07.00#Security bars#46.17.15.00.00
-unspsc7#46.17.15.08.00#Number locks#46.17.15.00.00
-unspsc7#46.17.15.09.00#Key cabinets#46.17.15.00.00
-unspsc7#46.17.15.10.00#Time locks#46.17.15.00.00
-unspsc7#46.17.15.11.00#Lockout devices#46.17.15.00.00
-unspsc7#46.17.15.12.00#Instrument locks#46.17.15.00.00
-unspsc7#46.17.15.13.00#Locking cam#46.17.15.00.00
-unspsc7#46.17.15.14.00#Security chains or accessories#46.17.15.00.00
-unspsc7#46.17.16.00.00#Surveillance and detection equipment#46.17.00.00.00
-unspsc7#46.17.16.02.00#Safety horns#46.17.16.00.00
-unspsc7#46.17.16.03.00#Clock timers#46.17.16.00.00
-unspsc7#46.17.16.04.00#Alarm systems#46.17.16.00.00
-unspsc7#46.17.16.05.00#Door chimes#46.17.16.00.00
-unspsc7#46.17.16.06.00#Sirens#46.17.16.00.00
-unspsc7#46.17.16.07.00#Buzzers#46.17.16.00.00
-unspsc7#46.17.16.08.00#Motion detectors#46.17.16.00.00
-unspsc7#46.17.16.09.00#Convex security mirrors#46.17.16.00.00
-unspsc7#46.17.16.10.00#Security cameras#46.17.16.00.00
-unspsc7#46.17.16.11.00#Video identification systems#46.17.16.00.00
-unspsc7#46.17.16.12.00#Video monitors#46.17.16.00.00
-unspsc7#46.17.16.13.00#Gas detectors#46.17.16.00.00
-unspsc7#46.17.16.14.00#Surveillance cameras#46.17.16.00.00
-unspsc7#46.17.16.15.00#Light enhancing cameras or vision devices#46.17.16.00.00
-unspsc7#46.17.16.16.00#Radar detectors#46.17.16.00.00
-unspsc7#46.17.16.17.00#Door eyes#46.17.16.00.00
-unspsc7#46.17.16.18.00#Door bells#46.17.16.00.00
-unspsc7#46.18.00.00.00#Personal safety and protection#46.00.00.00.00
-unspsc7#46.18.15.00.00#Safety apparel#46.18.00.00.00
-unspsc7#46.18.15.01.00#Protective aprons#46.18.15.00.00
-unspsc7#46.18.15.02.00#Bullet proof vests#46.18.15.00.00
-unspsc7#46.18.15.03.00#Protective coveralls#46.18.15.00.00
-unspsc7#46.18.15.04.00#Protective gloves#46.18.15.00.00
-unspsc7#46.18.15.05.00#Protective knee pads#46.18.15.00.00
-unspsc7#46.18.15.06.00#Protective ponchos#46.18.15.00.00
-unspsc7#46.18.15.07.00#Safety vests#46.18.15.00.00
-unspsc7#46.18.15.08.00#Fire retardant apparel#46.18.15.00.00
-unspsc7#46.18.15.09.00#Hazardous material protective apparel#46.18.15.00.00
-unspsc7#46.18.15.10.00#Fire retardant gloves#46.18.15.00.00
-unspsc7#46.18.15.11.00#Hazardous material protective goods#46.18.15.00.00
-unspsc7#46.18.15.12.00#Cleanroom apparel#46.18.15.00.00
-unspsc7#46.18.15.13.00#Cleanroom gloves#46.18.15.00.00
-unspsc7#46.18.15.14.00#Elbow protectors#46.18.15.00.00
-unspsc7#46.18.15.15.00#Insecticide protective clothing#46.18.15.00.00
-unspsc7#46.18.15.16.00#Safety sleeves#46.18.15.00.00
-unspsc7#46.18.15.17.00#Insulated or flotation suits#46.18.15.00.00
-unspsc7#46.18.15.18.00#Heat resistant clothing#46.18.15.00.00
-unspsc7#46.18.15.19.00#Safety harnesses or belts#46.18.15.00.00
-unspsc7#46.18.15.20.00#Leg protectors#46.18.15.00.00
-unspsc7#46.18.15.21.00#Radiation protection clothing or coats#46.18.15.00.00
-unspsc7#46.18.15.22.00#Safety hoods#46.18.15.00.00
-unspsc7#46.18.15.23.00#Insulated clothing for cold environments#46.18.15.00.00
-unspsc7#46.18.15.24.00#Personal flotation devices#46.18.15.00.00
-unspsc7#46.18.15.25.00#Protective rainwear or wet environment apparel#46.18.15.00.00
-unspsc7#46.18.15.26.00#Protective shirts#46.18.15.00.00
-unspsc7#46.18.15.27.00#Protective pants#46.18.15.00.00
-unspsc7#46.18.15.28.00#Protective frock#46.18.15.00.00
-unspsc7#46.18.15.29.00#Insulated clothing for cold environments#46.18.15.00.00
-unspsc7#46.18.15.30.00#Protective finger cots#46.18.15.00.00
-unspsc7#46.18.15.31.00#Reflective suspenders#46.18.15.00.00
-unspsc7#46.18.15.32.00#Lab coats#46.18.15.00.00
-unspsc7#46.18.16.00.00#Safety footwear#46.18.00.00.00
-unspsc7#46.18.16.01.00#Fire retardant footwear#46.18.16.00.00
-unspsc7#46.18.16.02.00#Hazardous material protective footwear#46.18.16.00.00
-unspsc7#46.18.16.03.00#Cleanroom footwear#46.18.16.00.00
-unspsc7#46.18.16.04.00#Safety boots#46.18.16.00.00
-unspsc7#46.18.16.05.00#Safety shoes#46.18.16.00.00
-unspsc7#46.18.16.06.00#Footwear covers#46.18.16.00.00
-unspsc7#46.18.17.00.00#Face and head protection#46.18.00.00.00
-unspsc7#46.18.17.01.00#Hard hats#46.18.17.00.00
-unspsc7#46.18.17.02.00#Facial shields#46.18.17.00.00
-unspsc7#46.18.17.03.00#Welding masks#46.18.17.00.00
-unspsc7#46.18.17.04.00#Safety helmets#46.18.17.00.00
-unspsc7#46.18.17.05.00#Motorcycle helmets#46.18.17.00.00
-unspsc7#46.18.17.06.00#Helmet parts or accessories#46.18.17.00.00
-unspsc7#46.18.18.00.00#Vision protection and accessories#46.18.00.00.00
-unspsc7#46.18.18.01.00#Eyewear holders#46.18.18.00.00
-unspsc7#46.18.18.02.00#Safety glasses#46.18.18.00.00
-unspsc7#46.18.18.03.00#Eye shields#46.18.18.00.00
-unspsc7#46.18.18.04.00#Goggles#46.18.18.00.00
-unspsc7#46.18.18.05.00#Video display filters#46.18.18.00.00
-unspsc7#46.18.18.06.00#Lens cleaner#46.18.18.00.00
-unspsc7#46.18.19.00.00#Hearing protectors#46.18.00.00.00
-unspsc7#46.18.19.01.00#Ear plugs#46.18.19.00.00
-unspsc7#46.18.19.02.00#Ear muffs#46.18.19.00.00
-unspsc7#46.18.20.00.00#Respiratory protection#46.18.00.00.00
-unspsc7#46.18.20.01.00#Masks#46.18.20.00.00
-unspsc7#46.18.20.02.00#Respirators#46.18.20.00.00
-unspsc7#46.18.20.03.00#Gas masks#46.18.20.00.00
-unspsc7#46.18.20.04.00#Respiration air supplying self contained breathing apparatus (SCBA)#46.18.20.00.00
-unspsc7#46.18.20.05.00#Mask filters#46.18.20.00.00
-unspsc7#46.18.21.00.00#Anti static equipment and supplies#46.18.00.00.00
-unspsc7#46.18.21.01.00#Antistatic wrist straps#46.18.21.00.00
-unspsc7#46.18.21.02.00#Heel grounding straps#46.18.21.00.00
-unspsc7#46.18.21.03.00#Grounding hardware#46.18.21.00.00
-unspsc7#46.18.21.04.00#Anti static floor mats#46.18.21.00.00
-unspsc7#46.18.21.05.00#Anti static worktable mats#46.18.21.00.00
-unspsc7#46.18.21.06.00#Antistatic belts#46.18.21.00.00
-unspsc7#46.18.21.07.00#Antistatic maintenance kits#46.18.21.00.00
-unspsc7#46.18.21.08.00#Antistatic toe straps#46.18.21.00.00
-unspsc7#46.18.22.00.00#Ergonomic support aids#46.18.00.00.00
-unspsc7#46.18.22.01.00#Back support belts#46.18.22.00.00
-unspsc7#46.18.22.02.00#Elbow supports#46.18.22.00.00
-unspsc7#46.18.22.03.00#Back support rests#46.18.22.00.00
-unspsc7#46.18.22.04.00#Wrist braces#46.18.22.00.00
-unspsc7#46.18.22.05.00#Foot rests#46.18.22.00.00
-unspsc7#46.18.22.06.00#Wrist rests#46.18.22.00.00
-unspsc7#46.18.22.07.00#Ankle supports#46.18.22.00.00
-unspsc7#46.18.22.08.00#Shoe insoles#46.18.22.00.00
-unspsc7#46.18.23.00.00#Fall protection#46.18.00.00.00
-unspsc7#46.18.23.01.00#Lifelines or lifeline equipment#46.18.23.00.00
-unspsc7#46.18.23.02.00#Fall protection lanyard#46.18.23.00.00
-unspsc7#46.18.23.03.00#Safety harness winders#46.18.23.00.00
-unspsc7#46.18.23.04.00#Anchorage connector#46.18.23.00.00
-unspsc7#46.18.23.05.00#Self retracting lanyard#46.18.23.00.00
-unspsc7#46.18.24.00.00#Decontamination aids#46.18.00.00.00
-unspsc7#46.18.24.01.00#Decontamination shower#46.18.24.00.00
-unspsc7#46.18.25.00.00#Personal safety devices or weapons#46.18.00.00.00
-unspsc7#46.18.25.01.00#Repellents for canine attacks#46.18.25.00.00
-unspsc7#46.19.00.00.00#Fire protection#46.00.00.00.00
-unspsc7#46.19.15.00.00#Fire prevention#46.19.00.00.00
-unspsc7#46.19.15.01.00#Smoke detectors#46.19.15.00.00
-unspsc7#46.19.15.02.00#Heat detectors#46.19.15.00.00
-unspsc7#46.19.15.03.00#Fire resistant coatings or putties or sealants#46.19.15.00.00
-unspsc7#46.19.16.00.00#Fire fighting equipment#46.19.00.00.00
-unspsc7#46.19.16.01.00#Fire extinguishers#46.19.16.00.00
-unspsc7#46.19.16.02.00#Fire sprinkler systems#46.19.16.00.00
-unspsc7#46.19.16.03.00#Fire hoses or nozzles#46.19.16.00.00
-unspsc7#46.19.16.04.00#Fire blankets#46.19.16.00.00
-unspsc7#46.19.16.05.00#Fire suppression hand tools#46.19.16.00.00
-unspsc7#46.19.16.06.00#Fire suppression foam or similar compounds#46.19.16.00.00
-unspsc7#46.19.16.07.00#Fire breathing apparatus#46.19.16.00.00
-unspsc7#47.00.00.00.00#Cleaning Equipment and Supplies#47.00.00.00.00
-unspsc7#47.10.00.00.00#Water and wastewater treatment supply and disposal#47.00.00.00.00
-unspsc7#47.10.15.00.00#Water treatment and supply equipment#47.10.00.00.00
-unspsc7#47.10.15.01.00#Activated carbon equipment#47.10.15.00.00
-unspsc7#47.10.15.02.00#Ammonia removal equipment#47.10.15.00.00
-unspsc7#47.10.15.03.00#Carbon filtration equipment#47.10.15.00.00
-unspsc7#47.10.15.04.00#Bacterial removal equipment#47.10.15.00.00
-unspsc7#47.10.15.05.00#Chlorine handling equipment#47.10.15.00.00
-unspsc7#47.10.15.06.00#Corrosion control equipment#47.10.15.00.00
-unspsc7#47.10.15.07.00#Grit chambers#47.10.15.00.00
-unspsc7#47.10.15.08.00#Desalination equipment#47.10.15.00.00
-unspsc7#47.10.15.09.00#Fluoridation equipment#47.10.15.00.00
-unspsc7#47.10.15.10.00#Iron removal equipment#47.10.15.00.00
-unspsc7#47.10.15.11.00#Ion exchange equipment#47.10.15.00.00
-unspsc7#47.10.15.12.00#Mixers or agitators#47.10.15.00.00
-unspsc7#47.10.15.13.00#Oxygen generators#47.10.15.00.00
-unspsc7#47.10.15.14.00#Water purification equipment#47.10.15.00.00
-unspsc7#47.10.15.16.00#Turbidimeters#47.10.15.00.00
-unspsc7#47.10.15.17.00#Ultraviolet disinfection equipment#47.10.15.00.00
-unspsc7#47.10.15.18.00#Water conditioners#47.10.15.00.00
-unspsc7#47.10.15.19.00#Water softening accessories#47.10.15.00.00
-unspsc7#47.10.15.21.00#Ultrafiltration equipment#47.10.15.00.00
-unspsc7#47.10.15.22.00#Packaged water treatment systems#47.10.15.00.00
-unspsc7#47.10.15.23.00#Collection tanks#47.10.15.00.00
-unspsc7#47.10.15.24.00#Sludge or sewage composting equipment#47.10.15.00.00
-unspsc7#47.10.15.25.00#Dewatering equipment#47.10.15.00.00
-unspsc7#47.10.15.26.00#Sludge pelletizers#47.10.15.00.00
-unspsc7#47.10.15.27.00#Sludge shredders#47.10.15.00.00
-unspsc7#47.10.15.28.00#Water treatment dryers#47.10.15.00.00
-unspsc7#47.10.15.29.00#Incinerators#47.10.15.00.00
-unspsc7#47.10.15.30.00#Odor control equipment#47.10.15.00.00
-unspsc7#47.10.15.31.00#Septic tanks#47.10.15.00.00
-unspsc7#47.10.15.32.00#Settling tanks#47.10.15.00.00
-unspsc7#47.10.15.33.00#Lift stations#47.10.15.00.00
-unspsc7#47.10.15.34.00#Sewage distributors#47.10.15.00.00
-unspsc7#47.10.15.35.00#Sludge disposal equipment#47.10.15.00.00
-unspsc7#47.10.15.36.00#Sludge collectors#47.10.15.00.00
-unspsc7#47.10.15.37.00#Sludge conditioning equipment#47.10.15.00.00
-unspsc7#47.10.15.38.00#Sludge or sewage digesters#47.10.15.00.00
-unspsc7#47.10.15.39.00#Sludge or sewage removal equipment#47.10.15.00.00
-unspsc7#47.10.16.00.00#Water treatment consumables#47.10.00.00.00
-unspsc7#47.10.16.01.00#Algaecides#47.10.16.00.00
-unspsc7#47.10.16.02.00#Antiscalants#47.10.16.00.00
-unspsc7#47.10.16.03.00#Descalers#47.10.16.00.00
-unspsc7#47.10.16.04.00#Boiler feed chemicals#47.10.16.00.00
-unspsc7#47.10.16.05.00#Bacterial removal chemicals#47.10.16.00.00
-unspsc7#47.10.16.06.00#Corrosion control chemicals#47.10.16.00.00
-unspsc7#47.10.16.07.00#Odor control chemicals#47.10.16.00.00
-unspsc7#47.10.16.08.00#Flocculents#47.10.16.00.00
-unspsc7#47.10.16.09.00#Microbiocides#47.10.16.00.00
-unspsc7#47.10.16.10.00#Water softening compounds#47.10.16.00.00
-unspsc7#47.10.16.11.00#Demulsifiers#47.10.16.00.00
-unspsc7#47.10.16.12.00#Polyelectrolytes#47.10.16.00.00
-unspsc7#47.11.00.00.00#Industrial laundry and dry cleaning equipment#47.00.00.00.00
-unspsc7#47.11.15.00.00#Washing and drying equipment#47.11.00.00.00
-unspsc7#47.11.15.01.00#Laundry type combined washing or drying machines#47.11.15.00.00
-unspsc7#47.11.15.02.00#Laundry type washing machines#47.11.15.00.00
-unspsc7#47.11.15.03.00#Clothes dryers#47.11.15.00.00
-unspsc7#47.11.15.04.00#Laundry type drying machines#47.11.15.00.00
-unspsc7#47.11.15.05.00#Laundry equipment stands#47.11.15.00.00
-unspsc7#47.11.16.00.00#Ironing equipment#47.11.00.00.00
-unspsc7#47.11.16.01.00#Ironing machines or presses#47.11.16.00.00
-unspsc7#47.11.16.02.00#Folding machines#47.11.16.00.00
-unspsc7#47.11.16.03.00#Steam pressing machines#47.11.16.00.00
-unspsc7#47.11.17.00.00#Dry cleaning equipment#47.11.00.00.00
-unspsc7#47.11.17.01.00#Dry cleaning machines#47.11.17.00.00
-unspsc7#47.12.00.00.00#Janitorial equipment#47.00.00.00.00
-unspsc7#47.12.15.00.00#Janitor carts and accessories#47.12.00.00.00
-unspsc7#47.12.15.01.00#Janitor carts#47.12.15.00.00
-unspsc7#47.12.15.02.00#Janitor cart accessories#47.12.15.00.00
-unspsc7#47.12.16.00.00#Floor machines and accessories#47.12.00.00.00
-unspsc7#47.12.16.02.00#Vacuum cleaners#47.12.16.00.00
-unspsc7#47.12.16.03.00#Floor polishers#47.12.16.00.00
-unspsc7#47.12.16.04.00#Wet or dry combination vacuum cleaners#47.12.16.00.00
-unspsc7#47.12.16.05.00#Floor scrubbers#47.12.16.00.00
-unspsc7#47.12.16.06.00#Carpet sweepers#47.12.16.00.00
-unspsc7#47.12.16.07.00#Vacuum cleaner supplies or accessories#47.12.16.00.00
-unspsc7#47.12.16.08.00#Floor machine pads#47.12.16.00.00
-unspsc7#47.12.16.09.00#Carpet cleaning equipment#47.12.16.00.00
-unspsc7#47.12.16.10.00#Floor washing machine#47.12.16.00.00
-unspsc7#47.12.17.00.00#Waste containers and accessories#47.12.00.00.00
-unspsc7#47.12.17.01.00#Trash bags#47.12.17.00.00
-unspsc7#47.12.17.02.00#Waste containers or rigid liners#47.12.17.00.00
-unspsc7#47.12.17.03.00#Smoking urns or accessories#47.12.17.00.00
-unspsc7#47.12.17.04.00#Waste container lids#47.12.17.00.00
-unspsc7#47.12.17.05.00#Urn sand bags#47.12.17.00.00
-unspsc7#47.12.17.06.00#Ash trays#47.12.17.00.00
-unspsc7#47.12.17.07.00#Motion sickness bags#47.12.17.00.00
-unspsc7#47.12.18.00.00#Cleaning equipment#47.12.00.00.00
-unspsc7#47.12.18.01.00#Cleaning dusters#47.12.18.00.00
-unspsc7#47.12.18.02.00#Lint removers#47.12.18.00.00
-unspsc7#47.12.18.03.00#Squeeges or washers#47.12.18.00.00
-unspsc7#47.12.18.04.00#Cleaning pails or buckets#47.12.18.00.00
-unspsc7#47.12.18.05.00#Pressure or steam cleaners#47.12.18.00.00
-unspsc7#47.12.18.06.00#Mop wringer#47.12.18.00.00
-unspsc7#47.12.18.07.00#Drain or toilet plunger#47.12.18.00.00
-unspsc7#47.12.18.08.00#Drain or pipe cleaning equipment#47.12.18.00.00
-unspsc7#47.12.18.09.00#Degreasing pans#47.12.18.00.00
-unspsc7#47.12.18.10.00#Cleaning rag dispenser#47.12.18.00.00
-unspsc7#47.12.18.11.00#Duct cleaning machines#47.12.18.00.00
-unspsc7#47.13.00.00.00#Cleaning and janitorial supplies#47.00.00.00.00
-unspsc7#47.13.15.00.00#Cleaning rags and cloths and wipes#47.13.00.00.00
-unspsc7#47.13.15.01.00#Rags#47.13.15.00.00
-unspsc7#47.13.15.02.00#Wipes#47.13.15.00.00
-unspsc7#47.13.16.00.00#Brooms and mops and brushes and accessories#47.13.00.00.00
-unspsc7#47.13.16.01.00#Dust brushes or pans#47.13.16.00.00
-unspsc7#47.13.16.02.00#Scouring pads#47.13.16.00.00
-unspsc7#47.13.16.03.00#Sponges#47.13.16.00.00
-unspsc7#47.13.16.04.00#Brooms#47.13.16.00.00
-unspsc7#47.13.16.05.00#Cleaning brushes#47.13.16.00.00
-unspsc7#47.13.16.06.00#Dust mops#47.13.16.00.00
-unspsc7#47.13.16.07.00#Wet mops#47.13.16.00.00
-unspsc7#47.13.16.08.00#Toilet brushes#47.13.16.00.00
-unspsc7#47.13.16.09.00#Broom or mop handles#47.13.16.00.00
-unspsc7#47.13.16.10.00#Floor finish applicator#47.13.16.00.00
-unspsc7#47.13.16.11.00#Trash picker#47.13.16.00.00
-unspsc7#47.13.16.12.00#Replacement rubbers#47.13.16.00.00
-unspsc7#47.13.16.13.00#Mop or broom holder#47.13.16.00.00
-unspsc7#47.13.16.14.00#Cleaning equipment clamps#47.13.16.00.00
-unspsc7#47.13.17.00.00#Restroom supplies#47.13.00.00.00
-unspsc7#47.13.17.01.00#Paper towel dispensers#47.13.17.00.00
-unspsc7#47.13.17.02.00#Sanitary goods dispensers#47.13.17.00.00
-unspsc7#47.13.17.03.00#Sanitary waste receptacles#47.13.17.00.00
-unspsc7#47.13.17.04.00#Institutional soap or lotion dispensers#47.13.17.00.00
-unspsc7#47.13.17.05.00#Urinal or toilet accessories#47.13.17.00.00
-unspsc7#47.13.17.06.00#Air freshener dispensers#47.13.17.00.00
-unspsc7#47.13.17.07.00#Institutional hand dryers#47.13.17.00.00
-unspsc7#47.13.17.08.00#Bathroom tissue dispenser#47.13.17.00.00
-unspsc7#47.13.17.09.00#Facial tissue dispensers#47.13.17.00.00
-unspsc7#47.13.17.10.00#Toilet tissue dispensers#47.13.17.00.00
-unspsc7#47.13.17.11.00#Cleaner dispenser#47.13.17.00.00
-unspsc7#47.13.18.00.00#Cleaning and disinfecting solutions#47.13.00.00.00
-unspsc7#47.13.18.01.00#Floor cleaners#47.13.18.00.00
-unspsc7#47.13.18.02.00#Floor waxes#47.13.18.00.00
-unspsc7#47.13.18.03.00#Household disinfectants#47.13.18.00.00
-unspsc7#47.13.18.04.00#Ammonias#47.13.18.00.00
-unspsc7#47.13.18.05.00#General purpose cleaners#47.13.18.00.00
-unspsc7#47.13.18.06.00#Furniture polish or waxes#47.13.18.00.00
-unspsc7#47.13.18.07.00#Bleaches#47.13.18.00.00
-unspsc7#47.13.18.08.00#Dry germicidal#47.13.18.00.00
-unspsc7#47.13.18.09.00#Shoe cleaning or polishing products#47.13.18.00.00
-unspsc7#47.13.18.10.00#Dishwashing products#47.13.18.00.00
-unspsc7#47.13.18.11.00#Laundry products#47.13.18.00.00
-unspsc7#47.13.18.12.00#Air freshener#47.13.18.00.00
-unspsc7#47.13.18.13.00#Screen cleaner#47.13.18.00.00
-unspsc7#47.13.18.14.00#Metal cleaners or polishes#47.13.18.00.00
-unspsc7#47.13.18.15.00#Drain cleaner#47.13.18.00.00
-unspsc7#47.13.18.16.00#Deodorizers#47.13.18.00.00
-unspsc7#47.13.18.17.00#Household or automotive protectants#47.13.18.00.00
-unspsc7#47.13.18.18.00#Air sanitizer#47.13.18.00.00
-unspsc7#47.13.18.19.00#Caustic cleaners#47.13.18.00.00
-unspsc7#47.13.18.20.00#Petroleum derivative cleaners#47.13.18.00.00
-unspsc7#47.13.18.21.00#Degreasing compounds#47.13.18.00.00
-unspsc7#47.13.18.22.00#Carbon removing compounds#47.13.18.00.00
-unspsc7#47.13.18.23.00#Deicers and defrosters#47.13.18.00.00
-unspsc7#47.13.18.24.00#Glass or window cleaners#47.13.18.00.00
-unspsc7#47.13.18.25.00#Contact surface cleaners#47.13.18.00.00
-unspsc7#47.13.19.00.00#Absorbents#47.13.00.00.00
-unspsc7#47.13.19.01.00#Mats#47.13.19.00.00
-unspsc7#47.13.19.02.00#Granular absorbent#47.13.19.00.00
-unspsc7#47.13.19.03.00#Plugging compound#47.13.19.00.00
-unspsc7#47.13.19.04.00#Absorbent socks#47.13.19.00.00
-unspsc7#47.13.19.05.00#Spill kits#47.13.19.00.00
-unspsc7#47.13.19.06.00#Pans#47.13.19.00.00
-unspsc7#47.13.19.07.00#Absorbent booms#47.13.19.00.00
-unspsc7#47.13.19.08.00#Absorbent pillows#47.13.19.00.00
-unspsc7#47.13.20.00.00#Mats#47.13.00.00.00
-unspsc7#47.13.21.00.00#Cleaning kits#47.13.00.00.00
-unspsc7#47.13.21.01.00#Industrial cleaning kits#47.13.21.00.00
-unspsc7#47.13.21.02.00#General purpose cleaning kits#47.13.21.00.00
-unspsc7#48.00.00.00.00#Service Industry Machinery and Equipment and Supplies#48.00.00.00.00
-unspsc7#48.10.00.00.00#Institutional food services equipment#48.00.00.00.00
-unspsc7#48.10.15.00.00#Cooking and warming equipment#48.10.00.00.00
-unspsc7#48.10.15.01.00#Commercial use bain maries#48.10.15.00.00
-unspsc7#48.10.15.02.00#Commercial use barbeque ovens#48.10.15.00.00
-unspsc7#48.10.15.03.00#Commercial use broilers#48.10.15.00.00
-unspsc7#48.10.15.04.00#Commercial use charcoal grills#48.10.15.00.00
-unspsc7#48.10.15.05.00#Commercial use coffee or iced tea makers#48.10.15.00.00
-unspsc7#48.10.15.06.00#Commercial use coffee warmers#48.10.15.00.00
-unspsc7#48.10.15.07.00#Commercial use convection ovens#48.10.15.00.00
-unspsc7#48.10.15.08.00#Commercial use conveyer toasters#48.10.15.00.00
-unspsc7#48.10.15.09.00#Commercial use deep fryers#48.10.15.00.00
-unspsc7#48.10.15.10.00#Commercial use food warmers#48.10.15.00.00
-unspsc7#48.10.15.11.00#Commercial use griddles#48.10.15.00.00
-unspsc7#48.10.15.12.00#Commercial use grills#48.10.15.00.00
-unspsc7#48.10.15.13.00#Commercial use heat lamps#48.10.15.00.00
-unspsc7#48.10.15.14.00#Commercial use high pressure steamers#48.10.15.00.00
-unspsc7#48.10.15.15.00#Commercial use hot dog grills#48.10.15.00.00
-unspsc7#48.10.15.16.00#Commercial use microwave ovens#48.10.15.00.00
-unspsc7#48.10.15.17.00#Commercial use ovens#48.10.15.00.00
-unspsc7#48.10.15.18.00#Commercial use pasta cookers#48.10.15.00.00
-unspsc7#48.10.15.19.00#Commercial use pizza ovens#48.10.15.00.00
-unspsc7#48.10.15.20.00#Commercial use popcorn machines#48.10.15.00.00
-unspsc7#48.10.15.21.00#Commercial use ranges#48.10.15.00.00
-unspsc7#48.10.15.22.00#Commercial use rotisseries#48.10.15.00.00
-unspsc7#48.10.15.23.00#Commercial use smokers or smoke ovens#48.10.15.00.00
-unspsc7#48.10.15.24.00#Commercial use steamers#48.10.15.00.00
-unspsc7#48.10.15.25.00#Commercial use toasters#48.10.15.00.00
-unspsc7#48.10.15.26.00#Commercial use waffle irons#48.10.15.00.00
-unspsc7#48.10.15.27.00#Barbecues#48.10.15.00.00
-unspsc7#48.10.15.28.00#Commercial use crepe machines#48.10.15.00.00
-unspsc7#48.10.15.29.00#Pressure cookers or pressure fryers#48.10.15.00.00
-unspsc7#48.10.15.30.00#Commercial use rice cookers#48.10.15.00.00
-unspsc7#48.10.15.31.00#Commercial salmon poachers or kettles#48.10.15.00.00
-unspsc7#48.10.16.00.00#Food preparation equipment#48.10.00.00.00
-unspsc7#48.10.16.01.00#Commercial use blenders#48.10.16.00.00
-unspsc7#48.10.16.02.00#Commercial use electric can openers#48.10.16.00.00
-unspsc7#48.10.16.03.00#Commercial use food choppers or cubers or dicers#48.10.16.00.00
-unspsc7#48.10.16.04.00#Commercial use coffee grinders#48.10.16.00.00
-unspsc7#48.10.16.05.00#Commercial use food grinders#48.10.16.00.00
-unspsc7#48.10.16.06.00#Commercial use graters#48.10.16.00.00
-unspsc7#48.10.16.07.00#Commercial use juicers#48.10.16.00.00
-unspsc7#48.10.16.08.00#Commercial use mixers#48.10.16.00.00
-unspsc7#48.10.16.09.00#Commercial use pasta machines#48.10.16.00.00
-unspsc7#48.10.16.10.00#Commercial use peelers#48.10.16.00.00
-unspsc7#48.10.16.11.00#Commercial use scales#48.10.16.00.00
-unspsc7#48.10.16.12.00#Commercial use food processors#48.10.16.00.00
-unspsc7#48.10.16.13.00#Commercial use dough machines#48.10.16.00.00
-unspsc7#48.10.16.14.00#Commercial use icing sets or bags#48.10.16.00.00
-unspsc7#48.10.16.15.00#Commercial use dishwashers#48.10.16.00.00
-unspsc7#48.10.16.16.00#Commercial use bread slicers#48.10.16.00.00
-unspsc7#48.10.16.17.00#Commercial use plastic shovels#48.10.16.00.00
-unspsc7#48.10.17.00.00#Food and beverage dispensing equipment#48.10.00.00.00
-unspsc7#48.10.17.01.00#Carbonated beverage dispenser#48.10.17.00.00
-unspsc7#48.10.17.02.00#Non carbonated beverage dispenser#48.10.17.00.00
-unspsc7#48.10.17.03.00#Milk dispensers#48.10.17.00.00
-unspsc7#48.10.17.04.00#Syrup pumps#48.10.17.00.00
-unspsc7#48.10.17.05.00#Cappuccino or espresso machines#48.10.17.00.00
-unspsc7#48.10.17.06.00#Milkshake machines#48.10.17.00.00
-unspsc7#48.10.17.07.00#Soft serve machines#48.10.17.00.00
-unspsc7#48.10.17.08.00#Slush machines#48.10.17.00.00
-unspsc7#48.10.17.09.00#Ice dispensers#48.10.17.00.00
-unspsc7#48.10.17.10.00#Drinking fountains or bubblers#48.10.17.00.00
-unspsc7#48.10.17.11.00#Bottled water dispensers or accessories#48.10.17.00.00
-unspsc7#48.10.17.12.00#Cup dispenser#48.10.17.00.00
-unspsc7#48.10.17.13.00#Cocktail shakers or accessories#48.10.17.00.00
-unspsc7#48.10.17.14.00#Hot water dispenser#48.10.17.00.00
-unspsc7#48.10.18.00.00#Cookware and kitchen tools#48.10.00.00.00
-unspsc7#48.10.18.01.00#Commercial use cutlery#48.10.18.00.00
-unspsc7#48.10.18.02.00#Commercial use molds#48.10.18.00.00
-unspsc7#48.10.18.03.00#Commercial use scoops#48.10.18.00.00
-unspsc7#48.10.18.04.00#Commercial use measuring cups#48.10.18.00.00
-unspsc7#48.10.18.05.00#Commercial use mixing bowls#48.10.18.00.00
-unspsc7#48.10.18.06.00#Commercial use cake or pie pans#48.10.18.00.00
-unspsc7#48.10.18.07.00#Commercial use pizza pans#48.10.18.00.00
-unspsc7#48.10.18.08.00#Commercial use sauce or saute pans#48.10.18.00.00
-unspsc7#48.10.18.09.00#Commercial use stock or sauce pots#48.10.18.00.00
-unspsc7#48.10.18.10.00#Commercial use pot or pan covers#48.10.18.00.00
-unspsc7#48.10.18.11.00#Commercial use rolling pins#48.10.18.00.00
-unspsc7#48.10.18.12.00#Commercial use strainers#48.10.18.00.00
-unspsc7#48.10.18.13.00#Commercial use whisks#48.10.18.00.00
-unspsc7#48.10.18.14.00#Commercial use woks#48.10.18.00.00
-unspsc7#48.10.18.15.00#Commercial use ladles#48.10.18.00.00
-unspsc7#48.10.18.16.00#Commercial use cutlery pouch#48.10.18.00.00
-unspsc7#48.10.18.17.00#Cake decorating equipment or moulds#48.10.18.00.00
-unspsc7#48.10.19.00.00#Tabletop and serving equipment#48.10.00.00.00
-unspsc7#48.10.19.01.00#Food service dinnerware#48.10.19.00.00
-unspsc7#48.10.19.02.00#Food service flatware#48.10.19.00.00
-unspsc7#48.10.19.03.00#Food service glasses#48.10.19.00.00
-unspsc7#48.10.19.04.00#Food service stemware#48.10.19.00.00
-unspsc7#48.10.19.05.00#Food service cups or mugs#48.10.19.00.00
-unspsc7#48.10.19.06.00#Food service serving baskets#48.10.19.00.00
-unspsc7#48.10.19.07.00#Food service pitchers#48.10.19.00.00
-unspsc7#48.10.19.08.00#Food service chafers#48.10.19.00.00
-unspsc7#48.10.19.09.00#Food service coffee or tea pots#48.10.19.00.00
-unspsc7#48.10.19.10.00#Food service soup crocks#48.10.19.00.00
-unspsc7#48.10.19.11.00#Food service ice buckets or wine coolers#48.10.19.00.00
-unspsc7#48.10.19.12.00#Food service condiment dispensers#48.10.19.00.00
-unspsc7#48.10.19.13.00#Food service punch bowls#48.10.19.00.00
-unspsc7#48.10.19.14.00#Food service wine carafes#48.10.19.00.00
-unspsc7#48.10.19.15.00#Food service trays#48.10.19.00.00
-unspsc7#48.10.19.16.00#Food service napkin dispensers#48.10.19.00.00
-unspsc7#48.10.19.17.00#Food service fondue pots#48.10.19.00.00
-unspsc7#48.10.20.00.00#Restaurant furniture#48.10.00.00.00
-unspsc7#48.10.20.01.00#Restaurant chairs#48.10.20.00.00
-unspsc7#48.10.20.02.00#Booths#48.10.20.00.00
-unspsc7#48.10.20.03.00#Salad bars#48.10.20.00.00
-unspsc7#48.10.20.04.00#Tabletops#48.10.20.00.00
-unspsc7#48.10.20.05.00#Restaurant or bar stools#48.10.20.00.00
-unspsc7#48.10.20.06.00#Permanent bars#48.10.20.00.00
-unspsc7#48.10.20.07.00#Portable bars#48.10.20.00.00
-unspsc7#48.10.21.00.00#Storage and handling equipment#48.10.00.00.00
-unspsc7#48.10.21.01.00#Display cases#48.10.21.00.00
-unspsc7#48.10.21.02.00#Heated display cases#48.10.21.00.00
-unspsc7#48.10.21.03.00#Refrigerated display cases#48.10.21.00.00
-unspsc7#48.10.21.04.00#Ice cream display cases#48.10.21.00.00
-unspsc7#48.10.21.05.00#Glass chilling equipment#48.10.21.00.00
-unspsc7#48.10.21.06.00#Cool containers#48.10.21.00.00
-unspsc7#48.11.00.00.00#Vending machines#48.00.00.00.00
-unspsc7#48.11.10.00.00#Liquid vending machines#48.11.00.00.00
-unspsc7#48.11.10.01.00#Machines dispensing single servings with cups#48.11.10.00.00
-unspsc7#48.11.10.02.00#Machines dispensing bulk quantities#48.11.10.00.00
-unspsc7#48.11.11.00.00#Piece and part vending machines#48.11.00.00.00
-unspsc7#48.11.11.01.00#Bottle or can vending machines#48.11.11.00.00
-unspsc7#48.11.11.02.00#Gumball candy or childrens novelties machines#48.11.11.00.00
-unspsc7#48.11.11.03.00#Snack or small package goods display machines#48.11.11.00.00
-unspsc7#48.11.11.04.00#A la carte foods vending machines#48.11.11.00.00
-unspsc7#48.11.11.05.00#Frozen confections machines#48.11.11.00.00
-unspsc7#48.11.11.06.00#Personal accommodation item dispensers#48.11.11.00.00
-unspsc7#48.11.11.07.00#Cigarette machines#48.11.11.00.00
-unspsc7#48.11.12.00.00#Prepared to order food vending machines#48.11.00.00.00
-unspsc7#48.11.12.01.00#French fry vending machines#48.11.12.00.00
-unspsc7#48.11.12.02.00#Popcorn vending machines#48.11.12.00.00
-unspsc7#48.11.13.00.00#Service and ticket vending machines#48.11.00.00.00
-unspsc7#48.11.13.01.00#Ticket dispensing machines#48.11.13.00.00
-unspsc7#48.11.13.02.00#Insurance policy vending machines#48.11.13.00.00
-unspsc7#48.11.13.03.00#Stamp machines#48.11.13.00.00
-unspsc7#48.11.14.00.00#Currency vending machines#48.11.00.00.00
-unspsc7#48.11.14.01.00#Automatic teller machines (ATMs)#48.11.14.00.00
-unspsc7#48.11.14.02.00#Bill to coin changers#48.11.14.00.00
-unspsc7#48.11.14.03.00#Foreign currency exchange machines#48.11.14.00.00
-unspsc7#48.11.14.04.00#Electronic funds transfer point of sale equipment#48.11.14.00.00
-unspsc7#48.12.00.00.00#Gambling or wagering equipment#48.00.00.00.00
-unspsc7#48.12.11.00.00#Coin operated gambling machines#48.12.00.00.00
-unspsc7#48.12.11.01.00#Poker or slot machines#48.12.11.00.00
-unspsc7#48.12.12.00.00#Gambling tables and games#48.12.00.00.00
-unspsc7#48.12.12.01.00#Roulette wheels#48.12.12.00.00
-unspsc7#48.12.12.02.00#Card tables#48.12.12.00.00
-unspsc7#48.12.13.00.00#Gambling management and networked wagering systems#48.12.00.00.00
-unspsc7#48.12.13.01.00#Table gambling management systems#48.12.13.00.00
-unspsc7#48.12.13.02.00#Networked wagering games#48.12.13.00.00
-unspsc7#49.00.00.00.00#Sports and Recreational Equipment and Supplies and Accessories#49.00.00.00.00
-unspsc7#49.10.00.00.00#Collectibles and awards#49.00.00.00.00
-unspsc7#49.10.15.00.00#Art#49.10.00.00.00
-unspsc7#49.10.15.01.00#Paintings#49.10.15.00.00
-unspsc7#49.10.15.02.00#Sculptures#49.10.15.00.00
-unspsc7#49.10.15.03.00#Statuary#49.10.15.00.00
-unspsc7#49.10.15.04.00#Portraits#49.10.15.00.00
-unspsc7#49.10.15.05.00#Drawings#49.10.15.00.00
-unspsc7#49.10.15.06.00#Pictures#49.10.15.00.00
-unspsc7#49.10.15.07.00#Lithographs#49.10.15.00.00
-unspsc7#49.10.15.08.00#Posters#49.10.15.00.00
-unspsc7#49.10.15.09.00#Decorative pot#49.10.15.00.00
-unspsc7#49.10.15.10.00#Scrolls#49.10.15.00.00
-unspsc7#49.10.15.11.00#Photographs#49.10.15.00.00
-unspsc7#49.10.15.12.00#Flower vases#49.10.15.00.00
-unspsc7#49.10.16.00.00#Collectibles#49.10.00.00.00
-unspsc7#49.10.16.01.00#Antiques#49.10.16.00.00
-unspsc7#49.10.16.02.00#Souvenirs#49.10.16.00.00
-unspsc7#49.10.16.03.00#Mint coin collections#49.10.16.00.00
-unspsc7#49.10.16.04.00#Stamp collections#49.10.16.00.00
-unspsc7#49.10.16.05.00#Antique rugs#49.10.16.00.00
-unspsc7#49.10.16.06.00#Diggings#49.10.16.00.00
-unspsc7#49.10.16.07.00#Comic book collections#49.10.16.00.00
-unspsc7#49.10.16.08.00#Antique musical instruments#49.10.16.00.00
-unspsc7#49.10.16.09.00#Ornaments or decorations#49.10.16.00.00
-unspsc7#49.10.16.10.00#Key chains#49.10.16.00.00
-unspsc7#49.10.16.11.00#Charms#49.10.16.00.00
-unspsc7#49.10.16.12.00#Holograms#49.10.16.00.00
-unspsc7#49.10.16.13.00#Glass crystals#49.10.16.00.00
-unspsc7#49.10.17.00.00#Awards#49.10.00.00.00
-unspsc7#49.10.17.01.00#Medals#49.10.17.00.00
-unspsc7#49.10.17.02.00#Trophies#49.10.17.00.00
-unspsc7#49.10.17.03.00#Medallions#49.10.17.00.00
-unspsc7#49.10.17.04.00#Plaques#49.10.17.00.00
-unspsc7#49.10.17.05.00#Certificates#49.10.17.00.00
-unspsc7#49.10.17.06.00#Photo award#49.10.17.00.00
-unspsc7#49.10.17.07.00#Achievement certificate#49.10.17.00.00
-unspsc7#49.10.17.08.00#Crowns#49.10.17.00.00
-unspsc7#49.11.00.00.00#Musical instruments#49.00.00.00.00
-unspsc7#49.11.15.00.00#Keyboard instruments#49.11.00.00.00
-unspsc7#49.11.15.01.00#Musical organs#49.11.15.00.00
-unspsc7#49.11.15.02.00#Accordions#49.11.15.00.00
-unspsc7#49.11.15.03.00#Pianos#49.11.15.00.00
-unspsc7#49.11.16.00.00#Brass instruments#49.11.00.00.00
-unspsc7#49.11.16.01.00#Trumpets#49.11.16.00.00
-unspsc7#49.11.16.02.00#Trombones#49.11.16.00.00
-unspsc7#49.11.16.03.00#Sousaphones#49.11.16.00.00
-unspsc7#49.11.16.04.00#Saxophones#49.11.16.00.00
-unspsc7#49.11.16.05.00#Whistle#49.11.16.00.00
-unspsc7#49.11.17.00.00#Woodwind instruments#49.11.00.00.00
-unspsc7#49.11.17.01.00#Clarinets#49.11.17.00.00
-unspsc7#49.11.17.02.00#Oboes#49.11.17.00.00
-unspsc7#49.11.17.03.00#Musical flutes#49.11.17.00.00
-unspsc7#49.11.17.04.00#Piccoloes#49.11.17.00.00
-unspsc7#49.11.17.05.00#Musical cornets#49.11.17.00.00
-unspsc7#49.11.17.06.00#Bagpipes#49.11.17.00.00
-unspsc7#49.11.17.07.00#Harmonicas#49.11.17.00.00
-unspsc7#49.11.17.08.00#Kazoos#49.11.17.00.00
-unspsc7#49.11.18.00.00#String instruments#49.11.00.00.00
-unspsc7#49.11.18.01.00#Harpsichords#49.11.18.00.00
-unspsc7#49.11.18.02.00#Clavichords#49.11.18.00.00
-unspsc7#49.11.18.03.00#Guitars#49.11.18.00.00
-unspsc7#49.11.18.04.00#Violins#49.11.18.00.00
-unspsc7#49.11.18.05.00#Harps#49.11.18.00.00
-unspsc7#49.11.18.06.00#Banjoes#49.11.18.00.00
-unspsc7#49.11.19.00.00#Percussion instruments#49.11.00.00.00
-unspsc7#49.11.19.01.00#Cymbals#49.11.19.00.00
-unspsc7#49.11.19.02.00#Bells#49.11.19.00.00
-unspsc7#49.11.19.03.00#Tambourines#49.11.19.00.00
-unspsc7#49.11.19.04.00#Castanets#49.11.19.00.00
-unspsc7#49.11.19.05.00#Drums#49.11.19.00.00
-unspsc7#49.11.19.06.00#Xylophones#49.11.19.00.00
-unspsc7#49.11.19.07.00#Bodhran#49.11.19.00.00
-unspsc7#49.11.20.00.00#Musical instrument parts and accessories#49.11.00.00.00
-unspsc7#49.11.20.01.00#Metronomes#49.11.20.00.00
-unspsc7#49.11.20.02.00#Reeds#49.11.20.00.00
-unspsc7#49.11.20.03.00#Instrument strings or picks#49.11.20.00.00
-unspsc7#49.11.20.04.00#Tuning pins#49.11.20.00.00
-unspsc7#49.11.20.05.00#Musical instrument stands or sheet holders#49.11.20.00.00
-unspsc7#49.11.20.06.00#Accessories for stringed instruments#49.11.20.00.00
-unspsc7#49.11.20.07.00#Percussion instrument accessory#49.11.20.00.00
-unspsc7#49.11.20.08.00#Music boxes or mechanisms#49.11.20.00.00
-unspsc7#49.12.00.00.00#Camping and outdoor equipment and accessories#49.00.00.00.00
-unspsc7#49.12.15.00.00#Camping and outdoor equipment#49.12.00.00.00
-unspsc7#49.12.15.01.00#Tarpaulins#49.12.15.00.00
-unspsc7#49.12.15.02.00#Sleeping pads#49.12.15.00.00
-unspsc7#49.12.15.03.00#Tents#49.12.15.00.00
-unspsc7#49.12.15.04.00#Sleeping bags#49.12.15.00.00
-unspsc7#49.12.15.05.00#Ice chests#49.12.15.00.00
-unspsc7#49.12.15.06.00#Tent repair kits#49.12.15.00.00
-unspsc7#49.12.15.07.00#Pneumatic mattresses#49.12.15.00.00
-unspsc7#49.12.15.08.00#Mosquito nets#49.12.15.00.00
-unspsc7#49.12.15.09.00#Camping or outdoor stoves#49.12.15.00.00
-unspsc7#49.12.15.10.00#Drink coolers#49.12.15.00.00
-unspsc7#49.12.16.00.00#Camping furniture#49.12.00.00.00
-unspsc7#49.12.16.01.00#Camping chairs or stools#49.12.16.00.00
-unspsc7#49.12.16.02.00#Camping tables#49.12.16.00.00
-unspsc7#49.12.16.03.00#Camping cots#49.12.16.00.00
-unspsc7#49.13.00.00.00#Fishing and hunting equipment#49.00.00.00.00
-unspsc7#49.13.15.00.00#Fishing tackle#49.13.00.00.00
-unspsc7#49.13.15.01.00#Fishing rods#49.13.15.00.00
-unspsc7#49.13.15.02.00#Fishing line#49.13.15.00.00
-unspsc7#49.13.15.03.00#Fishing reels#49.13.15.00.00
-unspsc7#49.13.15.04.00#Fishing lures#49.13.15.00.00
-unspsc7#49.13.15.05.00#Fishing bait#49.13.15.00.00
-unspsc7#49.13.15.06.00#Fishing weights or sinkers#49.13.15.00.00
-unspsc7#49.13.16.00.00#Hunting products#49.13.00.00.00
-unspsc7#49.13.16.01.00#Animal calls#49.13.16.00.00
-unspsc7#49.13.16.02.00#Sporting decoys#49.13.16.00.00
-unspsc7#49.13.16.03.00#Sporting traps#49.13.16.00.00
-unspsc7#49.13.16.04.00#Sporting shotguns#49.13.16.00.00
-unspsc7#49.13.16.05.00#Sporting rifles#49.13.16.00.00
-unspsc7#49.13.16.06.00#Sporting ammunition#49.13.16.00.00
-unspsc7#49.13.16.07.00#Gun barrel#49.13.16.00.00
-unspsc7#49.14.00.00.00#Watersports equipment#49.00.00.00.00
-unspsc7#49.14.15.00.00#Scuba and snorkeling gear#49.14.00.00.00
-unspsc7#49.14.15.01.00#Bouyancy compensators#49.14.15.00.00
-unspsc7#49.14.15.02.00#Scuba tanks#49.14.15.00.00
-unspsc7#49.14.15.03.00#Scuba regulators#49.14.15.00.00
-unspsc7#49.14.15.04.00#Diving instruments or accessories#49.14.15.00.00
-unspsc7#49.14.15.05.00#Masks or fins or snorkels#49.14.15.00.00
-unspsc7#49.14.15.06.00#Wetsuits#49.14.15.00.00
-unspsc7#49.14.15.07.00#Drysuits#49.14.15.00.00
-unspsc7#49.14.16.00.00#Surf and swim equipment and accessories#49.14.00.00.00
-unspsc7#49.14.16.02.00#Wakeboards or kneeboards or boogieboards#49.14.16.00.00
-unspsc7#49.14.16.03.00#Water skis or accessories#49.14.16.00.00
-unspsc7#49.14.16.04.00#Windsurfing equipment#49.14.16.00.00
-unspsc7#49.14.16.05.00#Surfboards#49.14.16.00.00
-unspsc7#49.14.16.06.00#Swim goggles or swim fins#49.14.16.00.00
-unspsc7#49.14.16.07.00#Parasailing equipment#49.14.16.00.00
-unspsc7#49.15.00.00.00#Winter sports equipment#49.00.00.00.00
-unspsc7#49.15.15.00.00#Skiing and snowboarding equipment#49.15.00.00.00
-unspsc7#49.15.15.01.00#Ski boots#49.15.15.00.00
-unspsc7#49.15.15.02.00#Skis#49.15.15.00.00
-unspsc7#49.15.15.03.00#Ski poles#49.15.15.00.00
-unspsc7#49.15.15.04.00#Bindings#49.15.15.00.00
-unspsc7#49.15.15.05.00#Snowboards#49.15.15.00.00
-unspsc7#49.15.16.00.00#Skating and ice hockey equipment#49.15.00.00.00
-unspsc7#49.15.16.01.00#Hockey pucks#49.15.16.00.00
-unspsc7#49.15.16.02.00#Ice skates#49.15.16.00.00
-unspsc7#49.15.16.03.00#Hockey sticks#49.15.16.00.00
-unspsc7#49.16.00.00.00#Field and court sports equipment#49.00.00.00.00
-unspsc7#49.16.15.00.00#Field sports equipment#49.16.00.00.00
-unspsc7#49.16.15.01.00#Football blocking sleds#49.16.15.00.00
-unspsc7#49.16.15.02.00#Baseball gloves#49.16.15.00.00
-unspsc7#49.16.15.03.00#Baseballs#49.16.15.00.00
-unspsc7#49.16.15.04.00#Footballs#49.16.15.00.00
-unspsc7#49.16.15.05.00#Soccer balls#49.16.15.00.00
-unspsc7#49.16.15.06.00#Baseball bats#49.16.15.00.00
-unspsc7#49.16.15.07.00#Baseball bases#49.16.15.00.00
-unspsc7#49.16.15.08.00#Pitching machines#49.16.15.00.00
-unspsc7#49.16.15.09.00#Softballs#49.16.15.00.00
-unspsc7#49.16.15.10.00#Football tackling dummies#49.16.15.00.00
-unspsc7#49.16.15.11.00#Lacrosse sticks#49.16.15.00.00
-unspsc7#49.16.15.12.00#Lacrosse balls#49.16.15.00.00
-unspsc7#49.16.15.13.00#Field hockey sticks#49.16.15.00.00
-unspsc7#49.16.15.14.00#Field hockey balls#49.16.15.00.00
-unspsc7#49.16.15.15.00#Team handball balls#49.16.15.00.00
-unspsc7#49.16.15.16.00#Team handball school sets#49.16.15.00.00
-unspsc7#49.16.15.17.00#Baseball or softball protective gear#49.16.15.00.00
-unspsc7#49.16.15.18.00#Baseball batting aids#49.16.15.00.00
-unspsc7#49.16.15.19.00#Baseball backstops or fences#49.16.15.00.00
-unspsc7#49.16.15.20.00#Softball bats#49.16.15.00.00
-unspsc7#49.16.15.21.00#Softball gloves#49.16.15.00.00
-unspsc7#49.16.15.22.00#Football kicking tees#49.16.15.00.00
-unspsc7#49.16.15.23.00#Flag football gear#49.16.15.00.00
-unspsc7#49.16.15.24.00#Soccer field marking equipment#49.16.15.00.00
-unspsc7#49.16.15.25.00#Soccer protective equipment#49.16.15.00.00
-unspsc7#49.16.15.26.00#Soccer training aids#49.16.15.00.00
-unspsc7#49.16.16.00.00#Racquet and court sports equipment#49.16.00.00.00
-unspsc7#49.16.16.01.00#Racquetball rackets#49.16.16.00.00
-unspsc7#49.16.16.02.00#Badminton rackets#49.16.16.00.00
-unspsc7#49.16.16.03.00#Basketballs#49.16.16.00.00
-unspsc7#49.16.16.04.00#Tennis balls#49.16.16.00.00
-unspsc7#49.16.16.05.00#Racquet balls#49.16.16.00.00
-unspsc7#49.16.16.06.00#Squash balls#49.16.16.00.00
-unspsc7#49.16.16.07.00#Tennis racquets#49.16.16.00.00
-unspsc7#49.16.16.08.00#Volleyballs#49.16.16.00.00
-unspsc7#49.16.16.09.00#Badminton birdies or shuttlecocks#49.16.16.00.00
-unspsc7#49.16.16.10.00#Squash racquets#49.16.16.00.00
-unspsc7#49.16.16.11.00#Tennis training aids#49.16.16.00.00
-unspsc7#49.16.16.12.00#Tennis court equipment#49.16.16.00.00
-unspsc7#49.16.16.13.00#Volleyball storage for balls or nets#49.16.16.00.00
-unspsc7#49.16.16.14.00#Volleyball gymnasium standards#49.16.16.00.00
-unspsc7#49.16.16.15.00#Basketball complete game systems#49.16.16.00.00
-unspsc7#49.16.16.16.00#Floor hockey protective equipment#49.16.16.00.00
-unspsc7#49.16.16.17.00#Tether poles#49.16.16.00.00
-unspsc7#49.16.16.18.00#Tether balls#49.16.16.00.00
-unspsc7#49.16.17.00.00#Track sports equipment#49.16.00.00.00
-unspsc7#49.16.17.01.00#Javelins#49.16.17.00.00
-unspsc7#49.16.17.02.00#Jumping bars#49.16.17.00.00
-unspsc7#49.16.17.03.00#Discus#49.16.17.00.00
-unspsc7#49.16.17.04.00#Shotputs#49.16.17.00.00
-unspsc7#49.16.17.05.00#Vaulting poles#49.16.17.00.00
-unspsc7#49.16.17.06.00#Hurdles#49.16.17.00.00
-unspsc7#49.16.17.07.00#Batons#49.16.17.00.00
-unspsc7#49.17.00.00.00#Gymnastics and boxing equipment#49.00.00.00.00
-unspsc7#49.17.15.00.00#Gymnastics equipment#49.17.00.00.00
-unspsc7#49.17.15.01.00#Gymnastic bars or beams#49.17.15.00.00
-unspsc7#49.17.15.02.00#Gymnastic ropes or rings or climbing accessories#49.17.15.00.00
-unspsc7#49.17.15.03.00#Gymnastic vaulting equipment#49.17.15.00.00
-unspsc7#49.17.15.04.00#Gymnastic trampolines#49.17.15.00.00
-unspsc7#49.17.15.05.00#Balance equipment#49.17.15.00.00
-unspsc7#49.17.16.00.00#Boxing equipment#49.17.00.00.00
-unspsc7#49.17.16.01.00#Boxing rings#49.17.16.00.00
-unspsc7#49.17.16.02.00#Punching bags#49.17.16.00.00
-unspsc7#49.17.16.03.00#Boxing gloves#49.17.16.00.00
-unspsc7#49.18.00.00.00#Target and table games and equipment#49.00.00.00.00
-unspsc7#49.18.15.00.00#Table games and equipment#49.18.00.00.00
-unspsc7#49.18.15.01.00#Billiard tables#49.18.15.00.00
-unspsc7#49.18.15.02.00#Pool cues#49.18.15.00.00
-unspsc7#49.18.15.03.00#Shuffleboard#49.18.15.00.00
-unspsc7#49.18.15.04.00#Pinball games#49.18.15.00.00
-unspsc7#49.18.15.05.00#Billiard balls#49.18.15.00.00
-unspsc7#49.18.15.06.00#Air hockey tables or accessories#49.18.15.00.00
-unspsc7#49.18.15.07.00#Tennis tables#49.18.15.00.00
-unspsc7#49.18.15.08.00#Table tennis paddles#49.18.15.00.00
-unspsc7#49.18.15.09.00#Table tennis balls#49.18.15.00.00
-unspsc7#49.18.15.10.00#Foosball tables#49.18.15.00.00
-unspsc7#49.18.15.11.00#Foosballs#49.18.15.00.00
-unspsc7#49.18.15.12.00#Foosball replacement players#49.18.15.00.00
-unspsc7#49.18.15.13.00#Billiard cue tips#49.18.15.00.00
-unspsc7#49.18.15.14.00#Billiard chalk#49.18.15.00.00
-unspsc7#49.18.15.15.00#Billiard racks#49.18.15.00.00
-unspsc7#49.18.16.00.00#Target games and equipment#49.18.00.00.00
-unspsc7#49.18.16.01.00#Archery targets#49.18.16.00.00
-unspsc7#49.18.16.02.00#Archery bows#49.18.16.00.00
-unspsc7#49.18.16.03.00#Archery arrows#49.18.16.00.00
-unspsc7#49.18.16.04.00#Darts#49.18.16.00.00
-unspsc7#49.18.16.05.00#Dart boards#49.18.16.00.00
-unspsc7#49.18.16.06.00#Trapshooting equipment#49.18.16.00.00
-unspsc7#49.18.16.07.00#Throwing targets#49.18.16.00.00
-unspsc7#49.18.16.08.00#Archery bow strings#49.18.16.00.00
-unspsc7#49.18.16.09.00#Archery gloves#49.18.16.00.00
-unspsc7#49.18.16.10.00#Archery arm guards#49.18.16.00.00
-unspsc7#49.18.16.11.00#Archery target stands#49.18.16.00.00
-unspsc7#49.18.16.12.00#Archery backstops#49.18.16.00.00
-unspsc7#49.20.00.00.00#Fitness equipment#49.00.00.00.00
-unspsc7#49.20.15.00.00#Aerobic training equipment#49.20.00.00.00
-unspsc7#49.20.15.01.00#Treadmills#49.20.15.00.00
-unspsc7#49.20.15.02.00#Stair climbers#49.20.15.00.00
-unspsc7#49.20.15.03.00#Stationary bicycles#49.20.15.00.00
-unspsc7#49.20.15.04.00#Rowing machines#49.20.15.00.00
-unspsc7#49.20.15.12.00#Jump ropes#49.20.15.00.00
-unspsc7#49.20.15.13.00#Exercise trampolines#49.20.15.00.00
-unspsc7#49.20.15.14.00#Exercise balls#49.20.15.00.00
-unspsc7#49.20.15.15.00#Step aerobic equipment#49.20.15.00.00
-unspsc7#49.20.16.00.00#Weight and resistance training equipment#49.20.00.00.00
-unspsc7#49.20.16.01.00#Dumbbells#49.20.16.00.00
-unspsc7#49.20.16.02.00#Barbells#49.20.16.00.00
-unspsc7#49.20.16.03.00#Lower body resistance machines#49.20.16.00.00
-unspsc7#49.20.16.04.00#Weight benches or racks#49.20.16.00.00
-unspsc7#49.20.16.05.00#Upper body resistance machines#49.20.16.00.00
-unspsc7#49.20.16.06.00#Fitness weights#49.20.16.00.00
-unspsc7#49.20.16.07.00#Pilates machines#49.20.16.00.00
-unspsc7#49.20.16.08.00#Grip strengthener#49.20.16.00.00
-unspsc7#49.20.16.09.00#Resistance bands#49.20.16.00.00
-unspsc7#49.20.16.10.00#Resistance tubes#49.20.16.00.00
-unspsc7#49.21.00.00.00#Other sports#49.00.00.00.00
-unspsc7#49.21.16.00.00#Golf equipment#49.21.00.00.00
-unspsc7#49.21.16.01.00#Golf bags#49.21.16.00.00
-unspsc7#49.21.16.02.00#Golf balls#49.21.16.00.00
-unspsc7#49.21.16.03.00#Golf clubs#49.21.16.00.00
-unspsc7#49.21.16.04.00#Golf tees#49.21.16.00.00
-unspsc7#49.21.16.05.00#Golf club head covers#49.21.16.00.00
-unspsc7#49.21.16.06.00#Golf gloves#49.21.16.00.00
-unspsc7#49.21.16.07.00#Divot fixers#49.21.16.00.00
-unspsc7#49.21.17.00.00#Bowling equipment and supplies and accessories#49.21.00.00.00
-unspsc7#49.21.17.01.00#Bowling equipment#49.21.17.00.00
-unspsc7#49.21.17.02.00#Bowling supplies#49.21.17.00.00
-unspsc7#49.21.17.03.00#Bowling accessories#49.21.17.00.00
-unspsc7#49.21.18.00.00#Physical education classroom equipment#49.21.00.00.00
-unspsc7#49.21.18.01.00#Parachute equipment#49.21.18.00.00
-unspsc7#49.21.18.02.00#Hula hoops or hoop equipment#49.21.18.00.00
-unspsc7#49.21.18.03.00#Orienteering equipment#49.21.18.00.00
-unspsc7#49.21.18.04.00#Team identification materials or markers#49.21.18.00.00
-unspsc7#49.21.18.05.00#Lanyards#49.21.18.00.00
-unspsc7#49.21.18.06.00#Physical education equipment storage#49.21.18.00.00
-unspsc7#49.21.18.07.00#Physical education assessment tools#49.21.18.00.00
-unspsc7#49.22.00.00.00#Sports accessories#49.00.00.00.00
-unspsc7#49.22.15.00.00#Sport accessories#49.22.00.00.00
-unspsc7#49.22.15.01.00#Sport scoreboards#49.22.15.00.00
-unspsc7#49.22.15.02.00#Sport goals#49.22.15.00.00
-unspsc7#49.22.15.03.00#Sport safety equipment other than headgear#49.22.15.00.00
-unspsc7#49.22.15.04.00#Sport safety headgear#49.22.15.00.00
-unspsc7#49.22.15.05.00#Sport nets or netting#49.22.15.00.00
-unspsc7#49.22.15.06.00#Sport mats or padding#49.22.15.00.00
-unspsc7#49.22.15.07.00#Basketball backboards#49.22.15.00.00
-unspsc7#49.22.15.08.00#Basketball hoop#49.22.15.00.00
-unspsc7#49.22.15.09.00#Roller skates or roller blades#49.22.15.00.00
-unspsc7#49.23.00.00.00#Toys and games#49.00.00.00.00
-unspsc7#49.23.15.00.00#Toys#49.23.00.00.00
-unspsc7#49.23.15.01.00#Musical toys#49.23.15.00.00
-unspsc7#49.23.15.02.00#Educational toys#49.23.15.00.00
-unspsc7#49.23.15.03.00#Toy balloons or balls#49.23.15.00.00
-unspsc7#49.23.15.04.00#Dolls#49.23.15.00.00
-unspsc7#49.23.15.05.00#Doll houses#49.23.15.00.00
-unspsc7#49.23.15.06.00#Stuffed animals or puppets#49.23.15.00.00
-unspsc7#49.23.15.07.00#Playhouses#49.23.15.00.00
-unspsc7#49.23.15.08.00#Building blocks#49.23.15.00.00
-unspsc7#49.23.15.09.00#Riding toys#49.23.15.00.00
-unspsc7#49.23.15.10.00#Pull toys#49.23.15.00.00
-unspsc7#49.23.15.11.00#Childrens science kits#49.23.15.00.00
-unspsc7#49.23.15.12.00#Toy vehicles#49.23.15.00.00
-unspsc7#49.23.15.13.00#Toy trains#49.23.15.00.00
-unspsc7#49.23.15.14.00#Inflatable toys#49.23.15.00.00
-unspsc7#49.23.15.15.00#Doll parts or accessories#49.23.15.00.00
-unspsc7#49.23.15.16.00#Yo yos#49.23.15.00.00
-unspsc7#49.23.15.17.00#Kites#49.23.15.00.00
-unspsc7#49.23.15.18.00#Pogs#49.23.15.00.00
-unspsc7#49.23.15.19.00#Kaleidoscopes#49.23.15.00.00
-unspsc7#49.23.15.20.00#Pom poms#49.23.15.00.00
-unspsc7#49.23.15.21.00#Pinatas#49.23.15.00.00
-unspsc7#49.23.15.22.00#Boomerangs#49.23.15.00.00
-unspsc7#49.23.15.23.00#Flying discs#49.23.15.00.00
-unspsc7#49.23.15.24.00#Toy pails#49.23.15.00.00
-unspsc7#49.23.16.00.00#Games#49.23.00.00.00
-unspsc7#49.23.16.01.00#Educational games#49.23.16.00.00
-unspsc7#49.23.16.02.00#Board games#49.23.16.00.00
-unspsc7#49.23.16.03.00#Playing cards#49.23.16.00.00
-unspsc7#49.23.16.04.00#Video games#49.23.16.00.00
-unspsc7#49.23.16.05.00#Puzzles#49.23.16.00.00
-unspsc7#49.23.16.06.00#Dice#49.23.16.00.00
-unspsc7#49.24.00.00.00#Recreation and playground and swimming and spa equipment and supplies#49.00.00.00.00
-unspsc7#49.24.15.00.00#Playground equipment#49.24.00.00.00
-unspsc7#49.24.15.01.00#Playground swings#49.24.15.00.00
-unspsc7#49.24.15.02.00#Playground climbing apparatus#49.24.15.00.00
-unspsc7#49.24.15.03.00#Playground merry go rounds#49.24.15.00.00
-unspsc7#49.24.15.04.00#Playground slides#49.24.15.00.00
-unspsc7#49.24.15.05.00#Playground see saws#49.24.15.00.00
-unspsc7#49.24.15.06.00#Playground tunnels#49.24.15.00.00
-unspsc7#49.24.15.07.00#Playground sandboxes#49.24.15.00.00
-unspsc7#49.24.15.08.00#Playground bleachers#49.24.15.00.00
-unspsc7#49.24.15.09.00#Wall climbing equipment#49.24.15.00.00
-unspsc7#49.24.15.10.00#Rope climbing equipment#49.24.15.00.00
-unspsc7#49.24.16.00.00#Recreational equipment#49.24.00.00.00
-unspsc7#49.24.16.01.00#Croquet sets#49.24.16.00.00
-unspsc7#49.24.16.02.00#Lawn bowling equipment#49.24.16.00.00
-unspsc7#49.24.16.03.00#Horseshoe equipment#49.24.16.00.00
-unspsc7#49.24.16.04.00#Lawn darts#49.24.16.00.00
-unspsc7#49.24.17.00.00#Swimming pool and spa equipment and supplies#49.24.00.00.00
-unspsc7#49.24.17.01.00#Diving boards#49.24.17.00.00
-unspsc7#49.24.17.02.00#Pool slides#49.24.17.00.00
-unspsc7#49.24.17.03.00#Spa blower#49.24.17.00.00
-unspsc7#49.24.17.04.00#Water test kit or solutions#49.24.17.00.00
-unspsc7#49.24.17.05.00#Automatic pool cleaner#49.24.17.00.00
-unspsc7#49.24.17.06.00#Solar blanket#49.24.17.00.00
-unspsc7#49.24.17.07.00#Pool or spa heater#49.24.17.00.00
-unspsc7#49.24.17.08.00#Ozone generator#49.24.17.00.00
-unspsc7#49.24.17.09.00#Solar blanket reels#49.24.17.00.00
-unspsc7#49.25.00.00.00#Arts and crafts supplies#49.00.00.00.00
-unspsc7#49.25.15.00.00#Art supplies#49.25.00.00.00
-unspsc7#49.25.15.01.00#Art paints#49.25.15.00.00
-unspsc7#49.25.15.02.00#Modeling clay#49.25.15.00.00
-unspsc7#49.25.15.03.00#Art paintbrushes#49.25.15.00.00
-unspsc7#49.25.15.04.00#Picture or poster frames#49.25.15.00.00
-unspsc7#49.25.15.05.00#Picture albums or organizers#49.25.15.00.00
-unspsc7#49.25.15.06.00#Cutting mats#49.25.15.00.00
-unspsc7#49.25.15.07.00#Carving board#49.25.15.00.00
-unspsc7#49.25.15.08.00#Palettes#49.25.15.00.00
-unspsc7#49.25.15.09.00#Glitter#49.25.15.00.00
-unspsc7#49.25.15.10.00#Beads#49.25.15.00.00
-unspsc7#49.25.15.11.00#Decorative tapes or twists#49.25.15.00.00
-unspsc7#49.25.16.00.00#Craft supplies#49.25.00.00.00
-unspsc7#49.25.16.01.00#Model kits#49.25.16.00.00
-unspsc7#49.25.16.02.00#Potters wheels#49.25.16.00.00
-unspsc7#49.25.16.03.00#Decorative buttons#49.25.16.00.00
-unspsc7#49.25.16.04.00#Decorative shapes or strings#49.25.16.00.00
-unspsc7#49.25.16.05.00#Craft kits#49.25.16.00.00
-unspsc7#50.00.00.00.00#Food Beverage and Tobacco Products#50.00.00.00.00
-unspsc7#50.10.00.00.00#Fruits and vegetables and nuts and seeds#50.00.00.00.00
-unspsc7#50.10.15.00.00#Vegetables#50.10.00.00.00
-unspsc7#50.10.15.01.00#Beans#50.10.15.00.00
-unspsc7#50.10.15.02.00#Spinach#50.10.15.00.00
-unspsc7#50.10.15.03.00#Potatoes#50.10.15.00.00
-unspsc7#50.10.15.04.00#Peas#50.10.15.00.00
-unspsc7#50.10.15.05.00#Onions or other alliaceous vegetables#50.10.15.00.00
-unspsc7#50.10.15.06.00#Lettuce#50.10.15.00.00
-unspsc7#50.10.15.07.00#Cabbage#50.10.15.00.00
-unspsc7#50.10.15.08.00#Squashes#50.10.15.00.00
-unspsc7#50.10.15.09.00#Yams#50.10.15.00.00
-unspsc7#50.10.15.10.00#Carrots#50.10.15.00.00
-unspsc7#50.10.15.11.00#Rutabagas#50.10.15.00.00
-unspsc7#50.10.15.12.00#Eggplants#50.10.15.00.00
-unspsc7#50.10.15.13.00#Peppers#50.10.15.00.00
-unspsc7#50.10.15.14.00#Rhubarb#50.10.15.00.00
-unspsc7#50.10.15.15.00#Endive#50.10.15.00.00
-unspsc7#50.10.15.16.00#Asparagus#50.10.15.00.00
-unspsc7#50.10.15.17.00#Artichokes#50.10.15.00.00
-unspsc7#50.10.15.18.00#Parsnips#50.10.15.00.00
-unspsc7#50.10.15.19.00#Celery#50.10.15.00.00
-unspsc7#50.10.15.20.00#Radishes#50.10.15.00.00
-unspsc7#50.10.15.21.00#Mushrooms or other edible fungi#50.10.15.00.00
-unspsc7#50.10.15.22.00#Horseradish#50.10.15.00.00
-unspsc7#50.10.15.23.00#Turnips#50.10.15.00.00
-unspsc7#50.10.15.24.00#Mustard greens#50.10.15.00.00
-unspsc7#50.10.15.25.00#Kale#50.10.15.00.00
-unspsc7#50.10.15.26.00#Collards#50.10.15.00.00
-unspsc7#50.10.15.27.00#Brussel sprouts#50.10.15.00.00
-unspsc7#50.10.15.28.00#Broccoli#50.10.15.00.00
-unspsc7#50.10.15.29.00#Cauliflowers#50.10.15.00.00
-unspsc7#50.10.15.30.00#Okra#50.10.15.00.00
-unspsc7#50.10.15.31.00#Cucumbers#50.10.15.00.00
-unspsc7#50.10.15.32.00#Tomatoes#50.10.15.00.00
-unspsc7#50.10.15.33.00#Beets#50.10.15.00.00
-unspsc7#50.10.15.34.00#Manioc roots#50.10.15.00.00
-unspsc7#50.10.15.35.00#Lentils#50.10.15.00.00
-unspsc7#50.10.15.36.00#Corn#50.10.15.00.00
-unspsc7#50.10.15.37.00#Pumpkins#50.10.15.00.00
-unspsc7#50.10.15.38.00#Fresh vegetables#50.10.15.00.00
-unspsc7#50.10.15.39.00#Frozen vegetables#50.10.15.00.00
-unspsc7#50.10.15.40.00#Shelf stable vegetables#50.10.15.00.00
-unspsc7#50.10.16.00.00#Fruits#50.10.00.00.00
-unspsc7#50.10.16.01.00#Limes#50.10.16.00.00
-unspsc7#50.10.16.02.00#Mangoes#50.10.16.00.00
-unspsc7#50.10.16.03.00#Guavas#50.10.16.00.00
-unspsc7#50.10.16.04.00#Grapes#50.10.16.00.00
-unspsc7#50.10.16.05.00#Dates#50.10.16.00.00
-unspsc7#50.10.16.06.00#Apricots#50.10.16.00.00
-unspsc7#50.10.16.07.00#Berries#50.10.16.00.00
-unspsc7#50.10.16.08.00#Peaches#50.10.16.00.00
-unspsc7#50.10.16.09.00#Cherries#50.10.16.00.00
-unspsc7#50.10.16.10.00#Bananas#50.10.16.00.00
-unspsc7#50.10.16.11.00#Melons#50.10.16.00.00
-unspsc7#50.10.16.12.00#Pomegranates#50.10.16.00.00
-unspsc7#50.10.16.13.00#Papayas#50.10.16.00.00
-unspsc7#50.10.16.14.00#Kiwis#50.10.16.00.00
-unspsc7#50.10.16.15.00#Lichees#50.10.16.00.00
-unspsc7#50.10.16.16.00#Pears#50.10.16.00.00
-unspsc7#50.10.16.17.00#Plums#50.10.16.00.00
-unspsc7#50.10.16.18.00#Apples#50.10.16.00.00
-unspsc7#50.10.16.19.00#Passion fruit#50.10.16.00.00
-unspsc7#50.10.16.20.00#Nectarines#50.10.16.00.00
-unspsc7#50.10.16.21.00#Pineapples#50.10.16.00.00
-unspsc7#50.10.16.22.00#Figs#50.10.16.00.00
-unspsc7#50.10.16.23.00#Tangelos#50.10.16.00.00
-unspsc7#50.10.16.24.00#Mandarins#50.10.16.00.00
-unspsc7#50.10.16.25.00#Oranges#50.10.16.00.00
-unspsc7#50.10.16.26.00#Tangerines#50.10.16.00.00
-unspsc7#50.10.16.27.00#Grapefruit#50.10.16.00.00
-unspsc7#50.10.16.28.00#Lemons#50.10.16.00.00
-unspsc7#50.10.16.29.00#Durians#50.10.16.00.00
-unspsc7#50.10.16.30.00#Coconuts#50.10.16.00.00
-unspsc7#50.10.16.31.00#Avocados#50.10.16.00.00
-unspsc7#50.10.16.32.00#Quinces#50.10.16.00.00
-unspsc7#50.10.16.33.00#Olives#50.10.16.00.00
-unspsc7#50.10.16.34.00#Fresh fruit#50.10.16.00.00
-unspsc7#50.10.16.35.00#Frozen fruit#50.10.16.00.00
-unspsc7#50.10.16.36.00#Shelf stable fruit#50.10.16.00.00
-unspsc7#50.10.17.00.00#Nuts and seeds#50.10.00.00.00
-unspsc7#50.10.17.01.00#Chestnuts#50.10.17.00.00
-unspsc7#50.10.17.03.00#Pecans#50.10.17.00.00
-unspsc7#50.10.17.04.00#Brazil nuts#50.10.17.00.00
-unspsc7#50.10.17.05.00#Cashews#50.10.17.00.00
-unspsc7#50.10.17.06.00#Almonds#50.10.17.00.00
-unspsc7#50.10.17.07.00#Macadamia nuts#50.10.17.00.00
-unspsc7#50.10.17.08.00#Hazelnuts#50.10.17.00.00
-unspsc7#50.10.17.09.00#Pine nuts#50.10.17.00.00
-unspsc7#50.10.17.10.00#Pistachios#50.10.17.00.00
-unspsc7#50.10.17.11.00#Walnuts#50.10.17.00.00
-unspsc7#50.10.17.12.00#Betel nuts#50.10.17.00.00
-unspsc7#50.10.17.13.00#Peanuts or groundnuts#50.10.17.00.00
-unspsc7#50.10.17.14.00#Mixed nuts#50.10.17.00.00
-unspsc7#50.10.17.15.00#Nut meat#50.10.17.00.00
-unspsc7#50.10.17.16.00#Whole nuts or seeds#50.10.17.00.00
-unspsc7#50.10.17.17.00#Shelled#50.10.17.00.00
-unspsc7#50.11.00.00.00#Meat and poultry products#50.00.00.00.00
-unspsc7#50.11.15.00.00#Meat and poultry#50.11.00.00.00
-unspsc7#50.11.15.01.00#Chicken#50.11.15.00.00
-unspsc7#50.11.15.02.00#Turkey#50.11.15.00.00
-unspsc7#50.11.15.03.00#Duck#50.11.15.00.00
-unspsc7#50.11.15.04.00#Ostrich#50.11.15.00.00
-unspsc7#50.11.15.05.00#Partridge#50.11.15.00.00
-unspsc7#50.11.15.06.00#Dove#50.11.15.00.00
-unspsc7#50.11.15.07.00#Pheasant#50.11.15.00.00
-unspsc7#50.11.15.08.00#Quail#50.11.15.00.00
-unspsc7#50.11.15.09.00#Goose#50.11.15.00.00
-unspsc7#50.11.15.10.00#Fresh meat and poultry#50.11.15.00.00
-unspsc7#50.11.15.11.00#Frozen meat and poultry#50.11.15.00.00
-unspsc7#50.11.15.12.00#Shelf stable meat and poultry#50.11.15.00.00
-unspsc7#50.11.16.00.00#Fresh and frozen red meat and byproducts#50.11.00.00.00
-unspsc7#50.11.16.01.00#Beef#50.11.16.00.00
-unspsc7#50.11.16.02.00#Veal#50.11.16.00.00
-unspsc7#50.11.16.03.00#Mutton#50.11.16.00.00
-unspsc7#50.11.16.04.00#Lamb#50.11.16.00.00
-unspsc7#50.11.16.05.00#Buffalo#50.11.16.00.00
-unspsc7#50.11.16.06.00#Horsemeat#50.11.16.00.00
-unspsc7#50.11.16.07.00#Ass or mule or hinny meat#50.11.16.00.00
-unspsc7#50.11.17.00.00#Fresh and frozen pork and byproducts#50.11.00.00.00
-unspsc7#50.11.17.01.00#Pork#50.11.17.00.00
-unspsc7#50.11.18.00.00#Fresh and frozen organ meat and byproducts#50.11.00.00.00
-unspsc7#50.11.18.01.00#Organ meat#50.11.18.00.00
-unspsc7#50.11.18.02.00#Liver#50.11.18.00.00
-unspsc7#50.11.18.03.00#Gizzard#50.11.18.00.00
-unspsc7#50.11.18.04.00#Tripe#50.11.18.00.00
-unspsc7#50.11.18.05.00#Stomach#50.11.18.00.00
-unspsc7#50.11.18.06.00#Kidney#50.11.18.00.00
-unspsc7#50.11.18.07.00#Brains#50.11.18.00.00
-unspsc7#50.11.19.00.00#Delicatessen meat products#50.11.00.00.00
-unspsc7#50.11.19.01.00#Salami#50.11.19.00.00
-unspsc7#50.11.19.02.00#Kabana#50.11.19.00.00
-unspsc7#50.11.19.03.00#Pastrami#50.11.19.00.00
-unspsc7#50.11.19.04.00#Roast beef#50.11.19.00.00
-unspsc7#50.11.19.05.00#Corned beef or silverside#50.11.19.00.00
-unspsc7#50.11.19.06.00#Frankfurt or hot dog#50.11.19.00.00
-unspsc7#50.11.20.00.00#Processed and prepared meats#50.11.00.00.00
-unspsc7#50.11.20.01.00#Fresh processed or prepared meats#50.11.20.00.00
-unspsc7#50.11.20.02.00#Frozen processed or prepared meats#50.11.20.00.00
-unspsc7#50.11.20.03.00#Shelf stable processed or prepared meats#50.11.20.00.00
-unspsc7#50.12.00.00.00#Seafood#50.00.00.00.00
-unspsc7#50.12.15.00.00#Fish#50.12.00.00.00
-unspsc7#50.12.15.01.00#Lemonfish#50.12.15.00.00
-unspsc7#50.12.15.02.00#Dogfish#50.12.15.00.00
-unspsc7#50.12.15.03.00#Grouper#50.12.15.00.00
-unspsc7#50.12.15.04.00#Mahi mahi#50.12.15.00.00
-unspsc7#50.12.15.05.00#Monkfish#50.12.15.00.00
-unspsc7#50.12.15.06.00#Pompano#50.12.15.00.00
-unspsc7#50.12.15.07.00#Bass#50.12.15.00.00
-unspsc7#50.12.15.08.00#Shark#50.12.15.00.00
-unspsc7#50.12.15.09.00#Tilapia#50.12.15.00.00
-unspsc7#50.12.15.10.00#Swordfish#50.12.15.00.00
-unspsc7#50.12.15.11.00#Anchovies#50.12.15.00.00
-unspsc7#50.12.15.12.00#Carp#50.12.15.00.00
-unspsc7#50.12.15.13.00#Catfish#50.12.15.00.00
-unspsc7#50.12.15.14.00#Eel#50.12.15.00.00
-unspsc7#50.12.15.15.00#Sturgeon#50.12.15.00.00
-unspsc7#50.12.15.16.00#Tuna#50.12.15.00.00
-unspsc7#50.12.15.17.00#Cod#50.12.15.00.00
-unspsc7#50.12.15.18.00#Halibut#50.12.15.00.00
-unspsc7#50.12.15.19.00#Haddock#50.12.15.00.00
-unspsc7#50.12.15.20.00#Ocean perch#50.12.15.00.00
-unspsc7#50.12.15.21.00#Orange roughy#50.12.15.00.00
-unspsc7#50.12.15.22.00#Parrot fish#50.12.15.00.00
-unspsc7#50.12.15.23.00#Pike#50.12.15.00.00
-unspsc7#50.12.15.24.00#Red snapper#50.12.15.00.00
-unspsc7#50.12.15.25.00#Rockfish#50.12.15.00.00
-unspsc7#50.12.15.26.00#Smelt#50.12.15.00.00
-unspsc7#50.12.15.27.00#Sole#50.12.15.00.00
-unspsc7#50.12.15.28.00#Whiting#50.12.15.00.00
-unspsc7#50.12.15.29.00#Salmon#50.12.15.00.00
-unspsc7#50.12.15.30.00#Mackerel#50.12.15.00.00
-unspsc7#50.12.15.31.00#Sardines#50.12.15.00.00
-unspsc7#50.12.15.32.00#Trout#50.12.15.00.00
-unspsc7#50.12.15.33.00#Surimi#50.12.15.00.00
-unspsc7#50.12.15.34.00#Blackfish#50.12.15.00.00
-unspsc7#50.12.15.35.00#Herring#50.12.15.00.00
-unspsc7#50.12.15.36.00#Fresh fish#50.12.15.00.00
-unspsc7#50.12.15.37.00#Frozen fish#50.12.15.00.00
-unspsc7#50.12.15.38.00#Shelf stable fish#50.12.15.00.00
-unspsc7#50.12.15.39.00#Fresh fish#50.12.15.00.00
-unspsc7#50.12.16.00.00#Shellfish#50.12.00.00.00
-unspsc7#50.12.16.01.00#Abalone#50.12.16.00.00
-unspsc7#50.12.16.02.00#Scallops#50.12.16.00.00
-unspsc7#50.12.16.03.00#Clams#50.12.16.00.00
-unspsc7#50.12.16.04.00#Crabs#50.12.16.00.00
-unspsc7#50.12.16.05.00#Conch#50.12.16.00.00
-unspsc7#50.12.16.06.00#Crayfish#50.12.16.00.00
-unspsc7#50.12.16.07.00#Lobster#50.12.16.00.00
-unspsc7#50.12.16.08.00#Mussels#50.12.16.00.00
-unspsc7#50.12.16.09.00#Oysters#50.12.16.00.00
-unspsc7#50.12.16.10.00#Shrimp#50.12.16.00.00
-unspsc7#50.12.16.11.00#Fresh shellfish#50.12.16.00.00
-unspsc7#50.12.16.12.00#Frozen shellfish#50.12.16.00.00
-unspsc7#50.12.16.13.00#Shelf stable shellfish#50.12.16.00.00
-unspsc7#50.12.17.00.00#Aquatic invertebrates#50.12.00.00.00
-unspsc7#50.12.17.01.00#Squid#50.12.17.00.00
-unspsc7#50.12.17.02.00#Octopus#50.12.17.00.00
-unspsc7#50.12.17.03.00#Anemones#50.12.17.00.00
-unspsc7#50.12.17.04.00#Sea cucumbers#50.12.17.00.00
-unspsc7#50.12.17.05.00#Fresh aquatic invertebrates#50.12.17.00.00
-unspsc7#50.12.17.06.00#Frozen aquatic invertebrates#50.12.17.00.00
-unspsc7#50.12.17.07.00#Shelf stable aquatic invertebrates#50.12.17.00.00
-unspsc7#50.12.18.00.00#Aquatic plants#50.12.00.00.00
-unspsc7#50.12.18.01.00#Seaweeds#50.12.18.00.00
-unspsc7#50.12.18.02.00#Fresh aquatic plants#50.12.18.00.00
-unspsc7#50.12.18.03.00#Frozen aquatic plants#50.12.18.00.00
-unspsc7#50.12.18.04.00#Shelf stable aquatic plants#50.12.18.00.00
-unspsc7#50.13.00.00.00#Dairy products and eggs#50.00.00.00.00
-unspsc7#50.13.15.00.00#Dairy products and dairy substitutes#50.13.00.00.00
-unspsc7#50.13.15.01.00#Coffee creamer#50.13.15.00.00
-unspsc7#50.13.15.02.00#Butter#50.13.15.00.00
-unspsc7#50.13.15.03.00#Milk#50.13.15.00.00
-unspsc7#50.13.15.04.00#Soft cheeses#50.13.15.00.00
-unspsc7#50.13.15.05.00#Yogurts#50.13.15.00.00
-unspsc7#50.13.15.06.00#Ice creams#50.13.15.00.00
-unspsc7#50.13.15.07.00#Sour creams#50.13.15.00.00
-unspsc7#50.13.15.08.00#Hard cheeses#50.13.15.00.00
-unspsc7#50.13.15.09.00#Buttermilk#50.13.15.00.00
-unspsc7#50.13.15.10.00#Infant formula#50.13.15.00.00
-unspsc7#50.13.15.11.00#Custard#50.13.15.00.00
-unspsc7#50.13.15.12.00#Evaporated milk#50.13.15.00.00
-unspsc7#50.13.15.13.00#Sweetened condensed milk#50.13.15.00.00
-unspsc7#50.13.15.14.00#Powdered milk#50.13.15.00.00
-unspsc7#50.13.15.15.00#Cream#50.13.15.00.00
-unspsc7#50.13.15.16.00#Long life milk#50.13.15.00.00
-unspsc7#50.13.16.00.00#Eggs and egg substitutes#50.13.00.00.00
-unspsc7#50.13.16.01.00#Eggs#50.13.16.00.00
-unspsc7#50.13.16.02.00#Egg substitutes#50.13.16.00.00
-unspsc7#50.13.16.03.00#Meringue powders#50.13.16.00.00
-unspsc7#50.13.16.04.00#Egg whites#50.13.16.00.00
-unspsc7#50.13.16.05.00#Egg yolks#50.13.16.00.00
-unspsc7#50.13.16.06.00#Fresh eggs#50.13.16.00.00
-unspsc7#50.13.16.07.00#Egg substitutes#50.13.16.00.00
-unspsc7#50.13.16.08.00#Egg whites or yolks#50.13.16.00.00
-unspsc7#50.13.16.09.00#Prepared eggs#50.13.16.00.00
-unspsc7#50.13.17.00.00#Milk and butter products#50.13.00.00.00
-unspsc7#50.13.17.01.00#Fresh milk and butter products#50.13.17.00.00
-unspsc7#50.13.17.02.00#Shelf stable milk and butter products#50.13.17.00.00
-unspsc7#50.13.18.00.00#Cheese#50.13.00.00.00
-unspsc7#50.13.18.01.00#Natural cheese#50.13.18.00.00
-unspsc7#50.13.18.02.00#Processed cheese#50.13.18.00.00
-unspsc7#50.13.18.03.00#Imitation cheese#50.13.18.00.00
-unspsc7#50.14.00.00.00#Grains and cereals and their flours#50.00.00.00.00
-unspsc7#50.14.15.00.00#Grains and cereals#50.14.00.00.00
-unspsc7#50.14.15.01.00#Millet#50.14.15.00.00
-unspsc7#50.14.15.02.00#Hops#50.14.15.00.00
-unspsc7#50.14.15.03.00#Buckwheat#50.14.15.00.00
-unspsc7#50.14.15.04.00#Rye#50.14.15.00.00
-unspsc7#50.14.15.05.00#Corn cereals#50.14.15.00.00
-unspsc7#50.14.15.06.00#Sorghum#50.14.15.00.00
-unspsc7#50.14.15.07.00#Oats#50.14.15.00.00
-unspsc7#50.14.15.08.00#Rice#50.14.15.00.00
-unspsc7#50.14.15.09.00#Barley#50.14.15.00.00
-unspsc7#50.14.15.10.00#Wheat#50.14.15.00.00
-unspsc7#50.14.15.11.00#Pasta or noodle#50.14.15.00.00
-unspsc7#50.14.15.12.00#Bran#50.14.15.00.00
-unspsc7#50.14.15.13.00#short grain rice#50.14.15.00.00
-unspsc7#50.14.16.00.00#Flours#50.14.00.00.00
-unspsc7#50.14.16.01.00#Millet flour#50.14.16.00.00
-unspsc7#50.14.16.02.00#Oat flour#50.14.16.00.00
-unspsc7#50.14.16.03.00#Barley flour#50.14.16.00.00
-unspsc7#50.14.16.04.00#Rice flour#50.14.16.00.00
-unspsc7#50.14.16.05.00#Buckwheat flour#50.14.16.00.00
-unspsc7#50.14.16.06.00#Rye flour#50.14.16.00.00
-unspsc7#50.14.16.07.00#Corn flour#50.14.16.00.00
-unspsc7#50.14.16.08.00#Wheat flour#50.14.16.00.00
-unspsc7#50.14.16.09.00#Self rising flour#50.14.16.00.00
-unspsc7#50.14.16.10.00#Long Grain Rice#50.14.16.00.00
-unspsc7#50.15.00.00.00#Edible oils and fats#50.00.00.00.00
-unspsc7#50.15.15.00.00#Edible vegetable and plant oils and fats#50.15.00.00.00
-unspsc7#50.15.15.01.00#Soybean oil#50.15.15.00.00
-unspsc7#50.15.15.02.00#Corn oil#50.15.15.00.00
-unspsc7#50.15.15.03.00#Canola oil#50.15.15.00.00
-unspsc7#50.15.15.04.00#Sesame oil#50.15.15.00.00
-unspsc7#50.15.15.05.00#Peanut oil#50.15.15.00.00
-unspsc7#50.15.15.06.00#Olive oil#50.15.15.00.00
-unspsc7#50.15.15.07.00#Palm oil#50.15.15.00.00
-unspsc7#50.15.15.08.00#Safflower oil#50.15.15.00.00
-unspsc7#50.15.15.09.00#Castor oil#50.15.15.00.00
-unspsc7#50.15.15.10.00#Sunflower oil#50.15.15.00.00
-unspsc7#50.15.15.11.00#Cottonseed oil#50.15.15.00.00
-unspsc7#50.15.15.12.00#Colza oil#50.15.15.00.00
-unspsc7#50.15.15.13.00#Edible vegetable or plant oils#50.15.15.00.00
-unspsc7#50.15.15.14.00#Edible vegetable or plant fats#50.15.15.00.00
-unspsc7#50.15.16.00.00#Edible animal oils and fats#50.15.00.00.00
-unspsc7#50.15.16.01.00#Lard#50.15.16.00.00
-unspsc7#50.15.16.02.00#Tallow#50.15.16.00.00
-unspsc7#50.15.16.03.00#Cod liver oil#50.15.16.00.00
-unspsc7#50.15.16.04.00#Edible animal oils#50.15.16.00.00
-unspsc7#50.15.16.05.00#Edible animal fats#50.15.16.00.00
-unspsc7#50.15.17.00.00#Oils and fats and other#50.15.00.00.00
-unspsc7#50.15.17.01.00#Shortenings#50.15.17.00.00
-unspsc7#50.15.17.02.00#Margarine#50.15.17.00.00
-unspsc7#50.15.17.03.00#Linseed oil#50.15.17.00.00
-unspsc7#50.15.17.04.00#Cocoa butter#50.15.17.00.00
-unspsc7#50.15.17.05.00#Hop Oil#50.15.17.00.00
-unspsc7#50.15.17.06.00#Macadamia oil#50.15.17.00.00
-unspsc7#50.16.00.00.00#Chocolate and sugars and sweeteners and confectionary products#50.00.00.00.00
-unspsc7#50.16.15.00.00#Chocolate and sugars and sweetening products#50.16.00.00.00
-unspsc7#50.16.15.01.00#Brown sugar#50.16.15.00.00
-unspsc7#50.16.15.02.00#White sugars#50.16.15.00.00
-unspsc7#50.16.15.03.00#Sugar cane#50.16.15.00.00
-unspsc7#50.16.15.04.00#Fructose#50.16.15.00.00
-unspsc7#50.16.15.05.00#Palm sugar#50.16.15.00.00
-unspsc7#50.16.15.06.00#Glucose#50.16.15.00.00
-unspsc7#50.16.15.07.00#Beet sugar#50.16.15.00.00
-unspsc7#50.16.15.08.00#Raw sugar#50.16.15.00.00
-unspsc7#50.16.15.09.00#Natural sugars and sweetening products#50.16.15.00.00
-unspsc7#50.16.15.10.00#Artificial sweetening agents#50.16.15.00.00
-unspsc7#50.16.15.11.00#Chocolate and chocolate substitute#50.16.15.00.00
-unspsc7#50.16.15.12.00#Syrups#50.16.15.00.00
-unspsc7#50.16.16.00.00#Syrups and other sweeteners#50.16.00.00.00
-unspsc7#50.16.16.01.00#Molasses#50.16.16.00.00
-unspsc7#50.16.16.02.00#Honey#50.16.16.00.00
-unspsc7#50.16.16.03.00#Black treacle#50.16.16.00.00
-unspsc7#50.16.16.04.00#Corn syrup#50.16.16.00.00
-unspsc7#50.16.16.05.00#Aspertame#50.16.16.00.00
-unspsc7#50.16.16.06.00#Saccharrin#50.16.16.00.00
-unspsc7#50.16.16.07.00#Maple syrup#50.16.16.00.00
-unspsc7#50.16.17.00.00#Chocolate and carob and chocolate substitutes#50.16.00.00.00
-unspsc7#50.16.17.01.00#Chocolate#50.16.17.00.00
-unspsc7#50.16.17.02.00#Carob#50.16.17.00.00
-unspsc7#50.16.17.03.00#Cocoa#50.16.17.00.00
-unspsc7#50.16.18.00.00#Confectionary products#50.16.00.00.00
-unspsc7#50.16.18.04.00#Chewing gums#50.16.18.00.00
-unspsc7#50.16.18.05.00#Candy#50.16.18.00.00
-unspsc7#50.16.18.06.00#Licorice#50.16.18.00.00
-unspsc7#50.16.18.07.00#jellied confectionary#50.16.18.00.00
-unspsc7#50.16.18.08.00#Fudge#50.16.18.00.00
-unspsc7#50.16.18.09.00#Medicated confectionery or lozenges#50.16.18.00.00
-unspsc7#50.16.18.10.00#Sugar free confectionary#50.16.18.00.00
-unspsc7#50.16.18.11.00#Marshmallow#50.16.18.00.00
-unspsc7#50.16.18.12.00#Nougat#50.16.18.00.00
-unspsc7#50.16.18.13.00#Chocolate or chocolate substitute candy#50.16.18.00.00
-unspsc7#50.16.18.14.00#Sugar or sugar substitute candy#50.16.18.00.00
-unspsc7#50.16.18.15.00#Chewing gum#50.16.18.00.00
-unspsc7#50.17.00.00.00#Seasonings and preservatives#50.00.00.00.00
-unspsc7#50.17.15.00.00#Herbs and spices and extracts#50.17.00.00.00
-unspsc7#50.17.15.01.00#Salt#50.17.15.00.00
-unspsc7#50.17.15.03.00#Nutmeg#50.17.15.00.00
-unspsc7#50.17.15.04.00#Bay#50.17.15.00.00
-unspsc7#50.17.15.05.00#Anise#50.17.15.00.00
-unspsc7#50.17.15.06.00#Saffron#50.17.15.00.00
-unspsc7#50.17.15.07.00#Basil#50.17.15.00.00
-unspsc7#50.17.15.08.00#Ginger#50.17.15.00.00
-unspsc7#50.17.15.09.00#Lavender#50.17.15.00.00
-unspsc7#50.17.15.10.00#Mace#50.17.15.00.00
-unspsc7#50.17.15.11.00#Paprika#50.17.15.00.00
-unspsc7#50.17.15.12.00#Chicory#50.17.15.00.00
-unspsc7#50.17.15.13.00#Garlic#50.17.15.00.00
-unspsc7#50.17.15.14.00#Cumin#50.17.15.00.00
-unspsc7#50.17.15.15.00#Cloves#50.17.15.00.00
-unspsc7#50.17.15.16.00#Cinnamon#50.17.15.00.00
-unspsc7#50.17.15.17.00#Cilantro#50.17.15.00.00
-unspsc7#50.17.15.18.00#Allspice#50.17.15.00.00
-unspsc7#50.17.15.19.00#Marjoram#50.17.15.00.00
-unspsc7#50.17.15.20.00#Yarrow#50.17.15.00.00
-unspsc7#50.17.15.21.00#Thyme#50.17.15.00.00
-unspsc7#50.17.15.22.00#Tarragon#50.17.15.00.00
-unspsc7#50.17.15.23.00#Sesame#50.17.15.00.00
-unspsc7#50.17.15.24.00#Sage#50.17.15.00.00
-unspsc7#50.17.15.25.00#Rosemary#50.17.15.00.00
-unspsc7#50.17.15.26.00#Parsley#50.17.15.00.00
-unspsc7#50.17.15.27.00#Chamomile#50.17.15.00.00
-unspsc7#50.17.15.28.00#Mints#50.17.15.00.00
-unspsc7#50.17.15.29.00#Caraway#50.17.15.00.00
-unspsc7#50.17.15.30.00#Lemongrass#50.17.15.00.00
-unspsc7#50.17.15.31.00#Lemon balm#50.17.15.00.00
-unspsc7#50.17.15.32.00#Dill#50.17.15.00.00
-unspsc7#50.17.15.33.00#Fennel#50.17.15.00.00
-unspsc7#50.17.15.34.00#Curry#50.17.15.00.00
-unspsc7#50.17.15.35.00#Comfrey#50.17.15.00.00
-unspsc7#50.17.15.36.00#Chives#50.17.15.00.00
-unspsc7#50.17.15.37.00#Chervil#50.17.15.00.00
-unspsc7#50.17.15.38.00#Oregano#50.17.15.00.00
-unspsc7#50.17.15.39.00#Peppercorns#50.17.15.00.00
-unspsc7#50.17.15.40.00#Cardamom#50.17.15.00.00
-unspsc7#50.17.15.41.00#Coriander#50.17.15.00.00
-unspsc7#50.17.15.42.00#Flavoring extracts#50.17.15.00.00
-unspsc7#50.17.15.43.00#Chili powder#50.17.15.00.00
-unspsc7#50.17.15.44.00#Poppy seeds#50.17.15.00.00
-unspsc7#50.17.15.45.00#Mixed herbs#50.17.15.00.00
-unspsc7#50.17.15.46.00#Vanilla#50.17.15.00.00
-unspsc7#50.17.15.47.00#Seasoning mix#50.17.15.00.00
-unspsc7#50.17.15.48.00#Fresh herbs#50.17.15.00.00
-unspsc7#50.17.15.49.00#Dried herbs#50.17.15.00.00
-unspsc7#50.17.15.50.00#Spices or extracts#50.17.15.00.00
-unspsc7#50.17.16.00.00#Preservatives and additives#50.17.00.00.00
-unspsc7#50.17.16.01.00#Pectin#50.17.16.00.00
-unspsc7#50.17.16.02.00#Food colorings#50.17.16.00.00
-unspsc7#50.17.16.03.00#Monosodium glutamate (MSG)#50.17.16.00.00
-unspsc7#50.17.17.00.00#Vinegars and cooking wines#50.17.00.00.00
-unspsc7#50.17.17.01.00#Cider vineagar#50.17.17.00.00
-unspsc7#50.17.17.02.00#Balsamic vinegar#50.17.17.00.00
-unspsc7#50.17.17.03.00#Distilled vinegar#50.17.17.00.00
-unspsc7#50.17.17.04.00#Rice vinegar#50.17.17.00.00
-unspsc7#50.17.17.05.00#Wine vinegar#50.17.17.00.00
-unspsc7#50.17.17.06.00#Infused vinegar#50.17.17.00.00
-unspsc7#50.17.17.07.00#Vinegars#50.17.17.00.00
-unspsc7#50.17.17.08.00#Cooking wines#50.17.17.00.00
-unspsc7#50.17.18.00.00#Sauces and spreads and condiments#50.17.00.00.00
-unspsc7#50.17.18.01.00#Mustards#50.17.18.00.00
-unspsc7#50.17.18.02.00#Catsup or ketchup or tomato sauce#50.17.18.00.00
-unspsc7#50.17.18.03.00#Barbecue sauces#50.17.18.00.00
-unspsc7#50.17.18.04.00#Marinades#50.17.18.00.00
-unspsc7#50.17.18.05.00#Hot sauces#50.17.18.00.00
-unspsc7#50.17.18.06.00#Mayonnaise#50.17.18.00.00
-unspsc7#50.17.18.07.00#Soy sauce#50.17.18.00.00
-unspsc7#50.17.18.08.00#Salad dressings#50.17.18.00.00
-unspsc7#50.17.18.09.00#Worchestershire sauce#50.17.18.00.00
-unspsc7#50.17.18.10.00#Salsa#50.17.18.00.00
-unspsc7#50.17.18.11.00#Relishes or chutneys#50.17.18.00.00
-unspsc7#50.17.18.12.00#Conserve or jam#50.17.18.00.00
-unspsc7#50.17.18.13.00#Dip or chilled dipping sauce#50.17.18.00.00
-unspsc7#50.17.18.14.00#Sweet and sour sauce#50.17.18.00.00
-unspsc7#50.17.18.15.00#Tartare sauce#50.17.18.00.00
-unspsc7#50.17.18.16.00#Mint sauce#50.17.18.00.00
-unspsc7#50.17.18.17.00#Gravy sauce or powder#50.17.18.00.00
-unspsc7#50.17.18.18.00#Noodle or pasta sauce#50.17.18.00.00
-unspsc7#50.17.18.19.00#Food spreads or pastes#50.17.18.00.00
-unspsc7#50.17.18.20.00#Tomato paste#50.17.18.00.00
-unspsc7#50.17.18.21.00#Black bean sauce#50.17.18.00.00
-unspsc7#50.17.18.22.00#Satay sauce#50.17.18.00.00
-unspsc7#50.17.18.23.00#Teriyaki sauce#50.17.18.00.00
-unspsc7#50.17.18.24.00#Seafood sauce#50.17.18.00.00
-unspsc7#50.17.18.25.00#Pesto#50.17.18.00.00
-unspsc7#50.17.18.26.00#Steak sauce#50.17.18.00.00
-unspsc7#50.17.18.27.00#Oyster sauce#50.17.18.00.00
-unspsc7#50.17.18.28.00#Plum sauce#50.17.18.00.00
-unspsc7#50.17.18.29.00#White sauce#50.17.18.00.00
-unspsc7#50.17.18.30.00#Dipping sauces or condiments or spreads or marinades#50.17.18.00.00
-unspsc7#50.17.18.31.00#Cooking sauce#50.17.18.00.00
-unspsc7#50.17.18.32.00#Salad dressing or dips#50.17.18.00.00
-unspsc7#50.17.18.33.00#Savory spread or pate#50.17.18.00.00
-unspsc7#50.17.19.00.00#Pickles and relish and olives#50.17.00.00.00
-unspsc7#50.17.19.01.00#Pickles#50.17.19.00.00
-unspsc7#50.17.19.02.00#Relish#50.17.19.00.00
-unspsc7#50.17.19.03.00#Olives#50.17.19.00.00
-unspsc7#50.17.19.04.00#Chutneys#50.17.19.00.00
-unspsc7#50.18.00.00.00#Bread and bakery products#50.00.00.00.00
-unspsc7#50.18.15.00.00#Leavening agents#50.18.00.00.00
-unspsc7#50.18.15.01.00#Yeast#50.18.15.00.00
-unspsc7#50.18.15.02.00#Baking powder#50.18.15.00.00
-unspsc7#50.18.15.03.00#Baking soda#50.18.15.00.00
-unspsc7#50.18.15.04.00#Bakers ammonia#50.18.15.00.00
-unspsc7#50.18.16.00.00#Thickeners#50.18.00.00.00
-unspsc7#50.18.16.01.00#Gelatins#50.18.16.00.00
-unspsc7#50.18.16.02.00#Food grade starches#50.18.16.00.00
-unspsc7#50.18.16.03.00#Tapioca#50.18.16.00.00
-unspsc7#50.18.16.04.00#Arrowroot#50.18.16.00.00
-unspsc7#50.18.16.05.00#Food grade agar#50.18.16.00.00
-unspsc7#50.18.17.00.00#Baking mixes and supplies#50.18.00.00.00
-unspsc7#50.18.17.01.00#Food glazes#50.18.17.00.00
-unspsc7#50.18.17.02.00#Icings#50.18.17.00.00
-unspsc7#50.18.17.03.00#Cake decorations#50.18.17.00.00
-unspsc7#50.18.17.04.00#Cake or pudding mixtures#50.18.17.00.00
-unspsc7#50.18.17.05.00#Pie fillings#50.18.17.00.00
-unspsc7#50.18.17.06.00#Baking mixes#50.18.17.00.00
-unspsc7#50.18.17.07.00#Coating mix or breadcrumbs#50.18.17.00.00
-unspsc7#50.18.17.08.00#Baking mixes#50.18.17.00.00
-unspsc7#50.18.17.09.00#Baking supplies#50.18.17.00.00
-unspsc7#50.18.18.00.00#Baked goods#50.18.00.00.00
-unspsc7#50.18.18.01.00#Pastry shells#50.18.18.00.00
-unspsc7#50.18.18.02.00#Crackers or dry or savoury biscuits#50.18.18.00.00
-unspsc7#50.18.18.03.00#Bread#50.18.18.00.00
-unspsc7#50.18.18.04.00#Pastries#50.18.18.00.00
-unspsc7#50.18.18.05.00#Cakes#50.18.18.00.00
-unspsc7#50.18.18.06.00#Cookie or sweet biscuit#50.18.18.00.00
-unspsc7#50.18.18.07.00#Biscuits#50.18.18.00.00
-unspsc7#50.18.18.08.00#Unleavened bread#50.18.18.00.00
-unspsc7#50.18.18.09.00#Muffins#50.18.18.00.00
-unspsc7#50.18.18.10.00#Donuts#50.18.18.00.00
-unspsc7#50.18.18.11.00#Pizza or pizza bases#50.18.18.00.00
-unspsc7#50.18.18.12.00#Cornets or cones or waffles#50.18.18.00.00
-unspsc7#50.18.19.00.00#Bread and biscuits and cookies#50.18.00.00.00
-unspsc7#50.18.19.01.00#Fresh bread#50.18.19.00.00
-unspsc7#50.18.19.02.00#Frozen bread#50.18.19.00.00
-unspsc7#50.18.19.03.00#Plain savory biscuits#50.18.19.00.00
-unspsc7#50.18.19.04.00#Dried breads or bread shells or croutons#50.18.19.00.00
-unspsc7#50.18.19.05.00#Sweet biscuits or cookies#50.18.19.00.00
-unspsc7#50.18.20.00.00#Cakes and pies and pastries#50.18.00.00.00
-unspsc7#50.18.20.01.00#Fresh cakes or pies or pastries#50.18.20.00.00
-unspsc7#50.18.20.02.00#Frozen cakes or pies or pastries#50.18.20.00.00
-unspsc7#50.19.00.00.00#Prepared and preserved foods#50.00.00.00.00
-unspsc7#50.19.15.00.00#Prepared soups and stews#50.19.00.00.00
-unspsc7#50.19.15.01.00#Stews#50.19.15.00.00
-unspsc7#50.19.15.02.00#Soups#50.19.15.00.00
-unspsc7#50.19.15.03.00#Stock or stock cubes#50.19.15.00.00
-unspsc7#50.19.15.04.00#Stew or casserole base#50.19.15.00.00
-unspsc7#50.19.15.05.00#Fresh prepared soups or stews#50.19.15.00.00
-unspsc7#50.19.15.06.00#Frozen prepared soups or stews#50.19.15.00.00
-unspsc7#50.19.15.07.00#Shelf stable prepared soups or stews#50.19.15.00.00
-unspsc7#50.19.16.00.00#Frozen foods#50.19.00.00.00
-unspsc7#50.19.16.01.00#Frozen desserts#50.19.16.00.00
-unspsc7#50.19.16.02.00#Frozen meats#50.19.16.00.00
-unspsc7#50.19.16.03.00#Frozen fruits#50.19.16.00.00
-unspsc7#50.19.16.04.00#Frozen vegetables#50.19.16.00.00
-unspsc7#50.19.16.05.00#Frozen prepared meals#50.19.16.00.00
-unspsc7#50.19.16.06.00#Frozen fish#50.19.16.00.00
-unspsc7#50.19.16.07.00#Frozen crustaceans#50.19.16.00.00
-unspsc7#50.19.16.08.00#Frozen mollusks#50.19.16.00.00
-unspsc7#50.19.16.09.00#Frozen prepared pastry unbaked#50.19.16.00.00
-unspsc7#50.19.16.10.00#Frozen savouries#50.19.16.00.00
-unspsc7#50.19.17.00.00#Canned foods and bottled etc#50.19.00.00.00
-unspsc7#50.19.17.01.00#Canned fruits#50.19.17.00.00
-unspsc7#50.19.17.02.00#Canned vegetables#50.19.17.00.00
-unspsc7#50.19.17.03.00#Canned fish#50.19.17.00.00
-unspsc7#50.19.17.04.00#Canned meat#50.19.17.00.00
-unspsc7#50.19.17.05.00#Canned Infant foods#50.19.17.00.00
-unspsc7#50.19.17.06.00#Fruit jams#50.19.17.00.00
-unspsc7#50.19.17.07.00#Marmalade#50.19.17.00.00
-unspsc7#50.19.17.08.00#Canned prepared meals#50.19.17.00.00
-unspsc7#50.19.17.09.00#Canned desserts#50.19.17.00.00
-unspsc7#50.19.18.00.00#Dried foods#50.19.00.00.00
-unspsc7#50.19.18.01.00#Dried fish#50.19.18.00.00
-unspsc7#50.19.18.02.00#Dried meat#50.19.18.00.00
-unspsc7#50.19.18.03.00#Dried vegetables#50.19.18.00.00
-unspsc7#50.19.18.04.00#Dried fruits#50.19.18.00.00
-unspsc7#50.19.19.00.00#Salted and smoked foods#50.19.00.00.00
-unspsc7#50.19.19.01.00#Salted or smoked fish#50.19.19.00.00
-unspsc7#50.19.19.02.00#Salted or smoked meats#50.19.19.00.00
-unspsc7#50.19.19.03.00#Salted or smoked shellfish or crustaceans or roe#50.19.19.00.00
-unspsc7#50.19.19.04.00#Salted or smoked fruits#50.19.19.00.00
-unspsc7#50.19.19.05.00#Salted or smoked nuts#50.19.19.00.00
-unspsc7#50.19.20.00.00#Pickled foods#50.19.00.00.00
-unspsc7#50.19.20.01.00#Pickled fish#50.19.20.00.00
-unspsc7#50.19.20.02.00#Pickled crustaceans#50.19.20.00.00
-unspsc7#50.19.20.03.00#Pickled meats#50.19.20.00.00
-unspsc7#50.19.20.04.00#Pickled vegetables#50.19.20.00.00
-unspsc7#50.19.20.05.00#Pickled eggs#50.19.20.00.00
-unspsc7#50.19.21.00.00#Snack foods#50.19.00.00.00
-unspsc7#50.19.21.01.00#Pretzels#50.19.21.00.00
-unspsc7#50.19.21.02.00#Corn chips#50.19.21.00.00
-unspsc7#50.19.21.03.00#Potato chips#50.19.21.00.00
-unspsc7#50.19.21.04.00#Popcorn#50.19.21.00.00
-unspsc7#50.19.21.05.00#Fish fingers#50.19.21.00.00
-unspsc7#50.19.21.06.00#Fruit snacks#50.19.21.00.00
-unspsc7#50.19.21.07.00#Other flavoured snack foods#50.19.21.00.00
-unspsc7#50.19.21.08.00#Fruit or nut mix#50.19.21.00.00
-unspsc7#50.19.21.09.00#Crisps or chips or pretzels or mixes#50.19.21.00.00
-unspsc7#50.19.21.10.00#Nuts or dried fruits#50.19.21.00.00
-unspsc7#50.19.21.11.00#Dried or processed meats#50.19.21.00.00
-unspsc7#50.19.21.12.00#Popped corn#50.19.21.00.00
-unspsc7#50.19.22.00.00#Spreads and conserves#50.19.00.00.00
-unspsc7#50.19.22.01.00#Peanut butter#50.19.22.00.00
-unspsc7#50.19.22.02.00#Yeast or vegetable extract spreads#50.19.22.00.00
-unspsc7#50.19.22.03.00#Jams or jellies or quinces#50.19.22.00.00
-unspsc7#50.19.23.00.00#Deserts and desert toppings#50.19.00.00.00
-unspsc7#50.19.23.01.00#Prepared deserts#50.19.23.00.00
-unspsc7#50.19.23.02.00#Desert toppings#50.19.23.00.00
-unspsc7#50.19.23.03.00#Flavored ices or ice cream or ice cream deserts or frozen yogurts#50.19.23.00.00
-unspsc7#50.19.24.00.00#Jams and jellies and nut and sweet spreads and fruit conserves#50.19.00.00.00
-unspsc7#50.19.24.01.00#Jams or jellies or fruit preserves#50.19.24.00.00
-unspsc7#50.19.24.02.00#Nut or mixed spreads#50.19.24.00.00
-unspsc7#50.19.24.03.00#Honey#50.19.24.00.00
-unspsc7#50.19.25.00.00#Sandwiches and filled rolls#50.19.00.00.00
-unspsc7#50.19.25.01.00#Fresh sandwiches or filled rolls#50.19.25.00.00
-unspsc7#50.19.25.02.00#Frozen sandwiches or filled rolls#50.19.25.00.00
-unspsc7#50.19.26.00.00#Prepared potatoes and rice and pasta and stuffing#50.19.00.00.00
-unspsc7#50.19.26.01.00#Fresh prepared potatoes or rice or pasta or stuffing#50.19.26.00.00
-unspsc7#50.19.26.02.00#Frozen prepared potatoes or rice or pasta or stuffing#50.19.26.00.00
-unspsc7#50.19.26.03.00#Shelf stable prepared potatoes or rice or pasta or stuffing#50.19.26.00.00
-unspsc7#50.19.27.00.00#Packaged combination meals#50.19.00.00.00
-unspsc7#50.19.27.01.00#Fresh combination meals#50.19.27.00.00
-unspsc7#50.19.27.02.00#Frozen combination meals#50.19.27.00.00
-unspsc7#50.19.27.03.00#Shelf stable combination meals#50.19.27.00.00
-unspsc7#50.19.28.00.00#Savory pies and quiches and pasties#50.19.00.00.00
-unspsc7#50.19.28.01.00#Fresh savory pies or quiches or pasties#50.19.28.00.00
-unspsc7#50.19.28.02.00#Frozen savory pies or quiches or pasties#50.19.28.00.00
-unspsc7#50.19.28.03.00#Shelf stable savory pies or quiches or pasties#50.19.28.00.00
-unspsc7#50.19.29.00.00#Plain pasta and noodles#50.19.00.00.00
-unspsc7#50.19.29.01.00#Fresh plain pasta or noodles#50.19.29.00.00
-unspsc7#50.19.29.02.00#Shelf stable plain pasta or noodles#50.19.29.00.00
-unspsc7#50.19.30.00.00#Infant foods and beverages#50.19.00.00.00
-unspsc7#50.19.30.01.00#Infant foods#50.19.30.00.00
-unspsc7#50.19.30.02.00#Infant beverages#50.19.30.00.00
-unspsc7#50.20.00.00.00#Beverages#50.00.00.00.00
-unspsc7#50.20.15.00.00#Water#50.20.00.00.00
-unspsc7#50.20.15.01.00#Sparkling water#50.20.15.00.00
-unspsc7#50.20.15.02.00#Spring water#50.20.15.00.00
-unspsc7#50.20.15.03.00#Mineral water#50.20.15.00.00
-unspsc7#50.20.15.04.00#Distilled or purified water#50.20.15.00.00
-unspsc7#50.20.16.00.00#Juices#50.20.00.00.00
-unspsc7#50.20.16.01.00#Blended juices#50.20.16.00.00
-unspsc7#50.20.16.02.00#Guava juice#50.20.16.00.00
-unspsc7#50.20.16.03.00#Prune juice#50.20.16.00.00
-unspsc7#50.20.16.04.00#Tomato juice#50.20.16.00.00
-unspsc7#50.20.16.05.00#Cranberry juice#50.20.16.00.00
-unspsc7#50.20.16.06.00#Grapefruit juice#50.20.16.00.00
-unspsc7#50.20.16.07.00#Grape juice#50.20.16.00.00
-unspsc7#50.20.16.08.00#Pineapple juice#50.20.16.00.00
-unspsc7#50.20.16.09.00#Orange juice#50.20.16.00.00
-unspsc7#50.20.16.10.00#Apple juice#50.20.16.00.00
-unspsc7#50.20.16.11.00#Lemon juices or lemonade#50.20.16.00.00
-unspsc7#50.20.16.12.00#Infant juice#50.20.16.00.00
-unspsc7#50.20.17.00.00#Coffee and tea#50.20.00.00.00
-unspsc7#50.20.17.01.00#Instant coffee#50.20.17.00.00
-unspsc7#50.20.17.02.00#Ground coffee#50.20.17.00.00
-unspsc7#50.20.17.03.00#Whole bean coffee#50.20.17.00.00
-unspsc7#50.20.17.04.00#Green coffee#50.20.17.00.00
-unspsc7#50.20.17.05.00#Coffee substitutes#50.20.17.00.00
-unspsc7#50.20.17.06.00#Coffee#50.20.17.00.00
-unspsc7#50.20.17.07.00#Coffee substitutes#50.20.17.00.00
-unspsc7#50.20.17.08.00#Coffee drinks#50.20.17.00.00
-unspsc7#50.20.17.09.00#Instant coffee#50.20.17.00.00
-unspsc7#50.20.17.10.00#Leaf tea#50.20.17.00.00
-unspsc7#50.20.17.11.00#Instant tea#50.20.17.00.00
-unspsc7#50.20.17.12.00#Tea drinks#50.20.17.00.00
-unspsc7#50.20.17.13.00#Tea bags#50.20.17.00.00
-unspsc7#50.20.18.00.00#Tea#50.20.00.00.00
-unspsc7#50.20.18.01.00#Green tea#50.20.18.00.00
-unspsc7#50.20.18.02.00#Black tea#50.20.18.00.00
-unspsc7#50.20.18.03.00#Herbal tea#50.20.18.00.00
-unspsc7#50.20.18.04.00#Powdered tea#50.20.18.00.00
-unspsc7#50.20.18.05.00#Tea bags#50.20.18.00.00
-unspsc7#50.20.19.00.00#Soft drinks#50.20.00.00.00
-unspsc7#50.20.19.01.00#Non carbonated soft drinks#50.20.19.00.00
-unspsc7#50.20.19.02.00#Carbonated soft drinks#50.20.19.00.00
-unspsc7#50.20.19.03.00#Cordials or colourings#50.20.19.00.00
-unspsc7#50.20.19.04.00#Sports or high energy drinks#50.20.19.00.00
-unspsc7#50.20.19.05.00#Soy beverage#50.20.19.00.00
-unspsc7#50.20.20.00.00#Beer and wine#50.20.00.00.00
-unspsc7#50.20.20.01.00#Champagne#50.20.20.00.00
-unspsc7#50.20.20.02.00#Beer#50.20.20.00.00
-unspsc7#50.20.20.03.00#Wine#50.20.20.00.00
-unspsc7#50.20.20.04.00#Sparkling wines#50.20.20.00.00
-unspsc7#50.20.20.05.00#Fortified wine#50.20.20.00.00
-unspsc7#50.20.20.06.00#Port#50.20.20.00.00
-unspsc7#50.20.20.07.00#Sherry#50.20.20.00.00
-unspsc7#50.20.20.08.00#Wine cooler beverage#50.20.20.00.00
-unspsc7#50.20.21.00.00#Spirits and liquors#50.20.00.00.00
-unspsc7#50.20.21.01.00#Brandy#50.20.21.00.00
-unspsc7#50.20.21.02.00#Cognac or armagnac#50.20.21.00.00
-unspsc7#50.20.21.03.00#Whiskey#50.20.21.00.00
-unspsc7#50.20.21.04.00#Vodka#50.20.21.00.00
-unspsc7#50.20.21.05.00#Tequila#50.20.21.00.00
-unspsc7#50.20.21.06.00#Gin#50.20.21.00.00
-unspsc7#50.20.21.07.00#Liqueurs#50.20.21.00.00
-unspsc7#50.20.21.08.00#Rum#50.20.21.00.00
-unspsc7#50.20.21.09.00#Bourbon#50.20.21.00.00
-unspsc7#50.20.21.10.00#Scotch#50.20.21.00.00
-unspsc7#50.20.21.11.00#Cider#50.20.21.00.00
-unspsc7#50.20.21.12.00#Schnapps#50.20.21.00.00
-unspsc7#50.20.21.13.00#Ouzo#50.20.21.00.00
-unspsc7#50.20.21.14.00#Aperitifs or bitters#50.20.21.00.00
-unspsc7#50.20.21.15.00#Vermouth#50.20.21.00.00
-unspsc7#50.20.21.16.00#Sambuca#50.20.21.00.00
-unspsc7#50.20.21.17.00#Sake#50.20.21.00.00
-unspsc7#50.20.21.18.00#Muscat or madeira#50.20.21.00.00
-unspsc7#50.20.22.00.00#Alcoholic beverages#50.20.00.00.00
-unspsc7#50.20.22.01.00#Beer#50.20.22.00.00
-unspsc7#50.20.22.02.00#Cider or perry#50.20.22.00.00
-unspsc7#50.20.22.03.00#Wine#50.20.22.00.00
-unspsc7#50.20.22.04.00#Fortified wine#50.20.22.00.00
-unspsc7#50.20.22.05.00#Sparkling wine#50.20.22.00.00
-unspsc7#50.20.22.06.00#Spirits or liquors#50.20.22.00.00
-unspsc7#50.20.22.07.00#Alcohol cocktails or drink mixes#50.20.22.00.00
-unspsc7#50.20.23.00.00#Non alcoholic beverages#50.20.00.00.00
-unspsc7#50.20.23.01.00#Water#50.20.23.00.00
-unspsc7#50.20.23.02.00#Ice#50.20.23.00.00
-unspsc7#50.20.23.03.00#Frozen juices#50.20.23.00.00
-unspsc7#50.20.23.04.00#Shelf stable juice#50.20.23.00.00
-unspsc7#50.20.23.05.00#Fresh juice#50.20.23.00.00
-unspsc7#50.20.23.06.00#Soft drinks#50.20.23.00.00
-unspsc7#50.20.23.07.00#Chocolate or malt or other hot beverages#50.20.23.00.00
-unspsc7#50.20.23.08.00#Alcohol free cocktails or drink mixes#50.20.23.00.00
-unspsc7#50.20.23.09.00#Sport drink mixes#50.20.23.00.00
-unspsc7#50.20.23.10.00#Spring water#50.20.23.00.00
-unspsc7#50.21.00.00.00#Tobacco and smoking products and substitutes#50.00.00.00.00
-unspsc7#50.21.15.00.00#Tobacco and substitutes#50.21.00.00.00
-unspsc7#50.21.15.01.00#Tobacco leaf#50.21.15.00.00
-unspsc7#50.21.15.02.00#Cigarettes or cigars#50.21.15.00.00
-unspsc7#50.21.15.03.00#Pipe tobacco or leaf tobacco#50.21.15.00.00
-unspsc7#50.21.15.04.00#Chewing tobacco#50.21.15.00.00
-unspsc7#50.21.15.05.00#Herbal cigarettes#50.21.15.00.00
-unspsc7#50.21.16.00.00#Tobacco product accessories and supplies#50.21.00.00.00
-unspsc7#50.21.16.01.00#Pipe tobacco#50.21.16.00.00
-unspsc7#50.21.16.02.00#Cigars#50.21.16.00.00
-unspsc7#50.21.16.03.00#Cigarettes#50.21.16.00.00
-unspsc7#50.21.16.04.00#Smokeless tobacco#50.21.16.00.00
-unspsc7#50.21.16.05.00#Ready rubbed tobacco#50.21.16.00.00
-unspsc7#50.21.16.06.00#Cigarette papers#50.21.16.00.00
-unspsc7#50.21.16.07.00#Cigarette papers or filters#50.21.16.00.00
-unspsc7#50.21.16.08.00#Cigarette lighters or flints#50.21.16.00.00
-unspsc7#50.21.16.09.00#Smoking pipes#50.21.16.00.00
-unspsc7#50.22.00.00.00#Cereal and pulse products#50.00.00.00.00
-unspsc7#50.22.10.00.00#Pulses#50.22.00.00.00
-unspsc7#50.22.10.01.00#Pulse grains#50.22.10.00.00
-unspsc7#50.22.10.02.00#Pulse flour#50.22.10.00.00
-unspsc7#50.22.11.00.00#Cereals#50.22.00.00.00
-unspsc7#50.22.11.01.00#Cereal grains#50.22.11.00.00
-unspsc7#50.22.11.02.00#Cereal flour#50.22.11.00.00
-unspsc7#50.22.12.00.00#Processed cereals#50.22.00.00.00
-unspsc7#50.22.12.01.00#Ready to eat or hot cereals#50.22.12.00.00
-unspsc7#50.22.12.02.00#Health or breakfast bars#50.22.12.00.00
-unspsc7#51.00.00.00.00#Drugs and Pharmaceutical Products#51.00.00.00.00
-unspsc7#51.10.00.00.00#Anti infective drugs#51.00.00.00.00
-unspsc7#51.10.15.00.00#Antibiotics#51.10.00.00.00
-unspsc7#51.10.15.01.00#Aminoglycosides#51.10.15.00.00
-unspsc7#51.10.15.02.00#Cephalosporins#51.10.15.00.00
-unspsc7#51.10.15.03.00#Chloramphenicol#51.10.15.00.00
-unspsc7#51.10.15.04.00#Clindamycin or lincomycin#51.10.15.00.00
-unspsc7#51.10.15.05.00#Fluoroquinolones#51.10.15.00.00
-unspsc7#51.10.15.06.00#Macrolide#51.10.15.00.00
-unspsc7#51.10.15.07.00#Penicillins#51.10.15.00.00
-unspsc7#51.10.15.08.00#Antibiotic sulfonamides#51.10.15.00.00
-unspsc7#51.10.15.09.00#Tetracyclines#51.10.15.00.00
-unspsc7#51.10.16.00.00#Amebicides and Trichomonacides and Antiprotozoals#51.10.00.00.00
-unspsc7#51.10.16.01.00#Atovaquone#51.10.16.00.00
-unspsc7#51.10.16.02.00#Eflornithine hydrochloride#51.10.16.00.00
-unspsc7#51.10.16.03.00#Metronidazole#51.10.16.00.00
-unspsc7#51.10.17.00.00#Anthelmintics#51.10.00.00.00
-unspsc7#51.10.17.01.00#Albendadole#51.10.17.00.00
-unspsc7#51.10.17.02.00#Mebendazole#51.10.17.00.00
-unspsc7#51.10.17.03.00#Oxamniquine#51.10.17.00.00
-unspsc7#51.10.17.04.00#Piperazine citrate#51.10.17.00.00
-unspsc7#51.10.17.05.00#Praziquantel#51.10.17.00.00
-unspsc7#51.10.17.06.00#Pyrantel pamoate#51.10.17.00.00
-unspsc7#51.10.17.07.00#Thiabendazole#51.10.17.00.00
-unspsc7#51.10.18.00.00#Antifungal drugs#51.10.00.00.00
-unspsc7#51.10.18.01.00#Amphotericin b#51.10.18.00.00
-unspsc7#51.10.18.02.00#Butenafine hydrochloride#51.10.18.00.00
-unspsc7#51.10.18.03.00#Butoconazole nitrate#51.10.18.00.00
-unspsc7#51.10.18.04.00#Ciclopirox olamine#51.10.18.00.00
-unspsc7#51.10.18.05.00#Clotrimazole#51.10.18.00.00
-unspsc7#51.10.18.06.00#Econazole nitrate#51.10.18.00.00
-unspsc7#51.10.18.07.00#Fluconazole#51.10.18.00.00
-unspsc7#51.10.18.08.00#Flucytosine#51.10.18.00.00
-unspsc7#51.10.18.09.00#Griseofulvin#51.10.18.00.00
-unspsc7#51.10.18.10.00#Itraconazole#51.10.18.00.00
-unspsc7#51.10.18.11.00#Ketoconazole#51.10.18.00.00
-unspsc7#51.10.18.12.00#Miconazole#51.10.18.00.00
-unspsc7#51.10.18.13.00#Naftifine hydrochloride#51.10.18.00.00
-unspsc7#51.10.18.14.00#Natamycin#51.10.18.00.00
-unspsc7#51.10.18.15.00#Nystatin#51.10.18.00.00
-unspsc7#51.10.18.16.00#Oxiconazole nitrate#51.10.18.00.00
-unspsc7#51.10.18.17.00#Sulconazole nitrate#51.10.18.00.00
-unspsc7#51.10.18.18.00#Terbinafine hydrochloride#51.10.18.00.00
-unspsc7#51.10.18.19.00#Terconazole nitrate#51.10.18.00.00
-unspsc7#51.10.18.20.00#Tioconazole#51.10.18.00.00
-unspsc7#51.10.18.21.00#Tolnaftate#51.10.18.00.00
-unspsc7#51.10.19.00.00#Antimalarial drugs#51.10.00.00.00
-unspsc7#51.10.19.01.00#Aminoquinolines#51.10.19.00.00
-unspsc7#51.10.19.02.00#Mefloquine hydrochloride#51.10.19.00.00
-unspsc7#51.10.19.03.00#Primaquine phosphate#51.10.19.00.00
-unspsc7#51.10.19.04.00#Quinine sulfate#51.10.19.00.00
-unspsc7#51.10.19.05.00#Chloroquine#51.10.19.00.00
-unspsc7#51.10.19.06.00#Proguanil#51.10.19.00.00
-unspsc7#51.10.19.07.00#Pyrimethamine#51.10.19.00.00
-unspsc7#51.10.20.00.00#Antitubercular drugs#51.10.00.00.00
-unspsc7#51.10.20.01.00#Cycloserine#51.10.20.00.00
-unspsc7#51.10.20.02.00#Ethambutol hydrochloride#51.10.20.00.00
-unspsc7#51.10.20.03.00#Isoniazid#51.10.20.00.00
-unspsc7#51.10.20.04.00#Rifubutin#51.10.20.00.00
-unspsc7#51.10.20.05.00#Rifampin#51.10.20.00.00
-unspsc7#51.10.21.00.00#Leprostatics#51.10.00.00.00
-unspsc7#51.10.21.01.00#Clofazimine#51.10.21.00.00
-unspsc7#51.10.21.02.00#Dapsone#51.10.21.00.00
-unspsc7#51.10.22.00.00#Urinary anti infectives and analgesics#51.10.00.00.00
-unspsc7#51.10.22.01.00#Cinoxacin#51.10.22.00.00
-unspsc7#51.10.22.02.00#Flavoxate hydrochloride#51.10.22.00.00
-unspsc7#51.10.22.03.00#Methenamine hippurate#51.10.22.00.00
-unspsc7#51.10.22.04.00#Methenamine mandelate#51.10.22.00.00
-unspsc7#51.10.22.05.00#Nalidixic acid#51.10.22.00.00
-unspsc7#51.10.22.06.00#Nitrofurantoin#51.10.22.00.00
-unspsc7#51.10.22.07.00#Oxybutynin chloride#51.10.22.00.00
-unspsc7#51.10.22.08.00#Pentosan polysulfate sodium#51.10.22.00.00
-unspsc7#51.10.22.09.00#Phenazopyridine hydrochloride#51.10.22.00.00
-unspsc7#51.10.22.10.00#Antiseptic solutions#51.10.22.00.00
-unspsc7#51.10.23.00.00#Antiviral drugs#51.10.00.00.00
-unspsc7#51.10.23.01.00#Acyclovir#51.10.23.00.00
-unspsc7#51.10.23.02.00#Amantadine hydrochloride#51.10.23.00.00
-unspsc7#51.10.23.03.00#Cydofovir#51.10.23.00.00
-unspsc7#51.10.23.04.00#Didanosine#51.10.23.00.00
-unspsc7#51.10.23.05.00#Famciclovir#51.10.23.00.00
-unspsc7#51.10.23.06.00#Foscarnet sodium#51.10.23.00.00
-unspsc7#51.10.23.07.00#Ganciclovir sodium#51.10.23.00.00
-unspsc7#51.10.23.08.00#Idoxuridine#51.10.23.00.00
-unspsc7#51.10.23.09.00#Indinavir sulfate#51.10.23.00.00
-unspsc7#51.10.23.10.00#Lamivudine#51.10.23.00.00
-unspsc7#51.10.23.11.00#Nevirapine#51.10.23.00.00
-unspsc7#51.10.23.12.00#Ribavirin#51.10.23.00.00
-unspsc7#51.10.23.13.00#Rimantadine hydrochloride#51.10.23.00.00
-unspsc7#51.10.23.14.00#Ritonavir#51.10.23.00.00
-unspsc7#51.10.23.15.00#Saquinavir mesylate#51.10.23.00.00
-unspsc7#51.10.23.16.00#Stavidine#51.10.23.00.00
-unspsc7#51.10.23.17.00#Trifluradine#51.10.23.00.00
-unspsc7#51.10.23.18.00#Valacyclovir hydrochloride#51.10.23.00.00
-unspsc7#51.10.23.19.00#Vidarabine#51.10.23.00.00
-unspsc7#51.10.23.20.00#Zalcitabine#51.10.23.00.00
-unspsc7#51.10.23.21.00#Zidovudine#51.10.23.00.00
-unspsc7#51.11.00.00.00#Antineoplastic agents#51.00.00.00.00
-unspsc7#51.11.15.00.00#Alkylating agents#51.11.00.00.00
-unspsc7#51.11.15.01.00#Amifostine#51.11.15.00.00
-unspsc7#51.11.15.02.00#Busulfan#51.11.15.00.00
-unspsc7#51.11.15.03.00#Carboplatin#51.11.15.00.00
-unspsc7#51.11.15.04.00#Carmustine#51.11.15.00.00
-unspsc7#51.11.15.05.00#Chlorambucil#51.11.15.00.00
-unspsc7#51.11.15.06.00#Cisplatin#51.11.15.00.00
-unspsc7#51.11.15.07.00#Cyclophosphamide#51.11.15.00.00
-unspsc7#51.11.15.08.00#Dacarbazine#51.11.15.00.00
-unspsc7#51.11.15.09.00#Ifosfamide#51.11.15.00.00
-unspsc7#51.11.15.10.00#Lomustine#51.11.15.00.00
-unspsc7#51.11.15.11.00#Mechlorethamine hydrochloride#51.11.15.00.00
-unspsc7#51.11.15.12.00#Melphalan#51.11.15.00.00
-unspsc7#51.11.15.13.00#Mesna#51.11.15.00.00
-unspsc7#51.11.15.14.00#Pipobroman#51.11.15.00.00
-unspsc7#51.11.15.15.00#Streptozocin#51.11.15.00.00
-unspsc7#51.11.15.16.00#Thiotepa#51.11.15.00.00
-unspsc7#51.11.15.17.00#Uracil mustard#51.11.15.00.00
-unspsc7#51.11.16.00.00#Antimetabolites#51.11.00.00.00
-unspsc7#51.11.16.01.00#Cladribine#51.11.16.00.00
-unspsc7#51.11.16.02.00#Cytarabine#51.11.16.00.00
-unspsc7#51.11.16.03.00#Floxuridine#51.11.16.00.00
-unspsc7#51.11.16.04.00#Fludarabine phosphate#51.11.16.00.00
-unspsc7#51.11.16.05.00#Fluorouracil#51.11.16.00.00
-unspsc7#51.11.16.06.00#Hydroxyurea#51.11.16.00.00
-unspsc7#51.11.16.07.00#Idarubicin hydrochloride#51.11.16.00.00
-unspsc7#51.11.16.08.00#Levamisole hydrochloride#51.11.16.00.00
-unspsc7#51.11.16.09.00#Mercaptopurine#51.11.16.00.00
-unspsc7#51.11.16.10.00#Methotrexate#51.11.16.00.00
-unspsc7#51.11.16.11.00#Teniposide#51.11.16.00.00
-unspsc7#51.11.16.12.00#Thioguanine#51.11.16.00.00
-unspsc7#51.11.17.00.00#Antineoplastic antibiotics#51.11.00.00.00
-unspsc7#51.11.17.01.00#Bleomycin sulfate#51.11.17.00.00
-unspsc7#51.11.17.02.00#Dactinomycin#51.11.17.00.00
-unspsc7#51.11.17.03.00#Daunorubicins#51.11.17.00.00
-unspsc7#51.11.17.04.00#Mitomycin#51.11.17.00.00
-unspsc7#51.11.17.05.00#Mitotane#51.11.17.00.00
-unspsc7#51.11.17.06.00#Mitoxantrone hydrochloride#51.11.17.00.00
-unspsc7#51.11.17.07.00#Pentostatin#51.11.17.00.00
-unspsc7#51.11.17.08.00#Plicamycin#51.11.17.00.00
-unspsc7#51.11.18.00.00#Hormones and antihormones#51.11.00.00.00
-unspsc7#51.11.18.01.00#Anastrozole#51.11.18.00.00
-unspsc7#51.11.18.02.00#Bicalutamide#51.11.18.00.00
-unspsc7#51.11.18.03.00#Estramustine phosphate sodium#51.11.18.00.00
-unspsc7#51.11.18.04.00#Flutamide#51.11.18.00.00
-unspsc7#51.11.18.05.00#Goserelin acetate#51.11.18.00.00
-unspsc7#51.11.18.06.00#Irinotecan hydrochloride#51.11.18.00.00
-unspsc7#51.11.18.07.00#Leuprolide acetate#51.11.18.00.00
-unspsc7#51.11.18.08.00#Nilutamide#51.11.18.00.00
-unspsc7#51.11.18.09.00#Tamoxifen#51.11.18.00.00
-unspsc7#51.11.18.10.00#Testolactone#51.11.18.00.00
-unspsc7#51.11.18.11.00#Topotecan hydrochloride#51.11.18.00.00
-unspsc7#51.11.18.12.00#Vinblastine sulfate#51.11.18.00.00
-unspsc7#51.11.18.13.00#Vincristine sulfate#51.11.18.00.00
-unspsc7#51.11.18.14.00#Vinorelbine tartrate#51.11.18.00.00
-unspsc7#51.11.19.00.00#Natural antineoplastic products#51.11.00.00.00
-unspsc7#51.11.19.01.00#Asparaginase#51.11.19.00.00
-unspsc7#51.11.19.02.00#Docetaxel#51.11.19.00.00
-unspsc7#51.11.19.03.00#Interferon#51.11.19.00.00
-unspsc7#51.11.19.04.00#Paclitaxel#51.11.19.00.00
-unspsc7#51.11.19.05.00#Porfimer sodium#51.11.19.00.00
-unspsc7#51.12.00.00.00#Cardiovascular drugs#51.00.00.00.00
-unspsc7#51.12.15.00.00#Antiarrythmic agents#51.12.00.00.00
-unspsc7#51.12.15.01.00#Adenosine#51.12.15.00.00
-unspsc7#51.12.15.02.00#Digoxin#51.12.15.00.00
-unspsc7#51.12.15.03.00#Quinidine gluconate#51.12.15.00.00
-unspsc7#51.12.16.00.00#Antianginal drugs#51.12.00.00.00
-unspsc7#51.12.16.01.00#Amyl nitrate#51.12.16.00.00
-unspsc7#51.12.16.02.00#Isosorbide dinitrate#51.12.16.00.00
-unspsc7#51.12.16.03.00#Nitroglycerin#51.12.16.00.00
-unspsc7#51.12.16.04.00#Pentaerythritol tetranitrate#51.12.16.00.00
-unspsc7#51.12.17.00.00#Antihypertensive drugs#51.12.00.00.00
-unspsc7#51.12.17.01.00#Diazoxide#51.12.17.00.00
-unspsc7#51.12.17.02.00#Terazosin#51.12.17.00.00
-unspsc7#51.12.17.03.00#Captopril#51.12.17.00.00
-unspsc7#51.12.17.04.00#Lisinopril#51.12.17.00.00
-unspsc7#51.12.17.05.00#Felodipine#51.12.17.00.00
-unspsc7#51.12.17.06.00#Isradipine#51.12.17.00.00
-unspsc7#51.12.17.07.00#Verapamil#51.12.17.00.00
-unspsc7#51.12.17.08.00#Methyldopa#51.12.17.00.00
-unspsc7#51.12.17.09.00#Carvedilol#51.12.17.00.00
-unspsc7#51.12.17.10.00#Losartan potassium#51.12.17.00.00
-unspsc7#51.12.17.11.00#Minoxidil#51.12.17.00.00
-unspsc7#51.12.18.00.00#Antihyperlipidemic and hypocholesterolemic agents#51.12.00.00.00
-unspsc7#51.12.18.01.00#Fluvastatin sodium#51.12.18.00.00
-unspsc7#51.12.18.02.00#Lovastatin#51.12.18.00.00
-unspsc7#51.12.18.03.00#Simvastatin#51.12.18.00.00
-unspsc7#51.12.18.04.00#Clofibrate#51.12.18.00.00
-unspsc7#51.12.18.05.00#Gemfibrozil#51.12.18.00.00
-unspsc7#51.12.19.00.00#Drugs used for congestive heart failure#51.12.00.00.00
-unspsc7#51.12.19.01.00#Amrinone lactate#51.12.19.00.00
-unspsc7#51.12.19.02.00#Milrinone lactate#51.12.19.00.00
-unspsc7#51.12.19.03.00#Digitoxin#51.12.19.00.00
-unspsc7#51.13.00.00.00#Hematolic drugs#51.00.00.00.00
-unspsc7#51.13.15.00.00#Antianemic drugs#51.13.00.00.00
-unspsc7#51.13.15.01.00#Ferrous fumarate#51.13.15.00.00
-unspsc7#51.13.15.02.00#Ferrous gluconate#51.13.15.00.00
-unspsc7#51.13.15.03.00#Ferrous sulfate#51.13.15.00.00
-unspsc7#51.13.16.00.00#Anticoagulants#51.13.00.00.00
-unspsc7#51.13.16.01.00#Aprotinin#51.13.16.00.00
-unspsc7#51.13.16.02.00#Heparin calcium#51.13.16.00.00
-unspsc7#51.13.16.03.00#Heparin sodium#51.13.16.00.00
-unspsc7#51.13.16.04.00#Warfarin sodium#51.13.16.00.00
-unspsc7#51.13.17.00.00#Thrombolytic drugs and platelet aggregation inhibitors#51.13.00.00.00
-unspsc7#51.13.17.01.00#Abciximab#51.13.17.00.00
-unspsc7#51.13.17.02.00#Alteplase#51.13.17.00.00
-unspsc7#51.13.17.03.00#Streptokinase#51.13.17.00.00
-unspsc7#51.13.17.04.00#Urokinase#51.13.17.00.00
-unspsc7#51.14.00.00.00#Central nervous system drugs#51.00.00.00.00
-unspsc7#51.14.15.00.00#Anticonvulsants#51.14.00.00.00
-unspsc7#51.14.15.01.00#Acetazolamide#51.14.15.00.00
-unspsc7#51.14.15.02.00#Clonazepam#51.14.15.00.00
-unspsc7#51.14.15.03.00#Felbamate#51.14.15.00.00
-unspsc7#51.14.15.04.00#Lamotrigine#51.14.15.00.00
-unspsc7#51.14.15.05.00#Phenobarbital#51.14.15.00.00
-unspsc7#51.14.15.06.00#Phenobarbital sodium#51.14.15.00.00
-unspsc7#51.14.15.07.00#Phenytoin#51.14.15.00.00
-unspsc7#51.14.15.08.00#Ethosuximide#51.14.15.00.00
-unspsc7#51.14.16.00.00#Antidepressants#51.14.00.00.00
-unspsc7#51.14.16.01.00#Amitriptyline hydrochloride#51.14.16.00.00
-unspsc7#51.14.16.02.00#Doxepin hydrochloride#51.14.16.00.00
-unspsc7#51.14.16.03.00#Imipramine pamoate#51.14.16.00.00
-unspsc7#51.14.16.04.00#Mirtazapine#51.14.16.00.00
-unspsc7#51.14.16.05.00#Paroxetine hydrochloride#51.14.16.00.00
-unspsc7#51.14.16.06.00#Trazodone hydrochloride#51.14.16.00.00
-unspsc7#51.14.17.00.00#Antipsychotic agents#51.14.00.00.00
-unspsc7#51.14.17.01.00#Phenothiazines#51.14.17.00.00
-unspsc7#51.14.17.02.00#Haloperidol#51.14.17.00.00
-unspsc7#51.14.17.03.00#Olanzapine#51.14.17.00.00
-unspsc7#51.14.17.04.00#Risperidone#51.14.17.00.00
-unspsc7#51.14.18.00.00#Hypnotics#51.14.00.00.00
-unspsc7#51.14.18.01.00#Pentobarbital#51.14.18.00.00
-unspsc7#51.14.18.02.00#Secobarbital sodium#51.14.18.00.00
-unspsc7#51.14.18.03.00#Chloral hydrate#51.14.18.00.00
-unspsc7#51.14.18.04.00#Estazolam#51.14.18.00.00
-unspsc7#51.14.18.05.00#Triazolam#51.14.18.00.00
-unspsc7#51.14.19.00.00#Tranquilizers and antimanic drugs#51.14.00.00.00
-unspsc7#51.14.19.01.00#Alprazolam#51.14.19.00.00
-unspsc7#51.14.19.02.00#Diazepam#51.14.19.00.00
-unspsc7#51.14.19.03.00#Lithium carbonate#51.14.19.00.00
-unspsc7#51.14.19.04.00#Lithium citrate#51.14.19.00.00
-unspsc7#51.14.19.05.00#Midazolam hydrochloride#51.14.19.00.00
-unspsc7#51.14.19.06.00#Temazepam#51.14.19.00.00
-unspsc7#51.14.20.00.00#Non narcotic analgesics and antipyretics#51.14.00.00.00
-unspsc7#51.14.20.01.00#Acetaminophen#51.14.20.00.00
-unspsc7#51.14.20.02.00#Acetylsalicylic acid#51.14.20.00.00
-unspsc7#51.14.20.03.00#Mesalamine#51.14.20.00.00
-unspsc7#51.14.20.04.00#Meprobromate#51.14.20.00.00
-unspsc7#51.14.21.00.00#Nonsteroidal anti inflammatory drugs (NSAIDs)#51.14.00.00.00
-unspsc7#51.14.21.01.00#Auranofin#51.14.21.00.00
-unspsc7#51.14.21.02.00#Carpofen#51.14.21.00.00
-unspsc7#51.14.21.03.00#Diclofenac potassium#51.14.21.00.00
-unspsc7#51.14.21.04.00#Diclofenac sodium#51.14.21.00.00
-unspsc7#51.14.21.05.00#Flurbiprofen#51.14.21.00.00
-unspsc7#51.14.21.06.00#Ibuprofen#51.14.21.00.00
-unspsc7#51.14.21.07.00#Indomethacin#51.14.21.00.00
-unspsc7#51.14.21.08.00#Ketoprofen#51.14.21.00.00
-unspsc7#51.14.21.09.00#Naproxen#51.14.21.00.00
-unspsc7#51.14.21.10.00#Naproxen sodium#51.14.21.00.00
-unspsc7#51.14.21.11.00#Oxaprozin#51.14.21.00.00
-unspsc7#51.14.21.12.00#Sulindac#51.14.21.00.00
-unspsc7#51.14.21.13.00#Suprofen#51.14.21.00.00
-unspsc7#51.14.22.00.00#Narcotic analgesics#51.14.00.00.00
-unspsc7#51.14.22.01.00#Butorphanol tartrate#51.14.22.00.00
-unspsc7#51.14.22.02.00#Codeine phosphate#51.14.22.00.00
-unspsc7#51.14.22.03.00#Codeine sulfate#51.14.22.00.00
-unspsc7#51.14.22.05.00#Meperidine hydrochloride#51.14.22.00.00
-unspsc7#51.14.22.06.00#Morphine sulfate#51.14.22.00.00
-unspsc7#51.14.22.07.00#Oxycodone#51.14.22.00.00
-unspsc7#51.14.22.08.00#Sufentanil#51.14.22.00.00
-unspsc7#51.14.23.00.00#Narcotic antagonists#51.14.00.00.00
-unspsc7#51.14.23.01.00#Nalmefene hydrochloride#51.14.23.00.00
-unspsc7#51.14.23.02.00#Naloxone hydrochloride#51.14.23.00.00
-unspsc7#51.14.23.03.00#Naltrexone#51.14.23.00.00
-unspsc7#51.14.24.00.00#Drugs used for vascular and migraine headaches#51.14.00.00.00
-unspsc7#51.14.24.01.00#Methysergide maleate#51.14.24.00.00
-unspsc7#51.14.24.02.00#Sumatriptan succinate#51.14.24.00.00
-unspsc7#51.14.25.00.00#Antiparkinson drugs#51.14.00.00.00
-unspsc7#51.14.25.01.00#Bromocriptine mesylate#51.14.25.00.00
-unspsc7#51.14.25.02.00#Carbidopa#51.14.25.00.00
-unspsc7#51.14.25.03.00#Levodopa#51.14.25.00.00
-unspsc7#51.14.25.04.00#Selegiline hydrochloride#51.14.25.00.00
-unspsc7#51.14.26.00.00#Stimulants and anorexiants#51.14.00.00.00
-unspsc7#51.14.26.01.00#Amphetamine sulfate#51.14.26.00.00
-unspsc7#51.14.26.02.00#Fenfluramine#51.14.26.00.00
-unspsc7#51.14.26.03.00#Mazindol#51.14.26.00.00
-unspsc7#51.14.26.04.00#Pemoline#51.14.26.00.00
-unspsc7#51.14.26.05.00#Phendimetrazine tartrate#51.14.26.00.00
-unspsc7#51.15.00.00.00#Autonomic nervous system drugs#51.00.00.00.00
-unspsc7#51.15.15.00.00#Cholinergic drugs and cholinesterase inhibitors#51.15.00.00.00
-unspsc7#51.15.15.01.00#Bethanechol chloride#51.15.15.00.00
-unspsc7#51.15.15.02.00#Edrophonium chloride#51.15.15.00.00
-unspsc7#51.15.15.03.00#Physostigmine salicylate#51.15.15.00.00
-unspsc7#51.15.15.04.00#Pilocarpine nitrate#51.15.15.00.00
-unspsc7#51.15.16.00.00#Cholinergic blocking agents#51.15.00.00.00
-unspsc7#51.15.16.01.00#Atropine sulfate#51.15.16.00.00
-unspsc7#51.15.16.02.00#Benztropine mesylate#51.15.16.00.00
-unspsc7#51.15.16.03.00#Procyclidine hydrochloride#51.15.16.00.00
-unspsc7#51.15.16.04.00#Trihexyphenidyl hydrochloride#51.15.16.00.00
-unspsc7#51.15.17.00.00#Sympathomimetic or adrenergic drugs#51.15.00.00.00
-unspsc7#51.15.17.01.00#Albuterol#51.15.17.00.00
-unspsc7#51.15.17.02.00#Brimonidine tartrate#51.15.17.00.00
-unspsc7#51.15.17.03.00#Epinephrine#51.15.17.00.00
-unspsc7#51.15.17.04.00#Epinephrine borate#51.15.17.00.00
-unspsc7#51.15.17.05.00#Epinephrine hydrochloride#51.15.17.00.00
-unspsc7#51.15.17.06.00#Isoproterenol#51.15.17.00.00
-unspsc7#51.15.17.07.00#Isoproterenol sulfate#51.15.17.00.00
-unspsc7#51.15.17.08.00#Levarterenol bitartrate#51.15.17.00.00
-unspsc7#51.15.17.09.00#Phenylpropanolamine hydrochloride#51.15.17.00.00
-unspsc7#51.15.18.00.00#Adrenergic blocking agents#51.15.00.00.00
-unspsc7#51.15.18.01.00#Atenolol#51.15.18.00.00
-unspsc7#51.15.18.02.00#Esmolol hydrochloride#51.15.18.00.00
-unspsc7#51.15.18.03.00#Nadolol#51.15.18.00.00
-unspsc7#51.15.18.04.00#Pindolol#51.15.18.00.00
-unspsc7#51.15.18.05.00#Timolol maleate#51.15.18.00.00
-unspsc7#51.15.18.10.00#Phentolamine mesylate#51.15.18.00.00
-unspsc7#51.15.19.00.00#Skeletal muscle relaxants and centrally acting#51.15.00.00.00
-unspsc7#51.15.19.01.00#Baclofen#51.15.19.00.00
-unspsc7#51.15.19.02.00#Chlorzoxazone#51.15.19.00.00
-unspsc7#51.15.19.03.00#Dantrolene sodium#51.15.19.00.00
-unspsc7#51.15.19.04.00#Methocarbamol#51.15.19.00.00
-unspsc7#51.15.19.05.00#Carisoprodol#51.15.19.00.00
-unspsc7#51.15.20.00.00#Neuromuscular blocking agents#51.15.00.00.00
-unspsc7#51.15.20.01.00#Atracurium besylate#51.15.20.00.00
-unspsc7#51.15.20.02.00#Mivacurium chyloride#51.15.20.00.00
-unspsc7#51.15.20.03.00#Rocuronium bromide#51.15.20.00.00
-unspsc7#51.15.20.04.00#Vecuronium bromide#51.15.20.00.00
-unspsc7#51.16.00.00.00#Drugs affecting the respiratory tract#51.00.00.00.00
-unspsc7#51.16.15.00.00#Antiasthmatic drugs#51.16.00.00.00
-unspsc7#51.16.15.01.00#Bitolterol mesylate#51.16.15.00.00
-unspsc7#51.16.15.02.00#Nedocromil sodium#51.16.15.00.00
-unspsc7#51.16.15.03.00#Pirbuterol acetate#51.16.15.00.00
-unspsc7#51.16.15.04.00#Aminophylline#51.16.15.00.00
-unspsc7#51.16.15.05.00#Theophylline#51.16.15.00.00
-unspsc7#51.16.16.00.00#Antihistamines or H1 blockers#51.16.00.00.00
-unspsc7#51.16.16.01.00#Astemizole#51.16.16.00.00
-unspsc7#51.16.16.02.00#Clemastine fumarate#51.16.16.00.00
-unspsc7#51.16.16.03.00#Dexchlorpheniramine maleate#51.16.16.00.00
-unspsc7#51.16.16.04.00#Dimenhydrinate#51.16.16.00.00
-unspsc7#51.16.16.05.00#Levocabastine hydrochloride#51.16.16.00.00
-unspsc7#51.16.16.06.00#Loratidine#51.16.16.00.00
-unspsc7#51.16.16.07.00#Terfenadine#51.16.16.00.00
-unspsc7#51.16.17.00.00#Drugs used for respiratory tract disorders#51.16.00.00.00
-unspsc7#51.16.17.01.00#Acetylcysteine#51.16.17.00.00
-unspsc7#51.16.17.02.00#Beractant#51.16.17.00.00
-unspsc7#51.16.17.03.00#Budesonide#51.16.17.00.00
-unspsc7#51.16.17.04.00#Colfosceril palmitate#51.16.17.00.00
-unspsc7#51.16.17.05.00#Ipratropium bromide#51.16.17.00.00
-unspsc7#51.16.18.00.00#Cough and cold and antiallergy products#51.16.00.00.00
-unspsc7#51.16.18.01.00#Benzonatate#51.16.18.00.00
-unspsc7#51.16.18.02.00#Guaifenesin#51.16.18.00.00
-unspsc7#51.16.19.00.00#Nasal decongestants#51.16.00.00.00
-unspsc7#51.16.19.01.00#Oxymetazoline hydrochloride#51.16.19.00.00
-unspsc7#51.16.19.02.00#Pseudoephedrine hydrochloride#51.16.19.00.00
-unspsc7#51.16.19.03.00#Xylometazoline hydrochloride#51.16.19.00.00
-unspsc7#51.17.00.00.00#Drugs affecting the gastrointestinal system#51.00.00.00.00
-unspsc7#51.17.15.00.00#Antacids#51.17.00.00.00
-unspsc7#51.17.15.01.00#Calcium carbonate#51.17.15.00.00
-unspsc7#51.17.15.02.00#Magaldrate#51.17.15.00.00
-unspsc7#51.17.15.03.00#Magnesium hydroxide#51.17.15.00.00
-unspsc7#51.17.15.04.00#Sodium bicarbonate antacids#51.17.15.00.00
-unspsc7#51.17.16.00.00#Laxatives#51.17.00.00.00
-unspsc7#51.17.16.01.00#Cascara sagrada#51.17.16.00.00
-unspsc7#51.17.16.02.00#Docusate calcium#51.17.16.00.00
-unspsc7#51.17.16.03.00#Docusate potassium#51.17.16.00.00
-unspsc7#51.17.16.04.00#Docusate sodium#51.17.16.00.00
-unspsc7#51.17.16.05.00#Lactulose#51.17.16.00.00
-unspsc7#51.17.16.06.00#Magnesium sulfate#51.17.16.00.00
-unspsc7#51.17.16.07.00#Psyllium hydrophilic muciloid#51.17.16.00.00
-unspsc7#51.17.17.00.00#Antidiarrheals#51.17.00.00.00
-unspsc7#51.17.17.01.00#Difenoxin hydrochloride#51.17.17.00.00
-unspsc7#51.17.17.02.00#Loperamide hydrochloride#51.17.17.00.00
-unspsc7#51.17.17.03.00#Paregoric#51.17.17.00.00
-unspsc7#51.17.18.00.00#Antiemetics and antinauseants#51.17.00.00.00
-unspsc7#51.17.18.01.00#Dronabinol#51.17.18.00.00
-unspsc7#51.17.18.02.00#Granisetron hydrochloride#51.17.18.00.00
-unspsc7#51.17.18.03.00#Meclizine hydrochloride#51.17.18.00.00
-unspsc7#51.17.18.04.00#Ondansetron hydrochloride#51.17.18.00.00
-unspsc7#51.17.18.05.00#Trimethobenzamide hydrochloride#51.17.18.00.00
-unspsc7#51.17.19.00.00#Antiulcer and related gastrointestinal (GI) drugs#51.17.00.00.00
-unspsc7#51.17.19.01.00#Cimetidine#51.17.19.00.00
-unspsc7#51.17.19.02.00#Famotidine#51.17.19.00.00
-unspsc7#51.17.19.03.00#Nizatidine#51.17.19.00.00
-unspsc7#51.17.19.04.00#Ranitidine hydrochloride#51.17.19.00.00
-unspsc7#51.17.19.05.00#Cisapride#51.17.19.00.00
-unspsc7#51.17.19.06.00#Lansoprazole#51.17.19.00.00
-unspsc7#51.17.19.07.00#Librax#51.17.19.00.00
-unspsc7#51.17.19.08.00#Misoprostol#51.17.19.00.00
-unspsc7#51.17.20.00.00#Drugs used for gallbladder disease#51.17.00.00.00
-unspsc7#51.17.20.01.00#Chenodiol#51.17.20.00.00
-unspsc7#51.17.20.02.00#Monoctanoin#51.17.20.00.00
-unspsc7#51.17.20.03.00#Ursodiol#51.17.20.00.00
-unspsc7#51.18.00.00.00#Hormones and hormone antagonists#51.00.00.00.00
-unspsc7#51.18.15.00.00#Antidiabetic agents and hyperglycemic agents#51.18.00.00.00
-unspsc7#51.18.15.01.00#Acarbose#51.18.15.00.00
-unspsc7#51.18.15.02.00#Acetohexamide#51.18.15.00.00
-unspsc7#51.18.15.03.00#Chlorpropamide#51.18.15.00.00
-unspsc7#51.18.15.04.00#Glimepiride#51.18.15.00.00
-unspsc7#51.18.15.05.00#Glipizide#51.18.15.00.00
-unspsc7#51.18.15.06.00#Insulin#51.18.15.00.00
-unspsc7#51.18.15.08.00#Glucagon#51.18.15.00.00
-unspsc7#51.18.16.00.00#Thyroid and antithyroid drugs#51.18.00.00.00
-unspsc7#51.18.16.01.00#Levothyroxine sodium#51.18.16.00.00
-unspsc7#51.18.16.02.00#Liothyronine sodium#51.18.16.00.00
-unspsc7#51.18.16.03.00#Liotrix#51.18.16.00.00
-unspsc7#51.18.16.04.00#Thyrotropin#51.18.16.00.00
-unspsc7#51.18.16.05.00#Methimazole#51.18.16.00.00
-unspsc7#51.18.16.06.00#Propylthiouracil#51.18.16.00.00
-unspsc7#51.18.17.00.00#Corticosteroids#51.18.00.00.00
-unspsc7#51.18.17.01.00#Betamethasone#51.18.17.00.00
-unspsc7#51.18.17.02.00#Corticotropin#51.18.17.00.00
-unspsc7#51.18.17.03.00#Cosyntropin#51.18.17.00.00
-unspsc7#51.18.17.04.00#Dexamethasone#51.18.17.00.00
-unspsc7#51.18.17.05.00#Flunisolide#51.18.17.00.00
-unspsc7#51.18.17.06.00#Hydrocortisone#51.18.17.00.00
-unspsc7#51.18.17.07.00#Methylprednisolone#51.18.17.00.00
-unspsc7#51.18.17.08.00#Prednisolone#51.18.17.00.00
-unspsc7#51.18.17.09.00#Triamcinolone#51.18.17.00.00
-unspsc7#51.18.18.00.00#Estrogens and progestins and internal contraceptives#51.18.00.00.00
-unspsc7#51.18.18.01.00#Chlorotrianisene#51.18.18.00.00
-unspsc7#51.18.18.02.00#Estrone#51.18.18.00.00
-unspsc7#51.18.18.03.00#Estrogens conjugated#51.18.18.00.00
-unspsc7#51.18.18.04.00#Estropipate#51.18.18.00.00
-unspsc7#51.18.18.05.00#Levonorgestrel#51.18.18.00.00
-unspsc7#51.18.18.06.00#Megestrol acetate#51.18.18.00.00
-unspsc7#51.18.18.07.00#Ethinyl estradiol#51.18.18.00.00
-unspsc7#51.18.18.08.00#Mestranol#51.18.18.00.00
-unspsc7#51.18.19.00.00#Gonadotropic hormones and ovarian stimulants and inhibitors#51.18.00.00.00
-unspsc7#51.18.19.01.00#Chorionic gonadotropin#51.18.19.00.00
-unspsc7#51.18.19.02.00#Danazol#51.18.19.00.00
-unspsc7#51.18.19.03.00#Gonadorelin acetate#51.18.19.00.00
-unspsc7#51.18.19.04.00#Histrelin acetate#51.18.19.00.00
-unspsc7#51.18.19.05.00#Menotropins#51.18.19.00.00
-unspsc7#51.18.19.06.00#Urofollitropin#51.18.19.00.00
-unspsc7#51.18.20.00.00#Androgens and androgen inhibitors#51.18.00.00.00
-unspsc7#51.18.20.01.00#Finasteride#51.18.20.00.00
-unspsc7#51.18.20.02.00#Testosterone#51.18.20.00.00
-unspsc7#51.18.20.03.00#Testosterone cypionate#51.18.20.00.00
-unspsc7#51.18.20.04.00#Testosterone enanthate#51.18.20.00.00
-unspsc7#51.18.20.05.00#Testosterone propionate#51.18.20.00.00
-unspsc7#51.18.21.00.00#Posterior pituitary hormones#51.18.00.00.00
-unspsc7#51.18.21.01.00#Desmopressin acetate#51.18.21.00.00
-unspsc7#51.18.21.02.00#Vasopressin#51.18.21.00.00
-unspsc7#51.18.22.00.00#Drugs for inducing labor#51.18.00.00.00
-unspsc7#51.18.22.01.00#Dinoprostone#51.18.22.00.00
-unspsc7#51.18.22.02.00#Methylergonovine maleate#51.18.22.00.00
-unspsc7#51.18.22.03.00#Oxytocin#51.18.22.00.00
-unspsc7#51.18.23.00.00#Growth hormones#51.18.00.00.00
-unspsc7#51.18.23.01.00#Somatrem#51.18.23.00.00
-unspsc7#51.18.23.02.00#Somatropin#51.18.23.00.00
-unspsc7#51.18.24.00.00#Calcium salts and calcium regulators#51.18.00.00.00
-unspsc7#51.18.24.01.00#Calcium chloride#51.18.24.00.00
-unspsc7#51.18.24.02.00#Calcium citrate#51.18.24.00.00
-unspsc7#51.18.24.03.00#Calcium gluconate#51.18.24.00.00
-unspsc7#51.18.24.04.00#Calcium lactate#51.18.24.00.00
-unspsc7#51.18.24.05.00#Dibase calcium phosphate#51.18.24.00.00
-unspsc7#51.18.24.06.00#Alendronate sodium#51.18.24.00.00
-unspsc7#51.18.24.07.00#Calcitonin#51.18.24.00.00
-unspsc7#51.18.24.08.00#Cellulose sodium phosphate#51.18.24.00.00
-unspsc7#51.18.24.09.00#Gallium nitrate#51.18.24.00.00
-unspsc7#51.19.00.00.00#Agents affecting water and electrolytes#51.00.00.00.00
-unspsc7#51.19.15.00.00#Diuretics#51.19.00.00.00
-unspsc7#51.19.15.01.00#Chlorothiazide#51.19.15.00.00
-unspsc7#51.19.15.02.00#Chlorthalidone#51.19.15.00.00
-unspsc7#51.19.15.03.00#Mentolazone#51.19.15.00.00
-unspsc7#51.19.15.04.00#Bumetanide#51.19.15.00.00
-unspsc7#51.19.15.05.00#Ethacrynate sodium#51.19.15.00.00
-unspsc7#51.19.15.06.00#Amiloride hydrochloride#51.19.15.00.00
-unspsc7#51.19.15.07.00#Spironolactone#51.19.15.00.00
-unspsc7#51.19.15.08.00#Triamterene#51.19.15.00.00
-unspsc7#51.19.15.09.00#Mannitol#51.19.15.00.00
-unspsc7#51.19.16.00.00#Electrolytes#51.19.00.00.00
-unspsc7#51.19.16.01.00#Dextrose#51.19.16.00.00
-unspsc7#51.19.16.02.00#Sodium chloride electrolytes#51.19.16.00.00
-unspsc7#51.19.17.00.00#Alkalinizing agents#51.19.00.00.00
-unspsc7#51.19.17.01.00#Tromethamine#51.19.17.00.00
-unspsc7#51.19.18.00.00#Potassium salts#51.19.00.00.00
-unspsc7#51.19.18.01.00#Potassium bicarbonate#51.19.18.00.00
-unspsc7#51.19.18.02.00#Potassium chloride#51.19.18.00.00
-unspsc7#51.19.18.03.00#Potassium gluconate#51.19.18.00.00
-unspsc7#51.20.00.00.00#Immunomodulating drugs#51.00.00.00.00
-unspsc7#51.20.15.00.00#Immunosuppressants#51.20.00.00.00
-unspsc7#51.20.15.01.00#Azathioprine#51.20.15.00.00
-unspsc7#51.20.15.02.00#Cyclosporine#51.20.15.00.00
-unspsc7#51.20.15.03.00#Mycophenolate mofetil#51.20.15.00.00
-unspsc7#51.20.15.04.00#Tacrolimus#51.20.15.00.00
-unspsc7#51.20.16.00.00#Vaccines#51.20.00.00.00
-unspsc7#51.20.16.01.00#Anthrax antigen#51.20.16.00.00
-unspsc7#51.20.16.02.00#Brucella antigen#51.20.16.00.00
-unspsc7#51.20.16.03.00#Cholera#51.20.16.00.00
-unspsc7#51.20.16.04.00#Diphteria#51.20.16.00.00
-unspsc7#51.20.16.05.00#Encephalitis#51.20.16.00.00
-unspsc7#51.20.16.06.00#Hemophilus influenzae#51.20.16.00.00
-unspsc7#51.20.16.07.00#Hepatitis b#51.20.16.00.00
-unspsc7#51.20.16.08.00#Influenza#51.20.16.00.00
-unspsc7#51.20.16.09.00#Measles#51.20.16.00.00
-unspsc7#51.20.16.10.00#Meningococcus#51.20.16.00.00
-unspsc7#51.20.16.11.00#Morbilli#51.20.16.00.00
-unspsc7#51.20.16.12.00#Mumps#51.20.16.00.00
-unspsc7#51.20.16.13.00#Parotitis#51.20.16.00.00
-unspsc7#51.20.16.14.00#Pertussis#51.20.16.00.00
-unspsc7#51.20.16.15.00#Pneumococcus#51.20.16.00.00
-unspsc7#51.20.16.16.00#Poliomyelitis#51.20.16.00.00
-unspsc7#51.20.16.17.00#Rabies#51.20.16.00.00
-unspsc7#51.20.16.18.00#Rota virus#51.20.16.00.00
-unspsc7#51.20.16.19.00#Rubella#51.20.16.00.00
-unspsc7#51.20.16.20.00#Smallpox#51.20.16.00.00
-unspsc7#51.20.16.21.00#Tetanus toxoid#51.20.16.00.00
-unspsc7#51.20.16.22.00#Tuberculosis#51.20.16.00.00
-unspsc7#51.20.16.23.00#Typhoid#51.20.16.00.00
-unspsc7#51.20.16.24.00#Varicella#51.20.16.00.00
-unspsc7#51.20.16.25.00#Yellow fever#51.20.16.00.00
-unspsc7#51.20.16.26.00#Hepatitis a#51.20.16.00.00
-unspsc7#51.21.00.00.00#Miscellaneous drug categories#51.00.00.00.00
-unspsc7#51.21.15.00.00#Antigout drugs#51.21.00.00.00
-unspsc7#51.21.15.01.00#Allopurinol#51.21.15.00.00
-unspsc7#51.21.15.02.00#Colchicine#51.21.15.00.00
-unspsc7#51.21.15.03.00#Probenecid#51.21.15.00.00
-unspsc7#51.21.15.04.00#Sulfinpyrazone#51.21.15.00.00
-unspsc7#51.21.16.00.00#Antidotes#51.21.00.00.00
-unspsc7#51.21.16.01.00#Deferoxamine mesylate#51.21.16.00.00
-unspsc7#51.21.16.02.00#Dexrazoxane#51.21.16.00.00
-unspsc7#51.21.16.03.00#Digoxin immune fab#51.21.16.00.00
-unspsc7#51.21.16.04.00#Dimercaprol#51.21.16.00.00
-unspsc7#51.21.16.05.00#Edetate disodium#51.21.16.00.00
-unspsc7#51.21.16.06.00#Flumazenil#51.21.16.00.00
-unspsc7#51.21.16.07.00#Ipecac#51.21.16.00.00
-unspsc7#51.21.16.08.00#Penicillamine#51.21.16.00.00
-unspsc7#51.21.16.09.00#Protamine sulfate#51.21.16.00.00
-unspsc7#51.21.16.10.00#Sodium polystyrene sulfonate#51.21.16.00.00
-unspsc7#51.21.16.11.00#Trientine#51.21.16.00.00
-unspsc7#51.21.17.00.00#Nutritious food#51.21.00.00.00
-unspsc7#51.21.17.01.00#Residue of maize germ#51.21.17.00.00
-unspsc7#51.21.18.00.00#Anaesthetic drugs#51.21.00.00.00
-unspsc7#51.21.18.01.00#Chloroform#51.21.18.00.00
-unspsc7#52.00.00.00.00#Domestic Appliances and Supplies and Consumer Electronic Products#52.00.00.00.00
-unspsc7#52.10.00.00.00#Floor coverings#52.00.00.00.00
-unspsc7#52.10.15.00.00#Rugs and mats#52.10.00.00.00
-unspsc7#52.10.15.01.00#Oriental rugs#52.10.15.00.00
-unspsc7#52.10.15.02.00#Area rugs#52.10.15.00.00
-unspsc7#52.10.15.03.00#Wool rugs#52.10.15.00.00
-unspsc7#52.10.15.04.00#Cotton rugs#52.10.15.00.00
-unspsc7#52.10.15.05.00#Synthetic rugs#52.10.15.00.00
-unspsc7#52.10.15.06.00#Braided rugs#52.10.15.00.00
-unspsc7#52.10.15.07.00#Bath mats#52.10.15.00.00
-unspsc7#52.10.15.08.00#Door mats#52.10.15.00.00
-unspsc7#52.10.15.09.00#Decorative mats#52.10.15.00.00
-unspsc7#52.10.15.10.00#Anti fatigue mats#52.10.15.00.00
-unspsc7#52.10.15.11.00#Rubber or vinyl mats#52.10.15.00.00
-unspsc7#52.10.15.12.00#Chair mat#52.10.15.00.00
-unspsc7#52.10.15.13.00#Carpet protector#52.10.15.00.00
-unspsc7#52.11.00.00.00#Accommodation furniture#52.00.00.00.00
-unspsc7#52.11.15.00.00#Furniture#52.11.00.00.00
-unspsc7#52.11.15.01.00#Sofas#52.11.15.00.00
-unspsc7#52.11.15.02.00#Stands#52.11.15.00.00
-unspsc7#52.11.15.03.00#Bookcases#52.11.15.00.00
-unspsc7#52.11.15.04.00#Entertainment centers#52.11.15.00.00
-unspsc7#52.11.15.05.00#Futons#52.11.15.00.00
-unspsc7#52.11.15.06.00#Chairs#52.11.15.00.00
-unspsc7#52.11.15.07.00#Coat racks#52.11.15.00.00
-unspsc7#52.11.15.08.00#Wall racks#52.11.15.00.00
-unspsc7#52.11.15.09.00#Mattresses#52.11.15.00.00
-unspsc7#52.11.15.10.00#Cots#52.11.15.00.00
-unspsc7#52.11.15.11.00#Beds#52.11.15.00.00
-unspsc7#52.11.15.12.00#Foot stools#52.11.15.00.00
-unspsc7#52.11.15.13.00#Tables#52.11.15.00.00
-unspsc7#52.11.15.14.00#Chests#52.11.15.00.00
-unspsc7#52.11.15.15.00#Stools#52.11.15.00.00
-unspsc7#52.11.15.16.00#Dressers#52.11.15.00.00
-unspsc7#52.11.15.17.00#Partitions#52.11.15.00.00
-unspsc7#52.11.16.00.00#Outdoor furniture#52.11.00.00.00
-unspsc7#52.11.16.01.00#Outdoor chairs#52.11.16.00.00
-unspsc7#52.11.16.02.00#Outdoor tables or picnic tables#52.11.16.00.00
-unspsc7#52.11.16.03.00#Outdoor swings#52.11.16.00.00
-unspsc7#52.11.16.04.00#Outdoor benches#52.11.16.00.00
-unspsc7#52.11.16.05.00#Outdoor umbrellas#52.11.16.00.00
-unspsc7#52.11.17.00.00#Office furniture#52.11.00.00.00
-unspsc7#52.11.17.01.00#Credenzas#52.11.17.00.00
-unspsc7#52.11.17.03.00#Desks#52.11.17.00.00
-unspsc7#52.12.00.00.00#Bedclothes and table and kitchen linen and towels#52.00.00.00.00
-unspsc7#52.12.15.00.00#Bedclothes#52.12.00.00.00
-unspsc7#52.12.15.01.00#Quilts#52.12.15.00.00
-unspsc7#52.12.15.02.00#Comforters#52.12.15.00.00
-unspsc7#52.12.15.03.00#Comforter covers#52.12.15.00.00
-unspsc7#52.12.15.04.00#Mattress covers#52.12.15.00.00
-unspsc7#52.12.15.05.00#Pillows#52.12.15.00.00
-unspsc7#52.12.15.06.00#Mattress pads#52.12.15.00.00
-unspsc7#52.12.15.07.00#Featherbeds#52.12.15.00.00
-unspsc7#52.12.15.08.00#Blankets#52.12.15.00.00
-unspsc7#52.12.15.09.00#Sheets#52.12.15.00.00
-unspsc7#52.12.15.10.00#Dust ruffles#52.12.15.00.00
-unspsc7#52.12.15.11.00#Duvets#52.12.15.00.00
-unspsc7#52.12.15.12.00#Pillow cases#52.12.15.00.00
-unspsc7#52.12.15.13.00#Bed spreads#52.12.15.00.00
-unspsc7#52.12.16.00.00#Table and kitchen linen#52.12.00.00.00
-unspsc7#52.12.16.01.00#Dish towels#52.12.16.00.00
-unspsc7#52.12.16.02.00#Napkins#52.12.16.00.00
-unspsc7#52.12.16.03.00#Table runners#52.12.16.00.00
-unspsc7#52.12.16.04.00#Table cloths#52.12.16.00.00
-unspsc7#52.12.16.05.00#Domestic oven mits or pot holders#52.12.16.00.00
-unspsc7#52.12.16.06.00#Place mats#52.12.16.00.00
-unspsc7#52.12.16.07.00#Table skirts#52.12.16.00.00
-unspsc7#52.12.17.00.00#Towels#52.12.00.00.00
-unspsc7#52.12.17.01.00#Bath towels#52.12.17.00.00
-unspsc7#52.12.17.02.00#Beach towels#52.12.17.00.00
-unspsc7#52.12.17.03.00#Wash cloths#52.12.17.00.00
-unspsc7#52.12.17.04.00#Hand towels#52.12.17.00.00
-unspsc7#52.13.00.00.00#Window treatments#52.00.00.00.00
-unspsc7#52.13.15.00.00#Curtains and draperies#52.13.00.00.00
-unspsc7#52.13.15.01.00#Curtains#52.13.15.00.00
-unspsc7#52.13.15.03.00#Draperies#52.13.15.00.00
-unspsc7#52.13.16.00.00#Blinds and shades#52.13.00.00.00
-unspsc7#52.13.16.01.00#Venetian blinds#52.13.16.00.00
-unspsc7#52.13.16.02.00#Roll up shades#52.13.16.00.00
-unspsc7#52.13.16.03.00#Interior shutters#52.13.16.00.00
-unspsc7#52.13.16.04.00#Vertical blinds#52.13.16.00.00
-unspsc7#52.13.17.00.00#Window treatment accessories and hardware#52.13.00.00.00
-unspsc7#52.13.17.01.00#Valances#52.13.17.00.00
-unspsc7#52.13.17.02.00#Curtain rods#52.13.17.00.00
-unspsc7#52.13.17.03.00#Rod finials#52.13.17.00.00
-unspsc7#52.13.17.04.00#Curtain rings or clips#52.13.17.00.00
-unspsc7#52.14.00.00.00#Domestic appliances#52.00.00.00.00
-unspsc7#52.14.15.00.00#Domestic kitchen appliances#52.14.00.00.00
-unspsc7#52.14.15.01.00#Domestic refrigerators#52.14.15.00.00
-unspsc7#52.14.15.02.00#Domestic microwave ovens#52.14.15.00.00
-unspsc7#52.14.15.03.00#Domestic garbage disposals#52.14.15.00.00
-unspsc7#52.14.15.04.00#Domestic ranges#52.14.15.00.00
-unspsc7#52.14.15.05.00#Domestic dish washers#52.14.15.00.00
-unspsc7#52.14.15.06.00#Domestic freezers#52.14.15.00.00
-unspsc7#52.14.15.07.00#Domestic upright freezers#52.14.15.00.00
-unspsc7#52.14.15.08.00#Domestic chest freezers#52.14.15.00.00
-unspsc7#52.14.15.09.00#Domestic combination refrigerator freezers#52.14.15.00.00
-unspsc7#52.14.15.10.00#Domestic portable air conditioners#52.14.15.00.00
-unspsc7#52.14.15.11.00#Domestic juicers#52.14.15.00.00
-unspsc7#52.14.15.12.00#Domestic waffle irons#52.14.15.00.00
-unspsc7#52.14.15.13.00#Domestic electric can openers#52.14.15.00.00
-unspsc7#52.14.15.14.00#Domestic food processors#52.14.15.00.00
-unspsc7#52.14.15.15.00#Domestic trash compactors#52.14.15.00.00
-unspsc7#52.14.15.16.00#Domestic deep fryers#52.14.15.00.00
-unspsc7#52.14.15.17.00#Domestic popcorn poppers#52.14.15.00.00
-unspsc7#52.14.15.18.00#Domestic bread making machines#52.14.15.00.00
-unspsc7#52.14.15.19.00#Domestic convectional ovens#52.14.15.00.00
-unspsc7#52.14.15.20.00#Domestic mixers#52.14.15.00.00
-unspsc7#52.14.15.21.00#Domestic toaster ovens#52.14.15.00.00
-unspsc7#52.14.15.22.00#Domestic toasters#52.14.15.00.00
-unspsc7#52.14.15.23.00#Domestic electrical kettles#52.14.15.00.00
-unspsc7#52.14.15.24.00#Domestic blenders#52.14.15.00.00
-unspsc7#52.14.15.25.00#Domestic hot plates#52.14.15.00.00
-unspsc7#52.14.15.26.00#Domestic coffee makers#52.14.15.00.00
-unspsc7#52.14.15.27.00#Domestic electric knives#52.14.15.00.00
-unspsc7#52.14.15.28.00#Domestic electric woks#52.14.15.00.00
-unspsc7#52.14.15.29.00#Domestic coffee grinders#52.14.15.00.00
-unspsc7#52.14.15.30.00#Parts of dishwashing machines#52.14.15.00.00
-unspsc7#52.14.15.31.00#Domestic food choppers#52.14.15.00.00
-unspsc7#52.14.15.32.00#Domestic electric skillets#52.14.15.00.00
-unspsc7#52.14.15.33.00#Domestic electric griddles#52.14.15.00.00
-unspsc7#52.14.15.34.00#Domestic electric sandwich maker#52.14.15.00.00
-unspsc7#52.14.15.35.00#Domestic indoor electric grills#52.14.15.00.00
-unspsc7#52.14.15.36.00#Domestic pizelle or cookie maker#52.14.15.00.00
-unspsc7#52.14.15.37.00#Domestic crock pot#52.14.15.00.00
-unspsc7#52.14.16.00.00#Domestic laundry appliances and supplies#52.14.00.00.00
-unspsc7#52.14.16.01.00#Domestic clothes washers#52.14.16.00.00
-unspsc7#52.14.16.02.00#Domestic tumble dryers#52.14.16.00.00
-unspsc7#52.14.16.03.00#Domestic clothing irons#52.14.16.00.00
-unspsc7#52.14.16.04.00#Footwear dryers#52.14.16.00.00
-unspsc7#52.14.16.05.00#Laundry hampers#52.14.16.00.00
-unspsc7#52.14.16.06.00#Laundry baskets#52.14.16.00.00
-unspsc7#52.14.17.00.00#Domestic bath appliances#52.14.00.00.00
-unspsc7#52.14.17.01.00#Domestic electric toothbrushes#52.14.17.00.00
-unspsc7#52.14.17.03.00#Domestic hair dryers#52.14.17.00.00
-unspsc7#52.14.17.04.00#Domestic electric razors#52.14.17.00.00
-unspsc7#52.14.17.05.00#Parts of shavers or hair removers#52.14.17.00.00
-unspsc7#52.14.17.06.00#Nail dryers#52.14.17.00.00
-unspsc7#52.14.18.00.00#Other domestic household appliances#52.14.00.00.00
-unspsc7#52.14.18.01.00#Domestic sewing machines#52.14.18.00.00
-unspsc7#52.14.18.02.00#Domestic space heaters#52.14.18.00.00
-unspsc7#52.14.18.03.00#Domestic electric blankets#52.14.18.00.00
-unspsc7#52.15.00.00.00#Domestic kitchenware#52.00.00.00.00
-unspsc7#52.15.15.00.00#Domestic disposable kitchenware#52.15.00.00.00
-unspsc7#52.15.15.01.00#Domestic disposable cookware#52.15.15.00.00
-unspsc7#52.15.15.02.00#Domestic disposable dishes#52.15.15.00.00
-unspsc7#52.15.15.03.00#Domestic disposable flatware#52.15.15.00.00
-unspsc7#52.15.15.04.00#Domestic disposable cups or glasses or lids#52.15.15.00.00
-unspsc7#52.15.15.05.00#Domestic disposable stirrers#52.15.15.00.00
-unspsc7#52.15.15.06.00#Domestic disposable food containers#52.15.15.00.00
-unspsc7#52.15.15.07.00#Domestic disposable drinking straws#52.15.15.00.00
-unspsc7#52.15.16.00.00#Domestic kitchen tools and utensils#52.15.00.00.00
-unspsc7#52.15.16.01.00#Domestic rolling pins#52.15.16.00.00
-unspsc7#52.15.16.02.00#Domestic mixing bowls#52.15.16.00.00
-unspsc7#52.15.16.03.00#Domestic graters#52.15.16.00.00
-unspsc7#52.15.16.04.00#Domestic strainers or colanders#52.15.16.00.00
-unspsc7#52.15.16.05.00#Domestic can or bottle openers#52.15.16.00.00
-unspsc7#52.15.16.06.00#Domestic cutting boards#52.15.16.00.00
-unspsc7#52.15.16.07.00#Domestic measuring cups#52.15.16.00.00
-unspsc7#52.15.16.08.00#Basters or basting brushes#52.15.16.00.00
-unspsc7#52.15.16.09.00#Vegetable peeler#52.15.16.00.00
-unspsc7#52.15.16.10.00#Cookie cutters#52.15.16.00.00
-unspsc7#52.15.16.11.00#Domestic kitchen tongs#52.15.16.00.00
-unspsc7#52.15.16.12.00#Domestic kitchen wire whips#52.15.16.00.00
-unspsc7#52.15.16.13.00#Domestic food scrapers#52.15.16.00.00
-unspsc7#52.15.16.14.00#Domestic cooling racks#52.15.16.00.00
-unspsc7#52.15.16.15.00#Domestic pizza cutters#52.15.16.00.00
-unspsc7#52.15.16.16.00#Domestic kitchen spatulas#52.15.16.00.00
-unspsc7#52.15.16.17.00#Domestic wooden spoons#52.15.16.00.00
-unspsc7#52.15.16.18.00#Domestic wooden oven paddle#52.15.16.00.00
-unspsc7#52.15.16.19.00#Domestic pastry blender#52.15.16.00.00
-unspsc7#52.15.16.20.00#Domestic sifter#52.15.16.00.00
-unspsc7#52.15.16.21.00#Domestic cookie stampers#52.15.16.00.00
-unspsc7#52.15.16.22.00#Domestic pastry decorating gun#52.15.16.00.00
-unspsc7#52.15.16.23.00#Domestic cookie press#52.15.16.00.00
-unspsc7#52.15.16.24.00#Domestic knife sharpeners#52.15.16.00.00
-unspsc7#52.15.16.25.00#Domestic biscuit cutters#52.15.16.00.00
-unspsc7#52.15.16.26.00#Domestic mandolin#52.15.16.00.00
-unspsc7#52.15.16.27.00#Domestic garlic press#52.15.16.00.00
-unspsc7#52.15.16.28.00#Domestic egg slicer#52.15.16.00.00
-unspsc7#52.15.16.29.00#Domestic egg separator#52.15.16.00.00
-unspsc7#52.15.16.30.00#Domestic cheese slicer#52.15.16.00.00
-unspsc7#52.15.16.31.00#Domestic food mill#52.15.16.00.00
-unspsc7#52.15.16.32.00#Domestic kitchen funnels#52.15.16.00.00
-unspsc7#52.15.16.33.00#Domestic garnishing tools#52.15.16.00.00
-unspsc7#52.15.16.34.00#Domestic apple corer#52.15.16.00.00
-unspsc7#52.15.16.35.00#Domestic melon or butter baller#52.15.16.00.00
-unspsc7#52.15.16.36.00#Domestic food scoops#52.15.16.00.00
-unspsc7#52.15.16.37.00#Domestic pumpkin carver#52.15.16.00.00
-unspsc7#52.15.16.38.00#Domestic vegetable brush#52.15.16.00.00
-unspsc7#52.15.16.39.00#Domestic egg beater#52.15.16.00.00
-unspsc7#52.15.16.40.00#Domestic pasta drying rack#52.15.16.00.00
-unspsc7#52.15.16.41.00#Domestic whipped cream maker#52.15.16.00.00
-unspsc7#52.15.16.42.00#Domestic dough press#52.15.16.00.00
-unspsc7#52.15.16.43.00#Domestic ravioli maker#52.15.16.00.00
-unspsc7#52.15.16.44.00#Domestic mist sprayer#52.15.16.00.00
-unspsc7#52.15.16.45.00#Domestic pastry brush#52.15.16.00.00
-unspsc7#52.15.16.46.00#Domestic kitchen or diet scales#52.15.16.00.00
-unspsc7#52.15.16.47.00#Domestic kitchen timers#52.15.16.00.00
-unspsc7#52.15.16.48.00#Domestic kitchen or food thermometers#52.15.16.00.00
-unspsc7#52.15.16.49.00#Domestic bread slicing guide#52.15.16.00.00
-unspsc7#52.15.16.50.00#Domestic drain boards#52.15.16.00.00
-unspsc7#52.15.17.00.00#Domestic flatware and cutlery#52.15.00.00.00
-unspsc7#52.15.17.01.00#Domestic serving utensils#52.15.17.00.00
-unspsc7#52.15.17.02.00#Domestic knives#52.15.17.00.00
-unspsc7#52.15.17.03.00#Domestic forks#52.15.17.00.00
-unspsc7#52.15.17.04.00#Domestic spoons#52.15.17.00.00
-unspsc7#52.15.17.05.00#Spoon rests#52.15.17.00.00
-unspsc7#52.15.17.06.00#Chopsticks#52.15.17.00.00
-unspsc7#52.15.18.00.00#Domestic cookware#52.15.00.00.00
-unspsc7#52.15.18.01.00#Domestic dutch ovens#52.15.18.00.00
-unspsc7#52.15.18.02.00#Domestic frying pans#52.15.18.00.00
-unspsc7#52.15.18.03.00#Domestic saucepans#52.15.18.00.00
-unspsc7#52.15.18.04.00#Domestic kettles#52.15.18.00.00
-unspsc7#52.15.18.05.00#Domestic woks#52.15.18.00.00
-unspsc7#52.15.18.06.00#Domestic steamers#52.15.18.00.00
-unspsc7#52.15.18.07.00#Domestic stock pots#52.15.18.00.00
-unspsc7#52.15.18.08.00#Domestic pressure cookers#52.15.18.00.00
-unspsc7#52.15.18.09.00#Domestic saute pans#52.15.18.00.00
-unspsc7#52.15.18.10.00#Domestic chafing dishes#52.15.18.00.00
-unspsc7#52.15.18.11.00#Domestic griddles#52.15.18.00.00
-unspsc7#52.15.18.12.00#Domestic double boilers#52.15.18.00.00
-unspsc7#52.15.18.13.00#Domestic splatter shield#52.15.18.00.00
-unspsc7#52.15.19.00.00#Domestic bakeware#52.15.00.00.00
-unspsc7#52.15.19.01.00#Domestic muffin pans#52.15.19.00.00
-unspsc7#52.15.19.02.00#Domestic baking pans#52.15.19.00.00
-unspsc7#52.15.19.03.00#Domestic cake or pie pans#52.15.19.00.00
-unspsc7#52.15.19.04.00#Domestic roasting pans#52.15.19.00.00
-unspsc7#52.15.19.05.00#Domestic baking sheets#52.15.19.00.00
-unspsc7#52.15.19.06.00#Domestic broiling pans#52.15.19.00.00
-unspsc7#52.15.19.07.00#Domestic baking molds#52.15.19.00.00
-unspsc7#52.15.19.08.00#Domestic pizza pans#52.15.19.00.00
-unspsc7#52.15.19.09.00#Domestic tortilla bakers#52.15.19.00.00
-unspsc7#52.15.20.00.00#Domestic dishes and servingware and storage containers#52.15.00.00.00
-unspsc7#52.15.20.01.00#Domestic pitchers#52.15.20.00.00
-unspsc7#52.15.20.02.00#Domestic food storage containers#52.15.20.00.00
-unspsc7#52.15.20.03.00#Domestic punch bowls#52.15.20.00.00
-unspsc7#52.15.20.04.00#Domestic plates#52.15.20.00.00
-unspsc7#52.15.20.05.00#Domestic saucers#52.15.20.00.00
-unspsc7#52.15.20.06.00#Domestic trays or platters#52.15.20.00.00
-unspsc7#52.15.20.07.00#Domestic serving bowls#52.15.20.00.00
-unspsc7#52.15.20.08.00#Domestic tea or coffee pots#52.15.20.00.00
-unspsc7#52.15.20.09.00#Domestic soup or salad bowls#52.15.20.00.00
-unspsc7#52.15.20.10.00#Domestic vacuum flasks#52.15.20.00.00
-unspsc7#52.15.20.11.00#Inners for vaccum flasks#52.15.20.00.00
-unspsc7#52.15.20.12.00#Ice trays#52.15.20.00.00
-unspsc7#52.15.20.13.00#Spice or salt or pepper shakers#52.15.20.00.00
-unspsc7#52.15.20.14.00#Carafe sets#52.15.20.00.00
-unspsc7#52.15.20.15.00#Domestic cake plate with dome#52.15.20.00.00
-unspsc7#52.15.21.00.00#Domestic drinking utensils#52.15.00.00.00
-unspsc7#52.15.21.01.00#Domestic coffee or tea cups#52.15.21.00.00
-unspsc7#52.15.21.02.00#Domestic drinking glasses#52.15.21.00.00
-unspsc7#52.15.21.03.00#Domestic mugs#52.15.21.00.00
-unspsc7#52.15.21.04.00#Domestic stemware#52.15.21.00.00
-unspsc7#52.15.22.00.00#Dishwashing and dish storage accessories#52.15.00.00.00
-unspsc7#52.15.22.01.00#Shelf liner#52.15.22.00.00
-unspsc7#52.15.22.02.00#Dish drainer#52.15.22.00.00
-unspsc7#52.15.22.03.00#Soap dispensing brush#52.15.22.00.00
-unspsc7#52.16.00.00.00#Consumer electronics#52.00.00.00.00
-unspsc7#52.16.15.00.00#Audio and visual equipment#52.16.00.00.00
-unspsc7#52.16.15.01.00#Compact disc players#52.16.15.00.00
-unspsc7#52.16.15.02.00#Cassette players or recorders#52.16.15.00.00
-unspsc7#52.16.15.03.00#Digital video disc players#52.16.15.00.00
-unspsc7#52.16.15.04.00#Video cassette recorders#52.16.15.00.00
-unspsc7#52.16.15.05.00#Televisions#52.16.15.00.00
-unspsc7#52.16.15.06.00#Headphones#52.16.15.00.00
-unspsc7#52.16.15.07.00#Clock radios#52.16.15.00.00
-unspsc7#52.16.15.08.00#Laser disc players#52.16.15.00.00
-unspsc7#52.16.15.09.00#Portable stereo systems#52.16.15.00.00
-unspsc7#52.16.15.10.00#Home stereo systems#52.16.15.00.00
-unspsc7#52.16.15.11.00#Radios#52.16.15.00.00
-unspsc7#52.16.15.12.00#Speakers#52.16.15.00.00
-unspsc7#52.16.15.13.00#Combination television video cassette recorders#52.16.15.00.00
-unspsc7#52.16.15.14.00#Headphones#52.16.15.00.00
-unspsc7#52.16.15.15.00#Compact disk players or recorders#52.16.15.00.00
-unspsc7#52.16.15.16.00#Digital video disk players or recorders#52.16.15.00.00
-unspsc7#52.16.15.17.00#Equalizers#52.16.15.00.00
-unspsc7#52.16.15.18.00#Global positioning system receivers#52.16.15.00.00
-unspsc7#52.16.15.19.00#Headphones#52.16.15.00.00
-unspsc7#52.16.15.20.00#Microphones#52.16.15.00.00
-unspsc7#52.16.15.21.00#Multimedia receivers#52.16.15.00.00
-unspsc7#52.16.15.22.00#Radio frequency scanners#52.16.15.00.00
-unspsc7#52.16.15.23.00#Radio frequency transmittersreceivers#52.16.15.00.00
-unspsc7#52.16.15.24.00#Radio receivers#52.16.15.00.00
-unspsc7#52.16.15.25.00#Remote control#52.16.15.00.00
-unspsc7#52.16.15.26.00#Satellite receivers#52.16.15.00.00
-unspsc7#52.16.15.27.00#Subwoofers#52.16.15.00.00
-unspsc7#52.16.15.28.00#Televisions#52.16.15.00.00
-unspsc7#52.16.15.29.00#Video cassette players or recorders#52.16.15.00.00
-unspsc7#52.16.15.30.00#Video monitors#52.16.15.00.00
-unspsc7#52.16.15.31.00#Radio phonographs#52.16.15.00.00
-unspsc7#52.16.15.32.00#Karaoke systems#52.16.15.00.00
-unspsc7#52.16.15.33.00#Megaphones#52.16.15.00.00
-unspsc7#52.16.15.34.00#Integrated circut IC chip recorder#52.16.15.00.00
-unspsc7#52.16.15.35.00#Digital voice recorders#52.16.15.00.00
-unspsc7#52.16.15.36.00#Minidisc players or recorders#52.16.15.00.00
-unspsc7#52.16.16.00.00#Audio visual equipment accessories#52.16.00.00.00
-unspsc7#52.16.16.01.00#Cassette storage#52.16.16.00.00
-unspsc7#52.16.16.02.00#Audio or video head cleaners#52.16.16.00.00
-unspsc7#52.17.00.00.00#Domestic wall treatments#52.00.00.00.00
-unspsc7#52.17.10.00.00#Bathroom wall treatments#52.17.00.00.00
-unspsc7#52.17.10.01.00#Hanging toiletry organizer or shelf#52.17.10.00.00
-unspsc7#53.00.00.00.00#Apparel and Luggage and Personal Care Products#53.00.00.00.00
-unspsc7#53.10.00.00.00#Clothing#53.00.00.00.00
-unspsc7#53.10.15.00.00#Slacks and trousers and shorts#53.10.00.00.00
-unspsc7#53.10.15.01.00#Boys slacks or trousers or shorts#53.10.15.00.00
-unspsc7#53.10.15.02.00#Mens slacks or trousers or shorts#53.10.15.00.00
-unspsc7#53.10.15.03.00#Girls slacks or trousers or shorts#53.10.15.00.00
-unspsc7#53.10.15.04.00#Womens slacks or trousers or shorts#53.10.15.00.00
-unspsc7#53.10.15.05.00#Infants slacks or trousers or shorts#53.10.15.00.00
-unspsc7#53.10.16.00.00#Shirts and blouses#53.10.00.00.00
-unspsc7#53.10.16.01.00#Boys shirts#53.10.16.00.00
-unspsc7#53.10.16.02.00#Mens shirts#53.10.16.00.00
-unspsc7#53.10.16.03.00#Girls shirts or blouses#53.10.16.00.00
-unspsc7#53.10.16.04.00#Womens shirts or blouses#53.10.16.00.00
-unspsc7#53.10.16.05.00#Infants shirts or blouses#53.10.16.00.00
-unspsc7#53.10.17.00.00#Sweaters#53.10.00.00.00
-unspsc7#53.10.17.01.00#Boys sweaters#53.10.17.00.00
-unspsc7#53.10.17.02.00#Mens sweaters#53.10.17.00.00
-unspsc7#53.10.17.03.00#Girls sweaters#53.10.17.00.00
-unspsc7#53.10.17.04.00#Womens sweaters#53.10.17.00.00
-unspsc7#53.10.17.05.00#Infants sweaters#53.10.17.00.00
-unspsc7#53.10.18.00.00#Coats and jackets#53.10.00.00.00
-unspsc7#53.10.18.01.00#Boys coats or jackets#53.10.18.00.00
-unspsc7#53.10.18.02.00#Mens coats or jackets#53.10.18.00.00
-unspsc7#53.10.18.03.00#Girls coats or jackets#53.10.18.00.00
-unspsc7#53.10.18.04.00#Womens coats or jackets#53.10.18.00.00
-unspsc7#53.10.18.05.00#Infants coats or jackets#53.10.18.00.00
-unspsc7#53.10.19.00.00#Suits#53.10.00.00.00
-unspsc7#53.10.19.01.00#Boys suits#53.10.19.00.00
-unspsc7#53.10.19.02.00#Mens suits#53.10.19.00.00
-unspsc7#53.10.19.03.00#Girls suits#53.10.19.00.00
-unspsc7#53.10.19.04.00#Womens suits#53.10.19.00.00
-unspsc7#53.10.19.05.00#Infants suits#53.10.19.00.00
-unspsc7#53.10.20.00.00#Dresses and skirts and saris and kimonos#53.10.00.00.00
-unspsc7#53.10.20.01.00#Girls dresses or skirts or saris or kimonos#53.10.20.00.00
-unspsc7#53.10.20.02.00#Womens dresses or skirts or saris or kimonos#53.10.20.00.00
-unspsc7#53.10.20.03.00#Infants dresses or skirts or saris or kimonos#53.10.20.00.00
-unspsc7#53.10.21.00.00#Overalls and coveralls#53.10.00.00.00
-unspsc7#53.10.21.01.00#Boys overalls or coveralls#53.10.21.00.00
-unspsc7#53.10.21.02.00#Mens overalls or coveralls#53.10.21.00.00
-unspsc7#53.10.21.03.00#Girls overalls or coveralls#53.10.21.00.00
-unspsc7#53.10.21.04.00#Womens overalls or coveralls#53.10.21.00.00
-unspsc7#53.10.21.05.00#Infants overalls or coveralls#53.10.21.00.00
-unspsc7#53.10.22.00.00#Folkloric clothing#53.10.00.00.00
-unspsc7#53.10.22.01.00#Boys folkloric clothing#53.10.22.00.00
-unspsc7#53.10.22.02.00#Mens folkloric clothing#53.10.22.00.00
-unspsc7#53.10.22.03.00#Girls folkloric clothing#53.10.22.00.00
-unspsc7#53.10.22.04.00#Womens folkloric clothing#53.10.22.00.00
-unspsc7#53.10.22.05.00#Infants folkloric clothing#53.10.22.00.00
-unspsc7#53.10.23.00.00#Undergarments#53.10.00.00.00
-unspsc7#53.10.23.01.00#Undershirts#53.10.23.00.00
-unspsc7#53.10.23.02.00#Slips#53.10.23.00.00
-unspsc7#53.10.23.03.00#Underpants#53.10.23.00.00
-unspsc7#53.10.23.04.00#Brassieres#53.10.23.00.00
-unspsc7#53.10.23.05.00#Infant diapers#53.10.23.00.00
-unspsc7#53.10.23.06.00#Adult diapers#53.10.23.00.00
-unspsc7#53.10.23.07.00#Body shaping garments#53.10.23.00.00
-unspsc7#53.10.24.00.00#Hosiery#53.10.00.00.00
-unspsc7#53.10.24.01.00#Stockings#53.10.24.00.00
-unspsc7#53.10.24.02.00#Socks#53.10.24.00.00
-unspsc7#53.10.24.03.00#Panty hose#53.10.24.00.00
-unspsc7#53.10.24.04.00#Tights#53.10.24.00.00
-unspsc7#53.10.25.00.00#Clothing accessories#53.10.00.00.00
-unspsc7#53.10.25.01.00#Belts or suspenders#53.10.25.00.00
-unspsc7#53.10.25.02.00#Ties or scarves or mufflers#53.10.25.00.00
-unspsc7#53.10.25.03.00#Hats#53.10.25.00.00
-unspsc7#53.10.25.04.00#Gloves or mittens#53.10.25.00.00
-unspsc7#53.10.25.05.00#Umbrellas#53.10.25.00.00
-unspsc7#53.10.25.06.00#Sweat bands#53.10.25.00.00
-unspsc7#53.10.25.07.00#Clothing hangers#53.10.25.00.00
-unspsc7#53.10.25.08.00#Armbands#53.10.25.00.00
-unspsc7#53.10.25.09.00#Garters#53.10.25.00.00
-unspsc7#53.10.25.10.00#Tassles#53.10.25.00.00
-unspsc7#53.10.25.11.00#Bandannas#53.10.25.00.00
-unspsc7#53.10.25.12.00#Handkerchiefs#53.10.25.00.00
-unspsc7#53.10.25.13.00#Headbands#53.10.25.00.00
-unspsc7#53.10.25.14.00#Pocket protectors#53.10.25.00.00
-unspsc7#53.10.25.15.00#Button covers#53.10.25.00.00
-unspsc7#53.10.26.00.00#Nightwear#53.10.00.00.00
-unspsc7#53.10.26.01.00#Boys pajamas or nightshirts#53.10.26.00.00
-unspsc7#53.10.26.02.00#Mens pajamas or nightshirts#53.10.26.00.00
-unspsc7#53.10.26.03.00#Girls pajamas or nightshirts#53.10.26.00.00
-unspsc7#53.10.26.04.00#Womens pajamas or nightshirts#53.10.26.00.00
-unspsc7#53.10.26.05.00#Infants pajamas or nightshirts#53.10.26.00.00
-unspsc7#53.10.26.06.00#Bath robes#53.10.26.00.00
-unspsc7#53.10.27.00.00#Uniforms#53.10.00.00.00
-unspsc7#53.10.27.01.00#Military uniforms#53.10.27.00.00
-unspsc7#53.10.27.02.00#Customs uniforms#53.10.27.00.00
-unspsc7#53.10.27.03.00#Police uniforms#53.10.27.00.00
-unspsc7#53.10.28.00.00#Swimwear#53.10.00.00.00
-unspsc7#53.10.28.01.00#Mens swimwear#53.10.28.00.00
-unspsc7#53.10.28.02.00#Womens swimwear#53.10.28.00.00
-unspsc7#53.10.28.03.00#Boys swimwear#53.10.28.00.00
-unspsc7#53.10.28.04.00#Girls swimwear#53.10.28.00.00
-unspsc7#53.10.28.05.00#Infants swimwear#53.10.28.00.00
-unspsc7#53.10.29.00.00#Athletic wear#53.10.00.00.00
-unspsc7#53.10.29.01.00#Womens athletic wear#53.10.29.00.00
-unspsc7#53.10.29.02.00#Mens athletic wear#53.10.29.00.00
-unspsc7#53.10.29.03.00#Boys athletic wear#53.10.29.00.00
-unspsc7#53.10.29.04.00#Girls athletic wear#53.10.29.00.00
-unspsc7#53.11.00.00.00#Footwear#53.00.00.00.00
-unspsc7#53.11.15.00.00#Boots#53.11.00.00.00
-unspsc7#53.11.15.01.00#Mens boots#53.11.15.00.00
-unspsc7#53.11.15.02.00#Womens boots#53.11.15.00.00
-unspsc7#53.11.15.03.00#Boys boots#53.11.15.00.00
-unspsc7#53.11.15.04.00#Girls boots#53.11.15.00.00
-unspsc7#53.11.15.05.00#Infants boots#53.11.15.00.00
-unspsc7#53.11.16.00.00#Shoes#53.11.00.00.00
-unspsc7#53.11.16.01.00#Mens shoes#53.11.16.00.00
-unspsc7#53.11.16.02.00#Womens shoes#53.11.16.00.00
-unspsc7#53.11.16.03.00#Boys shoes#53.11.16.00.00
-unspsc7#53.11.16.04.00#Girls shoes#53.11.16.00.00
-unspsc7#53.11.16.05.00#Infants shoes#53.11.16.00.00
-unspsc7#53.11.17.00.00#Slippers#53.11.00.00.00
-unspsc7#53.11.17.01.00#Mens slippers#53.11.17.00.00
-unspsc7#53.11.17.02.00#Womens slippers#53.11.17.00.00
-unspsc7#53.11.17.03.00#Boys slippers#53.11.17.00.00
-unspsc7#53.11.17.04.00#Girls slippers#53.11.17.00.00
-unspsc7#53.11.17.05.00#Infants slippers#53.11.17.00.00
-unspsc7#53.11.18.00.00#Sandals#53.11.00.00.00
-unspsc7#53.11.18.01.00#Mens sandals#53.11.18.00.00
-unspsc7#53.11.18.02.00#Womens sandals#53.11.18.00.00
-unspsc7#53.11.18.03.00#Boys sandals#53.11.18.00.00
-unspsc7#53.11.18.04.00#Girls sandals#53.11.18.00.00
-unspsc7#53.11.18.05.00#Infants sandals#53.11.18.00.00
-unspsc7#53.11.19.00.00#Athletic footwear#53.11.00.00.00
-unspsc7#53.11.19.01.00#Mens athletic footwear#53.11.19.00.00
-unspsc7#53.11.19.02.00#Womens athletic footwear#53.11.19.00.00
-unspsc7#53.11.19.03.00#Boys athletic footwear#53.11.19.00.00
-unspsc7#53.11.19.04.00#Girls athletic footwear#53.11.19.00.00
-unspsc7#53.11.19.05.00#Infants athletic footwear#53.11.19.00.00
-unspsc7#53.11.20.00.00#Shoe accessories#53.11.00.00.00
-unspsc7#53.11.20.01.00#Shoehorns#53.11.20.00.00
-unspsc7#53.11.20.02.00#Shoelaces#53.11.20.00.00
-unspsc7#53.12.00.00.00#Luggage and handbags and packs and cases#53.00.00.00.00
-unspsc7#53.12.15.00.00#Luggage#53.12.00.00.00
-unspsc7#53.12.15.01.00#Garment bags#53.12.15.00.00
-unspsc7#53.12.15.02.00#Luggage sets#53.12.15.00.00
-unspsc7#53.12.15.03.00#Individual luggage pieces#53.12.15.00.00
-unspsc7#53.12.16.00.00#Purses and handbags and bags#53.12.00.00.00
-unspsc7#53.12.16.01.00#Handbags or purses#53.12.16.00.00
-unspsc7#53.12.16.02.00#Duffle bags#53.12.16.00.00
-unspsc7#53.12.16.03.00#Backpacks#53.12.16.00.00
-unspsc7#53.12.16.04.00#Eyeglass cases#53.12.16.00.00
-unspsc7#53.12.16.05.00#Coin purses#53.12.16.00.00
-unspsc7#53.12.16.06.00#Lipstick cases#53.12.16.00.00
-unspsc7#53.12.16.07.00#Cigar case#53.12.16.00.00
-unspsc7#53.12.17.00.00#Business cases#53.12.00.00.00
-unspsc7#53.12.17.01.00#Briefcases#53.12.17.00.00
-unspsc7#53.12.17.02.00#Attaches#53.12.17.00.00
-unspsc7#53.12.17.04.00#Portfolios#53.12.17.00.00
-unspsc7#53.12.17.05.00#Equipment cases#53.12.17.00.00
-unspsc7#53.12.17.06.00#Computer bags#53.12.17.00.00
-unspsc7#53.12.18.00.00#Travel kits and accessories#53.12.00.00.00
-unspsc7#53.12.18.01.00#Travel kits#53.12.18.00.00
-unspsc7#53.12.18.02.00#Travel carts#53.12.18.00.00
-unspsc7#53.12.18.03.00#Garment brushes#53.12.18.00.00
-unspsc7#53.12.18.04.00#Makeup or manicure cases#53.12.18.00.00
-unspsc7#53.13.00.00.00#Personal care products#53.00.00.00.00
-unspsc7#53.13.15.00.00#Dental#53.13.00.00.00
-unspsc7#53.13.15.01.00#Mouthwash#53.13.15.00.00
-unspsc7#53.13.15.02.00#Toothpaste#53.13.15.00.00
-unspsc7#53.13.15.03.00#Toothbrushes#53.13.15.00.00
-unspsc7#53.13.15.04.00#Dental floss#53.13.15.00.00
-unspsc7#53.13.15.05.00#Infant soother or pacifier or dummy#53.13.15.00.00
-unspsc7#53.13.15.06.00#Dental kits#53.13.15.00.00
-unspsc7#53.13.15.07.00#Toothpicks#53.13.15.00.00
-unspsc7#53.13.15.08.00#Denture cleaning tablets#53.13.15.00.00
-unspsc7#53.13.16.00.00#Bath and body#53.13.00.00.00
-unspsc7#53.13.16.01.00#Shower caps#53.13.16.00.00
-unspsc7#53.13.16.02.00#Hair care supplies#53.13.16.00.00
-unspsc7#53.13.16.03.00#Razors#53.13.16.00.00
-unspsc7#53.13.16.04.00#Hair combs or brushes#53.13.16.00.00
-unspsc7#53.13.16.05.00#Vanity kits#53.13.16.00.00
-unspsc7#53.13.16.06.00#Deodorants#53.13.16.00.00
-unspsc7#53.13.16.07.00#Hand or body lotions#53.13.16.00.00
-unspsc7#53.13.16.08.00#Soaps#53.13.16.00.00
-unspsc7#53.13.16.09.00#Sun protection products#53.13.16.00.00
-unspsc7#53.13.16.10.00#Eye care supplies#53.13.16.00.00
-unspsc7#53.13.16.11.00#Shaving creams#53.13.16.00.00
-unspsc7#53.13.16.12.00#Bath gels#53.13.16.00.00
-unspsc7#53.13.16.13.00#Skin care products#53.13.16.00.00
-unspsc7#53.13.16.14.00#Foot care products#53.13.16.00.00
-unspsc7#53.13.16.15.00#Feminine hygiene products#53.13.16.00.00
-unspsc7#53.13.16.16.00#Para pharmaceutical creams or lotions#53.13.16.00.00
-unspsc7#53.13.16.17.00#Manicure implements#53.13.16.00.00
-unspsc7#53.13.16.18.00#Pedicure implements#53.13.16.00.00
-unspsc7#53.13.16.19.00#Cosmetics#53.13.16.00.00
-unspsc7#53.13.16.20.00#Perfumes or colognes or fragrances#53.13.16.00.00
-unspsc7#53.13.16.21.00#Nail clippers#53.13.16.00.00
-unspsc7#53.13.16.22.00#Condoms#53.13.16.00.00
-unspsc7#53.13.16.23.00#Hair removal or depilatory products#53.13.16.00.00
-unspsc7#53.13.16.24.00#Disposable personal wipes#53.13.16.00.00
-unspsc7#53.13.16.25.00#Hair or beard nets#53.13.16.00.00
-unspsc7#53.13.16.26.00#Hand sanitizer#53.13.16.00.00
-unspsc7#53.13.16.27.00#Hand cleaner#53.13.16.00.00
-unspsc7#53.13.16.28.00#Shampoos#53.13.16.00.00
-unspsc7#53.13.16.29.00#Makeup kits#53.13.16.00.00
-unspsc7#53.13.16.30.00#Lip balm#53.13.16.00.00
-unspsc7#53.13.16.31.00#Tattoos#53.13.16.00.00
-unspsc7#53.13.16.32.00#Hot rollers#53.13.16.00.00
-unspsc7#53.13.16.33.00#Barrettes#53.13.16.00.00
-unspsc7#53.13.16.34.00#Chemical protection products#53.13.16.00.00
-unspsc7#53.13.16.35.00#Shaving brushes#53.13.16.00.00
-unspsc7#53.13.17.00.00#Eyewear#53.13.00.00.00
-unspsc7#53.13.17.01.00#Optical glasses or spectacles#53.13.17.00.00
-unspsc7#53.13.17.02.00#Contact lenses#53.13.17.00.00
-unspsc7#53.13.17.03.00#Sunglasses#53.13.17.00.00
-unspsc7#53.14.00.00.00#Sewing supplies and accessories#53.00.00.00.00
-unspsc7#53.14.15.00.00#Sewing fasteners#53.14.00.00.00
-unspsc7#53.14.15.01.00#Straight pins#53.14.15.00.00
-unspsc7#53.14.15.02.00#Safety pins#53.14.15.00.00
-unspsc7#53.14.15.03.00#Zippers#53.14.15.00.00
-unspsc7#53.14.15.04.00#Buckles#53.14.15.00.00
-unspsc7#53.14.15.05.00#Buttons#53.14.15.00.00
-unspsc7#53.14.15.06.00#Snaps#53.14.15.00.00
-unspsc7#53.14.15.07.00#Clasps#53.14.15.00.00
-unspsc7#53.14.15.08.00#Garment rivet#53.14.15.00.00
-unspsc7#53.14.16.00.00#Miscellaneous sewing supplies#53.14.00.00.00
-unspsc7#53.14.16.01.00#Pin cushions#53.14.16.00.00
-unspsc7#53.14.16.02.00#Sewing kits#53.14.16.00.00
-unspsc7#53.14.16.03.00#Thimbles#53.14.16.00.00
-unspsc7#53.14.16.04.00#Sewing patterns#53.14.16.00.00
-unspsc7#53.14.16.05.00#Sewing needles#53.14.16.00.00
-unspsc7#53.14.16.06.00#Bobbins or bobbin holders#53.14.16.00.00
-unspsc7#53.14.16.07.00#Seam gauge#53.14.16.00.00
-unspsc7#53.14.16.08.00#Bodkin#53.14.16.00.00
-unspsc7#53.14.16.09.00#Loop turner#53.14.16.00.00
-unspsc7#53.14.16.10.00#Fabric or tailors chalk holders#53.14.16.00.00
-unspsc7#53.14.16.11.00#Fabric markers or fabric pencils or fabric chalk#53.14.16.00.00
-unspsc7#53.14.16.12.00#Serrated pattern tracing wheel#53.14.16.00.00
-unspsc7#53.14.16.13.00#Transfer paper#53.14.16.00.00
-unspsc7#53.14.16.14.00#Tapestry needles#53.14.16.00.00
-unspsc7#53.14.16.15.00#Weaving needles#53.14.16.00.00
-unspsc7#53.14.16.16.00#Looper looms#53.14.16.00.00
-unspsc7#53.14.16.17.00#Cotton jersey loops#53.14.16.00.00
-unspsc7#53.14.16.18.00#Needlepoint canvas#53.14.16.00.00
-unspsc7#53.14.16.19.00#Magnet wands#53.14.16.00.00
-unspsc7#53.14.16.20.00#Seam ripper#53.14.16.00.00
-unspsc7#53.14.16.21.00#Needle threader#53.14.16.00.00
-unspsc7#53.14.16.22.00#Dressmakers ruler#53.14.16.00.00
-unspsc7#53.14.16.23.00#Liquid thread lock or reinforcer#53.14.16.00.00
-unspsc7#53.14.16.24.00#Cross stitch fabric or needles#53.14.16.00.00
-unspsc7#53.14.16.25.00#Cross stitch designs#53.14.16.00.00
-unspsc7#53.14.16.26.00#Embroidery hoops#53.14.16.00.00
-unspsc7#53.14.16.27.00#Crochet hooks#53.14.16.00.00
-unspsc7#53.14.16.28.00#Quilters basting tools#53.14.16.00.00
-unspsc7#53.14.16.29.00#Quilters pins#53.14.16.00.00
-unspsc7#53.14.16.30.00#Pattern cutting mats or boards#53.14.16.00.00
-unspsc7#54.00.00.00.00#Timepieces and Jewelry and Gemstone Products#54.00.00.00.00
-unspsc7#54.10.00.00.00#Jewelry#54.00.00.00.00
-unspsc7#54.10.15.00.00#Fine jewelry#54.10.00.00.00
-unspsc7#54.10.15.01.00#Gold or silver or platinum chains#54.10.15.00.00
-unspsc7#54.10.15.02.00#Fine jewelry necklaces#54.10.15.00.00
-unspsc7#54.10.15.03.00#Fine jewelry rings#54.10.15.00.00
-unspsc7#54.10.15.04.00#Fine jewelry earrings#54.10.15.00.00
-unspsc7#54.10.15.05.00#Fine body jewelry#54.10.15.00.00
-unspsc7#54.10.15.06.00#Fine jewelry bracelets#54.10.15.00.00
-unspsc7#54.10.15.07.00#Tiaras#54.10.15.00.00
-unspsc7#54.10.16.00.00#Imitation jewelry#54.10.00.00.00
-unspsc7#54.10.16.01.00#Bracelets#54.10.16.00.00
-unspsc7#54.10.16.02.00#Necklaces#54.10.16.00.00
-unspsc7#54.10.16.03.00#Rings#54.10.16.00.00
-unspsc7#54.10.16.04.00#Earrings#54.10.16.00.00
-unspsc7#54.10.16.05.00#Body jewelry#54.10.16.00.00
-unspsc7#54.11.00.00.00#Timepieces#54.00.00.00.00
-unspsc7#54.11.15.00.00#Watches#54.11.00.00.00
-unspsc7#54.11.15.01.00#Wrist watches#54.11.15.00.00
-unspsc7#54.11.15.02.00#Pocket watches#54.11.15.00.00
-unspsc7#54.11.16.00.00#Clocks#54.11.00.00.00
-unspsc7#54.11.16.01.00#Wall clocks#54.11.16.00.00
-unspsc7#54.11.16.02.00#Mantel or table clocks#54.11.16.00.00
-unspsc7#54.11.16.03.00#Free standing clocks#54.11.16.00.00
-unspsc7#54.11.16.04.00#Hourglasses#54.11.16.00.00
-unspsc7#54.11.17.00.00#Watch or clock parts#54.11.00.00.00
-unspsc7#54.11.17.01.00#Watch or clock dials#54.11.17.00.00
-unspsc7#54.11.17.02.00#Watch or clock crystals#54.11.17.00.00
-unspsc7#54.11.17.03.00#Watch or clock plates or bridges#54.11.17.00.00
-unspsc7#54.11.17.04.00#Watch straps or bands or bracelets or fobs#54.11.17.00.00
-unspsc7#54.12.00.00.00#Gemstones#54.00.00.00.00
-unspsc7#54.12.15.00.00#Precious stones#54.12.00.00.00
-unspsc7#54.12.15.01.00#Diamond gemstones#54.12.15.00.00
-unspsc7#54.12.15.02.00#Emerald gemstones#54.12.15.00.00
-unspsc7#54.12.15.03.00#Ruby gemstones#54.12.15.00.00
-unspsc7#54.12.15.04.00#Sapphire gemstones#54.12.15.00.00
-unspsc7#54.12.16.00.00#Semi precious stones#54.12.00.00.00
-unspsc7#54.12.16.01.00#Garnet gemstones#54.12.16.00.00
-unspsc7#54.12.16.02.00#Jade gemstones#54.12.16.00.00
-unspsc7#54.12.16.03.00#Opal gemstones#54.12.16.00.00
-unspsc7#54.12.17.00.00#Pearls#54.12.00.00.00
-unspsc7#54.12.17.01.00#Cultured pearls#54.12.17.00.00
-unspsc7#54.12.17.02.00#Natural pearls#54.12.17.00.00
-unspsc7#54.12.18.00.00#Industrial precious and semi precious stones#54.12.00.00.00
-unspsc7#54.12.18.01.00#Industrial diamonds#54.12.18.00.00
-unspsc7#54.12.18.02.00#Industrial garnets#54.12.18.00.00
-unspsc7#55.00.00.00.00#Published Products#55.00.00.00.00
-unspsc7#55.10.00.00.00#Printed media#55.00.00.00.00
-unspsc7#55.10.15.00.00#Printed publications#55.10.00.00.00
-unspsc7#55.10.15.01.00#Charts or maps or atlases#55.10.15.00.00
-unspsc7#55.10.15.02.00#Directories#55.10.15.00.00
-unspsc7#55.10.15.03.00#Catalogs#55.10.15.00.00
-unspsc7#55.10.15.04.00#Newspapers#55.10.15.00.00
-unspsc7#55.10.15.05.00#Comic books#55.10.15.00.00
-unspsc7#55.10.15.06.00#Magazines#55.10.15.00.00
-unspsc7#55.10.15.07.00#Picture or drawing or coloring books for children#55.10.15.00.00
-unspsc7#55.10.15.08.00#Encyclopedias#55.10.15.00.00
-unspsc7#55.10.15.09.00#Educational or vocational textbooks#55.10.15.00.00
-unspsc7#55.10.15.10.00#Leisure reading books#55.10.15.00.00
-unspsc7#55.10.15.11.00#Reference books#55.10.15.00.00
-unspsc7#55.10.15.12.00#Dictionaries#55.10.15.00.00
-unspsc7#55.10.15.13.00#Trading cards#55.10.15.00.00
-unspsc7#55.10.15.14.00#Sheet music#55.10.15.00.00
-unspsc7#55.10.15.15.00#Promotional material or annual reports#55.10.15.00.00
-unspsc7#55.10.15.16.00#Operation and instruction manuals#55.10.15.00.00
-unspsc7#55.10.15.17.00#Clearance and dimensional drawings#55.10.15.00.00
-unspsc7#55.10.15.18.00#Technical diagrams or drawings#55.10.15.00.00
-unspsc7#55.10.15.19.00#Periodicals#55.10.15.00.00
-unspsc7#55.10.15.20.00#Instruction sheets or booklets#55.10.15.00.00
-unspsc7#55.10.15.21.00#Owner or user manuals#55.10.15.00.00
-unspsc7#55.10.15.22.00#Terrestrial or celestial globes#55.10.15.00.00
-unspsc7#55.10.15.23.00#Exercise books#55.10.15.00.00
-unspsc7#55.10.15.24.00#Reference books#55.10.15.00.00
-unspsc7#55.10.15.25.00#Encyclopedias#55.10.15.00.00
-unspsc7#55.10.15.26.00#Dictionaries#55.10.15.00.00
-unspsc7#55.11.00.00.00#Electronic reference material#55.00.00.00.00
-unspsc7#55.11.15.00.00#Electronic publications and music#55.11.00.00.00
-unspsc7#55.11.15.01.00#Electronic directories#55.11.15.00.00
-unspsc7#55.11.15.02.00#Electronic dictionaries#55.11.15.00.00
-unspsc7#55.11.15.03.00#Electronic encyclopedias#55.11.15.00.00
-unspsc7#55.11.15.04.00#Electronic catalogs#55.11.15.00.00
-unspsc7#55.11.15.05.00#Books on tape or compact disc#55.11.15.00.00
-unspsc7#55.11.15.06.00#Electronic magazines#55.11.15.00.00
-unspsc7#55.11.15.07.00#Electronic newspapers#55.11.15.00.00
-unspsc7#55.11.15.08.00#Electronic charts or maps or atlases#55.11.15.00.00
-unspsc7#55.11.15.09.00#Background music#55.11.15.00.00
-unspsc7#55.11.15.10.00#Motion pictures on celluloid#55.11.15.00.00
-unspsc7#55.11.15.11.00#Motion pictures on video tape#55.11.15.00.00
-unspsc7#55.11.15.12.00#Music on tape or compact disc#55.11.15.00.00
-unspsc7#55.11.16.00.00#Electronic Software reference material#55.11.00.00.00
-unspsc7#55.11.16.01.00#Electronic Software Documentation and User Manuals#55.11.16.00.00
-unspsc7#55.12.00.00.00#Signage and accessories#55.00.00.00.00
-unspsc7#55.12.15.00.00#Tags#55.12.00.00.00
-unspsc7#55.12.15.01.00#Luggage tags#55.12.15.00.00
-unspsc7#55.12.15.02.00#Security tags#55.12.15.00.00
-unspsc7#55.12.15.03.00#Identification tags#55.12.15.00.00
-unspsc7#55.12.16.00.00#Labels#55.12.00.00.00
-unspsc7#55.12.16.01.00#Label removing kits#55.12.16.00.00
-unspsc7#55.12.16.02.00#Clothing labels#55.12.16.00.00
-unspsc7#55.12.16.03.00#Pressure sensitive labels#55.12.16.00.00
-unspsc7#55.12.16.04.00#Canning or bottling labels#55.12.16.00.00
-unspsc7#55.12.16.05.00#Addressing or mailing labels#55.12.16.00.00
-unspsc7#55.12.16.06.00#Self adhesive labels#55.12.16.00.00
-unspsc7#55.12.16.07.00#Decals#55.12.16.00.00
-unspsc7#55.12.16.08.00#Bar code labels#55.12.16.00.00
-unspsc7#55.12.16.09.00#Packaging labels#55.12.16.00.00
-unspsc7#55.12.16.10.00#Consecutively numbered labels#55.12.16.00.00
-unspsc7#55.12.16.11.00#Label making tapes#55.12.16.00.00
-unspsc7#55.12.16.12.00#Printer labels#55.12.16.00.00
-unspsc7#55.12.16.13.00#Color coding labels#55.12.16.00.00
-unspsc7#55.12.16.14.00#Removable labels#55.12.16.00.00
-unspsc7#55.12.16.15.00#Adhesive dots or arrows#55.12.16.00.00
-unspsc7#55.12.16.16.00#Self adhesive flags#55.12.16.00.00
-unspsc7#55.12.17.00.00#Signage#55.12.00.00.00
-unspsc7#55.12.17.01.00#Metallic nameplates#55.12.17.00.00
-unspsc7#55.12.17.02.00#Non metallic nameplates#55.12.17.00.00
-unspsc7#55.12.17.03.00#Illuminated signs#55.12.17.00.00
-unspsc7#55.12.17.04.00#Safety signs#55.12.17.00.00
-unspsc7#55.12.17.05.00#Self adhesive signs#55.12.17.00.00
-unspsc7#55.12.17.06.00#Banners#55.12.17.00.00
-unspsc7#55.12.17.07.00#Magnetic signs#55.12.17.00.00
-unspsc7#55.12.17.08.00#Neon signs#55.12.17.00.00
-unspsc7#55.12.17.09.00#Moving message signs#55.12.17.00.00
-unspsc7#55.12.17.10.00#Traffic signs#55.12.17.00.00
-unspsc7#55.12.17.11.00#Billboards#55.12.17.00.00
-unspsc7#55.12.17.12.00#Directional signs#55.12.17.00.00
-unspsc7#55.12.17.13.00#Point of purchase signs#55.12.17.00.00
-unspsc7#55.12.17.14.00#Pennants#55.12.17.00.00
-unspsc7#55.12.17.15.00#Flags#55.12.17.00.00
-unspsc7#55.12.17.16.00#Wooden signs#55.12.17.00.00
-unspsc7#55.12.17.17.00#Marker plates#55.12.17.00.00
-unspsc7#55.12.17.18.00#Informational signs#55.12.17.00.00
-unspsc7#55.12.17.19.00#Signalling components#55.12.17.00.00
-unspsc7#55.12.17.20.00#Emblems#55.12.17.00.00
-unspsc7#55.12.17.21.00#Vinyl letters or numbers#55.12.17.00.00
-unspsc7#55.12.17.22.00#Flagpoles#55.12.17.00.00
-unspsc7#55.12.17.23.00#Sign holders#55.12.17.00.00
-unspsc7#55.12.18.00.00#Identification documents#55.12.00.00.00
-unspsc7#55.12.18.01.00#Car tax discs#55.12.18.00.00
-unspsc7#55.12.18.02.00#Identification cards#55.12.18.00.00
-unspsc7#55.12.18.03.00#Passports#55.12.18.00.00
-unspsc7#55.12.18.04.00#Badges or badge holders#55.12.18.00.00
-unspsc7#56.00.00.00.00#Furniture and Furnishings#56.00.00.00.00
-unspsc7#56.10.00.00.00#Accommodation furniture#56.00.00.00.00
-unspsc7#56.10.15.00.00#Furniture#56.10.00.00.00
-unspsc7#56.10.15.01.00#Stands#56.10.15.00.00
-unspsc7#56.10.15.02.00#Sofas#56.10.15.00.00
-unspsc7#56.10.15.03.00#Coat racks#56.10.15.00.00
-unspsc7#56.10.15.04.00#Chairs#56.10.15.00.00
-unspsc7#56.10.15.05.00#Entertainment centers#56.10.15.00.00
-unspsc7#56.10.15.06.00#Futons#56.10.15.00.00
-unspsc7#56.10.15.07.00#Bookcases#56.10.15.00.00
-unspsc7#56.10.15.08.00#Mattresses#56.10.15.00.00
-unspsc7#56.10.15.09.00#Dressers or armoires#56.10.15.00.00
-unspsc7#56.10.15.10.00#Partitions#56.10.15.00.00
-unspsc7#56.10.15.12.00#Stools#56.10.15.00.00
-unspsc7#56.10.15.13.00#Cots#56.10.15.00.00
-unspsc7#56.10.15.14.00#Foot stools#56.10.15.00.00
-unspsc7#56.10.15.15.00#Beds#56.10.15.00.00
-unspsc7#56.10.15.16.00#Chests#56.10.15.00.00
-unspsc7#56.10.15.18.00#Wall racks#56.10.15.00.00
-unspsc7#56.10.15.19.00#Tables#56.10.15.00.00
-unspsc7#56.10.15.20.00#Lockers#56.10.15.00.00
-unspsc7#56.10.15.21.00#Bed headboard or footboard#56.10.15.00.00
-unspsc7#56.10.15.22.00#Arm chair#56.10.15.00.00
-unspsc7#56.10.15.23.00#Umbrella stands#56.10.15.00.00
-unspsc7#56.10.15.24.00#Ironing boards#56.10.15.00.00
-unspsc7#56.10.15.25.00#Ironing board covers#56.10.15.00.00
-unspsc7#56.10.15.26.00#Fridge bar#56.10.15.00.00
-unspsc7#56.10.15.27.00#Household type linen driers#56.10.15.00.00
-unspsc7#56.10.15.28.00#Artificial plants#56.10.15.00.00
-unspsc7#56.10.15.29.00#Magazine racks#56.10.15.00.00
-unspsc7#56.10.16.00.00#Outdoor furniture#56.10.00.00.00
-unspsc7#56.10.16.01.00#Outdoor umbrellas#56.10.16.00.00
-unspsc7#56.10.16.02.00#Outdoor chairs#56.10.16.00.00
-unspsc7#56.10.16.03.00#Outdoor tables or picnic tables#56.10.16.00.00
-unspsc7#56.10.16.04.00#Outdoor swings#56.10.16.00.00
-unspsc7#56.10.16.05.00#Outdoor benches#56.10.16.00.00
-unspsc7#56.10.16.06.00#Flower stands#56.10.16.00.00
-unspsc7#56.10.16.07.00#Outside clothes dryer#56.10.16.00.00
-unspsc7#56.10.17.00.00#Office furniture#56.10.00.00.00
-unspsc7#56.10.17.01.00#Credenzas#56.10.17.00.00
-unspsc7#56.10.17.02.00#Filing cabinets or accesories#56.10.17.00.00
-unspsc7#56.10.17.03.00#Desks#56.10.17.00.00
-unspsc7#56.10.17.04.00#Table base#56.10.17.00.00
-unspsc7#56.10.17.05.00#Showcases#56.10.17.00.00
-unspsc7#56.10.17.06.00#Conferencing tables#56.10.17.00.00
-unspsc7#56.10.17.07.00#Drafting tables#56.10.17.00.00
-unspsc7#56.10.17.08.00#Mobile files or equipment carts#56.10.17.00.00
-unspsc7#56.10.17.09.00#Table tops#56.10.17.00.00
-unspsc7#56.10.18.00.00#Baby and toddler furniture and accessories#56.10.00.00.00
-unspsc7#56.10.18.03.00#Carriages or perambulators or strollers#56.10.18.00.00
-unspsc7#56.10.18.04.00#Cribs or playpens#56.10.18.00.00
-unspsc7#56.10.18.05.00#Car seats#56.10.18.00.00
-unspsc7#56.10.18.06.00#High chairs or accessories#56.10.18.00.00
-unspsc7#56.10.18.07.00#Bouncer seats or jumpers#56.10.18.00.00
-unspsc7#56.10.18.08.00#Swings or jumpers or accessories#56.10.18.00.00
-unspsc7#56.10.18.09.00#Potty seats#56.10.18.00.00
-unspsc7#56.10.18.10.00#Baby baths or tubs#56.10.18.00.00
-unspsc7#56.10.18.11.00#Bassinets or cradles#56.10.18.00.00
-unspsc7#56.10.18.12.00#Changing tables or accessories#56.10.18.00.00
-unspsc7#56.11.00.00.00#Commercial and industrial furniture#56.00.00.00.00
-unspsc7#56.11.15.00.00#Workstations and office packages#56.11.00.00.00
-unspsc7#56.11.15.01.00#Modular reception office packages#56.11.15.00.00
-unspsc7#56.11.15.02.00#Casegood or non modular executive office packages#56.11.15.00.00
-unspsc7#56.11.15.03.00#Modular executive office packages#56.11.15.00.00
-unspsc7#56.11.15.04.00#Casegood or non modular managerial office packages#56.11.15.00.00
-unspsc7#56.11.15.05.00#Modular managerial office packages#56.11.15.00.00
-unspsc7#56.11.15.06.00#Casegood or non modular staff office packages#56.11.15.00.00
-unspsc7#56.11.15.07.00#Modular staff office packages#56.11.15.00.00
-unspsc7#56.11.15.08.00#Casegood or non modular technical office packages#56.11.15.00.00
-unspsc7#56.11.15.09.00#Modular technical office packages#56.11.15.00.00
-unspsc7#56.11.15.10.00#Casegood or non modular clerical office packages#56.11.15.00.00
-unspsc7#56.11.15.11.00#Modular clerical office packages#56.11.15.00.00
-unspsc7#56.11.15.12.00#Casegood or non modular reception office packages#56.11.15.00.00
-unspsc7#56.11.15.13.00#Conference or non modular room packages#56.11.15.00.00
-unspsc7#56.11.16.00.00#Panel systems#56.11.00.00.00
-unspsc7#56.11.16.01.00#Screens for panel systems#56.11.16.00.00
-unspsc7#56.11.16.02.00#Storage for panel systems#56.11.16.00.00
-unspsc7#56.11.16.03.00#Organization for panel systems#56.11.16.00.00
-unspsc7#56.11.16.04.00#Work surfaces for panel systems#56.11.16.00.00
-unspsc7#56.11.16.05.00#Lighting or power or data componets for panel systems#56.11.16.00.00
-unspsc7#56.11.16.06.00#Parts or accessories panel systems#56.11.16.00.00
-unspsc7#56.11.17.00.00#Casegood and non modular systems#56.11.00.00.00
-unspsc7#56.11.17.01.00#Casegood  or non modular desk#56.11.17.00.00
-unspsc7#56.11.17.02.00#Casegood or non modular credenza#56.11.17.00.00
-unspsc7#56.11.17.03.00#Casegood or non modular storage#56.11.17.00.00
-unspsc7#56.11.17.04.00#Casegood or non modular organization#56.11.17.00.00
-unspsc7#56.11.17.05.00#Casegood or non modular lighting or power or data components#56.11.17.00.00
-unspsc7#56.11.17.06.00#Casegood or non modular parts or accessories#56.11.17.00.00
-unspsc7#56.11.18.00.00#Freestanding furniture#56.11.00.00.00
-unspsc7#56.11.18.01.00#Freestanding lighting or power or data components#56.11.18.00.00
-unspsc7#56.11.18.02.00#Freestanding tables#56.11.18.00.00
-unspsc7#56.11.18.03.00#Freestanding storage#56.11.18.00.00
-unspsc7#56.11.18.04.00#Freestanding organization#56.11.18.00.00
-unspsc7#56.11.18.05.00#Freestanding parts or accessories#56.11.18.00.00
-unspsc7#56.11.19.00.00#Industrial furniture#56.11.00.00.00
-unspsc7#56.11.19.01.00#Industrial lighting or power or data components#56.11.19.00.00
-unspsc7#56.11.19.02.00#Industrial work surfaces#56.11.19.00.00
-unspsc7#56.11.19.03.00#Industrial storage units#56.11.19.00.00
-unspsc7#56.11.19.04.00#Industrial organization#56.11.19.00.00
-unspsc7#56.11.19.05.00#Industrial parts or accessories#56.11.19.00.00
-unspsc7#56.11.20.00.00#Computer support furniture#56.11.00.00.00
-unspsc7#56.11.20.01.00#Computer support lighting or power or data components#56.11.20.00.00
-unspsc7#56.11.20.02.00#Computer support work surfaces#56.11.20.00.00
-unspsc7#56.11.20.03.00#Computer support storage accessories#56.11.20.00.00
-unspsc7#56.11.20.04.00#Computer support organization#56.11.20.00.00
-unspsc7#56.11.20.05.00#Computer support parts or accessories#56.11.20.00.00
-unspsc7#56.11.21.00.00#Seating#56.11.00.00.00
-unspsc7#56.11.21.01.00#Auditorium or stadium or special use seating#56.11.21.00.00
-unspsc7#56.11.21.02.00#Task seating#56.11.21.00.00
-unspsc7#56.11.21.03.00#Guest seating#56.11.21.00.00
-unspsc7#56.11.21.04.00#Executive seating#56.11.21.00.00
-unspsc7#56.11.21.05.00#Lounge seating#56.11.21.00.00
-unspsc7#56.11.21.06.00#Stool seating#56.11.21.00.00
-unspsc7#56.11.21.07.00#Seating parts or accessories#56.11.21.00.00
-unspsc7#56.11.21.08.00#Combination chair with desk#56.11.21.00.00
-unspsc7#56.11.21.09.00#Benches#56.11.21.00.00
-unspsc7#56.12.00.00.00#Classroom and instructional and institutional furniture and fixtures#56.00.00.00.00
-unspsc7#56.12.10.00.00#Library furnishings#56.12.00.00.00
-unspsc7#56.12.10.01.00#Book carts or book trucks#56.12.10.00.00
-unspsc7#56.12.10.02.00#Circulation or librarian desks or components#56.12.10.00.00
-unspsc7#56.12.10.03.00#Book returns#56.12.10.00.00
-unspsc7#56.12.10.04.00#Card catalog units#56.12.10.00.00
-unspsc7#56.12.10.05.00#Dictionary stands#56.12.10.00.00
-unspsc7#56.12.10.06.00#Upholstered benches#56.12.10.00.00
-unspsc7#56.12.10.07.00#Public access tables#56.12.10.00.00
-unspsc7#56.12.10.08.00#Book browser units#56.12.10.00.00
-unspsc7#56.12.10.09.00#Sloped reading tables#56.12.10.00.00
-unspsc7#56.12.10.10.00#Book kiosks#56.12.10.00.00
-unspsc7#56.12.10.11.00#Library compact disc or audio cassette displayers#56.12.10.00.00
-unspsc7#56.12.10.12.00#Rotary island stands#56.12.10.00.00
-unspsc7#56.12.10.14.00#Hang up bag racks or bags#56.12.10.00.00
-unspsc7#56.12.11.00.00#Art classroom furnishings#56.12.00.00.00
-unspsc7#56.12.11.01.00#Art horse#56.12.11.00.00
-unspsc7#56.12.11.02.00#Art student bench#56.12.11.00.00
-unspsc7#56.12.12.00.00#First aid room furnishings#56.12.00.00.00
-unspsc7#56.12.12.01.00#First aid couches#56.12.12.00.00
-unspsc7#56.12.13.00.00#General educational facility fixtures#56.12.00.00.00
-unspsc7#56.12.13.01.00#Standing risers#56.12.13.00.00
-unspsc7#56.12.13.02.00#Table or chair movers or caddys#56.12.13.00.00
-unspsc7#56.12.13.03.00#Rubber brush floor matting#56.12.13.00.00
-unspsc7#56.12.13.04.00#Planning tables#56.12.13.00.00
-unspsc7#56.12.14.00.00#Cafeteria and lunchroom furnishings#56.12.00.00.00
-unspsc7#56.12.14.01.00#Mobile bench tables#56.12.14.00.00
-unspsc7#56.12.14.02.00#Mobile stool tables#56.12.14.00.00
-unspsc7#56.12.14.03.00#Mobile tables#56.12.14.00.00
-unspsc7#56.12.15.00.00#General classroom furnishings#56.12.00.00.00
-unspsc7#56.12.15.01.00#Activity tables#56.12.15.00.00
-unspsc7#56.12.15.02.00#Classroom chairs#56.12.15.00.00
-unspsc7#56.12.15.03.00#Classroom benches#56.12.15.00.00
-unspsc7#56.12.15.04.00#Clasroom stools#56.12.15.00.00
-unspsc7#56.12.15.05.00#Classroom tables#56.12.15.00.00
-unspsc7#56.12.15.06.00#Student desks#56.12.15.00.00
-unspsc7#56.12.15.07.00#Study carrels#56.12.15.00.00
-unspsc7#56.12.15.08.00#Student computer desks#56.12.15.00.00
-unspsc7#56.12.15.09.00#Student computer tables#56.12.15.00.00
-unspsc7#56.12.16.00.00#Creative play and rest time furnishings for daycare and early childhood facilities#56.12.00.00.00
-unspsc7#56.12.16.01.00#Toddler or child size living room sets#56.12.16.00.00
-unspsc7#56.12.16.02.00#Toddler or child size sofas#56.12.16.00.00
-unspsc7#56.12.16.03.00#Toddler or child size easy chairs#56.12.16.00.00
-unspsc7#56.12.16.04.00#Toddler or child size bean bag chairs#56.12.16.00.00
-unspsc7#56.12.16.05.00#Low rise room dividers or play panels#56.12.16.00.00
-unspsc7#56.12.16.06.00#Childs rest mats#56.12.16.00.00
-unspsc7#56.12.16.07.00#Childs rest mat racks or holders#56.12.16.00.00
-unspsc7#56.12.16.08.00#Childrens cots#56.12.16.00.00
-unspsc7#56.12.16.09.00#Childrens cot carriers#56.12.16.00.00
-unspsc7#56.12.16.10.00#Childrens cot activity systems#56.12.16.00.00
-unspsc7#56.12.17.00.00#Book and general storage units for classrooms#56.12.00.00.00
-unspsc7#56.12.17.01.00#General storage units#56.12.17.00.00
-unspsc7#56.12.17.02.00#Book storage units#56.12.17.00.00
-unspsc7#56.12.17.03.00#Cubbie units#56.12.17.00.00
-unspsc7#56.12.17.04.00#Institutional Storage Cabinets#56.12.17.00.00
-unspsc7#56.12.18.00.00#Vocational classroom furnishings and fixtures#56.12.00.00.00
-unspsc7#56.12.18.01.00#Technical education tool storage cabinets or cabinets with tools#56.12.18.00.00
-unspsc7#56.12.18.02.00#General shop tool storage cabinets or cabinets with tools#56.12.18.00.00
-unspsc7#56.12.18.03.00#Wordworking tool storage cabinets or cabinets with tools#56.12.18.00.00
-unspsc7#56.12.18.04.00#Instructors technical desk#56.12.18.00.00
-unspsc7#56.12.18.05.00#Flat files#56.12.18.00.00
-unspsc7#56.12.19.00.00#Demonstration furnishings#56.12.00.00.00
-unspsc7#56.12.19.01.00#Sewing machine demonstrator tables#56.12.19.00.00
-unspsc7#56.12.20.00.00#Laboratory furniture#56.12.00.00.00
-unspsc7#56.12.20.01.00#Laboratory benches#56.12.20.00.00
-unspsc7#56.12.20.02.00#Laboratory storage units or accessories#56.12.20.00.00
-unspsc7#56.12.20.03.00#Laboratory workstations#56.12.20.00.00
-unspsc7#60.00.00.00.00#Musical Instruments and Games and Toys and Arts and Crafts and Educational Equipment and Materials and Accessories and Supplies#60.00.00.00.00
-unspsc7#60.10.00.00.00#Developmental and professional teaching aids and materials and accessories and supplies#60.00.00.00.00
-unspsc7#60.10.10.00.00#Math kits#60.10.00.00.00
-unspsc7#60.10.10.01.00#Addition math kits#60.10.10.00.00
-unspsc7#60.10.10.02.00#Division math kits#60.10.10.00.00
-unspsc7#60.10.10.03.00#Fraction math kits#60.10.10.00.00
-unspsc7#60.10.10.04.00#Middle School math kits#60.10.10.00.00
-unspsc7#60.10.10.05.00#Early childhood math kits#60.10.10.00.00
-unspsc7#60.10.10.06.00#Measurement math kits#60.10.10.00.00
-unspsc7#60.10.10.07.00#Multiplication math kits#60.10.10.00.00
-unspsc7#60.10.10.08.00#Elementary math kits#60.10.10.00.00
-unspsc7#60.10.10.09.00#Subtraction math kits#60.10.10.00.00
-unspsc7#60.10.10.10.00#High school math kits#60.10.10.00.00
-unspsc7#60.10.11.00.00#Electronic learning aids#60.10.00.00.00
-unspsc7#60.10.11.01.00#Electronic card readers#60.10.11.00.00
-unspsc7#60.10.11.02.00#Curriculum based electronic learning aids#60.10.11.00.00
-unspsc7#60.10.11.03.00#Electronic globes#60.10.11.00.00
-unspsc7#60.10.11.04.00#Electronic quiz machines#60.10.11.00.00
-unspsc7#60.10.12.00.00#Educational incentives#60.10.00.00.00
-unspsc7#60.10.12.01.00#Bible based chart stickers#60.10.12.00.00
-unspsc7#60.10.12.02.00#Bible based incentive charts#60.10.12.00.00
-unspsc7#60.10.12.03.00#Incentive chart stickers#60.10.12.00.00
-unspsc7#60.10.12.04.00#Incentive charts#60.10.12.00.00
-unspsc7#60.10.12.05.00#Incentive punchcards#60.10.12.00.00
-unspsc7#60.10.13.00.00#Educational stickers and supplies#60.10.00.00.00
-unspsc7#60.10.13.01.00#Bible based stickers#60.10.13.00.00
-unspsc7#60.10.13.02.00#Giant stickers#60.10.13.00.00
-unspsc7#60.10.13.03.00#Notary seal stickers#60.10.13.00.00
-unspsc7#60.10.13.04.00#Photo stickers#60.10.13.00.00
-unspsc7#60.10.13.05.00#Reward stickers#60.10.13.00.00
-unspsc7#60.10.13.06.00#Scented stickers#60.10.13.00.00
-unspsc7#60.10.13.07.00#Shape stickers#60.10.13.00.00
-unspsc7#60.10.13.08.00#Sparkle stickers#60.10.13.00.00
-unspsc7#60.10.13.09.00#Reward star stickers#60.10.13.00.00
-unspsc7#60.10.13.10.00#Sticker assortments#60.10.13.00.00
-unspsc7#60.10.13.11.00#Sticker books#60.10.13.00.00
-unspsc7#60.10.13.12.00#Sticker boxes#60.10.13.00.00
-unspsc7#60.10.13.13.00#Tattoo stickers#60.10.13.00.00
-unspsc7#60.10.13.14.00#Addition flash cards#60.10.13.00.00
-unspsc7#60.10.13.15.00#All facts flash cards#60.10.13.00.00
-unspsc7#60.10.13.16.00#Blank flash cards#60.10.13.00.00
-unspsc7#60.10.13.17.00#Division flash cards#60.10.13.00.00
-unspsc7#60.10.13.18.00#Electronic flash cards#60.10.13.00.00
-unspsc7#60.10.13.19.00#Equivalent flash cards#60.10.13.00.00
-unspsc7#60.10.13.20.00#Fraction flash cards#60.10.13.00.00
-unspsc7#60.10.13.21.00#Greater than or less than flash cards#60.10.13.00.00
-unspsc7#60.10.13.22.00#Multiplication flash cards#60.10.13.00.00
-unspsc7#60.10.13.23.00#Subtraction flash cards#60.10.13.00.00
-unspsc7#60.10.13.24.00#Alphabet flash cards#60.10.13.00.00
-unspsc7#60.10.13.25.00#Word building flash cards#60.10.13.00.00
-unspsc7#60.10.13.26.00#Phonics flash cards#60.10.13.00.00
-unspsc7#60.10.13.27.00#Handwriting or writing flash cards#60.10.13.00.00
-unspsc7#60.10.13.28.00#Number clash cards#60.10.13.00.00
-unspsc7#60.10.13.29.00#Money flash cards#60.10.13.00.00
-unspsc7#60.10.13.30.00#Time flash cards#60.10.13.00.00
-unspsc7#60.10.13.31.00#State flash cards#60.10.13.00.00
-unspsc7#60.10.14.00.00#Classroom awards#60.10.00.00.00
-unspsc7#60.10.14.01.00#Badges#60.10.14.00.00
-unspsc7#60.10.14.02.00#Award buttons#60.10.14.00.00
-unspsc7#60.10.14.03.00#Celebration crowns#60.10.14.00.00
-unspsc7#60.10.14.04.00#Reward jewlery#60.10.14.00.00
-unspsc7#60.10.14.05.00#Classroom ribbons or rosettes#60.10.14.00.00
-unspsc7#60.10.16.00.00#Educational certificates or diplomas#60.10.00.00.00
-unspsc7#60.10.16.01.00#Bible based certificates#60.10.16.00.00
-unspsc7#60.10.16.02.00#Blank certificates#60.10.16.00.00
-unspsc7#60.10.16.03.00#Certificate frames#60.10.16.00.00
-unspsc7#60.10.16.04.00#Certificate holders#60.10.16.00.00
-unspsc7#60.10.16.05.00#Certificate ribbons#60.10.16.00.00
-unspsc7#60.10.16.06.00#Diplomas#60.10.16.00.00
-unspsc7#60.10.16.07.00#Foreign language certificates#60.10.16.00.00
-unspsc7#60.10.16.08.00#General praise certificates#60.10.16.00.00
-unspsc7#60.10.16.09.00#Grade specific certificates#60.10.16.00.00
-unspsc7#60.10.16.10.00#Subject specific certificates#60.10.16.00.00
-unspsc7#60.10.17.00.00#Teacher resource materials#60.10.00.00.00
-unspsc7#60.10.17.01.00#Assessment resource books#60.10.17.00.00
-unspsc7#60.10.17.02.00#Calendars or cut outs#60.10.17.00.00
-unspsc7#60.10.17.03.00#Character education resource materials#60.10.17.00.00
-unspsc7#60.10.17.04.00#Classroom activity books#60.10.17.00.00
-unspsc7#60.10.17.05.00#Critical thinking resource materials#60.10.17.00.00
-unspsc7#60.10.17.06.00#Cross curriculum guides#60.10.17.00.00
-unspsc7#60.10.17.07.00#Curriculum guides#60.10.17.00.00
-unspsc7#60.10.17.08.00#Fabric charts#60.10.17.00.00
-unspsc7#60.10.17.09.00#Flannel board aids#60.10.17.00.00
-unspsc7#60.10.17.10.00#Educator gifts#60.10.17.00.00
-unspsc7#60.10.17.11.00#Grading stamps#60.10.17.00.00
-unspsc7#60.10.17.12.00#Hall passes#60.10.17.00.00
-unspsc7#60.10.17.13.00#Home education resource materials#60.10.17.00.00
-unspsc7#60.10.17.14.00#Homework assignment resources#60.10.17.00.00
-unspsc7#60.10.17.15.00#Idea books#60.10.17.00.00
-unspsc7#60.10.17.16.00#Magnetic board aids#60.10.17.00.00
-unspsc7#60.10.17.17.00#Name plates or tags#60.10.17.00.00
-unspsc7#60.10.17.18.00#Teacher plan books#60.10.17.00.00
-unspsc7#60.10.17.19.00#Pocket charts#60.10.17.00.00
-unspsc7#60.10.17.20.00#Teacher communication postcards#60.10.17.00.00
-unspsc7#60.10.17.21.00#Professional teacher resource books#60.10.17.00.00
-unspsc7#60.10.17.22.00#Teacher classroom grading books#60.10.17.00.00
-unspsc7#60.10.17.23.00#Classroom student seating charts#60.10.17.00.00
-unspsc7#60.10.17.24.00#Substitute teacher folders or forms#60.10.17.00.00
-unspsc7#60.10.17.25.00#Technology activity or resource books#60.10.17.00.00
-unspsc7#60.10.17.26.00#Technology reference guides#60.10.17.00.00
-unspsc7#60.10.17.27.00#Test taking resource materials#60.10.17.00.00
-unspsc7#60.10.17.28.00#Theme unit resource materials#60.10.17.00.00
-unspsc7#60.10.17.29.00#Middle or junior school teaching kits#60.10.17.00.00
-unspsc7#60.10.17.30.00#Laboratory manuals#60.10.17.00.00
-unspsc7#60.10.18.00.00#Church school educational resources#60.10.00.00.00
-unspsc7#60.10.18.01.00#Bible reference guides#60.10.18.00.00
-unspsc7#60.10.18.02.00#Bible based dramas#60.10.18.00.00
-unspsc7#60.10.18.03.00#Bible based resource or activity books#60.10.18.00.00
-unspsc7#60.10.18.04.00#Sunday school activity resource books#60.10.18.00.00
-unspsc7#60.10.18.05.00#Vacation bible school resources#60.10.18.00.00
-unspsc7#60.10.19.00.00#Alphabet skills materials and resources#60.10.00.00.00
-unspsc7#60.10.19.01.00#Alphabet activity books#60.10.19.00.00
-unspsc7#60.10.19.02.00#Alphabet cubes#60.10.19.00.00
-unspsc7#60.10.19.03.00#Alphabet desk tapes#60.10.19.00.00
-unspsc7#60.10.19.04.00#Alphabet kits#60.10.19.00.00
-unspsc7#60.10.19.05.00#Alphabet letter tiles#60.10.19.00.00
-unspsc7#60.10.19.06.00#Alphabet poster cards#60.10.19.00.00
-unspsc7#60.10.19.07.00#Alphabet reference guides#60.10.19.00.00
-unspsc7#60.10.19.08.00#Alphabet resource books#60.10.19.00.00
-unspsc7#60.10.19.09.00#Alphabet stamps#60.10.19.00.00
-unspsc7#60.10.19.10.00#Alphabet wall cards#60.10.19.00.00
-unspsc7#60.10.19.11.00#Tactile alphabets#60.10.19.00.00
-unspsc7#60.10.20.00.00#Word building resource materials and accessories#60.10.00.00.00
-unspsc7#60.10.20.01.00#Speech mirror#60.10.20.00.00
-unspsc7#60.10.20.02.00#Spelling resource materials#60.10.20.00.00
-unspsc7#60.10.20.03.00#Word building activity books#60.10.20.00.00
-unspsc7#60.10.20.04.00#Word building kits#60.10.20.00.00
-unspsc7#60.10.20.05.00#Word building resource books#60.10.20.00.00
-unspsc7#60.10.20.06.00#Word building tiles#60.10.20.00.00
-unspsc7#60.10.20.07.00#Word walls#60.10.20.00.00
-unspsc7#60.10.21.00.00#Language arts resource materials#60.10.00.00.00
-unspsc7#60.10.21.01.00#Adjective resource books#60.10.21.00.00
-unspsc7#60.10.21.02.00#Adverb resource books#60.10.21.00.00
-unspsc7#60.10.21.03.00#Grammar resource books#60.10.21.00.00
-unspsc7#60.10.21.04.00#Noun resource books#60.10.21.00.00
-unspsc7#60.10.21.05.00#Punctutation resource books#60.10.21.00.00
-unspsc7#60.10.21.06.00#Verb resource books#60.10.21.00.00
-unspsc7#60.10.22.00.00#Phonics resource materials and accessories#60.10.00.00.00
-unspsc7#60.10.22.01.00#Phonics activity books#60.10.22.00.00
-unspsc7#60.10.22.02.00#Phonics drill cards#60.10.22.00.00
-unspsc7#60.10.22.03.00#Phonics kit#60.10.22.00.00
-unspsc7#60.10.22.04.00#Phonics picture cards#60.10.22.00.00
-unspsc7#60.10.22.05.00#Phonics resource books#60.10.22.00.00
-unspsc7#60.10.22.06.00#Phonics tiles#60.10.22.00.00
-unspsc7#60.10.23.00.00#Reading books and resources#60.10.00.00.00
-unspsc7#60.10.23.01.00#Reading activity books#60.10.23.00.00
-unspsc7#60.10.23.02.00#Beginning reading books#60.10.23.00.00
-unspsc7#60.10.23.03.00#Bible based childrens literature books#60.10.23.00.00
-unspsc7#60.10.23.04.00#Childrens literature books#60.10.23.00.00
-unspsc7#60.10.23.05.00#Critical reading skills#60.10.23.00.00
-unspsc7#60.10.23.06.00#Flannel boards#60.10.23.00.00
-unspsc7#60.10.23.07.00#Poetry resource books#60.10.23.00.00
-unspsc7#60.10.23.08.00#Reading comprehension materials#60.10.23.00.00
-unspsc7#60.10.23.09.00#Reading development materials or kits#60.10.23.00.00
-unspsc7#60.10.23.10.00#Reading resource books#60.10.23.00.00
-unspsc7#60.10.23.11.00#Reading thematic units#60.10.23.00.00
-unspsc7#60.10.23.12.00#Vocabulary activity or resource books#60.10.23.00.00
-unspsc7#60.10.24.00.00#Early learning math and counting resources and accessories#60.10.00.00.00
-unspsc7#60.10.24.01.00#Abacus or counting frames#60.10.24.00.00
-unspsc7#60.10.24.02.00#Activity or resource books for working with early math manipulatives#60.10.24.00.00
-unspsc7#60.10.24.03.00#Activity cards for working with early math manipulatives#60.10.24.00.00
-unspsc7#60.10.24.04.00#Beads or bead activity sets for early math#60.10.24.00.00
-unspsc7#60.10.24.05.00#Counters or counter activity sets for early math#60.10.24.00.00
-unspsc7#60.10.24.06.00#Counting or sorting trays or bowls for early math#60.10.24.00.00
-unspsc7#60.10.24.07.00#Laces or lacing sets for early math#60.10.24.00.00
-unspsc7#60.10.24.08.00#Linking manipulatives or linking activity sets for early math#60.10.24.00.00
-unspsc7#60.10.24.09.00#Math game chips or tokens#60.10.24.00.00
-unspsc7#60.10.24.10.00#Number cards#60.10.24.00.00
-unspsc7#60.10.24.11.00#Number forms models or accessories#60.10.24.00.00
-unspsc7#60.10.24.12.00#Pegboards for early math#60.10.24.00.00
-unspsc7#60.10.24.13.00#Pegs for early math#60.10.24.00.00
-unspsc7#60.10.24.14.00#Sorting manipulatives or sorting activity sets for early math#60.10.24.00.00
-unspsc7#60.10.25.00.00#Basic math operations and numeration resources and materials#60.10.00.00.00
-unspsc7#60.10.25.01.00#Addition activity or resource books#60.10.25.00.00
-unspsc7#60.10.25.02.00#Basic operations models#60.10.25.00.00
-unspsc7#60.10.25.03.00#Basic operations reference guides#60.10.25.00.00
-unspsc7#60.10.25.04.00#Division activity or resource books#60.10.25.00.00
-unspsc7#60.10.25.05.00#Multiplication activity or resource books#60.10.25.00.00
-unspsc7#60.10.25.06.00#Subtraction activity or resource books#60.10.25.00.00
-unspsc7#60.10.25.07.00#Number desk tapes#60.10.25.00.00
-unspsc7#60.10.25.08.00#Hundreds charts or boards#60.10.25.00.00
-unspsc7#60.10.25.09.00#Hundreds number tiles#60.10.25.00.00
-unspsc7#60.10.25.10.00#Number kits#60.10.25.00.00
-unspsc7#60.10.25.11.00#Number lines#60.10.25.00.00
-unspsc7#60.10.25.12.00#Numberation activity or resource books#60.10.25.00.00
-unspsc7#60.10.25.13.00#Dominoes#60.10.25.00.00
-unspsc7#60.10.26.00.00#Probability or chance or data or problem solving teacher resource materials#60.10.00.00.00
-unspsc7#60.10.26.01.00#Two sided counters or tokens#60.10.26.00.00
-unspsc7#60.10.26.02.00#Spinners#60.10.26.00.00
-unspsc7#60.10.26.03.00#Dice sets#60.10.26.00.00
-unspsc7#60.10.26.04.00#Probability activity or resource books#60.10.26.00.00
-unspsc7#60.10.26.05.00#Logic activity or resource books#60.10.26.00.00
-unspsc7#60.10.26.06.00#Attribute blocks#60.10.26.00.00
-unspsc7#60.10.26.07.00#Attribute blocks activity cards#60.10.26.00.00
-unspsc7#60.10.26.08.00#Attribute activity or resource books#60.10.26.00.00
-unspsc7#60.10.26.09.00#Graphing mat#60.10.26.00.00
-unspsc7#60.10.26.10.00#Graphing activity or resource books#60.10.26.00.00
-unspsc7#60.10.26.11.00#Logic games#60.10.26.00.00
-unspsc7#60.10.26.12.00#Attribute sets or kits#60.10.26.00.00
-unspsc7#60.10.26.13.00#Problem solving activity or resource books#60.10.26.00.00
-unspsc7#60.10.26.14.00#Problem solving activity cards#60.10.26.00.00
-unspsc7#60.10.27.00.00#Patterning or matching or spatial perception or logical thinking teacher resource materials#60.10.00.00.00
-unspsc7#60.10.27.01.00#Pattern blocks or parquetry blocks activity or resource books#60.10.27.00.00
-unspsc7#60.10.27.02.00#Pattern blocks#60.10.27.00.00
-unspsc7#60.10.27.03.00#Pattern block activity or pattern cards#60.10.27.00.00
-unspsc7#60.10.27.04.00#Pattern block games or activity sets#60.10.27.00.00
-unspsc7#60.10.27.05.00#Pattern block stickers#60.10.27.00.00
-unspsc7#60.10.27.06.00#Pattern blocks mirror#60.10.27.00.00
-unspsc7#60.10.27.07.00#Pattern blocks charts or posters#60.10.27.00.00
-unspsc7#60.10.27.08.00#Parquetry blocks#60.10.27.00.00
-unspsc7#60.10.27.09.00#Parquetry blocks activity or pattern cards#60.10.27.00.00
-unspsc7#60.10.27.10.00#Parquetry blocks activity sets#60.10.27.00.00
-unspsc7#60.10.27.11.00#Tangrams activity or resource books#60.10.27.00.00
-unspsc7#60.10.27.12.00#Tangram activity or pattern cards#60.10.27.00.00
-unspsc7#60.10.27.13.00#Tangram puzzle activity sets#60.10.27.00.00
-unspsc7#60.10.27.14.00#Tangrams puzzles#60.10.27.00.00
-unspsc7#60.10.27.15.00#Pentominoes activity and resource books#60.10.27.00.00
-unspsc7#60.10.27.16.00#Pentominoes activity or pattern cards#60.10.27.00.00
-unspsc7#60.10.27.17.00#Pentominoes#60.10.27.00.00
-unspsc7#60.10.27.18.00#Pentominoes activity sets#60.10.27.00.00
-unspsc7#60.10.28.00.00#Base ten and place value teacher resource materials#60.10.00.00.00
-unspsc7#60.10.28.01.00#Base ten blocks#60.10.28.00.00
-unspsc7#60.10.28.02.00#Base ten or place value activity or resource books#60.10.28.00.00
-unspsc7#60.10.28.03.00#Base ten or place value activity cards#60.10.28.00.00
-unspsc7#60.10.28.04.00#Base ten rubber stamps#60.10.28.00.00
-unspsc7#60.10.28.05.00#Place value grids#60.10.28.00.00
-unspsc7#60.10.28.06.00#Place value games or activity sets#60.10.28.00.00
-unspsc7#60.10.28.07.00#Place value models or accessories#60.10.28.00.00
-unspsc7#60.10.29.00.00#Money and time teacher resource materials#60.10.00.00.00
-unspsc7#60.10.29.01.00#Money activity or resource books#60.10.29.00.00
-unspsc7#60.10.29.02.00#Bulk bills for the classroom#60.10.29.00.00
-unspsc7#60.10.29.03.00#Bulk coins for the classroom#60.10.29.00.00
-unspsc7#60.10.29.04.00#Coin cubes or dice#60.10.29.00.00
-unspsc7#60.10.29.05.00#Magnetic money#60.10.29.00.00
-unspsc7#60.10.29.06.00#Overhead bills#60.10.29.00.00
-unspsc7#60.10.29.07.00#Overhead coins#60.10.29.00.00
-unspsc7#60.10.29.08.00#Money puzzles#60.10.29.00.00
-unspsc7#60.10.29.09.00#Money rubber stamps#60.10.29.00.00
-unspsc7#60.10.29.10.00#Coin bank#60.10.29.00.00
-unspsc7#60.10.29.11.00#Money games or kits#60.10.29.00.00
-unspsc7#60.10.29.12.00#Play cash registers#60.10.29.00.00
-unspsc7#60.10.29.13.00#Money reference guides#60.10.29.00.00
-unspsc7#60.10.29.14.00#Time activity or resource books#60.10.29.00.00
-unspsc7#60.10.29.15.00#Time rubber stamps#60.10.29.00.00
-unspsc7#60.10.29.16.00#Time kits#60.10.29.00.00
-unspsc7#60.10.29.17.00#Time reference guides#60.10.29.00.00
-unspsc7#60.10.30.00.00#Fractions and pentominoes and decimals teaching aids#60.10.00.00.00
-unspsc7#60.10.30.01.00#Fraction circles or squares#60.10.30.00.00
-unspsc7#60.10.30.02.00#Decimal squares#60.10.30.00.00
-unspsc7#60.10.30.03.00#Fraction activity books#60.10.30.00.00
-unspsc7#60.10.30.04.00#Fraction bars#60.10.30.00.00
-unspsc7#60.10.30.05.00#Fraction charts#60.10.30.00.00
-unspsc7#60.10.30.06.00#Fraction dice#60.10.30.00.00
-unspsc7#60.10.30.07.00#Fraction games#60.10.30.00.00
-unspsc7#60.10.30.08.00#Fraction kits#60.10.30.00.00
-unspsc7#60.10.30.09.00#Fraction tiles#60.10.30.00.00
-unspsc7#60.10.30.10.00#Fractions discs#60.10.30.00.00
-unspsc7#60.10.30.12.00#Pentominoes activity book#60.10.30.00.00
-unspsc7#60.10.30.13.00#Pentominoes pattern cards#60.10.30.00.00
-unspsc7#60.10.31.00.00#Geometry teacher resource materials#60.10.00.00.00
-unspsc7#60.10.31.01.00#Geometry activity or resource books#60.10.31.00.00
-unspsc7#60.10.31.02.00#Geometry charts or posters#60.10.31.00.00
-unspsc7#60.10.31.03.00#Geoboards#60.10.31.00.00
-unspsc7#60.10.31.04.00#Geometric construction sets#60.10.31.00.00
-unspsc7#60.10.31.05.00#Double sided geoboards#60.10.31.00.00
-unspsc7#60.10.31.06.00#Geoboard games or activity kits#60.10.31.00.00
-unspsc7#60.10.31.07.00#Geoboard rubber bands#60.10.31.00.00
-unspsc7#60.10.31.08.00#Geoboards activity cards#60.10.31.00.00
-unspsc7#60.10.31.09.00#Geometric chalkboard drawing instruments#60.10.31.00.00
-unspsc7#60.10.31.10.00#Geometry reference guides#60.10.31.00.00
-unspsc7#60.10.31.11.00#GeoMirror#60.10.31.00.00
-unspsc7#60.10.31.12.00#Geometric solids models#60.10.31.00.00
-unspsc7#60.10.32.00.00#Algebra teacher resource materials#60.10.00.00.00
-unspsc7#60.10.32.01.00#Algebra activity or resource books#60.10.32.00.00
-unspsc7#60.10.32.02.00#Centimeter cubes#60.10.32.00.00
-unspsc7#60.10.32.03.00#Algebra or pre algebra reference guides#60.10.32.00.00
-unspsc7#60.10.32.04.00#Algebra models or accessories#60.10.32.00.00
-unspsc7#60.10.33.00.00#Precalculus and calculus teacher resource materials#60.10.00.00.00
-unspsc7#60.10.33.01.00#Calculus activity or resources books#60.10.33.00.00
-unspsc7#60.10.33.02.00#Precalculus or calculus reference guides#60.10.33.00.00
-unspsc7#60.10.33.03.00#Precalculus activity or resource books#60.10.33.00.00
-unspsc7#60.10.34.00.00#Geography and map skills resources and accessories#60.10.00.00.00
-unspsc7#60.10.34.01.00#Goegraphy charts or posters#60.10.34.00.00
-unspsc7#60.10.34.02.00#Continents activity or resource books#60.10.34.00.00
-unspsc7#60.10.34.03.00#Electronic social studies learning aids#60.10.34.00.00
-unspsc7#60.10.34.04.00#Geography reference guides#60.10.34.00.00
-unspsc7#60.10.34.05.00#Map racks#60.10.34.00.00
-unspsc7#60.10.34.06.00#Map stencil kits#60.10.34.00.00
-unspsc7#60.10.34.07.00#Portable wall maps#60.10.34.00.00
-unspsc7#60.10.34.08.00#Geography resource or activity books#60.10.34.00.00
-unspsc7#60.10.35.00.00#Political science#60.10.00.00.00
-unspsc7#60.10.35.01.00#Economics activity or resource books#60.10.35.00.00
-unspsc7#60.10.35.02.00#Government activity or resource books#60.10.35.00.00
-unspsc7#60.10.35.03.00#Government reference guides#60.10.35.00.00
-unspsc7#60.10.35.04.00#State theme units#60.10.35.00.00
-unspsc7#60.10.36.00.00#Multicultural activities and resources#60.10.00.00.00
-unspsc7#60.10.36.01.00#Ancient civilizations resources#60.10.36.00.00
-unspsc7#60.10.36.02.00#Customs or rituals or traditions resources#60.10.36.00.00
-unspsc7#60.10.36.03.00#Ethnic diversity resources#60.10.36.00.00
-unspsc7#60.10.36.04.00#Genealogy resources#60.10.36.00.00
-unspsc7#60.10.36.05.00#Multicultural holidays resources#60.10.36.00.00
-unspsc7#60.10.36.06.00#Multicultural theme units#60.10.36.00.00
-unspsc7#60.10.37.00.00#Foreign languages resources#60.10.00.00.00
-unspsc7#60.10.37.01.00#Resources for Learning to speak spanish#60.10.37.00.00
-unspsc7#60.10.37.02.00#Resources for Learning to speak french#60.10.37.00.00
-unspsc7#60.10.37.03.00#Resources for Learning to speak german#60.10.37.00.00
-unspsc7#60.10.37.04.00#Resources for Learning to speak english#60.10.37.00.00
-unspsc7#60.10.37.05.00#Resources for Learning to speak latin#60.10.37.00.00
-unspsc7#60.10.37.06.00#Resources for Learning to speak italian#60.10.37.00.00
-unspsc7#60.10.38.00.00#History teaching resources#60.10.00.00.00
-unspsc7#60.10.38.01.00#African history resource books#60.10.38.00.00
-unspsc7#60.10.38.02.00#History charts or posters#60.10.38.00.00
-unspsc7#60.10.38.03.00#European history resource books#60.10.38.00.00
-unspsc7#60.10.38.04.00#Historical maps#60.10.38.00.00
-unspsc7#60.10.38.05.00#History theme units#60.10.38.00.00
-unspsc7#60.10.38.06.00#History photo cards#60.10.38.00.00
-unspsc7#60.10.38.07.00#History resource books#60.10.38.00.00
-unspsc7#60.10.38.08.00#Womans history resources#60.10.38.00.00
-unspsc7#60.10.38.09.00#World history resources#60.10.38.00.00
-unspsc7#60.10.39.00.00#Living organisms and preserved specimens and related materials#60.10.00.00.00
-unspsc7#60.10.39.01.00#Live amphibia#60.10.39.00.00
-unspsc7#60.10.39.02.00#Preserved amphibia#60.10.39.00.00
-unspsc7#60.10.39.03.00#Amphibia models#60.10.39.00.00
-unspsc7#60.10.39.04.00#Fungi cultures#60.10.39.00.00
-unspsc7#60.10.39.05.00#Culture kits or supplies#60.10.39.00.00
-unspsc7#60.10.39.06.00#Protozoan cultures#60.10.39.00.00
-unspsc7#60.10.39.07.00#Aquaria plants#60.10.39.00.00
-unspsc7#60.10.39.08.00#Terrarium plants#60.10.39.00.00
-unspsc7#60.10.39.09.00#Live invertebrates#60.10.39.00.00
-unspsc7#60.10.39.10.00#Preserved invertebrates#60.10.39.00.00
-unspsc7#60.10.39.11.00#Live vertebrates#60.10.39.00.00
-unspsc7#60.10.39.12.00#Preserved vertebrates#60.10.39.00.00
-unspsc7#60.10.39.13.00#Live reptilia#60.10.39.00.00
-unspsc7#60.10.39.14.00#Preserved reptilla#60.10.39.00.00
-unspsc7#60.10.39.15.00#Dissection kits or supplies#60.10.39.00.00
-unspsc7#60.10.39.18.00#Biospheres#60.10.39.00.00
-unspsc7#60.10.39.19.00#Biology experiment kits or supplies#60.10.39.00.00
-unspsc7#60.10.39.20.00#Staining kits or supplies#60.10.39.00.00
-unspsc7#60.10.39.21.00#Preserved life cycle specimens#60.10.39.00.00
-unspsc7#60.10.39.22.00#Biology reference guides#60.10.39.00.00
-unspsc7#60.10.39.23.00#Skeleton or bone or shell specimen#60.10.39.00.00
-unspsc7#60.10.39.24.00#Biology resource or activity books#60.10.39.00.00
-unspsc7#60.10.39.25.00#Biology study or activity kits#60.10.39.00.00
-unspsc7#60.10.39.26.00#Biology charts or posters#60.10.39.00.00
-unspsc7#60.10.39.27.00#Preserved plant body or organ specimens#60.10.39.00.00
-unspsc7#60.10.39.28.00#Biology activity or photo cards#60.10.39.00.00
-unspsc7#60.10.39.29.00#Plant life cycle specimens#60.10.39.00.00
-unspsc7#60.10.39.30.00#Combination organism specimens#60.10.39.00.00
-unspsc7#60.10.39.31.00#Animal body or body part or organ specimens#60.10.39.00.00
-unspsc7#60.10.39.32.00#Ecosystem displays#60.10.39.00.00
-unspsc7#60.10.39.33.00#Human body or body part or organ specimens#60.10.39.00.00
-unspsc7#60.10.39.34.00#Tissue cultures#60.10.39.00.00
-unspsc7#60.10.40.00.00#Biotechnology and bio chemistry and genetics and microbiology and related materials#60.10.00.00.00
-unspsc7#60.10.40.01.00#Deoxyribonucleic acid DNA models#60.10.40.00.00
-unspsc7#60.10.40.02.00#Deoxyribonucleic acid DNA experiment kits#60.10.40.00.00
-unspsc7#60.10.40.03.00#Genetic books#60.10.40.00.00
-unspsc7#60.10.40.04.00#Genetic kits#60.10.40.00.00
-unspsc7#60.10.40.05.00#Bacteria teaching kits#60.10.40.00.00
-unspsc7#60.10.40.06.00#Bacteria testing supplies#60.10.40.00.00
-unspsc7#60.10.40.07.00#Enzymology kits or supplies#60.10.40.00.00
-unspsc7#60.10.40.08.00#Protein testing kits or supplies#60.10.40.00.00
-unspsc7#60.10.41.00.00#Body systems and related materials#60.10.00.00.00
-unspsc7#60.10.41.01.00#Body models#60.10.41.00.00
-unspsc7#60.10.41.02.00#Cell models#60.10.41.00.00
-unspsc7#60.10.41.03.00#Cell teaching kits#60.10.41.00.00
-unspsc7#60.10.41.04.00#Body systems teaching kits#60.10.41.00.00
-unspsc7#60.10.41.05.00#Body systems teaching aids#60.10.41.00.00
-unspsc7#60.10.42.00.00#Water testing and conservation and ecology#60.10.00.00.00
-unspsc7#60.10.42.01.00#Water testing chemicals#60.10.42.00.00
-unspsc7#60.10.42.02.00#Water testing and sampling kits#60.10.42.00.00
-unspsc7#60.10.42.03.00#Water models#60.10.42.00.00
-unspsc7#60.10.42.04.00#Water ecology supplies#60.10.42.00.00
-unspsc7#60.10.43.00.00#Astronomy#60.10.00.00.00
-unspsc7#60.10.43.01.00#Astronomy models#60.10.43.00.00
-unspsc7#60.10.43.02.00#Astronomy charts#60.10.43.00.00
-unspsc7#60.10.43.03.00#Astronomy study kits#60.10.43.00.00
-unspsc7#60.10.44.00.00#Geology and earth science#60.10.00.00.00
-unspsc7#60.10.44.01.00#Rock specimen sets#60.10.44.00.00
-unspsc7#60.10.44.02.00#Rock specimens#60.10.44.00.00
-unspsc7#60.10.44.03.00#Fossils#60.10.44.00.00
-unspsc7#60.10.44.04.00#Landform models#60.10.44.00.00
-unspsc7#60.10.44.05.00#Fossil models#60.10.44.00.00
-unspsc7#60.10.44.06.00#Geology tools or field#60.10.44.00.00
-unspsc7#60.10.44.07.00#Stream tables#60.10.44.00.00
-unspsc7#60.10.44.08.00#Geology study kits#60.10.44.00.00
-unspsc7#60.10.45.00.00#Chemistry and electrochemistry and microchemistry#60.10.00.00.00
-unspsc7#60.10.45.01.00#Periodic table posters or boards#60.10.45.00.00
-unspsc7#60.10.45.02.00#Consumer analysis kits#60.10.45.00.00
-unspsc7#60.10.45.03.00#Chemistry class kits#60.10.45.00.00
-unspsc7#60.10.45.04.00#Chemistry demonstration kits#60.10.45.00.00
-unspsc7#60.10.45.05.00#Atomic models#60.10.45.00.00
-unspsc7#60.10.45.06.00#Molecular models#60.10.45.00.00
-unspsc7#60.10.45.07.00#Electrochemical demonstration tools#60.10.45.00.00
-unspsc7#60.10.45.08.00#Electrochemical kits#60.10.45.00.00
-unspsc7#60.10.45.09.00#Fuel cells#60.10.45.00.00
-unspsc7#60.10.45.10.00#Microchemistry kits#60.10.45.00.00
-unspsc7#60.10.45.11.00#Microchemistry tools#60.10.45.00.00
-unspsc7#60.10.46.00.00#Mechanical physics materials#60.10.00.00.00
-unspsc7#60.10.46.01.00#Force tables#60.10.46.00.00
-unspsc7#60.10.46.02.00#Gravity models or model sets#60.10.46.00.00
-unspsc7#60.10.46.04.00#Inclined planes#60.10.46.00.00
-unspsc7#60.10.46.05.00#Friction apparatus#60.10.46.00.00
-unspsc7#60.10.46.06.00#Physic cars#60.10.46.00.00
-unspsc7#60.10.46.07.00#Pendulum apparatus#60.10.46.00.00
-unspsc7#60.10.46.08.00#Torque apparatus#60.10.46.00.00
-unspsc7#60.10.46.09.00#Projectile apparatus#60.10.46.00.00
-unspsc7#60.10.46.10.00#Air tables#60.10.46.00.00
-unspsc7#60.10.46.11.00#Air apparatus#60.10.46.00.00
-unspsc7#60.10.46.12.00#Light or photo apparatus#60.10.46.00.00
-unspsc7#60.10.47.00.00#Energy and power physics materials#60.10.00.00.00
-unspsc7#60.10.47.01.00#Solar collecting devices#60.10.47.00.00
-unspsc7#60.10.47.02.00#Solar kits#60.10.47.00.00
-unspsc7#60.10.47.03.00#Energy demonstration kits#60.10.47.00.00
-unspsc7#60.10.47.04.00#Energy class kits#60.10.47.00.00
-unspsc7#60.10.47.05.00#Matter demonstration kits#60.10.47.00.00
-unspsc7#60.10.47.06.00#Matter class kits#60.10.47.00.00
-unspsc7#60.10.47.07.00#Monometers#60.10.47.00.00
-unspsc7#60.10.47.08.00#Gas diffusion apparatus#60.10.47.00.00
-unspsc7#60.10.48.00.00#Wave and sound physics materials#60.10.00.00.00
-unspsc7#60.10.48.01.00#Wave generators#60.10.48.00.00
-unspsc7#60.10.48.02.00#Wave tanks#60.10.48.00.00
-unspsc7#60.10.48.03.00#Wave springs#60.10.48.00.00
-unspsc7#60.10.48.04.00#Wave demonstration sets#60.10.48.00.00
-unspsc7#60.10.48.05.00#Tuning forks#60.10.48.00.00
-unspsc7#60.10.48.06.00#Doppler demonstrators#60.10.48.00.00
-unspsc7#60.10.48.07.00#Resonance apparatus#60.10.48.00.00
-unspsc7#60.10.48.08.00#Sound meters#60.10.48.00.00
-unspsc7#60.10.48.09.00#Wave apparatus#60.10.48.00.00
-unspsc7#60.10.48.10.00#Spectroscopes#60.10.48.00.00
-unspsc7#60.10.48.11.00#Spectrum charts#60.10.48.00.00
-unspsc7#60.10.48.12.00#Light demonstration kits#60.10.48.00.00
-unspsc7#60.10.48.13.00#Color charts or samples#60.10.48.00.00
-unspsc7#60.10.48.14.00#Radiometer#60.10.48.00.00
-unspsc7#60.10.48.15.00#Reflection or refraction apparatus#60.10.48.00.00
-unspsc7#60.10.48.16.00#Optics sets or kits#60.10.48.00.00
-unspsc7#60.10.49.00.00#Electrical physics materials#60.10.00.00.00
-unspsc7#60.10.49.01.00#Van degraff generators#60.10.49.00.00
-unspsc7#60.10.49.02.00#Electrostatic apparatus#60.10.49.00.00
-unspsc7#60.10.49.03.00#Electrostatic kits#60.10.49.00.00
-unspsc7#60.10.49.04.00#Electricity kits#60.10.49.00.00
-unspsc7#60.10.49.05.00#Electricity demonstration boards#60.10.49.00.00
-unspsc7#60.10.49.06.00#Battery kits#60.10.49.00.00
-unspsc7#60.10.49.07.00#Hand held generators#60.10.49.00.00
-unspsc7#60.10.49.08.00#Electromagnetic apparatus#60.10.49.00.00
-unspsc7#60.10.49.09.00#Magnetism apparatus#60.10.49.00.00
-unspsc7#60.10.49.10.00#Electromagnets#60.10.49.00.00
-unspsc7#60.10.49.11.00#Electric bells#60.10.49.00.00
-unspsc7#60.10.49.12.00#Electric lead wires or cables#60.10.49.00.00
-unspsc7#60.10.50.00.00#Nuclear physics materials#60.10.00.00.00
-unspsc7#60.10.50.01.00#Radioactivity sets#60.10.50.00.00
-unspsc7#60.10.50.02.00#Geiger counters#60.10.50.00.00
-unspsc7#60.10.50.03.00#Electron apparatus#60.10.50.00.00
-unspsc7#60.10.50.04.00#Radiation warning signs#60.10.50.00.00
-unspsc7#60.10.50.05.00#Nuclear physics transparencies#60.10.50.00.00
-unspsc7#60.10.50.06.00#Nuclear physics charts#60.10.50.00.00
-unspsc7#60.10.51.00.00#Rocketry and flight materials and supplies#60.10.00.00.00
-unspsc7#60.10.51.01.00#Rocket sets#60.10.51.00.00
-unspsc7#60.10.51.02.00#Launching apparatus#60.10.51.00.00
-unspsc7#60.10.51.03.00#Altitude measuring devices#60.10.51.00.00
-unspsc7#60.10.51.04.00#Airplane kits#60.10.51.00.00
-unspsc7#60.10.52.00.00#Life skills resources instructional materials#60.10.00.00.00
-unspsc7#60.10.52.01.00#Building listening skills instructional materials#60.10.52.00.00
-unspsc7#60.10.52.02.00#Study skills instructional materials#60.10.52.00.00
-unspsc7#60.10.52.03.00#Test preparation instructional materials#60.10.52.00.00
-unspsc7#60.10.53.00.00#Career education instructional materials#60.10.00.00.00
-unspsc7#60.10.53.01.00#Career education or planning or decision making skills instructional materials#60.10.53.00.00
-unspsc7#60.10.53.02.00#Basic job skills instructional materials#60.10.53.00.00
-unspsc7#60.10.53.03.00#Job search skills instructional materials#60.10.53.00.00
-unspsc7#60.10.53.04.00#Time management skills instructional materials#60.10.53.00.00
-unspsc7#60.10.53.05.00#Interview skills instructional materials#60.10.53.00.00
-unspsc7#60.10.53.06.00#Resume skills instructional materials#60.10.53.00.00
-unspsc7#60.10.53.07.00#Work ethics or attitude training instructional materials#60.10.53.00.00
-unspsc7#60.10.53.08.00#Team building skills instructional materials#60.10.53.00.00
-unspsc7#60.10.53.09.00#Business etiquette instructional materials#60.10.53.00.00
-unspsc7#60.10.54.00.00#Consumer economics and money management and independent living instructional materials#60.10.00.00.00
-unspsc7#60.10.54.01.00#Personal finance or money management education instructional materials#60.10.54.00.00
-unspsc7#60.10.54.02.00#Shopping or consumer skills instructional materials#60.10.54.00.00
-unspsc7#60.10.54.03.00#Independent living instructional materials#60.10.54.00.00
-unspsc7#60.10.54.04.00#Understanding consumer credit or loans instructional materials#60.10.54.00.00
-unspsc7#60.10.54.05.00#Insurance coverage or insurance comparison instructional materials#60.10.54.00.00
-unspsc7#60.10.54.06.00#Home buying instructional materials#60.10.54.00.00
-unspsc7#60.10.54.07.00#Apartment rental instructional materials#60.10.54.00.00
-unspsc7#60.10.54.08.00#Car buying educational aids#60.10.54.00.00
-unspsc7#60.10.54.09.00#Brand marketing or advertising instructional materials#60.10.54.00.00
-unspsc7#60.10.54.10.00#Relationship building or family life skills instructional materials#60.10.54.00.00
-unspsc7#60.10.54.11.00#Developing self concept and self esteem instuctional materials#60.10.54.00.00
-unspsc7#60.10.54.12.00#Violence avoidance education or violence prevention instructional materials#60.10.54.00.00
-unspsc7#60.10.54.13.00#Anger resolution training instructional materials#60.10.54.00.00
-unspsc7#60.10.54.14.00#Teaching patience skills instructional materials#60.10.54.00.00
-unspsc7#60.10.54.15.00#Tolerance training instructional materials#60.10.54.00.00
-unspsc7#60.10.54.16.00#Personal safety instructional materials#60.10.54.00.00
-unspsc7#60.10.54.17.00#Personal conflict resolution instructional materials#60.10.54.00.00
-unspsc7#60.10.54.18.00#Practical teen advice guides#60.10.54.00.00
-unspsc7#60.10.54.19.00#Developing social skills instructional materials#60.10.54.00.00
-unspsc7#60.10.54.20.00#Manners or etiquette or courtesy instructional aids#60.10.54.00.00
-unspsc7#60.10.54.21.00#Understanding or dealing with cultural diversity instructional materials#60.10.54.00.00
-unspsc7#60.10.54.22.00#How to read body language instructional materials#60.10.54.00.00
-unspsc7#60.10.54.23.00#Developing resiliency instructional materials#60.10.54.00.00
-unspsc7#60.10.54.24.00#Understanding community service instructional materials#60.10.54.00.00
-unspsc7#60.10.54.25.00#Developing refusal skills instructional materials#60.10.54.00.00
-unspsc7#60.10.54.26.00#Responsibility or Ddecision making skills instructional materials#60.10.54.00.00
-unspsc7#60.10.54.27.00#Understanding teens legal rights instructional materials#60.10.54.00.00
-unspsc7#60.10.54.28.00#Repercussions of dropping out of school instructional materials#60.10.54.00.00
-unspsc7#60.10.54.29.00#Race relations videos#60.10.54.00.00
-unspsc7#60.10.55.00.00#Home and interior design instructional materials#60.10.00.00.00
-unspsc7#60.10.55.01.00#Feng shui instructional materials#60.10.55.00.00
-unspsc7#60.10.55.02.00#Instructional materials for using color or paint for home decoration#60.10.55.00.00
-unspsc7#60.10.55.03.00#Instructional materials for home planning or design#60.10.55.00.00
-unspsc7#60.10.55.04.00#Landscaping design instructional materials#60.10.55.00.00
-unspsc7#60.10.55.05.00#Instructional materials for home decorating or furnishing#60.10.55.00.00
-unspsc7#60.10.56.00.00#Health education and nutrition and food preparation instructional materials#60.10.00.00.00
-unspsc7#60.10.56.01.00#Dietary guidelines or balanced diets educational resources#60.10.56.00.00
-unspsc7#60.10.56.02.00#Nutritional curriculum menu planning skills instructional materials#60.10.56.00.00
-unspsc7#60.10.56.03.00#Understanding nutrition labeling instructional materials#60.10.56.00.00
-unspsc7#60.10.56.04.00#Food shopping instructional materials#60.10.56.00.00
-unspsc7#60.10.56.05.00#Healthy food choices demonstration units#60.10.56.00.00
-unspsc7#60.10.56.06.00#Understanding the effects of dietary fat instructional materials#60.10.56.00.00
-unspsc7#60.10.56.07.00#Understanding vegetarianism instructional materials#60.10.56.00.00
-unspsc7#60.10.56.08.00#Recipe books or cook books#60.10.56.00.00
-unspsc7#60.10.56.09.00#Eating disorders education instructional materials#60.10.56.00.00
-unspsc7#60.10.56.10.00#Weight control or exercise instructional materials#60.10.56.00.00
-unspsc7#60.10.56.11.00#Kitchen measurements of solids or liquids instructional aids#60.10.56.00.00
-unspsc7#60.10.56.12.00#Kitchen equivalants or kitchen math instructional aids#60.10.56.00.00
-unspsc7#60.10.56.13.00#Kitchen utensils instructional aids#60.10.56.00.00
-unspsc7#60.10.56.14.00#Kitchen safety or sanitation instructional materials#60.10.56.00.00
-unspsc7#60.10.56.15.00#Food safety instructional materials#60.10.56.00.00
-unspsc7#60.10.56.16.00#Food science activities instructional materials#60.10.56.00.00
-unspsc7#60.10.56.17.00#Cooking skills instruction instructional materials#60.10.56.00.00
-unspsc7#60.10.56.18.00#Table manners or eating etiquette instructional materials#60.10.56.00.00
-unspsc7#60.10.56.19.00#Table setting instructional materials#60.10.56.00.00
-unspsc7#60.10.56.20.00#Food service training instructional materials#60.10.56.00.00
-unspsc7#60.10.56.21.00#Drug or tobacco or alcohol abuse education instructional materials#60.10.56.00.00
-unspsc7#60.10.56.22.00#Smoking Simulators#60.10.56.00.00
-unspsc7#60.10.56.23.00#Understanding addiction or addiction avoidance instructional materials#60.10.56.00.00
-unspsc7#60.10.56.24.00#Teen depression symptoms instructional materials#60.10.56.00.00
-unspsc7#60.10.56.25.00#Teen suicide avoidance training instructional materials#60.10.56.00.00
-unspsc7#60.10.56.26.00#Coping with stress instructional materials#60.10.56.00.00
-unspsc7#60.10.57.00.00#Memory books and supplies#60.10.00.00.00
-unspsc7#60.10.57.01.00#Memory books#60.10.57.00.00
-unspsc7#60.10.57.02.00#Memory book posts or extenders#60.10.57.00.00
-unspsc7#60.10.57.03.00#Memory book paper#60.10.57.00.00
-unspsc7#60.10.57.04.00#Acid free memory book glue sticks#60.10.57.00.00
-unspsc7#60.10.57.05.00#Acid free memory book tape#60.10.57.00.00
-unspsc7#60.10.58.00.00#Clothing and textile design instructional materials#60.10.00.00.00
-unspsc7#60.10.58.01.00#Sewing skills instructional materials#60.10.58.00.00
-unspsc7#60.10.58.02.00#Sewing project materials#60.10.58.00.00
-unspsc7#60.10.58.03.00#Understanding clothing construction or workmanship instructional materials#60.10.58.00.00
-unspsc7#60.10.58.04.00#Clothing design or fashion instructional materials#60.10.58.00.00
-unspsc7#60.10.58.05.00#Personal color analysis instructional materials#60.10.58.00.00
-unspsc7#60.10.58.06.00#Fashion merchandising or retail fundamentals instructional materials#60.10.58.00.00
-unspsc7#60.10.58.07.00#Science of fabrics or fibers instructional materials#60.10.58.00.00
-unspsc7#60.10.58.08.00#Clothing care or maintenance or laundering instructional materials#60.10.58.00.00
-unspsc7#60.10.58.09.00#Materials for teaching the art of design color on fabric#60.10.58.00.00
-unspsc7#60.10.58.10.00#Fabric dyes or paints instructional materials#60.10.58.00.00
-unspsc7#60.10.58.11.00#Quilting projects instructional materials#60.10.58.00.00
-unspsc7#60.10.59.00.00#Dating and sex and teen pregnancy and parenting skills and child development instructional materials#60.10.00.00.00
-unspsc7#60.10.59.01.00#Sex education or sexually transmitted disease instructional materials#60.10.59.00.00
-unspsc7#60.10.59.02.00#Prenatal nutrition resources or fetal abuse instructional materials#60.10.59.00.00
-unspsc7#60.10.59.03.00#Parenting skills instructional materials#60.10.59.00.00
-unspsc7#60.10.59.04.00#Child development instructional materials#60.10.59.00.00
-unspsc7#60.10.59.05.00#Understanding date rape or dating skills or harassment instructional materials#60.10.59.00.00
-unspsc7#60.10.59.06.00#Childbirth education instructional materials#60.10.59.00.00
-unspsc7#60.10.59.07.00#Pregnancy from conception through birth instructional materials#60.10.59.00.00
-unspsc7#60.10.59.08.00#Understanding the risks of birth defects instructional materials#60.10.59.00.00
-unspsc7#60.10.59.09.00#Pregnancy simulators#60.10.59.00.00
-unspsc7#60.10.59.10.00#Infant simulators and accessories#60.10.59.00.00
-unspsc7#60.10.59.11.00#Infant care training instructional materials#60.10.59.00.00
-unspsc7#60.10.59.12.00#Understanding physical or emotional child abuse instructional materials#60.10.59.00.00
-unspsc7#60.10.59.13.00#Discipline skill education instructional materials for parents#60.10.59.00.00
-unspsc7#60.10.59.14.00#Home safety or childproofing instructional materials#60.10.59.00.00
-unspsc7#60.10.59.15.00#Cardio pulmonary resusitation or  basic life support instructional materials#60.10.59.00.00
-unspsc7#60.10.59.16.00#Understanding childhood illnesses instructional materials#60.10.59.00.00
-unspsc7#60.10.59.17.00#Understanding attention deficit hyperactivity disorder instructional materials#60.10.59.00.00
-unspsc7#60.10.59.18.00#Child caregiver instructional materials#60.10.59.00.00
-unspsc7#60.10.59.19.00#Babysitting instructional materials#60.10.59.00.00
-unspsc7#60.10.60.00.00#Curriculum guides and projects and activities and lessons#60.10.00.00.00
-unspsc7#60.10.60.01.00#Middle school curriculum resource or idea books#60.10.60.00.00
-unspsc7#60.10.60.02.00#High School curriculum resource or idea books#60.10.60.00.00
-unspsc7#60.10.60.03.00#Home economics independent study projects#60.10.60.00.00
-unspsc7#60.10.60.04.00#Home economics projects or activities resources or guides#60.10.60.00.00
-unspsc7#60.10.61.00.00#Vocational teaching aids and materials#60.10.00.00.00
-unspsc7#60.10.61.01.00#Automotive teaching aids or materials#60.10.61.00.00
-unspsc7#60.10.61.02.00#Construction teaching aids or materials#60.10.61.00.00
-unspsc7#60.10.61.03.00#Drafting or design teaching aids or materials#60.10.61.00.00
-unspsc7#60.10.61.04.00#Electronics or electricity teaching aids or materials#60.10.61.00.00
-unspsc7#60.10.61.05.00#Graphic arts or photography teaching aids or materials#60.10.61.00.00
-unspsc7#60.10.61.06.00#Horticulture teaching aids or materials#60.10.61.00.00
-unspsc7#60.10.61.07.00#Manufacturing teaching aids or materials#60.10.61.00.00
-unspsc7#60.10.62.00.00#Technology teaching aids and materials#60.10.00.00.00
-unspsc7#60.10.62.01.00#Agriculture teaching aids or materials#60.10.62.00.00
-unspsc7#60.10.62.02.00#Biotechnology teaching aids or materials#60.10.62.00.00
-unspsc7#60.10.62.03.00#Communications teaching aids or materials#60.10.62.00.00
-unspsc7#60.10.62.04.00#Computer science teaching aids or materials#60.10.62.00.00
-unspsc7#60.10.62.05.00#Energy or power teaching aids or materials#60.10.62.00.00
-unspsc7#60.10.62.06.00#Environmental teaching aids or materials#60.10.62.00.00
-unspsc7#60.10.62.07.00#Materials teaching aids or materials#60.10.62.00.00
-unspsc7#60.10.62.08.00#Medical teaching aids or materials#60.10.62.00.00
-unspsc7#60.10.62.09.00#Transportation teaching aids or materials#60.10.62.00.00
-unspsc7#60.10.63.00.00#Forensic science teaching equipment and supplies#60.10.00.00.00
-unspsc7#60.10.63.01.00#Forensic science kits#60.10.63.00.00
-unspsc7#60.10.64.00.00#Electronics teaching supplies and equipment#60.10.00.00.00
-unspsc7#60.10.64.01.00#Electronics kits#60.10.64.00.00
-unspsc7#60.10.64.02.00#Electronics teaching supplies#60.10.64.00.00
-unspsc7#60.10.64.03.00#Forensic science teaching supplies#60.10.64.00.00
-unspsc7#60.11.00.00.00#Classroom decoratives and supplies#60.00.00.00.00
-unspsc7#60.11.10.00.00#Classroom Charts or classroom posters#60.11.00.00.00
-unspsc7#60.11.10.01.00#Chart packs#60.11.10.00.00
-unspsc7#60.11.10.02.00#Classroom charts#60.11.10.00.00
-unspsc7#60.11.10.03.00#Classroom posters or sets#60.11.10.00.00
-unspsc7#60.11.10.04.00#Do it yourself posters#60.11.10.00.00
-unspsc7#60.11.11.00.00#Bulletin board sets#60.11.00.00.00
-unspsc7#60.11.11.01.00#Big bulletin board sets#60.11.11.00.00
-unspsc7#60.11.11.02.00#Calendar bulleting board sets#60.11.11.00.00
-unspsc7#60.11.11.03.00#Early childhood bulletin board sets#60.11.11.00.00
-unspsc7#60.11.11.04.00#Language bulletin board sets#60.11.11.00.00
-unspsc7#60.11.11.05.00#Math bulletin board sets#60.11.11.00.00
-unspsc7#60.11.11.06.00#Multipurpose bulletin board sets#60.11.11.00.00
-unspsc7#60.11.11.07.00#Science bulletin board sets#60.11.11.00.00
-unspsc7#60.11.11.08.00#Seasonal bulletin board sets#60.11.11.00.00
-unspsc7#60.11.11.09.00#Social studies bulletin board sets#60.11.11.00.00
-unspsc7#60.11.12.00.00#Bulletin board borders and trimmers#60.11.00.00.00
-unspsc7#60.11.12.01.00#Classroom banners#60.11.12.00.00
-unspsc7#60.11.12.02.00#Border packs#60.11.12.00.00
-unspsc7#60.11.12.03.00#Classroom headers#60.11.12.00.00
-unspsc7#60.11.12.04.00#Corriguated borders or trimmers#60.11.12.00.00
-unspsc7#60.11.12.05.00#Die cut shaped scalloped borders or trimmers#60.11.12.00.00
-unspsc7#60.11.12.06.00#Sparkle borders or trimmers#60.11.12.00.00
-unspsc7#60.11.12.07.00#Straight borders or trimmers#60.11.12.00.00
-unspsc7#60.11.12.08.00#Border or Trimmer storage#60.11.12.00.00
-unspsc7#60.11.13.00.00#Decorative letters and numbers#60.11.00.00.00
-unspsc7#60.11.13.01.00#Lettered or numbered blocks#60.11.13.00.00
-unspsc7#60.11.13.02.00#Casual letters or numbers#60.11.13.00.00
-unspsc7#60.11.13.03.00#Italic letters or numbers#60.11.13.00.00
-unspsc7#60.11.13.04.00#Self adhesive letters or numbers#60.11.13.00.00
-unspsc7#60.11.13.05.00#Sparkle letters or numbers#60.11.13.00.00
-unspsc7#60.11.13.06.00#Tracing letters or numbers#60.11.13.00.00
-unspsc7#60.11.14.00.00#Specialty decoratives for the classroom and decorative accessories#60.11.00.00.00
-unspsc7#60.11.14.01.00#Classroom decorative kits#60.11.14.00.00
-unspsc7#60.11.14.02.00#Door decorations#60.11.14.00.00
-unspsc7#60.11.14.03.00#Mobiles#60.11.14.00.00
-unspsc7#60.11.14.04.00#Two sided decorations#60.11.14.00.00
-unspsc7#60.11.14.05.00#Window cling decorations#60.11.14.00.00
-unspsc7#60.11.14.07.00#Decorative Storage Systems#60.11.14.00.00
-unspsc7#60.11.14.08.00#Decorative tapes or twists#60.11.14.00.00
-unspsc7#60.11.14.09.00#Decorative buttons#60.11.14.00.00
-unspsc7#60.11.14.10.00#Decorative shapes or strings#60.11.14.00.00
-unspsc7#60.12.00.00.00#Arts and crafts equipment and accessories and supplies#60.00.00.00.00
-unspsc7#60.12.10.00.00#Art#60.12.00.00.00
-unspsc7#60.12.10.01.00#Paintings#60.12.10.00.00
-unspsc7#60.12.10.02.00#Sculptures#60.12.10.00.00
-unspsc7#60.12.10.03.00#Statuary#60.12.10.00.00
-unspsc7#60.12.10.04.00#Portraits#60.12.10.00.00
-unspsc7#60.12.10.05.00#Drawings#60.12.10.00.00
-unspsc7#60.12.10.06.00#Pictures#60.12.10.00.00
-unspsc7#60.12.10.07.00#Lithographs#60.12.10.00.00
-unspsc7#60.12.10.08.00#Posters#60.12.10.00.00
-unspsc7#60.12.10.09.00#Decorative pot#60.12.10.00.00
-unspsc7#60.12.10.10.00#Scrolls#60.12.10.00.00
-unspsc7#60.12.10.11.00#Photographs#60.12.10.00.00
-unspsc7#60.12.11.00.00#Canvases and films and boards and artists papers#60.12.00.00.00
-unspsc7#60.12.11.01.00#Sulphite drawing paper#60.12.11.00.00
-unspsc7#60.12.11.02.00#Groundwood drawing paper#60.12.11.00.00
-unspsc7#60.12.11.03.00#Tracing or vellum drawing paper#60.12.11.00.00
-unspsc7#60.12.11.04.00#Bond drawing paper#60.12.11.00.00
-unspsc7#60.12.11.05.00#Charcoal or pastel drawing paper#60.12.11.00.00
-unspsc7#60.12.11.06.00#Bristol drawing paper#60.12.11.00.00
-unspsc7#60.12.11.07.00#Watercolor paper sheets#60.12.11.00.00
-unspsc7#60.12.11.08.00#Watercolor paper pads#60.12.11.00.00
-unspsc7#60.12.11.09.00#Watercolor paper blocks#60.12.11.00.00
-unspsc7#60.12.11.10.00#Finger paint paper#60.12.11.00.00
-unspsc7#60.12.11.11.00#Sulphite construction paper#60.12.11.00.00
-unspsc7#60.12.11.12.00#Groundwood construction paper#60.12.11.00.00
-unspsc7#60.12.11.13.00#Foil construction paper#60.12.11.00.00
-unspsc7#60.12.11.14.00#Origami craft papers#60.12.11.00.00
-unspsc7#60.12.11.15.00#Paper or plastic Confetti#60.12.11.00.00
-unspsc7#60.12.11.16.00#Crepe paper for crafts#60.12.11.00.00
-unspsc7#60.12.11.17.00#Craft tissue paper#60.12.11.00.00
-unspsc7#60.12.11.18.00#Corrugated craft paper#60.12.11.00.00
-unspsc7#60.12.11.19.00#Pattern printed craft paper#60.12.11.00.00
-unspsc7#60.12.11.20.00#Self adhesive craft paper#60.12.11.00.00
-unspsc7#60.12.11.21.00#Glow in the dark paper#60.12.11.00.00
-unspsc7#60.12.11.23.00#Hand made paper#60.12.11.00.00
-unspsc7#60.12.11.24.00#Kraft paper#60.12.11.00.00
-unspsc7#60.12.11.25.00#Canvas panels#60.12.11.00.00
-unspsc7#60.12.11.26.00#Prestretched canvas#60.12.11.00.00
-unspsc7#60.12.11.27.00#Primed canvas#60.12.11.00.00
-unspsc7#60.12.11.28.00#Unprimed canvas#60.12.11.00.00
-unspsc7#60.12.11.29.00#Masonite panels#60.12.11.00.00
-unspsc7#60.12.11.30.00#Canvas like paper pads#60.12.11.00.00
-unspsc7#60.12.11.31.00#Japanese printmaking paper#60.12.11.00.00
-unspsc7#60.12.11.32.00#Lithography or intaglio printmaking paper#60.12.11.00.00
-unspsc7#60.12.11.33.00#Blockprinting printmaking paper#60.12.11.00.00
-unspsc7#60.12.11.34.00#Foil paper#60.12.11.00.00
-unspsc7#60.12.11.35.00#Acetate or vinyl or polyester films#60.12.11.00.00
-unspsc7#60.12.11.36.00#Cellophane films#60.12.11.00.00
-unspsc7#60.12.11.37.00#Acrylic sheets#60.12.11.00.00
-unspsc7#60.12.11.38.00#Illustration boards#60.12.11.00.00
-unspsc7#60.12.11.39.00#Mat boards#60.12.11.00.00
-unspsc7#60.12.11.40.00#Mounting board#60.12.11.00.00
-unspsc7#60.12.11.41.00#Foam core mounting board#60.12.11.00.00
-unspsc7#60.12.11.42.00#Tagboard or railroad board#60.12.11.00.00
-unspsc7#60.12.11.43.00#Display board#60.12.11.00.00
-unspsc7#60.12.11.44.00#Scratch art papers#60.12.11.00.00
-unspsc7#60.12.11.45.00#Scratch art boards#60.12.11.00.00
-unspsc7#60.12.11.46.00#Scratch art accessories#60.12.11.00.00
-unspsc7#60.12.12.00.00#Classroom and fine art paint and mediums and applicators and accessories#60.12.00.00.00
-unspsc7#60.12.12.01.00#Traditional liquid tempera paint#60.12.12.00.00
-unspsc7#60.12.12.02.00#Contemporary liquid tempera paint#60.12.12.00.00
-unspsc7#60.12.12.03.00#Powdered tempera paint#60.12.12.00.00
-unspsc7#60.12.12.04.00#Washable tempera paint#60.12.12.00.00
-unspsc7#60.12.12.05.00#Tempera cakes#60.12.12.00.00
-unspsc7#60.12.12.06.00#Liquid face or body paint#60.12.12.00.00
-unspsc7#60.12.12.07.00#Cake face or body paint#60.12.12.00.00
-unspsc7#60.12.12.08.00#Marker face or body paint#60.12.12.00.00
-unspsc7#60.12.12.09.00#Temporary tattoo paint#60.12.12.00.00
-unspsc7#60.12.12.10.00#Washable finger paint#60.12.12.00.00
-unspsc7#60.12.12.11.00#School style acrylic paint#60.12.12.00.00
-unspsc7#60.12.12.12.00#Acrylic airbrush paint#60.12.12.00.00
-unspsc7#60.12.12.13.00#Synthetic heat treated oil paint or mediums#60.12.12.00.00
-unspsc7#60.12.12.14.00#Water soluble oil paint or mediums#60.12.12.00.00
-unspsc7#60.12.12.15.00#Low viscosity removable glass or ceramic paint#60.12.12.00.00
-unspsc7#60.12.12.16.00#Low viscosity permanent glass or ceramic paint#60.12.12.00.00
-unspsc7#60.12.12.17.00#High viscosity Gel removable glass or ceramic paint#60.12.12.00.00
-unspsc7#60.12.12.18.00#High viscosity Gel permanent glass or ceramic paint#60.12.12.00.00
-unspsc7#60.12.12.19.00#Oven baked glass or ceramic paint#60.12.12.00.00
-unspsc7#60.12.12.20.00#Marker delivery system glass or ceramic paint#60.12.12.00.00
-unspsc7#60.12.12.21.00#Pan watercolor paint#60.12.12.00.00
-unspsc7#60.12.12.22.00#Tube watercolor paint#60.12.12.00.00
-unspsc7#60.12.12.23.00#Liquid watercolor paint#60.12.12.00.00
-unspsc7#60.12.12.24.00#Liquid watercolor frisket paint#60.12.12.00.00
-unspsc7#60.12.12.25.00#Watercolor painting mediums#60.12.12.00.00
-unspsc7#60.12.12.26.00#Watercolor brushes#60.12.12.00.00
-unspsc7#60.12.12.27.00#Oriental brushes#60.12.12.00.00
-unspsc7#60.12.12.28.00#Utility brushes#60.12.12.00.00
-unspsc7#60.12.12.29.00#Specialty brushes#60.12.12.00.00
-unspsc7#60.12.12.30.00#Easel brushes#60.12.12.00.00
-unspsc7#60.12.12.31.00#Palette knives#60.12.12.00.00
-unspsc7#60.12.12.32.00#Brayers for hand printing#60.12.12.00.00
-unspsc7#60.12.12.33.00#Sponge stamps#60.12.12.00.00
-unspsc7#60.12.12.34.00#Scrapers for paint application#60.12.12.00.00
-unspsc7#60.12.12.35.00#Pipettes for paint or dye mixing#60.12.12.00.00
-unspsc7#60.12.12.36.00#Combs or tools for paint or ink application#60.12.12.00.00
-unspsc7#60.12.12.37.00#Palettes for paint or ink mixing#60.12.12.00.00
-unspsc7#60.12.12.38.00#Paint pots for paint storage or mixing#60.12.12.00.00
-unspsc7#60.12.12.39.00#Paint cups or bottles#60.12.12.00.00
-unspsc7#60.12.12.41.00#Brush or tool cleaners#60.12.12.00.00
-unspsc7#60.12.12.42.00#Paint aprons#60.12.12.00.00
-unspsc7#60.12.12.43.00#Artists Smocks#60.12.12.00.00
-unspsc7#60.12.12.44.00#Stretcher strips#60.12.12.00.00
-unspsc7#60.12.12.45.00#Canvas stretchers#60.12.12.00.00
-unspsc7#60.12.12.46.00#Metal easels#60.12.12.00.00
-unspsc7#60.12.12.47.00#Wood easels#60.12.12.00.00
-unspsc7#60.12.12.48.00#Table top easels#60.12.12.00.00
-unspsc7#60.12.12.49.00#Presentation easels#60.12.12.00.00
-unspsc7#60.12.13.00.00#Art and craft cutting products#60.12.00.00.00
-unspsc7#60.12.13.01.00#Guillotine paper trimmers#60.12.13.00.00
-unspsc7#60.12.13.02.00#Mat cutter#60.12.13.00.00
-unspsc7#60.12.13.03.00#Mat knives#60.12.13.00.00
-unspsc7#60.12.13.04.00#Artist knives#60.12.13.00.00
-unspsc7#60.12.13.05.00#Rotary paper or fabric cutter#60.12.13.00.00
-unspsc7#60.12.13.06.00#Circle or oval paper cutters#60.12.13.00.00
-unspsc7#60.12.14.00.00#Picture Framing#60.12.00.00.00
-unspsc7#60.12.14.01.00#Pre assembled wood picture frames#60.12.14.00.00
-unspsc7#60.12.14.02.00#Wood section picture frames#60.12.14.00.00
-unspsc7#60.12.14.03.00#Pre assembled metal picture frames#60.12.14.00.00
-unspsc7#60.12.14.04.00#Metal section picture frames#60.12.14.00.00
-unspsc7#60.12.14.05.00#Adjustable picture frames#60.12.14.00.00
-unspsc7#60.12.14.06.00#Plastic picture frames#60.12.14.00.00
-unspsc7#60.12.14.07.00#Clear box picture frame#60.12.14.00.00
-unspsc7#60.12.14.08.00#Point drivers or accessories for picture frames#60.12.14.00.00
-unspsc7#60.12.14.09.00#Mitre box#60.12.14.00.00
-unspsc7#60.12.14.10.00#Picture Hanging devices#60.12.14.00.00
-unspsc7#60.12.14.11.00#Acrylic panels for picture frames#60.12.14.00.00
-unspsc7#60.12.14.12.00#Glass panels for picture frames#60.12.14.00.00
-unspsc7#60.12.15.00.00#Drawing tools and supplies and accessories#60.12.00.00.00
-unspsc7#60.12.15.01.00#Water based markers#60.12.15.00.00
-unspsc7#60.12.15.02.00#Solvent based markers#60.12.15.00.00
-unspsc7#60.12.15.03.00#Washable markers#60.12.15.00.00
-unspsc7#60.12.15.04.00#Calligraphy markers#60.12.15.00.00
-unspsc7#60.12.15.05.00#Fabric markers#60.12.15.00.00
-unspsc7#60.12.15.06.00#Metallic markers#60.12.15.00.00
-unspsc7#60.12.15.07.00#Tempera or chalk window markers#60.12.15.00.00
-unspsc7#60.12.15.08.00#Paint markers#60.12.15.00.00
-unspsc7#60.12.15.09.00#Wax based crayons#60.12.15.00.00
-unspsc7#60.12.15.10.00#Soy based crayons#60.12.15.00.00
-unspsc7#60.12.15.11.00#Specialty crayons#60.12.15.00.00
-unspsc7#60.12.15.12.00#Watercolor crayons#60.12.15.00.00
-unspsc7#60.12.15.13.00#Dry pastel#60.12.15.00.00
-unspsc7#60.12.15.14.00#Chalk pastel#60.12.15.00.00
-unspsc7#60.12.15.15.00#Oil based pastel#60.12.15.00.00
-unspsc7#60.12.15.16.00#Compressed charcoal#60.12.15.00.00
-unspsc7#60.12.15.17.00#Vine charcoal#60.12.15.00.00
-unspsc7#60.12.15.18.00#Graphite pencils#60.12.15.00.00
-unspsc7#60.12.15.19.00#Wax based colored drawing pencils#60.12.15.00.00
-unspsc7#60.12.15.20.00#Charcoal pencils#60.12.15.00.00
-unspsc7#60.12.15.21.00#Watercolor pencils#60.12.15.00.00
-unspsc7#60.12.15.22.00#Waterbased pens#60.12.15.00.00
-unspsc7#60.12.15.23.00#Permanent pens#60.12.15.00.00
-unspsc7#60.12.15.24.00#Gel pens#60.12.15.00.00
-unspsc7#60.12.15.25.00#Technical pens#60.12.15.00.00
-unspsc7#60.12.15.26.00#Calligraphy pens#60.12.15.00.00
-unspsc7#60.12.15.28.00#Water based drawing ink#60.12.15.00.00
-unspsc7#60.12.15.29.00#Solvent based drawing ink#60.12.15.00.00
-unspsc7#60.12.15.30.00#Calligraphy drawing ink#60.12.15.00.00
-unspsc7#60.12.15.31.00#Pink pencil erasers#60.12.15.00.00
-unspsc7#60.12.15.32.00#Kneaded erasers#60.12.15.00.00
-unspsc7#60.12.15.33.00#Vinyl erasers#60.12.15.00.00
-unspsc7#60.12.15.34.00#Plastic erasers#60.12.15.00.00
-unspsc7#60.12.15.35.00#Gum erasers#60.12.15.00.00
-unspsc7#60.12.16.00.00#Studio aids#60.12.00.00.00
-unspsc7#60.12.16.01.00#Wood Mannequins#60.12.16.00.00
-unspsc7#60.12.16.02.00#Clear acrylic mirrors or panels#60.12.16.00.00
-unspsc7#60.12.16.03.00#Plastic Rubbing plates#60.12.16.00.00
-unspsc7#60.12.16.04.00#Studio aid accessories#60.12.16.00.00
-unspsc7#60.12.16.05.00#Anatomical models#60.12.16.00.00
-unspsc7#60.12.17.00.00#Printmaking supplies and accessories#60.12.00.00.00
-unspsc7#60.12.17.01.00#Rubber stamping stamps#60.12.17.00.00
-unspsc7#60.12.17.02.00#Rubber stamping stamp pads#60.12.17.00.00
-unspsc7#60.12.17.03.00#Rubber stamping accessories#60.12.17.00.00
-unspsc7#60.12.17.04.00#Linoleum for block printing#60.12.17.00.00
-unspsc7#60.12.17.05.00#Wood blocks for printing#60.12.17.00.00
-unspsc7#60.12.17.06.00#Synthetic blocks for printing#60.12.17.00.00
-unspsc7#60.12.17.07.00#Block printing accessories#60.12.17.00.00
-unspsc7#60.12.17.08.00#Intaglio or lithography plates#60.12.17.00.00
-unspsc7#60.12.17.09.00#Intaglio or lithography blankets#60.12.17.00.00
-unspsc7#60.12.17.10.00#Intaglio or lithography wipes#60.12.17.00.00
-unspsc7#60.12.17.11.00#Intaglio or lithography hot plates#60.12.17.00.00
-unspsc7#60.12.17.12.00#Intaglio or lithography printing presses#60.12.17.00.00
-unspsc7#60.12.17.13.00#Printing Barens and Brayers#60.12.17.00.00
-unspsc7#60.12.17.14.00#Intaglio Etching or engraving tools#60.12.17.00.00
-unspsc7#60.12.17.15.00#Silkscreen screens or printing stations#60.12.17.00.00
-unspsc7#60.12.17.16.00#Silkscreen accessories#60.12.17.00.00
-unspsc7#60.12.18.00.00#Printing and drawing inks#60.12.00.00.00
-unspsc7#60.12.18.01.00#Water based poster inks#60.12.18.00.00
-unspsc7#60.12.18.02.00#Water based acrylic inks#60.12.18.00.00
-unspsc7#60.12.18.03.00#Oil based silkscreen inks#60.12.18.00.00
-unspsc7#60.12.18.04.00#Water based Textile inks#60.12.18.00.00
-unspsc7#60.12.18.05.00#Oil based textile inks#60.12.18.00.00
-unspsc7#60.12.18.06.00#Printmaking sublimation inks#60.12.18.00.00
-unspsc7#60.12.18.07.00#Oil based intaglio or lithography inks#60.12.18.00.00
-unspsc7#60.12.18.08.00#Oil based monoprint inks#60.12.18.00.00
-unspsc7#60.12.18.09.00#Water based monoprint inks#60.12.18.00.00
-unspsc7#60.12.18.10.00#Water based drawing inks#60.12.18.00.00
-unspsc7#60.12.18.11.00#Solvent based drawing inks#60.12.18.00.00
-unspsc7#60.12.18.12.00#Calligraphy drawing inks#60.12.18.00.00
-unspsc7#60.12.18.13.00#Silkscreen inks#60.12.18.00.00
-unspsc7#60.12.19.00.00#Art fabric and fabric decoration materials and supplies#60.12.00.00.00
-unspsc7#60.12.19.01.00#Muslin#60.12.19.00.00
-unspsc7#60.12.19.02.00#Felt#60.12.19.00.00
-unspsc7#60.12.19.03.00#Craft fur#60.12.19.00.00
-unspsc7#60.12.19.04.00#Cotton blends#60.12.19.00.00
-unspsc7#60.12.19.05.00#Canvas imprintables#60.12.19.00.00
-unspsc7#60.12.19.06.00#Pre sensitized imprintables#60.12.19.00.00
-unspsc7#60.12.19.07.00#Cotton imprintables#60.12.19.00.00
-unspsc7#60.12.19.08.00#Blended imprintables#60.12.19.00.00
-unspsc7#60.12.19.09.00#Batik waxes#60.12.19.00.00
-unspsc7#60.12.19.10.00#Batik accessories#60.12.19.00.00
-unspsc7#60.12.19.11.00#Batik fabric#60.12.19.00.00
-unspsc7#60.12.20.00.00#Sewing and stitchery and weaving equipment and accessories#60.12.00.00.00
-unspsc7#60.12.20.01.00#Weaving or tapestry needles#60.12.20.00.00
-unspsc7#60.12.20.02.00#Weaving accessories#60.12.20.00.00
-unspsc7#60.12.20.03.00#Hand sewing needles#60.12.20.00.00
-unspsc7#60.12.20.04.00#String art kits#60.12.20.00.00
-unspsc7#60.12.20.05.00#Hand looms#60.12.20.00.00
-unspsc7#60.12.20.06.00#Table looms#60.12.20.00.00
-unspsc7#60.12.20.07.00#Floor looms#60.12.20.00.00
-unspsc7#60.12.20.08.00#Rexlace#60.12.20.00.00
-unspsc7#60.12.20.09.00#Lacing or stringing accessories#60.12.20.00.00
-unspsc7#60.12.21.00.00#Candlemaking#60.12.00.00.00
-unspsc7#60.12.21.01.00#Candlemaking wicks#60.12.21.00.00
-unspsc7#60.12.21.02.00#Candlemaking forms#60.12.21.00.00
-unspsc7#60.12.21.03.00#Candlemaking accessories#60.12.21.00.00
-unspsc7#60.12.22.00.00#Wood crafts#60.12.00.00.00
-unspsc7#60.12.22.01.00#Wood craft materials#60.12.22.00.00
-unspsc7#60.12.22.02.00#Finishing materials#60.12.22.00.00
-unspsc7#60.12.22.03.00#Wood burning tools#60.12.22.00.00
-unspsc7#60.12.22.04.00#Carving tools#60.12.22.00.00
-unspsc7#60.12.23.00.00#Basketry making supplies#60.12.00.00.00
-unspsc7#60.12.23.01.00#Basketry reed#60.12.23.00.00
-unspsc7#60.12.23.02.00#Basketry project kits#60.12.23.00.00
-unspsc7#60.12.24.00.00#Stained glass making supplies#60.12.00.00.00
-unspsc7#60.12.24.01.00#Stained Glass fragments#60.12.24.00.00
-unspsc7#60.12.24.02.00#Stained glass tools or accessories#60.12.24.00.00
-unspsc7#60.12.25.00.00#Paper crafts and hand made papermaking#60.12.00.00.00
-unspsc7#60.12.25.01.00#Paper shaping tools#60.12.25.00.00
-unspsc7#60.12.25.02.00#Paper picture frames#60.12.25.00.00
-unspsc7#60.12.25.03.00#Paper plates or trays#60.12.25.00.00
-unspsc7#60.12.25.04.00#Paper filters#60.12.25.00.00
-unspsc7#60.12.25.05.00#Corrugated cardboard shapes#60.12.25.00.00
-unspsc7#60.12.25.06.00#Paper Doilies#60.12.25.00.00
-unspsc7#60.12.25.07.00#Deckles or molds for hand made paper#60.12.25.00.00
-unspsc7#60.12.25.08.00#Couch sheets or felts for hand made paper#60.12.25.00.00
-unspsc7#60.12.25.09.00#Pulp or raw materials for hand made paper#60.12.25.00.00
-unspsc7#60.12.26.00.00#Mosaics#60.12.00.00.00
-unspsc7#60.12.26.01.00#Mosaic tiles#60.12.26.00.00
-unspsc7#60.12.26.02.00#Mosaic molds#60.12.26.00.00
-unspsc7#60.12.26.03.00#Mosaic tools#60.12.26.00.00
-unspsc7#60.12.26.04.00#Mosaic accessories#60.12.26.00.00
-unspsc7#60.12.27.00.00#Enameling paints and accessories#60.12.00.00.00
-unspsc7#60.12.27.01.00#Enameling paints or mediums#60.12.27.00.00
-unspsc7#60.12.27.02.00#Copper shapes#60.12.27.00.00
-unspsc7#60.12.27.03.00#Enameling accessories#60.12.27.00.00
-unspsc7#60.12.27.04.00#Enameling Kilns#60.12.27.00.00
-unspsc7#60.12.28.00.00#Maskmaking#60.12.00.00.00
-unspsc7#60.12.28.01.00#Maskmaking forms#60.12.28.00.00
-unspsc7#60.12.29.00.00#Beads or beading accessories#60.12.00.00.00
-unspsc7#60.12.29.01.00#Seed beads#60.12.29.00.00
-unspsc7#60.12.29.02.00#Pony beads#60.12.29.00.00
-unspsc7#60.12.29.03.00#Wood beads#60.12.29.00.00
-unspsc7#60.12.29.04.00#Straw beads#60.12.29.00.00
-unspsc7#60.12.29.05.00#Ceramic beads#60.12.29.00.00
-unspsc7#60.12.29.06.00#Glass beads#60.12.29.00.00
-unspsc7#60.12.29.07.00#Assorted or decorative beads#60.12.29.00.00
-unspsc7#60.12.29.08.00#Bead accessories#60.12.29.00.00
-unspsc7#60.12.30.00.00#Foam crafts#60.12.00.00.00
-unspsc7#60.12.30.01.00#Styrofoam shapes#60.12.30.00.00
-unspsc7#60.12.30.02.00#Tools for foam crafts#60.12.30.00.00
-unspsc7#60.12.31.00.00#Chenille stem crafts#60.12.00.00.00
-unspsc7#60.12.31.01.00#Jumbo chenille stems#60.12.31.00.00
-unspsc7#60.12.31.02.00#Cotton chenille stems#60.12.31.00.00
-unspsc7#60.12.31.03.00#Bumps chenille stems#60.12.31.00.00
-unspsc7#60.12.32.00.00#Ribbon making materials#60.12.00.00.00
-unspsc7#60.12.32.01.00#Paper ribbons#60.12.32.00.00
-unspsc7#60.12.32.02.00#Silk ribbons#60.12.32.00.00
-unspsc7#60.12.32.03.00#Synthetic ribbons#60.12.32.00.00
-unspsc7#60.12.32.04.00#Decorative ribbons#60.12.32.00.00
-unspsc7#60.12.33.00.00#Craft Poms#60.12.00.00.00
-unspsc7#60.12.33.01.00#Acrylic craft poms#60.12.33.00.00
-unspsc7#60.12.33.02.00#Glitter craft poms#60.12.33.00.00
-unspsc7#60.12.33.03.00#Craft pom beadz#60.12.33.00.00
-unspsc7#60.12.34.00.00#Wiggle eyes materials#60.12.00.00.00
-unspsc7#60.12.34.01.00#Non self adhesive wiggle eyes#60.12.34.00.00
-unspsc7#60.12.34.02.00#Self adhesive wiggle eyes#60.12.34.00.00
-unspsc7#60.12.34.03.00#Decorative wiggle eyes#60.12.34.00.00
-unspsc7#60.12.35.00.00#Leather craft materials#60.12.00.00.00
-unspsc7#60.12.35.01.00#Leather or leather lacing materials#60.12.35.00.00
-unspsc7#60.12.35.02.00#Leather accessories#60.12.35.00.00
-unspsc7#60.12.36.00.00#Glitter#60.12.00.00.00
-unspsc7#60.12.36.01.00#Glitter glue#60.12.36.00.00
-unspsc7#60.12.36.02.00#Glitter dots#60.12.36.00.00
-unspsc7#60.12.36.03.00#Glitter jewels#60.12.36.00.00
-unspsc7#60.12.36.04.00#Plastic glitter#60.12.36.00.00
-unspsc7#60.12.36.05.00#Irridescent glitter#60.12.36.00.00
-unspsc7#60.12.36.06.00#Metallic glitter#60.12.36.00.00
-unspsc7#60.12.37.00.00#Macrame craft materials and accessories#60.12.00.00.00
-unspsc7#60.12.37.01.00#Macrame cord#60.12.37.00.00
-unspsc7#60.12.37.02.00#Macrame beads#60.12.37.00.00
-unspsc7#60.12.37.03.00#Macrame accessories#60.12.37.00.00
-unspsc7#60.12.38.00.00#Marbling supplies and accessories#60.12.00.00.00
-unspsc7#60.12.38.01.00#Marbling inks#60.12.38.00.00
-unspsc7#60.12.38.02.00#Marbling accessories#60.12.38.00.00
-unspsc7#60.12.39.00.00#Sequins and trims#60.12.00.00.00
-unspsc7#60.12.39.01.00#Decorative sequins or trims#60.12.39.00.00
-unspsc7#60.12.40.00.00#Cork craft supplies and accessories#60.12.00.00.00
-unspsc7#60.12.40.01.00#Cork sheets#60.12.40.00.00
-unspsc7#60.12.40.02.00#Cork stoppers#60.12.40.00.00
-unspsc7#60.12.41.00.00#Multicultural project materials and accessories#60.12.00.00.00
-unspsc7#60.12.41.01.00#Multicultural painting products#60.12.41.00.00
-unspsc7#60.12.41.02.00#Multicultural crafts products#60.12.41.00.00
-unspsc7#60.12.42.00.00#Cross curricular projects#60.12.00.00.00
-unspsc7#60.12.42.01.00#Mylar sculptures#60.12.42.00.00
-unspsc7#60.12.43.00.00#Clay and modeling compounds and ceramics equipment and accessories#60.12.00.00.00
-unspsc7#60.12.43.01.00#Moist kiln fired clay#60.12.43.00.00
-unspsc7#60.12.43.02.00#Dry kiln fired clay#60.12.43.00.00
-unspsc7#60.12.43.03.00#Kiln furniture#60.12.43.00.00
-unspsc7#60.12.43.04.00#Kilns for firing ceramics#60.12.43.00.00
-unspsc7#60.12.43.05.00#Kiln accessories for firing ceramics#60.12.43.00.00
-unspsc7#60.12.43.06.00#Potters wheels for hand made ceramics#60.12.43.00.00
-unspsc7#60.12.43.07.00#Extruders for modeling materials#60.12.43.00.00
-unspsc7#60.12.43.08.00#Cones for firing kilns#60.12.43.00.00
-unspsc7#60.12.43.09.00#Pottery Batts#60.12.43.00.00
-unspsc7#60.12.43.10.00#Decorating wheels for pottery#60.12.43.00.00
-unspsc7#60.12.43.11.00#Clay or modeling tools#60.12.43.00.00
-unspsc7#60.12.43.12.00#Fired ceramic tiles#60.12.43.00.00
-unspsc7#60.12.43.13.00#Clay storage containers#60.12.43.00.00
-unspsc7#60.12.43.14.00#Plasicized non hardening modeling compounds#60.12.43.00.00
-unspsc7#60.12.43.15.00#Oilbased nonhardening modeling compounds#60.12.43.00.00
-unspsc7#60.12.43.16.00#Air dry clay or modeling compounds#60.12.43.00.00
-unspsc7#60.12.43.17.00#Modeling dough#60.12.43.00.00
-unspsc7#60.12.43.18.00#Papier Mache#60.12.43.00.00
-unspsc7#60.12.43.19.00#Specialty modeling compounds#60.12.43.00.00
-unspsc7#60.12.43.20.00#Plaster compounds#60.12.43.00.00
-unspsc7#60.12.43.21.00#Oven hardening clay or modeling compounds#60.12.43.00.00
-unspsc7#60.12.43.22.00#Plastic modeling compounds#60.12.43.00.00
-unspsc7#60.12.43.23.00#Casts or molds for shaping modeling compounds#60.12.43.00.00
-unspsc7#60.12.44.00.00#Art metals#60.12.00.00.00
-unspsc7#60.12.44.01.00#Copper tooling foil#60.12.44.00.00
-unspsc7#60.12.44.02.00#Aluminum tooling foil#60.12.44.00.00
-unspsc7#60.12.44.03.00#Aluminum wire#60.12.44.00.00
-unspsc7#60.12.44.04.00#Brass tooling foil#60.12.44.00.00
-unspsc7#60.12.44.05.00#Brass wire#60.12.44.00.00
-unspsc7#60.12.44.06.00#Silver sheets or plates#60.12.44.00.00
-unspsc7#60.12.44.07.00#Silver wire#60.12.44.00.00
-unspsc7#60.12.44.08.00#Pewter pellets or shots#60.12.44.00.00
-unspsc7#60.12.44.09.00#Pewter ingots#60.12.44.00.00
-unspsc7#60.12.44.10.00#Nu gold sheets plates#60.12.44.00.00
-unspsc7#60.12.44.11.00#Nu gold wire#60.12.44.00.00
-unspsc7#60.12.44.12.00#Galvanized stovepipe wire#60.12.44.00.00
-unspsc7#60.12.45.00.00#Sculpture supplies and accessories#60.12.00.00.00
-unspsc7#60.12.45.01.00#Plaster wrap#60.12.45.00.00
-unspsc7#60.12.45.02.00#Casting resins#60.12.45.00.00
-unspsc7#60.12.45.03.00#Sculpture accessories#60.12.45.00.00
-unspsc7#60.12.45.04.00#Puzzle racks#60.12.45.00.00
-unspsc7#60.12.45.05.00#Bubbles or accessories#60.12.45.00.00
-unspsc7#60.12.45.06.00#Plastic sand or water tools or molds or toys#60.12.45.00.00
-unspsc7#60.12.45.07.00#Play sand#60.12.45.00.00
-unspsc7#60.12.45.08.00#Sand or water tables or activity centers#60.12.45.00.00
-unspsc7#60.12.45.09.00#Vehicle sets#60.12.45.00.00
-unspsc7#60.12.45.10.00#Waterway sets#60.12.45.00.00
-unspsc7#60.12.45.11.00#Play tools or play tool kits#60.12.45.00.00
-unspsc7#60.12.45.12.00#Scooter boards#60.12.45.00.00
-unspsc7#60.12.45.13.00#Beanbags#60.12.45.00.00
-unspsc7#60.12.45.14.00#Tactile toys#60.12.45.00.00
-unspsc7#60.12.45.15.00#Cognitive toys#60.12.45.00.00
-unspsc7#60.13.00.00.00#Musical Instruments and parts and accessories#60.00.00.00.00
-unspsc7#60.13.10.00.00#Keyboard instruments#60.13.00.00.00
-unspsc7#60.13.10.01.00#Pianos#60.13.10.00.00
-unspsc7#60.13.10.02.00#Accordions#60.13.10.00.00
-unspsc7#60.13.10.03.00#Musical organs#60.13.10.00.00
-unspsc7#60.13.11.00.00#Brass instruments#60.13.00.00.00
-unspsc7#60.13.11.01.00#Trumpets#60.13.11.00.00
-unspsc7#60.13.11.02.00#Trombones#60.13.11.00.00
-unspsc7#60.13.11.03.00#Sousaphones#60.13.11.00.00
-unspsc7#60.13.11.04.00#Saxophones#60.13.11.00.00
-unspsc7#60.13.11.05.00#Whistle#60.13.11.00.00
-unspsc7#60.13.12.00.00#Woodwind instruments#60.13.00.00.00
-unspsc7#60.13.12.01.00#Clarinets#60.13.12.00.00
-unspsc7#60.13.12.02.00#Oboes#60.13.12.00.00
-unspsc7#60.13.12.03.00#Musical flutes#60.13.12.00.00
-unspsc7#60.13.12.04.00#Piccoloes#60.13.12.00.00
-unspsc7#60.13.12.05.00#Musical cornets#60.13.12.00.00
-unspsc7#60.13.12.06.00#Bagpipes#60.13.12.00.00
-unspsc7#60.13.12.07.00#Harmonicas#60.13.12.00.00
-unspsc7#60.13.12.08.00#Kazoos#60.13.12.00.00
-unspsc7#60.13.13.00.00#String instruments#60.13.00.00.00
-unspsc7#60.13.13.01.00#Harpsichords#60.13.13.00.00
-unspsc7#60.13.13.02.00#Clavichords#60.13.13.00.00
-unspsc7#60.13.13.03.00#Guitars#60.13.13.00.00
-unspsc7#60.13.13.04.00#Violins#60.13.13.00.00
-unspsc7#60.13.13.05.00#Harps#60.13.13.00.00
-unspsc7#60.13.13.06.00#Banjoes#60.13.13.00.00
-unspsc7#60.13.14.00.00#Percussion instruments#60.13.00.00.00
-unspsc7#60.13.14.01.00#Cymbals#60.13.14.00.00
-unspsc7#60.13.14.02.00#Bells#60.13.14.00.00
-unspsc7#60.13.14.03.00#Tambourines#60.13.14.00.00
-unspsc7#60.13.14.04.00#Castanets#60.13.14.00.00
-unspsc7#60.13.14.05.00#Drums#60.13.14.00.00
-unspsc7#60.13.14.06.00#Xylophones#60.13.14.00.00
-unspsc7#60.13.15.00.00#Musical instrument parts and accessories#60.13.00.00.00
-unspsc7#60.13.15.01.00#Metronomes#60.13.15.00.00
-unspsc7#60.13.15.02.00#Reeds#60.13.15.00.00
-unspsc7#60.13.15.03.00#Instrument strings or picks#60.13.15.00.00
-unspsc7#60.13.15.04.00#Tuning pins#60.13.15.00.00
-unspsc7#60.13.15.05.00#Musical instrument stands or sheet holders#60.13.15.00.00
-unspsc7#60.13.15.06.00#Accessories for stringed instruments#60.13.15.00.00
-unspsc7#60.13.15.07.00#Percussion instrument accessory#60.13.15.00.00
-unspsc7#60.13.15.08.00#Music boxes or mechanisms#60.13.15.00.00
-unspsc7#60.13.16.00.00#Musical instrument sets#60.13.00.00.00
-unspsc7#60.13.16.01.00#Rhythm band sets#60.13.16.00.00
-unspsc7#60.13.17.00.00#Alternative sounds musical instruments#60.13.00.00.00
-unspsc7#60.13.17.01.00#Boomwhackers#60.13.17.00.00
-unspsc7#60.13.17.02.00#Disco taps#60.13.17.00.00
-unspsc7#60.13.18.00.00#Music and dance accessories#60.13.00.00.00
-unspsc7#60.13.18.01.00#Dancing scarves#60.13.18.00.00
-unspsc7#60.13.18.02.00#Rhythm sticks or lummi sticks#60.13.18.00.00
-unspsc7#60.13.18.03.00#Rhythm wands or hoops#60.13.18.00.00
-unspsc7#60.14.00.00.00#Toys and games#60.00.00.00.00
-unspsc7#60.14.10.00.00#Toys#60.14.00.00.00
-unspsc7#60.14.10.01.00#Toy balloons or balls#60.14.10.00.00
-unspsc7#60.14.10.02.00#Dolls#60.14.10.00.00
-unspsc7#60.14.10.03.00#Doll houses#60.14.10.00.00
-unspsc7#60.14.10.04.00#Stuffed animals or puppets#60.14.10.00.00
-unspsc7#60.14.10.05.00#Playhouses#60.14.10.00.00
-unspsc7#60.14.10.06.00#Building blocks#60.14.10.00.00
-unspsc7#60.14.10.07.00#Riding toys#60.14.10.00.00
-unspsc7#60.14.10.08.00#Pull toys#60.14.10.00.00
-unspsc7#60.14.10.09.00#Childrens science kits#60.14.10.00.00
-unspsc7#60.14.10.10.00#Toy vehicles#60.14.10.00.00
-unspsc7#60.14.10.11.00#Toy trains#60.14.10.00.00
-unspsc7#60.14.10.12.00#Inflatable toys#60.14.10.00.00
-unspsc7#60.14.10.13.00#Doll parts or accessories#60.14.10.00.00
-unspsc7#60.14.10.14.00#Yo yos#60.14.10.00.00
-unspsc7#60.14.10.15.00#Kites#60.14.10.00.00
-unspsc7#60.14.10.16.00#Pogs#60.14.10.00.00
-unspsc7#60.14.10.17.00#Kaleidoscopes#60.14.10.00.00
-unspsc7#60.14.10.18.00#Pom poms#60.14.10.00.00
-unspsc7#60.14.10.19.00#Pinatas#60.14.10.00.00
-unspsc7#60.14.10.20.00#Boomerangs#60.14.10.00.00
-unspsc7#60.14.10.21.00#Flying discs#60.14.10.00.00
-unspsc7#60.14.10.22.00#Toy pails#60.14.10.00.00
-unspsc7#60.14.11.00.00#Games#60.14.00.00.00
-unspsc7#60.14.11.01.00#Educational games#60.14.11.00.00
-unspsc7#60.14.11.02.00#Board games#60.14.11.00.00
-unspsc7#60.14.11.03.00#Playing cards#60.14.11.00.00
-unspsc7#60.14.11.04.00#Video games#60.14.11.00.00
-unspsc7#60.14.11.05.00#Puzzles#60.14.11.00.00
-unspsc7#60.14.11.06.00#Dice#60.14.11.00.00
-unspsc7#60.14.11.07.00#Bingo#60.14.11.00.00
-unspsc7#60.14.11.08.00#Classic games#60.14.11.00.00
-unspsc7#60.14.11.09.00#Collaborative games#60.14.11.00.00
-unspsc7#60.14.11.10.00#Strategy games#60.14.11.00.00
-unspsc7#60.14.11.11.00#Game accessories#60.14.11.00.00
-unspsc7#60.14.11.12.00#Game books#60.14.11.00.00
-unspsc7#60.14.11.13.00#Lotto games#60.14.11.00.00
-unspsc7#60.14.11.14.00#Memory games#60.14.11.00.00
-unspsc7#60.14.12.00.00#Active Play equipment and accessories#60.14.00.00.00
-unspsc7#60.14.12.01.00#Balance or gross motor equipment#60.14.12.00.00
-unspsc7#60.14.12.02.00#Ball pools or accessories#60.14.12.00.00
-unspsc7#60.14.12.03.00#Play houses or huts#60.14.12.00.00
-unspsc7#60.14.12.04.00#Trikes or wagons#60.14.12.00.00
-unspsc7#60.14.12.05.00#Soft play centers#60.14.12.00.00
-unspsc7#60.14.13.00.00#Childrens blocks and building systems#60.14.00.00.00
-unspsc7#60.14.13.02.00#Construction sets#60.14.13.00.00
-unspsc7#60.14.13.03.00#Playmats#60.14.13.00.00
-unspsc7#60.14.13.04.00#Railplay systems or accessories#60.14.13.00.00
-unspsc7#60.14.13.05.00#Unit blocks#60.14.13.00.00
-unspsc7#60.14.13.06.00#Play vehicles#60.14.13.00.00
-unspsc7#60.14.13.07.00#Play animals#60.14.13.00.00
-unspsc7#60.14.14.00.00#Dramatic play equipment and accessories#60.14.00.00.00
-unspsc7#60.14.14.01.00#Costumes or accessories#60.14.14.00.00
-unspsc7#60.14.14.02.00#Dress up Centers#60.14.14.00.00
-unspsc7#60.14.14.03.00#Housekeeping units or accessories#60.14.14.00.00
-unspsc7#60.14.14.04.00#Play food dishes or accessories#60.14.14.00.00
-unspsc7#60.14.14.05.00#Pretend play kits or supplies#60.14.14.00.00
-unspsc7#70.00.00.00.00#Farming and Fishing and Forestry and Wildlife Contracting Services#70.00.00.00.00
-unspsc7#70.10.00.00.00#Fisheries and aquaculture#70.00.00.00.00
-unspsc7#70.10.15.00.00#Fisheries operations#70.10.00.00.00
-unspsc7#70.10.15.01.00#Commercial fishing operations#70.10.15.00.00
-unspsc7#70.10.15.02.00#Fishing port services#70.10.15.00.00
-unspsc7#70.10.15.03.00#Fishing onshore facilities#70.10.15.00.00
-unspsc7#70.10.15.04.00#Deep sea fishing operations#70.10.15.00.00
-unspsc7#70.10.15.05.00#Sonar fishing#70.10.15.00.00
-unspsc7#70.10.15.06.00#Whaling#70.10.15.00.00
-unspsc7#70.10.15.07.00#Trawling#70.10.15.00.00
-unspsc7#70.10.15.08.00#Line fishing#70.10.15.00.00
-unspsc7#70.10.15.09.00#Seine operations#70.10.15.00.00
-unspsc7#70.10.15.10.00#Fishing nets#70.10.15.00.00
-unspsc7#70.10.16.00.00#Fisheries oversight#70.10.00.00.00
-unspsc7#70.10.16.01.00#Fishery information or documentation services#70.10.16.00.00
-unspsc7#70.10.16.02.00#Fishery research or experimentation services#70.10.16.00.00
-unspsc7#70.10.16.03.00#Fishery data collection or distribution#70.10.16.00.00
-unspsc7#70.10.16.04.00#Fishery commercial management#70.10.16.00.00
-unspsc7#70.10.16.05.00#Fishing fleet management#70.10.16.00.00
-unspsc7#70.10.16.06.00#Fishing cooperatives#70.10.16.00.00
-unspsc7#70.10.16.07.00#Fishery resources protection or conservation#70.10.16.00.00
-unspsc7#70.10.17.00.00#Fishery industry and technology#70.10.00.00.00
-unspsc7#70.10.17.01.00#Fishing technology services#70.10.17.00.00
-unspsc7#70.10.17.02.00#Fishery by products production services#70.10.17.00.00
-unspsc7#70.10.17.03.00#Fish production#70.10.17.00.00
-unspsc7#70.10.17.04.00#Fish storage#70.10.17.00.00
-unspsc7#70.10.18.00.00#Fisheries resources#70.10.00.00.00
-unspsc7#70.10.18.01.00#Inland water fishery resources#70.10.18.00.00
-unspsc7#70.10.18.02.00#Fish pond resources#70.10.18.00.00
-unspsc7#70.10.18.03.00#Fish hatcheries#70.10.18.00.00
-unspsc7#70.10.18.04.00#Fish ranches#70.10.18.00.00
-unspsc7#70.10.18.05.00#Fishery by product resources#70.10.18.00.00
-unspsc7#70.10.18.06.00#Fisheries resource evaluation#70.10.18.00.00
-unspsc7#70.10.19.00.00#Aquaculture#70.10.00.00.00
-unspsc7#70.10.19.01.00#Mariculture#70.10.19.00.00
-unspsc7#70.10.19.02.00#Ostreiculture#70.10.19.00.00
-unspsc7#70.10.19.03.00#Shellfish culture#70.10.19.00.00
-unspsc7#70.10.19.04.00#Shrimp farming#70.10.19.00.00
-unspsc7#70.10.19.05.00#Fish farming#70.10.19.00.00
-unspsc7#70.11.00.00.00#Horticulture#70.00.00.00.00
-unspsc7#70.11.15.00.00#Plants and ornamental trees#70.11.00.00.00
-unspsc7#70.11.15.01.00#Planting services or ornamental plant or bush or tree#70.11.15.00.00
-unspsc7#70.11.15.02.00#Pruning services or ornamental plant or bush#70.11.15.00.00
-unspsc7#70.11.15.03.00#Tree trimming services#70.11.15.00.00
-unspsc7#70.11.15.04.00#Bracing services#70.11.15.00.00
-unspsc7#70.11.15.05.00#Tree surgery services#70.11.15.00.00
-unspsc7#70.11.15.06.00#Arborist services#70.11.15.00.00
-unspsc7#70.11.15.07.00#Removal services or ornamental plant or bush or tree#70.11.15.00.00
-unspsc7#70.11.15.08.00#Plants or ornamental tree spraying services#70.11.15.00.00
-unspsc7#70.11.16.00.00#Flowering plants#70.11.00.00.00
-unspsc7#70.11.16.01.00#Planting services#70.11.16.00.00
-unspsc7#70.11.16.02.00#Nursery services#70.11.16.00.00
-unspsc7#70.11.16.03.00#Floriculture services#70.11.16.00.00
-unspsc7#70.11.17.00.00#Parks and gardens and orchards#70.11.00.00.00
-unspsc7#70.11.17.01.00#Orchard management or maintenance services#70.11.17.00.00
-unspsc7#70.11.17.02.00#Vineyard management or maintenance services#70.11.17.00.00
-unspsc7#70.11.17.03.00#Garden planting or maintenance services#70.11.17.00.00
-unspsc7#70.11.17.04.00#Horticultural counseling services#70.11.17.00.00
-unspsc7#70.11.17.05.00#Cemetery upkeep services#70.11.17.00.00
-unspsc7#70.11.17.06.00#Lawn care services#70.11.17.00.00
-unspsc7#70.11.17.07.00#Highway lawn maintenance services#70.11.17.00.00
-unspsc7#70.11.17.08.00#Mulching services#70.11.17.00.00
-unspsc7#70.11.17.09.00#Seeding services#70.11.17.00.00
-unspsc7#70.11.17.10.00#Mowing services#70.11.17.00.00
-unspsc7#70.11.17.11.00#Sprigging services#70.11.17.00.00
-unspsc7#70.11.17.12.00#Parks or gardens spraying services#70.11.17.00.00
-unspsc7#70.11.17.13.00#Parks management or maintenance services#70.11.17.00.00
-unspsc7#70.12.00.00.00#Livestock services#70.00.00.00.00
-unspsc7#70.12.15.00.00#Dairying#70.12.00.00.00
-unspsc7#70.12.15.01.00#Dairy herd management#70.12.15.00.00
-unspsc7#70.12.15.02.00#Dairy industry development#70.12.15.00.00
-unspsc7#70.12.15.03.00#Dairy technology#70.12.15.00.00
-unspsc7#70.12.15.04.00#Dairy laboratories services#70.12.15.00.00
-unspsc7#70.12.15.05.00#Dairy farm in house processing#70.12.15.00.00
-unspsc7#70.12.16.00.00#Livestock industry#70.12.00.00.00
-unspsc7#70.12.16.01.00#Livestock breeding#70.12.16.00.00
-unspsc7#70.12.16.02.00#Livestock genetics services#70.12.16.00.00
-unspsc7#70.12.16.03.00#Sericulture#70.12.16.00.00
-unspsc7#70.12.16.04.00#Animal husbandry#70.12.16.00.00
-unspsc7#70.12.16.05.00#Farm rearing systems#70.12.16.00.00
-unspsc7#70.12.16.06.00#Poultry production services#70.12.16.00.00
-unspsc7#70.12.16.07.00#Small animal breeding services#70.12.16.00.00
-unspsc7#70.12.16.08.00#Bovine production services#70.12.16.00.00
-unspsc7#70.12.16.10.00#Apiculture#70.12.16.00.00
-unspsc7#70.12.17.00.00#Livestock management#70.12.00.00.00
-unspsc7#70.12.17.01.00#Livestock selection#70.12.17.00.00
-unspsc7#70.12.17.02.00#Livestock showing services#70.12.17.00.00
-unspsc7#70.12.17.03.00#Livestock slaughtering services#70.12.17.00.00
-unspsc7#70.12.17.04.00#Herd management#70.12.17.00.00
-unspsc7#70.12.17.05.00#Livestock breeding or grooming services#70.12.17.00.00
-unspsc7#70.12.18.00.00#Pets industry#70.12.00.00.00
-unspsc7#70.12.18.01.00#Pet breeding services#70.12.18.00.00
-unspsc7#70.12.18.02.00#Pet grooming services#70.12.18.00.00
-unspsc7#70.12.18.03.00#Kennels services#70.12.18.00.00
-unspsc7#70.12.19.00.00#Pasture and range services#70.12.00.00.00
-unspsc7#70.12.19.01.00#Pasture improvement#70.12.19.00.00
-unspsc7#70.12.19.02.00#Range management#70.12.19.00.00
-unspsc7#70.12.19.03.00#Range research#70.12.19.00.00
-unspsc7#70.12.20.00.00#Animal health#70.12.00.00.00
-unspsc7#70.12.20.01.00#Animal nutrition#70.12.20.00.00
-unspsc7#70.12.20.02.00#Animal disease control#70.12.20.00.00
-unspsc7#70.12.20.03.00#Animal trypanosomiasis#70.12.20.00.00
-unspsc7#70.12.20.04.00#Foot or mouth control services#70.12.20.00.00
-unspsc7#70.12.20.05.00#Animal health preventive medication services#70.12.20.00.00
-unspsc7#70.12.20.06.00#Animal vaccination services#70.12.20.00.00
-unspsc7#70.12.20.07.00#Veterinary administration#70.12.20.00.00
-unspsc7#70.12.20.08.00#Veterinary laboratory technology#70.12.20.00.00
-unspsc7#70.12.20.09.00#Animal hospital services#70.12.20.00.00
-unspsc7#70.12.20.10.00#Animal health information services#70.12.20.00.00
-unspsc7#70.13.00.00.00#Land and soil preparation and management and protection#70.00.00.00.00
-unspsc7#70.13.15.00.00#Land and soil protection#70.13.00.00.00
-unspsc7#70.13.15.01.00#Desertification assessment or control services#70.13.15.00.00
-unspsc7#70.13.15.02.00#Soil conservation or protection services#70.13.15.00.00
-unspsc7#70.13.15.03.00#Erosion control services#70.13.15.00.00
-unspsc7#70.13.15.04.00#Sand dune fixation#70.13.15.00.00
-unspsc7#70.13.15.05.00#Soil conditioning#70.13.15.00.00
-unspsc7#70.13.15.06.00#Soil improvement#70.13.15.00.00
-unspsc7#70.13.16.00.00#Land and soil preparation#70.13.00.00.00
-unspsc7#70.13.16.01.00#Fertilizer application services#70.13.16.00.00
-unspsc7#70.13.16.02.00#Lime spreading services#70.13.16.00.00
-unspsc7#70.13.16.03.00#Plowing services#70.13.16.00.00
-unspsc7#70.13.16.04.00#Seed bed preparation services#70.13.16.00.00
-unspsc7#70.13.16.05.00#Soil chemical treatment services#70.13.16.00.00
-unspsc7#70.13.17.00.00#Land and soil management#70.13.00.00.00
-unspsc7#70.13.17.01.00#Land use planning#70.13.17.00.00
-unspsc7#70.13.17.02.00#Land evaluation#70.13.17.00.00
-unspsc7#70.13.17.03.00#Land reclamation#70.13.17.00.00
-unspsc7#70.13.17.04.00#Agro ecological zones assessment or planning#70.13.17.00.00
-unspsc7#70.13.17.05.00#Soil classification#70.13.17.00.00
-unspsc7#70.13.17.06.00#Watershed management#70.13.17.00.00
-unspsc7#70.13.17.07.00#Soil fertility analysis#70.13.17.00.00
-unspsc7#70.13.17.08.00#Pedology#70.13.17.00.00
-unspsc7#70.14.00.00.00#Crop production and management and protection#70.00.00.00.00
-unspsc7#70.14.15.00.00#Crop production#70.14.00.00.00
-unspsc7#70.14.15.01.00#Seed production services#70.14.15.00.00
-unspsc7#70.14.15.02.00#Hydroponics#70.14.15.00.00
-unspsc7#70.14.15.03.00#Grass or fodder production#70.14.15.00.00
-unspsc7#70.14.15.04.00#Aromatic plants production#70.14.15.00.00
-unspsc7#70.14.15.05.00#Beverage crops production#70.14.15.00.00
-unspsc7#70.14.15.06.00#Cocoa production#70.14.15.00.00
-unspsc7#70.14.15.07.00#Sugarbeet or sugarcane production#70.14.15.00.00
-unspsc7#70.14.15.08.00#Nut production#70.14.15.00.00
-unspsc7#70.14.15.09.00#Essential oil crops production#70.14.15.00.00
-unspsc7#70.14.15.10.00#Fiber crops production#70.14.15.00.00
-unspsc7#70.14.15.11.00#Fruit production#70.14.15.00.00
-unspsc7#70.14.15.12.00#Grain or legume production#70.14.15.00.00
-unspsc7#70.14.15.13.00#Insecticidal plants production#70.14.15.00.00
-unspsc7#70.14.15.14.00#Medicinal plants production#70.14.15.00.00
-unspsc7#70.14.15.15.00#Roots or tubers production#70.14.15.00.00
-unspsc7#70.14.15.16.00#Cereals production#70.14.15.00.00
-unspsc7#70.14.15.17.00#Rubber plant production#70.14.15.00.00
-unspsc7#70.14.15.18.00#Spice crops production#70.14.15.00.00
-unspsc7#70.14.15.19.00#Tobacco crop production#70.14.15.00.00
-unspsc7#70.14.15.20.00#Vegetable production#70.14.15.00.00
-unspsc7#70.14.16.00.00#Crop protection#70.14.00.00.00
-unspsc7#70.14.16.01.00#Crop spraying services#70.14.16.00.00
-unspsc7#70.14.16.02.00#Biological control services#70.14.16.00.00
-unspsc7#70.14.16.03.00#Weed control services#70.14.16.00.00
-unspsc7#70.14.16.04.00#Herbicide services#70.14.16.00.00
-unspsc7#70.14.16.05.00#Integrated pest management services#70.14.16.00.00
-unspsc7#70.14.16.06.00#Plant pathology#70.14.16.00.00
-unspsc7#70.14.16.07.00#Locust control#70.14.16.00.00
-unspsc7#70.14.17.00.00#Crop management#70.14.00.00.00
-unspsc7#70.14.17.01.00#Greenhouse services#70.14.17.00.00
-unspsc7#70.14.17.02.00#Fertilizer services#70.14.17.00.00
-unspsc7#70.14.17.03.00#Crop administration#70.14.17.00.00
-unspsc7#70.14.17.04.00#Crop substitution#70.14.17.00.00
-unspsc7#70.14.17.05.00#Extension services#70.14.17.00.00
-unspsc7#70.14.17.06.00#Crop specialization#70.14.17.00.00
-unspsc7#70.14.17.07.00#Cultivation farming system management#70.14.17.00.00
-unspsc7#70.14.17.08.00#Crop rotation or diversification counseling services#70.14.17.00.00
-unspsc7#70.14.17.09.00#Plant taxonomy services#70.14.17.00.00
-unspsc7#70.14.17.10.00#Field crop entomology#70.14.17.00.00
-unspsc7#70.14.18.00.00#Crop planting and cultivation#70.14.00.00.00
-unspsc7#70.14.18.01.00#Orchard tree or vine planting services#70.14.18.00.00
-unspsc7#70.14.18.02.00#Sprout or twig services#70.14.18.00.00
-unspsc7#70.14.18.03.00#Crop cultivating services#70.14.18.00.00
-unspsc7#70.14.18.04.00#Crop planting services#70.14.18.00.00
-unspsc7#70.14.19.00.00#Crop harvesting#70.14.00.00.00
-unspsc7#70.14.19.01.00#Cash grains harvesting services#70.14.19.00.00
-unspsc7#70.14.19.02.00#Fruit or tree nuts harvesting services#70.14.19.00.00
-unspsc7#70.14.19.03.00#Field crop harvesting services#70.14.19.00.00
-unspsc7#70.14.19.04.00#Seed harvesting services#70.14.19.00.00
-unspsc7#70.14.20.00.00#Post harvesting crop processing#70.14.00.00.00
-unspsc7#70.14.20.01.00#Silos related services#70.14.20.00.00
-unspsc7#70.14.20.02.00#Grain dryers services#70.14.20.00.00
-unspsc7#70.14.20.03.00#Crop processing services#70.14.20.00.00
-unspsc7#70.14.20.04.00#Field crops market preparation services#70.14.20.00.00
-unspsc7#70.14.20.05.00#Cash grain crops market preparation services#70.14.20.00.00
-unspsc7#70.14.20.06.00#Vegetable crops market preparation services#70.14.20.00.00
-unspsc7#70.14.20.07.00#Fruit crops market preparation services#70.14.20.00.00
-unspsc7#70.14.20.08.00#Tree nut crops market preparation services#70.14.20.00.00
-unspsc7#70.14.20.09.00#Ginning services#70.14.20.00.00
-unspsc7#70.14.20.10.00#Crop cleaning services#70.14.20.00.00
-unspsc7#70.14.20.11.00#Cooling or refrigeration services#70.14.20.00.00
-unspsc7#70.14.20.12.00#Spraying services#70.14.20.00.00
-unspsc7#70.15.00.00.00#Forestry#70.00.00.00.00
-unspsc7#70.15.15.00.00#Forestry management#70.15.00.00.00
-unspsc7#70.15.15.01.00#Forest resources management services#70.15.15.00.00
-unspsc7#70.15.15.02.00#Forest pest control#70.15.15.00.00
-unspsc7#70.15.15.03.00#Forest organizations or associations or cooperatives#70.15.15.00.00
-unspsc7#70.15.15.04.00#Forest administration services#70.15.15.00.00
-unspsc7#70.15.15.05.00#Forest inventory#70.15.15.00.00
-unspsc7#70.15.15.06.00#Forest monitoring or evaluation#70.15.15.00.00
-unspsc7#70.15.15.07.00#Afforestation services#70.15.15.00.00
-unspsc7#70.15.15.08.00#Forestry extension services#70.15.15.00.00
-unspsc7#70.15.15.09.00#Forest nursery management#70.15.15.00.00
-unspsc7#70.15.15.10.00#Forest sectoral planning#70.15.15.00.00
-unspsc7#70.15.16.00.00#Forestry industry#70.15.00.00.00
-unspsc7#70.15.16.01.00#Nonwood production services#70.15.16.00.00
-unspsc7#70.15.16.02.00#Essential oils production#70.15.16.00.00
-unspsc7#70.15.16.03.00#Timber production services#70.15.16.00.00
-unspsc7#70.15.16.04.00#Dyes production#70.15.16.00.00
-unspsc7#70.15.16.05.00#Edible forestry production#70.15.16.00.00
-unspsc7#70.15.16.06.00#Wood testing services#70.15.16.00.00
-unspsc7#70.15.16.07.00#Timber production#70.15.16.00.00
-unspsc7#70.15.17.00.00#Forestry harvesting#70.15.00.00.00
-unspsc7#70.15.17.01.00#Logging or felling#70.15.17.00.00
-unspsc7#70.15.17.02.00#Forest harvesting mountainous areas#70.15.17.00.00
-unspsc7#70.15.17.03.00#Forest harvesting specialized operations#70.15.17.00.00
-unspsc7#70.15.17.04.00#Plantation harvesting#70.15.17.00.00
-unspsc7#70.15.17.05.00#Swamp or mangrove forest harvesting#70.15.17.00.00
-unspsc7#70.15.17.06.00#Temperate forest harvesting#70.15.17.00.00
-unspsc7#70.15.17.07.00#Tropical high forests harvesting#70.15.17.00.00
-unspsc7#70.15.18.00.00#Forestry conservation services#70.15.00.00.00
-unspsc7#70.15.18.01.00#Conservation of forest genetic resources#70.15.18.00.00
-unspsc7#70.15.18.02.00#Forest protection services#70.15.18.00.00
-unspsc7#70.15.18.03.00#Forest arid land rehabilitation#70.15.18.00.00
-unspsc7#70.15.18.04.00#Forest wind breaks or shelter belts#70.15.18.00.00
-unspsc7#70.15.18.05.00#Forest reserves or parks conservation services#70.15.18.00.00
-unspsc7#70.15.18.06.00#Forestry watershed management#70.15.18.00.00
-unspsc7#70.15.18.07.00#Forestry torrent control#70.15.18.00.00
-unspsc7#70.15.19.00.00#Forestry resources#70.15.00.00.00
-unspsc7#70.15.19.01.00#Forest resources development#70.15.19.00.00
-unspsc7#70.15.19.02.00#Agroforestry resources#70.15.19.00.00
-unspsc7#70.15.19.03.00#Fuel wood resources#70.15.19.00.00
-unspsc7#70.15.19.04.00#Silviculture#70.15.19.00.00
-unspsc7#70.15.19.05.00#Arid rainfed plantation resources#70.15.19.00.00
-unspsc7#70.15.19.06.00#Broad leafed plantation resources#70.15.19.00.00
-unspsc7#70.15.19.07.00#Conifers plantations#70.15.19.00.00
-unspsc7#70.15.19.09.00#Tropical rain forest plantations#70.15.19.00.00
-unspsc7#70.15.19.10.00#Mangrove swamps resources#70.15.19.00.00
-unspsc7#70.16.00.00.00#Wildlife and flora#70.00.00.00.00
-unspsc7#70.16.15.00.00#Fauna#70.16.00.00.00
-unspsc7#70.16.15.01.00#Fauna protection#70.16.15.00.00
-unspsc7#70.16.16.00.00#Flora#70.16.00.00.00
-unspsc7#70.16.16.01.00#Flora protection#70.16.16.00.00
-unspsc7#70.16.17.00.00#Ecosystems#70.16.00.00.00
-unspsc7#70.16.17.01.00#Ecodevelopment services#70.16.17.00.00
-unspsc7#70.16.17.02.00#Marine ecosystem management services#70.16.17.00.00
-unspsc7#70.16.17.03.00#Terrestrial ecosystem management services#70.16.17.00.00
-unspsc7#70.16.17.04.00#Ecosystems protection services#70.16.17.00.00
-unspsc7#70.17.00.00.00#Water resources development and oversight#70.00.00.00.00
-unspsc7#70.17.15.00.00#Development#70.17.00.00.00
-unspsc7#70.17.15.01.00#Water quality assessment services#70.17.15.00.00
-unspsc7#70.17.15.02.00#Water resources planning services#70.17.15.00.00
-unspsc7#70.17.15.03.00#Ground or surface water surveying#70.17.15.00.00
-unspsc7#70.17.15.04.00#Water resources mapping services#70.17.15.00.00
-unspsc7#70.17.15.05.00#River basin development#70.17.15.00.00
-unspsc7#70.17.15.06.00#Ground or surface water modeling services#70.17.15.00.00
-unspsc7#70.17.16.00.00#Oversight#70.17.00.00.00
-unspsc7#70.17.16.01.00#Water quality management#70.17.16.00.00
-unspsc7#70.17.16.02.00#Water testing services#70.17.16.00.00
-unspsc7#70.17.16.03.00#Floodplain management#70.17.16.00.00
-unspsc7#70.17.16.04.00#Water conservation advisory services#70.17.16.00.00
-unspsc7#70.17.16.05.00#Water rights advisory services#70.17.16.00.00
-unspsc7#70.17.16.06.00#Water resource recovery services#70.17.16.00.00
-unspsc7#70.17.16.07.00#Water pricing services#70.17.16.00.00
-unspsc7#70.17.17.00.00#Irrigation#70.17.00.00.00
-unspsc7#70.17.17.01.00#Canal maintenance or management services#70.17.17.00.00
-unspsc7#70.17.17.02.00#Dam maintenance or management services#70.17.17.00.00
-unspsc7#70.17.17.03.00#Reservoirs maintenance or management services#70.17.17.00.00
-unspsc7#70.17.17.04.00#Pumping station maintenance or management services#70.17.17.00.00
-unspsc7#70.17.17.05.00#Pipelines maintenance or management services#70.17.17.00.00
-unspsc7#70.17.17.06.00#Dike or embankment maintenance or management services#70.17.17.00.00
-unspsc7#70.17.17.07.00#Water well maintenance or management services#70.17.17.00.00
-unspsc7#70.17.17.08.00#Irrigation advisory services#70.17.17.00.00
-unspsc7#70.17.17.09.00#Irrigation systems management services#70.17.17.00.00
-unspsc7#70.17.18.00.00#Drainage services#70.17.00.00.00
-unspsc7#70.17.18.01.00#Land drainage services#70.17.18.00.00
-unspsc7#70.17.18.02.00#Storm water drainage#70.17.18.00.00
-unspsc7#70.17.18.03.00#Flood protection or control services#70.17.18.00.00
-unspsc7#71.00.00.00.00#Mining and Oil and Gas Services#71.00.00.00.00
-unspsc7#71.10.00.00.00#Mining services#71.00.00.00.00
-unspsc7#71.10.15.00.00#Mine exploration#71.10.00.00.00
-unspsc7#71.10.15.01.00#Mine development#71.10.15.00.00
-unspsc7#71.10.15.02.00#Test boring or core drilling#71.10.15.00.00
-unspsc7#71.10.16.00.00#Mine drilling and blasting services#71.10.00.00.00
-unspsc7#71.10.16.01.00#Shaft sinking#71.10.16.00.00
-unspsc7#71.10.16.02.00#Mine blasting services#71.10.16.00.00
-unspsc7#71.10.17.00.00#Extraction#71.10.00.00.00
-unspsc7#71.10.17.01.00#Shaft mining services#71.10.17.00.00
-unspsc7#71.10.17.02.00#Open pit mining services#71.10.17.00.00
-unspsc7#71.10.17.03.00#Strip mining services#71.10.17.00.00
-unspsc7#71.10.17.04.00#In situ leaching (ISL) services#71.10.17.00.00
-unspsc7#71.10.17.05.00#Pumping or draining#71.10.17.00.00
-unspsc7#71.10.17.06.00#Overburden removal#71.10.17.00.00
-unspsc7#71.10.17.07.00#Impoundment or storage of water services#71.10.17.00.00
-unspsc7#71.10.17.08.00#Soil flushing services#71.10.17.00.00
-unspsc7#71.10.17.09.00#Mine filling services#71.10.17.00.00
-unspsc7#71.11.00.00.00#Oil and gas exploration services#71.00.00.00.00
-unspsc7#71.11.15.00.00#Oil and gas exploration#71.11.00.00.00
-unspsc7#71.11.15.01.00#Seismographic surveys#71.11.15.00.00
-unspsc7#71.11.15.02.00#Offshore exploration#71.11.15.00.00
-unspsc7#71.11.15.03.00#Well surveying#71.11.15.00.00
-unspsc7#71.11.16.00.00#Well drilling and maintenance#71.11.00.00.00
-unspsc7#71.11.16.01.00#Directional drilling#71.11.16.00.00
-unspsc7#71.11.16.02.00#Oil well drilling#71.11.16.00.00
-unspsc7#71.11.16.03.00#Drilling of water intake wells#71.11.16.00.00
-unspsc7#71.11.16.04.00#Redrilling or reworking of wells#71.11.16.00.00
-unspsc7#71.11.16.05.00#Acidizing or chemical treating of wells#71.11.16.00.00
-unspsc7#71.11.16.06.00#Tool fishing services#71.11.16.00.00
-unspsc7#71.11.16.07.00#Oil well platform maintenance services#71.11.16.00.00
-unspsc7#71.11.17.00.00#Extraction services#71.11.00.00.00
-unspsc7#71.11.17.01.00#Flow rate measurement services#71.11.17.00.00
-unspsc7#71.11.17.02.00#Oil sampling services#71.11.17.00.00
-unspsc7#71.11.17.03.00#Oil field drilling or mud services#71.11.17.00.00
-unspsc7#71.11.17.04.00#Impound or storage of water#71.11.17.00.00
-unspsc7#71.11.18.00.00#Well restoration and reclamation#71.11.00.00.00
-unspsc7#71.11.18.01.00#Cleaning or swabbing of wells#71.11.18.00.00
-unspsc7#71.11.18.02.00#Soil flushing services#71.11.18.00.00
-unspsc7#71.11.18.03.00#Mine filling services#71.11.18.00.00
-unspsc7#71.11.18.04.00#Well plugging or abandonment services#71.11.18.00.00
-unspsc7#71.11.18.05.00#Cementing services for well casings#71.11.18.00.00
-unspsc7#71.11.19.00.00#Well emergency services#71.11.00.00.00
-unspsc7#71.11.19.01.00#Well fire fighting services#71.11.19.00.00
-unspsc7#71.11.19.02.00#Well capping services#71.11.19.00.00
-unspsc7#71.11.20.00.00#Cased hole well logging services#71.11.00.00.00
-unspsc7#71.11.20.01.00#Cased hole formation sampling testing services#71.11.20.00.00
-unspsc7#71.11.20.02.00#Casing thickness measurement services#71.11.20.00.00
-unspsc7#71.11.20.03.00#Chemical cutters services#71.11.20.00.00
-unspsc7#71.11.20.04.00#Electromagnetic pipe recovery services#71.11.20.00.00
-unspsc7#71.11.20.05.00#Well flow measurement services#71.11.20.00.00
-unspsc7#71.11.20.06.00#Well fluid density measurement services#71.11.20.00.00
-unspsc7#71.11.20.07.00#Well fluid temperature measurement services#71.11.20.00.00
-unspsc7#71.11.20.08.00#Free point tool services#71.11.20.00.00
-unspsc7#71.11.20.09.00#Gamma ray services#71.11.20.00.00
-unspsc7#71.11.20.10.00#Jet cutter services#71.11.20.00.00
-unspsc7#71.11.20.11.00#Measurement while perforating services#71.11.20.00.00
-unspsc7#71.11.20.12.00#Neutron porosity services#71.11.20.00.00
-unspsc7#71.11.20.13.00#Nuclear spectroscopy services#71.11.20.00.00
-unspsc7#71.11.20.14.00#Well packer services#71.11.20.00.00
-unspsc7#71.11.20.15.00#Permanent magnets pipe recovery services#71.11.20.00.00
-unspsc7#71.11.20.16.00#Well plugging services#71.11.20.00.00
-unspsc7#71.11.20.17.00#Well pressure measurement control services#71.11.20.00.00
-unspsc7#71.11.20.18.00#Production logging borehole fluid measurement services#71.11.20.00.00
-unspsc7#71.11.20.19.00#Production logging density measurement services#71.11.20.00.00
-unspsc7#71.11.20.20.00#Production logging downhole video services#71.11.20.00.00
-unspsc7#71.11.20.21.00#Production logging flow measurement services#71.11.20.00.00
-unspsc7#71.11.20.22.00#Production logging pressure measurement services#71.11.20.00.00
-unspsc7#71.11.20.23.00#Other production logging services#71.11.20.00.00
-unspsc7#71.11.20.24.00#Production logging temperature measurement services#71.11.20.00.00
-unspsc7#71.11.20.25.00#Severing colliding services#71.11.20.00.00
-unspsc7#71.11.20.26.00#Well logging sonic services#71.11.20.00.00
-unspsc7#71.11.20.27.00#Stuck point tool services#71.11.20.00.00
-unspsc7#71.11.20.28.00#Thermal decay well logging services#71.11.20.00.00
-unspsc7#71.11.20.29.00#Well tubular corrosion evaluation services#71.11.20.00.00
-unspsc7#71.11.20.30.00#Well performance services#71.11.20.00.00
-unspsc7#71.11.20.31.00#Well tubular services#71.11.20.00.00
-unspsc7#71.11.21.00.00#Open hole well logging services#71.11.00.00.00
-unspsc7#71.11.21.01.00#Digital sonic logging services#71.11.21.00.00
-unspsc7#71.11.21.02.00#Borehole geometry logging services#71.11.21.00.00
-unspsc7#71.11.21.03.00#Density lithology nuclear logging services#71.11.21.00.00
-unspsc7#71.11.21.04.00#Dipmeter logging services#71.11.21.00.00
-unspsc7#71.11.21.05.00#Dipole sonic logging services#71.11.21.00.00
-unspsc7#71.11.21.06.00#Directional logging services#71.11.21.00.00
-unspsc7#71.11.21.07.00#Directional survey services#71.11.21.00.00
-unspsc7#71.11.21.08.00#Electromagnetic propagation logging services#71.11.21.00.00
-unspsc7#71.11.21.09.00#Formation testing sampling services#71.11.21.00.00
-unspsc7#71.11.21.10.00#Fracture identification logging services#71.11.21.00.00
-unspsc7#71.11.21.11.00#Gamma ray logging services#71.11.21.00.00
-unspsc7#71.11.21.12.00#Gamma ray spectroscopy logging services#71.11.21.00.00
-unspsc7#71.11.21.13.00#Geochemical nuclear logging services#71.11.21.00.00
-unspsc7#71.11.21.14.00#Well imaging services#71.11.21.00.00
-unspsc7#71.11.21.15.00#Magnetic resonance logging services#71.11.21.00.00
-unspsc7#71.11.21.16.00#Microresistivity logging services#71.11.21.00.00
-unspsc7#71.11.21.17.00#Neutron porosity logging services#71.11.21.00.00
-unspsc7#71.11.21.18.00#Petrophysics services#71.11.21.00.00
-unspsc7#71.11.21.19.00#Resistivity logging services#71.11.21.00.00
-unspsc7#71.11.21.20.00#Slim access sonic logging services#71.11.21.00.00
-unspsc7#71.11.21.21.00#Sonic cement bond ratio logging services#71.11.21.00.00
-unspsc7#71.11.21.22.00#Well sonic imaging services#71.11.21.00.00
-unspsc7#71.11.22.00.00#Other logging services#71.11.00.00.00
-unspsc7#71.11.22.01.00#Logging with coiled tubing services#71.11.22.00.00
-unspsc7#71.11.22.02.00#Logging while drilling services#71.11.22.00.00
-unspsc7#71.11.22.03.00#Logging during fishing services#71.11.22.00.00
-unspsc7#71.11.22.04.00#Logging while perforating services#71.11.22.00.00
-unspsc7#71.11.22.05.00#Drill pipe conveyed well services#71.11.22.00.00
-unspsc7#71.11.22.06.00#General well logging services#71.11.22.00.00
-unspsc7#71.11.23.00.00#Seismic services#71.11.00.00.00
-unspsc7#71.11.23.01.00#Two dimensional land seismic acquisition services#71.11.23.00.00
-unspsc7#71.11.23.02.00#Two dimensional marine seismic acquisition services#71.11.23.00.00
-unspsc7#71.11.23.03.00#Two dimensional seismic data processing services#71.11.23.00.00
-unspsc7#71.11.23.04.00#Three dimensional land seismic acquisition services#71.11.23.00.00
-unspsc7#71.11.23.05.00#Three dimensional marine seismic acquisition services#71.11.23.00.00
-unspsc7#71.11.23.06.00#Three dimensional seismic data processing services#71.11.23.00.00
-unspsc7#71.11.23.07.00#Four dimensional land seismic acquisition services#71.11.23.00.00
-unspsc7#71.11.23.08.00#Four dimensional marine seismic acquisition services#71.11.23.00.00
-unspsc7#71.11.23.09.00#Four dimensional seismic data processing services#71.11.23.00.00
-unspsc7#71.11.23.10.00#Checkshot seismic services#71.11.23.00.00
-unspsc7#71.11.23.11.00#Cross well seismic services#71.11.23.00.00
-unspsc7#71.11.23.12.00#Deviated well seismic services#71.11.23.00.00
-unspsc7#71.11.23.13.00#Geophysics seismic services#71.11.23.00.00
-unspsc7#71.11.23.14.00#Offset seismic services#71.11.23.00.00
-unspsc7#71.11.23.15.00#Quickshot seismic services#71.11.23.00.00
-unspsc7#71.11.23.16.00#Seismic data acquisition while drilling services#71.11.23.00.00
-unspsc7#71.11.23.17.00#Slim hole seismic services#71.11.23.00.00
-unspsc7#71.11.23.18.00#Seismic survey evaluation or design services#71.11.23.00.00
-unspsc7#71.11.23.19.00#Vertical seismic services#71.11.23.00.00
-unspsc7#71.11.23.20.00#Walkaway seismic services#71.11.23.00.00
-unspsc7#71.11.23.21.00#Geological services#71.11.23.00.00
-unspsc7#71.12.00.00.00#Well drilling construction and maintenance services#71.00.00.00.00
-unspsc7#71.12.10.00.00#Cement pumping services#71.12.00.00.00
-unspsc7#71.12.10.01.00#Oilfield casing hardware services#71.12.10.00.00
-unspsc7#71.12.10.02.00#Oilfield cement lab testing services#71.12.10.00.00
-unspsc7#71.12.10.03.00#Downhole oilfield tools services#71.12.10.00.00
-unspsc7#71.12.10.04.00#Oilfield filtering services#71.12.10.00.00
-unspsc7#71.12.10.05.00#Foam cementing services#71.12.10.00.00
-unspsc7#71.12.10.06.00#Geothermal well cementing services#71.12.10.00.00
-unspsc7#71.12.10.07.00#Liner cementing services#71.12.10.00.00
-unspsc7#71.12.10.08.00#Oilwell lost circulation services#71.12.10.00.00
-unspsc7#71.12.10.09.00#Oilfield mud removal services#71.12.10.00.00
-unspsc7#71.12.10.10.00#Plug cementing services#71.12.10.00.00
-unspsc7#71.12.10.11.00#Well site pressure pumping services#71.12.10.00.00
-unspsc7#71.12.10.12.00#Oilfield pressure testing services#71.12.10.00.00
-unspsc7#71.12.10.13.00#Surface casing cementing services#71.12.10.00.00
-unspsc7#71.12.10.14.00#Intermediate casing cementing services#71.12.10.00.00
-unspsc7#71.12.10.15.00#Production string cementing services#71.12.10.00.00
-unspsc7#71.12.10.16.00#Squeeze well cementing services#71.12.10.00.00
-unspsc7#71.12.10.17.00#Well water control services#71.12.10.00.00
-unspsc7#71.12.10.18.00#Well cement evaluation services#71.12.10.00.00
-unspsc7#71.12.10.19.00#Well cement grouting services#71.12.10.00.00
-unspsc7#71.12.10.20.00#Well cementing additives services#71.12.10.00.00
-unspsc7#71.12.10.21.00#Well cementing design services#71.12.10.00.00
-unspsc7#71.12.10.22.00#Well cleaning services#71.12.10.00.00
-unspsc7#71.12.10.23.00#Well repair services#71.12.10.00.00
-unspsc7#71.12.11.00.00#Coiled tubing services#71.12.00.00.00
-unspsc7#71.12.11.01.00#Acidizing through coiled tubing services#71.12.11.00.00
-unspsc7#71.12.11.02.00#Cable installation through coiled tubing services#71.12.11.00.00
-unspsc7#71.12.11.03.00#Cementing through coiled tubing services#71.12.11.00.00
-unspsc7#71.12.11.04.00#Chemical cutting through coiled tubing services#71.12.11.00.00
-unspsc7#71.12.11.05.00#Clean out through coiled tubing services#71.12.11.00.00
-unspsc7#71.12.11.06.00#Completion through coiled tubing services#71.12.11.00.00
-unspsc7#71.12.11.07.00#Conveying inflatables through coiled tubing services#71.12.11.00.00
-unspsc7#71.12.11.08.00#Coring through coiled tubing services#71.12.11.00.00
-unspsc7#71.12.11.09.00#Extended reach well services#71.12.11.00.00
-unspsc7#71.12.11.10.00#Fishing through coiled tubing services#71.12.11.00.00
-unspsc7#71.12.11.11.00#Fracturing through coiled tubing services#71.12.11.00.00
-unspsc7#71.12.11.12.00#High pressure coiled tubing services#71.12.11.00.00
-unspsc7#71.12.11.13.00#Horizontal isolation oilfield services#71.12.11.00.00
-unspsc7#71.12.11.14.00#Logging with coiled tubing services#71.12.11.00.00
-unspsc7#71.12.11.15.00#Milling through coiled tubing services#71.12.11.00.00
-unspsc7#71.12.11.16.00#Nitrogen related applications through coiled tubing#71.12.11.00.00
-unspsc7#71.12.11.17.00#Perforating through coiled tubing services#71.12.11.00.00
-unspsc7#71.12.11.18.00#Pipeline or flowline laying services#71.12.11.00.00
-unspsc7#71.12.11.19.00#Pipeline intervention services#71.12.11.00.00
-unspsc7#71.12.11.20.00#Sand control through coiled tubing services#71.12.11.00.00
-unspsc7#71.12.11.21.00#Abrasive tubular cleaning services#71.12.11.00.00
-unspsc7#71.12.11.22.00#Well kill through coiled tubing services#71.12.11.00.00
-unspsc7#71.12.11.23.00#Casing exit with coiled tubing services#71.12.11.00.00
-unspsc7#71.12.12.00.00#Coring services#71.12.00.00.00
-unspsc7#71.12.12.01.00#Conventional coring services#71.12.12.00.00
-unspsc7#71.12.12.02.00#Core isolation services#71.12.12.00.00
-unspsc7#71.12.12.03.00#Core preservation services#71.12.12.00.00
-unspsc7#71.12.12.04.00#Horizontal coring services#71.12.12.00.00
-unspsc7#71.12.12.05.00#Oriented coring services#71.12.12.00.00
-unspsc7#71.12.12.06.00#Rig site core analysis services#71.12.12.00.00
-unspsc7#71.12.12.07.00#Sponge coring services#71.12.12.00.00
-unspsc7#71.12.12.08.00#Wireline retrievable coring services#71.12.12.00.00
-unspsc7#71.12.13.00.00#Downhole tool services#71.12.00.00.00
-unspsc7#71.12.13.01.00#Downhole vibration control services#71.12.13.00.00
-unspsc7#71.12.13.02.00#Downhole hole opening services#71.12.13.00.00
-unspsc7#71.12.13.03.00#Reaming while drilling services#71.12.13.00.00
-unspsc7#71.12.13.04.00#Downhole torque or drag reduction services#71.12.13.00.00
-unspsc7#71.12.13.05.00#Downhole underreaming services#71.12.13.00.00
-unspsc7#71.12.14.00.00#Oilfield drilling bit services#71.12.00.00.00
-unspsc7#71.12.14.01.00#Oilfield drilling bit design services#71.12.14.00.00
-unspsc7#71.12.14.02.00#Oilfield drilling bit hydraulic optimization services#71.12.14.00.00
-unspsc7#71.12.14.03.00#Oilfield drilling bit planning services#71.12.14.00.00
-unspsc7#71.12.14.04.00#Oilfield drilling bit recording services#71.12.14.00.00
-unspsc7#71.12.14.05.00#Oilfield drilling bit repair services#71.12.14.00.00
-unspsc7#71.12.14.06.00#Oilfield drilling bit footage contracts#71.12.14.00.00
-unspsc7#71.12.14.07.00#Well site drilling optimization assistance service#71.12.14.00.00
-unspsc7#71.12.15.00.00#Drilling measurement services#71.12.00.00.00
-unspsc7#71.12.15.01.00#Acoustic measurement when drilling services#71.12.15.00.00
-unspsc7#71.12.15.02.00#Acoustic telemetry when drilling services#71.12.15.00.00
-unspsc7#71.12.15.03.00#Caliper measurement when drilling services#71.12.15.00.00
-unspsc7#71.12.15.04.00#Density measurement when drilling services#71.12.15.00.00
-unspsc7#71.12.15.05.00#Oilfield drilling performance services#71.12.15.00.00
-unspsc7#71.12.15.06.00#Electromagnetic telemetry when drilling services#71.12.15.00.00
-unspsc7#71.12.15.07.00#Formation dip measurement when drilling services#71.12.15.00.00
-unspsc7#71.12.15.08.00#Formation pressure measurement when drilling services#71.12.15.00.00
-unspsc7#71.12.15.09.00#Geologically steered wells#71.12.15.00.00
-unspsc7#71.12.15.10.00#Geostopping services#71.12.15.00.00
-unspsc7#71.12.15.11.00#Mud logging services#71.12.15.00.00
-unspsc7#71.12.15.12.00#Nuclear magnetic resonance services#71.12.15.00.00
-unspsc7#71.12.15.13.00#Porosity measurement when drilling services#71.12.15.00.00
-unspsc7#71.12.15.14.00#Resistivity measurement when drilling services#71.12.15.00.00
-unspsc7#71.12.15.15.00#Well surveying management services#71.12.15.00.00
-unspsc7#71.12.15.16.00#Surveying wireline services#71.12.15.00.00
-unspsc7#71.12.16.00.00#Oil well drilling services#71.12.00.00.00
-unspsc7#71.12.16.01.00#Well casing crew service#71.12.16.00.00
-unspsc7#71.12.16.02.00#Well casing planning services#71.12.16.00.00
-unspsc7#71.12.16.03.00#Well casing milling services#71.12.16.00.00
-unspsc7#71.12.16.04.00#Coiled tubing drilling services#71.12.16.00.00
-unspsc7#71.12.16.05.00#Well completion planning services#71.12.16.00.00
-unspsc7#71.12.16.06.00#Conventional well directional drilling services#71.12.16.00.00
-unspsc7#71.12.16.07.00#Well directional drilling services#71.12.16.00.00
-unspsc7#71.12.16.08.00#Well drilling contract development services#71.12.16.00.00
-unspsc7#71.12.16.09.00#Well drilling services#71.12.16.00.00
-unspsc7#71.12.16.10.00#Well drilling engineering services#71.12.16.00.00
-unspsc7#71.12.16.11.00#Well drilling mud or fluid services#71.12.16.00.00
-unspsc7#71.12.16.12.00#Well drilling of water intake well services#71.12.16.00.00
-unspsc7#71.12.16.13.00#Well drilling rig monitor services#71.12.16.00.00
-unspsc7#71.12.16.14.00#Well drilling solids control#71.12.16.00.00
-unspsc7#71.12.16.15.00#Well drilling stabilizing or hole opening services#71.12.16.00.00
-unspsc7#71.12.16.16.00#Well drilling supervision#71.12.16.00.00
-unspsc7#71.12.16.17.00#Well drilling control services#71.12.16.00.00
-unspsc7#71.12.16.18.00#Well drilling other general services#71.12.16.00.00
-unspsc7#71.12.16.19.00#Extended reach directional well drilling services#71.12.16.00.00
-unspsc7#71.12.16.20.00#Multilateral directional well drilling services#71.12.16.00.00
-unspsc7#71.12.16.21.00#Oil country tubular modification or testing services#71.12.16.00.00
-unspsc7#71.12.16.22.00#Well drilling pickup or laydown service#71.12.16.00.00
-unspsc7#71.12.16.23.00#Well drilling pipe storage#71.12.16.00.00
-unspsc7#71.12.16.24.00#Well drilling pipe threading#71.12.16.00.00
-unspsc7#71.12.16.25.00#Rathole well drilling service#71.12.16.00.00
-unspsc7#71.12.16.26.00#Short radius directional well drilling services#71.12.16.00.00
-unspsc7#71.12.16.27.00#Steerable underreaming while well drilling services#71.12.16.00.00
-unspsc7#71.12.16.28.00#Ultra short radius directional well drilling services#71.12.16.00.00
-unspsc7#71.12.16.29.00#Underbalanced well drilling services#71.12.16.00.00
-unspsc7#71.12.16.30.00#Well planning services#71.12.16.00.00
-unspsc7#71.12.16.31.00#Well redrilling or reworking services#71.12.16.00.00
-unspsc7#71.12.16.32.00#Well drilling deviation control#71.12.16.00.00
-unspsc7#71.12.16.33.00#Oilfield gravel packing services#71.12.16.00.00
-unspsc7#71.12.16.34.00#Oilfield hull systems services#71.12.16.00.00
-unspsc7#71.12.16.35.00#Rig well pulling crew services#71.12.16.00.00
-unspsc7#71.12.16.36.00#Wellhead equipment services#71.12.16.00.00
-unspsc7#71.12.16.37.00#Sidetracking with whipstock services#71.12.16.00.00
-unspsc7#71.12.17.00.00#Oilfield fishing services#71.12.00.00.00
-unspsc7#71.12.17.01.00#Oilfield fishing service design services#71.12.17.00.00
-unspsc7#71.12.17.02.00#Oilfield fishing service economic evaluation services#71.12.17.00.00
-unspsc7#71.12.17.03.00#Oilfield fishing service operation services#71.12.17.00.00
-unspsc7#71.12.17.04.00#Oilfield junk recovery services#71.12.17.00.00
-unspsc7#71.12.17.05.00#Oilfield pipe recovery service#71.12.17.00.00
-unspsc7#71.12.17.06.00#Oilfield fishing or drilling services#71.12.17.00.00
-unspsc7#71.12.18.00.00#Gas lift services#71.12.00.00.00
-unspsc7#71.12.18.01.00#Coiled tubing gas lift services#71.12.18.00.00
-unspsc7#71.12.18.02.00#Gas lift fixing or testing services#71.12.18.00.00
-unspsc7#71.12.18.03.00#Gas lift kickover services#71.12.18.00.00
-unspsc7#71.12.18.04.00#Gas lift sand containment services#71.12.18.00.00
-unspsc7#71.12.19.00.00#Down hole fluid services#71.12.00.00.00
-unspsc7#71.12.19.01.00#Down hole fluid evaluation services#71.12.19.00.00
-unspsc7#71.12.19.02.00#Down hole fluid laboratory services#71.12.19.00.00
-unspsc7#71.12.19.03.00#Down hole fluid sampling services#71.12.19.00.00
-unspsc7#71.12.20.00.00#Well perforating services#71.12.00.00.00
-unspsc7#71.12.20.01.00#Coiled tubing well perforating services#71.12.20.00.00
-unspsc7#71.12.20.02.00#Slickline well perforating services#71.12.20.00.00
-unspsc7#71.12.20.03.00#Through tubing well perforation services#71.12.20.00.00
-unspsc7#71.12.20.04.00#Tubing conveyed well perforating services#71.12.20.00.00
-unspsc7#71.12.20.05.00#Wireline well perforating services#71.12.20.00.00
-unspsc7#71.12.20.06.00#Well tubing puncher services#71.12.20.00.00
-unspsc7#71.12.21.00.00#Oilfield sand control services#71.12.00.00.00
-unspsc7#71.12.21.01.00#Acid sand control pumping services#71.12.21.00.00
-unspsc7#71.12.21.02.00#Sand control blending services#71.12.21.00.00
-unspsc7#71.12.21.03.00#Cleaning fluid sand control services#71.12.21.00.00
-unspsc7#71.12.21.04.00#Completion fluid sand control services#71.12.21.00.00
-unspsc7#71.12.21.05.00#Well consolidation services#71.12.21.00.00
-unspsc7#71.12.21.06.00#Oilfield filtering services#71.12.21.00.00
-unspsc7#71.12.21.07.00#Fracturing fluid sand control services#71.12.21.00.00
-unspsc7#71.12.21.08.00#Fracturing pre frac design testing services#71.12.21.00.00
-unspsc7#71.12.21.09.00#General sand control services#71.12.21.00.00
-unspsc7#71.12.21.10.00#Gravel carrier fluid sand control services#71.12.21.00.00
-unspsc7#71.12.21.11.00#Sand control lab testing services#71.12.21.00.00
-unspsc7#71.12.21.12.00#Multizone sand control services#71.12.21.00.00
-unspsc7#71.12.21.13.00#Sand control monitoring services#71.12.21.00.00
-unspsc7#71.12.21.14.00#Sand control temporary isolation services#71.12.21.00.00
-unspsc7#71.12.21.15.00#Well tool redressing services#71.12.21.00.00
-unspsc7#71.12.21.16.00#Non fracturing sand control pumping services#71.12.21.00.00
-unspsc7#71.12.22.00.00#Slickline services#71.12.00.00.00
-unspsc7#71.12.22.01.00#Slickline fishing services#71.12.22.00.00
-unspsc7#71.12.22.02.00#Slickline lifting services#71.12.22.00.00
-unspsc7#71.12.22.03.00#Slickline manipulation services#71.12.22.00.00
-unspsc7#71.12.23.00.00#Subsea well services#71.12.00.00.00
-unspsc7#71.12.23.01.00#Subsea well diving services#71.12.23.00.00
-unspsc7#71.12.23.02.00#Subsea well remote operation vehicle rov services#71.12.23.00.00
-unspsc7#71.12.23.03.00#Subsea well fixturing or test equipment services#71.12.23.00.00
-unspsc7#71.12.23.04.00#Subsea well intervention or completion services#71.12.23.00.00
-unspsc7#71.12.23.05.00#Subsea well safety test tree services#71.12.23.00.00
-unspsc7#71.12.23.06.00#Subsea well equipment maintenance services#71.12.23.00.00
-unspsc7#71.12.24.00.00#Well testing services#71.12.00.00.00
-unspsc7#71.12.24.01.00#Drill stem flow metering services#71.12.24.00.00
-unspsc7#71.12.24.02.00#Drill stem surface testing services#71.12.24.00.00
-unspsc7#71.12.24.03.00#Drill stem testing packer services#71.12.24.00.00
-unspsc7#71.12.24.04.00#Drill stem testing pressure control test services#71.12.24.00.00
-unspsc7#71.12.24.05.00#Drill stem testing pulse operated test services#71.12.24.00.00
-unspsc7#71.12.24.06.00#Drill stem testing for ultra high press high temp environment services#71.12.24.00.00
-unspsc7#71.12.24.07.00#Drill stem testing services#71.12.24.00.00
-unspsc7#71.12.24.08.00#Periodic well testing services#71.12.24.00.00
-unspsc7#71.12.24.09.00#Surface well testing services#71.12.24.00.00
-unspsc7#71.12.24.10.00#Underbalanced testing while drilling services#71.12.24.00.00
-unspsc7#71.12.25.00.00#Water or gas control services#71.12.00.00.00
-unspsc7#71.12.25.01.00#Water or gas control design services#71.12.25.00.00
-unspsc7#71.12.25.02.00#Water or gas control evaluation services#71.12.25.00.00
-unspsc7#71.12.25.03.00#Water or gas control isolation services#71.12.25.00.00
-unspsc7#71.12.25.04.00#Water or gas control testing services#71.12.25.00.00
-unspsc7#71.12.25.05.00#Water or gas testing services#71.12.25.00.00
-unspsc7#71.12.26.00.00#Well completion services#71.12.00.00.00
-unspsc7#71.12.26.01.00#Well casing completion services#71.12.26.00.00
-unspsc7#71.12.26.02.00#Well completion fluids services#71.12.26.00.00
-unspsc7#71.12.26.03.00#Gas lift well completion services#71.12.26.00.00
-unspsc7#71.12.26.04.00#Horizontal cased hole services#71.12.26.00.00
-unspsc7#71.12.26.05.00#Horizontal open hole services#71.12.26.00.00
-unspsc7#71.12.26.06.00#Intelligent well completion services#71.12.26.00.00
-unspsc7#71.12.26.07.00#Liner well completion services#71.12.26.00.00
-unspsc7#71.12.26.08.00#Multilateral well completion services#71.12.26.00.00
-unspsc7#71.12.26.09.00#Permanent well completion services#71.12.26.00.00
-unspsc7#71.12.26.10.00#Sand control well completion services#71.12.26.00.00
-unspsc7#71.12.26.11.00#Temporary drill stem testing well completion services#71.12.26.00.00
-unspsc7#71.12.26.12.00#Tubing well completion services#71.12.26.00.00
-unspsc7#71.12.26.13.00#Underbalanced well completion services#71.12.26.00.00
-unspsc7#71.12.27.00.00#Well maintenance services#71.12.00.00.00
-unspsc7#71.12.27.01.00#Oil well platform maintenance services#71.12.27.00.00
-unspsc7#71.12.27.02.00#Oilfield pumping unit maintenance services#71.12.27.00.00
-unspsc7#71.12.27.03.00#Oilfield rod pump repair services#71.12.27.00.00
-unspsc7#71.12.27.04.00#Oilfield snubbing service#71.12.27.00.00
-unspsc7#71.12.27.05.00#Oilfield sucker rod maintenance services#71.12.27.00.00
-unspsc7#71.12.27.06.00#Well swabbing services#71.12.27.00.00
-unspsc7#71.12.27.07.00#Oilfield tubing anchor services#71.12.27.00.00
-unspsc7#71.12.27.08.00#Oilfield pump mechanic services#71.12.27.00.00
-unspsc7#71.12.28.00.00#Well monitoring services#71.12.00.00.00
-unspsc7#71.12.28.01.00#Downhole recording services#71.12.28.00.00
-unspsc7#71.12.28.02.00#Well flow monitoring services#71.12.28.00.00
-unspsc7#71.12.28.03.00#Oil or gas well monitoring services#71.12.28.00.00
-unspsc7#71.12.28.04.00#Well site phase monitoring services#71.12.28.00.00
-unspsc7#71.12.28.05.00#Well site pump monitoring services#71.12.28.00.00
-unspsc7#71.12.28.06.00#Well site surface data acquisition services#71.12.28.00.00
-unspsc7#71.12.28.07.00#Well site surface readout services#71.12.28.00.00
-unspsc7#71.12.28.08.00#Well site surface recording services#71.12.28.00.00
-unspsc7#71.12.28.09.00#Surface well testing services#71.12.28.00.00
-unspsc7#71.12.28.10.00#Subsurface well testing services#71.12.28.00.00
-unspsc7#71.12.29.00.00#Oilfield rigs#71.12.00.00.00
-unspsc7#71.12.29.01.00#Deepwater oilfield rig services#71.12.29.00.00
-unspsc7#71.12.29.02.00#Jackup oilfield rig services#71.12.29.00.00
-unspsc7#71.12.29.03.00#Barge oilfield rig services#71.12.29.00.00
-unspsc7#71.12.29.04.00#Land oilfield rig services#71.12.29.00.00
-unspsc7#71.12.29.05.00#Platform oilfield rig services#71.12.29.00.00
-unspsc7#71.13.00.00.00#Oil and gas extraction and production enhancement services#71.00.00.00.00
-unspsc7#71.13.10.00.00#Well fracturing services#71.13.00.00.00
-unspsc7#71.13.10.01.00#Acid based fluid well fracturing services#71.13.10.00.00
-unspsc7#71.13.10.02.00#Emulsion based fluid well fracturing services#71.13.10.00.00
-unspsc7#71.13.10.03.00#Foam based fluid well fracturing services#71.13.10.00.00
-unspsc7#71.13.10.04.00#Oil well fracturing services#71.13.10.00.00
-unspsc7#71.13.10.05.00#Oil well scale control services#71.13.10.00.00
-unspsc7#71.13.10.06.00#Well fracture testing services#71.13.10.00.00
-unspsc7#71.13.10.07.00#Well fracturing downhole evaluation services#71.13.10.00.00
-unspsc7#71.13.10.08.00#Well fracturing height control services#71.13.10.00.00
-unspsc7#71.13.10.09.00#Well fracturing monitoring services#71.13.10.00.00
-unspsc7#71.13.10.10.00#Well fracturing service design services#71.13.10.00.00
-unspsc7#71.13.10.11.00#Well fracturing service evaluation services#71.13.10.00.00
-unspsc7#71.13.10.12.00#Well fracturing surface evaluation services#71.13.10.00.00
-unspsc7#71.13.10.13.00#Well fracturing treatment quality control services#71.13.10.00.00
-unspsc7#71.13.10.14.00#Oil based fluid well fracturing services#71.13.10.00.00
-unspsc7#71.13.10.15.00#Other well fracturing services#71.13.10.00.00
-unspsc7#71.13.10.16.00#Well fracturing stress management services#71.13.10.00.00
-unspsc7#71.13.10.17.00#Water based fluid well fracturing services#71.13.10.00.00
-unspsc7#71.13.11.00.00#Matrix stimulation services#71.13.00.00.00
-unspsc7#71.13.11.01.00#Acid based matrix stimulation services#71.13.11.00.00
-unspsc7#71.13.11.02.00#Formation sealer matrix stimulation services#71.13.11.00.00
-unspsc7#71.13.11.03.00#Matrix organic cleanup services#71.13.11.00.00
-unspsc7#71.13.11.04.00#Matrix organic inhibition services#71.13.11.00.00
-unspsc7#71.13.11.05.00#Matrix scale cleanup services#71.13.11.00.00
-unspsc7#71.13.11.06.00#Matrix scale inhibition services#71.13.11.00.00
-unspsc7#71.13.11.07.00#Matrix treatment design services#71.13.11.00.00
-unspsc7#71.13.11.08.00#Matrix treatment diversion services#71.13.11.00.00
-unspsc7#71.13.11.09.00#Matrix treatment evaluation services#71.13.11.00.00
-unspsc7#71.13.11.10.00#Matrix treatment quality control services#71.13.11.00.00
-unspsc7#71.13.11.11.00#Non acid based matrix stimulation services#71.13.11.00.00
-unspsc7#71.13.12.00.00#Oilfield nitrogen services#71.13.00.00.00
-unspsc7#71.13.12.01.00#Nitrogen well services#71.13.12.00.00
-unspsc7#71.13.13.00.00#Other oilfield pumping services#71.13.00.00.00
-unspsc7#71.13.13.01.00#Bottom intake oilfield pumping services#71.13.13.00.00
-unspsc7#71.13.13.02.00#Cable deployed oilfield pumping services#71.13.13.00.00
-unspsc7#71.13.13.03.00#Co2 oilfield pumping services#71.13.13.00.00
-unspsc7#71.13.13.04.00#Coiled tubing deployed oilfield pumping services#71.13.13.00.00
-unspsc7#71.13.13.05.00#Downhole pumping services#71.13.13.00.00
-unspsc7#71.13.13.06.00#Dual completion well services#71.13.13.00.00
-unspsc7#71.13.13.07.00#Horizontal pumping well services#71.13.13.00.00
-unspsc7#71.13.13.08.00#Oilfield pumping installation pull or operation services#71.13.13.00.00
-unspsc7#71.13.13.09.00#Well profile modification services#71.13.13.00.00
-unspsc7#71.13.13.10.00#Oilfield spooling services#71.13.13.00.00
-unspsc7#71.13.14.00.00#Well production services#71.13.00.00.00
-unspsc7#71.13.14.01.00#Oilfield flare system services#71.13.14.00.00
-unspsc7#71.13.14.02.00#Oilfield hot oil or water service#71.13.14.00.00
-unspsc7#71.13.14.03.00#Oilfield steaming services#71.13.14.00.00
-unspsc7#71.14.00.00.00#Oil and gas restoration and reclamation services#71.00.00.00.00
-unspsc7#71.14.10.00.00#Emergency well control services#71.14.00.00.00
-unspsc7#71.14.10.01.00#Well pressure control services#71.14.10.00.00
-unspsc7#71.14.10.02.00#Well capping services#71.14.10.00.00
-unspsc7#71.14.10.03.00#Well fire fighting services#71.14.10.00.00
-unspsc7#71.14.10.04.00#Wild well control services#71.14.10.00.00
-unspsc7#71.14.11.00.00#Well plugging and abandonment services#71.14.00.00.00
-unspsc7#71.14.11.01.00#Well abandonment services#71.14.11.00.00
-unspsc7#71.14.11.02.00#Well plugging services#71.14.11.00.00
-unspsc7#71.14.12.00.00#Well site restoration#71.14.00.00.00
-unspsc7#71.14.12.01.00#Well cleaning or swabbing services#71.14.12.00.00
-unspsc7#71.14.12.02.00#Well site restoration services#71.14.12.00.00
-unspsc7#71.15.00.00.00#Oil and gas data management and processing services#71.00.00.00.00
-unspsc7#71.15.10.00.00#Oilfield data communication services#71.15.00.00.00
-unspsc7#71.15.10.01.00#Log data transmission services#71.15.10.00.00
-unspsc7#71.15.10.02.00#Log graphics transmission services#71.15.10.00.00
-unspsc7#71.15.10.03.00#Real time well data monitoring services#71.15.10.00.00
-unspsc7#71.15.10.04.00#Satellite well data transmission services#71.15.10.00.00
-unspsc7#71.15.10.05.00#Well data transmission services#71.15.10.00.00
-unspsc7#71.15.11.00.00#Oilfield data management services#71.15.00.00.00
-unspsc7#71.15.11.01.00#Oilfield asset data management services#71.15.11.00.00
-unspsc7#71.15.11.02.00#Oilfield data mining services#71.15.11.00.00
-unspsc7#71.15.11.03.00#Log data management services#71.15.11.00.00
-unspsc7#71.15.11.04.00#Oilfield mapping data management services#71.15.11.00.00
-unspsc7#71.15.11.05.00#Seismic data management services#71.15.11.00.00
-unspsc7#71.15.12.00.00#Oilfield economic and risk model services#71.15.00.00.00
-unspsc7#71.15.12.01.00#Oilfield budgeting services#71.15.12.00.00
-unspsc7#71.15.12.02.00#Oilfield capital planning services#71.15.12.00.00
-unspsc7#71.15.12.03.00#Oilfield decision tree services#71.15.12.00.00
-unspsc7#71.15.13.00.00#Oilfield interpretation services#71.15.00.00.00
-unspsc7#71.15.13.01.00#Oilfield bubble map services#71.15.13.00.00
-unspsc7#71.15.13.02.00#Oilfield case studies#71.15.13.00.00
-unspsc7#71.15.13.03.00#Oilfield decline analysis#71.15.13.00.00
-unspsc7#71.15.13.04.00#Oilfield field studies#71.15.13.00.00
-unspsc7#71.15.13.05.00#Oilfield fracturing interpretation services#71.15.13.00.00
-unspsc7#71.15.13.06.00#Geology services#71.15.13.00.00
-unspsc7#71.15.13.07.00#Geophysics services#71.15.13.00.00
-unspsc7#71.15.13.08.00#Gravel pack interpretation services#71.15.13.00.00
-unspsc7#71.15.13.09.00#Oilfield grid mapping services#71.15.13.00.00
-unspsc7#71.15.13.10.00#Oilfield mapping or visualization services#71.15.13.00.00
-unspsc7#71.15.13.11.00#Petrophysics services#71.15.13.00.00
-unspsc7#71.15.13.12.00#Reservoir engineering services#71.15.13.00.00
-unspsc7#71.15.13.13.00#Reservoir modeling services#71.15.13.00.00
-unspsc7#71.15.13.14.00#Reservoir simulation services#71.15.13.00.00
-unspsc7#71.15.13.15.00#Rock mechanics services#71.15.13.00.00
-unspsc7#71.15.14.00.00#Well service engineering#71.15.00.00.00
-unspsc7#71.15.14.01.00#Well cementing job design services#71.15.14.00.00
-unspsc7#71.15.14.02.00#Coiled tubing job design services#71.15.14.00.00
-unspsc7#71.15.14.03.00#Well drilling job design services#71.15.14.00.00
-unspsc7#71.15.14.04.00#Well fracturing job design services#71.15.14.00.00
-unspsc7#71.15.14.05.00#Matrix stimulation job design services#71.15.14.00.00
-unspsc7#71.15.14.06.00#Well sand control job design services#71.15.14.00.00
-unspsc7#71.16.00.00.00#Oil and gas well project management services#71.00.00.00.00
-unspsc7#71.16.10.00.00#Oilfield Modeling Services#71.16.00.00.00
-unspsc7#71.16.10.01.00#Oilfield completion models#71.16.10.00.00
-unspsc7#71.16.10.02.00#Oilfield drilling models#71.16.10.00.00
-unspsc7#71.16.10.03.00#Oilfield economic models#71.16.10.00.00
-unspsc7#71.16.10.04.00#Oilfield field development models#71.16.10.00.00
-unspsc7#71.16.10.05.00#Oilfield production models#71.16.10.00.00
-unspsc7#71.16.10.06.00#Oilfield risk management services#71.16.10.00.00
-unspsc7#71.16.11.00.00#Oilfield production engineering management#71.16.00.00.00
-unspsc7#71.16.11.01.00#Oilfield artificial lift services#71.16.11.00.00
-unspsc7#71.16.11.02.00#Enhanced oil recovery services#71.16.11.00.00
-unspsc7#71.16.11.03.00#Well injection services#71.16.11.00.00
-unspsc7#71.16.11.04.00#Oilfield nodal analysis services#71.16.11.00.00
-unspsc7#71.16.11.05.00#Well perforation services#71.16.11.00.00
-unspsc7#71.16.11.06.00#Oilfield production chemistry services#71.16.11.00.00
-unspsc7#71.16.11.07.00#Oilfield production monitoring services#71.16.11.00.00
-unspsc7#71.16.11.08.00#Oilfield sand control services#71.16.11.00.00
-unspsc7#71.16.11.09.00#Well stimulation services#71.16.11.00.00
-unspsc7#71.16.11.10.00#Underground gas storage services#71.16.11.00.00
-unspsc7#71.16.11.11.00#Oilfield water management services#71.16.11.00.00
-unspsc7#71.16.12.00.00#Oilfield production operations management#71.16.00.00.00
-unspsc7#71.16.12.01.00#Oilfield hot oiling service#71.16.12.00.00
-unspsc7#71.16.12.02.00#Oilfield lease operations#71.16.12.00.00
-unspsc7#71.16.12.03.00#Oilfield logging services#71.16.12.00.00
-unspsc7#71.16.12.04.00#Oilfield paraffin cutting service#71.16.12.00.00
-unspsc7#71.16.12.05.00#Oilfield planning services#71.16.12.00.00
-unspsc7#71.16.12.06.00#Oilfield processing services#71.16.12.00.00
-unspsc7#71.16.12.07.00#Well testing services#71.16.12.00.00
-unspsc7#71.16.13.00.00#Oilfield project management services#71.16.00.00.00
-unspsc7#71.16.13.01.00#Oilfield audits or inspection services#71.16.13.00.00
-unspsc7#71.16.13.02.00#Oilfield emergency response planning services#71.16.13.00.00
-unspsc7#71.16.13.03.00#Oilfield field development services#71.16.13.00.00
-unspsc7#71.16.13.04.00#Oilfield performance monitoring services#71.16.13.00.00
-unspsc7#71.16.13.05.00#Oilfield reporting services#71.16.13.00.00
-unspsc7#71.16.13.06.00#Oilfield succession plan or handover services#71.16.13.00.00
-unspsc7#71.16.13.07.00#Oilfield training matrix services#71.16.13.00.00
-unspsc7#71.16.13.08.00#Well site logistics or procurement services#71.16.13.00.00
-unspsc7#71.16.14.00.00#Well construction management services#71.16.00.00.00
-unspsc7#71.16.14.01.00#Coiled tubing drilling services#71.16.14.00.00
-unspsc7#71.16.14.02.00#Well completion engineering services#71.16.14.00.00
-unspsc7#71.16.14.03.00#Deadman anchor services#71.16.14.00.00
-unspsc7#71.16.14.04.00#Well drilling engineering services#71.16.14.00.00
-unspsc7#71.16.14.05.00#Well site pit lining services#71.16.14.00.00
-unspsc7#71.16.14.06.00#Well plug or abandonment service#71.16.14.00.00
-unspsc7#71.16.14.07.00#Well pulling unit services#71.16.14.00.00
-unspsc7#71.16.14.08.00#Shorebase services#71.16.14.00.00
-unspsc7#71.16.14.09.00#Test pit lining services#71.16.14.00.00
-unspsc7#71.16.14.10.00#Well site vacuum truck services#71.16.14.00.00
-unspsc7#71.16.14.11.00#Underbalanced applications engineering services#71.16.14.00.00
-unspsc7#71.16.14.12.00#Well workover services#71.16.14.00.00
-unspsc7#71.16.14.13.00#Well fabrication or construction services#71.16.14.00.00
-unspsc7#71.16.15.00.00#Well site operations services#71.16.00.00.00
-unspsc7#71.16.15.01.00#Well site electrical or instrumentation services#71.16.15.00.00
-unspsc7#71.16.15.02.00#Well site heavy equipment or crane services#71.16.15.00.00
-unspsc7#71.16.15.03.00#Well site inspection or equipment testing services#71.16.15.00.00
-unspsc7#71.16.15.04.00#Well site instrument and meter services#71.16.15.00.00
-unspsc7#71.16.15.05.00#Well site valve or valve part services#71.16.15.00.00
-unspsc7#72.00.00.00.00#Building and Construction and Maintenance Services#72.00.00.00.00
-unspsc7#72.10.00.00.00#Building construction and support and maintenance and repair services#72.00.00.00.00
-unspsc7#72.10.15.00.00#Building support services#72.10.00.00.00
-unspsc7#72.10.15.01.00#Handyman services#72.10.15.00.00
-unspsc7#72.10.15.02.00#Scaffolding services#72.10.15.00.00
-unspsc7#72.10.15.03.00#Rigging services#72.10.15.00.00
-unspsc7#72.10.15.04.00#Disaster proofing or contingency services#72.10.15.00.00
-unspsc7#72.10.15.05.00#Locksmith services#72.10.15.00.00
-unspsc7#72.10.16.00.00#Roofing and siding and sheet metal work#72.10.00.00.00
-unspsc7#72.10.16.01.00#Roofing installation or repair#72.10.16.00.00
-unspsc7#72.10.16.02.00#Skylight installation#72.10.16.00.00
-unspsc7#72.10.16.03.00#Gutter or downspout services#72.10.16.00.00
-unspsc7#72.10.16.04.00#Architectural sheet metal work#72.10.16.00.00
-unspsc7#72.10.16.05.00#Ceiling erection or repair#72.10.16.00.00
-unspsc7#72.10.16.06.00#Chute installation#72.10.16.00.00
-unspsc7#72.10.16.07.00#Siding installation or repair#72.10.16.00.00
-unspsc7#72.10.17.00.00#Concrete work#72.10.00.00.00
-unspsc7#72.10.17.01.00#Exterior concrete or stucco services#72.10.17.00.00
-unspsc7#72.10.17.02.00#Grouting services#72.10.17.00.00
-unspsc7#72.10.17.03.00#Sidewalk or curb construction#72.10.17.00.00
-unspsc7#72.10.17.04.00#Foundation or slab work#72.10.17.00.00
-unspsc7#72.10.18.00.00#Exterior cleaning#72.10.00.00.00
-unspsc7#72.10.18.01.00#Sandblasting#72.10.18.00.00
-unspsc7#72.10.18.02.00#High pressure water blasting#72.10.18.00.00
-unspsc7#72.10.18.03.00#Steam cleaning#72.10.18.00.00
-unspsc7#72.10.19.00.00#Interior finishing#72.10.00.00.00
-unspsc7#72.10.19.01.00#Interior design or decorating#72.10.19.00.00
-unspsc7#72.10.19.02.00#Plastering or drywall#72.10.19.00.00
-unspsc7#72.10.19.03.00#Finish carpentry or cabinetry#72.10.19.00.00
-unspsc7#72.10.20.00.00#Coating and caulking and weather and water and fireproofing#72.10.00.00.00
-unspsc7#72.10.20.01.00#Caulking#72.10.20.00.00
-unspsc7#72.10.20.02.00#Plastic encasement or coating of structural materials#72.10.20.00.00
-unspsc7#72.10.20.03.00#Coating or glazing of metal or wood or concrete structural materials#72.10.20.00.00
-unspsc7#72.10.20.04.00#Dampproofing#72.10.20.00.00
-unspsc7#72.10.20.05.00#Fireproofing of buildings#72.10.20.00.00
-unspsc7#72.10.20.06.00#Wrapping of pipes#72.10.20.00.00
-unspsc7#72.10.21.00.00#Pest control#72.10.00.00.00
-unspsc7#72.10.21.01.00#Bird proofing services#72.10.21.00.00
-unspsc7#72.10.21.02.00#Termite control services#72.10.21.00.00
-unspsc7#72.10.21.03.00#Extermination or fumigation services#72.10.21.00.00
-unspsc7#72.10.21.04.00#Structural pest control#72.10.21.00.00
-unspsc7#72.10.21.05.00#Animal trapping#72.10.21.00.00
-unspsc7#72.10.21.06.00#Rodent control#72.10.21.00.00
-unspsc7#72.10.22.00.00#Electrical services#72.10.00.00.00
-unspsc7#72.10.22.01.00#Electric power systems installation or service#72.10.22.00.00
-unspsc7#72.10.22.02.00#Electronic controls installation#72.10.22.00.00
-unspsc7#72.10.22.03.00#Communication equipment installation#72.10.22.00.00
-unspsc7#72.10.22.04.00#Safety or security systems installation#72.10.22.00.00
-unspsc7#72.10.22.05.00#Cabling service#72.10.22.00.00
-unspsc7#72.10.23.00.00#Plumbing and heating and air conditioning#72.10.00.00.00
-unspsc7#72.10.23.01.00#Boiler installation or adjustment or maintenance or repair services#72.10.23.00.00
-unspsc7#72.10.23.02.00#Heating systems installation repair or maintenance#72.10.23.00.00
-unspsc7#72.10.23.03.00#Plumbing system construction#72.10.23.00.00
-unspsc7#72.10.23.04.00#Plumbing system maintenance or repair#72.10.23.00.00
-unspsc7#72.10.23.05.00#Air conditioning installation or maintenance or repair services#72.10.23.00.00
-unspsc7#72.10.24.00.00#Painting and paper hanging#72.10.00.00.00
-unspsc7#72.10.24.01.00#Exterior painting services#72.10.24.00.00
-unspsc7#72.10.24.02.00#Interior painting services#72.10.24.00.00
-unspsc7#72.10.24.03.00#Wallcovering services#72.10.24.00.00
-unspsc7#72.10.24.04.00#Industrial or specialized paint application for aircraft or ship or bridge#72.10.24.00.00
-unspsc7#72.10.24.05.00#Pavement marking services#72.10.24.00.00
-unspsc7#72.10.25.00.00#Masonry and stonework and tile setting#72.10.00.00.00
-unspsc7#72.10.25.01.00#Bricklaying#72.10.25.00.00
-unspsc7#72.10.25.02.00#Chimney construction or maintenance#72.10.25.00.00
-unspsc7#72.10.25.03.00#Marble or stone or tile installation#72.10.25.00.00
-unspsc7#72.10.25.04.00#Retaining wall construction#72.10.25.00.00
-unspsc7#72.10.25.05.00#Fresco work#72.10.25.00.00
-unspsc7#72.10.25.06.00#Acoustical#72.10.25.00.00
-unspsc7#72.10.25.07.00#Insulating material installation#72.10.25.00.00
-unspsc7#72.10.25.08.00#Restoration of masonry or stonework or tile#72.10.25.00.00
-unspsc7#72.10.26.00.00#Carpentry#72.10.00.00.00
-unspsc7#72.10.26.01.00#Rough carpentry#72.10.26.00.00
-unspsc7#72.10.26.02.00#Windows or door or fixture installation#72.10.26.00.00
-unspsc7#72.10.26.03.00#Furniture installation#72.10.26.00.00
-unspsc7#72.10.27.00.00#Flooring service#72.10.00.00.00
-unspsc7#72.10.27.01.00#Floor sheathing or laying or installation or finishing#72.10.27.00.00
-unspsc7#72.10.27.02.00#Floor covering installation or maintenance#72.10.27.00.00
-unspsc7#72.10.27.03.00#Floor cleaning services#72.10.27.00.00
-unspsc7#72.10.28.00.00#Refurbishing services#72.10.00.00.00
-unspsc7#72.10.28.01.00#Renovation of buildings or landmarks or monuments#72.10.28.00.00
-unspsc7#72.10.28.02.00#Restoration of buildings or landmarks or monuments#72.10.28.00.00
-unspsc7#72.10.29.00.00#Grounds maintenance services#72.10.00.00.00
-unspsc7#72.10.29.01.00#Snow Removal Services#72.10.29.00.00
-unspsc7#72.10.29.02.00#Landscaping services#72.10.29.00.00
-unspsc7#72.10.30.00.00#Site preparation services#72.10.00.00.00
-unspsc7#72.10.30.01.00#Land clearing services#72.10.30.00.00
-unspsc7#72.10.30.02.00#Land levelling services#72.10.30.00.00
-unspsc7#72.10.30.03.00#Demolition services#72.10.30.00.00
-unspsc7#72.10.30.04.00#Digging services#72.10.30.00.00
-unspsc7#72.11.00.00.00#General building construction#72.00.00.00.00
-unspsc7#72.11.15.00.00#Private housing#72.11.00.00.00
-unspsc7#72.11.15.01.00#Single family housing construction or remodeling or repair#72.11.15.00.00
-unspsc7#72.11.15.02.00#Residential multi tenant construction or remodeling or repair#72.11.15.00.00
-unspsc7#72.11.16.00.00#Industrial plants#72.11.00.00.00
-unspsc7#72.11.16.01.00#Commercial office building construction or remodeling or renovation or repair#72.11.16.00.00
-unspsc7#72.11.16.02.00#Industrial buildings or warehouse construction or remodeling or renovation or repair#72.11.16.00.00
-unspsc7#72.11.17.00.00#Public use buildings#72.11.00.00.00
-unspsc7#72.11.17.01.00#Specialized public use building construction#72.11.17.00.00
-unspsc7#72.11.17.02.00#Non residential agricultural building construction#72.11.17.00.00
-unspsc7#72.11.17.03.00#Service station or service garage construction#72.11.17.00.00
-unspsc7#72.11.17.04.00#Commercial building construction or erection or renovation or repair#72.11.17.00.00
-unspsc7#72.11.18.00.00#Commercial buildings#72.11.00.00.00
-unspsc7#72.11.18.01.00#Restaurant construction or renovation or repair or maintenance#72.11.18.00.00
-unspsc7#72.11.18.02.00#Shopping center or store construction or renovation or repair or maintenance#72.11.18.00.00
-unspsc7#72.11.18.03.00#Office building construction or renovation or repair or maintenance#72.11.18.00.00
-unspsc7#72.11.18.04.00#Bathroom renovation#72.11.18.00.00
-unspsc7#72.11.19.00.00#Land and building site preparation#72.11.00.00.00
-unspsc7#72.11.19.01.00#Land clearing#72.11.19.00.00
-unspsc7#72.11.19.02.00#Land leveling#72.11.19.00.00
-unspsc7#72.11.19.03.00#Building demolition#72.11.19.00.00
-unspsc7#72.12.00.00.00#Infrastructure construction and maintenance#72.00.00.00.00
-unspsc7#72.12.15.00.00#Highways and streets#72.12.00.00.00
-unspsc7#72.12.15.01.00#Highway or street or road construction#72.12.15.00.00
-unspsc7#72.12.15.02.00#Highway or street or road surfacing or paving or maintenance#72.12.15.00.00
-unspsc7#72.12.15.03.00#Highway or street guardrail construction or maintenance#72.12.15.00.00
-unspsc7#72.12.15.04.00#Highway or street sign or traffic signal installation#72.12.15.00.00
-unspsc7#72.12.16.00.00#Water and sewer and utility lines#72.12.00.00.00
-unspsc7#72.12.16.01.00#Electric power line construction or installation#72.12.16.00.00
-unspsc7#72.12.16.02.00#Cable laying#72.12.16.00.00
-unspsc7#72.12.16.03.00#Aqueduct construction or maintenance#72.12.16.00.00
-unspsc7#72.12.16.04.00#Sewer line construction or maintenance#72.12.16.00.00
-unspsc7#72.12.16.05.00#Water main construction or maintenance#72.12.16.00.00
-unspsc7#72.12.16.06.00#Voice or data line construction or maintenance#72.12.16.00.00
-unspsc7#72.12.16.07.00#Water industrial plant construction#72.12.16.00.00
-unspsc7#72.12.17.00.00#Dams and marine construction#72.12.00.00.00
-unspsc7#72.12.17.01.00#Dam construction or maintenance#72.12.17.00.00
-unspsc7#72.12.17.02.00#Pier or dock construction or maintenance#72.12.17.00.00
-unspsc7#72.12.17.03.00#Harbor or breakwater construction or maintenance#72.12.17.00.00
-unspsc7#72.12.17.04.00#Dyke or levee construction or maintenance#72.12.17.00.00
-unspsc7#72.12.17.05.00#Dredging or caisson drilling#72.12.17.00.00
-unspsc7#72.12.17.06.00#Canal or drainage or irrigation system construction or maintenance#72.12.17.00.00
-unspsc7#72.12.17.07.00#Pond construction or maintenance#72.12.17.00.00
-unspsc7#72.12.18.00.00#Railroads and subways and tramways#72.12.00.00.00
-unspsc7#72.12.18.01.00#Cutting of right of way#72.12.18.00.00
-unspsc7#72.12.18.02.00#Railroad construction or maintenance#72.12.18.00.00
-unspsc7#72.12.18.03.00#Subway construction or maintenance#72.12.18.00.00
-unspsc7#72.12.18.04.00#Tram construction or maintenance#72.12.18.00.00
-unspsc7#72.12.19.00.00#Airports and aviation#72.12.00.00.00
-unspsc7#72.12.19.01.00#Airport runway construction#72.12.19.00.00
-unspsc7#72.12.19.02.00#Airport terminal construction#72.12.19.00.00
-unspsc7#72.12.19.03.00#Helipad construction#72.12.19.00.00
-unspsc7#72.12.20.00.00#Bridges and tunnels and viaducts#72.12.00.00.00
-unspsc7#72.12.20.01.00#Bridge construction or maintenance#72.12.20.00.00
-unspsc7#72.12.20.02.00#Tunnel construction or maintenance#72.12.20.00.00
-unspsc7#72.12.20.03.00#Viaduct construction or maintenance#72.12.20.00.00
-unspsc7#72.12.21.00.00#Construction quantity surveyors#72.12.00.00.00
-unspsc7#72.12.21.01.00#Water or wastewater quantity surveyors#72.12.21.00.00
-unspsc7#72.12.22.00.00#Construction consultancy services#72.12.00.00.00
-unspsc7#72.12.22.01.00#Site supervision#72.12.22.00.00
-unspsc7#72.12.22.02.00#Industrial plant design#72.12.22.00.00
-unspsc7#73.00.00.00.00#Industrial Production and Manufacturing Services#73.00.00.00.00
-unspsc7#73.10.00.00.00#Plastic and chemical industries#73.00.00.00.00
-unspsc7#73.10.15.00.00#Petrochemical and plastic production#73.10.00.00.00
-unspsc7#73.10.15.01.00#Petroleum refining services#73.10.15.00.00
-unspsc7#73.10.15.02.00#Natural gas production services#73.10.15.00.00
-unspsc7#73.10.15.03.00#Oils or greases production services#73.10.15.00.00
-unspsc7#73.10.15.04.00#Coal production services#73.10.15.00.00
-unspsc7#73.10.15.05.00#Plastics or resins or fibers manufacturing services#73.10.15.00.00
-unspsc7#73.10.15.06.00#Credit card production or embossing services#73.10.15.00.00
-unspsc7#73.10.16.00.00#Chemicals and fertilizers production#73.10.00.00.00
-unspsc7#73.10.16.01.00#Inorganic chemicals production services#73.10.16.00.00
-unspsc7#73.10.16.02.00#Soda ash or chlorine or caustic soda production services#73.10.16.00.00
-unspsc7#73.10.16.03.00#Inorganic acids production services#73.10.16.00.00
-unspsc7#73.10.16.04.00#Organic chemical production services#73.10.16.00.00
-unspsc7#73.10.16.05.00#Acetylene or derivatives production services#73.10.16.00.00
-unspsc7#73.10.16.06.00#Ethylene or derivatives production services#73.10.16.00.00
-unspsc7#73.10.16.07.00#Ethanol or methanol or derivatives production services#73.10.16.00.00
-unspsc7#73.10.16.08.00#Fertilizers production services#73.10.16.00.00
-unspsc7#73.10.16.09.00#Potash mining or processing services#73.10.16.00.00
-unspsc7#73.10.16.10.00#Pesticide production services#73.10.16.00.00
-unspsc7#73.10.16.11.00#Paints or varnishes or lacquers production services#73.10.16.00.00
-unspsc7#73.10.16.12.00#Soap or cleaning preparations or perfumes or cosmetics production services#73.10.16.00.00
-unspsc7#73.10.16.13.00#Solvents or glycols or detergents production services#73.10.16.00.00
-unspsc7#73.10.16.14.00#Ferments or enzymes services#73.10.16.00.00
-unspsc7#73.10.17.00.00#Pharmaceutical production#73.10.00.00.00
-unspsc7#73.10.17.01.00#Drugs or medicine production services#73.10.17.00.00
-unspsc7#73.10.17.02.00#Vaccines or sera or antibiotics production services#73.10.17.00.00
-unspsc7#73.10.17.03.00#Parapharmaceutical production services#73.10.17.00.00
-unspsc7#73.10.18.00.00#Biochemical and biotechnology production#73.10.00.00.00
-unspsc7#73.10.18.01.00#Biomass production services#73.10.18.00.00
-unspsc7#73.10.18.02.00#Bioprotein production services#73.10.18.00.00
-unspsc7#73.10.19.00.00#Rubber production#73.10.00.00.00
-unspsc7#73.10.19.01.00#Rubber milling services#73.10.19.00.00
-unspsc7#73.10.19.02.00#Rubber tires or tubes production services#73.10.19.00.00
-unspsc7#73.10.19.03.00#Rubber or plastic footwear production services#73.10.19.00.00
-unspsc7#73.11.00.00.00#Wood and paper industries#73.00.00.00.00
-unspsc7#73.11.15.00.00#Wood processing#73.11.00.00.00
-unspsc7#73.11.15.01.00#Sawmilling services#73.11.15.00.00
-unspsc7#73.11.15.02.00#Veneer production services#73.11.15.00.00
-unspsc7#73.11.15.03.00#Wood base panels manufacturing services#73.11.15.00.00
-unspsc7#73.11.15.04.00#Wooden containers manufacturing services#73.11.15.00.00
-unspsc7#73.11.15.05.00#Furniture manufacturing services#73.11.15.00.00
-unspsc7#73.11.15.06.00#Cork products manufacturing services#73.11.15.00.00
-unspsc7#73.11.15.07.00#Cane or wickerware processing services#73.11.15.00.00
-unspsc7#73.11.16.00.00#Pulp and paper processing#73.11.00.00.00
-unspsc7#73.11.16.01.00#Pulp production services#73.11.16.00.00
-unspsc7#73.11.16.02.00#Paper or paper board production services#73.11.16.00.00
-unspsc7#73.11.16.03.00#Hardboard or fiberboard production services#73.11.16.00.00
-unspsc7#73.11.16.04.00#Paper production or recycling services#73.11.16.00.00
-unspsc7#73.12.00.00.00#Metal and mineral industries#73.00.00.00.00
-unspsc7#73.12.15.00.00#Metal smelting and refining and forming processes#73.12.00.00.00
-unspsc7#73.12.15.01.00#Ferrous alloy production services#73.12.15.00.00
-unspsc7#73.12.15.02.00#Basic metal combination processes services#73.12.15.00.00
-unspsc7#73.12.15.03.00#Refractors services for iron or steel production#73.12.15.00.00
-unspsc7#73.12.15.04.00#Iron or steel making services#73.12.15.00.00
-unspsc7#73.12.15.05.00#Iron or steel forging services#73.12.15.00.00
-unspsc7#73.12.15.06.00#Pre finishing iron or steel processes services#73.12.15.00.00
-unspsc7#73.12.15.07.00#Finishing metal processing services#73.12.15.00.00
-unspsc7#73.12.15.08.00#Smelting metal services#73.12.15.00.00
-unspsc7#73.12.15.09.00#Refining metal services#73.12.15.00.00
-unspsc7#73.12.16.00.00#Metal finishing#73.12.00.00.00
-unspsc7#73.12.16.01.00#Metal cutting services#73.12.16.00.00
-unspsc7#73.12.16.02.00#Blacksmith services#73.12.16.00.00
-unspsc7#73.12.16.03.00#Metal heating services#73.12.16.00.00
-unspsc7#73.12.16.04.00#Metal plating or replating services#73.12.16.00.00
-unspsc7#73.12.16.05.00#Metal rolling operations#73.12.16.00.00
-unspsc7#73.12.16.06.00#Metal forging services#73.12.16.00.00
-unspsc7#73.12.16.07.00#Metal drawing services#73.12.16.00.00
-unspsc7#73.12.16.08.00#Metal extruding services#73.12.16.00.00
-unspsc7#73.12.16.09.00#Surface metal finishing or treatment services#73.12.16.00.00
-unspsc7#73.12.16.10.00#Horseshoeing services#73.12.16.00.00
-unspsc7#73.12.16.11.00#Tinsmithing services#73.12.16.00.00
-unspsc7#73.12.16.12.00#Rebabbiting services#73.12.16.00.00
-unspsc7#73.12.16.13.00#Metal casting services#73.12.16.00.00
-unspsc7#73.12.17.00.00#Welding and brazing and soldering#73.12.00.00.00
-unspsc7#73.12.17.01.00#Welding services#73.12.17.00.00
-unspsc7#73.12.17.02.00#Brazing services#73.12.17.00.00
-unspsc7#73.12.17.03.00#Soldering services#73.12.17.00.00
-unspsc7#73.12.17.04.00#Casting services#73.12.17.00.00
-unspsc7#73.12.18.00.00#Non metallic mineral products industry services#73.12.00.00.00
-unspsc7#73.12.18.01.00#Pottery or china or earthenware manufacturing services#73.12.18.00.00
-unspsc7#73.12.18.02.00#Glass or glass products manufacturing services#73.12.18.00.00
-unspsc7#73.12.18.03.00#Structural clay products manufacturing services#73.12.18.00.00
-unspsc7#73.12.18.04.00#Cement or lime or plaster manufacturing services#73.12.18.00.00
-unspsc7#73.12.18.05.00#Concrete or aggregates or stone products manufacturing services#73.12.18.00.00
-unspsc7#73.12.18.06.00#Abrasives manufacturing services#73.12.18.00.00
-unspsc7#73.12.18.07.00#Asbestos products manufacturing services#73.12.18.00.00
-unspsc7#73.13.00.00.00#Food and beverage industries#73.00.00.00.00
-unspsc7#73.13.15.00.00#Beverage processing#73.13.00.00.00
-unspsc7#73.13.15.01.00#Spirits distilling or blending services#73.13.15.00.00
-unspsc7#73.13.15.02.00#Wine processing services#73.13.15.00.00
-unspsc7#73.13.15.03.00#Brewery processing services#73.13.15.00.00
-unspsc7#73.13.15.04.00#Non alcoholic fruit based beverage processing services#73.13.15.00.00
-unspsc7#73.13.15.05.00#Water beverages processing services#73.13.15.00.00
-unspsc7#73.13.15.06.00#Infused beverages processing services#73.13.15.00.00
-unspsc7#73.13.15.07.00#Coffee processing services#73.13.15.00.00
-unspsc7#73.13.15.08.00#Tea processing services#73.13.15.00.00
-unspsc7#73.13.16.00.00#Meat and poultry and seafood processing#73.13.00.00.00
-unspsc7#73.13.16.01.00#Meat products or by products processing services#73.13.16.00.00
-unspsc7#73.13.16.02.00#Fish or fish products processing services#73.13.16.00.00
-unspsc7#73.13.16.03.00#Poultry processing services#73.13.16.00.00
-unspsc7#73.13.16.04.00#Meat hygiene or inspection services#73.13.16.00.00
-unspsc7#73.13.16.05.00#Meat plant operation or management services#73.13.16.00.00
-unspsc7#73.13.16.06.00#Slaughter houses services#73.13.16.00.00
-unspsc7#73.13.16.07.00#Butcher services#73.13.16.00.00
-unspsc7#73.13.16.08.00#Cold storage services#73.13.16.00.00
-unspsc7#73.13.17.00.00#Fruits and vegetables processing#73.13.00.00.00
-unspsc7#73.13.17.01.00#Fruit or vegetable cleaning services#73.13.17.00.00
-unspsc7#73.13.17.02.00#Fruit or vegetable spraying services#73.13.17.00.00
-unspsc7#73.13.17.03.00#Fruit or vegetable packing services#73.13.17.00.00
-unspsc7#73.13.18.00.00#Dairy and eggs processing#73.13.00.00.00
-unspsc7#73.13.18.01.00#Milk processing services#73.13.18.00.00
-unspsc7#73.13.18.02.00#Egg processing services#73.13.18.00.00
-unspsc7#73.13.18.03.00#Cheese processing services#73.13.18.00.00
-unspsc7#73.13.18.04.00#Butter or cream processing services#73.13.18.00.00
-unspsc7#73.13.19.00.00#Grains and sugar and oils and fat processing#73.13.00.00.00
-unspsc7#73.13.19.01.00#Milling services#73.13.19.00.00
-unspsc7#73.13.19.02.00#Cereal products processing services#73.13.19.00.00
-unspsc7#73.13.19.03.00#Sugar or sugar products processing services#73.13.19.00.00
-unspsc7#73.13.19.04.00#Vegetable oils or fats processing services#73.13.19.00.00
-unspsc7#73.13.19.05.00#Spice processing services#73.13.19.00.00
-unspsc7#73.13.19.06.00#Bakery products processing services#73.13.19.00.00
-unspsc7#73.14.00.00.00#Fibers and textiles and fabric industries#73.00.00.00.00
-unspsc7#73.14.15.00.00#Fiber production#73.14.00.00.00
-unspsc7#73.14.15.01.00#Rayon or acetate fiber manufacturing services#73.14.15.00.00
-unspsc7#73.14.15.02.00#Glass fiber manufacturing services#73.14.15.00.00
-unspsc7#73.14.15.03.00#Silk fiber manufacturing services#73.14.15.00.00
-unspsc7#73.14.15.04.00#Cotton fiber manufacturing services#73.14.15.00.00
-unspsc7#73.14.15.05.00#Wool fiber manufacturing services#73.14.15.00.00
-unspsc7#73.14.15.06.00#Polyester fiber manufacturing services#73.14.15.00.00
-unspsc7#73.14.15.07.00#Polyamide fiber manufacturing services#73.14.15.00.00
-unspsc7#73.14.15.08.00#Acrylic fiber manufacturing services#73.14.15.00.00
-unspsc7#73.14.16.00.00#Thread and yarn processing#73.14.00.00.00
-unspsc7#73.14.16.01.00#Thread processing services#73.14.16.00.00
-unspsc7#73.14.16.02.00#Yarn processing services#73.14.16.00.00
-unspsc7#73.14.17.00.00#Fabrics and leather production#73.14.00.00.00
-unspsc7#73.14.17.01.00#Broad woven fabrics manufacturing services#73.14.17.00.00
-unspsc7#73.14.17.02.00#Narrow woven fabrics manufacturing services#73.14.17.00.00
-unspsc7#73.14.17.03.00#Knitwear manufacturing services#73.14.17.00.00
-unspsc7#73.14.17.04.00#Carpet or rug manufacturing services#73.14.17.00.00
-unspsc7#73.14.17.05.00#Cordage or rope or twine manufacturing services#73.14.17.00.00
-unspsc7#73.14.17.06.00#Dyeing or printing or finishing services#73.14.17.00.00
-unspsc7#73.14.17.07.00#Woven suits or coats or overcoats manufacturing services#73.14.17.00.00
-unspsc7#73.14.17.08.00#Woven outerwear clothing manufacturing services#73.14.17.00.00
-unspsc7#73.14.17.09.00#Fur dressing or dyeing services#73.14.17.00.00
-unspsc7#73.14.17.10.00#Leather footwear manufacturing services#73.14.17.00.00
-unspsc7#73.14.17.11.00#Leather luggage or handbags manufacturing services#73.14.17.00.00
-unspsc7#73.14.17.12.00#Leather tanning or finishing manufacturing services#73.14.17.00.00
-unspsc7#73.14.17.13.00#Nonwoven fabric services#73.14.17.00.00
-unspsc7#73.14.17.14.00#Braided yarn or fabric services#73.14.17.00.00
-unspsc7#73.14.17.15.00#Industrial sewing services#73.14.17.00.00
-unspsc7#73.15.00.00.00#Manufacturing support services#73.00.00.00.00
-unspsc7#73.15.15.00.00#Assembly services#73.15.00.00.00
-unspsc7#73.15.15.01.00#Assembly line work#73.15.15.00.00
-unspsc7#73.15.15.02.00#Joint sealing services#73.15.15.00.00
-unspsc7#73.15.16.00.00#Packaging services#73.15.00.00.00
-unspsc7#73.15.16.01.00#Canning plants services#73.15.16.00.00
-unspsc7#73.15.16.02.00#Packaging of agricultural by products services#73.15.16.00.00
-unspsc7#73.15.16.03.00#Packaging of non food products services#73.15.16.00.00
-unspsc7#73.15.16.04.00#Packaging of pharmaceuticals services#73.15.16.00.00
-unspsc7#73.15.16.05.00#Point of purchase display packaging services#73.15.16.00.00
-unspsc7#73.15.16.06.00#Manual hand packaging services#73.15.16.00.00
-unspsc7#73.15.16.07.00#Machine assisted packaging services#73.15.16.00.00
-unspsc7#73.15.17.00.00#Material treatment#73.15.00.00.00
-unspsc7#73.15.17.01.00#Water proofing material treatment services#73.15.17.00.00
-unspsc7#73.15.17.02.00#Fire protection material treatment services#73.15.17.00.00
-unspsc7#73.15.17.03.00#Anticorrosion material treatment services#73.15.17.00.00
-unspsc7#73.15.18.00.00#Converting services#73.15.00.00.00
-unspsc7#73.15.18.01.00#Sheeting services#73.15.18.00.00
-unspsc7#73.15.18.02.00#Slitting services#73.15.18.00.00
-unspsc7#73.15.18.03.00#Die cutting services#73.15.18.00.00
-unspsc7#73.15.18.04.00#Folding services#73.15.18.00.00
-unspsc7#73.15.18.05.00#Laminating services#73.15.18.00.00
-unspsc7#73.15.19.00.00#Industrial printing services#73.15.00.00.00
-unspsc7#73.15.19.01.00#Flexographic industrial printing services#73.15.19.00.00
-unspsc7#73.15.19.02.00#Rotogravure industrial printing services#73.15.19.00.00
-unspsc7#73.15.19.03.00#Screen industrial printing services#73.15.19.00.00
-unspsc7#73.15.19.04.00#Offset industrial printing services#73.15.19.00.00
-unspsc7#73.15.19.05.00#Digital industrial printing services#73.15.19.00.00
-unspsc7#73.15.19.06.00#Thermal transfer industrial printing services#73.15.19.00.00
-unspsc7#73.15.20.00.00#Filling Services#73.15.00.00.00
-unspsc7#73.15.20.01.00#Liquid filling services#73.15.20.00.00
-unspsc7#73.15.20.02.00#Aerosol filling services#73.15.20.00.00
-unspsc7#73.15.20.03.00#Paste filling services#73.15.20.00.00
-unspsc7#73.15.20.04.00#Powder filling services#73.15.20.00.00
-unspsc7#73.15.21.00.00#Manufacturing equipment maintenance and repair services#73.15.00.00.00
-unspsc7#73.15.21.01.00#Manufacturing equipment maintenance services#73.15.21.00.00
-unspsc7#73.15.21.02.00#Manufacturing equipment repair services#73.15.21.00.00
-unspsc7#73.16.00.00.00#Machinery and transport equipment manufacture#73.00.00.00.00
-unspsc7#73.16.15.00.00#Manufacture of machinery#73.16.00.00.00
-unspsc7#73.16.15.01.00#Engine or turbine manufacturing services#73.16.15.00.00
-unspsc7#73.16.15.02.00#Agricultural machinery or equipment manufacturing services#73.16.15.00.00
-unspsc7#73.16.15.03.00#Machine tools or metal or wood working manufacturing services#73.16.15.00.00
-unspsc7#73.16.15.04.00#Special industrial plants or machinery manufacturing services#73.16.15.00.00
-unspsc7#73.16.15.05.00#Construction machinery or equipment manufacturing services#73.16.15.00.00
-unspsc7#73.16.15.06.00#Mining machinery or equipment manufacturing services#73.16.15.00.00
-unspsc7#73.16.15.07.00#Food products machinery or equipment manufacturing services#73.16.15.00.00
-unspsc7#73.16.15.08.00#Paper printing machinery or equipment manufacture services#73.16.15.00.00
-unspsc7#73.16.15.09.00#Metallurgical machinery or equipment manufacture services#73.16.15.00.00
-unspsc7#73.16.15.10.00#Chemical or pharmaceutical machinery or equipment manufacture services#73.16.15.00.00
-unspsc7#73.16.15.11.00#Cement plant machinery or equipment manufacture services#73.16.15.00.00
-unspsc7#73.16.15.12.00#Textile machinery or equipment manufacture services#73.16.15.00.00
-unspsc7#73.16.15.13.00#Power plant boilers manufacture services#73.16.15.00.00
-unspsc7#73.16.15.14.00#Furnaces or ovens manufacture services#73.16.15.00.00
-unspsc7#73.16.15.15.00#Office machinery or equipment manufacture services#73.16.15.00.00
-unspsc7#73.16.15.16.00#Lifting or hoisting or conveying equipment manufacture services#73.16.15.00.00
-unspsc7#73.16.15.17.00#Air conditioning or ventilating or refrigeration equipment manufacture services#73.16.15.00.00
-unspsc7#73.16.15.18.00#Domestic appliances or machines except electrical manufacture services#73.16.15.00.00
-unspsc7#73.16.15.19.00#Pumps or compressors manufacture services#73.16.15.00.00
-unspsc7#73.16.16.00.00#Manufacture of transport equipment#73.16.00.00.00
-unspsc7#73.16.16.01.00#Fishing ship or boat building services#73.16.16.00.00
-unspsc7#73.16.16.02.00#Railroad rolling stock manufacture services#73.16.16.00.00
-unspsc7#73.16.16.03.00#Locomotive manufacture services#73.16.16.00.00
-unspsc7#73.16.16.04.00#Motor vehicles manufacture services#73.16.16.00.00
-unspsc7#73.16.16.05.00#Motor vehicles parts or accessories manufacture services#73.16.16.00.00
-unspsc7#73.16.16.06.00#Motorcycle or bicycle manufacture services#73.16.16.00.00
-unspsc7#73.16.16.07.00#Air or spacecraft manufacture services#73.16.16.00.00
-unspsc7#73.17.00.00.00#Manufacture of electrical goods and precision instruments#73.00.00.00.00
-unspsc7#73.17.15.00.00#Manufacture of electrical goods#73.17.00.00.00
-unspsc7#73.17.15.01.00#Power generation or transmission or distribution equipment manufacture services#73.17.15.00.00
-unspsc7#73.17.15.02.00#Dry or storage battery manufacture services#73.17.15.00.00
-unspsc7#73.17.15.03.00#Electrical tools manufacture services#73.17.15.00.00
-unspsc7#73.17.15.04.00#Measuring or testing instruments manufacture services#73.17.15.00.00
-unspsc7#73.17.15.05.00#Radio or television manufacture services#73.17.15.00.00
-unspsc7#73.17.15.06.00#Communication equipment manufacture services#73.17.15.00.00
-unspsc7#73.17.15.07.00#Electrical household appliances manufacture services#73.17.15.00.00
-unspsc7#73.17.15.08.00#Insulated wire or cable manufacture services#73.17.15.00.00
-unspsc7#73.17.15.09.00#Electrical accessories manufacture services#73.17.15.00.00
-unspsc7#73.17.15.10.00#Electrical accessories or supplies manufacture services#73.17.15.00.00
-unspsc7#73.17.15.11.00#Electronic equipment manufacture services#73.17.15.00.00
-unspsc7#73.17.15.12.00#Electronic computers or data processing equipment manufacture services#73.17.15.00.00
-unspsc7#73.17.16.00.00#Manufacture of precision instruments#73.17.00.00.00
-unspsc7#73.17.16.01.00#Scientific instruments or measuring equipment manufacture services#73.17.16.00.00
-unspsc7#73.17.16.02.00#Medical or dental equipment manufacture services#73.17.16.00.00
-unspsc7#73.17.16.03.00#Photographic or optical equipment manufacture services#73.17.16.00.00
-unspsc7#73.17.16.04.00#Watches or clocks manufacture services#73.17.16.00.00
-unspsc7#73.17.16.05.00#Laboratory equipment manufacture services#73.17.16.00.00
-unspsc7#73.18.00.00.00#Machining and processing services#73.00.00.00.00
-unspsc7#73.18.10.00.00#Machining services#73.18.00.00.00
-unspsc7#73.18.10.01.00#Turning services#73.18.10.00.00
-unspsc7#73.18.10.02.00#Electro discharge machining (EDM) services#73.18.10.00.00
-unspsc7#73.18.10.03.00#Electro chemical machining (ECM) services#73.18.10.00.00
-unspsc7#73.18.10.04.00#Chem milling services#73.18.10.00.00
-unspsc7#73.18.10.05.00#Punching services#73.18.10.00.00
-unspsc7#73.18.10.06.00#Stamping services#73.18.10.00.00
-unspsc7#73.18.10.07.00#Boring services#73.18.10.00.00
-unspsc7#73.18.10.08.00#Drilling services#73.18.10.00.00
-unspsc7#73.18.10.09.00#Tapping services#73.18.10.00.00
-unspsc7#73.18.10.10.00#Laser services#73.18.10.00.00
-unspsc7#73.18.10.11.00#Bending services#73.18.10.00.00
-unspsc7#73.18.10.12.00#Grinding services#73.18.10.00.00
-unspsc7#73.18.10.13.00#Shot blasting services#73.18.10.00.00
-unspsc7#73.18.10.14.00#Polishing services#73.18.10.00.00
-unspsc7#73.18.10.15.00#Flame cutting services#73.18.10.00.00
-unspsc7#73.18.10.16.00#Laser cutting services#73.18.10.00.00
-unspsc7#73.18.10.17.00#Plasma cutting services#73.18.10.00.00
-unspsc7#73.18.10.18.00#Water jet cutting services#73.18.10.00.00
-unspsc7#73.18.10.19.00#Rolling Services#73.18.10.00.00
-unspsc7#73.18.10.20.00#Surface treatment services#73.18.10.00.00
-unspsc7#73.18.10.21.00#Milling services#73.18.10.00.00
-unspsc7#73.18.10.22.00#Spraying services#73.18.10.00.00
-unspsc7#73.18.10.23.00#Sharpening service#73.18.10.00.00
-unspsc7#73.18.11.00.00#Coating services#73.18.00.00.00
-unspsc7#73.18.11.01.00#Electro coating services#73.18.11.00.00
-unspsc7#73.18.11.02.00#Dipping services#73.18.11.00.00
-unspsc7#73.18.11.03.00#Wrapping services#73.18.11.00.00
-unspsc7#73.18.11.04.00#Painting services#73.18.11.00.00
-unspsc7#73.18.11.05.00#Web coating services#73.18.11.00.00
-unspsc7#73.18.11.06.00#Plating services#73.18.11.00.00
-unspsc7#73.18.12.00.00#Forming services#73.18.00.00.00
-unspsc7#73.18.12.01.00#Draw forming services#73.18.12.00.00
-unspsc7#73.18.12.02.00#Hydro forming services#73.18.12.00.00
-unspsc7#73.18.12.03.00#Roll forming services#73.18.12.00.00
-unspsc7#73.18.12.04.00#Stretch forming services#73.18.12.00.00
-unspsc7#73.18.12.05.00#Spin forming services#73.18.12.00.00
-unspsc7#73.18.12.06.00#Explosive forming services#73.18.12.00.00
-unspsc7#73.18.13.00.00#Heat treatment services#73.18.00.00.00
-unspsc7#73.18.13.01.00#Quench and temper services#73.18.13.00.00
-unspsc7#73.18.13.02.00#Annealing services#73.18.13.00.00
-unspsc7#73.18.13.03.00#Normalizing services#73.18.13.00.00
-unspsc7#73.18.13.04.00#Aging or stabilizing services#73.18.13.00.00
-unspsc7#73.18.19.00.00#Welding and brazing and soldering services#73.18.00.00.00
-unspsc7#73.18.19.01.00#Arc welding services#73.18.19.00.00
-unspsc7#73.18.19.02.00#Metal inert gas (MIG) welding services#73.18.19.00.00
-unspsc7#73.18.19.03.00#Tungsten inert gas (TIG) welding services#73.18.19.00.00
-unspsc7#73.18.19.04.00#Laser welding services#73.18.19.00.00
-unspsc7#73.18.19.05.00#Spot welding services#73.18.19.00.00
-unspsc7#73.18.19.06.00#Projection welding services#73.18.19.00.00
-unspsc7#73.18.19.07.00#Brazing services#73.18.19.00.00
-unspsc7#73.18.19.08.00#Soldering services#73.18.19.00.00
-unspsc7#76.00.00.00.00#Industrial Cleaning Services#76.00.00.00.00
-unspsc7#76.10.00.00.00#Decontamination services#76.00.00.00.00
-unspsc7#76.10.15.00.00#Disinfection#76.10.00.00.00
-unspsc7#76.10.15.01.00#Washroom sanitation services#76.10.15.00.00
-unspsc7#76.10.15.02.00#Rest room cleaning services#76.10.15.00.00
-unspsc7#76.10.15.03.00#Disinfection or deodorizing services#76.10.15.00.00
-unspsc7#76.10.16.00.00#Hazardous material decontamination#76.10.00.00.00
-unspsc7#76.10.16.01.00#Radioactive decontamination services#76.10.16.00.00
-unspsc7#76.10.16.02.00#Asbestos decontamination or removal#76.10.16.00.00
-unspsc7#76.11.00.00.00#Cleaning and janitorial services#76.00.00.00.00
-unspsc7#76.11.15.00.00#General building and office cleaning services#76.11.00.00.00
-unspsc7#76.11.15.01.00#Building cleaning services#76.11.15.00.00
-unspsc7#76.11.15.02.00#Building maintenance or repair services#76.11.15.00.00
-unspsc7#76.11.15.03.00#Lighting maintenance services#76.11.15.00.00
-unspsc7#76.11.15.04.00#Window or window blind cleaning services#76.11.15.00.00
-unspsc7#76.11.16.00.00#Building component cleaning services#76.11.00.00.00
-unspsc7#76.11.16.01.00#Acoustical tile or ceiling cleaning services#76.11.16.00.00
-unspsc7#76.11.16.02.00#Air duct cleaning#76.11.16.00.00
-unspsc7#76.11.16.03.00#Chimney cleaning#76.11.16.00.00
-unspsc7#76.11.16.04.00#Floor waxing or carpet cleaning#76.11.16.00.00
-unspsc7#76.11.16.05.00#Exhaust hood or fan clearing#76.11.16.00.00
-unspsc7#76.11.17.00.00#Building site clean up#76.11.00.00.00
-unspsc7#76.11.17.01.00#Construction site clean up services#76.11.17.00.00
-unspsc7#76.11.17.02.00#Construction site haul away services#76.11.17.00.00
-unspsc7#76.12.00.00.00#Refuse disposal and treatment#76.00.00.00.00
-unspsc7#76.12.15.00.00#Refuse collection and disposal#76.12.00.00.00
-unspsc7#76.12.15.01.00#Garbage collection or destruction or processing or disposal#76.12.15.00.00
-unspsc7#76.12.15.02.00#Liquid waste collection or processing or disposal#76.12.15.00.00
-unspsc7#76.12.15.03.00#Street cleaning services#76.12.15.00.00
-unspsc7#76.12.16.00.00#Nonhazardous waste disposal#76.12.00.00.00
-unspsc7#76.12.16.01.00#Garbage dump#76.12.16.00.00
-unspsc7#76.12.16.02.00#Sanitary landfill operations#76.12.16.00.00
-unspsc7#76.12.16.03.00#Sludge disposal#76.12.16.00.00
-unspsc7#76.12.16.04.00#Dead animal disposal services#76.12.16.00.00
-unspsc7#76.12.17.00.00#Liquid waste treatment#76.12.00.00.00
-unspsc7#76.12.17.01.00#Sewage treatment services#76.12.17.00.00
-unspsc7#76.12.17.02.00#Chemical treatment services#76.12.17.00.00
-unspsc7#76.12.18.00.00#Refuse treatment#76.12.00.00.00
-unspsc7#76.12.18.01.00#Recycling services#76.12.18.00.00
-unspsc7#76.12.19.00.00#Hazardous waste disposal#76.12.00.00.00
-unspsc7#76.12.19.01.00#Medical waste disposal#76.12.19.00.00
-unspsc7#76.12.19.02.00#Acid waste collection or disposal#76.12.19.00.00
-unspsc7#76.12.19.03.00#Chemical detoxification#76.12.19.00.00
-unspsc7#76.13.00.00.00#Toxic and hazardous waste cleanup#76.00.00.00.00
-unspsc7#76.13.15.00.00#Nuclear waste treatment#76.13.00.00.00
-unspsc7#76.13.15.01.00#Radioactive waste material treatment#76.13.15.00.00
-unspsc7#76.13.15.02.00#Radioactive containment services#76.13.15.00.00
-unspsc7#76.13.16.00.00#Toxic spill cleanup#76.13.00.00.00
-unspsc7#76.13.16.01.00#Toxic spill containment#76.13.16.00.00
-unspsc7#76.13.16.02.00#Toxic substances spill cleanup#76.13.16.00.00
-unspsc7#76.13.17.00.00#Oil spill cleanup#76.13.00.00.00
-unspsc7#76.13.17.01.00#Oil residue disposal or control services#76.13.17.00.00
-unspsc7#76.13.17.02.00#Oil spill treatment services#76.13.17.00.00
-unspsc7#77.00.00.00.00#Environmental Services#77.00.00.00.00
-unspsc7#77.10.00.00.00#Environmental management#77.00.00.00.00
-unspsc7#77.10.15.00.00#Environmental impact assessment#77.10.00.00.00
-unspsc7#77.10.15.01.00#Risk or hazard assessment#77.10.15.00.00
-unspsc7#77.10.15.02.00#Environmental standards#77.10.15.00.00
-unspsc7#77.10.15.03.00#Environmental indicators analysis#77.10.15.00.00
-unspsc7#77.10.15.04.00#Environmental impact assessment  (EIA) services#77.10.15.00.00
-unspsc7#77.10.15.05.00#Environmental monitoring#77.10.15.00.00
-unspsc7#77.10.16.00.00#Environmental planning#77.10.00.00.00
-unspsc7#77.10.16.01.00#Urban environmental development planning#77.10.16.00.00
-unspsc7#77.10.16.02.00#Forest conservation strategy planning#77.10.16.00.00
-unspsc7#77.10.16.03.00#Marine conservation strategy planning#77.10.16.00.00
-unspsc7#77.10.16.04.00#Natural resources management or conservation strategy planning services#77.10.16.00.00
-unspsc7#77.10.16.05.00#Environmental institution building or planning#77.10.16.00.00
-unspsc7#77.10.17.00.00#Environmental advisory services#77.10.00.00.00
-unspsc7#77.10.17.01.00#Environmental sciences advisory services#77.10.17.00.00
-unspsc7#77.10.17.02.00#Environmental chemistry advisory services#77.10.17.00.00
-unspsc7#77.10.17.03.00#Environmental ethics advisory services#77.10.17.00.00
-unspsc7#77.10.17.04.00#Environmental technology advisory services#77.10.17.00.00
-unspsc7#77.10.17.05.00#Environmental economics advisory services#77.10.17.00.00
-unspsc7#77.10.17.06.00#Environmental law advisory services#77.10.17.00.00
-unspsc7#77.10.17.07.00#Ecology advisory services#77.10.17.00.00
-unspsc7#77.10.18.00.00#Environmental auditing#77.10.00.00.00
-unspsc7#77.10.18.01.00#Environmental information systems#77.10.18.00.00
-unspsc7#77.10.18.02.00#Corporate environmental auditing services#77.10.18.00.00
-unspsc7#77.10.18.03.00#Sectoral environmental auditing services#77.10.18.00.00
-unspsc7#77.10.18.04.00#Activity specific environmental auditing services#77.10.18.00.00
-unspsc7#77.10.18.05.00#Environmental quality control services#77.10.18.00.00
-unspsc7#77.10.18.06.00#Environmental security control services#77.10.18.00.00
-unspsc7#77.10.19.00.00#Pollution investigation services#77.10.00.00.00
-unspsc7#77.10.19.01.00#Industrial site investigation#77.10.19.00.00
-unspsc7#77.10.19.02.00#Industrial waste site investigation#77.10.19.00.00
-unspsc7#77.10.19.03.00#Gasworks site investigation#77.10.19.00.00
-unspsc7#77.10.19.04.00#Chemical works or oil refinery waste site investigation#77.10.19.00.00
-unspsc7#77.10.19.05.00#Wood treatment plant site investigation#77.10.19.00.00
-unspsc7#77.10.19.06.00#Oil depot or terminal site investigation#77.10.19.00.00
-unspsc7#77.10.19.07.00#Dry cleaning plants site investigation#77.10.19.00.00
-unspsc7#77.10.19.08.00#Foundry site investigation#77.10.19.00.00
-unspsc7#77.10.19.09.00#Recycling plant site investigation#77.10.19.00.00
-unspsc7#77.10.19.10.00#Food processing plant site investigation#77.10.19.00.00
-unspsc7#77.11.00.00.00#Environmental protection#77.00.00.00.00
-unspsc7#77.11.15.00.00#Environmental safety services#77.11.00.00.00
-unspsc7#77.11.15.01.00#Landscape protection services#77.11.15.00.00
-unspsc7#77.11.15.02.00#Ozone protection services#77.11.15.00.00
-unspsc7#77.11.15.03.00#Food or feed contamination protection services#77.11.15.00.00
-unspsc7#77.11.15.04.00#Genetic resources protection services#77.11.15.00.00
-unspsc7#77.11.15.05.00#Toxic substances protection services#77.11.15.00.00
-unspsc7#77.11.15.06.00#Radiation protection services#77.11.15.00.00
-unspsc7#77.11.15.07.00#Endangered species protection services#77.11.15.00.00
-unspsc7#77.11.15.08.00#Natural risks or hazards protection services#77.11.15.00.00
-unspsc7#77.11.16.00.00#Environmental rehabilitation#77.11.00.00.00
-unspsc7#77.11.16.01.00#Industrial site rehabilitation#77.11.16.00.00
-unspsc7#77.11.16.02.00#Environmental decontamination services#77.11.16.00.00
-unspsc7#77.11.16.03.00#Land reclamation services#77.11.16.00.00
-unspsc7#77.12.00.00.00#Pollution tracking and monitoring and rehabilitation#77.00.00.00.00
-unspsc7#77.12.15.00.00#Air pollution#77.12.00.00.00
-unspsc7#77.12.15.01.00#Air quality management#77.12.15.00.00
-unspsc7#77.12.15.02.00#Transboundary air pollution management or control services#77.12.15.00.00
-unspsc7#77.12.15.03.00#Air pollution protection services#77.12.15.00.00
-unspsc7#77.12.15.04.00#Air pollution monitoring or measurement services#77.12.15.00.00
-unspsc7#77.12.15.05.00#Toxic gas detection services#77.12.15.00.00
-unspsc7#77.12.15.06.00#Methane monitoring#77.12.15.00.00
-unspsc7#77.12.15.07.00#Carbon dioxide monitoring services#77.12.15.00.00
-unspsc7#77.12.15.08.00#Airborne particle monitoring#77.12.15.00.00
-unspsc7#77.12.15.09.00#Ozone depletion monitoring services#77.12.15.00.00
-unspsc7#77.12.16.00.00#Soil pollution#77.12.00.00.00
-unspsc7#77.12.16.01.00#Soil pollution protection services#77.12.16.00.00
-unspsc7#77.12.16.02.00#Polluted soil removal services#77.12.16.00.00
-unspsc7#77.12.16.03.00#Polluted soil treatment or rehabilitation#77.12.16.00.00
-unspsc7#77.12.16.04.00#Soil pollution advisory services#77.12.16.00.00
-unspsc7#77.12.16.05.00#Soil pollution mapping#77.12.16.00.00
-unspsc7#77.12.16.06.00#Soil pollution measurement or monitoring#77.12.16.00.00
-unspsc7#77.12.16.07.00#Organic fertilizer pollution assessment#77.12.16.00.00
-unspsc7#77.12.16.08.00#Pesticides pollution assessment#77.12.16.00.00
-unspsc7#77.12.16.09.00#Nitrates pollution assessment#77.12.16.00.00
-unspsc7#77.12.16.10.00#Phosphates pollution assessment#77.12.16.00.00
-unspsc7#77.12.17.00.00#Water pollution#77.12.00.00.00
-unspsc7#77.12.17.01.00#Surface water pollution monitoring or control services#77.12.17.00.00
-unspsc7#77.12.17.02.00#Surface water pollution rehabilitation services#77.12.17.00.00
-unspsc7#77.12.17.03.00#Surface water pollution protection services#77.12.17.00.00
-unspsc7#77.12.17.04.00#Surface water treatment services#77.12.17.00.00
-unspsc7#77.12.17.05.00#Surface water pollution drainage services#77.12.17.00.00
-unspsc7#77.12.17.06.00#Transboundary water pollution management or control services#77.12.17.00.00
-unspsc7#77.12.17.07.00#Groundwater pollution monitoring or control services#77.12.17.00.00
-unspsc7#77.12.17.08.00#Groundwater pollution drainage services#77.12.17.00.00
-unspsc7#77.12.17.09.00#Groundwater pollution treatment or rehabilitation#77.12.17.00.00
-unspsc7#77.13.00.00.00#Pollutants tracking and monitoring and rehabilitation services#77.00.00.00.00
-unspsc7#77.13.15.00.00#Oil pollution#77.13.00.00.00
-unspsc7#77.13.15.01.00#Oil spillage monitoring services#77.13.15.00.00
-unspsc7#77.13.15.02.00#Oil spillage control services#77.13.15.00.00
-unspsc7#77.13.15.03.00#Oil spillage rehabilitation services#77.13.15.00.00
-unspsc7#77.13.16.00.00#Noise pollution#77.13.00.00.00
-unspsc7#77.13.16.01.00#Noise control services#77.13.16.00.00
-unspsc7#77.13.16.02.00#Noise pollution protection services#77.13.16.00.00
-unspsc7#77.13.16.03.00#Noise pollution monitoring services#77.13.16.00.00
-unspsc7#77.13.16.04.00#Noise pollution advisory services#77.13.16.00.00
-unspsc7#77.13.17.00.00#Toxic substances pollution#77.13.00.00.00
-unspsc7#77.13.17.01.00#Toxic substances monitoring services#77.13.17.00.00
-unspsc7#77.13.17.02.00#Toxic substances rehabilitation services#77.13.17.00.00
-unspsc7#78.00.00.00.00#Transportation and Storage and Mail Services#78.00.00.00.00
-unspsc7#78.10.00.00.00#Mail and cargo transport#78.00.00.00.00
-unspsc7#78.10.15.00.00#Air cargo transport#78.10.00.00.00
-unspsc7#78.10.15.01.00#Domestic air cargo tranposrt#78.10.15.00.00
-unspsc7#78.10.15.02.00#International air cargo transport#78.10.15.00.00
-unspsc7#78.10.15.03.00#Armored air transport#78.10.15.00.00
-unspsc7#78.10.16.00.00#Rail cargo transport#78.10.00.00.00
-unspsc7#78.10.16.01.00#Boxcar transport services#78.10.16.00.00
-unspsc7#78.10.16.02.00#Bulk cargo rail trasnport services#78.10.16.00.00
-unspsc7#78.10.16.03.00#Livestock rail transport#78.10.16.00.00
-unspsc7#78.10.16.04.00#Vehicle transport services#78.10.16.00.00
-unspsc7#78.10.17.00.00#Marine cargo transport#78.10.00.00.00
-unspsc7#78.10.17.01.00#Domestic vessel transport services#78.10.17.00.00
-unspsc7#78.10.17.02.00#International vessel transport services#78.10.17.00.00
-unspsc7#78.10.17.03.00#Domestic barge transport services#78.10.17.00.00
-unspsc7#78.10.17.04.00#International barge transport services#78.10.17.00.00
-unspsc7#78.10.17.05.00#Armored marine transport#78.10.17.00.00
-unspsc7#78.10.18.00.00#Road cargo transport#78.10.00.00.00
-unspsc7#78.10.18.01.00#Local area trucking services#78.10.18.00.00
-unspsc7#78.10.18.02.00#Regional or national trucking services#78.10.18.00.00
-unspsc7#78.10.18.03.00#Vehicle carrier services#78.10.18.00.00
-unspsc7#78.10.18.04.00#Relocation services#78.10.18.00.00
-unspsc7#78.10.19.00.00#Intermodal cargo transport#78.10.00.00.00
-unspsc7#78.10.19.01.00#Air to ocean transportation#78.10.19.00.00
-unspsc7#78.10.19.02.00#Ocean to rail transportation#78.10.19.00.00
-unspsc7#78.10.19.03.00#Ocean to truck transportation#78.10.19.00.00
-unspsc7#78.10.19.04.00#Air to truck transport#78.10.19.00.00
-unspsc7#78.10.19.05.00#Rail truck transportation#78.10.19.00.00
-unspsc7#78.10.20.00.00#Spacecraft cargo transport#78.10.00.00.00
-unspsc7#78.10.20.01.00#Satellite launch services#78.10.20.00.00
-unspsc7#78.10.20.02.00#Experimental payload services#78.10.20.00.00
-unspsc7#78.10.21.00.00#Pipeline services#78.10.00.00.00
-unspsc7#78.10.21.01.00#Petroleum products transport#78.10.21.00.00
-unspsc7#78.10.21.02.00#Water transport#78.10.21.00.00
-unspsc7#78.10.22.00.00#Postal and small parcel and courier services#78.10.00.00.00
-unspsc7#78.10.22.01.00#National postal delivery services#78.10.22.00.00
-unspsc7#78.10.22.02.00#Post office box services#78.10.22.00.00
-unspsc7#78.10.22.03.00#Mailing or mail pick up or delivery services#78.10.22.00.00
-unspsc7#78.10.22.04.00#Letter or small parcel worldwide delivery services#78.10.22.00.00
-unspsc7#78.10.22.05.00#Letter or small parcel local delivery services#78.10.22.00.00
-unspsc7#78.10.22.06.00#Bicycle or scooter messenger servcies#78.10.22.00.00
-unspsc7#78.11.00.00.00#Passenger transport#78.00.00.00.00
-unspsc7#78.11.15.00.00#Air transportation#78.11.00.00.00
-unspsc7#78.11.15.01.00#Helicopter services#78.11.15.00.00
-unspsc7#78.11.15.02.00#Commercial airplane travel#78.11.15.00.00
-unspsc7#78.11.15.03.00#Chartered airplane travel#78.11.15.00.00
-unspsc7#78.11.16.00.00#Railway transportation#78.11.00.00.00
-unspsc7#78.11.16.01.00#Light rail vehicle transport (LRV) services#78.11.16.00.00
-unspsc7#78.11.16.02.00#Subway transport#78.11.16.00.00
-unspsc7#78.11.16.03.00#Continental or inter continental rail services#78.11.16.00.00
-unspsc7#78.11.17.00.00#Marine transportation#78.11.00.00.00
-unspsc7#78.11.17.01.00#Water taxis#78.11.17.00.00
-unspsc7#78.11.17.02.00#Overnight ship cruises#78.11.17.00.00
-unspsc7#78.11.17.03.00#Sightseeing boat excursions#78.11.17.00.00
-unspsc7#78.11.18.00.00#Road transportation#78.11.00.00.00
-unspsc7#78.11.18.01.00#Car rental services#78.11.18.00.00
-unspsc7#78.11.18.02.00#Scheduled bus services#78.11.18.00.00
-unspsc7#78.11.18.03.00#Chartered bus services#78.11.18.00.00
-unspsc7#78.11.18.04.00#Taxicab services#78.11.18.00.00
-unspsc7#78.11.18.05.00#Transportation maintenance#78.11.18.00.00
-unspsc7#78.11.18.06.00#Vehicle rental or leasing#78.11.18.00.00
-unspsc7#78.11.19.00.00#Space transportation#78.11.00.00.00
-unspsc7#78.11.19.01.00#Experimental or educational missions#78.11.19.00.00
-unspsc7#78.12.00.00.00#Material packing and handling#78.00.00.00.00
-unspsc7#78.12.15.00.00#Packing#78.12.00.00.00
-unspsc7#78.12.15.01.00#Containerization of goods#78.12.15.00.00
-unspsc7#78.12.15.02.00#Crating services#78.12.15.00.00
-unspsc7#78.12.16.00.00#Material handling services#78.12.00.00.00
-unspsc7#78.12.16.01.00#Freight loading or unloading#78.12.16.00.00
-unspsc7#78.12.16.02.00#Weighing services#78.12.16.00.00
-unspsc7#78.13.00.00.00#Storage#78.00.00.00.00
-unspsc7#78.13.15.00.00#Farm products warehousing#78.13.00.00.00
-unspsc7#78.13.15.01.00#Silo services#78.13.15.00.00
-unspsc7#78.13.15.02.00#Grain elevator services#78.13.15.00.00
-unspsc7#78.13.16.00.00#General goods storage#78.13.00.00.00
-unspsc7#78.13.16.01.00#Palletized cargo storage#78.13.16.00.00
-unspsc7#78.13.16.02.00#File archive storage#78.13.16.00.00
-unspsc7#78.13.17.00.00#Bulk storage#78.13.00.00.00
-unspsc7#78.13.17.01.00#In ground storage services#78.13.17.00.00
-unspsc7#78.13.18.00.00#Specialized warehousing and storage#78.13.00.00.00
-unspsc7#78.13.18.01.00#Refrigerated storage#78.13.18.00.00
-unspsc7#78.13.18.02.00#Customs bonded storage services#78.13.18.00.00
-unspsc7#78.13.18.03.00#Hazardous materials storage#78.13.18.00.00
-unspsc7#78.13.18.04.00#Document storage services#78.13.18.00.00
-unspsc7#78.14.00.00.00#Transport operations#78.00.00.00.00
-unspsc7#78.14.15.00.00#Transport arrangements#78.14.00.00.00
-unspsc7#78.14.15.01.00#Freight forwarders services#78.14.15.00.00
-unspsc7#78.14.15.02.00#Customs brokerage services#78.14.15.00.00
-unspsc7#78.14.15.03.00#Transportation industry tariff comparison or freight audit services#78.14.15.00.00
-unspsc7#78.14.16.00.00#Inspection#78.14.00.00.00
-unspsc7#78.14.16.01.00#Packing inspection services#78.14.16.00.00
-unspsc7#78.14.16.02.00#Cargo survey services#78.14.16.00.00
-unspsc7#78.14.16.03.00#Pest control inspections#78.14.16.00.00
-unspsc7#78.14.17.00.00#Navigational services#78.14.00.00.00
-unspsc7#78.14.17.01.00#Tugboat services#78.14.17.00.00
-unspsc7#78.14.17.02.00#Drawbridge operations#78.14.17.00.00
-unspsc7#78.14.18.00.00#Terminal services#78.14.00.00.00
-unspsc7#78.14.18.01.00#Stevedoring services#78.14.18.00.00
-unspsc7#78.14.18.02.00#Vessel docking services#78.14.18.00.00
-unspsc7#78.14.18.03.00#Vessel stores services#78.14.18.00.00
-unspsc7#78.14.18.04.00#Parking structures#78.14.18.00.00
-unspsc7#78.15.00.00.00#Transport industry support and maintenance and repair services#78.00.00.00.00
-unspsc7#78.15.01.00.00#Panel and paint services#78.15.00.00.00
-unspsc7#78.15.01.01.00#Panelbeating services#78.15.01.00.00
-unspsc7#78.15.02.00.00#Transport fuelling and vehicle storage and support services#78.15.00.00.00
-unspsc7#78.15.02.01.00#Fuelling of vehicles#78.15.02.00.00
-unspsc7#78.15.02.02.00#Transportation storage#78.15.02.00.00
-unspsc7#78.16.00.00.00#Panel and paint services#78.00.00.00.00
-unspsc7#78.17.00.00.00#Panelbeating services#78.00.00.00.00
-unspsc7#78.18.00.00.00#Transportation or vehicle repair services#78.00.00.00.00
-unspsc7#78.18.01.00.00#Vehicle repair services#78.18.00.00.00
-unspsc7#78.18.01.01.00#Vehicle body repair or painting services#78.18.01.00.00
-unspsc7#78.18.01.02.00#Transmission repair#78.18.01.00.00
-unspsc7#78.19.00.00.00#Vehicle repair services#78.00.00.00.00
-unspsc7#78.19.11.00.00#Vehicle body repair or painting services#78.19.00.00.00
-unspsc7#78.19.12.00.00#Transmission repair#78.19.00.00.00
-unspsc7#80.00.00.00.00#Management and Business Professionals and Administrative Services#80.00.00.00.00
-unspsc7#80.10.00.00.00#Management advisory services#80.00.00.00.00
-unspsc7#80.10.15.00.00#Business and corporate management#80.10.00.00.00
-unspsc7#80.10.15.01.00#New business start up consultation services#80.10.15.00.00
-unspsc7#80.10.15.02.00#Corporate mergers consultation services#80.10.15.00.00
-unspsc7#80.10.15.03.00#Corporate divestiture consultation services#80.10.15.00.00
-unspsc7#80.10.15.04.00#Strategic planning consultation services#80.10.15.00.00
-unspsc7#80.10.15.05.00#Corporate objectives or policy development#80.10.15.00.00
-unspsc7#80.10.15.06.00#Organizational structure consultation#80.10.15.00.00
-unspsc7#80.10.15.07.00#Information technology consultation services#80.10.15.00.00
-unspsc7#80.10.16.00.00#Project management#80.10.00.00.00
-unspsc7#80.10.16.01.00#Feasibility studies or screening of project ideas#80.10.16.00.00
-unspsc7#80.10.16.02.00#Regional or location studies for projects#80.10.16.00.00
-unspsc7#80.10.16.03.00#Economic or financial evaluation of projects#80.10.16.00.00
-unspsc7#80.10.16.04.00#Project administration or planning#80.10.16.00.00
-unspsc7#80.10.17.00.00#Industrial management#80.10.00.00.00
-unspsc7#80.10.17.01.00#Factory management services#80.10.17.00.00
-unspsc7#80.10.17.02.00#Productivity or efficiency studies or implementation#80.10.17.00.00
-unspsc7#80.10.17.03.00#Specification standardization services#80.10.17.00.00
-unspsc7#80.10.17.04.00#Supply chain analysis or re engineering services#80.10.17.00.00
-unspsc7#80.10.17.05.00#Co operative or consortium services#80.10.17.00.00
-unspsc7#80.10.17.06.00#Professional procurement services#80.10.17.00.00
-unspsc7#80.11.00.00.00#Human resources services#80.00.00.00.00
-unspsc7#80.11.15.00.00#Human resource development#80.11.00.00.00
-unspsc7#80.11.15.01.00#Management development#80.11.15.00.00
-unspsc7#80.11.15.02.00#Compensation or benefits planning#80.11.15.00.00
-unspsc7#80.11.15.03.00#Labor or union relations#80.11.15.00.00
-unspsc7#80.11.15.04.00#Labor training or development#80.11.15.00.00
-unspsc7#80.11.15.05.00#Human resources productivity audits#80.11.15.00.00
-unspsc7#80.11.15.06.00#Personnel relocation#80.11.15.00.00
-unspsc7#80.11.16.00.00#Temporary personnel services#80.11.00.00.00
-unspsc7#80.11.16.01.00#Temporary clerical or adminstrative assistance#80.11.16.00.00
-unspsc7#80.11.16.02.00#Temporary marketing staff needs#80.11.16.00.00
-unspsc7#80.11.16.03.00#Temporary production staffing needs#80.11.16.00.00
-unspsc7#80.11.16.04.00#Temporary technician staffing needs#80.11.16.00.00
-unspsc7#80.11.16.05.00#Temporary financial staffing needs#80.11.16.00.00
-unspsc7#80.11.16.06.00#Temporary medical staffing needs#80.11.16.00.00
-unspsc7#80.11.16.07.00#Temporary legal staffing needs#80.11.16.00.00
-unspsc7#80.11.16.08.00#Temporary information technology software developers#80.11.16.00.00
-unspsc7#80.11.16.09.00#Temporary information technology systems or database administrators#80.11.16.00.00
-unspsc7#80.11.16.10.00#Temporary information technology networking specialists#80.11.16.00.00
-unspsc7#80.11.16.11.00#Temporary warehouse staff#80.11.16.00.00
-unspsc7#80.11.16.12.00#Temporary drivers#80.11.16.00.00
-unspsc7#80.11.16.13.00#Temporary manual labor#80.11.16.00.00
-unspsc7#80.11.16.14.00#Temporary professional staff#80.11.16.00.00
-unspsc7#80.11.16.15.00#Temporary machinist personnel#80.11.16.00.00
-unspsc7#80.11.17.00.00#Personnel recruitment#80.11.00.00.00
-unspsc7#80.11.17.01.00#Staff recruiting services#80.11.17.00.00
-unspsc7#80.11.17.02.00#Reference or background check services#80.11.17.00.00
-unspsc7#80.11.17.03.00#Resume or curriculum vitae screening services#80.11.17.00.00
-unspsc7#80.11.18.00.00#Information technology contractors#80.11.00.00.00
-unspsc7#80.11.18.01.00#Temporary information technology contractors#80.11.18.00.00
-unspsc7#80.12.00.00.00#Legal services#80.00.00.00.00
-unspsc7#80.12.15.00.00#Criminal law services#80.12.00.00.00
-unspsc7#80.12.15.01.00#Juvenile justice law services#80.12.15.00.00
-unspsc7#80.12.15.02.00#Appellate procedure services#80.12.15.00.00
-unspsc7#80.12.15.03.00#Defense or criminal law services#80.12.15.00.00
-unspsc7#80.12.16.00.00#Business law services#80.12.00.00.00
-unspsc7#80.12.16.01.00#Government antitrust or regulations law services#80.12.16.00.00
-unspsc7#80.12.16.02.00#Bankruptcy law services#80.12.16.00.00
-unspsc7#80.12.16.03.00#Partnership law#80.12.16.00.00
-unspsc7#80.12.16.04.00#Patent or trademark or copyright law#80.12.16.00.00
-unspsc7#80.12.16.05.00#Liquidation law services#80.12.16.00.00
-unspsc7#80.12.16.06.00#Real estate law#80.12.16.00.00
-unspsc7#80.12.16.07.00#Taxation law#80.12.16.00.00
-unspsc7#80.12.16.08.00#Mergers or acquisitions law#80.12.16.00.00
-unspsc7#80.12.16.09.00#Legal research services#80.12.16.00.00
-unspsc7#80.12.16.10.00#Debt collection law services#80.12.16.00.00
-unspsc7#80.12.17.00.00#Civil liability services#80.12.00.00.00
-unspsc7#80.12.17.01.00#Malpractice or negligence law services#80.12.17.00.00
-unspsc7#80.12.17.02.00#Personal injury law services#80.12.17.00.00
-unspsc7#80.12.17.03.00#Property law services#80.12.17.00.00
-unspsc7#80.12.17.04.00#Contract law services#80.12.17.00.00
-unspsc7#80.12.18.00.00#Family law services#80.12.00.00.00
-unspsc7#80.12.18.01.00#Divorce law services#80.12.18.00.00
-unspsc7#80.12.18.02.00#Adoption law services#80.12.18.00.00
-unspsc7#80.12.18.03.00#Immigration or naturalization law#80.12.18.00.00
-unspsc7#80.12.18.04.00#Guardianship or custody law services#80.12.18.00.00
-unspsc7#80.13.00.00.00#Real estate services#80.00.00.00.00
-unspsc7#80.13.15.00.00#Lease and rental of property or building#80.13.00.00.00
-unspsc7#80.13.15.01.00#Residential rental#80.13.15.00.00
-unspsc7#80.13.15.02.00#Commercial or industrial facility rental#80.13.15.00.00
-unspsc7#80.13.15.03.00#Land leases#80.13.15.00.00
-unspsc7#80.13.16.00.00#Sale of property and building#80.13.00.00.00
-unspsc7#80.13.16.01.00#Real estate brokers or agents#80.13.16.00.00
-unspsc7#80.13.16.02.00#Real estate auction#80.13.16.00.00
-unspsc7#80.13.16.03.00#Sale of residential land#80.13.16.00.00
-unspsc7#80.13.16.04.00#Sale of commercial or industrial land#80.13.16.00.00
-unspsc7#80.13.16.05.00#Sale of commercial building#80.13.16.00.00
-unspsc7#80.13.17.00.00#Escrow and title services#80.13.00.00.00
-unspsc7#80.13.17.01.00#Title reconveyance services#80.13.17.00.00
-unspsc7#80.13.17.02.00#Title search services#80.13.17.00.00
-unspsc7#80.13.17.03.00#Escrow account services#80.13.17.00.00
-unspsc7#80.13.18.00.00#Real estate management services#80.13.00.00.00
-unspsc7#80.13.18.01.00#Property management#80.13.18.00.00
-unspsc7#80.13.18.02.00#Real estate appraisal services#80.13.18.00.00
-unspsc7#80.13.18.03.00#Real estate listing services#80.13.18.00.00
-unspsc7#80.14.00.00.00#Marketing and distribution#80.00.00.00.00
-unspsc7#80.14.15.00.00#Market research#80.14.00.00.00
-unspsc7#80.14.15.01.00#Marketing analysis#80.14.15.00.00
-unspsc7#80.14.15.02.00#Distributive or service trade statistics#80.14.15.00.00
-unspsc7#80.14.15.03.00#Commodity price forecasting#80.14.15.00.00
-unspsc7#80.14.15.04.00#Preparation of commodity market surveys#80.14.15.00.00
-unspsc7#80.14.15.05.00#Marketing plans#80.14.15.00.00
-unspsc7#80.14.15.06.00#Internet based market research#80.14.15.00.00
-unspsc7#80.14.16.00.00#Sales and business promotion activities#80.14.00.00.00
-unspsc7#80.14.16.01.00#Sales promotion services#80.14.16.00.00
-unspsc7#80.14.16.02.00#Public relation services#80.14.16.00.00
-unspsc7#80.14.16.03.00#Telemarketing#80.14.16.00.00
-unspsc7#80.14.16.04.00#Branding of product naming services#80.14.16.00.00
-unspsc7#80.14.16.05.00#Promotional merchandise#80.14.16.00.00
-unspsc7#80.14.16.06.00#Direct marketing fulfillment#80.14.16.00.00
-unspsc7#80.14.16.07.00#Events management#80.14.16.00.00
-unspsc7#80.14.16.08.00#Letter shop services#80.14.16.00.00
-unspsc7#80.14.16.09.00#Sponsorship of event or celebrity#80.14.16.00.00
-unspsc7#80.14.16.10.00#Close outs#80.14.16.00.00
-unspsc7#80.14.17.00.00#Distribution#80.14.00.00.00
-unspsc7#80.14.17.01.00#Direct sales services#80.14.17.00.00
-unspsc7#80.14.17.02.00#Wholesale distribution services#80.14.17.00.00
-unspsc7#80.14.17.03.00#Retail distribution services#80.14.17.00.00
-unspsc7#80.14.17.04.00#Franchise operations#80.14.17.00.00
-unspsc7#80.14.17.05.00#Auction services#80.14.17.00.00
-unspsc7#80.14.18.00.00#Mailing services#80.14.00.00.00
-unspsc7#80.14.18.01.00#Mailing list compilation services#80.14.18.00.00
-unspsc7#80.14.18.02.00#Mailing list management service#80.14.18.00.00
-unspsc7#80.14.18.03.00#Addressing service#80.14.18.00.00
-unspsc7#80.15.00.00.00#Trade policy and services#80.00.00.00.00
-unspsc7#80.15.15.00.00#Trade facilitation#80.15.00.00.00
-unspsc7#80.15.15.01.00#Commodity policy or projections services#80.15.15.00.00
-unspsc7#80.15.15.02.00#Trade expansion#80.15.15.00.00
-unspsc7#80.15.15.03.00#Trade information services#80.15.15.00.00
-unspsc7#80.15.15.04.00#Trade promotion services#80.15.15.00.00
-unspsc7#80.15.15.05.00#Multinational marketing enterprises#80.15.15.00.00
-unspsc7#80.15.16.00.00#International trade services#80.15.00.00.00
-unspsc7#80.15.16.01.00#Export development#80.15.16.00.00
-unspsc7#80.15.16.02.00#Import planning#80.15.16.00.00
-unspsc7#80.15.16.03.00#Export projections#80.15.16.00.00
-unspsc7#80.15.16.04.00#Import procurement services#80.15.16.00.00
-unspsc7#80.16.00.00.00#Business administration services#80.00.00.00.00
-unspsc7#80.16.15.00.00#Management support services#80.16.00.00.00
-unspsc7#80.16.15.01.00#Office administration or secretarial services#80.16.15.00.00
-unspsc7#80.16.15.02.00#Meeting planning services#80.16.15.00.00
-unspsc7#80.16.15.03.00#Keyboard entry services#80.16.15.00.00
-unspsc7#80.16.15.04.00#Clerical services#80.16.15.00.00
-unspsc7#80.16.15.05.00#Fleet management services#80.16.15.00.00
-unspsc7#80.16.15.06.00#Data archiving services#80.16.15.00.00
-unspsc7#80.16.15.07.00#Audio visual services#80.16.15.00.00
-unspsc7#80.16.16.00.00#Business facilities oversight#80.16.00.00.00
-unspsc7#80.16.16.01.00#Property managment services#80.16.16.00.00
-unspsc7#81.00.00.00.00#Engineering and Research and Technology Based Services#81.00.00.00.00
-unspsc7#81.10.00.00.00#Professional engineering services#81.00.00.00.00
-unspsc7#81.10.15.00.00#Civil engineering#81.10.00.00.00
-unspsc7#81.10.15.01.00#Well engineering#81.10.15.00.00
-unspsc7#81.10.15.02.00#Technical drawing#81.10.15.00.00
-unspsc7#81.10.15.03.00#Harbor or water ports engineering#81.10.15.00.00
-unspsc7#81.10.15.05.00#Structural engineering#81.10.15.00.00
-unspsc7#81.10.15.06.00#Naval architecture#81.10.15.00.00
-unspsc7#81.10.15.07.00#Dam engineering#81.10.15.00.00
-unspsc7#81.10.15.08.00#Architectural engineering#81.10.15.00.00
-unspsc7#81.10.15.09.00#Airport engineering#81.10.15.00.00
-unspsc7#81.10.15.10.00#Highway engineering#81.10.15.00.00
-unspsc7#81.10.15.11.00#Railway engineering#81.10.15.00.00
-unspsc7#81.10.16.00.00#Mechanical engineering#81.10.00.00.00
-unspsc7#81.10.16.01.00#Mechanical drawing#81.10.16.00.00
-unspsc7#81.10.16.02.00#Mechanical product enclosures design#81.10.16.00.00
-unspsc7#81.10.16.03.00#Machine tool design#81.10.16.00.00
-unspsc7#81.10.16.04.00#Power transmission design#81.10.16.00.00
-unspsc7#81.10.17.00.00#Electrical and electronic engineering#81.10.00.00.00
-unspsc7#81.10.17.01.00#Electrical engineering services#81.10.17.00.00
-unspsc7#81.10.17.02.00#Electronic circuit design#81.10.17.00.00
-unspsc7#81.10.18.00.00#Chemical engineering#81.10.00.00.00
-unspsc7#81.10.18.01.00#Plastics engineering#81.10.18.00.00
-unspsc7#81.10.19.00.00#Oil and gas engineering#81.10.00.00.00
-unspsc7#81.10.19.01.00#Drilling engineering for oil or gas#81.10.19.00.00
-unspsc7#81.10.19.02.00#Production engineering for oil or gas#81.10.19.00.00
-unspsc7#81.10.19.03.00#Reservoir engineering for oil or gas#81.10.19.00.00
-unspsc7#81.10.20.00.00#Mining engineering#81.10.00.00.00
-unspsc7#81.10.20.01.00#Hydraulic mining#81.10.20.00.00
-unspsc7#81.10.21.00.00#Ocean engineering#81.10.00.00.00
-unspsc7#81.10.21.01.00#Coastal engineering#81.10.21.00.00
-unspsc7#81.10.22.00.00#Transportation engineering#81.10.00.00.00
-unspsc7#81.10.22.01.00#Traffic engineering#81.10.22.00.00
-unspsc7#81.10.22.02.00#Urban transport network#81.10.22.00.00
-unspsc7#81.10.22.03.00#Inland waterways#81.10.22.00.00
-unspsc7#81.10.23.00.00#Aeronautical engineering#81.10.00.00.00
-unspsc7#81.10.23.01.00#Avionics design#81.10.23.00.00
-unspsc7#81.10.24.00.00#Avionics design#81.10.00.00.00
-unspsc7#81.11.00.00.00#Computer services#81.00.00.00.00
-unspsc7#81.11.15.00.00#Software or hardware engineering#81.11.00.00.00
-unspsc7#81.11.15.01.00#Mainframe software applications design#81.11.15.00.00
-unspsc7#81.11.15.02.00#Personal computer (PC) application design#81.11.15.00.00
-unspsc7#81.11.15.03.00#Systems integration design#81.11.15.00.00
-unspsc7#81.11.15.04.00#Application programming services#81.11.15.00.00
-unspsc7#81.11.15.05.00#Operating system programming services#81.11.15.00.00
-unspsc7#81.11.15.06.00#Client or server programming services#81.11.15.00.00
-unspsc7#81.11.15.07.00#ERP or database applications programming services#81.11.15.00.00
-unspsc7#81.11.15.08.00#Application implementation services#81.11.15.00.00
-unspsc7#81.11.15.09.00#Internet or intranet client application development services#81.11.15.00.00
-unspsc7#81.11.15.10.00#Internet or intranet server application development services#81.11.15.00.00
-unspsc7#81.11.15.11.00#Human resources productivity audits#81.11.15.00.00
-unspsc7#81.11.16.00.00#Computer programmers#81.11.00.00.00
-unspsc7#81.11.16.01.00#Programming for Visual Basic#81.11.16.00.00
-unspsc7#81.11.16.02.00#Programming for Java#81.11.16.00.00
-unspsc7#81.11.16.03.00#Programming for HTML#81.11.16.00.00
-unspsc7#81.11.16.04.00#Programming for ALGOL#81.11.16.00.00
-unspsc7#81.11.16.05.00#Programming for Assembler#81.11.16.00.00
-unspsc7#81.11.16.06.00#Programming for Basic#81.11.16.00.00
-unspsc7#81.11.16.07.00#Programming for C or C++#81.11.16.00.00
-unspsc7#81.11.16.08.00#Programming for COBOL#81.11.16.00.00
-unspsc7#81.11.16.09.00#Programming for FORTRAN#81.11.16.00.00
-unspsc7#81.11.16.10.00#Programming for Pascal#81.11.16.00.00
-unspsc7#81.11.16.11.00#Programming for PL/1#81.11.16.00.00
-unspsc7#81.11.16.12.00#Programming or Proprietary Languages#81.11.16.00.00
-unspsc7#81.11.17.00.00#Management information systems (MIS)#81.11.00.00.00
-unspsc7#81.11.17.01.00#Wide area network communications design#81.11.17.00.00
-unspsc7#81.11.17.02.00#Local area network communications design#81.11.17.00.00
-unspsc7#81.11.17.03.00#Electronic data interchange (EDI) design#81.11.17.00.00
-unspsc7#81.11.17.04.00#Database design#81.11.17.00.00
-unspsc7#81.11.17.05.00#Systems architecture#81.11.17.00.00
-unspsc7#81.11.18.00.00#System administrators#81.11.00.00.00
-unspsc7#81.11.18.01.00#Computer or network or internet security#81.11.18.00.00
-unspsc7#81.11.18.02.00#Mainframe administration services#81.11.18.00.00
-unspsc7#81.11.18.03.00#Local area network (LAN) maintenance or support#81.11.18.00.00
-unspsc7#81.11.18.04.00#Wide area network (WAN) maintenance or support#81.11.18.00.00
-unspsc7#81.11.18.05.00#Proprietary or licensed systems maintenance or support#81.11.18.00.00
-unspsc7#81.11.18.06.00#Database analysis#81.11.18.00.00
-unspsc7#81.11.18.07.00#Data storage#81.11.18.00.00
-unspsc7#81.11.18.08.00#Systems analysis#81.11.18.00.00
-unspsc7#81.11.18.09.00#System installation#81.11.18.00.00
-unspsc7#81.11.18.10.00#Software coding#81.11.18.00.00
-unspsc7#81.11.18.11.00#Technical support or help desk services#81.11.18.00.00
-unspsc7#81.11.18.12.00#Computer hardware maintenance or support#81.11.18.00.00
-unspsc7#81.11.18.13.00#Computer software maintenance or support#81.11.18.00.00
-unspsc7#81.11.18.14.00#Co location service#81.11.18.00.00
-unspsc7#81.11.18.15.00#Printer maintenance and support services#81.11.18.00.00
-unspsc7#81.11.18.16.00#Mainframe computer maintenance or support#81.11.18.00.00
-unspsc7#81.11.18.17.00#Telecom equipment maintenance or support#81.11.18.00.00
-unspsc7#81.11.19.00.00#Information retrieval systems#81.11.00.00.00
-unspsc7#81.11.19.01.00#Database information retrieval#81.11.19.00.00
-unspsc7#81.11.19.02.00#On line database information retrieval#81.11.19.00.00
-unspsc7#81.11.19.03.00#Remote database information retrieval#81.11.19.00.00
-unspsc7#81.11.20.00.00#Data services#81.11.00.00.00
-unspsc7#81.11.20.01.00#On line data processing#81.11.20.00.00
-unspsc7#81.11.20.02.00#Data processing or preparation services#81.11.20.00.00
-unspsc7#81.11.20.03.00#Data center services#81.11.20.00.00
-unspsc7#81.11.20.04.00#Disaster recovery services#81.11.20.00.00
-unspsc7#81.11.20.05.00#Document scanning service#81.11.20.00.00
-unspsc7#81.11.20.06.00#Data storage service#81.11.20.00.00
-unspsc7#81.11.20.07.00#Content or data standardization services#81.11.20.00.00
-unspsc7#81.11.21.00.00#Internet services#81.11.00.00.00
-unspsc7#81.11.21.01.00#Internet service providers (ISP)#81.11.21.00.00
-unspsc7#81.11.21.02.00#Electronic mail service provider#81.11.21.00.00
-unspsc7#81.11.21.03.00#World wide web (WWW) site design services#81.11.21.00.00
-unspsc7#81.11.21.04.00#Web search engine providers#81.11.21.00.00
-unspsc7#81.11.21.05.00#World wide web (WWW) site operation (host) services#81.11.21.00.00
-unspsc7#81.11.21.06.00#Application service providers#81.11.21.00.00
-unspsc7#81.11.21.07.00#Internet domain names#81.11.21.00.00
-unspsc7#81.11.22.00.00#Software maintenance and support#81.11.00.00.00
-unspsc7#81.11.22.01.00#Maintenance and support fees#81.11.22.00.00
-unspsc7#81.11.22.02.00#Software patches or upgrades#81.11.22.00.00
-unspsc7#81.12.00.00.00#Economics#81.00.00.00.00
-unspsc7#81.12.15.00.00#Economic analysis#81.12.00.00.00
-unspsc7#81.12.15.01.00#Macro economic analysis#81.12.15.00.00
-unspsc7#81.12.15.02.00#Micro economic analysis#81.12.15.00.00
-unspsc7#81.12.15.03.00#Econometrics#81.12.15.00.00
-unspsc7#81.12.15.04.00#Economic forecasts#81.12.15.00.00
-unspsc7#81.12.16.00.00#Monetary systems and issues#81.12.00.00.00
-unspsc7#81.12.16.01.00#Monetary policy#81.12.16.00.00
-unspsc7#81.12.16.02.00#Monetary systems#81.12.16.00.00
-unspsc7#81.12.16.03.00#Monetary analysis#81.12.16.00.00
-unspsc7#81.12.16.04.00#Monetary liquidity#81.12.16.00.00
-unspsc7#81.12.16.05.00#Precious metals reserves#81.12.16.00.00
-unspsc7#81.12.16.06.00#Foreign exchange control#81.12.16.00.00
-unspsc7#81.12.16.07.00#Currency exchange markets#81.12.16.00.00
-unspsc7#81.13.00.00.00#Statistics#81.00.00.00.00
-unspsc7#81.13.15.00.00#Methodology and analysis#81.13.00.00.00
-unspsc7#81.13.15.01.00#Factor analysis#81.13.15.00.00
-unspsc7#81.13.15.02.00#Multivariate analysis#81.13.15.00.00
-unspsc7#81.13.15.03.00#Regression analysis#81.13.15.00.00
-unspsc7#81.13.15.04.00#Sampling surveys#81.13.15.00.00
-unspsc7#81.13.15.05.00#Time series analysis#81.13.15.00.00
-unspsc7#81.14.00.00.00#Manufacturing technologies#81.00.00.00.00
-unspsc7#81.14.15.00.00#Quality control#81.14.00.00.00
-unspsc7#81.14.15.01.00#Materials testing#81.14.15.00.00
-unspsc7#81.14.15.02.00#Materials synthesis#81.14.15.00.00
-unspsc7#81.14.15.03.00#Materials inspection#81.14.15.00.00
-unspsc7#81.14.15.04.00#Equipment test or calibration#81.14.15.00.00
-unspsc7#81.14.15.05.00#Production standards development#81.14.15.00.00
-unspsc7#81.14.15.06.00#Product testing#81.14.15.00.00
-unspsc7#81.14.16.00.00#Supply chain management#81.14.00.00.00
-unspsc7#81.14.16.01.00#Logistics#81.14.16.00.00
-unspsc7#81.14.16.02.00#Transit analysis#81.14.16.00.00
-unspsc7#81.14.16.03.00#Transport finance or economics#81.14.16.00.00
-unspsc7#81.14.16.04.00#Transport facilitation#81.14.16.00.00
-unspsc7#81.14.16.05.00#Transport infrastructure#81.14.16.00.00
-unspsc7#81.14.16.06.00#Transport planning#81.14.16.00.00
-unspsc7#81.14.17.00.00#Production planning and control#81.14.00.00.00
-unspsc7#81.14.17.01.00#Production planning#81.14.17.00.00
-unspsc7#81.14.17.02.00#Production control#81.14.17.00.00
-unspsc7#81.14.17.03.00#Production scheduling#81.14.17.00.00
-unspsc7#81.14.17.04.00#Production statistics collection or analysis services#81.14.17.00.00
-unspsc7#81.14.18.00.00#Facilities management#81.14.00.00.00
-unspsc7#81.14.18.01.00#Safety or risk analysis#81.14.18.00.00
-unspsc7#81.14.18.02.00#Industrial hygiene or ventilation#81.14.18.00.00
-unspsc7#81.14.18.03.00#Acoustics or noise control#81.14.18.00.00
-unspsc7#81.14.18.04.00#Equipment inspection service#81.14.18.00.00
-unspsc7#81.14.18.05.00#Building inspection service#81.14.18.00.00
-unspsc7#81.14.18.06.00#Power line inspection service#81.14.18.00.00
-unspsc7#81.14.18.07.00#Plumbing or sewer inspection service#81.14.18.00.00
-unspsc7#81.15.00.00.00#Earth science services#81.00.00.00.00
-unspsc7#81.15.15.00.00#Meteorology#81.15.00.00.00
-unspsc7#81.15.15.01.00#Climatology#81.15.15.00.00
-unspsc7#81.15.15.02.00#Meteorological services#81.15.15.00.00
-unspsc7#81.15.15.03.00#Hydrometeorology#81.15.15.00.00
-unspsc7#81.15.16.00.00#Cartography#81.15.00.00.00
-unspsc7#81.15.16.01.00#Mapping#81.15.16.00.00
-unspsc7#81.15.16.02.00#Map production#81.15.16.00.00
-unspsc7#81.15.16.03.00#Photogrammetry#81.15.16.00.00
-unspsc7#81.15.16.04.00#Land surveying#81.15.16.00.00
-unspsc7#81.15.17.00.00#Geology#81.15.00.00.00
-unspsc7#81.15.17.01.00#Photogeology#81.15.17.00.00
-unspsc7#81.15.17.02.00#Stratigraphic geology#81.15.17.00.00
-unspsc7#81.15.17.03.00#Geological surveys#81.15.17.00.00
-unspsc7#81.15.17.04.00#Geological exploration#81.15.17.00.00
-unspsc7#81.15.17.05.00#Archaeological services#81.15.17.00.00
-unspsc7#81.15.18.00.00#Oceanography and hydrology#81.15.00.00.00
-unspsc7#81.15.18.01.00#Oceanographic survey#81.15.18.00.00
-unspsc7#81.15.18.02.00#Estuarine oceanography#81.15.18.00.00
-unspsc7#81.15.18.03.00#Physical oceanography#81.15.18.00.00
-unspsc7#81.15.18.04.00#Hydrological surveys#81.15.18.00.00
-unspsc7#81.15.18.05.00#Bathymetric surveys#81.15.18.00.00
-unspsc7#81.15.18.06.00#Underwater exploration#81.15.18.00.00
-unspsc7#81.15.19.00.00#Geophysics#81.15.00.00.00
-unspsc7#81.15.19.01.00#Geophysical surveys#81.15.19.00.00
-unspsc7#81.15.19.02.00#Geophysical exploration#81.15.19.00.00
-unspsc7#81.15.19.03.00#Geophysical photo interpretation#81.15.19.00.00
-unspsc7#81.15.19.04.00#Aero magnetic geophysics#81.15.19.00.00
-unspsc7#82.00.00.00.00#Editorial and Design and Graphic and Fine Art Services#82.00.00.00.00
-unspsc7#82.10.00.00.00#Advertising#82.00.00.00.00
-unspsc7#82.10.15.00.00#Print advertising#82.10.00.00.00
-unspsc7#82.10.15.01.00#Billboard advertising#82.10.15.00.00
-unspsc7#82.10.15.02.00#Poster advertising#82.10.15.00.00
-unspsc7#82.10.15.03.00#Magazine advertising#82.10.15.00.00
-unspsc7#82.10.15.04.00#Newspaper advertising#82.10.15.00.00
-unspsc7#82.10.15.05.00#Handbill or coupon advertising#82.10.15.00.00
-unspsc7#82.10.15.06.00#Transit advertising services#82.10.15.00.00
-unspsc7#82.10.15.07.00#Shopping news or advertising or distribution service#82.10.15.00.00
-unspsc7#82.10.15.08.00#Yellow  pages advertising#82.10.15.00.00
-unspsc7#82.10.16.00.00#Broadcast advertising#82.10.00.00.00
-unspsc7#82.10.16.01.00#Radio advertising#82.10.16.00.00
-unspsc7#82.10.16.02.00#Television advertising#82.10.16.00.00
-unspsc7#82.10.16.03.00#Internet advertising#82.10.16.00.00
-unspsc7#82.10.17.00.00#Aerial advertising#82.10.00.00.00
-unspsc7#82.10.17.01.00#Banner advertising services#82.10.17.00.00
-unspsc7#82.10.17.02.00#Skywriting advertising services#82.10.17.00.00
-unspsc7#82.10.18.00.00#Advertising agency services#82.10.00.00.00
-unspsc7#82.10.18.01.00#Advertising campaign services#82.10.18.00.00
-unspsc7#82.11.00.00.00#Writing and translations#82.00.00.00.00
-unspsc7#82.11.15.00.00#Technical writing#82.11.00.00.00
-unspsc7#82.11.15.01.00#Instruction writing services#82.11.15.00.00
-unspsc7#82.11.15.02.00#Manual writing services#82.11.15.00.00
-unspsc7#82.11.15.03.00#Academic or scientific article writing#82.11.15.00.00
-unspsc7#82.11.16.00.00#Non technical writing#82.11.00.00.00
-unspsc7#82.11.16.01.00#Letter writing services#82.11.16.00.00
-unspsc7#82.11.16.02.00#Resume writing services#82.11.16.00.00
-unspsc7#82.11.16.03.00#Court reporting services#82.11.16.00.00
-unspsc7#82.11.16.04.00#Transcribing services#82.11.16.00.00
-unspsc7#82.11.17.00.00#Creative writing#82.11.00.00.00
-unspsc7#82.11.17.01.00#Article writers services#82.11.17.00.00
-unspsc7#82.11.17.02.00#Book authors services#82.11.17.00.00
-unspsc7#82.11.17.03.00#Poetry authors services#82.11.17.00.00
-unspsc7#82.11.17.04.00#Copywriting#82.11.17.00.00
-unspsc7#82.11.17.05.00#Speech writing#82.11.17.00.00
-unspsc7#82.11.18.00.00#Editorial and support services#82.11.00.00.00
-unspsc7#82.11.18.01.00#Editing services#82.11.18.00.00
-unspsc7#82.11.18.02.00#Fact checking services#82.11.18.00.00
-unspsc7#82.11.18.03.00#Proofreading services#82.11.18.00.00
-unspsc7#82.11.18.04.00#Written translation services#82.11.18.00.00
-unspsc7#82.11.19.00.00#News and publicity services#82.11.00.00.00
-unspsc7#82.11.19.01.00#Press release services#82.11.19.00.00
-unspsc7#82.11.19.02.00#Special interest newsletter services#82.11.19.00.00
-unspsc7#82.11.19.03.00#News agency wire services#82.11.19.00.00
-unspsc7#82.11.19.04.00#Newspaper or advertising material delivery services#82.11.19.00.00
-unspsc7#82.12.00.00.00#Reproduction services#82.00.00.00.00
-unspsc7#82.12.15.00.00#Printing#82.12.00.00.00
-unspsc7#82.12.15.01.00#Planning or layout of graphic production#82.12.15.00.00
-unspsc7#82.12.15.02.00#Typesetting#82.12.15.00.00
-unspsc7#82.12.15.03.00#Digital printing#82.12.15.00.00
-unspsc7#82.12.15.04.00#Letterpress or screen printing#82.12.15.00.00
-unspsc7#82.12.15.05.00#Promotional or advertising printing#82.12.15.00.00
-unspsc7#82.12.15.06.00#Publication printing#82.12.15.00.00
-unspsc7#82.12.15.07.00#Stationery or business form printing#82.12.15.00.00
-unspsc7#82.12.15.08.00#Wrap or tag or label or seal or bag printing#82.12.15.00.00
-unspsc7#82.12.15.09.00#Security or financial instruments printing#82.12.15.00.00
-unspsc7#82.12.15.10.00#Textile printing#82.12.15.00.00
-unspsc7#82.12.15.11.00#Technical manual and instruction sheet printing#82.12.15.00.00
-unspsc7#82.12.15.12.00#Embossing#82.12.15.00.00
-unspsc7#82.12.16.00.00#Engraving#82.12.00.00.00
-unspsc7#82.12.16.01.00#Currency engraving#82.12.16.00.00
-unspsc7#82.12.16.02.00#Engraved roll printing#82.12.16.00.00
-unspsc7#82.12.16.03.00#Metal plate engraving#82.12.16.00.00
-unspsc7#82.12.17.00.00#Photocopying#82.12.00.00.00
-unspsc7#82.12.17.01.00#Black and white copy or collating services#82.12.17.00.00
-unspsc7#82.12.17.02.00#Color copy or collating services#82.12.17.00.00
-unspsc7#82.12.18.00.00#Publishing#82.12.00.00.00
-unspsc7#82.12.18.01.00#Textbook or research publishing#82.12.18.00.00
-unspsc7#82.12.18.02.00#Author funded publishing services#82.12.18.00.00
-unspsc7#82.12.19.00.00#Bookbinding#82.12.00.00.00
-unspsc7#82.12.19.01.00#Thread stitch bookbinding#82.12.19.00.00
-unspsc7#82.12.19.02.00#Spiral binding#82.12.19.00.00
-unspsc7#82.12.19.03.00#Glued binding#82.12.19.00.00
-unspsc7#82.12.19.04.00#Comb or clamp type binding#82.12.19.00.00
-unspsc7#82.12.19.05.00#Binding restoration or repair#82.12.19.00.00
-unspsc7#82.12.19.06.00#Bronzing or gilding or edging or deckling#82.12.19.00.00
-unspsc7#82.13.00.00.00#Photographic services#82.00.00.00.00
-unspsc7#82.13.15.00.00#Film processing services#82.13.00.00.00
-unspsc7#82.13.15.01.00#Still film processing or reproduction#82.13.15.00.00
-unspsc7#82.13.15.02.00#Motion picture film processing or reproduction#82.13.15.00.00
-unspsc7#82.13.15.03.00#Microfiche services#82.13.15.00.00
-unspsc7#82.13.15.04.00#Color separation#82.13.15.00.00
-unspsc7#82.13.16.00.00#Photographers and cinematographers#82.13.00.00.00
-unspsc7#82.13.16.01.00#Aerial photography services#82.13.16.00.00
-unspsc7#82.13.16.02.00#Motion picture cinematography#82.13.16.00.00
-unspsc7#82.13.16.03.00#Video production services#82.13.16.00.00
-unspsc7#82.13.16.04.00#Studio photography services or still photographs#82.13.16.00.00
-unspsc7#82.14.00.00.00#Graphic design#82.00.00.00.00
-unspsc7#82.14.15.00.00#Art design services#82.14.00.00.00
-unspsc7#82.14.15.01.00#Layout or graphics editing services#82.14.15.00.00
-unspsc7#82.14.15.02.00#Art design or graphics#82.14.15.00.00
-unspsc7#82.14.15.03.00#Photocomposition#82.14.15.00.00
-unspsc7#82.14.15.04.00#Chart or graph design services#82.14.15.00.00
-unspsc7#82.14.15.05.00#Computer generated design services#82.14.15.00.00
-unspsc7#82.14.15.06.00#Package design services#82.14.15.00.00
-unspsc7#82.14.15.07.00#Silkscreen design services#82.14.15.00.00
-unspsc7#82.14.16.00.00#Graphic display services#82.14.00.00.00
-unspsc7#82.14.16.01.00#Photographic or picture mounting or framing services#82.14.16.00.00
-unspsc7#82.14.16.02.00#Article display arrangement#82.14.16.00.00
-unspsc7#82.15.00.00.00#Professional artists and performers#82.00.00.00.00
-unspsc7#82.15.15.00.00#Visual art services#82.15.00.00.00
-unspsc7#82.15.15.01.00#Painters services#82.15.15.00.00
-unspsc7#82.15.15.02.00#Lithographers services#82.15.15.00.00
-unspsc7#82.15.15.03.00#Cartoonists services#82.15.15.00.00
-unspsc7#82.15.15.04.00#Sculptors services#82.15.15.00.00
-unspsc7#82.15.15.05.00#Ceramics makers services#82.15.15.00.00
-unspsc7#82.15.15.06.00#Glass blowers services#82.15.15.00.00
-unspsc7#82.15.15.07.00#Textile spinners or loomers or weavers services#82.15.15.00.00
-unspsc7#82.15.15.08.00#Taxidermy services#82.15.15.00.00
-unspsc7#82.15.16.00.00#Circus performers#82.15.00.00.00
-unspsc7#82.15.16.01.00#Animal trainers services#82.15.16.00.00
-unspsc7#82.15.16.02.00#Acrobats services#82.15.16.00.00
-unspsc7#82.15.16.03.00#Magicians services#82.15.16.00.00
-unspsc7#82.15.16.04.00#Clowns services#82.15.16.00.00
-unspsc7#82.15.17.00.00#Performing arts professionals#82.15.00.00.00
-unspsc7#82.15.17.01.00#Acting services#82.15.17.00.00
-unspsc7#82.15.17.02.00#Comedians services#82.15.17.00.00
-unspsc7#82.15.17.03.00#Dancers services#82.15.17.00.00
-unspsc7#82.15.17.04.00#Musicians services#82.15.17.00.00
-unspsc7#82.15.17.05.00#Vocalists services#82.15.17.00.00
-unspsc7#82.15.17.06.00#Choreographic services#82.15.17.00.00
-unspsc7#83.00.00.00.00#Public Utilities and Public Sector Related Services#83.00.00.00.00
-unspsc7#83.10.00.00.00#Utilities#83.00.00.00.00
-unspsc7#83.10.15.00.00#Water and sewer utilities#83.10.00.00.00
-unspsc7#83.10.15.01.00#Supply of water#83.10.15.00.00
-unspsc7#83.10.15.02.00#Water resource management#83.10.15.00.00
-unspsc7#83.10.15.03.00#Water quality control management#83.10.15.00.00
-unspsc7#83.10.15.04.00#Water distribution management#83.10.15.00.00
-unspsc7#83.10.15.05.00#Water policy advisory services#83.10.15.00.00
-unspsc7#83.10.15.06.00#Water treatment services#83.10.15.00.00
-unspsc7#83.10.15.07.00#Desalination services#83.10.15.00.00
-unspsc7#83.10.15.08.00#Town water#83.10.15.00.00
-unspsc7#83.10.15.09.00#Service water#83.10.15.00.00
-unspsc7#83.10.15.10.00#Chilled water#83.10.15.00.00
-unspsc7#83.10.16.00.00#Oil and gas utilities#83.10.00.00.00
-unspsc7#83.10.16.01.00#Supply of natural gas#83.10.16.00.00
-unspsc7#83.10.16.02.00#Supply of fuel oil#83.10.16.00.00
-unspsc7#83.10.16.03.00#Oil pipeline services#83.10.16.00.00
-unspsc7#83.10.16.04.00#Gas pipeline services#83.10.16.00.00
-unspsc7#83.10.16.05.00#Gas facility charge#83.10.16.00.00
-unspsc7#83.10.18.00.00#Electric utilities#83.10.00.00.00
-unspsc7#83.10.18.01.00#Supply of single phase electricity#83.10.18.00.00
-unspsc7#83.10.18.02.00#Supply of two phase electricity#83.10.18.00.00
-unspsc7#83.10.18.03.00#Supply of three phase electricity#83.10.18.00.00
-unspsc7#83.10.18.04.00#Electric power transmission services#83.10.18.00.00
-unspsc7#83.10.18.05.00#Industrial electric power distribution#83.10.18.00.00
-unspsc7#83.10.18.06.00#Rural electrical power distribution#83.10.18.00.00
-unspsc7#83.10.18.07.00#Municipal electric power distribution#83.10.18.00.00
-unspsc7#83.10.19.00.00#Energy conservation#83.10.00.00.00
-unspsc7#83.10.19.01.00#Energy conservation programs#83.10.19.00.00
-unspsc7#83.10.19.02.00#Energy use reduction measures#83.10.19.00.00
-unspsc7#83.10.20.00.00#Funeral services#83.10.00.00.00
-unspsc7#83.10.20.01.00#Grave digging#83.10.20.00.00
-unspsc7#83.11.00.00.00#Telecommunications media services#83.00.00.00.00
-unspsc7#83.11.15.00.00#Local and long distance telephone communications#83.11.00.00.00
-unspsc7#83.11.15.01.00#Local telephone service#83.11.15.00.00
-unspsc7#83.11.15.02.00#Long distance telephone services#83.11.15.00.00
-unspsc7#83.11.15.03.00#Pay phone provider services#83.11.15.00.00
-unspsc7#83.11.15.04.00#Pre paid phone card services#83.11.15.00.00
-unspsc7#83.11.15.05.00#Directory assistance services#83.11.15.00.00
-unspsc7#83.11.15.06.00#Conference calling services#83.11.15.00.00
-unspsc7#83.11.15.07.00#Call centre bureau services#83.11.15.00.00
-unspsc7#83.11.15.08.00#Toll free inbound telephone service#83.11.15.00.00
-unspsc7#83.11.15.09.00#Telephone equipment repair services#83.11.15.00.00
-unspsc7#83.11.16.00.00#Mobile communications services#83.11.00.00.00
-unspsc7#83.11.16.01.00#Telecommunication signal enhancement network services#83.11.16.00.00
-unspsc7#83.11.16.02.00#Satellite or earth communication systems services#83.11.16.00.00
-unspsc7#83.11.16.03.00#Cellular telephone services#83.11.16.00.00
-unspsc7#83.11.16.04.00#Paging services#83.11.16.00.00
-unspsc7#83.11.17.00.00#Facsimile and telegraph services#83.11.00.00.00
-unspsc7#83.11.17.01.00#Facsimile transmission services#83.11.17.00.00
-unspsc7#83.11.17.02.00#Telegraph transmission services#83.11.17.00.00
-unspsc7#83.11.17.03.00#Telex transmission services#83.11.17.00.00
-unspsc7#83.11.18.00.00#Television services#83.11.00.00.00
-unspsc7#83.11.18.01.00#Cable television services#83.11.18.00.00
-unspsc7#83.11.18.02.00#Closed circuit television services#83.11.18.00.00
-unspsc7#83.11.18.03.00#Television antenna construction or rental services#83.11.18.00.00
-unspsc7#83.11.18.04.00#Television broadcasting station management#83.11.18.00.00
-unspsc7#83.11.19.00.00#Radio services#83.11.00.00.00
-unspsc7#83.11.19.01.00#Radio broadcasting station management#83.11.19.00.00
-unspsc7#83.11.19.02.00#Amateur radio networks or services#83.11.19.00.00
-unspsc7#83.11.19.03.00#Small scale radio systems#83.11.19.00.00
-unspsc7#83.11.19.04.00#Radio studio or equipment services#83.11.19.00.00
-unspsc7#83.11.20.00.00#Fiber telecommunications services#83.11.00.00.00
-unspsc7#83.11.20.01.00#Dark fiber#83.11.20.00.00
-unspsc7#83.11.20.02.00#Dense wavelength division multiplexing DWDM#83.11.20.00.00
-unspsc7#83.11.20.03.00#Wave division multiplexing WDM#83.11.20.00.00
-unspsc7#83.11.20.04.00#Ocx optical carrier service#83.11.20.00.00
-unspsc7#83.11.21.00.00#Switched dial up and leased dedicated line circuit telecommunications services#83.11.00.00.00
-unspsc7#83.11.21.01.00#High speed circuit switched dial up services#83.11.21.00.00
-unspsc7#83.11.21.02.00#ISDN integrated services digital network services#83.11.21.00.00
-unspsc7#83.11.21.03.00#Point to point digital telecommunications circuit#83.11.21.00.00
-unspsc7#83.11.21.04.00#Multi point analog telecommunications circuit#83.11.21.00.00
-unspsc7#83.11.21.05.00#Point to point analog telecommunications circuit#83.11.21.00.00
-unspsc7#83.11.21.06.00#xDSL digital subscriber line#83.11.21.00.00
-unspsc7#83.11.22.00.00#Enhanced telecommunications services#83.11.00.00.00
-unspsc7#83.11.22.01.00#ATM asyncronous transfer mode managed network services#83.11.22.00.00
-unspsc7#83.11.22.02.00#Frame relay public managed network services#83.11.22.00.00
-unspsc7#83.11.22.03.00#VPN virtual private network managed network services#83.11.22.00.00
-unspsc7#83.11.22.04.00#X75 managed network services#83.11.22.00.00
-unspsc7#83.11.22.05.00#X25 managed network services#83.11.22.00.00
-unspsc7#83.12.00.00.00#Information services#83.00.00.00.00
-unspsc7#83.12.15.00.00#Libraries#83.12.00.00.00
-unspsc7#83.12.15.01.00#General municipal public use libraries#83.12.15.00.00
-unspsc7#83.12.15.02.00#College or university libraries#83.12.15.00.00
-unspsc7#83.12.15.03.00#Privately owned libraries#83.12.15.00.00
-unspsc7#83.12.15.04.00#National government or military post libraries#83.12.15.00.00
-unspsc7#83.12.16.00.00#Information centers#83.12.00.00.00
-unspsc7#83.12.16.01.00#Chambers of commerce#83.12.16.00.00
-unspsc7#83.12.16.02.00#Tourism board services#83.12.16.00.00
-unspsc7#83.12.16.03.00#Computerized information retrieval systems#83.12.16.00.00
-unspsc7#83.12.16.04.00#Online database information retrieval systems#83.12.16.00.00
-unspsc7#83.12.16.05.00#Remote database information retrieval services#83.12.16.00.00
-unspsc7#83.12.16.06.00#Skip tracing#83.12.16.00.00
-unspsc7#83.12.17.00.00#Mass communication services#83.12.00.00.00
-unspsc7#83.12.17.01.00#Television related services#83.12.17.00.00
-unspsc7#83.12.17.02.00#Radio related services#83.12.17.00.00
-unspsc7#83.12.17.03.00#Internet related services#83.12.17.00.00
-unspsc7#83.12.17.04.00#Citizen warning systems#83.12.17.00.00
-unspsc7#84.00.00.00.00#Financial and Insurance Services#84.00.00.00.00
-unspsc7#84.10.00.00.00#Development finance#84.00.00.00.00
-unspsc7#84.10.15.00.00#Development assistance#84.10.00.00.00
-unspsc7#84.10.15.01.00#Financial assistance#84.10.15.00.00
-unspsc7#84.10.15.02.00#Savings mobilization programs#84.10.15.00.00
-unspsc7#84.10.15.03.00#Guarantee agreements#84.10.15.00.00
-unspsc7#84.10.16.00.00#Aid financing#84.10.00.00.00
-unspsc7#84.10.16.01.00#Co financing#84.10.16.00.00
-unspsc7#84.10.16.02.00#Bi lateral or multi lateral aid#84.10.16.00.00
-unspsc7#84.10.16.03.00#Non governmental aid#84.10.16.00.00
-unspsc7#84.10.16.04.00#Government aid#84.10.16.00.00
-unspsc7#84.10.17.00.00#Debt management#84.10.00.00.00
-unspsc7#84.10.17.01.00#Debt negotiation#84.10.17.00.00
-unspsc7#84.10.17.02.00#Debt reorganization#84.10.17.00.00
-unspsc7#84.10.17.03.00#Debt servicing#84.10.17.00.00
-unspsc7#84.10.17.04.00#Debt collection services#84.10.17.00.00
-unspsc7#84.10.17.05.00#Repossession services#84.10.17.00.00
-unspsc7#84.11.00.00.00#Accounting and auditing#84.00.00.00.00
-unspsc7#84.11.15.00.00#Accounting services#84.11.00.00.00
-unspsc7#84.11.15.01.00#Cost accounting#84.11.15.00.00
-unspsc7#84.11.15.02.00#Financial accounting#84.11.15.00.00
-unspsc7#84.11.15.03.00#Tax accounting#84.11.15.00.00
-unspsc7#84.11.15.04.00#Bookkeeping services#84.11.15.00.00
-unspsc7#84.11.15.05.00#Payroll accounting services#84.11.15.00.00
-unspsc7#84.11.15.06.00#Billing services#84.11.15.00.00
-unspsc7#84.11.15.07.00#Inventory accounting#84.11.15.00.00
-unspsc7#84.11.16.00.00#Audit services#84.11.00.00.00
-unspsc7#84.11.16.01.00#Year end audits#84.11.16.00.00
-unspsc7#84.11.16.02.00#Quarterly reviews#84.11.16.00.00
-unspsc7#84.11.16.03.00#Internal audits#84.11.16.00.00
-unspsc7#84.11.17.00.00#Corporate finance#84.11.00.00.00
-unspsc7#84.11.17.01.00#Treasury services#84.11.17.00.00
-unspsc7#84.11.17.02.00#Investor relations services or programs#84.11.17.00.00
-unspsc7#84.11.17.03.00#Budget preparation or review services#84.11.17.00.00
-unspsc7#84.11.18.00.00#Taxation issues and preparation#84.11.00.00.00
-unspsc7#84.11.18.01.00#Tax preparers#84.11.18.00.00
-unspsc7#84.11.18.02.00#Tax advisory services#84.11.18.00.00
-unspsc7#84.12.00.00.00#Banking and investment#84.00.00.00.00
-unspsc7#84.12.15.00.00#Banking institutions#84.12.00.00.00
-unspsc7#84.12.15.01.00#Privately owned banks#84.12.15.00.00
-unspsc7#84.12.15.02.00#Publicly owned banks#84.12.15.00.00
-unspsc7#84.12.15.03.00#Credit unions#84.12.15.00.00
-unspsc7#84.12.15.04.00#Development finance institutions#84.12.15.00.00
-unspsc7#84.12.16.00.00#Funds transfer and clearance and exchange services#84.12.00.00.00
-unspsc7#84.12.16.01.00#Funds clearance services#84.12.16.00.00
-unspsc7#84.12.16.02.00#Letter of credit services#84.12.16.00.00
-unspsc7#84.12.16.03.00#Currency exchange services#84.12.16.00.00
-unspsc7#84.12.16.04.00#Spot exchange transaction services#84.12.16.00.00
-unspsc7#84.12.16.05.00#Currency conversion service#84.12.16.00.00
-unspsc7#84.12.16.06.00#Remittance processing services#84.12.16.00.00
-unspsc7#84.12.17.00.00#Investment advice#84.12.00.00.00
-unspsc7#84.12.17.01.00#Investment advisers#84.12.17.00.00
-unspsc7#84.12.17.02.00#Investment policy#84.12.17.00.00
-unspsc7#84.12.17.03.00#Investment analysis#84.12.17.00.00
-unspsc7#84.12.17.04.00#Investment agreements#84.12.17.00.00
-unspsc7#84.12.17.05.00#Market data#84.12.17.00.00
-unspsc7#84.12.18.00.00#Securities and commodities markets services#84.12.00.00.00
-unspsc7#84.12.18.01.00#Stock market trading services#84.12.18.00.00
-unspsc7#84.12.18.02.00#Commodities or futures market services#84.12.18.00.00
-unspsc7#84.12.18.03.00#Government bonds#84.12.18.00.00
-unspsc7#84.12.18.04.00#Privately issued bonds#84.12.18.00.00
-unspsc7#84.12.18.05.00#Precious metals market services#84.12.18.00.00
-unspsc7#84.12.19.00.00#Mortgage banking#84.12.00.00.00
-unspsc7#84.12.19.01.00#Housing finance#84.12.19.00.00
-unspsc7#84.12.19.02.00#Re financing services#84.12.19.00.00
-unspsc7#84.12.19.03.00#Commercial mortgage finance#84.12.19.00.00
-unspsc7#84.12.20.00.00#Cash vault services#84.12.00.00.00
-unspsc7#84.12.20.01.00#Deposit verification services#84.12.20.00.00
-unspsc7#84.13.00.00.00#Insurance and retirement services#84.00.00.00.00
-unspsc7#84.13.15.00.00#Insurance services for structures and property and possessions#84.13.00.00.00
-unspsc7#84.13.15.01.00#Building or building contents insurance#84.13.15.00.00
-unspsc7#84.13.15.02.00#Homeowners or renters insurance#84.13.15.00.00
-unspsc7#84.13.15.03.00#Car or truck insurance#84.13.15.00.00
-unspsc7#84.13.15.04.00#Cargo insurance#84.13.15.00.00
-unspsc7#84.13.15.05.00#Marine insurance#84.13.15.00.00
-unspsc7#84.13.15.06.00#Reinsurance services#84.13.15.00.00
-unspsc7#84.13.16.00.00#Life and health and accident insurance#84.13.00.00.00
-unspsc7#84.13.16.01.00#Life insurance#84.13.16.00.00
-unspsc7#84.13.16.02.00#Health or hospitalization insurance#84.13.16.00.00
-unspsc7#84.13.16.03.00#Accidental injury insurance#84.13.16.00.00
-unspsc7#84.13.16.04.00#Disability insurance#84.13.16.00.00
-unspsc7#84.13.16.05.00#Workmens insurance#84.13.16.00.00
-unspsc7#84.13.16.06.00#Unemployment insurance#84.13.16.00.00
-unspsc7#84.13.16.07.00#Liability insurance#84.13.16.00.00
-unspsc7#84.13.17.00.00#Pension funds#84.13.00.00.00
-unspsc7#84.13.17.01.00#Employer administered pension funds#84.13.17.00.00
-unspsc7#84.13.17.02.00#Union or guild administered pension funds#84.13.17.00.00
-unspsc7#84.13.18.00.00#Retirement funds#84.13.00.00.00
-unspsc7#84.13.18.01.00#Self directed or employer sponsored retirement funds#84.13.18.00.00
-unspsc7#84.13.18.02.00#Self directed or self initiated retirement plans#84.13.18.00.00
-unspsc7#84.14.00.00.00#Credit agencies#84.00.00.00.00
-unspsc7#84.14.15.00.00#Governmental credit agencies#84.14.00.00.00
-unspsc7#84.14.15.01.00#Farm credit services#84.14.15.00.00
-unspsc7#84.14.15.02.00#Small business loan agencies#84.14.15.00.00
-unspsc7#84.14.15.03.00#Minority owned business programs#84.14.15.00.00
-unspsc7#84.14.16.00.00#Personal credit agencies#84.14.00.00.00
-unspsc7#84.14.16.01.00#Consumer credit gathering or reporting services#84.14.16.00.00
-unspsc7#84.14.16.02.00#Credit card service providers#84.14.16.00.00
-unspsc7#84.14.17.00.00#Business credit agencies#84.14.00.00.00
-unspsc7#84.14.17.01.00#Business credit gathering or reporting services#84.14.17.00.00
-unspsc7#84.14.17.02.00#Value added network (VAN) services#84.14.17.00.00
-unspsc7#85.00.00.00.00#Healthcare Services#85.00.00.00.00
-unspsc7#85.10.00.00.00#Comprehensive health services#85.00.00.00.00
-unspsc7#85.10.15.00.00#Healthcare centers#85.10.00.00.00
-unspsc7#85.10.15.01.00#Emergency or surgical hospital services#85.10.15.00.00
-unspsc7#85.10.15.02.00#Private specialized clinic services#85.10.15.00.00
-unspsc7#85.10.15.03.00#Medical office services#85.10.15.00.00
-unspsc7#85.10.15.04.00#Psychiatric hospital services#85.10.15.00.00
-unspsc7#85.10.15.05.00#Respiratory hospital services#85.10.15.00.00
-unspsc7#85.10.15.06.00#Substance abuse hospital services#85.10.15.00.00
-unspsc7#85.10.15.07.00#Urgent care centers#85.10.15.00.00
-unspsc7#85.10.15.08.00#Mobile healthcare centers or services#85.10.15.00.00
-unspsc7#85.10.15.09.00#Gynecological or obstetrical hospital services#85.10.15.00.00
-unspsc7#85.10.16.00.00#Healthcare provider support persons#85.10.00.00.00
-unspsc7#85.10.16.01.00#Nursing services#85.10.16.00.00
-unspsc7#85.10.16.02.00#Midwifery or child birth preparation services#85.10.16.00.00
-unspsc7#85.10.16.03.00#Personal care services in specialized institutions#85.10.16.00.00
-unspsc7#85.10.16.04.00#Physicians personnel assistance services#85.10.16.00.00
-unspsc7#85.10.16.05.00#Home health assistants#85.10.16.00.00
-unspsc7#85.10.17.00.00#Health administration services#85.10.00.00.00
-unspsc7#85.10.17.01.00#Health policy#85.10.17.00.00
-unspsc7#85.10.17.02.00#Health legislation or regulations#85.10.17.00.00
-unspsc7#85.10.17.03.00#Health service planning#85.10.17.00.00
-unspsc7#85.10.17.04.00#Health economics#85.10.17.00.00
-unspsc7#85.10.17.05.00#Public health administration#85.10.17.00.00
-unspsc7#85.10.17.06.00#Traditional healthcare services#85.10.17.00.00
-unspsc7#85.10.17.07.00#Health systems evaluation services#85.10.17.00.00
-unspsc7#85.11.00.00.00#Disease prevention and control#85.00.00.00.00
-unspsc7#85.11.15.00.00#Contagious disease prevention and control#85.11.00.00.00
-unspsc7#85.11.15.01.00#Aids prevention or control services#85.11.15.00.00
-unspsc7#85.11.15.02.00#Parasitic disease prevention or control services#85.11.15.00.00
-unspsc7#85.11.15.03.00#Fungal diseases prevention or control services#85.11.15.00.00
-unspsc7#85.11.15.04.00#Tuberculosis prevention or control services#85.11.15.00.00
-unspsc7#85.11.15.05.00#Leprosy prevention or control services#85.11.15.00.00
-unspsc7#85.11.15.06.00#Bacterial disease prevention or control services#85.11.15.00.00
-unspsc7#85.11.15.07.00#Sexually transmitted diseases prevention or control services#85.11.15.00.00
-unspsc7#85.11.15.08.00#Viral diseases prevention or control services#85.11.15.00.00
-unspsc7#85.11.15.09.00#Zoonotic diseases prevention or control services#85.11.15.00.00
-unspsc7#85.11.15.10.00#Vaccination services#85.11.15.00.00
-unspsc7#85.11.15.11.00#Quarantine services#85.11.15.00.00
-unspsc7#85.11.15.12.00#Immunization services#85.11.15.00.00
-unspsc7#85.11.15.13.00#Disinsectization services#85.11.15.00.00
-unspsc7#85.11.15.14.00#Epidemics prevention or control services#85.11.15.00.00
-unspsc7#85.11.16.00.00#Non contagious disease prevention and control#85.11.00.00.00
-unspsc7#85.11.16.01.00#Bone diseases prevention or control services#85.11.16.00.00
-unspsc7#85.11.16.02.00#Cancer or leukemia prevention or control services#85.11.16.00.00
-unspsc7#85.11.16.03.00#Endocrine diseases prevention or control services#85.11.16.00.00
-unspsc7#85.11.16.04.00#Heart diseases prevention or control services#85.11.16.00.00
-unspsc7#85.11.16.05.00#Immunologic prevention or control services#85.11.16.00.00
-unspsc7#85.11.16.06.00#Allergies prevention or control services#85.11.16.00.00
-unspsc7#85.11.16.07.00#Neurological disorders prevention or control services#85.11.16.00.00
-unspsc7#85.11.16.08.00#Nutritional diseases prevention or control services#85.11.16.00.00
-unspsc7#85.11.16.09.00#Radiation sickness prevention or control services#85.11.16.00.00
-unspsc7#85.11.16.10.00#Digestive system diseases prevention or control services#85.11.16.00.00
-unspsc7#85.11.16.11.00#Eye disease prevention or control services#85.11.16.00.00
-unspsc7#85.11.16.12.00#Respiratory diseases prevention or control services#85.11.16.00.00
-unspsc7#85.11.16.13.00#Tropical diseases prevention or control services#85.11.16.00.00
-unspsc7#85.11.16.14.00#Childhood diseases prevention or control services#85.11.16.00.00
-unspsc7#85.11.16.15.00#Diarrheal diseases prevention or control services#85.11.16.00.00
-unspsc7#85.11.16.16.00#Alcoholism prevention or control services#85.11.16.00.00
-unspsc7#85.11.16.17.00#Drug addiction prevention or control services#85.11.16.00.00
-unspsc7#85.11.17.00.00#Disease vectors management and control#85.11.00.00.00
-unspsc7#85.11.17.01.00#Ticks management or control services#85.11.17.00.00
-unspsc7#85.11.17.02.00#Tsetse flies management or control services#85.11.17.00.00
-unspsc7#85.11.17.03.00#Bacteria management or control services#85.11.17.00.00
-unspsc7#85.11.17.04.00#Mosquito management or control services#85.11.17.00.00
-unspsc7#85.12.00.00.00#Medical practice#85.00.00.00.00
-unspsc7#85.12.15.00.00#Primary care practitioners services#85.12.00.00.00
-unspsc7#85.12.15.01.00#Primary care physicians home visits services#85.12.15.00.00
-unspsc7#85.12.15.02.00#Primary care physicians consultation services#85.12.15.00.00
-unspsc7#85.12.15.03.00#Primary care physicians control services#85.12.15.00.00
-unspsc7#85.12.15.04.00#Primary care physicians emergency medical services#85.12.15.00.00
-unspsc7#85.12.16.00.00#Medical doctors specialist services#85.12.00.00.00
-unspsc7#85.12.16.01.00#Gynecologic or obstetric services#85.12.16.00.00
-unspsc7#85.12.16.02.00#Nephrology services#85.12.16.00.00
-unspsc7#85.12.16.03.00#Cardiology services#85.12.16.00.00
-unspsc7#85.12.16.04.00#Pulomonary specialists services#85.12.16.00.00
-unspsc7#85.12.16.05.00#Gastroenterologists services#85.12.16.00.00
-unspsc7#85.12.16.06.00#Geriatric services#85.12.16.00.00
-unspsc7#85.12.16.07.00#Psychiatrist services#85.12.16.00.00
-unspsc7#85.12.16.08.00#Psychologists services#85.12.16.00.00
-unspsc7#85.12.16.09.00#Surgery services#85.12.16.00.00
-unspsc7#85.12.16.10.00#Ophthalmologists services#85.12.16.00.00
-unspsc7#85.12.16.11.00#Dermatology services#85.12.16.00.00
-unspsc7#85.12.16.12.00#Orthopedics services#85.12.16.00.00
-unspsc7#85.12.16.13.00#Pediatric services#85.12.16.00.00
-unspsc7#85.12.16.14.00#Nervous system specialist services#85.12.16.00.00
-unspsc7#85.12.17.00.00#Healthcare providers specialists services#85.12.00.00.00
-unspsc7#85.12.17.01.00#Psychotherapists services#85.12.17.00.00
-unspsc7#85.12.17.02.00#Optometrists services#85.12.17.00.00
-unspsc7#85.12.17.03.00#Podiatrists services#85.12.17.00.00
-unspsc7#85.12.17.04.00#Speech specialists services#85.12.17.00.00
-unspsc7#85.12.17.05.00#Acupuncturists services#85.12.17.00.00
-unspsc7#85.12.17.06.00#Chiropractors services#85.12.17.00.00
-unspsc7#85.12.18.00.00#Medical laboratories#85.12.00.00.00
-unspsc7#85.12.18.01.00#Blood analysis laboratory services#85.12.18.00.00
-unspsc7#85.12.18.02.00#Bacteriological laboratory services#85.12.18.00.00
-unspsc7#85.12.18.03.00#Biological laboratory services#85.12.18.00.00
-unspsc7#85.12.18.04.00#Pathological laboratory services#85.12.18.00.00
-unspsc7#85.12.18.05.00#Urinalysis laboratory services#85.12.18.00.00
-unspsc7#85.12.18.06.00#Neurological laboratory services#85.12.18.00.00
-unspsc7#85.12.18.07.00#Ultrasound laboratory services#85.12.18.00.00
-unspsc7#85.12.18.08.00#X ray laboratory services#85.12.18.00.00
-unspsc7#85.12.18.09.00#Blood or sperm or transplant organ banks services#85.12.18.00.00
-unspsc7#85.12.18.10.00#Drug or alcohol screening#85.12.18.00.00
-unspsc7#85.12.19.00.00#Pharmacists#85.12.00.00.00
-unspsc7#85.12.19.01.00#Pharmaceutical preparation services#85.12.19.00.00
-unspsc7#85.12.19.02.00#Commercial pharmaceutical services#85.12.19.00.00
-unspsc7#85.12.20.00.00#Dental services#85.12.00.00.00
-unspsc7#85.12.20.01.00#Dentists services#85.12.20.00.00
-unspsc7#85.12.20.02.00#Dental hygienists services#85.12.20.00.00
-unspsc7#85.12.20.03.00#Dentist support staff services#85.12.20.00.00
-unspsc7#85.12.20.04.00#Oral surgeons services#85.12.20.00.00
-unspsc7#85.12.20.05.00#Orthodontic services#85.12.20.00.00
-unspsc7#85.12.21.00.00#Rehabilitation services#85.12.00.00.00
-unspsc7#85.12.21.01.00#Physical therapy services#85.12.21.00.00
-unspsc7#85.12.21.02.00#Occupational therapy services#85.12.21.00.00
-unspsc7#85.12.21.03.00#Rehabilitation services for substance abuse#85.12.21.00.00
-unspsc7#85.12.21.04.00#Athletic rehabilitation services#85.12.21.00.00
-unspsc7#85.12.21.05.00#Eating disorders services#85.12.21.00.00
-unspsc7#85.12.21.06.00#Brain or spinal cord injury services#85.12.21.00.00
-unspsc7#85.12.21.07.00#Blind or vision impaired rehabilitation services#85.12.21.00.00
-unspsc7#85.12.21.08.00#Speech or language therapy#85.12.21.00.00
-unspsc7#85.12.21.09.00#Rehabilitation services for people with chronic disabilities#85.12.21.00.00
-unspsc7#85.13.00.00.00#Medical science research and experimentation#85.00.00.00.00
-unspsc7#85.13.15.00.00#Experimental medicine services#85.13.00.00.00
-unspsc7#85.13.15.01.00#Organ transplant services#85.13.15.00.00
-unspsc7#85.13.15.02.00#Clinical human drug trials#85.13.15.00.00
-unspsc7#85.13.15.03.00#Animal experimentation#85.13.15.00.00
-unspsc7#85.13.15.04.00#Human experimentation#85.13.15.00.00
-unspsc7#85.13.15.05.00#Space experimentation#85.13.15.00.00
-unspsc7#85.13.16.00.00#Medical ethics#85.13.00.00.00
-unspsc7#85.13.16.01.00#Euthanasia issues#85.13.16.00.00
-unspsc7#85.13.16.02.00#Medical code of conduct#85.13.16.00.00
-unspsc7#85.13.16.03.00#Medical societies#85.13.16.00.00
-unspsc7#85.13.16.04.00#International drug monitoring services#85.13.16.00.00
-unspsc7#85.13.17.00.00#Medical science and research#85.13.00.00.00
-unspsc7#85.13.17.01.00#Pharmaceutical research services#85.13.17.00.00
-unspsc7#85.13.17.02.00#Bacteriology research services#85.13.17.00.00
-unspsc7#85.13.17.03.00#Biomedical research services#85.13.17.00.00
-unspsc7#85.13.17.04.00#Cardiology research services#85.13.17.00.00
-unspsc7#85.13.17.05.00#Anatomy research services#85.13.17.00.00
-unspsc7#85.13.17.06.00#Pathology research services#85.13.17.00.00
-unspsc7#85.13.17.07.00#Embryology research services#85.13.17.00.00
-unspsc7#85.13.17.08.00#Epidemiology research services#85.13.17.00.00
-unspsc7#85.13.17.09.00#Genetics research services#85.13.17.00.00
-unspsc7#85.13.17.10.00#Immunology research services#85.13.17.00.00
-unspsc7#85.13.17.11.00#Physiology research services#85.13.17.00.00
-unspsc7#85.13.17.12.00#Toxicology research services#85.13.17.00.00
-unspsc7#85.13.17.13.00#Neurology research services#85.13.17.00.00
-unspsc7#85.14.00.00.00#Alternative and holistic medicine#85.00.00.00.00
-unspsc7#85.14.15.00.00#Faith healers#85.14.00.00.00
-unspsc7#85.14.15.01.00#Witch doctors or voodoo services#85.14.15.00.00
-unspsc7#85.14.15.02.00#Faith healers services#85.14.15.00.00
-unspsc7#85.14.15.03.00#Shamans#85.14.15.00.00
-unspsc7#85.14.15.04.00#Energy work#85.14.15.00.00
-unspsc7#85.14.16.00.00#Herbal treatments#85.14.00.00.00
-unspsc7#85.14.16.01.00#Herbal medicine or herbalists services#85.14.16.00.00
-unspsc7#85.14.16.02.00#Algae or sea weed medical cures#85.14.16.00.00
-unspsc7#85.14.16.03.00#Hot springs cure services#85.14.16.00.00
-unspsc7#85.14.17.00.00#Homeopathic practice#85.14.00.00.00
-unspsc7#85.14.17.01.00#Initial diagnostic assessment#85.14.17.00.00
-unspsc7#85.14.17.02.00#Remedy consultations#85.14.17.00.00
-unspsc7#85.15.00.00.00#Food and nutrition services#85.00.00.00.00
-unspsc7#85.15.15.00.00#Food technology#85.15.00.00.00
-unspsc7#85.15.15.01.00#Food hygiene control services#85.15.15.00.00
-unspsc7#85.15.15.02.00#Food contamination control services#85.15.15.00.00
-unspsc7#85.15.15.03.00#Food preservation management or control services#85.15.15.00.00
-unspsc7#85.15.15.04.00#Food preparation counseling or control services#85.15.15.00.00
-unspsc7#85.15.15.05.00#Food research services#85.15.15.00.00
-unspsc7#85.15.15.06.00#Studies on foods or food habits#85.15.15.00.00
-unspsc7#85.15.15.07.00#Food additive or quality standards services#85.15.15.00.00
-unspsc7#85.15.15.08.00#Food analysis services#85.15.15.00.00
-unspsc7#85.15.15.09.00#Food legislation services#85.15.15.00.00
-unspsc7#85.15.16.00.00#Nutrition issues#85.15.00.00.00
-unspsc7#85.15.16.01.00#Nutrition programming services#85.15.16.00.00
-unspsc7#85.15.16.02.00#Breast or bottle feeding policy#85.15.16.00.00
-unspsc7#85.15.16.03.00#Nutritional rehabilitation services#85.15.16.00.00
-unspsc7#85.15.16.04.00#Nutrition project evaluation#85.15.16.00.00
-unspsc7#85.15.16.05.00#Food or nutrition development strategies#85.15.16.00.00
-unspsc7#85.15.16.06.00#Nutrient deficiency control programs#85.15.16.00.00
-unspsc7#85.15.16.07.00#Diet control or programs#85.15.16.00.00
-unspsc7#85.15.17.00.00#Food policy planning and aid#85.15.00.00.00
-unspsc7#85.15.17.01.00#Food standards#85.15.17.00.00
-unspsc7#85.15.17.02.00#Food aid global information or early warning systems services#85.15.17.00.00
-unspsc7#85.15.17.03.00#Assessment of emergency food requirements#85.15.17.00.00
-unspsc7#85.15.17.04.00#National food intervention policy or programs#85.15.17.00.00
-unspsc7#85.15.17.05.00#Evaluation of food aid nutritional impact#85.15.17.00.00
-unspsc7#86.00.00.00.00#Education and Training Services#86.00.00.00.00
-unspsc7#86.10.00.00.00#Vocational training#86.00.00.00.00
-unspsc7#86.10.15.00.00#Agriculture and forestry and other natural resources training services#86.10.00.00.00
-unspsc7#86.10.15.01.00#Agro industry vocational training#86.10.15.00.00
-unspsc7#86.10.15.02.00#Dairy industry vocational training#86.10.15.00.00
-unspsc7#86.10.15.03.00#Meat industry vocational training#86.10.15.00.00
-unspsc7#86.10.15.04.00#Agriculture vocational training services#86.10.15.00.00
-unspsc7#86.10.15.05.00#Rural youth or farmers vocational training services#86.10.15.00.00
-unspsc7#86.10.15.06.00#Forestry vocational training services#86.10.15.00.00
-unspsc7#86.10.15.07.00#Fishery vocational training services#86.10.15.00.00
-unspsc7#86.10.15.08.00#Environmental vocational training services#86.10.15.00.00
-unspsc7#86.10.15.09.00#Natural resources vocational training services#86.10.15.00.00
-unspsc7#86.10.16.00.00#Scientific vocational training services#86.10.00.00.00
-unspsc7#86.10.16.01.00#Computer vocational training services#86.10.16.00.00
-unspsc7#86.10.16.02.00#Energy related vocational training services#86.10.16.00.00
-unspsc7#86.10.16.03.00#Chemistry vocational training services#86.10.16.00.00
-unspsc7#86.10.16.04.00#Biology vocational training services#86.10.16.00.00
-unspsc7#86.10.16.05.00#Medical vocational training services#86.10.16.00.00
-unspsc7#86.10.16.06.00#Electronics vocational training services#86.10.16.00.00
-unspsc7#86.10.16.07.00#Telecommunications vocational training services#86.10.16.00.00
-unspsc7#86.10.16.08.00#Hydraulics vocational training services#86.10.16.00.00
-unspsc7#86.10.16.09.00#Industrial vocational training services#86.10.16.00.00
-unspsc7#86.10.16.10.00#Engineering vocational training services#86.10.16.00.00
-unspsc7#86.10.17.00.00#Non scientific vocational training services#86.10.00.00.00
-unspsc7#86.10.17.01.00#Communications vocational training services#86.10.17.00.00
-unspsc7#86.10.17.02.00#Tourism related training#86.10.17.00.00
-unspsc7#86.10.17.03.00#Library or documentation training#86.10.17.00.00
-unspsc7#86.10.17.04.00#Procurement or supply chain training#86.10.17.00.00
-unspsc7#86.10.17.05.00#Clerical training#86.10.17.00.00
-unspsc7#86.10.17.06.00#Health assistance vocational training services#86.10.17.00.00
-unspsc7#86.10.17.07.00#Personal care vocational training services#86.10.17.00.00
-unspsc7#86.10.17.08.00#Literacy services#86.10.17.00.00
-unspsc7#86.10.17.09.00#Safety training services#86.10.17.00.00
-unspsc7#86.10.17.10.00#Teacher training services#86.10.17.00.00
-unspsc7#86.10.17.11.00#Fire fighting training services#86.10.17.00.00
-unspsc7#86.10.17.12.00#Handcrafts vocational training services#86.10.17.00.00
-unspsc7#86.10.17.13.00#Law vocational training services#86.10.17.00.00
-unspsc7#86.10.17.14.00#Law enforcement vocational training services#86.10.17.00.00
-unspsc7#86.10.17.15.00#Road or rail transportation vocational training services#86.10.17.00.00
-unspsc7#86.10.17.16.00#Shipping vocational training services#86.10.17.00.00
-unspsc7#86.10.18.00.00#In service training and manpower development#86.10.00.00.00
-unspsc7#86.10.18.01.00#Bank or finance sector manpower development#86.10.18.00.00
-unspsc7#86.10.18.02.00#Re training or refreshing training services#86.10.18.00.00
-unspsc7#86.10.18.03.00#Vocational rehabilitation services#86.10.18.00.00
-unspsc7#86.10.18.04.00#Commercial sector manpower development#86.10.18.00.00
-unspsc7#86.10.18.05.00#Industrial sector manpower development#86.10.18.00.00
-unspsc7#86.10.18.06.00#Health sector manpower development#86.10.18.00.00
-unspsc7#86.10.18.07.00#Management sector manpower development#86.10.18.00.00
-unspsc7#86.10.18.08.00#Public sector manpower development services#86.10.18.00.00
-unspsc7#86.10.18.09.00#Merchant marine vocational training services#86.10.18.00.00
-unspsc7#86.11.00.00.00#Alternative educational systems#86.00.00.00.00
-unspsc7#86.11.15.00.00#Distance learning services#86.11.00.00.00
-unspsc7#86.11.15.01.00#Distance learning guidance services#86.11.15.00.00
-unspsc7#86.11.15.02.00#Distance teaching services#86.11.15.00.00
-unspsc7#86.11.15.03.00#Certificated distance learning services#86.11.15.00.00
-unspsc7#86.11.15.04.00#Non certificated distance learning services#86.11.15.00.00
-unspsc7#86.11.15.05.00#Distance learning assessment services#86.11.15.00.00
-unspsc7#86.11.16.00.00#Adult education#86.11.00.00.00
-unspsc7#86.11.16.01.00#Evening courses#86.11.16.00.00
-unspsc7#86.11.16.02.00#Part time adult education services#86.11.16.00.00
-unspsc7#86.11.16.03.00#Parent education#86.11.16.00.00
-unspsc7#86.11.16.04.00#Employee Education#86.11.16.00.00
-unspsc7#86.11.17.00.00#Language schooling#86.11.00.00.00
-unspsc7#86.11.17.01.00#Conversational foreign language instruction#86.11.17.00.00
-unspsc7#86.11.17.02.00#Foreign language immersion instruction#86.11.17.00.00
-unspsc7#86.11.18.00.00#Educational exchanges#86.11.00.00.00
-unspsc7#86.11.18.01.00#Educational exchanges between universities#86.11.18.00.00
-unspsc7#86.11.18.02.00#Educational exchanges between schools#86.11.18.00.00
-unspsc7#86.12.00.00.00#Educational institutions#86.00.00.00.00
-unspsc7#86.12.15.00.00#Elementary and secondary schools#86.12.00.00.00
-unspsc7#86.12.15.01.00#Pre school educational services#86.12.15.00.00
-unspsc7#86.12.15.02.00#Religious elementary or secondary schools#86.12.15.00.00
-unspsc7#86.12.15.03.00#Private elementary or secondary schools#86.12.15.00.00
-unspsc7#86.12.15.04.00#Public elementary or secondary schools#86.12.15.00.00
-unspsc7#86.12.16.00.00#Junior colleges#86.12.00.00.00
-unspsc7#86.12.16.01.00#Community colleges#86.12.16.00.00
-unspsc7#86.12.16.02.00#Technical institutes#86.12.16.00.00
-unspsc7#86.12.17.00.00#University and colleges#86.12.00.00.00
-unspsc7#86.12.17.01.00#Undergraduate programs#86.12.17.00.00
-unspsc7#86.12.17.02.00#Postgraduate programs#86.12.17.00.00
-unspsc7#86.12.18.00.00#Professional schools#86.12.00.00.00
-unspsc7#86.12.18.02.00#Theological seminaries#86.12.18.00.00
-unspsc7#86.12.18.03.00#Technical professional schools#86.12.18.00.00
-unspsc7#86.12.18.04.00#Non technical professional schools#86.12.18.00.00
-unspsc7#86.13.00.00.00#Specialized educational services#86.00.00.00.00
-unspsc7#86.13.15.00.00#Fine arts#86.13.00.00.00
-unspsc7#86.13.15.01.00#Theater studies#86.13.15.00.00
-unspsc7#86.13.15.02.00#Painting#86.13.15.00.00
-unspsc7#86.13.15.03.00#Sculpture#86.13.15.00.00
-unspsc7#86.13.15.04.00#Media studies#86.13.15.00.00
-unspsc7#86.13.16.00.00#Music and drama#86.13.00.00.00
-unspsc7#86.13.16.01.00#Music schools#86.13.16.00.00
-unspsc7#86.13.16.02.00#Dance education#86.13.16.00.00
-unspsc7#86.13.16.03.00#Drama studies#86.13.16.00.00
-unspsc7#86.13.17.00.00#Driving and flying and sailing#86.13.00.00.00
-unspsc7#86.13.17.01.00#Vehicle driving schools services#86.13.17.00.00
-unspsc7#86.13.17.02.00#Flight school services#86.13.17.00.00
-unspsc7#86.13.17.03.00#Yachting or boating school services#86.13.17.00.00
-unspsc7#86.13.18.00.00#Military education#86.13.00.00.00
-unspsc7#86.13.18.01.00#Service academies#86.13.18.00.00
-unspsc7#86.13.18.02.00#Pilot schools#86.13.18.00.00
-unspsc7#86.13.18.03.00#Military police training#86.13.18.00.00
-unspsc7#86.13.18.04.00#War college#86.13.18.00.00
-unspsc7#86.13.19.00.00#Schools for people with disabilities#86.13.00.00.00
-unspsc7#86.13.19.01.00#Primary schooling services for people with disabilities#86.13.19.00.00
-unspsc7#86.13.19.02.00#Secondary schooling services for people with disabilities#86.13.19.00.00
-unspsc7#86.13.19.03.00#Specialized schools for people with disabilities#86.13.19.00.00
-unspsc7#86.13.19.04.00#Specialized rehabilitation services for people with disabilities#86.13.19.00.00
-unspsc7#86.14.00.00.00#Educational facilities#86.00.00.00.00
-unspsc7#86.14.15.00.00#Educational guidance services#86.14.00.00.00
-unspsc7#86.14.15.01.00#Educational advisory services#86.14.15.00.00
-unspsc7#86.14.15.02.00#Universities cooperation guidance services#86.14.15.00.00
-unspsc7#86.14.15.03.00#Study abroad advisory services#86.14.15.00.00
-unspsc7#86.14.16.00.00#Students organizations#86.14.00.00.00
-unspsc7#86.14.16.01.00#Students hobby clubs#86.14.16.00.00
-unspsc7#86.14.16.02.00#Students unions#86.14.16.00.00
-unspsc7#86.14.16.03.00#Students travelling organizations#86.14.16.00.00
-unspsc7#86.14.17.00.00#Educational technology#86.14.00.00.00
-unspsc7#86.14.17.01.00#Language laboratories#86.14.17.00.00
-unspsc7#86.14.17.02.00#Audio visual technology#86.14.17.00.00
-unspsc7#86.14.17.03.00#Computer programmed instruction#86.14.17.00.00
-unspsc7#86.14.17.04.00#Library or documentation services#86.14.17.00.00
-unspsc7#90.00.00.00.00#Travel and Food and Lodging and Entertainment Services#90.00.00.00.00
-unspsc7#90.10.00.00.00#Restaurants and catering#90.00.00.00.00
-unspsc7#90.10.15.00.00#Eating and drinking establishments#90.10.00.00.00
-unspsc7#90.10.15.01.00#Restaurants#90.10.15.00.00
-unspsc7#90.10.15.02.00#Bars#90.10.15.00.00
-unspsc7#90.10.15.03.00#Fast food establishments#90.10.15.00.00
-unspsc7#90.10.15.04.00#On street food vendors#90.10.15.00.00
-unspsc7#90.10.16.00.00#Banquet and catering services#90.10.00.00.00
-unspsc7#90.10.16.01.00#Banquet facilities#90.10.16.00.00
-unspsc7#90.10.16.02.00#Party tent services#90.10.16.00.00
-unspsc7#90.10.16.03.00#Catering services#90.10.16.00.00
-unspsc7#90.10.16.04.00#Construction or work site catering services#90.10.16.00.00
-unspsc7#90.10.17.00.00#Cafeteria services#90.10.00.00.00
-unspsc7#90.10.17.01.00#On site cafeteria management#90.10.17.00.00
-unspsc7#90.10.18.00.00#Carryout and takeaway services#90.10.00.00.00
-unspsc7#90.10.18.01.00#Professionally prepared carryout meals#90.10.18.00.00
-unspsc7#90.10.18.02.00#Delivered meals services#90.10.18.00.00
-unspsc7#90.11.00.00.00#Hotels and lodging and meeting facilities#90.00.00.00.00
-unspsc7#90.11.15.00.00#Hotels and motels and inns#90.11.00.00.00
-unspsc7#90.11.15.01.00#Hotels#90.11.15.00.00
-unspsc7#90.11.15.02.00#Lodges or resorts#90.11.15.00.00
-unspsc7#90.11.15.03.00#Bed and breakfast inns#90.11.15.00.00
-unspsc7#90.11.15.04.00#Cottage rental services#90.11.15.00.00
-unspsc7#90.11.16.00.00#Meeting facilities#90.11.00.00.00
-unspsc7#90.11.16.01.00#Conference centers#90.11.16.00.00
-unspsc7#90.11.16.02.00#Videoconferencing facilities#90.11.16.00.00
-unspsc7#90.11.16.03.00#Meeting or banquet rooms#90.11.16.00.00
-unspsc7#90.11.17.00.00#Camping and wilderness facilities#90.11.00.00.00
-unspsc7#90.11.17.01.00#Campsites#90.11.17.00.00
-unspsc7#90.11.17.02.00#Government owned parks#90.11.17.00.00
-unspsc7#90.11.17.03.00#Recreational vehicle campsite facilities#90.11.17.00.00
-unspsc7#90.12.00.00.00#Travel facilitation#90.00.00.00.00
-unspsc7#90.12.15.00.00#Travel agents#90.12.00.00.00
-unspsc7#90.12.15.01.00#Tour arrangement services#90.12.15.00.00
-unspsc7#90.12.15.02.00#Travel agencies#90.12.15.00.00
-unspsc7#90.12.15.03.00#Chartering services#90.12.15.00.00
-unspsc7#90.12.16.00.00#Travel document assistance#90.12.00.00.00
-unspsc7#90.12.16.01.00#Passport services#90.12.16.00.00
-unspsc7#90.12.16.02.00#Visa or auxilliary document services#90.12.16.00.00
-unspsc7#90.12.17.00.00#Guides and interpreters#90.12.00.00.00
-unspsc7#90.12.17.01.00#Area or tour guides#90.12.17.00.00
-unspsc7#90.12.17.02.00#Interpreters#90.12.17.00.00
-unspsc7#90.13.00.00.00#Performing arts#90.00.00.00.00
-unspsc7#90.13.15.00.00#Live performances#90.13.00.00.00
-unspsc7#90.13.15.01.00#Theatrical performances or plays#90.13.15.00.00
-unspsc7#90.13.15.02.00#Dance performances#90.13.15.00.00
-unspsc7#90.13.15.03.00#Opera#90.13.15.00.00
-unspsc7#90.13.15.04.00#Concerts#90.13.15.00.00
-unspsc7#90.13.16.00.00#Taped or motion picture performances#90.13.00.00.00
-unspsc7#90.13.16.01.00#Motion pictures#90.13.16.00.00
-unspsc7#90.13.16.02.00#Videotaped entertainment#90.13.16.00.00
-unspsc7#90.14.00.00.00#Commercial sports#90.00.00.00.00
-unspsc7#90.14.15.00.00#Professional sporting events#90.14.00.00.00
-unspsc7#90.14.15.01.00#League play#90.14.15.00.00
-unspsc7#90.14.15.02.00#Competitive events#90.14.15.00.00
-unspsc7#90.14.15.03.00#Exhibitions#90.14.15.00.00
-unspsc7#90.14.16.00.00#Sports event promotion and sponsorship#90.14.00.00.00
-unspsc7#90.14.16.01.00#Company sponsored professional sports events#90.14.16.00.00
-unspsc7#90.14.16.02.00#Company sponsored amateur sports events#90.14.16.00.00
-unspsc7#90.14.16.03.00#Sporting event promotion services#90.14.16.00.00
-unspsc7#90.14.17.00.00#Amateur and recreational sports#90.14.00.00.00
-unspsc7#90.14.17.01.00#Youth competitive sports leagues#90.14.17.00.00
-unspsc7#90.14.17.02.00#Adult sports leagues#90.14.17.00.00
-unspsc7#90.14.17.03.00#Youth sports#90.14.17.00.00
-unspsc7#90.15.00.00.00#Entertainment services#90.00.00.00.00
-unspsc7#90.15.15.00.00#Tourist attractions#90.15.00.00.00
-unspsc7#90.15.15.01.00#Museums#90.15.15.00.00
-unspsc7#90.15.15.02.00#Historical or cultural sites#90.15.15.00.00
-unspsc7#90.15.15.03.00#Zoological gardens#90.15.15.00.00
-unspsc7#90.15.16.00.00#Travelling shows#90.15.00.00.00
-unspsc7#90.15.16.01.00#Circuses#90.15.16.00.00
-unspsc7#90.15.16.02.00#Touring companies#90.15.16.00.00
-unspsc7#90.15.16.03.00#Art exhibitions#90.15.16.00.00
-unspsc7#90.15.17.00.00#Amusement parks#90.15.00.00.00
-unspsc7#90.15.17.01.00#Theme parks#90.15.17.00.00
-unspsc7#90.15.17.02.00#Water parks#90.15.17.00.00
-unspsc7#90.15.17.03.00#Miniature golf courses#90.15.17.00.00
-unspsc7#90.15.18.00.00#Carnivals and fairs#90.15.00.00.00
-unspsc7#90.15.18.01.00#Travelling carnivals#90.15.18.00.00
-unspsc7#90.15.18.02.00#Fair organization or management services#90.15.18.00.00
-unspsc7#90.15.19.00.00#Gambling and betting establishments#90.15.00.00.00
-unspsc7#90.15.19.01.00#Casinos#90.15.19.00.00
-unspsc7#90.15.19.02.00#Card clubs#90.15.19.00.00
-unspsc7#90.15.19.03.00#Racetracks#90.15.19.00.00
-unspsc7#90.15.20.00.00#Nightclubs and dance halls#90.15.00.00.00
-unspsc7#90.15.20.01.00#Nightclubs#90.15.20.00.00
-unspsc7#90.15.20.02.00#Dance halls#90.15.20.00.00
-unspsc7#91.00.00.00.00#Personal and Domestic Services#91.00.00.00.00
-unspsc7#91.10.00.00.00#Personal appearance#91.00.00.00.00
-unspsc7#91.10.15.00.00#Spa and workout and rejuvenation facilities#91.10.00.00.00
-unspsc7#91.10.15.01.00#Health or fitness clubs#91.10.15.00.00
-unspsc7#91.10.15.02.00#Spas#91.10.15.00.00
-unspsc7#91.10.15.03.00#Massage services#91.10.15.00.00
-unspsc7#91.10.15.04.00#Aerobics or exercise classes#91.10.15.00.00
-unspsc7#91.10.15.05.00#Turkish or steam or ritual baths#91.10.15.00.00
-unspsc7#91.10.16.00.00#Face and body care and adornment#91.10.00.00.00
-unspsc7#91.10.16.01.00#Facial or body treatments#91.10.16.00.00
-unspsc7#91.10.16.02.00#Make up consultation#91.10.16.00.00
-unspsc7#91.10.16.03.00#Tattoo services#91.10.16.00.00
-unspsc7#91.10.16.04.00#Body piercing services#91.10.16.00.00
-unspsc7#91.10.16.05.00#Electrolysis#91.10.16.00.00
-unspsc7#91.10.17.00.00#Hair care#91.10.00.00.00
-unspsc7#91.10.17.01.00#Hair cutting or color services#91.10.17.00.00
-unspsc7#91.10.17.02.00#Hair weaving or replacement services#91.10.17.00.00
-unspsc7#91.10.18.00.00#Clothing rental#91.10.00.00.00
-unspsc7#91.10.18.01.00#Tuxedo or formalwear rental#91.10.18.00.00
-unspsc7#91.10.18.02.00#Evening or bridal gown or dress rental#91.10.18.00.00
-unspsc7#91.10.18.03.00#Costume rental#91.10.18.00.00
-unspsc7#91.10.19.00.00#Fashion consultants#91.10.00.00.00
-unspsc7#91.10.19.01.00#Color consultant#91.10.19.00.00
-unspsc7#91.10.19.02.00#Fashion stylist#91.10.19.00.00
-unspsc7#91.10.19.03.00#Wardrobe consultant#91.10.19.00.00
-unspsc7#91.11.00.00.00#Domestic and personal assistance#91.00.00.00.00
-unspsc7#91.11.15.00.00#Laundering services#91.11.00.00.00
-unspsc7#91.11.15.01.00#Uniform rental#91.11.15.00.00
-unspsc7#91.11.15.02.00#Laundry services#91.11.15.00.00
-unspsc7#91.11.15.03.00#Dry cleaning#91.11.15.00.00
-unspsc7#91.11.15.04.00#Coin operated self service laundries#91.11.15.00.00
-unspsc7#91.11.16.00.00#Household assistance and care#91.11.00.00.00
-unspsc7#91.11.16.01.00#Housekeeping services#91.11.16.00.00
-unspsc7#91.11.16.02.00#Yard or pool care services#91.11.16.00.00
-unspsc7#91.11.16.03.00#Cooking or food preparation services#91.11.16.00.00
-unspsc7#91.11.17.00.00#Consumer buying and bartering services#91.11.00.00.00
-unspsc7#91.11.17.01.00#Used clothing consignment services#91.11.17.00.00
-unspsc7#91.11.17.02.00#Barter clubs or consortiums#91.11.17.00.00
-unspsc7#91.11.17.03.00#Wardrobe buying services#91.11.17.00.00
-unspsc7#91.11.18.00.00#Personal item care and storage#91.11.00.00.00
-unspsc7#91.11.18.01.00#Valet services#91.11.18.00.00
-unspsc7#91.11.18.02.00#Check room concessions#91.11.18.00.00
-unspsc7#91.11.18.03.00#Locker rental#91.11.18.00.00
-unspsc7#91.11.18.04.00#Fur storage#91.11.18.00.00
-unspsc7#91.11.19.00.00#Personal care services#91.11.00.00.00
-unspsc7#91.11.19.01.00#Infant or child daycare services#91.11.19.00.00
-unspsc7#91.11.19.02.00#Nanny or babysitting services#91.11.19.00.00
-unspsc7#91.11.19.03.00#Elderly daycare services#91.11.19.00.00
-unspsc7#91.11.19.04.00#Assisted living services#91.11.19.00.00
-unspsc7#92.00.00.00.00#National Defense and Public Order and Security and Safety Services#92.00.00.00.00
-unspsc7#92.10.00.00.00#Public order and safety#92.00.00.00.00
-unspsc7#92.10.15.00.00#Police services#92.10.00.00.00
-unspsc7#92.10.15.01.00#Policing services#92.10.15.00.00
-unspsc7#92.10.15.02.00#Special weapons and tactics (SWAT) or riot teams#92.10.15.00.00
-unspsc7#92.10.15.03.00#Community outreach programs#92.10.15.00.00
-unspsc7#92.10.15.04.00#Crime deterrence programs#92.10.15.00.00
-unspsc7#92.10.16.00.00#Fire services#92.10.00.00.00
-unspsc7#92.10.16.01.00#Municipal or national firefighting services#92.10.16.00.00
-unspsc7#92.10.16.02.00#Volunteer fire department services#92.10.16.00.00
-unspsc7#92.10.16.03.00#Fire prevention services#92.10.16.00.00
-unspsc7#92.10.16.04.00#Forest or wilderness firefighting services#92.10.16.00.00
-unspsc7#92.10.17.00.00#Jail and prison system#92.10.00.00.00
-unspsc7#92.10.17.01.00#Jail or prison or penitentiary services#92.10.17.00.00
-unspsc7#92.10.17.02.00#Youth camps or facilities services#92.10.17.00.00
-unspsc7#92.10.17.03.00#Half way house services#92.10.17.00.00
-unspsc7#92.10.17.04.00#Mentally impaired criminal facilities#92.10.17.00.00
-unspsc7#92.10.18.00.00#Court system#92.10.00.00.00
-unspsc7#92.10.18.01.00#Sheriffs services#92.10.18.00.00
-unspsc7#92.10.18.02.00#Plea bargain agreements#92.10.18.00.00
-unspsc7#92.10.18.03.00#Civil case court expenses#92.10.18.00.00
-unspsc7#92.10.18.04.00#Criminal case fees or fines#92.10.18.00.00
-unspsc7#92.10.18.05.00#Appeals process or judicial review#92.10.18.00.00
-unspsc7#92.10.19.00.00#Rescue services#92.10.00.00.00
-unspsc7#92.10.19.01.00#Search and rescue teams#92.10.19.00.00
-unspsc7#92.10.19.02.00#Ambulance services#92.10.19.00.00
-unspsc7#92.10.19.03.00#Life saving helicopter services#92.10.19.00.00
-unspsc7#92.10.19.04.00#Lifeguard services for pool or beach#92.10.19.00.00
-unspsc7#92.11.00.00.00#Military services and national defense#92.00.00.00.00
-unspsc7#92.11.15.00.00#Maintenance of international peace and security#92.11.00.00.00
-unspsc7#92.11.15.01.00#Dispute mediation or conciliation or negotiation or settlement#92.11.15.00.00
-unspsc7#92.11.15.02.00#Peace keeping operations#92.11.15.00.00
-unspsc7#92.11.15.03.00#Cease fire agreements or truce supervision#92.11.15.00.00
-unspsc7#92.11.15.04.00#Fact finding missions#92.11.15.00.00
-unspsc7#92.11.15.05.00#War prevention strategies#92.11.15.00.00
-unspsc7#92.11.15.06.00#Counterterrorism#92.11.15.00.00
-unspsc7#92.11.15.07.00#Embargoes#92.11.15.00.00
-unspsc7#92.11.16.00.00#Disarmament#92.11.00.00.00
-unspsc7#92.11.16.01.00#Arms limitations#92.11.16.00.00
-unspsc7#92.11.16.02.00#Conventional arms disarmament#92.11.16.00.00
-unspsc7#92.11.16.03.00#Nuclear freezes or disarmament#92.11.16.00.00
-unspsc7#92.11.16.04.00#Weapons destruction#92.11.16.00.00
-unspsc7#92.11.16.05.00#Disarmament negotiations or agreements#92.11.16.00.00
-unspsc7#92.11.16.06.00#Mutual or balanced force reductions#92.11.16.00.00
-unspsc7#92.11.17.00.00#Military science and research#92.11.00.00.00
-unspsc7#92.11.17.01.00#Military history#92.11.17.00.00
-unspsc7#92.11.17.02.00#Conventional weapons usage#92.11.17.00.00
-unspsc7#92.11.17.03.00#Chemical weapons usage#92.11.17.00.00
-unspsc7#92.11.17.04.00#Guerilla warfare#92.11.17.00.00
-unspsc7#92.11.17.05.00#Military strategy#92.11.17.00.00
-unspsc7#92.11.17.06.00#Aerial maneuvers#92.11.17.00.00
-unspsc7#92.11.17.07.00#Naval or submarine maneuvers#92.11.17.00.00
-unspsc7#92.11.17.08.00#Land maneuvers#92.11.17.00.00
-unspsc7#92.11.18.00.00#Military personnel and discipline#92.11.00.00.00
-unspsc7#92.11.18.01.00#Civil defense#92.11.18.00.00
-unspsc7#92.11.18.02.00#Compulsory military services#92.11.18.00.00
-unspsc7#92.11.18.03.00#Voluntary military services#92.11.18.00.00
-unspsc7#92.11.18.04.00#Military reservists#92.11.18.00.00
-unspsc7#92.11.18.05.00#Guerillas#92.11.18.00.00
-unspsc7#92.11.18.06.00#Mercenaries#92.11.18.00.00
-unspsc7#92.11.18.07.00#Veterans#92.11.18.00.00
-unspsc7#92.11.18.08.00#Military courts#92.11.18.00.00
-unspsc7#92.11.18.09.00#Military offenses#92.11.18.00.00
-unspsc7#92.11.18.10.00#Military personnel#92.11.18.00.00
-unspsc7#92.11.19.00.00#Military policy#92.11.00.00.00
-unspsc7#92.11.19.01.00#National security#92.11.19.00.00
-unspsc7#92.11.19.02.00#Defense contracts#92.11.19.00.00
-unspsc7#92.11.19.03.00#Non first use policy#92.11.19.00.00
-unspsc7#92.11.19.04.00#Arms race#92.11.19.00.00
-unspsc7#92.11.19.05.00#Military relations#92.11.19.00.00
-unspsc7#92.11.20.00.00#Military zones#92.11.00.00.00
-unspsc7#92.11.20.01.00#Demilitarized zones#92.11.20.00.00
-unspsc7#92.11.20.02.00#Nuclear or chemical weapon free zones#92.11.20.00.00
-unspsc7#92.11.20.03.00#Peace zones#92.11.20.00.00
-unspsc7#92.11.20.04.00#No fly zones#92.11.20.00.00
-unspsc7#92.11.21.00.00#Nuclear warfare#92.11.00.00.00
-unspsc7#92.11.21.01.00#Nuclear safeguards#92.11.21.00.00
-unspsc7#92.11.21.02.00#Nuclear weapon tests#92.11.21.00.00
-unspsc7#92.11.21.03.00#Nuclear non proliferation#92.11.21.00.00
-unspsc7#92.11.22.00.00#Military tactics#92.11.00.00.00
-unspsc7#92.11.22.01.00#Weapons deployment#92.11.22.00.00
-unspsc7#92.11.22.02.00#Military reconnaissance#92.11.22.00.00
-unspsc7#92.11.22.03.00#Arms transfers#92.11.22.00.00
-unspsc7#92.11.22.04.00#Military assistance#92.11.22.00.00
-unspsc7#92.11.22.05.00#Troop withdrawals#92.11.22.00.00
-unspsc7#92.11.22.06.00#Rapid deployment forces#92.11.22.00.00
-unspsc7#92.11.22.07.00#Environmental warfare#92.11.22.00.00
-unspsc7#92.11.23.00.00#Military bases#92.11.00.00.00
-unspsc7#92.11.23.01.00#Domestic military bases#92.11.23.00.00
-unspsc7#92.11.23.02.00#Foreign military bases#92.11.23.00.00
-unspsc7#92.11.23.03.00#Naval bases#92.11.23.00.00
-unspsc7#92.11.24.00.00#Armed conflicts and incidents#92.11.00.00.00
-unspsc7#92.11.24.01.00#Border incidents#92.11.24.00.00
-unspsc7#92.11.24.02.00#Limited war#92.11.24.00.00
-unspsc7#92.11.24.03.00#Nuclear war#92.11.24.00.00
-unspsc7#92.11.24.04.00#Space based war#92.11.24.00.00
-unspsc7#92.11.24.05.00#Response to terrorist attacks#92.11.24.00.00
-unspsc7#92.12.00.00.00#Security and personal safety#92.00.00.00.00
-unspsc7#92.12.15.00.00#Guard services#92.12.00.00.00
-unspsc7#92.12.15.01.00#Armored car services#92.12.15.00.00
-unspsc7#92.12.15.02.00#Burglary protection services#92.12.15.00.00
-unspsc7#92.12.15.03.00#Guard dog rental#92.12.15.00.00
-unspsc7#92.12.15.04.00#Security guard services#92.12.15.00.00
-unspsc7#92.12.16.00.00#Detective services#92.12.00.00.00
-unspsc7#92.12.16.01.00#Detective agencies#92.12.16.00.00
-unspsc7#92.12.16.02.00#Fingerprint services#92.12.16.00.00
-unspsc7#92.12.16.03.00#Lie detection services#92.12.16.00.00
-unspsc7#92.12.16.04.00#Private investigation services#92.12.16.00.00
-unspsc7#92.12.17.00.00#Security systems services#92.12.00.00.00
-unspsc7#92.12.17.01.00#Surveillance or alarm maintenance or monitoring#92.12.17.00.00
-unspsc7#92.12.17.02.00#Fire alarm maintenance or monitoring#92.12.17.00.00
-unspsc7#92.12.17.03.00#Store or business anti theft services#92.12.17.00.00
-unspsc7#92.12.17.04.00#Confinement surveillance systems maintenance or monitoring#92.12.17.00.00
-unspsc7#93.00.00.00.00#Politics and Civic Affairs Services#93.00.00.00.00
-unspsc7#93.10.00.00.00#Political systems and institutions#93.00.00.00.00
-unspsc7#93.10.15.00.00#Political bodies#93.10.00.00.00
-unspsc7#93.10.15.01.00#Political parties representation services#93.10.15.00.00
-unspsc7#93.10.15.02.00#Political parties fund raising services#93.10.15.00.00
-unspsc7#93.10.15.03.00#Political parties public appearance services#93.10.15.00.00
-unspsc7#93.10.15.04.00#Political legislature services#93.10.15.00.00
-unspsc7#93.10.15.05.00#Political judicial power or services#93.10.15.00.00
-unspsc7#93.10.15.06.00#Political executive power or services#93.10.15.00.00
-unspsc7#93.10.16.00.00#Political officials#93.10.00.00.00
-unspsc7#93.10.16.01.00#Cabinet officers services#93.10.16.00.00
-unspsc7#93.10.16.02.00#Governors services#93.10.16.00.00
-unspsc7#93.10.16.03.00#Heads of states services#93.10.16.00.00
-unspsc7#93.10.16.04.00#Presidential services#93.10.16.00.00
-unspsc7#93.10.16.05.00#Prime ministers services#93.10.16.00.00
-unspsc7#93.10.16.06.00#Monarch services#93.10.16.00.00
-unspsc7#93.10.16.07.00#Statesmen services#93.10.16.00.00
-unspsc7#93.10.16.08.00#Parliament members services#93.10.16.00.00
-unspsc7#93.10.17.00.00#Legislative bodies and practice#93.10.00.00.00
-unspsc7#93.10.17.01.00#National council services#93.10.17.00.00
-unspsc7#93.10.17.02.00#Corporate states#93.10.17.00.00
-unspsc7#93.10.17.03.00#Bill drafting services#93.10.17.00.00
-unspsc7#93.10.17.04.00#Legislative hearings services#93.10.17.00.00
-unspsc7#93.10.17.05.00#Intelligence services#93.10.17.00.00
-unspsc7#93.10.17.06.00#Legislators services#93.10.17.00.00
-unspsc7#93.10.17.07.00#Parliamentary practice services#93.10.17.00.00
-unspsc7#93.11.00.00.00#Socio political conditions#93.00.00.00.00
-unspsc7#93.11.15.00.00#Political movements#93.11.00.00.00
-unspsc7#93.11.15.01.00#Extremist movements#93.11.15.00.00
-unspsc7#93.11.15.02.00#Peace movements#93.11.15.00.00
-unspsc7#93.11.15.03.00#Protest movements#93.11.15.00.00
-unspsc7#93.11.15.04.00#Underground movements#93.11.15.00.00
-unspsc7#93.11.15.05.00#Student movements#93.11.15.00.00
-unspsc7#93.11.15.06.00#Peasant movements#93.11.15.00.00
-unspsc7#93.11.15.07.00#Opposition movements#93.11.15.00.00
-unspsc7#93.11.16.00.00#Political representation and participation#93.11.00.00.00
-unspsc7#93.11.16.01.00#Political representation#93.11.16.00.00
-unspsc7#93.11.16.02.00#Political participation#93.11.16.00.00
-unspsc7#93.11.16.03.00#Proportional representation#93.11.16.00.00
-unspsc7#93.11.16.04.00#Vote catcher services#93.11.16.00.00
-unspsc7#93.11.16.05.00#Voter registration or counting or analysis or scrutiny services#93.11.16.00.00
-unspsc7#93.11.16.06.00#Pressure groups representation or participation services#93.11.16.00.00
-unspsc7#93.11.16.07.00#Election analysis services#93.11.16.00.00
-unspsc7#93.11.16.08.00#Election organization services#93.11.16.00.00
-unspsc7#93.12.00.00.00#International relations#93.00.00.00.00
-unspsc7#93.12.15.00.00#Diplomacy#93.12.00.00.00
-unspsc7#93.12.15.01.00#Diplomatic services#93.12.15.00.00
-unspsc7#93.12.15.02.00#Consular services#93.12.15.00.00
-unspsc7#93.12.15.03.00#Diplomats security services#93.12.15.00.00
-unspsc7#93.12.15.04.00#Diplomatic privileges or immunities services#93.12.15.00.00
-unspsc7#93.12.15.05.00#State immunities services#93.12.15.00.00
-unspsc7#93.12.15.06.00#Embassies or ambassadors services#93.12.15.00.00
-unspsc7#93.12.15.07.00#State visits organization services#93.12.15.00.00
-unspsc7#93.12.15.08.00#International law prescription services#93.12.15.00.00
-unspsc7#93.12.15.09.00#International law promotion or recognition services#93.12.15.00.00
-unspsc7#93.12.16.00.00#International relations and cooperation#93.12.00.00.00
-unspsc7#93.12.16.01.00#Multilateral cooperation services#93.12.16.00.00
-unspsc7#93.12.16.02.00#Military cooperation services#93.12.16.00.00
-unspsc7#93.12.16.03.00#Political cooperation services#93.12.16.00.00
-unspsc7#93.12.16.04.00#International economic cooperation services#93.12.16.00.00
-unspsc7#93.12.16.05.00#North south cooperation services#93.12.16.00.00
-unspsc7#93.12.16.06.00#East west cooperation services#93.12.16.00.00
-unspsc7#93.12.16.07.00#International cooperation services#93.12.16.00.00
-unspsc7#93.12.16.08.00#Non governmental liaison services#93.12.16.00.00
-unspsc7#93.12.16.09.00#Non aligned countries cooperation#93.12.16.00.00
-unspsc7#93.12.16.10.00#Aligned countries cooperation#93.12.16.00.00
-unspsc7#93.12.16.11.00#Political crimes cooperation services#93.12.16.00.00
-unspsc7#93.12.16.12.00#Peace treaties cooperation#93.12.16.00.00
-unspsc7#93.12.16.13.00#Treaty signature or accessions or rectification services#93.12.16.00.00
-unspsc7#93.12.16.14.00#International watercourse cooperation services#93.12.16.00.00
-unspsc7#93.12.16.15.00#Territorial claims or negotiations third party services#93.12.16.00.00
-unspsc7#93.12.17.00.00#International organizations#93.12.00.00.00
-unspsc7#93.12.17.01.00#System of organizations services#93.12.17.00.00
-unspsc7#93.12.17.02.00#Security council services#93.12.17.00.00
-unspsc7#93.12.17.03.00#Economic or social council services#93.12.17.00.00
-unspsc7#93.12.17.04.00#Secretariat services#93.12.17.00.00
-unspsc7#93.12.17.05.00#Trustship council services#93.12.17.00.00
-unspsc7#93.12.17.06.00#General assembly services#93.12.17.00.00
-unspsc7#93.12.17.07.00#International court of justice services#93.12.17.00.00
-unspsc7#93.12.17.08.00#International political organizations services#93.12.17.00.00
-unspsc7#93.12.17.09.00#International charity organizations services#93.12.17.00.00
-unspsc7#93.12.17.10.00#International human relief organizations services#93.12.17.00.00
-unspsc7#93.12.17.11.00#International health organizations services#93.12.17.00.00
-unspsc7#93.13.00.00.00#Humanitarian aid and relief#93.00.00.00.00
-unspsc7#93.13.15.00.00#Refugee programs#93.13.00.00.00
-unspsc7#93.13.15.01.00#Protection of human rights services#93.13.15.00.00
-unspsc7#93.13.15.02.00#Promotion of human rights services#93.13.15.00.00
-unspsc7#93.13.15.03.00#Human rights education or information dissemination services#93.13.15.00.00
-unspsc7#93.13.15.04.00#Refugee emergency assistance services#93.13.15.00.00
-unspsc7#93.13.15.05.00#Refugee camps services#93.13.15.00.00
-unspsc7#93.13.15.06.00#Refugee resettlements or repatriation services#93.13.15.00.00
-unspsc7#93.13.15.07.00#Displaced persons assistance services#93.13.15.00.00
-unspsc7#93.13.16.00.00#Food and nutrition policy planning and programs#93.13.00.00.00
-unspsc7#93.13.16.01.00#Hunger eradication programs#93.13.16.00.00
-unspsc7#93.13.16.02.00#Emergency food supply services#93.13.16.00.00
-unspsc7#93.13.16.03.00#World food program services#93.13.16.00.00
-unspsc7#93.13.16.04.00#Food or agriculture organization services#93.13.16.00.00
-unspsc7#93.13.16.05.00#Common fund for commodities services#93.13.16.00.00
-unspsc7#93.13.16.06.00#International fund for agricultural development services#93.13.16.00.00
-unspsc7#93.13.16.07.00#Food distribution services#93.13.16.00.00
-unspsc7#93.13.16.08.00#Food supply services#93.13.16.00.00
-unspsc7#93.13.16.09.00#Food aid policies or programs#93.13.16.00.00
-unspsc7#93.13.16.10.00#Food planning services#93.13.16.00.00
-unspsc7#93.13.16.11.00#Food security services#93.13.16.00.00
-unspsc7#93.13.16.12.00#Food reserves management#93.13.16.00.00
-unspsc7#93.13.16.13.00#Food shortage or surplus management or control services#93.13.16.00.00
-unspsc7#93.13.17.00.00#Health programs#93.13.00.00.00
-unspsc7#93.13.17.01.00#Anti tobacco campaigns#93.13.17.00.00
-unspsc7#93.13.17.02.00#Sanitation programs#93.13.17.00.00
-unspsc7#93.13.17.03.00#Research programs#93.13.17.00.00
-unspsc7#93.13.17.04.00#Disease prevention or control services#93.13.17.00.00
-unspsc7#93.13.17.05.00#Drug abuse prevention or control programs#93.13.17.00.00
-unspsc7#93.13.18.00.00#Disaster preparedness and relief#93.13.00.00.00
-unspsc7#93.13.18.01.00#Disaster warning services#93.13.18.00.00
-unspsc7#93.13.18.02.00#Disaster preparedness response services#93.13.18.00.00
-unspsc7#93.13.18.03.00#Emergency housing services#93.13.18.00.00
-unspsc7#93.14.00.00.00#Community and social services#93.00.00.00.00
-unspsc7#93.14.15.00.00#Social development and services#93.14.00.00.00
-unspsc7#93.14.15.01.00#Social policy services#93.14.15.00.00
-unspsc7#93.14.15.02.00#Social security legislation services#93.14.15.00.00
-unspsc7#93.14.15.03.00#Social planning services#93.14.15.00.00
-unspsc7#93.14.15.04.00#Foster home care services or orphanage#93.14.15.00.00
-unspsc7#93.14.15.05.00#Adoption services#93.14.15.00.00
-unspsc7#93.14.15.06.00#Social welfare services#93.14.15.00.00
-unspsc7#93.14.15.07.00#Social work administration services#93.14.15.00.00
-unspsc7#93.14.15.08.00#Voluntary service management#93.14.15.00.00
-unspsc7#93.14.15.09.00#Social problems analysis or management services#93.14.15.00.00
-unspsc7#93.14.15.10.00#Social structure studies or related services#93.14.15.00.00
-unspsc7#93.14.15.11.00#Social groups studies or related services#93.14.15.00.00
-unspsc7#93.14.15.12.00#Youth movements or organizations services#93.14.15.00.00
-unspsc7#93.14.15.13.00#Social justice or legislation services#93.14.15.00.00
-unspsc7#93.14.15.14.00#Socio cultural services#93.14.15.00.00
-unspsc7#93.14.16.00.00#Population#93.14.00.00.00
-unspsc7#93.14.16.01.00#Population census services#93.14.16.00.00
-unspsc7#93.14.16.02.00#Population sample surveys services#93.14.16.00.00
-unspsc7#93.14.16.03.00#Birth reporting or control services#93.14.16.00.00
-unspsc7#93.14.16.04.00#Population control services#93.14.16.00.00
-unspsc7#93.14.16.05.00#Population trends or projections services#93.14.16.00.00
-unspsc7#93.14.16.06.00#Birth statistics services#93.14.16.00.00
-unspsc7#93.14.16.07.00#Marriage research or statistics services#93.14.16.00.00
-unspsc7#93.14.16.08.00#Population distribution or analysis services#93.14.16.00.00
-unspsc7#93.14.16.09.00#Population composition analysis services#93.14.16.00.00
-unspsc7#93.14.16.10.00#Demographic studies#93.14.16.00.00
-unspsc7#93.14.16.11.00#Immigration analysis or services#93.14.16.00.00
-unspsc7#93.14.16.12.00#Family planning programs or services#93.14.16.00.00
-unspsc7#93.14.16.13.00#Human reproduction analysis#93.14.16.00.00
-unspsc7#93.14.17.00.00#Culture#93.14.00.00.00
-unspsc7#93.14.17.01.00#Cultural events organizations#93.14.17.00.00
-unspsc7#93.14.17.02.00#Culture promotional services#93.14.17.00.00
-unspsc7#93.14.17.03.00#Art related services#93.14.17.00.00
-unspsc7#93.14.17.04.00#Song writing services#93.14.17.00.00
-unspsc7#93.14.17.05.00#Literary writing services#93.14.17.00.00
-unspsc7#93.14.17.06.00#Minorities protection services#93.14.17.00.00
-unspsc7#93.14.17.07.00#Cultural heritage preservation or promotion services#93.14.17.00.00
-unspsc7#93.14.17.08.00#Museum services#93.14.17.00.00
-unspsc7#93.14.17.09.00#Cultural policy services#93.14.17.00.00
-unspsc7#93.14.17.10.00#Archaic or indigenous language services#93.14.17.00.00
-unspsc7#93.14.17.11.00#Traditional handcrafts promotion services#93.14.17.00.00
-unspsc7#93.14.17.12.00#Protection of intellectual or cultural property services#93.14.17.00.00
-unspsc7#93.14.17.13.00#Historic sites or monuments protection services#93.14.17.00.00
-unspsc7#93.14.17.14.00#Mythology#93.14.17.00.00
-unspsc7#93.14.18.00.00#Employment#93.14.00.00.00
-unspsc7#93.14.18.01.00#Employment promotion or planning services#93.14.18.00.00
-unspsc7#93.14.18.02.00#Recruitment services#93.14.18.00.00
-unspsc7#93.14.18.03.00#International labor standards services#93.14.18.00.00
-unspsc7#93.14.18.04.00#International labor registration services#93.14.18.00.00
-unspsc7#93.14.18.05.00#Unemployment services#93.14.18.00.00
-unspsc7#93.14.18.06.00#Employment statistics or forecasting services#93.14.18.00.00
-unspsc7#93.14.18.07.00#Work time arrangements#93.14.18.00.00
-unspsc7#93.14.18.08.00#Occupational health or safety services#93.14.18.00.00
-unspsc7#93.14.18.10.00#Career development services#93.14.18.00.00
-unspsc7#93.14.18.11.00#Promotional services#93.14.18.00.00
-unspsc7#93.14.18.12.00#Labor inspection services#93.14.18.00.00
-unspsc7#93.14.18.13.00#Work council services#93.14.18.00.00
-unspsc7#93.14.18.14.00#International labor services#93.14.18.00.00
-unspsc7#93.14.19.00.00#Rural development#93.14.00.00.00
-unspsc7#93.14.19.01.00#Agricultural commercial banking services#93.14.19.00.00
-unspsc7#93.14.19.02.00#Rural investment services#93.14.19.00.00
-unspsc7#93.14.19.03.00#Agricultural institutions organization or management services#93.14.19.00.00
-unspsc7#93.14.19.04.00#Agricultural or rural cooperatives services#93.14.19.00.00
-unspsc7#93.14.19.05.00#Agricultural research services#93.14.19.00.00
-unspsc7#93.14.19.06.00#Farmers or peasants organizations services#93.14.19.00.00
-unspsc7#93.14.19.07.00#Womens services in agricultural production or rural development#93.14.19.00.00
-unspsc7#93.14.19.08.00#Agrarian reform or land settlement services#93.14.19.00.00
-unspsc7#93.14.19.09.00#Land administration services#93.14.19.00.00
-unspsc7#93.14.19.10.00#Island development services#93.14.19.00.00
-unspsc7#93.14.20.00.00#Urban development#93.14.00.00.00
-unspsc7#93.14.20.01.00#Urban development planning services#93.14.20.00.00
-unspsc7#93.14.20.02.00#Urban land administration services#93.14.20.00.00
-unspsc7#93.14.20.03.00#Urban investment programming services#93.14.20.00.00
-unspsc7#93.14.20.04.00#Slum redevlopment services#93.14.20.00.00
-unspsc7#93.14.20.05.00#Urban lighting services#93.14.20.00.00
-unspsc7#93.14.20.06.00#Urban development control or regulations services#93.14.20.00.00
-unspsc7#93.14.20.07.00#Urban building standards or regulations services#93.14.20.00.00
-unspsc7#93.14.20.08.00#Urban community services#93.14.20.00.00
-unspsc7#93.14.20.09.00#Urban project or program administration or management services#93.14.20.00.00
-unspsc7#93.14.21.00.00#Regional development#93.14.00.00.00
-unspsc7#93.14.21.01.00#Regional development planning services#93.14.21.00.00
-unspsc7#93.14.21.02.00#Economic cooperation services#93.14.21.00.00
-unspsc7#93.14.21.03.00#Technical cooperation services#93.14.21.00.00
-unspsc7#93.14.21.04.00#Sectoral planning services#93.14.21.00.00
-unspsc7#93.15.00.00.00#Public administration and finance services#93.00.00.00.00
-unspsc7#93.15.15.00.00#Public administration#93.15.00.00.00
-unspsc7#93.15.15.01.00#Public enterprises management or financial services#93.15.15.00.00
-unspsc7#93.15.15.02.00#Public enterprises information or control systems services#93.15.15.00.00
-unspsc7#93.15.15.03.00#Privatization programs#93.15.15.00.00
-unspsc7#93.15.15.04.00#Administrative reform services#93.15.15.00.00
-unspsc7#93.15.15.05.00#Administrative agencies services#93.15.15.00.00
-unspsc7#93.15.15.06.00#Administrative economic council services#93.15.15.00.00
-unspsc7#93.15.15.07.00#Administrative procedures or services#93.15.15.00.00
-unspsc7#93.15.15.08.00#Government departments services#93.15.15.00.00
-unspsc7#93.15.15.09.00#Government information services#93.15.15.00.00
-unspsc7#93.15.15.10.00#Administrative fees or tax collection services#93.15.15.00.00
-unspsc7#93.15.15.11.00#Administrative acts ratification or implementation services#93.15.15.00.00
-unspsc7#93.15.15.12.00#Public institutions services#93.15.15.00.00
-unspsc7#93.15.15.13.00#Multinational public corporations services#93.15.15.00.00
-unspsc7#93.15.15.14.00#Ombudsman services#93.15.15.00.00
-unspsc7#93.15.15.15.00#National planning services#93.15.15.00.00
-unspsc7#93.15.16.00.00#Public finance#93.15.00.00.00
-unspsc7#93.15.16.01.00#Program budgeting services#93.15.16.00.00
-unspsc7#93.15.16.02.00#Government budgeting services#93.15.16.00.00
-unspsc7#93.15.16.03.00#Budget or public investment management#93.15.16.00.00
-unspsc7#93.15.16.04.00#Military expenditures budgeting services#93.15.16.00.00
-unspsc7#93.15.16.05.00#Government finance services#93.15.16.00.00
-unspsc7#93.15.16.06.00#Government accounting services#93.15.16.00.00
-unspsc7#93.15.16.07.00#Government auditing services#93.15.16.00.00
-unspsc7#93.15.16.08.00#Government or central bank services#93.15.16.00.00
-unspsc7#93.15.16.09.00#Lotteries services#93.15.16.00.00
-unspsc7#93.15.16.10.00#Tax collection services#93.15.16.00.00
-unspsc7#93.15.16.11.00#Subsidies#93.15.16.00.00
-unspsc7#93.15.17.00.00#Currency#93.15.00.00.00
-unspsc7#93.15.17.01.00#Currencies or coinage#93.15.17.00.00
-unspsc7#93.15.17.02.00#National bank notes#93.15.17.00.00
-unspsc7#93.16.00.00.00#Taxation#93.00.00.00.00
-unspsc7#93.16.15.00.00#Income tax#93.16.00.00.00
-unspsc7#93.16.15.01.00#National income tax#93.16.15.00.00
-unspsc7#93.16.15.02.00#Municipal income tax#93.16.15.00.00
-unspsc7#93.16.15.03.00#Capital gains tax#93.16.15.00.00
-unspsc7#93.16.15.04.00#Excess profits tax#93.16.15.00.00
-unspsc7#93.16.16.00.00#Taxes other than income tax#93.16.00.00.00
-unspsc7#93.16.16.01.00#Property tax#93.16.16.00.00
-unspsc7#93.16.16.02.00#Land tax#93.16.16.00.00
-unspsc7#93.16.16.03.00#Value added tax (VAT)#93.16.16.00.00
-unspsc7#93.16.16.04.00#Payroll tax#93.16.16.00.00
-unspsc7#93.16.16.05.00#Sales tax#93.16.16.00.00
-unspsc7#93.16.16.06.00#Social security tax#93.16.16.00.00
-unspsc7#93.16.16.07.00#Inheritance or transfer tax#93.16.16.00.00
-unspsc7#93.16.17.00.00#Tax administration#93.16.00.00.00
-unspsc7#93.16.17.01.00#Tax collation#93.16.17.00.00
-unspsc7#93.16.17.02.00#Tax incentives#93.16.17.00.00
-unspsc7#93.16.17.03.00#Tax systems#93.16.17.00.00
-unspsc7#93.16.17.04.00#Tax revenue administration#93.16.17.00.00
-unspsc7#93.16.18.00.00#Taxation issues#93.16.00.00.00
-unspsc7#93.16.18.01.00#Tax reform#93.16.18.00.00
-unspsc7#93.16.18.02.00#Taxation policy#93.16.18.00.00
-unspsc7#93.16.18.03.00#Tax research#93.16.18.00.00
-unspsc7#93.16.18.04.00#Investment tax credit#93.16.18.00.00
-unspsc7#93.16.18.05.00#Tax deductions#93.16.18.00.00
-unspsc7#93.16.18.06.00#Tax evasion#93.16.18.00.00
-unspsc7#93.16.18.07.00#Tax shelters or havens#93.16.18.00.00
-unspsc7#93.16.18.08.00#Tax returns#93.16.18.00.00
-unspsc7#93.17.00.00.00#Trade policy and regulation#93.00.00.00.00
-unspsc7#93.17.15.00.00#Trade policy#93.17.00.00.00
-unspsc7#93.17.15.01.00#Trade agreements#93.17.15.00.00
-unspsc7#93.17.15.02.00#Trade negotiations#93.17.15.00.00
-unspsc7#93.17.15.03.00#Formulation of national commodity policies#93.17.15.00.00
-unspsc7#93.17.15.04.00#Development of small scale industries#93.17.15.00.00
-unspsc7#93.17.16.00.00#International trade#93.17.00.00.00
-unspsc7#93.17.16.01.00#International commodity agreements#93.17.16.00.00
-unspsc7#93.17.16.02.00#Export policy#93.17.16.00.00
-unspsc7#93.17.16.03.00#Global trade policies or procedures#93.17.16.00.00
-unspsc7#93.17.16.04.00#Bilateral trade agreements#93.17.16.00.00
-unspsc7#93.17.17.00.00#Customs administration and compliance#93.17.00.00.00
-unspsc7#93.17.17.01.00#Customs conventions#93.17.17.00.00
-unspsc7#93.17.17.02.00#Customs formalities#93.17.17.00.00
-unspsc7#93.17.17.03.00#Customs offences#93.17.17.00.00
-unspsc7#93.17.18.00.00#Trade analysis#93.17.00.00.00
-unspsc7#93.17.18.01.00#Trade projections#93.17.18.00.00
-unspsc7#93.17.18.02.00#Balance of trade projections#93.17.18.00.00
-unspsc7#93.17.18.03.00#Trade statistics#93.17.18.00.00
-unspsc7#94.00.00.00.00#Organizations and Clubs#94.00.00.00.00
-unspsc7#94.10.00.00.00#Work related organizations#94.00.00.00.00
-unspsc7#94.10.15.00.00#Business associations#94.10.00.00.00
-unspsc7#94.10.15.01.00#Agricultural industry associations#94.10.15.00.00
-unspsc7#94.10.15.02.00#Regulatory associations#94.10.15.00.00
-unspsc7#94.10.15.03.00#Sectoral business associations#94.10.15.00.00
-unspsc7#94.10.15.04.00#International business associations#94.10.15.00.00
-unspsc7#94.10.15.05.00#Employers associations#94.10.15.00.00
-unspsc7#94.10.16.00.00#Professional associations#94.10.00.00.00
-unspsc7#94.10.16.01.00#Dental associations#94.10.16.00.00
-unspsc7#94.10.16.02.00#Medical health associations#94.10.16.00.00
-unspsc7#94.10.16.03.00#Nursing associations#94.10.16.00.00
-unspsc7#94.10.16.04.00#Accounting associations#94.10.16.00.00
-unspsc7#94.10.16.05.00#Architect associations#94.10.16.00.00
-unspsc7#94.10.16.06.00#Bar associations#94.10.16.00.00
-unspsc7#94.10.16.07.00#Educational or teacher associations#94.10.16.00.00
-unspsc7#94.10.16.08.00#Engineering associations#94.10.16.00.00
-unspsc7#94.10.16.09.00#Scientific associations#94.10.16.00.00
-unspsc7#94.10.16.10.00#Professional standards review boards#94.10.16.00.00
-unspsc7#94.10.17.00.00#Staff associations#94.10.00.00.00
-unspsc7#94.10.17.01.00#Staff hobby clubs#94.10.17.00.00
-unspsc7#94.10.17.02.00#Staff sports associations#94.10.17.00.00
-unspsc7#94.10.17.03.00#Women staff associations#94.10.17.00.00
-unspsc7#94.10.17.04.00#Pensionnist staff associations#94.10.17.00.00
-unspsc7#94.10.17.05.00#Management staff associations#94.10.17.00.00
-unspsc7#94.10.18.00.00#Trade unions#94.10.00.00.00
-unspsc7#94.10.18.01.00#Labor or general workers trade unions#94.10.18.00.00
-unspsc7#94.10.18.02.00#Trade union activists services#94.10.18.00.00
-unspsc7#94.10.18.03.00#Trade union information services#94.10.18.00.00
-unspsc7#94.10.18.04.00#Transport unions#94.10.18.00.00
-unspsc7#94.10.18.05.00#Teachers unions#94.10.18.00.00
-unspsc7#94.10.18.06.00#Medical personnel unions#94.10.18.00.00
-unspsc7#94.10.18.07.00#Employers unions#94.10.18.00.00
-unspsc7#94.10.18.08.00#Civil servants unions#94.10.18.00.00
-unspsc7#94.10.18.09.00#Personal assistance services#94.10.18.00.00
-unspsc7#94.10.18.10.00#Aviation unions#94.10.18.00.00
-unspsc7#94.11.00.00.00#Religious organizations#94.00.00.00.00
-unspsc7#94.11.17.00.00#Religious residences#94.11.00.00.00
-unspsc7#94.11.17.01.00#Private religious home residences#94.11.17.00.00
-unspsc7#94.11.17.02.00#Community religious home residences#94.11.17.00.00
-unspsc7#94.11.17.03.00#Religious retreat residences#94.11.17.00.00
-unspsc7#94.11.17.04.00#Temporary religious home residences#94.11.17.00.00
-unspsc7#94.11.18.00.00#Pilgrimage organizations and services#94.11.00.00.00
-unspsc7#94.11.18.01.00#Mecca pilgrimage organizations or services#94.11.18.00.00
-unspsc7#94.11.18.02.00#Vatican pilgrimage organizations or services#94.11.18.00.00
-unspsc7#94.11.18.03.00#Pilgrimage travel assistance services#94.11.18.00.00
-unspsc7#94.11.18.04.00#Pilgrimage tour operators services#94.11.18.00.00
-unspsc7#94.11.19.00.00#Missionary services#94.11.00.00.00
-unspsc7#94.11.19.01.00#Religious orders services#94.11.19.00.00
-unspsc7#94.11.19.02.00#Evangelical missionary services#94.11.19.00.00
-unspsc7#94.11.19.03.00#Educational missionary services#94.11.19.00.00
-unspsc7#94.11.20.00.00#Denominational services#94.11.00.00.00
-unspsc7#94.11.20.01.00#Hinduism services#94.11.20.00.00
-unspsc7#94.11.20.02.00#Buddhism services#94.11.20.00.00
-unspsc7#94.11.20.03.00#Christian services#94.11.20.00.00
-unspsc7#94.11.20.04.00#Islam services#94.11.20.00.00
-unspsc7#94.11.20.05.00#Judaism services#94.11.20.00.00
-unspsc7#94.12.00.00.00#Clubs#94.00.00.00.00
-unspsc7#94.12.15.00.00#Sport clubs#94.12.00.00.00
-unspsc7#94.12.15.01.00#Ice sports clubs#94.12.15.00.00
-unspsc7#94.12.15.02.00#Boating or swimming sport clubs#94.12.15.00.00
-unspsc7#94.12.15.03.00#Gun or hunting sport clubs#94.12.15.00.00
-unspsc7#94.12.15.04.00#Outdoor field sport clubs#94.12.15.00.00
-unspsc7#94.12.15.05.00#Indoor or outdoor court sport clubs#94.12.15.00.00
-unspsc7#94.12.15.06.00#Winter sport clubs#94.12.15.00.00
-unspsc7#94.12.15.07.00#Beach or water sport clubs#94.12.15.00.00
-unspsc7#94.12.15.08.00#Cycling sport clubs#94.12.15.00.00
-unspsc7#94.12.15.09.00#Mountaineering sport clubs#94.12.15.00.00
-unspsc7#94.12.15.10.00#Racing sport clubs#94.12.15.00.00
-unspsc7#94.12.15.11.00#Flying sport clubs#94.12.15.00.00
-unspsc7#94.12.15.12.00#Professional or semiprofessional sports clubs#94.12.15.00.00
-unspsc7#94.12.15.13.00#Stadium event operator services#94.12.15.00.00
-unspsc7#94.12.15.14.00#Sport club managers or promoters services#94.12.15.00.00
-unspsc7#94.12.16.00.00#Hobby clubs#94.12.00.00.00
-unspsc7#94.12.16.01.00#Playing card hobby clubs#94.12.16.00.00
-unspsc7#94.12.16.02.00#Handcrafts clubs#94.12.16.00.00
-unspsc7#94.12.16.03.00#Poetry or literature hobby clubs#94.12.16.00.00
-unspsc7#94.12.16.04.00#Cooking hobby clubs#94.12.16.00.00
-unspsc7#94.12.16.05.00#Gardening hobby clubs#94.12.16.00.00
-unspsc7#94.12.16.06.00#Collector hobby club#94.12.16.00.00
-unspsc7#94.12.16.07.00#Scouting club#94.12.16.00.00
-unspsc7#94.12.17.00.00#Amateurs clubs#94.12.00.00.00
-unspsc7#94.12.17.01.00#Amateur drama clubs or services#94.12.17.00.00
-unspsc7#94.12.17.02.00#Amateur music clubs or services#94.12.17.00.00
-unspsc7#94.12.17.03.00#Amateur dance clubs or services#94.12.17.00.00
-unspsc7#94.12.17.04.00#Amateur fine arts clubs or services#94.12.17.00.00
-unspsc7#94.12.18.00.00#Social clubs#94.12.00.00.00
-unspsc7#94.12.18.01.00#Youth clubs#94.12.18.00.00
-unspsc7#94.12.18.02.00#Senior citizens clubs#94.12.18.00.00
-unspsc7#94.12.18.03.00#Social gathering clubs#94.12.18.00.00
-unspsc7#94.12.18.04.00#Social clubs for people with disabilities#94.12.18.00.00
-unspsc7#94.12.18.05.00#War veterans social clubs#94.12.18.00.00
-unspsc7#94.13.00.00.00#Civic organizations and associations and movements#94.00.00.00.00
-unspsc7#94.13.15.00.00#Non governmental organizations#94.13.00.00.00
-unspsc7#94.13.15.01.00#Environmental non governmental services#94.13.15.00.00
-unspsc7#94.13.15.02.00#Emergency relief non governmental services#94.13.15.00.00
-unspsc7#94.13.15.03.00#Technical assistance non governmental services#94.13.15.00.00
-unspsc7#94.13.15.04.00#Development aid non governemntal services#94.13.15.00.00
-unspsc7#94.13.16.00.00#Charity organizations#94.13.00.00.00
-unspsc7#94.13.16.01.00#Charity organizations shelter services#94.13.16.00.00
-unspsc7#94.13.16.02.00#Food relief services#94.13.16.00.00
-unspsc7#94.13.16.03.00#Legal assistance services#94.13.16.00.00
-unspsc7#94.13.16.04.00#Resource mobilization services#94.13.16.00.00
-unspsc7#94.13.16.05.00#International aid assistance services#94.13.16.00.00
-unspsc7#94.13.16.06.00#Orphanage or adoption services#94.13.16.00.00
-unspsc7#94.13.16.07.00#Ederly assistance organizations#94.13.16.00.00
-unspsc7#94.13.16.08.00#Prisoner assistance organizations#94.13.16.00.00
-unspsc7#94.13.17.00.00#Green associations#94.13.00.00.00
-unspsc7#94.13.17.01.00#Radical green associations#94.13.17.00.00
-unspsc7#94.13.17.02.00#Ecofeminists associations#94.13.17.00.00
-unspsc7#94.13.17.03.00#Ecological political organizations#94.13.17.00.00
-unspsc7#94.13.17.04.00#Green activists movements or services#94.13.17.00.00
-unspsc7#94.13.18.00.00#Movements#94.13.00.00.00
-unspsc7#94.13.18.01.00#Gay or lesbian or bisexual or transgender movements#94.13.18.00.00
-unspsc7#94.13.18.02.00#Anti racism movements#94.13.18.00.00
-unspsc7#94.13.18.03.00#Women liberation movements#94.13.18.00.00
-unspsc7#94.13.18.04.00#Fraternal associations#94.13.18.00.00
-unspsc7#94.13.18.05.00#Ethnic minorities cultural preservation services#94.13.18.00.00
-unspsc7#94.13.19.00.00#Animal protection associations#94.13.00.00.00
-unspsc7#94.13.19.01.00#Animal liberation movements#94.13.19.00.00
-unspsc7#94.13.19.02.00#Endangered species protection associations#94.13.19.00.00
-unspsc7#94.13.19.03.00#Threatened animals protection associations#94.13.19.00.00
-unspsc7#94.13.20.00.00#Human rights advocacy and defense associations#94.13.00.00.00
-unspsc7#94.13.20.01.00#Children rights defense services#94.13.20.00.00
-unspsc7#94.13.20.02.00#Prisoners defense services#94.13.20.00.00
-unspsc7#94.13.20.03.00#Physical or mental torture defense associations#94.13.20.00.00
-unspsc7#94.13.20.04.00#Freedom of speech defense associations#94.13.20.00.00
-unspsc7#94.13.20.05.00#Voting rights defense associations#94.13.20.00.00
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/BusPublishServiceAdvancedForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/BusPublishServiceAdvancedForm.jsp
deleted file mode 100644
index 80e9f9f2b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/BusPublishServiceAdvancedForm.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="subQueryKeyProperty" class="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.SubQueryKeyProperty" scope="request"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<script language="javascript">
-  function processPublishServiceAdvancedForm(form)
-  {
-    if (handleSubmit(form))
-    {
-      processResultTable("publishServiceAdvancedServiceInterface","<%=UDDIActionInputs.NODEID_SERVICE_INTERFACE%>",form,false);
-      processLanguageInputTable("publishServiceAdvancedNames","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME_LANGUAGE%>","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME%>",form);
-      processLanguageInputTable("publishServiceAdvancedDescriptions","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION_LANGUAGE%>","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION%>",form);
-      processCategoryTable("publishServiceAdvancedCategories",form,false);
-      return true;
-    }
-    return false;
-  }
-</script>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-   NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
-   Node selectedNode = navigatorManager.getSelectedNode();
-   FormTool formTool = (FormTool)(selectedNode.getCurrentToolManager().getSelectedTool());
-   FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKeyProperty.getSubQueryKey());
-%>
-<div id="publishServiceAdvanced" style="display:none;">
-  <form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/BusPublishServiceAdvancedActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" onSubmit="return processAdvancedForm(this)">
-    <input type="hidden" name="subQueryGet">
-    <input type="hidden" name="<%=UDDIActionInputs.NODEID_BUSINESS%>" value="<%=selectedNode.getNodeId()%>">  
-    <input type="hidden" name="<%=UDDIActionInputs.NEW_SUBQUERY_INITIATED%>">
-    <input type="hidden" name="<%=UDDIActionInputs.NEW_SUBQUERY_QUERY_ITEM%>">
-    <table width="95%" border=0 cellpadding=3 cellspacing=0>
-      <tr>
-        <td class="labels" height=10 valign="bottom">
-          <%=uddiPerspective.getMessage("FORM_LABEL_BUSINESS_PUBLISH_SERVICE_ADVANCED_DESC")%>
-        </td>
-      </tr>
-    </table>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("publishServiceAdvancedAuthentication");
-%>
-<jsp:include page="/uddi/forms/authentication_table.jsp" flush="true"/>
-    <table width="95%" border=0 cellpadding=3 cellspacing=0>
-      <tr>
-        <td nowrap class="labels" height=30 valign="bottom">
-          <label for="input_business_publish_service_advance_wsdl_url"><%=controller.getMessage("FORM_LABEL_WSDL_URL")%></label>
-<%
-   if (!formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL))
-   {
-%>
-          <%=HTMLUtils.redAsterisk()%>
-<%
-   }
-%>
-        </td>
-        <td nowrap height=30 valign="bottom">
-          <a href="javascript:openWSDLBrowser('publishServiceAdvanced',<%=ActionInputs.WSDL_TYPE_SERVICE%>)"><%=controller.getMessage("FORM_LINK_BROWSE")%></a>
-        </td>
-        <td width="90%">&nbsp;</td>
-      </tr>
-      <tr>
-        <td colspan=3>
-          <input type="text" id="input_business_publish_service_advance_wsdl_url" name="<%=ActionInputs.QUERY_INPUT_WSDL_URL%>" class="textenter">
-        </td>
-      </tr>
-    </table>
-<%
-   boolean tableHasErrors = !formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES);
-   String[] serviceInterfaceSpecificInfo = {"FORM_LABEL_SERVICE_INTERFACES",(new Boolean(tableHasErrors)).toString(),String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES),"publishServiceAdvanced",UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES};
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("publishServiceAdvancedServiceInterface");
-   sectionHeaderInfo.setOtherProperties(serviceInterfaceSpecificInfo);
-%>
-<jsp:include page="/uddi/forms/uddiObjects_table.jsp" flush="true"/>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("publishServiceAdvancedNames");
-   String[] nameSpecificInfo = {"FORM_LABEL_NAMES","FORM_LABEL_NAME",String.valueOf(!formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES))};
-   sectionHeaderInfo.setOtherProperties(nameSpecificInfo);
-%>
-<jsp:include page="/uddi/forms/languageInput_table.jsp" flush="true"/>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("publishServiceAdvancedDescriptions");
-   String[] descSpecificInfo = {"FORM_LABEL_DESCRIPTIONS","FORM_LABEL_DESCRIPTION",String.valueOf(!formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS))};
-   sectionHeaderInfo.setOtherProperties(descSpecificInfo);
-%>
-<jsp:include page="/uddi/forms/languageInput_table.jsp" flush="true"/>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("publishServiceAdvancedCategories");
-%>
-<jsp:include page="/uddi/forms/categories_table.jsp" flush="true"/>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
-  </form>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/BusPublishServiceForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/BusPublishServiceForm.jsp
deleted file mode 100644
index 57121d322..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/BusPublishServiceForm.jsp
+++ /dev/null
@@ -1,259 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectSubQueryItemAction,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*,
-                                                        org.uddi4j.datatype.*,
-                                                        org.uddi4j.datatype.tmodel.TModel,
-                                                        org.uddi4j.util.*,
-                                                        java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-   NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
-   // selectedNode must be a business node.
-   Node busNode = navigatorManager.getSelectedNode();
-   FormTool formTool = (FormTool)(busNode.getCurrentToolManager().getSelectedTool());
-%>
-<jsp:useBean id="subQueryKeyProperty" class="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.SubQueryKeyProperty" scope="request">
-<%
-   String subQueryKey = (String)formTool.getProperty(UDDIActionInputs.SUBQUERY_KEY);
-   subQueryKeyProperty.setSubQueryKey(subQueryKey);
-%>
-</jsp:useBean>
-<%
-   FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKeyProperty.getSubQueryKey());
-   // business parent node may be either the published items folder or a query node.
-   UDDIMainNode uddiMainNode = (UDDIMainNode)navigatorManager.getRootNode();
-   Node regNode = uddiMainNode.getRegistryNode(busNode);
-   RegistryElement regElement = (RegistryElement)regNode.getTreeElement();
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=uddiPerspective.getMessage("FORM_TITLE_BUSINESS_PUBLISH_SERVICE")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/scripts/formsubmit.jsp" flush="true"/>
-<jsp:include page="/scripts/tables.jsp" flush="true"/>
-<jsp:include page="/uddi/scripts/udditables.jsp" flush="true"/>
-<script language="javascript">
-  var sectionIds = ["publishServiceSimple","publishServiceAdvanced"];
-  var styleForm = "publishServiceStyle";
-  
-  function processAdvancedForm(form)
-  {
-    if (handleSubmit(form))
-    {
-      processResultTable("publishServiceAdvancedServiceInterface","<%=UDDIActionInputs.NODEID_SERVICE_INTERFACE%>",form,false);
-      processLanguageInputTable("publishServiceAdvancedNames","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME_LANGUAGE%>","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME%>",form);
-      processLanguageInputTable("publishServiceAdvancedDescriptions","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION_LANGUAGE%>","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION%>",form);
-      processCategoryTable("publishServiceAdvancedCategories",form,false);
-      return true;
-    }
-    return false;
-  }
-  
-  function setAuthenticationSectionDefaults(form)
-  {
-<%
-   String publishURL = (String)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-   String userId = (String)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-   String password = (String)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-%>
-    form.<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL%>.value = "<%=HTMLUtils.JSMangle(publishURL)%>";
-    form.<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID%>.value = "<%=HTMLUtils.JSMangle(userId)%>";
-    form.<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD%>.value = "<%=HTMLUtils.JSMangle(password)%>";
-  }
-  
-  function setDefaults()
-  {
-<%
-   String publishServiceStyleIndex = (String)formToolPI.getProperty(UDDIActionInputs.QUERY_STYLE_SERVICES);
-%>
-    document.forms[styleForm].<%=UDDIActionInputs.QUERY_STYLE_SERVICES%>[<%=publishServiceStyleIndex%>].checked = true;
-    
-    var publishServiceSimpleSection = document.getElementById(sectionIds[<%=UDDIActionInputs.QUERY_STYLE_SIMPLE%>]);
-    var publishServiceSimpleForm = publishServiceSimpleSection.getElementsByTagName("form").item(0);
-    setAuthenticationSectionDefaults(publishServiceSimpleForm);
-    publishServiceSimpleForm.<%=ActionInputs.QUERY_INPUT_WSDL_URL%>.value = "<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_WSDL_URL))%>";
-    publishServiceSimpleForm.<%=UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME%>.value = "<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME))%>";
-    publishServiceSimpleForm.<%=UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_DESCRIPTION%>.value = "<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_DESCRIPTION))%>";
-    
-    // Advanced form details.
-    var publishServiceAdvancedSection = document.getElementById(sectionIds[<%=UDDIActionInputs.QUERY_STYLE_ADVANCED%>]);
-    var publishServiceAdvancedForm = publishServiceAdvancedSection.getElementsByTagName("form").item(0);
-    setAuthenticationSectionDefaults(publishServiceAdvancedForm);
-    var publishServiceAdvancedNamesTable = getTable("publishServiceAdvancedNames");
-    var publishServiceAdvancedDescriptionsTable = getTable("publishServiceAdvancedDescriptions");
-    publishServiceAdvancedForm.<%=ActionInputs.QUERY_INPUT_WSDL_URL%>.value = "<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL))%>";
-<%
-   Vector serviceInterfaces = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES);
-   Vector serviceInterfacesCopy = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES_COPY);
-   if (serviceInterfaces != null)
-   {
-     if (serviceInterfacesCopy == null)
-       serviceInterfacesCopy = new Vector();
-     else
-       serviceInterfacesCopy.removeAllElements();
-     for (int i=0;i<serviceInterfaces.size();i++)
-     {
-       ListElement listElement = (ListElement)serviceInterfaces.elementAt(i);
-       int targetNodeId = listElement.getTargetNodeId();
-       int targetToolId = listElement.getTargetToolId();
-       int targetViewId = listElement.getTargetViewId();
-       String url = SelectSubQueryItemAction.getActionLink(targetNodeId,targetToolId,targetViewId,subQueryKeyProperty.getSubQueryKey(),UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES,i,UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES,false);
-       TModel tModel = (TModel)listElement.getObject();
-       serviceInterfacesCopy.addElement(serviceInterfaces.elementAt(i));
-%>
-    addResultRow("publishServiceAdvancedServiceInterface",<%=targetNodeId%>,"<%=response.encodeURL(controller.getPathWithContext(url))%>","<%=HTMLUtils.JSMangle(tModel.getNameString())%>","<%=HTMLUtils.JSMangle(tModel.getDefaultDescriptionString())%>");
-<%
-     }
-     formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES_COPY,serviceInterfacesCopy);
-   }
-   else
-   {
-     serviceInterfaces = new Vector();
-     serviceInterfacesCopy = new Vector();
-     formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES,serviceInterfaces);
-     formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES_COPY,serviceInterfacesCopy);
-   }
-%>
-<%
-   Vector serviceNameVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES);
-   if (serviceNameVector != null)
-   {
-     for (int i=0;i<serviceNameVector.size();i++)
-     {
-       Name name = (Name)serviceNameVector.elementAt(i);
-%>
-    addLanguageInputRow("publishServiceAdvancedNames","<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_CONTROL_TITLE_NAME_TEXT_VALUE"))%>");
-    setLanguageInputRowSettings("publishServiceAdvancedNames",<%=i%>,"<%=HTMLUtils.JSMangle(name.getLang())%>","<%=HTMLUtils.JSMangle(name.getText())%>");
-<%
-       if (!formToolPI.isRowInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES,i))
-       {
-%>
-    highlightErrantRow(publishServiceAdvancedNamesTable.rows[<%=i%>+numberOfHeaderRows],"errantrow");
-<%
-       }
-     }
-   }
-
-   Vector serviceDescriptionVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS);
-   if (serviceDescriptionVector != null)
-   {
-     for (int i=0;i<serviceDescriptionVector.size();i++)
-     {
-       Description description = (Description)serviceDescriptionVector.elementAt(i);
-%>
-    addLanguageInputRow("publishServiceAdvancedDescriptions","<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_CONTROL_TITLE_DESCRIPTION_TEXT_VALUE"))%>");
-    setLanguageInputRowSettings("publishServiceAdvancedDescriptions",<%=i%>,"<%=HTMLUtils.JSMangle(description.getLang())%>","<%=HTMLUtils.JSMangle(description.getText())%>");
-<%
-       if (!formToolPI.isRowInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS,i))
-       {
-%>
-    highlightErrantRow(publishServiceAdvancedDescriptionsTable.rows[<%=i%>+numberOfHeaderRows],"errantrow");
-<%
-       }
-     }
-   }
-
-   CategoryBag serviceCatBag = (CategoryBag)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES);
-   if (serviceCatBag != null)
-   {
-     Vector keyedReferenceVector = serviceCatBag.getKeyedReferenceVector();
-     for (int i=0;i<keyedReferenceVector.size();i++)
-     {
-       KeyedReference kr = (KeyedReference)keyedReferenceVector.elementAt(i);
-%>
-    addCategoryRow("publishServiceAdvancedCategories");
-    setCategoryRowSettings("publishServiceAdvancedCategories",<%=i%>,"<%=HTMLUtils.JSMangle(kr.getTModelKey())%>","<%=HTMLUtils.JSMangle(kr.getKeyName())%>","<%=HTMLUtils.JSMangle(kr.getKeyValue())%>");
-<%
-     }
-   }
-   
-   if (!regElement.isLoggedIn())
-   {
-%>
-    document.getElementById("publishServiceSimpleAuthentication").style.display = "";
-    document.getElementById("publishServiceAdvancedAuthentication").style.display = "";
-<%
-   }
-%>
-    showPublishForm(<%=publishServiceStyleIndex%>);    
-  }
-  
-  function showPublishForm(style)
-  {
-    closeAllUddiChildWindows();
-    for (var i=0;i<sectionIds.length;i++)
-    {
-      if (i == style)
-        document.getElementById(sectionIds[i]).style.display = "";
-      else
-        document.getElementById(sectionIds[i]).style.display = "none";
-    }
-    var loadScreenTable = document.getElementById("loadScreen");
-    if (loadScreenTable.rows.length > 0)
-      loadScreenTable.deleteRow(0);
-    document.getElementById("mainScreen").style.display = "";    
-  }
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin" onUnload="closeAllUddiChildWindows()">
-  <div id="contentborder">
-    <table id="loadScreen">
-      <tr>
-        <td>
-          <%=controller.getMessage("MSG_LOAD_IN_PROGRESS")%>
-        </td>
-      </tr>
-    </table>
-    <div id="mainScreen" style="display:none;">
-<%
-   String titleImagePath = "uddi/images/publish_service_highlighted.gif";
-   String title = uddiPerspective.getMessage("ALT_PUBLISH_SERVICE");
-%>
-<%@ include file="/forms/formheader.inc" %>
-      <form name="publishServiceStyle" style="margin-top:0;">
-        <table width="95%" border=0 cellpadding=3 cellspacing=0>
-          <tr>
-            <td class="labels">
-              <%=uddiPerspective.getMessage("FORM_LABEL_PUBLISH_FORM")%>
-            </td>
-          </tr>        
-          <tr>
-            <td>
-              <input type="radio" id="radio_business_publish_service_simple" class="radio" name="<%=UDDIActionInputs.QUERY_STYLE_SERVICES%>" onClick="showPublishForm(<%=UDDIActionInputs.QUERY_STYLE_SIMPLE%>)"><label for="radio_business_publish_service_simple"><%=uddiPerspective.getMessage("FORM_RADIO_SIMPLE")%></label>
-              <input type="radio" id="radio_business_publish_service_advance" class="radio" name="<%=UDDIActionInputs.QUERY_STYLE_SERVICES%>" onClick="showPublishForm(<%=UDDIActionInputs.QUERY_STYLE_ADVANCED%>)"><label for="radio_business_publish_service_advance"><%=uddiPerspective.getMessage("FORM_RADIO_ADVANCED")%></label>
-            </td>
-          </tr>
-        </table>
-      </form>
-<jsp:include page="/uddi/forms/BusPublishServiceSimpleForm.jsp" flush="true"/>
-<jsp:include page="/uddi/forms/BusPublishServiceAdvancedForm.jsp" flush="true"/>
-    </div>
-  </div>
-<script language="javascript">
-  setDefaults();
-</script>  
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/BusPublishServiceSimpleForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/BusPublishServiceSimpleForm.jsp
deleted file mode 100644
index 35a4d91bd..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/BusPublishServiceSimpleForm.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="subQueryKeyProperty" class="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.SubQueryKeyProperty" scope="request"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-   NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
-   Node selectedNode = navigatorManager.getSelectedNode();
-   FormTool formTool = (FormTool)(selectedNode.getCurrentToolManager().getSelectedTool());
-   FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKeyProperty.getSubQueryKey());
-%>
-<div id="publishServiceSimple" style="display:none;">
-  <form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/BusPublishServiceSimpleActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" onSubmit="return handleSubmit(this)">
-    <input type="hidden" name="<%=UDDIActionInputs.NODEID_BUSINESS%>" value="<%=selectedNode.getNodeId()%>">
-    <input type="hidden" name="<%=UDDIActionInputs.NEW_SUBQUERY_INITIATED%>">
-    <input type="hidden" name="<%=UDDIActionInputs.NEW_SUBQUERY_QUERY_ITEM%>">
-    <table width="95%" border=0 cellpadding=3 cellspacing=0>
-      <tr>
-        <td class="labels" height=10 valign="bottom">
-          <%=uddiPerspective.getMessage("FORM_LABEL_BUSINESS_PUBLISH_SERVICE_SIMPLE_DESC")%>
-        </td>
-      </tr>
-    </table>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("publishServiceSimpleAuthentication");
-%>
-<jsp:include page="/uddi/forms/authentication_table.jsp" flush="true"/>
-    <table width="95%" border=0 cellpadding=3 cellspacing=0>
-      <tr>
-        <td nowrap class="labels" height=30 valign="bottom">
-          <label for="input_business_publish_service_simple_wsdl_url"><%=controller.getMessage("FORM_LABEL_WSDL_URL")%></label>
-<%
-   if (!formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_WSDL_URL))
-   {
-%>
-          <%=HTMLUtils.redAsterisk()%>
-<%
-   }
-%>
-        </td>
-        <td nowrap height=30 valign="bottom">
-          <a href="javascript:openWSDLBrowser('publishServiceSimple',<%=ActionInputs.WSDL_TYPE_SERVICE%>)"><%=controller.getMessage("FORM_LINK_BROWSE")%></a>
-        </td>
-        <td width="90%">&nbsp;</td>
-      </tr>
-      <tr>
-        <td colspan=3>
-          <input type="text" id="input_business_publish_service_simple_wsdl_url" name="<%=ActionInputs.QUERY_INPUT_WSDL_URL%>" class="textenter">
-        </td>
-      </tr>
-      <tr>
-        <td colspan=3 class="labels">
-          <label for="input_business_publish_service_simple_name"><%=uddiPerspective.getMessage("FORM_LABEL_NAME")%></label>
-<%
-   if (!formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME))
-   {
-%>
-          <%=HTMLUtils.redAsterisk()%>
-<%
-   }
-%>
-        </td>
-      <tr>
-        <td colspan=3> <input type="text" id="input_business_publish_service_simple_name" name="<%=UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME%>" class="textenter"> </td>
-      </tr>
-      <tr>
-        <td colspan=3 class="labels">
-          <label for="input_business_publish_service_simple_desc"><%=uddiPerspective.getMessage("FORM_LABEL_DESCRIPTION")%></label>
-        </td>
-      </tr>
-      <tr>
-        <td colspan=3> <input type="text" id="input_business_publish_service_simple_desc" name="<%=UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_DESCRIPTION%>" class="textenter"> </td>
-      </tr>
-    </table>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
-  </form>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/BusinessDetailsForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/BusinessDetailsForm.jsp
deleted file mode 100644
index 5327070b4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/BusinessDetailsForm.jsp
+++ /dev/null
@@ -1,293 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*,
-                                                        org.uddi4j.datatype.*,
-                                                        org.uddi4j.util.*,
-                                                        java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-   NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
-   Node selectedNode = navigatorManager.getSelectedNode();
-   ToolManager currentToolManager = selectedNode.getCurrentToolManager();
-   FormTool formTool = (FormTool)(currentToolManager.getSelectedTool());
-   UDDIMainNode uddiMainNode = (UDDIMainNode)navigatorManager.getRootNode();
-   RegistryNode regNode = uddiMainNode.getRegistryNode(selectedNode);
-   RegistryElement regElement = (RegistryElement)regNode.getTreeElement();
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=uddiPerspective.getMessage("FORM_TITLE_BUSINESS_DETAILS")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/resumeproxyloadpage.js"))%>">
-</script>
-<jsp:include page="/scripts/formsubmit.jsp" flush="true"/>
-<jsp:include page="/uddi/scripts/detailstables.jsp" flush="true"/>
-<script language="javascript">
-  function setDefaults()
-  {
-    var businessDetailsDiscoveryURLsTable = getTable("businessDetailsDiscoveryURLs");
-    var businessDetailsNamesTable = getTable("businessDetailsNames");
-    var businessDetailsDescriptionsTable = getTable("businessDetailsDescriptions");
-    var businessDetailsIdentifiersTable = getTable("businessDetailsIdentifiers");
-<%
-   Vector discoveryURLVector = (Vector)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS);
-   if (discoveryURLVector != null)
-   {
-     for (int i=0;i<discoveryURLVector.size();i++)
-     {
-       ListElement listElement = (ListElement)discoveryURLVector.elementAt(i);
-       DiscoveryURL discoveryURL = (DiscoveryURL)listElement.getObject();
-       boolean isError = !formTool.isRowInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS,i);
-       boolean isNewItem = (listElement.getTargetViewId() == ActionInputs.VIEWID_DEFAULT);
-%>
-    addDetailsDiscoveryURLRow("businessDetailsDiscoveryURLs",<%=isError||isNewItem%>);
-    setDetailsDiscoveryURLRow("businessDetailsDiscoveryURLs",<%=i%>,<%=listElement.getViewId()%>,"<%=HTMLUtils.JSMangle(discoveryURL.getText())%>");
-<%
-       if (isError)
-       {
-%>
-    highlightErrantRow(businessDetailsDiscoveryURLsTable.rows[<%=i%>+numberOfHeaderRows],"errantRow");
-<%
-       }
-     }
-   }
-
-   Vector nameIndexVector = (Vector)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES);
-   if (nameIndexVector != null)
-   {
-     for (int i=0;i<nameIndexVector.size();i++)
-     {
-       ListElement listElement = (ListElement)nameIndexVector.elementAt(i);
-       Name name = (Name)listElement.getObject();
-       boolean isError = !formTool.isRowInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES,i);
-       boolean isNewItem = (listElement.getTargetViewId() == ActionInputs.VIEWID_DEFAULT);
-%>
-    addDetailsLanguageInputRow("businessDetailsNames","<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_CONTROL_TITLE_NAME_TEXT_VALUE"))%>",<%=isError||isNewItem%>);
-    setDetailsLanguageInputRow("businessDetailsNames",<%=i%>,<%=listElement.getViewId()%>,"<%=name.getLang()%>","<%=HTMLUtils.JSMangle(name.getText())%>");
-<%
-       if (isError)
-       {
-%>
-    highlightErrantRow(businessDetailsNamesTable.rows[<%=i%>+numberOfHeaderRows],"errantRow");
-<%
-       }
-     }
-   }
-
-   Vector descriptionIndexVector = (Vector)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS);
-   if (descriptionIndexVector != null)
-   {
-     for (int i=0;i<descriptionIndexVector.size();i++)
-     {
-       ListElement listElement = (ListElement)descriptionIndexVector.elementAt(i);
-       Description description = (Description)listElement.getObject();
-       boolean isError = !formTool.isRowInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS,i);
-       boolean isNewItem = (listElement.getTargetViewId() == ActionInputs.VIEWID_DEFAULT);
-%>
-    addDetailsLanguageInputRow("businessDetailsDescriptions","<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_CONTROL_TITLE_DESCRIPTION_TEXT_VALUE"))%>",<%=isError||isNewItem%>);
-    setDetailsLanguageInputRow("businessDetailsDescriptions",<%=i%>,<%=listElement.getViewId()%>,"<%=description.getLang()%>","<%=HTMLUtils.JSMangle(description.getText())%>");
-<%
-       if (isError)
-       {
-%>
-    highlightErrantRow(businessDetailsDescriptionsTable.rows[<%=i%>+numberOfHeaderRows],"errantRow");
-<%
-       }
-     }
-   }
-
-   Vector idVector = (Vector)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS);
-   if (idVector != null)
-   {
-     for (int i=0;i<idVector.size();i++)
-     {
-       ListElement listElement = (ListElement)idVector.elementAt(i);
-       KeyedReference kr = (KeyedReference)listElement.getObject();
-       boolean isError = !formTool.isRowInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS,i);
-       boolean isNewItem = (listElement.getTargetViewId() == ActionInputs.VIEWID_DEFAULT);
-%>
-    addDetailsIdentifierRow("businessDetailsIdentifiers",<%=isError||isNewItem%>);
-    setDetailsIdentifierRow("businessDetailsIdentifiers",<%=i%>,<%=listElement.getViewId()%>,"<%=HTMLUtils.JSMangle(kr.getTModelKey())%>","<%=HTMLUtils.JSMangle(kr.getKeyName())%>","<%=HTMLUtils.JSMangle(kr.getKeyValue())%>");
-<%
-       if (isError)
-       {
-%>
-    highlightErrantRow(businessDetailsIdentifiersTable.rows[<%=i%>+numberOfHeaderRows],"errantRow");
-<%       
-       }
-     }
-   }
-
-   Vector catVector = (Vector)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES);
-   if (catVector != null)
-   {
-     for (int i=0;i<catVector.size();i++)
-     {
-       ListElement listElement = (ListElement)catVector.elementAt(i);
-       KeyedReference kr = (KeyedReference)listElement.getObject();
-       boolean isError = !formTool.isRowInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES,i);
-       boolean isNewItem = (listElement.getTargetViewId() == ActionInputs.VIEWID_DEFAULT);
-%>
-    addDetailsCategoryRow("businessDetailsCategories",<%=isError||isNewItem%>);
-    setDetailsCategoryRow("businessDetailsCategories",<%=i%>,<%=listElement.getViewId()%>,"<%=HTMLUtils.JSMangle(kr.getTModelKey())%>","<%=HTMLUtils.JSMangle(kr.getKeyName())%>","<%=HTMLUtils.JSMangle(kr.getKeyValue())%>");
-<%
-       if (isError)
-       {
-%>
-    highlightErrantRow(businessDetailsCategoriesTable.rows[<%=i%>+numberOfHeaderRows],"errantRow");
-<%
-       }       
-     }
-   }
-
-   // Authentication.
-   String publishURL = (String)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-   String userId = (String)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-   String password = (String)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-%>
-    document.forms[0].<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL%>.value = "<%=HTMLUtils.JSMangle(publishURL)%>";
-    document.forms[0].<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID%>.value = "<%=HTMLUtils.JSMangle(userId)%>";
-    document.forms[0].<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD%>.value = "<%=HTMLUtils.JSMangle(password)%>";
-    if (<%=!regElement.isLoggedIn()%>)
-      document.getElementById("businessDetailsAuthentication").style.display = "";
-
-    showMainForm();
-  }
-
-  function showMainForm()
-  {
-    closeAllUddiChildWindows();
-    var loadScreenTable = document.getElementById("loadScreen");
-    if (loadScreenTable.rows.length > 0)
-      loadScreenTable.deleteRow(0);
-    document.getElementById("mainScreen").style.display = "";
-  }
-
-  function processForm(form)
-  {
-    if (handleSubmit(form))
-    {
-      processDetailsDiscoveryURLTable("businessDetailsDiscoveryURLs","<%=UDDIActionInputs.DISCOVERYURL_MODIFIED%>","<%=UDDIActionInputs.DISCOVERYURL_VIEWID%>","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_DISCOVERYURL%>",form);
-      processDetailsLanguageInputTable("businessDetailsNames","<%=UDDIActionInputs.NAME_MODIFIED%>","<%=UDDIActionInputs.NAME_VIEWID%>","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME_LANGUAGE%>","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME%>",form);
-      processDetailsLanguageInputTable("businessDetailsDescriptions","<%=UDDIActionInputs.DESCRIPTION_MODIFIED%>","<%=UDDIActionInputs.DESCRIPTION_VIEWID%>","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION_LANGUAGE%>","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION%>",form);
-      processDetailsIdentifierTable("businessDetailsIdentifiers",form);
-      processDetailsCategoryTable("businessDetailsCategories",form);
-      return true;
-    }
-    return false;
-  }
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-  <div id="contentborder">
-    <form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/UpdateBusinessActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" onSubmit="return processForm(this)">
-      <table id="loadScreen">
-        <tr>
-          <td class="labels">
-            <%=controller.getMessage("MSG_LOAD_IN_PROGRESS")%>
-          </td>
-        </tr>
-      </table>
-      <div id="mainScreen" style="display:none;">
-<%
-   String titleImagePath = "images/details_highlighted.gif";
-   String title = uddiPerspective.getMessage("ALT_BUSINESS_DETAILS");
-%>
-<%@ include file="/forms/formheader.inc" %>
-        <input type="hidden" name="<%=UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY%>" value="<%=formTool.getProperty(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY)%>">
-        <table>
-          <tr>
-            <td class="labels">
-              <%=uddiPerspective.getMessage("FORM_LABEL_DETAILS_EDITABLE",selectedNode.getNodeName())%>
-            </td>
-          </tr>
-          <tr>
-            <td height=20>&nbsp;</td>
-          </tr>
-        </table>
-        <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
-          <tr>
-            <th class="singleheadercolor" height=20 valign="bottom" align="left">
-              <%=uddiPerspective.getMessage("FORM_LABEL_BUSINESS_KEY")%>
-            </th>
-          </tr>
-          <tr>
-            <td class="tablecells">
-              <%=formTool.getProperty(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY)%>
-            </td>
-          </tr>
-        </table>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("businessDetailsNames");
-   String[] nameSpecificInfo = {"FORM_LABEL_NAMES","FORM_LABEL_NAME",String.valueOf(!formTool.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES))};
-   sectionHeaderInfo.setOtherProperties(nameSpecificInfo);
-%>
-<jsp:include page="/uddi/forms/detailsLanguageInput_table.jsp" flush="true"/>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("businessDetailsDescriptions");
-   String[] descSpecificInfo = {"FORM_LABEL_DESCRIPTIONS","FORM_LABEL_DESCRIPTION",String.valueOf(!formTool.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS))};
-   sectionHeaderInfo.setOtherProperties(descSpecificInfo);
-%>
-<jsp:include page="/uddi/forms/detailsLanguageInput_table.jsp" flush="true"/>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("businessDetailsIdentifiers");
-%>
-<jsp:include page="/uddi/forms/detailsIdentifiers_table.jsp" flush="true"/>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("businessDetailsCategories");
-%>
-<jsp:include page="/uddi/forms/detailsCategories_table.jsp" flush="true"/>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("businessDetailsDiscoveryURLs");
-   Boolean discoveryURLSpecificInfo = new Boolean(!formTool.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS));
-   sectionHeaderInfo.setOtherProperties(discoveryURLSpecificInfo);
-%>
-<jsp:include page="/uddi/forms/detailsDiscoveryURLs_table.jsp" flush="true"/>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("businessDetailsAuthentication");
-%>
-<jsp:include page="/uddi/forms/authentication_table.jsp" flush="true"/>
-<jsp:useBean id="currentToolManagerHash" class="java.util.Hashtable" scope="request">
-<%
-  currentToolManagerHash.put(ActionInputs.CURRENT_TOOL_MANAGER,currentToolManager);
-%>
-</jsp:useBean>
-<jsp:include page="/forms/otherActions.jsp" flush="true"/>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
-      </div>
-    </form>
-  </div>
-<script language="javascript">
-  setDefaults();
-  resumeProxyLoadPage();
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/GetForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/GetForm.jsp
deleted file mode 100644
index b372f602a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/GetForm.jsp
+++ /dev/null
@@ -1,217 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*,
-                                                        org.uddi4j.datatype.business.*,
-                                                        org.uddi4j.datatype.service.*,
-                                                        org.uddi4j.datatype.tmodel.*,
-                                                        java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<jsp:useBean id="subQueryTransferTargetHolder" class="java.util.Vector" scope="request">
-<%
-   subQueryTransferTargetHolder.removeAllElements();
-%>
-</jsp:useBean>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-   NodeManager nodeManager = uddiPerspective.getNavigatorManager();
-   Node selectedNode = nodeManager.getSelectedNode();
-   FormTool formTool = (FormTool)(selectedNode.getCurrentToolManager().getSelectedTool());
-   String subQueryKey = (String)formTool.getProperty(UDDIActionInputs.SUBQUERY_KEY);
-   FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKey);
-   TreeElement treeElement = selectedNode.getTreeElement();
-   String parentQueryKey;
-   int lastSeparatorPos = subQueryKey.lastIndexOf(':');
-   if (lastSeparatorPos == -1)
-     parentQueryKey = "";
-   else
-     parentQueryKey = subQueryKey.substring(0,lastSeparatorPos);
-   FormToolPropertiesInterface parentFormToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(parentQueryKey);
-   Object queryItemProperty = parentFormToolPI.getProperty(UDDIActionInputs.QUERY_ITEM);
-   Object queryStyleBus = parentFormToolPI.getProperty(UDDIActionInputs.QUERY_STYLE_BUSINESSES);
-   Object queryStyleSer = parentFormToolPI.getProperty(UDDIActionInputs.QUERY_STYLE_SERVICES);
-   Object queryStyleSerInt = parentFormToolPI.getProperty(UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES);
-   Hashtable parentQueryData = new Hashtable();
-   if (queryItemProperty != null)
-     parentQueryData.put(UDDIActionInputs.QUERY_ITEM, queryItemProperty);
-   if (queryStyleBus != null)
-     parentQueryData.put(UDDIActionInputs.QUERY_STYLE_BUSINESSES, queryStyleBus);
-   if (queryStyleSer != null)
-     parentQueryData.put(UDDIActionInputs.QUERY_STYLE_SERVICES, queryStyleSer);
-   if (queryStyleSerInt != null)
-     parentQueryData.put(UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES, queryStyleSerInt);
-   SubQueryTransferTarget subQueryTransferTarget = new SubQueryTransferTarget(selectedNode,subQueryKey,parentQueryData);
-   treeElement.setPropertyAsObject(UDDIModelConstants.SUBQUERY_TRANSFER_TARGET,subQueryTransferTarget);
-   subQueryTransferTargetHolder.addElement(subQueryTransferTarget);
-   boolean hasTarget = true;
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=uddiPerspective.getMessage("FORM_TITLE_GET_FORM")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/scripts/panes.jsp" flush="true"/>
-<jsp:include page="/uddi/scripts/results.jsp" flush="true"/>
-<script language="javascript">
-  function setDefaults()
-  {
-<%
-   int queryItem = Integer.parseInt((String)formToolPI.getProperty(UDDIActionInputs.QUERY_ITEM));
-   Hashtable allUniqueNodes = new Hashtable();
-   Vector allNodes = new Vector();
-   UDDIMainNode uddiMainNode = (UDDIMainNode)nodeManager.getRootNode();
-   RegistryNode regNode = uddiMainNode.getRegistryNode(selectedNode);
-   switch (queryItem)
-   {
-     case UDDIActionInputs.QUERY_ITEM_BUSINESSES:
-       regNode.getAllBusinessNodes(allNodes);
-       break;
-     case UDDIActionInputs.QUERY_ITEM_SERVICES:
-       regNode.getAllServiceNodes(allNodes);
-       break;
-     case UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES:
-     default:
-       regNode.getAllServiceInterfaceNodes(allNodes);
-   }
-   
-   for (int i=0;i<allNodes.size();i++)
-   {
-     Node node = (Node)allNodes.elementAt(i);
-     allUniqueNodes.put(node.getTreeElement().getKey(),node);
-   }
-
-   if (!allUniqueNodes.isEmpty())
-   {
-     Object[] itemNodes = allUniqueNodes.values().toArray();
-     QuickSort.sort(itemNodes,0,itemNodes.length-1);
-     for (int i=0;i<itemNodes.length;i++)
-     {
-       Node itemNode = (Node)itemNodes[i];
-       String url = SelectNavigatorNodeAction.getActionLink(itemNode.getNodeId(),false);
-       String name = null;
-       String description = null;
-       if (itemNode instanceof BusinessNode)
-       {
-         BusinessElement busElement = (BusinessElement)itemNode.getTreeElement();
-         BusinessEntity be = busElement.getBusinessEntity();
-         name = be.getDefaultNameString();
-         description = be.getDefaultDescriptionString();
-       }
-       else if (itemNode instanceof ServiceNode)
-       {
-         ServiceElement serviceElement = (ServiceElement)itemNode.getTreeElement();
-         BusinessService bs = serviceElement.getBusinessService();
-         name = bs.getDefaultNameString();
-         description = bs.getDefaultDescriptionString();
-       }
-       else if (itemNode instanceof ServiceInterfaceNode)
-       {
-         ServiceInterfaceElement siElement = (ServiceInterfaceElement)itemNode.getTreeElement();
-         TModel tModel = siElement.getTModel();
-         name = tModel.getNameString();
-         description = tModel.getDefaultDescriptionString();
-       }
-%>
-    addResultRow("Get",<%=itemNode.getNodeId()%>,"<%=response.encodeURL(controller.getPathWithContext(url))%>","<%=HTMLUtils.JSMangle(name)%>","<%=HTMLUtils.JSMangle(description)%>");
-<%
-     }
-%>
-    var loadScreenTable = document.getElementById("loadScreen");
-    if (loadScreenTable.rows.length > 0)
-      loadScreenTable.deleteRow(0);
-    document.getElementById("mainScreen").style.display = "";
-<%
-   }
-   else
-   {
-%>
-    perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(TransferSubQueryResultsAction.getActionLinkForReturn()))%>";
-<%
-   }
-%>
-  }
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-<div id="content">
-  <table id="loadScreen">
-    <tr>
-      <td>
-        <%=controller.getMessage("MSG_LOAD_IN_PROGRESS")%>
-      </td>
-    </tr>
-  </table>
-  <div id="mainScreen" style="display:none;">
-<%
-   String title = uddiPerspective.getMessage("ALT_GET");
-   String titleImagePath = "uddi/images/find_highlighted.gif";
-%>
-<%@ include file="/uddi/forms/resultsformheader.inc" %>
-    <form target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" method="post" enctype="multipart/form-data" style="margin-top:10px;">
-<%
-   sectionHeaderInfo.clear();
-   String tableTitle;
-   switch (queryItem)
-   {
-     case UDDIActionInputs.QUERY_ITEM_BUSINESSES:
-       tableTitle = uddiPerspective.getMessage("FORM_OPTION_BUSINESSES");
-       break;
-     case UDDIActionInputs.QUERY_ITEM_SERVICES:
-       tableTitle = uddiPerspective.getMessage("FORM_OPTION_SERVICES");
-       break;
-     case UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES:
-     default:
-       tableTitle = uddiPerspective.getMessage("FORM_OPTION_SERVICE_INTERFACES");
-   }
-   String[] otherProperties = {tableTitle,""};
-   sectionHeaderInfo.setContainerId("Get");
-   sectionHeaderInfo.setOtherProperties(otherProperties);
-%>
-<jsp:include page="/uddi/forms/results_table.jsp" flush="true"/>
-      <table border=0 cellpadding=2 cellspacing=0>
-        <tr>
-          <td height=40 align="bottom" nowrap>
-            <input type="button" value="<%=uddiPerspective.getMessage("FORM_BUTTON_TRANSFER")%>" onClick="transferSelections('Get',this.form)" class="button">
-          </td>
-          <td height=40 align="bottom" nowrap>
-            <input type="button" value="<%=controller.getMessage("FORM_BUTTON_REFRESH")%>" onClick="refreshSelections('Get',this.form)" class="button">
-          </td>
-          <td height=40 align="bottom" nowrap>
-            <input type="button" value="<%=uddiPerspective.getMessage("FORM_BUTTON_ADD_TO_FAVORITES")%>" onClick="addSelectionsToFavorites('Get',this.form)" class="button">
-          </td>
-          <td height=40 align="bottom" nowrap>
-            <input type="button" value="<%=uddiPerspective.getMessage("FORM_BUTTON_CLEAR")%>" onClick="clearSelections('Get',this.form)" class="button">
-          </td>
-          <td nowrap width="90%">&nbsp;</td>
-        </tr>
-      </table>
-    </form>
-  </div>
-</div>
-</div>
-<script language="javascript">
-  setDefaults();
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ItemsSummaryForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ItemsSummaryForm.jsp
deleted file mode 100644
index 07b3b6237..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ItemsSummaryForm.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*,
-                                                        org.uddi4j.datatype.business.*,
-                                                        org.uddi4j.datatype.service.*,
-                                                        org.uddi4j.datatype.tmodel.*,
-                                                        java.util.*" %>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
-   int queryItem = Integer.parseInt(request.getParameter(UDDIActionInputs.QUERY_ITEM));
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-   NodeManager nodeManager = uddiPerspective.getNavigatorManager();
-   UDDIMainNode uddiMainNode = (UDDIMainNode)nodeManager.getRootNode();
-   Node selectedNode = nodeManager.getSelectedNode();
-   Tool selectedTool = selectedNode.getCurrentToolManager().getSelectedTool();
-   RegistryNode regNode = uddiMainNode.getRegistryNode(selectedNode);
-   TreeElement treeElement = selectedNode.getTreeElement();
-   Vector summaryNodes = new Vector();
-   if (treeElement instanceof QueryParentElement)
-     regNode.getDiscoveredNodes(summaryNodes,queryItem);
-   else if (treeElement instanceof PublishedItemsElement)
-   {
-     switch (queryItem)
-     {
-       case UDDIActionInputs.QUERY_ITEM_BUSINESSES:
-         regNode.getPublishedBusinessNodes(summaryNodes);
-         break;
-       case UDDIActionInputs.QUERY_ITEM_SERVICES:
-         regNode.getPublishedServiceNodes(summaryNodes);
-         break;
-       case UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES:
-       default:
-         regNode.getPublishedServiceInterfaceNodes(summaryNodes);
-     }
-   }
-   boolean hasTarget = false;
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=uddiPerspective.getMessage("FORM_TITLE_ITEMS_SUMMARY")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/resumeproxyloadpage.js"))%>">
-</script>
-<jsp:include page="/scripts/panes.jsp" flush="true"/>
-<jsp:include page="/uddi/scripts/results.jsp" flush="true"/>
-<script language="javascript">
-  function setDefaults()
-  {
-<%   
-   Hashtable allUniqueNodes = new Hashtable();
-   for (int i=0;i<summaryNodes.size();i++)
-   {
-     Node summaryNode = (Node)summaryNodes.elementAt(i);
-     allUniqueNodes.put(summaryNode.getTreeElement().getKey(),summaryNode);
-   }
-   
-   if (!allUniqueNodes.isEmpty())
-   {
-     Object[] itemNodes = allUniqueNodes.values().toArray();
-     QuickSort.sort(itemNodes,0,itemNodes.length-1);
-     for (int i=0;i<itemNodes.length;i++)
-     {
-       Node itemNode = (Node)itemNodes[i];
-       String url = SelectNavigatorNodeAction.getActionLink(itemNode.getNodeId(),false);
-       String name = null;
-       String description = null;
-       if (itemNode instanceof QueryNode)
-       {
-         QueryElement queryElement = (QueryElement)itemNode.getTreeElement();
-         name = queryElement.getName();
-         String numberOfChildNodesString = String.valueOf(itemNode.getChildNodes().size());
-         switch (queryElement.getQueryType())
-         {
-           case UDDIActionInputs.QUERY_ITEM_BUSINESSES:
-             description = uddiPerspective.getMessage("MSG_INFO_BUSINESSES_FOUND",numberOfChildNodesString);
-             break;
-           case UDDIActionInputs.QUERY_ITEM_SERVICES:
-             description = uddiPerspective.getMessage("MSG_INFO_SERVICES_FOUND",numberOfChildNodesString);
-             break;
-           case UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES:
-           default:
-             description = uddiPerspective.getMessage("MSG_INFO_SERVICE_INTERFACES_FOUND",numberOfChildNodesString);
-         }             
-       }
-       else if (itemNode instanceof BusinessNode)
-       {
-         BusinessElement busElement = (BusinessElement)itemNode.getTreeElement();
-         BusinessEntity be = busElement.getBusinessEntity();
-         name = be.getDefaultNameString();
-         description = be.getDefaultDescriptionString();
-       }
-       else if (itemNode instanceof ServiceNode)
-       {
-         ServiceElement serviceElement = (ServiceElement)itemNode.getTreeElement();
-         BusinessService bs = serviceElement.getBusinessService();
-         name = bs.getDefaultNameString();
-         description = bs.getDefaultDescriptionString();
-       }
-       else if (itemNode instanceof ServiceInterfaceNode)
-       {
-         ServiceInterfaceElement siElement = (ServiceInterfaceElement)itemNode.getTreeElement();
-         TModel tModel = siElement.getTModel();
-         name = tModel.getNameString();
-         description = tModel.getDefaultDescriptionString();
-       }
-%>
-    addResultRow("Summary",<%=itemNode.getNodeId()%>,"<%=response.encodeURL(controller.getPathWithContext(url))%>","<%=HTMLUtils.JSMangle(name)%>","<%=HTMLUtils.JSMangle(description)%>");
-<%
-     }
-   }
-%>
-    var loadScreenTable = document.getElementById("loadScreen");
-    if (loadScreenTable.rows.length > 0)
-      loadScreenTable.deleteRow(0);
-    document.getElementById("mainScreen").style.display = "";
-  }
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-<div id="content">
-  <table id="loadScreen">
-    <tr>
-      <td>
-        <%=controller.getMessage("MSG_LOAD_IN_PROGRESS")%>
-      </td>
-    </tr>
-  </table>
-  <div id="mainScreen" style="display:none;">
-<%
-   String title = selectedTool.getAltText();
-   String titleImagePath = selectedTool.getHighlightedImageLink();
-%>
-<%@ include file="/uddi/forms/resultsformheader.inc" %>
-    <form target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" method="post" enctype="multipart/form-data" style="margin-top:10px;">
-<%
-   sectionHeaderInfo.clear();
-   String tableTitle;
-   switch (queryItem)
-   {
-     case UDDIActionInputs.QUERY_ITEM_QUERIES:
-       tableTitle = uddiPerspective.getMessage("FORM_LABEL_QUERIES");
-       break;
-     case UDDIActionInputs.QUERY_ITEM_BUSINESSES:
-       tableTitle = uddiPerspective.getMessage("FORM_OPTION_BUSINESSES");
-       break;
-     case UDDIActionInputs.QUERY_ITEM_SERVICES:
-       tableTitle = uddiPerspective.getMessage("FORM_OPTION_SERVICES");
-       break;
-     case UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES:
-     default:
-       tableTitle = uddiPerspective.getMessage("FORM_OPTION_SERVICE_INTERFACES");
-   }
-   String[] otherProperties = {tableTitle,""};
-   sectionHeaderInfo.setContainerId("Summary");
-   sectionHeaderInfo.setOtherProperties(otherProperties);
-%>
-<jsp:include page="/uddi/forms/results_table.jsp" flush="true"/>
-      <table border=0 cellpadding=2 cellspacing=0>
-        <tr>
-          <td height=40 align="bottom" nowrap>
-            <input type="button" value="<%=controller.getMessage("FORM_BUTTON_REFRESH")%>" onClick="refreshSelections('Summary',this.form)" class="button">
-          </td>
-<%
-   if (queryItem != UDDIActionInputs.QUERY_ITEM_QUERIES)
-   {
-%>             
-          <td height=40 align="bottom" nowrap>
-            <input type="button" value="<%=uddiPerspective.getMessage("FORM_BUTTON_ADD_TO_FAVORITES")%>" onClick="addSelectionsToFavorites('Summary',this.form)" class="button">
-          </td>
-<%
-   }
-%>             
-          <td height=40 align="bottom" nowrap>
-            <input type="button" value="<%=uddiPerspective.getMessage("FORM_BUTTON_CLEAR")%>" onClick="clearSelections('Summary',this.form)" class="button">
-          </td>
-          <td nowrap width="90%">&nbsp;</td>
-        </tr>
-      </table>
-    </form>
-  </div>
-</div>
-</div>
-<script language="javascript">
-  setDefaults();
-  resumeProxyLoadPage();
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ManagePublisherAssertionsForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ManagePublisherAssertionsForm.jsp
deleted file mode 100644
index f67f7820e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ManagePublisherAssertionsForm.jsp
+++ /dev/null
@@ -1,408 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*,
-                                                        org.uddi4j.response.CompletionStatus,
-                                                        org.uddi4j.datatype.business.*,
-                                                        java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
-   String pubAssertionForm = "showPublisherAssertionsForm";
-   String publisherAssertionsBusiness = "publisherAssertionsBusiness";
-
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-   NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
-   UDDIMainNode uddiMainNode = (UDDIMainNode)navigatorManager.getRootNode();
-   Node selectedNode = navigatorManager.getSelectedNode();
-   FormTool formTool = (FormTool)(selectedNode.getCurrentToolManager().getSelectedTool());   
-   RegistryNode regNode = uddiMainNode.getRegistryNode(selectedNode);
-   RegistryElement regElement = (RegistryElement)regNode.getTreeElement();
-   TreeElement selectedElement = selectedNode.getTreeElement();
-
-   String divPublisherAssertionTable = "divPublisherAssertionTable";
-   String xdivPublisherAssertionTable = "xdivPublisherAssertionTable";
-%>
-
-<jsp:useBean id="subQueryKeyProperty" class="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.SubQueryKeyProperty" scope="request">
-<%
-   String subQueryKey = (String)formTool.getProperty(UDDIActionInputs.SUBQUERY_KEY);
-   subQueryKeyProperty.setSubQueryKey(subQueryKey);
-%>
-</jsp:useBean>
-<%
-   FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKeyProperty.getSubQueryKey());
-%>
-
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=uddiPerspective.getMessage("FORM_TITLE_MANAGE_PUBLISHER_ASSERTIONS")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/resumeproxyloadpage.js"))%>">
-</script>
-
-<jsp:include page="/scripts/formsubmit.jsp" flush="true"/>
-<jsp:include page="/uddi/scripts/udditables.jsp" flush="true"/>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-<jsp:include page="/uddi/scripts/results.jsp" flush="true"/>
-<script language="javascript">
-  function setDefaults()
-  {
-    closeAllUddiChildWindows();
-<%
-   if (!regElement.isLoggedIn())
-   {
-     String publishURL = (String)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-     String userId = (String)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-     String password = (String)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-%>
-    document.forms[0].<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL%>.value = "<%=HTMLUtils.JSMangle(publishURL)%>";
-    document.forms[0].<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID%>.value = "<%=HTMLUtils.JSMangle(userId)%>";
-    document.forms[0].<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD%>.value = "<%=HTMLUtils.JSMangle(password)%>";
-    document.getElementById("<%=pubAssertionForm%>").style.display = "";
-<%
-   }
-   
-   Vector business = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADD_PUBLISHER_ASSERTIONS);
-   ListManager businessCopy = (ListManager)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADD_PUBLISHER_ASSERTIONS_COPY);
-   if (business != null)
-   {
-     if (businessCopy == null)
-       businessCopy = new ListManager();
-     else
-       businessCopy.clear();
-     for (int i=0;i<business.size();i++)
-     {
-       ListElement listElement = (ListElement)business.elementAt(i);
-       int targetNodeId = listElement.getTargetNodeId();
-       int targetToolId = listElement.getTargetToolId();
-       int targetViewId = listElement.getTargetViewId();
-       String url = SelectSubQueryItemAction.getActionLink(targetNodeId,targetToolId,targetViewId,subQueryKeyProperty.getSubQueryKey(),UDDIActionInputs.QUERY_INPUT_ADD_PUBLISHER_ASSERTIONS,i,UDDIActionInputs.QUERY_ITEM_BUSINESSES,false);
-       BusinessEntity be = (BusinessEntity)listElement.getObject();
-       businessCopy.add(listElement);
-%>
-    addPublisherAssertionResultRow("<%=publisherAssertionsBusiness%>",<%=listElement.getViewId()%>,"<%=response.encodeURL(controller.getPathWithContext(url))%>","<%=HTMLUtils.JSMangle(be.getDefaultNameString())%>","<%=HTMLUtils.JSMangle(be.getDefaultDescriptionString())%>");
-<%
-     }
-     formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADD_PUBLISHER_ASSERTIONS_COPY,businessCopy);
-   }
-   else
-   {
-     business = new Vector();
-     businessCopy = new ListManager();
-     formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADD_PUBLISHER_ASSERTIONS,business);
-     formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADD_PUBLISHER_ASSERTIONS_COPY,businessCopy);
-   }
-%>
-  }
-
-  function populateAssertionTable() {
-<%
-    if (selectedElement instanceof BusinessElement)
-    {
-      ListManager pubAssertions = ((BusinessElement)selectedElement).getPublisherAssertions();
-      if (pubAssertions == null)
-      {
-        ShowPublisherAssertionsAction action = new ShowPublisherAssertionsAction(controller);
-        action.run();
-%>
-        statusContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/status_content.jsp"))%>";
-<%
-        pubAssertions = ((BusinessElement)selectedElement).getPublisherAssertions();
-      }
-
-      pubAssertions = ((BusinessElement)selectedElement).getPublisherAssertions();
-      Enumeration e = ((pubAssertions != null) ? pubAssertions.getListElements() : null);
-      while (e != null && e.hasMoreElements())
-      {
-        ListElement le = (ListElement)e.nextElement();
-        PublisherAssertionElement pubAssertionElement = (PublisherAssertionElement)le.getObject();
-        int viewId = le.getViewId();
-        String direction;
-        if (((BusinessElement)selectedElement).getBusinessEntity().getBusinessKey().equals(pubAssertionElement.getFromKey()))
-          direction = uddiPerspective.getMessage("FORM_OPTION_ASSERTION_DIRECTION_FROM");
-        else
-          direction = uddiPerspective.getMessage("FORM_OPTION_ASSERTION_DIRECTION_TO");
-        ListElement sp = (ListElement)pubAssertionElement.getServiceProvider();
-        int targetNodeId = sp.getTargetNodeId();
-        int targetToolId = sp.getTargetToolId();
-        int targetViewId = sp.getTargetViewId();
-        int subQueryItemId = pubAssertionElement.getSubQueryItemId();
-        String url = SelectSubQueryItemAction.getActionLink(targetNodeId,targetToolId,targetViewId,subQueryKeyProperty.getSubQueryKey(),UDDIActionInputs.QUERY_INPUT_EXISTING_PUBLISHER_ASSERTIONS,subQueryItemId,UDDIActionInputs.QUERY_ITEM_BUSINESSES,false);
-        String name = ((BusinessEntity)sp.getObject()).getDefaultNameString();
-        String desc = ((BusinessEntity)sp.getObject()).getDefaultDescriptionString();
-        String status = pubAssertionElement.getStatus();
-        String type = pubAssertionElement.getKeyedRef().getKeyValue();
-%>
-      addAssertion("<%=divPublisherAssertionTable%>",<%=viewId%>,"<%=direction%>","<%=response.encodeURL(controller.getPathWithContext(url))%>","<%=HTMLUtils.JSMangle(name)%>","<%=HTMLUtils.JSMangle(desc)%>","<%=status%>","<%=HTMLUtils.JSMangle(type)%>");
-<%
-      }
-    }
-%>
-  }
-
-  function addAssertion(tableContainerId,viewId,direction,url,name,desc,status,type)
-  {
-    twistOpen(tableContainerId);
-    var table = getTable(tableContainerId);
-    var tableBody = table.getElementsByTagName("TBODY").item(0);
-    var newRow = document.createElement("tr");
-    var column0 = document.createElement("td");
-    var column1 = document.createElement("td");
-    var column2 = document.createElement("td");
-    var column3 = document.createElement("td");
-    var column4 = document.createElement("td");
-    var column5 = document.createElement("td");
-    var column6 = document.createElement("td");
-
-    var rowCheckbox = createRowCheckbox();
-    rowCheckbox.name = "<%=UDDIActionInputs.PUBLISHER_ASSERTIONS_VIEWID%>";
-    rowCheckbox.value = viewId;
-    column0.appendChild(rowCheckbox);
-
-    column1.appendChild(document.createTextNode("<%=uddiPerspective.getMessage("FORM_LABEL_THIS_BUSINESS")%>"));
-
-    column2.appendChild(document.createTextNode(direction));
-
-    var nameDetailsLink = document.createElement("a");
-    nameDetailsLink.href = url;
-    nameDetailsLink.target = "<%=FrameNames.PERSPECTIVE_WORKAREA%>";
-    nameDetailsLink.appendChild(document.createTextNode(name));
-    column3.appendChild(nameDetailsLink);
-
-    column4.appendChild(document.createTextNode(getDefaultDisplayString(desc)));
-
-    column5.appendChild(document.createTextNode(status));
-
-    column6.appendChild(document.createTextNode(type));
-
-    column0.className = "checkboxcells";
-    column1.className = "tablecells";
-    column2.className = "tablecells";
-    column3.className = "tablecells";
-    column4.className = "tablecells";
-    column5.className = "tablecells";
-    column6.className = "tablecells";
-    newRow.appendChild(column0);
-    newRow.appendChild(column1);
-    newRow.appendChild(column2);
-    newRow.appendChild(column3);
-    newRow.appendChild(column4);
-    newRow.appendChild(column5);
-    newRow.appendChild(column6);
-    tableBody.appendChild(newRow);
-
-  }
-
-  function addPublisherAssertionResultRow(tableContainerId,nodeId,url,name,description)
-  {
-    twistOpen(tableContainerId);
-    var table = getTable(tableContainerId);
-    var tableBody = table.getElementsByTagName("TBODY").item(0);
-    var newRow = document.createElement("tr");
-    var column0 = document.createElement("td");
-    var column1 = document.createElement("td");
-    var column2 = document.createElement("td");
-    var column3 = document.createElement("td");
-    var column4 = document.createElement("td");
-    var column5 = document.createElement("td");
-
-    var rowCheckbox = createRowCheckbox();
-    column0.appendChild(rowCheckbox);
-    column0.appendChild(createHiddenElement("",nodeId));
-
-    column1.appendChild(document.createTextNode("<%=uddiPerspective.getMessage("FORM_LABEL_THIS_BUSINESS")%>"));
-
-    var direction = document.createElement("select");
-    direction.id = "label_publisher_assertion_direction";
-    direction.name = "<%=UDDIActionInputs.PUBLISHER_ASSERTIONS_DIRECTION%>";
-    direction.className = "selectlist";
-    direction.options[0] = new Option("<%=uddiPerspective.getMessage("FORM_OPTION_ASSERTION_DIRECTION_FROM")%>", "<%=String.valueOf(UDDIActionInputs.DIRECTION_FROM)%>");
-    direction.options[1] = new Option("<%=uddiPerspective.getMessage("FORM_OPTION_ASSERTION_DIRECTION_TO")%>", "<%=String.valueOf(UDDIActionInputs.DIRECTION_TO)%>");
-    column2.appendChild(direction);
-
-    var nameDetailsLink = document.createElement("a");
-    nameDetailsLink.href = url;
-    nameDetailsLink.target = "<%=FrameNames.PERSPECTIVE_WORKAREA%>";
-    nameDetailsLink.appendChild(document.createTextNode(name));
-    column3.appendChild(nameDetailsLink);
-
-    column4.appendChild(document.createTextNode(getDefaultDisplayString(description)));
-
-    var assertionType = document.createElement("select");
-    assertionType.id = "label_publisher_assertion_type";
-    assertionType.name = "<%=UDDIActionInputs.PUBLISHER_ASSERTIONS_TYPE%>";
-    assertionType.className = "selectlist";
-    assertionType.options[0] = new Option("<%=uddiPerspective.getMessage("FORM_OPTION_ASSERTION_TYPE_PARENT_CHILD")%>", "<%=String.valueOf(UDDIActionInputs.PUBLISHER_ASSERTIONS_TYPE_PARENT_CHILD)%>");
-    assertionType.options[1] = new Option("<%=uddiPerspective.getMessage("FORM_OPTION_ASSERTION_TYPE_PEER_TO_PEER")%>", "<%=String.valueOf(UDDIActionInputs.PUBLISHER_ASSERTIONS_TYPE_PEER_TO_PEER)%>");
-    assertionType.options[2] = new Option("<%=uddiPerspective.getMessage("FORM_OPTION_ASSERTION_TYPE_IDENTITY")%>", "<%=String.valueOf(UDDIActionInputs.PUBLISHER_ASSERTIONS_TYPE_IDENTITY)%>");
-    column5.appendChild(assertionType);
-
-    column0.className = "checkboxcells";
-    column1.className = "tablecells";
-    column2.className = "tablecells";
-    column3.className = "tablecells";
-    column4.className = "tablecells";
-    column5.className = "tablecells";
-    newRow.appendChild(column0);
-    newRow.appendChild(column1);
-    newRow.appendChild(column2);
-    newRow.appendChild(column3);
-    newRow.appendChild(column4);
-    newRow.appendChild(column5);
-    tableBody.appendChild(newRow);
-  }
-
-  function setFormLocationAndSubmit(form,location)
-  {
-    form.action = location;
-    if (handleSubmit(form))
-    {
-      processResultTable("<%=publisherAssertionsBusiness%>", "<%=UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID%>", form, false);
-      form.submit();
-    }
-  }
-
-  function checkTableEntriesAndSubmit(tableContainerId,form,location)
-  {
-    if (getNumberOfSelections(tableContainerId) > 0) {
-      setFormLocationAndSubmit(form,location);
-      return;
-    }
-    alert("<%=controller.getUDDIPerspective().getMessage("MSG_ERROR_NOTHING_SELECTED")%>");
-  }
-
-  function checkTableSizeAndSubmit(tableContainerId,form,location)
-  {
-    var table = getTable(tableContainerId);
-    if (table.rows.length > numberOfHeaderRows) {
-      setFormLocationAndSubmit(form,location);
-      return;
-    }
-    alert("<%=controller.getUDDIPerspective().getMessage("MSG_ERROR_NOTHING_SELECTED")%>");
-  }
-
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin" onUnload="closeAllUddiChildWindows()">
-  <div id="contentborder">
-    <div id="publisherAssertions">
-      <form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/ShowPublisherAssertionsActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data">
-        <input type="hidden" name="<%=UDDIActionInputs.SUBQUERY_GET%>">
-        <input type="hidden" name="<%=UDDIActionInputs.NEW_SUBQUERY_INITIATED%>">
-        <input type="hidden" name="<%=UDDIActionInputs.NEW_SUBQUERY_QUERY_ITEM%>">
-
-<%
-   String titleImagePath = "uddi/images/publisher_assertions_highlighted.gif";
-   String title = uddiPerspective.getMessage("ALT_MANAGE_PUBLISHER_ASSERTIONS");
-%>
-<%@ include file="/forms/formheader.inc" %>
-        <table width="90%" border=0 cellpadding=3 cellspacing=0>
-          <tr>
-            <td class="labels">
-              <%=uddiPerspective.getMessage("FORM_LABEL_MANAGE_PUBLISHER_ASSERTIONS_DESC")%>
-            </td>
-          </tr>
-        </table>
-        <table border=0 cellpadding=6 cellspacing=0>
-          <tr>
-            <td height=40 valign="bottom" align="left" nowrap width=11>
-                <a href="javascript:twist('<%=divPublisherAssertionTable%>','<%=xdivPublisherAssertionTable%>')"><img name="<%=xdivPublisherAssertionTable%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a>
-            </td>
-            <td height=40 valign="bottom" align="left" nowrap class="labels">
-              <strong><%=uddiPerspective.getMessage("FORM_LABEL_PUBLISH_ASSERTIONS")%></strong>
-            </td>
-          </tr>
-        </table>
-
-        <table width="95%" border=0 cellpadding=0 cellspacing=0>
-          <tr>
-            <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" height=2 width="100%"></td>
-          </tr>
-        </table>
-
-        <div id="<%=divPublisherAssertionTable%>" style="display:none;">
-          <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
-            <tr>
-              <th class="checkboxcells" width=10><input type="checkbox" onClick="handleCheckAllClick('<%=divPublisherAssertionTable%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
-              <th class="headercolor"><%=((BusinessElement)selectedElement).getBusinessEntity().getDefaultNameString()%></th>
-              <th class="headercolor"><label for="label_publisher_assertion_direction"><%=uddiPerspective.getMessage("FORM_LABEL_DIRECTION")%></label></th>
-              <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_BUSINESS")%></th>
-              <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_DESCRIPTION")%></th>
-              <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_STATUS")%></th>
-              <th class="headercolor"><label for="label_publisher_assertion_type"><%=uddiPerspective.getMessage("FORM_LABEL_ASSERTION_TYPE")%></label></th>
-            </tr>
-          </table>
-          <table width="90%" border=0 cellpadding=3 cellspacing=0>
-            <tr>
-              <td height=30 valign="bottom" align="left" nowrap class="labels">
-                <%=uddiPerspective.getMessage("FORM_LABEL_INCOMPLETE_ASSERTIONS_VISIBILITY_DESC")%>
-              </td>
-            </tr>
-          </table>
-        </div>
-
-<%
-   boolean tableHasErrors = !formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_ADD_PUBLISHER_ASSERTIONS);
-   String[] busSpecificInfo = {"FORM_LABEL_BUSINESSES",(new Boolean(tableHasErrors)).toString(),String.valueOf(UDDIActionInputs.QUERY_ITEM_BUSINESSES),"publisherAssertions",UDDIActionInputs.QUERY_INPUT_ADD_PUBLISHER_ASSERTIONS};
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId(publisherAssertionsBusiness);
-   sectionHeaderInfo.setOtherProperties(busSpecificInfo);
-%>
-<jsp:include page="/uddi/forms/uddiObjectsPublisherAssertions_table.jsp" flush="true"/>
-
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId(pubAssertionForm);
-%>
-<jsp:include page="authentication_table.jsp" flush="true"/>
-        <br>
-        <table>
-          <tr>
-            <td>
-              <input type="button" value="<%=uddiPerspective.getMessage("FORM_BUTTON_SHOW_ALL_PUBLISHER_ASSERTIONS")%>" onClick="setFormLocationAndSubmit(this.form,'<%=response.encodeURL(controller.getPathWithContext("uddi/actions/ShowPublisherAssertionsActionJSP.jsp"))%>')" class="button">
-            </td>
-            <td>
-              <input type="button" value="<%=uddiPerspective.getMessage("FORM_BUTTON_COMPLETE_PUBLISHER_ASSERTIONS")%>" onClick="checkTableEntriesAndSubmit('<%=divPublisherAssertionTable%>',this.form,'<%=response.encodeURL(controller.getPathWithContext("uddi/actions/CompletePublisherAssertionsActionJSP.jsp"))%>')" class="button">
-            </td>
-            <td>
-              <input type="button" value="<%=uddiPerspective.getMessage("FORM_BUTTON_ADD_PUBLISHER_ASSERTIONS")%>" onClick="checkTableSizeAndSubmit('<%=publisherAssertionsBusiness%>',this.form,'<%=response.encodeURL(controller.getPathWithContext("uddi/actions/AddPublisherAssertionsActionJSP.jsp"))%>')" class="button">
-            </td>
-            <td>
-              <input type="button" value="<%=uddiPerspective.getMessage("FORM_BUTTON_REMOVE_PUBLISHER_ASSERTIONS")%>" onClick="checkTableEntriesAndSubmit('<%=divPublisherAssertionTable%>',this.form,'<%=response.encodeURL(controller.getPathWithContext("uddi/actions/RemovePublisherAssertionsActionJSP.jsp"))%>')" class="button">
-            </td>
-          </tr>
-        </table>
-      </form>
-
-    </div>
-  </div>
-<script language="javascript">
-  populateAssertionTable();
-  setDefaults();
-  resumeProxyLoadPage();
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ManageReferencedServicesForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ManageReferencedServicesForm.jsp
deleted file mode 100644
index bafda37f8..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ManageReferencedServicesForm.jsp
+++ /dev/null
@@ -1,231 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*,
-                                                        org.uddi4j.datatype.business.*,
-                                                        org.uddi4j.datatype.service.*,
-                                                        java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-   NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
-   UDDIMainNode uddiMainNode = (UDDIMainNode)navigatorManager.getRootNode();
-   Node selectedNode = navigatorManager.getSelectedNode();
-   FormTool formTool = (FormTool)(selectedNode.getCurrentToolManager().getSelectedTool());
-   RegistryNode regNode = uddiMainNode.getRegistryNode(selectedNode);
-   RegistryElement regElement = (RegistryElement)regNode.getTreeElement();
-   BusinessElement busElement = (BusinessElement)selectedNode.getTreeElement();
-%>
-<jsp:useBean id="subQueryKeyProperty" class="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.SubQueryKeyProperty" scope="request">
-<%
-   String sk = (String)formTool.getProperty(UDDIActionInputs.SUBQUERY_KEY);
-   subQueryKeyProperty.setSubQueryKey(sk);
-%>
-</jsp:useBean>
-<html>
-<head>
-  <title><%=uddiPerspective.getMessage("FORM_TITLE_MANAGE_REFERENCED_SERVICES")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/results.jsp" flush="true"/>
-<script language="javascript">
-  function setDefaults()
-  {
-<%
-   if (!regElement.isLoggedIn())
-   {
-     String publishURL = (String)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-     String userId = (String)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-     String password = (String)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-%>
-    document.forms[0].<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL%>.value = "<%=HTMLUtils.JSMangle(publishURL)%>";
-    document.forms[0].<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID%>.value = "<%=HTMLUtils.JSMangle(userId)%>";
-    document.forms[0].<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD%>.value = "<%=HTMLUtils.JSMangle(password)%>";
-    document.getElementById("manageReferencedServicesAuthentication").style.display = "";
-<%
-   }
-   String subQueryKey = subQueryKeyProperty.getSubQueryKey();
-   FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKey);
-   Vector referencedServices = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_REFERENCED_SERVICES);
-   if (referencedServices == null)
-   {
-     referencedServices = new Vector();
-     BusinessEntity businessEntity = busElement.getBusinessEntity();
-     String businessKey = businessEntity.getBusinessKey();
-     BusinessServices businessSvcs = businessEntity.getBusinessServices();
-     if (businessSvcs != null)
-     {
-       Vector businessSvcVector = businessSvcs.getBusinessServiceVector();
-       for (int i=0;i<businessSvcVector.size();i++)
-       {
-         BusinessService busService = (BusinessService)businessSvcVector.elementAt(i);
-         if (!busService.getBusinessKey().equals(businessKey))
-         {
-           ListElement listElement = new ListElement(busService);
-           referencedServices.addElement(listElement);
-         }
-       }
-     }
-     formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_REFERENCED_SERVICES,referencedServices);
-   }
-
-   for (int i=0;i<referencedServices.size();i++)
-   {
-     ListElement listElement = (ListElement)referencedServices.elementAt(i);
-     int targetNodeId = listElement.getTargetNodeId();
-     int targetToolId = listElement.getTargetToolId();
-     int targetViewId = listElement.getTargetViewId();
-     String url = SelectSubQueryItemAction.getActionLink(targetNodeId,targetToolId,targetViewId,subQueryKey,UDDIActionInputs.QUERY_INPUT_REFERENCED_SERVICES,i,UDDIActionInputs.QUERY_ITEM_SERVICES,false);
-     BusinessService bs = (BusinessService)listElement.getObject();
-     String name = bs.getDefaultNameString();
-     String description = bs.getDefaultDescriptionString();
-%>
-    addResultRow("manageReferencedServicesReferences",<%=targetNodeId%>,"<%=response.encodeURL(controller.getPathWithContext(url))%>","<%=HTMLUtils.JSMangle(name)%>","<%=HTMLUtils.JSMangle(description)%>");
-<%
-   }
-
-   Vector services = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_SERVICES);
-   if (services != null)
-   {
-     for (int i=0;i<services.size();i++)
-     {
-       ListElement listElement = (ListElement)services.elementAt(i);
-       int targetNodeId = listElement.getTargetNodeId();
-       int targetToolId = listElement.getTargetToolId();
-       int targetViewId = listElement.getTargetViewId();
-       String url = SelectSubQueryItemAction.getActionLink(targetNodeId,targetToolId,targetViewId,subQueryKey,UDDIActionInputs.QUERY_INPUT_SERVICES,i,UDDIActionInputs.QUERY_ITEM_SERVICES,false);
-       BusinessService bs = (BusinessService)listElement.getObject();
-       String name = bs.getDefaultNameString();
-       String description = bs.getDefaultDescriptionString();
-%>
-    addResultRow("manageReferencedServicesServices",<%=targetNodeId%>,"<%=response.encodeURL(controller.getPathWithContext(url))%>","<%=HTMLUtils.JSMangle(name)%>","<%=HTMLUtils.JSMangle(description)%>");
-<%
-     }
-   }
-%>
-  }
-
-  function processReferenceTable(tableContainerId,inputName,form)
-  {
-    var table = getTable(tableContainerId);
-    for (var i=numberOfHeaderRows;i<table.rows.length;i++)
-    {
-      var inputs = table.rows[i].getElementsByTagName("input");
-      form.appendChild(createHiddenElement(inputName,inputs.item(0).checked));
-    }
-  }
-
-  function processForm(form)
-  {
-    if (handleSubmit(form))
-    {
-      processReferenceTable("manageReferencedServicesReferences","<%=UDDIActionInputs.REFERENCED_SERVICE_SELECT_STATE%>",form);
-      processResultTable("manageReferencedServicesServices","<%=UDDIActionInputs.NODEID_SERVICE%>",form,false);
-      form.submit();
-    }
-  }
-
-  function processAddServices(form)
-  {
-    var table = getTable("manageReferencedServicesServices");
-    if (table.rows.length == numberOfHeaderRows)
-      alert("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("MSG_ERROR_NO_SERVICES"))%>");
-    else
-    {
-      form.<%=UDDIActionInputs.MANAGE_REFERENCED_SERVICES_OPERATION%>.value = "<%=UDDIActionInputs.MANAGE_REFERENCED_SERVICES_OPERATION_ADD%>";
-      processForm(form);
-    }
-  }
-
-  function processRemoveReferences(form)
-  {
-    var numberOfSelections = getNumberOfSelections("manageReferencedServicesReferences");
-    if (getNumberOfSelections("manageReferencedServicesReferences") == 0)
-      alert("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("MSG_ERROR_NO_REFERENCE_SELECTED"))%>");
-    else
-    {
-      form.<%=UDDIActionInputs.MANAGE_REFERENCED_SERVICES_OPERATION%>.value = "<%=UDDIActionInputs.MANAGE_REFERENCED_SERVICES_OPERATION_REMOVE%>";
-      processForm(form);
-    }
-  }
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-  <div id="contentborder">
-    <div id="manageReferencedServices">
-<%
-   String titleImagePath = "uddi/images/referenced_services_highlighted.gif";
-   String title = uddiPerspective.getMessage("ALT_MANAGE_REFERENCED_SERVICES");
-%>
-<%@ include file="/forms/formheader.inc" %>
-      <form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/ManageReferencedServicesActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" style="margin-top:0;">
-        <input type="hidden" name="<%=UDDIActionInputs.SUBQUERY_KEY%>">
-        <input type="hidden" name="<%=UDDIActionInputs.SUBQUERY_GET%>">
-        <input type="hidden" name="<%=UDDIActionInputs.NEW_SUBQUERY_INITIATED%>">
-        <input type="hidden" name="<%=UDDIActionInputs.NEW_SUBQUERY_QUERY_ITEM%>">
-        <input type="hidden" name="<%=UDDIActionInputs.MANAGE_REFERENCED_SERVICES_OPERATION%>">
-        <table width="90%" border=0 cellpadding=3 cellspacing=0>
-          <tr>
-            <td class="labels">
-              <%=uddiPerspective.getMessage("FORM_LABEL_MANAGE_REFERENCED_SERVICES_DESC")%>
-            </td>
-          </tr>
-        </table>
-<%
-   String[] projectionsSpecificInfo = {"FORM_LABEL_REFERENCED_SERVICES",Boolean.FALSE.toString(),String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICES),"manageReferencedServices",UDDIActionInputs.QUERY_INPUT_REFERENCED_SERVICES};
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("manageReferencedServicesReferences");
-   sectionHeaderInfo.setOtherProperties(projectionsSpecificInfo);
-   sectionHeaderInfo.enableDynamic(false);
-%>
-<jsp:include page="/uddi/forms/uddiObjects_table.jsp" flush="true"/>
-<%
-   String[] servicesSpecificInfo = {"FORM_OPTION_SERVICES",Boolean.FALSE.toString(),String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICES),"manageReferencedServices",UDDIActionInputs.QUERY_INPUT_SERVICES};
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("manageReferencedServicesServices");
-   sectionHeaderInfo.setOtherProperties(servicesSpecificInfo);
-%>
-<jsp:include page="/uddi/forms/uddiObjects_table.jsp" flush="true"/>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("manageReferencedServicesAuthentication");
-%>
-<jsp:include page="/uddi/forms/authentication_table.jsp" flush="true"/>
-        <table border=0 cellpadding=2 cellspacing=0>
-          <tr>
-            <td height=30 valign="bottom" align="left" nowrap>
-              <input type="button" value="<%=uddiPerspective.getMessage("FORM_BUTTON_ADD_SERVICES")%>" onClick="processAddServices(this.form)" class="button">
-            </td>
-            <td height=30 valign="bottom" align="left" nowrap>
-              <input type="button" value="<%=uddiPerspective.getMessage("FORM_BUTTON_REMOVE_REFERENCES")%>" onClick="processRemoveReferences(this.form)" class="button">
-            </td>
-            <td nowrap width="90%">&nbsp;</td>
-          </tr>
-        </table>
-      </form>
-    </div>
-  </div>
-<script language="javascript">
-  setDefaults();
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/OpenPrivateRegistryForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/OpenPrivateRegistryForm.jsp
deleted file mode 100644
index ac44704f4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/OpenPrivateRegistryForm.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*,
-                                                        java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
-UDDIMainNode uddiMainNode = (UDDIMainNode)navigatorManager.getRootNode();
-OpenRegistryTool openRegistryTool = (OpenRegistryTool)(uddiMainNode.getCurrentToolManager().getSelectedTool());
-%>
-<script language="javascript">
-  function toInquiryURL()
-  {
-    var inputHost = document.getElementById("privateRegistryHost");
-    var inputPort = document.getElementById("privateRegistryPort");
-    var inputInquiryURL = document.getElementById("privateRegistryInquiryURL");
-    var inputPublishURL = document.getElementById("privateRegistryPublishURL");
-    inputInquiryURL.value = "http://" + inputHost.value + ":" + inputPort.value + "/uddisoap/inquiryapi";
-    inputPublishURL.value = "http://" + inputHost.value + ":" + inputPort.value + "/uddisoap/publishapi";
-  }
-</script>
-<form id="openPrivateRegistryForm" action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/OpenRegistryActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" onSubmit="return handleSubmit(this)" style="display:none;">
-  <input type="hidden" id="privateRegistryPublishURL" name="<%=UDDIActionInputs.PUBLISH_URL%>">
-  <input type="hidden" name="<%=UDDIActionInputs.UDDI_USERNAME%>" value="UNAUTHENTICATED">
-  <input type="hidden" name="<%=UDDIActionInputs.UDDI_PASSWORD%>" value="">
-  <table width="95%" border=0 cellpadding=3 cellspacing=0>
-    <tr>
-      <td class="labels" height=25 valign="bottom">
-        <label for="privateRegistryName"><%=uddiPerspective.getMessage("FORM_LABEL_REGISTRY_NAME")%></label>
-        <%
-        if (!openRegistryTool.isInputValid(UDDIActionInputs.REGISTRY_NAME))
-        {
-        %>
-          <%=HTMLUtils.redAsterisk()%>
-        <%
-        }
-        %>
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <input type="text" id="privateRegistryName" name="<%=UDDIActionInputs.REGISTRY_NAME%>" value="<%=uddiPerspective.getMessage("DEFAULT_REGISTRY_NAME_WEBSPHERE")%>" class="textenter">
-      </td>
-    </tr>
-    <tr>
-      <td class="labels" height=25 valign="bottom">
-        <label for="privateRegistryHost"><%=uddiPerspective.getMessage("FORM_LABEL_REGISTRY_HOST")%></label>
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <input type="text" id="privateRegistryHost" value="localhost" onkeyup="javascript:toInquiryURL()" onpaste="javascript:toInquiryURL()" class="textenter">
-      </td>
-    </tr>
-    <tr>
-      <td class="labels" height=25 valign="bottom">
-        <label for="privateRegistryPort"><%=uddiPerspective.getMessage("FORM_LABEL_REGISTRY_PORT")%></label>
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <input type="text" id="privateRegistryPort" value="9080" onkeyup="javascript:toInquiryURL()" onpaste="javascript:toInquiryURL()" class="textenter">
-      </td>
-    </tr>
-    <tr>
-      <td class="labels" height=30 valign="bottom">
-        <label for="privateRegistryInquiryURL"><%=uddiPerspective.getMessage("FORM_LABEL_INQUIRY_URL")%></label>
-        <%
-        if (!openRegistryTool.isInputValid(UDDIActionInputs.INQUIRY_URL))
-        {
-        %>
-          <%=HTMLUtils.redAsterisk()%>
-        <%
-        }
-        %>
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <input type="text" id="privateRegistryInquiryURL" name="<%=UDDIActionInputs.INQUIRY_URL%>" class="textenter">
-      </td>
-    </tr>
-    <tr>
-      <td class="labels" height=40 valign="bottom">
-        <input type="checkbox" id="privateRegistryCategories" name="<%=UDDIActionInputs.CHECK_USER_DEFINED_CATEGORIES%>"><label for="privateRegistryCategories"><%=uddiPerspective.getMessage("FORM_LABEL_CHECK_USER_DEFINED_CATEGORIES")%></label>
-      </td>
-    </tr>
-  </table>
-  <jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
-</form>
-<script language="javascript">
-  toInquiryURL();
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/OpenRegistryForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/OpenRegistryForm.jsp
deleted file mode 100644
index 471ea4946..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/OpenRegistryForm.jsp
+++ /dev/null
@@ -1,196 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*,
-                                                        java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
-UDDIMainNode uddiMainNode = (UDDIMainNode)navigatorManager.getRootNode();
-OpenRegistryTool openRegistryTool = (OpenRegistryTool)(uddiMainNode.getCurrentToolManager().getSelectedTool());
-Enumeration favoriteRegistryElements = openRegistryTool.getFavoriteRegistryElements();
-Vector favoriteRegistryList = new Vector();
-while (favoriteRegistryElements.hasMoreElements())
-  favoriteRegistryList.addElement(favoriteRegistryElements.nextElement());
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=uddiPerspective.getMessage("FORM_TITLE_OPEN_REGISTRY")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-  <jsp:include page="/scripts/formsubmit.jsp" flush="true"/>
-  <jsp:include page="/scripts/formutils.jsp" flush="true"/>
-  <script language="javascript">
-    function fillFavoriteInfo(favoriteRegistrySelect)
-    {
-      var selectedFavoriteRegistryIndex = favoriteRegistrySelect.selectedIndex-1;
-      if (selectedFavoriteRegistryIndex >= 0)
-      {
-        var form = document.getElementById("openRegistryForm");
-        switch (selectedFavoriteRegistryIndex)
-        {
-          <%
-          for (int i=0;i<favoriteRegistryList.size();i++)
-          {
-            FavoritesUDDIRegistryElement favRegElement = (FavoritesUDDIRegistryElement)favoriteRegistryList.elementAt(i);
-          %>
-            case <%=i%>:
-              form.<%=UDDIActionInputs.REGISTRY_NAME%>.value = "<%=HTMLUtils.JSMangle(favRegElement.getName())%>";
-              form.<%=UDDIActionInputs.INQUIRY_URL%>.value = "<%=HTMLUtils.JSMangle(favRegElement.getInquiryURL())%>";
-              break;
-          <%
-          }
-          %>
-        }
-      }
-    }
-
-    function setDefaults()
-    {
-      var form = document.getElementById("openRegistryForm");
-      form.<%=UDDIActionInputs.REGISTRY_NAME%>.value = "<%=HTMLUtils.JSMangle((String)openRegistryTool.getProperty(UDDIActionInputs.REGISTRY_NAME))%>";
-      form.<%=UDDIActionInputs.INQUIRY_URL%>.value = "<%=HTMLUtils.JSMangle((String)openRegistryTool.getProperty(UDDIActionInputs.INQUIRY_URL))%>";
-      showMainForm();
-    }
-
-    function showMainForm()
-    {
-      var loadScreenTable = document.getElementById("loadScreen");
-      if (loadScreenTable.rows.length > 0)
-        loadScreenTable.deleteRow(0);
-      document.getElementById("mainScreen").style.display = "";
-    }
-
-    function toggleRegistryType(isPrivateRegistry)
-    {
-      var openRegistryForm = document.getElementById("openRegistryForm");
-      var openPrivateRegistryForm = document.getElementById("openPrivateRegistryForm");
-      if (isPrivateRegistry)
-      {
-        openRegistryForm.style.display = "none";
-        openPrivateRegistryForm.style.display = "";
-      }
-      else
-      {
-        openRegistryForm.style.display = "";
-        openPrivateRegistryForm.style.display = "none";
-      }
-    }
-  </script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-  <div id="contentborder">
-    <table id="loadScreen">
-      <tr>
-        <td class="labels">
-          <%=controller.getMessage("MSG_LOAD_IN_PROGRESS")%>
-        </td>
-      </tr>
-    </table>
-    <div id="mainScreen" style="display:none;">
-      <%
-      String titleImagePath = "uddi/images/open_registry_highlighted.gif";
-      String title = uddiPerspective.getMessage("ALT_OPEN_REGISTRY");
-      %>
-      <%@ include file="/forms/formheader.inc" %>
-      <table>
-        <tr>
-          <td class="labels">
-            <%=uddiPerspective.getMessage("FORM_LABEL_OPEN_REGISTRY_DESC")%>
-          </td>
-        </tr>
-      </table>
-      <table width="95%" border=0 cellpadding=3 cellspacing=0>
-        <tr>
-          <td class="labels" height=40 valign="bottom">
-            <input type="checkbox" id="registryType" onClick="javascript:toggleRegistryType(this.checked)"><label for="registryType"><%=uddiPerspective.getMessage("FORM_LABEL_IS_WEBSPHERE_UDDI_REGISTRY")%></label>
-          </td>
-        </tr>
-      </table>
-      <form id="openRegistryForm" action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/OpenRegistryActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" onSubmit="return handleSubmit(this)">
-        <table width="95%" border=0 cellpadding=3 cellspacing=0>
-          <tr>
-            <td class="labels" valign="bottom" nowrap height=25>
-              <label for="favoriteRegistry"><%=uddiPerspective.getMessage("FORM_LABEL_FAVORITE_REGISTRY")%></label>
-            </td>
-          </tr>
-          <tr>
-            <td height=25 valign="bottom">
-              <select id="favoriteRegistry" onChange="fillFavoriteInfo(this)" class="selectlist">
-                <option value="" selected>
-                <%
-                for (int i=0;i<favoriteRegistryList.size();i++)
-                {
-                  FavoritesUDDIRegistryElement favRegElement = (FavoritesUDDIRegistryElement)favoriteRegistryList.elementAt(i);
-                %>
-                  <option value="<%=favRegElement.getName()%>"><%=favRegElement.getName()%>
-                <%
-                }
-                %>
-              </select>
-            </td>
-          </tr>
-          <tr>
-            <td class="labels" height=25 valign="bottom">
-              <label for="input_registry_name"><%=uddiPerspective.getMessage("FORM_LABEL_REGISTRY_NAME")%></label>
-              <%
-              if (!openRegistryTool.isInputValid(UDDIActionInputs.REGISTRY_NAME))
-              {
-              %>
-                <%=HTMLUtils.redAsterisk()%>
-              <%
-              }
-              %>
-            </td>
-          </tr>
-          <tr>
-            <td>
-              <input type="text" id="input_registry_name" name="<%=UDDIActionInputs.REGISTRY_NAME%>" class="textenter">
-            </td>
-          </tr>
-          <tr>
-            <td class="labels" height=30 valign="bottom">
-              <label for="input_inquiry_url"><%=uddiPerspective.getMessage("FORM_LABEL_INQUIRY_URL")%></label>
-              <%
-              if (!openRegistryTool.isInputValid(UDDIActionInputs.INQUIRY_URL))
-              {
-              %>
-                <%=HTMLUtils.redAsterisk()%>
-              <%
-              }
-              %>
-            </td>
-          </tr>
-          <tr>
-            <td>
-              <input type="text" id="input_inquiry_url" name="<%=UDDIActionInputs.INQUIRY_URL%>" class="textenter">
-            </td>
-          </tr>
-        </table>
-        <jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
-      </form>
-      <script language="javascript">
-        setDefaults();
-      </script>
-      <jsp:include page="/uddi/forms/OpenPrivateRegistryForm.jsp" flush="true"/>
-    </div>
-  </div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ProcessUDDIFramesetsForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ProcessUDDIFramesetsForm.jsp
deleted file mode 100644
index 2b3ede0eb..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ProcessUDDIFramesetsForm.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>   
-<jsp:useBean id="formAction" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="formFrameName" class="java.lang.StringBuffer" scope="request"/>
-<form action="<%=response.encodeURL(controller.getPathWithContext(formAction.toString()))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" style="margin-top:0;margin-bottom:0">
-  <input name="<%=ActionInputs.FRAME_NAME%>" type="hidden" value="<%=formFrameName%>">
-  <input name="<%=UDDIActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT%>" type="hidden" value="<%=uddiPerspective.getPerspectiveContentFramesetCols()%>">
-  <input name="<%=UDDIActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER%>" type="hidden" value="<%=uddiPerspective.getActionsContainerFramesetRows()%>">
-</form>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegDetailsForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegDetailsForm.jsp
deleted file mode 100644
index efaf642ba..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegDetailsForm.jsp
+++ /dev/null
@@ -1,263 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*,
-                                                        java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-   FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
-   NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
-   // The selected node must be a registry node.
-   Node registryNode = navigatorManager.getSelectedNode();
-   ToolManager currentToolManager = registryNode.getCurrentToolManager();
-   FormTool formTool = (FormTool)(currentToolManager.getSelectedTool());   
-   RegistryElement regElement = (RegistryElement)registryNode.getTreeElement();
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=uddiPerspective.getMessage("FORM_TITLE_REGISTRY_DETAILS")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<jsp:include page="/scripts/formsubmit.jsp" flush="true"/>
-<jsp:include page="/uddi/scripts/detailstables.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/resumeproxyloadpage.js"))%>">
-</script>
-<script language="javascript">
-  function setDefaults()
-  {
-    var registryDetailsNameTable = getTable("registryDetailsName");
-<%
-   String name = regElement.getName();
-   boolean isError = !formTool.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_REGISTRY_NAME);   
-%>
-    addDetailsSingleItemRow("registryDetailsName",false);
-    setDetailsNameSingleItemRow("registryDetailsName","<%=HTMLUtils.JSMangle(name)%>");
-<%
-   if (isError)
-   {
-%>
-    highlightErrantRow(registryDetailsNameTable.rows[numberOfHeaderRows],"errantRow");
-<%
-   }
-   
-   Enumeration userDefinedCategories = regElement.getUserDefinedCategories();
-   boolean containsUserDefinedCategories;
-   if (userDefinedCategories != null && userDefinedCategories.hasMoreElements())
-   {
-%>
-    var registryCategoriesTable = getTable("registryUserDefinedCategories");
-<%   
-     containsUserDefinedCategories = true;
-     ArrayList userDefinedCategoriesList = new ArrayList();
-     do
-     {
-       userDefinedCategoriesList.add(userDefinedCategories.nextElement());
-     } while (userDefinedCategories.hasMoreElements());
-     CategoryModel[] userDefinedCategoriesArray = new CategoryModel[userDefinedCategoriesList.size()];
-     userDefinedCategoriesList.toArray(userDefinedCategoriesArray);
-     QuickSort.sort(userDefinedCategoriesArray,0,userDefinedCategoriesArray.length-1);
-     StringBuffer fileName = new StringBuffer();
-     for (int i=0;i<userDefinedCategoriesArray.length;i++)
-     {
-       name = userDefinedCategoriesArray[i].getDisplayName();
-       String tModelKey = userDefinedCategoriesArray[i].getTModelKey();
-       boolean checked = userDefinedCategoriesArray[i].isChecked();
-       fileName.setLength(0);
-       if (userDefinedCategoriesArray[i].isDataLoaded())
-         fileName.append(userDefinedCategoriesArray[i].getCategoryKey()).append(".txt");
-       else
-         fileName.append(controller.getMessage("TABLE_BLANK_PLACEHOLDER"));
-       boolean hasError = !formTool.isRowInputValid(UDDIActionInputs.USER_DEFINED_CATEGORIES,tModelKey);
-%>
-    addDetailsUserDefinedCategoryRow("registryUserDefinedCategories","<%=tModelKey%>","<%=HTMLUtils.JSMangle(name)%>",<%=checked%>,"<%=HTMLUtils.JSMangle(fileName.toString())%>",<%=hasError%>);
-<%
-       if (hasError)
-       {
-%>
-    highlightErrantRow(registryCategoriesTable.rows[numberOfHeaderRows+<%=i%>],"errantRow");
-<%       
-       }
-     }
-   }
-   else
-     containsUserDefinedCategories = false;   
-%>       
-    showMainForm();
-  }
-  
-  function showMainForm()
-  {
-    var loadScreenTable = document.getElementById("loadScreen");
-    if (loadScreenTable.rows.length > 0)
-      loadScreenTable.deleteRow(0);
-    document.getElementById("mainScreen").style.display = "";
-  }
-  
-  function processForm(form)
-  {
-    if (handleSubmit(form))
-    {
-      processDetailsSingleItemTable("registryDetailsName","<%=UDDIActionInputs.NAME_MODIFIED%>","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_REGISTRY_NAME%>",form);
-      return true;
-    }
-    return false;
-  }
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-  <div id="contentborder">
-    <form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/UpdateRegistryActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" onSubmit="return processForm(this)">
-      <table id="loadScreen">
-        <tr>
-          <td class="labels">
-            <%=controller.getMessage("MSG_LOAD_IN_PROGRESS")%>
-          </td>
-        </tr>
-      </table>
-      <div id="mainScreen" style="display:none;">
-<%
-   String titleImagePath = "images/details_highlighted.gif";
-   String title = uddiPerspective.getMessage("ALT_REGISTRY_DETAILS");
-%>
-<%@ include file="/forms/formheader.inc" %>
-        <table>
-          <tr>
-            <td class="labels">
-              <%=uddiPerspective.getMessage("FORM_LABEL_DETAILS_EDITABLE",registryNode.getNodeName())%>
-            </td>
-          </tr>
-        </table>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("registryDetailsName");
-   sectionHeaderInfo.setOtherProperties(uddiPerspective.getMessage("FORM_LABEL_REGISTRY_NAME"));
-%>
-<jsp:include page="/uddi/forms/detailsSingleItem_table.jsp" flush="true"/>
-        <table>
-          <tr>
-            <td height=20>&nbsp;</td>
-          </tr>
-        </table>
-        <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
-          <tr>
-            <th class="singleheadercolor" height=20 valign="bottom">
-              <%=uddiPerspective.getMessage("FORM_LABEL_INQUIRY_URL")%>
-            </th>
-          </tr>
-          <tr>
-            <td class="tablecells">
-              <%=regElement.getInquiryURL()%>
-            </td>
-          </tr>
-        </table>
-<%
-   String publishURL = regElement.getPublishURL();
-   if (Validator.validateURL(publishURL))
-   {
-%>
-        <table>
-          <tr>
-            <td height=20>&nbsp;</td>
-          </tr>
-        </table>
-        <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
-          <tr>
-            <th class="singleheadercolor" height=20 valign="bottom">
-              <%=uddiPerspective.getMessage("FORM_LABEL_PUBLISH_URL")%>
-            </th>
-          </tr>
-          <tr>
-            <td class="tablecells">
-              <%=regElement.getPublishURL()%>
-            </td>
-          </tr>
-        </table>
-<%
-   }
-   
-   if (containsUserDefinedCategories)
-   {
-     sectionHeaderInfo.clear();
-     sectionHeaderInfo.setContainerId("registryUserDefinedCategories");
-%>
-<jsp:include page="/uddi/forms/ud_categories_table.jsp" flush="true"/>
-<%
-   }
-   if (regElement.isLoggedIn())
-   {
-%>
-        <table>
-          <tr>
-            <td height=20>&nbsp;</td>
-          </tr>
-        </table>
-        <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
-          <tr>
-            <th class="singleheadercolor" height=20 valign="bottom">
-              <%=uddiPerspective.getMessage("FORM_LABEL_USERID")%>
-            </th>
-          </tr>
-          <tr>
-            <td class="tablecells">
-              <%=regElement.getUserId()%>
-            </td>
-          </tr>
-        </table>
-<%
-   }
-   
-   String registrationURL = regElement.getRegistrationURL();
-   if (Validator.validateURL(registrationURL))
-   {
-%>
-        <table>
-          <tr>
-            <td height=20>&nbsp;</td>
-          </tr>
-        </table>
-        <table>
-          <tr>
-            <td align="left">
-              <%=favPerspective.getMessage("FORM_LABEL_REGISTRY_URL",registrationURL)%>
-            </td>
-          </tr>
-        </table>
-<%
-   }
-%>
-<jsp:useBean id="currentToolManagerHash" class="java.util.Hashtable" scope="request">
-<%
-  currentToolManagerHash.put(ActionInputs.CURRENT_TOOL_MANAGER,currentToolManager);
-%>
-</jsp:useBean>
-<jsp:include page="/forms/otherActions.jsp" flush="true"/>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
-      </div>      
-    </form>
-  </div>
-<script language="javascript">
-  setDefaults();
-  resumeProxyLoadPage();  
-</script>    
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindBusinessesAdvancedForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindBusinessesAdvancedForm.jsp
deleted file mode 100644
index a907d0f14..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindBusinessesAdvancedForm.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<jsp:useBean id="subQueryKeyProperty" class="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.SubQueryKeyProperty" scope="request"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<div id="findBusinessesAdvanced">
-  <form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/RegFindBusinessesAdvancedActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" onSubmit="return processFindBusinessesAdvancedForm(this)">
-    <input type="hidden" name="<%=UDDIActionInputs.SUBQUERY_KEY%>">
-    <input type="hidden" name="<%=UDDIActionInputs.SUBQUERY_GET%>">
-    <input type="hidden" name="<%=UDDIActionInputs.NEW_SUBQUERY_INITIATED%>">
-    <input type="hidden" name="<%=UDDIActionInputs.NEW_SUBQUERY_QUERY_ITEM%>">
-    <input type="hidden" name="<%=UDDIActionInputs.QUERY_NAME%>">
-    <table width="90%" border=0 cellpadding=3 cellspacing=0>
-      <tr>
-        <td class="labels" height=20 valign="bottom">
-          <%=uddiPerspective.getMessage("FORM_LABEL_FIND_ADVANCED_DESC")%>
-        </td>
-      </tr>
-    </table>
-    <table width="95%" border=0 cellpadding=3 cellspacing=0>
-      <tr>
-        <td height=35 valign="bottom">
-          <input type="checkbox" id="input_find_businesses_advance_owned" name="<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_OWNED%>" onClick="toggleAdvancedAuthenticationSection(<%=UDDIActionInputs.QUERY_ITEM_BUSINESSES%>,this.checked)">
-          <label for="input_find_businesses_advance_owned"><%=uddiPerspective.getMessage("FORM_LABEL_OWNED")%></label>
-        </td>
-      </tr>
-    </table>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("findBusinessesAdvancedAuthentication");
-%>
-<jsp:include page="/uddi/forms/authentication_table.jsp" flush="true"/>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("findBusinessesAdvancedNames");
-   String[] nameSpecificInfo = {"FORM_LABEL_NAMES","FORM_LABEL_NAME",Boolean.FALSE.toString()};
-   sectionHeaderInfo.setOtherProperties(nameSpecificInfo);
-%>
-<jsp:include page="/uddi/forms/languageInput_table.jsp" flush="true"/>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("findBusinessesAdvancedIdentifiers");
-%>
-<jsp:include page="/uddi/forms/identifiers_table.jsp" flush="true"/>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("findBusinessesAdvancedCategories");
-%>
-<jsp:include page="/uddi/forms/categories_table.jsp" flush="true"/>
-<%
-   String[] siSpecificInfo = {"FORM_LABEL_SERVICE_INTERFACES",Boolean.FALSE.toString(),String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES),"findBusinessesAdvanced",UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_SERVICE_INTERFACES};
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("findBusinessesAdvancedServiceInterfaces");
-   sectionHeaderInfo.setOtherProperties(siSpecificInfo);
-%>
-<jsp:include page="/uddi/forms/uddiObjects_table.jsp" flush="true"/>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("findBusinessesAdvancedDiscoveryURLs");
-   sectionHeaderInfo.setOtherProperties(new Boolean(false));
-%>
-<jsp:include page="/uddi/forms/discoveryURLs_table.jsp" flush="true"/>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("findBusinessesAdvancedFindQualifiers");
-%>
-<jsp:include page="/uddi/forms/findQualifiers_table.jsp" flush="true"/>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("findBusinessesAdvancedCommon");
-%>
-<jsp:include page="/uddi/forms/advancedCommon_table.jsp" flush="true"/>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
-  </form>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindBusinessesForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindBusinessesForm.jsp
deleted file mode 100644
index f9148349a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindBusinessesForm.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<div id="findBusinesses" style="display:none;">
-  <form name="findBusinessesStyle">
-    <table width="95%" border=0 cellpadding=3 cellspacing=0>
-      <tr>
-        <td class="labels">
-          <%=uddiPerspective.getMessage("FORM_LABEL_SEARCH_TYPE")%>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input type="radio" id="radio_find_business_simple" class="radio" name="<%=UDDIActionInputs.QUERY_STYLE_BUSINESSES%>" onClick="showFindForm(<%=UDDIActionInputs.QUERY_ITEM_BUSINESSES%>,<%=UDDIActionInputs.QUERY_STYLE_SIMPLE%>)"><label for="radio_find_business_simple"><%=uddiPerspective.getMessage("FORM_RADIO_SIMPLE")%></label>
-          <input type="radio" id="radio_find_business_advance" class="radio" name="<%=UDDIActionInputs.QUERY_STYLE_BUSINESSES%>" onClick="showFindForm(<%=UDDIActionInputs.QUERY_ITEM_BUSINESSES%>,<%=UDDIActionInputs.QUERY_STYLE_ADVANCED%>)"><label for="radio_find_business_advance"><%=uddiPerspective.getMessage("FORM_RADIO_ADVANCED")%></label>
-          <input type="radio" id="radio_find_business_uuid" class="radio" name="<%=UDDIActionInputs.QUERY_STYLE_BUSINESSES%>" onClick="showFindForm(<%=UDDIActionInputs.QUERY_ITEM_BUSINESSES%>,<%=UDDIActionInputs.QUERY_STYLE_UUID%>)"><label for="radio_find_business_uuid"><%=uddiPerspective.getMessage("FORM_RADIO_UUID")%></label>
-        </td>
-      </tr>
-    </table>
-  </form>
-<jsp:include page="/uddi/forms/RegFindBusinessesSimpleForm.jsp" flush="true"/>
-<jsp:include page="/uddi/forms/RegFindBusinessesAdvancedForm.jsp" flush="true"/>
-<%
-   sectionHeaderInfo.setContainerId("findBusinessUUID");
-   String[] otherProperties = {"uddi/actions/RegFindBusinessUUIDActionJSP.jsp",UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY,"FORM_LABEL_FIND_BUSINESS_UUID_DESC"};
-   sectionHeaderInfo.setOtherProperties(otherProperties);
-%>
-<jsp:include page="/uddi/forms/RegFindUUIDForm.jsp" flush="true"/>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindBusinessesSimpleForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindBusinessesSimpleForm.jsp
deleted file mode 100644
index 2c7e34ad3..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindBusinessesSimpleForm.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="subQueryKeyProperty" class="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.SubQueryKeyProperty" scope="request"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-   NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
-   // selectedNode could be the registry or query nodes.
-   Node selectedNode = navigatorManager.getSelectedNode();
-   FormTool formTool = (FormTool)(selectedNode.getCurrentToolManager().getSelectedTool());
-   FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKeyProperty.getSubQueryKey());
-%>
-<div id="findBusinessesSimple" style="display:none;">
-  <form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/RegFindBusinessesSimpleActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" onSubmit="return processForm(this)">
-    <input type="hidden" name="<%=UDDIActionInputs.SUBQUERY_KEY%>">
-    <input type="hidden" name="<%=UDDIActionInputs.QUERY_NAME%>">
-    <table width="95%" border=0 cellpadding=3 cellspacing=0>
-      <tr>
-        <td class="labels" height=10 valign="bottom">
-          <%=uddiPerspective.getMessage("FORM_LABEL_FIND_BUSINESSES_SIMPLE_DESC")%>
-        </td>
-      </tr>
-      <tr>
-        <td class="labels" height=30 valign="bottom">
-          <label for="input_find_businesses_simple_name"><%=uddiPerspective.getMessage("FORM_LABEL_NAME")%></label>
-<%
-   if (!formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_NAME))
-   {
-%>
-          <%=HTMLUtils.redAsterisk()%>
-<%
-   }
-%>
-        </td>
-      </tr>
-      <tr>
-        <td> <input type="text" id="input_find_businesses_simple_name" name="<%=UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_NAME%>" class="textenter"> </td>
-      </tr>
-    </table>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
-  </form>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindForm.jsp
deleted file mode 100644
index cf1523aba..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindForm.jsp
+++ /dev/null
@@ -1,705 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*,
-                                                        org.uddi4j.datatype.*,
-                                                        org.uddi4j.datatype.business.*,
-                                                        org.uddi4j.datatype.service.*,
-                                                        org.uddi4j.datatype.tmodel.*,
-                                                        org.uddi4j.util.*,
-                                                        java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-   NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
-   // selectedNode could be the registry or query nodes.
-   Node selectedNode = navigatorManager.getSelectedNode();
-   FormTool formTool = (FormTool)(selectedNode.getCurrentToolManager().getSelectedTool());
-%>
-<jsp:useBean id="subQueryKeyProperty" class="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.SubQueryKeyProperty" scope="request">
-<%
-   String subQueryKey = (String)formTool.getProperty(UDDIActionInputs.SUBQUERY_KEY);
-   subQueryKeyProperty.setSubQueryKey(subQueryKey);
-%>
-</jsp:useBean>
-<%
-   FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKeyProperty.getSubQueryKey());
-   UDDIMainNode uddiMainNode = (UDDIMainNode)navigatorManager.getRootNode();
-   Node regNode = uddiMainNode.getRegistryNode(selectedNode);
-   RegistryElement regElement = (RegistryElement)regNode.getTreeElement();
-%>
-
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=uddiPerspective.getMessage("FORM_TITLE_REGISTRY_FIND")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/scripts/formsubmit.jsp" flush="true"/>
-<jsp:include page="/scripts/tables.jsp" flush="true"/>
-<jsp:include page="/uddi/scripts/udditables.jsp" flush="true"/>
-<script language="javascript">
-  var sectionIds = ["findBusinesses","findServices","findServiceInterfaces"];
-  var findBusinessesSectionIds = ["findBusinessesSimple","findBusinessesAdvanced","findBusinessUUID"];
-  var findServicesSectionIds = ["findServicesSimple","findServicesAdvanced","findServiceUUID"];
-  var findServiceInterfacesSectionIds = ["findServiceInterfacesSimple","findServiceInterfacesAdvanced","findServiceInterfaceUUID"];
-  var styleForms = ["findBusinessesStyle","findServicesStyle","findServiceInterfacesStyle"];
-  var authenticationSectionIds = ["findBusinessesAdvancedAuthentication","findServicesAdvancedAuthentication","findServiceInterfacesAdvancedAuthentication"];
-
-  function validateQueryName()
-  {
-<%
-   String subQueryKeyValue = subQueryKeyProperty.getSubQueryKey();
-   boolean isSubQuery = (subQueryKeyValue != null && subQueryKeyValue.length() > 0);
-%>   
-    if (<%=isSubQuery%>)
-    {
-      // Subqueries must have a name which is different from that of the current query or the closest query enclosing this object.
-<%
-   String currentQueryName = "";
-   if (selectedNode instanceof QueryNode)
-     currentQueryName = selectedNode.getNodeName();
-   else if (selectedNode instanceof BusinessNode)
-   {
-     Node parentNode = selectedNode.getParent();
-     if (parentNode instanceof QueryNode)
-       currentQueryName = parentNode.getNodeName();
-   }
-%>    
-      var queryName = document.getElementById("queryName").value;
-      if (queryName == "<%=HTMLUtils.JSMangle(currentQueryName)%>")
-      {
-        alert("<%=uddiPerspective.getMessage("MSG_ERROR_QUERY_NAME_CONFLICT")%>");
-        return false;
-      }
-    }
-    return true;
-  }
-  
-  function processForm(form)
-  {
-    if (!handleSubmit(form))
-      return false;
-    if (!validateQueryName())
-      return false;
-    form.<%=UDDIActionInputs.SUBQUERY_KEY%>.value = "<%=subQueryKeyProperty.getSubQueryKey()%>";
-    form.<%=UDDIActionInputs.QUERY_NAME%>.value = document.getElementById("queryName").value;
-    return true;
-  }
-
-  function processFindBusinessesAdvancedForm(form)
-  {
-    if (processForm(form))
-    {
-      processLanguageInputTable("findBusinessesAdvancedNames","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME_LANGUAGE%>","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME%>",form);
-      processNameFindQualifiers("findBusinessesAdvancedNames",form);
-      processIdentifierTable("findBusinessesAdvancedIdentifiers",form);
-      processCategoryTable("findBusinessesAdvancedCategories",form,true);
-      processResultTable("findBusinessesAdvancedServiceInterfaces","<%=UDDIActionInputs.NODEID_SERVICE_INTERFACE%>",form,false);
-      processDiscoveryURLTable("findBusinessesAdvancedDiscoveryURLs",form);
-      processFindQualifierTable("findBusinessesAdvancedFindQualifiers",form);
-      return true;
-    }
-    return false;
-  }
-
-  function processFindServicesAdvancedForm(form)
-  {
-    if (processForm(form))
-    {
-      processResultTable("findServicesAdvancedBusiness","<%=UDDIActionInputs.NODEID_BUSINESS%>",form,false);
-      processLanguageInputTable("findServicesAdvancedNames","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME_LANGUAGE%>","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME%>",form);
-      processNameFindQualifiers("findServicesAdvancedNames",form);
-      processCategoryTable("findServicesAdvancedCategories",form,false);
-      processResultTable("findServicesAdvancedServiceInterfaces","<%=UDDIActionInputs.NODEID_SERVICE_INTERFACE%>",form,false);
-      processFindQualifierTable("findServicesAdvancedFindQualifiers",form);
-      return true;
-    }
-    return false;
-  }
-
-  function processFindServiceInterfacesAdvancedForm(form)
-  {
-    if (processForm(form))
-    {
-      processResultTable("findServiceInterfacesAdvancedService","<%=UDDIActionInputs.NODEID_SERVICE%>",form,false);
-      processNameFindQualifiers("findServiceInterfacesAdvancedName",form);
-      processIdentifierTable("findServiceInterfacesAdvancedIdentifiers",form);
-      processCategoryTable("findServiceInterfacesAdvancedCategories",form,false);
-      processFindQualifierTable("findServiceInterfacesAdvancedFindQualifiers",form);
-      return true;
-    }
-    return false;
-  }
-
-  function setDefaults()
-  {
-    // Set the query name
-    document.getElementById("queryName").value = "<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_NAME))%>";
-    var searchFor = document.getElementById("searchFor");
-    searchFor.selectedIndex = <%=formToolPI.getProperty(UDDIActionInputs.QUERY_ITEM)%>;
-    setDefaultsForFindBusinessesForms();
-    setDefaultsForFindServicesForms();
-    setDefaultsForFindServiceInterfacesForms();
-    showMainForm(searchFor.value);
-  }
-
-  function setAuthenticationSectionDefaults(advancedForm,queryItemIndex,isOwnedChecked)
-  {
-<%
-   String publishURL = (String)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-   String userId = (String)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-   String password = (String)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-%>
-    advancedForm.<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_OWNED%>.checked = isOwnedChecked;
-    advancedForm.<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL%>.value = "<%=HTMLUtils.JSMangle(publishURL)%>";
-    advancedForm.<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID%>.value = "<%=HTMLUtils.JSMangle(userId)%>";
-    advancedForm.<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD%>.value = "<%=HTMLUtils.JSMangle(password)%>";
-    toggleAdvancedAuthenticationSection(queryItemIndex,isOwnedChecked);
-  }
-
-  function setAdvancedCommonSectionDefaults(form,maxSearchSet,maxResults)
-  {
-    form.<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_MAX_SEARCH_SET%>.value = maxSearchSet;
-    form.<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_MAX_RESULTS%>.value = maxResults;
-  }
-
-  function setDefaultsForFindBusinessesForms()
-  {
-    // Initialize the findBusinesses form.
-<%
-   String findBusinessesStyleIndex = (String)formToolPI.getProperty(UDDIActionInputs.QUERY_STYLE_BUSINESSES);
-%>
-    document.forms[styleForms[<%=UDDIActionInputs.QUERY_ITEM_BUSINESSES%>]].<%=UDDIActionInputs.QUERY_STYLE_BUSINESSES%>[<%=findBusinessesStyleIndex%>].checked = true;
-    var findBusinessesSimpleSection = document.getElementById(findBusinessesSectionIds[<%=UDDIActionInputs.QUERY_STYLE_SIMPLE%>]);
-    var findBusinessesSimpleForm = findBusinessesSimpleSection.getElementsByTagName("form").item(0);
-    findBusinessesSimpleForm.<%=UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_NAME%>.value = "<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_NAME))%>";
-
-    // Advanced form details.
-    var findBusinessesAdvancedSection = document.getElementById(findBusinessesSectionIds[<%=UDDIActionInputs.QUERY_STYLE_ADVANCED%>]);
-    var findBusinessesAdvancedForm = findBusinessesAdvancedSection.getElementsByTagName("form").item(0);
-    var isOwnedChecked = <%=(formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_OWNED) != null)%>;
-    setAuthenticationSectionDefaults(findBusinessesAdvancedForm,<%=UDDIActionInputs.QUERY_ITEM_BUSINESSES%>,isOwnedChecked);
-<%
-   Vector busNameVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES);
-   if (busNameVector != null)
-   {
-     for (int i=0;i<busNameVector.size();i++)
-     {
-       Name name = (Name)busNameVector.elementAt(i);
-%>
-    addLanguageInputRow("findBusinessesAdvancedNames","<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_CONTROL_TITLE_NAME_TEXT_VALUE"))%>");
-    setLanguageInputRowSettings("findBusinessesAdvancedNames",<%=i%>,"<%=HTMLUtils.JSMangle(name.getLang())%>","<%=HTMLUtils.JSMangle(name.getText())%>");
-<%
-     }
-   }
-
-   IdentifierBag busIdBag = (IdentifierBag)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS);
-   if (busIdBag != null)
-   {
-     Vector keyedReferenceVector = busIdBag.getKeyedReferenceVector();
-     for (int i=0;i<keyedReferenceVector.size();i++)
-     {
-       KeyedReference kr = (KeyedReference)keyedReferenceVector.elementAt(i);
-%>
-    addIdentifierRow("findBusinessesAdvancedIdentifiers");
-    setIdentifierRowSettings("findBusinessesAdvancedIdentifiers",<%=i%>,"<%=HTMLUtils.JSMangle(kr.getTModelKey())%>","<%=HTMLUtils.JSMangle(kr.getKeyName())%>","<%=HTMLUtils.JSMangle(kr.getKeyValue())%>");
-<%
-     }
-   }
-
-   CategoryBag busCatBag = (CategoryBag)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES);
-   if (busCatBag != null)
-   {
-     Vector keyedReferenceVector = busCatBag.getKeyedReferenceVector();
-     for (int i=0;i<keyedReferenceVector.size();i++)
-     {
-       KeyedReference kr = (KeyedReference)keyedReferenceVector.elementAt(i);
-%>
-    addCategoryRow("findBusinessesAdvancedCategories");
-    setCategoryRowSettings("findBusinessesAdvancedCategories",<%=i%>,"<%=HTMLUtils.JSMangle(kr.getTModelKey())%>","<%=HTMLUtils.JSMangle(kr.getKeyName())%>","<%=HTMLUtils.JSMangle(kr.getKeyValue())%>");
-<%
-     }
-   }
-
-   Vector busServiceInterfaces = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_SERVICE_INTERFACES);
-   Vector busServiceInterfacesCopy = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_SERVICE_INTERFACES_COPY);
-   if (busServiceInterfaces != null)
-   {
-     if (busServiceInterfacesCopy == null)
-       busServiceInterfacesCopy = new Vector();
-     else
-       busServiceInterfacesCopy.removeAllElements();
-     for (int i=0;i<busServiceInterfaces.size();i++)
-     {
-       ListElement listElement = (ListElement)busServiceInterfaces.elementAt(i);
-       int targetNodeId = listElement.getTargetNodeId();
-       int targetToolId = listElement.getTargetToolId();
-       int targetViewId = listElement.getTargetViewId();
-       String url = SelectSubQueryItemAction.getActionLink(targetNodeId,targetToolId,targetViewId,subQueryKeyProperty.getSubQueryKey(),UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_SERVICE_INTERFACES,i,UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES,false);
-       TModel tModel = (TModel)listElement.getObject();
-       busServiceInterfacesCopy.addElement(busServiceInterfaces.elementAt(i));
-%>
-    addResultRow("findBusinessesAdvancedServiceInterfaces",<%=targetNodeId%>,"<%=response.encodeURL(controller.getPathWithContext(url))%>","<%=HTMLUtils.JSMangle(tModel.getNameString())%>","<%=HTMLUtils.JSMangle(tModel.getDefaultDescriptionString())%>");
-<%
-     }
-     formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_SERVICE_INTERFACES_COPY,busServiceInterfacesCopy);
-   }
-   else
-   {
-     busServiceInterfaces = new Vector();
-     busServiceInterfacesCopy = new Vector();
-     formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_SERVICE_INTERFACES,busServiceInterfaces);
-     formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_SERVICE_INTERFACES_COPY,busServiceInterfacesCopy);
-   }
-
-   DiscoveryURLs busDiscoveryURLs = (DiscoveryURLs)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS);
-   if (busDiscoveryURLs != null)
-   {
-     Vector discoveryURLVector = busDiscoveryURLs.getDiscoveryURLVector();
-     for (int i=0;i<discoveryURLVector.size();i++)
-     {
-       DiscoveryURL discoveryURL = (DiscoveryURL)discoveryURLVector.elementAt(i);
-%>
-    addDiscoveryURLRow("findBusinessesAdvancedDiscoveryURLs");
-    setDiscoveryURLRowSettings("findBusinessesAdvancedDiscoveryURLs",<%=i%>,"<%=HTMLUtils.JSMangle(discoveryURL.getText())%>");
-<%
-     }
-   }
-
-   FindQualifiers busFindQualifiers = (FindQualifiers)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_FINDQUALIFIERS);
-   if (busFindQualifiers != null)
-   {
-     Vector findQualifierVector = busFindQualifiers.getFindQualifierVector();
-     for (int i=0;i<findQualifierVector.size();i++)
-     {
-       FindQualifier findQualifier = (FindQualifier)findQualifierVector.elementAt(i);
-%>
-    setFindQualifier("<%=HTMLUtils.JSMangle(findQualifier.getText())%>","findBusinessesAdvancedNames","findBusinessesAdvancedCategories","findBusinessesAdvancedFindQualifiers");
-<%
-     }
-   }
-%>
-    setAdvancedCommonSectionDefaults(findBusinessesAdvancedForm,"<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_MAX_SEARCH_SET))%>","<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_MAX_RESULTS))%>");
-
-    // UUID form details.
-    var findBusinessesUUIDSection = document.getElementById(findBusinessesSectionIds[<%=UDDIActionInputs.QUERY_STYLE_UUID%>]);
-    var findBusinessesUUIDForm = findBusinessesUUIDSection.getElementsByTagName("form").item(0);
-    findBusinessesUUIDForm.<%=UDDIActionInputs.QUERY_INPUT_UUID_KEY%>.value = "<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY))%>";
-
-    showFindForm(<%=UDDIActionInputs.QUERY_ITEM_BUSINESSES%>,<%=findBusinessesStyleIndex%>);
-  }
-
-  function setDefaultsForFindServicesForms()
-  {
-    // Initialize the findServices form.
-<%
-   String findServicesStyleIndex = (String)formToolPI.getProperty(UDDIActionInputs.QUERY_STYLE_SERVICES);
-%>
-    document.forms[styleForms[<%=UDDIActionInputs.QUERY_ITEM_SERVICES%>]].<%=UDDIActionInputs.QUERY_STYLE_SERVICES%>[<%=findServicesStyleIndex%>].checked = true;
-    var findServicesSimpleSection = document.getElementById(findServicesSectionIds[<%=UDDIActionInputs.QUERY_STYLE_SIMPLE%>]);
-    var findServicesSimpleForm = findServicesSimpleSection.getElementsByTagName("form").item(0);
-    findServicesSimpleForm.<%=UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME%>.value = "<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME))%>";
-
-    // Advanced form details.
-    var findServicesAdvancedSection = document.getElementById(findServicesSectionIds[<%=UDDIActionInputs.QUERY_STYLE_ADVANCED%>]);
-    var findServicesAdvancedForm = findServicesAdvancedSection.getElementsByTagName("form").item(0);
-    var isOwnedChecked = <%=(formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_OWNED) != null)%>;
-    setAuthenticationSectionDefaults(findServicesAdvancedForm,<%=UDDIActionInputs.QUERY_ITEM_SERVICES%>,isOwnedChecked);
-<%
-   Vector serviceBusiness = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS);
-   Vector serviceBusinessCopy = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS_COPY);
-   if (serviceBusiness != null)
-   {
-     if (serviceBusinessCopy == null)
-       serviceBusinessCopy = new Vector();
-     else
-       serviceBusinessCopy.removeAllElements();
-     for (int i=0;i<serviceBusiness.size();i++)
-     {
-       ListElement listElement = (ListElement)serviceBusiness.elementAt(i);
-       int targetNodeId = listElement.getTargetNodeId();
-       int targetToolId = listElement.getTargetToolId();
-       int targetViewId = listElement.getTargetViewId();
-       String url = SelectSubQueryItemAction.getActionLink(targetNodeId,targetToolId,targetViewId,subQueryKeyProperty.getSubQueryKey(),UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS,i,UDDIActionInputs.QUERY_ITEM_BUSINESSES,false);
-       BusinessEntity be = (BusinessEntity)listElement.getObject();
-       serviceBusinessCopy.addElement(serviceBusiness.elementAt(i));
-%>
-    addResultRow("findServicesAdvancedBusiness",<%=targetNodeId%>,"<%=response.encodeURL(controller.getPathWithContext(url))%>","<%=HTMLUtils.JSMangle(be.getDefaultNameString())%>","<%=HTMLUtils.JSMangle(be.getDefaultDescriptionString())%>");
-<%
-     }
-     formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS_COPY,serviceBusinessCopy);
-   }
-   else
-   {
-     serviceBusiness = new Vector();
-     serviceBusinessCopy = new Vector();
-     formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS,serviceBusiness);
-     formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS_COPY,serviceBusinessCopy);
-   }
-
-   Vector serviceNameVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES);
-   if (serviceNameVector != null)
-   {
-     for (int i=0;i<serviceNameVector.size();i++)
-     {
-       Name name = (Name)serviceNameVector.elementAt(i);
-%>
-    addLanguageInputRow("findServicesAdvancedNames","<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_CONTROL_TITLE_NAME_TEXT_VALUE"))%>");
-    setLanguageInputRowSettings("findServicesAdvancedNames",<%=i%>,"<%=HTMLUtils.JSMangle(name.getLang())%>","<%=HTMLUtils.JSMangle(name.getText())%>");
-<%
-     }
-   }
-
-   CategoryBag serviceCatBag = (CategoryBag)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES);
-   if (serviceCatBag != null)
-   {
-     Vector keyedReferenceVector = serviceCatBag.getKeyedReferenceVector();
-     for (int i=0;i<keyedReferenceVector.size();i++)
-     {
-       KeyedReference kr = (KeyedReference)keyedReferenceVector.elementAt(i);
-%>
-    addCategoryRow("findServicesAdvancedCategories");
-    setCategoryRowSettings("findServicesAdvancedCategories",<%=i%>,"<%=HTMLUtils.JSMangle(kr.getTModelKey())%>","<%=HTMLUtils.JSMangle(kr.getKeyName())%>","<%=HTMLUtils.JSMangle(kr.getKeyValue())%>");
-<%
-     }
-   }
-
-   Vector serviceServiceInterfaces = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES);
-   Vector serviceServiceInterfacesCopy = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES_COPY);
-   if (serviceServiceInterfaces != null)
-   {
-     if (serviceServiceInterfacesCopy == null)
-       serviceServiceInterfacesCopy = new Vector();
-     else
-       serviceServiceInterfacesCopy.removeAllElements();
-     for (int i=0;i<serviceServiceInterfaces.size();i++)
-     {
-       ListElement listElement = (ListElement)serviceServiceInterfaces.elementAt(i);
-       int targetNodeId = listElement.getTargetNodeId();
-       int targetToolId = listElement.getTargetToolId();
-       int targetViewId = listElement.getTargetViewId();
-       String url = SelectSubQueryItemAction.getActionLink(targetNodeId,targetToolId,targetViewId,subQueryKeyProperty.getSubQueryKey(),UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES,i,UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES,false);
-       TModel tModel = (TModel)listElement.getObject();
-       serviceServiceInterfacesCopy.addElement(serviceServiceInterfaces.elementAt(i));
-%>
-    addResultRow("findServicesAdvancedServiceInterfaces",<%=targetNodeId%>,"<%=response.encodeURL(controller.getPathWithContext(url))%>","<%=HTMLUtils.JSMangle(tModel.getNameString())%>","<%=HTMLUtils.JSMangle(tModel.getDefaultDescriptionString())%>");
-<%
-     }
-     formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES_COPY,serviceServiceInterfacesCopy);
-   }
-   else
-   {
-     serviceServiceInterfaces = new Vector();
-     serviceServiceInterfacesCopy = new Vector();
-     formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES,serviceServiceInterfaces);
-     formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES_COPY,serviceServiceInterfacesCopy);
-   }
-
-   FindQualifiers serviceFindQualifiers = (FindQualifiers)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_FINDQUALIFIERS);
-   if (serviceFindQualifiers != null)
-   {
-     Vector findQualifierVector = serviceFindQualifiers.getFindQualifierVector();
-     for (int i=0;i<findQualifierVector.size();i++)
-     {
-       FindQualifier findQualifier = (FindQualifier)findQualifierVector.elementAt(i);
-%>
-    setFindQualifier("<%=HTMLUtils.JSMangle(findQualifier.getText())%>","findServicesAdvancedNames","findServicesAdvancedCategories","findServicesAdvancedFindQualifiers");
-<%
-     }
-   }
-%>
-    setAdvancedCommonSectionDefaults(findServicesAdvancedForm,"<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_MAX_SEARCH_SET))%>","<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_MAX_RESULTS))%>");
-
-    // UUID form details.
-    var findServicesUUIDSection = document.getElementById(findServicesSectionIds[<%=UDDIActionInputs.QUERY_STYLE_UUID%>]);
-    var findServicesUUIDForm = findServicesUUIDSection.getElementsByTagName("form").item(0);
-    findServicesUUIDForm.<%=UDDIActionInputs.QUERY_INPUT_UUID_KEY%>.value = "<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY))%>";
-
-    showFindForm(<%=UDDIActionInputs.QUERY_ITEM_SERVICES%>,<%=findServicesStyleIndex%>);
-  }
-
-  function setDefaultsForFindServiceInterfacesForms()
-  {
-    // Initialize the findServiceInterfaces form.
-<%
-   String findServiceInterfacesStyleIndex = (String)formToolPI.getProperty(UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES);
-%>
-    document.forms[styleForms[<%=UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES%>]].<%=UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES%>[<%=findServiceInterfacesStyleIndex%>].checked = true;
-    var findServiceInterfacesSimpleSection = document.getElementById(findServiceInterfacesSectionIds[<%=UDDIActionInputs.QUERY_STYLE_SIMPLE%>]);
-    var findServiceInterfacesSimpleForm = findServiceInterfacesSimpleSection.getElementsByTagName("form").item(0);
-    findServiceInterfacesSimpleForm.<%=UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME%>.value = "<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME))%>";
-
-    // Advanced form details.
-    var findServiceInterfacesAdvancedSection = document.getElementById(findServiceInterfacesSectionIds[<%=UDDIActionInputs.QUERY_STYLE_ADVANCED%>]);
-    var findServiceInterfacesAdvancedForm = findServiceInterfacesAdvancedSection.getElementsByTagName("form").item(0);
-
-    var isOwnedChecked = <%=(formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_OWNED) != null)%>;
-    setAuthenticationSectionDefaults(findServiceInterfacesAdvancedForm,<%=UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES%>,isOwnedChecked);
-    var isUseServiceChecked = <%=(formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_USE_SERVICE) != null)%>;
-    findServiceInterfacesAdvancedForm.<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_USE_SERVICE%>.checked = isUseServiceChecked;
-    toggleFindServiceInterfacesAdvancedServiceParameters(findServiceInterfacesAdvancedForm);
-    findServiceInterfacesAdvancedForm.<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME%>.value = "<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME))%>";
-
-<%
-   Vector siService = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_SERVICE);
-   Vector siServiceCopy = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_SERVICE_COPY);
-   if (siService != null)
-   {
-     if (siServiceCopy == null)
-       siServiceCopy = new Vector();
-     else
-       siServiceCopy.removeAllElements();
-     for (int i=0;i<siService.size();i++)
-     {
-       ListElement listElement = (ListElement)siService.elementAt(i);
-       int targetNodeId = listElement.getTargetNodeId();
-       int targetToolId = listElement.getTargetToolId();
-       int targetViewId = listElement.getTargetViewId();
-       String url = SelectSubQueryItemAction.getActionLink(targetNodeId,targetToolId,targetViewId,subQueryKeyProperty.getSubQueryKey(),UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_SERVICE,i,UDDIActionInputs.QUERY_ITEM_SERVICES,false);
-       BusinessService bs = (BusinessService)listElement.getObject();
-       siServiceCopy.addElement(siService.elementAt(i));
-%>
-    addResultRow("findServiceInterfacesAdvancedService",<%=targetNodeId%>,"<%=response.encodeURL(controller.getPathWithContext(url))%>","<%=HTMLUtils.JSMangle(bs.getDefaultNameString())%>","<%=HTMLUtils.JSMangle(bs.getDefaultDescriptionString())%>");
-<%
-     }
-     formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_SERVICE_COPY,siServiceCopy);
-   }
-   else
-   {
-     siService = new Vector();
-     siServiceCopy = new Vector();
-     formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_SERVICE,siService);
-     formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_SERVICE_COPY,siServiceCopy);
-   }
-
-   IdentifierBag siIdBag = (IdentifierBag)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS);
-   if (siIdBag != null)
-   {
-     Vector keyedReferenceVector = siIdBag.getKeyedReferenceVector();
-     for (int i=0;i<keyedReferenceVector.size();i++)
-     {
-       KeyedReference kr = (KeyedReference)keyedReferenceVector.elementAt(i);
-%>
-    addIdentifierRow("findServiceInterfacesAdvancedIdentifiers");
-    setIdentifierRowSettings("findServiceInterfacesAdvancedIdentifiers",<%=i%>,"<%=HTMLUtils.JSMangle(kr.getTModelKey())%>","<%=HTMLUtils.JSMangle(kr.getKeyName())%>","<%=HTMLUtils.JSMangle(kr.getKeyValue())%>");
-<%
-     }
-   }
-
-   CategoryBag siCatBag = (CategoryBag)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES);
-   if (siCatBag != null)
-   {
-     Vector keyedReferenceVector = siCatBag.getKeyedReferenceVector();
-     for (int i=0;i<keyedReferenceVector.size();i++)
-     {
-       KeyedReference kr = (KeyedReference)keyedReferenceVector.elementAt(i);
-%>
-    addCategoryRow("findServiceInterfacesAdvancedCategories");
-    setCategoryRowSettings("findServiceInterfacesAdvancedCategories",<%=i%>,"<%=HTMLUtils.JSMangle(kr.getTModelKey())%>","<%=HTMLUtils.JSMangle(kr.getKeyName())%>","<%=HTMLUtils.JSMangle(kr.getKeyValue())%>");
-<%
-     }
-   }
-
-   FindQualifiers siFindQualifiers = (FindQualifiers)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_FINDQUALIFIERS);
-   if (siFindQualifiers != null)
-   {
-     Vector findQualifierVector = siFindQualifiers.getFindQualifierVector();
-     for (int i=0;i<findQualifierVector.size();i++)
-     {
-       FindQualifier findQualifier = (FindQualifier)findQualifierVector.elementAt(i);
-%>
-    setFindQualifier("<%=HTMLUtils.JSMangle(findQualifier.getText())%>","findServiceInterfacesAdvancedName","findServiceInterfacesAdvancedCategories","findServiceInterfacesAdvancedFindQualifiers");
-<%
-     }
-   }
-%>
-    setAdvancedCommonSectionDefaults(findServiceInterfacesAdvancedForm,"<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_SEARCH_SET))%>","<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_RESULTS))%>");
-
-    // UUID form details.
-    var findServiceInterfacesUUIDSection = document.getElementById(findServiceInterfacesSectionIds[<%=UDDIActionInputs.QUERY_STYLE_UUID%>]);
-    var findServiceInterfacesUUIDForm = findServiceInterfacesUUIDSection.getElementsByTagName("form").item(0);
-    findServiceInterfacesUUIDForm.<%=UDDIActionInputs.QUERY_INPUT_UUID_KEY%>.value = "<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY))%>";
-
-    showFindForm(<%=UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES%>,<%=findServiceInterfacesStyleIndex%>);
-  }
-
-  function showMainForm(searchForValueString)
-  {
-    closeAllUddiChildWindows();
-    var queryInfoItemList = document.getElementById("queryInfoItemList");
-    var searchForIndex = parseInt(searchForValueString);
-    for (var i=0;i<sectionIds.length;i++)
-    {
-      if (i == searchForIndex)
-        document.getElementById(sectionIds[i]).style.display = "";
-      else
-        document.getElementById(sectionIds[i]).style.display = "none";
-    }
-<%
-   if (subQueryKeyProperty.getSubQueryKey().length() < 1)
-   {
-%>
-    document.getElementById("queryInfoItemList").style.display = "";
-<%
-   }
-%>
-    var loadScreenTable = document.getElementById("loadScreen");
-    if (loadScreenTable.rows.length > 0)
-      loadScreenTable.deleteRow(0);
-    document.getElementById("mainScreen").style.display = "";
-  }
-
-  function showFindForm(queryItemIndex,style)
-  {
-    closeAllUddiChildWindows();
-    var findSectionIds;
-    switch (queryItemIndex)
-    {
-      case <%=UDDIActionInputs.QUERY_ITEM_BUSINESSES%>:
-        findSectionIds = findBusinessesSectionIds;
-        break;
-      case <%=UDDIActionInputs.QUERY_ITEM_SERVICES%>:
-        findSectionIds = findServicesSectionIds;
-        break;
-      case <%=UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES%>:
-      default:
-        findSectionIds = findServiceInterfacesSectionIds;
-    }
-    for (var i=0;i<findSectionIds.length;i++)
-    {
-      if (i == style)
-        document.getElementById(findSectionIds[i]).style.display = "";
-      else
-        document.getElementById(findSectionIds[i]).style.display = "none";
-    }
-  }
-
-  function toggleAdvancedAuthenticationSection(queryItemIndex,isChecked)
-  {
-    if (isChecked && <%=!regElement.isLoggedIn()%>)
-      document.getElementById(authenticationSectionIds[queryItemIndex]).style.display = "";
-    else
-      document.getElementById(authenticationSectionIds[queryItemIndex]).style.display = "none";
-  }
-
-  function toggleFindServiceInterfacesAdvancedServiceParameters(form)
-  {
-    var isUseServiceChecked = form.<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_USE_SERVICE%>.checked;
-    var isOwnedChecked = form.<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_OWNED%>.checked;
-    if (isUseServiceChecked)
-    {
-      document.getElementById("findServiceInterfacesAdvancedServiceSection").style.display = "";
-      document.getElementById("findServiceInterfacesAdvancedOwned").style.display = "none";
-      toggleAdvancedAuthenticationSection(<%=UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES%>,false);
-      document.getElementById("findServiceInterfacesAdvancedNameFindQualifiersSection").style.display = "none";
-      document.getElementById("findServiceInterfacesAdvancedFindQualifiersSection").style.display = "none";
-    }
-    else
-    {
-      document.getElementById("findServiceInterfacesAdvancedServiceSection").style.display = "none";
-      document.getElementById("findServiceInterfacesAdvancedOwned").style.display = "";
-      toggleAdvancedAuthenticationSection(<%=UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES%>,isOwnedChecked);
-      document.getElementById("findServiceInterfacesAdvancedNameFindQualifiersSection").style.display = "";
-      document.getElementById("findServiceInterfacesAdvancedFindQualifiersSection").style.display = "";
-    }
-  }
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin" onUnload="closeAllUddiChildWindows()">
-  <div id="contentborder">
-    <table id="loadScreen">
-      <tr>
-        <td class="labels">
-          <%=controller.getMessage("MSG_LOAD_IN_PROGRESS")%>
-        </td>
-      </tr>
-    </table>
-    <div id="mainScreen" style="display:none;">
-<%
-   String titleImagePath = "uddi/images/find_highlighted.gif";
-   String title;
-   String subQueryKey = subQueryKeyProperty.getSubQueryKey();
-   if (subQueryKey != null && subQueryKey.length() > 0)
-   {
-     int queryItem = Integer.parseInt((String)formToolPI.getProperty(UDDIActionInputs.QUERY_ITEM));
-     switch (queryItem)
-     {
-       case UDDIActionInputs.QUERY_ITEM_BUSINESSES:
-         title = uddiPerspective.getMessage("ALT_SUBQUERY",uddiPerspective.getMessage("FORM_OPTION_BUSINESSES"));
-         break;
-       case UDDIActionInputs.QUERY_ITEM_SERVICES:
-         title = uddiPerspective.getMessage("ALT_SUBQUERY",uddiPerspective.getMessage("FORM_OPTION_SERVICES"));
-         break;
-       case UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES:
-       default:
-         title = uddiPerspective.getMessage("ALT_SUBQUERY",uddiPerspective.getMessage("FORM_OPTION_SERVICE_INTERFACES"));
-     }
-   }
-   else
-     title = uddiPerspective.getMessage("ALT_FIND");
-%>
-<%@ include file="/uddi/forms/findformheader.inc" %>
-      <table width="95%" border=0 cellpadding=3 cellspacing=0>
-        <tr>
-          <td class="labels" height=20 valign="bottom">
-            <label for="queryName"><%=uddiPerspective.getMessage("FORM_LABEL_QUERY_NAME")%></label>
-<%
-   if (!formToolPI.isInputValid(UDDIActionInputs.QUERY_NAME))
-   {
-%>
-            <%=HTMLUtils.redAsterisk()%>
-<%
-   }
-%>
-          </td>
-        </tr>
-        <tr>
-          <td> <input id="queryName" type="text" value="<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("DEFAULT_QUERY_NAME"))%>" class="textenter"> </td>
-        </tr>
-      </table>
-      <div id="queryInfoItemList" style="display:none;">
-        <table width="95%" border=0 cellpadding=3 cellspacing=0>
-          <tr>
-            <td class="labels" valign="middle" nowrap height=40>
-              <label for="searchFor"><%=uddiPerspective.getMessage("FORM_LABEL_SEARCH_FOR")%></label>
-            </td>
-            <td valign="middle" nowrap height=40>
-              <select id="searchFor" onChange="showMainForm(this.value)" class="selectlist">
-                <option value="<%=UDDIActionInputs.QUERY_ITEM_BUSINESSES%>"><%=uddiPerspective.getMessage("FORM_OPTION_BUSINESSES")%>
-                <option value="<%=UDDIActionInputs.QUERY_ITEM_SERVICES%>"><%=uddiPerspective.getMessage("FORM_OPTION_SERVICES")%>
-                <option value="<%=UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES%>"><%=uddiPerspective.getMessage("FORM_OPTION_SERVICE_INTERFACES")%>
-              </select>
-            </td>
-            <td width="90%" height=40>&nbsp;</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-<jsp:include page="/uddi/forms/RegFindBusinessesForm.jsp" flush="true"/>
-<jsp:include page="/uddi/forms/RegFindServicesForm.jsp" flush="true"/>
-<jsp:include page="/uddi/forms/RegFindServiceInterfacesForm.jsp" flush="true"/>
-  </div>
-<script language="javascript">
-  setDefaults();
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindServiceInterfacesAdvancedForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindServiceInterfacesAdvancedForm.jsp
deleted file mode 100644
index 11bad2bd7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindServiceInterfacesAdvancedForm.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<jsp:useBean id="subQueryKeyProperty" class="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.SubQueryKeyProperty" scope="request"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-   NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
-   // selectedNode could be the registry or query nodes.
-   Node selectedNode = navigatorManager.getSelectedNode();
-   FormTool formTool = (FormTool)(selectedNode.getCurrentToolManager().getSelectedTool());
-   FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKeyProperty.getSubQueryKey());
-%>
-<div id="findServiceInterfacesAdvanced" style="display:none;">
-  <form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/RegFindServiceInterfacesAdvancedActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" onSubmit="return processFindServiceInterfacesAdvancedForm(this)">
-    <input type="hidden" name="<%=UDDIActionInputs.SUBQUERY_KEY%>">
-    <input type="hidden" name="<%=UDDIActionInputs.SUBQUERY_GET%>">    
-    <input type="hidden" name="<%=UDDIActionInputs.NEW_SUBQUERY_INITIATED%>">
-    <input type="hidden" name="<%=UDDIActionInputs.NEW_SUBQUERY_QUERY_ITEM%>">
-    <input type="hidden" name="<%=UDDIActionInputs.QUERY_NAME%>">
-    <table width="95%" border=0 cellpadding=3 cellspacing=0>
-      <tr>
-        <td class="labels" height=20 valign="bottom"> <%=uddiPerspective.getMessage("FORM_LABEL_FIND_ADVANCED_DESC")%> </td>
-      </tr>
-      <tr>
-        <td height=40 valign="bottom">
-          <input type="checkbox" id="input_find_service_interface_advance_use_service" name="<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_USE_SERVICE%>" onClick="toggleFindServiceInterfacesAdvancedServiceParameters(this.form)"><label for="input_find_service_interface_advance_use_service"><%=uddiPerspective.getMessage("FORM_LABEL_USE_SERVICE")%></label>
-        </td>
-      </tr>
-    </table>
-<%
-   String[] serviceSpecificInfo = {"FORM_LABEL_SERVICE",Boolean.FALSE.toString(),String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICES),"findServiceInterfacesAdvanced",UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_SERVICE};
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("findServiceInterfacesAdvancedService");
-   sectionHeaderInfo.setOtherProperties(serviceSpecificInfo);
-%>
-<div id="findServiceInterfacesAdvancedServiceSection" style="display:none;">
-  <jsp:include page="/uddi/forms/uddiObjects_table.jsp" flush="true"/>
-</div>
-    <div id="findServiceInterfacesAdvancedOwned">
-      <table width="95%" border=0 cellpadding=3 cellspacing=0>
-        <tr>
-          <td height=35 valign="bottom">
-            <input type="checkbox" id="input_find_service_interface_advance_owned" name="<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_OWNED%>" onClick="toggleAdvancedAuthenticationSection(<%=UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES%>,this.checked)">
-            <label for="input_find_service_interface_advance_owned"><%=uddiPerspective.getMessage("FORM_LABEL_OWNED")%></label>
-          </td>
-        </tr>
-      </table>
-    </div>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("findServiceInterfacesAdvancedAuthentication");
-%>
-<jsp:include page="/uddi/forms/authentication_table.jsp" flush="true"/>
-    <div id="findServiceInterfacesAdvancedName">
-      <table width="95%" border=0 cellpadding=3 cellspacing=0>
-        <tr>
-          <td class="labels" height=40 valign="bottom">
-            <label for="input_find_service_interface_advanced_name"><%=uddiPerspective.getMessage("FORM_LABEL_NAME")%></label>
-<%
-   if (!formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME))
-   {
-%>
-            <%=HTMLUtils.redAsterisk()%>
-<%
-   }
-%>
-          </td>
-        </tr>
-        <tr>
-          <td><input type="text" id="input_find_service_interface_advanced_name" name="<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME%>" class="textenter"></td>
-        </tr>
-      </table>
-<div id="findServiceInterfacesAdvancedNameFindQualifiersSection">
-<jsp:include page="/uddi/forms/names_findQualifiers_table.jsp" flush="true"/>
-</div>
-    </div>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("findServiceInterfacesAdvancedIdentifiers");
-%>
-<jsp:include page="/uddi/forms/identifiers_table.jsp" flush="true"/>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("findServiceInterfacesAdvancedCategories");
-%>
-<jsp:include page="/uddi/forms/categories_table.jsp" flush="true"/>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("findServiceInterfacesAdvancedFindQualifiers");
-%>
-<div id="findServiceInterfacesAdvancedFindQualifiersSection">
-<jsp:include page="/uddi/forms/findQualifiers_table.jsp" flush="true"/>
-</div>
-<jsp:include page="/uddi/forms/advancedCommon_table.jsp" flush="true"/>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
-  </form>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindServiceInterfacesForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindServiceInterfacesForm.jsp
deleted file mode 100644
index 59ed9c456..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindServiceInterfacesForm.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<div id="findServiceInterfaces" style="display:none;">
-  <form name="findServiceInterfacesStyle">
-    <table>
-      <tr>
-        <td> <%=uddiPerspective.getMessage("FORM_LABEL_SEARCH_TYPE")%> </td>
-      </tr>
-      <tr>
-        <td>
-          <input type="radio" id="radio_find_service_interface_simple" name="<%=UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES%>" onClick="showFindForm(<%=UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES%>,<%=UDDIActionInputs.QUERY_STYLE_SIMPLE%>)"><label for="radio_find_service_interface_simple"><%=uddiPerspective.getMessage("FORM_RADIO_SIMPLE")%></label>
-          <input type="radio" id="radio_find_service_interface_advance" name="<%=UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES%>" onClick="showFindForm(<%=UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES%>,<%=UDDIActionInputs.QUERY_STYLE_ADVANCED%>)"><label for="radio_find_service_interface_advance"><%=uddiPerspective.getMessage("FORM_RADIO_ADVANCED")%></label>
-          <input type="radio" id="radio_find_service_interface_uuid" name="<%=UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES%>" onClick="showFindForm(<%=UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES%>,<%=UDDIActionInputs.QUERY_STYLE_UUID%>)"><label for="radio_find_service_interface_uuid"><%=uddiPerspective.getMessage("FORM_RADIO_UUID")%></label>
-        </td>
-      </tr>
-    </table>
-  </form>
-<jsp:include page="/uddi/forms/RegFindServiceInterfacesSimpleForm.jsp" flush="true"/>
-<jsp:include page="/uddi/forms/RegFindServiceInterfacesAdvancedForm.jsp" flush="true"/>
-<%
-   sectionHeaderInfo.setContainerId("findServiceInterfaceUUID");
-   String[] otherProperties = {"uddi/actions/RegFindServiceInterfaceUUIDActionJSP.jsp",UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY,"FORM_LABEL_FIND_SERVICE_INTERFACE_UUID_DESC"};
-   sectionHeaderInfo.setOtherProperties(otherProperties);
-%>
-<jsp:include page="/uddi/forms/RegFindUUIDForm.jsp" flush="true"/>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindServiceInterfacesSimpleForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindServiceInterfacesSimpleForm.jsp
deleted file mode 100644
index 635934bd3..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindServiceInterfacesSimpleForm.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="subQueryKeyProperty" class="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.SubQueryKeyProperty" scope="request"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-   NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
-   // selectedNode could be the registry or query nodes.
-   Node selectedNode = navigatorManager.getSelectedNode();
-   FormTool formTool = (FormTool)(selectedNode.getCurrentToolManager().getSelectedTool());
-   FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKeyProperty.getSubQueryKey());
-%>
-<div id="findServiceInterfacesSimple" style="display:none;">
-  <form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/RegFindServiceInterfacesSimpleActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" onSubmit="return processForm(this)">
-    <input type="hidden" name="<%=UDDIActionInputs.SUBQUERY_KEY%>">
-    <input type="hidden" name="<%=UDDIActionInputs.QUERY_NAME%>">
-    <table width="95%" border=0 cellpadding=3 cellspacing=0>
-      <tr>
-        <td class="labels" height=10 valign="bottom">
-          <%=uddiPerspective.getMessage("FORM_LABEL_FIND_SERVICE_INTERFACES_SIMPLE_DESC")%>
-        </td>
-      </tr>
-      <tr>
-        <td class="labels" height=30 valign="bottom">
-          <label for="input_find_service_interfaces_simple_name"><%=uddiPerspective.getMessage("FORM_LABEL_NAME")%></label>
-<%
-   if (!formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME))
-   {
-%>
-          <%=HTMLUtils.redAsterisk()%>
-<%
-   }
-%>
-        </td>
-      </tr>
-      <tr>
-        <td> <input type="text" id="input_find_service_interfaces_simple_name" name="<%=UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME%>" class="textenter"> </td>
-      </tr>
-    </table>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
-  </form>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindServicesAdvancedForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindServicesAdvancedForm.jsp
deleted file mode 100644
index b6976a9d6..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindServicesAdvancedForm.jsp
+++ /dev/null
@@ -1,85 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<jsp:useBean id="subQueryKeyProperty" class="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.SubQueryKeyProperty" scope="request"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<div id="findServicesAdvanced">
-  <form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/RegFindServicesAdvancedActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" onSubmit="return processFindServicesAdvancedForm(this)">
-    <input type="hidden" name="<%=UDDIActionInputs.SUBQUERY_KEY%>">
-    <input type="hidden" name="<%=UDDIActionInputs.SUBQUERY_GET%>">    
-    <input type="hidden" name="<%=UDDIActionInputs.NEW_SUBQUERY_INITIATED%>">
-    <input type="hidden" name="<%=UDDIActionInputs.NEW_SUBQUERY_QUERY_ITEM%>">
-    <input type="hidden" name="<%=UDDIActionInputs.QUERY_NAME%>">
-    <table width="90%" border=0 cellpadding=3 cellspacing=0>
-      <tr>
-        <td class="labels" height=20 valign="bottom">
-          <%=uddiPerspective.getMessage("FORM_LABEL_FIND_ADVANCED_DESC")%>
-        </td>
-      </tr>
-    </table>
-    <table width="95%" border=0 cellpadding=3 cellspacing=0>
-      <tr>
-        <td height=35 valign="bottom">
-          <input type="checkbox" id="input_find_services_advance_owned" name="<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_OWNED%>" onClick="toggleAdvancedAuthenticationSection(<%=UDDIActionInputs.QUERY_ITEM_SERVICES%>,this.checked)">
-          <label for="input_find_services_advance_owned"><%=uddiPerspective.getMessage("FORM_LABEL_OWNED")%></label>
-        </td>
-      </tr>
-    </table>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("findServicesAdvancedAuthentication");
-%>
-<jsp:include page="/uddi/forms/authentication_table.jsp" flush="true"/>
-<%
-   String[] busSpecificInfo = {"FORM_LABEL_BUSINESS",Boolean.FALSE.toString(),String.valueOf(UDDIActionInputs.QUERY_ITEM_BUSINESSES),"findServicesAdvanced",UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS};
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("findServicesAdvancedBusiness");
-   sectionHeaderInfo.setOtherProperties(busSpecificInfo);
-%>
-<jsp:include page="/uddi/forms/uddiObjects_table.jsp" flush="true"/>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("findServicesAdvancedNames");
-   String[] nameSpecificInfo = {"FORM_LABEL_NAMES","FORM_LABEL_NAME",Boolean.FALSE.toString()};
-   sectionHeaderInfo.setOtherProperties(nameSpecificInfo);
-%>
-<jsp:include page="/uddi/forms/languageInput_table.jsp" flush="true"/>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("findServicesAdvancedCategories");
-%>
-<jsp:include page="/uddi/forms/categories_table.jsp" flush="true"/>
-<%
-   String[] siSpecificInfo = {"FORM_LABEL_SERVICE_INTERFACES",Boolean.FALSE.toString(),String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES),"findServicesAdvanced",UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES};
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("findServicesAdvancedServiceInterfaces");
-   sectionHeaderInfo.setOtherProperties(siSpecificInfo);
-%>
-<jsp:include page="/uddi/forms/uddiObjects_table.jsp" flush="true"/>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("findServicesAdvancedFindQualifiers");
-%>
-<jsp:include page="/uddi/forms/findQualifiers_table.jsp" flush="true"/>
-<jsp:include page="/uddi/forms/advancedCommon_table.jsp" flush="true"/>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
-  </form>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindServicesForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindServicesForm.jsp
deleted file mode 100644
index f94f39345..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindServicesForm.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<div id="findServices" style="display:none;">
-  <form name="findServicesStyle">
-    <table width="95%" border=0 cellpadding=3 cellspacing=0>
-      <tr>
-        <td class="labels">
-          <%=uddiPerspective.getMessage("FORM_LABEL_SEARCH_TYPE")%>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input type="radio" id="radio_find_service_simple" class="radio" name="<%=UDDIActionInputs.QUERY_STYLE_SERVICES%>" onClick="showFindForm(<%=UDDIActionInputs.QUERY_ITEM_SERVICES%>,<%=UDDIActionInputs.QUERY_STYLE_SIMPLE%>)"><label for="radio_find_service_simple"><%=uddiPerspective.getMessage("FORM_RADIO_SIMPLE")%></label>
-          <input type="radio" id="radio_find_service_advance" class="radio" name="<%=UDDIActionInputs.QUERY_STYLE_SERVICES%>" onClick="showFindForm(<%=UDDIActionInputs.QUERY_ITEM_SERVICES%>,<%=UDDIActionInputs.QUERY_STYLE_ADVANCED%>)"><label for="radio_find_service_advance"><%=uddiPerspective.getMessage("FORM_RADIO_ADVANCED")%></label>
-          <input type="radio" id="radio_find_service_uuid" class="radio" name="<%=UDDIActionInputs.QUERY_STYLE_SERVICES%>" onClick="showFindForm(<%=UDDIActionInputs.QUERY_ITEM_SERVICES%>,<%=UDDIActionInputs.QUERY_STYLE_UUID%>)"><label for="radio_find_service_uuid"><%=uddiPerspective.getMessage("FORM_RADIO_UUID")%></label>
-        </td>
-      </tr>
-    </table>
-  </form>
-<jsp:include page="/uddi/forms/RegFindServicesSimpleForm.jsp" flush="true"/>
-<jsp:include page="/uddi/forms/RegFindServicesAdvancedForm.jsp" flush="true"/>
-<%
-   sectionHeaderInfo.setContainerId("findServiceUUID");
-   String[] otherProperties = {"uddi/actions/RegFindServiceUUIDActionJSP.jsp",UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY,"FORM_LABEL_FIND_SERVICE_UUID_DESC"};
-   sectionHeaderInfo.setOtherProperties(otherProperties);
-%>
-<jsp:include page="/uddi/forms/RegFindUUIDForm.jsp" flush="true"/>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindServicesSimpleForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindServicesSimpleForm.jsp
deleted file mode 100644
index 40b72816b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindServicesSimpleForm.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="subQueryKeyProperty" class="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.SubQueryKeyProperty" scope="request"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-   NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
-   // selectedNode could be the registry or query nodes.
-   Node selectedNode = navigatorManager.getSelectedNode();
-   FormTool formTool = (FormTool)(selectedNode.getCurrentToolManager().getSelectedTool());
-   FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKeyProperty.getSubQueryKey());
-%>
-<div id="findServicesSimple" style="display:none;">
-  <form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/RegFindServicesSimpleActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" onSubmit="return processForm(this)">
-    <input type="hidden" name="<%=UDDIActionInputs.SUBQUERY_KEY%>">
-    <input type="hidden" name="<%=UDDIActionInputs.QUERY_NAME%>">
-    <table width="95%" border=0 cellpadding=3 cellspacing=0>
-      <tr>
-        <td class="labels" height=10 valign="bottom">
-          <%=uddiPerspective.getMessage("FORM_LABEL_FIND_SERVICES_SIMPLE_DESC")%>
-        </td>
-      </tr>
-      <tr>
-        <td class="labels" height=30 valign="bottom">
-          <label for="input_find_services_simple_name"><%=uddiPerspective.getMessage("FORM_LABEL_NAME")%></label>
-<%
-   if (!formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME))
-   {
-%>
-          <%=HTMLUtils.redAsterisk()%>
-<%
-   }
-%>
-        </td>
-      </tr>
-      <tr>
-        <td> <input type="text" id="input_find_services_simple_name" name="<%=UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME%>" class="textenter"> </td>
-      </tr>
-    </table>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
-  </form>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindUUIDForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindUUIDForm.jsp
deleted file mode 100644
index ae39db2d9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindUUIDForm.jsp
+++ /dev/null
@@ -1,65 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="subQueryKeyProperty" class="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.SubQueryKeyProperty" scope="request"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-   NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
-   // selectedNode could be the registry or query nodes.
-   Node selectedNode = navigatorManager.getSelectedNode();
-   FormTool formTool = (FormTool)(selectedNode.getCurrentToolManager().getSelectedTool());
-   FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKeyProperty.getSubQueryKey());
-   
-   String formContainerId = sectionHeaderInfo.getContainerId();
-   String[] otherProperties = (String[])(sectionHeaderInfo.getOtherProperties());
-   String actionLink = (String)otherProperties[0];
-   String uuidEntryKey = (String)otherProperties[1];
-   String descriptionKey = (String)otherProperties[2];
-%>
-<div id="<%=formContainerId%>" style="display:none;">
-  <form action="<%=response.encodeURL(controller.getPathWithContext(actionLink))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" onSubmit="return processForm(this)">
-    <input type="hidden" name="<%=UDDIActionInputs.SUBQUERY_KEY%>">
-    <input type="hidden" name="<%=UDDIActionInputs.QUERY_NAME%>">
-    <table width="95%" border=0 cellpadding=3 cellspacing=0>
-      <tr>
-        <td class="labels" height=10 valign="bottom">
-          <%=uddiPerspective.getMessage(descriptionKey)%>
-        </td>
-      </tr>
-      <tr>
-        <td class="labels" height=30 valign="bottom">
-          <label for="<%=(formContainerId+"_input_uuid_key")%>"><%=uddiPerspective.getMessage("FORM_LABEL_UUID_KEY")%></label>
-<%
-   if (!formToolPI.isInputValid(uuidEntryKey))
-   {
-%>
-          <%=HTMLUtils.redAsterisk()%>
-<%
-   }
-%>
-        </td>
-      </tr>
-      <tr>
-        <td> <input type="text" id="<%=(formContainerId+"_input_uuid_key")%>" name="<%=UDDIActionInputs.QUERY_INPUT_UUID_KEY%>" class="textenter"> </td>
-      </tr>
-    </table>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
-  </form>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishBusinessAdvancedForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishBusinessAdvancedForm.jsp
deleted file mode 100644
index 0de1a93df..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishBusinessAdvancedForm.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="subQueryKeyProperty" class="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.SubQueryKeyProperty" scope="request"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-   NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
-   Node selectedNode = navigatorManager.getSelectedNode();
-   FormTool formTool = (FormTool)(selectedNode.getCurrentToolManager().getSelectedTool());
-   FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKeyProperty.getSubQueryKey());
-%>
-<div id="publishBusinessAdvanced" style="display:none;">
-  <form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/RegPublishBusinessAdvancedActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" onSubmit="return processPublishBusinessAdvancedForm(this)">
-    <table width="95%" border=0 cellpadding=3 cellspacing=0>
-      <tr>
-        <td class="labels" height=10 valign="bottom">
-          <%=uddiPerspective.getMessage("FORM_LABEL_PUBLISH_BUSINESS_ADVANCED_DESC")%>
-        </td>
-      </tr>
-    </table>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("publishBusinessAdvancedAuthentication");
-%>
-<jsp:include page="/uddi/forms/authentication_table.jsp" flush="true"/>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("publishBusinessAdvancedNames");
-   String[] nameSpecificInfo = {"FORM_LABEL_NAMES","FORM_LABEL_NAME",String.valueOf(!formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES))};
-   sectionHeaderInfo.setOtherProperties(nameSpecificInfo);
-%>
-<jsp:include page="/uddi/forms/languageInput_table.jsp" flush="true"/>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("publishBusinessAdvancedDescriptions");
-   String[] descSpecificInfo = {"FORM_LABEL_DESCRIPTIONS","FORM_LABEL_DESCRIPTION",String.valueOf(!formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS))};
-   sectionHeaderInfo.setOtherProperties(descSpecificInfo);
-%>
-<jsp:include page="/uddi/forms/languageInput_table.jsp" flush="true"/>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("publishBusinessAdvancedIdentifiers");
-%>
-<jsp:include page="/uddi/forms/identifiers_table.jsp" flush="true"/>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("publishBusinessAdvancedCategories");
-%>
-<jsp:include page="/uddi/forms/categories_table.jsp" flush="true"/>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("publishBusinessAdvancedDiscoveryURLs");
-   sectionHeaderInfo.setOtherProperties(new Boolean(!formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS)));
-%>
-<jsp:include page="/uddi/forms/discoveryURLs_table.jsp" flush="true"/>   
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
-  </form>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishBusinessForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishBusinessForm.jsp
deleted file mode 100644
index b7b30c127..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishBusinessForm.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<div id="publishBusiness" style="display:none;">
-  <form name="publishBusinessStyle">
-    <table width="95%" border=0 cellpadding=3 cellspacing=0>
-      <tr>
-        <td class="labels">
-          <%=uddiPerspective.getMessage("FORM_LABEL_PUBLISH_FORM")%>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input type="radio" id="radio_publish_business_simple" class="radio" name="<%=UDDIActionInputs.QUERY_STYLE_BUSINESSES%>" onClick="showPublishForm(<%=UDDIActionInputs.QUERY_ITEM_BUSINESSES%>,<%=UDDIActionInputs.QUERY_STYLE_SIMPLE%>)"><label for="radio_publish_business_simple"><%=uddiPerspective.getMessage("FORM_RADIO_SIMPLE")%></label>
-          <input type="radio" id="radio_publish_business_advance" class="radio" name="<%=UDDIActionInputs.QUERY_STYLE_BUSINESSES%>" onClick="showPublishForm(<%=UDDIActionInputs.QUERY_ITEM_BUSINESSES%>,<%=UDDIActionInputs.QUERY_STYLE_ADVANCED%>)"><label for="radio_publish_business_advance"><%=uddiPerspective.getMessage("FORM_RADIO_ADVANCED")%></label>
-        </td>
-      </tr>
-    </table>
-  </form>
-<jsp:include page="/uddi/forms/RegPublishBusinessSimpleForm.jsp" flush="true"/>
-<jsp:include page="/uddi/forms/RegPublishBusinessAdvancedForm.jsp" flush="true"/>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishBusinessSimpleForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishBusinessSimpleForm.jsp
deleted file mode 100644
index 9c193d599..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishBusinessSimpleForm.jsp
+++ /dev/null
@@ -1,71 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="subQueryKeyProperty" class="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.SubQueryKeyProperty" scope="request"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-   NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
-   Node selectedNode = navigatorManager.getSelectedNode();
-   FormTool formTool = (FormTool)(selectedNode.getCurrentToolManager().getSelectedTool());
-   FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKeyProperty.getSubQueryKey());
-%>
-<div id="publishBusinessSimple" style="display:none;">
-  <form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/RegPublishBusinessSimpleActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" onSubmit="return handleSubmit(this)">
-    <table width="95%" border=0 cellpadding=3 cellspacing=0>
-      <tr>
-        <td class="labels" height=10 valign="bottom">
-          <%=uddiPerspective.getMessage("FORM_LABEL_PUBLISH_BUSINESS_SIMPLE_DESC")%>
-        </td>
-      </tr>
-    </table>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("publishBusinessSimpleAuthentication");
-%>
-<jsp:include page="/uddi/forms/authentication_table.jsp" flush="true"/>
-    <table width="95%" border=0 cellpadding=3 cellspacing=0>
-      <tr>
-        <td class="labels" height=20 valign="bottom">
-          <label for="input_publish_business_simple_name"><%=uddiPerspective.getMessage("FORM_LABEL_NAME")%></label>
-<%
-   if (!formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_NAME))
-   {
-%>
-          <%=HTMLUtils.redAsterisk()%>
-<%
-   }
-%>
-        </td>
-      </tr>
-      <tr>
-        <td> <input type="text" id="input_publish_business_simple_name" name="<%=UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_NAME%>" class="textenter"> </td>
-      </tr>
-      <tr>
-        <td class="labels">
-          <label for="input_publish_business_simple_desc"><%=uddiPerspective.getMessage("FORM_LABEL_DESCRIPTION")%></label>
-        </td>
-      </tr>
-      <tr>
-        <td> <input type="text" id="input_publish_business_simple_desc" name="<%=UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_DESCRIPTION%>" class="textenter"> </td>
-      </tr>
-    </table>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
-  </form>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishForm.jsp
deleted file mode 100644
index e9f1c03c8..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishForm.jsp
+++ /dev/null
@@ -1,583 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*,
-                                                        org.uddi4j.datatype.business.*,
-                                                        org.uddi4j.datatype.tmodel.TModel,
-                                                        org.uddi4j.datatype.*,
-                                                        org.uddi4j.util.*,
-                                                        java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-   NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
-   // selectedNode must be a registry node.
-   Node regNode = navigatorManager.getSelectedNode();
-   FormTool formTool = (FormTool)(regNode.getCurrentToolManager().getSelectedTool());
-%>
-<jsp:useBean id="subQueryKeyProperty" class="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.SubQueryKeyProperty" scope="request">
-<%
-   String subQueryKey = (String)formTool.getProperty(UDDIActionInputs.SUBQUERY_KEY);
-   subQueryKeyProperty.setSubQueryKey(subQueryKey);
-%>
-</jsp:useBean>
-<%
-   FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKeyProperty.getSubQueryKey());
-   RegistryElement regElement = (RegistryElement)regNode.getTreeElement();
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=uddiPerspective.getMessage("FORM_TITLE_REGISTRY_PUBLISH")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/scripts/formsubmit.jsp" flush="true"/>
-<jsp:include page="/uddi/scripts/udditables.jsp" flush="true"/>
-<script language="javascript">
-  var sectionIds = ["publishBusiness","publishService","publishServiceInterface"];
-  var publishBusinessSectionIds = ["publishBusinessSimple","publishBusinessAdvanced"];
-  var publishServiceSectionIds = ["publishServiceSimple","publishServiceAdvanced"];
-  var publishServiceInterfaceSectionIds = ["publishServiceInterfaceSimple","publishServiceInterfaceAdvanced"];
-  var styleForms = ["publishBusinessStyle","publishServiceStyle","publishServiceInterfaceStyle"];
-
-  function processPublishBusinessAdvancedForm(form)
-  {
-    if (handleSubmit(form))
-    {
-      processLanguageInputTable("publishBusinessAdvancedNames","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME_LANGUAGE%>","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME%>",form);
-      processLanguageInputTable("publishBusinessAdvancedDescriptions","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION_LANGUAGE%>","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION%>",form);
-      processIdentifierTable("publishBusinessAdvancedIdentifiers",form);
-      processCategoryTable("publishBusinessAdvancedCategories",form,false);
-      processDiscoveryURLTable("publishBusinessAdvancedDiscoveryURLs",form);
-      return true;
-    }
-    return false;
-  }
-
-  function processPublishServiceSimpleForm(form)
-  {
-    if (handleSubmit(form))
-    {
-      processResultTable("publishServiceSimpleBusiness","<%=UDDIActionInputs.NODEID_BUSINESS%>",form,false);
-      return true;
-    }
-    return false;
-  }
-
-  function processPublishServiceAdvancedForm(form)
-  {
-    if (handleSubmit(form))
-    {
-      processResultTable("publishServiceAdvancedBusiness","<%=UDDIActionInputs.NODEID_BUSINESS%>",form,false);
-      processResultTable("publishServiceAdvancedServiceInterface","<%=UDDIActionInputs.NODEID_SERVICE_INTERFACE%>",form,false);
-      processLanguageInputTable("publishServiceAdvancedNames","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME_LANGUAGE%>","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME%>",form);
-      processLanguageInputTable("publishServiceAdvancedDescriptions","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION_LANGUAGE%>","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION%>",form);
-      processCategoryTable("publishServiceAdvancedCategories",form,false);
-      return true;
-    }
-    return false;
-  }
-
-  function processPublishServiceInterfaceAdvancedForm(form)
-  {
-    if (handleSubmit(form))
-    {
-      processLanguageInputTable("publishServiceInterfaceAdvancedDescriptions","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION_LANGUAGE%>","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION%>",form);
-      processIdentifierTable("publishServiceInterfaceAdvancedIdentifiers",form);
-      processCategoryTable("publishServiceInterfaceAdvancedCategories",form,false);
-      return true;
-    }
-    return false;
-  }
-
-  function setDefaults()
-  {
-    var publish = document.getElementById("publish");
-    publish.selectedIndex = <%=formToolPI.getProperty(UDDIActionInputs.QUERY_ITEM)%>;
-    setDefaultsForPublishBusinessForms();
-    setDefaultsForPublishServiceForms();
-    setDefaultsForPublishServiceInterfaceForms();
-<%
-   if (!regElement.isLoggedIn())
-   {
-%>
-    document.getElementById("publishBusinessSimpleAuthentication").style.display = "";
-    document.getElementById("publishBusinessAdvancedAuthentication").style.display = "";
-    document.getElementById("publishServiceSimpleAuthentication").style.display = "";
-    document.getElementById("publishServiceAdvancedAuthentication").style.display = "";
-    document.getElementById("publishServiceInterfaceSimpleAuthentication").style.display = "";
-    document.getElementById("publishServiceInterfaceAdvancedAuthentication").style.display = "";
-<%
-   }
-%>
-    showMainForm(publish.value);
-  }
-
-  function setAuthenticationSectionDefaults(form)
-  {
-<%
-   String publishURL = (String)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-   String userId = (String)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-   String password = (String)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-%>
-    form.<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL%>.value = "<%=HTMLUtils.JSMangle(publishURL)%>";
-    form.<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID%>.value = "<%=HTMLUtils.JSMangle(userId)%>";
-    form.<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD%>.value = "<%=HTMLUtils.JSMangle(password)%>";
-  }
-
-  function setDefaultsForPublishBusinessForms()
-  {
-    // Initialize the publishBusiness form.
-<%
-   String publishBusinessStyleIndex = (String)formToolPI.getProperty(UDDIActionInputs.QUERY_STYLE_BUSINESSES);
-%>
-    document.forms[styleForms[<%=UDDIActionInputs.QUERY_ITEM_BUSINESSES%>]].<%=UDDIActionInputs.QUERY_STYLE_BUSINESSES%>[<%=publishBusinessStyleIndex%>].checked = true;
-    var publishBusinessSimpleSection = document.getElementById(publishBusinessSectionIds[<%=UDDIActionInputs.QUERY_STYLE_SIMPLE%>]);
-    var publishBusinessSimpleForm = publishBusinessSimpleSection.getElementsByTagName("form").item(0);
-    setAuthenticationSectionDefaults(publishBusinessSimpleForm);
-    publishBusinessSimpleForm.<%=UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_NAME%>.value = "<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_NAME))%>";
-    publishBusinessSimpleForm.<%=UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_DESCRIPTION%>.value = "<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_DESCRIPTION))%>";
-
-    // Advanced form details.
-    var publishBusinessAdvancedSection = document.getElementById(publishBusinessSectionIds[<%=UDDIActionInputs.QUERY_STYLE_ADVANCED%>]);
-    var publishBusinessAdvancedForm = publishBusinessAdvancedSection.getElementsByTagName("form").item(0);
-    setAuthenticationSectionDefaults(publishBusinessAdvancedForm);
-    var publishBusinessAdvancedNamesTable = getTable("publishBusinessAdvancedNames");
-    var publishBusinessAdvancedDescriptionsTable = getTable("publishBusinessAdvancedDescriptions");
-    var publishBusinessAdvancedDiscoveryURLsTable = getTable("publishBusinessAdvancedDiscoveryURLs");
-<%
-   Vector busNameVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES);
-   if (busNameVector != null)
-   {
-     for (int i=0;i<busNameVector.size();i++)
-     {
-       Name name = (Name)busNameVector.elementAt(i);
-%>
-    addLanguageInputRow("publishBusinessAdvancedNames","<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_CONTROL_TITLE_NAME_TEXT_VALUE"))%>");
-    setLanguageInputRowSettings("publishBusinessAdvancedNames",<%=i%>,"<%=HTMLUtils.JSMangle(name.getLang())%>","<%=HTMLUtils.JSMangle(name.getText())%>");
-<%
-       if (!formToolPI.isRowInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES,i))
-       {
-%>
-    highlightErrantRow(publishBusinessAdvancedNamesTable.rows[<%=i%>+numberOfHeaderRows],"errantrow");
-<%
-       }
-     }
-   }
-
-   Vector busDescriptionVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS);
-   if (busDescriptionVector != null)
-   {
-     for (int i=0;i<busDescriptionVector.size();i++)
-     {
-       Description description = (Description)busDescriptionVector.elementAt(i);
-%>
-    addLanguageInputRow("publishBusinessAdvancedDescriptions","<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_CONTROL_TITLE_DESCRIPTION_TEXT_VALUE"))%>");
-    setLanguageInputRowSettings("publishBusinessAdvancedDescriptions",<%=i%>,"<%=HTMLUtils.JSMangle(description.getLang())%>","<%=HTMLUtils.JSMangle(description.getText())%>");
-<%
-       if (!formToolPI.isRowInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS,i))
-       {
-%>
-    highlightErrantRow(publishBusinessAdvancedDescriptionsTable.rows[<%=i%>+numberOfHeaderRows],"errantrow");
-<%
-       }
-     }
-   }
-
-   IdentifierBag busIdBag = (IdentifierBag)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS);
-   if (busIdBag != null)
-   {
-     Vector keyedReferenceVector = busIdBag.getKeyedReferenceVector();
-     for (int i=0;i<keyedReferenceVector.size();i++)
-     {
-       KeyedReference kr = (KeyedReference)keyedReferenceVector.elementAt(i);
-%>
-    addIdentifierRow("publishBusinessAdvancedIdentifiers");
-    setIdentifierRowSettings("publishBusinessAdvancedIdentifiers",<%=i%>,"<%=HTMLUtils.JSMangle(kr.getTModelKey())%>","<%=HTMLUtils.JSMangle(kr.getKeyName())%>","<%=HTMLUtils.JSMangle(kr.getKeyValue())%>");
-<%
-     }
-   }
-
-   CategoryBag busCatBag = (CategoryBag)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES);
-   if (busCatBag != null)
-   {
-     Vector keyedReferenceVector = busCatBag.getKeyedReferenceVector();
-     for (int i=0;i<keyedReferenceVector.size();i++)
-     {
-       KeyedReference kr = (KeyedReference)keyedReferenceVector.elementAt(i);
-%>
-    addCategoryRow("publishBusinessAdvancedCategories");
-    setCategoryRowSettings("publishBusinessAdvancedCategories",<%=i%>,"<%=HTMLUtils.JSMangle(kr.getTModelKey())%>","<%=HTMLUtils.JSMangle(kr.getKeyName())%>","<%=HTMLUtils.JSMangle(kr.getKeyValue())%>");
-<%
-     }
-   }
-  
-   DiscoveryURLs discoveryURLs = (DiscoveryURLs)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS);
-   if (discoveryURLs != null)
-   {
-     Vector discoveryURLVector = discoveryURLs.getDiscoveryURLVector();
-     for (int i=0;i<discoveryURLVector.size();i++)
-     {
-       DiscoveryURL discoveryURL = (DiscoveryURL)discoveryURLVector.elementAt(i);
-%>
-    addDiscoveryURLRow("publishBusinessAdvancedDiscoveryURLs");
-    setDiscoveryURLRowSettings("publishBusinessAdvancedDiscoveryURLs",<%=i%>,"<%=HTMLUtils.JSMangle(discoveryURL.getText())%>");
-<%
-       if (!formToolPI.isRowInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS,i))
-       {
-%>
-    highlightErrantRow(publishBusinessAdvancedDiscoveryURLsTable.rows[<%=i%>+numberOfHeaderRows],"errantrow");
-<%
-       }
-     }
-   }
-%>       
-    showPublishForm(<%=UDDIActionInputs.QUERY_ITEM_BUSINESSES%>,<%=publishBusinessStyleIndex%>);
-  }
-
-  function setDefaultsForPublishServiceForms()
-  {
-<%
-   String publishServiceStyleIndex = (String)formToolPI.getProperty(UDDIActionInputs.QUERY_STYLE_SERVICES);
-%>
-    document.forms[styleForms[<%=UDDIActionInputs.QUERY_ITEM_SERVICES%>]].<%=UDDIActionInputs.QUERY_STYLE_SERVICES%>[<%=publishServiceStyleIndex%>].checked = true;
-    var publishServiceSimpleSection = document.getElementById(publishServiceSectionIds[<%=UDDIActionInputs.QUERY_STYLE_SIMPLE%>]);
-    var publishServiceSimpleForm = publishServiceSimpleSection.getElementsByTagName("form").item(0);
-    setAuthenticationSectionDefaults(publishServiceSimpleForm);
-<%
-   Vector serviceBusiness = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_BUSINESS);
-   Vector serviceBusinessCopy = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_BUSINESS_COPY);
-   if (serviceBusiness != null)
-   {
-     if (serviceBusinessCopy == null)
-       serviceBusinessCopy = new Vector();
-     else
-       serviceBusinessCopy.removeAllElements();
-     for (int i=0;i<serviceBusiness.size();i++)
-     {
-       ListElement listElement = (ListElement)serviceBusiness.elementAt(i);
-       int targetNodeId = listElement.getTargetNodeId();
-       int targetToolId = listElement.getTargetToolId();
-       int targetViewId = listElement.getTargetViewId();
-       String url = SelectSubQueryItemAction.getActionLink(targetNodeId,targetToolId,targetViewId,subQueryKeyProperty.getSubQueryKey(),UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_BUSINESS,i,UDDIActionInputs.QUERY_ITEM_BUSINESSES,false);
-       BusinessEntity be = (BusinessEntity)listElement.getObject();
-       serviceBusinessCopy.addElement(serviceBusiness.elementAt(i));
-%>
-    addResultRow("publishServiceSimpleBusiness",<%=targetNodeId%>,"<%=response.encodeURL(controller.getPathWithContext(url))%>","<%=HTMLUtils.JSMangle(be.getDefaultNameString())%>","<%=HTMLUtils.JSMangle(be.getDefaultDescriptionString())%>");
-<%
-     }
-     formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_BUSINESS_COPY,serviceBusinessCopy);
-   }
-   else
-   {
-     serviceBusiness = new Vector();
-     serviceBusinessCopy = new Vector();
-     formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_BUSINESS,serviceBusiness);
-     formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_BUSINESS_COPY,serviceBusinessCopy);
-   }
-%>
-<%
-   Vector serviceInterfaces = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES);
-   Vector serviceInterfacesCopy = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES_COPY);
-   if (serviceInterfaces != null)
-   {
-     if (serviceInterfacesCopy == null)
-       serviceInterfacesCopy = new Vector();
-     else
-       serviceInterfacesCopy.removeAllElements();
-     for (int i=0;i<serviceInterfaces.size();i++)
-     {
-       ListElement listElement = (ListElement)serviceInterfaces.elementAt(i);
-       int targetNodeId = listElement.getTargetNodeId();
-       int targetToolId = listElement.getTargetToolId();
-       int targetViewId = listElement.getTargetViewId();
-       String url = SelectSubQueryItemAction.getActionLink(targetNodeId,targetToolId,targetViewId,subQueryKeyProperty.getSubQueryKey(),UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES,i,UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES,false);
-       TModel tModel = (TModel)listElement.getObject();
-       serviceInterfacesCopy.addElement(serviceInterfaces.elementAt(i));
-%>
-    addResultRow("publishServiceAdvancedServiceInterface",<%=targetNodeId%>,"<%=response.encodeURL(controller.getPathWithContext(url))%>","<%=HTMLUtils.JSMangle(tModel.getNameString())%>","<%=HTMLUtils.JSMangle(tModel.getDefaultDescriptionString())%>");
-<%
-     }
-     formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES_COPY,serviceInterfacesCopy);
-   }
-   else
-   {
-     serviceInterfaces = new Vector();
-     serviceInterfacesCopy = new Vector();
-     formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES,serviceInterfaces);
-     formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES_COPY,serviceInterfacesCopy);
-   }
-%>
-    publishServiceSimpleForm.<%=ActionInputs.QUERY_INPUT_WSDL_URL%>.value = "<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_WSDL_URL))%>";
-    publishServiceSimpleForm.<%=UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME%>.value = "<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME))%>";
-    publishServiceSimpleForm.<%=UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_DESCRIPTION%>.value = "<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_DESCRIPTION))%>";
-
-    // Advanced form details.
-    var publishServiceAdvancedSection = document.getElementById(publishServiceSectionIds[<%=UDDIActionInputs.QUERY_STYLE_ADVANCED%>]);
-    var publishServiceAdvancedForm = publishServiceAdvancedSection.getElementsByTagName("form").item(0);
-    setAuthenticationSectionDefaults(publishServiceAdvancedForm);
-    var publishServiceAdvancedNamesTable = getTable("publishServiceAdvancedNames");
-    var publishServiceAdvancedDescriptionsTable = getTable("publishServiceAdvancedDescriptions");
-<%
-   serviceBusiness = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS);
-   serviceBusinessCopy = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS_COPY);
-   if (serviceBusiness != null)
-   {
-     if (serviceBusinessCopy == null)
-       serviceBusinessCopy = new Vector();
-     else
-       serviceBusinessCopy.removeAllElements();
-     for (int i=0;i<serviceBusiness.size();i++)
-     {
-       ListElement listElement = (ListElement)serviceBusiness.elementAt(i);
-       int targetNodeId = listElement.getTargetNodeId();
-       int targetToolId = listElement.getTargetToolId();
-       int targetViewId = listElement.getTargetViewId();
-       String url = SelectSubQueryItemAction.getActionLink(targetNodeId,targetToolId,targetViewId,subQueryKeyProperty.getSubQueryKey(),UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS,i,UDDIActionInputs.QUERY_ITEM_BUSINESSES,false);
-       BusinessEntity be = (BusinessEntity)listElement.getObject();
-       serviceBusinessCopy.addElement(serviceBusiness.elementAt(i));
-%>
-    addResultRow("publishServiceAdvancedBusiness",<%=targetNodeId%>,"<%=response.encodeURL(controller.getPathWithContext(url))%>","<%=HTMLUtils.JSMangle(be.getDefaultNameString())%>","<%=HTMLUtils.JSMangle(be.getDefaultDescriptionString())%>");
-<%
-     }
-     formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS_COPY,serviceBusinessCopy);
-   }
-   else
-   {
-     serviceBusiness = new Vector();
-     serviceBusinessCopy = new Vector();
-     formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS,serviceBusiness);
-     formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS_COPY,serviceBusinessCopy);
-   }
-%>
-    publishServiceAdvancedForm.<%=ActionInputs.QUERY_INPUT_WSDL_URL%>.value = "<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL))%>";
-<%
-   Vector serviceNameVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES);
-   if (serviceNameVector != null)
-   {
-     for (int i=0;i<serviceNameVector.size();i++)
-     {
-       Name name = (Name)serviceNameVector.elementAt(i);
-%>
-    addLanguageInputRow("publishServiceAdvancedNames","<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_CONTROL_TITLE_NAME_TEXT_VALUE"))%>");
-    setLanguageInputRowSettings("publishServiceAdvancedNames",<%=i%>,"<%=HTMLUtils.JSMangle(name.getLang())%>","<%=HTMLUtils.JSMangle(name.getText())%>");
-<%
-       if (!formToolPI.isRowInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES,i))
-       {
-%>
-    highlightErrantRow(publishServiceAdvancedNamesTable.rows[<%=i%>+numberOfHeaderRows],"errantrow");
-<%
-       }
-     }
-   }
-
-   Vector serviceDescriptionVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS);
-   if (serviceDescriptionVector != null)
-   {
-     for (int i=0;i<serviceDescriptionVector.size();i++)
-     {
-       Description description = (Description)serviceDescriptionVector.elementAt(i);
-%>
-    addLanguageInputRow("publishServiceAdvancedDescriptions","<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_CONTROL_TITLE_DESCRIPTION_TEXT_VALUE"))%>");
-    setLanguageInputRowSettings("publishServiceAdvancedDescriptions",<%=i%>,"<%=HTMLUtils.JSMangle(description.getLang())%>","<%=HTMLUtils.JSMangle(description.getText())%>");
-<%
-       if (!formToolPI.isRowInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS,i))
-       {
-%>
-    highlightErrantRow(publishServiceAdvancedDescriptionsTable.rows[<%=i%>+numberOfHeaderRows],"errantrow");
-<%
-       }
-     }
-   }
-
-   CategoryBag serviceCatBag = (CategoryBag)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES);
-   if (serviceCatBag != null)
-   {
-     Vector keyedReferenceVector = serviceCatBag.getKeyedReferenceVector();
-     for (int i=0;i<keyedReferenceVector.size();i++)
-     {
-       KeyedReference kr = (KeyedReference)keyedReferenceVector.elementAt(i);
-%>
-    addCategoryRow("publishServiceAdvancedCategories");
-    setCategoryRowSettings("publishServiceAdvancedCategories",<%=i%>,"<%=HTMLUtils.JSMangle(kr.getTModelKey())%>","<%=HTMLUtils.JSMangle(kr.getKeyName())%>","<%=HTMLUtils.JSMangle(kr.getKeyValue())%>");
-<%
-     }
-   }
-%>
-    showPublishForm(<%=UDDIActionInputs.QUERY_ITEM_SERVICES%>,<%=publishServiceStyleIndex%>);
-  }
-
-  function setDefaultsForPublishServiceInterfaceForms()
-  {
-<%
-   String publishServiceInterfaceStyleIndex = (String)formToolPI.getProperty(UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES);
-%>
-    document.forms[styleForms[<%=UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES%>]].<%=UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES%>[<%=publishServiceInterfaceStyleIndex%>].checked = true;
-    var publishServiceInterfaceSimpleSection = document.getElementById(publishServiceInterfaceSectionIds[<%=UDDIActionInputs.QUERY_STYLE_SIMPLE%>]);
-    var publishServiceInterfaceSimpleForm = publishServiceInterfaceSimpleSection.getElementsByTagName("form").item(0);
-    setAuthenticationSectionDefaults(publishServiceInterfaceSimpleForm);
-    publishServiceInterfaceSimpleForm.<%=ActionInputs.QUERY_INPUT_WSDL_URL%>.value = "<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_WSDL_URL))%>";
-    publishServiceInterfaceSimpleForm.<%=UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME%>.value = "<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME))%>";
-    publishServiceInterfaceSimpleForm.<%=UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_DESCRIPTION%>.value = "<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_DESCRIPTION))%>";
-
-    // Advanced form details.
-    var publishServiceInterfaceAdvancedSection = document.getElementById(publishServiceInterfaceSectionIds[<%=UDDIActionInputs.QUERY_STYLE_ADVANCED%>]);
-    var publishServiceInterfaceAdvancedForm = publishServiceInterfaceAdvancedSection.getElementsByTagName("form").item(0);
-    setAuthenticationSectionDefaults(publishServiceInterfaceAdvancedForm);
-    publishServiceInterfaceAdvancedForm.<%=ActionInputs.QUERY_INPUT_WSDL_URL%>.value = "<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL))%>";
-    publishServiceInterfaceAdvancedForm.<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME%>.value = "<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME))%>";
-    var publishServiceInterfaceAdvancedDescriptionsTable = getTable("publishServiceInterfaceAdvancedDescriptions");
-<%
-   Vector siDescriptionVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS);
-   if (siDescriptionVector != null)
-   {
-     for (int i=0;i<siDescriptionVector.size();i++)
-     {
-       Description description = (Description)siDescriptionVector.elementAt(i);
-%>
-    addLanguageInputRow("publishServiceInterfaceAdvancedDescriptions","<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_CONTROL_TITLE_DESCRIPTION_TEXT_VALUE"))%>");
-    setLanguageInputRowSettings("publishServiceInterfaceAdvancedDescriptions",<%=i%>,"<%=HTMLUtils.JSMangle(description.getLang())%>","<%=HTMLUtils.JSMangle(description.getText())%>");
-<%
-       if (!formToolPI.isRowInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS,i))
-       {
-%>
-    highlightErrantRow(publishServiceInterfaceAdvancedDescriptionsTable.rows[<%=i%>+numberOfHeaderRows],"errantrow");
-<%
-       }
-     }
-   }
-
-   IdentifierBag siIdBag = (IdentifierBag)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS);
-   if (siIdBag != null)
-   {
-     Vector keyedReferenceVector = siIdBag.getKeyedReferenceVector();
-     for (int i=0;i<keyedReferenceVector.size();i++)
-     {
-       KeyedReference kr = (KeyedReference)keyedReferenceVector.elementAt(i);
-%>
-    addIdentifierRow("publishServiceInterfaceAdvancedIdentifiers");
-    setIdentifierRowSettings("publishServiceInterfaceAdvancedIdentifiers",<%=i%>,"<%=HTMLUtils.JSMangle(kr.getTModelKey())%>","<%=HTMLUtils.JSMangle(kr.getKeyName())%>","<%=HTMLUtils.JSMangle(kr.getKeyValue())%>");
-<%
-     }
-   }
-
-   CategoryBag siCatBag = (CategoryBag)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES);
-   if (siCatBag != null)
-   {
-     Vector keyedReferenceVector = siCatBag.getKeyedReferenceVector();
-     for (int i=0;i<keyedReferenceVector.size();i++)
-     {
-       KeyedReference kr = (KeyedReference)keyedReferenceVector.elementAt(i);
-%>
-    addCategoryRow("publishServiceInterfaceAdvancedCategories");
-    setCategoryRowSettings("publishServiceInterfaceAdvancedCategories",<%=i%>,"<%=HTMLUtils.JSMangle(kr.getTModelKey())%>","<%=HTMLUtils.JSMangle(kr.getKeyName())%>","<%=HTMLUtils.JSMangle(kr.getKeyValue())%>");
-<%
-     }
-   }
-%>
-    showPublishForm(<%=UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES%>,<%=publishServiceInterfaceStyleIndex%>);
-  }
-
-  function showMainForm(publishValue)
-  {
-    closeAllUddiChildWindows();
-    var publish = parseInt(publishValue);
-    for (var i=0;i<sectionIds.length;i++)
-    {
-      if (i == publish)
-        document.getElementById(sectionIds[i]).style.display = "";
-      else
-        document.getElementById(sectionIds[i]).style.display = "none";
-    }
-    var loadScreenTable = document.getElementById("loadScreen");
-    if (loadScreenTable.rows.length > 0)
-      loadScreenTable.deleteRow(0);
-    document.getElementById("mainScreen").style.display = "";
-  }
-
-  function showPublishForm(queryItemIndex,style)
-  {
-    closeAllUddiChildWindows();
-    var publishSectionIds;
-    switch (queryItemIndex)
-    {
-      case <%=UDDIActionInputs.QUERY_ITEM_BUSINESSES%>:
-        publishSectionIds = publishBusinessSectionIds;
-        break;
-      case <%=UDDIActionInputs.QUERY_ITEM_SERVICES%>:
-        publishSectionIds = publishServiceSectionIds;
-        break;
-      case <%=UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES%>:
-      default:
-        publishSectionIds = publishServiceInterfaceSectionIds;
-        break;
-    }
-    for (var i=0;i<publishSectionIds.length;i++)
-    {
-      if (i == style)
-        document.getElementById(publishSectionIds[i]).style.display = "";
-      else
-        document.getElementById(publishSectionIds[i]).style.display = "none";
-    }
-  }
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin" onUnload="closeAllUddiChildWindows()">
-  <div id="contentborder">
-    <table id="loadScreen">
-      <tr>
-        <td class="labels">
-          <%=controller.getMessage("MSG_LOAD_IN_PROGRESS")%>
-        </td>
-      </tr>
-    </table>
-    <div id="mainScreen" style="display:none;">
-<%
-   String titleImagePath = "uddi/images/publish_highlighted.gif";
-   String title = uddiPerspective.getMessage("ALT_PUBLISH");
-%>
-<%@ include file="/forms/formheader.inc" %>
-      <table width="95%" border=0 cellpadding=3 cellspacing=0>
-        <tr>
-          <td class="labels" valign="middle" nowrap>
-            <label for="publish"><%=uddiPerspective.getMessage("FORM_LABEL_PUBLISH")%></label>
-          </td>
-          <td valign="middle" nowrap>
-            <select id="publish" onChange="showMainForm(this.value)" class="selectlist">
-              <option value="<%=UDDIActionInputs.QUERY_ITEM_BUSINESSES%>"><%=uddiPerspective.getMessage("FORM_OPTION_BUSINESS")%>
-              <option value="<%=UDDIActionInputs.QUERY_ITEM_SERVICES%>"><%=uddiPerspective.getMessage("FORM_OPTION_SERVICE")%>
-              <option value="<%=UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES%>"><%=uddiPerspective.getMessage("FORM_OPTION_SERVICE_INTERFACE")%>
-            </select>
-          </td>
-          <td width="90%">&nbsp;</td>
-        </tr>
-      </table>
-    </div>
-<jsp:include page="/uddi/forms/RegPublishBusinessForm.jsp" flush="true"/>
-<jsp:include page="/uddi/forms/RegPublishServiceForm.jsp" flush="true"/>
-<jsp:include page="/uddi/forms/RegPublishServiceInterfaceForm.jsp" flush="true"/>
-  </div>
-<script language="javascript">
-  setDefaults();
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishServiceAdvancedForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishServiceAdvancedForm.jsp
deleted file mode 100644
index bef6c0bce..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishServiceAdvancedForm.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="subQueryKeyProperty" class="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.SubQueryKeyProperty" scope="request"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-   NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
-   Node selectedNode = navigatorManager.getSelectedNode();
-   FormTool formTool = (FormTool)(selectedNode.getCurrentToolManager().getSelectedTool());
-   FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKeyProperty.getSubQueryKey());
-%>
-<div id="publishServiceAdvanced" style="display:none;">
-  <form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/RegPublishServiceAdvancedActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" onSubmit="return processPublishServiceAdvancedForm(this)">
-    <input type="hidden" name="<%=UDDIActionInputs.SUBQUERY_GET%>">  
-    <input type="hidden" name="<%=UDDIActionInputs.NEW_SUBQUERY_INITIATED%>">    
-    <input type="hidden" name="<%=UDDIActionInputs.NEW_SUBQUERY_QUERY_ITEM%>">
-    <table width="95%" border=0 cellpadding=3 cellspacing=0>
-      <tr>
-        <td class="labels" height=10 valign="bottom">
-          <%=uddiPerspective.getMessage("FORM_LABEL_PUBLISH_SERVICE_ADVANCED_DESC")%>
-        </td>
-      </tr>
-    </table>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("publishServiceAdvancedAuthentication");
-%>
-<jsp:include page="/uddi/forms/authentication_table.jsp" flush="true"/>
-<%
-   boolean tableHasErrors = !formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS);
-   String[] busSpecificInfo = {"FORM_LABEL_BUSINESS",(new Boolean(tableHasErrors)).toString(),String.valueOf(UDDIActionInputs.QUERY_ITEM_BUSINESSES),"publishServiceAdvanced",UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS};
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("publishServiceAdvancedBusiness");
-   sectionHeaderInfo.setOtherProperties(busSpecificInfo);
-%>
-<jsp:include page="/uddi/forms/uddiObjects_table.jsp" flush="true"/>
-    <table width="95%" border=0 cellpadding=3 cellspacing=0>
-      <tr>
-        <td nowrap class="labels" height=30 valign="bottom">
-          <label for="input_publish_service_advance_wsdl_url"><%=controller.getMessage("FORM_LABEL_WSDL_URL")%></label>
-<%
-   if (!formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL))
-   {
-%>
-          <%=HTMLUtils.redAsterisk()%>
-<%
-   }
-%>
-        </td>
-        <td nowrap height=30 valign="bottom">
-          <a href="javascript:openWSDLBrowser('publishServiceAdvanced',<%=ActionInputs.WSDL_TYPE_SERVICE%>)"><%=controller.getMessage("FORM_LINK_BROWSE")%></a>
-        </td>
-        <td width="90%">&nbsp;</td>
-      </tr>
-      <tr>
-        <td colspan=3>
-          <input type="text" id="input_publish_service_advance_wsdl_url" name="<%=ActionInputs.QUERY_INPUT_WSDL_URL%>" class="textenter">
-        </td>
-      </tr>
-    </table>
-<%
-   tableHasErrors = !formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES);
-   String[] serviceInterfaceSpecificInfo = {"FORM_LABEL_SERVICE_INTERFACES",(new Boolean(tableHasErrors)).toString(),String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES),"publishServiceAdvanced",UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES};
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("publishServiceAdvancedServiceInterface");
-   sectionHeaderInfo.setOtherProperties(serviceInterfaceSpecificInfo);
-%>
-<jsp:include page="/uddi/forms/uddiObjects_table.jsp" flush="true"/>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("publishServiceAdvancedNames");
-   String[] nameSpecificInfo = {"FORM_LABEL_NAMES","FORM_LABEL_NAME",String.valueOf(!formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES))};
-   sectionHeaderInfo.setOtherProperties(nameSpecificInfo);
-%>
-<jsp:include page="/uddi/forms/languageInput_table.jsp" flush="true"/>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("publishServiceAdvancedDescriptions");
-   String[] descSpecificInfo = {"FORM_LABEL_DESCRIPTIONS","FORM_LABEL_DESCRIPTION",String.valueOf(!formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS))};
-   sectionHeaderInfo.setOtherProperties(descSpecificInfo);
-%>
-<jsp:include page="/uddi/forms/languageInput_table.jsp" flush="true"/>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("publishServiceAdvancedCategories");
-%>
-<jsp:include page="/uddi/forms/categories_table.jsp" flush="true"/>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
-  </form>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishServiceForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishServiceForm.jsp
deleted file mode 100644
index 82a3ff540..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishServiceForm.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<div id="publishService" style="display:none;">
-  <form name="publishServiceStyle">
-    <table width="95%" border=0 cellpadding=3 cellspacing=0>
-      <tr>
-        <td class="labels">
-          <%=uddiPerspective.getMessage("FORM_LABEL_PUBLISH_FORM")%>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input type="radio" id="radio_publish_service_simple" class="radio" name="<%=UDDIActionInputs.QUERY_STYLE_SERVICES%>" onClick="showPublishForm(<%=UDDIActionInputs.QUERY_ITEM_SERVICES%>,<%=UDDIActionInputs.QUERY_STYLE_SIMPLE%>)"><label for="radio_publish_service_simple"><%=uddiPerspective.getMessage("FORM_RADIO_SIMPLE")%></label>
-          <input type="radio" id="radio_publish_service_advance" class="radio" name="<%=UDDIActionInputs.QUERY_STYLE_SERVICES%>" onClick="showPublishForm(<%=UDDIActionInputs.QUERY_ITEM_SERVICES%>,<%=UDDIActionInputs.QUERY_STYLE_ADVANCED%>)"><label for="radio_publish_service_advance"><%=uddiPerspective.getMessage("FORM_RADIO_ADVANCED")%></label>
-        </td>
-      </tr>
-    </table>
-  </form>
-<jsp:include page="/uddi/forms/RegPublishServiceSimpleForm.jsp" flush="true"/>
-<jsp:include page="/uddi/forms/RegPublishServiceAdvancedForm.jsp" flush="true"/>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishServiceInterfaceAdvancedForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishServiceInterfaceAdvancedForm.jsp
deleted file mode 100644
index 24eca7835..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishServiceInterfaceAdvancedForm.jsp
+++ /dev/null
@@ -1,101 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="subQueryKeyProperty" class="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.SubQueryKeyProperty" scope="request"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-   NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
-   Node selectedNode = navigatorManager.getSelectedNode();
-   FormTool formTool = (FormTool)(selectedNode.getCurrentToolManager().getSelectedTool());
-   FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKeyProperty.getSubQueryKey());
-%>
-<div id="publishServiceInterfaceAdvanced" style="display:none;">
-  <form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/RegPublishServiceInterfaceAdvancedActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" onSubmit="return processPublishServiceInterfaceAdvancedForm(this)">
-    <table width="95%" border=0 cellpadding=3 cellspacing=0>
-      <tr>
-        <td class="labels" height=10 valign="bottom">
-          <%=uddiPerspective.getMessage("FORM_LABEL_PUBLISH_SERVICE_INTERFACE_ADVANCED_DESC")%>
-        </td>
-      </tr>
-    </table>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("publishServiceInterfaceAdvancedAuthentication");
-%>
-<jsp:include page="/uddi/forms/authentication_table.jsp" flush="true"/>
-    <table width="95%" border=0 cellpadding=3 cellspacing=0>
-      <tr>
-        <td nowrap class="labels" height=30 valign="bottom">
-          <label for="input_publish_service_interface_advance_wsdl_url"><%=controller.getMessage("FORM_LABEL_WSDL_URL")%></label>
-<%
-   if (!formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL))
-   {
-%>
-          <%=HTMLUtils.redAsterisk()%>
-<%
-   }
-%>
-        </td>
-        <td nowrap height=30 valign="bottom">
-          <a href="javascript:openWSDLBrowser('publishServiceInterfaceAdvanced',<%=ActionInputs.WSDL_TYPE_SERVICE_INTERFACE%>)"><%=controller.getMessage("FORM_LINK_BROWSE")%></a>
-        </td>
-        <td width="90%">&nbsp;</td>
-      </tr>
-      <tr>
-        <td colspan=3>
-          <input type="text" id="input_publish_service_interface_advance_wsdl_url" name="<%=ActionInputs.QUERY_INPUT_WSDL_URL%>" class="textenter">
-        </td>
-      </tr>
-      <tr>
-        <td colspan=3 class="labels">
-          <label for="input_publish_service_interface_advance_name"><%=uddiPerspective.getMessage("FORM_LABEL_NAME")%></label>
-<%
-   if (!formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME))
-   {
-%>
-          <%=HTMLUtils.redAsterisk()%>
-<%
-   }
-%>
-        </td>
-      <tr>
-        <td colspan=3> <input type="text" id="input_publish_service_interface_advance_name" name="<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME%>" class="textenter"> </td>
-      </tr>
-    </table>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("publishServiceInterfaceAdvancedDescriptions");
-   String[] descSpecificInfo = {"FORM_LABEL_DESCRIPTIONS","FORM_LABEL_DESCRIPTION",String.valueOf(!formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS))};
-   sectionHeaderInfo.setOtherProperties(descSpecificInfo);
-%>
-<jsp:include page="/uddi/forms/languageInput_table.jsp" flush="true"/>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("publishServiceInterfaceAdvancedIdentifiers");
-%>
-<jsp:include page="/uddi/forms/identifiers_table.jsp" flush="true"/>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("publishServiceInterfaceAdvancedCategories");
-%>
-<jsp:include page="/uddi/forms/categories_table.jsp" flush="true"/>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
-  </form>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishServiceInterfaceForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishServiceInterfaceForm.jsp
deleted file mode 100644
index 9fa82cdde..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishServiceInterfaceForm.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<div id="publishServiceInterface" style="display:none;">
-  <form name="publishServiceInterfaceStyle">
-    <table width="95%" border=0 cellpadding=3 cellspacing=0>
-      <tr>
-        <td class="labels">
-          <%=uddiPerspective.getMessage("FORM_LABEL_PUBLISH_FORM")%>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input type="radio" id="radio_publish_service_interface_simple" class="radio" name="<%=UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES%>" onClick="showPublishForm(<%=UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES%>,<%=UDDIActionInputs.QUERY_STYLE_SIMPLE%>)"><label for="radio_publish_service_interface_simple"><%=uddiPerspective.getMessage("FORM_RADIO_SIMPLE")%></label>
-          <input type="radio" id="radio_publish_service_interface_advance" class="radio" name="<%=UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES%>" onClick="showPublishForm(<%=UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES%>,<%=UDDIActionInputs.QUERY_STYLE_ADVANCED%>)"><label for="radio_publish_service_interface_advance"><%=uddiPerspective.getMessage("FORM_RADIO_ADVANCED")%></label>
-        </td>
-      </tr>
-    </table>
-  </form>
-<jsp:include page="/uddi/forms/RegPublishServiceInterfaceSimpleForm.jsp" flush="true"/>
-<jsp:include page="/uddi/forms/RegPublishServiceInterfaceAdvancedForm.jsp" flush="true"/>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishServiceInterfaceSimpleForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishServiceInterfaceSimpleForm.jsp
deleted file mode 100644
index 85b06eb1a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishServiceInterfaceSimpleForm.jsp
+++ /dev/null
@@ -1,92 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="subQueryKeyProperty" class="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.SubQueryKeyProperty" scope="request"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-   NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
-   Node selectedNode = navigatorManager.getSelectedNode();
-   FormTool formTool = (FormTool)(selectedNode.getCurrentToolManager().getSelectedTool());
-   FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKeyProperty.getSubQueryKey());
-%>
-<div id="publishServiceInterfaceSimple" style="display:none;">
-  <form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/RegPublishServiceInterfaceSimpleActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" onSubmit="return handleSubmit(this)">
-    <table width="95%" border=0 cellpadding=3 cellspacing=0>
-      <tr>
-        <td class="labels" height=10 valign="bottom">
-          <%=uddiPerspective.getMessage("FORM_LABEL_PUBLISH_SERVICE_INTERFACE_SIMPLE_DESC")%>
-        </td>
-      </tr>
-    </table>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("publishServiceInterfaceSimpleAuthentication");
-%>      
-<jsp:include page="/uddi/forms/authentication_table.jsp" flush="true"/>  
-    <table width="95%" border=0 cellpadding=3 cellspacing=0>
-      <tr>
-        <td nowrap class="labels" height=30 valign="bottom">
-          <label for="input_publish_service_interface_simple_wsdl_url"><%=controller.getMessage("FORM_LABEL_WSDL_URL")%></label>
-<%
-   if (!formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_WSDL_URL))
-   {
-%>
-          <%=HTMLUtils.redAsterisk()%>
-<%
-   }
-%>                          
-        </td>
-        <td nowrap height=30 valign="bottom">
-          <a href="javascript:openWSDLBrowser('publishServiceInterfaceSimple',<%=ActionInputs.WSDL_TYPE_SERVICE_INTERFACE%>)"><%=controller.getMessage("FORM_LINK_BROWSE")%></a>
-        </td>
-        <td width="90%">&nbsp;</td>
-      </tr>
-      <tr>
-        <td colspan=3>
-          <input type="text" id="input_publish_service_interface_simple_wsdl_url" name="<%=ActionInputs.QUERY_INPUT_WSDL_URL%>" class="textenter">
-        </td>
-      </tr>
-      <tr>
-        <td colspan=3 class="labels">
-          <label for="input_publish_service_interface_simple_name"><%=uddiPerspective.getMessage("FORM_LABEL_NAME")%></label>
-<%
-   if (!formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME))
-   {
-%>
-          <%=HTMLUtils.redAsterisk()%>
-<%
-   }
-%>
-        </td>
-      <tr>
-        <td colspan=3> <input type="text" id="input_publish_service_interface_simple_name" name="<%=UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME%>" class="textenter"> </td>
-      </tr>
-      <tr>
-        <td colspan=3 class="labels">
-          <label for="input_publish_service_interface_simple_desc"><%=uddiPerspective.getMessage("FORM_LABEL_DESCRIPTION")%></label>
-        </td>
-      </tr>
-      <tr>
-        <td colspan=3> <input type="text" id="input_publish_service_interface_simple_desc" name="<%=UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_DESCRIPTION%>" class="textenter"> </td>
-      </tr>          
-    </table>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
-  </form>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishServiceSimpleForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishServiceSimpleForm.jsp
deleted file mode 100644
index aacaf1e47..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishServiceSimpleForm.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="subQueryKeyProperty" class="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.SubQueryKeyProperty" scope="request"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-   NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
-   Node selectedNode = navigatorManager.getSelectedNode();
-   FormTool formTool = (FormTool)(selectedNode.getCurrentToolManager().getSelectedTool());
-   FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKeyProperty.getSubQueryKey());
-%>
-<div id="publishServiceSimple" style="display:none;">
-  <form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/RegPublishServiceSimpleActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" onSubmit="return processPublishServiceSimpleForm(this)">
-    <input type="hidden" name="<%=UDDIActionInputs.SUBQUERY_GET%>">  
-    <input type="hidden" name="<%=UDDIActionInputs.NEW_SUBQUERY_INITIATED%>">
-    <input type="hidden" name="<%=UDDIActionInputs.NEW_SUBQUERY_QUERY_ITEM%>">
-    <table width="95%" border=0 cellpadding=3 cellspacing=0>
-      <tr>
-        <td class="labels" height=10 valign="bottom">
-          <%=uddiPerspective.getMessage("FORM_LABEL_PUBLISH_SERVICE_SIMPLE_DESC")%>
-        </td>
-      </tr>
-    </table>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("publishServiceSimpleAuthentication");
-%>
-<jsp:include page="/uddi/forms/authentication_table.jsp" flush="true"/>
-<%
-   boolean tableHasErrors = !formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_BUSINESS);
-   String[] busSpecificInfo = {"FORM_LABEL_BUSINESS",(new Boolean(tableHasErrors)).toString(),String.valueOf(UDDIActionInputs.QUERY_ITEM_BUSINESSES),"publishServiceSimple",UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_BUSINESS};
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("publishServiceSimpleBusiness");
-   sectionHeaderInfo.setOtherProperties(busSpecificInfo);
-%>
-<jsp:include page="/uddi/forms/uddiObjects_table.jsp" flush="true"/>
-    <table width="95%" border=0 cellpadding=3 cellspacing=0>
-      <tr>
-        <td nowrap class="labels" height=30 valign="bottom">
-          <label for="input_publish_service_simple_wsdl_url"><%=controller.getMessage("FORM_LABEL_WSDL_URL")%></label>
-<%
-   if (!formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_WSDL_URL))
-   {
-%>
-          <%=HTMLUtils.redAsterisk()%>
-<%
-   }
-%>
-        </td>
-        <td nowrap height=30 valign="bottom">
-          <a href="javascript:openWSDLBrowser('publishServiceSimple',<%=ActionInputs.WSDL_TYPE_SERVICE%>)"><%=controller.getMessage("FORM_LINK_BROWSE")%></a>
-        </td>
-        <td width="90%">&nbsp;</td>
-      </tr>
-      <tr>
-        <td colspan=3>
-          <input type="text" id="input_publish_service_simple_wsdl_url" name="<%=ActionInputs.QUERY_INPUT_WSDL_URL%>" class="textenter">
-        </td>
-      </tr>
-      <tr>
-        <td colspan=3 class="labels">
-          <label for="input_publish_service_simple_name"><%=uddiPerspective.getMessage("FORM_LABEL_NAME")%></label>
-<%
-   if (!formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME))
-   {
-%>
-          <%=HTMLUtils.redAsterisk()%>
-<%
-   }
-%>
-        </td>
-      <tr>
-        <td colspan=3> <input type="text" id="input_publish_service_simple_name" name="<%=UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME%>" class="textenter"> </td>
-      </tr>
-      <tr>
-        <td colspan=3 class="labels">
-          <label for="input_publish_service_simple_desc"><%=uddiPerspective.getMessage("FORM_LABEL_DESCRIPTION")%></label>
-        </td>
-      </tr>
-      <tr>
-        <td colspan=3> <input type="text" id="input_publish_service_simple_desc" name="<%=UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_DESCRIPTION%>" class="textenter"> </td>
-      </tr>
-    </table>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
-  </form>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ResultsForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ResultsForm.jsp
deleted file mode 100644
index 4df0217cf..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ResultsForm.jsp
+++ /dev/null
@@ -1,176 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*,
-                                                        org.uddi4j.datatype.business.*,
-                                                        org.uddi4j.datatype.service.*,
-                                                        org.uddi4j.datatype.tmodel.*,
-                                                        java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<jsp:useBean id="subQueryTransferTargetHolder" class="java.util.Vector" scope="request">
-<%
-   subQueryTransferTargetHolder.removeAllElements();
-%>
-</jsp:useBean>   
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-   NodeManager nodeManager = uddiPerspective.getNavigatorManager();
-   Node selectedNode = nodeManager.getSelectedNode();
-   TreeElement treeElement = selectedNode.getTreeElement();
-   SubQueryTransferTarget subQueryTransferTarget = null;
-   boolean hasTarget = false;
-   if (treeElement instanceof QueryElement)
-   {
-     subQueryTransferTarget = (SubQueryTransferTarget)treeElement.getPropertyAsObject(UDDIModelConstants.SUBQUERY_TRANSFER_TARGET);
-     if (subQueryTransferTarget != null && subQueryTransferTarget.getTargetFormTool() != null)
-     {
-       subQueryTransferTargetHolder.removeAllElements();
-       subQueryTransferTargetHolder.addElement(subQueryTransferTarget);
-       hasTarget = true;
-     }
-   }
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=uddiPerspective.getMessage("FORM_TITLE_RESULTS")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/resumeproxyloadpage.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/results.jsp" flush="true"/>
-<script language="javascript">
-  function setDefaults()
-  {
-<%
-   Vector childNodes = selectedNode.getChildNodes();
-   for (int i=0;i<childNodes.size();i++)
-   {
-     Node childNode = (Node)childNodes.elementAt(i);
-     String url = SelectNavigatorNodeAction.getActionLink(childNode.getNodeId(),false);
-     String name = null;
-     String description = null;
-     if (childNode instanceof BusinessNode)
-     {
-       BusinessElement busElement = (BusinessElement)childNode.getTreeElement();
-       BusinessEntity be = busElement.getBusinessEntity();
-       name = be.getDefaultNameString();
-       description = be.getDefaultDescriptionString();
-     }
-     else if (childNode instanceof ServiceNode)
-     {
-       ServiceElement serviceElement = (ServiceElement)childNode.getTreeElement();
-       BusinessService bs = serviceElement.getBusinessService();
-       name = bs.getDefaultNameString();
-       description = bs.getDefaultDescriptionString();
-     }
-     else if (childNode instanceof ServiceInterfaceNode)
-     {
-       ServiceInterfaceElement siElement = (ServiceInterfaceElement)childNode.getTreeElement();
-       TModel tModel = siElement.getTModel();
-       name = tModel.getNameString();
-       description = tModel.getDefaultDescriptionString();
-     }
-%>
-    addResultRow("Results",<%=childNode.getNodeId()%>,"<%=response.encodeURL(controller.getPathWithContext(url))%>","<%=HTMLUtils.JSMangle(name)%>","<%=HTMLUtils.JSMangle(description)%>");
-<%
-   }
-%>
-    var loadScreenTable = document.getElementById("loadScreen");
-    if (loadScreenTable.rows.length > 0)
-      loadScreenTable.deleteRow(0);
-    document.getElementById("mainScreen").style.display = "";
-  }
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-<div id="content">
-  <table id="loadScreen">
-    <tr>
-      <td>
-        <%=controller.getMessage("MSG_LOAD_IN_PROGRESS")%>
-      </td>
-    </tr>
-  </table>
-  <div id="mainScreen" style="display:none;">
-<%
-   String title = uddiPerspective.getMessage("ALT_QUERY_RESULTS");
-   String titleImagePath = "images/details_highlighted.gif";
-%>
-<%@ include file="/uddi/forms/resultsformheader.inc" %>
-    <form target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" method="post" enctype="multipart/form-data" style="margin-top:10px;">
-<%
-   sectionHeaderInfo.clear();
-   String tableTitle;
-   int itemType = Integer.parseInt(treeElement.getPropertyAsString(UDDIModelConstants.QUERY_TYPE));   
-   switch (itemType)
-   {
-     case UDDIActionInputs.QUERY_ITEM_BUSINESSES:
-       tableTitle = uddiPerspective.getMessage("FORM_OPTION_BUSINESSES");
-       break;
-     case UDDIActionInputs.QUERY_ITEM_SERVICES:
-       tableTitle = uddiPerspective.getMessage("FORM_OPTION_SERVICES");
-       break;
-     case UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES:
-     default:
-       tableTitle = uddiPerspective.getMessage("FORM_OPTION_SERVICE_INTERFACES");
-   }
-   String[] otherProperties = {tableTitle,""};
-   sectionHeaderInfo.setContainerId("Results");
-   sectionHeaderInfo.setOtherProperties(otherProperties);
-%>
-<jsp:include page="/uddi/forms/results_table.jsp" flush="true"/>
-      <table border=0 cellpadding=2 cellspacing=0>
-        <tr>
-<%
-   if (hasTarget)
-   {
-%>
-          <td height=40 align="bottom" nowrap>
-            <input type="button" value="<%=uddiPerspective.getMessage("FORM_BUTTON_TRANSFER")%>" onClick="transferSelections('Results',this.form)" class="button">
-          </td>
-<%
-   }
-%>
-          <td height=40 align="bottom" nowrap>
-            <input type="button" value="<%=controller.getMessage("FORM_BUTTON_REFRESH")%>" onClick="refreshSelections('Results',this.form)" class="button">
-          </td>
-          <td height=40 align="bottom" nowrap>
-            <input type="button" value="<%=uddiPerspective.getMessage("FORM_BUTTON_ADD_TO_FAVORITES")%>" onClick="addSelectionsToFavorites('Results',this.form)" class="button">
-          </td>
-          <td height=40 align="bottom" nowrap>
-            <input type="button" value="<%=uddiPerspective.getMessage("FORM_BUTTON_CLEAR")%>" onClick="clearSelections('Results',this.form)" class="button">
-          </td>
-          <td nowrap width="90%">&nbsp;</td>
-        </tr>
-      </table>
-    </form>
-  </div>
-</div>
-</div>
-<script language="javascript">
-  setDefaults();
-  resumeProxyLoadPage();
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ServiceDetailsForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ServiceDetailsForm.jsp
deleted file mode 100644
index 8efc51bcc..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ServiceDetailsForm.jsp
+++ /dev/null
@@ -1,278 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*,
-                                                        org.uddi4j.datatype.*,
-                                                        org.uddi4j.util.*,
-                                                        java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-   NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
-   Node selectedNode = navigatorManager.getSelectedNode();
-   ToolManager currentToolManager = selectedNode.getCurrentToolManager();
-   FormTool formTool = (FormTool)(currentToolManager.getSelectedTool());
-   ServiceElement serviceElement = (ServiceElement)selectedNode.getTreeElement();
-   UDDIMainNode uddiMainNode = (UDDIMainNode)navigatorManager.getRootNode();
-   RegistryNode regNode = uddiMainNode.getRegistryNode(selectedNode);
-   RegistryElement regElement = (RegistryElement)regNode.getTreeElement();
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=uddiPerspective.getMessage("FORM_TITLE_SERVICE_DETAILS")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/resumeproxyloadpage.js"))%>">
-</script>
-<jsp:include page="/scripts/formsubmit.jsp" flush="true"/>
-<jsp:include page="/uddi/scripts/detailstables.jsp" flush="true"/>
-<script language="javascript">
-  function setDefaults()
-  {
-    var serviceDetailsWSDLURLTable = getTable("serviceDetailsWSDLURL");
-    var serviceDetailsNamesTable = getTable("serviceDetailsNames");
-    var serviceDetailsDescriptionsTable = getTable("serviceDetailsDescriptions");
-<%
-   ListElement wsdlURLListElement = (ListElement)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL);
-   String wsdlURL = null;
-   if (wsdlURLListElement == null)
-   {
-     try
-     {
-       Uddi4jHelper uddi4jHelper = new Uddi4jHelper();
-       wsdlURL = uddi4jHelper.getWSDL(serviceElement.getBusinessService(), serviceElement.getRegistryElement().getProxy());
-       uddi4jHelper.getWSDLDefinition(wsdlURL);
-       if (wsdlURL == null)
-         wsdlURL = "temp.wsdl";
-     }
-     catch (Throwable t)
-     {
-       wsdlURL = "";
-       formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL);
-     }
-     wsdlURLListElement = new ListElement(wsdlURL);
-     wsdlURLListElement.setTargetViewToolInfo(-1,-1,0);
-     formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL,wsdlURLListElement);
-   }
-   else
-     wsdlURL = (String)wsdlURLListElement.getObject();
-   boolean isError = !formTool.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL);
-   boolean isNewItem = (wsdlURLListElement.getTargetViewId() == ActionInputs.VIEWID_DEFAULT);
-%>
-    addDetailsSingleItemRow("serviceDetailsWSDLURL",<%=isError||isNewItem%>);
-    setDetailsWSDLURLSingleItemRow("serviceDetailsWSDLURL",<%=UDDIActionInputs.WSDL_TYPE_SERVICE%>,"<%=HTMLUtils.JSMangle(wsdlURL)%>");
-<%
-   if (isError)
-   {
-%>
-    highlightErrantRow(serviceDetailsWSDLURLTable.rows[numberOfHeaderRows],"errantRow");
-<%
-   }
-
-   Vector nameIndexVector = (Vector)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES);
-   if (nameIndexVector != null)
-   {
-     for (int i=0;i<nameIndexVector.size();i++)
-     {
-       ListElement listElement = (ListElement)nameIndexVector.elementAt(i);
-       Name name = (Name)listElement.getObject();
-       isError = !formTool.isRowInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES,i);
-       isNewItem = (listElement.getTargetViewId() == ActionInputs.VIEWID_DEFAULT);
-%>
-    addDetailsLanguageInputRow("serviceDetailsNames","<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_CONTROL_TITLE_NAME_TEXT_VALUE"))%>",<%=isError||isNewItem%>);
-    setDetailsLanguageInputRow("serviceDetailsNames",<%=i%>,<%=listElement.getViewId()%>,"<%=name.getLang()%>","<%=HTMLUtils.JSMangle(name.getText())%>");
-<%
-       if (isError)
-       {
-%>
-    highlightErrantRow(serviceDetailsNamesTable.rows[<%=i%>+numberOfHeaderRows],"errantRow");
-<%
-       }
-     }
-   }
-
-   Vector descriptionIndexVector = (Vector)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS);
-   if (descriptionIndexVector != null)
-   {
-     for (int i=0;i<descriptionIndexVector.size();i++)
-     {
-       ListElement listElement = (ListElement)descriptionIndexVector.elementAt(i);
-       Description description = (Description)listElement.getObject();
-       isError = !formTool.isRowInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS,i);
-       isNewItem = (listElement.getTargetViewId() == ActionInputs.VIEWID_DEFAULT);
-%>
-    addDetailsLanguageInputRow("serviceDetailsDescriptions","<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_CONTROL_TITLE_DESCRIPTION_TEXT_VALUE"))%>",<%=isError||isNewItem%>);
-    setDetailsLanguageInputRow("serviceDetailsDescriptions",<%=i%>,<%=listElement.getViewId()%>,"<%=description.getLang()%>","<%=HTMLUtils.JSMangle(description.getText())%>");
-<%
-       if (isError)
-       {
-%>
-    highlightErrantRow(serviceDetailsDescriptionsTable.rows[<%=i%>+numberOfHeaderRows],"errantRow");
-<%
-       }
-     }
-   }
-
-   Vector catVector = (Vector)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES);
-   if (catVector != null)
-   {
-     for (int i=0;i<catVector.size();i++)
-     {
-       ListElement listElement = (ListElement)catVector.elementAt(i);
-       KeyedReference kr = (KeyedReference)listElement.getObject();
-       isError = !formTool.isRowInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES,i);
-       isNewItem = (listElement.getTargetViewId() == ActionInputs.VIEWID_DEFAULT);
-%>
-    addDetailsCategoryRow("serviceDetailsCategories",<%=isError||isNewItem%>);
-    setDetailsCategoryRow("serviceDetailsCategories",<%=i%>,<%=listElement.getViewId()%>,"<%=HTMLUtils.JSMangle(kr.getTModelKey())%>","<%=HTMLUtils.JSMangle(kr.getKeyName())%>","<%=HTMLUtils.JSMangle(kr.getKeyValue())%>");
-<%
-     }
-   }
-
-   // Authentication.
-   if (!regElement.isLoggedIn())
-   {
-     String publishURL = (String)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-     String userId = (String)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-     String password = (String)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-%>
-    document.forms[0].<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL%>.value = "<%=HTMLUtils.JSMangle(publishURL)%>";
-    document.forms[0].<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID%>.value = "<%=HTMLUtils.JSMangle(userId)%>";
-    document.forms[0].<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD%>.value = "<%=HTMLUtils.JSMangle(password)%>";
-    document.getElementById("serviceDetailsAuthentication").style.display = "";
-<%
-   }
-%>
-
-    showMainForm();
-  }
-
-  function showMainForm()
-  {
-    closeAllUddiChildWindows();
-    var loadScreenTable = document.getElementById("loadScreen");
-    if (loadScreenTable.rows.length > 0)
-      loadScreenTable.deleteRow(0);
-    document.getElementById("mainScreen").style.display = "";
-  }
-
-  function processForm(form)
-  {
-    if (handleSubmit(form))
-    {
-      processDetailsSingleItemTable("serviceDetailsWSDLURL","<%=UDDIActionInputs.WSDL_URL_MODIFIED%>","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL%>",form);
-      processDetailsLanguageInputTable("serviceDetailsNames","<%=UDDIActionInputs.NAME_MODIFIED%>","<%=UDDIActionInputs.NAME_VIEWID%>","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME_LANGUAGE%>","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME%>",form);
-      processDetailsLanguageInputTable("serviceDetailsDescriptions","<%=UDDIActionInputs.DESCRIPTION_MODIFIED%>","<%=UDDIActionInputs.DESCRIPTION_VIEWID%>","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION_LANGUAGE%>","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION%>",form);
-      processDetailsCategoryTable("serviceDetailsCategories",form);
-      return true;
-    }
-    return false;
-  }
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin" onUnload="closeAllUddiChildWindows()">
-  <div id="contentborder">
-    <form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/UpdateServiceActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" onSubmit="return processForm(this)">
-      <table id="loadScreen">
-        <tr>
-          <td class="labels">
-            <%=controller.getMessage("MSG_LOAD_IN_PROGRESS")%>
-          </td>
-        </tr>
-      </table>
-      <div id="mainScreen" style="display:none;">
-<%
-   String titleImagePath = "images/details_highlighted.gif";
-   String title = uddiPerspective.getMessage("ALT_SERVICE_DETAILS");
-%>
-<%@ include file="/forms/formheader.inc" %>
-        <input type="hidden" name="<%=UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY%>" value="<%=formTool.getProperty(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY)%>">
-        <input type="hidden" name="<%=UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY%>" value="<%=formTool.getProperty(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY)%>">
-        <table>
-          <tr>
-            <td class="labels">
-              <%=uddiPerspective.getMessage("FORM_LABEL_DETAILS_EDITABLE",selectedNode.getNodeName())%>
-            </td>
-          </tr>
-          <tr>
-            <td height=20>&nbsp;</td>
-          </tr>
-        </table>
-        <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
-          <tr>
-            <th class="singleheadercolor" height=20 valign="bottom" align="left">
-              <%=uddiPerspective.getMessage("FORM_LABEL_SERVICE_KEY")%>
-            </th>
-          </tr>
-          <tr>
-            <td class="tablecells">
-              <%=formTool.getProperty(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY)%>
-            </td>
-          </tr>
-        </table>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("serviceDetailsWSDLURL");
-   sectionHeaderInfo.setOtherProperties(controller.getMessage("FORM_LABEL_WSDL_URL"));
-%>
-<jsp:include page="/uddi/forms/detailsSingleItem_table.jsp" flush="true"/>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("serviceDetailsNames");
-   String[] nameSpecificInfo = {"FORM_LABEL_NAMES","FORM_LABEL_NAME",String.valueOf(!formTool.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES))};
-   sectionHeaderInfo.setOtherProperties(nameSpecificInfo);
-%>
-<jsp:include page="/uddi/forms/detailsLanguageInput_table.jsp" flush="true"/>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("serviceDetailsDescriptions");
-   String[] descSpecificInfo = {"FORM_LABEL_DESCRIPTIONS","FORM_LABEL_DESCRIPTION",String.valueOf(!formTool.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS))};
-   sectionHeaderInfo.setOtherProperties(descSpecificInfo);
-%>
-<jsp:include page="/uddi/forms/detailsLanguageInput_table.jsp" flush="true"/>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("serviceDetailsCategories");
-%>
-<jsp:include page="/uddi/forms/detailsCategories_table.jsp" flush="true"/>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("serviceDetailsAuthentication");
-%>
-<jsp:include page="/uddi/forms/authentication_table.jsp" flush="true"/>
-<jsp:useBean id="currentToolManagerHash" class="java.util.Hashtable" scope="request">
-<%
-  currentToolManagerHash.put(ActionInputs.CURRENT_TOOL_MANAGER,currentToolManager);
-%>
-</jsp:useBean>
-<jsp:include page="/forms/otherActions.jsp" flush="true"/>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
-      </div>
-    </form>
-  </div>
-<script language="javascript">
-  setDefaults();
-  resumeProxyLoadPage();
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ServiceInterfaceDetailsForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ServiceInterfaceDetailsForm.jsp
deleted file mode 100644
index 31e38c08b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ServiceInterfaceDetailsForm.jsp
+++ /dev/null
@@ -1,292 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*,
-                                                        org.uddi4j.datatype.*,
-                                                        org.uddi4j.util.*,
-                                                        java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-   NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
-   Node selectedNode = navigatorManager.getSelectedNode();
-   ToolManager currentToolManager = selectedNode.getCurrentToolManager();
-   FormTool formTool = (FormTool)(currentToolManager.getSelectedTool());
-   ServiceInterfaceElement siElement = (ServiceInterfaceElement)selectedNode.getTreeElement();   
-   UDDIMainNode uddiMainNode = (UDDIMainNode)navigatorManager.getRootNode();
-   RegistryNode regNode = uddiMainNode.getRegistryNode(selectedNode);
-   RegistryElement regElement = (RegistryElement)regNode.getTreeElement();
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=uddiPerspective.getMessage("FORM_TITLE_SERVICE_INTERFACE_DETAILS")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/resumeproxyloadpage.js"))%>">
-</script>
-<jsp:include page="/scripts/formsubmit.jsp" flush="true"/>
-<jsp:include page="/uddi/scripts/detailstables.jsp" flush="true"/>
-<script language="javascript">
-  function setDefaults()
-  {
-    var serviceInterfaceDetailsWSDLURLTable = getTable("serviceInterfaceDetailsWSDLURL");
-    var serviceInterfaceDetailsNameTable = getTable("serviceInterfaceDetailsName");
-    var serviceInterfaceDetailsDescriptionsTable = getTable("serviceInterfaceDetailsDescriptions");
-    var serviceInterfaceDetailsIdentifiersTable = getTable("serviceInterfaceDetailsIdentifiers");
-    var serviceInterfaceDetailsCategoriesTable = getTable("serviceInterfaceDetailsCategories");
-<%
-   ListElement wsdlURLListElement = (ListElement)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL);
-   String wsdlURL = null;
-   if (wsdlURLListElement == null)
-   {
-     try
-     {
-       Uddi4jHelper uddi4jHelper = new Uddi4jHelper();
-       wsdlURL = uddi4jHelper.getWSDL(siElement.getTModel());
-       uddi4jHelper.getWSDLDefinition(wsdlURL);
-       if (wsdlURL == null)
-         wsdlURL = "temp.wsdl";
-     }
-     catch (Throwable t)
-     {
-       wsdlURL = "";
-       formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL);
-     }
-     wsdlURLListElement = new ListElement(wsdlURL);
-     wsdlURLListElement.setTargetViewToolInfo(-1,-1,0);
-     formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL,wsdlURLListElement);
-   }
-   else
-     wsdlURL = (String)wsdlURLListElement.getObject();
-   boolean isError = !formTool.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL);
-   boolean isNewItem = (wsdlURLListElement.getTargetViewId() == ActionInputs.VIEWID_DEFAULT);
-%>
-    addDetailsSingleItemRow("serviceInterfaceDetailsWSDLURL",<%=isError||isNewItem%>);
-    setDetailsWSDLURLSingleItemRow("serviceInterfaceDetailsWSDLURL",<%=ActionInputs.WSDL_TYPE_SERVICE_INTERFACE%>,"<%=HTMLUtils.JSMangle(wsdlURL)%>");
-<%
-   if (isError)
-   {
-%>
-    highlightErrantRow(serviceInterfaceDetailsWSDLURLTable.rows[numberOfHeaderRows],"errantRow");
-<%   
-   }
-
-   ListElement nameListElement = (ListElement)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME);
-   String name = (String)nameListElement.getObject();
-   isError = !formTool.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME);
-   isNewItem = (nameListElement.getTargetViewId() == ActionInputs.VIEWID_DEFAULT);
-%>
-    addDetailsSingleItemRow("serviceInterfaceDetailsName",<%=isError||isNewItem%>);
-    setDetailsNameSingleItemRow("serviceInterfaceDetailsName","<%=HTMLUtils.JSMangle(name)%>");
-<%
-   if (isError)
-   {
-%>
-    highlightErrantRow(serviceInterfaceDetailsNameTable.rows[numberOfHeaderRows],"errantRow");
-<%
-   }
-   
-   Vector descriptionIndexVector = (Vector)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS);
-   if (descriptionIndexVector != null)
-   {
-     for (int i=0;i<descriptionIndexVector.size();i++)
-     {
-       ListElement listElement = (ListElement)descriptionIndexVector.elementAt(i);
-       Description description = (Description)listElement.getObject();
-       isError = !formTool.isRowInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS,i);
-       isNewItem = (listElement.getTargetViewId() == ActionInputs.VIEWID_DEFAULT);
-%>
-    addDetailsLanguageInputRow("serviceInterfaceDetailsDescriptions","<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_CONTROL_TITLE_DESCRIPTION_TEXT_VALUE"))%>",<%=isError||isNewItem%>);
-    setDetailsLanguageInputRow("serviceInterfaceDetailsDescriptions",<%=i%>,<%=listElement.getViewId()%>,"<%=description.getLang()%>","<%=HTMLUtils.JSMangle(description.getText())%>");
-<%
-       if (isError)
-       {
-%>
-    highlightErrantRow(serviceInterfaceDetailsDescriptionsTable.rows[<%=i%>+numberOfHeaderRows],"errantRow");
-<%       
-       }
-     }
-   }
-   
-   Vector idVector = (Vector)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS);
-   if (idVector != null)
-   {
-     for (int i=0;i<idVector.size();i++)
-     {
-       ListElement listElement = (ListElement)idVector.elementAt(i);
-       KeyedReference kr = (KeyedReference)listElement.getObject();
-       isError = !formTool.isRowInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS,i);
-       isNewItem = (listElement.getTargetViewId() == ActionInputs.VIEWID_DEFAULT);
-%>
-    addDetailsIdentifierRow("serviceInterfaceDetailsIdentifiers",<%=isError||isNewItem%>);
-    setDetailsIdentifierRow("serviceInterfaceDetailsIdentifiers",<%=i%>,<%=listElement.getViewId()%>,"<%=HTMLUtils.JSMangle(kr.getTModelKey())%>","<%=HTMLUtils.JSMangle(kr.getKeyName())%>","<%=HTMLUtils.JSMangle(kr.getKeyValue())%>");
-<%       
-     }
-   }
-   
-   Vector catVector = (Vector)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES);
-   if (catVector != null)
-   {
-     for (int i=0;i<catVector.size();i++)
-     {
-       ListElement listElement = (ListElement)catVector.elementAt(i);
-       KeyedReference kr = (KeyedReference)listElement.getObject();
-       isError = !formTool.isRowInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES,i);
-       isNewItem = (listElement.getTargetViewId() == ActionInputs.VIEWID_DEFAULT);
-%>
-    addDetailsCategoryRow("serviceInterfaceDetailsCategories",<%=isError||isNewItem%>);
-    setDetailsCategoryRow("serviceInterfaceDetailsCategories",<%=i%>,<%=listElement.getViewId()%>,"<%=HTMLUtils.JSMangle(kr.getTModelKey())%>","<%=HTMLUtils.JSMangle(kr.getKeyName())%>","<%=HTMLUtils.JSMangle(kr.getKeyValue())%>");
-<%
-     }
-   }
-   
-   // Authentication.
-   if (!regElement.isLoggedIn())
-   {
-     String publishURL = (String)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-     String userId = (String)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-     String password = (String)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-%>   
-    document.forms[0].<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL%>.value = "<%=HTMLUtils.JSMangle(publishURL)%>";
-    document.forms[0].<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID%>.value = "<%=HTMLUtils.JSMangle(userId)%>";
-    document.forms[0].<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD%>.value = "<%=HTMLUtils.JSMangle(password)%>";
-    document.getElementById("serviceInterfaceDetailsAuthentication").style.display = "";
-<%
-   }
-%>  
-    showMainForm();
-  }
-  
-  function showMainForm()
-  {
-    closeAllUddiChildWindows();
-    var loadScreenTable = document.getElementById("loadScreen");
-    if (loadScreenTable.rows.length > 0)
-      loadScreenTable.deleteRow(0);
-    document.getElementById("mainScreen").style.display = "";
-  }
-  
-  function processForm(form)
-  {
-    if (handleSubmit(form))
-    {
-      processDetailsSingleItemTable("serviceInterfaceDetailsWSDLURL","<%=UDDIActionInputs.WSDL_URL_MODIFIED%>","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL%>",form);
-      processDetailsSingleItemTable("serviceInterfaceDetailsName","<%=UDDIActionInputs.NAME_MODIFIED%>","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME%>",form);
-      processDetailsLanguageInputTable("serviceInterfaceDetailsDescriptions","<%=UDDIActionInputs.DESCRIPTION_MODIFIED%>","<%=UDDIActionInputs.DESCRIPTION_VIEWID%>","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION_LANGUAGE%>","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION%>",form);
-      processDetailsIdentifierTable("serviceInterfaceDetailsIdentifiers",form);
-      processDetailsCategoryTable("serviceInterfaceDetailsCategories",form);
-      return true;
-    }
-    return false;
-  }   
-</script>  
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin" onUnload="closeAllUddiChildWindows()">
-  <div id="contentborder">
-    <form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/UpdateServiceInterfaceActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" onSubmit="return processForm(this)">  
-      <table id="loadScreen">
-        <tr>
-          <td class="labels">
-            <%=controller.getMessage("MSG_LOAD_IN_PROGRESS")%>
-          </td>
-        </tr>
-      </table>
-      <div id="mainScreen" style="display:none;">
-<%
-   String titleImagePath = "images/details_highlighted.gif";
-   String title = uddiPerspective.getMessage("ALT_SERVICE_INTERFACE_DETAILS");
-%>
-<%@ include file="/forms/formheader.inc" %>      
-        <input type="hidden" name="<%=UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY%>" value="<%=formTool.getProperty(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY)%>">
-        <table>
-          <tr>
-            <td class="labels">
-              <%=uddiPerspective.getMessage("FORM_LABEL_DETAILS_EDITABLE",selectedNode.getNodeName())%>
-            </td>
-          </tr>
-          <tr>
-            <td height=20>&nbsp;</td>
-          </tr>
-        </table>        
-        <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
-          <tr>
-            <th class="singleheadercolor" height=20 valign="bottom" align="left">
-              <%=uddiPerspective.getMessage("FORM_LABEL_SERVICE_INTERFACE_KEY")%>
-            </th>
-          </tr>
-          <tr>
-            <td class="tablecells">
-              <%=formTool.getProperty(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY)%>
-            </td>
-          </tr>
-        </table>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("serviceInterfaceDetailsWSDLURL");
-   sectionHeaderInfo.setOtherProperties(controller.getMessage("FORM_LABEL_WSDL_URL"));
-%>
-<jsp:include page="/uddi/forms/detailsSingleItem_table.jsp" flush="true"/>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("serviceInterfaceDetailsName");
-   sectionHeaderInfo.setOtherProperties(uddiPerspective.getMessage("FORM_LABEL_NAME"));
-%>
-<jsp:include page="/uddi/forms/detailsSingleItem_table.jsp" flush="true"/>   
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("serviceInterfaceDetailsDescriptions");
-   String[] descSpecificInfo = {"FORM_LABEL_DESCRIPTIONS","FORM_LABEL_DESCRIPTION",String.valueOf(!formTool.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS))};
-   sectionHeaderInfo.setOtherProperties(descSpecificInfo);
-%>
-<jsp:include page="/uddi/forms/detailsLanguageInput_table.jsp" flush="true"/>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("serviceInterfaceDetailsIdentifiers");
-%>
-<jsp:include page="/uddi/forms/detailsIdentifiers_table.jsp" flush="true"/>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("serviceInterfaceDetailsCategories");
-%>
-<jsp:include page="/uddi/forms/detailsCategories_table.jsp" flush="true"/>   
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("serviceInterfaceDetailsAuthentication");
-%>
-<jsp:include page="/uddi/forms/authentication_table.jsp" flush="true"/>
-<jsp:useBean id="currentToolManagerHash" class="java.util.Hashtable" scope="request">
-<%
-  currentToolManagerHash.put(ActionInputs.CURRENT_TOOL_MANAGER,currentToolManager);
-%>
-</jsp:useBean>
-<jsp:include page="/forms/otherActions.jsp" flush="true"/>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
-      </div>
-    </form>
-  </div>
-<script language="javascript">
-  setDefaults();
-  resumeProxyLoadPage();  
-</script>    
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/UDDIImportWSDLToWorkbenchForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/UDDIImportWSDLToWorkbenchForm.jsp
deleted file mode 100644
index 84228b292..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/UDDIImportWSDLToWorkbenchForm.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="formProperties" class="java.util.Hashtable" scope="request">
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-   NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
-   Node selectedNode = navigatorManager.getSelectedNode();
-   String wsdlURL;
-   // selectedNode should be either a service or a service interface node.
-   if (selectedNode instanceof ServiceNode)
-   {
-     ServiceNode serviceNode = (ServiceNode)selectedNode;
-     wsdlURL = serviceNode.getWSDLURLFromDetailsTool();
-   }
-   else
-   {
-     ServiceInterfaceNode siNode = (ServiceInterfaceNode)selectedNode;
-     wsdlURL = siNode.getWSDLURLFromDetailsTool();
-   }
-   formProperties.put("formActionLink","uddi/actions/UDDIImportWSDLToWorkbenchActionJSP.jsp");
-   formProperties.put("wsdlURL",wsdlURL);
-%>
-</jsp:useBean>
-<jsp:include page="/forms/ImportToWorkbenchForm.jsp" flush="true"/>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/UDDILaunchWebServiceWizardForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/UDDILaunchWebServiceWizardForm.jsp
deleted file mode 100644
index 5ffa252d4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/UDDILaunchWebServiceWizardForm.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" %>
-
-<jsp:useBean id="formActionLink" class="java.lang.StringBuffer" scope="request">
-<%
-   formActionLink.append("uddi/actions/UDDILaunchWebServiceWizardActionJSP.jsp");
-%>
-</jsp:useBean>
-<jsp:include page="/forms/LaunchWebServiceWizardForm.jsp" flush="true"/>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/UnpublishForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/UnpublishForm.jsp
deleted file mode 100644
index cd1db2c58..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/UnpublishForm.jsp
+++ /dev/null
@@ -1,90 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*,
-                                                        java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-   NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
-   UDDIMainNode uddiMainNode = (UDDIMainNode)navigatorManager.getRootNode();
-   RegistryNode regNode = uddiMainNode.getRegistryNode(navigatorManager.getSelectedNode());
-   RegistryElement regElement = (RegistryElement)regNode.getTreeElement();
-   
-   FormTool unpublishTool = (FormTool)(navigatorManager.getSelectedNode().getCurrentToolManager().getSelectedTool());
-%>
-
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=uddiPerspective.getMessage("FORM_TITLE_UNPUBLISH")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/scripts/formsubmit.jsp" flush="true"/>
-<jsp:include page="/uddi/scripts/udditables.jsp" flush="true"/>
-
-<script language="javascript">
-  function setDefaults()
-  {
-<%
-   if (!regElement.isLoggedIn())
-   {
-%>
-    var authenticationSection = document.getElementById("unpublishAuthentication");
-    authenticationSection.style.display = "";
-    var form = document.forms[0];
-    form.<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL%>.value = "<%=HTMLUtils.JSMangle((String)unpublishTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL))%>";
-    form.<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID%>.value = "<%=HTMLUtils.JSMangle((String)unpublishTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID))%>";
-    form.<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD%>.value = "<%=HTMLUtils.JSMangle((String)unpublishTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD))%>";    
-<%
-   }
-%>
-  }
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin" onUnload="closeAllUddiChildWindows()">
-  <div id="contentborder">
-    <form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/UnpublishActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" onSubmit="return handleSubmit(this)">
-<%
-   String titleImagePath = unpublishTool.getHighlightedImageLink();
-   String title = unpublishTool.getAltText();
-%>
-<%@ include file="/forms/formheader.inc" %>
-    <table>
-      <tr>
-        <td>
-          <%=uddiPerspective.getMessage("FORM_LABEL_UNPUBLISH_DESC")%>
-        </td>
-      </tr>
-    </table>
-<%
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("unpublishAuthentication");
-%>       
-<jsp:include page="/uddi/forms/authentication_table.jsp" flush="true"/>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
-  </div>
-<script language="javascript">
-  setDefaults();
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/advancedCommon_table.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/advancedCommon_table.jsp
deleted file mode 100644
index cbe853e40..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/advancedCommon_table.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-   NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
-   Node selectedNode = navigatorManager.getSelectedNode();
-   FormToolPropertiesInterface formToolPI = (FormToolPropertiesInterface)(selectedNode.getCurrentToolManager().getSelectedTool());
-%>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
-  <tr>
-    <td colspan=3 height=40 valign="bottom" align="left" class="labels">
-      <%=uddiPerspective.getMessage("FORM_LABEL_MAX_SEARCH_SET")%>
-<%
-   if (!formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_SEARCH_SET))
-   {
-%>
-      <%=HTMLUtils.redAsterisk()%>
-<%
-   }
-%>
-    </td>
-  </tr>
-  <tr>
-    <td colspan=3>
-      <input type="text" name="<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_MAX_SEARCH_SET%>" class="smtextenter">
-    </td>
-  </tr>
-  <tr>
-    <td colspan=3 class="labels">
-      <%=uddiPerspective.getMessage("FORM_LABEL_MAX_RESULTS")%>
-<%
-   if (!formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_RESULTS))
-   {
-%>
-      <%=HTMLUtils.redAsterisk()%>
-<%
-   }
-%>
-    </td>
-  </tr>
-  <tr>
-    <td colspan=3>
-      <input type="text" name="<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_MAX_RESULTS%>" class="smtextenter">
-    </td>
-  </tr>
-</table>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/authentication_table.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/authentication_table.jsp
deleted file mode 100644
index 685543d71..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/authentication_table.jsp
+++ /dev/null
@@ -1,85 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.AbstractUDDIElement,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="subQueryKeyProperty" class="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.SubQueryKeyProperty" scope="request"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
-UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
-Node selectedNode = navigatorManager.getSelectedNode();
-TreeElement selectedElement = selectedNode.getTreeElement();
-FormTool formTool = (FormTool)(selectedNode.getCurrentToolManager().getSelectedTool());
-String tableContainerId = sectionHeaderInfo.getContainerId();
-String username = null;
-String password = null;
-if (selectedElement instanceof AbstractUDDIElement)
-{
-  RegistryElement regElement = ((AbstractUDDIElement)selectedElement).getRegistryElement();
-  username = regElement.getUserId();
-  password = regElement.getCred();
-}
-if (username == null)
-  username = "";
-if (password == null)
-  password = "";
-%>
-<div id="<%=tableContainerId%>" style="display:none;">
-  <table width="95%" border=0 cellpadding=3 cellspacing=0>
-    <tr>
-      <td class="labels" height=30 valign="bottom">
-        <label for="<%=tableContainerId+"_input_publish_url"%>"><%=uddiPerspective.getMessage("FORM_LABEL_PUBLISH_URL")%></label>
-        <%
-        if (!formTool.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL))
-        {
-        %>
-          <%=HTMLUtils.redAsterisk()%>
-        <%
-        }
-        %>
-      </td>
-    </tr>
-    <tr>
-      <td><input type="text" id="<%=tableContainerId+"_input_publish_url"%>" name="<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL%>" class="textenter"></td>
-    </tr>
-    <tr>
-      <td class="labels" height=30 valign="bottom">
-        <label for="<%=tableContainerId+"_input_user_id"%>"><%=uddiPerspective.getMessage("FORM_LABEL_USERID")%></label>
-        <%
-        if (!formTool.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID))
-        {
-        %>
-          <%=HTMLUtils.redAsterisk()%>
-        <%
-        }
-        %>
-      </td>
-    </tr>
-    <tr>
-      <td><input type="text" id="<%=tableContainerId+"_input_user_id"%>" name="<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID%>" value="<%=username%>" class="textenter"></td>
-    </tr>
-    <tr>
-      <td class="labels" height=30 valign="bottom"><label for="<%=tableContainerId+"_input_password"%>"><%=uddiPerspective.getMessage("FORM_LABEL_PASSWORD")%></td></label>
-    </tr>
-    <tr>
-      <td><input type="password" id="<%=tableContainerId+"_input_password"%>" name="<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD%>" value="<%=password%>" class="textenter"></td>
-    </tr>
-  </table>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/categories_table.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/categories_table.jsp
deleted file mode 100644
index 99fbee41d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/categories_table.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.uddi4j.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-   String tableContainerId = sectionHeaderInfo.getContainerId();
-   StringBuffer twistImageName = new StringBuffer("x");
-   twistImageName.append(tableContainerId);
-%>
-<table border=0 cellpadding=6 cellspacing=0>
-  <tr>
-    <td height=40 valign="bottom" align="left" nowrap width=11><a href="javascript:twist('<%=tableContainerId%>','<%=twistImageName.toString()%>')"><img name="<%=twistImageName.toString()%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a></td> 
-    <td height=40 valign="bottom" align="left" nowrap class="labels">
-      <strong><%=uddiPerspective.getMessage("FORM_LABEL_CATEGORIES")%></strong>
-    </td>
-    <td height=40 valign="bottom" align="left" nowrap class="labels">
-      <a href="javascript:addCategoryRow('<%=tableContainerId%>')"><%=uddiPerspective.getMessage("FORM_LINK_ADD")%></a>
-    </td>
-    <td height=40 valign="bottom" align="left" nowrap class="labels">
-      <a href="javascript:removeSelectedCategoryRows('<%=tableContainerId%>')"><%=uddiPerspective.getMessage("FORM_LINK_REMOVE")%></a>  
-    </td>
-    <td nowrap width="90%">&nbsp;</td>
-  </tr>
-</table>
-
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
-  <tr>
-    <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" height=2 width="100%"></td>
-  </tr>
-</table>
-
-<div id="<%=tableContainerId%>" style="display:none;">
-  <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
-    <tr>
-      <th class="checkboxcells" width=10><input type="checkbox" onClick="handleCheckAllClick('<%=tableContainerId%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
-      <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_CATEGORY_TYPE")%></th>
-      <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_KEY_NAME")%></th>
-      <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_KEY_VALUE")%></th>
-      <th class="headercolor"><%=controller.getMessage("FORM_LABEL_ACTIONS")%></th>
-    </tr>
-  </table>
-<%
-   if (tableContainerId.startsWith("findBusinesses"))
-   {// condition to turn off for everything other than find by business searches.
-%>
-  <table>
-    <tr>
-      <td height=30 valign="center">
-        <label for="business_categories"><%=uddiPerspective.getMessage("FORM_LABEL_BUSINESS_CATEGORIES")%></label>
-      </td>
-      <td height=30 valign="center">
-        <select id="business_categories" class="selectlist">
-          <option><%=uddiPerspective.getMessage("FORM_OPTION_BUSINESSES_ONLY")%>
-          <option value="<%=FindQualifier.serviceSubset%>"><%=uddiPerspective.getMessage("FORM_OPTION_SERVICES_ONLY")%>
-          <option value="<%=FindQualifier.combineCategoryBags%>"><%=uddiPerspective.getMessage("FORM_OPTION_BOTH")%>
-        </select>
-      </td>
-    </tr>
-  </table>
-<%   
-   }
-%>     
-</div>  
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/detailsCategories_table.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/detailsCategories_table.jsp
deleted file mode 100644
index 0ca932776..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/detailsCategories_table.jsp
+++ /dev/null
@@ -1,60 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-   String tableContainerId = sectionHeaderInfo.getContainerId();
-   StringBuffer twistImageName = new StringBuffer("x");
-   twistImageName.append(tableContainerId);
-%>
-<table border=0 cellpadding=6 cellspacing=0>
-  <tr>
-    <td height=40 valign="bottom" align="left" nowrap width=11><a href="javascript:twist('<%=tableContainerId%>','<%=twistImageName.toString()%>')"><img name="<%=twistImageName.toString()%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a></td>
-    <td height=40 valign="bottom" align="left" nowrap class="labels">
-      <strong><%=uddiPerspective.getMessage("FORM_LABEL_CATEGORIES")%></strong>
-    </td>
-    <td height=40 valign="bottom" align="left" nowrap class="labels">
-      <a href="javascript:addDetailsCategoryRow('<%=tableContainerId%>',true)"><%=uddiPerspective.getMessage("FORM_LINK_ADD")%></a>
-    </td>
-    <td height=40 valign="bottom" align="left" nowrap class="labels">
-      <a href="javascript:removeSelectedDetailsCategoryRows('<%=tableContainerId%>')"><%=uddiPerspective.getMessage("FORM_LINK_REMOVE")%></a>
-    </td>
-    <td height=40 valign="bottom" align="left" nowrap class="labels">
-      <a href="javascript:editSelectedDetailsCategoryRows('<%=tableContainerId%>')"><%=uddiPerspective.getMessage("FORM_LINK_EDIT")%></a>
-    </td>
-    <td height=40 valign="bottom" align="left" nowrap class="labels">
-      <a href="javascript:cancelSelectedDetailsCategoryRows('<%=tableContainerId%>')"><%=uddiPerspective.getMessage("FORM_LINK_CANCEL")%></a>
-    <td nowrap width="90%">&nbsp;</td>
-  </tr>
-</table>
-
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
-  <tr>
-    <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" height=2 width="100%"></td>
-  </tr>
-</table>
-
-<div id="<%=tableContainerId%>" style="display:none;">
-  <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
-    <tr>
-      <th class="checkboxcells" width=10><input type="checkbox" onClick="handleCheckAllClick('<%=tableContainerId%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
-      <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_CATEGORY_TYPE")%></th>
-      <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_KEY_NAME")%></th>
-      <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_KEY_VALUE")%></th>
-      <th class="headercolor"><%=controller.getMessage("FORM_LABEL_ACTIONS")%></th>
-    </tr>
-  </table>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/detailsDiscoveryURLs_table.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/detailsDiscoveryURLs_table.jsp
deleted file mode 100644
index 1ff02eb2c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/detailsDiscoveryURLs_table.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-   String tableContainerId = sectionHeaderInfo.getContainerId();
-   StringBuffer twistImageName = new StringBuffer("x");
-   boolean hasErrors = ((Boolean)sectionHeaderInfo.getOtherProperties()).booleanValue();
-   twistImageName.append(tableContainerId);
-%>
-<table border=0 cellpadding=6 cellspacing=0>
-  <tr>
-    <td height=40 valign="bottom" align="left" nowrap width=11><a href="javascript:twist('<%=tableContainerId%>','<%=twistImageName.toString()%>')"><img name="<%=twistImageName.toString()%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a></td>  
-    <td height=40 valign="bottom" align="left" nowrap class="labels">
-      <strong><%=uddiPerspective.getMessage("FORM_LABEL_DISCOVERYURLS")%></strong>
-<%
-   if (hasErrors)
-   {
-%>
-      <%=HTMLUtils.redAsterisk()%>
-<%
-   }
-%>      
-    </td>
-    <td height=40 valign="bottom" align="left" nowrap class="labels">
-      <a href="javascript:addDetailsDiscoveryURLRow('<%=tableContainerId%>',true)"><%=uddiPerspective.getMessage("FORM_LINK_ADD")%></a>
-    </td>
-    <td height=40 valign="bottom" align="left" nowrap class="labels">
-      <a href="javascript:removeSelectedDetailsDiscoveryURLRows('<%=tableContainerId%>')"><%=uddiPerspective.getMessage("FORM_LINK_REMOVE")%></a>
-    </td>
-    <td height=40 valign="bottom" align="left" nowrap class="labels">
-      <a href="javascript:editSelectedDetailsDiscoveryURLRows('<%=tableContainerId%>')"><%=uddiPerspective.getMessage("FORM_LINK_EDIT")%></a>
-    </td>
-    <td height=40 valign="bottom" align="left" nowrap class="labels">
-      <a href="javascript:cancelSelectedDetailsDiscoveryURLRows('<%=tableContainerId%>')"><%=uddiPerspective.getMessage("FORM_LINK_CANCEL")%></a>
-    </td>
-  </tr>
-</table>
-
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
-  <tr>
-    <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" height=2 width="100%"></td>
-  </tr>
-</table>
-
-<div id="<%=tableContainerId%>" style="display:none;">
-  <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
-    <tr>
-      <th class="checkboxcells" width=10><input type="checkbox" onClick="handleCheckAllClick('<%=tableContainerId%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
-      <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_DISCOVERYURL")%></th>
-      <th class="headercolor"><%=controller.getMessage("FORM_LABEL_ACTIONS")%></th>
-    </tr>
-  </table>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/detailsIdentifiers_table.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/detailsIdentifiers_table.jsp
deleted file mode 100644
index 08d8cde21..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/detailsIdentifiers_table.jsp
+++ /dev/null
@@ -1,60 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-   String tableContainerId = sectionHeaderInfo.getContainerId();
-   StringBuffer twistImageName = new StringBuffer("x");
-   twistImageName.append(tableContainerId);
-%>
-<table border=0 cellpadding=6 cellspacing=0>
-  <tr>
-    <td height=40 valign="bottom" align="left" nowrap width=11><a href="javascript:twist('<%=tableContainerId%>','<%=twistImageName.toString()%>')"><img name="<%=twistImageName.toString()%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a></td>
-    <td height=40 valign="bottom" align="left" nowrap class="labels">
-      <strong><%=uddiPerspective.getMessage("FORM_LABEL_IDENTIFIERS")%></strong>
-    </td>
-    <td height=40 valign="bottom" align="left" nowrap class="labels">
-      <a href="javascript:addDetailsIdentifierRow('<%=tableContainerId%>',true)"><%=uddiPerspective.getMessage("FORM_LINK_ADD")%></a>
-    </td>
-    <td height=40 valign="bottom" align="left" nowrap class="labels">
-      <a href="javascript:removeSelectedDetailsIdentifierRows('<%=tableContainerId%>')"><%=uddiPerspective.getMessage("FORM_LINK_REMOVE")%></a>
-    </td>
-    <td height=40 valign="bottom" align="left" nowrap class="labels">
-      <a href="javascript:editSelectedDetailsIdentifierRows('<%=tableContainerId%>')"><%=uddiPerspective.getMessage("FORM_LINK_EDIT")%></a>
-    </td>
-    <td height=40 valign="bottom" align="left" nowrap class="labels">
-      <a href="javascript:cancelSelectedDetailsIdentifierRows('<%=tableContainerId%>')"><%=uddiPerspective.getMessage("FORM_LINK_CANCEL")%></a>
-    <td nowrap width="90%">&nbsp;</td>
-  </tr>
-</table>
-
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
-  <tr>
-    <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" height=2 width="100%"></td>
-  </tr>
-</table>
-
-<div id="<%=tableContainerId%>" style="display:none;">
-  <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
-    <tr>
-      <th class="checkboxcells" width=10><input type="checkbox" onClick="handleCheckAllClick('<%=tableContainerId%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
-      <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_IDENTIFIER_TYPE")%></th>
-      <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_KEY_NAME")%></th>
-      <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_KEY_VALUE")%></th>
-      <th class="headercolor"><%=controller.getMessage("FORM_LABEL_ACTIONS")%></th>
-    </tr>
-  </table>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/detailsLanguageInput_table.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/detailsLanguageInput_table.jsp
deleted file mode 100644
index 594f2aa36..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/detailsLanguageInput_table.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*,
-                                                        org.uddi4j.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-   String tableContainerId = sectionHeaderInfo.getContainerId();
-   String[] otherProperties = (String[])sectionHeaderInfo.getOtherProperties();
-   String[] titleKeys = {otherProperties[0],otherProperties[1]};
-   boolean hasErrors = otherProperties[2].equals(Boolean.TRUE.toString());
-   StringBuffer twistImageName = new StringBuffer("x");
-   twistImageName.append(tableContainerId);
-%>
-<table border=0 cellpadding=6 cellspacing=0>
-  <tr>
-    <td height=40 valign="bottom" align="left" nowrap width=11><a href="javascript:twist('<%=tableContainerId%>','<%=twistImageName.toString()%>')"><img name="<%=twistImageName.toString()%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a></td>
-    <td height=40 valign="bottom" align="left" nowrap class="labels">
-      <strong><%=uddiPerspective.getMessage(titleKeys[0])%></strong>
-<%
-   if (hasErrors)
-   {
-%>
-      <%=HTMLUtils.redAsterisk()%>
-<%
-   }
-%>      
-    </td>
-    <td height=40 valign="bottom" align="left" nowrap class="labels">
-<%
-   String textControlTitleKey;
-   if (titleKeys[0].equals("FORM_LABEL_NAMES"))
-     textControlTitleKey = "FORM_CONTROL_TITLE_NAME_TEXT_VALUE";
-   else
-     textControlTitleKey = "FORM_CONTROL_TITLE_DESCRIPTION_TEXT_VALUE";
-%>         
-      <a href="javascript:addDetailsLanguageInputRow('<%=tableContainerId%>','<%=HTMLUtils.JSMangle(uddiPerspective.getMessage(textControlTitleKey))%>',true)"><%=uddiPerspective.getMessage("FORM_LINK_ADD")%></a>
-    </td>
-    <td height=40 valign="bottom" align="left" nowrap class="labels">
-      <a href="javascript:removeSelectedDetailsLanguageInputRows('<%=tableContainerId%>')"><%=uddiPerspective.getMessage("FORM_LINK_REMOVE")%></a>
-    </td>
-    <td height=40 valign="bottom" align="left" nowrap class="labels">
-      <a href="javascript:editSelectedDetailsLanguageInputRows('<%=tableContainerId%>')"><%=uddiPerspective.getMessage("FORM_LINK_EDIT")%></a>
-    </td>
-    <td height=40 valign="bottom" align="left" nowrap class="labels">
-      <a href="javascript:cancelSelectedDetailsLanguageInputRows('<%=tableContainerId%>')"><%=uddiPerspective.getMessage("FORM_LINK_CANCEL")%></a>
-    </td>
-    <td nowrap width="90%">&nbsp;</td>
-  </tr>
-</table>
-
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
-  <tr>
-    <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" height=2 width="100%"></td>
-  </tr>
-</table>
-
-<div id="<%=tableContainerId%>" style="display:none;">
-  <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
-    <tr>
-      <th class="checkboxcells" width=10><input type="checkbox" onClick="handleCheckAllClick('<%=tableContainerId%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
-      <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_LANGUAGE")%></th>
-      <th class="headercolor"><%=uddiPerspective.getMessage(titleKeys[1])%></th>
-      <th class="headercolor"><%=controller.getMessage("FORM_LABEL_ACTIONS")%></th>
-    </tr>
-  </table>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/detailsSingleItem_table.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/detailsSingleItem_table.jsp
deleted file mode 100644
index 41c7cff67..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/detailsSingleItem_table.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-   String tableContainerId = sectionHeaderInfo.getContainerId();
-   String itemHeader = (String)sectionHeaderInfo.getOtherProperties();
-%>
-<table>
-  <tr>
-    <td height=20>&nbsp;</td>
-  </tr>
-</table>
-<div id="<%=tableContainerId%>">
-  <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
-    <tr>
-      <th class="headercolor"><%=itemHeader%></th>
-      <th class="headercolor"><%=controller.getMessage("FORM_LABEL_ACTIONS")%></th>
-    </tr>
-  </table>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/discoveryURLs_table.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/discoveryURLs_table.jsp
deleted file mode 100644
index d0eebc6e4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/discoveryURLs_table.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-   String tableContainerId = sectionHeaderInfo.getContainerId();
-   boolean hasErrors = ((Boolean)sectionHeaderInfo.getOtherProperties()).booleanValue();
-   StringBuffer twistImageName = new StringBuffer("x");
-   twistImageName.append(tableContainerId);
-%>
-<table border=0 cellpadding=6 cellspacing=0>
-  <tr>
-    <td height=40 valign="bottom" align="left" nowrap width=11><a href="javascript:twist('<%=tableContainerId%>','<%=twistImageName.toString()%>')"><img name="<%=twistImageName.toString()%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a></td>  
-    <td height=40 valign="bottom" align="left" nowrap class="labels">
-      <strong><%=uddiPerspective.getMessage("FORM_LABEL_DISCOVERYURLS")%></strong>
-<%
-   if (hasErrors)
-   {
-%>
-      <%=HTMLUtils.redAsterisk()%>
-<%
-   }
-%>                  
-    </td>
-    <td height=40 valign="bottom" align="left" nowrap class="labels">
-      <a href="javascript:addDiscoveryURLRow('<%=tableContainerId%>')"><%=uddiPerspective.getMessage("FORM_LINK_ADD")%></a>
-    </td>
-    <td height=40 valign="bottom" align="left" nowrap class="labels">
-      <a href="javascript:removeSelectedRows('<%=tableContainerId%>')"><%=uddiPerspective.getMessage("FORM_LINK_REMOVE")%></a>
-    </td>
-    <td nowrap width="90%">&nbsp;</td>
-  </tr>
-</table>
-
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
-  <tr>
-    <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" height=2 width="100%"></td>
-  </tr>
-</table>
-
-<div id="<%=tableContainerId%>" style="display:none;">
-  <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
-    <tr>
-      <th class="checkboxcells" width=10><input type="checkbox" onClick="handleCheckAllClick('<%=tableContainerId%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
-      <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_DISCOVERYURL")%></th>
-    </tr>
-  </table>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/findQualifiers_table.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/findQualifiers_table.jsp
deleted file mode 100644
index d266ca4bc..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/findQualifiers_table.jsp
+++ /dev/null
@@ -1,65 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.uddi4j.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-   String tableContainerId = sectionHeaderInfo.getContainerId();
-   StringBuffer twistImageName = new StringBuffer("x");
-   twistImageName.append(tableContainerId);   
-%>
-<table border=0 cellpadding=6 cellspacing=0>
-  <tr>
-    <td height=40 valign="bottom" align="left" nowrap width=11><a href="javascript:twist('<%=tableContainerId%>','<%=twistImageName.toString()%>')"><img name="<%=twistImageName.toString()%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a></td>
-    <td height=40 valign="bottom" align="left" nowrap class="labels"><strong><%=uddiPerspective.getMessage("FORM_LABEL_FINDQUALIFIERS")%></strong></td>
-  </tr>
-</table>
-
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
-  <tr>
-    <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" height=2 width="100%"></td>
-  </tr>
-</table>
-
-<div id="<%=tableContainerId%>" style="display:none;">
-  <table>
-    <tr>
-      <td><label for="combine_keys"><%=uddiPerspective.getMessage("FORM_LABEL_COMBINE_KEYS")%></label></td>
-      <td>
-        <select id="combine_keys" class="selectlist">
-          <option value="<%=FindQualifier.andAllKeys%>"><%=uddiPerspective.getMessage("FORM_OPTION_ANDALLKEYS")%>
-          <option value="<%=FindQualifier.orAllKeys%>"><%=uddiPerspective.getMessage("FORM_OPTION_ORALLKEYS")%>
-          <option value="<%=FindQualifier.orLikeKeys%>"><%=uddiPerspective.getMessage("FORM_OPTION_ORLIKEKEYS")%>
-        </select>
-      </td>
-    </tr>
-    <tr>
-      <td><%=uddiPerspective.getMessage("FORM_LABEL_SORT_BY_NAME")%></td>
-      <td>
-        <input type="radio" id="advance_sort_by_name_asc" name="<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_SORT_BY_NAME%>" value="<%=FindQualifier.sortByNameAsc%>" checked><label for="advance_sort_by_name_asc"><%=uddiPerspective.getMessage("FORM_RADIO_SORT_ASC")%></label>
-        <input type="radio" id="advance_sort_by_name_desc" name="<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_SORT_BY_NAME%>" value="<%=FindQualifier.sortByNameDesc%>"><label for="advance_sort_by_name_desc"><%=uddiPerspective.getMessage("FORM_RADIO_SORT_DESC")%></label>
-      </td>
-    </tr>
-    <tr>
-      <td><%=uddiPerspective.getMessage("FORM_LABEL_SORT_BY_DATE")%></td>
-      <td>
-        <input type="radio" id="advance_sort_by_date_asc" name="<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_SORT_BY_DATE%>" value="<%=FindQualifier.sortByDateAsc%>" checked><label for="advance_sort_by_date_asc"><%=uddiPerspective.getMessage("FORM_RADIO_SORT_ASC")%></label>
-        <input type="radio" id="advance_sort_by_date_desc" name="<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_SORT_BY_DATE%>" value="<%=FindQualifier.sortByDateDesc%>"><label for="advance_sort_by_date_desc"><%=uddiPerspective.getMessage("FORM_RADIO_SORT_DESC")%></label>
-      </td>
-    </tr>
-  </table>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/findformheader.inc b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/findformheader.inc
deleted file mode 100644
index c3f901c02..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/findformheader.inc
+++ /dev/null
@@ -1,53 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (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
- *******************************************************************************/
-%>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
-  <tr>
-    <td>
-      <img src="<%=response.encodeURL(controller.getPathWithContext(titleImagePath))%>">
-      <strong><%=title%></strong>
-    </td>
-    <td width="*">&nbsp;</td>
-<%
-   int colspan = 2;
-   if (subQueryKey != null && subQueryKey.length() > 0)
-   {
-     int nodeId = selectedNode.getNodeId();
-     int toolId = formTool.getToolId();
-     int viewId = selectedNode.getViewId();
-     int viewToolId = selectedNode.getViewToolId();
-     int count = 1;
-%>
-    <td align="right">
-      <a href="<%=response.encodeURL(controller.getPathWithContext(SelectFindToolAction.getActionLink(nodeId,toolId,viewId,viewToolId,"",false)))%>"><%=count%></a>
-    </td>
-<%
-     String currentSubQueryKey = subQueryKey;
-     int separatorPos = -1;
-     while ((separatorPos = currentSubQueryKey.indexOf(':')) != -1)
-     {
-       count++;
-%>
-    <td align="right">
-      <a href="<%=response.encodeURL(controller.getPathWithContext(SelectFindToolAction.getActionLink(nodeId,toolId,viewId,viewToolId,currentSubQueryKey.substring(0,separatorPos),false)))%>"><%=count%></a>
-    </td>      
-<%   
-       currentSubQueryKey = currentSubQueryKey.substring(separatorPos+1,currentSubQueryKey.length());
-     }
-     colspan += count;
-   }
-%>    
-  </tr>
-  <tr>
-    <td height=20 colspan=<%=colspan%>> <img height=2 width="100%" align="top" src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>"> </td>
-  </tr>
-</table>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/identifiers_table.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/identifiers_table.jsp
deleted file mode 100644
index 82995f4cd..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/identifiers_table.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-   String tableContainerId = sectionHeaderInfo.getContainerId();
-   StringBuffer twistImageName = new StringBuffer("x");
-   twistImageName.append(tableContainerId);   
-%>
-<table border=0 cellpadding=6 cellspacing=0>
-  <tr>
-    <td height=40 valign="bottom" align="left" nowrap width=11><a href="javascript:twist('<%=tableContainerId%>','<%=twistImageName.toString()%>')"><img name="<%=twistImageName.toString()%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a></td>
-    <td height=40 valign="bottom" align="left" nowrap class="labels">
-      <strong><%=uddiPerspective.getMessage("FORM_LABEL_IDENTIFIERS")%></strong>
-    </td>
-    <td height=40 valign="bottom" align="left" nowrap class="labels">
-      <a href="javascript:addIdentifierRow('<%=tableContainerId%>')"><%=uddiPerspective.getMessage("FORM_LINK_ADD")%></a>
-    </td>
-    <td height=40 valign="bottom" align="left" nowrap class="labels">
-      <a href="javascript:removeSelectedRows('<%=tableContainerId%>')"><%=uddiPerspective.getMessage("FORM_LINK_REMOVE")%></a>  
-    </td>
-    <td nowrap width="90%">&nbsp;</td>
-  </tr>
-</table>
-
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
-  <tr>
-    <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" height=2 width="100%"></td>
-  </tr>
-</table>
-    
-<div id="<%=tableContainerId%>" style="display:none;">
-  <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
-    <tr>
-      <th class="checkboxcells" width=10><input type="checkbox" onClick="handleCheckAllClick('<%=tableContainerId%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
-      <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_IDENTIFIER_TYPE")%></th>
-      <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_KEY_NAME")%></th>
-      <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_KEY_VALUE")%></th>
-    </tr>
-  </table>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/languageInput_table.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/languageInput_table.jsp
deleted file mode 100644
index 0453210e2..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/languageInput_table.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*,
-                                                        org.uddi4j.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-   String tableContainerId = sectionHeaderInfo.getContainerId();
-   String[] otherProperties = (String[])sectionHeaderInfo.getOtherProperties();
-   String[] titleKeys = {otherProperties[0],otherProperties[1]};
-   boolean hasErrors = otherProperties[2].equals(Boolean.TRUE.toString());
-   boolean isFind = tableContainerId.startsWith("find");
-   StringBuffer twistImageName = new StringBuffer("x");
-   twistImageName.append(tableContainerId);
-%>
-<table border=0 cellpadding=6 cellspacing=0>
-  <tr>
-    <td height=40 valign="bottom" align="left" nowrap width=11><a href="javascript:twist('<%=tableContainerId%>','<%=twistImageName.toString()%>')"><img name="<%=twistImageName.toString()%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a></td>
-    <td height=40 valign="bottom" align="left" nowrap class="labels">
-      <strong><%=uddiPerspective.getMessage(titleKeys[0])%></strong>
-<%
-   if (hasErrors)
-   {
-%>
-      <%=HTMLUtils.redAsterisk()%>
-<%
-   }
-%>
-    </td>
-    <td height=40 valign="bottom" align="left" nowrap class="labels">
-<%
-   String textControlTitleKey;
-   if (titleKeys[0].equals("FORM_LABEL_NAMES"))
-     textControlTitleKey = "FORM_CONTROL_TITLE_NAME_TEXT_VALUE";
-   else
-     textControlTitleKey = "FORM_CONTROL_TITLE_DESCRIPTION_TEXT_VALUE";
-%>       
-      <a href="javascript:addLanguageInputRow('<%=tableContainerId%>','<%=HTMLUtils.JSMangle(uddiPerspective.getMessage(textControlTitleKey))%>')">
-        <%=uddiPerspective.getMessage("FORM_LINK_ADD")%>
-      </a>
-    </td>
-    <td height=40 valign="bottom" align="left" nowrap class="labels">
-      <a href="javascript:removeSelectedRows('<%=tableContainerId%>')"><%=uddiPerspective.getMessage("FORM_LINK_REMOVE")%></a>
-    </td>
-    <td nowrap width="90%">&nbsp;</td>
-  </tr>
-</table>
-
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
-  <tr>
-    <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" height=2 width="100%"></td>
-  </tr>
-</table>
-
-<div id="<%=tableContainerId%>" style="display:none;">
-  <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
-    <tr>
-      <th class="checkboxcells" width=10><input type="checkbox" onClick="handleCheckAllClick('<%=tableContainerId%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
-      <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_LANGUAGE")%></th>
-      <th class="headercolor"><%=uddiPerspective.getMessage(titleKeys[1])%></th>
-    </tr>
-  </table>
-<% 
-   if (isFind)
-   {// condition to turn off when publishing to come.
-%>     
-<jsp:include page="/uddi/forms/names_findQualifiers_table.jsp" flush="true"/>
-<%
-   }
-%>     
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/names_findQualifiers_table.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/names_findQualifiers_table.jsp
deleted file mode 100644
index 43ee68b67..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/names_findQualifiers_table.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.uddi4j.util.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>   
-<table>
-  <tr>
-    <td>
-      <input type="checkbox" id="find_qualifier_exact_name_match" value="<%=FindQualifier.exactNameMatch%>"><label for="find_qualifier_exact_name_match"><%=uddiPerspective.getMessage("FORM_LABEL_EXACT_NAME_MATCH")%></label>
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <input type="checkbox" id="find_qualifier_case_sensitive_match" value="<%=FindQualifier.caseSensitiveMatch%>"><label for="find_qualifier_case_sensitive_match"><%=uddiPerspective.getMessage("FORM_LABEL_CASE_SENSITIVE_MATCH")%></label>
-    </td>
-  </tr>
-</table>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/results_table.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/results_table.jsp
deleted file mode 100644
index 2db782e6c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/results_table.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-   String tableContainerId = sectionHeaderInfo.getContainerId();
-   String[] specificInfo = (String[])sectionHeaderInfo.getOtherProperties();
-   String title = specificInfo[0];
-   String parentContainerId = specificInfo[1];
-   StringBuffer twistImageName = new StringBuffer("x");
-   twistImageName.append(tableContainerId);
-%>
-<table width="95%" border=0 cellpadding=6 cellspacing=0>
-  <tr>
-    <td height=20 valign="bottom" align="left" nowrap width=11><a href="javascript:twist('<%=tableContainerId%>','<%=twistImageName.toString()%>')"><img name="<%=twistImageName.toString()%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a></td>
-    <td height=20 valign="bottom" align="left" nowrap class="labels">
-      <strong><%=title%></strong>
-    </td>
-    <td nowrap width="90%">&nbsp;</td>
-  </tr>
-</table>
-
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
-  <tr>
-    <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" height=2 width="100%"></td>
-  </tr>
-</table>
-
-<div id="<%=tableContainerId%>" style="display:none;">
-  <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
-    <tr>
-      <th class="checkboxcells" width=10><input type="checkbox" onClick="handleCheckAllClick('<%=tableContainerId%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
-      <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_NAME")%></th>
-      <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_DESCRIPTION")%></th>
-    </tr>
-  </table>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/resultsformheader.inc b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/resultsformheader.inc
deleted file mode 100644
index b0370e28c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/resultsformheader.inc
+++ /dev/null
@@ -1,50 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (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
- *******************************************************************************/
-%>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
-  <tr>
-    <td align="left" nowrap>
-      <img src="<%=response.encodeURL(controller.getPathWithContext(titleImagePath))%>">
-      <strong><%=title%></strong>
-    </td>
-<%
-   int colspan = 1;
-   if (hasTarget)
-   {
-     String returnLink = TransferSubQueryResultsAction.getActionLinkForReturn();
-%>
-    <td nowrap width="*">&nbsp;</td>
-    <td align="right" nowrap>
-      <a href="<%=response.encodeURL(controller.getPathWithContext(returnLink))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><%=uddiPerspective.getMessage("FORM_LINK_TARGET")%></a>
-    </td>
-<%
-     colspan += 2;
-   }
-%>
-  </tr>
-  <tr>
-    <td height=20 colspan=<%=colspan%>> <img height=2 width="100%" align="top" src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>"> </td>
-  </tr>
-  <tr>
-    <td colspan=<%=colspan%>>
-<%
-   if (hasTarget)
-   {
-%>
-<%=uddiPerspective.getMessage("FORM_LABEL_SUBQUERY")%>
-<%
-   }
-%>
-<%=uddiPerspective.getMessage("FORM_LABEL_QUERY")%>
-    </td>
-  </tr>
-</table>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ud_categories_table.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ud_categories_table.jsp
deleted file mode 100644
index 0c31a7bcb..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ud_categories_table.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.uddi4j.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-   String tableContainerId = sectionHeaderInfo.getContainerId();
-   StringBuffer twistImageName = new StringBuffer("x");
-   twistImageName.append(tableContainerId);
-%>
-<table border=0 cellpadding=6 cellspacing=0>
-  <tr>
-    <td height=40 valign="bottom" align="left" nowrap width=11><a href="javascript:twist('<%=tableContainerId%>','<%=twistImageName.toString()%>')"><img name="<%=twistImageName.toString()%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_OPENED")%>" class="twist"></a></td> 
-    <td height=40 valign="bottom" align="left" nowrap class="labels">
-      <strong><%=uddiPerspective.getMessage("FORM_LABEL_USER_DEFINED_CATEGORIES")%></strong>
-    </td>
-    <!--
-    <td height=40 valign="bottom" align="left" nowrap class="labels">
-      <a href="javascript:editSelectedDetailsUserDefinedCategoryRows('<%=tableContainerId%>')"><%=uddiPerspective.getMessage("FORM_LINK_EDIT")%></a>
-    </td>
-    <td height=40 valign="bottom" align="left" nowrap class="labels">
-      <a href="javascript:cancelSelectedDetailsUserDefinedCategoryRows('<%=tableContainerId%>')"><%=uddiPerspective.getMessage("FORM_LINK_CANCEL")%></a>
-    </td>
-    -->
-    <td nowrap width="90%">&nbsp;</td>
-  </tr>
-</table>
-
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
-  <tr>
-    <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" height=2 width="100%"></td>
-  </tr>
-</table>
-
-<div id="<%=tableContainerId%>" style="display:'';">
-  <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
-    <tr>
-      <!--
-      <th class="checkboxcells" width=10><input type="checkbox" onClick="handleCheckAllClick('<%=tableContainerId%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
-      -->
-      <th class="headercolor" width="15%"><%=uddiPerspective.getMessage("FORM_LABEL_NAME")%></th>
-      <!--
-      <th class="headercolor" width="10%"><%=uddiPerspective.getMessage("FORM_LABEL_CHECKED")%></th>
-      <th class="headercolor" width="70%"><%=uddiPerspective.getMessage("FORM_LABEL_FILE")%></th>
-      <th class="headercolor" width="*"><%=controller.getMessage("FORM_LABEL_ACTIONS")%></th>
-      -->
-    </tr>
-  </table>
-</div>  
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/uddiObjectsPublisherAssertions_table.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/uddiObjectsPublisherAssertions_table.jsp
deleted file mode 100644
index eeeffdfd7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/uddiObjectsPublisherAssertions_table.jsp
+++ /dev/null
@@ -1,84 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-   String tableContainerId = sectionHeaderInfo.getContainerId();
-   String[] specificInfo = (String[])sectionHeaderInfo.getOtherProperties();
-   String tableTitleKey = specificInfo[0];
-   boolean hasErrors = specificInfo[1].equals(Boolean.TRUE.toString());
-   String queryItemString = specificInfo[2];
-   String parentContainerId = specificInfo[3];
-   String transferTargetKey = specificInfo[4];
-   StringBuffer twistImageName = new StringBuffer("x");
-   twistImageName.append(tableContainerId);
-%>
-<table width="95%" border=0 cellpadding=6 cellspacing=0>
-  <tr>
-    <td height=40 valign="bottom" align="left" nowrap width=11><a href="javascript:twist('<%=tableContainerId%>','<%=twistImageName.toString()%>')"><img name="<%=twistImageName.toString()%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a></td>
-    <td height=40 valign="bottom" align="left" nowrap class="labels">
-      <strong><%=uddiPerspective.getMessage(tableTitleKey)%></strong>
-<%
-   if (hasErrors)
-   {
-%>
-      <%=HTMLUtils.redAsterisk()%>
-<%
-   }
-%>         
-    </td>
-<%
-   if (sectionHeaderInfo.isDynamic())
-   {
-%>       
-    <td height=40 valign="bottom" align="left" nowrap class="labels">
-      <a href="javascript:initiateSubQuery('<%=parentContainerId%>','<%=transferTargetKey%>',<%=queryItemString%>,true)"><%=uddiPerspective.getMessage("FORM_LINK_GET")%></a>
-    </td>
-    <td height=40 valign="bottom" align="left" nowrap class="labels">
-      <a href="javascript:initiateSubQuery('<%=parentContainerId%>','<%=transferTargetKey%>',<%=queryItemString%>,false)"><%=uddiPerspective.getMessage("FORM_LINK_FIND")%></a>
-    </td>
-    <td height=40 valign="bottom" align="left" nowrap class="labels">
-      <a href="javascript:removeSelectedRows('<%=tableContainerId%>')"><%=uddiPerspective.getMessage("FORM_LINK_REMOVE")%></a>
-    </td>
-<%
-   }
-%>       
-    <td nowrap width="90%">&nbsp;</td>
-  </tr>
-</table>
-
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
-  <tr>
-    <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" height=2 width="100%"></td>
-  </tr>
-</table>
-
-<div id="<%=tableContainerId%>" style="display:none;">
-  <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
-    <tr>
-      <th class="checkboxcells" width=10><input type="checkbox" onClick="handleCheckAllClick('<%=tableContainerId%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
-      <th class="headercolor"><%=((BusinessElement)uddiPerspective.getNavigatorManager().getSelectedNode().getTreeElement()).getBusinessEntity().getDefaultNameString()%></th>
-      <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_DIRECTION")%></th>
-      <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_NAME")%></th>
-      <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_DESCRIPTION")%></th>
-      <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_ASSERTION_TYPE")%></th>
-    </tr>
-  </table>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/uddiObjects_table.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/uddiObjects_table.jsp
deleted file mode 100644
index f8a063658..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/uddiObjects_table.jsp
+++ /dev/null
@@ -1,80 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-   String tableContainerId = sectionHeaderInfo.getContainerId();
-   String[] specificInfo = (String[])sectionHeaderInfo.getOtherProperties();
-   String tableTitleKey = specificInfo[0];
-   boolean hasErrors = specificInfo[1].equals(Boolean.TRUE.toString());
-   String queryItemString = specificInfo[2];
-   String parentContainerId = specificInfo[3];
-   String transferTargetKey = specificInfo[4];
-   StringBuffer twistImageName = new StringBuffer("x");
-   twistImageName.append(tableContainerId);
-%>
-<table width="95%" border=0 cellpadding=6 cellspacing=0>
-  <tr>
-    <td height=40 valign="bottom" align="left" nowrap width=11><a href="javascript:twist('<%=tableContainerId%>','<%=twistImageName.toString()%>')"><img name="<%=twistImageName.toString()%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a></td>
-    <td height=40 valign="bottom" align="left" nowrap class="labels">
-      <strong><%=uddiPerspective.getMessage(tableTitleKey)%></strong>
-<%
-   if (hasErrors)
-   {
-%>
-      <%=HTMLUtils.redAsterisk()%>
-<%
-   }
-%>         
-    </td>
-<%
-   if (sectionHeaderInfo.isDynamic())
-   {
-%>       
-    <td height=40 valign="bottom" align="left" nowrap class="labels">
-      <a href="javascript:initiateSubQuery('<%=parentContainerId%>','<%=transferTargetKey%>',<%=queryItemString%>,true)"><%=uddiPerspective.getMessage("FORM_LINK_GET")%></a>
-    </td>
-    <td height=40 valign="bottom" align="left" nowrap class="labels">
-      <a href="javascript:initiateSubQuery('<%=parentContainerId%>','<%=transferTargetKey%>',<%=queryItemString%>,false)"><%=uddiPerspective.getMessage("FORM_LINK_FIND")%></a>
-    </td>
-    <td height=40 valign="bottom" align="left" nowrap class="labels">
-      <a href="javascript:removeSelectedRows('<%=tableContainerId%>')"><%=uddiPerspective.getMessage("FORM_LINK_REMOVE")%></a>
-    </td>
-<%
-   }
-%>       
-    <td nowrap width="90%">&nbsp;</td>
-  </tr>
-</table>
-
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
-  <tr>
-    <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" height=2 width="100%"></td>
-  </tr>
-</table>
-
-<div id="<%=tableContainerId%>" style="display:none;">
-  <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
-    <tr>
-      <th class="checkboxcells" width=10><input type="checkbox" onClick="handleCheckAllClick('<%=tableContainerId%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
-      <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_NAME")%></th>
-      <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_DESCRIPTION")%></th>
-    </tr>
-  </table>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/business_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/business_enabled.gif
deleted file mode 100644
index 3afd94a2f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/business_enabled.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/business_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/business_highlighted.gif
deleted file mode 100644
index d3d6a778b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/business_highlighted.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/businesses_closed_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/businesses_closed_enabled.gif
deleted file mode 100644
index a85c09742..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/businesses_closed_enabled.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/businesses_closed_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/businesses_closed_highlighted.gif
deleted file mode 100644
index df3043ff2..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/businesses_closed_highlighted.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/businesses_open_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/businesses_open_highlighted.gif
deleted file mode 100644
index 6ad7cea3a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/businesses_open_highlighted.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/category.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/category.gif
deleted file mode 100644
index 4514d7d21..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/category.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/find_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/find_enabled.gif
deleted file mode 100644
index 5c18d74c4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/find_enabled.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/find_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/find_highlighted.gif
deleted file mode 100644
index d540a01f4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/find_highlighted.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/open_registry_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/open_registry_enabled.gif
deleted file mode 100644
index 875066b5f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/open_registry_enabled.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/open_registry_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/open_registry_highlighted.gif
deleted file mode 100644
index 8d5699ce5..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/open_registry_highlighted.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/publish_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/publish_enabled.gif
deleted file mode 100644
index 3c4263cc5..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/publish_enabled.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/publish_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/publish_highlighted.gif
deleted file mode 100644
index 62cef1f31..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/publish_highlighted.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/publish_service_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/publish_service_enabled.gif
deleted file mode 100644
index 45894fde3..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/publish_service_enabled.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/publish_service_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/publish_service_highlighted.gif
deleted file mode 100644
index d45ea5cad..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/publish_service_highlighted.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/publisher_assertions_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/publisher_assertions_enabled.gif
deleted file mode 100644
index 1eff85563..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/publisher_assertions_enabled.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/publisher_assertions_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/publisher_assertions_highlighted.gif
deleted file mode 100644
index 54e992fd6..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/publisher_assertions_highlighted.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/queries_closed_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/queries_closed_enabled.gif
deleted file mode 100644
index 7737d7b85..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/queries_closed_enabled.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/queries_closed_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/queries_closed_highlighted.gif
deleted file mode 100644
index 9d5500cf0..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/queries_closed_highlighted.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/queries_open_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/queries_open_highlighted.gif
deleted file mode 100644
index b6ca15439..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/queries_open_highlighted.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/query.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/query.gif
deleted file mode 100644
index 0607660ac..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/query.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/referenced_services_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/referenced_services_enabled.gif
deleted file mode 100644
index 89d796f21..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/referenced_services_enabled.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/referenced_services_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/referenced_services_highlighted.gif
deleted file mode 100644
index 401506fe7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/referenced_services_highlighted.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/registry.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/registry.gif
deleted file mode 100644
index 5b43cae7b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/registry.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/regstrycat_obj.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/regstrycat_obj.gif
deleted file mode 100644
index d37d59efc..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/regstrycat_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/service_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/service_highlighted.gif
deleted file mode 100644
index 3a6714bf9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/service_highlighted.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/service_interface_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/service_interface_highlighted.gif
deleted file mode 100644
index 21325ca77..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/service_interface_highlighted.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/service_interfaces_closed_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/service_interfaces_closed_enabled.gif
deleted file mode 100644
index fbe4a748d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/service_interfaces_closed_enabled.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/service_interfaces_closed_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/service_interfaces_closed_highlighted.gif
deleted file mode 100644
index 9bd9820d2..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/service_interfaces_closed_highlighted.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/service_interfaces_open_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/service_interfaces_open_highlighted.gif
deleted file mode 100644
index 9afcc01e1..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/service_interfaces_open_highlighted.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/services_closed_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/services_closed_enabled.gif
deleted file mode 100644
index c398f6fc8..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/services_closed_enabled.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/services_closed_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/services_closed_highlighted.gif
deleted file mode 100644
index 5e6544f2d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/services_closed_highlighted.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/services_open_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/services_open_enabled.gif
deleted file mode 100644
index 282b4c0c7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/services_open_enabled.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/services_open_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/services_open_highlighted.gif
deleted file mode 100644
index 8f860520f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/services_open_highlighted.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/unpublish.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/unpublish.gif
deleted file mode 100644
index b6922ac11..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/unpublish.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/unpublish_bus_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/unpublish_bus_enabled.gif
deleted file mode 100644
index a25416492..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/unpublish_bus_enabled.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/unpublish_bus_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/unpublish_bus_highlighted.gif
deleted file mode 100644
index d730b0fee..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/unpublish_bus_highlighted.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/unpublish_service_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/unpublish_service_enabled.gif
deleted file mode 100644
index 4e4dd3c38..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/unpublish_service_enabled.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/unpublish_service_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/unpublish_service_highlighted.gif
deleted file mode 100644
index 48bd83fb4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/unpublish_service_highlighted.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/unpublish_service_interface_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/unpublish_service_interface_enabled.gif
deleted file mode 100644
index 60eb1999e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/unpublish_service_interface_enabled.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/unpublish_service_interface_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/unpublish_service_interface_highlighted.gif
deleted file mode 100644
index 59713e2e5..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/unpublish_service_interface_highlighted.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/navigator_container.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/navigator_container.jsp
deleted file mode 100644
index ae8fbb029..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/navigator_container.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>   
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=uddiPerspective.getMessage("FRAME_TITLE_NAVIGATOR_CONTAINER")%></title>
-</head>
-<frameset rows="33,*" border=0 bgcolor="#ECE9D8">
-  <frame name="<%=UDDIFrameNames.NAVIGATOR_TOOLBAR%>" title="<%=uddiPerspective.getMessage("FRAME_TITLE_NAVIGATOR_TOOLBAR")%>" src="<%=response.encodeURL(controller.getPathWithContext("uddi/navigator_toolbar.jsp"))%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-  <frame name="<%=UDDIFrameNames.NAVIGATOR_CONTENT%>" title="<%=uddiPerspective.getMessage("FRAME_TITLE_NAVIGATOR_CONTENT")%>" src="<%=response.encodeURL(controller.getPathWithContext("uddi/navigator_content.jsp"))%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-</frameset>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/navigator_content.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/navigator_content.jsp
deleted file mode 100644
index a472951f9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/navigator_content.jsp
+++ /dev/null
@@ -1,50 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>   
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=uddiPerspective.getMessage("FRAME_TITLE_NAVIGATOR_CONTENT")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/treeview.css"))%>">
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-  <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-  </script>
-  <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/treeview.js"))%>">
-  </script>
-</head>
-<%
-   String selectedAnchorName = "";
-   NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
-   int focusedNodeId = navigatorManager.getFocusedNodeId();
-   String focusedAnchorName = String.valueOf(focusedNodeId);
-   Node selectedNode = navigatorManager.getSelectedNode();
-   if (selectedNode != null)
-   {
-     selectedAnchorName = selectedNode.getAnchorName();
-     if (focusedNodeId == selectedNode.getNodeId())
-       focusedAnchorName = selectedAnchorName;
-   }
-%>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" onLoad="self.location.hash='#<%=focusedAnchorName%>';setSelectedAnchorName('<%=selectedAnchorName%>')" class="contentbodymargin">
-<div id="treecontentborder">
-<%=navigatorManager.renderTreeView(response)%>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/navigator_toolbar.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/navigator_toolbar.jsp
deleted file mode 100644
index 41974bb0c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/navigator_toolbar.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=uddiPerspective.getMessage("FRAME_TITLE_NAVIGATOR_TOOLBAR")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/toolbar.css"))%>">
-<jsp:include page="/uddi/scripts/uddiframesets.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/toolbar.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="toolbarbodymargin">
-<div id="toolbarborder">
-  <div id="toolbar" ondblclick="processFramesetSizes(document.forms[0])">
-<jsp:useBean id="formAction" class="java.lang.StringBuffer" scope="request">
-<%
-  formAction.append("uddi/actions/ResizeUDDIFramesActionJSP.jsp");
-%>  
-</jsp:useBean>
-<jsp:useBean id="formFrameName" class="java.lang.StringBuffer" scope="request">
-<%
-   formFrameName.append(UDDIFrameNames.NAVIGATOR_CONTAINER);
-%>
-</jsp:useBean>
-<jsp:include page="/uddi/forms/ProcessUDDIFramesetsForm.jsp" flush="true"/>
-    <table width="100%" height=25 cellpadding=0 cellspacing=0 border=0>
-      <tr>
-        <td valign="middle" align="center" width=25 height=25><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/navigator.gif"))%>" width=16 height=16></td>
-<%
-   String doubleClickColumnTitle = null;
-   if (uddiPerspective.getPerspectiveContentFramesetCols().startsWith("100%"))
-     doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_RESTORE");
-   else
-     doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_MAXIMIZE");
-%>        
-        <td id="doubleclickcolumn" title="<%=doubleClickColumnTitle%>" valign="middle" align="left" width="*" height=25 nowrap class="text"><%=controller.getMessage("ALT_NAVIGATOR")%></td>
-<%
-   String altRefresh = controller.getMessage("ALT_REFRESH");
-   String altClear = controller.getMessage("ALT_CLEAR");
-%>   
-        <td valign="middle" align="center" width=25 height=25><a href="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/RefreshUDDINodeActionJSP.jsp"))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/refresh_enabled.gif"))%>" width=16 height=16 onMouseOver="src='<%=response.encodeURL(controller.getPathWithContext("images/refresh_highlighted.gif"))%>';mouseover(this)" onMouseOut="src='<%=response.encodeURL(controller.getPathWithContext("images/refresh_enabled.gif"))%>';mouseout(this)" onMouseDown="src='<%=response.encodeURL(controller.getPathWithContext("images/refresh_highlighted.gif"))%>';mousedown(this)" onMouseUp="src='<%=response.encodeURL(controller.getPathWithContext("images/refresh_enabled.gif"))%>';mouseup(this)" alt="<%=altRefresh%>" title="<%=altRefresh%>"></a></td>
-        <td valign="middle" align="center" width=25 height=25><a href="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/ClearNavigatorNodeActionJSP.jsp"))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>" width=16 height=16 onMouseOver="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_highlighted.gif"))%>';mouseover(this)" onMouseOut="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>';mouseout(this)" onMouseDown="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_highlighted.gif"))%>';mousedown(this)" onMouseUp="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>';mouseup(this)" alt="<%=altClear%>" title="<%=altClear%>"></a></td>
-      </tr>
-    </table>
-  </div>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/properties_container.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/properties_container.jsp
deleted file mode 100644
index 12fbb5454..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/properties_container.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>   
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=uddiPerspective.getMessage("FRAME_TITLE_PROPERTIES_CONTAINER")%></title>
-</head>
-<frameset rows="33,*" border=0 bgcolor="#ECE9D8">
-  <frame name="<%=UDDIFrameNames.PROPERTIES_TOOLBAR%>" title="<%=uddiPerspective.getMessage("FRAME_TITLE_PROPERTIES_TOOLBAR")%>" src="<%=response.encodeURL(controller.getPathWithContext("uddi/properties_toolbar.jsp"))%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-  <frame name="<%=UDDIFrameNames.PROPERTIES_CONTENT%>" title="<%=uddiPerspective.getMessage("FRAME_TITLE_PROPERTIES_CONTENT")%>" src="<%=response.encodeURL(controller.getPathWithContext("uddi/properties_content.jsp"))%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-</frameset>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/properties_content.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/properties_content.jsp
deleted file mode 100644
index 50237879a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/properties_content.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>   
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=uddiPerspective.getMessage("FRAME_TITLE_PROPERTIES_CONTENT")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-<%
-   NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
-   Node selectedNavigatorNode = navigatorManager.getSelectedNode();
-   if (selectedNavigatorNode != null)
-   {
-     ToolManager toolManager;
-     if (selectedNavigatorNode.getViewId() == ActionInputs.VIEWID_DEFAULT)
-       toolManager = selectedNavigatorNode.getToolManager();
-     else
-       toolManager = selectedNavigatorNode.getViewToolManager();
-     Tool selectedTool = toolManager.getSelectedTool();
-     if (selectedTool != null && selectedTool.getToolType() != ToolTypes.ACTION)
-     {
-%>
-<script language="javascript">
-  location="<%=response.encodeURL(controller.getPathWithContext(selectedTool.getFormLink()))%>";
-</script>
-<%
-     }
-     else
-     {
-%>
-<table>
-  <tr>
-    <td>
-      <%=controller.getMessage("MSG_ERROR_NO_ACTION_SELECTED")%>
-    </td>
-  </tr>
-</table>
-<%
-     }
-   }
-   else
-   {
-%>
-<table>
-  <tr>
-    <td>
-      <%=controller.getMessage("MSG_ERROR_NO_NODE_SELECTED")%>
-    </td>
-  </tr>
-</table>
-<%
-   }
-%>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/properties_toolbar.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/properties_toolbar.jsp
deleted file mode 100644
index 7939ad13a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/properties_toolbar.jsp
+++ /dev/null
@@ -1,84 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>   
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=uddiPerspective.getMessage("FRAME_TITLE_PROPERTIES_TOOLBAR")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/toolbar.css"))%>">
-<jsp:include page="/uddi/scripts/uddiframesets.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/toolbar.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="toolbarbodymargin">
-<div id="toolbarborder">
-  <div id="toolbar" ondblclick="processFramesetSizes(document.forms[0])">
-<jsp:useBean id="formAction" class="java.lang.StringBuffer" scope="request">
-<%
-  formAction.append("uddi/actions/ResizeUDDIFramesActionJSP.jsp");
-%>  
-</jsp:useBean>
-<jsp:useBean id="formFrameName" class="java.lang.StringBuffer" scope="request">
-<%
-   formFrameName.append(UDDIFrameNames.PROPERTIES_CONTAINER);
-%>
-</jsp:useBean>
-<jsp:include page="/uddi/forms/ProcessUDDIFramesetsForm.jsp" flush="true"/>
-    <table width="100%" height=25 cellpadding=0 cellspacing=0 border=0>
-      <tr>
-        <td valign="middle" align="center" width=25 height=25><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/actions.gif"))%>" width=16 height=16></td>
-<%
-   String doubleClickColumnTitle = null;
-   if (uddiPerspective.getPerspectiveContentFramesetCols().endsWith("100%"))
-   {
-     if (uddiPerspective.getActionsContainerFramesetRows().startsWith("100%"))
-       doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_RESTORE");
-   }
-   if (doubleClickColumnTitle == null)
-     doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_MAXIMIZE");
-%>        
-        <td id="doubleclickcolumn" title="<%=doubleClickColumnTitle%>" valign="middle" align="left" width="*" height=25 nowrap class="text"><%=controller.getMessage("ALT_ACTIONS")%></td>
-<%
-   NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
-   Node selectedNavigatorNode = navigatorManager.getSelectedNode();
-   if (selectedNavigatorNode != null)
-   {
-     ToolManager toolManager;
-     if (selectedNavigatorNode.getViewId() == ActionInputs.VIEWID_DEFAULT)
-       toolManager = selectedNavigatorNode.getToolManager();
-     else
-       toolManager = selectedNavigatorNode.getViewToolManager();
-     for (int i=0;i<toolManager.getNumberOfTools();i++)
-     {
-       Tool tool = (Tool)toolManager.getTool(i);
-%>
-        <td valign="middle" align="center" width=25 height=25><%=tool.renderTool(response,controller)%></td>
-<%
-     }
-   }
-%>
-      </tr>
-    </table>
-  </div>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/scripts/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/scripts/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/scripts/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/scripts/cbpanes.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/scripts/cbpanes.jsp
deleted file mode 100644
index 8c2719827..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/scripts/cbpanes.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*" %>
-
-<script language="javascript">
-  var categoryBrowserWindow = top;
-  var categoryBrowserWindowWorkArea = top.frames["<%=UDDIFrameNames.CATEGORIES_WORKAREA%>"];
-  var categoryBrowserWindowToolbar = categoryBrowserWindow.frames["<%=UDDIFrameNames.CATEGORIES_TOOLBAR%>"];
-  var categoryBrowserWindowContent = categoryBrowserWindow.frames["<%=UDDIFrameNames.CATEGORIES_CONTENT%>"];
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/scripts/detailstables.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/scripts/detailstables.jsp
deleted file mode 100644
index 1fde370c9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/scripts/detailstables.jsp
+++ /dev/null
@@ -1,1550 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/uddi/scripts/udditables.jsp" flush="true"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>   
-<script language="javascript">
-  function addDetailsLanguageInputRow(tableContainerId,textControlTitle,hasError)
-  {
-    twistOpen(tableContainerId);
-    var table = getTable(tableContainerId);
-    var tableBody = table.getElementsByTagName("TBODY").item(0);
-    var newRow = document.createElement("tr");
-    var column0 = document.createElement("td");
-    var column1 = document.createElement("td");
-    var column2 = document.createElement("td");
-    var column3 = document.createElement("td");
-
-    column0.className = "checkboxcells";
-    column1.className = "tablecells";
-    column2.className = "tablecells";
-    column2.width = "70%";
-    column3.className = "tablecells";
-
-    var rowCheckbox = createRowCheckbox();
-    column0.appendChild(rowCheckbox);
-
-    column1.appendChild(createHiddenElement("","<%=ActionInputs.VIEWID_DEFAULT%>")); <%// viewId%>
-    column1.appendChild(createHiddenElement("","")); <%// original language%>
-    column1.appendChild(createHiddenElement("","")); <%// original text%>
-    column1.appendChild(createHiddenElement("",textControlTitle)); <%// control title%>
-    column1.appendChild(createHiddenElement("",hasError)); <%// mode%>
-    if (hasError)
-    {
-      var languageSelect = document.createElement("select");
-      languageSelect.className = "selectlist";
-      populateLanguageSelect(languageSelect);
-      column1.appendChild(languageSelect);
-      
-      var textInput = document.createElement("input");
-      textInput.className = "tabletextenter";
-      textInput.title = textControlTitle;
-      column2.appendChild(textInput);
-      
-      addDetailsLanguageInputRowRemoveActionLink(tableContainerId,column3,table.rows.length);
-    }
-    else
-    {
-      column1.appendChild(document.createTextNode(""));
-      column2.appendChild(document.createTextNode(""));
-      addDetailsLanguageInputRowEditActionLink(tableContainerId,column3,table.rows.length);
-    }
-    
-    newRow.appendChild(column0);
-    newRow.appendChild(column1);
-    newRow.appendChild(column2);
-    newRow.appendChild(column3);
-    
-    tableBody.appendChild(newRow);
-  }
-
-  function removeColumnChildren(column)
-  {
-    for (var i=0;i<column.childNodes.length;i++)
-    {
-      column.removeChild(column.childNodes[i]);
-      i--;
-    }
-  }
-  
-  function addDetailsLanguageInputRowRemoveActionLink(tableContainerId,column,rowIndex)
-  {
-    var removeLink = document.createElement("a");
-    setJSLinkRowTarget(removeLink,"removeDetailsLanguageInputRow",tableContainerId,rowIndex);
-    removeLink.appendChild(document.createTextNode("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_LINK_REMOVE"))%>"));
-    column.appendChild(removeLink);
-  }
-
-  function addDetailsLanguageInputRowEditActionLink(tableContainerId,column,rowIndex)
-  {
-    var editLink = document.createElement("a");
-    setJSLinkRowTarget(editLink,"editDetailsLanguageInputRow",tableContainerId,rowIndex);
-    editLink.appendChild(document.createTextNode("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_LINK_EDIT"))%>"));
-    column.appendChild(editLink);  
-  }  
-  
-  function addDetailsLanguageInputRowCancelActionLink(tableContainerId,column,rowIndex)
-  {
-    var cancelLink = document.createElement("a");
-    setJSLinkRowTarget(cancelLink,"cancelDetailsLanguageInputRowEdit",tableContainerId,rowIndex);
-    cancelLink.appendChild(document.createTextNode("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_LINK_CANCEL"))%>"));
-    column.appendChild(cancelLink);
-  }
-  
-  function editDetailsLanguageInputRow(tableContainerId,rowIndex)
-  {
-    var table = getTable(tableContainerId);
-    var row = table.rows[rowIndex];
-    var columns = row.getElementsByTagName("td");
-    
-    var column1 = columns.item(1);
-    var column2 = columns.item(2);
-    var column3 = columns.item(3);
-    
-    var langId = column1.childNodes[1].value;
-    var inputValue = column1.childNodes[2].value;
-    var textControlTitle = column1.childNodes[3].value;
-    var editable = (column1.childNodes[4].value == "true")
-    if (editable)
-      return;
-    column1.childNodes[4].value = true;
-    var column1Control = column1.childNodes[5];
-    
-    var languageSelect = document.createElement("select");
-    populateLanguageSelect(languageSelect);
-    column1.replaceChild(languageSelect,column1Control);
-    languageSelect.className = "selectlist";
-    setLanguageSelect(languageSelect,langId);
-    
-    var column2Control = column2.childNodes[0];
-    var textInput = document.createElement("input");
-    column2.replaceChild(textInput,column2Control);
-    textInput.className = "tabletextenter";
-    textInput.title = textControlTitle;
-    textInput.value = inputValue;
-
-    removeColumnChildren(column3);
-    addDetailsLanguageInputRowCancelActionLink(tableContainerId,column3,rowIndex);
-  }
-  
-  function setDetailsLanguageInputRow(tableContainerId,index,viewId,langId,inputValue)
-  {
-    var table = getTable(tableContainerId);
-    var row = table.rows[numberOfHeaderRows+index];
-    var columns = row.getElementsByTagName("td");
-    var column1 = columns.item(1);
-    var column2 = columns.item(2);
-    column1.childNodes[0].value = viewId;
-    column1.childNodes[1].value = langId;
-    column1.childNodes[2].value = inputValue;
-    var editable = (column1.childNodes[4].value == "true");
-    var column1Control = column1.childNodes[5];
-    if (editable)
-      setLanguageSelect(column1Control,langId);
-    else
-    {
-      var tempSelect = document.createElement("select");
-      populateLanguageSelect(tempSelect);
-      var language = setLanguageSelect(tempSelect,langId);
-      column1.replaceChild(document.createTextNode(getDefaultDisplayString(language)),column1Control);
-    }
-    
-    var column2Control = column2.childNodes[0];
-    if (editable)
-      column2Control.value = inputValue;
-    else
-      column2.replaceChild(document.createTextNode(getDefaultDisplayString(inputValue)),column2Control)
-  }
-  
-  function removeDetailsLanguageInputRow(tableContainerId,rowIndex)
-  {
-    var table = getTable(tableContainerId);
-    table.deleteRow(rowIndex);
-    fixDetailsLanguageInputRowLinks(tableContainerId);
-  }
-    
-  function cancelDetailsLanguageInputRowEdit(tableContainerId,rowIndex)
-  {
-    var table = getTable(tableContainerId);
-    var row = table.rows[rowIndex];
-    var columns = row.getElementsByTagName("td");
-    var column1 = columns.item(1);
-    var column2 = columns.item(2);
-    var column3 = columns.item(3);
-    
-    var viewId = column1.childNodes[0].value;
-    var langId = column1.childNodes[1].value;
-    var inputValue = column1.childNodes[2].value;
-    var rowActionLinkHref = column3.childNodes[column3.childNodes.length-1].href;
-    if (rowActionLinkHref.indexOf("javascript:cancel") != 0)
-      return;
-      
-    column1.childNodes[4].value = false;
-    
-    var column1Control = column1.childNodes[5];
-    var tempSelect = document.createElement("select");
-    populateLanguageSelect(tempSelect);
-    var language = setLanguageSelect(tempSelect,langId);
-    column1.replaceChild(document.createTextNode(getDefaultDisplayString(language)),column1Control);
-    
-    var column2Control = column2.childNodes[0];
-    column2.replaceChild(document.createTextNode(getDefaultDisplayString(inputValue)),column2Control);
-
-    removeColumnChildren(column3);
-    addDetailsLanguageInputRowEditActionLink(tableContainerId,column3,rowIndex);
-  }
-
-  function removeSelectedDetailsLanguageInputRows(tableContainerId)
-  {
-    removeSelectedRows(tableContainerId);
-    fixDetailsLanguageInputRowLinks(tableContainerId);
-  }
-  
-  function fixDetailsLanguageInputRowLinks(tableContainerId)
-  {
-    <%// Fix the links%>
-    var table = getTable(tableContainerId);
-    for (var i=numberOfHeaderRows;i<table.rows.length;i++)
-    {
-      var row = table.rows[i];
-      var columns = row.getElementsByTagName("td");
-      var rowCheckbox = columns.item(0).getElementsByTagName("input").item(0);
-      
-      for (var j=1;j<columns.length;j++)
-      {
-        if (rowCheckbox.checked)
-          columns.item(j).className = "rowcolor";
-        else
-          columns.item(j).className = "tablecells";
-      }
-      
-      var column1 = columns.item(1);
-      var column3 = columns.item(3);
-      var link = column3.childNodes[column3.childNodes.length-1];
-      var removeLink;
-      if (link.href.indexOf("javascript:remove") == 0)
-        removeLink = true;
-      else
-        removeLink = false;
-        
-      removeColumnChildren(column3);            
-      var editable = (column1.childNodes[4].value == "true");
-      if (link.href.indexOf("javascript:remove") == 0)
-        addDetailsLanguageInputRowRemoveActionLink(tableContainerId,column3,i);
-      else if (link.href.indexOf("javascript:cancel") == 0)
-        addDetailsLanguageInputRowCancelActionLink(tableContainerId,column3,i);
-      else if (link.href.indexOf("javascript:edit") == 0)
-        addDetailsLanguageInputRowEditActionLink(tableContainerId,column3,i);
-    }
-  }
-  
-  function editSelectedDetailsLanguageInputRows(tableContainerId)
-  {
-    var table = getTable(tableContainerId);
-    for (var i=numberOfHeaderRows;i<table.rows.length;i++)
-    {
-      var rowCheckbox = table.rows[i].getElementsByTagName("input").item(0);
-      if (rowCheckbox.checked)
-        editDetailsLanguageInputRow(tableContainerId,i);
-    }
-  }
-    
-  function cancelSelectedDetailsLanguageInputRows(tableContainerId)
-  {
-    var table = getTable(tableContainerId);
-    for (var i=numberOfHeaderRows;i<table.rows.length;i++)
-    {
-      var rowCheckbox = table.rows[i].getElementsByTagName("input").item(0);
-      if (rowCheckbox.checked)
-        cancelDetailsLanguageInputRowEdit(tableContainerId,i);
-    }
-  }
-  
-  function addDetailsIdentifierRow(tableContainerId,hasError)
-  {
-    twistOpen(tableContainerId);
-    var table = getTable(tableContainerId);
-    var tableBody = table.getElementsByTagName("TBODY").item(0);
-    var newRow = document.createElement("tr");
-    var column0 = document.createElement("td");
-    var column1 = document.createElement("td");
-    var column2 = document.createElement("td");
-    var column3 = document.createElement("td");
-    var column4 = document.createElement("td");
-    
-    var rowCheckbox = createRowCheckbox();
-    column0.appendChild(rowCheckbox);
-    
-    column0.className = "checkboxcells";
-    column1.className = "tablecells";
-    column1.width = "10%";
-    column2.className = "tablecells";
-    column2.width = "40%";
-    column3.className = "tablecells";
-    column3.width = "40%";
-    column4.className = "tablecells";
-
-    column1.appendChild(createHiddenElement("","<%=ActionInputs.VIEWID_DEFAULT%>")); <%// viewId%>
-    column1.appendChild(createHiddenElement("","")); <%// original key type%>
-    column1.appendChild(createHiddenElement("","")); <%// original key name%>
-    column1.appendChild(createHiddenElement("","")); <%// original key value%>
-    column1.appendChild(createHiddenElement("",hasError)); <%// mode%>
-    
-    var identifierTypeSelect;
-    var keyNameTextInput;
-    if (hasError)
-    {
-      identifierTypeSelect = document.createElement("select");
-      identifierTypeSelect.onchange = handleIdentifierChange;
-      populateIdentifierTypeSelect(identifierTypeSelect);
-      identifierTypeSelect.className = "selectlist";
-      column1.appendChild(identifierTypeSelect);    
-    
-      keyNameTextInput = document.createElement("input");
-      keyNameTextInput.className = "tabletextenter";
-      keyNameTextInput.title = "<%=uddiPerspective.getMessage("FORM_CONTROL_TITLE_IDENTIFIER_KEY_NAME")%>";
-      column2.appendChild(keyNameTextInput);
-
-      var keyValueTextInput = document.createElement("input");
-      keyValueTextInput.className = "tabletextenter";
-      keyValueTextInput.title = "<%=uddiPerspective.getMessage("FORM_CONTROL_TITLE_IDENTIFIER_KEY_VALUE")%>";
-      column3.appendChild(keyValueTextInput);      
-      addDetailsIdentifierRowRemoveActionLink(tableContainerId,column4,table.rows.length);
-    }
-    else
-    {
-      column1.appendChild(document.createTextNode(""));
-      column2.appendChild(document.createTextNode(""));
-      column3.appendChild(document.createTextNode(""));
-      addDetailsIdentifierRowEditActionLink(tableContainerId,column4,table.rows.length);
-    }
-    
-    newRow.appendChild(column0);
-    newRow.appendChild(column1);
-    newRow.appendChild(column2);
-    newRow.appendChild(column3);
-    newRow.appendChild(column4);
-    tableBody.appendChild(newRow);
-    if (hasError)
-      keyNameTextInput.value = identifierTypeSelect.options[0].text;
-  }
-
-  function addDetailsIdentifierRowRemoveActionLink(tableContainerId,column,rowIndex)
-  {
-    var removeLink = document.createElement("a");
-    setJSLinkRowTarget(removeLink,"removeDetailsIdentifierRow",tableContainerId,rowIndex);
-    removeLink.appendChild(document.createTextNode("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_LINK_REMOVE"))%>"));
-    column.appendChild(removeLink);
-  }
-  
-  function addDetailsIdentifierRowEditActionLink(tableContainerId,column,rowIndex)
-  {
-    var editLink = document.createElement("a");
-    setJSLinkRowTarget(editLink,"editDetailsIdentifierRow",tableContainerId,rowIndex);
-    editLink.appendChild(document.createTextNode("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_LINK_EDIT"))%>"));
-    column.appendChild(editLink);
-  }  
-
-  function addDetailsIdentifierRowCancelActionLink(tableContainerId,column,rowIndex)
-  {
-    var cancelLink = document.createElement("a");
-    setJSLinkRowTarget(cancelLink,"cancelDetailsIdentifierRowEdit",tableContainerId,rowIndex);
-    cancelLink.appendChild(document.createTextNode("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_LINK_CANCEL"))%>"));
-    column.appendChild(cancelLink);  
-  }
-
-  function editDetailsIdentifierRow(tableContainerId,rowIndex)
-  {
-    var table = getTable(tableContainerId);
-    var row = table.rows[rowIndex];
-    var columns = row.getElementsByTagName("td");
-    
-    var column1 = columns.item(1);
-    var column2 = columns.item(2);
-    var column3 = columns.item(3);
-    var column4 = columns.item(4);
-    
-    var tModelKey = column1.childNodes[1].value     
-    var keyName = column1.childNodes[2].value;
-    var keyValue = column1.childNodes[3].value;
-    var editable = (column1.childNodes[4].value == "true")
-    if (editable)
-      return;
-    column1.childNodes[4].value = true;
-    
-    var column1Control = column1.childNodes[5];
-    var identifierTypeSelect = document.createElement("select");
-    identifierTypeSelect.onchange = handleIdentifierChange;
-    populateIdentifierTypeSelect(identifierTypeSelect);
-    column1.replaceChild(identifierTypeSelect,column1Control);
-    identifierTypeSelect.className = "selectlist";
-    setTModelKeySelect(identifierTypeSelect,tModelKey);    
-    
-    var column2Control = column2.childNodes[0];
-    var keyNameTextInput = document.createElement("input");
-    column2.replaceChild(keyNameTextInput,column2Control);
-    keyNameTextInput.className = "tabletextenter";
-    keyNameTextInput.title = "<%=uddiPerspective.getMessage("FORM_CONTROL_TITLE_IDENTIFIER_KEY_NAME")%>";
-    keyNameTextInput.value = keyName;
-    
-    var column3Control = column3.childNodes[0];
-    var keyValueTextInput = document.createElement("input");
-    column3.replaceChild(keyValueTextInput,column3Control);
-    keyValueTextInput.className = "tabletextenter";
-    keyValueTextInput.title = "<%=uddiPerspective.getMessage("FORM_CONTROL_TITLE_IDENTIFIER_KEY_VALUE")%>";
-    keyValueTextInput.value = keyValue;
-   
-    removeColumnChildren(column4);
-    
-    addDetailsIdentifierRowCancelActionLink(tableContainerId,column4,rowIndex);
-  }
-
-  function setDetailsIdentifierRow(tableContainerId,index,viewId,tModelKey,keyName,keyValue)
-  {
-    var table = getTable(tableContainerId);
-    var row = table.rows[numberOfHeaderRows+index];
-    var columns = row.getElementsByTagName("td");
-    var column1 = columns.item(1);
-    var column2 = columns.item(2);
-    var column3 = columns.item(3);
-    column1.childNodes[0].value = viewId;
-    column1.childNodes[1].value = tModelKey;
-    column1.childNodes[2].value = keyName;
-    column1.childNodes[3].value = keyValue;
-    var editable = (column1.childNodes[4].value == "true");
-    var column1Control = column1.childNodes[5];
-    if (editable)
-      setTModelKeySelect(column1Control,tModelKey);
-    else
-    {
-      var tempSelect = document.createElement("select");
-      populateIdentifierTypeSelect(tempSelect);
-      var tModelKeyValue = setTModelKeySelect(tempSelect,tModelKey);
-      column1.replaceChild(document.createTextNode(tModelKeyValue),column1Control);
-    }
-        
-    var column2Control = column2.childNodes[0];
-    if (editable)
-      column2Control.value = keyName;
-    else
-      column2.replaceChild(document.createTextNode(keyName),column2Control);
-      
-    var column3Control = column3.childNodes[0];
-    if (editable)
-      column3Control.value = keyValue;
-    else
-      column3.replaceChild(document.createTextNode(keyValue),column3Control);
-  }
-
-  function removeDetailsIdentifierRow(tableContainerId,rowIndex)
-  {
-    var table = getTable(tableContainerId);
-    table.deleteRow(rowIndex);
-    fixDetailsIdentifierRowLinks(tableContainerId);
-  }
-  
-  function cancelDetailsIdentifierRowEdit(tableContainerId,rowIndex)
-  {
-    var table = getTable(tableContainerId);
-    var row = table.rows[rowIndex];
-    var columns = row.getElementsByTagName("td");
-    var column1 = columns.item(1);
-    var column2 = columns.item(2);
-    var column3 = columns.item(3);
-    var column4 = columns.item(4);
-    
-    var viewId = column1.childNodes[0].value;
-    var tModelKey = column1.childNodes[1].value;
-    var keyName = column1.childNodes[2].value;
-    var keyValue = column1.childNodes[3].value;
-    var rowActionLinkHref = column4.childNodes[column4.childNodes.length-1].href;
-    if (rowActionLinkHref.indexOf("javascript:cancel") != 0)
-      return;
-    column1.childNodes[4].value = false;
-    
-    var column1Control = column1.childNodes[5];
-    var tempSelect = document.createElement("select");
-    populateIdentifierTypeSelect(tempSelect);
-    var tModelKeyValue = setTModelKeySelect(tempSelect,tModelKey);
-    column1.replaceChild(document.createTextNode(tModelKeyValue),column1Control);
-    
-    var column2Control = column2.childNodes[0];
-    column2.replaceChild(document.createTextNode(keyName),column2Control);
-    
-    var column3Control = column3.childNodes[0];
-    column3.replaceChild(document.createTextNode(keyValue),column3Control);
-
-    removeColumnChildren(column4);
-    addDetailsIdentifierRowEditActionLink(tableContainerId,column4,rowIndex);
-  }
-  
-  function removeSelectedDetailsIdentifierRows(tableContainerId)
-  {
-    removeSelectedRows(tableContainerId);
-    <%// Fix the links%>
-    fixDetailsIdentifierRowLinks(tableContainerId);
-  }
-  
-  function fixDetailsIdentifierRowLinks(tableContainerId)
-  {
-    var table = getTable(tableContainerId);
-    for (var i=numberOfHeaderRows;i<table.rows.length;i++)
-    {
-      var row = table.rows[i];
-      var columns = row.getElementsByTagName("td");
-      var rowCheckbox = columns.item(0).getElementsByTagName("input").item(0);
-      for (var j=1;j<columns.length;j++)
-      {
-        if (rowCheckbox.checked)
-          columns.item(j).className = "rowcolor";
-        else
-          columns.item(j).className = "tablecells";
-      }
-      var column1 = columns.item(1);
-      var viewId = column1.childNodes[0].value;
-      var column4 = columns.item(4);
-      var link = column4.childNodes[column4.childNodes.length-1];
-      var removeLink;
-      if (link.href.indexOf("javascript:remove") == 0)
-        removeLink = true;
-      else
-        removeLink = false;      
-      removeColumnChildren(column4);
-      
-      if (link.href.indexOf("javascript:remove") == 0)
-        addDetailsIdentifierRowRemoveActionLink(tableContainerId,column4,i);
-      else if (link.href.indexOf("javascript:edit") == 0)
-        addDetailsIdentifierRowEditActionLink(tableContainerId,column4,i);
-      else if (link.href.indexOf("javascript:cancel") == 0)
-        addDetailsIdentifierRowCancelActionLink(tableContainerId,column4,i);
-    }  
-  }
-  
-  function editSelectedDetailsIdentifierRows(tableContainerId)
-  {
-    var table = getTable(tableContainerId);
-    for (var i=numberOfHeaderRows;i<table.rows.length;i++)
-    {
-      var rowCheckbox = table.rows[i].getElementsByTagName("input").item(0);
-      if (rowCheckbox.checked)
-        editDetailsIdentifierRow(tableContainerId,i);
-    }  
-  }
-  
-  function cancelSelectedDetailsIdentifierRows(tableContainerId)
-  {
-    var table = getTable(tableContainerId);
-    for (var i=numberOfHeaderRows;i<table.rows.length;i++)
-    {
-      var rowCheckbox = table.rows[i].getElementsByTagName("input").item(0);
-      if (rowCheckbox.checked)
-        cancelDetailsIdentifierRowEdit(tableContainerId,i);
-    }  
-  }
-  
-  function addDetailsCategoryRow(tableContainerId,hasError)
-  {
-    twistOpen(tableContainerId);
-    var table = getTable(tableContainerId);
-    var tableBody = table.getElementsByTagName("TBODY").item(0);
-    var newRow = document.createElement("tr");
-    var column0 = document.createElement("td");
-    var column1 = document.createElement("td");
-    var column2 = document.createElement("td");
-    var column3 = document.createElement("td");
-    var column4 = document.createElement("td");
-    
-    var rowCheckbox = createRowCheckbox();
-    column0.appendChild(rowCheckbox);
-    
-    column0.className = "checkboxcells";
-    column1.className = "tablecells";
-    column1.width = "5%";
-    column2.className = "tablecells";
-    column2.width = "55%";
-    column3.className = "tablecells";
-    column3.width = "25%";
-    column4.className = "tablecells";
-
-    column1.appendChild(createHiddenElement("","<%=ActionInputs.VIEWID_DEFAULT%>")); <%// viewId%>
-    column1.appendChild(createHiddenElement("","")); <%// original key type%>
-    column1.appendChild(createHiddenElement("","")); <%// original key name%>
-    column1.appendChild(createHiddenElement("","")); <%// original key value%>
-    column1.appendChild(createHiddenElement("",hasError)); <%// mode%>
-    
-    if (hasError)
-    {
-      var categoryTypeSelect = document.createElement("select");
-      populateCategoryTypeSelect(categoryTypeSelect);
-      categoryTypeSelect.className = "selectlist";
-      column1.appendChild(categoryTypeSelect);
-      
-      var keyNameTextInput = document.createElement("input");
-      keyNameTextInput.className = "tabletextenter";
-      keyNameTextInput.title = "<%=uddiPerspective.getMessage("FORM_CONTROL_TITLE_CATEGORY_KEY_NAME")%>";
-      column2.appendChild(keyNameTextInput);
-      
-      var keyValueTextInput = document.createElement("input");
-      keyValueTextInput.className = "tabletextenter";
-      keyValueTextInput.title = "<%=uddiPerspective.getMessage("FORM_CONTROL_TITLE_CATEGORY_KEY_VALUE")%>";
-      column3.appendChild(keyValueTextInput);
-      addCategoryRowBrowseLink(tableContainerId,column4,table.rows.length);
-    }
-    else
-    {
-      column1.appendChild(document.createTextNode(""));
-      column2.appendChild(document.createTextNode(""));
-      column3.appendChild(document.createTextNode(""));
-      addDetailsCategoryRowEditActionLink(tableContainerId,column4,table.rows.length);
-    }
-      
-    newRow.appendChild(column0);
-    newRow.appendChild(column1);
-    newRow.appendChild(column2);
-    newRow.appendChild(column3);
-    newRow.appendChild(column4);
-    tableBody.appendChild(newRow);      
-  }
-
-  function addDetailsCategoryRowCancelActionLink(tableContainerId,column,rowIndex)
-  {
-    var cancelLink = document.createElement("a");
-    setJSLinkRowTarget(cancelLink,"cancelDetailsCategoryRowEdit",tableContainerId,rowIndex);
-    cancelLink.appendChild(document.createTextNode("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_LINK_CANCEL"))%>"));
-    column.appendChild(cancelLink);  
-  }
-
-  function addDetailsCategoryRowBrowseCancelActionLinks(tableContainerId,column,rowIndex)
-  {
-    addCategoryRowBrowseLink(tableContainerId,column,rowIndex);
-    column.appendChild(document.createTextNode(" "));
-    addDetailsCategoryRowCancelActionLink(tableContainerId,column,rowIndex);
-  }
-
-  function addDetailsCategoryRowEditActionLink(tableContainerId,column,rowIndex)
-  {
-    var editLink = document.createElement("a");
-    setJSLinkRowTarget(editLink,"editDetailsCategoryRow",tableContainerId,rowIndex);
-    editLink.appendChild(document.createTextNode("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_LINK_EDIT"))%>"));
-    column.appendChild(editLink);
-  }
-
-  function addDetailsCategoryRowRemoveActionLink(tableContainerId,column,rowIndex)
-  {
-    var removeLink = document.createElement("a");
-    setJSLinkRowTarget(removeLink,"removeDetailsCategoryRow",tableContainerId,rowIndex);
-    removeLink.appendChild(document.createTextNode("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_LINK_REMOVE"))%>"));
-    column.appendChild(removeLink);  
-  }
-
-  function addDetailsCategoryRowBrowseRemoveActionLinks(tableContainerId,column,rowIndex)
-  {
-    addCategoryRowBrowseLink(tableContainerId,column,rowIndex);
-    column.appendChild(document.createTextNode(" "));
-    addDetailsCategoryRowRemoveActionLink(tableContainerId,column,rowIndex);
-  }
-
-  function editDetailsCategoryRow(tableContainerId,rowIndex)
-  {
-    var table = getTable(tableContainerId);
-    var row = table.rows[rowIndex];
-    var columns = row.getElementsByTagName("td");
-    
-    var column1 = columns.item(1);
-    var column2 = columns.item(2);
-    var column3 = columns.item(3);
-    var column4 = columns.item(4);
-    
-    var tModelKey = column1.childNodes[1].value
-    var keyName = column1.childNodes[2].value;
-    var keyValue = column1.childNodes[3].value;
-    var editable = (column1.childNodes[4].value == "true")
-    if (editable)
-      return;
-    column1.childNodes[4].value = true;
-    
-    var column1Control = column1.childNodes[5];
-    var categoryTypeSelect = document.createElement("select");
-    populateCategoryTypeSelect(categoryTypeSelect);
-    column1.replaceChild(categoryTypeSelect,column1Control);
-    categoryTypeSelect.className = "selectlist";
-    setTModelKeySelect(categoryTypeSelect,tModelKey);    
-    
-    var column2Control = column2.childNodes[0];
-    var keyNameTextInput = document.createElement("input");
-    column2.replaceChild(keyNameTextInput,column2Control);
-    keyNameTextInput.className = "tabletextenter";
-    keyNameTextInput.title = "<%=uddiPerspective.getMessage("FORM_CONTROL_TITLE_CATEGORY_KEY_NAME")%>";
-    keyNameTextInput.value = keyName;
-    
-    var column3Control = column3.childNodes[0];
-    var keyValueTextInput = document.createElement("input");
-    column3.replaceChild(keyValueTextInput,column3Control);
-    keyValueTextInput.className = "tabletextenter";
-    keyValueTextInput.title = "<%=uddiPerspective.getMessage("FORM_CONTROL_TITLE_CATEGORY_KEY_VALUE")%>";
-    keyValueTextInput.value = keyValue;
-    
-    removeColumnChildren(column4);
-    
-    addDetailsCategoryRowBrowseCancelActionLinks(tableContainerId,column4,rowIndex);
-  }
-
-  function setDetailsCategoryRow(tableContainerId,index,viewId,tModelKey,keyName,keyValue)
-  {
-    var table = getTable(tableContainerId);
-    var row = table.rows[numberOfHeaderRows+index];
-    var columns = row.getElementsByTagName("td");
-    var column1 = columns.item(1);
-    var column2 = columns.item(2);
-    var column3 = columns.item(3);
-    column1.childNodes[0].value = viewId;
-    column1.childNodes[1].value = tModelKey;
-    column1.childNodes[2].value = keyName;
-    column1.childNodes[3].value = keyValue;
-    var editable = (column1.childNodes[4].value == "true");
-    
-    var column1Control = column1.childNodes[5];
-    if (editable)
-      setTModelKeySelect(column1Control,tModelKey);
-    else
-    {
-      var tempSelect = document.createElement("select");
-      populateCategoryTypeSelect(tempSelect);
-      var tModelKeyValue = setTModelKeySelect(tempSelect,tModelKey);
-      column1.replaceChild(document.createTextNode(tModelKeyValue),column1Control);
-    }
-        
-    var column2Control = column2.childNodes[0];
-    if (editable)
-      column2Control.value = keyName;
-    else
-      column2.replaceChild(document.createTextNode(keyName),column2Control);
-      
-    var column3Control = column3.childNodes[0];
-    if (editable)
-      column3Control.value = keyValue;
-    else
-      column3.replaceChild(document.createTextNode(keyValue),column3Control); 
-  }
-
-  function removeDetailsCategoryRow(tableContainerId,rowIndex)
-  {
-    var table = getTable(tableContainerId);
-    table.deleteRow(rowIndex);
-    fixDetailsCategoryRowLinks(tableContainerId);
-  }
-  
-  function cancelDetailsCategoryRowEdit(tableContainerId,rowIndex)
-  {
-    var table = getTable(tableContainerId);
-    var row = table.rows[rowIndex];
-    var columns = row.getElementsByTagName("td");
-    var column1 = columns.item(1);
-    var column2 = columns.item(2);
-    var column3 = columns.item(3);
-    var column4 = columns.item(4);
-    
-    var viewId = column1.childNodes[0].value;
-    var tModelKey = column1.childNodes[1].value;
-    var keyName = column1.childNodes[2].value;
-    var keyValue = column1.childNodes[3].value;
-    var rowActionLinkHref = column4.childNodes[column4.childNodes.length-1].href;
-    if (rowActionLinkHref.indexOf("javascript:cancel") != 0)
-      return;
-    column1.childNodes[4].value = false;
-    
-    var column1Control = column1.childNodes[5];
-    var tempSelect = document.createElement("select");
-    populateCategoryTypeSelect(tempSelect);
-    var tModelKeyValue = setTModelKeySelect(tempSelect,tModelKey);
-    column1.replaceChild(document.createTextNode(tModelKeyValue),column1Control);
-    
-    var column2Control = column2.childNodes[0];
-    column2.replaceChild(document.createTextNode(keyName),column2Control);
-    
-    var column3Control = column3.childNodes[0];
-    column3.replaceChild(document.createTextNode(keyValue),column3Control);
-
-    removeColumnChildren(column4);    
-    addDetailsCategoryRowEditActionLink(tableContainerId,column4,rowIndex);
-    if (rowIndex == targetCategoryRow)
-      closeCategoryBrowser();
-  }
-  
-  function removeSelectedDetailsCategoryRows(tableContainerId)
-  {
-    removeSelectedRows(tableContainerId);
-    <%// Fix the links%>
-    fixDetailsCategoryRowLinks(tableContainerId);
-  }
-  
-  function fixDetailsCategoryRowLinks(tableContainerId)
-  {
-    var table = getTable(tableContainerId);
-    for (var i=numberOfHeaderRows;i<table.rows.length;i++)
-    {
-      var row = table.rows[i];
-      var columns = row.getElementsByTagName("td");
-      var rowCheckbox = columns.item(0).getElementsByTagName("input").item(0);
-      for (var j=1;j<columns.length;j++)
-      {
-        if (rowCheckbox.checked)
-          columns.item(j).className = "rowcolor";
-        else
-          columns.item(j).className = "tablecells";
-      }
-      var column1 = columns.item(1);
-      var viewId = column1.childNodes[0].value;
-      var column4 = columns.item(4);
-<%      
-      // Browse, Remove
-      // Browse, Cancel
-      // Edit
-      // Browse
-%>      
-      var lastLink = column4.childNodes[column4.childNodes.length-1];
-      removeColumnChildren(column4);
-      if (lastLink.href.indexOf("javascript:remove") == 0)
-        addDetailsCategoryRowBrowseRemoveActionLinks(tableContainerId,column4,i);
-      else if (lastLink.href.indexOf("javascript:cancel") == 0)
-        addDetailsCategoryRowBrowseCancelActionLinks(tableContainerId,column4,i);
-      else if (lastLink.href.indexOf("javascript:edit") == 0)
-        addDetailsCategoryRowEditActionLink(tableContainerId,column4,i);
-      else if (lastLink.href.indexOf("javascript:open") == 0)
-        addCategoryRowBrowseLink(tableContainerId,column4,i);
-    }  
-  }
-  
-  function editSelectedDetailsCategoryRows(tableContainerId)
-  {
-    var table = getTable(tableContainerId);
-    for (var i=numberOfHeaderRows;i<table.rows.length;i++)
-    {
-      var rowCheckbox = table.rows[i].getElementsByTagName("input").item(0);
-      if (rowCheckbox.checked)
-        editDetailsCategoryRow(tableContainerId,i);
-    }  
-  }
-  
-  function cancelSelectedDetailsCategoryRows(tableContainerId)
-  {
-    var table = getTable(tableContainerId);
-    for (var i=numberOfHeaderRows;i<table.rows.length;i++)
-    {
-      var rowCheckbox = table.rows[i].getElementsByTagName("input").item(0);
-      if (rowCheckbox.checked)
-        cancelDetailsCategoryRowEdit(tableContainerId,i);
-    }  
-  }
-  
-  function addDetailsUserDefinedCategoryRow(tableContainerId,tModelKey,categoryName,isChecked,fileName,hasError)
-  {
-    var table = getTable(tableContainerId);
-    var tableBody = table.getElementsByTagName("TBODY").item(0);
-    var newRow = document.createElement("tr");
-    //var column0 = document.createElement("td");
-    var column1 = document.createElement("td");
-    //var column2 = document.createElement("td");
-    //var column3 = document.createElement("td");
-    //var column4 = document.createElement("td");
-    
-    //column0.className = "checkboxcells";
-    column1.className = "tablecells";
-    column1.width = "15%";
-    //column2.className = "tablecells";
-    //column2.width = "10%";
-    //column3.className = "tablecells";
-    //column3.width = "70%";
-    //column4.className = "tablecells";
-    
-    //var rowCheckbox = createRowCheckbox();
-    //column0.appendChild(rowCheckbox);
-    
-    //column1.appendChild(createHiddenElement("",fileName));  <%// original file name%>
-    //column1.appendChild(createHiddenElement("",hasError));  <%// mode%>
-    //column1.appendChild(createHiddenElement("",tModelKey)); <%// tModelKey%>
-    column1.appendChild(document.createTextNode(categoryName));
-    
-    //column2.appendChild(document.createTextNode(isChecked));
-    
-    //if (hasError)
-    //{
-    //  column3.appendChild(createHiddenElement("<%=UDDIActionInputs.CATEGORY_TMODEL_KEY%>",tModelKey));
-    //  var fileInput = document.createElement("input");
-    //  fileInput.setAttribute("name","<%=UDDIActionInputs.CATEGORY_FILENAME%>");
-    //  fileInput.setAttribute("type","file");
-    //  fileInput.title = "<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_CONTROL_TITLE_CATEGORY_FILE"))%>";
-    //  fileInput.className = "tablefilebrowse";
-    //  column3.appendChild(fileInput);
-    //  addDetailsUserDefinedCategoryRowCancelLink(tableContainerId,column4,table.rows.length);
-    //}
-    //else
-    //{
-    //  column3.appendChild(document.createTextNode(fileName));
-    //  addDetailsUserDefinedCategoryRowEditLink(tableContainerId,column4,table.rows.length);
-    //}
-    
-    //newRow.appendChild(column0);
-    newRow.appendChild(column1);
-    //newRow.appendChild(column2);
-    //newRow.appendChild(column3);
-    //newRow.appendChild(column4);
-    
-    tableBody.appendChild(newRow);
-  }
-  
-  function addDetailsUserDefinedCategoryRowEditLink(tableContainerId,column,rowIndex)
-  {
-    var editLink = document.createElement("a");
-    setJSLinkRowTarget(editLink,"editDetailsUserDefinedCategoryRow",tableContainerId,rowIndex);
-    editLink.appendChild(document.createTextNode("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_LINK_EDIT"))%>"));
-    column.appendChild(editLink);
-  }
-  
-  function editDetailsUserDefinedCategoryRow(tableContainerId,rowIndex)
-  {
-    var table = getTable(tableContainerId);
-    var row = table.rows[rowIndex];
-    var columns = row.getElementsByTagName("td");
-    
-    var column1 = columns.item(1);    
-    var column3 = columns.item(3);
-    var column4 = columns.item(4);
-    
-    var editable = (column1.childNodes[1].value == "true");
-    if (editable)
-      return;
-    var tModelKey = column1.childNodes[2].value;
-    column1.childNodes[1].value = true;
-    
-    removeColumnChildren(column3);
-    column3.appendChild(createHiddenElement("<%=UDDIActionInputs.CATEGORY_TMODEL_KEY%>",tModelKey));
-    var fileInput = document.createElement("input");
-    fileInput.setAttribute("name","<%=UDDIActionInputs.CATEGORY_FILENAME%>");
-    fileInput.setAttribute("type","file");
-    fileInput.title = "<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_CONTROL_TITLE_CATEGORY_FILE"))%>";
-    fileInput.className = "tablefilebrowse";
-    column3.appendChild(fileInput);
-    
-    removeColumnChildren(column4);
-    
-    addDetailsUserDefinedCategoryRowCancelLink(tableContainerId,column4,rowIndex);
-  }
-  
-  function addDetailsUserDefinedCategoryRowCancelLink(tableContainerId,column,rowIndex)
-  {
-    var cancelLink = document.createElement("a");
-    setJSLinkRowTarget(cancelLink,"cancelDetailsUserDefinedCategoryRowEdit",tableContainerId,rowIndex);
-    cancelLink.appendChild(document.createTextNode("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_LINK_CANCEL"))%>"));
-    column.appendChild(cancelLink);
-  }
-  
-  function cancelDetailsUserDefinedCategoryRowEdit(tableContainerId,rowIndex)
-  {
-    var table = getTable(tableContainerId);
-    var row = table.rows[rowIndex];
-    var columns = row.getElementsByTagName("td");
-    
-    var column1 = columns.item(1);
-    var column3 = columns.item(3);
-    var column4 = columns.item(4);
-    
-    var editable = (column1.childNodes[1].value == "true");
-    if (!editable)
-      return;
-    column1.childNodes[1].value = false;
-    
-    removeColumnChildren(column3);
-    column3.appendChild(document.createTextNode(column1.childNodes[0].value));
-    
-    removeColumnChildren(column4);
-    
-    addDetailsUserDefinedCategoryRowEditLink(tableContainerId,column4,rowIndex);
-  }
-  
-  function editSelectedDetailsUserDefinedCategoryRows(tableContainerId)
-  {
-    var table = getTable(tableContainerId);
-    for (var i=numberOfHeaderRows;i<table.rows.length;i++)
-    {
-      var rowCheckbox = table.rows[i].getElementsByTagName("input").item(0);
-      if (rowCheckbox.checked)
-        editDetailsUserDefinedCategoryRow(tableContainerId,i);
-    }
-  }
-  
-  function cancelSelectedDetailsUserDefinedCategoryRows(tableContainerId)
-  {
-    var table = getTable(tableContainerId);
-    for (var i=numberOfHeaderRows;i<table.rows.length;i++)
-    {
-      var rowCheckbox = table.rows[i].getElementsByTagName("input").item(0);
-      if (rowCheckbox.checked)
-        cancelDetailsUserDefinedCategoryRowEdit(tableContainerId,i);
-    }
-  }  
-  
-  function addDetailsDiscoveryURLRow(tableContainerId,hasError)
-  {
-    twistOpen(tableContainerId);
-    var table = getTable(tableContainerId);
-    var tableBody = table.getElementsByTagName("TBODY").item(0);
-    var newRow = document.createElement("tr");
-    var column0 = document.createElement("td");
-    var column1 = document.createElement("td");
-    var column2 = document.createElement("td");
-
-    column0.className = "checkboxcells";
-    column1.className = "tablecells";
-    column1.width = "85%";
-    column2.className = "tablecells";
-    
-    var rowCheckbox = createRowCheckbox();
-    column0.appendChild(rowCheckbox);
-    
-    column1.appendChild(createHiddenElement("","<%=ActionInputs.VIEWID_DEFAULT%>")); <%// viewId%>
-    column1.appendChild(createHiddenElement("","")); <%// original Discovery URL%>
-    column1.appendChild(createHiddenElement("",hasError)); <%// mode%>
-    if (hasError)
-    {
-      var textInput = document.createElement("input");
-      textInput.className = "tabletextenter";
-      textInput.title = "<%=uddiPerspective.getMessage("FORM_CONTROL_TITLE_DISCOVERY_URL")%>";
-      column1.appendChild(textInput);
-      addDetailsDiscoveryURLRowRemoveActionLink(tableContainerId,column2,table.rows.length);
-    }
-    else
-    {
-      column1.appendChild(document.createTextNode(""));
-      addDetailsDiscoveryURLRowEditActionLink(tableContainerId,column2,table.rows.length);
-    }
-    
-    newRow.appendChild(column0);
-    newRow.appendChild(column1);
-    newRow.appendChild(column2);
-    
-    tableBody.appendChild(newRow);
-  }
-  
-  function addDetailsDiscoveryURLRowRemoveActionLink(tableContainerId,column,rowIndex)
-  {
-    var removeLink = document.createElement("a");
-    setJSLinkRowTarget(removeLink,"removeDetailsDiscoveryURLRow",tableContainerId,rowIndex);
-    removeLink.appendChild(document.createTextNode("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_LINK_REMOVE"))%>"));
-    column.appendChild(removeLink);
-  }
-  
-  function addDetailsDiscoveryURLRowEditActionLink(tableContainerId,column,rowIndex)
-  {
-    var editLink = document.createElement("a");
-    setJSLinkRowTarget(editLink,"editDetailsDiscoveryURLRow",tableContainerId,rowIndex);
-    editLink.appendChild(document.createTextNode("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_LINK_EDIT"))%>"));
-    column.appendChild(editLink);
-  }
-  
-  function addDetailsDiscoveryURLRowCancelActionLink(tableContainerId,column,rowIndex)
-  {
-    var cancelLink = document.createElement("a");
-    setJSLinkRowTarget(cancelLink,"cancelDetailsDiscoveryURLRowEdit",tableContainerId,rowIndex);
-    cancelLink.appendChild(document.createTextNode("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_LINK_CANCEL"))%>"));
-    column.appendChild(cancelLink);
-  }
-  
-  function editDetailsDiscoveryURLRow(tableContainerId,rowIndex)
-  {
-    var table = getTable(tableContainerId);
-    var row = table.rows[rowIndex];
-    var columns = row.getElementsByTagName("td");
-    
-    var column1 = columns.item(1);
-    var column2 = columns.item(2);
-    
-    var discoveryURL = column1.childNodes[1].value;
-    var editable = (column1.childNodes[2].value == "true")
-    if (editable)
-      return;
-    column1.childNodes[2].value = true;
-    
-    var column1Control = column1.childNodes[3];
-    var textInput = document.createElement("input");
-    column1.replaceChild(textInput,column1Control);
-    textInput.className = "tabletextenter";
-    textInput.title = "<%=uddiPerspective.getMessage("FORM_CONTROL_TITLE_DISCOVERY_URL")%>";
-    textInput.value = discoveryURL;
-    
-    removeColumnChildren(column2);
-    addDetailsDiscoveryURLRowCancelActionLink(tableContainerId,column2,rowIndex);
-  }
-  
-  function setDetailsDiscoveryURLRow(tableContainerId,index,viewId,discoveryURL)
-  {
-    var table = getTable(tableContainerId);
-    var row = table.rows[numberOfHeaderRows+index];
-    var columns = row.getElementsByTagName("td");
-    var column1 = columns.item(1);
-    column1.childNodes[0].value = viewId;
-    column1.childNodes[1].value = discoveryURL;
-    var editable = (column1.childNodes[2].value == "true");
-    var column1Control = column1.childNodes[3];
-    if (editable)
-      column1Control.value = discoveryURL;
-    else
-      column1.replaceChild(document.createTextNode(getDefaultDisplayString(discoveryURL)),column1Control);
-  }
-  
-  function removeDetailsDiscoveryURLRow(tableContainerId,rowIndex)
-  {
-    var table = getTable(tableContainerId);
-    table.deleteRow(rowIndex);
-    fixDetailsDiscoveryURLRowLinks(tableContainerId);
-  }
-  
-  function cancelDetailsDiscoveryURLRowEdit(tableContainerId,rowIndex)
-  {
-    var table = getTable(tableContainerId);
-    var row = table.rows[rowIndex];
-    var columns = row.getElementsByTagName("td");
-    var column1 = columns.item(1);
-    var column2 = columns.item(2);
-    
-    var viewId = column1.childNodes[0].value;
-    var discoveryURL = column1.childNodes[1].value;
-    var rowActionLinkHref = column2.childNodes[column2.childNodes.length-1].href;
-    if (rowActionLinkHref.indexOf("javascript:cancel") != 0)
-      return;
-      
-    column1.childNodes[2].value = false;
-    
-    var column1Control = column1.childNodes[3];
-    column1.replaceChild(document.createTextNode(getDefaultDisplayString(discoveryURL)),column1Control);
-    
-    removeColumnChildren(column2);
-    addDetailsDiscoveryURLRowEditActionLink(tableContainerId,column2,rowIndex);
-  }
-  
-  function removeSelectedDetailsDiscoveryURLRows(tableContainerId)
-  {
-    removeSelectedRows(tableContainerId);
-    fixDetailsDiscoveryURLRowLinks(tableContainerId);
-  }
-  
-  function fixDetailsDiscoveryURLRowLinks(tableContainerId)
-  {
-    <%// Fix the links%>
-    var table = getTable(tableContainerId);
-    for (var i=numberOfHeaderRows;i<table.rows.length;i++)
-    {
-      var row = table.rows[i];
-      var columns = row.getElementsByTagName("td");
-      var rowCheckbox = columns.item(0).getElementsByTagName("input").item(0);
-      
-      for (var j=1;j<columns.length;j++)
-      {
-        if (rowCheckbox.checked)
-          columns.item(j).className = "rowcolor";
-        else
-          columns.item(j).className = "tablecells";
-      }
-      
-      var column1 = columns.item(1);
-      var column2 = columns.item(2);
-      var link = column2.childNodes[column2.childNodes.length-1];
-      removeColumnChildren(column2);
-      var editable = (column1.childNodes[2].value == "true");
-      if (link.href.indexOf("javascript:remove") == 0)
-        addDetailsDiscoveryURLRowRemoveActionLink(tableContainerId,column2,i);
-      else if (link.href.indexOf("javascript:cancel") == 0)
-        addDetailsDiscoveryURLRowCancelActionLink(tableContainerId,column2,i);
-      else if (link.href.indexOf("javascript:edit") == 0)
-        addDetailsDiscoveryURLRowEditActionLink(tableContainerId,column2,i); 
-    }
-  }
-  
-  function editSelectedDetailsDiscoveryURLRows(tableContainerId)
-  {
-    var table = getTable(tableContainerId);
-    for (var i=numberOfHeaderRows;i<table.rows.length;i++)
-    {
-      var rowCheckbox = table.rows[i].getElementsByTagName("input").item(0);
-      if (rowCheckbox.checked)
-        editDetailsDiscoveryURLRow(tableContainerId,i);
-    }
-  }
-  
-  function cancelSelectedDetailsDiscoveryURLRows(tableContainerId)
-  {
-    var table = getTable(tableContainerId);
-    for (var i=numberOfHeaderRows;i<table.rows.length;i++)
-    {
-      var rowCheckbox = table.rows[i].getElementsByTagName("input").item(0);
-      if (rowCheckbox.checked)
-        cancelDetailsDiscoveryURLRowEdit(tableContainerId,i);
-    }
-  }
-
-  function addDetailsSingleItemRow(tableContainerId,hasError)
-  {
-    var table = getTable(tableContainerId);
-    var tableBody = table.getElementsByTagName("TBODY").item(0);
-    var newRow = document.createElement("tr");
-    var column0 = document.createElement("td");
-    var column1 = document.createElement("td");
-    
-    column0.className = "tablecells";
-    column0.width = "90%";
-    column1.className = "tablecells";
-    
-    column0.appendChild(createHiddenElement("","")); <%// item value%>
-    column0.appendChild(createHiddenElement("",hasError)); <%// mode%>
-    
-    newRow.appendChild(column0);
-    newRow.appendChild(column1);
-    
-    newRow.appendChild(column1);
-    tableBody.appendChild(newRow);
-  }
-
-  function addDetailsWSDLURLSingleItemRowBrowseActionLink(tableContainerId,wsdlType,column)
-  {
-    var browseLink = document.createElement("a");
-    browseLink.href = "javascript:openWSDLBrowser('contentborder',"+wsdlType+")";
-    browseLink.appendChild(document.createTextNode("<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LINK_BROWSE"))%>"));
-    column.appendChild(browseLink);    
-  }
-  
-  function addDetailsWSDLURLSingleItemRowBrowseCancelActionLinks(tableContainerId,wsdlType,column)
-  {
-    addDetailsWSDLURLSingleItemRowBrowseActionLink(tableContainerId,wsdlType,column);
-    column.appendChild(document.createTextNode(" "));
-    var cancelLink = document.createElement("a");
-    cancelLink.href = "javascript:cancelDetailsWSDLURLSingleItemRowEdit('"+tableContainerId+"')";
-    cancelLink.appendChild(document.createTextNode("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_LINK_CANCEL"))%>"));
-    column.appendChild(cancelLink);
-  }
-  
-  function addDetailsWSDLURLSingleItemRowEditActionLink(tableContainerId,column)
-  {
-    var editLink = document.createElement("a");
-    editLink.href = "javascript:editDetailsWSDLURLSingleItemRow('"+tableContainerId+"')";
-    editLink.appendChild(document.createTextNode("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_LINK_EDIT"))%>"));
-    column.appendChild(editLink);
-  }
-  
-  function cancelDetailsWSDLURLSingleItemRowEdit(tableContainerId)
-  {
-    var table = getTable(tableContainerId);
-    var columns = table.rows[numberOfHeaderRows].getElementsByTagName("td");
-    var column0 = columns.item(0);
-    var column1 = columns.item(1);
-    
-    column0.childNodes[2].value = false;
-    
-    var column0Control = column0.childNodes[column0.childNodes.length-1];
-    column0.replaceChild(document.createTextNode(getWSDLURLDisplay(column0.childNodes[0].value)),column0Control);
-    
-    removeColumnChildren(column1);
-    
-    addDetailsWSDLURLSingleItemRowEditActionLink(tableContainerId,column1);
-  }
-  
-  function editDetailsWSDLURLSingleItemRow(tableContainerId)
-  {
-    var table = getTable(tableContainerId);
-    var columns = table.rows[numberOfHeaderRows].getElementsByTagName("td");
-    var column0 = columns.item(0);
-    var column1 = columns.item(1);
-    
-    var wsdlType = column0.childNodes[1].value;
-    column0.childNodes[2].value = true;
-    
-    var column0Control = column0.childNodes[column0.childNodes.length-1];
-    var wsdlURLEditControl = createWSDLURLEditControl();
-    column0.replaceChild(wsdlURLEditControl,column0Control);
-    wsdlURLEditControl.className = "tabletextenter";
-    wsdlURLEditControl.value = getWSDLURLDisplay(column0.childNodes[0].value);
-    
-    removeColumnChildren(column1);
-    
-    addDetailsWSDLURLSingleItemRowBrowseCancelActionLinks(tableContainerId,wsdlType,column1);
-  }
-  
-  function createWSDLURLEditControl()
-  {
-    var control;
-    if (isMicrosoftInternetExplorer())
-      control = document.createElement("<input name='<%=ActionInputs.QUERY_INPUT_WSDL_URL%>'>");
-    else
-    {
-      control = document.createElement("input");
-      control.setAttribute("name","<%=ActionInputs.QUERY_INPUT_WSDL_URL%>");
-    }
-    return control;
-  }
-  
-  function getWSDLURLDisplay(wsdlURL)
-  {
-    if (wsdlURL.length < 1)
-      wsdlURLDisplay = "<%=HTMLUtils.JSMangle(controller.getMessage("MSG_ERROR_WSDL_URL_IS_UNREACHABLE"))%>";
-    else
-      wsdlURLDisplay = wsdlURL;
-    return wsdlURLDisplay;
-  }
-  
-  function setDetailsWSDLURLSingleItemRow(tableContainerId,wsdlType,wsdlURL)
-  {
-    var table = getTable(tableContainerId);
-    var columns = table.rows[numberOfHeaderRows].getElementsByTagName("td");
-    var column0 = columns.item(0);
-    var column1 = columns.item(1);
-
-    column0.insertBefore(createHiddenElement("",wsdlType),column0.childNodes[1]);
-    var editable = (column0.childNodes[2].value == "true");
-    var wsdlURLDisplay = getWSDLURLDisplay(wsdlURL);
-    column0.childNodes[0].value = wsdlURL;
-    
-    var column0Control;    
-    if (editable)
-    {
-      column0Control = createWSDLURLEditControl();
-      column0Control.className = "tabletextenter";
-      addDetailsWSDLURLSingleItemRowBrowseActionLink(tableContainerId,wsdlType,column1);
-    }
-    else
-    {
-      column0Control = document.createTextNode(wsdlURLDisplay);
-      addDetailsWSDLURLSingleItemRowEditActionLink(tableContainerId,column1);
-    }
-    column0.appendChild(column0Control);
-    if (editable)
-      column0Control.value = wsdlURLDisplay;
-  }
-  
-  function addDetailsNameSingleItemRowCancelActionLink(tableContainerId,column)
-  {
-    var cancelLink = document.createElement("a");
-    cancelLink.href = "javascript:cancelDetailsNameSingleItemRowEdit('"+tableContainerId+"')";
-    cancelLink.appendChild(document.createTextNode("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_LINK_CANCEL"))%>"));
-    column.appendChild(cancelLink);
-  }
-
-  function addDetailsNameSingleItemRowEditActionLink(tableContainerId,column)  
-  {
-    var editLink = document.createElement("a");
-    editLink.href = "javascript:editDetailsNameSingleItemRow('"+tableContainerId+"')";
-    editLink.appendChild(document.createTextNode("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_LINK_EDIT"))%>"));
-    column.appendChild(editLink);
-  }
-  
-  function editDetailsNameSingleItemRow(tableContainerId)
-  {
-    var table = getTable(tableContainerId);
-    var columns = table.rows[numberOfHeaderRows].getElementsByTagName("td");
-    var column0 = columns.item(0);
-    var column1 = columns.item(1);
-    
-    column0.childNodes[1].value = true;
-    
-    var column0Control = column0.childNodes[column0.childNodes.length-1];
-    var textInput = document.createElement("input");
-    column0.replaceChild(textInput,column0Control);
-    textInput.className = "tabletextenter";
-    textInput.title = "<%=uddiPerspective.getMessage("FORM_CONTROL_TITLE_INPUT_TEXT_VALUE")%>";
-    textInput.value = column0.childNodes[0].value;
-
-    removeColumnChildren(column1);
-    
-    addDetailsNameSingleItemRowCancelActionLink(tableContainerId,column1);
-  }
-  
-  function cancelDetailsNameSingleItemRowEdit(tableContainerId)
-  {
-    var table = getTable(tableContainerId);
-    var columns = table.rows[numberOfHeaderRows].getElementsByTagName("td");
-    var column0 = columns.item(0);
-    var column1 = columns.item(1);
-    
-    column0.childNodes[1].value = false;
-    
-    var column0Control = column0.childNodes[column0.childNodes.length-1];
-    column0.replaceChild(document.createTextNode(column0.childNodes[0].value),column0Control);
-    
-    for (var i=0;i<column1.childNodes.length;i++)
-    {
-      column1.removeChild(column1.childNodes[i]);
-      i--;
-    }
-    addDetailsNameSingleItemRowEditActionLink(tableContainerId,column1);
-  }
-  
-  function setDetailsNameSingleItemRow(tableContainerId,name)
-  {
-    var table = getTable(tableContainerId);
-    var columns = table.rows[numberOfHeaderRows].getElementsByTagName("td");
-    var column0 = columns.item(0);
-    var column1 = columns.item(1);
-    
-    var editable = (column0.childNodes[1].value == "true");
-    column0.childNodes[0].value = name;
-    
-    var column0Control;
-    if (editable)
-    {
-      column0Control = document.createElement("input");
-      column0Control.className = "tabletextenter";
-      column0Control.title = "<%=uddiPerspective.getMessage("FORM_CONTROL_TITLE_INPUT_TEXT_VALUE")%>";
-      column0Control.value = name;
-      column1.appendChild(document.createTextNode("<%=uddiPerspective.getMessage("FORM_LABEL_ACTIONS_NONE")%>"));
-    }
-    else
-    {
-      column0Control = document.createTextNode(name);
-      addDetailsNameSingleItemRowEditActionLink(tableContainerId,column1);
-    }
-    column0.appendChild(column0Control);
-  }
-  
-  function processDetailsDiscoveryURLTable(tableContainerId,modifiedName,viewIdName,discoveryURLName,form)
-  {
-    var table = getTable(tableContainerId);
-    for (var i=numberOfHeaderRows;i<table.rows.length;i++)
-    {
-      var columns = table.rows[i].getElementsByTagName("td");
-      var column1 = columns.item(1);
-      var viewId = column1.childNodes[0].value;
-      var editable = (column1.childNodes[2].value == "true");
-      var discoveryURL;
-      if (editable)
-        discoveryURL = column1.childNodes[3].value;
-      else
-        discoveryURL = column1.childNodes[1].value;
-      form.appendChild(createHiddenElement(viewIdName,viewId));
-      form.appendChild(createHiddenElement(discoveryURLName,discoveryURL));
-      form.appendChild(createHiddenElement(modifiedName,editable));        
-    }
-  }
-  
-  function processDetailsLanguageInputTable(tableContainerId,modifiedName,viewIdName,langIdName,inputName,form)
-  {
-    var table = getTable(tableContainerId);
-    for (var i=numberOfHeaderRows;i<table.rows.length;i++)
-    {
-      var columns = table.rows[i].getElementsByTagName("td");
-      var column1 = columns.item(1);
-      var viewId = column1.childNodes[0].value;
-      var editable = (column1.childNodes[4].value == "true");
-      var langId,inputText;
-      if (editable)
-      {
-        langId = column1.childNodes[5].value;
-        var column2 = columns.item(2);
-        inputText = column2.childNodes[0].value;
-      }
-      else
-      {
-        langId = column1.childNodes[1].value;
-        inputText = column1.childNodes[2].value;
-      }
-      form.appendChild(createHiddenElement(viewIdName,viewId));
-      form.appendChild(createHiddenElement(langIdName,langId));
-      form.appendChild(createHiddenElement(inputName,inputText));
-      form.appendChild(createHiddenElement(modifiedName,editable));
-    }
-  }
-  
-  function processDetailsIdentifierTable(tableContainerId,form)
-  {
-    var table = getTable(tableContainerId);
-    for (var i=numberOfHeaderRows;i<table.rows.length;i++)
-    {
-      var columns = table.rows[i].getElementsByTagName("td");
-      var column1 = columns.item(1);
-      var viewId = column1.childNodes[0].value;
-      var editable = (column1.childNodes[4].value == "true");
-      var tModelKey,idKeyName,idKeyValue;
-      if (editable)
-      {
-        tModelKey = column1.childNodes[5].value;
-        var column2 = columns.item(2);
-        idKeyName = column2.childNodes[0].value;
-        var column3 = columns.item(3);
-        idKeyValue = column3.childNodes[0].value;
-      }
-      else
-      {
-        tModelKey = column1.childNodes[1].value;
-        idKeyName = column1.childNodes[2].value;
-        idKeyValue = column1.childNodes[3].value;
-      }
-      form.appendChild(createHiddenElement("<%=UDDIActionInputs.IDENTIFIER_VIEWID%>",viewId));
-      form.appendChild(createHiddenElement("<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_TYPE%>",tModelKey));
-      form.appendChild(createHiddenElement("<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_NAME%>",idKeyName));
-      form.appendChild(createHiddenElement("<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_VALUE%>",idKeyValue));
-      form.appendChild(createHiddenElement("<%=UDDIActionInputs.IDENTIFIER_MODIFIED%>",editable));      
-    }
-  }
-  
-  function processDetailsCategoryTable(tableContainerId,form)
-  {
-    var table = getTable(tableContainerId);
-    for (var i=numberOfHeaderRows;i<table.rows.length;i++)
-    {
-      var columns = table.rows[i].getElementsByTagName("td");
-      var column1 = columns.item(1);
-      var viewId = column1.childNodes[0].value;
-      var editable = (column1.childNodes[4].value == "true");
-      var tModelKey,catKeyName,catKeyValue;
-      if (editable)
-      {
-        tModelKey = column1.childNodes[5].value;
-        var column2 = columns.item(2);
-        catKeyName = column2.childNodes[0].value;
-        var column3 = columns.item(3);
-        catKeyValue = column3.childNodes[0].value;
-      }
-      else
-      {
-        tModelKey = column1.childNodes[1].value;
-        catKeyName = column1.childNodes[2].value;
-        catKeyValue = column1.childNodes[3].value;
-      }
-      form.appendChild(createHiddenElement("<%=UDDIActionInputs.CATEGORY_VIEWID%>",viewId));
-      form.appendChild(createHiddenElement("<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_TYPE%>",tModelKey));
-      form.appendChild(createHiddenElement("<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_NAME%>",catKeyName));
-      form.appendChild(createHiddenElement("<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_VALUE%>",catKeyValue));
-      form.appendChild(createHiddenElement("<%=UDDIActionInputs.CATEGORY_MODIFIED%>",editable));
-    }
-  }
-  
-  function processDetailsSingleItemTable(tableContainerId,modifiedName,inputName,form)
-  {
-    var table = getTable(tableContainerId);
-    var columns = table.rows[numberOfHeaderRows].getElementsByTagName("td");
-    var column0 = columns.item(0);
-    var column1 = columns.item(1);
-    var editable = (column0.childNodes[column0.childNodes.length-2].value == "true");
-    var inputValue;
-    if (editable)
-      inputValue = column0.childNodes[column0.childNodes.length-1].value;
-    else
-      inputValue = column0.childNodes[0].value;
-    form.appendChild(createHiddenElement(inputName,inputValue));
-    form.appendChild(createHiddenElement(modifiedName,editable));    
-  }
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/scripts/results.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/scripts/results.jsp
deleted file mode 100644
index 31b66729f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/scripts/results.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*,
-                                                        java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="subQueryTransferTargetHolder" class="java.util.Vector" scope="request"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<jsp:include page="/scripts/formsubmit.jsp" flush="true"/>
-<jsp:include page="/uddi/scripts/udditables.jsp" flush="true"/>
-<script language="javascript">
-  function getNumberOfSelections(tableContainerId)
-  {
-    var numberSelected = 0;
-    var table = getTable(tableContainerId);
-    for (var i=numberOfHeaderRows;i<table.rows.length;i++)
-    {
-      var rowCheckbox = table.rows[i].getElementsByTagName("input").item(0);
-      if (rowCheckbox.checked)
-        numberSelected++;
-    }
-    return numberSelected;
-  }
-  
-  function processResultForm(tableContainerId,form)
-  {
-    if (handleSubmit(form))
-    {
-      processResultTable(tableContainerId,"<%=ActionInputs.NODEID%>",form,true);
-      form.submit();
-    }
-  }
-  
-  function clearSelections(tableContainerId,form)
-  {
-    form.action = "<%=response.encodeURL(controller.getPathWithContext("uddi/actions/ClearNavigatorNodesActionJSP.jsp"))%>";
-    // Ensure that at least one item is selected.
-    var numberSelected = getNumberOfSelections(tableContainerId);
-    if (numberSelected > 0)
-      processResultForm(tableContainerId,form);
-    else
-      alert("<%=uddiPerspective.getMessage("MSG_ERROR_NOTHING_SELECTED")%>");
-  }
-  
-  function refreshSelections(tableContainerId,form)
-  {
-    form.action = "<%=response.encodeURL(controller.getPathWithContext("uddi/actions/RefreshUDDINodesActionJSP.jsp"))%>";
-    // Ensure that at least one item is selected.
-    var numberSelected = getNumberOfSelections(tableContainerId);
-    if (numberSelected > 0)
-      processResultForm(tableContainerId,form);
-    else
-      alert("<%=uddiPerspective.getMessage("MSG_ERROR_NOTHING_SELECTED")%>");
-  }
-  
-  function addSelectionsToFavorites(tableContainerId,form)
-  {
-    form.action = "<%=response.encodeURL(controller.getPathWithContext("uddi/actions/AddItemsToFavoritesActionJSP.jsp"))%>";
-    // Ensure that at least one item is selected.
-    var numberSelected = getNumberOfSelections(tableContainerId);
-    if (numberSelected > 0)
-      processResultForm(tableContainerId,form);
-    else
-      alert("<%=uddiPerspective.getMessage("MSG_ERROR_NOTHING_SELECTED")%>");
-  }
-  
-<%
-   if (subQueryTransferTargetHolder.size() > 0)
-   {
-     SubQueryTransferTarget subQueryTransferTarget = (SubQueryTransferTarget)subQueryTransferTargetHolder.elementAt(0);
-     String subQueryKey = subQueryTransferTarget.getSubQueryKey();
-     int lastSeparatorPos = subQueryKey.lastIndexOf(':');
-     String targetQueryKey;
-     if (lastSeparatorPos == -1)
-       targetQueryKey = "";
-     else
-       targetQueryKey = subQueryKey.substring(0,lastSeparatorPos);
-     String targetProperty = subQueryKey.substring(lastSeparatorPos+1,subQueryKey.length());
-%>     
-  function transferSelections(tableContainerId,form)
-  {
-    form.action = "<%=response.encodeURL(controller.getPathWithContext("uddi/actions/TransferSubQueryResultsActionJSP.jsp"))%>";
-    // Ensure that at least one item is selected.
-    var numberSelected = getNumberOfSelections(tableContainerId);
-    if (numberSelected > 0)
-    {
-<%
-     if (targetProperty.equals(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS) || targetProperty.equals(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_BUSINESS) || targetProperty.equals(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_SERVICE))
-     {
-%>
-      if (numberSelected != 1)
-      {
-        alert("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("MSG_ERROR_SINGLE_ITEM"))%>");
-        return;
-      }
-
-<%
-       FormTool targetFormTool = subQueryTransferTarget.getTargetFormTool();
-       FormToolPropertiesInterface targetFormToolPI = ((MultipleFormToolPropertiesInterface)targetFormTool).getFormToolProperties(targetQueryKey);
-       Vector serviceBusiness = (Vector)targetFormToolPI.getProperty(targetProperty);
-       if (serviceBusiness != null && serviceBusiness.size() > 0)
-       {
-%>
-      if (!confirm("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("MSG_QUESTION_ITEM_REPLACEMENT"))%>"))
-        return;
-<%
-       }
-     }
-%>
-      processResultForm(tableContainerId,form);
-    }
-    else
-      alert("<%=uddiPerspective.getMessage("MSG_ERROR_NOTHING_SELECTED")%>");
-  }
-<%
-   }
-%>       
-</script>  
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/scripts/uddiframesets.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/scripts/uddiframesets.jsp
deleted file mode 100644
index da24ad5ac..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/scripts/uddiframesets.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-<jsp:include page="/scripts/panes.jsp" flush="true"/>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<script language="javascript">
-  function getActionsContainerFrameset()
-  {
-    return perspectiveContent.frames["<%=UDDIFrameNames.ACTIONS_CONTAINER%>"].document.getElementsByTagName("frameset").item(0);
-  }
-
-  function processFramesetSizes(framesetSizesForm)
-  {
-    toggleDoubleClickColumnTitle();
-    var perspectiveContentFrameset = getPerspectiveContentFrameset();
-    var actionsContainerFrameset = getActionsContainerFrameset();
-    framesetSizesForm.<%=UDDIActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT%>.value = perspectiveContentFrameset.cols;
-    framesetSizesForm.<%=UDDIActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER%>.value = actionsContainerFrameset.rows;
-    framesetSizesForm.submit();
-  }
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/scripts/uddipanes.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/scripts/uddipanes.jsp
deleted file mode 100644
index 3d864cc0b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/scripts/uddipanes.jsp
+++ /dev/null
@@ -1,35 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:include page="/scripts/panes.jsp" flush="true"/>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<script language="javascript">
-  var navigatorContainer = perspectiveContent.frames["<%=UDDIFrameNames.NAVIGATOR_CONTAINER%>"];
-  var navigatorToolbar = navigatorContainer.frames["<%=UDDIFrameNames.NAVIGATOR_TOOLBAR%>"];
-  var navigatorContent = navigatorContainer.frames["<%=UDDIFrameNames.NAVIGATOR_CONTENT%>"];
-  var actionsContainer = perspectiveContent.frames["<%=UDDIFrameNames.ACTIONS_CONTAINER%>"];
-  var propertiesContainer = actionsContainer.frames["<%=UDDIFrameNames.PROPERTIES_CONTAINER%>"];
-  var propertiesToolbar = propertiesContainer.frames["<%=UDDIFrameNames.PROPERTIES_TOOLBAR%>"];
-  var propertiesContent = propertiesContainer.frames["<%=UDDIFrameNames.PROPERTIES_CONTENT%>"];
-  var statusContainer = actionsContainer.frames["<%=UDDIFrameNames.STATUS_CONTAINER%>"];
-  var statusToolbar = statusContainer.frames["<%=UDDIFrameNames.STATUS_TOOLBAR%>"];
-  var statusContent = statusContainer.frames["<%=UDDIFrameNames.STATUS_CONTENT%>"];
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/scripts/udditables.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/scripts/udditables.jsp
deleted file mode 100644
index 9fb27851c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/scripts/udditables.jsp
+++ /dev/null
@@ -1,894 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*,
-                                                        org.uddi4j.datatype.tmodel.*,
-                                                        org.uddi4j.util.*,
-                                                        java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/scripts/wsdlbrowser.jsp" flush="true"/>
-<jsp:include page="/scripts/tables.jsp" flush="true"/>
-<jsp:include page="/scripts/formutils.jsp" flush="true"/>
-<%
-   String sessionId = session.getId();
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-   NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
-   UDDIMainNode uddiMainNode = (UDDIMainNode)navigatorManager.getRootNode();
-   RegistryNode regNode = uddiMainNode.getRegistryNode(navigatorManager.getSelectedNode());
-   RegistryElement regElement = (RegistryElement)regNode.getTreeElement();
-%>
-<jsp:useBean id="commonCategoryModels" class="java.util.Hashtable" scope="application"/>
-<script language="javascript">
-  // Requires browserdetect.js, tables.jsp (explorer)
-  var rowCheckboxName = "rowCheckboxName";
-  var categoryWindow;
-  var categoryWindowClosed = true;
-  var targetCategoryRow = -1;
-  var targetCategoryKeyNameElement;
-  var targetCategoryKeyValueElement;
-  var languageArray = new Array();
-  var categoryArray = new Array();
-  var wildcardCategoryBrowserURLRe = /(%)/;
-
-  function closeAllUddiChildWindows()
-  {
-    closeCategoryBrowser();
-    closeWSDLBrowser();
-  }
-
-  function Language(displayName,langId)
-  {
-    this.displayName = displayName;
-    this.langId = langId;
-  }
-
-  function compareLanguageDisplayNames(a,b)
-  {
-    var result = a.displayName.localeCompare(b.displayName);
-    if (result < 0)
-      return -1;
-    else if (result > 0)
-      return 1;
-    else
-      return 0;
-  }
-
-  function setTModelKeySelect(itemSelect,tModelKey)
-  {
-    for (var i=0;i<itemSelect.options.length;i++)
-    {
-      if (itemSelect.options[i].value.toLowerCase() == tModelKey.toLowerCase())
-      {
-        itemSelect.options[i].selected = true;
-        return itemSelect.options[i].text;
-      }
-    }
-  }
-
-  function setLanguageSelect(languageSelect,languageValue)
-  {
-    var start;
-<%
-   // Compare with the empty string only if the languageValue is the empty string.
-%>
-    if (languageValue.length < 1)
-      start = 0;
-    else
-      start = 1;
-    for (var i=start;i<languageSelect.options.length;i++)
-    {
-<%
-   // Use a regular expression to check if languageValue begins with a key whose item is in the pick list. This enables "English" to be selected
-   // for en-xxx (dialects).
-%>
-      var regExp = new RegExp("^"+languageSelect.options[i].value,"i");
-      if (regExp.test(languageValue))
-      {
-        languageSelect.options[i].selected = true;
-        return languageSelect.options[i].text;
-      }
-    }
-  }
-
-  function populateLanguageSelect(languageSelect)
-  {
-    if (languageArray.length == 0)
-    {
-      languageArray[languageArray.length] = new Language("","");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_EN"))%>","en");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_AA"))%>","aa");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_AB"))%>","ab");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_AF"))%>","af");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_AM"))%>","am");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_AR"))%>","ar");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_AS"))%>","as");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_AY"))%>","ay");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_AZ"))%>","az");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_BA"))%>","ba");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_BE"))%>","be");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_BG"))%>","bg");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_BH"))%>","bh");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_BI"))%>","bi");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_BN"))%>","bn");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_BO"))%>","bo");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_BR"))%>","br");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_CA"))%>","ca");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_CO"))%>","co");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_CZ"))%>","cz");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_CY"))%>","cy");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_DA"))%>","da");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_DE"))%>","de");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_DZ"))%>","dz");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_EL"))%>","el");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_EO"))%>","eo");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_ES"))%>","es");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_ET"))%>","et");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_EU"))%>","eu");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_FA"))%>","fa");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_FI"))%>","fi");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_FJ"))%>","fj");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_FO"))%>","fo");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_FR"))%>","fr");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_FY"))%>","fy");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_GA"))%>","ga");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_GD"))%>","gd");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_GL"))%>","gl");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_GN"))%>","gn");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_GU"))%>","gu");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_HA"))%>","ha");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_HI"))%>","hi");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_HR"))%>","hr");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_HU"))%>","hu");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_HY"))%>","hy");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_IA"))%>","ia");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_IE"))%>","ie");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_IK"))%>","ik");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_IN"))%>","in");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_IS"))%>","is");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_IT"))%>","it");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_IW"))%>","iw");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_JA"))%>","ja");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_JI"))%>","ji");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_JW"))%>","jw");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_KA"))%>","ka");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_KK"))%>","kk");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_KL"))%>","kl");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_KM"))%>","km");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_KN"))%>","kn");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_KO"))%>","ko");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_KS"))%>","ks");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_KU"))%>","ku");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_KY"))%>","ky");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_LA"))%>","la");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_LN"))%>","ln");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_LO"))%>","lo");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_LT"))%>","lt");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_LV"))%>","lv");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_MG"))%>","mg");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_MI"))%>","mi");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_MK"))%>","mk");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_ML"))%>","ml");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_MN"))%>","mn");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_MO"))%>","mo");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_MR"))%>","mr");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_MS"))%>","ms");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_MT"))%>","mt");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_MY"))%>","my");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_NA"))%>","na");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_NE"))%>","ne");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_NL"))%>","nl");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_NO"))%>","no");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_OC"))%>","oc");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_OM"))%>","om");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_OR"))%>","or");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_PA"))%>","pa");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_PL"))%>","pl");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_PS"))%>","ps");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_PT"))%>","pt");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_QU"))%>","qu");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_RM"))%>","rm");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_RN"))%>","rn");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_RO"))%>","ro");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_RU"))%>","ru");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_RW"))%>","rw");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_SA"))%>","sa");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_SD"))%>","sd");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_SG"))%>","sg");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_SH"))%>","sh");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_SI"))%>","si");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_SK"))%>","sk");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_SL"))%>","sl");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_SM"))%>","sm");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_SN"))%>","sn");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_SO"))%>","so");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_SQ"))%>","sq");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_SR"))%>","sr");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_SS"))%>","ss");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_ST"))%>","st")
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_SU"))%>","su");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_SV"))%>","sv");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_SW"))%>","sw");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_TA"))%>","ta");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_TE"))%>","te");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_TG"))%>","tg");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_TH"))%>","th");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_TI"))%>","ti");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_TK"))%>","tk");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_TL"))%>","tl");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_TN"))%>","tn");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_TO"))%>","to");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_TR"))%>","tr");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_TS"))%>","ts");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_TT"))%>","tt");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_TW"))%>","tw");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_UK"))%>","uk");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_UR"))%>","ur");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_UZ"))%>","uz");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_VI"))%>","vi");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_VO"))%>","vo");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_WO"))%>","wo");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_XH"))%>","xh");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_YO"))%>","yo");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_ZH"))%>","zh");
-      languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_ZU"))%>","zu");
-      languageArray.sort(compareLanguageDisplayNames);
-    }
-
-    for (var i=0;i<languageArray.length;i++)
-      languageSelect.options[i] = new Option(languageArray[i].displayName,languageArray[i].langId);
-  }
-
-  function setLanguageInputRowSettings(tableContainerId,nameIndex,languageValue,nameTextValue)
-  {
-    var table = getTable(tableContainerId);
-    var row = table.rows[numberOfHeaderRows+nameIndex];
-    var languageSelect = row.getElementsByTagName("select").item(0);
-    var nameText = row.getElementsByTagName("input").item(1);
-    setLanguageSelect(languageSelect,languageValue);
-    nameText.value = nameTextValue;
-  }
-
-  function removeSelectedCategoryRows(tableContainerId)
-  {
-    // Check if any rows above and including the targetCategoryRow are selected.
-    var table = getTable(tableContainerId);
-    var newTargetCategoryRow = targetCategoryRow;
-    for (var i=numberOfHeaderRows;i<=targetCategoryRow;i++)
-    {
-      var tableRow = table.rows[i];
-      var rowCheckbox = tableRow.getElementsByTagName("input").item(0);
-      if (rowCheckbox.checked)
-      {
-        if (i == targetCategoryRow)
-          newTargetCategoryRow = -1;
-        else
-          newTargetCategoryRow--;
-      }
-    }
-    if (newTargetCategoryRow == -1)
-      closeCategoryBrowser();
-    targetCategoryRow = newTargetCategoryRow;
-    removeSelectedRows(tableContainerId);
-    // Fix the browse... links.
-    for (var i=numberOfHeaderRows;i<table.rows.length;i++)
-    {
-      var tableRow = table.rows[i];
-      var browseLink = tableRow.getElementsByTagName("a").item(0);
-      setJSLinkRowTarget(browseLink,"openCategoryBrowser",tableContainerId,i);
-    }
-  }
-
-  function addLanguageInputRow(tableContainerId,textControlTitle)
-  {
-    twistOpen(tableContainerId);
-    var table = getTable(tableContainerId);
-    var tableBody = table.getElementsByTagName("TBODY").item(0);
-    var newRow = document.createElement("tr");
-    var column0 = document.createElement("td");
-    var column1 = document.createElement("td");
-    var column2 = document.createElement("td");
-
-    var rowCheckbox = createRowCheckbox();
-    column0.appendChild(rowCheckbox);
-
-    var languageSelect = document.createElement("select");
-    populateLanguageSelect(languageSelect);
-    column1.appendChild(languageSelect);
-
-    var textInput = document.createElement("input");
-    column2.appendChild(textInput);
-
-    column0.className = "checkboxcells";
-    languageSelect.className = "selectlist";
-    column1.className = "tablecells";
-    textInput.className = "tabletextenter";
-    textInput.title = textControlTitle;
-    column2.className = "tablecells";
-    column2.width = "90%";
-    newRow.appendChild(column0);
-    newRow.appendChild(column1);
-    newRow.appendChild(column2);
-    tableBody.appendChild(newRow);
-  }
-
-  function setIdentifierRowSettings(tableContainerId,identifierIndex,tModelKey,keyName,keyValue)
-  {
-    var table = getTable(tableContainerId);
-    var row = table.rows[numberOfHeaderRows+identifierIndex];
-    var identifierTypeSelect = row.getElementsByTagName("select").item(0);
-    var rowElementCollection = row.getElementsByTagName("input");
-    var keyNameText = rowElementCollection.item(1);
-    var keyValueText = rowElementCollection.item(2);
-    setTModelKeySelect(identifierTypeSelect,tModelKey);
-    keyNameText.value = keyName;
-    keyValueText.value = keyValue;
-  }
-
-  function populateIdentifierTypeSelect(identifierTypeSelect)
-  {
-    var counter = 0;
-    identifierTypeSelect.options[counter++] = new Option("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_IDENTIFIER_DUNS"))%>","<%=TModel.D_U_N_S_TMODEL_KEY%>");
-    identifierTypeSelect.options[counter++] = new Option("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_IDENTIFIER_THOMAS_REGISTRY"))%>","<%=TModel.THOMAS_REGISTER_TMODEL_KEY%>");
-  }
-
-  function handleIdentifierChange(e)
-  {
-    var identifierSelect;
-    if (isMicrosoftInternetExplorer())
-      identifierSelect = event.srcElement;
-    else
-      identifierSelect = e.target;
-    var cell = identifierSelect.parentNode;
-    var row = cell.parentNode;
-    var inputElements = row.getElementsByTagName("input");
-    for (var i=0;i<inputElements.length;i++)
-    {
-      if (inputElements.item(i).type == "text")
-      {
-        inputElements.item(i).value = identifierSelect.options[identifierSelect.selectedIndex].text;
-        break;
-      }
-    }
-  }
-
-  function addIdentifierRow(tableContainerId)
-  {
-    twistOpen(tableContainerId);
-    var table = getTable(tableContainerId);
-    var tableBody = table.getElementsByTagName("TBODY").item(0);
-    var newRow = document.createElement("tr");
-    var column0 = document.createElement("td");
-    var column1 = document.createElement("td");
-    var column2 = document.createElement("td");
-    var column3 = document.createElement("td");
-
-    var rowCheckbox = createRowCheckbox();
-    column0.appendChild(rowCheckbox);
-
-    var keyTypeSelect = document.createElement("select");
-    keyTypeSelect.onchange = handleIdentifierChange;
-    populateIdentifierTypeSelect(keyTypeSelect);
-    column1.appendChild(keyTypeSelect);
-
-    var keyNameTextInput = document.createElement("input");
-    column2.appendChild(keyNameTextInput);
-
-    var keyValueTextInput = document.createElement("input");
-    column3.appendChild(keyValueTextInput);
-
-    column0.className = "checkboxcells";
-    keyTypeSelect.className = "selectlist"
-    column1.className = "tablecells";
-    column1.width = "5%";
-    keyNameTextInput.className = "tabletextenter";
-    keyNameTextInput.title = "<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_CONTROL_TITLE_IDENTIFIER_KEY_NAME"))%>";
-    column2.className = "tablecells";
-    column2.width = "40%";
-    keyValueTextInput.className = "tabletextenter";
-    keyValueTextInput.title = "<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_CONTROL_TITLE_IDENTIFIER_KEY_VALUE"))%>";
-    column3.className = "tablecells";
-    column3.width = "55%";
-
-    newRow.appendChild(column0);
-    newRow.appendChild(column1);
-    newRow.appendChild(column2);
-    newRow.appendChild(column3);
-    tableBody.appendChild(newRow);
-    keyNameTextInput.value = keyTypeSelect.options[0].text;
-  }
-  
-  function Category(displayName,tModelKey)
-  {
-    this.displayName = displayName;
-    this.tModelKey = tModelKey;
-  }
-
-  function compareCategoryDisplayNames(a,b)
-  {
-    var result = a.displayName.localeCompare(b.displayName);
-    if (result < 0)
-      return -1;
-    else if (result > 0)
-      return 1;
-    else
-      return 0;
-  }  
-
-  function populateCategoryTypeSelect(categoryTypeSelect)
-  {
-    if (categoryArray.length == 0)
-    {
-<%
-   Enumeration commonCategories = commonCategoryModels.elements();
-   while (commonCategories.hasMoreElements())
-   {
-     CategoryModel commonCategoryModel = (CategoryModel)commonCategories.nextElement();
-%>
-      categoryArray[categoryArray.length] = new Category("<%=HTMLUtils.JSMangle(commonCategoryModel.getDisplayName())%>","<%=commonCategoryModel.getTModelKey()%>");
-<%
-   }
-   Enumeration userDefinedCategories = regElement.getUserDefinedCategories();
-   if (userDefinedCategories != null)
-   {
-     while (userDefinedCategories.hasMoreElements())
-     {
-       CategoryModel userDefinedCategory = (CategoryModel)userDefinedCategories.nextElement();
-%>
-      categoryArray[categoryArray.length] = new Category("<%=HTMLUtils.JSMangle(userDefinedCategory.getDisplayName())%>","<%=userDefinedCategory.getTModelKey()%>");
-<%
-     }
-   }
-%>
-      categoryArray.sort(compareCategoryDisplayNames);
-    }
-    
-    for (var i=0;i<categoryArray.length;i++)
-      categoryTypeSelect.options[i] = new Option(categoryArray[i].displayName,categoryArray[i].tModelKey);
-  }
-
-  function setJSLinkRowTarget(link,jsFunction,tableContainerId,row)
-  {
-    link.href = "javascript:"+jsFunction+"('"+tableContainerId+"',"+row+")";
-  }
-
-  function openCategoryBrowser(tableContainerId,row)
-  {
-    var table = getTable(tableContainerId);
-    var categorySelect = table.rows[row].getElementsByTagName("select").item(0);
-    var selectedCategoryOption = categorySelect.options[categorySelect.options.selectedIndex];
-    var categoryType = table.rows[row].getElementsByTagName("select").item(0).options.selectedIndex;
-    var columns = table.rows[row].getElementsByTagName("td");
-    targetCategoryRow = row;
-    targetCategoryKeyNameElement = columns.item(2).childNodes[0];
-    targetCategoryKeyValueElement = columns.item(3).childNodes[0];
-    var link = "<%=response.encodeURL(controller.getPathWithContext(OpenCategoryBrowserAction.getWildCardActionLink(sessionId)))%>";
-    categoryWindow = window.open(link.replace(wildcardCategoryBrowserURLRe,selectedCategoryOption.value),"categoryWindow","height=300,width=300,status=yes,scrollbars=yes,resizable=yes");
-    if (categoryWindow.focus)
-      categoryWindow.focus();
-  }
-
-  function closeCategoryBrowser()
-  {
-    if (!categoryWindowClosed)
-      categoryWindow.close();
-  }
-
-  function setCategoryRowSettings(tableContainerId,categoryIndex,tModelKey,keyName,keyValue)
-  {
-    var table = getTable(tableContainerId);
-    var row = table.rows[numberOfHeaderRows+categoryIndex];
-    var categoryTypeSelect = row.getElementsByTagName("select").item(0);
-    var rowElementCollection = row.getElementsByTagName("input");
-    var keyNameText = rowElementCollection.item(1);
-    var keyValueText = rowElementCollection.item(2);
-    setTModelKeySelect(categoryTypeSelect,tModelKey);
-    keyNameText.value = keyName;
-    keyValueText.value = keyValue;
-  }
-
-  function addCategoryRowBrowseLink(tableContainerId,column,rowIndex)
-  {
-    var browseLink = document.createElement("a");
-    setJSLinkRowTarget(browseLink,"openCategoryBrowser",tableContainerId,rowIndex);
-    browseLink.appendChild(document.createTextNode("<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LINK_BROWSE"))%>"));
-    column.appendChild(browseLink);
-  }
-
-  function addCategoryRow(tableContainerId)
-  {
-    twistOpen(tableContainerId);
-    var table = getTable(tableContainerId);
-    var tableBody = table.getElementsByTagName("TBODY").item(0);
-    var newRow = document.createElement("tr");
-    var column0 = document.createElement("td");
-    var column1 = document.createElement("td");
-    var column2 = document.createElement("td");
-    var column3 = document.createElement("td");
-    var column4 = document.createElement("td");
-
-    var rowCheckbox = createRowCheckbox();
-    column0.appendChild(rowCheckbox);
-
-    var categoryTypeSelect = document.createElement("select");
-    populateCategoryTypeSelect(categoryTypeSelect);
-    column1.appendChild(categoryTypeSelect);
-
-    var keyNameTextInput = document.createElement("input");
-    column2.appendChild(keyNameTextInput);
-
-    var keyValueTextInput = document.createElement("input");
-    column3.appendChild(keyValueTextInput);
-
-    addCategoryRowBrowseLink(tableContainerId,column4,table.rows.length);
-
-    column0.className = "checkboxcells";
-    categoryTypeSelect.className = "selectlist";
-    column1.className = "tablecells";
-    column1.width = "5%";
-    keyNameTextInput.className = "tabletextenter";
-    keyNameTextInput.title = "<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_CONTROL_TITLE_CATEGORY_KEY_NAME"))%>";
-    column2.className = "tablecells";
-    column2.width = "55%";
-    keyValueTextInput.className = "tabletextenter";
-    keyValueTextInput.title = "<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_CONTROL_TITLE_CATEGORY_KEY_VALUE"))%>";
-    column3.className = "tablecells";
-    column3.width = "25%";
-    column4.className = "tablecells";
-
-    newRow.appendChild(column0);
-    newRow.appendChild(column1);
-    newRow.appendChild(column2);
-    newRow.appendChild(column3);
-    newRow.appendChild(column4);
-    tableBody.appendChild(newRow);
-  }
-
-  function setDiscoveryURLRowSettings(tableContainerId,discoveryURLIndex,discoveryURL)
-  {
-    var table = getTable(tableContainerId);
-    var row = table.rows[numberOfHeaderRows+discoveryURLIndex];
-    var rowElementCollection = row.getElementsByTagName("input");
-    var discoveryURLTextInput = rowElementCollection.item(1);
-    discoveryURLTextInput.value = discoveryURL;
-  }
-
-  function addDiscoveryURLRow(tableContainerId)
-  {
-    twistOpen(tableContainerId);
-    var table = getTable(tableContainerId);
-    var tableBody = table.getElementsByTagName("TBODY").item(0);
-    var newRow = document.createElement("tr");
-    var column0 = document.createElement("td");
-    var column1 = document.createElement("td");
-
-    var rowCheckbox = createRowCheckbox();
-    column0.appendChild(rowCheckbox);
-
-    var discoveryURLTextInput = document.createElement("input");
-    column1.appendChild(discoveryURLTextInput);
-
-    column0.className = "checkboxcells";
-    discoveryURLTextInput.className = "tabletextenter";
-    discoveryURLTextInput.title = "<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_CONTROL_TITLE_DISCOVERY_URL"))%>";
-    column1.className = "tablecells";
-    column1.width = "95%";
-
-    newRow.appendChild(column0);
-    newRow.appendChild(column1);
-    tableBody.appendChild(newRow);
-  }
-
-  function addResultRow(tableContainerId,nodeId,url,name,description)
-  {
-    twistOpen(tableContainerId);
-    var table = getTable(tableContainerId);
-    var tableBody = table.getElementsByTagName("TBODY").item(0);
-    var newRow = document.createElement("tr");
-    var column0 = document.createElement("td");
-    var column1 = document.createElement("td");
-    var column2 = document.createElement("td");
-
-    var rowCheckbox = createRowCheckbox();
-    column0.appendChild(rowCheckbox);
-    column0.appendChild(createHiddenElement("",nodeId));
-
-    var nameDetailsLink = document.createElement("a");
-    nameDetailsLink.href = url;
-    nameDetailsLink.target = "<%=FrameNames.PERSPECTIVE_WORKAREA%>";
-    nameDetailsLink.appendChild(document.createTextNode(name));
-    column1.appendChild(nameDetailsLink);
-
-    column2.appendChild(document.createTextNode(getDefaultDisplayString(description)));
-
-    column0.className = "checkboxcells";
-    column1.className = "tablecells";
-    column2.className = "tablecells";
-    column1.width = "48%";
-    column2.width = "48%";
-    newRow.appendChild(column0);
-    newRow.appendChild(column1);
-    newRow.appendChild(column2);
-    tableBody.appendChild(newRow);
-  }
-
-  function getFindQualifierTable(containerId)
-  {
-    var container = document.getElementById(containerId);
-    return container.getElementsByTagName("table").item(1);
-  }
-
-  function setFindQualifier(findQualifier,nameTableContainerId,categoryTableContainerId,findQualifiersTableContainerId)
-  {
-    var twistOpenNames = false;
-    var twistOpenCategories = false;
-    var twistOpenFindQualifiers = false;
-
-    if (findQualifier == "<%=FindQualifier.exactNameMatch%>")
-    {
-      var fqTable = getFindQualifierTable(nameTableContainerId);
-      var exactNameMatchCheckbox = fqTable.getElementsByTagName("input").item(0);
-      exactNameMatchCheckbox.checked = true;
-      twistOpenNames = true;
-    }
-    else if (findQualifier == "<%=FindQualifier.caseSensitiveMatch%>")
-    {
-      var fqTable = getFindQualifierTable(nameTableContainerId);
-      var caseSensitiveMatchCheckbox = fqTable.getElementsByTagName("input").item(1);
-      caseSensitiveMatchCheckbox.checked = true;
-      twistOpenNames = true;
-    }
-    else if (findQualifier == "<%=FindQualifier.serviceSubset%>" || findQualifier == "<%=FindQualifier.combineCategoryBags%>")
-    {
-      var fqTable = getFindQualifierTable(categoryTableContainerId);
-      var categorySelect = fqTable.getElementsByTagName("select").item(0);
-      setSelect(categorySelect,findQualifier);
-      twistOpenCategories = true;
-    }
-    else if (findQualifier == "<%=FindQualifier.andAllKeys%>" || findQualifier == "<%=FindQualifier.orAllKeys%>" || findQualifier == "<%=FindQualifier.orLikeKeys%>")
-    {
-      var fqTable = getTable(findQualifiersTableContainerId);
-      var keySelect = fqTable.getElementsByTagName("select").item(0);
-      setSelect(keySelect,findQualifier);
-      if (findQualifier != "<%=FindQualifier.andAllKeys%>")
-        twistOpenFindQualifiers = true;
-    }
-    else if (findQualifier == "<%=FindQualifier.sortByNameAsc%>" || findQualifier == "<%=FindQualifier.sortByNameDesc%>" || findQualifier == "<%=FindQualifier.sortByDateAsc%>" || findQualifier == "<%=FindQualifier.sortByDateDesc%>")
-    {
-      var fqTable = getTable(findQualifiersTableContainerId);
-      var sortCollection = fqTable.getElementsByTagName("input");
-      for (var i=0;i<sortCollection.length;i++)
-      {
-        if (sortCollection.item(i).value == findQualifier)
-          sortCollection.item(i).checked = true;
-      }
-      if (findQualifier != "<%=FindQualifier.sortByNameAsc%>" && findQualifier != "<%=FindQualifier.sortByDateAsc%>")
-        twistOpenFindQualifiers = true;
-    }
-
-    if (twistOpenNames)
-      twistOpen(nameTableContainerId);
-    if (twistOpenCategories)
-      twistOpen(categoryTableContainerId);
-    if (twistOpenFindQualifiers)
-      twistOpen(findQualifiersTableContainerId);
-  }
-
-  function processLanguageInputTable(tableContainerId,langVar,textVar,form)
-  {
-    var table = getTable(tableContainerId);
-    var languageSelects = table.getElementsByTagName("select");
-    var textInputs = table.getElementsByTagName("input");
-    for (var i=0;i<languageSelects.length;i++)
-    {
-      var hiddenLanguageSelect = createHiddenElement(langVar,languageSelects[i].value);
-      form.appendChild(hiddenLanguageSelect);
-    }
-
-    for (var i=0;i<textInputs.length;i++)
-    {
-      if (textInputs[i].type == "text")
-      {
-        var hiddenTextInput = createHiddenElement(textVar,textInputs[i].value);
-        form.appendChild(hiddenTextInput);
-      }
-    }
-  }
-
-  function processNameFindQualifiers(tableContainerId,form)
-  {
-    var table = getFindQualifierTable(tableContainerId);
-    var nameFindQualifierCheckboxes = table.getElementsByTagName("input");
-    for (var i=0;i<nameFindQualifierCheckboxes.length;i++)
-    {
-      var item = nameFindQualifierCheckboxes.item(i);
-      if (item.checked)
-      {
-        var hiddenFindQualifier = createHiddenElement("<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_FINDQUALIFIER%>",item.value);
-        form.appendChild(hiddenFindQualifier);
-      }
-    }
-  }
-
-  function processIdentifierTable(tableContainerId,form)
-  {
-    var table = getTable(tableContainerId);
-    var identifierTypeSelects = table.getElementsByTagName("select");
-    var textInputs = table.getElementsByTagName("input");
-    for (var i=0;i<identifierTypeSelects.length;i++)
-    {
-      var hiddenIdentifierTypeSelect = createHiddenElement("<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_TYPE%>",identifierTypeSelects[i].value);
-      form.appendChild(hiddenIdentifierTypeSelect);
-    }
-
-    var isKeyName = true;
-    for (var i=0;i<textInputs.length;i++)
-    {
-      if (textInputs[i].type == "text")
-      {
-        var name;
-        if (isKeyName)
-          name = "<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_NAME%>";
-        else
-          name = "<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_VALUE%>";
-        var hiddenTextInput = createHiddenElement(name,textInputs[i].value);
-        form.appendChild(hiddenTextInput);
-        isKeyName = !isKeyName;
-      }
-    }
-  }
-
-  function processCategoryTable(tableContainerId,form,isFindBusiness)
-  {
-    var table = getTable(tableContainerId);
-    var categoryTypeSelects = table.getElementsByTagName("select");
-    var textInputs = table.getElementsByTagName("input");
-    for (var i=0;i<categoryTypeSelects.length;i++)
-    {
-      var hiddenCategoryTypeSelect = createHiddenElement("<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_TYPE%>",categoryTypeSelects[i].value);
-      form.appendChild(hiddenCategoryTypeSelect);
-    }
-
-    var isKeyName = true;
-    for (var i=0;i<textInputs.length;i++)
-    {
-      if (textInputs[i].type == "text")
-      {
-        var name;
-        if (isKeyName)
-          name = "<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_NAME%>";
-        else
-          name = "<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_VALUE%>";
-        var hiddenTextInput = createHiddenElement(name,textInputs[i].value);
-        form.appendChild(hiddenTextInput);
-        isKeyName = !isKeyName;
-      }
-    }
-
-    if (isFindBusiness)
-    {
-      table = getFindQualifierTable(tableContainerId);
-      var categoryFindQualifier = table.getElementsByTagName("select").item(0);
-      if (categoryFindQualifier.selectedIndex != 0)
-      {
-        var hiddenFindQualifier = createHiddenElement("<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_FINDQUALIFIER%>",categoryFindQualifier.value);
-        form.appendChild(hiddenFindQualifier);
-      }
-    }
-  }
-
-  function processDiscoveryURLTable(tableContainerId,form)
-  {
-    var table = getTable(tableContainerId);
-    var textInputs = table.getElementsByTagName("input");
-    for (var i=0;i<textInputs.length;i++)
-    {
-      if (textInputs[i].type == "text")
-      {
-        var hiddenTextInput = createHiddenElement("<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_DISCOVERYURL%>",textInputs[i].value);
-        form.appendChild(hiddenTextInput);
-      }
-    }
-  }
-
-  function processFindQualifierTable(tableContainerId,form)
-  {
-    var table = getTable(tableContainerId);
-    var findQualifierSelects = table.getElementsByTagName("select");
-    for (var i=0;i<findQualifierSelects.length;i++)
-    {
-      var findQualifierSelect = findQualifierSelects.item(i);
-      var hiddenFindQualifier = createHiddenElement("<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_FINDQUALIFIER%>",findQualifierSelect.value);
-      form.appendChild(hiddenFindQualifier);
-    }
-
-    var findQualifierSortRadios = table.getElementsByTagName("input");
-    for (var i=0;i<findQualifierSortRadios.length;i++)
-    {
-      if (findQualifierSortRadios.item(i).checked)
-      {
-        var hiddenSortElement = createHiddenElement("<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_FINDQUALIFIER%>",findQualifierSortRadios.item(i).value);
-        form.appendChild(hiddenSortElement);
-      }
-    }
-  }
-
-  function processResultTable(tableContainerId,inputName,form,selectedOnly)
-  {
-    var table = getTable(tableContainerId);
-    for (var i=numberOfHeaderRows;i<table.rows.length;i++)
-    {
-      var inputs = table.rows[i].getElementsByTagName("input");
-      if (selectedOnly)
-      {
-        if (inputs.item(0).checked)
-          form.appendChild(createHiddenElement(inputName,inputs.item(1).value));
-      }
-      else
-        form.appendChild(createHiddenElement(inputName,inputs.item(1).value));
-    }
-  }
-
-  function initiateSubQuery(formContainerId,newSubQueryKey,queryItem,isGet)
-  {
-    if (isGet)
-    {
-      var hasGetItems = false;
-      switch (queryItem)
-      {
-        case <%=UDDIActionInputs.QUERY_ITEM_BUSINESSES%>:
-          hasGetItems = <%=regNode.hasBusiness()%>;
-          break;
-        case <%=UDDIActionInputs.QUERY_ITEM_SERVICES%>:
-          hasGetItems = <%=regNode.hasService()%>;
-          break;
-        case <%=UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES%>:
-        default:
-          hasGetItems = <%=regNode.hasServiceInterface()%>;
-      }
-      if (!hasGetItems)
-      {
-        alert("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("MSG_ERROR_NO_ITEMS_TO_GET"))%>");
-        return;
-      }
-    }
-    var formContainer = document.getElementById(formContainerId);
-    var form = formContainer.getElementsByTagName("form").item(0);
-    form.<%=UDDIActionInputs.SUBQUERY_GET%>.value = isGet;
-    form.<%=UDDIActionInputs.NEW_SUBQUERY_INITIATED%>.value = newSubQueryKey;
-    form.<%=UDDIActionInputs.NEW_SUBQUERY_QUERY_ITEM%>.value = queryItem;
-    var okToSubmit = false;
-    if (formContainerId == "findBusinessesAdvanced")
-      okToSubmit = processFindBusinessesAdvancedForm(form);
-    else if (formContainerId == "findServicesAdvanced")
-      okToSubmit = processFindServicesAdvancedForm(form);
-    else if (formContainerId == "findServiceInterfacesAdvanced")
-      okToSubmit = processFindServiceInterfacesAdvancedForm(form);
-    else if (formContainerId == "publishServiceSimple")
-      okToSubmit = processPublishServiceSimpleForm(form);
-    else if (formContainerId == "publishServiceAdvanced")
-      okToSubmit = processPublishServiceAdvancedForm(form);
-    else if (formContainerId == "publisherAssertions")
-      okToSubmit = handleSubmit(form);
-    else if (formContainerId == "manageReferencedServices")
-      okToSubmit = processForm(form);
-    if (okToSubmit)
-      form.submit();
-  }
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/status_container.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/status_container.jsp
deleted file mode 100644
index 12888809d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/status_container.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>   
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=uddiPerspective.getMessage("FRAME_TITLE_STATUS_CONTAINER")%></title>
-</head>
-<frameset rows="33,*" border=0 bgcolor="#ECE9D8">
-  <frame name="<%=UDDIFrameNames.STATUS_TOOLBAR%>" title="<%=uddiPerspective.getMessage("FRAME_TITLE_STATUS_TOOLBAR")%>" src="<%=response.encodeURL(controller.getPathWithContext("uddi/status_toolbar.jsp"))%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-  <frame name="<%=UDDIFrameNames.STATUS_CONTENT%>" title="<%=uddiPerspective.getMessage("FRAME_TITLE_STATUS_CONTENT")%>" src="<%=response.encodeURL(controller.getPathWithContext("uddi/status_content.jsp"))%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-</frameset>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/status_content.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/status_content.jsp
deleted file mode 100644
index 57a5a3321..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/status_content.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>   
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=uddiPerspective.getMessage("FRAME_TITLE_STATUS_CONTENT")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-  <table>
-    <tr>
-      <td>
-        <pre>
-<%=uddiPerspective.getMessageQueue().getMessagesFromList()%>
-        </pre>
-      </td>
-    </tr>
-  </table>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/status_toolbar.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/status_toolbar.jsp
deleted file mode 100644
index a383f8c8f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/status_toolbar.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>   
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=uddiPerspective.getMessage("FRAME_TITLE_STATUS_TOOLBAR")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/toolbar.css"))%>">
-<jsp:include page="/uddi/scripts/uddiframesets.jsp" flush="true"/>  
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/toolbar.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="toolbarbodymargin">
-<div id="toolbarborder">
-  <div id="toolbar" ondblclick="processFramesetSizes(document.forms[0])">
-<jsp:useBean id="formAction" class="java.lang.StringBuffer" scope="request">
-<%
-  formAction.append("uddi/actions/ResizeUDDIFramesActionJSP.jsp");
-%>  
-</jsp:useBean>
-<jsp:useBean id="formFrameName" class="java.lang.StringBuffer" scope="request">
-<%
-   formFrameName.append(UDDIFrameNames.STATUS_CONTAINER);
-%>
-</jsp:useBean>
-<jsp:include page="/uddi/forms/ProcessUDDIFramesetsForm.jsp" flush="true"/>
-    <table width="100%" height=25 cellpadding=0 cellspacing=0 border=0>
-      <tr>
-        <td valign="middle" align="center" width=25 height=25><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/status.gif"))%>" width=16 height=16></td>
-<%
-   String doubleClickColumnTitle = null;
-   if (uddiPerspective.getPerspectiveContentFramesetCols().endsWith("100%"))
-   {
-     if (uddiPerspective.getActionsContainerFramesetRows().endsWith("100%"))
-       doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_RESTORE");
-   }
-   if (doubleClickColumnTitle == null)
-     doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_MAXIMIZE");
-%>        
-        <td id="doubleclickcolumn" title="<%=doubleClickColumnTitle%>" valign="middle" align="left" width="*" height=25 nowrap class="text"><%=controller.getMessage("ALT_STATUS")%></td>
-<%
-   String altClear = controller.getMessage("ALT_CLEAR");
-%>           
-        <td valign="middle" align="center" width=25 height=25><a href="<%=response.encodeURL(controller.getPathWithContext("uddi/status_content.jsp"))%>" target="<%=UDDIFrameNames.STATUS_CONTENT%>"><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>" width=16 height=16 onMouseOver="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_highlighted.gif"))%>';mouseover(this)" onMouseOut="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>';mouseout(this)" onMouseDown="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_highlighted.gif"))%>';mousedown(this)" onMouseUp="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>';mouseup(this)" alt="<%=altClear%>" title="<%=altClear%>"></a></td>
-      </tr>
-    </table>
-  </div>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/uddi_perspective_content.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/uddi_perspective_content.jsp
deleted file mode 100644
index 8661bdf58..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/uddi_perspective_content.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>   
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=uddiPerspective.getMessage("FRAME_TITLE_UDDI_PERSPECTIVE_CONTENT")%></title>
-</head>
-<frameset cols="<%=uddiPerspective.getPerspectiveContentFramesetCols()%>" bgcolor=#ECE9D8>
-  <%
-  if (org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.isRTL())
-  {
-  %>
-  <frame name="<%=UDDIFrameNames.ACTIONS_CONTAINER%>" title="<%=uddiPerspective.getMessage("FRAME_TITLE_ACTIONS_CONTAINER")%>" src="<%=response.encodeURL(controller.getPathWithContext("uddi/actions_container.jsp"))%>" marginwidth=0 marginheight=0 scrolling="no" frameborder=1>
-  <frame name="<%=UDDIFrameNames.NAVIGATOR_CONTAINER%>" title="<%=uddiPerspective.getMessage("FRAME_TITLE_NAVIGATOR_CONTAINER")%>" src="<%=response.encodeURL(controller.getPathWithContext("uddi/navigator_container.jsp"))%>" marginwidth=0 marginheight=0 scrolling="no" frameborder=1>
-  <%
-  }
-  else
-  {
-  %>
-  <frame name="<%=UDDIFrameNames.NAVIGATOR_CONTAINER%>" title="<%=uddiPerspective.getMessage("FRAME_TITLE_NAVIGATOR_CONTAINER")%>" src="<%=response.encodeURL(controller.getPathWithContext("uddi/navigator_container.jsp"))%>" marginwidth=0 marginheight=0 scrolling="no" frameborder=1>
-  <frame name="<%=UDDIFrameNames.ACTIONS_CONTAINER%>" title="<%=uddiPerspective.getMessage("FRAME_TITLE_ACTIONS_CONTAINER")%>" src="<%=response.encodeURL(controller.getPathWithContext("uddi/actions_container.jsp"))%>" marginwidth=0 marginheight=0 scrolling="no" frameborder=1>
-  <%
-  }
-  %>
-</frameset>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/ClearWSDLActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/ClearWSDLActionJSP.jsp
deleted file mode 100644
index 9b758e886..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/ClearWSDLActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.ClearWSDLAction"%>
-
-<jsp:include page="/wsdl/scripts/wsdlpanes.jsp" flush="true"/>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-// Prepare the action.
-ClearWSDLAction action = new ClearWSDLAction(controller);
-
-// Load the parameters for the action from the servlet request.
-action.populatePropertyTable(request);
-
-// Run the action and obtain the return code (fail/success).
-boolean actionResult = action.execute();
-%>
-<%@ include file="/actions/ClearNodeAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/CreateInstanceActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/CreateInstanceActionJSP.jsp
deleted file mode 100644
index 678eeb2ac..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/CreateInstanceActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLFrameNames,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.FrameNames,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.CreateInstanceAction"%>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/wsdl/scripts/wsdlpanes.jsp" flush="true"/>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-  <%
-  CreateInstanceAction action = new CreateInstanceAction(controller);
-  action.populatePropertyTable(request);
-  action.execute();
-  %>
-  <script language="javascript">
-    wsdlPropertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_properties_content.jsp"))%>";
-  </script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/InvokeWSDLHttpGetOperationFormActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/InvokeWSDLHttpGetOperationFormActionJSP.jsp
deleted file mode 100644
index 449c9ef89..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/InvokeWSDLHttpGetOperationFormActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*"%>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/wsdl/scripts/wsdlpanes.jsp" flush="true"/>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-  <%
-  // Prepare the action.
-  InvokeWSDLHttpGetOperationFormAction action = new InvokeWSDLHttpGetOperationFormAction(controller);
-
-  // Load the parameters for the action from the servlet request.
-  boolean inputsValid = action.populatePropertyTable(request);
-
-  if (inputsValid)
-  {
-    boolean actionResult = action.execute();
-  }
-  %>
-<script language="javascript">
-  wsdlPropertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_properties_content.jsp"))%>";
-  wsdlStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_status_content.jsp"))%>";
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/InvokeWSDLHttpPostOperationFormActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/InvokeWSDLHttpPostOperationFormActionJSP.jsp
deleted file mode 100644
index d3f4e5253..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/InvokeWSDLHttpPostOperationFormActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*"%>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/wsdl/scripts/wsdlpanes.jsp" flush="true"/>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-  <%
-  // Prepare the action.
-  InvokeWSDLHttpPostOperationFormAction action = new InvokeWSDLHttpPostOperationFormAction(controller);
-
-  // Load the parameters for the action from the servlet request.
-  boolean inputsValid = action.populatePropertyTable(request);
-
-  if (inputsValid)
-  {
-    boolean actionResult = action.execute();
-  }
-  %>
-<script language="javascript">
-  wsdlPropertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_properties_content.jsp"))%>";
-  wsdlStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_status_content.jsp"))%>";
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/InvokeWSDLSOAPOperationFormActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/InvokeWSDLSOAPOperationFormActionJSP.jsp
deleted file mode 100644
index b44fe049f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/InvokeWSDLSOAPOperationFormActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLActionInputs,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.transport.HTTPException,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.transport.HTTPTransport,
-                                                        sun.misc.BASE64Decoder,
-                                                        javax.servlet.http.HttpServletResponse"%>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-// Prepare the action.
-InvokeWSDLSOAPOperationFormAction action = new InvokeWSDLSOAPOperationFormAction(controller);
-String httpBasicAuthData = request.getHeader(HTTPTransport.HTTP_HEADER_AUTH);
-if (httpBasicAuthData != null && httpBasicAuthData.length() > 0)
-{
-  int basicIndex = httpBasicAuthData.indexOf(HTTPTransport.BASIC);
-  if (basicIndex != -1)
-  {
-    BASE64Decoder decoder = new BASE64Decoder();
-    httpBasicAuthData = new String(decoder.decodeBuffer(httpBasicAuthData.substring(basicIndex + HTTPTransport.BASIC.length() + 1)));
-    int colonIndex = httpBasicAuthData.indexOf(HTTPTransport.COLON);
-    if (colonIndex != -1)
-    {
-      action.addProperty(WSDLActionInputs.HTTP_BASIC_AUTH_USERNAME, httpBasicAuthData.substring(0, colonIndex));
-      action.addProperty(WSDLActionInputs.HTTP_BASIC_AUTH_PASSWORD, httpBasicAuthData.substring(colonIndex + 1, httpBasicAuthData.length()));
-    }
-  }
-}
-
-// Load the parameters for the action from the servlet request.
-boolean inputsValid = action.populatePropertyTable(request);
-if (!inputsValid)
-{
-%>
-  <jsp:include page="/wsdl/scripts/wsdlpanes.jsp" flush="true"/>
-  <html>
-    <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-      <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>"></script>
-    </head>
-    <body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-      <script language="javascript">
-        wsdlPropertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_properties_content.jsp"))%>";
-        wsdlStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_status_content.jsp"))%>";
-      </script>
-    </body>
-  </html>
-<%
-}
-else
-{
-  try
-  {
-    // Run the action and obtain the return code (fail/success).
-    boolean actionResult = action.execute();
-%>
-    <jsp:include page="/wsdl/scripts/wsdlpanes.jsp" flush="true"/>
-    <html>
-      <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>"></script>
-      </head>
-      <body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-        <script language="javascript">
-          wsdlPropertiesContainer.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_properties_container.jsp"))%>";
-          <%
-          if (actionResult)
-          {
-          %>
-            wsdlStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_result_content.jsp"))%>";
-          <%
-          }
-          else
-          {
-          %>
-            wsdlStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_status_content.jsp"))%>";
-          <%
-          }
-          %>
-        </script>
-      </body>
-    </html>
-<%
-  }
-  catch (HTTPException httpe)
-  {
-    int code = httpe.getStatusCode();
-    if (code == HttpServletResponse.SC_UNAUTHORIZED)
-    {
-      response.setStatus(code);
-      response.setHeader(HTTPTransport.HTTP_HEADER_CONTENT_LENGTH, String.valueOf(0));
-      String wwwAuthData = httpe.getHeader(HTTPTransport.HTTP_HEADER_WWW_AUTH.toLowerCase());
-      if (wwwAuthData == null)
-        wwwAuthData = httpe.getHeader(HTTPTransport.HTTP_HEADER_WWW_AUTH);
-      if (wwwAuthData == null)
-        wwwAuthData = HTTPTransport.BASIC;
-      response.setHeader(HTTPTransport.HTTP_HEADER_WWW_AUTH, wwwAuthData);
-    }
-    else
-    {
-      WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-      MessageQueue messageQueue = wsdlPerspective.getMessageQueue();
-      messageQueue.addMessage(controller.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage(String.valueOf(code));
-      messageQueue.addMessage(httpe.getStatusMessage());
-      %>
-        <jsp:include page="/wsdl/scripts/wsdlpanes.jsp" flush="true"/>
-        <html>
-          <head>
-            <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-            <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>"></script>
-          </head>
-          <body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-            <script language="javascript">
-              wsdlPropertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_properties_content.jsp"))%>";
-              wsdlStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_status_content.jsp"))%>";
-            </script>
-          </body>
-        </html>
-      <%
-    }
-  }
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/InvokeWSDLSOAPOperationSourceActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/InvokeWSDLSOAPOperationSourceActionJSP.jsp
deleted file mode 100644
index a907688f4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/InvokeWSDLSOAPOperationSourceActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLActionInputs,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.transport.HTTPException,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.transport.HTTPTransport,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        sun.misc.BASE64Decoder,
-                                                        javax.servlet.http.HttpServletResponse,
-                                                        javax.wsdl.*"%>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-// Prepare the action.
-InvokeWSDLSOAPOperationSourceAction action = new InvokeWSDLSOAPOperationSourceAction(controller);
-
-// Load the parameters for the action from the servlet request.
-boolean inputsValid = action.populatePropertyTable(request);
-  
-if (action.wasSaveAsSelected())
-{
-  // write to file system
-  response.setContentType("application/octet-stream");
-  response.setHeader("Content-Disposition","attachment;filename="+action.getDefaultSaveAsFileName());
-  action.writeSourceContent(response.getOutputStream());    
-}
-else
-{
-  if (!inputsValid)
-  {
-  %>
-    <jsp:include page="/wsdl/scripts/wsdlpanes.jsp" flush="true"/>
-    <html>
-      <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>"></script>
-      </head>
-      <body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-        <script language="javascript">
-          wsdlPropertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_properties_content.jsp"))%>";
-          wsdlStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_status_content.jsp"))%>";
-        </script>
-      </body>
-    </html>
-  <%
-  }
-  else
-  {
-    if (action.wasNewFileSelected())
-    {     
-  %>
-      <jsp:include page="/wsdl/scripts/wsdlpanes.jsp" flush="true"/>
-      <html>
-        <head>
-          <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-          <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>"></script>
-        </head>
-        <body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-          <script language="javascript">
-            wsdlPropertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_properties_content.jsp"))%>";
-            wsdlStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_status_content.jsp"))%>";
-          </script>
-        </body>
-      </html>
-    <%    
-    }
-    else
-    {
-      String httpBasicAuthData = request.getHeader(HTTPTransport.HTTP_HEADER_AUTH);
-      if (httpBasicAuthData != null && httpBasicAuthData.length() > 0)
-      {
-        int basicIndex = httpBasicAuthData.indexOf(HTTPTransport.BASIC);
-        if (basicIndex != -1)
-        {
-          BASE64Decoder decoder = new BASE64Decoder();
-          httpBasicAuthData = new String(decoder.decodeBuffer(httpBasicAuthData.substring(basicIndex + HTTPTransport.BASIC.length() + 1)));
-          int colonIndex = httpBasicAuthData.indexOf(HTTPTransport.COLON);
-          if (colonIndex != -1)
-          {
-            action.addProperty(WSDLActionInputs.HTTP_BASIC_AUTH_USERNAME, httpBasicAuthData.substring(0, colonIndex));
-            action.addProperty(WSDLActionInputs.HTTP_BASIC_AUTH_PASSWORD, httpBasicAuthData.substring(colonIndex + 1, httpBasicAuthData.length()));
-          }
-        }
-      }
-      try
-      {
-        // Run the action and obtain the return code (fail/success).
-        boolean actionResult = action.execute();
-    %>
-        <jsp:include page="/wsdl/scripts/wsdlpanes.jsp" flush="true"/>
-        <html>
-          <head>
-            <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-            <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>"></script>
-          </head>
-          <body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-            <script language="javascript">
-              wsdlPropertiesContainer.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_properties_container.jsp"))%>";
-              <%
-              if (actionResult)
-              {
-              %>
-                wsdlStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_result_content.jsp"))%>";
-              <%
-              }
-              else
-              {
-              %>
-                wsdlStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_status_content.jsp"))%>";
-              <%
-              }
-              %>
-            </script>
-          </body>
-        </html>
-<%
-      }
-      catch (HTTPException httpe)
-      {
-        int code = httpe.getStatusCode();
-        if (code == HttpServletResponse.SC_UNAUTHORIZED)
-        {
-          response.setStatus(code);
-          response.setHeader(HTTPTransport.HTTP_HEADER_CONTENT_LENGTH, String.valueOf(0));
-          String wwwAuthData = httpe.getHeader(HTTPTransport.HTTP_HEADER_WWW_AUTH.toLowerCase());
-          if (wwwAuthData == null)
-            wwwAuthData = httpe.getHeader(HTTPTransport.HTTP_HEADER_WWW_AUTH);
-          if (wwwAuthData == null)
-            wwwAuthData = HTTPTransport.BASIC;
-          response.setHeader(HTTPTransport.HTTP_HEADER_WWW_AUTH, wwwAuthData);
-        }
-        else
-        {
-          WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-          MessageQueue messageQueue = wsdlPerspective.getMessageQueue();
-          messageQueue.addMessage(controller.getMessage("MSG_ERROR_UNEXPECTED"));
-          messageQueue.addMessage(String.valueOf(code));
-          messageQueue.addMessage(httpe.getStatusMessage());
-          %>
-          <jsp:include page="/wsdl/scripts/wsdlpanes.jsp" flush="true"/>
-          <html>
-            <head>
-              <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-              <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>"></script>
-            </head>
-            <body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-              <script language="javascript">
-                wsdlPropertiesContainer.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_properties_container.jsp"))%>";
-                wsdlStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_status_content.jsp"))%>";
-              </script>
-            </body>
-          </html>
-          <%
-        }
-      }
-    }
-  }
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/OpenWSDLActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/OpenWSDLActionJSP.jsp
deleted file mode 100644
index b23ad7792..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/OpenWSDLActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLFrameNames,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.FrameNames,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.OpenWSDLAction"%>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/wsdl/scripts/wsdlpanes.jsp" flush="true"/>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-  </script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-  // Prepare the action.
-  OpenWSDLAction action = new OpenWSDLAction(controller);
-
-  // Load the parameters for the action from the servlet request.
-  boolean inputsValid = action.populatePropertyTable(request);
-  if (!inputsValid) {
-%>
-  <script language="javascript">
-    wsdlPropertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_properties_content.jsp"))%>";
-    wsdlStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_status_content.jsp"))%>";
-  </script>
-<%
-  }
-  else {
-    // Run the action and obtain the return code (fail/success).
-    boolean actionResult = action.execute();
-%>
-    <script language="javascript">
-    if (isMicrosoftInternetExplorer()) {
-      wsdlNavigatorContent.location="<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_navigator_content.jsp"))%>";
-      wsdlPropertiesContainer.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_properties_container.jsp"))%>";
-      wsdlStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_status_content.jsp"))%>";
-    }
-    else {
-      perspectiveContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_perspective_content.jsp"))%>";
-    }
-    </script>
-<%
-  }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/RefreshWSDLActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/RefreshWSDLActionJSP.jsp
deleted file mode 100644
index 81fc7f7df..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/RefreshWSDLActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.RefreshWSDLAction,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.ClearWSDLAction,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/wsdl/scripts/wsdlpanes.jsp" flush="true"/>
-<%
-// Prepare the action.
-RefreshWSDLAction action = new RefreshWSDLAction(controller);
-
-// The action may be executed via program link.
-boolean paramsValid = action.populatePropertyTable(request);
-if (paramsValid) {
-  int nodeID = Integer.parseInt((String)action.getPropertyTable().get(ActionInputs.NODEID));
-  WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-  NodeManager nodeManager = wsdlPerspective.getNodeManager();
-  Node wsdlNode = nodeManager.getNode(nodeID);
-  
-  // Run the action.
-  boolean actionResult = action.execute();
-  
-  if (actionResult) {
-  %>
-  <script language="javascript">
-    if (isMicrosoftInternetExplorer()) {
-      wsdlNavigatorContent.location="<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_navigator_content.jsp"))%>";
-      wsdlPropertiesContainer.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_properties_container.jsp"))%>";
-      wsdlStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_status_content.jsp"))%>";
-    }
-    else {
-      perspectiveContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_perspective_content.jsp"))%>";
-    }
-  </script>
-  <%
-  }
-  else {
-  %>
-  <script language="javascript">
-    if (confirm("<%=HTMLUtils.JSMangle(wsdlPerspective.getMessage("MSG_QUESTION_REMOVE_WSDL_NODE", wsdlNode.getNodeName()))%>"))
-      perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(ClearWSDLAction.getActionLink(nodeID)))%>";
-    else {
-      wsdlPropertiesContainer.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_properties_container.jsp"))%>";
-      wsdlStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_status_content.jsp"))%>";
-    }
-  </script>
-  <%
-  }
-}
-%>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/ResizeWSDLFramesActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/ResizeWSDLFramesActionJSP.jsp
deleted file mode 100644
index 1fbaf5b32..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/ResizeWSDLFramesActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   // Create the action.
-   ResizeWSDLFramesAction action = new ResizeWSDLFramesAction(controller);
-   
-   // Populate the action with the request properties.
-   boolean result = action.populatePropertyTable(request);
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<jsp:include page="/wsdl/scripts/wsdlframesets.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-   if (result)
-   {
-     action.execute(false);
-     
-     WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-%>
-<script language="javascript">
-  if (isMicrosoftInternetExplorer())
-  {
-    var perspectiveContentFrameset = getPerspectiveContentFrameset();
-    var actionsContainerFrameset = getActionsContainerFrameset();  
-    perspectiveContentFrameset.setAttribute("cols","<%=wsdlPerspective.getPerspectiveContentFramesetCols()%>");
-    actionsContainerFrameset.setAttribute("rows","<%=wsdlPerspective.getActionsContainerFramesetRows()%>");
-  }
-  else
-    perspectiveContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_perspective_content.jsp"))%>";
-</script>
-<%
-   }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SelectWSDLNavigatorNodeActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SelectWSDLNavigatorNodeActionJSP.jsp
deleted file mode 100644
index e61449d40..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SelectWSDLNavigatorNodeActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.SelectWSDLNavigatorNodeAction" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-// Prepare the action.
-SelectWSDLNavigatorNodeAction action = new SelectWSDLNavigatorNodeAction(controller);
-
-// Load the parameters for the action from the servlet request.
-action.populatePropertyTable(request);
-
-// Run the action and obtain the return code (fail/success).
-boolean actionResult = action.execute();
-
-// Determine if the action was added to the history list.
-boolean isAddedToHistory = action.isAddedToHistory();
-%>
-<%@ include file="/actions/SelectNodeAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SelectWSDLPropertiesToolActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SelectWSDLPropertiesToolActionJSP.jsp
deleted file mode 100644
index 147641419..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SelectWSDLPropertiesToolActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.SelectWSDLPropertiesToolAction" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-// Prepare the action.
-SelectWSDLPropertiesToolAction action = new SelectWSDLPropertiesToolAction(controller);
-
-// Load the parameters for the action from the servlet request.
-action.populatePropertyTable(request);
-
-// Run the action and obtain the return code (fail/success).
-boolean actionResult = action.execute();
-
-// Determine if the action was added to the history list.
-boolean isAddedToHistory = action.isAddedToHistory();
-%>
-<%@ include file="/actions/SelectNodeToolAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SwitchPerspectiveFromWSDLActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SwitchPerspectiveFromWSDLActionJSP.jsp
deleted file mode 100644
index 901c76648..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SwitchPerspectiveFromWSDLActionJSP.jsp
+++ /dev/null
@@ -1,30 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-// Prepare the action
-SwitchPerspectiveFromWSDLAction action = new SwitchPerspectiveFromWSDLAction(controller);
-   
-// Load the parameters for the action from the servlet request.
-action.populatePropertyTable(request);
-   
-// Run the action and obtain the return code (fail/success).
-boolean actionResult = action.execute();
-   
-// Determine if the action was added to the history list.
-boolean isAddedToHistory = action.isAddedToHistory();
-%>
-<jsp:include page="/scripts/switchperspective.jsp" flush="true"/>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SwitchReadOnlyFragmentViewsActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SwitchReadOnlyFragmentViewsActionJSP.jsp
deleted file mode 100644
index 11d64a006..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SwitchReadOnlyFragmentViewsActionJSP.jsp
+++ /dev/null
@@ -1,37 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.FrameNames,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLFrameNames,
-                                   					                    org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective"%>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/wsdl/scripts/wsdlpanes.jsp" flush="true"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-if (wsdlPerspective.getStatusContentType() == WSDLPerspective.STATUS_CONTENT_RESULT_FORM)
-  wsdlPerspective.setStatusContentType(WSDLPerspective.STATUS_CONTENT_RESULT_SOURCE);
-else
-  wsdlPerspective.setStatusContentType(WSDLPerspective.STATUS_CONTENT_RESULT_FORM);
-%>
-<script language="javascript">
-  wsdlStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_result_content.jsp"))%>";
-</script>
-
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SwitchWSDLDetailsViewsActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SwitchWSDLDetailsViewsActionJSP.jsp
deleted file mode 100644
index 46138b269..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SwitchWSDLDetailsViewsActionJSP.jsp
+++ /dev/null
@@ -1,37 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.FrameNames,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.perspective.Node,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLFrameNames,
-                                   					                    org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective,
-                                   					                    org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLDetailsTool"%>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/wsdl/scripts/wsdlpanes.jsp" flush="true"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node wsdlNode = wsdlPerspective.getNodeManager().getSelectedNode();
-WSDLDetailsTool wsdlDetailsTool = (WSDLDetailsTool)wsdlNode.getToolManager().getSelectedTool();
-wsdlDetailsTool.toggleViewId();
-%>
-<script language="javascript">
-  wsdlPropertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_properties_content.jsp"))%>";
-</script>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SynchronizeFragmentViewsActionAbortJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SynchronizeFragmentViewsActionAbortJSP.jsp
deleted file mode 100644
index 6911ceb0f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SynchronizeFragmentViewsActionAbortJSP.jsp
+++ /dev/null
@@ -1,38 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.FrameNames,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLFrameNames,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.InvokeWSDLOperationTool"%>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/wsdl/scripts/wsdlpanes.jsp" flush="true"/>
-
-<%
-InvokeWSDLOperationTool invokeWSDLOperationTool = (InvokeWSDLOperationTool)controller.getWSDLPerspective().getNodeManager().getSelectedNode().getCurrentToolManager().getSelectedTool();
-if (invokeWSDLOperationTool.getFragmentViewID().equals(FragmentConstants.FRAGMENT_VIEW_SWITCH_SOURCE_TO_FORM))
-  invokeWSDLOperationTool.setFragmentViewID(FragmentConstants.FRAGMENT_VIEW_SWITCH_FORM_TO_SOURCE);
-else
-  invokeWSDLOperationTool.setFragmentViewID(FragmentConstants.FRAGMENT_VIEW_SWITCH_SOURCE_TO_FORM);
-%>
-<script language="javascript">
-  wsdlPropertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_properties_content.jsp"))%>";
-</script>
-
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SynchronizeFragmentViewsActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SynchronizeFragmentViewsActionJSP.jsp
deleted file mode 100644
index dca68ff91..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SynchronizeFragmentViewsActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.FrameNames,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLFrameNames,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.SynchronizeFragmentViewsAction"%>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/wsdl/scripts/wsdlpanes.jsp" flush="true"/>
-
-<%
-SynchronizeFragmentViewsAction action = new SynchronizeFragmentViewsAction(controller);
-boolean paramValid = action.populatePropertyTable(request);
-String viewID = (String)action.getPropertyTable().get(FragmentConstants.FRAGMENT_VIEW_ID);
-boolean sourceToForm = viewID.equals(FragmentConstants.FRAGMENT_VIEW_SWITCH_SOURCE_TO_FORM);
-if (sourceToForm) {
-  if (paramValid) {
-%>
-    <script language="javascript">
-      if (!confirm("<%=controller.getWSDLPerspective().getMessage("MSG_QUESTION_SYNC_VIEWS")%>"))
-        perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/actions/SynchronizeFragmentViewsActionAbortJSP.jsp"))%>";
-    </script>
-<%
-  }
-  else {
-%>
-    <script language="javascript">
-      if (!confirm("<%=controller.getWSDLPerspective().getMessage("MSG_QUESTION_SYNC_VIEWS_DESPITE_INVALID_SOURCE_CONTENT")%>"))
-        perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/actions/SynchronizeFragmentViewsActionAbortJSP.jsp"))%>";
-    </script>
-<%
-  }
-}
-action.execute();
-%>
-<script language="javascript">
-  wsdlPropertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_properties_content.jsp"))%>";
-</script>
-
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/ToggleWSDLNavigatorNodeActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/ToggleWSDLNavigatorNodeActionJSP.jsp
deleted file mode 100644
index 1e586d042..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/ToggleWSDLNavigatorNodeActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-// Prepare the action.
-ToggleWSDLNavigatorNodeAction action = new ToggleWSDLNavigatorNodeAction(controller);
-
-// Load the parameters for the action from the servlet request.
-action.populatePropertyTable(request);
-
-// Run the action and obtain the return code (fail/success).
-boolean actionResult = action.execute();
-
-// Determine if the action was added to the history list.
-boolean isAddedToHistory = action.isAddedToHistory();
-%>
-<%@ include file="/actions/ToggleNodeAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/UpdateWSDLBindingActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/UpdateWSDLBindingActionJSP.jsp
deleted file mode 100644
index 11b1a24a5..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/UpdateWSDLBindingActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLFrameNames,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.FrameNames,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.UpdateWSDLBindingAction"%>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/wsdl/scripts/wsdlpanes.jsp" flush="true"/>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-  UpdateWSDLBindingAction action = new UpdateWSDLBindingAction(controller);
-  action.populatePropertyTable(request);
-  action.execute();
-%>
-  <script language="javascript">
-    wsdlPropertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_properties_content.jsp"))%>";
-    wsdlStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_status_content.jsp"))%>";
-  </script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/WSDLAddToFavoritesActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/WSDLAddToFavoritesActionJSP.jsp
deleted file mode 100644
index fb8c8d123..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/WSDLAddToFavoritesActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.WSDLAddToFavoritesAction"%>
-
-
-<jsp:include page="/wsdl/scripts/wsdlpanes.jsp" flush="true"/>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-// Prepare the action.
-WSDLAddToFavoritesAction action = new WSDLAddToFavoritesAction(controller);
-
-// Load the parameters for the action from the servlet request.
-action.populatePropertyTable(request);
-
-// Run the action and obtain the return code (fail/success).
-boolean actionResult = action.execute();
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<script language="javascript">
-  wsdlPropertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_properties_content.jsp"))%>";
-  wsdlStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_status_content.jsp"))%>";
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/WSDLCheckFavoriteExistsActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/WSDLCheckFavoriteExistsActionJSP.jsp
deleted file mode 100644
index b83258bc2..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/WSDLCheckFavoriteExistsActionJSP.jsp
+++ /dev/null
@@ -1,65 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*,
-                                   					            java.util.*" %>
-
-
-<jsp:include page="/wsdl/scripts/wsdlpanes.jsp" flush="true"/>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<form action="<%=response.encodeURL(controller.getPathWithContext("wsdl/actions/WSDLAddToFavoritesActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>">
-<%
-Enumeration paramNames = request.getParameterNames();
-while (paramNames.hasMoreElements()) {
-  String paramName = (String)paramNames.nextElement();
-  String[] paramValues = request.getParameterValues(paramName);
-  for (int i = 0; i < paramValues.length; i++) {
-%>
-    <input type="hidden" name="<%=paramName%>" value="<%=paramValues[i]%>">
-<%
-  }
-}
-%>
-</form>
-</body>
-</html>
-
-<%
-// Prepare the action.
-WSDLAddToFavoritesAction action = new WSDLAddToFavoritesAction(controller);
-// Load the parameters for the action from the servlet request.
-action.populatePropertyTable(request);
-if (action.favoriteExists()) {
-%>
-  <script language="javascript">
-    if (confirm("<%=HTMLUtils.JSMangle(controller.getWSDLPerspective().getMessage("MSG_QUESTION_OVERWRITE_FAVORITES"))%>"))
-      document.forms[0].submit();
-  </script>
-<%
-}
-else {
-%>
-  <script language="javascript">
-    document.forms[0].submit();
-  </script>
-<%
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/WSDLImportWSDLToFileSystemActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/WSDLImportWSDLToFileSystemActionJSP.jsp
deleted file mode 100644
index 0df02da62..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/WSDLImportWSDLToFileSystemActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.WSDLImportWSDLToFileSystemAction,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.actions.*,
-                                                        java.io.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-// Prepare the action.
-WSDLImportWSDLToFileSystemAction action = new WSDLImportWSDLToFileSystemAction(controller);
-%>
-<%@ include file="/actions/ImportToFileSystemAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/WSDLImportWSDLToWorkbenchActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/WSDLImportWSDLToWorkbenchActionJSP.jsp
deleted file mode 100644
index d02382edc..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/WSDLImportWSDLToWorkbenchActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.WSDLImportWSDLToWorkbenchAction,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-WSDLImportWSDLToWorkbenchAction action = new WSDLImportWSDLToWorkbenchAction(controller);
-%>
-<%@ include file="/actions/ImportToWorkbenchAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/WSDLLaunchWebServiceWizardActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/WSDLLaunchWebServiceWizardActionJSP.jsp
deleted file mode 100644
index 8f8760f34..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/WSDLLaunchWebServiceWizardActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.WSDLLaunchWebServiceWizardAction" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-WSDLLaunchWebServiceWizardAction action = new WSDLLaunchWebServiceWizardAction(controller);
-%>
-<%@ include file="/actions/LaunchWebServiceWizardAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/FragmentsFormView.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/FragmentsFormView.jsp
deleted file mode 100644
index 3f2d2e65d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/FragmentsFormView.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        javax.wsdl.*,
-                                                        java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node selectedNode = wsdlPerspective.getNodeManager().getSelectedNode();
-nodeID.delete(0, nodeID.length());
-nodeID.append(selectedNode.getNodeId());
-InvokeWSDLOperationTool invokeWSDLOperationTool = (InvokeWSDLOperationTool)(selectedNode.getCurrentToolManager().getSelectedTool());
-WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-Iterator it = operElement.getOrderedBodyParts().iterator();
-while (it.hasNext()) {
-  Part part = (Part)it.next();
-  IXSDFragment frag = operElement.getFragment(part);
-  fragID.delete(0, fragID.length());
-  fragID.append(frag.getID());
-  %>
-  <jsp:include page="<%=frag.getWriteFragment()%>" flush="true"/>
-  <%
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/FragmentsSoapView.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/FragmentsSoapView.jsp
deleted file mode 100644
index ff2c7536e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/FragmentsSoapView.jsp
+++ /dev/null
@@ -1,316 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.util.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*,
-                                                        org.w3c.dom.*,
-                                                        javax.wsdl.*,
-                                                        javax.wsdl.extensions.ExtensibilityElement,
-                                                        javax.wsdl.extensions.soap.SOAPBody,
-                                                        java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<%
-   WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-   WSDLOperationElement operElement = (WSDLOperationElement)(wsdlPerspective.getNodeManager().getSelectedNode().getTreeElement());
-   Operation oper = operElement.getOperation();
-   Iterator it = operElement.getOrderedBodyParts().iterator();
-   StringBuffer sourceContent = new StringBuffer();
-   String cachedSourceContent = operElement.getPropertyAsString(WSDLModelConstants.PROP_SOURCE_CONTENT);
-   Hashtable soapEnvelopeNamespaceTable = new Hashtable();
-   SoapHelper.addDefaultSoapEnvelopeNamespaces(soapEnvelopeNamespaceTable);
-   if (cachedSourceContent != null)
-   {
-     sourceContent.append(cachedSourceContent);
-     String[] nsDeclarations = (String[])operElement.getPropertyAsObject(WSDLModelConstants.PROP_SOURCE_CONTENT_NAMESPACE);
-     if (nsDeclarations != null)
-     {
-       for (int i = 0; i < nsDeclarations.length; i++)
-       {
-         String[] prefix_ns = SoapHelper.decodeNamespaceDeclaration(nsDeclarations[i]);
-         if (!soapEnvelopeNamespaceTable.contains(prefix_ns[1]))
-           soapEnvelopeNamespaceTable.put(prefix_ns[1], prefix_ns[0]);
-       }
-     }
-   }
-   else
-   {
-     while (it.hasNext())
-     {
-       Part part = (Part)it.next();
-       IXSDFragment frag = operElement.getFragment(part);
-       Element[] instanceDocuments = frag.genInstanceDocumentsFromParameterValues(!operElement.isUseLiteral(), soapEnvelopeNamespaceTable, XMLUtils.createNewDocument(null));
-       for (int i = 0; i < instanceDocuments.length; i++)
-       {
-         sourceContent.append(XMLUtils.serialize(instanceDocuments[i], true));
-         sourceContent.append(HTMLUtils.LINE_SEPARATOR);
-       }     
-     }
-   }
-
-   Enumeration enm = soapEnvelopeNamespaceTable.keys();
-   while (enm.hasMoreElements())
-   {
-     String uri = (String)enm.nextElement();
-     String prefix = (String)soapEnvelopeNamespaceTable.get(uri);
-     String value = SoapHelper.encodeNamespaceDeclaration(prefix, uri);
-     %>
-     <input type="hidden" name="<%=FragmentConstants.SOURCE_CONTENT_NAMESPACE%>" value="<%=value%>">
-     <%
-   }
-%>
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
-  <tr>
-    <td height=30 valign="bottom" class="labels">
-<%
-    Document doc = XMLUtils.createNewDocument(null);
-    Element soapEnvelopeElement = SoapHelper.createSoapEnvelopeElement(doc,soapEnvelopeNamespaceTable);
-    StringBuffer header = new StringBuffer("<");
-    header.append(soapEnvelopeElement.getTagName());
-    NamedNodeMap attributes = soapEnvelopeElement.getAttributes();
-    int numberOfAttributes = attributes.getLength();
-    if (numberOfAttributes == 0)
-      header.append('>');
-%>
-      <%=HTMLUtils.charactersToHTMLEntities(header.toString())%>
-    </td>
-  </tr>
-</table>
-<%
-    for (int i=0;i<numberOfAttributes;i++)
-    {
-      header.setLength(0);
-      Node attrNode = attributes.item(i);
-      header.append(attrNode.getNodeName()).append("=\"").append(attrNode.getNodeValue()).append('\"');
-      if (i == numberOfAttributes-1)
-        header.append('>');
-%>
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
-  <tr>
-    <td width=8>
-      <img width=8 height=16 src="<%=response.encodeURL(controller.getPathWithContext("images/space.gif"))%>">
-    </td>
-    <td valign="bottom" class="labels">
-      <%=HTMLUtils.charactersToHTMLEntities(header.toString())%>
-    </td>
-  </tr>
-</table>
-<%
-    }
-
-    Element soapBodyElement = SoapHelper.createSoapBodyElement(doc);
-    header.setLength(0);
-    header.append('<').append(soapBodyElement.getTagName());
-    attributes = soapBodyElement.getAttributes();
-    numberOfAttributes = attributes.getLength();
-    if (numberOfAttributes == 0)
-      header.append('>');
-%>
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
-  <tr>
-    <td width=8>
-      <img width=8 height=16 src="<%=response.encodeURL(controller.getPathWithContext("images/space.gif"))%>">
-    </td>
-    <td valign="bottom" class="labels">
-      <%=HTMLUtils.charactersToHTMLEntities(header.toString())%>
-    </td>
-  </tr>
-</table>
-<%
-    for (int i=0;i<numberOfAttributes;i++)
-    {
-      header.setLength(0);
-      Node attrNode = attributes.item(i);
-      header.append(attrNode.getNodeName()).append("=\"").append(attrNode.getNodeValue()).append('\"');
-      if (i == numberOfAttributes-1)
-        header.append('>');
-%>
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
-  <tr>
-    <td width=16>
-      <img width=16 height=16 src="<%=response.encodeURL(controller.getPathWithContext("images/space.gif"))%>">
-    </td>
-    <td valign="bottom" class="labels">
-      <%=HTMLUtils.charactersToHTMLEntities(header.toString())%>
-    </td>
-  </tr>
-</table>
-<table
-<%
-    }
-
-    Element wrapperElement = null;
-    if (!operElement.isDocumentStyle())
-    {
-      // Must be RPC style.
-      String encodingNamespaceURI = null;
-      /*
-       * WS-I: In a rpc-literal SOAP binding, the serialized child element of the 
-       * soap:Body element consists of a wrapper element, whose namespace is the value 
-       * of the namespace attribute of the soapbind:body element and whose local name is 
-       * either the name of the operation or the name of the operation suffixed 
-       * with "Response". The namespace attribute is required, as opposed to being 
-       * optional, to ensure that the children of the soap:Body element are namespace-
-       * qualified.
-       */
-      BindingOperation bindingOperation = operElement.getBindingOperation();
-      if (bindingOperation != null)
-      {
-        BindingInput bindingInput = bindingOperation.getBindingInput();
-        if (bindingInput != null)
-        {
-          List extElements = bindingInput.getExtensibilityElements();
-          for (Iterator extElementsIt = extElements.iterator(); extElementsIt.hasNext();)
-          {
-            ExtensibilityElement extElement = (ExtensibilityElement)extElementsIt.next();
-            if (extElement instanceof SOAPBody)
-            {
-              encodingNamespaceURI = ((SOAPBody)extElement).getNamespaceURI();
-              break;
-            }
-          }
-        }
-      }
-      // If the namespace of the soapbind:body element is not set, get it from the operation element
-      if (encodingNamespaceURI == null)
-        encodingNamespaceURI = operElement.getEncodingNamespace();
-      // If the namespace of the operation element is not set, get it from the definition element
-      if (encodingNamespaceURI == null)
-      {
-        WSDLBindingElement bindingElement = (WSDLBindingElement)operElement.getParentElement();
-        WSDLServiceElement serviceElement = (WSDLServiceElement)bindingElement.getParentElement();
-        WSDLElement wsdlElement = (WSDLElement)serviceElement.getParentElement();
-        Definition definition = wsdlElement.getDefinition();
-        encodingNamespaceURI = definition.getTargetNamespace();
-      }
-      // Generate an RPC style wrapper element.
-      String encodingStyle = (operElement.isUseLiteral() ? null : operElement.getEncodingStyle());
-      wrapperElement = SoapHelper.createRPCWrapperElement(doc,soapEnvelopeNamespaceTable,encodingNamespaceURI,oper.getName(),encodingStyle);
-      header.setLength(0);
-      header.append('<').append(wrapperElement.getTagName());
-      attributes = wrapperElement.getAttributes();
-      numberOfAttributes = attributes.getLength();
-      if (numberOfAttributes == 0)
-        header.append('>');
-%>
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
-  <tr>
-    <td width=16>
-      <img width=16 height=16 src="<%=response.encodeURL(controller.getPathWithContext("images/space.gif"))%>">
-    </td>
-    <td valign="bottom" class="labels">
-      <%=HTMLUtils.charactersToHTMLEntities(header.toString())%>
-    </td>
-  </tr>
-</table>
-<%
-      for (int i=0;i<numberOfAttributes;i++)
-      {
-        header.setLength(0);
-        Node attrNode = attributes.item(i);
-        header.append(attrNode.getNodeName()).append("=\"").append(attrNode.getNodeValue()).append('\"');
-        if (i == numberOfAttributes-1)
-          header.append('>');
-%>
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
-  <tr>
-    <td width=24>
-      <img width=24 height=16 src="<%=response.encodeURL(controller.getPathWithContext("images/space.gif"))%>">
-    </td>
-    <td valign="bottom" class="labels">
-      <%=HTMLUtils.charactersToHTMLEntities(header.toString())%>
-    </td>
-  </tr>
-</table>
-<%
-      }
-    }
-
-    int sourceContentIndentationImageWidth = 16;
-    if (wrapperElement != null)
-      sourceContentIndentationImageWidth += 8;
-%>
-<table border=0 cellpadding=3 cellspacing=3>
-  <tr>
-    <td width=<%=sourceContentIndentationImageWidth%>>
-      <img width=<%=sourceContentIndentationImageWidth%> height=16 src="<%=response.encodeURL(controller.getPathWithContext("images/space.gif"))%>">
-    </td>    
-    <td valign="center" align="left" nowrap>
-      <input type="file" name="<%=WSDLActionInputs.SELECTED_FILE%>" title="<%=wsdlPerspective.getMessage("FORM_CONTROL_TITLE_SOAP_FILE")%>">
-    </td>
-    <td valign="center" align="left" class="labels" nowrap>
-      <a href="javascript:showNewFileContents()"><%=wsdlPerspective.getMessage("BUTTON_LABEL_LOAD")%></a>
-    </td>
-    <td valign="center" align="left" class="labels" nowrap>
-      <a href="javascript:saveSourceContent()"><%=wsdlPerspective.getMessage("BUTTON_LABEL_SAVE_AS")%></a>
-    </td>
-  </tr>
-</table>
-<table width="95%" border=0 cellpadding=3 cellspacing=3>
-  <tr>
-    <td width=<%=sourceContentIndentationImageWidth%>>
-      <img width=<%=sourceContentIndentationImageWidth%> height=16 src="<%=response.encodeURL(controller.getPathWithContext("images/space.gif"))%>">
-    </td>
-    <td width="100%">
-      <textarea id="soap_body_content" name="<%=FragmentConstants.SOURCE_CONTENT%>" class="bigtextareaenter"><%=sourceContent.toString()%></textarea>
-    </td>
-  </tr>
-</table>
-<%
-   if (wrapperElement != null)
-   {
-     header.setLength(0);
-     header.append("</").append(wrapperElement.getTagName()).append('>');
-%>
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
-  <tr>
-    <td width=16>
-      <img width=16 height=16 src="<%=response.encodeURL(controller.getPathWithContext("images/space.gif"))%>">
-    </td>
-    <td valign="bottom" class="labels">
-      <%=HTMLUtils.charactersToHTMLEntities(header.toString())%>
-    </td>
-  </tr>
-</table>
-<%
-   }
-
-   header.setLength(0);
-   header.append("</").append(soapBodyElement.getTagName()).append('>');
-%>
-<table width="95%" cellpadding=1 cellspacing=0>
-  <tr>
-    <td width=8>
-      <img width=8 height=16 src="<%=response.encodeURL(controller.getPathWithContext("images/space.gif"))%>">
-    </td>
-    <td valign="bottom" class="labels">
-      <%=HTMLUtils.charactersToHTMLEntities(header.toString())%>
-    </td>
-  </tr>
-</table>
-<%
-   header.setLength(0);
-   header.append("</").append(soapEnvelopeElement.getTagName()).append('>');
-%>
-<table width="95%" cellpadding=1 cellspacing=0>
-  <tr>
-    <td valign="bottom" class="labels">
-      <%=HTMLUtils.charactersToHTMLEntities(header.toString())%>
-    </td>
-  </tr>
-</table>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/InvokeWSDLOperationForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/InvokeWSDLOperationForm.jsp
deleted file mode 100644
index 938de2662..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/InvokeWSDLOperationForm.jsp
+++ /dev/null
@@ -1,164 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        javax.wsdl.*,
-                                                        java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-  WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-  Node selectedNode = wsdlPerspective.getNodeManager().getSelectedNode();
-  InvokeWSDLOperationTool invokeWSDLOperationTool = (InvokeWSDLOperationTool)(selectedNode.getCurrentToolManager().getSelectedTool());
-  WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-  String fragmentViewID = invokeWSDLOperationTool.getFragmentViewID();
-  int operationType = operElement.getOperationType();
-  String invokeWSDLOperationURL = response.encodeURL(controller.getPathWithContext(invokeWSDLOperationTool.getFormActionLink(operationType,fragmentViewID)));
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=wsdlPerspective.getMessage("FORM_TITLE_INVOKE_WSDL_OPERATION")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<jsp:include page="/scripts/formsubmit.jsp" flush="true"/>
-<jsp:include page="/wsdl/scripts/fragmenttables.jsp" flush="true"/>
-<jsp:include page="/wsdl/scripts/wsdlpanes.jsp" flush="true"/>
-<script language="javascript">
-  function showNewFileContents()
-  {
-    var form = document.forms[0];
-    if (handleSubmit(form))
-    {
-      form.<%=WSDLActionInputs.SUBMISSION_ACTION%>.value = "<%=WSDLActionInputs.SUBMISSION_ACTION_BROWSE_FILE%>";
-      form.submit();
-      form.<%=WSDLActionInputs.SUBMISSION_ACTION%>.value = "<%=invokeWSDLOperationURL%>";
-      resetSubmission();
-    }
-  }
-
-  function saveSourceContent()
-  {
-    var form = document.forms[0];
-    if (handleSubmit(form))
-    {
-      form.<%=WSDLActionInputs.SUBMISSION_ACTION%>.value = "<%=WSDLActionInputs.SUBMISSION_ACTION_SAVE_AS%>";
-      form.submit();
-      form.<%=WSDLActionInputs.SUBMISSION_ACTION%>.value = "<%=invokeWSDLOperationURL%>";
-      resetSubmission();
-    }
-  }
-  
-  function closeChildWindows()
-  {
-    closeXSDInfoDialog();
-    closeCalendarBrowser();
-  }
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin" onUnload="closeChildWindows()">
-<div id="contentborder">
-  <form action="<%=invokeWSDLOperationURL%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data">
-    <input type="hidden" name="<%=WSDLActionInputs.SUBMISSION_ACTION%>" value="<%=WSDLActionInputs.SUBMISSION_ACTION_FORM%>">
-    <%
-    String titleImagePath = "wsdl/images/invoke_wsdl_operation_highlighted.gif";
-    String title = wsdlPerspective.getMessage("ALT_INVOKE_WSDL_OPERATION");
-    if (operationType == WSDLOperationElement.OPERATION_TYPE_SOAP)
-    {
-    %>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
-  <tr>
-    <td>
-      <img src="<%=response.encodeURL(controller.getPathWithContext(titleImagePath))%>" alt="">
-      <strong><%=title%></strong>
-    </td>
-    <td width="*">&nbsp;</td>
-    <td align="right" class="labels">
-<%
-   if (fragmentViewID.equals(FragmentConstants.FRAGMENT_VIEW_SWITCH_FORM_TO_SOURCE))
-   {
-%>
-      <a href="javascript:synchronizeFragmentViews('<%=FragmentConstants.FRAGMENT_VIEW_SWITCH_SOURCE_TO_FORM%>')" title="<%=wsdlPerspective.getMessage("ALT_SWITCH_TO_FORM_VIEW")%>"><%=wsdlPerspective.getMessage("FORM_LINK_FORM")%></a>
-<%
-   }
-   else
-   {
-%>
-      <a href="javascript:synchronizeFragmentViews('<%=FragmentConstants.FRAGMENT_VIEW_SWITCH_FORM_TO_SOURCE%>')" title="<%=wsdlPerspective.getMessage("ALT_SWITCH_TO_SOURCE_VIEW")%>"><%=wsdlPerspective.getMessage("FORM_LINK_SOURCE")%></a>
-<%
-   }
-%>
-    </td>
-  </tr>
-  <tr>
-    <td height=20 colspan=3><img height=2 width="100%" align="top" src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>"></td>
-  </tr>
-</table>
-    <%
-    }
-    else
-    {
-    %>
-    <%@ include file = "/forms/formheader.inc" %>
-    <%
-    }
-    %>
-    <table>
-      <tr>
-        <td class="labels">
-          <%=wsdlPerspective.getMessage("FORM_LABEL_INVOKE_WSDL_OPERATION_DESC")%>
-        </td>
-      </tr>
-    </table>
-    <table width="95%" border=0 cellpadding=3 cellspacing=0>
-      <tr>
-        <td>
-          <fieldset class="keylinefieldset">
-            <legend class="labels">
-              <label for="<%=WSDLActionInputs.END_POINT%>"><%=wsdlPerspective.getMessage("FORM_LABEL_END_POINTS")%></label>
-            </legend>
-            <table border=0 cellpadding=10 cellspacing=0>
-              <tr>
-                <td>
-                  <select id="<%=WSDLActionInputs.END_POINT%>" name="<%=WSDLActionInputs.END_POINT%>" class="selectlist">
-                    <%
-                    WSDLBindingElement bindingElement = (WSDLBindingElement)operElement.getParentElement();
-                    String[] endPoints = bindingElement.getEndPoints();
-                    String currEndPoint = invokeWSDLOperationTool.getEndPoint();
-                    for (int i = 0; i < endPoints.length; i++)
-                    {
-                    %>
-                      <option value="<%=endPoints[i]%>" <%if (endPoints[i].equals(currEndPoint)) {%>selected<%}%>><%=endPoints[i]%>
-                    <%
-                    }
-                    %>
-                  </select>
-                </td>
-              </tr>
-            </table>
-          </fieldset>
-        </td>
-      </tr>
-    </table>
-    <%
-    if (fragmentViewID.equals(FragmentConstants.FRAGMENT_VIEW_SWITCH_FORM_TO_SOURCE))
-    {
-    %>
-<jsp:include page="/wsdl/forms/FragmentsSoapView.jsp" flush="true"/>
-    <%
-    }
-    else
-    {
-    %>
-<jsp:include page="/wsdl/forms/FragmentsFormView.jsp" flush="true"/>
-    <%
-    }
-    %>
-    <jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
-  </form>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/OpenWSDLForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/OpenWSDLForm.jsp
deleted file mode 100644
index 1b0a05784..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/OpenWSDLForm.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.util.HTMLUtils" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-  WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-  FormTool formTool = (FormTool)wsdlPerspective.getNodeManager().getSelectedNode().getToolManager().getSelectedTool();
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=wsdlPerspective.getMessage("FORM_TITLE_OPEN_WSDL")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<jsp:include page="/wsdl/scripts/wsdlpanes.jsp" flush="true"/>
-<jsp:include page="/scripts/formsubmit.jsp" flush="true"/>
-<jsp:include page="/scripts/formutils.jsp" flush="true"/>
-<jsp:include page="/scripts/wsdlbrowser.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin" onUnload="closeWSDLBrowser()">
-<div id="contentborder">
-  <form action="<%=response.encodeURL(controller.getPathWithContext("wsdl/actions/OpenWSDLActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" onSubmit="return handleSubmit(this)">
-    <%
-    String titleImagePath = "wsdl/images/open_wsdl_highlighted.gif";
-    String title = wsdlPerspective.getMessage("ALT_OPEN_WSDL");
-    %>
-    <%@ include file = "/forms/formheader.inc" %>
-      <table>
-        <tr>
-          <td class="labels">
-            <%=wsdlPerspective.getMessage("FORM_LABEL_OPEN_WSDL_DESC")%>
-          </td>
-        </tr>
-      </table>        
-        <table width="95%" border=0 cellpadding=3 cellspacing=0>
-          <tr>
-            <td class="labels" height=25 valign="bottom" nowrap>
-              <label for="input_wsdl_url"><%=controller.getMessage("FORM_LABEL_WSDL_URL")%></label>
-              <%
-              if (!formTool.isInputValid(ActionInputs.QUERY_INPUT_WSDL_URL)) {
-              %>
-              <%=HTMLUtils.redAsterisk()%>
-              <%
-              }
-              String wsdlUrl = (String)formTool.getProperty(ActionInputs.QUERY_INPUT_WSDL_URL);
-              if (wsdlUrl == null)
-                wsdlUrl = "";
-              %>
-            </td>
-            <td height=25 valign="bottom" nowrap>
-              <a href="javascript:openWSDLBrowser('contentborder',<%=ActionInputs.WSDL_TYPE_SERVICE%>)"><%=controller.getMessage("FORM_LINK_BROWSE")%></a>
-            </td>
-            <td width="90%">&nbsp;</td>
-          </tr>
-          <tr>
-            <td colspan=3>
-              <input type="text" id="input_wsdl_url" name="<%=ActionInputs.QUERY_INPUT_WSDL_URL%>" value="<%=wsdlUrl%>" size="50" class="textenter">
-            </td>
-          </tr>
-        </table>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
-    </form>
-</div>
-<script language="javascript">
-  closeWSDLBrowser();
-</script>  
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/ProcessWSDLFramesetsForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/ProcessWSDLFramesetsForm.jsp
deleted file mode 100644
index 3e52f4d3d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/ProcessWSDLFramesetsForm.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-%>   
-<jsp:useBean id="formAction" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="formFrameName" class="java.lang.StringBuffer" scope="request"/>
-<form action="<%=response.encodeURL(controller.getPathWithContext(formAction.toString()))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" style="margin-top:0;margin-bottom:0">
-  <input name="<%=ActionInputs.FRAME_NAME%>" type="hidden" value="<%=formFrameName%>">
-  <input name="<%=WSDLActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT%>" type="hidden" value="<%=wsdlPerspective.getPerspectiveContentFramesetCols()%>">
-  <input name="<%=WSDLActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER%>" type="hidden" value="<%=wsdlPerspective.getActionsContainerFramesetRows()%>">
-</form>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/ReadOnlyFragmentsFormView.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/ReadOnlyFragmentsFormView.jsp
deleted file mode 100644
index c8a8c4388..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/ReadOnlyFragmentsFormView.jsp
+++ /dev/null
@@ -1,222 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.Node,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*,
-                                                        org.w3c.dom.*,
-                                                        javax.wsdl.*,
-                                                        javax.xml.parsers.*,
-                                                        java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-
-<%!
-private Element soapResponse_ = null;
-
-private Element[] parseSOAPResponse(SOAPMessageQueue soapMessageQueue, WSDLOperationElement operElement)
-{
-  String messages = soapMessageQueue.getMessagesFromList();
-  try
-  {
-    soapResponse_ = XMLUtils.stringToElement(messages, true);
-    NodeList nl = soapResponse_.getElementsByTagNameNS(FragmentConstants.URI_SOAP_ENV, FragmentConstants.QNAME_LOCAL_NAME_BODY);
-    if (nl.getLength() > 0)
-    {
-      Element soapBody = (Element)nl.item(0);
-      NodeList soapFault = soapBody.getElementsByTagNameNS(FragmentConstants.URI_SOAP_ENV, FragmentConstants.QNAME_LOCAL_NAME_FAULT);
-      if (soapFault.getLength() > 0)
-        return new Element[0];
-      NodeList instanceList;
-      if (operElement.isDocumentStyle())
-        instanceList = soapBody.getChildNodes();
-      else
-      {
-        NodeList rpcWrapper = soapBody.getElementsByTagNameNS("*", operElement.getOperation().getOutput().getMessage().getQName().getLocalPart());
-
-        /*
-        * HACK - Some of the web services out on the internet do not
-        * set their RPC wrapper properly.  It should be set to the output
-        * message name of the selected operation.  The hack is to
-        * assume the first element inside the body element is the
-        * RPC wrapper.
-        */
-        if (rpcWrapper.getLength() <= 0)
-          rpcWrapper = soapBody.getElementsByTagNameNS("*", "*");
-
-        if (rpcWrapper.getLength() > 0)
-          instanceList = rpcWrapper.item(0).getChildNodes();
-        else
-          return null;
-      }
-      return fixSOAPResponse(instanceList, operElement);
-    }
-  }
-  catch (Throwable t) {
-    t.printStackTrace();
-  }
-  return null;
-}
-
-/*
-* HACK - The root element tag name of the instance document
-* is ambiguous.  It lands on a very grey area between the SOAP
-* spec and the WSDL spec.  The two specs do not explicitly define
-* that the root element tag name must match the name of the
-* WSDL part.  The hack is to treat elements with different tag names
-* as instances of the WSDL part.
-*/
-private Element[] fixSOAPResponse(NodeList instanceList, WSDLOperationElement operElement)
-{
-  Vector instanceVector = new Vector();
-  for (int i = 0; i < instanceList.getLength(); i++)
-  {
-    Object object = instanceList.item(i);
-    if (object != null && (object instanceof Element))
-      instanceVector.add(object);
-  }
-  Element[] instanceDocuments = new Element[instanceVector.size()];
-  Operation oper = operElement.getOperation();
-  Map partsMap = oper.getOutput().getMessage().getParts();
-  if (partsMap.size() == 1)
-  {
-    Iterator it = partsMap.values().iterator();
-    IXSDFragment frag = operElement.getFragment((Part)it.next(), false);
-    for (int i = 0; i < instanceVector.size(); i++)
-    {
-      Element element = (Element)instanceVector.get(i);
-      if (!element.getTagName().equals(frag.getName()))
-      {
-        Document doc = element.getOwnerDocument();
-        NodeList children = element.getChildNodes();
-        NamedNodeMap attributes = element.getAttributes();
-        element = doc.createElement(frag.getName());
-        for (int j = 0; j < children.getLength(); j++)
-        {
-          if (children.item(j) != null)
-          {
-            element.appendChild(children.item(j));
-            // When you append a node from one element to another,
-            // the original element will lose its reference to this node,
-            // therefore, the size of the node list will decrease by 1.
-            j--;
-          }
-        }
-        for (int j = 0; j < attributes.getLength(); j++)
-        {
-          Object attr = attributes.item(j);
-          if (attr != null && (attr instanceof Attr))
-          {
-            Attr attribute = (Attr)attr;
-            element.setAttribute(attribute.getName(), attribute.getValue());
-          }
-        }
-      }
-      instanceDocuments[i] = element;
-    }
-  }
-  else
-    instanceVector.copyInto(instanceDocuments);
-  return instanceDocuments;
-}
-%>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-wsdlPerspective.setStatusContentType(WSDLPerspective.STATUS_CONTENT_RESULT_FORM);
-Node operNode = wsdlPerspective.getOperationNode();
-nodeID.delete(0, nodeID.length());
-nodeID.append(operNode.getNodeId());
-WSDLOperationElement operElement = (WSDLOperationElement)operNode.getTreeElement();
-Operation oper = operElement.getOperation();
-if (oper.getOutput() == null)
-{
-%>
-  <table width="95%" border=0 cellpadding=6 cellspacing=0>
-    <tr>
-      <td height=20 valign="bottom" align="left" class="labels">
-        <%=wsdlPerspective.getMessage("FORM_LABEL_NOTHING_TO_DISPLAY_IN_FORM_VIEW")%>
-      </td>
-    </tr>
-  </table>
-<%
-}
-else
-{
-  boolean cached = ((Boolean)operElement.getPropertyAsObject(WSDLActionInputs.SOAP_RESPONSE_CACHED)).booleanValue();
-  Element[] instanceDocuments = null;
-  if (!cached)
-  {
-    SOAPMessageQueue soapMessageQueue = wsdlPerspective.getSOAPResponseQueue();
-    instanceDocuments = parseSOAPResponse(soapMessageQueue, operElement);
-  }
-  if (!cached && instanceDocuments == null)
-  {
-  %>
-    <table width="95%" border=0 cellpadding=6 cellspacing=0>
-      <tr>
-        <td height=20 valign="bottom" align="left" class="labels">
-          <%=wsdlPerspective.getMessage("FORM_LABEL_SOAP_RESPONSE_FAILED_VALIDATION_IN_FORM_VIEW")%>
-        </td>
-      </tr>
-    </table>
-  <%
-  }
-  else if (!cached && instanceDocuments.length <= 0)
-  {
-  %>
-    <table width="95%" border=0 cellpadding=6 cellspacing=0>
-      <tr>
-        <td height=20 valign="bottom" align="left" class="labels">
-          <%=wsdlPerspective.getMessage("FORM_LABEL_NOTHING_TO_DISPLAY_IN_FORM_VIEW")%>
-        </td>
-      </tr>
-    </table>
-  <%
-  }
-  else
-  {
-    Map partsMap = oper.getOutput().getMessage().getParts();
-    Iterator it = partsMap.values().iterator();
-    Hashtable uriReferences = null;
-    while (it.hasNext())
-    {
-      IXSDFragment fragment = operElement.getFragment((Part)it.next(), false);
-      if (!cached)
-      {
-        if (!operElement.isUseLiteral() && (fragment instanceof ISOAPEncodingWrapperFragment))
-        {
-          if (uriReferences == null)
-            uriReferences = SOAPEncodingWrapperFragment.parseURIReferences(soapResponse_, true);
-          ((ISOAPEncodingWrapperFragment)fragment).setURIReferences(uriReferences);
-        }
-        fragment.setParameterValuesFromInstanceDocuments(instanceDocuments);
-      }
-      fragID.delete(0, fragID.length());
-      fragID.append(fragment.getID());
-      %>
-      <jsp:include page="<%=fragment.getReadFragment()%>" flush="true"/>
-      <%
-    }
-    operElement.setPropertyAsObject(WSDLActionInputs.SOAP_RESPONSE_CACHED, new Boolean(true));
-  }
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/ReadOnlyFragmentsSoapView.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/ReadOnlyFragmentsSoapView.jsp
deleted file mode 100644
index 80c36875e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/ReadOnlyFragmentsSoapView.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.Node,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLOperationElement" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-wsdlPerspective.setStatusContentType(WSDLPerspective.STATUS_CONTENT_RESULT_SOURCE);
-Node operNode = wsdlPerspective.getOperationNode();
-WSDLOperationElement operElement = (WSDLOperationElement)operNode.getTreeElement();
-String soapRequestTableContainerId = "SOAPRequest";
-StringBuffer soapRequestTwistImageName = new StringBuffer("x");
-soapRequestTwistImageName.append(soapRequestTableContainerId);
-String soapResponseTableContainerId = "SOAPResponse";
-StringBuffer soapResponseTwistImageName = new StringBuffer("x");
-soapResponseTwistImageName.append(soapResponseTableContainerId);
-%>
-
-<script language="javascript">
-  var sectionIds = ["<%=soapRequestTableContainerId%>","<%=soapResponseTableContainerId%>"];
-  function toggleSOAPEnvelope(soapEnvelopeType,twistImageName)
-  {
-<%
-    // If both envelopes are expanded, each should have 50% height. Otherwise, the remaining displayed envelope should be reset to 100% height.
-%>
-    var soapSectionId = sectionIds[soapEnvelopeType];
-    var soapSection = document.getElementById(soapSectionId);
-    var soapSectionTable = getTable(soapSectionId);
-    var otherSoapSectionId = sectionIds[1-soapEnvelopeType];
-    var otherSoapSection = document.getElementById(otherSoapSectionId);
-    var otherSoapSectionTable = getTable(otherSoapSectionId);
-    if (soapSection.style.display == "none")
-    {
-      if (otherSoapSection.style.display == "")
-      {
-        soapSectionTable.height = "50%";
-        otherSoapSectionTable.height = "50%";
-      }
-      else
-        soapSectionTable.height = "100%";
-    }
-    else
-    {
-      if (otherSoapSection.style.display == "")
-        otherSoapSectionTable.height = "100%";
-    }
-    twist(soapSectionId,twistImageName);
-  }
-</script>
-
-<table width="95%" border=0 cellpadding=6 cellspacing=0>
-  <tr>
-    <td height=20 valign="bottom" align="left" nowrap width=11><a href="javascript:toggleSOAPEnvelope(<%=WSDLActionInputs.SOAP_ENVELOPE_TYPE_REQUEST%>,'<%=soapRequestTwistImageName.toString()%>')"><img name="<%=soapRequestTwistImageName.toString()%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a></td>
-    <td height=20 valign="bottom" align="left" nowrap class="labels">
-      <strong><%=wsdlPerspective.getMessage("FORM_LABEL_SOAP_REQUEST_ENVELOPE")%></strong>
-    </td>
-    <td nowrap width="90%">&nbsp;</td>
-  </tr>
-</table>
-<div id="<%=soapRequestTableContainerId%>" style="display:none">
-  <table width="95%" height="50%" border=0 cellpadding=0 cellpadding=0>
-    <tr>
-      <td>
-        <iframe src="<%=response.encodeURL(controller.getPathWithContext(wsdlPerspective.getSOAPEnvelopeXMLLink(WSDLActionInputs.SOAP_ENVELOPE_TYPE_REQUEST)))%>" width="95%" height="100%"></iframe>
-      </td>
-    </tr>
-  </table>
-</div>
-<script language="javascript">
-  twist("<%=soapRequestTableContainerId%>","<%=soapRequestTwistImageName.toString()%>");
-</script>
-
-<%
-if (operElement.getOperation().getOutput() != null)
-{
-%>
-<table width="95%" border=0 cellpadding=6 cellspacing=0>
-  <tr>
-    <td height=20 valign="bottom" align="left" nowrap width=11><a href="javascript:toggleSOAPEnvelope(<%=WSDLActionInputs.SOAP_ENVELOPE_TYPE_RESPONSE%>,'<%=soapResponseTwistImageName.toString()%>')"><img name="<%=soapResponseTwistImageName.toString()%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a></td>
-    <td height=20 valign="bottom" align="left" nowrap class="labels">
-      <strong><%=wsdlPerspective.getMessage("FORM_LABEL_SOAP_RESPONSE_ENVELOPE")%></strong>
-    </td>
-    <td nowrap width="90%">&nbsp;</td>
-  </tr>
-</table>
-<div id="<%=soapResponseTableContainerId%>" style="display:none">
-  <table width="95%" height="50%" border=0 cellpadding=0 cellpadding=0>
-    <tr>
-      <td>
-        <iframe src="<%=response.encodeURL(controller.getPathWithContext(wsdlPerspective.getSOAPEnvelopeXMLLink(WSDLActionInputs.SOAP_ENVELOPE_TYPE_RESPONSE)))%>" width="95%" height="100%"></iframe>
-      </td>
-    </tr>
-  </table>
-</div>
-<script language="javascript">
-  twist("<%=soapResponseTableContainerId%>","<%=soapResponseTwistImageName.toString()%>");
-</script>
-<%
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/WSDLBindingDetailsForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/WSDLBindingDetailsForm.jsp
deleted file mode 100644
index 8647191ec..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/WSDLBindingDetailsForm.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
-  WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-  Node bindingNode = wsdlPerspective.getNodeManager().getSelectedNode();
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=wsdlPerspective.getMessage("FORM_TITLE_WSDL_BINDING_DETAILS")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<script language="javascript">
-  var rowCheckboxName = "rowCheckboxName";
-</script>
-<jsp:include page="/scripts/tables.jsp" flush="true"/>
-<jsp:include page="/scripts/formsubmit.jsp" flush="true"/>
-<jsp:include page="/scripts/formutils.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-<form action="<%=response.encodeURL(controller.getPathWithContext("wsdl/actions/UpdateWSDLBindingActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" onSubmit="return handleSubmit(this)">
-<%
-   String titleImagePath = "wsdl/images/open_wsdl_highlighted.gif";
-   String title = wsdlPerspective.getMessage("ALT_WSDL_BINDING_DETAILS");
-   WSDLBindingElement wsdlBindingElement = (WSDLBindingElement)bindingNode.getTreeElement();
-   Vector operationNodes = bindingNode.getChildNodes();
-%>
-<%@ include file = "/forms/formheader.inc" %>
-<input type="hidden" name="<%=ActionInputs.NODEID%>" value="<%=bindingNode.getNodeId()%>">
-<table>
-  <tr>
-    <td class="labels"><%=wsdlPerspective.getMessage("FORM_LABEL_BINDING_DETAILS_DESC",wsdlPerspective.getBindingTypeString(wsdlBindingElement.getBindingType()))%></td>
-  </tr>
-</table>
-<%
-   String documentation = wsdlBindingElement.getPropertyAsString(WSDLModelConstants.PROP_DOCUMENTATION);
-   if (documentation.length() > 0)
-   {
-%>
-<table>
-  <tr>
-    <td height=20 valign="bottom" class="labels"><%=documentation%></td>
-  </tr>
-  <tr>
-    <td height=10>&nbsp;</td>
-  </tr>
-</table>
-<%
-   }
-
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("Operations");
-   sectionHeaderInfo.setOtherProperties(operationNodes);
-%>
-<jsp:include page="/wsdl/forms/operations_table.jsp" flush="true"/>
-<%
-   if (operationNodes.size() > 0)
-   {
-%>
-<script language="javascript">
-  twist("Operations","xOperations");
-</script>
-<%
-   }
-
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("Endpoints");
-   sectionHeaderInfo.setOtherProperties(wsdlBindingElement);
-%>
-<table>
-  <tr>
-    <td height=20>&nbsp;</td>
-  </tr>
-</table>
-<jsp:include page="/wsdl/forms/endpoint_table.jsp" flush="true"/>
-<%
-  if (wsdlBindingElement.getEndPoints().length > 0)
-  {
-%>
-<script language="javascript">
-  twistOpen("Endpoints");
-</script>
-<%
-  }
-%>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
-</form>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/WSDLDetailsForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/WSDLDetailsForm.jsp
deleted file mode 100644
index eead075e0..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/WSDLDetailsForm.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.Node,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
-  WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-  Node wsdlNode = wsdlPerspective.getNodeManager().getSelectedNode();
-  ToolManager currentToolManager = wsdlNode.getCurrentToolManager();
-  WSDLDetailsTool wsdlDetailsTool = (WSDLDetailsTool)currentToolManager.getSelectedTool();
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=wsdlPerspective.getMessage("FORM_TITLE_WSDL_DETAILS")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<jsp:include page="/scripts/tables.jsp" flush="true"/>
-<jsp:include page="/scripts/panes.jsp" flush="true"/>
-<script language="javascript">
-  function switchWSDLDetailsView() {
-    perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/actions/SwitchWSDLDetailsViewsActionJSP.jsp"))%>";
-  }
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-<%
-   String titleImagePath = "wsdl/images/open_wsdl_highlighted.gif";
-   String title = wsdlPerspective.getMessage("ALT_WSDL_DETAILS");
-%>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
-  <tr>
-    <td>
-      <img src="<%=response.encodeURL(controller.getPathWithContext(titleImagePath))%>" alt="">
-      <strong><%=title%></strong>
-    </td>
-    <td width="*">&nbsp;</td>
-    <td align="right" class="labels">
-<%
-   if (wsdlDetailsTool.getViewId() == WSDLDetailsTool.SOURCE_VIEW_ID)
-   {     
-%>
-      <a href="javascript:switchWSDLDetailsView()" title="<%=wsdlPerspective.getMessage("ALT_SWITCH_TO_FORM_VIEW")%>"><%=wsdlPerspective.getMessage("FORM_LINK_FORM")%></a>
-<%
-   }
-   else
-   {
-%>
-      <a href="javascript:switchWSDLDetailsView()" title="<%=wsdlPerspective.getMessage("ALT_SWITCH_TO_SOURCE_VIEW")%>"><%=wsdlPerspective.getMessage("FORM_LINK_SOURCE")%></a>
-<%
-   }
-%>   
-    </td>
-  </tr>
-  <tr>
-    <td height=20 colspan=3><img height=2 width="100%" align="top" src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>"></td>
-  </tr>
-</table>
-<%
-  if (wsdlDetailsTool.getViewId() == WSDLDetailsTool.FORM_VIEW_ID)
-  {
-%>
-    <jsp:include page="/wsdl/forms/WSDLDetailsFormView.jsp" flush="true"/>
-<%
-  }
-  else
-  {
-%>
-    <table width="95%" height="100%" border=0 cellpadding=0 cellpadding=0>
-      <tr>
-        <td>
-          <iframe src="<%=response.encodeURL(controller.getPathWithContext("/wsdl/forms/WSDLDetailsSourceView.jsp"))%>" width="95%" height="100%"></iframe>
-        </td>
-      </tr>
-    </table>
-<%
-  }
-%>
-<jsp:useBean id="currentToolManagerHash" class="java.util.Hashtable" scope="request">
-<%
-  currentToolManagerHash.put(ActionInputs.CURRENT_TOOL_MANAGER,currentToolManager);
-%>
-</jsp:useBean>
-<jsp:include page="/forms/otherActions.jsp" flush="true"/>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/WSDLDetailsFormView.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/WSDLDetailsFormView.jsp
deleted file mode 100644
index 5525c532c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/WSDLDetailsFormView.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.Node,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-%>
-<table>
-  <tr>
-    <td class="labels"><%=wsdlPerspective.getMessage("FORM_LABEL_WSDL_DETAILS_DESC")%></td>
-  </tr>
-  <tr>
-    <td height=20>&nbsp;</td>
-  </tr>
-</table>
-<%
-Node wsdlNode = wsdlPerspective.getNodeManager().getSelectedNode();
-WSDLElement wsdlElement = (WSDLElement)wsdlNode.getTreeElement();
-String documentation = wsdlElement.getPropertyAsString(WSDLModelConstants.PROP_DOCUMENTATION);
-if (documentation != null && documentation.length() > 0)
-{
-%>
-<table>
-  <tr>
-    <td height=20 valign="bottom" class="labels"><%=documentation%></td>
-  </tr>
-</table>
-<%
-}
-%>
-<table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
-  <tr>
-    <th class="singleheadercolor"><%=controller.getMessage("FORM_LABEL_WSDL_URL")%></th>
-  </tr>
-  <tr>
-    <td class="tablecells"><%=wsdlElement.getWsdlUrl()%></td>
-  </tr>
-</table>
-<table>
-  <tr>
-    <td height=10>&nbsp;</td>
-  </tr>
-</table>
-<%   
-sectionHeaderInfo.clear();
-sectionHeaderInfo.setContainerId("Services");
-Vector serviceNodes = wsdlNode.getChildNodes();
-sectionHeaderInfo.setOtherProperties(serviceNodes);
-%>
-<jsp:include page="/wsdl/forms/services_table.jsp" flush="true"/>
-<table>
-  <tr>
-    <td height=10>&nbsp;</td>
-  </tr>
-</table>
-<%   
-Vector bindingNodes = new Vector();
-for (int i=0;i<serviceNodes.size();i++)
-{
-  Node serviceNode = (Node)serviceNodes.elementAt(i);
-  Vector serviceBindingNodes = serviceNode.getChildNodes();
-  for (int j=0;j<serviceBindingNodes.size();j++)
-  {
-    Node serviceBindingNode = (Node)serviceBindingNodes.elementAt(j);
-    bindingNodes.addElement(serviceBindingNode);
-  }
-}
-sectionHeaderInfo.clear();
-sectionHeaderInfo.setContainerId("Bindings");
-sectionHeaderInfo.setOtherProperties(bindingNodes);
-%>
-<jsp:include page="/wsdl/forms/bindings_table.jsp" flush="true"/>
-<script language="javascript">
-<%
-if (serviceNodes.size() > 0)
-{
-%>
-  twist("Services","xServices");
-<%
-}
-if (bindingNodes.size() > 0)
-{
-%>
-  twist("Bindings","xBindings");
-<%
-}
-%>
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/WSDLDetailsSourceView.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/WSDLDetailsSourceView.jsp
deleted file mode 100644
index 470a4b5a6..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/WSDLDetailsSourceView.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/xml; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                       org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
-                                                       org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                       org.eclipse.wst.wsdl.internal.impl.wsdl4j.WSDLFactoryImpl,
-                                                       java.io.*,
-                                                       javax.wsdl.*,
-                                                       javax.wsdl.xml.*,
-                                                       javax.wsdl.factory.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-NodeManager nodeManager = wsdlPerspective.getNodeManager();
-Node selectedNode = nodeManager.getSelectedNode();
-WSDLElement wsdlElement = (WSDLElement)selectedNode.getTreeElement();
-Definition definition = wsdlElement.getDefinition();
-WSDLFactory wsdlFactory = new WSDLFactoryImpl();
-WSDLWriter wsdlWriter = wsdlFactory.newWSDLWriter();
-StringWriter stringWriter = new StringWriter();
-try
-{
-  wsdlWriter.writeWSDL(definition, stringWriter);
-  %>
-  <%=stringWriter.toString()%>
-  <%
-}
-catch (WSDLException wsdle)
-{
-  %>
-  <?xml version="1.0"?>
-  <%
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/WSDLImportWSDLToWorkbenchForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/WSDLImportWSDLToWorkbenchForm.jsp
deleted file mode 100644
index 1ad9d5c01..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/WSDLImportWSDLToWorkbenchForm.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLElement,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="formProperties" class="java.util.Hashtable" scope="request">
-<%
-   WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-   NodeManager nodeManager = wsdlPerspective.getNodeManager();
-   Node selectedNode = nodeManager.getSelectedNode();
-   String wsdlUrl = ((WSDLElement)selectedNode.getTreeElement()).getWsdlUrl();
-   formProperties.put("formActionLink","wsdl/actions/WSDLImportWSDLToWorkbenchActionJSP.jsp");
-   formProperties.put("wsdlURL",wsdlUrl);
-%>
-</jsp:useBean>
-<jsp:include page="/forms/ImportWSDLAndWSILToWorkbenchForm.jsp" flush="true"/>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/WSDLLaunchWebServiceWizardForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/WSDLLaunchWebServiceWizardForm.jsp
deleted file mode 100644
index 893d80cea..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/WSDLLaunchWebServiceWizardForm.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" %>
-
-<jsp:useBean id="formActionLink" class="java.lang.StringBuffer" scope="request">
-<%
-formActionLink.append("wsdl/actions/WSDLLaunchWebServiceWizardActionJSP.jsp");
-%>
-</jsp:useBean>
-<jsp:include page="/forms/LaunchWebServiceWizardForm.jsp" flush="true"/>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/WSDLServiceDetailsForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/WSDLServiceDetailsForm.jsp
deleted file mode 100644
index 4e24cc8e3..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/WSDLServiceDetailsForm.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
-  WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-  Node serviceNode = wsdlPerspective.getNodeManager().getSelectedNode();
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=wsdlPerspective.getMessage("FORM_TITLE_WSDL_SERVICE_DETAILS")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<jsp:include page="/scripts/tables.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-<%
-   String titleImagePath = "wsdl/images/open_wsdl_highlighted.gif";
-   String title = wsdlPerspective.getMessage("ALT_WSDL_SERVICE_DETAILS");
-%>
-<%@ include file = "/forms/formheader.inc" %>
-<table>
-  <tr>
-    <td class="labels"><%=wsdlPerspective.getMessage("FORM_LABEL_SERVICE_DETAILS_DESC")%></td>
-  </tr>
-</table>
-<%
-   WSDLServiceElement wsdlServiceElement = (WSDLServiceElement)serviceNode.getTreeElement();
-   String documentation = wsdlServiceElement.getPropertyAsString(WSDLModelConstants.PROP_DOCUMENTATION);
-   if (documentation.length() > 0)
-   {
-%>
-<table>
-  <tr>
-    <td height=20 valign="bottom" class="labels"><%=documentation%></td>
-  </tr>
-  <tr>
-    <td height=10>&nbsp;</td>
-  </tr>
-</table>
-<%
-   }
-   Vector bindingNodes = serviceNode.getChildNodes();
-   sectionHeaderInfo.clear();
-   sectionHeaderInfo.setContainerId("Bindings");
-   sectionHeaderInfo.setOtherProperties(bindingNodes);
-%>
-<jsp:include page="/wsdl/forms/bindings_table.jsp" flush="true"/>
-</div>
-<%
-   if (bindingNodes.size() > 0)
-   {
-%>
-<script language="javascript">
-  twist("Bindings","xBindings");
-</script>
-<%
-   }
-%>
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/bindings_table.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/bindings_table.jsp
deleted file mode 100644
index a10ca074e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/bindings_table.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        javax.wsdl.*,
-                                                        java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
-   WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-   String tableContainerId = sectionHeaderInfo.getContainerId();
-   StringBuffer twistImageName = new StringBuffer("x");
-   twistImageName.append(tableContainerId);
-%>
-<table border=0 cellpadding=6 cellspacing=0>
-  <tr>
-    <td height=20 valign="bottom" align="left" nowrap width=11><a href="javascript:twist('<%=tableContainerId%>','<%=twistImageName.toString()%>')"><img name="<%=twistImageName.toString()%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a></td>
-    <td height=20 valign="bottom" align="left" nowrap class="labels"><strong><%=wsdlPerspective.getMessage("FORM_LABEL_BINDINGS")%></strong></td>
-  </tr>
-</table>
-
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
-  <tr>
-    <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" height=2 width="100%"></td>
-  </tr>
-</table>
-
-<div id="<%=tableContainerId%>" style="display:none;">
-  <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
-    <tr>
-      <th class="headercolor" width="20%"><%=wsdlPerspective.getMessage("FORM_LABEL_NAME")%></th>
-      <th class="headercolor" width="20%"><%=wsdlPerspective.getMessage("FORM_LABEL_BINDING_TYPE")%></th>
-      <th class="headercolor"><%=wsdlPerspective.getMessage("FORM_LABEL_DOCUMENTATION")%></th>
-    </tr>
-<%
-   Vector bindingNodes = (Vector)sectionHeaderInfo.getOtherProperties();
-   for (int i=0;i<bindingNodes.size();i++)
-   {
-     Node bindingNode = (Node)bindingNodes.elementAt(i);
-     WSDLBindingElement wsdlBindingElement = (WSDLBindingElement)bindingNode.getTreeElement();
-     Binding binding = wsdlBindingElement.getBinding();
-%>
-    <tr>
-      <td class="tablecells"><a href="<%=response.encodeURL(controller.getPathWithContext(SelectWSDLNavigatorNodeAction.getActionLink(bindingNode.getNodeId(),false)))%>"><%=binding.getQName().getLocalPart()%></td>
-      <td class="tablecells"><%=wsdlPerspective.getBindingTypeString(wsdlBindingElement.getBindingType())%></td>
-<%
-     WSDLServiceElement wsdlServiceElement = (WSDLServiceElement)wsdlBindingElement.getParentElement();
-     String documentation = wsdlServiceElement.getPropertyAsString(WSDLModelConstants.PROP_DOCUMENTATION);
-     if (documentation.length() < 1)
-       documentation = controller.getMessage("TABLE_BLANK_PLACEHOLDER");     
-%>
-      <td class="tablecells"><%=documentation%></td>
-    </tr>
-<%
-   }
-%>
-  </table>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/endpoint_table.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/endpoint_table.jsp
deleted file mode 100644
index 37ec6d4ff..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/endpoint_table.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<script language="javascript">
-  function addEndpoint(tableContainerID, id, name, value, isRemovable)
-  {
-    twistOpen(tableContainerID);
-    var table = getTable(tableContainerID);
-    var tableBody = table.getElementsByTagName("tbody").item(0);
-    var newRow = document.createElement("tr");
-    var column0 = document.createElement("td");
-    var column1 = document.createElement("td");
-
-    var rowCheckbox = createRowCheckbox();
-    if (!isRemovable)
-    {
-      rowCheckbox.disabled = true;
-    }
-    column0.appendChild(rowCheckbox);
-
-    var endPoint;
-    if (isRemovable)
-    {
-      endPoint = document.createElement("input");
-      endPoint.type = "text";
-      endPoint.id = id;
-      endPoint.name = name;
-      if (value != null)
-        endPoint.value = value;
-      endPoint.className = "tabletextenter";
-    }
-    else
-      endPoint = document.createTextNode(value);
-    column1.appendChild(endPoint);
-
-    column0.className = "checkboxcells";
-    column1.className = "tablecells";
-    newRow.appendChild(column0);
-    newRow.appendChild(column1);
-    tableBody.appendChild(newRow);
-  }
-
-  function handleEndpointCheckAllClick(tableContainerId,checkAllCheckbox)
-  {
-    var table = getTable(tableContainerId);
-    for (var i=numberOfHeaderRows;i<table.rows.length;i++)
-    {
-      var rowCheckboxCell = table.rows[i].getElementsByTagName("td").item(0);
-      var rowCheckbox = rowCheckboxCell.childNodes[0];
-      if (!rowCheckbox.disabled)
-      {
-        rowCheckbox.checked = checkAllCheckbox.checked;
-        if (rowCheckbox.checked)
-          highlightRow(table.rows[i],"rowcolor");
-        else
-          highlightRow(table.rows[i],"tablecells");
-      }
-    }
-  }
-</script>
-<%
-   WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-   String tableContainerID = sectionHeaderInfo.getContainerId();
-   StringBuffer twistImageName = new StringBuffer("x");
-   twistImageName.append(tableContainerID);   
-   WSDLBindingElement bindingElement = (WSDLBindingElement)sectionHeaderInfo.getOtherProperties();
-   String[] endpoints = bindingElement.getEndPoints();
-   String addressLocation = ((WSDLServiceElement)bindingElement.getParentElement()).getAddressLocation(bindingElement.getBinding());   
-%>
-<table border=0 cellpadding=6 cellspacing=0>
-  <tr>
-    <td height=20 valign="bottom" align="left" nowrap width=11>
-      <a href="javascript:twist('<%=tableContainerID%>','<%=twistImageName.toString()%>')"><img name="<%=twistImageName.toString()%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a>
-    </td>
-    <td height=20 valign="bottom" align="left" nowrap class="labels">
-      <strong><%=wsdlPerspective.getMessage("FORM_LABEL_END_POINTS")%></strong>
-    </td>
-    <td class="labels" height=25 valign="bottom" align="left" nowrap>
-      <a href="javascript:addEndpoint('<%=tableContainerID%>', '<%=WSDLActionInputs.END_POINT%>', '<%=WSDLActionInputs.END_POINT%>', '<%=addressLocation%>', true)"><%=wsdlPerspective.getMessage("FORM_LINK_ADD")%></a>
-    </td>
-    <td class="labels" height=25 valign="bottom" align="left" nowrap>
-      <a href="javascript:removeSelectedRows('<%=tableContainerID%>')"><%=wsdlPerspective.getMessage("FORM_LINK_REMOVE")%></a>
-    </td>
-  </tr>
-</table>
-
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
-  <tr>
-    <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" height=2 width="100%"></td>
-  </tr>
-</table>
-
-<div id="<%=tableContainerID%>" style="display:none;">
-  <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
-    <tr>
-      <th class="checkboxcells" width=10><input type="checkbox" onClick="handleEndpointCheckAllClick('<%=tableContainerID%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
-      <th class="headercolor"><%=wsdlPerspective.getMessage("FORM_LABEL_END_POINTS")%></th>
-    </tr>
-  </table>
-</div>
-<script language="javascript">
-<%
-  boolean isDefaultAdded = false;
-  for (int i = 0; i < endpoints.length; i++)
-  {
-    if (endpoints[i].equals(addressLocation) && !isDefaultAdded)
-    {
-%>
-    addEndpoint('<%=tableContainerID%>', '<%=WSDLActionInputs.END_POINT%>', "", '<%=endpoints[i]%>', false);
-    
-<%
-      isDefaultAdded = true;
-    }
-    else
-    {
-%>
-    addEndpoint('<%=tableContainerID%>', '<%=WSDLActionInputs.END_POINT%>', '<%=WSDLActionInputs.END_POINT%>', '<%=endpoints[i]%>', true);
-<%
-    }
-  }
-%>
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/operations_table.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/operations_table.jsp
deleted file mode 100644
index bab19e2d3..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/operations_table.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
-   WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-   String tableContainerId = sectionHeaderInfo.getContainerId();
-   StringBuffer twistImageName = new StringBuffer("x");
-   twistImageName.append(tableContainerId);   
-%>
-<table border=0 cellpadding=6 cellspacing=0>
-  <tr>
-    <td height=20 valign="bottom" align="left" nowrap width=11><a href="javascript:twist('<%=tableContainerId%>','<%=twistImageName.toString()%>')"><img name="<%=twistImageName.toString()%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a></td>
-    <td height=20 valign="bottom" align="left" nowrap class="labels"><strong><%=wsdlPerspective.getMessage("FORM_LABEL_OPERATIONS")%></strong></td>
-  </tr>
-</table>
-
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
-  <tr>
-    <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" height=2 width="100%"></td>
-  </tr>
-</table>
-
-<div id="<%=tableContainerId%>" style="display:none;">
-  <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
-    <tr>
-      <th class="headercolor" width="20%"><%=wsdlPerspective.getMessage("FORM_LABEL_NAME")%></th>
-      <th class="headercolor"><%=wsdlPerspective.getMessage("FORM_LABEL_DOCUMENTATION")%></th>
-    </tr>
-<%
-   Vector operationNodes = (Vector)sectionHeaderInfo.getOtherProperties();
-   for (int i=0;i<operationNodes.size();i++)
-   {
-     Node operationNode = (Node)operationNodes.elementAt(i);
-     WSDLOperationElement wsdlOperationElement = (WSDLOperationElement)operationNode.getTreeElement();
-%>
-    <tr>
-      <td class="tablecells"><a href="<%=response.encodeURL(controller.getPathWithContext(SelectWSDLNavigatorNodeAction.getActionLink(operationNode.getNodeId(),false)))%>"><%=wsdlOperationElement.getOperation().getName()%></a></td>
-<%     
-     String documentation = wsdlOperationElement.getPropertyAsString(WSDLModelConstants.PROP_DOCUMENTATION);
-     if (documentation.length() < 1)
-       documentation = controller.getMessage("TABLE_BLANK_PLACEHOLDER");
-%>
-      <td class="tablecells"><%=documentation%></td>
-    </tr>
-<%   
-   }   
-%>
-  </table>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/services_table.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/services_table.jsp
deleted file mode 100644
index 18c99033b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/services_table.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
-   WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-   String tableContainerId = sectionHeaderInfo.getContainerId();
-   StringBuffer twistImageName = new StringBuffer("x");
-   twistImageName.append(tableContainerId);   
-%>
-<table border=0 cellpadding=6 cellspacing=0>
-  <tr>
-    <td height=20 valign="bottom" align="left" nowrap width=11><a href="javascript:twist('<%=tableContainerId%>','<%=twistImageName.toString()%>')"><img name="<%=twistImageName.toString()%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a></td>
-    <td height=20 valign="bottom" align="left" nowrap class="labels"><strong><%=wsdlPerspective.getMessage("FORM_LABEL_SERVICES")%></strong></td>
-  </tr>
-</table>
-
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
-  <tr>
-    <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" height=2 width="100%"></td>
-  </tr>
-</table>
-
-<div id="<%=tableContainerId%>" style="display:none;">
-  <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
-    <tr>
-      <th class="headercolor" width="20%"><%=wsdlPerspective.getMessage("FORM_LABEL_NAME")%></th>
-      <th class="headercolor"><%=wsdlPerspective.getMessage("FORM_LABEL_DOCUMENTATION")%></th>
-    </tr>
-<%
-   Vector serviceNodes = (Vector)sectionHeaderInfo.getOtherProperties();
-   for (int i=0;i<serviceNodes.size();i++)
-   {
-     Node serviceNode = (Node)serviceNodes.elementAt(i);
-     WSDLServiceElement wsdlServiceElement = (WSDLServiceElement)serviceNode.getTreeElement();
-%>
-    <tr>
-      <td class="tablecells"><a href="<%=response.encodeURL(controller.getPathWithContext(SelectWSDLNavigatorNodeAction.getActionLink(serviceNode.getNodeId(),false)))%>"><%=wsdlServiceElement.getService().getQName().getLocalPart()%></a></td>
-<%     
-     String documentation = wsdlServiceElement.getPropertyAsString(WSDLModelConstants.PROP_DOCUMENTATION);
-     if (documentation.length() < 1)
-       documentation = controller.getMessage("TABLE_BLANK_PLACEHOLDER");
-%>
-      <td class="tablecells"><%=documentation%></td>
-    </tr>
-<%   
-   }   
-%>
-  </table>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/SOAPEncArrayFixWFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/SOAPEncArrayFixWFragmentJSP.jsp
deleted file mode 100644
index de802b9b1..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/SOAPEncArrayFixWFragmentJSP.jsp
+++ /dev/null
@@ -1,55 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-ISOAPEncArrayFragment frag = (ISOAPEncArrayFragment)operElement.getFragmentByID(fragID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-String tableContainerID = (new StringBuffer(FragmentConstants.TABLE_ID)).append(frag.getID()).toString();
-String twistImageName = (new StringBuffer("x")).append(tableContainerID).toString();
-%>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
-  <tr>
-    <td height=25 valign="bottom" align="left" nowrap width=11>
-      <a href="javascript:twist('<%=tableContainerID%>','<%=twistImageName%>')"><img name="<%=twistImageName%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_OPENED")%>" class="twist"></a>
-    </td>
-    <td class="labels" height=25 valign="bottom" align="left" nowrap>
-      <a href="javascript:openXSDInfoDialog('<%=response.encodeURL(controller.getPathWithContext(OpenXSDInfoDialogAction.getActionLink(session.getId(),selectedNode.getNodeId(),fragID.toString())))%>')"><%=frag.getName()%></a>
-    </td>
-    <td nowrap width="90%">&nbsp;</td>
-  </tr>
-</table>
-<span id="<%=tableContainerID%>">
-<table cellpadding=0 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "fixfragtable" : "innerfixfragtable")%>">
-  <tr>
-    <td width=16>
-      <img width=16 src="<%=response.encodeURL(controller.getPathWithContext("images/space.gif"))%>">
-    </td>
-    <td>
-      <jsp:include page="/wsdl/fragment/XSDGroupSeqFixWFragmentJSP.jsp" flush="true"/>
-    </td>
-  </tr>
-</table>
-</span>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/SOAPEncArrayRFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/SOAPEncArrayRFragmentJSP.jsp
deleted file mode 100644
index 608414e05..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/SOAPEncArrayRFragmentJSP.jsp
+++ /dev/null
@@ -1,67 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node operNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)operNode.getTreeElement();
-ISOAPEncArrayFragment frag = (ISOAPEncArrayFragment)operElement.getFragmentByID(fragID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-String tableContainerIDBase = (new StringBuffer(FragmentConstants.TABLE_ID)).append(frag.getID()).toString();
-String twistImageNameBase = (new StringBuffer("x")).append(tableContainerIDBase).toString();
-String[] groupIDs = frag.getGroupIDs();
-for (int i = 0; i < groupIDs.length; i++) {
-%>
-  <table width="95%" border=0 cellpadding=3 cellspacing=0>
-    <tr>
-      <td height=25 valign="bottom" align="left" nowrap width=11>
-        <a href="javascript:twist('<%=i + tableContainerIDBase%>','<%=i + twistImageNameBase%>')"><img name="<%=i + twistImageNameBase%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_OPENED")%>" class="twist"></a>
-      </td>
-      <td class="labels" height=25 valign="bottom" align="left" nowrap>
-        <%=frag.getName()%>
-      </td>
-    </tr>
-  </table>
-  <span id="<%=i + tableContainerIDBase%>">
-  <table cellpadding=0 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "fixfragtable" : "innerfixfragtable")%>">
-<%
-    IXSDFragment[] childFragments = frag.getGroupMemberFragments(groupIDs[i]);
-    for (int j = 0; j < childFragments.length; j++) {
-      fragID.delete(0, fragID.length());
-      fragID.append(childFragments[j].getID());
-%>
-      <tr>
-        <td width=16>
-          <img width=16 src="<%=response.encodeURL(controller.getPathWithContext("images/space.gif"))%>">
-        </td>
-        <td>
-          <jsp:include page="<%=childFragments[j].getReadFragment()%>" flush="true"/>
-        </td>
-      </tr>
-<%
-    }
-%>
-  </table>
-  </span>
-<%
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/SOAPEncArrayRangeWFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/SOAPEncArrayRangeWFragmentJSP.jsp
deleted file mode 100644
index 502a699a0..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/SOAPEncArrayRangeWFragmentJSP.jsp
+++ /dev/null
@@ -1,89 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-IXSDGroupSeqFragment frag = (IXSDGroupSeqFragment)operElement.getFragmentByID(fragID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-String tableContainerID = (new StringBuffer(FragmentConstants.TABLE_ID)).append(frag.getID()).toString();
-String twistImageName = (new StringBuffer("x")).append(tableContainerID).toString();
-String nameAnchorID = (new StringBuffer(FragmentConstants.NAME_ANCHOR_ID)).append(frag.getID()).toString();
-%>
-<a name="<%=nameAnchorID%>"/>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
-  <tr>
-    <td height=25 valign="bottom" align="left" nowrap width=11>
-      <a href="javascript:twist('<%=tableContainerID%>','<%=twistImageName%>')"><img name="<%=twistImageName%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_OPENED")%>" class="twist"></a>
-    </td>
-    <td class="labels" height=25 valign="bottom" align="left" nowrap>
-      <a href="javascript:openXSDInfoDialog('<%=response.encodeURL(controller.getPathWithContext(OpenXSDInfoDialogAction.getActionLink(session.getId(),selectedNode.getNodeId(),fragID.toString())))%>')"><%=frag.getName()%></a>
-    </td>
-    <td class="labels" height=25 valign="bottom" align="left" nowrap>
-      <a href="javascript:createInstance('<%=tableContainerID%>', <%=xsdConfig.getMaxOccurs()%>, '<%=fragID%>', '<%=nameAnchorID%>')"><%=wsdlPerspective.getMessage("FORM_LINK_ADD")%></a>
-    </td>
-    <td class="labels" height=25 valign="bottom" align="left" nowrap>
-      <a href="javascript:checkMinOccursAndRemoveSelectedRows('<%=tableContainerID%>', <%=xsdConfig.getMinOccurs()%>)"><%=wsdlPerspective.getMessage("FORM_LINK_REMOVE")%></a>
-    </td>
-    <td nowrap width="90%">&nbsp;</td>
-  </tr>
-</table>
-<span id="<%=tableContainerID%>">
-<table cellpadding=3 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "rangefragtable" : "innerrangefragtable")%>">
-  <tr>
-    <th class="checkboxcells" width=10><input type="checkbox" onClick="handleCheckAllClick('<%=tableContainerID%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
-    <th class="headercolor"><%=wsdlPerspective.getMessage("FORM_LABEL_SOAP_ENC_ARRAYS")%></th>
-  </tr>
-  <%
-  String[] groupIDs = frag.getGroupIDs();
-  for (int i = 0; i < groupIDs.length || i < xsdConfig.getMinOccurs(); i++) {
-    String groupID;
-    if (i < groupIDs.length)
-      groupID = groupIDs[i];
-    else
-      groupID = frag.createGroupSeqInstance();
-    IXSDFragment[] groupMemberFragments = frag.getGroupMemberFragments(groupID);
-  %>
-  <tr>
-    <td class="checkboxcells" width=10>
-      <input type="checkbox" onClick="handleRowCheckboxClick()" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ROW_CHECK_BOX")%>">
-    </td>
-    <td class="tablecells">
-      <input type="hidden" name="<%=frag.getID()%>" value="<%=groupID%>">
-      <%
-        for (int j = 0; j < groupMemberFragments.length; j++) {
-          fragID.delete(0, fragID.length());
-          fragID.append(groupMemberFragments[j].getID());
-      %>
-      <jsp:include page="<%=groupMemberFragments[j].getWriteFragment()%>" flush="true"/>
-      <%
-        }
-      %>
-    </td>
-  </tr>
-  <%
-  }
-  %>
-</table>
-</span>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDComplexFixWFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDComplexFixWFragmentJSP.jsp
deleted file mode 100644
index 4877764eb..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDComplexFixWFragmentJSP.jsp
+++ /dev/null
@@ -1,75 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-IXSDComplexFragment frag = (IXSDComplexFragment)operElement.getFragmentByID(fragID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-String tableContainerID = (new StringBuffer(FragmentConstants.TABLE_ID)).append(frag.getID()).toString();
-String twistImageName = (new StringBuffer("x")).append(tableContainerID).toString();
-%>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
-  <tr>
-    <td height=25 valign="bottom" align="left" nowrap width=11>
-      <a href="javascript:twist('<%=tableContainerID%>','<%=twistImageName%>')"><img name="<%=twistImageName%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_OPENED")%>" class="twist"></a>
-    </td>
-    <td class="labels" height=25 valign="bottom" align="left" nowrap>
-      <a href="javascript:openXSDInfoDialog('<%=response.encodeURL(controller.getPathWithContext(OpenXSDInfoDialogAction.getActionLink(session.getId(),selectedNode.getNodeId(),fragID.toString())))%>')"><%=frag.getName()%></a>
-    </td>
-    <td nowrap width="90%">&nbsp;</td>
-  </tr>
-</table>
-<span id="<%=tableContainerID%>">
-<table cellpadding=0 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "fixfragtable" : "innerfixfragtable")%>">
-  <%
-  IXSDFragment[] childFrags = frag.getAllFragments();
-  for (int i = 0; i < xsdConfig.getMaxOccurs(); i++) {
-    IXSDFragment childFrag;
-    String childFragID;
-    if (i < childFrags.length) {
-      childFrag = childFrags[i];
-      childFragID = childFrag.getID();
-    }
-    else {
-      childFragID = frag.createComplexInstance();
-      childFrag = frag.getFragment(childFragID);
-    }
-    fragID.delete(0, fragID.length());
-    fragID.append(childFragID);
-  %>
-  <tr>
-    <td width=16>
-      <img width=16 src="<%=response.encodeURL(controller.getPathWithContext("images/space.gif"))%>">
-    </td>
-    <td>
-      <input type="hidden" name="<%=frag.getID()%>" value="<%=childFragID%>">
-      <jsp:include page="<%=childFrag.getWriteFragment()%>" flush="true"/>
-    </td>
-  </tr>
-  <%
-  }
-  %>
-</table>
-</span>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDComplexRFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDComplexRFragmentJSP.jsp
deleted file mode 100644
index 672800300..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDComplexRFragmentJSP.jsp
+++ /dev/null
@@ -1,60 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node operNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)operNode.getTreeElement();
-IXSDComplexFragment frag = (IXSDComplexFragment)operElement.getFragmentByID(fragID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-String tableContainerIDBase = (new StringBuffer(FragmentConstants.TABLE_ID)).append(frag.getID()).toString();
-String twistImageNameBase = (new StringBuffer("x")).append(tableContainerIDBase).toString();
-IXSDFragment[] childFrags = frag.getAllFragments();
-for (int i = 0; i < childFrags.length; i++) {
-  fragID.delete(0, fragID.length());
-  fragID.append(childFrags[i].getID());
-%>
-  <table width="95%" border=0 cellpadding=3 cellspacing=0>
-    <tr>
-      <td height=25 valign="bottom" align="left" nowrap width=11>
-        <a href="javascript:twist('<%=i + tableContainerIDBase%>','<%=i + twistImageNameBase%>')"><img name="<%=i + twistImageNameBase%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_OPENED")%>" class="twist"></a>
-      </td>
-      <td class="labels" height=25 valign="bottom" align="left" nowrap>
-        <%=frag.getName()%>
-      </td>
-    </tr>
-  </table>
-  <span id="<%=i + tableContainerIDBase%>">
-  <table cellpadding=0 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "fixfragtable" : "innerfixfragtable")%>">
-    <tr>
-      <td width=16>
-        <img width=16 src="<%=response.encodeURL(controller.getPathWithContext("images/space.gif"))%>">
-      </td>
-      <td>
-        <jsp:include page="<%=childFrags[i].getReadFragment()%>" flush="true"/>
-      </td>
-    </tr>
-  </table>
-  </span>
-<%
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDComplexRangeWFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDComplexRangeWFragmentJSP.jsp
deleted file mode 100644
index 6af5c1f34..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDComplexRangeWFragmentJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-IXSDComplexFragment frag = (IXSDComplexFragment)operElement.getFragmentByID(fragID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-String tableContainerID = (new StringBuffer(FragmentConstants.TABLE_ID)).append(frag.getID()).toString();
-String twistImageName = (new StringBuffer("x")).append(tableContainerID).toString();
-String nameAnchorID = (new StringBuffer(FragmentConstants.NAME_ANCHOR_ID)).append(frag.getID()).toString();
-%>
-<a name="<%=nameAnchorID%>"/>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
-  <tr>
-    <td height=25 valign="bottom" align="left" nowrap width=11>
-      <a href="javascript:twist('<%=tableContainerID%>','<%=twistImageName%>')"><img name="<%=twistImageName%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_OPENED")%>" class="twist"></a>
-    </td>
-    <td class="labels" height=25 valign="bottom" align="left" nowrap>
-      <a href="javascript:openXSDInfoDialog('<%=response.encodeURL(controller.getPathWithContext(OpenXSDInfoDialogAction.getActionLink(session.getId(),selectedNode.getNodeId(),fragID.toString())))%>')"><%=frag.getName()%></a>
-    </td>
-    <td class="labels" height=25 valign="bottom" align="left" nowrap>
-      <a href="javascript:createInstance('<%=tableContainerID%>', <%=xsdConfig.getMaxOccurs()%>, '<%=fragID%>', '<%=nameAnchorID%>')"><%=wsdlPerspective.getMessage("FORM_LINK_ADD")%></a>
-    </td>
-    <td class="labels" height=25 valign="bottom" align="left" nowrap>
-      <a href="javascript:checkMinOccursAndRemoveSelectedRows('<%=tableContainerID%>', <%=xsdConfig.getMinOccurs()%>)"><%=wsdlPerspective.getMessage("FORM_LINK_REMOVE")%></a>
-    </td>
-    <td nowrap width="90%">&nbsp;</td>
-  </tr>
-</table>
-<span id="<%=tableContainerID%>">
-<table cellpadding=3 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "rangefragtable" : "innerrangefragtable")%>">
-  <tr>
-    <th class="checkboxcells" width=10><input type="checkbox" onClick="handleCheckAllClick('<%=tableContainerID%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
-    <th class="headercolor"><%=wsdlPerspective.getMessage("FORM_LABEL_CONTENT")%></th>
-  </tr>
-  <%
-  IXSDFragment[] childFrags = frag.getAllFragments();
-  for (int i = 0; i < childFrags.length || i < xsdConfig.getMinOccurs(); i++) {
-    IXSDFragment childFrag;
-    String childFragID;
-    if (i < childFrags.length) {
-      childFrag = childFrags[i];
-      childFragID = childFrag.getID();
-    }
-    else {
-      childFragID = frag.createComplexInstance();
-      childFrag = frag.getFragment(childFragID);
-    }
-    fragID.delete(0, fragID.length());
-    fragID.append(childFragID);
-  %>
-  <tr>
-    <td class="checkboxcells" width=10>
-      <input type="checkbox" onClick="handleRowCheckboxClick()" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ROW_CHECK_BOX")%>">
-    </td>
-    <td class="tablecells">
-      <input type="hidden" name="<%=frag.getID()%>" value="<%=childFragID%>">
-      <jsp:include page="<%=childFrag.getWriteFragment()%>" flush="true"/>
-    </td>
-  </tr>
-  <%
-  }
-  %>
-</table>
-</span>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp
deleted file mode 100644
index 3a8ad8295..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp
+++ /dev/null
@@ -1,201 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*,
-                                                        org.eclipse.emf.common.util.EList,
-                                                        org.eclipse.xsd.*,
-                                                        org.w3c.dom.Element,
-                                                        org.w3c.dom.NodeList" %>
-
-<jsp:useBean id="sessionID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-
-<%!
-private static final String XMLNS_LANG = "xml:lang";
-private static final String DEFAULT_XMLNS_LANG = "en-US";
-%>
-
-<%
-HttpSession currentSession = (HttpSession)application.getAttribute(sessionID.toString());
-Controller controller = (Controller)currentSession.getAttribute("controller");
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-IXSDFragment frag = operElement.getFragmentByID(fragID.toString());
-XSDComponent xsdComponent = frag.getXSDToFragmentConfiguration().getXSDComponent();
-XSDAnnotation annotation = null;
-EList appInfoList = null;
-EList docList = null;
-if (xsdComponent instanceof XSDTypeDefinition)
-  annotation = ((XSDTypeDefinition)xsdComponent).getAnnotation();
-else if (xsdComponent instanceof XSDElementDeclaration)
-  annotation = ((XSDElementDeclaration)xsdComponent).getAnnotation();
-if (annotation != null) {
-  appInfoList = annotation.getApplicationInformation();
-  docList = annotation.getUserInformation();
-}
-String appInfoContainerID = "::appInfo";
-String xappInfoContainerID = "x::appInfo";
-String documentationContainerID = "::documentation";
-String xdocumentationContainerID = "x::documentation";
-%>
-
-<script language="javascript">
-  function twist(tableContainerId,twistImageName)
-  {
-    var tableContainer = document.getElementById(tableContainerId);
-    var twistImage = document.images[twistImageName];
-    if (tableContainer.style.display == "none")
-    {
-      tableContainer.style.display = "";
-      twistImage.src = "<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>";
-      twistImage.alt = "<%=HTMLUtils.JSMangle(controller.getMessage("ALT_TWIST_OPENED"))%>";
-    }
-    else
-    {
-      tableContainer.style.display = "none";
-      twistImage.src = "<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>";
-      twistImage.alt = "<%=HTMLUtils.JSMangle(controller.getMessage("ALT_TWIST_CLOSED"))%>";
-    }
-  }
-
-  function twistClose(tableContainerId)
-  {
-    if (document.getElementById(tableContainerId).style.display == "")
-      twist(tableContainerId,"x"+tableContainerId);
-  }
-</script>
-
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
-  <tr>
-    <td height=25 valign="bottom" align="left" nowrap width=11>
-      <a href="javascript:twist('<%=appInfoContainerID%>','<%=xappInfoContainerID%>')"><img name="<%=xappInfoContainerID%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_OPENED")%>" class="twist"></a>
-    </td>
-    <td class="labels" height=25 valign="bottom" align="left" nowrap>
-     <strong><%=wsdlPerspective.getMessage("FORM_LABEL_XSD_APPLICATION_INFORMATION")%></strong>
-    </td>
-  </tr>
-</table>
-<span id="<%=appInfoContainerID%>">
-<table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
-  <tr>
-    <th class="headercolor"><%=wsdlPerspective.getMessage("FORM_LABEL_LANGUAGE")%></th>
-    <th class="headercolor" width="100%"><%=wsdlPerspective.getMessage("FORM_LABEL_XSD_APPLICATION_INFORMATION")%></th>
-  </tr>
-  <%
-  boolean openAppInfoTable = false;
-  if (appInfoList != null) {
-    for (int i = 0; i < appInfoList.size(); i++) {
-      Element e = (Element)appInfoList.get(i);
-      String appInfoLang = e.getAttribute(XMLNS_LANG);
-      String appInfoText = null;
-      NodeList nl = e.getChildNodes();
-      for (int j = 0; j < nl.getLength(); j++) {
-        if (nl.item(j).getNodeType() == org.w3c.dom.Node.TEXT_NODE) {
-          appInfoText = nl.item(j).getNodeValue();
-          break;
-        }
-      }
-      if (appInfoText != null)
-      { 
-        openAppInfoTable = true;
-        if (appInfoText.trim().length() < 1)
-          appInfoText = controller.getMessage("TABLE_BLANK_PLACEHOLDER");
-  %>
-  <tr>
-    <td class="tablecells"><%=((appInfoLang != null && appInfoLang.length() > 0) ? appInfoLang : DEFAULT_XMLNS_LANG)%></td>
-    <td class="tablecells"><%=appInfoText%></td>
-  </tr>
-  <%
-      }
-    }
-  }
-  %>
-</table>
-</span>
-<%
-if (!openAppInfoTable) {
-%>
-<script language="javascript">
-  twistClose('<%=appInfoContainerID%>');
-</script>
-<%
-}
-%>
-
-<table>
-  <tr>
-    <td height=20>&nbsp;</td>
-  </tr>
-</table>
-
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
-  <tr>
-    <td height=25 valign="bottom" align="left" nowrap width=11>
-      <a href="javascript:twist('<%=documentationContainerID%>','<%=xdocumentationContainerID%>')"><img name="<%=xdocumentationContainerID%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_OPENED")%>" class="twist"></a>
-    </td>
-    <td class="labels" height=25 valign="bottom" align="left" nowrap>
-     <strong><%=wsdlPerspective.getMessage("FORM_LABEL_XSD_DOCUMENTATION")%></strong>
-    </td>
-  </tr>
-</table>
-<span id="<%=documentationContainerID%>">
-<table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
-  <tr>
-    <th class="headercolor"><%=wsdlPerspective.getMessage("FORM_LABEL_LANGUAGE")%></th>
-    <th class="headercolor" width="100%"><%=wsdlPerspective.getMessage("FORM_LABEL_XSD_DOCUMENTATION")%></th>
-  </tr>
-  <%
-  boolean openDocTable = false;
-  if (docList != null) {
-    for (int i = 0; i < docList.size(); i++) {
-      Element e = (Element)docList.get(i);
-      String docLang = e.getAttribute(XMLNS_LANG);
-      String docText = null;
-      NodeList nl = e.getChildNodes();
-      for (int j = 0; j < nl.getLength(); j++) {
-        if (nl.item(j).getNodeType() == org.w3c.dom.Node.TEXT_NODE) {
-          docText = nl.item(j).getNodeValue();
-          break;
-        }
-      }      
-      if (docText != null)
-      {
-        openDocTable = true;
-        if (docText.trim().length() < 1)
-          docText = controller.getMessage("TABLE_BLANK_PLACEHOLDER");
-  %>
-  <tr>
-    <td class="tablecells"><%=((docLang != null && docLang.length() > 0) ? docLang : DEFAULT_XMLNS_LANG)%></td>
-    <td class="tablecells"><%=docText%></td>
-  </tr>
-  <%
-      }
-    }
-  }
-  %>
-</table>
-</span>
-<%
-if (!openDocTable) {
-%>
-<script language="javascript">
-  twistClose('<%=documentationContainerID%>');
-</script>
-<%
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDDefaultRFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDDefaultRFragmentJSP.jsp
deleted file mode 100644
index c00694f7c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDDefaultRFragmentJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.Node,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*,
-                                                        org.w3c.dom.Element,
-                                                        javax.xml.rpc.NamespaceConstants,
-                                                        java.util.Hashtable" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node operNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)operNode.getTreeElement();
-IXSDFragment frag = operElement.getFragmentByID(fragID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-Hashtable soapEnvelopeNamespaceTable = new Hashtable();
-// TODO: Replace "SOAP-ENV" by NamespaceConstants.NSPREFIX_SOAP_ENVELOPE (="soapenv")
-soapEnvelopeNamespaceTable.put(NamespaceConstants.NSURI_SOAP_ENVELOPE,"SOAP-ENV");
-soapEnvelopeNamespaceTable.put(NamespaceConstants.NSURI_SCHEMA_XSI,NamespaceConstants.NSPREFIX_SCHEMA_XSI);
-soapEnvelopeNamespaceTable.put(NamespaceConstants.NSURI_SCHEMA_XSD,NamespaceConstants.NSPREFIX_SCHEMA_XSD);
-Element[] instanceDocuments = frag.genInstanceDocumentsFromParameterValues(!operElement.isUseLiteral(), soapEnvelopeNamespaceTable, XMLUtils.createNewDocument(null));
-StringBuffer sb = new StringBuffer();
-for (int i = 0; i < instanceDocuments.length; i++) {
-  if (instanceDocuments[i] == null)
-    continue;
-  sb.append(XMLUtils.serialize(instanceDocuments[i], true));
-  sb.append(HTMLUtils.LINE_SEPARATOR);
-}
-%>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
-  <tr>
-    <td class="labels" height=25 valign="bottom" align="left" nowrap>
-      <label for="<%=frag.getID()%>"><%=frag.getName()%></label>
-    </td>
-  </tr>
-</table>
-<table cellpadding=3 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "fixfragtable" : "innerfixfragtable")%>">
-  <tr>
-    <td>
-      <textarea id="<%=frag.getID()%>" name="<%=frag.getID()%>" class="textareaenter" readonly><%=sb.toString()%></textarea>
-<%
-      /*
-      StringBuffer url = new StringBuffer();
-      url.append(response.encodeURL(controller.getPathWithContext("/wsdl/fragment/XSDDefaultRFragmentXML.jsp?")));
-      url.append(WSDLActionInputs.FRAGMENT_ID).append("=").append(fragID).append("&");
-      url.append(ActionInputs.NODEID).append("=").append(nodeID).append("&");
-      url.append(ActionInputs.SESSIONID).append("=").append(session.getId());
-      */
-%>
-      <!--
-      <iframe src="" width="100%" height="150px"></iframe>
-      -->
-    </td>
-  </tr>
-</table>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDDefaultRFragmentXML.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDDefaultRFragmentXML.jsp
deleted file mode 100644
index 6a908182d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDDefaultRFragmentXML.jsp
+++ /dev/null
@@ -1,98 +0,0 @@
-<%@ page contentType="text/xml; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*,
-                                                        org.eclipse.xsd.*,
-                                                        org.w3c.dom.Element,
-                                                        org.xml.sax.*,
-                                                        org.xml.sax.helpers.*,
-                                                        javax.xml.rpc.NamespaceConstants,
-                                                        javax.xml.parsers.*,
-                                                        java.io.*,
-                                                        java.util.*" %>
-<%
-String fragID = request.getParameter(WSDLActionInputs.FRAGMENT_ID);
-String nodeID = request.getParameter(ActionInputs.NODEID);
-String sessionId = request.getParameter(ActionInputs.SESSIONID);
-HttpSession currentSession = (HttpSession)application.getAttribute(sessionId);
-Controller controller = (Controller)currentSession.getAttribute("controller");
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node operNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID));
-WSDLOperationElement operElement = (WSDLOperationElement)operNode.getTreeElement();
-IXSDFragment frag = operElement.getFragmentByID(fragID);
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-Hashtable soapEnvelopeNamespaceTable = new Hashtable();
-// TODO: Replace "SOAP-ENV" by NamespaceConstants.NSPREFIX_SOAP_ENVELOPE (="soapenv")
-soapEnvelopeNamespaceTable.put(NamespaceConstants.NSURI_SOAP_ENVELOPE,"SOAP-ENV");
-soapEnvelopeNamespaceTable.put(NamespaceConstants.NSURI_SCHEMA_XSI,NamespaceConstants.NSPREFIX_SCHEMA_XSI);
-soapEnvelopeNamespaceTable.put(NamespaceConstants.NSURI_SCHEMA_XSD,NamespaceConstants.NSPREFIX_SCHEMA_XSD);
-Element[] instanceDocuments = new Element[0];
-StringBuffer sb = null;
-try
-{
-  instanceDocuments = frag.genInstanceDocumentsFromParameterValues(!operElement.isUseLiteral(), soapEnvelopeNamespaceTable, XMLUtils.createNewDocument(null));
-  if (instanceDocuments.length == 1)
-  {
-    byte[] b = XMLUtils.serialize(instanceDocuments[0], true).getBytes(HTMLUtils.UTF8_ENCODING);
-    ByteArrayInputStream bais = new ByteArrayInputStream(b);
-    SAXParserFactory saxFactory = SAXParserFactory.newInstance();
-    saxFactory.setValidating(true);
-    SAXParser saxParser = saxFactory.newSAXParser();
-    saxParser.parse(bais,
-      new DefaultHandler()
-      {
-        public void error(SAXParseException e) throws SAXException
-        {
-          throw e;
-        }
-    
-        public void fatalError(SAXParseException e) throws SAXException
-        {
-          throw e;
-        }
-    
-        public void warning(SAXParseException e) throws SAXException
-        {
-          throw e;
-        }
-      });
-    bais.close();
-    sb = new StringBuffer(new String(b));
-  }
-}
-catch (Throwable t)
-{
-}
-if (sb == null)
-{
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=frag.getName()%></title>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-  sb = new StringBuffer();
-  response.setContentType("text/html; charset=UTF-8");
-  for (int i = 0; i < instanceDocuments.length; i++) {
-    if (instanceDocuments[i] == null)
-      continue;
-    sb.append(HTMLUtils.charactersToHTMLEntities(XMLUtils.serialize(instanceDocuments[i], true)));
-  }
-%>
-<%=sb.toString()%>
-</body>
-</html>
-<%
-}
-else
-{
-%>
-<%=sb.toString()%>
-<%
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDDefaultWFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDDefaultWFragmentJSP.jsp
deleted file mode 100644
index 10a2f7f14..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDDefaultWFragmentJSP.jsp
+++ /dev/null
@@ -1,55 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-IXSDFragment frag = operElement.getFragmentByID(fragID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-String param = frag.getParameterValue(frag.getID(), 0);
-%>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
-  <tr>
-    <td class="labels" height=25 valign="bottom" align="left" nowrap>
-      <label for="<%=frag.getID()%>"><a href="javascript:openXSDInfoDialog('<%=response.encodeURL(controller.getPathWithContext(OpenXSDInfoDialogAction.getActionLink(session.getId(),selectedNode.getNodeId(),fragID.toString())))%>')"><%=frag.getName()%></a></label>
-    </td>
-    <td>
-      <%
-      if (!frag.validateAllParameterValues()) {
-      %>
-      <%=HTMLUtils.redAsterisk()%>
-      <%
-      }
-      %>
-    </td>
-    <td nowrap width="90%">&nbsp;</td>
-  </tr>
-</table>
-<table cellpadding=3 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "fixfragtable" : "innerfixfragtable")%>">
-  <tr>
-    <td>
-      <textarea id="<%=frag.getID()%>" name="<%=frag.getID()%>" class="textareaenter"><%=((param != null) ? param : "")%></textarea>
-    </td>
-  </tr>
-</table>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDDelegationRFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDDelegationRFragmentJSP.jsp
deleted file mode 100644
index d0931f294..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDDelegationRFragmentJSP.jsp
+++ /dev/null
@@ -1,38 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node operNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)operNode.getTreeElement();
-IXSDDelegationFragment wrapperFragment = (IXSDDelegationFragment)operElement.getFragmentByID(fragID.toString());
-IXSDFragment delegationFragment = wrapperFragment.getXSDDelegationFragment();
-XSDToFragmentConfiguration xsdConfig = wrapperFragment.getXSDToFragmentConfiguration();
-fragID.delete(0, fragID.length());
-fragID.append(delegationFragment.getID());
-%>
-<table cellpadding=0 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "fixfragtable" : "innerfixfragtable")%>">
-  <tr>
-    <td>
-      <jsp:include page="<%=delegationFragment.getReadFragment()%>" flush="true"/>
-    </td>
-  </tr>
-</table>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDDelegationWFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDDelegationWFragmentJSP.jsp
deleted file mode 100644
index c34607a31..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDDelegationWFragmentJSP.jsp
+++ /dev/null
@@ -1,38 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-IXSDDelegationFragment wrapperFragment = (IXSDDelegationFragment)operElement.getFragmentByID(fragID.toString());
-IXSDFragment delegationFragment = wrapperFragment.getXSDDelegationFragment();
-XSDToFragmentConfiguration xsdConfig = wrapperFragment.getXSDToFragmentConfiguration();
-fragID.delete(0, fragID.length());
-fragID.append(delegationFragment.getID());
-%>
-<table cellpadding=0 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "fixfragtable" : "innerfixfragtable")%>">
-  <tr>
-    <td>
-      <jsp:include page="<%=delegationFragment.getWriteFragment()%>" flush="true"/>
-    </td>
-  </tr>
-</table>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDEmptyRFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDEmptyRFragmentJSP.jsp
deleted file mode 100644
index ba3ceeed5..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDEmptyRFragmentJSP.jsp
+++ /dev/null
@@ -1,17 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8"%>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDEmptyWFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDEmptyWFragmentJSP.jsp
deleted file mode 100644
index 89a494313..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDEmptyWFragmentJSP.jsp
+++ /dev/null
@@ -1,77 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-IXSDFragment frag = operElement.getFragmentByID(fragID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-int minOccurs = xsdConfig.getMinOccurs();
-int maxOccurs = xsdConfig.getMaxOccurs();
-if (minOccurs == maxOccurs) {
-%>
-<input type="hidden" name="<%=frag.getID()%>" value="<%=maxOccurs%>"/>
-<%
-} else {
-  String[] params = frag.getParameterValues(frag.getID());
-%>
-  <table cellpadding=3 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "fixfragtable" : "innerfixfragtable")%>">
-    <tr>
-      <td>
-        <label for="<%=frag.getID()%>"><%=wsdlPerspective.getMessage("FORM_LABEL_OCCURANCE")%>&nbsp;<a href="javascript:openXSDInfoDialog('<%=response.encodeURL(controller.getPathWithContext(OpenXSDInfoDialogAction.getActionLink(session.getId(),selectedNode.getNodeId(),fragID.toString())))%>')"><%=frag.getName()%></a></label>
-      </td>
-    </tr>
-    <tr>
-      <td>
-      <%
-      if (maxOccurs != FragmentConstants.UNBOUNDED) {
-      %>
-        <select id="<%=frag.getID()%>" name="<%=frag.getID()%>" class="selectlist">
-        <%
-        for (int i = minOccurs; i <= maxOccurs; i++) {
-        %>
-          <option value="<%=i%>" <% if (params != null && i == params.length) { %>selected<% } %>><%=i%>
-        <%
-        }
-        %>
-        </select>
-      <%
-      } else {
-      %>
-        <input type="text" id="<%=frag.getID()%>" name="<%=frag.getID()%>" value="<%=((params != null) ? String.valueOf(params.length) : "")%>" class="tabletextenter">
-      <%
-        if (!frag.validateParameterValues(frag.getID())) {
-        %>
-        <%=HTMLUtils.redAsterisk()%>
-        <%
-        }
-      }
-      %>
-      </td>
-    </tr>
-  </table>
-<%
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDGroupAllWFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDGroupAllWFragmentJSP.jsp
deleted file mode 100644
index 159029224..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDGroupAllWFragmentJSP.jsp
+++ /dev/null
@@ -1,190 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-IXSDGroupAllFragment frag = (IXSDGroupAllFragment)operElement.getFragmentByID(fragID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-boolean enableGroup = (xsdConfig.getMinOccurs() > 0 || frag.getGroupIDs().length > 0);
-String tableContainerID = (new StringBuffer(FragmentConstants.TABLE_ID)).append(frag.getID()).toString();
-String twistImageName = (new StringBuffer("x")).append(tableContainerID).toString();
-String groupID = frag.getGroupAllInstance();
-String groupCheckboxID = (new StringBuffer(FragmentConstants.XSD_ALL_GROUP_ID)).append(frag.getID()).toString();
-String groupMemberRadioID = (new StringBuffer(groupCheckboxID)).append(frag.getID()).toString();
-%>
-<script language="javascript">
-  function initGroupAll(tableContainerID, twistImageName, fragID, groupID, groupCheckboxID, enable) {
-    var checkbox = document.getElementById(groupCheckboxID);
-    checkbox.checked = enable;
-    enableGroupAll(tableContainerID, twistImageName, fragID, groupID, checkbox);
-  }
-
-  function enableGroupAll(tableContainerID, twistImageName, fragID, groupID, checkbox) {
-    var tableContainer = document.getElementById(tableContainerID);
-    var checkboxTable = checkbox.parentNode.parentNode.parentNode;
-    if (checkbox.checked) {
-      if (tableContainer.style.display == "none")
-        twist(tableContainerID, twistImageName);
-      checkbox.name = fragID;
-      checkbox.value = groupID;
-    }
-    else {
-      if (tableContainer.style.display == "")
-        twist(tableContainerID, twistImageName);
-      checkbox.name = "";
-      checkbox.value = "";
-    }
-    var tds = checkboxTable.getElementsByTagName("td");
-    var checkboxCellIndex = checkbox.parentNode.cellIndex;
-    for (var i = 0; i < tds.length; i++) {
-      if (i == checkboxCellIndex || checkbox.checked)
-        tds.item(i).style.display = "";
-      else
-        tds.item(i).style.display = "none";
-    }
-  }
-
-  function groupAllOrderingMoveUp(tableContainerID) {
-    var table = getTable(tableContainerID);
-    if (table.rows[numberOfHeaderRows].cells[0].getElementsByTagName("input").item(0).checked) {
-      alert('<%=wsdlPerspective.getMessage("MSG_ERROR_CANNOT_MOVE_FIRST_ELEMENT_UP")%>');
-      return;
-    }
-    for (var i = numberOfHeaderRows + 1; i < table.rows.length; i++) {
-      if (table.rows[i].cells[0].getElementsByTagName("input").item(0).checked) {
-        swapRows(table, i-1, i);
-        table.rows[i-1].cells[0].getElementsByTagName("input").item(0).checked = true;
-        return;
-      }
-    }
-    alert('<%=controller.getWSDLPerspective().getMessage("MSG_ERROR_NOTHING_SELECTED")%>');
-  }
-
-  function groupAllOrderingMoveDown(tableContainerID) {
-    var table = getTable(tableContainerID);
-    if (table.rows[table.rows.length - 1].cells[0].getElementsByTagName("input").item(0).checked) {
-      alert('<%=wsdlPerspective.getMessage("MSG_ERROR_CANNOT_MOVE_LAST_ELEMENT_DOWN")%>');
-      return;
-    }
-    for (var i = numberOfHeaderRows; i < table.rows.length - 1; i++) {
-      if (table.rows[i].cells[0].getElementsByTagName("input").item(0).checked) {
-        swapRows(table, i, i+1);
-        table.rows[i+1].cells[0].getElementsByTagName("input").item(0).checked = true;
-        return;
-      }
-    }
-    alert('<%=controller.getWSDLPerspective().getMessage("MSG_ERROR_NOTHING_SELECTED")%>');
-  }
-
-  <%
-  // rowIndex1 must be smaller than rowIndex2 in order to work
-  %>
-  function swapRows(table, rowIndex1, rowIndex2) {
-    var row1ChildNodes = cloneArray(table.rows[rowIndex1].childNodes);
-    var row2ChildNodes = cloneArray(table.rows[rowIndex2].childNodes);
-    table.deleteRow(rowIndex2);
-    table.deleteRow(rowIndex1);
-    var row1 = table.insertRow(rowIndex1);
-    var row2 = table.insertRow(rowIndex2);
-    appendToRow(row1, row2ChildNodes);
-    appendToRow(row2, row1ChildNodes);
-  }
-
-  function cloneArray(oldArray) {
-    var arrayClone = new Array();
-    for (var i = 0; i < oldArray.length; i++) {
-      arrayClone[i] = oldArray[i].cloneNode(true);
-    }
-    return arrayClone;
-  }
-
-  function appendToRow(row, nodesArray) {
-    for (var i = 0; i < nodesArray.length; i++) {
-      row.appendChild(nodesArray[i]);
-    }
-  }
-</script>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
-  <tr>
-    <td height=25 valign="bottom" align="left" nowrap width=11>
-      <a href="javascript:twist('<%=tableContainerID%>','<%=twistImageName%>')"><img name="<%=twistImageName%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_OPENED")%>" class="twist"></a>
-    </td>
-    <%
-    if (xsdConfig.getMinOccurs() > 0) {
-    %>
-    <input type="hidden" name="<%=frag.getID()%>" value="<%=groupID%>">
-    <%
-    }
-    else {
-    %>
-    <td class="labels" height=25 valign="bottom" align="left" nowrap>
-      <input type="checkbox" id="<%=groupCheckboxID%>" name="<%=frag.getID()%>" value="<%=groupID%>" title="<%=wsdlPerspective.getMessage("FORM_CONTROL_TITLE_ENABLE_DISABLE_GROUP")%>" onClick="javascript:enableGroupAll('<%=tableContainerID%>', '<%=twistImageName%>', '<%=frag.getID()%>', '<%=groupID%>', this)" checked><label for="<%=groupCheckboxID%>"><%=wsdlPerspective.getMessage("FORM_LABEL_ENABLE_DISABLE_GROUP")%></label>
-    </td>
-    <%
-    }
-    %>
-    <td class="labels" height=25 valign="bottom" align="left" nowrap>
-      <a href="javascript:groupAllOrderingMoveUp('<%=tableContainerID%>')"><%=wsdlPerspective.getMessage("FORM_LABEL_GROUP_ALL_ORDERING_MOVE_UP")%></a>
-    </td>
-    <td class="labels" height=25 valign="bottom" align="left" nowrap>
-      <a href="javascript:groupAllOrderingMoveDown('<%=tableContainerID%>')"><%=wsdlPerspective.getMessage("FORM_LABEL_GROUP_ALL_ORDERING_MOVE_DOWN")%></a>
-    </td>
-    <td nowrap width="90%">&nbsp;</td>
-  </tr>
-</table>
-<span id="<%=tableContainerID%>">
-<table cellpadding=3 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "rangefragtable" : "innerrangefragtable")%>">
-  <tr>
-    <th class="headercolor" width=10></th>
-    <th class="headercolor"><%=wsdlPerspective.getMessage("FORM_LABEL_ELEMENTS")%></th>
-  </tr>
-  <%
-  IXSDFragment[] groupMemberFragments = frag.getGroupMemberFragments(groupID);
-  for (int i = 0; i < groupMemberFragments.length; i++) {
-    fragID.delete(0, fragID.length());
-    fragID.append(groupMemberFragments[i].getID());
-  %>
-  <tr>
-    <td class="tablecells">
-      <input type="radio" class="radio" name="<%=groupMemberRadioID%>" value="<%=fragID.toString()%>" title="<%=wsdlPerspective.getMessage("FORM_CONTROL_TITLE_SELECT_ELEMENT_IN_GROUP")%>">
-    </td>
-    <td class="tablecells" width="100%">
-      <input type="hidden" name="<%=groupID%>" value="<%=fragID.toString()%>">
-      <jsp:include page="<%=groupMemberFragments[i].getWriteFragment()%>" flush="true"/>
-    </td>
-  </tr>
-  <%
-  }
-  %>
-</table>
-</span>
-<%
-if (!enableGroup) {
-%>
-  <script language="javascript">
-    initGroupAll('<%=tableContainerID%>', '<%=twistImageName%>', '<%=frag.getID()%>', '<%=groupID%>', '<%=groupCheckboxID%>', <%=enableGroup%>);
-  </script>
-<%
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDGroupChoiceFixWFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDGroupChoiceFixWFragmentJSP.jsp
deleted file mode 100644
index 054cf0cdf..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDGroupChoiceFixWFragmentJSP.jsp
+++ /dev/null
@@ -1,113 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.xsd.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-
-<script language="javascript">
-  function choose(select) {
-    for (var i = 0; i < select.options.length; i++) {
-      var tableContainerID = '<%=FragmentConstants.TABLE_ID%>';
-      tableContainerID += select.options(i).value;
-      showTable(tableContainerID, select.options(i).selected);
-    }
-  }
-
-  function showTable(tableContainerID, show) {
-    var tableContainer = document.getElementById(tableContainerID);
-    if (show)
-      tableContainer.style.display = "";
-    else
-      tableContainer.style.display = "none";
-  }
-</script>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-IXSDGroupChoiceFragment frag = (IXSDGroupChoiceFragment)operElement.getFragmentByID(fragID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-%>
-<table cellpadding=3 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "rangefragtable" : "innerrangefragtable")%>">
-  <tr>
-    <th class="headercolor" nowrap><%=wsdlPerspective.getMessage("FORM_LABEL_CHOICES")%></th>
-    <th class="headercolor" width="100%" nowrap><%=wsdlPerspective.getMessage("FORM_LABEL_ELEMENTS")%></th>
-  </tr>
-<%
-  XSDParticle[] choices = frag.getChoices();
-  String[] groupIDs = frag.getGroupIDs();
-  for (int i = 0; i < xsdConfig.getMaxOccurs(); i++) {
-    String groupID;
-    int choiceIndex;
-    if (i < groupIDs.length) {
-      groupID = groupIDs[i];
-      choiceIndex = frag.getChoiceIndex(groupID);
-    }
-    else {
-      groupID = frag.createGroupChoiceInstance(0);
-      choiceIndex = 0;
-    }
-    IXSDFragment[] choiceFrags = frag.getGroupMemberFragments(groupID);
-%>
-    <tr>
-      <td class="tablecells">
-        <input type="hidden" name="<%=frag.getID()%>" value="<%=groupID%>">
-        <select id="<%=groupID%>" name="<%=groupID%>" onChange="javascript:choose(this)" title="<%=wsdlPerspective.getMessage("FORM_CONTROL_TITLE_SELECT_CHOICES")%>">
-<%
-          for (int j = 0; j < choiceFrags.length; j++) {
-            XSDElementDeclaration xsdElement = (XSDElementDeclaration)choiceFrags[j].getXSDToFragmentConfiguration().getXSDComponent();
-            if (j == choiceIndex) {
-%>
-              <option value="<%=choiceFrags[j].getID()%>" selected><%=xsdElement.getQName()%>
-<%
-            }
-            else {
-%>
-              <option value="<%=choiceFrags[j].getID()%>"><%=xsdElement.getQName()%>
-<%
-            }
-          }
-%>
-        </select>
-      </td>
-      <td class="tablecells">
-<%
-        for (int j = 0; j < choiceFrags.length; j++) {
-          fragID.delete(0, fragID.length());
-          fragID.append(choiceFrags[j].getID());
-          String choiceFragTableContainerID = (new StringBuffer(FragmentConstants.TABLE_ID)).append(choiceFrags[j].getID()).toString();
-%>
-          <span id="<%=choiceFragTableContainerID%>">
-            <jsp:include page="<%=choiceFrags[j].getWriteFragment()%>" flush="true"/>
-          </span>
-          <script language="javascript">
-            showTable('<%=choiceFragTableContainerID%>', <%=(j == choiceIndex)%>);
-          </script>
-<%
-        }
-%>
-      </td>
-    </tr>
-<%
-  }
-%>
-</table>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDGroupChoiceRFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDGroupChoiceRFragmentJSP.jsp
deleted file mode 100644
index 494cc1c4d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDGroupChoiceRFragmentJSP.jsp
+++ /dev/null
@@ -1,79 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node operNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)operNode.getTreeElement();
-IXSDGroupChoiceFragment frag = (IXSDGroupChoiceFragment)operElement.getFragmentByID(fragID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-String tableContainerIDBase = (new StringBuffer(FragmentConstants.TABLE_ID)).append(frag.getID()).toString();
-String twistImageNameBase = (new StringBuffer("x")).append(tableContainerIDBase).toString();
-String[] groupIDs = frag.getGroupIDs();
-if (groupIDs.length == 1) {
-  int choiceIndex = frag.getChoiceIndex(groupIDs[0]);
-  IXSDFragment choiceFrag = frag.getGroupMemberFragments(groupIDs[0])[choiceIndex];
-  fragID.delete(0, fragID.length());
-  fragID.append(choiceFrag.getID());
-%>
-  <table cellpadding=0 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "fixfragtable" : "innerfixfragtable")%>">
-    <tr>
-      <td>
-        <jsp:include page="<%=choiceFrag.getReadFragment()%>" flush="true"/>
-      </td>
-    </tr>
-  </table>
-<%
-}
-else {
-  for (int i = 0; i < groupIDs.length; i++) {
-    int choiceIndex = frag.getChoiceIndex(groupIDs[i]);
-    IXSDFragment choiceFrag = frag.getGroupMemberFragments(groupIDs[i])[choiceIndex];
-    fragID.delete(0, fragID.length());
-    fragID.append(choiceFrag.getID());
-%>
-    <table width="95%" border=0 cellpadding=3 cellspacing=0>
-      <tr>
-        <td height=25 valign="bottom" align="left" nowrap width=11>
-          <a href="javascript:twist('<%=i + tableContainerIDBase%>','<%=i + twistImageNameBase%>')"><img name="<%=i + twistImageNameBase%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_OPENED")%>" class="twist"></a>
-        </td>
-        <td class="labels" height=25 valign="bottom" align="left" nowrap>
-          <%=wsdlPerspective.getMessage("FORM_LABEL_GROUP_NUMBER", String.valueOf(i + 1))%>
-        </td>
-      </tr>
-    </table>
-    <span id="<%=i + tableContainerIDBase%>">
-    <table cellpadding=0 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "fixfragtable" : "innerfixfragtable")%>">
-      <tr>
-        <td width=16>
-          <img width=16 src="<%=response.encodeURL(controller.getPathWithContext("images/space.gif"))%>">
-        </td>
-        <td>
-          <jsp:include page="<%=choiceFrag.getReadFragment()%>" flush="true"/>
-        </td>
-      </tr>
-    </table>
-    </span>
-<%
-  }
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDGroupChoiceRangeWFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDGroupChoiceRangeWFragmentJSP.jsp
deleted file mode 100644
index e9674b8b0..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDGroupChoiceRangeWFragmentJSP.jsp
+++ /dev/null
@@ -1,136 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.xsd.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-
-<script language="javascript">
-  function choose(select) {
-    for (var i = 0; i < select.options.length; i++) {
-      var tableContainerID = '<%=FragmentConstants.TABLE_ID%>';
-      tableContainerID += select.options(i).value;
-      showTable(tableContainerID, select.options(i).selected);
-    }
-  }
-
-  function showTable(tableContainerID, show) {
-    var tableContainer = document.getElementById(tableContainerID);
-    if (show)
-      tableContainer.style.display = "";
-    else
-      tableContainer.style.display = "none";
-  }
-</script>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-IXSDGroupChoiceFragment frag = (IXSDGroupChoiceFragment)operElement.getFragmentByID(fragID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-String tableContainerID = (new StringBuffer(FragmentConstants.TABLE_ID)).append(frag.getID()).toString();
-String twistImageName = (new StringBuffer("x")).append(tableContainerID).toString();
-String nameAnchorID = (new StringBuffer(FragmentConstants.NAME_ANCHOR_ID)).append(frag.getID()).toString();
-%>
-<a name="<%=nameAnchorID%>"/>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
-  <tr>
-    <td height=25 valign="bottom" align="left" nowrap width=11>
-      <a href="javascript:twist('<%=tableContainerID%>','<%=twistImageName%>')"><img name="<%=twistImageName%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_OPENED")%>" class="twist"></a>
-    </td>
-    <td class="labels" height=25 valign="bottom" align="left" nowrap>
-      <a href="javascript:createInstance('<%=tableContainerID%>', <%=xsdConfig.getMaxOccurs()%>, '<%=fragID%>', '<%=nameAnchorID%>')"><%=wsdlPerspective.getMessage("FORM_LINK_ADD")%></a>
-    </td>
-    <td class="labels" height=25 valign="bottom" align="left" nowrap>
-      <a href="javascript:checkMinOccursAndRemoveSelectedRows('<%=tableContainerID%>', <%=xsdConfig.getMinOccurs()%>)"><%=wsdlPerspective.getMessage("FORM_LINK_REMOVE")%></a>
-    </td>
-    <td nowrap width="90%">&nbsp;</td>
-  </tr>
-</table>
-<span id="<%=tableContainerID%>">
-<table cellpadding=3 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "rangefragtable" : "innerrangefragtable")%>">
-  <tr>
-    <th class="checkboxcells" width=10><input type="checkbox" onClick="handleCheckAllClick('<%=tableContainerID%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
-    <th class="headercolor" nowrap><%=wsdlPerspective.getMessage("FORM_LABEL_CHOICES")%></th>
-    <th class="headercolor" width="100%" nowrap><%=wsdlPerspective.getMessage("FORM_LABEL_ELEMENTS")%></th>
-  </tr>
-<%
-  XSDParticle[] choices = frag.getChoices();
-  String[] groupIDs = frag.getGroupIDs();
-  for (int i = 0; i < groupIDs.length || i < xsdConfig.getMinOccurs(); i++) {
-    String groupID;
-    int choiceIndex;
-    if (i < groupIDs.length) {
-      groupID = groupIDs[i];
-      choiceIndex = frag.getChoiceIndex(groupID);
-    }
-    else {
-      groupID = frag.createGroupChoiceInstance(0);
-      choiceIndex = 0;
-    }
-    IXSDFragment[] choiceFrags = frag.getGroupMemberFragments(groupID);
-%>
-    <tr>
-      <td class="checkboxcells" width=10>
-        <input type="checkbox" onClick="handleRowCheckboxClick()" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ROW_CHECK_BOX")%>">
-      </td>
-      <td class="tablecells">
-        <input type="hidden" name="<%=frag.getID()%>" value="<%=groupID%>">
-        <select id="<%=groupID%>" name="<%=groupID%>" onChange="javascript:choose(this)" title="<%=wsdlPerspective.getMessage("FORM_CONTROL_TITLE_SELECT_CHOICES")%>">
-<%
-          for (int j = 0; j < choiceFrags.length; j++) {
-            XSDElementDeclaration xsdElement = (XSDElementDeclaration)choiceFrags[j].getXSDToFragmentConfiguration().getXSDComponent();
-            if (j == choiceIndex) {
-%>
-              <option value="<%=choiceFrags[j].getID()%>" selected><%=xsdElement.getQName()%>
-<%
-            }
-            else {
-%>
-              <option value="<%=choiceFrags[j].getID()%>"><%=xsdElement.getQName()%>
-<%
-            }
-          }
-%>
-        </select>
-      </td>
-      <td class="tablecells">
-<%
-        for (int j = 0; j < choiceFrags.length; j++) {
-          fragID.delete(0, fragID.length());
-          fragID.append(choiceFrags[j].getID());
-          String choiceFragTableContainerID = (new StringBuffer(FragmentConstants.TABLE_ID)).append(choiceFrags[j].getID()).toString();
-%>
-          <span id="<%=choiceFragTableContainerID%>">
-            <jsp:include page="<%=choiceFrags[j].getWriteFragment()%>" flush="true"/>
-          </span>
-          <script language="javascript">
-            showTable('<%=choiceFragTableContainerID%>', <%=(j == choiceIndex)%>);
-          </script>
-<%
-        }
-%>
-      </td>
-    </tr>
-<%
-  }
-%>
-</table>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDGroupRFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDGroupRFragmentJSP.jsp
deleted file mode 100644
index 40d7db597..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDGroupRFragmentJSP.jsp
+++ /dev/null
@@ -1,89 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node operNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)operNode.getTreeElement();
-IXSDGroupFragment frag = (IXSDGroupFragment)operElement.getFragmentByID(fragID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-String tableContainerIDBase = (new StringBuffer(FragmentConstants.TABLE_ID)).append(frag.getID()).toString();
-String twistImageNameBase = (new StringBuffer("x")).append(tableContainerIDBase).toString();
-String[] groupIDs = frag.getGroupIDs();
-if (groupIDs.length == 1) {
-  IXSDFragment[] groupMemberFragments = frag.getGroupMemberFragments(groupIDs[0]);
-%>
-  <table cellpadding=0 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "fixfragtable" : "innerfixfragtable")%>">
-<%
-  for (int i = 0; i < groupMemberFragments.length; i++) {
-    fragID.delete(0, fragID.length());
-    fragID.append(groupMemberFragments[i].getID());
-%>
-    <tr>
-      <td>
-        <jsp:include page="<%=groupMemberFragments[i].getReadFragment()%>" flush="true"/>
-      </td>
-    </tr>
-<%
-  }
-%>
-  </table>
-<%
-}
-else {
-  for (int i = 0; i < groupIDs.length; i++) {
-    IXSDFragment[] groupMemberFragments = frag.getGroupMemberFragments(groupIDs[i]);
-%>
-    <table width="95%" border=0 cellpadding=3 cellspacing=0>
-      <tr>
-        <td height=25 valign="bottom" align="left" nowrap width=11>
-          <a href="javascript:twist('<%=i + tableContainerIDBase%>','<%=i + twistImageNameBase%>')"><img name="<%=i + twistImageNameBase%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_OPENED")%>" class="twist"></a>
-        </td>
-        <td class="labels" height=25 valign="bottom" align="left" nowrap>
-          <%=wsdlPerspective.getMessage("FORM_LABEL_GROUP_NUMBER", String.valueOf(i + 1))%>
-        </td>
-      </tr>
-    </table>
-    <span id="<%=i + tableContainerIDBase%>">
-    <table cellpadding=0 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "fixfragtable" : "innerfixfragtable")%>">
-<%
-    for (int j = 0; j < groupMemberFragments.length; j++) {
-      fragID.delete(0, fragID.length());
-      fragID.append(groupMemberFragments[j].getID());
-%>
-      <tr>
-        <td width=16>
-          <img width=16 src="<%=response.encodeURL(controller.getPathWithContext("images/space.gif"))%>">
-        </td>
-        <td>
-          <jsp:include page="<%=groupMemberFragments[j].getReadFragment()%>" flush="true"/>
-        </td>
-      </tr>
-<%
-    }
-%>
-    </table>
-    </span>
-<%
-  }
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDGroupSeqFixWFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDGroupSeqFixWFragmentJSP.jsp
deleted file mode 100644
index 55d81c059..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDGroupSeqFixWFragmentJSP.jsp
+++ /dev/null
@@ -1,55 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-IXSDGroupSeqFragment frag = (IXSDGroupSeqFragment)operElement.getFragmentByID(fragID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-String[] groupIDs = frag.getGroupIDs();
-for (int i = 0; i < xsdConfig.getMaxOccurs(); i++) {
-  String groupID;
-  if (i < groupIDs.length)
-    groupID = groupIDs[i];
-  else
-    groupID = frag.createGroupSeqInstance();
-  IXSDFragment[] groupMemberFragments = frag.getGroupMemberFragments(groupID);
-%>
-  <input type="hidden" name="<%=frag.getID()%>" value="<%=groupID%>">
-  <table cellpadding=0 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "fixfragtable" : "innerfixfragtable")%>">
-<%
-  for (int j = 0; j < groupMemberFragments.length; j++) {
-    fragID.delete(0, fragID.length());
-    fragID.append(groupMemberFragments[j].getID());
-%>
-    <tr>
-      <td>
-        <jsp:include page="<%=groupMemberFragments[j].getWriteFragment()%>" flush="true"/>
-      </td>
-    </tr>
-<%
-  }
-%>
-  </table>
-<%
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDGroupSeqRangeWFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDGroupSeqRangeWFragmentJSP.jsp
deleted file mode 100644
index 7a3954c5a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDGroupSeqRangeWFragmentJSP.jsp
+++ /dev/null
@@ -1,85 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-IXSDGroupSeqFragment frag = (IXSDGroupSeqFragment)operElement.getFragmentByID(fragID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-String tableContainerID = (new StringBuffer(FragmentConstants.TABLE_ID)).append(frag.getID()).toString();
-String twistImageName = (new StringBuffer("x")).append(tableContainerID).toString();
-String nameAnchorID = (new StringBuffer(FragmentConstants.NAME_ANCHOR_ID)).append(frag.getID()).toString();
-%>
-<a name="<%=nameAnchorID%>"/>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
-  <tr>
-    <td height=25 valign="bottom" align="left" nowrap width=11>
-      <a href="javascript:twist('<%=tableContainerID%>','<%=twistImageName%>')"><img name="<%=twistImageName%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_OPENED")%>" class="twist"></a>
-    </td>
-    <td class="labels" height=25 valign="bottom" align="left" nowrap>
-      <a href="javascript:createInstance('<%=tableContainerID%>', <%=xsdConfig.getMaxOccurs()%>, '<%=fragID%>', '<%=nameAnchorID%>')"><%=wsdlPerspective.getMessage("FORM_LINK_ADD")%></a>
-    </td>
-    <td class="labels" height=25 valign="bottom" align="left" nowrap>
-      <a href="javascript:checkMinOccursAndRemoveSelectedRows('<%=tableContainerID%>', <%=xsdConfig.getMinOccurs()%>)"><%=wsdlPerspective.getMessage("FORM_LINK_REMOVE")%></a>
-    </td>
-    <td nowrap width="90%">&nbsp;</td>
-  </tr>
-</table>
-<span id="<%=tableContainerID%>">
-<table cellpadding=3 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "rangefragtable" : "innerrangefragtable")%>">
-  <tr>
-    <th class="checkboxcells" width=10><input type="checkbox" onClick="handleCheckAllClick('<%=tableContainerID%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
-    <th class="headercolor"><%=wsdlPerspective.getMessage("FORM_LABEL_ELEMENTS")%></th>
-  </tr>
-  <%
-  String[] groupIDs = frag.getGroupIDs();
-  for (int i = 0; i < groupIDs.length || i < xsdConfig.getMinOccurs(); i++) {
-    String groupID;
-    if (i < groupIDs.length)
-      groupID = groupIDs[i];
-    else
-      groupID = frag.createGroupSeqInstance();
-    IXSDFragment[] groupMemberFragments = frag.getGroupMemberFragments(groupID);
-  %>
-  <tr>
-    <td class="checkboxcells" width=10>
-      <input type="checkbox" onClick="handleRowCheckboxClick()" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ROW_CHECK_BOX")%>">
-    </td>
-    <td class="tablecells">
-      <input type="hidden" name="<%=frag.getID()%>" value="<%=groupID%>">
-      <%
-        for (int j = 0; j < groupMemberFragments.length; j++) {
-          fragID.delete(0, fragID.length());
-          fragID.append(groupMemberFragments[j].getID());
-      %>
-      <jsp:include page="<%=groupMemberFragments[j].getWriteFragment()%>" flush="true"/>
-      <%
-        }
-      %>
-    </td>
-  </tr>
-  <%
-  }
-  %>
-</table>
-</span>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDInfoDialog.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDInfoDialog.jsp
deleted file mode 100644
index d6c86ea15..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDInfoDialog.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.actions.*,
-                                                        java.net.*" %>
-
-<%
-   String sessionId = request.getParameter(ActionInputs.SESSIONID);
-   HttpSession currentSession = (HttpSession)application.getAttribute(sessionId);
-   Controller controller = (Controller)currentSession.getAttribute("controller");
-   WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-   String nodeId = request.getParameter(ActionInputs.NODEID);
-   String fragmentId = request.getParameter(WSDLActionInputs.FRAGMENT_ID);
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>
-    <%=wsdlPerspective.getMessage("TITLE_XSD_INFORMATION_DIALOG")%>
-  </title>
-</head>
-<frameset rows="33,*" border=0 bgcolor="#ECE9D8">
-<%
-   StringBuffer link = new StringBuffer("wsdl/fragment/XSDInfo_toolbar.jsp?");
-   link.append(ActionInputs.SESSIONID).append('=').append(sessionId);
-   link.append('&').append(ActionInputs.NODEID).append('=').append(nodeId);
-   link.append('&').append(WSDLActionInputs.FRAGMENT_ID).append('=').append(fragmentId);
-%>
-  <frame name="<%=WSDLFrameNames.XSD_INFO_TOOLBAR%>" title="<%=controller.getMessage("FRAME_TITLE_XSD_INFORMATION_TOOLBAR")%>" src="<%=response.encodeURL(controller.getPathWithContext(link.toString()))%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-<%      
-   link.setLength(0);
-   link.append("wsdl/fragment/XSDInfo_content.jsp?");
-   link.append(ActionInputs.SESSIONID).append('=').append(sessionId);
-   link.append('&').append(ActionInputs.NODEID).append('=').append(nodeId);
-   link.append('&').append(WSDLActionInputs.FRAGMENT_ID).append('=').append(fragmentId);
-%>  
-  <frame name="<%=WSDLFrameNames.XSD_INFO_CONTENT%>" title="<%=controller.getMessage("FRAME_TITLE_XSD_INFORMATION_CONTENT")%>" src="<%=response.encodeURL(controller.getPathWithContext(link.toString()))%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-</frameset>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDInfo_content.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDInfo_content.jsp
deleted file mode 100644
index 81ed2ac87..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDInfo_content.jsp
+++ /dev/null
@@ -1,47 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="sessionID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-<%
-   sessionID.append(request.getParameter(ActionInputs.SESSIONID));
-   fragID.append(request.getParameter(WSDLActionInputs.FRAGMENT_ID));
-
-   HttpSession currentSession = (HttpSession)application.getAttribute(sessionID.toString());
-   Controller controller = (Controller)currentSession.getAttribute("controller");
-   WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-   nodeID.append(request.getParameter(ActionInputs.NODEID));
-   Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-   WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-   IXSDFragment frag = operElement.getFragmentByID(fragID.toString());
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=wsdlPerspective.getMessage("FRAME_TITLE_XSD_INFORMATION_CONTENT")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-<jsp:include page="<%=frag.getInformationFragment()%>" flush="true"/>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDInfo_toolbar.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDInfo_toolbar.jsp
deleted file mode 100644
index 85a008f96..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDInfo_toolbar.jsp
+++ /dev/null
@@ -1,50 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<%
-   String sessionId = request.getParameter(ActionInputs.SESSIONID);
-   HttpSession currentSession = (HttpSession)application.getAttribute(request.getParameter(ActionInputs.SESSIONID));
-   Controller controller = (Controller)currentSession.getAttribute("controller");
-   WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-   Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(request.getParameter(ActionInputs.NODEID)));
-   WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-   IXSDFragment frag = operElement.getFragmentByID(request.getParameter(WSDLActionInputs.FRAGMENT_ID));   
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=wsdlPerspective.getMessage("FRAME_TITLE_XSD_INFORMATION_TOOLBAR")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/toolbar.css"))%>">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" onUnload="top.opener.xsdInfoDialogClosed=true" class="toolbarbodymargin">
-<div id="toolbarborder">
-  <div id="toolbar">
-    <table width="100%" height=25 cellpadding=0 cellspacing=0 border=0>
-      <tr>
-        <td valign="middle" align="center" width=25 height=25><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/wsdl.gif"))%>" width=16 height=16></td>
-        <td valign="middle" align="left" width="*" height=25 nowrap class="text"><%=frag.getName()%></td>
-      </tr>
-    </table>
-  </div>
-</div>
-<script language="javascript">
-  top.opener.xsdInfoDialogClosed = false;
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicDateTimeFixWFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicDateTimeFixWFragmentJSP.jsp
deleted file mode 100644
index 68391d371..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicDateTimeFixWFragmentJSP.jsp
+++ /dev/null
@@ -1,78 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*,
-                                                        org.eclipse.xsd.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-String fragIDString = fragID.toString();
-IXSDFragment frag = operElement.getFragmentByID(fragID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-XSDSimpleTypeDefinition simpleType = (XSDSimpleTypeDefinition)frag.getXSDTypeDefinition();
-XSDTypeDefinition xsdBuiltInType = XSDTypeDefinitionUtil.resolveToXSDBuiltInTypeDefinition(simpleType);
-%>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
-  <tr>
-    <td class="labels" height=25 valign="bottom" align="left" nowrap>
-      <label for="<%=fragIDString%>"><a href="javascript:openXSDInfoDialog('<%=response.encodeURL(controller.getPathWithContext(OpenXSDInfoDialogAction.getActionLink(session.getId(),selectedNode.getNodeId(),fragID.toString())))%>')"><%=frag.getName()%></a></label>
-    </td>
-    <td class="labels" height=25 valign="bottom" align="left" nowrap>
-      <%=(xsdBuiltInType != null ? xsdBuiltInType.getName() : simpleType.getName())%>
-    </td>
-    <td>
-      <%
-      if (!frag.validateParameterValues(fragIDString)) {
-      %>
-      <%=HTMLUtils.redAsterisk()%>
-      <%
-      }
-      %>
-    </td>
-    <td nowrap width="90%">&nbsp;</td>
-  </tr>
-</table>
-<table cellpadding=3 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "fixfragtable" : "innerfixfragtable")%>">
-  <%
-  for (int i = 0; i < xsdConfig.getMaxOccurs(); i++) {
-  %>
-  <tr>
-    <td width="60%">
-      <%
-      String value = frag.getParameterValue(frag.getID(), i);
-      %>
-      <input type="text" id="<%=frag.getID()%>" name="<%=fragIDString%>" value="<%=((value != null) ? value : "")%>" size="50" class="tabletextenter">
-    </td>
-    <td valign="center" align="left" nowrap>
-      <a href="javascript:openCalendarBrowser(<%=request.getParameter(ActionInputs.CALENDAR_TYPE)%>,'contentborder','<%=fragIDString%>',<%=i%>)"><%=controller.getMessage("FORM_LINK_BROWSE")%></a>
-    </td>
-    <td nowrap width="30%">&nbsp;</td>    
-  </tr>
-  <%
-  }
-  %>
-</table>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicDateTimeRangeWFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicDateTimeRangeWFragmentJSP.jsp
deleted file mode 100644
index a482df110..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicDateTimeRangeWFragmentJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*,
-                                                        org.eclipse.xsd.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-IXSDFragment frag = operElement.getFragmentByID(fragID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-XSDSimpleTypeDefinition simpleType = (XSDSimpleTypeDefinition)frag.getXSDTypeDefinition();
-XSDTypeDefinition xsdBuiltInType = XSDTypeDefinitionUtil.resolveToXSDBuiltInTypeDefinition(simpleType);
-String tableContainerID = (new StringBuffer(FragmentConstants.TABLE_ID)).append(frag.getID()).toString();
-String twistImageName = (new StringBuffer("x")).append(tableContainerID).toString();
-int calendarType = Integer.parseInt(request.getParameter(ActionInputs.CALENDAR_TYPE));
-%>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
-  <tr>
-    <td height=25 valign="bottom" align="left" nowrap width=11>
-      <a href="javascript:twist('<%=tableContainerID%>','<%=twistImageName%>')"><img name="<%=twistImageName%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_OPENED")%>" class="twist"></a>
-    </td>
-    <td class="labels" height=25 valign="bottom" align="left" nowrap>
-      <label for="<%=frag.getID()%>"><a href="javascript:openXSDInfoDialog('<%=response.encodeURL(controller.getPathWithContext(OpenXSDInfoDialogAction.getActionLink(session.getId(),selectedNode.getNodeId(),fragID.toString())))%>')"><%=frag.getName()%></a></label>
-    </td>
-    <td class="labels" height=25 valign="bottom" align="left" nowrap>
-      <%=(xsdBuiltInType != null ? xsdBuiltInType.getName() : simpleType.getName())%>
-    </td>
-    <td class="labels" height=25 valign="bottom" align="left" nowrap>
-      <a href="javascript:addSimpleAtomicDateTimeRows(<%=calendarType%>,'<%=tableContainerID%>', '<%=frag.getID()%>', '<%=frag.getID()%>', null, <%=xsdConfig.getMaxOccurs()%>)"><%=wsdlPerspective.getMessage("FORM_LINK_ADD")%></a>
-    </td>
-    <td class="labels" height=25 valign="bottom" align="left" nowrap>
-      <a href="javascript:checkMinOccursAndRemoveSelectedDateTimeRows(<%=calendarType%>,'<%=tableContainerID%>',<%=xsdConfig.getMinOccurs()%>)"><%=wsdlPerspective.getMessage("FORM_LINK_REMOVE")%></a>
-    </td>
-    <td>
-      <%
-      if (!frag.validateParameterValues(frag.getID())) {
-      %>
-      <%=HTMLUtils.redAsterisk()%>
-      <%
-      }
-      %>
-    </td>
-    <td nowrap width="90%">&nbsp;</td>
-  </tr>
-</table>
-<span id="<%=tableContainerID%>">
-<table cellpadding=3 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "rangefragtable" : "innerrangefragtable")%>">
-  <tr>
-    <th class="checkboxcells" width=10><input type="checkbox" onClick="handleCheckAllClick('<%=tableContainerID%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
-    <th width="90%" class="headercolor"><%=wsdlPerspective.getMessage("FORM_LABEL_VALUES")%></th>
-    <th class="headercolor"><%=controller.getMessage("FORM_LABEL_ACTIONS")%></th>
-  </tr>
-</table>
-</span>
-<%
-String[] values = frag.getParameterValues(frag.getID());
-int i = 0;
-if (values != null) {
-  for ( ; i < values.length; i++) {
-%>
-    <script language="javascript">
-      addSimpleAtomicDateTimeRows(<%=calendarType%>,"<%=tableContainerID%>","<%=frag.getID()%>","<%=frag.getID()%>","<%=values[i]%>",<%=xsdConfig.getMaxOccurs()%>);
-    </script>
-<%
-  }
-}
-for ( ; i < xsdConfig.getMinOccurs(); i++) {
-%>
-  <script language="javascript">
-    addSimpleAtomicDateTimeRows(<%=calendarType%>,"<%=tableContainerID%>","<%=frag.getID()%>","<%=frag.getID()%>",null,<%=xsdConfig.getMaxOccurs()%>);
-  </script>
-<%
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicEnumFixWFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicEnumFixWFragmentJSP.jsp
deleted file mode 100644
index 01092d739..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicEnumFixWFragmentJSP.jsp
+++ /dev/null
@@ -1,93 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*,
-                                                        org.eclipse.xsd.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-<%
-   WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-   Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-   WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-   XSDSimpleAtomicEnumFragment frag = (XSDSimpleAtomicEnumFragment)operElement.getFragmentByID(fragID.toString());
-   XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-   XSDSimpleTypeDefinition simpleType = (XSDSimpleTypeDefinition)frag.getXSDTypeDefinition();
-   XSDTypeDefinition xsdBuiltInType = XSDTypeDefinitionUtil.resolveToXSDBuiltInTypeDefinition(simpleType);
-%>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
-  <tr>
-    <td class="labels" height=25 valign="bottom" align="left" nowrap>
-      <label for="<%=frag.getID()%>"><a href="javascript:openXSDInfoDialog('<%=response.encodeURL(controller.getPathWithContext(OpenXSDInfoDialogAction.getActionLink(session.getId(),selectedNode.getNodeId(),fragID.toString())))%>')"><%=frag.getName()%></a></label>
-    </td>
-    <td class="labels" height=25 valign="bottom" align="left" nowrap>
-      <%=(xsdBuiltInType != null ? xsdBuiltInType.getName() : simpleType.getName())%>
-    </td>
-    <td>
-<%
-   if (!frag.validateParameterValues(frag.getID()))
-   {
-%>
-      <%=HTMLUtils.redAsterisk()%>
-<%
-   }
-%>
-    </td>
-    <td nowrap width="90%">&nbsp;</td>
-  </tr>
-</table>
-<table cellpadding=3 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "fixfragtable" : "innerfixfragtable")%>">
-<%
-   OptionVector optionVector = frag.getOptionVector();
-   for (int i = 0; i < xsdConfig.getMaxOccurs(); i++)
-   {
-%>
-  <tr>
-    <td>
-<%
-     String selectedValue = frag.getParameterValue(frag.getID(), i);
-%>
-      <select id="<%=frag.getID()%>" name="<%=frag.getID()%>" class="selectlist">
-<%              
-     for (int j = 0; j < optionVector.size(); j++)
-     {
-       String displayValue = optionVector.getDisplayValue(j);
-       String value = optionVector.getValue(j);
-       if (value.equals(selectedValue))
-       {
-%>
-        <option value="<%=value%>" selected><%=displayValue%>
-<%
-       }
-       else
-       {
-%>
-        <option value="<%=value%>"><%=displayValue%>
-<%
-       }
-     }
-%>
-      </select>
-    </td>
-  </tr>
-<%
-   }
-  %>
-</table>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicEnumRangeWFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicEnumRangeWFragmentJSP.jsp
deleted file mode 100644
index 7283b87ac..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicEnumRangeWFragmentJSP.jsp
+++ /dev/null
@@ -1,149 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*,
-                                                        org.eclipse.emf.common.util.EList,
-                                                        org.eclipse.xsd.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-   WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-   Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-   WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-   XSDSimpleAtomicEnumFragment frag = (XSDSimpleAtomicEnumFragment)operElement.getFragmentByID(fragID.toString());
-   OptionVector optionVector = frag.getOptionVector();
-   XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-   XSDSimpleTypeDefinition simpleType = (XSDSimpleTypeDefinition)frag.getXSDTypeDefinition();
-   XSDTypeDefinition xsdBuiltInType = XSDTypeDefinitionUtil.resolveToXSDBuiltInTypeDefinition(simpleType);
-   String tableContainerID = (new StringBuffer(FragmentConstants.TABLE_ID)).append(frag.getID()).toString();
-   String twistImageName = (new StringBuffer("x")).append(tableContainerID).toString();
-   String optionsContainerID = (new StringBuffer(FragmentConstants.XSD_ATOMIC_ENUM_ID)).append(frag.getID()).toString();
-%>
-<span id="<%=optionsContainerID%>">
-<%
-   for (int j = 0; j < optionVector.size(); j++) {
-%>
-    <input type="hidden" name="<%=optionsContainerID%>" value="<%=optionVector.getDisplayValue(j)%>">
-    <input type="hidden" name="<%=optionsContainerID%>" value="<%=optionVector.getValue(j)%>">
-<%
-   }
-%>
-</span>
-<script language="javascript">
-  function addSimpleAtomicEnumRows(tableContainerID, optionsContainerID, id, name, value, maxOccurs) {
-    if (checkMaxOccursReached(tableContainerID, maxOccurs))
-      return;
-    twistOpen(tableContainerID);
-    var table = getTable(tableContainerID);
-    var tableBody = table.getElementsByTagName("tbody").item(0);
-    var newRow = document.createElement("tr");
-    var column0 = document.createElement("td");
-    var column1 = document.createElement("td");
-
-    var rowCheckbox = createRowCheckbox();
-    column0.appendChild(rowCheckbox);
-
-    var select = document.createElement("select");
-    column1.appendChild(select);
-    select.id = id;
-    select.name = name;
-    select.className = "selectlist";
-    var options = getOptions(optionsContainerID);
-    var index = 0;
-    for (var k = 0; k < options.length; k += 2) {
-      select.options[index] = new Option(options[k].value,options[k+1].value);
-      if (value != null && value == options[k+1].value)
-        select.options[index].selected = true;
-      index++;
-    }
-
-    column0.className = "checkboxcells";
-    column1.className = "tablecells";
-    newRow.appendChild(column0);
-    newRow.appendChild(column1);
-    tableBody.appendChild(newRow);
-  }
-
-  function getOptions(optionsContainerID) {
-    var optionsContainer = document.getElementById(optionsContainerID);
-    var options = optionsContainer.getElementsByTagName("input");
-    return options;
-  }
-</script>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
-  <tr>
-    <td height=25 valign="bottom" align="left" nowrap width=11>
-      <a href="javascript:twist('<%=tableContainerID%>','<%=twistImageName%>')"><img name="<%=twistImageName%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_OPENED")%>" class="twist"></a>
-    </td>
-    <td class="labels" height=25 valign="bottom" align="left" nowrap>
-      <label for="<%=frag.getID()%>"><a href="javascript:openXSDInfoDialog('<%=response.encodeURL(controller.getPathWithContext(OpenXSDInfoDialogAction.getActionLink(session.getId(),selectedNode.getNodeId(),fragID.toString())))%>')"><%=frag.getName()%></a></label>
-    </td>
-    <td class="labels" height=25 valign="bottom" align="left" nowrap>
-      <%=(xsdBuiltInType != null ? xsdBuiltInType.getName() : simpleType.getName())%>
-    </td>
-    <td class="labels" height=25 valign="bottom" align="left" nowrap>
-      <a href="javascript:addSimpleAtomicEnumRows('<%=tableContainerID%>', '<%=optionsContainerID%>', '<%=frag.getID()%>', '<%=frag.getID()%>', null, <%=xsdConfig.getMaxOccurs()%>)"><%=wsdlPerspective.getMessage("FORM_LINK_ADD")%></a>
-    </td>
-    <td class="labels" height=25 valign="bottom" align="left" nowrap>
-      <a href="javascript:checkMinOccursAndRemoveSelectedRows('<%=tableContainerID%>', <%=xsdConfig.getMinOccurs()%>)"><%=wsdlPerspective.getMessage("FORM_LINK_REMOVE")%></a>
-    </td>
-    <td>
-      <%
-      if (!frag.validateParameterValues(frag.getID())) {
-      %>
-      <%=HTMLUtils.redAsterisk()%>
-      <%
-      }
-      %>
-    </td>
-    <td nowrap width="90%">&nbsp;</td>
-  </tr>
-</table>
-<span id="<%=tableContainerID%>">
-<table cellpadding=3 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "rangefragtable" : "innerrangefragtable")%>">
-  <tr>
-    <th class="checkboxcells" width=10><input type="checkbox" onClick="handleCheckAllClick('<%=tableContainerID%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
-    <th class="headercolor"><%=wsdlPerspective.getMessage("FORM_LABEL_VALUES")%></th>
-  </tr>
-</table>
-</span>
-<%
-String[] values = frag.getParameterValues(frag.getID());
-int i = 0;
-if (values != null) {
-  for ( ; i < values.length; i++) {
-%>
-    <script language="javascript">
-      addSimpleAtomicEnumRows('<%=tableContainerID%>', '<%=optionsContainerID%>', '<%=frag.getID()%>', '<%=frag.getID()%>', '<%=values[i]%>', '<%=xsdConfig.getMaxOccurs()%>');
-    </script>
-<%
-  }
-}
-for ( ; i < xsdConfig.getMinOccurs(); i++) {
-%>
-  <script language="javascript">
-    addSimpleAtomicEnumRows('<%=tableContainerID%>', '<%=optionsContainerID%>', '<%=frag.getID()%>', '<%=frag.getID()%>', null, '<%=xsdConfig.getMaxOccurs()%>');
-  </script>
-<%
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicFixWFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicFixWFragmentJSP.jsp
deleted file mode 100644
index 877601de6..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicFixWFragmentJSP.jsp
+++ /dev/null
@@ -1,72 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*,
-                                                        org.eclipse.xsd.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-IXSDFragment frag = operElement.getFragmentByID(fragID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-XSDSimpleTypeDefinition simpleType = (XSDSimpleTypeDefinition)frag.getXSDTypeDefinition();
-XSDTypeDefinition xsdBuiltInType = XSDTypeDefinitionUtil.resolveToXSDBuiltInTypeDefinition(simpleType);
-%>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
-  <tr>
-    <td class="labels" height=25 valign="bottom" align="left" nowrap>
-      <label for="<%=frag.getID()%>"><a href="javascript:openXSDInfoDialog('<%=response.encodeURL(controller.getPathWithContext(OpenXSDInfoDialogAction.getActionLink(session.getId(),selectedNode.getNodeId(),fragID.toString())))%>')"><%=frag.getName()%></a></label>
-    </td>
-    <td class="labels" height=25 valign="bottom" align="left" nowrap>
-      <%=(xsdBuiltInType != null ? xsdBuiltInType.getName() : simpleType.getName())%>
-    </td>
-    <td>
-      <%
-      if (!frag.validateParameterValues(frag.getID())) {
-      %>
-      <%=HTMLUtils.redAsterisk()%>
-      <%
-      }
-      %>
-    </td>
-    <td nowrap width="90%">&nbsp;</td>
-  </tr>
-</table>
-<table cellpadding=3 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "fixfragtable" : "innerfixfragtable")%>">
-  <%
-  for (int i = 0; i < xsdConfig.getMaxOccurs(); i++) {
-  %>
-  <tr>
-    <td>
-      <%
-      String value = frag.getParameterValue(frag.getID(), i);
-      %>
-      <input type="text" id="<%=frag.getID()%>" name="<%=frag.getID()%>" value="<%=((value != null) ? value : "")%>" size="50" class="tabletextenter">
-    </td>
-  </tr>
-  <%
-  }
-  %>
-</table>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicInfoFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicInfoFragmentJSP.jsp
deleted file mode 100644
index e2ceffa78..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicInfoFragmentJSP.jsp
+++ /dev/null
@@ -1,323 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.emf.common.util.EList,
-                                                        org.eclipse.xsd.*,
-                                                        java.util.*" %>
-
-<jsp:useBean id="sessionID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-<%
-HttpSession currentSession = (HttpSession)application.getAttribute(sessionID.toString());
-Controller controller = (Controller)currentSession.getAttribute("controller");
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-IXSDFragment frag = operElement.getFragmentByID(fragID.toString());
-XSDSimpleTypeDefinition simpleType = (XSDSimpleTypeDefinition)frag.getXSDToFragmentConfiguration().getXSDComponent();
-
-int minLength = -1;
-int maxLength = -1;
-Vector patternVector = new Vector();
-String whiteSpace = null;
-boolean minExclusive = true;
-Object min = null;
-boolean maxExclusive = true;
-Object max = null;
-int totalDigits = -1;
-int fractionDigits = -1;
-
-XSDSimpleTypeDefinition currType = simpleType;
-while (!XSDTypeDefinitionUtil.isRootTypeDefinition(currType)) {
-  // minLength
-  if (minLength < 0) {
-    XSDLengthFacet xsdLengthFacet = currType.getLengthFacet();
-    XSDMinLengthFacet xsdMinLengthFacet = currType.getMinLengthFacet();
-    // port to org.eclipse.xsd
-    if (xsdLengthFacet != null)
-      minLength = xsdLengthFacet.getValue();
-    else if (xsdMinLengthFacet != null)
-      minLength = xsdMinLengthFacet.getValue();
-  }
-  // maxLength
-  if (maxLength < 0) {
-    XSDLengthFacet xsdLengthFacet = currType.getLengthFacet();
-    XSDMaxLengthFacet xsdMaxLengthFacet = currType.getMaxLengthFacet();
-    // port to org.eclipse.xsd
-    if (xsdLengthFacet != null)
-      maxLength = xsdLengthFacet.getValue();
-    else if (xsdMaxLengthFacet != null)
-      maxLength = xsdMaxLengthFacet.getValue();
-  }
-  // patternVector
-  EList xsdPatternFacets = currType.getPatternFacets();
-  if (xsdPatternFacets != null) {
-    for (int i = 0; i < xsdPatternFacets.size(); i++) {
-      XSDPatternFacet xsdPatternFacet = (XSDPatternFacet)xsdPatternFacets.get(i);
-      EList patterns = xsdPatternFacet.getValue();
-      for (int j = 0; j < patterns.size(); j++) {
-        patternVector.add(patterns.get(j));
-      }
-    }
-  }
-  // whiteSpace
-  if (whiteSpace == null) {
-    XSDWhiteSpaceFacet xsdWhiteSpaceFacet = currType.getWhiteSpaceFacet();
-    // port to org.eclipse.xsd
-    if (xsdWhiteSpaceFacet != null)
-      whiteSpace = xsdWhiteSpaceFacet.getValue().getName();
-  }
-  // min in/exclusive
-  if (min == null ) {
-    XSDMinExclusiveFacet xsdMinExclusiveFacet = currType.getMinExclusiveFacet();
-    XSDMinInclusiveFacet xsdMinInclusiveFacet = currType.getMinInclusiveFacet();
-    if (xsdMinExclusiveFacet != null) {
-      min = xsdMinExclusiveFacet.getValue();
-      minExclusive = true;
-    }
-    else if (xsdMinInclusiveFacet != null) {
-      min = xsdMinInclusiveFacet.getValue();
-      minExclusive = false;
-    }
-  }
-  // max in/exclusive
-  if (max == null) {
-    XSDMaxExclusiveFacet xsdMaxExclusiveFacet = currType.getMaxExclusiveFacet();
-    XSDMaxInclusiveFacet xsdMaxInclusiveFacet = currType.getMaxInclusiveFacet();
-    if (xsdMaxExclusiveFacet != null) {
-      max = xsdMaxExclusiveFacet.getValue();
-      maxExclusive = true;
-    }
-    else if (xsdMaxInclusiveFacet != null) {
-      max = xsdMaxInclusiveFacet.getValue();
-      maxExclusive = false;
-    }
-  }
-  // totalDigits
-  if (totalDigits < 0) {
-    XSDTotalDigitsFacet xsdTotalDigitsFacet = currType.getTotalDigitsFacet();
-    if (xsdTotalDigitsFacet != null)
-      totalDigits = xsdTotalDigitsFacet.getValue();
-  }
-  // fractionDigits
-  if (fractionDigits < 0) {
-    XSDFractionDigitsFacet xsdFractionDigitsFacet = currType.getFractionDigitsFacet();
-    if (xsdFractionDigitsFacet != null)
-      fractionDigits = xsdFractionDigitsFacet.getValue();
-  }
-  // walk to base type
-  currType = currType.getBaseTypeDefinition();
-}
-%>
-
-<jsp:include page="/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp" flush="true"/>
-
-<table>
-  <tr>
-    <td height=20>&nbsp;</td>
-  </tr>
-</table>
-<table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
-  <tr>
-    <th class="singleheadercolor" height=20 valign="bottom" align="left">
-      <%=wsdlPerspective.getMessage("FORM_LABEL_BASE_TYPE")%>
-    </th>
-  </tr>
-  <tr>
-    <td class="tablecells">
-      <%=XSDTypeDefinitionUtil.resolveToXSDBuiltInTypeDefinition(simpleType).getName()%>
-    </td>
-  </tr>
-</table>
-
-<%
-String minLengthString = (minLength < 0) ? wsdlPerspective.getMessage("FORM_LABEL_UNBOUNDED") : String.valueOf(minLength);
-String maxLengthString = (maxLength < 0) ? wsdlPerspective.getMessage("FORM_LABEL_UNBOUNDED") : String.valueOf(maxLength);
-String[] lengthValues = {minLengthString, maxLengthString};
-if (minLength >= 0 || maxLength >= 0) {
-%>
-  <table>
-    <tr>
-      <td height=20>&nbsp;</td>
-    </tr>
-  </table>
-  <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
-    <tr>
-      <th class="singleheadercolor" height=20 valign="bottom" align="left">
-        <%=wsdlPerspective.getMessage("FORM_LABEL_LENGTH")%>
-      </th>
-    </tr>
-    <tr>
-      <td class="tablecells">
-        <%=wsdlPerspective.getMessage("FORM_LABEL_LENGTH_VALUE", lengthValues)%>
-      </td>
-    </tr>
-  </table>
-<%
-}
-%>
-
-<%
-if (patternVector.size() > 0) {
-  String patternContainerID = "::pattern";
-  String xpatternContainerID = "x::pattern";
-%>
-  <table>
-    <tr>
-      <td height=20>&nbsp;</td>
-    </tr>
-  </table>
-  <table width="95%" border=0 cellpadding=3 cellspacing=0>
-    <tr>
-      <td height=25 valign="bottom" align="left" nowrap width=11>
-        <a href="javascript:twist('<%=patternContainerID%>','<%=xpatternContainerID%>')"><img name="<%=xpatternContainerID%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_OPENED")%>" class="twist"></a>
-      </td>
-      <td class="labels" height=25 valign="bottom" align="left" nowrap>
-       <strong><%=wsdlPerspective.getMessage("FORM_LABEL_PATTERN")%></strong>
-      </td>
-    </tr>
-  </table>
-  <span id="<%=patternContainerID%>">
-  <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
-    <tr>
-      <th class="singleheadercolor" height=20 valign="bottom" align="left">
-        <%=wsdlPerspective.getMessage("FORM_LABEL_PATTERN")%>
-      </th>
-    </tr>
-    <%
-    for (int k = 0; k < patternVector.size(); k++) {
-    %>
-      <tr>
-        <td class="tablecells">
-          <%=(String)patternVector.get(k)%>
-        </td>
-      </tr>
-    <%
-    }
-    %>
-  </table>
-  </span>
-<%
-}
-%>
-
-<%
-if (whiteSpace != null) {
-%>
-  <table>
-    <tr>
-      <td height=20>&nbsp;</td>
-    </tr>
-  </table>
-  <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
-    <tr>
-      <th class="singleheadercolor" height=20 valign="bottom" align="left">
-        <%=wsdlPerspective.getMessage("FORM_LABEL_WHITESPACE")%>
-      </th>
-    </tr>
-    <tr>
-      <td class="tablecells">
-        <%=whiteSpace%>
-      </td>
-    </tr>
-  </table>
-<%
-}
-%>
-
-<%
-String lowerBound;
-if (minExclusive)
-  lowerBound = wsdlPerspective.getMessage("FORM_LABEL_MIN_EXCLUSIVE", (min == null) ? wsdlPerspective.getMessage("FORM_LABEL_UNBOUNDED") : min.toString());
-else
-  lowerBound = wsdlPerspective.getMessage("FORM_LABEL_MIN_INCLUSIVE", (min == null) ? wsdlPerspective.getMessage("FORM_LABEL_UNBOUNDED") : min.toString());
-String upperBound;
-if (maxExclusive)
-  upperBound = wsdlPerspective.getMessage("FORM_LABEL_MAX_EXCLUSIVE", (max == null) ? wsdlPerspective.getMessage("FORM_LABEL_UNBOUNDED") : max.toString());
-else
-  upperBound = wsdlPerspective.getMessage("FORM_LABEL_MAX_INCLUSIVE", (max == null) ? wsdlPerspective.getMessage("FORM_LABEL_UNBOUNDED") : max.toString());
-if (min != null || max != null) {
-%>
-  <table>
-    <tr>
-      <td height=20>&nbsp;</td>
-    </tr>
-  </table>
-  <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
-    <tr>
-      <th class="singleheadercolor" height=20 valign="bottom" align="left">
-        <%=wsdlPerspective.getMessage("FORM_LABEL_RANGE_OF_VALUES")%>
-      </th>
-    </tr>
-    <tr>
-      <td class="tablecells">
-        <%=lowerBound + upperBound%>
-      </td>
-    </tr>
-  </table>
-<%
-}
-%>
-
-<%
-if (totalDigits >= 0) {
-%>
-  <table>
-    <tr>
-      <td height=20>&nbsp;</td>
-    </tr>
-  </table>
-  <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
-    <tr>
-      <th class="singleheadercolor" height=20 valign="bottom" align="left">
-        <%=wsdlPerspective.getMessage("FORM_LABEL_TOTAL_DIGITS")%>
-      </th>
-    </tr>
-    <tr>
-      <td class="tablecells">
-        <%=totalDigits%>
-      </td>
-    </tr>
-  </table>
-<%
-}
-%>
-
-<%
-if (fractionDigits >= 0) {
-%>
-  <table>
-    <tr>
-      <td height=20>&nbsp;</td>
-    </tr>
-  </table>
-  <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
-    <tr>
-      <th class="singleheadercolor" height=20 valign="bottom" align="left">
-        <%=wsdlPerspective.getMessage("FORM_LABEL_FRACTION_DIGITS")%>
-      </th>
-    </tr>
-    <tr>
-      <td class="tablecells">
-        <%=fractionDigits%>
-      </td>
-    </tr>
-  </table>
-<%
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicRFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicRFragmentJSP.jsp
deleted file mode 100644
index 4fdd4b64d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicRFragmentJSP.jsp
+++ /dev/null
@@ -1,60 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*,
-                                                        org.eclipse.xsd.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node operNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)operNode.getTreeElement();
-IXSDFragment frag = operElement.getFragmentByID(fragID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-XSDSimpleTypeDefinition simpleType = (XSDSimpleTypeDefinition)frag.getXSDTypeDefinition();
-XSDTypeDefinition xsdBuiltInType = XSDTypeDefinitionUtil.resolveToXSDBuiltInTypeDefinition(simpleType);
-String[] labelArgs = {frag.getName(), (xsdBuiltInType != null ? xsdBuiltInType.getName() : simpleType.getName())};
-String[] params = frag.getParameterValues(frag.getID());
-%>
-<table cellpadding=3 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "fixfragtable" : "innerfixfragtable")%>">
-  <tr>
-    <th id="<%=frag.getID()%>" class="labels" height=25 valign="bottom" align="left" nowrap>
-      <%=wsdlPerspective.getMessage("FORM_LABEL_ATOMIC_NAME_TYPE", labelArgs)%>
-    </th>
-    <td headers="<%=frag.getID()%>" class="labels" height=25 width="100%" valign="bottom" align="left" nowrap>
-      <%=((params != null && params.length > 0) ? HTMLUtils.charactersToHTMLEntities(params[0]) : wsdlPerspective.getMessage("FORM_LABEL_NULL"))%>
-    </td>
-  </tr>
-  <%
-  if (params != null) {
-    for (int i = 1; i < params.length; i++) {
-    %>
-      <tr>
-        <td class="labels" height=25 valign="bottom" align="left" nowrap></td>
-        <td headers="<%=frag.getID()%>" class="labels" height=25 width="100%" valign="bottom" align="left" nowrap>
-          <%=HTMLUtils.charactersToHTMLEntities(params[i])%>
-        </td>
-      </tr>
-    <%
-    }
-  }
-  %>
-</table>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicRangeWFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicRangeWFragmentJSP.jsp
deleted file mode 100644
index e239e78bf..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicRangeWFragmentJSP.jsp
+++ /dev/null
@@ -1,124 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*,
-                                                        org.eclipse.xsd.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-IXSDFragment frag = operElement.getFragmentByID(fragID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-XSDSimpleTypeDefinition simpleType = (XSDSimpleTypeDefinition)frag.getXSDTypeDefinition();
-XSDTypeDefinition xsdBuiltInType = XSDTypeDefinitionUtil.resolveToXSDBuiltInTypeDefinition(simpleType);
-String tableContainerID = (new StringBuffer(FragmentConstants.TABLE_ID)).append(frag.getID()).toString();
-String twistImageName = (new StringBuffer("x")).append(tableContainerID).toString();
-%>
-<script language="javascript">
-  function addSimpleAtomicRows(tableContainerID, id, name, value, maxOccurs) {
-    if (checkMaxOccursReached(tableContainerID, maxOccurs))
-      return;
-    twistOpen(tableContainerID);
-    var table = getTable(tableContainerID);
-    var tableBody = table.getElementsByTagName("tbody").item(0);
-    var newRow = document.createElement("tr");
-    var column0 = document.createElement("td");
-    var column1 = document.createElement("td");
-
-    var rowCheckbox = createRowCheckbox();
-    column0.appendChild(rowCheckbox);
-
-    var input = document.createElement("input");
-    column1.appendChild(input);
-    input.type = "text";
-    input.id = id;
-    input.name = name;
-    if (value != null && value.length > 0)
-      input.value = value;
-    input.className = "tabletextenter";
-
-    column0.className = "checkboxcells";
-    column1.className = "tablecells";
-    newRow.appendChild(column0);
-    newRow.appendChild(column1);
-    tableBody.appendChild(newRow);
-  }
-</script>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
-  <tr>
-    <td height=25 valign="bottom" align="left" nowrap width=11>
-      <a href="javascript:twist('<%=tableContainerID%>','<%=twistImageName%>')"><img name="<%=twistImageName%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_OPENED")%>" class="twist"></a>
-    </td>
-    <td class="labels" height=25 valign="bottom" align="left" nowrap>
-      <label for="<%=frag.getID()%>"><a href="javascript:openXSDInfoDialog('<%=response.encodeURL(controller.getPathWithContext(OpenXSDInfoDialogAction.getActionLink(session.getId(),selectedNode.getNodeId(),fragID.toString())))%>')"><%=frag.getName()%></a></label>
-    </td>
-    <td class="labels" height=25 valign="bottom" align="left" nowrap>
-      <%=(xsdBuiltInType != null ? xsdBuiltInType.getName() : simpleType.getName())%>
-    </td>
-    <td class="labels" height=25 valign="bottom" align="left" nowrap>
-      <a href="javascript:addSimpleAtomicRows('<%=tableContainerID%>', '<%=frag.getID()%>', '<%=frag.getID()%>', null, <%=xsdConfig.getMaxOccurs()%>)"><%=wsdlPerspective.getMessage("FORM_LINK_ADD")%></a>
-    </td>
-    <td class="labels" height=25 valign="bottom" align="left" nowrap>
-      <a href="javascript:checkMinOccursAndRemoveSelectedRows('<%=tableContainerID%>', <%=xsdConfig.getMinOccurs()%>)"><%=wsdlPerspective.getMessage("FORM_LINK_REMOVE")%></a>
-    </td>
-    <td>
-      <%
-      if (!frag.validateParameterValues(frag.getID())) {
-      %>
-      <%=HTMLUtils.redAsterisk()%>
-      <%
-      }
-      %>
-    </td>
-    <td nowrap width="90%">&nbsp;</td>
-  </tr>
-</table>
-<span id="<%=tableContainerID%>">
-<table cellpadding=3 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "rangefragtable" : "innerrangefragtable")%>">
-  <tr>
-    <th class="checkboxcells" width=10><input type="checkbox" onClick="handleCheckAllClick('<%=tableContainerID%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
-    <th class="headercolor"><%=wsdlPerspective.getMessage("FORM_LABEL_VALUES")%></th>
-  </tr>
-</table>
-</span>
-<%
-String[] values = frag.getParameterValues(frag.getID());
-int i = 0;
-if (values != null) {
-  for ( ; i < values.length; i++) {
-%>
-    <script language="javascript">
-      addSimpleAtomicRows('<%=tableContainerID%>', '<%=frag.getID()%>', '<%=frag.getID()%>', '<%=values[i]%>', '<%=xsdConfig.getMaxOccurs()%>');
-    </script>
-<%
-  }
-}
-for ( ; i < xsdConfig.getMinOccurs(); i++) {
-%>
-  <script language="javascript">
-    addSimpleAtomicRows('<%=tableContainerID%>', '<%=frag.getID()%>', '<%=frag.getID()%>', null, '<%=xsdConfig.getMaxOccurs()%>');
-  </script>
-<%
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleListFixWFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleListFixWFragmentJSP.jsp
deleted file mode 100644
index 09c2300ac..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleListFixWFragmentJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-IXSDSimpleListFragment frag = (IXSDSimpleListFragment)operElement.getFragmentByID(fragID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-IXSDFragment[] childFrags = frag.getAllFragments();
-%>
-<table cellpadding=0 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "fixfragtable" : "innerfixfragtable")%>">
-<%
-for (int i = 0; i < xsdConfig.getMaxOccurs(); i++) {
-  IXSDFragment childFrag;
-  String childFragID;
-  if (i < childFrags.length) {
-    childFrag = childFrags[i];
-    childFragID = childFrag.getID();
-  }
-  else {
-    childFragID = frag.createListInstance();
-    childFrag = frag.getFragment(childFragID);
-  }
-  fragID.delete(0, fragID.length());
-  fragID.append(childFragID);
-%>
-  <tr>
-    <td>
-      <input type="hidden" name="<%=frag.getID()%>" value="<%=childFragID%>">
-      <jsp:include page="<%=childFrag.getWriteFragment()%>" flush="true"/>
-    </td>
-  </tr>
-<%
-}
-%>
-</table>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleListRFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleListRFragmentJSP.jsp
deleted file mode 100644
index 032861858..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleListRFragmentJSP.jsp
+++ /dev/null
@@ -1,45 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node operNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)operNode.getTreeElement();
-IXSDSimpleListFragment frag = (IXSDSimpleListFragment)operElement.getFragmentByID(fragID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-IXSDFragment[] childFrags = frag.getAllFragments();
-%>
-<table cellpadding=0 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "fixfragtable" : "innerfixfragtable")%>">
-<%
-for (int i = 0; i < childFrags.length; i++) {
-  fragID.delete(0, fragID.length());
-  fragID.append(childFrags[i].getID());
-%>
-  <tr>
-    <td>
-      <jsp:include page="<%=childFrags[i].getReadFragment()%>" flush="true"/>
-    </td>
-  </tr>
-<%
-}
-%>
-</table>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleListRangeWFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleListRangeWFragmentJSP.jsp
deleted file mode 100644
index 6f7c2d117..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleListRangeWFragmentJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-IXSDSimpleListFragment frag = (IXSDSimpleListFragment)operElement.getFragmentByID(fragID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-String tableContainerID = (new StringBuffer(FragmentConstants.TABLE_ID)).append(frag.getID()).toString();
-String twistImageName = (new StringBuffer("x")).append(tableContainerID).toString();
-String nameAnchorID = (new StringBuffer(FragmentConstants.NAME_ANCHOR_ID)).append(frag.getID()).toString();
-%>
-<a name="<%=nameAnchorID%>"/>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
-  <tr>
-    <td height=25 valign="bottom" align="left" nowrap width=11>
-      <a href="javascript:twist('<%=tableContainerID%>','<%=twistImageName%>')"><img name="<%=twistImageName%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_OPENED")%>" class="twist"></a>
-    </td>
-    <td class="labels" height=25 valign="bottom" align="left" nowrap>
-      <a href="javascript:openXSDInfoDialog('<%=response.encodeURL(controller.getPathWithContext(OpenXSDInfoDialogAction.getActionLink(session.getId(),selectedNode.getNodeId(),fragID.toString())))%>')"><%=frag.getName()%></a>
-    </td>
-    <td class="labels" height=25 valign="bottom" align="left" nowrap>
-      <a href="javascript:createInstance('<%=tableContainerID%>', <%=xsdConfig.getMaxOccurs()%>, '<%=fragID%>', '<%=nameAnchorID%>')"><%=wsdlPerspective.getMessage("FORM_LINK_ADD")%></a>
-    </td>
-    <td class="labels" height=25 valign="bottom" align="left" nowrap>
-      <a href="javascript:checkMinOccursAndRemoveSelectedRows('<%=tableContainerID%>', <%=xsdConfig.getMinOccurs()%>)"><%=wsdlPerspective.getMessage("FORM_LINK_REMOVE")%></a>
-    </td>
-    <td nowrap width="90%">&nbsp;</td>
-  </tr>
-</table>
-<span id="<%=tableContainerID%>">
-<table cellpadding=3 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "rangefragtable" : "innerrangefragtable")%>">
-  <tr>
-    <th class="checkboxcells" width=10><input type="checkbox" onClick="handleCheckAllClick('<%=tableContainerID%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
-    <th class="headercolor"><%=wsdlPerspective.getMessage("FORM_LABEL_LIST_ITEMS")%></th>
-  </tr>
-  <%
-  IXSDFragment[] childFrags = frag.getAllFragments();
-  for (int i = 0; i < childFrags.length || i < xsdConfig.getMinOccurs(); i++) {
-    IXSDFragment childFrag;
-    String childFragID;
-    if (i < childFrags.length) {
-      childFrag = childFrags[i];
-      childFragID = childFrag.getID();
-    }
-    else {
-      childFragID = frag.createListInstance();
-      childFrag = frag.getFragment(childFragID);
-    }
-    fragID.delete(0, fragID.length());
-    fragID.append(childFragID);
-  %>
-  <tr>
-    <td class="checkboxcells" width=10>
-      <input type="checkbox" onClick="handleRowCheckboxClick()" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ROW_CHECK_BOX")%>">
-    </td>
-    <td class="tablecells">
-      <input type="hidden" name="<%=frag.getID()%>" value="<%=childFragID%>">
-      <jsp:include page="<%=childFrag.getWriteFragment()%>" flush="true"/>
-    </td>
-  </tr>
-  <%
-  }
-  %>
-</table>
-</span>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleUnionFixWFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleUnionFixWFragmentJSP.jsp
deleted file mode 100644
index 9407bde38..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleUnionFixWFragmentJSP.jsp
+++ /dev/null
@@ -1,128 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.xsd.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-IXSDSimpleUnionFragment frag = (IXSDSimpleUnionFragment)operElement.getFragmentByID(fragID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-String tableContainerID = (new StringBuffer(FragmentConstants.TABLE_ID)).append(frag.getID()).toString();
-String twistImageName = (new StringBuffer("x")).append(tableContainerID).toString();
-%>
-<script language="javascript">
-  function changeUnionMemberType(select) {
-    for (var i = 0; i < select.options.length; i++) {
-      var tableContainerID = '<%=FragmentConstants.TABLE_ID%>';
-      tableContainerID += select.options(i).value;
-      showTable(tableContainerID, select.options(i).selected);
-    }
-  }
-
-  function showTable(tableContainerID, show) {
-    var tableContainer = document.getElementById(tableContainerID);
-    if (show)
-      tableContainer.style.display = "";
-    else
-      tableContainer.style.display = "none";
-  }
-</script>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
-  <tr>
-    <td height=25 valign="bottom" align="left" nowrap width=11>
-      <a href="javascript:twist('<%=tableContainerID%>','<%=twistImageName%>')"><img name="<%=twistImageName%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_OPENED")%>" class="twist"></a>
-    </td>
-    <td class="labels" height=25 valign="bottom" align="left" nowrap>
-      <a href="javascript:openXSDInfoDialog('<%=response.encodeURL(controller.getPathWithContext(OpenXSDInfoDialogAction.getActionLink(session.getId(),selectedNode.getNodeId(),fragID.toString())))%>')"><%=frag.getName()%></a>
-    </td>
-    <td nowrap width="90%">&nbsp;</td>
-  </tr>
-</table>
-<span id="<%=tableContainerID%>">
-<table cellpadding=3 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "rangefragtable" : "innerrangefragtable")%>">
-  <tr>
-    <th class="headercolor" nowrap><%=wsdlPerspective.getMessage("FORM_LABEL_UNION_TYPE")%></th>
-    <th class="headercolor" width="100%" nowrap><%=wsdlPerspective.getMessage("FORM_LABEL_UNION_MEMBERS")%></th>
-  </tr>
-  <%
-  XSDSimpleTypeDefinition[] memberTypes = frag.getMemberTypeDefinitions();
-  IXSDFragment[] memberFrags = frag.getAllFragments();
-  for (int i = 0; i < xsdConfig.getMaxOccurs(); i++) {
-    int typeSelectionIndex = 0;
-    String[] newMemberFragIDs = new String[memberTypes.length];
-    IXSDFragment[] newMemberFrags = new IXSDFragment[memberTypes.length];
-    for (int j = 0; j < memberTypes.length; j++) {
-      if (i < memberFrags.length && memberFrags[i].getXSDTypeDefinition().getQName().equals(memberTypes[j].getQName())) {
-        newMemberFragIDs[j] = memberFrags[i].getID();
-        newMemberFrags[j] = memberFrags[i];
-        typeSelectionIndex = j;
-      }
-      else {
-        newMemberFragIDs[j] = frag.createUnionInstance(j);
-        newMemberFrags[j] = frag.getFragment(newMemberFragIDs[j]);
-      }
-    }
-    %>
-    <tr>
-      <td class="tablecells">
-        <select id="<%=frag.getID()%>" name="<%=frag.getID()%>" onChange="javascript:changeUnionMemberType(this)" title="<%=wsdlPerspective.getMessage("FORM_CONTROL_TITLE_SELECT_UNION_TYPE")%>">
-          <%
-          for (int k = 0; k < memberTypes.length; k++) {
-            if (k == typeSelectionIndex) {
-              %>
-              <option value="<%=newMemberFragIDs[k]%>" selected><%=memberTypes[k].getQName()%>
-              <%
-            }
-            else {
-              %>
-              <option value="<%=newMemberFragIDs[k]%>"><%=memberTypes[k].getQName()%>
-              <%
-            }
-          }
-          %>
-        </select>
-      </td>
-      <td class="tablecells">
-        <%
-        for (int l = 0; l < memberTypes.length; l++) {
-          fragID.delete(0, fragID.length());
-          fragID.append(newMemberFragIDs[l]);
-          String memberTableContainerID = (new StringBuffer(FragmentConstants.TABLE_ID)).append(newMemberFrags[l].getID()).toString();
-        %>
-        <span id="<%=memberTableContainerID%>">
-          <jsp:include page="<%=newMemberFrags[l].getWriteFragment()%>" flush="true"/>
-        </span>
-        <script language="javascript">
-          showTable('<%=memberTableContainerID%>', <%=(l == typeSelectionIndex)%>);
-        </script>
-        <%
-        }
-        %>
-      </td>
-    </tr>
-  <%
-  }
-  %>
-</table>
-</span>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleUnionRFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleUnionRFragmentJSP.jsp
deleted file mode 100644
index ae61fe552..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleUnionRFragmentJSP.jsp
+++ /dev/null
@@ -1,44 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node operNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)operNode.getTreeElement();
-IXSDSimpleUnionFragment frag = (IXSDSimpleUnionFragment)operElement.getFragmentByID(fragID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-IXSDFragment[] childFrags = frag.getAllFragments();
-%>
-<table cellpadding=0 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "fixfragtable" : "innerfixfragtable")%>">
-<%
-for (int i = 0; i < childFrags.length; i++) {
-  fragID.delete(0, fragID.length());
-  fragID.append(childFrags[i].getID());
-%>
-  <tr>
-    <td>
-      <jsp:include page="<%=childFrags[i].getReadFragment()%>" flush="true"/>
-    </td>
-  </tr>
-<%
-}
-%>
-</table>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleUnionRangeWFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleUnionRangeWFragmentJSP.jsp
deleted file mode 100644
index 0013387d5..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleUnionRangeWFragmentJSP.jsp
+++ /dev/null
@@ -1,141 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.xsd.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-IXSDSimpleUnionFragment frag = (IXSDSimpleUnionFragment)operElement.getFragmentByID(fragID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-String tableContainerID = (new StringBuffer(FragmentConstants.TABLE_ID)).append(frag.getID()).toString();
-String twistImageName = (new StringBuffer("x")).append(tableContainerID).toString();
-String nameAnchorID = (new StringBuffer(FragmentConstants.NAME_ANCHOR_ID)).append(frag.getID()).toString();
-%>
-<script language="javascript">
-  function changeUnionMemberType(select) {
-    for (var i = 0; i < select.options.length; i++) {
-      var tableContainerID = '<%=FragmentConstants.TABLE_ID%>';
-      tableContainerID += select.options(i).value;
-      showTable(tableContainerID, select.options(i).selected);
-    }
-  }
-
-  function showTable(tableContainerID, show) {
-    var tableContainer = document.getElementById(tableContainerID);
-    if (show)
-      tableContainer.style.display = "";
-    else
-      tableContainer.style.display = "none";
-  }
-</script>
-<a name="<%=nameAnchorID%>"/>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
-  <tr>
-    <td height=25 valign="bottom" align="left" nowrap width=11>
-      <a href="javascript:twist('<%=tableContainerID%>','<%=twistImageName%>')"><img name="<%=twistImageName%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_OPENED")%>" class="twist"></a>
-    </td>
-    <td class="labels" height=25 valign="bottom" align="left" nowrap>
-      <a href="javascript:openXSDInfoDialog('<%=response.encodeURL(controller.getPathWithContext(OpenXSDInfoDialogAction.getActionLink(session.getId(),selectedNode.getNodeId(),fragID.toString())))%>')"><%=frag.getName()%></a>
-    </td>
-    <td class="labels" height=25 valign="bottom" align="left" nowrap>
-      <a href="javascript:createInstance('<%=tableContainerID%>', <%=xsdConfig.getMaxOccurs()%>, '<%=fragID%>', '<%=nameAnchorID%>')"><%=wsdlPerspective.getMessage("FORM_LINK_ADD")%></a>
-    </td>
-    <td class="labels" height=25 valign="bottom" align="left" nowrap>
-      <a href="javascript:checkMinOccursAndRemoveSelectedRows('<%=tableContainerID%>', <%=xsdConfig.getMinOccurs()%>)"><%=wsdlPerspective.getMessage("FORM_LINK_REMOVE")%></a>
-    </td>
-    <td nowrap width="90%">&nbsp;</td>
-  </tr>
-</table>
-<span id="<%=tableContainerID%>">
-<table cellpadding=3 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "rangefragtable" : "innerrangefragtable")%>">
-  <tr>
-    <th class="checkboxcells" width=10><input type="checkbox" onClick="handleCheckAllClick('<%=tableContainerID%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
-    <th class="headercolor" nowrap><%=wsdlPerspective.getMessage("FORM_LABEL_UNION_TYPE")%></th>
-    <th class="headercolor" width="100%" nowrap><%=wsdlPerspective.getMessage("FORM_LABEL_UNION_MEMBERS")%></th>
-  </tr>
-  <%
-  XSDSimpleTypeDefinition[] memberTypes = frag.getMemberTypeDefinitions();
-  IXSDFragment[] memberFrags = frag.getAllFragments();
-  for (int i = 0; i < memberFrags.length || i < xsdConfig.getMinOccurs(); i++) {
-    int typeSelectionIndex = 0;
-    String[] newMemberFragIDs = new String[memberTypes.length];
-    IXSDFragment[] newMemberFrags = new IXSDFragment[memberTypes.length];
-    for (int j = 0; j < memberTypes.length; j++) {
-      if (i < memberFrags.length && memberFrags[i].getXSDTypeDefinition().getQName().equals(memberTypes[j].getQName())) {
-        newMemberFragIDs[j] = memberFrags[i].getID();
-        newMemberFrags[j] = memberFrags[i];
-        typeSelectionIndex = j;
-      }
-      else {
-        newMemberFragIDs[j] = frag.createUnionInstance(j);
-        newMemberFrags[j] = frag.getFragment(newMemberFragIDs[j]);
-      }
-    }
-    %>
-    <tr>
-      <td class="checkboxcells" width=10>
-        <input type="checkbox" onClick="handleRowCheckboxClick()" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ROW_CHECK_BOX")%>">
-      </td>
-      <td class="tablecells">
-        <select id="<%=frag.getID()%>" name="<%=frag.getID()%>" onChange="javascript:changeUnionMemberType(this)" title="<%=wsdlPerspective.getMessage("FORM_CONTROL_TITLE_SELECT_UNION_TYPE")%>">
-          <%
-          for (int k = 0; k < memberTypes.length; k++) {
-            if (k == typeSelectionIndex) {
-              %>
-              <option value="<%=newMemberFragIDs[k]%>" selected><%=memberTypes[k].getQName()%>
-              <%
-            }
-            else {
-              %>
-              <option value="<%=newMemberFragIDs[k]%>"><%=memberTypes[k].getQName()%>
-              <%
-            }
-          }
-          %>
-        </select>
-      </td>
-      <td class="tablecells">
-        <%
-        for (int l = 0; l < memberTypes.length; l++) {
-          fragID.delete(0, fragID.length());
-          fragID.append(newMemberFragIDs[l]);
-          String memberTableContainerID = (new StringBuffer(FragmentConstants.TABLE_ID)).append(newMemberFrags[l].getID()).toString();
-        %>
-        <span id="<%=memberTableContainerID%>">
-          <jsp:include page="<%=newMemberFrags[l].getWriteFragment()%>" flush="true"/>
-        </span>
-        <script language="javascript">
-          showTable('<%=memberTableContainerID%>', <%=(l == typeSelectionIndex)%>);
-        </script>
-        <%
-        }
-        %>
-      </td>
-    </tr>
-  <%
-  }
-  %>
-</table>
-</span>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/invoke_wsdl_operation_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/invoke_wsdl_operation_enabled.gif
deleted file mode 100644
index 0f055924f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/invoke_wsdl_operation_enabled.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/invoke_wsdl_operation_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/invoke_wsdl_operation_highlighted.gif
deleted file mode 100644
index bcfc403a0..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/invoke_wsdl_operation_highlighted.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/open_wsdl_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/open_wsdl_enabled.gif
deleted file mode 100644
index 9ffa818f4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/open_wsdl_enabled.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/open_wsdl_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/open_wsdl_highlighted.gif
deleted file mode 100644
index 5455bae67..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/open_wsdl_highlighted.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/wsdl_binding_node.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/wsdl_binding_node.gif
deleted file mode 100644
index ae386c636..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/wsdl_binding_node.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/wsdl_operation_node.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/wsdl_operation_node.gif
deleted file mode 100644
index c211ba23c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/wsdl_operation_node.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/wsdl_service_node.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/wsdl_service_node.gif
deleted file mode 100644
index 15d08be6c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/wsdl_service_node.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/scripts/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/scripts/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/scripts/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/scripts/fragmenttables.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/scripts/fragmenttables.jsp
deleted file mode 100644
index c4fb85fa9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/scripts/fragmenttables.jsp
+++ /dev/null
@@ -1,183 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*"%>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/scripts/tables.jsp" flush="true"/>
-<jsp:include page="/scripts/formutils.jsp" flush="true"/>
-<jsp:include page="/scripts/calendarbrowser.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-
-<%
-   WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-%>
-
-<script language="javascript">
-  var xsdInfoDialog;
-  var xsdInfoDialogClosed = true;
-  var rowCheckboxName = "rowCheckboxName";
-  var unbounded = <%=FragmentConstants.UNBOUNDED%>;
-
-  function checkMaxOccursReached(tableContainerID, maxOccurs) {
-    var table = getTable(tableContainerID);
-    if (maxOccurs != unbounded && (table.rows.length - numberOfHeaderRows) >= maxOccurs) {
-      alert("<%=HTMLUtils.JSMangle(wsdlPerspective.getMessage("MSG_ERROR_MAX_OCCURS_VIOLATION"))%>");
-      return true;
-    }
-    else
-      return false;
-  }
-
-  function checkMinOccursAndRemoveSelectedRows(tableContainerID, minOccurs) {
-    var table = getTable(tableContainerID);
-    var rowsLength = table.rows.length - numberOfHeaderRows;
-    var checkedRows = 0;
-    for (var i = numberOfHeaderRows; i < table.rows.length; i++) {
-      var tableRow = table.rows[i];
-      var rowCheckbox = tableRow.getElementsByTagName("input").item(0);
-      if (rowCheckbox.checked)
-        checkedRows++;
-    }
-    if (checkedRows == 0)
-      alert("<%=HTMLUtils.JSMangle(wsdlPerspective.getMessage("MSG_ERROR_NOTHING_SELECTED"))%>");
-    else if ((rowsLength - checkedRows) < minOccurs)
-      alert("<%=HTMLUtils.JSMangle(wsdlPerspective.getMessage("MSG_ERROR_MIN_OCCURS_VIOLATION"))%>");
-    else
-      removeSelectedRows(tableContainerID);
-  }
-  
-  function checkMinOccursAndRemoveSelectedDateTimeRows(calendarType,tableContainerID,minOccurs)
-  {
-    var table = getTable(tableContainerID);
-    var newCalendarTargetRow = calendarTargetRow;
-    for (var i=numberOfHeaderRows;i<table.rows.length;i++)
-    {
-      var columns = table.rows[i].getElementsByTagName("td");
-      var rowCheckbox = columns.item(0).getElementsByTagName("input").item(0);
-      if (rowCheckbox.checked)
-      {
-        if (i-numberOfHeaderRows == calendarTargetRow)
-          newCalendarTargetRow = -1;
-        else
-          newCalendarTargetRow--;
-      }
-    }
-    if (newCalendarTargetRow == -1)
-      closeCalendarBrowser();
-    calendarTargetRow = newCalendarTargetRow;
-      
-    checkMinOccursAndRemoveSelectedRows(tableContainerID,minOccurs);
-<%
-   // Fix the browse... links.
-%>
-    var table = getTable(tableContainerID);
-    for (var i=numberOfHeaderRows;i<table.rows.length;i++)
-    {
-      var columns = table.rows[i].getElementsByTagName("td");
-      var dateTimeTextField = columns.item(1).getElementsByTagName("input").item(0);
-      setDateTimeBrowseLinkHref(columns.item(2).getElementsByTagName("a").item(0),calendarType,dateTimeTextField.name,i-numberOfHeaderRows);
-    }
-  }
-
-  function createInstance(tableContainerID, maxOccurs, fragmentID, nameAnchorID) {
-    if (checkMaxOccursReached(tableContainerID, maxOccurs))
-      return;
-    twistOpen(tableContainerID);
-    var table = getTable(tableContainerID);
-    var tableBody = table.getElementsByTagName("tbody").item(0);
-    var newRow = document.createElement("tr");
-    var newColumn = document.createElement("td");
-    newColumn.appendChild(createHiddenElement("<%=FragmentConstants.FRAGMENT_ID%>", fragmentID));
-    newColumn.appendChild(createHiddenElement("<%=FragmentConstants.NAME_ANCHOR_ID%>", nameAnchorID));
-    newRow.appendChild(newColumn);
-    tableBody.appendChild(newRow);
-    var form = document.getElementsByTagName("form");
-    form[0].action = "<%=response.encodeURL(controller.getPathWithContext("wsdl/actions/CreateInstanceActionJSP.jsp"))%>";
-    form[0].submit();
-  }
-
-  function openXSDInfoDialog(link) {
-    xsdInfoDialog = window.open(link, "XSDInformationDialog", "height=500,width=500,scrollbars=no,resizable=yes");
-    if (xsdInfoDialog.focus)
-      xsdInfoDialog.focus();
-  }
-
-  function closeXSDInfoDialog()
-  {
-    if (!xsdInfoDialogClosed)
-      xsdInfoDialog.close();
-  }
-
-  function synchronizeFragmentViews(viewID) {
-    var form = document.getElementsByTagName("form");
-    if (viewID == "<%=FragmentConstants.FRAGMENT_VIEW_SWITCH_FORM_TO_SOURCE%>")
-      form[0].appendChild(createHiddenElement("<%=FragmentConstants.FRAGMENT_VIEW_ID%>","<%=FragmentConstants.FRAGMENT_VIEW_SWITCH_FORM_TO_SOURCE%>"));
-    else
-      form[0].appendChild(createHiddenElement("<%=FragmentConstants.FRAGMENT_VIEW_ID%>","<%=FragmentConstants.FRAGMENT_VIEW_SWITCH_SOURCE_TO_FORM%>"));
-    form[0].action = "<%=response.encodeURL(controller.getPathWithContext("wsdl/actions/SynchronizeFragmentViewsActionJSP.jsp"))%>";
-    form[0].submit();
-  }
-  
-  function addSimpleAtomicDateTimeRows(calendarType,tableContainerID,id,name,value,maxOccurs) {
-    if (checkMaxOccursReached(tableContainerID, maxOccurs))
-      return;
-    twistOpen(tableContainerID);
-    var table = getTable(tableContainerID);
-    var tableBody = table.getElementsByTagName("tbody").item(0);
-    var newRow = document.createElement("tr");
-    var column0 = document.createElement("td");
-    var column1 = document.createElement("td");
-    var column2 = document.createElement("td");
-
-    var rowCheckbox = createRowCheckbox();
-    column0.appendChild(rowCheckbox);
-
-    var input = document.createElement("input");
-    input.type = "text";
-    input.id = id;
-    input.name = name;
-    if (value != null && value.length > 0)
-      input.value = value;
-    input.className = "tabletextenter";
-    column1.appendChild(input);
-    
-    column2.appendChild(createDateTimeBrowseLink(calendarType,name,table.rows.length-1));
-    column2.width = "90%";
-
-    column0.className = "checkboxcells";
-    column1.className = "tablecells";
-    column2.className = "tablecells";
-    newRow.appendChild(column0);
-    newRow.appendChild(column1);
-    newRow.appendChild(column2);
-    tableBody.appendChild(newRow);
-  }  
-  
-  function createDateTimeBrowseLink(calendarType,name,position)
-  {
-    var link = document.createElement("a");
-    setDateTimeBrowseLinkHref(link,calendarType,name,position);
-    link.appendChild(document.createTextNode("<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LINK_BROWSE"))%>"));
-    return link;
-  }
-  
-  function setDateTimeBrowseLinkHref(link,calendarType,name,position)
-  {
-    link.href = "javascript:openCalendarBrowser("+calendarType+",'contentborder','"+name+"',"+position+")";
-    return link;
-  }
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/scripts/wsdlframesets.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/scripts/wsdlframesets.jsp
deleted file mode 100644
index d0c384952..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/scripts/wsdlframesets.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:include page="/scripts/panes.jsp" flush="true"/>
-<script language="javascript">
-  function getActionsContainerFrameset()
-  {
-    return perspectiveContent.frames["<%=WSDLFrameNames.WSDL_ACTIONS_CONTAINER%>"].document.getElementsByTagName("frameset").item(0);
-  }
-  
-  function processFramesetSizes(framesetSizesForm)
-  {
-    toggleDoubleClickColumnTitle();
-    var perspectiveContentFrameset = getPerspectiveContentFrameset();
-    var actionsContainerFrameset = getActionsContainerFrameset();
-    framesetSizesForm.<%=WSDLActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT%>.value = perspectiveContentFrameset.cols;
-    framesetSizesForm.<%=WSDLActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER%>.value = actionsContainerFrameset.rows;
-    framesetSizesForm.submit();
-  }
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/scripts/wsdlpanes.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/scripts/wsdlpanes.jsp
deleted file mode 100644
index 5b509c095..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/scripts/wsdlpanes.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                             org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*" %>
-
-<jsp:include page="/scripts/panes.jsp" flush="true"/>
-<script language="javascript">
-  var wsdlNavigatorContainer = perspectiveContent.frames["<%=WSDLFrameNames.WSDL_NAVIGATOR_CONTAINER%>"];
-  var wsdlNavigatorToolbar = wsdlNavigatorContainer.frames["<%=WSDLFrameNames.WSDL_NAVIGATOR_TOOLBAR%>"];
-  var wsdlNavigatorContent = wsdlNavigatorContainer.frames["<%=WSDLFrameNames.WSDL_NAVIGATOR_CONTENT%>"];
-  var wsdlActionsContainer = perspectiveContent.frames["<%=WSDLFrameNames.WSDL_ACTIONS_CONTAINER%>"];
-  var wsdlPropertiesContainer = wsdlActionsContainer.frames["<%=WSDLFrameNames.WSDL_PROPERTIES_CONTAINER%>"];
-  var wsdlPropertiesToolbar = wsdlPropertiesContainer.frames["<%=WSDLFrameNames.WSDL_PROPERTIES_TOOLBAR%>"];
-  var wsdlPropertiesContent = wsdlPropertiesContainer.frames["<%=WSDLFrameNames.WSDL_PROPERTIES_CONTENT%>"];
-  var wsdlStatusContainer = wsdlActionsContainer.frames["<%=WSDLFrameNames.WSDL_STATUS_CONTAINER%>"];
-  var wsdlStatusToolbar = wsdlStatusContainer.frames["<%=WSDLFrameNames.WSDL_STATUS_TOOLBAR%>"];
-  var wsdlStatusContent = wsdlStatusContainer.frames["<%=WSDLFrameNames.WSDL_STATUS_CONTENT%>"];
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/soap_envelope_xml.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/soap_envelope_xml.jsp
deleted file mode 100644
index 1b6ee0dec..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/soap_envelope_xml.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/xml; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                       org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-int soapEnvelopeType = Integer.parseInt(request.getParameter(WSDLActionInputs.SOAP_ENVELOPE_TYPE));
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-SOAPMessageQueue soapMessageQueue;
-switch (soapEnvelopeType)
-{
-  case WSDLActionInputs.SOAP_ENVELOPE_TYPE_REQUEST:
-    soapMessageQueue = wsdlPerspective.getSOAPRequestQueue();
-    break;
-  case WSDLActionInputs.SOAP_ENVELOPE_TYPE_RESPONSE:
-  default:
-    soapMessageQueue = wsdlPerspective.getSOAPResponseQueue();
-    break;
-}
-String messages = soapMessageQueue.getMessagesFromList();
-%>
-<%=messages%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_actions_container.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_actions_container.jsp
deleted file mode 100644
index b0c3d0688..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_actions_container.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-%>   
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=wsdlPerspective.getMessage("FRAME_TITLE_ACTIONS_CONTAINER")%></title>
-</head>
-<frameset rows="<%=wsdlPerspective.getActionsContainerFramesetRows()%>" bgcolor="#ECE9D8">
-  <frame name="<%=WSDLFrameNames.WSDL_PROPERTIES_CONTAINER%>" title="<%=wsdlPerspective.getMessage("FRAME_TITLE_PROPERTIES_CONTAINER")%>" src="<%=response.encodeURL("wsdl_properties_container.jsp")%>" scrolling="no" frameborder=1 marginwidth=0 marginheight=0>
-  <frame name="<%=WSDLFrameNames.WSDL_STATUS_CONTAINER%>" title="<%=wsdlPerspective.getMessage("FRAME_TITLE_STATUS_CONTAINER")%>" src="<%=response.encodeURL("wsdl_status_container.jsp")%>" scrolling="no" frameborder=1 marginwidth=0 marginheight=0>
-</frameset>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_navigator_container.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_navigator_container.jsp
deleted file mode 100644
index 0820de627..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_navigator_container.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-%>   
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<frameset rows="33,*" border=0 bgcolor="#ECE9D8">
-  <frame name="<%=WSDLFrameNames.WSDL_NAVIGATOR_TOOLBAR%>" title="<%=wsdlPerspective.getMessage("FRAME_TITLE_NAVIGATOR_TOOLBAR")%>" src="<%=response.encodeURL("wsdl_navigator_toolbar.jsp")%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-  <frame name="<%=WSDLFrameNames.WSDL_NAVIGATOR_CONTENT%>" title="<%=wsdlPerspective.getMessage("FRAME_TITLE_NAVIGATOR_CONTENT")%>" src="<%=response.encodeURL("wsdl_navigator_content.jsp")%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-</frameset>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_navigator_content.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_navigator_content.jsp
deleted file mode 100644
index 7b47e4dd2..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_navigator_content.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-%>      
-<html>
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <title><%=wsdlPerspective.getMessage("FRAME_TITLE_NAVIGATOR_CONTENT")%></title>
-    <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/treeview.css"))%>">
-    <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-    <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-    </script>
-    <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/treeview.js"))%>">
-    </script>
-</head>
-<%
-    String selectedAnchorName = "";
-    NodeManager nodeManager = controller.getWSDLPerspective().getNodeManager();
-    int focusedNodeId = nodeManager.getFocusedNodeId();
-    String focusedAnchorName = String.valueOf(focusedNodeId);
-    Node selectedNode = nodeManager.getSelectedNode();
-    if (selectedNode != null) {
-        selectedAnchorName = selectedNode.getAnchorName();
-        if (focusedNodeId == selectedNode.getNodeId())
-            focusedAnchorName = selectedAnchorName;
-    }
-%>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" onLoad="self.location.hash='#<%=focusedAnchorName%>';setSelectedAnchorName('<%=selectedAnchorName%>')" class="contentbodymargin">
-    <div id="treecontentborder">
-        <%=nodeManager.renderTreeView(response)%>
-    </div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_navigator_toolbar.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_navigator_toolbar.jsp
deleted file mode 100644
index afc523c87..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_navigator_toolbar.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-%>   
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=wsdlPerspective.getMessage("FRAME_TITLE_NAVIGATOR_TOOLBAR")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/toolbar.css"))%>">
-<jsp:include page="/wsdl/scripts/wsdlframesets.jsp" flush="true"/>  
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/toolbar.js"))%>">
-</script>  
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="toolbarbodymargin">
-<div id="toolbarborder">
-  <div id="toolbar" ondblclick="processFramesetSizes(document.forms[0])">
-<jsp:useBean id="formAction" class="java.lang.StringBuffer" scope="request">
-<%
-  formAction.append("wsdl/actions/ResizeWSDLFramesActionJSP.jsp");
-%>  
-</jsp:useBean>
-<jsp:useBean id="formFrameName" class="java.lang.StringBuffer" scope="request">
-<%
-   formFrameName.append(WSDLFrameNames.WSDL_NAVIGATOR_CONTAINER);
-%>
-</jsp:useBean>
-<jsp:include page="/wsdl/forms/ProcessWSDLFramesetsForm.jsp" flush="true"/>
-    <table width="100%" height=25 cellpadding=0 cellspacing=0 border=0>
-      <tr>
-        <td valign="middle" align="center" width=25 height=25><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/navigator.gif"))%>" width=16 height=16></td>
-<%
-   String doubleClickColumnTitle = null;
-   if (wsdlPerspective.getPerspectiveContentFramesetCols().startsWith("100%"))
-     doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_RESTORE");
-   else
-     doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_MAXIMIZE");
-%>        
-        <td id="doubleclickcolumn" title="<%=doubleClickColumnTitle%>" valign="middle" align="left" width="*" height=25 nowrap class="text"><%=controller.getMessage("ALT_NAVIGATOR")%></td>
-<%
-   String altRefresh = controller.getMessage("ALT_REFRESH");
-   String altClear = controller.getMessage("ALT_CLEAR");
-%>           
-        <td valign="middle" align="center" width=25 height=25><a href="<%=response.encodeURL(controller.getPathWithContext("wsdl/actions/RefreshWSDLActionJSP.jsp"))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/refresh_enabled.gif"))%>" width=16 height=16 onMouseOver="src='<%=response.encodeURL(controller.getPathWithContext("images/refresh_highlighted.gif"))%>';mouseover(this)" onMouseOut="src='<%=response.encodeURL(controller.getPathWithContext("images/refresh_enabled.gif"))%>';mouseout(this)" onMouseDown="src='<%=response.encodeURL(controller.getPathWithContext("images/refresh_highlighted.gif"))%>';mousedown(this)" onMouseUp="src='<%=response.encodeURL(controller.getPathWithContext("images/refresh_enabled.gif"))%>';mouseup(this)" alt="<%=altRefresh%>" title="<%=altRefresh%>"></a></td>
-        <td valign="middle" align="center" width=25 height=25><a href="<%=response.encodeURL(controller.getPathWithContext("wsdl/actions/ClearWSDLActionJSP.jsp"))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>" width=16 height=16 onMouseOver="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_highlighted.gif"))%>';mouseover(this)" onMouseOut="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>';mouseout(this)" onMouseDown="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_highlighted.gif"))%>';mousedown(this)" onMouseUp="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>';mouseup(this)" alt="<%=altClear%>" title="<%=altClear%>"></a></td>
-      </tr>
-    </table>
-  </div>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_perspective_content.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_perspective_content.jsp
deleted file mode 100644
index aab86c99c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_perspective_content.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-%>   
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<frameset cols="<%=wsdlPerspective.getPerspectiveContentFramesetCols()%>" bgcolor="#ECE9D8">
-  <%
-  if (org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.isRTL())
-  {
-  %>
-  <frame name="<%=WSDLFrameNames.WSDL_ACTIONS_CONTAINER%>" title="<%=wsdlPerspective.getMessage("FRAME_TITLE_ACTIONS_CONTAINER")%>" src="<%=response.encodeURL("wsdl_actions_container.jsp")%>" marginwidth=0 marginheight=0 scrolling="no" frameborder=1>
-  <frame name="<%=WSDLFrameNames.WSDL_NAVIGATOR_CONTAINER%>" title="<%=wsdlPerspective.getMessage("FRAME_TITLE_NAVIGATOR_CONTAINER")%>" src="<%=response.encodeURL("wsdl_navigator_container.jsp")%>" marginwidth=0 marginheight=0 scrolling="no" frameborder=1>
-  <%
-  }
-  else
-  {
-  %>
-  <frame name="<%=WSDLFrameNames.WSDL_NAVIGATOR_CONTAINER%>" title="<%=wsdlPerspective.getMessage("FRAME_TITLE_NAVIGATOR_CONTAINER")%>" src="<%=response.encodeURL("wsdl_navigator_container.jsp")%>" marginwidth=0 marginheight=0 scrolling="no" frameborder=1>
-  <frame name="<%=WSDLFrameNames.WSDL_ACTIONS_CONTAINER%>" title="<%=wsdlPerspective.getMessage("FRAME_TITLE_ACTIONS_CONTAINER")%>" src="<%=response.encodeURL("wsdl_actions_container.jsp")%>" marginwidth=0 marginheight=0 scrolling="no" frameborder=1>
-  <%
-  }
-  %>
-</frameset>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_properties_container.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_properties_container.jsp
deleted file mode 100644
index 558e23300..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_properties_container.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-%>   
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=wsdlPerspective.getMessage("FRAME_TITLE_PROPERTIES_CONTAINER")%></title>
-</head>
-<frameset rows="33,*" border=0 bgcolor="#ECE9D8">
-  <frame name="<%=WSDLFrameNames.WSDL_PROPERTIES_TOOLBAR%>" title="<%=wsdlPerspective.getMessage("FRAME_TITLE_PROPERTIES_TOOLBAR")%>" src="<%=response.encodeURL("wsdl_properties_toolbar.jsp")%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-  <frame name="<%=WSDLFrameNames.WSDL_PROPERTIES_CONTENT%>" title="<%=wsdlPerspective.getMessage("FRAME_TITLE_PROPERTIES_CONTENT")%>" src="<%=response.encodeURL("wsdl_properties_content.jsp")%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-</frameset>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_properties_content.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_properties_content.jsp
deleted file mode 100644
index 876e36d55..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_properties_content.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-%>   
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=wsdlPerspective.getMessage("FRAME_TITLE_PROPERTIES_CONTENT")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-<%
-    NodeManager nodeManager = wsdlPerspective.getNodeManager();
-    Node selectedNode = nodeManager.getSelectedNode();
-    if (selectedNode != null)
-    {
-        ToolManager toolManager;
-        if (selectedNode.getViewId() == ActionInputs.VIEWID_DEFAULT)
-            toolManager = selectedNode.getToolManager();
-        else
-            toolManager = selectedNode.getViewToolManager();
-        Tool selectedTool = toolManager.getSelectedTool();
-        if (selectedTool != null && selectedTool.getToolType() != ToolTypes.ACTION) {
-        %>
-        <script language="javascript">
-            location="<%=response.encodeURL(controller.getPathWithContext(selectedTool.getFormLink()))%>";
-        </script>
-        <%
-        }
-        else {
-        %>
-<table>
-  <tr>
-    <td>
-      <%=controller.getMessage("MSG_ERROR_NO_ACTION_SELECTED")%>
-    </td>
-  </tr>
-</table>
-        <%
-        }
-    }
-    else {
-    %>
-<table>
-  <tr>
-    <td>
-      <%=controller.getMessage("MSG_ERROR_NO_NODE_SELECTED")%>
-    </td>
-  </tr>
-</table>
-    <%
-    }
-%>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_properties_toolbar.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_properties_toolbar.jsp
deleted file mode 100644
index d882c3042..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_properties_toolbar.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-%>   
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=wsdlPerspective.getMessage("FRAME_TITLE_PROPERTIES_TOOLBAR")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/toolbar.css"))%>">
-<jsp:include page="/wsdl/scripts/wsdlframesets.jsp" flush="true"/>  
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/toolbar.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="toolbarbodymargin">
-<div id="toolbarborder">
-  <div id="toolbar" ondblclick="processFramesetSizes(document.forms[0])">
-<jsp:useBean id="formAction" class="java.lang.StringBuffer" scope="request">
-<%
-  formAction.append("wsdl/actions/ResizeWSDLFramesActionJSP.jsp");
-%>  
-</jsp:useBean>
-<jsp:useBean id="formFrameName" class="java.lang.StringBuffer" scope="request">
-<%
-   formFrameName.append(WSDLFrameNames.WSDL_PROPERTIES_CONTAINER);
-%>
-</jsp:useBean>
-<jsp:include page="/wsdl/forms/ProcessWSDLFramesetsForm.jsp" flush="true"/>
-    <table width="100%" height=25 cellpadding=0 cellspacing=0 border=0>
-      <tr>
-        <td valign="middle" align="center" width=25 height=25><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/actions.gif"))%>" width=16 height=16></td>
-<%
-   String doubleClickColumnTitle = null;
-   if (wsdlPerspective.getPerspectiveContentFramesetCols().endsWith("100%"))
-   {
-     if (wsdlPerspective.getActionsContainerFramesetRows().startsWith("100%"))
-       doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_RESTORE");
-   }
-   if (doubleClickColumnTitle == null)
-     doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_MAXIMIZE");
-%>        
-        <td id="doubleclickcolumn" title="<%=doubleClickColumnTitle%>" valign="middle" align="left" width="*" height=25 nowrap class="text"><%=controller.getMessage("ALT_ACTIONS")%></td>
-<%
-    NodeManager nodeManager = wsdlPerspective.getNodeManager();
-    Node selectedNode = nodeManager.getSelectedNode();
-    if (selectedNode != null) {
-        ToolManager toolManager;
-        if (selectedNode.getViewId() == ActionInputs.VIEWID_DEFAULT)
-            toolManager = selectedNode.getToolManager();
-        else
-            toolManager = selectedNode.getViewToolManager();
-        for(int i=0; i<toolManager.getNumberOfTools(); i++) {
-            Tool tool = (Tool)toolManager.getTool(i);
-            %>
-        <td valign="middle" align="center" width=25 height=25><%=tool.renderTool(response,controller)%></td>
-            <%
-        }
-    }
-%>
-      </tr>
-    </table>
-  </div>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_result_content.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_result_content.jsp
deleted file mode 100644
index 74e79f642..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_result_content.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-   int viewID = wsdlPerspective.getStatusContentType();
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=wsdlPerspective.getMessage("FRAME_TITLE_STATUS_CONTENT")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<jsp:include page="/scripts/tables.jsp" flush="true"/>
-<jsp:include page="/scripts/panes.jsp" flush="true"/>
-<script language="javascript">
-  function switchReadOnlyFragmentsView() {
-    perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/actions/SwitchReadOnlyFragmentViewsActionJSP.jsp"))%>";
-  }
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-  <table width="95%" border=0 cellpadding=3 cellspacing=0>
-    <tr>
-      <td align="right" class="labels">
-<%
-        if (viewID == wsdlPerspective.STATUS_CONTENT_RESULT_SOURCE)
-        {     
-%>
-          <a href="javascript:switchReadOnlyFragmentsView()" title="<%=wsdlPerspective.getMessage("ALT_SWITCH_TO_FORM_VIEW")%>"><%=wsdlPerspective.getMessage("FORM_LINK_FORM")%></a>
-<%
-        }
-        else
-        {
-%>
-          <a href="javascript:switchReadOnlyFragmentsView()" title="<%=wsdlPerspective.getMessage("ALT_SWITCH_TO_SOURCE_VIEW")%>"><%=wsdlPerspective.getMessage("FORM_LINK_SOURCE")%></a>
-<%
-        }
-%>   
-      </td>
-    </tr>
-  </table>
-<%
-  if (viewID == wsdlPerspective.STATUS_CONTENT_RESULT_SOURCE)
-  {
-%>
-    <jsp:include page="/wsdl/forms/ReadOnlyFragmentsSoapView.jsp" flush="true"/>
-<%
-  }
-  else
-  {
-%>
-    <jsp:include page="/wsdl/forms/ReadOnlyFragmentsFormView.jsp" flush="true"/>
-<%
-  }
-%>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_status_container.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_status_container.jsp
deleted file mode 100644
index b03acef31..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_status_container.jsp
+++ /dev/null
@@ -1,39 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-   String statusContentSrc = "wsdl_status_content.jsp";
-   switch (wsdlPerspective.getStatusContentType())
-   {
-     case WSDLPerspective.STATUS_CONTENT_RESULT_FORM:
-       statusContentSrc = "wsdl_result_content.jsp";
-       break;
-     case WSDLPerspective.STATUS_CONTENT_RESULT_SOURCE:
-     	statusContentSrc = "wsdl_result_content.jsp";
-     	break;
-   }
-%>   
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=wsdlPerspective.getMessage("FRAME_TITLE_STATUS_CONTAINER")%></title>
-</head>
-<frameset rows="33,*" border=0 bgcolor="#ECE9D8">
-  <frame name="<%=WSDLFrameNames.WSDL_STATUS_TOOLBAR%>" title="<%=wsdlPerspective.getMessage("FRAME_TITLE_STATUS_TOOLBAR")%>" src="<%=response.encodeURL("wsdl_status_toolbar.jsp")%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-  <frame name="<%=WSDLFrameNames.WSDL_STATUS_CONTENT%>" title="<%=wsdlPerspective.getMessage("FRAME_TITLE_STATUS_CONTENT")%>" src="<%=response.encodeURL(statusContentSrc)%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-</frameset>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_status_content.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_status_content.jsp
deleted file mode 100644
index 95ba86f3f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_status_content.jsp
+++ /dev/null
@@ -1,39 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-   wsdlPerspective.setStatusContentType(WSDLPerspective.STATUS_CONTENT_DEFAULT);
-%>   
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=wsdlPerspective.getMessage("FRAME_TITLE_STATUS_CONTENT")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-  <table>
-    <tr>
-      <td>
-        <pre>
-<%=wsdlPerspective.getMessageQueue().getMessagesFromList()%>
-        </pre>
-      </td>
-    </tr>
-  </table>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_status_toolbar.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_status_toolbar.jsp
deleted file mode 100644
index c5164e52e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_status_toolbar.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*"%>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-%>   
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=wsdlPerspective.getMessage("FRAME_TITLE_STATUS_TOOLBAR")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/toolbar.css"))%>">
-<jsp:include page="/wsdl/scripts/wsdlframesets.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/toolbar.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="toolbarbodymargin">
-<div id="toolbarborder">
-  <div id="toolbar" ondblclick="processFramesetSizes(document.forms[0])">
-<jsp:useBean id="formAction" class="java.lang.StringBuffer" scope="request">
-<%
-  formAction.append("wsdl/actions/ResizeWSDLFramesActionJSP.jsp");
-%>  
-</jsp:useBean>
-<jsp:useBean id="formFrameName" class="java.lang.StringBuffer" scope="request">
-<%
-   formFrameName.append(WSDLFrameNames.WSDL_STATUS_CONTAINER);
-%>
-</jsp:useBean>
-<jsp:include page="/wsdl/forms/ProcessWSDLFramesetsForm.jsp" flush="true"/>
-    <table width="100%" height=25 cellpadding=0 cellspacing=0 border=0>
-      <tr>
-        <td valign="middle" align="center" width=25 height=25><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/status.gif"))%>" width=16 height=16></td>
-<%
-   String doubleClickColumnTitle = null;
-   if (wsdlPerspective.getPerspectiveContentFramesetCols().endsWith("100%"))
-   {
-     if (wsdlPerspective.getActionsContainerFramesetRows().endsWith("100%"))
-       doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_RESTORE");
-   }
-   if (doubleClickColumnTitle == null)
-     doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_MAXIMIZE");
-%>        
-        <td id="doubleclickcolumn" title="<%=doubleClickColumnTitle%>" valign="middle" align="left" width="*" height=25 nowrap class="text"><%=controller.getMessage("ALT_STATUS")%></td>
-<%
-   String altClear = controller.getMessage("ALT_CLEAR");
-%>           
-        <td valign="middle" align="center" width=25 height=25><a href="<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_status_content.jsp"))%>" target="<%=WSDLFrameNames.WSDL_STATUS_CONTENT%>"><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>" width=16 height=16 onMouseOver="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_highlighted.gif"))%>';mouseover(this)" onMouseOut="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>';mouseout(this)" onMouseDown="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_highlighted.gif"))%>';mousedown(this)" onMouseUp="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>';mouseup(this)" alt="<%=altClear%>" title="<%=altClear%>"></a></td>
-      </tr>
-    </table>
-  </div>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl_browser.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl_browser.jsp
deleted file mode 100644
index 076bf96e8..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl_browser.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.actions.*,
-                                                        java.net.*" %>
-
-<%
-   String sessionId = request.getParameter(ActionInputs.SESSIONID);
-   HttpSession currentSession = (HttpSession)application.getAttribute(sessionId);
-   Controller controller = (Controller)currentSession.getAttribute("controller");
-   String wsdlTypeString = request.getParameter(ActionInputs.WSDL_TYPE);
-   int wsdlType = ActionInputs.WSDL_TYPE_SERVICE_INTERFACE;
-   try
-   {
-     wsdlType = Integer.parseInt(wsdlTypeString);
-   }
-   catch (NumberFormatException e)
-   {
-   }
-   controller.setWSDLType(wsdlType);
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>
-<%
-   String wsdlSource;
-   if (wsdlType == ActionInputs.WSDL_TYPE_SERVICE_INTERFACE)
-     wsdlSource = controller.getMessage("WSDL_TYPE_SERVICE_INTERFACES");
-   else
-     wsdlSource = controller.getMessage("WSDL_TYPE_SERVICES");
-     
-   StringBuffer sessionIdParam = new StringBuffer(ActionInputs.SESSIONID);
-   sessionIdParam.append('=').append(sessionId);
-   
-   StringBuffer toolbarLink = new StringBuffer("wsdl_toolbar.jsp?");
-   toolbarLink.append(ActionInputs.SESSIONID).append('=').append(sessionId);
-%>
-    <%=controller.getMessage("TITLE_WSDL_BROWSER",wsdlSource)%>
-  </title>
-</head>
-<frameset rows="33,*" border=0 bgcolor="#ECE9D8">
-  <frame name="<%=FrameNames.WSDL_TOOLBAR%>" title="<%=controller.getMessage("FRAME_TITLE_WSDL_TOOLBAR")%>" src="<%=response.encodeURL(controller.getPathWithContext(toolbarLink.toString()))%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-  <frame name="<%=FrameNames.WSDL_CONTENT%>" title="<%=controller.getMessage("FRAME_TITLE_WSDL_CONTENT")%>" src="<%=response.encodeURL(controller.getPathWithContext(ProxyLoadPageAction.getActionLink(sessionId,"wsdl_content.jsp")))%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-</frameset>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl_content.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl_content.jsp
deleted file mode 100644
index 432dd8dab..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl_content.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.core.resources.*,
-                                                        org.eclipse.core.runtime.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*,
-                                                        org.eclipse.wst.ws.internal.wsrt.WebServiceInfo,
-                                                        org.eclipse.wst.ws.internal.wsfinder.WebServiceFinder,
-                                                        javax.wsdl.extensions.soap.*,
-                                                        javax.wsdl.extensions.http.*,
-                                                        javax.wsdl.extensions.*,
-                                                        javax.wsdl.*,
-                                                        java.util.*,
-                                                        java.net.*" %>
-
-<%
-   String sessionId = request.getParameter(ActionInputs.SESSIONID);
-   HttpSession currentSession = (HttpSession)application.getAttribute(sessionId);
-   Controller controller = (Controller)currentSession.getAttribute("controller");
-   int wsdlType = controller.getWSDLType();
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-  <title><%=controller.getMessage("FRAME_TITLE_WSDL_CONTENT")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/resumeproxyloadpage.js"))%>">
-</script>  
-<script language="javascript">
-  var sectionIds = ["workbench","favorites"];
-  function fillWebProjects()
-  {
-    var x = 0;
-<%
-   {
-     IWorkspaceRoot iWorkspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
-     IProject[] projects = iWorkspaceRoot.getProjects();
-     for (int i=0;i<projects.length;i++)
-     {
-       if (!projects[i].isOpen())
-         continue;
-       
-%>
-    document.forms[0].<%=ActionInputs.PROJECT%>.options[x++] = new Option("<%=HTMLUtils.JSMangle(projects[i].getName())%>","<%=HTMLUtils.JSMangle(projects[i].getName())%>");
-<%
-       
-     }
-   }
-%>
-    if (document.forms[0].<%=ActionInputs.PROJECT%>.options.length > 0)
-    {
-      document.forms[0].<%=ActionInputs.PROJECT%>.options[0].selected = true;
-      fillWSDLFiles(document.forms[0].<%=ActionInputs.PROJECT%>.options[0].value);
-    }
-  }
-
-<%! private Vector wsdlURLs_ = new Vector(); %>
-
-  function fillWSDLFiles(selectedWebProjectName)
-  {
-    var currentNumberOfOptions = document.forms[0].<%=ActionInputs.QUERY_INPUT_WEBPROJECT_WSDL_URL%>.options.length;
-    for (var i=0;i<currentNumberOfOptions;i++)
-      document.forms[0].<%=ActionInputs.QUERY_INPUT_WEBPROJECT_WSDL_URL%>.options[0] = null;
-<%
-   {
-
-     IWorkspaceRoot iWorkspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
-     IProject[] projects = iWorkspaceRoot.getProjects();
-       
-     for (int i=0;i<projects.length;i++)
-     {
-       if (!projects[i].isOpen())
-         continue;
-       {
-%>
-    if (selectedWebProjectName == "<%=HTMLUtils.JSMangle(projects[i].getName())%>")
-    {
-      var x=0;
-<%
-         String platformProtocol = "platform:/resource";
-         String httpProtocol = "http://";
-         String httpsProtocol = "https://";
-         wsdlURLs_.removeAllElements();
-         
-         Iterator ws = WebServiceFinder.instance().getWebServices();  
-
-         while (ws.hasNext())
-         {
-            WebServiceInfo wsInfo = (WebServiceInfo)ws.next();
-            String url = wsInfo.getWsdlURL();
-            
-          // filter wsdl URLs with same project name as selected project
-          // only look at workspace URLs returned from the web service finder
-          if (url.startsWith(platformProtocol))
-          {
-             //strip off platformProtocol to look at the workspace path
-             Path wsdlPath = new Path(url.substring(platformProtocol.length()+1));
-             String pathProjName = wsdlPath.segment(0);                          
-
-             if (pathProjName.equals(projects[i].getName()))
-             {
-               wsdlURLs_.add(url);
-             }
-          }
-          // also add any http or https URLs returned
-          else if (url.startsWith(httpProtocol) || url.startsWith(httpsProtocol))
-          {
-               wsdlURLs_.add(url);
-          }
-         }
-         if (wsdlType == ActionInputs.WSDL_TYPE_SERVICE_INTERFACE)
-         {
-         
-         }
-
-         for (Iterator it = wsdlURLs_.iterator(); it.hasNext();)
-         {
-             String wsdl = HTMLUtils.JSMangle(it.next().toString());
-             %>
-              document.forms[0].<%=ActionInputs.QUERY_INPUT_WEBPROJECT_WSDL_URL%>.options[x++] = new Option("<%=wsdl%>", "<%=wsdl%>"); 
-             <%
-         }
-%>
-    }
-<%
-       }
-     }
-   }
-%>
-  }
-  
-  function fillFavoriteWSDLFiles()
-  {
-    var x = 0;
-<%
-   FavoritesPerspective favoritesPerspective = controller.getFavoritesPerspective();
-   NodeManager favoritesNodeManager = favoritesPerspective.getNodeManager();
-   TreeElement favoritesMainElement = favoritesNodeManager.getRootNode().getTreeElement();
-   TreeElement favoriteWSDLServicesElement = (TreeElement)(favoritesMainElement.getElements(FavoritesModelConstants.REL_WSDL_SERVICE_FOLDER_NODE).nextElement());
-   Enumeration favoriteWSDLServiceElements = favoriteWSDLServicesElement.getElements(FavoritesModelConstants.REL_WSDL_SERVICE_NODE);
-   while (favoriteWSDLServiceElements.hasMoreElements())
-   {
-     FavoritesWSDLServiceElement favoriteWSDLServiceElement = (FavoritesWSDLServiceElement)favoriteWSDLServiceElements.nextElement();
-     String url = HTMLUtils.JSMangle((favoriteWSDLServiceElement.getService().getDescriptions())[0].getLocation());
-%>
-    document.forms[0].<%=ActionInputs.QUERY_INPUT_FAVORITE_WSDL_URL%>.options[x++] = new Option("<%=url%>","<%=url%>");
-<%     
-   }
-%>  
-  }
-  
-  function toggleForm(formIndex)
-  {
-    for (var i=0;i<sectionIds.length;i++)
-    {
-      if (i == formIndex)
-        document.getElementById(sectionIds[i]).style.display = "";
-      else
-        document.getElementById(sectionIds[i]).style.display = "none";
-    }  
-  }
-  
-  function setDefaults()
-  {
-    fillWebProjects();
-    fillFavoriteWSDLFiles();
-    document.getElementById(sectionIds[0]).style.display = "";
-    var loadScreenTable = document.getElementById("loadScreen");
-    if (loadScreenTable.rows.length > 0)
-      loadScreenTable.deleteRow(0);
-    document.getElementById("mainScreen").style.display = "";      
-  }
-</script>
-</head>
-
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-  <div id="contentborder">
-    <table id="loadScreen">
-      <tr>
-        <td>
-          <%=controller.getMessage("MSG_LOAD_IN_PROGRESS")%>
-        </td>
-      </tr>
-    </table>
-    <div id="mainScreen" style="display:none;">
-      <form style="margin-top:0">
-<%
-   if (wsdlType == ActionInputs.WSDL_TYPE_SERVICE)
-   {
-%>
-        <table>
-          <tr>
-            <td> <%=controller.getMessage("FORM_LABEL_WSDL_SOURCE")%> </td>
-          </tr>
-          <tr>
-            <td>               
-              <input type="radio" name="selectFrom" onClick="toggleForm(0)" checked><%=controller.getMessage("FORM_LABEL_WSDL_SOURCE_WEBPROJECTS")%>
-              <input type="radio" name="selectFrom" onClick="toggleForm(1)"><%=controller.getMessage("FORM_LABEL_WSDL_SOURCE_FAVORITES")%>
-            </td>
-          </tr>
-        </table>
-<%              
-   }
-%>              
-        <div id="workbench" style="display:none;">
-          <table width="95%" border=0 cellpadding=3 cellspacing=0>
-            <tr>
-              <td height=30 valign="bottom" class="labels"><%=controller.getMessage("FORM_LABEL_WEB_PROJECT")%></td>
-            </tr>
-            <tr>
-              <td nowrap>
-                <select name="<%=ActionInputs.PROJECT%>" onChange="fillWSDLFiles(this.value)" class="selectlist">
-                </select>
-                <input type="button" value="<%=controller.getMessage("FORM_BUTTON_REFRESH")%>" onClick="document.location.reload()" class="button">
-              </td>
-            </tr>
-            <tr>
-              <td height=10 valign="bottom" class="labels"><%=controller.getMessage("FORM_LABEL_WSDL_URL")%></td>
-            </tr>
-            <tr>
-              <td>
-                <select name="<%=ActionInputs.QUERY_INPUT_WEBPROJECT_WSDL_URL%>" class="selectlist">
-                </select>
-              </td>
-            </tr>
-          </table>
-          <table border=0 cellpadding=2 cellspacing=0>
-            <tr>
-              <td height=30 valign="bottom" nowrap align="left">
-                <input type="button" value="<%=controller.getMessage("FORM_BUTTON_GO")%>" onClick="top.opener.targetWSDLURLElement.value=this.form.<%=ActionInputs.QUERY_INPUT_WEBPROJECT_WSDL_URL%>.value;top.close()" class="button">
-              </td>
-              <td height=30 valign="bottom" nowrap align="left">
-                <input type="button" value="<%=controller.getMessage("FORM_BUTTON_CANCEL")%>" onClick="top.close()" class="button">
-              </td>
-              <td nowrap width="90%">&nbsp;</td>
-            </tr>
-          </table>
-        </div>
-        <div id="favorites" style="display:none;">
-          <table width="95%" border=0 cellpadding=3 cellspacing=0>
-            <tr>
-              <td height=30 valign="bottom" class="labels"><%=controller.getMessage("FORM_LABEL_WSDL_URL")%></td>
-            </tr>
-            <tr>
-              <td>
-                <select name="<%=ActionInputs.QUERY_INPUT_FAVORITE_WSDL_URL%>" class="selectlist">
-              </td>
-          </table>
-          <table border=0 cellpadding=2 cellspacing=0>
-            <tr>
-              <td height=30 valign="bottom" nowrap align="left">
-                <input type="button" value="<%=controller.getMessage("FORM_BUTTON_GO")%>" onClick="top.opener.targetWSDLURLElement.value=this.form.<%=ActionInputs.QUERY_INPUT_FAVORITE_WSDL_URL%>.value;top.close()" class="button">
-              </td>
-              <td height=30 valign="bottom" nowrap align="left">
-                <input type="button" value="<%=controller.getMessage("FORM_BUTTON_CANCEL")%>" onClick="top.close()" class="button">
-              </td>
-              <td nowrap width="90%">&nbsp;</td>
-            </tr>
-          </table>          
-        </div>
-      </form>
-    </div>
-  </div>
-<script language="javascript">
-  setDefaults();
-  resumeProxyLoadPage();
-</script>  
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl_toolbar.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl_toolbar.jsp
deleted file mode 100644
index d7c838d6c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl_toolbar.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<%
-   String sessionId = request.getParameter(ActionInputs.SESSIONID);
-   HttpSession currentSession = (HttpSession)application.getAttribute(sessionId);
-   Controller controller = (Controller)currentSession.getAttribute("controller");
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=controller.getMessage("FRAME_TITLE_WSDL_TOOLBAR")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/toolbar.css"))%>">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" onUnload="top.opener.wsdlWindowClosed=true" class="toolbarbodymargin">
-<div id="toolbarborder">
-  <div id="toolbar">
-    <table width="100%" height=25 cellpadding=0 cellspacing=0 border=0>
-      <tr>
-        <td valign="middle" align="center" width=25 height=25><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/wsdl.gif"))%>" width=16 height=16></td>
-        <td valign="middle" align="left" width="*" height=25 nowrap class="text"><%=controller.getMessage("ALT_WSDL_BROWSER")%></td>
-      </tr>
-    </table>
-  </div>
-</div>
-<script language="javascript">
-  top.opener.wsdlWindowClosed = false;
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsexplorer.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsexplorer.jsp
deleted file mode 100644
index a90aa8be5..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsexplorer.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.URLUtils,
-                                                        java.util.Enumeration,
-                                                        java.net.*,
-                                                        java.io.*"%>
-
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <script language="javascript">
-    function initWindowName(name)
-    {
-      window.name = name;
-    }
-  </script>
-  <%
-  String sessionId = session.getId();
-  %>
-  <jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session">
-    <%
-    // Add the session to the application. This allows us to resurrect the session even if the browser chooses not to participate.
-    application.setAttribute(sessionId,session);
-
-    if (session.getMaxInactiveInterval() > 0)
-      session.setMaxInactiveInterval(-1);
-
-    // LaunchOptionManager (below) handles most options,
-    // but need to get state and install locations earlier,
-    // specifically before controller.init().
-    Enumeration paramNames = request.getParameterNames();
-    while (paramNames.hasMoreElements())
-    {
-      String paramName = (String)paramNames.nextElement();
-      String[] paramValues = request.getParameterValues(paramName);
-      if (paramValues != null && paramValues.length > 0)
-      {
-        String decodedParamName = URLUtils.decode(paramName);
-        if (decodedParamName.equals(LaunchOptions.DEFAULT_FAVORITES_LOCATION))
-        {
-          controller.setDefaultFavoritesLocation(paramValues[0]);
-        }
-        else if (decodedParamName.equals(LaunchOptions.STATE_LOCATION))
-        {
-          controller.setStateLocation(paramValues[0]);
-        }
-      }
-    }
-
-    // controller.init()
-    controller.init(sessionId,application,request.getContextPath());
-    %>
-  </jsp:useBean>
-  <%
-  // preload from LaunchOptionManager
-  String key = request.getParameter(URLUtils.encode(WSExplorerContext.ID));
-  if (key != null && key.length() > 0)
-  {
-    LaunchOptionsManager manager = LaunchOptionsManager.getInstance();
-    manager.manage(key, sessionId, application);
-  }
-  %>
-  <jsp:include page="/actionengine.jsp" flush="true"/>
-  <title><%=controller.getMessage("TITLE_WSEXPLORER")%></title>
-</head>
-<%
-// reset perspective content to blank
-controller.enablePerspectiveContentBlank(true);
-%>
-<frameset rows="0,35,*" border=0 onload="javascript:initWindowName('<%=FrameNames.WINDOW_NAME_WSEXPLORER_JSP%>')">
-  <frame name="<%=FrameNames.PERSPECTIVE_WORKAREA%>" title="<%=controller.getMessage("FRAME_TITLE_PERSPECTIVE_WORKAREA")%>" frameborder=0 noresize>
-  <frame name="<%=FrameNames.PERSPECTIVE_TOOLBAR%>" title="<%=controller.getMessage("FRAME_TITLE_PERSPECTIVE_TOOLBAR")%>" src="<%=response.encodeURL(controller.getPathWithContext("perspective_toolbar.jsp"))%>" marginwidth=0 marginheight=0 scrolling="no" frameborder=0 noresize>
-  <frame name="<%=FrameNames.PERSPECTIVE_CONTENT%>" title="<%=controller.getMessage("FRAME_TITLE_PERSPECTIVE_CONTENT")%>" src="<%=response.encodeURL(controller.getPathWithContext("perspective_content.jsp"))%>" marginwidth=0 marginheight=0 scrolling="no" frameborder=0>
-</frameset>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/ClearNodeConfirmJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/ClearNodeConfirmJSP.jsp
deleted file mode 100644
index 5c1337fb2..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/ClearNodeConfirmJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilFrameNames,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                   					                    org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.ClearWSILAction"%>
-
-<jsp:include page="/wsil/scripts/wsilPanes.jsp" flush="true"/>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<html>
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-    <script language="javascript">
-        if (confirm("<%=controller.getWSILPerspective().getMessage("MSG_CONFIRM_REMOVE_NODE", controller.getWSILPerspective().getNodeManager().getSelectedNode().getNodeName())%>")) {
-            perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(ClearWSILAction.getActionLink(controller.getWSILPerspective().getNodeManager().getSelectedNode().getNodeId())))%>";
-        }
-        else {
-            wsilPropertiesContainer.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_properties_container.jsp"))%>";
-            wsilStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_status_content.jsp"))%>";
-        }
-    </script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/ClearWSILActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/ClearWSILActionJSP.jsp
deleted file mode 100644
index 31bb13f68..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/ClearWSILActionJSP.jsp
+++ /dev/null
@@ -1,18 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.ClearWSILAction"%>
-
-<jsp:include page="/wsil/scripts/wsilPanes.jsp" flush="true"/>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-    // Prepare the action.
-    ClearWSILAction action = new ClearWSILAction(controller);
-
-     // Load the parameters for the action from the servlet request.
-     action.populatePropertyTable(request);
-
-     // Run the action and obtain the return code (fail/success).
-     boolean actionResult = action.execute();
-%>
-<%@ include file="/actions/ClearNodeAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/ImportWSDLToFileSystemActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/ImportWSDLToFileSystemActionJSP.jsp
deleted file mode 100644
index b55b9461d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/ImportWSDLToFileSystemActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.actions.*,
-                                                        java.io.*" %>
-
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-  // Prepare the action.
-  ImportWSDLToFileSystemAction action = new ImportWSDLToFileSystemAction(controller);
-%>
-<%@ include file="/actions/ImportToFileSystemAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/ImportWSILToFileSystemActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/ImportWSILToFileSystemActionJSP.jsp
deleted file mode 100644
index 0edcd8e50..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/ImportWSILToFileSystemActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.actions.*,
-                                                        java.io.*" %>
-
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-  // Prepare the action.
-  ImportWSILToFileSystemAction action = new ImportWSILToFileSystemAction(controller);
-%>
-<%@ include file="/actions/ImportToFileSystemAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/OpenWSILActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/OpenWSILActionJSP.jsp
deleted file mode 100644
index 23a4c47fb..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/OpenWSILActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/wsil/scripts/wsilPanes.jsp" flush="true"/>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-  </script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-// Prepare the action.
-OpenWSILAction action = new OpenWSILAction(controller);
-
-// Load the parameters for the action from the servlet request.
-boolean inputsValid = action.populatePropertyTable(request);
-if (!inputsValid) {
-%>
-  <script language="javascript">
-    wsilPropertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_properties_content.jsp"))%>";
-    wsilStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_status_content.jsp"))%>";
-  </script>
-<%
-}
-else {
-  // Run the action and obtain the return code (fail/success).
-  boolean actionResult = action.execute();
-  if (actionResult) {
-%>
-    <script language="javascript">
-      if (isMicrosoftInternetExplorer()) {
-        wsilNavigatorContent.location="<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_navigator_content.jsp"))%>";
-        wsilPropertiesContainer.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_properties_container.jsp"))%>";
-        wsilStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_status_content.jsp"))%>";
-      }
-      else
-        perspectiveContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_perspective_content.jsp"))%>";
-    </script>
-<%
-  }
-  else {
-%>
-    <script language="javascript">
-      wsilPropertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_properties_content.jsp"))%>";
-      wsilStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_status_content.jsp"))%>";
-    </script>
-<%
-  }
-}
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/OpenWSILLinkActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/OpenWSILLinkActionJSP.jsp
deleted file mode 100644
index 9ca75e67c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/OpenWSILLinkActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilFrameNames,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.constants.FrameNames,
-                                   					                    org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.OpenWSILLinkAction"%>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/wsil/scripts/wsilPanes.jsp" flush="true"/>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-  </script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-// Prepare the action.
-OpenWSILLinkAction action = new OpenWSILLinkAction(controller);
-
-// Load the parameters for the action from the servlet request.
-boolean inputsValid = action.populatePropertyTable(request);
-if (!inputsValid) {
-%>
-  <script language="javascript">
-    wsilPropertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_properties_content.jsp"))%>";
-    wsilStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_status_content.jsp"))%>";
-  </script>
-<%
-}
-else {
-  // Run the action and obtain the return code (fail/success).
-  boolean actionResult = action.execute();
-  if (actionResult) {
-%>
-    <script language="javascript">
-      if (isMicrosoftInternetExplorer()) {
-        wsilNavigatorContent.location="<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_navigator_content.jsp"))%>";
-        wsilPropertiesContainer.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_properties_container.jsp"))%>";
-        wsilStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_status_content.jsp"))%>";
-      }
-      else
-        perspectiveContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_perspective_content.jsp"))%>";
-    </script>
-<%
-  }
-  else {
-%>
-    <script language="javascript">
-      wsilPropertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_properties_content.jsp"))%>";
-      wsilStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_status_content.jsp"))%>";
-    </script>
-<%
-  }
-}
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/RefreshActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/RefreshActionJSP.jsp
deleted file mode 100644
index baf3e1a5a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/RefreshActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilFrameNames,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.actions.Action,
-                                   					                    org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.*"%>
-
-<jsp:include page="/wsil/scripts/wsilPanes.jsp" flush="true"/>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-    // Prepare the action.
-    Action action = RefreshAction.newAction(request, controller);
-
-    // Load the parameters for the action from the servlet request.
-    action.populatePropertyTable(request);
-
-    // Run the action and obtain the return code (fail/success).
-    boolean actionResult = action.execute();
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-    <%
-    if (!actionResult) {
-        if (action instanceof RefreshWSILAction) {
-        %>
-            <jsp:include page="/wsil/actions/ClearNodeConfirmJSP.jsp" flush="true"/>
-        <%
-        }
-        else {
-        %>
-            <script language="javascript">
-                wsilPropertiesContainer.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_properties_container.jsp"))%>";
-                wsilStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_status_content.jsp"))%>";
-            </script>
-        <%
-        }
-        %>
-    <%
-    }
-    else {
-    %>
-        <script language="javascript">
-            wsilPropertiesContainer.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_properties_container.jsp"))%>";
-            wsilStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_status_content.jsp"))%>";
-        </script>
-    <%
-    }
-    %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/ResizeWSILFramesActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/ResizeWSILFramesActionJSP.jsp
deleted file mode 100644
index b9e376b25..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/ResizeWSILFramesActionJSP.jsp
+++ /dev/null
@@ -1,42 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   // Create the action.
-   ResizeWSILFramesAction action = new ResizeWSILFramesAction(controller);
-   
-   // Populate the action with the request properties.
-   boolean result = action.populatePropertyTable(request);
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<jsp:include page="/wsil/scripts/wsilframesets.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-   if (result)
-   {
-     action.execute(false);
-     
-     WSILPerspective wsilPerspective = controller.getWSILPerspective();
-%>
-<script language="javascript">
-  if (isMicrosoftInternetExplorer())
-  {
-    var perspectiveContentFrameset = getPerspectiveContentFrameset();
-    var actionsContainerFrameset = getActionsContainerFrameset();
-    perspectiveContentFrameset.setAttribute("cols","<%=wsilPerspective.getPerspectiveContentFramesetCols()%>");
-    actionsContainerFrameset.setAttribute("rows","<%=wsilPerspective.getActionsContainerFramesetRows()%>");
-  }
-  else
-    perspectiveContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_perspective_content.jsp"))%>";
-</script>
-<%
-   }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/SelectWSILNodeActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/SelectWSILNodeActionJSP.jsp
deleted file mode 100644
index 7f94c89f9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/SelectWSILNodeActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.actions.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILNodeAction" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-    // Prepare the action.
-    SelectWSILNodeAction action = new SelectWSILNodeAction(controller);
-
-    // Load the parameters for the action from the servlet request.
-    action.populatePropertyTable(request);
-
-    // Run the action and obtain the return code (fail/success).
-    boolean actionResult = action.execute();
-
-    // Determine if the action was added to the history list.
-    boolean isAddedToHistory = action.isAddedToHistory();
-%>
-<%@ include file="/actions/SelectNodeAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/SelectWSILToolActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/SelectWSILToolActionJSP.jsp
deleted file mode 100644
index 338dfd6a0..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/SelectWSILToolActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.actions.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-    // Prepare the action.
-    SelectWSILToolAction action = new SelectWSILToolAction(controller);
-
-    // Load the parameters for the action from the servlet request.
-    action.populatePropertyTable(request);
-
-    // Run the action and obtain the return code (fail/success).
-    boolean actionResult = action.execute();
-
-    // Determine if the action was added to the history list.
-    boolean isAddedToHistory = action.isAddedToHistory();
-%>
-<%@ include file="/actions/SelectNodeToolAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/SwitchPerspectiveFromWSILActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/SwitchPerspectiveFromWSILActionJSP.jsp
deleted file mode 100644
index 57d07b2a4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/SwitchPerspectiveFromWSILActionJSP.jsp
+++ /dev/null
@@ -1,30 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   // Prepare the action
-   SwitchPerspectiveFromWSILAction action = new SwitchPerspectiveFromWSILAction(controller);
-   
-   // Load the parameters for the action from the servlet request.
-   action.populatePropertyTable(request);
-   
-   // Run the action and obtain the return code (fail/success).
-   boolean actionResult = action.execute();
-   
-   // Determine if the action was added to the history list.
-   boolean isAddedToHistory = action.isAddedToHistory();
-%>
-<jsp:include page="/scripts/switchperspective.jsp" flush="true"/>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WSILImportWSILToWorkbenchActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WSILImportWSILToWorkbenchActionJSP.jsp
deleted file mode 100644
index 8d53132ef..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WSILImportWSILToWorkbenchActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   WSILImportWSILToWorkbenchAction action = new WSILImportWSILToWorkbenchAction(controller);
-%>
-<%@ include file="/actions/ImportToWorkbenchAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WsilAddToFavoritesActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WsilAddToFavoritesActionJSP.jsp
deleted file mode 100644
index d08368670..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WsilAddToFavoritesActionJSP.jsp
+++ /dev/null
@@ -1,39 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilFrameNames,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.FrameNames,
-                                   	                    org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.AddToFavoritesAction"%>
-
-<jsp:include page="/wsil/scripts/wsilPanes.jsp" flush="true"/>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-// Prepare the action.
-AddToFavoritesAction action = AddToFavoritesAction.newAction(request, controller);
-
-// Load the parameters for the action from the servlet request.
-action.populatePropertyTable(request);
-
-// Run the action
-action.execute();
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-  <script language="javascript">
-    wsilPropertiesContainer.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_properties_container.jsp"))%>";
-    wsilStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_status_content.jsp"))%>";
-  </script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WsilAddToUDDIPerspectiveActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WsilAddToUDDIPerspectiveActionJSP.jsp
deleted file mode 100644
index 08a37b936..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WsilAddToUDDIPerspectiveActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.actions.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <jsp:include page="/scripts/panes.jsp" flush="true"/>
-  <jsp:include page="/wsil/scripts/wsilPanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-  <%
-  // Prepare the action.
-  Action action = AddToUDDIPerspectiveAction.newAction(request, controller);
-
-  // Load the parameters for the action from the servlet request.
-  action.populatePropertyTable(request);
-
-  // Run the action and obtain the return code (fail/success).
-  boolean actionResult = action.execute();
-
-  if (actionResult)
-  {
-    controller.getUDDIPerspective().getNavigatorManager().makeSelectedNodeVisible();
-  %>
-    <script language="javascript">
-      perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(ShowPerspectiveAction.getActionLink(ActionInputs.PERSPECTIVE_UDDI,false)))%>";
-    </script>
-  <%
-  }
-  else
-  {
-  %>
-    <script language="javascript">
-      wsilPropertiesContainer.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_properties_container.jsp"))%>";
-      wsilStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_status_content.jsp"))%>";
-    </script>
-  <%
-  }
-  %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WsilAddToWSDLPerspectiveActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WsilAddToWSDLPerspectiveActionJSP.jsp
deleted file mode 100644
index a1f49dc4e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WsilAddToWSDLPerspectiveActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.actions.ShowPerspectiveAction,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilFrameNames,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.WsilAddToWSDLPerspectiveAction"%>
-
-<jsp:include page="/wsil/scripts/wsilPanes.jsp" flush="true"/>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-// Prepare the action.
-WsilAddToWSDLPerspectiveAction action = new WsilAddToWSDLPerspectiveAction(controller);
-
-// Load the parameters for the action from the servlet request.
-action.populatePropertyTable(request);
-
-// Run the action and obtain the return code (fail/success).
-boolean actionResult = action.execute();
-
-if (actionResult) {
-%>
-  <script language="javascript">
-    perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(ShowPerspectiveAction.getActionLink(ActionInputs.PERSPECTIVE_WSDL,false)))%>";
-  </script>
-<%
-}
-else {
-%>
-  <script language="javascript">
-    wsilPropertiesContainer.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_properties_container.jsp"))%>";
-    wsilStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_status_content.jsp"))%>";
-  </script>
-<%
-}
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WsilCheckFavoriteExistsActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WsilCheckFavoriteExistsActionJSP.jsp
deleted file mode 100644
index 9ba990339..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WsilCheckFavoriteExistsActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                   					                    org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.AddToFavoritesAction,
-                                   					                    org.eclipse.wst.ws.internal.explorer.platform.util.HTMLUtils,
-                                   					                    java.util.Enumeration"%>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/wsil/scripts/wsilPanes.jsp" flush="true"/>
-
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-  <form action="<%=response.encodeURL(controller.getPathWithContext("wsil/actions/WsilAddToFavoritesActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>">
-<%
-    Enumeration paramNames = request.getParameterNames();
-    while (paramNames.hasMoreElements()) {
-      String paramName = (String)paramNames.nextElement();
-      String[] paramValues = request.getParameterValues(paramName);
-      for (int i = 0; i < paramValues.length; i++) {
-%>
-        <input type="hidden" name="<%=paramName%>" value="<%=paramValues[i]%>">
-<%
-      }
-    }
-%>
-  </form>
-</body>
-</html>
-<%
-if (request.getParameter(WsilActionInputs.MULTIPLE_LINK_ACTION) == null) {
-  // Prepare the action.
-  AddToFavoritesAction action = AddToFavoritesAction.newAction(request, controller);
-  // Load the parameters for the action from the servlet request.
-  action.populatePropertyTable(request);
-  if (action.favoriteExists()) {
-%>
-    <script language="javascript">
-      if (confirm("<%=HTMLUtils.JSMangle(controller.getWSILPerspective().getMessage("MSG_QUESTION_OVERWRITE_FAVORITES"))%>"))
-        document.forms[0].submit();
-    </script>
-<%
-  }
-  else {
-%>
-    <script language="javascript">
-      document.forms[0].submit();
-    </script>
-<%
-  }
-}
-else {
-%>
-  <script language="javascript">
-    document.forms[0].submit();
-  </script>
-<%
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WsilImportWSDLToWorkbenchActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WsilImportWSDLToWorkbenchActionJSP.jsp
deleted file mode 100644
index 3daac68cd..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WsilImportWSDLToWorkbenchActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   WsilImportWSDLToWorkbenchAction action = new WsilImportWSDLToWorkbenchAction(controller);
-%>
-<%@ include file="/actions/ImportToWorkbenchAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WsilLaunchWebServiceWizardActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WsilLaunchWebServiceWizardActionJSP.jsp
deleted file mode 100644
index 284c8398a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WsilLaunchWebServiceWizardActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   WsilLaunchWebServiceWizardAction action = new WsilLaunchWebServiceWizardAction(controller);
-%>
-<%@ include file="/actions/LaunchWebServiceWizardAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WsilToggleNodeActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WsilToggleNodeActionJSP.jsp
deleted file mode 100644
index b82cdb09b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WsilToggleNodeActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-// Prepare the action.
-WsilToggleNodeAction action = new WsilToggleNodeAction(controller);
-
-// Load the parameters for the action from the servlet request.
-action.populatePropertyTable(request);
-
-// Run the action and obtain the return code (fail/success).
-boolean actionResult = action.execute();
-
-// Determine if the action was added to the history list.
-boolean isAddedToHistory = action.isAddedToHistory();
-%>
-<%@ include file="/actions/ToggleNodeAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/OpenWSILForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/OpenWSILForm.jsp
deleted file mode 100644
index 0d7708136..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/OpenWSILForm.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.FrameNames,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.util.HTMLUtils" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-WSILPerspective wsilPerspective = controller.getWSILPerspective();
-FormTool formTool = (FormTool)wsilPerspective.getNodeManager().getSelectedNode().getToolManager().getSelectedTool();
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=wsilPerspective.getMessage("FORM_TITLE_OPEN_WSIL")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<jsp:include page="/wsil/scripts/wsilPanes.jsp" flush="true"/>
-<jsp:include page="/scripts/formsubmit.jsp" flush="true"/>
-<jsp:include page="/scripts/formutils.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-  <form action="<%=response.encodeURL(controller.getPathWithContext("wsil/actions/OpenWSILActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" onSubmit="return handleSubmit(this)">
-  <%
-  String titleImagePath = "wsil/images/open_wsil_highlighted.gif";
-  String title = wsilPerspective.getMessage("ALT_OPEN_WSIL");
-  %>
-  <%@ include file = "/forms/formheader.inc" %>
-  <table>
-    <tr>
-      <td class="labels">
-        <%=wsilPerspective.getMessage("FORM_LABEL_OPEN_WSIL_DESC")%>
-      </td>
-    </tr>
-  </table>        
-  <table width="95%" border=0 cellpadding=3 cellspacing=0>
-    <tr>
-      <td class="labels" height=25 valign="bottom">
-        <label for="input_wsil_url"><%=wsilPerspective.getMessage("WSIL_URL")%></label>
-        <%
-        if (!formTool.isInputValid(WsilActionInputs.WSIL_URL)) {
-        %>
-          <%=HTMLUtils.redAsterisk()%>
-        <%
-        }
-        String wsilURL = (String)formTool.getProperty(WsilActionInputs.WSIL_URL);
-        if (wsilURL == null)
-          wsilURL = "";
-        %>
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <input type="text" id="input_wsil_url" name="<%=WsilActionInputs.WSIL_URL%>" value="<%=wsilURL%>" size="50" class="textenter">
-      </td>
-    </tr>
-  </table>
-  <%
-  String inspectionTypeString = (String)formTool.getProperty(WsilActionInputs.WSIL_INSPECTION_TYPE);
-  int inspectionType = WsilActionInputs.WSIL_DETAILS;
-  if (inspectionTypeString != null)
-    inspectionType = Integer.parseInt(inspectionTypeString);
-  %>
-  <table width="95%" border=0 cellpadding=3 cellspacing=0>
-    <tr>
-      <td class="labels" height=30 valign="bottom">
-        <label for="inspection_type"><%=wsilPerspective.getMessage("FORM_LABEL_CHOOSE_WSIL_INSPECTION_TYPE")%></label>
-      </td>
-    </tr>
-    <tr>
-      <td valign="bottom">
-        <select id="inspection_type" name="<%=WsilActionInputs.WSIL_INSPECTION_TYPE%>" class="selectlist">
-          <option value="<%=WsilActionInputs.WSIL_DETAILS%>" <% if (inspectionType == WsilActionInputs.WSIL_DETAILS) { %>selected<% } %>><%=wsilPerspective.getMessage("FORM_LABEL_WSIL")%>
-          <option value="<%=WsilActionInputs.WSDL_SERVICES%>" <% if (inspectionType == WsilActionInputs.WSDL_SERVICES) { %>selected<% } %>><%=wsilPerspective.getMessage("FORM_LABEL_WSDL_SERVICE")%>
-          <option value="<%=WsilActionInputs.UDDI_SERVICES%>" <% if (inspectionType == WsilActionInputs.UDDI_SERVICES) { %>selected<% } %>><%=wsilPerspective.getMessage("FORM_LABEL_UDDI_SERVICE")%>
-          <option value="<%=WsilActionInputs.UDDI_BUSINESSES%>" <% if (inspectionType == WsilActionInputs.UDDI_BUSINESSES) { %>selected<% } %>><%=wsilPerspective.getMessage("FORM_LABEL_UDDI_BUSINESS")%>
-          <option value="<%=WsilActionInputs.WSIL_LINKS%>" <% if (inspectionType == WsilActionInputs.WSIL_LINKS) { %>selected<% } %>><%=wsilPerspective.getMessage("FORM_LABEL_WSIL_LINKS")%>
-        </select>
-      </td>
-    </tr>
-  </table>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
-  </form>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/ProcessWSILFramesetsForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/ProcessWSILFramesetsForm.jsp
deleted file mode 100644
index 532e6da04..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/ProcessWSILFramesetsForm.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   WSILPerspective wsilPerspective = controller.getWSILPerspective();
-%>   
-<jsp:useBean id="formAction" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="formFrameName" class="java.lang.StringBuffer" scope="request"/>
-<form action="<%=response.encodeURL(controller.getPathWithContext(formAction.toString()))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" style="margin-top:0;margin-bottom:0">
-  <input name="<%=ActionInputs.FRAME_NAME%>" type="hidden" value="<%=formFrameName%>">
-  <input name="<%=WsilActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT%>" type="hidden" value="<%=wsilPerspective.getPerspectiveContentFramesetCols()%>">
-  <input name="<%=WsilActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER%>" type="hidden" value="<%=wsilPerspective.getActionsContainerFramesetRows()%>">
-</form>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/UddiBusinessDetailsPage.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/UddiBusinessDetailsPage.jsp
deleted file mode 100644
index dab8bc757..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/UddiBusinessDetailsPage.jsp
+++ /dev/null
@@ -1,126 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.AddToFavoritesAction,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.AddToUDDIPerspectiveAction,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.RefreshAction,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="abstractLangs" class="java.util.Vector" scope="request"/>
-<jsp:useBean id="abstracts" class="java.util.Vector" scope="request"/>
-<%
-    WSILPerspective wsilPerspective = controller.getWSILPerspective();
-    NodeManager nodeManager = wsilPerspective.getNodeManager();
-    Node selectedNode = nodeManager.getSelectedNode();
-    ToolManager currentToolManager = selectedNode.getCurrentToolManager();
-    int viewID = selectedNode.getViewId();
-    TreeElement selectedElement = selectedNode.getTreeElement();
-    String inquiryAPI = null;
-    String businessKey = null;
-    String discoveryURL = null;
-    WsilUddiBusinessElement link = null;
-    if (selectedElement instanceof WsilElement) {
-        ListElement le = ((WsilElement)selectedElement).getAllUDDILinks().getElementWithViewId(viewID);
-        link = (WsilUddiBusinessElement)le.getObject();
-        if (link != null) {
-            abstracts.addAll(link.getLinkAbstracts());
-            abstractLangs.addAll(link.getLinkAbstractLangs());
-            inquiryAPI = link.getUDDILinkInquiryAPI();
-            businessKey = link.getUDDILinkBusinessKey();
-            discoveryURL = link.getUDDILinkDiscoveryURL();
-        }
-    }
-%>
-<html>
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <title><%=wsilPerspective.getMessage("FORM_TITLE_UDDI_BUSINESS_DETAILS")%></title>
-    <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-    <jsp:include page="/wsil/scripts/wsilFormSubmit.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-    <form action="<%=response.encodeURL(controller.getPathWithContext(AddToFavoritesAction.getBaseActionLink()))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>">
-
-    <%
-    String titleImagePath = "images/details_highlighted.gif";
-    String title = wsilPerspective.getMessage("ALT_UDDI_LINK_DETAILS");
-    %>
-    <%@ include file = "/forms/formheader.inc" %>
-    <%
-    if (selectedElement instanceof WsilElement && link != null) {
-    %>
-        <input type="hidden" name="<%=ActionInputs.NODEID%>" value="<%=selectedNode.getNodeId()%>">
-        <input type="hidden" name="<%=ActionInputs.VIEWID%>" value="<%=viewID%>">
-
-        <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
-            <tr>
-                <th class="singleheadercolor" height=20 valign="bottom" align="left">
-                    <%=wsilPerspective.getMessage("FORM_LABEL_INQUIRY_API")%>
-                </th>
-            </tr>
-            <tr>
-                <td class="tablecells">
-                    <%=((inquiryAPI != null) ? inquiryAPI : wsilPerspective.getMessage("FORM_LABEL_NA"))%>
-                </td>
-            </tr>
-        </table>
-
-        <br>
-        <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
-            <tr>
-                <th class="singleheadercolor" height=20 valign="bottom" align="left">
-                    <%=wsilPerspective.getMessage("FORM_LABEL_BUSINESS_KEY")%>
-                </th>
-            </tr>
-            <tr>
-                <td class="tablecells">
-                    <%=((businessKey != null) ? businessKey : wsilPerspective.getMessage("FORM_LABEL_NA"))%>
-                </td>
-            </tr>
-        </table>
-
-        <br>
-        <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
-            <tr>
-                <th class="singleheadercolor" height=20 valign="bottom" align="left">
-                    <%=wsilPerspective.getMessage("FORM_LABEL_DISCOVERY_URL")%>
-                </th>
-            </tr>
-            <tr>
-                <td class="tablecells">
-                    <%=((discoveryURL != null) ? discoveryURL : wsilPerspective.getMessage("FORM_LABEL_NA"))%>
-                </td>
-            </tr>
-        </table>
-
-        <jsp:include page="/wsil/scripts/wsilAbstractTable.jsp" flush="true"/>
-
-<jsp:useBean id="currentToolManagerHash" class="java.util.Hashtable" scope="request">
-<%
-  currentToolManagerHash.put(ActionInputs.CURRENT_TOOL_MANAGER,currentToolManager);
-%>
-</jsp:useBean>
-<jsp:include page="/forms/otherActions.jsp" flush="true"/>
-
-    <%
-    }
-%>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/UddiServiceDetailsPage.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/UddiServiceDetailsPage.jsp
deleted file mode 100644
index a01e396e1..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/UddiServiceDetailsPage.jsp
+++ /dev/null
@@ -1,132 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.AddToFavoritesAction,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.AddToUDDIPerspectiveAction,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.RefreshAction,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="nameLangs" class="java.util.Vector" scope="request"/>
-<jsp:useBean id="names" class="java.util.Vector" scope="request"/>
-<jsp:useBean id="abstractLangs" class="java.util.Vector" scope="request"/>
-<jsp:useBean id="abstracts" class="java.util.Vector" scope="request"/>
-<%
-    WSILPerspective wsilPerspective = controller.getWSILPerspective();
-    NodeManager nodeManager = wsilPerspective.getNodeManager();
-    Node selectedNode = nodeManager.getSelectedNode();
-    ToolManager currentToolManager = selectedNode.getCurrentToolManager();
-    int viewID = selectedNode.getViewId();
-    TreeElement selectedElement = selectedNode.getTreeElement();
-    String inquiryAPI = null;
-    String serviceKey = null;
-    String discoveryURL = null;
-    WsilServiceElement service = null;
-    if (selectedElement instanceof WsilElement) {
-        ListElement le = ((WsilElement)selectedElement).getAllUDDIServices().getElementWithViewId(viewID);
-        service = (WsilServiceElement)le.getObject();
-        if (service != null) {
-            names.addAll(service.getServiceNames());
-            nameLangs.addAll(service.getServiceNameLangs());
-            abstracts.addAll(service.getServiceAbstracts());
-            abstractLangs.addAll(service.getServiceAbstractLangs());
-            inquiryAPI = ((WsilUddiServiceElement)service).getUDDIServiceInquiryAPI();
-            serviceKey = ((WsilUddiServiceElement)service).getUDDIServiceKey();
-            discoveryURL = ((WsilUddiServiceElement)service).getUDDIServiceDiscoveryURL();
-        }
-    }
-%>
-<html>
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <title><%=wsilPerspective.getMessage("FORM_TITLE_UDDI_SERVICE_DETAILS")%></title>
-    <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-    <jsp:include page="/wsil/scripts/wsilFormSubmit.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-    <form action="<%=response.encodeURL(controller.getPathWithContext(AddToFavoritesAction.getBaseActionLink()))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>">
-
-    <%
-    String titleImagePath = "images/details_highlighted.gif";
-    String title = wsilPerspective.getMessage("ALT_WSIL_SERVICE_DETAILS");
-    %>
-    <%@ include file = "/forms/formheader.inc" %>
-    <%
-    if (selectedElement instanceof WsilElement && service != null) {
-    %>
-        <input type="hidden" name="<%=ActionInputs.NODEID%>" value="<%=selectedNode.getNodeId()%>">
-        <input type="hidden" name="<%=ActionInputs.VIEWID%>" value="<%=viewID%>">
-
-        <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
-            <tr>
-                <th class="singleheadercolor" height=20 valign="bottom" align="left">
-                    <strong><%=wsilPerspective.getMessage("FORM_LABEL_INQUIRY_API")%></strong>
-                </th>
-            </tr>
-            <tr>
-                <td class="tablecells">
-                    <%=((inquiryAPI != null) ? inquiryAPI : wsilPerspective.getMessage("FORM_LABEL_NA"))%>
-                </td>
-            </tr>
-        </table>
-
-        <br>
-        <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
-            <tr>
-                <th class="singleheadercolor" height=20 valign="bottom" align="left">
-                    <strong><%=wsilPerspective.getMessage("FORM_LABEL_SERVICE_KEY")%></strong>
-                </th>
-            </tr>
-            <tr>
-                <td class="tablecells">
-                    <%=((serviceKey != null) ? serviceKey : wsilPerspective.getMessage("FORM_LABEL_NA"))%>
-                </td>
-            </tr>
-        </table>
-
-        <br>
-        <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
-            <tr>
-                <th class="singleheadercolor" height=20 valign="bottom" align="left">
-                    <strong><%=wsilPerspective.getMessage("FORM_LABEL_DISCOVERY_URL")%></strong>
-                </th>
-            </tr>
-            <tr>
-                <td class="tablecells">
-                    <%=((discoveryURL != null) ? discoveryURL : wsilPerspective.getMessage("FORM_LABEL_NA"))%>
-                </td>
-            </tr>
-        </table>
-
-        <jsp:include page="/wsil/scripts/wsilNameTable.jsp" flush="true"/>
-
-        <jsp:include page="/wsil/scripts/wsilAbstractTable.jsp" flush="true"/>
-
-<jsp:useBean id="currentToolManagerHash" class="java.util.Hashtable" scope="request">
-<%
-  currentToolManagerHash.put(ActionInputs.CURRENT_TOOL_MANAGER,currentToolManager);
-%>
-</jsp:useBean>
-<jsp:include page="/forms/otherActions.jsp" flush="true"/>
-
-    <%
-    }
-%>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/WSILImportWSILToWorkbenchForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/WSILImportWSILToWorkbenchForm.jsp
deleted file mode 100644
index 51336d186..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/WSILImportWSILToWorkbenchForm.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*,
-                                                        org.eclipse.core.resources.*,
-                                                        org.eclipse.core.runtime.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-WSILPerspective wsilPerspective = controller.getWSILPerspective();
-NodeManager nodeManager = wsilPerspective.getNodeManager();
-Node selectedNode = nodeManager.getSelectedNode();
-WsilElement wsilElement = (WsilElement)selectedNode.getTreeElement();
-%>
-</jsp:useBean>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=controller.getMessage("FORM_TITLE_IMPORT_TO_WORKBENCH")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-  <jsp:include page="/scripts/formsubmit.jsp" flush="true"/>
-  <jsp:include page="/scripts/formutils.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-  <form action="<%=response.encodeURL(controller.getPathWithContext("wsil/actions/WSILImportWSILToWorkbenchActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data">
-  <input type="hidden" name="<%=ActionInputs.IMPORT_FILE%>" value="<%=ActionInputs.IMPORT_FILE%>">
-  <%
-  String titleImagePath = "images/import_to_workbench_highlighted.gif";
-  String title = wsilPerspective.getMessage("ATL_IMPORT_WSIL_TO_WORKBENCH");
-  %>
-  <%@ include file = "/forms/formheader.inc" %>
-  <table>
-    <tr>
-      <td>
-        <%=wsilPerspective.getMessage("FORM_LABEL_IMPORT_WSIL_TO_WORKBENCH_DESC")%>
-      </td>
-    </tr>
-  </table>
-  <table>
-    <tr>
-      <td class="labels" height=40 valign="center">
-        <label for="select_workbench_project_name"><%=controller.getMessage("WORKBENCH_PROJECT_NAME")%></label>
-      </td>
-      <td class="labels" height=40 valign="center" nowrap>
-        <%
-        IWorkspaceRoot iWorkspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
-        IProject[] projects = iWorkspaceRoot.getProjects();
-        %>
-        <select id="select_workbench_project_name" name="<%=ActionInputs.WORKBENCH_PROJECT_NAME%>" class="selectlist">
-        <%
-        for (int i = 0; i < projects.length; i++)
-        {
-          try
-          {
-            if (!projects[i].isOpen())
-              continue;
-            String projectName = projects[i].getName();
-        %>
-        <option value="<%=projectName%>"><%=projectName%>
-        <%
-          }
-          catch (Exception e) {}
-        }
-        %>
-        </select>
-      </td>
-    </tr>
-  </table>
-  <table width="95%" border=0 cellpadding=3 cellspacing=0>
-    <tr>
-      <td>
-        <label for="input_imported_wsil_file_name"><%=controller.getMessage("WSIL_FILE_NAME")%></label>
-      </td>
-    </tr>
-    <tr>
-      <td height=10 valign="bottom" width="60%">
-<%
- String wsilFileName = "temp.wsil";
- String wsilURL = wsilElement.getWsilUrl();
- if (wsilURL.endsWith(".wsil"))
- {
-   int lastSeparatorPos = Math.max(wsilURL.lastIndexOf("/"), wsilURL.lastIndexOf("\\"));
-   if (lastSeparatorPos > 0)
-     wsilFileName = wsilURL.substring(lastSeparatorPos+1, wsilURL.length());
- }
-%>   
-        <input type="text" id="input_imported_wsil_file_name" name="<%=ActionInputs.IMPORTED_FILE_NAME%>" value="<%=wsilFileName%>" size=50 class="textenter">
-      </td>
-    </tr>
-  </table>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>    
-  </form>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/WsdlServiceDetailsPage.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/WsdlServiceDetailsPage.jsp
deleted file mode 100644
index 497e6d4e9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/WsdlServiceDetailsPage.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.AddToFavoritesAction,
-                                                                                          org.apache.wsil.QName,
-                                                                                          java.util.Vector,
-                                                                                          java.util.Enumeration" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="nameLangs" class="java.util.Vector" scope="request"/>
-<jsp:useBean id="names" class="java.util.Vector" scope="request"/>
-<jsp:useBean id="abstractLangs" class="java.util.Vector" scope="request"/>
-<jsp:useBean id="abstracts" class="java.util.Vector" scope="request"/>
-<%
-    String bindingTable = "bindingTable";
-    String xbindingTable = "xbindingTable";
-
-    WSILPerspective wsilPerspective =controller.getWSILPerspective();
-    NodeManager nodeManager = wsilPerspective.getNodeManager();
-    Node selectedNode = nodeManager.getSelectedNode();
-    ToolManager currentToolManager = selectedNode.getCurrentToolManager();
-    int viewID = selectedNode.getViewId();
-    TreeElement selectedElement = selectedNode.getTreeElement();
-    WsilServiceElement service = null;
-    String wsdlURL = null;
-    Vector wsdlBindings = new Vector();
-    if (selectedElement instanceof WsilElement) {
-        ListElement le = ((WsilElement)selectedElement).getAllWSDLServices().getElementWithViewId(viewID);
-        service = (WsilServiceElement)le.getObject();
-        if (service != null) {
-            names.addAll(service.getServiceNames());
-            nameLangs.addAll(service.getServiceNameLangs());
-            abstracts.addAll(service.getServiceAbstracts());
-            abstractLangs.addAll(service.getServiceAbstractLangs());
-            wsdlURL = ((WsilWsdlServiceElement)service).getWSDLServiceURL();
-            wsdlBindings = ((WsilWsdlServiceElement)service).getWSDLBinding();
-        }
-    }
-%>
-<html>
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <title><%=wsilPerspective.getMessage("FORM_TITLE_WSDL_SERVICE_DETAILS")%></title>
-    <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-    <jsp:include page="/wsil/scripts/wsilTable.jsp" flush="true"/>
-    <jsp:include page="/wsil/scripts/wsilFormSubmit.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-    <form action="<%=response.encodeURL(controller.getPathWithContext(AddToFavoritesAction.getBaseActionLink()))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>">
-
-    <%
-    String titleImagePath = "images/details_highlighted.gif";
-    String title = wsilPerspective.getMessage("ALT_WSIL_SERVICE_DETAILS");
-    %>
-    <%@ include file = "/forms/formheader.inc" %>
-    <%
-    if (selectedElement instanceof WsilElement && service != null) {
-    %>
-        <input type="hidden" name="<%=ActionInputs.NODEID%>" value="<%=selectedNode.getNodeId()%>">
-        <input type="hidden" name="<%=ActionInputs.VIEWID%>" value="<%=viewID%>">
-
-        <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
-            <tr>
-                <th class="singleheadercolor" height=20 valign="bottom" align="left">
-                    <strong><%=wsilPerspective.getMessage("FORM_LABEL_URL")%></strong>
-                </th>
-            </tr>
-            <tr>
-                <td class="tablecells">
-                    <%=wsdlURL%>
-                </td>
-            </tr>
-        </table>
-
-        <jsp:include page="/wsil/scripts/wsilNameTable.jsp" flush="true"/>
-
-        <jsp:include page="/wsil/scripts/wsilAbstractTable.jsp" flush="true"/>
-
-        <table border=0 cellpadding=6 cellspacing=0>
-            <tr>
-                <td height=40 valign="bottom" align="left" nowrap width=11>
-                    <a href="javascript:twist('<%=bindingTable%>','<%=xbindingTable%>')"><img name="<%=xbindingTable%>" src="/wsexplorer/images/twistclosed.gif" class="twist"></a>
-                </td>
-                <td height=40 valign="bottom" align="left" nowrap class="labels">
-                    <strong><%=wsilPerspective.getMessage("FORM_LABEL_WSDL_BINDINGS")%></strong>
-                </td>
-            </tr>
-        </table>
-
-        <table width="95%" border=0 cellpadding=0 cellspacing=0>
-            <tr>
-                <td valign="top" height=10><img src="/wsexplorer/images/keyline.gif" height=2 width="100%"></td>
-            </tr>
-        </table>
-
-        <div id="<%=bindingTable%>">
-        <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
-            <tr>
-                <th class="headercolor"><%=wsilPerspective.getMessage("FORM_LABEL_NAMESPACE_URI")%></th>
-                <th class="headercolor"><%=wsilPerspective.getMessage("FORM_LABEL_LOCAL_NAME")%></th>
-            </tr>
-            <%
-            Enumeration e = wsdlBindings.elements();
-            while (e.hasMoreElements()) {
-                QName qname = (QName)e.nextElement();
-                %>
-                 <tr>
-                    <td class="tablecells" nowrap><%=qname.getNamespaceURI()%></td>
-                    <td class="tablecells" nowrap><%=qname.getLocalName()%></td>
-                 </tr>
-                <%
-            }
-            %>
-        </table>
-        </div>
-        <script language="javascript">
-            twistInit('<%=bindingTable%>','<%=xbindingTable%>');
-        </script>
-
-<jsp:useBean id="currentToolManagerHash" class="java.util.Hashtable" scope="request">
-<%
-  currentToolManagerHash.put(ActionInputs.CURRENT_TOOL_MANAGER,currentToolManager);
-%>
-</jsp:useBean>
-<jsp:include page="/forms/otherActions.jsp" flush="true"/>
-
-        <%
-    }
-%>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/WsilDetailsPage.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/WsilDetailsPage.jsp
deleted file mode 100644
index cc7009662..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/WsilDetailsPage.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.AddToFavoritesAction,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.RefreshAction,
-                                                                                          java.util.Enumeration" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="abstractLangs" class="java.util.Vector" scope="request"/>
-<jsp:useBean id="abstracts" class="java.util.Vector" scope="request"/>
-<%
-    WSILPerspective wsilPerspective =controller.getWSILPerspective();
-    NodeManager nodeManager = wsilPerspective.getNodeManager();
-    Node selectedNode = nodeManager.getSelectedNode();
-    ToolManager currentToolManager = selectedNode.getCurrentToolManager();
-    TreeElement selectedElement = selectedNode.getTreeElement();
-    WsilElement wsilElement = null;
-    if (selectedElement instanceof WsilElement) {
-        wsilElement = (WsilElement)selectedElement;
-        abstracts.addAll(wsilElement.getWSILAbstracts());
-        abstractLangs.addAll(wsilElement.getWSILAbstractLangs());
-    }
-%>
-<html>
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <title><%=wsilPerspective.getMessage("FORM_TITLE_WSIL_DETAILS")%></title>
-    <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-    <jsp:include page="/wsil/scripts/wsilFormSubmit.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-    <form action="<%=response.encodeURL(controller.getPathWithContext(AddToFavoritesAction.getBaseActionLink()))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>">
-
-    <%
-    String titleImagePath = "images/details_highlighted.gif";
-    String title = wsilPerspective.getMessage("ALT_WSIL_DETAILS");
-    %>
-    <%@ include file = "/forms/formheader.inc" %>
-    <%
-    if (selectedElement instanceof WsilElement) {
-    %>
-        <input type="hidden" name="<%=ActionInputs.NODEID%>" value="<%=selectedNode.getNodeId()%>">
-        <input type="hidden" name="<%=ActionInputs.VIEWID%>" value="<%=ActionInputs.VIEWID_DEFAULT%>">
-
-        <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
-            <tr>
-                <th class="singleheadercolor" height=20 valign="bottom" align="left">
-                    <strong><%=wsilPerspective.getMessage("FORM_LABEL_URL")%></strong>
-                </th>
-            </tr>
-            <tr>
-                <td class="tablecells">
-                    <%=wsilElement.getWsilUrl()%>
-                </td>
-            </tr>
-        </table>
-
-        <jsp:include page="/wsil/scripts/wsilAbstractTable.jsp" flush="true"/>
-
-<jsp:useBean id="currentToolManagerHash" class="java.util.Hashtable" scope="request">
-<%
-  currentToolManagerHash.put(ActionInputs.CURRENT_TOOL_MANAGER,currentToolManager);
-%>
-</jsp:useBean>
-<jsp:include page="/forms/otherActions.jsp" flush="true"/>
-
-    <%
-    }
-    %>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/WsilImportWSDLToWorkbenchForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/WsilImportWSDLToWorkbenchForm.jsp
deleted file mode 100644
index ceaff7f65..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/WsilImportWSDLToWorkbenchForm.jsp
+++ /dev/null
@@ -1,50 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.datamodel.*" %>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-  WSILPerspective wsilPerspective = controller.getWSILPerspective();
-  NodeManager nodeManager = wsilPerspective.getNodeManager();
-  Node selectedNode = nodeManager.getSelectedNode();
-  Tool selectedTool = selectedNode.getToolManager().getSelectedTool();
-%>
-<jsp:useBean id="formProperties" class="java.util.Hashtable" scope="request">
-<%
-  if (selectedTool instanceof ListWSDLServicesTool)
-  {
-    int viewId = selectedNode.getViewId();
-    WsilElement wsilElement = (WsilElement)selectedNode.getTreeElement();
-    ListElement le = wsilElement.getAllWSDLServices().getElementWithViewId(viewId);
-    WsilWsdlServiceElement wsilWsdlServiceElement = (WsilWsdlServiceElement)le.getObject();
-    formProperties.put("wsdlURL",wsilWsdlServiceElement.getWSDLServiceURL());
-  }
-  formProperties.put("formActionLink","wsil/actions/WsilImportWSDLToWorkbenchActionJSP.jsp");
-%>   
-</jsp:useBean>
-<%
-  if (selectedTool instanceof ListWSDLServicesTool)
-  {
-%>
-<jsp:include page="/forms/ImportWSDLAndWSILToWorkbenchForm.jsp" flush="true"/>
-<%
-  }
-  else if (selectedTool instanceof ListUDDIServicesTool)
-  {
-%>
-<jsp:include page="/forms/ImportToWorkbenchForm.jsp" flush="true"/>
-<%
-  }
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/WsilLaunchWebServiceWizardForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/WsilLaunchWebServiceWizardForm.jsp
deleted file mode 100644
index 799195ec7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/WsilLaunchWebServiceWizardForm.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" %>
-
-<jsp:useBean id="formActionLink" class="java.lang.StringBuffer" scope="request">
-<%
-   formActionLink.append("wsil/actions/WsilLaunchWebServiceWizardActionJSP.jsp");
-%>
-</jsp:useBean>
-<jsp:include page="/forms/LaunchWebServiceWizardForm.jsp" flush="true"/>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/WsilLinkDetailsPage.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/WsilLinkDetailsPage.jsp
deleted file mode 100644
index 10c1f3f3c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/WsilLinkDetailsPage.jsp
+++ /dev/null
@@ -1,84 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="abstractLangs" class="java.util.Vector" scope="request"/>
-<jsp:useBean id="abstracts" class="java.util.Vector" scope="request"/>
-<%
-    WSILPerspective wsilPerspective =controller.getWSILPerspective();
-    NodeManager nodeManager = wsilPerspective.getNodeManager();
-    Node selectedNode = nodeManager.getSelectedNode();
-    ToolManager currentToolManager = selectedNode.getCurrentToolManager();
-    int viewID = selectedNode.getViewId();
-    TreeElement selectedElement = selectedNode.getTreeElement();
-    WsilWsilLinkElement link = null;
-    if (selectedElement instanceof WsilElement) {
-        ListElement le = ((WsilElement)selectedElement).getAllWSILLinks().getElementWithViewId(viewID);
-        link = (WsilWsilLinkElement)le.getObject();
-        if (link != null) {
-            abstractLangs.addAll(link.getLinkAbstractLangs());
-            abstracts.addAll(link.getLinkAbstracts());
-        }
-    }
-%>
-<html>
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <title><%=wsilPerspective.getMessage("FORM_TITLE_WSIL_LINK_DETAILS")%></title>
-    <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-    <%
-    String titleImagePath = "images/details_highlighted.gif";
-    String title = wsilPerspective.getMessage("ALT_WSIL_LINK_DETAILS");
-    %>
-    <%@ include file = "/forms/formheader.inc" %>
-    <%
-    if (selectedElement instanceof WsilElement && link != null) {
-    %>
-
-        <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
-            <tr>
-                <th class="singleheadercolor" height=20 valign="bottom" align="left">
-                    <%=wsilPerspective.getMessage("FORM_LABEL_URL")%>
-                </th>
-            </tr>
-            <tr>
-                <td class="tablecells">
-                    <%=link.getWSILLinkLocation()%>
-                </td>
-            </tr>
-        </table>
-
-        <jsp:include page="/wsil/scripts/wsilAbstractTable.jsp" flush="true"/>
-<jsp:useBean id="currentToolManagerHash" class="java.util.Hashtable" scope="request">
-<%
-  currentToolManagerHash.put(ActionInputs.CURRENT_TOOL_MANAGER,currentToolManager);
-%>
-</jsp:useBean>
-<jsp:include page="/forms/otherActions.jsp" flush="true"/>        
-
-    <%
-    }
-    %>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/add_to_UDDI_perspective_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/add_to_UDDI_perspective_enabled.gif
deleted file mode 100644
index e65d19a11..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/add_to_UDDI_perspective_enabled.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/add_to_UDDI_perspective_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/add_to_UDDI_perspective_highlighted.gif
deleted file mode 100644
index 4aa3ddcb5..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/add_to_UDDI_perspective_highlighted.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_UDDI_service_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_UDDI_service_enabled.gif
deleted file mode 100644
index c351daff7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_UDDI_service_enabled.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_UDDI_service_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_UDDI_service_highlighted.gif
deleted file mode 100644
index 53e1335da..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_UDDI_service_highlighted.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_WSDL_service_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_WSDL_service_enabled.gif
deleted file mode 100644
index 6dc028508..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_WSDL_service_enabled.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_WSDL_service_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_WSDL_service_highlighted.gif
deleted file mode 100644
index 428c8ea5e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_WSDL_service_highlighted.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_WSIL_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_WSIL_enabled.gif
deleted file mode 100644
index 0fa09842f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_WSIL_enabled.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_WSIL_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_WSIL_highlighted.gif
deleted file mode 100644
index c34bbe6a8..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_WSIL_highlighted.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_business_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_business_enabled.gif
deleted file mode 100644
index bd1e37adc..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_business_enabled.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_business_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_business_highlighted.gif
deleted file mode 100644
index d51b97517..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_business_highlighted.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/open_wsil_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/open_wsil_enabled.gif
deleted file mode 100644
index 459cc6e4f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/open_wsil_enabled.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/open_wsil_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/open_wsil_highlighted.gif
deleted file mode 100644
index 261775f64..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/open_wsil_highlighted.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/wsil_node.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/wsil_node.gif
deleted file mode 100644
index 7c5916fb6..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/wsil_node.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/scripts/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/scripts/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/scripts/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/scripts/wsilAbstractTable.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/scripts/wsilAbstractTable.jsp
deleted file mode 100644
index 1083233d6..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/scripts/wsilAbstractTable.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.util.HTMLUtils" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="abstractLangs" class="java.util.Vector" scope="request"/>
-<jsp:useBean id="abstracts" class="java.util.Vector" scope="request"/>
-
-<jsp:include page="/wsil/scripts/wsilTable.jsp" flush="true"/>
-
-<%
-String abstractTable = "abstractTable";
-String xabstractTable = "xabstractTable";
-String showAllAbstractID = "showAllAbstractID";
-WSILPerspective wsilPerspective =controller.getWSILPerspective();
-%>
-
-<script language="javascript">
-    function showAbstract(tableContainerID) {
-        var table = getTable(tableContainerID);
-        var tableBody = table.getElementsByTagName("TBODY").item(0);
-        var hiddenInput = document.getElementById('<%=showAllAbstractID%>');
-        <%
-        for (int i = 0; i < abstracts.size(); i++) {
-        %>
-           addRowToAbstractTable(tableBody,
-               "<%=HTMLUtils.JSMangle((String)abstractLangs.elementAt(i))%>",
-               "<%=HTMLUtils.JSMangle((String)abstracts.elementAt(i))%>");
-        <%
-        }
-        %>
-    }
-
-    function addRowToAbstractTable(tableBody, lang, abst) {
-        var newRow = document.createElement("tr");
-        addKeyValueToRow(newRow, lang, abst);
-        tableBody.appendChild(newRow);
-    }
-</script>
-
-<table border=0 cellpadding=6 cellspacing=0>
-    <tr>
-        <td height=40 valign="bottom" align="left" nowrap width=11>
-            <a href="javascript:twist('<%=abstractTable%>','<%=xabstractTable%>')"><img name="<%=xabstractTable%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a>
-        </td>
-        <td height=40 valign="bottom" align="left" nowrap class="labels">
-            <strong><%=wsilPerspective.getMessage("FORM_LABEL_ABSTRACT")%></strong>
-        </td>
-    </tr>
-</table>
-
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
-    <tr>
-        <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" height=2 width="100%"></td>
-    </tr>
-</table>
-
-<div id="<%=abstractTable%>">
-    <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
-        <tr>
-            <th class="headercolor"><%=wsilPerspective.getMessage("FORM_LABEL_LANGUAGE")%></th>
-            <th class="headercolor" width="100%"><%=wsilPerspective.getMessage("FORM_LABEL_ABSTRACT")%></th>
-        </tr>
-    </table>
-</div>
-
-<script language="javascript">
-    showAbstract('<%=abstractTable%>');
-    twistInit('<%=abstractTable%>','<%=xabstractTable%>');
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/scripts/wsilFormSubmit.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/scripts/wsilFormSubmit.jsp
deleted file mode 100644
index eb25f00aa..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/scripts/wsilFormSubmit.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/scripts/formsubmit.jsp" flush="true"/>
-<jsp:include page="/wsil/scripts/wsilTable.jsp" flush="true"/>
-<script language="javascript">
-    function isSomethingSelected(tableContainerId) {
-        var table = getTable(tableContainerId);
-        for (var i=numberOfHeaderRows; i<table.rows.length; i++) {
-            var rowCheckboxCell = table.rows[i].getElementsByTagName("td").item(0);
-            var rowCheckbox = rowCheckboxCell.childNodes[0];
-            if (rowCheckbox.checked)
-                return true;
-        }
-        alert("<%=controller.getWSILPerspective().getMessage("MSG_ERROR_NOTHING_SELECTED")%>");
-        return false;
-    }
-
-    function setFormLocationAndSubmit(tableContainerId, form, location) {
-        if (isSomethingSelected(tableContainerId))
-            setLocationAndSubmit(form, location);
-    }
-
-    function setLocationAndSubmit(form, location) {
-        if (handleSubmit(form))
-        {
-          form.action = location;
-          form.submit();
-        }
-    }
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/scripts/wsilNameTable.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/scripts/wsilNameTable.jsp
deleted file mode 100644
index 162887d9a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/scripts/wsilNameTable.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.util.HTMLUtils" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="nameLangs" class="java.util.Vector" scope="request"/>
-<jsp:useBean id="names" class="java.util.Vector" scope="request"/>
-
-<jsp:include page="/wsil/scripts/wsilTable.jsp" flush="true"/>
-
-<%
-String nameTable = "nameTable";
-String xnameTable = "xnameTable";
-String showAllNameID = "showAllNameID";
-WSILPerspective wsilPerspective =controller.getWSILPerspective();
-%>
-
-<script language="javascript">
-    function showName(tableContainerID) {
-        var table = getTable(tableContainerID);
-        var tableBody = table.getElementsByTagName("TBODY").item(0);
-        var hiddenInput = document.getElementById('<%=showAllNameID%>');
-        <%
-        for (int i = 0; i < names.size(); i++) {
-        %>
-           addRowToNameTable(tableBody,
-               "<%=HTMLUtils.JSMangle((String)nameLangs.elementAt(i))%>",
-               "<%=HTMLUtils.JSMangle((String)names.elementAt(i))%>");
-        <%
-        }
-        %>
-    }
-
-    function addRowToNameTable(tableBody, lang, name) {
-        var newRow = document.createElement("tr");
-        addKeyValueToRow(newRow, lang, name);
-        tableBody.appendChild(newRow);
-    }
-</script>
-
-<table border=0 cellpadding=6 cellspacing=0>
-    <tr>
-        <td height=40 valign="bottom" align="left" nowrap width=11>
-            <a href="javascript:twist('<%=nameTable%>','<%=xnameTable%>')"><img name="<%=xnameTable%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a>
-        </td>
-        <td height=40 valign="bottom" align="left" nowrap class="labels">
-            <strong><%=wsilPerspective.getMessage("FORM_LABEL_NAME")%></strong>
-        </td>
-    </tr>
-</table>
-
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
-    <tr>
-        <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" height=2 width="100%"></td>
-    </tr>
-</table>
-
-<div id="<%=nameTable%>">
-    <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
-        <tr>
-            <th class="headercolor"><%=wsilPerspective.getMessage("FORM_LABEL_LANGUAGE")%></th>
-            <th class="headercolor" width="100%"><%=wsilPerspective.getMessage("FORM_LABEL_NAME")%></th>
-        </tr>
-    </table>
-</div>
-
-<script language="javascript">
-    showName('<%=nameTable%>');
-    twistInit('<%=nameTable%>','<%=xnameTable%>');
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/scripts/wsilPanes.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/scripts/wsilPanes.jsp
deleted file mode 100644
index 07c5b3bea..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/scripts/wsilPanes.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page import="org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*,
-                 org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:include page="/scripts/panes.jsp" flush="true"/>
-<script language="javascript">
-  var wsilNavigatorContainer = perspectiveContent.frames["<%=WsilFrameNames.WSIL_NAVIGATOR_CONTAINER%>"];
-  var wsilNavigatorToolbar = wsilNavigatorContainer.frames["<%=WsilFrameNames.WSIL_NAVIGATOR_TOOLBAR%>"];
-  var wsilNavigatorContent = wsilNavigatorContainer.frames["<%=WsilFrameNames.WSIL_NAVIGATOR_CONTENT%>"];
-  var wsilActionsContainer = perspectiveContent.frames["<%=WsilFrameNames.WSIL_ACTIONS_CONTAINER%>"];
-  var wsilPropertiesContainer = wsilActionsContainer.frames["<%=WsilFrameNames.WSIL_PROPERTIES_CONTAINER%>"];
-  var wsilPropertiesToolbar = wsilPropertiesContainer.frames["<%=WsilFrameNames.WSIL_PROPERTIES_TOOLBAR%>"];
-  var wsilPropertiesContent = wsilPropertiesContainer.frames["<%=WsilFrameNames.WSIL_PROPERTIES_CONTENT%>"];
-  var wsilStatusContainer = wsilActionsContainer.frames["<%=WsilFrameNames.WSIL_STATUS_CONTAINER%>"];
-  var wsilStatusToolbar = wsilStatusContainer.frames["<%=WsilFrameNames.WSIL_STATUS_TOOLBAR%>"];
-  var wsilStatusContent = wsilStatusContainer.frames["<%=WsilFrameNames.WSIL_STATUS_CONTENT%>"];
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/scripts/wsilTable.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/scripts/wsilTable.jsp
deleted file mode 100644
index 625126bca..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/scripts/wsilTable.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.constants.*"%>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/scripts/tables.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<script language="javascript">
-
-    function wsilHandleCheckAllClick(tableContainerId, checkAllCheckbox) {
-        var table = getTable(tableContainerId);
-        for (var i=numberOfHeaderRows; i<table.rows.length; i++) {
-            var rowCheckboxCell = table.rows[i].getElementsByTagName("td").item(0);
-            var rowCheckbox = rowCheckboxCell.childNodes[0];
-            rowCheckbox.checked = checkAllCheckbox.checked;
-            if (rowCheckbox.checked) {
-                highlightRow(table.rows[i],"rowcolor");
-                rowCheckbox.name = "<%=ActionInputs.VIEWID%>";
-            }
-            else {
-                highlightRow(table.rows[i],"tablecells");
-                rowCheckbox.name = "";
-            }
-        }
-    }
-
-    function validateCheckBoxInput(checkbox, isChecked) {
-        if (isChecked) {
-            checkbox.name = "<%=ActionInputs.VIEWID%>";
-        }
-        else {
-            checkbox.name = "";
-        }
-        handleRowCheckboxClick();
-    }
-
-    function twistInit(tableContainerId,twistImageName) {
-        var tableContainer = document.getElementById(tableContainerId);
-        var table = getTable(tableContainerId);
-        if (table.rows.length > numberOfHeaderRows) {
-            tableContainer.style.display = "none";
-            twist(tableContainerId, twistImageName);
-        }
-        else {
-            tableContainer.style.display = "";
-            twist(tableContainerId, twistImageName);
-        }
-    }
-
-    function addKeyValueToRow(row, key, value) {
-        var keyText = document.createTextNode(key);
-        var valueText = document.createTextNode(value);
-        var newCol = document.createElement("td");
-        var newCol2 = document.createElement("td");
-        newCol.appendChild(keyText);
-        newCol.className = "tablecells";
-        newCol2.appendChild(valueText);
-        newCol2.className = "tablecells";
-        row.appendChild(newCol);
-        row.appendChild(newCol2);
-    }
-
-    function clearTable(tableBody, numHeader) {
-        for(var i = numHeader; i < tableBody.rows.length; i++) {
-            tableBody.deleteRow(i);
-            i--;
-        }
-    }
-
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/scripts/wsilframesets.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/scripts/wsilframesets.jsp
deleted file mode 100644
index 382673f2b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/scripts/wsilframesets.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:include page="/scripts/panes.jsp" flush="true"/>
-<script language="javascript">
-  function getActionsContainerFrameset()
-  {
-    return perspectiveContent.frames["<%=WsilFrameNames.WSIL_ACTIONS_CONTAINER%>"].document.getElementsByTagName("frameset").item(0);
-  }
-
-  function processFramesetSizes(framesetSizesForm)
-  {
-    toggleDoubleClickColumnTitle();
-    var perspectiveContentFrameset = getPerspectiveContentFrameset();
-    var actionsContainerFrameset = getActionsContainerFrameset();
-    framesetSizesForm.<%=WsilActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT%>.value = perspectiveContentFrameset.cols;
-    framesetSizesForm.<%=WsilActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER%>.value = actionsContainerFrameset.rows;
-    framesetSizesForm.submit();
-  }
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/views/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/views/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/views/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/views/UddiBusinessView.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/views/UddiBusinessView.jsp
deleted file mode 100644
index 517fae044..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/views/UddiBusinessView.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="java.util.Vector,
-                                                                                          java.util.Enumeration,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.util.QuickSort,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.AddToFavoritesAction,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.AddBusinessToUDDIPerspectiveAction,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.RefreshAction,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-    String divUDDIBusinessList = "divUDDIBusinessList";
-    String xdivUDDIBusinessList = "xdivUDDIBusinessList";
-
-    WSILPerspective wsilPerspective = controller.getWSILPerspective();
-    NodeManager nodeManager = wsilPerspective.getNodeManager();
-    Node selectedNode = nodeManager.getSelectedNode();
-    TreeElement selectedElement = selectedNode.getTreeElement();
-%>
-<html>
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <title><%=wsilPerspective.getMessage("VIEW_TITLE_UDDI_BUSINESSES")%></title>
-    <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-    <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/resumeproxyloadpage.js"))%>">
-    </script>
-    <jsp:include page="/wsil/scripts/wsilTable.jsp" flush="true"/>
-    <jsp:include page="/wsil/scripts/wsilFormSubmit.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-    <%
-    String titleImagePath = "wsil/images/list_business_highlighted.gif";
-    String title = wsilPerspective.getMessage("ALT_LIST_UDDI_LINKS");
-    %>
-    <%@ include file = "/forms/formheader.inc" %>
-    <table>
-      <tr>
-        <td class="labels">
-          <%=wsilPerspective.getMessage("FORM_LABEL_LIST_UDDI_BUSINESSES_DESC")%>
-        </td>
-      </tr>
-    </table>    
-    <form action="<%=response.encodeURL(controller.getPathWithContext(AddToFavoritesAction.getBaseActionLink()))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" style="margin-top:10px;">
-    <%
-    if (selectedElement instanceof WsilElement) {
-    %>
-        <input type="hidden" name="<%=ActionInputs.NODEID%>" value="<%=selectedNode.getNodeId()%>">
-        <input type="hidden" name="<%=WsilActionInputs.MULTIPLE_LINK_ACTION%>" value="1">
-        <table border=0 cellpadding=6 cellspacing=0>
-            <tr>
-                <td height=20 valign="bottom" align="left" nowrap width=11>
-                    <a href="javascript:twist('<%=divUDDIBusinessList%>','<%=xdivUDDIBusinessList%>')"><img name="<%=xdivUDDIBusinessList%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a>
-                </td>
-                <td height=20 valign="bottom" align="left" nowrap class="labels">
-                    <strong><%=wsilPerspective.getMessage("FORM_LABEL_UDDI_BUSINESS")%></strong>
-                </td>
-            </tr>
-        </table>
-
-        <table width="95%" border=0 cellpadding=0 cellspacing=0>
-            <tr>
-                <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" height=2 width="100%"></td>
-            </tr>
-        </table>
-
-        <div id="<%=divUDDIBusinessList%>">
-        <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
-            <tr>
-                <th class="checkboxcells" width=10><input type="checkbox" onClick="wsilHandleCheckAllClick('<%=divUDDIBusinessList%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
-                <th class="headercolor"><%=wsilPerspective.getMessage("FORM_LABEL_ITEM_NUMBER")%></th>
-                <th class="headercolor"><%=wsilPerspective.getMessage("FORM_LABEL_UDDI_BUSINESS_NAME")%></th>
-            </tr>
-            <%
-                ListManager uddiLinks = ((WsilElement)selectedElement).getAllUDDILinks();
-                Enumeration e = uddiLinks.getListElements();
-                int itemNum = 1;
-                Vector sortedVector = new Vector();
-                while (e.hasMoreElements()) {
-                	sortedVector.add(e.nextElement());
-             	  }
-                QuickSort.sort(sortedVector);
-                for (int i = 0; i < sortedVector.size(); i++) {
-                    ListElement le = (ListElement)sortedVector.elementAt(i);
-                    WsilUddiBusinessElement uddiLink = (WsilUddiBusinessElement)le.getObject();
-                    String name = uddiLink.getName();
-                    %>
-                    <tr>
-                        <td class="checkboxcells" width=10><input type="checkbox"  name="<%=ActionInputs.VIEWID%>" value="<%=le.getViewId()%>" onClick="validateCheckBoxInput(this, this.checked)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ROW_CHECK_BOX")%>"></td>
-                        <%
-                        if (name != null) {
-                        %>
-	                    <td class="tablecells" nowrap><a href="<%=response.encodeURL(controller.getPathWithContext(SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), le.getViewId(), 0, false)))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><%=String.valueOf(itemNum)%></a></td>
-       	             <td class="tablecells"><a href="<%=response.encodeURL(controller.getPathWithContext(SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), le.getViewId(), 0, false)))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><%=name%></a></td>
-       	          <%
-       	          }
-                        else {
-                        %>
-	                    <td class="tablecells" nowrap><%=String.valueOf(itemNum)%></td>
-       	             <td class="tablecells"><%=wsilPerspective.getMessage("FORM_LABEL_UNAVAILABLE_UDDI_BUSINESS")%>&nbsp;<%=uddiLink.getUDDILinkBusinessKey()%></td>
-                        <%
-                        }
-                        %>
-                    </tr>
-                    <%
-                    itemNum++;
-                }
-            %>
-        </table>
-        </div>
-        <script language="javascript">
-            twistInit('<%=divUDDIBusinessList%>','<%=xdivUDDIBusinessList%>');
-        </script>
-
-        <table border=0 cellpadding=2 cellspacing=0>
-            <tr>
-                <td height=40 valign="bottom">
-                    <input type="button" value="<%=wsilPerspective.getMessage("FORM_LABEL_ADD_TO_UDDI_PERSPECTIVE")%>" onClick="setFormLocationAndSubmit('<%=divUDDIBusinessList%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(AddBusinessToUDDIPerspectiveAction.getBaseActionLink()))%>')" class="button">
-                </td>
-                <td height=40 valign="bottom">
-                    <input type="button" value="<%=wsilPerspective.getMessage("FORM_LABEL_ADD_TO_FAVORITES")%>" onClick="setFormLocationAndSubmit('<%=divUDDIBusinessList%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(AddToFavoritesAction.getBaseActionLink()))%>')" class="button">
-                </td>
-                <td height=40 valign="bottom">
-                    <input type="button" value="<%=wsilPerspective.getMessage("FORM_LABEL_REFRESH")%>" onClick="setFormLocationAndSubmit('<%=divUDDIBusinessList%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(RefreshAction.getBaseActionLink()))%>')" class="button">
-                </td>
-                <td nowrap width="90%">&nbsp;</td>
-            </tr>
-        </table>
-
-    <%
-    }
-%>
-</div>
-
-<script language="javascript">
-    resumeProxyLoadPage();
-</script>
-
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/views/UddiServicesView.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/views/UddiServicesView.jsp
deleted file mode 100644
index f3b04448e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/views/UddiServicesView.jsp
+++ /dev/null
@@ -1,158 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="java.util.Vector,
-                                                                                          java.util.Enumeration,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.util.QuickSort,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.AddToFavoritesAction,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.AddServiceToUDDIPerspectiveAction,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.RefreshAction,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-    String divUDDIServiceList = "divUDDIServiceList";
-    String xdivUDDIServiceList = "xdivUDDIServiceList";
-
-    WSILPerspective wsilPerspective = controller.getWSILPerspective();
-    NodeManager nodeManager = wsilPerspective.getNodeManager();
-    Node selectedNode = nodeManager.getSelectedNode();
-    TreeElement selectedElement = selectedNode.getTreeElement();
-%>
-<html>
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <title><%=wsilPerspective.getMessage("VIEW_TITLE_UDDI_SERVICES")%></title>
-    <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-    <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/resumeproxyloadpage.js"))%>">
-    </script>
-    <jsp:include page="/wsil/scripts/wsilTable.jsp" flush="true"/>
-    <jsp:include page="/wsil/scripts/wsilFormSubmit.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-    <%
-    String titleImagePath = "wsil/images/list_UDDI_service_highlighted.gif";
-    String title = wsilPerspective.getMessage("ALT_LIST_UDDI_SERVICES");
-    %>
-    <%@ include file = "/forms/formheader.inc" %>
-    <table>
-      <tr>
-        <td class="labels">
-          <%=wsilPerspective.getMessage("FORM_LABEL_LIST_UDDI_SERVICES_DESC")%>
-        </td>
-      </tr>
-    </table>    
-    <form action="<%=response.encodeURL(controller.getPathWithContext(AddToFavoritesAction.getBaseActionLink()))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" style="margin-top:10px;">
-
-    <%
-    if (selectedElement instanceof WsilElement) {
-    %>
-        <input type="hidden" name="<%=ActionInputs.NODEID%>" value="<%=selectedNode.getNodeId()%>">
-        <input type="hidden" name="<%=WsilActionInputs.MULTIPLE_LINK_ACTION%>" value="1">
-        <table border=0 cellpadding=6 cellspacing=0>
-            <tr>
-                <td height=20 valign="bottom" align="left" nowrap width=11>
-                    <a href="javascript:twist('<%=divUDDIServiceList%>','<%=xdivUDDIServiceList%>')"><img name="<%=xdivUDDIServiceList%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a>
-                </td>
-                <td height=20 valign="bottom" align="left" nowrap class="labels">
-                    <strong><%=wsilPerspective.getMessage("FORM_LABEL_UDDI_SERVICE")%></strong>
-                </td>
-            </tr>
-        </table>
-
-        <table width="95%" border=0 cellpadding=0 cellspacing=0>
-            <tr>
-                <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" height=2 width="100%"></td>
-            </tr>
-        </table>
-
-        <div id="<%=divUDDIServiceList%>">
-        <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
-            <tr>
-                <th class="checkboxcells" width=10><input type="checkbox" onClick="wsilHandleCheckAllClick('<%=divUDDIServiceList%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
-                <th class="headercolor"><%=wsilPerspective.getMessage("FORM_LABEL_ITEM_NUMBER")%></th>
-                <th class="headercolor"><%=wsilPerspective.getMessage("FORM_LABEL_UDDI_SERVICE_NAME")%></th>
-            </tr>
-            <%
-                ListManager uddiServices = ((WsilElement)selectedElement).getAllUDDIServices();
-                Enumeration e = uddiServices.getListElements();
-                int itemNum = 1;
-                Vector sortedVector = new Vector();
-                while (e.hasMoreElements()) {
-                	sortedVector.add(e.nextElement());
-             	  }
-                QuickSort.sort(sortedVector);
-                for (int i = 0; i < sortedVector.size(); i++) {
-                    ListElement le = (ListElement)sortedVector.elementAt(i);
-                    WsilUddiServiceElement uddiService = (WsilUddiServiceElement)le.getObject();
-                    String name = uddiService.getName();
-                    %>
-                    <tr>
-                        <td class="checkboxcells" width=10><input type="checkbox"  name="<%=ActionInputs.VIEWID%>" value="<%=le.getViewId()%>" onClick="validateCheckBoxInput(this, this.checked)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ROW_CHECK_BOX")%>"></td>
-                        <%
-                        if (name != null) {
-                        %>
-                        	<td class="tablecells" nowrap><a href="<%=response.encodeURL(controller.getPathWithContext(SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), le.getViewId(), 0, false)))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><%=String.valueOf(itemNum)%></a></td>
-	                     <td class="tablecells" nowrap><a href="<%=response.encodeURL(controller.getPathWithContext(SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), le.getViewId(), 0, false)))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><%=name%></a></td>
-	                 <%
-	                 }
-                        else {
-                        %>
-                        	<td class="tablecells" nowrap><%=String.valueOf(itemNum)%></td>
-				<td class="tablecells" nowrap><%=wsilPerspective.getMessage("FORM_LABEL_UNAVAILABLE_UDDI_SERVICE")%>&nbsp;<%=uddiService.getUDDIServiceKey()%></td>
-                        <%
-                        }
-                        %>
-                    </tr>
-                    <%
-                    itemNum++;
-                }
-            %>
-        </table>
-        </div>
-        <script language="javascript">
-            twistInit('<%=divUDDIServiceList%>','<%=xdivUDDIServiceList%>');
-        </script>
-
-        <table border=0 cellpadding=2 cellspacing=0>
-            <tr>
-                <td height=40 valign="bottom">
-                    <input type="button" value="<%=wsilPerspective.getMessage("FORM_LABEL_ADD_TO_UDDI_PERSPECTIVE")%>" onClick="setFormLocationAndSubmit('<%=divUDDIServiceList%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(AddServiceToUDDIPerspectiveAction.getBaseActionLink()))%>')" class="button">
-                </td>
-                <td height=40 valign="bottom">
-                    <input type="button" value="<%=wsilPerspective.getMessage("FORM_LABEL_ADD_TO_FAVORITES")%>" onClick="setFormLocationAndSubmit('<%=divUDDIServiceList%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(AddToFavoritesAction.getBaseActionLink()))%>')" class="button">
-                </td>
-                <td height=40 valign="bottom">
-                    <input type="button" value="<%=wsilPerspective.getMessage("FORM_LABEL_REFRESH")%>" onClick="setFormLocationAndSubmit('<%=divUDDIServiceList%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(RefreshAction.getBaseActionLink()))%>')" class="button">
-                </td>
-                <td nowrap width="90%">&nbsp;</td>
-            </tr>
-        </table>
-
-    <%
-    }
-%>
-</div>
-
-<script language="javascript">
-    resumeProxyLoadPage();
-</script>
-
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/views/WsdlServicesView.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/views/WsdlServicesView.jsp
deleted file mode 100644
index 96469b3d5..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/views/WsdlServicesView.jsp
+++ /dev/null
@@ -1,134 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="java.util.Vector,
-                                                                                          java.util.Enumeration,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.util.QuickSort,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.AddToFavoritesAction,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.WsilAddToWSDLPerspectiveAction,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-    String divWSDLList = "divWSDLList";
-    String xdivWSDLList = "xdivWSDLList";
-
-    WSILPerspective wsilPerspective = controller.getWSILPerspective();
-    NodeManager nodeManager = wsilPerspective.getNodeManager();
-    Node selectedNode = nodeManager.getSelectedNode();
-    TreeElement selectedElement = selectedNode.getTreeElement();
-%>
-<html>
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <title><%=wsilPerspective.getMessage("VIEW_TITLE_WSDL_SERVICES")%></title>
-    <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-    <jsp:include page="/wsil/scripts/wsilTable.jsp" flush="true"/>
-    <jsp:include page="/wsil/scripts/wsilFormSubmit.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-    <%
-    String titleImagePath = "wsil/images/list_WSDL_service_highlighted.gif";
-    String title = wsilPerspective.getMessage("ALT_LIST_WSDL_SERVICES");
-    %>
-    <%@ include file = "/forms/formheader.inc" %>
-    <table>
-      <tr>
-        <td class="labels">
-          <%=wsilPerspective.getMessage("FORM_LABEL_LIST_WSDL_SERVICES_DESC")%>
-        </td>
-      </tr>
-    </table>    
-    <form action="<%=response.encodeURL(controller.getPathWithContext(AddToFavoritesAction.getBaseActionLink()))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" style="margin-top:10px;">
-    <%
-    if (selectedElement instanceof WsilElement) {
-    %>
-        <input type="hidden" name="<%=ActionInputs.NODEID%>" value="<%=selectedNode.getNodeId()%>">
-        <input type="hidden" name="<%=WsilActionInputs.MULTIPLE_LINK_ACTION%>" value="1">
-        <table border=0 cellpadding=6 cellspacing=0>
-            <tr>
-                <td height=25 valign="bottom" align="left" nowrap width=11>
-                    <a href="javascript:twist('<%=divWSDLList%>','<%=xdivWSDLList%>')"><img name="<%=xdivWSDLList%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a>
-                </td>
-                <td height=25 valign="bottom" align="left" nowrap class="labels">
-                    <strong><%=wsilPerspective.getMessage("FORM_LABEL_WSDL_SERVICE")%></strong>
-                </td>
-            </tr>
-        </table>
-
-        <table width="95%" border=0 cellpadding=0 cellspacing=0>
-            <tr>
-                <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" height=2 width="100%"></td>
-            </tr>
-        </table>
-
-        <div id="<%=divWSDLList%>">
-        <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
-            <tr>
-                <th class="checkboxcells" width=10><input type="checkbox" onClick="wsilHandleCheckAllClick('<%=divWSDLList%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
-                <th class="headercolor"><%=wsilPerspective.getMessage("FORM_LABEL_ITEM_NUMBER")%></th>
-                <th class="headercolor"><%=wsilPerspective.getMessage("FORM_LABEL_URL")%></th>
-            </tr>
-            <%
-                ListManager wsdlServices = ((WsilElement)selectedElement).getAllWSDLServices();
-                Enumeration e = wsdlServices.getListElements();
-                int itemNum = 1;
-                Vector sortedVector = new Vector();
-                while (e.hasMoreElements()) {
-                	sortedVector.add(e.nextElement());
-             	  }
-                QuickSort.sort(sortedVector);
-                for (int i = 0; i < sortedVector.size(); i++) {
-                    ListElement le = (ListElement)sortedVector.elementAt(i);
-                    WsilWsdlServiceElement wsdlService = (WsilWsdlServiceElement)le.getObject();
-                    String wsdlURL = wsdlService.getWSDLServiceURL();
-                    %>
-                    <tr>
-                        <td class="checkboxcells" width=10><input type="checkbox"  name="<%=ActionInputs.VIEWID%>" value="<%=le.getViewId()%>" onClick="validateCheckBoxInput(this, this.checked)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ROW_CHECK_BOX")%>"></td>
-                        <td class="tablecells" nowrap><a href="<%=response.encodeURL(controller.getPathWithContext(SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), le.getViewId(), 0, false)))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><%=String.valueOf(itemNum)%></a></td>
-                        <td class="tablecells" nowrap><%=wsdlURL%></td>
-                    </tr>
-                    <%
-                    itemNum++;
-                }
-            %>
-        </table>
-        </div>
-        <script language="javascript">
-            twistInit('<%=divWSDLList%>','<%=xdivWSDLList%>');
-        </script>
-
-        <table border=0 cellpadding=2 cellspacing=0>
-            <tr>
-                <td height=40 valign="bottom">
-                    <input type="button" value="<%=wsilPerspective.getMessage("FORM_LABEL_ADD_TO_WSDL_PERSPECTIVE")%>" onClick="setFormLocationAndSubmit('<%=divWSDLList%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(WsilAddToWSDLPerspectiveAction.getBaseActionLink()))%>')" class="button">
-                </td>
-                <td height=40 valign="bottom">
-                    <input type="button" value="<%=wsilPerspective.getMessage("FORM_LABEL_ADD_TO_FAVORITES")%>" onClick="setFormLocationAndSubmit('<%=divWSDLList%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(AddToFavoritesAction.getBaseActionLink()))%>')" class="button">
-                </td>
-                <td nowrap width="90%">&nbsp;</td>
-            </tr>
-        </table>
-
-    <%
-    }
-%>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/views/WsilLinksView.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/views/WsilLinksView.jsp
deleted file mode 100644
index fd97da7f5..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/views/WsilLinksView.jsp
+++ /dev/null
@@ -1,130 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="java.util.Vector,
-                                                                                          java.util.Enumeration,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.util.QuickSort,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.OpenWSILLinkAction,
-                                                                                          org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-    String divWSILList = "divWSILList";
-    String xdivWSILList = "xdivWSILList";
-
-    WSILPerspective wsilPerspective = controller.getWSILPerspective();
-    NodeManager nodeManager = wsilPerspective.getNodeManager();
-    Node selectedNode = nodeManager.getSelectedNode();
-    TreeElement selectedElement = selectedNode.getTreeElement();
-%>
-<html>
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <title><%=wsilPerspective.getMessage("VIEW_TITLE_WSIL_LINKS")%></title>
-    <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-    <jsp:include page="/wsil/scripts/wsilTable.jsp" flush="true"/>
-    <jsp:include page="/wsil/scripts/wsilFormSubmit.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-    <%
-    String titleImagePath = "wsil/images/list_WSIL_highlighted.gif";
-    String title = wsilPerspective.getMessage("ALT_LIST_WSIL_LINKS");
-    %>
-    <%@ include file = "/forms/formheader.inc" %>
-    <table>
-      <tr>
-        <td class="labels">
-          <%=wsilPerspective.getMessage("FORM_LABEL_LIST_WSIL_LINKS")%>
-        </td>
-      </tr>
-    </table>    
-    <form action="<%=response.encodeURL(controller.getPathWithContext(OpenWSILLinkAction.getBaseActionLink()))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" style="margin-top:10px;">
-    <%
-    if (selectedElement instanceof WsilElement) {
-    %>
-        <input type="hidden" name="<%=ActionInputs.NODEID%>" value="<%=selectedNode.getNodeId()%>">
-        <input type="hidden" name="<%=WsilActionInputs.MULTIPLE_LINK_ACTION%>" value="1">
-        <table border=0 cellpadding=6 cellspacing=0>
-            <tr>
-                <td height=25 valign="bottom" align="left" nowrap width=11>
-                    <a href="javascript:twist('<%=divWSILList%>','<%=xdivWSILList%>')"><img name="<%=xdivWSILList%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a>
-                </td>
-                <td height=25 valign="bottom" align="left" nowrap class="labels">
-                    <strong><%=wsilPerspective.getMessage("FORM_LABEL_WSIL_LINKS")%></strong>
-                </td>
-            </tr>
-        </table>
-
-        <table width="95%" border=0 cellpadding=0 cellspacing=0>
-            <tr>
-                <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" height=2 width="100%"></td>
-            </tr>
-        </table>
-
-        <div id="<%=divWSILList%>">
-        <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
-            <tr>
-                <th class="checkboxcells" width=10><input type="checkbox" onClick="wsilHandleCheckAllClick('<%=divWSILList%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
-                <th class="headercolor"><%=wsilPerspective.getMessage("FORM_LABEL_ITEM_NUMBER")%></th>
-                <th class="headercolor"><%=wsilPerspective.getMessage("FORM_LABEL_URL")%></th>
-            </tr>
-            <%
-                ListManager wsilLinks = ((WsilElement)selectedElement).getAllWSILLinks();
-                Enumeration e = wsilLinks.getListElements();
-                int itemNum = 1;
-                Vector sortedVector = new Vector();
-                while (e.hasMoreElements()) {
-                	sortedVector.add(e.nextElement());
-             	  }
-                QuickSort.sort(sortedVector);
-                for (int i = 0; i < sortedVector.size(); i++) {
-                    ListElement le = (ListElement)sortedVector.elementAt(i);
-                    WsilWsilLinkElement wsilLink = (WsilWsilLinkElement)le.getObject();
-                    String url = wsilLink.getWSILLinkLocation();
-                    %>
-                    <tr>
-                        <td class="checkboxcells" width=10><input type="checkbox"  name="<%=ActionInputs.VIEWID%>" value="<%=le.getViewId()%>" onClick="validateCheckBoxInput(this, this.checked)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ROW_CHECK_BOX")%>"></td>
-                        <td class="tablecells" nowrap><a href="<%=response.encodeURL(controller.getPathWithContext(SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), le.getViewId(), 0, false)))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><%=String.valueOf(itemNum)%></a></td>
-                        <td class="tablecells" nowrap><%=url%></td>
-                    </tr>
-                    <%
-                    itemNum++;
-                }
-            %>
-        </table>
-        </div>
-        <script language="javascript">
-            twistInit('<%=divWSILList%>','<%=xdivWSILList%>');
-        </script>
-
-        <table border=0 cellpadding=2 cellspacing=0>
-            <tr>
-                <td height=40 valign="bottom">
-                    <input type="button" value="<%=wsilPerspective.getMessage("FORM_LABEL_ADD_TO_NAVIGATOR")%>" onClick="setFormLocationAndSubmit('<%=divWSILList%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(OpenWSILLinkAction.getBaseActionLink()))%>')" class="button">
-                </td>
-                <td nowrap width="90%">&nbsp;</td>
-            </tr>
-        </table>
-
-    <%
-    }
-%>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_actions_container.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_actions_container.jsp
deleted file mode 100644
index 4acecc332..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_actions_container.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   WSILPerspective wsilPerspective = controller.getWSILPerspective();
-%>   
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=wsilPerspective.getMessage("FRAME_TITLE_ACTIONS_CONTAINER")%></title>
-</head>
-<frameset rows="<%=wsilPerspective.getActionsContainerFramesetRows()%>" bgcolor="#ECE9D8">
-  <frame name="<%=WsilFrameNames.WSIL_PROPERTIES_CONTAINER%>" title="<%=wsilPerspective.getMessage("FRAME_TITLE_PROPERTIES_CONTAINER")%>" src="<%=response.encodeURL("wsil_properties_container.jsp")%>" scrolling="no" frameborder=1 marginwidth=0 marginheight=0>
-  <frame name="<%=WsilFrameNames.WSIL_STATUS_CONTAINER%>" title="<%=wsilPerspective.getMessage("FRAME_TITLE_STATUS_CONTAINER")%>" src="<%=response.encodeURL("wsil_status_container.jsp")%>" scrolling="no" frameborder=1 marginwidth=0 marginheight=0>
-</frameset>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_navigator_container.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_navigator_container.jsp
deleted file mode 100644
index 02ba26bce..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_navigator_container.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   WSILPerspective wsilPerspective = controller.getWSILPerspective();
-%>   
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<frameset rows="33,*" border=0 bgcolor="#ECE9D8">
-  <frame name="<%=WsilFrameNames.WSIL_NAVIGATOR_TOOLBAR%>" title="<%=wsilPerspective.getMessage("FRAME_TITLE_NAVIGATOR_TOOLBAR")%>" src="<%=response.encodeURL("wsil_navigator_toolbar.jsp")%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-  <frame name="<%=WsilFrameNames.WSIL_NAVIGATOR_CONTENT%>" title="<%=wsilPerspective.getMessage("FRAME_TITLE_NAVIGATOR_CONTENT")%>" src="<%=response.encodeURL("wsil_navigator_content.jsp")%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-</frameset>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_navigator_content.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_navigator_content.jsp
deleted file mode 100644
index bb3c4bca3..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_navigator_content.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   WSILPerspective wsilPerspective = controller.getWSILPerspective();
-%>      
-<html>
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <title><%=wsilPerspective.getMessage("FRAME_TITLE_NAVIGATOR_CONTENT")%></title>
-    <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/treeview.css"))%>">
-    <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-    <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-    </script>
-    <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/treeview.js"))%>">
-    </script>
-</head>
-<%
-    String selectedAnchorName = "";
-    NodeManager nodeManager = controller.getWSILPerspective().getNodeManager();
-    int focusedNodeId = nodeManager.getFocusedNodeId();
-    String focusedAnchorName = String.valueOf(focusedNodeId);
-    Node selectedNode = nodeManager.getSelectedNode();
-    if (selectedNode != null) {
-        selectedAnchorName = selectedNode.getAnchorName();
-        if (focusedNodeId == selectedNode.getNodeId())
-            focusedAnchorName = selectedAnchorName;
-    }
-%>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" onLoad="self.location.hash='#<%=focusedAnchorName%>';setSelectedAnchorName('<%=selectedAnchorName%>')" class="contentbodymargin">
-    <div id="treecontentborder">
-        <%=nodeManager.renderTreeView(response)%>
-    </div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_navigator_toolbar.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_navigator_toolbar.jsp
deleted file mode 100644
index ef42244b6..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_navigator_toolbar.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   WSILPerspective wsilPerspective = controller.getWSILPerspective();
-%>   
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=wsilPerspective.getMessage("FRAME_TITLE_NAVIGATOR_TOOLBAR")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/toolbar.css"))%>">
-<jsp:include page="/wsil/scripts/wsilframesets.jsp" flush="true"/>  
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/toolbar.js"))%>">
-</script>  
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="toolbarbodymargin">
-<div id="toolbarborder">
-  <div id="toolbar" ondblclick="processFramesetSizes(document.forms[0])">
-<jsp:useBean id="formAction" class="java.lang.StringBuffer" scope="request">
-<%
-  formAction.append("wsil/actions/ResizeWSILFramesActionJSP.jsp");
-%>  
-</jsp:useBean>
-<jsp:useBean id="formFrameName" class="java.lang.StringBuffer" scope="request">
-<%
-   formFrameName.append(WsilFrameNames.WSIL_NAVIGATOR_CONTAINER);
-%>
-</jsp:useBean>
-<jsp:include page="/wsil/forms/ProcessWSILFramesetsForm.jsp" flush="true"/>
-    <table width="100%" height=25 cellpadding=0 cellspacing=0 border=0>
-      <tr>
-        <td valign="middle" align="center" width=25 height=25><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/navigator.gif"))%>" width=16 height=16></td>
-<%
-   String doubleClickColumnTitle = null;
-   if (wsilPerspective.getPerspectiveContentFramesetCols().startsWith("100%"))
-     doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_RESTORE");
-   else
-     doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_MAXIMIZE");
-%>        
-        <td id="doubleclickcolumn" title="<%=doubleClickColumnTitle%>" valign="middle" align="left" width="*" height=25 nowrap class="text"><%=controller.getMessage("ALT_NAVIGATOR")%></td>
-<%
-   String altRefresh = wsilPerspective.getMessage("ALT_REFRESH_WSIL");
-   String altClear = wsilPerspective.getMessage("ALT_CLEAR_WSIL");
-%>           
-        <td valign="middle" align="center" width=25 height=25><a href="<%=response.encodeURL(controller.getPathWithContext("wsil/actions/RefreshActionJSP.jsp"))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/refresh_enabled.gif"))%>" width=16 height=16 onMouseOver="src='<%=response.encodeURL(controller.getPathWithContext("images/refresh_highlighted.gif"))%>';mouseover(this)" onMouseOut="src='<%=response.encodeURL(controller.getPathWithContext("images/refresh_enabled.gif"))%>';mouseout(this)" onMouseDown="src='<%=response.encodeURL(controller.getPathWithContext("images/refresh_highlighted.gif"))%>';mousedown(this)" onMouseUp="src='<%=response.encodeURL(controller.getPathWithContext("images/refresh_enabled.gif"))%>';mouseup(this)" alt="<%=altRefresh%>" title="<%=altRefresh%>"></a></td>
-        <td valign="middle" align="center" width=25 height=25><a href="<%=response.encodeURL(controller.getPathWithContext("wsil/actions/ClearWSILActionJSP.jsp"))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>" width=16 height=16 onMouseOver="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_highlighted.gif"))%>';mouseover(this)" onMouseOut="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>';mouseout(this)" onMouseDown="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_highlighted.gif"))%>';mousedown(this)" onMouseUp="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>';mouseup(this)" alt="<%=altClear%>" title="<%=altClear%>"></a></td>
-      </tr>
-    </table>
-  </div>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_perspective_content.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_perspective_content.jsp
deleted file mode 100644
index 98ded4b9f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_perspective_content.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   WSILPerspective wsilPerspective = controller.getWSILPerspective();
-%>   
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<frameset cols="<%=wsilPerspective.getPerspectiveContentFramesetCols()%>" bgcolor="#ECE9D8">
-  <%
-  if (org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.isRTL())
-  {
-  %>
-  <frame name="<%=WsilFrameNames.WSIL_ACTIONS_CONTAINER%>" title="<%=wsilPerspective.getMessage("FRAME_TITLE_ACTIONS_CONTAINER")%>" src="<%=response.encodeURL("wsil_actions_container.jsp")%>" marginwidth=0 marginheight=0 scrolling="no" frameborder=1>
-  <frame name="<%=WsilFrameNames.WSIL_NAVIGATOR_CONTAINER%>" title="<%=wsilPerspective.getMessage("FRAME_TITLE_NAVIGATOR_CONTAINER")%>" src="<%=response.encodeURL("wsil_navigator_container.jsp")%>" marginwidth=0 marginheight=0 scrolling="no" frameborder=1>
-  <%
-  }
-  else
-  {
-  %>
-  <frame name="<%=WsilFrameNames.WSIL_NAVIGATOR_CONTAINER%>" title="<%=wsilPerspective.getMessage("FRAME_TITLE_NAVIGATOR_CONTAINER")%>" src="<%=response.encodeURL("wsil_navigator_container.jsp")%>" marginwidth=0 marginheight=0 scrolling="no" frameborder=1>
-  <frame name="<%=WsilFrameNames.WSIL_ACTIONS_CONTAINER%>" title="<%=wsilPerspective.getMessage("FRAME_TITLE_ACTIONS_CONTAINER")%>" src="<%=response.encodeURL("wsil_actions_container.jsp")%>" marginwidth=0 marginheight=0 scrolling="no" frameborder=1>
-  <%
-  }
-  %>
-</frameset>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_properties_container.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_properties_container.jsp
deleted file mode 100644
index b336e546c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_properties_container.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   WSILPerspective wsilPerspective = controller.getWSILPerspective();
-%>   
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=wsilPerspective.getMessage("FRAME_TITLE_PROPERTIES_CONTAINER")%></title>
-</head>
-<frameset rows="33,*" border=0 bgcolor="#ECE9D8">
-  <frame name="<%=WsilFrameNames.WSIL_PROPERTIES_TOOLBAR%>" title="<%=wsilPerspective.getMessage("FRAME_TITLE_PROPERTIES_TOOLBAR")%>" src="<%=response.encodeURL("wsil_properties_toolbar.jsp")%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-  <frame name="<%=WsilFrameNames.WSIL_PROPERTIES_CONTENT%>" title="<%=wsilPerspective.getMessage("FRAME_TITLE_PROPERTIES_CONTENT")%>" src="<%=response.encodeURL("wsil_properties_content.jsp")%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-</frameset>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_properties_content.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_properties_content.jsp
deleted file mode 100644
index a72cc746d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_properties_content.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   WSILPerspective wsilPerspective = controller.getWSILPerspective();
-%>   
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=wsilPerspective.getMessage("FRAME_TITLE_PROPERTIES_CONTENT")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-<%
-    NodeManager nodeManager = wsilPerspective.getNodeManager();
-    Node selectedNode = nodeManager.getSelectedNode();
-    if (selectedNode != null)
-    {
-        ToolManager toolManager;
-        if (selectedNode.getViewId() == ActionInputs.VIEWID_DEFAULT)
-            toolManager = selectedNode.getToolManager();
-        else
-            toolManager = selectedNode.getViewToolManager();
-        Tool selectedTool = toolManager.getSelectedTool();
-        if (selectedTool != null && selectedTool.getToolType() != ToolTypes.ACTION) {
-        %>
-        <script language="javascript">
-            location="<%=response.encodeURL(controller.getPathWithContext(selectedTool.getFormLink()))%>";
-        </script>
-        <%
-        }
-        else {
-        %>
-<table>
-  <tr>
-    <td>
-      <%=controller.getMessage("MSG_ERROR_NO_ACTION_SELECTED")%>
-    </td>
-  </tr>
-</table>
-        <%
-        }
-    }
-    else {
-    %>
-<table>
-  <tr>
-    <td>
-      <%=controller.getMessage("MSG_ERROR_NO_NODE_SELECTED")%>
-    </td>
-  </tr>
-</table>
-    <%
-    }
-%>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_properties_toolbar.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_properties_toolbar.jsp
deleted file mode 100644
index 49aa504f6..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_properties_toolbar.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   WSILPerspective wsilPerspective = controller.getWSILPerspective();
-%>   
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=wsilPerspective.getMessage("FRAME_TITLE_PROPERTIES_TOOLBAR")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/toolbar.css"))%>">
-<jsp:include page="/wsil/scripts/wsilframesets.jsp" flush="true"/>  
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/toolbar.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="toolbarbodymargin">
-<div id="toolbarborder">
-  <div id="toolbar" ondblclick="processFramesetSizes(document.forms[0])">
-<jsp:useBean id="formAction" class="java.lang.StringBuffer" scope="request">
-<%
-  formAction.append("wsil/actions/ResizeWSILFramesActionJSP.jsp");
-%>  
-</jsp:useBean>
-<jsp:useBean id="formFrameName" class="java.lang.StringBuffer" scope="request">
-<%
-   formFrameName.append(WsilFrameNames.WSIL_PROPERTIES_CONTAINER);
-%>
-</jsp:useBean>
-<jsp:include page="/wsil/forms/ProcessWSILFramesetsForm.jsp" flush="true"/>
-    <table width="100%" height=25 cellpadding=0 cellspacing=0 border=0>
-      <tr>
-        <td valign="middle" align="center" width=25 height=25><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/actions.gif"))%>" width=16 height=16></td>
-<%
-   String doubleClickColumnTitle = null;
-   if (wsilPerspective.getPerspectiveContentFramesetCols().endsWith("100%"))
-   {
-     if (wsilPerspective.getActionsContainerFramesetRows().startsWith("100%"))
-       doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_RESTORE");
-   }
-   if (doubleClickColumnTitle == null)
-     doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_MAXIMIZE");
-%>        
-        <td id="doubleclickcolumn" title="<%=doubleClickColumnTitle%>" valign="middle" align="left" width="*" height=25 nowrap class="text"><%=controller.getMessage("ALT_ACTIONS")%></td>
-<%
-    NodeManager nodeManager = wsilPerspective.getNodeManager();
-    Node selectedNode = nodeManager.getSelectedNode();
-    if (selectedNode != null) {
-        ToolManager toolManager;
-        if (selectedNode.getViewId() == ActionInputs.VIEWID_DEFAULT)
-            toolManager = selectedNode.getToolManager();
-        else
-            toolManager = selectedNode.getViewToolManager();
-        for(int i=0; i<toolManager.getNumberOfTools(); i++) {
-            Tool tool = (Tool)toolManager.getTool(i);
-            %>
-        <td valign="middle" align="center" width=25 height=25><%=tool.renderTool(response,controller)%></td>
-            <%
-        }
-    }
-%>
-      </tr>
-    </table>
-  </div>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_status_container.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_status_container.jsp
deleted file mode 100644
index e0834c5c7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_status_container.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   WSILPerspective wsilPerspective = controller.getWSILPerspective();
-%>   
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=wsilPerspective.getMessage("FRAME_TITLE_STATUS_CONTAINER")%></title>
-</head>
-<frameset rows="33,*" border=0 bgcolor="#ECE9D8">
-  <frame name="<%=WsilFrameNames.WSIL_STATUS_TOOLBAR%>" title="<%=wsilPerspective.getMessage("FRAME_TITLE_STATUS_TOOLBAR")%>" src="<%=response.encodeURL("wsil_status_toolbar.jsp")%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-  <frame name="<%=WsilFrameNames.WSIL_STATUS_CONTENT%>" title="<%=wsilPerspective.getMessage("FRAME_TITLE_STATUS_CONTENT")%>" src="<%=response.encodeURL("wsil_status_content.jsp")%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-</frameset>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_status_content.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_status_content.jsp
deleted file mode 100644
index 959a6f372..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_status_content.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   WSILPerspective wsilPerspective = controller.getWSILPerspective();
-%>   
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=wsilPerspective.getMessage("FRAME_TITLE_STATUS_CONTENT")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-  <table>
-    <tr>
-      <td>
-        <pre>
-<%=wsilPerspective.getMessageQueue().getMessagesFromList()%>
-        </pre>
-      </td>
-    </tr>
-  </table>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_status_toolbar.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_status_toolbar.jsp
deleted file mode 100644
index 4d4f30e5a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_status_toolbar.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   WSILPerspective wsilPerspective = controller.getWSILPerspective();
-%>   
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=wsilPerspective.getMessage("FRAME_TITLE_STATUS_TOOLBAR")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/toolbar.css"))%>">
-<jsp:include page="/wsil/scripts/wsilframesets.jsp" flush="true"/>  
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/toolbar.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="toolbarbodymargin">
-<div id="toolbarborder">
-  <div id="toolbar" ondblclick="processFramesetSizes(document.forms[0])">
-<jsp:useBean id="formAction" class="java.lang.StringBuffer" scope="request">
-<%
-  formAction.append("wsil/actions/ResizeWSILFramesActionJSP.jsp");
-%>  
-</jsp:useBean>
-<jsp:useBean id="formFrameName" class="java.lang.StringBuffer" scope="request">
-<%
-   formFrameName.append(WsilFrameNames.WSIL_STATUS_CONTAINER);
-%>
-</jsp:useBean>
-<jsp:include page="/wsil/forms/ProcessWSILFramesetsForm.jsp" flush="true"/>
-    <table width="100%" height=25 cellpadding=0 cellspacing=0 border=0>
-      <tr>
-        <td valign="middle" align="center" width=25 height=25><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/status.gif"))%>" width=16 height=16></td>
-<%
-   String doubleClickColumnTitle = null;
-   if (wsilPerspective.getPerspectiveContentFramesetCols().endsWith("100%"))
-   {
-     if (wsilPerspective.getActionsContainerFramesetRows().endsWith("100%"))
-       doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_RESTORE");
-   }
-   if (doubleClickColumnTitle == null)
-     doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_MAXIMIZE");
-%>        
-        <td id="doubleclickcolumn" title="<%=doubleClickColumnTitle%>" valign="middle" align="left" width="*" height=25 nowrap class="text"><%=controller.getMessage("ALT_STATUS")%></td>
-<%
-   String altClear = controller.getMessage("ALT_CLEAR");
-%>           
-        <td valign="middle" align="center" width=25 height=25><a href="<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_status_content.jsp"))%>" target="<%=WsilFrameNames.WSIL_STATUS_CONTENT%>"><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>" width=16 height=16 onMouseOver="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_highlighted.gif"))%>';mouseover(this)" onMouseOut="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>';mouseout(this)" onMouseDown="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_highlighted.gif"))%>';mousedown(this)" onMouseUp="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>';mouseup(this)" alt="<%=altClear%>" title="<%=altClear%>"></a></td>
-      </tr>
-    </table>
-  </div>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.parser/.classpath b/bundles/org.eclipse.wst.ws.parser/.classpath
deleted file mode 100644
index 751c8f2e5..000000000
--- a/bundles/org.eclipse.wst.ws.parser/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.wst.ws.parser/.cvsignore b/bundles/org.eclipse.wst.ws.parser/.cvsignore
deleted file mode 100644
index 6e021a124..000000000
--- a/bundles/org.eclipse.wst.ws.parser/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-.cdtproject
-build.xml
-temp.folder
-parser.jar
-@dot
-src.zip
diff --git a/bundles/org.eclipse.wst.ws.parser/.project b/bundles/org.eclipse.wst.ws.parser/.project
deleted file mode 100644
index feb66400b..000000000
--- 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/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.wst.ws.parser/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index de2122bdc..000000000
--- a/bundles/org.eclipse.wst.ws.parser/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,57 +0,0 @@
-#Mon Jan 30 10:38:08 EST 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/bundles/org.eclipse.wst.ws.parser/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.wst.ws.parser/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 25b0b69eb..000000000
--- a/bundles/org.eclipse.wst.ws.parser/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Jan 30 10:39:59 EST 2006
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.wst.ws.parser/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.ws.parser/META-INF/MANIFEST.MF
deleted file mode 100644
index 4d3364697..000000000
--- a/bundles/org.eclipse.wst.ws.parser/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,21 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.wst.ws.parser
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.wst.ws.internal.parser.plugin.ParserPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.ws.internal.parser.disco,
- org.eclipse.wst.ws.internal.parser.discovery,
- org.eclipse.wst.ws.internal.parser.favorites,
- org.eclipse.wst.ws.internal.parser.plugin,
- org.eclipse.wst.ws.internal.parser.wsil,
- org.eclipse.wst.ws.parser
-Require-Bundle: org.eclipse.wst.wsdl,
- org.wsdl4j,
- org.eclipse.core.runtime,
- org.apache.wsil4j,
- org.uddi4j,
- org.eclipse.wst.command.env.core
-Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.wst.ws.parser/about.html b/bundles/org.eclipse.wst.ws.parser/about.html
deleted file mode 100644
index 6f6b96c4c..000000000
--- a/bundles/org.eclipse.wst.ws.parser/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.parser/build.properties b/bundles/org.eclipse.wst.ws.parser/build.properties
deleted file mode 100644
index f41b40a78..000000000
--- a/bundles/org.eclipse.wst.ws.parser/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-bin.includes = plugin.xml,\
-               .,\
-               META-INF/,\
-               plugin.properties,\
-               about.html
-source.. = src/
-output.. = bin/
diff --git a/bundles/org.eclipse.wst.ws.parser/plugin.properties b/bundles/org.eclipse.wst.ws.parser/plugin.properties
deleted file mode 100644
index 395ac6e50..000000000
--- 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/src/org/eclipse/wst/ws/internal/parser/disco/DISCOContractReference.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/disco/DISCOContractReference.java
deleted file mode 100644
index a96dad292..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/disco/DISCOContractReference.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.disco;
-
-public class DISCOContractReference extends DISCOReference
-{
-  private String docRef_;
-  
-  public DISCOContractReference(String ref,String docRef)
-  {
-    super(ref);
-    docRef_ = docRef;
-  }
-  
-  public String getDocRef()
-  {
-    return docRef_;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/disco/DISCOParser.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/disco/DISCOParser.java
deleted file mode 100644
index 620944923..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/disco/DISCOParser.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.disco;
-
-import java.util.Vector;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-
-/**
- * See http://msdn.microsoft.com/msdnmag/issues/02/02/xml/default.aspx for more
- * details on DISCO.
- */
-public class DISCOParser
-{
-  private DocumentBuilder parser_;
-  private final String NS_DISCO = "http://schemas.xmlsoap.org/disco/";
-  private final String DISCOVERY = "discovery";
-  private final String DISCOVERY_REF = "discoveryRef";
-  private final String NS_CONTRACT_REF = "http://schemas.xmlsoap.org/disco/scl/";
-  private final String CONTRACT_REF = "contractRef";
-  private final String REF = "ref";
-  private final String DOC_REF = "docRef";
-
-  public DISCOParser()
-  {
-    try
-    {
-      DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
-      docBuilderFactory.setNamespaceAware(true);
-      parser_ = docBuilderFactory.newDocumentBuilder();
-    }
-    catch (ParserConfigurationException pce)
-    {
-      parser_ = null;
-    }
-  }
-
-  public DISCOReference[] parse(String discoURI, InputSource source) throws Exception
-  {
-    if (parser_ != null)
-    {
-      Document doc = parser_.parse(source);
-      Element rootElement = doc.getDocumentElement();
-      // Root element must by <disco:discovery
-      // xmlns:disco="http://schemas.xmlsoap.org/disco/">
-      if (rootElement != null && rootElement.getNamespaceURI().equals(NS_DISCO) && rootElement.getLocalName().equals(DISCOVERY))
-      {
-        NodeList childNodes = rootElement.getChildNodes();
-        Vector discoReferences = new Vector();
-        for (int i = 0; i < childNodes.getLength(); i++)
-        {
-          Node childNode = childNodes.item(i);
-          if (childNode instanceof Element)
-          {
-            Element element = (Element)childNode;
-            String localName = element.getLocalName();
-            String nsURI = element.getNamespaceURI();
-            if (nsURI.equals(NS_DISCO) && localName.equals(DISCOVERY_REF))
-            {
-              // DISCO link.
-              String ref = convertToAbsoluteURI(discoURI, element.getAttribute(REF));
-              discoReferences.addElement(new DISCOReference(ref));
-            }
-            else if (nsURI.equals(NS_CONTRACT_REF) && localName.equals(CONTRACT_REF))
-            {
-              // WSDL link.
-              String ref = convertToAbsoluteURI(discoURI, element.getAttribute(REF));
-              String docRef = convertToAbsoluteURI(discoURI, element.getAttribute(DOC_REF));
-              discoReferences.addElement(new DISCOContractReference(ref, docRef));
-            }
-          }
-        }
-        int numberOfDISCOReferences = discoReferences.size();
-        if (numberOfDISCOReferences > 0)
-        {
-          DISCOReference[] references = new DISCOReference[numberOfDISCOReferences];
-          discoReferences.copyInto(references);
-          return references;
-        }
-      }
-      else
-      {
-        // The document is not a valid DISCO document.
-        throw new Exception();
-      }
-    }
-    return null;
-  }
-
-  private String convertToAbsoluteURI(String discoURI, String refURI)
-  {
-    if (refURI != null)
-    {
-      if (refURI.indexOf("://") > -1)
-      {
-        // refURI is already absolute.
-        return refURI;
-      }
-      else
-      {
-        StringBuffer absoluteURI = new StringBuffer(discoURI.substring(0, Math.max(discoURI.lastIndexOf('\\'), discoURI.lastIndexOf('/') + 1)));
-        absoluteURI.append(refURI);
-        return absoluteURI.toString();
-      }
-    }
-    return null;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/disco/DISCOReference.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/disco/DISCOReference.java
deleted file mode 100644
index dd2175edb..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/disco/DISCOReference.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.disco;
-
-public class DISCOReference
-{
-  private String ref_;
-  
-  public DISCOReference(String ref)
-  {
-    ref_ = ref;
-  }
-  
-  public String getRef()
-  {
-    return ref_;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/discovery/NetUtils.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/discovery/NetUtils.java
deleted file mode 100644
index 527a489b1..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/discovery/NetUtils.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.discovery;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
-
-import sun.misc.BASE64Encoder;
-
-public final class NetUtils
-{
-
-  /**
-   * Get the java.net.URLConnection given a string representing the URL. This class ensures
-   * that proxy settings in WSAD are respected.
-   * @param urlString String representing the URL.
-   * @return java.net.URLCDonnection URLConnection to the URL.
-   */
-  public static final URLConnection getURLConnection(String urlString)
-  {
-    try
-    {
-      URL url = createURL(urlString);
-      URLConnection uc = url.openConnection();
-      String proxyUserName = System.getProperty("http.proxyUserName");
-      String proxyPassword = System.getProperty("http.proxyPassword");
-      if (proxyUserName != null && proxyPassword != null)
-      {
-        StringBuffer userNamePassword = new StringBuffer(proxyUserName);
-        userNamePassword.append(':').append(proxyPassword);
-        BASE64Encoder encoder = new BASE64Encoder();
-        String encoding = encoder.encode(userNamePassword.toString().getBytes());
-        userNamePassword.setLength(0);
-        userNamePassword.append("Basic ").append(encoding);
-        uc.setRequestProperty("Proxy-authorization",userNamePassword.toString());
-      }
-      return uc;
-    }
-    catch (MalformedURLException e)
-    {
-    }
-    catch (IOException e)
-    {
-    }
-    return null;
-  }
-  
-  /**
-   * Get the java.io.InputStream for a URL given a string representing the URL. This class
-   * ensures that proxy settings in WSAD are respected.
-   * @param urlString String representing the URL.
-   * @return java.io.InputStream InputStream for reading the URL stream.
-   */
-  public static final InputStream getURLInputStream(String urlString)
-  {
-    try
-    {
-      URLConnection uc = getURLConnection(urlString);
-      if (uc != null)
-      {
-        InputStream is = uc.getInputStream();
-        return is;
-      }
-    }
-    catch (IOException e)
-    {
-    }
-    return null;
-  }
-
-  /**
-   * Create a URL from a string.
-   * @param urlString String representing the URL.
-   * @return URL java.lang.URL representation of the URL.
-   * @throws MalformedURLException
-   */
-  public static final URL createURL(String urlString) throws MalformedURLException
-  {
-  	return new URL(urlString);
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/discovery/WebServicesParserExt.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/discovery/WebServicesParserExt.java
deleted file mode 100644
index 4e907538f..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/discovery/WebServicesParserExt.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.discovery;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-public class WebServicesParserExt extends WebServicesParser {
-
-    public WebServicesParserExt() {
-        super();
-    }
-
-    public WebServicesParserExt(String uri) {
-        super(uri);
-    }
-
-    protected URL createURL(String url) throws MalformedURLException {
-        return NetUtils.createURL(url);
-    }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesConstants.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesConstants.java
deleted file mode 100644
index 5b2e956e7..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesConstants.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.favorites;
-
-public class FavoritesConstants
-{
-  // Namespace
-  public static final String NAMESPACE_WSDL = "http://schemas.xmlsoap.org/wsdl/";
-  public static final String NAMESPACE_UDDI_V1 = "urn:uddi-org:api";
-  public static final String NAMESPACE_UDDI_V2 = "urn:uddi-org:api_v2";
-  public static final String NAMESPACE_UDDI_BINDING = "http://schemas.xmlsoap.org/ws/2001/10/inspection/uddi/";
-  public static final String NAMESPACE_WSIL_INSPECTION = "http://schemas.xmlsoap.org/ws/2001/10/inspection/";
-}
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesLink.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesLink.java
deleted file mode 100644
index c8c912955..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesLink.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.favorites;
-
-import org.apache.wsil.Link;
-
-public class FavoritesLink
-{
-  protected Link link_;
-
-  public FavoritesLink()
-  {
-    link_ = null;
-  }
-
-  public Link getLink()
-  {
-    return link_;
-  }
-
-  public void setLink(Link link)
-  {
-    link_ = link;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesRegistryTypeAbstract.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesRegistryTypeAbstract.java
deleted file mode 100644
index d167fbea6..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesRegistryTypeAbstract.java
+++ /dev/null
@@ -1,429 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.favorites;
-
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.Vector;
-
-import org.apache.wsil.Abstract;
-import org.apache.wsil.Description;
-import org.apache.wsil.Inspection;
-import org.apache.wsil.Link;
-import org.apache.wsil.Service;
-import org.apache.wsil.ServiceName;
-import org.apache.wsil.WSILDocument;
-import org.apache.wsil.WSILException;
-import org.apache.wsil.extension.uddi.BusinessDescription;
-import org.apache.wsil.extension.uddi.ServiceDescription;
-import org.apache.wsil.impl.AbstractImpl;
-import org.apache.wsil.impl.DescriptionImpl;
-import org.apache.wsil.impl.LinkImpl;
-import org.apache.wsil.impl.ServiceImpl;
-import org.apache.wsil.impl.ServiceNameImpl;
-import org.apache.wsil.impl.extension.uddi.BusinessDescriptionImpl;
-import org.apache.wsil.impl.extension.uddi.ServiceDescriptionImpl;
-import org.uddi4j.util.BusinessKey;
-import org.uddi4j.util.ServiceKey;
-
-public abstract class FavoritesRegistryTypeAbstract implements IFavoritesRegistryType
-{
-  public FavoritesRegistryTypeAbstract()
-  {
-  }
-
-  public abstract String getReadLocation();
-  public abstract String getWriteLocation();
-  protected abstract WSILDocument getWSILDocument();
-
-  public void init()
-  {
-    getWSILDocument();
-  }
-
-  protected WSILDocument loadWSILDocument(String path, boolean force)
-  {
-    try
-    {
-      WSILDocument wsilDoc = WSILDocument.newInstance();
-      wsilDoc.read(new FileReader(new File(path)));
-      return wsilDoc;
-    }
-    catch (Throwable t)
-    {
-      if (force)
-      {
-        try
-        {
-          return WSILDocument.newInstance();
-        }
-        catch (Throwable t2)
-        {
-          return null;
-        }
-      }
-      else
-        return null;
-    }
-  }
-
-  public String getFavoritesVersion()
-  {
-    WSILDocument wsilDoc = getWSILDocument();
-    Inspection inspection = wsilDoc.getInspection();
-    Abstract[] abstracts = inspection.getAbstracts();
-    if (abstracts.length > 0)
-      return abstracts[0].getText();
-    else
-      return null;
-  }
-
-  public void setFavoritesVersion(String version)
-  {
-    WSILDocument wsilDoc = getWSILDocument();
-    Inspection inspection = wsilDoc.getInspection();
-    Abstract abst = new AbstractImpl();
-    abst.setText(version);
-    inspection.removeAbstracts();
-    inspection.addAbstract(abst);
-  }
-
-  public synchronized void save() throws WSILException, IOException
-  {
-    WSILDocument wsilDoc = getWSILDocument();
-    if (wsilDoc != null)
-      wsilDoc.write(getWriteLocation());
-  }
-
-  public IFavoritesUDDIRegistry[] getFavoritesUDDIRegistries()
-  {
-    Link[] links = loadUDDIRegistries();
-    FavoritesUDDIRegistry[] registries = new FavoritesUDDIRegistry[links.length];
-    for (int i = 0; i < links.length; i++)
-    {
-      registries[i] = new FavoritesUDDIRegistry();
-      registries[i].setLink(links[i]);
-    }
-    return registries;
-  }
-
-  public IFavoritesUDDIBusiness[] getFavoritesUDDIBusinesses()
-  {
-    Link[] links = loadUDDIBusinesses();
-    FavoritesUDDIBusiness[] businesses = new FavoritesUDDIBusiness[links.length];
-    for (int i = 0; i < links.length; i++)
-    {
-      businesses[i] = new FavoritesUDDIBusiness();
-      businesses[i].setLink(links[i]);
-    }
-    return businesses;
-  }
-
-  public IFavoritesUDDIService[] getFavoritesUDDIServices()
-  {
-    Service[] services = loadUDDIServices();
-    FavoritesUDDIService[] uddiServices = new FavoritesUDDIService[services.length];
-    for (int i = 0; i < services.length; i++)
-    {
-      uddiServices[i] = new FavoritesUDDIService();
-      uddiServices[i].setService(services[i]);
-    }
-    return uddiServices;
-  }
-
-  public IFavoritesUDDIServiceInterface[] getFavoritesUDDIServiceInterfaces()
-  {
-    Service[] services = loadUDDIServiceInterfaces();
-    FavoritesUDDIServiceInterface[] serInts = new FavoritesUDDIServiceInterface[services.length];
-    for (int i = 0; i < services.length; i++)
-    {
-      serInts[i] = new FavoritesUDDIServiceInterface();
-      serInts[i].setService(services[i]);
-    }
-    return serInts;
-  }
-
-  public IFavoritesWSDL[] getFavoritesWSDLs()
-  {
-    Service[] services = loadWSDLServices();
-    FavoritesWSDL[] wsdls = new FavoritesWSDL[services.length];
-    for (int i = 0; i < services.length; i++)
-    {
-      wsdls[i] = new FavoritesWSDL();
-      wsdls[i].setService(services[i]);
-    }
-    return wsdls;
-  }
-
-  public IFavoritesWSIL[] getFavoritesWSILs()
-  {
-    Link[] links = loadWSILs();
-    FavoritesWSIL[] wsils = new FavoritesWSIL[links.length];
-    for (int i = 0; i < links.length; i++)
-    {
-      wsils[i] = new FavoritesWSIL();
-      wsils[i].setLink(links[i]);
-    }
-    return wsils;
-  }
-
-  public Link[] loadUDDIRegistries() {
-    return loadLinksByNamespace(FavoritesConstants.NAMESPACE_UDDI_V1);
-  }
-    
-  public Link[] loadUDDIBusinesses() {
-    return loadLinksByNamespace(FavoritesConstants.NAMESPACE_UDDI_V2);
-  }
-
-  public Service[] loadUDDIServices() {
-    return loadServicesByNamespace(FavoritesConstants.NAMESPACE_UDDI_V2);
-  }
-
-  public Service[] loadUDDIServiceInterfaces() {
-    return loadServicesByNamespace(FavoritesConstants.NAMESPACE_UDDI_V1);
-  }
-
-  public Service[] loadWSDLServices() {
-    return loadServicesByNamespace(FavoritesConstants.NAMESPACE_WSDL);
-  }
-
-  public Link[] loadWSILs() {
-    return loadLinksByNamespace(FavoritesConstants.NAMESPACE_WSIL_INSPECTION);
-  }
-
-  private Service[] loadServicesByNamespace(String namespace) {
-    Vector serviceVector = new Vector();
-    WSILDocument wsilDoc = getWSILDocument();
-    if (wsilDoc != null)
-    {
-      Inspection inspection = wsilDoc.getInspection();
-      Service[] services = inspection.getServices();
-      for (int i = 0; i < services.length; i++)
-      {
-         Description[] desc = services[i].getDescriptions();
-         if (desc[0].getReferencedNamespace().equals(namespace))
-           serviceVector.add(services[i]);
-      }
-    }
-    Service[] services = new Service[serviceVector.size()];
-    serviceVector.copyInto(services);
-    return services;
-  }
-
-  private Link[] loadLinksByNamespace(String namespace) {
-    Vector linkVector = new Vector();
-    WSILDocument wsilDoc = getWSILDocument();
-    if (wsilDoc != null)
-    {
-      Inspection inspection = wsilDoc.getInspection();
-      Link[] links = inspection.getLinks();
-      for (int i = 0; i < links.length; i++)
-      {
-        if (links[i].getReferencedNamespace().equals(namespace))
-          linkVector.add(links[i]);
-      }
-    }
-    Link[] links = new Link[linkVector.size()];
-    linkVector.copyInto(links);
-    return links;
-  }
-
-  public void addFavoritesUDDIRegistry(IFavoritesUDDIRegistry registry)
-  {
-    addUDDIRegistry(registry.getName(), registry.getInquiryURL(), registry.getPublishURL(), registry.getRegistrationURL());
-  }
-
-  public void addFavoritesUDDIBusiness(IFavoritesUDDIBusiness business)
-  {
-    addUDDIBusiness(business.getName(), business.getInquiryURL(), business.getBusinessKey());
-  }
-
-  public void addFavoritesUDDIService(IFavoritesUDDIService service)
-  {
-    addUDDIService(service.getName(), service.getInquiryURL(), service.getServiceKey());
-  }
-
-  public void addFavoritesUDDIServiceInterface(IFavoritesUDDIServiceInterface serviceInterface)
-  {
-    addUDDIServiceInterface(serviceInterface.getName(), serviceInterface.getInquiryURL(), serviceInterface.getServiceInterfaceKey());
-  }
-
-  public void addFavoritesWSDL(IFavoritesWSDL wsdl)
-  {
-    addWSDLService(wsdl.getWsdlUrl());
-  }
-
-  public void addFavoritesWSIL(IFavoritesWSIL wsil)
-  {
-    addWSILLink(wsil.getWsilUrl());
-  }
-
-  public Link addUDDIRegistry(String registryName, String inquiryAPI, String publishAPI, String registrationURL) {
-    WSILDocument wsilDoc = getWSILDocument();
-    Inspection inspection = wsilDoc.getInspection();
-    Link link = new LinkImpl();
-    // registry name
-    Abstract abst = new AbstractImpl();
-    abst.setText(registryName);
-    link.addAbstract(abst);
-    // inquiry URL
-    Abstract abst2 = new AbstractImpl();
-    abst2.setText(inquiryAPI);
-    link.addAbstract(abst2);
-    // publish URL
-    Abstract abst3 = new AbstractImpl();
-    if (publishAPI != null)
-      abst3.setText(publishAPI);
-    else
-      abst3.setText("");
-    link.addAbstract(abst3);
-    // registration URL
-    Abstract abst4 = new AbstractImpl();
-    if (registrationURL != null)
-      abst4.setText(registrationURL);
-    else
-      abst4.setText("");
-    link.addAbstract(abst4);
-    // add namespace
-    link.setReferencedNamespace(FavoritesConstants.NAMESPACE_UDDI_V1);
-    inspection.addLink(link);
-    return link;
-  }
-
-  public Link addUDDIBusiness(String businessName, String inquiryAPI, String businessKey) {
-    WSILDocument wsilDoc = getWSILDocument();
-    Inspection inspection = wsilDoc.getInspection();
-    Link link = new LinkImpl();
-    Abstract abst = new AbstractImpl();
-    abst.setText(businessName);
-    link.addAbstract(abst);
-    link.setReferencedNamespace(FavoritesConstants.NAMESPACE_UDDI_V2);
-    BusinessDescription bd = new BusinessDescriptionImpl();
-    bd.setLocation(inquiryAPI);
-    BusinessKey key = new BusinessKey(businessKey);
-    bd.setBusinessKey(key);
-    link.setExtensionElement(bd);
-    inspection.addLink(link);
-    return link;
-  }
-
-  public Service addUDDIService(String serviceName, String inquiryAPI, String serviceKey) {
-    WSILDocument wsilDoc = getWSILDocument();
-    Inspection inspection = wsilDoc.getInspection();
-    Service service = new ServiceImpl();
-    ServiceName name = new ServiceNameImpl();
-    name.setText(serviceName);
-    service.addServiceName(name);
-    Description desc = new DescriptionImpl();
-    desc.setReferencedNamespace(FavoritesConstants.NAMESPACE_UDDI_V2);
-    ServiceDescription sd = new ServiceDescriptionImpl();
-    sd.setLocation(inquiryAPI);
-    ServiceKey key = new ServiceKey(serviceKey);
-    sd.setServiceKey(key);
-    desc.setExtensionElement(sd);
-    service.addDescription(desc);
-    inspection.addService(service);
-    return service;
-  }
-
-  public Service addUDDIServiceInterface(String serIntName, String inquiryAPI, String serIntKey) {
-    WSILDocument wsilDoc = getWSILDocument();
-    Inspection inspection = wsilDoc.getInspection();
-    Service service = new ServiceImpl();
-    ServiceName name = new ServiceNameImpl();
-    name.setText(serIntName);
-    service.addServiceName(name);
-    Description desc = new DescriptionImpl();
-    desc.setReferencedNamespace(FavoritesConstants.NAMESPACE_UDDI_V1);
-    ServiceDescription sd = new ServiceDescriptionImpl();
-    sd.setLocation(inquiryAPI);
-    ServiceKey key = new ServiceKey(serIntKey);
-    sd.setServiceKey(key);
-    desc.setExtensionElement(sd);
-    service.addDescription(desc);
-    inspection.addService(service);
-    return service;
-  }
-
-  public Service addWSDLService(String url) {
-    WSILDocument wsilDoc = getWSILDocument();
-    Inspection inspection = wsilDoc.getInspection();
-    Service service = new ServiceImpl();
-    Description desc = new DescriptionImpl();
-    desc.setLocation(url);
-    desc.setReferencedNamespace(FavoritesConstants.NAMESPACE_WSDL);
-    service.addDescription(desc);
-    inspection.addService(service);
-    return service;
-  }
-
-  public Link addWSILLink(String url) {
-    WSILDocument wsilDoc = getWSILDocument();
-    Inspection inspection = wsilDoc.getInspection();
-    Link link = new LinkImpl();
-    link.setLocation(url);
-    link.setReferencedNamespace(FavoritesConstants.NAMESPACE_WSIL_INSPECTION);
-    inspection.addLink(link);
-    return link;
-  }
-
-  public void removeFavoritesUDDIRegistry(IFavoritesUDDIRegistry registry)
-  {
-    if (registry instanceof FavoritesUDDIRegistry)
-      removeLink(((FavoritesUDDIRegistry)registry).getLink());
-  }
-
-  public void removeFavoritesUDDIBusiness(IFavoritesUDDIBusiness business)
-  {
-    if (business instanceof FavoritesUDDIBusiness)
-      removeLink(((FavoritesUDDIBusiness)business).getLink());
-  }
-
-  public void removeFavoritesUDDIService(IFavoritesUDDIService service)
-  {
-    if (service instanceof FavoritesUDDIService)
-      removeService(((FavoritesUDDIService)service).getService());
-  }
-
-  public void removeFavoritesUDDIServiceInterface(IFavoritesUDDIServiceInterface serviceInterface)
-  {
-    if (serviceInterface instanceof FavoritesUDDIServiceInterface)
-      removeService(((FavoritesUDDIServiceInterface)serviceInterface).getService());
-  }
-
-  public void removeFavoritesWSDL(IFavoritesWSDL wsdl)
-  {
-    if (wsdl instanceof FavoritesWSDL)
-      removeService(((FavoritesWSDL)wsdl).getService());
-  }
-
-  public void removeFavoritesWSIL(IFavoritesWSIL wsil)
-  {
-    if (wsil instanceof FavoritesWSIL)
-      removeLink(((FavoritesWSIL)wsil).getLink());
-  }
-
-  public void removeService(Service service)
-  {
-    WSILDocument wsilDoc = getWSILDocument();
-    Inspection inspection = wsilDoc.getInspection();
-    inspection.removeService(service);
-  }
-
-  public void removeLink(Link link)
-  {
-    WSILDocument wsilDoc = getWSILDocument();
-    Inspection inspection = wsilDoc.getInspection();
-    inspection.removeLink(link);
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesService.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesService.java
deleted file mode 100644
index 4520f9aaf..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesService.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.favorites;
-
-import org.apache.wsil.Service;
-
-public class FavoritesService
-{
-  protected Service service_;
-
-  public FavoritesService()
-  {
-    service_ = null;
-  }
-
-  public Service getService()
-  {
-    return service_;
-  }
-
-  public void setService(Service service)
-  {
-    service_ = service;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesUDDIBusiness.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesUDDIBusiness.java
deleted file mode 100644
index f53883c86..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesUDDIBusiness.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.favorites;
-
-import org.apache.wsil.extension.uddi.BusinessDescription;
-
-public class FavoritesUDDIBusiness extends FavoritesLink implements IFavoritesUDDIBusiness
-{
-  public FavoritesUDDIBusiness()
-  {
-    super();
-  }
-
-  public String getName()
-  {
-    return (link_.getAbstracts())[0].getText();
-  }
-
-  public String getInquiryURL()
-  {
-    return ((BusinessDescription)link_.getExtensionElement()).getLocation();
-  }
-
-  public String getBusinessKey()
-  {
-    return ((BusinessDescription)link_.getExtensionElement()).getBusinessKey().getText();
-  }
-
-  public void setName(String name)
-  {
-  }
-
-  public void setInquiryURL(String inquiryURL)
-  {
-  }
-
-  public void setBusinessKey(String key)
-  {
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesUDDIRegistry.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesUDDIRegistry.java
deleted file mode 100644
index 7cc8076dd..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesUDDIRegistry.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.favorites;
-
-import org.apache.wsil.Abstract;
-import org.eclipse.wst.ws.internal.parser.plugin.ParserPlugin;
-
-public class FavoritesUDDIRegistry extends FavoritesLink implements IFavoritesUDDIRegistry
-{
-  public FavoritesUDDIRegistry()
-  {
-    super();
-  }
-
-  public String getName()
-  {
-    String name = (link_.getAbstracts())[0].getText();
-    if (name.startsWith("%"))
-    {
-      String translatedName = ParserPlugin.getMessage(name);
-      if (translatedName != null)
-        name = translatedName;
-    }
-    return name;
-  }
-
-  public String getInquiryURL()
-  {
-    return (link_.getAbstracts())[1].getText();
-  }
-
-  public String getPublishURL()
-  {
-    Abstract[] abstracts = link_.getAbstracts();
-    if (abstracts.length > 2)
-    {
-      String publishURL = abstracts[2].getText();
-      if (publishURL != null && publishURL.length() > 0)
-        return publishURL;
-    }
-    return null;
-  }
-
-  public String getRegistrationURL()
-  {
-    Abstract[] abstracts = link_.getAbstracts();
-    if (abstracts.length > 3)
-    {
-      String registrationURL = abstracts[3].getText();
-      if (registrationURL != null && registrationURL.length() > 0)
-        return registrationURL;
-    }
-    return null;
-  }
-
-  public void setName(String name)
-  {
-    (link_.getAbstracts())[0].setText(name);
-  }
-
-  public void setInquiryURL(String inquiryURL)
-  {
-    (link_.getAbstracts())[1].setText(inquiryURL);
-  }
-
-  public void setPublishURL(String publishURL)
-  {
-    Abstract[] abstracts = link_.getAbstracts();
-    if (abstracts.length > 2)
-      abstracts[2].setText(publishURL);
-  }
-
-  public void setRegistrationURL(String registrationURL)
-  {
-    Abstract[] abstracts = link_.getAbstracts();
-    if (abstracts.length > 3)
-      abstracts[3].setText(registrationURL);
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesUDDIService.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesUDDIService.java
deleted file mode 100644
index 0954f5712..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesUDDIService.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.favorites;
-
-import org.apache.wsil.extension.uddi.ServiceDescription;
-
-public class FavoritesUDDIService extends FavoritesService implements IFavoritesUDDIService
-{
-  public FavoritesUDDIService()
-  {
-    super();
-  }
-
-  public String getName()
-  {
-    return (service_.getServiceNames())[0].getText();
-  }
-
-  public String getInquiryURL()
-  {
-    ServiceDescription sd = (ServiceDescription)(service_.getDescriptions())[0].getExtensionElement();
-    return sd.getLocation();
-  }
-
-  public String getServiceKey()
-  {
-    ServiceDescription sd = (ServiceDescription)(service_.getDescriptions())[0].getExtensionElement();
-    return sd.getServiceKey().getText();
-  }
-
-  public void setName(String name)
-  {
-  }
-
-  public void setInquiryURL(String inquiryURL)
-  {
-  }
-
-  public void setServiceKey(String key)
-  {
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesUDDIServiceInterface.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesUDDIServiceInterface.java
deleted file mode 100644
index 56ec674c1..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesUDDIServiceInterface.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.favorites;
-
-import org.apache.wsil.extension.uddi.ServiceDescription;
-
-public class FavoritesUDDIServiceInterface extends FavoritesService implements IFavoritesUDDIServiceInterface
-{
-  public FavoritesUDDIServiceInterface()
-  {
-    super();
-  }
-
-  public String getName()
-  {
-    return (service_.getServiceNames())[0].getText();
-  }
-
-  public String getInquiryURL()
-  {
-    ServiceDescription sd = (ServiceDescription)(service_.getDescriptions())[0].getExtensionElement();
-    return sd.getLocation();
-  }
-
-  public String getServiceInterfaceKey()
-  {
-    ServiceDescription sd = (ServiceDescription)(service_.getDescriptions())[0].getExtensionElement();
-    return sd.getServiceKey().getText();
-  }
-
-  public void setName(String name)
-  {
-  }
-
-  public void setInquiryURL(String inquiryURL)
-  {
-  }
-
-  public void setServiceInterfaceKey(String key)
-  {
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesWSDL.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesWSDL.java
deleted file mode 100644
index 0f340e053..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesWSDL.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.favorites;
-
-public class FavoritesWSDL extends FavoritesService implements IFavoritesWSDL
-{
-  public FavoritesWSDL()
-  {
-    super();
-  }
-
-  public String getName()
-  {
-    return getWsdlUrl();
-  }
-
-  public String getWsdlUrl()
-  {
-    return (service_.getDescriptions())[0].getLocation();
-  }
-
-  public void setName(String name)
-  {
-  }
-
-  public void setWsdlUrl(String wsdlURL)
-  {
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesWSIL.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesWSIL.java
deleted file mode 100644
index 6622c7dea..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesWSIL.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.favorites;
-
-public class FavoritesWSIL extends FavoritesLink implements IFavoritesWSIL
-{
-  public FavoritesWSIL()
-  {
-    super();
-  }
-
-  public String getName()
-  {
-    return getWsilUrl();
-  }
-
-
-  public String getWsilUrl()
-  {
-    return link_.getLocation();
-  }
-
-  public void setName(String name)
-  {
-  }
-
-  public void setWsilUrl(String wsilURL)
-  {
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesRegistryType.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesRegistryType.java
deleted file mode 100644
index b2c96c1cb..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesRegistryType.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.favorites;
-
-public interface IFavoritesRegistryType
-{
-  public IFavoritesUDDIRegistry[] getFavoritesUDDIRegistries();
-  public IFavoritesUDDIBusiness[] getFavoritesUDDIBusinesses();
-  public IFavoritesUDDIService[] getFavoritesUDDIServices();
-  public IFavoritesUDDIServiceInterface[] getFavoritesUDDIServiceInterfaces();
-  public IFavoritesWSDL[] getFavoritesWSDLs();
-  public IFavoritesWSIL[] getFavoritesWSILs();
-
-  public void addFavoritesUDDIRegistry(IFavoritesUDDIRegistry registry);
-  public void addFavoritesUDDIBusiness(IFavoritesUDDIBusiness business);
-  public void addFavoritesUDDIService(IFavoritesUDDIService service);
-  public void addFavoritesUDDIServiceInterface(IFavoritesUDDIServiceInterface serviceInterface);
-  public void addFavoritesWSDL(IFavoritesWSDL wsdl);
-  public void addFavoritesWSIL(IFavoritesWSIL wsil);
-
-  public void removeFavoritesUDDIRegistry(IFavoritesUDDIRegistry registry);
-  public void removeFavoritesUDDIBusiness(IFavoritesUDDIBusiness business);
-  public void removeFavoritesUDDIService(IFavoritesUDDIService service);
-  public void removeFavoritesUDDIServiceInterface(IFavoritesUDDIServiceInterface serviceInterface);
-  public void removeFavoritesWSDL(IFavoritesWSDL wsdl);
-  public void removeFavoritesWSIL(IFavoritesWSIL wsil);  
-}
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesUDDIBusiness.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesUDDIBusiness.java
deleted file mode 100644
index dd2d2c950..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesUDDIBusiness.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.favorites;
-
-public interface IFavoritesUDDIBusiness
-{
-  public String getName();
-  public String getInquiryURL();
-  public String getBusinessKey();
-
-  public void setName(String name);
-  public void setInquiryURL(String inquiryURL);
-  public void setBusinessKey(String key);
-}
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesUDDIRegistry.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesUDDIRegistry.java
deleted file mode 100644
index bb035f1c1..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesUDDIRegistry.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.favorites;
-
-public interface IFavoritesUDDIRegistry
-{
-  public String getName();
-  public String getInquiryURL();
-  public String getPublishURL();
-  public String getRegistrationURL();
-
-  public void setName(String name);
-  public void setInquiryURL(String inquiryURL);
-  public void setPublishURL(String publishURL);
-  public void setRegistrationURL(String registrationURL);
-}
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesUDDIService.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesUDDIService.java
deleted file mode 100644
index 286370df0..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesUDDIService.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.favorites;
-
-public interface IFavoritesUDDIService
-{
-  public String getName();
-  public String getInquiryURL();
-  public String getServiceKey();
-
-  public void setName(String name);
-  public void setInquiryURL(String inquiryURL);
-  public void setServiceKey(String key);
-}
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesUDDIServiceInterface.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesUDDIServiceInterface.java
deleted file mode 100644
index ad426cbb6..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesUDDIServiceInterface.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.favorites;
-
-public interface IFavoritesUDDIServiceInterface
-{
-  public String getName();
-  public String getInquiryURL();
-  public String getServiceInterfaceKey();
-
-  public void setName(String name);
-  public void setInquiryURL(String inquiryURL);
-  public void setServiceInterfaceKey(String key);
-}
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesWSDL.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesWSDL.java
deleted file mode 100644
index d69f824cf..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesWSDL.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.favorites;
-
-public interface IFavoritesWSDL
-{
-  public String getName();
-  public String getWsdlUrl();
-
-  public void setName(String name);
-  public void setWsdlUrl(String wsdlURL);
-}
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesWSIL.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesWSIL.java
deleted file mode 100644
index 4c129e13b..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesWSIL.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.favorites;
-
-public interface IFavoritesWSIL
-{
-  public String getName();
-  public String getWsilUrl();
-
-  public void setName(String name);
-  public void setWsilUrl(String wsilURL);
-}
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/plugin/ParserPlugin.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/plugin/ParserPlugin.java
deleted file mode 100644
index d2dc6dc69..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/plugin/ParserPlugin.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.plugin;
-
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class ParserPlugin extends Plugin {
-	//The shared instance.
-	private static ParserPlugin plugin;
-	//Resource bundle.
-	private ResourceBundle resourceBundle;
-	
-	/**
-	 * The constructor.
-	 */
-	public ParserPlugin() {
-		super();
-		plugin = this;
-		try {
-			resourceBundle   = ResourceBundle.getBundle("org.eclipse.wst.ws.parser.ParserPluginResources");
-		} catch (MissingResourceException x) {
-			resourceBundle = null;
-		}
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static ParserPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle,
-	 * or 'key' if not found.
-	 */
-	public static String getResourceString(String key) {
-		ResourceBundle bundle = ParserPlugin.getDefault().getResourceBundle();
-		try {
-			return (bundle != null) ? bundle.getString(key) : key;
-		} catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	/**
-	 * Returns the plugin's resource bundle,
-	 */
-	public ResourceBundle getResourceBundle() {
-		return resourceBundle;
-	}
-
-	 /**
-	  * Returns the message string identified by the given key from
-	  * the plugin.properties file for the appropriate locale.
-	  * @param key The message key string prefixed by a "%" symbol.
-	  * That is, the string passed in must be of the form "%KEY"
-	  * where the plugin.properties file contains a line of the
-	  * form: "KEY = value".
-	  * @return The locale-specific message.
-	  */
-	  public static String getMessage ( String key )
-	  {
-	    MessageUtils msgUtils = new MessageUtils( "org.eclipse.wst.ws.parser.plugin", plugin );
-	    
-	    if( key.startsWith("%"))
-	    {
-	      key = key.substring( 1, key.length() );
-	    }
-	    
-	    return msgUtils.getMessage(key);
-	  }
-
-	  /**
-	  * Returns the message string identified by the given key from
-	  * the plugin.properties file for the appropriate locale.
-	  * Substitution sequences in the message string
-	  * are replaced by the given array of substitution objects (which
-	  * are most frequently strings). See java.text.MessageFormat for
-	  * further details on substitution.
-	  * @param key The message key string prefixed by a "%" symbol.
-	  * That is, the string passed in must be of the form "%KEY"
-	  * where the plugin.properties file contains a line of the
-	  * form: "KEY = value".
-	  * @param args The substitution values for the message
-	  * as required by the message in plugin.properties and
-	  * by the rules of class java.text.MessageFormat.
-	  * @return The locale-specific message.
-	  */
-	  public static String getMessage ( String key, Object[] args )
-	  {
-	    return MessageFormat.format(getMessage(key),args);
-	  }
-}
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/HTMLHeadHandler.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/HTMLHeadHandler.java
deleted file mode 100644
index 36994bb05..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/HTMLHeadHandler.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.wsil;
-
-import java.io.UnsupportedEncodingException;
-import java.util.Vector;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.helpers.DefaultHandler;
-
-public class HTMLHeadHandler extends DefaultHandler
-{
-  private final char START_TAG = '<';
-  private final char END_TAG = '>';
-  private final String HEAD_START_TAG = "<head>";
-  private final String HEAD_END_TAG = "</head>";
-  private final String ROOT_START_TAG = "<root>";
-  private final String ROOT_END_TAG = "</root>";
-  private final String UTF8 = "UTF-8";  
-  
-  // WSIL tag information.
-  private final String META = "meta";
-  private final String NAME = "name";
-  private final String SERVICE_INSPECTION = "serviceInspection";
-  private final String CONTENT = "content";
-  
-  // DISCO tag information.
-  private final String LINK = "link";
-  private final String TYPE = "type";
-  private final String TEXT_XML = "text/xml";
-  private final String REL = "rel";
-  private final String ALTERNATE = "alternate";
-  private final String HREF = "href";
-    
-  private String baseURI_;
-  private Vector wsils_;
-  private Vector discos_;
-  
-  public HTMLHeadHandler(String baseURI)
-  {
-    super();
-    baseURI_ = baseURI;
-    wsils_ = new Vector();
-    discos_ = new Vector();
-  }
- 
-  public String[] getWsils()
-  {
-    String[] wsils = new String[wsils_.size()];
-    wsils_.copyInto(wsils);
-    return wsils;
-  }
-  
-  public String[] getDiscos()
-  {
-    String[] discos = new String[discos_.size()];
-    discos_.copyInto(discos);
-    return discos;
-  }
-  
-  public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException
-  {
-    String qNameLC = qName.toLowerCase();
-    if (qNameLC.equals(META))
-    {
-      String nameValue = attributes.getValue(NAME);
-      if (SERVICE_INSPECTION.equals(nameValue))
-      {
-        String wsilURI = attributes.getValue(CONTENT);
-        if (baseURI_ != null && wsilURI.indexOf(":/") == -1)
-        {
-          StringBuffer sb = new StringBuffer();
-          sb.append(baseURI_.substring(0, baseURI_.lastIndexOf("/")+1));
-          sb.append(wsilURI);
-          wsilURI = sb.toString();
-        }
-        if (!wsils_.contains(wsilURI))
-          wsils_.add(wsilURI);
-      }
-    }
-    else if (qNameLC.equals(LINK))
-    {
-      // See http://msdn.microsoft.com/msdnmag/issues/02/02/xml/default.aspx for more details on DISCO.
-      String type = attributes.getValue(TYPE);
-      String rel = attributes.getValue(REL);
-      String href = attributes.getValue(HREF);
-      if (TEXT_XML.equals(type) && ALTERNATE.equals(rel) && href != null)
-      {
-        String discoURI = href;
-        if (discoURI.indexOf(":/") == -1)
-        {
-          StringBuffer sb = new StringBuffer();
-          sb.append(baseURI_.substring(0,baseURI_.lastIndexOf("/")+1));
-          sb.append(discoURI);
-          discoURI = sb.toString();
-        }
-        if (!discos_.contains(discoURI))
-          discos_.add(discoURI);
-      }
-    }
-  }
-  
-  public void error(SAXParseException e) throws SAXException
-  {
-  }
-  
-  public void fatalError(SAXParseException e) throws SAXException
-  {
-  }
-  
-  public void warning(SAXParseException e) throws SAXException
-  {
-  }
-  
-  private void harvestTags(StringBuffer target,String document,String tag)
-  {
-    int index = document.indexOf(START_TAG);
-    int documentLength = document.length();
-    int tagLength = tag.length();
-    while (index != -1 && (index+1+tagLength)<documentLength)
-    {
-      String str = document.substring(index+1,index+1+tagLength);
-      if (str.toLowerCase().equals(tag))
-      {
-        str = document.substring(index,document.indexOf(END_TAG,index+1)+1);
-        target.append(str);
-        index += str.length();
-      }
-      else
-        index++;
-      index = document.indexOf(START_TAG,index);
-    }
-  }
-  
-  public byte[] harvestHeadTags(byte[] b)
-  {
-    String s;
-    try
-    {
-      s = new String(b, UTF8);
-    }
-    catch (UnsupportedEncodingException uee)
-    {
-      s = new String(b);
-    }
-    String head = s.toLowerCase();
-    int headStartIndex = head.indexOf(HEAD_START_TAG);
-    int headEndIndex = head.indexOf(HEAD_END_TAG);
-    StringBuffer sb = new StringBuffer();
-    sb.append(ROOT_START_TAG);
-    if (headStartIndex != -1 && headEndIndex != -1)
-    {
-      head = s.substring(headStartIndex, headEndIndex+HEAD_END_TAG.length());
-      harvestTags(sb,head,META);
-      harvestTags(sb,head,LINK);
-    }
-    sb.append(ROOT_END_TAG);
-    return sb.toString().getBytes();
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/IllegalArgumentsException.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/IllegalArgumentsException.java
deleted file mode 100644
index bf42dc6b9..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/IllegalArgumentsException.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.wsil;
-
-public class IllegalArgumentsException extends Exception
-{
-  private static final long serialVersionUID = -2533981176285561234L;
-
-  public IllegalArgumentsException(String arg)
-  {
-    super(arg);
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/UDDIURIHelper.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/UDDIURIHelper.java
deleted file mode 100644
index 3d007ac66..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/UDDIURIHelper.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.wsil;
-
-import java.text.MessageFormat;
-import java.text.ParseException;
-
-public class UDDIURIHelper
-{
-  private static final String QUERYSERVICE_URI_TEMPLATE = "uddiservice:query:{0}:query:{1}";
-  private static final String SERVICEKEY_URI_TEMPLATE = "uddiservice:serviceKey:{0}:serviceKey:{1}";
-  
-  public static final String getQueryServiceURI(String query,String inquiryURL)
-  {
-    String[] uriParams = {query,inquiryURL};
-    return MessageFormat.format(QUERYSERVICE_URI_TEMPLATE,uriParams);
-  }
-  
-  public static final String getServiceKeyURI(String serviceKey,String inquiryURL)
-  {
-    String[] uriParams = {serviceKey,inquiryURL};
-    return MessageFormat.format(SERVICEKEY_URI_TEMPLATE,uriParams);
-  }
-  
-  private static final String[] parseURI(String pattern,String uri)
-  {
-    try
-    {
-      MessageFormat mf = new MessageFormat(pattern);
-      Object[] parsedResults = mf.parse(uri);
-      if (parsedResults != null && parsedResults.length > 0)
-      {
-        String[] results = new String[parsedResults.length];
-        for (int i=0;i<parsedResults.length;i++)
-          results[i] = (String)parsedResults[i];
-        return results;
-      }        
-    }
-    catch (ParseException e)
-    {
-    }
-    return null;
-  }
-  
-  public static final String[] parseServiceKeyURI(String uri)
-  {
-    return parseURI(SERVICEKEY_URI_TEMPLATE,uri);
-  }
-  
-  public static final String[] parseQueryServiceURI(String uri)
-  {
-    return parseURI(QUERYSERVICE_URI_TEMPLATE,uri);
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WSILMessages.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WSILMessages.java
deleted file mode 100644
index 3286ba799..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WSILMessages.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.eclipse.wst.ws.internal.parser.wsil;
-
-import org.eclipse.osgi.util.NLS;
-
-public class WSILMessages extends NLS
-{
-  private static final String BUNDLE_NAME = "org.eclipse.wst.ws.internal.parser.wsil.wsil"; //$NON-NLS-1$
-  
-  static
-  {
-    NLS.initializeMessages(BUNDLE_NAME, WSILMessages.class);
-  }
-
-  public static String MSG_ERROR_INVALID_ARGUMENTS;
-  public static String MSG_ERROR_ILLEGAL_ARGUMENTS;
-  public static String MSG_ERROR_INVALID_WSDL_URI;
-  public static String MSG_ERROR_INVALID_WSIL_URI;
-  public static String MSG_ERROR_UNRESOLVABLE_WSDL;
-  public static String MSG_ERROR_UNEXPECTED_EXCEPTION;
-  public static String MSG_ERROR_MALFORMED_WSDL;
-  public static String MSG_ERROR_WRITE_WSIL;
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WWWAuthenticationException.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WWWAuthenticationException.java
deleted file mode 100644
index 8ac66a620..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WWWAuthenticationException.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.wsil;
-
-import java.io.IOException;
-
-public class WWWAuthenticationException extends Exception
-{
-  private static final long serialVersionUID = -4918211021620316049L;
-
-  private IOException ioe_;
-  private String wwwAuthMsg_;
-  private String url_;
-
-  public WWWAuthenticationException(IOException ioe, String wwwAuthMsg, String url)
-  {
-    super(ioe.getMessage());
-    ioe_ = ioe;
-    wwwAuthMsg_ = wwwAuthMsg;
-    url_ = url;
-  }
-
-  public IOException getIOException()
-  {
-    return ioe_;
-  }
-
-  public String getWWWAuthenticationMsg()
-  {
-    return wwwAuthMsg_;
-  }
-
-  public String getURL()
-  {
-    return url_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WWWAuthenticationHandler.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WWWAuthenticationHandler.java
deleted file mode 100644
index c7a8cab19..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WWWAuthenticationHandler.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.wsil;
-
-public interface WWWAuthenticationHandler
-{
-  public void handleWWWAuthentication(WWWAuthenticationException wwwae);
-  public String getUsername();
-  public String getPassword();
-}
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WebServiceEntity.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WebServiceEntity.java
deleted file mode 100644
index 33e38a77f..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WebServiceEntity.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.wsil;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class WebServiceEntity
-{
-  public static final int TYPE_UNKNOWN = -1;
-  public static final int TYPE_HTML = 0;
-  public static final int TYPE_WSIL = 1;
-  public static final int TYPE_WSDL = 2;
-  public static final int TYPE_UDDI_SERVICE = 3;
-  public static final int TYPE_DISCO = 4;
-
-  private Object parent_;
-  private List children_;
-  private int type_;
-  private String uri_;
-  private byte[] bytes_;
-  private String httpUsername_;
-  private String httpPassword_;
-  private String documentation_;
-  private Object model_;
-
-  public WebServiceEntity()
-  {
-    parent_ = null;
-    children_ = new ArrayList();
-    type_ = TYPE_UNKNOWN;
-    uri_ = null;
-    bytes_ = null;
-    httpUsername_ = null;
-    httpPassword_ = null;
-    documentation_ = null;
-    model_ = null;
-  }
-
-  public Object getParent()
-  {
-    return parent_;
-  }
-
-  public void setParent(Object parent)
-  {
-    parent_ = parent;
-  }
-
-  public List getChildren()
-  {
-    return children_;
-  }
-
-  public void addChild(Object child)
-  {
-    children_.add(child);
-  }
-
-  public void removeChild(Object child)
-  {
-    children_.remove(child);
-  }
-
-  public int getType()
-  {
-    return type_;
-  }
-
-  public void setType(int type)
-  {
-    type_ = type;
-  }
-
-  public String getURI()
-  {
-    return uri_;
-  }
-
-  public void setURI(String uri)
-  {
-    uri_ = uri;
-  }
-
-  public byte[] getBytes()
-  {
-    return bytes_;
-  }
-
-  public void setBytes(byte[] bytes)
-  {
-    bytes_ = bytes;
-  }
-
-  public String getHTTPUsername()
-  {
-    return httpUsername_;
-  }
-
-  public void setHTTPUsername(String httpUsername)
-  {
-    httpUsername_ = httpUsername;
-  }
-
-  public String getHTTPPassword()
-  {
-    return httpPassword_;
-  }
-
-  public void setHTTPPassword(String httpPassword)
-  {
-    httpPassword_ = httpPassword;
-  }
-  
-  public String getDocumentation()
-  {
-    return documentation_;
-  }
-  
-  public void setDocumentation(String documentation)
-  {
-    documentation_ = documentation;
-  }
-  
-  public Object getModel()
-  {
-    return model_;
-  }
-  
-  public void setModel(Object model)
-  {
-    model_ = model;
-  }
-
-  public boolean isEntityResolved()
-  {
-    return (bytes_ != null);
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WebServicesParser.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WebServicesParser.java
deleted file mode 100644
index 1acc20c68..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WebServicesParser.java
+++ /dev/null
@@ -1,547 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.wsil;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.Hashtable;
-
-import javax.wsdl.Definition;
-import javax.wsdl.WSDLException;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLReader;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.apache.wsil.Abstract;
-import org.apache.wsil.Description;
-import org.apache.wsil.Inspection;
-import org.apache.wsil.Link;
-import org.apache.wsil.Service;
-import org.apache.wsil.WSILConstants;
-import org.apache.wsil.WSILDocument;
-import org.apache.wsil.WSILException;
-import org.apache.wsil.extension.ExtensionElement;
-import org.apache.wsil.extension.uddi.ServiceDescription;
-import org.apache.wsil.extension.uddi.UDDIConstants;
-import org.apache.wsil.extension.wsdl.WSDLConstants;
-import org.eclipse.wst.ws.internal.parser.disco.DISCOContractReference;
-import org.eclipse.wst.ws.internal.parser.disco.DISCOParser;
-import org.eclipse.wst.ws.internal.parser.disco.DISCOReference;
-import org.eclipse.wst.wsdl.WSDLPlugin;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-import sun.misc.BASE64Encoder;
-
-public class WebServicesParser
-{
-  public static final int PARSE_NONE = 0;
-  public static final int PARSE_WSIL = 1<<0;
-  public static final int PARSE_WSDL = 1<<1;
-  public static final int PARSE_LINKS = 1<<2;
-  public static final int PARSE_DISCO = 1<<3;
-
-  private String uri_;
-  private Hashtable uriToEntityTable_;
-
-  private String httpBasicAuthUsername_;
-  private String httpBasicAuthPassword_;
-
-  public WebServicesParser()
-  {
-    this(null);
-  }
-
-  public WebServicesParser(String uri)
-  {
-    uri_ = uri;
-    uriToEntityTable_ = new Hashtable();
-    httpBasicAuthUsername_ = null;
-    httpBasicAuthPassword_ = null;
-  }
-
-  public String getURI()
-  {
-    return uri_;
-  }
-
-  public void setURI(String uri)
-  {
-    uri_ = uri;
-  }
-
-  public WebServiceEntity getWebServiceEntityByURI(String uri)
-  {
-    if (uri != null)
-      return (WebServiceEntity)uriToEntityTable_.get(uri);
-    else
-      return null;
-  }
-
-  public WSILDocument getWSILDocument(String wsilURI)
-  {
-    try
-    {
-      return getWSILDocumentVerbose(wsilURI);
-    }
-    catch (Throwable t)
-    {
-    }
-    return null;
-  }
-
-  public WSILDocument getWSILDocumentVerbose(String wsilURI) throws MalformedURLException, IOException, WWWAuthenticationException, WSILException
-  {
-    WebServiceEntity wsEntity = getWebServiceEntityByURI(wsilURI);
-    if (wsEntity == null)
-    {
-      wsEntity = new WebServiceEntity();
-      wsEntity.setURI(wsilURI);
-      uriToEntityTable_.put(wsilURI, wsEntity);
-    }
-    WSILDocument wsilDocument = (WSILDocument)wsEntity.getModel();
-    if (wsilDocument == null)
-    {
-      byte[] b = getInputStreamAsByteArray(wsilURI);
-      wsEntity.setBytes(b);
-      setHTTPSettings(wsEntity);
-      InputStreamReader isr = new InputStreamReader(new ByteArrayInputStream(b));
-      wsilDocument = WSILDocument.newInstance();
-      wsilDocument.read(isr);
-      wsEntity.setType(WebServiceEntity.TYPE_WSIL);
-      wsEntity.setModel(wsilDocument);
-    }
-    return wsilDocument;
-  }
-
-  public Definition getWSDLDefinition(String wsdlURI)
-  {
-    try
-    {
-      return getWSDLDefinitionVerbose(wsdlURI);
-    }
-    catch (Throwable t)
-    {
-    }
-    return null;
-  }
-
-  public Definition getWSDLDefinitionVerbose(String wsdlURI) throws MalformedURLException, IOException, WWWAuthenticationException, WSDLException
-  {
-    WebServiceEntity wsEntity = getWebServiceEntityByURI(wsdlURI);
-    if (wsEntity == null)
-    {
-      wsEntity = new WebServiceEntity();
-      wsEntity.setURI(wsdlURI);
-      uriToEntityTable_.put(wsdlURI, wsEntity);
-    }
-    Definition definition = (Definition)wsEntity.getModel();
-    if (definition == null)
-    {
-      byte[] b = getInputStreamAsByteArray(wsdlURI);
-      wsEntity.setBytes(b);
-      setHTTPSettings(wsEntity);
-      ByteArrayInputStream bais = new ByteArrayInputStream(b);
-      WSDLFactory factory = WSDLPlugin.INSTANCE.createWSDL4JFactory();
-      WSDLReader wsdlReader = factory.newWSDLReader();
-      definition = wsdlReader.readWSDL(wsdlURI, new InputSource(bais));
-      wsEntity.setType(WebServiceEntity.TYPE_WSDL);
-      wsEntity.setModel(definition);
-    }
-    return definition;
-  }
-
-  public void parse() throws MalformedURLException, IOException, ParserConfigurationException, SAXException, WWWAuthenticationException
-  {
-    parseURL(PARSE_WSIL | PARSE_WSDL | PARSE_LINKS | PARSE_DISCO);
-  }
-
-  public void parse(int parseOption) throws MalformedURLException, IOException, ParserConfigurationException, SAXException, WWWAuthenticationException
-  {
-    parseURL(parseOption);
-  }
-
-  private void parseURL(int parseOption) throws MalformedURLException, IOException, ParserConfigurationException, SAXException, WWWAuthenticationException
-  {
-    WebServiceEntity wsEntity = new WebServiceEntity();
-    wsEntity.setURI(uri_);
-    byte[] b = getInputStreamAsByteArray(uri_);
-    wsEntity.setBytes(b);
-    setHTTPSettings(wsEntity);
-    uriToEntityTable_.put(uri_, wsEntity);
-    // parse uri_ as a HTML document
-    HTMLHeadHandler headHandler = new HTMLHeadHandler(uri_);
-    byte[] head = headHandler.harvestHeadTags(b);
-    SAXParserFactory factory = SAXParserFactory.newInstance();
-    factory.setNamespaceAware(false);
-    factory.setValidating(false);
-    SAXParser parser = factory.newSAXParser();
-    try
-    {
-      parser.parse(new ByteArrayInputStream(head), headHandler);
-    }
-    catch (Throwable t)
-    {
-    }
-    String[] wsilURIs = headHandler.getWsils();
-    String[] discoURIs = headHandler.getDiscos();
-    // true if uri_ is a HTML document
-    if (wsilURIs.length > 0 || discoURIs.length > 0)
-    {
-      wsEntity.setType(WebServiceEntity.TYPE_HTML);
-      for (int i = 0; i < wsilURIs.length; i++)
-      {
-        String absoluteURI = convertToAbsoluteURI(uri_, wsilURIs[i]);
-        WebServiceEntity wsilEntity = new WebServiceEntity();
-        wsilEntity.setType(WebServiceEntity.TYPE_WSIL);
-        wsilEntity.setURI(absoluteURI);
-        associate(wsEntity, wsilEntity);
-        uriToEntityTable_.put(absoluteURI, wsilEntity);
-        if ((parseOption | PARSE_WSIL) == parseOption)
-        {
-          try
-          {
-            parseWSIL(absoluteURI, parseOption);
-          }
-          catch (Throwable t)
-          {
-          }
-        }
-      }
-      for (int i=0;i<discoURIs.length;i++)
-      {
-        WebServiceEntity discoEntity = new WebServiceEntity();
-        discoEntity.setType(WebServiceEntity.TYPE_DISCO);
-        discoEntity.setURI(discoURIs[i]);
-        associate(wsEntity,discoEntity);
-        uriToEntityTable_.put(discoURIs[i],discoEntity);
-        if ((parseOption | PARSE_DISCO) == parseOption)
-        {
-          try
-          {
-            parseDISCO(discoURIs[i],parseOption);
-          }
-          catch (Throwable t)
-          {
-          }
-        }
-      }
-    }
-    // false if uri_ is not a HTML document
-    // then parse uri_ as a WSIL document
-    else
-    {
-      try
-      {
-        parseWSIL(uri_, parseOption);
-        // no exception thrown if uri_ is a WSIL document
-        wsEntity.setType(WebServiceEntity.TYPE_WSIL);
-      }
-      catch (Throwable t)
-      {
-        // exception thrown if uri_ is not a WSIL document
-        // then parse uri_ as a DISCO document.
-        try
-        {
-          parseDISCO(uri_, parseOption);
-          // no exception thrown if uri_ is a DISCO document
-          wsEntity.setType(WebServiceEntity.TYPE_DISCO);
-        }
-        catch (Throwable t2)
-        {
-          // exception thrown if uri_ is not a DISCO document
-          // then parse uri_ as a WSDL document
-          try
-          {
-            parseWSDL(uri_);
-            // no exception thrown if uri_ is a WSDL document
-            wsEntity.setType(WebServiceEntity.TYPE_WSDL);
-          }
-          catch (Throwable t3)
-          {
-            // exception thrown if uri_ is not a WSDL document
-            // then do nothing
-          }
-        }
-      }
-    }
-  }
-
-  private void parseWSIL(String wsilURI, int parseOption) throws WSILException, MalformedURLException, IOException, WSDLException, WWWAuthenticationException
-  {
-    WebServiceEntity wsilEntity = getWebServiceEntityByURI(wsilURI);
-    WSILDocument wsilDoc = (WSILDocument)wsilEntity.getModel();
-    if (wsilDoc != null)
-    {
-      // Prevent infinite loops from occurring when a WSIL cycles occur.
-      return;
-    }
-    wsilDoc = getWSILDocumentVerbose(wsilURI);
-    Inspection inspection = wsilDoc.getInspection();
-    Service[] services = inspection.getServices();
-    for (int i = 0; i < services.length; i++)
-    {
-      Description[] descs = services[i].getDescriptions();
-      // Set the documentation to the <service> element's first abstract.
-      String documentation = null;
-      Abstract[] abstracts = services[i].getAbstracts();
-      if (abstracts != null && abstracts.length > 0)
-        documentation = abstracts[0].getText();
-      for (int j = 0; j < descs.length; j++)
-      {
-      	String referencedNS = descs[j].getReferencedNamespace();
-      	// If a <description> element contains an abstract, use it to override the service documentation.      	
-      	abstracts = descs[j].getAbstracts();
-      	if (abstracts != null && abstracts.length > 0)
-      	  documentation = abstracts[0].getText();
-        if (WSDLConstants.NS_URI_WSDL.equals(referencedNS))
-        {
-          String location = descs[j].getLocation();
-          if (location != null && location.length() > 0)
-          {
-            String absoluteURI = convertToAbsoluteURI(wsilURI, location);
-            WebServiceEntity wsdlEntity = new WebServiceEntity();
-            wsdlEntity.setType(WebServiceEntity.TYPE_WSDL);
-            wsdlEntity.setURI(absoluteURI);
-            wsdlEntity.setDocumentation(documentation);
-            associate(wsilEntity, wsdlEntity);
-            uriToEntityTable_.put(absoluteURI, wsdlEntity);
-            if ((parseOption | PARSE_WSDL) == parseOption)
-              parseWSDL(absoluteURI);
-          }
-        }
-        else if (UDDIConstants.NS_URI_UDDI_V2.equals(referencedNS))
-        {
-          ExtensionElement ee = descs[j].getExtensionElement();
-          if (ee instanceof ServiceDescription)
-          {
-            ServiceDescription sd = (ServiceDescription)ee;
-            String inquiryURL = sd.getLocation();
-            String serviceKey = sd.getServiceKey().getText();
-            WebServiceEntity uddiServiceEntity = new WebServiceEntity();
-            uddiServiceEntity.setType(WebServiceEntity.TYPE_UDDI_SERVICE);
-            String uddiServiceKeyURI = UDDIURIHelper.getServiceKeyURI(serviceKey,inquiryURL);
-            uddiServiceEntity.setURI(uddiServiceKeyURI);
-            uddiServiceEntity.setDocumentation(documentation);
-            associate(wsilEntity,uddiServiceEntity);
-            uriToEntityTable_.put(uddiServiceKeyURI,uddiServiceEntity);
-            // TODO: parse WSDL if necessary...
-          }
-        }
-      }
-    }
-    Link[] links = inspection.getLinks();    
-    for (int i = 0; i < links.length; i++)
-    {
-      if (WSILConstants.NS_URI_WSIL.equals(links[i].getReferencedNamespace()))
-      {
-        String documentation = null;
-        Abstract[] abstracts = links[i].getAbstracts();
-        if (abstracts != null && abstracts.length > 0)
-          documentation = abstracts[0].getText();
-        String linkLocation = links[i].getLocation();
-        String absoluteURI = convertToAbsoluteURI(wsilURI, linkLocation);
-        // Prevent cycles.
-        WebServiceEntity wsilLinkEntity = getWebServiceEntityByURI(absoluteURI);
-        if (wsilLinkEntity == null)
-        {
-          wsilLinkEntity = new WebServiceEntity();
-          wsilLinkEntity.setType(WebServiceEntity.TYPE_WSIL);
-          wsilLinkEntity.setURI(absoluteURI);
-          wsilLinkEntity.setDocumentation(documentation);
-          uriToEntityTable_.put(absoluteURI, wsilLinkEntity);
-          if ((parseOption | PARSE_LINKS) == parseOption)
-            parseWSIL(absoluteURI, parseOption);
-        }
-        associate(wsilEntity,wsilLinkEntity);
-      }
-    }
-  }
-  
-  private void parseDISCO(String discoURI, int parseOption) throws MalformedURLException, WWWAuthenticationException, Exception
-  {
-    WebServiceEntity discoEntity = getWebServiceEntityByURI(discoURI);
-    byte[] b = getInputStreamAsByteArray(discoURI);
-    discoEntity.setBytes(b);
-    setHTTPSettings(discoEntity);
-    ByteArrayInputStream bais = new ByteArrayInputStream(b);
-    DISCOParser parser = new DISCOParser();
-    DISCOReference[] references = parser.parse(discoURI,new InputSource(bais));
-    if (references != null && references.length > 0)
-    {
-      for (int i=0;i<references.length;i++)
-      {
-        if (references[i] instanceof DISCOContractReference)
-        {
-          // contractRef
-          DISCOContractReference reference = (DISCOContractReference)references[i];
-          String ref = reference.getRef();
-          String docRef = reference.getDocRef();
-          WebServiceEntity wsdlEntity = new WebServiceEntity();
-          wsdlEntity.setType(WebServiceEntity.TYPE_WSDL);
-          wsdlEntity.setURI(ref);
-          wsdlEntity.setDocumentation(docRef);
-          associate(discoEntity,wsdlEntity);
-          uriToEntityTable_.put(ref,wsdlEntity);
-          if ((parseOption | PARSE_WSDL) == parseOption)
-            parseWSDL(ref);
-        }
-        else
-        {
-          // discoveryRef
-          String ref = references[i].getRef();
-          // Prevent cycles.
-          WebServiceEntity discoLinkEntity = getWebServiceEntityByURI(ref);
-          if (discoLinkEntity == null)
-          {
-            discoLinkEntity = new WebServiceEntity();
-            discoLinkEntity.setType(WebServiceEntity.TYPE_DISCO);
-            discoLinkEntity.setURI(ref);
-            uriToEntityTable_.put(ref,discoLinkEntity);
-            if ((parseOption | PARSE_LINKS) == parseOption)
-              parseDISCO(ref,parseOption);
-          }
-          associate(discoEntity,discoLinkEntity);
-        }
-      }
-    }
-  }
-
-  private Definition parseWSDL(String wsdlURI) throws WSDLException, MalformedURLException, IOException, WWWAuthenticationException
-  {
-    return getWSDLDefinitionVerbose(wsdlURI);
-  }
-
-  private byte[] getInputStreamAsByteArray(String uriString) throws MalformedURLException, IOException, WWWAuthenticationException
-  {
-    // Try to get a cached copy of the byte[]
-    WebServiceEntity wsEntity = getWebServiceEntityByURI(uriString);
-    if (wsEntity != null)
-    {
-      byte[] bytes = wsEntity.getBytes();
-      if (bytes != null)
-        return bytes;
-    }
-    // Get the byte[] by opening a stream to the URI
-    URL url = createURL(uriString);
-    URLConnection conn = url.openConnection();
-    // proxy server setting
-    String proxyUserName = System.getProperty("http.proxyUserName");
-    String proxyPassword = System.getProperty("http.proxyPassword");
-    if (proxyUserName != null && proxyPassword != null)
-    {
-      StringBuffer userNamePassword = new StringBuffer(proxyUserName);
-      userNamePassword.append(':').append(proxyPassword);
-      BASE64Encoder encoder = new BASE64Encoder();
-      String encoding = encoder.encode(userNamePassword.toString().getBytes());
-      userNamePassword.setLength(0);
-      userNamePassword.append("Basic ").append(encoding);
-      conn.setRequestProperty("Proxy-authorization", userNamePassword.toString());
-    }
-    // HTTP basic authentication setting
-    if (httpBasicAuthUsername_ != null && httpBasicAuthPassword_ != null)
-    {
-      StringBuffer sb = new StringBuffer(httpBasicAuthUsername_);
-      sb.append(':').append(httpBasicAuthPassword_);
-      BASE64Encoder encoder = new BASE64Encoder();
-      String encoding = encoder.encode(sb.toString().getBytes());
-      sb.setLength(0);
-      sb.append("Basic ").append(encoding);
-      conn.setRequestProperty("Authorization", sb.toString());
-    }
-    InputStream is = null;
-    try
-    {
-      is = conn.getInputStream();
-      String wwwAuthMsg = conn.getHeaderField("WWW-Authenticate");
-      if (wwwAuthMsg != null)
-        throw new WWWAuthenticationException(new IOException(), wwwAuthMsg, uriString);
-    }
-    catch (IOException ioe)
-    {
-      String wwwAuthMsg = conn.getHeaderField("WWW-Authenticate");
-      if (wwwAuthMsg != null)
-        throw new WWWAuthenticationException(ioe, wwwAuthMsg, uriString);
-      else
-        throw ioe;
-    }
-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    byte[] b = new byte[1024];
-    int byteRead = is.read(b);
-    while (byteRead != -1)
-    {
-      baos.write(b, 0, byteRead);
-      byteRead = is.read(b);
-    }
-    is.close();
-    return baos.toByteArray();
-  }
-
-  protected URL createURL(String url) throws MalformedURLException
-  {
-    return new URL(url);
-  }
-
-  private void associate(WebServiceEntity parent, WebServiceEntity child)
-  {
-    parent.addChild(child);
-    child.setParent(parent);
-  }
-
-  private String convertToAbsoluteURI(String baseURI,String refURI)
-  {
-    if (refURI != null && refURI.indexOf(":") < 0)
-    {
-      StringBuffer absoluteURI = new StringBuffer(baseURI.substring(0,Math.max(baseURI.lastIndexOf('\\'),baseURI.lastIndexOf('/')+1)));
-      absoluteURI.append(refURI);
-      return absoluteURI.toString();
-    }
-    return refURI;
-  }
-
-  private void setHTTPSettings(WebServiceEntity entity)
-  {
-    if (httpBasicAuthUsername_ != null && httpBasicAuthPassword_ != null)
-    {
-      entity.setHTTPUsername(httpBasicAuthUsername_);
-      entity.setHTTPPassword(httpBasicAuthPassword_);
-    }
-  }
-
-  public String getHTTPBasicAuthUsername()
-  {
-    return httpBasicAuthUsername_;
-  }
-
-  public void setHTTPBasicAuthUsername(String username)
-  {
-    httpBasicAuthUsername_ = username;
-  }
-
-  public String getHTTPBasicAuthPassword()
-  {
-    return httpBasicAuthPassword_;
-  }
-
-  public void setHTTPBasicAuthPassword(String password)
-  {
-    httpBasicAuthPassword_ = password;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/wsil.properties b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/wsil.properties
deleted file mode 100644
index 1e60c01ba..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/wsil.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-###############################################################################
-# Copyright (c) 2001,2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# Messages for AddWSDLToWSILCommand
-#
-MSG_ERROR_INVALID_ARGUMENTS=IWAB0055E Invalid command arguments.
-MSG_ERROR_ILLEGAL_ARGUMENTS=IWAB0105E Illegal argument.
-MSG_ERROR_INVALID_WSDL_URI=IWAB0185E Invalid WSDL URI.
-MSG_ERROR_INVALID_WSIL_URI=IWAB0206E Invalid WSIL URI.
-MSG_ERROR_UNRESOLVABLE_WSDL=IWAB0405E WSDL is unresolvable.
-MSG_ERROR_UNEXPECTED_EXCEPTION=IWAB0451E An unexpected exception has occured.
-MSG_ERROR_MALFORMED_WSDL=IWAB0452E WSDL is malformed, error parsing WSDL.
-MSG_ERROR_WRITE_WSIL=IWAB0453E Error writing WSIL.
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/PluginMessages.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/PluginMessages.java
deleted file mode 100644
index 9609cb5af..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/PluginMessages.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.eclipse.wst.ws.parser;
-
-import org.eclipse.osgi.util.NLS;
-
-public class PluginMessages extends NLS
-{
-  private static final String BUNDLE_NAME = "org.eclipse.wst.ws.parser.plugin"; //$NON-NLS-1$
-  
-  static
-  {
-    NLS.initializeMessages(BUNDLE_NAME, PluginMessages.class);
-  }
-
-  public static String PUBLICUDDIREGISTRYTYPE_NAME_IBM;
-  public static String PUBLICUDDIREGISTRYTYPE_NAME_IBM_TEST;
-  public static String PUBLICUDDIREGISTRYTYPE_NAME_MICROSOFT;
-  public static String PUBLICUDDIREGISTRYTYPE_NAME_MICROSOFT_TEST;
-  public static String PUBLICUDDIREGISTRYTYPE_NAME_SAP;
-  public static String PUBLICUDDIREGISTRYTYPE_NAME_SAP_TEST;
-  public static String PUBLICUDDIREGISTRYTYPE_NAME_XMETHODS;
-  public static String PUBLICUDDIREGISTRYTYPE_NAME_NTTCOMM;
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/plugin.properties b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/plugin.properties
deleted file mode 100644
index ec8bde8ed..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/plugin.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-###############################################################################
-# Copyright (c) 2004,2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# PublicUDDIRegistryType
-#
-PUBLICUDDIREGISTRYTYPE_NAME_IBM=IBM UDDI Registry
-PUBLICUDDIREGISTRYTYPE_NAME_IBM_TEST=IBM UDDI Test Registry
-PUBLICUDDIREGISTRYTYPE_NAME_MICROSOFT=Microsoft UDDI Registry
-PUBLICUDDIREGISTRYTYPE_NAME_MICROSOFT_TEST=Microsoft UDDI Test Registry
-PUBLICUDDIREGISTRYTYPE_NAME_SAP=SAP UDDI Registry
-PUBLICUDDIREGISTRYTYPE_NAME_SAP_TEST=SAP UDDI Test Registry
-PUBLICUDDIREGISTRYTYPE_NAME_XMETHODS=XMethods Registry
-PUBLICUDDIREGISTRYTYPE_NAME_NTTCOMM=NTT Communications Registry
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.ui/.classpath b/bundles/org.eclipse.wst.ws.ui/.classpath
deleted file mode 100644
index 751c8f2e5..000000000
--- a/bundles/org.eclipse.wst.ws.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.wst.ws.ui/.cvsignore b/bundles/org.eclipse.wst.ws.ui/.cvsignore
deleted file mode 100644
index 486ce3b6b..000000000
--- a/bundles/org.eclipse.wst.ws.ui/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-temp.folder
-wsui.jar
-build.xml
-@dot
-src.zip
diff --git a/bundles/org.eclipse.wst.ws.ui/.project b/bundles/org.eclipse.wst.ws.ui/.project
deleted file mode 100644
index a1487d2c4..000000000
--- 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/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.wst.ws.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index bf654bdd7..000000000
--- a/bundles/org.eclipse.wst.ws.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,57 +0,0 @@
-#Mon Jan 30 10:38:15 EST 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/bundles/org.eclipse.wst.ws.ui/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.wst.ws.ui/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 379690c2a..000000000
--- a/bundles/org.eclipse.wst.ws.ui/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Jan 30 10:39:46 EST 2006
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.wst.ws.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.ws.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 29a24127d..000000000
--- a/bundles/org.eclipse.wst.ws.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.wst.ws.ui; singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.wst.ws.internal.ui.plugin.WSUIPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.ws.internal.ui.wsrt,
- org.eclipse.wst.ws.internal.ui.plugin,
- org.eclipse.wst.ws.internal.ui.preferences,
- org.eclipse.wst.ws.internal.ui.wsi.preferences,
- org.eclipse.wst.ws.internal.ui.wsi.properties,
- org.eclipse.wst.ws.internal.ui
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.wst.command.env.ui,
- org.eclipse.wst.ws
-Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.wst.ws.ui/about.html b/bundles/org.eclipse.wst.ws.ui/about.html
deleted file mode 100644
index 6f6b96c4c..000000000
--- a/bundles/org.eclipse.wst.ws.ui/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.ui/build.properties b/bundles/org.eclipse.wst.ws.ui/build.properties
deleted file mode 100644
index ee7ecd581..000000000
--- a/bundles/org.eclipse.wst.ws.ui/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = plugin.xml,\
-               .,\
-               plugin.properties,\
-               META-INF/,\
-               about.html
diff --git a/bundles/org.eclipse.wst.ws.ui/plugin.properties b/bundles/org.eclipse.wst.ws.ui/plugin.properties
deleted file mode 100644
index b9b831ee3..000000000
--- a/bundles/org.eclipse.wst.ws.ui/plugin.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Web Services UI
-PLUGIN_PROVIDER=Eclipse.org
-
-PLUGIN_NEW_CATEGORY_NAME_WS=Web Services
-PREFERENCE_CATEGORY_WSI=Profile Compliance and Validation
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.ui/plugin.xml b/bundles/org.eclipse.wst.ws.ui/plugin.xml
deleted file mode 100644
index a5046040b..000000000
--- a/bundles/org.eclipse.wst.ws.ui/plugin.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-    	<extension
-         point="org.eclipse.ui.preferencePages">
-
-      <page
-            name="%PLUGIN_NEW_CATEGORY_NAME_WS"
-            class="org.eclipse.wst.ws.internal.ui.preferences.WebServicesPreferencePage"
-            id="org.eclipse.wst.ws.internal.ui.preferences.name">
-      </page>
-      
-      <page
-            name="%PREFERENCE_CATEGORY_WSI"
-            category="org.eclipse.wst.ws.internal.ui.preferences.name"
-            class="org.eclipse.wst.ws.internal.ui.wsi.preferences.WSICompliancePreferencePage"
-            id="org.eclipse.wst.ws.internal.ui.wsi.preferences.WSICompliancePreferencePage">
-      </page>
-
-   </extension>
-
-   <extension
-         point="org.eclipse.ui.propertyPages">
-
-      <page
-            objectClass="org.eclipse.core.resources.IProject"
-            adaptable="true"
-            name="%PREFERENCE_CATEGORY_WSI"
-            class="org.eclipse.wst.ws.internal.ui.wsi.properties.WSICompliancePropertyPage"
-            id="org.eclipse.wst.ws.internal.ui.wsi.properties.WSICompliancePropertyPage">
-      </page>
-
-   </extension>
-</plugin>
diff --git a/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/WstWSUIPlugin.properties b/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/WstWSUIPlugin.properties
deleted file mode 100644
index 44a8b7d5b..000000000
--- a/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/WstWSUIPlugin.properties
+++ /dev/null
@@ -1,67 +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
-
-#
-#	WSDL Validation
-#
-LABEL_WSDLVAL=Select whether WSDL validation should be performed on wizards that consume WSDL files
-LABEL_WSDLVAL_NONE=No wizard WSDL validation
-LABEL_WSDLVAL_REMOTE=Wizard WSDL validation for remote files only
-LABEL_WSDLVAL_ALL=Wizard WSDL validation for all WSDL files
-LABEL_WAIT_FOR_WSDLVAL=Wait for WSDL validation to complete before moving along the wizards?
-BUTTON_WAIT_FOR_WSDLVAL=Wait for pending WSDL validation to complete
-TOOLTIP_PWSI_RADIO_WSDLVAL_NONE=Do not perform WSDL validation on the WSDL file or URL input to the Web Services wizard
-TOOLTIP_PWSI_RADIO_WSDLVAL_REMOTE=Only perform WSDL validation on remote WSDL file or URL input to the Web Services wizard
-TOOLTIP_PWSI_RADIO_WSDLVAL_ALL=Perform WSDL validation on all WSDL file or URL input to the Web Services wizard
-TOOLTIP_PWSI_WSDLVAL_LABEL=Select whether WSDL validation should be performed on wizards that consume WSDL files, \nfor example, Web Service wizard in skeleton scenario and Web Service Client wizard.
-TOOLTIP_PWSI_LABEL_WAIT_FOR_WSDLVAL=WSDL validation might not have completed during wizard flow, \nwould you like to wait for WSDL validation or cancel it?
-TOOLTIP_PWSI_BUTTON_WAIT_FOR_WSDLVAL=Wait for pending WSDL validation to complete and continue with the wizard
-
-
-
-
diff --git a/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/WstWSUIPluginMessages.java b/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/WstWSUIPluginMessages.java
deleted file mode 100644
index 325234d9a..000000000
--- a/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/WstWSUIPluginMessages.java
+++ /dev/null
@@ -1,59 +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;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class WstWSUIPluginMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.wst.ws.internal.ui.WstWSUIPlugin";//$NON-NLS-1$
-
-	private WstWSUIPluginMessages() {
-		// Do not instantiate
-	}
-
-	public static String PLUGIN_NAME;
-	public static String PLUGIN_VENDOR;
-	public static String PLUGIN_DESC;
-	public static String PLUGIN_NEW_CATEGORY_NAME_WS;
-	public static String PREFERENCE_CATEGORY_WSI;
-	public static String STOP_NON_WSI;
-	public static String WARN_NON_WSI;
-	public static String IGNORE_NON_WSI;
-	public static String FOLLOW_WSI_PREFERENCE;
-	public static String TOOLTIP_PWSI_PAGE;
-	public static String TOOLTIP_PWSI_RADIO_STOP_NON_WSI;
-	public static String TOOLTIP_PWSI_RADIO_WARNING_NON_WSI;
-	public static String TOOLTIP_PWSI_RADIO_IGNORE_NON_WSI;
-	public static String TOOLTIP_PWSI_RADIO_FOLLOW_WSI_PREFERENCE;
-	public static String LABEL_WSI_SSBP;
-	public static String TOOLTIP_PWSI_SSBP_LABEL;
-	public static String TOOLTIP_PWSI_SSBP_COMBO;
-	public static String LABEL_WSI_AP;
-	public static String TOOLTIP_PWSI_AP_LABEL;
-	public static String TOOLTIP_PWSI_AP_COMBO;
-	public static String LABEL_WSDLVAL;
-	public static String LABEL_WSDLVAL_NONE;
-	public static String LABEL_WSDLVAL_REMOTE;
-	public static String LABEL_WSDLVAL_ALL;
-	public static String LABEL_WAIT_FOR_WSDLVAL;
-	public static String BUTTON_WAIT_FOR_WSDLVAL;
-	public static String TOOLTIP_PWSI_RADIO_WSDLVAL_NONE;
-	public static String TOOLTIP_PWSI_RADIO_WSDLVAL_REMOTE;
-	public static String TOOLTIP_PWSI_RADIO_WSDLVAL_ALL;
-	public static String TOOLTIP_PWSI_WSDLVAL_LABEL;
-	public static String TOOLTIP_PWSI_LABEL_WAIT_FOR_WSDLVAL;
-	public static String TOOLTIP_PWSI_BUTTON_WAIT_FOR_WSDLVAL;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, WstWSUIPluginMessages.class);
-	}
-}
\ No newline at end of file
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 ee09901a6..000000000
--- a/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/plugin/WSUIPlugin.java
+++ /dev/null
@@ -1,72 +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 org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-
-/**
-* 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
-{
-
- /**
- * 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_;
- 
- /**
-  * 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_;
- }
-
- /**
- * Returns an image descriptor for the named resource
- * as relative to the plugin install location.
- * @return An image descriptor, possibly null.
- */
-	public static ImageDescriptor getImageDescriptor(String name) {
-		try {
-			URL installURL = instance_.getBundle().getEntry("/");
-			URL imageURL = new URL(installURL, name);
-			return ImageDescriptor.createFromURL(imageURL);
-		} catch (MalformedURLException e) {
-     return null;
-   }
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/preferences/WebServicesPreferencePage.java b/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/preferences/WebServicesPreferencePage.java
deleted file mode 100644
index d8ee6b6fe..000000000
--- 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/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 32cdb6346..000000000
--- a/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/wsi/preferences/WSICompliancePreferencePage.java
+++ /dev/null
@@ -1,381 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.ui.wsi.preferences;
-
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.help.IWorkbenchHelpSystem;
-import org.eclipse.wst.ws.internal.plugin.WSPlugin;
-import org.eclipse.wst.ws.internal.preferences.PersistentWSDLValidationContext;
-import org.eclipse.wst.ws.internal.preferences.PersistentWSIContext;
-import org.eclipse.wst.ws.internal.ui.WstWSUIPluginMessages;
-import org.eclipse.wst.ws.internal.ui.plugin.WSUIPlugin;
-
-
-
-public class WSICompliancePreferencePage extends PreferencePage implements IWorkbenchPreferencePage, SelectionListener, Listener
-
-{
-	  
-  /*CONTEXT_ID PWSI0001 for the WS-I Preference Page*/
-  private String INFOPOP_PWSI_PAGE = WSUIPlugin.ID + ".PWSI0000";
-  //
-
-  private Label wsi_ssbp_Label_;
-  private Combo wsi_ssbp_Types_;
-  
-  /*CONTEXT_ID PWSI0004 for the WS-I SSBP type combo box on the Profile Compliance and Validation page*/
-  private String INFOPOP_PWSI_SSBP_COMBO_TYPE = WSUIPlugin.ID + ".PWSI0004";
-  /*CONTEXT_ID PWSI0008 for the WS-I AP type combo box on the Profile Compliance and Validation page*/
-  private String INFOPOP_PWSI_AP_COMBO_TYPE = WSUIPlugin.ID + ".PWSI0008";
-      
-  private Label wsi_ap_Label_;
-  private Combo wsi_ap_Types_;
-  
-  private int savedSSBPSetting_ = -1;
-  
-  private Group validationSelectionGroup_;
-  
-  private Label wsdlValidationLabel_;
-  /*CONTEXT_ID PWSI0009 for the No Wizard WSDL validation button on the Profile Compliance and Validation page*/
-  private Button validateNoWsdlButton_;
-  /*CONTEXT_ID PWSI00010 for the Wizard WSDL validation for remote files only button on the Profile Compliance and Validation page*/
-  private Button validateRemoteWsdlButton_;
-  /*CONTEXT_ID PWSI00011 for the Wizard WSDL validation for all files button on the Profile Compliance and Validation page*/
-  private Button validateAllWsdlButton_;
-  private Label waitForWsdlValidationLabel_;
-  /*CONTEXT_ID PWSI00012 for the Wait for pending WSDL validation to complete checkbox on the Profile Compliance and Validation page*/
-  private Button waitForWSDLValidationCheckbox_;
-  
-
-  /*
-   * CONTEXT_ID PWRS0009 for the no wsdl validation radio button of the profile validation preference page
-   */
-  private String INFOPOP_PWSI_RADIO_WSDLVAL_NONE = WSUIPlugin.ID + ".PWSI0009";
-  /*
-   * CONTEXT_ID PWRS0010 for the wsdl validation on remote document radio button of the profile validation preference page
-   */
-  private String INFOPOP_PWSI_RADIO_WSDLVAL_REMOTE = WSUIPlugin.ID + ".PWSI00010";
-  /*
-   * CONTEXT_ID PWRS0011 for the wsdl validation on all document radio button of the profile validation preference page
-   */
-  private String INFOPOP_PWSI_RADIO_WSDLVAL_ALL = WSUIPlugin.ID + ".PWSI0011";
-  /*
-   * CONTEXT_ID PWRS0012 for the wsdl validation label of the profile validation preference page
-   */
-  private String INFOPOP_PWSI_WSDLVAL_LABEL = WSUIPlugin.ID + ".PWSI0012";
-  /*
-   * CONTEXT_ID PWRS0013 for the wait for wsdl validation checkbox of the profile validation preference page
-   */
-  private String INFOPOP_PWSI_BUTTON_WAIT_FOR_WSDLVAL = WSUIPlugin.ID + ".PWSI0013";
-
- /**
-   * Creates preference page controls on demand.
-   *   @param parent  the parent for the preference page
-   */
-  protected Control createContents(Composite superparent)
-  {
-   
-    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(WstWSUIPluginMessages.TOOLTIP_PWSI_PAGE);
-    helpSystem.setHelp(parent,INFOPOP_PWSI_PAGE);
-
-    GridLayout gl = new GridLayout();
-    gl.numColumns = 1;
-    gl.marginHeight = 0;
-    gl.marginWidth = 0;
-
-    Composite wsi_Composite = new Composite (parent, SWT.NONE);
-    wsi_Composite.setLayout(gl);
-    wsi_Composite.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
-    
-    wsi_ap_Label_ = new Label(wsi_Composite, SWT.NONE);
-    wsi_ap_Label_.setText(WstWSUIPluginMessages.LABEL_WSI_AP);
-    wsi_ap_Label_.setToolTipText(WstWSUIPluginMessages.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(WstWSUIPluginMessages.TOOLTIP_PWSI_AP_COMBO);
-    helpSystem.setHelp(wsi_ap_Types_,INFOPOP_PWSI_AP_COMBO_TYPE);
-    
-    wsi_ap_Types_.add(WstWSUIPluginMessages.STOP_NON_WSI);
-    wsi_ap_Types_.add(WstWSUIPluginMessages.WARN_NON_WSI);
-    wsi_ap_Types_.add(WstWSUIPluginMessages.IGNORE_NON_WSI);
-    
-    wsi_ap_Types_.addSelectionListener(this);
-    
-    wsi_ssbp_Label_ = new Label(wsi_Composite, SWT.NONE);
-    wsi_ssbp_Label_.setText(WstWSUIPluginMessages.LABEL_WSI_SSBP);
-    wsi_ssbp_Label_.setToolTipText(WstWSUIPluginMessages.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(WstWSUIPluginMessages.TOOLTIP_PWSI_SSBP_COMBO);
-    helpSystem.setHelp(wsi_ssbp_Types_,INFOPOP_PWSI_SSBP_COMBO_TYPE);
-    
-    wsi_ssbp_Types_.add(WstWSUIPluginMessages.STOP_NON_WSI);
-    wsi_ssbp_Types_.add(WstWSUIPluginMessages.WARN_NON_WSI);
-    wsi_ssbp_Types_.add(WstWSUIPluginMessages.IGNORE_NON_WSI);
-  
-    // WSDL validation preferences
-    validationSelectionGroup_ = new Group(wsi_Composite, SWT.NONE);
-    gl = new GridLayout();
-    gl.marginHeight = 0;
-    gl.marginWidth = 0;
-    validationSelectionGroup_.setLayout(gl);
-    GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-    validationSelectionGroup_.setLayoutData(gd);
-    
-    wsdlValidationLabel_ = new Label(validationSelectionGroup_, SWT.NONE);
-    wsdlValidationLabel_.setText(WstWSUIPluginMessages.LABEL_WSDLVAL);
-    wsdlValidationLabel_.setToolTipText(WstWSUIPluginMessages.TOOLTIP_PWSI_WSDLVAL_LABEL);
-    helpSystem.setHelp(wsdlValidationLabel_, INFOPOP_PWSI_WSDLVAL_LABEL);
-    
-    validateNoWsdlButton_ = new Button(validationSelectionGroup_, SWT.RADIO);
-    validateNoWsdlButton_.setText(WstWSUIPluginMessages.LABEL_WSDLVAL_NONE);
-    validateNoWsdlButton_.addListener(SWT.Selection, this);
-    validateNoWsdlButton_.setToolTipText(WstWSUIPluginMessages.TOOLTIP_PWSI_RADIO_WSDLVAL_NONE);
-    helpSystem.setHelp(validateNoWsdlButton_, INFOPOP_PWSI_RADIO_WSDLVAL_NONE);
-    
-    validateRemoteWsdlButton_ = new Button(validationSelectionGroup_, SWT.RADIO);
-    validateRemoteWsdlButton_.setText(WstWSUIPluginMessages.LABEL_WSDLVAL_REMOTE);
-    validateRemoteWsdlButton_.addListener(SWT.Selection, this);
-    validateRemoteWsdlButton_.setToolTipText(WstWSUIPluginMessages.TOOLTIP_PWSI_RADIO_WSDLVAL_REMOTE);
-    helpSystem.setHelp(validateRemoteWsdlButton_, INFOPOP_PWSI_RADIO_WSDLVAL_REMOTE);
-    
-    validateAllWsdlButton_ = new Button(validationSelectionGroup_, SWT.RADIO);
-    validateAllWsdlButton_.setText(WstWSUIPluginMessages.LABEL_WSDLVAL_ALL);
-    validateAllWsdlButton_.addListener(SWT.Selection, this);
-    validateAllWsdlButton_.setToolTipText(WstWSUIPluginMessages.TOOLTIP_PWSI_RADIO_WSDLVAL_ALL);
-    helpSystem.setHelp(validateAllWsdlButton_, INFOPOP_PWSI_RADIO_WSDLVAL_ALL);
-    
-    new Label(validationSelectionGroup_, SWT.NONE);;
-    
-    waitForWsdlValidationLabel_ = new Label(validationSelectionGroup_, SWT.NONE);
-    waitForWsdlValidationLabel_.setText(WstWSUIPluginMessages.LABEL_WAIT_FOR_WSDLVAL);
-    waitForWsdlValidationLabel_.setToolTipText(WstWSUIPluginMessages.TOOLTIP_PWSI_LABEL_WAIT_FOR_WSDLVAL);
-    
-    waitForWSDLValidationCheckbox_ = new Button(validationSelectionGroup_, SWT.CHECK);
-    waitForWSDLValidationCheckbox_.setText(WstWSUIPluginMessages.BUTTON_WAIT_FOR_WSDLVAL);            
-    waitForWSDLValidationCheckbox_.addListener(SWT.Selection, this);
-    waitForWSDLValidationCheckbox_.setToolTipText(WstWSUIPluginMessages.TOOLTIP_PWSI_BUTTON_WAIT_FOR_WSDLVAL);
-    helpSystem.setHelp(waitForWSDLValidationCheckbox_, INFOPOP_PWSI_BUTTON_WAIT_FOR_WSDLVAL);
-    
-    initializeValues();
-    org.eclipse.jface.dialogs.Dialog.applyDialogFont(superparent);    
-    return parent;
-  }
-
-  /**
-   * Does anything necessary because the default button has been pressed.
-   */
-  protected void performDefaults()
-  {
-    super.performDefaults();
-    initializeDefaults();
-  }
-
-  /**
-   * Do anything necessary because the OK button has been pressed.
-   *  @return whether it is okay to close the preference page
-   */
-  public boolean performOk()
-  {
-    storeValues();
-    return true;
-  }
-
-  protected void performApply()
-  {
-    performOk();
-  }
-
-  /**
-   * @see IWorkbenchPreferencePage
-   */
-  public void init(IWorkbench workbench)   { }
-
-  /**
-   * Initializes states of the controls using default values
-   * in the preference store.
-   */
-  private void initializeDefaults()
-  {
-    // force WSI compliance by default
-    
-    wsi_ssbp_Types_.select(wsi_ssbp_Types_.indexOf(WstWSUIPluginMessages.WARN_NON_WSI));
-    int apSelection = wsi_ap_Types_.indexOf(WstWSUIPluginMessages.WARN_NON_WSI);
-    wsi_ap_Types_.select(apSelection);
-    savedSSBPSetting_ = -1;  // do not restore saved SSBP setting
-    processAPSelection(apSelection);
-
-    PersistentWSDLValidationContext wsdlValidationContext = WSPlugin.getInstance().getWSDLValidationContext();
-    String validationSelection = wsdlValidationContext.getDefault();
-    wsdlValidationContext.updateWSDLValidation(validationSelection);
-    validateNoWsdlButton_.setSelection(false);
-    validateRemoteWsdlButton_.setSelection(false);
-    validateAllWsdlButton_.setSelection(false);
-    processWSDLValidationSelection(validationSelection);
-    
-    waitForWSDLValidationCheckbox_.setSelection(WSPlugin.getInstance().getWaitForWSDLValidationContext().getDefault());
-    WSPlugin.getInstance().getWaitForWSDLValidationContext().setWaitForWSDLValidation(WSPlugin.getInstance().getWaitForWSDLValidationContext().getDefault());
-    
-  }
-
-  /**
-   * Initializes states of the controls from the preference store.
-   */
-  private void initializeValues()
-  {
-    
-	String WSIText = getWSISelection(WSPlugin.getInstance().getWSISSBPContext());
-    wsi_ssbp_Types_.select(wsi_ssbp_Types_.indexOf(WSIText));
-    
-    int apSelection = wsi_ap_Types_.indexOf(getWSISelection(WSPlugin.getInstance().getWSIAPContext()));
-    wsi_ap_Types_.select(apSelection);
-    savedSSBPSetting_ = -1;  // do not restore saved SSBP setting
-    processAPSelection(apSelection);
-    
-    String validationSelection = WSPlugin.getInstance().getWSDLValidationContext().getPersistentWSDLValidation();
-    processWSDLValidationSelection(validationSelection);
-    
-    waitForWSDLValidationCheckbox_.setSelection(WSPlugin.getInstance().getWaitForWSDLValidationContext().getPersistentWaitForWSDLValidation());
-  }
-
-  private void processWSDLValidationSelection(String validationSelection) {
-
-		if (PersistentWSDLValidationContext.VALIDATE_NO_WSDL.equals(validationSelection)) {
-			validateNoWsdlButton_.setSelection(true);
-		} else if (PersistentWSDLValidationContext.VALIDATE_REMOTE_WSDL.equals(validationSelection)) {
-			validateRemoteWsdlButton_.setSelection(true);
-		} else if (PersistentWSDLValidationContext.VALIDATE_ALL_WSDL.equals(validationSelection)) {
-			validateAllWsdlButton_.setSelection(true);
-		}
-
-	}
-
-private String getWSISelection(PersistentWSIContext context)
-  {
-    
-    String WSIvalue = context.getPersistentWSICompliance();
-    String WSIText = WstWSUIPluginMessages.WARN_NON_WSI;
-    if (PersistentWSIContext.STOP_NON_WSI.equals(WSIvalue)) {
-		WSIText = WstWSUIPluginMessages.STOP_NON_WSI;
-	} else if (PersistentWSIContext.IGNORE_NON_WSI.equals(WSIvalue)) {
-		WSIText = WstWSUIPluginMessages.IGNORE_NON_WSI;
-	}
-	return WSIText;
-  }
-  /**
-   * Stores the values of the controls back to the preference store.
-   */
-  private void storeValues()
-  {
-  	updateWSIContext(wsi_ssbp_Types_.getSelectionIndex(), WSPlugin.getInstance().getWSISSBPContext());
-  	updateWSIContext(wsi_ap_Types_.getSelectionIndex(), WSPlugin.getInstance().getWSIAPContext());
-  }
-  
-  private void updateWSIContext(int selectionIndex, PersistentWSIContext context)
-  {
-    // get the persistent context from the plugin
-    
-    String value=null;
-    switch (selectionIndex) {
-    	case 0:
-    		value = PersistentWSIContext.STOP_NON_WSI;
-    		break;
-    	case 1:
-    		value = PersistentWSIContext.WARN_NON_WSI;
-    		break;
-    	case 2:
-    		value = PersistentWSIContext.IGNORE_NON_WSI;		
-    		break;
-    }
-    context.updateWSICompliances(value);
-  }
-  
-  public void widgetSelected(SelectionEvent e)
-  {
-  	
-  	processAPSelection( wsi_ap_Types_.getSelectionIndex() );
-  	
-  }
-  
-  public void processAPSelection(int selection) {
-  	if (selection == 2) { // reset SSBP to default if AP is ignore
-  		wsi_ssbp_Types_.setEnabled(true);
-  		if (savedSSBPSetting_ != -1)  {
-  			// restore saved SSBP setting, if any
-  			wsi_ssbp_Types_.select(savedSSBPSetting_);
-  			savedSSBPSetting_ = -1;
-  		}
-  	} else { // set SSBP to follow AP setting if STOP or WARN chosen
-  		if (savedSSBPSetting_ == -1)  {  // SSBP setting not saved
-  			savedSSBPSetting_ = wsi_ssbp_Types_.getSelectionIndex();
-  		}
-  		wsi_ssbp_Types_.select(selection);
-  		wsi_ssbp_Types_.setEnabled(false);
-  		
-  	}
-  }
-
-  public void widgetDefaultSelected(SelectionEvent e) {
-	
-  }
-  
-  /**
-   * Called when an event occurs on the page. Handles the event and revalidates the page.
-   * 
-   * @param event
-   *          The event that occured.
-   */
-  public void handleEvent(Event event) {
-	  
-	  if (waitForWSDLValidationCheckbox_ == event.widget) {		   		  
-		  WSPlugin.getInstance().getWaitForWSDLValidationContext().setWaitForWSDLValidation(waitForWSDLValidationCheckbox_.getSelection());
-	  } else {
-		  String wsdlValdationSelection = null;
-		  if (validateNoWsdlButton_ == event.widget) {
-			  wsdlValdationSelection = PersistentWSDLValidationContext.VALIDATE_NO_WSDL;
-		  }
-		  else if (validateRemoteWsdlButton_ == event.widget) {
-			  wsdlValdationSelection = PersistentWSDLValidationContext.VALIDATE_REMOTE_WSDL;
-		  }
-		  else if (validateAllWsdlButton_ == event.widget) {
-			  wsdlValdationSelection = PersistentWSDLValidationContext.VALIDATE_ALL_WSDL;
-		  }
-		  WSPlugin.getInstance().getWSDLValidationContext().updateWSDLValidation(wsdlValdationSelection);
-	  }
-	  
-	  
-  }
-
-
-}
diff --git a/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/wsi/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 4a39d5a59..000000000
--- a/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/wsi/properties/WSICompliancePropertyPage.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.ui.wsi.properties;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.PropertyPage;
-import org.eclipse.ui.help.IWorkbenchHelpSystem;
-import org.eclipse.wst.ws.internal.plugin.WSPlugin;
-import org.eclipse.wst.ws.internal.preferences.PersistentWSIContext;
-import org.eclipse.wst.ws.internal.ui.WstWSUIPluginMessages;
-import org.eclipse.wst.ws.internal.ui.plugin.WSUIPlugin;
-
-
-public class WSICompliancePropertyPage extends PropertyPage implements SelectionListener
-{
-  
-  /*CONTEXT_ID PWSI0001 for the WS-I Preference Page*/
-  private String INFOPOP_PWSI_PAGE = WSUIPlugin.ID + ".PWSI0000";
-  //
-
-  private Label wsi_ssbp_Label_;
-  private Combo wsi_ssbp_Types_;
-  
-  /*CONTEXT_ID PWSI0004 for the WS-I SSBP type combo box on the WS-I AP Non compliance Preference Page*/
-  private String INFOPOP_PWSI_SSBP_COMBO_TYPE = WSUIPlugin.ID + ".PWSI0004";
-  /*CONTEXT_ID PWSI0008 for the WS-I AP type combo box on the WS-I AP Non compliance Preference Page*/
-  private String INFOPOP_PWSI_AP_COMBO_TYPE = WSUIPlugin.ID + ".PWSI0008";
-
-  private Label wsi_ap_Label_;
-  private Combo wsi_ap_Types_;
-  private int savedSSBPSetting_ = -1;
-  
- /**
-   * Creates preference page controls on demand.
-   *   @param parent  the parent for the preference page
-   */
-  protected Control createContents(Composite superparent)
-  {
-	
-    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(WstWSUIPluginMessages.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(WstWSUIPluginMessages.LABEL_WSI_AP);
-    wsi_ap_Label_.setToolTipText(WstWSUIPluginMessages.TOOLTIP_PWSI_AP_LABEL);
-    wsi_ap_Types_ = new Combo(wsi_Composite, SWT.DROP_DOWN | SWT.READ_ONLY);
-    wsi_ap_Types_.setToolTipText(WstWSUIPluginMessages.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(WstWSUIPluginMessages.STOP_NON_WSI);
-    wsi_ap_Types_.add(WstWSUIPluginMessages.WARN_NON_WSI);
-    wsi_ap_Types_.add(WstWSUIPluginMessages.IGNORE_NON_WSI);
-    wsi_ap_Types_.add(WstWSUIPluginMessages.FOLLOW_WSI_PREFERENCE);
-
-    wsi_ap_Types_.addSelectionListener(this);
-    
-    wsi_ssbp_Label_ = new Label(wsi_Composite, SWT.NONE);
-    wsi_ssbp_Label_.setText(WstWSUIPluginMessages.LABEL_WSI_SSBP);
-    wsi_ssbp_Label_.setToolTipText(WstWSUIPluginMessages.TOOLTIP_PWSI_SSBP_LABEL);
-    wsi_ssbp_Types_ = new Combo(wsi_Composite, SWT.DROP_DOWN | SWT.READ_ONLY);
-    wsi_ssbp_Types_.setToolTipText(WstWSUIPluginMessages.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(WstWSUIPluginMessages.STOP_NON_WSI);
-    wsi_ssbp_Types_.add(WstWSUIPluginMessages.WARN_NON_WSI);
-    wsi_ssbp_Types_.add(WstWSUIPluginMessages.IGNORE_NON_WSI);
-    wsi_ssbp_Types_.add(WstWSUIPluginMessages.FOLLOW_WSI_PREFERENCE);
-
-    initializeValues();
-    org.eclipse.jface.dialogs.Dialog.applyDialogFont(superparent);    
-    return parent;
-  }
-
-  /**
-   * Does anything necessary because the default button has been pressed.
-   */
-  protected void performDefaults()
-  {
-    super.performDefaults();
-    initializeDefaults();
-  }
-
-  /**
-   * Do anything necessary because the OK button has been pressed.
-   *  @return whether it is okay to close the preference page
-   */
-  public boolean performOk()
-  {
-    storeValues();
-    return true;
-  }
-
-  protected void performApply()
-  {
-    performOk();
-  }
-
-  /**
-   * Initializes states of the controls using default values
-   * in the preference store.
-   */
-  private void initializeDefaults()
-  {
-    wsi_ssbp_Types_.select(wsi_ssbp_Types_.indexOf(WstWSUIPluginMessages.FOLLOW_WSI_PREFERENCE));
-    int apSelection = wsi_ap_Types_.indexOf(WstWSUIPluginMessages.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(WSPlugin.getInstance().getWSISSBPContext());
-    wsi_ssbp_Types_.select(wsi_ssbp_Types_.indexOf(WSIText));
-    
-    int apSelection = wsi_ap_Types_.indexOf(getWSISelection(WSPlugin.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 = WstWSUIPluginMessages.FOLLOW_WSI_PREFERENCE;
-	if (PersistentWSIContext.STOP_NON_WSI.equals(WSIvalue)) {
-		WSIText = WstWSUIPluginMessages.STOP_NON_WSI;
-	} else if (PersistentWSIContext.WARN_NON_WSI.equals(WSIvalue)) {
-		WSIText = WstWSUIPluginMessages.WARN_NON_WSI;
-	} else if (PersistentWSIContext.IGNORE_NON_WSI.equals(WSIvalue)) {
-		WSIText = WstWSUIPluginMessages.IGNORE_NON_WSI;
-	}
-	return WSIText;
-  }
-  
-  /**
-   * Stores the values of the controls back to the preference store.
-   */
-  private void storeValues()
-  {
-  	updateWSIContext(wsi_ssbp_Types_.getSelectionIndex(), WSPlugin.getInstance().getWSISSBPContext());
-  	updateWSIContext(wsi_ap_Types_.getSelectionIndex(), WSPlugin.getInstance().getWSIAPContext());
-  }
-  
-  private void updateWSIContext(int selectionIndex, PersistentWSIContext context)
-  {    
-  	String value = PersistentWSIContext.FOLLOW_WSI_PREFERENCE;
-    IProject project = (IProject) getElement();
-    
-    switch (selectionIndex) {
-    	case 0:
-    		value = PersistentWSIContext.STOP_NON_WSI;
-    		break;
-    	case 1:
-    		value = PersistentWSIContext.WARN_NON_WSI;
-    		break;
-    	case 2:
-    		value = PersistentWSIContext.IGNORE_NON_WSI;		
-    		break;
-    	case 3:
-    		value = PersistentWSIContext.FOLLOW_WSI_PREFERENCE;		
-    		break;
-    }
-    context.updateProjectWSICompliances(project, value);
-  }
-  
-  public void widgetSelected(SelectionEvent e)
-  {
-  	
-  	processAPSelection( wsi_ap_Types_.getSelectionIndex() );
-  	
-  }
-  
-  public void processAPSelection(int selection) {
-  	if (selection == 2) { // reset SSBP to default if AP is ignore
-  		wsi_ssbp_Types_.setEnabled(true);
-  		if (savedSSBPSetting_ != -1)  {
-  			// restore saved SSBP setting, if any
-  			wsi_ssbp_Types_.select(savedSSBPSetting_);
-  			savedSSBPSetting_ = -1;
-  		}
-  	} else { // set SSBP to follow AP setting if STOP or WARN chosen
-  		if (savedSSBPSetting_ == -1)  {  // SSBP setting not saved
-  			savedSSBPSetting_ = wsi_ssbp_Types_.getSelectionIndex();
-  		}
-  		wsi_ssbp_Types_.select(selection);
-  		wsi_ssbp_Types_.setEnabled(false);
-  		
-  	}
-  }
-
-  public void widgetDefaultSelected(SelectionEvent e) {
-	
-  }
-}
-
diff --git a/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/wsrt/IObjectSelector.java b/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/wsrt/IObjectSelector.java
deleted file mode 100644
index 459e68b2f..000000000
--- a/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/wsrt/IObjectSelector.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.ui.wsrt;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.ws.internal.wsrt.ISelection;
-
-public interface IObjectSelector {
-	
-	public void setInitialSelection(ISelection sel);
-	public ISelection getSelection();
-	public String getProject();
-	public IStatus validateSelection(ISelection sel);
-	public WidgetDataEvents addControls(Composite parent, Listener statusListener);
-
-}
diff --git a/bundles/org.eclipse.wst.ws/.classpath b/bundles/org.eclipse.wst.ws/.classpath
deleted file mode 100644
index 751c8f2e5..000000000
--- 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.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.wst.ws/.cvsignore b/bundles/org.eclipse.wst.ws/.cvsignore
deleted file mode 100644
index ef2600fc2..000000000
--- a/bundles/org.eclipse.wst.ws/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-temp.folder
-build.xml
-ws.jar
-@dot
-src.zip
diff --git a/bundles/org.eclipse.wst.ws/.project b/bundles/org.eclipse.wst.ws/.project
deleted file mode 100644
index 2494e2f90..000000000
--- 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/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.wst.ws/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 430233b54..000000000
--- a/bundles/org.eclipse.wst.ws/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,57 +0,0 @@
-#Mon Jan 30 10:37:49 EST 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/bundles/org.eclipse.wst.ws/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.wst.ws/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 9fe56e0d9..000000000
--- a/bundles/org.eclipse.wst.ws/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Jan 30 10:40:12 EST 2006
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.wst.ws/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.ws/META-INF/MANIFEST.MF
deleted file mode 100644
index 201b6b1bf..000000000
--- a/bundles/org.eclipse.wst.ws/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,49 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.wst.ws; singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.wst.ws.internal.plugin.WSPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.ws.internal,
- org.eclipse.wst.ws.internal.common,
- org.eclipse.wst.ws.internal.data,
- org.eclipse.wst.ws.internal.datamodel,
- org.eclipse.wst.ws.internal.ext,
- org.eclipse.wst.ws.internal.extensions,
- org.eclipse.wst.ws.internal.model.v10.registry,
- org.eclipse.wst.ws.internal.model.v10.registry.impl,
- org.eclipse.wst.ws.internal.model.v10.registry.util,
- org.eclipse.wst.ws.internal.model.v10.rtindex,
- org.eclipse.wst.ws.internal.model.v10.rtindex.impl,
- org.eclipse.wst.ws.internal.model.v10.rtindex.util,
- org.eclipse.wst.ws.internal.model.v10.taxonomy,
- org.eclipse.wst.ws.internal.model.v10.taxonomy.impl,
- org.eclipse.wst.ws.internal.model.v10.taxonomy.util,
- org.eclipse.wst.ws.internal.model.v10.uddiregistry,
- org.eclipse.wst.ws.internal.model.v10.uddiregistry.impl,
- org.eclipse.wst.ws.internal.model.v10.uddiregistry.util,
- org.eclipse.wst.ws.internal.monitor,
- org.eclipse.wst.ws.internal.plugin,
- org.eclipse.wst.ws.internal.preferences,
- org.eclipse.wst.ws.internal.registry,
- org.eclipse.wst.ws.internal.wsfinder,
- org.eclipse.wst.ws.internal.wsil,
- org.eclipse.wst.ws.internal.wsrt
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.wst.internet.monitor.core,
- org.eclipse.wst.server.core,
- org.eclipse.wst.command.env.core,
- org.eclipse.wst.ws.parser,
- org.eclipse.emf.common,
- org.wsdl4j,
- org.apache.wsil4j,
- org.eclipse.core.resources,
- org.eclipse.wst.command.env,
- org.eclipse.wst.common.frameworks,
- org.eclipse.core.commands,
- org.eclipse.wst.common.environment,
- org.eclipse.emf.ecore,
- org.eclipse.emf.ecore.xmi
-Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.wst.ws/RT.genmodel b/bundles/org.eclipse.wst.ws/RT.genmodel
deleted file mode 100644
index 9aaa4f14f..000000000
--- a/bundles/org.eclipse.wst.ws/RT.genmodel
+++ /dev/null
@@ -1,117 +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="/RegistryModel2/src"
-    editDirectory="/RegistryModel2.edit/src" editorDirectory="/RegistryModel2.editor/src"
-    modelPluginID="RegistryModel2" runtimeJar="true" modelName="RT" editPluginClass="org.eclipse.wst.ws.internal.model.v10.rtindex.provider.RTEditPlugin"
-    editorPluginClass="org.eclipse.wst.ws.internal.model.v10.rtindex.presentation.RTEditorPlugin"
-    runtimeCompatibility="false">
-  <foreignModel>Index.xsd</foreignModel>
-  <foreignModel>Registry.xsd</foreignModel>
-  <foreignModel>UDDIRegistry.xsd</foreignModel>
-  <foreignModel>Taxonomy.xsd</foreignModel>
-  <genPackages prefix="RTIndex" basePackage="org.eclipse.wst.ws.internal.model.v10"
-      resource="XML" ecorePackage="org.eclipse.wst.ws.internal.model.v10.rtindex.ecore#/">
-    <genClasses ecoreClass="org.eclipse.wst.ws.internal.model.v10.rtindex.ecore#//Description">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.wst.ws.internal.model.v10.rtindex.ecore#//Description/value"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.wst.ws.internal.model.v10.rtindex.ecore#//Description/lang"/>
-    </genClasses>
-    <genClasses ecoreClass="org.eclipse.wst.ws.internal.model.v10.rtindex.ecore#//DocumentRoot">
-      <genFeatures property="None" children="true" createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.wst.ws.internal.model.v10.rtindex.ecore#//DocumentRoot/mixed"/>
-      <genFeatures property="None" notify="false" createChild="true" ecoreFeature="ecore:EReference org.eclipse.wst.ws.internal.model.v10.rtindex.ecore#//DocumentRoot/xMLNSPrefixMap"/>
-      <genFeatures property="None" notify="false" createChild="true" ecoreFeature="ecore:EReference org.eclipse.wst.ws.internal.model.v10.rtindex.ecore#//DocumentRoot/xSISchemaLocation"/>
-      <genFeatures property="None" notify="false" createChild="true" ecoreFeature="ecore:EReference org.eclipse.wst.ws.internal.model.v10.rtindex.ecore#//DocumentRoot/description"/>
-      <genFeatures property="None" notify="false" createChild="true" ecoreFeature="ecore:EReference org.eclipse.wst.ws.internal.model.v10.rtindex.ecore#//DocumentRoot/index"/>
-      <genFeatures property="None" notify="false" createChild="true" ecoreFeature="ecore:EReference org.eclipse.wst.ws.internal.model.v10.rtindex.ecore#//DocumentRoot/name"/>
-    </genClasses>
-    <genClasses ecoreClass="org.eclipse.wst.ws.internal.model.v10.rtindex.ecore#//Index">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference org.eclipse.wst.ws.internal.model.v10.rtindex.ecore#//Index/name"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference org.eclipse.wst.ws.internal.model.v10.rtindex.ecore#//Index/description"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference org.eclipse.wst.ws.internal.model.v10.rtindex.ecore#//Index/registry"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference org.eclipse.wst.ws.internal.model.v10.rtindex.ecore#//Index/taxonomy"/>
-    </genClasses>
-    <genClasses ecoreClass="org.eclipse.wst.ws.internal.model.v10.rtindex.ecore#//Name">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.wst.ws.internal.model.v10.rtindex.ecore#//Name/value"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.wst.ws.internal.model.v10.rtindex.ecore#//Name/lang"/>
-    </genClasses>
-  </genPackages>
-  <genPackages prefix="Taxonomy" basePackage="org.eclipse.wst.ws.internal.model.v10"
-      resource="XML" ecorePackage="org.eclipse.wst.ws.internal.model.v10.taxonomy.ecore#/">
-    <genClasses ecoreClass="org.eclipse.wst.ws.internal.model.v10.taxonomy.ecore#//Category">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference org.eclipse.wst.ws.internal.model.v10.taxonomy.ecore#//Category/nlname"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference org.eclipse.wst.ws.internal.model.v10.taxonomy.ecore#//Category/category"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.wst.ws.internal.model.v10.taxonomy.ecore#//Category/code"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.wst.ws.internal.model.v10.taxonomy.ecore#//Category/name"/>
-    </genClasses>
-    <genClasses ecoreClass="org.eclipse.wst.ws.internal.model.v10.taxonomy.ecore#//DocumentRoot">
-      <genFeatures property="None" children="true" createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.wst.ws.internal.model.v10.taxonomy.ecore#//DocumentRoot/mixed"/>
-      <genFeatures property="None" notify="false" createChild="true" ecoreFeature="ecore:EReference org.eclipse.wst.ws.internal.model.v10.taxonomy.ecore#//DocumentRoot/xMLNSPrefixMap"/>
-      <genFeatures property="None" notify="false" createChild="true" ecoreFeature="ecore:EReference org.eclipse.wst.ws.internal.model.v10.taxonomy.ecore#//DocumentRoot/xSISchemaLocation"/>
-      <genFeatures property="None" notify="false" createChild="true" ecoreFeature="ecore:EReference org.eclipse.wst.ws.internal.model.v10.taxonomy.ecore#//DocumentRoot/category"/>
-      <genFeatures property="None" notify="false" createChild="true" ecoreFeature="ecore:EReference org.eclipse.wst.ws.internal.model.v10.taxonomy.ecore#//DocumentRoot/name"/>
-      <genFeatures property="None" notify="false" createChild="true" ecoreFeature="ecore:EReference org.eclipse.wst.ws.internal.model.v10.taxonomy.ecore#//DocumentRoot/taxonomy"/>
-    </genClasses>
-    <genClasses ecoreClass="org.eclipse.wst.ws.internal.model.v10.taxonomy.ecore#//Name">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.wst.ws.internal.model.v10.taxonomy.ecore#//Name/value"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.wst.ws.internal.model.v10.taxonomy.ecore#//Name/lang"/>
-    </genClasses>
-    <genClasses ecoreClass="org.eclipse.wst.ws.internal.model.v10.taxonomy.ecore#//Taxonomy">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference org.eclipse.wst.ws.internal.model.v10.taxonomy.ecore#//Taxonomy/nlname"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference org.eclipse.wst.ws.internal.model.v10.taxonomy.ecore#//Taxonomy/category"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.wst.ws.internal.model.v10.taxonomy.ecore#//Taxonomy/id"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.wst.ws.internal.model.v10.taxonomy.ecore#//Taxonomy/location"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.wst.ws.internal.model.v10.taxonomy.ecore#//Taxonomy/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.wst.ws.internal.model.v10.taxonomy.ecore#//Taxonomy/ref"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.wst.ws.internal.model.v10.taxonomy.ecore#//Taxonomy/tmodelKey"/>
-    </genClasses>
-  </genPackages>
-  <genPackages prefix="Registry" basePackage="org.eclipse.wst.ws.internal.model.v10"
-      resource="XML" ecorePackage="org.eclipse.wst.ws.internal.model.v10.registry.ecore#/">
-    <genClasses ecoreClass="org.eclipse.wst.ws.internal.model.v10.registry.ecore#//Description">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.wst.ws.internal.model.v10.registry.ecore#//Description/value"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.wst.ws.internal.model.v10.registry.ecore#//Description/lang"/>
-    </genClasses>
-    <genClasses ecoreClass="org.eclipse.wst.ws.internal.model.v10.registry.ecore#//DocumentRoot">
-      <genFeatures property="None" children="true" createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.wst.ws.internal.model.v10.registry.ecore#//DocumentRoot/mixed"/>
-      <genFeatures property="None" notify="false" createChild="true" ecoreFeature="ecore:EReference org.eclipse.wst.ws.internal.model.v10.registry.ecore#//DocumentRoot/xMLNSPrefixMap"/>
-      <genFeatures property="None" notify="false" createChild="true" ecoreFeature="ecore:EReference org.eclipse.wst.ws.internal.model.v10.registry.ecore#//DocumentRoot/xSISchemaLocation"/>
-      <genFeatures property="None" notify="false" createChild="true" ecoreFeature="ecore:EReference org.eclipse.wst.ws.internal.model.v10.registry.ecore#//DocumentRoot/description"/>
-      <genFeatures property="None" notify="false" createChild="true" ecoreFeature="ecore:EReference org.eclipse.wst.ws.internal.model.v10.registry.ecore#//DocumentRoot/name"/>
-      <genFeatures property="None" notify="false" createChild="true" ecoreFeature="ecore:EReference org.eclipse.wst.ws.internal.model.v10.registry.ecore#//DocumentRoot/registry"/>
-    </genClasses>
-    <genClasses ecoreClass="org.eclipse.wst.ws.internal.model.v10.registry.ecore#//Name">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.wst.ws.internal.model.v10.registry.ecore#//Name/value"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.wst.ws.internal.model.v10.registry.ecore#//Name/lang"/>
-    </genClasses>
-    <genClasses ecoreClass="org.eclipse.wst.ws.internal.model.v10.registry.ecore#//Registry">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference org.eclipse.wst.ws.internal.model.v10.registry.ecore#//Registry/name"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference org.eclipse.wst.ws.internal.model.v10.registry.ecore#//Registry/description"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.wst.ws.internal.model.v10.registry.ecore#//Registry/id"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.wst.ws.internal.model.v10.registry.ecore#//Registry/location"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.wst.ws.internal.model.v10.registry.ecore#//Registry/ref"/>
-    </genClasses>
-  </genPackages>
-  <genPackages prefix="UDDIRegistry" basePackage="org.eclipse.wst.ws.internal.model.v10"
-      resource="XML" ecorePackage="org.eclipse.wst.ws.internal.model.v10.uddiregistry.ecore#/">
-    <genClasses ecoreClass="org.eclipse.wst.ws.internal.model.v10.uddiregistry.ecore#//DocumentRoot">
-      <genFeatures property="None" children="true" createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.wst.ws.internal.model.v10.uddiregistry.ecore#//DocumentRoot/mixed"/>
-      <genFeatures property="None" notify="false" createChild="true" ecoreFeature="ecore:EReference org.eclipse.wst.ws.internal.model.v10.uddiregistry.ecore#//DocumentRoot/xMLNSPrefixMap"/>
-      <genFeatures property="None" notify="false" createChild="true" ecoreFeature="ecore:EReference org.eclipse.wst.ws.internal.model.v10.uddiregistry.ecore#//DocumentRoot/xSISchemaLocation"/>
-      <genFeatures property="None" notify="false" createChild="true" ecoreFeature="ecore:EReference org.eclipse.wst.ws.internal.model.v10.uddiregistry.ecore#//DocumentRoot/taxonomies"/>
-      <genFeatures property="None" notify="false" createChild="true" ecoreFeature="ecore:EReference org.eclipse.wst.ws.internal.model.v10.uddiregistry.ecore#//DocumentRoot/uddiRegistry"/>
-    </genClasses>
-    <genClasses ecoreClass="org.eclipse.wst.ws.internal.model.v10.uddiregistry.ecore#//Taxonomies">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference org.eclipse.wst.ws.internal.model.v10.uddiregistry.ecore#//Taxonomies/taxonomy"/>
-    </genClasses>
-    <genClasses ecoreClass="org.eclipse.wst.ws.internal.model.v10.uddiregistry.ecore#//UDDIRegistry">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.wst.ws.internal.model.v10.uddiregistry.ecore#//UDDIRegistry/version"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.wst.ws.internal.model.v10.uddiregistry.ecore#//UDDIRegistry/discoveryURL"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.wst.ws.internal.model.v10.uddiregistry.ecore#//UDDIRegistry/publicationURL"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.wst.ws.internal.model.v10.uddiregistry.ecore#//UDDIRegistry/securedDiscoveryURL"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.wst.ws.internal.model.v10.uddiregistry.ecore#//UDDIRegistry/securedPublicationURL"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.wst.ws.internal.model.v10.uddiregistry.ecore#//UDDIRegistry/defaultLogin"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.wst.ws.internal.model.v10.uddiregistry.ecore#//UDDIRegistry/defaultPassword"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference org.eclipse.wst.ws.internal.model.v10.uddiregistry.ecore#//UDDIRegistry/taxonomies"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/bundles/org.eclipse.wst.ws/RT.xsd2ecore b/bundles/org.eclipse.wst.ws/RT.xsd2ecore
deleted file mode 100644
index 3bdae80be..000000000
--- a/bundles/org.eclipse.wst.ws/RT.xsd2ecore
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<xsd2ecore:XSD2EcoreMappingRoot xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsd2ecore="http://www.eclipse.org/emf/2002/XSD2Ecore" inputs="Index.xsd#/ http://www.w3.org/2001/xml.xsd#/ Taxonomy.xsd#/ Registry.xsd#/ UDDIRegistry.xsd#/"
-    outputs="org.eclipse.wst.ws.internal.model.v10.taxonomy.ecore#/ org.eclipse.wst.ws.internal.model.v10.registry.ecore#/ org.eclipse.wst.ws.internal.model.v10.rtindex.ecore#/ org.eclipse.wst.ws.internal.model.v10.uddiregistry.ecore#/"
-    topToBottom="true">
-  <nested inputs="http://www.w3.org/2001/xml.xsd#//base;XSDAttributeDeclaration=2"
-      outputs="http://www.w3.org/XML/1998/namespace#//XMLNamespaceDocumentRoot/base"/>
-  <nested inputs="http://www.w3.org/2001/xml.xsd#//id;XSDAttributeDeclaration=3" outputs="http://www.w3.org/XML/1998/namespace#//XMLNamespaceDocumentRoot/id"/>
-  <nested inputs="http://www.w3.org/2001/xml.xsd#//lang;XSDAttributeDeclaration" outputs="http://www.w3.org/XML/1998/namespace#//XMLNamespaceDocumentRoot/lang"/>
-  <nested inputs="http://www.w3.org/2001/xml.xsd#//lang;XSDAttributeDeclaration/XSDSimpleTypeDefinition"
-      outputs="http://www.eclipse.org/emf/2003/XMLType#//Language"/>
-  <nested inputs="http://www.w3.org/2001/xml.xsd#//space;XSDAttributeDeclaration=1"
-      outputs="http://www.w3.org/XML/1998/namespace#//XMLNamespaceDocumentRoot/space"/>
-  <nested inputs="http://www.w3.org/2001/xml.xsd#//space;XSDAttributeDeclaration=1/XSDSimpleTypeDefinition"
-      outputs="http://www.w3.org/XML/1998/namespace#//SpaceType"/>
-  <nested inputs="bundleentry://1839/cache/www.w3.org/2001/XMLSchema.xsd#//string;XSDSimpleTypeDefinition=7"
-      outputs="http://www.eclipse.org/emf/2003/XMLType#//String"/>
-  <nested inputs="Taxonomy.xsd#//Name;XSDComplexTypeDefinition=2" outputs="org.eclipse.wst.ws.internal.model.v10.taxonomy.ecore#//Name">
-    <nested inputs="Taxonomy.xsd#//Name;XSDComplexTypeDefinition=2/XSDAttributeUse"
-        outputs="org.eclipse.wst.ws.internal.model.v10.taxonomy.ecore#//Name/lang"/>
-  </nested>
-  <nested inputs="Taxonomy.xsd#//Category;XSDComplexTypeDefinition=1" outputs="org.eclipse.wst.ws.internal.model.v10.taxonomy.ecore#//Category">
-    <nested inputs="Taxonomy.xsd#//Category;XSDComplexTypeDefinition=1/XSDParticle/XSDModelGroup/XSDParticle"
-        outputs="org.eclipse.wst.ws.internal.model.v10.taxonomy.ecore#//Category/nlname"/>
-    <nested inputs="Taxonomy.xsd#//Category;XSDComplexTypeDefinition=1/XSDParticle/XSDModelGroup/XSDParticle=1"
-        outputs="org.eclipse.wst.ws.internal.model.v10.taxonomy.ecore#//Category/category"/>
-    <nested inputs="Taxonomy.xsd#//Category;XSDComplexTypeDefinition=1/XSDAttributeUse=1"
-        outputs="org.eclipse.wst.ws.internal.model.v10.taxonomy.ecore#//Category/code"/>
-    <nested inputs="Taxonomy.xsd#//Category;XSDComplexTypeDefinition=1/XSDAttributeUse"
-        outputs="org.eclipse.wst.ws.internal.model.v10.taxonomy.ecore#//Category/name"/>
-  </nested>
-  <nested inputs="Taxonomy.xsd#//category;XSDElementDeclaration=1" outputs="org.eclipse.wst.ws.internal.model.v10.taxonomy.ecore#//DocumentRoot/category"/>
-  <nested inputs="Registry.xsd#//Description;XSDComplexTypeDefinition=2" outputs="org.eclipse.wst.ws.internal.model.v10.registry.ecore#//Description">
-    <nested inputs="Registry.xsd#//Description;XSDComplexTypeDefinition=2/XSDAttributeUse"
-        outputs="org.eclipse.wst.ws.internal.model.v10.registry.ecore#//Description/lang"/>
-  </nested>
-  <nested inputs="Registry.xsd#//description;XSDElementDeclaration=2" outputs="org.eclipse.wst.ws.internal.model.v10.registry.ecore#//DocumentRoot/description"/>
-  <nested inputs="Index.xsd#//Description;XSDComplexTypeDefinition=2" outputs="org.eclipse.wst.ws.internal.model.v10.rtindex.ecore#//Description">
-    <nested inputs="Index.xsd#//Description;XSDComplexTypeDefinition=2/XSDAttributeUse"
-        outputs="org.eclipse.wst.ws.internal.model.v10.rtindex.ecore#//Description/lang"/>
-  </nested>
-  <nested inputs="Index.xsd#//description;XSDElementDeclaration=2" outputs="org.eclipse.wst.ws.internal.model.v10.rtindex.ecore#//DocumentRoot/description"/>
-  <nested inputs="Index.xsd#//Name;XSDComplexTypeDefinition=1" outputs="org.eclipse.wst.ws.internal.model.v10.rtindex.ecore#//Name">
-    <nested inputs="Index.xsd#//Name;XSDComplexTypeDefinition=1/XSDAttributeUse" outputs="org.eclipse.wst.ws.internal.model.v10.rtindex.ecore#//Name/lang"/>
-  </nested>
-  <nested inputs="Registry.xsd#//Name;XSDComplexTypeDefinition=1" outputs="org.eclipse.wst.ws.internal.model.v10.registry.ecore#//Name">
-    <nested inputs="Registry.xsd#//Name;XSDComplexTypeDefinition=1/XSDAttributeUse"
-        outputs="org.eclipse.wst.ws.internal.model.v10.registry.ecore#//Name/lang"/>
-  </nested>
-  <nested inputs="bundleentry://1839/cache/www.w3.org/2001/XMLSchema.xsd#//anyURI;XSDSimpleTypeDefinition=23"
-      outputs="http://www.eclipse.org/emf/2003/XMLType#//AnyURI"/>
-  <nested inputs="Registry.xsd#//Registry;XSDComplexTypeDefinition" outputs="org.eclipse.wst.ws.internal.model.v10.registry.ecore#//Registry">
-    <nested inputs="Registry.xsd#//Registry;XSDComplexTypeDefinition/XSDParticle/XSDModelGroup/XSDParticle"
-        outputs="org.eclipse.wst.ws.internal.model.v10.registry.ecore#//Registry/name"/>
-    <nested inputs="Registry.xsd#//Registry;XSDComplexTypeDefinition/XSDParticle/XSDModelGroup/XSDParticle=1"
-        outputs="org.eclipse.wst.ws.internal.model.v10.registry.ecore#//Registry/description"/>
-    <nested inputs="Registry.xsd#//Registry;XSDComplexTypeDefinition/XSDAttributeUse"
-        outputs="org.eclipse.wst.ws.internal.model.v10.registry.ecore#//Registry/id"/>
-    <nested inputs="Registry.xsd#//Registry;XSDComplexTypeDefinition/XSDAttributeUse=2"
-        outputs="org.eclipse.wst.ws.internal.model.v10.registry.ecore#//Registry/location"/>
-    <nested inputs="Registry.xsd#//Registry;XSDComplexTypeDefinition/XSDAttributeUse=1"
-        outputs="org.eclipse.wst.ws.internal.model.v10.registry.ecore#//Registry/ref"/>
-  </nested>
-  <nested inputs="Taxonomy.xsd#//Taxonomy;XSDComplexTypeDefinition" outputs="org.eclipse.wst.ws.internal.model.v10.taxonomy.ecore#//Taxonomy">
-    <nested inputs="Taxonomy.xsd#//Taxonomy;XSDComplexTypeDefinition/XSDParticle/XSDModelGroup/XSDParticle"
-        outputs="org.eclipse.wst.ws.internal.model.v10.taxonomy.ecore#//Taxonomy/nlname"/>
-    <nested inputs="Taxonomy.xsd#//Taxonomy;XSDComplexTypeDefinition/XSDParticle/XSDModelGroup/XSDParticle=1"
-        outputs="org.eclipse.wst.ws.internal.model.v10.taxonomy.ecore#//Taxonomy/category"/>
-    <nested inputs="Taxonomy.xsd#//Taxonomy;XSDComplexTypeDefinition/XSDAttributeUse"
-        outputs="org.eclipse.wst.ws.internal.model.v10.taxonomy.ecore#//Taxonomy/id"/>
-    <nested inputs="Taxonomy.xsd#//Taxonomy;XSDComplexTypeDefinition/XSDAttributeUse=2"
-        outputs="org.eclipse.wst.ws.internal.model.v10.taxonomy.ecore#//Taxonomy/location"/>
-    <nested inputs="Taxonomy.xsd#//Taxonomy;XSDComplexTypeDefinition/XSDAttributeUse=3"
-        outputs="org.eclipse.wst.ws.internal.model.v10.taxonomy.ecore#//Taxonomy/name"/>
-    <nested inputs="Taxonomy.xsd#//Taxonomy;XSDComplexTypeDefinition/XSDAttributeUse=1"
-        outputs="org.eclipse.wst.ws.internal.model.v10.taxonomy.ecore#//Taxonomy/ref"/>
-    <nested inputs="Taxonomy.xsd#//Taxonomy;XSDComplexTypeDefinition/XSDAttributeUse=4"
-        outputs="org.eclipse.wst.ws.internal.model.v10.taxonomy.ecore#//Taxonomy/tmodelKey"/>
-  </nested>
-  <nested inputs="Index.xsd#//Index;XSDComplexTypeDefinition" outputs="org.eclipse.wst.ws.internal.model.v10.rtindex.ecore#//Index">
-    <nested inputs="Index.xsd#//Index;XSDComplexTypeDefinition/XSDParticle/XSDModelGroup/XSDParticle"
-        outputs="org.eclipse.wst.ws.internal.model.v10.rtindex.ecore#//Index/name"/>
-    <nested inputs="Index.xsd#//Index;XSDComplexTypeDefinition/XSDParticle/XSDModelGroup/XSDParticle=1"
-        outputs="org.eclipse.wst.ws.internal.model.v10.rtindex.ecore#//Index/description"/>
-    <nested inputs="Index.xsd#//Index;XSDComplexTypeDefinition/XSDParticle/XSDModelGroup/XSDParticle=2"
-        outputs="org.eclipse.wst.ws.internal.model.v10.rtindex.ecore#//Index/registry"/>
-    <nested inputs="Index.xsd#//Index;XSDComplexTypeDefinition/XSDParticle/XSDModelGroup/XSDParticle=3"
-        outputs="org.eclipse.wst.ws.internal.model.v10.rtindex.ecore#//Index/taxonomy"/>
-  </nested>
-  <nested inputs="Index.xsd#//index;XSDElementDeclaration" outputs="org.eclipse.wst.ws.internal.model.v10.rtindex.ecore#//DocumentRoot/index"/>
-  <nested inputs="Registry.xsd#//name;XSDElementDeclaration=1" outputs="org.eclipse.wst.ws.internal.model.v10.registry.ecore#//DocumentRoot/name"/>
-  <nested inputs="Index.xsd#//name;XSDElementDeclaration=1" outputs="org.eclipse.wst.ws.internal.model.v10.rtindex.ecore#//DocumentRoot/name"/>
-  <nested inputs="Taxonomy.xsd#//name;XSDElementDeclaration=2" outputs="org.eclipse.wst.ws.internal.model.v10.taxonomy.ecore#//DocumentRoot/name"/>
-  <nested inputs="Registry.xsd#//registry;XSDElementDeclaration" outputs="org.eclipse.wst.ws.internal.model.v10.registry.ecore#//DocumentRoot/registry"/>
-  <nested inputs="Taxonomy.xsd#//taxonomy;XSDElementDeclaration" outputs="org.eclipse.wst.ws.internal.model.v10.taxonomy.ecore#//DocumentRoot/taxonomy"/>
-  <nested inputs="UDDIRegistry.xsd#//Taxonomies;XSDComplexTypeDefinition=1" outputs="org.eclipse.wst.ws.internal.model.v10.uddiregistry.ecore#//Taxonomies">
-    <nested inputs="UDDIRegistry.xsd#//Taxonomies;XSDComplexTypeDefinition=1/XSDParticle/XSDModelGroup/XSDParticle"
-        outputs="org.eclipse.wst.ws.internal.model.v10.uddiregistry.ecore#//Taxonomies/taxonomy"/>
-  </nested>
-  <nested inputs="UDDIRegistry.xsd#//taxonomies;XSDElementDeclaration=1" outputs="org.eclipse.wst.ws.internal.model.v10.uddiregistry.ecore#//DocumentRoot/taxonomies"/>
-  <nested inputs="UDDIRegistry.xsd#//UDDIRegistry;XSDComplexTypeDefinition" outputs="org.eclipse.wst.ws.internal.model.v10.uddiregistry.ecore#//UDDIRegistry">
-    <nested inputs="UDDIRegistry.xsd#//UDDIRegistry;XSDComplexTypeDefinition/XSDParticle/XSDModelGroup/XSDParticle"
-        outputs="org.eclipse.wst.ws.internal.model.v10.uddiregistry.ecore#//UDDIRegistry/version"/>
-    <nested inputs="UDDIRegistry.xsd#//UDDIRegistry;XSDComplexTypeDefinition/XSDParticle/XSDModelGroup/XSDParticle=1"
-        outputs="org.eclipse.wst.ws.internal.model.v10.uddiregistry.ecore#//UDDIRegistry/discoveryURL"/>
-    <nested inputs="UDDIRegistry.xsd#//UDDIRegistry;XSDComplexTypeDefinition/XSDParticle/XSDModelGroup/XSDParticle=2"
-        outputs="org.eclipse.wst.ws.internal.model.v10.uddiregistry.ecore#//UDDIRegistry/publicationURL"/>
-    <nested inputs="UDDIRegistry.xsd#//UDDIRegistry;XSDComplexTypeDefinition/XSDParticle/XSDModelGroup/XSDParticle=3"
-        outputs="org.eclipse.wst.ws.internal.model.v10.uddiregistry.ecore#//UDDIRegistry/securedDiscoveryURL"/>
-    <nested inputs="UDDIRegistry.xsd#//UDDIRegistry;XSDComplexTypeDefinition/XSDParticle/XSDModelGroup/XSDParticle=4"
-        outputs="org.eclipse.wst.ws.internal.model.v10.uddiregistry.ecore#//UDDIRegistry/securedPublicationURL"/>
-    <nested inputs="UDDIRegistry.xsd#//UDDIRegistry;XSDComplexTypeDefinition/XSDParticle/XSDModelGroup/XSDParticle=5"
-        outputs="org.eclipse.wst.ws.internal.model.v10.uddiregistry.ecore#//UDDIRegistry/defaultLogin"/>
-    <nested inputs="UDDIRegistry.xsd#//UDDIRegistry;XSDComplexTypeDefinition/XSDParticle/XSDModelGroup/XSDParticle=6"
-        outputs="org.eclipse.wst.ws.internal.model.v10.uddiregistry.ecore#//UDDIRegistry/defaultPassword"/>
-    <nested inputs="UDDIRegistry.xsd#//UDDIRegistry;XSDComplexTypeDefinition/XSDParticle/XSDModelGroup/XSDParticle=7"
-        outputs="org.eclipse.wst.ws.internal.model.v10.uddiregistry.ecore#//UDDIRegistry/taxonomies"/>
-  </nested>
-  <nested inputs="UDDIRegistry.xsd#//uddiRegistry;XSDElementDeclaration" outputs="org.eclipse.wst.ws.internal.model.v10.uddiregistry.ecore#//DocumentRoot/uddiRegistry"/>
-</xsd2ecore:XSD2EcoreMappingRoot>
diff --git a/bundles/org.eclipse.wst.ws/about.html b/bundles/org.eclipse.wst.ws/about.html
deleted file mode 100644
index 6f6b96c4c..000000000
--- a/bundles/org.eclipse.wst.ws/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws/build.properties b/bundles/org.eclipse.wst.ws/build.properties
deleted file mode 100644
index 9eea0cb04..000000000
--- a/bundles/org.eclipse.wst.ws/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = plugin.xml,\
-               .,\
-               META-INF/,\
-               plugin.properties,\
-               about.html
-src.includes = component.xml
diff --git a/bundles/org.eclipse.wst.ws/component.xml b/bundles/org.eclipse.wst.ws/component.xml
deleted file mode 100644
index 0ce35c629..000000000
--- 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" fragment="false"/>
-   <plugin id="org.eclipse.wst.ws.parser" fragment="false"/>
-   <plugin id="org.eclipse.wst.ws.ui" fragment="false"/>
-   <plugin id="org.eclipse.wst.ws.explorer" fragment="false"/>
-   <plugin id="org.apache.axis" fragment="false"/>
-   <plugin id="org.apache.wsil4j" fragment="false"/>
-   <plugin id="org.uddi4j" fragment="false"/>
-</component>
diff --git a/bundles/org.eclipse.wst.ws/model/Index.xsd b/bundles/org.eclipse.wst.ws/model/Index.xsd
deleted file mode 100644
index edcf540a7..000000000
--- a/bundles/org.eclipse.wst.ws/model/Index.xsd
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema
-xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-xmlns:rti="http://eclipse.org/wst/ws/internal/model/v10/rtindex"
-xmlns:reg="http://eclipse.org/wst/ws/internal/model/v10/registry"
-xmlns:tax="http://eclipse.org/wst/ws/internal/model/v10/taxonomy"
-targetNamespace="http://eclipse.org/wst/ws/internal/model/v10/rtindex">
-
-	<xsd:import
-	namespace="http://www.w3.org/XML/1998/namespace"
-	schemaLocation="http://www.w3.org/2001/xml.xsd"/>
-
-	<xsd:import
-	namespace="http://eclipse.org/wst/ws/internal/model/v10/registry"
-	schemaLocation="./Registry.xsd"/>
-
-	<xsd:import
-	namespace="http://eclipse.org/wst/ws/internal/model/v10/taxonomy"
-	schemaLocation="./Taxonomy.xsd"/>
-
-	<xsd:element name="index" type="rti:Index"/>
-	
-	<xsd:complexType name="Index">
-		<xsd:sequence>
-			<xsd:element name="name" type="rti:Name" minOccurs="1" maxOccurs="unbounded"/>
-			<xsd:element name="description" type="rti:Description" minOccurs="1" maxOccurs="unbounded"/>
-			<xsd:element ref="reg:registry" minOccurs="0" maxOccurs="unbounded"/>
-			<xsd:element ref="tax:taxonomy" minOccurs="0" maxOccurs="unbounded"/>
-		</xsd:sequence>
-	</xsd:complexType>
-
-	<xsd:element name="name" type="rti:Name"/>
-
-	<xsd:complexType name="Name">
-		<xsd:simpleContent>
-			<xsd:extension base="xsd:string">
-				<xsd:attribute ref="xml:lang" use="optional"/>
-			</xsd:extension>
-		</xsd:simpleContent>
-	</xsd:complexType>
-
-	<xsd:element name="description" type="rti:Description"/>
-
-	<xsd:complexType name="Description">
-		<xsd:simpleContent>
-			<xsd:extension base="xsd:string">
-				<xsd:attribute ref="xml:lang" use="optional"/>
-			</xsd:extension>
-		</xsd:simpleContent>
-	</xsd:complexType>
-
-</xsd:schema>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws/model/Registry.xsd b/bundles/org.eclipse.wst.ws/model/Registry.xsd
deleted file mode 100644
index 9ae196867..000000000
--- a/bundles/org.eclipse.wst.ws/model/Registry.xsd
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema
-xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-xmlns:reg="http://eclipse.org/wst/ws/internal/model/v10/registry"
-targetNamespace="http://eclipse.org/wst/ws/internal/model/v10/registry">
-
-	<xsd:import
-	namespace="http://www.w3.org/XML/1998/namespace"
-	schemaLocation="http://www.w3.org/2001/xml.xsd"/>
-
-	<xsd:element name="registry" type="reg:Registry"/>
-	
-	<xsd:complexType name="Registry">
-		<xsd:sequence>
-			<xsd:element name="name" type="reg:Name" minOccurs="1" maxOccurs="unbounded"/>
-			<xsd:element name="description" type="reg:Description" minOccurs="1" maxOccurs="unbounded"/>
-		</xsd:sequence>
-		<xsd:attribute name="id" type="xsd:anyURI" use="optional"/>
-		<xsd:attribute name="ref" type="xsd:anyURI" use="optional"/>
-		<xsd:attribute name="location" type="xsd:anyURI" use="optional"/>
-	</xsd:complexType>
-
-	<xsd:element name="name" type="reg:Name"/>
-
-	<xsd:complexType name="Name">
-		<xsd:simpleContent>
-			<xsd:extension base="xsd:string">
-				<xsd:attribute ref="xml:lang" use="optional"/>
-			</xsd:extension>
-		</xsd:simpleContent>
-	</xsd:complexType>
-
-	<xsd:element name="description" type="reg:Description"/>
-
-	<xsd:complexType name="Description">
-		<xsd:simpleContent>
-			<xsd:extension base="xsd:string">
-				<xsd:attribute ref="xml:lang" use="optional"/>
-			</xsd:extension>
-		</xsd:simpleContent>
-	</xsd:complexType>
-
-</xsd:schema>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws/model/Taxonomy.xsd b/bundles/org.eclipse.wst.ws/model/Taxonomy.xsd
deleted file mode 100644
index 0b56aec8b..000000000
--- a/bundles/org.eclipse.wst.ws/model/Taxonomy.xsd
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema
-xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-xmlns:tax="http://eclipse.org/wst/ws/internal/model/v10/taxonomy"
-targetNamespace="http://eclipse.org/wst/ws/internal/model/v10/taxonomy">
-
-	<xsd:import
-	namespace="http://www.w3.org/XML/1998/namespace"
-	schemaLocation="http://www.w3.org/2001/xml.xsd"/>
-
-	<xsd:element name="taxonomy" type="tax:Taxonomy"/>
-
-	<xsd:complexType name="Taxonomy">
-		<xsd:sequence>
-			<xsd:element name="nlname" type="tax:Name" minOccurs="0" maxOccurs="unbounded"/>
-			<xsd:element name="category" type="tax:Category" minOccurs="0" maxOccurs="unbounded"/>
-		</xsd:sequence>
-		<xsd:attribute name="id" type="xsd:anyURI" use="optional"/>
-		<xsd:attribute name="ref" type="xsd:anyURI" use="optional"/>
-		<xsd:attribute name="location" type="xsd:anyURI" use="optional"/>
-		<xsd:attribute name="name" type="xsd:string" use="optional"/>
-		<xsd:attribute name="tmodelKey" type="xsd:string" use="required"/>
-	</xsd:complexType>
-
-	<xsd:element name="category" type="tax:Category"/>
-
-	<xsd:complexType name="Category">
-		<xsd:sequence>
-			<xsd:element name="nlname" type="tax:Name" minOccurs="0" maxOccurs="unbounded"/>
-			<xsd:element name="category" type="tax:Category" minOccurs="0" maxOccurs="unbounded"/>
-		</xsd:sequence>
-		<xsd:attribute name="name" type="xsd:string"/>
-		<xsd:attribute name="code" type="xsd:string"/>
-	</xsd:complexType>
-
-	<xsd:element name="name" type="tax:Name"/>
-
-	<xsd:complexType name="Name">
-		<xsd:simpleContent>
-			<xsd:extension base="xsd:string">
-				<xsd:attribute ref="xml:lang" use="optional"/>
-			</xsd:extension>
-		</xsd:simpleContent>
-	</xsd:complexType>
-
-</xsd:schema>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws/model/UDDIRegistry.xsd b/bundles/org.eclipse.wst.ws/model/UDDIRegistry.xsd
deleted file mode 100644
index ac36261b5..000000000
--- a/bundles/org.eclipse.wst.ws/model/UDDIRegistry.xsd
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema
-xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-xmlns:urg="http://eclipse.org/wst/ws/internal/model/v10/uddiregistry"
-xmlns:reg="http://eclipse.org/wst/ws/internal/model/v10/registry"
-xmlns:tax="http://eclipse.org/wst/ws/internal/model/v10/taxonomy"
-targetNamespace="http://eclipse.org/wst/ws/internal/model/v10/uddiregistry">
-
-	<xsd:import
-	namespace="http://www.w3.org/XML/1998/namespace"
-	schemaLocation="http://www.w3.org/2001/xml.xsd"/>
-	
-	<xsd:import
-	namespace="http://eclipse.org/wst/ws/internal/model/v10/registry"
-	schemaLocation="./Registry.xsd"/>
-
-	<xsd:import
-	namespace="http://eclipse.org/wst/ws/internal/model/v10/taxonomy"
-	schemaLocation="./Taxonomy.xsd"/>
-
-	<xsd:element name="uddiRegistry" type="urg:UDDIRegistry"/>
-	
-	<xsd:complexType name="UDDIRegistry">
-		<xsd:complexContent>
-			<xsd:extension base="reg:Registry">
-				<xsd:sequence>
-					<xsd:element name="version" type="xsd:string" minOccurs="1"/>
-					<xsd:element name="discoveryURL" type="xsd:anyURI" minOccurs="1"/>
-					<xsd:element name="publicationURL" type="xsd:anyURI" minOccurs="1"/>
-					<xsd:element name="securedDiscoveryURL" type="xsd:anyURI" minOccurs="1"/>
-					<xsd:element name="securedPublicationURL" type="xsd:anyURI" minOccurs="1"/>
-					<xsd:element name="defaultLogin" type="xsd:string" minOccurs="1"/>
-					<xsd:element name="defaultPassword" type="xsd:string" minOccurs="1"/>
-					<xsd:element name="taxonomies" type="urg:Taxonomies" minOccurs="0"/>
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	
-	<xsd:element name="taxonomies" type="urg:Taxonomies"/>
-	
-	<xsd:complexType name="Taxonomies">
-		<xsd:sequence>
-			<xsd:element ref="tax:taxonomy" minOccurs="0" maxOccurs="unbounded"/>
-		</xsd:sequence>
-	</xsd:complexType>
-
-</xsd:schema>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws/org.eclipse.wst.ws.internal.model.v10.registry.ecore b/bundles/org.eclipse.wst.ws/org.eclipse.wst.ws.internal.model.v10.registry.ecore
deleted file mode 100644
index f4042d499..000000000
--- a/bundles/org.eclipse.wst.ws/org.eclipse.wst.ws.internal.model.v10.registry.ecore
+++ /dev/null
@@ -1,141 +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="registry"
-    nsURI="http://eclipse.org/wst/ws/internal/model/v10/registry" nsPrefix="registry">
-  <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-    <details key="documentation" value="&#xD;&#xA;   See http://www.w3.org/XML/1998/namespace.html and&#xD;&#xA;   http://www.w3.org/TR/REC-xml for information about this namespace.&#xD;&#xA;&#xD;&#xA;    This schema document describes the XML namespace, in a form&#xD;&#xA;    suitable for import by other schema documents.  &#xD;&#xA;&#xD;&#xA;    Note that local names in this namespace are intended to be defined&#xD;&#xA;    only by the World Wide Web Consortium or its subgroups.  The&#xD;&#xA;    following names are currently defined in this namespace and should&#xD;&#xA;    not be used with conflicting semantics by any Working Group,&#xD;&#xA;    specification, or document instance:&#xD;&#xA;&#xD;&#xA;    base (as an attribute name): denotes an attribute whose value&#xD;&#xA;         provides a URI to be used as the base for interpreting any&#xD;&#xA;         relative URIs in the scope of the element on which it&#xD;&#xA;         appears; its value is inherited.  This name is reserved&#xD;&#xA;         by virtue of its definition in the XML Base specification.&#xD;&#xA;&#xD;&#xA;    id   (as an attribute name): denotes an attribute whose value&#xD;&#xA;         should be interpreted as if declared to be of type ID.&#xD;&#xA;         The xml:id specification is not yet a W3C Recommendation,&#xD;&#xA;         but this attribute is included here to facilitate experimentation&#xD;&#xA;         with the mechanisms it proposes.  Note that it is _not_ included&#xD;&#xA;         in the specialAttrs attribute group.&#xD;&#xA;&#xD;&#xA;    lang (as an attribute name): denotes an attribute whose value&#xD;&#xA;         is a language code for the natural language of the content of&#xD;&#xA;         any element; its value is inherited.  This name is reserved&#xD;&#xA;         by virtue of its definition in the XML specification.&#xD;&#xA;  &#xD;&#xA;    space (as an attribute name): denotes an attribute whose&#xD;&#xA;         value is a keyword indicating what whitespace processing&#xD;&#xA;         discipline is intended for the content of the element; its&#xD;&#xA;         value is inherited.  This name is reserved by virtue of its&#xD;&#xA;         definition in the XML specification.&#xD;&#xA;&#xD;&#xA;    Father (in any context at all): denotes Jon Bosak, the chair of &#xD;&#xA;         the original XML Working Group.  This name is reserved by &#xD;&#xA;         the following decision of the W3C XML Plenary and &#xD;&#xA;         XML Coordination groups:&#xD;&#xA;&#xD;&#xA;             In appreciation for his vision, leadership and dedication&#xD;&#xA;             the W3C XML Plenary on this 10th day of February, 2000&#xD;&#xA;             reserves for Jon Bosak in perpetuity the XML name&#xD;&#xA;             xml:Father&#xD;&#xA;  &#xD;&#xA;This schema defines attributes and an attribute group&#xD;&#xA;        suitable for use by&#xD;&#xA;        schemas wishing to allow xml:base, xml:lang, xml:space or xml:id&#xD;&#xA;        attributes on elements they define.&#xD;&#xA;&#xD;&#xA;        To enable this, such a schema must import this schema&#xD;&#xA;        for the XML namespace, e.g. as follows:&#xD;&#xA;        &amp;lt;schema . . .&amp;gt;&#xD;&#xA;         . . .&#xD;&#xA;         &amp;lt;import namespace=&quot;http://www.w3.org/XML/1998/namespace&quot;&#xD;&#xA;                    schemaLocation=&quot;http://www.w3.org/2001/xml.xsd&quot;/&amp;gt;&#xD;&#xA;&#xD;&#xA;        Subsequently, qualified reference to any of the attributes&#xD;&#xA;        or the group defined below will have the desired effect, e.g.&#xD;&#xA;&#xD;&#xA;        &amp;lt;type . . .&amp;gt;&#xD;&#xA;         . . .&#xD;&#xA;         &amp;lt;attributeGroup ref=&quot;xml:specialAttrs&quot;/&amp;gt;&#xD;&#xA; &#xD;&#xA;         will define a type which will schema-validate an instance&#xD;&#xA;         element with any of those attributes&#xD;&#xA;In keeping with the XML Schema WG's standard versioning&#xD;&#xA;   policy, this schema document will persist at&#xD;&#xA;   http://www.w3.org/2005/08/xml.xsd.&#xD;&#xA;   At the date of issue it can also be found at&#xD;&#xA;   http://www.w3.org/2001/xml.xsd.&#xD;&#xA;   The schema document at that URI may however change in the future,&#xD;&#xA;   in order to remain compatible with the latest version of XML Schema&#xD;&#xA;   itself, or with the XML namespace itself.  In other words, if the XML&#xD;&#xA;   Schema or XML namespaces change, the version of this document at&#xD;&#xA;   http://www.w3.org/2001/xml.xsd will change&#xD;&#xA;   accordingly; the version at&#xD;&#xA;   http://www.w3.org/2005/08/xml.xsd will not change.&#xD;&#xA;  "/>
-  </eAnnotations>
-  <eClassifiers xsi:type="ecore:EClass" name="Description">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Description"/>
-      <details key="kind" value="simple"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="name" value=":0"/>
-        <details key="kind" value="simple"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="lang" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Language">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="lang"/>
-        <details key="namespace" value="http://www.w3.org/XML/1998/namespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DocumentRoot">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value=""/>
-      <details key="kind" value="mixed"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="mixed" unique="false" upperBound="-1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="elementWildcard"/>
-        <details key="name" value=":mixed"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="xMLNSPrefixMap" unique="false"
-        upperBound="-1" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EStringToStringMapEntry"
-        transient="true" containment="true" resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="xmlns:prefix"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="xSISchemaLocation" unique="false"
-        upperBound="-1" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EStringToStringMapEntry"
-        transient="true" containment="true" resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="xsi:schemaLocation"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="description" upperBound="-2"
-        eType="#//Description" volatile="true" transient="true" derived="true" containment="true"
-        resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="description"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="name" upperBound="-2" eType="#//Name"
-        volatile="true" transient="true" derived="true" containment="true" resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="name"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="registry" upperBound="-2"
-        eType="#//Registry" volatile="true" transient="true" derived="true" containment="true"
-        resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="registry"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Name">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Name"/>
-      <details key="kind" value="simple"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="name" value=":0"/>
-        <details key="kind" value="simple"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="lang" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Language">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="lang"/>
-        <details key="namespace" value="http://www.w3.org/XML/1998/namespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Registry">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Registry"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="name" lowerBound="1" upperBound="-1"
-        eType="#//Name" containment="true" resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="name"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="description" lowerBound="1"
-        upperBound="-1" eType="#//Description" containment="true" resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="description"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//AnyURI">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="id"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="location" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//AnyURI">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="location"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="ref" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//AnyURI">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="ref"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/bundles/org.eclipse.wst.ws/org.eclipse.wst.ws.internal.model.v10.rtindex.ecore b/bundles/org.eclipse.wst.ws/org.eclipse.wst.ws.internal.model.v10.rtindex.ecore
deleted file mode 100644
index 5a095c5ac..000000000
--- a/bundles/org.eclipse.wst.ws/org.eclipse.wst.ws.internal.model.v10.rtindex.ecore
+++ /dev/null
@@ -1,140 +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="rtindex"
-    nsURI="http://eclipse.org/wst/ws/internal/model/v10/rtindex" nsPrefix="rtindex">
-  <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-    <details key="documentation" value="&#xD;&#xA;   See http://www.w3.org/XML/1998/namespace.html and&#xD;&#xA;   http://www.w3.org/TR/REC-xml for information about this namespace.&#xD;&#xA;&#xD;&#xA;    This schema document describes the XML namespace, in a form&#xD;&#xA;    suitable for import by other schema documents.  &#xD;&#xA;&#xD;&#xA;    Note that local names in this namespace are intended to be defined&#xD;&#xA;    only by the World Wide Web Consortium or its subgroups.  The&#xD;&#xA;    following names are currently defined in this namespace and should&#xD;&#xA;    not be used with conflicting semantics by any Working Group,&#xD;&#xA;    specification, or document instance:&#xD;&#xA;&#xD;&#xA;    base (as an attribute name): denotes an attribute whose value&#xD;&#xA;         provides a URI to be used as the base for interpreting any&#xD;&#xA;         relative URIs in the scope of the element on which it&#xD;&#xA;         appears; its value is inherited.  This name is reserved&#xD;&#xA;         by virtue of its definition in the XML Base specification.&#xD;&#xA;&#xD;&#xA;    id   (as an attribute name): denotes an attribute whose value&#xD;&#xA;         should be interpreted as if declared to be of type ID.&#xD;&#xA;         The xml:id specification is not yet a W3C Recommendation,&#xD;&#xA;         but this attribute is included here to facilitate experimentation&#xD;&#xA;         with the mechanisms it proposes.  Note that it is _not_ included&#xD;&#xA;         in the specialAttrs attribute group.&#xD;&#xA;&#xD;&#xA;    lang (as an attribute name): denotes an attribute whose value&#xD;&#xA;         is a language code for the natural language of the content of&#xD;&#xA;         any element; its value is inherited.  This name is reserved&#xD;&#xA;         by virtue of its definition in the XML specification.&#xD;&#xA;  &#xD;&#xA;    space (as an attribute name): denotes an attribute whose&#xD;&#xA;         value is a keyword indicating what whitespace processing&#xD;&#xA;         discipline is intended for the content of the element; its&#xD;&#xA;         value is inherited.  This name is reserved by virtue of its&#xD;&#xA;         definition in the XML specification.&#xD;&#xA;&#xD;&#xA;    Father (in any context at all): denotes Jon Bosak, the chair of &#xD;&#xA;         the original XML Working Group.  This name is reserved by &#xD;&#xA;         the following decision of the W3C XML Plenary and &#xD;&#xA;         XML Coordination groups:&#xD;&#xA;&#xD;&#xA;             In appreciation for his vision, leadership and dedication&#xD;&#xA;             the W3C XML Plenary on this 10th day of February, 2000&#xD;&#xA;             reserves for Jon Bosak in perpetuity the XML name&#xD;&#xA;             xml:Father&#xD;&#xA;  &#xD;&#xA;This schema defines attributes and an attribute group&#xD;&#xA;        suitable for use by&#xD;&#xA;        schemas wishing to allow xml:base, xml:lang, xml:space or xml:id&#xD;&#xA;        attributes on elements they define.&#xD;&#xA;&#xD;&#xA;        To enable this, such a schema must import this schema&#xD;&#xA;        for the XML namespace, e.g. as follows:&#xD;&#xA;        &amp;lt;schema . . .&amp;gt;&#xD;&#xA;         . . .&#xD;&#xA;         &amp;lt;import namespace=&quot;http://www.w3.org/XML/1998/namespace&quot;&#xD;&#xA;                    schemaLocation=&quot;http://www.w3.org/2001/xml.xsd&quot;/&amp;gt;&#xD;&#xA;&#xD;&#xA;        Subsequently, qualified reference to any of the attributes&#xD;&#xA;        or the group defined below will have the desired effect, e.g.&#xD;&#xA;&#xD;&#xA;        &amp;lt;type . . .&amp;gt;&#xD;&#xA;         . . .&#xD;&#xA;         &amp;lt;attributeGroup ref=&quot;xml:specialAttrs&quot;/&amp;gt;&#xD;&#xA; &#xD;&#xA;         will define a type which will schema-validate an instance&#xD;&#xA;         element with any of those attributes&#xD;&#xA;In keeping with the XML Schema WG's standard versioning&#xD;&#xA;   policy, this schema document will persist at&#xD;&#xA;   http://www.w3.org/2005/08/xml.xsd.&#xD;&#xA;   At the date of issue it can also be found at&#xD;&#xA;   http://www.w3.org/2001/xml.xsd.&#xD;&#xA;   The schema document at that URI may however change in the future,&#xD;&#xA;   in order to remain compatible with the latest version of XML Schema&#xD;&#xA;   itself, or with the XML namespace itself.  In other words, if the XML&#xD;&#xA;   Schema or XML namespaces change, the version of this document at&#xD;&#xA;   http://www.w3.org/2001/xml.xsd will change&#xD;&#xA;   accordingly; the version at&#xD;&#xA;   http://www.w3.org/2005/08/xml.xsd will not change.&#xD;&#xA;  "/>
-  </eAnnotations>
-  <eClassifiers xsi:type="ecore:EClass" name="Description">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Description"/>
-      <details key="kind" value="simple"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="name" value=":0"/>
-        <details key="kind" value="simple"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="lang" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Language">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="lang"/>
-        <details key="namespace" value="http://www.w3.org/XML/1998/namespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DocumentRoot">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value=""/>
-      <details key="kind" value="mixed"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="mixed" unique="false" upperBound="-1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="elementWildcard"/>
-        <details key="name" value=":mixed"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="xMLNSPrefixMap" unique="false"
-        upperBound="-1" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EStringToStringMapEntry"
-        transient="true" containment="true" resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="xmlns:prefix"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="xSISchemaLocation" unique="false"
-        upperBound="-1" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EStringToStringMapEntry"
-        transient="true" containment="true" resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="xsi:schemaLocation"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="description" upperBound="-2"
-        eType="#//Description" volatile="true" transient="true" derived="true" containment="true"
-        resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="description"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="index" upperBound="-2"
-        eType="#//Index" volatile="true" transient="true" derived="true" containment="true"
-        resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="index"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="name" upperBound="-2" eType="#//Name"
-        volatile="true" transient="true" derived="true" containment="true" resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="name"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Index">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Index"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="name" lowerBound="1" upperBound="-1"
-        eType="#//Name" containment="true" resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="name"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="description" lowerBound="1"
-        upperBound="-1" eType="#//Description" containment="true" resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="description"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="registry" upperBound="-1"
-        eType="ecore:EClass org.eclipse.wst.ws.internal.model.v10.registry.ecore#//Registry"
-        containment="true" resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="registry"/>
-        <details key="namespace" value="http://eclipse.org/wst/ws/internal/model/v10/registry"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="taxonomy" upperBound="-1"
-        eType="ecore:EClass org.eclipse.wst.ws.internal.model.v10.taxonomy.ecore#//Taxonomy"
-        containment="true" resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="taxonomy"/>
-        <details key="namespace" value="http://eclipse.org/wst/ws/internal/model/v10/taxonomy"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Name">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Name"/>
-      <details key="kind" value="simple"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="name" value=":0"/>
-        <details key="kind" value="simple"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="lang" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Language">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="lang"/>
-        <details key="namespace" value="http://www.w3.org/XML/1998/namespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/bundles/org.eclipse.wst.ws/org.eclipse.wst.ws.internal.model.v10.taxonomy.ecore b/bundles/org.eclipse.wst.ws/org.eclipse.wst.ws.internal.model.v10.taxonomy.ecore
deleted file mode 100644
index 01889b0e8..000000000
--- a/bundles/org.eclipse.wst.ws/org.eclipse.wst.ws.internal.model.v10.taxonomy.ecore
+++ /dev/null
@@ -1,167 +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="taxonomy"
-    nsURI="http://eclipse.org/wst/ws/internal/model/v10/taxonomy" nsPrefix="taxonomy">
-  <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-    <details key="documentation" value="&#xD;&#xA;   See http://www.w3.org/XML/1998/namespace.html and&#xD;&#xA;   http://www.w3.org/TR/REC-xml for information about this namespace.&#xD;&#xA;&#xD;&#xA;    This schema document describes the XML namespace, in a form&#xD;&#xA;    suitable for import by other schema documents.  &#xD;&#xA;&#xD;&#xA;    Note that local names in this namespace are intended to be defined&#xD;&#xA;    only by the World Wide Web Consortium or its subgroups.  The&#xD;&#xA;    following names are currently defined in this namespace and should&#xD;&#xA;    not be used with conflicting semantics by any Working Group,&#xD;&#xA;    specification, or document instance:&#xD;&#xA;&#xD;&#xA;    base (as an attribute name): denotes an attribute whose value&#xD;&#xA;         provides a URI to be used as the base for interpreting any&#xD;&#xA;         relative URIs in the scope of the element on which it&#xD;&#xA;         appears; its value is inherited.  This name is reserved&#xD;&#xA;         by virtue of its definition in the XML Base specification.&#xD;&#xA;&#xD;&#xA;    id   (as an attribute name): denotes an attribute whose value&#xD;&#xA;         should be interpreted as if declared to be of type ID.&#xD;&#xA;         The xml:id specification is not yet a W3C Recommendation,&#xD;&#xA;         but this attribute is included here to facilitate experimentation&#xD;&#xA;         with the mechanisms it proposes.  Note that it is _not_ included&#xD;&#xA;         in the specialAttrs attribute group.&#xD;&#xA;&#xD;&#xA;    lang (as an attribute name): denotes an attribute whose value&#xD;&#xA;         is a language code for the natural language of the content of&#xD;&#xA;         any element; its value is inherited.  This name is reserved&#xD;&#xA;         by virtue of its definition in the XML specification.&#xD;&#xA;  &#xD;&#xA;    space (as an attribute name): denotes an attribute whose&#xD;&#xA;         value is a keyword indicating what whitespace processing&#xD;&#xA;         discipline is intended for the content of the element; its&#xD;&#xA;         value is inherited.  This name is reserved by virtue of its&#xD;&#xA;         definition in the XML specification.&#xD;&#xA;&#xD;&#xA;    Father (in any context at all): denotes Jon Bosak, the chair of &#xD;&#xA;         the original XML Working Group.  This name is reserved by &#xD;&#xA;         the following decision of the W3C XML Plenary and &#xD;&#xA;         XML Coordination groups:&#xD;&#xA;&#xD;&#xA;             In appreciation for his vision, leadership and dedication&#xD;&#xA;             the W3C XML Plenary on this 10th day of February, 2000&#xD;&#xA;             reserves for Jon Bosak in perpetuity the XML name&#xD;&#xA;             xml:Father&#xD;&#xA;  &#xD;&#xA;This schema defines attributes and an attribute group&#xD;&#xA;        suitable for use by&#xD;&#xA;        schemas wishing to allow xml:base, xml:lang, xml:space or xml:id&#xD;&#xA;        attributes on elements they define.&#xD;&#xA;&#xD;&#xA;        To enable this, such a schema must import this schema&#xD;&#xA;        for the XML namespace, e.g. as follows:&#xD;&#xA;        &amp;lt;schema . . .&amp;gt;&#xD;&#xA;         . . .&#xD;&#xA;         &amp;lt;import namespace=&quot;http://www.w3.org/XML/1998/namespace&quot;&#xD;&#xA;                    schemaLocation=&quot;http://www.w3.org/2001/xml.xsd&quot;/&amp;gt;&#xD;&#xA;&#xD;&#xA;        Subsequently, qualified reference to any of the attributes&#xD;&#xA;        or the group defined below will have the desired effect, e.g.&#xD;&#xA;&#xD;&#xA;        &amp;lt;type . . .&amp;gt;&#xD;&#xA;         . . .&#xD;&#xA;         &amp;lt;attributeGroup ref=&quot;xml:specialAttrs&quot;/&amp;gt;&#xD;&#xA; &#xD;&#xA;         will define a type which will schema-validate an instance&#xD;&#xA;         element with any of those attributes&#xD;&#xA;In keeping with the XML Schema WG's standard versioning&#xD;&#xA;   policy, this schema document will persist at&#xD;&#xA;   http://www.w3.org/2005/08/xml.xsd.&#xD;&#xA;   At the date of issue it can also be found at&#xD;&#xA;   http://www.w3.org/2001/xml.xsd.&#xD;&#xA;   The schema document at that URI may however change in the future,&#xD;&#xA;   in order to remain compatible with the latest version of XML Schema&#xD;&#xA;   itself, or with the XML namespace itself.  In other words, if the XML&#xD;&#xA;   Schema or XML namespaces change, the version of this document at&#xD;&#xA;   http://www.w3.org/2001/xml.xsd will change&#xD;&#xA;   accordingly; the version at&#xD;&#xA;   http://www.w3.org/2005/08/xml.xsd will not change.&#xD;&#xA;  "/>
-  </eAnnotations>
-  <eClassifiers xsi:type="ecore:EClass" name="Category">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Category"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="nlname" upperBound="-1"
-        eType="#//Name" containment="true" resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="nlname"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="category" upperBound="-1"
-        eType="#//Category" containment="true" resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="category"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="code" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="code"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="name"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DocumentRoot">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value=""/>
-      <details key="kind" value="mixed"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="mixed" unique="false" upperBound="-1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="elementWildcard"/>
-        <details key="name" value=":mixed"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="xMLNSPrefixMap" unique="false"
-        upperBound="-1" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EStringToStringMapEntry"
-        transient="true" containment="true" resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="xmlns:prefix"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="xSISchemaLocation" unique="false"
-        upperBound="-1" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EStringToStringMapEntry"
-        transient="true" containment="true" resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="xsi:schemaLocation"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="category" upperBound="-2"
-        eType="#//Category" volatile="true" transient="true" derived="true" containment="true"
-        resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="category"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="name" upperBound="-2" eType="#//Name"
-        volatile="true" transient="true" derived="true" containment="true" resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="name"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="taxonomy" upperBound="-2"
-        eType="#//Taxonomy" volatile="true" transient="true" derived="true" containment="true"
-        resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="taxonomy"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Name">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Name"/>
-      <details key="kind" value="simple"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="name" value=":0"/>
-        <details key="kind" value="simple"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="lang" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Language">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="lang"/>
-        <details key="namespace" value="http://www.w3.org/XML/1998/namespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Taxonomy">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Taxonomy"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="nlname" upperBound="-1"
-        eType="#//Name" containment="true" resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="nlname"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="category" upperBound="-1"
-        eType="#//Category" containment="true" resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="category"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//AnyURI">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="id"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="location" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//AnyURI">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="location"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="name"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="ref" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//AnyURI">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="ref"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="tmodelKey" unique="false"
-        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="tmodelKey"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/bundles/org.eclipse.wst.ws/org.eclipse.wst.ws.internal.model.v10.uddiregistry.ecore b/bundles/org.eclipse.wst.ws/org.eclipse.wst.ws.internal.model.v10.uddiregistry.ecore
deleted file mode 100644
index e8ce60204..000000000
--- a/bundles/org.eclipse.wst.ws/org.eclipse.wst.ws.internal.model.v10.uddiregistry.ecore
+++ /dev/null
@@ -1,133 +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="uddiregistry"
-    nsURI="http://eclipse.org/wst/ws/internal/model/v10/uddiregistry" nsPrefix="uddiregistry">
-  <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-    <details key="documentation" value="&#xD;&#xA;   See http://www.w3.org/XML/1998/namespace.html and&#xD;&#xA;   http://www.w3.org/TR/REC-xml for information about this namespace.&#xD;&#xA;&#xD;&#xA;    This schema document describes the XML namespace, in a form&#xD;&#xA;    suitable for import by other schema documents.  &#xD;&#xA;&#xD;&#xA;    Note that local names in this namespace are intended to be defined&#xD;&#xA;    only by the World Wide Web Consortium or its subgroups.  The&#xD;&#xA;    following names are currently defined in this namespace and should&#xD;&#xA;    not be used with conflicting semantics by any Working Group,&#xD;&#xA;    specification, or document instance:&#xD;&#xA;&#xD;&#xA;    base (as an attribute name): denotes an attribute whose value&#xD;&#xA;         provides a URI to be used as the base for interpreting any&#xD;&#xA;         relative URIs in the scope of the element on which it&#xD;&#xA;         appears; its value is inherited.  This name is reserved&#xD;&#xA;         by virtue of its definition in the XML Base specification.&#xD;&#xA;&#xD;&#xA;    id   (as an attribute name): denotes an attribute whose value&#xD;&#xA;         should be interpreted as if declared to be of type ID.&#xD;&#xA;         The xml:id specification is not yet a W3C Recommendation,&#xD;&#xA;         but this attribute is included here to facilitate experimentation&#xD;&#xA;         with the mechanisms it proposes.  Note that it is _not_ included&#xD;&#xA;         in the specialAttrs attribute group.&#xD;&#xA;&#xD;&#xA;    lang (as an attribute name): denotes an attribute whose value&#xD;&#xA;         is a language code for the natural language of the content of&#xD;&#xA;         any element; its value is inherited.  This name is reserved&#xD;&#xA;         by virtue of its definition in the XML specification.&#xD;&#xA;  &#xD;&#xA;    space (as an attribute name): denotes an attribute whose&#xD;&#xA;         value is a keyword indicating what whitespace processing&#xD;&#xA;         discipline is intended for the content of the element; its&#xD;&#xA;         value is inherited.  This name is reserved by virtue of its&#xD;&#xA;         definition in the XML specification.&#xD;&#xA;&#xD;&#xA;    Father (in any context at all): denotes Jon Bosak, the chair of &#xD;&#xA;         the original XML Working Group.  This name is reserved by &#xD;&#xA;         the following decision of the W3C XML Plenary and &#xD;&#xA;         XML Coordination groups:&#xD;&#xA;&#xD;&#xA;             In appreciation for his vision, leadership and dedication&#xD;&#xA;             the W3C XML Plenary on this 10th day of February, 2000&#xD;&#xA;             reserves for Jon Bosak in perpetuity the XML name&#xD;&#xA;             xml:Father&#xD;&#xA;  &#xD;&#xA;This schema defines attributes and an attribute group&#xD;&#xA;        suitable for use by&#xD;&#xA;        schemas wishing to allow xml:base, xml:lang, xml:space or xml:id&#xD;&#xA;        attributes on elements they define.&#xD;&#xA;&#xD;&#xA;        To enable this, such a schema must import this schema&#xD;&#xA;        for the XML namespace, e.g. as follows:&#xD;&#xA;        &amp;lt;schema . . .&amp;gt;&#xD;&#xA;         . . .&#xD;&#xA;         &amp;lt;import namespace=&quot;http://www.w3.org/XML/1998/namespace&quot;&#xD;&#xA;                    schemaLocation=&quot;http://www.w3.org/2001/xml.xsd&quot;/&amp;gt;&#xD;&#xA;&#xD;&#xA;        Subsequently, qualified reference to any of the attributes&#xD;&#xA;        or the group defined below will have the desired effect, e.g.&#xD;&#xA;&#xD;&#xA;        &amp;lt;type . . .&amp;gt;&#xD;&#xA;         . . .&#xD;&#xA;         &amp;lt;attributeGroup ref=&quot;xml:specialAttrs&quot;/&amp;gt;&#xD;&#xA; &#xD;&#xA;         will define a type which will schema-validate an instance&#xD;&#xA;         element with any of those attributes&#xD;&#xA;In keeping with the XML Schema WG's standard versioning&#xD;&#xA;   policy, this schema document will persist at&#xD;&#xA;   http://www.w3.org/2005/08/xml.xsd.&#xD;&#xA;   At the date of issue it can also be found at&#xD;&#xA;   http://www.w3.org/2001/xml.xsd.&#xD;&#xA;   The schema document at that URI may however change in the future,&#xD;&#xA;   in order to remain compatible with the latest version of XML Schema&#xD;&#xA;   itself, or with the XML namespace itself.  In other words, if the XML&#xD;&#xA;   Schema or XML namespaces change, the version of this document at&#xD;&#xA;   http://www.w3.org/2001/xml.xsd will change&#xD;&#xA;   accordingly; the version at&#xD;&#xA;   http://www.w3.org/2005/08/xml.xsd will not change.&#xD;&#xA;  "/>
-  </eAnnotations>
-  <eClassifiers xsi:type="ecore:EClass" name="DocumentRoot">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value=""/>
-      <details key="kind" value="mixed"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="mixed" unique="false" upperBound="-1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="elementWildcard"/>
-        <details key="name" value=":mixed"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="xMLNSPrefixMap" unique="false"
-        upperBound="-1" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EStringToStringMapEntry"
-        transient="true" containment="true" resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="xmlns:prefix"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="xSISchemaLocation" unique="false"
-        upperBound="-1" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EStringToStringMapEntry"
-        transient="true" containment="true" resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="xsi:schemaLocation"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="taxonomies" upperBound="-2"
-        eType="#//Taxonomies" volatile="true" transient="true" derived="true" containment="true"
-        resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="taxonomies"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="uddiRegistry" upperBound="-2"
-        eType="#//UDDIRegistry" volatile="true" transient="true" derived="true" containment="true"
-        resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="uddiRegistry"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Taxonomies">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Taxonomies"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="taxonomy" upperBound="-1"
-        eType="ecore:EClass org.eclipse.wst.ws.internal.model.v10.taxonomy.ecore#//Taxonomy"
-        containment="true" resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="taxonomy"/>
-        <details key="namespace" value="http://eclipse.org/wst/ws/internal/model/v10/taxonomy"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="UDDIRegistry" eSuperTypes="org.eclipse.wst.ws.internal.model.v10.registry.ecore#//Registry">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="UDDIRegistry"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="version" unique="false"
-        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="version"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="discoveryURL" unique="false"
-        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//AnyURI">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="discoveryURL"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="publicationURL" unique="false"
-        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//AnyURI">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="publicationURL"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="securedDiscoveryURL" unique="false"
-        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//AnyURI">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="securedDiscoveryURL"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="securedPublicationURL"
-        unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//AnyURI">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="securedPublicationURL"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="defaultLogin" unique="false"
-        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="defaultLogin"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="defaultPassword" unique="false"
-        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="defaultPassword"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="taxonomies" eType="#//Taxonomies"
-        containment="true" resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="taxonomies"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/bundles/org.eclipse.wst.ws/plugin.properties b/bundles/org.eclipse.wst.ws/plugin.properties
deleted file mode 100644
index 691114cb3..000000000
--- a/bundles/org.eclipse.wst.ws/plugin.properties
+++ /dev/null
@@ -1,33 +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
-
-# Extension point names
-XP_WEB_SERVICE_LOCATOR=Web Service Locator
-X_WEB_SERVICE_LOCATOR_WORKSPACE=Workspace Web Service Locator
-X_WEB_SERVICE_LOCATOR_CATEGORY_WORKSPACE=Workspace WSDL documents
-
-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 99268cbae..000000000
--- a/bundles/org.eclipse.wst.ws/plugin.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
-   <!-- The following extension point is internal, though likely to be promoted for public use, possibly with changes, in a future release. -->
-   <extension-point id="locator" name="%XP_WEB_SERVICE_LOCATOR" schema="schema/webServiceLocator.exsd"/>
-
-   <!-- Extension providing workspace WSDL discovery -->   
-   <extension
-         point="org.eclipse.wst.ws.locator">
-
-      <webServiceLocatorCategory
-            id="org.eclipse.wst.ws.internal.wsfinder.category.workspace"
-            label="%X_WEB_SERVICE_LOCATOR_CATEGORY_WORKSPACE"/>
-
-      <webServiceLocator
-            class="org.eclipse.wst.ws.internal.wsfinder.WorkspaceWSDLLocator"
-            id="org.eclipse.wst.ws.internal.wsfinder.WorkspaceWSDLLocator"
-            category="org.eclipse.wst.ws.internal.wsfinder.category.workspace"
-            label="%X_WEB_SERVICE_LOCATOR_WORKSPACE">
-         org.eclipse.wst.ws.internal.wsfinder
-      </webServiceLocator>
-
-   </extension>
-    
-</plugin>
diff --git a/bundles/org.eclipse.wst.ws/schema/webServiceLocator.exsd b/bundles/org.eclipse.wst.ws/schema/webServiceLocator.exsd
deleted file mode 100644
index 0d97d0d03..000000000
--- a/bundles/org.eclipse.wst.ws/schema/webServiceLocator.exsd
+++ /dev/null
@@ -1,197 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.ws">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.wst.ws" id="webServiceLocator" name="Web Service Locator"/>
-      </appInfo>
-      <documentation>
-         This extension point is provided to register locators that extend AbstractWebServiceLocator.
-         These locators are used by WebServiceFinder to locate Web services for the purpose of Web service discovery.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <all>
-            <element ref="webServiceLocator" minOccurs="1" maxOccurs="unbounded"/>
-            <element ref="webServiceLocatorCategory" minOccurs="1" maxOccurs="unbounded"/>
-         </all>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  A fully qualified identifier of the target extension point.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  An optional identifier of the extension instance.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  An optional name of the extension instance.
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="webServiceLocator">
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  A unique identifier for the Web Service Locator.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The fully qualified class name for the locator class which extends AbstractWebServiceLocator.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="label" type="string" use="required">
-            <annotation>
-               <documentation>
-                  A short label to identify the Web Service Locator.
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="description" type="string">
-            <annotation>
-               <documentation>
-                  Optionally, a description of the purpose of the Web Service Locator.
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="icon" type="string">
-            <annotation>
-               <documentation>
-                  Optionally, an icon that represents the Web Service Locator.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="category" type="string">
-            <annotation>
-               <documentation>
-                  Optionally, a category to which the Web Service Locator should belong.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="webServiceLocatorCategory">
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  A unique identifier for the category of Web Service Locators.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="label" type="string" use="required">
-            <annotation>
-               <documentation>
-                  A short label for the category of Web Service Locators.
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="description" type="string">
-            <annotation>
-               <documentation>
-                  Optionally, a description of the category of Web Service Locators.
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="icon" type="string">
-            <annotation>
-               <documentation>
-                  Optionally, an icon that represents the category of Web Service Locators.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="category" type="string">
-            <annotation>
-               <documentation>
-                  Optionally, a parent category under which the Web Service Locator
-                  category should be grouped. If absent, the category is considered
-                  to be a root category.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         &lt;b&gt;This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.&lt;/b&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         Extenders should implement &lt;code&gt;org.eclipse.wst.ws.internal.wsfinder.AbstractWebServiceLocator&lt;/code&gt;.  The WebServiceLocatorRegistry uses this extension point to retrieve all locators.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;
-All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
-this distribution, and is available at &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/WstWSPlugin.properties b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/WstWSPlugin.properties
deleted file mode 100644
index 157295e22..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/WstWSPlugin.properties
+++ /dev/null
@@ -1,37 +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
-###############################################################################
-
-#
-# GetMonitorCommand
-#
-MSG_ERROR_UNABLE_TO_START_MONITOR=IWAB0001E Unable to monitor port {0} of {1}.
-
-#
-# WSIComplianceUtils
-#
-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
-CANCEL_DESCRIPTION=Cancel
-
-#
-#	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.
-NOT_OK=Cannot continue due to WS-I non-compliance
-
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/WstWSPluginMessages.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/WstWSPluginMessages.java
deleted file mode 100644
index 46d31af4e..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/WstWSPluginMessages.java
+++ /dev/null
@@ -1,41 +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;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class WstWSPluginMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.wst.ws.internal.WstWSPlugin";//$NON-NLS-1$
-
-	private WstWSPluginMessages() {
-		// Do not instantiate
-	}
-
-	public static String MSG_ERROR_UNABLE_TO_START_MONITOR;
-	public static String IGNORE_LABEL;
-	public static String IGNORE_DESCRIPTION;
-	public static String IGNORE_ALL_LABEL;
-	public static String IGNORE_ALL_DESCRIPTION;
-	public static String CANCEL_LABEL;
-	public static String CANCEL_DESCRIPTION;
-	public static String WSI_SSBP_ERROR;
-	public static String WSI_SSBP_WARNING;
-	public static String WSI_SSBP_INCOMPLIANT_RUNTIME;
-	public static String WSI_AP_ERROR;
-	public static String WSI_AP_WARNING;	
-	public static String WSI_AP_INCOMPLIANT_RUNTIME;
-	public static String NOT_OK;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, WstWSPluginMessages.class);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/common/BundleUtils.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/common/BundleUtils.java
deleted file mode 100644
index 6eeca66b8..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/common/BundleUtils.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.ws.internal.common;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import org.eclipse.core.runtime.Platform;
-import org.osgi.framework.Bundle;
-
-public class BundleUtils
-{
-  static public URL getURLFromBundle( String bundleId, String path ) throws MalformedURLException
-  {
-    Bundle      bundle     = Platform.getBundle( bundleId );
-    URL         installURL = bundle.getEntry("/");
-    URL         fileURL    = new URL(installURL, path );
-    
-    return fileURL;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/common/LiveWSDLFilter.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/common/LiveWSDLFilter.java
deleted file mode 100644
index 0dfb0504d..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/common/LiveWSDLFilter.java
+++ /dev/null
@@ -1,102 +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.wst.ws.internal.common;
-
-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.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.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)
-    {
-    	System.out.println("Throwing exception " + t.getMessage());
-      live_ = false;
-    }
-    finally
-    {
-      finish_ = true;
-    }
-  }
-
-  private boolean validateWSDL() throws WSDLException, MalformedURLException, IOException, WWWAuthenticationException
-  {
-  	WebServicesParserExt parser = new WebServicesParserExt();
-  	Definition definition = parser.getWSDLDefinitionVerbose(wsdlURL_);
-  	System.out.println("wsdlURL_ " + wsdlURL_.toString());
-    Map services = definition.getServices();
-    Iterator serviceIterator = services.values().iterator();
-    System.out.println("serviceIterator " + serviceIterator.toString());
-    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.wst.ws/src/org/eclipse/wst/ws/internal/common/WSDLUtility.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/common/WSDLUtility.java
deleted file mode 100644
index 67929b9c6..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/common/WSDLUtility.java
+++ /dev/null
@@ -1,151 +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.common;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.List;
-import java.util.Map;
-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.core.resources.IResource;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-/**
- * Utilities for working with a workspace WSDL file resource.
- * 
- * @author joan
- *
- */
-
-public class WSDLUtility {
-
-	protected Definition definition_ = null;
-	protected IResource resource_ = null;
-	protected String serviceName_ = "";
-	protected URL url_ = null;
-	
-	public WSDLUtility(IResource res)
-	{
-		super();
-		resource_ = res;
-		buildDefinition();		
-	}
-	
-	protected boolean buildDefinition()
-	{
-		
-		if (resource_.getType() == IResource.FILE)
-	    {        
-	        String ext = resource_.getFileExtension();
-	        if (ext != null && ext.equalsIgnoreCase("wsdl"))
-	        {
-		      	String resPath = resource_.getFullPath().toString();
-		        WebServicesParser parser = new WebServicesParser();
-		      			      	
-		      	try {
-		      		definition_ = parser.getWSDLDefinition("platform:" + resPath);
-		      	   if (definition_ == null){
-		      		   throw new Exception("WebServiceUtils.getWSDLAddress - error parsing platform:/resource" + resPath);
-		      	   }
-		      	}
-		      	catch (Exception e){
-		      		return false;
-		      	}
-	        }
-	    }
-		serviceName_ = "";		
-		return true;
-	}
-	
-	/**
-	 * Determines the name of the service defined in the WSDL file
-	 * 
-	 * @param resource The workspace resource for the WSDL file
-	 * @return Returns a string containing the value of the name attribute of the service element 
-	 */
-	public String getServiceName()
-	{
-		if (serviceName_.equals(""))
-		{
-			   Map servicesMap = definition_.getServices();
-		  	   Object[] services = servicesMap.values().toArray();
-		  	   
-		  	   // TODO: here can detect if no service tag - send appropriate message
-		  	   // TODO: what if > 1 service defined in the WSDL?
-		  	   // for now return the first service name found...
-		  	   for (int i = 0; i < services.length; i++) {
-				   Service s = (Service)services[i];
-				   String qString = s.getQName().toString();
-				   
-				   //get name only from qualified string
-				   int index1 = qString.indexOf("}")+1;  //$NON-NLS-1$
-				   int index2 = qString.length();
-				   
-				   serviceName_ = qString.substring(index1, index2);				   
-		  	   }  		  
-		}
-	  	return serviceName_;
-	}
-	
-	public URL getWSDLAddress() 
-    {
-	   if (url_ == null)
-	   {	   
-	       String locationURI = null;
-	  	   Map servicesMap = definition_.getServices();
-	  	   Object[] services = servicesMap.values().toArray();
-	  	   
-	  	   // TODO: here can detect if no service tag - send appropriate message
-	  	   // TODO: what if > 1 service defined in the WSDL?
-	  	   for (int i = 0; i < services.length; i++) {
-			   Service s = (Service)services[i];
-			   Map portsMap = s.getPorts();
-			   Object[] ports = portsMap.values().toArray();
-	
-			   // TODO: here can detect if > 1 port for the service - determine how to handle
-			   for (int j = 0; j < ports.length; j++) {
-					Port p = (Port)ports[j];
-					List extList = p.getExtensibilityElements();
-					
-					for (int k = 0; j < extList.size(); j++){
-					      ExtensibilityElement extElement = (ExtensibilityElement)extList.get(k);
-					      if (extElement instanceof SOAPAddress)
-					      {  
-					        locationURI = ((SOAPAddress)extElement).getLocationURI();
-					      }
-					      else if (extElement instanceof HTTPAddress)
-					       {
-					        locationURI = ((HTTPAddress)extElement).getLocationURI();						        
-					      }
-					      else
-					      {
-					    	  //TODO: if not SOAP or HTTP - how do we want to handle it... 
-					      }
-					 }					
-			   }
-	  	   }  		    	
-	  	 
-		    try {
-		         url_ = new URL(locationURI + "?" + resource_.getFileExtension());	         
-		    }
-		    catch (MalformedURLException malExc){
-		    	
-		    }	  		      
-	    }
-	   return url_;
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/data/LabelsAndIds.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/data/LabelsAndIds.java
deleted file mode 100644
index 5a06b36f1..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/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.wst.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.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 538caa25e..000000000
--- 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 72d08f09d..000000000
--- 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 3b3b43589..000000000
--- 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 6661a82e0..000000000
--- 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 41336fbd9..000000000
--- 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 8d6270c6a..000000000
--- 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 c23721b8e..000000000
--- 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 ec0cfd8bb..000000000
--- 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 44819e36b..000000000
--- 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 72f297a11..000000000
--- 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 8e793ba7c..000000000
--- 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 62fc05805..000000000
--- 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 0ade7cb29..000000000
--- 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 be468da8c..000000000
--- 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 661a6dfc3..000000000
--- 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 41a10f739..000000000
--- 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 d8fa4f764..000000000
--- 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/ext/WebServiceExecutable.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/ext/WebServiceExecutable.java
deleted file mode 100644
index 6877bb9b1..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/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.wst.ws.internal.ext;
-
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
-* 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 AbstractDataModelOperation getFinishCommand();
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/ext/WebServiceExtension.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/ext/WebServiceExtension.java
deleted file mode 100644
index 0f932a8ee..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/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.wst.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 Object 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.wst.ws/src/org/eclipse/wst/ws/internal/ext/WebServiceExtensionImpl.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/ext/WebServiceExtensionImpl.java
deleted file mode 100644
index c9b0c841c..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/ext/WebServiceExtensionImpl.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.ext;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.wst.common.environment.EnvironmentService;
-import org.eclipse.wst.common.environment.ILog;
-
-
-
-
-
-/**
-* 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 ILog	log_;
-	
-  /*
-  * The ConfigElement that holds extension info
-  */
-  protected IConfigurationElement configElement_;
-
-  /*
-  * The extension executable 
-  */
-  protected WebServiceExecutable webServiceExecutable_;
-  
-
-  public WebServiceExtensionImpl(IConfigurationElement configElement)
-  {
-    configElement_ = configElement;
-    log_ = EnvironmentService.getEclipseLog();
-  }
-
-  // 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 Object getWebServiceExecutableExtension()
-  {
-    if(webServiceExecutable_ != null) return webServiceExecutable_;
-
-    try{
-      return configElement_.createExecutableExtension("class");
-    }catch (CoreException e){
-      log_.log(ILog.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.wst.ws/src/org/eclipse/wst/ws/internal/ext/WebServiceExtensionRegistry.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/ext/WebServiceExtensionRegistry.java
deleted file mode 100644
index fd19bcbd9..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/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.wst.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.wst.ws/src/org/eclipse/wst/ws/internal/ext/WebServiceExtensionRegistryImpl.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/ext/WebServiceExtensionRegistryImpl.java
deleted file mode 100644
index f57c7d9e9..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/ext/WebServiceExtensionRegistryImpl.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.wst.ws.internal.ext;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.wst.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 label = elem.getAttribute( "label" );
-      String id =   elem.getAttribute( "id" );      
-      WebServiceExtension webServiceExtension = createWebServiceExtension(elem);	
-      nameExtensionTable_.put(label,webServiceExtension);
-      label_.add(label);
-      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.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 8e277ffe5..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/AbstractClientFragment.java
+++ /dev/null
@@ -1,86 +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.internal.env.core.fragment.CommandFactoryFragment;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-import org.eclipse.wst.ws.internal.wsrt.ISelection;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient;
-
-public abstract class AbstractClientFragment extends CommandFactoryFragment
-{
-  protected IWebServiceClient webServiceClient_;
-  protected IEnvironment       environment_;
-  protected IContext          context_;
-  protected ISelection        selection_;
-  protected String            project_;
-  protected String            module_;
-  protected String            earProject_;
-  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( IEnvironment environment )
-  {
-	environment_ = environment;
-  }
-  
-  public void setContext( IContext context )
-  {	  
-	context_ = context;
-  }
-  
-  public void setSelection( ISelection selection )
-  {
-	selection_ = selection;  
-  }
-  
-  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.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 47f6d7c58..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/AbstractServiceFragment.java
+++ /dev/null
@@ -1,86 +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.internal.env.core.fragment.CommandFactoryFragment;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-import org.eclipse.wst.ws.internal.wsrt.ISelection;
-import org.eclipse.wst.ws.internal.wsrt.IWebService;
-
-public abstract class AbstractServiceFragment extends CommandFactoryFragment
-{
-  protected IWebService webService_;
-  protected IEnvironment environment_;
-  protected IContext    context_;
-  protected ISelection  selection_;
-  protected String      project_;
-  protected String      module_;
-  protected String      earProject_;
-  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( IEnvironment environment )
-  {
-	environment_ = environment;
-  }
-  
-  public void setContext( IContext context )
-  {	  
-	context_ = context;
-  }
-  
-  public void setSelection( ISelection selection )
-  {
-	selection_ = selection;  
-  }
-  
-  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.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 3e87fd800..000000000
--- 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.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.env.core.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_, project_, earProject_);	
-	}
-	
-	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 288adb7a9..000000000
--- 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.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.env.core.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_, project_, earProject_);	
-	}
-	
-	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 1cf5fe760..000000000
--- 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.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.env.core.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_, project_, earProject_);	
-	}
-	
-	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 3ad5ed7a0..000000000
--- 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.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.env.core.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_, project_, earProject_);	
-	}
-	
-	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 588f0b6ff..000000000
--- 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.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.env.core.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_, project_, earProject_);	
-	}
-	
-	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 0e5c024d2..000000000
--- 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.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.env.core.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_, project_, earProject_);	
-	}
-	
-	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 700f68706..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/InstallClientFragment.java
+++ /dev/null
@@ -1,58 +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.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.env.core.SimpleCommandFactory;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-
-public class InstallClientFragment extends AbstractClientFragment 
-{
-	private IContext context_;
-	
-  public InstallClientFragment()
-  {
-  }
-  
-  protected InstallClientFragment( InstallClientFragment fragment )
-  {
-	super( fragment );  
-  }
-  
-  public Object clone() 
-  {
-	return new InstallClientFragment();
-  }
-
-  public ICommandFactory getICommandFactory() 
-  {
-	ICommandFactory factory = null;
-	
-	if( webServiceClient_ == null || !context_.getInstall())
-	{
-	  factory = new SimpleCommandFactory( new Vector() );
-	}
-	else
-	{
-	  factory = webServiceClient_.install( environment_, context_, selection_, project_, earProject_);	
-	}
-	
-	return factory;
-  }
-  
-  public void setContext(IContext context)
-  {
-	  context_=context;
-  }
-}
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 7233de634..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/InstallServiceFragment.java
+++ /dev/null
@@ -1,59 +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.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.env.core.SimpleCommandFactory;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-
-public class InstallServiceFragment extends AbstractServiceFragment 
-{
-	private IContext context_;
-	
-  public InstallServiceFragment()
-  {
-  }
-  
-  protected InstallServiceFragment( InstallServiceFragment fragment )
-  {
-	super( fragment );  
-  }
-  
-  public Object clone() 
-  {
-	return new InstallServiceFragment();
-  }
-
-  public ICommandFactory getICommandFactory() 
-  {
-	ICommandFactory factory = null;
-	
-	if( webService_ == null || !context_.getInstall())
-	{
-	  factory = new SimpleCommandFactory( new Vector() );
-	}
-	else
-	{
-	  factory = webService_.install( environment_, context_, selection_, project_, earProject_);	
-	}
-	
-	return factory;
-  }
-  
-  public void setContext(IContext context)
-  {
-	  context_=context;
-  }
-  
-}
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 6b782b818..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/RunClientFragment.java
+++ /dev/null
@@ -1,58 +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.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.env.core.SimpleCommandFactory;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-
-public class RunClientFragment extends AbstractClientFragment 
-{
-	private IContext context_;
-	
-  public RunClientFragment()
-  {
-  }
-  
-  protected RunClientFragment( RunClientFragment fragment )
-  {
-	super( fragment );  
-  }
-  
-  public Object clone() 
-  {
-	return new RunClientFragment();
-  }
-
-  public ICommandFactory getICommandFactory() 
-  {
-	ICommandFactory factory = null;
-	
-	if( webServiceClient_ == null || !context_.getRun())
-	{
-	  factory = new SimpleCommandFactory( new Vector() );
-	}
-	else
-	{
-	  factory = webServiceClient_.run( environment_, context_, selection_, project_, earProject_);	
-	}
-	
-	return factory;
-  }
-  
-  public void setContext(IContext context)
-  {
-	  context_=context;
-  }
-}
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 6565d1bc0..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/RunServiceFragment.java
+++ /dev/null
@@ -1,59 +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.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.env.core.SimpleCommandFactory;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-
-public class RunServiceFragment extends AbstractServiceFragment 
-{
-	
-	private IContext context_;
-	
-  public RunServiceFragment()
-  {
-  }
-  
-  protected RunServiceFragment( RunServiceFragment fragment )
-  {
-	super( fragment );  
-  }
-  
-  public Object clone() 
-  {
-	return new RunServiceFragment();
-  }
-
-  public ICommandFactory getICommandFactory() 
-  {
-	ICommandFactory factory = null;
-	
-	if( webService_ == null || !context_.getRun())
-	{
-	  factory = new SimpleCommandFactory( new Vector() );
-	}
-	else
-	{
-	  factory = webService_.run( environment_, context_, selection_, project_, earProject_);	
-	}
-	
-	return factory;
-  }
-  
-  public void setContext(IContext context)
-  {
-	  context_=context;	  
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/Description.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/Description.java
deleted file mode 100644
index a080742c0..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/Description.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Description.java,v 1.2 2005/12/03 04:06:49 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.registry;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Description</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.registry.Description#getValue <em>Value</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.registry.Description#getLang <em>Lang</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.ws.internal.model.v10.registry.RegistryPackage#getDescription()
- * @model 
- * @generated
- */
-public interface Description extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Value</em>' attribute.
-	 * @see #setValue(String)
-	 * @see org.eclipse.wst.ws.internal.model.v10.registry.RegistryPackage#getDescription_Value()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.ws.internal.model.v10.registry.Description#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Lang</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Lang</em>' attribute.
-	 * @see #setLang(String)
-	 * @see org.eclipse.wst.ws.internal.model.v10.registry.RegistryPackage#getDescription_Lang()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Language"
-	 * @generated
-	 */
-	String getLang();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.ws.internal.model.v10.registry.Description#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
-	 * @see #getLang()
-	 * @generated
-	 */
-	void setLang(String value);
-
-} // Description
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/DocumentRoot.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/DocumentRoot.java
deleted file mode 100644
index 2308826a5..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/DocumentRoot.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DocumentRoot.java,v 1.2 2005/12/03 04:06:49 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.registry;
-
-import org.eclipse.emf.common.util.EMap;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Document Root</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.registry.DocumentRoot#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.registry.DocumentRoot#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.registry.DocumentRoot#getXSISchemaLocation <em>XSI Schema Location</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.registry.DocumentRoot#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.registry.DocumentRoot#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.registry.DocumentRoot#getRegistry <em>Registry</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.ws.internal.model.v10.registry.RegistryPackage#getDocumentRoot()
- * @model 
- * @generated
- */
-public interface DocumentRoot extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Mixed</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>Mixed</em>' attribute list.
-	 * @see org.eclipse.wst.ws.internal.model.v10.registry.RegistryPackage#getDocumentRoot_Mixed()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
-	 * @generated
-	 */
-	FeatureMap getMixed();
-
-	/**
-	 * Returns the value of the '<em><b>XMLNS Prefix Map</b></em>' map.
-	 * The key is of type {@link java.lang.String},
-	 * and the value is of type {@link java.lang.String},
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>XMLNS Prefix Map</em>' map isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>XMLNS Prefix Map</em>' map.
-	 * @see org.eclipse.wst.ws.internal.model.v10.registry.RegistryPackage#getDocumentRoot_XMLNSPrefixMap()
-	 * @model mapType="org.eclipse.emf.ecore.EStringToStringMapEntry" keyType="java.lang.String" valueType="java.lang.String" transient="true"
-	 * @generated
-	 */
-	EMap getXMLNSPrefixMap();
-
-	/**
-	 * Returns the value of the '<em><b>XSI Schema Location</b></em>' map.
-	 * The key is of type {@link java.lang.String},
-	 * and the value is of type {@link java.lang.String},
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>XSI Schema Location</em>' map isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>XSI Schema Location</em>' map.
-	 * @see org.eclipse.wst.ws.internal.model.v10.registry.RegistryPackage#getDocumentRoot_XSISchemaLocation()
-	 * @model mapType="org.eclipse.emf.ecore.EStringToStringMapEntry" keyType="java.lang.String" valueType="java.lang.String" transient="true"
-	 * @generated
-	 */
-	EMap getXSISchemaLocation();
-
-	/**
-	 * Returns the value of the '<em><b>Description</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Description</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>Description</em>' containment reference.
-	 * @see #setDescription(Description)
-	 * @see org.eclipse.wst.ws.internal.model.v10.registry.RegistryPackage#getDocumentRoot_Description()
-	 * @model containment="true" resolveProxies="false" transient="true" volatile="true" derived="true"
-	 * @generated
-	 */
-	Description getDescription();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.ws.internal.model.v10.registry.DocumentRoot#getDescription <em>Description</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Description</em>' containment reference.
-	 * @see #getDescription()
-	 * @generated
-	 */
-	void setDescription(Description value);
-
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</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>Name</em>' containment reference.
-	 * @see #setName(Name)
-	 * @see org.eclipse.wst.ws.internal.model.v10.registry.RegistryPackage#getDocumentRoot_Name()
-	 * @model containment="true" resolveProxies="false" transient="true" volatile="true" derived="true"
-	 * @generated
-	 */
-	Name getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.ws.internal.model.v10.registry.DocumentRoot#getName <em>Name</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' containment reference.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(Name value);
-
-	/**
-	 * Returns the value of the '<em><b>Registry</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Registry</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>Registry</em>' containment reference.
-	 * @see #setRegistry(Registry)
-	 * @see org.eclipse.wst.ws.internal.model.v10.registry.RegistryPackage#getDocumentRoot_Registry()
-	 * @model containment="true" resolveProxies="false" transient="true" volatile="true" derived="true"
-	 * @generated
-	 */
-	Registry getRegistry();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.ws.internal.model.v10.registry.DocumentRoot#getRegistry <em>Registry</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Registry</em>' containment reference.
-	 * @see #getRegistry()
-	 * @generated
-	 */
-	void setRegistry(Registry value);
-
-} // DocumentRoot
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/Name.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/Name.java
deleted file mode 100644
index 1c3dd398c..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/Name.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Name.java,v 1.2 2005/12/03 04:06:49 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.registry;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Name</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.registry.Name#getValue <em>Value</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.registry.Name#getLang <em>Lang</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.ws.internal.model.v10.registry.RegistryPackage#getName_()
- * @model 
- * @generated
- */
-public interface Name extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Value</em>' attribute.
-	 * @see #setValue(String)
-	 * @see org.eclipse.wst.ws.internal.model.v10.registry.RegistryPackage#getName_Value()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.ws.internal.model.v10.registry.Name#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Lang</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Lang</em>' attribute.
-	 * @see #setLang(String)
-	 * @see org.eclipse.wst.ws.internal.model.v10.registry.RegistryPackage#getName_Lang()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Language"
-	 * @generated
-	 */
-	String getLang();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.ws.internal.model.v10.registry.Name#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
-	 * @see #getLang()
-	 * @generated
-	 */
-	void setLang(String value);
-
-} // Name
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/Registry.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/Registry.java
deleted file mode 100644
index e992da0f8..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/Registry.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Registry.java,v 1.2 2005/12/03 04:06:49 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.registry;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Registry</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.registry.Registry#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.registry.Registry#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.registry.Registry#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.registry.Registry#getLocation <em>Location</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.registry.Registry#getRef <em>Ref</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.ws.internal.model.v10.registry.RegistryPackage#getRegistry()
- * @model 
- * @generated
- */
-public interface Registry extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.wst.ws.internal.model.v10.registry.Name}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</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>Name</em>' containment reference list.
-	 * @see org.eclipse.wst.ws.internal.model.v10.registry.RegistryPackage#getRegistry_Name()
-	 * @model type="org.eclipse.wst.ws.internal.model.v10.registry.Name" containment="true" resolveProxies="false" required="true"
-	 * @generated
-	 */
-	EList getName();
-
-	/**
-	 * Returns the value of the '<em><b>Description</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.wst.ws.internal.model.v10.registry.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Description</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>Description</em>' containment reference list.
-	 * @see org.eclipse.wst.ws.internal.model.v10.registry.RegistryPackage#getRegistry_Description()
-	 * @model type="org.eclipse.wst.ws.internal.model.v10.registry.Description" containment="true" resolveProxies="false" required="true"
-	 * @generated
-	 */
-	EList getDescription();
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.wst.ws.internal.model.v10.registry.RegistryPackage#getRegistry_Id()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.AnyURI"
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.ws.internal.model.v10.registry.Registry#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(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.wst.ws.internal.model.v10.registry.RegistryPackage#getRegistry_Location()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.AnyURI"
-	 * @generated
-	 */
-	String getLocation();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.ws.internal.model.v10.registry.Registry#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>Ref</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Ref</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Ref</em>' attribute.
-	 * @see #setRef(String)
-	 * @see org.eclipse.wst.ws.internal.model.v10.registry.RegistryPackage#getRegistry_Ref()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.AnyURI"
-	 * @generated
-	 */
-	String getRef();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.ws.internal.model.v10.registry.Registry#getRef <em>Ref</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Ref</em>' attribute.
-	 * @see #getRef()
-	 * @generated
-	 */
-	void setRef(String value);
-
-} // Registry
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/RegistryFactory.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/RegistryFactory.java
deleted file mode 100644
index dc241326a..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/RegistryFactory.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: RegistryFactory.java,v 1.2 2005/12/03 04:06:49 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.registry;
-
-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.ws.internal.model.v10.registry.RegistryPackage
- * @generated
- */
-public interface RegistryFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	RegistryFactory eINSTANCE = new org.eclipse.wst.ws.internal.model.v10.registry.impl.RegistryFactoryImpl();
-
-	/**
-	 * Returns a new object of class '<em>Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Description</em>'.
-	 * @generated
-	 */
-	Description createDescription();
-
-	/**
-	 * Returns a new object of class '<em>Document Root</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Document Root</em>'.
-	 * @generated
-	 */
-	DocumentRoot createDocumentRoot();
-
-	/**
-	 * Returns a new object of class '<em>Name</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Name</em>'.
-	 * @generated
-	 */
-	Name createName();
-
-	/**
-	 * Returns a new object of class '<em>Registry</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Registry</em>'.
-	 * @generated
-	 */
-	Registry createRegistry();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	RegistryPackage getRegistryPackage();
-
-} //RegistryFactory
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/RegistryPackage.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/RegistryPackage.java
deleted file mode 100644
index b08f1e536..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/RegistryPackage.java
+++ /dev/null
@@ -1,570 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: RegistryPackage.java,v 1.2 2005/12/03 04:06:49 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.registry;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-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 -->
- * 
- *    See http://www.w3.org/XML/1998/namespace.html and
- *    http://www.w3.org/TR/REC-xml for information about this namespace.
- * 
- *     This schema document describes the XML namespace, in a form
- *     suitable for import by other schema documents.  
- * 
- *     Note that local names in this namespace are intended to be defined
- *     only by the World Wide Web Consortium or its subgroups.  The
- *     following names are currently defined in this namespace and should
- *     not be used with conflicting semantics by any Working Group,
- *     specification, or document instance:
- * 
- *     base (as an attribute name): denotes an attribute whose value
- *          provides a URI to be used as the base for interpreting any
- *          relative URIs in the scope of the element on which it
- *          appears; its value is inherited.  This name is reserved
- *          by virtue of its definition in the XML Base specification.
- * 
- *     id   (as an attribute name): denotes an attribute whose value
- *          should be interpreted as if declared to be of type ID.
- *          The xml:id specification is not yet a W3C Recommendation,
- *          but this attribute is included here to facilitate experimentation
- *          with the mechanisms it proposes.  Note that it is _not_ included
- *          in the specialAttrs attribute group.
- * 
- *     lang (as an attribute name): denotes an attribute whose value
- *          is a language code for the natural language of the content of
- *          any element; its value is inherited.  This name is reserved
- *          by virtue of its definition in the XML specification.
- *   
- *     space (as an attribute name): denotes an attribute whose
- *          value is a keyword indicating what whitespace processing
- *          discipline is intended for the content of the element; its
- *          value is inherited.  This name is reserved by virtue of its
- *          definition in the XML specification.
- * 
- *     Father (in any context at all): denotes Jon Bosak, the chair of 
- *          the original XML Working Group.  This name is reserved by 
- *          the following decision of the W3C XML Plenary and 
- *          XML Coordination groups:
- * 
- *              In appreciation for his vision, leadership and dedication
- *              the W3C XML Plenary on this 10th day of February, 2000
- *              reserves for Jon Bosak in perpetuity the XML name
- *              xml:Father
- *   
- * This schema defines attributes and an attribute group
- *         suitable for use by
- *         schemas wishing to allow xml:base, xml:lang, xml:space or xml:id
- *         attributes on elements they define.
- * 
- *         To enable this, such a schema must import this schema
- *         for the XML namespace, e.g. as follows:
- *         &lt;schema . . .&gt;
- *          . . .
- *          &lt;import namespace="http://www.w3.org/XML/1998/namespace"
- *                     schemaLocation="http://www.w3.org/2001/xml.xsd"/&gt;
- * 
- *         Subsequently, qualified reference to any of the attributes
- *         or the group defined below will have the desired effect, e.g.
- * 
- *         &lt;type . . .&gt;
- *          . . .
- *          &lt;attributeGroup ref="xml:specialAttrs"/&gt;
- *  
- *          will define a type which will schema-validate an instance
- *          element with any of those attributes
- * In keeping with the XML Schema WG's standard versioning
- *    policy, this schema document will persist at
- *    http://www.w3.org/2005/08/xml.xsd.
- *    At the date of issue it can also be found at
- *    http://www.w3.org/2001/xml.xsd.
- *    The schema document at that URI may however change in the future,
- *    in order to remain compatible with the latest version of XML Schema
- *    itself, or with the XML namespace itself.  In other words, if the XML
- *    Schema or XML namespaces change, the version of this document at
- *    http://www.w3.org/2001/xml.xsd will change
- *    accordingly; the version at
- *    http://www.w3.org/2005/08/xml.xsd will not change.
- *   
- * <!-- end-model-doc -->
- * @see org.eclipse.wst.ws.internal.model.v10.registry.RegistryFactory
- * @generated
- */
-public interface RegistryPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "registry";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://eclipse.org/wst/ws/internal/model/v10/registry";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "registry";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	RegistryPackage eINSTANCE = org.eclipse.wst.ws.internal.model.v10.registry.impl.RegistryPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.ws.internal.model.v10.registry.impl.DescriptionImpl <em>Description</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.wst.ws.internal.model.v10.registry.impl.DescriptionImpl
-	 * @see org.eclipse.wst.ws.internal.model.v10.registry.impl.RegistryPackageImpl#getDescription()
-	 * @generated
-	 */
-	int DESCRIPTION = 0;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTION__VALUE = 0;
-
-	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTION__LANG = 1;
-
-	/**
-	 * The number of structural features of the the '<em>Description</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTION_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.ws.internal.model.v10.registry.impl.DocumentRootImpl <em>Document Root</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.wst.ws.internal.model.v10.registry.impl.DocumentRootImpl
-	 * @see org.eclipse.wst.ws.internal.model.v10.registry.impl.RegistryPackageImpl#getDocumentRoot()
-	 * @generated
-	 */
-	int DOCUMENT_ROOT = 1;
-
-	/**
-	 * The feature id for the '<em><b>Mixed</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOCUMENT_ROOT__MIXED = 0;
-
-	/**
-	 * The feature id for the '<em><b>XMLNS Prefix Map</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOCUMENT_ROOT__XMLNS_PREFIX_MAP = 1;
-
-	/**
-	 * The feature id for the '<em><b>XSI Schema Location</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOCUMENT_ROOT__XSI_SCHEMA_LOCATION = 2;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOCUMENT_ROOT__DESCRIPTION = 3;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOCUMENT_ROOT__NAME = 4;
-
-	/**
-	 * The feature id for the '<em><b>Registry</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOCUMENT_ROOT__REGISTRY = 5;
-
-	/**
-	 * The number of structural features of the the '<em>Document Root</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOCUMENT_ROOT_FEATURE_COUNT = 6;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.ws.internal.model.v10.registry.impl.NameImpl <em>Name</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.wst.ws.internal.model.v10.registry.impl.NameImpl
-	 * @see org.eclipse.wst.ws.internal.model.v10.registry.impl.RegistryPackageImpl#getName_()
-	 * @generated
-	 */
-	int NAME = 2;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NAME__VALUE = 0;
-
-	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NAME__LANG = 1;
-
-	/**
-	 * The number of structural features of the the '<em>Name</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NAME_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.ws.internal.model.v10.registry.impl.RegistryImpl <em>Registry</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.wst.ws.internal.model.v10.registry.impl.RegistryImpl
-	 * @see org.eclipse.wst.ws.internal.model.v10.registry.impl.RegistryPackageImpl#getRegistry()
-	 * @generated
-	 */
-	int REGISTRY = 3;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REGISTRY__NAME = 0;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REGISTRY__DESCRIPTION = 1;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REGISTRY__ID = 2;
-
-	/**
-	 * The feature id for the '<em><b>Location</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REGISTRY__LOCATION = 3;
-
-	/**
-	 * The feature id for the '<em><b>Ref</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REGISTRY__REF = 4;
-
-	/**
-	 * The number of structural features of the the '<em>Registry</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REGISTRY_FEATURE_COUNT = 5;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.ws.internal.model.v10.registry.Description <em>Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Description</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.registry.Description
-	 * @generated
-	 */
-	EClass getDescription();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.ws.internal.model.v10.registry.Description#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.registry.Description#getValue()
-	 * @see #getDescription()
-	 * @generated
-	 */
-	EAttribute getDescription_Value();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.ws.internal.model.v10.registry.Description#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Lang</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.registry.Description#getLang()
-	 * @see #getDescription()
-	 * @generated
-	 */
-	EAttribute getDescription_Lang();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.ws.internal.model.v10.registry.DocumentRoot <em>Document Root</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Document Root</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.registry.DocumentRoot
-	 * @generated
-	 */
-	EClass getDocumentRoot();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.wst.ws.internal.model.v10.registry.DocumentRoot#getMixed <em>Mixed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Mixed</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.registry.DocumentRoot#getMixed()
-	 * @see #getDocumentRoot()
-	 * @generated
-	 */
-	EAttribute getDocumentRoot_Mixed();
-
-	/**
-	 * Returns the meta object for the map '{@link org.eclipse.wst.ws.internal.model.v10.registry.DocumentRoot#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the map '<em>XMLNS Prefix Map</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.registry.DocumentRoot#getXMLNSPrefixMap()
-	 * @see #getDocumentRoot()
-	 * @generated
-	 */
-	EReference getDocumentRoot_XMLNSPrefixMap();
-
-	/**
-	 * Returns the meta object for the map '{@link org.eclipse.wst.ws.internal.model.v10.registry.DocumentRoot#getXSISchemaLocation <em>XSI Schema Location</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the map '<em>XSI Schema Location</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.registry.DocumentRoot#getXSISchemaLocation()
-	 * @see #getDocumentRoot()
-	 * @generated
-	 */
-	EReference getDocumentRoot_XSISchemaLocation();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.wst.ws.internal.model.v10.registry.DocumentRoot#getDescription <em>Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Description</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.registry.DocumentRoot#getDescription()
-	 * @see #getDocumentRoot()
-	 * @generated
-	 */
-	EReference getDocumentRoot_Description();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.wst.ws.internal.model.v10.registry.DocumentRoot#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Name</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.registry.DocumentRoot#getName()
-	 * @see #getDocumentRoot()
-	 * @generated
-	 */
-	EReference getDocumentRoot_Name();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.wst.ws.internal.model.v10.registry.DocumentRoot#getRegistry <em>Registry</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Registry</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.registry.DocumentRoot#getRegistry()
-	 * @see #getDocumentRoot()
-	 * @generated
-	 */
-	EReference getDocumentRoot_Registry();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.ws.internal.model.v10.registry.Name <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Name</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.registry.Name
-	 * @generated
-	 */
-	EClass getName_();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.ws.internal.model.v10.registry.Name#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.registry.Name#getValue()
-	 * @see #getName_()
-	 * @generated
-	 */
-	EAttribute getName_Value();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.ws.internal.model.v10.registry.Name#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Lang</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.registry.Name#getLang()
-	 * @see #getName_()
-	 * @generated
-	 */
-	EAttribute getName_Lang();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.ws.internal.model.v10.registry.Registry <em>Registry</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Registry</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.registry.Registry
-	 * @generated
-	 */
-	EClass getRegistry();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.wst.ws.internal.model.v10.registry.Registry#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Name</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.registry.Registry#getName()
-	 * @see #getRegistry()
-	 * @generated
-	 */
-	EReference getRegistry_Name();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.wst.ws.internal.model.v10.registry.Registry#getDescription <em>Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Description</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.registry.Registry#getDescription()
-	 * @see #getRegistry()
-	 * @generated
-	 */
-	EReference getRegistry_Description();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.ws.internal.model.v10.registry.Registry#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.registry.Registry#getId()
-	 * @see #getRegistry()
-	 * @generated
-	 */
-	EAttribute getRegistry_Id();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.ws.internal.model.v10.registry.Registry#getLocation <em>Location</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Location</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.registry.Registry#getLocation()
-	 * @see #getRegistry()
-	 * @generated
-	 */
-	EAttribute getRegistry_Location();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.ws.internal.model.v10.registry.Registry#getRef <em>Ref</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Ref</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.registry.Registry#getRef()
-	 * @see #getRegistry()
-	 * @generated
-	 */
-	EAttribute getRegistry_Ref();
-
-	/**
-	 * 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
-	 */
-	RegistryFactory getRegistryFactory();
-
-} //RegistryPackage
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/impl/DescriptionImpl.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/impl/DescriptionImpl.java
deleted file mode 100644
index 611d94753..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/impl/DescriptionImpl.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DescriptionImpl.java,v 1.2 2005/12/03 04:06:47 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.registry.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.ws.internal.model.v10.registry.Description;
-import org.eclipse.wst.ws.internal.model.v10.registry.RegistryPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Description</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.registry.impl.DescriptionImpl#getValue <em>Value</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.registry.impl.DescriptionImpl#getLang <em>Lang</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DescriptionImpl extends EObjectImpl implements Description {
-	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected String value = VALUE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLang()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LANG_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLang()
-	 * @generated
-	 * @ordered
-	 */
-	protected String lang = LANG_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DescriptionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return RegistryPackage.eINSTANCE.getDescription();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValue(String newValue) {
-		String oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, RegistryPackage.DESCRIPTION__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLang() {
-		return lang;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLang(String newLang) {
-		String oldLang = lang;
-		lang = newLang;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, RegistryPackage.DESCRIPTION__LANG, oldLang, lang));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case RegistryPackage.DESCRIPTION__VALUE:
-				return getValue();
-			case RegistryPackage.DESCRIPTION__LANG:
-				return getLang();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case RegistryPackage.DESCRIPTION__VALUE:
-				setValue((String)newValue);
-				return;
-			case RegistryPackage.DESCRIPTION__LANG:
-				setLang((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case RegistryPackage.DESCRIPTION__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-			case RegistryPackage.DESCRIPTION__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case RegistryPackage.DESCRIPTION__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-			case RegistryPackage.DESCRIPTION__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-		}
-		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(" (value: ");
-		result.append(value);
-		result.append(", lang: ");
-		result.append(lang);
-		result.append(')');
-		return result.toString();
-	}
-
-} //DescriptionImpl
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/impl/DocumentRootImpl.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/impl/DocumentRootImpl.java
deleted file mode 100644
index 9a32e38c9..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/impl/DocumentRootImpl.java
+++ /dev/null
@@ -1,367 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DocumentRootImpl.java,v 1.2 2005/12/03 04:06:47 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.registry.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EMap;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.impl.EStringToStringMapEntryImpl;
-
-import org.eclipse.emf.ecore.util.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.EcoreEMap;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.wst.ws.internal.model.v10.registry.Description;
-import org.eclipse.wst.ws.internal.model.v10.registry.DocumentRoot;
-import org.eclipse.wst.ws.internal.model.v10.registry.Name;
-import org.eclipse.wst.ws.internal.model.v10.registry.Registry;
-import org.eclipse.wst.ws.internal.model.v10.registry.RegistryPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Document Root</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.registry.impl.DocumentRootImpl#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.registry.impl.DocumentRootImpl#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.registry.impl.DocumentRootImpl#getXSISchemaLocation <em>XSI Schema Location</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.registry.impl.DocumentRootImpl#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.registry.impl.DocumentRootImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.registry.impl.DocumentRootImpl#getRegistry <em>Registry</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DocumentRootImpl extends EObjectImpl implements DocumentRoot {
-	/**
-	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMixed()
-	 * @generated
-	 * @ordered
-	 */
-	protected FeatureMap mixed = null;
-
-	/**
-	 * The cached value of the '{@link #getXMLNSPrefixMap() <em>XMLNS Prefix Map</em>}' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getXMLNSPrefixMap()
-	 * @generated
-	 * @ordered
-	 */
-	protected EMap xMLNSPrefixMap = null;
-
-	/**
-	 * The cached value of the '{@link #getXSISchemaLocation() <em>XSI Schema Location</em>}' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getXSISchemaLocation()
-	 * @generated
-	 * @ordered
-	 */
-	protected EMap xSISchemaLocation = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DocumentRootImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return RegistryPackage.eINSTANCE.getDocumentRoot();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureMap getMixed() {
-		if (mixed == null) {
-			mixed = new BasicFeatureMap(this, RegistryPackage.DOCUMENT_ROOT__MIXED);
-		}
-		return mixed;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EMap getXMLNSPrefixMap() {
-		if (xMLNSPrefixMap == null) {
-			xMLNSPrefixMap = new EcoreEMap(EcorePackage.eINSTANCE.getEStringToStringMapEntry(), EStringToStringMapEntryImpl.class, this, RegistryPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP);
-		}
-		return xMLNSPrefixMap;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EMap getXSISchemaLocation() {
-		if (xSISchemaLocation == null) {
-			xSISchemaLocation = new EcoreEMap(EcorePackage.eINSTANCE.getEStringToStringMapEntry(), EStringToStringMapEntryImpl.class, this, RegistryPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION);
-		}
-		return xSISchemaLocation;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Description getDescription() {
-		return (Description)getMixed().get(RegistryPackage.eINSTANCE.getDocumentRoot_Description(), true);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetDescription(Description newDescription, NotificationChain msgs) {
-		return ((FeatureMap.Internal)getMixed()).basicAdd(RegistryPackage.eINSTANCE.getDocumentRoot_Description(), newDescription, null);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDescription(Description newDescription) {
-		((FeatureMap.Internal)getMixed()).set(RegistryPackage.eINSTANCE.getDocumentRoot_Description(), newDescription);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Name getName() {
-		return (Name)getMixed().get(RegistryPackage.eINSTANCE.getDocumentRoot_Name(), true);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetName(Name newName, NotificationChain msgs) {
-		return ((FeatureMap.Internal)getMixed()).basicAdd(RegistryPackage.eINSTANCE.getDocumentRoot_Name(), newName, null);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(Name newName) {
-		((FeatureMap.Internal)getMixed()).set(RegistryPackage.eINSTANCE.getDocumentRoot_Name(), newName);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Registry getRegistry() {
-		return (Registry)getMixed().get(RegistryPackage.eINSTANCE.getDocumentRoot_Registry(), true);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetRegistry(Registry newRegistry, NotificationChain msgs) {
-		return ((FeatureMap.Internal)getMixed()).basicAdd(RegistryPackage.eINSTANCE.getDocumentRoot_Registry(), newRegistry, null);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRegistry(Registry newRegistry) {
-		((FeatureMap.Internal)getMixed()).set(RegistryPackage.eINSTANCE.getDocumentRoot_Registry(), newRegistry);
-	}
-
-	/**
-	 * <!-- 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 RegistryPackage.DOCUMENT_ROOT__MIXED:
-					return ((InternalEList)getMixed()).basicRemove(otherEnd, msgs);
-				case RegistryPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
-					return ((InternalEList)getXMLNSPrefixMap()).basicRemove(otherEnd, msgs);
-				case RegistryPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
-					return ((InternalEList)getXSISchemaLocation()).basicRemove(otherEnd, msgs);
-				case RegistryPackage.DOCUMENT_ROOT__DESCRIPTION:
-					return basicSetDescription(null, msgs);
-				case RegistryPackage.DOCUMENT_ROOT__NAME:
-					return basicSetName(null, msgs);
-				case RegistryPackage.DOCUMENT_ROOT__REGISTRY:
-					return basicSetRegistry(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 RegistryPackage.DOCUMENT_ROOT__MIXED:
-				return getMixed();
-			case RegistryPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
-				return getXMLNSPrefixMap();
-			case RegistryPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
-				return getXSISchemaLocation();
-			case RegistryPackage.DOCUMENT_ROOT__DESCRIPTION:
-				return getDescription();
-			case RegistryPackage.DOCUMENT_ROOT__NAME:
-				return getName();
-			case RegistryPackage.DOCUMENT_ROOT__REGISTRY:
-				return getRegistry();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case RegistryPackage.DOCUMENT_ROOT__MIXED:
-				getMixed().clear();
-				getMixed().addAll((Collection)newValue);
-				return;
-			case RegistryPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
-				getXMLNSPrefixMap().clear();
-				getXMLNSPrefixMap().addAll((Collection)newValue);
-				return;
-			case RegistryPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
-				getXSISchemaLocation().clear();
-				getXSISchemaLocation().addAll((Collection)newValue);
-				return;
-			case RegistryPackage.DOCUMENT_ROOT__DESCRIPTION:
-				setDescription((Description)newValue);
-				return;
-			case RegistryPackage.DOCUMENT_ROOT__NAME:
-				setName((Name)newValue);
-				return;
-			case RegistryPackage.DOCUMENT_ROOT__REGISTRY:
-				setRegistry((Registry)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case RegistryPackage.DOCUMENT_ROOT__MIXED:
-				getMixed().clear();
-				return;
-			case RegistryPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
-				getXMLNSPrefixMap().clear();
-				return;
-			case RegistryPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
-				getXSISchemaLocation().clear();
-				return;
-			case RegistryPackage.DOCUMENT_ROOT__DESCRIPTION:
-				setDescription((Description)null);
-				return;
-			case RegistryPackage.DOCUMENT_ROOT__NAME:
-				setName((Name)null);
-				return;
-			case RegistryPackage.DOCUMENT_ROOT__REGISTRY:
-				setRegistry((Registry)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case RegistryPackage.DOCUMENT_ROOT__MIXED:
-				return mixed != null && !mixed.isEmpty();
-			case RegistryPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
-				return xMLNSPrefixMap != null && !xMLNSPrefixMap.isEmpty();
-			case RegistryPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
-				return xSISchemaLocation != null && !xSISchemaLocation.isEmpty();
-			case RegistryPackage.DOCUMENT_ROOT__DESCRIPTION:
-				return getDescription() != null;
-			case RegistryPackage.DOCUMENT_ROOT__NAME:
-				return getName() != null;
-			case RegistryPackage.DOCUMENT_ROOT__REGISTRY:
-				return getRegistry() != 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(" (mixed: ");
-		result.append(mixed);
-		result.append(')');
-		return result.toString();
-	}
-
-} //DocumentRootImpl
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/impl/NameImpl.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/impl/NameImpl.java
deleted file mode 100644
index eccef768c..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/impl/NameImpl.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: NameImpl.java,v 1.2 2005/12/03 04:06:47 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.registry.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.ws.internal.model.v10.registry.Name;
-import org.eclipse.wst.ws.internal.model.v10.registry.RegistryPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Name</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.registry.impl.NameImpl#getValue <em>Value</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.registry.impl.NameImpl#getLang <em>Lang</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class NameImpl extends EObjectImpl implements Name {
-	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected String value = VALUE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLang()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LANG_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLang()
-	 * @generated
-	 * @ordered
-	 */
-	protected String lang = LANG_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected NameImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return RegistryPackage.eINSTANCE.getName_();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValue(String newValue) {
-		String oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, RegistryPackage.NAME__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLang() {
-		return lang;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLang(String newLang) {
-		String oldLang = lang;
-		lang = newLang;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, RegistryPackage.NAME__LANG, oldLang, lang));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case RegistryPackage.NAME__VALUE:
-				return getValue();
-			case RegistryPackage.NAME__LANG:
-				return getLang();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case RegistryPackage.NAME__VALUE:
-				setValue((String)newValue);
-				return;
-			case RegistryPackage.NAME__LANG:
-				setLang((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case RegistryPackage.NAME__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-			case RegistryPackage.NAME__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case RegistryPackage.NAME__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-			case RegistryPackage.NAME__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-		}
-		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(" (value: ");
-		result.append(value);
-		result.append(", lang: ");
-		result.append(lang);
-		result.append(')');
-		return result.toString();
-	}
-
-} //NameImpl
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/impl/RegistryFactoryImpl.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/impl/RegistryFactoryImpl.java
deleted file mode 100644
index 3cf2c1690..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/impl/RegistryFactoryImpl.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: RegistryFactoryImpl.java,v 1.2 2005/12/03 04:06:47 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.registry.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.wst.ws.internal.model.v10.registry.*;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class RegistryFactoryImpl extends EFactoryImpl implements RegistryFactory {
-	/**
-	 * Creates and instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RegistryFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case RegistryPackage.DESCRIPTION: return createDescription();
-			case RegistryPackage.DOCUMENT_ROOT: return createDocumentRoot();
-			case RegistryPackage.NAME: return createName();
-			case RegistryPackage.REGISTRY: return createRegistry();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Description createDescription() {
-		DescriptionImpl description = new DescriptionImpl();
-		return description;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DocumentRoot createDocumentRoot() {
-		DocumentRootImpl documentRoot = new DocumentRootImpl();
-		return documentRoot;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Name createName() {
-		NameImpl name = new NameImpl();
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Registry createRegistry() {
-		RegistryImpl registry = new RegistryImpl();
-		return registry;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RegistryPackage getRegistryPackage() {
-		return (RegistryPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	public static RegistryPackage getPackage() {
-		return RegistryPackage.eINSTANCE;
-	}
-
-} //RegistryFactoryImpl
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/impl/RegistryImpl.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/impl/RegistryImpl.java
deleted file mode 100644
index a171e7f5e..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/impl/RegistryImpl.java
+++ /dev/null
@@ -1,368 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: RegistryImpl.java,v 1.2 2005/12/03 04:06:47 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.registry.impl;
-
-import java.util.Collection;
-
-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.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.impl.EObjectImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.wst.ws.internal.model.v10.registry.Description;
-import org.eclipse.wst.ws.internal.model.v10.registry.Name;
-import org.eclipse.wst.ws.internal.model.v10.registry.Registry;
-import org.eclipse.wst.ws.internal.model.v10.registry.RegistryPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Registry</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.registry.impl.RegistryImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.registry.impl.RegistryImpl#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.registry.impl.RegistryImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.registry.impl.RegistryImpl#getLocation <em>Location</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.registry.impl.RegistryImpl#getRef <em>Ref</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class RegistryImpl extends EObjectImpl implements Registry {
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList name = null;
-
-	/**
-	 * The cached value of the '{@link #getDescription() <em>Description</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList description = null;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_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 #getRef() <em>Ref</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRef()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String REF_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getRef() <em>Ref</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRef()
-	 * @generated
-	 * @ordered
-	 */
-	protected String ref = REF_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected RegistryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return RegistryPackage.eINSTANCE.getRegistry();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getName() {
-		if (name == null) {
-			name = new EObjectContainmentEList(Name.class, this, RegistryPackage.REGISTRY__NAME);
-		}
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescription() {
-		if (description == null) {
-			description = new EObjectContainmentEList(Description.class, this, RegistryPackage.REGISTRY__DESCRIPTION);
-		}
-		return description;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, RegistryPackage.REGISTRY__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- 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, RegistryPackage.REGISTRY__LOCATION, oldLocation, location));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getRef() {
-		return ref;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRef(String newRef) {
-		String oldRef = ref;
-		ref = newRef;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, RegistryPackage.REGISTRY__REF, oldRef, ref));
-	}
-
-	/**
-	 * <!-- 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 RegistryPackage.REGISTRY__NAME:
-					return ((InternalEList)getName()).basicRemove(otherEnd, msgs);
-				case RegistryPackage.REGISTRY__DESCRIPTION:
-					return ((InternalEList)getDescription()).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 RegistryPackage.REGISTRY__NAME:
-				return getName();
-			case RegistryPackage.REGISTRY__DESCRIPTION:
-				return getDescription();
-			case RegistryPackage.REGISTRY__ID:
-				return getId();
-			case RegistryPackage.REGISTRY__LOCATION:
-				return getLocation();
-			case RegistryPackage.REGISTRY__REF:
-				return getRef();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case RegistryPackage.REGISTRY__NAME:
-				getName().clear();
-				getName().addAll((Collection)newValue);
-				return;
-			case RegistryPackage.REGISTRY__DESCRIPTION:
-				getDescription().clear();
-				getDescription().addAll((Collection)newValue);
-				return;
-			case RegistryPackage.REGISTRY__ID:
-				setId((String)newValue);
-				return;
-			case RegistryPackage.REGISTRY__LOCATION:
-				setLocation((String)newValue);
-				return;
-			case RegistryPackage.REGISTRY__REF:
-				setRef((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case RegistryPackage.REGISTRY__NAME:
-				getName().clear();
-				return;
-			case RegistryPackage.REGISTRY__DESCRIPTION:
-				getDescription().clear();
-				return;
-			case RegistryPackage.REGISTRY__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case RegistryPackage.REGISTRY__LOCATION:
-				setLocation(LOCATION_EDEFAULT);
-				return;
-			case RegistryPackage.REGISTRY__REF:
-				setRef(REF_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case RegistryPackage.REGISTRY__NAME:
-				return name != null && !name.isEmpty();
-			case RegistryPackage.REGISTRY__DESCRIPTION:
-				return description != null && !description.isEmpty();
-			case RegistryPackage.REGISTRY__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case RegistryPackage.REGISTRY__LOCATION:
-				return LOCATION_EDEFAULT == null ? location != null : !LOCATION_EDEFAULT.equals(location);
-			case RegistryPackage.REGISTRY__REF:
-				return REF_EDEFAULT == null ? ref != null : !REF_EDEFAULT.equals(ref);
-		}
-		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(" (id: ");
-		result.append(id);
-		result.append(", location: ");
-		result.append(location);
-		result.append(", ref: ");
-		result.append(ref);
-		result.append(')');
-		return result.toString();
-	}
-
-} //RegistryImpl
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/impl/RegistryPackageImpl.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/impl/RegistryPackageImpl.java
deleted file mode 100644
index 23f9beff3..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/impl/RegistryPackageImpl.java
+++ /dev/null
@@ -1,586 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: RegistryPackageImpl.java,v 1.2 2005/12/03 04:06:47 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.registry.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-
-import org.eclipse.emf.ecore.xml.type.impl.XMLTypePackageImpl;
-
-import org.eclipse.wst.ws.internal.model.v10.registry.Description;
-import org.eclipse.wst.ws.internal.model.v10.registry.DocumentRoot;
-import org.eclipse.wst.ws.internal.model.v10.registry.Name;
-import org.eclipse.wst.ws.internal.model.v10.registry.RegistryFactory;
-import org.eclipse.wst.ws.internal.model.v10.registry.RegistryPackage;
-
-import org.eclipse.wst.ws.internal.model.v10.rtindex.RTIndexPackage;
-
-import org.eclipse.wst.ws.internal.model.v10.rtindex.impl.RTIndexPackageImpl;
-
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.TaxonomyPackage;
-
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.impl.TaxonomyPackageImpl;
-
-import org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistryPackage;
-
-import org.eclipse.wst.ws.internal.model.v10.uddiregistry.impl.UDDIRegistryPackageImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class RegistryPackageImpl extends EPackageImpl implements RegistryPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass descriptionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass documentRootEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass nameEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass registryEClass = 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.ws.internal.model.v10.registry.RegistryPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private RegistryPackageImpl() {
-		super(eNS_URI, RegistryFactory.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 RegistryPackage init() {
-		if (isInited) return (RegistryPackage)EPackage.Registry.INSTANCE.getEPackage(RegistryPackage.eNS_URI);
-
-		// Obtain or create and register package
-		RegistryPackageImpl theRegistryPackage = (RegistryPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof RegistryPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new RegistryPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		XMLTypePackageImpl.init();
-
-		// Obtain or create and register interdependencies
-		RTIndexPackageImpl theRTIndexPackage = (RTIndexPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(RTIndexPackage.eNS_URI) instanceof RTIndexPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RTIndexPackage.eNS_URI) : RTIndexPackageImpl.eINSTANCE);
-		TaxonomyPackageImpl theTaxonomyPackage = (TaxonomyPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(TaxonomyPackage.eNS_URI) instanceof TaxonomyPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(TaxonomyPackage.eNS_URI) : TaxonomyPackageImpl.eINSTANCE);
-		UDDIRegistryPackageImpl theUDDIRegistryPackage = (UDDIRegistryPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(UDDIRegistryPackage.eNS_URI) instanceof UDDIRegistryPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(UDDIRegistryPackage.eNS_URI) : UDDIRegistryPackageImpl.eINSTANCE);
-
-		// Create package meta-data objects
-		theRegistryPackage.createPackageContents();
-		theRTIndexPackage.createPackageContents();
-		theTaxonomyPackage.createPackageContents();
-		theUDDIRegistryPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theRegistryPackage.initializePackageContents();
-		theRTIndexPackage.initializePackageContents();
-		theTaxonomyPackage.initializePackageContents();
-		theUDDIRegistryPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theRegistryPackage.freeze();
-
-		return theRegistryPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDescription() {
-		return descriptionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDescription_Value() {
-		return (EAttribute)descriptionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDescription_Lang() {
-		return (EAttribute)descriptionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDocumentRoot() {
-		return documentRootEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDocumentRoot_Mixed() {
-		return (EAttribute)documentRootEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDocumentRoot_XMLNSPrefixMap() {
-		return (EReference)documentRootEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDocumentRoot_XSISchemaLocation() {
-		return (EReference)documentRootEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDocumentRoot_Description() {
-		return (EReference)documentRootEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDocumentRoot_Name() {
-		return (EReference)documentRootEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDocumentRoot_Registry() {
-		return (EReference)documentRootEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getName_() {
-		return nameEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getName_Value() {
-		return (EAttribute)nameEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getName_Lang() {
-		return (EAttribute)nameEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getRegistry() {
-		return registryEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getRegistry_Name() {
-		return (EReference)registryEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getRegistry_Description() {
-		return (EReference)registryEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getRegistry_Id() {
-		return (EAttribute)registryEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getRegistry_Location() {
-		return (EAttribute)registryEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getRegistry_Ref() {
-		return (EAttribute)registryEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RegistryFactory getRegistryFactory() {
-		return (RegistryFactory)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
-		descriptionEClass = createEClass(DESCRIPTION);
-		createEAttribute(descriptionEClass, DESCRIPTION__VALUE);
-		createEAttribute(descriptionEClass, DESCRIPTION__LANG);
-
-		documentRootEClass = createEClass(DOCUMENT_ROOT);
-		createEAttribute(documentRootEClass, DOCUMENT_ROOT__MIXED);
-		createEReference(documentRootEClass, DOCUMENT_ROOT__XMLNS_PREFIX_MAP);
-		createEReference(documentRootEClass, DOCUMENT_ROOT__XSI_SCHEMA_LOCATION);
-		createEReference(documentRootEClass, DOCUMENT_ROOT__DESCRIPTION);
-		createEReference(documentRootEClass, DOCUMENT_ROOT__NAME);
-		createEReference(documentRootEClass, DOCUMENT_ROOT__REGISTRY);
-
-		nameEClass = createEClass(NAME);
-		createEAttribute(nameEClass, NAME__VALUE);
-		createEAttribute(nameEClass, NAME__LANG);
-
-		registryEClass = createEClass(REGISTRY);
-		createEReference(registryEClass, REGISTRY__NAME);
-		createEReference(registryEClass, REGISTRY__DESCRIPTION);
-		createEAttribute(registryEClass, REGISTRY__ID);
-		createEAttribute(registryEClass, REGISTRY__LOCATION);
-		createEAttribute(registryEClass, REGISTRY__REF);
-	}
-
-	/**
-	 * <!-- 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
-		XMLTypePackageImpl theXMLTypePackage = (XMLTypePackageImpl)EPackage.Registry.INSTANCE.getEPackage(XMLTypePackage.eNS_URI);
-
-		// Add supertypes to classes
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(descriptionEClass, Description.class, "Description", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getDescription_Value(), theXMLTypePackage.getString(), "value", null, 0, 1, Description.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getDescription_Lang(), theXMLTypePackage.getLanguage(), "lang", null, 0, 1, Description.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(documentRootEClass, DocumentRoot.class, "DocumentRoot", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getDocumentRoot_Mixed(), ecorePackage.getEFeatureMapEntry(), "mixed", null, 0, -1, null, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getDocumentRoot_XMLNSPrefixMap(), ecorePackage.getEStringToStringMapEntry(), null, "xMLNSPrefixMap", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getDocumentRoot_XSISchemaLocation(), ecorePackage.getEStringToStringMapEntry(), null, "xSISchemaLocation", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getDocumentRoot_Description(), this.getDescription(), null, "description", null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEReference(getDocumentRoot_Name(), this.getName_(), null, "name", null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEReference(getDocumentRoot_Registry(), this.getRegistry(), null, "registry", null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-
-		initEClass(nameEClass, Name.class, "Name", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getName_Value(), theXMLTypePackage.getString(), "value", null, 0, 1, Name.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getName_Lang(), theXMLTypePackage.getLanguage(), "lang", null, 0, 1, Name.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(registryEClass, org.eclipse.wst.ws.internal.model.v10.registry.Registry.class, "Registry", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getRegistry_Name(), this.getName_(), null, "name", null, 1, -1, org.eclipse.wst.ws.internal.model.v10.registry.Registry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getRegistry_Description(), this.getDescription(), null, "description", null, 1, -1, org.eclipse.wst.ws.internal.model.v10.registry.Registry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getRegistry_Id(), theXMLTypePackage.getAnyURI(), "id", null, 0, 1, org.eclipse.wst.ws.internal.model.v10.registry.Registry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getRegistry_Location(), theXMLTypePackage.getAnyURI(), "location", null, 0, 1, org.eclipse.wst.ws.internal.model.v10.registry.Registry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getRegistry_Ref(), theXMLTypePackage.getAnyURI(), "ref", null, 0, 1, org.eclipse.wst.ws.internal.model.v10.registry.Registry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		// Create resource
-		createResource(eNS_URI);
-
-		// Create annotations
-		// http:///org/eclipse/emf/ecore/util/ExtendedMetaData
-		createExtendedMetaDataAnnotations();
-	}
-
-	/**
-	 * Initializes the annotations for <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void createExtendedMetaDataAnnotations() {
-		String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData";			
-		addAnnotation
-		  (descriptionEClass, 
-		   source, 
-		   new String[] {
-			 "name", "Description",
-			 "kind", "simple"
-		   });		
-		addAnnotation
-		  (getDescription_Value(), 
-		   source, 
-		   new String[] {
-			 "name", ":0",
-			 "kind", "simple"
-		   });		
-		addAnnotation
-		  (getDescription_Lang(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "lang",
-			 "namespace", "http://www.w3.org/XML/1998/namespace"
-		   });		
-		addAnnotation
-		  (documentRootEClass, 
-		   source, 
-		   new String[] {
-			 "name", "",
-			 "kind", "mixed"
-		   });		
-		addAnnotation
-		  (getDocumentRoot_Mixed(), 
-		   source, 
-		   new String[] {
-			 "kind", "elementWildcard",
-			 "name", ":mixed"
-		   });		
-		addAnnotation
-		  (getDocumentRoot_XMLNSPrefixMap(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "xmlns:prefix"
-		   });		
-		addAnnotation
-		  (getDocumentRoot_XSISchemaLocation(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "xsi:schemaLocation"
-		   });		
-		addAnnotation
-		  (getDocumentRoot_Description(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "description",
-			 "namespace", "##targetNamespace"
-		   });		
-		addAnnotation
-		  (getDocumentRoot_Name(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "name",
-			 "namespace", "##targetNamespace"
-		   });		
-		addAnnotation
-		  (getDocumentRoot_Registry(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "registry",
-			 "namespace", "##targetNamespace"
-		   });		
-		addAnnotation
-		  (nameEClass, 
-		   source, 
-		   new String[] {
-			 "name", "Name",
-			 "kind", "simple"
-		   });		
-		addAnnotation
-		  (getName_Value(), 
-		   source, 
-		   new String[] {
-			 "name", ":0",
-			 "kind", "simple"
-		   });		
-		addAnnotation
-		  (getName_Lang(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "lang",
-			 "namespace", "http://www.w3.org/XML/1998/namespace"
-		   });		
-		addAnnotation
-		  (registryEClass, 
-		   source, 
-		   new String[] {
-			 "name", "Registry",
-			 "kind", "elementOnly"
-		   });		
-		addAnnotation
-		  (getRegistry_Name(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "name"
-		   });		
-		addAnnotation
-		  (getRegistry_Description(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "description"
-		   });		
-		addAnnotation
-		  (getRegistry_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "id"
-		   });		
-		addAnnotation
-		  (getRegistry_Location(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "location"
-		   });		
-		addAnnotation
-		  (getRegistry_Ref(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "ref"
-		   });
-	}
-
-} //RegistryPackageImpl
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/util/RegistryAdapterFactory.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/util/RegistryAdapterFactory.java
deleted file mode 100644
index 11b20517e..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/util/RegistryAdapterFactory.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: RegistryAdapterFactory.java,v 1.2 2005/12/03 04:06:51 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.registry.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.ecore.EObject;
-
-import org.eclipse.wst.ws.internal.model.v10.registry.*;
-
-/**
- * <!-- 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.ws.internal.model.v10.registry.RegistryPackage
- * @generated
- */
-public class RegistryAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static RegistryPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RegistryAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = RegistryPackage.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 RegistrySwitch modelSwitch =
-		new RegistrySwitch() {
-			public Object caseDescription(Description object) {
-				return createDescriptionAdapter();
-			}
-			public Object caseDocumentRoot(DocumentRoot object) {
-				return createDocumentRootAdapter();
-			}
-			public Object caseName(Name object) {
-				return createNameAdapter();
-			}
-			public Object caseRegistry(Registry object) {
-				return createRegistryAdapter();
-			}
-			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.ws.internal.model.v10.registry.Description <em>Description</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.ws.internal.model.v10.registry.Description
-	 * @generated
-	 */
-	public Adapter createDescriptionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.wst.ws.internal.model.v10.registry.DocumentRoot <em>Document Root</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.ws.internal.model.v10.registry.DocumentRoot
-	 * @generated
-	 */
-	public Adapter createDocumentRootAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.wst.ws.internal.model.v10.registry.Name <em>Name</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.ws.internal.model.v10.registry.Name
-	 * @generated
-	 */
-	public Adapter createNameAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.wst.ws.internal.model.v10.registry.Registry <em>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 org.eclipse.wst.ws.internal.model.v10.registry.Registry
-	 * @generated
-	 */
-	public Adapter createRegistryAdapter() {
-		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;
-	}
-
-} //RegistryAdapterFactory
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/util/RegistryResourceFactoryImpl.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/util/RegistryResourceFactoryImpl.java
deleted file mode 100644
index 42787236f..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/util/RegistryResourceFactoryImpl.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: RegistryResourceFactoryImpl.java,v 1.2 2005/12/03 04:06:51 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.registry.util;
-
-import org.eclipse.emf.common.util.URI;
-
-import org.eclipse.emf.ecore.resource.Resource;
-
-import org.eclipse.emf.ecore.util.ExtendedMetaData;
-
-import org.eclipse.emf.ecore.xmi.XMLResource;
-
-import org.eclipse.emf.ecore.xmi.impl.XMLResourceFactoryImpl;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource Factory</b> associated with the package.
- * <!-- end-user-doc -->
- * @see org.eclipse.wst.ws.internal.model.v10.registry.util.RegistryResourceImpl
- * @generated
- */
-public class RegistryResourceFactoryImpl extends XMLResourceFactoryImpl {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ExtendedMetaData extendedMetaData;
-
-	/**
-	 * Creates an instance of the resource factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RegistryResourceFactoryImpl() {
-		super();
-		extendedMetaData = ExtendedMetaData.INSTANCE;
-	}
-
-	/**
-	 * Creates an instance of the resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Resource createResource(URI uri) {
-		XMLResource result = new RegistryResourceImpl(uri);
-		result.getDefaultSaveOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, extendedMetaData);
-		result.getDefaultLoadOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, extendedMetaData);
-
-		result.getDefaultSaveOptions().put(XMLResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE);
-		result.getDefaultSaveOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
-
-		result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE);
-		return result;
-	}
-
-} //RegistryResourceFactoryImpl
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/util/RegistryResourceImpl.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/util/RegistryResourceImpl.java
deleted file mode 100644
index 9ebfc00e4..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/util/RegistryResourceImpl.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: RegistryResourceImpl.java,v 1.2 2005/12/03 04:06:51 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.registry.util;
-
-import org.eclipse.emf.common.util.URI;
-
-import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource </b> associated with the package.
- * <!-- end-user-doc -->
- * @see org.eclipse.wst.ws.internal.model.v10.registry.util.RegistryResourceFactoryImpl
- * @generated
- */
-public class RegistryResourceImpl extends XMLResourceImpl {
-	/**
-	 * Creates an instance of the resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param uri the URI of the new resource.
-	 * @generated
-	 */
-	public RegistryResourceImpl(URI uri) {
-		super(uri);
-	}
-
-} //RegistryResourceFactoryImpl
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/util/RegistrySwitch.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/util/RegistrySwitch.java
deleted file mode 100644
index 279370e78..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/util/RegistrySwitch.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: RegistrySwitch.java,v 1.2 2005/12/03 04:06:51 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.registry.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.wst.ws.internal.model.v10.registry.*;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) 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.ws.internal.model.v10.registry.RegistryPackage
- * @generated
- */
-public class RegistrySwitch {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static RegistryPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RegistrySwitch() {
-		if (modelPackage == null) {
-			modelPackage = RegistryPackage.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) {
-		return doSwitch(theEObject.eClass(), theEObject);
-	}
-
-	/**
-	 * 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
-	 */
-	protected Object doSwitch(EClass theEClass, EObject theEObject) {
-		if (theEClass.eContainer() == modelPackage) {
-			return doSwitch(theEClass.getClassifierID(), theEObject);
-		}
-		else {
-			List eSuperTypes = theEClass.getESuperTypes();
-			return
-				eSuperTypes.isEmpty() ?
-					defaultCase(theEObject) :
-					doSwitch((EClass)eSuperTypes.get(0), theEObject);
-		}
-	}
-
-	/**
-	 * 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
-	 */
-	protected Object doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case RegistryPackage.DESCRIPTION: {
-				Description description = (Description)theEObject;
-				Object result = caseDescription(description);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case RegistryPackage.DOCUMENT_ROOT: {
-				DocumentRoot documentRoot = (DocumentRoot)theEObject;
-				Object result = caseDocumentRoot(documentRoot);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case RegistryPackage.NAME: {
-				Name name = (Name)theEObject;
-				Object result = caseName(name);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case RegistryPackage.REGISTRY: {
-				Registry registry = (Registry)theEObject;
-				Object result = caseRegistry(registry);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Description</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>Description</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDescription(Description object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Document Root</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>Document Root</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDocumentRoot(DocumentRoot object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Name</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>Name</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseName(Name object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>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>Registry</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseRegistry(Registry 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;
-	}
-
-} //RegistrySwitch
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/Description.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/Description.java
deleted file mode 100644
index 857763088..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/Description.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Description.java,v 1.2 2005/12/03 04:06:48 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.rtindex;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Description</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.rtindex.Description#getValue <em>Value</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.rtindex.Description#getLang <em>Lang</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.ws.internal.model.v10.rtindex.RTIndexPackage#getDescription()
- * @model 
- * @generated
- */
-public interface Description extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Value</em>' attribute.
-	 * @see #setValue(String)
-	 * @see org.eclipse.wst.ws.internal.model.v10.rtindex.RTIndexPackage#getDescription_Value()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.ws.internal.model.v10.rtindex.Description#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Lang</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Lang</em>' attribute.
-	 * @see #setLang(String)
-	 * @see org.eclipse.wst.ws.internal.model.v10.rtindex.RTIndexPackage#getDescription_Lang()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Language"
-	 * @generated
-	 */
-	String getLang();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.ws.internal.model.v10.rtindex.Description#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
-	 * @see #getLang()
-	 * @generated
-	 */
-	void setLang(String value);
-
-} // Description
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/DocumentRoot.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/DocumentRoot.java
deleted file mode 100644
index 653388c58..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/DocumentRoot.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DocumentRoot.java,v 1.2 2005/12/03 04:06:48 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.rtindex;
-
-import org.eclipse.emf.common.util.EMap;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Document Root</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.rtindex.DocumentRoot#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.rtindex.DocumentRoot#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.rtindex.DocumentRoot#getXSISchemaLocation <em>XSI Schema Location</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.rtindex.DocumentRoot#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.rtindex.DocumentRoot#getIndex <em>Index</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.rtindex.DocumentRoot#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.ws.internal.model.v10.rtindex.RTIndexPackage#getDocumentRoot()
- * @model 
- * @generated
- */
-public interface DocumentRoot extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Mixed</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>Mixed</em>' attribute list.
-	 * @see org.eclipse.wst.ws.internal.model.v10.rtindex.RTIndexPackage#getDocumentRoot_Mixed()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
-	 * @generated
-	 */
-	FeatureMap getMixed();
-
-	/**
-	 * Returns the value of the '<em><b>XMLNS Prefix Map</b></em>' map.
-	 * The key is of type {@link java.lang.String},
-	 * and the value is of type {@link java.lang.String},
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>XMLNS Prefix Map</em>' map isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>XMLNS Prefix Map</em>' map.
-	 * @see org.eclipse.wst.ws.internal.model.v10.rtindex.RTIndexPackage#getDocumentRoot_XMLNSPrefixMap()
-	 * @model mapType="org.eclipse.emf.ecore.EStringToStringMapEntry" keyType="java.lang.String" valueType="java.lang.String" transient="true"
-	 * @generated
-	 */
-	EMap getXMLNSPrefixMap();
-
-	/**
-	 * Returns the value of the '<em><b>XSI Schema Location</b></em>' map.
-	 * The key is of type {@link java.lang.String},
-	 * and the value is of type {@link java.lang.String},
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>XSI Schema Location</em>' map isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>XSI Schema Location</em>' map.
-	 * @see org.eclipse.wst.ws.internal.model.v10.rtindex.RTIndexPackage#getDocumentRoot_XSISchemaLocation()
-	 * @model mapType="org.eclipse.emf.ecore.EStringToStringMapEntry" keyType="java.lang.String" valueType="java.lang.String" transient="true"
-	 * @generated
-	 */
-	EMap getXSISchemaLocation();
-
-	/**
-	 * Returns the value of the '<em><b>Description</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Description</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>Description</em>' containment reference.
-	 * @see #setDescription(Description)
-	 * @see org.eclipse.wst.ws.internal.model.v10.rtindex.RTIndexPackage#getDocumentRoot_Description()
-	 * @model containment="true" resolveProxies="false" transient="true" volatile="true" derived="true"
-	 * @generated
-	 */
-	Description getDescription();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.ws.internal.model.v10.rtindex.DocumentRoot#getDescription <em>Description</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Description</em>' containment reference.
-	 * @see #getDescription()
-	 * @generated
-	 */
-	void setDescription(Description value);
-
-	/**
-	 * Returns the value of the '<em><b>Index</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Index</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>Index</em>' containment reference.
-	 * @see #setIndex(Index)
-	 * @see org.eclipse.wst.ws.internal.model.v10.rtindex.RTIndexPackage#getDocumentRoot_Index()
-	 * @model containment="true" resolveProxies="false" transient="true" volatile="true" derived="true"
-	 * @generated
-	 */
-	Index getIndex();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.ws.internal.model.v10.rtindex.DocumentRoot#getIndex <em>Index</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Index</em>' containment reference.
-	 * @see #getIndex()
-	 * @generated
-	 */
-	void setIndex(Index value);
-
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</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>Name</em>' containment reference.
-	 * @see #setName(Name)
-	 * @see org.eclipse.wst.ws.internal.model.v10.rtindex.RTIndexPackage#getDocumentRoot_Name()
-	 * @model containment="true" resolveProxies="false" transient="true" volatile="true" derived="true"
-	 * @generated
-	 */
-	Name getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.ws.internal.model.v10.rtindex.DocumentRoot#getName <em>Name</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' containment reference.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(Name value);
-
-} // DocumentRoot
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/Index.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/Index.java
deleted file mode 100644
index e8aa4aa83..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/Index.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Index.java,v 1.2 2005/12/03 04:06:48 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.rtindex;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Index</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.rtindex.Index#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.rtindex.Index#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.rtindex.Index#getRegistry <em>Registry</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.rtindex.Index#getTaxonomy <em>Taxonomy</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.ws.internal.model.v10.rtindex.RTIndexPackage#getIndex()
- * @model 
- * @generated
- */
-public interface Index extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.wst.ws.internal.model.v10.rtindex.Name}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</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>Name</em>' containment reference list.
-	 * @see org.eclipse.wst.ws.internal.model.v10.rtindex.RTIndexPackage#getIndex_Name()
-	 * @model type="org.eclipse.wst.ws.internal.model.v10.rtindex.Name" containment="true" resolveProxies="false" required="true"
-	 * @generated
-	 */
-	EList getName();
-
-	/**
-	 * Returns the value of the '<em><b>Description</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.wst.ws.internal.model.v10.rtindex.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Description</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>Description</em>' containment reference list.
-	 * @see org.eclipse.wst.ws.internal.model.v10.rtindex.RTIndexPackage#getIndex_Description()
-	 * @model type="org.eclipse.wst.ws.internal.model.v10.rtindex.Description" containment="true" resolveProxies="false" required="true"
-	 * @generated
-	 */
-	EList getDescription();
-
-	/**
-	 * Returns the value of the '<em><b>Registry</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.wst.ws.internal.model.v10.registry.Registry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Registry</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>Registry</em>' containment reference list.
-	 * @see org.eclipse.wst.ws.internal.model.v10.rtindex.RTIndexPackage#getIndex_Registry()
-	 * @model type="org.eclipse.wst.ws.internal.model.v10.registry.Registry" containment="true" resolveProxies="false"
-	 * @generated
-	 */
-	EList getRegistry();
-
-	/**
-	 * Returns the value of the '<em><b>Taxonomy</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Taxonomy</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>Taxonomy</em>' containment reference list.
-	 * @see org.eclipse.wst.ws.internal.model.v10.rtindex.RTIndexPackage#getIndex_Taxonomy()
-	 * @model type="org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy" containment="true" resolveProxies="false"
-	 * @generated
-	 */
-	EList getTaxonomy();
-
-} // Index
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/Name.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/Name.java
deleted file mode 100644
index d145fb3e8..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/Name.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Name.java,v 1.2 2005/12/03 04:06:48 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.rtindex;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Name</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.rtindex.Name#getValue <em>Value</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.rtindex.Name#getLang <em>Lang</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.ws.internal.model.v10.rtindex.RTIndexPackage#getName_()
- * @model 
- * @generated
- */
-public interface Name extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Value</em>' attribute.
-	 * @see #setValue(String)
-	 * @see org.eclipse.wst.ws.internal.model.v10.rtindex.RTIndexPackage#getName_Value()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.ws.internal.model.v10.rtindex.Name#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Lang</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Lang</em>' attribute.
-	 * @see #setLang(String)
-	 * @see org.eclipse.wst.ws.internal.model.v10.rtindex.RTIndexPackage#getName_Lang()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Language"
-	 * @generated
-	 */
-	String getLang();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.ws.internal.model.v10.rtindex.Name#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
-	 * @see #getLang()
-	 * @generated
-	 */
-	void setLang(String value);
-
-} // Name
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/RTIndexFactory.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/RTIndexFactory.java
deleted file mode 100644
index 74db708e0..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/RTIndexFactory.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: RTIndexFactory.java,v 1.2 2005/12/03 04:06:48 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.rtindex;
-
-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.ws.internal.model.v10.rtindex.RTIndexPackage
- * @generated
- */
-public interface RTIndexFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	RTIndexFactory eINSTANCE = new org.eclipse.wst.ws.internal.model.v10.rtindex.impl.RTIndexFactoryImpl();
-
-	/**
-	 * Returns a new object of class '<em>Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Description</em>'.
-	 * @generated
-	 */
-	Description createDescription();
-
-	/**
-	 * Returns a new object of class '<em>Document Root</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Document Root</em>'.
-	 * @generated
-	 */
-	DocumentRoot createDocumentRoot();
-
-	/**
-	 * Returns a new object of class '<em>Index</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Index</em>'.
-	 * @generated
-	 */
-	Index createIndex();
-
-	/**
-	 * Returns a new object of class '<em>Name</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Name</em>'.
-	 * @generated
-	 */
-	Name createName();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	RTIndexPackage getRTIndexPackage();
-
-} //RTIndexFactory
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/RTIndexPackage.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/RTIndexPackage.java
deleted file mode 100644
index 3ad2bd13b..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/RTIndexPackage.java
+++ /dev/null
@@ -1,550 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: RTIndexPackage.java,v 1.2 2005/12/03 04:06:48 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.rtindex;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-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 -->
- * 
- *    See http://www.w3.org/XML/1998/namespace.html and
- *    http://www.w3.org/TR/REC-xml for information about this namespace.
- * 
- *     This schema document describes the XML namespace, in a form
- *     suitable for import by other schema documents.  
- * 
- *     Note that local names in this namespace are intended to be defined
- *     only by the World Wide Web Consortium or its subgroups.  The
- *     following names are currently defined in this namespace and should
- *     not be used with conflicting semantics by any Working Group,
- *     specification, or document instance:
- * 
- *     base (as an attribute name): denotes an attribute whose value
- *          provides a URI to be used as the base for interpreting any
- *          relative URIs in the scope of the element on which it
- *          appears; its value is inherited.  This name is reserved
- *          by virtue of its definition in the XML Base specification.
- * 
- *     id   (as an attribute name): denotes an attribute whose value
- *          should be interpreted as if declared to be of type ID.
- *          The xml:id specification is not yet a W3C Recommendation,
- *          but this attribute is included here to facilitate experimentation
- *          with the mechanisms it proposes.  Note that it is _not_ included
- *          in the specialAttrs attribute group.
- * 
- *     lang (as an attribute name): denotes an attribute whose value
- *          is a language code for the natural language of the content of
- *          any element; its value is inherited.  This name is reserved
- *          by virtue of its definition in the XML specification.
- *   
- *     space (as an attribute name): denotes an attribute whose
- *          value is a keyword indicating what whitespace processing
- *          discipline is intended for the content of the element; its
- *          value is inherited.  This name is reserved by virtue of its
- *          definition in the XML specification.
- * 
- *     Father (in any context at all): denotes Jon Bosak, the chair of 
- *          the original XML Working Group.  This name is reserved by 
- *          the following decision of the W3C XML Plenary and 
- *          XML Coordination groups:
- * 
- *              In appreciation for his vision, leadership and dedication
- *              the W3C XML Plenary on this 10th day of February, 2000
- *              reserves for Jon Bosak in perpetuity the XML name
- *              xml:Father
- *   
- * This schema defines attributes and an attribute group
- *         suitable for use by
- *         schemas wishing to allow xml:base, xml:lang, xml:space or xml:id
- *         attributes on elements they define.
- * 
- *         To enable this, such a schema must import this schema
- *         for the XML namespace, e.g. as follows:
- *         &lt;schema . . .&gt;
- *          . . .
- *          &lt;import namespace="http://www.w3.org/XML/1998/namespace"
- *                     schemaLocation="http://www.w3.org/2001/xml.xsd"/&gt;
- * 
- *         Subsequently, qualified reference to any of the attributes
- *         or the group defined below will have the desired effect, e.g.
- * 
- *         &lt;type . . .&gt;
- *          . . .
- *          &lt;attributeGroup ref="xml:specialAttrs"/&gt;
- *  
- *          will define a type which will schema-validate an instance
- *          element with any of those attributes
- * In keeping with the XML Schema WG's standard versioning
- *    policy, this schema document will persist at
- *    http://www.w3.org/2005/08/xml.xsd.
- *    At the date of issue it can also be found at
- *    http://www.w3.org/2001/xml.xsd.
- *    The schema document at that URI may however change in the future,
- *    in order to remain compatible with the latest version of XML Schema
- *    itself, or with the XML namespace itself.  In other words, if the XML
- *    Schema or XML namespaces change, the version of this document at
- *    http://www.w3.org/2001/xml.xsd will change
- *    accordingly; the version at
- *    http://www.w3.org/2005/08/xml.xsd will not change.
- *   
- * <!-- end-model-doc -->
- * @see org.eclipse.wst.ws.internal.model.v10.rtindex.RTIndexFactory
- * @generated
- */
-public interface RTIndexPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "rtindex";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://eclipse.org/wst/ws/internal/model/v10/rtindex";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "rtindex";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	RTIndexPackage eINSTANCE = org.eclipse.wst.ws.internal.model.v10.rtindex.impl.RTIndexPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.ws.internal.model.v10.rtindex.impl.DescriptionImpl <em>Description</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.wst.ws.internal.model.v10.rtindex.impl.DescriptionImpl
-	 * @see org.eclipse.wst.ws.internal.model.v10.rtindex.impl.RTIndexPackageImpl#getDescription()
-	 * @generated
-	 */
-	int DESCRIPTION = 0;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTION__VALUE = 0;
-
-	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTION__LANG = 1;
-
-	/**
-	 * The number of structural features of the the '<em>Description</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTION_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.ws.internal.model.v10.rtindex.impl.DocumentRootImpl <em>Document Root</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.wst.ws.internal.model.v10.rtindex.impl.DocumentRootImpl
-	 * @see org.eclipse.wst.ws.internal.model.v10.rtindex.impl.RTIndexPackageImpl#getDocumentRoot()
-	 * @generated
-	 */
-	int DOCUMENT_ROOT = 1;
-
-	/**
-	 * The feature id for the '<em><b>Mixed</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOCUMENT_ROOT__MIXED = 0;
-
-	/**
-	 * The feature id for the '<em><b>XMLNS Prefix Map</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOCUMENT_ROOT__XMLNS_PREFIX_MAP = 1;
-
-	/**
-	 * The feature id for the '<em><b>XSI Schema Location</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOCUMENT_ROOT__XSI_SCHEMA_LOCATION = 2;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOCUMENT_ROOT__DESCRIPTION = 3;
-
-	/**
-	 * The feature id for the '<em><b>Index</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOCUMENT_ROOT__INDEX = 4;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOCUMENT_ROOT__NAME = 5;
-
-	/**
-	 * The number of structural features of the the '<em>Document Root</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOCUMENT_ROOT_FEATURE_COUNT = 6;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.ws.internal.model.v10.rtindex.impl.IndexImpl <em>Index</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.wst.ws.internal.model.v10.rtindex.impl.IndexImpl
-	 * @see org.eclipse.wst.ws.internal.model.v10.rtindex.impl.RTIndexPackageImpl#getIndex()
-	 * @generated
-	 */
-	int INDEX = 2;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEX__NAME = 0;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEX__DESCRIPTION = 1;
-
-	/**
-	 * The feature id for the '<em><b>Registry</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEX__REGISTRY = 2;
-
-	/**
-	 * The feature id for the '<em><b>Taxonomy</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEX__TAXONOMY = 3;
-
-	/**
-	 * The number of structural features of the the '<em>Index</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEX_FEATURE_COUNT = 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.ws.internal.model.v10.rtindex.impl.NameImpl <em>Name</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.wst.ws.internal.model.v10.rtindex.impl.NameImpl
-	 * @see org.eclipse.wst.ws.internal.model.v10.rtindex.impl.RTIndexPackageImpl#getName_()
-	 * @generated
-	 */
-	int NAME = 3;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NAME__VALUE = 0;
-
-	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NAME__LANG = 1;
-
-	/**
-	 * The number of structural features of the the '<em>Name</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NAME_FEATURE_COUNT = 2;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.ws.internal.model.v10.rtindex.Description <em>Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Description</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.rtindex.Description
-	 * @generated
-	 */
-	EClass getDescription();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.ws.internal.model.v10.rtindex.Description#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.rtindex.Description#getValue()
-	 * @see #getDescription()
-	 * @generated
-	 */
-	EAttribute getDescription_Value();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.ws.internal.model.v10.rtindex.Description#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Lang</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.rtindex.Description#getLang()
-	 * @see #getDescription()
-	 * @generated
-	 */
-	EAttribute getDescription_Lang();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.ws.internal.model.v10.rtindex.DocumentRoot <em>Document Root</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Document Root</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.rtindex.DocumentRoot
-	 * @generated
-	 */
-	EClass getDocumentRoot();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.wst.ws.internal.model.v10.rtindex.DocumentRoot#getMixed <em>Mixed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Mixed</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.rtindex.DocumentRoot#getMixed()
-	 * @see #getDocumentRoot()
-	 * @generated
-	 */
-	EAttribute getDocumentRoot_Mixed();
-
-	/**
-	 * Returns the meta object for the map '{@link org.eclipse.wst.ws.internal.model.v10.rtindex.DocumentRoot#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the map '<em>XMLNS Prefix Map</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.rtindex.DocumentRoot#getXMLNSPrefixMap()
-	 * @see #getDocumentRoot()
-	 * @generated
-	 */
-	EReference getDocumentRoot_XMLNSPrefixMap();
-
-	/**
-	 * Returns the meta object for the map '{@link org.eclipse.wst.ws.internal.model.v10.rtindex.DocumentRoot#getXSISchemaLocation <em>XSI Schema Location</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the map '<em>XSI Schema Location</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.rtindex.DocumentRoot#getXSISchemaLocation()
-	 * @see #getDocumentRoot()
-	 * @generated
-	 */
-	EReference getDocumentRoot_XSISchemaLocation();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.wst.ws.internal.model.v10.rtindex.DocumentRoot#getDescription <em>Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Description</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.rtindex.DocumentRoot#getDescription()
-	 * @see #getDocumentRoot()
-	 * @generated
-	 */
-	EReference getDocumentRoot_Description();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.wst.ws.internal.model.v10.rtindex.DocumentRoot#getIndex <em>Index</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Index</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.rtindex.DocumentRoot#getIndex()
-	 * @see #getDocumentRoot()
-	 * @generated
-	 */
-	EReference getDocumentRoot_Index();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.wst.ws.internal.model.v10.rtindex.DocumentRoot#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Name</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.rtindex.DocumentRoot#getName()
-	 * @see #getDocumentRoot()
-	 * @generated
-	 */
-	EReference getDocumentRoot_Name();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.ws.internal.model.v10.rtindex.Index <em>Index</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Index</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.rtindex.Index
-	 * @generated
-	 */
-	EClass getIndex();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.wst.ws.internal.model.v10.rtindex.Index#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Name</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.rtindex.Index#getName()
-	 * @see #getIndex()
-	 * @generated
-	 */
-	EReference getIndex_Name();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.wst.ws.internal.model.v10.rtindex.Index#getDescription <em>Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Description</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.rtindex.Index#getDescription()
-	 * @see #getIndex()
-	 * @generated
-	 */
-	EReference getIndex_Description();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.wst.ws.internal.model.v10.rtindex.Index#getRegistry <em>Registry</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Registry</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.rtindex.Index#getRegistry()
-	 * @see #getIndex()
-	 * @generated
-	 */
-	EReference getIndex_Registry();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.wst.ws.internal.model.v10.rtindex.Index#getTaxonomy <em>Taxonomy</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Taxonomy</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.rtindex.Index#getTaxonomy()
-	 * @see #getIndex()
-	 * @generated
-	 */
-	EReference getIndex_Taxonomy();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.ws.internal.model.v10.rtindex.Name <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Name</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.rtindex.Name
-	 * @generated
-	 */
-	EClass getName_();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.ws.internal.model.v10.rtindex.Name#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.rtindex.Name#getValue()
-	 * @see #getName_()
-	 * @generated
-	 */
-	EAttribute getName_Value();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.ws.internal.model.v10.rtindex.Name#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Lang</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.rtindex.Name#getLang()
-	 * @see #getName_()
-	 * @generated
-	 */
-	EAttribute getName_Lang();
-
-	/**
-	 * 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
-	 */
-	RTIndexFactory getRTIndexFactory();
-
-} //RTIndexPackage
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/impl/DescriptionImpl.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/impl/DescriptionImpl.java
deleted file mode 100644
index 0f8cb524c..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/impl/DescriptionImpl.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DescriptionImpl.java,v 1.2 2005/12/03 04:06:48 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.rtindex.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.ws.internal.model.v10.rtindex.Description;
-import org.eclipse.wst.ws.internal.model.v10.rtindex.RTIndexPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Description</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.rtindex.impl.DescriptionImpl#getValue <em>Value</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.rtindex.impl.DescriptionImpl#getLang <em>Lang</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DescriptionImpl extends EObjectImpl implements Description {
-	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected String value = VALUE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLang()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LANG_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLang()
-	 * @generated
-	 * @ordered
-	 */
-	protected String lang = LANG_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DescriptionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return RTIndexPackage.eINSTANCE.getDescription();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValue(String newValue) {
-		String oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, RTIndexPackage.DESCRIPTION__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLang() {
-		return lang;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLang(String newLang) {
-		String oldLang = lang;
-		lang = newLang;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, RTIndexPackage.DESCRIPTION__LANG, oldLang, lang));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case RTIndexPackage.DESCRIPTION__VALUE:
-				return getValue();
-			case RTIndexPackage.DESCRIPTION__LANG:
-				return getLang();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case RTIndexPackage.DESCRIPTION__VALUE:
-				setValue((String)newValue);
-				return;
-			case RTIndexPackage.DESCRIPTION__LANG:
-				setLang((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case RTIndexPackage.DESCRIPTION__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-			case RTIndexPackage.DESCRIPTION__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case RTIndexPackage.DESCRIPTION__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-			case RTIndexPackage.DESCRIPTION__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-		}
-		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(" (value: ");
-		result.append(value);
-		result.append(", lang: ");
-		result.append(lang);
-		result.append(')');
-		return result.toString();
-	}
-
-} //DescriptionImpl
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/impl/DocumentRootImpl.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/impl/DocumentRootImpl.java
deleted file mode 100644
index 448dbc14e..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/impl/DocumentRootImpl.java
+++ /dev/null
@@ -1,367 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DocumentRootImpl.java,v 1.2 2005/12/03 04:06:48 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.rtindex.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EMap;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.impl.EStringToStringMapEntryImpl;
-
-import org.eclipse.emf.ecore.util.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.EcoreEMap;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.wst.ws.internal.model.v10.rtindex.Description;
-import org.eclipse.wst.ws.internal.model.v10.rtindex.DocumentRoot;
-import org.eclipse.wst.ws.internal.model.v10.rtindex.Index;
-import org.eclipse.wst.ws.internal.model.v10.rtindex.Name;
-import org.eclipse.wst.ws.internal.model.v10.rtindex.RTIndexPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Document Root</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.rtindex.impl.DocumentRootImpl#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.rtindex.impl.DocumentRootImpl#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.rtindex.impl.DocumentRootImpl#getXSISchemaLocation <em>XSI Schema Location</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.rtindex.impl.DocumentRootImpl#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.rtindex.impl.DocumentRootImpl#getIndex <em>Index</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.rtindex.impl.DocumentRootImpl#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DocumentRootImpl extends EObjectImpl implements DocumentRoot {
-	/**
-	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMixed()
-	 * @generated
-	 * @ordered
-	 */
-	protected FeatureMap mixed = null;
-
-	/**
-	 * The cached value of the '{@link #getXMLNSPrefixMap() <em>XMLNS Prefix Map</em>}' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getXMLNSPrefixMap()
-	 * @generated
-	 * @ordered
-	 */
-	protected EMap xMLNSPrefixMap = null;
-
-	/**
-	 * The cached value of the '{@link #getXSISchemaLocation() <em>XSI Schema Location</em>}' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getXSISchemaLocation()
-	 * @generated
-	 * @ordered
-	 */
-	protected EMap xSISchemaLocation = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DocumentRootImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return RTIndexPackage.eINSTANCE.getDocumentRoot();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureMap getMixed() {
-		if (mixed == null) {
-			mixed = new BasicFeatureMap(this, RTIndexPackage.DOCUMENT_ROOT__MIXED);
-		}
-		return mixed;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EMap getXMLNSPrefixMap() {
-		if (xMLNSPrefixMap == null) {
-			xMLNSPrefixMap = new EcoreEMap(EcorePackage.eINSTANCE.getEStringToStringMapEntry(), EStringToStringMapEntryImpl.class, this, RTIndexPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP);
-		}
-		return xMLNSPrefixMap;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EMap getXSISchemaLocation() {
-		if (xSISchemaLocation == null) {
-			xSISchemaLocation = new EcoreEMap(EcorePackage.eINSTANCE.getEStringToStringMapEntry(), EStringToStringMapEntryImpl.class, this, RTIndexPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION);
-		}
-		return xSISchemaLocation;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Description getDescription() {
-		return (Description)getMixed().get(RTIndexPackage.eINSTANCE.getDocumentRoot_Description(), true);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetDescription(Description newDescription, NotificationChain msgs) {
-		return ((FeatureMap.Internal)getMixed()).basicAdd(RTIndexPackage.eINSTANCE.getDocumentRoot_Description(), newDescription, null);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDescription(Description newDescription) {
-		((FeatureMap.Internal)getMixed()).set(RTIndexPackage.eINSTANCE.getDocumentRoot_Description(), newDescription);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Index getIndex() {
-		return (Index)getMixed().get(RTIndexPackage.eINSTANCE.getDocumentRoot_Index(), true);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetIndex(Index newIndex, NotificationChain msgs) {
-		return ((FeatureMap.Internal)getMixed()).basicAdd(RTIndexPackage.eINSTANCE.getDocumentRoot_Index(), newIndex, null);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIndex(Index newIndex) {
-		((FeatureMap.Internal)getMixed()).set(RTIndexPackage.eINSTANCE.getDocumentRoot_Index(), newIndex);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Name getName() {
-		return (Name)getMixed().get(RTIndexPackage.eINSTANCE.getDocumentRoot_Name(), true);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetName(Name newName, NotificationChain msgs) {
-		return ((FeatureMap.Internal)getMixed()).basicAdd(RTIndexPackage.eINSTANCE.getDocumentRoot_Name(), newName, null);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(Name newName) {
-		((FeatureMap.Internal)getMixed()).set(RTIndexPackage.eINSTANCE.getDocumentRoot_Name(), newName);
-	}
-
-	/**
-	 * <!-- 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 RTIndexPackage.DOCUMENT_ROOT__MIXED:
-					return ((InternalEList)getMixed()).basicRemove(otherEnd, msgs);
-				case RTIndexPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
-					return ((InternalEList)getXMLNSPrefixMap()).basicRemove(otherEnd, msgs);
-				case RTIndexPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
-					return ((InternalEList)getXSISchemaLocation()).basicRemove(otherEnd, msgs);
-				case RTIndexPackage.DOCUMENT_ROOT__DESCRIPTION:
-					return basicSetDescription(null, msgs);
-				case RTIndexPackage.DOCUMENT_ROOT__INDEX:
-					return basicSetIndex(null, msgs);
-				case RTIndexPackage.DOCUMENT_ROOT__NAME:
-					return basicSetName(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 RTIndexPackage.DOCUMENT_ROOT__MIXED:
-				return getMixed();
-			case RTIndexPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
-				return getXMLNSPrefixMap();
-			case RTIndexPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
-				return getXSISchemaLocation();
-			case RTIndexPackage.DOCUMENT_ROOT__DESCRIPTION:
-				return getDescription();
-			case RTIndexPackage.DOCUMENT_ROOT__INDEX:
-				return getIndex();
-			case RTIndexPackage.DOCUMENT_ROOT__NAME:
-				return getName();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case RTIndexPackage.DOCUMENT_ROOT__MIXED:
-				getMixed().clear();
-				getMixed().addAll((Collection)newValue);
-				return;
-			case RTIndexPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
-				getXMLNSPrefixMap().clear();
-				getXMLNSPrefixMap().addAll((Collection)newValue);
-				return;
-			case RTIndexPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
-				getXSISchemaLocation().clear();
-				getXSISchemaLocation().addAll((Collection)newValue);
-				return;
-			case RTIndexPackage.DOCUMENT_ROOT__DESCRIPTION:
-				setDescription((Description)newValue);
-				return;
-			case RTIndexPackage.DOCUMENT_ROOT__INDEX:
-				setIndex((Index)newValue);
-				return;
-			case RTIndexPackage.DOCUMENT_ROOT__NAME:
-				setName((Name)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case RTIndexPackage.DOCUMENT_ROOT__MIXED:
-				getMixed().clear();
-				return;
-			case RTIndexPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
-				getXMLNSPrefixMap().clear();
-				return;
-			case RTIndexPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
-				getXSISchemaLocation().clear();
-				return;
-			case RTIndexPackage.DOCUMENT_ROOT__DESCRIPTION:
-				setDescription((Description)null);
-				return;
-			case RTIndexPackage.DOCUMENT_ROOT__INDEX:
-				setIndex((Index)null);
-				return;
-			case RTIndexPackage.DOCUMENT_ROOT__NAME:
-				setName((Name)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case RTIndexPackage.DOCUMENT_ROOT__MIXED:
-				return mixed != null && !mixed.isEmpty();
-			case RTIndexPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
-				return xMLNSPrefixMap != null && !xMLNSPrefixMap.isEmpty();
-			case RTIndexPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
-				return xSISchemaLocation != null && !xSISchemaLocation.isEmpty();
-			case RTIndexPackage.DOCUMENT_ROOT__DESCRIPTION:
-				return getDescription() != null;
-			case RTIndexPackage.DOCUMENT_ROOT__INDEX:
-				return getIndex() != null;
-			case RTIndexPackage.DOCUMENT_ROOT__NAME:
-				return getName() != 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(" (mixed: ");
-		result.append(mixed);
-		result.append(')');
-		return result.toString();
-	}
-
-} //DocumentRootImpl
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/impl/IndexImpl.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/impl/IndexImpl.java
deleted file mode 100644
index 98dc08e65..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/impl/IndexImpl.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: IndexImpl.java,v 1.2 2005/12/03 04:06:48 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.rtindex.impl;
-
-import java.util.Collection;
-
-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.impl.EObjectImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.wst.ws.internal.model.v10.registry.Registry;
-
-import org.eclipse.wst.ws.internal.model.v10.rtindex.Description;
-import org.eclipse.wst.ws.internal.model.v10.rtindex.Index;
-import org.eclipse.wst.ws.internal.model.v10.rtindex.Name;
-import org.eclipse.wst.ws.internal.model.v10.rtindex.RTIndexPackage;
-
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Index</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.rtindex.impl.IndexImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.rtindex.impl.IndexImpl#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.rtindex.impl.IndexImpl#getRegistry <em>Registry</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.rtindex.impl.IndexImpl#getTaxonomy <em>Taxonomy</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class IndexImpl extends EObjectImpl implements Index {
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList name = null;
-
-	/**
-	 * The cached value of the '{@link #getDescription() <em>Description</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList description = null;
-
-	/**
-	 * The cached value of the '{@link #getRegistry() <em>Registry</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRegistry()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList registry = null;
-
-	/**
-	 * The cached value of the '{@link #getTaxonomy() <em>Taxonomy</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTaxonomy()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList taxonomy = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IndexImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return RTIndexPackage.eINSTANCE.getIndex();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getName() {
-		if (name == null) {
-			name = new EObjectContainmentEList(Name.class, this, RTIndexPackage.INDEX__NAME);
-		}
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescription() {
-		if (description == null) {
-			description = new EObjectContainmentEList(Description.class, this, RTIndexPackage.INDEX__DESCRIPTION);
-		}
-		return description;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getRegistry() {
-		if (registry == null) {
-			registry = new EObjectContainmentEList(Registry.class, this, RTIndexPackage.INDEX__REGISTRY);
-		}
-		return registry;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getTaxonomy() {
-		if (taxonomy == null) {
-			taxonomy = new EObjectContainmentEList(Taxonomy.class, this, RTIndexPackage.INDEX__TAXONOMY);
-		}
-		return taxonomy;
-	}
-
-	/**
-	 * <!-- 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 RTIndexPackage.INDEX__NAME:
-					return ((InternalEList)getName()).basicRemove(otherEnd, msgs);
-				case RTIndexPackage.INDEX__DESCRIPTION:
-					return ((InternalEList)getDescription()).basicRemove(otherEnd, msgs);
-				case RTIndexPackage.INDEX__REGISTRY:
-					return ((InternalEList)getRegistry()).basicRemove(otherEnd, msgs);
-				case RTIndexPackage.INDEX__TAXONOMY:
-					return ((InternalEList)getTaxonomy()).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 RTIndexPackage.INDEX__NAME:
-				return getName();
-			case RTIndexPackage.INDEX__DESCRIPTION:
-				return getDescription();
-			case RTIndexPackage.INDEX__REGISTRY:
-				return getRegistry();
-			case RTIndexPackage.INDEX__TAXONOMY:
-				return getTaxonomy();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case RTIndexPackage.INDEX__NAME:
-				getName().clear();
-				getName().addAll((Collection)newValue);
-				return;
-			case RTIndexPackage.INDEX__DESCRIPTION:
-				getDescription().clear();
-				getDescription().addAll((Collection)newValue);
-				return;
-			case RTIndexPackage.INDEX__REGISTRY:
-				getRegistry().clear();
-				getRegistry().addAll((Collection)newValue);
-				return;
-			case RTIndexPackage.INDEX__TAXONOMY:
-				getTaxonomy().clear();
-				getTaxonomy().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case RTIndexPackage.INDEX__NAME:
-				getName().clear();
-				return;
-			case RTIndexPackage.INDEX__DESCRIPTION:
-				getDescription().clear();
-				return;
-			case RTIndexPackage.INDEX__REGISTRY:
-				getRegistry().clear();
-				return;
-			case RTIndexPackage.INDEX__TAXONOMY:
-				getTaxonomy().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case RTIndexPackage.INDEX__NAME:
-				return name != null && !name.isEmpty();
-			case RTIndexPackage.INDEX__DESCRIPTION:
-				return description != null && !description.isEmpty();
-			case RTIndexPackage.INDEX__REGISTRY:
-				return registry != null && !registry.isEmpty();
-			case RTIndexPackage.INDEX__TAXONOMY:
-				return taxonomy != null && !taxonomy.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-} //IndexImpl
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/impl/NameImpl.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/impl/NameImpl.java
deleted file mode 100644
index 3b6852492..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/impl/NameImpl.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: NameImpl.java,v 1.2 2005/12/03 04:06:48 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.rtindex.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.ws.internal.model.v10.rtindex.Name;
-import org.eclipse.wst.ws.internal.model.v10.rtindex.RTIndexPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Name</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.rtindex.impl.NameImpl#getValue <em>Value</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.rtindex.impl.NameImpl#getLang <em>Lang</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class NameImpl extends EObjectImpl implements Name {
-	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected String value = VALUE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLang()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LANG_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLang()
-	 * @generated
-	 * @ordered
-	 */
-	protected String lang = LANG_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected NameImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return RTIndexPackage.eINSTANCE.getName_();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValue(String newValue) {
-		String oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, RTIndexPackage.NAME__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLang() {
-		return lang;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLang(String newLang) {
-		String oldLang = lang;
-		lang = newLang;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, RTIndexPackage.NAME__LANG, oldLang, lang));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case RTIndexPackage.NAME__VALUE:
-				return getValue();
-			case RTIndexPackage.NAME__LANG:
-				return getLang();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case RTIndexPackage.NAME__VALUE:
-				setValue((String)newValue);
-				return;
-			case RTIndexPackage.NAME__LANG:
-				setLang((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case RTIndexPackage.NAME__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-			case RTIndexPackage.NAME__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case RTIndexPackage.NAME__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-			case RTIndexPackage.NAME__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-		}
-		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(" (value: ");
-		result.append(value);
-		result.append(", lang: ");
-		result.append(lang);
-		result.append(')');
-		return result.toString();
-	}
-
-} //NameImpl
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/impl/RTIndexFactoryImpl.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/impl/RTIndexFactoryImpl.java
deleted file mode 100644
index 1efa33a99..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/impl/RTIndexFactoryImpl.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: RTIndexFactoryImpl.java,v 1.2 2005/12/03 04:06:48 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.rtindex.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.wst.ws.internal.model.v10.rtindex.*;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class RTIndexFactoryImpl extends EFactoryImpl implements RTIndexFactory {
-	/**
-	 * Creates and instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RTIndexFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case RTIndexPackage.DESCRIPTION: return createDescription();
-			case RTIndexPackage.DOCUMENT_ROOT: return createDocumentRoot();
-			case RTIndexPackage.INDEX: return createIndex();
-			case RTIndexPackage.NAME: return createName();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Description createDescription() {
-		DescriptionImpl description = new DescriptionImpl();
-		return description;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DocumentRoot createDocumentRoot() {
-		DocumentRootImpl documentRoot = new DocumentRootImpl();
-		return documentRoot;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Index createIndex() {
-		IndexImpl index = new IndexImpl();
-		return index;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Name createName() {
-		NameImpl name = new NameImpl();
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RTIndexPackage getRTIndexPackage() {
-		return (RTIndexPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	public static RTIndexPackage getPackage() {
-		return RTIndexPackage.eINSTANCE;
-	}
-
-} //RTIndexFactoryImpl
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/impl/RTIndexPackageImpl.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/impl/RTIndexPackageImpl.java
deleted file mode 100644
index e99755de3..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/impl/RTIndexPackageImpl.java
+++ /dev/null
@@ -1,573 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: RTIndexPackageImpl.java,v 1.2 2005/12/03 04:06:48 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.rtindex.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-
-import org.eclipse.emf.ecore.xml.type.impl.XMLTypePackageImpl;
-
-import org.eclipse.wst.ws.internal.model.v10.registry.RegistryPackage;
-
-import org.eclipse.wst.ws.internal.model.v10.registry.impl.RegistryPackageImpl;
-
-import org.eclipse.wst.ws.internal.model.v10.rtindex.Description;
-import org.eclipse.wst.ws.internal.model.v10.rtindex.DocumentRoot;
-import org.eclipse.wst.ws.internal.model.v10.rtindex.Index;
-import org.eclipse.wst.ws.internal.model.v10.rtindex.Name;
-import org.eclipse.wst.ws.internal.model.v10.rtindex.RTIndexFactory;
-import org.eclipse.wst.ws.internal.model.v10.rtindex.RTIndexPackage;
-
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.TaxonomyPackage;
-
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.impl.TaxonomyPackageImpl;
-
-import org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistryPackage;
-
-import org.eclipse.wst.ws.internal.model.v10.uddiregistry.impl.UDDIRegistryPackageImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class RTIndexPackageImpl extends EPackageImpl implements RTIndexPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass descriptionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass documentRootEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass indexEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass nameEClass = 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.ws.internal.model.v10.rtindex.RTIndexPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private RTIndexPackageImpl() {
-		super(eNS_URI, RTIndexFactory.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 RTIndexPackage init() {
-		if (isInited) return (RTIndexPackage)EPackage.Registry.INSTANCE.getEPackage(RTIndexPackage.eNS_URI);
-
-		// Obtain or create and register package
-		RTIndexPackageImpl theRTIndexPackage = (RTIndexPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof RTIndexPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new RTIndexPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		XMLTypePackageImpl.init();
-
-		// Obtain or create and register interdependencies
-		TaxonomyPackageImpl theTaxonomyPackage = (TaxonomyPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(TaxonomyPackage.eNS_URI) instanceof TaxonomyPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(TaxonomyPackage.eNS_URI) : TaxonomyPackageImpl.eINSTANCE);
-		RegistryPackageImpl theRegistryPackage = (RegistryPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(RegistryPackage.eNS_URI) instanceof RegistryPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RegistryPackage.eNS_URI) : RegistryPackageImpl.eINSTANCE);
-		UDDIRegistryPackageImpl theUDDIRegistryPackage = (UDDIRegistryPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(UDDIRegistryPackage.eNS_URI) instanceof UDDIRegistryPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(UDDIRegistryPackage.eNS_URI) : UDDIRegistryPackageImpl.eINSTANCE);
-
-		// Create package meta-data objects
-		theRTIndexPackage.createPackageContents();
-		theTaxonomyPackage.createPackageContents();
-		theRegistryPackage.createPackageContents();
-		theUDDIRegistryPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theRTIndexPackage.initializePackageContents();
-		theTaxonomyPackage.initializePackageContents();
-		theRegistryPackage.initializePackageContents();
-		theUDDIRegistryPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theRTIndexPackage.freeze();
-
-		return theRTIndexPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDescription() {
-		return descriptionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDescription_Value() {
-		return (EAttribute)descriptionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDescription_Lang() {
-		return (EAttribute)descriptionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDocumentRoot() {
-		return documentRootEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDocumentRoot_Mixed() {
-		return (EAttribute)documentRootEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDocumentRoot_XMLNSPrefixMap() {
-		return (EReference)documentRootEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDocumentRoot_XSISchemaLocation() {
-		return (EReference)documentRootEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDocumentRoot_Description() {
-		return (EReference)documentRootEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDocumentRoot_Index() {
-		return (EReference)documentRootEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDocumentRoot_Name() {
-		return (EReference)documentRootEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getIndex() {
-		return indexEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getIndex_Name() {
-		return (EReference)indexEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getIndex_Description() {
-		return (EReference)indexEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getIndex_Registry() {
-		return (EReference)indexEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getIndex_Taxonomy() {
-		return (EReference)indexEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getName_() {
-		return nameEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getName_Value() {
-		return (EAttribute)nameEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getName_Lang() {
-		return (EAttribute)nameEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RTIndexFactory getRTIndexFactory() {
-		return (RTIndexFactory)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
-		descriptionEClass = createEClass(DESCRIPTION);
-		createEAttribute(descriptionEClass, DESCRIPTION__VALUE);
-		createEAttribute(descriptionEClass, DESCRIPTION__LANG);
-
-		documentRootEClass = createEClass(DOCUMENT_ROOT);
-		createEAttribute(documentRootEClass, DOCUMENT_ROOT__MIXED);
-		createEReference(documentRootEClass, DOCUMENT_ROOT__XMLNS_PREFIX_MAP);
-		createEReference(documentRootEClass, DOCUMENT_ROOT__XSI_SCHEMA_LOCATION);
-		createEReference(documentRootEClass, DOCUMENT_ROOT__DESCRIPTION);
-		createEReference(documentRootEClass, DOCUMENT_ROOT__INDEX);
-		createEReference(documentRootEClass, DOCUMENT_ROOT__NAME);
-
-		indexEClass = createEClass(INDEX);
-		createEReference(indexEClass, INDEX__NAME);
-		createEReference(indexEClass, INDEX__DESCRIPTION);
-		createEReference(indexEClass, INDEX__REGISTRY);
-		createEReference(indexEClass, INDEX__TAXONOMY);
-
-		nameEClass = createEClass(NAME);
-		createEAttribute(nameEClass, NAME__VALUE);
-		createEAttribute(nameEClass, NAME__LANG);
-	}
-
-	/**
-	 * <!-- 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
-		XMLTypePackageImpl theXMLTypePackage = (XMLTypePackageImpl)EPackage.Registry.INSTANCE.getEPackage(XMLTypePackage.eNS_URI);
-		RegistryPackageImpl theRegistryPackage = (RegistryPackageImpl)EPackage.Registry.INSTANCE.getEPackage(RegistryPackage.eNS_URI);
-		TaxonomyPackageImpl theTaxonomyPackage = (TaxonomyPackageImpl)EPackage.Registry.INSTANCE.getEPackage(TaxonomyPackage.eNS_URI);
-
-		// Add supertypes to classes
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(descriptionEClass, Description.class, "Description", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getDescription_Value(), theXMLTypePackage.getString(), "value", null, 0, 1, Description.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getDescription_Lang(), theXMLTypePackage.getLanguage(), "lang", null, 0, 1, Description.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(documentRootEClass, DocumentRoot.class, "DocumentRoot", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getDocumentRoot_Mixed(), ecorePackage.getEFeatureMapEntry(), "mixed", null, 0, -1, null, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getDocumentRoot_XMLNSPrefixMap(), ecorePackage.getEStringToStringMapEntry(), null, "xMLNSPrefixMap", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getDocumentRoot_XSISchemaLocation(), ecorePackage.getEStringToStringMapEntry(), null, "xSISchemaLocation", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getDocumentRoot_Description(), this.getDescription(), null, "description", null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEReference(getDocumentRoot_Index(), this.getIndex(), null, "index", null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEReference(getDocumentRoot_Name(), this.getName_(), null, "name", null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-
-		initEClass(indexEClass, Index.class, "Index", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getIndex_Name(), this.getName_(), null, "name", null, 1, -1, Index.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getIndex_Description(), this.getDescription(), null, "description", null, 1, -1, Index.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getIndex_Registry(), theRegistryPackage.getRegistry(), null, "registry", null, 0, -1, Index.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getIndex_Taxonomy(), theTaxonomyPackage.getTaxonomy(), null, "taxonomy", null, 0, -1, Index.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(nameEClass, Name.class, "Name", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getName_Value(), theXMLTypePackage.getString(), "value", null, 0, 1, Name.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getName_Lang(), theXMLTypePackage.getLanguage(), "lang", null, 0, 1, Name.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		// Create resource
-		createResource(eNS_URI);
-
-		// Create annotations
-		// http:///org/eclipse/emf/ecore/util/ExtendedMetaData
-		createExtendedMetaDataAnnotations();
-	}
-
-	/**
-	 * Initializes the annotations for <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void createExtendedMetaDataAnnotations() {
-		String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData";			
-		addAnnotation
-		  (descriptionEClass, 
-		   source, 
-		   new String[] {
-			 "name", "Description",
-			 "kind", "simple"
-		   });		
-		addAnnotation
-		  (getDescription_Value(), 
-		   source, 
-		   new String[] {
-			 "name", ":0",
-			 "kind", "simple"
-		   });		
-		addAnnotation
-		  (getDescription_Lang(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "lang",
-			 "namespace", "http://www.w3.org/XML/1998/namespace"
-		   });		
-		addAnnotation
-		  (documentRootEClass, 
-		   source, 
-		   new String[] {
-			 "name", "",
-			 "kind", "mixed"
-		   });		
-		addAnnotation
-		  (getDocumentRoot_Mixed(), 
-		   source, 
-		   new String[] {
-			 "kind", "elementWildcard",
-			 "name", ":mixed"
-		   });		
-		addAnnotation
-		  (getDocumentRoot_XMLNSPrefixMap(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "xmlns:prefix"
-		   });		
-		addAnnotation
-		  (getDocumentRoot_XSISchemaLocation(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "xsi:schemaLocation"
-		   });		
-		addAnnotation
-		  (getDocumentRoot_Description(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "description",
-			 "namespace", "##targetNamespace"
-		   });		
-		addAnnotation
-		  (getDocumentRoot_Index(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "index",
-			 "namespace", "##targetNamespace"
-		   });		
-		addAnnotation
-		  (getDocumentRoot_Name(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "name",
-			 "namespace", "##targetNamespace"
-		   });		
-		addAnnotation
-		  (indexEClass, 
-		   source, 
-		   new String[] {
-			 "name", "Index",
-			 "kind", "elementOnly"
-		   });		
-		addAnnotation
-		  (getIndex_Name(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "name"
-		   });		
-		addAnnotation
-		  (getIndex_Description(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "description"
-		   });		
-		addAnnotation
-		  (getIndex_Registry(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "registry",
-			 "namespace", "http://eclipse.org/wst/ws/internal/model/v10/registry"
-		   });		
-		addAnnotation
-		  (getIndex_Taxonomy(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "taxonomy",
-			 "namespace", "http://eclipse.org/wst/ws/internal/model/v10/taxonomy"
-		   });		
-		addAnnotation
-		  (nameEClass, 
-		   source, 
-		   new String[] {
-			 "name", "Name",
-			 "kind", "simple"
-		   });		
-		addAnnotation
-		  (getName_Value(), 
-		   source, 
-		   new String[] {
-			 "name", ":0",
-			 "kind", "simple"
-		   });		
-		addAnnotation
-		  (getName_Lang(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "lang",
-			 "namespace", "http://www.w3.org/XML/1998/namespace"
-		   });
-	}
-
-} //RTIndexPackageImpl
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/util/RTIndexAdapterFactory.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/util/RTIndexAdapterFactory.java
deleted file mode 100644
index 09de415a7..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/util/RTIndexAdapterFactory.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: RTIndexAdapterFactory.java,v 1.2 2005/12/03 04:06:47 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.rtindex.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.ecore.EObject;
-
-import org.eclipse.wst.ws.internal.model.v10.rtindex.*;
-
-/**
- * <!-- 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.ws.internal.model.v10.rtindex.RTIndexPackage
- * @generated
- */
-public class RTIndexAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static RTIndexPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RTIndexAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = RTIndexPackage.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 RTIndexSwitch modelSwitch =
-		new RTIndexSwitch() {
-			public Object caseDescription(Description object) {
-				return createDescriptionAdapter();
-			}
-			public Object caseDocumentRoot(DocumentRoot object) {
-				return createDocumentRootAdapter();
-			}
-			public Object caseIndex(Index object) {
-				return createIndexAdapter();
-			}
-			public Object caseName(Name object) {
-				return createNameAdapter();
-			}
-			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.ws.internal.model.v10.rtindex.Description <em>Description</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.ws.internal.model.v10.rtindex.Description
-	 * @generated
-	 */
-	public Adapter createDescriptionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.wst.ws.internal.model.v10.rtindex.DocumentRoot <em>Document Root</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.ws.internal.model.v10.rtindex.DocumentRoot
-	 * @generated
-	 */
-	public Adapter createDocumentRootAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.wst.ws.internal.model.v10.rtindex.Index <em>Index</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.ws.internal.model.v10.rtindex.Index
-	 * @generated
-	 */
-	public Adapter createIndexAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.wst.ws.internal.model.v10.rtindex.Name <em>Name</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.ws.internal.model.v10.rtindex.Name
-	 * @generated
-	 */
-	public Adapter createNameAdapter() {
-		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;
-	}
-
-} //RTIndexAdapterFactory
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/util/RTIndexResourceFactoryImpl.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/util/RTIndexResourceFactoryImpl.java
deleted file mode 100644
index 6d09fcc4c..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/util/RTIndexResourceFactoryImpl.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: RTIndexResourceFactoryImpl.java,v 1.2 2005/12/03 04:06:47 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.rtindex.util;
-
-import org.eclipse.emf.common.util.URI;
-
-import org.eclipse.emf.ecore.resource.Resource;
-
-import org.eclipse.emf.ecore.util.ExtendedMetaData;
-
-import org.eclipse.emf.ecore.xmi.XMLResource;
-
-import org.eclipse.emf.ecore.xmi.impl.XMLResourceFactoryImpl;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource Factory</b> associated with the package.
- * <!-- end-user-doc -->
- * @see org.eclipse.wst.ws.internal.model.v10.rtindex.util.RTIndexResourceImpl
- * @generated
- */
-public class RTIndexResourceFactoryImpl extends XMLResourceFactoryImpl {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ExtendedMetaData extendedMetaData;
-
-	/**
-	 * Creates an instance of the resource factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RTIndexResourceFactoryImpl() {
-		super();
-		extendedMetaData = ExtendedMetaData.INSTANCE;
-	}
-
-	/**
-	 * Creates an instance of the resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Resource createResource(URI uri) {
-		XMLResource result = new RTIndexResourceImpl(uri);
-		result.getDefaultSaveOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, extendedMetaData);
-		result.getDefaultLoadOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, extendedMetaData);
-
-		result.getDefaultSaveOptions().put(XMLResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE);
-		result.getDefaultSaveOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
-
-		result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE);
-		return result;
-	}
-
-} //RTIndexResourceFactoryImpl
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/util/RTIndexResourceImpl.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/util/RTIndexResourceImpl.java
deleted file mode 100644
index 9e3164857..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/util/RTIndexResourceImpl.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: RTIndexResourceImpl.java,v 1.2 2005/12/03 04:06:47 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.rtindex.util;
-
-import org.eclipse.emf.common.util.URI;
-
-import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource </b> associated with the package.
- * <!-- end-user-doc -->
- * @see org.eclipse.wst.ws.internal.model.v10.rtindex.util.RTIndexResourceFactoryImpl
- * @generated
- */
-public class RTIndexResourceImpl extends XMLResourceImpl {
-	/**
-	 * Creates an instance of the resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param uri the URI of the new resource.
-	 * @generated
-	 */
-	public RTIndexResourceImpl(URI uri) {
-		super(uri);
-	}
-
-} //RTIndexResourceFactoryImpl
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/util/RTIndexSwitch.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/util/RTIndexSwitch.java
deleted file mode 100644
index be85be382..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/util/RTIndexSwitch.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: RTIndexSwitch.java,v 1.2 2005/12/03 04:06:47 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.rtindex.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.wst.ws.internal.model.v10.rtindex.*;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) 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.ws.internal.model.v10.rtindex.RTIndexPackage
- * @generated
- */
-public class RTIndexSwitch {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static RTIndexPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RTIndexSwitch() {
-		if (modelPackage == null) {
-			modelPackage = RTIndexPackage.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) {
-		return doSwitch(theEObject.eClass(), theEObject);
-	}
-
-	/**
-	 * 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
-	 */
-	protected Object doSwitch(EClass theEClass, EObject theEObject) {
-		if (theEClass.eContainer() == modelPackage) {
-			return doSwitch(theEClass.getClassifierID(), theEObject);
-		}
-		else {
-			List eSuperTypes = theEClass.getESuperTypes();
-			return
-				eSuperTypes.isEmpty() ?
-					defaultCase(theEObject) :
-					doSwitch((EClass)eSuperTypes.get(0), theEObject);
-		}
-	}
-
-	/**
-	 * 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
-	 */
-	protected Object doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case RTIndexPackage.DESCRIPTION: {
-				Description description = (Description)theEObject;
-				Object result = caseDescription(description);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case RTIndexPackage.DOCUMENT_ROOT: {
-				DocumentRoot documentRoot = (DocumentRoot)theEObject;
-				Object result = caseDocumentRoot(documentRoot);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case RTIndexPackage.INDEX: {
-				Index index = (Index)theEObject;
-				Object result = caseIndex(index);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case RTIndexPackage.NAME: {
-				Name name = (Name)theEObject;
-				Object result = caseName(name);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Description</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>Description</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDescription(Description object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Document Root</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>Document Root</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDocumentRoot(DocumentRoot object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Index</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>Index</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseIndex(Index object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Name</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>Name</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseName(Name 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;
-	}
-
-} //RTIndexSwitch
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/Category.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/Category.java
deleted file mode 100644
index 153d967dc..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/Category.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Category.java,v 1.2 2005/12/03 04:06:49 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.taxonomy;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Category</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.Category#getNlname <em>Nlname</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.Category#getCategory <em>Category</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.Category#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.Category#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.TaxonomyPackage#getCategory()
- * @model 
- * @generated
- */
-public interface Category extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Nlname</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.wst.ws.internal.model.v10.taxonomy.Name}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Nlname</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>Nlname</em>' containment reference list.
-	 * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.TaxonomyPackage#getCategory_Nlname()
-	 * @model type="org.eclipse.wst.ws.internal.model.v10.taxonomy.Name" containment="true" resolveProxies="false"
-	 * @generated
-	 */
-	EList getNlname();
-
-	/**
-	 * Returns the value of the '<em><b>Category</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.wst.ws.internal.model.v10.taxonomy.Category}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Category</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>Category</em>' containment reference list.
-	 * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.TaxonomyPackage#getCategory_Category()
-	 * @model type="org.eclipse.wst.ws.internal.model.v10.taxonomy.Category" containment="true" resolveProxies="false"
-	 * @generated
-	 */
-	EList getCategory();
-
-	/**
-	 * Returns the value of the '<em><b>Code</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Code</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Code</em>' attribute.
-	 * @see #setCode(String)
-	 * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.TaxonomyPackage#getCategory_Code()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getCode();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.Category#getCode <em>Code</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Code</em>' attribute.
-	 * @see #getCode()
-	 * @generated
-	 */
-	void setCode(String 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.wst.ws.internal.model.v10.taxonomy.TaxonomyPackage#getCategory_Name()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.Category#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);
-
-} // Category
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/DocumentRoot.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/DocumentRoot.java
deleted file mode 100644
index d7024e4c7..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/DocumentRoot.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DocumentRoot.java,v 1.2 2005/12/03 04:06:49 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.taxonomy;
-
-import org.eclipse.emf.common.util.EMap;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Document Root</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.DocumentRoot#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.DocumentRoot#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.DocumentRoot#getXSISchemaLocation <em>XSI Schema Location</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.DocumentRoot#getCategory <em>Category</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.DocumentRoot#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.DocumentRoot#getTaxonomy <em>Taxonomy</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.TaxonomyPackage#getDocumentRoot()
- * @model 
- * @generated
- */
-public interface DocumentRoot extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Mixed</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>Mixed</em>' attribute list.
-	 * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.TaxonomyPackage#getDocumentRoot_Mixed()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
-	 * @generated
-	 */
-	FeatureMap getMixed();
-
-	/**
-	 * Returns the value of the '<em><b>XMLNS Prefix Map</b></em>' map.
-	 * The key is of type {@link java.lang.String},
-	 * and the value is of type {@link java.lang.String},
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>XMLNS Prefix Map</em>' map isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>XMLNS Prefix Map</em>' map.
-	 * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.TaxonomyPackage#getDocumentRoot_XMLNSPrefixMap()
-	 * @model mapType="org.eclipse.emf.ecore.EStringToStringMapEntry" keyType="java.lang.String" valueType="java.lang.String" transient="true"
-	 * @generated
-	 */
-	EMap getXMLNSPrefixMap();
-
-	/**
-	 * Returns the value of the '<em><b>XSI Schema Location</b></em>' map.
-	 * The key is of type {@link java.lang.String},
-	 * and the value is of type {@link java.lang.String},
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>XSI Schema Location</em>' map isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>XSI Schema Location</em>' map.
-	 * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.TaxonomyPackage#getDocumentRoot_XSISchemaLocation()
-	 * @model mapType="org.eclipse.emf.ecore.EStringToStringMapEntry" keyType="java.lang.String" valueType="java.lang.String" transient="true"
-	 * @generated
-	 */
-	EMap getXSISchemaLocation();
-
-	/**
-	 * Returns the value of the '<em><b>Category</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Category</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>Category</em>' containment reference.
-	 * @see #setCategory(Category)
-	 * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.TaxonomyPackage#getDocumentRoot_Category()
-	 * @model containment="true" resolveProxies="false" transient="true" volatile="true" derived="true"
-	 * @generated
-	 */
-	Category getCategory();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.DocumentRoot#getCategory <em>Category</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Category</em>' containment reference.
-	 * @see #getCategory()
-	 * @generated
-	 */
-	void setCategory(Category value);
-
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</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>Name</em>' containment reference.
-	 * @see #setName(Name)
-	 * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.TaxonomyPackage#getDocumentRoot_Name()
-	 * @model containment="true" resolveProxies="false" transient="true" volatile="true" derived="true"
-	 * @generated
-	 */
-	Name getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.DocumentRoot#getName <em>Name</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' containment reference.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(Name value);
-
-	/**
-	 * Returns the value of the '<em><b>Taxonomy</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Taxonomy</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>Taxonomy</em>' containment reference.
-	 * @see #setTaxonomy(Taxonomy)
-	 * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.TaxonomyPackage#getDocumentRoot_Taxonomy()
-	 * @model containment="true" resolveProxies="false" transient="true" volatile="true" derived="true"
-	 * @generated
-	 */
-	Taxonomy getTaxonomy();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.DocumentRoot#getTaxonomy <em>Taxonomy</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Taxonomy</em>' containment reference.
-	 * @see #getTaxonomy()
-	 * @generated
-	 */
-	void setTaxonomy(Taxonomy value);
-
-} // DocumentRoot
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/Name.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/Name.java
deleted file mode 100644
index f01ecea5c..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/Name.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Name.java,v 1.2 2005/12/03 04:06:49 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.taxonomy;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Name</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.Name#getValue <em>Value</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.Name#getLang <em>Lang</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.TaxonomyPackage#getName_()
- * @model 
- * @generated
- */
-public interface Name extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Value</em>' attribute.
-	 * @see #setValue(String)
-	 * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.TaxonomyPackage#getName_Value()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.Name#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Lang</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Lang</em>' attribute.
-	 * @see #setLang(String)
-	 * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.TaxonomyPackage#getName_Lang()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Language"
-	 * @generated
-	 */
-	String getLang();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.Name#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
-	 * @see #getLang()
-	 * @generated
-	 */
-	void setLang(String value);
-
-} // Name
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/Taxonomy.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/Taxonomy.java
deleted file mode 100644
index 414be07f0..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/Taxonomy.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Taxonomy.java,v 1.2 2005/12/03 04:06:49 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.taxonomy;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Taxonomy</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy#getNlname <em>Nlname</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy#getCategory <em>Category</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy#getLocation <em>Location</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy#getRef <em>Ref</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy#getTmodelKey <em>Tmodel Key</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.TaxonomyPackage#getTaxonomy()
- * @model 
- * @generated
- */
-public interface Taxonomy extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Nlname</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.wst.ws.internal.model.v10.taxonomy.Name}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Nlname</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>Nlname</em>' containment reference list.
-	 * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.TaxonomyPackage#getTaxonomy_Nlname()
-	 * @model type="org.eclipse.wst.ws.internal.model.v10.taxonomy.Name" containment="true" resolveProxies="false"
-	 * @generated
-	 */
-	EList getNlname();
-
-	/**
-	 * Returns the value of the '<em><b>Category</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.wst.ws.internal.model.v10.taxonomy.Category}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Category</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>Category</em>' containment reference list.
-	 * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.TaxonomyPackage#getTaxonomy_Category()
-	 * @model type="org.eclipse.wst.ws.internal.model.v10.taxonomy.Category" containment="true" resolveProxies="false"
-	 * @generated
-	 */
-	EList getCategory();
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.TaxonomyPackage#getTaxonomy_Id()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.AnyURI"
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(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.wst.ws.internal.model.v10.taxonomy.TaxonomyPackage#getTaxonomy_Location()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.AnyURI"
-	 * @generated
-	 */
-	String getLocation();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy#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>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.wst.ws.internal.model.v10.taxonomy.TaxonomyPackage#getTaxonomy_Name()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy#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>Ref</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Ref</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Ref</em>' attribute.
-	 * @see #setRef(String)
-	 * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.TaxonomyPackage#getTaxonomy_Ref()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.AnyURI"
-	 * @generated
-	 */
-	String getRef();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy#getRef <em>Ref</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Ref</em>' attribute.
-	 * @see #getRef()
-	 * @generated
-	 */
-	void setRef(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Tmodel Key</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Tmodel Key</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Tmodel Key</em>' attribute.
-	 * @see #setTmodelKey(String)
-	 * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.TaxonomyPackage#getTaxonomy_TmodelKey()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
-	 * @generated
-	 */
-	String getTmodelKey();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy#getTmodelKey <em>Tmodel Key</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Tmodel Key</em>' attribute.
-	 * @see #getTmodelKey()
-	 * @generated
-	 */
-	void setTmodelKey(String value);
-
-} // Taxonomy
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/TaxonomyFactory.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/TaxonomyFactory.java
deleted file mode 100644
index f06fdbf73..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/TaxonomyFactory.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: TaxonomyFactory.java,v 1.2 2005/12/03 04:06:49 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.taxonomy;
-
-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.ws.internal.model.v10.taxonomy.TaxonomyPackage
- * @generated
- */
-public interface TaxonomyFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	TaxonomyFactory eINSTANCE = new org.eclipse.wst.ws.internal.model.v10.taxonomy.impl.TaxonomyFactoryImpl();
-
-	/**
-	 * Returns a new object of class '<em>Category</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Category</em>'.
-	 * @generated
-	 */
-	Category createCategory();
-
-	/**
-	 * Returns a new object of class '<em>Document Root</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Document Root</em>'.
-	 * @generated
-	 */
-	DocumentRoot createDocumentRoot();
-
-	/**
-	 * Returns a new object of class '<em>Name</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Name</em>'.
-	 * @generated
-	 */
-	Name createName();
-
-	/**
-	 * Returns a new object of class '<em>Taxonomy</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Taxonomy</em>'.
-	 * @generated
-	 */
-	Taxonomy createTaxonomy();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	TaxonomyPackage getTaxonomyPackage();
-
-} //TaxonomyFactory
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/TaxonomyPackage.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/TaxonomyPackage.java
deleted file mode 100644
index 6bd96f952..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/TaxonomyPackage.java
+++ /dev/null
@@ -1,650 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: TaxonomyPackage.java,v 1.2 2005/12/03 04:06:49 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.taxonomy;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-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 -->
- * 
- *    See http://www.w3.org/XML/1998/namespace.html and
- *    http://www.w3.org/TR/REC-xml for information about this namespace.
- * 
- *     This schema document describes the XML namespace, in a form
- *     suitable for import by other schema documents.  
- * 
- *     Note that local names in this namespace are intended to be defined
- *     only by the World Wide Web Consortium or its subgroups.  The
- *     following names are currently defined in this namespace and should
- *     not be used with conflicting semantics by any Working Group,
- *     specification, or document instance:
- * 
- *     base (as an attribute name): denotes an attribute whose value
- *          provides a URI to be used as the base for interpreting any
- *          relative URIs in the scope of the element on which it
- *          appears; its value is inherited.  This name is reserved
- *          by virtue of its definition in the XML Base specification.
- * 
- *     id   (as an attribute name): denotes an attribute whose value
- *          should be interpreted as if declared to be of type ID.
- *          The xml:id specification is not yet a W3C Recommendation,
- *          but this attribute is included here to facilitate experimentation
- *          with the mechanisms it proposes.  Note that it is _not_ included
- *          in the specialAttrs attribute group.
- * 
- *     lang (as an attribute name): denotes an attribute whose value
- *          is a language code for the natural language of the content of
- *          any element; its value is inherited.  This name is reserved
- *          by virtue of its definition in the XML specification.
- *   
- *     space (as an attribute name): denotes an attribute whose
- *          value is a keyword indicating what whitespace processing
- *          discipline is intended for the content of the element; its
- *          value is inherited.  This name is reserved by virtue of its
- *          definition in the XML specification.
- * 
- *     Father (in any context at all): denotes Jon Bosak, the chair of 
- *          the original XML Working Group.  This name is reserved by 
- *          the following decision of the W3C XML Plenary and 
- *          XML Coordination groups:
- * 
- *              In appreciation for his vision, leadership and dedication
- *              the W3C XML Plenary on this 10th day of February, 2000
- *              reserves for Jon Bosak in perpetuity the XML name
- *              xml:Father
- *   
- * This schema defines attributes and an attribute group
- *         suitable for use by
- *         schemas wishing to allow xml:base, xml:lang, xml:space or xml:id
- *         attributes on elements they define.
- * 
- *         To enable this, such a schema must import this schema
- *         for the XML namespace, e.g. as follows:
- *         &lt;schema . . .&gt;
- *          . . .
- *          &lt;import namespace="http://www.w3.org/XML/1998/namespace"
- *                     schemaLocation="http://www.w3.org/2001/xml.xsd"/&gt;
- * 
- *         Subsequently, qualified reference to any of the attributes
- *         or the group defined below will have the desired effect, e.g.
- * 
- *         &lt;type . . .&gt;
- *          . . .
- *          &lt;attributeGroup ref="xml:specialAttrs"/&gt;
- *  
- *          will define a type which will schema-validate an instance
- *          element with any of those attributes
- * In keeping with the XML Schema WG's standard versioning
- *    policy, this schema document will persist at
- *    http://www.w3.org/2005/08/xml.xsd.
- *    At the date of issue it can also be found at
- *    http://www.w3.org/2001/xml.xsd.
- *    The schema document at that URI may however change in the future,
- *    in order to remain compatible with the latest version of XML Schema
- *    itself, or with the XML namespace itself.  In other words, if the XML
- *    Schema or XML namespaces change, the version of this document at
- *    http://www.w3.org/2001/xml.xsd will change
- *    accordingly; the version at
- *    http://www.w3.org/2005/08/xml.xsd will not change.
- *   
- * <!-- end-model-doc -->
- * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.TaxonomyFactory
- * @generated
- */
-public interface TaxonomyPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "taxonomy";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://eclipse.org/wst/ws/internal/model/v10/taxonomy";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "taxonomy";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	TaxonomyPackage eINSTANCE = org.eclipse.wst.ws.internal.model.v10.taxonomy.impl.TaxonomyPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.impl.CategoryImpl <em>Category</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.impl.CategoryImpl
-	 * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.impl.TaxonomyPackageImpl#getCategory()
-	 * @generated
-	 */
-	int CATEGORY = 0;
-
-	/**
-	 * The feature id for the '<em><b>Nlname</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CATEGORY__NLNAME = 0;
-
-	/**
-	 * The feature id for the '<em><b>Category</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CATEGORY__CATEGORY = 1;
-
-	/**
-	 * The feature id for the '<em><b>Code</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CATEGORY__CODE = 2;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CATEGORY__NAME = 3;
-
-	/**
-	 * The number of structural features of the the '<em>Category</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CATEGORY_FEATURE_COUNT = 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.impl.DocumentRootImpl <em>Document Root</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.impl.DocumentRootImpl
-	 * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.impl.TaxonomyPackageImpl#getDocumentRoot()
-	 * @generated
-	 */
-	int DOCUMENT_ROOT = 1;
-
-	/**
-	 * The feature id for the '<em><b>Mixed</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOCUMENT_ROOT__MIXED = 0;
-
-	/**
-	 * The feature id for the '<em><b>XMLNS Prefix Map</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOCUMENT_ROOT__XMLNS_PREFIX_MAP = 1;
-
-	/**
-	 * The feature id for the '<em><b>XSI Schema Location</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOCUMENT_ROOT__XSI_SCHEMA_LOCATION = 2;
-
-	/**
-	 * The feature id for the '<em><b>Category</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOCUMENT_ROOT__CATEGORY = 3;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOCUMENT_ROOT__NAME = 4;
-
-	/**
-	 * The feature id for the '<em><b>Taxonomy</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOCUMENT_ROOT__TAXONOMY = 5;
-
-	/**
-	 * The number of structural features of the the '<em>Document Root</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOCUMENT_ROOT_FEATURE_COUNT = 6;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.impl.NameImpl <em>Name</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.impl.NameImpl
-	 * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.impl.TaxonomyPackageImpl#getName_()
-	 * @generated
-	 */
-	int NAME = 2;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NAME__VALUE = 0;
-
-	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NAME__LANG = 1;
-
-	/**
-	 * The number of structural features of the the '<em>Name</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NAME_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.impl.TaxonomyImpl <em>Taxonomy</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.impl.TaxonomyImpl
-	 * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.impl.TaxonomyPackageImpl#getTaxonomy()
-	 * @generated
-	 */
-	int TAXONOMY = 3;
-
-	/**
-	 * The feature id for the '<em><b>Nlname</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAXONOMY__NLNAME = 0;
-
-	/**
-	 * The feature id for the '<em><b>Category</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAXONOMY__CATEGORY = 1;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAXONOMY__ID = 2;
-
-	/**
-	 * The feature id for the '<em><b>Location</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAXONOMY__LOCATION = 3;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAXONOMY__NAME = 4;
-
-	/**
-	 * The feature id for the '<em><b>Ref</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAXONOMY__REF = 5;
-
-	/**
-	 * The feature id for the '<em><b>Tmodel Key</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAXONOMY__TMODEL_KEY = 6;
-
-	/**
-	 * The number of structural features of the the '<em>Taxonomy</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAXONOMY_FEATURE_COUNT = 7;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.Category <em>Category</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Category</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.Category
-	 * @generated
-	 */
-	EClass getCategory();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.Category#getNlname <em>Nlname</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Nlname</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.Category#getNlname()
-	 * @see #getCategory()
-	 * @generated
-	 */
-	EReference getCategory_Nlname();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.Category#getCategory <em>Category</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Category</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.Category#getCategory()
-	 * @see #getCategory()
-	 * @generated
-	 */
-	EReference getCategory_Category();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.Category#getCode <em>Code</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Code</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.Category#getCode()
-	 * @see #getCategory()
-	 * @generated
-	 */
-	EAttribute getCategory_Code();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.Category#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.Category#getName()
-	 * @see #getCategory()
-	 * @generated
-	 */
-	EAttribute getCategory_Name();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.DocumentRoot <em>Document Root</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Document Root</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.DocumentRoot
-	 * @generated
-	 */
-	EClass getDocumentRoot();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.DocumentRoot#getMixed <em>Mixed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Mixed</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.DocumentRoot#getMixed()
-	 * @see #getDocumentRoot()
-	 * @generated
-	 */
-	EAttribute getDocumentRoot_Mixed();
-
-	/**
-	 * Returns the meta object for the map '{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.DocumentRoot#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the map '<em>XMLNS Prefix Map</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.DocumentRoot#getXMLNSPrefixMap()
-	 * @see #getDocumentRoot()
-	 * @generated
-	 */
-	EReference getDocumentRoot_XMLNSPrefixMap();
-
-	/**
-	 * Returns the meta object for the map '{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.DocumentRoot#getXSISchemaLocation <em>XSI Schema Location</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the map '<em>XSI Schema Location</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.DocumentRoot#getXSISchemaLocation()
-	 * @see #getDocumentRoot()
-	 * @generated
-	 */
-	EReference getDocumentRoot_XSISchemaLocation();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.DocumentRoot#getCategory <em>Category</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Category</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.DocumentRoot#getCategory()
-	 * @see #getDocumentRoot()
-	 * @generated
-	 */
-	EReference getDocumentRoot_Category();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.DocumentRoot#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Name</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.DocumentRoot#getName()
-	 * @see #getDocumentRoot()
-	 * @generated
-	 */
-	EReference getDocumentRoot_Name();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.DocumentRoot#getTaxonomy <em>Taxonomy</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Taxonomy</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.DocumentRoot#getTaxonomy()
-	 * @see #getDocumentRoot()
-	 * @generated
-	 */
-	EReference getDocumentRoot_Taxonomy();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.Name <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Name</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.Name
-	 * @generated
-	 */
-	EClass getName_();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.Name#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.Name#getValue()
-	 * @see #getName_()
-	 * @generated
-	 */
-	EAttribute getName_Value();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.Name#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Lang</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.Name#getLang()
-	 * @see #getName_()
-	 * @generated
-	 */
-	EAttribute getName_Lang();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy <em>Taxonomy</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Taxonomy</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy
-	 * @generated
-	 */
-	EClass getTaxonomy();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy#getNlname <em>Nlname</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Nlname</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy#getNlname()
-	 * @see #getTaxonomy()
-	 * @generated
-	 */
-	EReference getTaxonomy_Nlname();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy#getCategory <em>Category</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Category</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy#getCategory()
-	 * @see #getTaxonomy()
-	 * @generated
-	 */
-	EReference getTaxonomy_Category();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy#getId()
-	 * @see #getTaxonomy()
-	 * @generated
-	 */
-	EAttribute getTaxonomy_Id();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy#getLocation <em>Location</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Location</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy#getLocation()
-	 * @see #getTaxonomy()
-	 * @generated
-	 */
-	EAttribute getTaxonomy_Location();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy#getName()
-	 * @see #getTaxonomy()
-	 * @generated
-	 */
-	EAttribute getTaxonomy_Name();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy#getRef <em>Ref</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Ref</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy#getRef()
-	 * @see #getTaxonomy()
-	 * @generated
-	 */
-	EAttribute getTaxonomy_Ref();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy#getTmodelKey <em>Tmodel Key</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Tmodel Key</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy#getTmodelKey()
-	 * @see #getTaxonomy()
-	 * @generated
-	 */
-	EAttribute getTaxonomy_TmodelKey();
-
-	/**
-	 * 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
-	 */
-	TaxonomyFactory getTaxonomyFactory();
-
-} //TaxonomyPackage
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/impl/CategoryImpl.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/impl/CategoryImpl.java
deleted file mode 100644
index 35b2e3ca5..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/impl/CategoryImpl.java
+++ /dev/null
@@ -1,313 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: CategoryImpl.java,v 1.2 2005/12/03 04:06:48 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.taxonomy.impl;
-
-import java.util.Collection;
-
-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.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.impl.EObjectImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.Category;
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.Name;
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.TaxonomyPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Category</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.impl.CategoryImpl#getNlname <em>Nlname</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.impl.CategoryImpl#getCategory <em>Category</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.impl.CategoryImpl#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.impl.CategoryImpl#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class CategoryImpl extends EObjectImpl implements Category {
-	/**
-	 * The cached value of the '{@link #getNlname() <em>Nlname</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNlname()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList nlname = null;
-
-	/**
-	 * The cached value of the '{@link #getCategory() <em>Category</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCategory()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList category = null;
-
-	/**
-	 * The default value of the '{@link #getCode() <em>Code</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCode()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CODE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCode() <em>Code</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCode()
-	 * @generated
-	 * @ordered
-	 */
-	protected String code = CODE_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;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CategoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return TaxonomyPackage.eINSTANCE.getCategory();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getNlname() {
-		if (nlname == null) {
-			nlname = new EObjectContainmentEList(Name.class, this, TaxonomyPackage.CATEGORY__NLNAME);
-		}
-		return nlname;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getCategory() {
-		if (category == null) {
-			category = new EObjectContainmentEList(Category.class, this, TaxonomyPackage.CATEGORY__CATEGORY);
-		}
-		return category;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getCode() {
-		return code;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCode(String newCode) {
-		String oldCode = code;
-		code = newCode;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaxonomyPackage.CATEGORY__CODE, oldCode, code));
-	}
-
-	/**
-	 * <!-- 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, TaxonomyPackage.CATEGORY__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- 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 TaxonomyPackage.CATEGORY__NLNAME:
-					return ((InternalEList)getNlname()).basicRemove(otherEnd, msgs);
-				case TaxonomyPackage.CATEGORY__CATEGORY:
-					return ((InternalEList)getCategory()).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 TaxonomyPackage.CATEGORY__NLNAME:
-				return getNlname();
-			case TaxonomyPackage.CATEGORY__CATEGORY:
-				return getCategory();
-			case TaxonomyPackage.CATEGORY__CODE:
-				return getCode();
-			case TaxonomyPackage.CATEGORY__NAME:
-				return getName();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case TaxonomyPackage.CATEGORY__NLNAME:
-				getNlname().clear();
-				getNlname().addAll((Collection)newValue);
-				return;
-			case TaxonomyPackage.CATEGORY__CATEGORY:
-				getCategory().clear();
-				getCategory().addAll((Collection)newValue);
-				return;
-			case TaxonomyPackage.CATEGORY__CODE:
-				setCode((String)newValue);
-				return;
-			case TaxonomyPackage.CATEGORY__NAME:
-				setName((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case TaxonomyPackage.CATEGORY__NLNAME:
-				getNlname().clear();
-				return;
-			case TaxonomyPackage.CATEGORY__CATEGORY:
-				getCategory().clear();
-				return;
-			case TaxonomyPackage.CATEGORY__CODE:
-				setCode(CODE_EDEFAULT);
-				return;
-			case TaxonomyPackage.CATEGORY__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case TaxonomyPackage.CATEGORY__NLNAME:
-				return nlname != null && !nlname.isEmpty();
-			case TaxonomyPackage.CATEGORY__CATEGORY:
-				return category != null && !category.isEmpty();
-			case TaxonomyPackage.CATEGORY__CODE:
-				return CODE_EDEFAULT == null ? code != null : !CODE_EDEFAULT.equals(code);
-			case TaxonomyPackage.CATEGORY__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-		}
-		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(" (code: ");
-		result.append(code);
-		result.append(", name: ");
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-} //CategoryImpl
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/impl/DocumentRootImpl.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/impl/DocumentRootImpl.java
deleted file mode 100644
index 677874404..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/impl/DocumentRootImpl.java
+++ /dev/null
@@ -1,367 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DocumentRootImpl.java,v 1.2 2005/12/03 04:06:48 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.taxonomy.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EMap;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.impl.EStringToStringMapEntryImpl;
-
-import org.eclipse.emf.ecore.util.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.EcoreEMap;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.Category;
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.DocumentRoot;
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.Name;
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy;
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.TaxonomyPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Document Root</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.impl.DocumentRootImpl#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.impl.DocumentRootImpl#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.impl.DocumentRootImpl#getXSISchemaLocation <em>XSI Schema Location</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.impl.DocumentRootImpl#getCategory <em>Category</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.impl.DocumentRootImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.impl.DocumentRootImpl#getTaxonomy <em>Taxonomy</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DocumentRootImpl extends EObjectImpl implements DocumentRoot {
-	/**
-	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMixed()
-	 * @generated
-	 * @ordered
-	 */
-	protected FeatureMap mixed = null;
-
-	/**
-	 * The cached value of the '{@link #getXMLNSPrefixMap() <em>XMLNS Prefix Map</em>}' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getXMLNSPrefixMap()
-	 * @generated
-	 * @ordered
-	 */
-	protected EMap xMLNSPrefixMap = null;
-
-	/**
-	 * The cached value of the '{@link #getXSISchemaLocation() <em>XSI Schema Location</em>}' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getXSISchemaLocation()
-	 * @generated
-	 * @ordered
-	 */
-	protected EMap xSISchemaLocation = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DocumentRootImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return TaxonomyPackage.eINSTANCE.getDocumentRoot();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureMap getMixed() {
-		if (mixed == null) {
-			mixed = new BasicFeatureMap(this, TaxonomyPackage.DOCUMENT_ROOT__MIXED);
-		}
-		return mixed;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EMap getXMLNSPrefixMap() {
-		if (xMLNSPrefixMap == null) {
-			xMLNSPrefixMap = new EcoreEMap(EcorePackage.eINSTANCE.getEStringToStringMapEntry(), EStringToStringMapEntryImpl.class, this, TaxonomyPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP);
-		}
-		return xMLNSPrefixMap;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EMap getXSISchemaLocation() {
-		if (xSISchemaLocation == null) {
-			xSISchemaLocation = new EcoreEMap(EcorePackage.eINSTANCE.getEStringToStringMapEntry(), EStringToStringMapEntryImpl.class, this, TaxonomyPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION);
-		}
-		return xSISchemaLocation;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Category getCategory() {
-		return (Category)getMixed().get(TaxonomyPackage.eINSTANCE.getDocumentRoot_Category(), true);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetCategory(Category newCategory, NotificationChain msgs) {
-		return ((FeatureMap.Internal)getMixed()).basicAdd(TaxonomyPackage.eINSTANCE.getDocumentRoot_Category(), newCategory, null);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCategory(Category newCategory) {
-		((FeatureMap.Internal)getMixed()).set(TaxonomyPackage.eINSTANCE.getDocumentRoot_Category(), newCategory);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Name getName() {
-		return (Name)getMixed().get(TaxonomyPackage.eINSTANCE.getDocumentRoot_Name(), true);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetName(Name newName, NotificationChain msgs) {
-		return ((FeatureMap.Internal)getMixed()).basicAdd(TaxonomyPackage.eINSTANCE.getDocumentRoot_Name(), newName, null);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(Name newName) {
-		((FeatureMap.Internal)getMixed()).set(TaxonomyPackage.eINSTANCE.getDocumentRoot_Name(), newName);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Taxonomy getTaxonomy() {
-		return (Taxonomy)getMixed().get(TaxonomyPackage.eINSTANCE.getDocumentRoot_Taxonomy(), true);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetTaxonomy(Taxonomy newTaxonomy, NotificationChain msgs) {
-		return ((FeatureMap.Internal)getMixed()).basicAdd(TaxonomyPackage.eINSTANCE.getDocumentRoot_Taxonomy(), newTaxonomy, null);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTaxonomy(Taxonomy newTaxonomy) {
-		((FeatureMap.Internal)getMixed()).set(TaxonomyPackage.eINSTANCE.getDocumentRoot_Taxonomy(), newTaxonomy);
-	}
-
-	/**
-	 * <!-- 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 TaxonomyPackage.DOCUMENT_ROOT__MIXED:
-					return ((InternalEList)getMixed()).basicRemove(otherEnd, msgs);
-				case TaxonomyPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
-					return ((InternalEList)getXMLNSPrefixMap()).basicRemove(otherEnd, msgs);
-				case TaxonomyPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
-					return ((InternalEList)getXSISchemaLocation()).basicRemove(otherEnd, msgs);
-				case TaxonomyPackage.DOCUMENT_ROOT__CATEGORY:
-					return basicSetCategory(null, msgs);
-				case TaxonomyPackage.DOCUMENT_ROOT__NAME:
-					return basicSetName(null, msgs);
-				case TaxonomyPackage.DOCUMENT_ROOT__TAXONOMY:
-					return basicSetTaxonomy(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 TaxonomyPackage.DOCUMENT_ROOT__MIXED:
-				return getMixed();
-			case TaxonomyPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
-				return getXMLNSPrefixMap();
-			case TaxonomyPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
-				return getXSISchemaLocation();
-			case TaxonomyPackage.DOCUMENT_ROOT__CATEGORY:
-				return getCategory();
-			case TaxonomyPackage.DOCUMENT_ROOT__NAME:
-				return getName();
-			case TaxonomyPackage.DOCUMENT_ROOT__TAXONOMY:
-				return getTaxonomy();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case TaxonomyPackage.DOCUMENT_ROOT__MIXED:
-				getMixed().clear();
-				getMixed().addAll((Collection)newValue);
-				return;
-			case TaxonomyPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
-				getXMLNSPrefixMap().clear();
-				getXMLNSPrefixMap().addAll((Collection)newValue);
-				return;
-			case TaxonomyPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
-				getXSISchemaLocation().clear();
-				getXSISchemaLocation().addAll((Collection)newValue);
-				return;
-			case TaxonomyPackage.DOCUMENT_ROOT__CATEGORY:
-				setCategory((Category)newValue);
-				return;
-			case TaxonomyPackage.DOCUMENT_ROOT__NAME:
-				setName((Name)newValue);
-				return;
-			case TaxonomyPackage.DOCUMENT_ROOT__TAXONOMY:
-				setTaxonomy((Taxonomy)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case TaxonomyPackage.DOCUMENT_ROOT__MIXED:
-				getMixed().clear();
-				return;
-			case TaxonomyPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
-				getXMLNSPrefixMap().clear();
-				return;
-			case TaxonomyPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
-				getXSISchemaLocation().clear();
-				return;
-			case TaxonomyPackage.DOCUMENT_ROOT__CATEGORY:
-				setCategory((Category)null);
-				return;
-			case TaxonomyPackage.DOCUMENT_ROOT__NAME:
-				setName((Name)null);
-				return;
-			case TaxonomyPackage.DOCUMENT_ROOT__TAXONOMY:
-				setTaxonomy((Taxonomy)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case TaxonomyPackage.DOCUMENT_ROOT__MIXED:
-				return mixed != null && !mixed.isEmpty();
-			case TaxonomyPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
-				return xMLNSPrefixMap != null && !xMLNSPrefixMap.isEmpty();
-			case TaxonomyPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
-				return xSISchemaLocation != null && !xSISchemaLocation.isEmpty();
-			case TaxonomyPackage.DOCUMENT_ROOT__CATEGORY:
-				return getCategory() != null;
-			case TaxonomyPackage.DOCUMENT_ROOT__NAME:
-				return getName() != null;
-			case TaxonomyPackage.DOCUMENT_ROOT__TAXONOMY:
-				return getTaxonomy() != 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(" (mixed: ");
-		result.append(mixed);
-		result.append(')');
-		return result.toString();
-	}
-
-} //DocumentRootImpl
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/impl/NameImpl.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/impl/NameImpl.java
deleted file mode 100644
index bc55bd948..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/impl/NameImpl.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: NameImpl.java,v 1.2 2005/12/03 04:06:48 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.taxonomy.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.ws.internal.model.v10.taxonomy.Name;
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.TaxonomyPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Name</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.impl.NameImpl#getValue <em>Value</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.impl.NameImpl#getLang <em>Lang</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class NameImpl extends EObjectImpl implements Name {
-	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected String value = VALUE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLang()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LANG_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLang()
-	 * @generated
-	 * @ordered
-	 */
-	protected String lang = LANG_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected NameImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return TaxonomyPackage.eINSTANCE.getName_();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValue(String newValue) {
-		String oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaxonomyPackage.NAME__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLang() {
-		return lang;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLang(String newLang) {
-		String oldLang = lang;
-		lang = newLang;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaxonomyPackage.NAME__LANG, oldLang, lang));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case TaxonomyPackage.NAME__VALUE:
-				return getValue();
-			case TaxonomyPackage.NAME__LANG:
-				return getLang();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case TaxonomyPackage.NAME__VALUE:
-				setValue((String)newValue);
-				return;
-			case TaxonomyPackage.NAME__LANG:
-				setLang((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case TaxonomyPackage.NAME__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-			case TaxonomyPackage.NAME__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case TaxonomyPackage.NAME__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-			case TaxonomyPackage.NAME__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-		}
-		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(" (value: ");
-		result.append(value);
-		result.append(", lang: ");
-		result.append(lang);
-		result.append(')');
-		return result.toString();
-	}
-
-} //NameImpl
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/impl/TaxonomyFactoryImpl.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/impl/TaxonomyFactoryImpl.java
deleted file mode 100644
index 7f5b54ebc..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/impl/TaxonomyFactoryImpl.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: TaxonomyFactoryImpl.java,v 1.2 2005/12/03 04:06:48 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.taxonomy.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.*;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class TaxonomyFactoryImpl extends EFactoryImpl implements TaxonomyFactory {
-	/**
-	 * Creates and instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TaxonomyFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case TaxonomyPackage.CATEGORY: return createCategory();
-			case TaxonomyPackage.DOCUMENT_ROOT: return createDocumentRoot();
-			case TaxonomyPackage.NAME: return createName();
-			case TaxonomyPackage.TAXONOMY: return createTaxonomy();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Category createCategory() {
-		CategoryImpl category = new CategoryImpl();
-		return category;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DocumentRoot createDocumentRoot() {
-		DocumentRootImpl documentRoot = new DocumentRootImpl();
-		return documentRoot;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Name createName() {
-		NameImpl name = new NameImpl();
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Taxonomy createTaxonomy() {
-		TaxonomyImpl taxonomy = new TaxonomyImpl();
-		return taxonomy;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TaxonomyPackage getTaxonomyPackage() {
-		return (TaxonomyPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	public static TaxonomyPackage getPackage() {
-		return TaxonomyPackage.eINSTANCE;
-	}
-
-} //TaxonomyFactoryImpl
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/impl/TaxonomyImpl.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/impl/TaxonomyImpl.java
deleted file mode 100644
index f57895285..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/impl/TaxonomyImpl.java
+++ /dev/null
@@ -1,476 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: TaxonomyImpl.java,v 1.2 2005/12/03 04:06:48 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.taxonomy.impl;
-
-import java.util.Collection;
-
-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.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.impl.EObjectImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.Category;
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.Name;
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy;
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.TaxonomyPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Taxonomy</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.impl.TaxonomyImpl#getNlname <em>Nlname</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.impl.TaxonomyImpl#getCategory <em>Category</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.impl.TaxonomyImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.impl.TaxonomyImpl#getLocation <em>Location</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.impl.TaxonomyImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.impl.TaxonomyImpl#getRef <em>Ref</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.impl.TaxonomyImpl#getTmodelKey <em>Tmodel Key</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class TaxonomyImpl extends EObjectImpl implements Taxonomy {
-	/**
-	 * The cached value of the '{@link #getNlname() <em>Nlname</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNlname()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList nlname = null;
-
-	/**
-	 * The cached value of the '{@link #getCategory() <em>Category</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCategory()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList category = null;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_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 #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 #getRef() <em>Ref</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRef()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String REF_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getRef() <em>Ref</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRef()
-	 * @generated
-	 * @ordered
-	 */
-	protected String ref = REF_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getTmodelKey() <em>Tmodel Key</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTmodelKey()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TMODEL_KEY_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getTmodelKey() <em>Tmodel Key</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTmodelKey()
-	 * @generated
-	 * @ordered
-	 */
-	protected String tmodelKey = TMODEL_KEY_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TaxonomyImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return TaxonomyPackage.eINSTANCE.getTaxonomy();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getNlname() {
-		if (nlname == null) {
-			nlname = new EObjectContainmentEList(Name.class, this, TaxonomyPackage.TAXONOMY__NLNAME);
-		}
-		return nlname;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getCategory() {
-		if (category == null) {
-			category = new EObjectContainmentEList(Category.class, this, TaxonomyPackage.TAXONOMY__CATEGORY);
-		}
-		return category;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaxonomyPackage.TAXONOMY__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- 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, TaxonomyPackage.TAXONOMY__LOCATION, oldLocation, location));
-	}
-
-	/**
-	 * <!-- 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, TaxonomyPackage.TAXONOMY__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getRef() {
-		return ref;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRef(String newRef) {
-		String oldRef = ref;
-		ref = newRef;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaxonomyPackage.TAXONOMY__REF, oldRef, ref));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getTmodelKey() {
-		return tmodelKey;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTmodelKey(String newTmodelKey) {
-		String oldTmodelKey = tmodelKey;
-		tmodelKey = newTmodelKey;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaxonomyPackage.TAXONOMY__TMODEL_KEY, oldTmodelKey, tmodelKey));
-	}
-
-	/**
-	 * <!-- 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 TaxonomyPackage.TAXONOMY__NLNAME:
-					return ((InternalEList)getNlname()).basicRemove(otherEnd, msgs);
-				case TaxonomyPackage.TAXONOMY__CATEGORY:
-					return ((InternalEList)getCategory()).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 TaxonomyPackage.TAXONOMY__NLNAME:
-				return getNlname();
-			case TaxonomyPackage.TAXONOMY__CATEGORY:
-				return getCategory();
-			case TaxonomyPackage.TAXONOMY__ID:
-				return getId();
-			case TaxonomyPackage.TAXONOMY__LOCATION:
-				return getLocation();
-			case TaxonomyPackage.TAXONOMY__NAME:
-				return getName();
-			case TaxonomyPackage.TAXONOMY__REF:
-				return getRef();
-			case TaxonomyPackage.TAXONOMY__TMODEL_KEY:
-				return getTmodelKey();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case TaxonomyPackage.TAXONOMY__NLNAME:
-				getNlname().clear();
-				getNlname().addAll((Collection)newValue);
-				return;
-			case TaxonomyPackage.TAXONOMY__CATEGORY:
-				getCategory().clear();
-				getCategory().addAll((Collection)newValue);
-				return;
-			case TaxonomyPackage.TAXONOMY__ID:
-				setId((String)newValue);
-				return;
-			case TaxonomyPackage.TAXONOMY__LOCATION:
-				setLocation((String)newValue);
-				return;
-			case TaxonomyPackage.TAXONOMY__NAME:
-				setName((String)newValue);
-				return;
-			case TaxonomyPackage.TAXONOMY__REF:
-				setRef((String)newValue);
-				return;
-			case TaxonomyPackage.TAXONOMY__TMODEL_KEY:
-				setTmodelKey((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case TaxonomyPackage.TAXONOMY__NLNAME:
-				getNlname().clear();
-				return;
-			case TaxonomyPackage.TAXONOMY__CATEGORY:
-				getCategory().clear();
-				return;
-			case TaxonomyPackage.TAXONOMY__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case TaxonomyPackage.TAXONOMY__LOCATION:
-				setLocation(LOCATION_EDEFAULT);
-				return;
-			case TaxonomyPackage.TAXONOMY__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case TaxonomyPackage.TAXONOMY__REF:
-				setRef(REF_EDEFAULT);
-				return;
-			case TaxonomyPackage.TAXONOMY__TMODEL_KEY:
-				setTmodelKey(TMODEL_KEY_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case TaxonomyPackage.TAXONOMY__NLNAME:
-				return nlname != null && !nlname.isEmpty();
-			case TaxonomyPackage.TAXONOMY__CATEGORY:
-				return category != null && !category.isEmpty();
-			case TaxonomyPackage.TAXONOMY__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case TaxonomyPackage.TAXONOMY__LOCATION:
-				return LOCATION_EDEFAULT == null ? location != null : !LOCATION_EDEFAULT.equals(location);
-			case TaxonomyPackage.TAXONOMY__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case TaxonomyPackage.TAXONOMY__REF:
-				return REF_EDEFAULT == null ? ref != null : !REF_EDEFAULT.equals(ref);
-			case TaxonomyPackage.TAXONOMY__TMODEL_KEY:
-				return TMODEL_KEY_EDEFAULT == null ? tmodelKey != null : !TMODEL_KEY_EDEFAULT.equals(tmodelKey);
-		}
-		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(" (id: ");
-		result.append(id);
-		result.append(", location: ");
-		result.append(location);
-		result.append(", name: ");
-		result.append(name);
-		result.append(", ref: ");
-		result.append(ref);
-		result.append(", tmodelKey: ");
-		result.append(tmodelKey);
-		result.append(')');
-		return result.toString();
-	}
-
-} //TaxonomyImpl
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/impl/TaxonomyPackageImpl.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/impl/TaxonomyPackageImpl.java
deleted file mode 100644
index 0ff7da8cd..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/impl/TaxonomyPackageImpl.java
+++ /dev/null
@@ -1,658 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: TaxonomyPackageImpl.java,v 1.2 2005/12/03 04:06:48 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.taxonomy.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-
-import org.eclipse.emf.ecore.xml.type.impl.XMLTypePackageImpl;
-
-import org.eclipse.wst.ws.internal.model.v10.registry.RegistryPackage;
-
-import org.eclipse.wst.ws.internal.model.v10.registry.impl.RegistryPackageImpl;
-
-import org.eclipse.wst.ws.internal.model.v10.rtindex.RTIndexPackage;
-
-import org.eclipse.wst.ws.internal.model.v10.rtindex.impl.RTIndexPackageImpl;
-
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.Category;
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.DocumentRoot;
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.Name;
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy;
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.TaxonomyFactory;
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.TaxonomyPackage;
-
-import org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistryPackage;
-
-import org.eclipse.wst.ws.internal.model.v10.uddiregistry.impl.UDDIRegistryPackageImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class TaxonomyPackageImpl extends EPackageImpl implements TaxonomyPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass categoryEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass documentRootEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass nameEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass taxonomyEClass = 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.ws.internal.model.v10.taxonomy.TaxonomyPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private TaxonomyPackageImpl() {
-		super(eNS_URI, TaxonomyFactory.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 TaxonomyPackage init() {
-		if (isInited) return (TaxonomyPackage)EPackage.Registry.INSTANCE.getEPackage(TaxonomyPackage.eNS_URI);
-
-		// Obtain or create and register package
-		TaxonomyPackageImpl theTaxonomyPackage = (TaxonomyPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof TaxonomyPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new TaxonomyPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		XMLTypePackageImpl.init();
-
-		// Obtain or create and register interdependencies
-		RTIndexPackageImpl theRTIndexPackage = (RTIndexPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(RTIndexPackage.eNS_URI) instanceof RTIndexPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RTIndexPackage.eNS_URI) : RTIndexPackageImpl.eINSTANCE);
-		RegistryPackageImpl theRegistryPackage = (RegistryPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(RegistryPackage.eNS_URI) instanceof RegistryPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RegistryPackage.eNS_URI) : RegistryPackageImpl.eINSTANCE);
-		UDDIRegistryPackageImpl theUDDIRegistryPackage = (UDDIRegistryPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(UDDIRegistryPackage.eNS_URI) instanceof UDDIRegistryPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(UDDIRegistryPackage.eNS_URI) : UDDIRegistryPackageImpl.eINSTANCE);
-
-		// Create package meta-data objects
-		theTaxonomyPackage.createPackageContents();
-		theRTIndexPackage.createPackageContents();
-		theRegistryPackage.createPackageContents();
-		theUDDIRegistryPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theTaxonomyPackage.initializePackageContents();
-		theRTIndexPackage.initializePackageContents();
-		theRegistryPackage.initializePackageContents();
-		theUDDIRegistryPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theTaxonomyPackage.freeze();
-
-		return theTaxonomyPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getCategory() {
-		return categoryEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getCategory_Nlname() {
-		return (EReference)categoryEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getCategory_Category() {
-		return (EReference)categoryEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getCategory_Code() {
-		return (EAttribute)categoryEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getCategory_Name() {
-		return (EAttribute)categoryEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDocumentRoot() {
-		return documentRootEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDocumentRoot_Mixed() {
-		return (EAttribute)documentRootEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDocumentRoot_XMLNSPrefixMap() {
-		return (EReference)documentRootEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDocumentRoot_XSISchemaLocation() {
-		return (EReference)documentRootEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDocumentRoot_Category() {
-		return (EReference)documentRootEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDocumentRoot_Name() {
-		return (EReference)documentRootEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDocumentRoot_Taxonomy() {
-		return (EReference)documentRootEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getName_() {
-		return nameEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getName_Value() {
-		return (EAttribute)nameEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getName_Lang() {
-		return (EAttribute)nameEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getTaxonomy() {
-		return taxonomyEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTaxonomy_Nlname() {
-		return (EReference)taxonomyEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTaxonomy_Category() {
-		return (EReference)taxonomyEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTaxonomy_Id() {
-		return (EAttribute)taxonomyEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTaxonomy_Location() {
-		return (EAttribute)taxonomyEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTaxonomy_Name() {
-		return (EAttribute)taxonomyEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTaxonomy_Ref() {
-		return (EAttribute)taxonomyEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTaxonomy_TmodelKey() {
-		return (EAttribute)taxonomyEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TaxonomyFactory getTaxonomyFactory() {
-		return (TaxonomyFactory)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
-		categoryEClass = createEClass(CATEGORY);
-		createEReference(categoryEClass, CATEGORY__NLNAME);
-		createEReference(categoryEClass, CATEGORY__CATEGORY);
-		createEAttribute(categoryEClass, CATEGORY__CODE);
-		createEAttribute(categoryEClass, CATEGORY__NAME);
-
-		documentRootEClass = createEClass(DOCUMENT_ROOT);
-		createEAttribute(documentRootEClass, DOCUMENT_ROOT__MIXED);
-		createEReference(documentRootEClass, DOCUMENT_ROOT__XMLNS_PREFIX_MAP);
-		createEReference(documentRootEClass, DOCUMENT_ROOT__XSI_SCHEMA_LOCATION);
-		createEReference(documentRootEClass, DOCUMENT_ROOT__CATEGORY);
-		createEReference(documentRootEClass, DOCUMENT_ROOT__NAME);
-		createEReference(documentRootEClass, DOCUMENT_ROOT__TAXONOMY);
-
-		nameEClass = createEClass(NAME);
-		createEAttribute(nameEClass, NAME__VALUE);
-		createEAttribute(nameEClass, NAME__LANG);
-
-		taxonomyEClass = createEClass(TAXONOMY);
-		createEReference(taxonomyEClass, TAXONOMY__NLNAME);
-		createEReference(taxonomyEClass, TAXONOMY__CATEGORY);
-		createEAttribute(taxonomyEClass, TAXONOMY__ID);
-		createEAttribute(taxonomyEClass, TAXONOMY__LOCATION);
-		createEAttribute(taxonomyEClass, TAXONOMY__NAME);
-		createEAttribute(taxonomyEClass, TAXONOMY__REF);
-		createEAttribute(taxonomyEClass, TAXONOMY__TMODEL_KEY);
-	}
-
-	/**
-	 * <!-- 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
-		XMLTypePackageImpl theXMLTypePackage = (XMLTypePackageImpl)EPackage.Registry.INSTANCE.getEPackage(XMLTypePackage.eNS_URI);
-
-		// Add supertypes to classes
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(categoryEClass, Category.class, "Category", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getCategory_Nlname(), this.getName_(), null, "nlname", null, 0, -1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getCategory_Category(), this.getCategory(), null, "category", null, 0, -1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getCategory_Code(), theXMLTypePackage.getString(), "code", null, 0, 1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getCategory_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(documentRootEClass, DocumentRoot.class, "DocumentRoot", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getDocumentRoot_Mixed(), ecorePackage.getEFeatureMapEntry(), "mixed", null, 0, -1, null, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getDocumentRoot_XMLNSPrefixMap(), ecorePackage.getEStringToStringMapEntry(), null, "xMLNSPrefixMap", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getDocumentRoot_XSISchemaLocation(), ecorePackage.getEStringToStringMapEntry(), null, "xSISchemaLocation", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getDocumentRoot_Category(), this.getCategory(), null, "category", null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEReference(getDocumentRoot_Name(), this.getName_(), null, "name", null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEReference(getDocumentRoot_Taxonomy(), this.getTaxonomy(), null, "taxonomy", null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-
-		initEClass(nameEClass, Name.class, "Name", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getName_Value(), theXMLTypePackage.getString(), "value", null, 0, 1, Name.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getName_Lang(), theXMLTypePackage.getLanguage(), "lang", null, 0, 1, Name.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(taxonomyEClass, Taxonomy.class, "Taxonomy", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getTaxonomy_Nlname(), this.getName_(), null, "nlname", null, 0, -1, Taxonomy.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getTaxonomy_Category(), this.getCategory(), null, "category", null, 0, -1, Taxonomy.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getTaxonomy_Id(), theXMLTypePackage.getAnyURI(), "id", null, 0, 1, Taxonomy.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getTaxonomy_Location(), theXMLTypePackage.getAnyURI(), "location", null, 0, 1, Taxonomy.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getTaxonomy_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, Taxonomy.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getTaxonomy_Ref(), theXMLTypePackage.getAnyURI(), "ref", null, 0, 1, Taxonomy.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getTaxonomy_TmodelKey(), theXMLTypePackage.getString(), "tmodelKey", null, 1, 1, Taxonomy.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		// Create resource
-		createResource(eNS_URI);
-
-		// Create annotations
-		// http:///org/eclipse/emf/ecore/util/ExtendedMetaData
-		createExtendedMetaDataAnnotations();
-	}
-
-	/**
-	 * Initializes the annotations for <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void createExtendedMetaDataAnnotations() {
-		String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData";			
-		addAnnotation
-		  (categoryEClass, 
-		   source, 
-		   new String[] {
-			 "name", "Category",
-			 "kind", "elementOnly"
-		   });		
-		addAnnotation
-		  (getCategory_Nlname(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "nlname"
-		   });		
-		addAnnotation
-		  (getCategory_Category(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "category"
-		   });		
-		addAnnotation
-		  (getCategory_Code(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "code"
-		   });		
-		addAnnotation
-		  (getCategory_Name(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "name"
-		   });		
-		addAnnotation
-		  (documentRootEClass, 
-		   source, 
-		   new String[] {
-			 "name", "",
-			 "kind", "mixed"
-		   });		
-		addAnnotation
-		  (getDocumentRoot_Mixed(), 
-		   source, 
-		   new String[] {
-			 "kind", "elementWildcard",
-			 "name", ":mixed"
-		   });		
-		addAnnotation
-		  (getDocumentRoot_XMLNSPrefixMap(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "xmlns:prefix"
-		   });		
-		addAnnotation
-		  (getDocumentRoot_XSISchemaLocation(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "xsi:schemaLocation"
-		   });		
-		addAnnotation
-		  (getDocumentRoot_Category(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "category",
-			 "namespace", "##targetNamespace"
-		   });		
-		addAnnotation
-		  (getDocumentRoot_Name(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "name",
-			 "namespace", "##targetNamespace"
-		   });		
-		addAnnotation
-		  (getDocumentRoot_Taxonomy(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "taxonomy",
-			 "namespace", "##targetNamespace"
-		   });		
-		addAnnotation
-		  (nameEClass, 
-		   source, 
-		   new String[] {
-			 "name", "Name",
-			 "kind", "simple"
-		   });		
-		addAnnotation
-		  (getName_Value(), 
-		   source, 
-		   new String[] {
-			 "name", ":0",
-			 "kind", "simple"
-		   });		
-		addAnnotation
-		  (getName_Lang(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "lang",
-			 "namespace", "http://www.w3.org/XML/1998/namespace"
-		   });		
-		addAnnotation
-		  (taxonomyEClass, 
-		   source, 
-		   new String[] {
-			 "name", "Taxonomy",
-			 "kind", "elementOnly"
-		   });		
-		addAnnotation
-		  (getTaxonomy_Nlname(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "nlname"
-		   });		
-		addAnnotation
-		  (getTaxonomy_Category(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "category"
-		   });		
-		addAnnotation
-		  (getTaxonomy_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "id"
-		   });		
-		addAnnotation
-		  (getTaxonomy_Location(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "location"
-		   });		
-		addAnnotation
-		  (getTaxonomy_Name(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "name"
-		   });		
-		addAnnotation
-		  (getTaxonomy_Ref(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "ref"
-		   });		
-		addAnnotation
-		  (getTaxonomy_TmodelKey(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "tmodelKey"
-		   });
-	}
-
-} //TaxonomyPackageImpl
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/util/TaxonomyAdapterFactory.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/util/TaxonomyAdapterFactory.java
deleted file mode 100644
index 932b70f70..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/util/TaxonomyAdapterFactory.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: TaxonomyAdapterFactory.java,v 1.2 2005/12/03 04:06:50 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.taxonomy.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.ecore.EObject;
-
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.*;
-
-/**
- * <!-- 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.ws.internal.model.v10.taxonomy.TaxonomyPackage
- * @generated
- */
-public class TaxonomyAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static TaxonomyPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TaxonomyAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = TaxonomyPackage.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 TaxonomySwitch modelSwitch =
-		new TaxonomySwitch() {
-			public Object caseCategory(Category object) {
-				return createCategoryAdapter();
-			}
-			public Object caseDocumentRoot(DocumentRoot object) {
-				return createDocumentRootAdapter();
-			}
-			public Object caseName(Name object) {
-				return createNameAdapter();
-			}
-			public Object caseTaxonomy(Taxonomy object) {
-				return createTaxonomyAdapter();
-			}
-			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.ws.internal.model.v10.taxonomy.Category <em>Category</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.ws.internal.model.v10.taxonomy.Category
-	 * @generated
-	 */
-	public Adapter createCategoryAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.DocumentRoot <em>Document Root</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.ws.internal.model.v10.taxonomy.DocumentRoot
-	 * @generated
-	 */
-	public Adapter createDocumentRootAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.Name <em>Name</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.ws.internal.model.v10.taxonomy.Name
-	 * @generated
-	 */
-	public Adapter createNameAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy <em>Taxonomy</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.ws.internal.model.v10.taxonomy.Taxonomy
-	 * @generated
-	 */
-	public Adapter createTaxonomyAdapter() {
-		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;
-	}
-
-} //TaxonomyAdapterFactory
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/util/TaxonomyResourceFactoryImpl.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/util/TaxonomyResourceFactoryImpl.java
deleted file mode 100644
index 85d5cc6e2..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/util/TaxonomyResourceFactoryImpl.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: TaxonomyResourceFactoryImpl.java,v 1.2 2005/12/03 04:06:50 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.taxonomy.util;
-
-import org.eclipse.emf.common.util.URI;
-
-import org.eclipse.emf.ecore.resource.Resource;
-
-import org.eclipse.emf.ecore.util.ExtendedMetaData;
-
-import org.eclipse.emf.ecore.xmi.XMLResource;
-
-import org.eclipse.emf.ecore.xmi.impl.XMLResourceFactoryImpl;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource Factory</b> associated with the package.
- * <!-- end-user-doc -->
- * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.util.TaxonomyResourceImpl
- * @generated
- */
-public class TaxonomyResourceFactoryImpl extends XMLResourceFactoryImpl {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ExtendedMetaData extendedMetaData;
-
-	/**
-	 * Creates an instance of the resource factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TaxonomyResourceFactoryImpl() {
-		super();
-		extendedMetaData = ExtendedMetaData.INSTANCE;
-	}
-
-	/**
-	 * Creates an instance of the resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Resource createResource(URI uri) {
-		XMLResource result = new TaxonomyResourceImpl(uri);
-		result.getDefaultSaveOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, extendedMetaData);
-		result.getDefaultLoadOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, extendedMetaData);
-
-		result.getDefaultSaveOptions().put(XMLResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE);
-		result.getDefaultSaveOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
-
-		result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE);
-		return result;
-	}
-
-} //TaxonomyResourceFactoryImpl
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/util/TaxonomyResourceImpl.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/util/TaxonomyResourceImpl.java
deleted file mode 100644
index 8cbed9bdd..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/util/TaxonomyResourceImpl.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: TaxonomyResourceImpl.java,v 1.2 2005/12/03 04:06:50 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.taxonomy.util;
-
-import org.eclipse.emf.common.util.URI;
-
-import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource </b> associated with the package.
- * <!-- end-user-doc -->
- * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.util.TaxonomyResourceFactoryImpl
- * @generated
- */
-public class TaxonomyResourceImpl extends XMLResourceImpl {
-	/**
-	 * Creates an instance of the resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param uri the URI of the new resource.
-	 * @generated
-	 */
-	public TaxonomyResourceImpl(URI uri) {
-		super(uri);
-	}
-
-} //TaxonomyResourceFactoryImpl
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/util/TaxonomySwitch.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/util/TaxonomySwitch.java
deleted file mode 100644
index 82ddc7975..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/util/TaxonomySwitch.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: TaxonomySwitch.java,v 1.2 2005/12/03 04:06:50 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.taxonomy.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.*;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) 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.ws.internal.model.v10.taxonomy.TaxonomyPackage
- * @generated
- */
-public class TaxonomySwitch {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static TaxonomyPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TaxonomySwitch() {
-		if (modelPackage == null) {
-			modelPackage = TaxonomyPackage.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) {
-		return doSwitch(theEObject.eClass(), theEObject);
-	}
-
-	/**
-	 * 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
-	 */
-	protected Object doSwitch(EClass theEClass, EObject theEObject) {
-		if (theEClass.eContainer() == modelPackage) {
-			return doSwitch(theEClass.getClassifierID(), theEObject);
-		}
-		else {
-			List eSuperTypes = theEClass.getESuperTypes();
-			return
-				eSuperTypes.isEmpty() ?
-					defaultCase(theEObject) :
-					doSwitch((EClass)eSuperTypes.get(0), theEObject);
-		}
-	}
-
-	/**
-	 * 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
-	 */
-	protected Object doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case TaxonomyPackage.CATEGORY: {
-				Category category = (Category)theEObject;
-				Object result = caseCategory(category);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case TaxonomyPackage.DOCUMENT_ROOT: {
-				DocumentRoot documentRoot = (DocumentRoot)theEObject;
-				Object result = caseDocumentRoot(documentRoot);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case TaxonomyPackage.NAME: {
-				Name name = (Name)theEObject;
-				Object result = caseName(name);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case TaxonomyPackage.TAXONOMY: {
-				Taxonomy taxonomy = (Taxonomy)theEObject;
-				Object result = caseTaxonomy(taxonomy);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Category</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>Category</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseCategory(Category object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Document Root</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>Document Root</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDocumentRoot(DocumentRoot object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Name</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>Name</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseName(Name object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Taxonomy</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>Taxonomy</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseTaxonomy(Taxonomy 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;
-	}
-
-} //TaxonomySwitch
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/DocumentRoot.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/DocumentRoot.java
deleted file mode 100644
index 598dcb616..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/DocumentRoot.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DocumentRoot.java,v 1.2 2005/12/03 04:06:49 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.uddiregistry;
-
-import org.eclipse.emf.common.util.EMap;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Document Root</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.DocumentRoot#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.DocumentRoot#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.DocumentRoot#getXSISchemaLocation <em>XSI Schema Location</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.DocumentRoot#getTaxonomies <em>Taxonomies</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.DocumentRoot#getUddiRegistry <em>Uddi Registry</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistryPackage#getDocumentRoot()
- * @model 
- * @generated
- */
-public interface DocumentRoot extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Mixed</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>Mixed</em>' attribute list.
-	 * @see org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistryPackage#getDocumentRoot_Mixed()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
-	 * @generated
-	 */
-	FeatureMap getMixed();
-
-	/**
-	 * Returns the value of the '<em><b>XMLNS Prefix Map</b></em>' map.
-	 * The key is of type {@link java.lang.String},
-	 * and the value is of type {@link java.lang.String},
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>XMLNS Prefix Map</em>' map isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>XMLNS Prefix Map</em>' map.
-	 * @see org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistryPackage#getDocumentRoot_XMLNSPrefixMap()
-	 * @model mapType="org.eclipse.emf.ecore.EStringToStringMapEntry" keyType="java.lang.String" valueType="java.lang.String" transient="true"
-	 * @generated
-	 */
-	EMap getXMLNSPrefixMap();
-
-	/**
-	 * Returns the value of the '<em><b>XSI Schema Location</b></em>' map.
-	 * The key is of type {@link java.lang.String},
-	 * and the value is of type {@link java.lang.String},
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>XSI Schema Location</em>' map isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>XSI Schema Location</em>' map.
-	 * @see org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistryPackage#getDocumentRoot_XSISchemaLocation()
-	 * @model mapType="org.eclipse.emf.ecore.EStringToStringMapEntry" keyType="java.lang.String" valueType="java.lang.String" transient="true"
-	 * @generated
-	 */
-	EMap getXSISchemaLocation();
-
-	/**
-	 * Returns the value of the '<em><b>Taxonomies</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Taxonomies</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>Taxonomies</em>' containment reference.
-	 * @see #setTaxonomies(Taxonomies)
-	 * @see org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistryPackage#getDocumentRoot_Taxonomies()
-	 * @model containment="true" resolveProxies="false" transient="true" volatile="true" derived="true"
-	 * @generated
-	 */
-	Taxonomies getTaxonomies();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.DocumentRoot#getTaxonomies <em>Taxonomies</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Taxonomies</em>' containment reference.
-	 * @see #getTaxonomies()
-	 * @generated
-	 */
-	void setTaxonomies(Taxonomies value);
-
-	/**
-	 * Returns the value of the '<em><b>Uddi Registry</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Uddi Registry</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>Uddi Registry</em>' containment reference.
-	 * @see #setUddiRegistry(UDDIRegistry)
-	 * @see org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistryPackage#getDocumentRoot_UddiRegistry()
-	 * @model containment="true" resolveProxies="false" transient="true" volatile="true" derived="true"
-	 * @generated
-	 */
-	UDDIRegistry getUddiRegistry();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.DocumentRoot#getUddiRegistry <em>Uddi Registry</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Uddi Registry</em>' containment reference.
-	 * @see #getUddiRegistry()
-	 * @generated
-	 */
-	void setUddiRegistry(UDDIRegistry value);
-
-} // DocumentRoot
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/Taxonomies.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/Taxonomies.java
deleted file mode 100644
index fc7ebce71..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/Taxonomies.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Taxonomies.java,v 1.2 2005/12/03 04:06:49 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.uddiregistry;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Taxonomies</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.Taxonomies#getTaxonomy <em>Taxonomy</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistryPackage#getTaxonomies()
- * @model 
- * @generated
- */
-public interface Taxonomies extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Taxonomy</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Taxonomy</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>Taxonomy</em>' containment reference list.
-	 * @see org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistryPackage#getTaxonomies_Taxonomy()
-	 * @model type="org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy" containment="true" resolveProxies="false"
-	 * @generated
-	 */
-	EList getTaxonomy();
-
-} // Taxonomies
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/UDDIRegistry.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/UDDIRegistry.java
deleted file mode 100644
index 5cf2115e3..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/UDDIRegistry.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: UDDIRegistry.java,v 1.2 2005/12/03 04:06:49 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.uddiregistry;
-
-import org.eclipse.wst.ws.internal.model.v10.registry.Registry;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>UDDIRegistry</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistry#getVersion <em>Version</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistry#getDiscoveryURL <em>Discovery URL</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistry#getPublicationURL <em>Publication URL</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistry#getSecuredDiscoveryURL <em>Secured Discovery URL</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistry#getSecuredPublicationURL <em>Secured Publication URL</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistry#getDefaultLogin <em>Default Login</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistry#getDefaultPassword <em>Default Password</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistry#getTaxonomies <em>Taxonomies</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistryPackage#getUDDIRegistry()
- * @model 
- * @generated
- */
-public interface UDDIRegistry extends Registry {
-	/**
-	 * Returns the value of the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Version</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Version</em>' attribute.
-	 * @see #setVersion(String)
-	 * @see org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistryPackage#getUDDIRegistry_Version()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
-	 * @generated
-	 */
-	String getVersion();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistry#getVersion <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Version</em>' attribute.
-	 * @see #getVersion()
-	 * @generated
-	 */
-	void setVersion(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Discovery URL</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Discovery URL</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Discovery URL</em>' attribute.
-	 * @see #setDiscoveryURL(String)
-	 * @see org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistryPackage#getUDDIRegistry_DiscoveryURL()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.AnyURI" required="true"
-	 * @generated
-	 */
-	String getDiscoveryURL();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistry#getDiscoveryURL <em>Discovery URL</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Discovery URL</em>' attribute.
-	 * @see #getDiscoveryURL()
-	 * @generated
-	 */
-	void setDiscoveryURL(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Publication URL</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Publication URL</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Publication URL</em>' attribute.
-	 * @see #setPublicationURL(String)
-	 * @see org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistryPackage#getUDDIRegistry_PublicationURL()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.AnyURI" required="true"
-	 * @generated
-	 */
-	String getPublicationURL();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistry#getPublicationURL <em>Publication URL</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Publication URL</em>' attribute.
-	 * @see #getPublicationURL()
-	 * @generated
-	 */
-	void setPublicationURL(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Secured Discovery URL</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Secured Discovery URL</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Secured Discovery URL</em>' attribute.
-	 * @see #setSecuredDiscoveryURL(String)
-	 * @see org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistryPackage#getUDDIRegistry_SecuredDiscoveryURL()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.AnyURI" required="true"
-	 * @generated
-	 */
-	String getSecuredDiscoveryURL();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistry#getSecuredDiscoveryURL <em>Secured Discovery URL</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Secured Discovery URL</em>' attribute.
-	 * @see #getSecuredDiscoveryURL()
-	 * @generated
-	 */
-	void setSecuredDiscoveryURL(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Secured Publication URL</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Secured Publication URL</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Secured Publication URL</em>' attribute.
-	 * @see #setSecuredPublicationURL(String)
-	 * @see org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistryPackage#getUDDIRegistry_SecuredPublicationURL()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.AnyURI" required="true"
-	 * @generated
-	 */
-	String getSecuredPublicationURL();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistry#getSecuredPublicationURL <em>Secured Publication URL</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Secured Publication URL</em>' attribute.
-	 * @see #getSecuredPublicationURL()
-	 * @generated
-	 */
-	void setSecuredPublicationURL(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Default Login</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Default Login</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Default Login</em>' attribute.
-	 * @see #setDefaultLogin(String)
-	 * @see org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistryPackage#getUDDIRegistry_DefaultLogin()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
-	 * @generated
-	 */
-	String getDefaultLogin();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistry#getDefaultLogin <em>Default Login</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Default Login</em>' attribute.
-	 * @see #getDefaultLogin()
-	 * @generated
-	 */
-	void setDefaultLogin(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Default Password</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Default Password</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Default Password</em>' attribute.
-	 * @see #setDefaultPassword(String)
-	 * @see org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistryPackage#getUDDIRegistry_DefaultPassword()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
-	 * @generated
-	 */
-	String getDefaultPassword();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistry#getDefaultPassword <em>Default Password</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Default Password</em>' attribute.
-	 * @see #getDefaultPassword()
-	 * @generated
-	 */
-	void setDefaultPassword(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Taxonomies</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Taxonomies</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>Taxonomies</em>' containment reference.
-	 * @see #setTaxonomies(Taxonomies)
-	 * @see org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistryPackage#getUDDIRegistry_Taxonomies()
-	 * @model containment="true" resolveProxies="false"
-	 * @generated
-	 */
-	Taxonomies getTaxonomies();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistry#getTaxonomies <em>Taxonomies</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Taxonomies</em>' containment reference.
-	 * @see #getTaxonomies()
-	 * @generated
-	 */
-	void setTaxonomies(Taxonomies value);
-
-} // UDDIRegistry
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/UDDIRegistryFactory.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/UDDIRegistryFactory.java
deleted file mode 100644
index a210c72d0..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/UDDIRegistryFactory.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: UDDIRegistryFactory.java,v 1.2 2005/12/03 04:06:49 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.uddiregistry;
-
-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.ws.internal.model.v10.uddiregistry.UDDIRegistryPackage
- * @generated
- */
-public interface UDDIRegistryFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	UDDIRegistryFactory eINSTANCE = new org.eclipse.wst.ws.internal.model.v10.uddiregistry.impl.UDDIRegistryFactoryImpl();
-
-	/**
-	 * Returns a new object of class '<em>Document Root</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Document Root</em>'.
-	 * @generated
-	 */
-	DocumentRoot createDocumentRoot();
-
-	/**
-	 * Returns a new object of class '<em>Taxonomies</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Taxonomies</em>'.
-	 * @generated
-	 */
-	Taxonomies createTaxonomies();
-
-	/**
-	 * Returns a new object of class '<em>UDDIRegistry</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>UDDIRegistry</em>'.
-	 * @generated
-	 */
-	UDDIRegistry createUDDIRegistry();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	UDDIRegistryPackage getUDDIRegistryPackage();
-
-} //UDDIRegistryFactory
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/UDDIRegistryPackage.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/UDDIRegistryPackage.java
deleted file mode 100644
index c1e5ae1f9..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/UDDIRegistryPackage.java
+++ /dev/null
@@ -1,568 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: UDDIRegistryPackage.java,v 1.2 2005/12/03 04:06:49 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.uddiregistry;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-import org.eclipse.wst.ws.internal.model.v10.registry.RegistryPackage;
-
-/**
- * <!-- 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 -->
- * 
- *    See http://www.w3.org/XML/1998/namespace.html and
- *    http://www.w3.org/TR/REC-xml for information about this namespace.
- * 
- *     This schema document describes the XML namespace, in a form
- *     suitable for import by other schema documents.  
- * 
- *     Note that local names in this namespace are intended to be defined
- *     only by the World Wide Web Consortium or its subgroups.  The
- *     following names are currently defined in this namespace and should
- *     not be used with conflicting semantics by any Working Group,
- *     specification, or document instance:
- * 
- *     base (as an attribute name): denotes an attribute whose value
- *          provides a URI to be used as the base for interpreting any
- *          relative URIs in the scope of the element on which it
- *          appears; its value is inherited.  This name is reserved
- *          by virtue of its definition in the XML Base specification.
- * 
- *     id   (as an attribute name): denotes an attribute whose value
- *          should be interpreted as if declared to be of type ID.
- *          The xml:id specification is not yet a W3C Recommendation,
- *          but this attribute is included here to facilitate experimentation
- *          with the mechanisms it proposes.  Note that it is _not_ included
- *          in the specialAttrs attribute group.
- * 
- *     lang (as an attribute name): denotes an attribute whose value
- *          is a language code for the natural language of the content of
- *          any element; its value is inherited.  This name is reserved
- *          by virtue of its definition in the XML specification.
- *   
- *     space (as an attribute name): denotes an attribute whose
- *          value is a keyword indicating what whitespace processing
- *          discipline is intended for the content of the element; its
- *          value is inherited.  This name is reserved by virtue of its
- *          definition in the XML specification.
- * 
- *     Father (in any context at all): denotes Jon Bosak, the chair of 
- *          the original XML Working Group.  This name is reserved by 
- *          the following decision of the W3C XML Plenary and 
- *          XML Coordination groups:
- * 
- *              In appreciation for his vision, leadership and dedication
- *              the W3C XML Plenary on this 10th day of February, 2000
- *              reserves for Jon Bosak in perpetuity the XML name
- *              xml:Father
- *   
- * This schema defines attributes and an attribute group
- *         suitable for use by
- *         schemas wishing to allow xml:base, xml:lang, xml:space or xml:id
- *         attributes on elements they define.
- * 
- *         To enable this, such a schema must import this schema
- *         for the XML namespace, e.g. as follows:
- *         &lt;schema . . .&gt;
- *          . . .
- *          &lt;import namespace="http://www.w3.org/XML/1998/namespace"
- *                     schemaLocation="http://www.w3.org/2001/xml.xsd"/&gt;
- * 
- *         Subsequently, qualified reference to any of the attributes
- *         or the group defined below will have the desired effect, e.g.
- * 
- *         &lt;type . . .&gt;
- *          . . .
- *          &lt;attributeGroup ref="xml:specialAttrs"/&gt;
- *  
- *          will define a type which will schema-validate an instance
- *          element with any of those attributes
- * In keeping with the XML Schema WG's standard versioning
- *    policy, this schema document will persist at
- *    http://www.w3.org/2005/08/xml.xsd.
- *    At the date of issue it can also be found at
- *    http://www.w3.org/2001/xml.xsd.
- *    The schema document at that URI may however change in the future,
- *    in order to remain compatible with the latest version of XML Schema
- *    itself, or with the XML namespace itself.  In other words, if the XML
- *    Schema or XML namespaces change, the version of this document at
- *    http://www.w3.org/2001/xml.xsd will change
- *    accordingly; the version at
- *    http://www.w3.org/2005/08/xml.xsd will not change.
- *   
- * <!-- end-model-doc -->
- * @see org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistryFactory
- * @generated
- */
-public interface UDDIRegistryPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "uddiregistry";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://eclipse.org/wst/ws/internal/model/v10/uddiregistry";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "uddiregistry";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	UDDIRegistryPackage eINSTANCE = org.eclipse.wst.ws.internal.model.v10.uddiregistry.impl.UDDIRegistryPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.impl.DocumentRootImpl <em>Document Root</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.wst.ws.internal.model.v10.uddiregistry.impl.DocumentRootImpl
-	 * @see org.eclipse.wst.ws.internal.model.v10.uddiregistry.impl.UDDIRegistryPackageImpl#getDocumentRoot()
-	 * @generated
-	 */
-	int DOCUMENT_ROOT = 0;
-
-	/**
-	 * The feature id for the '<em><b>Mixed</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOCUMENT_ROOT__MIXED = 0;
-
-	/**
-	 * The feature id for the '<em><b>XMLNS Prefix Map</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOCUMENT_ROOT__XMLNS_PREFIX_MAP = 1;
-
-	/**
-	 * The feature id for the '<em><b>XSI Schema Location</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOCUMENT_ROOT__XSI_SCHEMA_LOCATION = 2;
-
-	/**
-	 * The feature id for the '<em><b>Taxonomies</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOCUMENT_ROOT__TAXONOMIES = 3;
-
-	/**
-	 * The feature id for the '<em><b>Uddi Registry</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOCUMENT_ROOT__UDDI_REGISTRY = 4;
-
-	/**
-	 * The number of structural features of the the '<em>Document Root</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOCUMENT_ROOT_FEATURE_COUNT = 5;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.impl.TaxonomiesImpl <em>Taxonomies</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.wst.ws.internal.model.v10.uddiregistry.impl.TaxonomiesImpl
-	 * @see org.eclipse.wst.ws.internal.model.v10.uddiregistry.impl.UDDIRegistryPackageImpl#getTaxonomies()
-	 * @generated
-	 */
-	int TAXONOMIES = 1;
-
-	/**
-	 * The feature id for the '<em><b>Taxonomy</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAXONOMIES__TAXONOMY = 0;
-
-	/**
-	 * The number of structural features of the the '<em>Taxonomies</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAXONOMIES_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.impl.UDDIRegistryImpl <em>UDDIRegistry</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.wst.ws.internal.model.v10.uddiregistry.impl.UDDIRegistryImpl
-	 * @see org.eclipse.wst.ws.internal.model.v10.uddiregistry.impl.UDDIRegistryPackageImpl#getUDDIRegistry()
-	 * @generated
-	 */
-	int UDDI_REGISTRY = 2;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int UDDI_REGISTRY__NAME = RegistryPackage.REGISTRY__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int UDDI_REGISTRY__DESCRIPTION = RegistryPackage.REGISTRY__DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int UDDI_REGISTRY__ID = RegistryPackage.REGISTRY__ID;
-
-	/**
-	 * The feature id for the '<em><b>Location</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int UDDI_REGISTRY__LOCATION = RegistryPackage.REGISTRY__LOCATION;
-
-	/**
-	 * The feature id for the '<em><b>Ref</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int UDDI_REGISTRY__REF = RegistryPackage.REGISTRY__REF;
-
-	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int UDDI_REGISTRY__VERSION = RegistryPackage.REGISTRY_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Discovery URL</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int UDDI_REGISTRY__DISCOVERY_URL = RegistryPackage.REGISTRY_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Publication URL</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int UDDI_REGISTRY__PUBLICATION_URL = RegistryPackage.REGISTRY_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Secured Discovery URL</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int UDDI_REGISTRY__SECURED_DISCOVERY_URL = RegistryPackage.REGISTRY_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Secured Publication URL</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int UDDI_REGISTRY__SECURED_PUBLICATION_URL = RegistryPackage.REGISTRY_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Default Login</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int UDDI_REGISTRY__DEFAULT_LOGIN = RegistryPackage.REGISTRY_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Default Password</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int UDDI_REGISTRY__DEFAULT_PASSWORD = RegistryPackage.REGISTRY_FEATURE_COUNT + 6;
-
-	/**
-	 * The feature id for the '<em><b>Taxonomies</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int UDDI_REGISTRY__TAXONOMIES = RegistryPackage.REGISTRY_FEATURE_COUNT + 7;
-
-	/**
-	 * The number of structural features of the the '<em>UDDIRegistry</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int UDDI_REGISTRY_FEATURE_COUNT = RegistryPackage.REGISTRY_FEATURE_COUNT + 8;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.DocumentRoot <em>Document Root</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Document Root</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.uddiregistry.DocumentRoot
-	 * @generated
-	 */
-	EClass getDocumentRoot();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.DocumentRoot#getMixed <em>Mixed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Mixed</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.uddiregistry.DocumentRoot#getMixed()
-	 * @see #getDocumentRoot()
-	 * @generated
-	 */
-	EAttribute getDocumentRoot_Mixed();
-
-	/**
-	 * Returns the meta object for the map '{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.DocumentRoot#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the map '<em>XMLNS Prefix Map</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.uddiregistry.DocumentRoot#getXMLNSPrefixMap()
-	 * @see #getDocumentRoot()
-	 * @generated
-	 */
-	EReference getDocumentRoot_XMLNSPrefixMap();
-
-	/**
-	 * Returns the meta object for the map '{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.DocumentRoot#getXSISchemaLocation <em>XSI Schema Location</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the map '<em>XSI Schema Location</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.uddiregistry.DocumentRoot#getXSISchemaLocation()
-	 * @see #getDocumentRoot()
-	 * @generated
-	 */
-	EReference getDocumentRoot_XSISchemaLocation();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.DocumentRoot#getTaxonomies <em>Taxonomies</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Taxonomies</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.uddiregistry.DocumentRoot#getTaxonomies()
-	 * @see #getDocumentRoot()
-	 * @generated
-	 */
-	EReference getDocumentRoot_Taxonomies();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.DocumentRoot#getUddiRegistry <em>Uddi Registry</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Uddi Registry</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.uddiregistry.DocumentRoot#getUddiRegistry()
-	 * @see #getDocumentRoot()
-	 * @generated
-	 */
-	EReference getDocumentRoot_UddiRegistry();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.Taxonomies <em>Taxonomies</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Taxonomies</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.uddiregistry.Taxonomies
-	 * @generated
-	 */
-	EClass getTaxonomies();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.Taxonomies#getTaxonomy <em>Taxonomy</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Taxonomy</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.uddiregistry.Taxonomies#getTaxonomy()
-	 * @see #getTaxonomies()
-	 * @generated
-	 */
-	EReference getTaxonomies_Taxonomy();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistry <em>UDDIRegistry</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>UDDIRegistry</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistry
-	 * @generated
-	 */
-	EClass getUDDIRegistry();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistry#getVersion <em>Version</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Version</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistry#getVersion()
-	 * @see #getUDDIRegistry()
-	 * @generated
-	 */
-	EAttribute getUDDIRegistry_Version();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistry#getDiscoveryURL <em>Discovery URL</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Discovery URL</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistry#getDiscoveryURL()
-	 * @see #getUDDIRegistry()
-	 * @generated
-	 */
-	EAttribute getUDDIRegistry_DiscoveryURL();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistry#getPublicationURL <em>Publication URL</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Publication URL</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistry#getPublicationURL()
-	 * @see #getUDDIRegistry()
-	 * @generated
-	 */
-	EAttribute getUDDIRegistry_PublicationURL();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistry#getSecuredDiscoveryURL <em>Secured Discovery URL</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Secured Discovery URL</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistry#getSecuredDiscoveryURL()
-	 * @see #getUDDIRegistry()
-	 * @generated
-	 */
-	EAttribute getUDDIRegistry_SecuredDiscoveryURL();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistry#getSecuredPublicationURL <em>Secured Publication URL</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Secured Publication URL</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistry#getSecuredPublicationURL()
-	 * @see #getUDDIRegistry()
-	 * @generated
-	 */
-	EAttribute getUDDIRegistry_SecuredPublicationURL();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistry#getDefaultLogin <em>Default Login</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Default Login</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistry#getDefaultLogin()
-	 * @see #getUDDIRegistry()
-	 * @generated
-	 */
-	EAttribute getUDDIRegistry_DefaultLogin();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistry#getDefaultPassword <em>Default Password</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Default Password</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistry#getDefaultPassword()
-	 * @see #getUDDIRegistry()
-	 * @generated
-	 */
-	EAttribute getUDDIRegistry_DefaultPassword();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistry#getTaxonomies <em>Taxonomies</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Taxonomies</em>'.
-	 * @see org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistry#getTaxonomies()
-	 * @see #getUDDIRegistry()
-	 * @generated
-	 */
-	EReference getUDDIRegistry_Taxonomies();
-
-	/**
-	 * 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
-	 */
-	UDDIRegistryFactory getUDDIRegistryFactory();
-
-} //UDDIRegistryPackage
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/impl/DocumentRootImpl.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/impl/DocumentRootImpl.java
deleted file mode 100644
index 6802d3fb2..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/impl/DocumentRootImpl.java
+++ /dev/null
@@ -1,326 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DocumentRootImpl.java,v 1.2 2005/12/03 04:06:50 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.uddiregistry.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EMap;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.impl.EStringToStringMapEntryImpl;
-
-import org.eclipse.emf.ecore.util.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.EcoreEMap;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.wst.ws.internal.model.v10.uddiregistry.DocumentRoot;
-import org.eclipse.wst.ws.internal.model.v10.uddiregistry.Taxonomies;
-import org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistry;
-import org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistryPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Document Root</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.impl.DocumentRootImpl#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.impl.DocumentRootImpl#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.impl.DocumentRootImpl#getXSISchemaLocation <em>XSI Schema Location</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.impl.DocumentRootImpl#getTaxonomies <em>Taxonomies</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.impl.DocumentRootImpl#getUddiRegistry <em>Uddi Registry</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DocumentRootImpl extends EObjectImpl implements DocumentRoot {
-	/**
-	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMixed()
-	 * @generated
-	 * @ordered
-	 */
-	protected FeatureMap mixed = null;
-
-	/**
-	 * The cached value of the '{@link #getXMLNSPrefixMap() <em>XMLNS Prefix Map</em>}' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getXMLNSPrefixMap()
-	 * @generated
-	 * @ordered
-	 */
-	protected EMap xMLNSPrefixMap = null;
-
-	/**
-	 * The cached value of the '{@link #getXSISchemaLocation() <em>XSI Schema Location</em>}' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getXSISchemaLocation()
-	 * @generated
-	 * @ordered
-	 */
-	protected EMap xSISchemaLocation = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DocumentRootImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UDDIRegistryPackage.eINSTANCE.getDocumentRoot();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureMap getMixed() {
-		if (mixed == null) {
-			mixed = new BasicFeatureMap(this, UDDIRegistryPackage.DOCUMENT_ROOT__MIXED);
-		}
-		return mixed;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EMap getXMLNSPrefixMap() {
-		if (xMLNSPrefixMap == null) {
-			xMLNSPrefixMap = new EcoreEMap(EcorePackage.eINSTANCE.getEStringToStringMapEntry(), EStringToStringMapEntryImpl.class, this, UDDIRegistryPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP);
-		}
-		return xMLNSPrefixMap;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EMap getXSISchemaLocation() {
-		if (xSISchemaLocation == null) {
-			xSISchemaLocation = new EcoreEMap(EcorePackage.eINSTANCE.getEStringToStringMapEntry(), EStringToStringMapEntryImpl.class, this, UDDIRegistryPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION);
-		}
-		return xSISchemaLocation;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Taxonomies getTaxonomies() {
-		return (Taxonomies)getMixed().get(UDDIRegistryPackage.eINSTANCE.getDocumentRoot_Taxonomies(), true);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetTaxonomies(Taxonomies newTaxonomies, NotificationChain msgs) {
-		return ((FeatureMap.Internal)getMixed()).basicAdd(UDDIRegistryPackage.eINSTANCE.getDocumentRoot_Taxonomies(), newTaxonomies, null);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTaxonomies(Taxonomies newTaxonomies) {
-		((FeatureMap.Internal)getMixed()).set(UDDIRegistryPackage.eINSTANCE.getDocumentRoot_Taxonomies(), newTaxonomies);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public UDDIRegistry getUddiRegistry() {
-		return (UDDIRegistry)getMixed().get(UDDIRegistryPackage.eINSTANCE.getDocumentRoot_UddiRegistry(), true);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetUddiRegistry(UDDIRegistry newUddiRegistry, NotificationChain msgs) {
-		return ((FeatureMap.Internal)getMixed()).basicAdd(UDDIRegistryPackage.eINSTANCE.getDocumentRoot_UddiRegistry(), newUddiRegistry, null);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setUddiRegistry(UDDIRegistry newUddiRegistry) {
-		((FeatureMap.Internal)getMixed()).set(UDDIRegistryPackage.eINSTANCE.getDocumentRoot_UddiRegistry(), newUddiRegistry);
-	}
-
-	/**
-	 * <!-- 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 UDDIRegistryPackage.DOCUMENT_ROOT__MIXED:
-					return ((InternalEList)getMixed()).basicRemove(otherEnd, msgs);
-				case UDDIRegistryPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
-					return ((InternalEList)getXMLNSPrefixMap()).basicRemove(otherEnd, msgs);
-				case UDDIRegistryPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
-					return ((InternalEList)getXSISchemaLocation()).basicRemove(otherEnd, msgs);
-				case UDDIRegistryPackage.DOCUMENT_ROOT__TAXONOMIES:
-					return basicSetTaxonomies(null, msgs);
-				case UDDIRegistryPackage.DOCUMENT_ROOT__UDDI_REGISTRY:
-					return basicSetUddiRegistry(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 UDDIRegistryPackage.DOCUMENT_ROOT__MIXED:
-				return getMixed();
-			case UDDIRegistryPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
-				return getXMLNSPrefixMap();
-			case UDDIRegistryPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
-				return getXSISchemaLocation();
-			case UDDIRegistryPackage.DOCUMENT_ROOT__TAXONOMIES:
-				return getTaxonomies();
-			case UDDIRegistryPackage.DOCUMENT_ROOT__UDDI_REGISTRY:
-				return getUddiRegistry();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case UDDIRegistryPackage.DOCUMENT_ROOT__MIXED:
-				getMixed().clear();
-				getMixed().addAll((Collection)newValue);
-				return;
-			case UDDIRegistryPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
-				getXMLNSPrefixMap().clear();
-				getXMLNSPrefixMap().addAll((Collection)newValue);
-				return;
-			case UDDIRegistryPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
-				getXSISchemaLocation().clear();
-				getXSISchemaLocation().addAll((Collection)newValue);
-				return;
-			case UDDIRegistryPackage.DOCUMENT_ROOT__TAXONOMIES:
-				setTaxonomies((Taxonomies)newValue);
-				return;
-			case UDDIRegistryPackage.DOCUMENT_ROOT__UDDI_REGISTRY:
-				setUddiRegistry((UDDIRegistry)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case UDDIRegistryPackage.DOCUMENT_ROOT__MIXED:
-				getMixed().clear();
-				return;
-			case UDDIRegistryPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
-				getXMLNSPrefixMap().clear();
-				return;
-			case UDDIRegistryPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
-				getXSISchemaLocation().clear();
-				return;
-			case UDDIRegistryPackage.DOCUMENT_ROOT__TAXONOMIES:
-				setTaxonomies((Taxonomies)null);
-				return;
-			case UDDIRegistryPackage.DOCUMENT_ROOT__UDDI_REGISTRY:
-				setUddiRegistry((UDDIRegistry)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case UDDIRegistryPackage.DOCUMENT_ROOT__MIXED:
-				return mixed != null && !mixed.isEmpty();
-			case UDDIRegistryPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
-				return xMLNSPrefixMap != null && !xMLNSPrefixMap.isEmpty();
-			case UDDIRegistryPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
-				return xSISchemaLocation != null && !xSISchemaLocation.isEmpty();
-			case UDDIRegistryPackage.DOCUMENT_ROOT__TAXONOMIES:
-				return getTaxonomies() != null;
-			case UDDIRegistryPackage.DOCUMENT_ROOT__UDDI_REGISTRY:
-				return getUddiRegistry() != 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(" (mixed: ");
-		result.append(mixed);
-		result.append(')');
-		return result.toString();
-	}
-
-} //DocumentRootImpl
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/impl/TaxonomiesImpl.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/impl/TaxonomiesImpl.java
deleted file mode 100644
index 5d75bf7d5..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/impl/TaxonomiesImpl.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: TaxonomiesImpl.java,v 1.2 2005/12/03 04:06:50 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.uddiregistry.impl;
-
-import java.util.Collection;
-
-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.impl.EObjectImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy;
-
-import org.eclipse.wst.ws.internal.model.v10.uddiregistry.Taxonomies;
-import org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistryPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Taxonomies</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.impl.TaxonomiesImpl#getTaxonomy <em>Taxonomy</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class TaxonomiesImpl extends EObjectImpl implements Taxonomies {
-	/**
-	 * The cached value of the '{@link #getTaxonomy() <em>Taxonomy</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTaxonomy()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList taxonomy = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TaxonomiesImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UDDIRegistryPackage.eINSTANCE.getTaxonomies();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getTaxonomy() {
-		if (taxonomy == null) {
-			taxonomy = new EObjectContainmentEList(Taxonomy.class, this, UDDIRegistryPackage.TAXONOMIES__TAXONOMY);
-		}
-		return taxonomy;
-	}
-
-	/**
-	 * <!-- 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 UDDIRegistryPackage.TAXONOMIES__TAXONOMY:
-					return ((InternalEList)getTaxonomy()).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 UDDIRegistryPackage.TAXONOMIES__TAXONOMY:
-				return getTaxonomy();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case UDDIRegistryPackage.TAXONOMIES__TAXONOMY:
-				getTaxonomy().clear();
-				getTaxonomy().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case UDDIRegistryPackage.TAXONOMIES__TAXONOMY:
-				getTaxonomy().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case UDDIRegistryPackage.TAXONOMIES__TAXONOMY:
-				return taxonomy != null && !taxonomy.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-} //TaxonomiesImpl
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/impl/UDDIRegistryFactoryImpl.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/impl/UDDIRegistryFactoryImpl.java
deleted file mode 100644
index 2e8033bb0..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/impl/UDDIRegistryFactoryImpl.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: UDDIRegistryFactoryImpl.java,v 1.2 2005/12/03 04:06:50 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.uddiregistry.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.wst.ws.internal.model.v10.uddiregistry.*;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class UDDIRegistryFactoryImpl extends EFactoryImpl implements UDDIRegistryFactory {
-	/**
-	 * Creates and instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public UDDIRegistryFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case UDDIRegistryPackage.DOCUMENT_ROOT: return createDocumentRoot();
-			case UDDIRegistryPackage.TAXONOMIES: return createTaxonomies();
-			case UDDIRegistryPackage.UDDI_REGISTRY: return createUDDIRegistry();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DocumentRoot createDocumentRoot() {
-		DocumentRootImpl documentRoot = new DocumentRootImpl();
-		return documentRoot;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Taxonomies createTaxonomies() {
-		TaxonomiesImpl taxonomies = new TaxonomiesImpl();
-		return taxonomies;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public UDDIRegistry createUDDIRegistry() {
-		UDDIRegistryImpl uddiRegistry = new UDDIRegistryImpl();
-		return uddiRegistry;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public UDDIRegistryPackage getUDDIRegistryPackage() {
-		return (UDDIRegistryPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	public static UDDIRegistryPackage getPackage() {
-		return UDDIRegistryPackage.eINSTANCE;
-	}
-
-} //UDDIRegistryFactoryImpl
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/impl/UDDIRegistryImpl.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/impl/UDDIRegistryImpl.java
deleted file mode 100644
index c8e38b095..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/impl/UDDIRegistryImpl.java
+++ /dev/null
@@ -1,631 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: UDDIRegistryImpl.java,v 1.2 2005/12/03 04:06:50 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.uddiregistry.impl;
-
-import java.util.Collection;
-
-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.impl.ENotificationImpl;
-
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.wst.ws.internal.model.v10.registry.impl.RegistryImpl;
-
-import org.eclipse.wst.ws.internal.model.v10.uddiregistry.Taxonomies;
-import org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistry;
-import org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistryPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>UDDIRegistry</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.impl.UDDIRegistryImpl#getVersion <em>Version</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.impl.UDDIRegistryImpl#getDiscoveryURL <em>Discovery URL</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.impl.UDDIRegistryImpl#getPublicationURL <em>Publication URL</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.impl.UDDIRegistryImpl#getSecuredDiscoveryURL <em>Secured Discovery URL</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.impl.UDDIRegistryImpl#getSecuredPublicationURL <em>Secured Publication URL</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.impl.UDDIRegistryImpl#getDefaultLogin <em>Default Login</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.impl.UDDIRegistryImpl#getDefaultPassword <em>Default Password</em>}</li>
- *   <li>{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.impl.UDDIRegistryImpl#getTaxonomies <em>Taxonomies</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class UDDIRegistryImpl extends RegistryImpl implements UDDIRegistry {
-	/**
-	 * The default value of the '{@link #getVersion() <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VERSION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getVersion() <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected String version = VERSION_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDiscoveryURL() <em>Discovery URL</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDiscoveryURL()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DISCOVERY_URL_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDiscoveryURL() <em>Discovery URL</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDiscoveryURL()
-	 * @generated
-	 * @ordered
-	 */
-	protected String discoveryURL = DISCOVERY_URL_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getPublicationURL() <em>Publication URL</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPublicationURL()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PUBLICATION_URL_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPublicationURL() <em>Publication URL</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPublicationURL()
-	 * @generated
-	 * @ordered
-	 */
-	protected String publicationURL = PUBLICATION_URL_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getSecuredDiscoveryURL() <em>Secured Discovery URL</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSecuredDiscoveryURL()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SECURED_DISCOVERY_URL_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getSecuredDiscoveryURL() <em>Secured Discovery URL</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSecuredDiscoveryURL()
-	 * @generated
-	 * @ordered
-	 */
-	protected String securedDiscoveryURL = SECURED_DISCOVERY_URL_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getSecuredPublicationURL() <em>Secured Publication URL</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSecuredPublicationURL()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SECURED_PUBLICATION_URL_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getSecuredPublicationURL() <em>Secured Publication URL</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSecuredPublicationURL()
-	 * @generated
-	 * @ordered
-	 */
-	protected String securedPublicationURL = SECURED_PUBLICATION_URL_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDefaultLogin() <em>Default Login</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDefaultLogin()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DEFAULT_LOGIN_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDefaultLogin() <em>Default Login</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDefaultLogin()
-	 * @generated
-	 * @ordered
-	 */
-	protected String defaultLogin = DEFAULT_LOGIN_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDefaultPassword() <em>Default Password</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDefaultPassword()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DEFAULT_PASSWORD_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDefaultPassword() <em>Default Password</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDefaultPassword()
-	 * @generated
-	 * @ordered
-	 */
-	protected String defaultPassword = DEFAULT_PASSWORD_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getTaxonomies() <em>Taxonomies</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTaxonomies()
-	 * @generated
-	 * @ordered
-	 */
-	protected Taxonomies taxonomies = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected UDDIRegistryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UDDIRegistryPackage.eINSTANCE.getUDDIRegistry();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getVersion() {
-		return version;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setVersion(String newVersion) {
-		String oldVersion = version;
-		version = newVersion;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UDDIRegistryPackage.UDDI_REGISTRY__VERSION, oldVersion, version));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getDiscoveryURL() {
-		return discoveryURL;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDiscoveryURL(String newDiscoveryURL) {
-		String oldDiscoveryURL = discoveryURL;
-		discoveryURL = newDiscoveryURL;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UDDIRegistryPackage.UDDI_REGISTRY__DISCOVERY_URL, oldDiscoveryURL, discoveryURL));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPublicationURL() {
-		return publicationURL;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPublicationURL(String newPublicationURL) {
-		String oldPublicationURL = publicationURL;
-		publicationURL = newPublicationURL;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UDDIRegistryPackage.UDDI_REGISTRY__PUBLICATION_URL, oldPublicationURL, publicationURL));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getSecuredDiscoveryURL() {
-		return securedDiscoveryURL;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSecuredDiscoveryURL(String newSecuredDiscoveryURL) {
-		String oldSecuredDiscoveryURL = securedDiscoveryURL;
-		securedDiscoveryURL = newSecuredDiscoveryURL;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UDDIRegistryPackage.UDDI_REGISTRY__SECURED_DISCOVERY_URL, oldSecuredDiscoveryURL, securedDiscoveryURL));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getSecuredPublicationURL() {
-		return securedPublicationURL;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSecuredPublicationURL(String newSecuredPublicationURL) {
-		String oldSecuredPublicationURL = securedPublicationURL;
-		securedPublicationURL = newSecuredPublicationURL;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UDDIRegistryPackage.UDDI_REGISTRY__SECURED_PUBLICATION_URL, oldSecuredPublicationURL, securedPublicationURL));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getDefaultLogin() {
-		return defaultLogin;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDefaultLogin(String newDefaultLogin) {
-		String oldDefaultLogin = defaultLogin;
-		defaultLogin = newDefaultLogin;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UDDIRegistryPackage.UDDI_REGISTRY__DEFAULT_LOGIN, oldDefaultLogin, defaultLogin));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getDefaultPassword() {
-		return defaultPassword;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDefaultPassword(String newDefaultPassword) {
-		String oldDefaultPassword = defaultPassword;
-		defaultPassword = newDefaultPassword;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UDDIRegistryPackage.UDDI_REGISTRY__DEFAULT_PASSWORD, oldDefaultPassword, defaultPassword));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Taxonomies getTaxonomies() {
-		return taxonomies;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetTaxonomies(Taxonomies newTaxonomies, NotificationChain msgs) {
-		Taxonomies oldTaxonomies = taxonomies;
-		taxonomies = newTaxonomies;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, UDDIRegistryPackage.UDDI_REGISTRY__TAXONOMIES, oldTaxonomies, newTaxonomies);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTaxonomies(Taxonomies newTaxonomies) {
-		if (newTaxonomies != taxonomies) {
-			NotificationChain msgs = null;
-			if (taxonomies != null)
-				msgs = ((InternalEObject)taxonomies).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - UDDIRegistryPackage.UDDI_REGISTRY__TAXONOMIES, null, msgs);
-			if (newTaxonomies != null)
-				msgs = ((InternalEObject)newTaxonomies).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - UDDIRegistryPackage.UDDI_REGISTRY__TAXONOMIES, null, msgs);
-			msgs = basicSetTaxonomies(newTaxonomies, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UDDIRegistryPackage.UDDI_REGISTRY__TAXONOMIES, newTaxonomies, newTaxonomies));
-	}
-
-	/**
-	 * <!-- 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 UDDIRegistryPackage.UDDI_REGISTRY__NAME:
-					return ((InternalEList)getName()).basicRemove(otherEnd, msgs);
-				case UDDIRegistryPackage.UDDI_REGISTRY__DESCRIPTION:
-					return ((InternalEList)getDescription()).basicRemove(otherEnd, msgs);
-				case UDDIRegistryPackage.UDDI_REGISTRY__TAXONOMIES:
-					return basicSetTaxonomies(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 UDDIRegistryPackage.UDDI_REGISTRY__NAME:
-				return getName();
-			case UDDIRegistryPackage.UDDI_REGISTRY__DESCRIPTION:
-				return getDescription();
-			case UDDIRegistryPackage.UDDI_REGISTRY__ID:
-				return getId();
-			case UDDIRegistryPackage.UDDI_REGISTRY__LOCATION:
-				return getLocation();
-			case UDDIRegistryPackage.UDDI_REGISTRY__REF:
-				return getRef();
-			case UDDIRegistryPackage.UDDI_REGISTRY__VERSION:
-				return getVersion();
-			case UDDIRegistryPackage.UDDI_REGISTRY__DISCOVERY_URL:
-				return getDiscoveryURL();
-			case UDDIRegistryPackage.UDDI_REGISTRY__PUBLICATION_URL:
-				return getPublicationURL();
-			case UDDIRegistryPackage.UDDI_REGISTRY__SECURED_DISCOVERY_URL:
-				return getSecuredDiscoveryURL();
-			case UDDIRegistryPackage.UDDI_REGISTRY__SECURED_PUBLICATION_URL:
-				return getSecuredPublicationURL();
-			case UDDIRegistryPackage.UDDI_REGISTRY__DEFAULT_LOGIN:
-				return getDefaultLogin();
-			case UDDIRegistryPackage.UDDI_REGISTRY__DEFAULT_PASSWORD:
-				return getDefaultPassword();
-			case UDDIRegistryPackage.UDDI_REGISTRY__TAXONOMIES:
-				return getTaxonomies();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case UDDIRegistryPackage.UDDI_REGISTRY__NAME:
-				getName().clear();
-				getName().addAll((Collection)newValue);
-				return;
-			case UDDIRegistryPackage.UDDI_REGISTRY__DESCRIPTION:
-				getDescription().clear();
-				getDescription().addAll((Collection)newValue);
-				return;
-			case UDDIRegistryPackage.UDDI_REGISTRY__ID:
-				setId((String)newValue);
-				return;
-			case UDDIRegistryPackage.UDDI_REGISTRY__LOCATION:
-				setLocation((String)newValue);
-				return;
-			case UDDIRegistryPackage.UDDI_REGISTRY__REF:
-				setRef((String)newValue);
-				return;
-			case UDDIRegistryPackage.UDDI_REGISTRY__VERSION:
-				setVersion((String)newValue);
-				return;
-			case UDDIRegistryPackage.UDDI_REGISTRY__DISCOVERY_URL:
-				setDiscoveryURL((String)newValue);
-				return;
-			case UDDIRegistryPackage.UDDI_REGISTRY__PUBLICATION_URL:
-				setPublicationURL((String)newValue);
-				return;
-			case UDDIRegistryPackage.UDDI_REGISTRY__SECURED_DISCOVERY_URL:
-				setSecuredDiscoveryURL((String)newValue);
-				return;
-			case UDDIRegistryPackage.UDDI_REGISTRY__SECURED_PUBLICATION_URL:
-				setSecuredPublicationURL((String)newValue);
-				return;
-			case UDDIRegistryPackage.UDDI_REGISTRY__DEFAULT_LOGIN:
-				setDefaultLogin((String)newValue);
-				return;
-			case UDDIRegistryPackage.UDDI_REGISTRY__DEFAULT_PASSWORD:
-				setDefaultPassword((String)newValue);
-				return;
-			case UDDIRegistryPackage.UDDI_REGISTRY__TAXONOMIES:
-				setTaxonomies((Taxonomies)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case UDDIRegistryPackage.UDDI_REGISTRY__NAME:
-				getName().clear();
-				return;
-			case UDDIRegistryPackage.UDDI_REGISTRY__DESCRIPTION:
-				getDescription().clear();
-				return;
-			case UDDIRegistryPackage.UDDI_REGISTRY__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case UDDIRegistryPackage.UDDI_REGISTRY__LOCATION:
-				setLocation(LOCATION_EDEFAULT);
-				return;
-			case UDDIRegistryPackage.UDDI_REGISTRY__REF:
-				setRef(REF_EDEFAULT);
-				return;
-			case UDDIRegistryPackage.UDDI_REGISTRY__VERSION:
-				setVersion(VERSION_EDEFAULT);
-				return;
-			case UDDIRegistryPackage.UDDI_REGISTRY__DISCOVERY_URL:
-				setDiscoveryURL(DISCOVERY_URL_EDEFAULT);
-				return;
-			case UDDIRegistryPackage.UDDI_REGISTRY__PUBLICATION_URL:
-				setPublicationURL(PUBLICATION_URL_EDEFAULT);
-				return;
-			case UDDIRegistryPackage.UDDI_REGISTRY__SECURED_DISCOVERY_URL:
-				setSecuredDiscoveryURL(SECURED_DISCOVERY_URL_EDEFAULT);
-				return;
-			case UDDIRegistryPackage.UDDI_REGISTRY__SECURED_PUBLICATION_URL:
-				setSecuredPublicationURL(SECURED_PUBLICATION_URL_EDEFAULT);
-				return;
-			case UDDIRegistryPackage.UDDI_REGISTRY__DEFAULT_LOGIN:
-				setDefaultLogin(DEFAULT_LOGIN_EDEFAULT);
-				return;
-			case UDDIRegistryPackage.UDDI_REGISTRY__DEFAULT_PASSWORD:
-				setDefaultPassword(DEFAULT_PASSWORD_EDEFAULT);
-				return;
-			case UDDIRegistryPackage.UDDI_REGISTRY__TAXONOMIES:
-				setTaxonomies((Taxonomies)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case UDDIRegistryPackage.UDDI_REGISTRY__NAME:
-				return name != null && !name.isEmpty();
-			case UDDIRegistryPackage.UDDI_REGISTRY__DESCRIPTION:
-				return description != null && !description.isEmpty();
-			case UDDIRegistryPackage.UDDI_REGISTRY__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case UDDIRegistryPackage.UDDI_REGISTRY__LOCATION:
-				return LOCATION_EDEFAULT == null ? location != null : !LOCATION_EDEFAULT.equals(location);
-			case UDDIRegistryPackage.UDDI_REGISTRY__REF:
-				return REF_EDEFAULT == null ? ref != null : !REF_EDEFAULT.equals(ref);
-			case UDDIRegistryPackage.UDDI_REGISTRY__VERSION:
-				return VERSION_EDEFAULT == null ? version != null : !VERSION_EDEFAULT.equals(version);
-			case UDDIRegistryPackage.UDDI_REGISTRY__DISCOVERY_URL:
-				return DISCOVERY_URL_EDEFAULT == null ? discoveryURL != null : !DISCOVERY_URL_EDEFAULT.equals(discoveryURL);
-			case UDDIRegistryPackage.UDDI_REGISTRY__PUBLICATION_URL:
-				return PUBLICATION_URL_EDEFAULT == null ? publicationURL != null : !PUBLICATION_URL_EDEFAULT.equals(publicationURL);
-			case UDDIRegistryPackage.UDDI_REGISTRY__SECURED_DISCOVERY_URL:
-				return SECURED_DISCOVERY_URL_EDEFAULT == null ? securedDiscoveryURL != null : !SECURED_DISCOVERY_URL_EDEFAULT.equals(securedDiscoveryURL);
-			case UDDIRegistryPackage.UDDI_REGISTRY__SECURED_PUBLICATION_URL:
-				return SECURED_PUBLICATION_URL_EDEFAULT == null ? securedPublicationURL != null : !SECURED_PUBLICATION_URL_EDEFAULT.equals(securedPublicationURL);
-			case UDDIRegistryPackage.UDDI_REGISTRY__DEFAULT_LOGIN:
-				return DEFAULT_LOGIN_EDEFAULT == null ? defaultLogin != null : !DEFAULT_LOGIN_EDEFAULT.equals(defaultLogin);
-			case UDDIRegistryPackage.UDDI_REGISTRY__DEFAULT_PASSWORD:
-				return DEFAULT_PASSWORD_EDEFAULT == null ? defaultPassword != null : !DEFAULT_PASSWORD_EDEFAULT.equals(defaultPassword);
-			case UDDIRegistryPackage.UDDI_REGISTRY__TAXONOMIES:
-				return taxonomies != 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(" (version: ");
-		result.append(version);
-		result.append(", discoveryURL: ");
-		result.append(discoveryURL);
-		result.append(", publicationURL: ");
-		result.append(publicationURL);
-		result.append(", securedDiscoveryURL: ");
-		result.append(securedDiscoveryURL);
-		result.append(", securedPublicationURL: ");
-		result.append(securedPublicationURL);
-		result.append(", defaultLogin: ");
-		result.append(defaultLogin);
-		result.append(", defaultPassword: ");
-		result.append(defaultPassword);
-		result.append(')');
-		return result.toString();
-	}
-
-} //UDDIRegistryImpl
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/impl/UDDIRegistryPackageImpl.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/impl/UDDIRegistryPackageImpl.java
deleted file mode 100644
index 877528bb9..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/impl/UDDIRegistryPackageImpl.java
+++ /dev/null
@@ -1,542 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: UDDIRegistryPackageImpl.java,v 1.2 2005/12/03 04:06:50 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.uddiregistry.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-
-import org.eclipse.emf.ecore.xml.type.impl.XMLTypePackageImpl;
-
-import org.eclipse.wst.ws.internal.model.v10.registry.RegistryPackage;
-
-import org.eclipse.wst.ws.internal.model.v10.registry.impl.RegistryPackageImpl;
-
-import org.eclipse.wst.ws.internal.model.v10.rtindex.RTIndexPackage;
-
-import org.eclipse.wst.ws.internal.model.v10.rtindex.impl.RTIndexPackageImpl;
-
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.TaxonomyPackage;
-
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.impl.TaxonomyPackageImpl;
-
-import org.eclipse.wst.ws.internal.model.v10.uddiregistry.DocumentRoot;
-import org.eclipse.wst.ws.internal.model.v10.uddiregistry.Taxonomies;
-import org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistry;
-import org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistryFactory;
-import org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistryPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class UDDIRegistryPackageImpl extends EPackageImpl implements UDDIRegistryPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass documentRootEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass taxonomiesEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass uddiRegistryEClass = 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.ws.internal.model.v10.uddiregistry.UDDIRegistryPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private UDDIRegistryPackageImpl() {
-		super(eNS_URI, UDDIRegistryFactory.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 UDDIRegistryPackage init() {
-		if (isInited) return (UDDIRegistryPackage)EPackage.Registry.INSTANCE.getEPackage(UDDIRegistryPackage.eNS_URI);
-
-		// Obtain or create and register package
-		UDDIRegistryPackageImpl theUDDIRegistryPackage = (UDDIRegistryPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof UDDIRegistryPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new UDDIRegistryPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		XMLTypePackageImpl.init();
-
-		// Obtain or create and register interdependencies
-		RTIndexPackageImpl theRTIndexPackage = (RTIndexPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(RTIndexPackage.eNS_URI) instanceof RTIndexPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RTIndexPackage.eNS_URI) : RTIndexPackageImpl.eINSTANCE);
-		TaxonomyPackageImpl theTaxonomyPackage = (TaxonomyPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(TaxonomyPackage.eNS_URI) instanceof TaxonomyPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(TaxonomyPackage.eNS_URI) : TaxonomyPackageImpl.eINSTANCE);
-		RegistryPackageImpl theRegistryPackage = (RegistryPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(RegistryPackage.eNS_URI) instanceof RegistryPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RegistryPackage.eNS_URI) : RegistryPackageImpl.eINSTANCE);
-
-		// Create package meta-data objects
-		theUDDIRegistryPackage.createPackageContents();
-		theRTIndexPackage.createPackageContents();
-		theTaxonomyPackage.createPackageContents();
-		theRegistryPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theUDDIRegistryPackage.initializePackageContents();
-		theRTIndexPackage.initializePackageContents();
-		theTaxonomyPackage.initializePackageContents();
-		theRegistryPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theUDDIRegistryPackage.freeze();
-
-		return theUDDIRegistryPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDocumentRoot() {
-		return documentRootEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDocumentRoot_Mixed() {
-		return (EAttribute)documentRootEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDocumentRoot_XMLNSPrefixMap() {
-		return (EReference)documentRootEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDocumentRoot_XSISchemaLocation() {
-		return (EReference)documentRootEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDocumentRoot_Taxonomies() {
-		return (EReference)documentRootEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDocumentRoot_UddiRegistry() {
-		return (EReference)documentRootEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getTaxonomies() {
-		return taxonomiesEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTaxonomies_Taxonomy() {
-		return (EReference)taxonomiesEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getUDDIRegistry() {
-		return uddiRegistryEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getUDDIRegistry_Version() {
-		return (EAttribute)uddiRegistryEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getUDDIRegistry_DiscoveryURL() {
-		return (EAttribute)uddiRegistryEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getUDDIRegistry_PublicationURL() {
-		return (EAttribute)uddiRegistryEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getUDDIRegistry_SecuredDiscoveryURL() {
-		return (EAttribute)uddiRegistryEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getUDDIRegistry_SecuredPublicationURL() {
-		return (EAttribute)uddiRegistryEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getUDDIRegistry_DefaultLogin() {
-		return (EAttribute)uddiRegistryEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getUDDIRegistry_DefaultPassword() {
-		return (EAttribute)uddiRegistryEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getUDDIRegistry_Taxonomies() {
-		return (EReference)uddiRegistryEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public UDDIRegistryFactory getUDDIRegistryFactory() {
-		return (UDDIRegistryFactory)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
-		documentRootEClass = createEClass(DOCUMENT_ROOT);
-		createEAttribute(documentRootEClass, DOCUMENT_ROOT__MIXED);
-		createEReference(documentRootEClass, DOCUMENT_ROOT__XMLNS_PREFIX_MAP);
-		createEReference(documentRootEClass, DOCUMENT_ROOT__XSI_SCHEMA_LOCATION);
-		createEReference(documentRootEClass, DOCUMENT_ROOT__TAXONOMIES);
-		createEReference(documentRootEClass, DOCUMENT_ROOT__UDDI_REGISTRY);
-
-		taxonomiesEClass = createEClass(TAXONOMIES);
-		createEReference(taxonomiesEClass, TAXONOMIES__TAXONOMY);
-
-		uddiRegistryEClass = createEClass(UDDI_REGISTRY);
-		createEAttribute(uddiRegistryEClass, UDDI_REGISTRY__VERSION);
-		createEAttribute(uddiRegistryEClass, UDDI_REGISTRY__DISCOVERY_URL);
-		createEAttribute(uddiRegistryEClass, UDDI_REGISTRY__PUBLICATION_URL);
-		createEAttribute(uddiRegistryEClass, UDDI_REGISTRY__SECURED_DISCOVERY_URL);
-		createEAttribute(uddiRegistryEClass, UDDI_REGISTRY__SECURED_PUBLICATION_URL);
-		createEAttribute(uddiRegistryEClass, UDDI_REGISTRY__DEFAULT_LOGIN);
-		createEAttribute(uddiRegistryEClass, UDDI_REGISTRY__DEFAULT_PASSWORD);
-		createEReference(uddiRegistryEClass, UDDI_REGISTRY__TAXONOMIES);
-	}
-
-	/**
-	 * <!-- 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
-		TaxonomyPackageImpl theTaxonomyPackage = (TaxonomyPackageImpl)EPackage.Registry.INSTANCE.getEPackage(TaxonomyPackage.eNS_URI);
-		RegistryPackageImpl theRegistryPackage = (RegistryPackageImpl)EPackage.Registry.INSTANCE.getEPackage(RegistryPackage.eNS_URI);
-		XMLTypePackageImpl theXMLTypePackage = (XMLTypePackageImpl)EPackage.Registry.INSTANCE.getEPackage(XMLTypePackage.eNS_URI);
-
-		// Add supertypes to classes
-		uddiRegistryEClass.getESuperTypes().add(theRegistryPackage.getRegistry());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(documentRootEClass, DocumentRoot.class, "DocumentRoot", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getDocumentRoot_Mixed(), ecorePackage.getEFeatureMapEntry(), "mixed", null, 0, -1, null, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getDocumentRoot_XMLNSPrefixMap(), ecorePackage.getEStringToStringMapEntry(), null, "xMLNSPrefixMap", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getDocumentRoot_XSISchemaLocation(), ecorePackage.getEStringToStringMapEntry(), null, "xSISchemaLocation", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getDocumentRoot_Taxonomies(), this.getTaxonomies(), null, "taxonomies", null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEReference(getDocumentRoot_UddiRegistry(), this.getUDDIRegistry(), null, "uddiRegistry", null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-
-		initEClass(taxonomiesEClass, Taxonomies.class, "Taxonomies", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getTaxonomies_Taxonomy(), theTaxonomyPackage.getTaxonomy(), null, "taxonomy", null, 0, -1, Taxonomies.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(uddiRegistryEClass, UDDIRegistry.class, "UDDIRegistry", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getUDDIRegistry_Version(), theXMLTypePackage.getString(), "version", null, 1, 1, UDDIRegistry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getUDDIRegistry_DiscoveryURL(), theXMLTypePackage.getAnyURI(), "discoveryURL", null, 1, 1, UDDIRegistry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getUDDIRegistry_PublicationURL(), theXMLTypePackage.getAnyURI(), "publicationURL", null, 1, 1, UDDIRegistry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getUDDIRegistry_SecuredDiscoveryURL(), theXMLTypePackage.getAnyURI(), "securedDiscoveryURL", null, 1, 1, UDDIRegistry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getUDDIRegistry_SecuredPublicationURL(), theXMLTypePackage.getAnyURI(), "securedPublicationURL", null, 1, 1, UDDIRegistry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getUDDIRegistry_DefaultLogin(), theXMLTypePackage.getString(), "defaultLogin", null, 1, 1, UDDIRegistry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getUDDIRegistry_DefaultPassword(), theXMLTypePackage.getString(), "defaultPassword", null, 1, 1, UDDIRegistry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getUDDIRegistry_Taxonomies(), this.getTaxonomies(), null, "taxonomies", null, 0, 1, UDDIRegistry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		// Create resource
-		createResource(eNS_URI);
-
-		// Create annotations
-		// http:///org/eclipse/emf/ecore/util/ExtendedMetaData
-		createExtendedMetaDataAnnotations();
-	}
-
-	/**
-	 * Initializes the annotations for <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void createExtendedMetaDataAnnotations() {
-		String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData";			
-		addAnnotation
-		  (documentRootEClass, 
-		   source, 
-		   new String[] {
-			 "name", "",
-			 "kind", "mixed"
-		   });		
-		addAnnotation
-		  (getDocumentRoot_Mixed(), 
-		   source, 
-		   new String[] {
-			 "kind", "elementWildcard",
-			 "name", ":mixed"
-		   });		
-		addAnnotation
-		  (getDocumentRoot_XMLNSPrefixMap(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "xmlns:prefix"
-		   });		
-		addAnnotation
-		  (getDocumentRoot_XSISchemaLocation(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "xsi:schemaLocation"
-		   });		
-		addAnnotation
-		  (getDocumentRoot_Taxonomies(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "taxonomies",
-			 "namespace", "##targetNamespace"
-		   });		
-		addAnnotation
-		  (getDocumentRoot_UddiRegistry(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "uddiRegistry",
-			 "namespace", "##targetNamespace"
-		   });		
-		addAnnotation
-		  (taxonomiesEClass, 
-		   source, 
-		   new String[] {
-			 "name", "Taxonomies",
-			 "kind", "elementOnly"
-		   });		
-		addAnnotation
-		  (getTaxonomies_Taxonomy(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "taxonomy",
-			 "namespace", "http://eclipse.org/wst/ws/internal/model/v10/taxonomy"
-		   });		
-		addAnnotation
-		  (uddiRegistryEClass, 
-		   source, 
-		   new String[] {
-			 "name", "UDDIRegistry",
-			 "kind", "elementOnly"
-		   });		
-		addAnnotation
-		  (getUDDIRegistry_Version(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "version"
-		   });		
-		addAnnotation
-		  (getUDDIRegistry_DiscoveryURL(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "discoveryURL"
-		   });		
-		addAnnotation
-		  (getUDDIRegistry_PublicationURL(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "publicationURL"
-		   });		
-		addAnnotation
-		  (getUDDIRegistry_SecuredDiscoveryURL(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "securedDiscoveryURL"
-		   });		
-		addAnnotation
-		  (getUDDIRegistry_SecuredPublicationURL(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "securedPublicationURL"
-		   });		
-		addAnnotation
-		  (getUDDIRegistry_DefaultLogin(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "defaultLogin"
-		   });		
-		addAnnotation
-		  (getUDDIRegistry_DefaultPassword(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "defaultPassword"
-		   });		
-		addAnnotation
-		  (getUDDIRegistry_Taxonomies(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "taxonomies"
-		   });
-	}
-
-} //UDDIRegistryPackageImpl
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/util/UDDIRegistryAdapterFactory.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/util/UDDIRegistryAdapterFactory.java
deleted file mode 100644
index fc8e0c6fe..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/util/UDDIRegistryAdapterFactory.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: UDDIRegistryAdapterFactory.java,v 1.2 2005/12/03 04:06:50 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.uddiregistry.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.ecore.EObject;
-
-import org.eclipse.wst.ws.internal.model.v10.registry.Registry;
-
-import org.eclipse.wst.ws.internal.model.v10.uddiregistry.*;
-
-/**
- * <!-- 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.ws.internal.model.v10.uddiregistry.UDDIRegistryPackage
- * @generated
- */
-public class UDDIRegistryAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static UDDIRegistryPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public UDDIRegistryAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = UDDIRegistryPackage.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 UDDIRegistrySwitch modelSwitch =
-		new UDDIRegistrySwitch() {
-			public Object caseDocumentRoot(DocumentRoot object) {
-				return createDocumentRootAdapter();
-			}
-			public Object caseTaxonomies(Taxonomies object) {
-				return createTaxonomiesAdapter();
-			}
-			public Object caseUDDIRegistry(UDDIRegistry object) {
-				return createUDDIRegistryAdapter();
-			}
-			public Object caseRegistry(Registry object) {
-				return createRegistryAdapter();
-			}
-			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.ws.internal.model.v10.uddiregistry.DocumentRoot <em>Document Root</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.ws.internal.model.v10.uddiregistry.DocumentRoot
-	 * @generated
-	 */
-	public Adapter createDocumentRootAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.Taxonomies <em>Taxonomies</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.ws.internal.model.v10.uddiregistry.Taxonomies
-	 * @generated
-	 */
-	public Adapter createTaxonomiesAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistry <em>UDDIRegistry</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.ws.internal.model.v10.uddiregistry.UDDIRegistry
-	 * @generated
-	 */
-	public Adapter createUDDIRegistryAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.wst.ws.internal.model.v10.registry.Registry <em>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 org.eclipse.wst.ws.internal.model.v10.registry.Registry
-	 * @generated
-	 */
-	public Adapter createRegistryAdapter() {
-		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;
-	}
-
-} //UDDIRegistryAdapterFactory
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/util/UDDIRegistryResourceFactoryImpl.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/util/UDDIRegistryResourceFactoryImpl.java
deleted file mode 100644
index 91315af76..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/util/UDDIRegistryResourceFactoryImpl.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: UDDIRegistryResourceFactoryImpl.java,v 1.2 2005/12/03 04:06:50 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.uddiregistry.util;
-
-import org.eclipse.emf.common.util.URI;
-
-import org.eclipse.emf.ecore.resource.Resource;
-
-import org.eclipse.emf.ecore.util.ExtendedMetaData;
-
-import org.eclipse.emf.ecore.xmi.XMLResource;
-
-import org.eclipse.emf.ecore.xmi.impl.XMLResourceFactoryImpl;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource Factory</b> associated with the package.
- * <!-- end-user-doc -->
- * @see org.eclipse.wst.ws.internal.model.v10.uddiregistry.util.UDDIRegistryResourceImpl
- * @generated
- */
-public class UDDIRegistryResourceFactoryImpl extends XMLResourceFactoryImpl {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ExtendedMetaData extendedMetaData;
-
-	/**
-	 * Creates an instance of the resource factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public UDDIRegistryResourceFactoryImpl() {
-		super();
-		extendedMetaData = ExtendedMetaData.INSTANCE;
-	}
-
-	/**
-	 * Creates an instance of the resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Resource createResource(URI uri) {
-		XMLResource result = new UDDIRegistryResourceImpl(uri);
-		result.getDefaultSaveOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, extendedMetaData);
-		result.getDefaultLoadOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, extendedMetaData);
-
-		result.getDefaultSaveOptions().put(XMLResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE);
-		result.getDefaultSaveOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
-
-		result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE);
-		return result;
-	}
-
-} //UDDIRegistryResourceFactoryImpl
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/util/UDDIRegistryResourceImpl.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/util/UDDIRegistryResourceImpl.java
deleted file mode 100644
index 6d029c674..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/util/UDDIRegistryResourceImpl.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: UDDIRegistryResourceImpl.java,v 1.2 2005/12/03 04:06:50 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.uddiregistry.util;
-
-import org.eclipse.emf.common.util.URI;
-
-import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource </b> associated with the package.
- * <!-- end-user-doc -->
- * @see org.eclipse.wst.ws.internal.model.v10.uddiregistry.util.UDDIRegistryResourceFactoryImpl
- * @generated
- */
-public class UDDIRegistryResourceImpl extends XMLResourceImpl {
-	/**
-	 * Creates an instance of the resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param uri the URI of the new resource.
-	 * @generated
-	 */
-	public UDDIRegistryResourceImpl(URI uri) {
-		super(uri);
-	}
-
-} //UDDIRegistryResourceFactoryImpl
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/util/UDDIRegistrySwitch.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/util/UDDIRegistrySwitch.java
deleted file mode 100644
index bd3d8ae47..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/util/UDDIRegistrySwitch.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: UDDIRegistrySwitch.java,v 1.2 2005/12/03 04:06:50 cbrealey Exp $
- */
-package org.eclipse.wst.ws.internal.model.v10.uddiregistry.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.wst.ws.internal.model.v10.registry.Registry;
-
-import org.eclipse.wst.ws.internal.model.v10.uddiregistry.*;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) 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.ws.internal.model.v10.uddiregistry.UDDIRegistryPackage
- * @generated
- */
-public class UDDIRegistrySwitch {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static UDDIRegistryPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public UDDIRegistrySwitch() {
-		if (modelPackage == null) {
-			modelPackage = UDDIRegistryPackage.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) {
-		return doSwitch(theEObject.eClass(), theEObject);
-	}
-
-	/**
-	 * 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
-	 */
-	protected Object doSwitch(EClass theEClass, EObject theEObject) {
-		if (theEClass.eContainer() == modelPackage) {
-			return doSwitch(theEClass.getClassifierID(), theEObject);
-		}
-		else {
-			List eSuperTypes = theEClass.getESuperTypes();
-			return
-				eSuperTypes.isEmpty() ?
-					defaultCase(theEObject) :
-					doSwitch((EClass)eSuperTypes.get(0), theEObject);
-		}
-	}
-
-	/**
-	 * 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
-	 */
-	protected Object doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case UDDIRegistryPackage.DOCUMENT_ROOT: {
-				DocumentRoot documentRoot = (DocumentRoot)theEObject;
-				Object result = caseDocumentRoot(documentRoot);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UDDIRegistryPackage.TAXONOMIES: {
-				Taxonomies taxonomies = (Taxonomies)theEObject;
-				Object result = caseTaxonomies(taxonomies);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UDDIRegistryPackage.UDDI_REGISTRY: {
-				UDDIRegistry uddiRegistry = (UDDIRegistry)theEObject;
-				Object result = caseUDDIRegistry(uddiRegistry);
-				if (result == null) result = caseRegistry(uddiRegistry);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Document Root</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>Document Root</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDocumentRoot(DocumentRoot object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Taxonomies</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>Taxonomies</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseTaxonomies(Taxonomies object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>UDDIRegistry</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>UDDIRegistry</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseUDDIRegistry(UDDIRegistry object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>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>Registry</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseRegistry(Registry 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;
-	}
-
-} //UDDIRegistrySwitch
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 32f5c5a9f..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/monitor/GetMonitorCommand.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.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.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.StatusException;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.internet.monitor.core.internal.provisional.IMonitor;
-import org.eclipse.wst.internet.monitor.core.internal.provisional.IMonitorWorkingCopy;
-import org.eclipse.wst.internet.monitor.core.internal.provisional.MonitorCore;
-import org.eclipse.wst.server.core.util.SocketUtil;
-import org.eclipse.wst.ws.internal.WstWSPluginMessages;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-public class GetMonitorCommand extends AbstractDataModelOperation 
-{
-	private boolean monitorService;
-
-	private boolean create;
-
-	private WebServicesParser webServicesParser;
-
-	private String wsdlURI;
-
-	private List endpoints;
-
-	public GetMonitorCommand() {
-		monitorService = true;
-		create = true;
-	}
-
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-  {
-    IEnvironment env = getEnvironment();
-    
-		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) 
-                    {
-											IStatus warning = StatusUtils.warningStatus(
-													NLS.bind(WstWSPluginMessages.MSG_ERROR_UNABLE_TO_START_MONITOR,
-													new Object[] {String.valueOf(port),	endpoint }), 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) 
-                    {
-											IStatus warning = StatusUtils.warningStatus(
-													NLS.bind(WstWSPluginMessages.MSG_ERROR_UNABLE_TO_START_MONITOR,
-													new Object[] {String.valueOf(port), endpoint }), t );
-											try {
-												if (env != null)
-													env.getStatusHandler()
-															.report(warning);
-											} catch (StatusException se) {
-											}
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-		return Status.OK_STATUS;
-	}
-
-	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/plugin/WSPlugin.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/plugin/WSPlugin.java
deleted file mode 100644
index 02b9c34be..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/plugin/WSPlugin.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.wst.ws.internal.plugin;
-
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.wst.ws.internal.preferences.PersistentWSDLValidationContext;
-import org.eclipse.wst.ws.internal.preferences.PersistentWSIAPContext;
-import org.eclipse.wst.ws.internal.preferences.PersistentWSIContext;
-import org.eclipse.wst.ws.internal.preferences.PersistentWSISSBPContext;
-import org.eclipse.wst.ws.internal.preferences.PersistentWaitForWSDLValidationContext;
-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;
-	
-	private PersistentWSISSBPContext wsiSSBPContext_;
-	private PersistentWSIAPContext wsiAPContext_;
-	private PersistentWSDLValidationContext wsdlValidationContext_;
-	private PersistentWaitForWSDLValidationContext waitForWsdlValidationContext_;
-
-	public static final String ID = "org.eclipse.wst.ws";
-	
-	/**
-	 * The constructor.
-	 */
-	public WSPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * Returns the singleton instance of this plugin. Equivalent to calling
-	 * (WSPlugin)Platform.getPlugin("org.eclipse.wst.ws");
-	 * @return The WSPlugin singleton.
-	 */
-	 static public WSPlugin getInstance() {
-	   return plugin;
-	 }
-	 
-	/**
-	 * 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;
-	}
-	/**
-	 * 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_;
-	}
-
-	 /**
-	 * Get WSDL Valiation Context
-	 * 
-	 */ 
-
-	public PersistentWSDLValidationContext getWSDLValidationContext() {
-		if (wsdlValidationContext_ == null) {
-			wsdlValidationContext_ = new PersistentWSDLValidationContext();
-			wsdlValidationContext_.load();
-		}
-		return wsdlValidationContext_;
-	}
-	
-	/**
-	 * Get Wait for WSDL Valiation Context
-	 * 
-	 */ 
-
-	public PersistentWaitForWSDLValidationContext getWaitForWSDLValidationContext() {
-		if (waitForWsdlValidationContext_ == null) {
-			waitForWsdlValidationContext_ = new PersistentWaitForWSDLValidationContext();
-			waitForWsdlValidationContext_.load();
-		}
-		return waitForWsdlValidationContext_;
-	}
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/preferences/PersistentWSDLValidationContext.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/preferences/PersistentWSDLValidationContext.java
deleted file mode 100644
index cb1c047a9..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/preferences/PersistentWSDLValidationContext.java
+++ /dev/null
@@ -1,77 +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.preferences;
-
-import org.eclipse.wst.command.internal.env.context.PersistentContext;
-import org.eclipse.wst.ws.internal.plugin.WSPlugin;
-
-
-
-public class PersistentWSDLValidationContext extends PersistentContext
-{
-	public static final String VALIDATE_NO_WSDL = "0";
-	public static final String VALIDATE_REMOTE_WSDL = "1";
-	public static final String VALIDATE_ALL_WSDL = "2";
-
-	private String wsdl_validation = "WSDL_VALIDATION";
-
-public PersistentWSDLValidationContext () 
-{
-	super(  WSPlugin.getInstance());
-	
-}
-
-public void load() 
-{
-	setDefault(wsdl_validation, VALIDATE_NO_WSDL);
-}
-
-// to be used only by the preference page
-public void updateWSDLValidation ( String value)
-{
- 		setValue( wsdl_validation, value);
-}
-
-public String getPersistentWSDLValidation ()
-{
-	String property = getValueAsString(wsdl_validation);
-//	 default to Ignore if no init has been done from ini file
-	if (property == null || property.equals("")) {
-		setValue( wsdl_validation, VALIDATE_NO_WSDL);
-		return VALIDATE_NO_WSDL;
-	}
-	else
-		return property;
-}
-
-public String getDefault()
-{
-	return getDefaultString(wsdl_validation);
-}
-
-public boolean ValidateNoWSDL()
-{
-	 return VALIDATE_NO_WSDL.equals(getPersistentWSDLValidation());
-}
-
-public boolean WarnNonWSICompliances()
-{
-	 return VALIDATE_REMOTE_WSDL.equals(getPersistentWSDLValidation());
-}
-
-public boolean IgnoreNonWSICompliances()
-{
-	 return VALIDATE_ALL_WSDL.equals(getPersistentWSDLValidation());
-}
-
-
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/preferences/PersistentWSIAPContext.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/preferences/PersistentWSIAPContext.java
deleted file mode 100644
index 3f5d8984e..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/preferences/PersistentWSIAPContext.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.preferences;
-
-import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.wst.ws.internal.WstWSPluginMessages;
-import org.eclipse.wst.ws.internal.plugin.WSPlugin;
-
-
-
-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(WSPlugin.ID , non_wsi_compliance);
-	wsiWarning_ = WstWSPluginMessages.WSI_AP_WARNING;
-	wsiError_ = WstWSPluginMessages.WSI_AP_ERROR;
-}
-
-public String getPersistentWSICompliance ()
-{
-	String property = getValueAsString(non_wsi_compliance);
-	// default to Warning if no init has been done from ini file
-	if (property == null || property.equals("")) {
-		setValue( non_wsi_compliance, WARN_NON_WSI);
-		return WARN_NON_WSI;
-	}
-	else
-		return property;
-}
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/preferences/PersistentWSIContext.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/preferences/PersistentWSIContext.java
deleted file mode 100644
index 2b4fd0d07..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/preferences/PersistentWSIContext.java
+++ /dev/null
@@ -1,164 +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.preferences;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.wst.command.internal.env.context.PersistentContext;
-import org.eclipse.wst.common.environment.EnvironmentService;
-import org.eclipse.wst.common.environment.ILog;
-import org.eclipse.wst.ws.internal.WstWSPluginMessages;
-import org.eclipse.wst.ws.internal.plugin.WSPlugin;
-
-
-
-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(  WSPlugin.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(WSPlugin.ID , non_wsi_compliance);
-	wsiWarning_ = WstWSPluginMessages.WSI_SSBP_WARNING;
-	wsiError_ = WstWSPluginMessages.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 Warning if no init has been done from ini file
-	if (property == null || property.equals("")) {
-		setValue( non_wsi_compliance, WARN_NON_WSI);
-		return WARN_NON_WSI;
-	}
-	else
-		return property;
-}
-
-public boolean StopNonWSICompliances()
-{
-	 return STOP_NON_WSI.equals(getPersistentWSICompliance());
-}
-
-public boolean WarnNonWSICompliances()
-{
-	 return WARN_NON_WSI.equals(getPersistentWSICompliance());
-}
-
-public boolean IgnoreNonWSICompliances()
-{
-	 return IGNORE_NON_WSI.equals(getPersistentWSICompliance());
-}
-
-// to be used only by the property page
-public void updateProjectWSICompliances ( IProject project, String value)
-{
-    try {
-		project.setPersistentProperty(name, value);
-    }
-    catch (CoreException e) { 
-    	System.out.println("No such Project");
-    	ILog log = EnvironmentService.getEclipseLog();
-    	log.log(ILog.INFO, 5084, this, "updateProjectWSICompliances", "No such Project "+project);
-    }
-}
-
-public boolean projectStopNonWSICompliances(IProject project)
-{
- 	return STOP_NON_WSI.equals(getProjectPersistentProperty(project));    
-}
-
-public boolean projectWarnNonWSICompliances(IProject project)
-{
- 	return WARN_NON_WSI.equals(getProjectPersistentProperty(project));    
-}
-
-public boolean projectIgnoreNonWSICompliances(IProject project)
-{
- 	return IGNORE_NON_WSI.equals(getProjectPersistentProperty(project));    
-}
-
-
-// to be used only by the property page
-public boolean projectFollowWSIPreferance(IProject project)
-{
-    try {
- 	String property = project.getPersistentProperty(name);
-    return (property == null || property.equals("") || property.equals(FOLLOW_WSI_PREFERENCE));
-    	}
-    catch (CoreException e)     {
-    	return true;
-     }     
-}
-
-private String getProjectPersistentProperty(IProject project)
-{
-	String property = getProjectWSICompliance(project);
-	if (property.equals(FOLLOW_WSI_PREFERENCE)) {
-		property = getPersistentWSICompliance();
-	}
-	return property;
- }
-
-public String getProjectWSICompliance(IProject project)
-{
-  try {
-     	String property = project.getPersistentProperty(name);
-     	if (property == null || property.equals(""))
-     	{
-     		property = FOLLOW_WSI_PREFERENCE;
-     	}
-     	return property;
-     }
-     catch (CoreException e)     {
-    	System.out.println("No such Project");
-    	return getPersistentWSICompliance();
-     }     
-}
-
-public String getWarning()
-{
-	return wsiWarning_;
-}
-
-public String getError()
-{
-	return wsiError_;
-}
-
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/preferences/PersistentWSISSBPContext.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/preferences/PersistentWSISSBPContext.java
deleted file mode 100644
index d5da7de48..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/preferences/PersistentWSISSBPContext.java
+++ /dev/null
@@ -1,33 +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.preferences;
-
-import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.wst.ws.internal.WstWSPluginMessages;
-import org.eclipse.wst.ws.internal.plugin.WSPlugin;
-
-
-
-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(WSPlugin.ID , non_wsi_compliance);
-	wsiWarning_ = WstWSPluginMessages.WSI_SSBP_WARNING;
-	wsiError_ = WstWSPluginMessages.WSI_SSBP_ERROR;
-}
-
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/preferences/PersistentWaitForWSDLValidationContext.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/preferences/PersistentWaitForWSDLValidationContext.java
deleted file mode 100644
index eced2116e..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/preferences/PersistentWaitForWSDLValidationContext.java
+++ /dev/null
@@ -1,55 +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.preferences;
-
-import org.eclipse.wst.command.internal.env.context.PersistentContext;
-import org.eclipse.wst.ws.internal.plugin.WSPlugin;
-
-
-
-public class PersistentWaitForWSDLValidationContext extends PersistentContext
-{
-
-	private String wait_for_wsdl_validation = "WAIT_FOR_WSDL_VALIDATION";
-
-public PersistentWaitForWSDLValidationContext () 
-{
-	super(  WSPlugin.getInstance());
-	
-}
-
-public void load() 
-{
-	setDefault(wait_for_wsdl_validation, true);
-}
-
-// to be used only by the preference page
-public void setWaitForWSDLValidation ( boolean value)
-{
- 		setValue( wait_for_wsdl_validation, value);
-}
-
-public boolean getPersistentWaitForWSDLValidation ()
-{
-	return getValueAsBoolean(wait_for_wsdl_validation);
-
-}
-
-public boolean getDefault()
-{
-	return getDefaultBoolean(wait_for_wsdl_validation);
-}
-
-
-
-
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/preferences/WSIComplianceUtils.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/preferences/WSIComplianceUtils.java
deleted file mode 100644
index 4a71383f4..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/preferences/WSIComplianceUtils.java
+++ /dev/null
@@ -1,84 +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.preferences;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Choice;
-import org.eclipse.wst.common.environment.IStatusHandler;
-import org.eclipse.wst.ws.internal.WstWSPluginMessages;
-
-
-public class WSIComplianceUtils
-{
-
-/**
- * @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;
-}
-
-/**
- * @param monitor IStatusHandler
- * @param status Status[]
- * @param project IProject
- * @param context PersistentWSIContext
- * @return boolean true if to continue
- */
-public static boolean checkWSICompliance ( IStatusHandler monitor, Status[] status, IProject project, PersistentWSIContext context)
-{
-  	if (context.projectStopNonWSICompliances(project))
-  		{
-      
-  			// emit an error message and return false
-  			IStatus status_ = StatusUtils.multiStatus( context.getError(), status );
-			monitor.reportError(status_);
-  			return false;
-  		}
-  	else if (context.projectWarnNonWSICompliances(project))
-  		{
-  			// give a warning message with the options to stop, ignore this one, or ignore all coming messages
-  			IStatus status_ = StatusUtils.multiStatus( context.getWarning(), status);
-
-  			Choice ignoreChoice = new Choice('I', WstWSPluginMessages.IGNORE_LABEL, WstWSPluginMessages.IGNORE_DESCRIPTION);
-  			Choice ignoreAllChoice = new Choice('A', WstWSPluginMessages.IGNORE_ALL_LABEL, WstWSPluginMessages.IGNORE_ALL_DESCRIPTION);
-  			Choice cancelChoice = new Choice('C', WstWSPluginMessages.CANCEL_LABEL, WstWSPluginMessages.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/src/org/eclipse/wst/ws/internal/registry/GenericResourceFactory.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/registry/GenericResourceFactory.java
deleted file mode 100644
index 0536d0f3b..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/registry/GenericResourceFactory.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.registry;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.ExtendedMetaData;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.ecore.xmi.impl.XMLResourceFactoryImpl;
-import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
-
-/**
- * Patterned after the ResourceFactory classes generated
- * by the EMF tools, this generic factory handles creation
- * of EMF resources for XML documents in general.
- */
-public class GenericResourceFactory extends XMLResourceFactoryImpl
-{
-	/**
-	 * Holds an instance of <code>ExtendedMetaData</code>
-	 * for associating extended metadata with the
-	 * <code>Resource</code> returned by <code>createResource</code>.
-	 */
-	protected ExtendedMetaData extendedMetaData;
-
-	/**
-	 * Constructs a new <code>GenericResourceFactory</code>.
-	 */
-	public GenericResourceFactory()
-	{
-		super();
-		extendedMetaData = ExtendedMetaData.INSTANCE;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.ecore.resource.Resource$Factory#createResource(org.eclipse.emf.common.util.URI)
-	 */
-	public Resource createResource(URI uri)
-	{
-		XMLResource result = new XMLResourceImpl(uri);
-		result.getDefaultSaveOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, extendedMetaData);
-		result.getDefaultLoadOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, extendedMetaData);
-		result.getDefaultSaveOptions().put(XMLResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE);
-		result.getDefaultSaveOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
-		result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE);
-		return result;
-	}
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/registry/IRegistryManager.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/registry/IRegistryManager.java
deleted file mode 100644
index 582e47613..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/registry/IRegistryManager.java
+++ /dev/null
@@ -1,260 +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.registry;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.ws.internal.model.v10.registry.Registry;
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy;
-
-/**
- * An IRegistryManager manages a family of <code>Registry</code>
- * and <code>Taxonomy</code> models persisted within some
- * addressable location such as under a directory in the
- * filesystem or under a folder in the Eclipse workspace,
- * and referenced from an index document at the same location. 
- * <p>
- * Call <code>RegisteryService.getDefaultRegistryManager()</code>
- * or <code>RegisteryService.getRegistryManager(URL)</code> to
- * get a new IRegistryManager.
- * 
- * @see org.eclipse.wst.ws.internal.registry.RegistryService#instance()
- * @see org.eclipse.wst.ws.internal.model.v10.registry.Registry
- * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy
- * @author cbrealey
- */
-public interface IRegistryManager
-{
-	/**
-	 * A constant for use in the <code>removeRegistry(...)</code>
-	 * and <code>removeTaxonomy(...)</code> methods that will
-	 * cause the given registry or taxonomy document to be removed
-	 * from the index, but not deleted.
-	 * 
-	 * @see #removeRegistry(String, boolean)
-	 * @see #removeTaxonomy(String, boolean)
-	 */
-	public boolean KEEP_DOCUMENT = false;
-
-	/**
-	 * A constant for use in the <code>removeRegistry(...)</code>
-	 * and <code>removeTaxonomy(...)</code> methods that will
-	 * cause the given registry or taxonomy document to be removed
-	 * from the index and deleted.
-	 * 
-	 * @see #removeRegistry(String, boolean)
-	 * @see #removeTaxonomy(String, boolean)
-	 */
-	public boolean DELETE_DOCUMENT = true;
-
-	/**
-	 * Returns the URL of the XML index document that references
-	 * the XML registry and taxonomy models managed by this
-	 * Registry Manager.
-	 * 
-	 * @return The URL of the managing document.
-	 * @throws MalformedURLException If a URL to the managing
-	 * document cannot be determined or created.
-	 */
-	public URL getURL () throws MalformedURLException;
-
-	/**
-	 * Adds an <code>ITaxonomyFinder</code> that the
-	 * <code>IRegistryManager</code> can use to find
-	 * the set of <code>Taxonomy</code> models used
-	 * by a given <code>Registry</code> model.
-	 * <code>IRegistryManager.save(registry)</code> needs help finding
-	 * the <code>Taxonomy</code> models used by a <code>Registry</code>,
-	 * if any.
-	 * 
-	 * @param className The name of the concrete <code>Registry<code>
-	 * class for which the <code>ITaxonomyFinder</code> is being added.
-	 * @param taxonomyFinder An <code>ITaxonomyFinder</code> that knows
-	 * how to determine the set of <code>Taxonomy</code> models a given
-	 * concrete <code>Registry</code> model is using.
-	 * @see ITaxonomyFinder
-	 * @see #saveRegistry(Registry)
-	 */
-	public void addTaxonomyFinder ( String className, ITaxonomyFinder taxonomyFinder );
-
-	/**
-	 * Saves a <code>Taxonomy</code> model to an XML document
-	 * located relative to the index XML document as identified by
-	 * <code>getURL()</code>, and updates the index XML document
-	 * with references to the saved taxonomy document.
-	 * The relative pathname to the taxonomy XML document is
-	 * computed by the <code>IRegistryManager</code> and cannot
-	 * be influenced by the caller.
-	 * 
-	 * @param registry The <code>Registry</code> model (and
-	 * referenced <code>Taxonomy</code> models) to save.
-	 * @return A <code>Registry</code> reference.
-	 * @throws CoreException If the operation fails for any reason,
-	 * including but not limited to malformed location URIs in the
-	 * index or general input/output error conditions.
-	 * @see Registry
-	 * @see #addTaxonomyFinder(String, ITaxonomyFinder)
-	 */
-	public Registry saveRegistry ( Registry registry ) throws CoreException;
-
-	/**
-	 * Loads as necessary and returns a full <code>Registry</code>
-	 * model as identified by the given URI and referenced from
-	 * the index XML document located at <code>getURL()</code>.
-	 * 
-	 * @param uri The URI identifier of the registry.
-	 * @return The <code>Registry</code> model
-	 * or null if no such model can be found.
-	 * @throws CoreException If the operation fails for any reason,
-	 * including but not limited to malformed location URIs in the
-	 * index or general input/output error conditions.
-	 * @see Registry
-	 */
-	public Registry loadRegistry ( String uri ) throws CoreException;
-
-	/**
-	 * Loads as necessary and returns an array of full <code>Registry</code>
-	 * models as identified by the given array of URIs and referenced from
-	 * the index XML document located at <code>getURL()</code>.
-	 * Useful in conjunction with <code>getRegistryURIs()</code>.
-	 * Note that the length of the returned array may be less than
-	 * the length of the array of URIs in cases where one or more
-	 * URIs fail to resolve to a loadable model.
-	 * 
-	 * @param uris The URI identifiers of the registries.
-	 * @return The array of <code>Registry</code> models,
-	 * never null, but possibly empty.
-	 * @throws CoreException If the operation fails for any reason,
-	 * including but not limited to malformed location URIs in the
-	 * index or general input/output error conditions.
-	 * @see Registry
-	 */
-	public Registry[] loadRegistries ( String[] uris ) throws CoreException;
-
-	/**
-	 * Returns an array of URI identifiers to <code>Registry</code>
-	 * models in the index managed by this <code>IRegistryManager</code>.
-	 * 
-	 * @return An array of URI identifiers, possibly empty but never null,
-	 * to registered <code>Registry</code> models.
-	 * @throws CoreException If the operation fails for any reason,
-	 * including but not limited to malformed location URIs in the
-	 * index or general input/output error conditions.
-	 * @see Registry
-	 */
-	public String[] getRegistryURIs () throws CoreException;
-
-	/**
-	 * Removes the <code>Registry</code> model identified by the
-	 * given <code>uri</code> from the index and either keeps or
-	 * deletes the corresponding <code>Registry</code> document
-	 * based on the value given for <code>deleteDocument</code>.
-	 * 
-	 * @param uri The URI identifier of the model to delete.
-	 * @param deleteDocument Either <code>KEEP_DOCUMENT</code>
-	 * or <code>DELETE_DOCUMENT</code> depending on whether the
-	 * model document should be kept or deleted.
-	 * @throws CoreException If the operation fails for any reason,
-	 * including but not limited to malformed location URIs in the
-	 * index or general input/output error conditions.
-	 * @see Registry
-	 * @see #KEEP_DOCUMENT
-	 * @see #DELETE_DOCUMENT
-	 */
-	public void removeRegistry ( String uri, boolean deleteDocument ) throws CoreException;
-
-	/**
-	 * Saves a <code>Taxonomy</code> model to an XML document
-	 * located relative to the index XML document as identified by
-	 * <code>getURL()</code>, and updates the index XML document
-	 * with references to the saved taxonomy document.
-	 * The relative pathname to the taxonomy XML document is
-	 * computed by the <code>IRegistryManager</code> and cannot
-	 * be influenced by the caller.
-	 * 
-	 * @param taxonomy The <code>Taxonomy</code> model to save.
-	 * @return A <code>Taxonomy</code> reference.
-	 * @throws CoreException If the operation fails for any reason,
-	 * including but not limited to malformed location URIs in the
-	 * index or general input/output error conditions.
-	 * @see Taxonomy
-	 */
-	public Taxonomy saveTaxonomy ( Taxonomy taxonomy ) throws CoreException;
-
-	/**
-	 * Loads as necessary and returns a full <code>Taxonomy</code>
-	 * model as identified by the given URI and referenced from
-	 * the index XML document located at <code>getURL()</code>.
-	 * 
-	 * @param uri The URI identifier of the taxonomy.
-	 * @return The <code>Taxonomy</code> model
-	 * or null if no such model can be found.
-	 * @throws CoreException If the operation fails for any reason,
-	 * including but not limited to malformed location URIs in the
-	 * index or general input/output error conditions.
-	 * @see Taxonomy
-	 */
-	public Taxonomy loadTaxonomy ( String uri ) throws CoreException;
-
-	/**
-	 * Loads as necessary and returns an array of full <code>Taxonomy</code>
-	 * models as identified by the given array of URIs and referenced from
-	 * the index XML document located at <code>getURL()</code>.
-	 * Useful in conjunction with <code>getTaxonomyURIs()</code>.
-	 * Note that the length of the returned array may be less than
-	 * the length of the array of URIs in cases where one or more
-	 * URIs fail to resolve to a loadable model. 
-	 * 
-	 * @param uris The URI identifiers of the taxonomies.
-	 * @return The array of <code>Taxonomy</code> models,
-	 * never null, but possibly empty.
-	 * @throws CoreException If the operation fails for any reason,
-	 * including but not limited to malformed location URIs in the
-	 * index or general input/output error conditions.
-	 * @see Registry
-	 */
-	public Taxonomy[] loadTaxonomies ( String[] uris ) throws CoreException;
-
-	/**
-	 * Returns an array of URI identifiers to <code>Taxonomy</code>
-	 * models in the index managed by this <code>IRegistryManager</code>.
-	 * 
-	 * @return An array of URI identifiers, possibly empty but never null,
-	 * to registered <code>Taxonomy</code> models.
-	 * @throws CoreException If the operation fails for any reason,
-	 * including but not limited to malformed location URIs in the
-	 * index or general input/output error conditions.
-	 * @see Taxonomy
-	 */
-	public String[] getTaxonomyURIs () throws CoreException;
-
-	/**
-	 * Removes the <code>Taxonomy</code> model identified by the
-	 * given <code>uri</code> from the index and either keeps or
-	 * deletes the corresponding <code>Taxonomy</code> document
-	 * based on the value given for <code>deleteDocument</code>.
-	 * 
-	 * @param uri The URI identifier of the model to delete.
-	 * @param deleteDocument Either <code>KEEP_DOCUMENT</code>
-	 * or <code>DELETE_DOCUMENT</code> depending on whether the
-	 * model document should be kept or deleted.
-	 * @throws CoreException If the operation fails for any reason,
-	 * including but not limited to malformed location URIs in the
-	 * index or general input/output error conditions.
-	 * @see Taxonomy
-	 * @see #KEEP_DOCUMENT
-	 * @see #DELETE_DOCUMENT
-	 */
-	public void removeTaxonomy ( String uri, boolean deleteDocument ) throws CoreException;
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/registry/ITaxonomyFinder.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/registry/ITaxonomyFinder.java
deleted file mode 100644
index e78fcc034..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/registry/ITaxonomyFinder.java
+++ /dev/null
@@ -1,35 +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.registry;
-
-import org.eclipse.wst.ws.internal.model.v10.registry.Registry;
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy;
-
-/**
- * An <code>ITaxonomyFinder</code> computes the set of
- * <code>Taxonomy</code> models referenced or used by a
- * <code>Registry</code>.
- * @author gilberta@ca.ibm.com
- * @see IRegistryManager
- */
-public interface ITaxonomyFinder
-{
-	/**
-	 * Returns an array taxonomies used by the given
-	 * <code>registry</code>. This method never returns null.
-	 *
-	 * @param registry The <code>Registry</code> for which
-	 * a set of taxonomies might be found.
-	 * @return The array of taxonomies, possibly empty.
-	 */
-	public Taxonomy[] taxonomies ( Registry registry );	
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/registry/RegistryManager.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/registry/RegistryManager.java
deleted file mode 100644
index aac978d18..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/registry/RegistryManager.java
+++ /dev/null
@@ -1,519 +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.registry;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.wst.ws.internal.model.v10.registry.Registry;
-import org.eclipse.wst.ws.internal.model.v10.rtindex.Index;
-import org.eclipse.wst.ws.internal.model.v10.rtindex.RTIndexFactory;
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy;
-import org.eclipse.wst.ws.internal.plugin.WSPlugin;
-
-/**
- * A typical implementation of <code>IRegistryManager</code>.
- * @author cbrealey
- * @see IRegistryManager
- */
-public class RegistryManager implements IRegistryManager
-{
-	private static String REGISTRY = "Registry";
-	private static String TAXONOMY = "Taxonomy";
-	private static String XML = "xml";
-	private Hashtable taxonomyFinders_;
-	private Index index_;
-	private GenericResourceFactory resourceFactory_ = new GenericResourceFactory();
-	private URL registryURL_= null;
-	private String registryPathname_ = null;
-
-	/**
-	 * Constructs a new RegistryManager for the index XML file
-	 * at the given <code>url</code>.
-	 * @param url The URL to the index XML file.
-	 */
-	RegistryManager ( URL url )
-	{
-		registryURL_ = url;
-		taxonomyFinders_ = new Hashtable();
-	}
-
-	/**
-	 * Constructs a new RegistryManager for the index XML file
-	 * at the given <code>pathname</code>.
-	 * @param pathname The pathname to the index XML file.
-	 */
-	RegistryManager ( String pathname )
-	{
-		registryPathname_ = pathname;
-		taxonomyFinders_ = new Hashtable();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.ws.internal.registry.IRegistryManager#getURL()
-	 */
-	public URL getURL () throws MalformedURLException
-	{
-		if (registryURL_ == null)
-		{
-			registryURL_ = new File(registryPathname_).toURI().toURL();
-		}
-		return registryURL_;
-	}
-
-	/**
-	 * Returns an absolute URL computed from the absolute URL of the
-	 * index XML document managed by this <code>RegistryManager</code>
-	 * and the given <code>id</code>. This method is used to determine
-	 * a reasonable location URL for registry and taxonomy documents
-	 * when references to them are first to be added to the index XML
-	 * document. This method is idempotent insofar as it will always
-	 * compute the same URL for a given <code>RegistryManager</code>
-	 * and a given <code>id</code>.
-	 * 
-	 * @param id The id of the referenced registry or taxonomy document. 
-	 * @return The absolute URL to the referenced document.
-	 * @throws MalformedURLException If a viable absolute URL cannot
-	 * be computed.
-	 */
-	private URL getURL ( String id ) throws MalformedURLException
-	{
-		String baseUrl = ""; 
-		URL indexUrl = getURL();
-		String indexString = indexUrl.toString();
-		int index = indexString.lastIndexOf("/"); 
-		baseUrl = indexString.substring(0,index + 1);
-		String urlString = baseUrl + id + "." + XML;
-		return new URL(urlString);
-	}
-
-	/**
-	 * Caches and returns the index model. On first call,
-	 * if an index document exists, the index is loaded
-	 * from it, otherwise, a new index is returned.
-	 * @return The index.
-	 * @throws CoreException If the index cannot be loaded for any reason.
-	 */
-	private Index getIndex () throws CoreException
-	{
-		if (index_ == null)
-		{
-			try
-			{
-				URL indexURL = getURL();
-				if (RegistryService.exists(indexURL))
-				{
-					Resource resource = resourceFactory_.createResource(URI.createURI("*.xml"));
-					resource.load(RegistryService.getInputStreamFor(indexURL),null);
-					org.eclipse.wst.ws.internal.model.v10.rtindex.DocumentRoot document = (org.eclipse.wst.ws.internal.model.v10.rtindex.DocumentRoot)resource.getContents().get(0);
-					index_ = document.getIndex();
-				}
-				else
-				{
-					index_ = RTIndexFactory.eINSTANCE.createIndex();
-				}
-			}
-			catch (IOException e)
-			{
-				//TODO: Need a message for this Status.
-				throw new CoreException(new Status(IStatus.ERROR,WSPlugin.ID,0,"",e));
-			}
-		}
-		return index_;
-	}
-
-	/**
-	 * Saves the index model to an XML document.	
-	 * @throws CoreException If the save fails for any reason.
-	 */
-	private void saveIndex () throws CoreException
-	{
-		org.eclipse.wst.ws.internal.model.v10.rtindex.DocumentRoot document = RTIndexFactory.eINSTANCE.createDocumentRoot();
-		document.setIndex(getIndex());
-		Resource resource = resourceFactory_.createResource(URI.createURI("*.xml"));
-		resource.getContents().add(document);
-		try
-		{
-			resource.save(RegistryService.getOutputStreamFor(getURL()),null);
-		}
-		catch (IOException e)
-		{
-			//TODO: Need a message for this Status.
-			throw new CoreException(new Status(IStatus.ERROR,WSPlugin.ID,0,"",e));
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.ws.internal.registry.IRegistryManager#addTaxonomyFinder(java.lang.String, org.eclipse.wst.ws.internal.registry.ITaxonomyFinder)
-	 */
-	public void addTaxonomyFinder(String className, ITaxonomyFinder taxonomyFinder)
-	{
-		taxonomyFinders_.put(className,taxonomyFinder);
-	}
-	
-	/**
-	 * Adds the given <code>registry</code> as-is, whether full model
-	 * or reference, to the index only if a registry with the same ID
-	 * or reference is not already stored there.
-	 * @param registry The registry to add.
-	 */
-	private void addRegistryToIndex(Registry registry) throws CoreException
-	{
-		String id = registry.getId();
-		if (id == null) id = registry.getRef();
-		if (id != null && getRegistry(id) == null)
-		{
-			getIndex().getRegistry().add(registry);
-		}
-	}
-	
-	/**
-	 * Adds the given <code>taxonomy</code> as-is, whether full model
-	 * or reference, to the index only if a taxonomy with the same ID
-	 * or reference is not already stored there.
-	 * @param taxonomy The taxonomy to add.
-	 */
-	private void addTaxonomyToIndex(Taxonomy taxonomy) throws CoreException
-	{
-		String id = taxonomy.getId();
-		if (id == null) id = taxonomy.getRef();
-		if (id != null && getTaxonomy(id) == null)
-		{
-		 	getIndex().getTaxonomy().add(taxonomy);	
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.ws.internal.registry.IRegistryManager#saveRegistry(org.eclipse.wst.ws.internal.model.v10.registry.Registry)
-	 */
-	public Registry saveRegistry ( Registry registry ) throws CoreException
-	{
-		RegistryService registryService = RegistryService.instance();
-		Registry registryRef = null;
-		try
-		{
-			URL url = getURL(REGISTRY + registry.getId());
-			registryService.saveRegistry(url,registry);
-			registryRef = registryService.newRegistryReference(registry);
-			registryRef.setLocation(url.toString());
-			addRegistryToIndex(registryRef);
-			saveIndex();
-			/*
-			 * TODO: The following pile of code is commented out
-			 * since there isn't a reliable way under the current
-			 * design to save taxonomy models held in a registry model
-			 * 
-			ITaxonomyFinder finder = (ITaxonomyFinder)taxonomyFinders_.get(registry.getClass().getName());
-			if (finder != null)
-			{
-				Taxonomy[] taxonomies = finder.taxonomies(registry);
-				for (int i=0; i<taxonomies.length; i++)
-				{
-					String id = taxonomies[i].getId();
-					String ref = taxonomies[i].getRef();
-					if (id != null)
-					{
-						URL taxonomyURL = getURL(TAXONOMY + id);
-						registryService.saveTaxonomy(taxonomyURL,taxonomies[i]);
-						Taxonomy taxonomyRef = registryService.newTaxonomyReference(taxonomies[i]);
-						taxonomyRef.setLocation(taxonomyURL.toString());
-						addTaxonomyToIndex(taxonomyRef);
-					}
-					else if (ref != null)
-					{
-						if (taxonomies[i].getLocation() == null)
-						{
-							String location = null;
-							Taxonomy taxonomy = getTaxonomy(ref);
-							if (taxonomy != null) location = taxonomy.getLocation();
-							if (location == null) location = getURL(TAXONOMY + ref).toString();
-							taxonomies[i].setLocation(location);
-							if (taxonomy == null)
-							{
-								addTaxonomyToIndex(registryService.newTaxonomyReference(taxonomies[i]));
-							}
-						}
-					}
-				}
-			}
-		    */
-		}
-		catch ( MalformedURLException me )
-		{
-			//TODO: Message text required.
-			throw new CoreException(new Status(IStatus.ERROR,WSPlugin.ID,0,"",me));
-		}
-		return registryService.newRegistryReference(registryRef);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.ws.internal.registry.IRegistryManager#loadRegistry(java.lang.String)
-	 */
-	public Registry loadRegistry ( String uri ) throws CoreException
-	{
-		RegistryService registryService = RegistryService.instance();
-		try
-		{
-			Registry registry = getRegistry(uri);
-			if (registry == null) return null;
-
-			// If the Registry has an ID, it's a full model
-			// inlined within the Index and is returned as-is.
-			if (registry.getId() != null) return registry;
-
-			// Otherwise it's a reference to a full model
-			// which we load from the reference's location.
-			String urlString = registry.getLocation();
-			if (urlString == null) return null;
-			URL url = new URL(urlString);
-			return registryService.loadRegistry(url);
-		}
-		catch ( MalformedURLException me )
-		{
-			//TODO: Message text required.
-			throw new CoreException(new Status(IStatus.ERROR,WSPlugin.ID,0,"",me));
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.ws.internal.registry.IRegistryManager#loadRegistries(java.lang.String[])
-	 */
-	public Registry[] loadRegistries ( String[] uris ) throws CoreException
-	{
-		List list = new ArrayList(uris.length);
-		for (int i=0; i<uris.length; i++)
-		{
-			Registry registry = loadRegistry(uris[i]);
-			if (registry != null)
-			{
-				list.add(registry);
-			}
-		}
-		return (Registry[])list.toArray(new Registry[0]);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.ws.internal.registry.IRegistryManager#getRegistryURIs()
-	 */
-	public String[] getRegistryURIs () throws CoreException
-	{
-		EList list = getIndex().getRegistry();
-		List registryURIs = new ArrayList(list.size());
-		Iterator iterator = list.iterator();
-		while(iterator.hasNext())
-		{
-			// Each Registry found in the index may be
-			// either a full model or a reference to one.
-			Registry registry = (Registry)iterator.next();
-			if (registry.getId() != null)
-			{
-				registryURIs.add(registry.getId());
-			}
-			else if (registry.getRef() != null)
-			{
-				registryURIs.add(registry.getRef());
-			}
-		}	
-		return (String[])registryURIs.toArray(new String[0]);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.ws.internal.registry.IRegistryManager#removeRegistry(java.lang.String, boolean)
-	 */
-	public void removeRegistry ( String uri, boolean deleteDocument ) throws CoreException
-	{
-		EList list = getIndex().getRegistry();
-		Registry registry = getRegistry(uri);
-		if (registry != null)
-		{
-			list.remove(registry);
-			saveIndex();
-			// The identified Registry may be either a full model
-			// (ie. inlined in the Index) or a reference to one.
-			// Only in the latter case is there a file to delete.
-			if (deleteDocument && registry.getLocation() != null)
-			{
-				//TODO: Implement me.
-			}
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.ws.internal.registry.IRegistryManager#saveTaxonomy(org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy)
-	 */
-	public Taxonomy saveTaxonomy ( Taxonomy taxonomy ) throws CoreException
-	{
-		RegistryService registryService = RegistryService.instance();
-		Taxonomy taxonomyRef = null;
-		try
-		{
-			URL	url = getURL(TAXONOMY + taxonomy.getId());
-		    registryService.saveTaxonomy(url,taxonomy);
-			taxonomyRef = registryService.newTaxonomyReference(taxonomy);
-			taxonomyRef.setLocation(url.toString());
-			addTaxonomyToIndex(taxonomyRef);
-			saveIndex();
-		}
-		catch ( MalformedURLException me )
-		{
-			//TODO: Message text required.
-			throw new CoreException(new Status(IStatus.ERROR,WSPlugin.ID,0,"",me));
-		}
-		return registryService.newTaxonomyReference(taxonomyRef);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.ws.internal.registry.IRegistryManager#loadTaxonomy(java.lang.String)
-	 */
-	public Taxonomy loadTaxonomy ( String uri ) throws CoreException
-	{
-		RegistryService registryService = RegistryService.instance();
-		try
-		{
-			Taxonomy taxonomy = getTaxonomy(uri);
-			if (taxonomy == null) return null;
-
-			// If the Taxonomy has an ID, it's a full model
-			// inlined within the Index and is returned as-is.
-			if (taxonomy.getId() != null) return taxonomy;
-
-			// Otherwise it's a reference to a full model
-			// which we load from the reference's location.
-			String urlString = taxonomy.getLocation();
-			if (urlString == null) return null;
-			URL url = new URL(urlString);
-			return registryService.loadTaxonomy(url);
-		}
-		catch ( MalformedURLException me )
-		{
-			//TODO: Message text required.
-			throw new CoreException(new Status(IStatus.ERROR,WSPlugin.ID,0,"",me));
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.ws.internal.registry.IRegistryManager#loadTaxonomies(java.lang.String[])
-	 */
-	public Taxonomy[] loadTaxonomies ( String[] uris ) throws CoreException
-	{
-		List list = new ArrayList(uris.length);
-		for (int i=0; i<uris.length; i++)
-		{
-			Taxonomy taxonomy = loadTaxonomy(uris[i]);
-			if (taxonomy != null)
-			{
-				list.add(taxonomy);
-			}
-		}
-		return (Taxonomy[])list.toArray(new Taxonomy[0]);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.ws.internal.registry.IRegistryManager#getTaxonomyURIs()
-	 */
-	public String[] getTaxonomyURIs () throws CoreException
-	{
-		EList list = getIndex().getTaxonomy();
-		List taxonomyURIs = new ArrayList(list.size());
-		Iterator iterator = list.iterator();
-		while(iterator.hasNext())
-		{
-			// Each Taxonomy found in the index may be
-			// either a full model or a reference to one.
-			Taxonomy taxonomy = (Taxonomy)iterator.next();
-			if (taxonomy.getId() != null)
-			{
-				taxonomyURIs.add(taxonomy.getId());
-			}
-			else if (taxonomy.getRef() != null)
-			{
-				taxonomyURIs.add(taxonomy.getRef());
-			}
-		}	
-		return (String[])taxonomyURIs.toArray(new String[0]);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.ws.internal.registry.IRegistryManager#removeTaxonomy(java.lang.String, boolean)
-	 */
-	public void removeTaxonomy ( String uri, boolean deleteDocument ) throws CoreException
-	{
-		EList list = getIndex().getTaxonomy();
-		Taxonomy taxonomy = getTaxonomy(uri);
-		if (taxonomy != null)
-		{
-			list.remove(taxonomy);
-			saveIndex();
-			// The identified Taxonomy may be either a full model
-			// (ie. inlined in the Index) or a reference to one.
-			// Only in the latter case is there a file to delete.
-			if (deleteDocument && taxonomy.getLocation() != null)
-			{
-				//TODO: Implement me.
-			}
-		}
-	}
-
-	/**
-	 * Returns the Registry from the index whose ID or Reference
-	 * matches the given URI. As such, this method may return a
-	 * full model or a reference to a full model.
-	 * @param uri The URI identifier of the Registry
-	 * @return The <code>Registry</code> object whose ID or reference
-	 * matches the given <code>uri</code>, or null if none match.
-	 */
-    private Registry getRegistry ( String uri ) throws CoreException
-    {
-		EList list = getIndex().getRegistry();	
-		Iterator it = list.iterator();
-		while (it.hasNext()){
-			Registry registry = (Registry)it.next();
-			if (uri.equals(registry.getId()) || uri.equals(registry.getRef())){
-				return registry;  
-			}
-		}	
-        return null;
-    }
-	
-	/**
-	 * Returns the Taxonomy from the index whose ID or Reference
-	 * matches the given URI. As such, this method may return a
-	 * full model or a reference to a full model.
-	 * @param uri The URI identifier of the Taxonomy
-	 * @return The <code>Taxonomy</code> object whose ID or reference
-	 * matches the given <code>uri</code>, or null if none match.
-	 */
-    private Taxonomy getTaxonomy ( String uri ) throws CoreException
-    {
-		EList list = getIndex().getTaxonomy();	
-		Iterator it = list.iterator();
-		while (it.hasNext()){
-			Taxonomy taxonomy = (Taxonomy)it.next();
-			if (uri.equals(taxonomy.getId()) || uri.equals(taxonomy.getRef())){
-				return taxonomy;
-			}
-		}	
-        return null;
-	}
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/registry/RegistryService.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/registry/RegistryService.java
deleted file mode 100644
index 8e8c818c5..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/registry/RegistryService.java
+++ /dev/null
@@ -1,467 +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.registry;
-
-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.URLConnection;
-import java.util.Hashtable;
-
-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.Status;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.wst.ws.internal.model.v10.registry.Registry;
-import org.eclipse.wst.ws.internal.model.v10.registry.RegistryFactory;
-import org.eclipse.wst.ws.internal.model.v10.registry.RegistryPackage;
-import org.eclipse.wst.ws.internal.model.v10.rtindex.RTIndexPackage;
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy;
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.TaxonomyFactory;
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.TaxonomyPackage;
-import org.eclipse.wst.ws.internal.plugin.WSPlugin;
-
-/**
- * RegistryService is the starting class of the Web service registry
- * programming model. Call the <code>RegistryService.instance()</code>
- * static method to get the singleton instance of this class.
- * <p>
- * RegistryService provides factory methods for getting new
- * instances of <code>IRegistryManager</code> objects which,
- * in turn, provide the means for registering and unregistering
- * groups of <code>Registry</code> and <code>Taxonomy</code> models
- * at URL addressable locations in the filesystem or elsewhere.
- * <p>
- * RegistryService provides utility methods to ease the creation,
- * loading and saving raw instances of the <code>Registry</code>
- * and <code>Taxonomy</code> models, and to simplify the process of
- * composing and finding <code>Taxonomy</code> models in
- * <code>Registry</code> models.
- * <p>
- * A typical use of <code>RegistryService</code> and its related
- * classes to create and save a new family of models is:
- * <blockquote>
- * <code>
- * RegistryService registryService = RegistryService.instance();
- * MyRegistry registry = MyRegistryFactory.eINSTANCE.createMyRegistry();
- * // build up your registry model here
- * Taxonomy taxonomy = registryService.newTaxonomy();
- * // build up your taxonomy model here
- * registryService.addTaxonomy(registry,taxonomy);
- * IRegistryManager registryManager = registryService.getDefaultRegistryManager();
- * registryManager.saveRegistry(registry);
- * </code>
- * </blockquote>
- * @see #instance()
- * @see IRegistryManager
- * @see Registry
- * @see Taxonomy
- * @author cbrealey
- */
-public class RegistryService
-{
-	private static RegistryService instance_;
-	private static final String DEFAULT_INDEX_XML_FILE = "DefaultIndex.xml";
-	private Hashtable registryManagers_ = new Hashtable();
-	private IRegistryManager defaultRegistryManager_ = null;
-	private GenericResourceFactory resourceFactory_ = new GenericResourceFactory();
-
-	/**
-	 * A RegistryService cannot be directly constructed.
-	 * Use @link #instance() to get the singleton of this class.
-	 */
-	private RegistryService ()
-	{
-		Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("xml",resourceFactory_);
-		RegistryPackage.eINSTANCE.getClass();
-		TaxonomyPackage.eINSTANCE.getClass();
-		RTIndexPackage.eINSTANCE.getClass();
-	}
-
-	/**
-	 * Returns the singleton of this class.
-	 * @return The singleton of this class.
-	 */
-	public static RegistryService instance ()
-	{
-		if (instance_ == null)
-		{
-			instance_ = new RegistryService();
-		}
-		return instance_;
-	}
-	
-	/**
-	 * Creates a default <code>IRegistryManager</code> for the system.
-	 * @return The default <code>IRegistryManager</code> for the system.
-	 * @see IRegistryManager
-	 */
-	public IRegistryManager getDefaultRegistryManager ()
-	{
-		if (defaultRegistryManager_ == null)
-		{
-			String indexFilename = WSPlugin.getDefault().getStateLocation().append(DEFAULT_INDEX_XML_FILE).toString();
-			defaultRegistryManager_ = new RegistryManager(indexFilename);
-		}
-		return defaultRegistryManager_;
-	}
-
-	/**
-	 * Creates a new or existing <code>IRegistryManager</code> for the given URL.
-	 * @param url A URL to the XML document that persists
-	 * the set of registries managed by this <code>IRegistryManager</code>.
-	 * @return The new or existing <code>RegistryManager</code> for the given URL.
-	 * @see IRegistryManager
-	 */
-	public IRegistryManager getRegistryManager ( URL url )
-	{
-		IRegistryManager registryManager = (IRegistryManager)registryManagers_.get(url);
-		if (registryManager == null)
-		{
-			registryManager = new RegistryManager(url);
-			registryManagers_.put(url,registryManager);
-		}
-		return registryManager;
-	}
-	
-	/**
-	 * Removes the <code>IRegistryManager</code> for the given URL.
-	 * No physical resources are deleted.
-	 * @param url A URL to the XML document that persists
-	 * the set of registries managed by this <code>IRegistryManager</code>.
-	 * @see IRegistryManager
-	 */
-	public void removeRegistryManager ( URL url )
-	{
-		registryManagers_.remove(url);
-	}
-
-	/**
-	 * Creates and returns a new <code>Registry</code> model.
-	 * As a general rule, this method has little actual value as
-	 * most concrete registry models will be of types that extend
-	 * the base Registry model, such as <code>UDDIRegistry</code>.
-	 * For example, <code>UDDIRegistryService.newUDDIRegistry()</code>
-	 * returns a new <code>UDDIRegistry</code>. Providers of other
-	 * concrete types of registries may provide similar facilities.
-	 * @return A new <code>Registry</code> model. Never returns null.
-	 * @see Registry
-	 * @see UDDIRegistryService#newUDDIRegistry()
-	 */
-	public Registry newRegistry ()
-	{
-		return RegistryFactory.eINSTANCE.createRegistry();
-	}
-	
-	/**
-	 * Loads the <code>Registry</code> model from an XML document.
-	 * If loading the model of a registry that extends the base
-	 * Registry interface and Schema, you must initialize the EMF
-	 * eCore package (eg. <code>MyRegistryPackage.eINSTANCE</code>
-	 * for your model before calling this load method.
-	 * For UDDI Registry models, this is done automatically by
-	 * calling <code>UDDIRegistryService.instance()</code>.
-	 * @param url The URL to the XML document to load.
-	 * @return The <code>Registry</code> model.
-	 * @throws <code>CoreException</code> If the model cannot be loaded.
-	 * @see Registry
-	 * @see UDDIRegistryService#instance()
-	 */
-	public Registry loadRegistry ( URL url ) throws CoreException
-	{
-		Resource resource = resourceFactory_.createResource(URI.createURI("*.xml"));
-		try
-		{
-			resource.load(getInputStreamFor(url),null);
-		}
-		catch (IOException e)
-		{
-			throw new CoreException(new Status(IStatus.ERROR,WSPlugin.ID,0,"",e));
-		}
-		org.eclipse.wst.ws.internal.model.v10.registry.DocumentRoot document = (org.eclipse.wst.ws.internal.model.v10.registry.DocumentRoot)resource.getContents().get(0);
-		return document.getRegistry();
-	}
-
-	/**
-	 * Saves the <code>Registry</code> model to an XML document.
-	 * @param url The URL to the XML document to save.
-	 * @param registry The <code>Registry</code> model to save.
-	 * @throws <code>CoreException</code> If the model cannot be saved.
-	 * @see Registry
-	 */
-	public void saveRegistry ( URL url, Registry registry ) throws CoreException
-	{
-		org.eclipse.wst.ws.internal.model.v10.registry.DocumentRoot document = RegistryFactory.eINSTANCE.createDocumentRoot();
-		document.setRegistry(registry);
-		Resource resource = resourceFactory_.createResource(URI.createURI("*.xml"));
-		resource.getContents().add(document);
-		try
-		{
-			resource.save(getOutputStreamFor(url),null);
-		}
-		catch (IOException e)
-		{
-			throw new CoreException(new Status(IStatus.ERROR,WSPlugin.ID,0,"",e));
-		}
-	}
-
-	/**
-	 * Creates and returns a new <code>Taxonomy</code> model.
-	 * @return A new <code>Taxonomy</code> model. Never returns null.
-	 * @see Taxonomy
-	 */
-	public Taxonomy newTaxonomy ()
-	{
-		return TaxonomyFactory.eINSTANCE.createTaxonomy();
-	}
-	
-	/**
-	 * Loads the <code>Taxonomy</code> model from an XML document.
-	 * @param url The URL to the XML document to load.
-	 * @return the <code>Taxonomy</code> model.
-	 * @throws <code>CoreException</code> If the model cannot be loaded.
-	 * @see Taxonomy
-	 */
-	public Taxonomy loadTaxonomy ( URL url ) throws CoreException
-	{
-		Resource resource = resourceFactory_.createResource(URI.createURI("*.xml"));
-		try
-		{
-			resource.load(getInputStreamFor(url),null);
-		}
-		catch (IOException e)
-		{
-			throw new CoreException(new Status(IStatus.ERROR,WSPlugin.ID,0,"",e));
-		}
-		org.eclipse.wst.ws.internal.model.v10.taxonomy.DocumentRoot document = (org.eclipse.wst.ws.internal.model.v10.taxonomy.DocumentRoot)resource.getContents().get(0);
-		return document.getTaxonomy();
-	}
-
-	/**
-	 * Saves the <code>Taxonomy</code> model to an XML document.
-	 * @param url The URL to the XML document to save.
-	 * @param taxonomy The <code>Taxonomy</code> model to save.
-	 * @throws <code>CoreException</code> If the model cannot be saved.
-	 * @see Taxonomy
-	 */
-	public void saveTaxonomy ( URL url, Taxonomy taxonomy ) throws CoreException
-	{
-		org.eclipse.wst.ws.internal.model.v10.taxonomy.DocumentRoot document = TaxonomyFactory.eINSTANCE.createDocumentRoot();
-		document.setTaxonomy(taxonomy);
-		Resource resource = resourceFactory_.createResource(URI.createURI("*.xml"));
-		resource.getContents().add(document);
-		try
-		{
-			resource.save(getOutputStreamFor(url),null);
-		}
-		catch (IOException e)
-		{
-			throw new CoreException(new Status(IStatus.ERROR,WSPlugin.ID,0,"",e));
-		}
-	}
-
-	/**
-	 * Constructs and returns a new Registry model configured
-	 * to reference the given <code>registry</code>.
-	 * <p>
-	 * The given <code>registry</code> can be either a full
-	 * model as signified by having a non-null, non-empty
-	 * identifier (<code>registry.getId()</code>), or a
-	 * reference itself as signified by having a non-null,
-	 * non-empty reference (<code>registry.getRef()</code>).
-	 * <p>
-	 * If the given <code>registry</code> is a full model,
-	 * then a new <code>Registry</code> is returned such that
-	 * <ul>
-	 * <li><code>getRef()</code> equals <code>registry.getId()</code></li>
-	 * <li><code>getLocation()</code> is null</li>
-	 * <li><code>getId()</code> is null</li>
-	 * </ul>
-	 * <p>
-	 * In the given <code>registry</code> is itself a reference,
-	 * then a new <code>Registry</code> is returned such that
-	 * <ul>
-	 * <li><code>getRef()</code> equals <code>registry.getRef()</code></li>
-	 * <li><code>getLocation()</code> equals <code>registry.getLocation()</code></li>
-	 * <li><code>getId()</code> is null</li>
-	 * </ul>
-	 * 
-	 * @param registry The <code>Registry</code> model to clone or
-	 * refer to depending on whether the given <code>registry</code>
-	 * is a full model or a reference.
-	 * @return A new <code>Registry</code>, guaranteed to be a reference.
-	 */
-	public Registry newRegistryReference ( Registry registry )
-	{
-		String id = registry.getId();
-		String ref = registry.getRef();
-		Registry registryRef = newRegistry();
-		if (ref == null || "".equals(ref))
-		{
-			registryRef.setRef(id);
-		}
-		else
-		{
-			registryRef.setRef(ref);
-			registryRef.setLocation(registry.getLocation());
-		}
-		return registryRef;
-	}
-
-	/**
-	 * Constructs and returns a new Taxonomy model configured
-	 * to reference the given <code>taxonomy</code>.
-	 * <p>
-	 * The given <code>taxonomy</code> can be either a full
-	 * model as signified by having a non-null, non-empty
-	 * identifier (<code>taxonomy.getId()</code>), or a
-	 * reference itself as signified by having a non-null,
-	 * non-empty reference (<code>taxonomy.getRef()</code>).
-	 * <p>
-	 * If the given <code>taxonomy</code> is a full model,
-	 * then a new <code>Taxonomy</code> is returned such that
-	 * <ul>
-	 * <li><code>getRef()</code> equals <code>taxonomy.getId()</code></li>
-	 * <li><code>getLocation()</code> is null</li>
-	 * <li><code>getId()</code> is null</li>
-	 * </ul>
-	 * <p>
-	 * In the given <code>taxonomy</code> is itself a reference,
-	 * then a new <code>Taxonomy</code> is returned such that
-	 * <ul>
-	 * <li><code>getRef()</code> equals <code>taxonomy.getRef()</code></li>
-	 * <li><code>getLocation()</code> equals <code>taxonomy.getLocation()</code></li>
-	 * <li><code>getId()</code> is null</li>
-	 * </ul>
-	 * 
-	 * @param taxonomy The <code>Taxonomy</code> model to clone or
-	 * refer to depending on whether the given <code>taxonomy</code>
-	 * is a full model or a reference.
-	 * @return A new <code>Taxonomy</code>, guaranteed to be a reference.
-	 */
-	public Taxonomy newTaxonomyReference ( Taxonomy taxonomy )
-	{
-		String id = taxonomy.getId();
-		String ref = taxonomy.getRef();
-		Taxonomy taxonomyRef = newTaxonomy();
-		if (ref == null || "".equals(ref))
-		{
-			taxonomyRef.setRef(id);
-		}
-		else
-		{
-			taxonomyRef.setRef(ref);
-			taxonomyRef.setLocation(taxonomy.getLocation());
-		}
-		return taxonomyRef;
-	}
-
-	/**
-	 * Returns true if and only if the given URL identifies
-	 * a resource that exists and is a file.
-	 * @param url The URL of the resource to check for existence.
-	 * @return True if the URL resource exists and is a file,
-	 * or false otherwise.
-	 */
-	static boolean exists ( URL url )
-	{
-		if ("platform".equals(url.getProtocol()))
-		{
-			String urlFile = url.getFile().trim();
-			IPath path = new Path(urlFile).removeFirstSegments(1);
-			if (path.segmentCount() <= 1)
-			{
-				return false;
-			}
-			IPath osPath = ResourcesPlugin.getWorkspace().getRoot().getFile(path).getLocation();
-			if (osPath == null)
-			{
-				return false;
-			}
-			File file = new File(osPath.toString());
-			return (file.exists() && !file.isDirectory());
-		}
-		else if ("file".equals(url.getProtocol()))
-		{
-			File file = new File(url.getFile().trim());
-			return (file.exists() && !file.isDirectory());
-		}
-		return false;
-	}
-
-	/**
-	 * Opens an <code>OutputStream</code> for writing to
-	 * the given <code>url</code>.
-	 * @param url The URL of the resource to write.
-	 * @return An OuptutStream to write to.
-	 * @throws IOException If the stream could not be opened.
-	 */
-	static OutputStream getOutputStreamFor ( URL url ) throws IOException
-	{
-		OutputStream outputStream = null;
-		if ("platform".equals(url.getProtocol()))
-		{
-			String urlFile = url.getFile().trim();
-			IPath path = new Path(urlFile).removeFirstSegments(1);
-			if (path.segmentCount() <= 1)
-			{
-				throw new IOException("The Platform URL {0} is not bound to a local, writable file.");
-			}
-			IPath osPath = ResourcesPlugin.getWorkspace().getRoot().getFile(path).getLocation();
-			if (osPath == null)
-			{
-				throw new IOException("The Platform URL {0} is not bound to a local, writable file.");
-			}
-			File file = new File(osPath.toString());
-			if (file.isDirectory())
-			{
-				throw new IOException("The Platform URL {0} is bound to a folder.");
-			}
-			outputStream = new FileOutputStream(file);
-		}
-		else if ("file".equals(url.getProtocol()))
-		{
-			File file = new File(url.getFile().trim());
-			if (file.isDirectory())
-			{
-				throw new IOException("The File URL {0} is bound to a directory.");
-			}
-			outputStream = new FileOutputStream(file);
-		}
-		else
-		{
-			URLConnection connection = url.openConnection();
-			connection.setDoOutput(true);
-			outputStream = connection.getOutputStream();
-		}
-		return outputStream;
-	}
-
-	/**
-	 * Opens an <code>InputStream</code> for reading from
-	 * the given <code>url</code>.
-	 * @param url The URL of the resource to read.
-	 * @return An InputStream to read from.
-	 * @throws IOException If the stream could not be opened.
-	 */
-	static InputStream getInputStreamFor ( URL url ) throws IOException
-	{
-		return url.openStream();
-	}
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/registry/UDDIRegistryService.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/registry/UDDIRegistryService.java
deleted file mode 100644
index eb3ca1cce..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/registry/UDDIRegistryService.java
+++ /dev/null
@@ -1,230 +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.registry;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy;
-import org.eclipse.wst.ws.internal.model.v10.uddiregistry.Taxonomies;
-import org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistry;
-import org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistryFactory;
-import org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistryPackage;
-import org.eclipse.wst.ws.internal.plugin.WSPlugin;
-
-/**
- * UDDIRegistryService is an adjunct to <code>RegistryService</code>.
- * Call the <code>RegistryService.instance()</code> static method to
- * get the singleton instance of this class.
- * <p>
- * UDDIRegistryService provides utility methods to ease the creation
- * of new <code>UDDIRegistry</code> models and the management of their
- * relationships to <code>Taxonomy</code> models.
- * <p>
- * Utility methods for loading and saving <code>Registry</code> and
- * <code>Taxonomy</code> models are on <code>RegistryService</code>.
- * Methods for managing an indexed family of <code>Registry</code> and
- * <code>Taxonomy</code> models are on <code>IRegistryManager</code>.
- * <p>
- * A typical use of <code>UDDIRegistryService</code> and its related
- * classes to create and save a new family of models is:
- * <blockquote>
- * <code>
- * RegistryService registryService = RegistryService.instance();
- * UDDIRegistryService uddiRegistryService = UDDIRegistryService.instance();
- * UDDIRegistry uddiRegistry = uddiRegistryService.newUDDIRegistry();
- * // build up your registry model here
- * Taxonomy taxonomy = registryService.newTaxonomy();
- * // build up your taxonomy model here
- * uddiRegistryService.addTaxonomy(uddiRegistry,taxonomy);
- * IRegistryManager registryManager = registryService.getDefaultRegistryManager();
- * registryManager.saveRegistry(uddiRegistry);
- * </code>
- * </blockquote>
- * @see #instance()
- * @see RegistryService
- * @see IRegistryManager
- * @see UDDIRegistry
- * @see Taxonomy
- * @author cbrealey
- */
-public class UDDIRegistryService
-{
-	private static UDDIRegistryService instance_;
-
-	/**
-	 * A UDDIRegistryService cannot be directly constructed.
-	 * Use @link #instance() to get the singleton of this class.
-	 */
-	private UDDIRegistryService ()
-	{
-		UDDIRegistryPackage.eINSTANCE.getClass();
-	}
-
-	/**
-	 * Returns the singleton of this class.
-	 * @return The singleton of this class.
-	 */
-	public static UDDIRegistryService instance ()
-	{
-		if (instance_ == null)
-		{
-			instance_ = new UDDIRegistryService();
-		}
-		return instance_;
-	}
-	
-	/**
-	 * Adds a reference from the given <code>UDDIRegistry</code>
-	 * to the given <code>Taxonomy</code> object.
-	 * @param uddiRegistry The <code>UDDIRegistry</code> to which the reference
-	 * to the given <code>Taxonomy</code> object should be added.
-	 * @param taxonomy The <code>Taxonomy</code> object to add.
-	 * @see org.eclipse.wst.ws.internal.movel.v10.uddiregistry.UDDIRegistry
-	 * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy
-	 */
-	public void addTaxonomy ( UDDIRegistry uddiRegistry, Taxonomy taxonomy )
-	{
-		addTaxonomies(uddiRegistry,new Taxonomy[] {taxonomy});
-	}
-
-	/**
-	 * Adds the given <code>Taxonomy</code> objects as-is
-	 * (whether they are references or full models)
-	 * to the given <code>UDDIRegistry</code>.
-	 * @param uddiRegistry The <code>UDDIRegistry</code> to which
-	 * the given <code>Taxonomy</code> objects should be added.
-	 * @param taxonomies The array of <code>Taxonomy</code> objects to add.
-	 * @see org.eclipse.wst.ws.internal.movel.v10.uddiregistry.UDDIRegistry
-	 * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy
-	 */
-	public void addTaxonomies ( UDDIRegistry uddiRegistry, Taxonomy[] taxonomies )
-	{
-		if (taxonomies.length > 0)
-		{
-			Taxonomies taxonomySet = uddiRegistry.getTaxonomies();
-			if (taxonomySet == null)
-			{
-				taxonomySet = UDDIRegistryFactory.eINSTANCE.createTaxonomies();
-				uddiRegistry.setTaxonomies(taxonomySet);
-			}
-			EList list = taxonomySet.getTaxonomy();
-			for (int i=0; i<taxonomies.length; i++)
-			{
-				list.add(taxonomies[i]);
-			}
-		}
-	}
-	
-	/**
-	 * Returns an array of URI identifiers to <code>Taxonomy</code>
-	 * models contained in or referenced by the <code>uddiRegistry</code>.
-	 * Passing the result to <code>IRegistryManager.loadTaxonomies()</code>
-	 * is a handy way to resolve and load the full taxonomy models used
-	 * by the UDDI registry.
-	 * 
-	 * @return An array of URI identifiers, possibly empty but never null,
-	 * to <code>Taxonomy</code> models.
-	 * @see Taxonomy
-	 * @see IRegistryManager#loadTaxonomies(String[])
-	 */
-	public String[] getTaxonomyURIs ( UDDIRegistry uddiRegistry )
-	{
-		Taxonomies taxonomies = uddiRegistry.getTaxonomies();
-		if (taxonomies == null) return new String[0];
-		EList taxonomyList = taxonomies.getTaxonomy();
-		List taxonomyURIs = new ArrayList(taxonomyList.size());
-		Iterator i = taxonomyList.iterator();
-		while (i.hasNext())
-		{
-			Taxonomy taxonomy = (Taxonomy)i.next();
-			if (taxonomy.getId() != null)
-			{
-				taxonomyURIs.add(taxonomy.getId());
-			}
-			else if (taxonomy.getRef() != null)
-			{
-				taxonomyURIs.add(taxonomy.getRef());
-			}
-		}
-		return (String[])taxonomyURIs.toArray(new String[0]);
-	}
-
-	/**
-	 * Returns an array of full <code>Taxonomy</code> models
-	 * contained in or referenced by the given <code>uddiRegistry</code>.
-	 * Inline taxonomies are returned as-is. References to taxonomies are
-	 * resolved by following the locations of the references and loading
-	 * the models at the location URLs.
-	 * This method never returns null, but may return an empty array.
-	 * @param registry The <code>UDDIRegistry</code> whose
-	 * <code>Taxonomy</code> models to find.
-	 * @return The array, never null but possibly length zero,
-	 * of <code>Taxonomy</code> models.
-	 * @see org.eclipse.wst.ws.internal.movel.v10.uddiregistry.UDDIRegistry
-	 * @see org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy
-	 * @see #getTaxonomyURIs(UDDIRegistry)
-	 * @see IRegistryManager#loadTaxonomies(String[])
-	 * @deprecated This method suffers from a lack of awareness of the
-	 * Index XML document that is often responsible for mapping URIs
-	 * to location URLs. Use
-	 * <code>IRegistryManager.loadTaxonomies(getTaxonomyURIs(uddiRegistry))</code>
-	 * instead.
-	 */
-	public Taxonomy[] getTaxonomies ( UDDIRegistry uddiRegistry ) throws CoreException
-	{
-		RegistryService registryService = RegistryService.instance();
-		Taxonomies taxonomies = uddiRegistry.getTaxonomies();
-		if (taxonomies == null) return new Taxonomy[0];
-		EList literalTaxonomyList = taxonomies.getTaxonomy();
-		List resolvedTaxonomyList = new ArrayList(literalTaxonomyList.size());
-		Iterator i = literalTaxonomyList.iterator();
-		while (i.hasNext())
-		{
-			Taxonomy literalTaxonomy = (Taxonomy)i.next();
-			if (literalTaxonomy.getId() != null)
-			{
-				resolvedTaxonomyList.add(literalTaxonomy);
-			}
-			else if (literalTaxonomy.getLocation() != null)
-			{
-				try
-				{
-					Taxonomy resolvedTaxonomy = registryService.loadTaxonomy(new URL(literalTaxonomy.getLocation()));
-					resolvedTaxonomyList.add(resolvedTaxonomy);
-				}
-				catch (MalformedURLException e)
-				{
-					//TODO: Need message text here
-					throw new CoreException(new Status(IStatus.ERROR, WSPlugin.ID, 0, "", e));
-				}
-			}
-		}
-		return (Taxonomy[])resolvedTaxonomyList.toArray(new Taxonomy[0]);
-	}
-	
-	/**
-	 * Creates and returns a new <code>UDDIRegistry</code> model.
-	 * @return A new <code>UDDIRegistry</code> model, never null.
-	 */
-	public UDDIRegistry newUDDIRegistry ()
-	{
-		return UDDIRegistryFactory.eINSTANCE.createUDDIRegistry();
-	}
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/registry/UDDITaxonomyFinder.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/registry/UDDITaxonomyFinder.java
deleted file mode 100644
index fd4ce844a..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/registry/UDDITaxonomyFinder.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.ws.internal.registry;
-
-import org.eclipse.wst.ws.internal.model.v10.registry.Registry;
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy;
-import org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistry;
-
-/**
- * This <code>ITaxonomyFinder</code> for UDDI registries
- * returns an array of <code>Taxonomy</code>
- * models used (supported by) the registry.
- * @author gilberta@ca.ibm.com
- * @see UDDIRegistry
- */
-public class UDDITaxonomyFinder implements ITaxonomyFinder
-{
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.ws.internal.registry.ITaxonomyFinder#taxonomies(org.eclipse.wst.ws.internal.model.v10.registry.Registry)
-	 */
-	public Taxonomy[] taxonomies ( Registry registry )
-	{
-		if ( registry instanceof UDDIRegistry )
-		{
-			UDDIRegistry uddiRegistry = (UDDIRegistry)registry;	  
-			return (Taxonomy[])uddiRegistry.getTaxonomies().getTaxonomy().toArray(new Taxonomy[0]);
-		}
-		return null;
-	}
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/AbstractWebServiceLocator.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/AbstractWebServiceLocator.java
deleted file mode 100644
index 5c4c888f7..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/AbstractWebServiceLocator.java
+++ /dev/null
@@ -1,53 +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.wsfinder;
-
-import java.util.List;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-
-/**
- * @author joan
- * 
- * Implementation of IWebServiceLocator.  Extenders must implement the abstract method getWebServices().  
- * This class will be used to provide methods useful to locator implementers.  Extenders should register their
- * locator implementation with their plugin using the org.eclipse.wst.ws.locator extension point. 
- *
- */
-
-
-public abstract class AbstractWebServiceLocator implements IWebServiceLocator {
-
-	public AbstractWebServiceLocator()
-	{
-		super();
-	}
-
-	/**
-	 * Must return a list of WebServiceInfo objects.  Method will be called by WebServiceFinder.getWebServices()
-	 * 
-	 * @return list of WebServiceInfo objects
-	 */
-	public abstract List getWebServices();
-	
-	/**
-	 * 
-	 * @return array of all projects in the workspace resource tree
-	 */
-	public IProject[] getWorkspaceProjects()
-	{
-	  IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-      return root.getProjects();
-	}
-	
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/IWebServiceLocator.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/IWebServiceLocator.java
deleted file mode 100644
index 980eb58d3..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/IWebServiceLocator.java
+++ /dev/null
@@ -1,27 +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.wsfinder;
-
-import java.util.List;
-
-/**
- * @author joan
- *
- * Interface for web service locators that will be retrieved by the WebServiceFinder.  This interface must 
- * not be implemented directly.  Subclasses should extend the AbstractWebServiceLocator and implement the 
- * getWebServices() method.
- */
-
-public interface IWebServiceLocator {
-
-	public List getWebServices();
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/WebServiceFinder.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/WebServiceFinder.java
deleted file mode 100644
index 4f970c3fb..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/WebServiceFinder.java
+++ /dev/null
@@ -1,150 +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.wsfinder;
-
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-
-/**
- * @author joan
- *
- * WebServiceFinder is a singleton which finds all extenders and returns a comprehensive list of WebServiceInfo objects.
- * Finds web services by calling locators extending {@link org.eclipse.wst.ws.internal.wsfinder.AbstractWebServiceLocator} 
- * which have been registered with {@link org.eclipse.wst.ws.internal.wsfinder.WebServiceLocatorRegistry}.
- */
-
-public class WebServiceFinder {
-
-	private static WebServiceFinder instance = null;
-
-	private static final String ELEMENT_LOCATOR = "webServiceLocator"; //$NON-NLS-1$
-	private static final String ELEMENT_CATEGORY = "webServiceLocatorCategory"; //$NON-NLS-1$
-	private static final String ATTRIBUTE_ID = "id"; //$NON-NLS-1$
-	private static final String ATTRIBUTE_CLASS = "class"; //$NON-NLS-1$
-	private static final String ATTRIBUTE_CATEGORY = "category"; //$NON-NLS-1$
-//	private static final String ATTRIBUTE_LABEL = "label"; //$NON-NLS-1$
-//	private static final String ATTRIBUTE_DESCRIPTION = "description"; //$NON-NLS-1$
-//	private static final String ATTRIBUTE_ICON = "icon"; //$NON-NLS-1$
-
-	/*
-	 * Public construction is not allowed.
-	 * Use WebServiceFinder.instance().
-	 */
-	private WebServiceFinder()	
-	{
-		super();
-	}
-
-	/**
-	 * Returns the singleton of <code>WebServiceFinder</code>.
-	 * @return The singleton of <code>WebServiceFinder</code>.
-	 */
-	public static WebServiceFinder instance()
-	{
-		if (instance == null)
-		{
-			instance = new WebServiceFinder();
-		}
-		return instance;
-	}
-		
-	/**
-	 * Returns an iterator of WebServiceInfo objects which represent web services found by locators that
-	 * have registered using the org.eclipse.wst.ws.locator extension point.  Currently returns all web 
-	 * services found for all registered locators.  Locators must extend {@link AbstractWebServiceLocator}.
-	 * 
-	 * Callers can use the getter methods on the WebServiceInfo object to retrieve information on the 
-	 * web services found.  The WebServiceFinder cannot guarantee the level of detail contained in WebServiceInfo
-	 * objects returned.  This is left to the locator implementations.
-	 *  
-	 * @return iterator of WebServiceInfo objects
-	 */
-	public Iterator getWebServices()
-	{
-		return getWebServices(null);
-	}
-
-	/**
-	 * Returns an iterator of WebServiceInfo objects which represent web services found by locators that
-	 * have registered using the org.eclipse.wst.ws.locator extension point under the given category.
-	 * Locators must extend {@link AbstractWebServiceLocator}.
-	 * 
-	 * Callers can use the getter methods on the WebServiceInfo object to retrieve information on the 
-	 * web services found.  The WebServiceFinder cannot guarantee the level of detail contained in WebServiceInfo
-	 * objects returned.  This is left to the locator implementations.
-	 *  
-	 * @return iterator of WebServiceInfo objects
-	 * @param category The category of locators to use
-	 */
-	public Iterator getWebServices(String category)
-	{
-		LinkedList webServices = new LinkedList();
-		WebServiceLocatorRegistry wslr = WebServiceLocatorRegistry.getInstance();
-		IConfigurationElement[] regElements = wslr.getConfigElements();
-		for (int i = 0; i < regElements.length; i++)
-		{
-			if (ELEMENT_LOCATOR.equals(regElements[i].getName()))
-			{
-				try
-				{
-					if (category == null || category.equals(regElements[i].getAttributeAsIs(ATTRIBUTE_CATEGORY)))
-					{
-						Object obj = regElements[i].createExecutableExtension(ATTRIBUTE_CLASS);
-						if (obj instanceof IWebServiceLocator)
-						{
-							IWebServiceLocator wsl = (IWebServiceLocator)obj;
-							List wsList = wsl.getWebServices();
-							webServices.addAll(wsList);
-						}
-					}
-				} 
-				catch (CoreException ex){
-					// Quietly bypass any IWebServiceLocators that failed to be loaded.
-				}
-			}
-		} 
-		return webServices.iterator();	
-	} 
-
-	/**
-	 * Returns an array of registered Web Service Category IDs.
-	 *  
-	 * @return An array, never null but possibly empty,
-	 * of registered Web Service Category IDs.
-	 */
-	public String[] getCategoryIDs()
-	{
-		LinkedList categories = new LinkedList();
-		WebServiceLocatorRegistry wslr = WebServiceLocatorRegistry.getInstance();
-		IConfigurationElement[] regElements = wslr.getConfigElements();
-		for (int i = 0; i < regElements.length; i++)
-		{
-			if (ELEMENT_CATEGORY.equals(regElements[i].getName()))
-			{
-				String id = regElements[i].getAttributeAsIs(ATTRIBUTE_ID);
-				if (id != null)
-				{
-					categories.add(id);
-				}
-			}
-		}
-		return (String[])categories.toArray(new String[0]);
-	}
-	
-	//TODO: Need another method to return full Category objects,
-	//as in "public WebServiceLocatorCategory getCategories()"
-	//where WebServiceLocatorCategory is a new bean class with properties
-	//mirroring the attributes of a webServiceLocatorCategory extension.
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/WebServiceLocatorExtension.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/WebServiceLocatorExtension.java
deleted file mode 100644
index 9542b0182..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/WebServiceLocatorExtension.java
+++ /dev/null
@@ -1,33 +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.wsfinder;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.wst.ws.internal.ext.WebServiceExtensionImpl;
-
-/**
- * @author joan
- * 
- * This class is provided for the addition of locator extension specific functions
- * 
- */
-
-public class WebServiceLocatorExtension extends WebServiceExtensionImpl {
-	
-//	 Copyright
-	  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-	
-	 public WebServiceLocatorExtension(IConfigurationElement configElement)
-	  {
-	    super(configElement);
-	  }
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/WebServiceLocatorRegistry.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/WebServiceLocatorRegistry.java
deleted file mode 100644
index 23d6bffd5..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/WebServiceLocatorRegistry.java
+++ /dev/null
@@ -1,78 +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.wsfinder;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.ws.internal.ext.WebServiceExtension;
-import org.eclipse.wst.ws.internal.ext.WebServiceExtensionRegistryImpl;
-
-/**
- * @author joan
- *
- * Retrieves locators which extend {@link org.eclipse.wst.ws.internal.wsfinder.AbstractWebServiceLocator}.
- * Locators must create an extension for the org.eclipse.wst.ws.locator extension point in order to be retrieved by
- * the registry.
- */
-
-
-public class WebServiceLocatorRegistry 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 WebServiceLocatorRegistry wslr;
-	  
-	  public static WebServiceLocatorRegistry getInstance()
-	  {
-	  	if(wslr == null) wslr = new WebServiceLocatorRegistry();
-	    return wslr;
-	  }
-	  
-	  private WebServiceLocatorRegistry()
-	  {
-	    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 WebServiceLocatorExtension(configElement);
-	  }
-
-	  /**
-	  * Contacts platform registry and gets all locators which have registered 
-	  *  using the org.eclipse.wst.ws.locator extension point.
-	  * @return IConfigurationElement[] an array of elements which contain locators 
-	  * extending AbstractWebServiceLocator.
-	  */
-	  public IConfigurationElement[] getConfigElements()
-	  {
-	    IExtensionRegistry reg = Platform.getExtensionRegistry();
-	    IConfigurationElement[] config = reg.getConfigurationElementsFor(
-	                                     "org.eclipse.wst.ws",
-	                                     "locator");
-	    return config;    
-	  }
-
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/WorkspaceWSDLLocator.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/WorkspaceWSDLLocator.java
deleted file mode 100644
index 23a76e19a..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/WorkspaceWSDLLocator.java
+++ /dev/null
@@ -1,116 +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.wsfinder;
-
-import java.util.List;
-import java.util.Vector;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceVisitor;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo;
-
-/**
- * Extends the Web Services Finder Framework.
- * Finds all .wsdl files in the workspace.
- * Not intended to be used directly.  WorkspaceWSDLLocator registers with WebServiceLocatorRegistry 
- * and is accessed by the {@link WebServiceFinder}. 
- */
-
-public class WorkspaceWSDLLocator extends AbstractWebServiceLocator {
-	
-	protected List wsdlServices = null;
-	private static final String PLATFORM_RES = "platform:/resource";  //$NON-NLS-1$
-	private static final String WSDL_EXT = "wsdl";  //$NON-NLS-1$
-	
-	public WorkspaceWSDLLocator()
-	{
-		super();	
-	}
-	
-	/**
-	 * Returns the collection of all .wsdl files in the workspace.  Currently does not eliminate multiple 
-	 * occurences of the same web service. 
-	 * 
-	 * TODO: add a listener to the workspace resource tree so that getWebServices doesn't always
-	 * use the WSDLVisitor to walk the entire resource tree.  That should only happen once.  After
-	 * that the resource tree can be monitored for modifications to .wsdl files and changes made to a cache. 
-	 * 
-	 * @return list of WebServiceInfo objects
-	 */
-	public List getWebServices() {
-		
-		if (wsdlServices == null)
-		{
-			 try{
-			      IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-		
-			      WSDLVisitor visitor = new WSDLVisitor();
-			      root.accept(visitor);		
-			      visitor.visit(root);
-			      wsdlServices = visitor.getWSDL();
-			    }
-			    catch (Exception ex){
-			        	
-			    }
-		}
-		
-		return wsdlServices;		
-	}
-
-	/**
-	 *  Uses the Visitor pattern to walk the workspace resource tree
-	 */
-	
-	private class WSDLVisitor implements IResourceVisitor
-    {
-	  
-	  private Vector wsdl = new Vector();
-    
-	  /**
-	   *
-	   * visits every node on the resource tree stopping a file resources
-	   * if file resource has extension .wsdl a WebServiceInfo object is created and added to a vector 
-	   *  TODO: look at caching to eliminate duplicate web service definitions in the vector returned
-	   *  TODO: add more information to the WebServiceInfo object.  Currently only the qualified filename is added.
-	   */
-	 
-	  public boolean visit(IResource resource)
-      {
-    	if (resource.getType() == IResource.FILE)
-        {        
-          String ext = resource.getFileExtension();
-          if (ext != null && ext.equalsIgnoreCase(WSDL_EXT))
-          {
-        	String urlString = resource.getFullPath().toString();          
-        	urlString = PLATFORM_RES + urlString;
-        	
-        	WebServiceInfo wsInfo = new WebServiceInfo();
-            wsInfo.setWsdlURL(urlString);           
-            
-            wsdl.add(wsInfo);
-          }
-        }
-        return true;
-      }
-      
-	  /**
-	   * 
-	   * @return vector of WebServiceInfo objects
-	   */
-      public Vector getWSDL()
-      {
-    	  return wsdl;
-      }
-    }
-	
-}
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 17a02d5a2..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsil/AddWSDLToWSILCommand.java
+++ /dev/null
@@ -1,518 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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 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.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.uri.IURIFactory;
-import org.eclipse.wst.common.environment.uri.URIException;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.parser.wsil.IllegalArgumentsException;
-import org.eclipse.wst.ws.internal.parser.wsil.WSILMessages;
-import org.eclipse.wst.ws.internal.parser.wsil.WWWAuthenticationException;
-import org.eclipse.wst.ws.internal.parser.wsil.WWWAuthenticationHandler;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-import org.w3c.dom.Element;
-import org.xml.sax.SAXException;
-
-public class AddWSDLToWSILCommand extends AbstractDataModelOperation
-{
-  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 WWWAuthenticationHandler wwwAuthHandler_;
-  private String[] args_;
-  private String wsil_;
-  private ArrayList wsdls_;
-  private boolean resolveWSDL_;
-  private String httpUsername_;
-  private String httpPassword_;
-
-  public AddWSDLToWSILCommand()
-  {
-    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 IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    IEnvironment environment = getEnvironment();
-    
-    IURIFactory uriFactory = environment.getURIFactory();
-    // Parse arguments
-    try
-    {
-      parseArguments();
-    }
-    catch (IllegalArgumentsException iae)
-    {
-      return StatusUtils.errorStatus( WSILMessages.MSG_ERROR_ILLEGAL_ARGUMENTS, iae);
-    }
-    catch (ArrayIndexOutOfBoundsException e)
-    {
-      return StatusUtils.errorStatus( WSILMessages.MSG_ERROR_INVALID_ARGUMENTS, e);
-    }
-    // Create new WSIL document
-    WSILDocument wsilDocument = null;
-    URL wsilURL = null;
-    try
-    {
-      wsilDocument = WSILDocument.newInstance();
-      wsilURL = new URL(wsil_);
-    }
-    catch (MalformedURLException murle)
-    {
-      IStatus status = StatusUtils.errorStatus( WSILMessages.MSG_ERROR_INVALID_WSIL_URI, murle);
-      environment.getStatusHandler().reportError(status);
-      return status;
-    }
-    catch (WSILException wsile)
-    {
-      IStatus status = StatusUtils.errorStatus( WSILMessages.MSG_ERROR_UNEXPECTED_EXCEPTION, 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)
-    {
-      IStatus status = StatusUtils.errorStatus( WSILMessages.MSG_ERROR_UNEXPECTED_EXCEPTION, urie);
-      environment.getStatusHandler().reportError(status);
-      return status;
-    }
-    catch (IOException ioe)
-    {
-      IStatus status = StatusUtils.errorStatus( WSILMessages.MSG_ERROR_UNEXPECTED_EXCEPTION, ioe);
-      environment.getStatusHandler().reportError(status);
-      return status;
-    }
-    catch (WSILException wsile)
-    {
-      IStatus status = StatusUtils.errorStatus( WSILMessages.MSG_ERROR_UNEXPECTED_EXCEPTION, 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();
-      IStatus 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)
-            {
-              IStatus wwwaeStatus = StatusUtils.errorStatus( WSILMessages.MSG_ERROR_UNRESOLVABLE_WSDL, wwwae2.getIOException());
-              environment.getStatusHandler().reportError(wwwaeStatus);
-              return wwwaeStatus;
-            }
-          }
-        }
-        if (status == null)
-        {
-          IStatus s = StatusUtils.errorStatus( WSILMessages.MSG_ERROR_UNRESOLVABLE_WSDL, 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)
-    {
-      IStatus status = StatusUtils.errorStatus( WSILMessages.MSG_ERROR_WRITE_WSIL, urie);
-      environment.getStatusHandler().reportError(status);
-      return status;
-    }
-    catch (IOException ioe)
-    {
-      IStatus status = StatusUtils.errorStatus( WSILMessages.MSG_ERROR_WRITE_WSIL, ioe);
-      environment.getStatusHandler().reportError(status);
-      return status;
-    }
-    catch (WSILException wsile)
-    {
-      IStatus status = StatusUtils.errorStatus( WSILMessages.MSG_ERROR_WRITE_WSIL, wsile);
-      environment.getStatusHandler().reportError(status);
-      return status;
-    }
-    return Status.OK_STATUS;
-  }
-
-  private IStatus internalExecute(IEnvironment 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)
-      {
-        IStatus status = StatusUtils.errorStatus( WSILMessages.MSG_ERROR_INVALID_WSDL_URI, murle);
-        environment.getStatusHandler().reportError(status);
-        return status;
-      }
-      catch (IOException ioe)
-      {
-        IStatus status = StatusUtils.errorStatus( WSILMessages.MSG_ERROR_UNRESOLVABLE_WSDL, ioe);
-        environment.getStatusHandler().reportError(status);
-        return status;
-      }
-      catch (ParserConfigurationException pce)
-      {
-        IStatus status = StatusUtils.errorStatus( WSILMessages.MSG_ERROR_UNEXPECTED_EXCEPTION, pce);
-        environment.getStatusHandler().reportError(status);
-        return status;
-      }
-      catch (SAXException saxe)
-      {
-        IStatus status = StatusUtils.errorStatus( WSILMessages.MSG_ERROR_MALFORMED_WSDL, 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)
-    {
-      IStatus status = StatusUtils.errorStatus( WSILMessages.MSG_ERROR_UNEXPECTED_EXCEPTION, wsile);
-      environment.getStatusHandler().reportError(status);
-      return status;
-    }
-    catch (Throwable t)
-    {
-      IStatus status = StatusUtils.errorStatus( WSILMessages.MSG_ERROR_UNEXPECTED_EXCEPTION, t);
-      environment.getStatusHandler().reportError(status);
-      return status;
-    }
-    return Status.OK_STATUS;
-  }
-
-  /**
-   * 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 IStatus undo(IEnvironment environment)
-  {
-    return Status.OK_STATUS;
-  }
-
-  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(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(IURIFactory 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/AbstractWebService.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/AbstractWebService.java
deleted file mode 100644
index 2e168bb11..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/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.wsrt;
-
-import org.eclipse.wst.command.internal.env.core.ICommandFactory;
-import org.eclipse.wst.common.environment.IEnvironment;
-
-
-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(IEnvironment env, IContext ctx, ISelection sel,
-			String project, String earProject);
-	
-
-	public abstract ICommandFactory deploy(IEnvironment env, IContext ctx, ISelection sel,
-      String project, String earProject);
-	
-
-	public abstract ICommandFactory develop(IEnvironment env, IContext ctx, ISelection sel,
-      String project, String earProject);
-		
-
-	public abstract ICommandFactory install(IEnvironment env, IContext ctx, ISelection sel,
-      String project, String earProject);
-	
-
-	public abstract ICommandFactory run(IEnvironment env, IContext ctx, ISelection sel,
-      String project, String earProject);
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/AbstractWebServiceClient.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/AbstractWebServiceClient.java
deleted file mode 100644
index dfca570da..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/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.wsrt;
-
-import org.eclipse.wst.command.internal.env.core.ICommandFactory;
-import org.eclipse.wst.common.environment.IEnvironment;
-
-
-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(IEnvironment env, IContext ctx, ISelection sel,
-      String project, String earProject);
-	
-
-	public abstract ICommandFactory deploy(IEnvironment env, IContext ctx, ISelection sel,
-      String project, String earProject);
-	
-
-	public abstract ICommandFactory develop(IEnvironment env, IContext ctx, ISelection sel,
-      String project, String earProject);
-		
-
-	public abstract ICommandFactory install(IEnvironment env, IContext ctx, ISelection sel,
-      String project, String earProject);
-	
-
-	public abstract ICommandFactory run(IEnvironment env, IContext ctx, ISelection sel,
-      String project, String earProject);
-}
-
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/AbstractWebServiceRuntime.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/AbstractWebServiceRuntime.java
deleted file mode 100644
index c79033e15..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/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.wsrt;
-
-import org.eclipse.wst.command.internal.env.core.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/wsrt/IContext.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/IContext.java
deleted file mode 100644
index 4e3718f55..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/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.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/wsrt/ISelection.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/ISelection.java
deleted file mode 100644
index 5893b5a38..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/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.wsrt;
-
-public interface ISelection {
-	
-	Object[] getSelection();
-
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/IWebService.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/IWebService.java
deleted file mode 100644
index 923e61a87..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/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.wsrt;
-
-
-import org.eclipse.wst.command.internal.env.core.ICommandFactory;
-import org.eclipse.wst.common.environment.IEnvironment;
-
-
-public interface IWebService {
-
-	/**
-	 */
-	public WebServiceInfo getWebServiceInfo();
-	
-	public ICommandFactory develop(IEnvironment env, IContext ctx, ISelection sel, String project, String earProject);
-	public ICommandFactory deploy(IEnvironment env, IContext ctx, ISelection sel, String project, String earProject);
-	public ICommandFactory assemble(IEnvironment env, IContext ctx, ISelection sel, String project, String earProject);
-	public ICommandFactory install(IEnvironment env, IContext ctx, ISelection sel, String project, String earProject);
-	public ICommandFactory run(IEnvironment env, IContext ctx, ISelection sel, String project, String earProject);
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/IWebServiceClient.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/IWebServiceClient.java
deleted file mode 100644
index 6321ecc2e..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/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.wsrt;
-
-import org.eclipse.wst.command.internal.env.core.ICommandFactory;
-import org.eclipse.wst.common.environment.IEnvironment;
-
-public interface IWebServiceClient {
-	
-	/**
-	 */
-	public WebServiceClientInfo getWebServiceClientInfo();
-	
-	public ICommandFactory develop(IEnvironment env, IContext ctx, ISelection sel, String project, String earProject);
-	public ICommandFactory deploy(IEnvironment env, IContext ctx, ISelection sel, String project, String earProject);
-	public ICommandFactory assemble(IEnvironment env, IContext ctx, ISelection sel, String project, String earProject);
-	public ICommandFactory install(IEnvironment env, IContext ctx, ISelection sel, String project, String earProject);
-	public ICommandFactory run(IEnvironment env, IContext ctx, ISelection sel, String project, String earProject);	
-
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/IWebServicePublisher.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/IWebServicePublisher.java
deleted file mode 100644
index 26dc5e836..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/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.wsrt;
-
-import org.eclipse.wst.command.internal.env.core.ICommandFactory;
-import org.eclipse.wst.common.environment.IEnvironment;
-
-public interface IWebServicePublisher {
-	
-	public ICommandFactory publish(IEnvironment env, IWebService ws);
-
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/IWebServiceRuntime.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/IWebServiceRuntime.java
deleted file mode 100644
index 8f8c2e8bb..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/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.wsrt;
-
-import org.eclipse.wst.command.internal.env.core.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/wsrt/IWebServiceTester.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/IWebServiceTester.java
deleted file mode 100644
index 04748ac9e..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/IWebServiceTester.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.wsrt;
-
-import org.eclipse.wst.command.internal.env.core.ICommandFactory;
-
-public interface IWebServiceTester {
-  public ICommandFactory generate(TestInfo testInfo);
-  public ICommandFactory launch(TestInfo testInfo);
-}
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 0284b4ace..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/SimpleContext.java
+++ /dev/null
@@ -1,129 +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.wsrt;
-
-
-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.ws/src/org/eclipse/wst/ws/internal/wsrt/TestInfo.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/TestInfo.java
deleted file mode 100644
index 79d02e105..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/TestInfo.java
+++ /dev/null
@@ -1,265 +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.wsrt;
-
-import java.util.List;
-
-import org.eclipse.wst.command.internal.env.core.selection.BooleanSelection;
-import org.eclipse.wst.server.core.IServer;
-/**
- * This holds info that comes from user input or some calculations that 
- * which might be useful to any test extenders
- */
-
-public class TestInfo {
-  private String jspFolder;
-  private String generationProject;
-  private String serviceProject;
-  private String proxyBean;
-  private String setEndpointMethod;
-  private String clientProject;
-  private String clientModule;
-  private boolean clientNeedEAR;
-  private String clientEARProject;
-  private String clientEARModule;
-  private BooleanSelection[] methods;
-  private String serviceServerTypeID;
-  private String clientServerTypeID;
-  private IServer serviceExistingServer;
-  private IServer clientExistingServer;
-  private List endpoints;
-  private String wsdlServiceURL;
-  private boolean externalBrowser;  
-
-  /**
-  * This is the folder the user has chosen to generate any jsps 
-  * @param jspFolder
-  */
-  public void setJspFolder(String jspFolder){
-	this.jspFolder = jspFolder;  
-  }
-  
-  public String getJspFolder(){
-    return jspFolder;  
-  }
-  
-  /**
-  * This is the project the user has chosen to generate artifacts to  
-  * @param generationProject
-  */
-  public void setGenerationProject(String generationProject){
-    this.generationProject = generationProject;	  
-  }
-  
-  public String getGenerationProject(){
-    return generationProject;	  
-  }
-  
-  /**
-  * The proxy bean was generated by us this is the name of it  
-  * @param proxyBean
-  */
-  public void setProxyBean(String proxyBean){
-    this.proxyBean = proxyBean;	  
-  }
-  
-  public String getProxyBean(){
-    return proxyBean;	  
-  }
-	  
-  /**
-  * This is the SetEndpointMethod   
-  * @param 
-  */
-  public void setSetEndpointMethod(String setEndpointMethod){
-	this.setEndpointMethod = setEndpointMethod;  
-  }
-  
-  public String getSetEndpointMethod(){
-    return setEndpointMethod;  
-  }
-  
-  /**
-  * The clientProject contains the client artifacts including the 
-  * generated proxy bean   
-  * @param clientProject String
-  */
-  public void setClientProject(String clientProject){
-    this.clientProject = clientProject;	  
-  }
-  
-  public String getClientProject(){
-    return clientProject;	  
-  }
-	  
-  /**
-   * The clientModule contains the client artifacts including the 
-   * module   
-   * @param clientProject String
-   */
-   public void setClientModule(String clientModule){
-     this.clientModule = clientModule;	  
-   }
-   
-   public String getClientModule(){
-     return clientModule;	  
-   }
-  
-  /**
-  * These are methods on the proxybean the user has checked ones 
-  * they want included in the test client     
-  * @param methods
-  */
-  public void setMethods(BooleanSelection[] methods){
-	this.methods = methods;  
-  }
-  
-  public BooleanSelection[] getMethods(){
-    return methods;  
-  }
-  
-  /**
-  * If the command needs a server this is the chosen 
-  * client serverID
-  * @param sampleServerTypeID
-  */
-  public void setServiceServerTypeID(String serviceServerTypeID){
-    this.serviceServerTypeID = serviceServerTypeID;  
-  }
-  
-  public String getServiceServerTypeID(){
-    return serviceServerTypeID;  
-  }
-  
-  /**
-  * If the command needs a server this is the chosen 
-  * client serverID
-  * @param sampleServerTypeID
-  */
-   public void setClientServerTypeID(String clientServerTypeID){
-     this.clientServerTypeID = clientServerTypeID;  
-   }
-   
-   public String getClientServerTypeID(){
-     return clientServerTypeID;  
-   }
-	  
-  /**
-  * This is the IServer if required
-  * @param sampleExistingServer
-  */
-  public void setServiceExistingServer(IServer serviceExistingServer){
-	this.serviceExistingServer = serviceExistingServer;   
-  }
-  
-  public IServer getServiceExistingServer(){
-    return serviceExistingServer;   
-  }
-  
-  /**
-   * This is the String if required
-   * @param clientEARProject
-   */
-   public void setClientEARProject(String clientEARProject){
- 	this.clientEARProject = clientEARProject;   
-   }
-   
-   public String getClientEARProject(){
-     return clientEARProject;   
-   }
-   
-   
-   /**
-    * This is the String if required
-    * @param clientEARProject
-    */
-    public void setClientEARModule(String clientEARModule){
-  	this.clientEARModule = clientEARModule;   
-    }
-    
-    public String getClientEARModule(){
-      return clientEARModule;   
-    }
-   
-  /**
-  * This is the IServer if required
-  * @param sampleExistingServer
-  */
-  public void setClientExistingServer(IServer clientExistingServer){
-    this.clientExistingServer = clientExistingServer;   
-  }
-   
-  public IServer getClientExistingServer(){
-    return clientExistingServer;   
-  }
-   
-  /**
-  * This is the endpoints if monitor service is enabled
-  * @param endpoints
-  */
-  public void setEndpoint(List endpoints){
-	this.endpoints = endpoints;  
-  }
-  public List getEndpoint(){
-    return endpoints;  
-  } 
-
-  /**
-  * This is the project that should be used when dealing with
-  * wsdl
-  * @param serviceProject
-  */
-  public void setServiceProject(String serviceProject){
-    this.serviceProject = serviceProject;    	  
-  }
-
-  public String getServiceProject(){
-    return serviceProject;
-  }
-
-  /**
-  * WSDL URL
-  */
-  public void setWsdlServiceURL(String wsdlServiceURL){
-	this.wsdlServiceURL = wsdlServiceURL;  
-  }
-  
-  public String getWsdlServiceURL(){
-    return wsdlServiceURL;  
-  }
-  
-  /**
-   * clientNeedEAR
-   */
-  public boolean getClientNeedEAR() {
-		return clientNeedEAR;
-  }
-
-  public void setClientNeedEAR(boolean clientNeedEAR) {
-		this.clientNeedEAR = clientNeedEAR;
-  }
-
-  /**
-   * external browser
-   */
-  public boolean getExternalBrowser() 
-  {
-	  return externalBrowser;
-  }
-
-  public void setExternalBrowser(boolean externalBrowser) {
-	  this.externalBrowser = externalBrowser;
-  }
-
-
-	
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/WebServiceClientInfo.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/WebServiceClientInfo.java
deleted file mode 100644
index 1b3996e80..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/WebServiceClientInfo.java
+++ /dev/null
@@ -1,59 +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.wsrt;
-
-public class WebServiceClientInfo {
-
-	private WebServiceState state;
-	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 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 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/wsrt/WebServiceInfo.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/WebServiceInfo.java
deleted file mode 100644
index 348a08670..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/WebServiceInfo.java
+++ /dev/null
@@ -1,81 +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.wsrt;
-
-public class WebServiceInfo {
-
-	private WebServiceState state;
-	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 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 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/wsrt/WebServiceScenario.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/WebServiceScenario.java
deleted file mode 100644
index fe68771cc..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/WebServiceScenario.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.wst.ws.internal.wsrt;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-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 String BOTTOMUP_LABEL = "BOTTOMUP_LABEL";
-  public static final String TOPDOWN_LABEL = "TOPDOWN_LABEL";
-  public static final String CLIENT_LABEL = "CLIENT_LABEL";
-  
-  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/wsrt/WebServiceState.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/WebServiceState.java
deleted file mode 100644
index cf20c0d69..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/WebServiceState.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.wst.ws.internal.wsrt;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-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.wsdl.ui/.classpath b/bundles/org.eclipse.wst.wsdl.ui/.classpath
deleted file mode 100644
index 905c50815..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="src-validation"/>
-	<classpathentry kind="src" path="src-refactor"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.wst.wsdl.ui/.cvsignore b/bundles/org.eclipse.wst.wsdl.ui/.cvsignore
deleted file mode 100644
index 911ed7f1b..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-build.xml
-wsdleditor.jar
-temp.folder
-org.eclipse.wst.wsdl.ui_1.0.0.jar
-@dot
-src.zip
diff --git a/bundles/org.eclipse.wst.wsdl.ui/.project b/bundles/org.eclipse.wst.wsdl.ui/.project
deleted file mode 100644
index c5a4ddcd0..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.wsdl.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.wst.wsdl.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.wst.wsdl.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 449969789..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,59 +0,0 @@
-#Mon Jan 30 23:38:53 EST 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/bundles/org.eclipse.wst.wsdl.ui/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.wst.wsdl.ui/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index bbf7ac879..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Jan 30 23:38:15 EST 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/bundles/org.eclipse.wst.wsdl.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.wsdl.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 99a75b88e..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,80 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %_UI_PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.wst.wsdl.ui; singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.core.internal.compatibility.PluginActivator
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.wsdl.ui.internal,
- org.eclipse.wst.wsdl.ui.internal.actions,
- org.eclipse.wst.wsdl.ui.internal.commands,
- org.eclipse.wst.wsdl.ui.internal.contentgenerator,
- org.eclipse.wst.wsdl.ui.internal.contentgenerator.ui,
- org.eclipse.wst.wsdl.ui.internal.dialogs,
- org.eclipse.wst.wsdl.ui.internal.dialogs.types,
- org.eclipse.wst.wsdl.ui.internal.extension,
- org.eclipse.wst.wsdl.ui.internal.filter,
- org.eclipse.wst.wsdl.ui.internal.gef.util.editparts,
- org.eclipse.wst.wsdl.ui.internal.gef.util.editpolicies,
- org.eclipse.wst.wsdl.ui.internal.gef.util.figures,
- org.eclipse.wst.wsdl.ui.internal.graph,
- org.eclipse.wst.wsdl.ui.internal.graph.editparts,
- org.eclipse.wst.wsdl.ui.internal.graph.editpolicies,
- org.eclipse.wst.wsdl.ui.internal.graph.figures,
- org.eclipse.wst.wsdl.ui.internal.graph.model,
- org.eclipse.wst.wsdl.ui.internal.icons,
- org.eclipse.wst.wsdl.ui.internal.model,
- org.eclipse.wst.wsdl.ui.internal.nsedit,
- org.eclipse.wst.wsdl.ui.internal.outline,
- org.eclipse.wst.wsdl.ui.internal.parameters,
- org.eclipse.wst.wsdl.ui.internal.properties.section,
- org.eclipse.wst.wsdl.ui.internal.reconciler,
- org.eclipse.wst.wsdl.ui.internal.refactor,
- org.eclipse.wst.wsdl.ui.internal.text,
- org.eclipse.wst.wsdl.ui.internal.typesystem,
- org.eclipse.wst.wsdl.ui.internal.util,
- org.eclipse.wst.wsdl.ui.internal.util.flatui,
- org.eclipse.wst.wsdl.ui.internal.util.ui,
- org.eclipse.wst.wsdl.ui.internal.validation,
- org.eclipse.wst.wsdl.ui.internal.viewers,
- org.eclipse.wst.wsdl.ui.internal.viewers.widgets,
- org.eclipse.wst.wsdl.ui.internal.visitor,
- org.eclipse.wst.wsdl.ui.internal.widgets,
- org.eclipse.wst.wsdl.ui.internal.wizards,
- org.eclipse.wst.wsdl.ui.internal.xsd,
- org.eclipse.wst.wsdl.ui.internal.xsd.actions,
- org.eclipse.wst.wsdl.ui.internal.xsd.graph.editparts
-Require-Bundle: org.eclipse.core.resources,
- org.eclipse.core.runtime.compatibility,
- org.eclipse.emf.common,
- org.eclipse.emf.ecore,
- org.eclipse.gef,
- org.eclipse.jface,
- org.eclipse.jface.text,
- org.eclipse.ui,
- org.eclipse.ui.editors,
- org.eclipse.ui.ide,
- org.eclipse.ui.views,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.wst.sse.core,
- org.eclipse.wst.sse.ui,
- org.eclipse.wst.common.uriresolver,
- org.eclipse.wst.common.ui,
- org.eclipse.wst.xml.core,
- org.eclipse.wst.xml.ui,
- org.eclipse.xsd,
- org.eclipse.wst.wsdl,
- org.eclipse.wst.common.ui.properties,
- org.eclipse.wst.common.core,
- org.eclipse.wst.xsd.ui,
- org.eclipse.emf.edit,
- org.eclipse.emf.edit.ui,
- org.eclipse.wst.validation,
- org.wsdl4j,
- org.eclipse.wst.wsdl.validation,
- org.eclipse.ltk.core.refactoring,
- org.eclipse.ltk.ui.refactoring,
- com.ibm.icu
-Eclipse-AutoStart: true
-Plugin-Class: org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin
diff --git a/bundles/org.eclipse.wst.wsdl.ui/about.html b/bundles/org.eclipse.wst.wsdl.ui/about.html
deleted file mode 100644
index 6f6b96c4c..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/build.properties b/bundles/org.eclipse.wst.wsdl.ui/build.properties
deleted file mode 100644
index df3cd81f7..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/build.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
-###############################################################################
-bin.includes = plugin.xml,\
-               plugin.properties,\
-               icons/,\
-               .,\
-               META-INF/,\
-               about.html
-jars.compile.order = .
-source.. = src/,\
-           src-validation,\
-           src-refactor/
-output.. = bin/
diff --git a/bundles/org.eclipse.wst.wsdl.ui/icons/reloadgrammar.gif b/bundles/org.eclipse.wst.wsdl.ui/icons/reloadgrammar.gif
deleted file mode 100644
index 9d4c9ca3f..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/icons/reloadgrammar.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/icons/validate.gif b/bundles/org.eclipse.wst.wsdl.ui/icons/validate.gif
deleted file mode 100644
index 2b347ac45..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/icons/validate.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/icons/wsdl_file_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/icons/wsdl_file_obj.gif
deleted file mode 100644
index 75b1f92b4..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/icons/wsdl_file_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/plugin.properties b/bundles/org.eclipse.wst.wsdl.ui/plugin.properties
deleted file mode 100644
index 1995e7914..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/plugin.properties
+++ /dev/null
@@ -1,340 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-!
-! Plugin
-!
-_UI_PLUGIN_NAME             = WSDL Editor
-_UI_EDITOR_NAME             = WSDL Editor
-_UI_WSDL_LABEL              = WSDL Files
-
-
-_UI_HIDE_BINDINGS           = Hide Bindings
-_UI_BACK_TO                 = Back to {0}
-_UI_BACK_TO_DEFINITION      = Back to Definition
-_UI_BACK                    = Back to Previous View
-
-! New property tabs
-_UI_LABEL_GENERAL       = General
-_UI_LABEL_OTHER         = Other
-_UI_LABEL_ATTRIBUTES    = Attributes
-_UI_LABEL_DOCUMENTATION = Documentation
-_UI_LABEL_FACETS        = Facets
-_UI_LABEL_ENUMERATIONS  = Enumerations
-_UI_LABEL_NAMESPACE     = Namespace
-
-! Section title for other attributes
-_UI_SECTION_ADVANCED_ATTRIBUTES   = Advanced
-
-!
-! Workbook Pages
-!
-_UI_TAB_SOURCE = Source
-_UI_TAB_GRAPH  = Graph
-
-_UI_ADD_EXTENSIBILITY_ELEMENT    = Add Extensibility Element
-_UI_CREATE_WSDL_DOCUMENTATION    = Create WSDL Documentation
-_UI_FOLDER_NOT_CREATED           = Folder not created
-_UI_CREATING_DOCUMENTATION       = Creating Documentation
-_UI_LABEL_CREATE_FOLDER_FOR_DOCS = Create a new folder for the html documentation files
-_UI_LABEL_CREATING_HTML_FILES    = Creating HTML files
-_UI_LABEL_NEW_FOLDER             = New folder
-
-_UI_ACTION_ADD             = Add
-_UI_ACTION_COPY            = Copy
-_UI_ACTION_PASTE           = Paste
-_UI_ACTION_DELETE          = Delete
-_UI_ACTION_MULTIPLE_DELETE = Multiple Delete
-_UI_ACTION_RENAME          = Rename
-
-_UI_LABEL_BINDING_WIZARD = Binding Wizard
-_UI_ACTION_GENERATE_HTML_DOCUMENTATION = Generate HTML Documentation for this WSDL document
-_UI_ACTION_VALIDATE_WSDL_DOCUMENT = Validate WSDL Document
-
-_UI_ACTION_ADD_CHILD        = Add Child
-_UI_ACTION_SET_BINDING      = Set Binding
-_UI_ACTION_SET_PORTTYPE     = Set PortType
-_UI_ACTION_SET_MESSAGE      = Set Message
-_UI_ACTION_SET_ELEMENT      = Set Element
-_UI_ACTION_SET_TYPE         = Set Type
-_UI_LABEL_BINDING_OPERATION = Binding Operation
-_UI_ACTION_NEW_MESSAGE      = New Message...
-_UI_ACTION_NEW_SERVICE      = New Service
-_UI_ACTION_NEW_PORTTYPE     = New PortType...
-_UI_ACTION_NEW_BINDING      = New Binding...
-_UI_ACTION_NEW_PORT         = New Port
-_UI_ACTION_NEW_OPERATION    = New Operation
-_UI_ACTION_NEW_FAULT        = New Fault
-_UI_ACTION_NEW_PART         = New Part
-_UI_ACTION_NEW_ELEMENT      = New Element...
-_UI_ACTION_NEW_COMPLEX_TYPE = New Complex Type...
-_UI_ACTION_NEW_SIMPLE_TYPE  = New Simple Type...
-
-_UI_LABEL_NEW_BINDING      = New Binding
-_UI_LABEL_NEW_PORTTYPE     = New PortType
-_UI_LABEL_NEW_MESSAGE      = New Message
-_UI_LABEL_NEW_ELEMENT      = New Element
-_UI_LABEL_NEW_COMPLEX_TYPE = New Complex Type
-_UI_LABEL_NEW_SIMPLE_TYPE  = New Simple Type
-
-_UI_ACTION_EXISTING_BINDING  = Existing Binding...
-_UI_ACTION_EXISTING_PORTTYPE = Existing PortType...
-_UI_ACTION_EXISTING_MESSAGE  = Existing Message...
-_UI_ACTION_EXISTING_ELEMENT  = Existing Element...
-_UI_ACTION_EXISTING_TYPE     = Existing Type...
-
-_UI_ACTION_ADD_IMPORT            = Add Import
-_UI_ACTION_ADD_SCHEMA            = Add Schema
-_UI_ACTION_ADD_SERVICE           = Add Service
-_UI_ACTION_ADD_BINDING           = Add Binding
-_UI_ACTION_ADD_OPERATION         = Add Operation
-_UI_ACTION_ADD_BINDING_OPERATION = Add Binding Operation
-_UI_ACTION_ADD_PART              = Add Part
-_UI_ACTION_ADD_PORT              = Add Port
-_UI_ACTION_ADD_PORTTYPE          = Add PortType
-_UI_ACTION_ADD_MESSAGE           = Add Message
-_UI_ACTION_ADD_INPUT             = Add Input
-_UI_ACTION_ADD_OUTPUT            = Add Output
-_UI_ACTION_ADD_FAULT             = Add Fault
-
-_UI_LABEL_DEFINITION = Definition
-_UI_LABEL_BINDING    = Binding
-_UI_LABEL_INPUT      = Input
-_UI_LABEL_OUTPUT     = Output
-_UI_LABEL_FAULT      = Fault
-_UI_LABEL_MESSAGE    = Message
-_UI_LABEL_PORT       = Port
-_UI_LABEL_PORTTYPE   = PortType
-_UI_LABEL_SERVICE    = Service
-_UI_LABEL_ELEMENTS   = Elements
-_UI_LABEL_TYPES      = Types
-_UI_LABEL_NAME       = Name
-_UI_LABEL_OPERATION  = Operation
-_UI_LABEL_ELEMENT    = Element
-_UI_LABEL_TYPE       = Type
-
-_UI_LABEL_BINDING_NAME    = Binding Name:
-_UI_LABEL_PORTTYPE_NAME   = PortType Name:
-_UI_LABEL_MESSAGE_NAME    = Message Name:
-_UI_LABEL_TYPE_NAME       = Type Name:
-_UI_LABEL_ELEMENT_NAME    = Element Name:
-
-_UI_LABEL_MATCHING_BINDINGS  = Matching Bindings:
-_UI_LABEL_MATCHING_PORTTYPES = Matching PortTypes:
-_UI_LABEL_MATCHING_MESSAGES  = Matching Messages:
-_UI_LABEL_MATCHING_TYPES     = Matching Types:
-_UI_LABEL_MATCHING_ELEMENTS  = Matching Elements:
-
-_UI_LABEL_NEW_COMPONENT  = New Component
-
-_UI_LABEL_READ_ONLY     = read-only
-
-! Note to translators: keep the one character space and colon after the translation of View
-_UI_MENU_VIEW         = View :
-_UI_LABEL_XSD_COMPONENTS = XSD Components
-
-_UI_LABEL_UNKNOWN_OBJECT = Unknown Object
-_UI_LABEL_UNKNOWN_NODE   = Unknown Node
-_UI_LABEL_VIEW_NOT_AVAILABLE = View not available for selected object
-
-_UI_LABEL_PORT_W_COLON     = Port : 
-_UI_LABEL_PORTTYPE_W_COLON = PortType : 
-_UI_LABEL_SERVICE_W_COLON  = Service : 
-_UI_LABEL_UNKNOWN  = Unknown : 
-_UI_LABEL_VIEW_BY_SERVICE = View By : Service
-
-_UI_FOLDER_IMPORTS = Imports
-_UI_FOLDER_MESSAGES= Messages
-_UI_FOLDER_SERVICES = Services
-_UI_FOLDER_BINDINGS = Bindings
-_UI_FOLDER_PORTTYPES = Port Types
-_UI_FOLDER_TYPES     = Types
-_UI_FOLDER_EXTENSIBILITY_ELEMENTS = Extensiblity Elements
-_UI_FOLDER_DEFINITION = Definition
-
-_UI_LABEL_NONE = (none)
-_UI_MENUBAR_GENERATE_BINDING = Generate Binding
-
-_UI_LABEL_HTTP_BINDING_OPTIONS = HTTP Binding Options
-
-_UI_SOME_ELEMENT_NAME = some-element-name
-
-_UI_LABEL_BINDING_INPUT   = Binding Input
-_UI_LABEL_BINDING_OUTPUT  = Binding Output
-_UI_LABEL_BINDING_FAULT   = Binding Fault
-
-_UI_LABEL_BINDING_OPERATION = Binding Operation
-
-_UI_LABEL_UNKNOWN_EXTENSIBILITY_ELEMENT = Unknown Extensibility Element
-
-_UI_LABEL_IMPORT = Import
-_UI_LABEL_NAMESPACE = Namespace
-_UI_LABEL_PREFIX = Prefix
-_UI_LABEL_LOCATION = Location
-_UI_TITLE_SELECT = Select
-_UI_TITLE_SELECT_FILE = Select File
-_UI_DESCRIPTION_SELECT_WSDL_OR_XSD = Select a WSDL or XSD file to import.
-
-_UI_LABEL_PARAMETER_ORDER = Parameter Order
-_UI_LABEL_PART = Part
-_UI_LABEL_REFERENCE_KIND = Reference kind:
-_UI_LABEL_OVERVIEW = Overview
-_UI_LABEL_VIEW_NOT_IMPLEMENTED = This view is not yet implemented.
-_UI_LABEL_BINDING_VIEW = Binding View
-_UI_LABEL_DOCUMENTION = Documentation
-_UI_LABEL_PROPERTY = Property
-_UI_LABEL_VALUE = Value
-
-_UI_BUTTON_NEW    = New...
-_UI_BUTTON_IMPORT = Import...
-
-_UI_BUTTON_CREATE_ASSOCIATED_BINDINGS = Create associated bindings
-_UI_TITLE_GENERATE_BINDING_WIZARD = Generate Binding Wizard
-
-_UI_LABEL_NAMESPACE_URIS_TO_BE_INCLUDED = Namespace URIs to be included
-_UI_ACTION_ADD = Add
-
-_UI_TITLE_SELECT_WSDL_FILE = Select WSDL File
-_UI_DESCRIPTION_SELECT_WSDL_FILE_TO_IMPORT = Select a WSDL file to import
-
-_UI_TITLE_SPECIFY_BINDING = Specify Binding
-_UI_TITLE_SPECIFY_TYPE = Specify Type
-_UI_TITLE_SPECIFY_ELEMENT = Specify Element
-_UI_TITLE_SPECIFY_MESSAGE = Specify Message
-_UI_TITLE_SPECIFY_PORTTYPE = Specify Port Type
-
-_UI_TITLE_SPECIFY_BINDING_DETAILS = Specify Binding Details
-_UI_LABEL_SPECIFY_BINDING_DETAILS_DESC = Specify the details of the binding you wish to generate.
-
-! Translators: Leave the {0} as is
-_UI_RADIO_SELECT_EXISTING  = Select an existing {0}
-_UI_RADIO_CREATE_NEW       = Create a new {0}
-_UI_RADIO_IMPORT_FROM_FILE = Import {0} from a file
-_UI_LABEL_NAME_OF_ITEM     = Name of {0}:
-
-! Translators: Leave the {0} as is
-_UI_DESCRIPTION_CHOOSE_FROM_EXISTING = Choose {0} from the list
-_UI_DESCRIPTION_PROVIDE_NAME = Provide a name of the {0} to create
-_UI_DESCRIPTION_IMPORT_FILE = Select a file and then choose the {0}
-_UI_HELP = Help
-_UI_LABEL_FILE = File:
-_UI_BUTTON_BROWSE = Browse...
-
-_UI_TITLE_NEW_WSDL_FILE = New WSDL File
-_UI_TITLE_OPTIONS       = Options
-
-_UI_DESCRIPTION_SPECIFY_BINDING_PAGE = Description of Specify Binding Page
-_UI_RADIO_GENERATE_CONTENT = Generate content for an existing binding
-_UI_RADIO_GENERATE_NEW_BINDING = Generate a new binding
-_UI_LABEL_BINDING_NAME = Name:
-_UI_LABEL_BINDING_PROTOCOL = Protocol:
-_UI_CHECKBOX_OVERWRITE = Overwrite existing binding information
-_UI_LABEL_SOAP_BINDING_OPTIONS = SOAP Binding Options
-_UI_RADIO_DOCUMENT_LITERAL = document literal
-_UI_RADIO_RPC_LITERAL = rpc literal
-_UI_RADIO_RPC_ENCODED = rpc encoded
-
-_UI_DESCRIPTION_NEW_WSDL_FILE = Specify the attributes for the new WSDL file.
-_UI_LABEL_TARGET_NAMESPACE = Target namespace:
-_UI_LABEL_PREFIX_WITH_COLON = Prefix:
-_UI_LABEL_DEFINITION_NAME   = Definition name:
-_UI_LABEL_CREATE_NEW_WSDL_FILE = Create a new WSDL File
-_UI_LABEL_CREATE_WSDL_SKELETON = Create WSDL Skeleton
-_UI_LABEL_NEW_CATEGORY_NAME_WS = Web Services
-
-! Translators: Leave the {0} as is
-_UI_ERROR_NAMESPACE_INVALID = The target namespace is invalid
-_UI_ERROR_PREFIX_IS_INVALID = Prefix {0} is invalid
-_UI_ERROR_PREFIX_IS_A_DUPLICATE = Prefix {0} is a duplicate
-_UI_ERROR_MORE_THAN_ONE_PREFIX_IS_BLANK = More than one prefix is blank
-_UI_ERROR_FILE_MUST_END_WITH_WSDL = Error: File must end with wsdl
-_UI_ERROR_FILE_ALREADY_EXISTS = File already exists: {0}
-
-_UI_ERROR_INVALID_WSDL = Invalid WSDL
-_UI_ERROR_INVALID_WSDL_DESC = The WSDL File is invalid.  Fix errors and then retry this action.
-_UI_ERROR_ERROR             = Error
-_UI_ERROR_FOLDER_NOT_CREATED  = Folder not created.
-_UI_ERROR_CREATING_HTML_FILES = Error creating HTML files.
-
-_UI_ERROR_IMPORT_ERROR      = Import Error
-_UI_ERROR_IMPORTING_ITSELF  = This file is attempting to import itself.  Change the location of the import.
-
-
-_UI_USE_WS-I_STYLE_SCHEMA_IMPORT       = Use WS-I style schema import
-_UI_BINDING_WIZARD                     = Binding Wizard
-_UI_SPECIFY_BINDING_DETAILS_LABEL      = Specify the details of the binding that will be created
-_UI_PORT_TYPE                          = Port Type
-_UI_PORT_WIZARD                        = Port Wizard
-_UI_SPECIFY_PORT_DETAILS               = Specify Port Details
-_UI_SPECIFY_PORT_DETAILS_TO_BE_CREATED = Specify the details of the port that will be created
-_UI_BINDING                            = Binding
-_UI_NAMESPACES                         = Namespaces
-_UI_EDIT_NAMESPACES                    = Edit Namespaces...
-_UI_SELECT_REGISTERED_NAMESPACES       = Select From Registered Namespaces
-_UI_SPECIFY_NEW_NAMESPACE              = Specify New Namespace
-_UI_SELECT_NAMESPACE_TO_ADD            = Select the namespace declarations to add.
-_UI_ENTER_REQ_PREFIX_AND_NAMESPACE     = Enter the required prefix and namespace URI for the namespace declaration.
-_UI_TARGET_NAMESPACE                   = Target Namespace
-_UI_NAMESPACE_DECLARATIONS             = Namespace Declarations
-_UI_ADD                                = Add...
-_UI_ADD_NAMESPACE_DECLARATIONS_TITLE   = Add Namespace Declarations
-_UI_SOAP_PORT_DETAILS                  = SOAP Port Details
-_UI_LOCATION                           = Location:
-_UI_HTTP_PORT_DETAILS                  = HTTP Port Details
-_UI_EDIT_NAMESPACES_DIALOG_TITLE       = Edit Namespaces
-_UI_DEPENDENCIES_CHANGED               = Dependencies Changed
-_UI_DEPENDENCIES_CHANGED_REFRESH       = One or more dependencies have changed.  Do you want to refresh the editor to reflect these changes?
-_UI_RELOAD_DEPENDENCIES                = Reload Dependencies
-_UI_UNSPECIFIED                        = (unspecified)
-_UI_NO_IMPORT_SPECIFIED                = (no import location specified)
-_UI_GENERATE_BINDING_CONTENT           = Generate Binding Content...
-_UI_OPEN_IMPORT                        = Open Import
-
-_UI_PREF_PAGE_DEFAULT_TARGET_NAMESPACE = Default Target Namespace:
-_UI_PREF_PAGE_AUTO_REGENERATE_BINDING  = Regenerate Binding on save
-_UI_PREF_PAGE_CREATING_FILES		   = Creating files
-
-_UI_CREATE_MESSAGE_CHECKBOX_LABEL       = Create default messages
-_UI_DELETE_ASSOCIATED_MSG_AND_PARTS     = Delete associated Messages and Parts
-_UI_DELETE_OPERATION_TITLE              = Delete Operation
-_UI_LABEL_WARNING_DUPLICATE_NAME_EXISTS = Warning: duplicate name already exists
-
-_WARN_NAME_HAS_SPACE         = IWAX1402W Name field cannot contain a space
-_WARN_NAME_INVALID_FIRST      = IWAX1403W First character in name field must be one of the following ('_', ':', 'letter')
-_WARN_NAME_MUST_CONTAIN_AT_LEAST_ONE_CHAR = IWAX1415W Name field must contain at least one character
-_WARN_NAME_INVALID_CHAR       = IWAX1404W Name field contains invalid character ('
-_UI_NAME_INVALID_CHAR_END   = ')
-
-!======================================================================================
-!
-! refactoring
-!
-!======================================================================================
-refactoringActionSet.label=Refactor
-refactoring.menu.label=Refactor
-refactoring.renameAction.label=Re&name...
-
-! Copied from sse
-23concat_EXC_=Resource {0} does not exist.
-32concat_EXC_=Editor could not be open on {0}
-An_error_has_occurred_when1_ERROR_=An error has occurred when initializing the input for the the editor's source page.
-
-AddBookmark.label=Add Boo&kmark...
-SelectRuler.label=Select Ruler
-
-! ----------------------------------------------------------------
-! Translators : please don't translate any string below this line 
-! ----------------------------------------------------------------
-! _DEBUG_UPDATE_POLICY = 0Dummy.label=
-
-
-!-- WSDL Validation UI Menu Items
-_UI_MENU_VALIDATE_WSDL                     = Validate WSDL File
-_UI_WSDL_VALIDATOR                         = WSDL Validator
diff --git a/bundles/org.eclipse.wst.wsdl.ui/plugin.xml b/bundles/org.eclipse.wst.wsdl.ui/plugin.xml
deleted file mode 100644
index 5a7881847..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/plugin.xml
+++ /dev/null
@@ -1,401 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-	<extension point="org.eclipse.ui.editors">
-		<editor
-			name="%_UI_EDITOR_NAME"
-			default="true"
-			icon="icons/wsdl_file_obj.gif"
-			class="org.eclipse.wst.wsdl.ui.internal.WSDLEditor"
-			contributorClass="org.eclipse.wst.wsdl.ui.internal.actions.WSDLActionBarContributor"
-			id="org.eclipse.wst.wsdl.ui.internal.WSDLEditor">
-			<contentTypeBinding
-				contentTypeId="org.eclipse.wst.wsdl.wsdlsource" />
-		</editor>
-	</extension>
-
-	<extension-point
-		id="internalEditorExtensions"
-		name="Internal Editor Extensions"
-		schema="schema/internalEditorExtensions.exsd" />
-		
-	<extension-point
-		id="extensibilityItemTreeProviders"
-		name="Extensibility Item Tree Providers"
-		schema="schema/extensibilityItemTreeProviders.exsd" />
-
-	<!-- This extension point is used to suplement WSDL 1.1 schemas in order to   -->
-	<!-- constrain the extensiblity elements that are allowed at the 'wsdl' level -->
-	<extension-point
-		id="extensibilityElementFilter"
-		name="Extensiblity Element Filter"
-		schema="schema/extensibilityElementFilter.exsd" />
-
-	<extension-point
-		id="propertyDescriptorProvider"
-		name="Property Descriptor Provider"
-		schema="schema/propertyDescriptorProvider.exsd" />
-
-	<extension
-		point="org.eclipse.wst.wsdl.ui.extensibilityItemTreeProviders">
-		<extensibilityItemTreeProvider
-			namespace="http://schemas.xmlsoap.org/wsdl/http/"
-			labelProviderClass="org.eclipse.wst.wsdl.ui.internal.outline.HTTPLabelProvider">
-		</extensibilityItemTreeProvider>
-	</extension>
-
-	<extension
-		point="org.eclipse.wst.wsdl.ui.extensibilityItemTreeProviders">
-		<extensibilityItemTreeProvider
-			namespace="http://schemas.xmlsoap.org/wsdl/soap/"
-			labelProviderClass="org.eclipse.wst.wsdl.ui.internal.outline.SOAPLabelProvider">
-		</extensibilityItemTreeProvider>
-	</extension>
-
-	<extension
-		point="org.eclipse.wst.wsdl.ui.extensibilityElementFilter">
-		<extensibilityElementFilter
-			namespace="http://schemas.xmlsoap.org/wsdl/soap/"
-			class="org.eclipse.wst.wsdl.ui.internal.filter.SoapExtensiblityElementFilter">
-		</extensibilityElementFilter>
-	</extension>
-
-	<extension
-		point="org.eclipse.wst.wsdl.ui.extensibilityElementFilter">
-		<extensibilityElementFilter
-			namespace="http://schemas.xmlsoap.org/wsdl/http/"
-			class="org.eclipse.wst.wsdl.ui.internal.filter.HttpExtensiblityElementFilter">
-		</extensibilityElementFilter>
-	</extension>
-
-	<extension
-		point="org.eclipse.wst.wsdl.ui.extensibilityElementFilter">
-		<extensibilityElementFilter
-			namespace="http://schemas.xmlsoap.org/wsdl/mime/"
-			class="org.eclipse.wst.wsdl.ui.internal.filter.MimeExtensiblityElementFilter">
-		</extensibilityElementFilter>
-	</extension>
-
-	<extension
-		point="org.eclipse.wst.wsdl.ui.extensibilityElementFilter">
-		<extensibilityElementFilter
-			namespace="http://www.w3.org/2001/XMLSchema"
-			class="org.eclipse.wst.wsdl.ui.internal.filter.XSDExtensiblityElementFilter">
-		</extensibilityElementFilter>
-	</extension>
-
-	<extension point="org.eclipse.ui.newWizards">
-		<category
-			id="org.eclipse.jst.ws.ui.new"
-			name="%_UI_LABEL_NEW_CATEGORY_NAME_WS" />
-		<wizard
-			id="org.eclipse.wst.wsdl.ui"
-			name="WSDL"
-			class="org.eclipse.wst.wsdl.ui.internal.wizards.NewWSDLWizard"
-			category="org.eclipse.jst.ws.ui.new"
-			icon="icons/wsdl_file_obj.gif">
-			<description>%_UI_LABEL_CREATE_NEW_WSDL_FILE</description>
-			<selection class="org.eclipse.core.resources.IResource" />
-		</wizard>
-
-		<wizard
-			id="org.eclipse.wst.wsdl.ui"
-			name="WSDL"
-			class="org.eclipse.wst.wsdl.ui.internal.wizards.NewWSDLWizard"
-			category="org.eclipse.wst.XMLCategory"
-			icon="icons/wsdl_file_obj.gif">
-			<description>%_UI_LABEL_CREATE_NEW_WSDL_FILE</description>
-			<selection class="org.eclipse.core.resources.IResource" />
-		</wizard>
-	</extension>
-
-
-	<extension point="org.eclipse.ui.editorActions">
-		<editorContribution
-			id="org.eclipse.ui.articles.action.contribution.editor2"
-			targetID="org.eclipse.wst.wsdl.ui.internal.WSDLEditor">
-
-			<menu
-				id="WSDLEditor"
-				label="%_UI_EDITOR_NAME"
-				path="additions">
-				<separator name="group1" />
-			</menu>
-
-			<action
-				id="org.eclipse.wst.wsdl.ui.actions.ReloadDependenciesActionDelegate"
-				label="%_UI_RELOAD_DEPENDENCIES"
-				icon="icons/reloadgrammar.gif"
-				tooltip="Reload Dependencies"
-				menubarPath="WSDLEditor/group1"
-				class="org.eclipse.wst.wsdl.ui.internal.actions.ReloadDependenciesActionDelegate">
-			</action>
-
-			<!--
-				<action
-				id="org.eclipse.wst.wsdl.ui.internal.actions.ValidateActionDelegate" 
-				label="%_UI_ACTION_VALIDATE_WSDL_DOCUMENT" 
-				icon="icons/validate.gif" 
-				tooltip="%_UI_ACTION_VALIDATE_WSDL_DOCUMENT"
-				menubarPath="WSDLEditor/group1"
-				toolbarPath="%Normal/WSDLEditor"
-				class="org.eclipse.wst.wsdl.ui.internal.actions.ValidateActionDelegate"> 
-				</action>      
-			-->
-
-		</editorContribution>
-        <editorContribution
-            targetID="org.eclipse.wst.wsdl.wsdlsource.source"
-            id="org.eclipse.wst.wsdl.wsdlsource.ruler.actions">
-         <action
-               label="%AddBookmark.label"
-               helpContextId="org.eclipse.ui.bookmark_action_context"
-               class="org.eclipse.ui.texteditor.BookmarkRulerAction"
-               actionID="RulerDoubleClick"
-               id="org.eclipse.ui.texteditor.BookmarkRulerAction"/>
-         <action
-               label="%SelectRuler.label"
-               class="org.eclipse.ui.texteditor.SelectRulerAction"
-               actionID="RulerClick"
-               id="org.eclipse.ui.texteditor.SelectRulerAction"/>
-        </editorContribution>
-	</extension>
-
-	<extension point="org.eclipse.ui.preferencePages">
-		<!-- place everything in "Web and XML" -->
-		<page
-			name="%_UI_WSDL_LABEL"
-			category="org.eclipse.wst.sse.ui.internal.provisional.preferences"
-			class="org.eclipse.wst.wsdl.ui.internal.util.WSDLPreferencePage"
-			id="org.eclipse.wst.wsdl.ui.internal.util.WSDLPreferencePage" />
-	</extension>
-	<extension point="org.eclipse.wst.sse.ui.editorConfiguration">
-		<!-- add preference pages to the context menu action (ID must correspond to the declared "path" above) -->
-		<provisionalDefinition
-			type="preferencepages"
-			value="org.eclipse.wst.wsdl.ui.internal.util.WSDLPreferencePage"
-			target="org.eclipse.wst.wsdl.ui.internal.WSDLEditor.source" />
-		<sourceViewerConfiguration
-			class="org.eclipse.wst.wsdl.ui.internal.StructuredTextViewerConfigurationWSDL"
-			target="org.eclipse.wst.wsdl.wsdlsource" />
-		<contentOutlineConfiguration
-			class="org.eclipse.wst.wsdl.ui.internal.outline.WSDLContentOutlineConfiguration"
-			target="org.eclipse.wst.wsdl.wsdlsource" />
-	</extension>
-
-	<extension
-		point="org.eclipse.wst.common.ui.properties.propertyContributor">
-		<propertyContributor
-			typeMapper="org.eclipse.wst.wsdl.ui.internal.properties.section.WSDLTypeMapper"
-			contributorId="org.eclipse.wst.wsdl.ui.internal.WSDLEditor"
-			sectionDescriptorProvider="org.eclipse.wst.wsdl.ui.internal.properties.section.WSDLSectionDescriptorProvider"
-			labelProvider="org.eclipse.wst.wsdl.ui.internal.properties.section.WSDLLabelProvider">
-			<propertyCategory category="general"></propertyCategory>
-			<propertyCategory category="namespace"></propertyCategory>
-			<propertyCategory category="other"></propertyCategory>
-			<propertyCategory category="attributes"></propertyCategory>
-			<propertyCategory category="enumerations">
-			</propertyCategory>
-			<propertyCategory category="documentation">
-			</propertyCategory>
-			<propertyCategory category="facets"></propertyCategory>
-		</propertyContributor>
-	</extension>
-	<extension
-		point="org.eclipse.wst.common.ui.properties.propertyTabs">
-		<propertyTabs
-			contributorId="org.eclipse.wst.wsdl.ui.internal.WSDLEditor">
-			<propertyTab
-				label="%_UI_LABEL_GENERAL"
-				category="general"
-				id="org.eclipse.wst.xmlwebservices.general">
-			</propertyTab>
-			<propertyTab
-				label="%_UI_LABEL_NAMESPACE"
-				category="namespace"
-				afterTab="org.eclipse.wst.xmlwebservices.general"
-				id="org.eclipse.wst.xmlwebservices.namespace">
-			</propertyTab>
-			<propertyTab
-				label="%_UI_LABEL_OTHER"
-				category="other"
-				id="org.eclipse.wst.xmlwebservices.other">
-			</propertyTab>
-			<propertyTab
-				label="%_UI_LABEL_ATTRIBUTES"
-				category="attributes"
-				id="org.eclipse.wst.xmlwebservices.attributes">
-			</propertyTab>
-			<propertyTab
-				label="%_UI_LABEL_ENUMERATIONS"
-				category="enumerations"
-				id="org.eclipse.wst.xmlwebservices.enumerations">
-			</propertyTab>
-			<propertyTab
-				label="%_UI_LABEL_DOCUMENTATION"
-				category="documentation"
-				id="org.eclipse.wst.xmlwebservices.documentation">
-			</propertyTab>
-			<propertyTab
-				label="%_UI_SECTION_ADVANCED_ATTRIBUTES"
-				category="facets"
-				id="org.eclipse.wst.xmlwebservices.facets">
-			</propertyTab>
-		</propertyTabs>
-	</extension>
-
-	<extension
-		point="org.eclipse.wst.wsdl.ui.internalEditorExtensions">
-		<internalEditorExtension
-			class="org.eclipse.wst.wsdl.ui.internal.xsd.XSDExtension" />
-	</extension>
-
-	<extension
-		point="org.eclipse.wst.wsdl.ui.extensibilityItemTreeProviders">
-		<extensibilityItemTreeProvider
-			namespace="http://www.w3.org/2001/XMLSchema"
-			labelProviderClass="org.eclipse.wst.wsdl.ui.internal.xsd.XSDLabelProvider">
-		</extensibilityItemTreeProvider>
-	</extension>
-
-	<!-- intialize wsdl source validator -->
-	<extension point="org.eclipse.wst.sse.ui.sourcevalidation">
-		<validator
-			scope="total"
-			class="org.eclipse.wst.wsdl.ui.internal.reconciler.DelegatingSourceValidatorForWSDL"
-			id="org.eclipse.wst.wsdl.ui.internal.reconciler.DelegatingSourceValidatorForWSDL">
-			<contentTypeIdentifier
-				id="org.eclipse.wst.wsdl.wsdlsource">
-				<partitionType id="org.eclipse.wst.xml.XML_DEFAULT">
-				</partitionType>
-			</contentTypeIdentifier>
-		</validator>
-	</extension>
-
-	<!-- this extension point is used to augment the ModelQuery to provide WSDL specific guided editing -->
-	<extension point="org.eclipse.wst.xml.core.modelQueryExtensions">
-		<modelQueryExtension
-			class="org.eclipse.wst.wsdl.ui.internal.text.WSDLModelQueryExtension"
-			contentType="org.eclipse.wst.wsdl.wsdlsource">
-		</modelQueryExtension>
-	</extension>
-	
-   <!-- ====================================================== -->
-   <!-- 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.ui.internal.validation.ValidateWSDLActionDelegate"
-               enablesFor="1"
-               id="org.eclipse.wst.wsdl.ui.internal.validation.ValidateWSDLActionDelegate">
-         </action>
-      </objectContribution>
-   </extension>
-   
-   <!-- ====================================================== -->
-   <!-- An extension for adding the WSDL validator to the      -->
-   <!-- validation framework. 						           -->										   -->
-   <!-- ====================================================== -->
-   <extension
-         id="wsdlValidator"
-         name="%_UI_WSDL_VALIDATOR"
-         point="org.eclipse.wst.validation.validator">
-      <validator>
-         <filter
-               objectClass="org.eclipse.core.resources.IFile"
-               caseSensitive="false"
-               nameFilter="*.wsdl">
-         </filter>
-         <helper
-               class="org.eclipse.wst.xml.core.internal.validation.core.Helper">
-         </helper>
-         <run
-               class="org.eclipse.wst.wsdl.ui.internal.validation.Validator">
-         </run>
-      </validator>
-   </extension>
-   
-     <!-- Search participant extension that supports XMLComponentSearchPatten on WSDL resources -->
-	 <extension   
-		point="org.eclipse.wst.common.core.searchParticipants">
-		<searchParticipant
-			id="org.eclipse.wst.wsdl.search.WSDLSearchParticipant"
-			class="org.eclipse.wst.wsdl.ui.internal.search.WSDLSearchParticipant">
-			<enablement>
-			   <or>
-			      <with variable="pattern">
-					<instanceof value="org.eclipse.wst.xml.core.internal.search.XMLComponentSearchPattern"/>			   
-				  </with>
-				</or>
-			</enablement>
-		</searchParticipant>
-	 </extension>
-	
-
-
-	<!-- Refactoring CORE -->
-	<extension
-		point="org.eclipse.ltk.core.refactoring.renameParticipants">
-		<renameParticipant
-			name="WSDL Rename Particpant"           
-			class="org.eclipse.wst.wsdl.ui.internal.refactor.WSDLComponentRenameParticipant"
-			id="org.eclipse.wst.wsdl.ui.refactoring.WSDLComponentRenameParticipant">
-			<enablement>
-			   <or>
-			   <with variable="element">
-					<instanceof value="org.eclipse.wst.wsdl.WSDLElement"/>			   
-				</with>
-			   <with variable="element">
-					<instanceof value="org.eclipse.xsd.XSDNamedComponent"/>								
-				</with>							
-				</or>
-			</enablement>			
-		</renameParticipant>
-	</extension>
-	
-	
- 	<!--  Refactoring UI extensions -->
-   <extension point="org.eclipse.ui.popupMenus"> 
-      <objectContribution 
-         id="org.eclipse.wst.wsdl.ui.refactoring.menu.objectContrib" 
-         objectClass="org.eclipse.wst.wsdl.WSDLElement"> 
-         <action
-            id="org.eclipse.wst.wsdl.ui.refactoring.menu.refactorGroup.object" 
-            enablesFor="1"
-            style="pulldown"
-            menubarPath="additions"
-            label="%refactoring.menu.label" 
-            class="org.eclipse.wst.wsdl.ui.internal.refactor.actions.WSDLRefactorGroupActionDelegate"> 
-         </action> 
-      </objectContribution>   
-   
-    <viewerContribution
-        id="org.eclipse.wst.xsd.ui.refactoring.menu.source"
-        targetID="org.eclipse.wst.wsdl.wsdlsource.source.EditorContext">
-	    <action id="org.eclipse.wst.wsdl.ui.refactoring.menu.refactorGroup.source"
-       		style="pulldown"
-            menubarPath="additions"
-            label="%refactoring.menu.label" 
-            class="org.eclipse.wst.wsdl.ui.internal.refactor.actions.WSDLRefactorGroupActionDelegate"> 
-  	    </action>
-       </viewerContribution>       
-     </extension>
-          
-     <extension point="org.eclipse.ui.commands">
-		<command
-			name="%command.wsdl.refactor.rename.element.name"
-			description="%command.wsdl.refactor.rename.element.description"
-			categoryId="org.eclipse.ui.category.edit"
-			id="org.eclipse.wst.wsdl.ui.refactor.rename.element">
-		</command>
-	</extension>   
-</plugin>
diff --git a/bundles/org.eclipse.wst.wsdl.ui/schema/extensibilityElementFilter.exsd b/bundles/org.eclipse.wst.wsdl.ui/schema/extensibilityElementFilter.exsd
deleted file mode 100644
index b9470d861..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/schema/extensibilityElementFilter.exsd
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.wsdl.ui">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.wst.wsdl.ui" id="extensibilityelementFilter" name="Extensibility Element Filter"/>
-      </appInfo>
-      <documentation>
-         The Extensibility Element Filter extension point allows clients to register filters for Extensibility Elements in the WSDL Editor based on the Extensibility Element&apos;s namespace.  These filters determine what is to be displayed in the WSDL Editor.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="extensibilityElementFilter"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified identifier of the target extension point
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  an optional identifier of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  an optional name of the extension instance
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="extensibilityElementFilter">
-      <complexType>
-         <attribute name="namespace" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The namespace this extension point instance applies to.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The class that implements &lt;code&gt;org.eclipse.wst.wsdl.ui.internal.filter.ExtensiblityElementFilter&lt;/code&gt;.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         &lt;b&gt;This extension point is internal and should not be used by any other plugins.&lt;/b&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The following is an example of an Extensibility Element Filter contribution:
-&lt;pre&gt;
-   &lt;extension
-         point=&quot;org.eclipse.wst.wsdl.ui.extensibilityElementFilter&quot;&gt;
-      &lt;extensibilityElementFilter
-            namespace=&quot;http://schemas.xmlsoap.org/wsdl/soap/&quot;
-            class=&quot;org.eclipse.wst.wsdl.ui.internal.filter.SoapExtensiblityElementFilter&quot;/&gt;
-   &lt;/extension&gt;
-&lt;/pre&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         The supplied class must implement &lt;code&gt;org.eclipse.wst.wsdl.ui.internal.filter.ExtensiblityElementFilter&lt;/code&gt;.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2000, 2005 IBM Corporation and others.&lt;br&gt;
-All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
-this distribution, and is available at &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.wst.wsdl.ui/schema/extensibilityItemTreeProviders.exsd b/bundles/org.eclipse.wst.wsdl.ui/schema/extensibilityItemTreeProviders.exsd
deleted file mode 100644
index e7f897c24..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/schema/extensibilityItemTreeProviders.exsd
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.wsdl.ui">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.wst.wsdl.ui" id="extensibilityItemTreeProviders" name="Extensibility Item Tree Providers"/>
-      </appInfo>
-      <documentation>
-         The Extensibility Item Tree Provider extension point allows clients to register custom ILabelProviders (to provide custom labels and icons) for Extensibility Elements in the WSDL Editor based on the Extensibility Element&apos;s namespace.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="extensibilityItemTreeProvider"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified identifier of the target extension point
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  an optional identifier of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  an optional name of the extension instance
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="extensibilityItemTreeProvider">
-      <complexType>
-         <attribute name="namespace" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The namespace this extension point instance applies to.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="labelProviderClass" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The class that implements &lt;code&gt;org.eclipse.jface.viewers.ILabelProvider&lt;/code&gt;.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         &lt;b&gt;This extension point is internal and should not be used by any other plugins.&lt;/b&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The following is an example of an Extensibility Item Tree Provider contribution:
-&lt;pre&gt;
-   &lt;extension
-         point=&quot;org.eclipse.wst.wsdl.ui.extensibilityItemTreeProviders&quot;&gt;
-      &lt;extensibilityItemTreeProvider
-            namespace=&quot;http://schemas.xmlsoap.org/wsdl/soap/&quot;
-            labelProviderClass=&quot;org.eclipse.wst.wsdl.ui.internal.outline.SOAPLabelProvider&quot;/&gt;
-   &lt;/extension&gt;
-&lt;/pre&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         The supplied class must implement &lt;code&gt;org.eclipse.jface.viewers.ILabelProvider&lt;/code&gt;.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2000, 2005 IBM Corporation and others.&lt;br&gt;
-All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
-this distribution, and is available at &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.wst.wsdl.ui/schema/internalEditorExtensions.exsd b/bundles/org.eclipse.wst.wsdl.ui/schema/internalEditorExtensions.exsd
deleted file mode 100644
index f5710d795..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/schema/internalEditorExtensions.exsd
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.wsdl.ui">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.wst.wsdl.ui" id="internalEditorExtensions" name="Internal Editor Extensions"/>
-      </appInfo>
-      <documentation>
-         The Internal Editor Extension point is used to provide GUI objects, actions, context menu items, etc... for non WSDL Model Objects in the WSDL Editor.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="internalEditorExtension"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified identifier of the target extension point
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  an optional identifier of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  an optional name of the extension instance
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="internalEditorExtension">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The class that implements &lt;code&gt;org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtension&lt;/code&gt;.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         &lt;b&gt;This extension point is internal and should not be used by any other plugins.&lt;/b&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The following is an example of an Internal Editor Extension contribution:
-&lt;pre&gt;
-   &lt;extension
-         point=&quot;org.eclipse.wst.wsdl.ui.internalEditorExtensions&quot;&gt;
-      &lt;internalEditorExtension
-            class=&quot;org.eclipse.wst.wsdl.ui.internal.xsd.XSDExtension&quot; /&gt;
-   &lt;/extension&gt;
-&lt;/pre&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         The supplied class must implement &lt;code&gt;org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtension&lt;/code&gt;.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2000, 2005 IBM Corporation and others.&lt;br&gt;
-All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
-this distribution, and is available at &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.wst.wsdl.ui/schema/propertyDescriptorProvider.exsd b/bundles/org.eclipse.wst.wsdl.ui/schema/propertyDescriptorProvider.exsd
deleted file mode 100644
index 613846034..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/schema/propertyDescriptorProvider.exsd
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.wsdl.ui">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.wst.wsdl.ui" id="propertyDescriptorProvider" name="Property Descriptor Provider"/>
-      </appInfo>
-      <documentation>
-         The Property Descriptor Provider extension point allows clients to register their own custom IPropertyDescriptor in the WSDL Editor based on namespace.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="propertyDescriptorProvider"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified identifier of the target extension point
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  an optional identifier of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  an optional name of the extension instance
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="propertyDescriptorProvider">
-      <complexType>
-         <attribute name="namespace" type="string">
-            <annotation>
-               <documentation>
-                  The namespace this extension point instance applies to.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string">
-            <annotation>
-               <documentation>
-                  The class that implements &lt;code&gt;org.eclipse.ui.views.properties.IPropertyDescriptor&lt;/code&gt;.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         &lt;b&gt;This extension point is internal and should not be used by any other plugins.&lt;/b&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The following is an example of an  contribution:
-&lt;pre&gt;
-   &lt;extension
-         point=&quot;org.eclipse.wst.wsdl.ui.propertyDescriptorProvider&quot;&gt;
-      &lt;propertyDescriptorProvider
-            namespace=&quot;http://schemas.xmlsoap.org/wsdl/soap/&quot;
-            class=&quot;org.eclipse.wst.wsdl.ui.internal.example.ExamplePropertyDescriptor&quot;/&gt;
-   &lt;/extension&gt;
-&lt;/pre&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         The supplied class must implement &lt;code&gt;org.eclipse.ui.views.properties.IPropertyDescriptor&lt;/code&gt;.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2000, 2005 IBM Corporation and others.&lt;br&gt;
-All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
-this distribution, and is available at &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src-refactor/org/eclipse/wst/wsdl/ui/internal/refactor/WSDLComponentRenameParticipant.java b/bundles/org.eclipse.wst.wsdl.ui/src-refactor/org/eclipse/wst/wsdl/ui/internal/refactor/WSDLComponentRenameParticipant.java
deleted file mode 100644
index c9f9d0143..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src-refactor/org/eclipse/wst/wsdl/ui/internal/refactor/WSDLComponentRenameParticipant.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.ui.internal.refactor;
-
-import java.util.List;
-
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.search.IWSDLSearchConstants;
-import org.eclipse.wst.xsd.ui.internal.refactor.rename.ComponentRenameArguments;
-import org.eclipse.wst.xsd.ui.internal.refactor.rename.XMLComponentRenameParticipant;
-import org.eclipse.xsd.XSDNamedComponent;
-
-/**
- * This participant takes case of renaming matches that are XSD components
- */
-public class WSDLComponentRenameParticipant extends XMLComponentRenameParticipant {
-
-	protected boolean initialize(Object element) {
-
-		if(element instanceof WSDLElement || element instanceof XSDNamedComponent){
-			if(getArguments() instanceof ComponentRenameArguments){
-				matches = (List)((ComponentRenameArguments)getArguments()).getMatches().get(IWSDLSearchConstants.WSDL_NAMESPACE);
-			}
-			if(matches != null){
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public String getName() {
-		
-		return "WSDL component rename participant";
-	}
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src-refactor/org/eclipse/wst/wsdl/ui/internal/refactor/actions/RenameComponentAction.java b/bundles/org.eclipse.wst.wsdl.ui/src-refactor/org/eclipse/wst/wsdl/ui/internal/refactor/actions/RenameComponentAction.java
deleted file mode 100644
index 543c8c652..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src-refactor/org/eclipse/wst/wsdl/ui/internal/refactor/actions/RenameComponentAction.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.refactor.actions;
-
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ltk.core.refactoring.participants.RenameRefactoring;
-import org.eclipse.ltk.ui.refactoring.RefactoringWizard;
-import org.eclipse.ltk.ui.refactoring.RefactoringWizardOpenOperation;
-import org.eclipse.ui.actions.GlobalBuildAction;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.internal.impl.WSDLElementImpl;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.util.NodeAssociationManager;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xsd.ui.internal.refactor.RefactoringComponent;
-import org.eclipse.wst.xsd.ui.internal.refactor.RefactoringMessages;
-import org.eclipse.wst.xsd.ui.internal.refactor.XMLRefactoringComponent;
-import org.eclipse.wst.xsd.ui.internal.refactor.rename.RenameComponentProcessor;
-import org.eclipse.wst.xsd.ui.internal.refactor.wizard.RenameRefactoringWizard;
-import org.eclipse.xsd.XSDAttributeDeclaration;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDNamedComponent;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.w3c.dom.Element;
-
-public class RenameComponentAction extends WSDLSelectionDispatchAction {
-
-	private RefactoringComponent selectedComponent;
-
-	public RenameComponentAction(ISelection selection,
-			Definition model) {
-		super(selection);
-		setModel(model);
-	}
- 
-	protected boolean doCanEnableXSDSelection(XSDNamedComponent selectedObject) {
-
-		selectedComponent = null;
-		if (selectedObject != null) {
-			selectedComponent = new XMLRefactoringComponent(
-					selectedObject,
-					(IDOMElement)selectedObject.getElement(), 
-					selectedObject.getName(),
-					selectedObject.getTargetNamespace());
-	
-			// if it's element reference, then this action is not appropriate
-			if (selectedObject instanceof XSDElementDeclaration) {
-				XSDElementDeclaration element = (XSDElementDeclaration) selectedObject;
-				if (element.isElementDeclarationReference()) {
-					selectedComponent = null;
-				}
-			}
-			if(selectedObject instanceof XSDTypeDefinition){
-				XSDTypeDefinition type = (XSDTypeDefinition) selectedObject;
-				XSDConcreteComponent parent = type.getContainer();
-				if (parent instanceof XSDElementDeclaration) {
-					XSDElementDeclaration element = (XSDElementDeclaration) parent;
-					if(element.getAnonymousTypeDefinition().equals(type)){
-						selectedComponent = null;
-					}
-				}
-				else if(parent instanceof XSDAttributeDeclaration) {
-					XSDAttributeDeclaration element = (XSDAttributeDeclaration) parent;
-					if(element.getAnonymousTypeDefinition().equals(type)){
-						selectedComponent = null;
-					}
-				}
-			}
-		}
-
-		return canRun();
-	}
-	
-	protected boolean doCanEnableWSDLSelection(WSDLElement selectedObject) {
-
-		selectedComponent = null;
-		String localName = null;
-		String namespace = null; 
-		if (selectedObject instanceof Binding){
-			localName = ((Binding)selectedObject).getQName().getLocalPart();
-			namespace = ((Binding)selectedObject).getQName().getNamespaceURI();
-		}
-		else if (selectedObject instanceof PortType){
-			localName = ((PortType)selectedObject).getQName().getLocalPart();
-			namespace = ((PortType)selectedObject).getQName().getNamespaceURI();
-		}
-		else if (selectedObject instanceof Message){
-			localName = ((Message)selectedObject).getQName().getLocalPart();
-			namespace = ((Message)selectedObject).getQName().getNamespaceURI();
-		}
-		if(localName != null){
-			selectedComponent = new XMLRefactoringComponent(
-					selectedObject,
-					(IDOMElement)selectedObject.getElement(), 
-					localName,
-					namespace);
-		}
-		
-	
-		return canRun();
-	}
-
-	protected boolean canEnable(Object selectedObject) {
-
-		if (selectedObject instanceof XSDNamedComponent) {
-			return doCanEnableXSDSelection((XSDNamedComponent) selectedObject);
-		} else if(selectedObject instanceof WSDLElementImpl){
-			return doCanEnableWSDLSelection((WSDLElementImpl) selectedObject);
-		}
-		if (selectedObject instanceof Element) {
-			Element node = (Element) selectedObject;
-			if (getDefinition() != null) {
-				// issue (eb)  dependency on utility class to get component from the model based on element
-				Object concreteComponent = 	(new NodeAssociationManager()).getModelObjectForNode(getDefinition(), node);
-				return canEnable(concreteComponent);
-			}
-		}
-		return false;
-
-	}
-
-	public boolean canRun() {
-
-		return selectedComponent != null;
-	}
-
-	public void run(ISelection selection) {
-	
-		RenameComponentProcessor processor = new RenameComponentProcessor(selectedComponent, selectedComponent.getName());
-		RenameRefactoring refactoring = new RenameRefactoring(processor);
-		try {
-			RefactoringWizard wizard = new RenameRefactoringWizard(
-					refactoring,
-					RefactoringMessages
-					.getString("RenameComponentWizard.defaultPageTitle"), //$NON-NLS-1$ TODO: provide correct strings
-					RefactoringMessages
-					.getString("RenameComponentWizard.inputPage.description"), //$NON-NLS-1$
-					null);
-			RefactoringWizardOpenOperation op = new RefactoringWizardOpenOperation(
-					wizard);
-			op.run(WSDLEditorPlugin.getShell(), wizard
-					.getDefaultPageTitle());
-			triggerBuild();
-		} catch (InterruptedException e) {
-			// do nothing. User action got cancelled
-		}
-		
-	}
-
-	public static void triggerBuild() {
-		if (ResourcesPlugin.getWorkspace().getDescription().isAutoBuilding()) {
-			new GlobalBuildAction(WSDLEditorPlugin.getInstance().getWorkbench()
-					.getActiveWorkbenchWindow(),
-					IncrementalProjectBuilder.INCREMENTAL_BUILD).run();
-		}
-	}
-
-	
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src-refactor/org/eclipse/wst/wsdl/ui/internal/refactor/actions/WSDLRefactorActionGroup.java b/bundles/org.eclipse.wst.wsdl.ui/src-refactor/org/eclipse/wst/wsdl/ui/internal/refactor/actions/WSDLRefactorActionGroup.java
deleted file mode 100644
index b9bed6c41..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src-refactor/org/eclipse/wst/wsdl/ui/internal/refactor/actions/WSDLRefactorActionGroup.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.ui.internal.refactor.actions;
-
-import java.util.ArrayList;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.xsd.ui.internal.refactor.actions.RenameAction;
-import org.eclipse.wst.xsd.ui.internal.refactor.wizard.RefactorActionGroup;
-
-public class WSDLRefactorActionGroup extends RefactorActionGroup {
-
-
-	private static final String RENAME_ELEMENT = "org.eclipse.wst.wsdl.ui.refactor.rename.element"; //$NON-NLS-1$
-
-	
-	public WSDLRefactorActionGroup(ISelection selection,
-			Definition definition) {
-		
-		super(selection); 
-	  	if( definition != null){
-			fEditorActions = new ArrayList();
-			RenameComponentAction action = new RenameComponentAction(selection, definition);
-			fRenameAction = new RenameAction(selection);
-			fRenameAction.setRenameComponentAction(action);
-			fRenameAction.setActionDefinitionId(RENAME_ELEMENT);
-			fEditorActions.add(fRenameAction);
-			initAction(fRenameAction, selection);
-		}
-	}
-
-	public void dispose() {
-		//disposeAction(fRenameAction, fSelectionProvider);
-		super.dispose();
-	}
-	
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src-refactor/org/eclipse/wst/wsdl/ui/internal/refactor/actions/WSDLRefactorGroupActionDelegate.java b/bundles/org.eclipse.wst.wsdl.ui/src-refactor/org/eclipse/wst/wsdl/ui/internal/refactor/actions/WSDLRefactorGroupActionDelegate.java
deleted file mode 100644
index 02fcfdfd7..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src-refactor/org/eclipse/wst/wsdl/ui/internal/refactor/actions/WSDLRefactorGroupActionDelegate.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.ui.internal.refactor.actions;
-
-import java.io.IOException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IWorkbenchPartSite;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.internal.util.WSDLResourceFactoryImpl;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xsd.ui.internal.refactor.wizard.RefactorActionGroup;
-import org.eclipse.wst.xsd.ui.internal.refactor.wizard.RefactorGroupActionDelegate;
-import org.eclipse.wst.xsd.ui.internal.refactor.wizard.RefactorGroupSubMenu;
-
-public class WSDLRefactorGroupActionDelegate extends RefactorGroupActionDelegate {
-
-	
-
-    public WSDLRefactorGroupActionDelegate() {
-		super();
-	}
-
-	/**
-     * Fills the menu with applicable refactor sub-menues
-     * @param menu The menu to fill
-     */
-	protected void fillMenu(Menu menu) {
-		if (fSelection == null) {
-			return;
-		}
-		if (workbenchPart != null) {
-			IWorkbenchPartSite site = workbenchPart.getSite();
-			if (site == null)
-				return;
-
-			IEditorPart editor = site.getPage().getActiveEditor();
-			if (editor != null) {
-				IEditorInput editorInput = editor.getEditorInput();
-				if(editorInput instanceof IFileEditorInput){
-					IFileEditorInput fileInput = (IFileEditorInput)editorInput;
-					Definition definition = createDefinition(fileInput.getFile(), resourceSet);
-					RefactorActionGroup refactorMenuGroup = new WSDLRefactorActionGroup(fSelection, definition);
-					RefactorGroupSubMenu subMenu = new RefactorGroupSubMenu(refactorMenuGroup);
-					subMenu.fill(menu, -1);
-				}
-				
-			}
-		
-		}
-
-	}
-	
-	
-public static Definition createDefinition(IFile file, ResourceSet resourceSet) {
-		
-		URI uri = URI.createFileURI(file.getLocation().toString());
-		Definition definition = WSDLFactory.eINSTANCE.createDefinition();		
-		// we need this model to be able to get locations
-		try {
-			definition.setDocumentBaseURI(uri.toString());
-			IStructuredModel structuredModel = StructuredModelManager
-					.getModelManager().getModelForRead(file);
-			IDOMModel domModel = (IDOMModel) structuredModel;
-			WSDLResourceFactoryImpl resourceFactory = new WSDLResourceFactoryImpl();
-			Resource wsdlResource = resourceFactory.createResource(uri);
-			wsdlResource.setURI(uri);
-			if(resourceSet != null){
-				resourceSet.getResources().add(wsdlResource);
-			}
-			definition.setElement(domModel.getDocument()
-					.getDocumentElement());
-		} catch (IOException e) {
-			// do nothing
-		} catch (CoreException e) {
-			// do nothing
-		}
-		return definition;
-	}
-
-
-	
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src-refactor/org/eclipse/wst/wsdl/ui/internal/refactor/actions/WSDLSelectionDispatchAction.java b/bundles/org.eclipse.wst.wsdl.ui/src-refactor/org/eclipse/wst/wsdl/ui/internal/refactor/actions/WSDLSelectionDispatchAction.java
deleted file mode 100644
index cc81b426b..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src-refactor/org/eclipse/wst/wsdl/ui/internal/refactor/actions/WSDLSelectionDispatchAction.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.ui.internal.refactor.actions;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.xsd.ui.internal.refactor.actions.SelectionDispatchAction;
-
-
-public class WSDLSelectionDispatchAction extends SelectionDispatchAction
-{
-	public static final String RENAME_ELEMENT = "org.eclipse.wst.wsdl.ui.refactor.rename.element"; //$NON-NLS-1$
-
-	public WSDLSelectionDispatchAction(ISelection selection)
-	{
-		super(selection);
-	}
-	
-	protected Definition getDefinition(){
-		Object model = getModel();
-		if(model instanceof Definition)
-		{
-			return (Definition) model;
-		}
-	
-		return null;
-	}
-
-	
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src-refactor/org/eclipse/wst/wsdl/ui/internal/search/IWSDLSearchConstants.java b/bundles/org.eclipse.wst.wsdl.ui/src-refactor/org/eclipse/wst/wsdl/ui/internal/search/IWSDLSearchConstants.java
deleted file mode 100644
index 9aaa516fd..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src-refactor/org/eclipse/wst/wsdl/ui/internal/search/IWSDLSearchConstants.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.ui.internal.search;
-
-import org.eclipse.wst.common.core.search.pattern.QualifiedName;
-
-
-public interface IWSDLSearchConstants {
-
-	public static final String WSDL_NAMESPACE = "http://schemas.xmlsoap.org/wsdl/";
-	public static final String XMLSCHEMA_NAMESPACE = "http://www.w3.org/2001/XMLSchema";
-	
-	public static String WSDL_CONTENT_TYPE_ID = "org.eclipse.wst.wsdl.wsdlsource";
-
-	public static final QualifiedName MESSAGE_META_NAME = new QualifiedName(
-			WSDL_NAMESPACE, "message");
-
-	public static final QualifiedName PORT_TYPE_META_NAME = new QualifiedName(
-			WSDL_NAMESPACE, "portType");
-
-	public static final QualifiedName BINDING_META_NAME = new QualifiedName(
-			WSDL_NAMESPACE, "binding");
-
-	
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src-refactor/org/eclipse/wst/wsdl/ui/internal/search/WSDLSearchContributor.java b/bundles/org.eclipse.wst.wsdl.ui/src-refactor/org/eclipse/wst/wsdl/ui/internal/search/WSDLSearchContributor.java
deleted file mode 100644
index 1b4445b41..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src-refactor/org/eclipse/wst/wsdl/ui/internal/search/WSDLSearchContributor.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.ui.internal.search;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import org.eclipse.wst.common.core.search.pattern.SearchPattern;
-import org.eclipse.wst.xml.core.internal.search.ComponentSearchContributor;
-import org.eclipse.wst.xml.core.internal.search.XMLSearchPattern;
-import org.eclipse.wst.xsd.ui.internal.search.IXSDSearchConstants;
-
-public class WSDLSearchContributor extends ComponentSearchContributor {
-
-
-	protected void initializeDeclarations() {
-
-		declarations = new HashMap();
-		String ns = IWSDLSearchConstants.WSDL_NAMESPACE;
-
-		SearchPattern pattern = new XMLSearchPattern(ns, "message", "name");
-		declarations.put(IWSDLSearchConstants.MESSAGE_META_NAME, pattern);
-
-		pattern = new XMLSearchPattern( ns, "portType", "name");
-		declarations.put(IWSDLSearchConstants.PORT_TYPE_META_NAME, pattern);
-
-		pattern = new XMLSearchPattern(ns, "binding", "name");
-		declarations.put(IWSDLSearchConstants.BINDING_META_NAME, pattern);
-
-	}
-
-	protected void  initializeReferences() {
-
-		references = new HashMap();
-		String ns = IWSDLSearchConstants.WSDL_NAMESPACE;
-
-		List patterns = new ArrayList();
-		patterns.add(new XMLSearchPattern( ns, "part", "element"));
-		references.put(IXSDSearchConstants.ELEMENT_META_NAME, patterns);
-
-		patterns = new ArrayList();
-		patterns.add(new XMLSearchPattern(ns, "part", "type"));
-		references.put(IXSDSearchConstants.COMPLEX_TYPE_META_NAME, patterns);
-
-		patterns = new ArrayList();
-		patterns.add(new XMLSearchPattern(ns, "part", "type"));
-		references.put(IXSDSearchConstants.SIMPLE_TYPE_META_NAME, patterns);
-
-		patterns = new ArrayList();
-		patterns.add(new XMLSearchPattern(ns, "input", "message"));
-		patterns.add(new XMLSearchPattern(ns, "output", "message"));
-		patterns.add(new XMLSearchPattern(ns, "fault", "message"));
-		references.put(IWSDLSearchConstants.MESSAGE_META_NAME, patterns);
-
-		patterns = new ArrayList();
-		patterns.add(new XMLSearchPattern(ns, "binding", "type"));
-		references.put(IWSDLSearchConstants.PORT_TYPE_META_NAME, patterns);
-
-		patterns = new ArrayList();
-		patterns.add(new XMLSearchPattern( ns, "port", "binding"));
-		references.put(IWSDLSearchConstants.BINDING_META_NAME, patterns);
-	}
-	
-	protected void initializeSupportedNamespaces() {
-		namespaces = new String[]{ IXSDSearchConstants.XMLSCHEMA_NAMESPACE, IWSDLSearchConstants.WSDL_NAMESPACE};
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src-refactor/org/eclipse/wst/wsdl/ui/internal/search/WSDLSearchParticipant.java b/bundles/org.eclipse.wst.wsdl.ui/src-refactor/org/eclipse/wst/wsdl/ui/internal/search/WSDLSearchParticipant.java
deleted file mode 100644
index 40041e574..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src-refactor/org/eclipse/wst/wsdl/ui/internal/search/WSDLSearchParticipant.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.ui.internal.search;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.wst.common.core.search.SearchParticipant;
-import org.eclipse.wst.common.core.search.SearchPlugin;
-import org.eclipse.wst.common.core.search.pattern.SearchPattern;
-import org.eclipse.wst.xml.core.internal.search.ComponentSearchContributor;
-import org.eclipse.wst.xml.core.internal.search.XMLComponentDeclarationPattern;
-import org.eclipse.wst.xml.core.internal.search.XMLComponentReferencePattern;
-import org.eclipse.wst.xml.core.internal.search.XMLComponentSearchPattern;
-import org.eclipse.wst.xml.core.internal.search.XMLSearchParticipant;
-import org.eclipse.wst.xml.core.internal.search.XMLSearchPattern;
-import org.eclipse.wst.xsd.ui.internal.search.IXSDSearchConstants;
-
-public class WSDLSearchParticipant extends XMLSearchParticipant {
-	
-	private static String ID = "org.eclipse.wst.wsdl.search.WSDLSearchParticipant";
-	private static String XSD_PARTICIPANNT_ID = "org.eclipse.wst.xsd.search.XSDSearchParticipant";
-
-	
-	public WSDLSearchParticipant()
-	{
-	  super();
-      id = ID;
-	}
-	
-	public String[] getSupportedContentTypes()
-	{
-	  String[] result = { "org.eclipse.wst.wsdl.wsdlsource" };
-	  return result;
-	}
-	
-	public boolean isApplicable(SearchPattern pattern, Map searchOptions)
-	{
-		if(pattern instanceof XMLComponentSearchPattern ){
-			XMLComponentSearchPattern componentPattern = (XMLComponentSearchPattern)pattern;
-			String namespace = componentPattern.getMetaName().getNamespace();
-			if(IWSDLSearchConstants.WSDL_NAMESPACE.equals(namespace) ||
-					IXSDSearchConstants.XMLSCHEMA_NAMESPACE.equals(namespace)){
-				return true;
-			}
-		}
-		return false;
-	}	
-	
-	public ComponentSearchContributor getSearchContributor() {
-
-		return new WSDLSearchContributor();
-	}
-	
-  public void beginSearching(SearchPattern pattern, Map searchOptions) {
-		
-		super.beginSearching(pattern, searchOptions);
-		List patterns = new ArrayList();
-		if(pattern instanceof XMLComponentDeclarationPattern){
-			
-			XMLComponentDeclarationPattern componentPattern = (XMLComponentDeclarationPattern)pattern;
-			if(IWSDLSearchConstants.WSDL_NAMESPACE.equals(componentPattern.getMetaName().getNamespace())){
-				XMLSearchPattern childPattern = getSearchContributor().getDeclarationPattern(componentPattern.getMetaName());
-				if(childPattern != null){
-					childPattern.setSearchName(componentPattern.getName().getLocalName());
-					childPattern.setSearchNamespace(componentPattern.getName().getNamespace());
-	     			patterns.add(childPattern);
-				}
-			}
-			else if(IXSDSearchConstants.XMLSCHEMA_NAMESPACE.equals(componentPattern.getMetaName().getNamespace())){
-				SearchParticipant xsdParticipant = SearchPlugin.getDefault().getSearchParticipant(XSD_PARTICIPANNT_ID);
-				if(xsdParticipant instanceof XMLSearchParticipant){
-					ComponentSearchContributor xsdContributor = ((XMLSearchParticipant)xsdParticipant).getSearchContributor();
-					if(xsdContributor != null){
-						XMLSearchPattern childPattern = xsdContributor.getDeclarationPattern(componentPattern.getMetaName());
-						if(childPattern != null){
-							childPattern.setSearchName(componentPattern.getName().getLocalName());
-							childPattern.setSearchNamespace(componentPattern.getName().getNamespace());
-			     			patterns.add(childPattern);
-						}
-					}
-				}
-			}
-			componentPattern.setChildren((XMLSearchPattern[]) patterns.toArray(new XMLSearchPattern[patterns.size()]));
-			
-		}
-		else if(pattern instanceof XMLComponentReferencePattern){
-			XMLComponentReferencePattern componentPattern = (XMLComponentReferencePattern)pattern;
-			XMLSearchPattern[] childPatterns = getSearchContributor().getReferencesPatterns(componentPattern.getMetaName());
-			for (int i = 0; i < childPatterns.length; i++) {
-				XMLSearchPattern childPattern = childPatterns[i];
-				childPattern.setSearchName(componentPattern.getName().getLocalName());
-				childPattern.setSearchNamespace(componentPattern.getName().getNamespace());	
-				patterns.add(childPattern);
-			}
-			SearchParticipant xsdParticipant = SearchPlugin.getDefault().getSearchParticipant(XSD_PARTICIPANNT_ID);
-			if(xsdParticipant instanceof XMLSearchParticipant){
-				ComponentSearchContributor xsdContributor = ((XMLSearchParticipant)xsdParticipant).getSearchContributor();
-				if(xsdContributor != null){
-					childPatterns = xsdContributor.getReferencesPatterns(componentPattern.getMetaName());
-					for (int i = 0; i < childPatterns.length; i++) {
-						XMLSearchPattern childPattern = childPatterns[i];
-						childPattern.setSearchName(componentPattern.getName().getLocalName());
-						childPattern.setSearchNamespace(componentPattern.getName().getNamespace());		
-						patterns.add(childPattern);
-					}
-				}
-			}
-			componentPattern.setChildren((XMLSearchPattern[]) patterns.toArray(new XMLSearchPattern[patterns.size()]));
-			
-		}
-		
-	}
-
-  
-  
-	
-	
-	
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src-validation/org/eclipse/wst/wsdl/ui/internal/validation/ValidateWSDLAction.java b/bundles/org.eclipse.wst.wsdl.ui/src-validation/org/eclipse/wst/wsdl/ui/internal/validation/ValidateWSDLAction.java
deleted file mode 100644
index 3a3d4c2d7..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src-validation/org/eclipse/wst/wsdl/ui/internal/validation/ValidateWSDLAction.java
+++ /dev/null
@@ -1,491 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.ui.internal.validation;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ResourceBundle;
-import java.util.Set;
-
-import org.apache.xerces.xni.grammars.XMLGrammarPool;
-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.Constants;
-import org.eclipse.wst.wsdl.validation.internal.IValidationMessage;
-import org.eclipse.wst.wsdl.validation.internal.IValidationReport;
-import org.eclipse.wst.wsdl.validation.internal.ValidationMessageImpl;
-import org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLValidator;
-import org.eclipse.wst.wsdl.validation.internal.xml.XMLMessageInfoHelper;
-import org.eclipse.wst.xml.ui.internal.validation.core.ValidateAction;
-
-/**
- * Eclipse action for running the WSDL validator. 
- */
-public class ValidateWSDLAction extends ValidateAction
-{
- // private static final String REFERENCED_FILE_ERROR_OPEN = "referencedFileError(";
-
-  //private static final String REFERENCED_FILE_ERROR_CLOSE = ")";
-  private final String FILE_PROTOCOL = "file:///";
-
-  //private static final String _UI_SAVE_DIRTY_FILE_MESSAGE = "_UI_SAVE_DIRTY_FILE_MESSAGE";
-
-  //private static final String _UI_SAVE_DIRTY_FILE_TITLE = "_UI_SAVE_DIRTY_FILE_TITLE";
-  //private static final String _UI_REF_FILE_ERROR_MESSAGE = "_UI_REF_FILE_ERROR_MESSAGE";
-  //private static final String NESTED_ERRORS = "NESTED_ERRORS";
-
-  private InputStream inputStream = null;
-  
-  private XMLGrammarPool schemaGrammarPool = null;
-  private XMLGrammarPool xmlGrammarPool = null;
-  
-  private static ResourceBundle wsdlActionRB = ResourceBundle.getBundle("org.eclipse.wst.wsdl.ui.internal.validation.validatewsdlui");
-  /**
-   * 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);
-  }
-  
-  public void setSchemaGrammarPool(XMLGrammarPool grammarPool)
-  {
-	this.schemaGrammarPool = grammarPool;
-  }
-  
-  public void setXMLGrammarPool(XMLGrammarPool grammarPool)
-  {
-	this.xmlGrammarPool = grammarPool;
-  }
-
-
-  /**
-   * 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();
-        wsdlValidator.setAttribute(Constants.XMLSCHEMA_CACHE_ATTRIBUTE, schemaGrammarPool);
-        wsdlValidator.setAttribute(Constants.XML_CACHE_ATTRIBUTE, xmlGrammarPool);
-        clearMarkers(file);
-        IValidationReport valReport = null;
-
-        String location = null;
-        try
-        {
-          location = file.getLocation().toFile().getCanonicalFile().getAbsolutePath();
-        }
-        catch (IOException e)
-        {
-          location = file.getLocation().toString();
-        }
-        location = location.replace('\\','/');
-        if (location.startsWith("/"))
-        {
-          valReport = wsdlValidator.validate(FILE_PROTOCOL + location.substring(1), inputStream);
-        }
-        else
-        {
-          valReport = wsdlValidator.validate(FILE_PROTOCOL + location, inputStream);
-        }
-        // Need to remove the grammar pool when finished validating.
-        wsdlValidator.setAttribute(Constants.XMLSCHEMA_CACHE_ATTRIBUTE, null);
-        wsdlValidator.setAttribute(Constants.XML_CACHE_ATTRIBUTE, null);
-        
-        validationOutcome.isWSDLValid = valReport.isWSDLValid();
-        validationOutcome.isValid = !valReport.hasErrors();
-        if (valReport.getValidationMessages().length == 0)
-        {
-          validationOutcome.hasMessages = false;
-        }
-        else
-        {
-          validationOutcome.hasMessages = true;
-        }
-
-        createMarkers(file, convertValidationMessages(valReport.getValidationMessages()));
-        //createMarkers(file, validatormanager.getWarningList(), WARNING_MARKER);
-        
-        //file.setSessionProperty(ValidationMessage.ERROR_MESSAGE_MAP_QUALIFIED_NAME, valReport.getNestedMessages());
-        file.setSessionProperty(org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage.ERROR_MESSAGE_MAP_QUALIFIED_NAME, convertNestedValidationMessages(valReport.getNestedMessages()));
-      }
-    };
-
-    try
-    {
-      ResourcesPlugin.getWorkspace().run(op, null);
-
-      if (showDialog)
-      {
-        showDialog(validationOutcome);
-      }
-    }
-    catch (Exception e)
-    {
-      e.printStackTrace();
-    }
-  }
-  
-  /**
-   * Convert WSDL validation messages to validation framework messages.
-   * 
-   * @param messages The WSDL validation messages to convert.
-   * @return The converted validation messages.
-   */
-  private org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage[] convertValidationMessages(IValidationMessage[] messages)
-  {
-  	int numMessages = messages.length;
-  	org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage[] convertedMessages = new org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage[numMessages];
-  	
-  	for(int i = 0; i < numMessages; i++)
-  	{
-  	  IValidationMessage mess = messages[i];
-      
-      org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage convertMess = null;
-      if (mess instanceof ValidationMessageImpl)
-      {   String errorKey = ((ValidationMessageImpl)mess).getErrorKey();
-          Object[] messageArgs = ((ValidationMessageImpl)mess).getMessageArguments();
-          convertMess = new org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage(mess.getMessage(), mess.getLine(), mess.getColumn(), mess.getURI(), errorKey, messageArgs);
-      }
-      else
-      {
-         convertMess = new org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage(mess.getMessage(),mess.getLine(),mess.getColumn(), mess.getURI());
-      }
-  	  if(mess.getSeverity() == IValidationMessage.SEV_WARNING)
-	  {
-	  	convertMess.setSeverity(org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage.SEV_LOW);
-	  }
-	  else
-	  {
-	  	convertMess.setSeverity(org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage.SEV_HIGH);
-	  }
-  	  
-  	  // Convert any nested messages.
-  	  List nestedMessages = mess.getNestedMessages();
-  	  if(nestedMessages != null && !nestedMessages.isEmpty())
-  	  {
-  	  	Iterator nestedIter = nestedMessages.iterator();
-  	    while(nestedIter.hasNext())
-        {
-          IValidationMessage nestedMess = (IValidationMessage)nestedIter.next();
-    	  org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage convertNestedMess = new org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage(nestedMess.getMessage(),nestedMess.getLine(),nestedMess.getColumn(), nestedMess.getURI());
-    	  if(nestedMess.getSeverity() == IValidationMessage.SEV_WARNING)
-    	  {
-    	  	convertNestedMess.setSeverity(org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage.SEV_LOW);
-    	  }
-    	  else
-    	  {
-    	  	convertNestedMess.setSeverity(org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage.SEV_HIGH);
-    	  }
-    	  convertMess.addNestedMessage(convertNestedMess);
-        }
-  	  }
-  	  convertedMessages[i] = convertMess;
-  	}
-  	return convertedMessages;
-  }
-  
-  /**
-   * Convert the nested messages hashmap.
-   * 
-   * @param nestedMessages The nested messages hashmap to convert.
-   * @return A hashmap with the converted validation messages.
-   */
-  private HashMap convertNestedValidationMessages(HashMap nestedMessages)
-  {
-  	HashMap convertedMap = new HashMap();
-  	
-  	Set keySet = nestedMessages.keySet();
-  	Iterator keysIter = keySet.iterator();
-  	while(keysIter.hasNext())
-  	{
-  	  String key = (String)keysIter.next();
-  	  IValidationMessage message = (IValidationMessage)nestedMessages.get(key);
-  	  org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage[] convertedMessage = convertValidationMessages(new IValidationMessage[]{message});
-  	  
-  	  convertedMap.put(key, convertedMessage[0]);
-  	}
-  	return convertedMap;
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.jface.action.IAction#run()
-   */
-//  public void run()
-//  {
-//    // Only run the validation if the file exists and is available.
-//    if (fileIsOK(file))
-//    {
-//      if (showDialog)
-//      {
-//        // Check if the file is dirty - prompts user to save.
-//        checkIfFileDirty(file);
-//      }
-//      super.run();
-//    }
-//  }
-
-  /**
-   * Test whether the file given is OK to use. A file is OK to use if 1. It is
-   * not null 2. It exists. 3. The project containing the file is accessible.
-   * 
-   * @param file The file to check to see if it is OK to validate.
-   * @return True if the file is OK to validate, false otherwise.
-   */
-//  protected boolean fileIsOK(IFile file)
-//  {
-//    if (file != null && file.exists() && file.getProject().isAccessible())
-//    {
-//      return true;
-//    }
-//    return false;
-//  }
-
-  /**
-   * Check if the file is dirty. A file is dirty if there is an open editor for
-   * the file that contains changes that haven't been saved.
-   * 
-   * @param file The file to check to see if it is dirty.
-   */
-//  protected void checkIfFileDirty(IFile file)
-//  {
-//    IEditorPart[] dirtyEditors = ValidateWSDLPlugin.getInstance().getWorkbench().getActiveWorkbenchWindow().getActivePage().getDirtyEditors();
-//
-//    int numeditors = dirtyEditors.length;
-//    for (int i = 0; i < numeditors; i++)
-//    {
-//      IEditorInput editorInput = dirtyEditors[i].getEditorInput();
-//      if (editorInput instanceof FileEditorInput)
-//      {
-//        FileEditorInput fileEditorInput = (FileEditorInput) editorInput;
-//        if (fileEditorInput.getFile().equals(file))
-//        {
-//          String message = ValidateWSDLPlugin.getInstance().getString(_UI_SAVE_DIRTY_FILE_MESSAGE);
-//          String title = ValidateWSDLPlugin.getInstance().getString(_UI_SAVE_DIRTY_FILE_TITLE);
-//          if (MessageDialog.openQuestion(Display.getDefault().getActiveShell(), title, message))
-//          {
-//            dirtyEditors[i].doSave(null);
-//          }
-//          // There can only be one open editor/file so we can break.
-//          break;
-//        }
-//      }
-//
-//    }
-//  }
-
-  /**
-   * Create a marker on the file of the indicated type for each
-   * ValidationMessage in the array.
-   * 
-   * @param iFile
-   *          The file to add the markers to.
-   * @param valMessages
-   *          The array of messages to add as markers.
-   */
-//  public void createMarkers(IFile iFile, ValidationMessage[] valMessages)
-//  {
-//    if (!fileIsOK(iFile))
-//    {
-//      return;
-//    }
-//    int numValMessages = valMessages.length;
-//    for (int i = 0; i < numValMessages; i++)
-//    {
-//      ValidationMessage validationMessage = valMessages[i];
-//
-//      int line = validationMessage.getLine();
-//      int column = validationMessage.getColumn();
-//      String message = validationMessage.getMessage();
-//      int severity = validationMessage.getSeverity();
-//      IMarker marker = null;
-//      
-//      boolean hasNestedErrors = false;
-//      List nestederrors = validationMessage.getNestedMessages();
-//      if(nestederrors != null && !nestederrors.isEmpty())
-//      {
-//        hasNestedErrors = true;
-//        message += ValidateWSDLPlugin.getInstance().getString(_UI_REF_FILE_ERROR_MESSAGE); 
-//      }
-//      if (severity == ValidationMessage.SEV_ERROR)
-//      {
-//        marker = getOrCreateReporter().addErrorMessage(iFile, message, line, column);
-//      }
-//      else if (severity == ValidationMessage.SEV_WARNING)
-//      {
-//        marker = getOrCreateReporter().addWarningMessage(iFile, message, line, column);
-//      }
-//      
-//      if (hasNestedErrors && marker != null)
-//      {
-//        try
-//        {
-//          marker.setAttribute("groupName", REFERENCED_FILE_ERROR_OPEN + validationMessage.getURI() + REFERENCED_FILE_ERROR_CLOSE);
-//          marker.setAttribute(IMarker.DONE, true);
-//        }
-//        catch(CoreException e)
-//        {
-//        }
-//      }
-//      
-//    }
-//  }
-
-  /**
-   * Show a dialog containing the status of the validation. Will display valid
-   * or invalid depending on whether there are errors or not.
-   * 
-   * @param validationOutcome
-   *          The outcome of the validation.
-   */
-  public void showDialog(ValidationOutcome validationOutcome)
-  {
-    String title, message;
-    if (validationOutcome.isValid)
-    {
-      if (validationOutcome.hasMessages)
-      {
-        showProblemsView();
-        title = wsdlActionRB.getString("_VALIDATION_SUCCEEDED");
-        message = wsdlActionRB.getString("_UI_THE_WSDL_FILE_IS_VALID_WITH_WARNINGS");
-        MessageDialog.openWarning(Display.getDefault().getActiveShell(), title, message);
-      }
-      else
-      {
-        title = wsdlActionRB.getString("_VALIDATION_SUCCEEDED");
-        message = wsdlActionRB.getString("_UI_THE_WSDL_FILE_IS_VALID");
-        MessageDialog.openInformation(Display.getDefault().getActiveShell(), title, message);
-      }
-
-    }
-    else
-    {
-      if (validationOutcome.isWSDLValid)
-      {
-        title = wsdlActionRB.getString("_VALIDATION_FAILED");
-        message = wsdlActionRB.getString("_UI_THE_WSDL_FILE_IS_VALID_WSDL11");
-      }
-      else
-      {
-        title = wsdlActionRB.getString("_VALIDATION_FAILED");
-        message = wsdlActionRB.getString("_UI_THE_WSDL_FILE_IS_NOT_VALID");
-      }
-      showProblemsView();
-      MessageDialog.openError(Display.getDefault().getActiveShell(), title, message);
-    }
-
-  }
-  
-  /**
-   * Show the problems view if it is not already visible.
-   */
-//  protected void showProblemsView()
-//  {
-//    IWorkbenchWindow dw = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-//    IWorkbenchPage page = dw.getActivePage();
-//    IWorkbenchPart activePart = page.getActivePart();
-//    try
-//    {
-//      if (page != null)
-//      {
-//        page.showView("org.eclipse.ui.views.ProblemView");
-//      }
-//    }
-//    catch (PartInitException e)
-//    {
-//    }
-//    page.activate(activePart);
-//  }
-
-  /**
-   * If a reporter doesn't exist creates it or uses the reporter already
-   * created.
-   * 
-   * @return a reporter
-   */
-//  protected IReporter getOrCreateReporter()
-//  {
-//    if (reporter == null)
-//    {
-//      reporter = new WorkbenchReporter(file.getProject(), new NullProgressMonitor());
-//    }
-//    return reporter;
-//  }
-
-  /**
-   * Clear all the markers on the given resource generated by this validator.
-   * 
-   * @param resource -
-   *          the resrouce to clear all the markers from
-   */
-//  public void clearMarkers(IResource resource)
-//  {
-//    getOrCreateReporter().removeAllMessages(resource);
-//  }
-
-  protected class ValidationOutcome
-  {
-    public boolean isValid = true;
-
-    public boolean isWSDLValid = true;
-
-    public boolean hasMessages = false;
-
-    public ValidationOutcome()
-    {
-    }
-  }
-
-  public void setInputStream(InputStream inputStream)
-  {  this.inputStream = inputStream;
-  }
-  
-  /**
-   * Set extra attributes in the IMessage to provide information on what should be "squiggled"
-   * @param valMess the ValidationMessage corresponding to this error
-   * @param message the IMessage to set the attributes for
-   */
-  protected void addInfoToMessage(org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage valMess, IMessage message)
-  {   if (valMess.getKey() != null)
-      {
-          XMLMessageInfoHelper helper = new XMLMessageInfoHelper();
-          String[] squiggleInfo = helper.createMessageInfo(valMess.getKey(), valMess.getMessageArguments());
-      
-          message.setAttribute(COLUMN_NUMBER_ATTRIBUTE, new Integer(valMess.getColumnNumber()));
-          message.setAttribute(SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE, squiggleInfo[0]);
-          message.setAttribute(SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE, squiggleInfo[1]);
-      }
-  }
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src-validation/org/eclipse/wst/wsdl/ui/internal/validation/ValidateWSDLActionDelegate.java b/bundles/org.eclipse.wst.wsdl.ui/src-validation/org/eclipse/wst/wsdl/ui/internal/validation/ValidateWSDLActionDelegate.java
deleted file mode 100644
index 0c05a0041..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src-validation/org/eclipse/wst/wsdl/ui/internal/validation/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.ui.internal.validation;
-
-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.ui/src-validation/org/eclipse/wst/wsdl/ui/internal/validation/Validator.java b/bundles/org.eclipse.wst.wsdl.ui/src-validation/org/eclipse/wst/wsdl/ui/internal/validation/Validator.java
deleted file mode 100644
index 7e4c01bc4..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src-validation/org/eclipse/wst/wsdl/ui/internal/validation/Validator.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.ui.internal.validation;
-
-import java.io.InputStream;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.xerces.util.XMLGrammarPoolImpl;
-import org.apache.xerces.xni.grammars.XMLGrammarPool;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.operations.IRuleGroup;
-import org.eclipse.wst.validation.internal.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.wsdl.validation.internal.eclipse.InlineSchemaModelGrammarPoolImpl;
-import org.eclipse.wst.xml.core.internal.validation.core.Helper;
-
-
-/**
- * A validator to plug the WSDL validator into the validation framework.
- */
-public class Validator implements IValidator
-{
-
-  /**
-   * Validate the given IFile.
-   * 
-   * @param file
-   *          The file to validate.
-   */
-//  public void validate(IFile file)
-//  {
-//    ValidateWSDLAction validateAction = new ValidateWSDLAction(file, false);
-//    validateAction.setValidator(this);
-//    validateAction.run();
-//  }
-  
-  protected void validate(IFile file, InputStream inputStream, IReporter reporter, XMLGrammarPool xmlGrammarPool, XMLGrammarPool xsdGrammarPool)
-  {
-    ValidateWSDLAction validateAction = new ValidateWSDLAction(file, false);
-    validateAction.setSchemaGrammarPool(xsdGrammarPool);
-    validateAction.setXMLGrammarPool(xsdGrammarPool);
-    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
-  {
-	XMLGrammarPool xsdGrammarPool = new InlineSchemaModelGrammarPoolImpl();
-	XMLGrammarPool xmlGrammarPool = new XMLGrammarPoolImpl();
-	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, xmlGrammarPool, xsdGrammarPool);
-        
-      } else
-      { for (int i = 0; i < changedFiles.length; i++)
-        {
-          String fileName = changedFiles[i];
-          if (fileName != null)
-          {
-            Object[] parms = {fileName};
-            
-            IFile file = (IFile) helper.loadModel(Helper.GET_FILE, parms);
-            if (file != null)
-            {
-              validateIfNeeded(file, helper, reporter, xmlGrammarPool, xsdGrammarPool);
-            }
-          }
-        }
-      }
-    } 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, xmlGrammarPool, xsdGrammarPool);
-      }
-    }
-    xsdGrammarPool.clear();
-    xmlGrammarPool.clear();
-    xsdGrammarPool = null;
-    xmlGrammarPool = null;
-  }
-
-  /**
-   * @param file
-   * @param reporter
-   * @param ruleGroup
-   */
-  protected void validate(IFile file, IReporter reporter, int ruleGroup, XMLGrammarPool xmlGrammarPool, XMLGrammarPool xsdGrammarPool)
-  {
-    ValidateWSDLAction validateAction = new ValidateWSDLAction(file, false);
-    validateAction.setSchemaGrammarPool(xsdGrammarPool);
-    validateAction.setXMLGrammarPool(xmlGrammarPool);
-    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, XMLGrammarPool xmlGrammarPool, XMLGrammarPool xsdGrammarPool)
-  {
-    //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, xmlGrammarPool, xsdGrammarPool);
-  }
-
-  /*
-   * (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.ui/src-validation/org/eclipse/wst/wsdl/ui/internal/validation/validatewsdlui.properties b/bundles/org.eclipse.wst.wsdl.ui/src-validation/org/eclipse/wst/wsdl/ui/internal/validation/validatewsdlui.properties
deleted file mode 100644
index e8dc95dc6..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src-validation/org/eclipse/wst/wsdl/ui/internal/validation/validatewsdlui.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-!-- 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.
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/Logger.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/Logger.java
deleted file mode 100644
index c554e6079..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/Logger.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal;
-
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.Bundle;
-
-/**
- * Small convenience class to log messages to plugin's log file and also, if
- * desired, the console. This class should only be used by classes in this
- * plugin. Other plugins should make their own copy, with appropriate ID.
- */
-public class Logger {
-	private static final String PLUGIN_ID = "org.eclipse.wst.wsdl.ui"; //$NON-NLS-1$
-	
-	public static final int ERROR = IStatus.ERROR; // 4
-	public static final int ERROR_DEBUG = 200 + ERROR;
-	public static final int INFO = IStatus.INFO; // 1
-	public static final int INFO_DEBUG = 200 + INFO;
-
-	public static final int OK = IStatus.OK; // 0
-
-	public static final int OK_DEBUG = 200 + OK;
-
-	private static final String TRACEFILTER_LOCATION = "/debug/tracefilter"; //$NON-NLS-1$
-	public static final int WARNING = IStatus.WARNING; // 2
-	public static final int WARNING_DEBUG = 200 + WARNING;
-
-	/**
-	 * Adds message to log.
-	 * 
-	 * @param level
-	 *            severity level of the message (OK, INFO, WARNING, ERROR,
-	 *            OK_DEBUG, INFO_DEBUG, WARNING_DEBUG, ERROR_DEBUG)
-	 * @param message
-	 *            text to add to the log
-	 * @param exception
-	 *            exception thrown
-	 */
-	protected static void _log(int level, String message, Throwable exception) {
-		if (level == OK_DEBUG || level == INFO_DEBUG || level == WARNING_DEBUG || level == ERROR_DEBUG) {
-			if (!isDebugging())
-				return;
-		}
-
-		int severity = IStatus.OK;
-		switch (level) {
-			case INFO_DEBUG :
-			case INFO :
-				severity = IStatus.INFO;
-				break;
-			case WARNING_DEBUG :
-			case WARNING :
-				severity = IStatus.WARNING;
-				break;
-			case ERROR_DEBUG :
-			case ERROR :
-				severity = IStatus.ERROR;
-		}
-		message = (message != null) ? message : "null"; //$NON-NLS-1$
-		Status statusObj = new Status(severity, PLUGIN_ID, severity, message, exception);
-		Bundle bundle = Platform.getBundle(PLUGIN_ID);
-		if (bundle != null) 
-			Platform.getLog(bundle).log(statusObj);
-	}
-
-	/**
-	 * Prints message to log if category matches /debug/tracefilter option.
-	 * 
-	 * @param message
-	 *            text to print
-	 * @param category
-	 *            category of the message, to be compared with
-	 *            /debug/tracefilter
-	 */
-	protected static void _trace(String category, String message, Throwable exception) {
-		if (isTracing(category)) {
-			message = (message != null) ? message : "null"; //$NON-NLS-1$
-			Status statusObj = new Status(IStatus.OK, PLUGIN_ID, IStatus.OK, message, exception);
-			Bundle bundle = Platform.getBundle(PLUGIN_ID);
-			if (bundle != null) 
-				Platform.getLog(bundle).log(statusObj);
-		}
-	}
-
-	/**
-	 * @return true if the platform is debugging
-	 */
-	public static boolean isDebugging() {
-		return Platform.inDebugMode();
-	}
-
-	/**
-	 * Determines if currently tracing a category
-	 * 
-	 * @param category
-	 * @return true if tracing category, false otherwise
-	 */
-	public static boolean isTracing(String category) {
-		if (!isDebugging())
-			return false;
-
-		String traceFilter = Platform.getDebugOption(PLUGIN_ID + TRACEFILTER_LOCATION);
-		if (traceFilter != null) {
-			StringTokenizer tokenizer = new StringTokenizer(traceFilter, ","); //$NON-NLS-1$
-			while (tokenizer.hasMoreTokens()) {
-				String cat = tokenizer.nextToken().trim();
-				if (category.equals(cat)) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	public static void log(int level, String message) {
-		_log(level, message, null);
-	}
-
-	public static void log(int level, String message, Throwable exception) {
-		_log(level, message, exception);
-	}
-
-	public static void logException(String message, Throwable exception) {
-		_log(ERROR, message, exception);
-	}
-
-	public static void logException(Throwable exception) {
-		_log(ERROR, exception.getMessage(), exception);
-	}
-
-	public static void trace(String category, String message) {
-		_trace(category, message, null);
-	}
-
-	public static void traceException(String category, String message, Throwable exception) {
-		_trace(category, message, exception);
-	}
-
-	public static void traceException(String category, Throwable exception) {
-		_trace(category, exception.getMessage(), exception);
-	}
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/StructuredTextViewerConfigurationWSDL.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/StructuredTextViewerConfigurationWSDL.java
deleted file mode 100644
index bf9327fa8..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/StructuredTextViewerConfigurationWSDL.java
+++ /dev/null
@@ -1,39 +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 Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.text.hyperlink.IHyperlinkDetector;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants;
-import org.eclipse.wst.xml.ui.StructuredTextViewerConfigurationXML;
-
-public class StructuredTextViewerConfigurationWSDL extends StructuredTextViewerConfigurationXML {
-	public IHyperlinkDetector[] getHyperlinkDetectors(ISourceViewer sourceViewer) {
-		if (sourceViewer == null || !fPreferenceStore.getBoolean(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_HYPERLINKS_ENABLED))
-			return null;
-
-		List allDetectors = new ArrayList(0);
-		// add WSDL Hyperlink detector
-		allDetectors.add(new WSDLHyperlinkDetector());
-
-		IHyperlinkDetector[] superDetectors = super.getHyperlinkDetectors(sourceViewer);
-		for (int m = 0; m < superDetectors.length; m++) {
-			IHyperlinkDetector detector = superDetectors[m];
-			if (!allDetectors.contains(detector)) {
-				allDetectors.add(detector);
-			}
-		}
-		return (IHyperlinkDetector[]) allDetectors.toArray(new IHyperlinkDetector[0]);
-	}
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLEditor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLEditor.java
deleted file mode 100644
index 91d66e573..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLEditor.java
+++ /dev/null
@@ -1,774 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.IPostSelectionProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.INavigationLocation;
-import org.eclipse.ui.INavigationLocationProvider;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.ui.texteditor.TextSelectionNavigationLocation;
-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-import org.eclipse.ui.views.properties.IPropertySheetPage;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySheetPageContributor;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-import org.eclipse.wst.sse.ui.internal.contentoutline.ConfigurableContentOutlinePage;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.wsdl.internal.generator.BindingGenerator;
-import org.eclipse.wst.wsdl.ui.internal.actions.WSDLMenuActionContributor;
-import org.eclipse.wst.wsdl.ui.internal.dialogs.GenerateBindingOnSaveDialog;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtension;
-import org.eclipse.wst.wsdl.ui.internal.graph.WSDLGraphViewer;
-import org.eclipse.wst.wsdl.ui.internal.graph.editparts.WSDLEditPartFactory;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLModelAdapterFactory;
-import org.eclipse.wst.wsdl.ui.internal.outline.ModelAdapterContentProvider;
-import org.eclipse.wst.wsdl.ui.internal.outline.ModelAdapterLabelProvider;
-import org.eclipse.wst.wsdl.ui.internal.properties.section.WSDLTabbedPropertySheetPage;
-import org.eclipse.wst.wsdl.ui.internal.text.WSDLModelAdapter;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLNodeAssociationProvider;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLResourceUtil;
-import org.eclipse.wst.wsdl.ui.internal.viewers.WSDLDetailsViewer;
-import org.eclipse.wst.wsdl.ui.internal.viewers.WSDLDetailsViewerProvider;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-// public class WSDLEditor extends StructuredTextMultiPageEditorPart
-// implements
-// INavigationLocationProvider
-public class WSDLEditor extends WSDLMultiPageEditorPart implements INavigationLocationProvider, ITabbedPropertySheetPageContributor {
-	protected StructuredTextEditor textEditor;
-	protected WSDLGraphViewer graphViewer;
-	protected WSDLDetailsViewer detailsViewer;
-	protected WSDLSelectionManager selectionManager;
-	protected SashForm sashForm;
-	int graphPageIndex;
-	protected WSDLModelAdapter modelAdapter;
-	protected WSDLEditorResourceChangeHandler resourceChangeHandler;
-	// Used for Cut, Copy, Paste actions. This acts as a copy, cut, paste
-	// clipboard
-	protected WSDLElement clipboardElement;
-	private IPropertySheetPage fPropertySheetPage;
-	private IContentOutlinePage fContentOutlinePage;
-	private SourceEditorSelectionListener fSourceEditorSelectionListener;
-	private WSDLSelectionManagerSelectionListener fWSDLSelectionListener;
-
-	/**
-	 * Listener on SSE's outline page's selections that converts DOM
-	 * selections into wsdl selections and notifies WSDL selection manager
-	 */
-	class OutlineTreeSelectionChangeListener implements ISelectionChangedListener, IDoubleClickListener {
-		private ISelectionProvider fProvider = null;
-
-		public OutlineTreeSelectionChangeListener() {
-			super();
-		}
-		
-		void connect(IContentOutlinePage provider) {
-			fProvider = provider;
-			fProvider.addSelectionChangedListener(OutlineTreeSelectionChangeListener.this);
-			if (provider instanceof ConfigurableContentOutlinePage) {
-				((ConfigurableContentOutlinePage) provider).addDoubleClickListener(OutlineTreeSelectionChangeListener.this);
-			}
-		}
-		
-		void disconnect() {
-			fProvider.removeSelectionChangedListener(OutlineTreeSelectionChangeListener.this);
-			if (fProvider instanceof ConfigurableContentOutlinePage) {
-				((ConfigurableContentOutlinePage) fProvider).removeDoubleClickListener(OutlineTreeSelectionChangeListener.this);
-			}
-			fProvider = null;
-		}
-
-		private ISelection getWSDLSelection(ISelection selection) {
-			ISelection sel = null;
-			if (selection instanceof IStructuredSelection) {
-				IStructuredSelection structuredSelection = (IStructuredSelection) selection;
-				Object o = structuredSelection.getFirstElement();
-
-				// TODO ...
-				// we need to implement a selectionManagerMapping
-				// extension point
-				// so that extensions can specify how they'd like to map
-				// view objects
-				// to selection objects
-				//                                        
-				// if (o instanceof Element)
-				// {
-				// try
-				// {
-				// Object modelObject =
-				// WSDLEditorUtil.getInstance().findModelObjectForElement(wsdlEditor.getDefinition(),
-				// (Element)o);
-				// if (modelObject != null && !(modelObject instanceof
-				// UnknownExtensibilityElement))
-				// {
-				// o = modelObject;
-				// }
-				// }
-				// catch (Exception e)
-				// {
-				// }
-				// }
-				if (o != null)
-					sel = new StructuredSelection(o);
-			}
-			return sel;
-		}
-
-		public void doubleClick(DoubleClickEvent event) {
-			/*
-			 * Selection in outline tree changed so set outline tree's
-			 * selection into editor's selection and say it came from outline
-			 * tree
-			 */
-			if (getSelectionManager() != null && getSelectionManager().enableNotify) {
-				ISelection selection = getWSDLSelection(event.getSelection());
-				if (selection != null) {
-					getSelectionManager().setSelection(selection, fProvider);
-				}
-
-				if(getTextEditor() != null && selection instanceof IStructuredSelection) {
-					int start = -1;
-					int length = 0;
-					Object o = ((IStructuredSelection)selection).getFirstElement();
-					if (o != null)
-						o = WSDLEditorUtil.getInstance().getNodeForObject(o);
-					if (o instanceof IndexedRegion) {
-						start = ((IndexedRegion) o).getStartOffset();
-						length = ((IndexedRegion) o).getEndOffset() - start;
-					}
-					if(start > -1) {
-						getTextEditor().selectAndReveal(start, length);
-					}
-				}
-			}
-		}
-
-		public void selectionChanged(SelectionChangedEvent event) {
-			/*
-			 * Selection in outline tree changed so set outline tree's
-			 * selection into editor's selection and say it came from outline
-			 * tree
-			 */
-			if (getSelectionManager() != null && getSelectionManager().enableNotify) {
-				ISelection selection = getWSDLSelection(event.getSelection());
-				if (selection != null) {
-					getSelectionManager().setSelection(selection, fProvider);
-				}
-			}
-		}
-	}
-	private OutlineTreeSelectionChangeListener fOutlineTreeListener = null;
-
-	/**
-	 * Listener on SSE's source editor's selections that converts DOM
-	 * selections into wsdl selections and notifies WSDL selection manager
-	 */
-	private class SourceEditorSelectionListener implements ISelectionChangedListener {
-		/**
-		 * Determines WSDL node based on object (DOM node)
-		 * 
-		 * @param object
-		 * @return
-		 */
-		private Object getWSDLNode(Object object) {
-			// get the element node
-			Element element = null;
-			if (object instanceof Node) {
-				Node node = (Node) object;
-				if (node != null) {
-					if (node.getNodeType() == Node.ELEMENT_NODE) {
-						element = (Element) node;
-					}
-					else if (node.getNodeType() == Node.ATTRIBUTE_NODE) {
-						element = ((Attr) node).getOwnerElement();
-					}
-				}
-			}
-			Object o = element;
-			if (element != null) {
-				Object modelObject = WSDLEditorUtil.getInstance().findModelObjectForElement(getDefinition(), element);
-				if (modelObject != null) {
-					o = modelObject;
-				}
-			}
-			return o;
-		}
-
-		public void selectionChanged(SelectionChangedEvent event) {
-			ISelection selection = event.getSelection();
-			if (selection instanceof IStructuredSelection) {
-				List wsdlSelections = new ArrayList();
-				for (Iterator i = ((IStructuredSelection) selection).iterator(); i.hasNext();) {
-					Object domNode = i.next();
-					Object wsdlNode = getWSDLNode(domNode);
-					if (wsdlNode != null) {
-						wsdlSelections.add(wsdlNode);
-					}
-				}
-
-				if (!wsdlSelections.isEmpty()) {
-					StructuredSelection wsdlSelection = new StructuredSelection(wsdlSelections);
-					getSelectionManager().setSelection(wsdlSelection, getTextEditor().getSelectionProvider());
-				}
-			}
-		}
-	}
-
-	/**
-	 * Listener on WSDL's selection manager's selections that converts WSDL
-	 * selections into DOM selections and notifies SSE's selection provider
-	 */
-	private class WSDLSelectionManagerSelectionListener implements ISelectionChangedListener {
-		/**
-		 * Determines DOM node based on object (wsdl node)
-		 * 
-		 * @param object
-		 * @return
-		 */
-		private Object getObjectForOtherModel(Object object) {
-			Node node = null;
-
-			if (object instanceof Node) {
-				node = (Node) object;
-			}
-			else {
-				node = WSDLEditorUtil.getInstance().getNodeForObject(object);
-			}
-
-			// the text editor can only accept sed nodes!
-			//
-			if (!(node instanceof IDOMNode)) {
-				node = null;
-			}
-			return node;
-		}
-
-		public void selectionChanged(SelectionChangedEvent event) {
-			// do not fire selection in source editor if selection event came
-			// from source editor
-			if (event.getSource() != getTextEditor().getSelectionProvider()) {
-				ISelection selection = event.getSelection();
-				if (selection instanceof IStructuredSelection) {
-					List otherModelObjectList = new ArrayList();
-					for (Iterator i = ((IStructuredSelection) selection).iterator(); i.hasNext();) {
-						Object modelObject = i.next();
-						Object otherModelObject = getObjectForOtherModel(modelObject);
-						if (otherModelObject != null) {
-							otherModelObjectList.add(otherModelObject);
-						}
-					}
-					if (!otherModelObjectList.isEmpty()) {
-						StructuredSelection nodeSelection = new StructuredSelection(otherModelObjectList);
-						getTextEditor().getSelectionProvider().setSelection(nodeSelection);
-					}
-				}
-			}
-		}
-	}
-
-	public WSDLEditor() {
-		selectionManager = new WSDLSelectionManager();
-	}
-
-	public void init(IEditorSite site, IEditorInput input) throws PartInitException {
-		super.init(site, input);
-		try {
-			IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-			IWorkbenchPage page = window.getActivePage();
-			if (page != null) {
-				page.showView("org.eclipse.ui.views.PropertySheet");
-			}
-		}
-		catch (PartInitException partInitException) {
-		}
-		catch (Exception exception) {
-		}
-	}
-
-	public Object getAdapter(Class key) {
-		Object result = null;
-		if (key == ISelectionProvider.class) {
-			result = selectionManager;
-		}
-		else if (IPropertySheetPage.class.equals(key)) {
-			if (fPropertySheetPage == null || fPropertySheetPage.getControl() == null || fPropertySheetPage.getControl().isDisposed()) {
-				fPropertySheetPage = new WSDLTabbedPropertySheetPage(this, this);
-				((WSDLTabbedPropertySheetPage) fPropertySheetPage).setSelectionManager(getSelectionManager());
-
-			}
-			return fPropertySheetPage;
-		}
-		else if (IContentOutlinePage.class.equals(key)) {
-			if (fContentOutlinePage == null || fContentOutlinePage.getControl() == null || fContentOutlinePage.getControl().isDisposed()) {
-				fContentOutlinePage = (IContentOutlinePage) super.getAdapter(key);
-				if (fContentOutlinePage != null) {
-					fOutlineTreeListener = new OutlineTreeSelectionChangeListener();
-					fOutlineTreeListener.connect(fContentOutlinePage);
-				}
-			}
-			result = fContentOutlinePage;
-		}
-		else {
-			result = super.getAdapter(key);
-		}
-		return result;
-	}
-
-	public void dispose() {
-		// call the extensibleOutlineProvider's inputChanged method a null
-		// viewer
-		// so that the outline's contentprovider/adapters don't attempt to
-		// update
-		// the viewer
-		// after the editor closes
-		// extensibleOutlineProvider.inputChanged(null, null, null);
-		if (resourceChangeHandler != null) {
-			resourceChangeHandler.dispose();
-		}
-
-		ISelectionProvider provider = getTextEditor().getSelectionProvider();
-		if (provider instanceof IPostSelectionProvider) {
-			((IPostSelectionProvider) provider).removePostSelectionChangedListener(fSourceEditorSelectionListener);
-		}
-		else {
-			provider.removeSelectionChangedListener(fSourceEditorSelectionListener);
-		}
-		if (fOutlineTreeListener != null) {
-			fOutlineTreeListener.disconnect();
-			fOutlineTreeListener = null;
-		}
-		getSelectionManager().removeSelectionChangedListener(fWSDLSelectionListener);
-		super.dispose();
-	}
-
-	public WSDLSelectionManager getSelectionManager() {
-		return selectionManager;
-	}
-
-	public WSDLGraphViewer getGraphViewer() {
-		return graphViewer;
-	}
-
-	public IStructuredModel getStructuredModel() {
-		return textEditor.getModel();
-		// IDocument doc =
-		// textEditor.getDocumentProvider().getDocument(getEditorInput());
-		// IModelManager modelManager = ModelManagerImpl.getInstance();
-		// return modelManager.getModelForRead((IStructuredDocument) doc);
-	}
-
-	public Document getXMLDocument() {
-		return ((IDOMModel) getStructuredModel()).getDocument();
-	}
-
-	public Definition getDefinition() {
-		return modelAdapter != null ? modelAdapter.getDefinition() : null;
-	}
-
-	/**
-	 * Creates the pages of this multi-page editor.
-	 * <p>
-	 * Subclasses of <code>MultiPageEditor</code> must implement this
-	 * method.
-	 * </p>
-	 */
-	protected void createPages() {
-		try {
-			if (resourceChangeHandler == null) {
-				resourceChangeHandler = new WSDLEditorResourceChangeHandler(this);
-				resourceChangeHandler.attach();
-			}
-			createSourcePage();
-			addSourcePage();
-			// create the wsdl model
-			//
-			lookupOrCreateWSDLModel();
-			createAndAddGraphPage();
-
-			// get the type of page and set the active page to show
-			int pageIndexToShow = getDefaultPageIndex();
-			setActivePage(pageIndexToShow);
-			Definition definition = getDefinition();
-            if (definition != null) {
-                getSelectionManager().setSelection(new StructuredSelection(definition));
-            } else {
-              getSelectionManager().setSelection(new StructuredSelection());
-            }
-
-			// added selection listeners after setting selection to avoid
-			// navigation exception
-			ISelectionProvider provider = getTextEditor().getSelectionProvider();
-			fSourceEditorSelectionListener = new SourceEditorSelectionListener();
-			if (provider instanceof IPostSelectionProvider) {
-				((IPostSelectionProvider) provider).addPostSelectionChangedListener(fSourceEditorSelectionListener);
-			}
-			else {
-				provider.addSelectionChangedListener(fSourceEditorSelectionListener);
-			}
-			fWSDLSelectionListener = new WSDLSelectionManagerSelectionListener();
-			getSelectionManager().addSelectionChangedListener(fWSDLSelectionListener);
-		}
-		catch (PartInitException e) {
-			// log for now, unless we find reason not to
-			Logger.log(Logger.INFO, e.getMessage());
-		}
-		// TODO: add a catch block here for any exception the design page
-		// throws and
-		// convert it into a more informative message.
-	}
-
-	protected void lookupOrCreateWSDLModel() {
-		try {
-			Document document = ((IDOMModel) getModel()).getDocument();
-			if (document instanceof INodeNotifier) {
-				INodeNotifier notifier = (INodeNotifier) document;
-				modelAdapter = (WSDLModelAdapter) notifier.getAdapterFor(WSDLModelAdapter.class);
-				if (modelAdapter == null) {
-					modelAdapter = new WSDLModelAdapter();
-					notifier.addAdapter(modelAdapter);
-                    modelAdapter.createDefinition(document.getDocumentElement(), document);
-				}
-			}
-		}
-		catch (Exception e) {
-		}
-	}
-
-	protected int getDefaultPageIndex() {
-		if (WSDLEditorPlugin.getInstance().getDefaultPage().equals(WSDLEditorPlugin.GRAPH_PAGE)) {
-			if (graphPageIndex != -1) {
-				return graphPageIndex;
-			}
-		}
-		return sourcePageIndex;
-	}
-
-	/**
-	 * @see org.eclipse.wst.wsdl.ui.WSDLMultiPageEditorPart#createTextEditor()
-	 */
-	protected StructuredTextEditor createTextEditor() {
-		textEditor = new StructuredTextEditor();
-		return textEditor;
-	}
-
-	/**
-	 * create our own
-	 */
-	protected void createSourcePage() throws PartInitException {
-		super.createSourcePage();
-		textEditor = getTextEditor();
-	}
-
-	int sourcePageIndex = -1;
-
-	/**
-	 * Adds the source page of the multi-page editor.
-	 */
-	protected void addSourcePage() throws PartInitException {
-		sourcePageIndex = addPage(textEditor, getEditorInput());
-		setPageText(sourcePageIndex, WSDLEditorPlugin.getWSDLString("_UI_TAB_SOURCE"));
-		// the update's critical, to get viewer selection manager and
-		// highlighting to
-		// work
-		textEditor.update();
-	}
-
-	int[] weights;
-
-	public void setDesignWeights(int[] weights, boolean updateSourceDesign) {
-		this.weights = weights;
-		if (updateSourceDesign) {
-			sashForm.setWeights(weights);
-		}
-	}
-
-	protected void pageChange(int arg) {
-		super.pageChange(arg);
-		if (getPageText(arg).equals(WSDLEditorPlugin.getWSDLString("_UI_TAB_SOURCE"))) // TRANSLATE
-		// !
-		{
-			// update the input
-		}
-		else if (getPageText(arg).equals(WSDLEditorPlugin.getWSDLString("_UI_TAB_GRAPH"))) // TRANSLATE
-		// !
-		{
-			// update the input
-		}
-	}
-
-	static private Color dividerColor;
-
-	/**
-	 * Creates the graph page and adds it to the multi-page editor.
-	 */
-	protected void createAndAddGraphPage() throws PartInitException {
-		// create the graph page
-		sashForm = new SashForm(getContainer(), SWT.BORDER);
-		sashForm.setLayoutData(new GridData(GridData.FILL_BOTH));
-		sashForm.setOrientation(SWT.VERTICAL);
-		graphPageIndex = addPage(sashForm);
-		setPageText(graphPageIndex, WSDLEditorPlugin.getWSDLString("_UI_TAB_GRAPH"));
-		// create the graph viewer
-		graphViewer = new WSDLGraphViewer(this);
-		graphViewer.createControl(sashForm);
-		// detailsViewer = new WSDLDetailsViewer(this);
-		// detailsViewer.createControl(sashForm);
-		//
-		// sashForm.setWeights(weights);
-		if (dividerColor == null) {
-			dividerColor = new Color(getContainer().getDisplay(), 143, 141, 138);
-		}
-		getContainer().addPaintListener(new PaintListener() {
-			/**
-			 * @see org.eclipse.swt.events.PaintListener#paintControl(PaintEvent)
-			 */
-			public void paintControl(PaintEvent e) {
-				Object source = e.getSource();
-				if (source instanceof Composite) {
-					Composite comp = (Composite) source;
-					Rectangle boundary = comp.getClientArea();
-					e.gc.setForeground(dividerColor);
-					e.gc.drawLine(boundary.x, boundary.y, boundary.x + boundary.width, boundary.y);
-					setDesignWeights(sashForm.getWeights(), true);
-				}
-			}
-		});
-	}
-
-	public void setFocus() {
-		super.setFocus();
-		int activePage = getActivePage();
-		if (activePage == sourcePageIndex) {
-			WSDLEditorPlugin.getInstance().setDefaultPage(WSDLEditorPlugin.SOURCE_PAGE);
-		}
-		else {
-			WSDLEditorPlugin.getInstance().setDefaultPage(WSDLEditorPlugin.GRAPH_PAGE);
-		}
-	}
-
-	//
-	//
-	public static class BuiltInWSDLEditorExtension implements WSDLEditorExtension {
-		public boolean isExtensionTypeSupported(int type) {
-			return type == OUTLINE_TREE_CONTENT_PROVIDER || type == OUTLINE_LABEL_PROVIDER || type == EDIT_PART_FACTORY || type == DETAILS_VIEWER_PROVIDER || type == MENU_ACTION_CONTRIBUTOR || type == NODE_RECONCILER || type == NODE_ASSOCIATION_PROVIDER;
-		}
-
-		public boolean isApplicable(Object object) {
-			return (object instanceof WSDLElement && !(object instanceof XSDSchemaExtensibilityElement)) || (object instanceof WSDLGroupObject);
-		}
-
-		public Object createExtensionObject(int type, WSDLEditor wsdlEditor) {
-			Object result = null;
-			switch (type) {
-				case OUTLINE_TREE_CONTENT_PROVIDER : {
-					result = new ModelAdapterContentProvider(WSDLModelAdapterFactory.getWSDLModelAdapterFactory());
-					break;
-				}
-				case OUTLINE_LABEL_PROVIDER : {
-					result = new ModelAdapterLabelProvider(WSDLModelAdapterFactory.getWSDLModelAdapterFactory());
-					break;
-				}
-				case DETAILS_VIEWER_PROVIDER : {
-					result = new WSDLDetailsViewerProvider();
-					break;
-				}
-				case MENU_ACTION_CONTRIBUTOR : {
-					result = new WSDLMenuActionContributor(wsdlEditor);
-					break;
-				}
-				case NODE_ASSOCIATION_PROVIDER : {
-					result = new WSDLNodeAssociationProvider();
-					break;
-				}
-				case EDIT_PART_FACTORY : {
-					result = new WSDLEditPartFactory();
-					break;
-				}
-			}
-			return result;
-		}
-	}
-
-	public void reloadDependencies() {
-		try {
-			getGraphViewer().getComponentViewer().setPreserveExpansionEnabled(true);
-			Definition definition = getDefinition();
-			if (definition != null) {
-				WSDLResourceUtil.reloadDirectives(definition);
-				ComponentReferenceUtil.updateBindingReferences(definition);
-				ComponentReferenceUtil.updatePortTypeReferences(definition);
-				ComponentReferenceUtil.updateMessageReferences(definition);
-				ComponentReferenceUtil.updateSchemaReferences(definition);
-				// the line below simply causes a notification in order to
-				// update our
-				// views
-				//
-				definition.setDocumentationElement(definition.getDocumentationElement());
-			}
-		}
-		finally {
-			getGraphViewer().getComponentViewer().setPreserveExpansionEnabled(false);
-		}
-	}
-
-	public void openOnSelection(String specification) {
-		EObject eObject = getDefinition().eResource().getEObject(specification);
-		if (eObject != null) {
-			getSelectionManager().setSelection(new StructuredSelection(eObject));
-		}
-	}
-
-	public INavigationLocation createEmptyNavigationLocation() {
-		return new InternalTextSelectionNavigationLocation(textEditor, false);
-	}
-
-	public INavigationLocation createNavigationLocation() {
-		return new InternalTextSelectionNavigationLocation(textEditor, true);
-	}
-
-	static class InternalTextSelectionNavigationLocation extends TextSelectionNavigationLocation {
-		public InternalTextSelectionNavigationLocation(ITextEditor part, boolean initialize) {
-			super(part, initialize);
-		}
-
-		protected IEditorPart getEditorPart() {
-			IEditorPart part = super.getEditorPart();
-			if (part instanceof WSDLEditor) {
-				part = ((WSDLEditor) part).getTextEditor();
-			}
-			return part;
-		}
-
-		public String getText() {
-			// ISSUE: how to get title?
-			// IEditorPart part = getEditorPart();
-			// if (part instanceof WSDLTextEditor) {
-			// return ((WSDLTextEditor) part).getWSDLEditor().getTitle();
-			// }
-			// else {
-			// return super.getText();
-			// }
-			return super.getText();
-		}
-	}
-
-	// Returns the element currently on the copy, cut, paste clipboard
-	public WSDLElement getClipboardContents() {
-		return clipboardElement;
-	}
-
-	public void setClipboardContents(WSDLElement element) {
-		clipboardElement = element;
-	}
-
-	/**
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySheetPageContributor#getContributorId()
-	 */
-	public String getContributorId() {
-		return "org.eclipse.wst.wsdl.ui.internal.WSDLEditor";
-		// return getSite().getId();
-	}
-
-	/*
-	 * We override this method so we can hook in our automatic Binding
-	 * generation. We will generate the Binding after a save is executed (If
-	 * this preference has been set to true).
-	 */
-	public void doSave(IProgressMonitor monitor) {
-		try {
-			// Display prompt message
-			boolean continueRegeneration = false;
-			if (WSDLEditorPlugin.getInstance().getPluginPreferences().getBoolean("Prompt Regenerate Binding on save")) {
-				Shell shell = Display.getCurrent().getActiveShell();
-				GenerateBindingOnSaveDialog dialog = new GenerateBindingOnSaveDialog(shell);
-
-				int rValue = dialog.open();
-				if (rValue == SWT.YES) {
-					continueRegeneration = true;
-				}
-				else if (rValue == SWT.NO) {
-					continueRegeneration = false;
-				}
-				else if (rValue == SWT.CANCEL) {
-					return;
-				}
-				else {
-					System.out.println("\nNothing: " + rValue);
-				}
-			}
-			else {
-				continueRegeneration = WSDLEditorPlugin.getInstance().getPluginPreferences().getBoolean(WSDLEditorPlugin.getWSDLString("_UI_PREF_PAGE_AUTO_REGENERATE_BINDING"));
-			}
-
-			if (continueRegeneration) {
-				Iterator bindingsIt = getDefinition().getEBindings().iterator();
-				while (bindingsIt.hasNext()) {
-					Binding binding = (Binding) bindingsIt.next();
-					BindingGenerator generator = new BindingGenerator(binding.getEnclosingDefinition(), binding);
-					generator.setOverwrite(false);
-					generator.generateBinding();
-				}
-
-				// Little hack to 'redraw' connecting lines in the graph
-				// viewer
-				getDefinition().setQName(getDefinition().getQName());
-			}
-		}
-		catch (Exception e) {
-			// e.printStackTrace();
-		}
-		super.doSave(monitor);
-	}
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLEditorPlugin.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLEditorPlugin.java
deleted file mode 100644
index f9e5dfb6c..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLEditorPlugin.java
+++ /dev/null
@@ -1,588 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal;
-
-import java.io.IOException;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.HashMap;
-import java.util.Hashtable;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.wsdl.ui.internal.extension.ExtensibilityItemTreeProviderRegistry;
-import org.eclipse.wst.wsdl.ui.internal.extension.NSKeyedExtensionRegistry;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtensionRegistry;
-
-public class WSDLEditorPlugin extends AbstractUIPlugin //, IPluginHelper
-{
-  public static final String DEFAULT_PAGE = "org.eclipse.wst.wsdl.ui.internal.defaultpage";
-  public static final String GRAPH_PAGE = "org.eclipse.wst.wsdl.ui.internal.graphpage";
-  public static final String SOURCE_PAGE = "org.eclipse.wst.wsdl.ui.internal.sourcepage";
-
-  public final static String PLUGIN_ID = "org.eclipse.wst.wsdl.ui";
-  public final static String XSD_EDITOR_ID = "org.eclipse.wst.xsd.ui.XSDEditor"; 
-  
-  public final static String DEFAULT_TARGET_NAMESPACE = "http://www.example.org";
-  
-  public static int DEPENDECIES_CHANGED_POLICY_PROMPT = 0;
-  public static int DEPENDECIES_CHANGED_POLICY_IGNORE = 1;
-  public static int DEPENDECIES_CHANGED_POLICY_RELOAD = 2;
-
-  protected static WSDLEditorPlugin instance;
-  //  protected XMLSchemaPackage xmlschemaPackage;
-//  private static MsgLogger myMsgLogger;
-
-  private WSDLEditorExtensionRegistry wsdlEditorExtensionRegistry;
-  private NSKeyedExtensionRegistry extensiblityElementFilterRegistry;
-  private ExtensibilityItemTreeProviderRegistry treeProviderRegistry;
-  private NSKeyedExtensionRegistry propertyDescriptorProviderRegistry;
-  private NSKeyedExtensionRegistry propertySourceProviderRegistry;
-  private NSKeyedExtensionRegistry propertySectionDescriptorProviderRegistry;
-  private NSKeyedExtensionRegistry detailsViewerProviderRegistry;  
-  //private static Hashtable grayedImageMap = new Hashtable();
-  private int dependenciesChangedPolicy = DEPENDECIES_CHANGED_POLICY_RELOAD;
-
-  
-  public static void logMessage(String message)
-  {
-  }
-
-  /**
-   * Resources helper.
-   */
-
-  public WSDLEditorPlugin(IPluginDescriptor descriptor)
-  {
-    super(descriptor);
-    instance = this;
-
-    // TODO... remove this code when we add 'dependenciesChangedPolicy'
-    // to an editor preferences page
-    try
-    {
-      String string = getWSDLString("_DEBUG_UPDATE_POLICY");
-      int policy = Integer.parseInt(string);
-      if (policy >= 0 && policy <= DEPENDECIES_CHANGED_POLICY_RELOAD)
-      {
-        dependenciesChangedPolicy = policy;
-      }
-    }
-    catch (Exception e)
-    {
-    }
-  }
-
-  public WSDLEditorExtensionRegistry getWSDLEditorExtensionRegistry()
-  {
-    if (wsdlEditorExtensionRegistry == null)
-    {
-      wsdlEditorExtensionRegistry = new WSDLEditorExtensionRegistry();
-      new InternalEditorExtensionRegistryReader(wsdlEditorExtensionRegistry).readRegistry();
-    }
-    return wsdlEditorExtensionRegistry;
-  }
-
-  public NSKeyedExtensionRegistry getDetailsViewerProviderRegistry()
-  {
-    if (detailsViewerProviderRegistry == null)
-    {
-	  detailsViewerProviderRegistry = new NSKeyedExtensionRegistry();
-      new DetailsViewerProviderRegistryReader(detailsViewerProviderRegistry).readRegistry();
-    }
-    return detailsViewerProviderRegistry;
-  }
-
-  public NSKeyedExtensionRegistry getExtensiblityElementFilterRegistry()
-  {
-    if (extensiblityElementFilterRegistry == null)
-    {
-      extensiblityElementFilterRegistry = new NSKeyedExtensionRegistry();
-      new ElementContentFilterExtensionRegistryReader(extensiblityElementFilterRegistry).readRegistry();
-    }
-    return extensiblityElementFilterRegistry;
-  }
-
-  public ExtensibilityItemTreeProviderRegistry getExtensibilityItemTreeProviderRegistry()
-  {
-    if (treeProviderRegistry == null)
-    {
-      treeProviderRegistry = new ExtensibilityItemTreeProviderRegistry();
-      new ExtensibilityItemTreeProviderRegistryReader(treeProviderRegistry).readRegistry();
-    }
-    return treeProviderRegistry;
-  }
-
-  public NSKeyedExtensionRegistry getPropertyDescriptorProviderRegistry()
-  {
-    if (propertyDescriptorProviderRegistry == null)
-    {
-      propertyDescriptorProviderRegistry = new NSKeyedExtensionRegistry();
-      new PropertyDescriptorProviderRegistryReader(propertyDescriptorProviderRegistry).readRegistry();
-    }
-    return propertyDescriptorProviderRegistry;
-  }
-
-  public NSKeyedExtensionRegistry getPropertySourceProviderRegistry()
-  {
-    if (propertySourceProviderRegistry == null)
-    {
-      propertySourceProviderRegistry = new NSKeyedExtensionRegistry();
-      new PropertySourceProviderRegistryReader(propertySourceProviderRegistry).readRegistry();
-    }
-    return propertySourceProviderRegistry;
-  }
-
-  public NSKeyedExtensionRegistry getPropertySectionDescriptorProviderRegistry()
-  {
-    if (propertySectionDescriptorProviderRegistry == null)
-    {
-      propertySectionDescriptorProviderRegistry = new NSKeyedExtensionRegistry();
-      new PropertySectionDescriptorProviderRegistry(propertySectionDescriptorProviderRegistry).readRegistry();
-    }
-    return propertySectionDescriptorProviderRegistry;
-  }
-
-  /**
-   * Get the Install URL
-   */
-  public static URL getInstallURL()
-  {
-    return getInstance().getDescriptor().getInstallURL();
-  }
-
-  /**
-   * Get resource string
-   */
-  public static String getWSDLString(String key)
-  {	  
-    return Platform.getResourceBundle(Platform.getBundle(PLUGIN_ID)).getString(key);
-  }
-
-  /**
-   * Get resource string
-   */
-  public static String getWSDLString(String key, String arg0)
-  {
-    return MessageFormat.format(getWSDLString(key), new Object [] { arg0 });
-  }
-  
-  /**
-   * Get resource string
-   */
-  public static String getWSDLString(String key, String arg0, String arg1)
-  {
-    return MessageFormat.format(getWSDLString(key), new Object [] { arg0, arg1 });
-  }
-
-  /**
-   * Return the plugin physical directory location
-   */
-  public static IPath getPluginLocation()
-  {
-    try
-    {
-      IPath installPath = new Path(getInstallURL().toExternalForm()).removeTrailingSeparator();
-      String installStr = Platform.asLocalURL(new URL(installPath.toString())).getFile();
-      return new Path(installStr);
-    }
-    catch (IOException e)
-    {
-      //System.out.println("WSDLEditorPlugin.getPluginLocation() exception.." + e);
-    }
-    return null;
-  }
-
-  protected Hashtable imageDescriptorCache = new Hashtable();
-
-  protected ImageDescriptor internalGetImageDescriptor(String key)
-  {
-    ImageDescriptor imageDescriptor = (ImageDescriptor) imageDescriptorCache.get(key);
-    if (imageDescriptor == null)
-    {
-      imageDescriptor = ImageDescriptor.createFromFile(WSDLEditorPlugin.class, key);
-      if (imageDescriptor != null)
-      {
-        imageDescriptorCache.put(key, imageDescriptor);
-      }
-    }
-    return imageDescriptor;
-  }
-
-  public static ImageDescriptor getImageDescriptor(String key)
-  {
-    return getInstance().internalGetImageDescriptor(key);
-  }
-
-  public Image getImage(String iconName)
-  {
-    ImageRegistry imageRegistry = getImageRegistry();
-    
-    if (imageRegistry.get(iconName) != null)
-    {
-      return imageRegistry.get(iconName);
-    }
-    else
-    {
-      imageRegistry.put(iconName, ImageDescriptor.createFromFile(getClass(), iconName));
-      return imageRegistry.get(iconName);
-    }
-  }
-  
-  /*
-    public Image getImage(String key, boolean isGrayed)
-    { 
-      Image image = null;
-      if (!isGrayed)
-      {
-        image = super.getImage(key);
-      }                             
-      else
-      {
-        image = (Image)grayedImageMap.get(key);
-        if (image == null)
-        {
-          Image colorImage = super.getImage(key);
-          if (colorImage != null)
-          {
-            image = new Image(Display.getCurrent(), colorImage, SWT.IMAGE_GRAY);//SWT.IMAGE_DISABLE);
-            grayedImageMap.put(key, image);
-          }
-        }
-      }
-      return image;
-    }
-  */
-
-  /**
-   * Get the metadata directory for this plugin
-   */
-  public static String getMetaDataDirectory()
-  {
-    return getInstance().getStateLocation().toOSString();
-  }
-
-  /**
-   * Get the singleton instance.
-   */
-  public static WSDLEditorPlugin getInstance()
-  {
-    return instance;
-  }
-
-  public IWorkspace getWorkspace()
-  {
-    return ResourcesPlugin.getWorkspace();
-  }
-
-  public static Shell getShell()
-  {
-    return getInstance().getWorkbench().getActiveWorkbenchWindow().getShell();
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.ui.plugin.AbstractUIPlugin#initializeDefaultPreferences(org.eclipse.jface.preference.IPreferenceStore)
-   */
-  protected void initializeDefaultPreferences(IPreferenceStore store)
-  {
-    store.setDefault(DEFAULT_PAGE, GRAPH_PAGE);
-    
-    // WSDLPreferencePage prefs
-    store.setDefault(WSDLEditorPlugin.getWSDLString("_UI_PREF_PAGE_DEFAULT_TARGET_NAMESPACE"), DEFAULT_TARGET_NAMESPACE);
-    store.setDefault(WSDLEditorPlugin.getWSDLString("_UI_PREF_PAGE_AUTO_REGENERATE_BINDING"), false);
-    store.setDefault("Prompt Regenerate Binding on save", false);	// TODO: Externalize
-    // Do we need this preference below?  Look at WSDLPreferencePage.java
-//    store.setDefault("Defualt Location:", "http://www.example.com");
-  }
-  
-  /**
-   * setDefaultPage
-   * Set the default page to open when the editor starts. Maintains the state
-   * when WSAD is shutdown and restarted.
-   * @param page
-   */
-  public void setDefaultPage(String page)
-  {
-    getPreferenceStore().setValue(DEFAULT_PAGE, page);
-  }
-
-  public String getDefaultPage()
-  {
-    return getPreferenceStore().getString(DEFAULT_PAGE);
-  }
-
-  public int getDependenciesChangedPolicy()
-  {
-    //return getPreferenceStore().getInt(DEPENDECIES_CHANGED_POLICY);
-    return dependenciesChangedPolicy;
-  }
-}
-
-class BaseRegistryReader
-{
-  protected static final String PLUGIN_ID = "org.eclipse.wst.wsdl.ui";
-
-  /**
-   * read from plugin registry and parse it.
-   */
-  public void readRegistry(String extensionPointId)
-  {
-	IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry();
-	IExtensionPoint point = extensionRegistry.getExtensionPoint(PLUGIN_ID, extensionPointId);
-
-    if (point != null)
-    {
-      IConfigurationElement[] elements = point.getConfigurationElements();
-      for (int i = 0; i < elements.length; i++)
-      {
-        readElement(elements[i]);
-      }
-    }
-  }
-
-  protected void readElement(IConfigurationElement element)
-  {
-  }
-}
-
-/**
- * This class reads the plugin manifests and registers each internal editor extension
- */
-class InternalEditorExtensionRegistryReader extends BaseRegistryReader
-{
-  protected static final String EXTENSION_POINT_ID = "internalEditorExtensions";
-  protected static final String TAG_NAME = "internalEditorExtension";
-  protected static final String ATT_CLASS = "class";
-  protected WSDLEditorExtensionRegistry registry;
-
-  public InternalEditorExtensionRegistryReader(WSDLEditorExtensionRegistry registry)
-  {
-    this.registry = registry;
-  }
-
-  /**
-   * read from plugin registry and parse it.
-   */
-  public void readRegistry()
-  {
-    super.readRegistry(EXTENSION_POINT_ID);
-  }
-
-  /**
-   * readElement()
-   */
-  protected void readElement(IConfigurationElement element)
-  {
-    if (element.getName().equals(TAG_NAME))
-    {
-      String className = element.getAttribute(ATT_CLASS);
-      if (className != null)
-      {
-        try
-        {
-          ClassLoader pluginClsLoader = element.getDeclaringExtension().getDeclaringPluginDescriptor().getPlugin().getClass().getClassLoader();
-          registry.add(pluginClsLoader, className);
-        }
-        catch (Exception e)
-        {
-        }
-      }
-    }
-  }
-}
-
-/**
- * 
- */
-abstract class NSKeyedExtensionRegistryReader extends BaseRegistryReader
-{
-  protected static final String ATT_NAME_SPACE = "namespace";
-  protected String extensionPointId;
-  protected String tagName;
-  protected String[] attributeNames;
-  protected NSKeyedExtensionRegistry nsKeyedExtensionRegistry;
-
-  private NSKeyedExtensionRegistryReader(String extensionPointId, String tagName, NSKeyedExtensionRegistry nsKeyedExtensionRegistry)
-  {
-    this.extensionPointId = extensionPointId;
-    this.tagName = tagName;
-    this.nsKeyedExtensionRegistry = nsKeyedExtensionRegistry;
-  }
-
-  public NSKeyedExtensionRegistryReader(String extensionPointId, String tagName, String attributeName, NSKeyedExtensionRegistry nsKeyedExtensionRegistry)
-  {
-    this(extensionPointId, tagName, nsKeyedExtensionRegistry);
-    attributeNames = new String[1];
-    attributeNames[0] = attributeName;
-  }
-
-  public NSKeyedExtensionRegistryReader(String extensionPointId, String tagName, String[] attributeNames, NSKeyedExtensionRegistry nsKeyedExtensionRegistry)
-  {
-    this(extensionPointId, tagName, nsKeyedExtensionRegistry);
-    this.attributeNames = attributeNames;
-  }
-  /**
-   * read from plugin registry and parse it.
-   */
-  public void readRegistry()
-  {
-    super.readRegistry(extensionPointId);
-  }
-
-  /**
-   * readElement()
-   */
-  protected void readElement(IConfigurationElement element)
-  {
-    if (element.getName().equals(tagName))
-    {
-      String namespace = element.getAttribute(ATT_NAME_SPACE);
-      if (namespace != null)
-      {
-        ClassLoader pluginClasssLoader = element.getDeclaringExtension().getDeclaringPluginDescriptor().getPluginClassLoader();
-        if (attributeNames.length == 1)
-        {
-          String className = element.getAttribute(attributeNames[0]);
-          if (className != null)
-          {
-            nsKeyedExtensionRegistry.put(namespace, className, pluginClasssLoader);
-          }
-        }
-        else
-        {
-          HashMap map = new HashMap();
-          for (int i = 0; i < attributeNames.length; i++)
-          {
-            String attributeName = attributeNames[i];
-            String className = element.getAttribute(attributeName);
-            if (className != null && className.length() > 0)
-            {
-              map.put(attributeName, className);
-            }
-          }
-          nsKeyedExtensionRegistry.put(namespace, map, pluginClasssLoader);
-        }
-      }
-    }
-  }
-}
-
-/**
- * This class reads the plugin manifests and registers each extensibility item tree provider
- */
-class ExtensibilityItemTreeProviderRegistryReader extends NSKeyedExtensionRegistryReader
-{
-  protected static final String EXTENSION_POINT_ID = "extensibilityItemTreeProviders";
-  protected static final String TAG_NAME = "extensibilityItemTreeProvider";
-  protected static final String[] ATT_NAMES = { "labelProviderClass", "contentProviderClass" };
-
-  public ExtensibilityItemTreeProviderRegistryReader(NSKeyedExtensionRegistry nsKeyedExtensionRegistry)
-  {
-    super(EXTENSION_POINT_ID, TAG_NAME, ATT_NAMES, nsKeyedExtensionRegistry);
-  }
-}
-
-/**
- * 
- */
-class ElementContentFilterExtensionRegistryReader extends NSKeyedExtensionRegistryReader
-{
-  protected static final String EXTENSION_POINT_ID = "extensibilityElementFilter";
-  protected static final String TAG_NAME = "extensibilityElementFilter";
-
-  public ElementContentFilterExtensionRegistryReader(NSKeyedExtensionRegistry nsKeyedExtensionRegistry)
-  {
-    super(EXTENSION_POINT_ID, TAG_NAME, "class", nsKeyedExtensionRegistry);
-  }
-}
-
-/**
- * 
- */
-class PropertyDescriptorProviderRegistryReader extends NSKeyedExtensionRegistryReader
-{
-  protected static final String EXTENSION_POINT_ID = "propertyDescriptorProvider";
-  protected static final String TAG_NAME = "propertyDescriptorProvider";
-
-  public PropertyDescriptorProviderRegistryReader(NSKeyedExtensionRegistry nsKeyedExtensionRegistry)
-  {
-    super(EXTENSION_POINT_ID, TAG_NAME, "class", nsKeyedExtensionRegistry);
-  }
-
-  protected void readElement(IConfigurationElement element)
-  {
-    super.readElement(element);
-  }
-}
-
-class PropertySourceProviderRegistryReader extends NSKeyedExtensionRegistryReader
-{
-  protected static final String EXTENSION_POINT_ID = "propertySourceProvider";
-  protected static final String TAG_NAME = "propertySourceProvider";
-
-  public PropertySourceProviderRegistryReader(NSKeyedExtensionRegistry nsKeyedExtensionRegistry)
-  {
-    super(EXTENSION_POINT_ID, TAG_NAME, "class", nsKeyedExtensionRegistry);
-  }
-
-  protected void readElement(IConfigurationElement element)
-  {
-    super.readElement(element);
-  }
-}
-
-class PropertySectionDescriptorProviderRegistry extends NSKeyedExtensionRegistryReader
-{
-  protected static final String EXTENSION_POINT_ID = "propertySectionDescriptorProvider";
-  protected static final String TAG_NAME = "propertySectionDescriptorProvider";
-
-  public PropertySectionDescriptorProviderRegistry(NSKeyedExtensionRegistry nsKeyedExtensionRegistry)
-  {
-    super(EXTENSION_POINT_ID, TAG_NAME, "class", nsKeyedExtensionRegistry);
-  }
-
-  protected void readElement(IConfigurationElement element)
-  {
-    super.readElement(element);
-  }
-}
-
-/**
- * 
- */
-class DetailsViewerProviderRegistryReader extends NSKeyedExtensionRegistryReader
-{
-  protected static final String EXTENSION_POINT_ID = "detailsViewerProviders";
-  protected static final String TAG_NAME = "detailsViewerProvider";
-
-  public DetailsViewerProviderRegistryReader(NSKeyedExtensionRegistry nsKeyedExtensionRegistry)
-  {
-    super(EXTENSION_POINT_ID, TAG_NAME, "class", nsKeyedExtensionRegistry);
-  }
-
-  protected void readElement(IConfigurationElement element)
-  {
-    super.readElement(element);
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLEditorResourceChangeHandler.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLEditorResourceChangeHandler.java
deleted file mode 100644
index 9eb610bb5..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLEditorResourceChangeHandler.java
+++ /dev/null
@@ -1,314 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IPartListener;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.wsdl.Definition;
-
-
-public class WSDLEditorResourceChangeHandler
-{
-  protected WSDLEditor wsdlEditor;
-  protected boolean isUpdateRequired;
-  protected InternalResourceChangeListener resourceChangeListener;
-  protected InternalPartListener partListener;
-
-  public WSDLEditorResourceChangeHandler(WSDLEditor wsdlEditor)
-  {
-    this.wsdlEditor = wsdlEditor;
-    resourceChangeListener = new InternalResourceChangeListener();
-    partListener = new InternalPartListener();
-  }
-
-  public void attach()
-  {
-    ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener);
-    wsdlEditor.getSite().getWorkbenchWindow().getPartService().addPartListener(partListener);
-  }
-
-  public void dispose()
-  {
-    ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);
-    wsdlEditor.getSite().getWorkbenchWindow().getPartService().removePartListener(partListener);
-  }
-
-  protected Map computeDependencyMap()
-  {
-    Map map = new HashMap();
-    Definition definition = wsdlEditor.getDefinition();
-    ResourceSet resourceSet = definition.eResource().getResourceSet();
-    for (Iterator i = resourceSet.getResources().iterator(); i.hasNext();)
-    {
-      Resource resource = (Resource)i.next();
-      if (resource != definition.eResource())
-      {
-        String uri = resource.getURI().toString();
-        if (map.get(uri) == null)
-        {
-          map.put(uri, uri);
-        }
-      }
-    }
-    return map;
-  }
-
-  public void performReload()
-  {
-  	boolean doReload = false;  	
-	int policy = WSDLEditorPlugin.getInstance().getDependenciesChangedPolicy();
-	
-  	if (policy == WSDLEditorPlugin.DEPENDECIES_CHANGED_POLICY_PROMPT)
-  	{
-		doReload = MessageDialog.openQuestion(wsdlEditor.getSite().getShell(), WSDLEditorPlugin.getWSDLString("_UI_DEPENDENCIES_CHANGED"), WSDLEditorPlugin.getWSDLString("_UI_DEPENDENCIES_CHANGED_REFRESH"));  	
-  	}
-  	else if (policy == WSDLEditorPlugin.DEPENDECIES_CHANGED_POLICY_RELOAD)
-  	{
-  		doReload = true;
-  	}
-  	
-    if (doReload)
-    {    
-      wsdlEditor.reloadDependencies();
-    }  
-  }
-  
-  public boolean isListeningToResourceChanges()
-  {
-  	int policy = WSDLEditorPlugin.getInstance().getDependenciesChangedPolicy();
-  	return policy == WSDLEditorPlugin.DEPENDECIES_CHANGED_POLICY_PROMPT ||
-  		   policy == WSDLEditorPlugin.DEPENDECIES_CHANGED_POLICY_RELOAD;
-  }
-
-
-  class InternalResourceChangeListener implements IResourceChangeListener, IResourceDeltaVisitor
-  {
-    protected List list = new ArrayList();
-    protected boolean isPending = false;
-    protected int count = 0;
-
-    public void resourceChanged(IResourceChangeEvent event)
-    {      	
-      Display display = Display.getCurrent();
-      	     	
-      if (display != null && isListeningToResourceChanges() && !isUpdateRequired)
-      {
-        if (event.getType() == IResourceChangeEvent.POST_CHANGE)
-        {
-          IResourceDelta[] deltas = event.getDelta().getAffectedChildren();
-          for (int i = 0; i < deltas.length; i++)
-          {
-            try
-            {
-              deltas[i].accept(this);
-            }
-            catch (Exception e)
-            {
-            }
-          }
-        }
-        if (list.size() > 0)
-        {
-          if (!isPending)
-          {
-            isPending = true;
-            display.timerExec(2000, new TimerEvent());
-          }
-        }
-      }
-    }
-
-    public boolean visit(IResourceDelta delta) throws CoreException
-    {
-      IResource resource = delta.getResource();
-      if (resource.getType() == IResource.FILE)
-      {
-        if (!list.contains(resource))
-        {
-          list.add(resource);
-        }
-      }
-      return true;
-    }
-
-    class TimerEvent implements Runnable
-    {
-      public TimerEvent()
-      {
-        //System.out.println("NewTimerEvent(" + wsdlEditor.getDefinition().eResource().getURI() + ") " + count);      	
-      }
-
-      public void run()
-      {
-//        for (Iterator i = list.iterator(); i.hasNext();)
-//        {
-//          IResource resource = (IResource)i.next();
-//          String platformPath = URI.createPlatformResourceURI(resource.getFullPath().toString()).toString();
-//        }
-
-        Map dependencyMap = computeDependencyMap();
-
-        for (Iterator i = list.iterator(); i.hasNext();)
-        {
-          IResource resource = (IResource)i.next();
-          String platformPath = URI.createPlatformResourceURI(resource.getFullPath().toString()).toString();
-          if (dependencyMap.get(platformPath) != null)
-          {
-            isUpdateRequired = true;
-            if (wsdlEditor.getSite().getWorkbenchWindow().getPartService().getActivePart() == wsdlEditor)
-            {
-              isUpdateRequired = false;
-              performReload();
-            }
-          }
-        }
-
-        isPending = false;
-        list = new ArrayList();
-      }
-    }
-  }
-
-  class InternalPartListener implements IPartListener
-  {
-    public void partActivated(IWorkbenchPart part)
-    {
-      if (part == wsdlEditor)
-      {     
-        if (isUpdateRequired)
-        {
-          isUpdateRequired = false;
-          performReload();
-        }
-      }
-    }
-
-    public void partBroughtToTop(IWorkbenchPart part)
-    {
-    }
-
-    public void partClosed(IWorkbenchPart part)
-    {
-    }
-
-   
-    public void partDeactivated(IWorkbenchPart part)
-    {
-    }
-
-    public void partOpened(IWorkbenchPart part)
-    {
-    }
-  }
-
-
-}
-
-/*
-class DependencyVisitor
-{
-	public void visitImport(Import theImport)
-	{
-		if (theImport.getEDefinition() != null)
-		{
-			visitDefinition(theImport.getEDefinition());
-		}
-		else if (theImport.getESchema() != null)
-		{
-			visitSchema(theImport.getESchema());
-		}
-	}
-
-	public void visitXSDSchemaDirective(XSDSchemaDirective directive)
-	{
-		XSDSchema referencedSchema = directive.getResolvedSchema();
-		if (referencedSchema != null)
-		{
-			visitSchema(referencedSchema);
-		}
-	}
-
-	public void visitDefinition(Definition definition)
-	{
-		if (definition != null)
-		{
-			for (Iterator i = definition.getEImports().iterator(); i.hasNext();)
-			{
-				visitImport((Import)i.next());
-			}
-			Types types = definition.getETypes();
-			if (types != null)
-			{
-
-				for (Iterator i = types.getEExtensibilityElements().iterator(); i.hasNext();)
-				{
-					Object o = i.next();
-					if (o instanceof XSDSchemaExtensibilityElement)
-					{
-						XSDSchemaExtensibilityElement e = (XSDSchemaExtensibilityElement)o;
-						if (e.getEXSDSchema() != null)
-						{
-							visitSchema(e.getEXSDSchema());
-						}
-					}
-				}
-			}
-		}
-	}
-
-	public void visitSchema(XSDSchema schema)
-	{
-		for (Iterator i = schema.getContents().iterator(); i.hasNext();)
-		{
-			Object o = i.next();
-			if (o instanceof XSDSchemaDirective)
-			{
-				visitXSDSchemaDirective((XSDSchemaDirective)o);
-			}
-		}
-	}
-}
-
-class ReloadDependencyVisitor extends DependencyVisitor
-{
-	public void visitImport(Import theImport)
-	{
-		ComponentHandler handler = WSDLReconciler.getReconciler(theImport);
-		Element element = WSDLUtil.getInstance().getElementForObject(theImport);
-		if (element != null && handler != null)
-		{
-			handler.reconcile(wsdlEditor.getDefinition(), theImport, element);
-		}
-	}
-
-	public void visitXSDSchemaDirective(XSDSchemaDirective directive)
-	{
-
-	}
-}*/
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLHyperlink.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLHyperlink.java
deleted file mode 100644
index 61088f511..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLHyperlink.java
+++ /dev/null
@@ -1,104 +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 Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal;
-
-import java.lang.reflect.Method;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.hyperlink.IHyperlink;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.FileEditorInput;
-
-/**
- * WSDL Hyperlink that knows how to open links from wsdl files
- */
-public class WSDLHyperlink implements IHyperlink {
-	private IRegion fRegion;
-	private String fResource;
-	private String fSpec;
-
-	public WSDLHyperlink(IRegion region, String resource, String spec) {
-		fRegion = region;
-		fResource = resource;
-		fSpec = spec;
-	}
-
-	public IRegion getHyperlinkRegion() {
-		return fRegion;
-	}
-
-	public String getTypeLabel() {
-		return null;
-	}
-
-	public String getHyperlinkText() {
-		return null;
-	}
-
-	public void open() {
-		/*
-		 * ISSUE: There are cleaner ways to find the right file based on a URI
-		 * string and cleaner ways to find which editor to open for the file.
-		 * See other IHyperlink and IHyperlinkDetector implementors for
-		 * examples.
-		 */
-		String pattern = "platform:/resource";
-		if (fResource != null && fResource.startsWith(pattern)) {
-			try {
-				Path path = new Path(fResource.substring(pattern.length()));
-				IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
-
-				IWorkbenchPage workbenchPage = WSDLEditorPlugin.getInstance().getWorkbench().getActiveWorkbenchWindow().getActivePage();
-				IEditorPart editorPart = workbenchPage.getActiveEditor();
-
-				if (editorPart.getEditorInput() instanceof IFileEditorInput && ((IFileEditorInput) editorPart.getEditorInput()).getFile().equals(file)) {
-					workbenchPage.getNavigationHistory().markLocation(editorPart);
-				}
-				else {
-					try {
-						if (fResource.endsWith("xsd")) {
-							editorPart = workbenchPage.openEditor(new FileEditorInput(file), WSDLEditorPlugin.XSD_EDITOR_ID);
-						}
-						else {
-							// Since we are already in the wsdleditor
-							editorPart = workbenchPage.openEditor(new FileEditorInput(file), editorPart.getEditorSite().getId());
-						}
-					}
-					catch (PartInitException initEx) {
-					}
-				}
-
-				/*
-				 * ISSUE: This just does not look like a safe thing to do. One
-				 * simple solution would be to have an interface for
-				 * openOnSelection that your editors can implement. Or, java
-				 * editor has something like a utility that is able to find
-				 * the offset/location for a given element in a file. Once you
-				 * have offset/location, you can just call setSelection.
-				 */
-				Class theClass = editorPart.getClass();
-				Class[] methodArgs = {String.class};
-				Method method = theClass.getMethod("openOnSelection", methodArgs);
-				Object args[] = {fSpec};
-				method.invoke(editorPart, args);
-				workbenchPage.getNavigationHistory().markLocation(editorPart);
-			}
-			catch (Exception e) {
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLHyperlinkDetector.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLHyperlinkDetector.java
deleted file mode 100644
index 0309b0ed3..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLHyperlinkDetector.java
+++ /dev/null
@@ -1,129 +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 Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.Region;
-import org.eclipse.jface.text.hyperlink.IHyperlink;
-import org.eclipse.jface.text.hyperlink.IHyperlinkDetector;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ui.internal.text.WSDLModelAdapter;
-import org.eclipse.wst.wsdl.ui.internal.util.OpenOnSelectionHelper;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Node;
-
-/**
- * Detects hyperlinks for WSDL files
- */
-public class WSDLHyperlinkDetector implements IHyperlinkDetector {
-	/**
-	 * Gets the definition from document
-	 * 
-	 * @param document
-	 * @return Definition
-	 */
-	private Definition getDefinition(IDocument document) {
-		Definition definition = null;
-		IStructuredModel model = StructuredModelManager.getModelManager().getExistingModelForRead(document);
-		if (model != null) {
-			try {
-				if (model instanceof IDOMModel) {
-					IDOMDocument domDoc = ((IDOMModel) model).getDocument();
-					if (domDoc != null) {
-						WSDLModelAdapter modelAdapter = (WSDLModelAdapter) domDoc.getAdapterFor(WSDLModelAdapter.class);
-
-						/*
-						 * ISSUE: if adapter does not already exist for domDoc
-						 * getAdapterFor will create one. So why is this null
-						 * check/creation needed?
-						 */
-						if (modelAdapter == null) {
-							modelAdapter = new WSDLModelAdapter();
-							domDoc.addAdapter(modelAdapter);
-							modelAdapter.createDefinition(domDoc.getDocumentElement(), domDoc);
-						}
-
-						definition = modelAdapter.getDefinition();
-					}
-				}
-			}
-			finally {
-				model.releaseFromRead();
-			}
-		}
-		return definition;
-	}
-
-	public IHyperlink[] detectHyperlinks(ITextViewer textViewer, IRegion region, boolean canShowMultipleHyperlinks) {
-		// for now, only capable of creating 1 hyperlink
-		List hyperlinks = new ArrayList(0);
-
-		if (region != null && textViewer != null) {
-			IDocument document = textViewer.getDocument();
-			Node node = getCurrentNode(document, region.getOffset());
-
-			if (node != null) {
-				Definition definition = getDefinition(textViewer.getDocument());
-				OpenOnSelectionHelper helper = new OpenOnSelectionHelper(definition);
-				String[] array = helper.computeSpecification(node);
-				if (array != null) {
-					IRegion nodeRegion = region;
-					if (node instanceof IndexedRegion) {
-						IndexedRegion indexed = (IndexedRegion) node;
-						nodeRegion = new Region(indexed.getStartOffset(), indexed.getLength());
-					}
-					hyperlinks.add(new WSDLHyperlink(nodeRegion, array[0], array[1]));
-				}
-			}
-		}
-		if (hyperlinks.size() == 0)
-			return null;
-		return (IHyperlink[]) hyperlinks.toArray(new IHyperlink[0]);
-	}
-
-	/**
-	 * Returns the node the cursor is currently on in the document. null if no
-	 * node is selected
-	 * 
-	 * @param offset
-	 * @return Node either element, doctype, text, or null
-	 */
-	private Node getCurrentNode(IDocument document, int offset) {
-		// get the current node at the offset (returns either: element,
-		// doctype, text)
-		IndexedRegion inode = null;
-		IStructuredModel sModel = null;
-		try {
-			sModel = StructuredModelManager.getModelManager().getExistingModelForRead(document);
-			inode = sModel.getIndexedRegion(offset);
-			if (inode == null)
-				inode = sModel.getIndexedRegion(offset - 1);
-		}
-		finally {
-			if (sModel != null)
-				sModel.releaseFromRead();
-		}
-
-		if (inode instanceof Node) {
-			return (Node) inode;
-		}
-		return null;
-	}
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLMultiPageEditorPart.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLMultiPageEditorPart.java
deleted file mode 100644
index 32e4c1fd8..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLMultiPageEditorPart.java
+++ /dev/null
@@ -1,653 +0,0 @@
-
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceStatus;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextInputListener;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.events.ShellAdapter;
-import org.eclipse.swt.events.ShellEvent;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorActionBarContributor;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IPartListener;
-import org.eclipse.ui.IPropertyListener;
-import org.eclipse.ui.IStorageEditorInput;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IGotoMarker;
-import org.eclipse.wst.common.ui.provisional.editors.PostMultiPageEditorSite;
-import org.eclipse.wst.common.ui.provisional.editors.PostSelectionMultiPageEditorPart;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-import org.eclipse.wst.xml.core.internal.provisional.IXMLPreferenceNames;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-import org.eclipse.wst.xml.ui.internal.tabletree.XMLEditorMessages;
-
-public class WSDLMultiPageEditorPart extends PostSelectionMultiPageEditorPart implements IPropertyListener {
-
-	/**
-	 * 
-	 */
-	public WSDLMultiPageEditorPart() {
-		super();
-	}
-
-	/**
-	 * Internal part activation listener
-	 */
-	class PartListener extends ShellAdapter implements IPartListener {
-		private IWorkbenchPart fActivePart;
-		private boolean fIsHandlingActivation = false;
-
-		private void handleActivation() {
-
-			if (fIsHandlingActivation)
-				return;
-
-			if (fActivePart == WSDLMultiPageEditorPart.this) {
-				fIsHandlingActivation = true;
-				try {
-					safelySanityCheckState();
-				}
-				finally {
-					fIsHandlingActivation = false;
-				}
-			}
-		}
-
-		/**
-		 * @see IPartListener#partActivated(IWorkbenchPart)
-		 */
-		public void partActivated(IWorkbenchPart part) {
-			fActivePart = part;
-			handleActivation();
-		}
-
-		/**
-		 * @see IPartListener#partBroughtToTop(IWorkbenchPart)
-		 */
-		public void partBroughtToTop(IWorkbenchPart part) {
-		}
-
-		/**
-		 * @see IPartListener#partClosed(IWorkbenchPart)
-		 */
-		public void partClosed(IWorkbenchPart part) {
-		}
-
-		/**
-		 * @see IPartListener#partDeactivated(IWorkbenchPart)
-		 */
-		public void partDeactivated(IWorkbenchPart part) {
-			fActivePart = null;
-		}
-
-		/**
-		 * @see IPartListener#partOpened(IWorkbenchPart)
-		 */
-		public void partOpened(IWorkbenchPart part) {
-		}
-
-		/*
-		 * @see ShellListener#shellActivated(ShellEvent)
-		 */
-		public void shellActivated(ShellEvent e) {
-			handleActivation();
-		}
-	}
-
-	class TextInputListener implements ITextInputListener {
-		public void inputDocumentAboutToBeChanged(IDocument oldInput, IDocument newInput) {
-		}
-
-		public void inputDocumentChanged(IDocument oldInput, IDocument newInput) {
-		}
-	}
-
-	/** The source page index. */
-	private int fSourcePageIndex;
-	/** The text editor. */
-	private StructuredTextEditor fTextEditor;
-
-	private PartListener partListener;
-
-
-	/*
-	 * This method is just to make firePropertyChanged accessbible from some
-	 * (anonomous) inner classes.
-	 */
-	protected void _firePropertyChange(int property) {
-		super.firePropertyChange(property);
-	}
-
-	/**
-	 * Adds the source page of the multi-page editor.
-	 */
-	protected void addSourcePage() throws PartInitException {
-		try {
-			fSourcePageIndex = addPage(fTextEditor, getEditorInput());
-			setPageText(fSourcePageIndex, WSDLEditorPlugin.getWSDLString("_UI_TAB_SOURCE")); //$NON-NLS-1$
-			// the update's critical, to get viewer selection manager and
-			// highlighting to work
-			fTextEditor.update();
-
-			firePropertyChange(PROP_TITLE);
-
-			// Changes to the Text Viewer's document instance should also
-			// force an
-			// input refresh
-			fTextEditor.getTextViewer().addTextInputListener(new TextInputListener());
-		}
-		catch (PartInitException e) {
-			// dispose editor
-			dispose();
-
-			// log for now, unless we find reason not to
-			Logger.log(Logger.INFO, e.getMessage());
-		}
-	}
-
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.part.MultiPageEditorPart#createPages()
-	 */
-	protected void createPages() {
-		try {
-			// source page MUST be created before design page, now
-			createSourcePage();
-			addSourcePage();
-			setActivePage();
-
-			// future_TODO: add a catch block here for any exception the
-			// design
-			// page throws and convert it into a more informative message.
-		}
-		catch (PartInitException e) {
-			throw new RuntimeException(e);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.ui.part.MultiPageEditorPart#createSite(org.eclipse.ui.IEditorPart)
-	 */
-	protected IEditorSite createSite(IEditorPart editor) {
-		IEditorSite site = null;
-		if (editor == fTextEditor) {
-			site = new PostMultiPageEditorSite(this, editor) {
-				/**
-				 * @see org.eclipse.ui.part.MultiPageEditorSite#getActionBarContributor()
-				 */
-				public IEditorActionBarContributor getActionBarContributor() {
-					IEditorActionBarContributor contributor = super.getActionBarContributor();
-//					IEditorActionBarContributor multiContributor = WSDLMultiPageEditorPart.this.getEditorSite().getActionBarContributor();
-					// if (multiContributor instanceof
-					// XMLMultiPageEditorActionBarContributor) {
-					// contributor = ((XMLMultiPageEditorActionBarContributor)
-					// multiContributor).sourceViewerActionContributor;
-					// }
-					return contributor;
-				}
-
-				public String getId() {
-					// sets this id so nested editor is considered xml source
-					// page
-					return ContentTypeIdForXML.ContentTypeID_XML + ".source"; //$NON-NLS-1$;
-				}
-			};
-		}
-		else {
-			site = super.createSite(editor);
-		}
-		return site;
-	}
-
-	/**
-	 * Creates the source page of the multi-page editor.
-	 */
-	protected void createSourcePage() throws PartInitException {
-		fTextEditor = createTextEditor();
-		fTextEditor.setEditorPart(this);
-
-		// Set the SourceViewerConfiguration now so the text editor won't use
-		// the default configuration first
-		// and switch to the StructuredTextViewerConfiguration later.
-		// DMW removed setSourceViewerConfiguration 3/26/2003 since added
-		// createPartControl to our text editor.
-		// fTextEditor.setSourceViewerConfiguration();
-		fTextEditor.addPropertyListener(this);
-	}
-
-	/**
-	 * Method createTextEditor.
-	 * 
-	 * @return StructuredTextEditor
-	 */
-	protected StructuredTextEditor createTextEditor() {
-		return new StructuredTextEditor();
-	}
-
-	public void dispose() {
-		IWorkbenchWindow window = getSite().getWorkbenchWindow();
-		window.getPartService().removePartListener(partListener);
-		window.getShell().removeShellListener(partListener);
-
-		getSite().getPage().removePartListener(partListener);
-		if (fTextEditor != null) {
-			fTextEditor.removePropertyListener(this);
-		}
-
-		// moved to last when added window ... seems like
-		// we'd be in danger of losing some data, like site,
-		// or something.
-		super.dispose();
-	}
-
-	/*
-	 * (non-Javadoc) Saves the contents of this editor. <p> Subclasses must
-	 * override this method to implement the open-save-close lifecycle for an
-	 * editor. For greater details, see <code> IEditorPart </code></p>
-	 * 
-	 * @see IEditorPart
-	 */
-	public void doSave(IProgressMonitor monitor) {
-		fTextEditor.doSave(monitor);
-		// // this is a temporary way to force validation.
-		// // when the validator is a workbench builder, the following lines
-		// can be removed
-		// if (fDesignViewer != null)
-		// fDesignViewer.saveOccurred();
-
-	}
-
-	/*
-	 * (non-Javadoc) Saves the contents of this editor to another object. <p>
-	 * Subclasses must override this method to implement the open-save-close
-	 * lifecycle for an editor. For greater details, see <code> IEditorPart
-	 * </code></p>
-	 * 
-	 * @see IEditorPart
-	 */
-	public void doSaveAs() {
-		fTextEditor.doSaveAs();
-		// 253619
-		// following used to be executed here, but is
-		// now called "back" from text editor (since
-		// mulitiple paths to the performSaveAs in StructuredTextEditor.
-		// doSaveAsForStructuredTextMulitPagePart();
-	}
-
-	private void editorInputIsAcceptable(IEditorInput input) throws PartInitException {
-		if (input instanceof IFileEditorInput) {
-			// verify that it can be opened
-			CoreException[] coreExceptionArray = new CoreException[1];
-			if (fileDoesNotExist((IFileEditorInput) input, coreExceptionArray)) {
-				CoreException coreException = coreExceptionArray[0];
-				if (coreException.getStatus().getCode() == IResourceStatus.FAILED_READ_LOCAL) {
-					// I'm assuming this is always 'does not exist'
-					// we'll refresh local go mimic behavior of default
-					// editor, where the
-					// troublesome file is refreshed (and will cause it to
-					// 'disappear' from Navigator.
-					try {
-						((IFileEditorInput) input).getFile().refreshLocal(IResource.DEPTH_ZERO, new NullProgressMonitor());
-					}
-					catch (CoreException ce) {
-						// very unlikely
-						Logger.logException(ce);
-					}
-					throw new PartInitException(NLS.bind(XMLEditorMessages.Resource__does_not_exist, (new Object[]{input.getName()})));
-				}
-				else {
-					throw new PartInitException(NLS.bind(XMLEditorMessages.Editor_could_not_be_open, (new Object[]{input.getName()})));
-				}
-			}
-		}
-		else if (input instanceof IStorageEditorInput) {
-			InputStream contents = null;
-			try {
-				contents = ((IStorageEditorInput) input).getStorage().getContents();
-			}
-			catch (CoreException noStorageExc) {
-			}
-			if (contents == null) {
-				throw new PartInitException(NLS.bind(XMLEditorMessages.Editor_could_not_be_open, (new Object[]{input.getName()})));
-			}
-			else {
-				try {
-					contents.close();
-				}
-				catch (IOException e) {
-				}
-			}
-		}
-	}
-
-	// void doSaveAsForStructuredTextMulitPagePart() {
-	// setPageText(getActivePage(), fTextEditor.getTitle());
-	// setInput(fTextEditor.getEditorInput());
-	// if (fDesignViewer != null) {
-	// //fDesignViewer.setEditorInput(fTextEditor.getEditorInput());
-	// fDesignViewer.setModel(getModel());
-	// fDesignViewer.saveAsOccurred();
-	// }
-	// // even though we've set title etc., several times already!
-	// // only now is all prepared for it.
-	// firePropertyChange(IWorkbenchPart.PROP_TITLE);
-	// firePropertyChange(PROP_DIRTY);
-	// }
-	/*
-	 * (non-Javadoc) Initializes the editor part with a site and input. <p>
-	 * Subclasses of <code> EditorPart </code> must implement this method.
-	 * Within the implementation subclasses should verify that the input type
-	 * is acceptable and then save the site and input. Here is sample code:
-	 * </p><pre> if (!(input instanceof IFileEditorInput)) throw new
-	 * PartInitException("Invalid Input: Must be IFileEditorInput");
-	 * setSite(site); setInput(editorInput); </pre>
-	 */
-	protected boolean fileDoesNotExist(IFileEditorInput input, Throwable[] coreException) {
-		boolean result = false;
-		InputStream inStream = null;
-		if ((!(input.exists())) || (!(input.getFile().exists()))) {
-			result = true;
-		}
-		else {
-			try {
-				inStream = input.getFile().getContents(true);
-			}
-			catch (CoreException e) {
-				// very likely to be file not found
-				result = true;
-				coreException[0] = e;
-			}
-			finally {
-				if (input != null) {
-					try {
-						if (inStream != null) {
-							inStream.close();
-						}
-					}
-					catch (IOException e) {
-
-					}
-				}
-			}
-		}
-		return result;
-	}
-
-	public Object getAdapter(Class key) {
-		Object result = null;
-
-		// DMW: I'm bullet-proofing this because
-		// its been reported (on 4.03 version) a null pointer sometimes
-		// happens here on startup, when an editor has been left
-		// open when workbench shutdown.
-		if (fTextEditor != null) {
-			result = fTextEditor.getAdapter(key);
-		}
-		return result;
-	}
-
-	public IEditorPart getEditorPart() {
-		return this;
-	}
-
-	protected IStructuredModel getModel() {
-		IStructuredModel model = null;
-		if (fTextEditor != null) {
-			model = fTextEditor.getModel();
-//			IDocument doc = fTextEditor.getDocumentProvider().getDocument(getEditorInput());	
-//	    	IModelManager modelManager = ModelManagerImpl.getInstance();    	
-//	    	model = modelManager.getModelForRead((IStructuredDocument) doc);
-		}
-
-		return model;
-	}
-
-	protected IPreferenceStore getPreferenceStore() {
-		return WSDLEditorPlugin.getInstance().getPreferenceStore();
-	}
-
-	public StructuredTextEditor getTextEditor() {
-		return fTextEditor;
-	}
-
-	/*
-	 * (non-Javadoc) Method declared on IWorkbenchPart.
-	 */
-	public String getTitle() {
-		String title = null;
-		if (getTextEditor() == null) {
-			if (getEditorInput() != null) {
-				title = getEditorInput().getName();
-			}
-		}
-		else {
-			title = getTextEditor().getTitle();
-		}
-		if (title == null) {
-			title = getPartName();
-		}
-		return title;
-	}
-
-	/*
-	 * (non-Javadoc) Sets the cursor and selection state for this editor to
-	 * the passage defined by the given marker. <p> Subclasses may override.
-	 * For greater details, see <code> IEditorPart </code></p>
-	 * 
-	 * @see IEditorPart
-	 */
-	public void gotoMarker(IMarker marker) {
-		// (pa) 20020217 this was null when opening an editor that was
-		// already open
-		if (fTextEditor != null) {
-			IGotoMarker markerGotoer = (IGotoMarker) fTextEditor.getAdapter(IGotoMarker.class);
-			markerGotoer.gotoMarker(marker);
-		}
-	}
-
-	public void init(IEditorSite site, IEditorInput input) throws PartInitException {
-		editorInputIsAcceptable(input);
-		try {
-			super.init(site, input);
-			if (partListener == null) {
-				partListener = new PartListener();
-			}
-			// getSite().getPage().addPartListener(partListner);
-			// we want to listen for our own activation
-			IWorkbenchWindow window = getSite().getWorkbenchWindow();
-			window.getPartService().addPartListener(partListener);
-			window.getShell().addShellListener(partListener);
-		}
-		catch (Exception e) {
-			// log for now, unless we find reason not to
-			Logger.log(Logger.INFO, e.getMessage());
-		}
-		setPartName(input.getName());
-	}
-
-	/*
-	 * (non-Javadoc) Returns whether the "save as" operation is supported by
-	 * this editor. <p> Subclasses must override this method to implement the
-	 * open-save-close lifecycle for an editor. For greater details, see
-	 * <code> IEditorPart </code></p>
-	 * 
-	 * @see IEditorPart
-	 */
-	public boolean isSaveAsAllowed() {
-		return fTextEditor != null && fTextEditor.isSaveAsAllowed();
-	}
-
-	/*
-	 * (non-Javadoc) Returns whether the contents of this editor should be
-	 * saved when the editor is closed. <p> This method returns <code> true
-	 * </code> if and only if the editor is dirty ( <code> isDirty </code> ).
-	 * </p>
-	 */
-	public boolean isSaveOnCloseNeeded() {
-		// overriding super class since it does a lowly isDirty!
-		if (fTextEditor != null)
-			return fTextEditor.isSaveOnCloseNeeded();
-		return isDirty();
-	}
-
-	/**
-	 * Notifies this multi-page editor that the page with the given id has
-	 * been activated. This method is called when the user selects a different
-	 * tab.
-	 * 
-	 * @param newPageIndex
-	 *            the index of the activated page
-	 */
-	protected void pageChange(int newPageIndex) {
-		super.pageChange(newPageIndex);
-
-		saveLastActivePageIndex(newPageIndex);
-	}
-
-	/**
-	 * Posts the update code "behind" the running operation.
-	 */
-	protected void postOnDisplayQue(Runnable runnable) {
-		IWorkbench workbench = PlatformUI.getWorkbench();
-		IWorkbenchWindow[] windows = workbench.getWorkbenchWindows();
-		if (windows != null && windows.length > 0) {
-			Display display = windows[0].getShell().getDisplay();
-			display.asyncExec(runnable);
-		}
-		else
-			runnable.run();
-	}
-
-	/**
-	 * Indicates that a property has changed.
-	 * 
-	 * @param source
-	 *            the object whose property has changed
-	 * @param propId
-	 *            the id of the property which has changed; property ids are
-	 *            generally defined as constants on the source class
-	 */
-	public void propertyChanged(Object source, int propId) {
-		switch (propId) {
-			// had to implement input changed "listener" so that
-			// strucutedText could tell it containing editor that
-			// the input has change, when a 'resource moved' event is
-			// found.
-			case IEditorPart.PROP_INPUT :
-			case IEditorPart.PROP_DIRTY : {
-				if (source == fTextEditor) {
-					if (fTextEditor.getEditorInput() != getEditorInput()) {
-						setInput(fTextEditor.getEditorInput());
-						// title should always change when input changes.
-						// create runnable for following post call
-						Runnable runnable = new Runnable() {
-							public void run() {
-								_firePropertyChange(IWorkbenchPart.PROP_TITLE);
-							}
-						};
-						// Update is just to post things on the display queue
-						// (thread). We have to do this to get the dirty
-						// property to get updated after other things on the
-						// queue are executed.
-						postOnDisplayQue(runnable);
-					}
-				}
-				break;
-			}
-			case IWorkbenchPart.PROP_TITLE : {
-				// update the input if the title is changed
-				if (source == fTextEditor) {
-					if (fTextEditor.getEditorInput() != getEditorInput()) {
-						setInput(fTextEditor.getEditorInput());
-					}
-				}
-				break;
-			}
-			default : {
-				// propagate changes. Is this needed? Answer: Yes.
-				if (source == fTextEditor) {
-					firePropertyChange(propId);
-				}
-				break;
-			}
-		}
-
-	}
-
-	protected void safelySanityCheckState() {
-		// If we're called before editor is created, simply ignore since we
-		// delegate this function to our embedded TextEditor
-		if (getTextEditor() == null)
-			return;
-
-		getTextEditor().safelySanityCheckState(getEditorInput());
-
-	}
-
-	protected void saveLastActivePageIndex(int newPageIndex) {
-		// save the last active page index to preference manager
-		getPreferenceStore().setValue(IXMLPreferenceNames.LAST_ACTIVE_PAGE, newPageIndex);
-	}
-
-	/**
-	 * Sets the currently active page.
-	 */
-	protected void setActivePage() {
-		// retrieve the last active page index from preference manager
-		int activePageIndex = getPreferenceStore().getInt(IXMLPreferenceNames.LAST_ACTIVE_PAGE);
-
-		// We check this range since someone could hand edit the XML
-		// preference file to an invalid value ... which I know from
-		// experience :( ... if they do, we'll reset to default and continue
-		// rather than throw an assertion error in the setActivePage(int)
-		// method.
-		if (activePageIndex < 0 || activePageIndex >= getPageCount()) {
-			activePageIndex = fSourcePageIndex;
-		}
-		setActivePage(activePageIndex);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.part.EditorPart#setInput(org.eclipse.ui.IEditorInput)
-	 */
-	protected void setInput(IEditorInput input) {
-		// If driven from the Source page, it's "model" may not be up to date
-		// with the input just yet. We'll rely on later notification from the
-		// TextViewer to set us straight
-		super.setInput(input);
-		setPartName(input.getName());
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLSelectionManager.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLSelectionManager.java
deleted file mode 100644
index 55a4d8377..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLSelectionManager.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-
-public class WSDLSelectionManager implements ISelectionProvider, ISelectionChangedListener
-{       
-  protected List listenerList = new ArrayList();
-  protected ISelection currentSelection;
-  protected boolean enableNotify = true;
-
-  public void setSelection(ISelection selection, ISelectionProvider source)
-  {  
-    if (enableNotify)
-    {
-      currentSelection = selection;
-      enableNotify = false;
-      try
-      {
-        SelectionChangedEvent event = new SelectionChangedEvent(source, selection);
-        List copyOfListenerList = new ArrayList(listenerList);
-        for (Iterator i = copyOfListenerList.iterator(); i.hasNext(); )
-        {
-          ISelectionChangedListener listener = (ISelectionChangedListener)i.next();
-          listener.selectionChanged(event);
-        }
-      }
-      finally
-      {
-        enableNotify = true;
-      }
-    }
-  }      
-
-  //  implements ISelectionProvider
-  //
-  public void setSelection(ISelection selection)
-  {
-    setSelection(selection, this);
-  }
-
-  public ISelection getSelection() 
-  {
-    return currentSelection;
-  }
-
-  public void removeSelectionChangedListener(ISelectionChangedListener listener) 
-  {
-    listenerList.remove(listener);
-  }
-  
-  public void addSelectionChangedListener(ISelectionChangedListener listener) 
-  {
-    listenerList.add(listener);
-  } 
-  
-  // implements ISelectionChangedListener
-  //
-  public void selectionChanged(SelectionChangedEvent event)  
-  {                                                                                         
-    if (enableNotify)
-    {
-      setSelection(event.getSelection(), event.getSelectionProvider());
-    }
-  }
-}                      
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddEEMenuActionContributor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddEEMenuActionContributor.java
deleted file mode 100644
index a8bb5d65b..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddEEMenuActionContributor.java
+++ /dev/null
@@ -1,339 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions; 
-                      
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.UnknownExtensibilityElement;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.internal.util.WSDLSwitch;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.extension.IMenuActionContributor;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQueryAction;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.DOMContentBuilder;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.DOMContentBuilderImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.DOMNamespaceHelper;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML;
-import org.eclipse.wst.xml.ui.internal.actions.MenuBuilder;
-import org.eclipse.wst.xml.ui.internal.util.XMLCommonResources;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-                             
-/**
- * TODO... there are likely several places where we can refactor code from  AbstractNodeActionManager
- */
-public class AddEEMenuActionContributor implements IMenuActionContributor
-{                   
-  protected MenuBuilder menuBuilder = new MenuBuilder();
-
-  public void contributeMenuActions(final IMenuManager menu, Node node, Object object)
-  {
-    boolean isSubmenuRequired = false;
-    Element element = null;
-
-    if (object instanceof WSDLElement)
-    {     
-      WSDLSwitch wsdlSwitch = new WSDLSwitch()
-      {                   
-      	public Object caseBinding(Binding binding)
-        {                                          
-          return Boolean.TRUE;
-	      } 
-
-      	public Object caseBindingOperation(BindingOperation bindingOperation)
-        {                                          
-          return Boolean.TRUE;
-	      } 
-
-      	public Object caseBindingInput(BindingInput bindingInput)
-        {                                          
-          return Boolean.TRUE;
-	      } 
-
-      	public Object caseBindingOutput(BindingOutput bindingOutput)
-        {                                          
-          return Boolean.TRUE;
-	      }
-
-      	public Object caseBindingFault(BindingFault bindingFault)
-        {                                          
-          return Boolean.TRUE;
-	      } 
- 
-      	public Object caseDefinition(Definition definition)
-        {      
-          return Boolean.TRUE;
-	      }           
-     
-      	public Object casePort(Port port)
-        {                                         
-          return Boolean.TRUE;
-        } 
-      	public Object caseUnknownExtensibilityElement(UnknownExtensibilityElement unknownExtensibilityElement)
-      	{
-      		if (getExtensibilityElementActions(unknownExtensibilityElement.getElement()).size() > 0)
-      		{      		
-      			return Boolean.TRUE;
-      		}
-      		else
-      		{
-      			return Boolean.FALSE;
-      		}
-      	}
-      };        
-      isSubmenuRequired = wsdlSwitch.doSwitch((WSDLElement)object) != null;
-      element = WSDLEditorUtil.getInstance().getElementForObject(object);      
-    }
-    else if (object instanceof WSDLGroupObject)
-    {
-      WSDLGroupObject groupObject = (WSDLGroupObject)object;
-     
-      switch (groupObject.getType())
-      {   
-        case WSDLGroupObject.EXTENSIBILITY_ELEMENTS_GROUP : 
-        {
-          isSubmenuRequired = true;
-          element = WSDLEditorUtil.getInstance().getElementForObject(groupObject.getDefinition());    
-          break;
-        }
-      }   
-    }
-
-    if (isSubmenuRequired)
-    {
-      MenuManager submenu = new MenuManager(WSDLEditorPlugin.getWSDLString("_UI_ADD_EXTENSIBILITY_ELEMENT"));  //$NON-NLS-1$
-      // here I'm attempting to add the menu item in a 'good' place in the exisiting menu
-      // todo add menu groups to avoid the need for this test
-      //
-//      if (menu.find("addchild") != null)
-//      {
-//      	menu.insertAfter("addchild", submenu);
-//      }
-//      else
-//      {
-//      	menu.add(submenu);
-//      }	 
-    	menu.add(submenu);
-      if (element != null && element instanceof IDOMNode)
-      {
-        addExtensibilityElementActions(submenu, element);
-      }
-    }
-  }
-
-  public void addExtensibilityElementActions(IMenuManager menu, Element element)
-  {                 
-    ModelQuery modelQuery = ModelQueryUtil.getModelQuery(element.getOwnerDocument());
-    CMElementDeclaration ed = modelQuery.getCMElementDeclaration(element);
-    
-    if (ed != null)
-    {
-      addActionHelper(menu, getExtensibilityElementActions(element));
-    }
-  }
-  
-  public List getExtensibilityElementActions(Element element) {
-    List modelQueryActionList = new ArrayList();
-  	ModelQuery modelQuery = ModelQueryUtil.getModelQuery(element.getOwnerDocument());
-    CMElementDeclaration ed = modelQuery.getCMElementDeclaration(element);                                                                                                                            
-
-    if (ed != null)
-    {                                                                                    
-      // add insert child node actions
-      //
-      int ic = ModelQuery.INCLUDE_CHILD_NODES;
-      int vc = ModelQuery.VALIDITY_STRICT;
-
-      modelQuery.getInsertActions(element, ed, -1, ic, vc, modelQueryActionList);
-    }
-    
-    return modelQueryActionList;
-  }
-  
-
-  protected void addActionHelper(IMenuManager menu, List modelQueryActionList)
-  {                          
-    List actionList = new Vector();
-
-    for (Iterator i = modelQueryActionList.iterator(); i.hasNext(); )
-    {                                                   
-      ModelQueryAction action = (ModelQueryAction)i.next();
-      CMNode cmnode = action.getCMNode();
-      if (cmnode != null)
-      {                                       
-        boolean isOtherNamespace = false;
-        CMDocument cmDocument = (CMDocument)cmnode.getProperty("CMDocument");
-        if (cmDocument != null)          
-        {             
-          String namespaceURI = (String)cmDocument.getProperty("http://org.eclipse.wst/cm/properties/targetNamespaceURI"); 
-          isOtherNamespace = namespaceURI != null && !namespaceURI.equals(WSDLConstants.WSDL_NAMESPACE_URI);
-        }
-
-        if (isOtherNamespace)
-        {
-          int cmNodeType = cmnode.getNodeType();
-          if (action.getKind() == ModelQueryAction.INSERT)
-          {                                                 
-            switch (cmNodeType)                             
-            {
-              case CMNode.ELEMENT_DECLARATION :
-              {
-                actionList.add(new AddNodeAction((CMElementDeclaration)cmnode, action.getParent(), action.getStartIndex()));
-                break;
-              }
-            }
-          }           
-        }
-      }   
-    }  
-    menuBuilder.populateMenu(menu, actionList, false);
-  }   
-
-  /**
-   * AddNodeAction
-   */
-  public class AddNodeAction extends BaseNodeAction
-  {
-    protected String description;
-    protected String undoDescription; 
-    protected CMNode cmnode;
-    protected int index;
-    protected Node parent;
-
-
-    public AddNodeAction(CMNode cmnode, Node parent,  int index)
-    {                                 
-      this.cmnode = cmnode;
-      this.parent = parent;
-      this.index = index;                                   
-                                                                                                
-      String text = getLabel(parent, cmnode);
-      setText(text);     
-      description = text;
-      undoDescription = XMLCommonResources.getInstance().getString("_UI_MENU_ADD") + " " + text;
-      //setImageDescriptor(imageDescriptorCache.getImageDescriptor(cmnode)); 
-    }
-
-    public String getLabel(Node parent, CMNode cmnode)
-    {                                                
-      String result = "?" + cmnode + "?";
-      if (cmnode != null)
-      {                
-        result = DOMNamespaceHelper.computeName(cmnode, parent, null);         
-      }
-      return result;   
-    }  
-
-    public Node getNode()
-    {
-      return parent;
-    }
-
-    public String getUndoDescription()
-    {
-      return undoDescription;
-    }
-
-    public void run()
-    {
-      beginRecording();
-
-      if (cmnode != null && parent != null)
-      {
-        Document document = parent.getNodeType() == Node.DOCUMENT_NODE ? (Document)parent : parent.getOwnerDocument();        
-
-        DOMContentBuilder builder = new DOMContentBuilderImpl(document); 
-        builder.setProperty(DOMContentBuilder.PROPERTY_BUILD_BLANK_TEXT_NODES, Boolean.TRUE);
-        builder.setBuildPolicy(DOMContentBuilder.BUILD_ONLY_REQUIRED_CONTENT);
-        builder.build(parent, cmnode);
-        insertNodesAtIndex(parent, builder.getResult(), index, true);
-      }
-
-      endRecording();
-    } 
-
-    public void insertNodesAtIndex(Node parent, List list, int index, boolean format)
-    {                   
-      NodeList nodeList = parent.getChildNodes();
-      if (index == -1)
-      {
-        index = nodeList.getLength();
-      }
-      Node refChild = (index < nodeList.getLength()) ? nodeList.item(index) : null;
-    
-      // here we consider the case where the previous node is a 'white space' Text node
-      // we should really do the insert before this node
-      //
-      int prevIndex = index - 1;
-      Node prevChild = (prevIndex < nodeList.getLength()) ? nodeList.item(prevIndex) : null;
-	    if (isWhitespaceTextNode(prevChild)) 
-      {
-	  	  refChild = prevChild;
-	    }
-    
-      for (Iterator i = list.iterator(); i.hasNext(); )
-      {
-        Node newNode = (Node)i.next();
-    
-        if (newNode.getNodeType() == Node.ATTRIBUTE_NODE)
-        {
-          Element parentElement = (Element)parent;
-          parentElement.setAttributeNode((Attr)newNode);
-        }
-        else
-        {
-          parent.insertBefore(newNode, refChild);
-        }  
-      }
-    
-      for (Iterator i = list.iterator(); i.hasNext(); )
-      {
-        Node newNode = (Node)i.next();
-        if (format)
-        {                                                             
-		      FormatProcessorXML formatProcessorXML = new FormatProcessorXML();
-		      formatProcessorXML.formatNode((IDOMNode)newNode);
-        }  
-      }                      
-	    //setViewerSelection(list);
-    }   
-
-    protected boolean isWhitespaceTextNode(Node node) 
-    {
-	    return (node != null) && (node.getNodeType() == Node.TEXT_NODE) && (node.getNodeValue().trim().length() == 0);
-    } 
-  }                                       
-}    
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddElementAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddElementAction.java
deleted file mode 100644
index 12a1f6b3d..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddElementAction.java
+++ /dev/null
@@ -1,329 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import java.util.HashMap;
-import java.util.List;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.wsdl.ui.internal.widgets.NewComponentDialog;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-public class AddElementAction extends BaseNodeAction {
-	protected Node parentNode;
-	protected String prefix;
-	protected String nodeName;
-	protected Element newElement;
-	protected Node relativeNode = null;
-	protected IEditorPart editorPart;
-	protected Definition definition;
-	protected Document document;
-	protected boolean computeTopLevelRefChild;
-
-	protected boolean selectNewlyCreatedObject = true; // We should not be
-														// selecting the
-														// object in the
-														// action..... TODO
-
-	public AddElementAction(String text, String imageDescriptorKey, Node parentNode, String nodeName) {
-		setText(text);
-		setImageDescriptor(WSDLEditorPlugin.getImageDescriptor(imageDescriptorKey));
-		this.parentNode = parentNode;
-		this.nodeName = nodeName;
-	}
-
-	public AddElementAction(String text, String imageDescriptorKey, Node parentNode, String prefix, String localName) {
-		setText(text);
-		setImageDescriptor(WSDLEditorPlugin.getImageDescriptor(imageDescriptorKey));
-		this.parentNode = parentNode;
-		this.prefix = prefix;
-		this.nodeName = localName;
-	}
-
-	public AddElementAction(String text, Node parentNode, String prefix, String localName) {
-		setText(text);
-		setImageDescriptor(null);
-		this.parentNode = parentNode;
-		this.prefix = prefix;
-		this.nodeName = localName;
-	}
-
-	public AddElementAction(Node parentNode, String prefix, String localName, Node relativeNode) {
-		this.parentNode = parentNode;
-		this.prefix = prefix;
-		this.nodeName = localName;
-		this.relativeNode = relativeNode;
-	}
-
-	public void setComputeTopLevelRefChild(boolean isEnabled) {
-		computeTopLevelRefChild = isEnabled;
-	}
-
-	protected void setEditorPart(IEditorPart editorPart) {
-		this.editorPart = editorPart;
-	}
-
-	protected boolean showDialog() {
-		return true;
-	}
-
-	public void run() {
-		boolean ok = showDialog();
-		if (ok) {
-			beginRecording();
-			performAddElement();
-			endRecording();
-		}
-	}
-
-	protected void performAddElement() {
-		if (parentNode != null) {
-			newElement = createElement(nodeName);
-			addAttributes(newElement);
-			if (relativeNode == null && computeTopLevelRefChild) {
-				relativeNode = computeTopLevelRefChild(newElement);
-			}
-
-			if (relativeNode == null) {
-				parentNode.appendChild(newElement);
-			}
-			else {
-				parentNode.insertBefore(newElement, relativeNode);
-			}
-			// format(parentNode);
-			format(newElement);
-			// Ugly..... We should not be selecting the object in the graph
-			// view in the Action.
-			// This should be refactored out. We add this boolean check
-			// because WSDLSetTypeDialog.java
-			// uses AddImportAction.java but we should not be selecting the
-			// newly created import....
-			if (selectNewlyCreatedObject) {
-				selectObjectForNewElement();
-			}
-		}
-	}
-
-	// Ugly..... We should not be selecting the object in the graph view in
-	// the Action.
-	// This should be refactored out. We add this boolean check because
-	// WSDLSetTypeDialog.java
-	// uses AddImportAction.java but we should not be selecting the newly
-	// created import....
-	// We should call this method before calling run()
-	public void selectObjectForNewElement(boolean select) {
-		selectNewlyCreatedObject = select;
-	}
-
-	public Node getNode() {
-		if (parentNode != null) {
-			return parentNode;
-		}
-		else {
-			return document;
-		}
-	}
-
-
-	public String getUndoDescription() {
-		return WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD");
-	}
-
-
-	protected Element createElement(String nodeName) {
-		Document document = parentNode.getOwnerDocument();
-
-		Element element = (prefix != null && prefix.length() > 0) ? document.createElement(prefix + ":" + nodeName) : document.createElement(nodeName);
-
-		return element;
-	}
-
-	protected void addAttributes(Element newElement) {
-	}
-
-
-	protected void format(Node parentNode) {
-		if (parentNode instanceof IDOMNode) {
-			// format selected node
-			FormatProcessorXML formatProcessorXML = new FormatProcessorXML();
-			formatProcessorXML.formatNode((IDOMNode) parentNode);
-
-		}
-	}
-
-	protected Element getDefinitionElement(Element parentElement) {
-		Element definitionElement = null;
-
-		for (Node node = parentElement.getOwnerDocument().getFirstChild(); node != null; node = node.getNextSibling()) {
-			if (node.getNodeType() == Node.ELEMENT_NODE) {
-				Element element = (Element) node;
-				if (WSDLEditorUtil.getInstance().getWSDLType(element) == WSDLConstants.DEFINITION) {
-					definitionElement = element;
-					break;
-				}
-			}
-		}
-		return definitionElement;
-	}
-
-	public Element getNewElement() {
-		return newElement;
-	}
-
-	public void setDefinition(Definition definition) {
-		this.definition = definition;
-	}
-
-	public void selectObjectForNewElement() {
-		if (editorPart == null) {
-			editorPart = WSDLEditorPlugin.getInstance().getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-		}
-		if (editorPart != null && definition != null) {
-			Object object = WSDLEditorUtil.getInstance().findModelObjectForElement(definition, newElement);
-			if (object != null) {
-				ISelectionProvider selectionProvider = (ISelectionProvider) editorPart.getAdapter(ISelectionProvider.class);
-				if (selectionProvider != null) {
-					selectionProvider.setSelection(new StructuredSelection(object));
-				}
-			}
-		}
-	}
-
-	public void selectObject(WSDLElement object) {
-		if (editorPart == null) {
-			editorPart = WSDLEditorPlugin.getInstance().getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-		}
-		if (editorPart != null && definition != null) {
-			if (object != null) {
-				ISelectionProvider selectionProvider = (ISelectionProvider) editorPart.getAdapter(ISelectionProvider.class);
-				if (selectionProvider != null) {
-					selectionProvider.setSelection(new StructuredSelection(object));
-				}
-			}
-		}
-	}
-
-	public String showDialogHelper(String title, String defaultName, List usedNames) {
-		String result = defaultName;
-		NewComponentDialog dialog = new NewComponentDialog(WSDLEditorPlugin.getShell(), title, defaultName, usedNames);
-		int rc = dialog.createAndOpen();
-		if (rc == IDialogConstants.OK_ID) {
-			result = dialog.getName();
-		}
-		else {
-			result = null;
-		}
-		return result;
-	}
-
-	protected Node computeTopLevelRefChild(Node nodeToAdd) {
-		Node result = null;
-		int a = getPrecedence(nodeToAdd);
-
-		for (Node node = parentNode.getFirstChild(); node != null; node = node.getNextSibling()) {
-			if (node.getNodeType() == Node.ELEMENT_NODE) {
-				int b = getPrecedence(node);
-				if (b > a) {
-					result = node;
-					break;
-				}
-			}
-		}
-		return result;
-	}
-
-	protected void createDefinitionStub() {
-		if (document != null) {
-			// Create the Definitions element with proper namespace
-			Preferences preference = XMLCorePlugin.getDefault().getPluginPreferences();
-			String charSet = preference.getString(CommonEncodingPreferenceNames.OUTPUT_CODESET);
-			if (charSet == null || charSet.trim().equals("")) {
-				charSet = "UTF-8";
-			}
-			document.appendChild(document.createProcessingInstruction("xml", "version=\"1.0\" encoding=\"" + charSet + "\""));
-			Element root = document.createElement("wsdl:definitions");
-			document.appendChild(root);
-
-			// Add various namespace attributes here.
-			root.setAttribute("xmlns:soap", "http://schemas.xmlsoap.org/wsdl/soap/");
-			root.setAttribute("xmlns:tns", getDefaultNamespace());
-			root.setAttribute("xmlns:wsdl", "http://schemas.xmlsoap.org/wsdl/");
-			root.setAttribute("xmlns:xsd", "http://www.w3.org/2001/XMLSchema");
-			root.setAttribute("name", getFileName());
-			root.setAttribute("targetNamespace", getDefaultNamespace());
-
-			definition.setElement(root);
-			parentNode = root;
-			prefix = definition.getPrefix(WSDLConstants.WSDL_NAMESPACE_URI);
-		}
-	}
-
-	private String getDefaultNamespace() {
-		String namespace = WSDLEditorPlugin.getInstance().getPreferenceStore().getString(WSDLEditorPlugin.getWSDLString("_UI_PREF_PAGE_DEFAULT_TARGET_NAMESPACE"));
-		if (!namespace.endsWith("/")) {
-			namespace = namespace.concat("/");
-		}
-
-		namespace += getFileName() + "/";
-
-		return namespace;
-	}
-
-	private String getFileName() {
-		String fileLocation = definition.getLocation();
-		IPath filePath = new Path(fileLocation);
-		return filePath.removeFileExtension().lastSegment().toString();
-	}
-
-	protected static HashMap precedenceMap = createPrecedenceMap();
-
-	protected static int getPrecedence(Node node) {
-		int result = 2;
-		String localName = node.getLocalName();
-		if (localName != null) {
-			Integer integer = (Integer) precedenceMap.get(localName);
-			if (integer != null) {
-				result = integer.intValue();
-			}
-		}
-		return result;
-	}
-
-	protected static HashMap createPrecedenceMap() {
-		HashMap hashMap = new HashMap();
-		hashMap.put(WSDLConstants.DOCUMENTATION_ELEMENT_TAG, new Integer(1));
-		hashMap.put(WSDLConstants.IMPORT_ELEMENT_TAG, new Integer(3));
-		hashMap.put(WSDLConstants.TYPES_ELEMENT_TAG, new Integer(4));
-		hashMap.put(WSDLConstants.MESSAGE_ELEMENT_TAG, new Integer(5));
-		hashMap.put(WSDLConstants.PORT_TYPE_ELEMENT_TAG, new Integer(6));
-		hashMap.put(WSDLConstants.BINDING_ELEMENT_TAG, new Integer(7));
-		hashMap.put(WSDLConstants.SERVICE_ELEMENT_TAG, new Integer(8));
-		return hashMap;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddElementDeclarationAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddElementDeclarationAction.java
deleted file mode 100644
index 8bdee2f46..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddElementDeclarationAction.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ui.internal.util.NameUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.w3c.dom.Element;
-
-public class AddElementDeclarationAction extends Action
-{
-	protected Definition definition;
-	protected String namespace;
-	protected String prefix;
-	
-	public AddElementDeclarationAction(Definition definition, String namespace, String suggestedPrefix)
-	{
-		this.definition = definition;
-		this.namespace = namespace;
-		this.prefix = suggestedPrefix;
-	}
-	
-	public void run()
-	{
-		String existingPrefix = definition.getPrefix(namespace);
-		if (existingPrefix != null)
-		{
-			prefix = existingPrefix;
-		}
-		else
-		{
-			prefix = NameUtil.buildUniquePrefix(definition, prefix);
-			Element definitionElement = WSDLEditorUtil.getInstance().getElementForObject(definition);
-			if (definitionElement != null)
-			{
-				definitionElement.setAttribute("xmlns:" + prefix, namespace);
-			}			
-		}		
-	}
-	
-	public String getPrefix()
-	{
-		return prefix;
-	}
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddImportAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddImportAction.java
deleted file mode 100644
index fc85352be..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddImportAction.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions; 
-
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class AddImportAction extends AddElementAction
-{                              
-  protected String namespace;
-  protected String location;
-  protected String elementDeclarationNamespacePrefix;
-
-  public AddImportAction(IEditorPart part, Definition definition, Node parentNode, String prefix)
-  {
-	this(part, definition, parentNode, prefix, null, null);
-  }
-  
-  public AddImportAction(IEditorPart part, Definition definition, Node parentNode, String prefix, String namespace, String location)
-  {
-    super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_IMPORT"), "icons/import_obj.gif", parentNode, prefix, "import");
-	  setDefinition(definition);
-	  setComputeTopLevelRefChild(true);
-	  this.namespace = namespace;
-	  this.location = location;
-	  setEditorPart(part);
-	  
-	  if (part instanceof WSDLEditor) {
-	  	document = ((WSDLEditor) part).getXMLDocument();
-	  }
-  }
-        
-  protected Element createElement(String nodeName)
-  {
-  	if (elementDeclarationNamespacePrefix != null && namespace != null)
-  	{ 
-    	Element definitionElement = WSDLEditorUtil.getInstance().getElementForObject(definition);
-    	if (definitionElement != null)
-    	{    
-	  	  definitionElement.setAttribute("xmlns:" + elementDeclarationNamespacePrefix, namespace);
-    	}      	
-  	}
-  	return super.createElement(nodeName);  
-  }
-  
-  public void setElementDeclarationNamespacePrefix(String nsPrefix)
-  {
-  	this.elementDeclarationNamespacePrefix = nsPrefix;
-  }
-                   
-  protected void addAttributes(Element newElement)
-  {                                              
-    newElement.setAttribute("namespace", namespace != null ? namespace : "");
-    newElement.setAttribute("location", location != null ? location : "");
-  }                                     
-  
-  public void performAddElement() {
-  	if (parentNode == null || (document != null && document.getChildNodes().getLength() == 0)) {
-  		createDefinitionStub();
-  	}
-  	
-  	super.performAddElement();
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddMessageUIAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddMessageUIAction.java
deleted file mode 100644
index 7e39d867d..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddMessageUIAction.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddMessageCommand;
-import org.eclipse.wst.wsdl.ui.internal.util.NameUtil;
-import org.eclipse.wst.wsdl.ui.internal.widgets.NewComponentDialog;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-
-
-
-public final class AddMessageUIAction extends WSDLElementUIAction
-{
-  private Definition definition;
-  private String name;
-  
-  public AddMessageUIAction
-  	(Definition definition, 
-     String name, 
-     boolean createPart)
-  {
-    super
-    	(new AddMessageCommand(definition,name,createPart), 
-    	 WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD"), 
-    	 WSDLConstants.MESSAGE_ELEMENT_TAG, 
-    	 WSDLEditorPlugin.getImageDescriptor("icons/message_obj.gif"));
-    
-    this.definition = definition;
-    this.name = name;
-  }
- 
-  protected boolean showDialog()
-  {
-	  name = NameUtil.buildUniqueMessageName(definition, name);
-	  name = showDialogHelper(WSDLEditorPlugin.getWSDLString("_UI_ACTION_NEW_MESSAGE"), name);
-	  return name != null;
-  }
-  
-  protected String showDialogHelper(String title, String defaultName)
-  {   
-    String result = defaultName;                                                                                             
-    NewComponentDialog dialog = new NewComponentDialog(WSDLEditorPlugin.getShell(), title, defaultName);
-    int rc = dialog.createAndOpen();
-    if (rc == IDialogConstants.OK_ID)
-    {
-      result = dialog.getName();  
-    }
-    else
-    {
-      result = null;
-    }               
-    return result;
-  } 
-  
-  protected void preRun()
-  {
-    ((AddMessageCommand)super.modelAction).setLocalName(name);
-  }
-
-  protected WSDLElement getOwner()
-  {
-    return definition;
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddNamespaceDeclarationsAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddNamespaceDeclarationsAction.java
deleted file mode 100644
index b352e34c3..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddNamespaceDeclarationsAction.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import java.util.Hashtable;
-
-import org.eclipse.jface.action.Action;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-
-public class AddNamespaceDeclarationsAction extends Action
-{
-  protected Element ownerElement;
-  protected String[] namespaceNames;
-  protected String[] preferredPrefixes;
-
-  public AddNamespaceDeclarationsAction(Element ownerElement, String[] namespaceNames, String[] preferredPrefixes)
-  {
-    this.ownerElement = ownerElement;
-    this.namespaceNames = namespaceNames;
-    this.preferredPrefixes = preferredPrefixes;
-  }
-
-  public AddNamespaceDeclarationsAction(Element ownerElement, String namespaceName, String preferredPrefix)
-  {
-    this.ownerElement = ownerElement;
-    namespaceNames = new String[1];
-    namespaceNames[0] = namespaceName;
-
-    preferredPrefixes = new String[1];
-    preferredPrefixes[0] = preferredPrefix;
-  }
-
-  public void run()
-  {
-    if (ownerElement != null)
-    {
-      NamedNodeMap map = ownerElement.getAttributes();
-      Hashtable table = new Hashtable();
-      Hashtable prefixTable = new Hashtable();
-
-      int mapLength = map.getLength();
-      for (int i = 0; i < mapLength; i++)
-      {
-        Attr attribute = (Attr) map.item(i);
-        String attributeName = attribute.getName();
-        if (attributeName.startsWith("xmlns:"))
-        {
-          table.put(attribute.getValue(), Boolean.TRUE);
-          prefixTable.put(attributeName.substring(6), Boolean.TRUE);
-        }
-        else if (attributeName.equals("xmlns"))
-        {
-          table.put(attribute.getValue(), Boolean.TRUE);
-          prefixTable.put("", Boolean.TRUE);
-        }
-      }
-
-      for (int i = 0; i < namespaceNames.length; i++)
-      {
-        String namespace = namespaceNames[i];
-        if (table.get(namespace) == null)
-        {
-          String prefix = (i < preferredPrefixes.length) ? preferredPrefixes[i] : "p0";
-          if (prefixTable.get(prefix) != null)
-          {
-            prefix = computeUniquePrefix("p", prefixTable);
-          }
-
-          String attributeName = prefix.length() > 0 ? "xmlns:" + prefix : "xmlns";
-          ownerElement.setAttribute(attributeName, namespace);
-        }
-      }
-    }
-  }
-
-  protected String computeUniquePrefix(String base, Hashtable table)
-  {
-    int i = 0;
-    String prefix = base;
-    while (true)
-    {
-      if (table.get(prefix) == null)
-      {
-        break;
-      }
-      else
-      {
-        prefix = base + i;
-        i++;
-      }
-    }
-    return prefix;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddWSISchemaImportAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddWSISchemaImportAction.java
deleted file mode 100644
index 182c6a42e..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddWSISchemaImportAction.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
-public class AddWSISchemaImportAction extends BaseNodeAction
-{
-    protected Definition definition;
-    protected Element definitionElement;
-    protected String namespace;
-    protected String location;
-    protected String elementDeclarationNamespacePrefix;
-
-    public AddWSISchemaImportAction(Definition definition, String namespace, String location)
-    {
-        this.definition = definition;
-        this.namespace = namespace;
-        this.location = location;
-        definitionElement = WSDLEditorUtil.getInstance().getElementForObject(definition);
-    }
-
-    public Node getNode()
-    {
-        return definitionElement;
-    }
-    
-    public String getUndoDescription()
-    {
-    	return WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_IMPORT");
-    }
-
-    protected Element getOrCreateTypesElement()
-    {
-        Element typesElement = null;
-        if (definition.getTypes() == null)
-        {
-            if (definitionElement != null)
-            {
-                AddElementAction addTypesAction = new AddElementAction("", "icons/xsd_obj.gif", definitionElement, definitionElement.getPrefix(), "types");
-                addTypesAction.setComputeTopLevelRefChild(true);
-                addTypesAction.run();
-                typesElement = addTypesAction.getNewElement();
-                format(typesElement);
-            }
-        }
-        else
-        {
-            typesElement = WSDLEditorUtil.getInstance().getElementForObject(definition.getTypes());
-        }
-        return typesElement;
-    }
-    
-    protected Element getImportHolderElement(Element typesElement) {
-    	Element importHolderElement = null;
-        NodeList nodeList = typesElement.getChildNodes();
-        for (int i = 0; i < nodeList.getLength(); i++)
-        {
-            Node node = nodeList.item(i);
-            if (node.getNodeType() == Node.ELEMENT_NODE)
-            {
-                Element element = (Element) node;
-                if ("schema".equals(element.getLocalName()) && element.getAttribute("targetNamespace") == null)
-                {
-                    importHolderElement = element;
-                    break;
-                }
-            }
-        }
-        
-        return importHolderElement;
-    }
-
-    public Element getOrCreateImportHolderElement(Element typesElement)
-    {
-        Element importHolderElement = getImportHolderElement(typesElement);
-        if (importHolderElement == null)
-        {
-            AddElementAction addImportHolderAction = new AddElementAction("", "icons/xsd_obj.gif", typesElement, "xsd", "schema")
-            {
-                protected void addAttributes(Element newElement)
-                {
-                    newElement.setAttribute("xmlns:xsd", WSDLConstants.XSD_NAMESPACE_URI);
-                }
-            };
-            addImportHolderAction.run();
-            importHolderElement = addImportHolderAction.getNewElement();
-            format(importHolderElement);
-        }
-        return importHolderElement;
-    }
-    
-    // We don't want to add the import if it's already there
-    protected boolean importNotAlreadyExists() {
-    	boolean notExists = true;
-    	
-    	if (definition.getTypes() != null) {
-    		Element typesElement = WSDLEditorUtil.getInstance().getElementForObject(definition.getTypes());
-    		Element schemaElement = getImportHolderElement(typesElement);
-
-    		if (schemaElement != null) {
-    			// Collect children
-    			Node node = schemaElement.getFirstChild();
-    			java.util.Vector schemaChildren = new java.util.Vector();
-    			if (node != null) {
-    				Node child = node;
-					
-    				if (!(child instanceof org.eclipse.wst.xml.core.internal.document.TextImpl)) {
-    					schemaChildren.addElement(child);
-    				}
-					
-    				while (child.getNextSibling() != null) {
-    					child = child.getNextSibling();
-    					if (!(child instanceof org.eclipse.wst.xml.core.internal.document.TextImpl)) {
-    						schemaChildren.addElement(child);
-    					}
-    				}
-
-    				for (int index = 0; index < schemaChildren.size(); index++) {
-    					Element schemaChild = (Element) schemaChildren.elementAt(index);
-    					String schemaLocation = schemaChild.getAttribute("schemaLocation");
-    					String schemaNamespace = schemaChild.getAttribute("namespace");
-				
-    					if (schemaLocation != null && namespace != null &&
-    							schemaLocation.equals(location) && schemaNamespace.equals(namespace)) {
-    						notExists = false;
-    						break;
-    					}
-    				}
-    			}
-    		}
-    	}
-    	
-    	return notExists;
-    }
-
-    public void run()
-    {
-        if (definitionElement != null && importNotAlreadyExists())
-        {
-            beginRecording();
-            performAddElement();
-            endRecording();
-        }
-    }
-    public void performAddElement()
-    {
-        try
-        {
-            Element typesElement = getOrCreateTypesElement();
-            Element importHolderElement = getOrCreateImportHolderElement(typesElement);
-
-            AddElementAction addImportAction = new AddElementAction("", "icons/xsd_obj.gif", importHolderElement, importHolderElement.getPrefix(), "import")
-            {
-                protected void addAttributes(Element newElement)
-                {
-                    newElement.setAttribute("namespace", namespace);
-                    newElement.setAttribute("schemaLocation", location);
-                }
-            };
-            addImportAction.run();
-            Element newElement = addImportAction.getNewElement();
-            format(newElement);
-        }
-        catch (Exception e)
-        {
-        }
-    }
-
-    public void setElementDeclarationNamespacePrefix(String nsPrefix)
-    {
-        this.elementDeclarationNamespacePrefix = nsPrefix;
-    }
-
-    protected static void format(Node parentNode)
-    {
-        if (parentNode instanceof IDOMNode)
-        {
-            // format selected node                                                    
-            FormatProcessorXML formatProcessorXML = new FormatProcessorXML();
-            formatProcessorXML.formatNode((IDOMNode)parentNode);
-        }
-    }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/BaseNodeAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/BaseNodeAction.java
deleted file mode 100644
index e7fc8def9..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/BaseNodeAction.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions; 
-                      
-import org.eclipse.jface.action.Action;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Node;
-
-public abstract class BaseNodeAction extends Action
-{ 
-  public abstract Node getNode();
-  public abstract String getUndoDescription();
-
-  public void beginRecording()
-  {    
-    Node node = getNode();  
-    if (node instanceof IDOMNode)
-    {
-      ((IDOMNode)node).getModel().beginRecording(this, getUndoDescription());  
-    }
-  }
-
-  public void endRecording()
-  {                 
-    Node node = getNode(); 
-    if (node instanceof IDOMNode)
-    {
-      ((IDOMNode)node).getModel().endRecording(this);  
-    }
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/CopyGlobalAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/CopyGlobalAction.java
deleted file mode 100644
index ba45fdeb7..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/CopyGlobalAction.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-public class CopyGlobalAction extends Action {
-  	private IEditorPart editor;
-  	private WSDLElement selection;
-  	
-  	public CopyGlobalAction(WSDLElement selection, IEditorPart editor) {
-  		setText(WSDLEditorPlugin.getWSDLString("_UI_ACTION_COPY"));
-  		this.selection = selection;
-  		this.editor = editor;
-  		setEnabledState();
-  	}
-  	
-  	public void run() {
-  		if (editor instanceof WSDLEditor) {
-  			((WSDLEditor) editor).setClipboardContents(selection);
-  			
-  			((WSDLEditor) editor).getSelectionManager().setSelection(new StructuredSelection(selection));
-  		}
-  	}
-  	
-  	public void setSelection(WSDLElement newSelection) {
-  		selection = newSelection;
-  		setEnabledState();
-  	}
-  	
-  	protected void setEnabledState() {
-  		if (selection instanceof Operation) {
-  			setEnabled(true);
-  		}
-  		else {
-  	  		setEnabled(false);
-  		}
-  	}
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/CopyWSDLElementAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/CopyWSDLElementAction.java
deleted file mode 100644
index 3f3d8affb..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/CopyWSDLElementAction.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddOperationCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.WSDLElementCommand;
-import org.eclipse.wst.wsdl.ui.internal.graph.editparts.WSDLTreeNodeEditPart;
-import org.eclipse.wst.wsdl.ui.internal.util.NameUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.w3c.dom.Node;
-
-/*
- * Class which copies a WSDLElement and it's 'children' elements.
- * For example, a copy command on a Operation will result in a copy
- * of the operation and it's input/output/faults, and it's message
- * and parts.
- */
-public class CopyWSDLElementAction extends WSDLDragAction {
-	WSDLElement element, parent;
-	Node parentNode;
-	WSDLElementCommand wsdlElementCommand;
-	EditPartViewer editPartViewer;
-	
-	/*
-	 *  element = The WSDLElement being copied
-	 *  parent = The Parent of the 'new' WSDLElement
-	 *  parentNode = ElementImpl (for undo)
-	 */	
-	public CopyWSDLElementAction(EditPartViewer editPartViewer, WSDLElement element, WSDLElement parent, Node parentNode) {
-		setText("Copy WSDLElement");  // Do not Translate This
-		this.element = element;	
-		this.parent = parent;
-		this.parentNode = parentNode;
-		this.editPartViewer = editPartViewer;
-	}
-	
-	public boolean canExecute() {
-		if (element instanceof Operation){
-			if(parent instanceof PortType) {
-				PortType pt = (PortType) parent;
-				Operation op = (Operation) element;
-				wsdlElementCommand  = new AddOperationCommand(pt, op, NameUtil.buildUniqueOperationName(pt, op.getName()), true);		
-			}
-		}
-		/*
-		else if (element instanceof MessageReference) {
-	
-		}
-		else if (element instanceof Input) {
-
-		}
-		else if (element instanceof Output) {
-			
-		}
-		else if (element instanceof Fault) {
-			
-		}
-		else if (element instanceof Message) {
-			
-		}
-		*/
-		
-		if (wsdlElementCommand != null) {
-			return true;
-		}
-		else {
-			return false;
-		}
-	}
-	
-	public void run() {
-		if (wsdlElementCommand == null) {
-			if (canExecute()) {
-				runCommand();
-			}
-		}
-		 else {
-		 	runCommand();
-		 }
-	}
-	
-	private void runCommand() {
-	 	this.beginRecording();
-		wsdlElementCommand.run();
-		selectWSDLElement(wsdlElementCommand.getWSDLElement());
-		this.endRecording();
-	}
-	
-	private void selectWSDLElement(WSDLElement element) {
-		// Select the newly created element
-	    // Expand all the associated elements 'below' the given element
-	    Map editPartMap = editPartViewer.getEditPartRegistry();
-	    WSDLTreeNodeEditPart wsdlEditPart = (WSDLTreeNodeEditPart) editPartMap.get(element);
-	    if (wsdlEditPart != null) {
-	    	editPartViewer.select(wsdlEditPart);
-		    expandEditParts(element, true);
-	    }
-	}
-	
-	private void expandEditParts(Object element, boolean expandChildren) {
-	    if (element != null) {
-	    	Map editPartMap = editPartViewer.getEditPartRegistry();
-	    	WSDLTreeNodeEditPart wsdlEditPart = (WSDLTreeNodeEditPart) editPartMap.get(element);
-			wsdlEditPart.setExpanded(true);
-			
-			if (expandChildren) {
-				Iterator iterator = WSDLEditorUtil.getModelGraphViewChildren(element).iterator();
-				
-				while (iterator.hasNext()) {
-					expandEditParts(iterator.next(), expandChildren);
-				}
-			}
-	    }
-	}
-	
-	// Inherited classes from BaseNodeAction
-	  public Node getNode() {
-	  	return parentNode;
-	  }
-	  
-	  public String getUndoDescription() {
-	  	return WSDLEditorPlugin.getWSDLString("_UI_ACTION_COPY");
-	  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/CreateDocActionDelegate.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/CreateDocActionDelegate.java
deleted file mode 100644
index 4e4b9c538..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/CreateDocActionDelegate.java
+++ /dev/null
@@ -1,324 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import java.io.File;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorActionDelegate;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.actions.ActionDelegate;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.dialogs.WizardNewFolderMainPage;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.part.ISetSelectionTarget;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-
-public class CreateDocActionDelegate extends ActionDelegate implements IEditorActionDelegate
-{
-  protected IFile iFile;
-  protected IEditorPart editorPart;
-
-  protected final static String WSDLEDITOR_DOCGEN_PLUGIN_ID = "org.eclipse.wst.wsdl.ui.internal.docgen"; //$NON-NLS-1$
-  protected final static String VALIDATE_WSDL_PLUGIN_ID = "org.eclipse.wst.validate.wsdl"; //$NON-NLS-1$
-
-  protected IWorkspaceRoot workspaceRoot = null;
-
-  public CreateDocActionDelegate()
-  {
-  }
-
-  public void setFile(IFile iFile)
-  {
-    this.iFile = iFile;
-  }
-
-  public void setEditorPart(IEditorPart editorPart)
-  {
-    this.editorPart = editorPart;
-  }
-
-  public void run(IAction action)
-  {
-// TODO: Uncomment when validation is checked into corona    
-//    ISharedService validateSharedService = ExtensionPlugin.getSharedService("ValidateWSDLSharedService"); //$NON-NLS-1$
-//    System.out.println(validateSharedService);
-//    if (validateSharedService != null)
-//    {
-//      try
-//      {
-//        Boolean rc = (Boolean) validateSharedService.run(iFile);
-//        if (rc.booleanValue())
-//        {
-          NewWSDLDocFolderWizard wiz = new NewWSDLDocFolderWizard();
-          NewWSDLDocDialog dlg = new NewWSDLDocDialog(WSDLEditorPlugin.getShell(), wiz);
-          dlg.open();
-//        }
-//        else
-//        {
-//          MessageDialog.openError(Display.getCurrent().getActiveShell(), WSDLEditorPlugin.getWSDLString("_UI_ERROR_INVALID_WSDL"), //$NON-NLS-1$
-//          WSDLEditorPlugin.getWSDLString("_UI_ERROR_INVALID_WSDL_DESC")); //$NON-NLS-1$
-//        }
-//      }
-//      catch (Exception e)
-//      {
-//      }
-//    }
-//    else
-//    {
-//      MessageDialog.openError(Display.getCurrent().getActiveShell(), "Error", //$NON-NLS-1$
-//      "Cannot find validator"); //$NON-NLS-1$
-//    }
-  }
-
-  class GenHTMLOperation extends WorkspaceModifyOperation
-  {
-    IFile iFile;
-    String outputLocation;
-    public GenHTMLOperation(IFile iFile)
-    {
-      super();
-      this.iFile = iFile;
-    }
-
-    public void setOutputLocation(String outputLocation)
-    {
-      this.outputLocation = outputLocation;
-    }
-
-    protected void execute(IProgressMonitor monitor) throws CoreException
-    {
-    	/*
-      monitor.beginTask(WSDLEditorPlugin.getWSDLString("_UI_LABEL_CREATING_HTML_FILES"), IProgressMonitor.UNKNOWN); //$NON-NLS-1$
-      WSDLDoc doc = new WSDLDoc(new WSDLDocFileWriter());
-
-      try
-      {
-        Plugin plugin = Platform.getPlugin("org.eclipse.wst.wsdl.ui.internal.docgen"); //$NON-NLS-1$
-        IPath installPath = new Path(plugin.getDescriptor().getInstallURL().toExternalForm()).removeTrailingSeparator();
-        String installStr = Platform.asLocalURL(new URL(installPath.toString())).getFile();
-        Path docgenPath = new Path(installStr);
-
-        doc.setTemplateLocation(docgenPath.toOSString() + "template" + File.separator); //$NON-NLS-1$
-        doc.setOptions(iFile.getRawLocation().removeLastSegments(1).toOSString(), outputLocation, "");
-
-        doc.addFile(iFile.getName());
-        doc.doBuildStep();
-      }
-      catch (Exception e)
-      {
-        // e.printStackTrace(); 
-      }
-      finally
-      {
-        monitor.done();
-      }
-      */
-    }
-  }
-
-  class WSDLDocNewFolderMainPage extends WizardNewFolderMainPage
-  {
-    public WSDLDocNewFolderMainPage(String pageName)
-    {
-      super(pageName, new StructuredSelection(iFile));
-      setDescription(WSDLEditorPlugin.getWSDLString("_UI_LABEL_CREATE_FOLDER_FOR_DOCS")); //$NON-NLS-1$
-    }
-  }
-
-  class NewWSDLDocFolderWizard extends Wizard
-  {
-    IFolder folder;
-
-    private WSDLDocNewFolderMainPage newFolderPage;
-
-    public NewWSDLDocFolderWizard()
-    {
-      super();
-      setNeedsProgressMonitor(true);
-    }
-
-    public boolean performFinish()
-    {
-      folder = newFolderPage.createNewFolder();
-      if (folder == null)
-      {
-        MessageDialog.openError(WSDLEditorPlugin.getShell(), WSDLEditorPlugin.getWSDLString("_UI_ERROR_ERROR"), //$NON-NLS-1$
-        WSDLEditorPlugin.getWSDLString("_UI_ERROR_FOLDER_NOT_CREATED")); //$NON-NLS-1$
-        return false;
-      }
-
-      GenHTMLOperation op = new GenHTMLOperation(iFile);
-      op.setOutputLocation(folder.getLocation().toOSString());
-
-      try
-      {
-        op.execute(new NullProgressMonitor());
-
-        // refresh folder and open index.html in web browser
-        folder.refreshLocal(IResource.DEPTH_INFINITE, null);
-        String indexHtmlFile = folder.getLocation().toOSString() + File.separator + "index.html"; //$NON-NLS-1$
-        IFile indexHtmlIFile = getWorkspaceFileFromLocalLocation(indexHtmlFile);
-        if (indexHtmlIFile != null && indexHtmlIFile.exists())
-        {
-          revealSelection(new StructuredSelection(indexHtmlIFile));
-          
-          openEditor(indexHtmlIFile, "org.eclipse.webbrowser"); //$NON-NLS-1$
-        }
-        else
-        {
-          MessageDialog.openError(Display.getCurrent().getActiveShell(), WSDLEditorPlugin.getWSDLString("_UI_ERROR_ERROR"), //$NON-NLS-1$
-          WSDLEditorPlugin.getWSDLString("_UI_ERROR_CREATING_HTML_FILES")); //$NON-NLS-1$
-        }
-      }
-      catch (CoreException ce)
-      {
-        //        ce.printStackTrace();
-      }
-      catch (Exception e)
-      {
-        //        e.printStackTrace();
-      }
-      return true;
-    }
-
-    protected void revealSelection(final ISelection selection)
-    {
-      if (selection != null)
-      {
-        IWorkbench workbench = WSDLEditorPlugin.getInstance().getWorkbench();
-        final IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
-        final IWorkbenchPart focusPart = workbenchWindow.getActivePage().getActivePart();
-        if (focusPart instanceof ISetSelectionTarget)
-        {
-          Display.getCurrent().asyncExec
-          (new Runnable()
-              {
-            public void run()
-            {
-              ((ISetSelectionTarget)focusPart).selectReveal(selection);
-            }
-          });
-        }
-      }
-    }
-    
-    protected void openEditor(final IFile iFile, final String editorId)
-    {
-      if (iFile != null)
-      {
-        IWorkbench workbench = WSDLEditorPlugin.getInstance().getWorkbench();
-        final IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
-
-        Display.getDefault().asyncExec
-        (new Runnable()
-            {
-          public void run()
-          {
-            try
-            {
-              workbenchWindow.getActivePage().openEditor(new FileEditorInput(iFile), editorId);
-            }
-            catch (PartInitException ex)
-            {
-//              B2BGUIPlugin.getPlugin().getMsgLogger().write("Exception encountered when attempting to open file: " + iFile + "\n\n" + ex);
-            }
-          }
-        });
-      }
-    }
-    
-    protected IFile getWorkspaceFileFromLocalLocation(String fileName)
-    {
-      IWorkspace workspace = ResourcesPlugin.getWorkspace();
-      if (workspace != null)
-      {
-        IFile iFile = workspace.getRoot().getFileForLocation(new Path(fileName));
-        if (iFile != null)
-        {
-          return iFile;
-        }
-      }
-      return null;
-    }
-    
-    public void addPages()
-    {
-      newFolderPage = new WSDLDocNewFolderMainPage(WSDLEditorPlugin.getWSDLString("_UI_LABEL_NEW_FOLDER")); //$NON-NLS-1$
-      addPage(newFolderPage);
-    }
-
-    public boolean canFinish()
-    {
-      if (newFolderPage.isPageComplete())
-      {
-        return true;
-      }
-      return false;
-    }
-
-    public IFolder getFolder()
-    {
-      return folder;
-    }
-  }
-
-  class NewWSDLDocDialog extends WizardDialog
-  {
-    public NewWSDLDocDialog(Shell parentShell, IWizard newWizard)
-    {
-      super(parentShell, newWizard);
-    }
-  }
-
-  public void setActiveEditor(IAction action, IEditorPart targetEditor)
-  {
-    editorPart = targetEditor;
-    iFile = null;
-    if (editorPart != null)
-    {
-      IEditorInput input = targetEditor.getEditorInput();
-      if (input instanceof IFileEditorInput)
-      {
-        iFile = ((IFileEditorInput) input).getFile();
-      }
-    }
-  }
-
-  public void selectionChanged(IAction action, ISelection selection)
-  {
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/DeleteAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/DeleteAction.java
deleted file mode 100644
index b9b0612d8..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/DeleteAction.java
+++ /dev/null
@@ -1,358 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.xsd.XSDSchema;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class DeleteAction extends BaseNodeAction {
-	 protected List list;
-	 protected String deleteString = WSDLEditorPlugin.getWSDLString("_UI_ACTION_DELETE") + " "; //$NON-NLS-1$
-//	 private Object object;
-//	 private Node node;
-	
-	public DeleteAction(Object object, Node node) {
-		setText(WSDLEditorPlugin.getWSDLString("_UI_ACTION_DELETE"));  //$NON-NLS-1$
-	    list = new Vector();
-	    list.add(object);
-	}
-	
-	public DeleteAction(List deleteList) {
-		setText(WSDLEditorPlugin.getWSDLString("_UI_ACTION_DELETE"));  //$NON-NLS-1$
-	    list = deleteList;
-	}
-
-	private Vector getReferencedMessages(Operation operation) {
-		Vector messages = new Vector();
-		messages.addAll(getMessages(operation.getEFaults()));
-		
-		if (operation.getEInput() != null && operation.getEInput().getEMessage() != null)
-			messages.addElement(operation.getEInput().getEMessage());
-		if (operation.getEOutput() != null && operation.getEOutput().getEMessage() != null)
-			messages.addElement(operation.getEOutput().getEMessage());
-		
-		return messages;
-	}
-	
-	public void run() {
-		// We want to delete Operations first.  So we need to sort the list
-		List sortedList = new ArrayList(list.size());
-		Iterator listIterator = list.iterator();
-		
-		while (listIterator.hasNext()) {
-			Object unsortedObject = listIterator.next();
-			if (unsortedObject instanceof Operation) {
-				sortedList.add(0, unsortedObject);
-			}
-			else {
-				sortedList.add(unsortedObject);
-			}
-		}
-		
-		Node recordingNode = null;
-		if (sortedList.size() > 1) {
-			recordingNode = getElement(sortedList.get(0));
-			beginRecording(recordingNode, WSDLEditorPlugin.getWSDLString("_UI_ACTION_MULTIPLE_DELETE"));
-		}
-		
-		Iterator iterator = sortedList.iterator();
-		while (iterator.hasNext()) {
-			Object object = iterator.next();
-			
-			if (object instanceof Operation) {
-				deleteOperation((Operation) object);
-			}
-			else if (object instanceof Part) {
-				deletePart((Part) object);
-			}
-			else {
-				DeleteNodeAction deleteNodeAction = new DeleteNodeAction(getElement(object));
-				deleteNodeAction.run();
-			}
-		}
-		
-		if (recordingNode != null) {
-			endRecording(recordingNode);
-		}
-	}
-	
-	private Vector getMessages(List faults) {
-		Vector v = new Vector();
-		Iterator it = faults.iterator();
-		
-		while (it.hasNext()) {
-			Fault fault = (Fault) it.next();
-			if (fault.getEMessage() != null) {
-				v.addElement(fault.getEMessage());
-			}
-		}
-		
-		return v;
-	}
-	
-	private Vector getParts(Vector messages) {
-		Vector parts = new Vector();
-		Iterator it = messages.iterator();
-		
-		while (it.hasNext()) {
-			Message message = (Message) it.next();
-			
-			if (message.getEParts() != null) {
-				parts.addAll(message.getEParts());
-			}
-		}
-		
-		return parts;
-	}
-	
-	public Node getNode()
-	{
-	  return list.size() > 0 ? (Node) getElement(list.get(0)) : null;
-	} 
-
-	public String getUndoDescription()
-	{
-	  return WSDLEditorPlugin.getWSDLString("_UI_ACTION_DELETE"); //$NON-NLS-1$
-	}
-	
-	private void deleteOperation(Operation operation) {
-		DeleteOperationDialog dialog = new DeleteOperationDialog(WSDLEditorPlugin.getShell(), operation.getName());
-	    int returnCode = dialog.createAndOpen();
-	    
-	    if (returnCode == IDialogConstants.OK_ID) {
-	    	if (dialog.deleteMessagesAndParts()) {
-	    		// Get all associated messages
-	    		Vector messages = getReferencedMessages(operation);
-	    		
-	    		// Determine which Messages are referenced from 'outside' this operation
-	    		Vector referencedMessages = new Vector();
-	    		if (operation.getEnclosingDefinition().getEPortTypes() != null) {
-	    			Iterator portTypeIterator = operation.getEnclosingDefinition().getEPortTypes().iterator();
-	    			Vector operations = new Vector();
-	    			
-	    			while (portTypeIterator.hasNext()) {
-	    				PortType portType = (PortType) portTypeIterator.next();
-	    				
-	    				if (portType.getEOperations() != null) {
-	    					Iterator operationIterator = portType.getEOperations().iterator();
-	    					while (operationIterator.hasNext()) {
-	    						Operation nextOperation = (Operation) operationIterator.next();
-	    						if (!nextOperation.equals(operation))
-	    							operations.add(nextOperation);
-	    					}
-	    				}
-	    			}
-	    			
-	    			for (int index = 0; index < operations.size(); index++) {
-	    				referencedMessages.addAll(getReferencedMessages((Operation) operations.elementAt(index)));
-	    			}
-	    		
-	    			// Filter which Messages need to be deleted
-	    			for (int index = 0; index < messages.size(); index++) {
-	    				int foundIndex = referencedMessages.indexOf(messages.elementAt(index));
-	    				
-	    				if (foundIndex != -1) {
-	    					// Message is referenced elsewhere.  Do not delete
-	    					messages.remove(index);
-	    				}
-	    			}
-	    		}
-	    		
-	    		// Get all associated parts
-	    		Vector parts = getParts(messages);
-	    		
-	    		// Remove our list of Messages and Parts
-	    		PortType portType = (PortType) operation.eContainer();
-	    		Node recordingNode = portType.getEnclosingDefinition().getElement();
-	    		beginRecording(recordingNode, deleteString + WSDLEditorPlugin.getWSDLString("_UI_LABEL_OPERATION"));
-	    		
-	    		for (int index = 0; index < messages.size(); index++) {
-	    			Message message = (Message) messages.elementAt(index);
-	    			Definition definition = (Definition) message.eContainer();
-	    			definition.getEMessages().remove(message);
-	    		}
-
-	    		for (int index = 0; index < parts.size(); index++) {
-	    			Part part = (Part) parts.elementAt(index);
-	    			Message message = (Message) part.eContainer();
-	    			message.getEParts().remove(part);
-	    		}
-	    		
-	    		// Delete the Operation
-	    		portType.getEOperations().remove(operation);
-
-	    		endRecording(recordingNode);
-	    	}
-	    	else {
-	    		// Only delete the Operation
-	    		PortType portType = (PortType) operation.eContainer();
-	    		Node recordingNode = portType.getElement();
-	    		
-	    		beginRecording(recordingNode, deleteString + WSDLEditorPlugin.getWSDLString("_UI_LABEL_OPERATION")); // Translate this!!!
-	    		portType.getEOperations().remove(operation);
-	    		endRecording(recordingNode);
-	    	}
-	    }
-	}
-	
-	private void deletePart(Part part) {
-		Message message = (Message) part.eContainer();
-		if (message != null) {
-			beginRecording(message.getElement(), deleteString + WSDLEditorPlugin.getWSDLString("_UI_LABEL_PART"));
-			message.getEParts().remove(part);
-			endRecording(message.getElement());
-		}
-	}
-	
-	private Element getElement(Object object) {
-		Element element = null;
-		if (object instanceof WSDLElement) {
-			element = ((WSDLElement) object).getElement();
-		}
-		else if (object instanceof XSDSchema) {
-			element = ((XSDSchema) object).getElement();
-		}
-		
-		return element;
-	}
-	
-	/*
-	 * The following method should be used to begin recording changes.
-	 * This should eventually replace BaseNodeAction.beginRecording()
-	 * when all deletes are model driven.
-	 */
-	  private void beginRecording(Node node, String undoDescription)
-	  {    
-	    if (node instanceof IDOMNode)
-	    {
-	      ((IDOMNode)node).getModel().beginRecording(this, undoDescription);  
-	    }
-	  }
-
-	/*
-	 * The following method should be used to begin recording changes.
-	 * This should eventually replace BaseNodeAction.beginRecording()
-	 * when all deletes are model driven.
-	 */
-	  public void endRecording(Node node)
-	  {
-	    if (node instanceof IDOMNode)
-	    {
-	      ((IDOMNode)node).getModel().endRecording(this);  
-	    }
-	  }
-	
-	private class DeleteOperationDialog extends Dialog implements SelectionListener{
-		private Button checkButton = null;
-		private boolean deleteMessagesAndParts = true;
-		private String operationName;
-		 
-		public DeleteOperationDialog(Shell shell, String name) {
-			super(shell);
-			operationName = name;
-		}
-		
-		protected Control createDialogArea(Composite parent) 
-		  {
-		    Composite dialogArea = (Composite)super.createDialogArea(parent);
-
-		    Composite composite = new Composite(dialogArea, SWT.NONE);
-		    GridLayout layout = new GridLayout();
-		    layout.numColumns = 2;
-		    layout.marginWidth = 0;
-		    layout.marginHeight = 0;
-		    layout.verticalSpacing = 0;
-
-		    composite.setLayout(layout);
-
-		    GridData gdFill= new GridData();
-		    gdFill.horizontalAlignment= GridData.FILL;
-		    gdFill.grabExcessHorizontalSpace= true;
-		    gdFill.verticalAlignment= GridData.FILL;
-		    gdFill.grabExcessVerticalSpace= true;
-		    composite.setLayoutData(gdFill);
-
-		    Label label = new Label(composite, SWT.NONE);
-		    label.setText(operationName);
-//		    label.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_OPERATION") + " " + operationName);
-		    GridData labelData = new GridData();
-		    labelData.horizontalSpan = 2;
-		    
-		    label.setLayoutData(labelData);
-		    
-		    Label emptyLabel = new Label(composite, SWT.NONE);
-		    GridData emptyData = new GridData();
-		    emptyData.horizontalSpan = 2;
-		    emptyLabel.setLayoutData(emptyData);
-
-		    checkButton = new Button(composite, SWT.CHECK);
-		    checkButton.setSelection(deleteMessagesAndParts);
-		    checkButton.addSelectionListener(this);
-		    Label nameLabel = new Label(composite, SWT.NONE);
-		    nameLabel.setText(WSDLEditorPlugin.getWSDLString("_UI_DELETE_ASSOCIATED_MSG_AND_PARTS"));
-		    
-		    return dialogArea;
-		  }
-		
-		public boolean deleteMessagesAndParts() {
-			return deleteMessagesAndParts;
-		}
-		
-		public void widgetDefaultSelected(SelectionEvent e)  {}
-
-		public void widgetSelected(SelectionEvent e)  {
-			if (e.widget == checkButton) {
-				if (checkButton.getSelection()) {
-					deleteMessagesAndParts = true;
-				}
-				else {
-					deleteMessagesAndParts = false;
-				}
-			}
-		}
-
-		public int createAndOpen() {
-			create();
-		    getShell().setText(WSDLEditorPlugin.getWSDLString("_UI_DELETE_OPERATION_TITLE"));
-		    setBlockOnOpen(true);
-		    return open();
-		}
-		
-	}
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/DeleteInterfaceAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/DeleteInterfaceAction.java
deleted file mode 100644
index 176428702..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/DeleteInterfaceAction.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import java.util.List;
-
-public interface DeleteInterfaceAction {
-
-	public void setDeleteList(List list);
-	
-	public void run();
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/DeleteNodeAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/DeleteNodeAction.java
deleted file mode 100644
index f4e29319c..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/DeleteNodeAction.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions; 
-                      
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Node;
-
-
-public class DeleteNodeAction extends BaseNodeAction
-{ 
-  protected List list;
-
-  public DeleteNodeAction(Node node)
-  {
-    setText(WSDLEditorPlugin.getWSDLString("_UI_ACTION_DELETE"));  //$NON-NLS-1$
-    list = new Vector();
-    list.add(node);
-  }    
-  
-  public DeleteNodeAction(List nodeList)
-  {
-    setText(WSDLEditorPlugin.getWSDLString("_UI_ACTION_DELETE"));  //$NON-NLS-1$
-    list = new Vector();
-    Iterator it = nodeList.iterator();
-    while (it.hasNext()) {
-    	list.add(it.next());
-    }
-  }
-
-  public void run()
-  {
-    beginRecording();
-
-    for (Iterator i = list.iterator(); i.hasNext(); )
-    {
-      Node node = (Node)i.next();
-      if (node.getNodeType() == Node.ATTRIBUTE_NODE)
-      {
-        Attr attr = (Attr)node;
-        attr.getOwnerElement().removeAttributeNode(attr);
-      }
-      else
-      {                
-        Node parent = node.getParentNode();
-        if (parent != null)
-        {                                         
-          Node previousSibling = node.getPreviousSibling();
-          if (previousSibling != null && isWhitespaceTextNode(previousSibling))
-          {
-            parent.removeChild(previousSibling);
-          }
-          parent.removeChild(node);
-        }
-      }
-    }         
-
-    endRecording();
-  }   
-
-  protected boolean isWhitespaceTextNode(Node node) 
-  {
-	  return (node != null) && (node.getNodeType() == Node.TEXT_NODE) && (node.getNodeValue().trim().length() == 0);
-  }    
-
-  public Node getNode()
-  {
-    return list.size() > 0 ? (Node)list.get(0) : null;
-  } 
-
-  public String getUndoDescription()
-  {
-    return WSDLEditorPlugin.getWSDLString("_UI_ACTION_DELETE"); //$NON-NLS-1$
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/DeleteWSDLAndXSDAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/DeleteWSDLAndXSDAction.java
deleted file mode 100644
index 731b0aae7..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/DeleteWSDLAndXSDAction.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtension;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtensionRegistry;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDSchema;
-import org.w3c.dom.Node;
-
-
-/**
- * This class handles delete with the WSDL Editor's graph view.  the object for
- * deletion could be a WSDL 'object' or an XSD 'object'.  We need to make this
- * distinction because we have two different Delete classes.  One to handle
- * WSDL and another to handle XSD.
- */
-public class DeleteWSDLAndXSDAction extends BaseNodeAction {
-	List list;
-	Node recordingNode;
-	WSDLEditor wsdlEditor;
-
-	public DeleteWSDLAndXSDAction(List deleteList, Node recordingNode, WSDLEditor wsdlEditor) {
-		setText(WSDLEditorPlugin.getWSDLString("_UI_ACTION_DELETE"));
-		list = deleteList;
-		this.recordingNode = recordingNode;
-		this.wsdlEditor = wsdlEditor;
-	}
-	
-	public void run() {
-		Iterator it = list.iterator();
-		List wsdlDeleteList = new ArrayList();
-		List xsdDeleteList = new ArrayList();
-
-		while (it.hasNext()) {
-			Object object = it.next();
-			
-			if (object instanceof WSDLElement || object instanceof XSDSchema) {
-				wsdlDeleteList.add(object);
-			}
-			else {
-				xsdDeleteList.add(object);
-			}
-		}
-		
-		Object newSelection = null;
-		Object topLevelObject = null;
-		if (wsdlDeleteList.size() > 0 || xsdDeleteList.size() > 0)
-		{	
-			try
-			{
-			beginRecording();	
-				
-		
-		// Delete WSDL objects
-		if (wsdlDeleteList.size() > 0) {
-			Object wsdlObject = wsdlDeleteList.get(0);
-			if (wsdlObject instanceof WSDLElement) {
-				newSelection = ((WSDLElement) wsdlObject).eContainer();
-				topLevelObject = getTopLevelWSDLObject((WSDLElement) wsdlObject);
-			}
-			
-			DeleteAction wsdlDelete = new DeleteAction(wsdlDeleteList);
-			wsdlDelete.run();
-		}
-		
-		// Delete XSD objects
-		if (xsdDeleteList.size() > 0) {
-			Object xsdObject = xsdDeleteList.get(0);
-			if (xsdObject instanceof XSDConcreteComponent) {
-				newSelection = ((XSDConcreteComponent) xsdObject).getContainer();
-				topLevelObject = getTopLevelXSDObject((XSDConcreteComponent) xsdObject);
-			}
-			
-			DeleteInterfaceAction xsdDelete = (DeleteInterfaceAction) getXSDDelete();
-			xsdDelete.setDeleteList(xsdDeleteList);
-			xsdDelete.run();
-			// Hack to force a refresh of all components of the Graph View.  This is needed
-			// for the case where we delete a XSD Element (View input == Definition).  The XSD
-			// Element EditPart visual would not be removed from the view.
-			wsdlEditor.getDefinition().setQName(wsdlEditor.getDefinition().getQName());
-		}
-			}
-			finally
-			{
-			  endRecording();
-			}
-			// Make our selection after our Deletions
-			ISelectionProvider selectionProvider = (ISelectionProvider)wsdlEditor.getSelectionManager();
-		    if (selectionProvider != null)
-		    {
-		    	if (newSelection instanceof XSDParticle)
-	            {
-	              newSelection = ((XSDParticle) newSelection).getContainer();
-	            }
-	    		
-		    	if (newSelection == null) {
-		    		newSelection = getNewSelection();
-		    	}
-		    	if (newSelection != null) {
-		    		// We have a newSelection, but it may also be deleted by the user.  In this case, select the top level object
-		    		if (list.contains(newSelection) && topLevelObject != null) {
-		    			newSelection = topLevelObject;
-		    		}
-
-		    		selectionProvider.setSelection(new StructuredSelection(newSelection));
-		    	}
-		    }
-		}
-	}
-	
-	public Node getNode()
-	{
-	  return recordingNode;
-	}
-
-	public String getUndoDescription()
-	{
-	  return WSDLEditorPlugin.getWSDLString("_UI_ACTION_DELETE"); //$NON-NLS-1$
-	}
-
-	private Object getXSDDelete() {
-		WSDLEditorExtensionRegistry registry = WSDLEditorPlugin.getInstance().getWSDLEditorExtensionRegistry(); 
-	    WSDLEditorExtension[] extensions = registry.getRegisteredExtensions(WSDLEditorExtension.MENU_ACTION_CONTRIBUTOR);
-	    Object xsdDelete = null;
-	    
-	    for (int i = 0; i < extensions.length; i++)
-	    {
-//	    	xsdDelete = extensions[i].createExtensionObject(WSDLEditorExtension.XSD_DELETE_ACTION, wsdlEditor);
-	    	xsdDelete = extensions[i].createExtensionObject(WSDLEditorExtension.XSD_DELETE_ACTION, null);
-	    	if (xsdDelete != null) {
-	    		break;
-	    	}
-	    }	    
-	    
-	    return xsdDelete;
-	}
-	
-	private Object getNewSelection() {
-		// Hack using wsdleditor....  This situation occurs when we delete the Schema from the Types group....  We
-		// usually get the container of the object being deleted... however, in this situation, the container would
-		// be null because the object being deleted is a Schema......
-		Object selection;
-		try {
-			selection = wsdlEditor.getGraphViewer().getComponentViewer().getInput();
-			if (selection == null) {
-				selection = wsdlEditor.getDefinition();
-			}
-		}
-		catch (Exception e) {
-			selection = wsdlEditor.getDefinition();
-		}
-		
-		return selection;
-	}
-
-	private WSDLElement getTopLevelWSDLObject(WSDLElement element) {
-		WSDLElement topObject = (WSDLElement) element.eContainer();
-		
-		while (topObject != null && !(topObject instanceof Definition)) {
-			topObject = (WSDLElement) topObject.eContainer();
-		}
-
-		return topObject;
-	}
-	
-	private XSDConcreteComponent getTopLevelXSDObject(XSDConcreteComponent component) {
-		XSDConcreteComponent topObject = component.getContainer();
-		
-		while (topObject != null && !(topObject instanceof XSDSchema)) {
-			topObject = (XSDConcreteComponent) topObject.eContainer();
-		}
-
-		return topObject;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/EditNamespacesAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/EditNamespacesAction.java
deleted file mode 100644
index d84926fe8..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/EditNamespacesAction.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.nsedit.EditNamespacesDialog;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.DOMNamespaceInfoManager;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceInfo;
-import org.w3c.dom.Element;
-
-
-public class EditNamespacesAction extends Action
-{
-  protected Definition definition;
-
-  public EditNamespacesAction(Definition definition)
-  {
-    setText(WSDLEditorPlugin.getWSDLString("_UI_EDIT_NAMESPACES"));
-    this.definition = definition;
-  }
-
-  public void run()
-  {
-    DOMNamespaceInfoManager namespaceInfoManager = new DOMNamespaceInfoManager();
-    Element element = WSDLEditorUtil.getInstance().getElementForObject(definition);
-    if (element != null)
-    {
-      List namespaceInfoList = namespaceInfoManager.getNamespaceInfoList(element);
-//      List oldNamespaceInfoList = NamespaceInfo.cloneNamespaceInfoList(namespaceInfoList);
-
-      // here we store a copy of the old info for each NamespaceInfo
-      // this info will be used in createPrefixMapping() to figure out how to update the document 
-      // in response to these changes
-      for (Iterator i = namespaceInfoList.iterator(); i.hasNext();)
-      {
-        NamespaceInfo info = (NamespaceInfo) i.next();
-        NamespaceInfo oldCopy = new NamespaceInfo(info);
-        info.setProperty("oldCopy", oldCopy);
-      }
-
-	  IPath path = new Path(definition.getDocumentBaseURI());
-      EditNamespacesDialog dialog = new EditNamespacesDialog(WSDLEditorPlugin.getShell(),  path, WSDLEditorPlugin.getWSDLString("_UI_EDIT_NAMESPACES_DIALOG_TITLE"), definition.getTargetNamespace(), namespaceInfoList);
-      int rc = dialog.createAndOpen();
-      if (rc == IDialogConstants.OK_ID)
-      {      	
-		element.setAttribute("targetNamespace", dialog.getTargetNamespace());
-		
-        List newInfoList = dialog.getNamespaceInfoList();
-        namespaceInfoManager.removeNamespaceInfo(element);
-        namespaceInfoManager.addNamespaceInfo(element, newInfoList, false);
-
-/*
-        // see if we need to rename any prefixes
-        Map prefixMapping = createPrefixMapping(oldNamespaceInfoList, namespaceInfoList);
-        if (prefixMapping.size() > 0)
-        {
-          //manager.getModel().aboutToChangeModel();
-          ReplacePrefixAction replacePrefixAction = new ReplacePrefixAction(element, prefixMapping);
-          replacePrefixAction.run();
-          //manager.getModel().changedModel();
-        }
-*/        
-      }
-    }
-  }
-
-  protected Map createPrefixMapping(List oldList, List newList)
-  {
-    Map map = new Hashtable();
-
-    Hashtable oldURIToPrefixTable = new Hashtable();
-    for (Iterator i = oldList.iterator(); i.hasNext();)
-    {
-      NamespaceInfo oldInfo = (NamespaceInfo) i.next();
-      oldURIToPrefixTable.put(oldInfo.uri, oldInfo);
-    }
-
-    for (Iterator i = newList.iterator(); i.hasNext();)
-    {
-      NamespaceInfo newInfo = (NamespaceInfo) i.next();
-      NamespaceInfo oldInfo = (NamespaceInfo) oldURIToPrefixTable.get(newInfo.uri != null ? newInfo.uri : "");
-
-      // if oldInfo is non null ... there's a matching URI in the old set
-      // we can use its prefix to detemine out mapping
-      //
-      // if oldInfo is null ...  we use the 'oldCopy' we stashed away 
-      // assuming that the user changed the URI and the prefix
-      if (oldInfo == null)
-      {
-        oldInfo = (NamespaceInfo) newInfo.getProperty("oldCopy");
-      }
-
-      if (oldInfo != null)
-      {
-        String newPrefix = newInfo.prefix != null ? newInfo.prefix : "";
-        String oldPrefix = oldInfo.prefix != null ? oldInfo.prefix : "";
-        if (!oldPrefix.equals(newPrefix))
-        {
-          map.put(oldPrefix, newPrefix);
-        }
-      }
-    }
-    return map;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/ExtensibleMenuActionContributor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/ExtensibleMenuActionContributor.java
deleted file mode 100644
index 7020db630..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/ExtensibleMenuActionContributor.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;                        
-
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.extension.IMenuActionContributor;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtension;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtensionRegistry;
-import org.w3c.dom.Node;
-
-
-public class ExtensibleMenuActionContributor implements IMenuActionContributor
-{                                                                   
-  protected WSDLEditor wsdlEditor;
-  protected IMenuActionContributor[] menuActionContributors;  
-
-  public ExtensibleMenuActionContributor(WSDLEditor wsdlEditor)
-  {
-    this.wsdlEditor = wsdlEditor; 
-
-    WSDLEditorExtensionRegistry registry = WSDLEditorPlugin.getInstance().getWSDLEditorExtensionRegistry(); 
-
-    WSDLEditorExtension[] extensions = registry.getRegisteredExtensions(WSDLEditorExtension.MENU_ACTION_CONTRIBUTOR);
-    menuActionContributors = new IMenuActionContributor[extensions.length];
-
-    for (int i = 0; i < menuActionContributors.length; i++)
-    {
-      menuActionContributors[i] = (IMenuActionContributor)extensions[i].createExtensionObject(WSDLEditorExtension.MENU_ACTION_CONTRIBUTOR, wsdlEditor);
-    }
-  }
-                           
-  public void contributeMenuActions(IMenuManager manager, Node node, Object object)
-  {  
-    for (int i = 0; i < menuActionContributors.length; i++)
-    {                          
-      if (menuActionContributors[i] != null)
-      {
-        menuActionContributors[i].contributeMenuActions(manager, node, object);
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/IDesignViewerActionBarContributor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/IDesignViewerActionBarContributor.java
deleted file mode 100644
index 428695cd6..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/IDesignViewerActionBarContributor.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import org.eclipse.ui.IActionBars;
-import org.eclipse.wst.sse.ui.internal.ISourceViewerActionBarContributor;
-
-public interface IDesignViewerActionBarContributor extends ISourceViewerActionBarContributor {
-	public void initViewerSpecificContributions(IActionBars bars);
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/PasteGlobalAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/PasteGlobalAction.java
deleted file mode 100644
index ef249c57d..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/PasteGlobalAction.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.w3c.dom.Node;
-
-public class PasteGlobalAction extends Action {
-	private IEditorPart editor;
-	private WSDLElement selection;
-	private Node selectionNode;
-	
-	public PasteGlobalAction(WSDLElement selection, IEditorPart editor) {
-		setText(WSDLEditorPlugin.getWSDLString("_UI_ACTION_PASTE"));  // Translate This
-		this.selection = selection;
-		this.editor = editor;
-		selectionNode = selection.getElement();
-		setEnabledState();
-	}
-	
-	public void run() {
-		if (editor instanceof WSDLEditor) {
-			WSDLEditor wsdlEditor = (WSDLEditor) editor;
-			CopyWSDLElementAction copyAction = new CopyWSDLElementAction(wsdlEditor.getGraphViewer().getComponentViewer(), wsdlEditor.getClipboardContents(), selection, selectionNode);
-			copyAction.run();
-		}
-	}
-	
-  	public void setSelection(WSDLElement newSelection) {
-  		selection = newSelection;
-  		setEnabledState();
-  	}
-  	
-  	protected void setEnabledState() {
-  		WSDLElement parentElement = null;
-  		if ((parentElement = showPasteAction((WSDLElement) selection, editor)) != null) {
-  			selection = parentElement;
-  			setEnabled(true);
-  		}
-  		else {
-  			setEnabled(false);
-  		}
-  	}
-  	
-  	 private WSDLElement showPasteAction(WSDLElement element, IEditorPart ePart) {
-  	  	WSDLElement parentElement = null;
-  	  	
-  	  	if (ePart instanceof WSDLEditor) {
-  	  		WSDLElement clipboardElement = ((WSDLEditor) ePart).getClipboardContents();
-  	  		
-  	  		if (element instanceof PortType) {
-  	  			if (clipboardElement instanceof Operation) {
-  	  				parentElement = element;
-  	  			}
-  	  		}
-  	  		if (element instanceof Operation) {
-  	  			if (clipboardElement instanceof Operation) {
-  	  				parentElement = (WSDLElement) ((Operation) element).eContainer();
-  	  			}
-  	  		}
-  	  	}
-  	  	
-  	  	return parentElement;
-  	  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/ReloadDependenciesActionDelegate.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/ReloadDependenciesActionDelegate.java
deleted file mode 100644
index 6a04631c6..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/ReloadDependenciesActionDelegate.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.ui.IEditorActionDelegate;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.actions.ActionDelegate;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-
-public class ReloadDependenciesActionDelegate extends ActionDelegate implements IEditorActionDelegate
-{
-	private WSDLEditor wsdlEditor;
-
-	public void setActiveEditor(IAction action, IEditorPart targetEditor)
-	{
-		wsdlEditor = (targetEditor instanceof WSDLEditor) ? (WSDLEditor)targetEditor : null;
-	}
-
-	public void run(IAction action)
-	{
-		if (wsdlEditor != null)
-		{
-			try
-			{
-				wsdlEditor.reloadDependencies();
-			}
-			catch (Exception e)
-			{
-				e.printStackTrace();
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/RenameAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/RenameAction.java
deleted file mode 100644
index f6826e871..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/RenameAction.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions; 
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.wsdl.ui.internal.visitor.BindingRenamer;
-import org.eclipse.wst.wsdl.ui.internal.visitor.MessageRenamer;
-import org.eclipse.wst.wsdl.ui.internal.visitor.PortTypeRenamer;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-//import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-public class RenameAction //extends BaseNodeAction implements Runnable
-{
-  protected Object modelObject;                 
-  protected String newName;
-  protected Node node;                        
-
-  public RenameAction(Object modelObject, String newName)
-  {                          
-    this.modelObject = modelObject;
-    this.newName = newName;
-    this.node = WSDLEditorUtil.getInstance().getNodeForObject(modelObject);
-  }      
-
-  /*
-  public Node getNode()
-  {
-    return node;
-  }
-  */
-
-  /*
-  public String getUndoDescription()
-  {
-    return WSDLEditorPlugin.getWSDLString("_UI_ACTION_RENAME");  //$NON-NLS-1$
-  }
-  */
-
-  public void run()
-  {
-    if (modelObject instanceof Operation) 
-    {
-      renameOperationHelper((Operation)modelObject);
-    }  
-    else if (modelObject instanceof Input ||
-             modelObject instanceof Output ||
-             modelObject instanceof Fault)
-    {
-      renameIOFHelper((WSDLElement)modelObject);
-    }
-    else
-    {
-      renameModelObjectHelper(modelObject, newName);
-    }
-  } 
-
-  protected void renameModelObjectHelper(Object modelObject, String theNewName)
-  {
-    Element element = WSDLEditorUtil.getInstance().getElementForObject(modelObject);
-    if (element != null)
-    { 
-      element.setAttribute("name", theNewName);
-    }    
-
-    if (modelObject instanceof Message)
-    {
-      MessageRenamer renamer = new MessageRenamer((Message)modelObject, theNewName);
-      renamer.visitBindings();
-    }
-    else if (modelObject instanceof PortType)
-    {
-      PortTypeRenamer renamer = new PortTypeRenamer((PortType)modelObject, theNewName);
-      renamer.visitBindings();
-    }
-    else if (modelObject instanceof Binding)
-    {
-      BindingRenamer renamer = new BindingRenamer((Binding)modelObject, theNewName);
-      renamer.visitServices();
-    }
-  }
-
-  protected void renameOperationHelper(Operation operation)
-  {
-    renameModelObjectHelper(operation, newName);
-  }
-
-
-  protected void renameIOFHelper(WSDLElement object)
-  {                         
-    Definition definition = object.getEnclosingDefinition(); 
-    ComponentReferenceUtil util = new ComponentReferenceUtil(definition);
-                          
-    List list = null;
-
-    if (object instanceof Input)
-    {
-      list = util.getBindingInputs((Input)object);
-    }
-    else if (object instanceof Output)
-    {
-      list = util.getBindingOutputs((Output)object);
-    }
-    else // fault
-    {
-      list = util.getBindingFaults((Fault)object);
-    }
-      
-    if (list != null)
-    {
-      for (Iterator i = list.iterator(); i.hasNext(); )
-      {
-        Object bindingObject = i.next();
-        renameModelObjectHelper(bindingObject, newName);
-      }                                           
-    }
-
-    renameModelObjectHelper(object, newName);
-  }  
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/SetExistingComponentAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/SetExistingComponentAction.java
deleted file mode 100644
index 3ff35e49e..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/SetExistingComponentAction.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.dialogs.InvokeSetDialog;
-import org.w3c.dom.Node;
-
-
-
-public class SetExistingComponentAction extends AddElementAction
-{
-  Object input;
-  protected IEditorPart editorPart;
-  protected String kind;
-
-  public SetExistingComponentAction(
-    String text,
-    Node parentNode,
-    String prefix,
-    String localName,
-    Object input)
-  {
-    super(text, parentNode, prefix, localName);
-    this.input = input;
-  }
-
-  public void setEditor(IEditorPart editorPart)
-  {
-    this.editorPart = editorPart; 
-  }
-
-  public void setReferenceKind(String kind)
-  {
-    this.kind = kind;
-  }
-
-  protected void performAddElement()
-  {
-    InvokeSetDialog dialog = new InvokeSetDialog();
-    if (input instanceof Part)
-    {
-      dialog.setReferenceKind(kind);
-    }
-    dialog.run(input, editorPart);
-    
-    // We shouldn't know about the editor in this class
-    WSDLEditor editor = (WSDLEditor) editorPart;
-    editor.getSelectionManager().setSelection(new StructuredSelection(input));
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/SetNewComponentAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/SetNewComponentAction.java
deleted file mode 100644
index f775e431a..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/SetNewComponentAction.java
+++ /dev/null
@@ -1,336 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.MessageReference;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.binding.soap.internal.util.SOAPConstants;
-import org.eclipse.wst.wsdl.internal.generator.BindingGenerator;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddMessageCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddXSDElementDeclarationCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddXSDTypeDefinitionCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.WSDLElementCommand;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.CreateWSDLElementHelper;
-import org.eclipse.wst.wsdl.ui.internal.util.NameUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.wsdl.ui.internal.widgets.NewComponentDialog;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/*
- * TODO: Need to clean up this class.... We probably don't use quite a few of these
- * methods/instance variables.
- */
-public class SetNewComponentAction extends AddElementAction
-{
-  Object input;
-  protected IEditorPart editorPart;
-  protected String kind;
-  private String typeKind = "complex";      // TODO: Refactor code to handle this better
-
-  public SetNewComponentAction(
-    String text,
-    Node parentNode,
-    String prefix,
-    String localName,
-    Object input)
-  {
-    super(text, parentNode, prefix, localName);
-    this.input = input;
-  }
-
-  public void setEditor(IEditorPart editorPart)
-  {
-    this.editorPart = editorPart; 
-  }
-
-  public void setReferenceKind(String kind)
-  {
-    this.kind = kind;
-  }
-  
-  public void setTypeKind(String typeKind)
-  {
-      this.typeKind = typeKind;
-  }
-
-  // TODO: Clean up next methods below!!!
-  private WSDLElementCommand command;
-  private String newDialogTitle = WSDLEditorPlugin.getWSDLString("_UI_LABEL_NEW_COMPONENT");
-  
-  protected void performAddElement()
-  {
-    Shell shell = Display.getCurrent().getActiveShell();
-    String defaultName = getDefaultName();
-    NewComponentDialog dialog = new NewComponentDialog(shell, newDialogTitle, defaultName, getUsedNames());
-
-    int dialogCode = dialog.createAndOpen();
-    
-    if (dialogCode == Window.OK) {
-        if (input instanceof Port) {
-            Definition definition = ((Port) input).getEnclosingDefinition();
-            String newName = dialog.getName();
-            
-            // TODO: We should be smarter in choosing some default options/settings for generating a new Binding
-//            BindingGenerator bindingGenerator = new BindingGenerator(definition);
-//            bindingGenerator.setName(newName);
-//            bindingGenerator.setProtocol("SOAP");
-//            bindingGenerator.generate();
-			BindingGenerator bindingGenerator = new BindingGenerator(definition, null, SOAPConstants.SOAP_NAMESPACE_URI);
-			bindingGenerator.setName(newName);
-			bindingGenerator.generateBinding();
-            
-          String itemPrefix = definition.getPrefix(definition.getTargetNamespace());
-          if (itemPrefix == null)
-          {
-            itemPrefix = "";
-          }
-          org.w3c.dom.Element wsdlElement = WSDLEditorUtil.getInstance().getElementForObject((WSDLElement) input);
-          wsdlElement.setAttribute("binding", itemPrefix.length() == 0 ? newName : itemPrefix + ":" + newName);     
-          
-        }
-        else if (input instanceof Binding) {            
-            Definition definition = ((Binding) input).getEnclosingDefinition();
-            Element definitionElement = WSDLEditorUtil.getInstance().getElementForObject(definition);
-            
-            String newName = dialog.getName();
-            String prefix = definitionElement.getPrefix();
-            // Use AddMessageAction in WSDLMenuActionContributor
-            AddElementAction addPortTypeAction = new AddElementAction("", "icons/message_obj.gif", definitionElement, prefix, "portType"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-            addPortTypeAction.setComputeTopLevelRefChild(true);
-            addPortTypeAction.run();
-            org.w3c.dom.Element newMessage = addPortTypeAction.getNewElement();
-            newMessage.setAttribute("name", newName); //$NON-NLS-1$
-            // need to get the prefix for the item
-            // could get list of updated messages and then select but currently we only have the local name
-            String itemPrefix = definition.getPrefix(definition.getTargetNamespace());
-            if (itemPrefix == null)
-            {
-              itemPrefix = ""; //$NON-NLS-1$
-            }
-            String portTypeValue = itemPrefix.length() == 0 ? newName : itemPrefix + ":" + newName; //$NON-NLS-1$ //$NON-NLS-2$
-
-            // Set the component
-            if (input != null && portTypeValue != null) {
-                org.w3c.dom.Element wsdlElement = WSDLEditorUtil.getInstance().getElementForObject((WSDLElement) input);
-                wsdlElement.setAttribute("type", portTypeValue);
-            } 
-        }
-        else if (input instanceof Input || input instanceof Output || input instanceof Fault) {
-            Definition definition = ((MessageReference) input).getEnclosingDefinition();
-            String newName = dialog.getName();
-
-            AddMessageCommand action = new AddMessageCommand(definition, newName);
-            action.run();
-            Message message = (Message) action.getWSDLElement();
-            CreateWSDLElementHelper.PART_TYPE_OR_DEFINITION = CreateWSDLElementHelper.getPartInfo(message); 
-            CreateWSDLElementHelper.createPart(message);
-
-          // need to get the prefix for the item
-          // could get list of updated messages and then select but currently we only have the local name
-          String itemPrefix = definition.getPrefix(definition.getTargetNamespace());
-          if (itemPrefix == null)
-          {
-            itemPrefix = ""; //$NON-NLS-1$
-          }
-          org.w3c.dom.Element wsdlElement = WSDLEditorUtil.getInstance().getElementForObject((WSDLElement) input);
-          wsdlElement.setAttribute("message", itemPrefix.length() == 0 ? newName : itemPrefix + ":" + newName); //$NON-NLS-1$ //$NON-NLS-2$
-        }
-        else if (input instanceof Part) {
-            Definition definition = ((Part) input).getEnclosingDefinition();
-            String referencingPrefix = definition.getPrefix(definition.getTargetNamespace());
-            String newName = dialog.getName();
-            
-            if (kind.equalsIgnoreCase("type")) {
-                if (typeKind.equalsIgnoreCase("complex")) {
-                    ((AddXSDTypeDefinitionCommand) command).isComplexType(true);    
-                }
-                else {
-                    ((AddXSDTypeDefinitionCommand) command).isComplexType(false);
-                }                
-                ((AddXSDTypeDefinitionCommand) command).run(newName);
-                ComponentReferenceUtil.setComponentReference((Part) input, true, referencingPrefix.equals("") ? newName : referencingPrefix + ":" + newName);
-            }
-            else if (kind.equalsIgnoreCase("element")) {
-                ((AddXSDElementDeclarationCommand) command).run(newName);
-                ComponentReferenceUtil.setComponentReference((Part) input, false, referencingPrefix.equals("") ? newName : referencingPrefix + ":" + newName);
-            }
-        }
-        
-        // We shouldn't know about the editor in this class
-      WSDLEditor editor = (WSDLEditor) editorPart;
-      editor.getSelectionManager().setSelection(new StructuredSelection(input));
-    }
-  }
-  
-  private List getUsedNames() {
-      if (input instanceof Port) {
-          Definition definition = ((Port) input).getEnclosingDefinition();
-          return NameUtil.getUsedBindingNames(definition);
-      }
-      else if (input instanceof Binding) {
-          Definition definition = ((Binding) input).getEnclosingDefinition();
-          return NameUtil.getUsedPortTypeNames(definition);
-      }
-      else if (input instanceof Input || input instanceof Output || input instanceof Fault) {
-          Definition definition = ((MessageReference) input).getEnclosingDefinition();
-          return NameUtil.getUsedMessageNames(definition);
-      }
-      else if (input instanceof Part) {
-          Definition definition = ((Part) input).getEnclosingDefinition();
-          if (kind.equalsIgnoreCase("element")) {
-              if (command == null) {
-                  command = new AddXSDElementDeclarationCommand(definition, "NewElement");
-              }
-              XSDSchema parentSchema = ((AddXSDElementDeclarationCommand) command).getSchema();
-              
-              return getUsedElementNames(parentSchema);
-          }
-          else if (kind.equalsIgnoreCase("type")) {
-              if (command == null) {
-                  command = new AddXSDTypeDefinitionCommand(definition, "NewType");
-              }
-              XSDSchema parentSchema = ((AddXSDTypeDefinitionCommand) command).getSchema();
-              
-              List usedNames;
-              if (typeKind.equalsIgnoreCase("complex")) {
-                  usedNames = getUsedComplexTypeNames(parentSchema);    
-              }
-              else {
-                  usedNames = getUsedSimpleTypeNames(parentSchema);
-              }
-              
-              return usedNames;
-          }
-      }
-      
-      return (new ArrayList());
-  }
-
-  private String getDefaultName() {
-      if (input instanceof Port) {
-          newDialogTitle = WSDLEditorPlugin.getWSDLString("_UI_LABEL_NEW_BINDING");       // TODO: Ugly Hack... remove
-          Definition def = ((Port) input).getEnclosingDefinition();
-          return NameUtil.getUniqueNameHelper("NewBinding", NameUtil.getUsedBindingNames(def));
-      }
-      else if (input instanceof Binding) {
-          newDialogTitle = WSDLEditorPlugin.getWSDLString("_UI_LABEL_NEW_PORTTYPE");       // TODO: Ugly Hack... remove
-          Definition def = ((Binding) input).getEnclosingDefinition();
-          return NameUtil.getUniqueNameHelper("NewPortType", NameUtil.getUsedPortTypeNames(def));
-      }
-      else if (input instanceof Input || input instanceof Output || input instanceof Fault) {
-          newDialogTitle = WSDLEditorPlugin.getWSDLString("_UI_LABEL_NEW_MESSAGE");       // TODO: Ugly Hack... remove
-          Definition def = ((MessageReference) input).getEnclosingDefinition();
-          return NameUtil.getUniqueNameHelper("NewMessage", NameUtil.getUsedMessageNames(def));
-      }
-      else if (input instanceof Part) {
-          Definition def = ((Part) input).getEnclosingDefinition();
-          
-          if (kind.equalsIgnoreCase("element")) {
-              newDialogTitle = WSDLEditorPlugin.getWSDLString("_UI_LABEL_NEW_ELEMENT");      // TODO: Ugly Hack... remove
-              if (command == null) {
-                  command = new AddXSDElementDeclarationCommand(def, "NewElement");
-              }
-              XSDSchema parentSchema = ((AddXSDElementDeclarationCommand) command).getSchema();
-              
-              List usedNames = getUsedElementNames(parentSchema);
-              return NameUtil.getUniqueNameHelper("NewElement", usedNames);
-          }
-          else if (kind.equalsIgnoreCase("type")) {
-              if (command == null) {
-                  command = new AddXSDTypeDefinitionCommand(def, "NewType");
-              }
-              XSDSchema parentSchema = ((AddXSDTypeDefinitionCommand) command).getSchema();
-
-              String newItemName = "NewComplexType";
-              List usedNames = null;
-              if (typeKind.equalsIgnoreCase("complex")) {
-                  newDialogTitle = WSDLEditorPlugin.getWSDLString("_UI_LABEL_NEW_COMPLEX_TYPE");       // TODO: Ugly Hack... remove
-                  usedNames = getUsedComplexTypeNames(parentSchema);    
-              }
-              else {
-                  newDialogTitle = WSDLEditorPlugin.getWSDLString("_UI_LABEL_NEW_SIMPLE_TYPE");       // TODO: Ugly Hack... remove
-                  usedNames = getUsedSimpleTypeNames(parentSchema);
-                  newItemName = "NewSimpleType";
-              }
-              
-              return newItemName = NameUtil.getUniqueNameHelper(newItemName, usedNames);
-          }
-      }
-      
-      return "NewComponent";
-  }
-  
-  private List getUsedSimpleTypeNames(XSDSchema schema) {
-      List namesList = new ArrayList();
-      
-      Iterator typesIt = schema.getTypeDefinitions().iterator();
-      while (typesIt.hasNext()) {
-          XSDTypeDefinition type = (XSDTypeDefinition) typesIt.next();
-          if (type instanceof XSDSimpleTypeDefinition) {
-              namesList.add(type.getName());
-          }
-      }
-      
-      return namesList;
-  }
-  
-  private List getUsedComplexTypeNames(XSDSchema schema) {
-      List namesList = new ArrayList();
-      
-      Iterator typesIt = schema.getTypeDefinitions().iterator();
-      while (typesIt.hasNext()) {
-          XSDTypeDefinition type = (XSDTypeDefinition) typesIt.next();
-          if (type instanceof XSDComplexTypeDefinition) {
-              namesList.add(type.getName());
-          }
-      }
-      
-      return namesList;
-  }
-  
-  private List getUsedElementNames(XSDSchema schema) {
-      List namesList = new ArrayList();
-      
-      Iterator elementsIt = schema.getElementDeclarations().iterator();
-      while (elementsIt.hasNext()) {
-          XSDElementDeclaration element = (XSDElementDeclaration) elementsIt.next();
-          namesList.add(element.getName());
-      }
-      
-      return namesList;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/SmartRenameAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/SmartRenameAction.java
deleted file mode 100644
index 32fc403ee..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/SmartRenameAction.java
+++ /dev/null
@@ -1,551 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.MessageReference;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.w3c.dom.Node;
-
-
-/*
- * This class renames 'related' WSDLElements.  The scenario is as follows:
- * The user renames a WSDLElement in the editor, say a Message.  This class
- * will find the 'related' elements to this Message and rename them as well.
- * It will only rename a 'related' element if the element name (or part of it)
- * is generated.
- * 
- * See NameUtil.java
- */
-public class SmartRenameAction extends BaseNodeAction implements Runnable {
-	protected Object element;
-	protected String newName;
-	private List messageReferences; // This variable should be accessed by method getAllMessageReferences()
-	protected Node node;   
-	
-	public SmartRenameAction(Object element, String newName) {
-		setText("Smart Rename Action"); // Do not translate
-		this.element = element;
-		this.newName = newName;
-	    this.node = WSDLEditorUtil.getInstance().getNodeForObject(element);
-	}
-	
-	public Node getNode() {
-	   return node;
-	}
-
-	public String getUndoDescription() {
-	  return WSDLEditorPlugin.getWSDLString("_UI_ACTION_RENAME");  //$NON-NLS-1$
-	}
-
-	public void run() {
-		RenameAction renamer;
-		String oldName;
-		
-		beginRecording();
-		if (element instanceof Operation) {
-			Operation operation = (Operation) element;
-			oldName = operation.getName();
-
-			if (oldName.equals(newName)) {
-				return;
-			}
-			
-			// Rename Operation 
-			renamer = new RenameAction(operation, newName);
-			renamer.run();
-			
-			// Rename Input
-			Input input = operation.getEInput();
-			/*
-			if (input != null && isInputOutputNameGenerated(oldName, input.getName())) {
-				renamer = new RenameAction(input, newName);
-				renamer.run();
-			}
-			*/
-			
-			// Rename Output
-			Output output = operation.getEOutput();
-			/*
-			if (output != null && isInputOutputNameGenerated(oldName, output.getName())) {
-				renamer = new RenameAction(output, newName);
-				renamer.run();
-			}
-			*/
-			
-			// Rename Messages and Parts
-			Message msg;
-
-			// Input
-			if (input != null && input.getEMessage() != null) {
-				msg = input.getEMessage();
-				String oldMessageName = "";
-
-				if (msg != null) {
-					oldMessageName = msg.getQName().getLocalPart();
-					
-					if (isMessageNameGenerated(oldMessageName, oldName, "Request")) {
-						renameMessageHelper(msg, computeNewMessageName(msg, oldName, newName));
-						
-						if (msg.getEParts() != null)
-							renamePartsHelper(msg.getEParts(), oldMessageName, msg.getQName().getLocalPart(), true);	
-					}
-				}
-			}
-			
-			// Output
-			if (output != null && output.getMessage() != null) {
-				msg = output.getEMessage();
-				String oldMessageName = "";
-				
-				if (msg != null) {
-					oldMessageName = msg.getQName().getLocalPart();
-					
-					if (isMessageNameGenerated(oldMessageName, oldName, "Response")) {
-						renameMessageHelper(msg, computeNewMessageName(msg, oldName, newName));
-						
-						if (msg.getEParts() != null)
-							renamePartsHelper(msg.getEParts(), oldMessageName, msg.getQName().getLocalPart(), true);
-					}
-					
-				}
-			}
-			
-			// Faults
-			List faults = operation.getEFaults();
-			if (faults != null) {
-				Iterator it = faults.iterator();
-				while (it.hasNext()) {
-					Fault fault = (Fault) it.next();
-					msg = fault.getEMessage();
-					String oldMessageName = "";
-
-					if (msg != null) {
-						oldMessageName = msg.getQName().getLocalPart();
-						
-						if (isMessageNameGenerated(oldMessageName, oldName, fault.getName())) {
-							renameMessageHelper(msg, computeNewMessageName(msg, oldName, newName));
-							
-							if (msg.getEParts() != null)
-								renamePartsHelper(msg.getEParts(), oldMessageName, msg.getQName().getLocalPart(), true);
-						}
-					}
-				}
-			}
-		}
-		else if (element instanceof Input) {
-			Input input = (Input) element;
-			oldName = input.getName();
-			if (oldName == null) {
-				oldName = "";
-			}
-			
-			if (oldName.equals(newName)) {
-				return;
-			}
-			
-			input.setName(newName);
-
-//			 Rename Messages and Parts
-			Message msg;
-			
-			// Input
-			if (input != null && input.getEMessage() != null) {
-				msg = input.getEMessage();
-				String oldMessageName = "";
-				
-				if (msg != null) {
-					oldMessageName = msg.getQName().getLocalPart();
-					
-					if (isMessageNameGenerated(oldMessageName, oldName, "Request")) {
-						renameMessageHelper(msg, computeNewMessageName(msg, oldName, newName));
-						
-						if (msg.getEParts() != null)
-							renamePartsHelper(msg.getEParts(), oldMessageName, msg.getQName().getLocalPart(), true);	
-					}
-				}
-			}
-		}
-		else if (element instanceof Output) {
-			Output output = (Output) element;
-			oldName = output.getName();
-			if (oldName == null) {
-				oldName = "";
-			}
-			
-			if (oldName.equals(newName)) {
-				return;
-			}
-			
-			output.setName(newName);
-
-//			 Rename Messages and Parts
-			Message msg;
-			
-			// Output
-			if (output != null && output.getMessage() != null) {
-				msg = output.getEMessage();
-				String oldMessageName = "";
-				if (msg != null) {
-					oldMessageName = msg.getQName().getLocalPart();
-					if (isMessageNameGenerated(oldMessageName, oldName, "Response")) {
-						renameMessageHelper(msg, computeNewMessageName(msg, oldName, newName));
-						
-						if (msg.getEParts() != null)
-							renamePartsHelper(msg.getEParts(), oldMessageName, msg.getQName().getLocalPart(), true);
-					}
-				}
-			}
-		}
-		else if (element instanceof Fault) {
-			Fault fault = (Fault) element;
-			Message msg = fault.getEMessage();
-			String oldMessageName = "";
-			oldName = fault.getName();
-			
-			if (oldName.equals(newName)) {
-				return;
-			}
-			
-			// Rename the Fault
-			renamer = new RenameAction(fault, newName);
-			renamer.run();
-
-			// Rename the Message and Parts
-			if (msg != null) {
-				oldMessageName = msg.getQName().getLocalPart();
-				
-				Operation op = (Operation) fault.eContainer();
-				if (isMessageNameGenerated(oldMessageName, op.getName(), oldName)) {
-					renameMessageHelper(msg, computeNewMessageName(msg, oldName, newName));
-					
-					if (msg.getEParts() != null)
-						renameFaultParts(msg.getEParts(), op.getName(), oldName, newName);
-				}
-			}
-		}
-		else if (element instanceof Message) {
-			Message msg = (Message) element;
-			oldName = msg.getQName().getLocalPart();
-			String oldMessageName = msg.getQName().getLocalPart();
-			
-			if (oldName.equals(newName)) {
-				return;
-			}
-
-			renameMessageHelper(msg, computeNewMessageName(msg, oldName, newName));
-					
-			if (msg.getEParts() != null)
-				renamePartsHelper(msg.getEParts(), oldMessageName, msg.getQName().getLocalPart(), true);
-		}
-		else if (element instanceof Part) {
-			Part part = (Part) element;
-			String oldPartName = part.getName();
-			
-			if (oldPartName.equals(newName)) {
-				return;
-			}
-			
-			renamer = new RenameAction(element, newName);
-			renamer.run();
-			
-//			Rename Elements
-			renameXSDElement(part, oldPartName, newName);
-		}
-		else if (element instanceof Port) {
-			Port port = (Port) element;
-			String oldPortName = port.getName();
-			
-			renamer = new RenameAction(element, newName);
-			renamer.run();
-
-//			Rename Binding
-			Binding binding = port.getEBinding();
-			if (binding != null && binding.getQName().getLocalPart().equals(oldPortName)) {
-				renamer = new RenameAction(binding, newName);	
-				renamer.run();
-			}
-		}
-		endRecording();
-	}
-	
-	// boolean isInputOutput should be set to true if the part is an Input or Output.
-	// Set false if the part is a Fault.
-	private void renamePartsHelper(List partsList, String oldSubString, String newSubString, boolean isInputOutput) {
-		RenameAction renamer;
-		
-		if (partsList != null) {
-			Iterator pIt = partsList.iterator();
-			while (pIt.hasNext()) {
-				Part part = (Part) pIt.next();
-				String oldPartName = part.getName();
-				
-				if (isPartNameGenerated(oldPartName, oldSubString)) {
-					String newPartName;
-					if (isInputOutput) {
-						newPartName = computeNewPartName(part, oldSubString, newSubString);
-					}
-					else {
-						newPartName = computeNewFaultPartName(part, oldSubString, newSubString);
-					}
-					
-					renamer = new RenameAction(part, newPartName);
-					renamer.run();
-					
-					// Rename Elements
-					renameXSDElement(part, oldPartName, newPartName);
-				}
-			}
-		}
-	}
-	
-	// This method is used to update the Part name when the Fault name is changed.  Only
-	// change the Part name if the part name is a generated name.
-	// Compare to renamePartsHelper().  The renamePartsHelper() method is called when a Fault
-	// has NOT been renamed, rather, it is triggered by some other naming (ex. Operation
-	// renaming).  It will updat Input/Output, AND Fault Parts.
-	private void renameFaultParts(List partsList, String baseName, String oldSubString, String newSubString) {
-		RenameAction renamer;
-		
-		if (partsList != null) {
-			Iterator pIt = partsList.iterator();
-			while (pIt.hasNext()) {
-				Part part = (Part) pIt.next();
-				String oldPartName = part.getName();
-				
-				if (isPartNameGenerated(oldPartName, baseName, oldSubString)) {
-					String newPartName;
-					newPartName = computeNewFaultPartName(part, oldSubString, newSubString);
-					renamer = new RenameAction(part, newPartName);
-					renamer.run();
-					
-					// Rename Elements
-					renameXSDElement(part, oldPartName, newPartName);
-				}
-			}
-		}
-	}
-	
-	private String computeNewMessageName(Message message, String oldSubString, String newSubString) {
-		String string = message.getQName().getLocalPart();
-		return replaceSectionWithSubString(string, oldSubString, newSubString, 0);		
-	}
-	
-//	private String computeNewFaultMessageName(Message message, String oldSubString, String newSubString) {
-//		String string = message.getQName().getLocalPart();
-//		return replaceSectionWithSubString(string, oldSubString, newSubString, 1);		
-//	}
-	
-	// Method for Input, Output, and Fault Parts
-	// See computeNewFaultPartName() for comparison
-	private String computeNewPartName(Part part, String oldSubString, String newSubString) {
-		String string = part.getName();
-		return replaceSectionWithSubString(string, oldSubString, newSubString, 0);		
-	}
-	
-	// Method for Fault Parts
-	// This method behaves in the exact same way as computeNewPartName() except it starts searching for a match
-	// after the first character.  This method is intended for users who wish to rename a generated (Fault) part
-	// where the Fault name has changed.  We start our search after the first character because the generated name
-	// of the part is built by appending the Fault name after the Operation name.
-	private String computeNewFaultPartName(Part part, String oldSubString, String newSubString) {
-		String string = part.getName();
-		return replaceSectionWithSubString(string, oldSubString, newSubString, 1);		
-	}
-	
-	private String replaceSectionWithSubString(String fullString, String oldSubString, String newSubString, int startSearchIndex) {
-		StringBuffer fullSB = new StringBuffer(fullString);
-		int index = fullSB.indexOf(oldSubString, startSearchIndex);
-		if (index >= 0) {
-			return fullSB.replace(index, index + oldSubString.length(), newSubString).toString();
-		}
-		
-		return "";
-	}
-
-	////////////////////////////////////////////////////////////////////////////////////////
-	
-	private static boolean commonNameGeneratorCheck(String targetName, String baseName, String appendName) {
-		// First criteria is targetName must start with the baseName
-		if (!targetName.startsWith(baseName))
-			return false;
-			
-		if (appendName.trim().length() > 0) {
-			// Second criteria.  The appended name must be in the targetName and begin right
-			// after the baseName location
-			if (!targetName.startsWith(appendName, baseName.length()))
-				return false;
-		}
-			
-		// Third criteria (if necessary).  If baseName + appendName is shorter than targetName,
-		// then there must be 'extra' characters at the end of targetName.  These characters must
-		// make up an integer.  If not, it is not a generated string.
-		int subLength = baseName.length() + appendName.length();
-		if (targetName.length() > subLength) {
-			// We have 'extra' characters
-			String extras = targetName.substring(subLength);
-			
-			if(!isDigit(extras))
-				return false;
-		}
-		
-		return true;
-	}
-	
-	public static boolean isOperationNameGenerated(String opName, String name) {
-		return opName.equals(name);
-	}
-	
-	public static boolean isMessageNameGenerated(String msgName, String baseName, String appendName) {
-		return commonNameGeneratorCheck(msgName, baseName, appendName);
-	}
-	
-	public static boolean isInputOutputNameGenerated(String inOutName, String name) {
-		return inOutName.equals(name);
-	}
-	
-	public static boolean isFaultNameGenerated(String faultName, String name) {
-		return faultName.equals(name);
-	}
-	
-	public static boolean isPartNameGenerated(String partName, String baseName) {
-		return commonNameGeneratorCheck(partName, baseName, "");
-	}
-	
-	private boolean isPartNameGenerated(String partName, String baseName, String appendName) {
-		return commonNameGeneratorCheck(partName, baseName, appendName);
-	}
-	
-	private static boolean isDigit(String string) {
-		boolean rValue = true;
-		char[] chars = string.toCharArray();
-	
-		for (int index = 0; index < chars.length; index++) {
-			if (!Character.isDigit(chars[index])) {
-				rValue = false;
-				break;
-			}
-		}
-		
-		return rValue;
-	}
-	
-	/*
-	 * The following classes aid in renaming a message
-	 */
-	private void renameMessageHelper(Message msg, String newName) {
-		List messageRefs = getReferencingMessageReferences(msg, getAllMessageReferences());
-		
-		RenameAction renamer = new RenameAction(msg, newName);
-		renamer.run();
-		
-		Iterator iterator = messageRefs.iterator();
-		while (iterator.hasNext()) {
-			MessageReference messageReference = (MessageReference) iterator.next();
-			messageReference.setEMessage(msg);
-		}
-	}
-	
-	private List getReferencingMessageReferences(Message msg, List messageRefs) {
-		Vector referencesVector = new Vector();
-		QName messageQName = msg.getQName();
-		Iterator iterator = messageRefs.iterator();
-		
-		while (iterator.hasNext()) {
-			MessageReference messageReference = (MessageReference) iterator.next();
-			if (messageReference.getEMessage() != null && messageQName.equals(messageReference.getEMessage().getQName())) {
-				referencesVector.addElement(messageReference);
-			}
-		}
-		
-		return referencesVector;
-	}
-	
-	private List getAllMessageReferences() {
-		if (messageReferences == null) {
-			messageReferences = new Vector();
-			Definition definition = ((WSDLElement) element).getEnclosingDefinition();
-			List portTypes = definition.getEPortTypes();
-		
-			if (portTypes != null) {
-				Iterator portTypeIterator = portTypes.iterator();
-				while (portTypeIterator.hasNext()) {
-					List operationsList = ((PortType) portTypeIterator.next()).getEOperations();
-					
-					if (operationsList != null) {
-						Iterator operationsIterator = operationsList.iterator();
-						while (operationsIterator.hasNext()) {
-							messageReferences.addAll(getAllMessageReferences((Operation) operationsIterator.next()));
-						}
-					}
-				}
-			}
-		}
-		
-		return messageReferences;
-	}
-	
-	private Vector getAllMessageReferences(Operation operation) {
-		Vector iofs = new Vector();
-		Iterator it = operation.getEFaults().iterator();
-		while (it.hasNext()) {
-			iofs.addElement(it.next());
-		}
-		
-		if (iofs == null)
-			iofs = new Vector();
-		
-		if (operation.getEInput() != null)
-			iofs.addElement(operation.getEInput());
-		
-		if (operation.getEOutput() != null)
-			iofs.addElement(operation.getEOutput());
-		
-		return iofs;
-	}
-	
-	private void renameXSDElement(Part part, String oldXSDName, String newXSDName) {
-		XSDElementDeclaration elementDeclaration = part.getElementDeclaration();
-		if (elementDeclaration != null && oldXSDName.equals(elementDeclaration.getName())) {
-			renameElementDeclarationHelper(elementDeclaration, oldXSDName, newXSDName);
-			
-			// Here we rename the element reference.
-			//
-			QName qname = new QName(part.getElementName().getNamespaceURI(), newXSDName);
-			part.setElementName(qname);			
-		}
-	}
-	
-	private void renameElementDeclarationHelper(XSDElementDeclaration elementDeclaration, String oldXSDName, String newXSDName) {
-		if (elementDeclaration != null && elementDeclaration.getName().equals(oldXSDName)) {
-			elementDeclaration.setName(newXSDName);
-		}
-	}
-	
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/SourceEditorActionBarContributor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/SourceEditorActionBarContributor.java
deleted file mode 100644
index 472ca0db3..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/SourceEditorActionBarContributor.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IStatusLineManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorActionBarContributor;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.part.EditorActionBarContributor;
-import org.eclipse.ui.part.MultiPageEditorActionBarContributor;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-import org.eclipse.wst.sse.ui.internal.ExtendedEditorActionBuilder;
-import org.eclipse.wst.sse.ui.internal.IExtendedContributor;
-import org.eclipse.wst.sse.ui.internal.ISourceViewerActionBarContributor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLMultiPageEditorPart;
-
-public class SourceEditorActionBarContributor extends MultiPageEditorActionBarContributor implements IExtendedContributor {
-
-	protected IEditorActionBarContributor designViewerActionBarContributor = null;
-	protected IEditorActionBarContributor sourceViewerActionContributor = null;
-	protected WSDLMultiPageEditorPart multiPageEditor = null;
-
-	// EditorExtension
-	private static final String EDITOR_ID = "org.eclipse.wst.wsdl.ui.internal.actions.XMLMultiPageEditorPart"; //$NON-NLS-1$
-	private IExtendedContributor extendedContributor;
-
-	public SourceEditorActionBarContributor() {
-		super();
-
-		sourceViewerActionContributor = new SourcePageActionContributor();
-
-		// Read action extensions.
-		ExtendedEditorActionBuilder builder = new ExtendedEditorActionBuilder();
-		extendedContributor = builder.readActionExtensions(EDITOR_ID);
-	}
-
-	public void init(IActionBars actionBars) {
-		super.init(actionBars);
-
-		if (actionBars != null) {
-			initDesignViewerActionBarContributor(actionBars);
-			initSourceViewerActionContributor(actionBars);
-		}
-	}
-
-	protected void initDesignViewerActionBarContributor(IActionBars actionBars) {
-		if (designViewerActionBarContributor != null)
-			designViewerActionBarContributor.init(actionBars, getPage());
-	}
-
-	protected void initSourceViewerActionContributor(IActionBars actionBars) {
-		if (sourceViewerActionContributor != null)
-			sourceViewerActionContributor.init(actionBars, getPage());
-	}
-
-	public void dispose() {
-		super.dispose();
-
-		if (designViewerActionBarContributor != null)
-			designViewerActionBarContributor.dispose();
-
-		if (sourceViewerActionContributor != null)
-			sourceViewerActionContributor.dispose();
-
-		if (extendedContributor != null)
-			extendedContributor.dispose();
-	}
-
-	/**
-	 * @see EditorActionBarContributor#contributeToMenu(IMenuManager)
-	 */
-	public final void contributeToMenu(IMenuManager menu) {
-		super.contributeToMenu(menu);
-
-		addToMenu(menu);
-
-		if (extendedContributor != null)
-			extendedContributor.contributeToMenu(menu);
-	}
-
-	protected void addToMenu(IMenuManager menu) {
-	}
-
-	/**
-	 * @see IExtendedContributor#contributeToPopupMenu(IMenuManager)
-	 */
-	public final void contributeToPopupMenu(IMenuManager menu) {
-
-		addToPopupMenu(menu);
-
-		if (extendedContributor != null)
-			extendedContributor.contributeToPopupMenu(menu);
-	}
-
-	protected void addToPopupMenu(IMenuManager menu) {
-	}
-
-	/**
-	 * @see EditorActionBarContributor#contributeToToolBar(IToolBarManager)
-	 */
-	public final void contributeToToolBar(IToolBarManager toolBarManager) {
-		super.contributeToToolBar(toolBarManager);
-
-		addToToolBar(toolBarManager);
-
-		if (extendedContributor != null)
-			extendedContributor.contributeToToolBar(toolBarManager);
-	}
-
-	protected void addToToolBar(IToolBarManager toolBarManager) {
-	}
-
-	/**
-	 * @see EditorActionBarContributor#contributeToStatusLine(IStatusLineManager)
-	 */
-	public final void contributeToStatusLine(IStatusLineManager manager) {
-		super.contributeToStatusLine(manager);
-
-		addToStatusLine(manager);
-
-		if (extendedContributor != null)
-			extendedContributor.contributeToStatusLine(manager);
-	}
-
-	protected void addToStatusLine(IStatusLineManager manager) {
-	}
-
-	/**
-	 * @see IExtendedContributor#updateToolbarActions()
-	 */
-	public void updateToolbarActions() {
-		if (extendedContributor != null)
-			extendedContributor.updateToolbarActions();
-	}
-
-	public void setActiveEditor(IEditorPart targetEditor) {
-		// save multiPageEditor before calling super.setActiveEditor(targetEditor)
-		// super.setActiveEditor will call setActivePage(IEditorPart activeEditor)
-		// multiPageEditor is needed in setActivePage(IEditorPart activeEditor)
-		if (targetEditor instanceof WSDLMultiPageEditorPart)
-			multiPageEditor = (WSDLMultiPageEditorPart) targetEditor;
-
-		super.setActiveEditor(targetEditor);
-
-		updateToolbarActions();
-
-		if (extendedContributor != null)
-			extendedContributor.setActiveEditor(targetEditor);
-	}
-
-	public void setActivePage(IEditorPart activeEditor) {
-		// This contributor is designed for StructuredTextMultiPageEditorPart.
-		// To safe-guard this from problems caused by unexpected usage by other editors, the following
-		// check is added.
-		if (multiPageEditor != null) {
-			if (activeEditor != null && activeEditor instanceof StructuredTextEditor)
-				activateSourcePage(activeEditor);
-			else
-				activateDesignPage(activeEditor);
-		}
-
-		updateToolbarActions();
-
-		IActionBars actionBars = getActionBars();
-		if (actionBars != null) {
-			// update menu bar and tool bar
-			actionBars.updateActionBars();
-		}
-	}
-
-	protected void activateDesignPage(IEditorPart activeEditor) {
-		if (designViewerActionBarContributor != null && designViewerActionBarContributor instanceof IDesignViewerActionBarContributor) {
-			designViewerActionBarContributor.setActiveEditor(multiPageEditor);
-		}
-
-		if (sourceViewerActionContributor != null && sourceViewerActionContributor instanceof ISourceViewerActionBarContributor) {
-			// if design page is not really an IEditorPart, activeEditor == null, so pass in multiPageEditor instead (d282414)
-			if (activeEditor == null) {
-				sourceViewerActionContributor.setActiveEditor(multiPageEditor);
-			}
-			else {
-				sourceViewerActionContributor.setActiveEditor(activeEditor);
-			}
-			((ISourceViewerActionBarContributor) sourceViewerActionContributor).setViewerSpecificContributionsEnabled(false);
-		}
-	}
-
-	protected void activateSourcePage(IEditorPart activeEditor) {
-		if (designViewerActionBarContributor != null && designViewerActionBarContributor instanceof IDesignViewerActionBarContributor) {
-			designViewerActionBarContributor.setActiveEditor(multiPageEditor);
-		}
-
-		if (sourceViewerActionContributor != null && sourceViewerActionContributor instanceof ISourceViewerActionBarContributor) {
-			sourceViewerActionContributor.setActiveEditor(activeEditor);
-			((ISourceViewerActionBarContributor) sourceViewerActionContributor).setViewerSpecificContributionsEnabled(true);
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/SourcePageActionContributor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/SourcePageActionContributor.java
deleted file mode 100644
index 84b6bd753..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/SourcePageActionContributor.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import org.eclipse.ui.IActionBars;
-import org.eclipse.wst.xml.ui.internal.actions.ActionContributorXML;
-
-
-/**
- * SourcePageActionContributor
- * 
- * This class is for multi page editor's source page contributor.
- *
- * Use WSDLEditorActionContributor for single page editor
- * */
-public class SourcePageActionContributor extends ActionContributorXML {
-
-	private IActionBars fBars;
-
-	/**
-	 * This method calls:
-	 * <ul>
-	 *  <li><code>contributeToMenu</code> with <code>bars</code>' menu manager</li>
-	 *  <li><code>contributeToToolBar</code> with <code>bars</code>' tool bar
-	 *    manager</li>
-	 *  <li><code>contributeToStatusLine</code> with <code>bars</code>' status line
-	 *    manager</li>
-	 * </ul>
-	 * The given action bars are also remembered and made accessible via 
-	 * <code>getActionBars</code>.
-	 * 
-	 * @param bars the action bars
-	 * 
-	 */
-	public void init(IActionBars bars) {
-		fBars = bars;
-		contributeToMenu(bars.getMenuManager());
-		contributeToToolBar(bars.getToolBarManager());
-		contributeToStatusLine(bars.getStatusLineManager());
-	}
-
-	/**
-	 * Returns this contributor's action bars.
-	 *
-	 * @return the action bars
-	 */
-	public IActionBars getActionBars() {
-		return fBars;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLActionBarContributor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLActionBarContributor.java
deleted file mode 100644
index 1ac3e788a..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLActionBarContributor.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import org.eclipse.jface.action.GroupMarker;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.part.EditorActionBarContributor;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.ui.texteditor.ITextEditorActionConstants;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-
-public class WSDLActionBarContributor extends SourceEditorActionBarContributor
-{
-  protected ITextEditor textEditor;
-
-  /**
-   * Constructor for WSDLActionBarContributor.
-   */
-  public WSDLActionBarContributor()
-  {
-    super();
-  }
-
-  public void setActivePage(IEditorPart activeEditor)
-  {
-    super.setActivePage(activeEditor);
-
-    // always enable undo/redo regardless of which page we're on.  The undo/redo comes from the editor
-    //    
-    updateAction(ActionFactory.UNDO.getId(), ITextEditorActionConstants.UNDO, true);
-    updateAction(ActionFactory.REDO.getId(), ITextEditorActionConstants.REDO, true);
-
-    // turn these off so that the actionhandler will handle it for us
-    //
-    //updateAction(IWorkbenchActionConstants.CUT, ITextEditorActionConstants.CUT, false);
-    //updateAction(IWorkbenchActionConstants.COPY, ITextEditorActionConstants.COPY, false);
-    //updateAction(IWorkbenchActionConstants.PASTE, ITextEditorActionConstants.PASTE, false);
-
-    getActionBars().updateActionBars();
-  }
-
-  protected void updateAction(String globalActionId, String textEditorActionId, boolean enable)
-  {
-    getActionBars().setGlobalActionHandler(globalActionId, enable ? getAction(textEditor, textEditorActionId) : null);
-  }
-
-  /**
-   * Returns the action registed with the given text editor.
-   * @return IAction or null if editor is null.
-   */
-  protected IAction getAction(ITextEditor editor, String actionID)
-  {
-    try
-    {
-      return (editor == null ? null : editor.getAction(actionID));
-    }
-    catch (Exception e)
-    {
-      return null;
-    }
-  }
-
-  /**
-   * @see EditorActionBarContributor#contributeToToolBar(IToolBarManager)
-   */
-  public void addToToolBar(IToolBarManager toolBarManager)
-  {
-    super.addToToolBar(toolBarManager);
-    toolBarManager.add(new GroupMarker("WSDLEditor"));
-  }
-
-
-  public void setActiveEditor(IEditorPart activeEditor)
-  {
-    super.setActiveEditor(activeEditor);
-    textEditor = null;
-    if (activeEditor instanceof WSDLEditor)
-    {
-      textEditor = ((WSDLEditor) activeEditor).getTextEditor();
-    }
-    
-    updateAction(ActionFactory.UNDO.getId(), ITextEditorActionConstants.UNDO, true);
-    updateAction(ActionFactory.REDO.getId(), ITextEditorActionConstants.REDO, true);
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLDragAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLDragAction.java
deleted file mode 100644
index 6425160ad..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLDragAction.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.wst.wsdl.ui.internal.graph.editparts.WSDLTreeNodeEditPart;
-import org.w3c.dom.Node;
-
-public abstract class WSDLDragAction extends BaseNodeAction {
-	protected WSDLTreeNodeEditPart movingChildEditPart;
-	protected Point pointerLocation;
-	
-	/*
-	 * Sub-classes should override this method.
-	 */
-	public boolean canExecute() {
-		return false;
-	}
-	
-	public void execute() {
-		run();
-	}
-	
-	/*
-	 * Sub-classes should override this method.
-	 */
-	public String getUndoDescription() {
-		return "";
-	}
-	
-	/*
-	 * Sub-classes should override this method.
-	 */
-	public Node getNode() {
-		return null;
-	}
-	
-	/*
-	 * Sub-classes should override this method.
-	 */
-	public IFigure getFeedbackFigure() {
-		return null;
-	}
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLDragReorderAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLDragReorderAction.java
deleted file mode 100644
index 1cff3c81e..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLDragReorderAction.java
+++ /dev/null
@@ -1,424 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-import javax.wsdl.OperationType;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Polyline;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.EditPart;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.internal.impl.OperationImpl;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.graph.WSDLComponentViewer;
-import org.eclipse.wst.wsdl.ui.internal.graph.editparts.WSDLTreeNodeEditPart;
-
-
-public class WSDLDragReorderAction extends WSDLDragAction
-{
-  protected WSDLEditor wsdlEditor;
-  protected WSDLElement movingChild;
-  protected WSDLElement newParent;
-  protected WSDLTreeNodeEditPart leftSiblingEditPart;
-  protected WSDLTreeNodeEditPart rightSiblingEditPart;
-  protected WSDLElement leftSibElement;
-  protected WSDLElement rightSibElement;
-  protected boolean canNeverExecute = false;
-  
-  public WSDLDragReorderAction(WSDLTreeNodeEditPart movingChildEditPart, EditPart pointerEditPart, Point pointerLocation) {
-  	this.movingChildEditPart = movingChildEditPart;
-  	this.pointerLocation = pointerLocation;
-
-	EditPart possibleParent = getParentEditPart(pointerEditPart);
-	
-	if (!(possibleParent instanceof WSDLTreeNodeEditPart)) {
-		canNeverExecute = true;
-		return;
-	}
-  	
-	WSDLTreeNodeEditPart targetParentEditPart = (WSDLTreeNodeEditPart) possibleParent;
-	wsdlEditor = ((WSDLComponentViewer) possibleParent.getViewer()).getWSDLEditor();
-	
-	if (pointerEditPart.getParent() != null) {
-		// Sort the siblings (and itself)
-		List targetEditPartSiblings = pointerEditPart.getParent().getChildren();
-		Collections.sort(targetEditPartSiblings, new VerticalEditPartComparator());
-  
-		// Get 'left' and 'right' siblings
-		leftSiblingEditPart = getVerticalLeftSibling(targetEditPartSiblings, movingChildEditPart, pointerLocation);
-		rightSiblingEditPart = getVerticalRightSibling(targetEditPartSiblings, movingChildEditPart, pointerLocation);           	
-
-		if (movingChildEditPart != null)
-			movingChild = (WSDLElement) movingChildEditPart.getModel();
-		if (leftSiblingEditPart != null)
-			leftSibElement = (WSDLElement) leftSiblingEditPart.getModel();
-		if (rightSiblingEditPart != null)
-			rightSibElement = (WSDLElement) rightSiblingEditPart.getModel();
-		
-		newParent = (WSDLElement) targetParentEditPart.getModel();
-	}
-	else {
-		newParent = (WSDLElement) targetParentEditPart.getModel();
-		leftSibElement = null;
-		rightSibElement= null;
-	}
-  }
-            
-  public boolean canExecute()
-  {
-    boolean result = false;
-
-    if (canNeverExecute || newParent == null || movingChild == null) {
-    	return false;
-    }
-    
-    if (movingChild instanceof Input) {
-    	if (!(leftSibElement instanceof Fault) && newParent.equals(movingChild.eContainer())) {
-    		result = true;
-    	}
-    }
-    else if (movingChild instanceof Output) {
-    	if (!(leftSibElement instanceof Fault) && newParent.equals(movingChild.eContainer())) {
-    		result = true;
-    	}
-    }
-    else if (movingChild instanceof Part) {
-    	if (newParent instanceof Message && newParent.equals(movingChild.eContainer())) {
-    		result = true;
-    	}
-    }
-
-    return result;
-  }           
-
-
-  /*
-   * @see IAction#run()
-   */
-  public void run()
-  {                            
-//    beginRecording();
-  	if (canExecute()) {
-  		if (movingChild instanceof Input) {
-  			Input input = (Input) movingChild;
-  			OperationImpl operation = (OperationImpl) input.eContainer();
-  			
-  			if (leftSiblingEditPart == null) {
-  				// Input/Output style
-  				setInputOutputOrder(operation, true);
-  			}
-  			else {
-  				// Output/Input style
-  				setInputOutputOrder(operation, false);
-  			}
-  		}
-  		else if (movingChild instanceof Output) {
- 			Output output = (Output) movingChild;
-  			OperationImpl operation = (OperationImpl) output.eContainer();
-  			
-  			if (leftSiblingEditPart == null) {
-  				// Output/Input style
-  				setInputOutputOrder(operation, false);
-  			}
-  			else {
-  				// Input/Output style
-  				setInputOutputOrder(operation, true);
-  			}
-  		}
-  		else if (movingChild instanceof Part) {
-  			Message message = (Message) newParent;
-  			List parts = message.getEParts();
-
-  			parts.remove(movingChild);
-
-  			int leftIndex = -1, rightIndex = -1;
-  			if (leftSibElement != null) {
-  				leftIndex = parts.indexOf(leftSibElement);
-  			}
-  			if (rightSibElement != null) {
-  				rightIndex = parts.indexOf(rightSibElement);
-  			}
-
-  			if (leftIndex == -1) {
-  				// Add moving child to the front
-  				parts.add(0, movingChild);  				
-  			}
-  			else if (rightIndex == -1) {
-  				// Add moving child to the end
-  				parts.add(movingChild);
-  			}
-  			else {
-  				// Add moving child after the occurence of the left sibling
-  				parts.add(leftIndex + 1, movingChild);
-  			}
-  		}
-  		wsdlEditor.getSelectionManager().setSelection(new StructuredSelection(movingChild));
-  	}
-//    endRecording();
-  }
-  
-  public IFigure getFeedbackFigure() {
-  	IFigure feedbackFigure = null;
-    if (feedbackFigure == null && movingChildEditPart instanceof WSDLTreeNodeEditPart)
-    {                                       
-      feedbackFigure = new Polyline();                         
-//  polyLine.setLineStyle(Graphics.LINE_DASHDOT);      
-      ((Polyline)feedbackFigure).setLineWidth(2);	
-      drawLines((Polyline) feedbackFigure);
-    }
-    
-  	return feedbackFigure;
-  }
-
-  /* Return a PointList which will be used to add a feedback figure.  The feedback figure will be a
-   * Polyline composed of the Points in the PointList
-   */
-  private PointList drawLines(Polyline polyLine) {
-    PointList pointList = new PointList(); 
-    
-    if (leftSiblingEditPart != null) {
-    	Rectangle leftRectangle = leftSiblingEditPart.getFigure().getBounds();
-	   	int xCoord = leftRectangle.x + 15;
-	  	int yCoord = leftRectangle.y;
-	   	int height = leftRectangle.height;
-	   	int width = leftRectangle.width - 15;
-
-	   	// Draw left end line
-	   	addLineToPolyline(polyLine, xCoord, yCoord + height + 3, xCoord, yCoord + height - 3);
-	   	addLineToPolyline(polyLine, xCoord, yCoord + height - 3, xCoord, yCoord + height);
-	   	
-	   	// Draw horizontal line
-	   	addLineToPolyline(polyLine, xCoord, yCoord + height, xCoord + width, yCoord + height);
-	   	
-	   	// Draw right end line
-	   	addLineToPolyline(polyLine, xCoord + width, yCoord + height, xCoord + width, yCoord + height - 3);
-	  	addLineToPolyline(polyLine, xCoord + width, yCoord + height, xCoord + width, yCoord + height + 3);   	
-    }
-    else if (rightSiblingEditPart != null) {
-    	Rectangle rightRectangle = rightSiblingEditPart.getFigure().getBounds();
-    	int xCoord = rightRectangle.x + 15;
-    	int yCoord = rightRectangle.y;
-   		int width = rightRectangle.width - 15;	
-
-   		// Draw left end line
-	   	addLineToPolyline(polyLine, xCoord, yCoord + 3, xCoord, yCoord - 3);
-	   	addLineToPolyline(polyLine, xCoord, yCoord - 3, xCoord, yCoord);
-	   	
-	   	// Draw horizontal line
-	   	addLineToPolyline(polyLine, xCoord, yCoord, xCoord + width, yCoord);
-	   	
-	   	// Draw right end line
-	   	addLineToPolyline(polyLine, xCoord + width, yCoord, xCoord + width, yCoord - 3);
-	  	addLineToPolyline(polyLine, xCoord + width, yCoord, xCoord + width, yCoord + 3);   
-    }
-
-    return pointList;
-  }                    
-  
-  protected Polyline addLineToPolyline(Polyline polyline, int x1, int y1, int x2, int y2) {
-	polyline.addPoint(new Point(x1, y1));
-	polyline.addPoint(new Point(x2, y2));
-
-	return polyline;
-  }                                          
-  
-  /*
-   * Pre-condition: The List siblings should be sorted by it's y-coordinate 
-   */
-  private WSDLTreeNodeEditPart getVerticalRightSibling(List siblings, WSDLTreeNodeEditPart movingEditPart, Point pointerLocation) {
-  	WSDLTreeNodeEditPart rightSibling = null;
-  	int pointerYLocation = pointerLocation.y;
-
-  	for (int index = 0; index < siblings.size(); index++) {
-  		WSDLTreeNodeEditPart sibling = (WSDLTreeNodeEditPart) siblings.get(index);
-  		int siblingYLocation = sibling.getSelectionFigure().getBounds().getCenter().y;
-
-  		if (siblingYLocation > pointerYLocation) {
-  			rightSibling = sibling;
-  			break;
-  		}
-  	}
-  	
-  	return rightSibling;
-  }
-
-  /*
-   * Pre-condition: The List siblings should be sorted by it's y-coordinate 
-   */
-  private WSDLTreeNodeEditPart getVerticalLeftSibling(List siblings, WSDLTreeNodeEditPart movingEditPart, Point pointerLocation) {
-  	WSDLTreeNodeEditPart leftSibling = null;
-  	int pointerYLocation = pointerLocation.y;
-
-  	int index;
-  	for (index = 0; index < siblings.size(); index++) {
-  		WSDLTreeNodeEditPart sibling = (WSDLTreeNodeEditPart) siblings.get(index);
-  		int siblingYLocation = sibling.getSelectionFigure().getBounds().getCenter().y;
-  	  	
-  		if (siblingYLocation > pointerYLocation) {
-  			if (index > 0) {
-  				leftSibling = (WSDLTreeNodeEditPart) siblings.get(index - 1);
-  			}
-
-  			break;
-  		}
-  	}
-
-  	if (index == siblings.size()) {
-  		leftSibling = (WSDLTreeNodeEditPart) siblings.get(index - 1);
-  	}
-
-  	return leftSibling;
-  }
-  
-  protected EditPart getParentEditPart(EditPart target)
-  {
-  	return target.getParent();
-  }
-  
-  // boolean inputFirst = true if the Input is the first in the order of Input and Output
-  private void setInputOutputOrder(OperationImpl operation, boolean inputFirst) {
-  	// We need to determine more info before we can set the style	
-  	if (inputFirst && operation.getEInput() != null) {
-  		// Check if there is an Output
-  		if (operation.getEOutput() != null) {
-  			// Order is: Input, Output
-/*  			
-  			Node operationNode = operation.getElement();		
-  			NodeList childNodeList = operationNode.getChildNodes();
-  			
-  			Node inputNode = operation.getEInput().getElement();
-  			Node outputNode = operation.getEOutput().getElement();
-  			
-  			Node inputTextNode = inputNode.getNextSibling();
-  			Node outputTextNode = outputNode.getNextSibling();
-  			
-  			int inputNodeIndex = getNodeIndex(childNodeList, inputNode);
-  			int outputNodeIndex = getNodeIndex(childNodeList, outputNode);
-  			
-  			if (inputNodeIndex > outputNodeIndex) {
-  				// We need to swap Input and Output
-  				operationNode.removeChild(inputNode);
-  				operationNode.removeChild(outputNode);
-  				
-  				operationNode.insertBefore(inputNode, outputTextNode);
-  				operationNode.insertBefore(outputNode, inputTextNode);
-  			}
-*/  			
-  			
-  			setOperationStyle(operation, OperationType.REQUEST_RESPONSE);
-  		}
-  		/*
-  		else {
-  			// Order is: Input
-  			setOperationStyle(operation, OperationType.ONE_WAY);
-  		}
-  		*/
-  	}
-  	else if (operation.getEOutput() != null) {
-  		// Check if there is an Input
-  		if (operation.getEInput() != null) {
-  			// Order is: Output, Input
-/*  			
-  			Node operationNode = operation.getElement();		
-  			NodeList childNodeList = operationNode.getChildNodes();
-  			
-  			Node inputNode = operation.getEInput().getElement();
-  			Node outputNode = operation.getEOutput().getElement();
-  			
-  			Node inputTextNode = inputNode.getNextSibling();
-  			Node outputTextNode = outputNode.getNextSibling();
-  			
-  			int inputNodeIndex = getNodeIndex(childNodeList, inputNode);
-  			int outputNodeIndex = getNodeIndex(childNodeList, outputNode);
-  			
-  			if (outputNodeIndex > inputNodeIndex) {
-  				// We need to swap Input and Output
-  				operationNode.removeChild(inputNode);
-  				operationNode.removeChild(outputNode);
-
-  				operationNode.insertBefore(inputNode, outputTextNode);
-  				operationNode.insertBefore(outputNode, inputTextNode);
-  			}
-*/  			
-  			setOperationStyle(operation, OperationType.SOLICIT_RESPONSE);
-  		}
-  		/*
-  		else {
-  			// Order is: Output
-  			setOperationStyle(operation, OperationType.NOTIFICATION);
-  		}
-  		*/
-  	}
-  }
-
-/*
- * return -1 if node is not found in the given nodeList
- */
-//	private int getNodeIndex(NodeList nodeList, Node node) {
-//		int index = 0;
-//		while (index < nodeList.getLength() && !(nodeList.item(index).equals(node))) {
-//			index++;
-//		}
-//		
-//		if (index >= nodeList.getLength()) {
-//			index = -1;
-//		}
-//		
-//		return index;
-//	}
-  
-  private void setOperationStyle(OperationImpl operation, OperationType operationType) {
-  	// If there is no style to begin with, don't set one now
-  	if (operation.getStyle() == null) {
-  		return;
-  	}
-  	
-  	operation.setStyle(operationType);
-  }
-  
-  private class VerticalEditPartComparator implements Comparator {
-  	
-  	public VerticalEditPartComparator() {
-  	}
-  	
-  	public int compare(Object part1, Object part2) {
-  		int compareValue = 0;
-
-  		if (part1 instanceof WSDLTreeNodeEditPart && part2 instanceof WSDLTreeNodeEditPart) {
-  			WSDLTreeNodeEditPart editPart1 = (WSDLTreeNodeEditPart) part1;
-  			WSDLTreeNodeEditPart editPart2 = (WSDLTreeNodeEditPart) part2;
-  			
-  			int editPart1Y = editPart1.getSelectionFigure().getBounds().getCenter().y;
-  			int editPart2Y = editPart2.getSelectionFigure().getBounds().getCenter().y;
-  			
-  			Integer integerPart1 = new Integer(editPart1Y);
-  			Integer integerPart2 = new Integer(editPart2Y);
-  			
-  			compareValue = integerPart1.compareTo(integerPart2);
-  		}
-
-  		return compareValue;
-  	}
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLDragSetMessageAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLDragSetMessageAction.java
deleted file mode 100644
index 9aa7d4802..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLDragSetMessageAction.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Polyline;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.MessageReference;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.internal.impl.WSDLElementImpl;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.graph.WSDLComponentViewer;
-import org.eclipse.wst.wsdl.ui.internal.graph.editparts.GroupEditPart;
-import org.eclipse.wst.wsdl.ui.internal.graph.editparts.WSDLTreeNodeEditPart;
-import org.eclipse.wst.xsd.ui.internal.gef.util.figures.IConnectedFigure;
-
-public class WSDLDragSetMessageAction extends WSDLDragAction {
-	protected EditPart pointerEditPart;
-	protected WSDLElement movingChild;
-	protected WSDLElement pointerModelElement;
-	
-	public WSDLDragSetMessageAction(WSDLTreeNodeEditPart movingChildEditPart, EditPart pointerEditPart, Point pointerLocation) {
-		this.movingChildEditPart = movingChildEditPart;
-		this.pointerEditPart = pointerEditPart;
-		this.pointerLocation = pointerLocation;
-		
-		movingChild = (WSDLElement) movingChildEditPart.getModel();
-		pointerModelElement = (WSDLElement) pointerEditPart.getModel();
-		
-		// Allow the user to hover over a Part (of a Message) to set the Message
-		if (pointerModelElement instanceof Part) {
-			this.pointerEditPart = pointerEditPart.getParent();
-			pointerModelElement = (WSDLElement) this.pointerEditPart.getModel();
-		}
-	}
-
-	public boolean canExecute() {
-	    boolean result = false;
-
-	    if (pointerModelElement == null || movingChild == null) {
-	    	return false;
-	    }
-	    
-	    if (movingChild instanceof Input || movingChild instanceof Output || movingChild instanceof Fault) {
-	    	if (pointerModelElement instanceof Message) {
-	    		result = true;
-	    	}
-	    }
-
-	    return result;
-	}
-	
-	public void run() {
-		if (canExecute()) {
-			MessageReference messageReference = (MessageReference) movingChild;
-			messageReference.setEMessage((Message) pointerModelElement);
-			((WSDLElementImpl) messageReference).updateElement(true);
-			
-			WSDLEditor wsdlEditor = ((WSDLComponentViewer) pointerEditPart.getViewer()).getWSDLEditor();
-			wsdlEditor.getSelectionManager().setSelection(new StructuredSelection(movingChild));
-		}
-	}
-
-	public IFigure getFeedbackFigure() {
-		Polyline polyfigure = new Polyline();
-		GroupEditPart leftGroupEditPart = getGroupEditPart(movingChildEditPart);
-		GroupEditPart rightGroupEditPart = getGroupEditPart(pointerEditPart);
-		int mx = rightGroupEditPart.getFigure().getBounds().x - 5;                                                      
- 
-        drawLine(polyfigure, leftGroupEditPart.outputConnection.getFigure(), ((AbstractGraphicalEditPart) pointerEditPart).getFigure(), mx);
-		
-		return polyfigure;
-	}
-	
-	  protected void drawLine(Polyline feedbackFigure, IFigure a, IFigure b, int mx)
-	  {
-	        Rectangle r1 = getConnectionBounds(a);
-	        Rectangle r2 = getConnectionBounds(b);
-	        int x1 = r1.x + r1.width;
-	        int y1 = r1.y + r1.height / 2;
-	        int x2 = r2.x - 1;
-	        int y2 = r2.y + 8;
-                                          
-	        // draw horizontal line
-	       	addLineToPolyline(feedbackFigure, x1, y1, mx, y1);
-
-	        // draw horizontal line
-	       	addLineToPolyline(feedbackFigure, mx, y2, x2 - 1, y2);
-
-	        // draw the arrow head
-	       	addLineToPolyline(feedbackFigure, x2 - 1, y2, x2 - 4, y2 - 3);
-	       	addLineToPolyline(feedbackFigure, x2 - 1, y2, x2 - 4, y2 + 3);
-	  }
-
-	  protected Rectangle getConnectionBounds(IFigure figure)
-	  {                 
-	    Rectangle r = null;
-	    if (figure instanceof IConnectedFigure)
-	    {
-	      IConnectedFigure connectedFigure = (IConnectedFigure)figure;
-	      r = connectedFigure.getConnectionFigure().getBounds();
-	    }
-	    else
-	    {
-	      r = figure.getBounds();
-	    }
-	    return r; 
-	  }                      
-	  
-	  protected Polyline addLineToPolyline(Polyline polyline, int x1, int y1, int x2, int y2) {
-      	polyline.addPoint(new Point(x1, y1));
-      	polyline.addPoint(new Point(x2, y2));
-      	polyline.setLineWidth(1);
-      	//polyline.setLineStyle(Graphics.LINE_DOT);
-      	
-      	return polyline;
-	  }
-	  
-	  private GroupEditPart getGroupEditPart(EditPart editPart) {
-	  	EditPart parentPart = editPart.getParent();
-	  	
-	  	if (parentPart == null) {
-	  		return null;
-	  	}
-	  	if (!(parentPart instanceof GroupEditPart)) {
-	  		parentPart = getGroupEditPart(parentPart);
-	  	}
-	  	
-	  	return (GroupEditPart) parentPart;
-	  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLElementAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLElementAction.java
deleted file mode 100644
index e2f287c10..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLElementAction.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.commands.WSDLElementCommand;
-import org.eclipse.wst.wsdl.ui.internal.widgets.NewComponentDialog;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML;
-import org.w3c.dom.Node;
-
-public abstract class WSDLElementAction extends Action
-{
-  protected WSDLElementCommand modelCommand;
-  private IEditorPart editorPart;
-  
-  public WSDLElementAction
-  	(WSDLElementCommand command,
-  	 String undoDescription,
-  	 String label,
-  	 ImageDescriptor image)
-  {
-    super(label,image);
-    modelCommand = command;
-  }
-
-  public void setEditorPart(IEditorPart editorPart)
-  {
-    this.editorPart = editorPart;
-  }
-/*
-  private String getUndoDescription()
-  {
-    return undoDescription;
-  }
-*/
-  abstract protected WSDLElement getOwner();
-  
-  abstract protected boolean showDialog();
-  
-  public void run()
-  {
-    boolean ok = showDialog();
-    if (ok)
-    {
-	    preRun();
-	    modelCommand.run();
-	    format();
-	    selectObject();
-	    postRun();
-    }
-  }
-  
-  protected void preRun()
-  {
-  }
-  
-  protected void postRun()
-  {
-  }
-/*
-  private void beginRecording()
-  {    
-    Node node = null;
-    if (getOwner() != null)
-      node = getOwner().getElement(); 
-    
-    if (node instanceof IDOMNode)
-    {
-      ((IDOMNode)node).getModel().beginRecording(this, getUndoDescription());  
-    }
-  }
-
-  private void endRecording()
-  {                 
-    Node node = null;
-    if (getOwner() != null)
-      node = getOwner().getElement(); 
-    
-    if (node instanceof IDOMNode)
-    {
-      ((IDOMNode)node).getModel().endRecording(this);  
-    }
-  }
-*/
-  protected WSDLElement getWSDLElement()
-  {
-    return modelCommand.getWSDLElement();
-  }
-  
-  private void format()
-  {
-    Node parentNode = null;
-    if (getOwner() != null)
-      parentNode = getOwner().getElement(); 
-    
-    if (parentNode instanceof IDOMNode) 
-    {
-		  // format selected node                                                    
-      FormatProcessorXML formatProcessorXML = new FormatProcessorXML();
-      formatProcessorXML.formatNode((IDOMNode)parentNode);      
-    }
-  }
-  
-  private void selectObject()
-  {               
-    if (editorPart != null && getOwner() != null)
-    {
-      Object object = getWSDLElement();
-      if (object != null)
-      {
-        ISelectionProvider selectionProvider = (ISelectionProvider)editorPart.getAdapter(ISelectionProvider.class);
-        if (selectionProvider != null)
-        {
-          selectionProvider.setSelection(new StructuredSelection(object));
-        }
-      }  
-    }   
-  }
-  
-  protected String showDialogHelper(String title, String defaultName)
-  {   
-    String result = defaultName;                                                                                             
-    NewComponentDialog dialog = new NewComponentDialog(WSDLEditorPlugin.getShell(), title, defaultName);
-    int rc = dialog.createAndOpen();
-    if (rc == IDialogConstants.OK_ID)
-    {
-      result = dialog.getName();  
-    }
-    else
-    {
-      result = null;
-    }               
-    return result;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLElementUIAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLElementUIAction.java
deleted file mode 100644
index 23822090c..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLElementUIAction.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.commands.WSDLElementCommand;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML;
-import org.w3c.dom.Node;
-
-public abstract class WSDLElementUIAction extends Action
-{
-  protected WSDLElementCommand modelAction;
-  private IEditorPart editorPart;
-  
-  public WSDLElementUIAction
-  	(WSDLElementCommand action,
-  	 String undoDescription,
-  	 String label,
-  	 ImageDescriptor image)
-  {
-    super(label,image);
-    modelAction = action;
-  }
-
-  public void setEditorPart(IEditorPart editorPart)
-  {
-    this.editorPart = editorPart;
-  }
-
-  private Node getOwnerNode()
-  {
-    if (getOwner() != null)
-      return getOwner().getElement();
-    else
-      return null;
-  }
-
-  abstract protected WSDLElement getOwner();
-  
-  abstract protected boolean showDialog();
-  
-  public void run()
-  {
-    boolean ok = showDialog();
-    if (ok)
-    {
-	    preRun();
-	    modelAction.run();
-	    format();
-	    selectObject();
-	    postRun();
-    }
-  }
-  
-  protected void preRun()
-  {
-  }
-  
-  protected void postRun()
-  {
-  }
-/*
-  private void beginRecording()
-  {    
-    Node node = getOwnerNode();  
-    if (node instanceof IDOMNode)
-    {
-      ((IDOMNode)node).getModel().beginRecording(this, getUndoDescription());  
-    }
-  }
-
-  private void endRecording()
-  {                 
-    Node node = getOwnerNode(); 
-    if (node instanceof IDOMNode)
-    {
-      ((IDOMNode)node).getModel().endRecording(this);  
-    }
-  }
-*/
-  protected WSDLElement getWSDLElement()
-  {
-    return modelAction.getWSDLElement();
-  }
-  
-  private void format()
-  {
-    Node parentNode = getOwnerNode();
-    if (parentNode instanceof IDOMNode) 
-    {
-		  // format selected node                                                    
-      FormatProcessorXML formatProcessorXML = new FormatProcessorXML();
-      formatProcessorXML.formatNode((IDOMNode)parentNode);      
-    }
-  }
-  
-  private void selectObject()
-  {               
-    if (editorPart != null && getOwner() != null)
-    {
-      Object object = getWSDLElement();
-      if (object != null)
-      {
-        ISelectionProvider selectionProvider = (ISelectionProvider)editorPart.getAdapter(ISelectionProvider.class);
-        if (selectionProvider != null)
-        {
-          selectionProvider.setSelection(new StructuredSelection(object));
-        }
-      }  
-    }   
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLMenuActionContributor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLMenuActionContributor.java
deleted file mode 100644
index ce494be67..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLMenuActionContributor.java
+++ /dev/null
@@ -1,1148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.internal.impl.WSDLElementImpl;
-import org.eclipse.wst.wsdl.internal.util.WSDLSwitch;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddInputCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddMessageCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddOperationCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddOutputCommand;
-import org.eclipse.wst.wsdl.ui.internal.extension.IMenuActionContributor;
-import org.eclipse.wst.wsdl.ui.internal.graph.editparts.WSDLTreeNodeEditPart;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.CreateWSDLElementHelper;
-import org.eclipse.wst.wsdl.ui.internal.util.NameUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.wsdl.ui.internal.widgets.NewComponentWithChildDialog;
-import org.eclipse.wst.wsdl.ui.internal.wizards.BindingWizard;
-import org.eclipse.wst.wsdl.ui.internal.wizards.PortWizard;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xsd.ui.internal.XSDEditorPlugin;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
-public class WSDLMenuActionContributor implements IMenuActionContributor
-{
-  protected AddEEMenuActionContributor addEEMenuActionContributor;
-  IEditorPart editorPart;
-
-  public WSDLMenuActionContributor(IEditorPart editorPart)
-  {
-    addEEMenuActionContributor = new AddEEMenuActionContributor();
-    this.editorPart = editorPart;
-  }
-
-  protected static List createList(Action action)
-  {
-    List list = new ArrayList();
-    list.add(action);
-    return list;
-  }
-  
-	private class OpenSchemaOnSelectionHelper extends Action {
-		Object object;
-		
-		public OpenSchemaOnSelectionHelper(Object object) {
-			setText(WSDLEditorPlugin.getWSDLString("_UI_OPEN_IMPORT"));
-			this.object = object;
-			
-			if (object instanceof Import) {
-				String location = ((Import) object).getLocationURI();
-				
-				if (location == null || location.trim().equals(""))
-					setEnabled(false);
-			}
-		}
-		
-		public void run() {
-			Definition definition = ((WSDLElement) object).getEnclosingDefinition();
-			org.eclipse.wst.wsdl.ui.internal.util.OpenOnSelectionHelper helper = new org.eclipse.wst.wsdl.ui.internal.util.OpenOnSelectionHelper(definition);
-		    helper.openEditor((org.eclipse.emf.ecore.EObject) object);
-		}
-	}
-
-  public void contributeMenuActions(final IMenuManager menu, final Node node, Object object)
-  {
-    final IMenuManager addMenu;
-    boolean addEditAction = false;
-    final boolean isEditable = (node instanceof IDOMNode);
-    if (object instanceof WSDLElement && node != null && isEditable)
-    {
-      addEditAction = true;
-      addMenu = new MenuManager(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_CHILD"), "addchild"); //$NON-NLS-1$ //$NON-NLS-2$
-      menu.add(addMenu);
-      Definition definition = ((WSDLElement) object).getEnclosingDefinition();
-
-      final String prefix = definition.getPrefix(WSDLConstants.WSDL_NAMESPACE_URI);
-
-      if (object instanceof Import) {
-      	menu.add(new OpenSchemaOnSelectionHelper(object));
-      }
-      
-      WSDLSwitch wsdlSwitch = new WSDLSwitch()
-      {
-        public Object caseBinding(Binding binding)
-        {
-          if (isEditable)
-          {
-            menu.add(new AddBindingOperationAction(node, "NewBindingOperation", prefix)); //$NON-NLS-1$
-            menu.add(new Separator());
-          }
-          
-          menu.add(createSetPortTypeMenu(binding, isEditable));
-          menu.add(new GenerateBindingContentAction(binding, isEditable));
-          return null;
-        }
-
-        public Object caseBindingOperation(BindingOperation bindingOperation)
-        {
-          if (isEditable)
-          {
-            menu.add(new AddBindingInputAction(editorPart, node, prefix));
-            menu.add(new AddBindingOutputAction(editorPart, node, prefix));
-            menu.add(new AddBindingFaultAction(node, prefix));
-          }
-          return null;
-        }
-
-        public Object caseDefinition(Definition definition)
-        {
-           menu.add(new EditNamespacesAction(definition));
-           menu.add(new Separator());
-        	
-          if (isEditable)
-          {
-            menu.add(new AddMessageAction(definition, null, node, prefix, ((WSDLEditor) editorPart).getXMLDocument()));
-            menu.add(new AddServiceAction(definition, null, node, prefix, ((WSDLEditor) editorPart).getXMLDocument()));
-            menu.add(new AddPortTypeAction(definition, null, node, prefix, ((WSDLEditor) editorPart).getXMLDocument()));
-            menu.add(new AddBindingAction(definition, ((WSDLEditor) editorPart).getXMLDocument()));//, null, node, prefix));
-            menu.add(new AddImportAction(editorPart, definition, node, prefix));
-          }
-          return null;
-        }
-
-        public Object caseFault(Fault fault)
-        {
-          menu.add(createSetMessageMenu(fault, isEditable));
-          //menu.add(createAddBindingMenuForIOF(fault));
-          return null;
-        }
-
-        public Object caseInput(Input input)
-        {
-          menu.add(createSetMessageMenu(input, isEditable));
-          //menu.add(createAddBindingMenuForIOF(input));
-          return null;
-        }
-
-        public Object caseOutput(Output output)
-        {
-          menu.add(createSetMessageMenu(output, isEditable));
-          //menu.add(createAddBindingMenuForIOF(output));
-          return null;
-        }
-
-        public Object caseMessage(Message message)
-        {
-          if (isEditable)
-          {
-            menu.add(new AddPartAction(editorPart, message, node, prefix));
-          }
-          return null;
-        }
-
-        public Object caseOperation(Operation operation)
-        {
-          if (isEditable)
-          {
-            menu.add(new AddInputAction(editorPart, node, operation, prefix));
-            menu.add(new AddOutputAction(editorPart, node, operation, prefix));
-            menu.add(new AddFaultAction(editorPart, node, operation, prefix));
-          }
-          //menu.add(createAddBindingMenuForOperation(operation));
-          return null;
-        }
-
-        public Object casePart(Part part)
-        {
-          menu.add(createSetPartMenu(part, (Element) node, "element", isEditable)); //$NON-NLS-1$
-          menu.add(createSetPartMenu(part, (Element) node, "type", isEditable)); //$NON-NLS-1$
-          return null;
-        }
-
-        public Object casePort(Port port)
-        {
-          if (node instanceof Element)
-          {
-            menu.add(createSetBindingMenu(port, (Element) node, isEditable));
-            if (port.getEBinding() != null)
-            {
-              menu.add(createSetPortTypeMenu(port.getEBinding(), isEditable));
-            }
-          }
-          return null;
-        }
-
-        public Object casePortType(PortType portType)
-        {
-          if (isEditable)
-          {
-            menu.add(new AddOperationAction(editorPart, portType, node, prefix));
-          }
-          return null;
-        }
-
-        public Object caseService(Service service)
-        {
-          if (isEditable)
-          {
-            menu.add(new AddPortAction(service));
-          }
-          return null;
-        }
-
-        //public Object caseTypes(Types types)
-        //{   
-        //  return createTypesAdapter();
-        // } 
-      };
-      wsdlSwitch.doSwitch((WSDLElement) object);
-    }
-    else if (object instanceof WSDLGroupObject)
-    {
-      addMenu = new MenuManager(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_CHILD"), "addchild"); //$NON-NLS-1$ //$NON-NLS-2$
-      menu.add(addMenu);
-      
-      WSDLGroupObject groupObject = (WSDLGroupObject) object;
-      Definition definition = groupObject.getDefinition();
-
-      final String prefix = definition.getPrefix(WSDLConstants.WSDL_NAMESPACE_URI);
-
-      //for (Iterator i = actionList.iterator(); i.hasNext(); )
-      //{                           
-      //  Action action = (Action)i.next();
-      //  manager.add(action); 
-      //}
-
-      switch (groupObject.getType())
-      {
-        case WSDLGroupObject.MESSAGES_GROUP :
-          {
-            menu.add(new AddMessageAction(groupObject.getDefinition(), null, node, prefix, ((WSDLEditor) editorPart).getXMLDocument()));
-            break;
-          }
-        case WSDLGroupObject.SERVICES_GROUP :
-          {
-            menu.add(new AddServiceAction(groupObject.getDefinition(), null, node, prefix, ((WSDLEditor) editorPart).getXMLDocument()));
-            break;
-          }
-        case WSDLGroupObject.PORT_TYPES_GROUP :
-          {
-            menu.add(new AddPortTypeAction(groupObject.getDefinition(), null, node, prefix, ((WSDLEditor) editorPart).getXMLDocument()));
-            break;
-          }
-        case WSDLGroupObject.BINDINGS_GROUP :
-          {
-            menu.add(new AddBindingAction(groupObject.getDefinition(), ((WSDLEditor) editorPart).getXMLDocument()));//, null, node, prefix));
-            break;
-          }
-        case WSDLGroupObject.IMPORTS_GROUP :
-          {
-            menu.add(new AddImportAction(editorPart, groupObject.getDefinition(), node, prefix));
-            break;
-          }
-      }
-    }
-
-    menu.add(new Separator());
-    
-   	addEEMenuActionContributor.contributeMenuActions(menu, node, object);
-
-    menu.add(new Separator());
-
-    if (object instanceof WSDLElement && node != null && addEditAction && node != null && isEditable)
-    {
-      //////////////////////////////////////// Currently, only allow Copy and Paste on Operations
-    	if (object instanceof Operation) {
-    		// Add Cut, Copy Actions
-    		// Note:  The Cut, Copy, Paste Actions are Model Driven.  The Delete Action is still
-    		// currently DOM driven.
-    		//      menu.add(new CutAction((WSDLElement) object, editorPart));
-   		 	menu.add(new CopyGlobalAction((WSDLElement) object, editorPart));
-    	}
-
-   	 	Action pasteAction = new PasteGlobalAction((WSDLElement) object, editorPart);
-   	 	if (pasteAction.isEnabled()) {
-   	 		menu.add(pasteAction);
-   	 	}
-   	 	
-	 	menu.add(new Separator());
-      //////////////////////////////////////// Currently, only allow Copy and Paste on Operations
-		
-		// Get the list of selected elements.  Use this list for the DeleteAction.		
-		IStructuredSelection selectionList = (IStructuredSelection) ((WSDLEditor) editorPart).getSelectionManager().getSelection();	
-		Action deleteAtion = new DeleteWSDLAndXSDAction(selectionList.toList(), node, (WSDLEditor) editorPart);
-		menu.add(deleteAtion);
-		deleteAtion.setEnabled(isEditable);
-    }
-       
-    // insertion point for popupMenus extension
-    menu.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
-  }
-
-  /*
-  protected MenuManager createAddBindingMenuForOperation(Operation operation) 
-  {
-    MenuManager subMenu = new MenuManager("Add Binding");                    
-  
-    Definition definition = operation.getEnclosingDefinition(); 
-    ComponentReferenceUtil util = new ComponentReferenceUtil(definition);
-  
-    String operationName = operation.getName();
-    if (operationName != null)
-    {       
-      for (Iterator i = util.getBindings(operation).iterator(); i.hasNext(); )
-      {   
-        Binding binding = (Binding)i.next();
-            
-        BindingOperation matchingBindingOperation = null;
-  
-        for (Iterator j = binding.getBindingOperations().iterator(); j.hasNext(); )
-        {
-          BindingOperation bindingOperation = (BindingOperation)j.next();
-          if (operationName.equals(bindingOperation.getName()))
-          { 
-            matchingBindingOperation = bindingOperation;
-            break;
-          }
-        }         
-  
-        if (matchingBindingOperation == null)
-        {                                                                            
-          Element bindingElement = WSDLUtil.getInstance().getElementForObject(binding);
-          subMenu.add(new AddBindingOperationAction(bindingElement, operation, prefix));
-        }    
-      }
-    }
-    return subMenu;
-  }*/
-
-  /*
-  protected MenuManager createAddBindingMenuForIOF(WSDLElement iof) 
-  {
-    MenuManager subMenu = new MenuManager("Add Binding");                    
-  
-    Definition definition = iof.getEnclosingDefinition(); 
-    Operation operation = (Operation)iof.eContainer();
-  
-    ComponentReferenceUtil util = new ComponentReferenceUtil(definition);
-  
-    String operationName = operation.getName();
-    if (operationName != null)
-    {  
-      for (Iterator i = util.getBindings(operation).iterator(); i.hasNext(); )
-      {   
-        Binding binding = (Binding)i.next();
-  
-        boolean hasName = false;
-        for (Iterator j = binding.getBindingOperations().iterator(); j.hasNext(); )
-        {
-          BindingOperation bindingOperation = (BindingOperation)j.next();
-          if (operationName.equals(bindingOperation.getName()))
-          {
-            hasName = true;
-            break;
-          }
-        }         
-  
-        if (!hasName)
-        {                                                                            
-          // TODO... should we add the operation to all of the bindings?
-          //
-          Element bindingElement = WSDLUtil.getInstance().getElementForObject(binding);
-          subMenu.add(new AddBindingOperationAction(bindingElement, operationName));
-        }
-      }
-    }
-    return subMenu;
-  }
-  */
-
-  protected MenuManager createSetBindingMenu(Port port, Element portElement, boolean isEditable)
-  {
-    MenuManager submenu = new MenuManager(WSDLEditorPlugin.getWSDLString("_UI_ACTION_SET_BINDING"));
-
-    Definition definition = port.getEnclosingDefinition();
-    String prefix = definition.getPrefix(WSDLConstants.WSDL_NAMESPACE_URI);
-    Element definitionElement = WSDLEditorUtil.getInstance().getElementForObject(definition);
-
-    SetNewComponentAction setNewAction = new SetNewComponentAction(WSDLEditorPlugin.getWSDLString("_UI_ACTION_NEW_BINDING"), definitionElement, prefix, "binding", port);
-    setNewAction.setEditor(editorPart);
-    setNewAction.setEnabled(true);
-    submenu.add(setNewAction);     
-    
-    SetExistingComponentAction action = new SetExistingComponentAction(WSDLEditorPlugin.getWSDLString("_UI_ACTION_EXISTING_BINDING"), definitionElement, prefix, "binding", port);
-    action.setEditor(editorPart);
-    action.setEnabled(isEditable);
-    submenu.add(action);
-    
-    return submenu;
-  }
-
-  protected MenuManager createSetPortTypeMenu(Binding binding, boolean isEditable)
-  {      
-    MenuManager submenu = new MenuManager(WSDLEditorPlugin.getWSDLString("_UI_ACTION_SET_PORTTYPE"));
-
-    if (binding != null)
-    {
-      Definition definition = binding.getEnclosingDefinition();
-      Element definitionElement = WSDLEditorUtil.getInstance().getElementForObject(definition);
-      String prefix = definition.getPrefix(WSDLConstants.WSDL_NAMESPACE_URI);
-	  
-      SetNewComponentAction setNewAction = new SetNewComponentAction(WSDLEditorPlugin.getWSDLString("_UI_ACTION_NEW_PORTTYPE"), definitionElement, prefix, "portType", binding);
-      setNewAction.setEditor(editorPart);
-      setNewAction.setEnabled(true);
-      submenu.add(setNewAction);      
-
-      SetExistingComponentAction action = new SetExistingComponentAction(WSDLEditorPlugin.getWSDLString("_UI_ACTION_EXISTING_PORTTYPE"), definitionElement, prefix, "portType", binding);
-      action.setEditor(editorPart);
-      action.setEnabled(isEditable);      
-      submenu.add(action);
-    }
-    return submenu;
-  }
-
-  protected MenuManager createSetMessageMenu(WSDLElement wsdlElement, boolean isEditable)
-  {
-    Definition definition = wsdlElement.getEnclosingDefinition();
-    Element definitionElement = WSDLEditorUtil.getInstance().getElementForObject(definition);
-    Element referencingElement = WSDLEditorUtil.getInstance().getElementForObject(wsdlElement);
-	
-    MenuManager submenu = new MenuManager(WSDLEditorPlugin.getWSDLString("_UI_ACTION_SET_MESSAGE"));
-    if (definitionElement != null && referencingElement != null)
-    {
-      String prefix = definition.getPrefix(WSDLConstants.WSDL_NAMESPACE_URI);
-      
-      SetNewComponentAction setNewAction = new SetNewComponentAction(WSDLEditorPlugin.getWSDLString("_UI_ACTION_NEW_MESSAGE"), definitionElement, prefix, "message", wsdlElement);
-      setNewAction.setEditor(editorPart);
-      setNewAction.setEnabled(true);
-      submenu.add(setNewAction);  
-      
-      SetExistingComponentAction action = new SetExistingComponentAction(WSDLEditorPlugin.getWSDLString("_UI_ACTION_EXISTING_MESSAGE"), definitionElement, prefix, "message", wsdlElement);
-      action.setEditor(editorPart);
-      action.setEnabled(isEditable);
-      submenu.add(action);
-    }
-    
-    return submenu;
-  }
-
-  protected MenuManager createSetPartMenu(Part part, Element portElement, String referenceKind, boolean isEditable)
-  {
-    Definition definition = part.getEnclosingDefinition();
-    String prefix = definition.getPrefix(WSDLConstants.WSDL_NAMESPACE_URI);
-    Element definitionElement = WSDLEditorUtil.getInstance().getElementForObject(definition);
-
-    String actionName;
-    MenuManager submenu = null;
-    if (referenceKind.equalsIgnoreCase("element")) // NON NLS
-    {
-      actionName = WSDLEditorPlugin.getWSDLString("_UI_ACTION_EXISTING_ELEMENT");
-      submenu = new MenuManager(WSDLEditorPlugin.getWSDLString("_UI_ACTION_SET_ELEMENT"));
-	  
-      SetNewComponentAction setNewElementAction = new SetNewComponentAction(WSDLEditorPlugin.getWSDLString("_UI_ACTION_NEW_ELEMENT"), definitionElement, prefix, "element", part);
-      setNewElementAction.setEditor(editorPart);
-      setNewElementAction.setEnabled(true);
-      setNewElementAction.setReferenceKind(referenceKind);
-      submenu.add(setNewElementAction);
-    }
-    else
-    {
-      actionName = WSDLEditorPlugin.getWSDLString("_UI_ACTION_EXISTING_TYPE");
-      submenu = new MenuManager(WSDLEditorPlugin.getWSDLString("_UI_ACTION_SET_TYPE"));
-      
-      SetNewComponentAction setNewComplexAction = new SetNewComponentAction(WSDLEditorPlugin.getWSDLString("_UI_ACTION_NEW_COMPLEX_TYPE"), definitionElement, prefix, "complex type", part);
-      setNewComplexAction.setEditor(editorPart);
-      setNewComplexAction.setEnabled(true);
-      setNewComplexAction.setReferenceKind(referenceKind);
-      setNewComplexAction.setTypeKind("complex");
-      Image image = XSDEditorPlugin.getXSDImage("icons/XSDComplexType.gif");
-      setNewComplexAction.setImageDescriptor(ImageDescriptor.createFromImage(image));
-      submenu.add(setNewComplexAction);
-      
-      SetNewComponentAction setNewSimpleAction = new SetNewComponentAction(WSDLEditorPlugin.getWSDLString("_UI_ACTION_NEW_SIMPLE_TYPE"), definitionElement, prefix, "simple type", part);
-      setNewSimpleAction.setEditor(editorPart);
-      setNewSimpleAction.setEnabled(true);
-      setNewSimpleAction.setReferenceKind(referenceKind);
-      setNewSimpleAction.setTypeKind("simple");
-      image = XSDEditorPlugin.getXSDImage("icons/XSDSimpleType.gif");
-      setNewSimpleAction.setImageDescriptor(ImageDescriptor.createFromImage(image));
-
-      submenu.add(setNewSimpleAction); 
-    }
-
-    
-    SetExistingComponentAction action = new SetExistingComponentAction(actionName, definitionElement, prefix, actionName, part);
-    action.setReferenceKind(referenceKind);
-    action.setEditor(editorPart);
-    action.setEnabled(isEditable);
-    submenu.add(action);
-    
-    return submenu;
-  }
-  
-//  private WSDLElement showPasteAction(WSDLElement element, IEditorPart ePart) {
-//  	WSDLElement parentElement = null;
-//  	
-//  	if (ePart instanceof WSDLEditor) {
-//  		WSDLElement clipboardElement = ((WSDLEditor) ePart).getClipboardContents();
-//  		
-//  		if (element instanceof PortType) {
-//  			if (clipboardElement instanceof Operation) {
-//  				parentElement = element;
-//  			}
-//  		}
-//  		if (element instanceof Operation) {
-//  			if (clipboardElement instanceof Operation) {
-//  				parentElement = (WSDLElement) ((Operation) element).eContainer();
-//  			}
-//  		}
-//  	}
-//  	
-//  	return parentElement;
-//  }
-}
-
-class AddBindingOperationAction extends AddElementAction
-{
-  protected String name;
-  protected Operation operation;
-
-  public AddBindingOperationAction(Node parentNode, String name, String prefix)
-  {
-    // super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD") + " " + WSDLEditorPlugin.getWSDLString("_UI_LABEL_BINDING_OPERATION"), "icons/operationbinding_obj.gif", parentNode, prefix, "operation");
-    super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_BINDING_OPERATION"), "icons/operationbinding_obj.gif", parentNode, prefix, "operation");
-    this.name = name;
-  }
-
-  public AddBindingOperationAction(Node parentNode, Operation operation, String prefix)
-  {
-    this(parentNode, operation.getName(), prefix);
-    this.operation = operation;
-  }
-
-  protected void addAttributes(Element newElement)
-  {
-    newElement.setAttribute("name", name);
-  }
-
-  protected void performAddElement()
-  {
-    super.performAddElement();
-
-    if (operation != null)
-    {
-      if (operation.getInput() != null)
-      {
-        new AddBindingInputAction(editorPart, newElement, prefix).run();
-      }
-      if (operation.getOutput() != null)
-      {
-        new AddBindingOutputAction(editorPart, newElement, prefix).run();
-      }
-      for (Iterator i = operation.getEFaults().iterator(); i.hasNext();)
-      {
-        Fault fault = (Fault) i.next();
-        new AddBindingFaultAction(newElement, fault, prefix).run();
-      }
-      format(operation.getElement());
-    }
-  }
-}
-
-
-class AddOperationAction extends AddElementAction
-{
-  protected String name = "NewOperation";
-  protected PortType portType;
-  protected boolean createSubComponents = false;
-
-  public AddOperationAction(IEditorPart editorPart, PortType portType, Node parentNode, String prefix)
-  {
-    super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_OPERATION"), "icons/operation_obj.gif", parentNode, prefix, "operation");
-    setEditorPart(editorPart);
-    setDefinition(portType.getEnclosingDefinition());
-    this.portType = portType;
-  }
-
-  public boolean showDialog()
-  {
-    name = NameUtil.buildUniqueOperationName(portType);
-    name = showDialogHelper(WSDLEditorPlugin.getWSDLString("_UI_ACTION_NEW_OPERATION"), name, NameUtil.getUsedOperationNames(portType));
-    return name != null;
-  }
-
-//  protected void addAttributes(Element newElement)
-//  {
-//    newElement.setAttribute("name", name);
-//  }
-
-  protected void performAddElement()
-  {
-  	if (createSubComponents) {
-  	  	CreateWSDLElementHelper.operationName = name;
-  	  	CreateWSDLElementHelper.PART_TYPE_OR_DEFINITION = CreateWSDLElementHelper.getPartInfo(portType);
-  		Operation operation = CreateWSDLElementHelper.createOperation(portType);
-  		format(operation.getElement());  		
-  		selectObject(operation);
-  		expandEditParts(operation,true);
-  	}
-  	else {
-  		// Add Operation
-  		AddOperationCommand opAction = new AddOperationCommand(portType, name);
-		opAction.run();
-		Operation operation = (Operation) opAction.getWSDLElement();
-		
-		// Add Output
-  		AddOutputCommand outAction = new AddOutputCommand(operation, NameUtil.buildUniqueInputName(portType, operation.getName(), ""));
-  		outAction.run();
-  		
-		// Add Input
-		AddInputCommand inAction = new AddInputCommand(operation, NameUtil.buildUniqueOutputName(portType, operation.getName(), ""));
-  		inAction.run();
-
-  		format(operation.getElement());
-
- 	  	selectObject(operation);
- 	  	expandEditParts(operation, true);
-  	}
-  }
-
-	private void expandEditParts(Object element, boolean expandChildren) {
-	    if (element != null) {
-	    	EditPartViewer editPartViewer = ((WSDLEditor) editorPart).getGraphViewer().getComponentViewer();
-	    	Map editPartMap = editPartViewer.getEditPartRegistry();
-	    	WSDLTreeNodeEditPart wsdlEditPart = (WSDLTreeNodeEditPart) editPartMap.get(element);
-			wsdlEditPart.setExpanded(true);
-			
-			if (expandChildren) {
-				Iterator iterator = WSDLEditorUtil.getModelGraphViewChildren(element).iterator();
-				
-				while (iterator.hasNext()) {
-					expandEditParts(iterator.next(), expandChildren);
-				}
-			}
-	    }
-	}
-
-  public String showDialogHelper(String title, String defaultName, List usedNames)
-  {   
-    String result = defaultName; 
-    NewComponentWithChildDialog dialog = new NewComponentWithChildDialog(WSDLEditorPlugin.getShell(), title, defaultName, usedNames);
-    int rc = dialog.createAndOpen();
-    if (rc == IDialogConstants.OK_ID)
-    {
-      result = dialog.getName();  
-      createSubComponents = dialog.createSubComponents();
-    }
-    else
-    {
-      result = null;
-    }               
-    return result;
-  }
-}
-
-abstract class AddIOFAction extends AddElementAction
-{
-  protected Operation operation;
-
-  public AddIOFAction(IEditorPart editorPart, String text, String imageDescriptorKey, Node parentNode, String prefix, String localName, Operation operation)
-  {
-    super(text, imageDescriptorKey, parentNode, prefix, localName);
-    this.operation = operation;
-    setEditorPart(editorPart);
-    setDefinition(operation.getEnclosingDefinition());
-  }
-
-  abstract protected void performAddElementToBindingOperation(BindingOperation bindingOperation, Element bindingOperationElement);
-
-  /*
-  protected void addAttributes(Element newElement)
-  {
-    newElement.setAttribute("message", "");
-  }
-  */
-
-  protected void performAddElement()
-  {
-    if (operation != null)
-    {
-      Definition definition = operation.getEnclosingDefinition();
-      ComponentReferenceUtil util = new ComponentReferenceUtil(definition);
-
-      for (Iterator i = util.getBindingOperations(operation).iterator(); i.hasNext();)
-      {
-        BindingOperation bindingOperation = (BindingOperation) i.next();
-        Element bindingOperationElement = WSDLEditorUtil.getInstance().getElementForObject(bindingOperation);
-        if (bindingOperationElement != null)
-        {
-          performAddElementToBindingOperation(bindingOperation, bindingOperationElement);
-        }
-      }
-      format(operation.getElement());
-    }
-  }
-}
-
-class AddInputAction extends AddIOFAction
-{
-  public AddInputAction(IEditorPart editorPart, Node parentNode, Operation operation, String prefix)
-  {
-    super(editorPart, WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_INPUT"), "icons/input_obj.gif", parentNode, prefix, "input", operation);
-  }
-
-  protected void performAddElementToBindingOperation(BindingOperation bindingOperation, Element bindingOperationElement)
-  {
-    if (bindingOperation.getBindingInput() == null)
-    {
-      new AddBindingInputAction(editorPart, bindingOperationElement, prefix).run();
-    }
-  }
-  
-  protected void performAddElement() {
-  	PortType portType = (PortType) ((WSDLElementImpl) operation).getContainer();
-  	CreateWSDLElementHelper.PART_TYPE_OR_DEFINITION = CreateWSDLElementHelper.getPartInfo(portType);
-  	Input input = CreateWSDLElementHelper.createInput(portType, operation, null); 
-  	format(input.getElement());
-  	selectObject(input);
-  }
-}
-
-class AddOutputAction extends AddIOFAction
-{
-  public AddOutputAction(IEditorPart editorPart, Node parentNode, Operation operation, String prefix)
-  {
-    super(editorPart, WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_OUTPUT"), "icons/output_obj.gif", parentNode, prefix, "output", operation);
-  }
-
-  protected void performAddElementToBindingOperation(BindingOperation bindingOperation, Element bindingOperationElement)
-  {
-    if (bindingOperation.getBindingOutput() == null)
-    {
-      new AddBindingOutputAction(editorPart, bindingOperationElement, prefix).run();
-    }
-  }
-  
-  protected void performAddElement() {
-  	// Determine Part info
-  	PortType portType = (PortType) ((WSDLElementImpl) operation).getContainer();
-  	CreateWSDLElementHelper.PART_TYPE_OR_DEFINITION = CreateWSDLElementHelper.getPartInfo(portType);
-  	Output output = CreateWSDLElementHelper.createOutput(portType, operation); 
-  	format(output.getElement());
-  	selectObject(output);
-  }
-}
-
-class AddFaultAction extends AddIOFAction
-{
-  protected String name = "NewFault";
-  public AddFaultAction(IEditorPart editorPart, Node parentNode, Operation operation, String prefix)
-  {
-    super(editorPart, WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_FAULT"), "icons/fault_obj.gif", parentNode, prefix, "fault", operation);
-    name = NameUtil.buildUniqueFaultName(operation);
-  }
-
-  public boolean showDialog()
-  {
-    name = NameUtil.buildUniqueFaultName(operation);
-    name = showDialogHelper(WSDLEditorPlugin.getWSDLString("_UI_ACTION_NEW_FAULT"), name, NameUtil.getUsedFaultNames(operation));
-    return name != null;
-  }
-
-  /*
-  protected void addAttributes(Element newElement)
-  {
-    newElement.setAttribute("message", "");
-    newElement.setAttribute("name", name);
-  }
-  */
-
-  protected void performAddElementToBindingOperation(BindingOperation bindingOperation, Element bindingOperationElement)
-  {
-    if (bindingOperation.getBindingFault(name) == null)
-    {
-      new AddBindingFaultAction(bindingOperationElement, prefix).run();
-    }
-  }
-  
-  protected void performAddElement() {
-  	CreateWSDLElementHelper.faultName = name;
-  	CreateWSDLElementHelper.PART_TYPE_OR_DEFINITION = CreateWSDLElementHelper.getPartInfo(operation);
-  	Fault fault = CreateWSDLElementHelper.createFault(operation);
-  	format(fault.getElement());  	
-  	selectObject(fault);
-  }
-}
-
-class AddBindingInputAction extends AddElementAction
-{
-  public AddBindingInputAction(IEditorPart editorPart, Node parentNode, String prefix)
-  {
-    super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_INPUT"), "icons/input_obj.gif", parentNode, prefix, "input");
-    setEditorPart(editorPart);
-  }
-}
-
-class AddBindingOutputAction extends AddElementAction
-{
-  public AddBindingOutputAction(IEditorPart editorPart, Node parentNode, String prefix)
-  {
-    super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_OUTPUT"), "icons/output_obj.gif", parentNode, prefix, "output");
-    setEditorPart(editorPart);
-  }
-}
-
-class AddBindingFaultAction extends AddElementAction
-{
-  protected Fault fault;
-
-  public AddBindingFaultAction(Node parentNode, String prefix)
-  {
-    super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_FAULT"), "icons/fault_obj.gif", parentNode, prefix, "fault");
-  }
-
-  public AddBindingFaultAction(Node parentNode, Fault fault, String prefix)
-  {
-    this(parentNode, prefix);
-    this.fault = fault;
-  }
-
-  protected void addAttributes(Element newElement)
-  {
-    if (fault == null)
-    {
-      newElement.setAttribute("name", "NewFault");
-    }
-    else
-    {
-      newElement.setAttribute("name", fault.getName());
-    }
-  }
-}
-
-class AddMessageAction extends AddElementAction
-{
-  protected Definition definition;
-  protected String name;
-
-  public AddMessageAction(Definition definition, String name, Node parentNode, String prefix)
-  {
-    super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_MESSAGE"), "icons/message_obj.gif", parentNode, prefix, "message");
-    this.definition = definition;
-    this.name = name;
-    setComputeTopLevelRefChild(true);
-  }
-
-  public AddMessageAction(Definition definition, String name, Node parentNode, String prefix, Document document)
-  {
-    super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_MESSAGE"), "icons/message_obj.gif", parentNode, prefix, "message");
-    this.definition = definition;
-    this.name = name;
-    this.setDefinition(definition);
-    this.document = document;
-    setComputeTopLevelRefChild(true);
-  }
-  
-  public boolean showDialog()
-  {
-    name = NameUtil.buildUniqueMessageName(definition, name);
-    name = showDialogHelper(WSDLEditorPlugin.getWSDLString("_UI_ACTION_NEW_MESSAGE"), name, NameUtil.getUsedMessageNames(definition));
-    return name != null;
-  }
-
-//  protected void addAttributes(Element newElement)
-//  {
-//    newElement.setAttribute("name", name);
-//  }
-  
-  protected void performAddElement() {
-  	NodeList list = document.getChildNodes();
-  	if (parentNode == null|| list.getLength() == 0) {
-  		createDefinitionStub();
-  	}
-  	
-  	AddMessageCommand action = new AddMessageCommand(definition, name);
-	action.run();
-	Message message = (Message) action.getWSDLElement();
-	CreateWSDLElementHelper.createPart(message);
-	format(message.getElement());
-	selectObject(message);
-  }
-
-  public String getName()
-  {
-    return name;
-  }
-}
-
-class AddPartAction extends AddElementAction
-{
-  protected Message message;
-  protected String name;
-
-  public AddPartAction(IEditorPart editorPart, Message message, Node parentNode, String prefix)
-  {
-    super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_PART"), "icons/part_obj.gif", parentNode, prefix, "part");
-    this.message = message;
-    setEditorPart(editorPart);
-    setDefinition(message.getEnclosingDefinition());
-  }
-
-  public boolean showDialog()
-  {
-    name = NameUtil.buildUniquePartName(message, message.getQName().getLocalPart());
-    name = showDialogHelper(WSDLEditorPlugin.getWSDLString("_UI_ACTION_NEW_PART"), name, NameUtil.getUsedPartNames(message));
-    return name != null;
-  }
-
-  protected void addAttributes(Element newElement)
-  {
-    newElement.setAttribute("name", name);
-    String xsdPrefix = message.getEnclosingDefinition().getPrefix(WSDLConstants.XSD_NAMESPACE_URI);
-    if (xsdPrefix == null)
-    {
-    	Element definitionElement = WSDLEditorUtil.getInstance().getElementForObject(message.getEnclosingDefinition());    	
-        new AddNamespaceDeclarationsAction(definitionElement, WSDLConstants.XSD_NAMESPACE_URI, "xsd").run();
-		xsdPrefix = message.getEnclosingDefinition().getPrefix(WSDLConstants.XSD_NAMESPACE_URI);
-    }
-			
-    String defaultTypeName = "string";
-    if (xsdPrefix != null && xsdPrefix.length() > 0)
-    {
-      defaultTypeName = xsdPrefix + ":" + defaultTypeName;
-    }
-    newElement.setAttribute("type", defaultTypeName);
-  }
-}
-
-class AddServiceAction extends AddElementAction
-{
-  protected String name;
-  protected Definition definition;
-
-  public AddServiceAction(Definition definition, String name, Node parentNode, String prefix)
-  {
-    super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_SERVICE"), "icons/service_obj.gif", parentNode, prefix, "service");
-    this.definition = definition;
-    this.name = name;
-    setComputeTopLevelRefChild(true);
-  }
-
-  public AddServiceAction(Definition definition, String name, Node parentNode, String prefix, Document document)
-  {
-    super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_SERVICE"), "icons/service_obj.gif", parentNode, prefix, "service");
-    this.definition = definition;
-    this.name = name;
-    this.setDefinition(definition);
-    this.document = document;
-    setComputeTopLevelRefChild(true);
-  }
-
-  public boolean showDialog()
-  {
-    if (name == null)
-    {
-      name = NameUtil.buildUniqueServiceName(definition);
-    }
-    name = showDialogHelper(WSDLEditorPlugin.getWSDLString("_UI_ACTION_NEW_SERVICE"), name, NameUtil.getUsedServiceNames(definition));
-    return name != null;
-  }
-
-  protected void addAttributes(Element newElement)
-  {
-    newElement.setAttribute("name", name);
-  }
-  
-  protected void performAddElement() {  	
-  	NodeList list = document.getChildNodes();
-  	if (parentNode == null || list.getLength() == 0) {
-  		createDefinitionStub();
-  	}
-  	
-  	super.performAddElement();
-  }
-}
-
-class AddPortTypeAction extends AddElementAction
-{
-  protected String name;
-  protected Definition definition;
-
-  public AddPortTypeAction(Definition definition, String name, Node parentNode, String prefix)
-  {
-    super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_PORTTYPE"), "icons/porttype_obj.gif", parentNode, prefix, "portType");
-    this.definition = definition;
-    this.name = name;
-    setComputeTopLevelRefChild(true);
-  }
-
-  public AddPortTypeAction(Definition definition, String name, Node parentNode, String prefix, Document document)
-  {
-    super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_PORTTYPE"), "icons/porttype_obj.gif", parentNode, prefix, "portType");
-    this.definition = definition;
-    this.name = name;
-    this.setDefinition(definition);
-    this.document = document;
-    setComputeTopLevelRefChild(true);
-  }
-  
-  public boolean showDialog()
-  {
-    name = NameUtil.buildUniquePortTypeName(definition, name);
-    name = showDialogHelper(WSDLEditorPlugin.getWSDLString("_UI_ACTION_NEW_PORTTYPE"), name, NameUtil.getUsedPortTypeNames(definition));
-    return name != null;
-  }
-
-  protected void addAttributes(Element newElement)
-  {
-    newElement.setAttribute("name", name);
-  }
-
-  public String getPortTypeName()
-  {
-    return name;
-  }
-  
-  protected void performAddElement() {
-  	NodeList list = document.getChildNodes();
-  	if (parentNode == null || list.getLength() == 0) {
-  		createDefinitionStub();
-  	}
-  	
-  	super.performAddElement();
-  }
-}
-
-class AddBindingAction extends Action
-{
-  protected Definition definition;
-  protected Document document;
-
-  public AddBindingAction(Definition definition, Document document)
-  {
-    super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_BINDING"), ImageDescriptor.createFromFile(WSDLEditorPlugin.class, "icons/binding_obj.gif")); //$NON-NLS-1$
-    //setToolTipText(WSDLEditorPlugin.getInstance().getWSDLString("_UI_LABEL_BINDING_WIZARD")); //$NON-NLS-1$
-    this.definition = definition;
-    this.document = document;
-  }
-
-  public void run()
-  {
-    BindingWizard wizard = new BindingWizard(definition, document);
-    WizardDialog wizardDialog = new WizardDialog(Display.getCurrent().getActiveShell(), wizard);
-    wizardDialog.create();
-
-    int result = wizardDialog.open();
-
-    if (result == Window.OK)
-    {
-      //todo...      
-    }
-  }
-}
-
-class AddPortAction extends Action
-{
-	protected Service service;
-
-	public AddPortAction(Service service)
-	{
-		super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_PORT"), ImageDescriptor.createFromFile(WSDLEditorPlugin.class, "icons/binding_obj.gif")); //$NON-NLS-1$
-		//setToolTipText(WSDLEditorPlugin.getInstance().getWSDLString("_UI_LABEL_BINDING_WIZARD")); //$NON-NLS-1$
-		this.service = service;
-	}
-
-	public void run()
-	{
-		PortWizard wizard = new PortWizard(service);
-		WizardDialog wizardDialog = new WizardDialog(Display.getCurrent().getActiveShell(), wizard);
-		wizardDialog.create();
-
-		int result = wizardDialog.open();
-		if (result == Window.OK)
-		{
-			//todo...      
-		}
-	}
-}
-
-class GenerateBindingContentAction extends Action
-{
-	protected Binding binding;
-	public GenerateBindingContentAction(Binding binding, boolean isEditable)
-	{
-		super(WSDLEditorPlugin.getWSDLString("_UI_GENERATE_BINDING_CONTENT"));
-		this.binding = binding;
-		setEnabled(isEditable);
-	}
-	
-	public void run()
-	{
-		BindingWizard wizard = new BindingWizard(binding.getEnclosingDefinition(), binding, BindingWizard.KIND_REGENERATE_BINDING);
-		wizard.setBindingName(ComponentReferenceUtil.getName(binding));
-		wizard.setPortTypeName(ComponentReferenceUtil.getPortTypeReference(binding));
-		WizardDialog wizardDialog = new WizardDialog(Display.getCurrent().getActiveShell(), wizard);
-		wizardDialog.create();
-		wizardDialog.open();	
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLMenuListener.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLMenuListener.java
deleted file mode 100644
index a71c2389f..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLMenuListener.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject;
-import org.w3c.dom.Node;
-
-
-public class WSDLMenuListener implements IMenuListener
-{                      
-  protected ISelectionProvider selectionProvider;
-  protected ExtensibleMenuActionContributor extensibleMenuActionContributor;
-
-  public WSDLMenuListener(WSDLEditor editor, ISelectionProvider selectionProvider)
-  {
-    super();                                                               
-    this.extensibleMenuActionContributor = new ExtensibleMenuActionContributor(editor);
-    this.selectionProvider = selectionProvider;              
-  }
-      
-  protected Object getSelectedObject()
-  {      
-    ISelection selection = selectionProvider.getSelection();    
-    return selection.isEmpty() ? null : ((IStructuredSelection)selection).getFirstElement();   
-  }
-
-  public void menuAboutToShow(IMenuManager manager)
-  {                                                                                         
-    Object object = getSelectedObject();
-    Node node = null;
-    if (object instanceof Node)
-    {
-      node = (Node)object;
-    }
-    else if (object instanceof WSDLElement)
-    {
-      node = ((WSDLElement)object).getElement();   
-    }                                                                            
-    else if (object instanceof WSDLGroupObject)
-    {
-      node =  ((WSDLGroupObject)object).getDefinition().getElement();
-    }
-    extensibleMenuActionContributor.contributeMenuActions(manager, node, object);
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingCommand.java
deleted file mode 100644
index 899817a0d..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingCommand.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-
-
-public final class AddBindingCommand extends WSDLElementCommand
-{
-  private Definition definition;
-  private String localName;
-  private Binding binding;
- 
-  public AddBindingCommand
-		(Definition definition,  
-		 String localName)
-	{
-	  this.definition = definition;
-	  this.localName = localName;
-	}
-  
-  public WSDLElement getWSDLElement()
-  {
-    return binding;
-  }
-
-  public void run()
-  {
-    binding = WSDLFactory.eINSTANCE.createBinding();
-    binding.setQName(new QName(definition.getTargetNamespace(),localName));
-    binding.setEnclosingDefinition(definition);
-    definition.addBinding(binding);
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingFaultCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingFaultCommand.java
deleted file mode 100644
index c8e02ae2c..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingFaultCommand.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-
-public final class AddBindingFaultCommand extends WSDLElementCommand
-{
-  BindingFault bindingFault;
-  BindingOperation bindingOperation;
-  String name;
-  
-  public AddBindingFaultCommand(BindingOperation bindingOperation, String name)
-  {
-    this.bindingOperation = bindingOperation;
-    this.name = name;
-  }
-
-  public void run()
-  {
-    bindingFault = WSDLFactory.eINSTANCE.createBindingFault();
-    bindingFault.setName(name); 
-    bindingFault.setEnclosingDefinition(bindingOperation.getEnclosingDefinition());
-    bindingOperation.addBindingFault((BindingFault)bindingFault);
-  }
-  
-  public WSDLElement getWSDLElement()
-  {
-    return bindingFault;
-  }
-}
-
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingInputCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingInputCommand.java
deleted file mode 100644
index 5303b444a..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingInputCommand.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-
-public final class AddBindingInputCommand extends WSDLElementCommand
-{
-  BindingInput bindingInput;
-  BindingOperation bindingOperation;
-  String name;
-  
-  public AddBindingInputCommand(BindingOperation bindingOperation, String name)
-  {
-    this.bindingOperation = bindingOperation;
-    this.name = name;
-  }
-
-  public void run()
-  {
-    bindingInput = WSDLFactory.eINSTANCE.createBindingInput();
-    bindingInput.setName(name); 
-    bindingInput.setEnclosingDefinition(bindingOperation.getEnclosingDefinition());
-    bindingOperation.setBindingInput((BindingInput)bindingInput);
-  }
-  
-  public WSDLElement getWSDLElement()
-  {
-    return bindingInput;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingOperationCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingOperationCommand.java
deleted file mode 100644
index 45e0f9617..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingOperationCommand.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-
-public final class AddBindingOperationCommand extends WSDLElementCommand
-{
-  private Binding binding;
-  
-  private String name;
-  private String bindingInputName = "";
-  private String bindingOutputName = "";
-  private String bindingFaultName ="";
-  
-  private BindingOperation bindingOperation;
-  
-  private boolean createBindingInput = false;
-  private boolean createBindingOutput = false;
-  private boolean createBindingFault = false;
-  
-  public AddBindingOperationCommand(Binding binding,String name)
-  {
-    this.binding = binding;
-    this.name = name;
-  }
-  
-  public AddBindingOperationCommand
-    (Binding binding,  
-     String name,
-     boolean createBindingInput,
-     boolean createBindingOutput,
-     boolean createBindingFault)
-  {
-    this.binding = binding;
-    this.name = name;
-    this.createBindingInput = createBindingInput;
-    this.createBindingOutput = createBindingOutput;
-    this.createBindingFault = createBindingFault;
-  }
-    
-  public void run()
-  {
-    bindingOperation = WSDLFactory.eINSTANCE.createBindingOperation();
-    bindingOperation.setName(name);
-    bindingOperation.setEnclosingDefinition(binding.getEnclosingDefinition());
-    binding.addBindingOperation(bindingOperation);
-
-    WSDLElementCommand command = null;
-    if (createBindingInput)
-    {
-      command = new AddBindingInputCommand(bindingOperation,bindingInputName);
-      command.run();
-    }
-
-    if (createBindingOutput)
-    {
-      command = new AddBindingOutputCommand(bindingOperation,bindingOutputName);
-      command.run();
-    }
-
-    if (createBindingFault)
-    {
-      command = new AddBindingFaultCommand(bindingOperation,bindingFaultName);
-      command.run();
-    }
-  }
-  
-  public WSDLElement getWSDLElement()
-  {
-    return bindingOperation;
-  }
-  
-  public void setName(String name)
-  {
-    this.name = name;
-  }
-  
-  public void setBindingInputName(String name)
-  {
-    this.bindingInputName = name;
-  }
-  
-  public void setBindingOutputName(String name)
-  {
-    this.bindingOutputName = name;
-  }
-  
-  public void setBindingFaultName(String name)
-  {
-    this.bindingFaultName = name;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingOutputCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingOutputCommand.java
deleted file mode 100644
index 4286b6c2f..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingOutputCommand.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-
-public final class AddBindingOutputCommand extends WSDLElementCommand
-{
-  BindingOutput bindingOutput;
-  BindingOperation bindingOperation;
-  String name;
-  
-  public AddBindingOutputCommand(BindingOperation bindingOperation, String name)
-  {
-    this.bindingOperation = bindingOperation;
-    this.name = name;
-  }
-
-  public void run()
-  {
-    bindingOutput = WSDLFactory.eINSTANCE.createBindingOutput();
-    bindingOutput.setName(name); 
-    bindingOutput.setEnclosingDefinition(bindingOperation.getEnclosingDefinition());
-    bindingOperation.setBindingOutput((BindingOutput)bindingOutput);
-  }
-  
-  public WSDLElement getWSDLElement()
-  {
-    return bindingOutput;
-  }
-}
-
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddFaultCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddFaultCommand.java
deleted file mode 100644
index deb638a2a..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddFaultCommand.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.ui.internal.util.NameUtil;
-
-
-public final class AddFaultCommand extends AddMessageReferenceCommand
-{
-  private Fault originalFault;
-  
-  public AddFaultCommand(Operation operation, String name)
-  {
-    super(operation,name);
-  }
-
-  public AddFaultCommand(Operation operation, String name, boolean createMessage)
-  {
-    super(operation,name,createMessage);
-  }
-  
-  /*
-   * Constructor used to create a Fault based on the given Fault.  In essence, this will
-   * create a copy of the given Fault.
-   */
-  public AddFaultCommand(Operation operation, Fault originalFault, String name) {
-  	super(operation, name, false);
-  	
-  	this.originalFault = originalFault;
-  }
-  
-  public void run()
-  {
-    messageReference = WSDLFactory.eINSTANCE.createFault();
-    messageReference.setName(name); 
-    messageReference.setEnclosingDefinition(operation.getEnclosingDefinition());
-    operation.addFault((Fault)messageReference);
-    
-    //  TBD - add binding fault
-
-    if (originalFault == null) {
-    	if (createMessage)
-    		createMessage();
-    }
-    else {
-    	// Do necessary copying of data from original Fault to new Fault
-    	if (originalFault.getEMessage() != null) {
-//    		String originalMsgName = originalFault.getEMessage().getQName().getLocalPart();
-//    		
-//    		boolean gened = false;
-//    		if (originalFault.eContainer() instanceof Operation)
-//    			gened = SmartRenameAction.isMessageNameGenerated(originalMsgName, ((Operation) originalFault.eContainer()).getName(), "");
-//    		
-//    		String newMsgName = "";
-//    		if (gened) {
-//    			newMsgName = NameUtil.buildUniqueMessageName(operation.getEnclosingDefinition(), messageReference);
-//    		}
-//    		else {
-//    			Definition definition = operation.getEnclosingDefinition();
-//    			Message tMessage = originalFault.getEMessage();
-//    			newMsgName = NameUtil.buildUniqueMessageName(definition, tMessage.getQName().getLocalPart());
-//    		}
-    		
-    		createMessage(originalFault, NameUtil.buildUniqueMessageName(operation.getEnclosingDefinition(), messageReference));
-    	}
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddImportCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddImportCommand.java
deleted file mode 100644
index 7fc4eb62a..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddImportCommand.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-
-public final class AddImportCommand extends WSDLElementCommand
-{
-  private Definition definition;
-  private String namespace;
-  private String location;
-  private Import importElement;
-  
-  public AddImportCommand
-  	(Definition definition,  
-  	 String namespace,
-  	 String location)
-  {
-    this.definition = definition;
-    this.namespace = namespace;
-    this.location = location;
-  }
-  
-  public WSDLElement getWSDLElement()
-  {
-    return importElement;
-  }
-
-  public void run()
-  {
-    importElement = WSDLFactory.eINSTANCE.createImport();
-    importElement.setNamespaceURI(namespace);
-    importElement.setLocationURI(location);
-    importElement.setEnclosingDefinition(definition);
-    definition.addImport(importElement);
-  }
-  
-  public void setNamespaceURI(String namespace)
-  {
-    this.namespace = namespace;
-  }
-  
-  public void setLocationURI(String location)
-  {
-    this.location = location;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddInputCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddInputCommand.java
deleted file mode 100644
index 0e33b7176..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddInputCommand.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.ui.internal.actions.SmartRenameAction;
-import org.eclipse.wst.wsdl.ui.internal.util.NameUtil;
-
-
-public final class AddInputCommand extends AddMessageReferenceCommand
-{
-  private Input originalInput;
-	
-  public AddInputCommand(Operation operation, String name)
-  {
-    super(operation,name);
-  }
-
-  public AddInputCommand(Operation operation, String name, boolean createMessage)
-  {
-    super(operation,name,createMessage);
-  }
-  
-  /*
-   * Constructor used to create an Input based on the given Input.  In essence, this will
-   * create a copy of the given Input.
-   */
-  public AddInputCommand(Operation operation, Input originalInput, String name) {
-  	super(operation, name, false);
-  	
-  	this.originalInput = originalInput;
-  }
-  
-  public void run()
-  {
-    messageReference = WSDLFactory.eINSTANCE.createInput();
-  //  messageReference.setName(name); 
-    messageReference.setEnclosingDefinition(operation.getEnclosingDefinition());
-    operation.setInput((Input)messageReference);
-    
-    // TBD - add binding input 
-    
-    if (originalInput == null) {
-    	if (createMessage)
-    		createMessage();
-    }
-    else {
-    	// Do necessary copying of data from original Input to new Input
-    	if (originalInput.getEMessage() != null) {
-    		String originalMsgName = originalInput.getEMessage().getQName().getLocalPart();
-    		
-    		boolean gened = false;
-    		if (originalInput.eContainer() instanceof Operation)
-    			gened = SmartRenameAction.isMessageNameGenerated(originalMsgName, ((Operation) originalInput.eContainer()).getName(), "Request");
-    		
-    		String newMsgName = "";
-    		if (gened) {
-    			newMsgName = NameUtil.buildUniqueMessageName(operation.getEnclosingDefinition(), messageReference);
-    		}
-    		else {
-    			Definition definition = operation.getEnclosingDefinition();
-    			Message tMessage = originalInput.getEMessage();
-    			newMsgName = NameUtil.buildUniqueMessageName(definition, tMessage.getQName().getLocalPart());
-    		}
-
-    		createMessage(originalInput, newMsgName);
-    	}
-    }
-  }
-  
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddMessageCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddMessageCommand.java
deleted file mode 100644
index 907972465..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddMessageCommand.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import java.util.Iterator;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.ui.internal.actions.SmartRenameAction;
-import org.eclipse.wst.wsdl.ui.internal.util.NameUtil;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-
-
-public final class AddMessageCommand extends WSDLElementCommand
-{
-  private Definition definition;
-  private String localName;
-  private Message message;
-  private Message originalMessage;
-  
-  private boolean createPart = false;
-  private final String DEFAULT_PART_NAME = "NewPart";
-  
-  public AddMessageCommand
-  	(Definition definition,  
-  	 String localName)
-  {
-    this.definition = definition;
-    this.localName = localName;
-  }
-  
-  public AddMessageCommand
-		(Definition definition, 
-		 String localName,
-		 boolean createPart)
-	{
-	  this.definition = definition;
-	  this.localName = localName;
-	  this.createPart = createPart;
-	}
-  
-  /*
-   * Constructor used to create a Message based on the given Message.  In essence, this will
-   * create a copy of the given Message.
-   */
-  public AddMessageCommand(Definition definition, Message originalMessage, String localName, boolean copyPart) {
-    this.definition = definition;
-	this.localName = localName;
-	this.createPart = copyPart;
-  	this.originalMessage = originalMessage;
-  }
-  
-  public void run()
-  {
-    message = WSDLFactory.eINSTANCE.createMessage();
-    message.setQName(new QName(definition.getTargetNamespace(),localName));
-    message.setEnclosingDefinition(definition);
-    definition.addMessage(message);
-    
-    if (originalMessage == null) {
-    	if (createPart)
-    	{
-    		AddPartCommand command = 
-    			new AddPartCommand(message,DEFAULT_PART_NAME,WSDLConstants.SCHEMA_FOR_SCHEMA_URI_2001,"string",true);
-    		command.run();
-    	}
-    }
-    else {
-    	if (originalMessage.getEParts() != null) {
-    		Iterator it = originalMessage.getEParts().iterator();
-    		
-    		while (it.hasNext()) {
-    			Part part = (Part) it.next();
-    			AddPartCommand command;
-    			if (SmartRenameAction.isPartNameGenerated(part.getName(), originalMessage.getQName().getLocalPart()))
-    				command = new AddPartCommand(message, part, NameUtil.buildUniquePartName(message, message.getQName().getLocalPart()));	
-    			else
-    				command = new AddPartCommand(message, part, part.getName());
-    			
-    			
-    			command.run();
-    		}
-    	}
-    }
-  }
-
-  public void setLocalName(String name)
-  {
-    this.localName = name;
-  }
-  
-  public WSDLElement getWSDLElement()
-  {
-    return message;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddMessageReferenceCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddMessageReferenceCommand.java
deleted file mode 100644
index 1ec11ea4f..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddMessageReferenceCommand.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.MessageReference;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.WSDLElement;
-
-abstract public class AddMessageReferenceCommand extends WSDLElementCommand
-{
-  protected String name;
-  protected MessageReference messageReference;
-  protected Operation operation;
-  protected boolean createMessage = false;
-  private final String DEFAULT_MESSAGE_NAME = "NewMessage";
-
-  public AddMessageReferenceCommand(Operation operation, String name)
-  {
-    this.operation = operation;
-    this.name = name;
-  }
-  
-  public AddMessageReferenceCommand(Operation operation, String name, boolean createMessage)
-  {
-    this.operation = operation;
-    this.name = name;
-    this.createMessage = createMessage;
-  }
-
-  protected void createMessage()
-  {
-    Definition definition = operation.getEnclosingDefinition();
-    AddMessageCommand command = 
-      new AddMessageCommand(definition,DEFAULT_MESSAGE_NAME,createMessage);      
-    command.run();
-    messageReference.setEMessage((Message)command.getWSDLElement());
-  }
-  
-  /*
-   * Overloaded createMessage(arg) method.  Similar to to createMessage() but takes in a MessageReference.
-   * Method used to create a copy of the original Message (contained in the passed in MessageReference).
-   */
-  protected void createMessage(MessageReference originalMRef, String newMessageRefName) {
-    Definition definition = operation.getEnclosingDefinition();
-    Message tMessage = originalMRef.getEMessage();
-    AddMessageCommand command = 
-      new AddMessageCommand(definition, tMessage, newMessageRefName, true);
-    command.run();
-    messageReference.setEMessage((Message)command.getWSDLElement());
-  }
-  
-  public WSDLElement getWSDLElement()
-  {
-    return messageReference;
-  }
-  
-  public void setName(String name)
-  {
-    this.name = name;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddOperationCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddOperationCommand.java
deleted file mode 100644
index 8059fc2c7..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddOperationCommand.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import java.util.Iterator;
-
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.ui.internal.util.NameUtil;
-
-
-public final class AddOperationCommand extends WSDLElementCommand
-{
-  private PortType portType;
-  private String name;
-  private Operation operation;
-  private Operation originalOperation;
-  private boolean copyInOutFault;
-  
-  private boolean createInput = false;
-  private boolean createOutput = false;
-  private boolean createFault = false;
-  
-  private final String DEFAULT_INPUT_NAME = "";
-  private final String DEFAULT_OUTPUT_NAME = "";
-  private final String DEFAULT_FAULT_NAME = "";
-  
-  public AddOperationCommand
-		(PortType portType,  
-		 String name)
-	{
-	  this.portType = portType;
-	  this.name = name;
-	}
-  
-  public AddOperationCommand
-		(PortType portType,  
-		 String name,
-		 boolean createInput,
-		 boolean createOutput,
-		 boolean createFault)
-	{
-	  this.portType = portType;
-	  this.name = name;
-	  this.createInput = createInput;
-	  this.createOutput = createOutput;
-	  this.createFault = createFault;
-	}
-  
-  /*
-   * Constructor used to create an Operation based on the given Operation.  In essence, this will
-   * create a copy of the given Operation.
-   */
-  public AddOperationCommand(PortType portType, Operation originalOperation, String name, boolean copyInOutFault) {
-  	this.portType = portType;
-  	this.originalOperation = originalOperation;
-  	this.name = name;
-  	this.copyInOutFault = copyInOutFault;
-  }
-  
-  public void run()
-  {
-    operation = WSDLFactory.eINSTANCE.createOperation();
-    operation.setName(name);
-    operation.setEnclosingDefinition(portType.getEnclosingDefinition());
-    portType.addOperation(operation);
-
-    if (originalOperation == null) {    
-    	WSDLElementCommand command = null;
-    	if (createInput)
-    	{
-    		command = new AddInputCommand(operation,DEFAULT_INPUT_NAME,true);
-    		command.run();
-    	}
-    
-    	if (createOutput)
-    	{
-    		command = new AddOutputCommand(operation,DEFAULT_OUTPUT_NAME,true);
-    		command.run();
-    	}
-    
-    	if (createFault)
-    	{
-    		command = new AddFaultCommand(operation,DEFAULT_FAULT_NAME,true);
-    		command.run();
-    	}
-    }
-    else {
-    	// Do necessary copying of data from original operation to new operation
-    	// Paramater ordering? Documentation?  This part still needs to be worked on    	
-    	// Copy 'kids' if necessary
-    	if (copyInOutFault) {
-    		WSDLElementCommand command = null;
-        
-        	if (originalOperation.getEOutput() != null)
-        	{
-        		Output output = originalOperation.getEOutput();
-        		command = new AddOutputCommand(operation, output, NameUtil.buildUniqueOutputName(portType, operation.getName(), ""));
-        		command.run();
-        	}
-        	
-        	if (originalOperation.getEInput() != null)
-        	{
-        		Input input = originalOperation.getEInput();
-        		command = new AddInputCommand(operation, input, NameUtil.buildUniqueInputName(portType, operation.getName(), ""));
-        		command.run();
-        	}
-        
-        	if (originalOperation.getEFaults() != null)
-        	{
-        		Iterator it = originalOperation.getEFaults().iterator();
-        		while (it.hasNext()) {
-        			Fault fault = (Fault) it.next();
-        			command = new AddFaultCommand(operation, fault, NameUtil.buildUniqueFaultName(originalOperation, fault.getName()));
-        			command.run();
-        		}
-        	}
-    		
-    	}
-    }
-  }
-  
-  public WSDLElement getWSDLElement()
-  {
-    return operation;
-  }
-  
-  public void setName(String name)
-  {
-    this.name = name;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddOutputCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddOutputCommand.java
deleted file mode 100644
index 5c57c5831..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddOutputCommand.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.ui.internal.actions.SmartRenameAction;
-import org.eclipse.wst.wsdl.ui.internal.util.NameUtil;
-
-
-public final class AddOutputCommand extends AddMessageReferenceCommand
-{
-  private Output originalOutput;
-  
-  public AddOutputCommand(Operation operation, String name)
-  {
-    super(operation,name);
-  }
-
-  public AddOutputCommand(Operation operation, String name, boolean createMessage)
-  {
-    super(operation,name,createMessage);
-  }
-  
-  /*
-   * Constructor used to create an Output based on the given Output.  In essence, this will
-   * create a copy of the given Output.
-   */
-  public AddOutputCommand(Operation operation, Output originalOutput, String name) {
-  	super(operation, name, false);
-  	
-  	this.originalOutput = originalOutput;
-  }
-  
-  public void run()
-  {
-    messageReference = WSDLFactory.eINSTANCE.createOutput();
-//    messageReference.setName(name);
-    messageReference.setEnclosingDefinition(operation.getEnclosingDefinition());
-    operation.setOutput((Output)messageReference);
-    
-    //  TBD - add binding output 
-    
-    if (originalOutput == null) {
-    	if (createMessage)
-    		createMessage();
-    }
-    else {
-    	// Do necessary copying of data from original Output to new Output
-    	if (originalOutput.getEMessage() != null) {
-    		String originalMsgName = originalOutput.getEMessage().getQName().getLocalPart();
-		
-		boolean gened = false;
-		if (originalOutput.eContainer() instanceof Operation)
-			gened = SmartRenameAction.isMessageNameGenerated(originalMsgName, ((Operation) originalOutput.eContainer()).getName(), "Response");
-		
-		String newMsgName = "";
-		if (gened) {
-			newMsgName = NameUtil.buildUniqueMessageName(operation.getEnclosingDefinition(), messageReference);
-		}
-		else {
-			Definition definition = operation.getEnclosingDefinition();
-			Message tMessage = originalOutput.getEMessage();
-			newMsgName = NameUtil.buildUniqueMessageName(definition, tMessage.getQName().getLocalPart());
-		}
-		
-    	createMessage(originalOutput, newMsgName);
-    	}
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddPartCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddPartCommand.java
deleted file mode 100644
index 2ed9d68c2..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddPartCommand.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import java.util.Iterator;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.wsdl.internal.impl.PartImpl;
-import org.eclipse.wst.wsdl.internal.impl.WSDLElementImpl;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDSchema;
-
-
-public final class AddPartCommand extends WSDLElementCommand
-{
-  private Message message;
-  private String name;
-  private Part part;
-  private Part originalPart;
-  
-  private QName typeOrElementName;
-  private boolean useType = true;
-
-  public AddPartCommand
-		(Message message,
-		 String name)
-	{
-	  this.message = message;
-	  this.name = name;
-	}
-  
-  public AddPartCommand
-		(Message message,
-		 String name,
-		 String namespace,
-		 String localName,
-		 boolean useType)
-	{
-	  this.message = message;
-	  this.name = name;
-	  this.useType = useType;
-	  typeOrElementName = new QName(namespace,localName);
-	}
-  
-  /*
-   * Constructor used to create a Part based on the given Part.  In essence, this will
-   * create a copy of the given Part.
-   */
-  public AddPartCommand
-	(Message message,
-	 Part originalPart,
-	 String name)
-  {
-  	this.message = message;
-  	this.name = name;
-  	this.originalPart = originalPart;
-  }
-  
-  /**
-   * @deprecated
-   */
-  public AddPartCommand
-		(Message message,
-		 String name,
-		 String namespace,
-		 String localName)
-	{
-	  this.message = message;
-	  this.name = name;
-	  typeOrElementName = new QName(namespace,localName);
-	}
-  
-  public void setName(String name)
-  {
-    this.name = name;
-  }
-  
-  public WSDLElement getWSDLElement()
-  {
-    return part;
-  }
-  
-  public void run()
-  {
-    if (typeOrElementName == null)
-      typeOrElementName = createDefaultTypeName();
-    
-    // Add namespace to the Definitions if it is not there yet.
-    addNamespaceDeclaration();
-    
-    part = WSDLFactory.eINSTANCE.createPart();
-    part.setName(name);
-    
-    if (originalPart == null) {
-    	if (useType)
-    		part.setTypeName(typeOrElementName);
-    	else
-    		part.setElementName(typeOrElementName);
-    }
-    else {
-    	if (originalPart.getTypeName() != null)
-    		part.setTypeName(originalPart.getTypeName());
-
-    	String newElementName = null;
-    	if (originalPart.getElementName() != null) {
-    		
-    		boolean createNewElement = true;
-    		if (originalPart.getElementDeclaration() != null && originalPart.getElementDeclaration().getElement() != null) {
-        		if (!(originalPart.getElementDeclaration().getElement() instanceof IDOMNode)) {
-        			createNewElement = false;
-        		}        		
-    		}
-    		
-    		if (createNewElement) {
-    			newElementName = getNewNameHelper(name, originalPart.getEnclosingDefinition(), false);
-    			part.setElementName(new QName(originalPart.getElementName().getNamespaceURI(), newElementName));
-	
-    			if (originalPart.getEnclosingDefinition() != null) {
-    				if (newElementName == null) {
-    					newElementName = getNewNameHelper(name, originalPart.getEnclosingDefinition(), false);
-    				}
-    		
-    				AddXSDElementDeclarationCommand elementAction = new AddXSDElementDeclarationCommand(originalPart.getEnclosingDefinition(), newElementName);
-    				elementAction.run();
-    			}
-    		}
-    		else {
-    			part.setElementName(new QName(originalPart.getElementName().getNamespaceURI(), originalPart.getElementName().getLocalPart()));
-    		}
-    	}
-    }
-    	
-    part.setEnclosingDefinition(message.getEnclosingDefinition());
-    ((PartImpl)part).reconcileReferences(false); 
-    message.addPart(part);
-  }
-  
-  private void addNamespaceDeclaration()
-  {
-    Definition definition = message.getEnclosingDefinition();
-    if (!definition.getNamespaces().containsValue(typeOrElementName.getNamespaceURI()))
-    {
-      definition.addNamespace("p",typeOrElementName.getNamespaceURI());
-      ((WSDLElementImpl)definition).updateElement(false);
-    }
-  }
-  
-  private QName createDefaultTypeName()
-  {
-    QName qname = new QName(WSDLConstants.SCHEMA_FOR_SCHEMA_URI_2001,"string");
-    return qname;
-  }
-  
-  private String getNewNameHelper(String base, Definition def, boolean isType)
-  { 
-    String name = base;    
-    int count = 0;
-
-    // Ugly....  Redo this...
-    // Get a list of Elements...
-    List elementList = null;
-    if (def.getETypes() != null) {
-    	List xsdsList = def.getETypes().getEExtensibilityElements();
-    	if (xsdsList != null) {
-    		Iterator xsdsIterator = xsdsList.iterator();
-    		XSDSchemaExtensibilityElement xsdElement = (XSDSchemaExtensibilityElement) xsdsIterator.next();
-    		XSDSchema schema = xsdElement.getSchema();
-    		if (schema != null) {
-    			elementList = schema.getElementDeclarations();
-    		}
-    	}
-    }
-    
-    if (elementList != null) {
-    	int index = 0;
-    	while (index < elementList.size()) {
-    		XSDElementDeclaration elementDeclaration = (XSDElementDeclaration) elementList.get(index);
-    		
-    		if (name.equals(elementDeclaration.getName())) {
-    			count++;
-    			name = name + count;
-    			index = 0;
-    		}
-    		else {
-    			index++;
-    		}
-    	}
-    }
-
-    return name;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddPortCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddPortCommand.java
deleted file mode 100644
index a647c5215..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddPortCommand.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-
-public final class AddPortCommand extends WSDLElementCommand
-{
-  private Service service;
-  private String name;
-  private Port port;
-  
-  public AddPortCommand
-		(Service service,
-		 String name)
-	{
-	  this.service = service;
-	  this.name = name;
-	}
-  
-  public void setName(String name)
-  {
-    this.name = name;
-  }
-  
-  public WSDLElement getWSDLElement()
-  {
-    return port;
-  }
-
-  public void run()
-  {
-    port = WSDLFactory.eINSTANCE.createPort();
-    port.setName(name);
-    port.setEnclosingDefinition(service.getEnclosingDefinition());
-    service.addPort(port);
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddPortTypeCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddPortTypeCommand.java
deleted file mode 100644
index 5eb4d5a15..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddPortTypeCommand.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-
-
-public final class AddPortTypeCommand extends WSDLElementCommand
-{
-  private Definition definition;
-  private String localName;
-  private PortType portType;
-  
-  private boolean createOperation = false;
-  private final String DEFAULT_OPERATION_NAME = "NewOperation";
-
-  public AddPortTypeCommand
-		(Definition definition,  
-		 String localName)
-	{
-	  this.definition = definition;
-	  this.localName = localName;
-	}
-
-  public AddPortTypeCommand
-		(Definition definition, 
-		 String localName,
-		 boolean createOperation)
-	{
-	  this.definition = definition;
-	  this.localName = localName;
-	  this.createOperation = createOperation;
-	}
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.wsdl.ui.internal.commands.WSDLElementAction#getWSDLElement()
-   */
-  public WSDLElement getWSDLElement()
-  {
-    return portType;
-  }
-
-  public void run()
-  {
-    portType = WSDLFactory.eINSTANCE.createPortType();
-    portType.setQName(new QName(definition.getTargetNamespace(),localName));
-    portType.setEnclosingDefinition(definition);
-    definition.addPortType(portType);
-    
-    if (createOperation)
-    {
-      AddOperationCommand command = 
-        new AddOperationCommand(portType,DEFAULT_OPERATION_NAME,true,true,false);
-      command.run();
-    }
-  }
-  
-  public void setLocalName(String name)
-  {
-    localName = name;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddServiceCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddServiceCommand.java
deleted file mode 100644
index d9fed45f7..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddServiceCommand.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-
-
-public final class AddServiceCommand extends WSDLElementCommand
-{
-  private Definition definition;
-  private String localName;
-  private Service service;
-  
-  private boolean createPort = false;
-  private final String DEFAULT_PORT_NAME = "NewPort";
-
-  public AddServiceCommand
-		(Definition definition,  
-		 String localName)
-	{
-	  this.definition = definition;
-	  this.localName = localName;
-	}
-
-	public AddServiceCommand
-		(Definition definition, 
-		 String localName,
-		 boolean createPort)
-	{
-	  this.definition = definition;
-	  this.localName = localName;
-	  this.createPort = createPort;
-	}
-
-  public WSDLElement getWSDLElement()
-  {
-    return service;
-  }
-
-  public void run()
-  {
-    service = WSDLFactory.eINSTANCE.createService();
-    service.setQName(new QName(definition.getTargetNamespace(),localName));
-    service.setEnclosingDefinition(definition);
-    definition.addService(service);
-    
-    if (createPort)
-    {
-      AddPortCommand command = 
-        new AddPortCommand(service,DEFAULT_PORT_NAME);
-      command.run();
-    }
-  }
-  
-  public void setLocalName(String name)
-  {
-    localName = name;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddTypesCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddTypesCommand.java
deleted file mode 100644
index b568fd150..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddTypesCommand.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Types;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-
-// Definition must not have "types" element to run this command.
-public final class AddTypesCommand extends WSDLElementCommand
-{
-  private Definition definition;
-  private Types types;
-  
-  public AddTypesCommand(Definition definition)
-  {
-    this.definition = definition;
-  }
-
-  public void run()
-  {
-  	if ((types = definition.getETypes()) != null)
-      return; // "types" already exists.
-  	
-    types = WSDLFactory.eINSTANCE.createTypes();
-    types.setEnclosingDefinition(definition);
-    definition.setTypes(types);
-  }
-  
-  public WSDLElement getWSDLElement()
-  {
-    return types;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddUnknownExtensibilityElementCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddUnknownExtensibilityElementCommand.java
deleted file mode 100644
index ab3352dba..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddUnknownExtensibilityElementCommand.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsdl.ExtensibleElement;
-import org.eclipse.wst.wsdl.UnknownExtensibilityElement;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.internal.impl.UnknownExtensibilityElementImpl;
-
-public final class AddUnknownExtensibilityElementCommand extends WSDLElementCommand
-{
-  private ExtensibleElement extensibleElement;
-  private String namespaceURI;
-  private String localName;
-  private UnknownExtensibilityElement extensibilityElement;
-  private Map properties;
- 
-  public AddUnknownExtensibilityElementCommand
-    (ExtensibleElement extensibleElement, 
-     String namespaceURI,
-     String localName)
-  {
-    this.extensibleElement = extensibleElement;
-    this.namespaceURI = namespaceURI;
-    this.localName = localName;
-  }
-  
-  public AddUnknownExtensibilityElementCommand
-    (ExtensibleElement extensibleElement, 
-     String namespaceURI,
-     String localName,
-     Map properties)
-  {
-    this.extensibleElement = extensibleElement;
-    this.namespaceURI = namespaceURI;
-    this.localName = localName;
-    this.properties = properties;
-  }
-  
-  public WSDLElement getWSDLElement()
-  {
-    return extensibilityElement;
-  }
-
-  public void run()
-  {
-  	extensibilityElement = WSDLFactory.eINSTANCE.createUnknownExtensibilityElement();
-  	extensibilityElement.setElementType(new QName(namespaceURI,localName));
-  	
-    if (properties != null)
-    {
-      Iterator iterator = properties.entrySet().iterator();
-      Map.Entry entry = null;
-      while (iterator.hasNext())
-      {
-      	entry = (Map.Entry)iterator.next();
-      	String attribute = (String)entry.getKey();
-      	String value = (String)entry.getValue();      	
-      	((UnknownExtensibilityElementImpl)extensibilityElement).setAttribute(attribute,value);
-      }
-    }
-    
-  	extensibilityElement.setEnclosingDefinition(extensibleElement.getEnclosingDefinition());
-  	extensibleElement.addExtensibilityElement(extensibilityElement);
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddXSDElementDeclarationCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddXSDElementDeclarationCommand.java
deleted file mode 100644
index 5fce11ee8..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddXSDElementDeclarationCommand.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import java.util.Iterator;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Types;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDFactory;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-
-
-// This class is used to create a new XSDElementDeclaration in the targetNamespace.
-public final class AddXSDElementDeclarationCommand extends WSDLElementCommand
-{
-  private Definition definition;
-  private String targetNamespace;
-  private String elementName;
-  private XSDSchema schema;
-  private XSDElementDeclaration xsdElement;
-  
-  /**
-   * TODO:
-   * We have a potential problem here....  What if the definition targetnamespace is null....
-   */
-  public AddXSDElementDeclarationCommand(Definition definition, String elementName)
-  {
-    this.definition = definition;
-    this.targetNamespace = definition.getTargetNamespace();
-    this.elementName = elementName;
-  }
-  
-  /**
-   * @deprecated
-   * Use AddXSDElementDeclarationCommand(Definition definition, String typeName)
-   */
-  public AddXSDElementDeclarationCommand
-    (Definition definition, 
-     String targetNamespace, 
-     String elementName)
-  {
-    this.definition = definition;
-    this.targetNamespace = targetNamespace;
-    this.elementName = elementName;
-  }
-
-  public void run()
-  {
-    XSDSchema xsdSchema = getSchema();
-    XSDElementDeclaration elementDecl = 
-      XSDFactory.eINSTANCE.createXSDElementDeclaration();
-    elementDecl.setName(elementName);
-    
-    XSDSimpleTypeDefinition simpleTypeDefinition = getXSDStringType(xsdSchema);
-    elementDecl.setTypeDefinition(simpleTypeDefinition);    
-    xsdSchema.getContents().add(elementDecl);
-    
-    xsdElement = elementDecl;
-  }
-  
-  public void run(String newElementName) {
-  	elementName = newElementName;
-  	run();
-  }
-  
-  /*
-   * Specify which Schema to use when creating the Type.
-   * Call this method before calling run().  Otherwise it will use the first
-   * Schema it finds.
-   */
-  public void setSchema(XSDSchema schema) {
-  	this.schema = schema;
-  }
-  
-  /*
-   * Return the Schema used to create the Type
-   */
-  public XSDSchema getSchema() {
-  	if (schema == null) {
-  		return getXSDSchema(targetNamespace);
-  	}
-  	else {
-  		return schema;
-  	}
-  }
-  
-  private XSDSimpleTypeDefinition getXSDStringType(XSDSchema schema)
-  {
-    return schema.getSchemaForSchema().resolveSimpleTypeDefinition("string");
-  }
-  
-  private XSDSchema getXSDSchema(String targetNamespace)
-  {
-    XSDSchema xsdSchema;
-    
-    // Do we have a schema already?
-    Iterator iterator = getTypes().getSchemas(targetNamespace).iterator();
-    if (iterator.hasNext())
-    {
-      xsdSchema = (XSDSchema)iterator.next(); // Get the first one.
-      return xsdSchema;
-    }
-    else
-    {	    
-      // Create a new schema because there's none.
-      AddXSDSchemaCommand command = new AddXSDSchemaCommand(definition,targetNamespace);
-      command.run();
-      return ((XSDSchemaExtensibilityElement)command.getWSDLElement()).getSchema();
-    }
-  }
-  
-  private Types getTypes()
-  {
-    // Types is created if it does not exist yet.
-    Types types = (Types)definition.getTypes();
-    if (types != null)
-      return types;
-    else
-    {
-      AddTypesCommand command = new AddTypesCommand(definition);
-      command.run();
-      return (Types)command.getWSDLElement();
-    }
-  }
-  
-  public WSDLElement getWSDLElement()
-  {
-    return null;
-  }
-  
-  public XSDElementDeclaration getXSDElement()
-  {
-	  return xsdElement;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddXSDSchemaCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddXSDSchemaCommand.java
deleted file mode 100644
index 73bd1fdf8..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddXSDSchemaCommand.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Types;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.xsd.XSDFactory;
-import org.eclipse.xsd.XSDSchema;
-
-
-
-public final class AddXSDSchemaCommand extends WSDLElementCommand
-{
-  private Definition definition;
-  private XSDSchemaExtensibilityElement extensibilityElement;
-  private String targetNamespace;
-  
-  public AddXSDSchemaCommand(Definition definition)
-  {
-    this.definition = definition;
-    this.targetNamespace = definition.getTargetNamespace();
-  }
-  
-  public AddXSDSchemaCommand(Definition definition, String targetNamespace)
-  {
-    this.definition = definition;
-    this.targetNamespace = targetNamespace;
-  }
-  
-  public void run()
-  {    
-    extensibilityElement = WSDLFactory.eINSTANCE.createXSDSchemaExtensibilityElement();
-    extensibilityElement.setEnclosingDefinition(definition);
- 
-    XSDSchema xsdSchema = XSDFactory.eINSTANCE.createXSDSchema();
-    xsdSchema.setSchemaForSchemaQNamePrefix("xsd");
-    xsdSchema.setTargetNamespace(targetNamespace);
-    // Choose the prefix Choose the prefix used for this schema's namespace and the schema for schema's namespace.
-    //    
-    java.util.Map qNamePrefixToNamespaceMap = xsdSchema.getQNamePrefixToNamespaceMap();
-//    qNamePrefixToNamespaceMap.put("p", xsdSchema.getTargetNamespace());
-    qNamePrefixToNamespaceMap.put
-	  (xsdSchema.getSchemaForSchemaQNamePrefix(),org.eclipse.xsd.util.XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001);
-    extensibilityElement.setSchema(xsdSchema);
-       
-    // TBD - Check if multiple schemas with the same targetNamespace can co-exist.
-    Types types = getTypes();
-    types.addExtensibilityElement(extensibilityElement);
-  }
-
-  private Types getTypes()
-  {
-    // Types is created if it does not exist.
-    Types types = (Types)definition.getTypes();
-    if (types != null)
-      return types;
-    else
-    {
-      AddTypesCommand command = new AddTypesCommand(definition);
-      command.run();
-      return (Types)command.getWSDLElement();
-    }
-  }
-  
-  public WSDLElement getWSDLElement()
-  {
-    return extensibilityElement;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddXSDTypeDefinitionCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddXSDTypeDefinitionCommand.java
deleted file mode 100644
index e0ec076c1..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddXSDTypeDefinitionCommand.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import java.util.Iterator;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Types;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.xsd.XSDFactory;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDTypeDefinition;
-
-// This class is used to create a new XSDTypeDefinition in the targetNamespace.
-public final class AddXSDTypeDefinitionCommand extends WSDLElementCommand
-{
-  private Definition definition;
-  private String targetNamespace;
-  private String typeName;
-  private XSDSchema schema;
-  private XSDTypeDefinition xsdType;
-  private boolean isComplexType = true;
-  
-  /**
-   * TODO:
-   * We have a potential problem here....  What if the definition targetnamespace is null....
-   */
-  public AddXSDTypeDefinitionCommand(Definition definition, String typeName)
-  {
-    this.definition = definition;
-    this.targetNamespace = definition.getTargetNamespace();
-    this.typeName = typeName;
-  }
-  
-  public AddXSDTypeDefinitionCommand(Definition definition, String typeName, boolean isComplexType)
-  {
-  	this(definition, typeName);
-  	this.isComplexType = isComplexType;
-  }
-  
-  /**
-   * @deprecated
-   * Use AddXSDTypeDefinitionCommand(Definition definition, String typeName)
-   */
-  public AddXSDTypeDefinitionCommand
-    (Definition definition, 
-     String targetNamespace,
-     String typeName)
-  {
-    this.definition = definition;
-    this.targetNamespace = targetNamespace;
-    this.typeName = typeName;
-  }
-  
-  public void run()
-  {
-    XSDSchema xsdSchema = getSchema();
-    XSDTypeDefinition typeDef;
-    
-    if (isComplexType) {
-    	typeDef = XSDFactory.eINSTANCE.createXSDComplexTypeDefinition();
-    }
-    else {
-    	typeDef = XSDFactory.eINSTANCE.createXSDSimpleTypeDefinition();
-    }
-    
-    typeDef.setName(typeName);
-    xsdSchema.getContents().add(typeDef);
-    
-    xsdType = typeDef;
-  }
-  
-  public void run(String newTypeName) {
-  	typeName = newTypeName;
-  	run();
-  }
-  
-  /*
-   * Specifiy if we should create a complex or simple type.  This should should be
-   * called before run().
-   * Overrides the value set when the constructor
-   * AddXSDTypeDefinitionCommand(Definition definition, String typeName, boolean isComplexType)
-   * is used.
-   */
-  public void isComplexType(boolean isComplexType) {
-  	this.isComplexType = isComplexType;
-  }
-  
-  /*
-   * Specify which Schema to use when creating the Type.
-   * Call this method before calling run().  Otherwise it will use the first
-   * Schema it finds.
-   */
-  public void setSchema(XSDSchema schema) {
-  	this.schema = schema;
-  }
-  
-  /*
-   * Return the Schema used to create the Type
-   */
-  public XSDSchema getSchema() {
-  	if (schema == null) {
-  		return getXSDSchema(targetNamespace);
-  	}
-  	else {
-  		return schema;
-  	}
-  }
-
-  private XSDSchema getXSDSchema(String targetNamespace)
-  {
-    XSDSchema xsdSchema;
-    
-    // Do we have a schema already?
-    Iterator iterator = getTypes().getSchemas(targetNamespace).iterator();
-    if (iterator.hasNext())
-    {
-      xsdSchema = (XSDSchema)iterator.next(); // Get the first one.
-      return xsdSchema;
-    }
-    else
-    {	    
-      // Create a new schema because there's none.
-      AddXSDSchemaCommand command = new AddXSDSchemaCommand(definition,targetNamespace);
-      command.run();
-      return ((XSDSchemaExtensibilityElement)command.getWSDLElement()).getSchema();
-    }
-  }
-  
-  private Types getTypes()
-  {
-    // Types is created if it does not exist yet.
-    Types types = (Types)definition.getTypes();
-    if (types != null)
-      return types;
-    else
-    {
-      AddTypesCommand command = new AddTypesCommand(definition);
-      command.run();
-      return (Types)command.getWSDLElement();
-    }
-  }
-  
-  public WSDLElement getWSDLElement()
-  {
-    return null;
-  }
-  
-  public XSDTypeDefinition getXSDElement()
-  {
-	  return xsdType;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/WSDLElementCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/WSDLElementCommand.java
deleted file mode 100644
index 3fc9c24b9..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/WSDLElementCommand.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import org.eclipse.wst.wsdl.WSDLElement;
-
-public abstract class WSDLElementCommand
-{
-  public abstract WSDLElement getWSDLElement();
-  public abstract void run();
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ContentGenerator.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ContentGenerator.java
deleted file mode 100644
index ff3bfc750..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ContentGenerator.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.contentgenerator;  
-        
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.w3c.dom.Element;
-
-
-
-public interface ContentGenerator
-{        
-	
-  public static String ADDRESS_LOCATION = "http://tempuri.org/";  
-  public void init(Definition definition, Object generator, Object[] options);
-
-  public String[] getRequiredNamespaces();
-  
-  public String[] getPreferredNamespacePrefixes();
-
-  // generates the 'address' extensiblity element for a port
-  //
-  public void generatePortContent(Element portElement, Port port);
- 
-  public void generateBindingContent(Element bindingElement, PortType portType);
-
-  public void generateBindingOperationContent(Element bindingOperationElement, Operation operation);
- 
-  public void generateBindingInputContent(Element bindingInputElement, Input input);    
-
-  public void generateBindingOutputContent(Element bindingOutputElement, Output output);
-
-  public void generateBindingFaultContent(Element bindingFaultElement, Fault fault);
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/HttpContentGenerator.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/HttpContentGenerator.java
deleted file mode 100644
index 3599cef78..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/HttpContentGenerator.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.contentgenerator;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.w3c.dom.Element;
-
-
-public class HttpContentGenerator implements ContentGenerator
-{
-  protected Definition definition;
-  protected boolean isPost;
-  protected String addressLocation = ContentGenerator.ADDRESS_LOCATION;
-
-  protected final static String[] requiredNamespaces = { "http://schemas.xmlsoap.org/wsdl/mime/", "http://schemas.xmlsoap.org/wsdl/http/" };
-  protected final static String[] preferredNamespacePrefixes = { "mime", "http" };
-
-  public void init(Definition definition, Object generator, Object[] options)
-  {
-    this.definition = definition;
-
-    if (options != null)
-    {
-      if (options.length > 0 && options[0] != null)
-      {
-        Boolean isPostOption = (Boolean) options[0];
-        isPost = isPostOption.booleanValue();
-      }
-      if (options.length > 1 && options[1] != null)
-      {
-        addressLocation = (String) options[1];
-      }
-    }
-  }
-
-  public String[] getRequiredNamespaces()
-  {
-    return requiredNamespaces;
-  }
-
-  public String[] getPreferredNamespacePrefixes()
-  {
-    return preferredNamespacePrefixes;
-  }
-
-  public void generatePortContent(Element portElement, Port port)
-  {
-    Element element = createElement(portElement, "http", "address");
-    element.setAttribute("location", addressLocation);
-  }
-
-  public void generateBindingContent(Element bindingElement, PortType portType)
-  {
-    Element element = createElement(bindingElement, "http", "binding");
-    element.setAttribute("verb", isPost ? "POST" : "GET");
-  }
-
-  public void generateBindingOperationContent(Element bindingOperationElement, Operation operation)
-  {
-    Element element = createElement(bindingOperationElement, "http", "operation");
-    element.setAttribute("location", "/" + operation.getName());
-  }
-
-  public void generateBindingInputContent(Element bindingInputElement, Input input)
-  {
-    if (isPost)
-    {
-      Element element = createElement(bindingInputElement, "mime", "content");
-      element.setAttribute("type", "application/x-www-form-urlencoded");
-    }
-    else
-    {
-      createElement(bindingInputElement, "http", "urlEncoded");
-    }
-  }
-
-  public void generateBindingOutputContent(Element bindingOutputElement, Output output)
-  {
-    Element element = createElement(bindingOutputElement, "mime", "content");
-    element.setAttribute("type", "text/xml");
-  }
-
-  public void generateBindingFaultContent(Element bindingFaultElement, Fault fault)
-  {
-    //TODO!!
-  }
-
-  protected Element createElement(Element parentElement, String prefix, String elementName)
-  {
-    String name = prefix != null ? (prefix + ":" + elementName) : elementName;
-    Element result = parentElement.getOwnerDocument().createElement(name);
-    parentElement.appendChild(result);
-    return result;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/SoapContentGenerator.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/SoapContentGenerator.java
deleted file mode 100644
index d928c338a..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/SoapContentGenerator.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.contentgenerator;  
-        
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.w3c.dom.Element;
-
-
-public class SoapContentGenerator implements ContentGenerator
-{ 
-  private final int DOCUMENT_LITERAL = 1;
-  private final int RPC_LITERAL      = 2;
-  private final int RPC_ENCODED      = 3;
-
-  protected int bindingOption = DOCUMENT_LITERAL;
-  protected String namespaceValue = "";
-  protected String addressLocation = ContentGenerator.ADDRESS_LOCATION;                   
-  protected Definition definition;                                    
-
-  protected final static String[] requiredNamespaces = {"http://schemas.xmlsoap.org/wsdl/soap/"};
-  protected final static String[] preferredNamespacePrefixes = {"soap"};
-
-
-  public void init(Definition definition, Object generator, Object[] options)
-  {              
-    this.definition = definition;
-                       
-    if (options != null)
-    {
-      bindingOption = computeBindingOption(options);
-
-      if (options.length > 1 && options[1] != null)
-      {
-      	addressLocation = (String)options[1];
-      }  
-    }
-    if (definition.getTargetNamespace() != null)
-    {
-      namespaceValue = definition.getTargetNamespace();
-    } 
-  }
-  
-  private int computeBindingOption(Object[] options) {
-  	int option = DOCUMENT_LITERAL;
-    if (options.length > 0 && options[0] != null)
-    {
-		boolean isDocumentLiteralOption = ((Boolean)options[0]).booleanValue();
-		if (isDocumentLiteralOption)
-			option =  DOCUMENT_LITERAL;
-		else
-			option = RPC_ENCODED;		
-		
-    	if (options.length >= 3 && options[2] != null) {
-    		// Extra info sent in
-    		if (((Boolean)options[2]).booleanValue())
-    			option = RPC_LITERAL;
-    	}
-    }
-
-    return option;
-  }
-     
-  public String[] getRequiredNamespaces()
-  {
-    return requiredNamespaces;
-  }
-  
-  public String[] getPreferredNamespacePrefixes()
-  {
-    return preferredNamespacePrefixes;
-  }  
-
-  public void generatePortContent(Element portElement, Port port)
-  {
-    Element element = createElement(portElement, "soap", "address");
-    element.setAttribute("location", addressLocation);     
-  }  
-
-  public void generateBindingContent(Element bindingElement, PortType portType)
-  {
-    Element element = createElement(bindingElement, "soap", "binding");
-    element.setAttribute("style", (bindingOption == DOCUMENT_LITERAL) ? "document" : "rpc"); 
-    element.setAttribute("transport", "http://schemas.xmlsoap.org/soap/http");
-  }
-
-  public void generateBindingOperationContent(Element bindingOperationElement, Operation operation)
-  {
-    Element element = createElement(bindingOperationElement, "soap", "operation");
-    
-    String soapActionValue = namespaceValue;                                        
-    if (!soapActionValue.endsWith("/"))
-    {                
-      soapActionValue += "/";
-    }                        
-    soapActionValue += operation.getName();
-    element.setAttribute("soapAction", soapActionValue);
-  }  
-
-  public void generateBindingInputContent(Element bindingInputElement, Input input)
-  {
-    generateSoapBody(bindingInputElement);
-  }
-
-  public void generateBindingOutputContent(Element bindingOutputElement, Output output)
-  {
-    generateSoapBody(bindingOutputElement);
-  }         
-
-  public void generateBindingFaultContent(Element bindingFaultElement, Fault fault)
-  {                              
-    Element element = createElement(bindingFaultElement, "soap", "fault");      
-    element.setAttribute("name", fault.getName()); 
-    element.setAttribute("use", (bindingOption == RPC_ENCODED) ? "encoded" : "literal");
-    if (bindingOption == RPC_ENCODED)
-    {
-      element.setAttribute("encodingStyle", "http://schemas.xmlsoap.org/soap/encoding/");
-      element.setAttribute("namespace", namespaceValue);
-    }
-    else if (bindingOption == RPC_LITERAL) {
-        element.setAttribute("namespace", namespaceValue);
-    }
-  }  
-
-  protected void generateSoapBody(Element parentElement)
-  {
-    Element element = createElement(parentElement, "soap", "body");      
-    element.setAttribute("use", (bindingOption == RPC_ENCODED) ? "encoded" : "literal"); 
-    if (bindingOption == RPC_ENCODED)
-    {
-      element.setAttribute("encodingStyle", "http://schemas.xmlsoap.org/soap/encoding/");
-      element.setAttribute("namespace", namespaceValue);
-    }
-    else if (bindingOption == RPC_LITERAL) {
-    	element.setAttribute("namespace", namespaceValue);
-    }
-  }
-
-  protected Element createElement(Element parentElement, String prefix, String elementName)
-  {                                         
-    String name = prefix != null ? (prefix + ":" + elementName) : elementName;
-    Element result = parentElement.getOwnerDocument().createElement(name);
-    parentElement.appendChild(result);
-    return result;
-  }
-} 
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/ContentGeneratorOptionsPage.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/ContentGeneratorOptionsPage.java
deleted file mode 100644
index bca40e98d..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/ContentGeneratorOptionsPage.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.contentgenerator.ui;  
-        
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.wsdl.internal.generator.BaseGenerator;
-
-public interface ContentGeneratorOptionsPage
-{                                          
-  public void init(BaseGenerator baseGenerator);             
-  public Composite createControl(Composite parent);
-  public Composite getControl();
-  
-  // TODO can this go into init?
-  //
-  public void setOptionsOnGenerator();
-  public boolean isOverwriteApplicable();
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/HttpBindingOptionsPage.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/HttpBindingOptionsPage.java
deleted file mode 100644
index 1e355e35d..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/HttpBindingOptionsPage.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.contentgenerator.ui;
-
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.binding.http.internal.generator.HTTPContentGenerator;
-import org.eclipse.wst.wsdl.internal.generator.BaseGenerator;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.w3c.dom.Element;
-
-
-public class HttpBindingOptionsPage implements ContentGeneratorOptionsPage, SelectionListener
-{
-  protected Button getButton;
-  protected Button postButton;
-  protected Composite control;
-  protected BaseGenerator generator;
-  protected HTTPContentGenerator httpGenerator;
-
-  public HttpBindingOptionsPage()
-  {
-  }
-
-  public void init(BaseGenerator generator)
-  {
-    this.generator = generator;
-	if (generator.getContentGenerator() instanceof HTTPContentGenerator) {
-		httpGenerator = (HTTPContentGenerator) generator.getContentGenerator();
-	}
-  }
-
-  public Composite createControl(Composite parent)
-  {
-    control = new Composite(parent, SWT.NONE);
-    GridLayout layout = new GridLayout();
-    layout.marginWidth = 0;
-    control.setLayout(layout);
-
-    Label separator = new Label(control, SWT.SEPARATOR | SWT.HORIZONTAL);
-    GridData gd= new GridData();
-    gd.horizontalAlignment= GridData.FILL;
-    gd.grabExcessHorizontalSpace= true;
-   
-    separator.setLayoutData(gd);
-
-    Label optionsHeading = new Label(control, SWT.NONE);
-    optionsHeading.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_HTTP_BINDING_OPTIONS"));
-
-    getButton = new Button(control, SWT.RADIO);
-    getButton.setText("HTTP GET");
-    getButton.setSelection(true);
-
-    postButton = new Button(control, SWT.RADIO);
-    postButton.setText("HTTP POST");
-
-    if (generator.getName() != null)
-    {
-      Definition definition = generator.getDefinition();
-      QName qname = new QName(definition.getTargetNamespace(), generator.getName());
-      Binding binding = (Binding) definition.getBinding(qname);
-      if (binding != null)
-      {
-        List eeList = binding.getEExtensibilityElements();
-        if (eeList.size() > 0)
-        {
-          ExtensibilityElement ee = (ExtensibilityElement) eeList.get(0);
-          Element element = WSDLEditorUtil.getInstance().getElementForObject(ee);
-          String verb = element.getAttribute("verb");
-          if ("POST".equals(verb))
-          {
-            getButton.setSelection(false);
-            postButton.setSelection(true);
-          }
-        }
-      }
-    }
-
-    postButton.addSelectionListener(this);
-    getButton.addSelectionListener(this);
-	computeOptions();
-	
-    return control;
-  }
-  
-  public Composite getControl() {
-	  return control;
-  }
-  
-  public boolean isOverwriteApplicable()
-  {
-  	return true;
-  }  
-
-  public void widgetSelected(SelectionEvent event)
-  {
-	computeOptions();
-  }
-
-  protected void computeOptions()
-  {
-	  if (generator.getContentGenerator() instanceof HTTPContentGenerator) {
-		  HTTPContentGenerator httpGenerator = (HTTPContentGenerator) generator.getContentGenerator();
-
-		  if (postButton.getSelection()) {
-			  httpGenerator.setVerb(HTTPContentGenerator.VERB_POST);
-		  }	  
-		  else if (getButton.getSelection()) {
-			  httpGenerator.setVerb(HTTPContentGenerator.VERB_GET);
-		  }
-	  }
-  }
-  
-  public void setOptionsOnGenerator() {
-	  computeOptions();
-  }
-
-  public void widgetDefaultSelected(SelectionEvent event)
-  {
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/HttpPortOptionsPage.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/HttpPortOptionsPage.java
deleted file mode 100644
index 28ea27ac4..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/HttpPortOptionsPage.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.contentgenerator.ui;
-
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.wsdl.binding.http.internal.generator.HTTPContentGenerator;
-import org.eclipse.wst.wsdl.internal.generator.BaseGenerator;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-
-public class HttpPortOptionsPage implements ContentGeneratorOptionsPage, ModifyListener
-{
-  protected Text addressField;
-  protected Composite control;
-  protected BaseGenerator generator;
-
-  public HttpPortOptionsPage()
-  {
-  }
-
-  public void init(BaseGenerator generator)
-  {
-    this.generator = generator;
-  }
-
-  public Composite createControl(Composite parent)
-  {
-    control = new Composite(parent, SWT.NONE);
-    GridLayout layout = new GridLayout();
-    layout.marginWidth = 0;
-    control.setLayout(layout);
-    control.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-    Label separator = new Label(control, SWT.SEPARATOR | SWT.HORIZONTAL);
-    GridData gd= new GridData();
-    gd.horizontalAlignment= GridData.FILL;
-    gd.grabExcessHorizontalSpace= true;
-    separator.setLayoutData(gd);
-
-    Label optionsHeading = new Label(control, SWT.NONE);
-    optionsHeading.setText(WSDLEditorPlugin.getWSDLString("_UI_HTTP_PORT_DETAILS"));
-
-    Composite nameValueGroup = new Composite(control, SWT.NONE);
-    nameValueGroup.setLayoutData(new GridData(GridData.FILL_BOTH));
-    GridLayout layout2 = new GridLayout(2, false);
-    layout2.marginWidth = 0;
-    nameValueGroup.setLayout(layout2);
-
-    Label addressLabel = new Label(nameValueGroup, SWT.NONE);
-    addressLabel.setText(WSDLEditorPlugin.getWSDLString("_UI_LOCATION") + " ");
-    addressField = new Text(nameValueGroup, SWT.BORDER);
-    addressField.setText("http://example.com/");
-    addressField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-    addressField.addModifyListener(this);
-
-    return control;
-  }
-
-  public boolean isOverwriteApplicable()
-  {
-    return false;
-  }
-
-  public void modifyText(ModifyEvent e)
-  {
-	  computeOptions();
-  }
-  
-  private void computeOptions() {
-	if (generator.getContentGenerator() instanceof HTTPContentGenerator) {
-		((HTTPContentGenerator) generator.getContentGenerator()).setAddressLocation(addressField.getText());
-	}
-  }
-
-  public void setOptionsOnGenerator() {
-	  computeOptions();
-  }
-  
-  public Composite getControl() {
-	  return control;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/SoapBindingOptionsPage.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/SoapBindingOptionsPage.java
deleted file mode 100644
index a9e32d253..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/SoapBindingOptionsPage.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.contentgenerator.ui;
-
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.binding.soap.internal.generator.SOAPContentGenerator;
-import org.eclipse.wst.wsdl.internal.generator.BaseGenerator;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.w3c.dom.Element;
-
-
-public class SoapBindingOptionsPage implements ContentGeneratorOptionsPage, SelectionListener
-{
-  protected Button docLiteral;
-  protected Button rpcLiteral;
-  protected Button rpcEncoded;
-  protected Composite control;
-  protected BaseGenerator generator;
-
-  public SoapBindingOptionsPage()
-  {
-  }
-
-  public void init(BaseGenerator generator)
-  {
-    this.generator = generator;
-  }
-
-  public Composite createControl(Composite parent)
-  {
-    control = new Composite(parent, SWT.NONE);
-    GridLayout layout = new GridLayout();
-    layout.marginWidth = 0;
-    control.setLayout(layout);
-
-    Label separator = new Label(control, SWT.SEPARATOR | SWT.HORIZONTAL);
-    GridData gd= new GridData();
-    gd.horizontalAlignment= GridData.FILL;
-    gd.grabExcessHorizontalSpace= true;
-    separator.setLayoutData(gd);
-
-    Label optionsHeading = new Label(control, SWT.NONE);
-    optionsHeading.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_SOAP_BINDING_OPTIONS"));
-
-    docLiteral = new Button(control, SWT.RADIO);
-    docLiteral.setText(WSDLEditorPlugin.getWSDLString("_UI_RADIO_DOCUMENT_LITERAL"));
-    docLiteral.setSelection(true);
-
-    rpcLiteral = new Button(control, SWT.RADIO);
-    rpcLiteral.setText(WSDLEditorPlugin.getWSDLString("_UI_RADIO_RPC_LITERAL"));
-    
-    rpcEncoded = new Button(control, SWT.RADIO);
-    rpcEncoded.setText(WSDLEditorPlugin.getWSDLString("_UI_RADIO_RPC_ENCODED"));
-
-    if (generator.getName() != null)
-    {
-      Definition definition = generator.getDefinition();
-      QName qname = new QName(definition.getTargetNamespace(), generator.getName());
-      Binding binding = (Binding) definition.getBinding(qname);
-
-      if (binding != null)
-      {
-        List eeList = binding.getEExtensibilityElements();
-        if (eeList.size() > 0)
-        {
-          ExtensibilityElement ee = (ExtensibilityElement) eeList.get(0);
-
-          Element element = WSDLEditorUtil.getInstance().getElementForObject(ee);
-          String style = element.getAttribute("style");
-          
-          if ("rpc".equals(style))
-          {
-            // Try to determine if it's RPC Literal or RPC Encoded
-          	String use = "encoded";
-          	List operations = binding.getEBindingOperations();
-          	if (operations.size() > 0) {
-          		element = null;
-          		BindingOperation operation = (BindingOperation) operations.get(0);
-          		if (operation.getEBindingInput() != null && operation.getEBindingInput().getEExtensibilityElements().size() > 0) {
-          			Object object = operation.getEBindingInput().getEExtensibilityElements().get(0);
-          			element = WSDLEditorUtil.getInstance().getElementForObject(object);
-          		}
-          		else if (operation.getEBindingOutput() != null && operation.getEBindingOutput().getEExtensibilityElements().size() > 0) {
-          			Object object = operation.getEBindingOutput().getEExtensibilityElements().get(0);
-          			element = WSDLEditorUtil.getInstance().getElementForObject(object);
-          		}
-          		else if (operation.getEBindingFaults().size() > 0) {
-          			BindingFault fault = (BindingFault) operation.getEBindingFaults().get(0);
-          			List faultEE = fault.getExtensibilityElements();
-          			
-          			if (faultEE.size() > 0) {
-          				element = WSDLEditorUtil.getInstance().getElementForObject(faultEE.get(0));
-          			}
-          		}
-          		
-          		if (element != null) {
-          			use = element.getAttribute("use");
-          		}
-          	}
-          	
-          	if (use != null && "literal".equals(use)) {
-          		docLiteral.setSelection(false);
-          		rpcLiteral.setSelection(true);
-          		rpcEncoded.setSelection(false);
-          	}
-          	else {          	
-          		docLiteral.setSelection(false);
-          		rpcLiteral.setSelection(false);
-          		rpcEncoded.setSelection(true);
-          	}
-          }
-        }
-      }
-    }
-
-    docLiteral.addSelectionListener(this);
-    rpcLiteral.addSelectionListener(this);
-    rpcEncoded.addSelectionListener(this);
-    computeOptions();
-
-    return control;
-  }
-
-  public Composite getControl() {
-	  return control;
-  }
-  
-  public boolean isOverwriteApplicable()
-  {
-    return true;
-  }
-
-  public void widgetSelected(SelectionEvent event)
-  {
-    computeOptions();
-  }
-
-  protected void computeOptions()
-  {
-	  if (generator.getContentGenerator() instanceof SOAPContentGenerator) {
-		  SOAPContentGenerator soapGenerator = (SOAPContentGenerator) generator.getContentGenerator();
-		  if (docLiteral.getSelection()) {
-			  soapGenerator.setStyle(SOAPContentGenerator.STYLE_DOCUMENT);
-			  soapGenerator.setUse(SOAPContentGenerator.USE_LITERAL);
-		  }	  
-		  else if (rpcLiteral.getSelection()) {
-			  soapGenerator.setStyle(SOAPContentGenerator.STYLE_RPC);
-			  soapGenerator.setUse(SOAPContentGenerator.USE_LITERAL);
-		  }
-		  else if (rpcEncoded.getSelection()) {
-			  soapGenerator.setStyle(SOAPContentGenerator.STYLE_RPC);
-			  soapGenerator.setUse(SOAPContentGenerator.USE_ENCODED);
-		  }
-	  }
-  }
-  
-  public void setOptionsOnGenerator() {
-	  computeOptions();
-  }
-
-  public void widgetDefaultSelected(SelectionEvent event)
-  {
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/SoapPortOptionsPage.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/SoapPortOptionsPage.java
deleted file mode 100644
index 137394f27..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/SoapPortOptionsPage.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.contentgenerator.ui;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.wsdl.binding.soap.internal.generator.SOAPContentGenerator;
-import org.eclipse.wst.wsdl.internal.generator.BaseGenerator;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-
-public class SoapPortOptionsPage implements ContentGeneratorOptionsPage, ModifyListener
-{
-  protected Text addressField;
-  protected Composite control;
-  protected BaseGenerator generator;
-
-  public SoapPortOptionsPage()
-  {
-  }
-
-  public void init(BaseGenerator generator)
-  {
-    this.generator = generator;
-  }
-
-  public Composite createControl(Composite parent)
-  {
-    control = new Composite(parent, SWT.NONE);
-    GridLayout layout = new GridLayout();
-    layout.marginWidth = 0;
-    control.setLayout(layout);
-    control.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-    Label separator = new Label(control, SWT.SEPARATOR | SWT.HORIZONTAL);
-    GridData gd= new GridData();
-    gd.horizontalAlignment= GridData.FILL;
-    gd.grabExcessHorizontalSpace= true;
-    separator.setLayoutData(gd);
-
-    Label optionsHeading = new Label(control, SWT.NONE);
-    optionsHeading.setText(WSDLEditorPlugin.getWSDLString("_UI_SOAP_PORT_DETAILS"));
-
-    Composite nameValueGroup = new Composite(control, SWT.NONE);
-    nameValueGroup.setLayoutData(new GridData(GridData.FILL_BOTH));
-    GridLayout layout2 = new GridLayout(2, false);
-    layout2.marginWidth = 0;
-    nameValueGroup.setLayout(layout2);
-
-    Label addressLabel = new Label(nameValueGroup, SWT.NONE);
-    addressLabel.setText(WSDLEditorPlugin.getWSDLString("_UI_LOCATION") + " ");
-    addressField = new Text(nameValueGroup, SWT.BORDER);
-    addressField.setText("http://example.com/");
-    addressField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-    addressField.addModifyListener(this);
-
-    return control;
-  }
-
-  public boolean isOverwriteApplicable()
-  {
-    return false;
-  }
-
-  public void modifyText(ModifyEvent e)
-  {
-	  computeOptions();
-  }
-  
-  private void computeOptions() {
-	if (generator.getContentGenerator() instanceof SOAPContentGenerator) {
-		((SOAPContentGenerator) generator.getContentGenerator()).setAddressLocation(addressField.getText());
-	}
-  }
-  
-  public void setOptionsOnGenerator() {
-	  computeOptions();
-  }
-  
-  public Composite getControl() {
-	  return control;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/GenerateBindingOnSaveDialog.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/GenerateBindingOnSaveDialog.java
deleted file mode 100644
index 23634b902..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/GenerateBindingOnSaveDialog.java
+++ /dev/null
@@ -1,98 +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 Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.dialogs;
-
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-public class GenerateBindingOnSaveDialog extends MessageDialog implements SelectionListener {
-	private static String dialogTitle = "Regenerate Bindings On Save";		// TODO: Translations needed....
-	private static String dialogMessage = "Regenerate Bindings On Save?";
-	private static String[] buttons = new String[]{"Yes", "No", "Cancel"};
-	
-	private Button rememberDecisionBox;
-	private boolean rememberDecision = false;
-	
-	public GenerateBindingOnSaveDialog(Shell shell) {
-		super(shell, dialogTitle, null, dialogMessage, MessageDialog.QUESTION, buttons, 0);
-	}
-	
-	
-	protected Control createCustomArea(Composite parent) {
-		Composite comp = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		comp.setLayout(layout);
-		comp.setData(new GridData());
-		
-		// Spacer
-		new Label(comp, SWT.NONE);
-		new Label(comp, SWT.NONE);
-		
-		rememberDecisionBox = new Button(comp, SWT.CHECK);
-		rememberDecisionBox.setText("Remember my decision");	// TODO: Externalize...
-		rememberDecisionBox.addSelectionListener(this);
-
-		return parent;
-	}
-	
-	private void storePromptPreference(int swtValue) {
-		// Store the new preference for displaying this dialog.
-		if (rememberDecision) {
-			WSDLEditorPlugin.getInstance().getPluginPreferences().setValue("Prompt Regenerate Binding on save", false);
-		
-			String generateID = WSDLEditorPlugin.getWSDLString("_UI_PREF_PAGE_AUTO_REGENERATE_BINDING");
-			if (swtValue == SWT.YES) {
-				WSDLEditorPlugin.getInstance().getPluginPreferences().setValue(generateID, true);
-			}
-			else if (swtValue == SWT.NO) {
-				WSDLEditorPlugin.getInstance().getPluginPreferences().setValue(generateID, false);
-			}
-		}
-	}
-	
-	public int open() {
-		int rValue = super.open();
-		
-		if (rValue ==0) {
-			storePromptPreference(SWT.YES);
-			return SWT.YES;
-		}
-		else if (rValue == 1) {
-			storePromptPreference(SWT.NO);
-			return SWT.NO;
-		}
-		else if (rValue == 2) {
-			storePromptPreference(SWT.CANCEL);
-			return SWT.CANCEL;
-		}
-		
-		return rValue;
-	}
-	
-	public void widgetSelected(SelectionEvent e) {
-		if (e.widget == rememberDecisionBox) {
-			rememberDecision = rememberDecisionBox.getSelection();
-		}
-	}
-	
-	public void widgetDefaultSelected(SelectionEvent e) {}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/ImportAddResourceListener.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/ImportAddResourceListener.java
deleted file mode 100644
index b696cad54..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/ImportAddResourceListener.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.dialogs;
-
-import java.util.Collection;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-
-public class ImportAddResourceListener implements IResourceChangeListener, IResourceDeltaVisitor
-{
-  Vector importedFiles;
-
-  ImportAddResourceListener()
-  {
-    importedFiles = new Vector(); 
-  }
-  
-  public void resourceChanged(IResourceChangeEvent event)
-  {
-    IResourceDelta resourceDelta = event.getDelta();
-    
-    try
-    {
-      if (resourceDelta != null) 
-      {
-        resourceDelta.accept(this);
-      }
-    }
-    catch (Exception e)
-    {
-//      B2BGUIPlugin.getPlugin().getMsgLogger().write("Exception caught during resource change" + e);
-//      B2BGUIPlugin.getPlugin().getMsgLogger().writeCurrentThread(); 
-    }      
-  }
-
-  public boolean visit(IResourceDelta delta)
-  {
-    if (delta.getKind() == IResourceDelta.ADDED)
-    {
-      if (delta.getResource() instanceof IFile) 
-        importedFiles.add(delta.getResource());
-    }
-    return true;
-  }
-
-  public Collection getImportedFiles()
-  {
-    return importedFiles;
-  }
-    
-  // This returns the first imported file in the list of imported files
-  public IFile getImportedFile()
-  {
-    if (importedFiles.isEmpty() == false) 
-      return (IFile)importedFiles.firstElement();
-  
-    return null;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/InvokeSetDialog.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/InvokeSetDialog.java
deleted file mode 100644
index ba1e63027..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/InvokeSetDialog.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.dialogs;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.dialogs.types.WSDLComponentSelectionDialog;
-import org.eclipse.wst.wsdl.ui.internal.dialogs.types.WSDLComponentSelectionProvider;
-import org.eclipse.wst.wsdl.ui.internal.dialogs.types.WSDLSetComponentHelper;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-
-public class InvokeSetDialog
-{
-  String kind;
-  String newValue = "";
-  
-  public void setReferenceKind(String kind)
-  {
-    this.kind = kind;
-  }
-  
-  public String getValue()
-  {
-    return newValue; 
-  }
-  
-  public void run(Object input, IEditorPart editorPart)
-  {
-      WSDLComponentSelectionDialog dialog = null;
-      Shell shell = Display.getCurrent().getActiveShell();
-      IFile iFile = ((IFileEditorInput) editorPart.getEditorInput()).getFile();
-      Definition definition = ((WSDLElement) input).getEnclosingDefinition();
-      String property = "";
-      
-    if (input instanceof Binding)
-    {
-        String dialogTitle = WSDLEditorPlugin.getWSDLString("_UI_TITLE_SPECIFY_PORTTYPE");
-        
-        WSDLComponentSelectionProvider provider = new WSDLComponentSelectionProvider(iFile, definition, WSDLConstants.PORT_TYPE);
-        dialog = new WSDLComponentSelectionDialog(shell, dialogTitle, provider);
-        provider.setDialog(dialog);
-        property = "type";
-    }
-    else if (input instanceof Port)
-    {
-        String dialogTitle = WSDLEditorPlugin.getWSDLString("_UI_TITLE_SPECIFY_BINDING");
-        
-        WSDLComponentSelectionProvider provider = new WSDLComponentSelectionProvider(iFile, definition, WSDLConstants.BINDING);
-        dialog = new WSDLComponentSelectionDialog(shell, dialogTitle, provider);
-        provider.setDialog(dialog);
-        property = "binding";
-    }
-    else if (input instanceof Part)
-    {
-        List validExtensions = new ArrayList(2);
-        validExtensions.add("wsdl");
-        validExtensions.add("xsd");
-        WSDLComponentSelectionProvider provider = null;
-        if (kind.equalsIgnoreCase("type")) {
-            property = ""; 
-            String dialogTitle = WSDLEditorPlugin.getWSDLString("_UI_TITLE_SPECIFY_TYPE");
-            
-            provider = new WSDLComponentSelectionProvider(iFile, definition, WSDLEditorUtil.TYPE, validExtensions);
-            dialog = new WSDLComponentSelectionDialog(shell, dialogTitle, provider);
-        }
-        else {
-            property = ""; 
-            String dialogTitle = WSDLEditorPlugin.getWSDLString("_UI_TITLE_SPECIFY_ELEMENT");
-            
-            provider = new WSDLComponentSelectionProvider(iFile, definition, WSDLEditorUtil.ELEMENT, validExtensions);
-            dialog = new WSDLComponentSelectionDialog(shell, dialogTitle, provider);
-        }
-        provider.setDialog(dialog);
-    }
-    else if (input instanceof Input || input instanceof Output || input instanceof Fault)
-    {
-        String dialogTitle = WSDLEditorPlugin.getWSDLString("_UI_TITLE_SPECIFY_MESSAGE");
-
-        WSDLComponentSelectionProvider provider = new WSDLComponentSelectionProvider(iFile, definition, WSDLConstants.MESSAGE);
-        dialog = new WSDLComponentSelectionDialog(shell, dialogTitle, provider);   
-        provider.setDialog(dialog);
-        property = "message";
-    }
-
-    dialog.setBlockOnOpen(true);
-    dialog.create();
-
-    if (dialog.open() == Window.OK) {
-        WSDLSetComponentHelper helper = new WSDLSetComponentHelper(iFile, definition);
-        if (kind != null && kind.equalsIgnoreCase("type")) {
-            helper.setXSDTypeComponent((Part) input, dialog.getSelection());
-        }
-        else if (kind != null && kind.equalsIgnoreCase("element")){
-            helper.setXSDElementComponent((Part) input, dialog.getSelection());
-        }
-        else {
-            helper.setWSDLComponent((WSDLElement) input, property, dialog.getSelection());
-        }
-    } 
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/types/WSDLComponentFinder.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/types/WSDLComponentFinder.java
deleted file mode 100644
index 3673cbb8e..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/types/WSDLComponentFinder.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.wst.wsdl.ui.internal.dialogs.types;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.wst.common.core.search.SearchEngine;
-import org.eclipse.wst.common.core.search.SearchMatch;
-//import org.eclipse.wst.common.core.search.SearchParticipant;
-//import org.eclipse.wst.common.core.search.SearchPlugin;
-import org.eclipse.wst.common.core.search.pattern.QualifiedName;
-import org.eclipse.wst.common.core.search.pattern.SearchPattern;
-import org.eclipse.wst.common.core.search.scope.ProjectSearchScope;
-import org.eclipse.wst.common.core.search.scope.SearchScope;
-import org.eclipse.wst.common.core.search.scope.WorkspaceSearchScope;
-import org.eclipse.wst.common.core.search.util.CollectingSearchRequestor;
-//import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.eclipse.wst.xml.core.internal.search.XMLComponentDeclarationPattern;
-import org.eclipse.wst.xsd.ui.internal.dialogs.types.xml.XMLComponentFinder;
-import org.eclipse.wst.xsd.ui.internal.dialogs.types.xml.XMLComponentSpecification;
-
-public class WSDLComponentFinder extends XMLComponentFinder {
-	QualifiedName metaName;
-    public WSDLComponentFinder(QualifiedName metaName) {
-    	this.metaName = metaName;
-    }
-    
-    
-    protected void findComponents(SearchEngine searchEngine, List list, int scope)
-    {      
-      SearchScope searchScope = new WorkspaceSearchScope();
-      if (scope == ENCLOSING_PROJECT_SCOPE)
-      {
-        searchScope = new ProjectSearchScope(currentIFile.getProject().getLocation());
-      }       
-      try {
-          CollectingSearchRequestor requestor = new CollectingSearchRequestor();
-          
-          XMLComponentDeclarationPattern pattern = new XMLComponentDeclarationPattern(new QualifiedName("*", "*"), metaName, SearchPattern.R_PATTERN_MATCH);
-          
-          // TODO (cs) rethink the commented out code below.  Is there some reason for narrowing to list of search particpants?
-          // It seems the only benefit may be to filter our xsd component declarations that aren't defined
-          // in stand alone wsdl documents.  Perhaps it's best to do this with an additional property arg on the
-          // declaration pattern or perhaps simply doing some 'post' filtering.
-          //
-          //String participantId = metaName.getNamespace().equals(WSDLConstants.WSDL_NAMESPACE_URI) ?
-          //    "org.eclipse.wst.wsdl.search.WSDLSearchParticipant" :
-          //    "org.eclipse.wst.xsd.search.XSDSearchParticipant";        		  
-          //SearchParticipant particpant = SearchPlugin.getDefault().getSearchParticipant(participantId);         
-          //SearchParticipant[] participants = { particpant };     
-          
-          // TODO (cs) I'm betting we'll need to provide some hook here to allow extenders to configure
-          // the search options.  Currently we just pass in null.
-          searchEngine.search(pattern, requestor, searchScope, null, new NullProgressMonitor());
-          
-          for (Iterator i = requestor.getResults().iterator(); i.hasNext(); )
-          {
-            SearchMatch match = (SearchMatch)i.next();
-            XMLComponentSpecification spec = new XMLComponentSpecification(metaName);
-            spec.setFileLocation(match.getFile().getLocation().toString());
-            Object o = match.map.get("name");
-            if (o != null && o instanceof QualifiedName)
-            {  
-              QualifiedName qualifiedName = (QualifiedName)o;
-              if (qualifiedName.getLocalName() != null)
-              {  
-                spec.addAttributeInfo("name", qualifiedName.getLocalName());
-                spec.setTargetNamespace(qualifiedName.getNamespace());
-                list.add(spec);
-              }  
-            }  
-          }  
-      } catch (CoreException e) {
-        e.printStackTrace();
-          //status.add(e.getStatus());
-      }      
-    }
-    
-    public List getWorkbenchResourceComponents(int scope) {
-
-        List list = new ArrayList();
-        SearchEngine searchEngine = new SearchEngine();
-        findComponents(searchEngine, list, scope);    
-        return list;       
-    }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/types/WSDLComponentSelectionDialog.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/types/WSDLComponentSelectionDialog.java
deleted file mode 100644
index 885640f42..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/types/WSDLComponentSelectionDialog.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.dialogs.types;
-
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.xsd.ui.internal.dialogs.types.common.IComponentSelectionProvider;
-import org.eclipse.wst.xsd.ui.internal.dialogs.types.xml.XMLComponentSelectionDialog;
-
-public class WSDLComponentSelectionDialog extends XMLComponentSelectionDialog {
-	
-    public WSDLComponentSelectionDialog(Shell shell, String dialogTitle, IComponentSelectionProvider provider) {
-        super(shell, dialogTitle, provider);
-    }  
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/types/WSDLComponentSelectionProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/types/WSDLComponentSelectionProvider.java
deleted file mode 100644
index dcb8fdc57..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/types/WSDLComponentSelectionProvider.java
+++ /dev/null
@@ -1,604 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.dialogs.types;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.common.core.search.pattern.QualifiedName;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.wsdl.internal.impl.ImportImpl;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.eclipse.wst.xsd.ui.internal.XSDEditorPlugin;
-import org.eclipse.wst.xsd.ui.internal.dialogs.types.common.IComponentList;
-import org.eclipse.wst.xsd.ui.internal.dialogs.types.xml.XMLComponentFinder;
-import org.eclipse.wst.xsd.ui.internal.dialogs.types.xml.XMLComponentSelectionDialog;
-import org.eclipse.wst.xsd.ui.internal.dialogs.types.xml.XMLComponentSelectionProvider;
-import org.eclipse.wst.xsd.ui.internal.dialogs.types.xml.XMLComponentSpecification;
-import org.eclipse.wst.xsd.ui.internal.search.IXSDSearchConstants;
-import org.eclipse.wst.xsd.ui.internal.util.XSDDOMHelper;
-import org.eclipse.wst.wsdl.ui.internal.search.IWSDLSearchConstants;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDImport;
-import org.eclipse.xsd.XSDNamedComponent;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSchemaContent;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.impl.XSDImportImpl;
-import org.eclipse.xsd.util.XSDConstants;
-
-public class WSDLComponentSelectionProvider extends XMLComponentSelectionProvider {
-    public static final String BUILT_IN_TYPE = "BUILT_IN_TYPE";
-    
-    private WSDLComponentFinder wsdlComponentFinder;
-    private WSDLComponentSelectionDialog dialog;
-    private WSDLComponentLabelProvider labelProvider;
-    private Definition definition;
-    private QualifiedName metaName;
-    private int kind;
-    
-    /*
-     * Takes in the IFile we are currently editing.
-     */
-    public WSDLComponentSelectionProvider(IFile file, Definition definition, int kind) {
-    	this.kind = kind;
-        List validExt = new ArrayList(1);
-        validExt.add("wsdl");
-        this.metaName = getQualifiedName(kind);
-        wsdlComponentFinder = new WSDLComponentFinder(metaName);
-        wsdlComponentFinder.setFile(file);
-        //wsdlComponentFinder.setValidExtensions(validExt);
-        this.definition = definition;
-        labelProvider = new WSDLComponentLabelProvider();
-    }
-    
-    protected QualifiedName getQualifiedName(int kind)
-    {    	 
-    	switch (kind)
-		{
-		case WSDLConstants.BINDING :
-		{
-			return IWSDLSearchConstants.BINDING_META_NAME;
-		}
-		case WSDLConstants.PORT_TYPE :
-		{
-			return IWSDLSearchConstants.PORT_TYPE_META_NAME;
-		}	
-		case WSDLConstants.MESSAGE :
-		{
-			return IWSDLSearchConstants.MESSAGE_META_NAME;
-		}   
-		case WSDLEditorUtil.TYPE :
-		{
-			// TODO... need to combine complex and simple into a single meta name
-			return IXSDSearchConstants.COMPLEX_TYPE_META_NAME;
-		}
-		case WSDLEditorUtil.ELEMENT :
-		{
-			return IXSDSearchConstants.ELEMENT_META_NAME;
-		}
-		}    	
-    	return null;
-    }
-
-    public WSDLComponentSelectionProvider(IFile file, Definition definition, int kind, List validExt) {
-        this(file, definition, kind);
-        //wsdlComponentFinder.setValidExtensions(validExt);
-    }
-    
-    public void setDialog(WSDLComponentSelectionDialog dialog) {
-        this.dialog = dialog;
-    }
-    
-    public String getType(Object element) {
-        return null;
-    }
-    
-    private void createWSDLComponentObjects(IComponentList list, List inputComponents, QualifiedName metaName) {
-        Iterator it = inputComponents.iterator();
-        while (it.hasNext()) {
-            WSDLElement wsdlElement = (WSDLElement) it.next();
-            XMLComponentSpecification spec = new XMLComponentSpecification(metaName); 
-            spec.addAttributeInfo("name", wsdlElement.getElement().getAttribute("name"));
-            spec.setTargetNamespace(wsdlElement.getEnclosingDefinition().getTargetNamespace());
-            
-            String normalizedFile = getNormalizedLocation(wsdlElement.getEnclosingDefinition().getLocation());
-            spec.setFileLocation(normalizedFile);
-            
-            addDataItemToTreeNode(list, spec);
-        }
-    }
-    
-    private void createXSDComponentObjects(IComponentList list, List inputComponents, QualifiedName metaName) {
-        Iterator it = inputComponents.iterator();
-        while (it.hasNext()) {
-            XSDNamedComponent xsdElement = (XSDNamedComponent) it.next();
-            XMLComponentSpecification spec = new XMLComponentSpecification(metaName); 
-            spec.addAttributeInfo("name", xsdElement.getName());
-            spec.setTargetNamespace(xsdElement.getTargetNamespace());
-            
-            String normalizedFile = getNormalizedLocation(xsdElement.getSchema().getSchemaLocation());
-            spec.setFileLocation(normalizedFile);
-            
-            addDataItemToTreeNode(list, spec);
-        }
-    }
-        
-    public void getComponents(IComponentList list, boolean quick) {
-        if (quick) {
-            //Iterator tags = lookupTagPaths.iterator();
-            //while (tags.hasNext()) {
-                getComponentsQuick(list, metaName);
-            //}
-        }
-        else {
-            // Grab components from workspace locations
-            String scope = "";
-            if (dialog != null) {
-                scope = dialog.getSearchScope();
-            }
-            
-            List comps = new ArrayList();
-            if (scope.equals(XMLComponentSelectionDialog.SCOPE_ENCLOSING_PROJECT)) {
-                comps = wsdlComponentFinder.getWorkbenchResourceComponents(XMLComponentFinder.ENCLOSING_PROJECT_SCOPE);
-            }
-            else if (scope.equals(XMLComponentSelectionDialog.SCOPE_WORKSPACE)) {
-                comps = wsdlComponentFinder.getWorkbenchResourceComponents(XMLComponentFinder.ENTIRE_WORKSPACE_SCOPE);            
-            }
-
-            Iterator compsIt = comps.iterator();
-            while (compsIt.hasNext()) {
-                XMLComponentSpecification item = (XMLComponentSpecification) compsIt.next();
-                addDataItemToTreeNode(list, item);
-            }
-        }
-    }
-    
-    private void getComponentsQuick(IComponentList list, QualifiedName metaName) {
-        // Grab components within the file
-        if (metaName == IWSDLSearchConstants.BINDING_META_NAME) {
-            // Grab explictly defined components
-            createWSDLComponentObjects(list, definition.getEBindings(), metaName);
-            
-            // Grab directly imported components
-            Iterator importsIt = getWSDLFileImports(definition.getEImports()).iterator();
-            while (importsIt.hasNext()) {
-                Import importItem = (Import) importsIt.next();
-                Definition importDefinition = importItem.getEDefinition();
-                List importedComponents = importDefinition.getEBindings();
-                
-                createWSDLComponentObjects(list, importedComponents, metaName);
-            }
-        }
-        else if (metaName == IWSDLSearchConstants.PORT_TYPE_META_NAME) {
-            // Grab explictly defined components
-            createWSDLComponentObjects(list, definition.getEPortTypes(), metaName);
-            
-            // Grab directly imported components
-            Iterator importsIt = getWSDLFileImports(definition.getEImports()).iterator();
-            while (importsIt.hasNext()) {
-                Import importItem = (Import) importsIt.next();
-                Definition importDefinition = importItem.getEDefinition();
-                List importedComponents = importDefinition.getEPortTypes();
-                
-                createWSDLComponentObjects(list, importedComponents, metaName);
-            }
-        }
-        else if (metaName == IWSDLSearchConstants.MESSAGE_META_NAME) {
-            // Grab explictly defined components
-            createWSDLComponentObjects(list, definition.getEMessages(), metaName);
-            
-            // Grab directly imported components
-            Iterator importsIt = getWSDLFileImports(definition.getEImports()).iterator();
-            while (importsIt.hasNext()) {
-                Import importItem = (Import) importsIt.next();
-                Definition importDefinition = importItem.getEDefinition();
-                List importedComponents = importDefinition.getEMessages();
-                
-                createWSDLComponentObjects(list, importedComponents, metaName);
-            }
-        }
-        /*TODO... fix these cases
-        else if (metaName == IXSDSearchConstants.COMPLEX_TYPE_META_NAME) {
-            createXSDInlineTypesObjects(list, metaName);
-        }
-        else if (metaName.equals("/definitions/types/schema/simpleType")) {
-            createXSDInlineTypesObjects(list, metaName);
-        }*/
-        else if (metaName == IXSDSearchConstants.ELEMENT_META_NAME) {
-            createXSDElementObjects(list, metaName);
-            createRegularImportXSDElementObjects(list);
-        }
-        else if (metaName == IXSDSearchConstants.COMPLEX_TYPE_META_NAME){
-            createXSDInlineWrapperTypeObjects(list, metaName);
-            
-            createXSDBuiltInTypeObjects(list);
-            createRegularImportXSDTypeObjects(list);
-        }
-        else if (metaName == IXSDSearchConstants.SIMPLE_TYPE_META_NAME) {
-            createXSDInlineWrapperTypeObjects(list, metaName);
-        }
-        //else if (metaName.equals("/schema/element")) {
-        //    createXSDInlineWrapperElementObjects(list, metaName);
-        //}
-    }
-    
-    private List getWSDLFileImports(List wsdlImports) {
-        List list = new ArrayList();
-        Iterator it = wsdlImports.iterator();
-        while (it.hasNext()) {
-            ImportImpl importItem = (ImportImpl) it.next();
-            importItem.importDefinitionOrSchema();          // Load if necessary
-            if (importItem.getESchema() == null) {
-                list.add(importItem);
-            }
-        }
-        
-        return list;
-    }
-    
-    private void createXSDBuiltInTypeObjects(IComponentList list) { 
-        for (int i = 0; i < XSDDOMHelper.dataType.length; i++) {
-            String builtIn = XSDDOMHelper.dataType[i][0];
-            XMLComponentSpecification spec = new XMLComponentSpecification(null);//BUILT_IN_TYPE); 
-            spec.addAttributeInfo("name", builtIn);
-            spec.setTargetNamespace(XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001);
-
-//            String normalizedFile = getNormalizedLocation(definition.getLocation());
-//            spec.setFileLocation(normalizedFile);
-            spec.setFileLocation("Built-in");    
-            
-            addDataItemToTreeNode(list, spec);
-        }
-    }
-    
-    private void createRegularImportXSDTypeObjects(IComponentList list) {
-        // Handle regular imports(xsd and wsdl).
-        Iterator imports = definition.getEImports().iterator();
-        while (imports.hasNext()) {
-            Import importItem = (Import) imports.next();
-            ((ImportImpl) importItem).importDefinitionOrSchema();
-            List schemas = new ArrayList();
-            String complexPath = "";
-            String simplePath = "";
-            
-            if (importItem.getESchema() != null) {
-                // Import is a xsd file
-                schemas.add(importItem.getESchema());
-                complexPath = "/schema/complexType";
-                simplePath = "/schema/simpleType";
-            }
-            else if (importItem.getEDefinition() != null) {
-                // Import is a wsdl file
-                Definition definition = importItem.getEDefinition();
-                if (definition.getETypes() != null) {
-	                Iterator schemaIt = definition.getETypes().getEExtensibilityElements().iterator();
-	                while (schemaIt.hasNext()) {
-	                    XSDSchemaExtensibilityElement eeElement = (XSDSchemaExtensibilityElement) schemaIt.next();
-	                    schemas.add(eeElement.getSchema());
-	                    complexPath = "/definitions/types/schema/complexType";
-	                    simplePath = "/definitions/types/schema/simpleType";
-	                }
-                }
-            }
-            
-            if (schemas.size() > 0) {
-                Iterator schemaIt = schemas.iterator();
-                while (schemaIt.hasNext()) {
-                    Iterator typesIt = ((XSDSchema) schemaIt.next()).getTypeDefinitions().iterator();
-                    List complexList = new ArrayList();
-                    List simpleList = new ArrayList();
-                    while (typesIt.hasNext()) {
-                        Object component = typesIt.next();
-                        if (component instanceof XSDComplexTypeDefinition) {
-                            complexList.add(component);
-                        }
-                        else if (component instanceof XSDSimpleTypeDefinition) {
-                            simpleList.add(component);
-                        }
-                    }
-                    
-                    createXSDComponentObjects(list, complexList, IXSDSearchConstants.COMPLEX_TYPE_META_NAME);
-                    createXSDComponentObjects(list, simpleList, IXSDSearchConstants.SIMPLE_TYPE_META_NAME);
-                }
-            }
-        }
-    }
-    
-    private void createRegularImportXSDElementObjects(IComponentList list) {
-        // Handle regular imports(xsd and wsdl).
-        Iterator imports = definition.getEImports().iterator();
-        while (imports.hasNext()) {
-            Import importItem = (Import) imports.next();
-            ((ImportImpl) importItem).importDefinitionOrSchema();
-            List schemas = new ArrayList();
-            String path = "";
-            
-            if (importItem.getESchema() != null) {
-                // Import is a xsd file
-                schemas.add(importItem.getESchema());
-                path = "/schema/element";
-            }
-            else if (importItem.getEDefinition() != null) {
-                // Import is a wsdl file
-                Definition definition = importItem.getEDefinition();
-                if (definition.getETypes() != null) {
-	                Iterator schemaIt = definition.getETypes().getEExtensibilityElements().iterator();
-	                while (schemaIt.hasNext()) {
-	                    XSDSchemaExtensibilityElement eeElement = (XSDSchemaExtensibilityElement) schemaIt.next();
-	                    schemas.add(eeElement.getSchema());
-	                    path = "/definitions/types/schema/element";
-	                }
-                }
-            }
-            
-            if (schemas.size() > 0) {
-                Iterator schemaIt = schemas.iterator();
-                while (schemaIt.hasNext()) {
-                    List elementList = ((XSDSchema) schemaIt.next()).getElementDeclarations();
-                    createXSDComponentObjects(list, elementList, IXSDSearchConstants.ELEMENT_META_NAME);
-                }
-            }
-        }
-    }
-    
-    private void createXSDInlineTypesObjects(IComponentList list, QualifiedName tagPath) {
-        // Handle inline schemas
-    	if (definition.getETypes() == null) {
-    		return;
-    	}
-    	
-        Iterator inlineSchemasIt = definition.getETypes().getSchemas().iterator();
-        while (inlineSchemasIt.hasNext()) {
-            XSDSchema schema = (XSDSchema) inlineSchemasIt.next();
-            
-            if (schema.getTargetNamespace() != null && !schema.getTargetNamespace().equals("")) {
-                    List keepTypes = new ArrayList();
-                    Iterator typeIterator = schema.getTypeDefinitions().iterator();
-                    // Filter out unwanted Types
-                    if (tagPath.equals("/definitions/types/schema/complexType")) {
-                        while (typeIterator.hasNext()) {
-                            Object type = typeIterator.next();
-                            if (type instanceof XSDComplexTypeDefinition &&
-                                    ((XSDComplexTypeDefinition) type).getSchema().equals(schema)) {
-                                keepTypes.add(type);
-                            }
-                        }
-                    }
-                    else if (tagPath.equals("/definitions/types/schema/simpleType")) {
-                        while (typeIterator.hasNext()) {
-                            Object type = typeIterator.next();
-                            if (type instanceof XSDSimpleTypeDefinition &&
-                                    ((XSDSimpleTypeDefinition) type).getSchema().equals(schema)) {
-                                keepTypes.add(type);
-                            }
-                        }
-                    }
-                    
-                    createXSDComponentObjects(list, keepTypes, tagPath);
-            }
-        }
-    }
-
-    private void createXSDElementObjects(IComponentList list, QualifiedName tagPath) {
-    	if (definition.getETypes() == null) {
-    		return;
-    	}
-    	
-        Iterator inlineSchemasIt = definition.getETypes().getSchemas().iterator();
-        while (inlineSchemasIt.hasNext()) {
-            XSDSchema schema = (XSDSchema) inlineSchemasIt.next();
-            
-            List keepElements = new ArrayList();
-            if (schema.getTargetNamespace() != null && !schema.getTargetNamespace().equals("")) {
-                Iterator elementIt = schema.getElementDeclarations().iterator();
-                while (elementIt.hasNext()) {
-                    // Only look for elements explicitly defined in the Schema (not through imports).
-                    XSDElementDeclaration xsdElement = (XSDElementDeclaration) elementIt.next();
-                    if (xsdElement.getSchema().equals(schema)) {
-                        keepElements.add(xsdElement);
-                    }
-                }
-                
-                createXSDComponentObjects(list, keepElements, tagPath);
-            }
-        }
-    }
-    
-    private void createXSDInlineWrapperTypeObjects(IComponentList list, QualifiedName tagPath) {
-        // Handle inline schemas
-    	if (definition.getETypes() == null) {
-    		return;
-    	}
-    	
-        Iterator inlineSchemasIt = definition.getETypes().getSchemas().iterator();
-        while (inlineSchemasIt.hasNext()) {
-            XSDSchema schema = (XSDSchema) inlineSchemasIt.next();
-            
-            if (schema.getTargetNamespace() == null || schema.getTargetNamespace().equals("")) {
-                List keepTypes = new ArrayList();
-                
-                List imports = new ArrayList();
-                Iterator contents = schema.getContents().iterator();
-                while (contents.hasNext()) {
-                    XSDSchemaContent content = (XSDSchemaContent) contents.next();
-                    if (content instanceof XSDImport) {
-                        imports.add(content);             
-                    }
-                }
-                
-                Iterator importIterator = imports.iterator();
-                while (importIterator.hasNext()) {
-                    XSDImport importObject = (XSDImport) importIterator.next();
-                    XSDSchema importSchema = ((XSDImportImpl) importObject).importSchema();
-                    Iterator typesIt = importSchema.getTypeDefinitions().iterator();
-                    while (typesIt.hasNext()) {
-                        Object typeObject = typesIt.next();
-                        if (tagPath.equals("/schema/complexType") &&
-                            typeObject instanceof XSDComplexTypeDefinition) {
-                            keepTypes.add(typeObject);
-                        }
-                        else if (tagPath.equals("/schema/simpleType") &&
-                                 typeObject instanceof XSDSimpleTypeDefinition) {
-                            keepTypes.add(typeObject);
-                        }
-                    }
-                    
-                }
-
-                createXSDComponentObjects(list, keepTypes, tagPath);
-            }
-        }
-    }
-    
-    private void createXSDInlineWrapperElementObjects(IComponentList list, QualifiedName tagPath) {
-    	if (definition.getETypes() == null) {
-    		return;
-    	}
-    	
-        Iterator inlineSchemasIt = definition.getETypes().getSchemas().iterator();
-        while (inlineSchemasIt.hasNext()) {
-            XSDSchema schema = (XSDSchema) inlineSchemasIt.next();
-            
-            if (schema.getTargetNamespace() == null || schema.getTargetNamespace().equals("")) {
-                Iterator contents = schema.getContents().iterator();
-                List imports = new ArrayList();
-                while (contents.hasNext()) {
-                    XSDSchemaContent content = (XSDSchemaContent) contents.next();
-                    if (content instanceof XSDImport) {
-                        imports.add(content);             
-                    }
-                }
-                
-                Iterator importIterator = imports.iterator();
-                while (importIterator.hasNext()) {
-                    XSDImport importObject = (XSDImport) importIterator.next();
-                    XSDSchema importSchema = ((XSDImportImpl) importObject).importSchema();
-
-                    createXSDComponentObjects(list, importSchema.getElementDeclarations(), tagPath);    
-                }                
-            }
-        }
-    }
-
-//      private ITypeSystemProvider getTypeSystemProvider() {
-//            ITypeSystemProvider provider = WSDLEditorUtil.getInstance().getTypeSystemProvider(definition);
-//            if (provider instanceof ExtensibleTypeSystemProvider) {
-//                provider = (ExtensibleTypeSystemProvider) provider; 
-//            }
-//            else {
-//                return null;
-//            }
-//            
-//            return provider;
-//      }
-
-    
-  
-    public ILabelProvider getLabelProvider() {
-        return labelProvider;
-    }    
-    
-	public String getListTitle() {
-
-		switch (kind)
-		{
-		case WSDLConstants.BINDING :
-		{
-			return WSDLEditorPlugin.getWSDLString("_UI_LABEL_MATCHING_BINDINGS");
-		}
-		case WSDLConstants.PORT_TYPE :
-		{
-			return WSDLEditorPlugin.getWSDLString("_UI_LABEL_MATCHING_PORTTYPES");
-		}	
-		case WSDLConstants.MESSAGE :
-		{
-			return WSDLEditorPlugin.getWSDLString("_UI_LABEL_MATCHING_MESSAGES");
-		}   
-		case WSDLEditorUtil.TYPE :
-		{
-			return WSDLEditorPlugin.getWSDLString("_UI_LABEL_MATCHING_TYPES");
-		}
-		case WSDLEditorUtil.ELEMENT :
-		{
-			return WSDLEditorPlugin.getWSDLString("_UI_LABEL_MATCHING_ELEMENTS");
-		}
-		}    	
-		return null;	   
-	}
-
-	public String getNameFieldTitle() {
-		switch (kind)
-		{
-		case WSDLConstants.BINDING :
-		{
-			return WSDLEditorPlugin.getWSDLString("_UI_LABEL_BINDING_NAME");
-		}
-		case WSDLConstants.PORT_TYPE :
-		{
-			return WSDLEditorPlugin.getWSDLString("_UI_LABEL_PORTTYPE_NAME");
-		}	
-		case WSDLConstants.MESSAGE :
-		{
-			return WSDLEditorPlugin.getWSDLString("_UI_LABEL_MESSAGE_NAME");
-		}   
-		case WSDLEditorUtil.TYPE :
-		{
-			return WSDLEditorPlugin.getWSDLString("_UI_LABEL_TYPE_NAME");
-		}
-		case WSDLEditorUtil.ELEMENT :
-		{
-			return WSDLEditorPlugin.getWSDLString("_UI_LABEL_ELEMENT_NAME");
-		}
-		}    	
-		return null;	   
-	}
-    public class WSDLComponentLabelProvider extends XMLComponentSelectionLabelProvider {
-        public Image getImage(Object element) {
-            XMLComponentTreeObject specification = (XMLComponentTreeObject) element;
-            XMLComponentSpecification spec = (XMLComponentSpecification) specification.getXMLComponentSpecification().get(0);
-            if (spec.getMetaName() == IWSDLSearchConstants.BINDING_META_NAME) {
-                return WSDLEditorPlugin.getInstance().getImage("icons/binding_obj.gif");
-            }
-            else if (spec.getMetaName() == IWSDLSearchConstants.PORT_TYPE_META_NAME) {
-                return WSDLEditorPlugin.getInstance().getImage("icons/portType_obj.gif");
-            }
-            else if (spec.getMetaName() == IWSDLSearchConstants.MESSAGE_META_NAME) {
-                return WSDLEditorPlugin.getInstance().getImage("icons/message_obj.gif");
-            }
-            else if (spec.getMetaName() == IXSDSearchConstants.COMPLEX_TYPE_META_NAME){
-            	//|| spec.getMetaName() == ("/schema/complexType"))             	
-                return XSDEditorPlugin.getXSDImage("icons/XSDComplexType.gif");
-            }
-            else if (spec.getMetaName() == IXSDSearchConstants.SIMPLE_TYPE_META_NAME ||
-                     //spec.getMetaName() == ("/schema/simpleType") ||
-                     spec.getMetaName() == null /*BUILT_IN_TYPE*/){ 
-                return XSDEditorPlugin.getXSDImage("icons/XSDSimpleType.gif");
-            }
-            else if (spec.getMetaName() == IXSDSearchConstants.ELEMENT_META_NAME){
-            		// ||spec.getMetaName() == ("/schema/element"))
-                return XSDEditorPlugin.getXSDImage("icons/XSDElement.gif");
-            }
-    
-            return null;
-        }
-    }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/types/WSDLSetComponentHelper.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/types/WSDLSetComponentHelper.java
deleted file mode 100644
index 0d1f2a951..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/types/WSDLSetComponentHelper.java
+++ /dev/null
@@ -1,246 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.dialogs.types;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.common.uriresolver.internal.util.URIHelper;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.wsdl.ui.internal.actions.AddElementDeclarationAction;
-import org.eclipse.wst.wsdl.ui.internal.actions.AddImportAction;
-import org.eclipse.wst.wsdl.ui.internal.actions.AddWSISchemaImportAction;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.eclipse.wst.xsd.ui.internal.dialogs.types.xml.XMLComponentSpecification;
-import org.eclipse.xsd.XSDImport;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSchemaContent;
-
-
-public class WSDLSetComponentHelper {
-    private Definition definition;
-    private IFile currentIFile;
-    
-    public WSDLSetComponentHelper(IFile iFile, Definition definition) {
-        currentIFile = iFile;
-        this.definition = definition;
-    }
-    
-    public void setWSDLComponent(WSDLElement inputElement, String property, XMLComponentSpecification spec) {
-        addImportIfNecessary(spec);
-        String componentObject = getPrefixedComponentName(spec);
-
-        org.w3c.dom.Element wsdlElement = inputElement.getElement();
-        
-        wsdlElement.setAttribute(property, componentObject); //$NON-NLS-1$
-    }
-    
-    public void setXSDTypeComponent(Part part, XMLComponentSpecification spec) {
-        if (spec.getMetaName() != null) {
-            addImportIfNecessary(spec);
-        }
-        String componentObject = getPrefixedComponentName(spec);
-        
-        ComponentReferenceUtil.setComponentReference((Part) part, true, componentObject);
-    }
-    
-    public void setXSDElementComponent(Part part, XMLComponentSpecification spec) {
-        addImportIfNecessary(spec);
-        String componentObject = getPrefixedComponentName(spec);
-        
-        ComponentReferenceUtil.setComponentReference((Part) part, false, componentObject);
-    }
-    
-    /*
-     * Return the prefixed component name described by the given
-     * XMLComponentSpecification object.
-     */
-    public String getPrefixedComponentName(XMLComponentSpecification spec) {
-        String name = (String) spec.getAttributeInfo("name");
-        List prefixes = getPrefixes(definition, spec.getTargetNamespace());
-        if (prefixes.size() > 0) {
-            name = prefixes.get(0) + ":" + name;
-        }
-        
-        return name;
-    }         
-          
-    private List getPrefixes(Definition definition, String namespace) {
-        List list = new ArrayList();
-        Map map = definition.getNamespaces();
-        for (Iterator i = map.keySet().iterator(); i.hasNext();) {
-            String prefix = (String) i.next();
-            String theNamespace = (String) map.get(prefix);
-            if (theNamespace != null && theNamespace.equals(namespace)) {
-                list.add(prefix);
-            }
-        }
-        return list;
-    }
-
-    
-    private void addImportIfNecessary(XMLComponentSpecification spec) {
-        boolean foundMatch = false;
-        
-        // Check itself
-        String currentFileLocation = currentIFile.getLocation().toString();
-        if (currentFileLocation.equals(spec.getFileLocation())) {
-            foundMatch = true;
-        }
-        
-        // Check regular Imports
-        if (!foundMatch) {
-            Iterator importsIt = definition.getEImports().iterator();
-            
-            while (importsIt.hasNext()) {
-                String importLocation = "";
-                Import importItem = (Import) importsIt.next();
-                if (importItem.getESchema() != null) {
-                    XSDSchema schema = importItem.getESchema();
-                    importLocation = getNormalizedLocation(schema.getSchemaLocation());
-                }
-                else {            
-                    Definition importDefinition = importItem.getEDefinition();
-                    importLocation = getNormalizedLocation(importDefinition.getLocation()); 
-                }            
-    
-                if (importLocation.equals(spec.getFileLocation())) {
-                    foundMatch = true;
-                    break;
-                }
-            }
-        }
-        
-        // Check inline Schemas
-        if (!foundMatch) {
-            List imports = new ArrayList();
-            
-            if (definition.getETypes() != null) {
-	            Iterator it = definition.getETypes().getEExtensibilityElements().iterator();
-	            while (it.hasNext()) {
-	                XSDSchemaExtensibilityElement eeElement = (XSDSchemaExtensibilityElement) it.next();
-	                XSDSchema schema = eeElement.getSchema();
-	                if (schema.getTargetNamespace() == null || schema.getTargetNamespace().equals("")) {                    
-	                    Iterator contents = schema.getContents().iterator();
-	                    while (contents.hasNext()) {
-	                        XSDSchemaContent content = (XSDSchemaContent) contents.next();
-	                        if (content instanceof XSDImport) {
-	                            imports.add(content);             
-	                        }
-	                    }
-	                }
-	            }
-            }
-            
-            Iterator importIt = imports.iterator();
-            while (importIt.hasNext()) {
-                XSDImport importItem = (XSDImport) importIt.next();
-                XSDSchema resolvedSchema = importItem.getResolvedSchema();
-                String resolvedString = resolvedSchema.getSchemaLocation();
-                String importLocation = getNormalizedLocation(resolvedString);
-                
-                if (importLocation.equals(spec.getFileLocation())) {
-                    foundMatch = true;
-                    break;
-                }
-            }            
-        }
-        
-        if (!foundMatch) {
-            boolean wsiStyleImport = isXSDSchemaFile(spec);
-            if (wsiStyleImport) {
-                AddElementDeclarationAction action = new AddElementDeclarationAction(definition, spec.getTargetNamespace(), "xsd");
-                action.run();
-             
-                String location = URIHelper.getRelativeURI(new Path(spec.getFileLocation()), currentIFile.getLocation());
-                AddWSISchemaImportAction addImport = new AddWSISchemaImportAction(definition, spec.getTargetNamespace(), location);
-                addImport.run();
-            }
-            else {
-                String newSelectedFileLoc = spec.getFileLocation();
-                String currentFileLoc = getNormalizedLocation(definition.getLocation());
-                String relativeLoc = ComponentReferenceUtil.computeRelativeURI(newSelectedFileLoc, currentFileLoc, true);
-                
-                org.w3c.dom.Element definitionElement = WSDLEditorUtil.getInstance().getElementForObject(definition);
-                String prefix = definition.getPrefix(WSDLConstants.WSDL_NAMESPACE_URI);
-                String namespace = spec.getTargetNamespace();
-                
-                AddImportAction addImportAction = new AddImportAction(null, definition, definitionElement, prefix, namespace, relativeLoc);
-                addImportAction.run();            
-                
-                String uniquePrefix = getUniquePrefix(definition, prefix);            
-                definitionElement.setAttribute("xmlns:" + uniquePrefix, namespace);
-            }
-        }
-    }
-    /*
-     * Try to determine if the passed in XMLComponentSpecification refers to
-     * an XSD or WSDL file.  If it's an XSD, return true.
-     */
-    private boolean isXSDSchemaFile(XMLComponentSpecification spec) {
-        String fileLocation = spec.getFileLocation();
-        int periodIndex = fileLocation.lastIndexOf(".");
-        
-        if (periodIndex > 0) {
-            String extension = fileLocation.substring(periodIndex + 1);
-            if (extension.equalsIgnoreCase("xsd")) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-    
-    private String getUniquePrefix(Definition definition, String initPrefix) {
-      String uniquePrefix;
-      Map map = definition.getNamespaces();
-
-      if (definition.getNamespace(initPrefix) == null) {
-        uniquePrefix = initPrefix;
-      }
-      else {// if used, then try to create a unique one
-        String tempPrefix = initPrefix;
-        int i = 1;
-        while(map.containsKey(tempPrefix + i)) {
-          i++;
-        }
-        uniquePrefix = tempPrefix + i;
-      }
-      return uniquePrefix;    
-    } 
-    
-    private String getNormalizedLocation(String location) {
-        try {
-            URL url = new URL(location);
-            URL resolvedURL = Platform.resolve(url);
-            location = resolvedURL.getPath();
-        }
-        catch (Exception e) {
-            e.printStackTrace();
-        }
-        
-        return location; 
-      }
-    
-    
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/ExtensibilityItemTreeProviderRegistry.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/ExtensibilityItemTreeProviderRegistry.java
deleted file mode 100644
index 326428bea..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/ExtensibilityItemTreeProviderRegistry.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.extension;
-
-import org.eclipse.jface.viewers.ILabelProvider;
-
-/**
- * This class reads the plugin manifests and registers each extensibility item tree provider
- */
-public class ExtensibilityItemTreeProviderRegistry extends NSKeyedExtensionRegistry
-{
-  protected static final String LABEL_PROVIDER_PROPERTY = "labelProviderClass";
-  protected static final String CONTENT_PROVIDER_PROPERTY = "contentProviderClass";
-  protected static final String[] ATT_NAMES = { "labelProviderClass", "contentProviderClass" };
-
-  public ILabelProvider getLabelProvider(String namespace)
-  {
-    return (ILabelProvider) getProperty(namespace, LABEL_PROVIDER_PROPERTY);
-  }
-
-  public ITreeChildProvider getContentProvider(String namespace)
-  {
-    return (ITreeChildProvider) getProperty(namespace, CONTENT_PROVIDER_PROPERTY);
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/IDetailsViewerProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/IDetailsViewerProvider.java
deleted file mode 100644
index d1f474f69..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/IDetailsViewerProvider.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.extension;
-
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorPart;
-
-public interface IDetailsViewerProvider
-{                                      
-  public Object getViewerKey(Object modelObject);
-  public Viewer createViewer(Object modelObject, Composite parent, IEditorPart editorPart);
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/IEditPartProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/IEditPartProvider.java
deleted file mode 100644
index 01c82370c..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/IEditPartProvider.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.extension;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.w3c.dom.Node;
-
-public interface IEditPartProvider
-{                                      
-  public void contributeMenuActions(IMenuManager manager, Node node, Object object);
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/IMenuActionContributor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/IMenuActionContributor.java
deleted file mode 100644
index a1ff91571..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/IMenuActionContributor.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.extension;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.w3c.dom.Node;
-
-public interface IMenuActionContributor
-{                                      
-  public void contributeMenuActions(IMenuManager manager, Node node, Object object);
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/IModelQueryContributor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/IModelQueryContributor.java
deleted file mode 100644
index 95d9a75fa..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/IModelQueryContributor.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.extension;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-                   
-// Note this class will likely be removed in the future when the ModelQuery's extension mechanism is updated
-//
-public interface IModelQueryContributor
-{                                      
-  public void setModel(IDOMModel xmlModel);
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/INodeAssociationProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/INodeAssociationProvider.java
deleted file mode 100644
index ee956ceaf..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/INodeAssociationProvider.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.extension;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public interface INodeAssociationProvider
-{                    
-  public Object getModelObject(Object parentModelObject, Element[] elementChain, int start, int[] end);
-  public Node getNode(Object modelObject); 
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/INodeReconciler.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/INodeReconciler.java
deleted file mode 100644
index 86cfebbb2..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/INodeReconciler.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.extension;
-
-import org.w3c.dom.Element;
-
-
-public interface INodeReconciler
-{
-  public void notifyChanged(Object modelObject, Element element, int eventType, Object feature, Object oldValue, Object newValue, int index);                                         
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/ITreeChildProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/ITreeChildProvider.java
deleted file mode 100644
index aac380ebd..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/ITreeChildProvider.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.extension;
-
-/**
- * This class allows extension writers to provide specialize tree content behaviour.
- * It is intended to behave similar to the org.eclipse.jface.viewers.ITreeContentProvider.
- * The major difference is that this class is simplified so that only one method is involved.
- * 
- * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)  	
- */
-public interface ITreeChildProvider
-{
-	public Object[] getChildren(Object object);
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/ITypeSystemProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/ITypeSystemProvider.java
deleted file mode 100644
index 4700edef6..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/ITypeSystemProvider.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.extension;
-
-import java.util.List;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.xsd.XSDSchema;
-
-public interface ITypeSystemProvider
-{                                                      
-  public static final int UNKNOWN_TYPE = 0x0;
-  public static final int BUILT_IN_TYPE = 0x1;
-  public static final int USER_DEFINED_SIMPLE_TYPE = 0x2;
-  public static final int USER_DEFINED_COMPLEX_TYPE = 0x4;
-
-  public List getAvailableTypeNames(Definition definition, int typeNameCategory);
-  public List getAvailableElementNames(Definition definition);  
-  public List getAvailableTypes(Definition definition, XSDSchema schema, int typeNameCategory);
-  public int getCategoryForTypeName(Definition definition, String typeName);
-  public List getPrefixedNames(Definition definition, String namespace, String localName);
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/NSKeyedExtensionRegistry.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/NSKeyedExtensionRegistry.java
deleted file mode 100644
index 03b7ea4af..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/NSKeyedExtensionRegistry.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.extension;
-
-import java.util.HashMap;
-
-public class NSKeyedExtensionRegistry
-{
-  protected HashMap map = new HashMap();
-  private static final String PLUGIN_LOADING_ERROR = "PLUGIN_LOADING_ERROR";
-
-  public NSKeyedExtensionRegistry()
-  {
-  }
-
-  public void put(String namespaceURI, String className, ClassLoader classLoader)
-  {
-    ExtensionInfo info = (ExtensionInfo) map.get(namespaceURI);
-    if (info == null)
-    {
-      info = new SinglePropertyExtensionInfo(className, classLoader);
-      map.put(namespaceURI, info);
-    }
-  }
-
-  public void put(String namespaceURI, HashMap propertyToClassNameMap, ClassLoader classLoader)
-  {
-    ExtensionInfo info = (ExtensionInfo) map.get(namespaceURI);
-    if (info == null)
-    {
-      info = new MultiPropertyExtensionInfo(propertyToClassNameMap, classLoader);
-      map.put(namespaceURI, info);
-    }
-  }
-
-  /**
-   * 
-   * @deprecated
-   */
-  public Object get(String namespaceURI)
-  {
-    ExtensionInfo info = (ExtensionInfo) map.get(namespaceURI);
-    return info != null ? info.getObject("") : null;
-  }
-
-  public Object getProperty(String namespaceURI, String property)
-  {
-    ExtensionInfo info = (ExtensionInfo) map.get(namespaceURI);
-    return info != null ? info.getObject(property) : null;
-  }
-
-  private abstract class ExtensionInfo
-  {
-    protected ClassLoader classLoader;
-
-    public ExtensionInfo(ClassLoader classLoader)
-    {
-      this.classLoader = classLoader;
-    }
-
-    public abstract Object getObject(String property);
-  }
-
-  private class SinglePropertyExtensionInfo extends ExtensionInfo
-  {
-    protected String className;
-    protected Object object;
-    protected boolean error;
-
-    public SinglePropertyExtensionInfo(String className, ClassLoader classLoader)
-    {
-      super(classLoader);
-      this.className = className;
-    }
-
-    public Object getObject(String property)
-    {
-      if (object == null)
-      {
-        try
-        {
-          Class theClass = classLoader != null ? classLoader.loadClass(className) : Class.forName(className);
-          object = theClass.newInstance();
-        }
-        catch (Exception e)
-        {
-          object = PLUGIN_LOADING_ERROR;
-          e.printStackTrace();
-        }
-      }
-      return object != PLUGIN_LOADING_ERROR ? object : null;
-    }
-  }
-
-  private class MultiPropertyExtensionInfo extends ExtensionInfo
-  {
-    protected HashMap propertyToClassNameTable;
-    protected HashMap propertyToObjectTable = new HashMap();
-
-    public MultiPropertyExtensionInfo(HashMap propertToClassNameTable, ClassLoader classLoader)
-    {
-      super(classLoader);
-      this.propertyToClassNameTable = propertToClassNameTable;
-    }
-
-    public Object getObject(String property)
-    {
-      Object result = null;
-      String className = (String) propertyToClassNameTable.get(property);
-      if (className != null)
-      {
-        result = propertyToObjectTable.get(property);
-        if (result == null)
-        {
-          try
-          {
-            Class theClass = classLoader != null ? classLoader.loadClass(className) : Class.forName(className);
-            result = theClass.newInstance();
-            propertyToObjectTable.put(property, result);
-          }
-          catch (Exception e)
-          {
-            propertyToObjectTable.put(property, PLUGIN_LOADING_ERROR);
-            result = PLUGIN_LOADING_ERROR;
-            e.printStackTrace();
-          }
-        }
-      }
-	  return result != PLUGIN_LOADING_ERROR ? result : null;      
-    }
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/WSDLEditorExtension.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/WSDLEditorExtension.java
deleted file mode 100644
index 5bbaf6c82..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/WSDLEditorExtension.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.extension;
-
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-
-public interface WSDLEditorExtension
-{                                          
-  public static final int OUTLINE_TREE_CONTENT_PROVIDER = 1;    // req'd for model based ext
-  public static final int OUTLINE_LABEL_PROVIDER = 2;           // req'd for model based ext
-
-  public static final int MENU_ACTION_CONTRIBUTOR = 3;          // node
-  public static final int DETAILS_VIEWER_PROVIDER = 4;          // node
-
-  public static final int EDIT_PART_FACTORY = 5;                // req'd for model based ext
-  public static final int TYPE_SYSTEM_PROVIDER = 6;             // req'd for type system ext
-  public static final int NODE_RECONCILER = 7;                  // req'd for model based ext
-  public static final int NODE_ASSOCIATION_PROVIDER = 8;        // req'd for model based ext
-  public static final int MODEL_QUERY_CONTRIBUTOR = 9;          // req'd for model based ext
-
-  public static final int PROPERTY_SOURCE_PROVIDER = 10;        // req'd for model based ext
-  public static final int PROPERTY_SECTION_DESCRIPTOR_PROVIDER = 11;  // req'd for model based ext
-  public static final int XSD_DELETE_ACTION = 12;
-  
-  boolean isExtensionTypeSupported(int type);
-  boolean isApplicable(Object modelObject);
-  Object createExtensionObject(int type, WSDLEditor wsdlEditor);
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/WSDLEditorExtensionRegistry.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/WSDLEditorExtensionRegistry.java
deleted file mode 100644
index f8e2435bc..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/WSDLEditorExtensionRegistry.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.extension;
-        
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-
-public class WSDLEditorExtensionRegistry
-{                   
-  //protected List classNameClassLoaderPairList = new ArrayList();
-  //protected HashMap treeProviderMap = new HashMap(); 
-  protected List registeredExtensionList = new ArrayList();
-
-  public WSDLEditorExtensionRegistry()
-  {
-    add(new WSDLEditor.BuiltInWSDLEditorExtension());
-  }            
-
-  //public ExtensibilityItemTreeProvider getExtensibilityItemTreeProvider(String namespaceURI)
-  //{
-  //  return (ExtensibilityItemTreeProvider)treeProviderMap.get(namespaceURI);
-  //}
-
-  //public void putExtensibilityItemTreeProvider(String namespaceURI, ExtensibilityItemTreeProvider treeProvider)
-  //{
-  //  treeProviderMap.put(namespaceURI, treeProvider);
-  //}
-  
-  public List getRegisteredExtensions()
-  {                            
-    return registeredExtensionList;                                
-  }                       
-
-  public WSDLEditorExtension getApplicableExtension(int type, Object object)
-  { 
-    WSDLEditorExtension result = null;                                    
-    for (Iterator i = getRegisteredExtensions().iterator(); i.hasNext(); )
-    {
-      WSDLEditorExtension extension = (WSDLEditorExtension)i.next();
-      if (extension.isExtensionTypeSupported(type) && extension.isApplicable(object))
-      { 
-        result = extension;
-        break;
-      }
-    }         
-    return result;                                                           
-  }
-
-  public WSDLEditorExtension[] getRegisteredExtensions(int type)
-  { 
-    List list = new ArrayList();                                    
-    for (Iterator i = getRegisteredExtensions().iterator(); i.hasNext(); )
-    {
-      WSDLEditorExtension extension = (WSDLEditorExtension)i.next();
-      if (extension.isExtensionTypeSupported(type))
-      { 
-        list.add(extension);
-      }
-    } 
-
-    WSDLEditorExtension[] result = new WSDLEditorExtension[list.size()];
-    int count = 0;
-    for (Iterator i = list.iterator(); i.hasNext(); )
-    { 
-      WSDLEditorExtension extension = (WSDLEditorExtension)i.next();
-      result[count] = extension;
-      count++;
-    }
-    return result;                          
-  }
-             
-  public void addAsFirst(WSDLEditorExtension extension)
-  {               
-    getRegisteredExtensions().add(0, extension);
-  }    
-
-  public void add(WSDLEditorExtension extension)
-  {               
-    getRegisteredExtensions().add(extension);
-  }          
-
-  public void add(ClassLoader classLoader, String className)
-  {                      
-    // TODO... consider defered instantiation of WSDLEditorExtensions         
-    try
-    {       
-      Class theClass = classLoader != null ? classLoader.loadClass(className) : Class.forName(className);
-      WSDLEditorExtension extension = (WSDLEditorExtension)theClass.newInstance();
-      registeredExtensionList.add(extension);
-    }
-    catch (Exception e)
-    {
-    	e.printStackTrace();
-    }
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/filter/ExtensiblityElementFilter.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/filter/ExtensiblityElementFilter.java
deleted file mode 100644
index 61bf0d273..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/filter/ExtensiblityElementFilter.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.filter;
-
-import org.w3c.dom.Element;
-
-public interface ExtensiblityElementFilter 
-{
-  public boolean isValidContext(Element parentElement, String localName);     
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/filter/HttpExtensiblityElementFilter.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/filter/HttpExtensiblityElementFilter.java
deleted file mode 100644
index 859259cd1..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/filter/HttpExtensiblityElementFilter.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.filter;
-
-import org.w3c.dom.Element;
-
-
-public class HttpExtensiblityElementFilter implements ExtensiblityElementFilter
-{  
-  public HttpExtensiblityElementFilter()
-  {
-  }  	
-	
-  public boolean isValidContext(Element parentElement, String localName)
-  {
-  	boolean result = false;
-    
-    String parentElementName = parentElement.getLocalName();
-	if (parentElementName.equals("binding"))
-	{
-	  result = localName.equals("binding"); 	  
-	}	  
-	else if (parentElementName.equals("operation"))
-	{
-	  result = localName.equals("operation"); 
-	}
-	else if (parentElementName.equals("input") || 
-	         parentElementName.equals("output"))
-	{
-	  result = localName.equals("body") || 
-	           localName.equals("header"); 	  
-	}	
-	else if (parentElementName.equals("fault"))
-	{
-	  result = localName.equals("fault"); 	  
-	}
-	else if (parentElementName.equals("port"))
-	{
-	  result = localName.equals("address"); 	  
-	}	
-    
-    return result;
-  }     
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/filter/MimeExtensiblityElementFilter.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/filter/MimeExtensiblityElementFilter.java
deleted file mode 100644
index eaa701fa4..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/filter/MimeExtensiblityElementFilter.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.filter;
-
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-
-
-public class MimeExtensiblityElementFilter implements ExtensiblityElementFilter
-{   
-  private static final String MIME_NAMESPACE_URI="http://schemas.xmlsoap.org/wsdl/mime/";
-  public MimeExtensiblityElementFilter()
-  {
-  }  	
-	
-  public boolean isValidContext(Element parentElement, String localName)
-  {
-  	boolean result = false;
-
-    String parentElementName = parentElement.getLocalName();
-    String parentElementNamespace = parentElement.getNamespaceURI();
-
-  	if (WSDLConstants.WSDL_NAMESPACE_URI.equals(parentElementNamespace))
-  	{
-    	if (parentElementName.equals("input") || parentElementName.equals("output"))
-    	{
-    	  	result = localName.equals("content") ||
-				     localName.equals("multipartRelated") ||
-				     localName.equals("mimeXml");    	  	
-    	}
-  	}
-  	else if (MIME_NAMESPACE_URI.equals(parentElementNamespace))
-  	{
-		result = true;				
-  	}
-    return result;
-  }     
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/filter/SoapExtensiblityElementFilter.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/filter/SoapExtensiblityElementFilter.java
deleted file mode 100644
index fbfe95ce0..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/filter/SoapExtensiblityElementFilter.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.filter;
-
-import org.w3c.dom.Element;
-
-public class SoapExtensiblityElementFilter implements ExtensiblityElementFilter
-{   
-  public SoapExtensiblityElementFilter()
-  {
-  }  	
-	
-  public boolean isValidContext(Element parentElement, String localName)
-  {
-  	boolean result = false;
-
-    String parentElementName = parentElement.getLocalName();
-	if (parentElementName.equals("binding"))
-	{
-	  result = localName.equals("binding"); 	  
-	}	  
-	else if (parentElementName.equals("operation"))
-	{
-	  result = localName.equals("operation"); 
-	}
-	else if (parentElementName.equals("input") || 
-	         parentElementName.equals("output"))
-	{
-	  result = localName.equals("body") || 
-	           localName.equals("header"); 	  
-	}	
-	else if (parentElementName.equals("fault"))
-	{
-	  result = localName.equals("fault"); 	  
-	}
-	else if (parentElementName.equals("port"))
-	{
-	  result = localName.equals("address"); 	  
-	}	
-
-    return result;
-  }     
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/filter/XSDExtensiblityElementFilter.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/filter/XSDExtensiblityElementFilter.java
deleted file mode 100644
index c9d3aecc1..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/filter/XSDExtensiblityElementFilter.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.filter;
-
-import org.w3c.dom.Element;
-
-public class XSDExtensiblityElementFilter implements ExtensiblityElementFilter
-{   
-  public XSDExtensiblityElementFilter()
-  {
-  }  	
-	
-  public boolean isValidContext(Element parentElement, String localName)
-  {
-  	boolean result = false;
-    String parentElementName = parentElement.getLocalName();
-	if (parentElementName.equals("types"))
-	{
-	  result = localName.equals("schema"); 	  
-	}	  	
-    return result;
-  }     
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/editparts/InteractorHelper.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/editparts/InteractorHelper.java
deleted file mode 100644
index 4709c16b6..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/editparts/InteractorHelper.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.gef.util.editparts;
-
-import java.util.Iterator;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.LayoutManager;
-import org.eclipse.draw2d.MouseEvent;
-import org.eclipse.draw2d.MouseListener;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.eclipse.wst.wsdl.ui.internal.gef.util.figures.Interactor;
-import org.eclipse.wst.xsd.ui.internal.gef.util.figures.IExpandable;
-
-                 
-// hooks up an interactor with an edit part and the figure that needs to be expanded and collapsed
-//
-public class InteractorHelper implements MouseListener
-{                             
-  protected boolean needToPerformDefaultExpansion = true;
-  protected EditPart editPart;               
-  protected Interactor interactor;                                                        
-  protected IExpandable expandable;
-
-  public InteractorHelper(EditPart editPart, Interactor interactor, IExpandable expandable)
-  {                          
-    this.editPart = editPart;
-    this.interactor = interactor;
-    this.expandable = expandable;
-    interactor.addMouseListener(this);
-    expandable.setExpanded(interactor.isExpanded());
-  }                  
-
-  public void setExpanded(boolean isExpanded)
-  {
-    interactor.setExpanded(isExpanded);
-    interactorExpansionChanged(isExpanded);
-  }
-  
-  protected void interactorExpansionChanged(boolean isInteractorExpanded)
-  { 
-    expandable.setExpanded(isInteractorExpanded);
-    expandable.setVisible(isInteractorExpanded);
-
-    editPart.refresh();
-
-    EditPart root = editPart.getRoot();
-    if (root instanceof AbstractGraphicalEditPart)
-    {                               
-      IFigure rootFigure = ((AbstractGraphicalEditPart)root).getFigure();
-      invalidateAll(rootFigure);
-      rootFigure.validate();
-      rootFigure.repaint();
-    }      
-  }
-
-         
-  protected void invalidateAll(IFigure figure)
-  {
-    figure.invalidate();   
-    LayoutManager manager = figure.getLayoutManager();
-    if (manager != null)
-    {
-      manager.invalidate();
-    }
-    for (Iterator i = figure.getChildren().iterator(); i.hasNext(); )
-    {
-      IFigure child = (IFigure)i.next();
-      invalidateAll(child);
-    }
-  } 
-     
-
-  // implements MouseListener
-  //
-  public void mouseDoubleClicked(MouseEvent me) 
-  {      
-  }
- 
-  public void mousePressed(MouseEvent me)
-  {      
-    boolean newExpansionState = !interactor.isExpanded();
-    interactor.setExpanded(newExpansionState);
-    interactorExpansionChanged(newExpansionState);
-  }
- 
-  public void mouseReleased(MouseEvent me)  
-  { 
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/editparts/MultiContentPaneEditPart.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/editparts/MultiContentPaneEditPart.java
deleted file mode 100644
index 115179acb..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/editparts/MultiContentPaneEditPart.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.gef.util.editparts;
-                               
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-
-
-public abstract class MultiContentPaneEditPart extends AbstractGraphicalEditPart
-{
-  protected IFigure[] contentPanes;
-  protected int[] contentPaneIndexAdjustment;
-                         
-  protected IFigure[] initContentPanes()
-  {                             
-    return null;
-  }    
-
-  protected int getContentPane(Object model)
-  {  
-    return 0;
-  }
-    
-  protected List sortByContentPane(List list)
-  {                    
-    return list;
-  }  
-
-
-  protected void setFigure(IFigure figure)
-  {
-	  super.setFigure(figure);
-    contentPanes = initContentPanes();   
-    if (contentPanes != null)
-    {
-      contentPaneIndexAdjustment = new int[contentPanes.length];
-    }
-  }        
-     
-
-  protected void updateContentPaneInfoIndexAdjustment(List list)
-  { 
-    int index = 0;  
-    int listSize = list.size();
-
-    for (int  j = 0; j < contentPanes.length; j++)
-    { 
-      contentPaneIndexAdjustment[j] = index;
-      while (index < listSize)
-      {              
-        Object model = list.get(index);
-        if (getContentPane(model) != j)
-        {
-          break;
-        }                          
-        index++;
-      }
-    }
-  }
-                            
-
-  protected void refreshChildren()
-  {                        
-    if (contentPanes != null)
-    {
-      List sortedList = sortByContentPane(getModelChildren());
-      updateContentPaneInfoIndexAdjustment(sortedList);
-    }
-    super.refreshChildren();
-  }
-                            
-
-  protected void addChildVisual(EditPart childEditPart, int index)
-  {                
-    if (contentPanes != null)
-    {
-      int j = getContentPane(childEditPart.getModel());
-      if (contentPaneIndexAdjustment.length > j)
-      {
-        int adjustedIndex = index - contentPaneIndexAdjustment[j];
-        if (adjustedIndex >= 0)
-        {
-  	      IFigure child = ((GraphicalEditPart)childEditPart).getFigure();
-  	      contentPanes[j].add(child, adjustedIndex);
-        }
-      }
-    }  
-    else
-    {
-      super.addChildVisual(childEditPart, index);
-    }
-  }
-
-  
-  protected void removeChildVisual(EditPart childEditPart)
-  {                         
-    if (contentPanes != null)
-    {
-      int j = getContentPane(childEditPart.getModel());
-      IFigure child = ((GraphicalEditPart)childEditPart).getFigure();
-      contentPanes[j].remove(child);  
-    }    
-    else
-    {
-      super.removeChildVisual(childEditPart);
-    }
-  }
-
-  protected void reorderChild(EditPart editpart, int index)
-  {
-    removeChildVisual(editpart);
-    List children = getChildren();
-    children.remove(editpart);
-    children.add(index, editpart);
-    addChildVisual(editpart, index);
-  }
-}     
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/editpolicies/IDirectEditPolicyDelegate.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/editpolicies/IDirectEditPolicyDelegate.java
deleted file mode 100644
index e2a84e899..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/editpolicies/IDirectEditPolicyDelegate.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.gef.util.editpolicies;
-   
-import org.eclipse.jface.viewers.CellEditor;
-
-public interface IDirectEditPolicyDelegate
-{       
-  public void performEdit(CellEditor cellEditor);  
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/editpolicies/TextCellEditorManager.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/editpolicies/TextCellEditorManager.java
deleted file mode 100644
index 7bac729ac..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/editpolicies/TextCellEditorManager.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.gef.util.editpolicies;
-                                                  
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.tools.CellEditorLocator;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Text;
-
-public abstract class TextCellEditorManager extends DirectEditManager implements IDirectEditPolicyDelegate
-{
-  protected Label label;                                 
-
-  public TextCellEditorManager(GraphicalEditPart source,	Label label)
-  {
-	  super(source, TextCellEditor.class, new InternalCellEditorLocator(label));
-    this.label = label;     
-  }
-
-  protected void initCellEditor() 
-  {                                             
-  	String initialLabelText = label.getText();
-  	getCellEditor().setValue(initialLabelText);
-  	Text text = (Text)getCellEditor().getControl();
-  	text.setFont(label.getFont());
-    text.setForeground(label.getForegroundColor());
-    text.setBackground(label.getBackgroundColor());
-  	text.selectAll();
-  }	          
-
-  protected abstract void performModify(String value);
-    
-  public static class InternalCellEditorLocator implements CellEditorLocator
-  {
-    protected Label label;
-
-    public InternalCellEditorLocator(Label label)
-    {
-      this.label = label;
-    }                   
-
-    public void relocate(CellEditor celleditor) 
-    {
-      Text text = (Text)celleditor.getControl();  
-	    Point sel = text.getSelection();
-	    Point pref = text.computeSize(-1, -1);
-	    Rectangle rect = label.getTextBounds().getCopy();
-	    label.translateToAbsolute(rect);
-	    text.setBounds(rect.x-4, rect.y-1, pref.x+1, pref.y+1);	
-	    text.setSelection(0);
-	    text.setSelection(sel); 
-    }
-  }    
-
-  // implements DirectEditPolicyDelegate
-  // 
-  public void performEdit(CellEditor cellEditor)
-  {
-    performModify((String)cellEditor.getValue());
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/figures/CenterLayout.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/figures/CenterLayout.java
deleted file mode 100644
index f83f38572..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/figures/CenterLayout.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.gef.util.figures;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.AbstractLayout;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-
-/**
- * Figures using the StackLayout as their layout manager have
- * their children placed on top of one another. Order of 
- * placement is determined by the order in which the children
- * were added, first child added placed on the bottom.
- */
-public class CenterLayout	extends AbstractLayout
-{       
-  public static final int ALIGNMENT_TOP = 1;
-  public static final int ALIGNMENT_CENTER = 2;
-  public static final int ALIGNMENT_BOTTOM = 3;
-                        
-  protected int spacing;
-  protected int verticalAlignment = ALIGNMENT_CENTER;
-  
-  public CenterLayout(){}
-  public CenterLayout(int spacing){ this.spacing = spacing; }
-  
- 
-  /**
-   * Calculates and returns the preferred size of the input container.
-   * This is the size of the largest child of the container, as all
-   * other children fit into this size.
-   *
-   * @param figure  Container figure for which preferred size is required.
-   * @return  The preferred size of the input figure.
-   */
-//  protected Dimension calculatePreferredSize(IFigure figure)
-  protected Dimension calculatePreferredSize(IFigure figure, int width, int height)
-  {
-  	Dimension d = calculatePreferredClientAreaSize(figure);
-//  	d.expand(figure.getInsets().getWidth(),
-//  	         figure.getInsets().getHeight());
-    d.expand(width, height);
-  	d.union(getBorderPreferredSize(figure));
-  	return d;
-  }
-  
-  protected Dimension calculatePreferredClientAreaSize(IFigure figure)
-  {
-  	Dimension d = new Dimension();
-  	List children = figure.getChildren();
-  	for (Iterator i = children.iterator(); i.hasNext(); )
-    {
-  		IFigure child = (IFigure)i.next();
-      Dimension childSize = child.getPreferredSize();
-      d.height += childSize.height;
-      d.width = Math.max(childSize.width, d.width);
-  	}	                    
-    int childrenSize = children.size();       
-    if (childrenSize > 0)
-    {
-      d.height += spacing * children.size() - 1;
-    }
-  	return d;
-  }
-  
-  /*
-   * Returns the minimum size required by the input container.
-   * This is the size of the largest child of the container, as all
-   * other children fit into this size.
-   */
-  // TODO GEF PORT
-  public Dimension getMinimumSize(IFigure figure, int width, int height)
-  {
-  	Dimension d = new Dimension();
-  	List children = figure.getChildren();
-  	IFigure child;
-  	for (int i=0; i < children.size(); i++)
-    {
-  		child = (IFigure)children.get(i);
-  		d.union(child.getMinimumSize());
-  	}
-  	d.expand(figure.getInsets().getWidth(), figure.getInsets().getHeight());
-  	return d;
-  }
-  // TODO GEF PORT
-  public Dimension getPreferredSize(IFigure figure, int width, int height)
-  {
-  	return calculatePreferredSize(figure, figure.getInsets().getWidth(), figure.getInsets().getHeight());
-  }
-  
-  
-  public void layout(IFigure figure)
-  {
-  	Rectangle r = figure.getClientArea();
-  	List children = figure.getChildren();
-    
-    Dimension preferredClientAreaSize = calculatePreferredClientAreaSize(figure);
-  
-    int x = r.x + (r.width - preferredClientAreaSize.width) / 2;
-    int y = 0;
-  
-    switch (getVerticalAlignment())
-    {
-      case ALIGNMENT_TOP :  
-      {
-        y = r.y;
-        break;
-      }
-      case ALIGNMENT_CENTER :
-      {
-        y = r.y + (r.height - preferredClientAreaSize.height) / 2;
-        break;
-      }
-      case ALIGNMENT_BOTTOM :
-      {
-        y = r.y + (r.height - preferredClientAreaSize.height);
-        break;
-      }
-    }
-        
-  	for (Iterator i = children.iterator(); i.hasNext(); )
-    {
-  		IFigure child = (IFigure)i.next();
-      Dimension childSize = child.getPreferredSize();
-  		child.setBounds(new Rectangle(x, y, childSize.width, childSize.height));
-      y += childSize.height + spacing;
-  	}
-  }
-  
-  /**
-   * @param verticalAlignment The verticalAlignment to set.
-   */
-  public void setVerticalAlignment(int verticalAlignment)
-  {
-    this.verticalAlignment = verticalAlignment;
-  }
-  
-  protected int getVerticalAlignment()
-  {
-    return verticalAlignment;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/figures/IGraphNodeFigure.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/figures/IGraphNodeFigure.java
deleted file mode 100644
index bd9d85ad9..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/figures/IGraphNodeFigure.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.gef.util.figures;
-            
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-
-public interface IGraphNodeFigure extends IFigure
-{                       
-  public static final int UP_CONNECTION = 1; 
-  public static final int DOWN_CONNECTION = 2;
-  public static final int LEFT_CONNECTION = 3;
-  public static final int RIGHT_CONNECTION = 4;
-
-  public IFigure getSelectionFigure();
-  public IFigure getConnectionFigure();
-  public List getConnectedFigures(int type);
-  public int getConnectionType();      
-  public void addConnectedFigure(IGraphNodeFigure figure);
-  public void removeConnectedFigure(IGraphNodeFigure figure);
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/figures/Interactor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/figures/Interactor.java
deleted file mode 100644
index 3e27c0379..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/figures/Interactor.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.gef.util.figures;
-            
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.RectangleFigure;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-/**
- * Interactor the +/- control commonly found in trees
- */
-public class Interactor extends RectangleFigure
-{
-  protected boolean isExpanded;
-
-  public Interactor()
-  {
-    super(); 
-    setPreferredSize(new Dimension(9, 9));               
-  }  
-
-  public void setExpanded(boolean isExpanded)
-  {                                         
-    this.isExpanded = isExpanded;
-    repaint();
-  }
-
-  public boolean isExpanded()
-  {
-    return isExpanded;
-  }
-    
-  protected void fillShape(Graphics g)
-  {
-    super.fillShape(g);
-    Rectangle r = getBounds();                          
-    int mx = r.x + r.width / 2;
-    int my = r.y + r.height / 2;    
-    int s = 2;       
-    g.drawLine(r.x + s, my, r.x + r.width - s - 1, my); 
-    if (!isExpanded)
-    {
-      g.drawLine(mx, r.y + s, mx, r.y + r.height - s -1);
-    }
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/figures/RoundedLineBorder.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/figures/RoundedLineBorder.java
deleted file mode 100644
index b1bfad47d..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/figures/RoundedLineBorder.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.gef.util.figures;
-            
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.LineBorder;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.swt.graphics.Color;
-
-public class RoundedLineBorder extends LineBorder
-{               
-  protected int arcLength;   
-  protected int lineStyle = Graphics.LINE_SOLID;
-
-  public RoundedLineBorder(Color c, int width, int arcLength)
-  {
-	  super(c, width);     
-    this.arcLength = arcLength;
-  }
-
-  public RoundedLineBorder(int width, int arcLength)
-  {
-	  super(width);     
-    this.arcLength = arcLength;
-  }
-  
-  public RoundedLineBorder(Color c, int width, int arcLength, int lineStyle)
-  {
-    super(c, width);
-    this.arcLength = arcLength;
-    this.lineStyle = lineStyle;
-  }
-
-  public RoundedLineBorder(int width, int arcLength, int lineStyle)
-  {
-    super(width);
-    this.arcLength = arcLength;
-    this.lineStyle = lineStyle;
-  }
-
-  public void paint(IFigure figure, Graphics graphics, Insets insets)
-  {
-	  tempRect.setBounds(getPaintRectangle(figure, insets));
-    int width = getWidth();
-    Color color = getColor();
-  	if (width%2 == 1)
-    {
-		  tempRect.width--;
-		  tempRect.height--;
-	  }
-	  tempRect.shrink(width/2,width/2);
-	  graphics.setLineWidth(width);
-    graphics.setLineStyle(lineStyle);
-	  if (color != null)
-		  graphics.setForegroundColor(color);
-	  graphics.drawRoundRectangle(tempRect, arcLength, arcLength);
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/FigureCanvasKeyboardHandler.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/FigureCanvasKeyboardHandler.java
deleted file mode 100644
index e861ddf2b..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/FigureCanvasKeyboardHandler.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph;
-
-import org.eclipse.draw2d.FigureCanvas;
-import org.eclipse.draw2d.RangeModel;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Widget;
-
-public class FigureCanvasKeyboardHandler extends KeyAdapter
-{
-  public static final int H_SCROLL_INCREMENT = 5;
-  public static final int V_SCROLL_INCREMENT = 30;
-
-  /**
-   * Constructor for FigureCanvasKeyboardHandler.
-   */
-  public FigureCanvasKeyboardHandler()
-  {
-    super();
-  }
-
-  public void keyPressed(KeyEvent e)
-  {
-    Widget w = e.widget;
-    if (w instanceof FigureCanvas)
-    {
-      processKey(e.keyCode, (FigureCanvas)w);
-    }
-  }
-
-  private void processKey(int keyCode, FigureCanvas figureCanvas)
-  {
-    switch (keyCode)
-    {
-      case SWT.ARROW_DOWN :
-        scrollVertical(figureCanvas, false);
-        break;
-      case SWT.ARROW_UP :
-        scrollVertical(figureCanvas, true);
-        break;
-      case SWT.ARROW_LEFT :
-        scrollHorizontal(figureCanvas, true);
-        break;
-      case SWT.ARROW_RIGHT :
-        scrollHorizontal(figureCanvas, false);
-        break;
-      case SWT.PAGE_UP :
-        scrollPage(figureCanvas, true);
-        break;
-      case SWT.PAGE_DOWN :
-        scrollPage(figureCanvas, false);
-        break;
-    }
-  }
-
-  private int verifyScrollBarOffset(RangeModel model, int value)
-  {
-    value = Math.max(model.getMinimum(), value);
-    return Math.min(model.getMaximum() - model.getExtent(), value);
-  }
-
-  private void scrollVertical(FigureCanvas figureCanvas, boolean up)
-  {
-    Point location = figureCanvas.getViewport().getViewLocation();
-    int vOffset = up ? -V_SCROLL_INCREMENT : V_SCROLL_INCREMENT;
-    int x = verifyScrollBarOffset(figureCanvas.getViewport().getHorizontalRangeModel(), location.x);
-    int y = verifyScrollBarOffset(figureCanvas.getViewport().getVerticalRangeModel(), location.y + vOffset);
-    figureCanvas.scrollSmoothTo(x, y);
-  }
-
-  private void scrollHorizontal(FigureCanvas figureCanvas, boolean left)
-  {
-    Point location = figureCanvas.getViewport().getViewLocation();
-    int hOffset = left ? -H_SCROLL_INCREMENT : H_SCROLL_INCREMENT;
-    int x = verifyScrollBarOffset(figureCanvas.getViewport().getHorizontalRangeModel(), location.x + hOffset);
-    int y = verifyScrollBarOffset(figureCanvas.getViewport().getVerticalRangeModel(), location.y);
-    figureCanvas.scrollSmoothTo(x, y);
-  }
-
-  private void scrollPage(FigureCanvas figureCanvas, boolean up)
-  {
-    Rectangle clientArea = figureCanvas.getClientArea();
-    int increment = up ? -clientArea.height : clientArea.height;
-    Point location = figureCanvas.getViewport().getViewLocation();
-    int x = verifyScrollBarOffset(figureCanvas.getViewport().getHorizontalRangeModel(), location.x);
-    int y = verifyScrollBarOffset(figureCanvas.getViewport().getVerticalRangeModel(), location.y + increment);
-    figureCanvas.scrollSmoothTo(x, y);
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/GraphViewToolBar.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/GraphViewToolBar.java
deleted file mode 100644
index 5fec3a0b1..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/GraphViewToolBar.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph;
-                                                 
-import java.util.List;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.ViewForm;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.TraverseEvent;
-import org.eclipse.swt.events.TraverseListener;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.ToolBar;
-import org.eclipse.swt.widgets.ToolItem;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.graph.model.WSDLGraphModelAdapterFactory;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSchemaDirective;
-
- 
-public class GraphViewToolBar extends ViewForm
-{
-    ToolBar graphToolBar;  // the toolbar at the top of the graph view
-    //ToolItem toolItem;   // the view tool item
-    Composite frameBar;  // The composite that contains the toolbar
-    WSDLEditor editor;                        
-
-    ToolItem showBindingsButton;   // the view tool item   
-    ToolItem backButton;
-
-    public GraphViewToolBar(WSDLEditor wsdlEditor, Composite c, int style)
-    {
-      super(c, style);
-      this.editor = wsdlEditor;
-      frameBar = new Composite(this, SWT.NONE);
-      /*
-      CLabel label = new CLabel(frameBar, SWT.NONE);
-      label.setText("View :");
-      */
-      org.eclipse.swt.layout.GridLayout frameLayout = new org.eclipse.swt.layout.GridLayout();
-      frameLayout.numColumns = 3;
-      frameLayout.horizontalSpacing = 0;
-      frameLayout.marginWidth = 0;
-      frameLayout.marginHeight = 0;     
-
-      frameBar.setLayout(frameLayout);
-      
-      graphToolBar = new ToolBar(frameBar, SWT.FLAT);
-      graphToolBar.addTraverseListener(new TraverseListener()
-      {
-        public void keyTraversed(TraverseEvent e)
-        {
-          if (e.detail == SWT.TRAVERSE_MNEMONIC)
-           e.doit = false;
-        }
-      });
-              
-
-      backButton = new ToolItem(graphToolBar, SWT.PUSH);
-      backButton.setImage(WSDLEditorPlugin.getInstance().getImage("icons/back.gif"));
-      // backButton.setToolTipText(WSDLEditorPlugin.getWSDLString("_UI_BACK_TO", "Definition"));
-      backButton.setToolTipText(WSDLEditorPlugin.getWSDLString("_UI_BACK"));
-      backButton.setEnabled(false);
-      backButton.addSelectionListener(new org.eclipse.swt.events.SelectionAdapter()
-      {
-        public void widgetSelected(SelectionEvent e)
-        {
-          Object object = editor.getGraphViewer().getComponentViewer().getInput();
-          if (object instanceof XSDSchema)
-          {
-            editor.getGraphViewer().setInput(editor.getDefinition());
-          }
-          else if (object instanceof XSDConcreteComponent)
-          {
-            // Need to common this up with xsdeditor's BackAction code
-            XSDSchema xsdSchema = ((XSDConcreteComponent)object).getSchema();
-            boolean flag = true;
-            while (flag)
-            {
-              List list = xsdSchema.getReferencingDirectives();
-              if (list.size() > 0)
-              {
-                XSDSchemaDirective xsdSchemaDirective = (XSDSchemaDirective)list.get(0);
-                if (xsdSchemaDirective.getSchema() != null)
-                {
-                  xsdSchema = xsdSchemaDirective.getSchema();
-                }
-                else
-                {
-                  flag = false;
-                }
-              }
-              else
-              {
-                flag = false;
-              }
-            }
-
-            editor.getGraphViewer().setInput(xsdSchema);
-          }
-          else
-          {
-            editor.getGraphViewer().setInput(editor.getDefinition());
-          }
-        }
-      }); 
-
-      // hack to make the button look like a toggle button.  SWT.TOGGLE is not an allowed style
-      // for a ToolItem, but SWT.RADIO is.  SWT.RADIO makes it look like a toggle.......
-      showBindingsButton = new ToolItem(graphToolBar, SWT.RADIO);
-      showBindingsButton.setImage(WSDLEditorPlugin.getInstance().getImage("icons/hidebinding.gif"));
-      showBindingsButton.setToolTipText(WSDLEditorPlugin.getWSDLString("_UI_HIDE_BINDINGS")); 
-      showBindingsButton.addSelectionListener(new org.eclipse.swt.events.SelectionAdapter()
-      {
-      	private boolean currentlySelected = false;
-      	
-        public void widgetSelected(SelectionEvent e)
-        {                                             
-          ViewMode vm = WSDLGraphModelAdapterFactory.getViewMode((Definition)editor.getDefinition());
-          vm.setBindingVisible(!vm.isBindingVisible());
-          
-          // hack to make the button look like a toggle button
-          ToolItem item = (ToolItem) e.widget;
-          if (currentlySelected) {
-          	item.setSelection(false);
-          	currentlySelected = false;
-          }
-          else {
-          	currentlySelected = true;
-          }
-        }
-      }); 
-
-      setTopLeft(frameBar);
-    }
-    
-    public void setBackButtonEnabled(boolean state)
-    {
-      backButton.setEnabled(state);
-    }
-
-    
-//    public void updateHoverHelp(Object object)
-//    {
-//      if (object instanceof XSDSchema)
-//      {
-//        backButton.setToolTipText(WSDLEditorPlugin.getWSDLString("_UI_BACK_TO", "Definition"));
-//      }
-//      else if (object instanceof XSDConcreteComponent)
-//      {
-//        backButton.setToolTipText(WSDLEditorPlugin.getWSDLString("_UI_BACK_TO", "XML Schema"));
-//      }
-//    }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/GraphicsConstants.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/GraphicsConstants.java
deleted file mode 100644
index 8170eba7d..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/GraphicsConstants.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * A collection of color and font related constants.
- */
-public interface GraphicsConstants 
-{                          
-  public final static Display display = Display.getDefault(); 
-                                                 
-  public final static Color groupBorderColor        = new Color(null, 118, 134, 164);
-  public final static Color groupHeaderColor        = new Color(null, 232, 240, 248);
-
-  public final static Color elementBorderColor      = new Color(null, 120, 152, 184);
-  public final static Color elementBackgroundColor  = new Color(null, 232, 240, 248);  
-  public final static Color elementLabelColor       = new Color(null,  80, 102, 144);
-  public final static Color readOnlyBorderColor     = new Color(null, 164, 164, 164); 
-  public final static Color red                     = new Color(null, 255,   0,   0); 
-
-  public final static Color readOnlyBackgroundColor = ColorConstants.white;
-
-  public final static Font  smallBoldFont           = new Font(Display.getCurrent(), "Tahoma", 8, SWT.BOLD);
-  public final static Font  mediumFont              = new Font(Display.getCurrent(), "Tahoma", 10, SWT.NONE);
-  public final static Font  mediumBoldFont          = new Font(Display.getCurrent(), "Tahoma", 10, SWT.BOLD); 
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/ViewMode.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/ViewMode.java
deleted file mode 100644
index 6275daf4f..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/ViewMode.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-public class ViewMode 
-{
-  public static final int BINDING     =   1;
-  public static final int MESSAGE     =   2;
-  public static final int PORT_TYPE   =   3;
-  public static final int SERVICE     =   4;
-  public static final int TYPES       =   5;
-
-  public static final String BINDING_DESCRIPTION     = WSDLEditorPlugin.getWSDLString("_UI_LABEL_BINDING");
-  public static final String MESSAGE_DESCRIPTION     = WSDLEditorPlugin.getWSDLString("_UI_LABEL_MESSAGE");
-  public static final String PORT_TYPE_DESCRIPTION   = WSDLEditorPlugin.getWSDLString("_UI_LABEL_PORTTYPE");
-  public static final String SERVICE_DESCRIPTION     = WSDLEditorPlugin.getWSDLString("_UI_LABEL_SERVICE");
-  public static final String TYPES_DESCRIPTION       = WSDLEditorPlugin.getWSDLString("_UI_LABEL_TYPES");
-
-
-  protected boolean isBindingVisible = true;
-  protected int mode = SERVICE;
-  protected List listenerList = new ArrayList();
-
-  public ViewMode()
-  {
-  }                              
-
-  public void setBindingVisible(boolean isVisible)
-  {
-    if (isBindingVisible != isVisible)
-    {
-      isBindingVisible = isVisible;
-      fireChangeNotification();
-    }
-  }
-
-  public boolean isBindingVisible()
-  {                                                   
-    return isBindingVisible;
-  }
-
-  public static int getModeForDescription(String description)
-  {               
-    int result = SERVICE;
-    if (description.equals(BINDING_DESCRIPTION))
-    {               
-      result = BINDING; 
-    }
-    else if (description.equals(MESSAGE_DESCRIPTION))
-    {        
-      result = MESSAGE;
-    }
-    else if (description.equals(PORT_TYPE_DESCRIPTION))
-    { 
-      result = PORT_TYPE;
-    }
-    else if (description.equals(SERVICE_DESCRIPTION))
-    {    
-      result = SERVICE;
-    }
-    else if (description.equals(TYPES_DESCRIPTION))
-    {  
-      result = TYPES;
-    }    
-    return result;
-  }
-
-  public static String getDescriptionForMode(int mode)
-  {               
-    String result = SERVICE_DESCRIPTION;
-    switch (mode)
-    {
-      case BINDING :
-      {             
-        result = BINDING_DESCRIPTION;
-        break;
-      }
-      case MESSAGE : 
-      {             
-        result = MESSAGE_DESCRIPTION;
-        break;
-      }
-      case PORT_TYPE : 
-      {             
-        result = PORT_TYPE_DESCRIPTION;
-        break;
-      }
-      case SERVICE : 
-      {             
-        result = SERVICE_DESCRIPTION;
-        break;
-      }
-      case TYPES :  
-      {             
-        result = TYPES_DESCRIPTION;
-        break;
-      }
-    }
-    return result;
-  }
-
-  public interface Listener
-  {
-    public void viewModeChanged(ViewMode mode);
-  }
-
-  public void setMode(int mode)
-  {
-    this.mode = mode;
-    fireChangeNotification();
-  }
-
-  public void setMode(String description)
-  {
-    this.mode = getModeForDescription(description);
-    fireChangeNotification();
-  }
-
-  public int getMode()
-  {
-    return mode;
-  } 
-
-  public String getModeDescription()
-  {
-    return getDescriptionForMode(mode);
-  }
-
-  public void addListener(Listener listener)
-  {
-    if (!listenerList.contains(listener))
-    { 
-      listenerList.add(listener);
-    }  
-  }
-
-  public void removeListener(Listener listener)
-  {
-    listenerList.remove(listener);
-  }  
-
-  public void fireChangeNotification()
-  {
-    for (Iterator i = listenerList.iterator(); i.hasNext(); )
-    {
-      Listener listener = (Listener)i.next();
-      listener.viewModeChanged(this);
-    }
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/WSDLComponentViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/WSDLComponentViewer.java
deleted file mode 100644
index b551a22a6..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/WSDLComponentViewer.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph;
-
-import java.util.List;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.StackLayout;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.ContextMenuProvider;
-import org.eclipse.gef.DefaultEditDomain;
-import org.eclipse.gef.EditDomain;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.LayerConstants;
-import org.eclipse.gef.editparts.ScalableRootEditPart;
-import org.eclipse.gef.tools.SelectionTool;
-import org.eclipse.gef.ui.parts.ScrollingGraphicalViewer;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.actions.ExtensibleMenuActionContributor;
-import org.eclipse.wst.wsdl.ui.internal.gef.util.figures.CenterLayout;
-import org.eclipse.wst.wsdl.ui.internal.graph.editparts.ComponentViewerRootEditPart;
-import org.eclipse.wst.wsdl.ui.internal.graph.figures.MyConnectionRenderingHelper;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject;
-import org.eclipse.wst.wsdl.ui.internal.util.OpenOnSelectionHelper;
-import org.eclipse.wst.xsd.ui.internal.gef.util.figures.ConnectionRenderingFigure;
-import org.eclipse.wst.xsd.ui.internal.gef.util.figures.IConnectionRenderingViewer;
-import org.w3c.dom.Node;
-
-public class WSDLComponentViewer extends ScrollingGraphicalViewer implements IConnectionRenderingViewer
-{
-  protected EditDomain editDomain;
-  protected WSDLEditor editor;
-  protected ISelectionProvider menuSelectionProvider;
-  protected ComponentViewerRootEditPart componentViewerRootEditPart;
-  protected ConnectionRenderingFigure connectionRenderingFigure;
-  protected boolean isPreserveExpansionEnabled;
-
-  public WSDLComponentViewer(WSDLEditor editor, ISelectionProvider menuSelectionProvider)
-  {
-    super();
-    this.editor = editor;
-    this.menuSelectionProvider = menuSelectionProvider;
-  }
-
-  public void setPreserveExpansionEnabled(boolean isPreserveExpansionEnabled)
-  {
-    this.isPreserveExpansionEnabled = isPreserveExpansionEnabled;
-  }
-
-  public boolean isPreserveExpansionEnabled()
-  {
-    return isPreserveExpansionEnabled;
-  }
-
-  public ConnectionRenderingFigure getConnectionRenderingFigure()
-  {
-    return connectionRenderingFigure;
-  }
-
-  public Object getInput()
-  {
-    return componentViewerRootEditPart.getModel();
-  }
-
-  public void setInput(Object object)
-  {
-    componentViewerRootEditPart.setInput(object);
-    
-    if (object instanceof Definition)
-    {
-      editor.getGraphViewer().setBackButtonEnabled(false);
-    }
-    else
-    {
-      editor.getGraphViewer().setBackButtonEnabled(true);
-    }
-    
-    // todo.. revisit this to understand why we don't get a set input
-    // when drilling down into a schema element or type
-    //
-    int layoutAlignment = (object instanceof Definition) ? 
-                          CenterLayout.ALIGNMENT_TOP :
-                          CenterLayout.ALIGNMENT_CENTER;
-    
-    ScalableRootEditPart graphicalRootEditPart = (ScalableRootEditPart)getRootEditPart();
-    CenterLayout centerLayout = (CenterLayout)graphicalRootEditPart.getLayer(LayerConstants.PRIMARY_LAYER).getLayoutManager();
-    centerLayout.setVerticalAlignment(layoutAlignment);
-  }
-
-  //public void setSelection(Object object)
-  //{                                      
-  //}
-
-  protected void hookControl()
-  {
-    super.hookControl();
-
-    getControl().setBackground(ColorConstants.white);
-
-    editDomain = new DefaultEditDomain(null);
-    ((DefaultEditDomain)editDomain).setDefaultTool(new SelectionTool());
-    editDomain.loadDefaultTool();
-    editDomain.addViewer(this);
-
-    componentViewerRootEditPart = new ComponentViewerRootEditPart();
-
-    KeyAdapter keyListener = new KeyAdapter()
-    {
-      public void keyReleased(KeyEvent e)
-      {   	
-        if (e.keyCode == SWT.F3)
-        {
-          ISelection selection = editor.getSelectionManager().getSelection();
-          if (selection instanceof IStructuredSelection)
-          {
-            Object object = ((IStructuredSelection)selection).getFirstElement();
-            if (object instanceof EObject)
-            {
-			  OpenOnSelectionHelper helper = new OpenOnSelectionHelper(editor.getDefinition());
-              helper.openEditor((EObject)object);
-            }
-          }
-
-        }
-      }
-    };
-    getControl().addKeyListener(keyListener);
-
-    setContents(componentViewerRootEditPart);
-    //getFigureCanvas().addKeyListener(new FigureCanvasKeyboardHandler(editor));
-    getRootEditPart().activate();
-
-    componentViewerRootEditPart.setInput(editor.getDefinition());
-
-    ScalableRootEditPart graphicalRootEditPart = (ScalableRootEditPart)getRootEditPart();
-
-    // set the layout for the primary layer so that the children are always centered
-    //
-    CenterLayout centerLayout = new CenterLayout();
-    centerLayout.setVerticalAlignment(CenterLayout.ALIGNMENT_TOP);
-    graphicalRootEditPart.getLayer(LayerConstants.PRIMARY_LAYER).setLayoutManager(centerLayout); //new ContainerLayout());//
-
-    ContextMenuProvider menuProvider = new InternalContextMenuProvider(this, editor); 
-    setContextMenu(menuProvider);
-    
-    // add context menu to the graph
-    MenuManager manager = new MenuManager("#popup");
-    manager.addMenuListener(menuProvider);
-    manager.setRemoveAllWhenShown(true);
-    Menu menu = manager.createContextMenu(getControl());
-    getControl().setMenu(menu);    
-    
-    // enable popupMenus extension
-    ((IEditorSite) editor.getSite()).registerContextMenu("org.eclipse.wst.wsdl.ui.popup.graph", manager, menuSelectionProvider, false);
-  
-    // add the ConnectionFigure which is responsible for drawing all of the lines in the view
-    //                       
-    IFigure figure = graphicalRootEditPart.getLayer(LayerConstants.CONNECTION_LAYER);
-    figure.setLayoutManager(new StackLayout());
-
-    final MyConnectionRenderingHelper connectionRenderingHelper = new MyConnectionRenderingHelper(this);
-
-    connectionRenderingFigure = new ConnectionRenderingFigure(graphicalRootEditPart.getLayer(LayerConstants.PRIMARY_LAYER))
-    {
-      protected void fillShape(Graphics graphics)
-      {
-        super.fillShape(graphics);
-        connectionRenderingHelper.fillShapeHelper(graphics);
-      }
-    };
-    figure.add(connectionRenderingFigure);
-    figure.validate();
-  }
-  
-  public WSDLEditor getWSDLEditor() {
-  	return editor;
-  }
-
-  public class InternalContextMenuProvider extends ContextMenuProvider
-  {
-    protected EditPartViewer viewer;
-    protected ExtensibleMenuActionContributor extensibleMenuActionContributor;
-
-    public InternalContextMenuProvider(EditPartViewer viewer, WSDLEditor editor)
-    {
-      super(viewer);
-      this.viewer = viewer;
-      extensibleMenuActionContributor = new ExtensibleMenuActionContributor(editor);
-    }
-
-    public void buildContextMenu(IMenuManager menu)
-    {
-      List list = getSelectedEditParts();
-      if (list.size() > 0)
-      {
-        EditPart editPart = (EditPart)list.get(0);
-        Object object = editPart.getModel();
-
-        //if (editPart instanceof PropertyEditPart)
-        //{
-        //  object = ((PropertyEditPart)editPart).getOwnerModel();
-        //}               
-
-        if (object != null)
-        {
-          Node node = null;
-          if (object instanceof Node)
-          {
-            node = (Node)object;
-          }
-          else if (object instanceof WSDLElement)
-          {
-            node = ((WSDLElement)object).getElement();
-          }
-          else if (object instanceof WSDLGroupObject)
-          {
-            node = ((WSDLGroupObject)object).getDefinition().getElement();
-          }
-          extensibleMenuActionContributor.contributeMenuActions(menu, node, object);
-        }
-      }
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/WSDLGraphViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/WSDLGraphViewer.java
deleted file mode 100644
index b6a7ddfac..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/WSDLGraphViewer.java
+++ /dev/null
@@ -1,365 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph;
-                                                 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.EditPart;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.actions.CopyGlobalAction;
-import org.eclipse.wst.wsdl.ui.internal.actions.DeleteWSDLAndXSDAction;
-import org.eclipse.wst.wsdl.ui.internal.actions.PasteGlobalAction;
-import org.eclipse.wst.wsdl.ui.internal.graph.editparts.ComponentViewerRootEditPart;
-import org.eclipse.wst.wsdl.ui.internal.graph.editparts.GroupEditPart;
-import org.eclipse.wst.wsdl.ui.internal.graph.editparts.TreeNodeEditPart;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject;
-import org.eclipse.wst.wsdl.ui.internal.util.SelectionAdapter;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDModelGroupDefinition;
-import org.eclipse.xsd.XSDSchema;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class WSDLGraphViewer implements ISelectionChangedListener
-{
-  protected Control componentViewerControl; 
-  protected WSDLComponentViewer componentViewer;
-  protected Definition definition;              
-  protected WSDLEditor editor;  
-  protected InternalSelectionAdapter internalSelectionAdapter = new InternalSelectionAdapter();
-
-  GraphViewToolBar form;  // Tool bar view form
-  
-  public WSDLGraphViewer(WSDLEditor editor)
-  {
-    super();
-    this.editor = editor;                 
-  }    
-
-  public void setDefinition(Definition definition)
-  {
-    this.definition = definition;              
-  }
-
-  public ISelectionProvider getSelectionProvider()
-  {
-    return internalSelectionAdapter;
-  }
-
-  public Control createControl(Composite parent)
-  {
-    componentViewer = new WSDLComponentViewer(editor, editor.getSelectionManager());
-
-    componentViewer.addSelectionChangedListener(internalSelectionAdapter);
-    internalSelectionAdapter.addSelectionChangedListener(editor.getSelectionManager());
-
-    form = new GraphViewToolBar(editor, parent, SWT.NONE);
-
-    componentViewerControl = componentViewer.createControl(form);
-    form.setContent(componentViewerControl);
-
-    editor.getSelectionManager().addSelectionChangedListener(this);
-    
-    componentViewerControl.addKeyListener(new KeyAdapter() {
-    	public void keyPressed(KeyEvent e) {
-    		if (e.character == SWT.DEL) {
-    			List selections = ((IStructuredSelection) editor.getSelectionManager().getSelection()).toList();
-       			DeleteWSDLAndXSDAction deleteAction = new DeleteWSDLAndXSDAction(selections, editor.getDefinition().getElement(), editor);
-       			deleteAction.run();
-    		}
-    	}    	
-    });
-    
-    return componentViewerControl; 
-  }
-
-  public WSDLComponentViewer getComponentViewer()
-  {
-    return componentViewer;
-  }
-
-
-  Node inputNode;    
-  public void setInput(Object object)
-  {
-    componentViewer.setInput(object);
-  }
-  
-  public void setBackButtonEnabled(boolean state)
-  {
-    form.setBackButtonEnabled(state);
-  }
-
-  //protected boolean isDeleted(Object object)
-  //}            
-
-    
-  // this is called when selection changes in the selection manager
-  //
-
-
-  
-  protected Object getInputComponentForNode(Node node)   
-  {
-    // TODO... logic to get WSDLElement or other object (e.g. XSD or extension for the Node)
-    // TODO... consider case where the model is simply a chunk of DOM
-    return null;
-  }
-   
-  protected Object getSelectionComponentForNode(Node node)   
-  {
-    // TODO... logic to get WSDLElement or other object (e.g. XSD or extension for the Node)
-    // TODO... consider case where the model is simply a chunk of DOM
-    return null;
-  } 
-
-  protected class InternalSelectionAdapter extends SelectionAdapter implements ISelectionChangedListener
-  {
-    public Object getObjectForOtherModel(Object object)
-    {            
-      Object result = null;
-      if (object instanceof EditPart)
-      {       
-        // fix for defect 4294 ... this test prevents selection from changing
-        // when a component is renamed which indirectly causes it to be removed and
-        // re-added from the 'sorted' list
-        //
-        if (!(object instanceof ComponentViewerRootEditPart))
-        {  
-          EditPart editPart = (EditPart)object;
-          result = editPart.getModel();
-        }  
-      }
-      return result;
-    }  
-
-    public void selectionChanged(SelectionChangedEvent event)                                       
-    {                                        
-      setSelection(event.getSelection()); 
-    }  
-  }
-    
-  // this gets called when the selection changes within the selection manager
-  //
-  public void selectionChanged(SelectionChangedEvent event) 
-  {   
-    //System.out.println("WSDLGraphViewer.selectionChanged( " + event.getSource() + ")");
-  	
-  	 IStructuredSelection selectionObject = (IStructuredSelection)event.getSelection();
-     Object modelObject = selectionObject.getFirstElement();
-     if (modelObject instanceof WSDLElement) {
-     	Element node = ((WSDLElement) modelObject).getElement();
-         boolean isEditable = (node instanceof IDOMNode);
-         
-     	Action copyAction = new CopyGlobalAction((WSDLElement) modelObject, editor);
-     	Action pasteAction = new PasteGlobalAction((WSDLElement) modelObject, editor);
- 		
- 		IActionBars actionBars = editor.getEditorSite().getActionBars();
- 		actionBars.setGlobalActionHandler(ActionFactory.COPY.getId(), copyAction);
- 		actionBars.setGlobalActionHandler(ActionFactory.PASTE.getId(), pasteAction);
- 		actionBars.updateActionBars();
- 		
- 		if (!isEditable) {
- 			copyAction.setEnabled(false);
- 			pasteAction.setEnabled(false);
- 		}
-     }
-
-    if (event.getSource() != internalSelectionAdapter && event.getSource() != (editor.getTextEditor()).getSelectionProvider())
-    {   
-      boolean isEmptySelectionRequired = true;
-      if (event.getSelection() instanceof IStructuredSelection)
-      {
-        IStructuredSelection selection = (IStructuredSelection)event.getSelection();
-        Object model = selection.getFirstElement();
-
-        if (model != null)
-        {                                                                           
-          EditPart editPart = getEditPart(componentViewer.getRootEditPart(), model);
-          if (editPart == null)
-          {                                                                         
-            editPart = expandToReveal(componentViewer.getRootEditPart(), model);
-          }
-          if (editPart == null)
-          {
-          	if (model instanceof XSDConcreteComponent) {
-          		model = getTopLevelComponent((XSDConcreteComponent) model);
-          		
-				if (model instanceof XSDElementDeclaration ||
-					model instanceof XSDComplexTypeDefinition ||
-					model instanceof XSDModelGroupDefinition ||
-					model instanceof XSDSchema) {
-						componentViewer.setInput(model);
-				}
-            }
-          	else if (model instanceof WSDLElement || model instanceof WSDLGroupObject) {
-          		// We need to switch the output to Definition
-          		componentViewer.setInput(editor.getDefinition());
-          		editPart = getEditPart(componentViewer.getRootEditPart(), model);
-          		if (editPart == null)
-          		{                                                                         
-          			editPart = expandToReveal(componentViewer.getRootEditPart(), model);
-          		}
-          	}
-            else
-            {
-              // bad hack to convert xsd editor category to xsd object
-              // see also WSDLTabbedPropertySheetPage
-              Node node = WSDLEditorUtil.getInstance().getNodeForObject(model);
-              Object o = WSDLEditorUtil.getInstance().findModelObjectForElement(editor.getDefinition(), (Element)node);
-              if (o instanceof XSDSchemaExtensibilityElement)
-              {
-                Object obj = ((XSDSchemaExtensibilityElement)o).getSchema();
-                componentViewer.setInput(obj);
-              }
-            }
-          }
-          if (editPart != null)
-          {
-            isEmptySelectionRequired = false;
-            componentViewer.setSelection(new StructuredSelection(editPart));
-            scrollIntoView(editPart);
-          }   
-        }
-      }
-      if (isEmptySelectionRequired)
-      {
-        componentViewer.setSelection(new StructuredSelection());
-      }
-    }
-  }
-  
-  protected XSDConcreteComponent getTopLevelComponent(XSDConcreteComponent component)
-  {
-    XSDConcreteComponent prev = component;
-    XSDConcreteComponent container = component;
-    while ( container != null && !(container instanceof XSDSchema))
-    {
-      prev = container;     
-      container = container.getContainer();
-    }
-    return container != null ? prev : null;
-  }
-
-  protected EditPart getEditPart(EditPart editPart, Object model)  
-  {                     
-    EditPart result = null;
-    if (editPart.getModel() == model)
-    {
-      result = editPart;      
-    }                   
-    else
-    {
-      for (Iterator i = editPart.getChildren().iterator(); i.hasNext(); )
-      {
-        result = getEditPart((EditPart)i.next(), model);
-        if (result != null)
-        {
-          break;
-        }
-      }
-    }
-    return result;
-  }
-
-
-  public EditPart expandToReveal(EditPart editPart, Object model)
-  {   
-    // here we create the parent list
-    //
-    List parentList = new ArrayList();
-    for (Object o = model; o != null; o = getParent(o))
-    {
-      parentList.add(0, o);
-    }               
-    EditPart result = expandToRevealHelper(editPart, parentList, 0);    
-                 
-    return result;
-  }   
-
-
-  public EditPart expandToRevealHelper(EditPart editPart, List parentList, int index)
-  {                                      
-    EditPart result = null;
-    int parentListSize =  parentList.size();
-    Object model = index < parentListSize ? parentList.get(index) : null;
-    if (model != null && editPart != null)
-    { 
-      // search editpart and its descendants to find a match for this model object
-      //
-      result = getEditPart(editPart, model);  
-      //System.out.println("getEditPart(" + index + ", " + model + ") = " + result);
-    }
-
-    if (result != null)
-    {
-      if (index < (parentListSize - 1))
-      {
-        // we've found the editPart for the item in the parentList 
-        // now we need to find the next item 
-        if (result instanceof TreeNodeEditPart)
-        {
-          ((TreeNodeEditPart)result).setExpanded(true);
-        }           
-        result = expandToRevealHelper(result, parentList, index + 1);
-      }
-    }
-    return result;
-  }
-    
-    
-  protected Object getParent(Object model)
-  { 
-    Object parent = null;
-    if (model instanceof EObject)
-    {
-      parent = ((EObject)model).eContainer();
-    }                                        
-    return parent;
-  }     
-
-
-  public void scrollIntoView(EditPart editPart)
-  {                
-    for (EditPart parent = editPart.getParent(); parent != null; parent = parent.getParent())
-    {
-      if (parent instanceof GroupEditPart)
-      {
-        GroupEditPart groupEditPart = (GroupEditPart)parent;
-        groupEditPart.scrollToRevealEditPart(editPart);
-        break;
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/AbstractConnectionManager.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/AbstractConnectionManager.java
deleted file mode 100644
index 6f84aaa07..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/AbstractConnectionManager.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.editparts;
-                                  
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.internal.util.WSDLSwitch;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-                                                   
-public class AbstractConnectionManager implements IConnectionManager
-{            
-  public static final int PROPAGATE_FORWARD = 0;
-  public static final int PROPAGATE_BACK    = 1;
-  public static final int SELECTED          = 2;
-
-  protected GroupEditPart groupEditPart;
-
-  public AbstractConnectionManager(GroupEditPart groupEditPart)
-  {
-    this.groupEditPart = groupEditPart;
-  }                                    
-                                                
-  protected WSDLSwitch createSwitch(int selectionType)
-  {
-    return new WSDLSwitch();
-  }
-
-  public void propagateForward(Object model)
-  {  
-    if (model instanceof WSDLElement)
-    {
-      WSDLSwitch theSwitch = createSwitch(PROPAGATE_FORWARD);
-      theSwitch.doSwitch((EObject)model);    
-      groupEditPart.scrollToRevealInputConnection();
-    }       
-    else
-    {
-      removeConnections();
-    }
-    propagateForwardToNext(model);
-  }
-
-  public void propagateBack(Object model)
-  {                               
-    if (model instanceof WSDLElement)
-    {                        
-      WSDLSwitch theSwitch = createSwitch(PROPAGATE_BACK);
-      theSwitch.doSwitch((EObject)model);   
-      groupEditPart.scrollToRevealOutputConnection();
-    }
-    else
-    {
-      removeConnections();
-    }
-    propagateBackToPrevious(model);
-  }
-
-  public void setSelectedModelObject(Object model)
-  {  
-	if (model instanceof Node)
-	{
-    	Node node = (Node)model;
-		//Definition definition = groupEditPart.getDefinition();
-        while(node != null)
-        {        
-    	  if (WSDLConstants.WSDL_NAMESPACE_URI.equals(node.getNamespaceURI()))
-    	  {
-    		break;
-    	  }  
-    	  else
-    	  {
-    	  	node = node.getParentNode();
-    	  }
-        }
-        if (node instanceof Element)
-        {
-        	model = WSDLEditorUtil.getInstance().findModelObjectForElement( groupEditPart.getDefinition(), (Element)node);
-        }  
-	}
-	  	
-    if (model instanceof WSDLElement)
-    {
-      WSDLSwitch theSwitch = createSwitch(SELECTED);
-      theSwitch.doSwitch((EObject)model);                                                       
-    }
-    else 
-    {
-      removeConnections();
-    }
-    propagateForwardToNext(model);
-    propagateBackToPrevious(model);
-  } 
-
- 
-  protected void removeConnections()
-  {
-    groupEditPart.setEmphasizedModelObject(null);
-    groupEditPart.setInputConnectionModelObject(null);
-    groupEditPart.setOutputConnectionModelObject(null);
-  }
-     
-  protected void propagateForwardToNext(Object model)
-  {
-    GroupEditPart group = groupEditPart.getNext();
-    if (group != null)
-    {
-      IConnectionManager connectionManager = group.getConnectionManager();
-      if (connectionManager != null)
-      {
-        connectionManager.propagateForward(model);
-      }
-    }
-  }
-
-  protected void propagateBackToPrevious(Object model)
-  {
-    GroupEditPart group = groupEditPart.getPrevious();
-    if (group != null)
-    {
-      IConnectionManager connectionManager = group.getConnectionManager();
-      if (connectionManager != null)
-      {
-        connectionManager.propagateBack(model);
-      }
-    }
-  }  
-
-  protected Binding getEnclosingBinding(EObject object)
-  { 
-    Binding binding = null;
-    if (object instanceof Binding)
-    {     
-      binding = (Binding)object;
-    }
-    else if (object instanceof BindingOperation)
-    {     
-      binding = (Binding)object.eContainer();
-    }
-    else if (object instanceof BindingInput ||
-             object instanceof BindingOutput ||
-             object instanceof BindingFault)
-    {
-      binding = (Binding)object.eContainer().eContainer();
-    }
-    return binding;
-  }   
-
-  protected PortType getEnclosingPortType(EObject object)
-  { 
-    PortType portType = null;
-    if (object instanceof Operation)
-    {     
-      portType = (PortType)object.eContainer();
-    }
-    else if (object instanceof Input ||
-             object instanceof Output ||
-             object instanceof Fault)
-    {
-    	
-      portType = object.eContainer() != null ? (PortType)object.eContainer().eContainer() : null;
-    } 
-    else if (object instanceof PortType)
-    {
-      portType = (PortType)object;	
-    }                         
-    return portType;
-  }
-  
-  protected Operation getEnclosingOperation(EObject object)
-  { 
-    Operation operation = null;
-    if (object instanceof Operation)
-    {     
-      operation = (Operation)object;
-    }
-    else if (object instanceof Input ||
-             object instanceof Output ||
-             object instanceof Fault)
-    {
-      operation = (Operation)object.eContainer();
-    } 	                
-    return operation;
-  } 
-	
-  protected EObject getMessageReference(EObject object)
-  {      
-    return (object instanceof Input ||
-            object instanceof Output ||
-            object instanceof Fault) ? object : null;  
-  }	
-}  
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/BindingsGroupConnectionManager.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/BindingsGroupConnectionManager.java
deleted file mode 100644
index 61ce315b0..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/BindingsGroupConnectionManager.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.editparts;
-                                  
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.internal.util.WSDLSwitch;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-
-                                                   
-public class BindingsGroupConnectionManager extends AbstractConnectionManager
-{ 
-  public BindingsGroupConnectionManager(GroupEditPart groupEditPart)
-  {
-    super(groupEditPart);
-  }                                    
-
-    
-  class InternalWSDLSwitch extends WSDLSwitch
-  {                             
-    protected ComponentReferenceUtil util = new ComponentReferenceUtil(groupEditPart.getDefinition());
-
-    public Object caseBinding(Binding binding)
-    {                
-      groupEditPart.setEmphasizedModelObject(binding);      
-      groupEditPart.setInputConnectionModelObject(binding);
-      groupEditPart.setOutputConnectionModelObject(binding);
-      return Boolean.TRUE;
-    }  
-      
-    public Object caseBindingFault(BindingFault bindingFault)
-    {    
-      groupEditPart.setEmphasizedModelObject(getEnclosingBinding(bindingFault)); 
-      groupEditPart.setInputConnectionModelObject(getEnclosingBinding(bindingFault));
-      groupEditPart.setOutputConnectionModelObject(bindingFault);
-      return Boolean.TRUE;
-    }
-
-    public Object caseBindingInput(BindingInput bindingInput)
-    {                                                
-      groupEditPart.setEmphasizedModelObject(getEnclosingBinding(bindingInput)); 
-      groupEditPart.setInputConnectionModelObject(getEnclosingBinding(bindingInput));
-      groupEditPart.setOutputConnectionModelObject(bindingInput);
-      return Boolean.TRUE;
-    }
-      
-    public Object caseBindingOperation(BindingOperation bindingOperation)
-    {                       
-      groupEditPart.setEmphasizedModelObject(getEnclosingBinding(bindingOperation));
-      groupEditPart.setInputConnectionModelObject(getEnclosingBinding(bindingOperation));
-      groupEditPart.setOutputConnectionModelObject(bindingOperation);
-      return Boolean.TRUE;
-    }
-      
-    public Object caseBindingOutput(BindingOutput bindingOutput)
-    {                
-      groupEditPart.setEmphasizedModelObject(getEnclosingBinding(bindingOutput));
-      groupEditPart.setInputConnectionModelObject(getEnclosingBinding(bindingOutput));
-      groupEditPart.setOutputConnectionModelObject(bindingOutput);
-      return Boolean.TRUE;
-    }                                            
-                 
-    public Object caseFault(Fault fault)
-    {                                               
-      handleInterfaceHelper(fault); 
-      return Boolean.TRUE;
-    } 
-          
-    public Object caseInput(Input input)
-    { 
-                
-      handleInterfaceHelper(input);
-      return Boolean.TRUE;
-    }     
-            
-    public Object caseOperation(Operation operation) 
-    {      
-      handleInterfaceHelper(operation);     
-      return Boolean.TRUE;
-    }
-          
-    public Object caseOutput(Output output)
-    {  
-      handleInterfaceHelper(output);
-      return Boolean.TRUE;
-    }   
-                                        
-    public Object casePortType(PortType portType)
-    {                     
-      handleInterfaceHelper(portType);
-      return Boolean.TRUE;
-    }  
-
-    public Object casePort(Port port)
-    {          
-      Binding binding = port.getEBinding();
-      groupEditPart.setEmphasizedModelObject(binding); 
-      groupEditPart.setInputConnectionModelObject(binding);
-      groupEditPart.setOutputConnectionModelObject(binding);
-      return Boolean.TRUE;
-    }                                         
-      
-    public Object defaultCase(EObject object)
-    {                       
-      groupEditPart.setEmphasizedModelObject(null);
-      groupEditPart.setInputConnectionModelObject(null);
-      groupEditPart.setOutputConnectionModelObject(null);
-      return Boolean.TRUE;
-    }   
-    
-    protected Binding getPreviousMatchingBinding(PortType portType)
-    {
-      Binding result = null;
-      Object previousContext = groupEditPart.getOutputConnectionModelObject();
-      if (previousContext == null)      
-      {
-        previousContext = groupEditPart.getEmphasizedModelObject();
-      }
-      if (previousContext instanceof EObject) 
-      {
-        Binding binding = getEnclosingBinding((EObject)previousContext);
-        if (binding != null && binding.getEPortType() == portType)
-        {
-          result = binding;  
-        }        
-      }
-      return result;
-    }     
-
-    protected void handleInterfaceHelper(EObject interfaceObject)
-    {   
-      Binding binding = null;
-      PortType portType = getEnclosingPortType(interfaceObject);
-      if (portType != null)
-      {              
-        binding = getPreviousMatchingBinding(portType);     
-        if (binding == null)
-        {      
-          List list = util.getBindings(portType);
-          binding = list.size() > 0 ? (Binding)list.get(0) : null;  
-        }
-        if (binding != null)
-        {
-          groupEditPart.setEmphasizedModelObject(binding);   
-          groupEditPart.setInputConnectionModelObject(binding);     
-          EObject bindingObject = util.getBindingObject(interfaceObject, binding);
-          groupEditPart.setOutputConnectionModelObject(bindingObject);                  
-        }
-      }
-      if (binding == null)
-      {
-        defaultCase(null);
-      }
-    }   
-  }    
-    
-  protected WSDLSwitch createSwitch(int selectionType)
-  {
-    return new InternalWSDLSwitch();
-  }
-  
-  protected void propagateBackToPrevious(Object model)
-  {   
-    super.propagateBackToPrevious(groupEditPart.getInputConnectionModelObject());
-  }  
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/ComponentViewerRootEditPart.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/ComponentViewerRootEditPart.java
deleted file mode 100644
index a014114e5..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/ComponentViewerRootEditPart.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.editparts;
-                                    
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.draw2d.Panel;
-import org.eclipse.gef.EditPart;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapter;
-import org.eclipse.wst.xsd.ui.internal.gef.util.editparts.AbstractComponentViewerRootEditPart;
-import org.eclipse.wst.xsd.ui.internal.gef.util.figures.ContainerLayout;
-              
-
-public class ComponentViewerRootEditPart extends AbstractComponentViewerRootEditPart
-{                       
-  protected final static String MESSAGE_PLACE_HOLDER = "MESSAGE_PLACE_HOLDER";
-  protected Object input; 
-
-  public void setInput(Object newInput)
-  {
-    input = newInput;  
-    setModel(input);
-    refreshChildren();
-  }
-
-  protected IFigure createFigure()
-  {
-    Panel panel = new Panel();
-    panel.setBorder(new MarginBorder(30, 30, 30, 30));
-    //panel.setBackgroundColor(GraphicsConstants.red);
-    
-    ContainerLayout layout = new ContainerLayout();
-    layout.setHorizontal(false);
-    panel.setLayoutManager(layout);
-    return panel;
-  } 
-   
-
-  protected EditPart createChild(Object model)
-  {
-    EditPart editPart = null;
-    if (model == MESSAGE_PLACE_HOLDER)
-    {
-      editPart = new NotAvailableMessageEditPart();
-      editPart.setModel(model);
-    } 
-    else
-    {
-      editPart = ExtensibleEditPartFactory.getInstance().createEditPart(this, model);
-    }
-    return editPart;
-  }  
-  
-
-  protected List getModelChildren() 
-  {   
-    List result = new ArrayList();
-
-    if (input != null)
-    {              
-      result.add(input);
-    }     
-    else
-    {
-      result.add(MESSAGE_PLACE_HOLDER);
-    }       
-
-    return result;
-  }    
-                                                           
-
-  public void propertyChanged(Object object, String property)
-  {                                                                                                  
-    if (property == ModelAdapter.CHILDREN_PROPERTY)
-    {
-      refreshChildren();
-    }
-    else if (property == ModelAdapter.DETAIL_PROPERTY)
-    { 
-      refreshVisuals(); 
-    }                                       
-    else
-    {
-      refreshChildren();
-      refreshVisuals();
-    }
-  }                                          
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/DefinitionEditPart.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/DefinitionEditPart.java
deleted file mode 100644
index b7cf86655..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/DefinitionEditPart.java
+++ /dev/null
@@ -1,417 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.editparts;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.gef.util.figures.RoundedLineBorder;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject;
-import org.eclipse.wst.wsdl.ui.internal.util.OpenOnSelectionHelper;
-import org.eclipse.wst.xsd.ui.internal.gef.util.figures.ContainerFigure;
-import org.eclipse.wst.xsd.ui.internal.gef.util.figures.ContainerLayout;
-import org.eclipse.wst.xsd.ui.internal.gef.util.figures.FillLayout;
-
-public class DefinitionEditPart extends WSDLEditPart implements ISelectionChangedListener //, ModelAdapterListener
-{
-  protected Label label;
-  protected ContainerFigure outlined;
-
-  protected ContainerFigure rightContentPane;
-  protected ContainerFigure topContentPane;
-  protected ContainerFigure middleContentPane;
-  protected ContainerFigure bottomContentPane;
-  protected static final String SELECTED_EDIT_PART_REFERENCE = "SELECTED_EDIT_PART_REFERENCE";
-
-  public void activate()
-  {
-    super.activate();
-    getViewer().addSelectionChangedListener(this);
-  }
-  /** 
-   * Apart from the deactivation done in super, the source
-   * and target connections are deactivated, and the visual
-   * part of the this is removed.
-   *
-   * @see #activate() 
-   */
-  public void deactivate()
-  {
-    getViewer().removeSelectionChangedListener(this);
-    super.deactivate();
-  }
-
-  protected IFigure[] initContentPanes()
-  {
-    IFigure[] contentPanes = new IFigure[4];
-    contentPanes[0] = rightContentPane;
-    contentPanes[1] = topContentPane;
-    contentPanes[2] = middleContentPane;
-    contentPanes[3] = bottomContentPane;
-    return contentPanes;
-  }
-
-  protected int getContentPane(Object model)
-  {
-    int result = 0;
-
-    if (model == SELECTED_EDIT_PART_REFERENCE)
-    {
-      result = 0;
-    }
-    else if (model instanceof WSDLGroupObject)
-    {
-      WSDLGroupObject groupObject = (WSDLGroupObject)model;
-      switch (groupObject.getType())
-      {
-        case WSDLGroupObject.IMPORTS_GROUP :
-        case WSDLGroupObject.TYPES_GROUP :
-          //case WSDLGroupObject.EXTENSIBILITY_ELEMENTS_GROUP :
-          {
-            result = 1;
-            break;
-          }
-        case WSDLGroupObject.BINDINGS_GROUP :
-        case WSDLGroupObject.MESSAGES_GROUP :
-        case WSDLGroupObject.PORT_TYPES_GROUP :
-        case WSDLGroupObject.SERVICES_GROUP :
-          {
-            result = 2;
-            break;
-          }
-        case WSDLGroupObject.EXTENSIBILITY_ELEMENTS_GROUP :
-          {
-            result = 3;
-            break;
-          }
-      }
-    }
-    return result;
-  }
-
-  protected EditPart createChild(Object model)
-  {
-    EditPart editPart = null;
-    if (model == SELECTED_EDIT_PART_REFERENCE)
-    {
-      editPart = new PartReferenceSectionEditPart();
-      editPart.setModel(model);
-      editPart.setParent(this);
-    }
-    else
-    {
-      editPart = super.createChild(model);
-    }
-    return editPart;
-  }
-
-  protected IFigure createFigure()
-  {
-    ContainerFigure outer = new ContainerFigure();
-    ContainerLayout anchoredLayout = new ContainerLayout()
-    {
-      protected int alignFigure(IFigure parent, IFigure child)
-      {
-        return (child == outlined) ? 0 : -1;
-      }
-    };
-    outer.setLayoutManager(anchoredLayout);
-    /*
-    ContainerFigure outer = new ConnectedEditPartFigure(this)
-    {
-      public IFigure getConnectionFigure()
-      {
-        return selectedPartEditPart != null ? selectedPartEditPart.getFigure() : this;
-      }               
-    };*/
-    outer.getContainerLayout().setHorizontal(true);
-    //outer.setBorder(new MarginBorder(0, 20, 0, 0));
-
-    outlined = new ContainerFigure();
-    outer.add(outlined);
-    //outlined.getContainerLayout().setHorizontal(false);
-    outlined.setLayoutManager(new FillLayout());
-    outlined.setBorder(new RoundedLineBorder(1, 6));
-    outlined.setForegroundColor(groupBorderColor);
-
-    ContainerFigure rightPane = new ContainerFigure();
-    rightPane.setBorder(new MarginBorder(0, 0, 0, 300));
-    rightPane.getContainerLayout().setHorizontal(false);
-    outer.add(rightPane);
-
-    //RectangleFigure spacer = new RectangleFigure();
-    //rightPane.add(spacer);
-    //spacer.setPreferredSize(new Dimension(450, 200));
-
-    rightContentPane = new ContainerFigure();
-    rightPane.add(rightContentPane);
-    rightContentPane.setBorder(new MarginBorder(15, 20, 15, 15));
-
-    ContainerFigure labelHolder = new ContainerFigure();
-    outlined.add(labelHolder);
-
-    label = new Label();
-    labelHolder.add(label);
-    label.setBorder(new MarginBorder(2, 5, 0, 5));
-    label.setFont(mediumFont);
-    label.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_DEFINITION"));
-    label.setForegroundColor(ColorConstants.black);
-
-    topContentPane = new ContainerFigure();
-    outlined.add(topContentPane);
-
-    FillLayout fillLayout = new FillLayout(15);
-    fillLayout.setHorizontal(true);
-    topContentPane.setLayoutManager(fillLayout);
-    topContentPane.setBorder(new MarginBorder(10, 10, 10, 10));
-
-    middleContentPane = new ContainerFigure();
-    outlined.add(middleContentPane);
-    fillLayout = new FillLayout(15);
-    fillLayout.setHorizontal(true);
-    middleContentPane.setLayoutManager(fillLayout);
-    middleContentPane.setBorder(new MarginBorder(0, 10, 10, 10));
-
-    bottomContentPane = new ContainerFigure();
-    outlined.add(bottomContentPane);
-    bottomContentPane.setLayoutManager(new FillLayout());
-    bottomContentPane.setBorder(new MarginBorder(0, 10, 10, 10));
-
-    return outer;
-  }
-
-  //public IFigure getContentPane()
-  //{
-  //  return contentPane;
-  //}   
-  public PartReferenceSectionEditPart getPartReferenceSectionEditPart()
-  {
-    PartReferenceSectionEditPart result = null;
-    for (Iterator i = getChildren().iterator(); i.hasNext();)
-    {
-      EditPart editPart = (EditPart)i.next();
-      if (editPart.getModel() == SELECTED_EDIT_PART_REFERENCE)
-      {
-        result = (PartReferenceSectionEditPart)editPart;
-        break;
-      }
-    }
-    return result;
-  }
-
-  public GroupEditPart getGroupEditPart(int type)
-  {
-    GroupEditPart result = null;
-    for (Iterator i = getChildren().iterator(); i.hasNext();)
-    {
-      Object o = i.next();
-      if (o instanceof GroupEditPart)
-      {
-        GroupEditPart groupEditPart = (GroupEditPart)o;
-        if (groupEditPart.getType() == type)
-        {
-          result = groupEditPart;
-          break;
-        }
-      }
-    }
-    return result;
-  }
-
-  public List getModelChildren()
-  {
-    List list = new ArrayList();
-    list.add(SELECTED_EDIT_PART_REFERENCE);
-    list.addAll(super.getModelChildren());
-    return list;
-  }
-
-  public void handleOpenRequest(EditPart editPart)
-  {
-    GroupEditPart groupEditPart = null;
-    if (editPart.getModel() instanceof Import)
-    {
-      Import theImport = (Import)editPart.getModel();
-      Definition definition = (Definition)getModel();
-      OpenOnSelectionHelper helper = new OpenOnSelectionHelper(definition);
-      helper.openEditor(theImport);
-    }
-    else
-    {
-      for (EditPart parent = (EditPart)editPart.getParent(); parent != null; parent = parent.getParent())
-      {
-        if (parent instanceof GroupEditPart)
-        {
-          groupEditPart = (GroupEditPart)parent;
-          break;
-        }
-      }
-
-      if (groupEditPart != null)
-      {
-        GroupEditPart nextGroupEditPart = groupEditPart.getNext();
-        if (nextGroupEditPart != null)
-        {
-          if (nextGroupEditPart.inputConnection instanceof TreeNodeEditPart)
-          {
-            ((TreeNodeEditPart) (nextGroupEditPart.inputConnection)).setExpanded(true);
-          }
-        }
-        GroupEditPart prevGroupEditPart = groupEditPart.getPrevious();
-        if (prevGroupEditPart != null)
-        {
-          if (prevGroupEditPart.outputConnection instanceof TreeNodeEditPart)
-          {
-            ((TreeNodeEditPart) (prevGroupEditPart.outputConnection)).setExpanded(true);
-          }
-        }
-      }
-      updateConnections();
-    }
-  }
-
-  public void selectionChanged(SelectionChangedEvent event)
-  {
-    updateConnections();
-  }
-
-  public void updateConnections()
-  {
-    // todo         
-    if (isActive())
-    {
-      try
-      {
-        final AbstractGraphicalEditPart selectedEditPart = getSelectedEditPart(getViewer().getSelection());
-        GroupEditPart group = getContainingGroup(selectedEditPart);
-        if (group != null && group.getConnectionManager() != null)
-        {
-          group.getConnectionManager().setSelectedModelObject(selectedEditPart.getModel());
-        }
-        else if (!isAncestor(getPartReferenceSectionEditPart(), selectedEditPart))
-        {
-          group = getGroupEditPart(WSDLGroupObject.PORT_TYPES_GROUP);
-          group.getConnectionManager().setSelectedModelObject(null);
-        }
-      }
-      catch (Exception e)
-      {
-        e.printStackTrace();
-      }
-    }
-  }
-
-  public GroupEditPart getContainingGroup(AbstractGraphicalEditPart editPart)
-  {
-    GroupEditPart result = null;
-    for (EditPart parent = editPart.getParent(); parent != null; parent = parent.getParent())
-    {
-      if (parent instanceof GroupEditPart)
-      {
-        result = (GroupEditPart)parent;
-        break;
-      }
-    }
-    return result;
-  }
-
-  public GroupEditPart getNextGroupEditPart(GroupEditPart groupEditPart)
-  {
-    GroupEditPart result = null;
-    GroupEditPart prev = null;
-    for (Iterator i = getChildren().iterator(); i.hasNext();)
-    {
-      Object o = i.next();
-      if (o instanceof GroupEditPart)
-      {
-        GroupEditPart editPart = (GroupEditPart)o;
-        if (prev == groupEditPart)
-        {
-          result = editPart;
-          break;
-        }
-        prev = editPart;
-      }
-    }
-    return result;
-  }
-
-  public GroupEditPart getPreviousGroupEditPart(GroupEditPart groupEditPart)
-  {
-    GroupEditPart prev = null;
-    for (Iterator i = getChildren().iterator(); i.hasNext();)
-    {
-      Object o = i.next();
-      if (o instanceof GroupEditPart)
-      {
-        GroupEditPart editPart = (GroupEditPart)o;
-        if (editPart == groupEditPart)
-        {
-          break;
-        }
-        prev = editPart;
-      }
-    }
-    return prev;
-  }
-
-  protected AbstractGraphicalEditPart getSelectedEditPart(ISelection selection)
-  {
-    AbstractGraphicalEditPart editPart = null;
-    if (selection instanceof IStructuredSelection)
-    {
-      IStructuredSelection s = (IStructuredSelection)selection;
-      Object first = s.getFirstElement();
-      if (first instanceof AbstractGraphicalEditPart)
-      {
-        editPart = (AbstractGraphicalEditPart)first;
-      }
-    }
-    return editPart;
-  }
-
-  public void refreshChildren()
-  {
-    super.refreshChildren();
-    updateConnections();
-  }
-
-  public boolean isAncestor(EditPart ancestor, EditPart child)
-  {
-    boolean result = false;
-    if (ancestor != null && child != null)
-    {
-      for (EditPart editPart = child; editPart != null; editPart = editPart.getParent())
-      {
-        if (editPart == ancestor)
-        {
-          result = true;
-          break;
-        }
-      }
-    }
-    return result;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/DrillDownEditPart.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/DrillDownEditPart.java
deleted file mode 100644
index 07207c3c8..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/DrillDownEditPart.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.editparts;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.RequestConstants;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.eclipse.gef.editpolicies.SelectionHandlesEditPolicy;
-import org.eclipse.gef.handles.MoveHandle;
-import org.eclipse.gef.handles.MoveHandleLocator;
-import org.eclipse.gef.requests.LocationRequest;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.graph.WSDLComponentViewer;
-import org.eclipse.wst.xsd.ui.internal.gef.util.figures.ContainerFigure;
-
-public class DrillDownEditPart extends AbstractGraphicalEditPart
-{
-  protected Label drillDownButtonLabel; 
-  protected Label label;            
-
-  protected IFigure createFigure()
-  {                                     
-    ContainerFigure figure = new ContainerFigure();  
-    drillDownButtonLabel = new Label();
-    drillDownButtonLabel.setIcon(WSDLEditorPlugin.getInstance().getImage("icons/forward.gif"));
-    figure.add(drillDownButtonLabel);
-    label = new Label();
-    label.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_UNKNOWN"));
-    
-//  evil hack to provide underlines
-    boolean isLinux = java.io.File.separator.equals("/");
-    if (!isLinux)
-    {
-      Font underlineFont = new Font(Display.getCurrent(), "Tahoma", 8, SWT.NONE); 
-      FontData oldData = underlineFont.getFontData()[0];
-      FontData fontData = new FontData(oldData.getName(), oldData.getHeight(), SWT.NONE);
-      try
-      {
-        // TODO... clean this awful code up... we seem to be leaking here too
-        // we can't call this directly since the methods are OS dependant
-        // fontData.data.lfUnderline = 1
-        // so instead we use reflection
-        Object data = fontData.getClass().getField("data").get(fontData);
-        System.out.println("data" + data.getClass());
-        data.getClass().getField("lfUnderline").setByte(data, (byte)1);
-        Font font = new Font(Display.getCurrent(), fontData);
-        label.setFont(font);        
-      }
-      catch (Exception e)
-      {    
-      }
-    }
-    figure.add(label);
-    
-    return figure;
-  }    
-
-
-  protected void createEditPolicies() 
-  {
-  	DrillDownEditPartSelectionHandlesEditPolicy policy = new DrillDownEditPartSelectionHandlesEditPolicy();
-    installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, policy);      
-  }
-
-  public void performRequest(Request request)
-  {  
-	  if (request.getType() == RequestConstants.REQ_DIRECT_EDIT ||
-        request.getType() == RequestConstants.REQ_OPEN)
-    {                                         
-      if (request instanceof LocationRequest)
-      {
-        LocationRequest locationRequest = (LocationRequest)request;
-        Point p = locationRequest.getLocation();
-        
-        if (hitTest(drillDownButtonLabel, p) || hitTest(label, p))
-        {
-  		    performDrillDownAction();
-        }              
-      }
-    }
-  }  
-
-  protected EditPart createChild(Object model) 
-  {
-    return null;
-  }  
-
-  protected List getModelChildren() 
-  {   
-    return Collections.EMPTY_LIST;
-  } 
-
-  public boolean hitTest(IFigure target, Point location)
-  {
-    Rectangle b = target.getBounds().getCopy();
-    target.translateToAbsolute(b);  
-    return b.contains(location);
-  }  
-
-  protected void performDrillDownAction()
-  {                                                                                    
-    Runnable runnable = new Runnable()
-    {
-      public void run()
-      {
-        ((WSDLComponentViewer)getViewer()).setInput(getModel());
-      }
-    };
-    Display.getCurrent().asyncExec(runnable);
-  }
-  
-  private class DrillDownEditPartSelectionHandlesEditPolicy extends SelectionHandlesEditPolicy {
-  	 protected List createSelectionHandles()
-  	  {              
-  	    List list = new ArrayList();
-  	    EditPart editPart = getHost();  
-  	  
-  	    if (editPart instanceof GraphicalEditPart)
-  	    {
-  	      GraphicalEditPart graphicalEditPart = (GraphicalEditPart)editPart;
-  	      IFigure figure = graphicalEditPart.getFigure();
-
-  	      MoveHandleLocator loc = new MoveHandleLocator(figure);    
-  	      MoveHandle moveHandle = new MoveHandle(graphicalEditPart, loc);     
-  	      list.add(moveHandle);
-  	    }
-
-  	    return list;
-  	  }
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/ExtensibleEditPartFactory.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/ExtensibleEditPartFactory.java
deleted file mode 100644
index 7783b1c3c..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/ExtensibleEditPartFactory.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.editparts;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartFactory;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtension;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtensionRegistry;
-
-public class ExtensibleEditPartFactory implements EditPartFactory
-{                           
-  protected WSDLEditorExtension[] extensions;
-  protected EditPartFactory[] editPartFactories;
-
-  protected static ExtensibleEditPartFactory instance;
-                      
-  public static ExtensibleEditPartFactory getInstance()
-  {
-    if (instance == null)
-    {               
-      instance = new ExtensibleEditPartFactory();
-    }
-    return instance;
-  }
-                                              
-  public ExtensibleEditPartFactory()
-  {
-    WSDLEditorExtensionRegistry registry = WSDLEditorPlugin.getInstance().getWSDLEditorExtensionRegistry(); 
-
-    extensions = registry.getRegisteredExtensions(WSDLEditorExtension.EDIT_PART_FACTORY); 
-    editPartFactories = new EditPartFactory[extensions.length]; 
-    for (int i = 0; i < extensions.length; i++)
-    {
-      editPartFactories[i] = (EditPartFactory)extensions[i].createExtensionObject(WSDLEditorExtension.EDIT_PART_FACTORY, null);
-    }
-  }        
-
-  protected EditPartFactory getApplicableEditPartFactory(Object object)
-  {                             
-    EditPartFactory result = null;
-    for (int i = 0; i < extensions.length; i++)
-    {
-      if (extensions[i].isApplicable(object))
-      {
-        result  = editPartFactories[i];
-        if (result != null)
-        {
-          break;
-        }
-      }
-    }
-
-    return result;
-  }  
-
-  public EditPart createEditPart(EditPart parent, Object model)
-  {                     
-    EditPart result = null;
-    EditPartFactory factory = getApplicableEditPartFactory(model);
-    if (factory != null)   
-    {
-      result = factory.createEditPart(parent, model);
-    }  
-    else
-    {
-      result = new UnknownObjectEditPart();
-      result.setModel(model);
-      result.setParent(parent);
-    }
-    return result;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/GroupEditPart.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/GroupEditPart.java
deleted file mode 100644
index 5d11eeee5..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/GroupEditPart.java
+++ /dev/null
@@ -1,479 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.editparts;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.FigureListener;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.draw2d.RectangleFigure;
-import org.eclipse.draw2d.ScrollPane;
-import org.eclipse.draw2d.Viewport;
-import org.eclipse.draw2d.ViewportLayout;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.LayerConstants;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.eclipse.gef.editparts.ScalableRootEditPart;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ui.internal.gef.util.figures.RoundedLineBorder;
-import org.eclipse.wst.wsdl.ui.internal.graph.WSDLComponentViewer;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapter;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject;
-import org.eclipse.wst.xsd.ui.internal.gef.util.figures.ContainerFigure;
-import org.eclipse.wst.xsd.ui.internal.gef.util.figures.ContainerLayout;
-import org.eclipse.wst.xsd.ui.internal.gef.util.figures.FillLayout;
-
-public class GroupEditPart extends WSDLEditPart
-{
-  protected ScrollPane scrollpane;
-  protected Label label;
-
-  protected Object emphasizedModelObject;
-  protected Object inputConnectionModelObject;
-  protected Object outputConnectionModelObject;
-
-  public WSDLTreeNodeEditPart emphasizedEditPart;
-  public AbstractGraphicalEditPart inputConnection;
-  public AbstractGraphicalEditPart outputConnection;
-
-  public GroupEditPart nextGroupEditPart;
-  public IConnectionManager connectionManager;
-
-  protected InternalFigureListener figureListener = new InternalFigureListener();
-
-  class InternalFigureListener implements FigureListener
-  {
-    public void figureMoved(IFigure source)
-    {
-      ScalableRootEditPart root = (ScalableRootEditPart)getViewer().getRootEditPart();
-      root.getLayer(LayerConstants.CONNECTION_LAYER).repaint();
-    }
-  }
-
-  public Object getEmphasizedModelObject()
-  {
-    return emphasizedModelObject;
-  }
-
-  public Definition getDefinition()
-  {
-    return ((WSDLGroupObject)getModel()).getDefinition();
-  }
-
-  //protected void setEmphasizedObject(EditPart editPart)
-  //{                                                            
-  //  UnknownObjectEditPart ep = null;
-  //  if (editPart instanceof UnknownObjectEditPart)
-  //  {
-  //   ep = (UnknownObjectEditPart)editPart;
-  //  }
-  //
-  //  if (emphasizedEditPart != null)
-  //  {
-  //    emphasizedEditPart.setEmphasized(false);
-  //  }
-  //  if (ep != null)
-  //  {
-  //    emphasizedEditPart = ep;
-  //    emphasizedEditPart.setEmphasized(true);
-  //  }
-  //}  
-
-  public void setEmphasizedModelObject(Object model)
-  {
-    emphasizedModelObject = model;
-
-    if (emphasizedEditPart != null)
-    {
-      emphasizedEditPart.setEmphasized(false);
-    }
-
-    EditPart editPart = getMatchingChildEditPart(model);
-    emphasizedEditPart = (editPart instanceof WSDLTreeNodeEditPart) ? (WSDLTreeNodeEditPart)editPart : null;
-
-    if (emphasizedEditPart != null)
-    {
-      emphasizedEditPart.setEmphasized(true);
-    }
-  }
-
-  public void scrollToRevealEditPart(EditPart editPart)
-  {
-    if (editPart instanceof AbstractGraphicalEditPart)
-    {
-      scrollToEditPart((AbstractGraphicalEditPart)editPart);
-    }
-  }
-
-  public void scrollToRevealInputConnection()
-  {
-    if (inputConnection != null)
-    {
-      scrollToEditPart(inputConnection);
-    }
-  }
-
-  public void scrollToRevealOutputConnection()
-  {
-    if (outputConnection != null)
-    {
-      scrollToEditPart(outputConnection);
-    }
-  }
-
-  public void setInputConnectionModelObject(Object model)
-  {
-    inputConnection = getMatchingChildEditPart(model);
-    inputConnectionModelObject = model;
-  }
-
-  public Object getInputConnectionModelObject()
-  {
-    return inputConnectionModelObject;
-  }
-
-  public Object getOutputConnectionModelObject()
-  {
-    return outputConnectionModelObject;
-  }
-
-  public void setOutputConnectionModelObject(Object model)
-  {
-    outputConnection = getMatchingChildEditPart(model);
-    outputConnectionModelObject = model;
-  }
-
-  protected void createConnectionManager()
-  {
-    switch (getType())
-    {
-      case WSDLGroupObject.MESSAGES_GROUP :
-        {
-          connectionManager = new MessagesGroupConnectionManager(this);
-          break;
-        }
-      case WSDLGroupObject.SERVICES_GROUP :
-        {
-          connectionManager = new ServicesGroupConnectionManager(this);
-          break;
-        }
-      case WSDLGroupObject.BINDINGS_GROUP :
-        {
-          connectionManager = new BindingsGroupConnectionManager(this);
-          break;
-        }
-      case WSDLGroupObject.PORT_TYPES_GROUP :
-        {
-          connectionManager = new PortTypesGroupConnectionManager(this);
-          break;
-        }
-    }
-  }
-
-  public IConnectionManager getConnectionManager()
-  {
-    return connectionManager;
-  }
-
-  public ContainerFigure outerPane;
-
-  public IFigure createFigure()
-  {
-    createConnectionManager();
-
-    outerPane = new ContainerFigure();
-    outerPane.setBorder(new RoundedLineBorder(1, 6));
-    outerPane.setForegroundColor(groupBorderColor);
-
-    ContainerFigure r = new ContainerFigure();
-    //r.setCornerDimensions(new Dimension(4, 4));   
-    r.setOutline(false);
-    r.setMinimumSize(new Dimension(0, 0));
-
-    r.setFill(true);
-
-    r.setBackgroundColor(groupHeaderColor);
-    outerPane.add(r);
-
-    //ContainerFigure labelHolder = new ContainerFigure();                             
-    //labelHolder.add(label);
-    label = new Label();
-    label.setForegroundColor(ColorConstants.black);
-    label.setBorder(new MarginBorder(2, 4, 2, 4));
-    r.add(label); //Holder);
-
-    RectangleFigure line = new RectangleFigure();
-    line.setPreferredSize(20, 1);
-    outerPane.add(line);
-
-    int minHeight = 250;
-    switch (getType())
-    {
-    	case WSDLGroupObject.IMPORTS_GROUP :
-		case WSDLGroupObject.TYPES_GROUP :
-		{
-			minHeight = 50;
-			break;	
-		}
-		case WSDLGroupObject.EXTENSIBILITY_ELEMENTS_GROUP :
-		{
-			minHeight = 150;
-			break;
-		}
-    }
-
-	final int theMinHeight = minHeight;
-    FillLayout outerLayout = new FillLayout()
-    {
-      protected Dimension calculatePreferredSize(IFigure parent, int width, int height)
-      {
-        Dimension d = super.calculatePreferredSize(parent, width, height);
-        d.union(new Dimension(100, theMinHeight));
-        return d;
-      }
-    };
-    outerLayout.setHorizontal(false);
-    //layout.setSpacing(5);
-    outerPane.setLayoutManager(outerLayout);
-
-    scrollpane = new ScrollPane();
-    scrollpane.setForegroundColor(ColorConstants.black);
-    scrollpane.setVerticalScrollBarVisibility(ScrollPane.AUTOMATIC); //ScrollPane.ALWAYS);
-    outerPane.add(scrollpane);
-
-    ContainerFigure pane = new ContainerFigure();
-    pane.setBorder(new MarginBorder(5, 8, 5, 8));
-    ContainerLayout layout = new ContainerLayout();
-    layout.setHorizontal(false);
-    layout.setSpacing(0);
-    pane.setLayoutManager(layout);
-
-    Viewport viewport = new Viewport();
-    viewport.setContentsTracksHeight(true);
-    ViewportLayout viewportLayout = new ViewportLayout()
-    {
-      protected Dimension calculatePreferredSize(IFigure parent, int width, int height)
-      {
-        Dimension d = super.calculatePreferredSize(parent, width, height);
-        d.height = Math.min(d.height, theMinHeight - 25); //getViewer().getControl().getBounds().height);
-        return d;
-      }
-    };
-    viewport.setLayoutManager(viewportLayout);
-
-    scrollpane.setViewport(viewport);
-    scrollpane.setContents(pane);
-    pane.addFigureListener(figureListener);
-
-    return outerPane;
-  }
-
-  protected void refreshVisuals()
-  {
-    ModelAdapter adapter = getModelAdapter(getModel());
-    if (adapter != null)
-    {
-      label.setText((String)adapter.getProperty(getModel(), ModelAdapter.LABEL_PROPERTY));
-      //label.setIcon((Image)adapter.getProperty(getModel(), ModelAdapter.IMAGE_PROPERTY));
-    }
-    super.refreshVisuals();
-  }
-
-  protected void createEditPolicies()
-  {
-  }
-
-  public IFigure getContentPane()
-  {
-    return scrollpane.getContents();
-  }
-
-  protected void scrollToEditPart(final AbstractGraphicalEditPart targetEditPart)
-  {
-    Runnable r = new Runnable()
-    {
-      public void run()
-      {
-        scrollToEditPartHelper(targetEditPart);
-      }
-    };
-    Display.getCurrent().asyncExec(r);
-  }
-
-  protected void scrollToEditPartHelper(AbstractGraphicalEditPart targetEditPart)
-  {
-    if (targetEditPart != null)
-    {
-      Rectangle r1 = targetEditPart.getFigure().getBounds();
-      Rectangle r2 = getContentPane().getBounds();
-      scrollpane.scrollVerticalTo((r1.y - r2.y) - scrollpane.getBounds().height / 2);
-    }
-  }
-
-  public AbstractGraphicalEditPart getMatchingChildEditPart(Object model)
-  {
-    List list = new ArrayList();
-    for (Object o = model; o != null && !(o instanceof Definition); o = getParent(o))
-    {
-      list.add(0, o);
-    }
-    return getMatchingChildEditPart(this, list, 0, true);
-  }
-
-  protected Object getParent(Object model)
-  {
-    Object parent = null;
-    if (model instanceof EObject)
-    {
-      parent = ((EObject)model).eContainer();
-    }
-    return parent;
-  }
-
-  protected AbstractGraphicalEditPart getMatchingChildEditPart(AbstractGraphicalEditPart editPart, List list, int index, boolean getUnexpandedParent)
-  {
-    AbstractGraphicalEditPart result = (getUnexpandedParent && editPart != this) ? editPart : null;
-    Object model = list.size() > index ? list.get(index) : null;
-    if (model != null && editPart != null)
-    {
-      for (Iterator i = editPart.getChildren().iterator(); i.hasNext();)
-      {
-        AbstractGraphicalEditPart child = (AbstractGraphicalEditPart)i.next();
-        if (child.getModel() == model)
-        {
-          result = child;
-          break;
-        }
-      }
-      index++;
-      if (index < list.size())
-      {
-        result = getMatchingChildEditPart(result, list, index, getUnexpandedParent);
-      }
-    }
-    return result;
-  }
-
-  public int getType()
-  {
-    return ((WSDLGroupObject)getModel()).getType();
-  }
-
-  public GroupEditPart getNext()
-  {
-    return ((DefinitionEditPart)getParent()).getNextGroupEditPart(this);
-  }
-
-  public GroupEditPart getPrevious()
-  {
-    return ((DefinitionEditPart)getParent()).getPreviousGroupEditPart(this);
-  }
-
-  private void _refreshChildren()
-  {
-    int i;
-    EditPart editPart;
-    Object model;
-
-    Map modelToEditPart = new HashMap();
-    List children = getChildren();
-
-    for (i = 0; i < children.size(); i++)
-    {
-      editPart = (EditPart)children.get(i);
-      modelToEditPart.put(editPart.getModel(), editPart);
-    }
-
-    List modelObjects = getModelChildren();
-
-    for (i = 0; i < modelObjects.size(); i++)
-    {
-      model = modelObjects.get(i);
-
-      //Do a quick check to see if editPart[i] == model[i]
-      if (i < children.size())
-      {
-        editPart = (EditPart)children.get(i);
-        Object editPartModel = editPart.getModel();
-        if (editPartModel == model)
-        {
-          continue;
-        }
-        else if (editPartModel.getClass() == model.getClass())
-        {
-          modelToEditPart.remove(editPartModel);
-
-          if (isActive())
-            editPart.deactivate();
-
-          editPart.setModel(model);
-
-          if (isActive())
-          {
-            editPart.activate();
-            editPart.refresh();
-          }
-          continue;
-        }
-      }
-
-      //Look to see if the EditPart is already around but in the wrong location
-      editPart = (EditPart)modelToEditPart.get(model);
-
-      if (editPart != null)
-        reorderChild(editPart, i);
-      else
-      {
-        //An editpart for this model doesn't exist yet.  Create and insert one.
-        editPart = createChild(model);
-        addChild(editPart, i);
-      }
-    }
-    List trash = new ArrayList();
-    for (; i < children.size(); i++)
-      trash.add(children.get(i));
-    for (i = 0; i < trash.size(); i++)
-    {
-      EditPart ep = (EditPart)trash.get(i);
-      removeChild(ep);
-    }
-  }
-
-  public void refreshChildren()
-  {
-    boolean reuseChildren = false;
-    if (getViewer() instanceof WSDLComponentViewer)
-    {
-      WSDLComponentViewer wsdlComponentViewer = (WSDLComponentViewer)getViewer();
-      reuseChildren = wsdlComponentViewer.isPreserveExpansionEnabled();
-    }
-
-    if (reuseChildren)
-    {
-      _refreshChildren();
-    }
-    else
-    {
-      super.refreshChildren();
-    }
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/IConnectionManager.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/IConnectionManager.java
deleted file mode 100644
index bd0d0a8c0..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/IConnectionManager.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.editparts;
-
-public interface IConnectionManager
-{ 
-  public void propagateForward(Object model);
-  public void propagateBack(Object model);
-  public void setSelectedModelObject(Object model);
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/IFeedbackHandler.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/IFeedbackHandler.java
deleted file mode 100644
index b6ac2b5f0..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/IFeedbackHandler.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.editparts;
-
-public interface IFeedbackHandler
-{
-  public void addFeedback();
-  public void removeFeedback();
-}              
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/MessagesGroupConnectionManager.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/MessagesGroupConnectionManager.java
deleted file mode 100644
index 231455d01..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/MessagesGroupConnectionManager.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.editparts;
-                                  
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.internal.util.WSDLSwitch;
-
-                                                   
-public class MessagesGroupConnectionManager extends AbstractConnectionManager
-{ 
-  public MessagesGroupConnectionManager(GroupEditPart groupEditPart)
-  {
-    super(groupEditPart);
-  }                                    
-              
-  class InternalWSDLSwitch extends WSDLSwitch
-  {            
-    public Object caseFault(Fault fault)
-    {                      
-      groupEditPart.setEmphasizedModelObject(fault.getEMessage());
-      groupEditPart.setInputConnectionModelObject(fault.getEMessage());
-      groupEditPart.setOutputConnectionModelObject(getFirstPart(fault.getEMessage()));
-      return Boolean.TRUE;
-    } 
-          
-    public Object caseInput(Input input)
-    {       
-      groupEditPart.setEmphasizedModelObject(input.getEMessage());
-      groupEditPart.setInputConnectionModelObject(input.getEMessage());
-      groupEditPart.setOutputConnectionModelObject(getFirstPart(input.getEMessage()));
-      return Boolean.TRUE;
-    }     
-
-    public Object caseMessage(Message message)
-    {  
-      groupEditPart.setEmphasizedModelObject(message);  
-      groupEditPart.setInputConnectionModelObject(message);
-      groupEditPart.setOutputConnectionModelObject(getFirstPart(message));
-      return Boolean.TRUE;
-    } 
-                      
-    public Object caseOutput(Output output)
-    {  
-      groupEditPart.setEmphasizedModelObject(output.getEMessage());  
-      groupEditPart.setInputConnectionModelObject(output.getEMessage());
-      groupEditPart.setOutputConnectionModelObject(getFirstPart(output.getEMessage()));
-      return Boolean.TRUE;
-    }                                                         
-
-    public Object casePart(Part part)
-    {  
-      groupEditPart.setEmphasizedModelObject(part.eContainer());  
-      groupEditPart.setInputConnectionModelObject(part.eContainer());
-      groupEditPart.setOutputConnectionModelObject(part);
-      return Boolean.TRUE;
-    } 
-      
-    public Object defaultCase(EObject object)
-    {                       
-      groupEditPart.setEmphasizedModelObject(null);
-      groupEditPart.setInputConnectionModelObject(null);
-      groupEditPart.setOutputConnectionModelObject(null);
-      return Boolean.TRUE;
-    }      
-
-    public Object doSwitch(EObject theEObject)
-    {
-      Object result = super.doSwitch(theEObject);
-      ((DefinitionEditPart)groupEditPart.getParent()).getPartReferenceSectionEditPart().setInput(groupEditPart.getOutputConnectionModelObject());
-      return result;
-    }
-  }
-
-  protected WSDLSwitch createSwitch(int selectionType)
-  {
-    return new InternalWSDLSwitch();
-  }   
-
-  protected Part getFirstPart(Message message)
-  {           
-    Part result = null;
-    if (message != null)
-    {    
-      List parts = message.getEParts();
-      result = (parts.size() > 0) ? (Part)parts.get(0) : null;
-    }
-    return result;
-  }
-  
-  protected void propagateBackToPrevious(Object model)
-  {  	
-  	model = (model instanceof Part) ?((Part)model).eContainer() : model; 
-    super.propagateBackToPrevious(model);
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/NotAvailableMessageEditPart.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/NotAvailableMessageEditPart.java
deleted file mode 100644
index 6a4a500a4..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/NotAvailableMessageEditPart.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.editparts;
-                          
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-              
-
-public class NotAvailableMessageEditPart extends AbstractGraphicalEditPart 
-{            
-  public NotAvailableMessageEditPart()
-  {
-  }   
-  
-  protected IFigure createFigure()
-  {                            
-    Label label = new Label(WSDLEditorPlugin.getWSDLString("_UI_LABEL_VIEW_NOT_AVAILABLE"));
-    return label;
-  }    
-
-  protected List getModelChildren() 
-  {                  
-    return Collections.EMPTY_LIST;
-  }    
-
-  protected EditPart createChild(Object model)
-  {
-    return null;
-  }
- 
-  protected void createEditPolicies()
-  {  
-  }   
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/PartReferenceSectionEditPart.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/PartReferenceSectionEditPart.java
deleted file mode 100644
index 8ab8deebe..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/PartReferenceSectionEditPart.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.editparts;
-                                  
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartFactory;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.ui.internal.graph.model.WSDLGraphModelAdapterFactory;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapter;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapterListener;
-import org.eclipse.wst.xsd.ui.internal.gef.util.figures.ContainerFigure;
-import org.eclipse.xsd.XSDElementDeclaration;
-                                                   
-
-public class PartReferenceSectionEditPart extends AbstractGraphicalEditPart implements ModelAdapterListener
-{ 
-  protected Object input;
-  protected Definition definition;
-              
-  protected IFigure createFigure()
-  {                                                  
-    ContainerFigure outer = new ContainerFigure(); 
-    return outer;
-  } 
-
-  protected void setInput(Object object)
-  {                    
-    if (input != null)
-    {
-      removeModelAdapterListener(input, this);
-	  removeModelAdapterListener(definition, this);
-    }
-    input = object;
-    if (input != null)
-    {
-      addModelAdapterListener(input, this);
-	  definition = getParent() != null ? (Definition)getParent().getModel() : null;
-      addModelAdapterListener(definition, this);
-    }
-    refresh();
-    getFigure().repaint();
-  }
-  
-	public void deactivate() 
-	  {       
-		  if (input != null)
-		  { 	
-	        removeModelAdapterListener(input, this);
-	        removeModelAdapterListener(definition, this);
-		  }  
-			super.deactivate(); 
-		}  
-
-  protected List getModelChildren() 
-  { 
-    List list = new ArrayList();
-    if (input instanceof Part)
-    {
-      Part part = (Part)input;
-      Object component = part.getTypeDefinition();
-      if (component != null) 
-      {
-        // TODO... i'm pulling a fast one here.... we should call the extension
-        // to see if he wants to show a child here
-        if (component instanceof org.eclipse.xsd.XSDComplexTypeDefinition)
-        {
-          list.add(component);
-        }
-      }
-      else
-      {
-        // This is before the new org.eclipse.wst.wsdl model
-        // where it handled DOM nodes
-        // component = part.getElement();
-        XSDElementDeclaration ed = part.getElementDeclaration();
-        if (ed != null && ed.getContainer() != null)
-        {
-          list.add(ed);
-        }
-      }
-    }                    
-    return list;
-  }
-       
-  protected void createEditPolicies() 
-  {
-  }       
-
-  protected EditPart createChild(Object model) 
-  {
-    return getEditPartFactory().createEditPart(this, model);
-  } 
-
-  protected EditPartFactory getEditPartFactory()
-  {
-    return ExtensibleEditPartFactory.getInstance();
-  } 
-
-  public void propertyChanged(Object object, String property)
-  {                     
-    refreshChildren();
-  }  
-
-  protected ModelAdapter getModelAdapter(Object modelObject)
-  {
-    return WSDLGraphModelAdapterFactory.getWSDLGraphModelAdapterFactory().getAdapter(modelObject);
-  } 
-
-  protected void addModelAdapterListener(Object modelObject, ModelAdapterListener listener)
-  {
-    ModelAdapter adapter = getModelAdapter(modelObject);
-    if (adapter != null)
-    {
-      adapter.addListener(listener);
-    }
-  }
-
-  protected void removeModelAdapterListener(Object modelObject, ModelAdapterListener listener)
-  {
-    ModelAdapter adapter = getModelAdapter(modelObject);
-    if (adapter != null)
-    {
-      adapter.removeListener(listener);
-    }
-  }  
-
-}   
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/PortTypesGroupConnectionManager.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/PortTypesGroupConnectionManager.java
deleted file mode 100644
index d6520e2a7..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/PortTypesGroupConnectionManager.java
+++ /dev/null
@@ -1,351 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.editparts;
-                                  
-import java.util.Iterator;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.internal.util.WSDLSwitch;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-
-                                                   
-public class PortTypesGroupConnectionManager extends AbstractConnectionManager
-{ 
-  public PortTypesGroupConnectionManager(GroupEditPart groupEditPart)
-  {
-    super(groupEditPart);
-  }                                    
-
-    
-  class InternalWSDLSwitch extends WSDLSwitch
-  {        
-    public boolean isBindingGroupShowing()
-    {
-      GroupEditPart prevGroupEditPart = groupEditPart.getPrevious();
-      return prevGroupEditPart  != null && prevGroupEditPart.getType() == WSDLGroupObject.BINDINGS_GROUP;
-    } 
-
-    public Object caseBinding(Binding binding)
-    {                             
-      Object portType = getPortTypeForBindingObject(binding);
-      groupEditPart.setEmphasizedModelObject(portType);      
-      groupEditPart.setInputConnectionModelObject(portType);
-      groupEditPart.setOutputConnectionModelObject(null);
-      return Boolean.TRUE;
-    }  
-
-    public Object caseBindingFault(BindingFault bindingFault)
-    {                
-      groupEditPart.setEmphasizedModelObject(getPortTypeForBindingObject(bindingFault));
-      Fault fault = ComponentReferenceUtil.computeFault(bindingFault);
-      groupEditPart.setInputConnectionModelObject(fault);
-      groupEditPart.setOutputConnectionModelObject(fault);
-      return Boolean.TRUE;
-    } 
-      
-    public Object caseBindingInput(BindingInput bindingInput)
-    {    
-      groupEditPart.setEmphasizedModelObject(getPortTypeForBindingObject(bindingInput)); 
-      Input input = ComponentReferenceUtil.computeInput(bindingInput);
-      groupEditPart.setInputConnectionModelObject(input);
-      groupEditPart.setOutputConnectionModelObject(input);
-      return Boolean.TRUE;
-    }
-      
-    public Object caseBindingOperation(BindingOperation bindingOperation)
-    {                       
-      groupEditPart.setEmphasizedModelObject(getPortTypeForBindingObject(bindingOperation));
-      groupEditPart.setInputConnectionModelObject(ComponentReferenceUtil.computeOperation(bindingOperation));
-      groupEditPart.setOutputConnectionModelObject(null);
-      return Boolean.TRUE;
-    }
-      
-    public Object caseBindingOutput(BindingOutput bindingOutput)
-    {                
-      groupEditPart.setEmphasizedModelObject(getPortTypeForBindingObject(bindingOutput));
-      Output output = ComponentReferenceUtil.computeOutput(bindingOutput);
-      groupEditPart.setInputConnectionModelObject(output);
-      groupEditPart.setOutputConnectionModelObject(output);
-      return Boolean.TRUE;
-    }                                            
-                 
-    public Object caseFault(Fault fault)
-    {                      
-      groupEditPart.setEmphasizedModelObject(getEnclosingPortType(fault));   
-      if (isBindingGroupShowing())
-      {
-        groupEditPart.setInputConnectionModelObject(fault);
-      }
-      else
-      {
-        groupEditPart.setInputConnectionModelObject(getEnclosingPortType(fault));
-      }
-      groupEditPart.setOutputConnectionModelObject(fault);
-      return Boolean.TRUE;
-    } 
-          
-    public Object caseInput(Input input)
-    {       
-      groupEditPart.setEmphasizedModelObject(getEnclosingPortType(input));   
-      if (isBindingGroupShowing())
-      {
-        groupEditPart.setInputConnectionModelObject(input);
-      }
-      else
-      {
-        groupEditPart.setInputConnectionModelObject(getEnclosingPortType(input));
-      }
-      groupEditPart.setOutputConnectionModelObject(input);
-      return Boolean.TRUE;
-    }     
-    
-    public Object caseMessage(Message message)
-    {
-      Object previousContext = groupEditPart.getOutputConnectionModelObject();
-      if (previousContext == null)      
-      {
-        previousContext = groupEditPart.getEmphasizedModelObject();
-      }
-      
-      EObject messageReference = null;      
-      if (previousContext == null || previousContext instanceof EObject)
-      {
-      messageReference = getMessageReference(message, (EObject)previousContext);
-      }
-
-      if (messageReference != null)
-      {
-        doSwitch(messageReference);
-      }
-      else
-      {
-      defaultCase(null);
-      }
-      return Boolean.TRUE;
-    }  
-            
-    public Object caseOperation(Operation operation) 
-    {      
-      groupEditPart.setEmphasizedModelObject(getEnclosingPortType(operation));
-      if (isBindingGroupShowing())
-      {
-        groupEditPart.setInputConnectionModelObject(operation);
-      }
-      else
-      {
-        groupEditPart.setInputConnectionModelObject(getEnclosingPortType(operation));
-      }
-      groupEditPart.setOutputConnectionModelObject(null);      
-      return Boolean.TRUE;
-    }
-          
-    public Object caseOutput(Output output)
-    {  
-      groupEditPart.setEmphasizedModelObject(getEnclosingPortType(output));   
-      if (isBindingGroupShowing())
-      {
-        groupEditPart.setInputConnectionModelObject(output);
-      }
-      else
-      {
-        groupEditPart.setInputConnectionModelObject(getEnclosingPortType(output));
-      }
-      groupEditPart.setOutputConnectionModelObject(output);  
-      return Boolean.TRUE;
-    }   
-                                        
-    public Object casePortType(PortType portType)
-    { 
-      groupEditPart.setEmphasizedModelObject(portType); 
-      groupEditPart.setInputConnectionModelObject(portType);
-      groupEditPart.setOutputConnectionModelObject(null);
-      return Boolean.TRUE;
-    }  
-
-    public Object casePort(Port port)
-    {          
-      Binding binding = port.getEBinding();
-      PortType portType = binding != null ? binding.getEPortType() : null;
-      groupEditPart.setEmphasizedModelObject(portType);     
-      groupEditPart.setInputConnectionModelObject(portType);
-      groupEditPart.setOutputConnectionModelObject(null);
-      return Boolean.TRUE;
-    }                                         
-      
-    public Object defaultCase(EObject object)
-    {                       
-      groupEditPart.setEmphasizedModelObject(null);
-      groupEditPart.setInputConnectionModelObject(null);
-      groupEditPart.setOutputConnectionModelObject(null);
-      return Boolean.TRUE;
-    }      
-  } 
-
-  protected WSDLSwitch createSwitch(int selectionType)
-  {
-    return new InternalWSDLSwitch();
-  }
-
-  protected PortType getPortTypeForBindingObject(EObject object)
-  { 
-    Binding binding = getEnclosingBinding(object);
-    return binding.getEPortType();
-  }   
-            
-  public void propagateForward(Object model)
-  { 
-    if (model instanceof WSDLElement)
-    {
-      WSDLSwitch theSwitch = createSwitch(PROPAGATE_FORWARD);
-      theSwitch.doSwitch((EObject)model);    
-      groupEditPart.scrollToRevealInputConnection();
-    }       
-    else
-    {
-      removeConnections();
-    }
-
-    Object o = groupEditPart.getOutputConnectionModelObject();
-    propagateForwardToNext(o != null ? o : model); 
-  }
-  
-  protected void propagateBackToPrevious(Object model)
-  {
-    model = (model instanceof Message) ? groupEditPart.getInputConnectionModelObject() : model; 
-    super.propagateBackToPrevious(model);
-  } 
-  
-
-  protected Message getReferencedMessage(EObject o)
-  {      
-    Message result = null;
-    if (o instanceof Input)
-    {
-      result = ((Input)o).getEMessage();
-    }                                   
-    else if (o instanceof Output)
-    {
-      result = ((Output)o).getEMessage();
-    }  
-    else if (o instanceof Fault)
-    {
-      result = ((Fault)o).getEMessage();
-    }                     
-    return result;
-  }
-  
-  protected boolean isMatchingMessageReference(EObject messageReference, Message message)
-  {
-    Message m = getReferencedMessage(messageReference);
-    return (m != null) && (m == messageReference);
-  }
-  
-  public EObject getMessageReference(Message message, EObject prevContext)
-  {
-    EObject result = null;
-        
-    PortType prevPortType = getEnclosingPortType(prevContext);
-    Operation prevOperation = getEnclosingOperation(prevContext);  
-    EObject prevMessageReference = getMessageReference(prevContext);
-    
-    if (prevPortType != null)
-    {
-      result = getMessageReference(message, prevPortType, prevOperation, prevMessageReference);  
-    }   
-    if (result == null)
-    {    
-      Definition definition = groupEditPart.getDefinition();
-      ComponentReferenceUtil util = new ComponentReferenceUtil(definition);
-      for (Iterator i = util.getPortTypes().iterator(); i.hasNext(); )
-      {
-        PortType portType = (PortType)i.next();              
-        result = getMessageReference(message, portType, null, null);  
-        
-        if (result != null)
-        {
-          break;
-        }
-      }
-    }
-    return result;
-  }
-  
-  public EObject getMessageReference(Message message, PortType portType, Operation prevOperation, EObject prevMessageReference)
-  {
-    EObject result = null;
-    if (prevMessageReference != null && isMatchingMessageReference(prevMessageReference, message)) 
-    {
-      result = prevMessageReference;
-    }
-      
-    if (result == null && prevOperation != null)
-    {
-      result = getMessageReference(message, prevOperation);       
-    }
-            
-    if (result == null)
-    {             
-      for (Iterator i = portType.getOperations().iterator(); i.hasNext();)
-      { 
-        Operation operation = (Operation)i.next();
-        result = getMessageReference(message, operation);
-        if (result != null)
-        {
-          break; 
-        }
-      }
-    }
-    return result;    
-  } 
-  
-  public EObject getMessageReference(Message message, Operation operation)
-  {
-    EObject result = null;
-    Input input = operation.getEInput();
-    Output output = operation.getEOutput(); 
-    if (input != null && input.getMessage() == message)
-    {
-      result = input;
-    }
-    else if (output != null && output.getMessage() == message)
-    {
-      result = output;
-    }
-    if (result == null)
-    {
-      for (Iterator i = operation.getEFaults().iterator(); i.hasNext();)
-      {
-        Fault fault = (Fault)i.next();
-        if (fault.getMessage() == message)
-        {
-          result = fault;
-          break;
-        }  
-      }
-    }
-    return result;        
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/ServicesGroupConnectionManager.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/ServicesGroupConnectionManager.java
deleted file mode 100644
index cc9543d60..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/ServicesGroupConnectionManager.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.editparts;
-                                  
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.internal.util.WSDLSwitch;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-
-                                                   
-public class ServicesGroupConnectionManager extends AbstractConnectionManager
-{   
-  public ServicesGroupConnectionManager(GroupEditPart groupEditPart)
-  {
-    super(groupEditPart);
-  }                                    
-    
-  protected class InternalWSDLSwitch extends WSDLSwitch
-  {
-   	public Object caseBinding(Binding binding)
-    {                   
-      handleBindingHelper(binding);
-      return Boolean.TRUE;
-    }         
-
-    public Object caseBindingFault(BindingFault bindingFault)
-    {    
-      handleBindingHelper(getEnclosingBinding(bindingFault)); 
-      return Boolean.TRUE;
-    }
-
-    public Object caseBindingInput(BindingInput bindingInput)
-    {    
-      handleBindingHelper(getEnclosingBinding(bindingInput)); 
-      return Boolean.TRUE;
-    }
-      
-    public Object caseBindingOperation(BindingOperation bindingOperation)
-    {                       
-      handleBindingHelper(getEnclosingBinding(bindingOperation));
-      return Boolean.TRUE;
-    }
-      
-    public Object caseBindingOutput(BindingOutput bindingOutput)
-    {                
-      handleBindingHelper(getEnclosingBinding(bindingOutput));
-      return Boolean.TRUE;
-    }      
-
-    public Object caseFault(Fault fault)
-    {                      
-      handlePortTypeHelper(getEnclosingPortType(fault));   
-      return Boolean.TRUE;
-    } 
-          
-    public Object caseInput(Input input)
-    {       
-      handlePortTypeHelper(getEnclosingPortType(input));   
-      return Boolean.TRUE;
-    }     
-            
-    public Object caseOperation(Operation operation) 
-    {      
-      handlePortTypeHelper(getEnclosingPortType(operation));    
-      return Boolean.TRUE;
-    }
-          
-    public Object caseOutput(Output output)
-    {  
-      handlePortTypeHelper(getEnclosingPortType(output));   
-      return Boolean.TRUE;
-    }  
-
-   	public Object casePort(Port port)
-    {           
-      groupEditPart.setEmphasizedModelObject(port);     
-      groupEditPart.setOutputConnectionModelObject(port);
-      return Boolean.TRUE;
-    }   
-
-   	public Object casePortType(PortType portType)
-    {           
-      handlePortTypeHelper(portType);
-      return Boolean.TRUE;
-    }          
-        
-   	public Object defaultCase(EObject object)
-    {
-      groupEditPart.setEmphasizedModelObject(null);
-      groupEditPart.setOutputConnectionModelObject(null);
-      return Boolean.TRUE;
-    }          
-
-    //
-    protected void handlePortTypeHelper(PortType portType)
-    {       
-      if (portType != null)
-      { 
-        Port port = null;   
-        Object previousContext = groupEditPart.getOutputConnectionModelObject();
-        if (previousContext == null)      
-        {
-          previousContext = groupEditPart.getEmphasizedModelObject();
-        }
-        if (previousContext instanceof Port)
-        {
-          Port previousPort = (Port)previousContext;
-          if (previousPort.getEBinding() != null && previousPort.getEBinding().getEPortType() == portType)
-          {
-            port = previousPort;
-          }          
-        }                  
-
-        if (port == null)
-        {
-          ComponentReferenceUtil util = new ComponentReferenceUtil(groupEditPart.getDefinition());           
-          List list = util.getPortsForPortType(portType);          
-          if (list.size() > 0)
-          {
-            port = (Port)list.get(0);
-          }                          
-        }
-
-        groupEditPart.setEmphasizedModelObject(port);     
-        groupEditPart.setOutputConnectionModelObject(port);
-      } 
-    }   
-
-    protected void handleBindingHelper(Binding binding)
-    {       
-      if (binding != null)
-      {
-        ComponentReferenceUtil util = new ComponentReferenceUtil(groupEditPart.getDefinition());
-        List list = util.getPortsForBinding(binding);
-        Port port = null;
-        if (list.size() > 0)
-        {
-          port = (Port)list.get(0);
-        }                          
-        groupEditPart.setEmphasizedModelObject(port);     
-        groupEditPart.setOutputConnectionModelObject(port);                                          
-      }
-    }
-  }
-
-  protected WSDLSwitch createSwitch(int selectionType)
-  {
-    return new InternalWSDLSwitch();
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/TreeNodeEditPart.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/TreeNodeEditPart.java
deleted file mode 100644
index cd66aab54..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/TreeNodeEditPart.java
+++ /dev/null
@@ -1,343 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.editparts;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.RectangleFigure;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartFactory;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.eclipse.gef.editpolicies.SelectionEditPolicy;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.gef.util.editparts.InteractorHelper;
-import org.eclipse.wst.wsdl.ui.internal.graph.GraphicsConstants;
-import org.eclipse.wst.wsdl.ui.internal.graph.WSDLComponentViewer;
-import org.eclipse.wst.wsdl.ui.internal.graph.editpolicies.WSDLSelectionHandlesEditPolicyImpl;
-import org.eclipse.wst.wsdl.ui.internal.graph.figures.TreeNodeContentFigure;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapter;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapterListener;
-import org.eclipse.wst.xsd.ui.internal.gef.util.figures.ContainerFigure;
-
-public abstract class TreeNodeEditPart extends AbstractGraphicalEditPart implements ModelAdapterListener, GraphicsConstants, IFeedbackHandler
-{
-  protected Label label;
-  protected Label label2;
-  protected ContainerFigure labelHolder = new ContainerFigure();
-  protected TreeNodeContentFigure contentFigure;
-  protected InteractorHelper interactorHelper;
-  protected boolean isSelected = false;
-  protected boolean isReadOnly = false;
-
-  public void activate()
-  {
-    super.activate();
-    addModelAdapterListener(getModel(), this);
-    //viewer = getViewer();
-  }
-
-  int removeNotifyCount = 0;
-
-  public void removeNotify()
-  {
-    removeNotifyCount++;
-    if (removeNotifyCount == 1)
-    {
-      super.removeNotify();
-    }
-  }
-
-  /** 
-   * Apart from the deactivation done in super, the source
-   * and target connections are deactivated, and the visual
-   * part of the this is removed.
-   *
-   * @see #activate() 
-   */
-  public void deactivate()
-  {
-    removeModelAdapterListener(getModel(), this);
-    super.deactivate();
-  }
-
-  protected void createEditPolicies()
-  {
-    //SelectionHandlesEditPolicyImpl policy = new SelectionHandlesEditPolicyImpl();
-    //installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, policy);
-
-    SelectionEditPolicy feedBackSelectionEditPolicy = new WSDLSelectionHandlesEditPolicyImpl();
-    installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, feedBackSelectionEditPolicy);
-  }
-
-  protected EditPart createChild(Object model)
-  {
-    return getEditPartFactory().createEditPart(this, model);
-  }
-
-  public void propertyChanged(Object object, String property)
-  {
-    if (property == ModelAdapter.CHILDREN_PROPERTY)
-    {
-      refreshChildren();
-    }
-    else if (property == ModelAdapter.DETAIL_PROPERTY)
-    {
-      refreshVisuals();
-    }
-    else
-    {
-      refreshChildren();
-      refreshVisuals();
-    }
-  }
-
-  protected IFigure createFigure()
-  {
-    createContentFigure();
-    createFigureContent();
-    return contentFigure;
-  }
-
-  protected void createContentFigure()
-  {
-    contentFigure = new TreeNodeContentFigure();
-  }
-
-  protected void createFigureContent()
-  {
-    // add a bit of space between the interactor and icon
-    //                      
-    RectangleFigure space = new RectangleFigure();
-    space.setVisible(false);
-    space.setPreferredSize(new Dimension(3, 3));
-    contentFigure.getIconArea().add(space);
-
-    labelHolder = new ContainerFigure();
-    labelHolder.setFill(true);
-    contentFigure.getIconArea().add(labelHolder);
-
-    label = new Label(WSDLEditorPlugin.getWSDLString("_UI_LABEL_UNKNOWN_OBJECT"));
-    label.setForegroundColor(ColorConstants.black);
-    labelHolder.add(label);
-
-    interactorHelper = new InteractorHelper(this, contentFigure.getInteractor(), contentFigure.getInnerContentArea());
-  }
-
-  public IFigure getContentPane()
-  {
-    return contentFigure.getInnerContentArea();
-  }
-
-  public Color computeLabelColor()
-  {
-    Color color = ColorConstants.black;
-    if (isSelected)
-    {
-      color = ColorConstants.white;
-    }
-    else if (isReadOnly)
-    {
-      color = ColorConstants.gray;
-    }
-    return color;
-  }
-
-  public void refreshVisuals()
-  {
-    ModelAdapter adapter = getModelAdapter(getModel());
-    if (adapter != null)
-    {
-      isReadOnly = Boolean.TRUE.equals(adapter.getProperty(getModel(), "isReadOnly"));
-      label.setForegroundColor(computeLabelColor());
-      label.setText((String)adapter.getProperty(getModel(), ModelAdapter.LABEL_PROPERTY));
-      label.setIcon((Image)adapter.getProperty(getModel(), ModelAdapter.IMAGE_PROPERTY));
-    }
-    else
-    {
-      label.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_UNKNOWN_NODE") + getModel().getClass().getName());
-    }
-  }
-
-  private void _refreshChildren()
-  {
-    int i;
-    EditPart editPart;
-    Object model;
-
-    Map modelToEditPart = new HashMap();
-    List children = getChildren();
-
-    for (i = 0; i < children.size(); i++)
-    {
-      editPart = (EditPart)children.get(i);
-      modelToEditPart.put(editPart.getModel(), editPart);
-    }
-
-    List modelObjects = getModelChildren();
-
-    for (i = 0; i < modelObjects.size(); i++)
-    {
-      model = modelObjects.get(i);
-
-      //Do a quick check to see if editPart[i] == model[i]
-      if (i < children.size())
-      {
-        editPart = (EditPart)children.get(i);
-        Object editPartModel = editPart.getModel();
-        if (editPartModel == model)
-        {
-          continue;
-        }
-        else if (editPartModel.getClass() == model.getClass())
-        {
-          modelToEditPart.remove(editPartModel);
-
-          if (isActive())
-            editPart.deactivate();
-
-          editPart.setModel(model);
-
-          if (isActive())
-          {
-            editPart.activate();
-            editPart.refresh();
-          }
-          continue;
-        }
-      }
-
-      //Look to see if the EditPart is already around but in the wrong location
-      editPart = (EditPart)modelToEditPart.get(model);
-
-      if (editPart != null)
-        reorderChild(editPart, i);
-      else
-      {
-        //An editpart for this model doesn't exist yet.  Create and insert one.
-        editPart = createChild(model);
-        addChild(editPart, i);
-      }
-    }
-    List trash = new ArrayList();
-    for (; i < children.size(); i++)
-      trash.add(children.get(i));
-    for (i = 0; i < trash.size(); i++)
-    {
-      EditPart ep = (EditPart)trash.get(i);
-      removeChild(ep);
-    }
-  }
-
-  public void refreshChildren()
-  {
-
-    boolean reuseChildren = false;
-    if (getViewer() instanceof WSDLComponentViewer)
-    {
-      WSDLComponentViewer wsdlComponentViewer = (WSDLComponentViewer)getViewer();
-      reuseChildren = wsdlComponentViewer.isPreserveExpansionEnabled();
-    }
-
-    if (reuseChildren)
-    {
-      _refreshChildren();
-    }
-    else
-    {
-      super.refreshChildren();
-    }
-
-    contentFigure.getInteractor().setVisible(hasChildren());
-  }
-
-  public List getModelChildren()
-  {
-    return contentFigure.getInteractor().isExpanded() ? getModelChildrenHelper() : Collections.EMPTY_LIST;
-  }
-
-  protected List getModelChildrenHelper()
-  {
-    List result = null;
-    ModelAdapter modelAdapter = getModelAdapter(getModel());
-    if (modelAdapter != null)
-    {
-      result = (List)modelAdapter.getProperty(getModel(), ModelAdapter.CHILDREN_PROPERTY);
-    }
-    return result != null ? result : Collections.EMPTY_LIST;
-  }
-
-  protected boolean hasChildren()
-  {
-    return getModelChildrenHelper().size() > 0;
-  }
-
-  protected abstract ModelAdapter getModelAdapter(Object model);
-
-  protected EditPartFactory getEditPartFactory()
-  {
-    return ExtensibleEditPartFactory.getInstance();
-  }
-
-  protected void addModelAdapterListener(Object modelObject, ModelAdapterListener listener)
-  {
-    ModelAdapter adapter = getModelAdapter(modelObject);
-    if (adapter != null)
-    {
-      adapter.addListener(listener);
-    }
-  }
-
-  protected void removeModelAdapterListener(Object modelObject, ModelAdapterListener listener)
-  {
-    ModelAdapter adapter = getModelAdapter(modelObject);
-    if (adapter != null)
-    {
-      adapter.removeListener(listener);
-    }
-  }
-
-  public void addFeedback()
-  {
-    isSelected = true;
-    labelHolder.setBackgroundColor(ColorConstants.black);
-    label.setForegroundColor(computeLabelColor());
-    labelHolder.setFill(true);
-  }
-
-  public void removeFeedback()
-  {
-    isSelected = false;
-    labelHolder.setBackgroundColor(null);
-    label.setForegroundColor(computeLabelColor());
-    labelHolder.setFill(false);
-  }
-
-  public boolean isExpanded()
-  {
-    return contentFigure.getInteractor().isExpanded();
-  }
-
-  public void setExpanded(boolean arg)
-  {
-    interactorHelper.setExpanded(arg);
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/UnknownObjectEditPart.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/UnknownObjectEditPart.java
deleted file mode 100644
index 2354fbf7c..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/UnknownObjectEditPart.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.editparts;
-                                         
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapter;
-
-
-public class UnknownObjectEditPart extends TreeNodeEditPart
-{
-  protected ModelAdapter getModelAdapter(Object model)
-  {
-    return null;
-  }                                                                               
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/WSDLEditPart.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/WSDLEditPart.java
deleted file mode 100644
index a8872a4ce..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/WSDLEditPart.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.editparts;
-                                     
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartFactory;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.editpolicies.SelectionEditPolicy;
-import org.eclipse.wst.wsdl.ui.internal.gef.util.editparts.MultiContentPaneEditPart;
-import org.eclipse.wst.wsdl.ui.internal.graph.GraphicsConstants;
-import org.eclipse.wst.wsdl.ui.internal.graph.model.WSDLGraphModelAdapterFactory;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapter;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapterListener;
-
-
-public abstract class WSDLEditPart extends MultiContentPaneEditPart implements ModelAdapterListener, GraphicsConstants
-{
-	/**
-	 * Activates the <code>EditPart</code> by setting the
-	 * appropriate flags, and activating its children.
-	 * activation signals to the EditPart that is should start observing
-	 * it's model, and that is should support editing at this time.
-	 * An EditPart will have a parent prior to activiation.
-	 * @see #deactivate()
-	 */
-	public void activate() 
-  {
-		super.activate();         
-    addModelAdapterListener(getModel(), this);   
-	}
-	/** 
-	 * Apart from the deactivation done in super, the source
-	 * and target connections are deactivated, and the visual
-	 * part of the this is removed.
-	 *
-	 * @see #activate() 
-	 */
-	public void deactivate() 
-  {                    
-    removeModelAdapterListener(getModel(), this); 
-		super.deactivate(); 
-	}   
-    
-  protected void createEditPolicies() 
-  {
-    SelectionEditPolicy policy = new SelectionEditPolicy()
-    {        
-      protected  void hideSelection() 
-      {
-        EditPart editPart = getHost();
-        if (editPart instanceof IFeedbackHandler)
-        {
-          ((IFeedbackHandler)editPart).removeFeedback();
-        }
-      }
-
-      protected  void showSelection()  
-      { 
-        EditPart editPart = getHost();
-        if (editPart instanceof IFeedbackHandler)
-        {
-          ((IFeedbackHandler)editPart).addFeedback();
-        }
-      }             
-    };
-    installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, policy);           
-  }  
-
-  protected EditPart createChild(Object model) 
-  {
-    return getEditPartFactory().createEditPart(this, model);
-  } 
-
-  public void propertyChanged(Object object, String property)
-  {                                                                                                  
-    if (property == ModelAdapter.CHILDREN_PROPERTY)
-    {
-      refreshChildren();
-    }
-    else if (property == ModelAdapter.DETAIL_PROPERTY)
-    { 
-      refreshVisuals(); 
-    }                                       
-    else
-    {
-      refreshChildren();
-      refreshVisuals();
-    }
-  }  
-
-  protected List getModelChildren() 
-  {   
-    List result = null;
-    ModelAdapter modelAdapter = getModelAdapter(getModel());
-    if (modelAdapter != null)
-    {
-      result = (List)modelAdapter.getProperty(getModel(), ModelAdapter.CHILDREN_PROPERTY);
-    }
-    return result != null ? result : Collections.EMPTY_LIST;
-  } 
-
-  protected EditPartFactory getEditPartFactory()
-  {
-    return ExtensibleEditPartFactory.getInstance();
-  } 
-
-  protected ModelAdapter getModelAdapter(Object modelObject)
-  {
-    // TODO : port check
-    return WSDLGraphModelAdapterFactory.getWSDLGraphModelAdapterFactory().getAdapter(modelObject);
-//    return WSDLGraphModelAdapterFactory.EcoreUtil.getAdapter(getWSDLGraphModelAdapterFactory().eAdapters(),modelObject);
-  } 
-
-  protected void addModelAdapterListener(Object modelObject, ModelAdapterListener listener)
-  {
-    ModelAdapter adapter = getModelAdapter(modelObject);
-    if (adapter != null)
-    {
-      adapter.addListener(listener);
-    }
-  }
-
-  protected void removeModelAdapterListener(Object modelObject, ModelAdapterListener listener)
-  {
-    ModelAdapter adapter = getModelAdapter(modelObject);
-    if (adapter != null)
-    {
-      adapter.removeListener(listener);
-    }
-  }  
-
-  public boolean hitTest(IFigure target, Point location)
-  {
-    Rectangle b = target.getBounds().getCopy();
-    target.translateToAbsolute(b);  
-    return b.contains(location);
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/WSDLEditPartFactory.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/WSDLEditPartFactory.java
deleted file mode 100644
index 62e4a2c6e..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/WSDLEditPartFactory.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.editparts;
-                              
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartFactory;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.internal.util.WSDLSwitch;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject;
-
-
-public class WSDLEditPartFactory implements EditPartFactory
-{ 
-  protected static WSDLEditPartFactory instance;                            
-
-  public static WSDLEditPartFactory getInstance()
-  {
-    if (instance == null)
-    {
-      instance = new WSDLEditPartFactory();
-    }
-    return instance;
-  }
-           
-
-
-  public EditPart createEditPart(final EditPart parent, Object model)
-  {             
-      WSDLSwitch wsdlSwitch = new WSDLSwitch()
-      {                   
-      	public Object caseWSDLElement(WSDLElement wsdlElement)
-        {   
-          return new WSDLTreeNodeEditPart();
-	    }   
-       
-      	public Object caseDefinition(Definition definition)
-        {   
-          return new DefinitionEditPart();
-	    }  
-				
-		public Object defaultCase(EObject object)
-		{
-	       return new WSDLTreeNodeEditPart();
-		}
-      };
-	 
-	  
-    EditPart editPart = null;       	
-    if (model instanceof EObject)
-    {
-      editPart = (EditPart)wsdlSwitch.doSwitch((EObject)model);
-    }
-    else if (model instanceof WSDLGroupObject)
-    {
-      editPart = new GroupEditPart();
-    }                                
-
-    if (editPart != null)   
-    {
-      editPart.setModel(model);
-      editPart.setParent(parent);
-    }
-    else
-    {      
-      System.out.println("can't create editPart for " + model);
-      Thread.dumpStack();
-    }
-    return editPart;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/WSDLTreeNodeEditPart.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/WSDLTreeNodeEditPart.java
deleted file mode 100644
index a6c9339db..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/WSDLTreeNodeEditPart.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.editparts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.gef.DragTracker;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.RequestConstants;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.ui.internal.graph.editpolicies.WSDLDragAndDropEditPolicy;
-import org.eclipse.wst.wsdl.ui.internal.graph.editpolicies.WSDLGraphNodeDragTracker;
-import org.eclipse.wst.wsdl.ui.internal.graph.editpolicies.WSDLSelectionHandlesEditPolicyImpl;
-import org.eclipse.wst.wsdl.ui.internal.graph.figures.TreeNodeContentFigure;
-import org.eclipse.wst.wsdl.ui.internal.graph.model.WSDLGraphModelAdapterFactory;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapter;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-
-public class WSDLTreeNodeEditPart extends TreeNodeEditPart
-{ 
-  protected Label label2;                                     
-  protected boolean isEmphasized = false;  
-
-  protected static final Color emphasisColor = new Color(null, 238, 238, 238);
-  protected static final Color label2ForegroundColor = new Color(null, 82, 82, 158);        
-  protected static final Color label2ForegroundColorSelected = new Color(null, 182, 182, 255);
-
-  protected ModelAdapter getModelAdapter(Object modelObject)
-  {
-    return WSDLGraphModelAdapterFactory.getWSDLGraphModelAdapterFactory().getAdapter(modelObject);
-  }                                       
-
-  protected void createContentFigure()
-  {
-	contentFigure = new TreeNodeContentFigure()
-	{
-	  public IFigure getConnectionFigure()
-	  {  	
-  	    return isTopLevel() ? outlinedArea : iconArea;
-	  }   	  
-	};      
-  }
-  
-  protected boolean isTopLevel()
-  {
-    return getParent() instanceof GroupEditPart;
-  }
-	
-  protected void createFigureContent()
-  {                  
-    super.createFigureContent();
-      
-    if (getModel() instanceof Part)
-    {
-      label2 = new Label();
-      labelHolder.add(label2);
-      label2.setBorder(new MarginBorder(0, 5, 0, 0));
-      label2.setForegroundColor(label2ForegroundColor);
-    }
-  }   
-
-  public void setEmphasized(boolean isEmphasized)
-  {
-    this.isEmphasized = isEmphasized;
-    refreshVisuals();
-  }
-  
-  protected void updateEmphasis()
-  {
-    boolean isEmphasisShowing = isEmphasized && (!isSelected || getModelChildren().size() > 0);
-    if (isEmphasisShowing)
-    {              
-      contentFigure.getOutlinedArea().setBackgroundColor(emphasisColor); 
-    }                                                                                    
-
-    contentFigure.getOutlinedArea().setFill(isEmphasisShowing);
-    contentFigure.getOutlinedArea().setOutlined(isEmphasisShowing);    
-    contentFigure.setForegroundColor(elementBorderColor);
-  }
-
-  public void refreshVisuals()
-  {   
-    updateEmphasis();
-
-    super.refreshVisuals();
-   
-    if (label2 != null)
-    {
-      Part part = (Part)getModel();
-	  //String label = ComponentReferenceUtil.isType(part) ? "type" : "element";
-	  String value = ComponentReferenceUtil.getPartReferenceValue(part);  
-      label2.setText("(" + value + ")");
-    }
-  }         
-
-  public void performRequest(Request request)
-  {  
-    if (request.getType() == RequestConstants.REQ_OPEN)
-    {                                        
-      for (EditPart parent = (EditPart)getParent(); parent != null; parent = parent.getParent())
-      {
-        if (parent instanceof DefinitionEditPart)
-        {
-          ((DefinitionEditPart)parent).handleOpenRequest(this);
-          break;
-        }
-      }
-    }    
-    //else if (request.getType() == RequestConstants.REQ_DIRECT_EDIT)
-    //{                            
-    //  performDirectEdit();
-    //}
-  }     
-
-  public void addFeedback()
-  {    
-    super.addFeedback();
-    if (label2 != null)        
-    {
-      label2.setForegroundColor(label2ForegroundColorSelected);
-    }    
-    updateEmphasis();
-  }   
-
-  public void removeFeedback()
-  { 
-    super.removeFeedback();
-    if (label2 != null)        
-    {
-      label2.setForegroundColor(label2ForegroundColor);
-    }
-    updateEmphasis();
-  }                     
-  
-  protected void createEditPolicies()
-  { 
-    super.createEditPolicies();
-    selectionHandlesEditPolicy = new WSDLSelectionHandlesEditPolicyImpl();
-    installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new WSDLDragAndDropEditPolicy(getViewer(), selectionHandlesEditPolicy));
-    installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, selectionHandlesEditPolicy);
-  }  
-  
-  WSDLSelectionHandlesEditPolicyImpl selectionHandlesEditPolicy;
-
-  public IFigure getSelectionFigure()
-  {
-    return getFigure();
-  }
-
-  public DragTracker getDragTracker(Request request)
-  {
-    return new WSDLGraphNodeDragTracker((EditPart)this);
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editpolicies/EditUtil.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editpolicies/EditUtil.java
deleted file mode 100644
index 69bcb3f7d..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editpolicies/EditUtil.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.editpolicies;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.w3c.dom.Element;
-
-//import org.eclipse.wst.wsdl.ui.internal.reconciler.WSDLToDOMElementUtil;
-
-
-public class EditUtil
-{
-  public static List getPossiblePropertyValues(Object model, String propertyName)
-  {
-    List list = null;
-    if (model instanceof Port)
-    {
-      Port port = (Port)model;   
-      ComponentReferenceUtil util = new ComponentReferenceUtil(port.getEnclosingDefinition());
-      list = util.getBindingNames();
-    }                                                   
-    else if (model instanceof Binding)
-    {
-      Binding binding = (Binding)model;   
-      ComponentReferenceUtil util = new ComponentReferenceUtil(binding.getEnclosingDefinition());
-      list = util.getPortTypeNames();
-    }    
-    else if (model instanceof Part)
-    {
-      Part part = (Part)model;    
-      boolean isType = ComponentReferenceUtil.isType(part);
-      list = ComponentReferenceUtil.getComponentNameList(part, isType);
-    } 
-    else if (model instanceof Input ||
-             model instanceof Output ||
-             model instanceof Fault)
-    { 
-      WSDLElement wsdlElement = (WSDLElement)model;   
-      ComponentReferenceUtil util = new ComponentReferenceUtil(wsdlElement.getEnclosingDefinition());
-      list = util.getMessageNames();
-    } 
-
-    if (list == null)
-    {                
-      list = new ArrayList();                            
-      list.add("A");
-      list.add("B");
-      list.add("C");
-    }
-    return list;
-  }
-
-  public static void setPropertyValue(Object model, String propertyName, String value)
-  { 
-    if (model instanceof Part)
-    {                     
-      Part part = (Part)model; 
-      boolean isType = ComponentReferenceUtil.isType(part);
-      ComponentReferenceUtil.setComponentReference(part, isType, value);
-    } 
-    else if (model instanceof Port)
-    {
-      Element element = ((WSDLElement)model).getElement();
-      element.setAttribute("binding", value);
-    } 
-    else if (model instanceof Binding)
-    { 
-      Element element = ((WSDLElement)model).getElement();
-      element.setAttribute("type", value);
-    } 
-    else if (model instanceof Input ||
-             model instanceof Output ||
-             model instanceof Fault)
-    { 
-      Element element = ((WSDLElement)model).getElement();
-      element.setAttribute("message", value);
-    } 
-  }
-
-  public static String getPropertyValue(Object model, String propertyName)
-  { 
-    String result = null;
-
-    if (model instanceof Part)
-    {
-      Element element = ((WSDLElement)model).getElement();
-      result = element.getAttribute(propertyName);
-    } 
-    else if (model instanceof Port)
-    {
-      Element element = ((WSDLElement)model).getElement();
-      result = element.getAttribute("binding");
-    }   
-    else if (model instanceof Binding)
-    { 
-      Element element = ((WSDLElement)model).getElement();
-      result = element.getAttribute("type");
-    }   
-    else if (model instanceof Input ||
-             model instanceof Output ||
-             model instanceof Fault)
-    { 
-      Element element = ((WSDLElement)model).getElement();
-      result = element.getAttribute("message");
-    }              
-    return result;
-  }
-
-  public static void setName(Object model, String value)
-  { 
-    if (model instanceof WSDLElement)
-    {
-      Element element = ((WSDLElement)model).getElement();
-      element.setAttribute("name", value);
-    }  
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editpolicies/NameDirectEditManager.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editpolicies/NameDirectEditManager.java
deleted file mode 100644
index 7619958a3..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editpolicies/NameDirectEditManager.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.editpolicies;
-
-import org.eclipse.draw2d.Label;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.wst.wsdl.ui.internal.actions.SmartRenameAction;
-import org.eclipse.wst.wsdl.ui.internal.gef.util.editpolicies.TextCellEditorManager;
-
-public class NameDirectEditManager extends TextCellEditorManager
-{
-  protected Object model;
-
-  public NameDirectEditManager(GraphicalEditPart source, Label label, Object model)
-  {
-    super(source, label);  
-    this.model = model;
-  }
-
-  public void performModify(final String value)
-  {          
-    Display.getCurrent().asyncExec(new SmartRenameAction(model, value));
-  }      
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editpolicies/WSDLDragAndDropCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editpolicies/WSDLDragAndDropCommand.java
deleted file mode 100644
index 5792516c1..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editpolicies/WSDLDragAndDropCommand.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.editpolicies;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.draw2d.FigureCanvas;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.RequestConstants;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.requests.ChangeBoundsRequest;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.actions.CopyWSDLElementAction;
-import org.eclipse.wst.wsdl.ui.internal.actions.WSDLDragAction;
-import org.eclipse.wst.wsdl.ui.internal.actions.WSDLDragReorderAction;
-import org.eclipse.wst.wsdl.ui.internal.actions.WSDLDragSetMessageAction;
-import org.eclipse.wst.wsdl.ui.internal.graph.editparts.WSDLTreeNodeEditPart;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-
-
-public class WSDLDragAndDropCommand extends Command //AbstractCommand
-{ 
-  protected EditPartViewer viewer;    
-  protected ChangeBoundsRequest request;
-  protected Point location;
-  protected WSDLDragAction dragAction;    
-  protected boolean canExecute = false;
-
-  public WSDLDragAndDropCommand(EditPartViewer viewer, ChangeBoundsRequest request)
-  {
-    this.viewer = viewer;                    
-    this.request = request;
-
-    location = request.getLocation();   
-    EditPart targetEditPart = viewer.findObjectAt(location); 
-
-    // Only support drag and drop for WSDLTreeNodeEditPart
-  	if (targetEditPart instanceof WSDLTreeNodeEditPart) {
-  		WSDLElement wsdlElement = (WSDLElement) targetEditPart.getModel();
-  		if (wsdlElement.getElement() instanceof IDOMNode) {
-  			((GraphicalEditPart)viewer.getRootEditPart()).getFigure().translateToRelative(location);
-  			WSDLTreeNodeEditPart movingChildEditPart;
-  			Vector dragActions = new Vector();
-
-  			if (request.getType().equals(RequestConstants.REQ_ADD))  { // This really shouldn't be REQ_ADD....
-  				List list = request.getEditParts();
-  				if (list.size() <= 0) {
-  					canExecute = false;
-  					return;
-  				}
-            
-  				// Grabbing the fist selection
-  				movingChildEditPart = (WSDLTreeNodeEditPart) list.get(0);
-  				Object model = movingChildEditPart.getModel();
-  				EditPart pointerEditPart = viewer.findObjectAt(location);
- 
-  				if (model instanceof Input || model instanceof Output) {
-  					dragActions.add(new WSDLDragReorderAction(movingChildEditPart, pointerEditPart, getPointerLocation(location)));
-  					dragActions.add(new WSDLDragSetMessageAction(movingChildEditPart, pointerEditPart, location));
-  				}
-  				else if (model instanceof Part) {
-  					dragActions.add(new WSDLDragReorderAction(movingChildEditPart, pointerEditPart, getPointerLocation(location)));     
-  				}
-  				else if (model instanceof Fault) {
-  					dragActions.add(new WSDLDragSetMessageAction(movingChildEditPart, pointerEditPart, location));
-  				}            
-  			}
-  			else if (request.getType().equals(RequestConstants.REQ_CLONE)) {
-  				List list = request.getEditParts();
-  				if (list.size() > 0)
-  				{
-  					// Grabbing the fist selection
-  					movingChildEditPart = (WSDLTreeNodeEditPart) list.get(0);
-             
-  					dragActions.add(new CopyWSDLElementAction(viewer,
-             											  (WSDLElement) movingChildEditPart.getModel(),
-             										      (WSDLElement) targetEditPart.getModel(),
-														  null));
-  				}
-  			}
-        
-  			Iterator it = dragActions.iterator();
-  			while (it.hasNext()) {
-  				dragAction = (WSDLDragAction) it.next();
-  				canExecute = dragAction.canExecute();
-  				if (canExecute)
-  					break;
-  			}
-  		}
-  	}
-  }
-  
-  public boolean canExecute()
-  { 
-    return canExecute;
-  }     
-  
-  public void execute() {
-    if (canExecute)
-    { 
-      dragAction.run(); 
-    }
-  }
-  
-  public IFigure getFeedbackFigure() {
-  	if (dragAction != null) {
-  		return dragAction.getFeedbackFigure();
-  	}
-  	else {
-  		return null;
-  	}
-  }
-  
-  /*
-   * This method compensates for the current scroll position
-   */
-  private Point getPointerLocation(Point origPointerLocation) {
-  	 Point compensatedLocation = origPointerLocation;
-  	 FigureCanvas figureCanvas = (FigureCanvas) viewer.getControl();
-     int yOffset = figureCanvas.getViewport().getVerticalRangeModel().getValue();
-     compensatedLocation.y = compensatedLocation.y + yOffset;
-     
-     return compensatedLocation;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editpolicies/WSDLDragAndDropEditPolicy.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editpolicies/WSDLDragAndDropEditPolicy.java
deleted file mode 100644
index b5dddbc37..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editpolicies/WSDLDragAndDropEditPolicy.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.editpolicies;
-
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.ChangeBoundsRequest;
-
-public class WSDLDragAndDropEditPolicy extends org.eclipse.gef.editpolicies.GraphicalEditPolicy
-{ 
-  protected EditPartViewer viewer;    
-  protected WSDLSelectionHandlesEditPolicyImpl selectionHandlesEditPolicy;
-
-  public WSDLDragAndDropEditPolicy(EditPartViewer viewer, WSDLSelectionHandlesEditPolicyImpl selectionHandlesEditPolicy)
-  {
-    this.viewer = viewer;
-    this.selectionHandlesEditPolicy = selectionHandlesEditPolicy;
-  }
-
-  public boolean understandsRequest(Request req)
-  {
-	  return true;
-  }                             
-  
-  public org.eclipse.gef.commands.Command getCommand(Request request)
-  {
-    WSDLDragAndDropCommand command = null;                            
-    if (request instanceof ChangeBoundsRequest)
-    {
-      command = new WSDLDragAndDropCommand(viewer, (ChangeBoundsRequest)request);  
-      selectionHandlesEditPolicy.setDragAndDropCommand(command);
-    } 
-    return command;             
-  }                                                     
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editpolicies/WSDLGraphNodeDragTracker.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editpolicies/WSDLGraphNodeDragTracker.java
deleted file mode 100644
index 182b93978..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editpolicies/WSDLGraphNodeDragTracker.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.editpolicies;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.tools.DragEditPartsTracker;
-                                   
-public class WSDLGraphNodeDragTracker extends DragEditPartsTracker 
-{                                     
-  protected EditPart editPart; 
-           
-  public WSDLGraphNodeDragTracker(EditPart editPart)
-  {
-    super(editPart);
-    this.editPart = editPart;
-  } 
-                                              
-  protected Command getCommand() 
-  { 
-	  Request request = getTargetRequest();
-    return editPart.getCommand(request); 
-  }
-} 
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editpolicies/WSDLSelectionHandlesEditPolicyImpl.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editpolicies/WSDLSelectionHandlesEditPolicyImpl.java
deleted file mode 100644
index b038d9af4..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editpolicies/WSDLSelectionHandlesEditPolicyImpl.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.editpolicies;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.editpolicies.SelectionHandlesEditPolicy;
-import org.eclipse.gef.handles.MoveHandle;
-import org.eclipse.gef.handles.MoveHandleLocator;
-import org.eclipse.gef.requests.ChangeBoundsRequest;
-import org.eclipse.wst.wsdl.ui.internal.graph.editparts.IFeedbackHandler;
-import org.eclipse.wst.wsdl.ui.internal.graph.editparts.WSDLTreeNodeEditPart;
-
-public class WSDLSelectionHandlesEditPolicyImpl	extends SelectionHandlesEditPolicy
-{
-  protected IFigure feedback;
-  protected Rectangle originalLocation;
-  protected WSDLDragAndDropCommand dragAndDropCommand;
-
-  protected List createSelectionHandles()
-  {              
-    List list = new ArrayList();
-    EditPart editPart = getHost();  
-
-    if (editPart instanceof GraphicalEditPart)
-    {
-      GraphicalEditPart graphicalEditPart = (GraphicalEditPart)editPart;
-      IFigure figure = (graphicalEditPart instanceof WSDLTreeNodeEditPart) ? 
-                          ((WSDLTreeNodeEditPart)graphicalEditPart).getSelectionFigure() :
-                          graphicalEditPart.getFigure();
-   
-      MoveHandleLocator loc = new MoveHandleLocator(figure);    
-      MoveHandle moveHandle = new MoveHandle(graphicalEditPart, loc);     
-      list.add(moveHandle);
-    }
-
-    return list;
-  }   
-  
-
-  public boolean understandsRequest(Request request)
-  {    
-    boolean result = false;
-
-	  if (REQ_MOVE.equals(request.getType()))
-    {  
-		  result = false; // return false to disable move for now 
-    }
-    else
-    {
-	    result = super.understandsRequest(request);
-    }
-    return result;
-  }
-  
-
-  public org.eclipse.gef.commands.Command getCommand(Request request) 
-  {                                          
-    return null;  
-  }   
-
-  public void setDragAndDropCommand(WSDLDragAndDropCommand dragAndDropCommand)
-  {
-    this.dragAndDropCommand = dragAndDropCommand;
-  }
-
-  protected org.eclipse.gef.commands.Command getMoveCommand(ChangeBoundsRequest request) 
-  {
-	  ChangeBoundsRequest req = new ChangeBoundsRequest(REQ_MOVE_CHILDREN);
-	  req.setEditParts(getHost());
-	
-	  req.setMoveDelta(request.getMoveDelta());
-	  req.setSizeDelta(request.getSizeDelta());
-	  req.setLocation(request.getLocation());
-
-	  return getHost().getParent().getCommand(req);
-  } 
-
-  public void showSourceFeedback(Request request)
-  {
-  	eraseChangeBoundsFeedback(null);
-  	
-  	if (dragAndDropCommand != null && dragAndDropCommand.canExecute()) {
-	  if (REQ_MOVE.equals(request.getType()) || REQ_ADD.equals(request.getType())) {
-		  showMoveChangeBoundsFeedback((ChangeBoundsRequest) request);
-	  }
-	  else if (REQ_CLONE.equals(request.getType())) {
-	  	  showCopyChangeBoundsFeedback((ChangeBoundsRequest) request);
-	  }
-  	}
-  }
-
-  protected void showMoveChangeBoundsFeedback(ChangeBoundsRequest request)
-  {
-  	if (dragAndDropCommand != null && dragAndDropCommand.getFeedbackFigure() != null) {
-  		feedback = dragAndDropCommand.getFeedbackFigure();
-  		addFeedback(feedback);
-  	}
-  }        
-
-  protected void showCopyChangeBoundsFeedback(ChangeBoundsRequest request)
-  {
-  	/*
-  	IFigure p = getDragSourceFeedbackFigure();
-  	Rectangle r = originalLocation.getTranslated(request.getMoveDelta());
-  	Dimension resize = request.getSizeDelta();
-  	r.width += resize.width;
-  	r.height+= resize.height;
-  
-  	((GraphicalEditPart)getHost()).getFigure().translateToAbsolute(r);
-  	p.translateToRelative(r);
-                
-    Rectangle pBounds = r.getCopy();                            
-
-    if (dragAndDropCommand != null && dragAndDropCommand.canExecute())
-    {                     
-      int size = request.getEditParts().size();
-      if (size > 0 && request.getEditParts().get(size - 1) == getHost())
-      {         
-        PointList pointList = dragAndDropCommand.getConnectionPoints(r);
-        if (pointList != null && pointList.size() > 0)
-        {
-          polyLine.setPoints(pointList);
-          
-          Point firstPoint = pointList.getFirstPoint();
-          if (firstPoint != null)
-          {
-            pBounds = pBounds.getUnion(new Rectangle(firstPoint.x, firstPoint.y, 1, 1));
-          }
-        }
-      }
-    }
-    p.setBounds(pBounds);
-    ghostShape.setBounds(r);
-  	p.validate();
-  	*/
-  }        
-/*
-  protected IFigure getDragSourceFeedbackFigure() 
-  {
-    EditPart editPart = getHost(); 
-    if (feedback == null && editPart instanceof WSDLTreeNodeEditPart)
-    {                                       
-      WSDLTreeNodeEditPart baseEditPart = (WSDLTreeNodeEditPart)editPart;
-      originalLocation = new Rectangle(baseEditPart.getSelectionFigure().getBounds());
-      feedback = createDragSourceFeedbackFigure(baseEditPart.getSelectionFigure());
-	}
-	return feedback;
-  }
-
-  protected IFigure createDragSourceFeedbackFigure(IFigure draggedFigure)
-  {  	
-  	Polyline polyLine = new Polyline();                         
-//    polyLine.setLineStyle(Graphics.LINE_DASHDOT);      
-    polyLine.setLineWidth(1);
-    addFeedback(polyLine);
-			
-  	return polyLine;
-	} 
-	*/
-
-  public void deactivate()
-  {
-	  if (feedback != null)
-    {
-		  removeFeedback(feedback);
-		  feedback = null;
-	  }
-	  hideFocus();
-	  super.deactivate();
-  }
-
-  /**
-   * Erase feedback indicating that the receiver object is 
-   * being dragged.  This method is called when a drag is
-   * completed or cancelled on the receiver object.
-   * @param dragTracker org.eclipse.gef.tools.DragTracker The drag tracker of the tool performing the drag.
-   */
-  protected void eraseChangeBoundsFeedback(ChangeBoundsRequest request) 
-  {
-	  if (feedback != null) 
-    {		      
-		  removeFeedback(feedback);
-	  }
-	  feedback = null;
-	  originalLocation = null;
-  }
-
-  /**
-   * Erase feedback indicating that the receiver object is 
-   * being dragged.  This method is called when a drag is
-   * completed or cancelled on the receiver object.
-   * @param dragTracker org.eclipse.gef.tools.DragTracker The drag tracker of the tool performing the drag.
-   */
-  public void eraseSourceFeedback(Request request) 
-  {
-    if (REQ_MOVE.equals(request.getType()) ||  REQ_ADD.equals(request.getType()))
-    {
-		  eraseChangeBoundsFeedback((ChangeBoundsRequest)request);
-    }
-  }
-
-  protected void hideSelection()
-  {
-    EditPart editPart = getHost();
-    if (editPart instanceof IFeedbackHandler)
-    {
-      ((IFeedbackHandler)editPart).removeFeedback();
-    }
-  }
-
-  protected void showSelection()
-  {
-    EditPart editPart = getHost();
-    if (editPart instanceof IFeedbackHandler)
-    {
-      ((IFeedbackHandler)editPart).addFeedback();
-    }
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/figures/ExpandableGraphNodeContentFigure.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/figures/ExpandableGraphNodeContentFigure.java
deleted file mode 100644
index 0120df36a..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/figures/ExpandableGraphNodeContentFigure.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.figures;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.draw2d.RectangleFigure;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.wst.wsdl.ui.internal.gef.util.figures.Interactor;
-
-              
-              
-
-//  --------------------------------------------
-//  | ExpandableGraphNodeContentFigure         |
-//  |                                          |
-//  |   ----------------------------------     |
-//  |   | verticalGroup                  |     |
-//  |   |                                |     |
-//  |   | -----------------------------  |     |
-//  |   | | horizontalGroup           |  |     |
-//  |   | |                           |  |     |
-//  |   | | ---------------------     |  |     |
-//  |   | | | outlinedArea      |     |  |     |
-//  |   | | | ----------------- |     |  |     |
-//  |   | | | |[+]iconArea    | |     |  |     |
-//  |   | | | ----------------- |     |  |     |
-//  |   | | | ----------------- |     |  |     |
-//  |   | | | | innerContent  | |     |  |     |
-//  |   | | | ----------------- |     |  |     |
-//  |   | | ---------------------     |  |     |
-//  |   | -----------------------------  |     |
-//  |   |                                |     |
-//  |   ----------------------------------     |
-//  --------------------------------------------
-
-public class ExpandableGraphNodeContentFigure extends GraphNodeContentFigure
-{   
-  protected Interactor interactor; 
-  //protected ContainerFigure occurenceArea;  
- 
-  public ExpandableGraphNodeContentFigure()
-  {
-    super();    
-  }      
-  
-  public Interactor getInteractor()
-  {
-    return interactor;
-  } 
-
-
-  protected void createFigure()
-  {   
-    //createPreceedingSpace(this);           
-    createVerticalGroup(this);
-    createOutlinedArea(verticalGroup);   
-    createInteractor(iconArea);
-    innerContentArea.setBorder(new MarginBorder(0, 10, 0, 0));
-    //createOccurenceArea(verticalGroup);   
-  }
-  
-              
-
-  protected void createInteractor(IFigure parent)
-  {
-    interactor = new Interactor();
-    interactor.setBorder(new MarginBorder(0, 0, 0, 5));
-    interactor.setForegroundColor(ColorConstants.black);
-    interactor.setBackgroundColor(ColorConstants.white); 
-    parent.add(interactor);
-  } 
-
-                                
-  protected void createPreceedingSpace(IFigure parent)
-  {
-    // create a small space
-    RectangleFigure space = new RectangleFigure();
-    space.setVisible(false);
-    space.setPreferredSize(new Dimension(10, 10));
-    parent.add(space);  
-  }  
-  
-
-  //protected void createOccurenceArea(IFigure parent)
-  //{
-  //  occurenceArea = new ContainerFigure();             
-  //  parent.add(occurenceArea);
-  //}                 
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/figures/GraphNodeContentFigure.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/figures/GraphNodeContentFigure.java
deleted file mode 100644
index 94af5a419..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/figures/GraphNodeContentFigure.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.figures;
-                                         
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.wst.xsd.ui.internal.gef.util.figures.ContainerFigure;
-import org.eclipse.wst.xsd.ui.internal.gef.util.figures.IConnectedFigure;
-              
-
-//  ------------------------------
-//  | GraphNodeContentFigure     |
-//  |                            |
-//  | -------------------------  |
-//  | | vertical group        |  |
-//  | | --------------------- |  |
-//  | | | outlined area     | |  |
-//  | | | ----------------- | |  |
-//  | | | | icon area     | | |  |
-//  | | | ----------------- | |  |
-//  | | | ----------------- | |  |
-//  | | | | inner content | | |  |
-//  | | | ----------------- | |  |
-//  | | --------------------- |  |
-//  | -------------------------  |
-//  ------------------------------
-
-public class GraphNodeContentFigure extends ContainerFigure implements IConnectedFigure
-{                        
-  protected ContainerFigure verticalGroup; 
-  protected ContainerFigure outlinedArea;
-  protected ContainerFigure iconArea;
-  protected ContainerFigure innerContentArea; 
-         
-  public GraphNodeContentFigure()
-  {                                    
-    createFigure();                    
-  }      
-                  
-  protected void createFigure()
-  {                     
-    //getContainerLayout().setHorizontal(true);
-    //setLayoutManager(new FillLayout());
-    createVerticalGroup(this);
-    createOutlinedArea(verticalGroup); 
-  }
-
-  protected void createVerticalGroup(IFigure parent)
-  {
-    verticalGroup = new ContainerFigure();
-    verticalGroup.getContainerLayout().setHorizontal(false);
-    ///verticalGroup.setLayoutManager(new FillLayout());
-    parent.add(verticalGroup);
-  }
-
-  protected void createOutlinedArea(IFigure parent)
-  { 
-    outlinedArea = new ContainerFigure();
-    //outlinedArea.setLayoutManager(new FillLayout());
-    outlinedArea.getContainerLayout().setHorizontal(false);
-    parent.add(outlinedArea);      
-     
-    iconArea = new ContainerFigure();
-    iconArea.getContainerLayout().setHorizontal(true);
-    outlinedArea.add(iconArea);
-
-    innerContentArea = new ContainerFigure();
-    //innerContentArea.setLayoutManager(new FillLayout());
-    innerContentArea.getContainerLayout().setHorizontal(false);
-    outlinedArea.add(innerContentArea);  
-  }   
-
-  public ContainerFigure getIconArea()
-  {
-    return iconArea;
-  }
-
-  public ContainerFigure getOutlinedArea()
-  {
-    return outlinedArea;
-  }
-
-  public ContainerFigure getInnerContentArea()
-  {
-    return innerContentArea;
-  } 
-
-  public IFigure getConnectionFigure()
-  {
-    return outlinedArea;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/figures/MyConnectionRenderingHelper.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/figures/MyConnectionRenderingHelper.java
deleted file mode 100644
index af8537da6..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/figures/MyConnectionRenderingHelper.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.figures;
-
-import java.util.Iterator;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.eclipse.wst.wsdl.ui.internal.graph.editparts.DefinitionEditPart;
-import org.eclipse.wst.wsdl.ui.internal.graph.editparts.GroupEditPart;
-import org.eclipse.wst.wsdl.ui.internal.graph.editparts.PartReferenceSectionEditPart;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject;
-import org.eclipse.wst.xsd.ui.internal.gef.util.figures.IConnectedFigure;
-              
-
-public class MyConnectionRenderingHelper //implements ISelectionChangedListener
-{               
-  protected boolean isOutlined = true;
-  protected EditPartViewer viewer;
-
-  public MyConnectionRenderingHelper(EditPartViewer viewer)
-  {
-    this.viewer = viewer;    
-    //viewer.addSelectionChangedListener(this);
-    //setFocusTraversable(false); 
-    //setEnabled(false); 
-  }      
-  
-  //public void selectionChanged(SelectionChangedEvent event) 
-  //{
-  //}
-            
-  public void fillShapeHelper(Graphics graphics)
-  { 
-    drawLines(graphics, viewer.getRootEditPart());    
-  }
-                 
-  protected Rectangle getConnectionBounds(IFigure figure)
-  {                 
-    Rectangle r = null;
-    if (figure instanceof IConnectedFigure)
-    {
-      IConnectedFigure connectedFigure = (IConnectedFigure)figure;
-      r = connectedFigure.getConnectionFigure().getBounds();
-    }
-    else
-    {
-      r = figure.getBounds();
-    }
-    return r; 
-  }                      
-            
-  final static int DOTTED_LINE_HEIGHT = 20;
-  protected int getClippedY(int y, Rectangle bounds)
-  {                        
-    if (bounds != null)
-    {
-      if (y < bounds.y)
-      {
-        y = bounds.y;
-      }     
-      if (y  > (bounds.y + bounds.height))
-      {
-        y = bounds.y + bounds.height; 
-      }
-    }
-    return y;
-  }
-    
-  protected void drawLine(Graphics graphics, IFigure a, IFigure b, int mx, Rectangle bounds)
-  {
-        Rectangle r1 = getConnectionBounds(a);
-        Rectangle r2 = getConnectionBounds(b);
-        int x1 = r1.x + r1.width;
-        int y1 = r1.y + r1.height / 2;
-        int x2 = r2.x - 1;
-        int y2 = r2.y + r2.height / 2;
-          
-        int clippedY1 = getClippedY(y1, bounds);
-        int clippedY2 = getClippedY(y2, bounds);
-
-        graphics.setForegroundColor(ColorConstants.black);
-
-        if (clippedY1 == y1 || clippedY2 == y2)
-        {                       
-          if (clippedY1 == y1)
-          {                                                
-            // draw horizontal line
-            graphics.drawLine(x1, y1, mx, y1); 
-          }
-       
-          if (clippedY2 == y2)
-          {        
-            // draw horizontal line
-            graphics.drawLine(mx, y2, x2 - 1, y2);    
-
-            // draw the arrow head
-            //
-            graphics.drawLine(x2 - 1, y2, x2 - 4, y2 - 3); 
-            graphics.drawLine(x2 - 1, y2, x2 - 4, y2 + 3); 
-          }  
-                  
-            
-          // draw the vertical line including dotted ends
-          //
-          int lowClippedY = Math.min(clippedY1, clippedY2);
-          int highClippedY = Math.max(clippedY1, clippedY2);
-          int lowY = Math.min(y1, y2);
-          int highY = Math.max(y1, y2);
-            
-          if (lowY == lowClippedY && highY == highClippedY)
-          {
-            graphics.drawLine(mx, lowClippedY, mx, highClippedY);
-          }
-          else
-          { 
-            int dottedLineLength = Math.min(DOTTED_LINE_HEIGHT, (highY - lowY)/3);
-            if (lowY != lowClippedY)
-            {
-              graphics.setLineStyle(Graphics.LINE_DOT);
-              int dottedY = lowClippedY + dottedLineLength;
-              graphics.drawLine(mx, lowClippedY, mx, dottedY); 
-              graphics.setLineStyle(Graphics.LINE_SOLID);
-              graphics.drawLine(mx, dottedY, mx, highClippedY); 
-            }
-            else //if (highY != highClippedY)
-            {
-              graphics.setLineStyle(Graphics.LINE_DOT);
-              int dottedY = highClippedY - dottedLineLength;
-              graphics.drawLine(mx, highClippedY, mx, dottedY); 
-              graphics.setLineStyle(Graphics.LINE_SOLID);
-              graphics.drawLine(mx, dottedY, mx, lowClippedY); 
-            }                              
-          }
-        }
-  }
-
-  protected void drawLines(Graphics graphics, EditPart editPart)
-  { 
-    if (editPart instanceof GroupEditPart)
-    { 
-      GroupEditPart leftGroupEditPart = (GroupEditPart)editPart;
-      GroupEditPart rightGroupEditPart = leftGroupEditPart.getNext();
-
-      if (leftGroupEditPart != null && rightGroupEditPart != null)
-      {                                                  
-        if (leftGroupEditPart.outputConnection != null && rightGroupEditPart.inputConnection != null)
-        {
-          int mx = rightGroupEditPart.getFigure().getBounds().x - 5;                                                      
-
-          Rectangle l = leftGroupEditPart.outerPane.getBounds();
-          Rectangle r = leftGroupEditPart.outerPane.getBounds();
-
-          // here we compute the union of the group bounds... rectangle.union() doesn't seem to work
-          //
-          int ux1 = Math.min(l.x, r.x); 
-          int uy1 = Math.min(l.y, r.y);       
-          int ux2 = Math.max(l.x + l.width, r.x + r.width);
-          int uy2 = Math.max(l.y + l.height, r.y + r.height);
-          Rectangle bounds = new Rectangle(ux1, uy1, ux2 - ux1, uy2 - uy1);       
-          drawLine(graphics, leftGroupEditPart.outputConnection.getFigure(), rightGroupEditPart.inputConnection.getFigure(), mx, bounds);      
-        }
-      }                                              
-    }  
-    else if (editPart instanceof PartReferenceSectionEditPart)
-    {
-      AbstractGraphicalEditPart child = (editPart.getChildren().size() > 0) ? 
-                                        (AbstractGraphicalEditPart)editPart.getChildren().get(0) :
-                                        null;
-      if (child != null)
-      {
-        DefinitionEditPart def = (DefinitionEditPart)editPart.getParent();
-        GroupEditPart groupEditPart = def.getGroupEditPart(WSDLGroupObject.MESSAGES_GROUP);
-        if (groupEditPart != null && groupEditPart.outputConnection != null)
-        {
-          int mx = child.getFigure().getBounds().x - 12;
-          drawLine(graphics, groupEditPart.outputConnection.getFigure(), child.getFigure(), mx, null);
-        }
-      }
-    }
-    else
-    {
-      for (Iterator i = editPart.getChildren().iterator(); i.hasNext(); )
-      {
-        EditPart child = (EditPart)i.next();
-        drawLines(graphics, child);
-      }
-    } 
-  }    
-}     
-
-/*
-    /*
-    List children = figure.getChildren();
-    for (Iterator i = children.iterator(); i.hasNext(); )
-    {
-      IFigure child = (IFigure)i.next();
-      drawLines(graphics, child);    
-    } */ 
-      /*  
-      List connectedFigures = graphNodeFigure.getConnectedFigures(IConnectedEditPartFigure.RIGHT_CONNECTION);
-      int connectedFiguresSize = connectedFigures.size();              
-
-      if (connectedFiguresSize > 0) 
-      {                                         
-        IConnectedEditPartFigure firstGraphNodeFigure = (IConnectedEditPartFigure)connectedFigures.get(0);
-        Rectangle r = graphNodeFigure.getConnectionFigure().getBounds();    
-          
-        int x1 = r.x + r.width;
-        int y1 = r.y + r.height/2;
-                                                                                   
-        int startOfChildBox = firstGraphNodeFigure.getConnectionFigure().getBounds().x;
-        int x2 = x1 + (startOfChildBox - x1) / 3;
-        int y2 = y1;
-      
-        if (connectedFiguresSize == 1)
-        {
-          graphics.drawLine(x1, y1, startOfChildBox, y2);   
-        }
-        else // (connectedFigures.length > 1)
-        { 
-          graphics.drawLine(x1, y1, x2, y2);
-
-          int minY = Integer.MAX_VALUE;
-          int maxY = -1;
-
-          for (Iterator i = connectedFigures.iterator(); i.hasNext(); )
-          {                                 
-            IConnectedEditPartFigure connectedFigure = (IConnectedEditPartFigure)i.next();
-            Rectangle childConnectionRectangle = connectedFigure.getConnectionFigure().getBounds();
-            int y = childConnectionRectangle.y + childConnectionRectangle.height / 2;
-            minY = Math.min(minY, y);
-            maxY = Math.max(maxY, y);
-            graphics.drawLine(x2, y, childConnectionRectangle.x, y);
-          }                   
-          graphics.drawLine(x2, minY, x2, maxY);
-        }                          
-      }                             
-    }            
-
-    //boolean visitChildren = true;
-    List children = figure.getChildren();
-    for (Iterator i = children.iterator(); i.hasNext(); )
-    {
-      IFigure child = (IFigure)i.next();
-      drawLines(graphics, child);
-    }
-*/
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/figures/TreeNodeContentFigure.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/figures/TreeNodeContentFigure.java
deleted file mode 100644
index 628b79863..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/figures/TreeNodeContentFigure.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.figures;
-                                         
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.MarginBorder;
-              
-
-public class TreeNodeContentFigure extends ExpandableGraphNodeContentFigure
-{            
-  protected void createOutlinedArea(IFigure parent)
-  {                   
-    super.createOutlinedArea(parent);
-    outlinedArea.setBorder(new MarginBorder(0,2,0,2)); 
-  }    
-  
-  public IFigure getConnectionFigure()
-  {
-    return outlinedArea;
-  }           
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/model/WSDLGraphModelAdapterFactory.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/model/WSDLGraphModelAdapterFactory.java
deleted file mode 100644
index c336ce0b4..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/model/WSDLGraphModelAdapterFactory.java
+++ /dev/null
@@ -1,394 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.model;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.wsdl.ui.internal.graph.ViewMode;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapter;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapterFactory;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapterListener;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLModelAdapterFactory;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-
-
-public class WSDLGraphModelAdapterFactory extends WSDLModelAdapterFactory
-{          
-  protected static WSDLGraphModelAdapterFactory wsdlGraphModelAdapterFactoryInstance;
-
-  public static WSDLGraphModelAdapterFactory getWSDLGraphModelAdapterFactory()
-  {                
-    if (wsdlGraphModelAdapterFactoryInstance == null)
-    {
-      wsdlGraphModelAdapterFactoryInstance = new WSDLGraphModelAdapterFactory();
-    }
-    return wsdlGraphModelAdapterFactoryInstance;
-  }  
-  
-  protected AdapterFactory createAdapterFactory()
-  {
-    return new GraphAdapterFactory();
-  }  
-
-  //protected boolean isExtensibilityElementConsideredChild()
-  //{
-  //  return false;
-  //}
-        
-
-  // There are many adapters associated with this factory.  Each DOM Node has its own adapter.
-  //
-  protected class GraphAdapterFactory extends WSDLAdapterFactoryImpl
-  {                                                                
-
-    public Adapter createDefinitionAdapter()
-    {
-      return new GraphDefinitionAdapter();
-    } 
-    
-    public Adapter createBindingAdapter()
-    {
-      return new GraphBindingAdapter();
-    } 
-
-    public Adapter createPartAdapter()
-    {
-      return new GraphPartAdapter();
-    }                                         
-
-    //public Adapter createPortAdapter()
-    //{
-    //  return new GraphPortAdapter();
-    //}
-
-    public Adapter createPortTypeAdapter()
-    {
-      return new GraphPortTypeAdapter();
-    }
-
-    //public Adapter createInputAdapter()
-    //{
-    //  return new GraphInputAdapter();
-    //} 
-
-    //public Adapter createOutputAdapter()
-    //{
-    //  return new GraphOutputAdapter();
-    //}   
-
-    //public Adapter createFaultAdapter()
-    //{
-    //  return new GraphFaultAdapter();
-    //}
-
-  	public Adapter createTypesAdapter() 
-    {                    
-      return new GraphTypesAdapter();
-    }
-  }      
-
-        
-  
-  protected class GraphDefinitionAdapter extends DefinitionAdapter implements ViewMode.Listener
-  {                
-    protected ViewMode viewMode = new ViewMode();  
- 
-    public void setTarget(Notifier newTarget) 
-    {
-      super.setTarget(newTarget);   
-      viewMode.addListener(this);         
-    }
-                                                      
-    protected List getChildren()
-    {             
-      List list = new ArrayList();
-      list.add(permanentWSDLGroupObjectList.get(0));
-      list.add(permanentWSDLGroupObjectList.get(1));  
-      list.add(permanentWSDLGroupObjectList.get(5));
-      if (viewMode.isBindingVisible())
-      {
-        list.add(permanentWSDLGroupObjectList.get(4));
-      } 
-      list.add(permanentWSDLGroupObjectList.get(3));  
-      list.add(permanentWSDLGroupObjectList.get(2));  
-      if (extensibilityElementsGroup.getChildren().size() > 0)
-      {
-        list.add(extensibilityElementsGroup);
-      }
-      return list;      
-    }
-
-  
-    public void viewModeChanged(ViewMode mode)
-    {
-      firePropertyChangedHelper();
-    }    
-
-    public ViewMode getViewMode()
-    {
-      return viewMode;
-    }    
-
-    protected ModelAdapterFactory getModelAdapterFactory()
-    {
-      return getWSDLGraphModelAdapterFactory();
-    }
-  }
-
-
-
-
-  protected class GraphBindingAdapter extends BindingAdapter
-  { /*                                  
-    protected List getChildren()
-    {                
-      List list = new ArrayList();   
-      if (binding.getPortType() != null)
-      {
-        list.add(binding.getPortType());
-      }
-      return list;
-    }*/  
-  }
-      
-                        
-  protected class GraphPartAdapter extends PartAdapter
-  { /*  
-    protected List getChildren()
-    {                  
-      List list = new ArrayList();
-
-      Object component = part.getType();
-      if (component != null) 
-      {
-        // TODO... i'm pulling a fast one here.... we should call the extension
-        // to see if he wants to show a child here
-        if (component instanceof org.eclipse.xsd.XSDComplexTypeDefinition)
-        {
-          list.add(component);
-        }
-      }
-      else
-      {
-        component = part.getElement();
-        if (component != null)
-        {
-          list.add(component);
-        }
-      }
-
-      return list;
-    }*/   
-  }
-    
-  protected class GraphPortTypeAdapter extends PortTypeAdapter
-  {   
-    public Object getProperty(Object modelObject, String propertyName)
-    {           
-      Object result = null;
-      if (propertyName.equals("bindings"))
-      {    
-        ComponentReferenceUtil util = new ComponentReferenceUtil(portType.getEnclosingDefinition());
-        result = util.getBindings(portType);
-      }
-      else
-      {
-        result = super.getProperty(modelObject, propertyName);
-      }   
-      return result;
-    }  
-  }
-
-  protected class GraphPortAdapter extends PortAdapter implements ModelAdapterListener
-  {                                                
-    protected List getChildren()
-    {                
-      List list = new ArrayList(); 
-    
-      Binding binding = (Binding)port.getBinding();
-
-      if (binding != null)
-      {
-        list.add(binding);
-      }
-     
-      return list;
-    }
-                     
-    // propagate changes to the binding object
-    //
-    public void propertyChanged(Object object, String property)
-    {
-      firePropertyChanged(port, null);
-    }
-  }   
-            
-
-  protected class GraphInputAdapter extends InputAdapter
-  {
-    protected List getChildren()
-    {     
-      List list = new ArrayList();
-      if (input.getMessage() != null)
-      {
-        list.add(input.getMessage());
-      }       
-      return list;
-    }     
-
-    public Object getProperty(Object modelObject, String propertyName)
-    {           
-      Object result = null;
-      if (propertyName.equals("bindings"))
-      {    
-        ComponentReferenceUtil util = new ComponentReferenceUtil(input.getEnclosingDefinition());
-        result = util.getBindingInputs(input);
-      }
-      else
-      {
-        result = super.getProperty(modelObject, propertyName);
-      }   
-      return result;
-    }   
-  }
-
-
-  protected class GraphOutputAdapter extends OutputAdapter
-  {
-    protected List getChildren()
-    {     
-      List list = new ArrayList();
-      if (output.getMessage() != null)
-      {
-        list.add(output.getMessage());
-      }       
-      return list;
-    }  
-
-    public Object getProperty(Object modelObject, String propertyName)
-    {           
-      Object result = null;
-      if (propertyName.equals("bindings"))
-      {    
-        ComponentReferenceUtil util = new ComponentReferenceUtil(output.getEnclosingDefinition());
-        result = util.getBindingOutputs(output);
-      }
-      else
-      {
-        result = super.getProperty(modelObject, propertyName);
-      }   
-      return result;
-    }   
-  }
-
-  protected class GraphFaultAdapter extends FaultAdapter
-  {
-    protected List getChildren()
-    {     
-      List list = new ArrayList();
-      if (fault.getMessage() != null)
-      {
-        list.add(fault.getMessage());
-      }       
-      return list;
-    }  
-
-    public Object getProperty(Object modelObject, String propertyName)
-    {           
-      Object result = null;
-      if (propertyName.equals("bindings"))
-      {    
-        ComponentReferenceUtil util = new ComponentReferenceUtil(fault.getEnclosingDefinition());
-        result = util.getBindingFaults(fault);
-      }
-      else
-      {
-        result = super.getProperty(modelObject, propertyName);
-      }   
-      return result;
-    }                                     
-  }     
-
-  public class GraphTypesAdapter extends TypesAdapter
-  {                                             
-    protected List getChildren()
-    {  
-      List list = new ArrayList();
-      for (Iterator i = types.getEExtensibilityElements().iterator(); i.hasNext(); )
-      {
-        Object o = i.next();
-        if (o instanceof XSDSchemaExtensibilityElement)
-        {
-          XSDSchemaExtensibilityElement s = (XSDSchemaExtensibilityElement)o;
-          Object schema = s.getSchema();
-          if (schema != null)
-          {
-            list.add(schema);
-          }
-        } 
-        else
-        {
-          list.add(o);
-        }
-      }
-      return list;
-    }                                                                                                         
-  }
-  /*
-  protected class GraphBindingAdapter extends BindingAdapter
-  {                                   
-    protected List getChildren()
-    {                
-      List list = new ArrayList();   
-      if (binding.getPortType() != null)
-      {
-        list.add(binding.getPortType());
-      }
-      return list;
-    }  
-  }*/
-
-  // convenience methods
-  //
-  public static void addModelAdapterListener(Object modelObject, ModelAdapterListener listener)
-  {                                                               
-// TODO: port check
-    ModelAdapter adapter = getWSDLGraphModelAdapterFactory().getAdapter(modelObject);
-//    ModelAdapter adapter = EcoreUtil.getAdapter(getWSDLGraphModelAdapterFactory().eAdapters(),modelObject);
-    if (adapter != null)
-    {
-      adapter.addListener(listener);
-    }
-  }    
-
-  public static void removeModelAdapterListener(Object modelObject, ModelAdapterListener listener)
-  {                                                            
-    ModelAdapter adapter = getWSDLGraphModelAdapterFactory().getAdapter(modelObject);
-    if (adapter != null)
-    {
-      adapter.removeListener(listener);
-    }
-  } 
-
-  public static ViewMode getViewMode(Definition definition)
-  {
-    GraphDefinitionAdapter adapter = (GraphDefinitionAdapter)getWSDLGraphModelAdapterFactory().getAdapter(definition);
-    return adapter.getViewMode();
-  }           
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/back.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/back.gif
deleted file mode 100644
index 24d1a279e..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/back.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/binding_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/binding_obj.gif
deleted file mode 100644
index 896e2f055..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/binding_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/bindingheader_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/bindingheader_obj.gif
deleted file mode 100644
index 1ffe54e33..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/bindingheader_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/browsebutton.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/browsebutton.gif
deleted file mode 100644
index e2402f88f..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/browsebutton.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/complextype_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/complextype_obj.gif
deleted file mode 100644
index 007f8522a..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/complextype_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/element_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/element_obj.gif
deleted file mode 100644
index dd45f08fb..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/element_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/error_co.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/error_co.gif
deleted file mode 100644
index 119dcccd5..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/error_co.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/fault_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/fault_obj.gif
deleted file mode 100644
index f228117f2..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/fault_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/file_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/file_obj.gif
deleted file mode 100644
index efa7a3801..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/file_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/fldr_el.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/fldr_el.gif
deleted file mode 100644
index 801c13388..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/fldr_el.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/forward.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/forward.gif
deleted file mode 100644
index eab699e38..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/forward.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/hidebinding.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/hidebinding.gif
deleted file mode 100644
index c846cd8d8..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/hidebinding.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/httpaddress_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/httpaddress_obj.gif
deleted file mode 100644
index fb20c389d..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/httpaddress_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/httpbinding_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/httpbinding_obj.gif
deleted file mode 100644
index 4428ef395..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/httpbinding_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/httpoperation_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/httpoperation_obj.gif
deleted file mode 100644
index 1c404181d..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/httpoperation_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/httpurlencoded_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/httpurlencoded_obj.gif
deleted file mode 100644
index ed5050f22..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/httpurlencoded_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/httpurlreplacement_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/httpurlreplacement_obj.gif
deleted file mode 100644
index 273587ea9..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/httpurlreplacement_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/import_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/import_obj.gif
deleted file mode 100644
index b7275aa56..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/import_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/importheader_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/importheader_obj.gif
deleted file mode 100644
index 6000cb80f..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/importheader_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/input_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/input_obj.gif
deleted file mode 100644
index fe6b34989..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/input_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/message_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/message_obj.gif
deleted file mode 100644
index 2dce48373..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/message_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/messageheader_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/messageheader_obj.gif
deleted file mode 100644
index 02a711cee..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/messageheader_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/namespace_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/namespace_obj.gif
deleted file mode 100644
index 7e3f274d0..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/namespace_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/namespacedecl_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/namespacedecl_obj.gif
deleted file mode 100644
index 2b79d2749..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/namespacedecl_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/new_wsdl_wiz.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/new_wsdl_wiz.gif
deleted file mode 100644
index d1087b9b1..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/new_wsdl_wiz.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/operation_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/operation_obj.gif
deleted file mode 100644
index 5818a3088..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/operation_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/operationbinding_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/operationbinding_obj.gif
deleted file mode 100644
index ae386c636..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/operationbinding_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/output_no.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/output_no.gif
deleted file mode 100644
index f6b9f8a59..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/output_no.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/output_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/output_obj.gif
deleted file mode 100644
index bd0918ce1..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/output_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/output_yes.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/output_yes.gif
deleted file mode 100644
index 9cacb96dc..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/output_yes.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/page_banner.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/page_banner.gif
deleted file mode 100644
index aebc0b2a3..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/page_banner.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/part_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/part_obj.gif
deleted file mode 100644
index 5219dfa87..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/part_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/port_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/port_obj.gif
deleted file mode 100644
index 379498b0a..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/port_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/porttype_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/porttype_obj.gif
deleted file mode 100644
index 21325ca77..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/porttype_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/porttypeheader_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/porttypeheader_obj.gif
deleted file mode 100644
index 9afcc01e1..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/porttypeheader_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/prtcmplxpltyp_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/prtcmplxpltyp_obj.gif
deleted file mode 100644
index db866437f..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/prtcmplxpltyp_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/prtelemt_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/prtelemt_obj.gif
deleted file mode 100644
index 782d108fe..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/prtelemt_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/prtsmpltyp_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/prtsmpltyp_obj.gif
deleted file mode 100644
index 8ffc7c57b..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/prtsmpltyp_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/service_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/service_obj.gif
deleted file mode 100644
index 5216b3f2d..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/service_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/serviceheader_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/serviceheader_obj.gif
deleted file mode 100644
index 8b4814cb8..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/serviceheader_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/simpletype_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/simpletype_obj.gif
deleted file mode 100644
index e45dbb1d8..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/simpletype_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soap_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soap_obj.gif
deleted file mode 100644
index fd426ed2d..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soap_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapaddress_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapaddress_obj.gif
deleted file mode 100644
index 4880ba795..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapaddress_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapatt_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapatt_obj.gif
deleted file mode 100644
index d0b366181..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapatt_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapbinding_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapbinding_obj.gif
deleted file mode 100644
index 115f6bf2b..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapbinding_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapbody_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapbody_obj.gif
deleted file mode 100644
index b2d01aad0..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapbody_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapfault_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapfault_obj.gif
deleted file mode 100644
index 856b1f7d4..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapfault_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapheader_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapheader_obj.gif
deleted file mode 100644
index f72ea3b20..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapheader_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapheaderfault_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapheaderfault_obj.gif
deleted file mode 100644
index 2f0e1906f..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapheaderfault_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapoperation_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapoperation_obj.gif
deleted file mode 100644
index bcc191469..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapoperation_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/types_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/types_obj.gif
deleted file mode 100644
index d1f6f889d..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/types_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/validate.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/validate.gif
deleted file mode 100644
index 2b347ac45..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/validate.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/wsdl_file_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/wsdl_file_obj.gif
deleted file mode 100644
index 75b1f92b4..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/wsdl_file_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/xsd_file_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/xsd_file_obj.gif
deleted file mode 100644
index 13dcfceaf..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/xsd_file_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/xsd_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/xsd_obj.gif
deleted file mode 100644
index 13dcfceaf..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/xsd_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/model/ModelAdapter.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/model/ModelAdapter.java
deleted file mode 100644
index 0e53e7ecf..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/model/ModelAdapter.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.model;
-
-public interface ModelAdapter
-{               
-  public static final String CHILDREN_PROPERTY = "CHILDREN_PROPERTY";
-  public static final String LABEL_PROPERTY = "LABEL_PROPERTY";
-  public static final String IMAGE_PROPERTY = "IMAGE_PROPERTY";
-  public static final String DETAIL_PROPERTY = "DETAIL_PROPERTY";
-                                       
-  public void addListener(ModelAdapterListener l);
-  public void removeListener(ModelAdapterListener l);
-  public Object getProperty(Object modelObject, String propertyName); 
-  public void firePropertyChanged(Object modelObject, String propertyName);
-}
-
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/model/ModelAdapterFactory.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/model/ModelAdapterFactory.java
deleted file mode 100644
index 9db0daaf2..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/model/ModelAdapterFactory.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.model;
-
-public interface ModelAdapterFactory
-{
-  public ModelAdapter getAdapter(Object o);
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/model/ModelAdapterListener.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/model/ModelAdapterListener.java
deleted file mode 100644
index 1e3e851aa..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/model/ModelAdapterListener.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.model;
-
-public interface ModelAdapterListener
-{                             
-  public void propertyChanged(Object object, String property);
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/model/WSDLGroupObject.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/model/WSDLGroupObject.java
deleted file mode 100644
index 5d9abfa6e..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/model/WSDLGroupObject.java
+++ /dev/null
@@ -1,414 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.model;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-
-
-  
-// Note that the TYPES_GROUP group is just a place holder.  If the Types obejct actually exists 
-// for the root WSDL document, it will be used instead of this model group
-//
-public class WSDLGroupObject implements ModelAdapter
-{
-  public static final int IMPORTS_GROUP = 1;
-  public static final int MESSAGES_GROUP = 2;
-  public static final int SERVICES_GROUP = 3;
-  public static final int PORT_TYPES_GROUP = 4;
-  public static final int BINDINGS_GROUP = 5;
-  public static final int TYPES_GROUP = 6;  
-  public static final int EXTENSIBILITY_ELEMENTS_GROUP = 7;
-         
-  protected Definition definition;
-  protected int type;       
-  protected List listenerList = new ArrayList();
-  protected ModelAdapterFactory modelAdapterFactory;
-
-  public WSDLGroupObject(Definition definition, int type)
-  {
-    this(definition, type, null);
-  }  
-
-  public WSDLGroupObject(Definition definition, int type, ModelAdapterFactory modelAdapterFactory)
-  {
-    this.definition = definition;
-    this.type = type;        
-    this.modelAdapterFactory = modelAdapterFactory;
-  }
-     
-  public Definition getParent()
-  {
-    return definition;
-  }               
-
-  public Definition getDefinition()
-  {
-    return definition;
-  }               
-
-
-  public int getType()
-  {
-    return type;
-  }
-
-  public String getLabel()
-  {            
-    String name = "";
-    switch (type)
-    {
-      case IMPORTS_GROUP :
-      {           
-        name = WSDLEditorPlugin.getWSDLString("_UI_FOLDER_IMPORTS");  //$NON-NLS-1$
-        break;
-      }
-      case MESSAGES_GROUP :
-      {    
-        name = WSDLEditorPlugin.getWSDLString("_UI_FOLDER_MESSAGES"); //$NON-NLS-1$
-        break;
-      }
-      case SERVICES_GROUP :
-      {
-        name = WSDLEditorPlugin.getWSDLString("_UI_FOLDER_SERVICES"); //$NON-NLS-1$
-        break;
-      }
-      case BINDINGS_GROUP :
-      {                   
-        name = WSDLEditorPlugin.getWSDLString("_UI_FOLDER_BINDINGS"); //$NON-NLS-1$
-        break;
-      }    
-      case PORT_TYPES_GROUP :
-      {                   
-        name = WSDLEditorPlugin.getWSDLString("_UI_FOLDER_PORTTYPES"); //$NON-NLS-1$
-        break;
-      }  
-      case TYPES_GROUP :
-      {                   
-        name = WSDLEditorPlugin.getWSDLString("_UI_FOLDER_TYPES"); //$NON-NLS-1$
-        break;
-      } 
-      case EXTENSIBILITY_ELEMENTS_GROUP:
-      {
-        name = WSDLEditorPlugin.getWSDLString("_UI_FOLDER_EXTENSIBILITY_ELEMENTS"); //$NON-NLS-1$
-        break;
-      }
-    }  
-    return name;
-  }    
-         
-
-  public Image getImage()
-  {                
-    Image image = null;
-    switch (type)
-    {
-      case IMPORTS_GROUP :
-      {    
-        image = WSDLEditorPlugin.getInstance().getImage("icons/importheader_obj.gif"); //$NON-NLS-1$
-        break;
-      }
-      case MESSAGES_GROUP :
-      {    
-        image = WSDLEditorPlugin.getInstance().getImage("icons/messageheader_obj.gif"); //$NON-NLS-1$
-        break;
-      }
-      case SERVICES_GROUP :
-      {
-        image = WSDLEditorPlugin.getInstance().getImage("icons/serviceheader_obj.gif"); //$NON-NLS-1$
-        break;
-      }
-      case PORT_TYPES_GROUP :
-      {                   
-        image = WSDLEditorPlugin.getInstance().getImage("icons/porttypeheader_obj.gif"); //$NON-NLS-1$
-        break;
-      }
-      case BINDINGS_GROUP :
-      {                   
-        image = WSDLEditorPlugin.getInstance().getImage("icons/bindingheader_obj.gif"); //$NON-NLS-1$
-        break;
-      }    
-      case TYPES_GROUP :
-      {                   
-        image = WSDLEditorPlugin.getInstance().getImage("icons/types_obj.gif"); //$NON-NLS-1$
-        break;
-      } 
-      case EXTENSIBILITY_ELEMENTS_GROUP:
-      {
-        image = WSDLEditorPlugin.getInstance().getImage("icons/fldr_el.gif"); //$NON-NLS-1$
-        break;
-      }
-    }  
-    return image;
-  }   
-
-
-  // implement ModelAdapter                                                             
-  public void addListener(ModelAdapterListener listener)
-  {
-    if (!listenerList.contains(listener))
-    {
-      listenerList.add(listener);
-    }
-  }   
-
-  public void removeListener(ModelAdapterListener listener)
-  {
-    listenerList.remove(listener);
-  } 
-
-
-  public Object getProperty(Object modelObject, String propertyName)
-  {       
-    Object result = null;
-    if (propertyName.equals(CHILDREN_PROPERTY))
-    {
-      result = getChildren();      
-    }                    
-    else if (propertyName.equals(LABEL_PROPERTY))
-    {
-      result = getLabel();      
-    }    
-    else if (propertyName.equals(IMAGE_PROPERTY))
-    {
-      result = getImage();      
-    }       
-    return result;
-  }
-
-
-  public  void firePropertyChanged(Object notifier, String property)
-  {                       
-    List list = new ArrayList();
-    list.addAll(listenerList);
-    for (Iterator i = list .iterator(); i.hasNext(); )
-    {
-      ModelAdapterListener listener = (ModelAdapterListener)i.next();
-      listener.propertyChanged(notifier, property);
-    }
-  } 
-   
-
-  public List getChildren()
-  {
-    List list = Collections.EMPTY_LIST;
-              
-    ComponentReferenceUtil util = new ComponentReferenceUtil(definition);
-    switch (getType())
-    {
-      case WSDLGroupObject.IMPORTS_GROUP : 
-      {   
-        list = definition.getEImports();
-        break;
-      }
-      case WSDLGroupObject.MESSAGES_GROUP : 
-      {
-        try
-        {
-          list = sortMessages(util.getMessages());
-        }
-        catch(Exception e)
-        {
-          list = util.getMessages();
-        }  
-        break;
-      }
-      case WSDLGroupObject.SERVICES_GROUP : 
-      {
-        list = util.getServices();
-        break;
-      }
-      case WSDLGroupObject.PORT_TYPES_GROUP : 
-      {       
-        list = util.getPortTypes();
-        break;
-      }
-      case WSDLGroupObject.BINDINGS_GROUP : 
-      {
-        list = util.getBindings();
-        break;
-      }
-      case WSDLGroupObject.TYPES_GROUP : 
-      {                     
-        Object types = definition.getETypes();
-        if (types != null)                                                   
-        {
-          list = (List)modelAdapterFactory.getAdapter(types).getProperty(types, ModelAdapter.CHILDREN_PROPERTY);
-        }
-        break;
-      }     
-      case WSDLGroupObject.EXTENSIBILITY_ELEMENTS_GROUP:
-      {
-        list = WSDLEditorUtil.getInstance().getExtensibilityElementNodes(definition);
-        break;
-      }
-    }   
-    return list;
-  }
-  
-  private List initialSort(List inputList) {
-  	List messageGroups = new ArrayList();
-  	Iterator iterator = inputList.iterator();
-  	
-  	while (iterator.hasNext()) {
-  		Message newMessage = (Message) iterator.next();
-  		
-  		boolean messageAdded = false;
-  		for (int index = 0; index < messageGroups.size(); index++) {
-  			MessageGroup messageItem = (MessageGroup) messageGroups.get(index);
-  			
-  			if(messageItem.addMessage(newMessage)) {
-  				messageAdded = true;
-  				break;
-  			}
-  		}
-  		
-  		// Do we need to create a new MessageGroup object?
-  		if (!messageAdded) {
-  			MessageGroup msGroup = new MessageGroup(newMessage.getQName().getLocalPart());
-			msGroup.addMessage(newMessage);
-  			messageGroups.add(msGroup);
-  		}
-  	}
-
-  	return messageGroups;
-  }
-  
-  private List buildMessageList(List list) {
-  	List sortedMessageList = new ArrayList();
-  	
-  	Iterator iterator = list.iterator();
-  	while (iterator.hasNext()) {
-  		MessageGroup mGroup = (MessageGroup) iterator.next();
-  		sortedMessageList.addAll(mGroup.getMessages());
-  	}
-  	
-  	return sortedMessageList;
-  }
-
-  private List sortMessages(List inputList) {
-  	List sortedList = new ArrayList();
-  	sortedList.addAll(inputList);
-  	
-  	// Get a sorted list of MessageGroups
-  	sortedList = initialSort(inputList);
-
-  	Collections.sort(sortedList, new Comparator() {
-  		public int compare(Object o1, Object o2) {
-  			String name1 = ((MessageGroup) o1).getBaseName();
-  			String name2 = ((MessageGroup) o2).getBaseName();
-  			
-  			return name1.compareToIgnoreCase(name2);
-      	}  	
-  	});
-  	
-  	sortedList = buildMessageList(sortedList);
-  	return sortedList;
-  }
-  
-  private class MessageGroup {
-  	private String baseName;
-  	private Vector messages;
-  	
-  	public MessageGroup(String name) {
-  		this.baseName = computeBaseName(name);
-  		messages = new Vector();
-  	}
-  	
-  	public boolean addMessage(Message newMessage) {
-  		// do check if it belongs here?......
-  		String newMessageBaseName = computeBaseName(newMessage.getQName().getLocalPart());
-  		
-  		if (newMessageBaseName.equalsIgnoreCase(getBaseName())) {
-  			addToSortedList(newMessage);
-  			
-  			return true;
-  		}
-  		
-  		return false;
-  	}
-  	
-  	public Vector getMessages() {
-  		return messages;
-  	}
-  	
-  	public String getBaseName() {
-  		return baseName;
-  	}
-  	
-  	private int getFirstInstance(String subString) {
-  		for (int index = 0; index < messages.size(); index++) {
-  			Message message = (Message) messages.get(index);
-  			String messageName = message.getQName().getLocalPart();
-  			
-  			if (messageName.indexOf(subString, 1) > 0) {
-  				return index;
-  			}
-  		}
-  		  		
-  		return -1;
-  	}
-  	
-  	private void addToSortedList(Message message) {
-  		// We need to add the new Message in the right position
-  		int index = -1;
-  		String name = message.getQName().getLocalPart();
-  		if (name.indexOf("Request", 1) > 0) {
-  			// Add after first instance of 'Response'
-  			index = getFirstInstance("Response");
-  		}
-  		else if (name.indexOf("Response", 1) > 0) {
-  			// Add after first instance of 'Request'
-  			index = getFirstInstance("Request");
-  			if (index >= 0)
-  				index++;
-  		}
-  		
-  		if (index >= 0) {
-  			messages.add(index, message);
-  		}
-  		else {
-  			messages.add(message);
-  		}
-  	}
-  	
-  	private String computeBaseName(String name) {
-  		int resReqIndex = name.indexOf("Request", 1);
-  		int resReqLength;
-  		if (resReqIndex == -1) {
-  			resReqIndex = name.indexOf("Response", 1);
-  			resReqLength = "Response".length();
-  		}
-  		else {
-  			resReqLength = "Request".length();
-  		}
-  				
-  		// Did we even find a Request/Response in both strings?
-  		if (resReqIndex != -1) {
-  			return name.substring(0, resReqIndex) + name.substring(resReqIndex + resReqLength, name.length());
-  		}
-  		else {  		
-  			return name;
-  		}
-  	}
-  }  
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/model/WSDLModelAdapterFactory.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/model/WSDLModelAdapterFactory.java
deleted file mode 100644
index 8325e9e4d..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/model/WSDLModelAdapterFactory.java
+++ /dev/null
@@ -1,1238 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.model;
-        
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.wsdl.OperationType;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.ExtensibleElement;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.Types;
-import org.eclipse.wst.wsdl.UnknownExtensibilityElement;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.internal.impl.OperationImpl;
-import org.eclipse.wst.wsdl.internal.util.WSDLSwitch;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.extension.ITreeChildProvider;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-public class WSDLModelAdapterFactory implements ModelAdapterFactory
-{                                      
-  protected static WSDLModelAdapterFactory wsdlModelAdapterFactoryInstance;
-
-  public AdapterFactory adapterFactory;
-                       
-  public WSDLModelAdapterFactory()
-  {
-    adapterFactory = createAdapterFactory();
-  }   
-                                                 
-  protected boolean isExtensibilityElementConsideredChild()
-  {
-    return true;
-  }
-
-  protected void addExtensiblityElementChildren(List list, ExtensibleElement extensibleElement)
-  {
-    if (isExtensibilityElementConsideredChild())
-    {
-      //list.addAll(WSDLEditorUtil.getInstance().getExtensibilityElementNodes(extensibleElement));
-      list.addAll(WSDLEditorUtil.getInstance().getExtensibilityElementNodes(extensibleElement));
-    }
-  }
-
-  public static WSDLModelAdapterFactory getWSDLModelAdapterFactory()
-  {                
-    if (wsdlModelAdapterFactoryInstance == null)
-    {
-      wsdlModelAdapterFactoryInstance = new WSDLModelAdapterFactory();
-    }
-    return wsdlModelAdapterFactoryInstance;
-  }  
-    
-
-  protected AdapterFactory createAdapterFactory()
-  {
-    return new WSDLAdapterFactoryImpl();
-  }            
-
-
-  public ModelAdapter getAdapter(Object o)
-  {                             
-    ModelAdapter adapter = null;
-    if (o instanceof WSDLElement)                     
-    {
-      adapter = (ModelAdapter)adapterFactory.adapt((WSDLElement)o, adapterFactory);
-    }
-    else if (o instanceof WSDLGroupObject)
-    {           
-      adapter = (WSDLGroupObject)o;
-    }
-    return adapter;
-  }                                    
-
-  //
-  //
-  //
-  public class WSDLAdapterFactoryImpl extends AdapterFactoryImpl
-  {                     
-    public Adapter createAdapter(Notifier target)
-    {                     
-      WSDLSwitch wsdlSwitch = new WSDLSwitch()
-      {                   
-      	public Object caseWSDLElement(WSDLElement wsdlElement)
-        {   
-          // note that the WSDLSwitch doesn't handle 
-          // caseExtensibilityElement when the object
-          // comes from another package... that why
-          // we have an instanceof check here
-		  if (wsdlElement instanceof ExtensibilityElement)
-		  {	
-			return createExtensibilityElementAdapter();  
-		  }
-		  else
-		  {	  
-            return createWSDLElementAdapter();
-		  }	
-	    }   
-
-      	public Object caseBinding(Binding binding)
-        {   
-          return createBindingAdapter();
-	      } 
-
-      	public Object caseBindingFault(BindingFault bindingFault)
-        {   
-          return createBindingFaultAdapter();
-	      } 
-
-      	public Object caseBindingInput(BindingInput bindingInput)
-        {   
-          return createBindingInputAdapter();
-	      } 
-
-      	public Object caseBindingOutput(BindingOutput bindingOutput)
-        {   
-          return createBindingOutputAdapter();
-	      } 
-                           
-      	public Object caseBindingOperation(BindingOperation bindingOperation)
-        {   
-          return createBindingOperationAdapter();
-	      } 
- 
-      	public Object caseDefinition(Definition definition)
-        {   
-          return createDefinitionAdapter();
-	      }           
-
-      	public Object caseFault(Fault fault)
-        {   
-          return createFaultAdapter();
-	      } 
-
-      	public Object caseImport(Import i)
-        {   
-          return createImportAdapter();
-	      } 
-
-      	public Object caseInput(Input input)
-        {   
-          return createInputAdapter();
-	      } 	
-
-      	public Object caseOutput(Output output)
-        {   
-          return createOutputAdapter();
-	      } 
-
-      	public Object caseMessage(Message message)
-        {   
-          return createMessageAdapter();
-	      }       
-
-      	public Object caseOperation(Operation operation)
-        {   
-          return createOperationAdapter();
-	      } 
-
-      	public Object casePart(Part part)
-        {   
-          return createPartAdapter();
-	      }  
-
-      	public Object casePort(Port port)
-        {   
-          return createPortAdapter();
-	      }  
-
-      	public Object casePortType(PortType portType)
-        {   
-          return createPortTypeAdapter();
-	      }  
-
-      	public Object caseService(Service service)
-        {   
-          return createServiceAdapter();
-	      }  
-
-      	public Object caseTypes(Types types)
-        {   
-          return createTypesAdapter();
-	    } 
-        
-		public Object defaultCase(EObject object)
-		{
-		  // note that the WSDLSwitch doesn't handle 
-          // caseExtensibilityElement when the object
-          // comes from another package... that why
-          // we have an instanceof check here
-		   if (object instanceof ExtensibilityElement)
-		   {	   
-	         return createExtensibilityElementAdapter();
-		   }
-		   else
-		   {
-			 return null;
-		   }	   
-        }
-      };   
-
-      Object o = wsdlSwitch.doSwitch((EObject)target);
-
-
-      Adapter result = null;
-      if (o instanceof Adapter)
-      {
-        result  = (Adapter)o;
-      }
-      else
-      {          
-        System.out.println("did not create adapter for target : " + target);
-        Thread.dumpStack();
-      }                   
-      return result;
-    }      
-                               
-  
-    public Adapter createWSDLElementAdapter()
-    {
-      return new WSDLElementAdapter();
-    }
-
-  	public Adapter createBindingAdapter()
-    {
-      return new BindingAdapter();
-    }   
-
- 	  public Adapter createBindingFaultAdapter()
-    {                                      
-      return new BindingFaultAdapter();
-    }           
-
- 	  public Adapter createBindingInputAdapter()
-    {                                      
-      return new BindingInputAdapter();
-    }
-
-    public Adapter createBindingOutputAdapter()
-    {
-      return new BindingOutputAdapter();
-	  } 
-                
-    public Adapter createBindingOperationAdapter()
-    {     
-      return new BindingOperationAdapter();
-    }
-          
-  	public Adapter createDefinitionAdapter() 
-    {
-		  return new DefinitionAdapter();
-	  }
-
-  	public Adapter createFaultAdapter() 
-    {
-		  return new FaultAdapter();
-	  }
-
-  	public Adapter createImportAdapter() 
-    {
-		  return new ImportAdapter();
-	  }
-
-  	public Adapter createInputAdapter() 
-    {
-		  return new InputAdapter();
-	  }
-
-  	public Adapter createMessageAdapter() 
-    {
-		  return new MessageAdapter();
-	  }
-
-
-  	public Adapter createOperationAdapter() 
-    {
-		  return new OperationAdapter();
-	  }
-
-  	public Adapter createOutputAdapter() 
-    {
-		  return new OutputAdapter();
-	  }
-
-  	public Adapter createPartAdapter() 
-    {
-		  return new PartAdapter();
-	  }
-
-  	public Adapter createPortAdapter() 
-    {
-		  return new PortAdapter();
-	  }
-
-  	public Adapter createPortTypeAdapter() 
-    {
-		  return new PortTypeAdapter();
-	  }
-
-  	public Adapter createServiceAdapter() 
-    {                    
-		  return new ServiceAdapter();
-	  } 
-
-  	public Adapter createTypesAdapter() 
-    {                    
-		  return new TypesAdapter();
-	  } 
-    
-    public Adapter createExtensibilityElementAdapter()
-    {
-      return new ExtensibilityElementAdapter();
-    }
-
-	
-    // convenience method
-    //
-    public Adapter adapt(Notifier target)
-    {
-      return adapt(target, this);
-    }
-  }
-    
-  //
-  //
-  //
-  protected class WSDLElementAdapter extends AdapterImpl implements ModelAdapter
-  {   
-    protected List listenerList = new ArrayList();
-
-
-    public WSDLElementAdapter()
-    {
-    }  
-                                 
-    public boolean isAdapterForType(Object type)
-    {
-      return type == adapterFactory;
-    }                                             
-
-    public void addListener(ModelAdapterListener listener)
-    {
-      if (!listenerList.contains(listener))
-      {
-        listenerList.add(listener);
-      }  
-    }  
-
-    public void removeListener(ModelAdapterListener listener)
-    {
-      if (listenerList.contains(listener))
-      {
-        listenerList.remove(listener);
-      }
-    } 
-
-    public void firePropertyChanged(Object notifier, String property)
-    {         
-      List list = new ArrayList();
-      list.addAll(listenerList);               
-      for (Iterator i = list.iterator(); i.hasNext(); )
-      {
-        ModelAdapterListener listener = (ModelAdapterListener)i.next();
-        listener.propertyChanged(getTarget(), property);
-      }
-    }   
-
-    public void notifyChanged(Notification msg)
-    {                        
-      if (msg.getEventType() != Notification.RESOLVE)
-      {        
-        firePropertyChanged(msg.getNotifier(), null);
-      }
-    }  
-
-       
-    public Object getProperty(Object modelObject, String propertyName)
-    {           
-      Object result = null;
-      if (propertyName.equals(CHILDREN_PROPERTY))
-      {
-        result = getChildren();      
-      }                    
-      else if (propertyName.equals(LABEL_PROPERTY))
-      {
-        result = getLabel();      
-      }                    
-      else if (propertyName.equals(IMAGE_PROPERTY))
-      {
-        result = getImage();
-      } 
-      else if (propertyName.equals("extensibilityElements"))
-      { 
-        if (modelObject instanceof ExtensibleElement)
-        {
-          result = WSDLEditorUtil.getInstance().getExtensibilityElementNodes((ExtensibleElement)modelObject);
-        }
-      } 
-      else if (propertyName.equals("isReadOnly"))
-      {
-      	Element element = WSDLEditorUtil.getInstance().getElementForObject(target); 
-     	  result = (element instanceof IDOMNode) ? Boolean.FALSE : Boolean.TRUE;    
-      }
-      return result;
-    } 
-
-    protected List getChildren()
-    {
-      return Collections.EMPTY_LIST;
-    }                        
-
-    protected String getLabel()
-    {  
-      return "todo";
-    }
-
-    protected Image getImage()
-    {
-      return null;
-    }                       
-  }                     
-  
-
-  protected class BindingAdapter extends WSDLElementAdapter
-  {                
-    protected Binding binding;
-                         
-    public void setTarget(Notifier newTarget) 
-    {
-      super.setTarget(newTarget);
-      this.binding = (Binding)newTarget;
-    }
-                                                      
-    protected List getChildren()
-    {                  
-      List list = new ArrayList();                 
-      addExtensiblityElementChildren(list, binding);
-      List operationsList = binding.getEBindingOperations();
-      List tempList = new ArrayList();
-      tempList.addAll(operationsList);
-      
-      Collections.sort(tempList, new Comparator() {
-    	public int compare(Object o1, Object o2) {
-    		String s1 = ((BindingOperation) o1).getName();
-    		String s2 = ((BindingOperation) o2).getName();
-    		
-    		if (s1 == null) {
-    			s1 = "";
-    		}
-    		if (s2 == null) {
-    			s2 = "";
-    		}
-
-      		return s1.compareToIgnoreCase(s2);
-      	}
-      });
-      
-      list.addAll(tempList);
-      
-      return list;
-    }     
-
-    protected String getLabel()
-    {  
-      return binding.getQName().getLocalPart();
-    }
-
-    protected Image getImage()
-    {
-      return WSDLEditorPlugin.getInstance().getImage("icons/binding_obj.gif");
-    }                             
-  }  
-    
-
-  protected class BindingFaultAdapter extends WSDLElementAdapter
-  {                
-    protected BindingFault bindingFault;
-                         
-    public void setTarget(Notifier newTarget) 
-    {
-      super.setTarget(newTarget);
-      this.bindingFault = (BindingFault)newTarget;
-    }
-                                                      
-    protected List getChildren()
-    {                  
-      List list = new ArrayList();    
-      addExtensiblityElementChildren(list, bindingFault);
-      return list;
-    }     
-
-    protected String getLabel()
-    {  
-      return bindingFault.getName();
-    }
-
-    protected Image getImage()
-    {
-      return WSDLEditorPlugin.getInstance().getImage("icons/fault_obj.gif");
-    }               
-  } 
-
-
-  protected class BindingInputAdapter extends WSDLElementAdapter
-  {                
-    protected BindingInput bindingInput;
-                         
-    public void setTarget(Notifier newTarget) 
-    {
-      super.setTarget(newTarget);
-      this.bindingInput = (BindingInput)newTarget;
-    }
-                                                      
-    protected List getChildren()
-    {                  
-      List list = new ArrayList();    
-      addExtensiblityElementChildren(list, bindingInput);
-      return list;
-    }     
-
-    protected String getLabel()
-    {  
-      return "input";
-    }
-
-    protected Image getImage()
-    {
-      return WSDLEditorPlugin.getInstance().getImage("icons/input_obj.gif");
-    }                             
-  }  
-
- 
-  protected class BindingOutputAdapter extends WSDLElementAdapter
-  {                
-    protected BindingOutput bindingOutput;
-                         
-    public void setTarget(Notifier newTarget) 
-    {
-      super.setTarget(newTarget);
-      this.bindingOutput = (BindingOutput)newTarget;
-    }
-                                                      
-    protected List getChildren()
-    {                  
-      List list = new ArrayList();    
-      addExtensiblityElementChildren(list, bindingOutput);
-      return list;
-    }     
-
-    protected String getLabel()
-    {  
-      return "output";
-    }
-
-    protected Image getImage()
-    {
-      return WSDLEditorPlugin.getInstance().getImage("icons/output_obj.gif");
-    }    
-  }  
-                              
-
-  protected class BindingOperationAdapter extends WSDLElementAdapter
-  {                
-    protected BindingOperation bindingOperation;
-                         
-    public void setTarget(Notifier newTarget) 
-    {
-      super.setTarget(newTarget);
-      this.bindingOperation = (BindingOperation)newTarget;
-    }
-                                                      
-    protected List getChildren()
-    {                  
-      List list = new ArrayList();         
-                  
-      addExtensiblityElementChildren(list, bindingOperation); 
-
-      if (bindingOperation.getBindingInput() != null)
-      {
-        list.add(bindingOperation.getBindingInput());
-      }
-      if (bindingOperation.getBindingOutput() != null)
-      {
-        list.add(bindingOperation.getBindingOutput());
-      }                             
-      list.addAll(bindingOperation.getEBindingFaults());
-      
-      return list;
-    }        
-                
-
-    protected String getLabel()
-    {  
-      return bindingOperation.getName();
-    }
-
-    protected Image getImage()
-    {
-      return WSDLEditorPlugin.getInstance().getImage("icons/operationbinding_obj.gif");
-    }               
-  }  
-
-  //
-  //
-  //
-  protected class DefinitionAdapter extends WSDLElementAdapter implements ModelAdapterListener
-  {                
-    protected List permanentWSDLGroupObjectList;
-    protected Definition definition;
-
-    protected WSDLGroupObject typesGroup;
-    protected WSDLGroupObject extensibilityElementsGroup;
-    protected Types types; 
-     
-    public void setTarget(Notifier newTarget) 
-    {
-      super.setTarget(newTarget);
-      this.definition = (Definition)newTarget;
-     
-      // this group is added and removed from the child list dynamically
-      // dependant on the presence of an 'actual' types element
-      //
-      typesGroup = new WSDLGroupObject(definition, WSDLGroupObject.TYPES_GROUP, getModelAdapterFactory());
-                                                          
-      // these groups always exist in the child list      
-      //
-      permanentWSDLGroupObjectList = new ArrayList();       
-      permanentWSDLGroupObjectList.add(new WSDLGroupObject(definition, WSDLGroupObject.IMPORTS_GROUP));
-      permanentWSDLGroupObjectList.add(typesGroup);  
-      permanentWSDLGroupObjectList.add(new WSDLGroupObject(definition, WSDLGroupObject.MESSAGES_GROUP));
-      permanentWSDLGroupObjectList.add(new WSDLGroupObject(definition, WSDLGroupObject.PORT_TYPES_GROUP));
-      permanentWSDLGroupObjectList.add(new WSDLGroupObject(definition, WSDLGroupObject.BINDINGS_GROUP));
-      permanentWSDLGroupObjectList.add(new WSDLGroupObject(definition, WSDLGroupObject.SERVICES_GROUP));
-      // we only add this group when it has content
-      //
-      extensibilityElementsGroup = new WSDLGroupObject(definition, WSDLGroupObject.EXTENSIBILITY_ELEMENTS_GROUP);
-
-      updateTypes();
-    }
-                                                      
-    protected List getChildren()
-    {       
-      List list = new ArrayList();
-      list.addAll(permanentWSDLGroupObjectList);   
-      //if (extensibilityElementsGroup.getChildren().size() > 0)
-      //{
-      list.add(extensibilityElementsGroup);
-      //}
-      return list;
-    }
-
-    public void notifyChanged(Notification msg)
-    {     
-      if (msg.getEventType() != Notification.RESOLVE)
-      {                           
-        updateTypes();
-        firePropertyChangedHelper();   
-      }
-    }        
-
-    protected void updateTypes()
-    {
-      if (types != definition.getETypes())
-      {
-        if (types != null)
-        {
-          removeModelAdapterListener(types, this);
-        }                                         
-        types = definition.getETypes();
-        if (types != null)
-        {
-          addModelAdapterListener(types, this);
-        }
-      }  
-    }
-
-    protected void firePropertyChangedHelper()
-    {                        
-      firePropertyChanged(getTarget(), null);
-
-      for (Iterator i = getChildren().iterator(); i.hasNext(); )
-      {                                                                              
-        ModelAdapter adapter = getAdapter(i.next());
-        adapter.firePropertyChanged(adapter, null);
-      }                                             
-    } 
-
-    // propagate changes to 'types' object
-    //
-    public void propertyChanged(Object object, String property)
-    {
-      typesGroup.firePropertyChanged(typesGroup, property);
-    } 
-
-    protected ModelAdapterFactory getModelAdapterFactory()
-    {
-      return getWSDLModelAdapterFactory();
-    }
-    
-    protected String getLabel()
-    {  
-      if (definition.getQName() != null) {
-    	  return definition.getQName().getLocalPart();
-      }
-      return "";
-    }
-
-    protected Image getImage()
-    {
-      return null;
-    }                       
-  }
-
- 
-
-  protected class FaultAdapter extends WSDLElementAdapter
-  {                
-    protected Fault fault;
-                                    
-    public void setTarget(Notifier newTarget) 
-    {
-      super.setTarget(newTarget);
-      this.fault = (Fault)newTarget;
-    }
-                                                      
-    protected Image getImage()
-    {
-      return WSDLEditorPlugin.getInstance().getImage("icons/fault_obj.gif");
-    }   
-
-    protected String getLabel()
-    {  
-      return fault.getName();
-    }               
-  }   
-      
-
-  //
-  //
-  //
-  protected class ImportAdapter extends WSDLElementAdapter
-  {                
-    protected Import theImport;
-                         
-    public void setTarget(Notifier newTarget) 
-    {
-      super.setTarget(newTarget);
-      this.theImport = (Import)newTarget;
-    }
-                                                       
-    protected Image getImage()
-    {
-      return WSDLEditorPlugin.getInstance().getImage("icons/import_obj.gif");
-    }   
-
-    protected String getLabel()
-    {  
-      String result = theImport.getLocationURI();
-      if (result == null || result.length() == 0)
-      {
-      	result = WSDLEditorPlugin.getWSDLString("_UI_NO_IMPORT_SPECIFIED");
-      }
-      return result;
-    }               
-  } 
-
-
-  //
-  //
-  //
-  protected class InputAdapter extends WSDLElementAdapter
-  {                
-    protected Input input;
-                         
-    public void setTarget(Notifier newTarget) 
-    {
-      super.setTarget(newTarget);
-      this.input = (Input)newTarget;
-    }
-                                                       
-    protected Image getImage()
-    {
-      return WSDLEditorPlugin.getInstance().getImage("icons/input_obj.gif");
-    }   
-
-    protected String getLabel()
-    {  
-      return "input";
-    }               
-  }    
-
-   
- 
-  //
-  //
-  //
-  protected class MessageAdapter extends WSDLElementAdapter
-  {                
-    protected Message message;
-                         
-    public void setTarget(Notifier newTarget) 
-    {
-      super.setTarget(newTarget);
-      this.message = (Message)newTarget;
-    }
-                                                      
-    protected List getChildren()
-    {
-      List list = new ArrayList();
-      list.addAll(message.getEParts());
-      return list;
-    }                        
-
-    protected String getLabel()
-    {  
-      if (message.getQName() == null) return ""; // revisit...it shouldn't be null 
-      return message.getQName().getLocalPart();
-    
-    }
-
-    protected Image getImage()
-    {
-      return WSDLEditorPlugin.getInstance().getImage("icons/message_obj.gif");
-    }
-  }
-
-
-  //
-  //
-  //
-  protected class OutputAdapter extends WSDLElementAdapter
-  {                
-    protected Output output;
-                         
-    public void setTarget(Notifier newTarget) 
-    {
-      super.setTarget(newTarget);
-      this.output = (Output)newTarget;
-    }                     
-        
-    protected String getLabel()
-    {  
-      return "output";
-    }
-
-    protected Image getImage()
-    {
-      return WSDLEditorPlugin.getInstance().getImage("icons/output_obj.gif");
-    }                                                        
-  }  
-
-  //
-  //
-  //
-  protected class OperationAdapter extends WSDLElementAdapter
-  {                
-    protected Operation operation;
-                         
-    public void setTarget(Notifier newTarget) 
-    {
-      super.setTarget(newTarget);
-      this.operation = (Operation)newTarget;
-    }
-                                                      
-    protected List getChildren()
-    {                  
-      List list = new ArrayList();
-      Input input = operation.getEInput();
-      Output output = operation.getEOutput();
-      
-      OperationType operationType = ((OperationImpl) operation).getStyle();
-      if (operationType != null) {
-      	if (operationType.equals(OperationType.REQUEST_RESPONSE) && input != null && output != null) {
-      		// Input, Output
-      		list.add(input);
-      		list.add(output);
-      	}
-      	else if (operationType.equals(OperationType.SOLICIT_RESPONSE) && input != null && output != null) {
-      		// Output, Input
-      		list.add(output);
-      		list.add(input);
-      	}
-      	else if (operationType.equals(OperationType.ONE_WAY) && input != null) {
-      		// Input
-      		list.add(input);
-      	}
-      	else if (operationType.equals(OperationType.NOTIFICATION) && output != null) {
-      		//Output
-      		list.add(output);
-      	}
-      }
-      list.addAll(operation.getFaults().values());
-      
-      return list;
-    }
-      
-//	private int getNodeIndex(NodeList nodeList, Node node) {
-//		int index = 0;
-//		while (index < nodeList.getLength() && !(nodeList.item(index).equals(node))) {
-//			index++;
-//		}
-//		
-//		if (index >= nodeList.getLength()) {
-//			index = -1;
-//		}
-//		
-//		return index;
-//	}
-
-    protected String getLabel()
-    {  
-      return operation.getName();
-    }
-
-    protected Image getImage()
-    {
-      return WSDLEditorPlugin.getInstance().getImage("icons/operation_obj.gif");
-    }               
-  }  
-   
-
-  //
-  //
-  //
-  protected class PartAdapter extends WSDLElementAdapter
-  {                
-    protected Part part;
-                         
-    public void setTarget(Notifier newTarget) 
-    {
-      super.setTarget(newTarget);
-      this.part = (Part)newTarget;
-    }                                                       
-
-    protected String getLabel()
-    {
-      return part.getName();
-    }
-
-    protected Image getImage()
-    {
-      return WSDLEditorPlugin.getInstance().getImage("icons/part_obj.gif");
-    }                             
-  }     
-
-  //
-  //
-  //
-  protected class PortAdapter extends WSDLElementAdapter implements ModelAdapterListener
-  {                
-    protected Port port;
-                         
-    public void setTarget(Notifier newTarget) 
-    {
-      super.setTarget(newTarget);
-      this.port = (Port)newTarget;
-    }
-                                                                             
-    protected String getLabel()
-    {  
-      return port.getName();
-    }
-
-    protected Image getImage()
-    {                                
-      return WSDLEditorPlugin.getInstance().getImage("icons/port_obj.gif");
-    }    
-
-    protected List getChildren()
-    {
-      return WSDLEditorUtil.getInstance().getExtensibilityElementNodes(port);  
-    }
-    // propagate changes to the binding object
-    //
-    public void propertyChanged(Object object, String property)
-    {
-      firePropertyChanged(port, property);
-    }
-  } 
-     
-  protected class ExtensibilityElementAdapter extends WSDLElementAdapter implements ModelAdapterListener
-  {                
-    protected ExtensibilityElement ee;
-                         
-    public void setTarget(Notifier newTarget) 
-    {
-      super.setTarget(newTarget);
-      this.ee = (ExtensibilityElement)newTarget;
-    }
-                                                                             
-    protected String getLabel()
-    {  
-      String result = null;
-      Node node = (Node) ee.getElement();
-
-      ILabelProvider labelProvider = getExtensibilityLabelProvider(node);
-      if (labelProvider != null)
-      {
-        result = labelProvider.getText(node);
-      }
-
-      if (result == null)
-      {
-        result = node.getNodeName();
-      }
-      return result;
-    }
-
-    protected Image getImage()
-    {                                
-      Image image = null;
-      Node node = (Node) ee.getElement();
-
-      ILabelProvider labelProvider = getExtensibilityLabelProvider(node);
-      if (labelProvider != null)
-      {
-        image = labelProvider.getImage(node);
-      }
-
-      if (image == null)
-      {
-        image = WSDLEditorPlugin.getInstance().getImage("icons/element_obj.gif");
-      }
-      return image;
-    }    
-
-    protected List getChildren()
-    {
-      List list = null;	  
-	  //TODO... we need to push getChildren down the ExtensiblityElement
-	  // for now let's just cast to UnkownExtensiblityElement
-	  if (ee instanceof UnknownExtensibilityElement)
-      {
-        list = ((UnknownExtensibilityElement)ee).getChildren();
-      }
-      return list; 
-    }
-
-    public void propertyChanged(Object object, String property)
-    {
-      firePropertyChanged(ee, property);
-    }
-    
-    protected ILabelProvider getExtensibilityLabelProvider(Node node)
-    {
-      ILabelProvider result = null;
-      String namespaceURI = node.getNamespaceURI();
-      if (namespaceURI != null)
-      {
-        result = WSDLEditorPlugin.getInstance().getExtensibilityItemTreeProviderRegistry().getLabelProvider(namespaceURI);
-      }
-      return result;
-    }
-    
-    protected ITreeChildProvider getExtensibilityContentProvider(Node node)
-    {
-      ITreeChildProvider result = null;
-      String namespaceURI = node.getNamespaceURI();
-      if (namespaceURI != null)
-      {
-        result = WSDLEditorPlugin.getInstance().getExtensibilityItemTreeProviderRegistry().getContentProvider(namespaceURI);
-      }
-      return result;
-    }
-
-    boolean isReadOnly()
-    {
-      return true;
-    }
-  } 
-
-
-  //
-  //
-  //
-  protected class PortTypeAdapter extends WSDLElementAdapter
-  {                
-    protected PortType portType;
-                         
-    public void setTarget(Notifier newTarget) 
-    {
-      super.setTarget(newTarget);
-      this.portType = (PortType)newTarget;
-    }
-                                                      
-    protected List getChildren()
-    {                  
-      List list = new ArrayList();
-      list.addAll(portType.getOperations());
-      
-      Collections.sort(list, new Comparator()
-      {
-        public int compare(Object o1, Object o2)
-        {
-          String o1Name = ((Operation) o1).getName();
-          String o2Name = ((Operation) o2).getName();
-          if (o1Name == null) o1Name = "";
-          if (o2Name == null) o2Name = "";
-          return (o1Name.compareToIgnoreCase(o2Name));
-        }
-      });
-      return list; 
-    }                    
-      
-    protected String getLabel()
-    {  
-      return portType.getQName().getLocalPart();
-    }
-
-    protected Image getImage()
-    {
-      return WSDLEditorPlugin.getInstance().getImage("icons/porttype_obj.gif");
-    }
-  } 
-     
-
-  protected class ServiceAdapter extends WSDLElementAdapter
-  {                
-    protected Service service;
-                         
-    public void setTarget(Notifier newTarget) 
-    {
-      super.setTarget(newTarget);
-      this.service = (Service)newTarget;
-    }
-                                                      
-    protected List getChildren()
-    {                  
-      List list = new ArrayList();
-      list.addAll(service.getEPorts());
-      return list; 
-    }                    
-      
-    protected String getLabel()
-    {  
-      return service.getQName().getLocalPart();
-    }
-
-    protected Image getImage()
-    {
-      return WSDLEditorPlugin.getInstance().getImage("icons/service_obj.gif");
-    }   
-  } 
-     
-  //
-  //
-  //
-  public class TypesAdapter extends WSDLElementAdapter
-  {
-    protected Types types; 
-                         
-    public void setTarget(Notifier newTarget) 
-    {
-      super.setTarget(newTarget);
-      this.types = (Types)newTarget;
-    }
-                                                      
-    protected List getChildren()
-    {                  
-      List list = new ArrayList();  
-      list.addAll(WSDLEditorUtil.getInstance().getExtensibilityElementNodes(types));
-      return list; 
-    }                    
-      
-    protected String getLabel()
-    {  
-      return "Types";
-    }
-
-    protected Image getImage()
-    {
-      return WSDLEditorPlugin.getInstance().getImage("icons/types_obj.gif");
-    }                                                                                      
-  }
-  
-  public static void addModelAdapterListener(Object modelObject, ModelAdapterListener listener)
-  {                                                               
-// TODO: port check
-    ModelAdapter adapter = getWSDLModelAdapterFactory().getAdapter(modelObject);
-//    ModelAdapter adapter = EcoreUtil.getAdapter(getWSDLModelAdapterFactory().eAdapters(),modelObject);
-    if (adapter != null)
-    {
-      adapter.addListener(listener);
-    }
-  }    
-
-  public static void removeModelAdapterListener(Object modelObject, ModelAdapterListener listener)
-  {                                                            
-// TODO: port check
-    ModelAdapter adapter = getWSDLModelAdapterFactory().getAdapter(modelObject);
-//    ModelAdapter adapter = EcoreUtil.getAdapter(getWSDLModelAdapterFactory().eAdapters(),modelObject);
-    if (adapter != null)
-    {
-      adapter.removeListener(listener);
-    }
-  }            
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/nsedit/EditNamespacesDialog.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/nsedit/EditNamespacesDialog.java
deleted file mode 100644
index 60536f7ea..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/nsedit/EditNamespacesDialog.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.nsedit;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.xml.ui.internal.nsedit.CommonEditNamespacesTargetFieldDialog;
-
-public class EditNamespacesDialog extends Dialog
-{
-  protected Button okButton;
-  protected String title;
-  protected String targetNamespace;
-  protected List namespaceInfoList;
-  protected CommonEditNamespacesTargetFieldDialog editWSDLNamespacesControl;
-  protected IPath resourceLocation;
-  //  protected Label errorMessageLabel;
-  //  protected String errorMessage;  
-
-  //protected Label errorMessageLabel;
-
-  public EditNamespacesDialog(Shell parentShell, IPath resourceLocation, String title, String targetNamespace, List namespaceList)
-  {
-    super(parentShell);
-    this.resourceLocation = resourceLocation;
-    setShellStyle(getShellStyle() | SWT.RESIZE);
-    this.title = title;
-    this.targetNamespace = targetNamespace;
-    this.namespaceInfoList = namespaceList;
-  }
-
-  public int createAndOpen()
-  {
-    create();
-    getShell().setText(title);
-    setBlockOnOpen(true);
-    return open();
-  }
-
-  protected Control createContents(Composite parent)
-  {
-    Control control = super.createContents(parent);
-    updateErrorMessage();
-    return control;
-  }
-
-  protected void createButtonsForButtonBar(Composite parent)
-  {
-    okButton = createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
-    createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
-  }
-
-  protected Control createDialogArea(Composite parent)
-  {
-    Composite dialogArea = (Composite) super.createDialogArea(parent);
-    editWSDLNamespacesControl = new CommonEditNamespacesTargetFieldDialog(dialogArea, resourceLocation);
-    editWSDLNamespacesControl.setNamespaceInfoList(namespaceInfoList);
-    editWSDLNamespacesControl.setTargetNamespace(targetNamespace);
-
-    return dialogArea;
-  }
-
-  public void modifyText(ModifyEvent e)
-  {
-    updateErrorMessage();
-  }
-
-  protected String computeErrorMessage(String name)
-  {
-    return null;
-  }
-
-  protected void updateErrorMessage()
-  {
-    String errorMessage = null;
-    /*
-    String name = nameField.getText().trim();
-    if (name.length() > 0)
-    {
-      errorMessage = computeErrorMessage(name);
-    }
-    else
-    {
-      errorMessage = "";
-    }*/
-
-    //errorMessageLabel.setText(errorMessage != null ? errorMessage : "");
-    okButton.setEnabled(errorMessage == null);
-  }
-
-  protected void buttonPressed(int buttonId)
-  {
-    if (buttonId == IDialogConstants.OK_ID)
-    {
-      targetNamespace = editWSDLNamespacesControl.getTargetNamespace();
-    }
-    super.buttonPressed(buttonId);
-  }
-
-  public List getNamespaceInfoList()
-  {
-    return namespaceInfoList;
-  }
-
-  public String getTargetNamespace()
-  {
-    return targetNamespace;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/ExtensibleOutlineProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/ExtensibleOutlineProvider.java
deleted file mode 100644
index ac204bf73..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/ExtensibleOutlineProvider.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.outline;
-
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtension;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtensionRegistry;
-import org.eclipse.wst.wsdl.ui.internal.text.WSDLModelAdapter;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-
-public class ExtensibleOutlineProvider implements ITreeContentProvider, ILabelProvider {
-	protected WSDLEditorExtension[] treeContentProviderExtensions;
-	protected ITreeContentProvider[] treeContentProviders;
-
-	protected WSDLEditorExtension[] labelProviderExtensions;
-	protected ILabelProvider[] labelProviders;
-
-	protected final static Object[] EMPTY_ARRAY = {};
-
-	public ExtensibleOutlineProvider(WSDLEditor wsdlEditor) {
-		WSDLEditorExtensionRegistry registry = WSDLEditorPlugin.getInstance().getWSDLEditorExtensionRegistry();
-
-		treeContentProviderExtensions = registry.getRegisteredExtensions(WSDLEditorExtension.OUTLINE_TREE_CONTENT_PROVIDER);
-		treeContentProviders = new ITreeContentProvider[treeContentProviderExtensions.length];
-		for (int i = 0; i < treeContentProviderExtensions.length; i++) {
-			treeContentProviders[i] = (ITreeContentProvider) treeContentProviderExtensions[i].createExtensionObject(WSDLEditorExtension.OUTLINE_TREE_CONTENT_PROVIDER, wsdlEditor);
-		}
-
-		labelProviderExtensions = registry.getRegisteredExtensions(WSDLEditorExtension.OUTLINE_LABEL_PROVIDER);
-		labelProviders = new ILabelProvider[labelProviderExtensions.length];
-		for (int i = 0; i < labelProviderExtensions.length; i++) {
-			labelProviders[i] = (ILabelProvider) labelProviderExtensions[i].createExtensionObject(WSDLEditorExtension.OUTLINE_LABEL_PROVIDER, wsdlEditor);
-		}
-	}
-
-
-	protected ITreeContentProvider getApplicableTreeContentProvider(Object object) {
-		ITreeContentProvider provider = null;
-		for (int i = 0; i < treeContentProviderExtensions.length; i++) {
-			if (treeContentProviderExtensions[i].isApplicable(object)) {
-				provider = treeContentProviders[i];
-				if (provider != null) {
-					break;
-				}
-			}
-		}
-		return provider;
-	}
-
-
-	protected ILabelProvider getApplicableLabelProvider(Object object) {
-		ILabelProvider provider = null;
-		for (int i = 0; i < labelProviderExtensions.length; i++) {
-			if (labelProviderExtensions[i].isApplicable(object)) {
-				provider = labelProviders[i];
-				if (provider != null) {
-					break;
-				}
-			}
-		}
-		return provider;
-	}
-
-	// implements ITreeContentProvider
-	//
-	public Object[] getChildren(Object parentElement) {
-		ITreeContentProvider provider = getApplicableTreeContentProvider(parentElement);
-		// System.out.println("getElements " + provider);
-		return provider != null ? provider.getChildren(parentElement) : EMPTY_ARRAY;
-	}
-
-	public Object getParent(Object element) {
-		ITreeContentProvider provider = getApplicableTreeContentProvider(element);
-		return provider != null ? provider.getParent(element) : null;
-	}
-
-	public boolean hasChildren(Object element) {
-		ITreeContentProvider provider = getApplicableTreeContentProvider(element);
-		return provider != null ? provider.hasChildren(element) : false;
-	}
-
-	public Object[] getElements(Object inputElement) {
-		// inputElement is initially a structured model, so turn it into a
-		// definition
-		Definition definition = getDefinition(inputElement);
-		ITreeContentProvider provider = getApplicableTreeContentProvider(definition);
-		// System.out.println("getElements " + provider);
-		return provider != null ? provider.getElements(definition) : EMPTY_ARRAY;
-	}
-
-	public void dispose() {
-		// TODO... call dispose dispose the created label and content
-		// providers
-		
-		for (int i = 0; i < treeContentProviders.length; i++) {
-			treeContentProviders[i].dispose();
-		}
-
-		for (int i = 0; i < labelProviderExtensions.length; i++) {
-			labelProviders[i].dispose();
-		}		
-	}
-
-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-		Definition definition = getDefinition(newInput);
-		for (int i = 0; i < treeContentProviders.length; i++) {
-			treeContentProviders[i].inputChanged(viewer, oldInput, definition);
-		}
-	}
-
-	// implements ILabelProvider
-	//
-	public Image getImage(Object element) {
-		ILabelProvider provider = getApplicableLabelProvider(element);
-		return provider != null ? provider.getImage(element) : null;
-	}
-
-	public String getText(Object element) {
-		String result = null;
-		if (element != null) {
-			ILabelProvider provider = getApplicableLabelProvider(element);
-			result = provider != null ? provider.getText(element) : (element.toString() + "noProviderForClass=" + element.getClass().getName());
-		}
-		return result != null ? result : "";
-	}
-
-	public void addListener(ILabelProviderListener listener) {
-	}
-
-	public void removeListener(ILabelProviderListener listener) {
-	}
-
-	public boolean isLabelProperty(Object element, String property) {
-		return false;
-	}
-
-	/**
-	 * Gets the definition from model
-	 * 
-	 * @param model
-	 *            (of type Object but really should be IStructuredModel)
-	 * @return Definition
-	 */
-	private Definition getDefinition(Object model) {
-		Definition definition = null;
-
-		if (model instanceof IDOMModel) {
-			IDOMDocument domDoc = ((IDOMModel) model).getDocument();
-			if (domDoc != null) {
-				WSDLModelAdapter modelAdapter = (WSDLModelAdapter) domDoc.getAdapterFor(WSDLModelAdapter.class);
-
-				/*
-				 * ISSUE: if adapter does not already exist for domDoc
-				 * getAdapterFor will create one. So why is this null
-				 * check/creation needed?
-				 */
-				if (modelAdapter == null) {
-					modelAdapter = new WSDLModelAdapter();
-					domDoc.addAdapter(modelAdapter);
-					modelAdapter.createDefinition(domDoc.getDocumentElement(), domDoc);
-				}
-
-				definition = modelAdapter.getDefinition();
-			}
-		}
-		return definition;
-	}
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/HTTPLabelProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/HTTPLabelProvider.java
deleted file mode 100644
index 5afe4fe09..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/HTTPLabelProvider.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.outline;
-
-import java.util.HashMap;
-
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.w3c.dom.Node;
-
-
-public class HTTPLabelProvider extends LabelProvider
-{                                                   
-  protected final static String ADDRESS         = "address";
-  protected final static String BINDING         = "binding";
-  protected final static String OPERATION       = "operation";
-  protected final static String URL_ENCODED     = "urlEncoded";
-  protected final static String URL_REPLACEMENT = "urlReplacement";
-
-  protected HashMap map = new HashMap();
-                         
-  public HTTPLabelProvider()
-  {                    
-    map.put(ADDRESS, "icons/httpaddress_obj.gif");
-    map.put(BINDING, "icons/httpbinding_obj.gif");
-    map.put(OPERATION, "icons/httpoperation_obj.gif");    
-    map.put(URL_ENCODED, "icons/httpurlencoded_obj.gif");
-    map.put(URL_REPLACEMENT, "icons/httpurlreplacement_obj.gif");
-  }
-
-  public Image getImage(Object object) 
-  {    
-    Node node = (Node)object;
-    String imageName = (String)map.get(node.getLocalName());       
-    return imageName != null ? WSDLEditorPlugin.getInstance().getImage(imageName) : null; 
-  }
-  
-  public String getText(Object object)  
-  {
-    Node node = (Node)object;
-    return node.getNodeName();
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/ModelAdapterContentProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/ModelAdapterContentProvider.java
deleted file mode 100644
index 7068aad06..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/ModelAdapterContentProvider.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.outline;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapter;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapterFactory;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapterListener;
-
-
-
-public class ModelAdapterContentProvider implements ITreeContentProvider, ModelAdapterListener
-{                                 
-  protected Viewer viewer;
-  protected ModelAdapterFactory adapterFactory;
-
-  public ModelAdapterContentProvider(ModelAdapterFactory adapterFactory)
-  {                                      
-    this.adapterFactory = adapterFactory;  
-  }
-        
-  protected void attachListener(Object object)
-  {
-    ModelAdapter adapter = adapterFactory.getAdapter(object);
-// TODO: port check
-//    ModelAdapter adapter = EcoreUtil.getAdapter(adapterFactory.eAdapters(),object);
-    if (adapter != null)
-    {
-      adapter.addListener(this);
-    }
-  } 
-
-  public void propertyChanged(Object object, String property)
-  {             
-    if (viewer != null)
-    {
-      if (viewer instanceof StructuredViewer)
-      {
-        ((StructuredViewer)viewer).refresh(object);
-      }
-      else
-      {     
-        viewer.refresh();
-      }
-    }
-  }
-
-  /*
-   * @see ITreeContentProvider#getChildren(Object)
-   */
-  public Object[] getChildren(Object parentObject)
-  {                                     
-    attachListener(parentObject);
-
-    List list = null;
-// TODO: port check    
-    ModelAdapter modelAdapter = adapterFactory.getAdapter(parentObject);
-//    ModelAdapter modelAdapter = EcoreUtil.getAdapter(adapterFactory.eAdapters(),parentObject);
-    if (modelAdapter != null)
-    {
-      list = (List)modelAdapter.getProperty(parentObject, ModelAdapter.CHILDREN_PROPERTY);     
-    }
-    list =  list != null ? list : Collections.EMPTY_LIST;
-    return list.toArray();
-  }
-
-  /*
-   * @see ITreeContentProvider#getParent(Object)
-   */
-  public Object getParent(Object element)
-  {
-    return null;
-  }
-
-  /*
-   * @see ITreeContentProvider#hasChildren(Object)
-   */
-  public boolean hasChildren(Object element)
-  {
-    Object[] children = getChildren(element);
-    return children != null && children.length > 0;   
-  }
-
-  /*
-   * @see IStructuredContentProvider#getElements(Object)
-   */
-  public Object[] getElements(Object inputElement)
-  {
-    return getChildren(inputElement);
-  }
-
-  /*
-   * @see IContentProvider#dispose()
-   */
-  public void dispose()
-  { 
-    viewer = null;
-  }
-  
-  /*
-   * @see IContentProvider#inputChanged(Viewer, Object, Object)
-   */
-  public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
-  {               
-    this.viewer = viewer;
-  }   
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/ModelAdapterLabelProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/ModelAdapterLabelProvider.java
deleted file mode 100644
index 720c74ca9..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/ModelAdapterLabelProvider.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.outline;
-        
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapter;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapterFactory;
-
-
-
-public class ModelAdapterLabelProvider extends LabelProvider
-{                     
-  protected ModelAdapterFactory adapterFactory;
-
-  public ModelAdapterLabelProvider(ModelAdapterFactory adapterFactory)
-  {                                      
-    this.adapterFactory = adapterFactory;
-  }
-
- 
-  public Image getImage(Object object)
-  {
-    Image result = null;           
-// TODO: port check
-    ModelAdapter modelAdapter = adapterFactory.getAdapter(object);
-//    ModelAdapter modelAdapter = EcoreUtil.getAdapter(adapterFactory.eAdapters(),object);
-    if (modelAdapter != null)
-    {
-      result = (Image)modelAdapter.getProperty(object, ModelAdapter.IMAGE_PROPERTY);     
-    }                                            
-    return result;
-  } 
-    
-
-  public String getText(Object object)
-  {                
-    String result = null;               
-// TODO: port check
-    ModelAdapter modelAdapter = adapterFactory.getAdapter(object);
-//    ModelAdapter modelAdapter = EcoreUtil.getAdapter(adapterFactory.eAdapters(),object);
-    if (modelAdapter != null)
-    {                       
-      result = (String)modelAdapter.getProperty(object, ModelAdapter.LABEL_PROPERTY);     
-    }                                            
-    return result;
-  }   
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/SOAPLabelProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/SOAPLabelProvider.java
deleted file mode 100644
index 93cefa40d..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/SOAPLabelProvider.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.outline;
-
-import java.util.HashMap;
-
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.w3c.dom.Node;
-
-
-public class SOAPLabelProvider extends LabelProvider
-{                                                     
-  protected final static String ADDRESS      = "address";
-  protected final static String BODY         = "body";
-  protected final static String BINDING      = "binding";
-  protected final static String FAULT        = "fault";                                 
-  protected final static String HEADER       = "header"; 
-  protected final static String HEADER_FAULT = "headerfault"; 
-  protected final static String OPERATION    = "operation";
-
-  protected HashMap map = new HashMap();
-                         
-  public SOAPLabelProvider()
-  {
-    map.put(ADDRESS, "icons/soapaddress_obj.gif");
-    map.put(BINDING, "icons/soapbinding_obj.gif");
-    map.put(BODY, "icons/soapbody_obj.gif");
-    map.put(FAULT, "icons/soapfault_obj.gif");
-    map.put(HEADER, "icons/soapheader_obj.gif");
-    map.put(HEADER_FAULT, "icons/soapheaderfault_obj.gif");
-    map.put(OPERATION, "icons/soapoperation_obj.gif");
-  }
-
-  public Image getImage(Object object) 
-  {    
-    Node node = (Node)object;
-    String imageName = (String)map.get(node.getLocalName());                        
-	  return imageName != null ? WSDLEditorPlugin.getInstance().getImage(imageName) : null; 
-  }
-  
-  public String getText(Object object)  
-  {
-    Node node = (Node)object;
-    return node.getNodeName();
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/WSDLContentOutlineConfiguration.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/WSDLContentOutlineConfiguration.java
deleted file mode 100644
index bb945f6bd..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/WSDLContentOutlineConfiguration.java
+++ /dev/null
@@ -1,211 +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 Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.outline;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.viewers.IContentProvider;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.sse.ui.views.contentoutline.ContentOutlineConfiguration;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.actions.WSDLMenuListener;
-import org.eclipse.wst.wsdl.ui.internal.text.WSDLModelAdapter;
-import org.eclipse.wst.wsdl.ui.internal.util.OpenOnSelectionHelper;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class WSDLContentOutlineConfiguration extends ContentOutlineConfiguration {
-	private ExtensibleOutlineProvider fOutlineProvider = null;
-	private KeyListener[] fKeyListeners = null;
-	private IMenuListener fMenuListener = null;
-	private WSDLEditor fEditor = null;
-
-	private ExtensibleOutlineProvider getOutlineProvider() {
-		if (fOutlineProvider == null) {
-			// ISSUE: what happens if cannot get WSDL Editor? (See
-			// getWSDLEditor comment)
-			fOutlineProvider = new ExtensibleOutlineProvider(getWSDLEditor());
-		}
-		return fOutlineProvider;
-	}
-
-	public IContentProvider getContentProvider(TreeViewer viewer) {
-		return getOutlineProvider();
-	}
-
-	public ILabelProvider getLabelProvider(TreeViewer viewer) {
-		return getOutlineProvider();
-	}
-
-	public KeyListener[] getKeyListeners(TreeViewer viewer) {
-		if (fKeyListeners == null) {
-			final TreeViewer finalViewer = viewer;
-			KeyAdapter keyListener = new KeyAdapter() {
-				public void keyReleased(KeyEvent e) {
-					if (e.keyCode == SWT.F3 && getWSDLEditor() != null) {
-						ISelection selection = getWSDLEditor().getSelectionManager().getSelection();
-						if (selection instanceof IStructuredSelection) {
-							Object object = ((IStructuredSelection) selection).getFirstElement();
-							if (object instanceof EObject) {
-								OpenOnSelectionHelper helper = new OpenOnSelectionHelper(getDefinition(finalViewer));
-								helper.openEditor((EObject) object);
-							}
-						}
-					}
-				}
-			};
-			fKeyListeners = new KeyListener[]{keyListener};
-		}
-
-		return fKeyListeners;
-	}
-
-	public IMenuListener getMenuListener(TreeViewer viewer) {
-		if (fMenuListener == null) {
-			// ISSUE: what happens if cannot get WSDL Editor? (See
-			// getWSDLEditor comment)
-			if (getWSDLEditor() != null)
-				fMenuListener = new WSDLMenuListener(getWSDLEditor(), getWSDLEditor().getSelectionManager());
-		}
-		return fMenuListener;
-	}
-
-	public ISelection getSelection(TreeViewer viewer, ISelection selection) {
-		ISelection sel = selection;
-
-		if (selection instanceof IStructuredSelection) {
-			List wsdlSelections = new ArrayList();
-			for (Iterator i = ((IStructuredSelection) selection).iterator(); i.hasNext();) {
-				Object domNode = i.next();
-				Object wsdlNode = getWSDLNode(domNode, viewer);
-				if (wsdlNode != null) {
-					wsdlSelections.add(wsdlNode);
-				}
-			}
-
-			if (!wsdlSelections.isEmpty()) {
-				sel = new StructuredSelection(wsdlSelections);
-			}
-		}
-		return sel;
-	}
-
-	/**
-	 * Gets the definition from treeviewer's input
-	 * 
-	 * @param model
-	 *            (of type Object but really should be IStructuredModel)
-	 * @return Definition
-	 */
-	private Definition getDefinition(TreeViewer viewer) {
-		Definition definition = null;
-		Object model = null;
-		if (viewer != null)
-			model = viewer.getInput();
-
-		if (model instanceof IDOMModel) {
-			IDOMDocument domDoc = ((IDOMModel) model).getDocument();
-			if (domDoc != null) {
-				WSDLModelAdapter modelAdapter = (WSDLModelAdapter) domDoc.getAdapterFor(WSDLModelAdapter.class);
-
-				/*
-				 * ISSUE: if adapter does not already exist for domDoc
-				 * getAdapterFor will create one. So why is this null
-				 * check/creation needed?
-				 */
-				if (modelAdapter == null) {
-					modelAdapter = new WSDLModelAdapter();
-					domDoc.addAdapter(modelAdapter);
-					modelAdapter.createDefinition(domDoc.getDocumentElement(), domDoc);
-				}
-
-				definition = modelAdapter.getDefinition();
-			}
-		}
-		return definition;
-	}
-
-	// ISSUE: There are some cases where outline comes up before editor
-	private WSDLEditor getWSDLEditor() {
-		if (fEditor == null) {
-			IWorkbench workbench = PlatformUI.getWorkbench();
-			if (workbench != null) {
-				IWorkbenchWindow window = workbench.getActiveWorkbenchWindow();
-				if (window != null) {
-					IWorkbenchPage page = window.getActivePage();
-					if (page != null) {
-						IEditorPart editor = page.getActiveEditor();
-						if (editor instanceof WSDLEditor)
-							fEditor = (WSDLEditor) editor;
-					}
-				}
-			}
-		}
-		return fEditor;
-	}
-
-	public void unconfigure(TreeViewer viewer) {
-		super.unconfigure(viewer);
-		fEditor = null;
-	}
-
-	/**
-	 * Determines WSDL node based on object (DOM node)
-	 * 
-	 * @param object
-	 * @return
-	 */
-	private Object getWSDLNode(Object object, TreeViewer viewer) {
-		// get the element node
-		Element element = null;
-		if (object instanceof Node) {
-			Node node = (Node) object;
-			if (node != null) {
-				if (node.getNodeType() == Node.ELEMENT_NODE) {
-					element = (Element) node;
-				}
-				else if (node.getNodeType() == Node.ATTRIBUTE_NODE) {
-					element = ((Attr) node).getOwnerElement();
-				}
-			}
-		}
-		Object o = element;
-		if (element != null) {
-			Object modelObject = WSDLEditorUtil.getInstance().findModelObjectForElement(getDefinition(viewer), element);
-			if (modelObject != null) {
-				o = modelObject;
-			}
-		}
-		return o;
-	}
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/WSDLContentOutlinePage.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/WSDLContentOutlinePage.java
deleted file mode 100644
index ffa80ee2e..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/WSDLContentOutlinePage.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.outline;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLSelectionManager;
-import org.eclipse.wst.wsdl.ui.internal.actions.WSDLMenuListener;
-import org.eclipse.wst.wsdl.ui.internal.util.OpenOnSelectionHelper;
-
-/**
- * @deprecated Using SSE's ConfiguratbleContentOutlinePage 
- * instead via WSDLContentOutlineCOnfiguration
- */
-public class WSDLContentOutlinePage extends ContentOutlinePage 
-{                                                    
-  protected WSDLEditor wsdlEditor;
-	protected int level = 0;  
-  protected Object model;                          
-  protected ITreeContentProvider contentProvider;
-  protected ILabelProvider labelProvider;
-  protected WSDLSelectionManager selectionManager;
-  protected SelectionManagerSelectionChangeListener selectionManagerSelectionChangeListener = new SelectionManagerSelectionChangeListener();
-  protected TreeSelectionChangeListener treeSelectionChangeListener = new TreeSelectionChangeListener();
-        
-  public WSDLContentOutlinePage(WSDLEditor wsdlEditor)
-  {                                          
-    this.wsdlEditor = wsdlEditor;
-  }
-
-
-  public void setContentProvider(ITreeContentProvider contentProvider)
-  {
-    this.contentProvider = contentProvider;
-  }
-
-
-  public void setLabelProvider(ILabelProvider labelProvider)
-  {
-    this.labelProvider = labelProvider;
-  }
-
-                          
-  // expose
-  public TreeViewer getTreeViewer()
-  {
-    return super.getTreeViewer();
-  }
-
-	public void createControl(Composite parent) 
-  {                                                 
-		super.createControl(parent);                 
-
-		getTreeViewer().setContentProvider(contentProvider);
-		getTreeViewer().setLabelProvider(labelProvider);
-    getTreeViewer().setInput(model);
-    getTreeViewer().addSelectionChangedListener(this);
-    
-    KeyAdapter keyListener = new KeyAdapter()
-    {
-      public void keyReleased(KeyEvent e)
-      {   	
-        if (e.keyCode == SWT.F3)
-        {
-          ISelection selection = selectionManager.getSelection();
-          if (selection instanceof IStructuredSelection)
-          {
-            Object object = ((IStructuredSelection)selection).getFirstElement();
-            if (object instanceof EObject)
-            {
-			  OpenOnSelectionHelper helper = new OpenOnSelectionHelper(wsdlEditor.getDefinition());
-              helper.openEditor((EObject)object);
-            }
-          }
-        }
-      }
-    };
-    getTreeViewer().getTree().addKeyListener(keyListener);
-
-    MenuManager menuManager = new MenuManager("#popup");//$NON-NLS-1$
-    menuManager.setRemoveAllWhenShown(true);
-    Menu menu = menuManager.createContextMenu(getTreeViewer().getControl());
-    getTreeViewer().getControl().setMenu(menu);
-    
-    WSDLMenuListener menuListener = new WSDLMenuListener(wsdlEditor, wsdlEditor.getSelectionManager());//, (XSDTextEditor)fTextEditor);
-    menuManager.addMenuListener(menuListener);
-
-    setSelectionManager(wsdlEditor.getSelectionManager());    
-    
-    // enable popupMenus extension - Rich - this class is deprecated.  TODO - change this
-    getSite().registerContextMenu("org.eclipse.wst.wsdl.ui.popup.outline", menuManager, wsdlEditor.getSelectionManager());
-	}
-
-
-  public void setModel(Object object)
-  {
-    model = object;
-  }
-
-	
-	public void setExpandToLevel(int i) 
-  {
-		level = i;
-	}
-
-	
-	public void setInput(Object value) 
-  {
-		getTreeViewer().setInput(value);
-	 	getTreeViewer().expandToLevel(level);
-	}  
-
-
-  public void setSelectionManager(WSDLSelectionManager newSelectionManager)
-  { 
-    TreeViewer treeViewer = getTreeViewer();
-
-    // disconnect from old one
-    if (selectionManager != null)
-    {                                                        
-      selectionManager.removeSelectionChangedListener(selectionManagerSelectionChangeListener);  
-      treeViewer.removeSelectionChangedListener(treeSelectionChangeListener);
-    }
-
-    selectionManager = newSelectionManager;
-
-    // connect to new one
-    if (selectionManager != null)
-    {
-      selectionManager.addSelectionChangedListener(selectionManagerSelectionChangeListener);  
-      treeViewer.addSelectionChangedListener(treeSelectionChangeListener);
-    }
-  }    
-
-  class SelectionManagerSelectionChangeListener implements ISelectionChangedListener
-  {
-    public void selectionChanged(SelectionChangedEvent event)  
-    {         
-      if (event.getSelectionProvider() != getTreeViewer())
-      {
-        getTreeViewer().setSelection(event.getSelection(), true);
-      }
-    }    
-  }
-
-  class TreeSelectionChangeListener implements ISelectionChangedListener
-  {
-    public void selectionChanged(SelectionChangedEvent event)  
-    { 
-      if (selectionManager != null)
-      {
-        ISelection selection = event.getSelection();
-        if (selection instanceof IStructuredSelection)
-        {
-          IStructuredSelection structuredSelection = (IStructuredSelection)selection;
-          Object o = structuredSelection.getFirstElement();
-        
-          // TODO ... 
-          // we need to implement a selectionManagerMapping extension point
-          // so that extensions can specify how they'd like to map view objects 
-          // to selection objects
-          //                                        
-//          if (o instanceof Element)
-//          {  
-//            try
-//            {
-//              Object modelObject = WSDLEditorUtil.getInstance().findModelObjectForElement(wsdlEditor.getDefinition(), (Element)o);
-//              if (modelObject != null && !(modelObject instanceof UnknownExtensibilityElement))
-//              {
-//                o = modelObject;
-//              }
-//            }
-//            catch (Exception e)
-//            {
-//            }
-//          }
-
-          if (o != null)
-          {
-            selectionManager.setSelection(new StructuredSelection(o), getTreeViewer());
-          }
-          else
-          {
-            selectionManager.setSelection(new StructuredSelection(), getTreeViewer());
-          }   
-        }
-      }
-    }    
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/parameters/AddBaseParameterCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/parameters/AddBaseParameterCommand.java
deleted file mode 100644
index bbe088389..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/parameters/AddBaseParameterCommand.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- */
-package org.eclipse.wst.wsdl.ui.internal.parameters;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.MessageReference;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddMessageCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddPartCommand;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDNamedComponent;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.XSDTypeDefinition;
-
-public abstract class AddBaseParameterCommand {
-	public static int PART_ELEMENT_SEQ_ELEMENT     = 0;
-	public static int PART_ELEMENT                 = 1;
-	public static int PART_COMPLEXTYPE_SEQ_ELEMENT = 2;
-	public static int PART_COMPLEXTYPE             = 3;
-
-	protected int style = 0;
-	protected Operation operation;
-	protected XSDElementDeclaration newXSDElement;
-	
-	protected String newAnonymousXSDElementName;
-	protected String newXSDElementName;
-	protected String newWSDLMessageName;
-	protected String newWSDLPartName;
-	
-	public abstract void run();
-	
-	public AddBaseParameterCommand(Operation operation, int style) {
-		this.operation = operation;
-		this.style = style;
-	}
-	
-	public void setStyle(int style) {
-		this.style = style;
-	}
-	
-	public XSDElementDeclaration getXSDElementDeclaration() {
-		return newXSDElement;
-	}
-	
-	protected boolean isPartElementReference() {
-		if (style == PART_ELEMENT || style == PART_ELEMENT_SEQ_ELEMENT) {
-			return true;
-		}
-		
-		return false;
-	}
-	
-	protected XSDElementDeclaration createPartElementReferenceComponents(Part part) {
-		XSDElementDeclaration returnedXSDElement = null;
-		XSDElementDeclaration partElement = part.getElementDeclaration();
-		
-		if (style == PART_ELEMENT_SEQ_ELEMENT) {
-			XSDElementDeclaration originalElement = null;
-			XSDElementDeclaration anonXSDElement = null;
-			
-			// Create the XSDElement (anonymous) referenced by the Part if necessary
-			if (partElement == null || partElement.getAnonymousTypeDefinition() == null) {
-				anonXSDElement = XSDComponentHelper.createAnonymousXSDElementDefinition(getAnonymousXSDElementBaseName(), part);
-//				part.setElementDeclaration(anonXSDElement);
-				String prefixedName = getPrefixedComponentName(part.getEnclosingDefinition(), anonXSDElement);
-				ComponentReferenceUtil.setComponentReference(part, false, prefixedName);
-				part.setTypeDefinition(null);
-				
-				if (partElement != null) {
-					originalElement = partElement;
-					// Remove the 'original' XSDElement as a Global Element
-					partElement.getSchema().getContents().remove(partElement);
-				}
-			}
-			else {
-				anonXSDElement = partElement;
-			}
-			
-			// Create a new XSDElement
-			XSDModelGroup modelGroup = XSDComponentHelper.getXSDModelGroup(anonXSDElement, part.getEnclosingDefinition());
-			returnedXSDElement = XSDComponentHelper.createXSDElementDeclarationCommand(null, getNewXSDElementBaseName(), modelGroup);
-			
-			// Add the newly created XSDElement to the ModelGroup
-			XSDComponentHelper.addXSDElementToModelGroup(anonXSDElement, returnedXSDElement);
-			
-			// Add the 'original' XSDElement if it's type wasn't anonymous
-			if (originalElement != null) {
-				XSDComponentHelper.addXSDElementToModelGroup(anonXSDElement, originalElement);
-			}
-		}
-		else if (style == PART_ELEMENT) {
-			if (partElement == null) {
-				returnedXSDElement = XSDComponentHelper.createXSDElementDeclarationCommand(part.getEnclosingDefinition(), getNewXSDElementBaseName(), part);
-			}
-			else {
-				// TODO: What should we do here.....  We can default to the PART_ELEMENT_SEQ_ELEMENT style
-				// since it handles 'multiple' XSDElements.... OR ..... we can 'overwrite and set a new
-				// XSDElement
-			}
-			
-			if (returnedXSDElement != null && !returnedXSDElement.equals(part.getElementDeclaration())) {
-//				part.setElementDeclaration(returnedXSDElement);
-				String prefixedName = getPrefixedComponentName(part.getEnclosingDefinition(), returnedXSDElement);
-				ComponentReferenceUtil.setComponentReference(part, false, prefixedName);
-
-			}	
-		}
-		
-		return returnedXSDElement;
-	}
-	
-	protected XSDElementDeclaration createPartComplexTypeReference(Part part) {
-		XSDElementDeclaration returnedXSDElement = null;
-		
-		if (style == PART_COMPLEXTYPE_SEQ_ELEMENT) {
-			XSDTypeDefinition originalType = null;
-			XSDComplexTypeDefinition topLevelType = null;
-			
-			// Create the ComplexType referenced by the Part if necessary
-			if (part.getTypeDefinition() == null || part.getTypeDefinition() instanceof XSDSimpleTypeDefinition) {
-				XSDSchema schema = XSDComponentHelper.getXSDSchema(part.getEnclosingDefinition());
-				String topLevelName = WNameHelperUtil.getXSDComplexTypeName(part.getName(), schema);
-				topLevelType = XSDComponentHelper.createXSDComplexTypeDefiniion(topLevelName, part);
-				
-				if (part.getTypeDefinition() instanceof XSDSimpleTypeDefinition) {
-					originalType = part.getTypeDefinition();
-				}
-			}
-			else if (part.getTypeDefinition() instanceof XSDComplexTypeDefinition){
-				topLevelType = (XSDComplexTypeDefinition) part.getTypeDefinition();
-			}			
-			
-			// Create a new XSDElement
-			XSDModelGroup modelGroup = XSDComponentHelper.getXSDModelGroup(topLevelType);
-			returnedXSDElement = XSDComponentHelper.createXSDElementDeclarationCommand(null, getNewXSDElementBaseName(), modelGroup);
-			
-			// Add the 'original' XSDElement if it's type wasn't anonymous
-			if (originalType != null) {
-				// Create another new XSDElement to 'contain' the originally referenced XSDSimpleType
-				XSDElementDeclaration origXSDElement = XSDComponentHelper.createXSDElementDeclarationCommand(null, getNewXSDElementBaseName(), modelGroup);
-				origXSDElement.setTypeDefinition(originalType);
-			}
-			
-			// Change Part reference
-//			part.setTypeDefinition(topLevelType);
-			String prefixedName = getPrefixedComponentName(part.getEnclosingDefinition(), topLevelType);
-			ComponentReferenceUtil.setComponentReference(part, true, prefixedName);
-
-			
-		}
-		else if (style == PART_COMPLEXTYPE) {
-			XSDComplexTypeDefinition complexType = null;
-			if (part.getTypeDefinition() == null) {
-				// Create a new ComplexType
-				XSDSchema schema = XSDComponentHelper.getXSDSchema(part.getEnclosingDefinition());
-				String complexName = WNameHelperUtil.getXSDComplexTypeName(part.getName(), schema);
-				complexType = XSDComponentHelper.createXSDComplexTypeDefiniion(complexName, part);
-				
-				// Create an XSDElement for the ComplexType
-				XSDModelGroup xsdModelGroup = XSDComponentHelper.getXSDModelGroup(complexType);
-				returnedXSDElement = XSDComponentHelper.createXSDElementDeclarationCommand(null, getNewXSDElementBaseName(), xsdModelGroup);
-			}
-			else {
-				// TODO: What should we do here.....  We can default to the PART_ELEMENT_SEQ_ELEMENT style
-				// since it handles 'multiple' XSDElements.... OR ..... we can 'overwrite and set a new
-				// XSDElement
-			}
-			
-			if (complexType != null && !complexType.equals(part.getTypeDefinition())) {
-//				part.setTypeDefinition(complexType);
-				String prefixedName = getPrefixedComponentName(part.getEnclosingDefinition(), complexType);
-				ComponentReferenceUtil.setComponentReference(part, true, prefixedName);
-			}	
-		}
-		
-		return returnedXSDElement;
-	}	
-	/*
-	 * Create if necessary a Message and Part for the given MessageReference
-	 * and return it's Part
-	 */
-	protected Part createWSDLComponents(MessageReference messageRef) {
-		Message message = messageRef.getEMessage();
-		Part part = null;
-		
-		if (message == null) {
-			// Create Message
-			AddMessageCommand command = new AddMessageCommand(messageRef.getEnclosingDefinition(), getWSDLMessageName());
-			command.run();
-			message = (Message) command.getWSDLElement();
-			messageRef.setEMessage(message);
-		}
-		
-		if (message.getEParts().size() == 0) {
-			// Create Part
-			AddPartCommand command = new AddPartCommand(message, getWSDLPartName());
-			command.run();
-			part = (Part) command.getWSDLElement();
-		}
-		else {
-			part = (Part) message.getEParts().get(0);
-		}
-		
-		return part;
-	}
-	
-	protected XSDElementDeclaration createXSDObjects(Part part) {
-		XSDElementDeclaration returnedXSDElement = null;
-		if (isPartElementReference()) {
-			// Is a Part --> Element reference
-			returnedXSDElement = createPartElementReferenceComponents(part);
-		}
-		else {
-			// Is a Part --> Complex Type reference
-			returnedXSDElement = createPartComplexTypeReference(part);
-		}
-		
-		return returnedXSDElement;
-	}
-	
-    private String getPrefixedComponentName(Definition definition, XSDNamedComponent component) {
-    	String name = component.getName();
-    	String tns = component.getTargetNamespace();
-        List prefixes = getPrefixes(definition, tns);
-        if (prefixes.size() > 0) {
-            name = prefixes.get(0) + ":" + name;
-        }
-        
-        return name;
-    }
-    
-    private List getPrefixes(Definition definition, String namespace) {
-        List list = new ArrayList();
-        Map map = definition.getNamespaces();
-        for (Iterator i = map.keySet().iterator(); i.hasNext();) {
-            String prefix = (String) i.next();
-            String theNamespace = (String) map.get(prefix);
-            if (theNamespace != null && theNamespace.equals(namespace)) {
-                list.add(prefix);
-            }
-        }
-        return list;
-    }
-
-	protected abstract String getAnonymousXSDElementBaseName();
-	protected abstract String getNewXSDElementBaseName();
-	protected abstract String getWSDLMessageName();
-	protected abstract String getWSDLPartName();
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/parameters/AddFaultParameterCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/parameters/AddFaultParameterCommand.java
deleted file mode 100644
index d6e986e8b..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/parameters/AddFaultParameterCommand.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 Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- */
-package org.eclipse.wst.wsdl.ui.internal.parameters;
-
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddFaultCommand;
-
-public class AddFaultParameterCommand extends AddBaseParameterCommand {
-	protected Fault fault;
-	private String faultName;
-	
-	public AddFaultParameterCommand(Operation operation, Fault fault) {
-		super(operation, AddBaseParameterCommand.PART_ELEMENT);
-		this.fault = fault;
-	}
-	
-	/*
-	 * 
-	 */
-	public void run() {
-		if (fault == null) {
-			AddFaultCommand command = new AddFaultCommand(operation, getFaultName());
-			command.run();
-			fault = (Fault) command.getWSDLElement();
-		}
-		
-		Part part = createWSDLComponents(fault);
-		
-		// Create necessary XSD Objects starting with the Part reference
-		newXSDElement = createXSDObjects(part);
-	}
-
-	protected String getAnonymousXSDElementBaseName() {
-		if (newAnonymousXSDElementName == null) {
-			newAnonymousXSDElementName = operation.getName() + "_" + getFaultName(); 
-		}
-		
-		return newAnonymousXSDElementName;
-	}
-	
-	protected String getNewXSDElementBaseName() {
-		if (newXSDElementName == null) {
-			newXSDElementName = operation.getName() + "_" + getFaultName();
-		}
-		
-		return newXSDElementName;
-	}
-	
-	protected String getWSDLMessageName() {
-		if (newWSDLMessageName == null) {
-			newWSDLMessageName = operation.getName() + "_" + getFaultName() + "Msg";
-		}
-		
-		return newWSDLMessageName;
-	}
-
-	protected String getWSDLPartName() {
-		if (newWSDLPartName == null) {
-			newWSDLPartName = getFaultName();
-		}
-		
-		return newWSDLPartName;
-	}
-	
-	private String getFaultName() {
-		if (faultName == null) {
-			if (fault != null) {
-				faultName = fault.getName();
-			}
-			else {
-				faultName = WNameHelperUtil.getFaultName(operation);
-			}
-		}
-
-		return faultName;
-	}
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/parameters/AddInputParameterCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/parameters/AddInputParameterCommand.java
deleted file mode 100644
index 3073f1cf6..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/parameters/AddInputParameterCommand.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- */
-package org.eclipse.wst.wsdl.ui.internal.parameters;
-
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddInputCommand;
-
-public class AddInputParameterCommand extends AddBaseParameterCommand {	
-	public AddInputParameterCommand(Operation operation, int style) {
-		super(operation, style);
-	}
-	
-	/*
-	 * 
-	 */
-	public void run() {
-		Part part = null;
-		if (operation.getEInput() != null) {
-			part = createWSDLComponents(operation.getEInput());
-		}
-		else {
-			AddInputCommand command = new AddInputCommand(operation, null);
-			command.run();
-			Input input = (Input) command.getWSDLElement();
-			part = createWSDLComponents(input);
-		}
-		
-		// Create necessary XSD Objects starting with the Part reference
-		newXSDElement = createXSDObjects(part);
-	}
-	
-	protected String getAnonymousXSDElementBaseName() {
-		if (newAnonymousXSDElementName == null) {
-			newAnonymousXSDElementName = operation.getName() + "Request"; 
-		}
-		
-		return newAnonymousXSDElementName;
-	}
-	
-	protected String getNewXSDElementBaseName() {
-		if (newXSDElementName == null) {
-			newXSDElementName = "input";
-		}
-		
-		return newXSDElementName;
-	}
-	
-	protected String getWSDLMessageName() {
-		if (newWSDLMessageName == null) {
-			if (operation.getEInput() != null) {
-				newWSDLMessageName= WNameHelperUtil.getMessageName(operation.getEInput());
-			}
-		}
-		
-		return newWSDLMessageName;
-	}
-
-	protected String getWSDLPartName() {
-		if (newWSDLPartName == null) {
-			newWSDLPartName  = WNameHelperUtil.getPartName(operation.getEInput());			
-		}
-		
-		return newWSDLPartName;
-	}
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/parameters/AddOutputParameterCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/parameters/AddOutputParameterCommand.java
deleted file mode 100644
index 4771bd1dd..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/parameters/AddOutputParameterCommand.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- */
-package org.eclipse.wst.wsdl.ui.internal.parameters;
-
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddOutputCommand;
-
-public class AddOutputParameterCommand extends AddBaseParameterCommand {
-	public AddOutputParameterCommand(Operation operation, int style) {
-		super(operation, style);
-	}
-	
-	/*
-	 * 
-	 */
-	public void run() {
-		Part part = null;
-		if (operation.getEOutput() != null) {
-			part = createWSDLComponents(operation.getEOutput());
-		}
-		else {
-			AddOutputCommand command = new AddOutputCommand(operation, null);
-			command.run();
-			Output output = (Output) command.getWSDLElement();
-			part = createWSDLComponents(output);
-		}
-		
-		// Create necessary XSD Objects starting with the Part reference
-		newXSDElement = createXSDObjects(part);
-	}
-	
-	protected String getAnonymousXSDElementBaseName() {
-		if (newAnonymousXSDElementName == null) {
-			newAnonymousXSDElementName = operation.getName() + "Response"; 
-		}
-		
-		return newAnonymousXSDElementName;
-	}
-	
-	protected String getNewXSDElementBaseName() {
-		if (newXSDElementName == null) {
-			newXSDElementName = "output";
-		}
-		
-		return newXSDElementName;
-	}
-	
-	protected String getWSDLMessageName() {
-		if (newWSDLMessageName == null) {
-			if (operation.getEOutput() != null) {
-				newWSDLMessageName= WNameHelperUtil.getMessageName(operation.getEOutput());
-			}
-		}
-		
-		return newWSDLMessageName;
-	}
-
-	protected String getWSDLPartName() {
-		if (newWSDLPartName == null) {
-			newWSDLPartName  = WNameHelperUtil.getPartName(operation.getEOutput());			
-		}
-		
-		return newWSDLPartName;
-	}
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/parameters/WNameHelperUtil.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/parameters/WNameHelperUtil.java
deleted file mode 100644
index 593783f64..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/parameters/WNameHelperUtil.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 Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- */
-package org.eclipse.wst.wsdl.ui.internal.parameters;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.MessageReference;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDSchema;
-
-public class WNameHelperUtil {
-	public static String getMessageName(MessageReference messageRef) {	    
-		String messageName = "NewMessage";
-		List messageNames = new ArrayList();
-		Operation operation = (Operation) messageRef.getContainer();
-		Iterator messageIt = operation.getEnclosingDefinition().getEMessages().iterator();
-		while (messageIt.hasNext()) {
-			messageNames.add(((Message) messageIt.next()).getQName().getLocalPart());
-		}
-		
-		String requestResponseString = getRequestOrResponse(messageRef) + "Msg";
-		messageName = getUniqueName(operation.getName() + requestResponseString, messageNames);
-		
-		return messageName;
-	}
-	
-	public static String getPartName(MessageReference messageRef) {
-		String partName = "NewPart";
-		Message message = messageRef.getEMessage();
-		
-		Operation operation = (Operation) messageRef.getContainer();
-//		Operation operation = (Operation) ((WOperation) ownerMessage.getOwnerOperation()).getModel();
-		String operationName = operation.getName();
-		String appendString = "";    	  
-		if (messageRef instanceof Input) {
-			appendString = "Parameters";
-		}
-		else if (messageRef instanceof Output) {
-			appendString = "Result";
-		}
-		else if (messageRef instanceof Fault) {
-			appendString = "Fault";
-		}
-		partName = operationName + appendString;
-		
-		List usedPartNames = new ArrayList();
-		if (message != null) {
-			Iterator partIt = message.getEParts().iterator();
-			while (partIt.hasNext()) {
-				usedPartNames.add(((Part) partIt.next()).getName());
-			}
-		}
-		
-		partName = getUniqueName(partName, usedPartNames);
-		
-		return partName;
-	}
-	
-	public static String getOperationName(PortType portType) {
-		String operationName = "NewOperation";
-		Iterator operationIt = portType.getEOperations().iterator();
-		List usedNames = new ArrayList();
-		while (operationIt.hasNext()) {
-			usedNames.add(((Operation) operationIt.next()).getName());
-		}
-		
-		operationName = getUniqueName("NewOperation", usedNames);
-		
-		return operationName;
-	}
-	
-	public static String getRequestOrResponse(MessageReference messageRef) {
-		if (messageRef instanceof Input)
-		{
-			return "Request";
-		}
-		else if (messageRef instanceof Output)
-		{
-			return "Response";
-		}
-		else if (messageRef instanceof Fault)
-		{
-			return "_Fault";
-		}
-		
-		return "";
-	}
-	
-	public static String getFaultName(Operation operation) {
-		String faultName = "fault";
-		List nameList = new ArrayList();
-		Iterator faultIt = operation.getEFaults().iterator();
-		while (faultIt.hasNext()) {
-			nameList.add(((Fault) faultIt.next()).getName());
-		}
-		
-		faultName = getUniqueName(faultName, nameList);
-		
-		return faultName;
-	}
-	
-	public static String getXSDElementName(String baseName, Object parent) {
-		String elementName = "";
-		
-		if (parent instanceof XSDSchema) {
-			elementName = getUniqueName(baseName, getUsedElementNames((XSDSchema) parent));
-		}
-		else if (parent instanceof XSDModelGroup) {
-			List existingNames = new ArrayList();
-			XSDModelGroup modelGroup = (XSDModelGroup) parent;
-			Iterator modelGroupIt = modelGroup.getContents().iterator();
-			while (modelGroupIt.hasNext()) {
-				Object item = modelGroupIt.next();
-				if (item instanceof XSDParticle) {
-					XSDParticle existingParticle = (XSDParticle) item;
-					if (existingParticle.getContent() instanceof XSDElementDeclaration) {
-						existingNames.add(((XSDElementDeclaration) existingParticle.getContent()).getName());
-					}
-				}
-			}
-			
-			elementName = getUniqueName(baseName, existingNames);			
-		}
-		
-		return elementName;
-	}
-	
-	public static String getXSDComplexTypeName(String baseName, XSDSchema schema) {
-		String typeName = "";
-		List existingNames = new ArrayList();
-		
-		Iterator it = schema.getTypeDefinitions().iterator();
-		while (it.hasNext()) {
-			Object item = it.next();
-			if (item instanceof XSDComplexTypeDefinition) {
-				existingNames.add(((XSDComplexTypeDefinition) item).getName());
-			}
-		}
-		
-		typeName = getUniqueName(baseName, existingNames);
-		return typeName;
-	}
-	
-	private static List getUsedElementNames(XSDSchema xsdSchema) {
-		List usedNames = new ArrayList();
-		Iterator schemaIt = xsdSchema.getContents().iterator();
-		while (schemaIt.hasNext()) {
-			Object item = schemaIt.next();
-			if (item instanceof XSDElementDeclaration) {
-				usedNames.add(((XSDElementDeclaration) item).getName());
-			}
-		}
-		
-		return usedNames;
-	}
-	
-	private static String getUniqueName(String baseName, List existingNames) {
-		int count = 1;
-		
-		if (!existingNames.contains(baseName)) {
-			return baseName;
-		}
-		
-		Iterator namesIt = existingNames.iterator();
-		boolean foundMatch = true;
-		while (foundMatch) {
-			foundMatch = false;
-			while (namesIt.hasNext()) {
-				String name = (String) namesIt.next();
-				if (name.equals(baseName + String.valueOf(count))) {
-					count++;
-					foundMatch = true;
-					break;
-				}
-			}
-		}
-		
-		return baseName + String.valueOf(count);
-	}
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/parameters/XSDComponentHelper.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/parameters/XSDComponentHelper.java
deleted file mode 100644
index 7d9c87c3c..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/parameters/XSDComponentHelper.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- */
-package org.eclipse.wst.wsdl.ui.internal.parameters;
-
-import java.util.Iterator;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.Types;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddXSDElementDeclarationCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddXSDSchemaCommand;
-import org.eclipse.wst.xsd.ui.internal.commands.AddElementDeclarationCommand;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDComponent;
-import org.eclipse.xsd.XSDCompositor;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDFactory;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-
-/**
- * Input createInput(Operation operation, String style) --- create default message/part/etc.
- * Object createInputParameter(Operation operation, Input input, Style style) --
- * 
- * Command getCreateInputParameterCommand(Operation operation, Input input, Style style)
- * 
- * Message/part/Element
- * Message/part/Element/sequence/Element
- * (x) Message/part
- */
-public class XSDComponentHelper {
-	/*
-	 * Create an XSDElement with type anonymous.  Set the given part to reference the newly created
-	 * XSDElement.
-	 */
-	public static XSDElementDeclaration createAnonymousXSDElementDefinition(String baseName, Part part) {
-		XSDElementDeclaration anonElement = createXSDElementDeclarationCommand(part.getEnclosingDefinition(), baseName, part);
-		XSDComplexTypeDefinition newAnon = XSDFactory.eINSTANCE.createXSDComplexTypeDefinition();
-		XSDParticle newXSDParticle = XSDFactory.eINSTANCE.createXSDParticle();
-		XSDModelGroup newXSDModelGroup = XSDFactory.eINSTANCE.createXSDModelGroup();
-		newXSDModelGroup.setCompositor(XSDCompositor.SEQUENCE_LITERAL);
-		
-		anonElement.setAnonymousTypeDefinition(newAnon);
-		newXSDParticle.setContent(newXSDModelGroup);
-		newAnon.setContent(newXSDParticle);
-		
-		return anonElement;
-	}
-	
-	public static XSDElementDeclaration createXSDElementDeclarationCommand(Definition definition, String baseName, Object context) {
-		XSDElementDeclaration xsdElement = null;
-		
-		if (context instanceof Part) {
-			AddXSDElementDeclarationCommand command = new AddXSDElementDeclarationCommand(definition, "");
-			
-			// Find a unique name
-			XSDSchema xsdSchema = command.getSchema();
-			String name = WNameHelperUtil.getXSDElementName(baseName, xsdSchema);
-			command.run(name);
-			// The 'workaround' below is causing me to hang.....  The latest WTP is needed.
-//			xsdElement = xsdSchema.resolveElementDeclaration(name);
-			xsdElement = command.getXSDElement();
-		}
-		else if (context instanceof XSDModelGroup) {
-			XSDModelGroup modelGroup = (XSDModelGroup) context;
-			XSDParticle newParticle = XSDFactory.eINSTANCE.createXSDParticle();
-			String name = WNameHelperUtil.getXSDElementName(baseName, modelGroup);
-			
-			AddElementDeclarationCommand command = new AddElementDeclarationCommand(modelGroup, name);
-			command.run();
-			xsdElement = (XSDElementDeclaration) command.getModelObject();
-			xsdElement.setTypeDefinition(getXSDStringType(modelGroup));
-			
-			newParticle.setContent(xsdElement);
-			modelGroup.getContents().add(newParticle);
-		}
-		else {
-			AddElementDeclarationCommand command = new AddElementDeclarationCommand(null, baseName);
-			command.run();
-			xsdElement = (XSDElementDeclaration) command.getModelObject();
-		}
-		
-		return xsdElement;
-	}
-	
-	public static void addXSDElementToModelGroup(XSDElementDeclaration parent, XSDElementDeclaration child) {
-		if (parent.getAnonymousTypeDefinition() instanceof XSDComplexTypeDefinition) {
-			XSDComplexTypeDefinition anonType = (XSDComplexTypeDefinition) parent.getAnonymousTypeDefinition();
-			if (anonType.getContent() instanceof XSDParticle) {
-				XSDParticle particle = (XSDParticle) anonType.getContent();
-				if (particle.getContent() instanceof XSDModelGroup) {
-					// Create XSDParticle
-					XSDModelGroup modelGroup = (XSDModelGroup) particle.getContent();
-					addXSDElementToModelGroup(modelGroup, child);
-				}
-				else {
-					// Create XSDModelGroup -- XSDParticle
-					addXSDElementToModelGroup(particle, child);
-				}				  
-			}
-			else {
-				// Create XSDParticle --> XSDModelGroup --> XSDParticle
-				XSDParticle newParticle = XSDFactory.eINSTANCE.createXSDParticle();
-				anonType.setContent(newParticle);
-				addXSDElementToModelGroup(newParticle, child);
-			}			  
-		}
-		else {
-			// Create Anonymous Type --> XSDParticle --> XSDModelGroup --> XSDParticle
-			XSDComplexTypeDefinition newAnonType = XSDFactory.eINSTANCE.createXSDComplexTypeDefinition();
-			parent.setAnonymousTypeDefinition(newAnonType);
-			
-			XSDParticle newParticle = XSDFactory.eINSTANCE.createXSDParticle();
-			newAnonType.setContent(newParticle);
-			addXSDElementToModelGroup(newParticle, child);
-		}
-	}
-	
-	public static void addXSDElementToModelGroup(XSDParticle particle, XSDElementDeclaration child) {
-		XSDModelGroup newXSDModelGroup = XSDFactory.eINSTANCE.createXSDModelGroup();
-		newXSDModelGroup.setCompositor(XSDCompositor.SEQUENCE_LITERAL);					  
-		particle.setContent(newXSDModelGroup);
-		addXSDElementToModelGroup(newXSDModelGroup, child);
-	}
-	
-	public static void addXSDElementToModelGroup(XSDModelGroup modelGroup, XSDElementDeclaration child) {
-		// Create XSDParticle
-		XSDParticle newParticle = XSDFactory.eINSTANCE.createXSDParticle();
-		newParticle.setContent(child);
-		modelGroup.getContents().add(newParticle);
-	}
-	
-	/*
-	 * Return it's XSDModelGroup.  If one does not exist, create one
-	 */
-	public static XSDModelGroup getXSDModelGroup(XSDElementDeclaration xsdElement, Definition definition) {
-		XSDModelGroup modelGroup = null;
-		XSDComplexTypeDefinition anonType = null;
-		
-		if (xsdElement.getAnonymousTypeDefinition() instanceof XSDComplexTypeDefinition) {
-			anonType = (XSDComplexTypeDefinition) xsdElement.getAnonymousTypeDefinition();
-		}		  
-		else {
-			// Create Anonymous Type
-			anonType = XSDFactory.eINSTANCE.createXSDComplexTypeDefinition();
-			anonType.setName("NewComplexTypeName");
-			getXSDSchema(definition).getContents().add(anonType);
-			xsdElement.setAnonymousTypeDefinition(anonType);
-		}
-		
-		if (anonType != null) {
-			modelGroup = getXSDModelGroup(anonType);
-		}
-		
-		return modelGroup;
-	}
-	
-	/*
-	 * Return it's XSDModelGroup.  If one does not exist, create one
-	 */
-	public static XSDModelGroup getXSDModelGroup(XSDComplexTypeDefinition xsdComplexType) {
-		XSDModelGroup modelGroup = null;
-		XSDParticle particle = null;
-		// Check for XSDParticle
-		if (xsdComplexType.getContent() instanceof XSDParticle) {
-			particle = (XSDParticle) xsdComplexType.getContent();
-		}
-		else {
-			particle = XSDFactory.eINSTANCE.createXSDParticle();
-			modelGroup = XSDFactory.eINSTANCE.createXSDModelGroup();
-			modelGroup.setCompositor(XSDCompositor.SEQUENCE_LITERAL);			  
-			particle.setContent(modelGroup);
-			xsdComplexType.setContent(particle);
-		}
-		
-		// Check for XSDModelGroup
-		if (particle.getContent() instanceof XSDModelGroup) {
-			modelGroup = (XSDModelGroup) particle.getContent();
-		}
-		else {
-			modelGroup = XSDFactory.eINSTANCE.createXSDModelGroup();
-			modelGroup.setCompositor(XSDCompositor.SEQUENCE_LITERAL);			  
-			particle.setContent(modelGroup);
-		}
-		
-		return modelGroup;
-	}
-	
-	/*
-	 * 
-	 */
-	public static XSDComplexTypeDefinition createXSDComplexTypeDefiniion(String complexTypeName, Part part) {
-		XSDComplexTypeDefinition newComplexType = XSDFactory.eINSTANCE.createXSDComplexTypeDefinition();
-		XSDParticle newXSDParticle = XSDFactory.eINSTANCE.createXSDParticle();
-		XSDModelGroup newXSDModelGroup = XSDFactory.eINSTANCE.createXSDModelGroup();
-		newXSDModelGroup.setCompositor(XSDCompositor.SEQUENCE_LITERAL);
-		
-		newComplexType.setName(complexTypeName);
-		newComplexType.setContent(newXSDParticle);
-		newXSDParticle.setContent(newXSDModelGroup);
-		getXSDSchema(part.getEnclosingDefinition()).getContents().add(newComplexType);
-		
-		return newComplexType;
-	}
-	
-	public static void addXSDElementToModelGroup(XSDComplexTypeDefinition parent, XSDElementDeclaration child) {
-		if (parent.getContent() instanceof XSDParticle) {
-			XSDParticle particle = (XSDParticle) parent.getContent();
-			if (particle.getContent() instanceof XSDModelGroup) {
-				// Create XSDParticle
-				XSDModelGroup modelGroup = (XSDModelGroup) particle.getContent();
-				addXSDElementToModelGroup(modelGroup, child);
-			}
-			else {
-				// Create XSDModelGroup -- XSDParticle
-				addXSDElementToModelGroup(particle, child);
-			}				  
-		}
-		else {
-			// Create XSDParticle --> XSDModelGroup --> XSDParticle
-			XSDParticle newParticle = XSDFactory.eINSTANCE.createXSDParticle();
-			parent.setContent(newParticle);
-			addXSDElementToModelGroup(newParticle, child);
-		}
-	}
-	
-	/*
-	 * Return the inline XSDSchema associated with this WSDL.
-	 * Look for the inline XSDSchema with the same namespace as the WSDL.
-	 * If this inline XSDSchema does not exists, create it.
-	 */
-	public static XSDSchema getXSDSchema(Definition definition) {
-		XSDSchema schema = null;
-		String wsdlTargetNamespace = definition.getTargetNamespace();
-		
-		Types types = (Types) definition.getTypes();
-		if (types != null) {
-			
-			Iterator eeIt = types.getExtensibilityElements().iterator();
-			while (eeIt.hasNext()) {
-				Object eeElement = eeIt.next();
-				if (eeElement instanceof XSDSchemaExtensibilityElement) {
-					XSDSchemaExtensibilityElement ee = (XSDSchemaExtensibilityElement) eeElement;
-					if (ee.getSchema().getTargetNamespace().equals(wsdlTargetNamespace)) {
-						schema = ee.getSchema();
-						break;
-					}
-				}
-			}
-		}
-		
-		if (schema == null) {
-			// We need to create the schema
-			AddXSDSchemaCommand command = new AddXSDSchemaCommand(definition);
-			command.run();
-			XSDSchemaExtensibilityElement eeElement = (XSDSchemaExtensibilityElement) command.getWSDLElement();
-			schema = eeElement.getSchema();
-		}
-		
-		return schema;
-	}
-	
-	private static XSDSimpleTypeDefinition getXSDStringType(XSDComponent component) {
-		XSDSchema schema = component.getSchema();
-		return schema.getSchemaForSchema().resolveSimpleTypeDefinition("string");
-	}
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/AbstractSection.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/AbstractSection.java
deleted file mode 100644
index 2988ee289..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/AbstractSection.java
+++ /dev/null
@@ -1,353 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import org.eclipse.jface.action.IStatusLineManager;
-import org.eclipse.jface.util.Assert;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.part.EditorActionBarContributor;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISection;
-import org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetPage;
-import org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.graph.model.WSDLGraphModelAdapterFactory;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapter;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject;
-import org.eclipse.wst.xml.core.internal.document.DocumentImpl;
-import org.w3c.dom.Element;
-
-public class AbstractSection implements ISection, IPropertyChangeListener, Listener, SelectionListener
-{
-	private TabbedPropertySheetWidgetFactory factory;
-	private WSDLElement element;
-  protected boolean isReadOnly = false;
-  protected Composite composite;
-  protected int rightMarginSpace;
-  protected int tableMinimumWidth = 50;
-	
-  public void createControls(Composite parent,	TabbedPropertySheetPage tabbedPropertySheetPage)
-  {
-    createControls(parent, tabbedPropertySheetPage.getWidgetFactory());
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#createControls(org.eclipse.swt.widgets.Composite, org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory)
-   */
-  public void createControls(Composite parent, TabbedPropertySheetWidgetFactory aFactory)
-  {
-		this.factory = aFactory;
-    GC gc = new GC(parent);
-    Point extent = gc.textExtent("  ...  "); //$NON-NLS-1$
-    rightMarginSpace = extent.x;
-    gc.dispose();
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#setInput(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
-   */
-  public void setInput(IWorkbenchPart part, ISelection selection)
-  {
-		Assert.isTrue(selection instanceof IStructuredSelection);
-		Object input = ((IStructuredSelection)selection).getFirstElement();
-		
-		if (input instanceof WSDLElement)
-		{
-		  this.element = (WSDLElement)input;
-      ModelAdapter adapter = WSDLGraphModelAdapterFactory.getWSDLGraphModelAdapterFactory().getAdapter(input);
-      if (adapter != null)
-      {
-        isReadOnly = Boolean.TRUE.equals(adapter.getProperty(input, "isReadOnly")); //$NON-NLS-1$
-      }
-		}
-		else if (input instanceof WSDLGroupObject)
-		{
-		  this.element = ((WSDLGroupObject)input).getDefinition();
-		}
-		refresh();
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#aboutToBeShown()
-   */
-  public void aboutToBeShown()
-  {
-		refresh();
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#aboutToBeHidden()
-   */
-  public void aboutToBeHidden()
-  {
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#dispose()
-   */
-  public void dispose()
-  {
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#getMinimumHeight()
-   */
-  public int getMinimumHeight()
-  {
-    return SWT.DEFAULT;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#shouldUseExtraSpace()
-   */
-  public boolean shouldUseExtraSpace()
-  {
-    return true;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#refresh()
-   */
-  public void refresh()
-  {
-    if (isReadOnly)
-    {
-      composite.setEnabled(false);
-    }
-    else
-    {
-      composite.setEnabled(true);
-    }
-  }
-
-  public WSDLElement getElement()
-  {
-    return element;
-  }
-  
-	/**
-	 * Get the widget factory.
-	 * @return the widget factory.
-	 */
-	public TabbedPropertySheetWidgetFactory getWidgetFactory() {
-		return factory;
-	}
-
-	public void propertyChange(PropertyChangeEvent event)
-	{
-    refresh();
-	}
-
-	
-  public void doWidgetDefaultSelected(SelectionEvent e)
-  {}
-  
-  public void doWidgetSelected(SelectionEvent e)
-  {}
-  
-  /**
-   * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(SelectionEvent)
-   */
-  public void widgetDefaultSelected(SelectionEvent e)
-  {
-    if (isListenerEnabled() &&
-        getElement() != null &&
-        !isInDoHandle) 
-    {
-      isInDoHandle = true;
-      doWidgetDefaultSelected(e);
-      isInDoHandle = false;
-    }
-    
-  }
-
-  /**
-   * @see org.eclipse.swt.events.SelectionListener#widgetSelected(SelectionEvent)
-   */
-  public void widgetSelected(SelectionEvent e)
-  {
-    if (isListenerEnabled() &&
-        getElement() != null &&
-        !isInDoHandle) 
-    {
-      isInDoHandle = true;
-      doWidgetSelected(e);
-      isInDoHandle = false;
-    }
-    
-  }
-  
-  boolean listenerEnabled = true;
-  /**
-   * Get the value of listenerEnabled.
-   * @return value of listenerEnabled.
-   */
-  public boolean isListenerEnabled() 
-  {
-    return listenerEnabled;
-  }
-  
-  /**
-   * Set the value of listenerEnabled.
-   * @param v  Value to assign to listenerEnabled.
-   */
-  public void setListenerEnabled(boolean  v) 
-  {
-    this.listenerEnabled = v;
-  }
-
-  public void handleEvent(Event event)
-  {
-    if (isListenerEnabled() && !isInDoHandle) 
-    {
-      isInDoHandle = true;
-      startDelayedEvent(event);
-      isInDoHandle = false;
-    } // end of if ()
-  }
-  
-  public void doHandleEvent(Event event)
-  {
-    
-  }
-  
-  protected DelayedEvent delayedTask;
-  
-  protected void startDelayedEvent(Event e)
-  {
-    if (delayedTask == null ||
-      delayedTask.getEvent() == null)
-    {
-      delayedTask = new DelayedEvent();
-      delayedTask.setEvent(e);
-      Display.getDefault().timerExec(500,delayedTask);
-    }
-    else
-    {
-      Event delayedEvent = delayedTask.getEvent();
-      
-      if (e.widget == delayedEvent.widget &&
-        e.type == delayedEvent.type)
-      {
-        // same event, just different data, delay new event
-        delayedTask.setEvent(null);
-      }
-      delayedTask = new DelayedEvent();
-      delayedTask.setEvent(e);
-      Display.getDefault().timerExec(500,delayedTask);
-    }
-  }
-  
-  class DelayedEvent implements Runnable
-  {
-    protected Event event;
-    
-    /*
-     * @see Runnable#run()
-     */
-    public void run()
-    {
-      if (event != null)
-      {
-        isInDoHandle = true;
-        doHandleEvent(event);
-        isInDoHandle = false;
-        event = null;
-      }
-    }
-    
-    /**
-     * Gets the event.
-     * @return Returns a Event
-     */
-    public Event getEvent()
-    {
-      return event;
-    }
-
-    /**
-     * Sets the event.
-     * @param event The event to set
-     */
-    public void setEvent(Event event)
-    {
-      this.event = event;
-    }
-
-  }
-
-  boolean isInDoHandle;
-  /**
-   * Get the value of isInDoHandle.
-   * @return value of isInDoHandle.
-   */
-  public boolean isInDoHandle() 
-  {
-    return isInDoHandle;
-  }
-
-  
-  static protected IEditorPart getActiveEditor()
-  {
-    IWorkbench workbench = WSDLEditorPlugin.getInstance().getWorkbench();
-    IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
-    IEditorPart editorPart = workbenchWindow.getActivePage().getActiveEditor();
-
-    return editorPart;
-  }
-
-  static protected IStatusLineManager getStatusLineManager(IEditorPart editorPart)
-  { 
-    IStatusLineManager result = null;
-    try
-    {                       
-      EditorActionBarContributor contributor = (EditorActionBarContributor)editorPart.getEditorSite().getActionBarContributor();
-      result = contributor.getActionBars().getStatusLineManager();
-    }
-    catch (Exception e)
-    {
-    }  
-    return result;
-  }
-
-  public DocumentImpl getDocument(Element element)
-  {
-    return (DocumentImpl) element.getOwnerDocument();
-  }
-
-  public void beginRecording(String description, Element element)
-  {
-    getDocument(element).getModel().beginRecording(this, description);
-  }
-  
-  public void endRecording(Element element)
-  {
-    DocumentImpl doc = (DocumentImpl) getDocument(element);
-    
-    doc.getModel().endRecording(this);    
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/AbstractSectionDescriptor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/AbstractSectionDescriptor.java
deleted file mode 100644
index f65456d8b..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/AbstractSectionDescriptor.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISection;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ITypeMapper;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject;
-
-public class AbstractSectionDescriptor implements ISectionDescriptor
-{
-  /**
-   * 
-   */
-  public AbstractSectionDescriptor()
-  {
-    super();
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getId()
-   */
-  public String getId()
-  {
-    return "";
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getFilter()
-   */
-  public ITypeMapper getFilter()
-  {
-    return null;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getInputTypes()
-   */
-  public List getInputTypes()
-  {
-    List list = new ArrayList();
-    list.add(WSDLElement.class);
-    return list;
- }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getSectionClass()
-   */
-  public ISection getSectionClass()
-  {
-    return null;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getTargetTab()
-   */
-  public String getTargetTab()
-  {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#appliesTo(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
-   */
-  public boolean appliesTo(IWorkbenchPart part, ISelection selection)
-  {
-    Object object = null;
-    if (selection instanceof StructuredSelection)
-    {
-      StructuredSelection structuredSelection = (StructuredSelection)selection;
-      object = structuredSelection.getFirstElement();
-      if (object instanceof WSDLElement || object instanceof WSDLGroupObject)
-      {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getAfterSection()
-   */
-  public String getAfterSection()
-  {
-    return "";
-  }
-  
-  public int getEnablesFor()
-  {
-	return ENABLES_FOR_ANY;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/DocumentationSection.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/DocumentationSection.java
deleted file mode 100644
index 93fe1e61d..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/DocumentationSection.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.wsdl.ui.internal.actions.AddElementAction;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-public class DocumentationSection extends AbstractSection {
-
-	Text docText;
-
-	/**
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySection#createControls(org.eclipse.swt.widgets.Composite, org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory)
-	 */
-	public void createControls(Composite parent, TabbedPropertySheetWidgetFactory factory)
-	{
-	  super.createControls(parent, factory);
-		composite =	getWidgetFactory().createFlatFormComposite(parent);
-		
-		docText = getWidgetFactory().createText(composite, "", SWT.MULTI | SWT.NONE | SWT.H_SCROLL | SWT.V_SCROLL); //$NON-NLS-1$
-    docText.addListener(SWT.Modify, this);  
-		FormData data = new FormData();
-		data.left = new FormAttachment(0, 0);
-		data.right = new FormAttachment(100, 0);
-		data.top = new FormAttachment(0, 0);
-		data.bottom = new FormAttachment(100, 0);
-		docText.setLayoutData(data);
-	}
-
-	/*
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.view.ITabbedPropertySection#refresh()
-	 */
-	public void refresh()
-	{
-    super.refresh();
-    if (docText.isFocusControl())
-    {
-      return;
-    }
-    setListenerEnabled(false);
-	  docText.setText("");
-	  if (getElement() != null)
-	  {
-	    Element docNode = getElement().getDocumentationElement();
-	    if (docNode != null)
-	    {
-        Node textNode = docNode.getFirstChild();
-        if (textNode != null)
-        {
-          String docValue = textNode.getNodeValue();
-          if (docValue != null)
-          {
-            docText.setText(docValue);
-          }
-        }
-	    }
-	  }
-	  setListenerEnabled(true);
-	}
-	
-	public void doHandleEvent(Event event)
-	{
-	  if (event.widget == docText)
-	  {
-	    String value = docText.getText();
-	    if (getElement() != null)
-	    {
-	      Element docNode = getElement().getDocumentationElement();
-	      if (docNode != null)
-	      {
-          Node textNode = docNode.getFirstChild();
-          if (textNode != null)
-          {
-            textNode.setNodeValue(value);
-          }
-          else
-          {
-            if (value.length() > 0)
-            {
-              Document document = docNode.getOwnerDocument();
-              org.w3c.dom.Text newTextNode = document.createTextNode(value);
-              docNode.appendChild(newTextNode);
-            }
-          }
-	      }
-	      else
-	      {
-	        Element element = getElement().getElement();
-          AddElementAction action = new AddElementAction(element, element.getPrefix(), "documentation", element.getFirstChild()); //$NON-NLS-1$
-          action.run();
-          Element newDocumentation = action.getNewElement();
-          
-          Document document = newDocumentation.getOwnerDocument();
-          org.w3c.dom.Text newTextNode = document.createTextNode(value);
-          newDocumentation.appendChild(newTextNode);
-          getElement().setDocumentationElement(newDocumentation);
-	      }
-	    }
-	  }
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/DocumentationSectionDescriptor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/DocumentationSectionDescriptor.java
deleted file mode 100644
index 7213861e7..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/DocumentationSectionDescriptor.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISection;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor;
-import org.eclipse.wst.wsdl.WSDLElement;
-
-
-public class DocumentationSectionDescriptor extends AbstractSectionDescriptor implements ISectionDescriptor
-{
-  /**
-   * 
-   */
-  public DocumentationSectionDescriptor()
-  {
-    super();
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getId()
-   */
-  public String getId()
-  {
-    return "org.eclipse.wst.wsdl.ui.internal.section.documentation";
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getSectionClass()
-   */
-  public ISection getSectionClass()
-  {
-    // TODO Auto-generated method stub
-    return new DocumentationSection();
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getTargetTab()
-   */
-  public String getTargetTab()
-  {
-    // TODO Auto-generated method stub
-    return "org.eclipse.wst.xmlwebservices.documentation";
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#appliesTo(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
-   */
-  public boolean appliesTo(IWorkbenchPart part, ISelection selection)
-  {
-    Object object = null;
-    if (selection instanceof StructuredSelection)
-    {
-      StructuredSelection structuredSelection = (StructuredSelection)selection;
-      object = structuredSelection.getFirstElement();
-      if (object instanceof WSDLElement)
-      {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getAfterSection()
-   */
-  public String getAfterSection()
-  {
-    return "org.eclipse.wst.xmlwebservices.general";
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ExtensibilityElementSectionDescriptor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ExtensibilityElementSectionDescriptor.java
deleted file mode 100644
index 2022a8a37..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ExtensibilityElementSectionDescriptor.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISection;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-
-public class ExtensibilityElementSectionDescriptor extends AbstractSectionDescriptor implements ISectionDescriptor
-{
-  /**
-   * 
-   */
-  public ExtensibilityElementSectionDescriptor()
-  {
-    super();
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getId()
-   */
-  public String getId()
-  {
-    return "org.eclipse.wst.wsdl.ui.internal.section.extensibilityelement";
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getSectionClass()
-   */
-  public ISection getSectionClass()
-  {
-    // TODO Auto-generated method stub
-    return new ExtensiblityElementSection();
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getTargetTab()
-   */
-  public String getTargetTab()
-  {
-    // TODO Auto-generated method stub
-    return "org.eclipse.wst.xmlwebservices.general";
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#appliesTo(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
-   */
-  public boolean appliesTo(IWorkbenchPart part, ISelection selection)
-  {
-    Object object = null;
-    if (selection instanceof StructuredSelection)
-    {
-      StructuredSelection structuredSelection = (StructuredSelection)selection;
-      object = structuredSelection.getFirstElement();
-      if (object instanceof ExtensibilityElement)
-      {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getAfterSection()
-   */
-  public String getAfterSection()
-  {
-    return "";
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ExtensiblityElementSection.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ExtensiblityElementSection.java
deleted file mode 100644
index 62646e2f3..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ExtensiblityElementSection.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapterListener;
-import org.eclipse.wst.wsdl.ui.internal.viewers.ExtensibilityElementViewer;
-import org.eclipse.wst.wsdl.ui.internal.viewers.widgets.AttributesTable;
-
-public class ExtensiblityElementSection extends AbstractSection implements ModelAdapterListener
-{
-  ExtensibilityElementViewer viewer;
-  protected AttributesTable attributesTable;
-	/**
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySection#createControls(org.eclipse.swt.widgets.Composite, org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory)
-	 */
-	public void createControls(Composite parent, TabbedPropertySheetWidgetFactory factory)
-	{
-		super.createControls(parent, factory);
-
-		composite =	getWidgetFactory().createFlatFormComposite(parent);
-	
-//		viewer = new ExtensibilityElementViewer(composite, getActiveEditor(), true);
-		attributesTable = new AttributesTable(getActiveEditor(), composite);
-		FormData data = new FormData();
-		data.left = new FormAttachment(0, 0);
-		data.right = new FormAttachment(100, 0);
-		data.top = new FormAttachment(0, 0);
-		data.bottom = new FormAttachment(100, 0);
-		attributesTable.getControl().setLayoutData(data);
-//		viewer.getControl().setLayoutData(data);
-	}
-	
-  public void propertyChanged(Object object, String property)
-  {
-    if (isListenerEnabled())
-    {
-      setListenerEnabled(false);
-      refresh();
-      setListenerEnabled(true);
-    }
-  }  
-
-	/*
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.view.ITabbedPropertySection#refresh()
-	 */
-	public void refresh()
-	{
-    super.refresh();
-    attributesTable.setInput(getElement().getElement());
-
-    Runnable runnable = new Runnable()
-    { 
-      public void run()
-      {           
-        if (!attributesTable.getControl().isDisposed())
-        {
-          attributesTable.refresh();
-        }
-      }
-    };               
-    Display.getCurrent().asyncExec(runnable);
-
-	}
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/IPropertyDescriptorProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/IPropertyDescriptorProvider.java
deleted file mode 100644
index c5f1e93b6..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/IPropertyDescriptorProvider.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-import org.w3c.dom.Element;
-
-public interface IPropertyDescriptorProvider 
-{
-  //public void init(IEditorPart editor);  
-  public IPropertyDescriptor getPropertyDescriptor(IEditorPart editor, Element ownerElement, String attributeNamespace, String attributeName);
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ImportSection.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ImportSection.java
deleted file mode 100644
index 75c3d3b02..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ImportSection.java
+++ /dev/null
@@ -1,304 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.wst.common.ui.internal.dialogs.SelectSingleFileDialog;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertyConstants;
-import org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.internal.impl.ImportImpl;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.XMLQuickScan;
-import org.w3c.dom.Element;
-
-public class ImportSection extends AbstractSection
-{
-  protected Text namespaceText, prefixText, locationText;
-  private String oldPrefixValue;
-  Button button;
-  IEditorPart editorPart;
-  
-	/**
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySection#createControls(org.eclipse.swt.widgets.Composite, org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory)
-	 */
-	public void createControls(Composite parent, TabbedPropertySheetWidgetFactory factory)
-	{
-		super.createControls(parent, factory);
-		Composite composite = getWidgetFactory().createFlatFormComposite(parent);
-		FormData data;
-
-		namespaceText = getWidgetFactory().createText(composite, ""); //$NON-NLS-1$
-		namespaceText.setEditable(false);
-//		namespaceText.addListener(SWT.Modify, this);
-		data = new FormData();
-		data.left = new FormAttachment(0, 100);
-		data.right = new FormAttachment(100, -rightMarginSpace - ITabbedPropertyConstants.HSPACE);
-		data.top = new FormAttachment(0, 0);
-		namespaceText.setLayoutData(data);
-
-		CLabel namespaceLabel = getWidgetFactory().createCLabel(composite, WSDLEditorPlugin.getWSDLString("_UI_LABEL_NAMESPACE")); //$NON-NLS-1$
-		data = new FormData();
-		data.left = new FormAttachment(0, 0);
-		data.right = new FormAttachment(namespaceText, -ITabbedPropertyConstants.HSPACE);
-		data.top = new FormAttachment(namespaceText, 0, SWT.CENTER);
-		namespaceLabel.setLayoutData(data);
-
-		prefixText = getWidgetFactory().createText(composite, ""); //$NON-NLS-1$
-//		prefixText.setEditable(false);
-		prefixText.addListener(SWT.Modify, this);
-		data = new FormData();
-		data.left = new FormAttachment(0, 100);
-		data.right = new FormAttachment(100, -rightMarginSpace - ITabbedPropertyConstants.HSPACE);
-		data.top = new FormAttachment(namespaceText, +ITabbedPropertyConstants.VSPACE);
-		prefixText.setLayoutData(data);
-
-		CLabel prefixLabel = getWidgetFactory().createCLabel(composite, WSDLEditorPlugin.getWSDLString("_UI_LABEL_PREFIX")); //$NON-NLS-1$
-		data = new FormData();
-		data.left = new FormAttachment(0, 0);
-		data.right = new FormAttachment(prefixText, -ITabbedPropertyConstants.HSPACE);
-		data.top = new FormAttachment(prefixText, 0, SWT.CENTER);
-		prefixLabel.setLayoutData(data);
-
-		locationText = getWidgetFactory().createText(composite, ""); //$NON-NLS-1$
-		locationText.setEditable(false);
-//		locationText.addListener(SWT.Modify, this);
-
-		CLabel locationLabel = getWidgetFactory().createCLabel(composite, WSDLEditorPlugin.getWSDLString("_UI_LABEL_LOCATION")); //$NON-NLS-1$
-		data = new FormData();
-		data.left = new FormAttachment(0, 0);
-		data.right = new FormAttachment(locationText, -ITabbedPropertyConstants.HSPACE);
-		data.top = new FormAttachment(locationText, 0, SWT.CENTER);
-		locationLabel.setLayoutData(data);
-
-    button = getWidgetFactory().createButton(composite, "", SWT.PUSH); //$NON-NLS-1$
-    button.setImage(WSDLEditorPlugin.getInstance().getImage("icons/browsebutton.gif")); //$NON-NLS-1$
-
-    button.addSelectionListener(this);
-		data = new FormData();
-		data.left = new FormAttachment(100, -rightMarginSpace + 2);
-		data.right = new FormAttachment(100,0);
-		data.top = new FormAttachment(locationText, 0, SWT.CENTER);
-		button.setLayoutData(data);
-    
-    data = new FormData();
-    data.left = new FormAttachment(0, 100);
-    data.right = new FormAttachment(button, 0);
-    data.top = new FormAttachment(prefixText, +ITabbedPropertyConstants.VSPACE);
-    locationText.setLayoutData(data);
-	}
-
-	/*
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.view.ITabbedPropertySection#refresh()
-	 */
-	public void refresh()
-	{
-	  setListenerEnabled(false);  
-	  Object obj = getElement();
-    boolean refreshPrefixText = true;
-    boolean refreshLocationText = true;
-    boolean refreshNamespaceText = true;
-    if (prefixText.isFocusControl())
-    {
-      refreshPrefixText = false;
-    }
-    if (locationText.isFocusControl())
-    {
-      refreshLocationText = false;
-    }
-    if (namespaceText.isFocusControl())
-    {
-      refreshNamespaceText = false;
-    }
-    
-    if (refreshPrefixText)
-    {
-      prefixText.setText(""); //$NON-NLS-1$
-    }
-    if (refreshLocationText)
-    {
-      locationText.setText(""); //$NON-NLS-1$
-    }
-    if (refreshNamespaceText)
-    {
-      namespaceText.setText(""); //$NON-NLS-1$
-    }
-	  if (obj instanceof Import)
-	  {
-	    Element element = ((Import)obj).getElement();                           
-      if (refreshLocationText)
-      {
-        String locationValue = element.getAttribute("location"); //$NON-NLS-1$
-  	    locationText.setText(locationValue != null ? locationValue : ""); //$NON-NLS-1$
-      }
-
-      String namespaceValue = element.getAttribute("namespace"); //$NON-NLS-1$
-      if (refreshNamespaceText)
-      {
-        namespaceText.setText(namespaceValue != null ? namespaceValue : ""); //$NON-NLS-1$
-      }
-      
-      if (refreshPrefixText)
-      {
-  	    String prefix = ((Import)obj).getEnclosingDefinition().getPrefix(namespaceValue);
-  	    prefixText.setText(prefix != null ? prefix : ""); //$NON-NLS-1$
-      }
-	  }
-	oldPrefixValue = prefixText.getText();
-    setListenerEnabled(true);
-	}
-
-	public void doHandleEvent(Event event) {
-	    if (event.widget == prefixText && locationText.getText().length() > 0 && namespaceText.getText().length() > 0) {    	
-	    	Object input = getElement();
-	        Import importObj = (Import)input;
-//	        org.w3c.dom.Element importElement = WSDLEditorUtil.getInstance().getElementForObject(importObj);
-	        Map namespacesMap = importObj.getEnclosingDefinition().getNamespaces();
-
-	        if (namespacesMap.containsKey(prefixText.getText())) {
-	        	// We should add error messages.........
-	 //           setErrorMessage(XSDEditorPlugin.getXSDString("_ERROR_LABEL_PREFIX_EXISTS"));
-	        }
-	        else {
-	            Element definitionElement = importObj.getEnclosingDefinition().getElement();
-	            definitionElement.removeAttribute("xmlns:"+oldPrefixValue);
-	            definitionElement.setAttribute("xmlns:" + prefixText.getText(), namespaceText.getText());
-
-//	            clearErrorMessage();
-	            oldPrefixValue = prefixText.getText();
-	        }
-	    }
-	}
-	
-  public void widgetSelected(SelectionEvent e)
-  {
-	  if (e.widget == button)
-	  {
-		  Object input = getElement();
-		  
-		  WSDLEditor editor = (WSDLEditor)editorPart;
-		  IFile currentWSDLFile = ((IFileEditorInput)editor.getEditorInput()).getFile();
-		  
-		  SelectSingleFileDialog dialog = new SelectSingleFileDialog(WSDLEditorPlugin.getShell(), null, true);
-		  String [] filters = { "xsd", "wsdl" }; //$NON-NLS-1$
-		  IFile [] excludedFiles = { currentWSDLFile };
-		  
-		  dialog.addFilterExtensions(filters, excludedFiles);
-		  dialog.create();
-		  dialog.getShell().setText(WSDLEditorPlugin.getWSDLString("_UI_TITLE_SELECT")); //$NON-NLS-1$
-		  dialog.setTitle(WSDLEditorPlugin.getWSDLString("_UI_TITLE_SELECT_FILE")); //$NON-NLS-1$
-		  dialog.setMessage(WSDLEditorPlugin.getWSDLString("_UI_DESCRIPTION_SELECT_WSDL_OR_XSD")); //$NON-NLS-1$
-		  int rc = dialog.open();
-		  if (rc == IDialogConstants.OK_ID)
-		  {
-			  IFile selectedFile = dialog.getFile();
-			  
-			  //if (selectedFile.getLocation().toOSString().equals(currentWSDLFile.getLocation().toOSString()))
-			  //{
-			  //  System.out.println("SAME FILE:" + currentWSDLFile.getLocation());
-			  //}
-			  
-			  String location = ComponentReferenceUtil.computeRelativeURI(selectedFile, currentWSDLFile, true);
-			  
-			  Import importObj = (Import)input;
-			  org.w3c.dom.Element importElement = WSDLEditorUtil.getInstance().getElementForObject(importObj);
-			  Definition definition = importObj.getEnclosingDefinition();
-			  org.w3c.dom.Element definitionElement = WSDLEditorUtil.getInstance().getElementForObject(definition);
-			  
-			  String importTargetNamespace = ""; //$NON-NLS-1$
-			  String prefix = prefixText.getText();
-			  String uniquePrefix = ""; //$NON-NLS-1$
-			  
-			  URI uri = URI.createPlatformResourceURI(selectedFile.getFullPath().toString());      
-			  
-			  // note that the getTargetNamespaceURIForSchema works for both schema and wsdl files
-			  // I should change the name of this convenience method
-			  importTargetNamespace =  XMLQuickScan.getTargetNamespaceURIForSchema(uri.toString());
-			  
-			  if (prefix.trim().equals("")) //$NON-NLS-1$
-			  {
-				  uniquePrefix = getUniquePrefix(definition, uri.fileExtension());
-			  }
-			  else
-			  {
-				  uniquePrefix = prefix; 
-			  }
-			  
-			  
-			  if (importTargetNamespace == null ||
-					  (importTargetNamespace != null && importTargetNamespace.trim().length() == 0))
-			  {
-				  return;  // what to do with no namespace docs?
-			  }
-			  
-			  importObj.setLocationURI(location);
-			  importObj.setNamespaceURI(importTargetNamespace);
-			  ((ImportImpl) importObj).importDefinitionOrSchema();
-			  
-			  definitionElement.setAttribute("xmlns:" + uniquePrefix, importTargetNamespace); //$NON-NLS-1$
-			  
-			  namespaceText.setText(importTargetNamespace);
-			  locationText.setText(location);
-			  prefixText.setText(uniquePrefix);
-		  }
-		  
-		  refresh();
-	  }
-  }
-	
-  
-  private String getUniquePrefix(Definition definition, String initPrefix)
-  {
-    String uniquePrefix;
-    Map map = definition.getNamespaces();
-
-    if (definition.getNamespace(initPrefix) == null)
-    {
-      uniquePrefix = initPrefix;
-    }
-    else // if used, then try to create a unique one
-    {
-      String tempPrefix = initPrefix;
-      int i = 1;
-      while(map.containsKey(tempPrefix + i))
-      {
-        i++;
-      }
-      uniquePrefix = tempPrefix + i;
-    }
-    return uniquePrefix;    
-  } 
-  
-  public void setEditorPart(IEditorPart editorPart)
-  {
-    this.editorPart = editorPart;
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ImportSectionDescriptor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ImportSectionDescriptor.java
deleted file mode 100644
index 012236932..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ImportSectionDescriptor.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISection;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor;
-import org.eclipse.wst.wsdl.Import;
-
-public class ImportSectionDescriptor extends AbstractSectionDescriptor implements ISectionDescriptor
-{
-  ImportSection importSection;
-  /**
-   * 
-   */
-  public ImportSectionDescriptor()
-  {
-    super();
-    importSection = new ImportSection();
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getId()
-   */
-  public String getId()
-  {
-    return "org.eclipse.wst.wsdl.ui.internal.section.import";
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getInputTypes()
-   */
-  public List getInputTypes()
-  {
-    List list = new ArrayList();
-    list.add(Import.class);
-    return list;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getSectionClass()
-   */
-  public ISection getSectionClass()
-  {
-    return importSection;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getTargetTab()
-   */
-  public String getTargetTab()
-  {
-    return "org.eclipse.wst.xmlwebservices.general";
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#appliesTo(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
-   */
-  public boolean appliesTo(IWorkbenchPart part, ISelection selection)
-  {
-    importSection.setEditorPart(part.getSite().getWorkbenchWindow().getActivePage().getActiveEditor());
-    Object object = null;
-    if (selection instanceof StructuredSelection)
-    {
-      StructuredSelection structuredSelection = (StructuredSelection)selection;
-      object = structuredSelection.getFirstElement();
-      if (object instanceof Import)
-      {
-        return true;
-      }
-    }
-    return false;
-  }
-  
-  public String getAfterSection()
-  {
-    return "org.eclipse.wst.wsdl.ui.internal.section.name";
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/NameSection.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/NameSection.java
deleted file mode 100644
index 8a2f11c38..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/NameSection.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertyConstants;
-import org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.MessageReference;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.actions.SmartRenameAction;
-
-
-public class NameSection extends AbstractSection
-{
-
-	Text nameText;
-
-	/**
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySection#createControls(org.eclipse.swt.widgets.Composite, org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory)
-	 */
-	public void createControls(Composite parent,TabbedPropertySheetWidgetFactory factory)
-	{
-		super.createControls(parent, factory);
-		composite =	getWidgetFactory().createFlatFormComposite(parent);
-		FormData data;
-		
-
-		nameText = getWidgetFactory().createText(composite, ""); //$NON-NLS-1$
-		data = new FormData();
-		data.left = new FormAttachment(0, 100);
-		data.right = new FormAttachment(100, -rightMarginSpace - ITabbedPropertyConstants.HSPACE);
-		data.top = new FormAttachment(0, 0);
-		nameText.setLayoutData(data);
-
-		CLabel nameLabel = getWidgetFactory().createCLabel(composite, WSDLEditorPlugin.getWSDLString("_UI_LABEL_NAME") + ":"); //$NON-NLS-1$
-		data = new FormData();
-		data.left = new FormAttachment(0, 0);
-		data.right = new FormAttachment(nameText, -ITabbedPropertyConstants.HSPACE);
-		data.top = new FormAttachment(nameText, 0, SWT.CENTER);
-		nameLabel.setLayoutData(data);
-		
-		nameText.addListener(SWT.Modify, this);
-	}
-
-	/*
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.view.ITabbedPropertySection#refresh()
-	 */
-	public void refresh()
-	{
-    super.refresh();
-    if (nameText.isFocusControl())
-    {
-      return;
-    }
-    setListenerEnabled(false);
-	  nameText.setText(""); //$NON-NLS-1$
-	  if (getElement() != null)
-	  {
-	    if (getElement().getElement()!= null)
-	    {
-	      String name = getElement().getElement().getAttribute("name"); //$NON-NLS-1$
-	      if (name==null) name="";
-	      nameText.setText(name);
-	    }
-	  }
-    setListenerEnabled(true);
-	}
-	
-  public boolean shouldUseExtraSpace()
-  {
-    return false;
-  }
-
-  public void doHandleEvent(Event event)
-  {
-    if (event.widget == nameText && !nameText.isDisposed()) {
-        String newValue = nameText.getText();
-        Object wsdlElement = getElement();
-
-        if (wsdlElement instanceof Definition) {
-        	Definition definition = (Definition) wsdlElement;
-        	String uri = "";
-        	if (definition.getQName() != null) {
-        		uri = definition.getQName().getNamespaceURI();	
-        	}
-        	definition.setQName(new QName(uri, newValue));
-        }
-        else if (wsdlElement instanceof Service) {        
-        	Service service = (Service) wsdlElement;
-        	String uri = service.getQName().getNamespaceURI(); 
-        	service.setQName(new QName(uri, newValue));
-        }
-        else if (wsdlElement instanceof Port) {
-        	new SmartRenameAction(wsdlElement, newValue).run();
-//        	((Port) wsdlElement).setName(newValue);
-        }
-        else if (wsdlElement instanceof Binding) {
-        	Binding binding = (Binding) wsdlElement;
-        	String uri = binding.getQName().getNamespaceURI();
-        	binding.setQName(new QName(uri, newValue));
-        }
-        else if (wsdlElement instanceof BindingOperation) {
-        		((BindingOperation) wsdlElement).setName(newValue);
-        }
-        else if (wsdlElement instanceof BindingInput) {
-        	if(((BindingInput) wsdlElement).getName() == null && newValue.equals("")) //$NON-NLS-1$
-        		return;
-        	
-        	((BindingInput) wsdlElement).setName(newValue);
-        }
-        else if (wsdlElement instanceof BindingOutput) {
-        	if (((BindingOutput) wsdlElement).getName() == null && newValue.equals("")) //$NON-NLS-1$
-        		return;
-        	
-        	((BindingOutput) wsdlElement).setName(newValue);
-        }
-        else if (wsdlElement instanceof BindingFault) {
-        	((BindingFault) wsdlElement).setName(newValue);
-        }
-        else if (wsdlElement instanceof PortType) {
-        	PortType portType = (PortType) wsdlElement;
-        	String uri = portType.getQName().getNamespaceURI();
-        	portType.setQName(new QName(uri, newValue));
-        }
-        else if (wsdlElement instanceof Operation) {
-        	new SmartRenameAction(wsdlElement, newValue).run();
-//        	((Operation) wsdlElement).setName(newValue);
-        }
-        else if (wsdlElement instanceof MessageReference) {
-        	if (((MessageReference) wsdlElement).getName() == null && newValue.equals("")) //$NON-NLS-1$
-        		return;
-        	
-        	new SmartRenameAction(wsdlElement, newValue).run();
-//        	((MessageReference) wsdlElement).setName(newValue);
-        }
-        else if (wsdlElement instanceof Message) {
-/*
-        	Message message = (Message) wsdlElement;
-        	String uri = message.getQName().getNamespaceURI();
-        	message.setQName(new QName(uri, newValue));
-        	*/
-        	new SmartRenameAction(wsdlElement, newValue).run();
-        }
-        else if (wsdlElement instanceof Part) {
-//        	((Part) wsdlElement).setName(newValue);
-        	new SmartRenameAction(wsdlElement, newValue).run();
-        }
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/NameSectionDescriptor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/NameSectionDescriptor.java
deleted file mode 100644
index b64135018..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/NameSectionDescriptor.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISection;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.WSDLElement;
-
-
-public class NameSectionDescriptor extends AbstractSectionDescriptor implements ISectionDescriptor
-{
-  /**
-   * 
-   */
-  public NameSectionDescriptor()
-  {
-    super();
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getId()
-   */
-  public String getId()
-  {
-    return "org.eclipse.wst.wsdl.ui.internal.section.name";
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getInputTypes()
-   */
-  public List getInputTypes()
-  {
-    List list = new ArrayList();
-    list.add(WSDLElement.class);
-    return list;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getSectionClass()
-   */
-  public ISection getSectionClass()
-  {
-    return new NameSection();
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getTargetTab()
-   */
-  public String getTargetTab()
-  {
-    return "org.eclipse.wst.xmlwebservices.general";
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#appliesTo(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
-   */
-  public boolean appliesTo(IWorkbenchPart part, ISelection selection)
-  {
-    Object object = null;
-    if (selection instanceof StructuredSelection)
-    {
-      StructuredSelection structuredSelection = (StructuredSelection)selection;
-      object = structuredSelection.getFirstElement();
-      if (object instanceof WSDLElement && 
-          !(object instanceof ExtensibilityElement) &&
-          !(object instanceof Import))
-      {
-      	if (object instanceof WSDLElement) {
-      		Definition definition = ((WSDLElement) object).getEnclosingDefinition();
-      		if (definition.getElement() != null && !(object instanceof Definition)) {
-      			return true;
-      		}
-      		
-      		return false;
-      	}
-      	/*
-      	else if (object instanceof WSDLGroupObject) {
-      		Definition definition = ((WSDLGroupObject) object).getDefinition();
-      		if (definition.getElement() != null) {
-      			return true;
-      		}
-      		
-      		return false;
-      	}
-      	*/
-      }
-    }
-    return false;
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/NamespaceSection.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/NamespaceSection.java
deleted file mode 100644
index 93cc7715d..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/NamespaceSection.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertyConstants;
-import org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.actions.EditNamespacesAction;
-import org.eclipse.wst.xml.core.internal.document.AttrImpl;
-import org.eclipse.wst.xml.ui.internal.nsedit.CommonEditNamespacesTargetFieldDialog;
-import org.eclipse.wst.xml.ui.internal.nsedit.CommonNamespaceInfoTable;
-import org.w3c.dom.Element;
-
-public class NamespaceSection extends AbstractSection
-{
-  protected String targetNamespace;
-  protected List namespaceInfoList;
-  protected CommonEditNamespacesTargetFieldDialog editWSDLNamespacesControl;
-  protected Button button;
-  
-  Text nameText;
-  Text prefixText;
-  Text targetNamespaceText;
-  protected CommonNamespaceInfoTable tableViewer;
-  private boolean handlingEvent;
-
-	/**
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySection#createControls(org.eclipse.swt.widgets.Composite, org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory)
-	 */
-	public void createControls(Composite parent, TabbedPropertySheetWidgetFactory factory)
-	{
-		super.createControls(parent, factory);
-		composite =	getWidgetFactory().createFlatFormComposite(parent);
-		
-		String nameString = WSDLEditorPlugin.getWSDLString("_UI_LABEL_NAME") + ":";
-		String prefixString = WSDLEditorPlugin.getWSDLString("_UI_LABEL_PREFIX") + ":";
-		String namespaceString = WSDLEditorPlugin.getWSDLString("_UI_LABEL_TARGET_NAMESPACE");
-		GC gc = new GC(parent);
-		int xoffset = Math.max(115, gc.textExtent(nameString).x + 20); // adds 20 due to borders
-		xoffset = Math.max(xoffset, gc.textExtent(prefixString).x + 20); // adds 20 due to borders
-		xoffset = Math.max(xoffset, gc.textExtent(namespaceString).x + 20); // adds 20 due to borders
-		gc.dispose();
-
-		// name
-		CLabel nameLabel = getWidgetFactory().createCLabel(composite, nameString); //$NON-NLS-1$
-		nameText = getWidgetFactory().createText(composite, ""); //$NON-NLS-1$
-		
-		// prefix
-		CLabel prefixLabel = getWidgetFactory().createCLabel(composite, prefixString); //$NON-NLS-1$
-		prefixText = getWidgetFactory().createText(composite, ""); //$NON-NLS-1$
-
-		// targetnamespace
-		CLabel targetNamespaceLabel = getWidgetFactory().createCLabel(composite, namespaceString); //$NON-NLS-1$
-		targetNamespaceText = getWidgetFactory().createText(composite, ""); //$NON-NLS-1$
-
-		// Advanced button
-		button = getWidgetFactory().createButton(composite, WSDLEditorPlugin.getWSDLString("_UI_SECTION_ADVANCED_ATTRIBUTES") + "...", SWT.PUSH); //$NON-NLS-1$
-		
-		
-		///////////////////// Labels
-		// name layout
-		FormData dataNameLabel = new FormData();
-		dataNameLabel.top = new FormAttachment(nameText, 0, SWT.CENTER);
-		nameLabel.setLayoutData(dataNameLabel);
-
-		// prefix layout
-		FormData dataPrefixLabel = new FormData();
-		dataPrefixLabel.left = new FormAttachment(0, 0);
-		dataPrefixLabel.top = new FormAttachment(prefixText, 0, SWT.CENTER);
-		prefixLabel.setLayoutData(dataPrefixLabel);
-
-		// targetNamespaceLabel layout
-		FormData datatnsLabel = new FormData();
-		datatnsLabel.left = new FormAttachment(0, 0);
-    datatnsLabel.right = new FormAttachment(targetNamespaceText, 0);
-		datatnsLabel.top = new FormAttachment(targetNamespaceText, 0, SWT.CENTER);
-		targetNamespaceLabel.setLayoutData(datatnsLabel);
-		
-
-		///////////////////// Text Fields
-		// name text field
-		FormData dataNameText = new FormData();
-		dataNameText.left = new FormAttachment(0, xoffset);
-		dataNameText.right = new FormAttachment(100, -rightMarginSpace - ITabbedPropertyConstants.HSPACE);
-		dataNameText.top = new FormAttachment(0, 0);
-		nameText.setLayoutData(dataNameText);
-		nameText.addListener(SWT.Modify, this);
-
-		// prefix text field
-		FormData dataPrefixText = new FormData();
-		dataPrefixText.left = new FormAttachment(0, xoffset);
-		dataPrefixText.right = new FormAttachment(100, -rightMarginSpace - ITabbedPropertyConstants.HSPACE);
-		dataPrefixText.top = new FormAttachment(nameText, +ITabbedPropertyConstants.VSPACE);
-		prefixText.setLayoutData(dataPrefixText);
-		prefixText.addListener(SWT.Modify, this);
-
-		// targetnamespace text field
-		FormData data = new FormData();
-		data.left = new FormAttachment(0, xoffset);
-		data.right = new FormAttachment(100, -rightMarginSpace - ITabbedPropertyConstants.HSPACE);
-		data.top = new FormAttachment(prefixText, +ITabbedPropertyConstants.VSPACE);
-		targetNamespaceText.setLayoutData(data);
-		targetNamespaceText.addListener(SWT.Modify, this);
-		
-		// Advanced button layout
-		FormData dataButton = new FormData();
-//		dataButton.left = new FormAttachment(100, -rightMarginSpace + 2);
-		dataButton.right = new FormAttachment(100, -rightMarginSpace - ITabbedPropertyConstants.HSPACE);
-		dataButton.top = new FormAttachment(targetNamespaceText, +ITabbedPropertyConstants.VSPACE);
-//		dataButton.top = new FormAttachment(targetNamespaceText, 0, SWT.CENTER);
-		button.setLayoutData(dataButton);
-		button.addSelectionListener(this);
-	}
-
-	public void doHandleEvent(Event event)
-	{
-		handlingEvent = true;
-	  if (event.widget == nameText) {
-	  	Object obj = getElement();
-	  	if (obj instanceof Definition) {
-	  		Definition definition = (Definition) obj;
-	  		String uri = "";
-	  		if (definition.getQName() != null) {
-	  			uri = definition.getQName().getNamespaceURI();
-	  		}
-	  		definition.setQName(new QName(uri, nameText.getText()));
-	  	}
-	  }
-	  else if (event.widget == prefixText) {
-	  	Object obj = getElement();
-	  	if (obj instanceof Definition) {
-	  		Definition definition = (Definition) obj;
-	  		Element element = definition.getElement();
-	  		
-	  		// Remove the old prefix
-	  		String oldPrefix = definition.getPrefix(definition.getTargetNamespace());
-	  		element.removeAttribute("xmlns:"+oldPrefix); 
-	  		
-	  		// Set the new prefix
-	  	  	element.setAttribute("xmlns:" + prefixText.getText(), definition.getTargetNamespace());
-	  	}
-	  }
-	  else if (event.widget == targetNamespaceText)
-	  {
-		  Object obj = getElement();
-		  if (obj instanceof Definition)
-		  {
-		    Definition definition = (Definition)obj;
-		    String newValue = targetNamespaceText.getText();
-		    String prefix = definition.getPrefix(definition.getTargetNamespace());
-		    definition.setTargetNamespace(newValue);
-		    definition.getElement().setAttribute("xmlns:" + prefix, newValue);
-		  }
-	  }
-	  handlingEvent = false;		
-	}
-	
-	/*
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.view.ITabbedPropertySection#refresh()
-	 */
-	public void refresh()
-	{
-    super.refresh();
-
-    if (targetNamespaceText.isFocusControl() || handlingEvent)
-    {
-      return;
-    }
-	  setListenerEnabled(false);  
-	  Object obj = getElement();
-	  if (obj instanceof Definition)
-	  {
-	    Definition definition = (Definition)obj;
-	    String targetNS = definition.getTargetNamespace();
-	    
-		// set targetnamespace field and prefix field
-	    if (targetNS != null)
-	    {
-	    	targetNamespaceText.setText(targetNS);
-	    	
-	    	Element element = definition.getElement();
-
-        String newPrefix = definition.getPrefix(targetNS);
-        if (newPrefix == null) newPrefix = "";
-        // TODO: remove this code
-        if (element != null)
-        {
-  	    	for (int index = 0; index < element.getAttributes().getLength(); index++) {
-  	    		AttrImpl attr = (AttrImpl) element.getAttributes().item(index);
-  	    		String nodeName = attr.getNodeName();
-  	    		String nsValue = attr.getNodeValue();
-  	    		if (nsValue.equals(targetNS)) {
-  	    			if (nodeName.indexOf(":") != -1) {
-  	    				String xmlnsString = nodeName.substring(0, nodeName.indexOf(":"));
-  	    				
-  	    				if (xmlnsString.equals("xmlns")) {
-  	    	    			newPrefix = attr.getLocalName();
-  	    	    			break;
-  	    				}
-  	    			}
-  	    		}
-  	    	}
-        }
-	    	prefixText.setText(newPrefix);     
-	    }
-	  }
-	  
-	  // set name field
-	  if (getElement() != null)
-	  {
-	    if (getElement().getElement()!= null)
-	    {
-	      String name = getElement().getElement().getAttribute("name"); //$NON-NLS-1$
-	      if (name==null) name="";
-	      nameText.setText(name);
-	    }
-	  }
-
-    setListenerEnabled(true);
-	}
-	
-	
-  public void widgetSelected(SelectionEvent e)
-  {
-    if (e.widget == button)
-    {
-      Object obj = getElement();
-      if (obj instanceof Definition)
-      {
-        Definition definition = (Definition)obj;
-        EditNamespacesAction action = new EditNamespacesAction(definition);
-      	action.run();
-        refresh();
-      }
-    }
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/NamespaceSectionDescriptor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/NamespaceSectionDescriptor.java
deleted file mode 100644
index eb0ffef34..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/NamespaceSectionDescriptor.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISection;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject;
-
-public class NamespaceSectionDescriptor extends AbstractSectionDescriptor implements ISectionDescriptor
-{
-  /**
-   * 
-   */
-  public NamespaceSectionDescriptor()
-  {
-    super();
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getId()
-   */
-  public String getId()
-  {
-    return "org.eclipse.wst.wsdl.ui.internal.section.namespace";
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getInputTypes()
-   */
-  public List getInputTypes()
-  {
-    List list = new ArrayList();
-    list.add(WSDLGroupObject.class);
-    return list;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getSectionClass()
-   */
-  public ISection getSectionClass()
-  {
-    return new NamespaceSection();
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getTargetTab()
-   */
-  public String getTargetTab()
-  {
-    return "org.eclipse.wst.xmlwebservices.general";
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#appliesTo(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
-   */
-  public boolean appliesTo(IWorkbenchPart part, ISelection selection)
-  {
-    Object object = null;
-    if (selection instanceof StructuredSelection)
-    {
-      StructuredSelection structuredSelection = (StructuredSelection)selection;
-      object = structuredSelection.getFirstElement();
-      if (object instanceof WSDLGroupObject)
-      {
-      	Definition definition = ((WSDLGroupObject) object).getDefinition();
-      	if (definition.getElement() != null) {
-      		return true;
-      	}
-      	
-      	return false;
-      }
-      else if (object instanceof org.eclipse.wst.wsdl.Definition) {
-      	Definition definition = (Definition) object;
-      	if (definition.getElement() != null) {
-      		return true;
-      	}
-      	
-      	return false;
-      }
-    }
-    return false;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getAfterSection()
-   */
-  public String getAfterSection()
-  {
-    return "";
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/PartSection.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/PartSection.java
deleted file mode 100644
index c3936aac5..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/PartSection.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertyConstants;
-import org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.dialogs.InvokeSetDialog;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-
-
-public class PartSection extends AbstractSection
-{
-  CCombo componentNameCombo;
-	CCombo referenceKindCombo;
-  CLabel componentNameLabel;
-  Button button;
-  IEditorPart editorPart;
-
-	public void handleEvent (Event event)
-	{
-    if (event.type == SWT.Modify)
-    {  
-      if (event.widget == referenceKindCombo)
-      {
-        boolean isType = referenceKindCombo.getText().equals(WSDLEditorPlugin.getWSDLString("_UI_LABEL_TYPE")); //$NON-NLS-1$
-        ComponentReferenceUtil.setComponentReference((Part)getElement(), isType, null);
-        refresh();
-      } 
-    }
-
-	}
-
-	/**
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySection#createControls(org.eclipse.swt.widgets.Composite, org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory)
-	 */
-	public void createControls(Composite parent, TabbedPropertySheetWidgetFactory factory)
-	{
-		super.createControls(parent, factory);
-		composite =	getWidgetFactory().createFlatFormComposite(parent);
-
-		FormData data;
-
-		referenceKindCombo = getWidgetFactory().createCCombo(composite);
-		referenceKindCombo.setBackground(composite.getBackground());
-		referenceKindCombo.add(WSDLEditorPlugin.getWSDLString("_UI_LABEL_ELEMENT")); //$NON-NLS-1$
-		referenceKindCombo.add(WSDLEditorPlugin.getWSDLString("_UI_LABEL_TYPE")); //$NON-NLS-1$
-
-		CLabel valueLabel = getWidgetFactory().createCLabel(composite, WSDLEditorPlugin.getWSDLString("_UI_LABEL_REFERENCE_KIND")); //$NON-NLS-1$
-		data = new FormData();
-		data.left = new FormAttachment(0, 0);
-		data.right = new FormAttachment(referenceKindCombo, -ITabbedPropertyConstants.HSPACE);
-		data.top = new FormAttachment(referenceKindCombo, 0, SWT.CENTER);
-		valueLabel.setLayoutData(data);
-
-    componentNameCombo = getWidgetFactory().createCCombo(composite);
-    componentNameCombo.setBackground(composite.getBackground());
-    componentNameCombo.addListener(SWT.Modify, this);
-    componentNameCombo.addSelectionListener(this);
-
-    componentNameLabel = getWidgetFactory().createCLabel(composite, WSDLEditorPlugin.getWSDLString("_UI_LABEL_ELEMENT") + ":"); //$NON-NLS-1$
-		data = new FormData();
-		data.left = new FormAttachment(0, 0);
-		data.right = new FormAttachment(componentNameCombo, -ITabbedPropertyConstants.HSPACE);
-		data.top = new FormAttachment(componentNameCombo, 0, SWT.CENTER);
-		componentNameLabel.setLayoutData(data);
-		
-    button = getWidgetFactory().createButton(composite, "", SWT.PUSH); //$NON-NLS-1$
-    button.setImage(WSDLEditorPlugin.getInstance().getImage("icons/browsebutton.gif")); //$NON-NLS-1$
-
-    button.addSelectionListener(this);
-		data = new FormData();
-		data.left = new FormAttachment(100, -rightMarginSpace + 2);
-		data.right = new FormAttachment(100, 0);
-		data.top = new FormAttachment(componentNameCombo, 0, SWT.CENTER);
-		button.setLayoutData(data);
-		
-    data = new FormData();
-    data.left = new FormAttachment(0, 100);
-    data.right = new FormAttachment(100, -rightMarginSpace - ITabbedPropertyConstants.HSPACE);
-    data.top = new FormAttachment(0, 0);
-    referenceKindCombo.setLayoutData(data);
-    
-    data = new FormData();
-    data.left = new FormAttachment(0, 100);
-    data.right = new FormAttachment(button, 0);
-    data.top = new FormAttachment(referenceKindCombo, +ITabbedPropertyConstants.VSPACE);
-    componentNameCombo.setLayoutData(data);
-
-    referenceKindCombo.addListener(SWT.Modify, this);
-	}
-
-	/*
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.view.ITabbedPropertySection#refresh()
-	 */
-	public void refresh()
-	{
-    super.refresh();
-	  referenceKindCombo.removeListener(SWT.Modify, this);
-		if (((Part)getElement()).getTypeDefinition() != null)
-		{
-		  referenceKindCombo.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_TYPE")); //$NON-NLS-1$
-		}
-		else
-		{
-		  referenceKindCombo.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_ELEMENT")); //$NON-NLS-1$
-		}
-		
-    try
-    {
-      Part part = (Part)getElement();
-      boolean isType = ComponentReferenceUtil.isType(part);
-      String value = ComponentReferenceUtil.getPartComponentReference(part);
-
-      // update the combo-box content
-      //
-      componentNameCombo.removeAll(); 
-      List compList = ComponentReferenceUtil.getComponentNameList(part, isType);
-      if (compList != null)
-      {
-        for (Iterator iterator =  compList.iterator(); iterator.hasNext();)
-        {
-          componentNameCombo.add((String)iterator.next());
-        }
-      } 
-      
-      if (isType)
-      {                                                 
-        referenceKindCombo.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_TYPE")); //$NON-NLS-1$
-        componentNameLabel.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_TYPE") + ":");  //$NON-NLS-1$
-        componentNameCombo.setText(value != null ? value : ""); //$NON-NLS-1$
-//        button.setReferenceKind("type");
-      }
-      else
-      {
-        referenceKindCombo.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_ELEMENT"));  //$NON-NLS-1$
-        componentNameLabel.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_ELEMENT") + ":");  //$NON-NLS-1$
-        componentNameCombo.setText(value != null ? value : ""); //$NON-NLS-1$
-        
-//        button.setReferenceKind("element");
-      }                                                        
-//      button.setInput(input);
-//      button.setEditor(editorPart);
-      
-    }
-    catch (Exception e)
-    {
-      e.printStackTrace();
-    }
-    finally
-    {
-  		referenceKindCombo.addListener(SWT.Modify, this);
-    }
-	}
-
-  /**
-   * @see org.eclipse.swt.events.SelectionListener#widgetSelected(SelectionEvent)
-   */
-  public void widgetSelected(SelectionEvent e)
-  {
-    Part part = (Part)getElement();
-    boolean isType = referenceKindCombo.getText().equals(WSDLEditorPlugin.getWSDLString("_UI_LABEL_TYPE")); //$NON-NLS-1$
-    if (e.widget == componentNameCombo)
-    {                                                      
-      ComponentReferenceUtil.setComponentReference(part, isType, componentNameCombo.getText());
-      refresh();
-    }
-    else if (e.widget == button)
-    {
-        InvokeSetDialog dialog = new InvokeSetDialog();
-          
-        if (getElement() instanceof Part)
-        {
-            dialog.setReferenceKind(referenceKindCombo.getText());
-        }
-        dialog.setReferenceKind(referenceKindCombo.getText());
-        dialog.run(getElement(), editorPart);
-        
-        WSDLEditor editor = (WSDLEditor) editorPart;
-        editor.getSelectionManager().setSelection(new StructuredSelection(getElement()));
-    }
-  }
-  
-  public void setEditorPart(IEditorPart editorPart)
-  {
-    this.editorPart = editorPart;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/PartSectionDescriptor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/PartSectionDescriptor.java
deleted file mode 100644
index 78f601215..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/PartSectionDescriptor.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISection;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor;
-import org.eclipse.wst.wsdl.Part;
-
-
-public class PartSectionDescriptor extends AbstractSectionDescriptor implements ISectionDescriptor
-{
-  PartSection partSection;
-  /**
-   * 
-   */
-  public PartSectionDescriptor()
-  {
-    super();
-    partSection = new PartSection();
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getId()
-   */
-  public String getId()
-  {
-    return "org.eclipse.wst.wsdl.ui.internal.section.part";
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getInputTypes()
-   */
-  public List getInputTypes()
-  {
-    List list = new ArrayList();
-    list.add(Part.class);
-    return list;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getSectionClass()
-   */
-  public ISection getSectionClass()
-  {
-    return partSection;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getTargetTab()
-   */
-  public String getTargetTab()
-  {
-    return "org.eclipse.wst.xmlwebservices.general";
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#appliesTo(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
-   */
-  public boolean appliesTo(IWorkbenchPart part, ISelection selection)
-  {
-    partSection.setEditorPart(part.getSite().getWorkbenchWindow().getActivePage().getActiveEditor());
-    Object object = null;
-    if (selection instanceof StructuredSelection)
-    {
-      StructuredSelection structuredSelection = (StructuredSelection)selection;
-      object = structuredSelection.getFirstElement();
-      if (object instanceof Part)
-      {
-        return true;
-      }
-    }
-    return false;
-  }
-  
-  public String getAfterSection()
-  {
-    return "org.eclipse.wst.wsdl.ui.internal.section.name";
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ReferenceSection.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ReferenceSection.java
deleted file mode 100644
index dffb3df1f..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ReferenceSection.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import java.util.List;
-
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertyConstants;
-import org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.MessageReference;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.dialogs.InvokeSetDialog;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.eclipse.wst.wsdl.ui.internal.viewers.widgets.ComponentNameComboHelper;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-
-public class ReferenceSection extends AbstractSection
-{
-  protected CCombo componentNameCombo; 
-  protected ComponentNameComboHelper componentNameComboHelper;
-  Button button;
-  IEditorPart editorPart;
-  CLabel messageLabel;
-  
-	/**
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySection#createControls(org.eclipse.swt.widgets.Composite, org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory)
-	 */
-	public void createControls(Composite parent, TabbedPropertySheetWidgetFactory factory)
-	{
-		super.createControls(parent, factory);
-		composite = getWidgetFactory().createFlatFormComposite(parent);
-		FormData data;
-    
-    messageLabel = getWidgetFactory().createCLabel(composite, WSDLEditorPlugin.getWSDLString("_UI_LABEL_MESSAGE")); //$NON-NLS-1$
-    componentNameCombo = getWidgetFactory().createCCombo(composite);
-    componentNameCombo.setBackground(composite.getBackground());
-    button = getWidgetFactory().createButton(composite, "", SWT.PUSH); //$NON-NLS-1$
-    button.setImage(WSDLEditorPlugin.getInstance().getImage("icons/browsebutton.gif")); //$NON-NLS-1$
-    button.addSelectionListener(this);
-
-		data = new FormData();
-		data.left = new FormAttachment(0, 0);
-		data.right = new FormAttachment(componentNameCombo, -ITabbedPropertyConstants.HSPACE);
-		data.top = new FormAttachment(componentNameCombo, 0, SWT.CENTER);
-		messageLabel.setLayoutData(data);
-		
-		data = new FormData();
-		data.left = new FormAttachment(100, -rightMarginSpace + 2);
-		data.right = new FormAttachment(100,0);
-		data.top = new FormAttachment(componentNameCombo, 0, SWT.CENTER);
-		button.setLayoutData(data);
-    
-    data = new FormData();
-    data.left = new FormAttachment(0, 100);
-    data.right = new FormAttachment(button, 0);
-    componentNameCombo.setLayoutData(data);
-    
-    componentNameCombo.addListener(SWT.Modify, this);
-	}
-
-	/*
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.view.ITabbedPropertySection#refresh()
-	 */
-	public void refresh()
-	{
-    super.refresh();
-	  setListenerEnabled(false);  
-	  componentNameCombo.removeListener(SWT.Modify, this);
-	  Object obj = getElement();
-	  if (obj instanceof MessageReference)
-	  {
-	    messageLabel.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_MESSAGE")); //$NON-NLS-1$
-	    componentNameComboHelper = new ComponentNameComboHelper(componentNameCombo)
-	    {
-	      protected List getComponentNameList(ComponentReferenceUtil util)
-	      {
-	        return util.getMessageNames();
-	      }
-
-	      protected String getAttributeName()
-	      {
-	        return WSDLConstants.MESSAGE_ATTRIBUTE;
-	      }
-	    };
-
-	  }
-	  else if (obj instanceof Binding)
-	  {
-	    componentNameComboHelper = new ComponentNameComboHelper(componentNameCombo)
-	    {
-	      protected List getComponentNameList(ComponentReferenceUtil util)
-	      {
-	        return util.getPortTypeNames();
-	      }
-
-	      protected String getAttributeName()
-	      {
-	        return WSDLConstants.TYPE_ATTRIBUTE;
-	      }
-	    };
-
-	    messageLabel.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_PORTTYPE")); //$NON-NLS-1$
-	  }
-	  else if (obj instanceof Port)
-	  {
-	    componentNameComboHelper = new ComponentNameComboHelper(componentNameCombo)
-	    {
-	      protected List getComponentNameList(ComponentReferenceUtil util)
-	      {
-	        return util.getBindingNames();
-	      }
-
-	      protected String getAttributeName()
-	      {
-	        return WSDLConstants.BINDING_ATTRIBUTE;
-	      }
-	    };
-	    messageLabel.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_BINDING")); //$NON-NLS-1$
-	  }
-	  
-    componentNameComboHelper.update(getElement());
-    setListenerEnabled(true);
-    componentNameCombo.addListener(SWT.Modify, this);
-	}
-
-  public void widgetSelected(SelectionEvent e)
-  {
-    if (e.widget == button)
-    {
-        InvokeSetDialog dialog = new InvokeSetDialog();
-        dialog.run(getElement(), editorPart);
-        
-        WSDLEditor editor = (WSDLEditor) editorPart;
-        editor.getSelectionManager().setSelection(new StructuredSelection(getElement()));
-    }
-  }
-	
-  public void handleEvent(Event event)
-  {
-    componentNameComboHelper.handleEventHelper(getElement().getElement(), event);
-  }
-  
-  public void setEditorPart(IEditorPart editorPart)
-  {
-    this.editorPart = editorPart;
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ReferenceSectionDescriptor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ReferenceSectionDescriptor.java
deleted file mode 100644
index 7978dc9b8..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ReferenceSectionDescriptor.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISection;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.MessageReference;
-import org.eclipse.wst.wsdl.Port;
-
-
-public class ReferenceSectionDescriptor extends AbstractSectionDescriptor implements ISectionDescriptor
-{
-  ReferenceSection referenceSection;
-  
-  /**
-   * 
-   */
-  public ReferenceSectionDescriptor()
-  {
-    super();
-    this.referenceSection = new ReferenceSection(); 
-  }
-
-
-  /**
-   * 
-   */
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getId()
-   */
-  public String getId()
-  {
-    return "org.eclipse.wst.wsdl.ui.internal.section.reference";
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getInputTypes()
-   */
-  public List getInputTypes()
-  {
-    List list = new ArrayList();
-    list.add(MessageReference.class);
-    list.add(Binding.class);
-    list.add(Port.class);
-    return list;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getSectionClass()
-   */
-  public ISection getSectionClass()
-  {
-    return referenceSection;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getTargetTab()
-   */
-  public String getTargetTab()
-  {
-    return "org.eclipse.wst.xmlwebservices.general";
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#appliesTo(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
-   */
-  public boolean appliesTo(IWorkbenchPart part, ISelection selection)
-  {
-    referenceSection.setEditorPart(part.getSite().getWorkbenchWindow().getActivePage().getActiveEditor());
-    Object object = null;
-    if (selection instanceof StructuredSelection)
-    {
-      StructuredSelection structuredSelection = (StructuredSelection)selection;
-      object = structuredSelection.getFirstElement();
-      if (object instanceof MessageReference || object instanceof Binding || object instanceof Port)
-      {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  public String getAfterSection()
-  {
-    return "org.eclipse.wst.wsdl.ui.internal.section.name";
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/TextChangeHelper.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/TextChangeHelper.java
deleted file mode 100644
index 124ed18cd..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/TextChangeHelper.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-
-/**
- * TextChangeHelper notifies the listner of text lifecycle events 
- * on behalf of the widget(s) it listens to. 
- * 
- * @author Anthony Hunter 
- * <a href="mailto:anthonyh@ca.ibm.com">anthonyh@ca.ibm.com</a>
- */
-public abstract class TextChangeHelper implements Listener {
-	
-	private boolean nonUserChange;
-
-	/**
-	 * Marks the start of a programmatic change to the widget contents.
-	 * Clients must call startNonUserChange() before directly setting 
-	 * the widget contents to avoid unwanted lifecycle events.
-	 * @throws IllegalArgumentException if a programmatic change is 
-	 * already in progress.
-	 */
-	public void startNonUserChange() {
-		if (nonUserChange)
-			throw new IllegalStateException("we already started a non user change");//$NON-NLS-1$
-		nonUserChange = true;
-	}
-
-	/**
-	 * Clients who call startNonUserChange() should call 
-	 * finishNonUserChange() as soon as possible after the change is done.
-	 * @throws IllegalArgumentException if no change is in progress.
-	 */
-	public void finishNonUserChange() {
-		if (!nonUserChange)
-			throw new IllegalStateException("we are not in a non user change");//$NON-NLS-1$
-		nonUserChange = false;
-	}
-
-	/**
-	 * Returns true if a programmatic change is in progress.
-	 */
-	public boolean isNonUserChange() {
-		return nonUserChange;
-	}
-
-	/**
-	 * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
-	 */
-	public void handleEvent(Event event) {
-		switch (event.type) {
-			case SWT.KeyDown :
-				if (event.character == SWT.CR)
-					textChanged((Control)event.widget);
-				break;
-			case SWT.FocusOut :
-				textChanged((Control)event.widget);
-				break;
-		}
-	}
-
-	/**
-	 * Abstract method notified when a text field has been changed.
-	 * @param control
-	 */
-	public abstract void textChanged(Control control);
-
-	/**
-	 * Registers this helper with the given control to listen for events
-	 * which indicate that a change is in progress (or done).
-	 */
-	public void startListeningTo(Control control) {
-		control.addListener(SWT.FocusOut, this);
-		control.addListener(SWT.Modify, this);
-	}
-
-	/**
-	 * Registers this helper with the given control to listen for the
-	 * Enter key.  When Enter is pressed, the change is considered done 
-	 * (this is only appropriate for single-line Text widgets).
-	 */
-	public void startListeningForEnter(Control control) {
-		// NOTE: KeyDown rather than KeyUp, because of similar usage in CCombo. 
-		control.addListener(SWT.KeyDown, this);
-	}
-
-	/**
-	 * Unregisters this helper from a control previously passed to
-	 * startListeningTo() and/or startListeningForEnter().
-	 */
-	public void stopListeningTo(Control control) {
-		control.removeListener(SWT.FocusOut, this);
-		control.removeListener(SWT.Modify, this);
-		control.removeListener(SWT.KeyDown, this);
-	}
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/WSDLLabelProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/WSDLLabelProvider.java
deleted file mode 100644
index a5de0b653..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/WSDLLabelProvider.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtension;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtensionRegistry;
-import org.eclipse.wst.wsdl.ui.internal.graph.model.WSDLGraphModelAdapterFactory;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapter;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapterFactory;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLModelAdapterFactory;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.w3c.dom.Element;
-
-public class WSDLLabelProvider extends LabelProvider
-{
-  protected ModelAdapterFactory adapterFactory = new WSDLModelAdapterFactory();
-	private WSDLTypeMapper typeMapper;
-	
-  protected WSDLEditorExtension[] labelProviderExtensions;
-  protected LabelProvider[] labelProviders;
-  IEditorPart editorPart;
-
-  /**
-   * 
-   */
-  public WSDLLabelProvider()
-  {
-    super();
-    typeMapper = new WSDLTypeMapper();
-    editorPart = WSDLEditorPlugin.getInstance().getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-    WSDLEditorExtensionRegistry registry = WSDLEditorPlugin.getInstance().getWSDLEditorExtensionRegistry(); 
-    labelProviderExtensions = registry.getRegisteredExtensions(WSDLEditorExtension.OUTLINE_LABEL_PROVIDER); 
-    labelProviders = new LabelProvider[labelProviderExtensions.length]; 
-    for (int i = 0; i < labelProviderExtensions.length; i++)
-    {
-      labelProviders[i] = (LabelProvider)labelProviderExtensions[i].createExtensionObject(WSDLEditorExtension.OUTLINE_LABEL_PROVIDER, (WSDLEditor)editorPart);
-    }
-  }
-
-	/**
-	 * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
-	 */
-	public Image getImage(Object object)
-	{
-		if (object == null || object.equals(StructuredSelection.EMPTY)) {
-			return null;
-		}
-    Image result = null;           
-    if (object instanceof StructuredSelection)
-    {
-      Object selected = ((StructuredSelection)object).getFirstElement();
-      selected  = typeMapper.remapObject(selected);
-      for (int i = 0; i < labelProviders.length; i++)
-      {
-        result = labelProviders[i].getImage(selected);
-        if (result!=null)
-        break;
-      }
-//      if (result != null)
-//      {
-//        ModelAdapter modelAdapter = adapterFactory.getAdapter(selected);
-//        if (modelAdapter != null)
-//        {
-//          result = (Image)modelAdapter.getProperty(selected, ModelAdapter.IMAGE_PROPERTY);     
-//        }
-//      }
-    }
-    return result;
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
-	 */
-	public String getText(Object object)
-	{
-		if (object == null || object.equals(StructuredSelection.EMPTY)) {
-			return "No items selected";//$NON-NLS-1$
-		}
-    String result = null;
-    Object selected = null;
-    if (object instanceof StructuredSelection)
-    {
-      selected = ((StructuredSelection)object).getFirstElement();
-      selected  = typeMapper.remapObject(selected);
-      
-      // Override outline provider's getText for WSDLElements
-      if (selected instanceof WSDLElement)
-      {
-      	if (((WSDLElement)selected).getElement() == null) {
-      		return "";
-      	}
-        boolean isReadOnly = false;
-        ModelAdapter adapter = WSDLGraphModelAdapterFactory.getWSDLGraphModelAdapterFactory().getAdapter(selected);
-        if (adapter != null)
-        {
-          isReadOnly = Boolean.TRUE.equals(adapter.getProperty(selected, "isReadOnly"));
-        }
-        if (isReadOnly)
-        {
-          result = ((WSDLElement)selected).getElement().getLocalName() + " (" + WSDLEditorPlugin.getWSDLString("_UI_LABEL_READ_ONLY") + ")";   //$NON-NLS-1$
-        }
-        else
-        {
-          result = ((WSDLElement)selected).getElement().getLocalName();
-        }
-        return result;
-      }
-      else if (selected instanceof XSDConcreteComponent)
-      {
-        // Override for XSD Components
-       
-        Element element = ((XSDConcreteComponent)selected).getElement();
-        if (element != null)
-        {
-          if (element instanceof IDOMNode)
-          {
-            return ((XSDConcreteComponent)selected).getElement().getLocalName();
-          }
-          else
-          {
-            return ((XSDConcreteComponent)selected).getElement().getLocalName() + " (" + WSDLEditorPlugin.getWSDLString("_UI_LABEL_READ_ONLY") + ")";   //$NON-NLS-1$
-          }
-        }
-        else
-        {
-          return "(" + WSDLEditorPlugin.getWSDLString("_UI_LABEL_READ_ONLY") + ")";  //$NON-NLS-1$
-        }
-
-      }
-      // otherwise get it from the extensions
-      for (int i = 0; i < labelProviders.length; i++)
-      {
-        result = labelProviders[i].getText(selected);
-        if (result!=null)
-        break;
-      }
-    }
-    else if (object instanceof TextSelection)
-    {
-    }
-    
-
-    return result;
-	}
-
-	/**
-	 * Determine if a multiple object selection has been passed to the 
-	 * label provider. If the objects is a IStructuredSelection, see if 
-	 * all the objects in the selection are the same and if so, we want
-	 * to provide labels for the common selected element.
-	 * @param objects a single object or a IStructuredSelection.
-	 * @param multiple first element in the array is true if there is multiple
-	 * unequal selected elements in a IStructuredSelection.
-	 * @return the object to get labels for.
-	 */
-//	private Object getObject(Object objects, boolean multiple[]) {
-//		Assert.isNotNull(objects);
-//		Object object = null;
-//		return object;
-//	}
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/WSDLSectionDescriptorProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/WSDLSectionDescriptorProvider.java
deleted file mode 100644
index 73d165899..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/WSDLSectionDescriptorProvider.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptorProvider;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtension;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtensionRegistry;
-
-public class WSDLSectionDescriptorProvider implements ISectionDescriptorProvider
-{
-  protected WSDLEditorExtension[] propertySectionDescriptorProviderExtensions;
-  protected ISectionDescriptorProvider[] propertySectionDescriptorProviders;
-
-  protected WSDLEditorExtension[] labelProviderExtensions;
-
-  protected final static Object[] EMPTY_ARRAY = {};
-  
-  IEditorPart editorPart;
-
-  /**
-   * 
-   */
-  public WSDLSectionDescriptorProvider()
-  {
-    super();
-    // TODO Check this
-    this.editorPart = WSDLEditorPlugin.getInstance().getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptorProvider#getSectionDescriptors()
-   */
-  public ISectionDescriptor[] getSectionDescriptors()
-  {
-    List list = new ArrayList();
-    
-    
-    WSDLEditorExtensionRegistry registry = WSDLEditorPlugin.getInstance().getWSDLEditorExtensionRegistry(); 
-
-    propertySectionDescriptorProviderExtensions = registry.getRegisteredExtensions(WSDLEditorExtension.PROPERTY_SECTION_DESCRIPTOR_PROVIDER); 
-    propertySectionDescriptorProviders = new ISectionDescriptorProvider[propertySectionDescriptorProviderExtensions.length]; 
-    for (int i = 0; i < propertySectionDescriptorProviderExtensions.length; i++)
-    {
-      propertySectionDescriptorProviders[i] = (ISectionDescriptorProvider)propertySectionDescriptorProviderExtensions[i].createExtensionObject(WSDLEditorExtension.PROPERTY_SECTION_DESCRIPTOR_PROVIDER, (WSDLEditor)editorPart);
-      
-      ISectionDescriptor [] extensionSectionDescriptors = propertySectionDescriptorProviders[i].getSectionDescriptors();
-      for (int j = 0; j < extensionSectionDescriptors.length; j++)
-      {
-        list.add(extensionSectionDescriptors[j]);
-      }
-    }
-
-    
-    list.add(new NameSectionDescriptor());
-    list.add(new PartSectionDescriptor());
-    list.add(new DocumentationSectionDescriptor());
-    list.add(new ReferenceSectionDescriptor());
-    list.add(new NamespaceSectionDescriptor());
-    list.add(new ExtensibilityElementSectionDescriptor());
-    list.add(new ImportSectionDescriptor());
-    
-		ISectionDescriptor[] descriptors = new ISectionDescriptor[list.size()];
-	  list.toArray(descriptors);
-
-    return descriptors;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/WSDLTabbedPropertySheetPage.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/WSDLTabbedPropertySheetPage.java
deleted file mode 100644
index 9952f86b8..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/WSDLTabbedPropertySheetPage.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySheetPageContributor;
-import org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetPage;
-import org.eclipse.wst.sse.ui.internal.view.events.INodeSelectionListener;
-import org.eclipse.wst.sse.ui.internal.view.events.NodeSelectionChangedEvent;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLSelectionManager;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapter;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapterListener;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLModelAdapterFactory;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.xsd.ui.internal.graph.model.XSDModelAdapterFactory;
-import org.eclipse.xsd.XSDComponent;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class WSDLTabbedPropertySheetPage extends TabbedPropertySheetPage implements ISelectionChangedListener, INodeSelectionListener, ModelAdapterListener, org.eclipse.wst.xsd.ui.internal.graph.model.ModelAdapterListener 
-{
-  private WSDLSelectionManager fViewerSelectionManager;
-  private WSDLEditor wsdlEditor;
-  private Object currentObject;
-
-  /**
-   * @param tabbedPropertySheetPageContributor
-   */
-  public WSDLTabbedPropertySheetPage(ITabbedPropertySheetPageContributor tabbedPropertySheetPageContributor, WSDLEditor editor)
-  {
-    super(tabbedPropertySheetPageContributor);
-    this.wsdlEditor = editor;
-  }
-  
-  public void createControl(Composite parent) {
-  	super.createControl(parent);
-  	wsdlEditor.getSelectionManager().setSelection(new StructuredSelection(wsdlEditor.getDefinition()));
-  }
-  
-	public void setSelectionManager(WSDLSelectionManager viewerSelectionManager) {
-		// disconnect from old one
-		if (fViewerSelectionManager != null) {
-			fViewerSelectionManager.removeSelectionChangedListener(this);
-		}
-
-		fViewerSelectionManager = viewerSelectionManager;
-
-		// connect to new one
-		if (fViewerSelectionManager != null) {
-			fViewerSelectionManager.addSelectionChangedListener(this);
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
-	 */
-	public void selectionChanged(SelectionChangedEvent event)
-	{
-		if (!event.getSelection().isEmpty()) {
-			selectionChanged(getSite().getWorkbenchWindow().getActivePage().getActivePart(), event.getSelection());
-		    //super.selectionChanged(getSite().getWorkbenchWindow().getActivePage().getActivePart(), event.getSelection());
-		}
-	}
-  
-  public void selectionChanged(IWorkbenchPart part, ISelection selection)
-  {
-    // override for category
-    if (selection != null)
-    {
-      if (selection instanceof StructuredSelection)
-      {
-        StructuredSelection structuredSelection = (StructuredSelection)selection;
-        if (structuredSelection.isEmpty())
-        {
-          return;
-        }
-        Object obj = structuredSelection.getFirstElement();
-        Node node = WSDLEditorUtil.getInstance().getNodeForObject(obj);
-        Object o = WSDLEditorUtil.getInstance().findModelObjectForElement(wsdlEditor.getDefinition(), (Element)node);
-        
-        // bad hack to get schema from category
-        // until we provide a better mechanism (selection manager extension)
-        // see also WSDLGraphViewer
-        if (o instanceof XSDSchemaExtensibilityElement)
-        {
-          obj = ((XSDSchemaExtensibilityElement)o).getSchema();
-          selection = new StructuredSelection(obj);
-        } 
-      	
-        attachListener(o);
-      }
-      else if (selection instanceof TextSelection)
-      {
-        return;
-      }
-    }
-    
-    super.selectionChanged(wsdlEditor.getEditorPart(), selection);   // event.getSelection()); 
-  }
-  
-  protected void attachListener(Object object)
-  {
-  	WSDLModelAdapterFactory adapterFactory = WSDLModelAdapterFactory.getWSDLModelAdapterFactory();
-    ModelAdapter adapter = adapterFactory.getAdapter(object);
-    if (adapter != null)
-    {
-    	// remove listener from the previously selected object
-    	removeListener(currentObject);
-    	
-    	// add listener to the newly selected object
-    	adapter.addListener(this);
-    	currentObject = object;
-    }
-    else if (object instanceof XSDComponent && XSDModelAdapterFactory.getAdapter(object) != null) {
-    	// Maybe it's an XSD Object
-    	if (currentObject != null) {
-    		org.eclipse.wst.xsd.ui.internal.graph.model.ModelAdapter xsdAdapter = (org.eclipse.wst.xsd.ui.internal.graph.model.ModelAdapter)XSDModelAdapterFactory.getAdapter(currentObject);
-    	  if (xsdAdapter != null)
-    		xsdAdapter.removeListener(this);
-    	}
-   	
-    	XSDModelAdapterFactory.getAdapter(object).addListener(this);
-    	currentObject = object;
-    }
-  } 
-  
-  protected void removeListener(Object object)
-  {
-  	WSDLModelAdapterFactory adapterFactory = WSDLModelAdapterFactory.getWSDLModelAdapterFactory();
-    ModelAdapter adapter = adapterFactory.getAdapter(object);
-    if (adapter != null)
-    {
-      adapter.removeListener(this);
-      currentObject = null;
-    }
-    else if (object instanceof XSDComponent && XSDModelAdapterFactory.getAdapter(object) != null) {
-    	// Maybe it's an XSD Object
-    	XSDModelAdapterFactory.getAdapter(object).removeListener(this);
-    	currentObject = null;
-    }
-  }
-	public void dispose() {
-		// disconnect from the ViewerSelectionManager
-		if (fViewerSelectionManager != null) {
-			fViewerSelectionManager.removeSelectionChangedListener(this);
-		}
-		
-		// disconnect listener from the current object
-		if (currentObject != null) {
-			removeListener(currentObject);
-		}
-
-		super.dispose();
-	}
-
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.sse.editor.view.events.INodeSelectionListener#nodeSelectionChanged(org.eclipse.wst.sse.editor.view.events.NodeSelectionChangedEvent)
-   */
-  public void nodeSelectionChanged(NodeSelectionChangedEvent event)
-  {
-  }
-  
-  public void propertyChanged(Object object, String property) {
-  	if (getCurrentTab() != null) {
-  		refresh();
-  	}
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/WSDLTypeMapper.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/WSDLTypeMapper.java
deleted file mode 100644
index 37ed0556c..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/WSDLTypeMapper.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import org.eclipse.wst.common.ui.properties.internal.provisional.ITypeMapper;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject;
-
-public class WSDLTypeMapper implements ITypeMapper
-{
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITypeMapper#remapType(java.lang.Object, java.lang.Class)
-   */
-  public Class remapType(Object object, Class effectiveType)
-  {
-		Class type = effectiveType;
-		
-		if (object instanceof WSDLGroupObject) {
-			type = ((WSDLGroupObject) object).getDefinition().getClass();
-		}
-
-		return type;
-  }
-  
-  public Object remapObject(Object object)
-  {
-    Object type = object;
-    
-    if (object instanceof WSDLGroupObject)
-    {
-      type = ((WSDLGroupObject) object).getDefinition();
-    }
-    return type;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/reconciler/DelegatingSourceValidatorForWSDL.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/reconciler/DelegatingSourceValidatorForWSDL.java
deleted file mode 100644
index f251731db..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/reconciler/DelegatingSourceValidatorForWSDL.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.reconciler;
-
-import org.eclipse.wst.validation.internal.ValidationRegistryReader;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-import org.eclipse.wst.xml.ui.internal.validation.DelegatingSourceValidator;
-
-/**
- * 
- */
-public class DelegatingSourceValidatorForWSDL extends DelegatingSourceValidator
-{
-
-  final private static String VALIDATOR_CLASS = "org.eclipse.wst.wsdl.validation.internal.ui.eclipse.Validator"; 
-
-  public DelegatingSourceValidatorForWSDL()
-  { super();
-  }
-  
-  protected IValidator getDelegateValidator()
-  {
-    try
-    {
-    ValidationRegistryReader registry = ValidationRegistryReader.getReader();
-      return registry.getValidator(VALIDATOR_CLASS);
-    }
-    catch (Exception e)
-    { //
-    } 
-    return null;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/reconciler/ExtensibleNodeReconciler.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/reconciler/ExtensibleNodeReconciler.java
deleted file mode 100644
index 58a0759d0..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/reconciler/ExtensibleNodeReconciler.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.reconciler;
-
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.extension.INodeReconciler;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtension;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtensionRegistry;
-import org.w3c.dom.Element;
-
-                                    
-
-// TODO.. we should probably be keying off of the node's qname (perhaps supporting 'null' as a wild card for local names) 
-// in order to compute an applicable reconciler
-//
-public class ExtensibleNodeReconciler
-{  
-  protected WSDLEditorExtension[] extensions;
-  protected INodeReconciler[] reconcilers;
-
-  public ExtensibleNodeReconciler()
-  {                                  
-    WSDLEditorExtensionRegistry registry = WSDLEditorPlugin.getInstance().getWSDLEditorExtensionRegistry();
-    extensions = registry.getRegisteredExtensions(WSDLEditorExtension.NODE_RECONCILER); 
-    reconcilers = new INodeReconciler[extensions.length]; 
-    for (int i = 0; i < extensions.length; i++)
-    {
-      reconcilers[i] = (INodeReconciler)extensions[i].createExtensionObject(WSDLEditorExtension.NODE_RECONCILER, null);
-    }
-  }         
-
-  protected INodeReconciler getApplicableNodeReconciler(Object object)
-  {
-    INodeReconciler reconciler = null;
-    for (int i = 0; i < extensions.length; i++)
-    {
-      if (extensions[i].isApplicable(object))
-      {
-        reconciler = reconcilers[i];
-        if (reconciler != null)
-        {
-          break;
-        }
-      }
-    }
-    return reconciler;
-  }
-
-  public void notifyChanged(Object modelObject, Element element, int eventType, Object feature, Object oldValue, Object newValue, int index)             
-  {
-    INodeReconciler reconciler = getApplicableNodeReconciler(modelObject);
-    if (reconciler != null)
-    {                                                    
-      reconciler.notifyChanged(modelObject, element, eventType, feature, oldValue, newValue, index);
-    }
-  }                                         
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/reconciler/SEDDocumentAdapter.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/reconciler/SEDDocumentAdapter.java
deleted file mode 100644
index 10c5dd5cc..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/reconciler/SEDDocumentAdapter.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.reconciler;    
-
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.internal.impl.DefinitionImpl;
-import org.eclipse.wst.wsdl.internal.impl.WSDLElementImpl;
-import org.eclipse.wst.wsdl.internal.impl.XSDSchemaExtensibilityElementImpl;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.impl.XSDSchemaImpl;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-public class SEDDocumentAdapter
-{
-  protected Document document;                               
-  protected Definition definition;   
-  protected ExtensibleNodeReconciler extensibleNodeReconciler;
-  
-  public SEDDocumentAdapter(IStructuredModel model, Definition definition)
-  {           
-    this.document = (model instanceof IDOMModel) ? ((IDOMModel)model).getDocument() : null;     
-    this.definition = definition;
-    this.extensibleNodeReconciler = new ExtensibleNodeReconciler();
-    new MyDocumentAdapter(document);
-  }  
- 
-
-  class MyDocumentAdapter extends DocumentAdapter
-  {
-//    private boolean isValidDefinition = true;
-    
-    MyDocumentAdapter(Document document)
-    {
-      super(document);
-    }   
-        
-    public void notifyChanged(INodeNotifier notifier, int eventType, Object feature, Object oldValue, Object newValue, int index) 
-    {                      
-      if (eventType == INodeNotifier.ADD)
-      {
-        if (newValue instanceof Element)
-        {
-          adapt((Element)newValue);
-
-          // See Bug 5366
-          // We need to sync up the Model and the DOM
-          Element newDocumentElement = (Element)newValue;
-          String wsdlPrefix = newDocumentElement.getPrefix();
-          if (wsdlPrefix == null) wsdlPrefix = "";
-          String ns = definition.getNamespace(wsdlPrefix);
-          if (ns != null && ns.equals(WSDLConstants.WSDL_NAMESPACE_URI)
-             && newDocumentElement.getLocalName().equals(WSDLConstants.DEFINITION_ELEMENT_TAG)) // &&
-             // !isValidDefinition)
-          {
-//            System.out.println("****** Setting new definition");
-            definition.setElement(newDocumentElement);
-          }
-        }
-      }   
-  
-      switch (eventType)
-      {                  
-        // we make the assumption that reconciling will only be triggered by one of these notifications 
-        // (ADD and REMOVE notifications are omitted)
-        //
-        case INodeNotifier.CHANGE: 
-        case INodeNotifier.STRUCTURE_CHANGED:
-        case INodeNotifier.CONTENT_CHANGED:
-        {                      
-          if (notifier instanceof Element)
-          {
-            reconcileModelObjectForElement((Element)notifier, eventType, feature, oldValue, newValue, index);
-          }
-          else if (notifier instanceof Document)
-          {
-            Document document = (Document)notifier;
-            Element definitionElement = null;          
-
-            for (Node node = document.getFirstChild(); node != null; node = node.getNextSibling())
-            {
-              if (node.getNodeType() == Node.ELEMENT_NODE)
-              {
-                Element element = (Element)node;
-                if (WSDLEditorUtil.getInstance().getWSDLType(element) == WSDLConstants.DEFINITION)
-                {
-                  definitionElement = element;
-                  break;
-                }
-              }
-            }
-           
-            // TODO... revisit definition.removeAllContent() and who should call this?
-            //
-            if (definitionElement != null)
-            {
-//              isValidDefinition = true;
-//              System.out.println("VALID DEFINITION ELEMENT");
-              ((DefinitionImpl)definition).elementChanged(definitionElement);
-            }
-            else
-            {
-//              System.out.println("INVALID DEFINITION ELEMENT");
-//              isValidDefinition = false;
-              ((DefinitionImpl)definition).removeAll();
-            }
-          }
-          break;
-        }
-      }
-    }
-    
-    protected void reconcileModelObjectForElement(Element element, int eventType, Object feature, Object oldValue, Object newValue, int index)
-    {                                                                  
-      Object modelObject = WSDLEditorUtil.getInstance().findModelObjectForElement(definition, element);  
-      if (modelObject != null)
-      {
-        if (modelObject instanceof XSDSchemaExtensibilityElementImpl)
-        {
-          XSDSchemaExtensibilityElementImpl ee = (XSDSchemaExtensibilityElementImpl)modelObject;
-          ((XSDSchemaImpl)ee.getSchema()).elementChanged(element);
-          ee.elementChanged(element);            
-        }		
-        else if (modelObject instanceof WSDLElementImpl)
-        {
-          ((WSDLElementImpl)modelObject).elementChanged(element);
-        }
-        else if (modelObject instanceof XSDConcreteComponent)
-        {
-          ((XSDConcreteComponent)modelObject).elementChanged(element);
-          extensibleNodeReconciler.notifyChanged(modelObject, element, eventType, feature, oldValue, newValue, index);     
-        }
-      } 	  
-    }   
-  }
-  
-                                                
-  // An abstract adapter that ensures that the children of a new Node are also adapted
-  //
-  abstract class DocumentAdapter implements INodeAdapter
-  {                               
-    public DocumentAdapter(Document document)
-    {
-      ((INodeNotifier)document).addAdapter(this);
-
-      for (Node child = document.getFirstChild(); child != null; child = child.getNextSibling())
-      {
-        if (child.getNodeType() == Node.ELEMENT_NODE)
-        {
-          adapt((Element)child);
-        }
-      }
-    }
-  
-    public void adapt(Element element)
-    {                 
-      if (element != null)
-      {
-        if (((INodeNotifier)element).getExistingAdapter(this) == null)
-        {  
-          ((INodeNotifier)element).addAdapter(this);
-        
-          for (Node child = element.getFirstChild(); child != null; child = child.getNextSibling())
-          {
-            if (child.getNodeType() == Node.ELEMENT_NODE)
-            {
-              adapt((Element)child);
-            }
-          }
-        }
-      }
-    }
-  
-    public boolean isAdapterForType(Object type) 
-    {
-      return type == this;
-    }
-  
-    abstract public void notifyChanged(INodeNotifier notifier, int eventType, Object feature, Object oldValue, Object newValue, int index);  
-  }
-} 
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/text/WSDLModelAdapter.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/text/WSDLModelAdapter.java
deleted file mode 100644
index 42305d1c4..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/text/WSDLModelAdapter.java
+++ /dev/null
@@ -1,114 +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 Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.text;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.internal.impl.DefinitionImpl;
-import org.eclipse.wst.wsdl.internal.util.WSDLResourceFactoryImpl;
-import org.eclipse.wst.wsdl.ui.internal.typesystem.ExtensibleTypeSystemProvider;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLModelLocatorAdapterFactory;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xsd.ui.internal.util.XSDSchemaLocationResolverAdapterFactory;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class WSDLModelAdapter implements INodeAdapter
-{
-  protected ResourceSet resourceSet;
-  protected Definition definition;
-
-  public Definition getDefinition()
-  {
-    return definition;
-  }
-
-  public void setDefinition(Definition definition)
-  {
-    this.definition = definition;
-  }
-
-  public boolean isAdapterForType(Object type)
-  {
-    return type == WSDLModelAdapter.class;
-  }
-
-  public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos)
-  {
-  }
-
-  public Definition createDefinition(Element element, Document document)
-  {     
-    try
-    {    	
-      IDOMNode domNode = (IDOMNode)element;
-      String baseLocation = "blankWSDL.wsdl";
-      if (domNode != null) {
-    	  baseLocation = domNode.getModel().getBaseLocation();
-      }
-      else if (document instanceof IDOMNode){
-    	  IDOMModel domModel = ((IDOMNode) document).getModel();
-    	  baseLocation = domModel.getBaseLocation();
-      }
-          
-      resourceSet = new ResourceSetImpl();
-      resourceSet.getAdapterFactories().add(new WSDLModelLocatorAdapterFactory());
-      resourceSet.getAdapterFactories().add(new XSDSchemaLocationResolverAdapterFactory());
-                     
-      // TODO.. .revist the best approach to obtain a URI from the SSE model
-      //
-      URI uri = null;
-      if (baseLocation.startsWith("/"))
-      {
-        uri = URI.createPlatformResourceURI(baseLocation);
-      }
-      else
-      {
-        uri = URI.createFileURI(baseLocation);
-      }            
-      
-      definition = WSDLFactory.eINSTANCE.createDefinition();
-      definition.setDocumentBaseURI(uri.toString());
-      definition.setDocument(document);
-      definition.setElement(element);
-      
-      WSDLResourceFactoryImpl resourceFactory = new WSDLResourceFactoryImpl();
-      Resource resource = resourceFactory.createResource(uri);
-      resourceSet.getResources().add(resource);       
-      resource.getContents().add(definition);
-      resource.setModified(false);    
-      ((DefinitionImpl)definition).reconcileReferences(true);    
-                 
-      // attach an adapter to keep the WSDL model and DOM in sync
-      //
-      new WSDLModelReconcileAdapter(document, definition);
-
-      // TODO... CS : revisit this line
-      // currently this is used to associate a 'type' system with the definition      
-      // I suspect that this could be made a whole lot more simple
-      //
-      WSDLEditorUtil.getInstance().setTypeSystemProvider(definition, new ExtensibleTypeSystemProvider());
-    }
-    catch (Exception ex)
-    {
-      ex.printStackTrace();
-    }
-    return definition;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/text/WSDLModelQueryExtension.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/text/WSDLModelQueryExtension.java
deleted file mode 100644
index 5de5b5cd9..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/text/WSDLModelQueryExtension.java
+++ /dev/null
@@ -1,208 +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 Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.text;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.filter.ExtensiblityElementFilter;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.eclipse.wst.xsd.ui.internal.text.XSDModelQueryExtension;
-import org.eclipse.wst.xsd.ui.internal.util.TypesHelper;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDSchema;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class WSDLModelQueryExtension extends XSDModelQueryExtension
-{
-  public WSDLModelQueryExtension()
-  {
-  }
-
-  protected boolean isParentElementMessageReference(String parentElementName)
-  {
-    return parentElementName.equals("input") || parentElementName.equals("output") || parentElementName.equals("fault");
-  }
-
-  protected boolean isMessageReference(String elementName)
-  {
-    return elementName.equals("body") || elementName.equals("header") || elementName.equals("fault") || elementName.equals("urlReplacement") || elementName.equals("urlEncoded");
-  }
-
-  
-  public boolean isApplicableChildElement(Node parentNode, String namespace, String name)
-  {
-    boolean result = true;
-    if (parentNode.getNodeType() == Node.ELEMENT_NODE)
-    {
-      Element element = (Element) parentNode;
-      String parentElementNamespaceURI = parentNode.getNamespaceURI();
-      String parentElementName = parentNode.getLocalName();
-      // only filter children for 'non-schema' elements
-      //      
-      if (!WSDLConstants.XSD_NAMESPACE_URI.equals(parentElementNamespaceURI))
-      {
-        if (parentElementName != null && name != null)
-        {
-          if (namespace != null)
-          {
-            // the following namespace are one that always should be filtered out            
-            // for now this is hardcoded
-            //
-            if (namespace.equals("http://schemas.xmlsoap.org/soap/encoding/"))
-            {
-              // exclude soap-enc elements
-              //
-              result = false;
-            }
-            else if (namespace.equals(WSDLConstants.XSD_NAMESPACE_URI))
-            {
-              // eclipse all schema elements, except for 'schema' withing wsdl types elements 
-              result = parentElementName.equals("types") && name.equals("schema");
-            }   
-            else
-            {
-              // TODO.. we should investigate removing the  ExtensiblityElementFilter extension point
-              // shouldn't this be a ModelQueryExtension defined on the extension languages?
-              //
-              ExtensiblityElementFilter filter = (ExtensiblityElementFilter) WSDLEditorPlugin.getInstance().getExtensiblityElementFilterRegistry().getProperty(namespace, "");
-              if (filter != null)
-              {
-                result = filter.isValidContext(element, name);
-              }
-            }
-          }
-        }
-      }
-    }
-    return result;
-  }
-
-  public String[] getAttributeValues(Element element, String namespace, String name)
-  {
-    if (WSDLConstants.WSDL_NAMESPACE_URI.equals(namespace))
-    {
-      List list = new ArrayList();
-      ComponentReferenceUtil util = new ComponentReferenceUtil(lookupOrCreateDefinition(element));
-      String currentElementName = element.getLocalName();
-      if (checkName(name, "message"))
-      {
-        list.addAll(util.getMessageNames());
-      }
-      else if (checkName(name, "binding"))
-      {
-        list.addAll(util.getBindingNames());
-      }
-      else if (checkName(name, "type"))
-      {
-        if (checkName(currentElementName, "binding"))
-        {
-          list.addAll(util.getPortTypeNames());
-        }
-        else if (checkName(currentElementName, "part"))
-        {
-          list.addAll(util.getComponentNameList(true));
-        }
-      }
-      else if (checkName(name, "element"))
-      {
-        if (checkName(currentElementName, "part"))
-        {
-          list.addAll(util.getComponentNameList(false));
-        }
-      }
-      String[] result = new String[list.size()];
-      list.toArray(result);
-      return result;
-    }
-    else
-    {
-      return super.getAttributeValues(element, namespace, name);
-    }
-  }
-
-  
-  protected XSDSchema lookupOrCreateSchemaForElement(Element element)
-  {       
-    XSDSchema schema = null;
-    Definition definition = lookupOrCreateDefinition(element);
-    Object o = WSDLEditorUtil.getInstance().findModelObjectForElement(definition, element);
-    if (o instanceof XSDConcreteComponent)
-    {
-      schema = ((XSDConcreteComponent) o).getSchema();
-    } 
-    return schema;
-  }
-  
-  
-  protected Definition lookupOrCreateDefinition(Element element)
-  {
-    Definition definition = null;
-    Document document = element.getOwnerDocument();
-    if (document instanceof INodeNotifier)
-    {
-      INodeNotifier notifier = (INodeNotifier) document;
-      WSDLModelAdapter adapter = (WSDLModelAdapter) notifier.getAdapterFor(WSDLModelAdapter.class);
-      if (adapter == null)
-      {
-        adapter = new WSDLModelAdapter();
-        notifier.addAdapter(adapter);
-        adapter.createDefinition(document.getDocumentElement(), document);
-      }
-      definition = adapter.getDefinition();
-    }
-    return definition;
-  }
-  
-  
-  protected TypesHelper getTypesHelper(final Element element)
-  {
-    XSDSchema schema = lookupOrCreateSchemaForElement(element);
-    return new TypesHelper(schema)
-    {
-      // TODO... it seems as though the model is not correctly
-      // mainting the list of prefixes for a given namespace
-      // must be a bug!
-      //
-      protected List getPrefixesForNamespace(String namespace)
-      {
-        List list = super.getPrefixesForNamespace(namespace);
-        Definition definition = lookupOrCreateDefinition(element);
-        if (definition != null)
-        {  
-          Map map = definition.getNamespaces();
-          for (Iterator i = map.keySet().iterator(); i.hasNext();)
-          {
-            String prefix = (String) i.next();
-            String ns = (String) map.get(prefix);
-            if (ns != null && ns.equals(namespace))
-            {
-              if (!list.contains(prefix))
-              {
-                list.add(prefix);
-              }
-            }
-          }
-        }
-        return list;
-      }       
-    };    
-  }  
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/text/WSDLModelReconcileAdapter.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/text/WSDLModelReconcileAdapter.java
deleted file mode 100644
index dcb3b3e74..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/text/WSDLModelReconcileAdapter.java
+++ /dev/null
@@ -1,181 +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 Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.text;
-
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.internal.impl.DefinitionImpl;
-import org.eclipse.wst.wsdl.internal.impl.WSDLElementImpl;
-import org.eclipse.wst.wsdl.internal.impl.XSDSchemaExtensibilityElementImpl;
-import org.eclipse.wst.wsdl.ui.internal.reconciler.ExtensibleNodeReconciler;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.impl.XSDSchemaImpl;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-class WSDLModelReconcileAdapter extends DocumentAdapter
-{                             
-  protected Definition definition;   
-  protected ExtensibleNodeReconciler extensibleNodeReconciler;
-
-  public WSDLModelReconcileAdapter(Document document, Definition definition)
-  {           
-    super(document);
-    this.definition = definition;
-    this.extensibleNodeReconciler = new ExtensibleNodeReconciler();
-  } 
-   
-     
-  public void notifyChanged(INodeNotifier notifier, int eventType, Object feature, Object oldValue, Object newValue, int index) 
-  {                      
-    if (eventType == INodeNotifier.ADD)
-    {
-      if (newValue instanceof Element)
-      {
-        adapt((Element)newValue);
-
-        // See Bug 5366
-        // We need to sync up the Model and the DOM
-        Element newDocumentElement = (Element)newValue;
-        String wsdlPrefix = newDocumentElement.getPrefix();
-        if (wsdlPrefix == null) wsdlPrefix = "";
-        String ns = definition != null ? definition.getNamespace(wsdlPrefix) : "";
-        if (ns != null && ns.equals(WSDLConstants.WSDL_NAMESPACE_URI)
-           && newDocumentElement.getLocalName().equals(WSDLConstants.DEFINITION_ELEMENT_TAG)) // &&
-           // !isValidDefinition)
-        {
-//          System.out.println("****** Setting new definition");
-          definition.setElement(newDocumentElement);
-        }
-      }
-    }   
-
-    switch (eventType)
-    {                  
-      // we make the assumption that reconciling will only be triggered by one of these notifications 
-      // (ADD and REMOVE notifications are omitted)
-      //
-      case INodeNotifier.CHANGE: 
-      case INodeNotifier.STRUCTURE_CHANGED:
-      case INodeNotifier.CONTENT_CHANGED:
-      {                      
-        if (notifier instanceof Element)
-        {
-          reconcileModelObjectForElement((Element)notifier, eventType, feature, oldValue, newValue, index);
-        }
-        else if (notifier instanceof Document)
-        {
-          Document document = (Document)notifier;
-          Element definitionElement = null;          
-
-          for (Node node = document.getFirstChild(); node != null; node = node.getNextSibling())
-          {
-            if (node.getNodeType() == Node.ELEMENT_NODE)
-            {
-              Element element = (Element)node;
-              if (WSDLEditorUtil.getInstance().getWSDLType(element) == WSDLConstants.DEFINITION)
-              {
-                definitionElement = element;
-                break;
-              }
-            }
-          }
-         
-          // TODO... revisit definition.removeAllContent() and who should call this?
-          //
-          if (definitionElement != null)
-          {
-//            isValidDefinition = true;
-//            System.out.println("VALID DEFINITION ELEMENT");
-            WSDLModelAdapter modelAdapter = (WSDLModelAdapter) notifier.getAdapterFor(WSDLModelAdapter.class);
-            if (modelAdapter != null) {
-              definition = modelAdapter.getDefinition();
-              if (definition == null) definition = modelAdapter.createDefinition(definitionElement, document);
-            }
-            ((DefinitionImpl)definition).elementChanged(definitionElement);
-          }
-          else
-          {
-//            System.out.println("INVALID DEFINITION ELEMENT");
-//            isValidDefinition = false;
-            ((DefinitionImpl)definition).removeAll();
-          }
-        }
-        break;
-      }
-    }
-  }
-
-  protected void reconcileModelObjectForElement(Element element, int eventType, Object feature, Object oldValue, Object newValue, int index)
-  {                                                                  
-    Object modelObject = WSDLEditorUtil.getInstance().findModelObjectForElement(definition, element);  
-    if (modelObject != null)
-    {
-      if (modelObject instanceof XSDSchemaExtensibilityElementImpl)
-      {
-        XSDSchemaExtensibilityElementImpl ee = (XSDSchemaExtensibilityElementImpl)modelObject;
-        ((XSDSchemaImpl)ee.getSchema()).elementChanged(element);
-        ee.elementChanged(element);            
-      }   
-      else if (modelObject instanceof WSDLElementImpl)
-      {
-        ((WSDLElementImpl)modelObject).elementChanged(element);
-      }
-      else if (modelObject instanceof XSDConcreteComponent)
-      {
-        ((XSDConcreteComponent)modelObject).elementChanged(element);
-        extensibleNodeReconciler.notifyChanged(modelObject, element, eventType, feature, oldValue, newValue, index);     
-      }
-    }     
-  }   
-}
-
-
-abstract class DocumentAdapter implements INodeAdapter
-{
-  Document document;
-  
-  public DocumentAdapter(Document document)
-  {
-    this.document = document;
-    ((INodeNotifier)document).addAdapter(this);
-    if (document.getDocumentElement() != null) adapt(document.getDocumentElement());
-  }
-
-  public void adapt(Element element)
-  {
-    if (((INodeNotifier)element).getExistingAdapter(this) == null)
-    {
-      ((INodeNotifier)element).addAdapter(this);
-
-      for (Node child = element.getFirstChild(); child != null; child = child.getNextSibling())
-      {
-        if (child.getNodeType() == Node.ELEMENT_NODE)
-        {
-          adapt((Element)child);
-        }
-      }
-    }
-  }
-
-  public boolean isAdapterForType(Object type)
-  {
-    return type == this;
-  }
-
-  abstract public void notifyChanged
-    (INodeNotifier notifier, int eventType, Object feature, Object oldValue, Object newValue, int index);
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/typesystem/ExtensibleTypeSystemProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/typesystem/ExtensibleTypeSystemProvider.java
deleted file mode 100644
index d6bc54a0a..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/typesystem/ExtensibleTypeSystemProvider.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.typesystem;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.extension.ITypeSystemProvider;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtension;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtensionRegistry;
-import org.eclipse.xsd.XSDSchema;
-
-public class ExtensibleTypeSystemProvider implements ITypeSystemProvider
-{
-  protected WSDLEditorExtension[] extensions;
-  protected ITypeSystemProvider[] typeSystemProviders;
-
-  protected final static Object[] EMPTY_ARRAY = {};
-
-  public ExtensibleTypeSystemProvider()
-  {
-    WSDLEditorExtensionRegistry registry = WSDLEditorPlugin.getInstance().getWSDLEditorExtensionRegistry(); 
-
-    extensions = registry.getRegisteredExtensions(WSDLEditorExtension.TYPE_SYSTEM_PROVIDER); 
-    typeSystemProviders = new ITypeSystemProvider[extensions.length]; 
-    for (int i = 0; i < extensions.length; i++)
-    {
-      typeSystemProviders[i] = (ITypeSystemProvider)extensions[i].createExtensionObject(WSDLEditorExtension.TYPE_SYSTEM_PROVIDER, null);
-    }
-  }          
-        
-  public List getAvailableTypeNames(Definition definition, int typeNameCategory)
-  {
-    List list = new ArrayList();
-    for (int i = 0; i < typeSystemProviders.length; i++)
-    {
-      list.addAll(typeSystemProviders[i].getAvailableTypeNames(definition, typeNameCategory));
-    }   
-    return list;
-  }
-  
-  public List getAvailableTypes(Definition definition, XSDSchema schema, int typeNameCategory)
-  {
-    List list = new ArrayList();
-    for (int i = 0; i < typeSystemProviders.length; i++)
-    {
-      list.addAll(typeSystemProviders[i].getAvailableTypes(definition, schema, typeNameCategory));
-    }   
-    return list;
-  }
-
-  public List getAvailableElementNames(Definition definition)
-  {
-    List list = new ArrayList();
-    for (int i = 0; i < typeSystemProviders.length; i++)
-    {
-      list.addAll(typeSystemProviders[i].getAvailableElementNames(definition));
-    }     
-    return list;
-  }
-
-  public int getCategoryForTypeName(Definition definition, String typeName)
-  {
-    int result = UNKNOWN_TYPE;
-    for (int i = 0; i < typeSystemProviders.length; i++)
-    {
-      result = typeSystemProviders[i].getCategoryForTypeName(definition, typeName);
-      if (result != UNKNOWN_TYPE)
-      {
-        break;
-      }
-    }                                                                                 
-    return result;
-  }
-  
-  public List getPrefixedNames(Definition definition, String namespace, String localName) {
-  	 List list = new ArrayList();
-     for (int i = 0; i < typeSystemProviders.length; i++)
-     {
-       list.addAll(typeSystemProviders[i].getPrefixedNames(definition, namespace, localName));
-     }     
-     return list;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ComponentReferenceUtil.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ComponentReferenceUtil.java
deleted file mode 100644
index cbf51ae69..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ComponentReferenceUtil.java
+++ /dev/null
@@ -1,957 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.common.uriresolver.internal.util.URIHelper;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.internal.impl.ImportImpl;
-import org.eclipse.wst.wsdl.internal.impl.WSDLElementImpl;
-import org.eclipse.wst.wsdl.ui.internal.extension.ITypeSystemProvider;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-public class ComponentReferenceUtil
-{
-  protected Definition rootDefinition;
-
-  public ComponentReferenceUtil(Definition rootDefinition)
-  {
-    this.rootDefinition = rootDefinition;
-  }
-
-  protected static boolean isEqual(String a, String b)
-  {
-    boolean result = false;
-    if (a != null)
-    {
-      result = a.equals(b) || (a.length() == 0 && b == null);
-    }
-    else
-    {
-      result = (b == null || b.length() == 0);
-    }
-    return result;
-  }
-
-  protected static boolean isEqualInputName(Operation operation, BindingOperation bindingOperation)
-  {
-    boolean result = false;
-    Input operationInput = operation.getEInput();
-    BindingInput bindingOperationInput = bindingOperation.getEBindingInput();
-
-    if (operationInput != null && bindingOperationInput != null)
-    {
-      result = isEqual(operationInput.getName(), bindingOperationInput.getName());
-    }
-    else if (operationInput == null && bindingOperationInput == null)
-    {
-      result = true;
-    }
-    return result;
-  }
-
-  protected static boolean isEqualOutputName(Operation operation, BindingOperation bindingOperation)
-  {
-    boolean result = false;
-    Output operationOutput = operation.getEOutput();
-    BindingOutput bindingOperationOutput = bindingOperation.getEBindingOutput();
-
-    if (operationOutput != null && bindingOperationOutput != null)
-    {
-      result = isEqual(operationOutput.getName(), bindingOperationOutput.getName());
-    }
-    else if (operationOutput == null && bindingOperationOutput == null)
-    {
-      result = true;
-    }
-    return result;
-  }
-
-  protected static boolean isMatchingBinding(Operation operation, BindingOperation bindingOperation)
-  {
-    return isEqual(operation.getName(), bindingOperation.getName()) && isEqualInputName(operation, bindingOperation) && isEqualOutputName(operation, bindingOperation);
-  }
-
-  public List getPortsForPortType(PortType portType)
-  {
-    List list = new ArrayList();
-    for (Iterator i = getServices().iterator(); i.hasNext();)
-    {
-      Service service = (Service) i.next();
-      for (Iterator j = service.getEPorts().iterator(); j.hasNext();)
-      {
-        Port port = (Port) j.next();
-        Binding binding = port.getEBinding();
-        if (binding != null && binding.getEPortType() == portType)
-        {
-          list.add(port);
-        }
-      }
-    }
-    return list;
-  }
-
-  public List getPortsForBinding(Binding binding)
-  {
-    List list = new ArrayList();
-    for (Iterator i = getServices().iterator(); i.hasNext();)
-    {
-      Service service = (Service) i.next();
-      for (Iterator j = service.getEPorts().iterator(); j.hasNext();)
-      {
-        Port port = (Port) j.next();
-        if (port.getEBinding() == binding)
-        {
-          list.add(port);
-        }
-      }
-    }
-    return list;
-  }
-
-  public List getBindingOperations(Operation operation)
-  {
-    List list = new ArrayList();
-    String operationName = operation.getName();
-
-    if (operationName != null)
-    {
-      PortType portType = getEnclosingPortType(operation);
-      for (Iterator i = getBindings(portType).iterator(); i.hasNext();)
-      {
-        Binding binding = (Binding) i.next();
-        BindingOperation bindingOperation = getBindingOperation(operation, binding);
-        if (bindingOperation != null)
-        {
-          list.add(bindingOperation);
-        }
-      }
-    }
-    return list;
-  }
-
-  public BindingOperation getBindingOperation(Operation operation, Binding binding)
-  {
-    BindingOperation result = null;
-    for (Iterator j = binding.getBindingOperations().iterator(); j.hasNext();)
-    {
-      BindingOperation bindingOperation = (BindingOperation) j.next();
-      if (isMatchingBinding(operation, bindingOperation))
-      {
-        result = bindingOperation;
-        break;
-      }
-    }
-    return result;
-  }
-
-  public BindingInput getBindingInput(Input input, Binding binding)
-  {
-    BindingOperation bindingOperation = getBindingOperation((Operation) input.eContainer(), binding);
-    return bindingOperation != null ? bindingOperation.getEBindingInput() : null;
-  }
-
-  public BindingOutput getBindingOutput(Output output, Binding binding)
-  {
-    BindingOperation bindingOperation = getBindingOperation((Operation) output.eContainer(), binding);
-    return bindingOperation != null ? bindingOperation.getEBindingOutput() : null;
-  }
-
-  public BindingFault getBindingFault(Fault fault, Binding binding)
-  {
-    BindingFault result = null;
-    String faultName = fault.getName();
-    if (faultName != null)
-    {
-      BindingOperation bindingOperation = getBindingOperation((Operation) fault.eContainer(), binding);
-      if (bindingOperation != null)
-      {
-        result = (BindingFault) bindingOperation.getBindingFault(faultName);
-      }
-    }
-    return result;
-  }
-
-  public EObject getBindingObject(EObject interfaceObject, Binding binding)
-  {
-    EObject result = null;
-    if (interfaceObject instanceof Input)
-    {
-      result = getBindingInput((Input) interfaceObject, binding);
-    }
-    else if (interfaceObject instanceof Output)
-    {
-      result = getBindingOutput((Output) interfaceObject, binding);
-    }
-    else if (interfaceObject instanceof Fault)
-    {
-      result = getBindingFault((Fault) interfaceObject, binding);
-    }
-    else if (interfaceObject instanceof Operation)
-    {
-      result = getBindingOperation((Operation) interfaceObject, binding);
-    }
-    else if (interfaceObject instanceof PortType)
-    {
-      result = binding;
-    }
-    return result;
-  }
-
-  public List getBindingInputs(Input input)
-  {
-    List list = new ArrayList();
-    List operations = getBindingOperations((Operation) input.eContainer());
-    for (Iterator i = operations.iterator(); i.hasNext();)
-    {
-      BindingOperation bindingOperation = (BindingOperation) i.next();
-      if (bindingOperation.getBindingInput() != null)
-      {
-        list.add(bindingOperation.getBindingInput());
-      }
-    }
-    return list;
-  }
-
-  public List getBindingOutputs(Output output)
-  {
-    List list = new ArrayList();
-    Operation operation = (Operation) output.eContainer();
-    if (operation != null)
-    {
-      List operations = getBindingOperations(operation);
-      for (Iterator i = operations.iterator(); i.hasNext();)
-      {
-        BindingOperation bindingOperation = (BindingOperation) i.next();
-        if (bindingOperation.getBindingOutput() != null)
-        {
-          list.add(bindingOperation.getBindingOutput());
-        }
-      }
-    }
-    return list;
-  }
-
-  public List getBindingFaults(Fault fault)
-  {
-    List list = new ArrayList();
-    String faultName = fault.getName();
-    if (faultName != null)
-    {
-      Operation operation = (Operation) fault.eContainer();
-      if (operation != null)
-      {
-        List operations = getBindingOperations(operation);
-        for (Iterator i = operations.iterator(); i.hasNext();)
-        {
-          BindingOperation bindingOperation = (BindingOperation) i.next();
-          BindingFault bindingFault = (BindingFault) bindingOperation.getBindingFault(faultName);
-          if (bindingFault != null)
-          {
-            list.add(bindingFault);
-          }
-        }
-      }
-    }
-    return list;
-  }
-
-  protected PortType getEnclosingPortType(Operation operation)
-  {
-    return (PortType) operation.eContainer();
-  }
-
-  public List getBindings(Operation operation)
-  {
-    return getBindings(getEnclosingPortType(operation));
-  }
-
-  public List getBindings(PortType portType)
-  {
-    List list = new ArrayList();
-    for (Iterator i = getDefinitions().iterator(); i.hasNext();)
-    {
-      Definition definition = (Definition) i.next();
-      for (Iterator j = definition.getBindings().values().iterator(); j.hasNext();)
-      {
-        Binding binding = (Binding) j.next();
-        if (portType == null || binding.getPortType() == portType)
-        {
-          list.add(binding);
-        }
-      }
-    }
-    return list;
-  }
-
-  public List getBindingsWithoutOperation(PortType portType, String operationName)
-  {
-    List result = new ArrayList();
-    if (operationName != null)
-    {
-      List bindings = getBindings(portType);
-      for (Iterator i = bindings.iterator(); i.hasNext();)
-      {
-        Binding binding = (Binding) i.next();
-        boolean hasName = false;
-        for (Iterator j = binding.getBindingOperations().iterator(); j.hasNext();)
-        {
-          BindingOperation bindingOperation = (BindingOperation) j.next();
-          if (operationName.equals(bindingOperation.getName()))
-          {
-            hasName = true;
-            break;
-          }
-        }
-        if (!hasName)
-        {
-          result.add(binding);
-        }
-      }
-    }
-    return result;
-  }
-
-  public List getBindings()
-  {
-    return getBindings((PortType) null);
-  }
-
-  public List getBindingNames()
-  {
-    List list = new ArrayList();
-    for (Iterator i = getBindings().iterator(); i.hasNext();)
-    {
-      Binding binding = (Binding) i.next();
-      list.addAll(getPrefixedNames(binding.getQName()));
-    }
-    return list;
-  }
-
-  public List getPortTypeNames()
-  {
-    List list = new ArrayList();
-    for (Iterator i = getDefinitions().iterator(); i.hasNext();)
-    {
-      Definition definition = (Definition) i.next();
-      for (Iterator j = definition.getPortTypes().values().iterator(); j.hasNext();)
-      {
-        PortType portType = (PortType) j.next();
-        list.addAll(getPrefixedNames(portType.getQName()));
-      }
-    }
-    return list;
-  }
-
-  public List getServices()
-  {
-    List list = new ArrayList();
-    for (Iterator i = getDefinitions().iterator(); i.hasNext();)
-    {
-      Definition definition = (Definition) i.next();
-      list.addAll(definition.getEServices());
-    }
-    return list;
-  }
-
-  public List getPortTypes()
-  {
-    List list = new ArrayList();
-    for (Iterator i = getDefinitions().iterator(); i.hasNext();)
-    {
-      Definition definition = (Definition) i.next();
-      list.addAll(definition.getEPortTypes());
-    }
-    return list;
-  }
-
-  public List getMessages()
-  {
-    List list = new ArrayList();
-    for (Iterator i = getDefinitions().iterator(); i.hasNext();)
-    {
-      Definition definition = (Definition) i.next();
-      list.addAll(definition.getEMessages());
-    }
-    return list;
-  }
-
-  public List getTypes()
-  {
-    List list = new ArrayList();
-    for (Iterator i = getDefinitions().iterator(); i.hasNext();)
-    {
-      Definition definition = (Definition) i.next();
-      if (definition.getETypes() != null)
-      {
-        list.add(definition.getETypes());
-      }
-    }
-    return list;
-  }
-
-  public List getMessageNames()
-  {
-    List list = new ArrayList();
-    for (Iterator i = getDefinitions().iterator(); i.hasNext();)
-    {
-      Definition definition = (Definition) i.next();
-      for (Iterator j = definition.getMessages().values().iterator(); j.hasNext();)
-      {
-        Message message = (Message) j.next();
-        list.addAll(getPrefixedNames(message.getQName()));
-      }
-    }
-    return list;
-  }
-
-  public List getDefinitions()
-  {
-    List list = new ArrayList();
-    addDefinition(rootDefinition, list);
-    return list;
-  }
-
-  /**
-   * @deprecated -- we should always use getPrefixedNames
-   */
-  public String getPrefixedName(QName qname)
-  {
-    String name = null;
-    if (qname != null)
-    {
-      String prefix = rootDefinition.getPrefix(qname.getNamespaceURI());
-      if (prefix != null)
-      {
-        name = prefix + ":" + qname.getLocalPart();
-      }
-    }
-    return name;
-  }
-
-  public List getPrefixedNames(QName qname)
-  {
-    List list = new ArrayList();
-    if (qname != null)
-    {
-      Map map = rootDefinition.getNamespaces();
-      for (Iterator i = map.keySet().iterator(); i.hasNext();)
-      {
-        String prefix = (String) i.next();
-        String namespace = (String) map.get(prefix);
-        if (namespace != null && namespace.equals(qname.getNamespaceURI()))
-        {
-          String name = prefix.length() > 0 ? prefix + ":" + qname.getLocalPart() : 
-                        qname.getLocalPart();
-          list.add(name);
-        }
-      }
-    }
-    return list;
-  }
-
-  protected void addDefinition(Definition definition, List list)
-  {
-    if (definition != null)
-    {
-      list.add(definition);
-      for (Iterator i = definition.getEImports().iterator(); i.hasNext();)
-      {
-        ImportImpl theImport = (ImportImpl) i.next();
-        if (theImport.getLocationURI() != null && !theImport.getLocationURI().endsWith("xsd"))
-        {
-          theImport.importDefinitionOrSchema();	 
-          Definition importedDefinition = (Definition) theImport.getEDefinition();
-          if (importedDefinition != null && !list.contains(importedDefinition))
-          {
-            addDefinition(importedDefinition, list);
-          }
-        }
-      }
-    }
-  }
-
-  public static String getPortTypeReference(Binding binding)
-  {
-    String result = null;
-    Element element = WSDLEditorUtil.getInstance().getElementForObject(binding);
-    if (element != null)
-    {
-      result = element.getAttribute("type");
-    }
-    return result;
-  }
-
-  public static void setPortTypeReference(Binding binding, String portType)
-  {
-    Element element = WSDLEditorUtil.getInstance().getElementForObject(binding);
-    if (element != null)
-    {
-      element.setAttribute("type", portType);
-    }
-  }
-
-  public static String getBindingReference(Port port)
-  {
-    String result = null;
-    Element element = WSDLEditorUtil.getInstance().getElementForObject(port);
-    if (element != null)
-    {
-      result = element.getAttribute("binding");
-    }
-    return result;
-  }
-
-  public static String getName(Binding binding)
-  {
-    String result = null;
-    Element element = WSDLEditorUtil.getInstance().getElementForObject(binding);
-    if (element != null)
-    {
-      result = element.getAttribute("name");
-    }
-    return result;
-  }
-
-  public static QName getPortTypeReferenceQName(Binding binding)
-  {
-    QName result = null;
-    Definition definition = binding.getEnclosingDefinition();
-    String prefixedName = getPortTypeReference(binding);
-    if (prefixedName != null)
-    {
-      result = WSDLEditorUtil.createQName(definition, prefixedName);
-    }
-    return result;
-  }
-
-  public static QName getBindingReferenceQName(Port port)
-  {
-    QName result = null;
-    Definition definition = port.getEnclosingDefinition();
-    String prefixedName = getBindingReference(port);
-    if (prefixedName != null)
-    {
-      result = WSDLEditorUtil.createQName(definition, prefixedName);
-    }
-    return result;
-  }
-
-  public static String getMessageReference(Input input)
-  {
-    return getMessageReferenceHelper(input);
-  }
-
-  public static String getMessageReference(Output output)
-  {
-    return getMessageReferenceHelper(output);
-  }
-
-  public static String getMessageReference(Fault fault)
-  {
-    return getMessageReferenceHelper(fault);
-  }
-
-  public static QName getMessageReferenceQName(Input input)
-  {
-    return getMessageReferenceQNameHelper(input);
-  }
-
-  public static QName getMessageReferenceQName(Output output)
-  {
-    return getMessageReferenceQNameHelper(output);
-  }
-
-  public static QName getMessageReferenceQName(Fault fault)
-  {
-    return getMessageReferenceQNameHelper(fault);
-  }
-
-  protected static String getMessageReferenceHelper(WSDLElement o)
-  {
-    String result = null;
-    Element element = WSDLEditorUtil.getInstance().getElementForObject(o);
-    if (element != null)
-    {
-      result = element.getAttribute("message");
-    }
-    return result;
-  }
-
-  public static QName getMessageReferenceQNameHelper(WSDLElement o)
-  {
-    QName result = null;
-    Definition definition = o.getEnclosingDefinition();
-    String prefixedName = getMessageReferenceHelper(o);
-    if (prefixedName != null)
-    {
-      result = WSDLEditorUtil.createQName(definition, prefixedName);
-    }
-    return result;
-  }
-
-  public static void updatePortTypeReferences(Definition definition)
-  {
-    for (Iterator i = definition.getBindings().values().iterator(); i.hasNext();)
-    {
-      Binding binding = (Binding) i.next();
-      QName qname = ComponentReferenceUtil.getPortTypeReferenceQName(binding);
-
-      PortType portType = (qname != null) ? (PortType) definition.getPortType(qname) : null;
-
-      if (binding.getPortType() != portType)
-      {
-        binding.setPortType(portType);
-      }
-    }
-  }
-
-  public static void updateBindingReferences(Definition definition)
-  {
-    for (Iterator i = definition.getServices().values().iterator(); i.hasNext();)
-    {
-      Service service = (Service) i.next();
-      for (Iterator j = service.getEPorts().iterator(); j.hasNext();)
-      {
-        Port port = (Port) j.next();
-        QName qname = ComponentReferenceUtil.getBindingReferenceQName(port);
-
-        Binding binding = (qname != null) ? (Binding) definition.getBinding(qname) : null;
-
-        if (port.getBinding() != binding)
-        {
-          port.setBinding(binding);
-        }
-      }
-    }
-  }
-
-  public static void updateMessageReferences(Definition definition)
-  {
-    // for each port type
-    //
-    for (Iterator i = definition.getPortTypes().values().iterator(); i.hasNext();)
-    {
-      PortType portType = (PortType) i.next();
-
-      // for each operation
-      //
-      for (Iterator j = portType.getEOperations().iterator(); j.hasNext();)
-      {
-        Operation operation = (Operation) j.next();
-
-        // handle Input
-        //
-        Input input = (Input) operation.getInput();
-        if (input != null)
-        {
-          QName qname = ComponentReferenceUtil.getMessageReferenceQName(input);
-          Message message = (qname != null) ? (Message) definition.getMessage(qname) : null;
-          if (input.getMessage() != message)
-          {
-            input.setMessage(message);
-          }
-        }
-
-        // handle Output
-        //
-        Output output = (Output) operation.getOutput();
-        if (output != null)
-        {
-          QName qname = ComponentReferenceUtil.getMessageReferenceQName(output);
-          Message message = (qname != null) ? (Message) definition.getMessage(qname) : null;
-          if (output.getMessage() != message)
-          {
-            output.setMessage(message);
-          }
-        }
-
-        // handle Faults
-        //
-        for (Iterator k = operation.getEFaults().iterator(); k.hasNext();)
-        {
-          Fault fault = (Fault) k.next();
-
-          QName qname = ComponentReferenceUtil.getMessageReferenceQName(fault);
-          Message message = (qname != null) ? (Message) definition.getMessage(qname) : null;
-          if (fault.getMessage() != message)
-          {
-            fault.setMessage(message);
-          }
-        }
-      }
-    }
-  }
-
-  public static void updateSchemaReferences(Definition definition)
-  {
-    for (Iterator i = definition.getEMessages().iterator(); i.hasNext();)
-    {
-      Message message = (Message) i.next();
-      for (Iterator j = message.getEParts().iterator(); j.hasNext();)
-      {
-        Part part = (Part) j.next();
-        Element element = WSDLEditorUtil.getInstance().getElementForObject(part);
-        if (element != null)
-        {
-          ((WSDLElementImpl)part).elementChanged(element);
-        }
-      }
-    }
-  }
-
-  public static Operation getOperation(PortType portType, BindingOperation bindingOperation)
-  {
-    Operation result = null;
-    for (Iterator i = portType.getEOperations().iterator(); i.hasNext();)
-    {
-      Operation operation = (Operation) i.next();
-      if (isMatchingBinding(operation, bindingOperation))
-      {
-        result = operation;
-        break;
-      }
-    }
-    return result;
-  }
-
-  public static void updateOperationReference(BindingOperation bindingOperation)
-  {
-    Operation operation = computeOperation(bindingOperation);
-    if (operation != bindingOperation.getOperation())
-    {
-      bindingOperation.setOperation(operation);
-    }
-  }
-
-  public List getComponentNameList(boolean isType)
-  {
-    List result = Collections.EMPTY_LIST;
-    ITypeSystemProvider typeSystemProvider = WSDLEditorUtil.getInstance().getTypeSystemProvider(rootDefinition);
-    if (typeSystemProvider != null)
-    {
-      result = isType ? typeSystemProvider.getAvailableTypeNames(rootDefinition, 0) : typeSystemProvider.getAvailableElementNames(rootDefinition);
-    }
-    return result;
-  }
-
-  public static List getComponentNameList(Part part, boolean isType)
-  {
-    List result = Collections.EMPTY_LIST;
-    Definition definition = part.getEnclosingDefinition();
-    ITypeSystemProvider typeSystemProvider = WSDLEditorUtil.getInstance().getTypeSystemProvider(definition);
-    if (typeSystemProvider != null)
-    {
-      result = isType ? typeSystemProvider.getAvailableTypeNames(definition, 0) : typeSystemProvider.getAvailableElementNames(definition);
-    }
-    return result;
-  }
-
-  public static boolean isType(Part part)
-  {
-    //Element element = WSDLEditorUtil.getInstance().getElementForObject(part);
-    Element element = part.getElement();
-    return !element.hasAttribute("element");
-  }
-
-  public static String getPartComponentReference(Part part)
-  {
-    //Element element = WSDLEditorUtil.getInstance().getElementForObject(part);
-    Element element = part.getElement();
-    String result = null;
-    if (element.hasAttribute("type"))
-    {
-      result = element.getAttribute("type");
-    }
-    else if (element.hasAttribute("element"))
-    {
-      result = element.getAttribute("element");
-    }
-    return result;
-  }
-
-  public static void setComponentReference(Part part, boolean isType, String componentName)
-  {
-    Element element = WSDLEditorUtil.getInstance().getElementForObject(part);
-    String newAttribute = isType ? "type" : "element";
-    String oldAttribute = isType ? "element" : "type";
-    element.removeAttribute(oldAttribute);
-
-    String value = componentName != null ? componentName : element.getAttribute(newAttribute);
-
-    if (value == null)
-    {
-      if (isType)
-      {
-        String xsdPrefix = part.getEnclosingDefinition().getPrefix(WSDLConstants.XSD_NAMESPACE_URI);
-        value = "string";
-        if (xsdPrefix != null && xsdPrefix.length() > 0)
-        {
-          value = xsdPrefix + ":" + value;
-        }
-      }
-      else
-      {
-        List list = getComponentNameList(part, isType);
-        value = list.size() > 0 ? (String) list.get(0) : "some-element-name";
-      }
-    }
-    element.setAttribute(newAttribute, value);
-  }
-
-  public static Operation computeOperation(BindingOperation bindingOperation)
-  {
-    Operation result = null;
-    Binding binding = (Binding) bindingOperation.eContainer();
-    PortType portType = (PortType) binding.getPortType();
-    if (portType != null)
-    {
-      result = getOperation(portType, bindingOperation);
-    }
-    return result;
-  }
-
-  public static Input computeInput(BindingInput bindingInput)
-  {
-    Operation operation = computeOperation((BindingOperation) bindingInput.eContainer());
-    return operation != null ? operation.getEInput() : null;
-  }
-
-  public static Output computeOutput(BindingOutput bindingOutput)
-  {
-    Operation operation = computeOperation((BindingOperation) bindingOutput.eContainer());
-    return operation != null ? operation.getEOutput() : null;
-  }
-
-  public static Fault computeFault(BindingFault bindingFault)
-  {
-    Fault result = null;
-    Operation operation = computeOperation((BindingOperation) bindingFault.eContainer());
-    if (operation != null)
-    {
-      for (Iterator i = operation.getEFaults().iterator(); i.hasNext();)
-      {
-        Fault fault = (Fault) i.next();
-        String faultName = fault.getName();
-        if (faultName != null && faultName.equals(bindingFault.getName()))
-        {
-          result = fault;
-          break;
-        }
-      }
-    }
-    return result;
-  }
-
-  public static String getPartReferenceValue(Part part)
-  {
-    Element element = WSDLEditorUtil.getInstance().getElementForObject(part);
-    String value = null;
-    if (element != null)
-    {
-      if (element.hasAttribute("type"))
-      {      		
-        value = element.getAttribute("type");
-      }
-      else if (element.hasAttribute("element"))
-      {  
-        value = element.getAttribute("element");
-      }         
-    }  
-    return value != null ? value : "";
-  }
-
-  public Operation getBindingOperation(Element bindingOperationContent)
-  {
-    Operation operation = null;
-    Node parent = bindingOperationContent.getParentNode();
-    if (parent instanceof Element)
-    {
-      Object object = WSDLEditorUtil.getInstance().findModelObjectForElement(rootDefinition, (Element) parent);
-      if (object instanceof BindingOperation)
-      {
-        operation = ComponentReferenceUtil.computeOperation((BindingOperation) object);
-      }
-    }
-    return operation;
-  }
-
-  public Message getBindingOperationInputMessage(Element bindingOperationContent)
-  {
-    Message message = null;
-    Operation operation = getBindingOperation(bindingOperationContent);
-    if (operation != null)
-    {
-      Input input = operation.getEInput();
-      if (input != null)
-      {
-        message = input.getEMessage();
-      }
-    }
-    return message;
-  }
-
-  public Message getBindingOperationOutputMessage(Element bindingOperationContent)
-  {
-    Message message = null;
-    Operation operation = getBindingOperation(bindingOperationContent);
-    if (operation != null)
-    {
-      Output output = operation.getEOutput();
-      if (output != null)
-      {
-        message = output.getEMessage();
-      }
-    }
-    return message;
-  }
-
-  public static String computeRelativeURI(IFile referencedLocation, IFile baseLocation, boolean enableIEStyleReferences)
-  {
-    // TODO... we need some extension to allow IE folks to plugin logic to create an 'IE' style path
-    // TODO... consider using URI class in EMF 
-    return URIHelper.getRelativeURI(referencedLocation.getLocation(), baseLocation.getLocation());
-  }
-  
-  public static String computeRelativeURI(String referencedLocation, String baseLocation, boolean enableIEStyleReferences)
-  {
-    // TODO... we need some extension to allow IE folks to plugin logic to create an 'IE' style path
-    // TODO... consider using URI class in EMF 
-    return URIHelper.getRelativeURI(referencedLocation, baseLocation);
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/CreateWSDLElementHelper.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/CreateWSDLElementHelper.java
deleted file mode 100644
index 5e4eb0218..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/CreateWSDLElementHelper.java
+++ /dev/null
@@ -1,351 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.MessageReference;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.wsdl.internal.impl.MessageReferenceImpl;
-import org.eclipse.wst.wsdl.internal.impl.WSDLElementImpl;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddBindingCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddFaultCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddInputCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddMessageCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddOperationCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddOutputCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddPartCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddPortCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddPortTypeCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddServiceCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddXSDElementDeclarationCommand;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDSchema;
-import org.w3c.dom.Element;
-
-public class CreateWSDLElementHelper {
-	// Constants used for getting Part information
-	public static final String PART_INFO_ELEMENT_DECLARATION = "ELEMENT_DECLARATION";
-	public static final String PART_INFO_TYPE_DEFINITION     = "TYPE_DEFINITION";
-
-	// The following variables should be set if a name other than the computed name is to be used.
-	public static String serviceName = null;
-	public static String portName = null;
-	public static String bindingName = null;
-	public static String portTypeName = null;
-	public static String operationName = null;
-	public static String inputName = null;
-	public static String outputName = null;
-	public static String faultName = null;
-	public static String messageName = null;
-	public static String partName = null;
-	
-	public static String PART_TYPE_OR_DEFINITION = PART_INFO_TYPE_DEFINITION;
-	public static boolean CREATE_DOWN_TO_PART = true;
-		
-/*
- * The following methods creates the 'specified' (by calling a certain method) WSDLElement
- * and it's 'children' all the way to the PortType level.
- */
-	public static Service createService(Definition definition) {
-		if (serviceName == null || serviceName.trim().equals(""))
-			serviceName = NameUtil.buildUniqueServiceName(definition);		
-		
-		CreateWSDLElementHelper.portTypeName = serviceName;
-		
-	    AddServiceCommand addService = new AddServiceCommand(definition, serviceName, false);
-	    addService.run();
-	    Service service = (Service) addService.getWSDLElement();
-	    CreateWSDLElementHelper.createPort(service);
-  		
-	    return service;
-	}
-	
-	public static Port createPort(Service service) {
-		if (portName == null || portName.trim().equals(""))
-			portName = NameUtil.buildUniquePortName(service, null);
-		
-	    AddPortCommand addPort = new AddPortCommand(service, portName);
-	    addPort.run();
-	    Port port = (Port) addPort.getWSDLElement();
-		Binding binding = CreateWSDLElementHelper.createBinding(port.getEnclosingDefinition(), port);
-
-		port.setBinding(binding);
-		
-	    return port;
-	}
-	
-	public static Binding createBinding(Definition definition, Port port) {
-		bindingName = port.getName();
-		if (bindingName == null || bindingName.trim().equals(""))
-			bindingName = NameUtil.buildUniqueBindingName(definition, null);
-		
-		AddBindingCommand addBinding = new AddBindingCommand(definition, bindingName);
-		addBinding.run();
-		Binding binding = (Binding) addBinding.getWSDLElement();
-		PortType portType = CreateWSDLElementHelper.createPortType(binding.getEnclosingDefinition());
-
-		binding.setPortType(portType);
-		
-		return binding;
-	}
-	
-	public static PortType createPortType(Definition definition) {
-		if (portTypeName == null || portTypeName.trim().equals(""))
-			portTypeName = NameUtil.buildUniquePortTypeName(definition, "PortType");
-		
-		AddPortTypeCommand addPortTypeCommand = new AddPortTypeCommand(definition, portTypeName);
-		addPortTypeCommand.run();
-		PortType portType = (PortType) addPortTypeCommand.getWSDLElement();
-
-		if (CREATE_DOWN_TO_PART) {
-			CreateWSDLElementHelper.createOperation(portType);
-		}
-		
-		return portType;
-	}
-
-	
-/*
- * The following methods creates the 'specified' (by calling a certain method) WSDLElement
- * and it's 'children' all the way to the Part level.
- */	
-  	public static Operation createOperation(PortType portType) {
-  		if (operationName == null || operationName.trim().equals(""))
-  			operationName = NameUtil.buildUniqueOperationName(portType);
-  		
-		AddOperationCommand action = new AddOperationCommand(portType, operationName);
-		action.run();
-		Operation operation = (Operation) action.getWSDLElement();
-  		CreateWSDLElementHelper.createOutput(portType, operation);
-		CreateWSDLElementHelper.createInput(portType, operation, null);
-
-//  		((PortTypeImpl) portType).updateElement(false);
-   		return operation;
-  	}
-
-  	public static Input createInput(PortType portType, Operation operation, String inputName) {
-  		if (inputName == null || inputName.trim().equals(""))
-  	  		inputName = NameUtil.buildUniqueInputName(portType, operation.getName(), "");
-  		
-  		AddInputCommand action = new AddInputCommand(operation, inputName);
-  		action.run();
-  		Input input = (Input) action.getWSDLElement(); 
-  		Message mess = CreateWSDLElementHelper.createMessage(input);
-  		input.setMessage(mess);
-  			  		
-  		return input;
-  	}
-  			  	
-  	public static Output createOutput(PortType portType, Operation operation) {
-  		if (outputName == null || outputName.trim().equals(""))
-  	  		outputName = NameUtil.buildUniqueOutputName(portType, operation.getName(), "");
-  		
-  		AddOutputCommand action = new AddOutputCommand(operation, outputName);
-  		action.run();
-  		Output output = (Output) action.getWSDLElement();
-  		Message mess = CreateWSDLElementHelper.createMessage(output);
-  		output.setMessage(mess);	
-  			  		
-  		return output;
-  	}
-  			  	
-  	public static Fault createFault(Operation operation) {
-  		if (faultName == null || faultName.trim().equals("")) 
-	  		faultName = NameUtil.buildUniqueFaultName(operation);
-  		
-  		AddFaultCommand action = new AddFaultCommand(operation, faultName);
-  		action.run();
-  		Fault fault = (Fault) action.getWSDLElement();
-  		Message mess = CreateWSDLElementHelper.createMessage(fault);
-  		fault.setMessage(mess);
-  		 		
-  		return fault;
-  	}
-  			  	
-  	public static Message createMessage(MessageReference iof) {
-  		if (messageName == null || messageName.trim().equals(""))
-  	  		messageName = NameUtil.buildUniqueMessageName(iof.getEnclosingDefinition(), iof);
-//	  		messageName = NameUtil.buildMessageName(iof.getName());
-  		
-  		Definition def = iof.getEnclosingDefinition();
-  		AddMessageCommand action = new AddMessageCommand(def, messageName);
-  		action.run();
-  		Message message = (Message) action.getWSDLElement();
-  		CreateWSDLElementHelper.createPart(message);
-  		Element parentNode = message.getElement();
-      if (parentNode instanceof IDOMNode) 
-      {
-		    // format selected node                                                    
-        FormatProcessorXML formatProcessorXML = new FormatProcessorXML();
-        formatProcessorXML.formatNode((IDOMNode)parentNode);
-      }
-  		
-  		messageName = null;
-  		return message;
-  	}
-  			  	
-  	public static Part createPart(Message message) {
-  		Definition def = message.getEnclosingDefinition();
-  		String name = NameUtil.buildUniquePartName(message, message.getQName().getLocalPart());
-  		AddPartCommand action = null;
-  		
-  		if (PART_TYPE_OR_DEFINITION == PART_INFO_TYPE_DEFINITION) {
-  			action = new AddPartCommand(message, name, WSDLConstants.SCHEMA_FOR_SCHEMA_URI_2001, "string", true);
-  		}
-  		else if (PART_TYPE_OR_DEFINITION == PART_INFO_ELEMENT_DECLARATION) {  			
-  			//action = new AddPartCommand(message, name, WSDLConstants.SCHEMA_FOR_SCHEMA_URI_2001, "string", true);
-  			String elementName = getNewNameHelper(name, def, false);
-  			AddXSDElementDeclarationCommand elementAction = new AddXSDElementDeclarationCommand(def, elementName);
-  			elementAction.run();
-  			action = new AddPartCommand(message, name, def.getTargetNamespace(), elementName, false);
-  		}
-
-  		action.run();
-  		
-  		return (Part) action.getWSDLElement();
-  	}	
-
-  	/*
-  	 * Used to determine a name for an Element
-  	 */
-    private static String getNewNameHelper(String base, Definition def, boolean isType)
-    { 
-      String name = base;    
-      int count = 0;
-
-      // Ugly....  Redo this...
-      // Get a list of Elements...
-      List elementList = null;
-      if (def.getETypes() != null) {
-      	List xsdsList = def.getETypes().getEExtensibilityElements();
-      	if (xsdsList != null) {
-      		Iterator xsdsIterator = xsdsList.iterator();
-      		XSDSchemaExtensibilityElement xsdElement = (XSDSchemaExtensibilityElement) xsdsIterator.next();
-      		XSDSchema schema = xsdElement.getSchema();
-      		if (schema != null) {
-      			elementList = schema.getElementDeclarations();
-      		}
-      	}
-      }
-      
-      if (elementList != null) {
-      	int index = 0;
-      	while (index < elementList.size()) {
-      		XSDElementDeclaration elementDeclaration = (XSDElementDeclaration) elementList.get(index);
-      		
-      		if (name.equals(elementDeclaration.getName())) {
-      			count++;
-      			name = name + count;
-      			index = 0;
-      		}
-      		else {
-      			index++;
-      		}
-      	}
-      }
-
-      return name;
-    }
-
-  	/*
-  	 * Return the type of Part this WSDLElement should have (Element vs Type).  To determine this, we filter up to the 'parent' PortType
-  	 * and go down to the first Part we encounter and check the type it has.  If this fails, default to Type.
-  	 */
-  	  public static String getPartInfo(WSDLElement element) {
-  	  	String partInfo = null;
-  	  	
-  	  	if (element instanceof PortType) {
-  	  		partInfo = getPartInfo((PortType) element);
-  	  	}
-  	  	else if (element instanceof Operation) {
-  	  		partInfo = getPartInfo(((WSDLElementImpl) element).getContainer());
-  	  	}
-  	  	else if (element instanceof MessageReferenceImpl) {
-  	  		partInfo = getPartInfo(((WSDLElementImpl) element).getContainer());
-  	  	}
-
-  	  	if (partInfo == null) {
-  	  		partInfo = CreateWSDLElementHelper.PART_INFO_TYPE_DEFINITION;
-  	  	}
-  	  	
-  	  	return partInfo;  	
-  	  }
-  	  
-  	  private static String getPartInfo(PortType portType) {
-  	  	String partInfo = null;
-  	  	
-  	  	if (portType.getOperations() != null) {
-  	  		Iterator operationIt = portType.getOperations().iterator();
-  	  		while (operationIt.hasNext()) {
-  	  			Operation op = (Operation) operationIt.next();
-
-  	  			if (op.getEInput() != null) {
-  	  				partInfo = getMessageRefPartInfo((MessageReferenceImpl) op.getEInput());
-  	  			}
-  	  	
-  	  			if (partInfo == null && op.getEOutput() != null) {
-  	  				partInfo = getMessageRefPartInfo((MessageReferenceImpl) op.getEOutput());
-  	  			}
-  	  	
-  	  			if (op.getEFaults() != null) {
-  	  				Iterator faultIt = op.getEFaults().iterator();
-  	  				while (partInfo == null && faultIt.hasNext()) {
-  	  					Fault fault = (Fault) faultIt.next();
-  	  					partInfo = getMessageRefPartInfo((MessageReferenceImpl) fault);
-  	  				}
-  	  			}
-  	  	  	  	
-  	  			if (partInfo != null)
-  	  				break;
-  	  		}
-  	  	}
-
-  	  	return partInfo;
-  	  }
-  	  
-  	  private static String getMessageRefPartInfo(MessageReferenceImpl iof) {
-  	  	String partInfo = null;
-  	  	
-  	  	if (iof.getEMessage() != null && iof.getEMessage().getEParts() != null) {
-  	  		Iterator partIt = iof.getEMessage().getEParts().iterator();
-  	  	
-  	  		while (partInfo == null && partIt.hasNext()) {
-  	  			Part part = (Part) partIt.next();
-  	  		
-  	  			if (part.getTypeDefinition() != null) {
-  	  				partInfo = CreateWSDLElementHelper.PART_INFO_TYPE_DEFINITION;
-  	  			}
-  	  			else if (part.getElementDeclaration() != null) {
-  	  				partInfo = CreateWSDLElementHelper.PART_INFO_ELEMENT_DECLARATION;
-  	  			}
-  	  		}
-  	  	}
-  	  	
-  	  	return partInfo;
-  	  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/NameUtil.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/NameUtil.java
deleted file mode 100644
index 1778c8c9d..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/NameUtil.java
+++ /dev/null
@@ -1,427 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.MessageReference;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.Service;
-
-public class NameUtil
-{
-  /**
-   * Return a name which is not used by any other fault in the operation.
-   * @return String
-   */
-  public static String buildUniqueFaultName(Operation operation)
-  {
-  	return buildUniqueFaultName(operation, "NewFault");
-  }
-  
-  public static String buildUniqueFaultName(Operation operation, String baseName) {
-  	if (baseName == null)
-  		baseName = "NewFault";
-  	
-  	List names = getUsedFaultNames(operation);
-
-    // Now search the list until we find an unused name
-    return getUniqueNameHelper(baseName, names);
-  }
-
-  /**
-   * Return a name which is not used by any other input in the portType.  Returned name will be of the form:
-   * <operationName> + <ending> [+ unique Integer]
-   * @return String
-   */
-  public static String buildUniqueInputName(PortType portType, String operationName, String ending)
-  {
-    String name = null;
-    String candidate = operationName + ending;
-
-    int i = 0;
-
-    // loop until we find a unique name (the name will consist of the operationName + ending + an integer)
-    while (name == null)
-    {
-      boolean unique = true;
-
-      // determine if this combination is unique within the current porttype
-      for (Iterator it = portType.getEOperations().iterator(); it.hasNext() && unique;)
-      {
-        Operation current = (Operation) it.next();
-        // TODO : port check
-        // old  if(current.isSetEInput() && current.getEInput().isSetName()) {
-        if (current.getEInput() != null && current.getEInput().getName() != null)
-        {
-          if (current.getEInput().getName().equals(candidate))
-            unique = false;
-        }
-      }
-      if (unique)
-        name = candidate;
-      else
-        candidate = operationName + ending + i;
-      i++;
-    }
-    return name;
-  }
-
-  /**
-   * Return a name which is not used by any other message in the definition.
-   * @return String
-   */
-  public static String buildUniqueMessageName(Definition definition, String baseName)
-  {
-    if (baseName == null)
-    {
-      baseName = "NewMessage";
-    }
-
-    List names = getUsedMessageNames(definition);
-
-    // Now search the list until we find an unused name
-    return getUniqueNameHelper(baseName, names);
-  }
-
-  /**
-   * Return a name which is not used by any other operation in the port type.
-   * @return String
-   */
-  public static String buildUniqueOperationName(PortType portType)
-  {
-  	return buildUniqueOperationName(portType, "NewOperation");
-  }
-  
-  public static String buildUniqueOperationName(PortType portType, String baseName)
-  {
-  	if (baseName == null) {
-  		baseName = "NewOperation";
-  	}
-
-  	List names = getUsedOperationNames(portType);
-
-    // Now search the list until we find an unused name
-    return getUniqueNameHelper(baseName, names);
-  }
-
-  /**
-   * Return a name which is not used by any other output in the portType.  Returned name will be of the form:
-   * <operationName> + <ending> [+ unique Integer]
-   * @return String
-   */
-  public static String buildUniqueOutputName(PortType portType, String operationName, String ending)
-  {
-    String name = null;
-    String candidate = operationName + ending;
-
-    int i = 0;
-
-    // loop until we find a unique name (the name will consist of the operationName + ending + an integer)
-    while (name == null)
-    {
-      boolean unique = true;
-
-      // determine if this combination is unique within the current porttype			
-      for (Iterator it = portType.getEOperations().iterator(); it.hasNext() && unique;)
-      {
-        Operation current = (Operation) it.next();
-        // TODO: port check
-        // old				if(current.isSetEOutput() && current.getEOutput().isSetName()) {
-        if (current.getEOutput() != null && current.getEOutput().getName() != null)
-        {
-          if (current.getEOutput().getName().equals(candidate))
-            unique = false;
-        }
-      }
-      if (unique)
-        name = candidate;
-      else
-        candidate = operationName + ending + i;
-      i++;
-    }
-    return name;
-  }
-
-  /**
-   * Return a name which is not used by any other part in the message.
-   * @return String
-   */
-  public static String buildUniquePartName(Message message)
-  {
-  	List names = getUsedPartNames(message);
-
-    // Now search the list until we find an unused name
-    return getUniqueNameHelper("NewPart", names);
-  }
-  
-  public static String buildUniquePartName(Message message, String baseName)
-  {
-  	if (baseName == null)
-  	{
-  		baseName = "NewPart";
-  	}
-  	
-  	List names = getUsedPartNames(message);
-
-    // Now search the list until we find an unused name
-    return getUniqueNameHelper(baseName, names);
-  }
-
-  /**
-   * Return a name which is not used by any other port type in the definition.
-   * @return String
-   */
-  public static String buildUniquePortTypeName(Definition definition, String baseName)
-  {
-    if (baseName == null)
-    {
-      baseName = "NewPortType";
-    }
-
-    List names = getUsedPortTypeNames(definition);
-
-    // Now search the list until we find an unused name
-    return getUniqueNameHelper(baseName, names);
-  }
-
-  public static String getUniqueNameHelper(String baseName, List names)
-  {
-    int i = 0;
-
-    String name = baseName;
-    while (true)
-    {
-      if (!names.contains(name))
-      {
-        break;
-      }
-      i++;
-      name = baseName + i;
-    }
-
-    return name;
-  }
-
-  /**
-   * Return a name which is not used by any other service in the definition.
-   * @return String
-   */
-  public static String buildUniqueServiceName(Definition definition)
-  {
-  	List names = getUsedServiceNames(definition);
-
-    // Now search the list until we find an unused name
-    return getUniqueNameHelper("NewService", names);
-  }
-
-  /**
-   * Return a name which is not used by any other binding in the definition.
-   * @return String
-   */
-  public static String buildUniqueBindingName(Definition definition, String baseName)
-  {
-    if (baseName == null)
-    {
-      baseName = "NewBinding";
-    }
-
-    List names = getUsedBindingNames(definition);
-
-    return getUniqueNameHelper(baseName, names);
-  }
-
-  public static String buildUniquePrefix(Definition definition, String basePrefix)
-  {
-    String prefix = basePrefix;
-    for (int i = 1; definition.getNamespace(prefix) != null; i++)
-    {
-      prefix = basePrefix + i;
-    }
-    return prefix;
-  }
-
-  public static String buildUniquePortName(Service service, String baseName)
-  {
-    if (baseName == null)
-    {
-      baseName = "NewPort";
-    }
-  
-    List names = getUsedPortNames(service);
-    
-	return getUniqueNameHelper(baseName, names);
-  }
-	
-  public static String buildUniqueMessageName(Definition definition, MessageReference messRef)
-  {   
-    String name = null;
-    if (messRef instanceof Input)
-    {
-      name = createOperationName(messRef, "Request");    
-    }
-    else if (messRef instanceof Output)
-    {
-      name = createOperationName(messRef, "Response"); 
-    }
-    else if (messRef instanceof Fault)
-    {                                
-      String faultName = ((Fault) messRef).getName();
-      if (faultName == null || faultName.length() == 0)
-      {                     
-        faultName = "Fault";
-      }
-      name = createOperationName(messRef, faultName); 
-    }                                                                     
-
-    return NameUtil.buildUniqueMessageName(definition, name);
-  }
-  
-  
-  public static List getUsedFaultNames(Operation operation) {
-    ArrayList names = new ArrayList();
-    for (Iterator i = operation.getEFaults().iterator(); i.hasNext();)
-    {
-      Fault fault = (Fault) i.next();
-      names.add(fault.getName());
-    }
-    
-    return names;
-  }
-
-  public static List getUsedOperationNames(PortType portType) {
-    ArrayList names = new ArrayList();
-    for (Iterator i = portType.getEOperations().iterator(); i.hasNext();)
-    {
-      Operation op = (Operation) i.next();
-      names.add(op.getName());
-    }
-    
-    return names;
-  }
-  
-  public static List getUsedPartNames(Message message) {
-    ArrayList names = new ArrayList();
-    for (Iterator i = message.getEParts().iterator(); i.hasNext();)
-    {
-      Part part = (Part) i.next();
-      names.add(part.getName());
-    }    
-    return names;
-  }
-  
-  public static List getUsedPortTypeNames(Definition definition) {
-    ArrayList names = new ArrayList();
-    for (Iterator i = definition.getEPortTypes().iterator(); i.hasNext();)
-    {
-      PortType portType = (PortType) i.next();
-      // TODO: port check
-      //			if (portType.isSetQName())
-      if (portType.getQName() != null)
-      {
-        names.add(portType.getQName().getLocalPart());
-      }
-    }
-    
-    return names;
-    
-  }
-  public static List getUsedServiceNames(Definition definition) {
-    // First build a list of names already used
-    ArrayList names = new ArrayList();
-    for (Iterator i = definition.getEServices().iterator(); i.hasNext();)
-    {
-      Service service = (Service) i.next();
-      // TODO: port check
-      // 		if(service.isSetQName())
-      if (service.getQName() != null)
-        names.add(service.getQName().getLocalPart());
-    }
-    
-    return names;
-  }
-  
-  public static List getUsedMessageNames(Definition definition) {
-    ArrayList names = new ArrayList();
-    for (Iterator i = definition.getEMessages().iterator(); i.hasNext();)
-    {
-      Message msg = (Message) i.next();
-      // TODO: port check
-      if (msg.getQName() != null)
-        //			if(msg.isSetQName())
-        names.add(msg.getQName().getLocalPart());
-    }
-    
-    return names;
-  }
-
-  public static List getUsedBindingNames(Definition definition) {
-    ArrayList names = new ArrayList();
-    for (Iterator i = definition.getEBindings().iterator(); i.hasNext();)
-    {
-      Binding binding = (Binding) i.next();
-      // TODO: port check
-      //			if (binding.isSetQName())
-      if (binding.getQName() != null)
-      {
-        names.add(binding.getQName().getLocalPart());
-      }
-    }
-    
-    return names;
-  }
-
-  public static List getUsedPortNames(Service service) {
-    // First build a list of names already used
-    ArrayList names = new ArrayList();
-    for (Iterator i = service.getEPorts().iterator(); i.hasNext();)
-    {
-      Port port = (Port) i.next();
-
-      if (port.getName() != null)
-      {
-        names.add(port.getName());
-      }
-    }
-    
-    return names;
-  }
-  
-  private static String createOperationName(Object object, String suffix)
-  {               
-    String result = null;
-    if (object instanceof EObject)
-    {
-      EObject parent = ((EObject)object).eContainer();
-      if (parent instanceof Operation)
-      {
-        result = ((Operation)parent).getName();
-      }
-    } 
-    if (result != null)
-    {
-      result += suffix;
-    }
-    return result;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/NodeAssociationManager.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/NodeAssociationManager.java
deleted file mode 100644
index 144c9ad3d..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/NodeAssociationManager.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.extension.INodeAssociationProvider;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtension;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtensionRegistry;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class NodeAssociationManager
-{                   
-  protected WSDLEditorExtension[] extensions;
-  protected INodeAssociationProvider[] providers;
-
-  public NodeAssociationManager()
-  {             
-    WSDLEditorExtensionRegistry registry = WSDLEditorPlugin.getInstance().getWSDLEditorExtensionRegistry();
-    extensions = registry.getRegisteredExtensions(WSDLEditorExtension.NODE_ASSOCIATION_PROVIDER); 
-    providers = new INodeAssociationProvider[extensions.length]; 
-    for (int i = 0; i < extensions.length; i++)
-    {
-      providers[i] = (INodeAssociationProvider)extensions[i].createExtensionObject(WSDLEditorExtension.NODE_ASSOCIATION_PROVIDER, null);
-    }
-  }        
-
-  protected INodeAssociationProvider getAppicableProvider(Object object)
-  {
-    INodeAssociationProvider provider = null;
-    for (int i = 0; i < extensions.length; i++)
-    {
-      if (extensions[i].isApplicable(object))
-      {
-        provider = providers[i];
-        if (provider != null)
-        {
-          break;
-        }
-      }
-    }
-    return provider;
-  }
-        
-
-  public Object getModelObjectForNode(Object rootObject, Element targetNode)
-  {                                                                       
-    int currentIndex = 0;
-
-    Element[] elementChain = getParentElementChain((Element)targetNode);
-
-    INodeAssociationProvider p = getAppicableProvider(rootObject);
-    if (p != null)
-    {
-      Node rootObjectNode = p.getNode(rootObject);
-
-      while (currentIndex < elementChain.length)
-      {
-        Element e = elementChain[currentIndex];
-        if (e == rootObjectNode)
-        {                
-          currentIndex++;
-          break;
-        }
-        currentIndex++;
-      }
-    }
-             
-    Object currentObject = rootObject;                        
-    int end[] = new int[1];
-
-    while (currentIndex < elementChain.length)
-    {               
-      p = getAppicableProvider(currentObject);                                                                                             
-      if (p != null)
-      {
-        end[0] = elementChain.length;
-        currentObject = p.getModelObject(currentObject, elementChain, currentIndex, end);
-        
-        if (currentObject == null)
-        {                      
-          // failure
-          break;
-        }                              
-        else
-        {
-          currentIndex = Math.max(end[0], currentIndex + 1);
-        }
-      }
-      else
-      {          
-        break;
-      } 
-    }     
-
-    return (currentIndex == elementChain.length) ? currentObject : null;
-  }  
-           
-
-  public Node getNode(Object modelObject)
-  {          
-    Node result = null;                                                                 
-    if (modelObject instanceof Node)
-    {
-      result = (Node)modelObject;
-    }
-    else
-    {
-      INodeAssociationProvider p = getAppicableProvider(modelObject);               
-      if (p != null)
-      {
-        result = p.getNode(modelObject);
-      }
-    }       
-    return result;
-  }     
-
-  protected Element[] getParentElementChain(Element element)
-  {
-    List list = new ArrayList();
-    while (element != null)
-    {
-      list.add(0, element);
-      Node node = element.getParentNode();
-      element = (node != null && node.getNodeType() == Node.ELEMENT_NODE) ? (Element)node : null;    
-    }                
-
-    int listSize = list.size();
-    Element[] result = new Element[listSize];
-    for (int i = 0; i < listSize; i++)
-    {
-      result[i] = (Element)list.get(i);
-    }             
-    return result;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/OpenOnSelectionHelper.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/OpenOnSelectionHelper.java
deleted file mode 100644
index bfa7fd1f6..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/OpenOnSelectionHelper.java
+++ /dev/null
@@ -1,307 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util;
-
-import java.lang.reflect.Method;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.internal.impl.ImportImpl;
-import org.eclipse.wst.wsdl.internal.util.WSDLSwitch;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-public class OpenOnSelectionHelper extends WSDLSwitch
-{
-  Definition definition;
-  Attr attr = null;
-  Element element = null;
-
-  public OpenOnSelectionHelper(Definition definition)
-  {
-    this.definition = definition;
-  }
-
-  public void openEditor(EObject eObject)
-  {
-    String[] array = computeSpecification(eObject);
-    if (array != null)
-    {
-      openEditor(array[0], array[1]);
-    }
-  }
-
-  public void openEditor(Node node)
-  {
-    String[] array = computeSpecification(node);
-    if (array != null)
-    {
-      openEditor(array[0], array[1]);
-    }
-  }
-
-  protected void openEditor(String resource, String spec)
-  {
-    String pattern = "platform:/resource";
-    if (resource != null && resource.startsWith(pattern))
-    {
-      try
-      {
-        Path path = new Path(resource.substring(pattern.length()));
-        IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
-
-        IWorkbenchPage workbenchPage = WSDLEditorPlugin.getInstance().getWorkbench().getActiveWorkbenchWindow().getActivePage();
-        IEditorPart editorPart = workbenchPage.getActiveEditor();
-        
-        if (editorPart.getEditorInput() instanceof IFileEditorInput &&
-           ((IFileEditorInput)editorPart.getEditorInput()).getFile().equals(file))
-        {  
-        	workbenchPage.getNavigationHistory().markLocation(editorPart);
-        }
-        else
-        {
-          try
-          {
-            if (resource.endsWith("xsd"))
-            {
-              editorPart = workbenchPage.openEditor(new FileEditorInput(file), WSDLEditorPlugin.XSD_EDITOR_ID); 
-            }
-            else
-            {
-              // Since we are already in the wsdleditor
-			        editorPart =  workbenchPage.openEditor(new FileEditorInput(file), editorPart.getEditorSite().getId());
-            }
-          }
-					catch (PartInitException initEx)
- 					{
- 					}
-        }
-
-        Class theClass = editorPart.getClass();
-        Class[] methodArgs = { String.class };
-        Method method = theClass.getMethod("openOnSelection", methodArgs);
-        Object args[] = { spec };
-        method.invoke(editorPart, args);
-        workbenchPage.getNavigationHistory().markLocation(editorPart);
-      }
-      catch (Exception e)
-      {
-      }
-    }
-  }
-
-  public String[] computeSpecification(EObject eObject)
-  {
-    String[] result = null;
-    Object referencedObject = doSwitch(eObject);
-    if (referencedObject instanceof EObject)
-    {
-      EObject referencedEObject = (EObject)referencedObject;
-      if (referencedEObject != eObject || 
-         referencedEObject.eResource() != definition.eResource())
-      {        
-      
-      Resource resource = referencedEObject.eResource();
-      if (resource != null)
-      {
-        result = new String[2];
-        result[0] = resource.getURI().toString();
-        result[1] = resource.getURIFragment(referencedEObject);
-      }
-      }
-    }
-    return result;
-  }
-
-  public String[] computeSpecification(Node node)
-  {
-    String[] result = null;
-    switch (node.getNodeType())
-    {
-      case Node.ELEMENT_NODE :
-        {
-          element = (Element)node;
-          break;
-        }
-      case Node.ATTRIBUTE_NODE :
-        {
-          attr = (Attr)node;
-          element = attr.getOwnerElement();
-          break;
-        }
-      case Node.TEXT_NODE :
-        {
-          Node parent = node.getParentNode();
-          element = (parent instanceof Element) ? (Element)parent : null;
-          break;
-        }
-    }
-    if (element != null)
-    {
-      Object object = WSDLEditorUtil.getInstance().findModelObjectForElement(definition, element);
-      if (object instanceof EObject)
-      {
-        result = computeSpecification((EObject)object);
-      }
-    }
-    return result;
-  }
-
-  public Object caseBinding(Binding binding)
-  {
-    Object result = binding;
-    if (isMatchingAttribute(WSDLConstants.TYPE_ATTRIBUTE))
-    {
-      result = binding.getEPortType();
-    }
-    return result;
-  }
-
-  public Object caseDefinition(Definition definition)
-  {
-    return definition;
-  }
-
-  public Object casePart(Part part)
-  {
-    Object result = part;
-    if (attr != null)
-    {
-      if (isMatchingAttribute(WSDLConstants.TYPE_ATTRIBUTE))
-      {
-        result = part.getTypeDefinition();
-      }
-      else if (isMatchingAttribute(WSDLConstants.ELEMENT_ATTRIBUTE))
-      {
-        result = part.getElement();
-      }
-    }
-    else if (part.getEnclosingDefinition() == definition)
-    {
-      result = part.getTypeDefinition() != null ? (Object)part.getTypeDefinition() : (Object)part.getElement();
-    }
-    return result;
-  }
-
-  public Object casePort(Port port)
-  {
-    Object result = port;
-    if (isMatchingAttribute(WSDLConstants.BINDING_ATTRIBUTE))
-    {
-      result = port.getEBinding();
-
-    }
-    return result;
-  }
-
-  public Object caseFault(Fault fault)
-  {
-    Object result = fault;
-    if (isMatchingAttribute(WSDLConstants.MESSAGE_ATTRIBUTE))
-    {
-      result = fault.getMessage();
-    }
-    return result;
-  }
-
-  public Object caseInput(Input input)
-  {
-    Object result = input;
-    if (isMatchingAttribute(WSDLConstants.MESSAGE_ATTRIBUTE))
-    {
-      result = input.getMessage();
-    }
-    return result;
-  }
-
-  public Object caseOutput(Output output)
-  {
-    Object result = output;
-
-    if (isMatchingAttribute(WSDLConstants.MESSAGE_ATTRIBUTE))
-    {
-      result = output.getMessage();
-    }
-    return result;
-  }
-
-  public Object caseImport(Import theImport)
-  {
-		Object result = null;
-		
-		// For now, look at the file extension.  When bugzilla 118293 is fixed, look at
-		// the Import's eDefinition and eSchema instead.
-		Path importPath = new Path(theImport.getLocationURI());
-		String extension = importPath.getFileExtension();
-		if (extension.equalsIgnoreCase("xsd")) {
-			if (theImport.getESchema() == null) {
-				((ImportImpl)theImport).importDefinitionOrSchema();
-			}
-			
-			result = theImport.getESchema();
-		}
-		else if (extension.equalsIgnoreCase("wsdl")) {
-			if (theImport.getEDefinition() == null) {
-				((ImportImpl)theImport).importDefinitionOrSchema();
-			}
-			
-			result = theImport.getEDefinition();
-		}
-		
-		
-//		if (theImport.getESchema() != null) {
-//			result = theImport.getESchema();
-//		}
-//		else if (theImport.getEDefinition() != null) {
-//			result = theImport.getEDefinition();
-//		}
-//		else {
-//	        // Need to resolve imports because the model doesn't automatically
-//	        // do it for us
-//	        ((ImportImpl)theImport).importDefinitionOrSchema();
-//	        result = theImport.getESchema();
-//	    }
-		
-		return result;
-  }
-
-  public Object caseWSDLElement(WSDLElement wsdlElement)
-  {
-    return wsdlElement;
-  }
-
-  private boolean isMatchingAttribute(String value)
-  {
-    return attr != null && value.equals(attr.getName());
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ReferenceManager.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ReferenceManager.java
deleted file mode 100644
index 8f4153964..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ReferenceManager.java
+++ /dev/null
@@ -1,363 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util;
-        
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.internal.util.WSDLSwitch;
-
-
-public class ReferenceManager
-{                            
-  protected static InternalAdapterFactory internalAdapterFactory = new InternalAdapterFactory();
-
-                                                 
-  public interface Listener
-  {
-    public void bindingsChanged( Operation operation);
-  }     
-
-            
-  public static void adaptDefinition(Definition definition)
-  {
-    internalAdapterFactory.adapt(definition);
-    for (Iterator i = definition.getEBindings().iterator(); i.hasNext(); )
-    {
-      Binding binding = (Binding)i.next();
-      internalAdapterFactory.adaptBinding(binding);
-    }
-  }
-
-                               
-  public static void addBindingListener(Operation operation, Listener listener)
-  {                 
-    OperationAdapter adapter = (OperationAdapter)internalAdapterFactory.adapt(operation);
-    if (adapter != null)
-    {
-      adapter.addListener(listener); 
-    }
-  }
-
-
-  public static void removeBindingListener(Operation operation, Listener listener)
-  { 
-    OperationAdapter adapter = (OperationAdapter)internalAdapterFactory.adapt(operation);
-    if (adapter != null)
-    {
-      adapter.removeListener(listener); 
-    }
-  }
-
-  protected static void fireNotificationForPortType(PortType portType)
-  {
-    // get the adapter for each operation and notify listeners
-    if (portType != null)
-    {
-      for (Iterator i = portType.getEOperations().iterator();  i.hasNext(); )
-      {
-        fireNotificationForOperation((Operation)i.next());
-      }
-    }
-  }
-
-
-  protected static void fireNotificationForOperation(Operation operation)
-  {
-    if (operation != null)
-    {
-      OperationAdapter adapter = (OperationAdapter)internalAdapterFactory.adapt(operation);
-      adapter.fireBindingsChanged();
-    }
-  }
-
-
-  public static class InternalAdapterFactory extends AdapterFactoryImpl
-  {                     
-    public Adapter createAdapter(Notifier target)
-    {                     
-      WSDLSwitch wsdlSwitch = new WSDLSwitch()
-      {                
-      	public Object caseBinding(Binding binding)
-        {   
-          return createBindingAdapter();
-	      }
-
- 	      public Object caseBindingFault(BindingFault bindingFault)
-        {                                      
-          return createBindingFaultAdapter();
-        }   
-
-	      public Object caseBindingOperation(BindingOperation bindingOperation)
-        {   
-          return createBindingOperationAdapter();
-	      } 
-   
-      	public Object caseDefinition(Definition definition)
-        {   
-          return createDefinitionAdapter();
-	      }  
-
-      	public Object caseOperation(Operation operation)
-        {   
-          return createOperationAdapter();
-	      }                
-      };   
-
-      Object o = wsdlSwitch.doSwitch((EObject)target);
-
-      Adapter result = null;
-      if (o instanceof Adapter)
-      {
-        result  = (Adapter)o;
-      }
-      else
-      {          
-        System.out.println("did not create adapter for target : " + target);
-        Thread.dumpStack();
-      }                   
-      //System.out.println("createAdapter(" + target + ") " + result);
-      return result;
-    }      
-                               
-               
-  	public Adapter createBindingAdapter()
-    {
-      return new BindingAdapter();
-    }        
-
- 	  public Adapter createBindingFaultAdapter()
-    {                                      
-      return new BindingFaultAdapter();
-    }     
-
-    public Adapter createBindingOperationAdapter()
-    {     
-      return new BindingOperationAdapter();
-    }      
-
-  	public Adapter createDefinitionAdapter() 
-    {
-		  return new DefinitionAdapter();
-	  } 
-
-  	public Adapter createOperationAdapter() 
-    {
-		  return new OperationAdapter();
-	  }                                      
-
-    public Adapter adapt(Notifier target)
-    {
-      return target != null ? adapt(target, internalAdapterFactory) : null;
-    }
-
-    protected void adaptBinding(Binding binding)     
-    {
-      adapt(binding); 
-      for (Iterator i = binding.getEBindingOperations().iterator(); i.hasNext(); )
-      {
-        BindingOperation bindingOperation = (BindingOperation)i.next();
-        adapt(bindingOperation);    
-        for (Iterator j = bindingOperation.getEBindingFaults().iterator(); j.hasNext(); )
-        {
-          BindingFault bindingFault = (BindingFault)j.next();
-          adapt(bindingFault);  
-        }
-      }
-    }  
-  }  
-  
-
-  protected static abstract class BaseAdapter extends AdapterImpl
-  {
-    public boolean isAdapterForType(Object type)
-    {
-      return type == internalAdapterFactory;
-    }   
-
-    public WSDLPackage getPackage()
-    {
-      return WSDLPackage.eINSTANCE;                        
-    }
-  }
-
-    
-  // DefinitionAdapter
-  //
-  protected static class DefinitionAdapter extends BaseAdapter
-  {                                                                                  
-    public void notifyChanged(Notification msg)
-    {                                
-      if ((EStructuralFeature)msg.getFeature() == getPackage().getDefinition_EBindings())
-      {                           
-        Object newValue = msg.getNewValue();
-        switch (msg.getEventType())
-        {
-          case Notification.ADD:
-          {                                 
-            handleAdd((Binding)newValue);
-            break;
-          }
-          case Notification.ADD_MANY:
-          {
-            for (Iterator newValues = ((Collection)newValue).iterator();  newValues.hasNext(); )
-            {
-              handleAdd((Binding)newValues.next());
-            }
-            break;
-          }       
-        }                                           
-      }    
-    }     
-
-    protected void handleAdd(Binding binding)
-    {  
-      internalAdapterFactory.adaptBinding(binding);
-      PortType portType = binding.getEPortType();
-      if (portType != null)
-      {
-        fireNotificationForPortType(portType);
-      }
-    }
-  }     
-          
-  
-  protected static class BindingAdapter extends BaseAdapter
-  {                      
-    public void notifyChanged(Notification msg)
-    { 
-      if ((EStructuralFeature)msg.getFeature() == getPackage().getBinding_EPortType())
-      {
-        // fireNotifcation for all of the operation of the old and new portType
-        fireNotificationForPortType((PortType)msg.getNewValue());
-        fireNotificationForPortType((PortType)msg.getOldValue());
-      }                                                                        
-      else if ((EStructuralFeature)msg.getFeature() == getPackage().getBinding_EBindingOperations())
-      {
-        // fireNotifcation for all operations that were added or removed
-        Object newValue = msg.getNewValue();
-        Object oldValue = msg.getNewValue();
-        switch (msg.getEventType())
-        {
-          case Notification.ADD:
-          {                                                                    
-            handleAdd((BindingOperation)newValue);
-            break;
-          }
-          case Notification.ADD_MANY:
-          {
-            for (Iterator newValues = ((Collection)newValue).iterator();  newValues.hasNext(); )
-            {
-              handleAdd((BindingOperation)newValues.next());
-            }
-            break;
-          }       
-          case Notification.REMOVE:
-          {                                                                    
-            handleRemove((BindingOperation)oldValue);
-            break;
-          }
-          case Notification.REMOVE_MANY:
-          {
-            for (Iterator oldValues = ((Collection)oldValue).iterator();  oldValues.hasNext(); )
-            {
-              handleRemove((BindingOperation)oldValues.next());
-            }
-            break;
-          }  
-        }                  
-      }
-    }    
-
-    protected void handleAdd(BindingOperation bindingOperation)
-    {
-      internalAdapterFactory.adapt(bindingOperation);
-      Operation operation = ComponentReferenceUtil.computeOperation(bindingOperation);                                                            
-      fireNotificationForOperation(operation);
-    }               
-
-    protected void handleRemove(BindingOperation bindingOperation)
-    {                 
-      if (bindingOperation != null)
-      {
-        Operation operation = ComponentReferenceUtil.computeOperation(bindingOperation);                                                            
-        fireNotificationForOperation(operation);
-      }
-    }   
-  }       
-  
-
-
-  protected static class BindingOperationAdapter extends BaseAdapter
-  {                                      
-    public void notifyChanged(Notification msg)
-    {                                
-      BindingOperation bindingOperation = (BindingOperation)getTarget();
-      Operation operation = ComponentReferenceUtil.computeOperation(bindingOperation);                                                            
-      fireNotificationForOperation(operation);
-    }                
-  }
-  
-
-  protected static class BindingFaultAdapter extends BaseAdapter
-  {                                  
-    public void notifyChanged(Notification msg)
-    {                                       
-      BindingFault bindingFault = (BindingFault)getTarget();
-      BindingOperation bindingOperation = (BindingOperation)bindingFault.eContainer();
-      Operation operation = ComponentReferenceUtil.computeOperation(bindingOperation);                                                            
-      fireNotificationForOperation(operation);
-    }                
-  } 
-  
-
-  protected static class OperationAdapter extends BaseAdapter 
-  {     
-    protected Definition definition;
-    protected List listeners = new ArrayList();
-
-    public void addListener(Listener listener)
-    {
-      listeners.add(listener);
-    }
-
-    public void removeListener(Listener listener)
-    {
-      listeners.remove(listener);
-    }   
-
-    public void fireBindingsChanged()
-    {                            
-      Operation operation = (Operation)getTarget();
-      for (Iterator i = listeners.iterator(); i.hasNext(); )
-      {                                   
-        Listener listener = (Listener)i.next();
-        listener.bindingsChanged(operation);
-      }
-    }         
-  }   
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/SelectionAdapter.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/SelectionAdapter.java
deleted file mode 100644
index 9f1fda475..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/SelectionAdapter.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-
-// This class is used to help syncronize selections between two models.
-//
-public abstract class SelectionAdapter implements ISelectionProvider
-{ 
-  protected List listenerList = new ArrayList();
-  protected ISelection selection = new StructuredSelection();
-  protected ISelectionProvider eventSource;
-
-  public void setEventSource(ISelectionProvider eventSource)
-  {
-    this.eventSource = eventSource;
-  }
-
-  public void addSelectionChangedListener(ISelectionChangedListener listener) 
-  {
-    listenerList.add(listener);
-  }
-
-  public void removeSelectionChangedListener(ISelectionChangedListener listener) 
-  {
-    listenerList.remove(listener);
-  }                    
-
-  public ISelection getSelection() 
-  {
-    return selection;
-  }    
-  
-  /**
-   * This method should be specialized to return the correct object that corresponds to the 'other' model
-   */
-  abstract protected Object getObjectForOtherModel(Object object);
-
-    
-  public void setSelection(ISelection modelSelection)  
-  { 
-    List otherModelObjectList = new ArrayList();
-    if (modelSelection instanceof IStructuredSelection)
-    {
-      for (Iterator i = ((IStructuredSelection)modelSelection).iterator(); i.hasNext(); )
-      {
-        Object modelObject = i.next(); 
-        Object otherModelObject = getObjectForOtherModel(modelObject);       
-        if (otherModelObject != null)
-        { 
-          otherModelObjectList.add(otherModelObject);
-        }
-      }
-    }                
-      
-    StructuredSelection nodeSelection = new StructuredSelection(otherModelObjectList);
-    selection = nodeSelection;
-    SelectionChangedEvent event = new SelectionChangedEvent(eventSource != null ? eventSource : this, nodeSelection);
-
-    for (Iterator i = listenerList.iterator(); i.hasNext(); )
-    {
-      ISelectionChangedListener listener = (ISelectionChangedListener)i.next();
-      listener.selectionChanged(event);
-    }
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ValidateHelper.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ValidateHelper.java
deleted file mode 100644
index 677932219..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ValidateHelper.java
+++ /dev/null
@@ -1,405 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util;
-
-import org.eclipse.wst.common.ui.internal.UIPlugin;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-public class ValidateHelper
-{
-  // XML Lang can have many different valid formats
-  // 1) xx      ie. en, fr, de
-  // 2) xx-xx   ie. en-US, en-FR
-  // 3) I-xx    ie. I-en
-  // 4) X-xx    ie. X-en
-  public static String checkXMLLang(String lang)
-  {
-    if (lang.length() == 0) 
-      return null;
-    
-    if (lang.length() == 1) 
-    {
-      char ch0 = lang.charAt(0);
-      if ((ch0 >= 'a' && ch0 <= 'z') || (ch0 >= 'A' && ch0 <= 'Z'))
-        return UIPlugin.getResourceString("_WARN_LANG_TOO_SHORT");
-      else
-        return UIPlugin.getResourceString("_WARN_NAME_INVALID_CHAR") + ch0 + 
-        UIPlugin.getResourceString("_UI_NAME_INVALID_CHAR_END");          
-    }
-    
-    int offset;
-
-    char ch0 = lang.charAt(0);
-    if (lang.charAt(1) == '-') 
-    {
-      if (ch0 == 'i' || ch0 == 'I' || ch0 == 'x' || ch0 == 'X') 
-        offset = 1;
-      else
-        return UIPlugin.getResourceString("_WARN_NAME_INVALID_CHAR") + ch0 + 
-        UIPlugin.getResourceString("_UI_NAME_INVALID_CHAR_END");
-    }
-    else
-    {
-      char ch1 = lang.charAt(1);
-      if ((ch0 >= 'a' && ch0 <= 'z') || (ch0 >= 'A' && ch0 <= 'Z'))
-        if ((ch1 >= 'a' && ch1 <= 'z') || (ch1 >= 'A' && ch1 <= 'Z'))
-          offset = 2;
-        else
-          return UIPlugin.getResourceString("_WARN_NAME_INVALID_CHAR") + ch1 + 
-          UIPlugin.getResourceString("_UI_NAME_INVALID_CHAR_END");
-      else
-        return UIPlugin.getResourceString("_WARN_NAME_INVALID_CHAR") + ch0 + 
-        UIPlugin.getResourceString("_UI_NAME_INVALID_CHAR_END");
-    }
-
-    if (lang.length() > offset) 
-    {
-      char ch = lang.charAt(offset++);
-      if (ch != '-') 
-        return UIPlugin.getResourceString("_WARN_HYPHEN_NEEDED") + Integer.toString(offset-1);        
-      else 
-      {
-        while (true) 
-        {
-          if (ch == '-') 
-          {
-            if (lang.length() == offset) 
-              return UIPlugin.getResourceString("_WARN_HYPHEN_ENDING");
-            
-            ch = lang.charAt(offset++);
-            if ((ch < 'a' || ch > 'z') && (ch < 'A' || ch > 'Z')) 
-              return UIPlugin.getResourceString("_WARN_NAME_INVALID_CHAR") + ch + 
-              UIPlugin.getResourceString("_UI_NAME_INVALID_CHAR_END");
-            
-            if (lang.length() == offset)
-              return null;
-          } 
-          else if ((ch < 'a' || ch > 'z') && (ch < 'A' || ch > 'Z')) 
-            return UIPlugin.getResourceString("_WARN_NAME_INVALID_CHAR") + ch + 
-            UIPlugin.getResourceString("_UI_NAME_INVALID_CHAR_END");             
-          else if (lang.length() == offset)
-            return null;
-          ch = lang.charAt(offset++);
-        }
-      }
-    }
-
-    return null;
-  }
-  
-  /**
-   * Check to see if the min value is correct.
-   * A minimum value must be non-negative and < maxValue
-   */
-  public static String isValidMinValue(String minValue, String maxValue)
-  {
-    int min;
-
-    if (minValue == null || minValue.equals(""))
-    {
-      // Nothing to check
-      return null;
-    }
-
-    try
-    {
-      min = Integer.parseInt(minValue);
-    }
-    catch (NumberFormatException ex)
-    {
-      return UIPlugin.getResourceString("_ERROR_MIN_NOT_POSITIVE");
-    }
-
-    if (min < 0) 
-    {
-      return UIPlugin.getResourceString("_ERROR_MIN_NOT_POSITIVE");
-    }
-
-    try
-    {
-      int max = Integer.parseInt(maxValue);
-      if (min > max) 
-      {
-        return UIPlugin.getResourceString("_ERROR_MIN_VALUE");
-      }
-    }
-    catch (NumberFormatException ex)
-    {
-      // Max is not accurate. Don't compare it.
-    }
-    return null;
-  }
-
-  /**
-   * Check to see if the max value is correct.
-   * A maximum value must be non-negative and > minValue
-   *
-   * It can also be set the string "unbounded"
-   */
-  public static String isValidMaxValue(String maxValue, String minValue)
-  {
-    int max;
-
-    if (maxValue == null || maxValue.equals("")) 
-    {
-      // Nothing to check
-      return null;
-    }
-
-    if (maxValue.equals("unbounded"))
-    {
-      return null;
-    }
-
-    try
-    {
-      max = Integer.parseInt(maxValue);
-    }
-    catch (NumberFormatException ex)
-    {
-      return UIPlugin.getResourceString("_ERROR_MAX_NOT_POSITIVE");
-    }
-
-    if (max < 0) 
-    {
-      return UIPlugin.getResourceString("_ERROR_MAX_NOT_POSITIVE");
-    }
-
-    try
-    {
-      int min = Integer.parseInt(minValue);
-      if (max < min) 
-      {
-        return UIPlugin.getResourceString("_ERROR_MAX_VALUE");
-      }
-    }
-    catch (NumberFormatException ex)
-    {
-      // Min is not accurate. Don't compare it.
-    }
-    return null;
-  }
-
-  /**
-   * Validate the name conforms to the XML spec
-   */
-  public static String checkXMLName(String name, boolean allowEntityRef)
-  {
-    int length = name.length();
-    char character;
-
-    if (length == 0) 
-    {
-      return WSDLEditorPlugin.getWSDLString("_WARN_NAME_MUST_CONTAIN_AT_LEAST_ONE_CHAR");
-    }
-    
-    if (name.indexOf(" ") >= 0)
-    {
-      return(WSDLEditorPlugin.getWSDLString("_WARN_NAME_HAS_SPACE"));
-    }
-
-    int index = 0;
-    if (length > 0 &&
-        name.charAt(0) == '%')
-    {
-      if (allowEntityRef) 
-      {
-        // skip over the first character 
-        index++;
-      } // end of if ()
-      else
-      {
-        return WSDLEditorPlugin.getWSDLString("_WARN_NAME_INVALID_FIRST");
-      } // end of else
-    }
-    
-    for(; index < length; index++)
-    {
-      character = name.charAt(index);
-
-      if(index == 0)
-      {
-        if( !isXMLNameStart(character) )
-        {
-          return WSDLEditorPlugin.getWSDLString("_WARN_NAME_INVALID_FIRST");
-        }
-      }
-      else
-      {
-        if(!isXMLNameChar(character))
-        {
-          if ((index == length - 1) && //check if the last character is a ';'
-              allowEntityRef &&
-              character == ';')
-          {
-            // we're still ok then
-            continue;
-          } // end of if ()
-          else 
-          {
-            return WSDLEditorPlugin.getWSDLString("_WARN_NAME_INVALID_CHAR") + character + 
-            WSDLEditorPlugin.getWSDLString("_UI_NAME_INVALID_CHAR_END");
-          } // end of else
-        }
-      }
-    }
-    return null;
-  }
-
-  /**
-   * Validate the name conforms to the XML spec
-   */
-  public static String checkXMLName(String name)
-  {
-    return checkXMLName(name, false);
-  }
-
-  /**
-   * isXMLNameStart
-   **/
-  private static boolean isXMLNameStart(char ch)
-  {
-    return (ch == '_' || ch == ':' || Character.isLetter(ch) );
-  }
-
-  /**
-   * isXMLNameChar
-   **/
-  private static boolean isXMLNameChar(char ch)
-  {
-    return (Character.isLetterOrDigit(ch) || ch == '.' || ch == '-' || ch == '_' || ch == ':');
-  }
-
-  /**
-   * isXMLPrefixStart
-   **/
-//  private static boolean isXMLPrefixStart(char ch)
-//  {
-//    return (ch == '_' || Character.isLetter(ch) );
-//  }
-
-  /**
-   * isXMLPrefixChar
-   **/
-  private static boolean isXMLPrefixChar(char ch)
-  {
-    return (Character.isLetterOrDigit(ch) || ch == '.' || ch == '-' || ch == '_');
-  }
-
-  /**
-   * parseElementText
-   */
-  public static String parseElementText(String text)
-  {
-    if (text.indexOf('<') != -1 || text.indexOf('>') != -1)
-    {
-      return UIPlugin.getResourceString("_WARN_ELEMENT_INVALID_CHAR");
-    }
-    return null;
-  }
-
-  /**
-   * parseAttributeValue
-   */
-  public static String parseAttributeValue(String value)
-  {
-    if (value.indexOf('"') != -1 || value.indexOf('<') != -1 || value.indexOf('>') != -1)
-    {
-      return UIPlugin.getResourceString("_WARN_ATTRIBUTE_INVALID_CHAR");
-
-    }
-    return null;
-  }
-
-  /**
-   * parseADATASection
-   */
-  public static String parseCDATASection(String section)
-  {
-    if (section.indexOf("]]>") != -1)
-    {
-      return UIPlugin.getResourceString("_WARN_CDATA_INVALID_STRING");
-
-    }
-    return null;
-  }
-
-  /**
-   * parseProcessiingInstruction
-   */
-  public static String parseProcessingInstructionData(String data)
-  {
-    if (data.indexOf("?>") != -1)
-    {
-      return UIPlugin.getResourceString("_WARN_PROCESSING_INVALID_STRING");
-
-    }
-    return null;
-  }
-
-  /**
-   * parseProcessingInstructionTarget
-   */
-  public static String parseProcessingInstructionTarget(String target)
-  {
-    if (target.length() == 3 && (target.indexOf("XML") != -1 || target.indexOf("XMl") != -1 || target.indexOf("XmL") != -1 ||
-        target.indexOf("xML") != -1 || target.indexOf("Xml") != -1 || target.indexOf("xMl") != -1 ||
-        target.indexOf("xmL") != -1 || target.indexOf("xml") != -1))
-    {
-      return UIPlugin.getResourceString("_WARN_PROCESSING_TARGET_INVALID_STRING");
-
-    }
-    return checkXMLName(target);
-  }
-
-  /**
-   * parsComment
-   */
-  public static String parseComment(String comment)
-  {
-    if (comment.indexOf("--") != -1)
-    {
-      return UIPlugin.getResourceString("_WARN_COMMENT_INVALID_STRING");
-    }
-    return null;
-  }
-  
-  /**
-   * Validate the prefix conforms to the XML spec
-   */
-  public static String checkXMLPrefix(String prefix)
-  {
-    int length = prefix.length();
-    if (length == 0)
-    {
-      return null;
-    }
-    char character;
-    
-    if (prefix.indexOf(" ") >= 0)
-    {
-      return(UIPlugin.getResourceString("_WARN_PREFIX_HAS_SPACE"));
-    }
-    
-    for(int index = 0; index < length; index++)
-    {
-      character = prefix.charAt(index);
-
-      if(!isXMLPrefixChar(character))
-      {
-        return UIPlugin.getString("_WARN_PREFIX_INVALID_CHAR", String.valueOf(character));
-      }
-    }
-    return null;
-  }
-
-}
-
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLEditorUtil.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLEditorUtil.java
deleted file mode 100644
index 2fa47f748..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLEditorUtil.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ExtensibleElement;
-import org.eclipse.wst.wsdl.MessageReference;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.Types;
-import org.eclipse.wst.wsdl.ui.internal.extension.ITypeSystemProvider;
-import org.eclipse.wst.wsdl.ui.internal.typesystem.ExtensibleTypeSystemProvider;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class WSDLEditorUtil extends WSDLConstants
-{
-  protected static WSDLEditorUtil instance;
-  protected NodeAssociationManager nodeAssociationManager = new NodeAssociationManager();
-
-  protected HashMap elementNameToTypeMap = new HashMap();
-  
-  public static final int ELEMENT = 14;
-  public static final int TYPE = 15;
-
-  public static WSDLEditorUtil getInstance()
-  {
-    if (instance == null)
-    {
-      instance = new WSDLEditorUtil();
-    }
-    return instance;
-  }
-
-  public WSDLEditorUtil()
-  {
-    elementNameToTypeMap.put(BINDING_ELEMENT_TAG, new Integer(BINDING));
-    elementNameToTypeMap.put(DEFINITION_ELEMENT_TAG, new Integer(DEFINITION));
-    elementNameToTypeMap.put(DOCUMENTATION_ELEMENT_TAG, new Integer(DOCUMENTATION));
-    elementNameToTypeMap.put(FAULT_ELEMENT_TAG, new Integer(FAULT));
-    elementNameToTypeMap.put(IMPORT_ELEMENT_TAG, new Integer(IMPORT));
-    elementNameToTypeMap.put(INPUT_ELEMENT_TAG, new Integer(INPUT));
-    elementNameToTypeMap.put(MESSAGE_ELEMENT_TAG, new Integer(MESSAGE));
-    elementNameToTypeMap.put(OPERATION_ELEMENT_TAG, new Integer(OPERATION));
-    elementNameToTypeMap.put(OUTPUT_ELEMENT_TAG, new Integer(OUTPUT));
-    elementNameToTypeMap.put(PART_ELEMENT_TAG, new Integer(PART));
-    elementNameToTypeMap.put(PORT_ELEMENT_TAG, new Integer(PORT));
-    elementNameToTypeMap.put(PORT_TYPE_ELEMENT_TAG, new Integer(PORT_TYPE));
-    elementNameToTypeMap.put(SERVICE_ELEMENT_TAG, new Integer(SERVICE));
-    elementNameToTypeMap.put(TYPES_ELEMENT_TAG, new Integer(TYPES));
-  }
-
-  public int getWSDLType(Element element)
-  {
-    int result = -1;
-
-    Integer integer = (Integer)elementNameToTypeMap.get(element.getLocalName());
-    if (integer != null)
-    {
-      result = integer.intValue();
-    }
-    return result;
-  }
-
-  protected List getParentElementChain(Element element)
-  {
-    List list = new ArrayList();
-    while (element != null)
-    {
-      list.add(0, element);
-      Node node = element.getParentNode();
-      element = (node != null && node.getNodeType() == Node.ELEMENT_NODE) ? (Element)node : null;
-    }
-    return list;
-  }
-
-  public Object findModelObjectForElement(Definition definition, Element targetElement)
-  {
-    Object o = nodeAssociationManager.getModelObjectForNode(definition, targetElement);
-    return o;
-  }
-
-  public Element getElementForObject(Object o)
-  {
-    return ((org.eclipse.wst.wsdl.WSDLElement)o).getElement();
-  }
-
-  public Node getNodeForObject(Object o)
-  {
-    return nodeAssociationManager.getNode(o);
-  }
-
-  // Provide a mapping between Definitions and ITypeSystemProviders
-  private Hashtable typeSystemProviders = new Hashtable();
-  private ITypeSystemProvider typeSystemProvider;
-  
-  public ITypeSystemProvider getTypeSystemProvider(Definition definition)
-  {
-	  if (typeSystemProvider == null) {
-		  typeSystemProvider = new ExtensibleTypeSystemProvider();
-	  }
-	  return typeSystemProvider;
-  }
-
-  public void setTypeSystemProvider(Definition definition, ITypeSystemProvider typeSystemProvider)
-  {
- //   typeSystemProviders.put(definition,typeSystemProvider);
-  }
-
-  public static QName createQName(Definition definition, String prefixedName)
-  {
-    QName qname = null;
-    if (prefixedName != null)
-    {
-      int index = prefixedName.indexOf(":");
-      String prefix = (index == -1) ? null : prefixedName.substring(0, index);
-      if (prefix != null)
-      {
-        String namespace = definition.getNamespace(prefix);
-        if (namespace != null)
-        {
-          String localPart = prefixedName.substring(index + 1);
-          qname = new QName(namespace, localPart);
-        }
-      }
-    }
-    return qname;
-  }
-
-  public List getExtensibilityElementNodes(ExtensibleElement extensibleElement)
-  {
-    // For Types, I need to get all the schemas
-    if (extensibleElement instanceof Types)
-    {
-      Types xsdEE = (Types)extensibleElement;
-      return xsdEE.getSchemas();
-    }
-    /*
-    List childList = new ArrayList();
-
-    Element parentElement = getElementForObject(extensibleElement);
-    if (parentElement != null)
-    {
-
-      NodeList nodeList = parentElement.getChildNodes();
-      int nodeListLength = nodeList.getLength();
-      for (int i = 0; i < nodeListLength; i++)
-      {
-        childList.add(nodeList.item(i));
-      }
-      HashMap extensibleElementTable = new HashMap();
-      for (Iterator i = extensibleElement.getEExtensibilityElements().iterator(); i.hasNext();)
-      {
-        ExtensibilityElement extensibilityElement = (ExtensibilityElement)i.next();
-        if (extensibilityElement != null)
-        {
-          Element element = getElementForObject(extensibilityElement);
-          if (element != null)
-          {
-            extensibleElementTable.put(element, element);
-          }
-        }
-      }
-
-      for (Iterator i = childList.iterator(); i.hasNext();)
-      {
-        Object o = i.next();
-        if (extensibleElementTable.get(o) == null)
-        {
-          i.remove();
-        }
-      }
-    }
-    return childList;
-    */
-    return extensibleElement.getEExtensibilityElements();
-  }
-
-  /*
-   * Returns a list of 'children' of the given object model (WSDLElement).
-   */
-  public static List getModelGraphViewChildren(Object object) {
-  	List childList = new ArrayList();
-  	
-  	if (object instanceof PortType) {
-  		PortType portType = (PortType) object;
-        childList.addAll(portType.getOperations());
-  	}
-  	else if (object instanceof Operation) {
-  		Operation operation = (Operation) object;
-  		
-  		if (operation.getEInput() != null) {
-  			childList.add(operation.getEInput());
-  		}
-  		if (operation.getEOutput() != null) {
-  			childList.add(operation.getEOutput());
-  		}
-  		childList.addAll(operation.getFaults().values());
-  	}
-  	else if (object instanceof MessageReference) {
-  		MessageReference messageReference = (MessageReference) object;
-  		childList.add(messageReference.getEMessage());
-  	}  	
-  	
-  	return childList;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLModelLocatorAdapterFactory.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLModelLocatorAdapterFactory.java
deleted file mode 100644
index 60724abad..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLModelLocatorAdapterFactory.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
-import org.eclipse.wst.wsdl.internal.util.WSDLModelLocator;
-
-public class WSDLModelLocatorAdapterFactory extends AdapterFactoryImpl
-{
-  protected CustomWSDLModelLocator customWSDLModelLocator = new CustomWSDLModelLocator();
-  
-  class CustomWSDLModelLocator extends AdapterImpl implements WSDLModelLocator
-  {
-    public String resolveURI(String baseLocation, String namespace, String location)
-    {
-      return URIResolverPlugin.createResolver().resolve(baseLocation, namespace, location);
-    }
-
-    public boolean isAdatperForType(Object type)
-    {
-      return type == WSDLModelLocator.class;
-    }
-  }
-
-  public boolean isFactoryForType(Object type)
-  {
-    return type == WSDLModelLocator.class;
-  }
-
-  public Adapter adaptNew(Notifier target, Object type)
-  {
-    return customWSDLModelLocator;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLNodeAssociationProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLNodeAssociationProvider.java
deleted file mode 100644
index ddc335303..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLNodeAssociationProvider.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util;      
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.internal.impl.WSDLElementImpl;
-import org.eclipse.wst.wsdl.ui.internal.extension.INodeAssociationProvider;
-import org.eclipse.xsd.impl.XSDComponentImpl;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class WSDLNodeAssociationProvider implements INodeAssociationProvider
-{                    
-  public Object getModelObject(Object parentModelObject, Element[] elementChain, int start, int[] end)
-  {                 
-    Object currentObject = parentModelObject;
-    for (int i = start; i < elementChain.length; i++)
-    {
-      Object o = getModelObjectHelper(currentObject, elementChain[i]);
-      if (o == null)
-      {              
-        end[0] = i;
-        break;
-      }            
-      else
-      {              
-        currentObject = o;
-      }
-    }                                                               
-    return currentObject != parentModelObject ? currentObject : null;                                                  
-  }
-
-  public Node getNode(Object modelObject)
-  {
-    if (modelObject instanceof WSDLElement)
-      return ((WSDLElementImpl)modelObject).getElement();
-    else
-      return null;
-  }
-      
-  protected Object getModelObjectHelper(Object parentObject, Element elementNode)
-  {          
-		Object result = null;
-		Collection childComponentList = ((WSDLElementImpl) parentObject).getWSDLContents();
-		for (Iterator i = childComponentList.iterator(); i.hasNext();)
-		{
-			Object o = i.next();
-			Element element = null;
-
-      if (o != null)
-      {
-        if (o instanceof WSDLElementImpl)
-        {
-          element = ((WSDLElementImpl)o).getElement();
-        }
-        else if (o instanceof XSDComponentImpl)
-        {
-          element = ((XSDComponentImpl)o).getElement();
-        }
-      }
-      
-			if (element == elementNode)
-			{
-				result = o;
-				break;
-			}
-		}
-		return result;
-  }
-}    
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLPreferencePage.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLPreferencePage.java
deleted file mode 100644
index a51b5e8a9..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLPreferencePage.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util;
-
-import org.eclipse.jface.preference.BooleanFieldEditor;
-import org.eclipse.jface.preference.FieldEditorPreferencePage;
-import org.eclipse.jface.preference.StringFieldEditor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-public class WSDLPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
-
-  public WSDLPreferencePage()
-  {
-    super(FieldEditorPreferencePage.FLAT);
-    setPreferenceStore(WSDLEditorPlugin.getInstance().getPreferenceStore());
-  }
-
-  public void init(IWorkbench workbench)
-  {
-  }
-
-  protected void createFieldEditors()
-  {
-    Composite parent = getFieldEditorParent();
-	GridLayout parentLayout = new GridLayout();
-	parentLayout.marginWidth = 0;
-	parent.setLayout(parentLayout);
-	
-//    WorkbenchHelp.setHelp(getControl(), some context id here); 
-
-	Group group = new Group(parent, SWT.NULL);
-    GridLayout layout = new GridLayout();
-    layout.marginWidth = 0;
-    layout.numColumns = 2;
-    group.setLayout(layout);
-    group.setText(WSDLEditorPlugin.getWSDLString("_UI_PREF_PAGE_CREATING_FILES"));
-
-    GridData data = new GridData();
-    data.verticalAlignment = GridData.FILL;
-    data.horizontalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    group.setLayoutData(data);
-    
-    Composite composite = new Composite(group, SWT.NULL);
-    GridData data1 = new GridData();
-    data1.verticalAlignment = GridData.FILL;
-    data1.horizontalAlignment = GridData.FILL;
-    data1.grabExcessHorizontalSpace = true;
-    composite.setLayoutData(data1);
-	
-	String namespaceLabel = WSDLEditorPlugin.getWSDLString("_UI_PREF_PAGE_DEFAULT_TARGET_NAMESPACE"); 
-    StringFieldEditor targetNamespace = new StringFieldEditor(namespaceLabel, namespaceLabel, composite); // Externalize
-    GridLayout compositeLayout = (GridLayout)composite.getLayout();
-    compositeLayout.marginWidth = 5;   // Default value
-    compositeLayout.numColumns = 2;
-    addField(targetNamespace);
-    targetNamespace.setFocus();
-	
-	String generateLabel = WSDLEditorPlugin.getWSDLString("_UI_PREF_PAGE_AUTO_REGENERATE_BINDING");
-	BooleanFieldEditor generateBindingOnSave = new BooleanFieldEditor(generateLabel, generateLabel, parent);
-	addField(generateBindingOnSave);
-	
-	String showGenerateDialogLabel = "Prompt Regenerate Binding on save";   // TODO: Externalize
-	BooleanFieldEditor showGenerateDialog = new BooleanFieldEditor(showGenerateDialogLabel, showGenerateDialogLabel, parent);
-	addField(showGenerateDialog);
-
-    /* Do we need this preference below?  If so, change WSDLEditorPlugin.java and use this preference in:
-       HttpContentGenerator.java
-       SoapContentGenerator.java
-       SoapPortOptionsPage.java
-    */
-//    HttpPortOptionsPage.java    StringFieldEditor location = new StringFieldEditor("Defualt Location:", "Default Location:", editorGroup1); // Externalize
-//    addField(location);    
-    
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLResourceUtil.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLResourceUtil.java
deleted file mode 100644
index 8b1dd18db..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLResourceUtil.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util;
-
-import java.util.Iterator;
-
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
-import org.eclipse.wst.common.uriresolver.internal.util.URIHelper;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.Types;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.wsdl.internal.impl.WSDLElementImpl;
-import org.eclipse.wst.wsdl.internal.util.WSDLModelLocator;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSchemaDirective;
-import org.w3c.dom.Element;
-
-
-public class WSDLResourceUtil
-{
-  public static void reloadDirectives(Definition definition)
-  {
-    Resource rootResource = definition.eResource();
-    ResourceSet resourceSet = rootResource.getResourceSet();
-
-    for (Iterator i = resourceSet.getResources().iterator(); i.hasNext();)
-    {
-      Resource resource = (Resource) i.next();
-      if (resource != rootResource)
-      {
-        //  TODO... consider unloading the resources  	
-        //  resource.unload();		      
-        i.remove();
-      }
-    }
-    ReloadDirectiveVisitor visitor = new ReloadDirectiveVisitor();
-    visitor.visitDefinition(definition);
-  }
-
-  static class ReloadDirectiveVisitor
-  {
-
-    public void visitImport(Import theImport)
-    {
-      // force the import to reload
-      Element element = WSDLEditorUtil.getInstance().getElementForObject(theImport);
-      if (element != null)
-      {
-        ((WSDLElementImpl)theImport).elementChanged(element);
-      }
-    }
-
-    public void visitXSDSchemaDirective(XSDSchemaDirective directive)
-    {
-      // force the schema directive to reload
-      Element element = directive.getElement();
-      if (element != null)
-      {
-        directive.elementAttributesChanged(element);
-      }
-    }
-
-    public void visitDefinition(Definition definition)
-    {
-      if (definition != null)
-      {
-        for (Iterator i = definition.getEImports().iterator(); i.hasNext();)
-        {
-          visitImport((Import) i.next());
-        }
-        Types types = definition.getETypes();
-        if (types != null)
-        {
-
-          for (Iterator i = types.getEExtensibilityElements().iterator(); i.hasNext();)
-          {
-            Object o = i.next();
-            if (o instanceof XSDSchemaExtensibilityElement)
-            {
-              XSDSchemaExtensibilityElement e = (XSDSchemaExtensibilityElement) o;
-              if (e.getSchema() != null)
-              {
-                visitSchema(e.getSchema());
-              }
-            }
-          }
-        }
-      }
-    }
-
-    public void visitSchema(XSDSchema schema)
-    {
-      for (Iterator i = schema.getContents().iterator(); i.hasNext();)
-      {
-        Object o = i.next();
-        if (o instanceof XSDSchemaDirective)
-        {
-          visitXSDSchemaDirective((XSDSchemaDirective) o);
-        }
-      }
-    }
-  }
-
-
-  public static class InternalURIResolver implements WSDLModelLocator
-  {
-    //IdResolver idResolver = new IdResolverImpl(null, true);
-    org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver resolver = URIResolverPlugin.createResolver();
-
-    InternalURIResolver()
-    {  
-    }
-
-    public String resolveURI(String baseLocation, String namespace, String location)
-    {
-      String resolvedLocation = resolver.resolve(baseLocation, namespace, location);
-
-      // here's an ugly hack... Platform.resolve() returns Windows files with the pattern "file:D:/hello.xsd"
-      // but EMF's URI class expects a pattern like this "file:///D:/hello.xsd"
-      //        
-      if (resolvedLocation != null)
-      {
-		String fileProtocol = "file:";      	
-        if (resolvedLocation.startsWith(fileProtocol) && !resolvedLocation.startsWith(fileProtocol + "/"))
-        {
-          resolvedLocation = resolvedLocation.substring(fileProtocol.length());
-        }
-        resolvedLocation = URIHelper.addImpliedFileProtocol(resolvedLocation);
-      }
-      // end ugly hack
-      return resolvedLocation;
-    }
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/XMLQuickScan.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/XMLQuickScan.java
deleted file mode 100644
index 7f338b73e..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/XMLQuickScan.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util;
-
-import java.io.InputStream;
-import java.net.URL;
-
-import javax.xml.transform.TransformerFactory;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- *
- */
-public class XMLQuickScan
-{            
-  public static String getTargetNamespaceURIForSchema(String uri)
-  {
-    String result = null;
-    try
-    {             
-      URL url = new URL(uri);
-      InputStream inputStream = url.openStream();
-      result = XMLQuickScan.getTargetNamespaceURIForSchema(inputStream); 
-    }
-    catch (Exception e)
-    {      
-    }  
-    return result;
-  }
-
-  public static String getTargetNamespaceURIForSchema(InputStream input)
-  {  
-    TargetNamespaceURIContentHandler handler = new TargetNamespaceURIContentHandler();                                                                  
-    ClassLoader prevClassLoader = Thread.currentThread().getContextClassLoader();
-    Thread.currentThread().setContextClassLoader(XMLQuickScan.class.getClassLoader());
-    // Line below is a hack to get XMLReader working
-    TransformerFactory transformerFactory = TransformerFactory.newInstance();
-    try
-    {
-    	XMLReader reader = org.xml.sax.helpers.XMLReaderFactory.createXMLReader();
-    	reader.setContentHandler(handler);
-    	reader.parse(new InputSource(input));
-    }
-    catch (Exception e)
-    {      
-    }
-    finally
-    {
-      Thread.currentThread().setContextClassLoader(prevClassLoader);
-    }
-    return handler.targetNamespaceURI;
-  }  
-
-  protected static class TargetNamespaceURIContentHandler extends DefaultHandler
-  {       
-    public String targetNamespaceURI;
-
-    public void startElement(String uri, String localName, String qName, Attributes attributes)  throws SAXException
-    {            
-      if (localName.equals("schema") || localName.equals("definitions"))
-      {               
-        int nAttributes = attributes.getLength();
-        for (int i = 0; i < nAttributes; i++)
-        {
-          if (attributes.getLocalName(i).equals("targetNamespace"))
-          {
-            targetNamespaceURI = attributes.getValue(i);
-            break;
-          }
-        }
-      }                                    
-      // todo there's a ice way to do this I'm sure    
-      // here I intentially cause an exception... 
-      String x = null;
-      x.length();
-    }
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/XSDSchemaLocationResolverAdapterFactory.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/XSDSchemaLocationResolverAdapterFactory.java
deleted file mode 100644
index 64b9ae85c..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/XSDSchemaLocationResolverAdapterFactory.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.xsd.util.XSDSchemaLocationResolver;
-
-public class XSDSchemaLocationResolverAdapterFactory extends AdapterFactoryImpl
-{
-    protected XSDSchemaLocationResolverImpl schemaLocator = new XSDSchemaLocationResolverImpl();
-
-    public boolean isFactoryForType(Object type)
-    {
-      return type == XSDSchemaLocationResolver.class;
-    }
-
-    public Adapter adaptNew(Notifier target, Object type)
-    {
-      return schemaLocator;
-    }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/XSDSchemaLocationResolverImpl.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/XSDSchemaLocationResolverImpl.java
deleted file mode 100644
index 306a2e80d..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/XSDSchemaLocationResolverImpl.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util;
-
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.util.XSDSchemaLocationResolver;
-import org.eclipse.xsd.util.XSDSchemaLocator;
-
-public class XSDSchemaLocationResolverImpl extends AdapterImpl implements XSDSchemaLocationResolver
-{
-    public String resolveSchemaLocation(XSDSchema xsdSchema, String namespaceURI, String schemaLocationURI)
-    {
-      String baseLocation = xsdSchema.getSchemaLocation();      
-      String result = URIResolverPlugin.createResolver().resolve(baseLocation, namespaceURI, schemaLocationURI);
-      if (result == null) {
-      	result = namespaceURI;
-      }
-      if (result == null) {
-      	result = "";
-      }
-
-      return result;
-    }
-
-    public boolean isAdatperForType(Object type)
-    {
-      return type == XSDSchemaLocator.class;
-    }  
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/FlatPageHeader.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/FlatPageHeader.java
deleted file mode 100644
index b4793549d..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/FlatPageHeader.java
+++ /dev/null
@@ -1,356 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util.flatui;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontMetrics;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Canvas;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-
-public class FlatPageHeader extends Canvas implements IPropertyChangeListener 
-{
-	private Image backgroundImage;  
-	private String text;
-	private Image buttonImage;
-	private Color imageBackgroundColor;
-	private Color textForegroundColor;
-	private int textHMargin = 10;
-	private int textVMargin = 5;
-	private Font headerFont;
-
-	private List listeners;
-	private int buttonImageX;
-	private int buttonImageY;
-	
-  // Usage: 
-  //    See org.eclipse.wst.common.ui.FlatViewUtility.createFlatPageHeader() 
-  //    methods.
-  //
-  //  Ex)
-  //  Composite parent = ... ;
-  //  Image image = ... ;
-  //  Layout layout = ... ;
-  //  String title = ... ;
-  //  WidgetFactory factory = ... ;
-  //
-  //  header = new FlatPageHeader(parent,SWT.NONE);
-  //  header.setLayout(layout);
-  //  header.setBackgroundImage(image);
-  //  header.setText(title);
-  //  Composite formParent = factory.createComposite(header);
-  //  
-  //  GridLayout gl = new GridLayout();
-  //  gl.numColumns = 1;
-  //  formParent.setLayout(gl);
-  //  formParent.setLayoutData(new GridData(GridData.FILL_BOTH));
-  //
-	public FlatPageHeader(Composite parent, int style) 
-  {
-		super(parent, style);
-		
-		// The default image background color is white
-		// The default text forekground color is black
-		imageBackgroundColor = new Color(null, 255, 255, 255);
-		textForegroundColor = new Color(null, 0, 0, 0);
-		setBackground(imageBackgroundColor);
-		
-		// The default text font is Header font
-		headerFont = JFaceResources.getHeaderFont();
-		
-		// Need to dispose the Color
-		addDisposeListener
-      (new DisposeListener() 
-        {
-			    public void widgetDisposed(DisposeEvent e) 
-          {
-				    FlatPageHeader.this.widgetDisposed(e);
-			    }
-		    } 
-      );
-		 
-		// need to paint
-		addPaintListener
-      (new PaintListener() 
-        {
-			    public void paintControl(PaintEvent e) 
-          {
-			      FlatPageHeader.this.paintControl(e);
-			    }
-		    }
-      );
-
-		// create a list of listeners
-		listeners = new ArrayList();
-
-		// add a mouse listener
-		this.addMouseListener
-      (new MouseAdapter() 
-        {
-			    public void mouseDown(MouseEvent event) 
-          {
-				    handleMouseDown(event);
-			    }
-		    }
-      );	
-		
-		JFaceResources.getFontRegistry().addListener(this);
-	}  
-
-	// Compute size of the widget
-	public Point computeSize(int wHint, int hHint, boolean changed) 
-  {
-		int width = getParent().getClientArea().width;
-		int height = 0;
-		if (backgroundImage != null) 
-    {
-			Rectangle bounds = backgroundImage.getBounds();
-			height = bounds.height;
-		}
-		if (text != null) 
-    {
-			GC gc = new GC(this);
-			int textHeight = getTextHeight(gc);
-			gc.dispose();
-			height = Math.max(height, textHeight);
-		}
-		if (buttonImage != null) 
-    { 
-			Rectangle bounds = buttonImage.getBounds();
-			if (height < bounds.height)
-				height = bounds.height;
-		}
-		if (wHint != SWT.DEFAULT) width = wHint;
-		if (hHint != SWT.DEFAULT) height = hHint;          
-		return new Point(width + 2, height + 2);     
-	}	
-
-	protected void paintControl(PaintEvent e) 
-  {
-		GC gc = e.gc;
-		if (backgroundImage != null) 
-    {
-			Rectangle imageBounds = backgroundImage.getBounds();
-			int y = 0;
-			int x = 0;
-
-			if (imageBackgroundColor != null) 
-      {
-				gc.setBackground(imageBackgroundColor);
-				gc.fillRectangle(0, 0, imageBounds.width, imageBounds.height);
-			}
-
-			if (SWT.getPlatform().equals("motif")==false) 
-      {
-				gc.drawImage(backgroundImage, x, y);
-			}
-			if (textForegroundColor != null)
-				gc.setForeground(textForegroundColor);
-			gc.setFont(headerFont);
-//			gc.setFont(getFont());	
-			gc.drawText(text, textHMargin, textVMargin, true);
-			if (buttonImage != null) 
-      {
-				Rectangle parentBounds = getParent().getClientArea();
-				Rectangle buttonBounds = buttonImage.getBounds();
-				int p = parentBounds.x + parentBounds.width;
-				buttonImageX = p - buttonBounds.width - 4;
-				buttonImageY = 4;
-				gc.drawImage(buttonImage, buttonImageX, buttonImageY);
-			}
-		}		
-	}
-	
-	public void addSelectionListener(SelectionListener listener) 
-  {
-		listeners.add(listener);
-	}
-       
-	public void removeSelectionListener(SelectionListener listener) 
-  {
-		listeners.remove(listener);
-	}	
-	
-	protected void handleMouseDown(MouseEvent event) 
-  {
-		if (buttonImage == null)
-			return;
-		// chekc if the Button image is clicked
-		int x = event.x;
-		int y = event.y;
-		if (x < buttonImageX || x > buttonImageX + buttonImage.getBounds().width) 
-    {
-			return;
-		}
-		if (y < buttonImageY || y > buttonImageY + buttonImage.getBounds().height) 
-    {
-			return;
-		}
-		
-		int size = listeners.size();
-		for (int i = 0; i < size; i++) 
-    {
-			SelectionListener listener = (SelectionListener)listeners.get(i);
-			listener.widgetSelected(null);
-		}
-	}
-	
-	protected void widgetDisposed(DisposeEvent e) 
-  {
-		if (imageBackgroundColor != null) imageBackgroundColor.dispose();
-		if (textForegroundColor != null) textForegroundColor.dispose();
-		if (backgroundImage != null) backgroundImage.dispose();
-	}
-	
-	// getters and setters
-	public Image getBackgroundImage() 
-  {
-		return backgroundImage;
-	}
-      
-	public void setBackgroundImage(Image backgroundImage) 
-  {
-		this.backgroundImage = backgroundImage;
-		redraw();
-	}
-
-	public Image getButtonImage() 
-  {
-		return buttonImage;
-	}
-      
-	public void setButtonImage(Image buttonImage) 
-  {
-		this.buttonImage = buttonImage;
-		redraw();
-	}
-      
-	public String getText() 
-  {
-		return text;
-	}
-      
-	public void setText(String text) 
-  {
-		this.text = text;
-		redraw();
-	}
-	
-	public int getTextHMargin() 
-  {
-		return textHMargin;
-	}
-	
-	public void setTextHMargin(int textHMargin) 
-  {
-		this.textHMargin = textHMargin;
-	}
-	
-	public int getTextVMargin() 
-  {
-		return textVMargin;
-	}
-	
-	public void setTextVMargin(int textVMargin) 
-  {
-		this.textVMargin = textVMargin;
-	}
-	
-	public Color getImageBackgroundColor() 
-  {
-		return imageBackgroundColor;
-	}
-	
-	public void setImageBackgroundColor(Color imageBackgroundColor) 
-  {
-		if (imageBackgroundColor == null)
-			return;
-		this.imageBackgroundColor = imageBackgroundColor;
-		redraw();
-	}
-	
-	public Color getTextForegroundColor() 
-  {
-		return textForegroundColor;
-	}
-	
-	public void setTextForegroundColor(Color textForegroundColor) 
-  {
-		if (textForegroundColor == null)
-			return;
-		this.textForegroundColor = textForegroundColor;
-		redraw();
-	}
-
-	private int getTextHeight(GC gc) 
-  {
-		int imageHeight = 0;
-		if (backgroundImage!= null && SWT.getPlatform().equals("motif")==false) 
-    {
-			imageHeight = backgroundImage.getBounds().height;
-		}
-		gc.setFont(headerFont);
-//		gc.setFont(getFont());
-		FontMetrics fm = gc.getFontMetrics();
-		int fontHeight = fm.getHeight();
-		int height =  fontHeight + textVMargin + textVMargin;
-		return Math.max(height, imageHeight);
-	}
-
-//	private int getTextWidth(GC gc) 
-//  {
-//		int imageWidth = 0;
-//		if (backgroundImage!= null && SWT.getPlatform().equals("motif")==false) 
-//    {
-//			imageWidth = backgroundImage.getBounds().width;
-//		}
-//		gc.setFont(headerFont);
-////		gc.setFont(getFont());
-//		FontMetrics fm = gc.getFontMetrics();
-//		int fontWidth = fm.getAverageCharWidth() + 5;
-//		int width =  fontWidth * text.length() + textHMargin + textHMargin;
-//		return Math.max(width, imageWidth);
-//	}
-	
-	public void handleEvent(Event e) 
-  {
-//		Widget source = e.widget;	
-	}
-	
-	public void propertyChange(PropertyChangeEvent event) 
-  {
-		if(event.getProperty() == JFaceResources.HEADER_FONT && this.isDisposed() == false)
-		{
-			headerFont = JFaceResources.getFontRegistry().get(JFaceResources.HEADER_FONT);
-			this.layout(true);
-			this.redraw();
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/FlatPageSection.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/FlatPageSection.java
deleted file mode 100644
index 7ef2e6ced..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/FlatPageSection.java
+++ /dev/null
@@ -1,408 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util.flatui;
-
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.ViewForm;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Layout;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Widget;
-
-//public abstract class FormSection implements IPropertyChangeListener, IModelChangedListener {
-public abstract class FlatPageSection extends ViewForm implements IPropertyChangeListener {
-	public static final int SELECTION = 1;
-//	private PDEFormPage formPage;
-	private String headerColorKey = WidgetFactory.DEFAULT_HEADER_COLOR;
-	private String headerText;
-	private Control client;
-	protected Label header;
-	protected Control separator;
-//	private SectionChangeManager sectionManager;
-	private java.lang.String description;
-	private boolean dirty;
-	protected Label descriptionLabel;
-	private ToggleControl toggle;
-	private boolean readOnly;
-	private boolean titleAsHyperlink;
-	private boolean addSeparator=true;
-	private boolean descriptionPainted=true;
-	private boolean headerPainted=true;
-	private boolean collapsable=false;
-	private Composite control;
-	
-	
-/*
- * This is a special layout for the section. Both the
- * header and the description labels will wrap and
- * they will use client's size to calculate needed
- * height. This kind of behaviour is not possible
- * with stock grid layout.
- */
-class SectionLayout extends Layout {
-	int vspacing = 3;
-	int sepHeight = 2;
-
-
-	protected Point computeSize(Composite parent, int wHint, int hHint, boolean flush) {
-		int width = 0;
-		int height = 0;
-		int cwidth = 0;
-		int collapsedHeight = 0;
-	
-		if (wHint != SWT.DEFAULT)
-		   width = wHint;
-		if (hHint != SWT.DEFAULT)
-			height = hHint;
-
-		cwidth = width;
-				
-		if (client != null) {
-			Point csize = client.computeSize(SWT.DEFAULT, SWT.DEFAULT, flush);
-			if (width == 0) {
-				width = csize.x;
-				cwidth = width;
-			}
-			if (height==0) height = csize.y;
-		}
-		
-		Point toggleSize = null;
-		
-		if (collapsable && toggle!=null) 
-		    toggleSize = toggle.computeSize(SWT.DEFAULT, SWT.DEFAULT, flush);
-		
-		if (hHint== SWT.DEFAULT && headerPainted && header!=null) {
-			int hwidth = cwidth;
-			if (toggleSize!=null)
-			   hwidth = cwidth - toggleSize.x - 5;
-			Point hsize = header.computeSize(hwidth, SWT.DEFAULT, flush);
-			height += hsize.y;
-			collapsedHeight = hsize.y;
-			height += vspacing;
-		}
-		
-		if (hHint==SWT.DEFAULT && addSeparator) {
-			height += sepHeight;
-			height += vspacing;
-			collapsedHeight += vspacing + sepHeight;
-		}
-		if (hHint == SWT.DEFAULT && descriptionPainted && descriptionLabel!=null) {
-			Point dsize = descriptionLabel.computeSize(cwidth, SWT.DEFAULT, flush);
-			height += dsize.y;
-			height += vspacing;
-		}
-		if (toggle!=null && toggle.getSelection()) {
-			// collapsed state
-			height = collapsedHeight;
-		}
-		return new Point(width, height);
-	}
-	protected void layout(Composite parent, boolean flush) {
-		int width = parent.getClientArea().width;
-		int height = parent.getClientArea().height;
-		int y = 0;
-		Point toggleSize=null;
-		
-		if (collapsable) {
-			toggleSize = toggle.computeSize(SWT.DEFAULT, SWT.DEFAULT, flush);
-		}
-
-		if (headerPainted && header!=null) {
-			Point hsize;
-			
-			if (titleAsHyperlink) {
-				hsize = header.computeSize(SWT.DEFAULT, SWT.DEFAULT, flush);
-				header.setBounds(0, y, hsize.x, hsize.y);
-			}
-			else {
-				int availableWidth = width;
-				if (toggleSize!=null)
-				   availableWidth = width - toggleSize.x - 5;
-				hsize = header.computeSize(availableWidth, SWT.DEFAULT, flush);
-
-        int hx = 0;
-		   	if (toggle!=null) {
-	   			int ty = y + hsize.y - toggleSize.y; // + vspacing;
-		   	  toggle.setBounds(0, ty, toggleSize.x, toggleSize.y);
-          hx = toggleSize.x;
-		   	}
-			  header.setBounds(hx, y, availableWidth, hsize.y);
-			}
-			y += hsize.y + vspacing;
-		}
-		if (addSeparator && separator!=null) {
-			separator.setBounds(0, y, width, 2);
-			y += sepHeight + vspacing;
-		}
-		if (toggle!=null && toggle.getSelection()) {
-			return;
-		}
-		if (descriptionPainted && descriptionLabel!=null) {
-			Point dsize = descriptionLabel.computeSize(width, SWT.DEFAULT, flush);
-			descriptionLabel.setBounds(0, y, width, dsize.y);
-			y += dsize.y + vspacing;
-		}
-		if (client!=null) {
-			client.setBounds(0, y, width, height - y);
-		}
-	}
-}
-	
-	
-public FlatPageSection(Composite parent) {
-	// Description causes problems re word wrapping
-	// and causes bad layout in schema and
-	// component editors when in Motif - turning off
-	
-	super(parent, SWT.FLAT);
-	if (SWT.getPlatform().equals("motif")) {
-		descriptionPainted = false;
-	}
-	JFaceResources.getFontRegistry().addListener(this);
-}
-public void commitChanges(boolean onSave) {
-}
-public abstract Composite createClient(Composite parent, WidgetFactory factory);
-public final Control createControl(
-	Composite parent,
-	WidgetFactory factory) {
-	Composite section = factory.createComposite(parent);
-	SectionLayout slayout = new SectionLayout();
-	section.setLayout(slayout);
-	section.setData(this);
-
-	if (headerPainted) {
-		Color headerColor = factory.getColor(getHeaderColorKey());
-		header = factory.createHeadingLabel(section, getHeaderText(), headerColor, SWT.WRAP);
-		if (titleAsHyperlink) {
-			factory.turnIntoHyperlink(header, new HyperlinkAdapter() {
-				public void linkActivated(Control label) {
-					titleActivated();
-				}
-			});
-		}
-		if (collapsable) {
-			toggle = new ToggleControl(section, SWT.NULL);
-			toggle.setBackground(factory.getBackgroundColor());
-			toggle.setActiveDecorationColor(factory.getHyperlinkColor());
-			toggle.setDecorationColor(factory.getColor(WidgetFactory.COLOR_COMPOSITE_SEPARATOR));
-			toggle.setActiveCursor(factory.getHyperlinkCursor());
-			toggle.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent e) {
-					
-					boolean collapsed = toggle.getSelection();
-					reflow();
-					if (descriptionLabel!=null)
-						descriptionLabel.setVisible(!collapsed);
-					if (client!=null)
-						client.setVisible(!collapsed);
-				}
-			});
-		}
-	}
-
-
-	if (addSeparator) {
-        //separator = factory.createSeparator(section, SWT.HORIZONTAL);
-		separator = factory.createCompositeSeparator(section);
-	}
-	
-	if (descriptionPainted && description != null) {
-		descriptionLabel = factory.createLabel(section, description, SWT.WRAP);
-	}
-	client = createClient(section, factory);
-	section.setData(this);
-	control = section;
-	return section;
-}
-
-protected void reflow() {
-	control.layout(true);
-	control.getParent().layout(true);
-
-  Widget grandParent = control.getParent().getParent();
-  if (grandParent != null && grandParent instanceof Composite)
-	  ((Composite)grandParent).layout(true);
-/*
-	SectionForm form = formPage.getForm();
-	if (form instanceof ScrollableSectionForm) {
-		((ScrollableSectionForm)form).updateScrollBars();
-	}
-*/
-}
-
-protected Text createText(Composite parent, String label, WidgetFactory factory) {
-	return createText(parent, label, factory, 1);
-}
-protected Text createText(Composite parent, String label, WidgetFactory factory, int span) {
-	factory.createLabel(parent, label);
-	Text text = factory.createText(parent, "");
-	GridData gd = new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_CENTER);
-	gd.grabExcessHorizontalSpace = true;
-	gd.horizontalSpan=span;
-	text.setLayoutData(gd);
-	return text;
-}
-protected Text createText(Composite parent, WidgetFactory factory, int span) {
-	Text text = factory.createText(parent, "");
-	GridData gd = new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_CENTER);
-	gd.grabExcessHorizontalSpace = true;
-	gd.horizontalSpan=span;
-	text.setLayoutData(gd);
-	return text;
-}
-public void dispose() {
-	JFaceResources.getFontRegistry().removeListener(this);
-	super.dispose();
-}
-public void doGlobalAction(String actionId) {}
-public void expandTo(Object object) {}
-/*
-public final void fireChangeNotification(int changeType, Object changeObject) {
-	if (sectionManager == null)
-		return;
-	sectionManager.dispatchNotification(this, changeType, changeObject);
-}
-public final void fireSelectionNotification(Object changeObject) {
-	fireChangeNotification(SELECTION, changeObject);
-}
-*/
-public java.lang.String getDescription() {
-	return description;
-}
-/*
-public PDEFormPage getFormPage() {
-	return formPage;
-}
-*/
-
-public java.lang.String getHeaderColorKey() {
-	return headerColorKey;
-}
-public java.lang.String getHeaderText() {
-	return headerText;
-}
-public void initialize(Object input) {}
-
-public boolean isDirty() {
-	return dirty;
-}
-
-public boolean isReadOnly() {
-	return readOnly;
-}
-public boolean isTitleAsHyperlink() {
-	return titleAsHyperlink;
-}
-/*
-public void modelChanged(IModelChangedEvent e) {
-}
-*/
-public void sectionChanged(FlatPageSection source, int changeType, Object changeObject) {}
-public void setAddSeparator(boolean newAddSeparator) {
-	addSeparator = newAddSeparator;
-}
-
-
-private String trimNewLines(String text) {
-	StringBuffer buff = new StringBuffer();
-	for (int i=0; i<text.length(); i++) {
-		char c = text.charAt(i);
-		if (c=='\n')
-		   buff.append(' ');
-		else
-		   buff.append(c);
-	}
-	return buff.toString();
-}
-	
-public void setDescription(java.lang.String newDescription) {
-	// we will trim the new lines so that we can
-	// use layout-based word wrapping instead
-	// of hard-coded one
-	description = trimNewLines(newDescription);
-	//description = newDescription;
-	if (descriptionLabel!=null) descriptionLabel.setText(newDescription);
-}
-public void setDescriptionPainted(boolean newDescriptionPainted) {
-	descriptionPainted = newDescriptionPainted;
-}
-public void setDirty(boolean newDirty) {
-	dirty = newDirty;
-}
-/*
-public void setFocus() {
-}
-*/
-public void setHeaderColorKey(java.lang.String newHeaderColorKey) {
-	headerColorKey = newHeaderColorKey;
-}
-public void setHeaderPainted(boolean newHeaderPainted) {
-	headerPainted = newHeaderPainted;
-}
-public void setHeaderText(java.lang.String newHeaderText) {
-	headerText = newHeaderText;
-	if (header!=null) header.setText(headerText);
-}
-/*
-void setManager(SectionChangeManager manager) {
-	this.sectionManager = manager;
-}
-*/
-public void setReadOnly(boolean newReadOnly) {
-	readOnly = newReadOnly;
-}
-public void setTitleAsHyperlink(boolean newTitleAsHyperlink) {
-	titleAsHyperlink = newTitleAsHyperlink;
-}
-public void titleActivated() {
-}
-/*
-public void update() {}
-*/
-
-public void propertyChange(PropertyChangeEvent arg0) {
-	if (control!=null && header!=null) {
-	  if (!header.isDisposed())
-		header.setFont(JFaceResources.getBannerFont());
-	  if (!control.isDisposed())
-		control.layout(true);
-	}
-}
-
-
-	/**
-	 * Gets the collapsable.
-	 * @return Returns a boolean
-	 */
-	public boolean getCollapsable() {
-		return collapsable;
-	}
-
-	/**
-	 * Sets the collapsable.
-	 * @param collapsable The collapsable to set
-	 */
-	public void setCollapsable(boolean collapsable) {
-		this.collapsable = collapsable;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/HyperlinkAdapter.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/HyperlinkAdapter.java
deleted file mode 100644
index 4e52bb988..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/HyperlinkAdapter.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util.flatui;
-
-public class HyperlinkAdapter implements IHyperlinkListener{
-
-public HyperlinkAdapter() {
-    super();
-}
-public void linkActivated(org.eclipse.swt.widgets.Control linkLabel) {}
-public void linkEntered(org.eclipse.swt.widgets.Control linkLabel) {}
-public void linkExited(org.eclipse.swt.widgets.Control linkLabel) {}
-}
-
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/HyperlinkHandler.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/HyperlinkHandler.java
deleted file mode 100644
index bcd3c338d..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/HyperlinkHandler.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util.flatui;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
-import org.eclipse.swt.events.MouseTrackListener;
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Cursor;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-
-public class HyperlinkHandler implements MouseListener, MouseTrackListener, PaintListener {
-
-  	public static final int UNDERLINE_NEVER = 1;
-    public static final int UNDERLINE_ROLLOVER = 2;
-    public static final int UNDERLINE_ALWAYS = 3;
-
-    private static Cursor hyperlinkCursor;
-    private static Cursor busyCursor;
-    private boolean hyperlinkCursorUsed=true;
-    private int hyperlinkUnderlineMode=UNDERLINE_ALWAYS;
-    private Color background;
-    private Color foreground;
-    private Color activeBackground;
-    private Color activeForeground;
-    private Hashtable hyperlinkListeners;
-    private Control lastLink;
-
-public HyperlinkHandler() {
-    hyperlinkListeners = new Hashtable();
-    if (hyperlinkCursor == null)
-    {
-      hyperlinkCursor = new Cursor(Display.getCurrent(), SWT.CURSOR_HAND);
-      busyCursor = new Cursor(Display.getCurrent(), SWT.CURSOR_WAIT);
-    }
-}
-public void dispose() {
-    hyperlinkCursor.dispose();
-    busyCursor.dispose();
-}
-public org.eclipse.swt.graphics.Color getActiveBackground() {
-    return activeBackground;
-}
-public org.eclipse.swt.graphics.Color getActiveForeground() {
-    return activeForeground;
-}
-public org.eclipse.swt.graphics.Color getBackground() {
-    return background;
-}
-public org.eclipse.swt.graphics.Cursor getBusyCursor() {
-    return busyCursor;
-}
-public org.eclipse.swt.graphics.Color getForeground() {
-    return foreground;
-}
-public org.eclipse.swt.graphics.Cursor getHyperlinkCursor() {
-    return hyperlinkCursor;
-}
-public int getHyperlinkUnderlineMode() {
-    return hyperlinkUnderlineMode;
-}
-public org.eclipse.swt.widgets.Control getLastLink() {
-    return lastLink;
-}
-public boolean isHyperlinkCursorUsed() {
-    return hyperlinkCursorUsed;
-}
-        public void mouseDoubleClick(MouseEvent e) {
-        }
-public void mouseDown(MouseEvent e) {
-    if (e.button == 1)
-        return;
-    lastLink = (Control)e.widget;
-}
-public void mouseEnter(MouseEvent e) {
-    Control control = (Control) e.widget;
-    if (isHyperlinkCursorUsed())
-        control.setCursor(hyperlinkCursor);
-    if (activeBackground != null)
-        control.setBackground(activeBackground);
-    if (activeForeground != null)
-        control.setForeground(activeForeground);
-    if (hyperlinkUnderlineMode==UNDERLINE_ROLLOVER) underline(control, true);    
-
-    IHyperlinkListener action =
-        (IHyperlinkListener) hyperlinkListeners.get(control);
-    if (action != null)
-        action.linkEntered(control);
-}
-public void mouseExit(MouseEvent e) {
-    Control control = (Control) e.widget;
-    if (isHyperlinkCursorUsed())
-        control.setCursor(null);
-    if (hyperlinkUnderlineMode==UNDERLINE_ROLLOVER)
-        underline(control, false);
-    if (background != null)
-        control.setBackground(background);
-    if (foreground != null)
-        control.setForeground(foreground);
-    IHyperlinkListener action =
-        (IHyperlinkListener) hyperlinkListeners.get(control);
-    if (action != null)
-        action.linkExited(control);
-}
-        public void mouseHover(MouseEvent e) {
-        }
-public void mouseUp(MouseEvent e) {
-    if (e.button != 1)
-        return;
-    IHyperlinkListener action =
-        (IHyperlinkListener) hyperlinkListeners.get(e.widget);
-    if (action != null) {
-        Control c = (Control) e.widget;
-        c.setCursor(busyCursor);
-        action.linkActivated(c);
-        if (!c.isDisposed()) 
-           c.setCursor(isHyperlinkCursorUsed()?hyperlinkCursor:null);
-    }
-}
-public void paintControl(PaintEvent e) {
-    Control label = (Control) e.widget;
-    if (hyperlinkUnderlineMode == UNDERLINE_ALWAYS)
-        HyperlinkHandler.underline(label, true);
-}
-public void registerHyperlink(Control control, IHyperlinkListener listener) {
-    if (background != null)
-        control.setBackground(background);
-    if (foreground != null)
-        control.setForeground(foreground);
-    control.addMouseListener(this);
-    control.addMouseTrackListener(this);
-    if (hyperlinkUnderlineMode == UNDERLINE_ALWAYS)
-        control.addPaintListener(this);
-    hyperlinkListeners.put(control, listener);
-    removeDisposedLinks();
-}
-private void removeDisposedLinks() {
-    for (Enumeration keys = hyperlinkListeners.keys(); keys.hasMoreElements();) {
-        Control control = (Control)keys.nextElement();
-        if (control.isDisposed()) {
-            hyperlinkListeners.remove(control);
-        }
-    }
-}
-public void reset() {
-    hyperlinkListeners.clear();
-}
-public void setActiveBackground(org.eclipse.swt.graphics.Color newActiveBackground) {
-    activeBackground = newActiveBackground;
-}
-public void setActiveForeground(org.eclipse.swt.graphics.Color newActiveForeground) {
-    activeForeground = newActiveForeground;
-}
-public void setBackground(org.eclipse.swt.graphics.Color newBackground) {
-    background = newBackground;
-}
-public void setForeground(org.eclipse.swt.graphics.Color newForeground) {
-    foreground = newForeground;
-}
-public void setHyperlinkCursorUsed(boolean newHyperlinkCursorUsed) {
-    hyperlinkCursorUsed = newHyperlinkCursorUsed;
-}
-public void setHyperlinkUnderlineMode(int newHyperlinkUnderlineMode) {
-    hyperlinkUnderlineMode = newHyperlinkUnderlineMode;
-}
-public static void underline(Control control, boolean inside) {
-    if (!(control instanceof Label))
-        return;
-    Composite parent = control.getParent();
-    Rectangle bounds = control.getBounds();
-    GC gc = new GC(parent);
-    Color color = inside? control.getForeground() : control.getBackground();
-    gc.setForeground(color);
-    int y = bounds.y + bounds.height;
-    gc.drawLine(bounds.x, y, bounds.x+bounds.width, y);
-    gc.dispose();
-}
-}
-
-
-
-
-
-
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/IHyperlinkListener.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/IHyperlinkListener.java
deleted file mode 100644
index 03dfbadcf..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/IHyperlinkListener.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util.flatui;
-
-import org.eclipse.swt.widgets.Control;
-
-public interface IHyperlinkListener {
-
-  public void linkActivated(Control linkLabel);
-  public void linkEntered(Control linkLabel);
-  public void linkExited(Control linkLabel);
-}
-
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/ToggleControl.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/ToggleControl.java
deleted file mode 100644
index 3149fef88..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/ToggleControl.java
+++ /dev/null
@@ -1,266 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util.flatui;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.ACC;
-import org.eclipse.swt.accessibility.AccessibleAdapter;
-import org.eclipse.swt.accessibility.AccessibleControlAdapter;
-import org.eclipse.swt.accessibility.AccessibleControlEvent;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.FocusListener;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseTrackAdapter;
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Cursor;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Canvas;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.TypedListener;
-
-public class ToggleControl extends Canvas {
-  private boolean fCollapsed;
-  private Color fDecorationColor;
-  private Color fActiveColor;
-  private Cursor fActiveCursor;
-  private boolean fHasFocus;
-  private boolean fHover = false;
-  private static final int MARGIN_WIDTH = 2;
-  private static final int MARGIN_HEIGHT = 2;
-
-  private static final int DEFAULT_HEIGHT = 8;
-  private static final int[] EXPANDED_POINTS = { 0, 2, 8, 2, 4, 6 }; 
-  private static final int[] COLLAPSED_POINTS = { 2, 0, 2, 8, 6, 4 }; 
-  private int fHeight = DEFAULT_HEIGHT;  
-
-  /* accessibility */
-  private String fName;
-  private String fDescription;
-
-  public ToggleControl(Composite parent, int style) {
-    super(parent, style);
-    initAccessible();
-
-    addPaintListener(new PaintListener() {
-      public void paintControl(PaintEvent e) {
-        paint(e);
-      }
-    });
-    addMouseListener(new MouseAdapter() {
-      public void mouseDown(MouseEvent e) {
-        notifyListeners(SWT.Selection);
-      }
-    });
-    addKeyListener(new KeyAdapter() {
-      public void keyPressed(KeyEvent e) {
-        if (e.character == '\r' || e.character == ' ') {
-          // Activation
-          notifyListeners(SWT.Selection);
-        }
-      }
-    });
-    addListener(SWT.Traverse, new Listener() {
-      public void handleEvent(Event e) {
-        if (e.detail != SWT.TRAVERSE_RETURN)
-          e.doit = true;
-      }
-    });
-    addFocusListener(new FocusListener() {
-      public void focusGained(FocusEvent e) {
-        if (!fHasFocus) {
-          fHasFocus = true;
-          redraw();
-        }
-      }
-      public void focusLost(FocusEvent e) {
-        if (fHasFocus) {
-          fHasFocus = false;
-          redraw();
-        }
-      }
-    });
-
-    addSelectionListener(new SelectionAdapter() {
-      public void widgetSelected(SelectionEvent e) {
-        fCollapsed = !fCollapsed;
-        redraw();
-      }
-    });
-
-    addMouseTrackListener(new MouseTrackAdapter() {
-      public void mouseEnter(MouseEvent e) {
-        fHover = true;
-        if (fActiveCursor != null)
-          setCursor(fActiveCursor);
-        redraw();
-      }
-      public void mouseExit(MouseEvent e) {
-        fHover = false;
-        if (fActiveCursor != null)
-          setCursor(null);
-        redraw();
-      }
-    });
-  }
-
-  public void addSelectionListener(SelectionListener listener) {
-    checkWidget();
-    if (listener != null)
-      addListener(SWT.Selection, new TypedListener(listener));
-  }
-
-  public void setDecorationColor(Color decorationColor) {
-    this.fDecorationColor = decorationColor;
-  }
-
-  public Color getDecorationColor() {
-    return fDecorationColor;
-  }
-
-  public void setActiveDecorationColor(Color activeColor) {
-    this.fActiveColor = activeColor;
-  }
-
-  public void removeSelectionListener(SelectionListener listener) {
-    checkWidget();
-    if (listener != null)
-      removeListener(SWT.Selection, listener);
-  }
-
-  public void setActiveCursor(Cursor activeCursor) {
-    this.fActiveCursor = activeCursor;
-  }
-
-  public Color getActiveDecorationColor() {
-    return fActiveColor;
-  }
-
-  public Point computeSize(int wHint, int hHint, boolean changed) {
-
-    return new Point((wHint != SWT.DEFAULT ? wHint : fHeight + 2 * MARGIN_WIDTH), (hHint != SWT.DEFAULT ? hHint : fHeight + 2 * MARGIN_HEIGHT));
-  }
-
-  protected void paint(PaintEvent e) {
-    GC gc = e.gc;
-    Point size = getSize();
-    gc.setFont(getFont());
-    paint(gc);
-    if (fHasFocus) {
-      gc.setForeground(getForeground());
-      gc.drawFocus(0, 0, size.x, size.y);
-    }
-  }
-
-  /*
-   * @see SelectableControl#paint(GC)
-   */
-  protected void paint(GC gc) {
-    if (fHover && fActiveColor != null)
-      gc.setBackground(fActiveColor);
-    else if (fDecorationColor != null)
-      gc.setBackground(fDecorationColor);
-    else
-      gc.setBackground(getForeground());
-    Point size = getSize();
-    gc.fillPolygon(translate((fCollapsed ? COLLAPSED_POINTS : EXPANDED_POINTS), ((size.x - fHeight) / 2), ((size.y - fHeight) / 2)));
-    gc.setBackground(getBackground());
-  }
-
-  private int[] translate(int[] data, int x, int y) {
-    int[] target = new int[data.length];
-    for (int i = 0; i < data.length; i += 2) {
-      target[i] = data[i]*fHeight/DEFAULT_HEIGHT + x;
-    }
-    for (int i = 1; i < data.length; i += 2) {
-      target[i] = data[i]*fHeight/DEFAULT_HEIGHT + y;
-    }
-    return target;
-  }
-  
-  public void setHeight(int y) {
-    fHeight = y;
-  }
-
-  private void notifyListeners(int eventType) {
-    Event event = new Event();
-    event.type = eventType;
-    event.widget = this;
-    notifyListeners(eventType, event);
-  }
-
-  public boolean getSelection() {
-    return fCollapsed;
-  }
-
-  public void setSelection(boolean selection) {
-    this.fCollapsed = selection;
-  }
-
-  public void setName(String name) {
-    fName = name;
-  }
-
-  public void setDescription(String description) {
-    fDescription = description;
-  }
-
-  private void initAccessible() {
-    getAccessible().addAccessibleListener(new AccessibleAdapter() {
-
-      public void getName(AccessibleEvent e) {
-        e.result = fName;
-      }
-
-      public void getDescription(AccessibleEvent e) {
-        e.result = fDescription;
-      }
-    });
-
-    getAccessible().addAccessibleControlListener(new AccessibleControlAdapter() {
-
-      public void getLocation(AccessibleControlEvent e) {
-        Rectangle location = getBounds();
-        Point pt = toDisplay(new Point(location.x, location.y));
-        e.x = pt.x;
-        e.y = pt.y;
-        e.width = location.width;
-        e.height = location.height;
-      }
-
-      public void getChildCount(AccessibleControlEvent e) {
-        e.detail = 0;
-      }
-
-      public void getRole(AccessibleControlEvent e) {
-        e.detail = ACC.ROLE_TREE;
-      }
-
-      public void getState(AccessibleControlEvent e) {
-        e.detail = fCollapsed ? ACC.STATE_COLLAPSED : ACC.STATE_EXPANDED;
-      }
-
-    });
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/WidgetFactory.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/WidgetFactory.java
deleted file mode 100644
index c09998212..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/WidgetFactory.java
+++ /dev/null
@@ -1,347 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util.flatui;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.custom.ScrolledComposite;
-import org.eclipse.swt.custom.TableTree;
-import org.eclipse.swt.custom.ViewForm;
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Cursor;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Canvas;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-
-public class WidgetFactory {	
-  public static final String DEFAULT_HEADER_COLOR = "__default__header__";
-  public static final String COLOR_BACKGROUND = "__bg";
-  public static final String COLOR_BORDER = "__border";
-  public static final String COLOR_COMPOSITE_SEPARATOR = "__compSep";
-  public static final String COLOR_HYPERLINK="__hyperlink";
-    
-  private Hashtable colorRegistry = new Hashtable();
-  private Color backgroundColor;
-  private Color clientAreaColor;
-  private Color foregroundColor;
-  private Color fReadOnlyColor;
-  private Display fDisplay;
-  public static final int BORDER_STYLE = SWT.NONE;
-  private BorderPainter borderPainter;
-  private Color borderColor;
-  private HyperlinkHandler hyperlinkHandler;
-  private static Image fBanner;
-  
-
-  class BorderPainter implements PaintListener {
-        public void paintControl(PaintEvent event) {
-            Composite composite = (Composite) event.widget;
-            Control[] children = composite.getChildren();
-            for (int i = 0; i < children.length; i++) {
-                Control c = children[i];
-                //if (c.isEnabled()==false) continue;
-                if (c instanceof Text
-                    || c instanceof Canvas
-                    || c instanceof CCombo) {
-                    Rectangle b = c.getBounds();
-                    GC gc = event.gc;
-                    gc.setForeground(c.getBackground());
-                    gc.drawRectangle(b.x - 1, b.y - 1, b.width + 1, b.height + 1);
-                    gc.setForeground(foregroundColor);
-                    gc.drawRectangle(b.x - 2, b.y - 2, b.width + 3, b.height + 3);
-                }
-                else if (c instanceof Table
-                    || c instanceof Tree
-                    || c instanceof TableTree) {
-                    Rectangle b = c.getBounds();
-                    GC gc = event.gc;
-                    gc.setForeground(borderColor);
-                    //gc.drawRectangle(b.x - 2, b.y - 2, b.width + 3, b.height + 3);
-                    gc.drawRectangle(b.x-1, b.y-1, b.width+2, b.height+2);
-                }
-            }
-        }
-    }
-
-
-public WidgetFactory() {
- 	fDisplay = Display.getDefault();
-    initialize();
-}
-
-public Button createButton(Composite parent, String text, int style) {
-    int flatStyle = BORDER_STYLE == SWT.BORDER ? SWT.NULL : SWT.FLAT;
-    //int flatStyle = SWT.NULL;
-    Button button = new Button(parent, style | flatStyle);
-    button.setBackground(backgroundColor);
-    button.setForeground(foregroundColor);
-    if (text!=null) button.setText(text);
-    return button;
-}
-public Composite createComposite(Composite parent) {
-    return createComposite(parent, SWT.NULL);
-}
-public Composite createComposite(Composite parent, int style) {
-    Composite composite = new Composite(parent, style);
-    composite.setBackground(backgroundColor);
-    return composite;
-}
-public Composite createCompositeSeparator(Composite parent) {
-    Composite composite = new Composite(parent, SWT.NONE);
-    composite.setBackground(getColor(COLOR_COMPOSITE_SEPARATOR));
-    return composite;
-}
-public Group createGroup(Composite parent, String text) {
-	Group group = new Group(parent, SWT.SHADOW_NONE);
-	group.setText(text);
-    group.setBackground(backgroundColor);
-    group.setForeground(foregroundColor);
-	return group;
-}
-public Label createHeadingLabel(Composite parent, String text, Color bg) {
-    return createHeadingLabel(parent, text, bg, SWT.NONE);
-}
-public Label createHeadingLabel(Composite parent, String text, Color bg, int style) {
-    Label label = new Label(parent, style);
-    label.setText(text);
-    label.setBackground(backgroundColor);
-    label.setForeground(foregroundColor);
-    label.setFont(JFaceResources.getFontRegistry().get(JFaceResources.BANNER_FONT));
-    return label;
-}
-public Label createHyperlinkLabel(Composite parent, String text, IHyperlinkListener listener) {
-    return createHyperlinkLabel(parent, text, listener, SWT.NULL);
-}
-public Label createHyperlinkLabel(Composite parent, String text, IHyperlinkListener listener, int style) {
-    Label label = createLabel(parent, text, style);
-    turnIntoHyperlink(label, listener);
-    return label;
-}
-public Label createLabel(Composite parent, String text) {
-    return createLabel(parent, text, SWT.NONE);
-}
-public Label createLabel(Composite parent, String text, int style) {
-    Label label = new Label(parent, style);
-    if (text!=null) label.setText(text);
-    label.setBackground(backgroundColor);
-    label.setForeground(foregroundColor);
-    return label;
-}
-public Label createSeparator(Composite parent, int style) {
-    Label label = new Label(parent, SWT.SEPARATOR | style);
-    label.setBackground(backgroundColor);
-    label.setForeground(borderColor);
-    return label;
-}
-public ScrolledComposite createScrolledComposite (Composite parent) {
-	ScrolledComposite scrolledcomposite = new ScrolledComposite(parent, SWT.V_SCROLL | SWT.H_SCROLL);
-    scrolledcomposite.setBackground(backgroundColor);
-    scrolledcomposite.setForeground(foregroundColor);
-    return scrolledcomposite;
-}
-public Table createTable(Composite parent, int style) {
-    Table table = new Table(parent, BORDER_STYLE | style);
-    table.setBackground(backgroundColor);
-    table.setForeground(foregroundColor);
-    //hookDeleteListener(table);
-    return table;
-}
-public Text createText(Composite parent, String value) {
-    return createText(parent, value, BORDER_STYLE | SWT.SINGLE);
-}
-public Text createText(Composite parent, String value, int style) {
-    Text text = new Text(parent, style);
-    text.setText(value);
-    text.setBackground(clientAreaColor);
-    text.setForeground(foregroundColor);
-    if ((style & SWT.READ_ONLY) != 0)
-    	text.setForeground(fReadOnlyColor);
-    return text;
-}
-public Tree createTree(Composite parent, int style) {
-    Tree tree = new Tree(parent, BORDER_STYLE | style);
-    tree.setBackground(backgroundColor);
-    tree.setForeground(foregroundColor);
-    //hookDeleteListener(tree);
-    return tree;
-}
-/* 
-private void deleteKeyPressed(Widget widget) {
-    if (!(widget instanceof Control)) return;
-    Control control = (Control)widget;
-    for (Control parent = control.getParent();
-        parent != null;
-        parent = parent.getParent()) {
-        if (parent.getData() instanceof FormSection) {
-            FormSection section = (FormSection) parent.getData();
-            section.doGlobalAction(IWorkbenchActionConstants.DELETE);
-            break;
-        }
-    }
-}
-*/
-public ViewForm createViewForm(Composite parent) {
-	ViewForm viewForm = new ViewForm(parent, SWT.NULL);
-    viewForm.setBackground(clientAreaColor);
-    viewForm.setForeground(foregroundColor);
-    return viewForm;
-}
-public void dispose() {
-    Enumeration colors= colorRegistry.elements();
-    while (colors.hasMoreElements()) {
-        Color c = (Color)colors.nextElement();
-        c.dispose();
-    }
-    hyperlinkHandler.dispose();
-    colorRegistry=null;
-    if (fBanner != null)
-    {
-      fBanner.dispose();
-      fBanner = null;
-    }
-}
-public Color getBackgroundColor() {
-    return backgroundColor;
-}
-public Image getBanner() {
-  if (fBanner == null)
-  {
-    try {
-      fBanner = (ImageDescriptor.createFromURL(new URL((WSDLEditorPlugin.getInstance().getDescriptor().getInstallURL()), "icons\form_banner.gif"))).createImage();
-      System.out.println("Created Image!!!! ");
-    } catch (MalformedURLException e) {
-      System.out.println("Exception!!!! " + e);
-    }
-  }
-  return fBanner;
-}
-public Color getBorderColor() {
-    return borderColor;
-}
-public Cursor getBusyCursor() {
-    return hyperlinkHandler.getBusyCursor();
-}
-public Color getClientAreaColor() {
-    return clientAreaColor;
-}
-public Color getColor(String key) {
-    return (Color)colorRegistry.get(key);
-}
-public Color getForegroundColor() {
-    return foregroundColor;
-}
-public Color getHyperlinkColor() {
-    return hyperlinkHandler.getForeground();
-}
-public Cursor getHyperlinkCursor() {
-    return hyperlinkHandler.getHyperlinkCursor();
-}
-public Color getHyperlinkHoverColor() {
-    return hyperlinkHandler.getActiveForeground();
-}
-public int getHyperlinkUnderlineMode() {
-    return hyperlinkHandler.getHyperlinkUnderlineMode();
-}
-/*
-public void hookDeleteListener(Control control) {
-    if (deleteListener == null) {
-        deleteListener = new KeyAdapter() {
-            public void keyPressed(KeyEvent event) {
-                if (event.character == SWT.DEL && event.stateMask == 0) {
-                    deleteKeyPressed(event.widget);
-                }
-            }
-        };
-    }
-    control.addKeyListener(deleteListener);
-}
-*/
-  private void initStaticColors()
-  {
-    if (colorRegistry == null)
-    {
-      colorRegistry = new Hashtable();
-      registerColor(COLOR_BACKGROUND, 0xff, 0xfe, 0xf9);
-      registerColor(COLOR_BORDER, 195, 191, 179);
-      registerColor(COLOR_COMPOSITE_SEPARATOR, 152, 170, 203);
-      registerColor(DEFAULT_HEADER_COLOR, 0x48, 0x70, 0x98);
-      registerColor(COLOR_HYPERLINK, 0, 0, 153);
-    }
-  }
-
-private void initialize() {
-    clientAreaColor = fDisplay.getSystemColor(SWT.COLOR_LIST_BACKGROUND);
-    fReadOnlyColor = fDisplay.getSystemColor(SWT.COLOR_DARK_GRAY);
-    initStaticColors();
-    backgroundColor = clientAreaColor;
-    borderColor = getColor(COLOR_BORDER);
-    foregroundColor = fDisplay.getSystemColor(SWT.COLOR_LIST_FOREGROUND);
-    hyperlinkHandler = new HyperlinkHandler();
-    hyperlinkHandler.setForeground(getColor(COLOR_HYPERLINK));
-    hyperlinkHandler.setBackground(backgroundColor);
-}
-public void paintBordersFor(Composite parent) {
-    if (BORDER_STYLE == SWT.BORDER) return;
-    if (borderPainter==null) borderPainter = new BorderPainter();
-    parent.addPaintListener(borderPainter);
-}
-public Color registerColor(String key, int r, int g, int b) {
-    Color c = new Color(fDisplay, r, g, b);
-    colorRegistry.put(key, c);
-    return c;
-}
-
-public void setClientAreaColor(Color color)
-{
-  clientAreaColor = color;
-  backgroundColor = clientAreaColor;
-}
-
-public void setHyperlinkColor(Color color) {
-    hyperlinkHandler.setForeground(color);
-}
-public void setHyperlinkHoverColor(org.eclipse.swt.graphics.Color hoverColor) {
-    hyperlinkHandler.setActiveForeground(hoverColor);
-}
-public void setHyperlinkUnderlineMode(int newHyperlinkUnderlineMode) {
-    hyperlinkHandler.setHyperlinkUnderlineMode(newHyperlinkUnderlineMode);
-}
-public void turnIntoHyperlink(Control control, IHyperlinkListener listener) {
-    hyperlinkHandler.registerHyperlink(control, listener);
-}
-
-}
-
-
-
-
-
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ui/BaseDesignWindow.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ui/BaseDesignWindow.java
deleted file mode 100644
index 4d30cf1ca..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ui/BaseDesignWindow.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util.ui;
-
-import org.eclipse.jface.action.IStatusLineManager;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.ScrolledComposite;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.part.EditorActionBarContributor;
-import org.eclipse.wst.common.ui.internal.UIPlugin;
-
-abstract public class BaseDesignWindow extends Viewer
-{
-  protected ScrolledComposite mainUIComponent;
-  protected Composite controlsContainer;
-
-  protected boolean pageComplete = true;
-  protected Object input;
-
-  private IStatusLineManager statusLine;
-
-  public BaseDesignWindow(IStatusLineManager statusLine)
-  {
-    this.statusLine = statusLine;
-  }
-
-  protected void setStatusLine(IStatusLineManager statusLine)
-  {
-    this.statusLine = statusLine;
-  }
-
-  protected IStatusLineManager getStatusLine()
-  {
-    if (statusLine == null)
-    {
-      //statusLine = WorkbenchUtility.getStatusLineManager();
-
-      IWorkbench workbench = UIPlugin.getDefault().getWorkbench();
-      IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
-      IEditorPart editorPart = workbenchWindow.getActivePage().getActiveEditor();
-      
-      try
-      {                       
-        EditorActionBarContributor contributor = (EditorActionBarContributor)editorPart.getEditorSite().getActionBarContributor();
-        statusLine = contributor.getActionBars().getStatusLineManager();
-      }
-      catch (Exception e)
-      {
-      }  
-    }
-    return statusLine;
-  }
-
-  public Object getInput()
-  {
-    return input;
-  }
-
-  public void setInput(Object input)
-  {
-    if (this.input != input) 
-    {
-      setErrorMessage("");
-    }
-    
-    this.input = input;
-  }
-
-  public ISelection getSelection()
-  {
-    return null;
-  }
-
-  public void setSelection(ISelection selection, boolean reveal)
-  {
-  }
-
-  public void refresh()
-  {
-  }
-
-  /**
-   * A design view that has a main area for controls, and a message line at
-   * the bottom
-   */
-  protected Control createDesignPane(Composite parent, int numColumns)
-  {
-    // Create the main UI container
-    mainUIComponent= new ScrolledComposite(parent, SWT.V_SCROLL | SWT.H_SCROLL)
-    {
-      public void setVisible(boolean visible)
-      {
-        super.setVisible(visible);
-        if (visible == false && !currentMessage.equals(""))
-        {
-          showMessageInStatusLine(visible == true);
-        }
-      }
-    };
-
-//    mainUIComponent.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-    controlsContainer = new Composite(mainUIComponent, SWT.NONE);
-
-    GridLayout layout = new GridLayout();
-    layout.numColumns = numColumns;
-    controlsContainer.setLayout(layout);
-
-    GridData data = new GridData();
-    data.verticalAlignment = GridData.FILL;
-    data.horizontalAlignment = GridData.FILL;
-    controlsContainer.setLayoutData(data);
-    
-    // TODO: Remove above line and uncomment the following two when XSDEditor views
-    // are rewritten.  Also refer do related TODO in DTDEditor's BaseWindow.
-    // FlatViewUtility flatViewUtility = new FlatViewUtility();
-    // controlsContainer = flatViewUtility.createComposite(mainUIComponent, numColumns);
-
-    mainUIComponent.setContent(controlsContainer);
-
-    return mainUIComponent;
-  }
-
-  public void setScrollComposite()
-  {
-    Point p = controlsContainer.computeSize(SWT.DEFAULT, SWT.DEFAULT);
-    mainUIComponent.setExpandHorizontal(true);
-    mainUIComponent.setExpandVertical(true);
-    mainUIComponent.setMinSize(p);
-  }
-
-  public Composite getControlsContainer()
-  {
-    return controlsContainer;
-  }
-
-  /**
-   * Sets the complete state of the page.
-   * If false, then client is not allowed to move to next page
-   */
-  public void setPageComplete(boolean complete)
-  {
-    pageComplete= complete;
-  }
-
-  /**
-   * Returns whether the page is complete or not.
-   */
-  public boolean isPageComplete()
-  {
-    return pageComplete;
-  }
-
-  private String currentMessage = "";
-  protected void showMessageInStatusLine(boolean show)
-  {
-    if (getStatusLine() == null)
-      return;
-    
-    if (show) 
-    {
-      getStatusLine().setErrorMessage(currentMessage);
-    }
-    else 
-    {
-      getStatusLine().setErrorMessage("");
-    }
-    
-    
-    getStatusLine().update(false);
-  }
-  
-  /**
-   * Sets the message line
-   */
-  public void setMessage(String message)
-  {
-    currentMessage = message;
-    if (getStatusLine() != null)
-    {
-      getStatusLine().setErrorMessage(currentMessage);
-      getStatusLine().update(false);
-    }
-  }
-
-  /**
-   * Clears a message.
-   */
-  public void clearMessage()
-  {
-    currentMessage = "";
-    if (getStatusLine() != null)
-    {
-      getStatusLine().setErrorMessage(currentMessage);
-      getStatusLine().update(false);
-    }
-  }
-
-  public void setErrorMessage(String message)
-  {
-    setMessage(message);
-    setPageComplete(false);
-  }
-
-  public void clearErrorMessage()
-  {
-    clearMessage();
-    setPageComplete(true);
-  }
-
-  public String getErrorMessage()
-  {
-    return currentMessage;
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ui/BorderPainter.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ui/BorderPainter.java
deleted file mode 100644
index 47bdeb5f3..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ui/BorderPainter.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util.ui;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.custom.TableTree;
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Canvas;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Tree;
-
-public class BorderPainter implements PaintListener
-{
-  Color backgroundColor, foregroundColor;
-  static Color borderColor;
-
-  public BorderPainter()
-  {
-    Display display = Display.getCurrent();
-    if (borderColor == null)
-    {
-      borderColor = new Color(Display.getCurrent(), 195, 191, 179);  	
-    }
-    backgroundColor = display.getSystemColor(SWT.COLOR_LIST_BACKGROUND);
-    foregroundColor = display.getSystemColor(SWT.COLOR_LIST_FOREGROUND);	
-  }
-	
-  public void paintControl(PaintEvent event)
-  {
-    Composite composite = (Composite) event.widget;
-    Control[] children = composite.getChildren();
-    for (int i = 0; i < children.length; i++)
-    {
-      Control c = children[i];
-      if (c.isEnabled()==false)
-      {
-        if (c instanceof Text
-          || c instanceof Canvas
-          || c instanceof List
-          || c instanceof CCombo)
-        {
-          Rectangle b = c.getBounds();
-          GC gc = event.gc;
-          gc.setForeground(backgroundColor);
-//        gc.drawRectangle(b.x - 1, b.y - 1, b.width + 1, b.height + 1);
-          gc.setForeground(borderColor);
-          gc.drawRectangle(b.x - 2, b.y - 2, b.width + 3, b.height + 3);
-        }
-        continue;
-      }
-      if (c instanceof Text
-//        || c instanceof Canvas
-        || c instanceof List
-        || c instanceof CCombo)
-      {
-        Rectangle b = c.getBounds();
-        GC gc = event.gc;
-        gc.setForeground(backgroundColor);
-        gc.drawRectangle(b.x - 1, b.y - 1, b.width + 1, b.height + 1);
-        gc.setForeground(foregroundColor);
-        gc.drawRectangle(b.x - 2, b.y - 2, b.width + 3, b.height + 3);
-      }
-      else if (c instanceof Table
-        || c instanceof Tree
-        || c instanceof TableTree) {
-        Rectangle b = c.getBounds();
-        GC gc = event.gc;
-        gc.setForeground(foregroundColor);
-        //gc.drawRectangle(b.x - 2, b.y - 2, b.width + 3, b.height + 3);
-        gc.drawRectangle(b.x-1, b.y-1, b.width+2, b.height+2);
-      }
-    }
-  }
-}
-
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ui/FlatViewUtility.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ui/FlatViewUtility.java
deleted file mode 100644
index f0b9fb552..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ui/FlatViewUtility.java
+++ /dev/null
@@ -1,902 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util.ui;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.custom.ScrolledComposite;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.FontMetrics;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Layout;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Widget;
-import org.eclipse.ui.part.PageBook;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.util.flatui.FlatPageHeader;
-import org.eclipse.wst.wsdl.ui.internal.util.flatui.WidgetFactory;
-
-public class FlatViewUtility implements PaintListener
-{
-  Color backgroundColor, foregroundColor;
-  Color comboBackgroundColor, comboDisabledColor;
-  static Color borderColor;
-
-  // Added for createFlatPageHeader()
-  private boolean headingVisible=true;
-  private Image headingImage = null;
-  private Composite headerControl = null;
-  private int TITLE_VMARGIN = 5;
-
-  private KeyboardHandler keyboardHandler;
-
-  public static final int H_SCROLL_INCREMENT = 5;
-  public static final int V_SCROLL_INCREMENT = 64;
-  
-  // this defaults to the flat style, but users can change it if they wish
-  private int flatStyle = SWT.FLAT;
-  private int border = 0;
-
-  public FlatViewUtility()
-  { 
-    Display display = Display.getCurrent();
-    if (borderColor == null)
-    {
-      borderColor = new Color(Display.getCurrent(), 195, 191, 179);  	
-    }
-    backgroundColor = display.getSystemColor(SWT.COLOR_LIST_BACKGROUND);
-    foregroundColor = display.getSystemColor(SWT.COLOR_LIST_FOREGROUND);
-    comboBackgroundColor = display.getSystemColor(SWT.COLOR_LIST_BACKGROUND);
-    comboDisabledColor = display.getSystemColor(SWT.COLOR_WIDGET_BACKGROUND);
-    keyboardHandler = new KeyboardHandler();
-  }
-  
-  public FlatViewUtility(boolean isFlat)
-  {
-    this();
-    
-    setFlat(isFlat);
-  }
-  
-  public void setFlat(boolean flat)
-  {
-    Display display = Display.getCurrent();
-    if (flat)
-    {
-      flatStyle = SWT.FLAT;
-      backgroundColor = display.getSystemColor(SWT.COLOR_LIST_BACKGROUND);
-      foregroundColor = display.getSystemColor(SWT.COLOR_LIST_FOREGROUND);  
-    }
-    else
-    {
-      flatStyle = 0;
-      border = SWT.BORDER;
-      backgroundColor = display.getSystemColor(SWT.COLOR_WIDGET_BACKGROUND);
-      foregroundColor = display.getSystemColor(SWT.COLOR_WIDGET_FOREGROUND);
-    }
-  }
-  
-  public void setColor(Control c)
-  {
-    if (flatStyle == SWT.FLAT)
-    {
-      c.setBackground(backgroundColor);
-    }
-  }
-  
-  public void paintControl(PaintEvent event)
-  {
-    Control c = (Control) event.widget;
-    if (c.isEnabled()==false)
-    {
-      if (c instanceof Text
-//      || c instanceof Canvas
-          || c instanceof List
-          || c instanceof CCombo)
-      {
-        GC gc = event.gc;
-        gc.setForeground(backgroundColor);
-//      gc.drawRectangle(b.x - 1, b.y - 1, b.width + 1, b.height + 1);
-        gc.setForeground(borderColor);
-//        gc.drawRectangle(b.x - 2, b.y - 2, b.width + 3, b.height + 3);
-      }
-    }              
-
-    // Defect 252891 : this causes some major problems on Linux GTK
-    // This looks rather dodgy in any case since an cyclic painting behaviour
-    // is likely occuring here
-    //if (c.getParent() != null)
-    //{
-    //  c.getParent().redraw();
-    //}
-  }
-
-  private static Font font;
-
-  public static Font getFont()
-  {
-    if (font == null)
-    {
-      font = new Font(Display.getCurrent(), "ms sans serif", 8, SWT.NORMAL);
-    }
-    return font;
-  }
-
-  public static void setFont(Font newFont)
-  {
-    font = newFont;
-  }
-
-  public static void setComposite(Composite comp)
-  {
-    // deprecated.  Remove later
-  }
-
-  public Composite createSimpleComposite(Composite parent, int style)
-  {
-    Composite composite = new Composite(parent, style | flatStyle);
-    composite.setFont(getFont());
-    setColor(composite);
-
-    GridLayout layout = new GridLayout();
-    composite.setLayout(layout);
-    return composite;
-  }
-
-  public Composite createComposite(Composite parent, int numColumns)
-  {
-    Composite composite = new Composite(parent, SWT.NONE | flatStyle);
-    composite.setFont(getFont());
-    GridLayout layout = new GridLayout();
-    layout.numColumns = numColumns;
-    composite.setLayout(layout);
-
-    GridData data = new GridData();
-    data.verticalAlignment = GridData.FILL;
-    data.horizontalAlignment = GridData.FILL;
-    composite.setLayoutData(data);
-    setColor(composite);
-    if (flatStyle == SWT.FLAT)
-    {
-      composite.addPaintListener(new BorderPainter());
-    }
-    return composite;
-  }
-
-  public Composite createComposite(Composite parent, int numColumns, boolean horizontalFill)
-  {
-    if (!horizontalFill)
-    {
-      createComposite(parent, numColumns);
-    }
-
-    Composite composite = new Composite(parent, SWT.NONE | flatStyle);
-    composite.setFont(getFont());
-    GridLayout layout = new GridLayout();
-    layout.numColumns = numColumns;
-    composite.setLayout(layout);
-
-    GridData data = new GridData();
-    data.verticalAlignment = GridData.FILL;
-    data.horizontalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    composite.setLayoutData(data);
-    setColor(composite);
-    if (flatStyle == SWT.FLAT)
-    {
-      composite.addPaintListener(new BorderPainter());
-    }
-    return composite;
-  }
-
-  public Composite createComposite(Composite parent, int numColumns, boolean horizontalFill, boolean verticalFill)
-  {
-    if (!horizontalFill && !verticalFill)
-    {
-      createComposite(parent, numColumns);
-    }
-
-    Composite composite = new Composite(parent, SWT.NONE | flatStyle);
-    composite.setFont(getFont());
-
-    GridLayout layout = new GridLayout();
-    layout.numColumns = numColumns;
-    composite.setLayout(layout);
-
-    GridData data = new GridData();
-    data.verticalAlignment = GridData.FILL;
-    data.horizontalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    data.grabExcessVerticalSpace = true;
-    composite.setLayoutData(data);
-    setColor(composite);
-    if (flatStyle == SWT.FLAT)
-    {
-      composite.addPaintListener(new BorderPainter());
-    }
-    return composite;
-  }
-
-  public SashForm createSashForm(Composite parent, int style)
-  {
-    SashForm sashForm = new SashForm(parent, style | flatStyle);
-    setColor(sashForm);
-    return sashForm;
-  }
-
-  public PageBook createPageBook(Composite parent, int style)
-  {
-    PageBook pageBook = new PageBook(parent, style | flatStyle);
-    setColor(pageBook);
-    if (flatStyle == SWT.FLAT)
-    {
-      pageBook.addPaintListener(new BorderPainter());
-    }
-    return pageBook;
-  }
-
-  public Label createHeadingLabel(Composite parent, String text, Color bg) {
-    return createHeadingLabel(parent, text, bg, SWT.NONE);
-  }
-  public Label createHeadingLabel(Composite parent, String text, Color bg, int style) {
-    Label label = new Label(parent, style);
-    label.setText(text);
-    setColor(label);
-    if (flatStyle == SWT.FLAT)
-    {
-      label.setForeground(foregroundColor);
-    }
-    label.setFont(JFaceResources.getFontRegistry().get(JFaceResources.BANNER_FONT));
-    return label;
-  }
-
-  public Label createHorizontalFiller(Composite parent, int horizontalSpan)
-  {
-    Label label = new Label(parent, SWT.LEFT | flatStyle);
-    setColor(label);
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.horizontalSpan = horizontalSpan;
-    label.setLayoutData(data);
-    return label;
-  }
-
-  /**
-   * Helper method for creating labels.
-   */
-  public Label createLabel(Composite parent, int style, String text)
-  {
-    Label label = new Label(parent, style | flatStyle);
-    setColor(label);
-    label.setText(text);
-
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    label.setLayoutData(data);
-    return label;
-  }
-
-  public Label createLabel(Composite parent, String text)
-  {
-    Label label = new Label(parent, SWT.LEFT | flatStyle);
-    setColor(label);
-    label.setText(text);
-
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    label.setLayoutData(data);
-    return label;
-  }
-
-  public Label createLabel(Composite parent, String text, int alignment)
-  {
-    Label label = new Label(parent, SWT.LEFT | flatStyle);
-    label.setText(text);
-    setColor(label);
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.verticalAlignment = alignment;
-    label.setLayoutData(data);
-    return label;
-  }
-
-  /**
-   * Helper method for creating buttons.
-   */
-  public Button createPushButton(Composite parent, String label)
-  {
-    Button button = new Button(parent, SWT.PUSH | flatStyle);
-    button.setText(label);
-    setColor(button);
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    button.setLayoutData(data);
-    button.addKeyListener(keyboardHandler);
-
-    return button;
-  }
-
-  public Table createTable(Composite parent)
-  {
-    Table table = new Table(parent, SWT.SINGLE | SWT.BORDER | flatStyle);
-    setColor(table);
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    table.setLayoutData(data);
-    return table;
-  }
-
-  /**
-   * Create radio button
-   */
-  public Button createRadioButton(Composite parent, String label)
-  {
-    Button button = new Button(parent, SWT.RADIO | flatStyle);
-    button.setText(label);
-    setColor(button);
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    button.setLayoutData(data);
-    button.addKeyListener(keyboardHandler);
-
-    return button;
-  }
-
-  /**
-   * Helper method for creating check box
-   */
-  public Button createCheckBox(Composite parent, String label)
-  {
-    Button button = new Button(parent, SWT.CHECK | flatStyle);
-    button.setText(label);
-    setColor(button);
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    button.setLayoutData(data);
-    return button;
-  }
-
-  public Combo createComboBox(Composite parent)
-  {
-    return createComboBox(parent, true);
-  }
-
-  public Combo createComboBox(Composite parent, boolean isReadOnly)
-  {
-    int style = isReadOnly == true ? SWT.READ_ONLY : SWT.DROP_DOWN;
-
-    Combo combo = new Combo(parent, style | flatStyle | border);
-    setColor(combo);
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    combo.setLayoutData(data);
-    return combo;
-  }
-
-  public CCombo createCComboBox(Composite parent)
-  {
-    return createCComboBox(parent, true);
-  }
-
-  public CCombo createCComboBox(Composite parent, boolean isReadOnly)
-  {
-    int style = isReadOnly == true ? SWT.READ_ONLY : SWT.DROP_DOWN;
-
-    CCombo combo = new CCombo(parent, style | flatStyle | border);
-    // setColor(combo);
-    // Always use List Background
-    combo.setBackground(comboBackgroundColor);
-
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.verticalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    combo.setLayoutData(data);
-    if (flatStyle == SWT.FLAT)
-    {
-      combo.addPaintListener(this);
-    }
-    else                        
-    {                           
-      /*   
-       // Defect 252891 : I'm not sure if this code will also cause problems on Linux GTK
-       // But since its potentially cyclic ... I'm commenting it out for now
-       combo.addPaintListener(new PaintListener()
-       {
-       public void paintControl(PaintEvent event)
-       {
-       Control c = (Control) event.widget;
-       if (c.isEnabled()==true)
-       {
-       c.setBackground(comboBackgroundColor);
-       }
-       else
-       {
-       c.setBackground(comboDisabledColor); 
-       }
-       final Control con = c;
-       Runnable delayedUpdate = new Runnable()
-       {
-       public void run()
-       {
-       if (con != null)
-       {
-       if (!con.isDisposed())  // it gets disposed
-       {
-       con.redraw();
-       }
-       }
-       }
-       };
-       Display.getCurrent().asyncExec(delayedUpdate);
-       }
-       });*/
-    }
-    return combo;
-  }
-
-  public List createListBox(Composite parent, int width, boolean isMultiSelect)
-  {
-    int style = isMultiSelect ? SWT.MULTI : SWT.SINGLE;
-    List list = new List(parent, style  | flatStyle | border);
-    setColor(list);
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    data.widthHint = width;
-    list.setLayoutData(data);
-    if (flatStyle == SWT.FLAT)
-    {
-      list.addPaintListener(this);
-    }
-    return list;
-  }
-
-  public List createListBox(Composite parent, int width, boolean isMultiSelect, boolean verticalFill)
-  {
-    int style = isMultiSelect ? SWT.MULTI : SWT.SINGLE;
-    List list = new List(parent, style  | flatStyle | border);
-    setColor(list);
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.verticalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    data.grabExcessVerticalSpace = verticalFill;
-    data.widthHint = width;
-    list.setLayoutData(data);
-    if (flatStyle == SWT.FLAT)
-    {
-      list.addPaintListener(this);
-    }
-    return list;
-  }
-
-  public List createListBox(Composite parent, int style)
-  {
-    List list = new List(parent, style | flatStyle | border);
-    setColor(list);
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.verticalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    data.grabExcessVerticalSpace = true;
-    list.setLayoutData(data);
-    if (flatStyle == SWT.FLAT)
-    {
-      list.addPaintListener(this);
-    }
-    return list;
-  }
-
-  public Text createTextField(Composite parent)
-  {
-    Text text = new Text(parent, SWT.SINGLE | flatStyle | border);
-    setColor(text);
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.verticalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    text.setLayoutData(data);
-    if (flatStyle == SWT.FLAT)
-    {
-      text.addPaintListener(this);
-    }
-    text.addKeyListener(keyboardHandler);
-    return text;
-  }
-
-  public Text createTextField(Composite parent, int width)
-  {
-    Text text = new Text(parent, SWT.SINGLE | flatStyle | border);
-    setColor(text);
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.verticalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    data.widthHint = width;
-    text.setLayoutData(data);
-    if (flatStyle == SWT.FLAT)
-    {
-      text.addPaintListener(this);
-    }
-    text.addKeyListener(keyboardHandler);
-    return text;
-  }
-
-  public Text createTextField(Composite parent, int width, int style)
-  {
-    Text text = new Text(parent, style | SWT.SINGLE | flatStyle | border);
-    setColor(text);
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.verticalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    data.widthHint = width;
-    text.setLayoutData(data);
-    if (flatStyle == SWT.FLAT)
-    {
-      text.addPaintListener(this);
-    }
-    return text;
-  }
-
-  /**
-   * <code>createWrappedMultiTextField</code> creates a wrapped multitext field
-   *
-   * @param parent a <code>Composite</code> value
-   * @param width an <code>int</code> value
-   * @param numLines an <code>int</code> value representing number of characters in height
-   * @param verticalFill a <code>boolean</code> value
-   * @return a <code>Text</code> value
-   */
-  public Text createWrappedMultiTextField(Composite parent, int width, int numLines, boolean verticalFill)
-  {
-    Text text = new Text(parent, SWT.MULTI | SWT.WRAP | SWT.V_SCROLL | flatStyle | border);
-    setColor(text);
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    if (verticalFill)
-    {
-      data.verticalAlignment = GridData.FILL;
-      data.grabExcessVerticalSpace = true;
-    }
-    data.widthHint = width;
-    FontData[] fontData = getFont().getFontData();
-    // hack for now where on Windows, only 1 fontdata exists
-    data.heightHint = numLines * fontData[0].getHeight();
-    text.setLayoutData(data);
-    if (flatStyle == SWT.FLAT)
-    {
-      text.addPaintListener(this);
-    }
-    return text;
-  }
-
-  public Text createMultiTextField(Composite parent, int width, int height, boolean verticalFill)
-  {
-    Text text = new Text(parent, SWT.MULTI |  SWT.H_SCROLL | SWT.V_SCROLL | flatStyle | border);
-    setColor(text);
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    if (verticalFill)
-    {
-      data.verticalAlignment = GridData.FILL;
-      data.grabExcessVerticalSpace = true;
-    }
-    data.widthHint = width;
-    data.heightHint = height;
-    text.setLayoutData(data);
-    if (flatStyle == SWT.FLAT)
-    {
-      text.addPaintListener(this);
-    }
-    return text;
-  }
-
-  public Text createMultiTextField(Composite parent, boolean verticalFill)
-  {
-    Text text = new Text(parent, SWT.MULTI |  SWT.H_SCROLL | SWT.V_SCROLL | flatStyle | border);
-    setColor(text);
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    if (verticalFill)
-    {
-      data.verticalAlignment = GridData.FILL;
-      data.grabExcessVerticalSpace = true;
-    }
-    text.setLayoutData(data);
-    if (flatStyle == SWT.FLAT)
-    {
-      text.addPaintListener(this);
-    }
-    return text;
-  }
-
-  public Group createGroup(Composite parent, int numColumns, String text, boolean verticalFill)
-  {
-    Group group = new Group(parent, SWT.SHADOW_ETCHED_IN  | flatStyle);
-    group.setText(text);
-    setColor(group);
-
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    if (verticalFill)
-    {
-      data.verticalAlignment = GridData.FILL;
-      data.grabExcessVerticalSpace = true;
-    }
-    group.setLayoutData(data);
-
-    GridLayout layout = new GridLayout();
-    layout.numColumns = numColumns;
-    group.setLayout(layout);
-    if (flatStyle == SWT.FLAT)
-    {
-      group.addPaintListener(new BorderPainter());
-    }
-    return group;
-  }
-
-  public Group createGroup(Composite parent, int numColumns, String text, boolean verticalFill, int alignment)
-  {
-    Group group = new Group(parent, SWT.SHADOW_ETCHED_IN | flatStyle);
-    group.setText(text);
-    setColor(group);
-
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    data.verticalAlignment = alignment;
-    if (verticalFill)
-    {
-      data.verticalAlignment = GridData.FILL;
-      data.grabExcessVerticalSpace = true;
-    }
-    group.setLayoutData(data);
-
-    GridLayout layout = new GridLayout();
-    layout.numColumns = numColumns;
-    group.setLayout(layout);
-    if (flatStyle == SWT.FLAT)
-    {
-      group.addPaintListener(new BorderPainter());
-    }
-    return group;
-  }
-
-  public Label createVerticalFiller(Composite parent, int verticalSpan)
-  {
-    Label label = new Label(parent, SWT.LEFT | flatStyle);
-    label.setFont(getFont());
-    setColor(label);
-    GridData data = new GridData();
-    data.verticalAlignment = GridData.FILL;
-    data.verticalSpan = verticalSpan;
-    label.setLayoutData(data);
-
-    return label;
-  }
-
-  //
-  // FlatPageHeader
-  //
-
-  // This will use the default background image.
-  public Composite createFlatPageHeader
-  (Composite parent,
-      String title)
-  {
-    Image bgImage = createDefaultImage();
-    return createFlatPageHeader(parent,bgImage,title);
-  }
-
-  // Provide your own background image.
-  public Composite createFlatPageHeader
-  (Composite parent,
-      Image bgImage,
-      String title)
-  {
-    FlatPageHeader header = new FlatPageHeader(parent,SWT.NONE);
-    header.setLayout(new PageLayout());
-    header.setBackgroundImage(bgImage);
-    header.setText(title);
-    WidgetFactory factory = new WidgetFactory();
-    Composite formParent = factory.createComposite(header);
-    //Composite formParent = createComposite(header,1);
-    createPageContent(formParent);
-    headerControl = header; // this is used in getTitleHeight()
-    return formParent;
-  }
-
-  public void updateFlatPageHeaderTitle(String title)
-  {
-    ((FlatPageHeader)headerControl).setText(title);
-  }
-
-  private void createPageContent(Composite parent) 
-  {
-    GridLayout layout = new GridLayout();
-    layout.numColumns = 1;
-    parent.setLayout(layout);
-    parent.setLayoutData(new GridData(GridData.FILL_BOTH));
-  }
-
-  class PageLayout extends Layout 
-  {
-    protected Point computeSize(Composite composite, int wHint, int hHint, boolean flushCache) 
-    {
-      if (wHint != SWT.DEFAULT && hHint != SWT.DEFAULT)
-        return new Point(wHint, hHint);
-
-      Control client = composite.getChildren()[0];
-      Point csize = client.computeSize(SWT.DEFAULT, SWT.DEFAULT, flushCache);
-      if (headingVisible) csize.y += getTitleHeight();
-      
-      return csize;
-    }
-    
-    protected void layout(Composite composite, boolean flushCache) 
-    {
-      Rectangle clientArea = composite.getClientArea();
-      Control client = composite.getChildren()[0];
-      int theight = headingVisible ? getTitleHeight() : 0;
-      client.setBounds(clientArea.x, clientArea.y + theight, clientArea.width, clientArea.height - theight);
-    }
-  }
-
-  private int getTitleHeight() 
-  {
-    int imageHeight = 0;
-    // Note - Find out why headingImage is always null.
-    if (headingImage != null && SWT.getPlatform().equals("motif") == false) 
-      imageHeight = headingImage.getBounds().height;
-
-    GC gc = new GC(headerControl);
-    gc.setFont(JFaceResources.getHeaderFont());
-    FontMetrics fm = gc.getFontMetrics();
-    int fontHeight = fm.getHeight();
-    gc.dispose();
-
-    int height = fontHeight + TITLE_VMARGIN + TITLE_VMARGIN;
-    return Math.max(height,imageHeight);
-  }
-
-
-  private Image createDefaultImage()
-  {
-    return ImageDescriptor.createFromFile
-    (WSDLEditorPlugin.class,
-        "icons/page_banner.gif").createImage();
-  }
-  /**
-   * Returns the backgroundColor.
-   * @return Color
-   */
-  public Color getBackgroundColor()
-  {
-    return backgroundColor;
-  }
-  
-  public class KeyboardHandler extends KeyAdapter
-  {
-    public void keyPressed(KeyEvent e)
-    {
-      Widget w = e.widget;
-      if (w instanceof Control)
-      {
-        processKey(e.keyCode, (Control) w);
-      }
-    }
-
-    private void scrollVertical(ScrolledComposite scomp, boolean up)
-    {
-      scroll(scomp, 0, up ? -V_SCROLL_INCREMENT : V_SCROLL_INCREMENT);
-    }
-
-    private void scrollHorizontal(ScrolledComposite scomp, boolean left)
-    {
-      scroll(scomp, left ? -H_SCROLL_INCREMENT : H_SCROLL_INCREMENT, 0);
-    }
-
-    private void scrollPage(ScrolledComposite scomp, boolean up)
-    {
-      Rectangle clientArea = scomp.getClientArea();
-      int increment = up ? -clientArea.height : clientArea.height;
-      scroll(scomp, 0, increment);
-    }
-
-    private void scroll(ScrolledComposite scomp, int xoffset, int yoffset)
-    {
-      Point origin = scomp.getOrigin();
-      Point contentSize = scomp.getContent().getSize();
-      int xorigin = origin.x + xoffset;
-      int yorigin = origin.y + yoffset;
-      xorigin = Math.max(xorigin, 0);
-      xorigin = Math.min(xorigin, contentSize.x - 1);
-      yorigin = Math.max(yorigin, 0);
-      yorigin = Math.min(yorigin, contentSize.y - 1);
-      scomp.setOrigin(xorigin, yorigin);
-    }
-    
-    protected ScrolledComposite getScrolledComposite(Control c)
-    {
-      Composite parent = c.getParent();
-      
-      while (parent != null)
-      {
-        if (parent instanceof ScrolledComposite)
-        {
-          return (ScrolledComposite) parent;
-        }
-        parent = parent.getParent();
-      }
-      return null;
-    }
-    
-    protected void processKey(int keyCode, Control c)
-    {
-      ScrolledComposite scomp = getScrolledComposite(c);
-      if (scomp != null)
-      {
-        switch (keyCode)
-        {
-        case SWT.ARROW_DOWN :
-          scrollVertical(scomp, false);
-          break;
-        case SWT.ARROW_UP :
-          scrollVertical(scomp, true);
-          break;
-        case SWT.ARROW_LEFT :
-          scrollHorizontal(scomp, true);
-          break;
-        case SWT.ARROW_RIGHT :
-          scrollHorizontal(scomp, false);
-          break;
-        case SWT.PAGE_UP :
-          scrollPage(scomp, true);
-          break;
-        case SWT.PAGE_DOWN :
-          scrollPage(scomp, false);
-          break;
-        }
-      }
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/BaseViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/BaseViewer.java
deleted file mode 100644
index 83a118bbf..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/BaseViewer.java
+++ /dev/null
@@ -1,367 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import org.eclipse.jface.action.IStatusLineManager;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.part.EditorActionBarContributor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapterListener;
-import org.eclipse.wst.wsdl.ui.internal.util.ui.BaseDesignWindow;
-import org.eclipse.wst.wsdl.ui.internal.util.ui.BorderPainter;
-import org.eclipse.wst.wsdl.ui.internal.util.ui.FlatViewUtility;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public abstract class BaseViewer extends BaseDesignWindow implements Listener, SelectionListener
-{
-//  protected Object input; 
-
-  // for use in subclasses
-  protected FlatViewUtility flatViewUtility = new FlatViewUtility(true);
-
-  public BaseViewer(IStatusLineManager statusLine)
-  {
-    super(statusLine);
-  }
-
-  public Object getInput()
-  {
-    return input;
-  }
-
-  // gets called only if we currently are not handling an event
-  abstract public void doSetInput(Object input);
-  
-  /**
-   * @see org.eclipse.jface.viewers.Viewer#setInput(Object)
-   */
-  static Object oldInput = null;
-  ModelAdapterListener oldModelAdapterListener = null;
-
-  public void setInput(Object input)
-  {
-    super.setInput(input);
-
-    doSetInput(input);
-/*
-    if (!isInDoHandle() && !getControl().isDisposed())
-    {
-      final Object obj = input;
-      getControl().getDisplay().asyncExec(new Runnable()
-      {
-        public void run()
-        {
-          doSetInput(obj);
-        }
-      });
-    }
-*/
-  }
-
-
-  boolean listenerEnabled = true;
-  /**
-   * Get the value of listenerEnabled.
-   * @return value of listenerEnabled.
-   */
-  public boolean isListenerEnabled() 
-  {
-    return listenerEnabled;
-  }
-  
-  /**
-   * Set the value of listenerEnabled.
-   * @param v  Value to assign to listenerEnabled.
-   */
-  public void setListenerEnabled(boolean  v) 
-  {
-    this.listenerEnabled = v;
-  }
-
-
-  public void handleEvent(Event event)
-  {
-    if (isListenerEnabled() &&
-        getInput() != null &&
-        !isInDoHandle) 
-    {
-      isInDoHandle = true;
-      startDelayedEvent(event);
-      isInDoHandle = false;
-    } // end of if ()
-  }
-
-  abstract public void doHandleEvent(Event event);
-  abstract public void createControl(Composite parent);
-
-  protected DelayedEvent delayedTask;
-  
-  protected void startDelayedEvent(Event e)
-  {
-    if (delayedTask == null ||
-      delayedTask.getEvent() == null)
-    {
-      delayedTask = new DelayedEvent();
-      delayedTask.setEvent(e);
-      Display.getDefault().timerExec(500,delayedTask);
-    }
-    else
-    {
-      Event delayedEvent = delayedTask.getEvent();
-      
-      if (e.widget == delayedEvent.widget &&
-        e.type == delayedEvent.type)
-      {
-        // same event, just different data, delay new event
-        delayedTask.setEvent(null);
-      }
-      delayedTask = new DelayedEvent();
-      delayedTask.setEvent(e);
-      Display.getDefault().timerExec(500,delayedTask);
-    }
-  }
-  
-  class DelayedEvent implements Runnable
-  {
-    protected Event event;
-    
-    /*
-     * @see Runnable#run()
-     */
-    public void run()
-    {
-      if (event != null)
-      {
-        isInDoHandle = true;
-        doHandleEvent(event);
-        isInDoHandle = false;
-        event = null;
-      }
-    }
-    
-    /**
-     * Gets the event.
-     * @return Returns a Event
-     */
-    public Event getEvent()
-    {
-      return event;
-    }
-
-    /**
-     * Sets the event.
-     * @param event The event to set
-     */
-    public void setEvent(Event event)
-    {
-      this.event = event;
-    }
-
-  }
-
-
-  boolean isInDoHandle;
-  /**
-   * Get the value of isInDoHandle.
-   * @return value of isInDoHandle.
-   */
-  public boolean isInDoHandle() 
-  {
-    return isInDoHandle;
-  }
-
-  /*
-   * @see Viewer#getControl()
-   */
-  public Control getControl()
-  {
-    return mainUIComponent;
-  }
-
-
-  /*
-   * @see BaseDesignWindow#createDesignPane(Composite, int)
-   */
-  protected Control createDesignPane(Composite arg0, int arg1)
-  {
-    Control control = super.createDesignPane(arg0, arg1);
-    
-    Composite client = super.getControlsContainer();
-    
-    client.addPaintListener(new BorderPainter());
-    
-    client.setBackground(new Color(Display.getCurrent(),255,255,255));
-
-    return control;
-  }
-
-
-  public ISelection getSelection()
-  {
-    return null;
-  }
-  
-  public void refresh()
-  {
-  }
-
-  public void setSelection(ISelection selection, boolean reveal) 
-  {
-  }
-   
-  
-//  public abstract Control getControl();
-
-
-  public Node getNode()
-  {
-    return (Node) getInput();
-  }
-
-
-  public void doWidgetDefaultSelected(SelectionEvent e)
-  {}
-  
-  public void doWidgetSelected(SelectionEvent e)
-  {}
-  
-  /**
-   * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(SelectionEvent)
-   */
-  public void widgetDefaultSelected(SelectionEvent e)
-  {
-    if (isListenerEnabled() &&
-        getInput() != null &&
-        !isInDoHandle) 
-    {
-      isInDoHandle = true;
-      doWidgetDefaultSelected(e);
-      isInDoHandle = false;
-    }
-    
-  }
-
-  /**
-   * @see org.eclipse.swt.events.SelectionListener#widgetSelected(SelectionEvent)
-   */
-  public void widgetSelected(SelectionEvent e)
-  {
-    if (isListenerEnabled() &&
-        getInput() != null &&
-        !isInDoHandle) 
-    {
-      isInDoHandle = true;
-      doWidgetSelected(e);
-      isInDoHandle = false;
-    }
-    
-  }
-
-  public Node getChildNode(Element parent, String childName)
-  {
-    NodeList list = null;
-    if (parent != null)
-    {
-      list = parent.getChildNodes();
-    }
-   
-    if (list != null)
-    {
-      // Performance issue perhaps?
-      for (int i = 0; i < list.getLength(); i++)
-      {
-        if (list.item(i) instanceof Element)
-        {
-          if (list.item(i).getLocalName().equals(childName))
-          {
-            return list.item(i);
-          }
-        }
-      }
-    }
-    return null;
-  }
-
-
-  protected Element performAddElement(Node parentNode, String namespaceName, String localName)
-  {
-    if (parentNode != null)
-    {                              
-      Element newElement = createElement(parentNode, namespaceName, localName);
-      parentNode.appendChild(newElement);       
-      format(parentNode);
-      return newElement;
-    }  
-    return null;
-  }
-
-  protected Element createElement(Node parentNode, String namespaceName, String localName)
-  {
-    Document document = parentNode.getOwnerDocument();
-    Element element = document.createElement(localName);
-    return element;   
-  }   
-
-  protected void addAttributes(Element newElement, String attr, String value)
-  {                                              
-    newElement.setAttribute(attr, value);
-  }
-
-  protected void format(Node parentNode)
-  {
-    if (parentNode instanceof IDOMNode) 
-    {
-      // format selected node                                                    
-      FormatProcessorXML formatProcessorXML = new FormatProcessorXML();
-      formatProcessorXML.formatNode((IDOMNode)parentNode);
-    }
-  }
-  
-  static protected IEditorPart getActiveEditor()
-  {
-    IWorkbench workbench = WSDLEditorPlugin.getInstance().getWorkbench();
-    IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
-    IEditorPart editorPart = workbenchWindow.getActivePage().getActiveEditor();
-
-    return editorPart;
-  }
-  
-  static protected IStatusLineManager getStatusLineManager(IEditorPart editorPart)
-  { 
-    IStatusLineManager result = null;
-    try
-    {                       
-      EditorActionBarContributor contributor = (EditorActionBarContributor)editorPart.getEditorSite().getActionBarContributor();
-      result = contributor.getActionBars().getStatusLineManager();
-    }
-    catch (Exception e)
-    {
-    }  
-    return result;
-  }
-  
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/BindingInputOutputFaultViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/BindingInputOutputFaultViewer.java
deleted file mode 100644
index 5c7d396a0..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/BindingInputOutputFaultViewer.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-public class BindingInputOutputFaultViewer extends NamedComponentViewer 
-{                    
-  public BindingInputOutputFaultViewer(Composite parent, IEditorPart editorPart)
-  {
-    super(parent, editorPart);    
-  } 
-
-  protected String getHeadingText()
-  { 
-    String result = "";
-    if (input instanceof BindingInput)
-    {
-      result = WSDLEditorPlugin.getWSDLString("_UI_LABEL_BINDING_INPUT");
-    }
-    else if (input instanceof BindingOutput)
-    {
-      result = WSDLEditorPlugin.getWSDLString("_UI_LABEL_BINDING_OUTPUT");
-    }
-    else if (input instanceof BindingFault)
-    {
-      result = WSDLEditorPlugin.getWSDLString("_UI_LABEL_BINDING_FAULT");
-    }            
-    return result;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/BindingOperationViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/BindingOperationViewer.java
deleted file mode 100644
index f10337bca..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/BindingOperationViewer.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-public class BindingOperationViewer extends NamedComponentViewer 
-{                    
-  public BindingOperationViewer(Composite parent, IEditorPart editorPart)
-  {
-    super(parent, editorPart);    
-  } 
-
-  protected String getHeadingText()
-  {
-    return WSDLEditorPlugin.getWSDLString("_UI_LABEL_BINDING_OPERATION"); //$NON-NLS-1$
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/BindingViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/BindingViewer.java
deleted file mode 100644
index 79d8bce9f..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/BindingViewer.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import java.util.List;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.eclipse.wst.wsdl.ui.internal.viewers.widgets.ComponentNameComboHelper;
-import org.eclipse.wst.wsdl.ui.internal.viewers.widgets.InvokeDialogButton;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-
-public class BindingViewer extends NamedComponentViewer 
-{                      
-  protected CCombo componentNameCombo;      
-  protected ComponentNameComboHelper componentNameComboHelper;
-  InvokeDialogButton button;
-
-  public BindingViewer(Composite parent, IEditorPart editorPart)
-  {
-    super(parent, editorPart);    
-  } 
-
-  protected String getHeadingText()
-  {
-    return WSDLEditorPlugin.getWSDLString("_UI_LABEL_BINDING");  //$NON-NLS-1$
-  }
-
-  protected Composite populatePrimaryDetailsSection(Composite parent)
-  {
-    Composite composite = super.populatePrimaryDetailsSection(parent);
-                   
-    flatViewUtility.createLabel(composite, 0, WSDLEditorPlugin.getWSDLString("_UI_LABEL_PORTTYPE")); //$NON-NLS-1$
-
-    componentNameCombo = flatViewUtility.createCComboBox(composite);
-    componentNameCombo.addListener(SWT.Modify, this); 
-                                                                  
-
-    componentNameComboHelper = new ComponentNameComboHelper(componentNameCombo)
-    {
-      protected List getComponentNameList(ComponentReferenceUtil util)
-      {
-        return util.getPortTypeNames();
-      }
-
-      protected String getAttributeName()
-      {
-        return WSDLConstants.TYPE_ATTRIBUTE;
-      }
-    };
-
-    button = new InvokeDialogButton(composite, getInput());
-    button.setEditor(editorPart);
-
-    return composite;
-  }  
-
-  protected void update()
-  {
-    super.update();                                                     
-    componentNameComboHelper.update(input);
-    button.setInput(input);
-  }
-
-  protected void handleEventHelper(Element element, Event event)
-  {                        
-    super.handleEventHelper(element, event);
-    componentNameComboHelper.handleEventHelper(element, event);
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/DefinitionViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/DefinitionViewer.java
deleted file mode 100644
index 5384c1d32..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/DefinitionViewer.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.actions.EditNamespacesAction;
-
-public class DefinitionViewer extends NamedComponentViewer 
-{                     
-  public DefinitionViewer(Composite parent, IEditorPart editorPart)
-  {
-    super(parent, editorPart);    
-  } 
-
-  protected String getHeadingText()
-  { 
-    return WSDLEditorPlugin.getWSDLString("_UI_LABEL_DEFINITION"); //$NON-NLS-1$
-  }  
-    
-  protected Composite populatePrimaryDetailsSection(Composite parent)
-  {
-	  Composite composite = super.populatePrimaryDetailsSection(parent);
-	  flatViewUtility.createLabel(composite, 0, WSDLEditorPlugin.getWSDLString("_UI_NAMESPACES")); //$NON-NLS-1$
-	  Button button = flatViewUtility.createPushButton(composite, WSDLEditorPlugin.getWSDLString("_UI_EDIT_NAMESPACES"));
-	  SelectionListener listener = new SelectionListener()
-	  {
-		  public void widgetDefaultSelected(SelectionEvent event)
-		  {    		
-		  }
-		  
-		  public void widgetSelected(SelectionEvent event)
-		  {
-			  EditNamespacesAction action = new EditNamespacesAction((Definition)getInput());					
-			  action.run();	
-		  }	
-	  };
-	  button.addSelectionListener(listener);
-	  return composite;	
-  }	    
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/EmptyViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/EmptyViewer.java
deleted file mode 100644
index e4e254189..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/EmptyViewer.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-
-public class EmptyViewer extends BaseViewer
-{                                      
-  protected Composite control;
-
-  public EmptyViewer(Composite parent, int style)
-  {
-    super(getStatusLineManager(getActiveEditor()));
-    createControl(parent);
-  }
-
-  public void createControl(Composite parent)
-  {
-    control = new Composite(parent, SWT.NONE);
-
-    GridLayout layout = new GridLayout();
-    layout.numColumns = 1;
-    control.setLayout(layout);
-
-    GridData data = new GridData();
-    data.verticalAlignment = GridData.FILL;
-    data.horizontalAlignment = GridData.FILL;
-    control.setLayoutData(data);
-  }                                    
-
-  public Control getControl()
-  {
-    return control;
-  }
-
-  public void doSetInput(Object input)
-  {
-    
-  }
-
-  /*
-   * @see BaseWindow#doHandleEvent(Event)
-   */
-  public void doHandleEvent(Event event)
-  {
-    if (event.type == SWT.Modify)
-    {
-    }
-  }  
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/ExtensibilityElementViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/ExtensibilityElementViewer.java
deleted file mode 100644
index 0f3a17017..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/ExtensibilityElementViewer.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapterListener;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLModelAdapterFactory;
-import org.eclipse.wst.wsdl.ui.internal.viewers.widgets.AttributesTable;
-import org.w3c.dom.Node;
-
-public class ExtensibilityElementViewer extends BaseViewer implements ModelAdapterListener
-{             
-  protected Composite control;   
-  protected IEditorPart editorPart;   
-  protected AttributesTable attributesTable;
-  boolean isForTabbedProperties = false;
-  
-  public ExtensibilityElementViewer(Composite parent, IEditorPart editorPart)
-  {
-    super(getStatusLineManager(editorPart));    
-    this.editorPart = editorPart;                  
-
-    createControl(parent);   
-  }
-  
-  public ExtensibilityElementViewer(Composite parent, IEditorPart editorPart, boolean isForTabbedProperties)
-  {
-    super(getStatusLineManager(editorPart));    
-    this.editorPart = editorPart;                  
-    this.isForTabbedProperties = isForTabbedProperties;
-    if (isForTabbedProperties)
-    {
-      createControlForTabbedPropertySheet(parent);
-    }
-    else
-    {
-      createControl(parent);
-    }
-  } 
-
-  protected String getHeadingText()
-  { 
-    String result = "";                            
-    if (input != null)
-    {
-      Node node = ((WSDLElement)input).getElement();
-      result = node.getNodeName();
-      if (result == null || result.length() == 0)
-      {
-        result = WSDLEditorPlugin.getWSDLString("_UI_LABEL_UNKNOWN_EXTENSIBILITY_ELEMENT"); //$NON-NLS-1$ 
-      }
-    }
-    return result;
-  }         
-  
-  // TODO... move this method down to BaseViewer!
-  public void doHandleEvent(Event event)
-  {
-  }
-
-  public void createControlForTabbedPropertySheet(Composite parent)
-  { 
-    attributesTable = new AttributesTable(editorPart, parent);
-  }  
-
-  public void createControl(Composite parent)
-  { 
-    control = flatViewUtility.createComposite(parent, 1, true);   
-	  control.setBackground (new Color(null,255,0,0));
-	  GridData gd= new GridData();
-	  gd.horizontalAlignment= GridData.FILL;
-	  gd.grabExcessHorizontalSpace= true;
-	  gd.verticalAlignment= GridData.FILL;
-	  gd.grabExcessVerticalSpace= true;
-	  
-    control.setLayoutData(gd);
-
-
-    GridLayout layout = (GridLayout)control.getLayout();
-    layout.verticalSpacing = 0;
-    layout.marginHeight = 0;
-    layout.marginWidth = 0;
-                                      
-    flatViewUtility.createFlatPageHeader(control, "");
-
-    Composite c = flatViewUtility.createComposite(control, 1, true);
-    GridData cGD= new GridData();
-    cGD.horizontalAlignment= GridData.FILL;
-    cGD.grabExcessHorizontalSpace= true;
-    cGD.verticalAlignment= GridData.FILL;
-    cGD.grabExcessVerticalSpace= true;
-    
-    c.setLayoutData(cGD);                                 
-    attributesTable = new AttributesTable(editorPart, c);
-
-    GridData attributesTableGD= new GridData();
-    attributesTableGD.horizontalAlignment= GridData.FILL;
-    attributesTableGD.grabExcessHorizontalSpace= true;
-    attributesTableGD.verticalAlignment= GridData.FILL;
-    attributesTableGD.grabExcessVerticalSpace= true;
-
-    attributesTable.getControl().setLayoutData(attributesTableGD);
-  }  
-
-  public Control getControl()
-  {
-    return control;
-  } 
-   
-
-  public void doSetInput(Object input)
-  {
-    if (!isForTabbedProperties)
-    {
-      flatViewUtility.updateFlatPageHeaderTitle(getHeadingText());
-    }
-    setListenerEnabled(false);                          
-               
-    attributesTable.setInput(((WSDLElement)input).getElement());
- 
-    setListenerEnabled(true);
-
-    if (oldInput != null)
-    {
-      WSDLModelAdapterFactory.removeModelAdapterListener(oldInput, this);
-    }
-    WSDLModelAdapterFactory.addModelAdapterListener(input, this);
-
-    oldInput = input;
-  }
-
-  public void propertyChanged(Object object, String property)
-  {
-    if (isListenerEnabled())
-    {
-      setListenerEnabled(false);
-      update();
-      setListenerEnabled(true);
-    }
-  }  
-
-  protected void update()
-  {                          
-    Runnable runnable = new Runnable()
-    { 
-      public void run()
-      {           
-        if (!attributesTable.getControl().isDisposed())
-        {
-          attributesTable.refresh();
-        }
-      }
-    };               
-    Display.getCurrent().asyncExec(runnable);
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/ExtensibleDetailsViewerProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/ExtensibleDetailsViewerProvider.java
deleted file mode 100644
index 2c6057f44..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/ExtensibleDetailsViewerProvider.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.extension.IDetailsViewerProvider;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtension;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtensionRegistry;
-
-public class ExtensibleDetailsViewerProvider implements IDetailsViewerProvider
-{
-  protected WSDLEditorExtension[] extensions;
-  protected IDetailsViewerProvider[] detailsViewerProviders;
-
-  protected final static Object[] EMPTY_ARRAY = {};
-
-  public ExtensibleDetailsViewerProvider(WSDLEditor wsdlEditor)
-  {  	
-    WSDLEditorExtensionRegistry registry = WSDLEditorPlugin.getInstance().getWSDLEditorExtensionRegistry(); 
-
-    extensions = registry.getRegisteredExtensions(WSDLEditorExtension.DETAILS_VIEWER_PROVIDER); 
-    detailsViewerProviders = new IDetailsViewerProvider[extensions.length]; 
-    for (int i = 0; i < extensions.length; i++)
-    {
-      detailsViewerProviders[i] = (IDetailsViewerProvider)extensions[i].createExtensionObject(WSDLEditorExtension.DETAILS_VIEWER_PROVIDER, wsdlEditor);
-    }
-  }          
-      
-
-  protected IDetailsViewerProvider getApplicableDetailsProvider(Object object)
-  {                             
-    IDetailsViewerProvider provider = null;
-    for (int i = 0; i < extensions.length; i++)
-    {
-      if (extensions[i].isApplicable(object))
-      {
-        provider = detailsViewerProviders[i];
-        if (provider != null)
-        {
-          break;
-        }
-      }
-    }
-    return provider;
-  }
-   
-  
-  public Object getViewerKey(Object object)
-  {
-    IDetailsViewerProvider provider = getApplicableDetailsProvider(object);
-    return provider != null ? provider.getViewerKey(object) : null;
-  }
-  
-
-  public Viewer createViewer(Object object, Composite parent, IEditorPart editorPart)
-  {
-    IDetailsViewerProvider provider = getApplicableDetailsProvider(object);
-    return provider != null ? provider.createViewer(object, parent, editorPart) : null;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/ImportViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/ImportViewer.java
deleted file mode 100644
index 1419425ed..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/ImportViewer.java
+++ /dev/null
@@ -1,321 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.wst.common.ui.internal.dialogs.SelectSingleFileDialog;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapterListener;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLModelAdapterFactory;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.XMLQuickScan;
-import org.w3c.dom.Element;
-
-
-public class ImportViewer extends BaseViewer implements ModelAdapterListener
-{
-  protected Composite control;
-  protected IEditorPart editorPart;
-  
-  protected Text namespaceText;
-  protected Text prefixText;
-  protected Text locationText;
-  Button selectButton;
-
-  /**
-   * Constructor for ImportViewer.
-   * @param parent
-   * @param editorPart
-   */
-  public ImportViewer(Composite parent, IEditorPart editorPart)
-  {
-    super(getStatusLineManager(editorPart));
-    this.editorPart = editorPart;
-    createControl(parent);
-  }
-  /**
-   * @see org.eclipse.wst.wsdl.ui.internal.viewers.NamedComponentViewer#getHeadingText()
-   */
-  protected String getHeadingText()
-  {
-    return WSDLEditorPlugin.getWSDLString("_UI_LABEL_IMPORT"); //$NON-NLS-1$
-  }
-
-  public void createControl(Composite parent)
-  { 
-    control = flatViewUtility.createComposite(parent, 1, true);                 
-    GridLayout layout = (GridLayout)control.getLayout();
-    layout.verticalSpacing = 0;
-                                      
-    flatViewUtility.createFlatPageHeader(control, getHeadingText());
-
-    Composite c = flatViewUtility.createComposite(control, 1, true);
-
-    Label bogus = flatViewUtility.createLabel(c, 0, "");
-    GridData gd= new GridData();
-    gd.horizontalAlignment= GridData.FILL;
-    gd.grabExcessHorizontalSpace= true;
-    
-    bogus.setLayoutData(gd);
-
-    Composite composite = flatViewUtility.createComposite(c, 2, true); 
-    GridLayout layout2 = new GridLayout();
-    layout2.makeColumnsEqualWidth  = false;
-    layout2.numColumns = 3;
-    layout2.marginHeight = 3;
-    composite.setLayout(layout2);
-
-    flatViewUtility.createLabel(composite, 0, WSDLEditorPlugin.getWSDLString("_UI_LABEL_NAMESPACE")); //$NON-NLS-1$
-    namespaceText = flatViewUtility.createTextField(composite);
-    namespaceText.setEnabled(false);
-
-    // place holder
-    Control con= flatViewUtility.createLabel(composite, 0, "");
-    gd = new GridData();
-    gd.grabExcessHorizontalSpace = false;
-    con.setLayoutData(gd);
-
-    flatViewUtility.createLabel(composite, 0, WSDLEditorPlugin.getWSDLString("_UI_LABEL_PREFIX")); //$NON-NLS-1$
-    prefixText = flatViewUtility.createTextField(composite);
-    prefixText.addListener(SWT.Modify,this);
-    prefixText.setEnabled(false);    
-
-    // place holder
-    Control con2= flatViewUtility.createLabel(composite, 0, "");
-    gd = new GridData();
-    gd.grabExcessHorizontalSpace = false;
-    con2.setLayoutData(gd);
-
-    flatViewUtility.createLabel(composite, 0, WSDLEditorPlugin.getWSDLString("_UI_LABEL_LOCATION")); //$NON-NLS-1$
-    locationText = flatViewUtility.createTextField(composite);
-    locationText.setEnabled(false);
-
-    selectButton = flatViewUtility.createPushButton(composite, "...");
-    gd = new GridData();
-    gd.horizontalAlignment = GridData.BEGINNING;
-    gd.grabExcessHorizontalSpace = false;
-    selectButton.setLayoutData(gd);
-    selectButton.addSelectionListener(this);
-  }  
-
-  public void doSetInput(Object input)
-  {    
-    setListenerEnabled(false);                          
-    try
-    {          
-//      Node node = WSDLEditorUtil.getInstance().getNodeForObject(input);
-      update();
-    }
-    finally
-    {
-      setListenerEnabled(true);
-    }
-
-    if (oldInput != null)
-    {
-      WSDLModelAdapterFactory.removeModelAdapterListener(oldInput, this);
-    }
-
-    WSDLModelAdapterFactory.addModelAdapterListener(input, this);
-    oldInput = input;
-  }
-
-  protected void handleEventHelper(Element element, Event event)
-  {                        
-    if (event.type == SWT.Modify)
-    {  
-    }
-  }
-
-  protected void update()
-  {
-    Element element = ((WSDLElement)input).getElement();                           
-    flatViewUtility.updateFlatPageHeaderTitle(getHeadingText());
-    prefixText.setText("");
-    locationText.setText("");
-    namespaceText.setText("                                                                  ");
-    namespaceText.getParent().layout();    
-    namespaceText.setText("");
-    String locationValue = element.getAttribute("location");
-    locationText.setText(locationValue != null ? locationValue : "");  
-
-    String namespaceValue = element.getAttribute("namespace");
-    namespaceText.setText(namespaceValue != null ? namespaceValue : "");
-    
-    String prefix = ((Import)input).getEnclosingDefinition().getPrefix(namespaceValue);
-    prefixText.setText(prefix != null ? prefix : "");
-  }
-
-  public Control getControl()
-  {
-    return control;
-  }
-
-  /*
-   * @see BaseWindow#doHandleEvent(Event)
-   */
-  public void doHandleEvent(Event event)
-  {
-//    if (event.widget == prefixText)
-//    {
-//      String newPrefix = prefixText.getText();
-//      String errorMessage = ValidateHelper.checkXMLPrefix(newPrefix);
-//    
-//      if (errorMessage == null || errorMessage.length() == 0)
-//      {
-//        Import importObj = (Import)input;
-//        org.w3c.dom.Element importElement = WSDLUtil.getInstance().getElementForObject(importObj);
-//        
-//        Definition definition = importObj.getEnclosingDefinition();
-//        org.w3c.dom.Element definitionElement = WSDLUtil.getInstance().getElementForObject(definition);
-//  
-//        String nsFromModel = importObj.getNamespaceURI();
-//        String nsFromDOM = importElement.getAttribute("namespace");
-//        System.out.println(nsFromModel);
-//        System.out.println(nsFromDOM);
-//  
-//        String oldPrefix = definition.getPrefix(nsFromModel);
-//        definitionElement.removeAttribute("xmlns:" + oldPrefix);
-//        definitionElement.setAttribute("xmlns:" + newPrefix, nsFromModel);
-//      }
-//    }
-  }             
-
-  public void propertyChanged(Object object, String property)
-  {
-    if (isListenerEnabled())
-    {
-      setListenerEnabled(false);
-      update();
-      setListenerEnabled(true);
-    }
-  }
-
-  public void widgetDefaultSelected(SelectionEvent e)
-  {
-
-  }
-
-  public void widgetSelected(SelectionEvent e)
-  {
-    if (e.widget == selectButton)
-    {
-// TODO: port check
-      WSDLEditor editor = (WSDLEditor)editorPart;
-      IFile currentWSDLFile = ((IFileEditorInput)editor.getEditorInput()).getFile();
-      
-      SelectSingleFileDialog dialog = new SelectSingleFileDialog(WSDLEditorPlugin.getShell(), null, true);
-      String [] filters = { "xsd", "wsdl" };
-      IFile [] excludedFiles = { currentWSDLFile };
-      
-      dialog.addFilterExtensions(filters, excludedFiles);
-      dialog.create();
-      dialog.getShell().setText(WSDLEditorPlugin.getWSDLString("_UI_TITLE_SELECT")); //$NON-NLS-1$
-      dialog.setTitle(WSDLEditorPlugin.getWSDLString("_UI_TITLE_SELECT_FILE")); //$NON-NLS-1$
-      dialog.setMessage(WSDLEditorPlugin.getWSDLString("_UI_DESCRIPTION_SELECT_WSDL_OR_XSD")); //$NON-NLS-1$
-      int rc = dialog.open();
-      if (rc == IDialogConstants.OK_ID)
-      {
-        IFile selectedFile = dialog.getFile();
-                
-        //if (selectedFile.getLocation().toOSString().equals(currentWSDLFile.getLocation().toOSString()))
-        //{
-        //  System.out.println("SAME FILE:" + currentWSDLFile.getLocation());
-        //}
-
-        String location = ComponentReferenceUtil.computeRelativeURI(selectedFile, currentWSDLFile, true);
-
-        Import importObj = (Import)input;
-        org.w3c.dom.Element importElement = WSDLEditorUtil.getInstance().getElementForObject(importObj);
-        Definition definition = importObj.getEnclosingDefinition();
-        org.w3c.dom.Element definitionElement = WSDLEditorUtil.getInstance().getElementForObject(definition);
-        
-        String importTargetNamespace = "";
-        String prefix = prefixText.getText();
-        String uniquePrefix = "";
-      
-		URI uri = URI.createPlatformResourceURI(selectedFile.getFullPath().toString());      
-
-		// note that the getTargetNamespaceURIForSchema works for both schema and wsdl files
-		// I should change the name of this convenience method
-        importTargetNamespace =  XMLQuickScan.getTargetNamespaceURIForSchema(uri.toString());
-
-        if (prefix.trim().equals(""))
-        {
-          uniquePrefix = getUniquePrefix(definition, uri.fileExtension());
-        }
-        else
-        {
-          uniquePrefix = prefix; 
-        }
-       
-        
-        if (importTargetNamespace == null ||
-           (importTargetNamespace != null && importTargetNamespace.trim().length() == 0))
-        {
-          return;  // what to do with no namespace docs?
-        }
-
-        importElement.setAttribute("location", location);
-        importElement.setAttribute("namespace", importTargetNamespace);
-
-        definitionElement.setAttribute("xmlns:" + uniquePrefix, importTargetNamespace);
-
-        namespaceText.setText(importTargetNamespace);
-        locationText.setText(location);
-        prefixText.setText(uniquePrefix);
-      }
-    }
-  }
-
-  private String getUniquePrefix(Definition definition, String initPrefix)
-  {
-    String uniquePrefix;
-    Map map = definition.getNamespaces();
-
-    if (definition.getNamespace(initPrefix) == null)
-    {
-      uniquePrefix = initPrefix;
-    }
-    else // if used, then try to create a unique one
-    {
-      String tempPrefix = initPrefix;
-      int i = 1;
-      while(map.containsKey(tempPrefix + i))
-      {
-        i++;
-      }
-      uniquePrefix = tempPrefix + i;
-    }
-    return uniquePrefix;    
-  } 
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/InputOutputFaultViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/InputOutputFaultViewer.java
deleted file mode 100644
index bcd529b4a..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/InputOutputFaultViewer.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import java.util.List;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.eclipse.wst.wsdl.ui.internal.viewers.widgets.ComponentNameComboHelper;
-import org.eclipse.wst.wsdl.ui.internal.viewers.widgets.InvokeDialogButton;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-
-public class InputOutputFaultViewer extends NamedComponentViewer 
-{                     
-  protected CCombo componentNameCombo; 
-  protected ComponentNameComboHelper componentNameComboHelper;
-  InvokeDialogButton button;
-
-  public InputOutputFaultViewer(Composite parent, IEditorPart editorPart)
-  {
-    super(parent, editorPart);    
-  } 
-
-  protected String getHeadingText()
-  { 
-    String result = "";
-
-    if (input instanceof Input)
-    {
-      result = WSDLEditorPlugin.getWSDLString("_UI_LABEL_INPUT"); //$NON-NLS-1$
-    }
-    else if (input instanceof Output)
-    {
-      result = WSDLEditorPlugin.getWSDLString("_UI_LABEL_OUTPUT"); //$NON-NLS-1$
-    }
-    else if (input instanceof Fault)
-    {
-      result = WSDLEditorPlugin.getWSDLString("_UI_LABEL_FAULT"); //$NON-NLS-1$
-    }                 
-
-    return result;
-  }      
-
-  public boolean isObjectExtensible()
-  {
-    return false;
-  }
-
-  protected Composite populatePrimaryDetailsSection(Composite parent)
-  {
-    Composite composite = super.populatePrimaryDetailsSection(parent);
-                   
-    flatViewUtility.createLabel(composite, 0, WSDLEditorPlugin.getWSDLString("_UI_LABEL_MESSAGE")); //$NON-NLS-1$
-
-    componentNameCombo = flatViewUtility.createCComboBox(composite);
-    componentNameCombo.addListener(SWT.Modify, this);      
-
-    componentNameComboHelper = new ComponentNameComboHelper(componentNameCombo)
-    {
-      protected List getComponentNameList(ComponentReferenceUtil util)
-      {
-        return util.getMessageNames();
-      }
-
-      protected String getAttributeName()
-      {
-        return WSDLConstants.MESSAGE_ATTRIBUTE;
-      }
-    };
-
-    button = new InvokeDialogButton(composite, getInput());
-    button.setEditor(editorPart);
-
-    return composite;
-  }
-
-
-  protected void update()
-  {
-    super.update();                                                     
-    componentNameComboHelper.update(input);
-    button.setInput(input);
-  }
-
-  protected void handleEventHelper(Element element, Event event)
-  {                        
-    super.handleEventHelper(element, event);
-    componentNameComboHelper.handleEventHelper(element, event);
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/MessageViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/MessageViewer.java
deleted file mode 100644
index 3a8e0c858..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/MessageViewer.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-
-public class MessageViewer extends NamedComponentViewer 
-{                     
-  public MessageViewer(Composite parent, IEditorPart editorPart)
-  {
-    super(parent, editorPart);    
-  } 
-
-  protected String getHeadingText()
-  { 
-    return WSDLEditorPlugin.getWSDLString("_UI_LABEL_MESSAGE"); //$NON-NLS-1$
-  }     
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/NamedComponentViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/NamedComponentViewer.java
deleted file mode 100644
index 80a506561..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/NamedComponentViewer.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.actions.SmartRenameAction;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapterListener;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLModelAdapterFactory;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-
-public abstract class NamedComponentViewer extends BaseViewer implements ModelAdapterListener
-{                                    
-  protected Composite control;
-  protected Text nameField;  
-  protected IEditorPart editorPart;
-
-  public NamedComponentViewer(Composite parent, IEditorPart editorPart)
-  {
-    super(getStatusLineManager(editorPart));    
-    this.editorPart = editorPart;                  
-
-    createControl(parent);
-  } 
-
-  protected abstract String getHeadingText();  
-
-  protected Composite populatePrimaryDetailsSection(Composite parent)
-  {
-  	Composite group = flatViewUtility.createComposite(parent, 2, true);
- 	
-  	group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-    Composite nameFieldComposite = flatViewUtility.createComposite(group, 2, true);
-	((GridLayout)nameFieldComposite.getLayout()).marginWidth = 0;
-    ((GridLayout)nameFieldComposite.getLayout()).marginHeight = 0; 	
-	 
-    GridLayout layout = new GridLayout();
-    layout.makeColumnsEqualWidth  = false;
-    layout.numColumns = 3;
-    layout.marginHeight = 4;
-    layout.marginWidth = 0;
-
-    nameFieldComposite.setLayout(layout);      
-    GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-    gd.horizontalSpan = 1;
-    gd.verticalAlignment = GridData.BEGINNING;
-    nameFieldComposite.setLayoutData(gd);
-
-
-    flatViewUtility.createLabel(nameFieldComposite, 0, WSDLEditorPlugin.getWSDLString("_UI_LABEL_NAME")); //$NON-NLS-1$
-    nameField = flatViewUtility.createTextField(nameFieldComposite);  
-    nameField.addListener(SWT.Modify, this);  
-    
-    // place holder
-    Control c = flatViewUtility.createLabel(nameFieldComposite, 0, "");
-    c.setBackground(new Color(null, 0, 255, 100));
-    gd = new GridData();
-    gd.grabExcessHorizontalSpace = false;
-    gd.heightHint = 0;
-    gd.widthHint = 0;
-    c.setLayoutData(gd);
-    	
-    return nameFieldComposite;
-  } 
-
-  public void createControl(Composite parent)
-  { 
-	SashForm sashForm = new SashForm(parent, SWT.BORDER);
-	sashForm.setLayoutData(new GridData(GridData.FILL_BOTH));
-	control = sashForm;
-	sashForm.setOrientation(SWT.HORIZONTAL);
-	
-    Composite composite = flatViewUtility.createComposite(sashForm, 1, true);        
-	composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-    GridLayout layout = (GridLayout)composite.getLayout();
-    layout.verticalSpacing = 0;
-    layout.marginHeight = 0;
-    layout.marginWidth = 0;
-                       
-    flatViewUtility.createFlatPageHeader(composite, getHeadingText());
-       
-    populatePrimaryDetailsSection(composite);
-    
-	TabbedViewer tabbedViewer = new TabbedViewer((WSDLEditor)editorPart);
-
-	Control c = tabbedViewer.createControl(sashForm);
-	c.setLayoutData(new GridData(GridData.FILL_BOTH));  	     	
-  }
-              
-  public void doSetInput(Object input)
-  {    
-    setListenerEnabled(false);                          
-    try
-    {          
-//      Node node = WSDLEditorUtil.getInstance().getNodeForObject(input);
-      update();
-    }
-    finally
-    {
-      setListenerEnabled(true);
-    }
-
-    if (oldInput != null)
-    {
-      WSDLModelAdapterFactory.removeModelAdapterListener(oldInput, this);
-    }
-
-    WSDLModelAdapterFactory.addModelAdapterListener(input, this);
-    oldInput = input;
-  }
-
-  protected void update()
-  {
-    Element element = ((WSDLElement)input).getElement();                          
-    flatViewUtility.updateFlatPageHeaderTitle(getHeadingText());
-
-    nameField.setText("");
-    String nameValue = element.getAttribute(WSDLConstants.NAME_ATTRIBUTE);
-    nameField.setText(nameValue != null ? nameValue : "");  
-  }
-
-  public Control getControl()
-  {
-    return control;
-  }
-
-  /*
-   * @see BaseWindow#doHandleEvent(Event)
-   */
-  public void doHandleEvent(Event event)
-  {
-    setListenerEnabled(false);
-    Element element = WSDLEditorUtil.getInstance().getElementForObject(input);
-    handleEventHelper(element, event);   
-    setListenerEnabled(true);
-  }             
-
-  protected void handleEventHelper(Element element, Event event)
-  {                          
-    if (event.type == SWT.Modify)
-    {  
-      if (event.widget == nameField)
-      { 
-        new SmartRenameAction(input, nameField.getText()).run();
-      }
-    }
-  }
-
-  public void propertyChanged(Object object, String property)
-  {
-    if (isListenerEnabled())
-    {
-      setListenerEnabled(false);
-      if (!control.isDisposed())
-      {      
-        update();
-      }  
-      setListenerEnabled(true);
-    }
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/OperationViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/OperationViewer.java
deleted file mode 100644
index c0c326e11..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/OperationViewer.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-public class OperationViewer extends NamedComponentViewer 
-{                    
-  public OperationViewer(Composite parent, IEditorPart editorPart)
-  {
-    super(parent, editorPart);    
-  } 
-
-  protected String getHeadingText()
-  {
-    return WSDLEditorPlugin.getWSDLString("_UI_LABEL_OPERATION");  //$NON-NLS-1$
-  }  
-
-  protected Composite populatePrimaryDetailsSection(Composite parent)
-  {
-    Composite composite = super.populatePrimaryDetailsSection(parent);
-                   
-    flatViewUtility.createLabel(composite, 0, WSDLEditorPlugin.getWSDLString("_UI_LABEL_PARAMETER_ORDER"));  //$NON-NLS-1$
-    Text parameterOrderField = flatViewUtility.createTextField(composite);  
-    parameterOrderField.addListener(SWT.Modify, this);  
-                              
-    //Button button = new Button(composite, SWT.FLAT);
-    //button.setText("...");
-
-    return composite;
-  }  
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/PartViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/PartViewer.java
deleted file mode 100644
index f509a79c4..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/PartViewer.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.eclipse.wst.wsdl.ui.internal.viewers.widgets.InvokeDialogButton;
-import org.w3c.dom.Element;
-
-public class PartViewer extends NamedComponentViewer
-{   
-  protected CCombo componentNameCombo;
-  protected CCombo referenceKindCombo; 
-  protected Label componentNameLabel;
-  InvokeDialogButton button;
-//  Button importButton;
-  
-
-  public PartViewer(Composite parent, IEditorPart editorPart)
-  {
-    super(parent, editorPart);    
-  } 
-
-  protected String getHeadingText()
-  {
-    return WSDLEditorPlugin.getWSDLString("_UI_LABEL_PART");  //$NON-NLS-1$
-  } 
-
-  public boolean isObjectExtensible()
-  {
-    return false;
-  }
-    
-  protected Composite populatePrimaryDetailsSection(Composite parent)
-  {
-    Composite composite = super.populatePrimaryDetailsSection(parent);
-     
-    flatViewUtility.createLabel(composite, WSDLEditorPlugin.getWSDLString("_UI_LABEL_REFERENCE_KIND")); //$NON-NLS-1$
-    referenceKindCombo = flatViewUtility.createCComboBox(composite);
-    referenceKindCombo.add("element");
-    referenceKindCombo.add("type");
-    referenceKindCombo.setText("type");
-    referenceKindCombo.addListener(SWT.Modify, this);
-
-    flatViewUtility.createLabel(composite, ""); 
-    
-    componentNameLabel = flatViewUtility.createLabel(composite, WSDLEditorPlugin.getWSDLString("_UI_LABEL_ELEMENT"));   //$NON-NLS-1$
-
-    componentNameCombo = flatViewUtility.createCComboBox(composite);
-    componentNameCombo.addListener(SWT.Modify, this);
-    componentNameCombo.addSelectionListener(this);
-
-    button = new InvokeDialogButton(composite, getInput());
-    
-    return composite;
-  }  
-          
-  protected void update()
-  {                    
-    try
-    {
-      Part part = (Part)input;
-      boolean isType = ComponentReferenceUtil.isType(part);
-      String value = ComponentReferenceUtil.getPartComponentReference(part);
-
-      // update the combo-box content
-      //
-      componentNameCombo.removeAll(); 
-      List compList = ComponentReferenceUtil.getComponentNameList(part, isType);
-      if (compList != null)
-      {
-        for (Iterator iterator =  compList.iterator(); iterator.hasNext();)
-        {
-          componentNameCombo.add((String)iterator.next());
-        }
-      } 
-      
-      if (isType)
-      {                                                 
-        referenceKindCombo.setText("type");
-        componentNameLabel.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_TYPE"));  //$NON-NLS-1$
-        componentNameCombo.setText(value != null ? value : "");
-        button.setReferenceKind("type");
-      }
-      else
-      {
-        referenceKindCombo.setText("element");
-        componentNameLabel.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_ELEMENT"));  //$NON-NLS-1$
-        componentNameCombo.setText(value != null ? value : "");
-        button.setReferenceKind("element");
-      }                                                        
-      button.setInput(input);
-      button.setEditor(editorPart);
-      super.update();  
-    }
-    catch (Exception e)
-    {
-      e.printStackTrace();
-    }
-  }       
-      
-     
-  protected void handleEventHelper(Element element, Event event)
-  {  
-    super.handleEventHelper(element, event);
-    if (event.type == SWT.Modify)
-    {  
-      if (event.widget == referenceKindCombo)
-      {                        
-        // TODO... I have no idea why we need to use a delayed runnable to get 
-        // updating working properly .... this is something we need to revisit
-        DelayedRenameRunnable runnable = new DelayedRenameRunnable((Part)input);
-        Display.getCurrent().asyncExec(runnable);  
-      } 
-    }
-  }      
-
-  protected class DelayedRenameRunnable implements Runnable
-  {                       
-    Part part;
-
-    DelayedRenameRunnable(Part part)
-    {
-      this.part = part;
-    }
-
-    public void run()                  
-    {                                                               
-      boolean isType = referenceKindCombo.getText().equals("type");
-      ComponentReferenceUtil.setComponentReference(part, isType, null);    
-    }
-  }  
-
-  public void doWidgetSelected(SelectionEvent e)
-  {
-    if (e.widget == componentNameCombo)
-    {                                                      
-      Part part = (Part)input;
-      boolean isType = referenceKindCombo.getText().equals("type");
-      ComponentReferenceUtil.setComponentReference(part, isType, componentNameCombo.getText());          
-    }
-  } 
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/PortTypeViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/PortTypeViewer.java
deleted file mode 100644
index d85fdfc9d..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/PortTypeViewer.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-public class PortTypeViewer extends NamedComponentViewer 
-{                    
-  public PortTypeViewer(Composite parent, IEditorPart editorPart)
-  {
-    super(parent, editorPart);    
-  } 
-
-  protected String getHeadingText()
-  {
-    return WSDLEditorPlugin.getWSDLString("_UI_LABEL_PORTTYPE"); //$NON-NLS-1$
-  }
-
-  public boolean isObjectExtensible()
-  {
-    return false;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/PortViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/PortViewer.java
deleted file mode 100644
index 8e5f3d087..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/PortViewer.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import java.util.List;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.eclipse.wst.wsdl.ui.internal.viewers.widgets.ComponentNameComboHelper;
-import org.eclipse.wst.wsdl.ui.internal.viewers.widgets.InvokeDialogButton;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-
-public class PortViewer extends NamedComponentViewer 
-{  
-  protected CCombo componentNameCombo;     
-  protected ComponentNameComboHelper componentNameComboHelper;
-  InvokeDialogButton button;
-
-  public PortViewer(Composite parent, IEditorPart editorPart)
-  {
-    super(parent, editorPart);    
-  } 
-
-  protected String getHeadingText()
-  {
-    return WSDLEditorPlugin.getWSDLString("_UI_LABEL_PORT"); //$NON-NLS-1$
-  }
-
-  protected Composite populatePrimaryDetailsSection(Composite parent)
-  {
-    Composite composite = super.populatePrimaryDetailsSection(parent);
-                   
-    flatViewUtility.createLabel(composite, 0, WSDLEditorPlugin.getWSDLString("_UI_LABEL_BINDING")); //$NON-NLS-1$
-
-    componentNameCombo = flatViewUtility.createCComboBox(composite);
-    componentNameCombo.addListener(SWT.Modify, this);   
-
-    componentNameComboHelper = new ComponentNameComboHelper(componentNameCombo)
-    {
-      protected List getComponentNameList(ComponentReferenceUtil util)
-      {
-        return util.getBindingNames();
-      }
-
-      protected String getAttributeName()
-      {
-        return WSDLConstants.BINDING_ATTRIBUTE;
-      }
-    };
-                              
-    button = new InvokeDialogButton(composite, getInput());
-    button.setEditor(editorPart);
-
-    return composite;
-  }  
-  
-  protected void update()
-  {
-    super.update();                                                     
-    componentNameComboHelper.update(input);
-    button.setInput(input);
-  }
-
-  protected void handleEventHelper(Element element, Event event)
-  {                        
-    super.handleEventHelper(element, event);
-    componentNameComboHelper.handleEventHelper(element, event);
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/ServiceViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/ServiceViewer.java
deleted file mode 100644
index 01b23cce0..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/ServiceViewer.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-public class ServiceViewer extends NamedComponentViewer 
-{                    
-  public ServiceViewer(Composite parent, IEditorPart editorPart)
-  {
-    super(parent, editorPart);    
-  } 
-
-  protected String getHeadingText()
-  {
-    return WSDLEditorPlugin.getWSDLString("_UI_LABEL_SERVICE"); //$NON-NLS-1$
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/TabbedViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/TabbedViewer.java
deleted file mode 100644
index c44135e7c..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/TabbedViewer.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;                                     
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CTabFolder;
-import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.actions.AddElementAction;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.xsd.XSDComponent;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class TabbedViewer implements ISelectionChangedListener
-{                                  
-  protected WSDLEditor editor;
-  protected CTabFolder tabFolder;
-  protected Text documentationField;
-  protected DocumentationListener documentationListener;
-  protected boolean listenerEnabled;
-
-  public TabbedViewer(WSDLEditor editor)
-  {
-    this.editor = editor;                            
-  }     
-
-  public Control createControl(Composite parent)
-  { 
-    tabFolder = new CTabFolder(parent, 0);
-
-    CTabItem tab = new CTabItem(tabFolder, SWT.NONE);
-    tab.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_DOCUMENTION")); //$NON-NLS-1$
-    documentationField = new Text(tabFolder, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.WRAP);
-    tab.setControl(documentationField);
-    tabFolder.setSelection(tab);
-    
-    documentationListener = new DocumentationListener();
-    listenerEnabled = true;
-    documentationField.addModifyListener(documentationListener);
-    
-    editor.getSelectionManager().addSelectionChangedListener(this);
-
-    return tabFolder;
-  }  
-
-  public void setInput(Object object)
-  {
-    listenerEnabled = false;
-    documentationListener.setInput(object);
-    documentationField.setEnabled(true);
-    documentationField.setText("");
-    
-    if (object instanceof XSDComponent || !(object instanceof WSDLElement))
-    {
-      documentationField.setEnabled(false);
-      listenerEnabled = true;
-      return;
-    }
-
-    Element element = WSDLEditorUtil.getInstance().getElementForObject(object);
-    if (element != null)
-    {
-      if (element.getLocalName().equals("documentation"))
-      {
-        documentationField.setEnabled(false);
-        listenerEnabled = true;
-        return;
-      }
-
-      Node docNode = getChildNode(element, element.getPrefix(), "documentation");
-      if (docNode != null)
-      {
-        Node textNode = docNode.getFirstChild();
-        if (textNode != null)
-        {                            
-          String textNodeValue = textNode.getNodeValue();
-          documentationField.setText(textNodeValue != null ? textNodeValue : "");          
-        }
-      }
-    }
-    listenerEnabled = true;
-// There appears to be a defect in the model...it doesn't return
-// the documentationElement even though it exists
-//    if (object instanceof WSDLElement)
-//    {
-//      WSDLElement elem = (WSDLElement)object;
-//      System.out.println("elem = " + elem);
-//
-//      if (elem != null)
-//      {
-//        Element doc = elem.getDocumentationElement();
-//        System.out.println("docNode = " + doc);
-//        if (doc != null)
-//        {
-//          Node textNode = doc.getFirstChild();
-//          if (textNode != null)
-//          {
-//            documentationField.setText(textNode.getNodeValue());
-//          }
-//        }
-//      }
-//    }
-  }
-   
-  public void selectionChanged(SelectionChangedEvent event)  
-  {                                 
-    ISelection selection = event.getSelection();
-    if (selection instanceof IStructuredSelection)
-    {
-      Object o = ((IStructuredSelection)selection).getFirstElement();
-      if (o != null)
-      {
-        setInput(o); 
-      }
-    }
-  }   
-
-  public Node getChildNode(Element parent, String prefix, String childName)
-  {
-    NodeList list = null;
-    if (parent != null)
-    {
-      list = parent.getChildNodes();
-    }
-    String targetName;
-    if (prefix != null && prefix.length() > 0)
-    {
-      targetName = prefix + ":" + childName;
-    }
-    else
-    {
-      targetName = childName;
-    }  
-   
-    if (list != null)
-    {
-      // Performance issue perhaps?
-      for (int i = 0; i < list.getLength(); i++)
-      {
-        if (list.item(i) instanceof Element)
-        {
-          if (list.item(i).getNodeName().equals(targetName))
-          {
-            return list.item(i);
-          }
-        }
-      }
-    }
-    return null;
-  }
-
-
-
-  class DocumentationListener implements ModifyListener
-  {
-    Object object;
-    
-    public void setInput(Object object)
-    {
-      this.object = object;
-    }
-
-    /**
-     * @see org.eclipse.swt.events.ModifyListener#modifyText(ModifyEvent)
-     */
-    public void modifyText(ModifyEvent e)
-    {
-      if (listenerEnabled)
-      {
-        Element element = WSDLEditorUtil.getInstance().getElementForObject(object);
-        if (element != null)
-        {
-          Node docNode = getChildNode(element, element.getPrefix(), "documentation");
-          if (docNode != null)
-          {
-            Node textNode = docNode.getFirstChild();
-            if (textNode != null)
-            {
-              textNode.setNodeValue(documentationField.getText());
-            }
-            else
-            {
-              if (documentationField.getText() != null && documentationField.getText().length() > 0)
-              {
-                Document document = docNode.getOwnerDocument();
-                org.w3c.dom.Text newTextNode = document.createTextNode(documentationField.getText());
-                docNode.appendChild(newTextNode);
-              }
-            }
-          }
-          else
-          {
-            AddElementAction action = new AddElementAction(element, element.getPrefix(), "documentation", element.getFirstChild());
-            action.run();
-            Element newDocumentation = action.getNewElement();
-            
-            Document document = newDocumentation.getOwnerDocument();
-            org.w3c.dom.Text newTextNode = document.createTextNode(documentationField.getText());
-            newDocumentation.appendChild(newTextNode);
-          }
-        }
-      }
-    }
-  }
-}
-                      
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/WSDLDetailsViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/WSDLDetailsViewer.java
deleted file mode 100644
index 35c8d23af..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/WSDLDetailsViewer.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-                                              
-import java.util.HashMap;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.part.PageBook;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject;
-import org.eclipse.xsd.XSDSchema;
-
-
-public class WSDLDetailsViewer implements ISelectionChangedListener
-{                                  
-  protected WSDLEditor editor;
-  protected Composite client;  
-  protected PageBook pageBook;
-  protected ExtensibleDetailsViewerProvider detailsViewerProvider;  
-  protected HashMap viewerMap = new HashMap();
-
-  protected final static String EMPTY_VIEWER_KEY = "EMPTY_VIEWER_KEY";
-  protected Viewer emptyViewer;
-
-  public WSDLDetailsViewer(WSDLEditor editor)
-  {
-    this.editor = editor;                            
-    detailsViewerProvider = new ExtensibleDetailsViewerProvider(editor);    
-    editor.getSelectionManager().addSelectionChangedListener(this);
-  }
-  
-  public Control createControl(Composite parent)
-  {
-    client = pageBook = new PageBook(parent, 0);
-	pageBook.setLayoutData(new GridData(GridData.FILL_BOTH));
-    emptyViewer = new EmptyViewer(pageBook, SWT.NONE);
-    viewerMap.put(EMPTY_VIEWER_KEY, emptyViewer);
-    pageBook.showPage(emptyViewer.getControl());
-    return client;
-  }  
-
-  public void setInput(Object object)
-  {                                 
-    try
-    {
-      Object key = detailsViewerProvider.getViewerKey(object);  
-      
-      if (key == null)
-      {
-        key = EMPTY_VIEWER_KEY;
-      }
-      Viewer viewer = (Viewer)viewerMap.get(key);
-      if (viewer == null)
-      {
-        viewer = detailsViewerProvider.createViewer(object, pageBook, editor);
-        if (viewer != null)
-        {
-          viewerMap.put(key, viewer);
-          if (viewer instanceof OperationViewer)
-          {
-
-          }
-        }
-      }
-      
-      if (viewer != null)
-      {
-        if (object instanceof XSDSchemaExtensibilityElement)
-        {
-          XSDSchemaExtensibilityElement schema = (XSDSchemaExtensibilityElement)object;
-          XSDSchema xsdSchema = schema.getSchema();
-          if (xsdSchema != null)
-          {
-            viewer.setInput(xsdSchema.getElement());
-          }
-        }
-        else
-        {
-          viewer.setInput(object);
-        }
-        pageBook.showPage(viewer.getControl());        
-      }
-    }
-    catch (Exception e)
-    {
-    	e.printStackTrace();
-    }
-  }   
-
-  public void selectionChanged(SelectionChangedEvent event)  
-  {                                 
-    ISelection selection = event.getSelection();
-    if (selection instanceof IStructuredSelection)
-    {
-      Object o = ((IStructuredSelection)selection).getFirstElement();
-      if (o instanceof WSDLGroupObject)
-      {
-      	o = ((WSDLGroupObject)o).getDefinition();
-      }
-      setInput(o);       
-    }
-  }   
-}
-                      
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/WSDLDetailsViewerProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/WSDLDetailsViewerProvider.java
deleted file mode 100644
index 216af1e37..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/WSDLDetailsViewerProvider.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.ui.internal.extension.IDetailsViewerProvider;
-
-public class WSDLDetailsViewerProvider implements IDetailsViewerProvider
-{
-  public Object getViewerKey(Object modelObject)
-  {                              
-    Object result = null;   
-                        
-    // todo.... use a switch
-    if (modelObject instanceof Message)
-    {
-      result = "message";
-    }
-    else if (modelObject instanceof Binding)
-    {
-      result = "binding";
-    }
-    else if (modelObject instanceof BindingOperation)
-    {
-      result = "bindingOperation";
-    }
-    else if (modelObject instanceof Operation)
-    {
-      result = "operation";
-    }
-    else if (modelObject instanceof Definition)
-    {
-      result = "definition";
-    }
-    else if (modelObject instanceof Part)
-    {
-      result = "part";
-    }
-    else if (modelObject instanceof Port)
-    {
-      result = "port";
-    }
-    else if (modelObject instanceof Input || 
-             modelObject instanceof Output ||
-             modelObject instanceof Fault)
-    {
-      result = "inputOutputFault";
-    }    
-    else if (modelObject instanceof BindingInput || 
-             modelObject instanceof BindingOutput || 
-             modelObject instanceof BindingFault) 
-    {
-      result = "bindingInputOutputFault";
-    }
-    else if (modelObject instanceof PortType)
-    {
-      result = "portType";
-    }
-    else if (modelObject instanceof Service)
-    {
-      result = "service";
-    }
-    else if (modelObject instanceof ExtensibilityElement)
-    {
-      result = "extensibilityElement";
-    }
-    else if (modelObject instanceof Import)
-    {
-      result = "import"; 
-    }
-    else
-    {
-      result = "empty";
-    }
-    return result;
-  }                                                                
-
-
-  public Viewer createViewer(Object modelObject, Composite parent, IEditorPart editorPart)
-  {                                       
-    Viewer viewer = null;
-    Object key = getViewerKey(modelObject);
-    if (key != null)     
-    {
-      if (key.equals("message"))
-      {
-        viewer = new MessageViewer(parent, editorPart); 
-      } 
-      else if (key.equals("binding"))
-      {
-        viewer = new BindingViewer(parent, editorPart);
-      }
-      else if (key.equals("definition"))
-      {
-        viewer = new DefinitionViewer(parent, editorPart); 
-      }
-      else if (key.equals("bindingOperation"))
-      {
-        viewer = new BindingOperationViewer(parent, editorPart);
-      }
-      else if (key.equals("operation"))
-      {
-        viewer = new OperationViewer(parent, editorPart);
-      }
-      else if (key.equals("part"))
-      {
-        viewer = new PartViewer(parent, editorPart);
-      }
-      else if (key.equals("port"))
-      {
-        viewer = new PortViewer(parent, editorPart);
-      }
-      else if (key.equals("inputOutputFault"))
-      {
-        viewer = new InputOutputFaultViewer(parent, editorPart); 
-      }    
-      else if (key.equals("bindingInputOutputFault"))
-      {
-        viewer = new BindingInputOutputFaultViewer(parent, editorPart); 
-      }        
-      else if (key.equals("service"))
-      {
-        viewer = new ServiceViewer(parent, editorPart); 
-      }
-      else if (key.equals("extensibilityElement"))
-      {
-        viewer = new ExtensibilityElementViewer(parent, editorPart); 
-      }  
-      else if (key.equals("portType"))
-      {
-        viewer = new PortTypeViewer(parent, editorPart); 
-      }
-      else if (key.equals("import"))
-      {
-        viewer = new ImportViewer(parent, editorPart);
-      }
-      else
-      {
-        viewer = new EmptyViewer(parent, 0); 
-      }
-    }   
-    return viewer;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/AttributesTable.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/AttributesTable.java
deleted file mode 100644
index d57b18115..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/AttributesTable.java
+++ /dev/null
@@ -1,246 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers.widgets;
-
-import com.ibm.icu.text.Collator;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
-
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ICellModifier;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-import org.eclipse.ui.views.properties.IPropertySource;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.w3c.dom.Element;
-
-public class AttributesTable extends TableViewer implements ICellModifier
-{                           
-  protected static final String PROPERTY = WSDLEditorPlugin.getWSDLString("_UI_LABEL_PROPERTY"); //$NON-NLS-1$
-  protected static final String VALUE = WSDLEditorPlugin.getWSDLString("_UI_LABEL_VALUE"); //$NON-NLS-1$
-
-  protected IEditorPart editorPart;
-  protected String[] columnProperties = {PROPERTY, VALUE};
-  protected PropertyTableProvider tableProvider = new PropertyTableProvider(this);
-  protected CellEditor textCellEditor;
-  //protected StringComboBoxCellEditor comboCellEditor;
-  protected IPropertySource propertySource;
-  
-
-  public AttributesTable(IEditorPart editorPart, Composite parent)
-  {
-    super(new Table(parent, SWT.FULL_SELECTION | SWT.MULTI | SWT.FLAT));   
-  	this.editorPart = editorPart;               
-    getTable().setLinesVisible(true);
-    getTable().setHeaderVisible(true);  
-    
-    setContentProvider(tableProvider);
-    setLabelProvider(tableProvider);
-    setColumnProperties(columnProperties);
-
-    for (int i = 0; i < columnProperties.length; i++)
-    {
-      TableColumn column = new TableColumn(getTable(), SWT.NONE, i);
-      column.setText(columnProperties[i]);
-      column.setAlignment(SWT.LEFT);
-    }      
-
-    TableLayout layout = new TableLayout(); 
-    ColumnWeightData data = new ColumnWeightData(40, 40, true);
-    layout.addColumnData(data);
-    
-    ColumnWeightData data2 = new ColumnWeightData(80, 80, true);
-    layout.addColumnData(data2);                       
-
-    getTable().setLayout(layout);
-         
-    textCellEditor = new TextCellEditor(getTable());                            
- 	resetCellEditors();	    
-
-    setCellModifier(this);    
-  }  
-      
-  protected void hookControl(Control control) {
-  	// we need to hook up our own mouse listener first
-  	// so that we can update the cellEditors before
-  	// the 'internal' listener tries to get hold of them
-	Table tableControl = (Table)control;
-	  tableControl.addMouseListener(new MouseAdapter() {
-		  public void mouseDown(MouseEvent e) {
-			updateCellEditors();
-		  }
-	  });	  	  	
-	  super.hookControl(control);
-  }                                
-
-  // ICellModifier
-  public boolean canModify(Object element, String property)
-  {
-    return property.equals(VALUE);
-  }  
-
-  public Object getValue(Object element, String property)
-  {
-    int column = 0;
-    if (property.equals(columnProperties[0]))
-    {
-      column = 0;
-    }
-    else if (property.equals(columnProperties[1]))
-    {
-      column = 1;
-    }    
-    return tableProvider.getColumnText(element, column);
-  }
-
-  public void modify(Object element, String property, Object value)
-  {  
-  	TableItem item = (TableItem)element;
-	IPropertyDescriptor propertyDescriptor = (IPropertyDescriptor)item.getData();
-		
-	// if the new value is the same as the old value, the user has only clicked
-	// on the cell in the course of 'browsing' ... so don't edit the value
-	Object oldValue = getValue(propertyDescriptor, property);	
-	if (value != null && !value.equals(oldValue)) 
-	{	
-		// we assume the value is empty that the attribute should be removed
-		// todo... we probably need to look at this in more detail
-		if (value instanceof String && ((String)value).length() == 0)
-		{
-			value = null;
-		}		  	
-		propertySource.setPropertyValue(propertyDescriptor.getId(), value);   
-		refresh(item.getData());
-	}	  		
-  } 
-   
-   
-  protected void updateCellEditors()
-  {                
-	CellEditor[] cellEditors = new CellEditor[2];
-	cellEditors[0] = textCellEditor;
-	cellEditors[1] = textCellEditor;
-
-	IPropertyDescriptor[] propertyDescriptors = propertySource.getPropertyDescriptors();
-	int index = getTable().getSelectionIndex();
-	if (index >= 0 && index < propertyDescriptors.length)
-	{
-	  CellEditor[] oldCellEditors = getCellEditors();
-	  CellEditor oldCellEditor = (oldCellEditors.length > 1) ? oldCellEditors[1] : null;
-	  if (oldCellEditor != null && oldCellEditor != textCellEditor)
-	  {
-	   oldCellEditor.deactivate();
-	   oldCellEditor.dispose();
-	  }
-	  cellEditors[1] = propertyDescriptors[index].createPropertyEditor(getTable());     
-	}  
-	setCellEditors(cellEditors);     
-  }
-                 
-
-  public String[] getStringArray(List list)
-  {
-    String[] result = new String[list.size()];
-    for (int i = 0; i < result.length; i++)
-    {
-      result[i] = (String)list.get(i);
-    }
-    return result;
-  }
-                                   
-  protected void resetCellEditors()
-  {
-	CellEditor[] cellEditors = new CellEditor[2];
-	cellEditors[0] = textCellEditor;
-	cellEditors[1] = textCellEditor;
-	setCellEditors(cellEditors);  
-  }
-
-
-  class PropertyTableProvider extends LabelProvider implements ITableLabelProvider, IStructuredContentProvider
-  {                  
-    protected TableViewer viewer;
-
-    PropertyTableProvider(TableViewer viewer)
-    {
-      this.viewer = viewer;
-    }
-
-    public void inputChanged(Viewer viewer, Object oldInput, Object newInput)  
-    {
-	  resetCellEditors();		    	
-      if (newInput instanceof IDOMElement)
-      {      
-	      propertySource = new ExtensiblePropertySource(editorPart, (IDOMElement)newInput);
-      } 
-      else if (newInput instanceof Element)
-      {
-      	propertySource = new ReadOnlyPropertySource(editorPart, (Element)newInput);
-      }
-      else
-      {
-      	propertySource = null;
-      }   	
-    }
-
-    public Image getColumnImage(Object element, int columnIndex)
-    {  
-      return null;
-    }      
-
-    public String getColumnText(Object o, int columnIndex)  
-    { 
-	  IPropertyDescriptor propertyDescriptor = (IPropertyDescriptor)o;	
-      return (columnIndex == 0) ? propertyDescriptor.getId().toString() : propertySource.getPropertyValue(propertyDescriptor.getId()).toString();
-    }  
-
-    public Object[] getElements(Object o)
-    {         
-   	  Object[] result = propertySource.getPropertyDescriptors();
-   	  // For some strange reson the ViewerSorter doesn't seem to be working for this table
-   	  // As a workaround we sort them in this method before returning them to the viewer
-   	  if (result.length > 0)
-   	  {
-   	  	Arrays.sort(result, new InternalComparator());
-   	  }
-   	  return result;
-    }
-  }
-  
-  class InternalComparator implements Comparator
-  {
-	public int compare(Object e1, Object e2) 
-	{
-		IPropertyDescriptor p1 = (IPropertyDescriptor)e1;
-		IPropertyDescriptor p2 = (IPropertyDescriptor)e2;
-		return Collator.getInstance().compare(p1.getDisplayName(), p2.getDisplayName());
-	}  	
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/ComponentNameComboHelper.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/ComponentNameComboHelper.java
deleted file mode 100644
index 224ce561a..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/ComponentNameComboHelper.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers.widgets;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.w3c.dom.Element;
-
-
-// A convenience class
-//
-public abstract class ComponentNameComboHelper
-{                      
-  protected CCombo componentNameCombo;
-
-  public ComponentNameComboHelper(CCombo componentNameCombo)
-  {
-    this.componentNameCombo = componentNameCombo;
-  }       
-
-  public void update(Object input)
-  {                                   
-    Element element = ((WSDLElement)input).getElement();
-    componentNameCombo.removeAll();
-    String value = element.getAttribute(getAttributeName());
-    componentNameCombo.setText(value != null ? value : "");
-
-    if (input instanceof WSDLElement)
-    {
-      Definition definition = ((WSDLElement)input).getEnclosingDefinition();
-      ComponentReferenceUtil componentReferenceUtil = new ComponentReferenceUtil(definition);
-      java.util.List list = getComponentNameList(componentReferenceUtil);
-      for (Iterator iter = list.iterator(); iter.hasNext();)
-      {
-        componentNameCombo.add((String)iter.next());
-      }
-    }
-  }  
-
-  public void handleEventHelper(Element element, Event event)
-  {                        
-    if (event.type == SWT.Modify)
-    {  
-      if (event.widget == componentNameCombo)
-      {
-        element.setAttribute(getAttributeName(), componentNameCombo.getText());
-      }
-    }
-  }
-
-  protected abstract List getComponentNameList(ComponentReferenceUtil util);
-
-  protected abstract String getAttributeName();
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/ComponentsSection.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/ComponentsSection.java
deleted file mode 100644
index 57225bee9..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/ComponentsSection.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers.widgets;
-
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.util.flatui.FlatPageSection;
-import org.eclipse.wst.wsdl.ui.internal.util.flatui.WidgetFactory;
-import org.eclipse.wst.wsdl.ui.internal.util.ui.FlatViewUtility;
-
-public class ComponentsSection extends FlatPageSection
-{
-  protected CCombo namesCombo;
-  protected Button newButton;
-  protected Button importButton;
-  protected String title;
-    
-  public ComponentsSection(Composite parent, FlatViewUtility flatViewUtility, String title)
-  {                            
-    this(parent, title);
-
-    WidgetFactory factory = new WidgetFactory();
-    factory.setClientAreaColor(flatViewUtility.getBackgroundColor());
-
-    Control section = createControl(this, factory);
-    setContent(section);
-
-    GridData gridData = new GridData();
-    gridData.horizontalAlignment = GridData.FILL;
-    gridData.verticalAlignment = GridData.FILL;
-    gridData.grabExcessHorizontalSpace = true;
-    setLayoutData(gridData);        
-  }
-
-
-  public ComponentsSection(Composite parent, String title)
-  {
-    super(parent);
-    setCollapsable(true);
-    setHeaderText(title);
-    setAddSeparator(true);                                                   
-  }         
-
-  public CCombo getNamesCombo()
-  {
-    return namesCombo;
-  }
-  
-  public Button getNewMessageButton()
-  {
-     return newButton;
-  }
-
-  public Button getImportMessageButton()
-  {
-     return importButton;
-  }
-
-  /*
-   * @see FlatPageSection#createClient(Composite, WidgetFactory)
-   */
-  public Composite createClient(Composite parent, WidgetFactory factory)
-  {
-    FlatViewUtility flatViewUtility = new FlatViewUtility(true);
-
-    Composite client = flatViewUtility.createComposite(parent, 1);
-
-    namesCombo = flatViewUtility.createCComboBox(client);
-                  
-    Composite buttonComposite = flatViewUtility.createComposite(client, 3, true);
-    GridLayout gridLayout = (GridLayout)buttonComposite.getLayout();
-    gridLayout.marginWidth = 3;
-    gridLayout.marginHeight = 3;
-    gridLayout.makeColumnsEqualWidth = true;
-    
-    Label filler = flatViewUtility.createHorizontalFiller(buttonComposite, 1);
-    GridData gd = (GridData)filler.getLayoutData();
-    gd.grabExcessHorizontalSpace = true;
-    newButton = flatViewUtility.createPushButton(buttonComposite, WSDLEditorPlugin.getWSDLString("_UI_BUTTON_NEW")); //$NON-NLS-1$
-    importButton = flatViewUtility.createPushButton(buttonComposite, WSDLEditorPlugin.getWSDLString("_UI_BUTTON_IMPORT")); //$NON-NLS-1$
-
-    return client;
-  }  
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/ExtensiblePropertySource.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/ExtensiblePropertySource.java
deleted file mode 100644
index b6e6f3017..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/ExtensiblePropertySource.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers.widgets;
-
-
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.properties.section.IPropertyDescriptorProvider;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.ui.internal.properties.XMLPropertySource;
-import org.w3c.dom.Element;
-
-public class ExtensiblePropertySource extends XMLPropertySource
-{
-	protected IEditorPart editorPart;
-	private INodeNotifier nodeNotifier;
-			
-	public ExtensiblePropertySource(IEditorPart editorPart, INodeNotifier target) 
-	{
-		super(target);
-		this.editorPart = editorPart;
-		this.nodeNotifier = target;
-  	}
-  	
-  	
-  	    
-	protected IPropertyDescriptor createPropertyDescriptor(CMAttributeDeclaration attrDecl) 
-	{
-		IPropertyDescriptor result = null;		
-		CMDocument cmDocument = (CMDocument)attrDecl.getProperty("CMDocument");
-		if (cmDocument != null)
-		{
-			String namespaceURI = (String)cmDocument.getProperty("http://org.eclipse.wst/cm/properties/targetNamespaceURI");   
-			if (namespaceURI != null)
-			{
-				IPropertyDescriptorProvider provider = (IPropertyDescriptorProvider)WSDLEditorPlugin.getInstance().getPropertyDescriptorProviderRegistry().getProperty(namespaceURI, "");
-				if (provider != null)
-				{
-				  result = provider.getPropertyDescriptor(editorPart, (Element) nodeNotifier, namespaceURI, attrDecl.getNodeName());
-				}
-			}
-		}
-		if (result == null)
-		{
-		  result = super.createPropertyDescriptor(attrDecl);
-		}
-		return result;			
-	}
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/InvokeDialogButton.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/InvokeDialogButton.java
deleted file mode 100644
index 5b1906b1e..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/InvokeDialogButton.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers.widgets;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.ui.internal.dialogs.InvokeSetDialog;
-
-// instead of using a Button directly (which causes sizing/layout problems)
-// we use this class
-public class InvokeDialogButton extends Composite implements SelectionListener
-{ 
-  protected Button button;
-  protected Object input;
-  protected Composite parent;
-  protected IEditorPart editorPart;
-  protected String kind;
-                                             
-  public InvokeDialogButton(Composite parent, Object input)
-  {
-    super(parent, SWT.NONE);
-    this.parent = parent;
-    this.input = input;
-    GridData gd = new GridData();
-    gd.grabExcessHorizontalSpace = false;
-    gd.grabExcessVerticalSpace = false;
-    setLayoutData(gd);
-    GridLayout layout = new GridLayout();
-    layout.marginWidth = 0;
-    layout.marginHeight = 0;
-    setLayout(layout);
-
-    button = new Button(this, SWT.NONE);
-    gd = new GridData();
-    gd.grabExcessHorizontalSpace = false;
-    gd.heightHint = 17;
-    gd.widthHint = 24;
-    button.setLayoutData(gd);
-    button.setText("...");
-    button.addSelectionListener(this);
-  }                         
-
-  public Button getButton() 
-  {
-    return button;
-  }
-  
-  public void setInput(Object input)
-  {
-    this.input = input;
-  }
-
-  public void setEditor(IEditorPart editorPart)
-  {
-    this.editorPart = editorPart; 
-  }
-  
-  public void setReferenceKind(String kind)
-  {
-    this.kind = kind;
-  }
-  
-  public void widgetSelected(SelectionEvent e)
-  {
-    if (e.widget == button)
-    {
-      InvokeSetDialog dialog = new InvokeSetDialog();
-      if (input instanceof Part)
-      {
-        dialog.setReferenceKind(kind);
-      }
-      dialog.run(input, editorPart);
-    }
-  }
-
-  public void widgetDefaultSelected(SelectionEvent e)
-  {
-    
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/ReadOnlyPropertySource.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/ReadOnlyPropertySource.java
deleted file mode 100644
index 7f48c9451..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/ReadOnlyPropertySource.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers.widgets;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-import org.eclipse.ui.views.properties.IPropertySource;
-import org.eclipse.ui.views.properties.PropertyDescriptor;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-
-public class ReadOnlyPropertySource implements IPropertySource
-{
-    protected Element element;
-
-    public ReadOnlyPropertySource(IEditorPart editPart, Element element)
-    {
-        this.element = element;
-    }
-
-    public Object getEditableValue()
-    {
-        return null;
-    }
-
-    public IPropertyDescriptor[] getPropertyDescriptors()
-    {
-        List list = new ArrayList();
-        NamedNodeMap map = element.getAttributes();
-        int mapLength = map.getLength();
-        for (int i = 0; i < mapLength; i++)
-        {
-            Attr attr = (Attr) map.item(i);
-            list.add(new PropertyDescriptor(attr.getName(), attr.getName()));
-        }
-        IPropertyDescriptor[] result = new IPropertyDescriptor[list.size()];
-        list.toArray(result);
-        return result;
-    }
-
-    public Object getPropertyValue(Object id)
-    {
-        Object result = null;
-        if (id instanceof String)
-        {
-            result = element.getAttribute((String) id);
-        }
-        return result != null ? result : "";
-    }
-
-    public boolean isPropertySet(Object id)
-    {
-        return false;
-    }
-
-    public void resetPropertyValue(Object id)
-    {
-    }
-
-    public void setPropertyValue(Object id, Object value)
-    {
-    }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/visitor/BaseRenamer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/visitor/BaseRenamer.java
deleted file mode 100644
index f92d94286..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/visitor/BaseRenamer.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.visitor;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.WSDLElement;
-
-public abstract class BaseRenamer extends WSDLVisitor
-{
-  protected String newName;
-  protected WSDLElement globalComponent;
-  
-  public BaseRenamer(WSDLElement globalComponent, String newName)
-  {
-    super(globalComponent.getEnclosingDefinition());
-    this.globalComponent = globalComponent;
-    this.newName = newName;
-  }
-  
-  public String getNewQName()
-  {
-    String qName = null;
-    if (newName != null)
-    {
-      Definition definition = globalComponent.getEnclosingDefinition();
-      qName = definition.getPrefix(definition.getTargetNamespace());
-      qName += ":" + newName;
-    }
-    else
-    {
-      qName = newName;
-    }
-    
-    return qName;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/visitor/BindingRenamer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/visitor/BindingRenamer.java
deleted file mode 100644
index b85cf04da..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/visitor/BindingRenamer.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.visitor;
-
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.w3c.dom.Element;
-
-public class BindingRenamer extends BaseRenamer
-{
-  /**
-   * Constructor for BindingRenamer.
-   * @param globalComponent
-   * @param newName
-   */
-  public BindingRenamer(WSDLElement globalComponent, String newName)
-  {
-    super(globalComponent, newName);
-  }
-  
-  public void visitPort(Port port)
-  {
-    super.visitPort(port);
-    Binding binding = port.getEBinding();
-    if (globalComponent.equals(binding))
-    {
-      Element element = WSDLEditorUtil.getInstance().getElementForObject(port);
-      element.setAttribute("binding", getNewQName());
-    }
-  }
-  
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/visitor/MessageRenamer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/visitor/MessageRenamer.java
deleted file mode 100644
index 75cf21e8a..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/visitor/MessageRenamer.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.visitor;
-
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.w3c.dom.Element;
-
-public class MessageRenamer extends BaseRenamer
-{
-  /**
-   * Constructor for MessageRenamer.
-   * @param globalComponent
-   * @param newName
-   */
-  public MessageRenamer(WSDLElement globalComponent, String newName)
-  {
-    super(globalComponent, newName);
-  }
-
-  public void visitInput(Input input)
-  {
-    super.visitInput(input);
-    Message message = input.getEMessage();
-    if (globalComponent.equals(message))
-    {
-      Element element = WSDLEditorUtil.getInstance().getElementForObject(input);
-      element.setAttribute("message", getNewQName());
-    }
-  }
-
-  public void visitOutput(Output output)
-  {
-    super.visitOutput(output);
-    if (globalComponent.equals(output))
-    {
-      Element element = WSDLEditorUtil.getInstance().getElementForObject(output);
-      element.setAttribute("message", getNewQName());
-    }
-  }
-
-  public void visitFault(Fault fault)
-  {
-    super.visitFault(fault);
-    if (globalComponent.equals(fault))
-    {
-      Element element = WSDLEditorUtil.getInstance().getElementForObject(fault);
-      element.setAttribute("message", getNewQName());
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/visitor/PortTypeRenamer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/visitor/PortTypeRenamer.java
deleted file mode 100644
index da4d02935..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/visitor/PortTypeRenamer.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.visitor;
-
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.w3c.dom.Element;
-
-public class PortTypeRenamer extends BaseRenamer
-{
-  /**
-   * Constructor for PortTypeRenamer.
-   * @param globalComponent
-   * @param newName
-   */
-  public PortTypeRenamer(WSDLElement globalComponent, String newName)
-  {
-    super(globalComponent, newName);
-  }
-
-  public void visitBinding(Binding binding)
-  {
-    super.visitBinding(binding);
-    PortType portType = binding.getEPortType();
-
-    if (globalComponent.equals(portType))
-    {
-      Element element = WSDLEditorUtil.getInstance().getElementForObject(binding);
-      element.setAttribute("type", getNewQName());
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/visitor/WSDLVisitor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/visitor/WSDLVisitor.java
deleted file mode 100644
index 8100d4e0a..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/visitor/WSDLVisitor.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.visitor;
-
-import java.util.Iterator;
-
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.Service;
-
-public class WSDLVisitor
-{
-  protected Definition definition;
-
-
-  public WSDLVisitor(Definition definition)
-  {
-    this.definition = definition;
-  }
-  
-  
-  public void visitDefinition()
-  {
-    visitBindings();
-    visitMessages();
-    visitPortTypes();
-    visitServices();
-  }
-
-  public void visitBindings()
-  {
-    for (Iterator iterator = definition.getEBindings().iterator(); iterator.hasNext(); )
-    {
-      Binding binding = (Binding)iterator.next();
-      visitBinding(binding);
-    }
-  }
-
-  public void visitMessages()
-  {
-    for (Iterator iterator = definition.getEMessages().iterator(); iterator.hasNext(); )
-    {
-      Message message = (Message)iterator.next();
-      visitMessage(message); 
-    }
-  }
-  
-  public void visitPortTypes()
-  {
-    for (Iterator iterator = definition.getEPortTypes().iterator(); iterator.hasNext(); )
-    {
-      PortType portType = (PortType)iterator.next();
-      visitPortType(portType);
-    }
-  }
-  
-  public void visitServices()
-  {
-    for (Iterator iterator = definition.getEServices().iterator(); iterator.hasNext(); )
-    {
-      Service service = (Service)iterator.next();
-      visitService(service);
-    }
-  }
-
-  public void visitBinding(Binding binding)
-  {
-    PortType portType = binding.getEPortType();
-    if (portType != null)
-    {
-      visitPortType(portType);
-    }
-
-    for (Iterator iterator = binding.getEBindingOperations().iterator(); iterator.hasNext(); )
-    {
-      BindingOperation bindingOperation = (BindingOperation)iterator.next();
-      visitBindingOperation(bindingOperation); 
-    }
-  }
-
-  public void visitPortType(PortType portType)
-  {
-    for (Iterator iterator = portType.getEOperations().iterator(); iterator.hasNext(); )
-    {
-      Operation operation = (Operation)iterator.next();
-      visitOperation(operation); 
-    }
-  }
-
-  public void visitBindingOperation(BindingOperation bindingOperation)
-  {
-//    BindingInput bindingInput = bindingOperation.getEBindingInput();
-//    BindingOutput bindingOutput = bindingOperation.getEBindingOutput();         
-  }
-
-  public void visitOperation(Operation operation)
-  {
-    Input input = operation.getEInput();
-    Output output = operation.getEOutput();
-    
-    if (input != null)
-    {
-      visitInput(input);
-    }
-    if (output != null)
-    {
-      visitOutput(output);
-    }
-    
-    for (Iterator iterator = operation.getEFaults().iterator(); iterator.hasNext(); )
-    {
-      Fault fault = (Fault)iterator.next();
-      if (fault != null)
-      {
-        visitFault(fault);
-      }
-    }
-
-  }
-
-  public void visitPart(Part part)
-  {
-//    XSDTypeDefinition type = part.getTypeDefinition();
-  }
-
-  public void visitMessage(Message message)
-  {
-    for (Iterator iterator = message.getEParts().iterator(); iterator.hasNext(); )
-    {
-      Part part = (Part)iterator.next();
-      visitPart(part);
-    }
-  }  
-
-  public void visitInput(Input input)
-  {
-    Message message = input.getEMessage();
-    if (message != null)
-    {
-      visitMessage(message);
-    }
-  }
-
-  public void visitOutput(Output output)
-  {
-    Message message = output.getEMessage();
-    if (message != null)
-    {
-      visitMessage(message);
-    }
-  }
-
-  public void visitFault(Fault fault)
-  {
-    Message message = fault.getEMessage();
-    if (message != null)
-    {
-      visitMessage(message);
-    }
-  }
-
-  public void visitPort(Port port)
-  {
-    Binding binding = port.getEBinding();
-    if (binding != null)
-    {
-      visitBinding(binding);
-    }
-  }
-
-  public void visitService(Service service)
-  {
-    for (Iterator iterator = service.getEPorts().iterator(); iterator.hasNext(); )
-    {
-      Port port = (Port)iterator.next();
-      visitPort(port);
-    }
-    
-  }  
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/widgets/NewComponentDialog.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/widgets/NewComponentDialog.java
deleted file mode 100644
index cbb04c33d..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/widgets/NewComponentDialog.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.widgets;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-public class NewComponentDialog extends Dialog implements ModifyListener
-{
-  protected Text nameField; 
-  protected Button okButton;
-  protected String name;                             
-  protected String title;
-  protected Label errorMessageLabel;
-  protected List usedNames;
-
-  public NewComponentDialog(Shell parentShell, String title, String defaultName) 
-  {
-    super(parentShell);
-    setShellStyle(getShellStyle() | SWT.RESIZE);
-    name = defaultName;      
-    this.title = title;
-  }
-  
-  public NewComponentDialog(Shell parentShell, String title, String defaultName, List usedNames) 
-  {
-    super(parentShell);
-    setShellStyle(getShellStyle() | SWT.RESIZE);
-    name = defaultName;      
-    this.title = title;
-    this.usedNames = usedNames;
-  }
-
-  public int createAndOpen()
-  {
-    create();
-    getShell().setText(title);
-    setBlockOnOpen(true);
-    return open();
-  }
-
-  protected Control createContents(Composite parent)  
-  {
-    Control control = super.createContents(parent);
-    nameField.forceFocus();
-    nameField.selectAll();  
-    updateErrorMessage();
-    return control;
-  }
-
-
-  protected void createButtonsForButtonBar(Composite parent) 
-  {
-    okButton = createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
-    createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
-  }
-
-  protected void createHeaderContent(Composite parent)
-  {
-  }
-  
-  protected void createExtendedContent(Composite parent)
-  {
-  }
-
-  protected Control createDialogArea(Composite parent) 
-  {
-    Composite dialogArea = (Composite)super.createDialogArea(parent);
-    
-    createHeaderContent(dialogArea);
-
-    Composite composite = new Composite(dialogArea, SWT.NONE);
-    GridLayout layout = new GridLayout();
-    layout.numColumns = 2;
-    layout.marginWidth = 0;
-    composite.setLayout(layout);
-
-    GridData gdFill= new GridData();
-    gdFill.horizontalAlignment= GridData.FILL;
-    gdFill.grabExcessHorizontalSpace= true;
-    gdFill.verticalAlignment= GridData.FILL;
-    gdFill.grabExcessVerticalSpace= true;
-    composite.setLayoutData(gdFill);
-
-    Label nameLabel = new Label(composite, SWT.NONE);
-    nameLabel.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_NAME")); //$NON-NLS-1$
-
-    nameField = new Text(composite, SWT.SINGLE | SWT.BORDER);
-    GridData gd= new GridData();
-    gd.horizontalAlignment= GridData.FILL;
-    gd.grabExcessHorizontalSpace= true;
-    gd.widthHint = 200;
-    nameField.setLayoutData(gd);
-    nameField.setText(name);
-    nameField.addModifyListener(this);
-
-    createExtendedContent(dialogArea);
-
-    // error message
-    errorMessageLabel = new Label(dialogArea, SWT.NONE);
-    errorMessageLabel.setText("error message goes here");         
-    GridData gd2 = new GridData();
-    gd2.horizontalAlignment= GridData.FILL;
-    gd2.grabExcessHorizontalSpace= true;
-    gd2.widthHint = 200;
-    errorMessageLabel.setLayoutData(gd2);          
-//    Color color = new Color(errorMessageLabel.getDisplay(), 200, 0, 0);
-//    errorMessageLabel.setForeground(color);
-
-    return dialogArea;
-  }
-  
-  public void modifyText(ModifyEvent e) 
-  {                        
-    updateErrorMessage();
-  }        
-
-  protected String computeErrorMessage(String name)
-  {
-  	if (usedNames == null)
-  		return null;
-  	
-  	Iterator iterator = usedNames.iterator();
-  	while (iterator.hasNext()) {
-  		if (name.equalsIgnoreCase((String) iterator.next())) {
-  			return WSDLEditorPlugin.getWSDLString("_UI_LABEL_WARNING_DUPLICATE_NAME_EXISTS");
-  		}
-  	}
-  	
-  	return null;
-  }
-
-  protected void updateErrorMessage()
-  {                 
-    String errorMessage = null;
-    String name = nameField.getText().trim();
-    if (name.length() > 0)
-    {                                
-      errorMessage = computeErrorMessage(name);
-    }   
-    else
-    {
-      errorMessage = "";
-    }  
-    errorMessageLabel.setText(errorMessage != null ? errorMessage : "");
-//    okButton.setEnabled(errorMessage == null);
-  }
- 
-  protected void buttonPressed(int buttonId) 
-  {
-    if (buttonId == IDialogConstants.OK_ID)
-    {
-      name = nameField.getText();
-    }
-    super.buttonPressed(buttonId);
-  }
-
-  public String getName()
-  {
-    return name;
-  }
-}
-
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/widgets/NewComponentWithChildDialog.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/widgets/NewComponentWithChildDialog.java
deleted file mode 100644
index 4c5091970..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/widgets/NewComponentWithChildDialog.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.widgets;
-
-import java.util.List;
-
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-
-/*
- * This class extends NewComponentDialog to allow additional widgets.  More
- * specifically, the 'create sub-components' checkbox
- */
-public class NewComponentWithChildDialog extends NewComponentDialog {
-	protected Button createMessageCheckBox;
-	private boolean createMessageBoolean;
-
-	public NewComponentWithChildDialog(Shell parentShell, String title, String defaultName) {
-		super(parentShell, title, defaultName);
-	}
-	
-	public NewComponentWithChildDialog(Shell parentShell, String title, String defaultName, List usedNames) {
-		super(parentShell, title, defaultName, usedNames);
-	}
-	
-	protected void createExtendedContent(Composite parent) {
-		Composite child = new Composite (parent, SWT.NONE);
-	    GridLayout layout = new GridLayout();
-	    layout.numColumns = 1;
-	    layout.marginWidth = 0;
-	    layout.marginHeight = 0;
-	    child.setLayout(layout);
-		
-	    createMessageCheckBox = new Button(child, SWT.CHECK);
-	    createMessageCheckBox.setSelection(true);
-	    createMessageCheckBox.setText(WSDLEditorPlugin.getWSDLString("_UI_CREATE_MESSAGE_CHECKBOX_LABEL"));
-	}
-
-	public boolean createSubComponents() {
-		return createMessageBoolean;
-	}
-	
-	protected void buttonPressed(int buttonId) {
-		if (buttonId == IDialogConstants.OK_ID) {
-			createMessageBoolean = createMessageCheckBox.getSelection();
-		}
-		super.buttonPressed(buttonId);
-	}
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/widgets/ProtocolComponentControl.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/widgets/ProtocolComponentControl.java
deleted file mode 100644
index 53c990550..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/widgets/ProtocolComponentControl.java
+++ /dev/null
@@ -1,340 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.widgets;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.part.PageBook;
-import org.eclipse.wst.wsdl.internal.generator.BaseGenerator;
-import org.eclipse.wst.wsdl.internal.generator.ContentGenerator;
-import org.eclipse.wst.wsdl.internal.generator.extension.ContentGeneratorExtensionFactoryRegistry;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.contentgenerator.ui.ContentGeneratorOptionsPage;
-
-public abstract class ProtocolComponentControl extends Composite implements SelectionListener, ModifyListener
-{
-  protected BaseGenerator generator;
-
-  protected Text componentNameField;
-  protected Combo refNameCombo;
-  protected Button refBrowseButton;
-  protected Combo protocolCombo;
-  protected Button overwriteButton;
-  protected PageBook pageBook;
-  protected Composite emptySettingsPage;
-  protected Map pageMap = new HashMap();
-
-  // List of ContentGenerators for each Protocol found in protocolCombo
-  protected List contentGenerators;
-  
-  //protected boolean isBindingComponent = true;
-  //protected boolean isNewComponent = true;
-  protected String name;
-  protected String refName;
-
-  protected String UNSPECIFIED = WSDLEditorPlugin.getWSDLString("_UI_UNSPECIFIED");
-  //protected BindingGenerator bindingGenerator;
-
-  public ProtocolComponentControl(Composite parent, BaseGenerator generator, boolean showOverwriteButton)
-  {
-    super(parent, SWT.NONE);
-    this.generator = generator;
-	contentGenerators = new ArrayList();
-
-    GridLayout layout = new GridLayout();
-    layout.marginWidth = 0;
-    setLayout(layout);
-    setLayoutData(createGridData(true, 1));
-
-    Composite labelValueComposite = new Composite(this, SWT.NONE);
-    labelValueComposite.setLayout(new GridLayout(2, false));
-    labelValueComposite.setLayoutData(createGridData(false, 1));
-
-    // row 1
-    //
-    Label componentNameLabel = new Label(labelValueComposite, SWT.NONE);
-    componentNameLabel.setText(getComponentNameLabelText()); //$NON-NLS-1$
-
-    componentNameField = new Text(labelValueComposite, SWT.BORDER);
-    GridData gdName= new GridData();
-    gdName.horizontalAlignment= GridData.FILL;
-    gdName.grabExcessHorizontalSpace= true;
-    componentNameField.setLayoutData(gdName);
-    componentNameField.addModifyListener(this);
-    //createPlaceHolder(labelValueComposite);
-
-    // row 2
-    //
-    Label refNameLabel = new Label(labelValueComposite, SWT.NONE);
-    refNameLabel.setText(getRefNameLabelText()); //$NON-NLS-1$	
-    refNameCombo = new Combo(labelValueComposite, SWT.READ_ONLY);
-    GridData gdRefName= new GridData();
-    gdRefName.horizontalAlignment= GridData.FILL;
-    gdRefName.grabExcessHorizontalSpace= true;
-    refNameCombo.setLayoutData(gdRefName);
-    refNameCombo.addSelectionListener(this);
-
-    //refBrowseButton = new Button(labelValueComposite, SWT.NONE);
-    //refBrowseButton.setText("  ...  ");
-    //GridData gd = new GridData();
-    //gd.grabExcessHorizontalSpace = false;
-    //gd.heightHint = 17;
-    //gd.widthHint = 24;
-    //refBrowseButton.setLayoutData(gd);
-    //refBrowseButton.addSelectionListener(this);
-    //createPlaceHolder(labelValueComposite);
-
-    // row 3
-    //
-    Label protocolLabel = new Label(labelValueComposite, SWT.NONE);
-    protocolLabel.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_BINDING_PROTOCOL")); //$NON-NLS-1$
-    protocolCombo = new Combo(labelValueComposite, SWT.READ_ONLY);
-    GridData gdProtocol= new GridData();
-    gdProtocol.horizontalAlignment= GridData.FILL;
-    gdProtocol.grabExcessHorizontalSpace= true;
-    protocolCombo.setLayoutData(gdProtocol);
-    protocolCombo.addSelectionListener(this);
-    //createPlaceHolder(labelValueComposite);
-
-    // optional overwrite button
-    //
-    if (showOverwriteButton)
-    {
-      overwriteButton = new Button(this, SWT.CHECK);
-      overwriteButton.setText(WSDLEditorPlugin.getWSDLString("_UI_CHECKBOX_OVERWRITE")); //$NON-NLS-1$
-      overwriteButton.addSelectionListener(this);
-    }
-
-    // protocol specific settings
-    //
-    pageBook = new PageBook(this, SWT.NONE);
-    GridData gdFill= new GridData();
-    gdFill.horizontalAlignment= GridData.FILL;
-    gdFill.grabExcessHorizontalSpace= true;
-    gdFill.verticalAlignment= GridData.FILL;
-    gdFill.grabExcessVerticalSpace= true;
-    pageBook.setLayoutData(gdFill);
-
-    emptySettingsPage = new Composite(pageBook, SWT.NONE);
-    for (int i = 0; i < 6; i++)
-    {
-      new Label(emptySettingsPage, SWT.NONE);
-    }
-  }
-
-  public void initFields()
-  {
-    // prime the fields
-    //
-    componentNameField.setText(getDefaultName());
-    updateRefNameCombo();
-    updateProtocolCombo();
-    updatePageBook(generator.getProtocol());
-  }
-
-  public Text getComponentNameField()
-  {
-    return componentNameField;
-  }
-
-  public String getComponentNameLabelText()
-  {
-    return WSDLEditorPlugin.getWSDLString("_UI_LABEL_NAME");
-  }
-
-  private GridData createGridData(boolean both, int span)
-  {
-    GridData gd = new GridData(both ? GridData.FILL_BOTH : GridData.FILL_HORIZONTAL);
-    gd.horizontalSpan = span;
-    return gd;
-  }
-
-//  private Control createPlaceHolder(Composite parent)
-//  {
-//    Label label = new Label(parent, SWT.NONE);
-//    return label;
-//  }
-  public BaseGenerator getGenerator()
-  {
-    return generator;
-  }
-
-  // implements SelectionListener
-  //
-  public void widgetDefaultSelected(SelectionEvent event)
-  {
-  }
-
-  public void widgetSelected(SelectionEvent event)
-  {
-    if (event.widget == overwriteButton && overwriteButton != null)
-    {
-      getGenerator().setOverwrite(overwriteButton.getSelection());
-    }
-    else if (event.widget == refNameCombo)
-    {
-      int index = refNameCombo.getSelectionIndex();
-      String refName = refNameCombo.getItem(index);
-	  if (refName.equals(UNSPECIFIED)) {
-	      getGenerator().setRefName("");
-	  }
-	  else {
-	      getGenerator().setRefName(refName);
-	  }
-    }
-    else if (event.widget == protocolCombo)
-    {
-      int index = protocolCombo.getSelectionIndex();
-      String protocol = (index != -1) ? protocolCombo.getItem(index) : null;
-	  getGenerator().setContentGenerator((ContentGenerator) contentGenerators.get(index));
-      updatePageBook(protocol);
-    }
-  }
-
-  private static final String IS_OVERWRITE_APPLICABLE = "IS_OVERWRITE_APPLICABLE";
-  protected void updatePageBook(String protocol)
-  {
-    if (protocol != null)
-    {
-	  ContentGeneratorOptionsPage page = (ContentGeneratorOptionsPage) pageMap.get(protocol);
-      if (page == null)
-      {
-        page = createContentGeneratorOptionsPage(protocol);
-
-        if (page != null)
-        {
-          page.init(getGenerator());
-          Control control = page.createControl(pageBook);
-          control.setData(IS_OVERWRITE_APPLICABLE, new Boolean(page.isOverwriteApplicable()));
-          pageMap.put(protocol, page);
-        }
-
-//        if (page != null)
-//        {
-//          pageMap.put(protocol, page);
-//        }
-      }
-
-      boolean enableOverwriteButton = true;
-      if (page != null)
-      {
-        if (overwriteButton != null)
-        {
-          Boolean data = (Boolean) page.getControl().getData(IS_OVERWRITE_APPLICABLE);
-          enableOverwriteButton = data == null || data.equals(Boolean.TRUE);
-        }
-        pageBook.showPage(page.getControl());
-        pageBook.layout();
-        pageBook.getParent().layout();
-		
-		page.setOptionsOnGenerator();
-      }
-      else
-      {
-        pageBook.showPage(emptySettingsPage);
-      }
-
-      if (overwriteButton != null)
-      {
-        if (enableOverwriteButton)
-        {
-          overwriteButton.setEnabled(true);
-          overwriteButton.setSelection(generator.getOverwrite());
-        }
-        else
-        {
-          overwriteButton.setEnabled(false);
-          overwriteButton.setSelection(true);
-        }
-      }
-    }
-  }
-
-  protected void updateProtocolCombo()
-  {
-    protocolCombo.removeAll();
-
-    List list = new ArrayList();
-    list.add(UNSPECIFIED);
-//    list.addAll(WSDLEditorPlugin.getInstance().getContentGeneratorExtensionRegistry().getBindingExtensionNames());
-	list.addAll(ContentGeneratorExtensionFactoryRegistry.getInstance().getBindingExtensionNames());
-	
-    String protocolText = generator.getProtocol();
-
-    for (Iterator i = list.iterator(); i.hasNext();)
-    {
-      String protocol = (String) i.next();
-      protocolCombo.add(protocol);
-	  
-	  if (protocol.equals(UNSPECIFIED)) {
-		  contentGenerators.add(null);
-	  }
-	  else {
-		  ContentGenerator gen = ContentGeneratorExtensionFactoryRegistry.getInstance().getGeneratorClassFromName(protocol);
-		  contentGenerators.add(gen);  
-	  }
-    }
-
-    if (protocolText == null && protocolCombo.getItemCount() > 0)
-    {
-      protocolText = protocolCombo.getItem(0);
-//      generator.setProtocol(!UNSPECIFIED.equals(protocolText) ? protocolText : null);
-    }
-    protocolCombo.setText(protocolText);
-
-	ContentGenerator gen = ContentGeneratorExtensionFactoryRegistry.getInstance().getGeneratorClassFromName(protocolText);
-	generator.setContentGenerator(gen);
-  }
-
-  protected void updateRefNameCombo()
-  {
-    refNameCombo.removeAll();
-
-    refNameCombo.add(UNSPECIFIED);
-    for (Iterator i = getRefNames().iterator(); i.hasNext();)
-    {
-      refNameCombo.add((String) i.next());
-    }
-
-    if (refNameCombo.getItemCount() > 0)
-    {
-      String refText = generator.getRefName();
-      refNameCombo.setText(refText != null ? refText : UNSPECIFIED);
-    }
-  }
-
-  public void modifyText(ModifyEvent e)
-  {
-    generator.setName(componentNameField.getText());
-  }
-
-  public abstract List getRefNames();
-  public abstract String getRefNameLabelText();
-  public abstract String getDefaultName();
-  public abstract ContentGeneratorOptionsPage createContentGeneratorOptionsPage(String protocol);
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/BindingWizard.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/BindingWizard.java
deleted file mode 100644
index 087a051ed..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/BindingWizard.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.wizards;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.internal.generator.BindingGenerator;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.contentgenerator.ui.ContentGeneratorOptionsPage;
-import org.eclipse.wst.wsdl.ui.internal.contentgenerator.ui.HttpBindingOptionsPage;
-import org.eclipse.wst.wsdl.ui.internal.contentgenerator.ui.SoapBindingOptionsPage;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.NameUtil;
-import org.eclipse.wst.wsdl.ui.internal.widgets.ProtocolComponentControl;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class BindingWizard extends Wizard
-{
-  protected BindingGenerator bindingGenerator;
-  protected BindingWizardOptionsPage specifyBindingPage;
-
-  protected Document document;
-  protected int kind;
-
-  public static final int KIND_NEW_BINDING = 1;
-  public static final int KIND_REGENERATE_BINDING = 2;
-
-  protected Definition definition;
-  
-  /*
-   * Constructor used when are creating a brand new Binding
-   */
-  public BindingWizard(Definition definition)
-  {
-    this(definition, null, KIND_NEW_BINDING);
-  }
-
-  /*
-   * Constructor used when are creating a brand new Binding
-   */
-  public BindingWizard(Definition definition, Document document)
-  {
-    this(definition, null, KIND_NEW_BINDING);
-    this.document = document;
-  }
-  
-  /*
-   * Constructor used when there is an existing Binding we wish to modify/regenerate
-   */
-  public BindingWizard(Definition definition, Binding binding, int kind)
-  {
-    super();
-	this.definition = definition;
-    this.kind = kind;	
-	bindingGenerator = new BindingGenerator(definition, binding);
-
-    setWindowTitle(WSDLEditorPlugin.getWSDLString("_UI_BINDING_WIZARD")); //$NON-NLS-1$
-    //setDefaultPageImageDescriptor(ImageDescriptor.createFromFile(WSDLEditorPlugin.class, "icons/NewXML.gif"));
-  }
-
-  public void setBindingName(String bindingName)
-  {
-//    QName qname = new QName(definition.getTargetNamespace(), bindingName);
-    bindingGenerator.setName(bindingName);
-/*
- 	// Binding binding = (Binding) definition.getBinding(qname);
-	if (binding != null)
-    {
-	  List eeList = binding.getEExtensibilityElements();
-      if (eeList.size() > 0)
-      {
-        ExtensibilityElement ee = (ExtensibilityElement) eeList.get(0);
-        Element element = WSDLEditorUtil.getInstance().getElementForObject(ee);
-        String namespace = element.getNamespaceURI();
-        if (namespace != null)
-        {
-          ContentGeneratorExtension extension = WSDLEditorPlugin.getInstance().getContentGeneratorExtensionRegistry().getExtensionForNamespace(namespace);
-
-          if (extension != null)
-          {
-            bindingGenerator.setProtocol(extension.getName());
-          }
-        }
-      }
-    }
-    */
-  }
-
-  public void setPortTypeName(String portTypeName)
-  {
-    bindingGenerator.setRefName(portTypeName);
-  }
-
-  public BindingGenerator getBindingGenerator()
-  {
-    return bindingGenerator;
-  }
-
-  /**
-   * Return true if wizard setup is successful, false otherwise
-   */
-  public boolean setup()
-  {
-    return true;
-  }
-
-  public void addPages()
-  {
-    specifyBindingPage = new BindingWizardOptionsPage();
-    addPage(specifyBindingPage);
-  }
-
-  public boolean performFinish()
-  {
-  	boolean recordingStarted = false;
-  	if (definition.getElement() == null || (document != null && document.getChildNodes().getLength() == 0)) {
-  		recordingStarted = true;
-  		beginRecording();
-  		
-  		// Create the Definitions element with proper namespace
-  	    Preferences preference = XMLCorePlugin.getDefault().getPluginPreferences();
-  		String charSet = preference.getString(CommonEncodingPreferenceNames.OUTPUT_CODESET);
-  	    if (charSet == null || charSet.trim().equals(""))
-  	    {
-  	    	charSet = "UTF-8";
-  	    }
-  	    document.appendChild(document.createProcessingInstruction("xml", "version=\"1.0\" encoding=\"" + charSet + "\""));
-  		Element root = document.createElement("wsdl:definitions");  		
-  		document.appendChild(root);
-
-  		// Add various namespace attributes here. 
-  		root.setAttribute("xmlns:soap", "http://schemas.xmlsoap.org/wsdl/soap/");
-  		root.setAttribute("xmlns:tns", getDefaultNamespace(definition));
-  		root.setAttribute("xmlns:wsdl", "http://schemas.xmlsoap.org/wsdl/");
-  		root.setAttribute("xmlns:xsd", "http://www.w3.org/2001/XMLSchema");
-  		root.setAttribute("name", getFileName(definition));
-  		root.setAttribute("targetNamespace", getDefaultNamespace(definition));
-
-  		definition.setElement(root);	
-  	}
-
-	// Generate/re-generate the Binding
-    try
-    {
-		Binding binding = bindingGenerator.generateBinding();
-		
-      if (binding != null)
-      {
-        IEditorPart editorPart = WSDLEditorPlugin.getInstance().getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-        ISelectionProvider selectionProvider = (ISelectionProvider) editorPart.getAdapter(ISelectionProvider.class);
-        if (selectionProvider != null)
-        {
-          selectionProvider.setSelection(new StructuredSelection(binding));
-        }
-      }
-    }
-    catch (Exception e)
-    {
-    }
-    finally {
-    	if (recordingStarted)
-    		endRecording();
-    }
-
-    return true;
-  }
-  
-  private String getDefaultNamespace(Definition definition)
-  {
-    String namespace = WSDLEditorPlugin.getInstance().getPreferenceStore().getString(WSDLEditorPlugin.getWSDLString("_UI_PREF_PAGE_DEFAULT_TARGET_NAMESPACE"));
-    if (!namespace.endsWith("/")) {
-    	namespace = namespace.concat("/");
-    }
-    
-    namespace += getFileName(definition) + "/";
-
-    return namespace;
-  }
-  
-  private String getFileName(Definition definition) {
-    String fileLocation = definition.getLocation();
-  	IPath filePath = new Path(fileLocation);
-  	return filePath.removeFileExtension().lastSegment().toString();
-  }
-  
-  private void beginRecording() {
-    Node node = document;
-    if (node instanceof IDOMNode)
-    {
-      ((IDOMNode)node).getModel().beginRecording(this, WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_BINDING"));  
-    }
-  }
-  
-  private void endRecording() {
-    Node node = document; 
-    if (node instanceof IDOMNode)
-    {
-      ((IDOMNode)node).getModel().endRecording(this);  
-    }
-  }
-
-  class BindingWizardOptionsPage extends WizardPage
-  {
-    protected ProtocolComponentControl protocolComponentControl;
-
-    public BindingWizardOptionsPage()
-    {
-      super("SpecifyBindingPage");
-      setTitle(WSDLEditorPlugin.getWSDLString("_UI_TITLE_SPECIFY_BINDING_DETAILS"));
-      setDescription(WSDLEditorPlugin.getWSDLString("_UI_SPECIFY_BINDING_DETAILS_LABEL"));
-    }
-
-    protected BindingGenerator getBindingGenerator()
-    {
-      return ((BindingWizard) getWizard()).getBindingGenerator();
-    }
-
-    public void createControl(Composite parent)
-    {
-      ProtocolComponentControl protocolComponentControl = new BindingProtocolComponentControl(parent, bindingGenerator, true);
-      protocolComponentControl.initFields();
-      setControl(protocolComponentControl);
-    }
-  }
-
-  public static class BindingProtocolComponentControl extends ProtocolComponentControl
-  {
-    public BindingProtocolComponentControl(Composite parent, BindingGenerator generator)
-    {
-      this(parent, generator, true);
-    }
-
-    public BindingProtocolComponentControl(Composite parent, BindingGenerator generator, boolean showOverwriteButton)
-    {
-      super(parent, generator, showOverwriteButton);
-
-      if (generator.getName() != null)
-      {
-        componentNameField.setEditable(false);
-      }
-    }
-
-    public String getRefNameLabelText()
-    {
-      return WSDLEditorPlugin.getWSDLString("_UI_PORT_TYPE");
-    }
-
-    public List getRefNames()
-    {
-      return new ComponentReferenceUtil(generator.getDefinition()).getPortTypeNames();
-    }
-
-    public String getDefaultName()
-    {
-      String bindingName = generator.getName();
-      return bindingName != null ? bindingName : NameUtil.buildUniqueBindingName(generator.getDefinition(), null);
-    }
-
-    public ContentGeneratorOptionsPage createContentGeneratorOptionsPage(String protocol)
-    {
-      ContentGeneratorOptionsPage optionsPage = null;
-	  String protocolSelection = protocolCombo.getItem(protocolCombo.getSelectionIndex());
-	  if (protocolSelection.equals("SOAP")) {
-		  optionsPage = new SoapBindingOptionsPage();
-	  }
-	  else if (protocolSelection.equals("HTTP")) {
-		  optionsPage = new HttpBindingOptionsPage();
-	  }
-//      ContentGeneratorExtension extension = WSDLEditorPlugin.getInstance().getContentGeneratorExtensionRegistry().getContentGeneratorExtension(protocol);
-//      if (extension != null)
-//      {
-//        optionsPage = extension.createBindingContentGeneratorOptionsPage();
-//      }
-      return optionsPage;
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/NamespaceTable.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/NamespaceTable.java
deleted file mode 100644
index 1ea47f6ed..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/NamespaceTable.java
+++ /dev/null
@@ -1,701 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.wizards;
-
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.CheckboxCellEditor;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ICellModifier;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.wst.common.ui.internal.viewers.NavigableTableViewer;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceInfo;
-import org.eclipse.wst.xml.ui.internal.dialogs.EditNamespaceInfoDialog;
-import org.eclipse.wst.xml.ui.internal.dialogs.UpdateListener;
-import org.eclipse.wst.xml.ui.internal.util.XMLCommonResources;
- 
-public class NamespaceTable extends Composite
-{
-  protected static final String NAMESPACE_URI = XMLCommonResources.getInstance().getString("_UI_LABEL_NAMESPACE_NAME"); //$NON-NLS-1$
-  protected static final String PREFIX = XMLCommonResources.getInstance().getString("_UI_LABEL_PREFIX"); //$NON-NLS-1$
-  protected static final String INCLUDE = WSDLEditorPlugin.getWSDLString("_UI_TITLE_SELECT"); //$NON-NLS-1$
-    
-  protected List namespaceInfoList = new Vector();
-  protected List checkedList = new Vector();
-  protected NamespaceNavigableTableViewer tableViewer;    
-  protected Button addButton;
-
-  protected NamespaceInfoTableLabelProvider provider;
-  protected UpdateListener updateListener;   
-  protected IPath resourceLocation;  
-  protected int visibleRows = -1;  
-  protected boolean dummyRowsRemoved = false;
-  Table table;
-
-  public NamespaceTable(Composite parent)
-  {  
-    this(parent, -1, -1, -1);
-  }    
-
-  public NamespaceTable(Composite parent, int visibleRows)
-  {
-    this(parent, -1, -1, visibleRows);
-  }
-
-  public NamespaceTable(Composite parent, int widthHint, int heightHint)
-  {
-    this(parent, widthHint, heightHint, -1);
-  }
-
-  public NamespaceTable(Composite parent, int widthHint, int heightHint, int visibleRows)
-  {
-    super(parent, SWT.NONE);                                                               
-    setLayout(createGridLayout());                                 
-    GridData fillGD= new GridData();
-    fillGD.horizontalAlignment= GridData.FILL;
-    fillGD.grabExcessHorizontalSpace= true;
-    fillGD.verticalAlignment= GridData.FILL;
-    fillGD.grabExcessVerticalSpace= true;
-    
-    setLayoutData(fillGD);             
-    
-    Group namespaceInfoGroup = new Group(this, SWT.NONE);
-    namespaceInfoGroup.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_NAMESPACE_URIS_TO_BE_INCLUDED")); //$NON-NLS-1$
-    namespaceInfoGroup.setLayout(new GridLayout());   
-    GridData gd = fillGD;
-    if (widthHint != -1)
-    {
-      gd.widthHint = widthHint;
-    }   
-    if (heightHint != -1)
-    {
-      gd.heightHint = heightHint;
-    }
-    namespaceInfoGroup.setLayoutData(gd); 
-    //WorkbenchHelp.setHelp(namespaceInfoGroup, new ControlContextComputer(namespaceInfoGroup, XMLBuilderContextIds.XMLC_NAMESPACE_GROUP));
-                    
-    String[] titleArray = {INCLUDE, PREFIX, NAMESPACE_URI};
-
-    table = new Table(namespaceInfoGroup, SWT.FULL_SELECTION);
-    table.setHeaderVisible(true);
-    
-    table.setLayoutData(fillGD);
-    table.setLinesVisible(true);
-    table.addMouseListener(new MouseAdapter()
-    {
-      public void mouseDown(MouseEvent e)
-      {
-        TableItem item = table.getItem(new Point(e.x, e.y));
-        if (item != null)
-        {
-          Object obj = item.getData();
-          if (obj != null)
-          {
-            TableElement holder = (TableElement)obj;
-            TableColumn col = table.getColumn(0);
-            if (e.x < col.getWidth()) // if the point falls within the Select column then perform check/uncheck
-            {
-              String currentState = holder.getChecked();
-              if (currentState.equals("true")) //$NON-NLS-1$
-              {
-                holder.setChecked("false"); //$NON-NLS-1$
-                checkedList.set(holder.getIndex(), "false"); //$NON-NLS-1$
-              }  
-              else if (currentState.equals("false")) //$NON-NLS-1$
-              {
-                holder.setChecked("true");  //$NON-NLS-1$
-                checkedList.set(holder.getIndex(), "true"); //$NON-NLS-1$
-              }
-              tableViewer.refresh();
-              if (updateListener != null)
-              {
-                updateListener.updateOccured(this, namespaceInfoList);
-              }
-            }
-          }
-        }        
-      }
-    });
-
-    tableViewer = new NamespaceNavigableTableViewer(table);
-    provider = new NamespaceInfoTableLabelProvider();
-    tableViewer.setContentProvider(provider);   
-    tableViewer.setLabelProvider(provider);
-    tableViewer.setColumnProperties(titleArray);
-    tableViewer.setCellModifier(new NamespaceInfoCellModifier());
-
-                    
-    int[] widthArray = {10, 20, 50};
-    TableLayout layout = new TableLayout();  
-
-    for (int i = 0; i < titleArray.length; i++)
-    {
-      TableColumn column = new TableColumn(table, i);
-      column.setText(titleArray[i]);
-      column.setAlignment(SWT.LEFT);
-      layout.addColumnData(new ColumnWeightData(widthArray[i], true));
-    }         
-    this.visibleRows = visibleRows;
-    for (int i = 0; i < visibleRows; i++)
-    {
-      TableItem item = new TableItem(table, SWT.NONE); 
-      item.setText("#######"); //$NON-NLS-1$
-    }
-    table.setLayout(layout);  
-    
-    CellEditor[] cellEditors = new CellEditor[titleArray.length];
-    cellEditors[0] = new NamespaceInfoCheckboxCellEditor(table);
-    cellEditors[1] = new TextCellEditor(table);
-    tableViewer.setCellEditors(cellEditors);
-
-//    createButtons(namespaceInfoGroup);            
-
-    initialize();    
-  }    
-
-  public void setUpdateListener(UpdateListener updateListener)
-  {
-    this.updateListener = updateListener;
-  }
-
-  public void setNamespaceInfoList(List namespaceInfoList)
-  {    
-    this.namespaceInfoList = namespaceInfoList;
-    update();
-  }                       
-
-  public List getNamespaceInfoList()
-  {
-    return namespaceInfoList;
-  }  
-
-  public List getNamespaceCheckedList()
-  {
-    return checkedList;
-  }  
-
-  public String getWSDLPrefix()
-  {
-    return ((NamespaceInfo)(namespaceInfoList.get(0))).prefix;
-  }
-
-  public void setResourceLocation(IPath resourceLocation)
-  {
-    this.resourceLocation = resourceLocation;
-  }
-
-  public GridLayout createGridLayout()
-  {
-    GridLayout gridLayout = new GridLayout();
-    gridLayout.marginWidth = 0;
-    gridLayout.horizontalSpacing = 0;
-    return gridLayout;
-  }
-    
-  protected void initialize()
-  {
-    // better way to do this....
-    NamespaceInfo info1 = new NamespaceInfo();
-    info1.prefix = "wsdl"; //$NON-NLS-1$
-    info1.uri = "http://schemas.xmlsoap.org/wsdl/"; //$NON-NLS-1$
-    namespaceInfoList.add(info1);
-    checkedList.add("true"); //$NON-NLS-1$
-    NamespaceInfo info2 = new NamespaceInfo();
-    info2.prefix = "soap"; //$NON-NLS-1$
-    info2.uri = "http://schemas.xmlsoap.org/wsdl/soap/"; //$NON-NLS-1$
-    namespaceInfoList.add(info2);
-    checkedList.add("false"); //$NON-NLS-1$
-    NamespaceInfo info3 = new NamespaceInfo();
-    info3.prefix = "http";  //$NON-NLS-1$
-    info3.uri = "http://schemas.xmlsoap.org/wsdl/http/"; //$NON-NLS-1$
-    namespaceInfoList.add(info3);
-    checkedList.add("false"); //$NON-NLS-1$
-    NamespaceInfo info4 = new NamespaceInfo();
-    info4.prefix = "mime"; //$NON-NLS-1$
-    info4.uri = "http://schemas.xmlsoap.org/wsdl/mime/"; //$NON-NLS-1$
-    namespaceInfoList.add(info4);
-    checkedList.add("false"); //$NON-NLS-1$
-    NamespaceInfo info5 = new NamespaceInfo();
-    info5.prefix = "soapenc"; //$NON-NLS-1$
-    info5.uri = "http://schemas.xmlsoap.org/soap/encoding/"; //$NON-NLS-1$
-    namespaceInfoList.add(info5);
-    checkedList.add("false"); //$NON-NLS-1$
-    NamespaceInfo info6 = new NamespaceInfo();
-    info6.prefix = "soapenv"; //$NON-NLS-1$
-    info6.uri = "http://schemas.xmlsoap.org/soap/envelope/"; //$NON-NLS-1$
-    namespaceInfoList.add(info6);
-    checkedList.add("false"); //$NON-NLS-1$
-    NamespaceInfo info7 = new NamespaceInfo();
-    info7.prefix = "xsi"; //$NON-NLS-1$
-    info7.uri = "http://www.w3.org/2001/XMLSchema-instance"; //$NON-NLS-1$
-    namespaceInfoList.add(info7);
-    checkedList.add("false"); //$NON-NLS-1$
-    NamespaceInfo info8 = new NamespaceInfo();
-    info8.prefix = "xsd"; //$NON-NLS-1$
-    info8.uri = "http://www.w3.org/2001/XMLSchema"; //$NON-NLS-1$
-    namespaceInfoList.add(info8);
-    checkedList.add("true"); //$NON-NLS-1$
-    update();
-  }
-
-  protected void createButtons(Composite parent)
-  {
-    Composite composite = new Composite(parent, SWT.NONE);
-    GridData hFillGD = new GridData();
-    hFillGD.horizontalAlignment= GridData.FILL;
-    hFillGD.grabExcessHorizontalSpace= true;
-    
-    composite.setLayoutData(hFillGD);
-    GridLayout gridLayout = new GridLayout();
-    gridLayout.numColumns = 2;
-    gridLayout.marginHeight = 0;
-    gridLayout.marginWidth = 0;
-    composite.setLayout(gridLayout);
-
-    GridData gd = new GridData();
-    gd.horizontalAlignment = GridData.FILL;
-    gd.grabExcessHorizontalSpace= true;
-    
-    Button hiddenButton = new Button(composite, SWT.NONE);
-    hiddenButton.setLayoutData(gd);
-    hiddenButton.setVisible(false);
-    hiddenButton.setEnabled(false);
-
-    SelectionListener selectionListener = new SelectionAdapter()
-    {
-      public void widgetSelected(SelectionEvent e)
-      {  
-        if (e.widget == addButton)
-        {
-          performNew();
-        }
-      }
-    };   
-    
-    // create a composite to hold the three buttons
-    Composite buttonComposite = new Composite(composite, SWT.NONE);
-
-    buttonComposite.setLayoutData(hFillGD);
-    GridLayout buttonGridLayout = new GridLayout();
-    buttonGridLayout.numColumns = 1;
-    buttonGridLayout.makeColumnsEqualWidth = true;
-    buttonComposite.setLayout(buttonGridLayout);
-
-    // add the New button
-    //
-    gd = new GridData();
-    gd.horizontalAlignment = GridData.FILL;
-    gd.grabExcessHorizontalSpace = true;
-
-    addButton = new Button(buttonComposite, SWT.NONE);
-    addButton.setText(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD")); //$NON-NLS-1$
-    addButton.setLayoutData(gd);//ViewUtility.createHorizontalFill());
-    addButton.addSelectionListener(selectionListener);
-  }
-
-  public void performNew()
-  {
-    NamespaceInfo info = new NamespaceInfo();
-    EditNamespaceInfoDialog dialog = invokeDialog(XMLCommonResources.getInstance().getString("_UI_LABEL_NEW_NAMESPACE_INFORMATION"), info); //$NON-NLS-1$
-    if (dialog.getReturnCode() == Dialog.OK)
-    {
-      namespaceInfoList.add(info);
-      checkedList.add("true"); //$NON-NLS-1$
-      performDelayedUpdate();
-    }
-  } 
-                     
-  protected EditNamespaceInfoDialog invokeDialog(String title, NamespaceInfo info)
-  {
-    Shell shell = XMLCommonResources.getInstance().getWorkbench().getActiveWorkbenchWindow().getShell();
-    EditNamespaceInfoDialog dialog = new EditNamespaceInfoDialog(shell, info);
-    dialog.create();
-    dialog.getShell().setText(title);
-    dialog.setBlockOnOpen(true);
-    dialog.setResourceLocation(resourceLocation);
-    dialog.open();      
-    return dialog;
-  }
-
-  protected void performDelayedUpdate()
-  {
-    Runnable delayedUpdate = new Runnable()
-    {
-      public void run()
-      {
-        update();
-      }
-    };
-    Display.getCurrent().asyncExec(delayedUpdate);
-
-    if (updateListener != null)
-    {
-      updateListener.updateOccured(this, namespaceInfoList);
-    }
-  }
- 
-  protected NamespaceInfo getTargetNamespaceInfo()
-  {
-    return (namespaceInfoList != null && namespaceInfoList.size() > 0) ? 
-           (NamespaceInfo)namespaceInfoList.get(0) :
-           null;
-  }    
-
-                    
-  public void update()
-  {
-    updateHelper(namespaceInfoList);
-  }
-                           
-  public void updateHelper(List namespaceInfoList)
-  {                                      
-    if (visibleRows != -1 && !dummyRowsRemoved)
-    {
-//      dummyRowsRemoved = true;
-//      tableViewer.getTable().removeAll();
-    }                                                      
-    ISelection selection = tableViewer.getSelection();
-    tableViewer.setInput(namespaceInfoList);
-    if (selection.isEmpty())
-    {                     
-      if (namespaceInfoList.size() > 0)
-      {
-        tableViewer.setSelection(new StructuredSelection(namespaceInfoList.get(0)));
-      }
-    }
-    else
-    {
-      tableViewer.setSelection(selection);
-    }
-  }
-
-  protected class NamespaceInfoCheckboxCellEditor extends CheckboxCellEditor implements MouseListener
-  {
-    public NamespaceInfoCheckboxCellEditor(Composite parent)
-    {
-      super(parent);
-    }
-
-    protected void doSetValue(Object value)
-    {
-    }
-
-    public void activate()
-    {
-       super.activate();
-       deactivate();
-       Display.getCurrent().getFocusControl().redraw();
-    }
-
-    public void mouseDown(MouseEvent e)   
-    {      
-      if (tableViewer.getTable().getItem(new Point(e.x, e.y)) != null)
-      {
-      }
-    }    
-    public void mouseDoubleClick(MouseEvent e) {}
-    public void mouseUp(MouseEvent e) {}
-
-
-  }
-
-
-  protected class NamespaceInfoCellModifier implements ICellModifier
-  {
-    public NamespaceInfoCellModifier()
-    {
-      
-    }
-    
-    public boolean canModify(Object element, String property)
-    {
-      if (property.equals(INCLUDE))
-      {
-        return true;
-      }
-      else if (property.equals(PREFIX))
-      {
-        return true;
-      }
-      return false;      
-    }
-
-    public Object getValue(Object element, String property)
-    {
-      int column = 0;
-      if (property.equals(INCLUDE))
-      {
-        column = 0;
-      }
-      else if (property.equals(PREFIX))
-      {
-        column = 1;
-      }
-      else if (property.equals(NAMESPACE_URI))
-      {
-        column = 2;
-      }
-
-      if (element instanceof TableElement)
-      {
-        return provider.getColumnText(element, column);
-      }
-      else
-      {
-        return null;
-      }
-    }
-
-    public void modify(Object element, String property, Object value)
-    {
-      TableItem item = (TableItem)element;
-      if (item != null)
-      {
-        Object obj = item.getData();
-        if (obj != null)
-        {
-          TableElement holder = (TableElement)obj;
-          NamespaceInfo info = holder.getNamespaceInfo();
-          if (property.equals(INCLUDE))
-          {
-            if (value instanceof Boolean)
-            {
-              if (((Boolean)value).booleanValue())
-              {
-                holder.setChecked("true");
-                checkedList.set(holder.getIndex(), "true");
-              }
-              else
-              {
-                holder.setChecked("false");
-                checkedList.set(holder.getIndex(), "false");
-              }
-            }
-          }
-          else if (property.equals(PREFIX))
-          {
-            info.prefix = ((String)value).trim();
-          }
-
-          Runnable delayedUpdate = new Runnable()
-          {
-            public void run()
-            {
-              tableViewer.refresh();
-            }
-          };
-          Display.getCurrent().asyncExec(delayedUpdate);
-          if (updateListener != null)
-          {
-            updateListener.updateOccured(this, namespaceInfoList);
-          }
-
-//          performDelayedUpdate();
-        }
-      }
-    }
-  }                   
-
-  protected class TableElement
-  {
-    NamespaceInfo info;
-    int index;
-    String checked = "true";
-    
-    TableElement(NamespaceInfo info, int index)
-    {
-      this.info = info;
-      this.index = index;
-    }
-    
-    public NamespaceInfo getNamespaceInfo()
-    {
-      return info;
-    }
-    
-    public int getIndex()
-    {
-      return index;
-    }
-    
-    public String getChecked()
-    {
-      return checked;
-    }
-    
-    public void setChecked(String checked)
-    {
-      this.checked = checked;
-    }
-  }
-
-  /**
-   * NamespaceInfoTableLabelProvider
-   */
-  protected class NamespaceInfoTableLabelProvider implements ITableLabelProvider, IStructuredContentProvider
-  {
-    public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
-    {
-    }
-
-    public boolean isLabelProperty(Object element, String property)
-    {
-      return false;
-    }
-
-    public boolean isDeleted(Object element)
-    {
-      return false;
-    }
-
-    public Object[] getElements(Object inputElement)
-    {
-      Vector v = new Vector();
-      for (int i = 0; i < namespaceInfoList.size(); i++)
-      {
-        NamespaceInfo info = (NamespaceInfo)namespaceInfoList.get(i);
-        TableElement holder = new TableElement(info, i);
-        holder.setChecked((String)checkedList.get(i));
-        v.add(holder);
-      }
-      return v.toArray();
-    }
-
-    public String getColumnText(Object object, int column)
-    {
-      TableElement holder = (TableElement)object;
-      NamespaceInfo info = holder.getNamespaceInfo();
-      String result = null;
-      switch (column)
-      {
-        case 1: { result = info.prefix; break; }
-        case 2: { result = info.uri; break; }
-      }
-      result = result != null ? result.trim() : "";
-      if (result.equals(""))
-      {
-        switch (column)
-        {
-          case 2: 
-          { 
-            result = XMLCommonResources.getInstance().getString("_UI_NO_NAMESPACE_NAME");  //$NON-NLS-1$
-            break; 
-          }
-        }
-      }
-      return result;
-    }
-
-//    private String getDefaultPrefix()
-//    {
-//      String defaultPrefix = "p";
-//      if (namespaceInfoList == null)
-//        return defaultPrefix;
-//
-//      Vector v = new Vector();
-//      for (int i=0; i<namespaceInfoList.size(); i++)
-//      {
-//        NamespaceInfo nsinfo = (NamespaceInfo)namespaceInfoList.get(i);
-//        if (nsinfo.prefix != null)
-//          v.addElement(nsinfo.prefix);
-//      }
-//
-//      if (v.contains(defaultPrefix))
-//      {
-//        String s = defaultPrefix;
-//        for (int j=0; v.contains(s); j++)
-//        {
-//          s = defaultPrefix + Integer.toString(j);
-//        }
-//        return s;
-//      }
-//      else
-//        return defaultPrefix;
-//    }
-
-    public Image getColumnImage(Object object, int columnIndex)
-    {
-      if (columnIndex == 0)  // Output Column
-      {
-        if (object instanceof TableElement)
-        {
-          TableElement holder = (TableElement) object;
-          String result = holder.getChecked();
-          if (result.equals("true")) //$NON-NLS-1$
-          {
-            return WSDLEditorPlugin.getInstance().getImage("icons/output_yes.gif"); //$NON-NLS-1$
-          }
-          else
-          {
-            return WSDLEditorPlugin.getInstance().getImage("icons/output_no.gif"); //$NON-NLS-1$
-          }
-        }
-      }
-      return null;
-    }
-
-    public boolean isLabelProperty(Object object, Object property)
-    {
-      return false;
-    }
-
-    public void addListener(ILabelProviderListener listener)
-    {
-    }
-
-    public void removeListener(ILabelProviderListener listener)
-    {
-    }
-
-    public void dispose()
-    {
-    }
-  }
-
-  class NamespaceNavigableTableViewer extends NavigableTableViewer
-  {
-    public NamespaceNavigableTableViewer(Table parent)
-    {
-      super(parent);
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/NewWSDLWizard.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/NewWSDLWizard.java
deleted file mode 100644
index 8c73cbe5c..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/NewWSDLWizard.java
+++ /dev/null
@@ -1,399 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.wizards;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.wst.common.ui.internal.UIPlugin;
-import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.binding.http.internal.generator.HTTPContentGenerator;
-import org.eclipse.wst.wsdl.binding.http.internal.util.HTTPConstants;
-import org.eclipse.wst.wsdl.binding.soap.internal.generator.SOAPContentGenerator;
-import org.eclipse.wst.wsdl.binding.soap.internal.util.SOAPConstants;
-import org.eclipse.wst.wsdl.internal.generator.BindingGenerator;
-import org.eclipse.wst.wsdl.internal.impl.DefinitionImpl;
-import org.eclipse.wst.wsdl.internal.impl.WSDLFactoryImpl;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.CreateWSDLElementHelper;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNodeList;
-import org.eclipse.wst.xml.core.internal.contentmodel.internal.util.DOMValidator;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.CMVisitor;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceInfo;
-import org.w3c.dom.Element;
-
-public class NewWSDLWizard extends Wizard implements INewWizard {
-	private WSDLNewFilePage newFilePage;
-	private WSDLNewFileOptionsPage optionsPage;
-	private IStructuredSelection selection;
-
-	/**
-	 * Constructor for NewWSDLWizard.
-	 */
-	public NewWSDLWizard() {
-		super();
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.IWizard#performFinish()
-	 */
-	public boolean performFinish() {
-		IFile file = newFilePage.createNewFile();
-
-		Preferences preference = XMLCorePlugin.getDefault().getPluginPreferences();
-		String charSet = preference.getString(CommonEncodingPreferenceNames.OUTPUT_CODESET);
-		if (charSet == null || charSet.trim().equals("")) {
-			charSet = "UTF-8";
-		}
-
-		String wsdlPrefix = "wsdl";
-		Vector namespaces = optionsPage.getNamespaceInfo();
-
-		String prefix = optionsPage.getPrefix();
-		String definitionName = optionsPage.getDefinitionName();
-
-		URI uri2 = URI.createPlatformResourceURI(file.getFullPath().toOSString());
-		ResourceSet resourceSet = new ResourceSetImpl();
-		WSDLResourceImpl resource = (WSDLResourceImpl) resourceSet.createResource(URI.createURI("*.wsdl"));
-		resource.setURI(uri2);
-		
-		WSDLFactoryImpl factory = new WSDLFactoryImpl();
-		DefinitionImpl definition = (DefinitionImpl) factory.createDefinition();
-		resource.getContents().add(definition);
-		
-		definition.setTargetNamespace(optionsPage.getTargetNamespace());
-		definition.setLocation(file.getLocation().toString());
-		definition.setEncoding(charSet);
-		definition.setQName(new QName(wsdlPrefix, definitionName));
-		definition.addNamespace(prefix, optionsPage.getTargetNamespace());
-
-		for (int i = 0; i < namespaces.size(); i++) {
-			NamespaceInfo info = (NamespaceInfo) namespaces.get(i);
-
-			if (info.prefix.length() > 0) {
-				definition.addNamespace(info.prefix, info.uri);
-			}
-			else {
-				definition.addNamespace(null, info.uri);
-			}
-		}
-		// TODO : cs... why do we need this?  these calls are evil!
-		definition.updateElement(true);
-		try {
-			if (optionsPage.getCreateSkeletonBoolean()) {
-				if (optionsPage.isSoapDocLiteralProtocol()) {
-					CreateWSDLElementHelper.PART_TYPE_OR_DEFINITION = CreateWSDLElementHelper.PART_INFO_ELEMENT_DECLARATION;
-				}
-				else {
-					CreateWSDLElementHelper.PART_TYPE_OR_DEFINITION = CreateWSDLElementHelper.PART_INFO_TYPE_DEFINITION;
-				}
-
-				CreateWSDLElementHelper.serviceName = definitionName;
-				CreateWSDLElementHelper.portName = definitionName + optionsPage.getProtocol();
-				Service service = CreateWSDLElementHelper.createService(definition);
-
-
-				// Generate Binding
-				Iterator bindingIt = definition.getEBindings().iterator();
-				Binding binding = null;
-				if (bindingIt.hasNext()) {
-					binding = (Binding) bindingIt.next();
-				}
-				BindingGenerator bindingGenerator = new BindingGenerator(definition, binding, SOAPConstants.SOAP_NAMESPACE_URI);
-				Port port = (Port) service.getEPorts().iterator().next();
-				bindingGenerator.setName(ComponentReferenceUtil.getName(port.getEBinding()));
-				bindingGenerator.setRefName(ComponentReferenceUtil.getPortTypeReference(port.getEBinding()));
-				bindingGenerator.setOverwrite(true);
-				
-				if (optionsPage.getProtocol().equals("SOAP")) {
-					String namespace = SOAPConstants.SOAP_NAMESPACE_URI;
-					bindingGenerator.setContentGenerator(BindingGenerator.getContentGenerator(namespace));
-
-					SOAPContentGenerator soapGen = (SOAPContentGenerator) bindingGenerator.getContentGenerator();
-					Boolean booleanValue = (Boolean) optionsPage.getProtocolOptions()[0];
-					Boolean booleanValue2 = (Boolean) optionsPage.getProtocolOptions()[2];
-					if (booleanValue.booleanValue()) {
-						// Document Literal
-						soapGen.setStyle(SOAPContentGenerator.STYLE_DOCUMENT);
-						soapGen.setUse(SOAPContentGenerator.USE_LITERAL);
-					}
-					else if (booleanValue2.booleanValue()){
-						// RPC Literal
-						soapGen.setStyle(SOAPContentGenerator.STYLE_RPC);
-						soapGen.setUse(SOAPContentGenerator.USE_LITERAL);
-					}
-					else {
-						// RPC Encoded
-						soapGen.setStyle(SOAPContentGenerator.STYLE_RPC);
-						soapGen.setUse(SOAPContentGenerator.USE_ENCODED);
-					}
-				}
-				else if (optionsPage.getProtocol().equals("HTTP")) {
-					String namespace = HTTPConstants.HTTP_NAMESPACE_URI;
-					bindingGenerator.setContentGenerator(BindingGenerator.getContentGenerator(namespace));
-
-					Boolean booleanValue = (Boolean) optionsPage.getProtocolOptions()[0];
-					if (booleanValue.booleanValue()) {
-						// Post
-						((HTTPContentGenerator) bindingGenerator.getContentGenerator()).setVerb(HTTPContentGenerator.VERB_POST);
-					}
-					else {
-						// Get
-						((HTTPContentGenerator) bindingGenerator.getContentGenerator()).setVerb(HTTPContentGenerator.VERB_GET);
-					}
-				}
-				
-				bindingGenerator.generateBinding();
-				bindingGenerator.generatePortContent();				
-			}
-			resource.save(null);
-		}
-		catch (Exception e) {
-			System.out.println("\nCould not write new WSDL file in WSDL Wizard: " + e);
-		}
-
-		/*
-		 * if (file != null) { final ISelection selection = new
-		 * StructuredSelection(file); if (selection != null) { IWorkbench
-		 * workbench = UIPlugin.getDefault().getWorkbench(); final
-		 * IWorkbenchWindow workbenchWindow =
-		 * workbench.getActiveWorkbenchWindow(); final IWorkbenchPart
-		 * focusPart = workbenchWindow.getActivePage().getActivePart(); if
-		 * (focusPart instanceof ISetSelectionTarget) {
-		 * Display.getCurrent().asyncExec (new Runnable() { public void run() {
-		 * ((ISetSelectionTarget)focusPart).selectReveal(selection); } }); } } }
-		 */
-		openEditor(file);
-
-		return true;
-	}
-
-	/**
-	 * @see org.eclipse.ui.IWorkbenchWizard#init(IWorkbench,
-	 *      IStructuredSelection)
-	 */
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		this.selection = selection;
-
-		// Need new icon
-		this.setDefaultPageImageDescriptor(ImageDescriptor.createFromFile(WSDLEditor.class, "icons/new_wsdl_wiz.gif"));
-		this.setWindowTitle(WSDLEditorPlugin.getWSDLString("_UI_TITLE_NEW_WSDL_FILE")); //$NON-NLS-1$
-	}
-
-	public void addPages() {
-		newFilePage = new WSDLNewFilePage(selection);
-		optionsPage = new WSDLNewFileOptionsPage(WSDLEditorPlugin.getWSDLString("_UI_TITLE_OPTIONS"), WSDLEditorPlugin.getWSDLString("_UI_TITLE_OPTIONS"), null); //$NON-NLS-1$ //$NON-NLS-2$
-		addPage(newFilePage);
-		addPage(optionsPage);
-	}
-
-	public IPath getNewFilePath() {
-		String fileName = newFilePage.getFileName();
-		return fileName != null ? new Path(fileName) : null;
-	}
-
-	public boolean canFinish() {
-		if (newFilePage.isPageComplete() && optionsPage.isPageComplete()) {
-			return true;
-		}
-		return false;
-	}
-
-	static public void openEditor(final IFile iFile) {
-		if (iFile != null) {
-			IWorkbench workbench = UIPlugin.getDefault().getWorkbench();
-			final IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
-
-			Display.getDefault().asyncExec(new Runnable() {
-				public void run() {
-					try {
-						workbenchWindow.getActivePage().openEditor(new FileEditorInput(iFile), "org.eclipse.wst.wsdl.ui.internal.WSDLEditor");
-					}
-					catch (PartInitException ex) {
-						// B2BGUIPlugin.getPlugin().getMsgLogger().write("Exception
-						// encountered when attempting to open file: " + iFile
-						// + "\n\n" + ex);
-					}
-				}
-			});
-		}
-	}
-
-	public class AvailableContentCMVisitor extends CMVisitor {
-		public static final int INCLUDE_ATTRIBUTES = ModelQuery.INCLUDE_ATTRIBUTES;
-		public static final int INCLUDE_CHILD_NODES = ModelQuery.INCLUDE_CHILD_NODES;
-		public static final int INCLUDE_SEQUENCE_GROUPS = ModelQuery.INCLUDE_SEQUENCE_GROUPS;
-
-		public Hashtable childNodeTable = new Hashtable();
-		public Hashtable attributeTable = new Hashtable();
-		public Element rootElement;
-		public CMElementDeclaration rootElementDeclaration;
-		public boolean isRootVisited;
-		protected boolean includeSequenceGroups;
-		public DOMValidator validator;
-
-		public AvailableContentCMVisitor(Element rootElement, CMElementDeclaration rootElementDeclaration) {
-			this.rootElement = rootElement;
-			this.rootElementDeclaration = rootElementDeclaration;
-			validator = new DOMValidator();
-		}
-
-		protected String getKey(CMNode cmNode) {
-			String key = cmNode.getNodeName();
-			CMDocument cmDocument = (CMDocument) cmNode.getProperty("CMDocument");
-			if (cmDocument != null) {
-				String namespaceURI = (String) cmDocument.getProperty("http://org.eclipse.wst/cm/properties/targetNamespaceURI");
-				if (namespaceURI != null) {
-					key = "[" + namespaceURI + "]" + key;
-				}
-			}
-			return key;
-		}
-
-		public List computeAvailableContent(int includeOptions) {
-			Vector v = new Vector();
-
-			int contentType = rootElementDeclaration.getContentType();
-			includeSequenceGroups = ((includeOptions & INCLUDE_SEQUENCE_GROUPS) != 0);
-			visitCMNode(rootElementDeclaration);
-
-			if ((includeOptions & INCLUDE_ATTRIBUTES) != 0) {
-				v.addAll(attributeTable.values());
-				CMAttributeDeclaration nillableAttribute = (CMAttributeDeclaration) rootElementDeclaration.getProperty("http://org.eclipse.wst/cm/properties/nillable");
-				if (nillableAttribute != null) {
-					v.add(nillableAttribute);
-				}
-			}
-
-			if ((includeOptions & INCLUDE_CHILD_NODES) != 0) {
-				if (contentType == CMElementDeclaration.MIXED || contentType == CMElementDeclaration.ELEMENT) {
-					v.addAll(childNodeTable.values());
-				}
-				else if (contentType == CMElementDeclaration.ANY) {
-					CMDocument cmDocument = (CMDocument) rootElementDeclaration.getProperty("CMDocument");
-					if (cmDocument != null) {
-						CMNamedNodeMap elements = cmDocument.getElements();
-						for (Iterator i = elements.iterator(); i.hasNext();) {
-							v.add((CMElementDeclaration) i.next());
-						}
-					}
-				}
-
-				if (contentType == CMElementDeclaration.MIXED || contentType == CMElementDeclaration.PCDATA || contentType == CMElementDeclaration.ANY) {
-					CMDataType dataType = rootElementDeclaration.getDataType();
-					if (dataType != null) {
-						v.add(dataType);
-					}
-				}
-			}
-			return v;
-		}
-
-		/*
-		 * public void visitCMAnyElement(CMAnyElement anyElement) { String uri =
-		 * anyElement.getNamespaceURI(); List list =
-		 * getCMDocumentList(rootElement, rootElementDeclaration, uri); for
-		 * (Iterator iterator = list.iterator(); iterator.hasNext(); ) {
-		 * CMDocument cmdocument = (CMDocument)iterator.next(); if (cmdocument !=
-		 * null) { CMNamedNodeMap map = cmdocument.getElements(); int size =
-		 * map.getLength(); for (int i = 0; i < size; i++) { CMNode ed =
-		 * map.item(i);
-		 * 
-		 * childNodeTable.put(getKey(ed), ed); } } } }
-		 */
-		public void visitCMAttributeDeclaration(CMAttributeDeclaration ad) {
-			super.visitCMAttributeDeclaration(ad);
-			attributeTable.put(ad.getNodeName(), ad);
-		}
-
-		public void visitCMElementDeclaration(CMElementDeclaration ed) {
-			if (ed == rootElementDeclaration && !isRootVisited) {
-				isRootVisited = true;
-				super.visitCMElementDeclaration(ed);
-			}
-			else {
-				if (!Boolean.TRUE.equals(ed.getProperty("Abstract"))) {
-					childNodeTable.put(getKey(ed), ed);
-				}
-
-				CMNodeList substitutionGroup = (CMNodeList) ed.getProperty("SubstitutionGroup");
-				if (substitutionGroup != null) {
-					handleSubstitutionGroup(substitutionGroup);
-				}
-			}
-		}
-
-		protected void handleSubstitutionGroup(CMNodeList substitutionGroup) {
-			int substitutionGroupLength = substitutionGroup.getLength();
-			if (substitutionGroupLength > 1) {
-				for (int i = 0; i < substitutionGroupLength; i++) {
-					CMNode ed = substitutionGroup.item(i);
-					if (!Boolean.TRUE.equals(ed.getProperty("Abstract"))) {
-						childNodeTable.put(getKey(ed), ed);
-					}
-				}
-			}
-		}
-
-		public void visitCMGroup(CMGroup group) {
-			if (includeSequenceGroups) {
-				if (group.getOperator() == CMGroup.SEQUENCE && group.getChildNodes().getLength() > 1 && includesRequiredContent(group)) {
-					childNodeTable.put(group, group);
-				}
-			}
-			super.visitCMGroup(group);
-		}
-
-		public boolean includesRequiredContent(CMGroup group) {
-			List list = getValidator().createContentSpecificationList(group);
-			return list.size() > 1;
-		}
-
-		public DOMValidator getValidator() {
-			return validator;
-		}
-	} // ///////////////////////// here
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/PortWizard.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/PortWizard.java
deleted file mode 100644
index 4ccf3c664..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/PortWizard.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.wizards;
-
-import java.util.List;
-
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.internal.generator.PortGenerator;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.contentgenerator.ui.ContentGeneratorOptionsPage;
-import org.eclipse.wst.wsdl.ui.internal.contentgenerator.ui.SoapBindingOptionsPage;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.NameUtil;
-import org.eclipse.wst.wsdl.ui.internal.widgets.ProtocolComponentControl;
-
-public class PortWizard extends Wizard
-{
-  protected final static int STYLE_NEW_BINDING = 1;
-  protected final static int STYLE_EXISTING_BINDING = 1 << 1;
-  protected final static int STYLE_DEFAULT = STYLE_NEW_BINDING | STYLE_EXISTING_BINDING;
-
-  protected PortGenerator portGenerator;
-  protected PortWizardOptionsPage specifyBindingPage;
-  protected int style;
-
-  /**
-   * Constructor for PortWizard.
-   */
-  public PortWizard(Service service)
-  {
-    this(service, 0);
-  }
-
-  public PortWizard(Service service, int style)
-  {
-    super();
-    portGenerator = new PortGenerator(service);
-    setWindowTitle(WSDLEditorPlugin.getWSDLString("_UI_PORT_WIZARD")); //$NON-NLS-1$
-    //setDefaultPageImageDescriptor(ImageDescriptor.createFromFile(WSDLEditorPlugin.class, "icons/NewXML.gif"));
-  }
-
-  /**
-   * Return true if wizard setup is successful, false otherwise
-   */
-  public boolean setup()
-  {
-    return true;
-  }
-
-  public void addPages()
-  {
-    specifyBindingPage = new PortWizardOptionsPage(style);
-    addPage(specifyBindingPage);
-  }
-
-  public boolean performFinish()
-  {
-    Object object = portGenerator.generatePort();
-
-    try
-    {
-      if (object != null)
-      {
-        IEditorPart editorPart = WSDLEditorPlugin.getInstance().getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-        ISelectionProvider selectionProvider = (ISelectionProvider) editorPart.getAdapter(ISelectionProvider.class);
-        if (selectionProvider != null)
-        {
-          selectionProvider.setSelection(new StructuredSelection(object));
-        }
-      }
-    }
-    catch (Exception e)
-    {
-    }
-    return true;
-  }
-
-  class PortWizardOptionsPage extends WizardPage
-  {
-
-    protected ProtocolComponentControl protocolComponentControl;
-
-    public PortWizardOptionsPage(int style)
-    {
-      super("SpecifyPortPage");
-      setTitle(WSDLEditorPlugin.getWSDLString("_UI_SPECIFY_PORT_DETAILS"));
-      setDescription(WSDLEditorPlugin.getWSDLString("_UI_SPECIFY_PORT_DETAILS_TO_BE_CREATED"));
-    }
-
-    public PortGenerator getGenerator()
-    {
-      return portGenerator;
-    }
-
-    public void createControl(Composite parent)
-    {
-      ProtocolComponentControl protocolComponentControl = new PortProtocolComponentControl(parent, portGenerator);
-      protocolComponentControl.initFields();
-      setControl(protocolComponentControl);
-    }
-  }
-
-  class PortProtocolComponentControl extends ProtocolComponentControl
-  {
-
-    public PortProtocolComponentControl(Composite parent, PortGenerator generator)
-    {
-      super(parent, generator, false);
-    }
-
-    public String getRefNameLabelText()
-    {
-      return WSDLEditorPlugin.getWSDLString("_UI_BINDING");
-    }
-
-    public List getRefNames()
-    {
-      return new ComponentReferenceUtil(portGenerator.getDefinition()).getBindingNames();
-    }
-
-    public String getDefaultName()
-    {
-      Service service = portGenerator.getService();
-      return NameUtil.buildUniquePortName(service, null);
-    }
-
-    public ContentGeneratorOptionsPage createContentGeneratorOptionsPage(String protocol)
-    {
-      ContentGeneratorOptionsPage optionsPage = null;	  
-	  String protocolSelection = protocolCombo.getItem(protocolCombo.getSelectionIndex());
-	  if (protocolSelection.equals("SOAP")) {
-		  optionsPage = new SoapBindingOptionsPage();
-	  }
-	  else if (protocolSelection.equals("HTTP")) {
-		  optionsPage = new SoapBindingOptionsPage();
-	  }	  
-//      ContentGeneratorExtension extension = WSDLEditorPlugin.getInstance().getContentGeneratorExtensionRegistry().getContentGeneratorExtension(protocol);
-//      if (extension != null)
-//      {
-//        optionsPage = extension.createPortContentGeneratorOptionsPage();
-//      }
-      return optionsPage;
-    }
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/WSDLNewFileOptionsPage.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/WSDLNewFileOptionsPage.java
deleted file mode 100644
index ba906c039..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/WSDLNewFileOptionsPage.java
+++ /dev/null
@@ -1,610 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.wizards;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.ui.part.PageBook;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.util.ValidateHelper;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceInfo;
-import org.eclipse.wst.xml.ui.internal.dialogs.UpdateListener;
-
-public class WSDLNewFileOptionsPage extends WizardPage implements ModifyListener, UpdateListener, SelectionListener
-{
-  protected Text targetNamespaceText;
-  protected Text prefixText;
-  protected boolean updatePortOpFieldBoolean = true;
-  
-  protected PageBook protocolPageBook;
-  protected Combo protocolCombo;
-  protected Composite soapPage;
-  protected Composite httpPage;
-  protected Button docLitRadio;
-  protected Button rpcLitRadio;
-  protected Button rpcEncRadio;
-  protected Button httpGetRadio;
-  protected Button httpPostRadio;
-  
-//  private BindingGenerator generator;
-
-  /**
-   * Constructor for WSDLNewFileOptionsPage.
-   * @param pageName
-   */
-  public WSDLNewFileOptionsPage(String pageName)
-  {
-    super(pageName);
-  }
-  /**
-   * Constructor for WSDLNewFileOptionsPage.
-   * @param pageName
-   * @param title
-   * @param titleImage
-   */
-  public WSDLNewFileOptionsPage(String pageName, String title, ImageDescriptor titleImage)
-  {
-    super(pageName, title, titleImage);
-    setDescription(WSDLEditorPlugin.getWSDLString("_UI_DESCRIPTION_NEW_WSDL_FILE")); //$NON-NLS-1$
-  }
-  /**
-   * @see org.eclipse.jface.dialogs.IDialogPage#createControl(Composite)
-   */
-  public void createControl(Composite parent)
-  {
-    Composite base = new Composite(parent, SWT.NONE);
-    WorkbenchHelp.setHelp(base, WSDLEditorPlugin.getWSDLString("_UI_HELP")); //$NON-NLS-1$
-    base.setLayout(new GridLayout());
-
-    //  Group wsdlGroup = ViewUtility.createGroup(base, 2, "WSDL", false);
-    Composite wsdlGroup = new Composite(base, SWT.NONE);
-    GridLayout layout = new GridLayout();
-    layout.numColumns = 2;
-    wsdlGroup.setLayout(layout);
-
-    GridData data = new GridData();
-    data.verticalAlignment = GridData.FILL;
-    data.horizontalAlignment = GridData.FILL;
-    wsdlGroup.setLayoutData(data);
-    
-    GridData gd = (GridData)wsdlGroup.getLayoutData();
-    gd.grabExcessHorizontalSpace = true;
-
-    Label targetNamespace = new Label(wsdlGroup, SWT.LEFT);
-    targetNamespace.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_TARGET_NAMESPACE")); //$NON-NLS-1$
-    GridData nsData = new GridData();
-    nsData.horizontalAlignment = GridData.FILL;
-    targetNamespace.setLayoutData(nsData);
-    
-    targetNamespaceText = new Text(wsdlGroup, SWT.SINGLE | SWT.BORDER);
-    GridData textData = new GridData();
-    textData.horizontalAlignment = GridData.FILL;
-    textData.grabExcessHorizontalSpace = true;
-    textData.widthHint = 10;
-    targetNamespaceText.setLayoutData(textData);
-    
-    targetNamespaceText.addModifyListener(this);
-
-    Label prefix = new Label(wsdlGroup, SWT.LEFT);
-    prefix.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_PREFIX_WITH_COLON")); //$NON-NLS-1$\
-
-    GridData prefixData = new GridData();
-    prefixData.horizontalAlignment = GridData.FILL;
-    prefix.setLayoutData(prefixData);
-    
-    prefixText = new Text(wsdlGroup, SWT.SINGLE | SWT.BORDER);
-    GridData prefixTextData = new GridData();
-    prefixTextData.horizontalAlignment = GridData.FILL;
-    prefixTextData.grabExcessHorizontalSpace = true;
-    prefixTextData.widthHint = 10;
-    prefixText.setLayoutData(prefixTextData);
-
-    prefixText.addModifyListener(this);
-    
-    //    XMLCatalog xmlCatalog = XMLCatalogRegistry.getInstance().lookupOrCreateXMLCatalog("default");
-    //    SelectXMLCatalogIdPanel catalog = new SelectXMLCatalogIdPanel(base, xmlCatalog);
-
-//  Determine if the user wishes to create a skeleton WSDL.  If yes, present the user with input fields.
-    createSkeletonCheckBox = new Button(base, SWT.CHECK);
-    createSkeletonCheckBox.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_CREATE_WSDL_SKELETON"));
-    createSkeletonCheckBox.setSelection(true);
-    
-    wsdlSkeletonGroup = new Composite(base, SWT.NONE);
-    GridLayout layout2 = new GridLayout();
-    layout2.numColumns = 2;
-    wsdlSkeletonGroup.setLayout(layout2);
-
-    GridData data2 = new GridData();
-    data2.verticalAlignment = GridData.FILL;
-    data2.horizontalAlignment = GridData.FILL;
-    wsdlSkeletonGroup.setLayoutData(data2);
-
-   createLabel(wsdlSkeletonGroup, WSDLEditorPlugin.getWSDLString("_UI_LABEL_BINDING_PROTOCOL"));
-   protocolCombo = new Combo(wsdlSkeletonGroup, SWT.READ_ONLY);
-   GridData dataC = new GridData();
-   dataC.horizontalAlignment = GridData.FILL;
-   dataC.grabExcessHorizontalSpace = true;
-   protocolCombo.setLayoutData(dataC);
-   protocolCombo.add(SOAP_PROTOCOL);
-   protocolCombo.add(HTTP_PROTOCOL);
-   protocolCombo.select(0);
-   protocolCombo.addModifyListener(this);
-   
-   sepLabel = new Label(base, SWT.SEPARATOR | SWT.HORIZONTAL);
-   GridData sepData = new GridData();
-   sepData.horizontalAlignment = GridData.FILL;
-   sepData.grabExcessHorizontalSpace = true;
-   sepLabel.setLayoutData(sepData);
-   
-   
-   // Create PageBook and pages/controls for the PageBook
-   protocolPageBook = new PageBook(base, SWT.NONE);
-
-   ///////////////////////// Soap Page
-   soapPage = new Composite(protocolPageBook, SWT.NONE);
-   GridLayout pbLayout = new GridLayout();
-   soapPage.setLayout(pbLayout);
-
-   GridData pbData = new GridData();
-   pbData.verticalAlignment = GridData.FILL;
-   pbData.horizontalAlignment = GridData.FILL;
-   soapPage.setLayoutData(pbData);
-
-   createLabel(soapPage, WSDLEditorPlugin.getWSDLString("_UI_LABEL_SOAP_BINDING_OPTIONS"));
-   docLitRadio = new Button(soapPage, SWT.RADIO);
-   rpcLitRadio = new Button(soapPage, SWT.RADIO);
-   rpcEncRadio = new Button(soapPage, SWT.RADIO);
-   docLitRadio.setText(SOAP_DOCUMENT_LITERAL);
-   rpcLitRadio.setText(SOAP_RPC_LITERAL);
-   rpcEncRadio.setText(SOAP_RPC_ENCODED);
-   docLitRadio.setSelection(true);
-   
-   ///////////////////////// Http Page
-   httpPage = new Composite(protocolPageBook, SWT.NONE);
-   pbLayout = new GridLayout();
-   httpPage.setLayout(pbLayout);
-
-   pbData = new GridData();
-   pbData.verticalAlignment = GridData.FILL;
-   pbData.horizontalAlignment = GridData.FILL;
-   httpPage.setLayoutData(pbData);
-   
-   createLabel(httpPage, WSDLEditorPlugin.getWSDLString("_UI_LABEL_HTTP_BINDING_OPTIONS")); // Already Externalized
-   httpGetRadio = new Button(httpPage, SWT.RADIO);
-   httpPostRadio = new Button(httpPage, SWT.RADIO);
-   httpGetRadio.setText(HTTP_GET);
-   httpPostRadio.setText(HTTP_POST);
-   httpGetRadio.setSelection(true);
-   
-   wsdlSkeletonGroup.setVisible(true);
-   sepLabel.setVisible(true);
-   protocolPageBook.showPage(soapPage);
-   protocolPageBook.setVisible(true);
-   
-   ////////////////////////// Add Selection Listeners
-   createSkeletonCheckBox.addSelectionListener(this);
-   
-//   BindingProtocolComponentControl component = new BindingProtocolComponentControl(base, generator, false);
-//   component.initFields();
-   
-    setControl(base);
-  }
-
-  private NewWSDLWizard getNewWSDLWizard()
-  {
-    return (NewWSDLWizard)getWizard();
-  }
-
-  private String computeDefaultDefinitionName()
-  {
-    String name = "DefaultName";
-    IPath path = getNewWSDLWizard().getNewFilePath();
-    if (path != null)
-    {
-      name = path.removeFileExtension().lastSegment().toString();
-    }
-    return name;
-  }
-
-  private String computeDefaultNamespaceName()
-  {
-    String namespace = WSDLEditorPlugin.getInstance().getPreferenceStore().getString(WSDLEditorPlugin.getWSDLString("_UI_PREF_PAGE_DEFAULT_TARGET_NAMESPACE"));
-    if (!namespace.endsWith("/")) {
-    	namespace = namespace.concat("/");
-    }
-    
-    IPath path = getNewWSDLWizard().getNewFilePath();
-    if (path != null)
-    {
-      namespace += path.removeFileExtension().toString() + "/";
-    }
-    return namespace;
-  }
-
-  public void setVisible(boolean visible)
-  {
-    super.setVisible(visible);
-
-    if (visible)
-    {
-      // prime the fields    
-      targetNamespaceText.setText(computeDefaultNamespaceName());
-      prefixText.setText("tns");
-    }
-  }
-
-  public String getTargetNamespace()
-  {
-    return targetNamespaceText.getText();
-  }
-
-  public String getPrefix()
-  {
-    return prefixText.getText().trim();
-  }
-
-  public String getDefinitionName()
-  {
-  	return computeDefaultDefinitionName();
-  }
-
-  public void modifyText(ModifyEvent e)
-  {
-    if (e.widget == targetNamespaceText)
-    {
-      startDelayedEvent(e);
-    }
-    else if (e.widget == prefixText)
-    {
-      setPageComplete(isPageComplete());
-    }
-	else if (e.widget == protocolCombo) {
-		// Update what page/control we show in the PageBook
-		if (protocolCombo.getText().equals("SOAP")) {
-			protocolPageBook.showPage(soapPage);
-		}
-		else if (protocolCombo.getText().equals("HTTP")) {
-			protocolPageBook.showPage(httpPage);
-		}
-	}
-  }
-
-  public void updateOccured(Object arg1, Object arg2)
-  {
-    setPageComplete(isPageComplete());
-  }
-
-  public boolean isPageComplete()
-  {
-    boolean ready = true;
-
-    setErrorMessage(null);
-
-    // so that the page doesn't immediately show up with an error
-    if (targetNamespaceText.getText().trim().equals(""))
-    {
-      if (ready)
-      {
-        setErrorMessage(null);
-      }
-      return false;
-    }
-
-    if (!validateTargetNamespace(targetNamespaceText.getText()))
-    {
-      ready = false;
-    }
-    
-    return ready;
-  }
-
-  protected boolean validatePrefix(String prefix)
-  {
-    String errorMessage = ValidateHelper.checkXMLPrefix(prefix);
-
-    if (errorMessage == null || errorMessage.length() == 0)
-    {
-      return true;
-    }
-    return false;
-  }
-
-  protected boolean validateXMLName(String xmlName)
-  {
-    String errorMessage = ValidateHelper.checkXMLName(xmlName);
-
-    if (errorMessage == null || errorMessage.length() == 0)
-    {
-      return true;
-    }
-    setErrorMessage(errorMessage);
-    return false;
-  }
-
-  protected boolean validateTargetNamespace(String ns)
-  {
-    boolean test = true;
-    try
-    {
-    	new URI(ns);
-//      URI testURI = new URI(ns);
-      //      if (!testURI.isGenericURI())
-      //      {
-      //        setErrorMessage(WSDLEditorPlugin.getInstance().getWSDLString("_UI_ERROR_NAMESPACE_INVALID")); //$NON-NLS-1$
-      //        test = false;
-      //      }
-    }
-    catch (URISyntaxException e)
-    {
-      //			String errorMessage = ValidateHelper.checkXMLName(ns);
-      //			if (errorMessage == null || errorMessage.length() == 0)
-      //			{
-      //				test = true;
-      //			}
-      //			else
-      //			{
-      setErrorMessage(WSDLEditorPlugin.getWSDLString("_UI_ERROR_NAMESPACE_INVALID")); //$NON-NLS-1$
-      test = false;
-      //			}
-    }
-
-    return test;
-  }
-
-  /*
-  private boolean arePrefixesUniqueAndValid()
-  {
-    java.util.List infoList = namespaceInfo.getNamespaceInfoList();
-    java.util.List checkedList = namespaceInfo.getNamespaceCheckedList();
-
-    Vector prefixList = new Vector();
-    boolean test = true;
-    boolean isOneBlank = false;
-
-    String currentPrefix = prefixText.getText().trim();
-    if (currentPrefix.length() == 0)
-    {
-      isOneBlank = true;
-    }
-    else
-    {
-      if (validatePrefix(currentPrefix))
-      {
-        prefixList.add(currentPrefix);
-      }
-      else
-      {
-        setErrorMessage(WSDLEditorPlugin.getWSDLString("_UI_ERROR_PREFIX_IS_INVALID", currentPrefix)); //$NON-NLS-1$
-        return false;
-      }
-    }
-
-    for (int i = 0; i < infoList.size(); i++)
-    {
-      NamespaceInfo info = (NamespaceInfo)infoList.get(i);
-      if (((String)checkedList.get(i)).equals("true")) //$NON-NLS-1$
-      {
-        String aPrefix = info.prefix.trim();
-        if (aPrefix.length() > 0)
-        {
-          if (!prefixList.contains(aPrefix))
-          {
-            if (validatePrefix(aPrefix))
-            {
-              prefixList.add(aPrefix);
-            }
-            else
-            {
-              setErrorMessage(WSDLEditorPlugin.getWSDLString("_UI_ERROR_PREFIX_IS_INVALID", info.prefix)); //$NON-NLS-1$
-              test = false;
-              break;
-            }
-          }
-          else
-          {
-            setErrorMessage(WSDLEditorPlugin.getWSDLString("_UI_ERROR_PREFIX_IS_A_DUPLICATE", info.prefix)); //$NON-NLS-1$
-            test = false;
-            break;
-          }
-        }
-        else
-        {
-          if (!isOneBlank)
-          {
-            isOneBlank = true;
-          }
-          else
-          {
-            setErrorMessage(WSDLEditorPlugin.getWSDLString("_UI_ERROR_MORE_THAN_ONE_PREFIX_IS_BLANK")); //$NON-NLS-1$
-            test = false;
-            break;
-          }
-        }
-      }
-    }
-    return test;
-  }
-  */
-
-  protected DelayedEvent delayedTask;
-  protected void startDelayedEvent(ModifyEvent e)
-  {
-    if (delayedTask == null || delayedTask.getEvent() == null)
-    {
-      delayedTask = new DelayedEvent();
-      delayedTask.setEvent(e);
-      Display.getDefault().timerExec(500, delayedTask);
-    }
-    else
-    {
-      ModifyEvent delayedEvent = delayedTask.getEvent();
-
-      if (e.widget == delayedEvent.widget)
-      {
-        // same event, just different data, delay new event
-        delayedTask.setEvent(null);
-      }
-      delayedTask = new DelayedEvent();
-      delayedTask.setEvent(e);
-      Display.getDefault().timerExec(500, delayedTask);
-    }
-  }
-
-  class DelayedEvent implements Runnable
-  {
-    protected ModifyEvent event;
-
-    /*
-     * @see Runnable#run()
-     */
-    public void run()
-    {
-      if (event != null)
-      {
-        setPageComplete(isPageComplete());
-        event = null;
-      }
-    }
-
-    public ModifyEvent getEvent()
-    {
-      return event;
-    }
-
-    public void setEvent(ModifyEvent event)
-    {
-      this.event = event;
-    }
-  }
-
-  public void widgetDefaultSelected(SelectionEvent e) {
-  }
-
-  public void widgetSelected(SelectionEvent e) {
-  	 if (e.widget == createSkeletonCheckBox) {
-  	 	if (createSkeletonCheckBox.getSelection()) {
-  	 		wsdlSkeletonGroup.setVisible(true);
-  	 		sepLabel.setVisible(true);
-  	 		protocolPageBook.setVisible(true);
-  	 	}
-  	 	else {
-  	 		wsdlSkeletonGroup.setVisible(false);
-  	 		sepLabel.setVisible(false);
-  	 		protocolPageBook.setVisible(false);
-  	 	}
-  	 }
-  }
-  
-  private static final String SOAP_PROTOCOL = "SOAP";
-  private static final String HTTP_PROTOCOL = "HTTP";
-  private static final String SOAP_RPC_ENCODED = WSDLEditorPlugin.getWSDLString("_UI_RADIO_RPC_ENCODED");
-  private static final String SOAP_RPC_LITERAL = WSDLEditorPlugin.getWSDLString("_UI_RADIO_RPC_LITERAL");
-  private static final String SOAP_DOCUMENT_LITERAL = WSDLEditorPlugin.getWSDLString("_UI_RADIO_DOCUMENT_LITERAL");
-  private static final String HTTP_POST = "HTTP POST";
-  private static final String HTTP_GET = "HTTP GET";
-
-  Composite wsdlSkeletonGroup;
-  Button createSkeletonCheckBox;
-  
-  Label sepLabel;
-  
-  private Label createLabel(Composite comp, String labelString) {
-    Label label = new Label(comp, SWT.LEFT);
-    label.setText(labelString);
-    GridData nsData = new GridData();
-    nsData.horizontalAlignment = GridData.FILL;
-    label.setLayoutData(nsData);
-    
-    return label;
-  }
-  
-  public Vector getNamespaceInfo() {
-		Vector namespaces = new Vector();
-  		
-  		// Add Default Namespaces
-		NamespaceInfo info1 = new NamespaceInfo();
-		info1.prefix = "wsdl";
-		info1.uri = "http://schemas.xmlsoap.org/wsdl/";
-		namespaces.addElement(info1);
-		
-		NamespaceInfo info8 = new NamespaceInfo();
-		info8.prefix = "xsd";
-		info8.uri = "http://www.w3.org/2001/XMLSchema";
-		namespaces.addElement(info8);
-		
-		return namespaces;
-  }
-  
-  public boolean getCreateSkeletonBoolean() {
-  	return createSkeletonCheckBox.getSelection();
-  }
-  
-  public String getProtocol() {
-  	return protocolCombo.getText();
-  }
-  
-  public Object[] getProtocolOptions() {
-  	Object bool[] = new Boolean[3];
-  	if (protocolCombo.getText().equals(SOAP_PROTOCOL)) {
-  		if (docLitRadio.getSelection()) {
-  			bool[0] = new Boolean(true);
-  		}
-  		else {
-  			bool[0] = new Boolean(false);
-  		}
-  		
-  		if (rpcLitRadio.getSelection()) {
-  			bool[2] = new Boolean(true);
-  		}
-  		else {
-  			bool[2] = new Boolean(false);
-  		}
-  	}
-  	else if (protocolCombo.getText().equals(HTTP_PROTOCOL)){
-  		if (httpGetRadio.getSelection()) {
-  			bool[0] = new Boolean(false);
-  		}
-  		else {
-  			bool[0] = new Boolean(true);
-  		}
-  	}
-  	
-  	return bool;
-  }
-  
-  public boolean isSoapDocLiteralProtocol() {
-  	if (getProtocol().equals(SOAP_PROTOCOL) && docLitRadio.getSelection()) {
-  		return true;
-  	}
-  	else {
-  		return false;
-  	}
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/WSDLNewFilePage.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/WSDLNewFilePage.java
deleted file mode 100644
index c50644770..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/WSDLNewFilePage.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.wizards;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-public class WSDLNewFilePage extends WizardNewFileCreationPage
-{
-  public WSDLNewFilePage(IStructuredSelection selection) 
-  {
-    super(WSDLEditorPlugin.getWSDLString("_UI_TITLE_NEW_WSDL_FILE"), selection); //$NON-NLS-1$
-    setTitle(WSDLEditorPlugin.getWSDLString("_UI_TITLE_NEW_WSDL_FILE")); //$NON-NLS-1$
-    setDescription(WSDLEditorPlugin.getWSDLString("_UI_LABEL_CREATE_NEW_WSDL_FILE")); //$NON-NLS-1$
-  }
-
-  public void createControl(Composite parent) 
-  {
-    // inherit default container and name specification widgets
-    super.createControl(parent);
-    this.setFileName(computeDefaultFileName());
-
-    setPageComplete(validatePage());
-  }
-  
-  protected boolean validatePage()
-  {
-    Path newName = new Path(getFileName());
-    String fullFileName = getFileName();
-    String extension = newName.getFileExtension();
-    if (extension == null || !extension.equalsIgnoreCase("wsdl"))  //$NON-NLS-1$
-    {
-      setErrorMessage(WSDLEditorPlugin.getWSDLString("_UI_ERROR_FILE_MUST_END_WITH_WSDL")); //$NON-NLS-1$
-      return false;
-    }
-    else 
-    {
-      setErrorMessage(null);
-    }
-
-    // check for file should be case insensitive
-    String sameName = existsFileAnyCase(fullFileName);
-    if (sameName != null) 
-    {
-//       String qualifiedFileName = getContainerFullPath().toString() + '/' + fullFileName;
-       setErrorMessage(WSDLEditorPlugin.getWSDLString("_UI_ERROR_FILE_ALREADY_EXISTS",  sameName)); //$NON-NLS-1$
-       return false;
-    }
-
-    
-    return super.validatePage();
-  }
-
-  public String defaultName = "NewWSDLFile"; //$NON-NLS-1$
-  public String defaultFileExtension = ".wsdl"; //$NON-NLS-1$
-  public String[] filterExtensions = { "*.wsdl"}; //$NON-NLS-1$
-
-
-  protected String computeDefaultFileName()
-  {
-    int count = 0;
-    String fileName = defaultName + defaultFileExtension;
-    IPath containerFullPath = getContainerFullPath();
-    if (containerFullPath != null)
-    {
-      while (true)
-      {
-        IPath path = containerFullPath.append(fileName);
-        // if (WorkbenchUtility.getWorkspace().getRoot().exists(path))
-        if (ResourcesPlugin.getWorkspace().getRoot().exists(path))
-        {
-          count++;
-          fileName = defaultName + count + defaultFileExtension;
-        }
-        else
-        {
-          break;
-        }
-      }
-    }
-    return fileName;
-  }
-
-  // returns true if file of specified name exists in any case for selected container
-  protected String existsFileAnyCase(String fileName)
-  {
-    if ( (getContainerFullPath() != null) && (getContainerFullPath().isEmpty() == false)
-          && (fileName.compareTo("") != 0))
-    {
-      //look through all resources at the specified container - compare in upper case
-      IResource parent = ResourcesPlugin.getWorkspace().getRoot().findMember(getContainerFullPath());
-      if (parent instanceof IContainer)
-      {
-        IContainer container = (IContainer) parent;
-        try
-        {
-          IResource[] members = container.members();
-          String enteredFileUpper = fileName.toUpperCase();
-          for (int i=0; i<members.length; i++)
-          {
-            String resourceUpperName = members[i].getName().toUpperCase();
-            if (resourceUpperName.equals(enteredFileUpper))
-            {  
-              return members[i].getName();    
-            }
-          }
-        }
-        catch (CoreException e)
-        {
-        }
-      }
-    }
-    return null;
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDDetailsViewerProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDDetailsViewerProvider.java
deleted file mode 100644
index 073604d63..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDDetailsViewerProvider.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.xsd;
-
-
-
-public class XSDDetailsViewerProvider // implements IDetailsViewerProvider
-{
-//  public Object getViewerKey(Object modelObject)
-//  {                              
-//    Object result = null;   
-//
-//    if (modelObject instanceof XSDConcreteComponent)
-//    {
-//      Element input = ((XSDConcreteComponent)modelObject).getElement();
-//
-//      if (inputEquals(input, XSDConstants.ELEMENT_ELEMENT_TAG, false))
-//      {
-//        result = "element";
-//      }
-//      else if (inputEquals(input, XSDConstants.ELEMENT_ELEMENT_TAG, true))
-//      {
-//        result = "elementRef";
-//      }
-//      else if (inputEquals(input, XSDConstants.SEQUENCE_ELEMENT_TAG, false) ||
-//                inputEquals(input, XSDConstants.CHOICE_ELEMENT_TAG, false) ||
-//                inputEquals(input, XSDConstants.ALL_ELEMENT_TAG, false))
-//      {
-//        result = "sequenceChoiceAll";
-//      }
-//      else if (inputEquals(input, XSDConstants.ATTRIBUTE_ELEMENT_TAG, false))
-//      {
-//        result = "attribute";
-//      }
-//      else if (inputEquals(input, XSDConstants.ATTRIBUTE_ELEMENT_TAG, true))
-//      {
-//        result = "attributeRef";
-//      }
-//      else if (inputEquals(input, XSDConstants.ATTRIBUTEGROUP_ELEMENT_TAG, false))
-//      {
-//        result = "attributeGroup";
-//      }
-//      else if (inputEquals(input, XSDConstants.ATTRIBUTEGROUP_ELEMENT_TAG, true))
-//      {
-//        result = "attributeGroupRef";
-//      }
-//      else if (inputEquals(input, XSDConstants.NOTATION_ELEMENT_TAG, false))
-//      {
-//        result = "notation";
-//      }
-//      else if (inputEquals(input, XSDConstants.GROUP_ELEMENT_TAG, false))
-//      {
-//        result = "group";
-//      }
-//      else if (inputEquals(input, XSDConstants.GROUP_ELEMENT_TAG, true))
-//      {
-//        result = "groupRef";
-//      }
-//      else if (inputEquals(input, XSDConstants.SCHEMA_ELEMENT_TAG, false))
-//      {
-//        result = "schema";
-//      }
-//      else if (inputEquals(input, XSDConstants.COMPLEXTYPE_ELEMENT_TAG, false))
-//      {
-//        result = "complexType";
-//      }
-//      else if (inputEquals(input, XSDConstants.DOCUMENTATION_ELEMENT_TAG, false))
-//      {
-//        result = "documentation";
-//      }
-//      else if (inputEquals(input, XSDConstants.APPINFO_ELEMENT_TAG, false))
-//      {
-//        result = "appInfo";
-//      }
-//      else if (inputEquals(input, XSDConstants.SIMPLECONTENT_ELEMENT_TAG, false))
-//      {
-//        if (input != null && input instanceof Element)
-//        {
-//          Element parentElement = (Element)input;
-//          XSDDOMHelper xsdDOMHelper = new XSDDOMHelper();
-//          Element derivedByNode = xsdDOMHelper.getDerivedByElement(parentElement);
-//          if (derivedByNode != null)
-//          {
-//            if (inputEquals(derivedByNode, XSDConstants.RESTRICTION_ELEMENT_TAG, false))
-//            {
-//              result = "simpleContent";
-//            }
-//            else if (inputEquals(derivedByNode, XSDConstants.EXTENSION_ELEMENT_TAG, false))
-//            {
-//              result = "simpleContent";
-//            }
-//          }
-//          else
-//          {
-//            result = "xsd";
-//          }
-//        }
-//      }
-//      else if (inputEquals(input, XSDConstants.COMPLEXCONTENT_ELEMENT_TAG, false))
-//      {
-//        if (input != null && input instanceof Element)
-//        {
-//          Element parentElement = (Element)input;
-//          XSDDOMHelper xsdDOMHelper = new XSDDOMHelper();
-//          Element derivedByNode = xsdDOMHelper.getDerivedByElement(parentElement);
-//          if (derivedByNode != null)
-//          {
-//            result = "simpleContent";
-//          }
-//          else
-//          {
-//            result = "xsd";
-//          }
-//        }
-//      }
-//      else if (inputEquals(input, XSDConstants.INCLUDE_ELEMENT_TAG, false))
-//      {
-//        result = "includeXSD";
-//      }
-//      else if (inputEquals(input, XSDConstants.IMPORT_ELEMENT_TAG, false))
-//      {
-//        result = "importXSD";
-//      }
-//      else if (inputEquals(input, XSDConstants.REDEFINE_ELEMENT_TAG, false))
-//      {
-//        result = "redefine";
-//      }
-//      else if (inputEquals(input, XSDConstants.LIST_ELEMENT_TAG, false))
-//      {
-//        result = "simpleBase";
-//      }
-//      else if (inputEquals(input, XSDConstants.UNION_ELEMENT_TAG, false))
-//      {
-//        result = "simpleBase";
-//      }
-//      else if (inputEquals(input, XSDConstants.RESTRICTION_ELEMENT_TAG, false))
-//      {
-//        result = getKeyForRestrictWindow(input);
-//      }
-//      else if (XSDDOMHelper.isFacet(input))
-//      {
-//        if (input != null && input instanceof Element)
-//        {
-//          Node parentElement = ((Element)input).getParentNode();
-//          if (inputEquals(parentElement, XSDConstants.RESTRICTION_ELEMENT_TAG, false))
-//          {
-//            result = getKeyForRestrictWindow(input);
-//          } 
-//        }
-//      }
-//      else if (inputEquals(input, XSDConstants.EXTENSION_ELEMENT_TAG, false))
-//      {
-//        if (input != null && input instanceof Element)
-//        {
-//          Node parentElement = ((Element)input).getParentNode();
-//          if (inputEquals(parentElement, XSDConstants.COMPLEXCONTENT_ELEMENT_TAG, false))
-//          {
-//            result = "simpleContent";
-//          }
-//          else if (inputEquals(parentElement, XSDConstants.SIMPLECONTENT_ELEMENT_TAG, false))
-//          {
-//            result = "simpleContent";
-//          }
-//          else
-//          {
-//            result = "xsd";            
-//          }
-//        }
-//      }
-//      else if (inputEquals(input, XSDConstants.PATTERN_ELEMENT_TAG, false))
-//      {
-//        result = "pattern";
-//      }
-//      else if (inputEquals(input, XSDConstants.ENUMERATION_ELEMENT_TAG, false))
-//      {
-//        result = "enum";
-//      }
-//      else if (inputEquals(input, XSDConstants.ANY_ELEMENT_TAG, false))
-//      {
-//        result = "anyElement";
-//      }
-//      else if (inputEquals(input, XSDConstants.ANYATTRIBUTE_ELEMENT_TAG, false))
-//      {
-//        result = "anyAttribute";
-//      }
-//      else if (inputEquals(input, XSDConstants.UNIQUE_ELEMENT_TAG, false))
-//      {
-//        result = "unique";
-//      }
-//      else if (inputEquals(input, XSDConstants.KEYREF_ELEMENT_TAG, false))
-//      {
-//        result = "keyRef";
-//      }
-//      else if (inputEquals(input, XSDConstants.SELECTOR_ELEMENT_TAG, false))
-//      {
-//        result = "selector";
-//      }
-//      else if (inputEquals(input, XSDConstants.FIELD_ELEMENT_TAG, false))
-//      {
-//        result = "field";
-//      }
-//      else if (inputEquals(input, XSDConstants.KEY_ELEMENT_TAG, false))
-//      {
-//        result = "key";
-//      }
-//      else
-//      {
-//        result = "xsd";
-//      }      
-//    }  
-//    else if (modelObject instanceof org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement)
-//    {
-//      result = "schema";
-//    }
-//
-//    return result;
-//  }                                                                
-//
-//
-//  public Viewer createViewer(Object modelObject, Composite parent, IEditorPart editorPart)
-//  {                                       
-//    Viewer viewer = null;
-//
-//    
-//    DesignViewer designViewer = new DesignViewer(editorPart);
-//    designViewer.setControl(parent);    
-//    if (modelObject instanceof XSDConcreteComponent)
-//    {
-//      Element elem = ((XSDConcreteComponent)modelObject).getElement();
-//      viewer = designViewer.createViewer(elem);
-////TODO port
-////      ((BaseWindow)viewer).setModelObject(modelObject);
-////      viewer.setInput(elem);
-//    }
-//    else if (modelObject instanceof org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement)
-//    {
-//      XSDSchemaExtensibilityElement schema = (XSDSchemaExtensibilityElement)modelObject;
-//      XSDSchema xsdSchema = schema.getSchema();
-//      Element elem = xsdSchema.getElement();
-//      viewer = designViewer.createViewer(elem);
-////TODO port
-////      ((BaseWindow)viewer).setModelObject(modelObject);
-////      viewer.setInput(elem);      
-//    }
-//    return viewer;
-//  }
-//
-//  protected boolean inputEquals(Object input, String tagname, boolean isRef)
-//  {
-//    return XSDDOMHelper.inputEquals(input, tagname, isRef);
-//  }
-//
-//  protected String getKeyForRestrictWindow(Object input)
-//  {
-//    // special case where SimpleType restriction is different than SimpleContent restriction
-//
-//    if (input != null && input instanceof Element)
-//    {
-//      Node parentElement = ((Element)input).getParentNode();
-//      if (inputEquals(parentElement, XSDConstants.SIMPLETYPE_ELEMENT_TAG, false))
-//      {
-//        return "simpleRestrict";
-//      }
-//      else if (inputEquals(parentElement, XSDConstants.SIMPLECONTENT_ELEMENT_TAG, false))
-//      {
-//        return "simpleRestrict";
-//      }
-//      else if (inputEquals(parentElement, XSDConstants.COMPLEXCONTENT_ELEMENT_TAG, false))
-//      {
-//        return "simpleContent";
-//      }
-//    }
-//    return "xsd";
-//  }
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDExtension.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDExtension.java
deleted file mode 100644
index fa840f539..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDExtension.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.xsd;
-                                           
-
-// import org.eclipse.emf.edit.provider.ItemProvider;
-// import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-// import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtension;
-import org.eclipse.wst.wsdl.ui.internal.xsd.actions.DeleteAction;
-import org.eclipse.wst.xsd.ui.internal.XSDEditorPlugin;
-import org.eclipse.wst.xsd.ui.internal.graph.model.Category;
-import org.eclipse.wst.xsd.ui.internal.provider.CategoryAdapter;
-import org.eclipse.wst.xsd.ui.internal.provider.XSDAdapterFactoryLabelProvider;
-import org.eclipse.wst.xsd.ui.internal.provider.XSDModelAdapterFactoryImpl;
-import org.eclipse.xsd.XSDConcreteComponent;
-
-
-//
-//
-public class XSDExtension implements WSDLEditorExtension
-{
-  XSDModelAdapterFactoryImpl xsdModelAdapterFactory;
-  XSDAdapterFactoryLabelProvider adapterFactoryLabelProvider;
-  
-  public XSDExtension()
-  {
-    xsdModelAdapterFactory = new XSDModelAdapterFactoryImpl();
-    adapterFactoryLabelProvider = new XSDAdapterFactoryLabelProvider(xsdModelAdapterFactory);
-  }
-  
-  public boolean isExtensionTypeSupported(int type)
-  {
-    return 
-           //CS comment these out until the port is complete
-           type == OUTLINE_TREE_CONTENT_PROVIDER || 
-           type == OUTLINE_LABEL_PROVIDER ||
-           type == PROPERTY_SOURCE_PROVIDER ||
-           type == PROPERTY_SECTION_DESCRIPTOR_PROVIDER ||
-           type == MENU_ACTION_CONTRIBUTOR ||
-           type == DETAILS_VIEWER_PROVIDER ||
-           type == EDIT_PART_FACTORY || 
-           type == TYPE_SYSTEM_PROVIDER ||
-           type == NODE_RECONCILER ||
-           type == NODE_ASSOCIATION_PROVIDER ||
-           type == MODEL_QUERY_CONTRIBUTOR;
-  }                                       
-
-  public boolean isApplicable(Object object)
-  {                     
-    return (object instanceof XSDSchemaExtensibilityElement || 
-            object instanceof XSDConcreteComponent ||
-            object instanceof CategoryAdapter ||
-            object instanceof Category);
-            // || object instanceof ItemProvider);
-  } 
-
-  public Object createExtensionObject(int type, WSDLEditor wsdlEditor)
-  {
-    Object result = null;
-    switch (type)
-    {
-      case OUTLINE_TREE_CONTENT_PROVIDER :
-      {
-        result = new XSDModelAdapterContentProvider(xsdModelAdapterFactory); 
-//        result = new XSDModelAdapterContentProvider();
-        // result = new AdapterFactoryContentProvider(XSDExtensionPlugin.getXSDSemanticItemProviderAdapterFactory());
-        break;
-      }
-      case OUTLINE_LABEL_PROVIDER :
-      {
-        result = new XSDLabelProvider(adapterFactoryLabelProvider);
-        // result = new AdapterFactoryLabelProvider(XSDExtensionPlugin.getXSDSemanticItemProviderAdapterFactory());
-        break;
-      }
-      case DETAILS_VIEWER_PROVIDER :
-      {
-        // result = new XSDDetailsViewerProvider();
-        result = null;
-        break;
-      }
-      case MENU_ACTION_CONTRIBUTOR :
-      {
-        result = new XSDMenuActionContributor(wsdlEditor);
-        break;
-      }
-      case TYPE_SYSTEM_PROVIDER :
-      {
-        result = new XSDTypeSystemProvider();
-        break;
-      }    
-      case EDIT_PART_FACTORY :
-      {
-        result = new XSDExtensionEditPartFactory();
-        break;
-      }
-      case NODE_RECONCILER :
-      {
-        result = new XSDNodeReconciler();
-        break;
-      }   
-      case NODE_ASSOCIATION_PROVIDER :
-      {
-        result = new XSDNodeAssociationProvider();
-        break;
-      }  
-      case MODEL_QUERY_CONTRIBUTOR :
-      {
-        //result = new XSDModelQueryContributor(wsdlEditor);
-        break;
-      }
-      case PROPERTY_SOURCE_PROVIDER:
-      {
-        result = new XSDPropertySourceProvider();
-        break;
-      }
-      case PROPERTY_SECTION_DESCRIPTOR_PROVIDER:
-      {
-        result = new XSDSectionDescriptorProvider();
-        break;
-      }
-      case XSD_DELETE_ACTION:
-      {
-        result = new DeleteAction(XSDEditorPlugin.getXSDString("_UI_ACTION_DELETE"));
-        break;
-      }
-    }
-    return result;
-  }
-} 
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDExtensionEditPartFactory.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDExtensionEditPartFactory.java
deleted file mode 100644
index 43c50c1ce..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDExtensionEditPartFactory.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.xsd;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject;
-import org.eclipse.wst.wsdl.ui.internal.xsd.graph.editparts.XSDSchemaDrillDownEditPart;
-import org.eclipse.wst.xsd.ui.internal.graph.editparts.XSDEditPartFactory;
-import org.eclipse.xsd.XSDSchema;
-
-public class XSDExtensionEditPartFactory extends XSDEditPartFactory
-{
-  public EditPart createEditPart(EditPart parent, Object model)
-  {
-    EditPart editPart = null;
-            
-    if (model instanceof XSDSchema && parent.getModel() instanceof WSDLGroupObject)
-    {         
-      editPart = new XSDSchemaDrillDownEditPart();
-      editPart.setModel(model);
-      editPart.setParent(parent);
-    }
-    else
-    {
-      editPart = super.createEditPart(parent, model);
-    }
- 
-    return editPart;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDLabelProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDLabelProvider.java
deleted file mode 100644
index 66474aa53..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDLabelProvider.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.xsd;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.xsd.ui.internal.provider.XSDAdapterFactoryLabelProvider;
-import org.eclipse.xsd.XSDSchema;
-
-
-
-/**
- * This version of the XSDLabelProvider is a modified version of the one in XSDEditor.
- * This provider only needs to handle nodes in the XML Schema namespace.
- * Other XML nodes (including comments, PIs etc) get handled by the 'main' provider.
- */
-public class XSDLabelProvider extends LabelProvider
-{
-  XSDAdapterFactoryLabelProvider adapterFactoryLabelProvider;
-  
-  /**
-   * Constructor for XSDLabelProvider.
-   */
-  public XSDLabelProvider(XSDAdapterFactoryLabelProvider adapterFactoryLabelProvider)
-  {
-    super();
-    this.adapterFactoryLabelProvider = adapterFactoryLabelProvider;
-  }
-  
-  /*
-   * @see ILabelProvider#getImage(Object)
-   */
-  public Image getImage(Object element)
-  {
-    if (element instanceof XSDSchemaExtensibilityElement)
-    {
-      element = ((XSDSchemaExtensibilityElement)element).getSchema().getElement();
-    }
-    return adapterFactoryLabelProvider.getImage(element);
-  }
-    
-  /*
-   * @see ILabelProvider#getText(Object)
-   */
-  public String getText(Object element)
-  {
-    // override text for xsd schema
-    if (element instanceof XSDSchema)
-    {
-      return ((XSDSchema)element).getTargetNamespace();
-    }
-    else
-    {
-    	// We don't call "adapterFactoryLabelProvider.getText(element)" because it will return a object.toString() if
-    	// there is no labelProvider....  but we don't want to display this 'garbage' info to the user.    	
-    	AdapterFactory adapterFactory = adapterFactoryLabelProvider.getAdapterFactory();
-        ILabelProvider labelProvider = (ILabelProvider)adapterFactory.adapt(element, ILabelProvider.class);
-        String text = "";
-        if (labelProvider != null) {
-        	text = labelProvider.getText(element);
-        }
-        
-        return text;
-    }
-  }
-
-}
-
-
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDMenuActionContributor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDMenuActionContributor.java
deleted file mode 100644
index 444acb575..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDMenuActionContributor.java
+++ /dev/null
@@ -1,381 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.xsd;
-                                      
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.gef.EditPart;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.wst.wsdl.Types;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.extension.IMenuActionContributor;
-import org.eclipse.wst.wsdl.ui.internal.graph.WSDLComponentViewer;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject;
-import org.eclipse.wst.wsdl.ui.internal.xsd.actions.AddSchemaAction;
-import org.eclipse.wst.wsdl.ui.internal.xsd.actions.BackAction;
-import org.eclipse.wst.xml.core.internal.document.DocumentImpl;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xsd.ui.internal.XSDEditorPlugin;
-import org.eclipse.wst.xsd.ui.internal.XSDMenuListener;
-import org.eclipse.wst.xsd.ui.internal.actions.CreateElementAction;
-import org.eclipse.wst.xsd.ui.internal.actions.CreateGroupAction;
-import org.eclipse.wst.xsd.ui.internal.actions.DOMAttribute;
-import org.eclipse.wst.xsd.ui.internal.gef.util.editparts.AbstractComponentViewerRootEditPart;
-import org.eclipse.wst.xsd.ui.internal.graph.editparts.TopLevelComponentEditPart;
-import org.eclipse.wst.xsd.ui.internal.graph.model.Category;
-import org.eclipse.wst.xsd.ui.internal.provider.CategoryAdapter;
-import org.eclipse.wst.xsd.ui.internal.util.XSDDOMHelper;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class XSDMenuActionContributor implements IMenuActionContributor
-{
-  Element currElement;
-  Document currDocument;
-//  XSDSchema xsdSchema;
-//  protected ISelectionProvider iSelectionProvider;
-  WSDLEditor wsdlEditor;
-
-  public XSDMenuActionContributor(WSDLEditor wsdlEditor)
-  {
-    this.wsdlEditor = wsdlEditor;
-  }
-
-  public void contributeMenuActions(IMenuManager manager, Node node, Object object)
-  {
-    XSDMenuExtensionListener xsdMenuListener = new XSDMenuExtensionListener(wsdlEditor.getSelectionManager());
-    xsdMenuListener.contributeMenuActions(manager, node, object);
-  }
-
-  class XSDMenuExtensionListener extends XSDMenuListener
-  {
-    public XSDMenuExtensionListener(ISelectionProvider selectionProvider)
-    {
-      super(selectionProvider);
-    }
-    
-    protected boolean isSchemaReadOnly()
-    {
-    	Iterator eeIt = wsdlEditor.getDefinition().getETypes().getEExtensibilityElements().iterator();
-    	while (eeIt.hasNext()) {
-    		XSDSchemaExtensibilityElement ee = (XSDSchemaExtensibilityElement) eeIt.next();
-    		XSDSchema schema = ee.getSchema();
-    		if (schema == xsdSchema) {
-    			return false;
-    		}
-    	}
-    	
-    	
-    	return true;
-    }
-
-    /*
-     * TODO: For now, just return the first inline schema we have.
-     */
-    protected XSDSchema getCurrentSchemaInEditor()
-    {
-    	Iterator eeIt = wsdlEditor.getDefinition().getETypes().getEExtensibilityElements().iterator();
-    	while (eeIt.hasNext()) {
-    		XSDSchemaExtensibilityElement ee = (XSDSchemaExtensibilityElement) eeIt.next();
-    		return ee.getSchema();    		
-    	}
-    
-      return null;
-    }
-    
-    public void contributeMenuActions(IMenuManager manager, Node node, Object object)
-    {
-      updateXSDSchema();
-      AbstractComponentViewerRootEditPart editPart = (AbstractComponentViewerRootEditPart)wsdlEditor.getGraphViewer().getComponentViewer().getRootEditPart().getContents();
-//    iSelectionProvider = ((WSDLContentOutlinePage)(wsdlEditor.getWSDLTextEditor().getContentOutlinePage())).getTreeViewer();
-      EditPart focusEditPart = wsdlEditor.getGraphViewer().getComponentViewer().getFocusEditPart();
-
-      if (object instanceof WSDLGroupObject)
-      {
-        WSDLGroupObject group = (WSDLGroupObject)object;
-        if (group.getType() == WSDLGroupObject.TYPES_GROUP)
-        {
-          boolean typesExist = group.getParent().getTypes() != null;
-          
-          Element typesElement = null;
-          if (typesExist)
-          {
-            Types types = group.getParent().getETypes();
-            typesElement = types.getElement();
-          }
-          if (manager != null)
-          {
-            Document document = null;
-            if (editPart.getViewer() instanceof WSDLComponentViewer) {
-              WSDLComponentViewer wsdlComponentViewer = (WSDLComponentViewer) editPart.getViewer();
-              document = wsdlComponentViewer.getWSDLEditor().getXMLDocument();
-            }
-
-            manager.add(new AddSchemaAction(group.getDefinition(), (Element)node, typesElement, document));
-          }
-        }
-      } 
-      else if (object instanceof Types)
-      {
-        // IMenuManager menu = manager.findMenuUsingPath("addchild");
-
-        if (manager != null)
-        {
-          Types types = (Types)object;
-          manager.add(new AddSchemaAction(types.getEnclosingDefinition(), (Element)node));
-        }
-      }
-      
-      if (xsdSchema == null)
-      {
-        return;
-      }
-      
-      ArrayList attributes = null;
-      Node relativeNode = null;
-      
-      BackAction backAction;
-      
-      if (object instanceof XSDSchema || focusEditPart instanceof TopLevelComponentEditPart || object instanceof Category)
-      {
-        backAction = new BackAction(WSDLEditorPlugin.getWSDLString("_UI_BACK_TO_DEFINITION"));
-        backAction.setDefinition(wsdlEditor.getDefinition());
-        backAction.setSelectionProvider(selectionProvider);
-        backAction.setRootEditPart(editPart);
-        backAction.setGraphViewer(wsdlEditor.getGraphViewer());
-        manager.add(backAction);
-        manager.add(new Separator());
-      }
-      else if (object instanceof XSDConcreteComponent)
-      {
-        backAction = new BackAction(XSDEditorPlugin.getXSDString("_UI_ACTION_BACK_TO_SCHEMA_VIEW"));
-        // backAction.setXSDSchema(((XSDConcreteComponent)object).getSchema());
-        backAction.setXSDSchema(xsdSchema);
-        backAction.setSelectionProvider(selectionProvider);
-        backAction.setRootEditPart(editPart);
-        backAction.setGraphViewer(wsdlEditor.getGraphViewer());
-        manager.add(backAction);
-        manager.add(new Separator());
-      }
-
-      // CS: I'm removing the 'object instanceof Element' case from this test
-      // for now the menu actions are driven from 'model' objects
-      if (object instanceof XSDConcreteComponent || (object instanceof org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement))
-      {
-        Element parent;
-        if (object instanceof XSDConcreteComponent)
-        {
-          parent = ((XSDConcreteComponent)object).getElement();
-          xsdSchema = ((XSDConcreteComponent)object).getSchema();
-        }
-        else if (object instanceof Element)
-        {
-          manager.add(new Separator());
-          parent = (Element)object; 
-        }
-        else if (object instanceof org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement)
-        {
-          XSDSchemaExtensibilityElement schema = (XSDSchemaExtensibilityElement)object;
-          xsdSchema = schema.getSchema();
-          manager.add(new Separator());
-          parent = xsdSchema.getElement();
-        }
-        else
-        {
-          return;
-        }
-        
-        currElement = parent;
-        currDocument = parent.getOwnerDocument();
-        
-//        if (!(currDocument instanceof DocumentImpl))
-//        {
-//          return;
-//        }
-        
-        addContextItems(manager, currElement, null);
-
-        if (!(object instanceof XSDSchema) ||
-           	(object instanceof XSDSchema && !(wsdlEditor.getGraphViewer().getComponentViewer().getInput() instanceof XSDSchema))) {
-           	IStructuredSelection selections = (IStructuredSelection) wsdlEditor.getSelectionManager().getSelection();
-           	manager.add(new Separator());
-           	org.eclipse.wst.wsdl.ui.internal.actions.DeleteWSDLAndXSDAction deleteWSDLAndXSDAction = new org.eclipse.wst.wsdl.ui.internal.actions.DeleteWSDLAndXSDAction(selections.toList(), currElement, wsdlEditor);
-           	deleteWSDLAndXSDAction.setEnabled(!isReadOnly);
-           	manager.add(deleteWSDLAndXSDAction);
-        }
-      }
-      else if (object instanceof Category
-            || object instanceof CategoryAdapter)
-      {
-        int groupType = -1;
-
-        if (object instanceof Category)
-        {
-          Category cg = (Category)object;
-          xsdSchema = cg.getXSDSchema();
-          groupType = cg.getGroupType();
-        }
-        else  // CategoryAdapter
-        {
-          CategoryAdapter category = (CategoryAdapter)object;
-          groupType = category.getGroupType();
-          xsdSchema = category.getXSDSchema();
-        }
-        Element parent = xsdSchema.getElement();
-        currElement = parent;
-        currDocument = parent.getOwnerDocument();
-        switch (groupType)
-        {
-          case Category.TYPES:
-          {
-            attributes = new ArrayList();
-            attributes.add(new DOMAttribute(XSDConstants.NAME_ATTRIBUTE, getNewGlobalTypeName("ComplexType")));
-            Action action = addCreateElementAction(manager, XSDConstants.COMPLEXTYPE_ELEMENT_TAG, XSDEditorPlugin.getXSDString("_UI_ACTION_ADD_COMPLEX_TYPE"), attributes, parent, relativeNode);
-            ((CreateElementAction)action).setIsGlobal(true);
-            attributes = new ArrayList();
-            attributes.add(new DOMAttribute(XSDConstants.NAME_ATTRIBUTE, getNewGlobalTypeName("SimpleType")));
-            Action action2 = addCreateSimpleTypeAction(manager, XSDConstants.SIMPLETYPE_ELEMENT_TAG, XSDEditorPlugin.getXSDString("_UI_ACTION_ADD_SIMPLE_TYPE"), attributes, parent, relativeNode);
-            ((CreateElementAction)action2).setIsGlobal(true);
-            break;
-          }
-          case Category.ELEMENTS:
-          {
-            attributes = new ArrayList();
-            attributes.add(new DOMAttribute(XSDConstants.NAME_ATTRIBUTE,
-                                            getNewGlobalName(XSDConstants.ELEMENT_ELEMENT_TAG, "GlobalElement")));
-            attributes.add(new DOMAttribute(XSDConstants.TYPE_ATTRIBUTE, getBuiltInStringQName()));
-            Action action = addCreateElementAction(manager, XSDConstants.ELEMENT_ELEMENT_TAG, XSDEditorPlugin.getXSDString("_UI_ACTION_ADD_ELEMENT"), attributes, parent, relativeNode);
-            ((CreateElementAction)action).setIsGlobal(true);
-            break;
-          }
-          case Category.GROUPS:
-          {
-            attributes = new ArrayList();
-            attributes.add(new DOMAttribute(XSDConstants.NAME_ATTRIBUTE,
-                                            getNewGlobalName(XSDConstants.GROUP_ELEMENT_TAG, "Group")));
-            CreateGroupAction groupAction = addCreateGroupAction(manager, XSDConstants.GROUP_ELEMENT_TAG, XSDEditorPlugin.getXSDString("_UI_ACTION_ADD_GROUP"), attributes, parent, relativeNode);
-            groupAction.setIsGlobal(true);
-            break;
-          }
-          case Category.ATTRIBUTES:
-          {
-            attributes = new ArrayList();
-            attributes.add(new DOMAttribute(XSDConstants.NAME_ATTRIBUTE,
-                                            getNewGlobalName(XSDConstants.ATTRIBUTE_ELEMENT_TAG, "GlobalAttribute")));
-            attributes.add(new DOMAttribute(XSDConstants.TYPE_ATTRIBUTE, getBuiltInStringQName()));
-            Action action = addCreateElementAction(manager, XSDConstants.ATTRIBUTE_ELEMENT_TAG, XSDEditorPlugin.getXSDString("_UI_ACTION_ADD_GLOBAL_ATTRIBUTE"), attributes, parent, relativeNode);
-            ((CreateElementAction)action).setIsGlobal(true);
-            break;
-          }
-          case Category.ATTRIBUTE_GROUPS:
-          {
-            attributes = new ArrayList();
-            attributes.add(new DOMAttribute(XSDConstants.NAME_ATTRIBUTE,
-                                            getNewGlobalName(XSDConstants.ATTRIBUTEGROUP_ELEMENT_TAG, "AttributeGroup")));
-            Action action = addCreateElementAction(manager, XSDConstants.ATTRIBUTEGROUP_ELEMENT_TAG, XSDEditorPlugin.getXSDString("_UI_ACTION_ADD_ATTRIBUTE_GROUP"), attributes, parent, relativeNode);
-            ((CreateElementAction)action).setIsGlobal(true);
-            break; 
-          }
-          case Category.NOTATIONS:
-          {
-            attributes = new ArrayList();
-            attributes.add(new DOMAttribute(XSDConstants.NAME_ATTRIBUTE, 
-                           getNewGlobalName(XSDConstants.NOTATION_ELEMENT_TAG, "Notation")));
-            attributes.add(new DOMAttribute(XSDConstants.PUBLIC_ATTRIBUTE, ""));
-            Action action = addCreateElementAction(manager, XSDConstants.NOTATION_ELEMENT_TAG, XSDEditorPlugin.getXSDString("_UI_ACTION_ADD_NOTATION"), attributes, parent, relativeNode);
-            ((CreateElementAction)action).setIsGlobal(true);
-            break;
-          }
-          case Category.DIRECTIVES:
-          {
-            boolean b = true;
-            NodeList children = parent.getChildNodes();
-            Node effectiveRelativeNode = parent.getFirstChild();
-            for (int i=0; i < children.getLength() && b; i++)
-            {
-              Node child = children.item(i);
-              if (child != null && child instanceof Element)
-              {
-                if (XSDDOMHelper.inputEquals((Element)child, XSDConstants.INCLUDE_ELEMENT_TAG, false) ||
-                    XSDDOMHelper.inputEquals((Element)child, XSDConstants.IMPORT_ELEMENT_TAG, false) ||
-                    XSDDOMHelper.inputEquals((Element)child, XSDConstants.REDEFINE_ELEMENT_TAG, false) ||
-                    XSDDOMHelper.inputEquals((Element)child, XSDConstants.ANNOTATION_ELEMENT_TAG, false))
-                {
-                  effectiveRelativeNode = child;
-                }
-                else
-                {
-                  b = false;
-                }
-              }
-            }
-            relativeNode = effectiveRelativeNode != null ? effectiveRelativeNode.getNextSibling() : null;
-            attributes = new ArrayList();
-            attributes.add(new DOMAttribute(XSDConstants.SCHEMALOCATION_ATTRIBUTE, ""));
-
-            addCreateElementAction(manager, XSDConstants.INCLUDE_ELEMENT_TAG,XSDEditorPlugin.getXSDString("_UI_ACTION_ADD_INCLUDE"), attributes, parent, relativeNode);
-            addCreateElementAction(manager, XSDConstants.IMPORT_ELEMENT_TAG,XSDEditorPlugin.getXSDString("_UI_ACTION_ADD_IMPORT"), null, parent, relativeNode);
-            addCreateElementAction(manager, XSDConstants.REDEFINE_ELEMENT_TAG,XSDEditorPlugin.getXSDString("_UI_ACTION_ADD_REDEFINE"), attributes, parent, relativeNode);
-            
-            
-            break;
-          }
-        }
-      }
-    }    
-
-    protected IFile getFileResource()
-    {
-  ///// WSDL TODO
-  //    if (getEditor() != null)
-  //      return getEditor().getFileResource();
-      return null;
-    }
-
-//    protected Object getSelectedElement()
-//    {
-//      return currElement;
-//    }
-
-    protected XSDSchema getXSDSchema()
-    {
-      return xsdSchema;
-    }
-  
-    protected IDOMModel getXMLModel()
-    {
-      if (currElement != null)
-      {
-        Object obj = currElement.getOwnerDocument();
-        if (obj instanceof DocumentImpl)
-        {
-          DocumentImpl xmlDoc = (DocumentImpl) currElement.getOwnerDocument();
-          return xmlDoc.getModel();
-        }
-      }
-      return null;
-    }
-  }
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDModelAdapterContentProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDModelAdapterContentProvider.java
deleted file mode 100644
index 4271d7802..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDModelAdapterContentProvider.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.xsd;
-
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.xsd.ui.internal.provider.XSDContentProvider;
-import org.eclipse.wst.xsd.ui.internal.provider.XSDModelAdapterFactoryImpl;
-import org.eclipse.xsd.XSDConcreteComponent;
-
-
-public class XSDModelAdapterContentProvider extends XSDContentProvider
-{  
-  public XSDModelAdapterContentProvider(XSDModelAdapterFactoryImpl xsdModelAdapterFactory)
-  {
-    super(xsdModelAdapterFactory);
-  }
-
-  public Object[] getChildren(Object parentObject)
-  {                                     
-    XSDConcreteComponent xsdComp = null;
-    if (parentObject instanceof XSDSchemaExtensibilityElement)
-    {
-      XSDSchemaExtensibilityElement xsdSchemaExtensibilityElement = (XSDSchemaExtensibilityElement)parentObject;
-      xsdComp = xsdSchemaExtensibilityElement.getSchema();
-      return super.getChildren(xsdComp);
-    }
-    return super.getChildren(parentObject);    
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDNodeAssociationProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDNodeAssociationProvider.java
deleted file mode 100644
index 81367fd4d..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDNodeAssociationProvider.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.xsd;
-                                                                    
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.wsdl.ui.internal.extension.INodeAssociationProvider;
-import org.eclipse.wst.xsd.ui.internal.graph.model.Category;
-import org.eclipse.wst.xsd.ui.internal.provider.CategoryAdapter;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDSchema;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-class XSDNodeAssociationProvider implements INodeAssociationProvider
-{                    
-  public Object getModelObject(Object parentModelObject, Element[] elementChain, int start, int[] end)
-  {   
-    Object result = null;
-    if (parentModelObject instanceof XSDSchemaExtensibilityElement)
-    {
-      XSDSchemaExtensibilityElement extensibilityElement = (XSDSchemaExtensibilityElement)parentModelObject;
-      XSDSchema schema = extensibilityElement.getSchema();
-      if (schema != null)
-      {          
-        Element targetElement = elementChain[elementChain.length - 1];
-        result = schema.getCorrespondingComponent(targetElement);
-      }
-    }
-    else if (parentModelObject instanceof CategoryAdapter)
-    {
-      result = ((CategoryAdapter)parentModelObject).getXSDSchema();
-    }
-    else if (parentModelObject instanceof Category)
-    {
-      result = ((Category)parentModelObject).getXSDSchema();
-    }
-
-    return result;
-  }
-
-  public Node getNode(Object modelObject)
-  {        
-    Node node = null;
-    if (modelObject instanceof XSDSchemaExtensibilityElement)
-    {           
-      XSDSchemaExtensibilityElement extensibilityElement = (XSDSchemaExtensibilityElement)modelObject;
-      XSDSchema schema = extensibilityElement.getSchema();
-      if (schema != null)
-      {
-        node = schema.getElement();
-      }
-    }        
-    else if (modelObject instanceof XSDConcreteComponent)
-    {
-      node = ((XSDConcreteComponent)modelObject).getElement();
-    }
-    else if (modelObject instanceof CategoryAdapter)
-    {
-      node = ((CategoryAdapter)modelObject).getXSDSchema().getElement();
-    }
-    else if (modelObject instanceof Category)
-    {
-      node = ((Category)modelObject).getXSDSchema().getElement();
-    }
-    
-    return node;
-  }      
-} 
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDNodeReconciler.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDNodeReconciler.java
deleted file mode 100644
index d4a77c6f6..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDNodeReconciler.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.xsd;
-                                           
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.wsdl.ui.internal.extension.INodeReconciler;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.w3c.dom.Element;
-
-
-public class XSDNodeReconciler implements INodeReconciler
-{                    
-  public void notifyChanged(Object modelObject, Element element, int eventType, Object feature, Object oldValue, Object newValue, int index)
-  {                         
-    XSDConcreteComponent component = null;
-    if (modelObject instanceof XSDConcreteComponent)
-    {
-      component = (XSDConcreteComponent)modelObject;
-    }
-    else if (modelObject instanceof XSDSchemaExtensibilityElement)
-    {           
-      XSDSchemaExtensibilityElement extensibilityElement = (XSDSchemaExtensibilityElement)modelObject;
-      component = extensibilityElement.getSchema();
-    }   
-
-    if (component != null)
-    {
-      switch (eventType)
-      {
-        case INodeNotifier.CHANGE:
-        {                           
-          component.elementAttributesChanged(element); 
-          break;
-        }
-        case INodeNotifier.STRUCTURE_CHANGED:
-        {                              
-          component.elementContentsChanged(element);
-          break;
-        }
-        case INodeNotifier.CONTENT_CHANGED:
-        {                              
-          component.elementChanged(element);
-          break;
-        }
-      }                   
-    }
-  }
-}                                                                   
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDPropertySourceProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDPropertySourceProvider.java
deleted file mode 100644
index 95ff36ebc..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDPropertySourceProvider.java
+++ /dev/null
@@ -1,336 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.xsd;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.ui.provider.PropertySource;
-import org.eclipse.ui.views.properties.IPropertySource;
-import org.eclipse.ui.views.properties.IPropertySourceProvider;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.xsd.ui.internal.properties.AnyAttributePropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.AnyElementPropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.AppInfoPropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.AttributeGroupRefPropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.AttributePropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.BasePropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.ComplexTypePropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.DocumentationPropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.ElementPropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.EnumerationPropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.GroupRefPropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.ImportPropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.IncludePropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.KeyrefPropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.ModelGroupPropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.NamePropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.NotationPropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.PatternPropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.SchemaPropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.SimpleContentPropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.SimpleRestrictPropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.SimpleTypeListPropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.SimpleTypePropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.SimpleTypeUnionPropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.XPathPropertySource;
-import org.eclipse.wst.xsd.ui.internal.util.XSDDOMHelper;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class XSDPropertySourceProvider implements IPropertySourceProvider
-{
-  /* (non-Javadoc)
-   * @see org.eclipse.ui.views.properties.IPropertySourceProvider#getPropertySource(java.lang.Object)
-   */
-  public IPropertySource getPropertySource(Object object)
-  {
-// Using XSD's item providers
-//    XSDItemProviderAdapterFactory adapterFactory = XSDExtensionPlugin.getXSDItemProviderAdapterFactory();
-//   
-//    IItemPropertySource itemPropertySource =
-//      (IItemPropertySource)
-//        (object instanceof EObject && ((EObject)object).eClass() == null ?
-//          null :
-//          adapterFactory.adapt(object, IItemPropertySource.class));
-//    return 
-//    itemPropertySource != null ?  createPropertySource(object, itemPropertySource) : null;
-    
-    if (object == null) return null;
-    
-    if (object instanceof XSDSchemaExtensibilityElement)
-    {
-      object = ((XSDSchemaExtensibilityElement)object).getSchema();
-    }
-    if (object instanceof XSDConcreteComponent)
-    {
-      BasePropertySource bps = (BasePropertySource)getXSDPropertySource(object);
-      Element input = ((XSDConcreteComponent)object).getElement();
-      bps.setInput(input);
-      return bps;
-    }
-    return null;
-  }
-
-  protected IPropertySource createPropertySource(Object object, IItemPropertySource itemPropertySource)
-  {
-    return new PropertySource(object, itemPropertySource);
-  }
-  
-  protected boolean inputEquals(Object input, String tagname, boolean isRef)
-  {
-    return XSDDOMHelper.inputEquals(input, tagname, isRef);
-  }
-
-  boolean showParent = false;
-  
-  // TODO: We should use adapters to do this.  Do as we complete 'model'-based port
-  public IPropertySource getXSDPropertySource(Object object)
-  {
-    XSDSchema xsdSchema = ((XSDConcreteComponent)object).getSchema();
-    Element input = ((XSDConcreteComponent)object).getElement();
-
-    if (inputEquals(input, XSDConstants.ELEMENT_ELEMENT_TAG, false))
-    {
-      return new ElementPropertySource(xsdSchema);
-    }
-    else if (inputEquals(input, XSDConstants.ELEMENT_ELEMENT_TAG, true))
-    {
-      return new GroupRefPropertySource(xsdSchema);
-    }
-    else if (inputEquals(input, XSDConstants.SEQUENCE_ELEMENT_TAG, false) ||
-              inputEquals(input, XSDConstants.CHOICE_ELEMENT_TAG, false) ||
-              inputEquals(input, XSDConstants.ALL_ELEMENT_TAG, false))
-    {
-      return new ModelGroupPropertySource(xsdSchema);
-    }
-    else if (inputEquals(input, XSDConstants.ATTRIBUTE_ELEMENT_TAG, false))
-    {
-      return new AttributePropertySource(xsdSchema);
-    }
-    else if (inputEquals(input, XSDConstants.ATTRIBUTE_ELEMENT_TAG, true))
-    {
-      return new AttributeGroupRefPropertySource(xsdSchema);
-    }
-    else if (inputEquals(input, XSDConstants.ATTRIBUTEGROUP_ELEMENT_TAG, false))
-    {
-      return new NamePropertySource(xsdSchema);
-    }
-    else if (inputEquals(input, XSDConstants.ATTRIBUTEGROUP_ELEMENT_TAG, true))
-    {
-      return new AttributeGroupRefPropertySource(xsdSchema);
-    }
-    else if (inputEquals(input, XSDConstants.NOTATION_ELEMENT_TAG, false))
-    {
-      return new NotationPropertySource(xsdSchema);
-    }
-    else if (inputEquals(input, XSDConstants.SIMPLETYPE_ELEMENT_TAG, false))
-    {
-      return new SimpleTypePropertySource(xsdSchema);
-    }
-    else if (inputEquals(input, XSDConstants.GROUP_ELEMENT_TAG, false))
-    {
-      return new NamePropertySource(xsdSchema);
-    }
-    else if (inputEquals(input, XSDConstants.GROUP_ELEMENT_TAG, true))
-    {
-      return new GroupRefPropertySource(xsdSchema);
-    }
-    else if (inputEquals(input, XSDConstants.SCHEMA_ELEMENT_TAG, false))
-    {
-      return new SchemaPropertySource(xsdSchema);
-    }
-    else if (inputEquals(input, XSDConstants.COMPLEXTYPE_ELEMENT_TAG, false))
-    {
-      return new ComplexTypePropertySource(xsdSchema);
-    }
-    else if (inputEquals(input, XSDConstants.DOCUMENTATION_ELEMENT_TAG, false))
-    {
-      return new DocumentationPropertySource(xsdSchema);
-    }
-    else if (inputEquals(input, XSDConstants.APPINFO_ELEMENT_TAG, false))
-    {
-      return new AppInfoPropertySource(xsdSchema);
-    }
-    else if (inputEquals(input, XSDConstants.SIMPLECONTENT_ELEMENT_TAG, false))
-    {
-      if (input != null && input instanceof Element)
-      {
-        Element parent = (Element)input;
-        XSDDOMHelper xsdDOMHelper = new XSDDOMHelper();
-        Element derivedByNode = xsdDOMHelper.getDerivedByElement(parent);
-        if (derivedByNode != null)
-        {
-          if (inputEquals(derivedByNode, XSDConstants.RESTRICTION_ELEMENT_TAG, false) || 
-              inputEquals(derivedByNode, XSDConstants.EXTENSION_ELEMENT_TAG, false))
-          {
-            return new SimpleContentPropertySource(xsdSchema);
-          }
-        }
-        else
-        {
-          return null;
-        }
-      }
-    }
-    else if (inputEquals(input, XSDConstants.COMPLEXCONTENT_ELEMENT_TAG, false))
-    {
-      if (input != null && input instanceof Element)
-      {
-        Element parent = (Element)input;
-        XSDDOMHelper xsdDOMHelper = new XSDDOMHelper();
-        Element derivedByNode = xsdDOMHelper.getDerivedByElement(parent);
-        if (derivedByNode != null)
-        {
-          return new SimpleContentPropertySource(xsdSchema);
-        }
-        else
-        {
-          return null;
-        }
-      }
-    }
-    else if (inputEquals(input, XSDConstants.INCLUDE_ELEMENT_TAG, false))
-    {
-//      if (editor instanceof XSDEditor)
-//      {
-//        IFile inputFile = ((IFileEditorInput)editor.getEditorInput()).getFile();
-        IFile inputFile = null;
-        return new IncludePropertySource(xsdSchema, inputFile);
-//      }
-//      return null;
-    }
-    else if (inputEquals(input, XSDConstants.IMPORT_ELEMENT_TAG, false))
-    {
-//      if (editor instanceof XSDEditor)
-//      {
-//        IFile inputFile = ((IFileEditorInput)editor.getEditorInput()).getFile();
-      IFile inputFile = null;
-        return new ImportPropertySource(xsdSchema, inputFile);
-//      }
-//      return null;
-    }
-    else if (inputEquals(input, XSDConstants.REDEFINE_ELEMENT_TAG, false))
-    {
-//      if (editor instanceof XSDEditor)
-//       {
-//        IFile inputFile = ((IFileEditorInput)editor.getEditorInput()).getFile();
-      IFile inputFile = null;
-        return new IncludePropertySource(xsdSchema, inputFile);
-//      }
-//      return null;
-    }
-    else if (inputEquals(input, XSDConstants.LIST_ELEMENT_TAG, false))
-    {
-      return new SimpleTypeListPropertySource(xsdSchema);
-    }
-    else if (inputEquals(input, XSDConstants.UNION_ELEMENT_TAG, false))
-    {
-      return new SimpleTypeUnionPropertySource(xsdSchema);
-    }
-    else if (inputEquals(input, XSDConstants.RESTRICTION_ELEMENT_TAG, false))
-    {
-      return createRestrictWindow(input, xsdSchema);
-    }
-    else if (XSDDOMHelper.isFacet(input))
-    {
-      if (input != null && input instanceof Element)
-      {
-        Node parent = ((Element)input).getParentNode();
-        if (inputEquals(parent, XSDConstants.RESTRICTION_ELEMENT_TAG, false))
-        {
-          return createRestrictWindow(input, xsdSchema);
-        } 
-      }
-    }
-    else if (inputEquals(input, XSDConstants.EXTENSION_ELEMENT_TAG, false))
-    {
-      if (input != null && input instanceof Element)
-      {
-        Node parent = ((Element)input).getParentNode();
-        if (inputEquals(parent, XSDConstants.COMPLEXCONTENT_ELEMENT_TAG, false)
-            || inputEquals(parent, XSDConstants.SIMPLECONTENT_ELEMENT_TAG, false))
-        {
-          showParent = true;
-          return new SimpleContentPropertySource(xsdSchema);
-        }
-      }
-    }
-    else if (inputEquals(input, XSDConstants.PATTERN_ELEMENT_TAG, false))
-    {
-      return new PatternPropertySource(xsdSchema);
-    }
-    else if (inputEquals(input, XSDConstants.ENUMERATION_ELEMENT_TAG, false))
-    {
-      return new EnumerationPropertySource(xsdSchema);
-    }
-    else if (inputEquals(input, XSDConstants.ANY_ELEMENT_TAG, false))
-    {
-      return new AnyElementPropertySource(xsdSchema);
-    }
-    else if (inputEquals(input, XSDConstants.ANYATTRIBUTE_ELEMENT_TAG, false))
-    {
-      return new AnyAttributePropertySource(xsdSchema);
-    }
-    else if (inputEquals(input, XSDConstants.UNIQUE_ELEMENT_TAG, false))
-    {
-      return new NamePropertySource(xsdSchema);
-    }
-    else if (inputEquals(input, XSDConstants.KEYREF_ELEMENT_TAG, false))
-    {
-      return new KeyrefPropertySource(xsdSchema);
-    }
-    else if (inputEquals(input, XSDConstants.SELECTOR_ELEMENT_TAG, false))
-    {
-      return new XPathPropertySource(xsdSchema);
-    }
-    else if (inputEquals(input, XSDConstants.FIELD_ELEMENT_TAG, false))
-    {
-      return new XPathPropertySource(xsdSchema);
-    }
-    else if (inputEquals(input, XSDConstants.KEY_ELEMENT_TAG, false))
-    {
-      return new NamePropertySource(xsdSchema);
-    }
-    else
-    {
-      return null;
-    }
-    return null;
-  }
-  
-  protected IPropertySource createRestrictWindow(Object input, XSDSchema xsdSchema)
-  {
-    // special case where SimpleType restriction is different than SimpleContent restriction
-
-    if (input != null && input instanceof Element)
-    {
-      Node parent = ((Element)input).getParentNode();
-      if (inputEquals(parent, XSDConstants.SIMPLETYPE_ELEMENT_TAG, false))
-      {
-        return new SimpleRestrictPropertySource(xsdSchema);
-      }
-      else if (inputEquals(parent, XSDConstants.SIMPLECONTENT_ELEMENT_TAG, false))
-      {
-        return new SimpleRestrictPropertySource(xsdSchema);
-      }
-      else if (inputEquals(parent, XSDConstants.COMPLEXCONTENT_ELEMENT_TAG, false))
-      {
-        showParent = true;
-        return new SimpleContentPropertySource(xsdSchema);
-      }
-    }
-    return null;
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDSectionDescriptorProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDSectionDescriptorProvider.java
deleted file mode 100644
index 9b5f5a1d5..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDSectionDescriptorProvider.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.xsd;
-
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptorProvider;
-
-public class XSDSectionDescriptorProvider implements ISectionDescriptorProvider
-{
-  org.eclipse.wst.xsd.ui.internal.properties.section.XSDSectionDescriptorProvider descriptor;
-  /**
-   * 
-   */
-  public XSDSectionDescriptorProvider()
-  {
-    super();
-    descriptor = new org.eclipse.wst.xsd.ui.internal.properties.section.XSDSectionDescriptorProvider();
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptorProvider#getSectionDescriptors()
-   */
-  public ISectionDescriptor[] getSectionDescriptors()
-  {
-    return descriptor.getSectionDescriptors();
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDTempDetailsViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDTempDetailsViewer.java
deleted file mode 100644
index 1b01ef690..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDTempDetailsViewer.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.xsd;
-                                 
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.wst.wsdl.ui.internal.viewers.BaseViewer;
-       
-
-public class XSDTempDetailsViewer extends BaseViewer
-{   
-  protected Composite control;
-
-  public XSDTempDetailsViewer(Composite parent)
-  { 
-    super(null);
-    createControl(parent);
-  }
-              
-  public void doSetInput(Object input)
-  {    
-  }
-
-  public void createControl(Composite parent)
-  {
-    control = flatViewUtility.createComposite(parent, 1, true); 
-                                      
-    flatViewUtility.createFlatPageHeader(control, "XSDViewer");
-  }
-  
-  protected void update()
-  {
-  }
-
-  public Control getControl()
-  {
-    return control;
-  }
-
-  public void doHandleEvent(Event event)
-  {
-
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDTypeSystemProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDTypeSystemProvider.java
deleted file mode 100644
index 2d8fadfad..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDTypeSystemProvider.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.xsd;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.Types;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.wsdl.ui.internal.extension.ITypeSystemProvider;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.eclipse.wst.xsd.ui.internal.util.XSDDOMHelper;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDNamedComponent;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSchemaContent;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.impl.XSDImportImpl;
-
-//
-//
-public class XSDTypeSystemProvider implements ITypeSystemProvider
-{
-    public List getPrefixes(Definition definition, String namespace)
-    {
-        List list = new ArrayList();
-        Map map = definition.getNamespaces();
-        for (Iterator i = map.keySet().iterator(); i.hasNext();)
-        {
-            String prefix = (String) i.next();
-            String theNamespace = (String) map.get(prefix);
-            if (theNamespace != null && theNamespace.equals(namespace))
-            {
-                list.add(prefix);
-            }
-        }
-        return list;
-    }
-
-    public List getPrefixedNames(Definition definition, String namespace, String localName)
-    {
-        List list = new ArrayList();
-        for (Iterator i = getPrefixes(definition, namespace).iterator(); i.hasNext();)
-        {
-            String prefix = (String) i.next();
-            String name = (prefix != null && prefix.length() > 0) ? prefix + ":" + localName : localName;
-            list.add(name);
-        }
-        return list;
-    }
-
-    protected void addNamedComponents(Definition definition, List list, List namedComponents)
-    {
-        for (Iterator i = namedComponents.iterator(); i.hasNext();)
-        {
-            XSDNamedComponent component = (XSDNamedComponent) i.next();
-            list.addAll(getPrefixedNames(definition, component.getTargetNamespace(), component.getName()));
-        }
-    }
-
-    public void initWSIStyleImports(XSDSchema xsdSchema)
-    {
-        if (xsdSchema.getTargetNamespace() == null)
-        {
-            for (Iterator i = xsdSchema.getContents().iterator(); i.hasNext();)
-            {
-                XSDSchemaContent content = (XSDSchemaContent) i.next();
-                if (content instanceof XSDImportImpl)
-                {
-                    XSDImportImpl xsdImport = (XSDImportImpl) content;
-					XSDSchema schema = (XSDSchema)xsdImport.getResolvedSchema();					
-					if (schema == null)
-					{
-						schema = xsdImport.importSchema();
-					}             
-                }
-            }
-        }
-    }
-
-    public List getAvailableTypeNames(Definition definition, int typeNameCategory)
-    {
-        List list = new ArrayList();
-        
-        if (typeNameCategory == ITypeSystemProvider.BUILT_IN_TYPE) {
-        	list = getBuiltInTypeNamesList(definition);        	
-        }
-        else {
-        	Types types = definition.getETypes();
-        	if (types != null)
-        	{
-        		for (Iterator i = types.getEExtensibilityElements().iterator(); i.hasNext();)
-        		{
-        			Object o = i.next();
-        			if (o instanceof XSDSchemaExtensibilityElement)
-        			{
-        				XSDSchema schema = ((XSDSchemaExtensibilityElement) o).getSchema();
-        				if (schema != null)
-        				{
-        					initWSIStyleImports(schema);
-        					addNamedComponents(definition, list, schema.getTypeDefinitions());
-        				}
-        			}
-        		}
-        	}
-        
-        	for (Iterator i = definition.getEImports().iterator(); i.hasNext();)
-        	{
-        		Import theImport = (Import) i.next();
-        		XSDSchema schema = theImport.getESchema();
-        		if (schema != null)
-        		{
-        			addNamedComponents(definition, list, schema.getTypeDefinitions());
-        		}
-        	}
-        	list.addAll(getBuiltInTypeNamesList(definition));
-        }
-        
-		return list;        
-    }
-    
-    public List getAvailableTypes(Definition definition, XSDSchema schema, int typeNameCategory)
-    {
-        List keepTypes = new ArrayList();
-        Iterator typeIterator = schema.getTypeDefinitions().iterator();
-        // Filter out unwanted Types
-        if (typeNameCategory == ITypeSystemProvider.USER_DEFINED_COMPLEX_TYPE) {
-        	while (typeIterator.hasNext()) {
-        		Object type = typeIterator.next();
-        		if (type instanceof XSDComplexTypeDefinition) {
-        			keepTypes.add(type);
-        		}
-        	}
-        }
-        else if (typeNameCategory == ITypeSystemProvider.USER_DEFINED_SIMPLE_TYPE) {
-        	while (typeIterator.hasNext()) {
-        		Object type = typeIterator.next();
-        		if (type instanceof XSDSimpleTypeDefinition) {
-        			keepTypes.add(type);
-        		}
-        	}
-        }
-        
-        //addNamedComponents(definition, list, keepTypes);        
-        //return list;
-        return keepTypes;
-    }
-
-    public java.util.List getBuiltInTypeNamesList(Definition definition)
-    {
-        List items = new ArrayList();
-        if (definition != null)
-        {
-            List prefixes = getPrefixes(definition, WSDLConstants.XSD_NAMESPACE_URI);
-            for (Iterator i = prefixes.iterator(); i.hasNext();)
-            {
-                String prefix = (String) i.next();
-                for (int j = 0; j < XSDDOMHelper.dataType.length; j++)
-                {
-                    String localName = XSDDOMHelper.dataType[j][0];
-                    String name = (prefix != null && prefix.length() > 0) ? prefix + ":" + localName : localName;
-                    items.add(name);
-                }
-            }
-        }
-        return items;
-    }
-    public List getAvailableElementNames(Definition definition)
-    {
-        List list = new ArrayList();
-        Types types = definition.getETypes();
-        if (types != null)
-        {
-            for (Iterator i = types.getEExtensibilityElements().iterator(); i.hasNext();)
-            {
-                Object o = i.next();
-                if (o instanceof XSDSchemaExtensibilityElement)
-                {
-                    XSDSchema schema = ((XSDSchemaExtensibilityElement) o).getSchema();
-                    if (schema != null)
-                    {
-						initWSIStyleImports(schema);
-                        addNamedComponents(definition, list, schema.getElementDeclarations());
-                    }
-                }
-            }
-        }
-        
-        for (Iterator i = definition.getEImports().iterator(); i.hasNext();)
-        {
-            Import theImport = (Import) i.next();
-            XSDSchema schema = theImport.getESchema();
-            if (schema != null)
-            {
-                addNamedComponents(definition, list, schema.getElementDeclarations());
-            }
-        }
-        return list;
-    }
-    public int getCategoryForTypeName(Definition definition, String typeName)
-    {
-        return 0;
-    }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/actions/AddSchemaAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/actions/AddSchemaAction.java
deleted file mode 100644
index 9037b3c7f..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/actions/AddSchemaAction.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.xsd.actions;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.actions.AddElementAction;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class AddSchemaAction extends AddElementAction
-{
-  protected String targetNamespace;
-  protected boolean createTypesElement = false;
-
-  public AddSchemaAction(Definition definition, Element definitionElement)
-  {
-    this(definition, definitionElement, false);
-  }
-
-  public AddSchemaAction(Definition definition, Element definitionElement, boolean createTypesElement)
-  {
-    super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_SCHEMA"), "icons/xsd_obj.gif", definitionElement, "xsd:schema");                       
-    this.createTypesElement = createTypesElement;
-    targetNamespace = definition.getTargetNamespace();    
-  }
-
-  public AddSchemaAction(Definition definition, Element definitionElement, Element typesElement)
-  {
-    super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_SCHEMA"), "icons/xsd_obj.gif", definitionElement, "xsd:schema");                       
-    if (typesElement != null)
-    {
-      parentNode =  typesElement;
-      this.createTypesElement = false;
-    }
-    else
-    {
-      this.createTypesElement = true;      
-    }
-    targetNamespace = definition.getTargetNamespace();    
-  }
-
-  public AddSchemaAction(Definition definition, Element definitionElement, Element typesElement, Document document)
-  {
-  	this(definition, definitionElement, typesElement);
-  	this.definition = definition;
-  	this.document = document;
-  }
-  
-  protected boolean showDialog()
-  {
-    return true;
-  }
-
-  protected void addAttributes(Element newElement)
-  {                                               
-    newElement.setAttribute("xmlns:xsd", XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001);
-    newElement.setAttribute("elementFormDefault", "qualified");
-    newElement.setAttribute("targetNamespace", targetNamespace);
-  }
-
-  public void run()
-  {
-  	beginRecording();
-  	if (parentNode == null || (document != null && document.getChildNodes().getLength() == 0)) {
-  		createDefinitionStub();
-  		prefix = null;
-  		targetNamespace = definition.getTargetNamespace();
-  	}
-  	
-    if (createTypesElement)
-    {
-      AddElementAction addTypesAction = new AddElementAction("", "icons/xsd_obj.gif", parentNode, parentNode.getPrefix(), "types");
-      addTypesAction.setComputeTopLevelRefChild(true);
-      addTypesAction.run();
-      parentNode =  addTypesAction.getNewElement();
-    } 
-    super.run();
-    endRecording();
-  }     
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/actions/BackAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/actions/BackAction.java
deleted file mode 100644
index 975790466..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/actions/BackAction.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.xsd.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ui.internal.graph.WSDLGraphViewer;
-import org.eclipse.wst.xsd.ui.internal.gef.util.editparts.AbstractComponentViewerRootEditPart;
-import org.eclipse.xsd.XSDSchema;
-
-public class BackAction extends Action
-{
-  ISelectionProvider selectionProvider;
-  XSDSchema xsdSchema;
-  Definition definition;
-  WSDLGraphViewer graphViewer;
-  
-  /**
-   * 
-   */
-  public BackAction()
-  {
-    super();
-  }
-
-  /**
-   * @param text
-   */
-  public BackAction(String text)
-  {
-    super(text);
-  }
-
-  /**
-   * @param text
-   * @param image
-   */
-  public BackAction(String text, ImageDescriptor image)
-  {
-    super(text, image);
-  }
-
-  /**
-   * @param text
-   * @param style
-   */
-  public BackAction(String text, int style)
-  {
-    super(text, style);
-  }
-
-  public void setSelectionProvider(ISelectionProvider selectionProvider)
-  {
-    this.selectionProvider = selectionProvider;
-  }
-  
-  AbstractComponentViewerRootEditPart editPart;
-  public void setRootEditPart(AbstractComponentViewerRootEditPart editPart)
-  {
-    this.editPart = editPart;
-  }
-
-  public void setDefinition(Definition definition)
-  {
-    this.definition = definition;
-  }
-  
-  public void setXSDSchema(XSDSchema xsdSchema)
-  {
-    this.xsdSchema = xsdSchema;
-  }
-  
-  public void setGraphViewer(WSDLGraphViewer graphViewer)
-  {
-    this.graphViewer = graphViewer;
-  }
-  
-  /*
-   * @see IAction#run()
-   */
-  public void run()
-  {
-    if (xsdSchema != null)
-    {
-      StructuredSelection selection = new StructuredSelection(xsdSchema);
-      selectionProvider.setSelection(selection);
-      // editPart.setInput(xsdSchema);
-      graphViewer.setInput(xsdSchema);
-    }
-    else if (definition != null)
-    {
-      StructuredSelection selection = new StructuredSelection(definition);
-      selectionProvider.setSelection(selection);
-      // editPart.setInput(definition);
-      graphViewer.setInput(definition);
-    }
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/actions/DeleteAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/actions/DeleteAction.java
deleted file mode 100644
index b4e8fcf0b..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/actions/DeleteAction.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.xsd.actions;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ui.internal.actions.DeleteInterfaceAction;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.xml.core.internal.document.DocumentImpl;
-import org.eclipse.wst.xsd.ui.internal.XSDEditorPlugin;
-import org.eclipse.wst.xsd.ui.internal.util.TypesHelper;
-import org.eclipse.wst.xsd.ui.internal.util.XSDDOMHelper;
-import org.eclipse.xsd.XSDComponent;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDImport;
-import org.eclipse.xsd.XSDInclude;
-import org.eclipse.xsd.XSDRedefine;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-// Should try to use xsdeditor's delete action....
-
-public class DeleteAction extends Action implements DeleteInterfaceAction
-{
-  XSDSchema xsdSchema;
-  Definition definition;
-  List deleteList;
-  
-  /**
-   * Constructor for DeleteAction.
-   * @param text
-   */
-  public DeleteAction(String text)
-  {
-    super(XSDEditorPlugin.getXSDString("_UI_ACTION_DELETE"));
-  }
-
-  public XSDSchema getSchema()
-  {
-    return xsdSchema;
-  }
-
-  public void setSchema(XSDSchema xsdSchema)
-  {
-    this.xsdSchema = xsdSchema;
-  }
-
-  public void setDeleteList(List list) {
-  	deleteList = list;
-  }
-  
-  public List getDeleteList() {
-  	return deleteList;
-  }
-
-  /*
-   * @see IAction#run()
-   */
-  public void run()
-  {
-    List selections = getDeleteList();
-    
-    if (selections.isEmpty())
-    {
-      return;
-    }
-    
-    Iterator iter = selections.iterator();
-    DocumentImpl doc = null;
-    while (iter.hasNext())
-    {
-      Object obj = iter.next();
-      Element node;
-      if (obj instanceof Element)
-      {
-        node = (Element)obj;
-        Object elem = WSDLEditorUtil.getInstance().findModelObjectForElement(definition, node);
-        if (elem instanceof XSDComponent)
-        {
-          xsdSchema = ((XSDComponent)elem).getSchema();
-        }        
-      }
-      else if (obj instanceof XSDComponent)
-      {
-        node = ((XSDComponent)obj).getElement();
-        xsdSchema = ((XSDComponent)obj).getSchema();
-      }
-      else if (obj instanceof XSDConcreteComponent) {
-      	node = ((XSDConcreteComponent)obj).getElement();
-      	xsdSchema = ((XSDConcreteComponent)obj).getSchema();
-      }
-      else
-      {
-        return; 
-      }
-        
-      if (!XSDDOMHelper.inputEquals(node, XSDConstants.SCHEMA_ELEMENT_TAG, false))
-      {
-        
-        if (doc == null)
-        {
-          doc = (DocumentImpl) node.getOwnerDocument();
-          doc.getModel().beginRecording(this, XSDEditorPlugin.getXSDString("_UI_ACTION_DELETE_NODES"));
-        }
-  
-        boolean refresh = cleanupReferences(node);
-        XSDDOMHelper.removeNodeAndWhitespace(node);
-        
-        // Workaround to reset included elements in XSD model
-        if (refresh)
-        {
-// TODO
-//          getEditor().reparseSchema();
-//          getEditor().getGraphViewer().setSchema(getEditor().getXSDSchema());
-        }
-      }
-    }
-    if (doc != null)
-    {
-      doc.getModel().endRecording(this);
-    }
-  }
-
-  protected boolean cleanupReferences(Node deletedNode)
-  {
-    boolean refresh = false;
-    XSDConcreteComponent comp = getSchema().getCorrespondingComponent(deletedNode);
-    
-    if (comp instanceof XSDInclude ||
-        comp instanceof XSDImport ||
-        comp instanceof XSDRedefine)
-    {
-//      XSDSchema resolvedSchema = ((XSDSchemaDirective)comp).getResolvedSchema();
-      XSDSchema referencedSchema = null;
-      if (comp instanceof XSDInclude)
-      {
-        referencedSchema = ((XSDInclude)comp).getIncorporatedSchema();
-        refresh = true;
-      }
-      else if (comp instanceof XSDRedefine)
-      {
-        referencedSchema = ((XSDRedefine)comp).getIncorporatedSchema();
-        refresh = true;
-      }
-      else if (comp instanceof XSDImport)
-      {
-         referencedSchema = ((XSDImport)comp).getResolvedSchema();
-      }
-
-      if (referencedSchema != null)
-      {
-//        XSDExternalFileCleanup cleanHelper = new XSDExternalFileCleanup(referencedSchema);
-//        cleanHelper.visitSchema(getSchema());
-//        // populate messages
-//// TODO
-////        getEditor().createTasksInTaskList(cleanHelper.getMessages());
-      }
-      if (comp instanceof XSDImport)
-      {
-        TypesHelper typesHelper = new TypesHelper(getSchema());
-        typesHelper.updateMapAfterDelete((XSDImport)comp);
-      }
-    }
-    else if (getSchema().equals(comp.getContainer()))
-    {
-//      BaseGlobalCleanup cleanHelper = null;
-   //   Only need to clean up references if the component being deleted is global scoped
-//      if (comp instanceof XSDElementDeclaration)
-//      {
-//        cleanHelper = new GlobalElementCleanup(comp);
-//      }
-//      else if (comp instanceof XSDModelGroupDefinition)
-//      {
-//        cleanHelper = new GlobalGroupCleanup(comp);
-//      }
-//      else if (comp instanceof XSDTypeDefinition)
-//      {
-//        cleanHelper = new GlobalSimpleOrComplexTypeCleanup(comp);
-//      }
-//      else if (comp instanceof XSDAttributeDeclaration)
-//      {
-//        cleanHelper = new GlobalAttributeCleanup(comp);
-//      }
-//      else if (comp instanceof XSDAttributeGroupDefinition)
-//      {
-//        cleanHelper = new GlobalAttributeGroupCleanup(comp);
-//      }
-//      
-//      
-//      if (cleanHelper != null)
-//      {
-//        cleanHelper.visitSchema(getSchema());
-//        // populate messages
-//// TODO
-////        getEditor().createTasksInTaskList(cleanHelper.getMessages());
-//      }
-    }
-    return refresh;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/graph/editparts/XSDSchemaDrillDownEditPart.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/graph/editparts/XSDSchemaDrillDownEditPart.java
deleted file mode 100644
index 9a6acfca2..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/graph/editparts/XSDSchemaDrillDownEditPart.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.xsd.graph.editparts;
-         
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.wst.wsdl.ui.internal.graph.editparts.DrillDownEditPart;
-import org.eclipse.wst.xsd.ui.internal.XSDEditorPlugin;
-import org.eclipse.xsd.XSDSchema;
-
-
-public class XSDSchemaDrillDownEditPart extends DrillDownEditPart 
-{                                 
-  protected IFigure createFigure()
-  {                                     
-    IFigure figure = super.createFigure();
-    label.setIcon(XSDEditorPlugin.getXSDImage("icons/XSDFile.gif"));
-    return figure;
-  }   
-
-  protected void refreshVisuals()
-  {                                       
-    XSDSchema schema = (XSDSchema)getModel();
-    String ns = schema.getTargetNamespace() != null ? schema.getTargetNamespace() : "";
-    label.setText(ns);
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/graph/editparts/XSDSchemaExtensibilityElementEditPart.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/graph/editparts/XSDSchemaExtensibilityElementEditPart.java
deleted file mode 100644
index c10245b7c..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/graph/editparts/XSDSchemaExtensibilityElementEditPart.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.xsd.graph.editparts;
-         
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartFactory;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.xsd.ui.internal.gef.util.figures.ContainerFigure;
-
-
-public class XSDSchemaExtensibilityElementEditPart extends AbstractGraphicalEditPart 
-{                                 
-  protected EditPartFactory factory;
-
-  public XSDSchemaExtensibilityElementEditPart(EditPartFactory factory)
-  {
-    this.factory = factory;
-  }
-
-  protected IFigure createFigure()
-  {                                     
-    ContainerFigure figure = new ContainerFigure();    
-    return figure;
-  }    
-
-  protected EditPart createChild(Object model) 
-  {
-    return factory.createEditPart(this, model);
-  }      
-
-  protected List getModelChildren() 
-  { 
-    XSDSchemaExtensibilityElement e = (XSDSchemaExtensibilityElement)getModel();
-    List result = new ArrayList();
-    result.add(e.getSchema());
-    return result;
-  }
- 
-  protected void createEditPolicies() 
-  {
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.validation/.classpath b/bundles/org.eclipse.wst.wsdl.validation/.classpath
deleted file mode 100644
index 2114c105e..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry excluding="wsdlvalidateui/|wsdlvalidate/" kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.wst.wsdl.validation/.cvsignore b/bundles/org.eclipse.wst.wsdl.validation/.cvsignore
deleted file mode 100644
index c171d6bf3..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/.cvsignore
+++ /dev/null
@@ -1,9 +0,0 @@
-bin
-build.xml
-temp.folder
-wsdlvalidate.jar
-wsdlvalidateui.jar
-wsdlvalidatesrc.zip
-wsdlvalidateuisrc.zip
-@dot
-src.zip
diff --git a/bundles/org.eclipse.wst.wsdl.validation/.project b/bundles/org.eclipse.wst.wsdl.validation/.project
deleted file mode 100644
index 9190c3717..000000000
--- 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/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.wst.wsdl.validation/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index e07a9a1c7..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,57 +0,0 @@
-#Mon Jan 30 19:34:49 EST 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/bundles/org.eclipse.wst.wsdl.validation/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.wsdl.validation/META-INF/MANIFEST.MF
deleted file mode 100644
index ff548045f..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,31 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %_PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.wst.wsdl.validation; singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.wst.wsdl.validation.internal.eclipse.ValidateWSDLPlugin
-Bundle-Vendor: %_PROVIDER_NAME
-Bundle-Localization: plugin
-Export-Package: .,
- org.eclipse.wst.wsdl.validation.internal,
- org.eclipse.wst.wsdl.validation.internal.eclipse,
- org.eclipse.wst.wsdl.validation.internal.exception,
- org.eclipse.wst.wsdl.validation.internal.resolver,
- org.eclipse.wst.wsdl.validation.internal.ui.ant,
- org.eclipse.wst.wsdl.validation.internal.ui.text,
- org.eclipse.wst.wsdl.validation.internal.util,
- org.eclipse.wst.wsdl.validation.internal.wsdl11,
- org.eclipse.wst.wsdl.validation.internal.wsdl11.http,
- org.eclipse.wst.wsdl.validation.internal.wsdl11.mime,
- org.eclipse.wst.wsdl.validation.internal.wsdl11.soap,
- org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd,
- org.eclipse.wst.wsdl.validation.internal.wsdl20,
- org.eclipse.wst.wsdl.validation.internal.xml
-Require-Bundle: org.eclipse.core.resources,
- org.apache.ant,
- org.eclipse.wst.common.uriresolver,
- org.eclipse.wst.validation,
- org.wsdl4j,
- org.apache.xerces;visibility:=reexport,
- org.eclipse.core.runtime
-Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.wst.wsdl.validation/about.html b/bundles/org.eclipse.wst.wsdl.validation/about.html
deleted file mode 100644
index 6f6b96c4c..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.validation/build.properties b/bundles/org.eclipse.wst.wsdl.validation/build.properties
deleted file mode 100644
index 4a6d5c538..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               plugin.properties,\
-               plugin.xml,\
-               .,\
-               about.html
-src.includes = exsd/,\
-               build.properties
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 13ab5583b..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/exsd/extvalidator.exsd
+++ /dev/null
@@ -1,132 +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>
-         The WSDL Extension Validator extension point allows clients to contribute a validator that provides custom validation logic for WSDL 1.1 documents.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="extvalidator"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified identifier of the target extension point
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  an optional identifier of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  an optional name of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="extvalidator">
-      <complexType>
-         <attribute name="namespace" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The WSDL namespace for which this validator should run. Currently the only accepted value is http://schemas.xmlsoap.org/wsdl/.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The class that implements &lt;code&gt;org.eclipse.wst.wsdl.validation.internal.IWSDLValidator&lt;/code&gt;.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="resourcebundle" type="string">
-            <annotation>
-               <documentation>
-                  An optional resource bundle that contains messages to be used by the extension validator.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         &lt;b&gt;This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.&lt;/b&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The following is an example of a WSDL Extension Validator contribution:
-&lt;pre&gt;
-   &lt;extension
-         id=&quot;wsdlWSIValidator&quot;
-         name=&quot;WSDL WS-I Validator&quot;
-         point=&quot;org.eclipse.wst.wsdl.validation.extvalidator&quot;&gt;
-      &lt;extvalidator
-            namespace=&quot;http://schemas.xmlsoap.org/wsdl/&quot;
-            class=&quot;org.eclipse.wst.wsi.internal.validate.wsdl.WSDLValidator&quot;
-            resourcebundle=&quot;wsivalidate&quot;&gt;
-      &lt;/extvalidator&gt;
-   &lt;/extension&gt;
-&lt;/pre&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         The supplied class must implement &lt;code&gt;org.eclipse.wst.wsdl.validation.internal.IWSDLValidator&lt;/code&gt;.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         &lt;code&gt;
-org.eclipse.wst.wsi.internal.validate.wsdl.WSDLValidator
-&lt;/code&gt;
-Contributes WS-I validation logic for the namespace http://schemas.xmlsoap.org/wsdl/.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2000, 2005 IBM Corporation and others.&lt;br&gt;
-All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
-this distribution, and is available at &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-      </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 14ed921e3..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/exsd/wsdl11validator.exsd
+++ /dev/null
@@ -1,137 +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>
-         The WSDL 1.1 Extension Validator extension point allows clients to contribute a validator for a specific namespace to WSDL 1.1 validation.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="validator"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified identifier of the target extension point
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  an optional identifier of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  an optional name of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="validator">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The class that implements &lt;code&gt;org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11Validator&lt;/code&gt;.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="namespace" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The namespace this validator will validate.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="resourcebundle" type="string">
-            <annotation>
-               <documentation>
-                  An optional resource bundle that contains messages to be used by the extension validator.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         &lt;b&gt;This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.&lt;/b&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The following is an example of a WSDL 1.1 Extension Validator contribution:
-&lt;pre&gt;
-   &lt;extension
-         point=&quot;org.eclipse.wst.wsdl.validation.wsdl11validator&quot;&gt;
-      &lt;validator
-            class=&quot;org.eclipse.wst.wsdl.validation.internal.wsdl11.http.HTTPValidator&quot;
-            namespace=&quot;http://schemas.xmlsoap.org/wsdl/http/&quot;
-            resourcebundle=&quot;validatewsdlhttp&quot;/&gt;
-   &lt;/extension&gt;
-&lt;/pre&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         The supplied class must implement &lt;code&gt;org.eclipse.wst.wsdl.validation.internal.wsdl11.WSDL11Validator&lt;/code&gt;.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         &lt;code&gt;
-org.eclipse.wst.wsdl.validation.internal.wsdl11.http.HTTPValdiator
-&lt;/code&gt;
-Contributes validation logic for the namespace http://schemas.xmlsoap.org/wsdl/http/.
-&lt;code&gt;
-org.eclipse.wst.wsdl.validation.internal.wsdl11.mime.MIMEValdiator
-&lt;/code&gt;
-Contributes validation logic for the namespace http://schemas.xmlsoap.org/wsdl/mime/.
-&lt;code&gt;
-org.eclipse.wst.wsdl.validation.internal.wsdl11.soap.SOAPValdiator
-&lt;/code&gt;
-Contributes validation logic for the namespace http://schemas.xmlsoap.org/wsdl/soap/.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2000, 2005 IBM Corporation and others.&lt;br&gt;
-All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
-this distribution, and is available at &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-      </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 d392f0e82..000000000
--- 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 7750fd907..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/plugin.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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
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 3406457b1..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/plugin.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-   <extension-point id="extvalidator" name="WSDL Extension Validator" schema="exsd/extvalidator.exsd"/>
-   
-   <extension-point id="wsdl11validator" name="WSDL 1.1 Extension Validator" schema="exsd/wsdl11validator.exsd"/>
-
-</plugin>
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/Constants.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/Constants.java
deleted file mode 100644
index afde1a451..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/Constants.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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/";
-  
-  /**
-   * The WSDL schema cache attribute allows an XMLGrammarPool object to be set for use in 
-   * inline schema validation.
-   */
-  public final static String XMLSCHEMA_CACHE_ATTRIBUTE = "http://www.eclipse.org/webtools/wsdl/schemacache";
-  
-  /**
-   * The WSDL schema cache attribute allows an XMLGrammarPool object to be set for use in 
-   * XML conformance validation.
-   */
-  public final static String XML_CACHE_ATTRIBUTE = "http://www.eclipse.org/webtools/wsdl/xmlcache";
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/ControllerValidationInfo.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/ControllerValidationInfo.java
deleted file mode 100644
index 34f4d51cf..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/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/org/eclipse/wst/wsdl/validation/internal/IValidationInfo.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/IValidationInfo.java
deleted file mode 100644
index 34e1581a0..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/IValidationInfo.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal;
-
-import org.eclipse.wst.wsdl.validation.internal.resolver.URIResolver;
-
-
-/**
- * An interface representing the current validation information.
- * This interface is not meant to be implemented by clients.
- */
-public interface IValidationInfo extends IValidationReport
-{
-  
-  /**
-   * Add an error message for this file. (Uses the URI from this validation info object.)
-   * 
-   * @param message The message for the error.
-   * @param line The line location of the error in the file.
-   * @param column The column location of the error in the file.
-   * @deprecated
-   */
-  public void addError(String message, int line, int column);
-  
-  /**
-   * Add an error message.
-   * 
-   * @param message The message for the error.
-   * @param line The line location of the error in the file.
-   * @param column The column location of the error in the file.
-   * @param uri The URI of the file that contains the error.
-   */
-  public void addError(String message, int line, int column, String uri);
-  
-  /**
-   * Add a warning message for this file. (Uses the URI from this validation info object.)
-   * 
-   * @param message The message for the warning.
-   * @param line The line location of the warning in the file.
-   * @param column The column location of the warning in the file.
-   * @deprecated
-   */
-  public void addWarning(String message, int line, int column);
-  
-  /**
-   * Add a warning message.
-   * 
-   * @param message The message for the warning.
-   * @param line The line location of the warning in the file.
-   * @param column The column location of the warning in the file.
-   * @param uri The URI of the file that contains the error.
-   */
-  public void addWarning(String message, int line, int column, String uri);
-  
-  /**
-   * Get the URI resolver in use for this validation. The URI resolver
-   * returned is actually a URI resolver handler that will 
-   * iterate through all of the registered URI resolvers.
-   * 
-   * @return The URI resolver handler.
-   */
-  public URIResolver getURIResolver();
-  
-  /**
-   * Get the attribute with the given name. If the attribute
-   * has not been registered, return null.
-   * 
-   * @param name The name of the attribute being requested.
-   * @return The attribute value if the attribute has been registered, null otherwise.
-   */
-  public Object getAttribute(String name);
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/IValidationMessage.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/IValidationMessage.java
deleted file mode 100644
index 3f5a9af27..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/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/org/eclipse/wst/wsdl/validation/internal/IValidationReport.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/IValidationReport.java
deleted file mode 100644
index ced4bd8cc..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/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/org/eclipse/wst/wsdl/validation/internal/IWSDLValidator.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/IWSDLValidator.java
deleted file mode 100644
index 3278e9d0e..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/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/org/eclipse/wst/wsdl/validation/internal/ValidationController.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/ValidationController.java
deleted file mode 100644
index 13113bdb1..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/ValidationController.java
+++ /dev/null
@@ -1,406 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.apache.xerces.xni.grammars.XMLGrammarPool;
-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(wsdlns != null)
-      {
-        if (validateWSDL(wsdldoc, valInfo, wsdlns))
-        {
-          validateExtensionValidators(wsdldoc, valInfo, wsdlns);
-        }
-      }
-    }
-    return 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);
-        XMLGrammarPool grammarPool = (XMLGrammarPool)valInfo.getAttribute(Constants.XML_CACHE_ATTRIBUTE);
-        if(grammarPool != null)
-          ((DefaultXMLValidator)xmlValidator).setGrammarPool(grammarPool);
-    }
-    //xmlValidator.setValidationInfo(valInfo);
-    xmlValidator.run();
-    // if there are no xml conformance problems go on to check the wsdl stuff
-    if (xmlValidator.hasErrors())
-    {
-      // temp handling of XML errors until validator is updated.
-      List errors = xmlValidator.getErrors();
-      Iterator errorsIter = errors.iterator();
-      while (errorsIter.hasNext())
-      {
-        IValidationMessage valMes = (IValidationMessage)errorsIter.next();
-        
-        if (valMes instanceof ValidationMessageImpl && valInfo instanceof ValidationInfoImpl)
-        {   String errorKey = ((ValidationMessageImpl)valMes).getErrorKey();
-            Object[] messageArgs = ((ValidationMessageImpl)valMes).getMessageArguments();
-            ((ValidationInfoImpl)valInfo).addError(valMes.getMessage(), valMes.getLine(), valMes.getColumn(), valMes.getURI(), errorKey, messageArgs);
-        }
-        else
-        {
-            valInfo.addError(valMes.getMessage(), valMes.getLine(), valMes.getColumn(), valMes.getURI());
-        }
-      }
-      return false;
-    }
-    //wsdlNamespace = xmlValidator.getWSDLNamespace();
-    return true;
-  }
-  
-  /**
-   * Validate the file for XML conformance.
-	 * @param valInfo information about the validation
-   * @return True if the file is conformant, false otherwise.
-   */
-  protected boolean validateXML(ControllerValidationInfo valInfo)
-  { return validateXML(valInfo, null);
-  }
-
-  /**
-   * Validate the WSDL file. Set the errors and warning appropriately.
-   * 
-   * @param wsdldoc A W3C document representation of the WSDL document.
-   * @param valInfo The current validation information.
-   * @param wsdlNamespace The WSDL namespace to validate.
-   * @return True if the file is valid, false otherwise.
-   */
-  protected boolean validateWSDL(Document wsdldoc, ControllerValidationInfo valInfo, String wsdlNamespace)
-  {
-    WSDLValidatorDelegate[] wsdlVals = ver.queryValidatorRegistry(wsdlNamespace, ValidatorRegistry.WSDL_VALIDATOR);
-    if (wsdlVals != null)
-    {
-      for (int i = 0; i < wsdlVals.length; i++)
-      {
-        WSDLValidatorDelegate wsdlvaldel = wsdlVals[i];
-        IWSDLValidator wsdlVal = wsdlvaldel.getValidator();
-
-        // If the wsdl validator isn't null, validate.
-        if (wsdlVal != null)
-        {
-          try
-          {
-            wsdlVal.validate(wsdldoc, valInfo);
-          }
-          catch (ValidateWSDLException e)
-          {
-            valInfo.addError(messagegenerator.getString(_ERROR_PROBLEM_WSDL_VALIDATOR, wsdlNamespace), 1, 1, valInfo.getFileURI());
-          }
-        }
-        // If the validator is null and the namespace isn't create an error.
-        // If the namespace is null the file is empty (and the XML validator
-        // has let it go)
-        // so it is valid but does not need to be validated.
-        else
-        {
-          valInfo.addError(
-            messagegenerator.getString(_ERROR_NO_WSDL_VALIDATOR, wsdlNamespace),
-            1,
-            1,
-            valInfo.getFileURI());
-        }
-      }
-    }
-    // No validators registered.
-    else
-    {
-      valInfo.addError(messagegenerator.getString(_ERROR_NO_WSDL_VALIDATOR, wsdlNamespace), 1, 1, valInfo.getFileURI());
-    }
-    valInfo.completeWSDLValidation();
-
-    return valInfo.isWSDLValid();
-  }
-
-  /**
-   * Validate the WSDL file with the extension validator. Set the errors and warning appropriately.
-   * 
-   * @param wsdldoc A W3C document representation of the WSDL document.
-   * @param valInfo The current validation information.
-   * @param wsdlNamespace The WSDL namespace to validate.
-   * @return True if the file is valid, false otherwise.
-   */
-  protected void validateExtensionValidators(Document wsdldoc, ControllerValidationInfo valInfo, String wsdlNamespace)
-  {
-    WSDLValidatorDelegate[] extVals = ver.queryValidatorRegistry(wsdlNamespace, ValidatorRegistry.EXT_VALIDATOR);
-    if(extVals != null)
-    {
-      int numvals = extVals.length;
-      for(int i = 0; i < numvals; i++)
-      {
-        WSDLValidatorDelegate extvaldel = extVals[i];
-        IWSDLValidator extval = extvaldel.getValidator();
-        if(extval != null)
-        {
-          try
-          {
-          extval.validate(wsdldoc, valInfo);
-          }
-          catch(Throwable  t)
-          {
-            valInfo.addWarning(messagegenerator.getString(_ERROR_PROBLEM_EXT_VALIDATOR,  extvaldel.getValidatorClassName(), wsdlNamespace), 1, 1, valInfo.getFileURI());
-            // This error should be logged and not displayed to the user.
-          }
-        }
-      }
-    }
-  }
-
-  /**
-   * Set the ResourceBundle for this ValidatorManager.
-   * 
-   * @param rb
-   *            The resource bundle to set.
-   * @see #getResourceBundle
-   */
-  public void setResourceBundle(ResourceBundle rb)
-  {
-    resourcebundle = rb;
-  }
-
-  /**
-   * Get the ResourceBundle for this ValidationController.
-   * 
-   * @return The resource bundle set for this ValidationController.
-   * @see #setResourceBundle
-   */
-  public ResourceBundle getResourceBundle()
-  {
-    return resourcebundle;
-  }
-  
-  /**
-   * Get a DOM document representation of the WSDL document.
-   * 
-   * @param uri The uri of the file to read
-   * @return The DOM model of the WSDL document or null if the document can't be read.
-   */
-  private Document getDocument(String uri, InputStream inputStream)
-  {
-    try
-    {
-      // Catch a premature EOF error to allow empty WSDL files to be considered valid.
-      StandardParserConfiguration configuration = new StandardParserConfiguration()
-      {
-        protected XMLErrorReporter createErrorReporter()
-        {
-          return new XMLErrorReporter()
-          {
-            public void reportError(String domain, String key, Object[] arguments, short severity) throws XNIException
-            {
-              boolean reportError = true;
-              if (key.equals("PrematureEOF"))
-              {         
-                reportError = false;
-              }
-
-              if (reportError)
-              {
-                super.reportError(domain, key, arguments, severity);
-              }
-            }
-          };
-        }
-      };
-      
-      InputSource inputSource = null;
-      if (inputStream != null)
-      { //then we want to create a DOM from the inputstream
-        inputSource = new InputSource(inputStream);
-      }
-      else
-      { inputSource = new InputSource(uri);
-      }
-      
-      DOMParser builder = new LineNumberDOMParser(configuration);
-      builder.parse(inputSource);
-      Document doc = builder.getDocument();
-
-      return doc;
-    }
-    catch (Throwable t)
-    {
-    	// TODO: Log error if the parser fails to read the WSDL document.
-    	// In this case the validator will fail with an unexplained error message
-    	// about a null WSDL namespace. This error should be addressed as well.
-    	System.out.println(t);
-    }
-    return null;
-  }
-  
-  private String getWSDLNamespace(Document doc)
-  {
-    String wsdlns = null;
-    if(doc != null)
-    {
-      Element rootdoc = doc.getDocumentElement();
-      if(rootdoc != null)
-      {
-        wsdlns = rootdoc.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/org/eclipse/wst/wsdl/validation/internal/ValidationInfoImpl.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/ValidationInfoImpl.java
deleted file mode 100644
index 3381ed21e..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/ValidationInfoImpl.java
+++ /dev/null
@@ -1,299 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.URIResolver;
-import org.eclipse.wst.wsdl.validation.internal.util.MessageGenerator;
-
-/**
- * An implementation of the validation info interface.
- */
-public class ValidationInfoImpl implements IValidationReport, ControllerValidationInfo
-{
-  private boolean WRAPPER_ERROR_SUPPORT_ENABLED = true;
-  private final String _WARN_NO_VALDIATOR = "_WARN_NO_VALDIATOR";
-  private final String _REF_FILE_ERROR_MESSAGE = "_REF_FILE_ERROR_MESSAGE";
-  private String validating_file_uri = null;
-  private URL validating_file_url = null;
-  private boolean wsdlValid = false;
-  private List messages = new Vector();
-  //private List schemas = new Vector();
-  private List nsNoVals = new Vector();
-  private MessageGenerator messagegenerator = null;
-  private boolean haserrors = false;
-  private HashMap nestedMessages = new HashMap();
-  private URIResolver uriResolver = null;
-  private Hashtable attributes = new Hashtable();
-
-  /**
-   * Constructor.
-   * 
-   * @param uri
-   *            The URI of the file for the validation.
-   */
-  public ValidationInfoImpl(String uri, MessageGenerator messagegenerator)
-  {
-    this.validating_file_uri = uri;
-    if(uri != null)
-    {
-      uri = uri.replaceAll("%20"," ");
-      this.validating_file_uri = uri;
-      try
-      {
-        this.validating_file_url = new URL(uri);
-      } catch (MalformedURLException e)
-      {
-      }
-    }
-    this.messagegenerator = messagegenerator;
-  }
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.IValidationReport#getFileURI()
-   */
-  public String getFileURI()
-  {
-    return validating_file_uri;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.IValidationReport#isWSDLValid()
-   */
-  public boolean isWSDLValid()
-  {
-    return wsdlValid;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.IValidationInfo#addError(java.lang.String,
-   *      int, int)
-   */
-  public void addError(String message, int line, int column)
-  {
-    addError(message, line, column, validating_file_uri);
-  }
-  
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.IValidationInfo#addError(java.lang.String,
-   *      int, int)
-   */
-  public void addError(String message, int line, int column, String uri)
-  {
-    if(addMessage(message, line, column, uri, ValidationMessageImpl.SEV_ERROR))
-    {
-      haserrors = true;
-    }
-  }
-
-  public void addError(String message, int line, int column, String uri, String errorKey, Object[] messageArguments)
-  {
-    if(addMessage(message, line, column, uri, ValidationMessageImpl.SEV_ERROR, errorKey, messageArguments))
-    {
-      haserrors = true;
-    }
-  }
-  
-  
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.IValidationInfo#addWarning(java.lang.String,
-   *      int, int)
-   */
-  public void addWarning(String message, int line, int column)
-  {
-    addWarning(message, line, column, validating_file_uri);
-  }
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.IValidationInfo#addWarning(java.lang.String,
-   *      int, int)
-   */
-  public void addWarning(String message, int line, int column, String uri)
-  {
-    addMessage(message, line, column, uri, ValidationMessageImpl.SEV_WARNING);
-  }
-  
-  /**
-   * Add a message to the list. A message may not be added to the list in 
-   * certain circumstances such as when the URI is invalid or the message 
-   * is null.
-   * 
-   * @param message The message to add.
-   * @param line The line location of the message.
-   * @param column The column location of the message.
-   * @param uri The URI of the file that contains the message.
-   * @param severity The severity of the message.
-   * @return True if the message was able to be added, false otherwise.
-   */
-  private boolean addMessage(String message, int line, int column, String uri, int severity)
-  {
-      return this.addMessage(message, line, column, uri, severity, null, null);
-  }
-  
-  /**
-   * Add a message to the list. A message may not be added to the list in 
-   * certain circumstances such as when the URI is invalid or the message 
-   * is null.
-   * 
-   * @param message The message to add.
-   * @param line The line location of the message.
-   * @param column The column location of the message.
-   * @param uri The URI of the file that contains the message.
-   * @param severity The severity of the message.
-   * @param errorKey The Xerces Error Key
-   * @param messageArguments The Xerces arguments used to create the error message
-   * @return True if the message was able to be added, false otherwise.
-   */
-  private boolean addMessage(String message, int line, int column, String uri, int severity, String errorKey, Object[] messageArguments)
-  {
-    boolean successfullyAdded = false;
-    // If the message is null there is nothing to report.
-    if(message == null)
-    {
-      return successfullyAdded;
-    }
-    String errorURI = uri;
-    URL errorURL = null;
-    if (errorURI != null)
-    {
-      try
-      {
-        errorURI = errorURI.replaceAll("%20", " ");
-        errorURL = new URL(errorURI);
-      } catch (MalformedURLException e)
-      {
-      }
-      //errorURI = normalizeURI(errorURI);
-    }
-//    else
-//    {
-//      errorURI = validating_file_uri;
-//      errorURL = validating_file_url;
-//    }
-    //boolean doDialog = true;
-    if (errorURL != null)
-    {
-      successfullyAdded = true;
-      // Add to the appropriate list if nested error support is off or
-      // this message is for the current file.
-      if (!WRAPPER_ERROR_SUPPORT_ENABLED || validating_file_url.sameFile(errorURL))
-      {
-
-        ValidationMessageImpl valmes = new ValidationMessageImpl(message, line,
-            column, severity, uri, errorKey, messageArguments);
-        messages.add(valmes);
-      }
-      // If nested error support is enabled create a nested error.
-      else if (WRAPPER_ERROR_SUPPORT_ENABLED)
-      {
-        String nesteduri = errorURL.toExternalForm();
-        ValidationMessageImpl nestedmess = new ValidationMessageImpl(message, line,
-            column, severity, nesteduri);
-
-        ValidationMessageImpl container = (ValidationMessageImpl) nestedMessages.get(nesteduri);
-        if(container == null)
-        {
-          // Initially set the nested error to a warning. This will automatically be changed
-          // to an error if a nested message has a severity of error.
-          container = new ValidationMessageImpl(messagegenerator.getString(_REF_FILE_ERROR_MESSAGE, nesteduri), 1, 0, IValidationMessage.SEV_WARNING, nesteduri);
-          nestedMessages.put(nesteduri, container);
-          messages.add(container);
-        }
-        container.addNestedMessage(nestedmess);
-      }
-    }
-
-    return successfullyAdded;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.IValidationReport#getValidationMessages()
-   */
-  public IValidationMessage[] getValidationMessages()
-  {
-    return (IValidationMessage[])messages.toArray(new IValidationMessage[messages.size()]);
-  }
-
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.IValidationInfo#addNamespaceWithNoValidator(java.lang.String)
-   */
-  public void addNamespaceWithNoValidator(String namespace)
-  {
-    // If the list doesn't already contain this namespace, add it to the list
-    // and create a warning message.
-    if (!nsNoVals.contains(namespace))
-    {
-      nsNoVals.add(namespace);
-      addWarning(messagegenerator.getString(_WARN_NO_VALDIATOR, namespace), 1, 0);
-
-    }
-
-  }
-
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.ControllerValidationInfo#completeWSDLValidation()
-   */
-  public void completeWSDLValidation()
-  {
-    if (haserrors)
-    {
-      wsdlValid = false;
-    }
-    else
-    {
-      wsdlValid = true;
-    }
-  }
-
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.IValidationReport#hasErrors()
-   */
-  public boolean hasErrors()
-  {
-    return haserrors;
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wsdl.validate.ValidationReport#getNestedMessages()
-   */
-  public HashMap getNestedMessages()
-  {
-    return nestedMessages;
-  }
-  
-  public void setURIResolver(URIResolver uriResolver)
-  {
-  	this.uriResolver = uriResolver;
-  }
-  
-  public URIResolver getURIResolver()
-  {
-  	return uriResolver;
-  }
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wsdl.validate.ValidationInfo#getAttribute(java.lang.String)
-	 */
-	public Object getAttribute(String name) 
-	{
-		return attributes.get(name);
-	}
-	
-	public void setAttributes(Hashtable attributes)
-	{
-		this.attributes.putAll(attributes);
-	}
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/ValidationMessageImpl.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/ValidationMessageImpl.java
deleted file mode 100644
index aa7fc1ae2..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/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/org/eclipse/wst/wsdl/validation/internal/ValidatorRegistry.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/ValidatorRegistry.java
deleted file mode 100644
index d7f8372e5..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/ValidatorRegistry.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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)
-  {
-    // 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/org/eclipse/wst/wsdl/validation/internal/WSDLValidator.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/WSDLValidator.java
deleted file mode 100644
index c42e00846..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/WSDLValidator.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal;
-
-import java.io.InputStream;
-import java.util.Hashtable;
-import java.util.ResourceBundle;
-
-import org.eclipse.wst.wsdl.validation.internal.resolver.IExtensibleURIResolver;
-import org.eclipse.wst.wsdl.validation.internal.resolver.URIResolver;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.WSDL11BasicValidator;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.WSDL11ValidatorController;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.WSDL11ValidatorDelegate;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.http.HTTPValidator;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.mime.MIMEValidator;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.soap.SOAPValidator;
-
-import com.ibm.wsdl.Constants;
-
-/**
- * An main WSDL validator class. The WSDL validator validates WSDL documents.
- */
-public class WSDLValidator
-{
-  private static String VALIDATOR_RESOURCE_BUNDLE = "validatewsdl";
-  private static String VALIDATOR_HTTP_RESOURCE_BUNDLE = "validatewsdlhttp";
-  private static String VALIDATOR_SOAP_RESOURCE_BUNDLE = "validatewsdlsoap";
-  private static String VALIDATOR_MIME_RESOURCE_BUNDLE = "validatewsdlmime";
-  private ValidationController validationController;
-  private URIResolver uriResolver;
-  private Hashtable attributes = new Hashtable();
-  
-  /**
-   * Constructor.
-   */
-  public WSDLValidator()
-  {
-    ResourceBundle rb = ResourceBundle.getBundle(VALIDATOR_RESOURCE_BUNDLE);
-    uriResolver = new URIResolver();
-    validationController = new ValidationController(rb, uriResolver);
-    
-    //Register the default validators.
-    ValidatorRegistry registry = ValidatorRegistry.getInstance();
-    // Register the WSDL 1.1 validator controller and validators.
-    WSDLValidatorDelegate delegate = new WSDLValidatorDelegate(WSDL11ValidatorController.class.getName(), VALIDATOR_RESOURCE_BUNDLE, getClass().getClassLoader());
-    registry.registerValidator(Constants.NS_URI_WSDL, delegate, ValidatorRegistry.WSDL_VALIDATOR);
-    WSDL11ValidatorDelegate delegate1 = new WSDL11ValidatorDelegate(WSDL11BasicValidator.class.getName(), VALIDATOR_RESOURCE_BUNDLE, getClass().getClassLoader());
-    registerWSDL11Validator(Constants.NS_URI_WSDL, delegate1);
-    delegate1 = new WSDL11ValidatorDelegate(HTTPValidator.class.getName(), VALIDATOR_HTTP_RESOURCE_BUNDLE, getClass().getClassLoader());
-    registerWSDL11Validator(org.eclipse.wst.wsdl.validation.internal.Constants.NS_HTTP, delegate1);
-    delegate1 = new WSDL11ValidatorDelegate(SOAPValidator.class.getName(), VALIDATOR_SOAP_RESOURCE_BUNDLE, getClass().getClassLoader());
-    registerWSDL11Validator(org.eclipse.wst.wsdl.validation.internal.Constants.NS_SOAP11, delegate1);
-    delegate1 = new WSDL11ValidatorDelegate(MIMEValidator.class.getName(), VALIDATOR_MIME_RESOURCE_BUNDLE, getClass().getClassLoader());
-    registerWSDL11Validator(org.eclipse.wst.wsdl.validation.internal.Constants.NS_MIME, delegate1);
-   
-    // The WSDL 1.1 schema validator is a special case as it is registered for three namespaces.
-//    delegate1 = new WSDL11ValidatorDelegate(InlineSchemaValidator.class.getName(), VALIDATOR_RESOURCE_BUNDLE, getClass().getClassLoader());
-//    registerWSDL11Validator(Constants.NS_URI_XSD_1999, delegate1);
-//    registerWSDL11Validator(Constants.NS_URI_XSD_2000, delegate1);
-//    registerWSDL11Validator(Constants.NS_URI_XSD_2001, delegate1);
-  }
-  
-  /**
-   * Validate the WSDL file at the given location.
-   * 
-   * @param uri The location of the WSDL file to validate.
-   * @return A validation report summarizing the results of the validation.
-   */
-  public IValidationReport validate(String uri)
-  {
-   return validate(uri, null);
-  }
-  
-  /**
-   * 
-   * Validate the inputStream
-   * @param uri The location of the WSDL file being validated
-   * @param inputStream The stream to validate
-   * @return A Validation report summarizing the results of the validation
-   */
-  public IValidationReport validate(String uri, InputStream inputStream)
-  {
-    if(uri == null) 
-      return null;
-    validationController.setAttributes(attributes);
-    return validationController.validate(uri, inputStream);
-  }
-  
-  /**
-   * Add a URI resolver to the WSDL validator.
-   * 
-   * @param uriResolver The URI resolver to add to the WSDL validator.
-   */
-  public void addURIResolver(IExtensibleURIResolver uriResolver)
-  {
-  	this.uriResolver.addURIResolver(uriResolver);
-  }
-  
-  /**
-   * Set an attribute on the validator. An attribute is
-   * defined by a name and a value pair. An attribute may
-   * be defined for any validator, built in or an extension.
-   * Extension validators can probe the attributes set on
-   * the WSDL validator to customize the way in which they
-   * validate. A null value will unset an attribute.
-   * 
-   * @param name The attribute identifier.
-   * @param value The attribute itself.
-   */
-  public void setAttribute(String name, Object value)
-  {
-	if(value == null)
-	{
-	  attributes.remove(name);
-	}
-	else
-	{
-  	  attributes.put(name, value);
-	}
-  }
-  
-  /**
-   * Register an extension WSDL validator delegate with this validator.
-   * 
-   * @param namespace The namespace the validator validates for. This is the WSDL namespace.
-   * @param delegate The delegate that holds the validator.
-   */
-  public void registerWSDLExtensionValidator(String namespace, WSDLValidatorDelegate delegate)
-  {
-    ValidatorRegistry.getInstance().registerValidator(namespace, delegate, ValidatorRegistry.EXT_VALIDATOR);
-  }
-  
-  /**
-   * Register a WSDL 1.1 validator delegate with this validator.
-   * 
-   * @param namespace The namespace the validator validates for.
-   * @param delegate The delegate that holds the validator.
-   */
-  public void registerWSDL11Validator(String namespace, WSDL11ValidatorDelegate delegate)
-  {
-    org.eclipse.wst.wsdl.validation.internal.wsdl11.ValidatorRegistry.getInstance().registerValidator(namespace, delegate);
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/WSDLValidatorDelegate.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/WSDLValidatorDelegate.java
deleted file mode 100644
index ab4075f2c..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/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/org/eclipse/wst/wsdl/validation/internal/eclipse/InlineSchemaModelGrammarPoolImpl.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/eclipse/InlineSchemaModelGrammarPoolImpl.java
deleted file mode 100644
index 2089bb7e8..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/eclipse/InlineSchemaModelGrammarPoolImpl.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.eclipse;
-
-import org.apache.xerces.util.XMLGrammarPoolImpl;
-import org.apache.xerces.xni.grammars.Grammar;
-import org.apache.xerces.xni.grammars.XMLGrammarDescription;
-
-/**
- * A grammar pool for inline schemas. This grammar pool restricts inline schemas
- * from being cached.
- */
-public class InlineSchemaModelGrammarPoolImpl extends XMLGrammarPoolImpl 
-{
-  public void putGrammar(Grammar grammar) 
-  {
-	if (grammar == null)
-	  return;
-	// we overide this method to perform 'selective' caching of schemas
-	XMLGrammarDescription description = grammar.getGrammarDescription();
-	if (!fPoolIsLocked && !containsGrammar(grammar.getGrammarDescription())) 
-	{
-	  // in order to avoid caching the inline schemas
-	  // we ensure the literal system id does not end with wsdl
-	  // before we attempt to 'put' the grammar
-	  String litSysId = description.getLiteralSystemId();
-	  String basSysId = description.getBaseSystemId();
-	  if (litSysId != null && litSysId.endsWith("xsd")
-			&& basSysId != null && basSysId.endsWith("wsdl")) 
-	  {
-				/*
-				 * System.out.println("putGramamr : " +
-				 * schemaDescription.getNamespace() + ", " +
-				 * schemaDescription.getExpandedSystemId() + ", " +
-				 * schemaDescription.getBaseSystemId());
-				 */
-	    super.putGrammar(grammar);
-	  }
-	}
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/eclipse/URIResolverWrapper.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/eclipse/URIResolverWrapper.java
deleted file mode 100644
index c6b4830b6..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/eclipse/URIResolverWrapper.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.eclipse;
-
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
-import org.eclipse.wst.wsdl.validation.internal.resolver.IExtensibleURIResolver;
-import org.eclipse.wst.wsdl.validation.internal.resolver.IURIResolutionResult;
-
-/**
- * An wrapper URI resolver that wraps the Web Standard Tools URI resolver
- * in a WSDL validator URI resolver.
- */
-public class URIResolverWrapper implements IExtensibleURIResolver
-{
-  /**
-   * Constructor.
-   */
-  public URIResolverWrapper()
-  {
-  }
-
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.resolver.IExtensibleURIResolver#resolve(java.lang.String, java.lang.String, java.lang.String, org.eclipse.wst.wsdl.validation.internal.resolver.IURIResolutionResult)
-   */
-  public void resolve(String baseLocation, String publicId, String systemId, IURIResolutionResult result)
-  {
-    URIResolver resolver = URIResolverPlugin.createResolver();
-    String location = null;
-    if (publicId != null || systemId != null)
-    {  
-      location = resolver.resolve(baseLocation, publicId, systemId);
-    }  
-    
-    if (location != null)
-    {       
-      result.setLogicalLocation(location);
-      String physical = resolver.resolvePhysicalLocation(baseLocation, publicId, location);
-      if(physical != null)
-      {
-        result.setPhysicalLocation(physical);
-      }
-      else
-      {
-        result.setPhysicalLocation(location);
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/eclipse/ValidateWSDLPlugin.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/eclipse/ValidateWSDLPlugin.java
deleted file mode 100644
index c170ad16f..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/eclipse/ValidateWSDLPlugin.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.eclipse;
-
-import java.io.IOException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.wst.wsdl.validation.internal.Constants;
-import org.eclipse.wst.wsdl.validation.internal.WSDLValidatorDelegate;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.WSDL11ValidatorDelegate;
-import org.eclipse.wst.wsdl.validation.internal.xml.XMLCatalog;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class required for eclipse.
- */
-public class ValidateWSDLPlugin extends Plugin
-{
-  protected final String PROPERTIES_FILE = "validatewsdlui";
-  protected static ValidateWSDLPlugin instance;
-  protected ResourceBundle resourcebundle = null;
-  protected ResourceBundle wsdlValidatorResourceBundle = null;
-
-  /**
-   * Constructor.
-   */
-  public ValidateWSDLPlugin()
-  {
-    super();
-  }
-
-  /* (non-Javadoc)
-   * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
-   */
-  public void start(BundleContext context) throws Exception
-  {
-    super.start(context);
-    instance = this;
-    wsdlValidatorResourceBundle = ResourceBundle.getBundle(Constants.WSDL_VALIDATOR_PROPERTIES_FILE);
-    resourcebundle = ResourceBundle.getBundle(PROPERTIES_FILE);
-
-    new WSDLValidatorPluginRegistryReader(
-      "extvalidator",
-      "extvalidator",
-      WSDLValidatorPluginRegistryReader.EXT_VALIDATOR)
-      .readRegistry();
-
-    // register any WSDL 1.1 validators defined
-    new WSDL11ValidatorPluginRegistryReader("wsdl11validator", "validator").readRegistry();
-  }
-  /* (non-Javadoc)
-   * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
-   */
-  public void stop(BundleContext context) throws Exception
-  {
-    super.stop(context);
-    XMLCatalog.reset();
-  }
-  
-  /**
-   * Return the instance of this plugin object.
-   * 
-   * @return the instance of this plugin object
-   */
-  public static ValidateWSDLPlugin getInstance()
-  {
-    return instance;
-  }
-
-  /**
-   * Get the install URL of this plugin.
-   * 
-   * @return the install url of this plugin
-   */
-  public String getInstallURL()
-  {
-    try
-    {
-      return Platform.resolve(getBundle().getEntry("/")).getFile();
-    }
-    catch (IOException e)
-    {
-      return null;
-    }
-  }
-
-  /*************************************************************
-   * ResourceBundle helper methods
-   * 
-   *************************************************************/
-  /**
-   * Returns the resource bundle for this plugin.
-   * 
-   * @return the resource bundle for this plugin
-   */
-  public ResourceBundle getResourceBundle()
-  {
-    return resourcebundle;
-  }
-
-  /**
-   * Returns the resource bundle for the WSDL validator.
-   * 
-   * @return the resource bundle for the WSDL validator
-   */
-  public ResourceBundle getWSDLValidatorResourceBundle()
-  {
-    return wsdlValidatorResourceBundle;
-  }
-
-  /**
-   * Returns the string for the given id.
-   * 
-   * @param stringID - the id for the string
-   * @return the string for the given id
-   */
-  public String getString(String stringID)
-  {
-    return getResourceBundle().getString(stringID);
-  }
-}
-
-/**
- * This class reads the plugin manifests and registers each WSDLExtensionValidator
- */
-class WSDLValidatorPluginRegistryReader
-{
-  protected static final String PLUGIN_ID = "org.eclipse.wst.wsdl.validation";
-  protected static final String ATT_CLASS = "class";
-  protected static final String ATT_NAMESPACE = "namespace";
-  protected static final String ATT_RESOURCEBUNDLE = "resourcebundle";
-  protected static final int WSDL_VALIDATOR = 0;
-  protected static final int EXT_VALIDATOR = 1;
-  protected String extensionPointId;
-  protected String tagName;
-  protected int validatorType;
-
-  /**
-   * 
-   */
-  public WSDLValidatorPluginRegistryReader(String extensionPointId, String tagName, int validatorType)
-  {
-    this.extensionPointId = extensionPointId;
-    this.tagName = tagName;
-    this.validatorType = validatorType;
-  }
-
-  /**
-   * read from plugin registry and parse it.
-   */
-  public void readRegistry()
-  {
-    IExtensionRegistry pluginRegistry = Platform.getExtensionRegistry();
-    IExtensionPoint point = pluginRegistry.getExtensionPoint(PLUGIN_ID, extensionPointId);
-    if (point != null)
-    {
-      IConfigurationElement[] elements = point.getConfigurationElements();
-      for (int i = 0; i < elements.length; i++)
-      {
-        readElement(elements[i]);
-      }
-    }
-  }
-
-  /**
-   * readElement() - parse and deal with an extension like:
-   *
-   * <extension point="org.eclipse.validate.wsdl.WSDLExtensionValidator"
-   *            id="soapValidator"
-   *            name="SOAP Validator">>
-   *   <validator>
-   *        <run class=" org.eclipse.validate.wsdl.soap.SOAPValidator"/>
-   *   </validator>
-   *   <attribute name="namespace" value="http://schemas.xmlsoap.org/wsdl/soap/"/>
-   * </extension>
-   */
-  protected void readElement(IConfigurationElement element)
-  {
-    if (element.getName().equals(tagName))
-    {
-      String validatorClass = element.getAttribute(ATT_CLASS);
-      String namespace = element.getAttribute(ATT_NAMESPACE);
-      String resourceBundle = element.getAttribute(ATT_RESOURCEBUNDLE);
-
-      if (validatorClass != null)
-      {
-        try
-        {
-          //          ClassLoader pluginLoader =
-          //            element.getDeclaringExtension().getDeclaringPluginDescriptor().getPlugin().getClass().getClassLoader();
-          //				modified to resolve certain situations where the plugin has not been initialized
-
-          ClassLoader pluginLoader =
-            element.getDeclaringExtension().getDeclaringPluginDescriptor().getPluginClassLoader();
-          
-//          if (validatorType == WSDL_VALIDATOR)
-//           {
-//            WSDL11ValidatorDelegate delegate = new WSDL11ValidatorDelegate(validatorClass, resourceBundle, pluginLoader);
-//            WSDLValidator.getInstance().registerWSDL11Validator(namespace, delegate);
-//          }
-          if (validatorType == EXT_VALIDATOR)
-           {
-            WSDLValidatorDelegate delegate = new WSDLValidatorDelegate(validatorClass, resourceBundle, pluginLoader);
-            WSDLValidator.getInstance().registerWSDLExtensionValidator(namespace, delegate);
-          }
-//          registerWSDLValidatorPluginExtensionWithClassName(
-//            pluginLoader,
-//            WSDLValidatorExtensionClass,
-//            WSDLValidatorExtensionNamespace);
-        }
-        catch (Exception e)
-        {
-        }
-      }
-    }
-  }
-
-  /**
-   * Register the extension validator with the given class name and namespaces.
-   * 
-   * @param classLoader - the class loader to create the validator
-   * @param className - the name of the extension validator
-   * @param namespace - the namespace of the extension validator
-   * @throws Exception
-   */
-//  protected void registerWSDLValidatorPluginExtensionWithClassName(
-//    ClassLoader classLoader,
-//    String className,
-//    String namespace)
-//    throws Exception
-//  {
-//    try
-//    {
-//      Class validatorExtensionClass = classLoader != null ? classLoader.loadClass(className) : Class.forName(className);
-//
-//      
-//      //IValidatorExtensionPlugin validatorHandler = (IValidatorExtensionPlugin)validatorExtensionClass.newInstance();
-//      //add(namespace, validatorHandler.getValidator());
-//    }
-//    catch (Exception e)
-//    {
-//      //System.out.println(e.getMessage());
-//      //TODO: write the error message to the log file - use custom log writer class
-//      //ValidateWSDLPlugin.getInstance().getMsgLogger().write("WSDL Validator could not register the extension validator." + e.getMessage());	
-//    }
-//  }
-
-  /**
-   * Register the loaded validator.
-   * 
-   * @param namespace - the namespace of the validator
-   * @param validatorExtension - the extension validator
-   */
-//  protected void add(String namespace, IWSDLValidator validatorExtension)
-//  {
-//    if (validatorType == WSDL_VALIDATOR)
-//    {
-//      WSDLConfigurator.registerWSDLValidator(namespace, validatorExtension);
-//    }
-//    else if (validatorType == WSI_VALIDATOR)
-//    {
-//      WSDLConfigurator.registerWSIValidator(namespace, validatorExtension);
-//    }
-//  }
-}
-
-/**
- * Read WSDl 1.1 extension validators.
- * 
- *  <extension
- *     point="com.ibm.etools.validation.validator"
- *     id="wsdlValidator"
- *     name="%_UI_WSDL_VALIDATOR">
- *    <wsdl11validator
- *       namespace="http://schemas.xmlsoap.org/wsdl/soap/"
- *       class="org.eclipse.wsdl.validate.soap.wsdl11.SOAPValidator"
- *       resourcebundle="validatewsdlsoap"/>
- *   </extension>
- *  
- */
-class WSDL11ValidatorPluginRegistryReader
-{
-  protected static final String PLUGIN_ID = "org.eclipse.wst.wsdl.validation";
-  protected static final String ATT_CLASS = "class";
-  protected static final String ATT_NAMESPACE = "namespace";
-  protected static final String ATT_RESOURCEBUNDLE = "resourcebundle";
-  protected String extensionPointId;
-  protected String tagName;
-
-  /**
-   * Constructor.
-   * 
-   * @param extensionPointId - the id of the extension point
-   * @param tagName - the tag name of the extension point
-   */
-  public WSDL11ValidatorPluginRegistryReader(String extensionPointId, String tagName)
-  {
-    this.extensionPointId = extensionPointId;
-    this.tagName = tagName;
-  }
-
-  /**
-   * Read from plugin registry and handle the configuration elements that match
-   * the spedified elements.
-   */
-  public void readRegistry()
-  {
-    IExtensionRegistry pluginRegistry = Platform.getExtensionRegistry();
-    IExtensionPoint point = pluginRegistry.getExtensionPoint(PLUGIN_ID, extensionPointId);
-    if (point != null)
-    {
-      IConfigurationElement[] elements = point.getConfigurationElements();
-      for (int i = 0; i < elements.length; i++)
-      {
-        readElement(elements[i]);
-      }
-    }
-  }
-
-  /**
-   * Parse and deal with the extension points.
-   * 
-   * @param element The extension point element.
-   */
-  protected void readElement(IConfigurationElement element)
-  {
-    if (element.getName().equals(tagName))
-    {
-      String validatorClass = element.getAttribute(ATT_CLASS);
-      String namespace = element.getAttribute(ATT_NAMESPACE);
-      String resourceBundle = element.getAttribute(ATT_RESOURCEBUNDLE);
-
-      if (validatorClass != null && namespace != null)
-      {
-        try
-        {
-          ClassLoader pluginLoader =
-            element.getDeclaringExtension().getDeclaringPluginDescriptor().getPluginClassLoader();
-          WSDL11ValidatorDelegate delegate = new WSDL11ValidatorDelegate(validatorClass, resourceBundle, pluginLoader);
-          WSDLValidator.getInstance().registerWSDL11Validator(namespace, delegate);
-        }
-        catch (Exception e)
-        {
-        }
-      }
-    }
-  }
-}
-
-
-
-
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/eclipse/WSDLValidator.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/eclipse/WSDLValidator.java
deleted file mode 100644
index 0c6826071..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/eclipse/WSDLValidator.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.eclipse;
-
-
-
-/**
- * An Eclipse WSDL validator. This validator is the default validator
- * used in the validation framework. There is only a single instance of
- * this validator. When created, this validator registers all extension
- * URI resolvers.
- */
-public class WSDLValidator extends org.eclipse.wst.wsdl.validation.internal.WSDLValidator
-{
-	private static WSDLValidator instance = null;
-
-	/**
-	 * The constructor registers all of the URI resolvers defined via the
-	 * WSDL URI resolver extension point with the WSDL validator. 
-	 * 
-	 */
-	private WSDLValidator()
-	{
-      super();
-      URIResolverWrapper resolver = new URIResolverWrapper();
-      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;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/exception/ValidateWSDLException.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/exception/ValidateWSDLException.java
deleted file mode 100644
index 33d1b48b6..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/exception/ValidateWSDLException.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.exception;
-
-/**
- * Custom exception for WSDL validation.
- */
-public class ValidateWSDLException extends Exception
-{
-	/**
-   * Required serial version uid.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * Constructor.
-   * 
-   * @param message The exception message
-   */
-  public ValidateWSDLException(String message)
-	{
-	  super(message);
-	}
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/resolver/IExtensibleURIResolver.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/resolver/IExtensibleURIResolver.java
deleted file mode 100644
index 2030ae7f8..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/resolver/IExtensibleURIResolver.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.resolver;
-
-/**
- * An interface for the WSDL validator's URI resolver mechanism. The URI resolver
- * is used to find the location of an entity.
- */
-public interface IExtensibleURIResolver
-{
- /**
-  * Resolve the location of the entity described by the publicId and systemId.
-  * 
-  * @param baseLocation The location of the resource that contains the uri.
-  * @param publicId An optional public identifier (i.e. namespace name), or null if none.
-  * @param systemId An absolute or relative URI, or null if none.
-  * @param result The result of the resolution.
-  */
-  public void resolve(String baseLocation, String publicId, String systemId, IURIResolutionResult result);
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/resolver/IURIResolutionResult.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/resolver/IURIResolutionResult.java
deleted file mode 100644
index 236bb1165..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/resolver/IURIResolutionResult.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.validation.internal.resolver;
-
-/**
- * The representation of a URI resolution result. This interface is not meant to
- * be implemented by clients.
- *
- */
-public interface IURIResolutionResult 
-{
-  /**
-   * Get the logical location of the resolution result.
-   * 
-   * @return The logical location of the resolution result.
-   */
-  public String getLogicalLocation();
-  
-  /**
-   * Set the logical location of the resolution result.
-   * 
-   * @param logicalLocation The logical location of the resolution result.
-   */
-  public void setLogicalLocation(String logicalLocation);
-  
-  /**
-   * Get the physical location of the resolution result.
-   * 
-   * @return The physical location of the resolution result.
-   */
-  public String getPhysicalLocation();
-  
-  /**
-   * Set the physical location of the resolution result.
-   * 
-   * @param physicalLocation The physical location of the resolution result.
-   */
-  public void setPhysicalLocation(String physicalLocation);
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/resolver/URIResolutionResult.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/resolver/URIResolutionResult.java
deleted file mode 100644
index 07df0c6f8..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/resolver/URIResolutionResult.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.validation.internal.resolver;
-
-/**
- * This class holds the URI resolution results.
- *
- */
-public class URIResolutionResult implements IURIResolutionResult
-{
-  private String logicalLocation = null;
-  private String physicalLocation = null;
-  
-  /**
-   * Constructor.
-   */
-  public URIResolutionResult()
-  {
-  }
-  
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.resolver.IURIResolutionResult#getLogicalLocation()
-   */
-  public String getLogicalLocation()
-  {
-	return logicalLocation;
-  }
-  
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.resolver.IURIResolutionResult#setLogicalLocation(java.lang.String)
-   */
-  public void setLogicalLocation(String logicalLocation)
-  {
-	this.logicalLocation = logicalLocation;
-  }
-  
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.resolver.IURIResolutionResult#getPhysicalLocation()
-   */
-  public String getPhysicalLocation()
-  {
-	return physicalLocation;
-  }
-  
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.resolver.IURIResolutionResult#setPhysicalLocation(java.lang.String)
-   */
-  public void setPhysicalLocation(String physicalLocation)
-  {
-	this.physicalLocation = physicalLocation;
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/resolver/URIResolver.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/resolver/URIResolver.java
deleted file mode 100644
index 9e4b86f81..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/resolver/URIResolver.java
+++ /dev/null
@@ -1,283 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.resolver;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.xerces.xni.XMLResourceIdentifier;
-import org.apache.xerces.xni.XNIException;
-import org.apache.xerces.xni.parser.XMLEntityResolver;
-import org.apache.xerces.xni.parser.XMLInputSource;
-import org.eclipse.wst.wsdl.validation.internal.util.LazyURLInputStream;
-import org.eclipse.wst.wsdl.validation.internal.xml.XMLCatalog;
-
-/**
- * This is the main URI resolver that calls out to all of the registered
- * external URI resolvers to locate an entity. If none of the external resolvers
- * can locate the entity the resolver will ask the internal WSDL validator XML
- * catalog to resolve the location.
- */
-public class URIResolver implements IExtensibleURIResolver, XMLEntityResolver
-{
-  private List extURIResolversList = new ArrayList();
-
-  /**
-   * Constructor. 
-   */
-  public URIResolver()
-  {
-  }
-
-
-  /**
-   * Add an extension URI resolver.
-   * 
-   * @param uriResolver
-   *          The extension URI resolver.
-   */
-  public void addURIResolver(IExtensibleURIResolver uriResolver)
-  {
-    extURIResolversList.add(uriResolver);
-  }
-
-  
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.resolver.IExtensibleURIResolver#resolve(java.lang.String, java.lang.String, java.lang.String, org.eclipse.wst.wsdl.validation.internal.resolver.IURIResolutionResult)
-   */
-  public void resolve(String baseLocation, String publicId, String systemId, IURIResolutionResult result)
-  {
-    Iterator resolverIter = extURIResolversList.iterator();
-    while(resolverIter.hasNext())
-    {
-      IExtensibleURIResolver resolver = (IExtensibleURIResolver)resolverIter.next();
-      if (resolver == null)
-      {
-        continue;
-      }
-      resolver.resolve(baseLocation, publicId, systemId, result);
-      if (result.getLogicalLocation() != null && !result.getPhysicalLocation().equals(systemId))
-      {
-        break;
-      }
-    }
-
-    // If we haven't been able to locate the result yet ask the internal XML
-    // catalog.
-    if (result.getLogicalLocation() == null && (publicId != null || systemId != null))
-    {
-      String tempresult = XMLCatalog.getInstance().resolveEntityLocation(publicId, systemId);
-      if(tempresult != null)
-      {
-    	result.setLogicalLocation(tempresult);
-    	result.setPhysicalLocation(tempresult);
-      }
-    }
-    if(result.getLogicalLocation() == null)
-    {
-      result.setLogicalLocation(normalize(baseLocation, systemId));
-      result.setPhysicalLocation(result.getLogicalLocation());
-    }
-  }
-  
-  public IURIResolutionResult resolve(String baseLocation, String publicId, String systemId)
-  {
-	IURIResolutionResult result= new URIResolutionResult();
-	resolve(baseLocation, publicId, systemId, result);
-	return result;
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.apache.xerces.xni.parser.XMLEntityResolver#resolveEntity(org.apache.xerces.xni.XMLResourceIdentifier)
-   */
-  public XMLInputSource resolveEntity(XMLResourceIdentifier resourceIdentifier) throws XNIException, IOException
-  {
-    String publicId = resourceIdentifier.getPublicId();
-    String systemId = resourceIdentifier.getLiteralSystemId();
-    if (publicId == null || publicId.equals(""))
-    {
-      publicId = resourceIdentifier.getNamespace();
-    }
-    IURIResolutionResult result = resolve(resourceIdentifier.getBaseSystemId(), publicId, systemId);
-    XMLInputSource xmlInputSource = null;
-    if (result != null)
-    {
-      LazyURLInputStream is = new LazyURLInputStream(result.getPhysicalLocation());
-      xmlInputSource = new XMLInputSource(publicId, result.getLogicalLocation(), result.getLogicalLocation(), is, null);
-    }
-    return xmlInputSource;
-  }
-  
-  /**
-   * Normalize the systemId. Make it absolute with respect to the
-   * baseLocation if necessary.
-   * 
-   * @param baseLocation The base location of the file.
-   * @param systemId The system id of the file.
-   * @return A normalized version of the system id.
-   */
-  protected String normalize(String baseLocation, String systemId)
-  {
-  	if(systemId == null)
-  	{
-  	  return systemId;
-  	}
-  	// Try to find a scheme in the systemId.
-  	int schemaLoc = systemId.indexOf(':');
-  	if(schemaLoc != -1 && systemId.charAt(schemaLoc+1) == '/')
-  	{
-  	  // A scheme has been found. The systemId is an
-  	  // absolute location so return it.
-  	  return systemId;
-  	}
-  	if(baseLocation == null)
-  	{
-  	  return baseLocation;
-  	}
-  	
-  	String result = "";
-  	
-  	// Ensure all slashes in the locations are /.
-  	baseLocation = baseLocation.replace('\\','/');
-  	systemId = systemId.replace('\\','/');
-  	
-  	// Remove the trailing section of the baseLocation.
-	int lastSlash = baseLocation.lastIndexOf('/');
-  	String tempresult = baseLocation.substring(0, lastSlash+1);
-  	
-  	if(systemId.startsWith("/"))
-  	{
-  	  systemId = systemId.substring(1);
-  	}
-  	
-  	// Join the base location with the systemid
-  	tempresult = tempresult + systemId;
-  	
-  	// While the relative location starts with a ../ or ./ change
-  	// the result and the relative location.
-  	int loc;
-  	while((loc = tempresult.lastIndexOf("./")) != -1)
-  	{
-  	  result = tempresult.substring(loc + 2) + result;
-  	  if(tempresult.charAt(loc - 1) == '.')
-  	  {
-  	  	if(tempresult.charAt(loc - 2) == '/')
-  	  	{
-  	  	  String temp = tempresult.substring(0, loc - 2);
-  	  	  int loc2 = temp.lastIndexOf('/');
-  	  	  if(loc2 == -1)
-  	  	  {
-  	  	  	// If there is no other / before this the URL must start with scheme:/../
-  	  	  	result = "../" + result;
-  	  	  	tempresult = tempresult.substring(0, loc - 1);
-  	  	  }
-  	  	  else
-  	  	  {
-  	  	  	// Remove the section that comes before this one from tempresult unless it's ../.
-  	  	    tempresult = tempresult.substring(0, loc - 1);
-  	  	    int numSectsToRemove = 1;
-  	  	    
-  	  	    while(tempresult.endsWith("./"))
-  	  	    {
-  	  	      int tempreslen = tempresult.length();
-  	  	      if(tempreslen > 2 && tempresult.charAt(tempreslen -3) == '.')
-  	  	      {
-  	  	      	if(tempreslen > 3 && tempresult.charAt(tempreslen - 4) == '/')
-  	  	      	{
-  	  	      	  numSectsToRemove++;
-  	  	      	  tempresult = tempresult.substring(0, tempresult.length() -3);
-  	  	        }
-  	  	      	else
-  	  	      	{
-  	  	      	  break;
-  	  	      	}
-  	  	      }
-  	  	      else
-  	  	      {
-  	  	      	if(tempresult.charAt(tempresult.length() -2) == '/')
-  	  	      	{
-  	  	      	  tempresult = tempresult.substring(0, tempresult.length() -2);
-  	  	      	}
-  	  	      	else
-  	  	      	{
-  	  	      	  break;
-  	  	      	}
-  	  	      }
-  	  	    }
-  	  	    // Remove the sections.
-  	  	    for(int i = 0; i < numSectsToRemove; i++)
-  	  	    {
-  	  	      String temp2 = tempresult.substring(0,tempresult.length()-1);
-  	  	      int loc3 = temp2.lastIndexOf('/');
-  	  	      if(loc3 == -1)
-  	  	      {
-  	  	      	break;
-  	  	      }
-  	  	      tempresult = tempresult.substring(0, loc3+1);
-  	  	    }
-  	  	  } 
-  	  	}
-  	  	else
-  	  	{
-  	  	  // The URI is of the form file://somedir../ so copy it as is
-  	  	  String temp = tempresult.substring(0, loc - 1);
-	  	  int loc2 = temp.lastIndexOf('/');
-	  	  if(loc2 == -1)
-	  	  {
-	  	  	// The URI must look like file:../ or ../ so copy over the whole tempresult.
-	  	  	result = tempresult.substring(0,loc+2) + result;
-	  	  	tempresult = "";
-	  	  }
-	  	  else
-	  	  {
-	  	  	// Copy over the whole somedir../
-	  	  	result = tempresult.substring(loc2 + 1, tempresult.length());
-	  	    tempresult = tempresult.substring(0, loc2+1);
-	  	  }
-  	  	}
-  	  }
-  	  else
-  	  {
-  	    if(tempresult.charAt(loc -1 ) == '/')
-	  	{
-  	  	  // Result is of the form file://something/./something so remove the ./
-  	      tempresult = tempresult.substring(0,loc);
-	  	}
-  	    else
-  	    {
-  	      // Result URI is of form file://somedir./ so copy over the whole section.
-    	  String temp = tempresult.substring(0, loc - 1);
-  	  	  int loc2 = temp.lastIndexOf('/');
-  	  	  if(loc2 == -1)
-  	  	  {
-  	  	  	// The URI must look like file:./ or ./ so copy over the whole tempresult.
-  	  	  	result = tempresult.substring(0, loc) + result;
-  	  	  	tempresult = "";
-  	  	  }
-  	  	  else
-  	  	  {
-  	  	  	// Copy over the whole somedir./
-  	  	  	result = tempresult.substring(loc2 + 1, tempresult.length());
-  	  	    tempresult = tempresult.substring(0, loc2+1);
-  	  	  }
-  	    }
-  	  }
-  	}
-  	result = tempresult + result;
-  	return result;
-  }
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/resolver/URIResolverDelegate.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/resolver/URIResolverDelegate.java
deleted file mode 100644
index 80a999297..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/resolver/URIResolverDelegate.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.resolver;
-
-
-/**
- * A delegate to hold information about an extension URI resolver.
- */
-public class URIResolverDelegate
-{
-  private String classname;
-  private ClassLoader classloader;
-  private IExtensibleURIResolver resolver = null;
-  
-  
-  /**
-   * Constructor.
-   * 
-   * @param classname The class name of the URI resolver.
-   * @param classloader The class loader to use to load the URI resolver.
-   */
-  public URIResolverDelegate(String classname, ClassLoader classloader)
-  {
-    this.classname = classname;
-    this.classloader = classloader;
-  }
-  
-  /**
-   * Get the URI resolver described by this delegate.
-   * 
-   * @return The URI resolver described by this delegate.
-   */
-  public IExtensibleURIResolver getURIResolver()
-  {
-    if(resolver == null)
-    {
-      try
-      {
-        resolver = (IExtensibleURIResolver)classloader.loadClass(classname).newInstance();
-      }
-      catch(Exception e)
-      {
-        try
-        {
-          resolver = (IExtensibleURIResolver)getClass().getClassLoader().loadClass(classname).newInstance();
-        }
-        catch(Exception e2)
-        {
-        }
-      }
-    }
-    return resolver;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/ui/ant/ExtensionValidator.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/ui/ant/ExtensionValidator.java
deleted file mode 100644
index 6b9aa2003..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/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/org/eclipse/wst/wsdl/validation/internal/ui/ant/URIResolver.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/ui/ant/URIResolver.java
deleted file mode 100644
index 2d66239b6..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/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/org/eclipse/wst/wsdl/validation/internal/ui/ant/WSDLValidate.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/ui/ant/WSDLValidate.java
deleted file mode 100644
index 5ad53d9c2..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/ui/ant/WSDLValidate.java
+++ /dev/null
@@ -1,458 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.ui.ant;
-
-import java.io.File;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.DirectoryScanner;
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.types.DTDLocation;
-import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.types.Path;
-import org.apache.tools.ant.types.XMLCatalog;
-import org.eclipse.wst.wsdl.validation.internal.IValidationMessage;
-import org.eclipse.wst.wsdl.validation.internal.IValidationReport;
-import org.eclipse.wst.wsdl.validation.internal.WSDLValidator;
-import org.eclipse.wst.wsdl.validation.internal.WSDLValidatorDelegate;
-import org.eclipse.wst.wsdl.validation.internal.resolver.URIResolverDelegate;
-import org.eclipse.wst.wsdl.validation.internal.util.MessageGenerator;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.WSDL11ValidatorDelegate;
-
-/**
- * An Ant task to run WSDL validation on a file or a set of files.
- * 
- * Options
- * - file - the file to run validation on (optional if fileset is used)
- * - failonerror - fail the build process on the first file with an error
- * - wsicompliance - how to report WS-I errors - REQUIRE, SUGGEST, IGNORE (defaults to REQUIRE)
- * 
- * Supported Nested Elements
- * - xmlcatalog - an xml catalog
- * - dtd        - a dtd specification as would appear in an xmlcatalog
- * - schema     - a schema specification as would appear in an xmlcatalog
- * - entity     - an entity specification as would appear in an xmlcatalog
- * - fileset    - a set of files to validate
- * - wsdl11validator - an extension WSDL 1.1 validator
- * - uriresolver - an extension URI resolver
- * 
- */
-public class WSDLValidate extends Task
-{
-  protected final String UI_PROPERTIES = "validatewsdlui";
-  protected final String VALIDATOR_PROPERTIES = org.eclipse.wst.wsdl.validation.internal.Constants.WSDL_VALIDATOR_PROPERTIES_FILE;
-  protected final String _ERROR_NO_FILE_SPECIFIED = "_ERROR_NO_FILE_SPECIFIED";
-  protected final String _UI_INFORMATION_DELIMITER = "_UI_INFORMATION_DELIMITER";
-  protected final String _UI_ACTION_VALIDATING_FILE = "_UI_ACTION_VALIDATING_FILE";
-  protected final String _UI_ERROR_MARKER = "_UI_ERROR_MARKER";
-  protected final String _UI_WARNING_MARKER = "_UI_WARNING_MARKER";
-  protected final String _UI_VALID = "_UI_VALID";
-  protected final String _UI_INVALID = "_UI_INVALID";
-  protected final String _EXC_UNABLE_TO_VALIDATE_FILE = "_EXC_UNABLE_TO_VALIDATE_FILE";
-  protected final String _EXC_WSDL_FAIL_ON_ERROR = "_EXC_WSDL_FAIL_ON_ERROR";
-  
-  protected final String FILE_PROTOCOL = "file:///";
-
-  // Global Vars
-  protected List filesets = new ArrayList();
-  protected String file = null;
-  protected Path classpath;
-  protected String xsdDirectory = null;
-  protected boolean failOnError = false;
-  protected XMLCatalog globalXMLCatalog = new XMLCatalog();
-  protected List wsdl11validators = new ArrayList();
-  protected List extvalidators = new ArrayList();
-  protected List extURIResolvers = new ArrayList();
-
-  /**
-   * Constuctor.
-   */
-  public WSDLValidate()
-  {
-  }
-
-  /**
-   * Tells the WSDL validate task to fail the build if an error is encountered.
-   * 
-   * @param failOnError Whether to fail on error or not.
-   */
-  public void setFailOnError(boolean failOnError)
-  {
-    this.failOnError = failOnError;
-  }
-
-  /**
-   * Set the directory where the base schema files for the catalog are located.
-   * 
-   * @param dir - the directory of the base schema files
-   */
-  public void setSchemaDir(String dir)
-  {
-    xsdDirectory = dir;
-  }
-
-  /**
-   * Set a file to run WSDL validation on.
-   * 
-   * @param file - a file to run validation on
-   */
-  public void setFile(String file)
-  {
-    this.file = file;
-  }
-
-  /**
-   * Create a set of files to run WSDL validation on.
-   * 
-   * @return the FileSet of files to run WSDL validation on
-   */
-  public FileSet createFileset()
-  {
-    FileSet fileset = new FileSet();
-    filesets.add(fileset);
-    return fileset;
-  }
-
-  /**
-   * Add an XML catalog to the validator.
-   * 
-   * @param catalog - the catalog to add to the validator
-   */
-  public void addConfiguredXMLCatalog(XMLCatalog catalog)
-  {
-    globalXMLCatalog.addConfiguredXMLCatalog(catalog);
-  }
-  /**
-   * Add an extension validator.
-   * 
-   * @param extVal The extension validator to add.
-   */
-  public void addConfiguredExtensionValidator(ExtensionValidator extVal)
-  {
-    extvalidators.add(extVal);
-  }
-  /**
-   * Add an extension WSDL 1.1 validator.
-   * 
-   * @param extVal The extension WSDL 1.1 validator to add.
-   */
-  public void addConfiguredWSDL11Validator(ExtensionValidator extVal)
-  {
-    wsdl11validators.add(extVal);
-  }
-
-  /**
-   * Allow specification of an entity outside of an XMLCatalog.
-   * 
-   * @return a DTDLocation with the specified entity
-   **/
-  public DTDLocation createEntity()
-  {
-    DTDLocation dtdLoc = new DTDLocation();
-    globalXMLCatalog.addEntity(dtdLoc);
-    return dtdLoc;
-  }
-
-  /**
-   * Allow specification of a DTD outside of an XMLCatalog.
-   * 
-   * @return a DTDLocation with the specified DTD
-   **/
-  public DTDLocation createDTD()
-  {
-    DTDLocation dtdLoc = new DTDLocation();
-    globalXMLCatalog.addEntity(dtdLoc);
-    return dtdLoc;
-  }
-  
-  /**
-   * Create a URIResolver extension.
-   * 
-   * @return A URIResolver.
-   */
-  public URIResolver createURIResolver()
-  {
-    URIResolver urires = new URIResolver();
-    extURIResolvers.add(urires.getClassName());
-    return urires;
-    
-  }
-
-  /**
-   * Get a list of all the files to run WSDL validation on. Takes the file and fileset
-   * and creates the list.
-   * 
-   * @return the list of files to be validated
-   */
-  protected List getFileList()
-  {
-    List files = new ArrayList();
-
-    // if a specific file was specified add it to the list
-    if (file != null)
-    {
-      try
-      {
-        URL url = new URL(file);
-        files.add(url.toExternalForm());
-      }
-      catch(Exception e)
-      {
-        File theFile = new File(file);
-        if(!theFile.isAbsolute())
-        {
-          theFile = new File(getProject().getBaseDir(), file);
-        }
-        String absFile = theFile.toString(); 
-        if(!absFile.startsWith("file:"))
-        {
-          absFile = FILE_PROTOCOL + absFile;
-        }
-        absFile = absFile.replace('\\','/');
-        files.add(absFile);
-      }
-    }
-
-    // go through all filesets specified and add all the files to the list
-    Iterator fsIter = filesets.iterator();
-    while (fsIter.hasNext())
-    {
-      FileSet fileset = (FileSet)fsIter.next();
-      DirectoryScanner ds = fileset.getDirectoryScanner(fileset.getProject());
-      String basedir = ds.getBasedir().toString() + File.separator;
-
-      String[] filelist = ds.getIncludedFiles();
-      int numFiles = filelist.length;
-      if (files != null && numFiles > 0)
-      {
-        for (int i = 0; i < numFiles; i++)
-        {
-          String absFile = FILE_PROTOCOL + basedir + filelist[i];
-          absFile = absFile.replace('\\','/');
-          files.add(absFile);
-        }
-      }
-    }
-    return files;
-  }
-
-  /* (non-Javadoc)
-   * @see org.apache.tools.ant.Task#execute()
-   */
-  public void execute() throws BuildException
-  {
-    // the resource bundles for the ui and validator are needed
-    MessageGenerator messGen = null;
-    try
-    {
-      ResourceBundle uiRB = ResourceBundle.getBundle(UI_PROPERTIES);
-      messGen = new MessageGenerator(uiRB);
-    }
-    catch (MissingResourceException e)
-    {
-      // if the resource bundles can't be opened we can't report error so throw an exception
-      throw new BuildException("Unable to open resource bundle. " + e);
-    }
-
-    // Set the XML catalog.
-    org.eclipse.wst.wsdl.validation.internal.xml.XMLCatalog.setExtensionXMLCatalog(XMLCatalogImpl.class.getName(), getClass().getClassLoader());
-    XMLCatalogImpl xmlCatalog = (XMLCatalogImpl)org.eclipse.wst.wsdl.validation.internal.xml.XMLCatalog.getExtensionCatalogInstance();
-    xmlCatalog.addXMLCatalog(globalXMLCatalog);
-    
-    WSDLValidator wsdlValidator = new WSDLValidator();
-    
-    // Set the extension URIResolvers.
-    Iterator resolversIter = extURIResolvers.iterator();
-    while(resolversIter.hasNext())
-    {
-      String resolverClass = (String)resolversIter.next();
-      wsdlValidator.addURIResolver(new URIResolverDelegate(resolverClass, getClass().getClassLoader()).getURIResolver());
-    }
-    
-    // Get the list of files to validate.
-    List files = getFileList();
-    
-    // Register the WSDL 1.1 extension validators.
-    Iterator wsdl11extIter = wsdl11validators.iterator();
-    while(wsdl11extIter.hasNext())
-    {
-      ExtensionValidator extVal = (ExtensionValidator)wsdl11extIter.next();
-      WSDL11ValidatorDelegate delegate = new WSDL11ValidatorDelegate(extVal.getClassName(), extVal.getResourceBundle());
-      wsdlValidator.registerWSDL11Validator(extVal.getNamespace(), delegate);
-    }
-    
-    // Register the extension validators.
-    Iterator extIter = extvalidators.iterator();
-    while(extIter.hasNext())
-    {
-      ExtensionValidator extVal = (ExtensionValidator)extIter.next();
-      WSDLValidatorDelegate delegate = new WSDLValidatorDelegate(extVal.getClassName(), extVal.getResourceBundle());
-      wsdlValidator.registerWSDLExtensionValidator(extVal.getNamespace(), delegate);
-    }
-
-    // The user didn't specify any files to validate.
-    if (files == null || files.isEmpty())
-    {
-      System.err.println(messGen.getString(_ERROR_NO_FILE_SPECIFIED));
-      return;
-    }
-
-    if (xsdDirectory != null)
-    {
-      org.eclipse.wst.wsdl.validation.internal.xml.XMLCatalog.addSchemaDir(xsdDirectory);
-    }
-
-    // Validate all the files specified.
-    Iterator iFiles = files.iterator();
-
-    // Common strings needed in validation output.
-    String infoDelim = messGen.getString(_UI_INFORMATION_DELIMITER);
-    String valid = messGen.getString(_UI_VALID);
-    String invalid = messGen.getString(_UI_INVALID);
-    String errormarker = messGen.getString(_UI_ERROR_MARKER);
-    String warningmarker = messGen.getString(_UI_WARNING_MARKER);
-
-    StringBuffer result = null;
-    boolean notvalid = true;
-    while (iFiles.hasNext())
-    {
-      result = new StringBuffer();
-      notvalid = false;
-      String filename = (String)iFiles.next();
-      try
-      {
-        result.append(infoDelim).append("\n");
-        result.append(messGen.getString(_UI_ACTION_VALIDATING_FILE, filename)).append(" - ");
-
-        IValidationReport valReport = wsdlValidator.validate(filename);
-
-        IValidationMessage[] messages = valReport.getValidationMessages();
-
-        if (!valReport.hasErrors())
-        {
-          result.append(valid);
-        }
-        else
-        {
-          result.append(invalid);
-          notvalid = true;
-        }
-        result.append("\n").append(infoDelim).append("\n");
-
-        result.append(reportMessages(messages, errormarker, warningmarker));
-
-        System.out.println(result.toString());
-      }
-      catch (Exception e)
-      {
-        System.err.println(messGen.getString(_EXC_UNABLE_TO_VALIDATE_FILE, filename, e));
-      }
-      finally
-      {
-        if (notvalid && failOnError)
-        {
-          // To fail on error, throw a build exception.
-          throw new BuildException(messGen.getString(_EXC_WSDL_FAIL_ON_ERROR));
-        }
-      }
-    }
-
-    org.eclipse.wst.wsdl.validation.internal.xml.XMLCatalog.reset();
-
-  }
-
-  /**
-   * Return a string with formatted output for the messages.
-   * 
-   * @param messages The messages to report.
-   * @param errormarker The marker to use for error messages.
-   * @param warningmarker The marker to use for warning messages.
-   * @return A string with the formatted output.
-   */
-  protected String reportMessages(IValidationMessage[] messages, String errormarker, String warningmarker)
-  {
-    StringBuffer returnBuffer = new StringBuffer();
-
-    if (messages == null)
-      return returnBuffer.toString();
-
-    String prefix = null;
-    int numMessages = messages.length;
-    for(int i = 0; i < numMessages; i++)
-    {
-      IValidationMessage message = messages[i];
-
-      if(message.getSeverity() == IValidationMessage.SEV_ERROR)
-       {
-        prefix = errormarker;
-      }
-      else if(message.getSeverity() == IValidationMessage.SEV_WARNING)
-       {
-        prefix = warningmarker;
-      }
-      else
-       {
-        prefix = "";
-      }if(message.getSeverity() == IValidationMessage.SEV_ERROR)
-       {
-        prefix = errormarker;
-      }
-      else if(message.getSeverity() == IValidationMessage.SEV_WARNING)
-       {
-        prefix = warningmarker;
-      }
-      else
-       {
-        prefix = "";
-      }if(message.getSeverity() == IValidationMessage.SEV_ERROR)
-       {
-        prefix = errormarker;
-      }
-      else if(message.getSeverity() == IValidationMessage.SEV_WARNING)
-       {
-        prefix = warningmarker;
-      }
-      else
-       {
-        prefix = "";
-      }if(message.getSeverity() == IValidationMessage.SEV_ERROR)
-       {
-        prefix = errormarker;
-      }
-      else if(message.getSeverity() == IValidationMessage.SEV_WARNING)
-       {
-        prefix = warningmarker;
-      }
-      else
-       {
-        prefix = "";
-      }
-      returnBuffer
-        .append(prefix)
-        .append(" ")
-        .append(message.getLine())
-        .append(":")
-        .append(message.getColumn())
-        .append(":")
-        .append(message.getMessage())
-        .append("\n");
-    }
-    return returnBuffer.toString();
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/ui/ant/XMLCatalogImpl.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/ui/ant/XMLCatalogImpl.java
deleted file mode 100644
index 2f762b1a4..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/ui/ant/XMLCatalogImpl.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.ui.ant;
-
-import org.apache.tools.ant.types.DTDLocation;
-import org.apache.tools.ant.types.XMLCatalog;
-import org.xml.sax.InputSource;
-
-/**
- * An implementation of the WSDL Validator's XML Catalog that uses the XML Catalog
- * from ant.
- */
-public class XMLCatalogImpl extends org.eclipse.wst.wsdl.validation.internal.xml.XMLCatalog
-{
-  protected XMLCatalog xmlCatalog = new XMLCatalog();
-
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.xml.XMLCatalog#addEntryToCatalog(java.lang.String, java.lang.String)
-   */
-  public void addEntryToCatalog(String publicId, String systemId)
-  {
-    DTDLocation resLoc = new DTDLocation();
-    resLoc.setLocation(systemId);
-    resLoc.setPublicId(publicId);
-    xmlCatalog.addEntity(resLoc);
-  }
-
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.xml.XMLCatalog#resolveEntityLocation(java.lang.String, java.lang.String)
-   */
-  public String resolveEntityLocation(String publicId, String systemId)
-  {
-    String resolvedId = null;
-
-    try
-    {
-      InputSource is = xmlCatalog.resolveEntity(publicId, systemId);
-      if (is != null)
-      {
-        resolvedId = is.getSystemId();
-      }
-    }
-    // 
-    catch (Exception e)
-    {
-      // Do nothing if the resource can't be resolved.
-    }
-    // needs to return null if it can't resolve the id
-    if (resolvedId != null && resolvedId.equals(""))
-    {
-      resolvedId = null;
-    }
-    return resolvedId;
-  }
-
-  /**
-   * Add a configured XML Catalog to this catalog.
-   * 
-   * @param catalog A configured XML catalog to add to this catalog.
-   */
-  public void addXMLCatalog(XMLCatalog catalog)
-  {
-    xmlCatalog.addConfiguredXMLCatalog(catalog);
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/ui/text/WSDLValidate.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/ui/text/WSDLValidate.java
deleted file mode 100644
index 5daa05ef4..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/ui/text/WSDLValidate.java
+++ /dev/null
@@ -1,376 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.ui.text;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.List;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-import java.util.Vector;
-
-import org.eclipse.wst.wsdl.validation.internal.IValidationMessage;
-import org.eclipse.wst.wsdl.validation.internal.IValidationReport;
-import org.eclipse.wst.wsdl.validation.internal.WSDLValidator;
-import org.eclipse.wst.wsdl.validation.internal.WSDLValidatorDelegate;
-import org.eclipse.wst.wsdl.validation.internal.resolver.IExtensibleURIResolver;
-import org.eclipse.wst.wsdl.validation.internal.resolver.URIResolverDelegate;
-import org.eclipse.wst.wsdl.validation.internal.util.MessageGenerator;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.WSDL11ValidatorDelegate;
-import org.eclipse.wst.wsdl.validation.internal.xml.XMLCatalog;
-import org.eclipse.wst.wsdl.validation.internal.xml.XMLCatalogEntityHolder;
-
-import com.ibm.wsdl.util.StringUtils;
-
-/**
- * A commande line tool to run WSDL Validation on a single or multiple files.
- * 
- * Options
- * -schemaDir directory       : a directory of schemas to load into the catalog
- * -schema namespace location : a schema to load into the registry
- * -wsdl11v classname namespace resourcebundle : register a WSDL 1.1 extension validator
- *                              to load for the given namespace with the given resourcebundle
- * -wsiv validatorClass namespace propertiesfile : register a WS-I validator
- * -uriresolver URIResolverClass : register an extension URI resolver
- */
-public class WSDLValidate
-{
-  private final String FILE_PREFIX = "file:///";
-  private static final String VALIDATOR_PROPERTIES =
-    org.eclipse.wst.wsdl.validation.internal.Constants.WSDL_VALIDATOR_PROPERTIES_FILE;
-  private static final String UI_PROPERTIES = "validatewsdlui";
-  private static final String _ERROR_WRONG_ARGUMENTS = "_ERROR_WRONG_ARGUMENTS";
-  private static final String _UI_INFORMATION_DELIMITER = "_UI_INFORMATION_DELIMITER";
-  private static final String _UI_ACTION_VALIDATING_FILE = "_UI_ACTION_VALIDATING_FILE";
-  private static final String _UI_VALID = "_UI_VALID";
-  private static final String _UI_INVALID = "_UI_INVALID";
-  private static final String _UI_ERROR_MARKER = "_UI_ERROR_MARKER";
-  private static final String _UI_WARNING_MARKER = "_UI_WARNING_MARKER";
-  //private static final String _ERROR_UNABLE_TO_LOAD_EXT_VALIDATOR = "_ERROR_UNABLE_TO_LOAD_EXT_VALIDATOR";
-  
-  private static final String PARAM_WSDL11VAL = "-wsdl11v";
-  private static final String PARAM_EXTVAL = "-extv";
-  private static final String PARAM_SCHEMADIR = "-schemaDir";
-  private static final String PARAM_SCHEMA = "-schema";
-  private static final String PARAM_URIRESOLVER = "-uriresolver";
-  
-  private static final String STRING_EMPTY = "";
-  private static final String STRING_SPACE = " ";
-  private static final String STRING_DASH = "-";
-  
-  
-  protected ResourceBundle resourceBundle;
-  protected List errors = null;
-  protected List warnings = null;
-  protected WSDLValidator wsdlValidator;
-
-  /**
-   * Constuctor.
-   */
-  public WSDLValidate()
-  {
-  	wsdlValidator = new WSDLValidator();
-  }
-  
-  public void addURIResolver(IExtensibleURIResolver uriResolver)
-  {
-  	wsdlValidator.addURIResolver(uriResolver);
-  }
-
-  /**
-   * Run WSDL validation on a given file.
-   * 
-   * @param directory - the current dir for resolving relative file names
-   * @param filename - the name of the file to validate
-   * @param validatorRB - the WSDL validator resource bundle
-   * @throws Exception
-   */
-  protected IValidationReport validateFile(String directory, String filename, ResourceBundle validatorRB)
-    throws Exception
-  {
-    //	resolve the location of the file
-    String filelocation = null;
-    try
-    {
-      URL test = StringUtils.getURL(new URL(FILE_PREFIX + directory + "/"), filename);
-      filelocation = test.toExternalForm();
-    }
-    catch (MalformedURLException e)
-    {
-      throw new Exception("Unable to resolve WSDL file location");
-    }
-    // run validation on the file and record the errors and warnings
-    IValidationReport valReport = wsdlValidator.validate(filelocation);
-    return valReport;
-  }
-
-  /**
-   * Returns a String with formatted output for a list of messages.
-   * 
-   * @param messages The messages to get.
-   * @param errormarker The marker to use to label error messages.
-   * @param warningmarker The marker to use to label warning messages.
-   * @return A string with a formatted list of the messages.
-   */
-  protected String getMessages(IValidationMessage[] messages, String errormarker, String warningmarker)
-  {
-    StringBuffer outputBuffer = new StringBuffer();
-    if (messages != null)
-    {
-      // create a list of messages that looks like
-      // ERROR 1:1 Error message content
-      int numMessages = messages.length;
-      String marker = null;
-      for (int i = 0; i < numMessages; i++)
-      {
-        IValidationMessage message = messages[i];
-        int severity = message.getSeverity();
-        if (severity == IValidationMessage.SEV_ERROR)
-        {
-          marker = errormarker;
-        }
-        else if (severity == IValidationMessage.SEV_WARNING)
-        {
-          marker = warningmarker;
-        }
-        else
-        {
-          marker = STRING_EMPTY;
-        }
-        outputBuffer
-          .append(marker)
-          .append(STRING_SPACE)
-          .append(message.getLine())
-          .append(":")
-          .append(message.getColumn())
-          .append(STRING_SPACE)
-          .append(message.getMessage())
-          .append("\n");
-      }
-    }
-    return outputBuffer.toString();
-  }
-
-  /**
-   * The main entry point into the command line tool. 
-   * Checks the command line arguments, registers the default validators and runs validation on the
-   * list of files.
-   * 
-   * @param args - the arguments to the validator
-   */
-  public static void main(String[] args)
-  {
-    List wsdlFiles = new Vector();
-    MessageGenerator messGen = null;
-    ResourceBundle validatorRB = null;
-    try
-    {
-      ResourceBundle uiRB = ResourceBundle.getBundle(UI_PROPERTIES);
-      messGen = new MessageGenerator(uiRB);
-      validatorRB = ResourceBundle.getBundle(VALIDATOR_PROPERTIES);
-    }
-    catch (MissingResourceException e)
-    {
-      System.err.println("Validation failed: Unable to load the properties file.");
-      return;
-    }
-    // no arguments specified. Print usage.
-    if (args.length < 1)
-    {
-      System.out.println(messGen.getString(_ERROR_WRONG_ARGUMENTS));
-      return;
-    }
-
-    int argslength = args.length;
-
-    WSDLValidate wsdlValidator = new WSDLValidate();
-    // go through the parameters
-    for (int i = 0; i < argslength; i++)
-    {
-      String param = args[i];
-
-      // registering a validator
-      if (param.equalsIgnoreCase(WSDLValidate.PARAM_WSDL11VAL) || param.equalsIgnoreCase(WSDLValidate.PARAM_EXTVAL))
-      {
-
-        String validatorClass = args[++i];
-        if (!validatorClass.startsWith(WSDLValidate.STRING_DASH))
-        {
-          String namespace = args[++i];
-
-          if (!namespace.startsWith(WSDLValidate.STRING_DASH))
-          {
-            String propertiesFile = args[++i];
-            if (propertiesFile.startsWith(WSDLValidate.STRING_DASH))
-            {
-              propertiesFile = null;
-              i--;
-            }
-            if(param.equalsIgnoreCase(WSDLValidate.PARAM_WSDL11VAL))
-            {  
-              WSDL11ValidatorDelegate delegate = new WSDL11ValidatorDelegate(validatorClass, propertiesFile);
-              wsdlValidator.wsdlValidator.registerWSDL11Validator(namespace, delegate);
-            }
-            else if(param.equalsIgnoreCase(WSDLValidate.PARAM_EXTVAL))
-            {
-              WSDLValidatorDelegate delegate = new WSDLValidatorDelegate(validatorClass, propertiesFile);
-              wsdlValidator.wsdlValidator.registerWSDLExtensionValidator(namespace, delegate);
-            }
-          }
-          else
-          {
-            namespace = null;
-            i--;
-          }
-        }
-        else
-        {
-          validatorClass = null;
-          i--;
-        }  
-      }
-      // registering a directory with schemas
-      else if (param.equalsIgnoreCase(WSDLValidate.PARAM_SCHEMADIR))
-      {
-        String xsdDir = args[++i];
-        XMLCatalog.addSchemaDir(xsdDir);
-      }
-      // registering a schema
-      else if (param.equalsIgnoreCase(WSDLValidate.PARAM_SCHEMA))
-      {
-        String publicid = args[++i];
-        String systemid = args[++i];
-        XMLCatalog.addEntity(new XMLCatalogEntityHolder(publicid, systemid));
-      }
-      else if(param.equalsIgnoreCase(PARAM_URIRESOLVER))
-      {
-        String resolverClass = args[++i];
-        wsdlValidator.addURIResolver(new URIResolverDelegate(resolverClass, null).getURIResolver());
-      }
-      // a file to validate
-      else
-      {
-        if(!param.startsWith(WSDLValidate.STRING_DASH))
-        {  
-          wsdlFiles.add(param);
-        }
-      }
-
-    }
-    // validate the file
-    StringBuffer outputBuffer = null;
-    String infoDelim = messGen.getString(_UI_INFORMATION_DELIMITER);
-    String valid = messGen.getString(_UI_VALID);
-    String invalid = messGen.getString(_UI_INVALID);
-    String errormarker = messGen.getString(_UI_ERROR_MARKER);
-    String warningmarker = messGen.getString(_UI_WARNING_MARKER);
-
-    Iterator filesIter = wsdlFiles.iterator();
-    while (filesIter.hasNext())
-    {
-      outputBuffer = new StringBuffer();
-      String wsdlFile = (String)filesIter.next();
-      try
-      {
-        IValidationReport valReport = wsdlValidator.validateFile(System.getProperty("user.dir"), wsdlFile, validatorRB);
-
-        outputBuffer.append(infoDelim).append("\n");
-        outputBuffer.append(messGen.getString(_UI_ACTION_VALIDATING_FILE, wsdlFile)).append(" - ");
-        if (!valReport.hasErrors())
-        {
-          outputBuffer.append(valid);
-        }
-        else
-        {
-          outputBuffer.append(invalid);
-        }
-        outputBuffer.append("\n").append(infoDelim).append("\n");
-        outputBuffer.append(wsdlValidator.getMessages(valReport.getValidationMessages(), errormarker, warningmarker));
-        System.out.println(outputBuffer.toString());
-      }
-      catch (Exception e)
-      {
-        System.out.println(e.getMessage());
-      }
-    }
-  }
-
-  /**
-   * Load a validator into the wsdl validation framework registry.
-   * 
-   * @param namespace - the namespace the validator checks
-   * @param validatorClass - the name of the class the implements IWSDLValidator
-   * @param propertiesFile - the name of the properties file for the validator
-   * @param type           - the type of validator - WSDL or WS-I
-   * @param messGen        - a MessageGenerator for producing error messages
-   */
-//  protected static void loadExtensionValidator(
-//    String namespace,
-//    String validatorClass,
-//    String propertiesFile,
-//    Integer type,
-//    MessageGenerator messGen)
-//  {
-//    try
-//    {
-//      ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
-//      IWSDLValidator validator = (IWSDLValidator)classLoader.loadClass(validatorClass).newInstance();
-//      // if no properties file is specified we can still load the validator
-//      if (propertiesFile != null && !propertiesFile.equals(""))
-//      {
-//        ResourceBundle rb = ResourceBundle.getBundle(propertiesFile);
-//        validator.setResourceBundle(rb);
-//      }
-//      else
-//      {
-//        propertiesFile = null;
-//      }
-//
-//      ValidatorRegistry.getInstance().registerValidator(namespace, validator, type);
-//    }
-//    catch (Exception e)
-//    {
-//      System.out.println(messGen.getString(_ERROR_UNABLE_TO_LOAD_EXT_VALIDATOR, namespace, e));
-//    }
-//
-//  }
-  //	/**
-  //	 * loadWSDL11ExtensionValidator
-  //	 * Load an extension validator into the WSDL 1.1 validator
-  //   * @param namespace
-  //   * @param validatorClass
-  //   * @param propertiesFile
-  //   * @param type
-  //   * @param classLoader
-  //   */
-  //  protected static void loadWSDL11ExtensionValidator(
-  //			String namespace,
-  //			String validatorClass,
-  //			String resourceBundle,
-  //			ClassLoader classLoader)
-  //		{
-  //			try
-  // {
-  // 	Class valclass = classLoader.loadClass(validatorClass);
-  // 	IWSDL11Validator validator = (IWSDL11Validator)valclass.newInstance();
-  // 	validator.setResourceBundle(ResourceBundle.getBundle(resourceBundle));
-  // 	WSDLConfigurator.registerWSDL11Validator(namespace,validator);
-  // }
-  // catch(Exception e)
-  // {
-  //	 System.out.println("Unable to load the WSDL 1.1 validator for namespace "
-  // + namespace + e);
-  // }
-  //
-  //		}
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/util/ErrorMessage.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/util/ErrorMessage.java
deleted file mode 100644
index 81bdc0e83..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/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/org/eclipse/wst/wsdl/validation/internal/util/LazyURLInputStream.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/util/LazyURLInputStream.java
deleted file mode 100644
index 1bc6ab199..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/util/LazyURLInputStream.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.util;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-
-
-/**
- * This class allows InputStreams to be created and returned to xerces without
- * actually opening file handles or network connections until it is absolutely
- * neccessary.
- */
-public class LazyURLInputStream extends InputStream
-{  
-  private static int debugTotalOpenStreamCount = 0; 
-  protected InputStream inner;
-  protected String url;
-  protected boolean error;
-  boolean hasMarks;
-  boolean pretendFileIsStillOpen;
-
-  public LazyURLInputStream(String url)
-  {
-    this.url = url;
-	inner = null;
-	pretendFileIsStillOpen = false;
-  }
-
-  private void createInnerStreamIfRequired() throws IOException
-  {
-    if (inner == null && !error)
-    {
-      debugTotalOpenStreamCount++;
-      //System.out.println("Creating stream (" + debugTotalOpenStreamCount + ")-- " + url);
-      try
-      {
-        inner = new URL(url).openStream();
-		pretendFileIsStillOpen = false;
-		hasMarks = false;
-      }
-      finally 
-      {
-        if (inner == null)
-        {  
-          error = true;
-        }
-      }
-    }
-  }
-
-	protected void closeStream() throws IOException {
-		if (inner != null && !pretendFileIsStillOpen) {
-			inner.close();
-			pretendFileIsStillOpen = true;
-		}
-  	}
-
-  public int available() throws IOException
-  {
-	if (pretendFileIsStillOpen) return 0;
-	createInnerStreamIfRequired();
-	if (inner == null) throw new IOException("Stream not available");
-	return inner.available();
-  }
-
-  public void close() throws IOException
-  {
-	if (pretendFileIsStillOpen) {
-		// Stop behaving as if the stream were still open.
-		pretendFileIsStillOpen = false;
-	} else {
-		if (inner != null) {
-			debugTotalOpenStreamCount--;
-		      //System.out.println("Closing stream (" + debugTotalOpenStreamCount + ") -- " + url);
-			inner.close();
-		}
-	}
-  }
-
-  public void mark(int readlimit)
-  {
-	if (pretendFileIsStillOpen) return;
-	hasMarks = true;
-	try {
-		createInnerStreamIfRequired();
-		inner.mark(readlimit);
-	} catch (IOException e) {
-		// TODO Auto-generated catch block
-		e.printStackTrace();
-	}
-  }
-
-  public boolean markSupported()
-  {
-	if (pretendFileIsStillOpen) return false;
-	try {
-		createInnerStreamIfRequired();
-		if (inner == null) return false;
-		return inner.markSupported();
-	} catch (IOException e) {
-		// TODO Auto-generated catch block
-		e.printStackTrace();
-	}
-	return false;
-  }
-
-  public int read() throws IOException
-  {
-	if (pretendFileIsStillOpen) return -1;
-	createInnerStreamIfRequired();
-	if (inner == null) throw new IOException("Stream not available");
-	int bytesRead = inner.read();
-	if (bytesRead == -1 && !hasMarks) closeStream();
-	return bytesRead;
-  }
-
-
-	public int read(byte[] b) throws IOException {
-		if (pretendFileIsStillOpen) return -1;
-		createInnerStreamIfRequired();
-		if (inner == null) throw new IOException("Stream not available");
-		int bytesRead = inner.read(b);
-		if (bytesRead == -1 && !hasMarks) closeStream();
-		return bytesRead;
-	}
-
-  public int read(byte[] b, int off, int len) throws IOException
-  {    
-	if (pretendFileIsStillOpen) return -1;
-	createInnerStreamIfRequired();
-	if (inner == null) throw new IOException("Stream not available");
-	int bytesRead = inner.read(b, off, len);
-	if (bytesRead == -1 && !hasMarks) closeStream();
-	return bytesRead;
-  }
-
-  public void reset() throws IOException
-  {
-	if (pretendFileIsStillOpen) return;
-	createInnerStreamIfRequired();
-	if (inner == null) throw new IOException("Stream not available");
-	inner.reset();
-  }
-
-  public long skip(long n) throws IOException
-  {   
-	if (pretendFileIsStillOpen) return 0;
-	createInnerStreamIfRequired();
-	if (inner == null) throw new IOException("Stream not available");
-	return inner.skip(n);
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/util/MessageGenerator.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/util/MessageGenerator.java
deleted file mode 100644
index 0b78cb9c7..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/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/org/eclipse/wst/wsdl/validation/internal/wsdl11/IWSDL11ValidationInfo.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/IWSDL11ValidationInfo.java
deleted file mode 100644
index 039f1ecc7..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/IWSDL11ValidationInfo.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl11;
-
-import java.util.Hashtable;
-
-import org.apache.xerces.xni.grammars.XMLGrammarPool;
-import org.apache.xerces.xs.XSModel;
-import org.eclipse.wst.wsdl.validation.internal.resolver.URIResolver;
-
-/**
- * An interface for WSDL 1.1 validation information. Uses an existing
- * validation info object and provides methods to set and retrieve
- * schemas and convenience methods for setting errors with objects.
- */
-public interface IWSDL11ValidationInfo
-{
-  /**
-   * Returns the URI of the file being validated.
-   * 
-   * @return The URI of the file being validated.
-   */
-  public String getFileURI();
-  
-  /**
-   * Add a schema to the list of schemas available for this WSDL document.
-   * 
-   * @param xsModel The schema to add to the list.
-   */
-  public void addSchema(XSModel xsModel);
-  
-  /**
-   * Get an array of all the schemas available for this WSDL document.
-   * 
-   * @return An array of all the schemas available for this WSDL document.
-   */
-  public XSModel[] getSchemas();
-  
-  /**
-   * Clear all the stored schemas.
-   */
-  public void clearSchemas();
-  
-  /**
-   * Set the element locations hashtable.
-   * 
-   * @param elementLocations The hashtable to set with the element locations.
-   */
-  public void setElementLocations(Hashtable elementLocations);
-  
-  /**
-   * Convenience method for extensibly validators to add error messages.
-   * 
-   * @param message The error to add.
-   * @param element The object to add the error for.
-   */
-  public void addError(String message, Object element);
-  
-  /**
-   * Convenience method for extensibly validators to add error messages.
-   * 
-   * @param message The error to add.
-   * @param element The object to add the error for.
-   * @param errorKey The error key for this message
-   * @param messageArguments The strings used to create the message.
-   */
-  public void addError(String message, Object element, String errorKey, Object[] messageArguments);
-  
-  /**
-   * Add an error message at the given line and column.
-   * 
-   * @param message The error to add.
-   * @param line The line location of the error.
-   * @param column The column location of the error.
-   * @param uri The uri of the file containing the error.
-   */
-  public void addError(String message, int line, int column, String uri);
-  
-  /**
-   * Convenience method for extensibly validators to add warning messages.
-   * 
-   * @param message The warning to add.
-   * @param element The object to add the warning for.
-   */
-  public void addWarning(String message, Object element);
-  
-  /**
-   * Add a warning message at the given line and column.
-   * 
-   * @param message The warning to add.
-   * @param line The line location of the warning.
-   * @param column The column location of the warning.
-   * @param uri The uri of the file containing the warning.
-   */
-  public void addWarning(String message, int line, int column, String uri);
-  
-  /**
-   * Get the URI resolver in use for this validation. The URI resolver
-   * returned is actually a URI resolver handler that will 
-   * iterate through all of the registered URI resolvers.
-   * 
-   * @return The URI resolver handler.
-   */
-  public URIResolver getURIResolver();
-  
-  /**
-   * Get the schema cache if one is specified.
-   * 
-   * @return The schema cache if one is specified, null otherwise.
-   */
-  public XMLGrammarPool getSchemaCache();
-  
-  /**
-   * Get the XML cache if one is specified.
-   * 
-   * @return The XML cache if one is specified, null otherwise.
-   */
-  public XMLGrammarPool getXMLCache();
-}
-
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/IWSDL11Validator.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/IWSDL11Validator.java
deleted file mode 100644
index a6bd2e23d..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/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/org/eclipse/wst/wsdl/validation/internal/wsdl11/ImportHolder.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/ImportHolder.java
deleted file mode 100644
index 33120c048..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/ImportHolder.java
+++ /dev/null
@@ -1,610 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.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.xni.grammars.XMLGrammarPool;
-import org.apache.xerces.xs.XSModel;
-import org.eclipse.wst.wsdl.validation.internal.IValidationMessage;
-import org.eclipse.wst.wsdl.validation.internal.resolver.IURIResolutionResult;
-import org.eclipse.wst.wsdl.validation.internal.util.ErrorMessage;
-import org.eclipse.wst.wsdl.validation.internal.util.MessageGenerator;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd.XSDValidator;
-import org.eclipse.wst.wsdl.validation.internal.xml.AbstractXMLConformanceFactory;
-import org.eclipse.wst.wsdl.validation.internal.xml.DefaultXMLValidator;
-import org.eclipse.wst.wsdl.validation.internal.xml.IXMLValidator;
-import org.eclipse.wst.wsdl.validation.internal.xml.XMLCatalogResolver;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.InputSource;
-
-import com.ibm.wsdl.Constants;
-import com.ibm.wsdl.util.StringUtils;
-import com.ibm.wsdl.util.xml.DOMUtils;
-import com.ibm.wsdl.util.xml.QNameUtils;
-
-/**
- * A class to hold and parse an import element.
- */
-public class ImportHolder implements Comparable
-{
-  private MessageGenerator messagegenerator;
-  
-  private WSDLDocument importingWSDLDoc = null;
-  private WSDLDocument wsdlDocument = null;
-  private Definition importingDef = null;
-  private Element importingDocImportElement = null;
-  private String namespace = null;
-  private String location = null;
-  private String classpathURI = null;
-  private String contextURI = null;
-  private int depth;
-  private Element element = null;
-  private List schemas = new ArrayList();
-  private boolean isWSDLFileImport = true;
-  private boolean importInvalid = false;
-  private Import importDef = null;
-  private IWSDL11ValidationInfo valinfo;
-  
-  /**
-   * Constructor.
-   * 
-   * @param namespace The namespace of the import.
-   * @param location The location of the import.
-   * @param contextURI The context URI for resolving the import location.
-   * @param wsdlDoc The WSDLDocument that contains the import.
-   * @param depth The depth of the import.
-   * @param importingDocImportElement The element representing the import in the encapsulating WSDLDocument.
-   * @param messagegenerator A messagegenerator for obtaining strings.
-   * @param valinfo The WSDL11ValidationInfo for reporting messages.
-   */
-  public ImportHolder(String namespace, String location, String contextURI, WSDLDocument importingWSDLDoc, int depth, Element importingDocImportElement, MessageGenerator messagegenerator, IWSDL11ValidationInfo valinfo)
-  {
-    this.messagegenerator = messagegenerator;
-    this.valinfo = valinfo;
-    this.importingWSDLDoc = importingWSDLDoc;
-    if(importingWSDLDoc != null)
-    {
-      this.importingDef = importingWSDLDoc.getDefinition();
-    }
-    this.importingDocImportElement = importingDocImportElement;
-    this.depth = depth;
-    this.namespace = namespace;
-    this.location = location;
-    
-    //  Allow WSDL imports to have no location attribute even though it is required.
-    // Schema will normally catch the problem but this allows users to override the
-    // schema and have the validator run.
-    if (this.location == null)
-    {
-      this.location = namespace;
-    }
-    this.contextURI = contextURI;
-    
-    this.location = this.location.replace('\\','/');
-    IURIResolutionResult classpathURI = valinfo.getURIResolver().resolve(this.contextURI, this.namespace, this.location);
-    if(classpathURI.getLogicalLocation() != null)
-    {
-      this.location = classpathURI.getLogicalLocation();
-    }
-    if(classpathURI.getPhysicalLocation() != null)
-    {
-      this.classpathURI = classpathURI.getPhysicalLocation();
-      this.contextURI = null;
-    } 
-  }
-  
-  public void initialize()
-  {
-    Element documentElement = null;
-    try
-    {
-      documentElement = getElement();
-    }
-    catch(WSDLException e)
-    {
-    }
-    if(documentElement != null)
-    {
-  	  // Handle WSDL imports.
-      if (QNameUtils.matches(Constants.Q_ELEM_DEFINITIONS, documentElement))
-      {
-        if(isXMLValid(this.classpathURI))
-        {
-          try
-          {
-            wsdlDocument = new WSDLDocument(this.location, documentElement, this.depth, this.messagegenerator, this.valinfo);
-            createWSDLImport(wsdlDocument);
-          }
-          catch(WSDLException e)
-          {
-            valinfo.addError(messagegenerator.getString("_UNABLE_TO_IMPORT_BAD_LOCATION", "'" + importDef.getLocationURI() + "'"), importingDocImportElement);
-          }
-        }
-      }
-      // Handle schema imports.
-      else if (QNameUtils.matches(Constants.Q_ELEM_XSD_2001, documentElement))
-      {
-        createXSDImport();
-      }
-    }
-  }
-  
-  protected boolean isXMLValid(String uri)
-  {
-    IXMLValidator xmlValidator = AbstractXMLConformanceFactory.getInstance().getXMLValidator();
-    xmlValidator.setFile(uri);
-    xmlValidator.setURIResolver(valinfo.getURIResolver());
-    //xmlValidator.setValidationInfo(valInfo);
-    if(xmlValidator instanceof DefaultXMLValidator)
-    {
-    	XMLGrammarPool grammarPool = valinfo.getXMLCache();
-        if(grammarPool != null)
-          ((DefaultXMLValidator)xmlValidator).setGrammarPool(grammarPool);
-    }
-    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;
-    //Import importDef = importingDef.createImport();
-    
-    //  Allow locating WSDL documents using any registered URI resolver.
-    //String classpathURI = URIResolver.getInstance().resolve(contextURI, namespaceURI, locationURI);
-//    if (!classpathURI.equals(locationURI))
-//    {
-//      locationURI = classpathURI;
-//      contextURI = null;
-//    }
-    Reader reader = null;
-    if (locationURI != null)
-    {
-        try
-        {
-          //String contextURI = def.getDocumentBaseURI();
-          //Definition importedDef = null;
-          
-          InputSource inputSource = null;
-          URL url = null;
-
-          
-            URL contextURL = (contextURI != null) ? StringUtils.getURL(null, contextURI) : null;
-
-            url = StringUtils.getURL(contextURL, locationURI);
-            
-            // Handle file:// urls. The correct format should be file:/// or file:/.
-            String urlAuthority = url.getAuthority();
-            String urlProtocol = url.getProtocol();
-            if(urlAuthority !=null && urlProtocol.equalsIgnoreCase("file") && !urlAuthority.equals(""))
-             {
-              url = new URL(urlProtocol,"","/" + urlAuthority + url.getFile());
-            }
-            
-            String urlString = url.toString();
-			// Test for case sensitivity on local files.
-			if(urlString.startsWith("file:"))
-			{
-			  File testfile = new File(url.getFile());
-			  String testfileString = testfile.getAbsolutePath();
-			  String canonicalfileString = testfile.getCanonicalPath();
-
-              if (!testfileString.equals(canonicalfileString))
-              {
-				if (!String.valueOf(testfileString.charAt(0)).equalsIgnoreCase
-				    (String.valueOf(canonicalfileString.charAt(0)))
-				    || !testfileString.substring(1,testfileString.length()).equals
-					(canonicalfileString.substring(1,canonicalfileString.length())))
-				{
-                  urlString = "";
-                  url = null;
-				}
-              }
-			}
-			if(url != null)
-			{
-			  try
-			  {
-                reader = StringUtils.getContentAsReader(url);
-			  }
-			  catch(IOException e)
-			  {
-			    // No need to do anything here. The error will be handled below.
-			  }
-			}
-            if (reader != null)
-            {
-              inputSource = new InputSource(reader);
-              if(classpathURI != null && !classpathURI.equals(location))
-  			  {
-  			    inputSource.setByteStream(new URL(classpathURI).openStream());
-  			  }
-            }
-
-            if (inputSource == null)
-            {
-              // Get the actual location from the element.
-              String actualLocation = DOMUtils.getAttribute(importingDocImportElement, Constants.ATTR_LOCATION);
-              if(actualLocation == null)
-              {
-              	actualLocation = DOMUtils.getAttribute(importingDocImportElement, "schemaLocation");
-              }
-              if(actualLocation == null)
-              {
-              	actualLocation = namespace;
-              }
-              importingWSDLDoc.addReaderWarning(
-                  importingDef,
-                  importingDocImportElement,
-                  messagegenerator.getString("_UNABLE_TO_IMPORT_BAD_LOCATION", "'" + actualLocation + "'"));
-              importInvalid = true;
-               
-              // TODO: modify the reader error to show in all the correct locations.
-              throw new WSDLException(
-                WSDLException.OTHER_ERROR,
-                "Unable to locate imported document "
-                  + "at '"
-                  + locationURI
-                  + "'"
-                  + (contextURI == null ? "." : ", relative to '" + contextURI + "'."));
-            }
-            Document doc = null;
-            try
-            {
-              doc = WSDLReaderImpl.getDocument(inputSource, locationURI);
-            }
-            catch(WSDLException e)
-            {
-              // The File is invalid and cannot be read. 
-              // Perform XML validation.
-              isXMLValid(locationURI);
-//              importingWSDLDoc.addReaderError(
-//                  importingDef,
-//                  importingDocImportElement,
-//                  messagegenerator.getString("_UNABLE_TO_IMPORT_INVALID", "'" + location + "'"));
-              throw e;
-            }
-            element = doc.getDocumentElement();
-            if(!QNameUtils.matches(Constants.Q_ELEM_DEFINITIONS, element))
-            {
-              isWSDLFileImport = false;
-            }
-            // Ensure that the imported document has the same namespace as the import element states.
-            String importTargetNS = element.getAttribute(Constants.ATTR_TARGET_NAMESPACE);
-            if(!importTargetNS.equals(namespace))
-            {
-              importingWSDLDoc.addReaderWarning(
-                  importingDef,
-                  importingDocImportElement,
-                  messagegenerator.getString("_WARN_WRONG_NS_ON_IMPORT", "'" + namespace + "'", "'" + importTargetNS + "'"));
-              element = null;
-              importInvalid = true;
-            }
-          }
-        
-        catch(Exception e)
-        {
-        }
-        finally
-        {
-          if(reader != null)
-          {
-            try
-            {
-              reader.close();
-            }
-            catch(IOException e)
-            {}
-          }
-        }
-      
-    }
-    return element;
-  }
-  
-  /**
-   * Create an import element for a WSDL import of a WSDL document.
-   * 
-   * @param wsdlDocument The document of the import.
-   * @return The newly created import element.
-   */
-  public Import createWSDLImport(WSDLDocument wsdlDocument)
-  {
-    if(importDef != null)
-    {
-      return importDef;
-    }
-    importDef = getNewImport();
-  
-    if (importDef != null)
-    {
-      importDef.setDefinition(wsdlDocument.getDefinition());
-      schemas.addAll(wsdlDocument.getSchemas());
-      importingWSDLDoc.addSchemas(schemas);
-    }
-
-    return importDef;
-  }
-  
-  /**
-   * Create an import element for a WSDL import of a schema import of a schema document.
-   * 
-   * @return The newly created import element.
-   */
-  public Import createXSDImport()
-  {
-    if(importDef != null)
-    {
-      return importDef;
-    }
-    importDef = getNewImport();
-    XSDValidator xsdvalidator = new XSDValidator();
-
-    xsdvalidator.validate(location, XMLCatalogResolver.getInstance(), valinfo.getSchemaCache());
-    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/org/eclipse/wst/wsdl/validation/internal/wsdl11/LocationHolder.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/LocationHolder.java
deleted file mode 100644
index 1def333f9..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/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/org/eclipse/wst/wsdl/validation/internal/wsdl11/ReaderError.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/ReaderError.java
deleted file mode 100644
index 36b4e44dc..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/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/org/eclipse/wst/wsdl/validation/internal/wsdl11/ValidatorRegistry.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/ValidatorRegistry.java
deleted file mode 100644
index 71484f1d7..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/ValidatorRegistry.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl11;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.ResourceBundle;
-
-
-/**
- * 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
-    if(!validatorReg.containsKey(namespace))
-    {
-      validatorReg.put(namespace, new WSDL11ValidatorDelegateContainer());
-    }
-    ((WSDL11ValidatorDelegateContainer)validatorReg.get(namespace)).addValidator(valDelegate);
-    //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 = "";
-    }
-    return (IWSDL11Validator)validatorReg.get(namespace);
-  }
-
-  /**
-   * 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;
-  }
-  
-  public class WSDL11ValidatorDelegateContainer implements IWSDL11Validator
-  {
-	private List validatorDelegates = new ArrayList();
-	
-	public void addValidator(WSDL11ValidatorDelegate delegate)
-	{
-	  validatorDelegates.add(delegate);
-	}
-
-	public void setResourceBundle(ResourceBundle rb) {
-		//Nothing to do
-		
-	}
-
-	public void validate(Object element, List parents, IWSDL11ValidationInfo valInfo) {
-		Iterator valDelIter = validatorDelegates.iterator();
-		while(valDelIter.hasNext())
-		{
-		  WSDL11ValidatorDelegate delegate = (WSDL11ValidatorDelegate)valDelIter.next();
-		  delegate.getValidator().validate(element, parents, valInfo);
-		}
-		
-	}
-	  
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDL11BasicValidator.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDL11BasicValidator.java
deleted file mode 100644
index bd7b98a9b..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDL11BasicValidator.java
+++ /dev/null
@@ -1,687 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.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);
-      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();
-      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("", SOAP_ENCODING_URI, null).getPhysicalLocation();
-        if(soapEnc != null)
-        {
-          xsdVal.validate(soapEnc, null, valInfo.getSchemaCache());
-          // 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/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDL11ValidationInfoImpl.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDL11ValidationInfoImpl.java
deleted file mode 100644
index bb364fa9a..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDL11ValidationInfoImpl.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.xni.grammars.XMLGrammarPool;
-import org.apache.xerces.xs.XSModel;
-import org.eclipse.wst.wsdl.validation.internal.Constants;
-import org.eclipse.wst.wsdl.validation.internal.IValidationInfo;
-import org.eclipse.wst.wsdl.validation.internal.ValidationInfoImpl;
-import org.eclipse.wst.wsdl.validation.internal.resolver.URIResolver;
-
-/**
- * An implemenation of WSDL11ValidationInfo.
- */
-public class WSDL11ValidationInfoImpl implements IWSDL11ValidationInfo
-{
-  private IValidationInfo valinfo = null;
-  private Hashtable elementlocations = null;
-  private List schemas = new Vector();
-  
-  public WSDL11ValidationInfoImpl(IValidationInfo valinfo)
-  {
-    this.valinfo = valinfo;
-  }
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11ValidationInfo#getFileURI()
-   */
-  public String getFileURI()
-  {
-    return valinfo.getFileURI();
-  }
-
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11ValidationInfo#addSchema(org.apache.xerces.xs.XSModel)
-   */
-  public void addSchema(XSModel xsModel)
-  {
-    if (xsModel != null)
-    {
-      schemas.add(xsModel);
-    }
-
-  }
-
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11ValidationInfo#getSchemas()
-   */
-  public XSModel[] getSchemas()
-  {
-    return (XSModel[])schemas.toArray(new XSModel[schemas.size()]);
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wsdl.validate.wsdl11.WSDL11ValidationInfo#cleardSchemas()
-   */
-  public void clearSchemas()
-  {
-    schemas.clear();
-  }
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11ValidationInfo#setElementLocations(java.util.Hashtable)
-   */
-  public void setElementLocations(Hashtable elementLocations)
-  {
-    this.elementlocations = elementLocations;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11ValidationInfo#addError(java.lang.String, java.lang.Object)
-   */
-  public void addError(String message, Object element)
-  {
-    addError(message, element, null, null);
-  }
-  
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11ValidationInfo#addError(java.lang.String, java.lang.Object, java.lang.String, java.lang.Object[])
-   */
-  public void addError(String message, Object element, String errorKey, Object[] messageArguments)
-  {
-    LocationHolder location;
-    if (elementlocations.containsKey(element))
-    {
-      location = (LocationHolder)elementlocations.get(element);
-      addError(message, location.getLine(), location.getColumn(), location.getURI(), errorKey, messageArguments);
-    }
-    // if we give it an element that hasn't been defined we'll set the location
-    // at (0,0) so the error shows up but no line marker in the editor
-    else
-    {
-      addError(message, 0, 1, getFileURI());
-    }
-  }
-
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11ValidationInfo#addWarning(java.lang.String, java.lang.Object)
-   */
-  public void addWarning(String message, Object element)
-  {
-    LocationHolder location;
-    if (elementlocations.containsKey(element))
-    {
-      location = (LocationHolder)elementlocations.get(element);
-      addWarning(message, location.getLine(), location.getColumn(), location.getURI());
-    }
-    // if we give it an element that hasn't been defined we'll set the location
-    // at (0,0) so the error shows up but no line marker in the editor
-    else
-    {
-      addWarning(message, 0, 1, getFileURI());
-    }
-
-  }
-
-  /**
-   * @see org.eclipse.wsdl.validate.wsdl11.WSDL11ValidationInfo#addNamespaceWithNoValidator(java.lang.String)
-   */
-//  public void addNamespaceWithNoValidator(String namespace)
-//  {
-//    valinfo.addNamespaceWithNoValidator(namespace);
-//
-//  }
-
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11ValidationInfo#addError(java.lang.String, int, int)
-   */
-  public void addError(String message, int line, int column, String uri)
-  {
-    addError(message, line, column, uri, null, null);
-  }
-
-  public void addError(String message, int line, int column, String uri, String errorKey, Object[] messageArguments)
-  { 
-    try
-    { ((ValidationInfoImpl)valinfo).addError(message, line, column, uri, errorKey, messageArguments);
-    }
-    catch (ClassCastException e)
-    { System.err.println(e);
-      valinfo.addError(message, line, column, uri);
-    }
-  }
-  
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11ValidationInfo#addWarning(java.lang.String, int, int)
-   */
-  public void addWarning(String message, int line, int column, String uri)
-  {
-    valinfo.addWarning(message, line, column, uri);
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wsdl.validate.wsdl11.WSDL11ValidationInfo#getURIResolver()
-   */
-  public URIResolver getURIResolver() 
-  {
-	return valinfo.getURIResolver();
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11ValidationInfo#getSchemaCache()
-   */
-  public XMLGrammarPool getSchemaCache() 
-  {
-	XMLGrammarPool grammarPool = (XMLGrammarPool)valinfo.getAttribute(Constants.XMLSCHEMA_CACHE_ATTRIBUTE);
-	return grammarPool;
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11ValidationInfo#getXMLCache()
-   */
-  public XMLGrammarPool getXMLCache() 
-  {
-	XMLGrammarPool grammarPool = (XMLGrammarPool)valinfo.getAttribute(Constants.XML_CACHE_ATTRIBUTE);
-	return grammarPool;
-  }
-  
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDL11ValidatorController.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDL11ValidatorController.java
deleted file mode 100644
index aa46e81bb..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/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/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDL11ValidatorDelegate.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDL11ValidatorDelegate.java
deleted file mode 100644
index e627a7812..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/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/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDLDocument.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDLDocument.java
deleted file mode 100644
index 4063bfda6..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDLDocument.java
+++ /dev/null
@@ -1,2005 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl11;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.Vector;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingFault;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.BindingOutput;
-import javax.wsdl.Definition;
-import javax.wsdl.Fault;
-import javax.wsdl.Input;
-import javax.wsdl.Message;
-import javax.wsdl.Operation;
-import javax.wsdl.OperationType;
-import javax.wsdl.Output;
-import javax.wsdl.Part;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.Types;
-import javax.wsdl.WSDLException;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.ExtensionDeserializer;
-import javax.wsdl.extensions.ExtensionRegistry;
-import javax.wsdl.extensions.UnknownExtensibilityElement;
-import javax.wsdl.factory.WSDLFactory;
-import javax.xml.namespace.QName;
-
-import org.apache.xerces.dom.ElementImpl;
-import org.apache.xerces.dom.ElementNSImpl;
-import org.apache.xerces.xs.XSModel;
-import org.eclipse.wst.wsdl.validation.internal.util.MessageGenerator;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd.InlineSchemaValidator;
-import org.eclipse.wst.wsdl.validation.internal.xml.ElementLocation;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-import com.ibm.wsdl.Constants;
-import com.ibm.wsdl.util.StringUtils;
-import com.ibm.wsdl.util.xml.DOMUtils;
-import com.ibm.wsdl.util.xml.QNameUtils;
-import com.ibm.wsdl.util.xml.XPathUtils;
-
-/**
- * A WSDL document that knows how to parse itself.
- */
-public class WSDLDocument
-{
-  private static final List STYLE_ONE_WAY = Arrays.asList(new String[] { Constants.ELEM_INPUT });
-  private static final List STYLE_REQUEST_RESPONSE =
-    Arrays.asList(new String[] { Constants.ELEM_INPUT, Constants.ELEM_OUTPUT });
-  private static final List STYLE_SOLICIT_RESPONSE =
-    Arrays.asList(new String[] { Constants.ELEM_OUTPUT, Constants.ELEM_INPUT });
-  private static final List STYLE_NOTIFICATION = Arrays.asList(new String[] { Constants.ELEM_OUTPUT });
-  
-  private static final String _ERROR_MULTIPLE_TYPES_DEFINED = "_ERROR_MULTIPLE_TYPES_DEFINED";
-  private static final String _UNABLE_TO_IMPORT_NO_LOCATION = "_UNABLE_TO_IMPORT_NO_LOCATION";
-
-  protected ExtensionRegistry extReg = null;
-  protected String factoryImplName = null;
-
-  // store the element locations within the file - line and column numbers
-  // the location info is stored as an int array of length 2 {linenumber, colnumber}
-  protected Hashtable elementLocations = new Hashtable();
-  
-  // hold the reader errors
-  protected List readerErrors = new ArrayList();
-  protected List readerWarnings = new ArrayList();
-  protected MessageGenerator messagegenerator;
-  
-  private Definition def = null;
-  private Set importedDefs = new TreeSet();
-  private Element typesEl = null;
-  private List messages = new ArrayList();
-  private List porttypes = new ArrayList();
-  private List bindings = new ArrayList();
-  private List services = new ArrayList();
-  private List extelements = new ArrayList();
-  private int depth;
-  // Hold the schemas that are imported or declared inline in this wsdl document.
-  private List schemas = new ArrayList();
-  private IWSDL11ValidationInfo valinfo;
-  
-  /**
-   * Constructor. Performs a preparse of the document and handles imports and types.
-   * 
-   * @param documentBaseURI The URI of this WSDL document.
-   * @param defEl The definitions element.
-   * @param depth The depth of this document in a document tree.
-   * @param messagegenerator A messagegenerator used for retrieving strings.
-   * @param valinfo A WSDL11ValidationInfo object for reporting messages.
-   * @throws WSDLException
-   */
-  public WSDLDocument(String documentBaseURI, Element defEl, int depth, MessageGenerator messagegenerator, IWSDL11ValidationInfo valinfo) throws WSDLException
-  {
-    this.messagegenerator = messagegenerator;
-    this.valinfo = valinfo;
-    this.depth = depth;
-    
-    checkElementName(defEl, Constants.Q_ELEM_DEFINITIONS);
-    
-    WSDLFactory factory =
-      (factoryImplName != null) ? WSDLFactory.newInstance(factoryImplName) : WSDLFactory.newInstance();
-    def = factory.newDefinition();
-    // Fix for WSDL4J adding default WSDL namespace when no default
-    // namespace has been declared.
-    // TODO: Remove this fix once fixed in WSDL4J.
-    if(def.getNamespace("") != null)
-    	def.getNamespaces().remove("");
-
-    if (extReg != null)
-    {
-      def.setExtensionRegistry(extReg);
-    }
-
-    String name = DOMUtils.getAttribute(defEl, Constants.ATTR_NAME);
-    String targetNamespace = DOMUtils.getAttribute(defEl, Constants.ATTR_TARGET_NAMESPACE);
-    NamedNodeMap attrs = defEl.getAttributes();
-
-    if (documentBaseURI != null)
-    {
-      def.setDocumentBaseURI(documentBaseURI);
-    }
-
-    if (name != null)
-    {
-      def.setQName(new QName(targetNamespace, name));
-    }
-
-    if (targetNamespace != null)
-    {
-      def.setTargetNamespace(targetNamespace);
-    }
-
-    int size = attrs.getLength();
-
-    for (int i = 0; i < size; i++)
-    {
-      Attr attr = (Attr)attrs.item(i);
-      String namespaceURI = attr.getNamespaceURI();
-      String localPart = attr.getLocalName();
-      String value = attr.getValue();
-
-      if (namespaceURI != null && namespaceURI.equals(Constants.NS_URI_XMLNS))
-      {
-        if (localPart != null && !localPart.equals(Constants.ATTR_XMLNS))
-        {
-          def.addNamespace(localPart, value);
-        }
-        else
-        {
-          def.addNamespace(null, value);
-        }
-      }
-    }
-
-    // There are problems when the model is created and the order of elements is not
-    // Import - Types - Message - PortType - Binding - Service so we need to read them
-    // into the model in that order
-    // Performance wise this should be modified as we have to make 5 extra loops through
-    // all of the elements as a result
-
-    // take care of Imports, Types, Documentation and extensibleelements together - saves a pass for Documentation 
-    // later and Docs don't effect anything else - Imports and Types are essentially the same thing
-    // no preconceived ideas about extensible elements
-    Element tempEl = DOMUtils.getFirstChildElement(defEl);
-
-    while (tempEl != null)
-    {
-
-      if (QNameUtils.matches(Constants.Q_ELEM_IMPORT, tempEl))
-      {
-        String namespaceURI = DOMUtils.getAttribute(tempEl, Constants.ATTR_NAMESPACE);
-        String locationURI = DOMUtils.getAttribute(tempEl, Constants.ATTR_LOCATION);
-        if(locationURI == null || locationURI.equals(""))
-        {
-          addReaderError(def, tempEl, messagegenerator.getString(_UNABLE_TO_IMPORT_NO_LOCATION));
-        }
-        else
-        {
-          ImportHolder ih = new ImportHolder(namespaceURI, locationURI, def.getDocumentBaseURI(), this, depth+1, tempEl, messagegenerator, valinfo);
-          importedDefs.add(ih);
-        }
-        setLocation(tempEl, tempEl);
-//        if (importedDefs == null)
-//        {
-//          importedDefs = new Hashtable();
-//        }
-//        if (documentBaseURI != null)
-//        {
-//          importedDefs.put(documentBaseURI, def);
-//        }
-//        def.addImport(parseImport(tempEl, def, importedDefs));
-      }
-      else if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
-      {
-        def.setDocumentationElement(tempEl);
-      }
-      else if (QNameUtils.matches(Constants.Q_ELEM_TYPES, tempEl))
-      {
-        if(typesEl != null)
-        {
-          setLocation(tempEl, tempEl);
-          addReaderError(def, tempEl, messagegenerator.getString(_ERROR_MULTIPLE_TYPES_DEFINED));
-        }
-        else
-        {
-          typesEl = tempEl;
-          parseTypes();
-        }
-//        def.setTypes(parseTypes(tempEl, def));
-      }
-      else if (QNameUtils.matches(Constants.Q_ELEM_MESSAGE, tempEl))
-      {
-        messages.add(tempEl);
-        //def.addMessage(parseMessage(tempEl, def));
-      }
-      else if (QNameUtils.matches(Constants.Q_ELEM_PORT_TYPE, tempEl))
-      {
-        porttypes.add(tempEl);
-        //             PortType pt = parsePortType(tempEl, def);
-        //             if(pt != null)
-        //             {
-        //          def.addPortType(pt);
-        //             }
-      }
-      else if (QNameUtils.matches(Constants.Q_ELEM_BINDING, tempEl))
-      {
-        bindings.add(tempEl);
-        //def.addBinding(parseBinding(tempEl, def));
-      }
-      else if (QNameUtils.matches(Constants.Q_ELEM_SERVICE, tempEl))
-      {
-        services.add(tempEl);
-        //def.addService(parseService(tempEl, def));
-      }
-      else
-      {
-        extelements.add(tempEl);
-        //        def.addExtensibilityElement(
-        //          parseExtensibilityElement(Definition.class, tempEl, def));
-      }
-      tempEl = DOMUtils.getNextSiblingElement(tempEl);
-    }
-
-  }
-  
-  /**
-   * Get the definitions element for this document.
-   * 
-   * @return The definitions element for this document.
-   */
-  public Definition getDefinition()
-  {
-    return def;
-  }
-  
-  /**
-   * Get a set of the imports in this document.
-   * 
-   * @return A set of the imports in this document.
-   */
-  public Set getImports()
-  {
-    return importedDefs;
-  }
-  
-  /**
-   * 
-   * @param def
-   * @param doc
-   * @param namespace
-   * @param location
-   */
-//  public void setImport(Definition def, Element doc, String namespace, String location)
-//  {
-//    if(location == null || location.equals(""))
-//    {
-//      valinfo.addError()_UNABLE_TO_IMPORT_NO_LOCATION 
-//    }
-//    Import imp = def.createImport();
-//    imp.setDefinition(def);
-//    imp.setDocumentationElement(doc);
-//    imp.setNamespaceURI(namespace);
-//    imp.setLocationURI(location);
-//    def.addImport(imp);
-//  }
-  
-  /**
-   * Parse the types in the WSDL document. Handles documentation, import and schema
-   * elements.
-   */
-  public void parseTypes()
-  {
-    Types types = def.createTypes();
-
-    Element tempEl = DOMUtils.getFirstChildElement(typesEl);
-
-    while (tempEl != null)
-    {
-      if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
-      {
-        types.setDocumentationElement(tempEl);
-      }
-      else if (tempEl.getLocalName().equalsIgnoreCase("import"))
-        //else if (QNameUtils.matches(Constants.Q_ELEM_IMPORT, tempEl))
-      {
-        // this shouldn't really be used here but a little hack will make
-        // life easier
-        //parseImport(tempEl, def, (Map)new Hashtable());
-        String namespaceURI = DOMUtils.getAttribute(tempEl, Constants.ATTR_NAMESPACE);
-        String locationURI = DOMUtils.getAttribute(tempEl, "schemaLocation");
-        importedDefs.add(new ImportHolder(namespaceURI, locationURI, def.getDocumentBaseURI(), this, depth+1, tempEl, messagegenerator, valinfo));
-        try
-        {
-          types.addExtensibilityElement(parseExtensibilityElement(Types.class, tempEl, def));
-        }
-        catch(WSDLException e)
-        {
-          
-        }
-      }
-      else
-      {
-        try
-        {
-          ExtensibilityElement extElem = parseExtensibilityElement(Types.class, tempEl, def);
-          types.addExtensibilityElement(extElem);
-        }
-        catch(WSDLException e)
-        {
-          
-        }
-      }
-
-      tempEl = DOMUtils.getNextSiblingElement(tempEl);
-    }
-    def.setTypes(types);
-    
-    valinfo.setElementLocations(elementLocations);
-    List typesElems = types.getExtensibilityElements();
-    if(typesElems != null)
-    {
-      Iterator typesElemsIter = typesElems.iterator();
-      while(typesElemsIter.hasNext())
-      {
-        ExtensibilityElement typeElement = (ExtensibilityElement)typesElemsIter.next();
-        
-        InlineSchemaValidator xsdVal = new InlineSchemaValidator();
-        xsdVal.setMessageGenerator(messagegenerator);
-    
-        List parents = new ArrayList();
-        parents.add(def);
-        parents.add(0,types);
-        xsdVal.validate(typeElement, parents,valinfo);
-        XSModel[] typesSchemas = valinfo.getSchemas();
-        List typesSchemaList = new ArrayList();
-        for(int i = 0; i < typesSchemas.length; i++)
-        {  
-          typesSchemaList.add(typesSchemas[i]);
-        }
-        schemas.addAll(typesSchemaList);
-        valinfo.clearSchemas();
-      }
-    }
-    valinfo.setElementLocations(null);
-  }
-  
-  /**
-   * Parse the messages in this document.
-   */
-  public void parseMessages()
-  {
-    for (int i = 0; i < messages.size(); i++)
-    {
-      try
-      {
-        def.addMessage(parseMessage((Element)messages.get(i), def));
-      }
-      catch(WSDLException e)
-      {}
-    }
-  }
-  
-  /**
-   * Parse the portTypes in this document.
-   */
-  public void parsePorttypes()
-  {
-    for (int i = 0; i < porttypes.size(); i++)
-    {
-      try
-      {
-        PortType pt = parsePortType((Element)porttypes.get(i), def);
-        if (pt != null)
-        {
-          def.addPortType(pt);
-        }
-      }
-      catch(WSDLException e)
-      {}
-    }
-  }
-  
-  /**
-   * Parse the bindings in this document.
-   */
-  public void parseBindings()
-  {
-    for (int i = 0; i < bindings.size(); i++)
-    {
-      try
-      {
-        def.addBinding(parseBinding((Element)bindings.get(i), def));
-      }
-      catch(WSDLException e)
-      {}
-    }
-  }
-  
-  /**
-   * Parse the services in this document.
-   */
-  public void parseServices()
-  {
-    for (int i = 0; i < services.size(); i++)
-    {
-      try
-      {
-        def.addService(parseService((Element)services.get(i), def));
-      }
-      catch(WSDLException e)
-      {}
-    }
-  }
-  
-  /**
-   * Parse the extensibility elements in this document.
-   */
-  public void parseExtensibilityElements()
-  {
-    for (int i = 0; i < extelements.size(); i++)
-    {
-      try
-      {
-        def.addExtensibilityElement(parseExtensibilityElement(Definition.class, (Element)extelements.get(i), def));
-      }
-      catch(WSDLException e)
-      {}
-    }
-  }
-  
-  /**
-   * Add the given list of schemas to the schemas for this document.
-   * 
-   * @param schemas The list of schemas to add to this document's schemas.
-   */
-  public void addSchemas(List schemas)
-  {
-    this.schemas.addAll(schemas);
-  }
-  
-  /**
-   * Get the schemas associated with this document.
-   * 
-   * @return The schemas associated with this document.
-   */
-  public List getSchemas()
-  {
-    return schemas;
-  }
-  
-  /**
-   * Parse the specified binding.
-   * 
-   * @param bindingEl The binding element.
-   * @param def The definitions element.
-   * @return A WSDL binding element.
-   * @throws WSDLException
-   */
-  protected Binding parseBinding(Element bindingEl, Definition def) throws WSDLException
-  {
-    Binding binding = null;
-    String name = DOMUtils.getAttribute(bindingEl, Constants.ATTR_NAME);
-    QName portTypeName;
-    try
-    {
-      portTypeName = DOMUtils.getQualifiedAttributeValue(bindingEl, Constants.ATTR_TYPE, Constants.ELEM_BINDING, false);
-    }
-    catch (Exception e)
-    {
-      //the call above fails if there is no qualified namespace for the message name
-      portTypeName = new QName(null, DOMUtils.getAttribute(bindingEl, "type"));
-    }
-
-    PortType portType = null;
-
-    if (name != null)
-    {
-      QName bindingName = new QName(def.getTargetNamespace(), name);
-
-      binding = def.getBinding(bindingName);
-
-      if (binding == null)
-      {
-        binding = def.createBinding();
-        binding.setQName(bindingName);
-      }
-      // report an error if a binding with this name has already been defined
-      else if (!binding.isUndefined())
-      {
-        //addReaderError(def,bindingEl, "_BINDING_NAME_ALREADY_DEFINED");       
-        addReaderError(
-          def,
-          bindingEl,
-          messagegenerator.getString("_BINDING_NAME_ALREADY_DEFINED", "'" + binding.getQName().getLocalPart() + "'"));
-      }
-    }
-    else
-    {
-      binding = def.createBinding();
-    }
-
-    // Whether it was retrieved or created, the definition has been found.
-    binding.setUndefined(false);
-
-    if (portTypeName != null)
-    {
-      portType = def.getPortType(portTypeName);
-
-      if (portType == null)
-      {
-        portType = def.createPortType();
-        portType.setQName(portTypeName);
-        def.addPortType(portType);
-      }
-
-      binding.setPortType(portType);
-    }
-
-    Element tempEl = DOMUtils.getFirstChildElement(bindingEl);
-
-    while (tempEl != null)
-    {
-      if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
-      {
-        binding.setDocumentationElement(tempEl);
-      }
-      else if (QNameUtils.matches(Constants.Q_ELEM_OPERATION, tempEl))
-      {
-        binding.addBindingOperation(parseBindingOperation(tempEl, portType, def));
-      }
-      else
-      {
-        binding.addExtensibilityElement(parseExtensibilityElement(Binding.class, tempEl, def));
-      }
-
-      tempEl = DOMUtils.getNextSiblingElement(tempEl);
-    }
-
-    // add the location of this element to elementLocations 
-    setLocation(binding, bindingEl);
-
-    return binding;
-  }
-
-  /**
-   * Parse a specific binding operation.
-   * 
-   * @param bindingOperationEl The binding operation element.
-   * @param portType The portType the binding references.
-   * @param def The definitions element.
-   * @return A WSDL binding operation element.
-   * @throws WSDLException
-   */
-  protected BindingOperation parseBindingOperation(Element bindingOperationEl, PortType portType, Definition def)
-    throws WSDLException
-  {
-    BindingOperation bindingOperation = def.createBindingOperation();
-    String name = DOMUtils.getAttribute(bindingOperationEl, Constants.ATTR_NAME);
-
-    if (name != null)
-    {
-      bindingOperation.setName(name);
-    }
-
-    Element tempEl = DOMUtils.getFirstChildElement(bindingOperationEl);
-
-    while (tempEl != null)
-    {
-      if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
-      {
-        bindingOperation.setDocumentationElement(tempEl);
-      }
-      else if (QNameUtils.matches(Constants.Q_ELEM_INPUT, tempEl))
-      {
-        bindingOperation.setBindingInput(parseBindingInput(tempEl, def));
-      }
-      else if (QNameUtils.matches(Constants.Q_ELEM_OUTPUT, tempEl))
-      {
-        bindingOperation.setBindingOutput(parseBindingOutput(tempEl, def));
-      }
-      else if (QNameUtils.matches(Constants.Q_ELEM_FAULT, tempEl))
-      {
-        bindingOperation.addBindingFault(parseBindingFault(tempEl, def));
-      }
-      else
-      {
-        bindingOperation.addExtensibilityElement(parseExtensibilityElement(BindingOperation.class, tempEl, def));
-      }
-
-      tempEl = DOMUtils.getNextSiblingElement(tempEl);
-    }
-
-    if (portType != null)
-    {
-      BindingInput bindingInput = bindingOperation.getBindingInput();
-      BindingOutput bindingOutput = bindingOperation.getBindingOutput();
-      //String inputName = (bindingInput != null ? bindingInput.getName() : null);
-      //String outputName = (bindingOutput != null ? bindingOutput.getName() : null);
-
-      // hack code to get at operations that are defined with the same name but different
-      // inputs and outputs 
-      Operation op = null;
-      List operations = portType.getOperations();
-      // get a list of all operations with matching names
-      List matchingOperations = new Vector();
-      Iterator iOperations = operations.iterator();
-      while (iOperations.hasNext())
-      {
-        Operation oper = (Operation)iOperations.next();
-        if (oper.getName().equalsIgnoreCase(bindingOperation.getName()))
-        {
-          matchingOperations.add(oper);
-        }
-      }
-
-      if (matchingOperations != null)
-      {
-        // If there's only one matching operation this is what we're referring to.
-        // Only matching if binding operation input name and output name are
-        // both null or the same as the portType operation input and output names.
-        // the portType operation name
-        if (matchingOperations.size() == 1)
-        {
-          // only say the single operation is the one we're looking for if the names
-          // of the binding input and output are not specified
-          Operation tempOp = (Operation)matchingOperations.get(0);
-          boolean inputOK = false;
-          boolean outputOK = false;
-          Input tempInput = tempOp.getInput();
-          Output tempOutput = tempOp.getOutput();
-
-          // order is important in these conditions. condition 2 must fail for 3 to work
-          // check the input
-          if (tempInput == null && bindingInput == null)
-          {
-            inputOK = true;
-          }
-          else if (bindingInput == null || bindingInput.getName() == null)
-          {
-            inputOK = true;
-          }
-          else if (tempInput != null && bindingInput.getName().equals(tempInput.getName()))
-          {
-            inputOK = true;
-          }
-          // check the output
-          if (tempOutput == null && bindingOutput == null)
-          {
-            outputOK = true;
-          }
-          else if (bindingOutput == null || bindingOutput.getName() == null)
-          {
-            outputOK = true;
-          }
-          else if (tempOutput != null && bindingOutput.getName().equals(tempOutput.getName()))
-          {
-            outputOK = true;
-          }
-          if (inputOK && outputOK)
-          {
-            op = tempOp;
-          }
-          //          op = (Operation) matchingOperations.get(0);
-        }
-        // otherwise find the operation with the same name, inputname, outputname signature
-        if (matchingOperations != null && op == null)
-        {
-          Iterator iMatchingOperations = matchingOperations.iterator();
-          while (iMatchingOperations.hasNext())
-          {
-
-            boolean inputNamesEqual = false;
-            boolean outputNamesEqual = false;
-            Operation oper = (Operation)iMatchingOperations.next();
-            //          if (oper.getName().equalsIgnoreCase(bindingOperation.getName()))
-            //          {
-            Input opInput = oper.getInput();
-            if (opInput != null && bindingInput != null)
-            {
-              String opInputName = opInput.getName();
-              String bindingInputName = bindingInput.getName();
-              if (opInputName != null && opInputName.equalsIgnoreCase(bindingInputName))
-              {
-                inputNamesEqual = true;
-              }
-              else if (opInputName == null && bindingInputName == null)
-              {
-                inputNamesEqual = true;
-              }
-            }
-            else if (opInput == null && bindingInput == null)
-            {
-              inputNamesEqual = true;
-            }
-            Output opOutput = oper.getOutput();
-            if (opOutput != null && bindingOutput != null)
-            {
-              String opOutputName = opOutput.getName();
-              String bindingOutputName = bindingOutput.getName();
-              if (opOutputName != null && opOutputName.equalsIgnoreCase(bindingOutputName))
-              {
-                outputNamesEqual = true;
-              }
-              else if (opOutputName == null && bindingOutputName == null)
-              {
-                outputNamesEqual = true;
-              }
-            }
-            else if (opOutput == null && bindingOutput == null)
-            {
-              outputNamesEqual = true;
-            }
-            if (inputNamesEqual && outputNamesEqual)
-            {
-              op = oper;
-              break;
-            }
-            //}
-          }
-        }
-      }
-      //Operation op = portType.getOperation(name, inputName, outputName);
-
-      if (op == null)
-      {
-        op = def.createOperation();
-        op.setName(name);
-        portType.addOperation(op);
-      }
-
-      bindingOperation.setOperation(op);
-    }
-
-    // add the location of this element to elementLocations 
-    setLocation(bindingOperation, bindingOperationEl);
-
-    return bindingOperation;
-  }
-  
-  /**
-   * Parse a specific binding input element.
-   * 
-   * @param bindingInputEl The binding input element.
-   * @param def The definitions element.
-   * @return A WSDL binding input element.
-   * @throws WSDLException
-   */
-  protected BindingInput parseBindingInput(Element bindingInputEl, Definition def) throws WSDLException
-  {
-    BindingInput bindingInput = def.createBindingInput();
-    String name = DOMUtils.getAttribute(bindingInputEl, Constants.ATTR_NAME);
-
-    if (name != null)
-    {
-      bindingInput.setName(name);
-    }
-
-    Element tempEl = DOMUtils.getFirstChildElement(bindingInputEl);
-
-    while (tempEl != null)
-    {
-      if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
-      {
-        bindingInput.setDocumentationElement(tempEl);
-      }
-      else
-      {
-        bindingInput.addExtensibilityElement(parseExtensibilityElement(BindingInput.class, tempEl, def));
-      }
-
-      tempEl = DOMUtils.getNextSiblingElement(tempEl);
-    }
-
-    // add the location of this element to elementLocations 
-    setLocation(bindingInput, bindingInputEl);
-
-    return bindingInput;
-  }
-
-  /**
-   * Parse a specific binding output element.
-   * 
-   * @param bindingOutputEl The binding output element.
-   * @param def The definitions element.
-   * @return A WSDL binding output element.
-   * @throws WSDLException
-   */
-  protected BindingOutput parseBindingOutput(Element bindingOutputEl, Definition def) throws WSDLException
-  {
-    BindingOutput bindingOutput = def.createBindingOutput();
-    String name = DOMUtils.getAttribute(bindingOutputEl, Constants.ATTR_NAME);
-
-    if (name != null)
-    {
-      bindingOutput.setName(name);
-    }
-
-    Element tempEl = DOMUtils.getFirstChildElement(bindingOutputEl);
-
-    while (tempEl != null)
-    {
-      if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
-      {
-        bindingOutput.setDocumentationElement(tempEl);
-      }
-      else
-      {
-        bindingOutput.addExtensibilityElement(parseExtensibilityElement(BindingOutput.class, tempEl, def));
-      }
-
-      tempEl = DOMUtils.getNextSiblingElement(tempEl);
-    }
-
-    // add the location of this element to elementLocations 
-    setLocation(bindingOutput, bindingOutputEl);
-
-    return bindingOutput;
-  }
-
-  /**
-   * Parse a specific binding fault element.
-   * 
-   * @param bindingFaultEl The binding fault element.
-   * @param def The definitions element.
-   * @return A WSDL binding fault element.
-   * @throws WSDLException
-   */
-  protected BindingFault parseBindingFault(Element bindingFaultEl, Definition def) throws WSDLException
-  {
-    BindingFault bindingFault = def.createBindingFault();
-    String name = DOMUtils.getAttribute(bindingFaultEl, Constants.ATTR_NAME);
-
-    if (name != null)
-    {
-      bindingFault.setName(name);
-    }
-
-    Element tempEl = DOMUtils.getFirstChildElement(bindingFaultEl);
-
-    while (tempEl != null)
-    {
-      if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
-      {
-        bindingFault.setDocumentationElement(tempEl);
-      }
-      else
-      {
-        bindingFault.addExtensibilityElement(parseExtensibilityElement(BindingFault.class, tempEl, def));
-      }
-
-      tempEl = DOMUtils.getNextSiblingElement(tempEl);
-    }
-
-    // add the location of this element to elementLocations 
-    setLocation(bindingFault, bindingFaultEl);
-
-    return bindingFault;
-  }
-
-  /**
-   * Parse a specific message element.
-   * 
-   * @param msgEl The message element.
-   * @param def The definitions element.
-   * @return A WSDL message element.
-   * @throws WSDLException
-   */
-  protected Message parseMessage(Element msgEl, Definition def) throws WSDLException
-  {
-    Message msg = null;
-    String name = DOMUtils.getAttribute(msgEl, Constants.ATTR_NAME);
-
-    if (name != null)
-    {
-      QName messageName = new QName(def.getTargetNamespace(), name);
-
-      msg = def.getMessage(messageName);
-
-      if (msg == null)
-      {
-        msg = def.createMessage();
-        msg.setQName(messageName);
-      }
-      else if (!msg.isUndefined())
-      {
-        // produce an error message as a message with this name has already been defined
-        addReaderError(
-          def,
-          msgEl,
-          messagegenerator.getString("_MESSAGE_NAME_ALREADY_DEFINED", "'" + msg.getQName().getLocalPart() + "'"));
-      }
-    }
-    else
-    {
-      msg = def.createMessage();
-    }
-
-    // Whether it was retrieved or created, the definition has been found.
-    msg.setUndefined(false);
-
-    Element tempEl = DOMUtils.getFirstChildElement(msgEl);
-
-    while (tempEl != null)
-    {
-      if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
-      {
-        msg.setDocumentationElement(tempEl);
-      }
-      else if (QNameUtils.matches(Constants.Q_ELEM_PART, tempEl))
-      {
-        msg.addPart(parsePart(tempEl, def));
-      }
-      else
-      {
-        // XML Validation will catch this
-        DOMUtils.throwWSDLException(tempEl);
-      }
-
-      tempEl = DOMUtils.getNextSiblingElement(tempEl);
-    }
-
-    // add the location of this element to elementLocations 
-    setLocation(msg, msgEl);
-
-    return msg;
-  }
-
-  /**
-   * Parse a specific part element.
-   * 
-   * @param partEl The part element.
-   * @param def The definitions element.
-   * @return A WSDL part element.
-   * @throws WSDLException
-   */
-  protected Part parsePart(Element partEl, Definition def) throws WSDLException
-  {
-    Part part = def.createPart();
-    String name = DOMUtils.getAttribute(partEl, Constants.ATTR_NAME);
-
-    QName elementName;
-    try
-    {
-      elementName = DOMUtils.getQualifiedAttributeValue(partEl, Constants.ATTR_ELEMENT, Constants.ELEM_MESSAGE, false);
-    }
-    catch (Exception e)
-    {
-      //the call above fails if there is no qualified namespace for the element name
-      elementName = new QName(null, DOMUtils.getAttribute(partEl, "element"));
-    }
-
-    QName typeName;
-    try
-    {
-      typeName = DOMUtils.getQualifiedAttributeValue(partEl, Constants.ATTR_TYPE,
-        // Corrected - was ATTR_ELEMENT
-  Constants.ELEM_MESSAGE, false);
-    }
-    catch (Exception e)
-    {
-      //the call above fails if there is no qualified namespace for the element attribute
-      typeName = new QName(null, DOMUtils.getAttribute(partEl, "name"));
-    }
-
-    if (name != null)
-    {
-      part.setName(name);
-    }
-
-    if (elementName != null)
-    {
-      part.setElementName(elementName);
-    }
-
-    if (typeName != null)
-    {
-      part.setTypeName(typeName);
-    }
-
-    Element tempEl = DOMUtils.getFirstChildElement(partEl);
-
-    while (tempEl != null)
-    {
-      if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
-      {
-        part.setDocumentationElement(tempEl);
-      }
-      else
-      {
-        // XML Validation will catch this
-        DOMUtils.throwWSDLException(tempEl);
-      }
-
-      tempEl = DOMUtils.getNextSiblingElement(tempEl);
-    }
-
-    Map extensionAttributes = part.getExtensionAttributes();
-
-    extensionAttributes.putAll(getPartAttributes(partEl, def));
-
-    // Need to do something here to locate part definition.
-
-    // add the location of this element to elementLocations 
-    setLocation(part, partEl);
-
-    return part;
-  }
-
-  /**
-   * Get a map of the part attributes.
-   * 
-   * @param el The part attributes element.
-   * @param def The defintions element.
-   * @return A map containing the part attributes.
-   * @throws WSDLException
-   */
-  protected Map getPartAttributes(Element el, Definition def) throws WSDLException
-  {
-    Map attributes = new HashMap();
-    NamedNodeMap nodeMap = el.getAttributes();
-    int atts = nodeMap.getLength();
-
-    for (int a = 0; a < atts; a++)
-    {
-      Attr attribute = (Attr)nodeMap.item(a);
-      String lName = attribute.getLocalName();
-      String nSpace = attribute.getNamespaceURI();
-      String prefix = attribute.getPrefix();
-      QName name = new QName(nSpace, lName);
-
-      if (nSpace != null && !nSpace.equals(Constants.NS_URI_WSDL))
-      {
-        if (!nSpace.equals(Constants.NS_URI_XMLNS))
-        {
-          String strValue = attribute.getValue();
-          QName qValue = null;
-
-          try
-          {
-            qValue = DOMUtils.getQName(strValue, el);
-          }
-          catch (WSDLException e)
-          {
-            qValue = new QName(strValue);
-          }
-
-          attributes.put(name, qValue);
-
-          String tempNSUri = def.getNamespace(prefix);
-
-          while (tempNSUri != null && !tempNSUri.equals(nSpace))
-          {
-            prefix += "_";
-            tempNSUri = def.getNamespace(prefix);
-          }
-
-          def.addNamespace(prefix, nSpace);
-        }
-      }
-      else if (
-        !lName.equals(Constants.ATTR_NAME)
-          && !lName.equals(Constants.ATTR_ELEMENT)
-          && !lName.equals(Constants.ATTR_TYPE))
-      {
-        WSDLException wsdlExc =
-          new WSDLException(
-            WSDLException.INVALID_WSDL,
-            "Encountered illegal "
-              + "part extension "
-              + "attribute '"
-              + name
-              + "'. Extension "
-              + "attributes must be in "
-              + "a namespace other than "
-              + "WSDL's.");
-
-        wsdlExc.setLocation(XPathUtils.getXPathExprFromNode(el));
-        //throw wsdlExc;
-      }
-    }
-
-    // add the location of this element to elementLocations 
-    setLocation(attributes, el);
-
-    return attributes;
-  }
-
-  /**
-   * Parse a specific portType element.
-   * 
-   * @param portTypeEl The portType element.
-   * @param def The defintions element.
-   * @return A WSDL portType element.
-   * @throws WSDLException
-   */
-  protected PortType parsePortType(Element portTypeEl, Definition def) throws WSDLException
-  {
-
-    PortType portType = null;
-    String name = DOMUtils.getAttribute(portTypeEl, Constants.ATTR_NAME);
-
-    if (name != null)
-    {
-      QName portTypeName = new QName(def.getTargetNamespace(), name);
-
-      portType = def.getPortType(portTypeName);
-
-      if (portType == null)
-      {
-        portType = def.createPortType();
-        portType.setQName(portTypeName);
-      }
-      else if (!portType.isUndefined())
-      {
-        // if the PortType has already been defined produce an error and return null
-        addReaderError(
-          def,
-          portTypeEl,
-          messagegenerator.getString("_PORTTYPE_NAME_ALREADY_DEFINED", "'" + portType.getQName().getLocalPart() + "'"));
-        return null;
-      }
-    }
-    else
-    {
-      portType = def.createPortType();
-    }
-
-    // Whether it was retrieved or created, the definition has been found.
-    portType.setUndefined(false);
-
-    Element tempEl = DOMUtils.getFirstChildElement(portTypeEl);
-
-    while (tempEl != null)
-    {
-      if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
-      {
-        portType.setDocumentationElement(tempEl);
-      }
-      else if (QNameUtils.matches(Constants.Q_ELEM_OPERATION, tempEl))
-      {
-        // modified so duplicate operations will not be added to porttype 
-        Operation op = parseOperation(tempEl, portType, def);
-        if (op != null)
-        {
-          portType.addOperation(op);
-        }
-        //portType.addOperation(parseOperation(tempEl, portType, def));
-      }
-      else
-      {
-        // something else that shouldn't be here
-        // NEED TO ADD TO ERROR LIST
-        //DOMUtils.throwWSDLException(tempEl);
-      }
-
-      tempEl = DOMUtils.getNextSiblingElement(tempEl);
-    }
-
-    // add the location of this element to elementLocations 
-    setLocation(portType, portTypeEl);
-
-    return portType;
-  }
-
-  /**
-   * Parse a specific operation element.
-   * 
-   * @param opEl The operation element.
-   * @param portType The portType element.
-   * @param def The definitions element.
-   * @return A WSDL operation element.
-   * @throws WSDLException
-   */
-  protected Operation parseOperation(Element opEl, PortType portType, Definition def) throws WSDLException
-  {
-    Operation op = null;
-    String name = DOMUtils.getAttribute(opEl, Constants.ATTR_NAME);
-    String parameterOrderStr = DOMUtils.getAttribute(opEl, Constants.ATTR_PARAMETER_ORDER);
-    Element tempEl = DOMUtils.getFirstChildElement(opEl);
-    List messageOrder = new Vector();
-    Element docEl = null;
-    Input input = null;
-    Output output = null;
-    List faults = new Vector();
-
-    while (tempEl != null)
-    {
-      if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
-      {
-        docEl = tempEl;
-      }
-      else if (QNameUtils.matches(Constants.Q_ELEM_INPUT, tempEl))
-      {
-        input = parseInput(tempEl, def);
-        messageOrder.add(Constants.ELEM_INPUT);
-      }
-      else if (QNameUtils.matches(Constants.Q_ELEM_OUTPUT, tempEl))
-      {
-        output = parseOutput(tempEl, def);
-        messageOrder.add(Constants.ELEM_OUTPUT);
-      }
-      else if (QNameUtils.matches(Constants.Q_ELEM_FAULT, tempEl))
-      {
-        faults.add(parseFault(tempEl, def));
-      }
-      else
-      {
-        // invalid element in the operation
-        // XML check will catch this
-        DOMUtils.throwWSDLException(tempEl);
-      }
-
-      tempEl = DOMUtils.getNextSiblingElement(tempEl);
-    }
-
-    if (name != null)
-    {
-      String inputName = (input != null ? input.getName() : null);
-      String outputName = (output != null ? output.getName() : null);
-
-      boolean opDefined = false;
-
-      try
-      {
-
-        //op = portType.getOperation(name, inputName, outputName);
-
-        //Operation op = null;
-        List operations = portType.getOperations();
-        if (operations != null)
-        {
-
-          Iterator iOperations = operations.iterator();
-          while (iOperations.hasNext())
-          {
-            boolean inputNamesEqual = false;
-            boolean outputNamesEqual = false;
-            Operation oper = (Operation)iOperations.next();
-            if (oper.getName().equals(name))
-            {
-              Input opInput = oper.getInput();
-              if (opInput != null && input != null)
-              {
-                String opInputName = opInput.getName();
-                if (opInputName != null && inputName != null && opInputName.equals(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.equals(outputName))
-                {
-                  outputNamesEqual = true;
-                }
-                else if (opOutputName == null && outputName == null)
-                {
-                  outputNamesEqual = true;
-                }
-              }
-              else if (opOutput == null && output == null)
-              {
-                outputNamesEqual = true;
-              }
-              if (inputNamesEqual && outputNamesEqual)
-              {
-                op = oper;
-                break;
-              }
-            }
-          }
-        }
-      }
-      catch (Exception e)
-      {
-        opDefined = true;
-      }
-
-      if (op != null /*&& !op.isUndefined()*/
-        )
-      {
-        //op = null;
-        opDefined = true;
-
-      }
-
-      if (op != null && !opDefined)
-      {
-        if (inputName == null)
-        {
-          Input tempIn = op.getInput();
-
-          if (tempIn != null)
-          {
-            if (tempIn.getName() != null)
-            {
-              //op = null;
-              opDefined = true;
-            }
-          }
-        }
-      }
-
-      if (op != null && !opDefined)
-      {
-        if (outputName == null)
-        {
-          Output tempOut = op.getOutput();
-
-          if (tempOut != null)
-          {
-            if (tempOut.getName() != null)
-            {
-              //op = null;
-              opDefined = true;
-            }
-          }
-        }
-      }
-
-      if (opDefined)
-      {
-        // instead of creating a new one with the same name we're going to return null.
-        // According to the WSDL 1.2 working draft operation overloading is no longer allowed.
-        // Going to use that here to save a lot of work
-        setLocation(op, opEl);
-        addReaderError(
-          portType,
-          op,
-          messagegenerator.getString(
-            "_DUPLICATE_OPERATION_FOR_PORTTYPE",
-            "'" + op.getName() + "'",
-            "'" + portType.getQName().getLocalPart() + "'"));
-        return null;
-      }
-      if (op == null)
-      {
-        op = def.createOperation();
-        op.setName(name);
-
-      }
-    }
-    else
-    {
-      op = def.createOperation();
-    }
-
-    // Whether it was retrieved or created, the definition has been found.
-    op.setUndefined(false);
-
-    if (parameterOrderStr != null)
-    {
-      op.setParameterOrdering(StringUtils.parseNMTokens(parameterOrderStr));
-    }
-
-    if (docEl != null)
-    {
-      op.setDocumentationElement(docEl);
-    }
-
-    if (input != null)
-    {
-      op.setInput(input);
-    }
-
-    if (output != null)
-    {
-      op.setOutput(output);
-    }
-
-    if (faults.size() > 0)
-    {
-      Iterator faultIterator = faults.iterator();
-
-      while (faultIterator.hasNext())
-      {
-        Fault f = (Fault)faultIterator.next();
-        // if the fault isn't defined yet
-        if (op.getFault(f.getName()) == null)
-        {
-          op.addFault(f);
-        }
-        else
-        {
-          addReaderError(
-            op,
-            f,
-            messagegenerator.getString("_DUPLICATE_FAULT_NAME", "'" + f.getName() + "'", "'" + op.getName() + "'"));
-          //faultErrors.add(new Object[]{f,"Duplicate Name",op});
-        }
-      }
-    }
-
-    OperationType style = null;
-
-    if (messageOrder.equals(STYLE_ONE_WAY))
-    {
-      style = OperationType.ONE_WAY;
-    }
-    else if (messageOrder.equals(STYLE_REQUEST_RESPONSE))
-    {
-      style = OperationType.REQUEST_RESPONSE;
-    }
-    else if (messageOrder.equals(STYLE_SOLICIT_RESPONSE))
-    {
-      style = OperationType.SOLICIT_RESPONSE;
-    }
-    else if (messageOrder.equals(STYLE_NOTIFICATION))
-    {
-      style = OperationType.NOTIFICATION;
-    }
-
-    if (style != null)
-    {
-      op.setStyle(style);
-    }
-
-    // add the location of this element to elementLocations 
-    setLocation(op, opEl);
-
-    // modified to remove duplicate operations
-    //    if(opDefined)
-    //    {
-    //      addReaderError(portType,op,ValidateWSDLPlugin.getInstance().getString("_DUPLICATE_OPERATION_FOR_PORTTYPE","'"+op.getName()+"'","'"+portType.getQName().getLocalPart()+"'"));
-    //      return null;
-    //    }
-    return op;
-  }
-
-  /**
-   * Parse a specific service element.
-   * 
-   * @param serviceEl The service element.
-   * @param def The defintions element.
-   * @return A WSDL service element.
-   * @throws WSDLException
-   */
-  protected Service parseService(Element serviceEl, Definition def) throws WSDLException
-  {
-    Service service = def.createService();
-    String name = DOMUtils.getAttribute(serviceEl, Constants.ATTR_NAME);
-
-    if (name != null)
-    {
-      service.setQName(new QName(def.getTargetNamespace(), name));
-    }
-    Service s;
-    // a service with this name has already been defined
-    if ((s = def.getService(service.getQName())) != null)
-    {
-      addReaderError(
-        def,
-        serviceEl,
-        messagegenerator.getString("_SERVICE_NAME_ALREADY_DEFINED", "'" + s.getQName().getLocalPart() + "'"));
-      return s;
-    }
-    Element tempEl = DOMUtils.getFirstChildElement(serviceEl);
-
-    while (tempEl != null)
-    {
-      if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
-      {
-        service.setDocumentationElement(tempEl);
-      }
-      else if (QNameUtils.matches(Constants.Q_ELEM_PORT, tempEl))
-      {
-        service.addPort(parsePort(tempEl, def));
-      }
-      else
-      {
-        service.addExtensibilityElement(parseExtensibilityElement(Service.class, tempEl, def));
-      }
-
-      tempEl = DOMUtils.getNextSiblingElement(tempEl);
-    }
-
-    // add the location of this element to elementLocations 
-    setLocation(service, serviceEl);
-
-    return service;
-  }
-  
-  /**
-   * Parse a specific port element.
-   * 
-   * @param portEl The port element.
-   * @param def The definitions element.
-   * @return A WSDL port element.
-   * @throws WSDLException
-   */
-  protected Port parsePort(Element portEl, Definition def) throws WSDLException
-  {
-    Port port = def.createPort();
-    String name = DOMUtils.getAttribute(portEl, Constants.ATTR_NAME);
-    QName bindingStr;
-    try
-    {
-      bindingStr = DOMUtils.getQualifiedAttributeValue(portEl, Constants.ATTR_BINDING, Constants.ELEM_PORT, false);
-    }
-    catch (Exception e)
-    {
-      //the call above fails if there is no qualified namespace for the message name
-      bindingStr = new QName(null, DOMUtils.getAttribute(portEl, "binding"));
-    }
-
-    if (name != null)
-    {
-      port.setName(name);
-    }
-
-    if (bindingStr != null)
-    {
-      Binding binding = def.getBinding(bindingStr);
-
-      if (binding == null)
-      {
-        binding = def.createBinding();
-        binding.setQName(bindingStr);
-        def.addBinding(binding);
-      }
-
-      port.setBinding(binding);
-    }
-
-    Element tempEl = DOMUtils.getFirstChildElement(portEl);
-
-    while (tempEl != null)
-    {
-      if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
-      {
-        port.setDocumentationElement(tempEl);
-      }
-      else
-      {
-        port.addExtensibilityElement(parseExtensibilityElement(Port.class, tempEl, def));
-      }
-
-      tempEl = DOMUtils.getNextSiblingElement(tempEl);
-    }
-
-    // add the location of this element to elementLocations 
-    setLocation(port, portEl);
-
-    return port;
-  }
-
-  /**
-   * Parse a specific extensibility element.
-   * 
-   * @param parentType The parent type of the extensibility element.
-   * @param el The extensibility element.
-   * @param def The definitions element.
-   * @return A WSDL extensibility element.
-   * @throws WSDLException
-   */
-  protected ExtensibilityElement parseExtensibilityElement(Class parentType, Element el, Definition def)
-    throws WSDLException
-  {
-    QName elementType = QNameUtils.newQName(el);
-
-    try
-    {
-      ExtensionRegistry extReg = def.getExtensionRegistry();
-
-      if (extReg == null)
-      {
-        throw new WSDLException(
-          WSDLException.CONFIGURATION_ERROR,
-          "No ExtensionRegistry set for this "
-            + "Definition, so unable to deserialize "
-            + "a '"
-            + elementType
-            + "' element in the "
-            + "context of a '"
-            + parentType.getName()
-            + "'.");
-      }
-
-      ExtensionDeserializer extDS = extReg.queryDeserializer(parentType, elementType);
-
-      // asign the ExtensibilityElement to a var so we can add it to the locations
-      ExtensibilityElement extElem = extDS.unmarshall(parentType, elementType, el, def, extReg);
-      // add the location of this element to elementLocations 
-      // this might not work properly
-      setLocation(extElem, el);
-
-      // register all of the child Elements so we can find them later
-      // used for inline schema validation
-      registerChildElements(extElem);
-
-      return extElem;
-    }
-    catch (WSDLException e)
-    {
-      if (e.getLocation() == null)
-      {
-        e.setLocation(XPathUtils.getXPathExprFromNode(el));
-      }
-      throw e;
-    }
-  }
-
-  /**
-   * Parse a specific input element.
-   * 
-   * @param inputEl The input element.
-   * @param def The defintions element.
-   * @return A WSDL input element.
-   * @throws WSDLException
-   */
-  protected Input parseInput(Element inputEl, Definition def) throws WSDLException
-  {
-
-    Input input = def.createInput();
-    String name = DOMUtils.getAttribute(inputEl, Constants.ATTR_NAME);
-    QName messageName = null;
-    try
-    {
-      messageName = DOMUtils.getQualifiedAttributeValue(inputEl, Constants.ATTR_MESSAGE, Constants.ELEM_INPUT, false);
-    }
-    catch (Exception e)
-    {
-      //the call above fails if there is no qualified namespace for the message name
-      messageName = new QName(null, DOMUtils.getAttribute(inputEl, "message"));
-    }
-
-    if (name != null)
-    {
-      input.setName(name);
-    }
-
-    if (messageName != null)
-    {
-      Message message = def.getMessage(messageName);
-
-      if (message == null)
-      {
-        message = def.createMessage();
-        message.setQName(messageName);
-        def.addMessage(message);
-      }
-
-      input.setMessage(message);
-    }
-
-    Element tempEl = DOMUtils.getFirstChildElement(inputEl);
-
-    while (tempEl != null)
-    {
-      if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
-      {
-        input.setDocumentationElement(tempEl);
-      }
-      else
-      {
-        // XML Validation will catch this
-        DOMUtils.throwWSDLException(tempEl);
-      }
-
-      tempEl = DOMUtils.getNextSiblingElement(tempEl);
-    }
-
-    // add the location of this element to elementLocations 
-    setLocation(input, inputEl);
-
-    return input;
-  }
-
-  /**
-   * Parse a specific output element.
-   * 
-   * @param outputEl The output element.
-   * @param def The defintions element.
-   * @return A WSDL output element.
-   * @throws WSDLException
-   */
-  protected Output parseOutput(Element outputEl, Definition def) throws WSDLException
-  {
-    Output output = def.createOutput();
-    String name = DOMUtils.getAttribute(outputEl, Constants.ATTR_NAME);
-    QName messageName = null;
-    try
-    {
-      messageName = DOMUtils.getQualifiedAttributeValue(outputEl, Constants.ATTR_MESSAGE, Constants.ELEM_OUTPUT, false);
-    }
-    catch (Exception e)
-    {
-      //the call above fails if there is no qualified namespace for the message name
-      messageName = new QName(null, DOMUtils.getAttribute(outputEl, "message"));
-    }
-
-    if (name != null)
-    {
-      output.setName(name);
-    }
-
-    if (messageName != null)
-    {
-      Message message = def.getMessage(messageName);
-
-      if (message == null)
-      {
-        message = def.createMessage();
-        message.setQName(messageName);
-        def.addMessage(message);
-      }
-
-      output.setMessage(message);
-    }
-
-    Element tempEl = DOMUtils.getFirstChildElement(outputEl);
-
-    while (tempEl != null)
-    {
-      if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
-      {
-        output.setDocumentationElement(tempEl);
-      }
-      else
-      {
-        // XML Validation will catch this
-        DOMUtils.throwWSDLException(tempEl);
-      }
-
-      tempEl = DOMUtils.getNextSiblingElement(tempEl);
-    }
-
-    // add the location of this element to elementLocations 
-    setLocation(output, outputEl);
-
-    return output;
-  }
-
-  /**
-   * Parse a specific fault element.
-   * 
-   * @param faultEl The fault element to parse.
-   * @param def The definitions element.
-   * @return A WSDL fault element.
-   * @throws WSDLException
-   */
-  protected Fault parseFault(Element faultEl, Definition def) throws WSDLException
-  {
-    Fault fault = def.createFault();
-    String name = DOMUtils.getAttribute(faultEl, Constants.ATTR_NAME);
-    QName messageName = null;
-    try
-    {
-      messageName = DOMUtils.getQualifiedAttributeValue(faultEl, Constants.ATTR_MESSAGE, Constants.ELEM_INPUT, false);
-    }
-    catch (Exception e)
-    {
-      //the call above fails if there is no qualified namespace for the message name
-      messageName = new QName(null, DOMUtils.getAttribute(faultEl, "message"));
-    }
-
-    if (name != null)
-    {
-      fault.setName(name);
-    }
-
-    if (messageName != null)
-    {
-      Message message = def.getMessage(messageName);
-
-      if (message == null)
-      {
-        message = def.createMessage();
-        message.setQName(messageName);
-        def.addMessage(message);
-      }
-
-      fault.setMessage(message);
-    }
-
-    Element tempEl = DOMUtils.getFirstChildElement(faultEl);
-
-    while (tempEl != null)
-    {
-      if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
-      {
-        fault.setDocumentationElement(tempEl);
-      }
-      else
-      {
-        // XML Validation will catch this
-        DOMUtils.throwWSDLException(tempEl);
-      }
-
-      tempEl = DOMUtils.getNextSiblingElement(tempEl);
-    }
-
-    // add the location of this element to elementLocations 
-    setLocation(fault, faultEl);
-
-    return fault;
-  }
-  
-  /**
-   * Set the messagegenerator for the reader.
-   * 
-   * @param mg The message generator to set.
-   */
-  public void setMessageGenerator(MessageGenerator mg)
-  {
-    messagegenerator = mg;
-  }
-
-  /**
-   * Add the refObject to the elementLocation hashtable with the location defined in element.
-   * 
-   * @param refObject The object to add.
-   * @param element The element that contains the location information.
-   */
-  protected void setLocation(Object refObject, Element element)
-  {
-    try
-    {
-      ElementImpl elementImpl = (ElementImpl)element;
-      ElementLocation elementLocation = (ElementLocation)elementImpl.getUserData();
-      if (elementLocation != null)
-      {
-
-        elementLocations.put(
-          refObject,
-          new LocationHolder(elementLocation.getLineNumber(), elementLocation.getColumnNumber(), def.getDocumentBaseURI()));
-      }
-    }
-    catch (ClassCastException e)
-    {
-    }
-  }
-  /**
-   * Add a reader error to the list.
-   * 
-   * @param parentobject The parent object of the object with the error.
-   * @param object The object with the error.
-   * @param error The error message.
-   */
-  protected void addReaderError(Object parentobject, Object object, String error)
-  {
-    readerErrors.add(new ReaderError(parentobject, object, error));
-  }
-  
-  /**
-   * Add a reader warning to the list.
-   * 
-   * @param parentobject The parent object of the object with the error.
-   * @param object The object with the error.
-   * @param warning The warning message.
-   */
-  protected void addReaderWarning(Object parentobject, Object object, String warning)
-  {
-    readerWarnings.add(new ReaderError(parentobject, object, warning));
-  }
-  
-  /**
-   * Register all of the locations of the child elements of the extensibility
-   * element given.
-   * 
-   * @param extElem The extensibility element whose child elements will be registered.
-   */
-
-  protected void registerChildElements(ExtensibilityElement extElem)
-  {
-    // only add those that are of type unknown. if they're known they 
-    // will take care of themselves
-    if (extElem instanceof UnknownExtensibilityElement)
-    {
-      Element elem = ((UnknownExtensibilityElement)extElem).getElement();
-      registerChildElementsRecursively(elem);
-    }
-  }
-
-  /**
-   * Register the location of all of the child elements of elem.
-   * 
-   * @param elem The element whose child elements will be registered.
-   */
-  protected void registerChildElementsRecursively(Element elem)
-  {
-    if (elem instanceof ElementNSImpl)
-    {
-      setLocation(elem, elem);
-
-      // call the method recursively for each child element
-      NodeList childNodes = elem.getChildNodes();
-
-      for (int i = 0; i < childNodes.getLength() || i < 5; i++)
-      {
-        Node n = childNodes.item(i);
-        // we only want nodes that are Elements
-        if (n instanceof Element)
-        {
-          Element child = (Element)n;
-          registerChildElementsRecursively(child);
-        }
-      }
-    }
-  }
-  /**
-   * Check that an element name matches the expected name.
-   * 
-   * @param el The element with the name to check.
-   * @param qname The name to check against.
-   * @throws WSDLException
-   */
-  private static void checkElementName(Element el, QName qname) throws WSDLException
-  {
-    if (!QNameUtils.matches(qname, el))
-    {
-      WSDLException wsdlExc = new WSDLException(WSDLException.INVALID_WSDL, "Expected element '" + qname + "'.");
-
-      wsdlExc.setLocation(XPathUtils.getXPathExprFromNode(el));
-
-      throw wsdlExc;
-    }
-  }
-  
-  /**
-   * Get the element locations hashtable.
-   * 
-   * @return The element locations hashtable.
-   */
-  public Hashtable getElementLocations()
-  {
-    return elementLocations;
-  }
-  
-  /**
-   * Get the reader errors.
-   * 
-   * @return The reader errors.
-   */
-  public List getReaderErrors()
-  {
-    return readerErrors;
-  }
-  
-  /**
-   * Get reader warnings.
-   * 
-   * @return The reader warnings.
-   */
-  public List getReaderWarnings()
-  {
-    return readerWarnings;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDLReaderImpl.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDLReaderImpl.java
deleted file mode 100644
index 4e6ecd6a9..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/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/org/eclipse/wst/wsdl/validation/internal/wsdl11/http/HTTPValidator.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/http/HTTPValidator.java
deleted file mode 100644
index 6780e48e2..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/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/org/eclipse/wst/wsdl/validation/internal/wsdl11/mime/MIMEValidator.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/mime/MIMEValidator.java
deleted file mode 100644
index 54fcea8f2..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/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/org/eclipse/wst/wsdl/validation/internal/wsdl11/soap/SOAPValidator.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/soap/SOAPValidator.java
deleted file mode 100644
index c5914256a..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/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.IWSDL11ValidationInfo;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11Validator;
-
-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/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/DOMError.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/DOMError.java
deleted file mode 100644
index 329b1118b..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/DOMError.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd;
-
-/**
- * This interface is used to signify error levels that are the result of
- * XMLParseException. They conceptually correspond to org.w3c.dom.DOMError but
- * we use our own interface, since DOMError is not in Java 1.4, and its
- * package changes from Xerces 2.6.2 and Xerces 2.7.0.
- */
-
-public interface DOMError {
-	int SEVERITY_WARNING = 1;
-	int SEVERITY_ERROR = 2;
-	int SEVERITY_FATAL_ERROR = 3;
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/FileEntityResolver.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/FileEntityResolver.java
deleted file mode 100644
index 2119778f3..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/FileEntityResolver.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.xerces.xni.XMLResourceIdentifier;
-import org.apache.xerces.xni.XNIException;
-import org.apache.xerces.xni.parser.XMLEntityResolver;
-import org.apache.xerces.xni.parser.XMLInputSource;
-import org.eclipse.wst.wsdl.validation.internal.util.LazyURLInputStream;
-
-/**
- * Entity resolve to resolve file entities.
- */
-public class FileEntityResolver implements XMLEntityResolver
-{
-
-  /**
-   * @see org.apache.xerces.xni.parser.XMLEntityResolver#resolveEntity(org.apache.xerces.xni.XMLResourceIdentifier)
-   */
-  public XMLInputSource resolveEntity(XMLResourceIdentifier resource) throws XNIException, IOException
-  {
-    String publicId = resource.getPublicId();
-    String systemId = resource.getExpandedSystemId();
-    String namespace = resource.getNamespace();
-    String url = null;
-    if(systemId != null)
-    {
-      url = systemId;
-    }
-    else if(publicId != null)
-    {
-      url = publicId;
-    }
-    else if(namespace != null)
-    {
-      url = namespace;
-    }
-    if(url != null)
-    {
-      InputStream is = new LazyURLInputStream(url);
-      return new XMLInputSource(publicId, resource.getExpandedSystemId(), resource.getExpandedSystemId(), is, null);
-    }
-    return null;
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/InlineSchemaGenerator.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/InlineSchemaGenerator.java
deleted file mode 100644
index 3b75c3e8d..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/InlineSchemaGenerator.java
+++ /dev/null
@@ -1,688 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.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
-{
-  /**
-   * Generating import statements for inline schema references is 
-   * invalid according to the WSDL spec. As some older clients (WSVT) may
-   * depend on this functionality the option to allow this is left
-   * in. This should be removed post 1.5.
-   * TODO: Review removing this preference.
-   */
-  protected static boolean GENERATE_INLINE_IMPORTS = false;
-  
-  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()
-  {
-	String genInlineImports = System.getProperty("wsdl.require.inline.imports");
-	if(genInlineImports != null && genInlineImports.equals("false"))
-	{
-	  GENERATE_INLINE_IMPORTS = true;
-	}
-  }
-
-  /**
-   * 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.getNamespacePrefixes(element);
-    Hashtable reqNSDecl = schemaGenerator.resolveNamespaces(reqns, nsResolver, parentNSs);
-    //Hashtable reqNSDecl = schemaGenerator.getRequiredNSDeclarations(reqns, nsResolver, parentNSs);
-    if(GENERATE_INLINE_IMPORTS)
-    {
-      List importNS = schemaGenerator.getImportNamespaces(element);
-      reqns = schemaGenerator.removeImports(reqns, importNS);
-      reqns = schemaGenerator.removeLocalNamespaces(reqns, element);
-	  reqns = schemaGenerator.restrictImports(reqns, validImportNSs);
-    }
-    else
-    {
-      reqns.clear();
-    }
-    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.getNamespacePrefixes(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 namespace prefixes that are used for elements or types in the schema.
-   *  
-   * @param elem The root element of the schema to check for namespace prefixes.
-   * @return A list of namespace prefixes for the element and all its children.
-   */
-  protected List getNamespacePrefixes(Element elem)
-  {
-    List namespace = new ArrayList();
-
-    // call the method recursively for each child element
-    // register all the child types first
-    NodeList childNodes = elem.getChildNodes();
-    int numChildren = childNodes.getLength();
-    for (int i = 0; i < numChildren; i++)
-    {
-      Node n = childNodes.item(i);
-      // we only want nodes that are Elements
-      if (n instanceof Element)
-      {
-        Element child = (Element)n;
-        List childns = getNamespacePrefixes(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
-        if (nodeName.indexOf(XMLNS) != -1 || nodeName.equals(TARGETNAMESPACE) || nodeName.equals(NAME))
-        {
-          continue;
-        }
-        // Grab namespace prefixes from attributes.
-        else
-        {
-          int colonIndex = nodeName.indexOf(":");
-          if(colonIndex != -1 && (colonIndex + 1 < nodeName.length() && nodeName.charAt(colonIndex + 1) != '/'))
-          {
-            String prefix = nodeName.substring(0, colonIndex);
-            if (!namespace.contains(prefix))
-            {
-
-              namespace.add(prefix);
-            }
-          }
-        }
-        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/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/InlineSchemaValidator.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/InlineSchemaValidator.java
deleted file mode 100644
index e3fc403e0..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/InlineSchemaValidator.java
+++ /dev/null
@@ -1,314 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.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.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.IWSDL11ValidationInfo;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11Validator;
-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
-{
-  /**
-   * Property to allow the WSDL validator to use the target namespace
-   * defined on the WSDL document for schemas with no target namespace.
-   * This property will allow clients who depend on this functionality
-   * to continue to use it and should be removed post 1.5.
-   */
-  private boolean USE_WSDL_TARGETNAMESPACE = false;
-  
-  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;
-  
-  public InlineSchemaValidator()
-  {
-	String useNS = System.getProperty("use.wsdl.targetnamespace");
-	if(useNS != null && useNS.equals("true"))
-	{
-	  USE_WSDL_TARGETNAMESPACE = true;
-	}
-  }
-  /**
-   * @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(USE_WSDL_TARGETNAMESPACE && (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(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, valInfo.getSchemaCache());
-    
-//	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;
-    
-    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/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/InlineXSDResolver.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/InlineXSDResolver.java
deleted file mode 100644
index 944b7d76c..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/InlineXSDResolver.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.validation.internal.wsdl11.xsd;
-
-import java.io.IOException;
-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;
-	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/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/SchemaAttributeTable.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/SchemaAttributeTable.java
deleted file mode 100644
index fe43e121c..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/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/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/ValidateErrorHandler.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/ValidateErrorHandler.java
deleted file mode 100644
index 10e3e5d39..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/ValidateErrorHandler.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.validation.internal.wsdl11.xsd;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.xerces.xni.XNIException;
-import org.apache.xerces.xni.parser.XMLErrorHandler;
-import org.apache.xerces.xni.parser.XMLParseException;
-import org.eclipse.wst.wsdl.validation.internal.util.ErrorMessage;
-
-/**
- * An implementation of XMLErrorHandler that captures error from Xerces.
- */
-public class ValidateErrorHandler implements XMLErrorHandler
-{
-  ArrayList errorList = new ArrayList();
-
-  
-  
-  /**
-   * Get the error messages created by Xerces.
-   * 
-   * @return The errors list.
-   */
-  public List getErrorMessages()
-  {
-    return errorList;
-  }
-
-  /**
-   * Create a validation message from the exception and severity.
-   * 
-   * @param key The Xerces error key.
-   * @param error The error.
-   * @param severity The severity.
-   * @return An error message.
-   */
-  protected ErrorMessage createValidationMessageForException(String key, 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 domain, String key, XMLParseException exception) throws XNIException
-  {
-    errorList.add(createValidationMessageForException(key, 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 domain, String key, XMLParseException exception) throws XNIException
-  {
-    errorList.add(createValidationMessageForException(key, 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 domain, String key, XMLParseException exception) throws XNIException
-  {
-    errorList.add(createValidationMessageForException(key, exception, DOMError.SEVERITY_WARNING));
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/XMLEntityResolverChain.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/XMLEntityResolverChain.java
deleted file mode 100644
index 85720c60a..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/XMLEntityResolverChain.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.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;
-    
-    // TODO: This fix should be removed once this problem is fixed in Xerces.
-    // Xerces currently (version 2.7) has a problem when the honour all schema locations
-    // property is set and the same schema is imported by two different files and one
-    // of the imports uses \ and another uses / in part of the location.
-    if(xmlResourceIdentifier.getLiteralSystemId() != null)
-    	xmlResourceIdentifier.setLiteralSystemId(xmlResourceIdentifier.getLiteralSystemId().replace('\\','/'));
-    
-    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/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/XSDValidator.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/XSDValidator.java
deleted file mode 100644
index d64cb4e17..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/XSDValidator.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.io.Reader;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.xerces.impl.Constants;
-import org.apache.xerces.impl.xs.XSDDescription;
-import org.apache.xerces.parsers.XMLGrammarPreparser;
-import org.apache.xerces.util.XMLGrammarPoolImpl;
-import org.apache.xerces.xni.grammars.Grammar;
-import org.apache.xerces.xni.grammars.XMLGrammarDescription;
-import org.apache.xerces.xni.grammars.XMLGrammarPool;
-import org.apache.xerces.xni.grammars.XSGrammar;
-import org.apache.xerces.xni.parser.XMLEntityResolver;
-import org.apache.xerces.xni.parser.XMLInputSource;
-import org.apache.xerces.xs.StringList;
-import org.apache.xerces.xs.XSModel;
-
-
-/**
- * Validate schemas from files or String.
- */
-public class XSDValidator
-{
-  protected final String HONOUR_ALL_SCHEMA_LOCATIONS_FEATURE_ID = "http://apache.org/xml/features/honour-all-schemaLocations";
-  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, 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.
-   * @param grammarPool A Xerces XMLGrammarPool that holds precached schemas.
-   */
-  public void validateInlineSchema(
-    String schema,
-    String targetNamespace,
-    String fileloc,
-    XMLEntityResolver entityResolverChain,
-    XMLEntityResolver inlineSchemaEntityResolver,
-    XMLGrammarPool grammarPool)
-  {
-    filelocation = fileloc;
-    
-    validateXSD(schema, true, entityResolverChain,targetNamespace, inlineSchemaEntityResolver, grammarPool);
-  }
-
-  /**
-   * 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.
-   * @param grammarPool A Xerces XMLGrammarPool that holds precached schemas.
-   */
-  public void validate(String uri, XMLEntityResolver entityResolver, XMLGrammarPool grammarPool)
-  {
-    validateXSD(uri, false, entityResolver, null, null, grammarPool);
-  }
-  
-  /**
-   * 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.
-   * @param grammarPool A Xerces XMLGrammarPool that holds precached schemas.
-   */
-  protected void validateXSD(String schema, boolean inlineXSD, XMLEntityResolver entityResolver, String targetNamespace, XMLEntityResolver inlineSchemaEntityResolver, XMLGrammarPool grammarPool)
-  {
-	ValidateErrorHandler errorHandler = new ValidateErrorHandler();
-	//errorHandler.getErrorMessages().clear();
-	try
-	{
-	  XMLGrammarPreparser grammarPreparser = new XMLGrammarPreparser();
-	  grammarPreparser.registerPreparser(XMLGrammarDescription.XML_SCHEMA,null/*schemaLoader*/);
-		
-	  grammarPreparser.setFeature(Constants.XERCES_FEATURE_PREFIX + Constants.CONTINUE_AFTER_FATAL_ERROR_FEATURE, false);
-      grammarPreparser.setFeature(Constants.XERCES_FEATURE_PREFIX + Constants.NAMESPACES_FEATURE, true);
-      grammarPreparser.setFeature(Constants.XERCES_FEATURE_PREFIX + Constants.NAMESPACE_PREFIXES_FEATURE, true);
-	  grammarPreparser.setFeature(Constants.XERCES_FEATURE_PREFIX + Constants.VALIDATION_FEATURE, true);
-	  grammarPreparser.setFeature(Constants.XERCES_FEATURE_PREFIX + Constants.SCHEMA_VALIDATION_FEATURE, true);
-      grammarPreparser.setFeature(Constants.XERCES_FEATURE_PREFIX + Constants.SCHEMA_FULL_CHECKING, false);
-	  grammarPreparser.setFeature(Constants.XERCES_FEATURE_PREFIX + Constants.EXTERNAL_GENERAL_ENTITIES_FEATURE, true);
-	  grammarPreparser.setFeature(Constants.XERCES_FEATURE_PREFIX + Constants.EXTERNAL_PARAMETER_ENTITIES_FEATURE, true);
-	  grammarPreparser.setFeature(Constants.XERCES_FEATURE_PREFIX + Constants.WARN_ON_DUPLICATE_ATTDEF_FEATURE, true);
-	      
-	  try
-	  {
-		grammarPreparser.setFeature(HONOUR_ALL_SCHEMA_LOCATIONS_FEATURE_ID, true);
-	  }
-	  catch (Exception e)
-	  {
-	    // Catch the exception and ignore if we can't set this feature.
-	  }
-
-	  // cs : toggle the comments on these 2 lines to easily disable caching
-      // grammarPreparser.setGrammarPool(new XMLGrammarPoolImpl()); 		
-	  grammarPreparser.setGrammarPool(grammarPool != null ? grammarPool : new XMLGrammarPoolImpl()); 
-	  grammarPreparser.setErrorHandler(errorHandler);
-	  if (entityResolver != null)
-	  {
-	    grammarPreparser.setEntityResolver(entityResolver);
-	  }
-
-	  try
-	  {
-	    XMLInputSource is = null;
-	    List oldGrammars = null;
-	    XMLGrammarPoolImpl pool = 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);
-		  // In the case that 'shared' grammar pool is used we need to consider
-		  // that we might have already added a schema to the pool with the same target namespace
-		  // as the inline schema we're hoping to construct.  In this case we need to remove
-		  // the schema from the pool before constructing our inline schema.  We can add it 
-		  // back when we're all done.
-		  pool = (XMLGrammarPoolImpl)grammarPreparser.getGrammarPool();        	      
-		  oldGrammars = new ArrayList();
-		  // Remove the inline schema namespace if it is listed directly
-		  // in the pool. If it is indirectly listed as an import of a grammar listed
-		  // directly in the pool hide the grammar to continue to get caching benefits
-		  // from the cached grammar.
-		  Grammar[] grammars = pool.retrieveInitialGrammarSet(XMLGrammarDescription.XML_SCHEMA);
-		  int numGrammars = grammars.length;
-		  for(int i = 0; i < numGrammars; i++)
-		  {
-		    XMLGrammarDescription desc = grammars[i].getGrammarDescription();
-		    if(desc.getNamespace().equals(targetNamespace))
-		    {
-		      oldGrammars.add(pool.removeGrammar(desc));
-		    }
-		    else
-		    {
-		      if(grammars[i] instanceof XSGrammar)
-		      {
-		    	XSGrammar grammar = (XSGrammar)grammars[i];
-		    	  	  
-		    	StringList namespaces = grammar.toXSModel().getNamespaces();
-		    	if(namespaces.contains(targetNamespace))
-		    	{
-		    	  oldGrammars.add(pool.removeGrammar(desc));
-		    	  	    //pool.putGrammar(new XSGrammarHider(grammar, targetNamespace));
-		    	}
-		      }
-		    }
-		  }
-		    	
-		  Set inlineNSs = ((InlineXSDResolver)inlineSchemaEntityResolver).getInlineSchemaNSs();
-		  Iterator nsiter = inlineNSs.iterator();
-		  while(nsiter.hasNext())
-		  {
-		    XSDDescription desc = new XSDDescription();
-		    desc.setNamespace((String)nsiter.next());      
-		    Grammar oldGrammar = pool.removeGrammar(desc);
-		    if(oldGrammar != null)
-		      oldGrammars.add(oldGrammar);
-		  }
-
-	    }
-	    // get the input source for an external schema file
-	    else
-	    {
-	      is = new XMLInputSource(null,schema,schema);
-	    }
-
-	    XSGrammar grammar = (XSGrammar)grammarPreparser.preparseGrammar(XMLGrammarDescription.XML_SCHEMA,is);
-	    xsModel = grammar.toXSModel();
-			
-	    // Here we add the temporiliy removed schema back.
-		if (inlineXSD && oldGrammars != null)
-		{
-		  XSDDescription description = new XSDDescription();
-		  description.setNamespace(targetNamespace); 
-		  pool.removeGrammar(description);
-				
-		  Set inlineNSs = ((InlineXSDResolver)inlineSchemaEntityResolver).getInlineSchemaNSs();
-		  Iterator nsiter = inlineNSs.iterator();
-		  while(nsiter.hasNext())
-		  {
-			XSDDescription desc = new XSDDescription();
-		    desc.setNamespace((String)nsiter.next());   
-		    pool.removeGrammar(desc);
-		  }
-		  
-		  Iterator oldGIter = oldGrammars.iterator();
-	      while(oldGIter.hasNext())
-		  {
-			 Grammar oldGrammar = (Grammar)oldGIter.next();
-			 if(oldGrammar != null)
-			   pool.putGrammar(oldGrammar);
-		  }
-		}  
-	  }
-	  catch (Exception e)
-	  {
-	        // Parser will return null pointer exception if the document is structurally invalid.
-	      	// In this case we simply ignore the error.
-	      	//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/org/eclipse/wst/wsdl/validation/internal/wsdl20/IWSDL20Validator.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl20/IWSDL20Validator.java
deleted file mode 100644
index bfc792d72..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/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/org/eclipse/wst/wsdl/validation/internal/wsdl20/ValidatorRegistry.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl20/ValidatorRegistry.java
deleted file mode 100644
index f983bd96d..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/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/org/eclipse/wst/wsdl/validation/internal/wsdl20/WSDL20BasicValidator.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl20/WSDL20BasicValidator.java
deleted file mode 100644
index fa38c9944..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/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/org/eclipse/wst/wsdl/validation/internal/wsdl20/WSDL20ValidatorController.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl20/WSDL20ValidatorController.java
deleted file mode 100644
index b8175cf47..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/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/org/eclipse/wst/wsdl/validation/internal/wsdl20/WSDL20ValidatorDelegate.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl20/WSDL20ValidatorDelegate.java
deleted file mode 100644
index 7661f7de5..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/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/org/eclipse/wst/wsdl/validation/internal/xml/AbstractXMLConformanceFactory.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/xml/AbstractXMLConformanceFactory.java
deleted file mode 100644
index d7cb52e10..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/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/org/eclipse/wst/wsdl/validation/internal/xml/DefaultXMLConformanceFactory.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/xml/DefaultXMLConformanceFactory.java
deleted file mode 100644
index 1e4e15c4d..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/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/org/eclipse/wst/wsdl/validation/internal/xml/DefaultXMLValidator.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/xml/DefaultXMLValidator.java
deleted file mode 100644
index 892a5a880..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/xml/DefaultXMLValidator.java
+++ /dev/null
@@ -1,638 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.xml;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.StringReader;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.xerces.impl.XMLErrorReporter;
-import org.apache.xerces.parsers.SAXParser;
-import org.apache.xerces.parsers.StandardParserConfiguration;
-import org.apache.xerces.xni.XMLResourceIdentifier;
-import org.apache.xerces.xni.XNIException;
-import org.apache.xerces.xni.grammars.XMLGrammarPool;
-import org.apache.xerces.xni.parser.XMLEntityResolver;
-import org.apache.xerces.xni.parser.XMLErrorHandler;
-import org.apache.xerces.xni.parser.XMLInputSource;
-import org.apache.xerces.xni.parser.XMLParseException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.wst.wsdl.validation.internal.ValidationMessageImpl;
-import org.eclipse.wst.wsdl.validation.internal.resolver.IURIResolutionResult;
-import org.eclipse.wst.wsdl.validation.internal.resolver.URIResolver;
-import org.w3c.dom.DOMError;
-import org.xml.sax.Attributes;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.DefaultHandler;
-
-import com.ibm.wsdl.Constants;
-
-/**
- * The default implementation of IXMLValidator.
- */
-public class DefaultXMLValidator implements IXMLValidator
-{
-  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 XMLGrammarPool grammarPool = 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);
-  }
-
-  /**
-   * @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;
-  }
-  
-  public void setGrammarPool(XMLGrammarPool grammarPool)
-  {
-	this.grammarPool = grammarPool;
-  }
-
-  /**
-   * @see org.eclipse.validate.wsdl.xmlconformance.IXMLValidatorAction#run()
-   */
-  public void run()
-  {
-    // Validate the XML file.
-    try
-    {
-      Reader reader1 = null; // Used for validation parse.
-      
-      InputSource validateInputSource; 
-     
-      
-      if (this.inputStream != null)
-      {    
-      
-
-        String string = createStringForInputStream(inputStream);
-        reader1 = new StringReader(string);
-          
-        validateInputSource = new InputSource(inputStream);
-        validateInputSource.setCharacterStream(reader1);
-      } else
-      { validateInputSource = new InputSource(uri);
-      }
-      
-      XMLReader reader = createXMLReader();
-      reader.parse(validateInputSource);
-    }
-    catch (SAXParseException e)
-    {
-      // No need to add an error here. SAXParseExceptions are reported by the error reporter.
-    }
-    catch (IOException e)
-    {
-      // TODO: Log exception.
-      // System.out.println(e);
-    }
-    catch (Exception e)
-    {
-      // TODO: Log exception.
-      //System.out.println(e);
-    }
-  }
-  
-  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();
-  }
-
-  /**
-   * @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;
-  }
-  
-  public void addError(String message, int line, int column, String uri)
-  {
-	  errors.add(new ValidationMessageImpl(message, line, column, ValidationMessageImpl.SEV_WARNING, uri, currentErrorKey, currentMessageArguments));
-  }
-
-  /**
-   * The handler for the SAX parser. This handler will obtain the WSDL
-   * namespace, handle errors and resolve entities.
-   */
-  protected class XMLConformanceDefaultHandler extends DefaultHandler
-  {
-    /**
-     * @see org.xml.sax.ErrorHandler#error(SAXParseException)
-     */
-    public void error(SAXParseException arg0) throws SAXException
-    {
-     String tempURI = arg0.getSystemId();
-     if (inputStream!= null && arg0.getSystemId() == null)
-     {
-       //mh: In this case we are validating a stream so the URI may be null in this exception
-       tempURI = uri;       
-     }
-     addError(arg0.getMessage(), arg0.getLineNumber(), arg0.getColumnNumber(), tempURI);
-    }
-
-    /**
-     * @see org.xml.sax.ErrorHandler#fatalError(SAXParseException)
-     */
-    public void fatalError(SAXParseException arg0) throws SAXException
-    {
-      addError(arg0.getMessage(), arg0.getLineNumber(), arg0.getColumnNumber(), arg0.getSystemId());
-    }
-
-    /**
-     * @see org.xml.sax.ErrorHandler#warning(SAXParseException)
-     */
-    public void warning(SAXParseException arg0) throws SAXException
-    {
-      addError(arg0.getMessage(), arg0.getLineNumber(), arg0.getColumnNumber(), arg0.getSystemId());
-    }
-	
-	/**
-	 * @see org.xml.sax.ContentHandler#endElement(java.lang.String, java.lang.String, java.lang.String)
-	 */
-	public void endElement(String uri, String localName, String qName)
-			throws SAXException {
-		if(localName.equals("documentation") && (uri.equals(Constants.NS_URI_WSDL) || uri.equals(Constants.NS_URI_XSD_2001)|| uri.equals(Constants.NS_URI_XSD_1999) || uri.equals(Constants.NS_URI_XSD_2000)))
-		{
-		  isChildOfDoc = false;
-		}
-		super.endElement(uri, localName, qName);
-	}
-	/**
-	 * @see org.xml.sax.ContentHandler#startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes)
-	 */
-	public void startElement(String uri, String localName, String qName,
-			Attributes atts) throws SAXException {
-		if(localName.equals("documentation") && (uri.equals(Constants.NS_URI_WSDL) || uri.equals(Constants.NS_URI_XSD_2001)|| uri.equals(Constants.NS_URI_XSD_1999) || uri.equals(Constants.NS_URI_XSD_2000)))
-		{
-		  isChildOfDoc = true;
-		}
-		super.startElement(uri, localName, qName, atts);
-	}
-
-    /**
-     * @see org.xml.sax.EntityResolver#resolveEntity(java.lang.String,
-     *      java.lang.String)
-     */
-    public InputSource resolveEntity(String publicId, String systemId) throws SAXException
-    {
-      // If we're currently examining a subelement of the 
-	  // WSDL or schema documentation element we don't want to resolve it
-	  // as anything is allowed as a child of documentation.
-	  if(isChildOfDoc)
-	  {
-	    return new InputSource();
-	  }
-    if(publicId == null)
-    {
-      publicId = systemId;
-    }
-      
-    IURIResolutionResult result = uriResolver.resolve("", publicId, systemId);
-    String uri = result.getPhysicalLocation();
-    if (uri != null && !uri.equals(""))
-    {
-	  try
-	  {
-//	    String entity = systemId;
-//		if(publicId != null)
-//		{
-//		  entity = publicId;
-//		 }
-		URL entityURL = new URL(uri);
-        InputSource is = new InputSource(result.getLogicalLocation());
-		is.setByteStream(entityURL.openStream());
-        if (is != null)
-        {
-          return is;
-        }
-	  }
-	  catch(Exception e)
-	  {
-		 // Do nothing.
-	  }
-    }
-      // This try/catch block with the IOException is here to handle a difference
-      // between different versions of the EntityResolver interface.
-      try
-      {
-        InputSource is = super.resolveEntity(publicId, systemId);
-        if(is == null)
-        {
-          throw new IOException();
-        }
-        return is;
-      }
-      catch(IOException e)
-      {
-      }
-      return null;
-    }
-
-  }
-
-  /**
-   * @see org.eclipse.validate.wsdl.xmlconformance.IXMLValidator#setSchemaLocation(String,
-   *      String)
-   */
-  public void setSchemaLocation(String namespace, String location)
-  {
-    if (namespace != null && location != null && !namespace.equalsIgnoreCase("") && !location.equalsIgnoreCase(""))
-    {
-      schemaLocationString.append(" ").append(namespace).append(" ").append(formatURI(location));
-    }
-  }
-  
-  
-  /**
-   * @param inputStream - set the inputStream to validate
-   */
-  public void setInputStream(InputStream inputStream)
-  {
-      this.inputStream = inputStream;
-  }
-
-  /**
-   * Remove space characters from a String and replace them with %20.
-   * 
-   * @param uri -
-   *            the uri to format
-   * @return the formatted string
-   */
-  protected String formatURI(String uri)
-  {
-    String space = "%20";
-    StringBuffer newUri = new StringBuffer(uri);
-    int newUriLength = newUri.length();
-
-    // work backwards through the stringbuffer in case it grows to the
-    // point
-    // where the last space would be missed.
-    for (int i = newUriLength - 1; i >= 0; i--)
-    {
-      if (newUri.charAt(i) == ' ')
-      {
-        newUri.replace(i, i + 1, space);
-      }
-    }
-
-    return newUri.toString();
-  }
-  
-  protected class XMLValidatorParserConfiguration extends StandardParserConfiguration
-  {
-    public XMLErrorHandler getErrorHandler() 
-    {
-	  return new XMLValidatorErrorHandler();
-	}
-
-	public XMLEntityResolver getEntityResolver() {
-    	return new XMLEntityResolver()
-    	  {
-
-    	   
-    	    
-    	    /* (non-Javadoc)
-    	     * @see org.apache.xerces.xni.parser.XMLEntityResolver#resolveEntity(org.apache.xerces.xni.XMLResourceIdentifier)
-    	     */
-    	    public XMLInputSource resolveEntity(XMLResourceIdentifier rid) throws XNIException, IOException
-    	    {
-//    	      XMLInputSource result = null;     
-//    	      
-//    	      // TODO cs : Lawrence's XMLConformanceDefaultHandler seems to need to ingore some entities
-//    	      // that are part of documentation etc.  I think this resolver needs to do that
-//    	      // since the XMLConformanceDefaultHandler resolver is no longer active.
-//    	      if (uriResolver != null)
-//    	      {         
-//    	        String pid = rid.getPublicId() != null ? rid.getPublicId() : rid.getNamespace();
-//    	        String systemId = uriResolver.resolve(rid.getBaseSystemId(), pid, rid.getLiteralSystemId());
-//    	        result = new XMLInputSource(rid.getPublicId(), systemId, rid.getBaseSystemId());               
-//    	      }
-//    	      return result;
-    	      
-//    	    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 XMLInputSource(rid);
-    		  }
-    		  String systemId = rid.getLiteralSystemId();
-    		  if(systemId == null)
-    		  {
-    			systemId = rid.getNamespace();
-    		  }
-    		  String publicId = rid.getPublicId();
-    	    if(publicId == null)
-    	    {
-    	      publicId = systemId;
-    	    }
-    	      
-    	    IURIResolutionResult result = uriResolver.resolve("", publicId, systemId);
-    	    String uri = result.getPhysicalLocation();
-    	    if (uri != null && !uri.equals(""))
-    	    {
-    		  try
-    		  {
-//    		    String entity = systemId;
-//    			if(publicId != null)
-//    			{
-//    			  entity = publicId;
-//    			 }
-    			URL entityURL = new URL(uri);
-    	        XMLInputSource is = new XMLInputSource(rid.getPublicId(), systemId, result.getLogicalLocation());
-    			is.setByteStream(entityURL.openStream());
-    	        if (is != null)
-    	        {
-    	          return is;
-    	        }
-    		  }
-    		  catch(Exception e)
-    		  {
-    			 // Do nothing.
-    		  }
-    	    }
-    	      // This try/catch block with the IOException is here to handle a difference
-    	      // between different versions of the EntityResolver interface.
-//    	      try
-//    	      {
-//    	        InputSource is = super.resolveEntity(publicId, systemId);
-//    	        if(is == null)
-//    	        {
-//    	          throw new IOException();
-//    	        }
-//    	        return is;
-//    	      }
-//    	      catch(IOException e)
-//    	      {
-//    	      }
-    	      return null;
-    	    }
-    	    
-    	  }; 
-	}
-
-	/* (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);
-        }
-      };
-    }
-  }
-  
-  /**
-   * Create an XML Reader.
-   * 
-   * @return The newly created XML reader or null if unsuccessful.
-   * @throws Exception
-   */
-  protected XMLReader createXMLReader() throws Exception
-  {     
-    SAXParser reader = null;
-    try
-    {
-      reader = new org.apache.xerces.parsers.SAXParser(new XMLValidatorParserConfiguration());
-      
-      XMLConformanceDefaultHandler conformanceDefaultHandler = new XMLConformanceDefaultHandler();
-      reader.setErrorHandler(conformanceDefaultHandler);
-      reader.setContentHandler(conformanceDefaultHandler);
-      
-      reader.setProperty(org.apache.xerces.impl.Constants.XERCES_PROPERTY_PREFIX + org.apache.xerces.impl.Constants.XMLGRAMMAR_POOL_PROPERTY, grammarPool);
-      reader.setProperty(org.apache.xerces.impl.Constants.XERCES_PROPERTY_PREFIX + org.apache.xerces.impl.Constants.ENTITY_RESOLVER_PROPERTY, new MyEntityResolver(uriResolver));
-      reader.setFeature(org.apache.xerces.impl.Constants.XERCES_FEATURE_PREFIX + org.apache.xerces.impl.Constants.CONTINUE_AFTER_FATAL_ERROR_FEATURE, false);
-      reader.setFeature(org.apache.xerces.impl.Constants.SAX_FEATURE_PREFIX + org.apache.xerces.impl.Constants.NAMESPACES_FEATURE, true);
-      reader.setFeature(org.apache.xerces.impl.Constants.SAX_FEATURE_PREFIX + org.apache.xerces.impl.Constants.NAMESPACE_PREFIXES_FEATURE, true);
-	  reader.setFeature(org.apache.xerces.impl.Constants.SAX_FEATURE_PREFIX + org.apache.xerces.impl.Constants.VALIDATION_FEATURE, true);
-	  reader.setFeature(org.apache.xerces.impl.Constants.XERCES_FEATURE_PREFIX + org.apache.xerces.impl.Constants.SCHEMA_VALIDATION_FEATURE, true);
-    } 
-    catch(Exception e)
-    { 
-      // TODO: Log error.
-      //e.printStackTrace();
-    }
-    return reader;
-  } 
-  
-  /**
-   * A custom entity resolver that uses the URI resolver specified to resolve entities.
-   */
-  protected class MyEntityResolver implements XMLEntityResolver 
-  {
-    private URIResolver uriResolver;
-    
-    /**
-     * Constructor.
-     * 
-     * @param uriResolver The URI resolver to use with this entity resolver.
-     */
-    public MyEntityResolver(URIResolver uriResolver)
-    {
-      this.uriResolver = uriResolver;
-    }
-    
-    /* (non-Javadoc)
-     * @see org.apache.xerces.xni.parser.XMLEntityResolver#resolveEntity(org.apache.xerces.xni.XMLResourceIdentifier)
-     */
-    public XMLInputSource resolveEntity(XMLResourceIdentifier rid) throws XNIException, IOException
-    {
-      // 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 XMLInputSource(rid);
-	  }
-	  
-	  String ns = rid.getNamespace();
-	  if(ns != null && ignoredNamespaceList.contains(ns))
-	  {
-		return new XMLInputSource(rid);
-	  }
-	  
-	  String systemId = rid.getLiteralSystemId();
-	  if(systemId == null)
-	  {
-		systemId = ns;
-	  }
-	  String publicId = rid.getPublicId();
-      if(publicId == null)
-      {
-        publicId = systemId;
-      }
-      
-      IURIResolutionResult result = uriResolver.resolve("", publicId, systemId);
-      String uri = result.getPhysicalLocation();
-      if (uri != null && !uri.equals(""))
-      {
-	    try
-	    {
-		  URL entityURL = new URL(uri);
-          XMLInputSource is = new XMLInputSource(rid.getPublicId(), systemId, result.getLogicalLocation());
-		  is.setByteStream(entityURL.openStream());
-          if (is != null)
-          {
-            return is;
-          }
-	    }
-	    catch(Exception e)
-	    {
-		  // No need to report this error. Simply continue below.
-	    }
-      }
-      return null;
-    }
-  }  
-  
-  protected class XMLValidatorErrorHandler implements XMLErrorHandler
-  {
-	  
-	/**
-	   * 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.
-	   */
-	private void addValidationMessage(String key, XMLParseException exception, int severity)
-	{
-		if (severity == DOMError.SEVERITY_WARNING)
-        {
-			errors.add(new ValidationMessageImpl(exception.getLocalizedMessage(), exception.getLineNumber(), exception.getColumnNumber(), ValidationMessageImpl.SEV_WARNING, uri, key, currentMessageArguments));
-        }
-        else
-        {
-        	errors.add(new ValidationMessageImpl(exception.getLocalizedMessage(), exception.getLineNumber(), exception.getColumnNumber(), ValidationMessageImpl.SEV_ERROR, uri, key, currentMessageArguments));
-        }
-	  
-	}
-
-	public void error(String domain, String key, XMLParseException exception) throws XNIException 
-	{
-		addValidationMessage(key, exception, DOMError.SEVERITY_ERROR);
-		
-	}
-
-	public void fatalError(String domain, String key, XMLParseException exception) throws XNIException 
-	{
-		addValidationMessage(key, exception, DOMError.SEVERITY_FATAL_ERROR);
-		
-	}
-
-	public void warning(String domain, String key, XMLParseException exception) throws XNIException 
-	{
-		addValidationMessage(key, exception, DOMError.SEVERITY_WARNING);
-		
-	}
-	  
-  }
-  
-  protected class MyXMLErrorReporter extends XMLErrorReporter
-  {
-
-	public XMLErrorHandler getErrorHandler() {
-		// TODO Auto-generated method stub
-		return new XMLValidatorErrorHandler();
-	}
-
-	/* (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/org/eclipse/wst/wsdl/validation/internal/xml/ElementLocation.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/xml/ElementLocation.java
deleted file mode 100644
index 57d9a3abe..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/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/org/eclipse/wst/wsdl/validation/internal/xml/IXMLCatalog.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/xml/IXMLCatalog.java
deleted file mode 100644
index 43f456e45..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/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/org/eclipse/wst/wsdl/validation/internal/xml/IXMLValidator.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/xml/IXMLValidator.java
deleted file mode 100644
index b4cadfe03..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/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/org/eclipse/wst/wsdl/validation/internal/xml/LineNumberDOMParser.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/xml/LineNumberDOMParser.java
deleted file mode 100644
index 0ade3673c..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/xml/LineNumberDOMParser.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.xml;
-
-import org.apache.xerces.dom.ElementImpl;
-import org.apache.xerces.parsers.DOMParser;
-import org.apache.xerces.util.SymbolTable;
-import org.apache.xerces.xni.Augmentations;
-import org.apache.xerces.xni.NamespaceContext;
-import org.apache.xerces.xni.QName;
-import org.apache.xerces.xni.XMLAttributes;
-import org.apache.xerces.xni.XMLLocator;
-import org.apache.xerces.xni.XNIException;
-import org.apache.xerces.xni.grammars.XMLGrammarPool;
-import org.apache.xerces.xni.parser.XMLParserConfiguration;
-import org.w3c.dom.Element;
-import org.xml.sax.SAXNotRecognizedException;
-import org.xml.sax.SAXNotSupportedException;
-
-import com.ibm.wsdl.Constants;
-
-/**
- * A DOM parser that will register location information with the elements in the model.
- */
-public class LineNumberDOMParser extends DOMParser
-{
-  XMLLocator locator = null;
-
-  /**
-   * Constructor.
-   */
-  public LineNumberDOMParser()
-  {
-    super();
-    try
-    {
-      setFeature(DEFER_NODE_EXPANSION, false);
-    }
-    catch (SAXNotSupportedException e)
-    {
-      System.out.println(e);
-    }
-    catch (SAXNotRecognizedException e)
-    {
-      System.out.println(e);
-    }
-  }
-
-  /**
-   * Constuctor.
-   * 
-   * @param arg0 The parser configuration.
-   */
-  public LineNumberDOMParser(XMLParserConfiguration arg0)
-  {
-    super(arg0);
-    try
-    {
-      setFeature(DEFER_NODE_EXPANSION, false);
-    }
-    catch (SAXNotSupportedException e)
-    {
-      System.out.println(e);
-    }
-    catch (SAXNotRecognizedException e)
-    {
-      System.out.println(e);
-    }
-  }
-
-  /**
-   * Constructor.
-   * 
-   * @param arg0 A symbol table for the parser.
-   */
-  public LineNumberDOMParser(SymbolTable arg0)
-  {
-    super(arg0);
-  }
-
-  /**
-   * Constructor.
-   * 
-   * @param arg0 A symbol table for the parser.
-   * @param arg1 A grammar pool for the parser.
-   */
-  public LineNumberDOMParser(SymbolTable arg0, XMLGrammarPool arg1)
-  {
-    super(arg0, arg1);
-  }
-
-  /**
-   * @see org.apache.xerces.xni.XMLDocumentHandler#startElement(org.apache.xerces.xni.QName, org.apache.xerces.xni.XMLAttributes, org.apache.xerces.xni.Augmentations)
-   */
-  public void startElement(QName arg0, XMLAttributes arg1, Augmentations arg2) throws XNIException
-  {
-    Element element;
-    // For elements from the Schema namespace we want to preserve them
-    // the way they were entered. Revert the values to the non-normalized values.
-    String ns = arg0.uri;
-    if(ns != null && (ns.equals(Constants.NS_URI_XSD_2001) || ns.equals(Constants.NS_URI_XSD_1999) || ns.equals(Constants.NS_URI_XSD_2000)))
-    {
-      int numatts = arg1.getLength();
-      for(int i = 0; i < numatts; i++)
-      {
-        String nonNormalizedValue = arg1.getNonNormalizedValue(i);
-        arg1.setValue(i, nonNormalizedValue);
-      }
-    }
-    super.startElement(arg0, arg1, arg2);
-    try
-    {
-      element = (Element)getProperty(CURRENT_ELEMENT_NODE);
-      ElementImpl elementImpl = (ElementImpl)element;
-      // Setting the user data with an identifier such as ElementLocation.KEY_NAME
-      // may be a long term good idea. The setUserData method with no id is used 
-      // to support JVMs with alternate versions of Xerces.
-      elementImpl.setUserData(new ElementLocation(locator.getLineNumber(), locator.getColumnNumber()));
-    }
-    // catch SAXNotRecognizedException and SAXNotSupportedException if can't get element
-    catch (ClassCastException e)
-    {
-      //System.out.println(e);
-    }
-    catch (SAXNotRecognizedException e)
-    {
-      //System.out.println(e);
-    }
-    catch (SAXNotSupportedException e)
-    {
-      //System.out.println(e);
-    }
-  }
-
-  /**
-   * @see org.apache.xerces.xni.XMLDocumentHandler#startDocument(org.apache.xerces.xni.XMLLocator, java.lang.String, org.apache.xerces.xni.NamespaceContext, org.apache.xerces.xni.Augmentations)
-   */
-  public void startDocument(XMLLocator arg0, String arg1, NamespaceContext arg2, Augmentations arg3)
-    throws XNIException
-  {
-    locator = arg0;
-    super.startDocument(arg0, arg1, arg2, arg3);
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/xml/XMLCatalog.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/xml/XMLCatalog.java
deleted file mode 100644
index f99887bcf..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/xml/XMLCatalog.java
+++ /dev/null
@@ -1,364 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.wst.wsdl.validation.internal.xml;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.parsers.FactoryConfigurationError;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.apache.xerces.jaxp.SAXParserFactoryImpl;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXNotRecognizedException;
-import org.xml.sax.SAXNotSupportedException;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * XMLCatalog This class can be used to register, obtain and delete an instance
- * of an XML catalog. Method definitions are provided for the catalog to set a
- * location in the catalog and resolve an entity from the catalog.
- */
-public class XMLCatalog implements IXMLCatalog
-{
-  //private final static String _APACHE_FEATURE_CONTINUE_AFTER_FATAL_ERROR = "http://apache.org/xml/features/continue-after-fatal-error";
-
-  private final static String _APACHE_FEATURE_NAMESPACE_PREFIXES = "http://xml.org/sax/features/namespace-prefixes";
-
-  private final static String _APACHE_FEATURE_NAMESPACES = "http://xml.org/sax/features/namespaces";
-
-  //private final static String _APACHE_FEATURE_VALIDATION = "http://xml.org/sax/features/validation";
-
-  //private final static String _APACHE_FEATURE_VALIDATION_SCHEMA = "http://apache.org/xml/features/validation/schema";
-  
-  private final static String FILE_PROTOCOL = "file:///";
-
-  private static IXMLCatalog instance = null;
-
-  private static String extxmlcatalogclass = null;
-
-  private static ClassLoader extclassLoader = null;
-
-  private static IXMLCatalog extXMLCatalogInstance = null;
-
-  private static List schemadirs = new ArrayList();
-
-  private static List entities = new ArrayList();
-
-  /**
-   * A hashtable to hold the XML catalog entries.
-   */
-  protected Map catalog = new Hashtable();
-
-  /**
-   * Return an instance of the XML catalog. Assigns all registered schemas to
-   * the XML catalog.
-   * 
-   * @return The instance of the XML catalog.
-   */
-  public static IXMLCatalog getInstance()
-  {
-    if (instance == null)
-    {
-      instance = new XMLCatalog();
-
-      // Add the registered entities to the catalog.
-      Iterator entityIter = entities.iterator();
-      while (entityIter.hasNext())
-      {
-        XMLCatalogEntityHolder entity = (XMLCatalogEntityHolder) entityIter.next();
-        instance.addEntryToCatalog(entity.getPublicId(), entity.getSystemId());
-      }
-
-      // Add the schemas in the schema directories to the catalog.
-      if (schemadirs.size() > 0)
-      {
-        SAXParser saxParser = null;
-        try
-        {
-          SAXParserFactory parserfactory = new SAXParserFactoryImpl();
-          parserfactory.setFeature(_APACHE_FEATURE_NAMESPACE_PREFIXES, true);
-          parserfactory.setFeature(_APACHE_FEATURE_NAMESPACES, true);
-          saxParser = parserfactory.newSAXParser();
-        }
-        catch (FactoryConfigurationError e)
-        {
-        }
-        catch (SAXNotRecognizedException e)
-        {
-        }
-        catch (ParserConfigurationException e)
-        {
-        }
-        catch (SAXNotSupportedException e)
-        {
-        }
-        catch (SAXException e)
-        {
-        }
-        Iterator schemadirIter = schemadirs.iterator();
-        SchemaNamespaceHandler handler = ((XMLCatalog) instance).new SchemaNamespaceHandler();
-        while (schemadirIter.hasNext())
-        {
-          String schemadir = (String) schemadirIter.next();
-          registerSchemasForDir(instance, schemadir, saxParser, handler);
-        }
-      }
-    }
-    return instance;
-  }
-
-  /**
-   * Register the schemas in the given directory and all subdirectories with the
-   * XML catalog.
-   * 
-   * @param catalog
-   *          The catalog to register the schemas with.
-   * @param schemadir
-   *          The schema directory to search for schema files.
-   * @param parser
-   *          The SAXParser to use to parse the schemas for their
-   *          targetNamespace.
-   * @param handler
-   *          The handler to use to get the targetNamespace.
-   */
-  private static void registerSchemasForDir(IXMLCatalog catalog, String schemadir, SAXParser parser,
-      SchemaNamespaceHandler handler)
-  {
-    // Remove file: and file:/ from beginning of file location if they are present.
-    if(schemadir.startsWith("file:"))
-    {
-      schemadir = schemadir.substring(5);
-    }
-    while(schemadir.startsWith("//"))
-    {
-      schemadir = schemadir.substring(1);
-    }
-    
-    File dir = new File(schemadir);
-    if (dir.isDirectory())
-    {
-      File[] files = dir.listFiles();
-      int numfiles = files.length;
-      for (int i = 0; i < numfiles; i++)
-      {
-        File tempfile = files[i];
-        String tempfilepath = tempfile.getAbsolutePath();
-        tempfilepath = tempfilepath.replace('\\','/');
-        while(tempfilepath.startsWith("/"))
-        {
-          tempfilepath = tempfilepath.substring(1);
-        }
-        tempfilepath = FILE_PROTOCOL + tempfilepath;
-        if (tempfile.isDirectory())
-        {
-          registerSchemasForDir(catalog, tempfilepath, parser, handler);
-        } else
-        {
-          handler.reset();
-          try
-          {
-            parser.parse(tempfilepath, handler);
-          }
-          catch (Exception e)
-          {
-            // TODO: log error.
-          }
-          String targetNamespace = handler.getTargetNamespace();
-          if (targetNamespace != null)
-          {
-            catalog.addEntryToCatalog(targetNamespace, tempfilepath);
-          }
-        }
-      }
-    }
-  }
-
-  /**
-   * Get the instance of the extension XML catalog. Returns the instance if one
-   * is registered and can be created, null otherwise.
-   * 
-   * @return The instance of the extension XML catalog if one is registered,
-   *         null otherwise.
-   */
-  public static IXMLCatalog getExtensionCatalogInstance()
-  {
-    if (extXMLCatalogInstance == null)
-    {
-      if (extxmlcatalogclass != null && extclassLoader != null)
-      {
-        try
-        {
-          Class catalogClass = extclassLoader != null ? extclassLoader.loadClass(extxmlcatalogclass) : Class
-              .forName(extxmlcatalogclass);
-          extXMLCatalogInstance = (IXMLCatalog) catalogClass.newInstance();
-        }
-        catch (Exception e)
-        {
-          //TODO: Log error
-        }
-      }
-    }
-    return extXMLCatalogInstance;
-  }
-
-  /**
-   * Set the class of the XML catalog to be used.
-   * 
-   * @param xmlcatalog
-   *          The class of the XML catalog to be used.
-   * @param classloader
-   *          The classloader to use to load the catalog.
-   */
-  public static void setExtensionXMLCatalog(String xmlcatalog, ClassLoader classloader)
-  {
-    extxmlcatalogclass = xmlcatalog;
-    extclassLoader = classloader;
-  }
-
-  /**
-   * Resets the instance of the XML catalog to null. For deleting the catalog if
-   * necessary.
-   */
-  public static void reset()
-  {
-    instance = null;
-    extxmlcatalogclass = null;
-    extclassLoader = null;
-    extXMLCatalogInstance = null;
-    entities = new ArrayList();
-    schemadirs = new ArrayList();
-  }
-
-  /**
-   * Add a schema directory to be checked for schemas to register in the
-   * catalog.
-   * 
-   * @param schemadir
-   *          The directory to check for schemas.
-   */
-  public static void addSchemaDir(String schemadir)
-  {
-    schemadirs.add(schemadir);
-  }
-
-  /**
-   * Add an entity to the catalog.
-   * 
-   * @param entity
-   *          The entity to add to the catalog.
-   */
-  public static void addEntity(XMLCatalogEntityHolder entity)
-  {
-    entities.add(entity);
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.wsdl.validate.internal.xml.IXMLCatalog#addEntryToCatalog(java.lang.String,
-   *      java.lang.String)
-   */
-  public void addEntryToCatalog(String publicId, String systemId)
-  {
-    catalog.put(publicId, systemId);
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.wsdl.validate.internal.xml.IXMLCatalog#resolveEntityLocation(java.lang.String,
-   *      java.lang.String)
-   */
-  public String resolveEntityLocation(String publicId, String systemId)
-  {
-    String resolvedlocation = null;
-    // First try to resolve using the ext catalog.
-    IXMLCatalog extcatalog = getExtensionCatalogInstance();
-    if (extcatalog != null)
-    {
-      resolvedlocation = extcatalog.resolveEntityLocation(publicId, systemId);
-    }
-    if (resolvedlocation == null)
-    {
-      // if there's no system id use the public id
-      if (systemId == null || systemId.equals(""))
-      {
-        systemId = publicId;
-      }
-      resolvedlocation = (String) catalog.get(systemId);
-    }
-    return resolvedlocation;
-  }
-
-  /**
-   * A handler used in parsing to get the targetNamespace string of a schema.
-   */
-  protected class SchemaNamespaceHandler extends DefaultHandler
-  {
-    private final String TARGET_NAMESPACE = "targetNamespace";
-
-    private final String SCHEMA = "schema";
-
-    private String targetNamespace = null;
-
-    /**
-     * @see org.xml.sax.ContentHandler#startElement(java.lang.String,
-     *      java.lang.String, java.lang.String, org.xml.sax.Attributes)
-     */
-    public void startElement(String uri, String localname, String arg2, Attributes attributes) throws SAXException
-    {
-      if (localname.equals(SCHEMA))
-      {
-
-        int numAtts = attributes.getLength();
-        for (int i = 0; i < numAtts; i++)
-        {
-
-          String attname = attributes.getQName(i);
-          if (attname.equals(TARGET_NAMESPACE))
-          {
-            targetNamespace = attributes.getValue(i);
-          }
-        }
-
-      }
-      super.startElement(uri, localname, arg2, attributes);
-    }
-
-    /**
-     * Return the targetNamespace found by parsing the file.
-     * 
-     * @return The targetNamespace found by parsing the file.
-     */
-    public String getTargetNamespace()
-    {
-      return targetNamespace;
-    }
-
-    /**
-     * Reset the state of the handler so it can be reused.
-     */
-    public void reset()
-    {
-      targetNamespace = null;
-    }
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/xml/XMLCatalogEntityHolder.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/xml/XMLCatalogEntityHolder.java
deleted file mode 100644
index 5eca6ac92..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/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/org/eclipse/wst/wsdl/validation/internal/xml/XMLCatalogResolver.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/xml/XMLCatalogResolver.java
deleted file mode 100644
index 0e850c0e5..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/xml/XMLCatalogResolver.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.xml;
-
-import java.io.IOException;
-
-import org.apache.xerces.xni.XMLResourceIdentifier;
-import org.apache.xerces.xni.XNIException;
-import org.apache.xerces.xni.parser.XMLEntityResolver;
-import org.apache.xerces.xni.parser.XMLInputSource;
-import org.eclipse.wst.wsdl.validation.internal.util.LazyURLInputStream;
-
-/**
- * A resolver to resolver entities from the XML catalog.
- */
-public class XMLCatalogResolver implements XMLEntityResolver
-{
-  protected static XMLCatalogResolver xmlCatalog;
-
-  /**
-   * Constructor.
-   */
-  protected XMLCatalogResolver()
-  {
-  }
-
-  /**
-   * Get the instance of this resolver.
-   * 
-   * @return the instance of this resolver
-   */
-  public static XMLCatalogResolver getInstance()
-  {
-    if (xmlCatalog == null)
-    {
-      xmlCatalog = new XMLCatalogResolver();
-    }
-    return xmlCatalog;
-  }
-
-  /**
-   * @see org.xml.sax.EntityResolver#resolveEntity(java.lang.String, java.lang.String)
-   */
-  public XMLInputSource resolveEntity(XMLResourceIdentifier resourceIdentifier) throws XNIException, IOException
-  {
-    String publicId = resourceIdentifier.getPublicId();
-    if(publicId == null)
-    {
-      publicId = resourceIdentifier.getNamespace();
-    }
-    String systemId = resourceIdentifier.getLiteralSystemId();
-    String location = XMLCatalog.getInstance().resolveEntityLocation(publicId, systemId);
-    if (location != null)
-    {
-      LazyURLInputStream is = new LazyURLInputStream(location);
-      XMLInputSource inputSource = new XMLInputSource(publicId, systemId, systemId, is, null);
-      return inputSource;
-    }
-    // otherwise return null to tell the parser to locate the systemId as a URI
-    return null;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/xml/XMLMessageInfoHelper.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/xml/XMLMessageInfoHelper.java
deleted file mode 100644
index 443ab84ae..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/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/validatewsdl.properties b/bundles/org.eclipse.wst.wsdl.validation/src/validatewsdl.properties
deleted file mode 100644
index 73d05dec5..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/validatewsdl.properties
+++ /dev/null
@@ -1,55 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-!-- Constants for strings  
-
-!-- Warning Messages
-_WARN_NO_VALDIATOR                         = There is no registered validator for the namespace {0}.
-
-_ERROR_PROBLEM_WSDL_VALIDATOR              = A problem occurred while running the WSDL validator for namespace {0}.
-_ERROR_NO_WSDL_VALIDATOR                   = The namespace {0} specified is not a valid WSDL namespace.
-_ERROR_PROBLEM_EXT_VALIDATOR               = A problem occurred while running the Extension validator {0} for namespace {1}.
-
-!-- Strings for WSDL 1.1 validator
-                                                       
-_UNABLE_TO_IMPORT_BAD_LOCATION             = The {0} document could not be imported. Check that the document exists and that the location is correct.
-_UNABLE_TO_IMPORT_NO_LOCATION              = The location attribute is empty. A location must be specified for the location attribute.
-_UNABLE_TO_IMPORT_INVALID                  = The {0} document could not be imported because it is not valid. The document must be corrected before it can be imported.
-_NO_BINDING_FOR_PORT                       = The {0} port has an invalid binding - {1}. Check that the {1} binding is defined.
-_PORTTYPE_UNDEFINED_FOR_BINDING            = The {0} port type specified for the {1} binding is undefined. Check the {0} port type name and ensure it is defined.
-_OPERATION_UNDEFINED_FOR_PORTTYPE          = The operation specified for the {0} binding is not defined for port type {1}. All operations specified in this binding must be defined in port type {1}.
-_INPUT_NAME_NOT_UNIQUE                     = The name {0} specified for this input element is not unique. The name of an input element must be unique from the names of all other input and output elements defined in the {1} port type.
-_OUTPUT_NAME_NOT_UNIQUE                    = The name {0} specified for this output element is not unique. The name of an output element must be unique from the names of all other inputs and output elements defined in the {1} port type.
-_MESSAGE_UNDEFINED_FOR_INPUT               = The input element is referencing an undefined message {0}. Check that the message name and namespace are correct and that the message has been defined.
-_MESSAGE_UNDEFINED_FOR_OUTPUT              = The output element is referencing an undefined message {0}. Check that the message name and namespace are correct and that the message has been defined.
-_MESSAGE_UNDEFINED_FOR_FAULT               = The fault element is referencing an undefined message {0}. Check that the message name and namespace are correct and that the message has been defined.
-_DUPLICATE_FAULT_NAME                      = A fault with the name {0} has already been defined for the {1} 0peration. Check that every fault defined for this operation has a unique name.
-_PART_NO_ELEMENT_OR_TYPE                   = The part {0} does not have a type defined. Every part must specify a type from some type system. The type can be specified using the built in "element" or "type" attributes or may be specified using an extension attribute.
-_PART_BOTH_ELEMENT_AND_TYPE                = The part {0} has both an element and a type defined. Every part must only have an element or a type defined.
-_PART_INVALID_ELEMENT                      = The part {0} has an invalid value {1} defined for its element. Element declarations must refer to valid values defined in a schema.
-_PART_INVALID_TYPE                         = The part {0} has an invalid value {1} defined for its type. Type declarations must refer to valid values defined in a schema.
-_DUPLICATE_OPERATION_FOR_PORTTYPE          = An operation with the name {0} has already been defined for the {1} port type. Every operation defined for a port type must have a unique name. 
-_SERVICE_NAME_ALREADY_DEFINED              = A Service with the name {0} has already been defined. Every service in the WSDL document must have a unique name.
-_BINDING_NAME_ALREADY_DEFINED              = A binding with the name {0} has already been defined. Every binding in the WSDL document must have a unique name.
-_MESSAGE_NAME_ALREADY_DEFINED              = A message with the name {0} has already been defined. Every message in the WSDL document must have a unique name.
-_PORTTYPE_NAME_ALREADY_DEFINED             = A port type with the name {0} has already been defined. Every port type in the WSDL document must have a unique name.
-_MORE_THEN_ONE_ADDRESS_PORT                = An address has already been defined for port {0}. Each port can have only one address defined.
-_NO_ADDRESS_PORT                           = The port {0} has no address defined. Each port must define one address.
-_PORT_NAME_NOT_UNIQUE                      = A port with the name {0} has already been defined. Every port in the WSDL document must have a unique name.
-_OPERATION_NO_INPUT_OR_OUTPUT              = No input or output element has been defined for the {0} operation. An input element, an output element, or both must be defined for every operation.
-_WARN_SOAPENC_IMPORTED_PART                = The part {0} uses an element or type from the SOAP encoding namespace but the namespace has not been imported. The SOAP encoding namespace should be imported with an import statement before it is used.
-_WARN_SOAPENC_IMPORTED_SCHEMA              = The inline schema uses an element or type from the SOAP encoding namespace but the namespace has not been imported. The SOAP encoding namespace should be imported with an import statement before it is used.
-_REFERENCED_FILE_CONTAINS_ERRORS           = Referenced file contains errors ({0}).
-_WARN_OLD_SCHEMA_NAMESPACE                 = An old version of the schema namespace has been specified. {0} is the schema namespace that should be used.
-_ERROR_MULTIPLE_TYPES_DEFINED              = A types section has already been defined. Only one types element is allowed.
-_WARN_WRONG_NS_ON_IMPORT                   = The file cannot be imported because the namespace {0} does not match the target namespace {1} of the imported document.
-!-- Referenced file error
-!-- Note to translator - _REF_FILE_ERROR_MESSAGE needs a trailing space as another message may follow.
-_REF_FILE_ERROR_MESSAGE          = Referenced file contains errors ({0}). 
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/validatewsdlhttp.properties b/bundles/org.eclipse.wst.wsdl.validation/src/validatewsdlhttp.properties
deleted file mode 100644
index 7e7afd00b..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/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/validatewsdlmime.properties b/bundles/org.eclipse.wst.wsdl.validation/src/validatewsdlmime.properties
deleted file mode 100644
index 633e7bf7f..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/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/validatewsdlsoap.properties b/bundles/org.eclipse.wst.wsdl.validation/src/validatewsdlsoap.properties
deleted file mode 100644
index 4a2b96ee8..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/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/validatewsdlui.properties b/bundles/org.eclipse.wst.wsdl.validation/src/validatewsdlui.properties
deleted file mode 100644
index 37af48a9d..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/validatewsdlui.properties
+++ /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
-###############################################################################
-
-!-- 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 1c993bebf..000000000
--- a/bundles/org.eclipse.wst.wsdl/.classpath
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src-http"/>
-	<classpathentry kind="src" path="src-mime"/>
-	<classpathentry kind="src" path="src-soap"/>
-	<classpathentry kind="src" path="src-wsdl"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.wst.wsdl/.cvsignore b/bundles/org.eclipse.wst.wsdl/.cvsignore
deleted file mode 100644
index 28dfd3ffa..000000000
--- a/bundles/org.eclipse.wst.wsdl/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-bin
-wsdl.jar
-build.xml
-temp.folder
-org.eclipse.wst.wsdl_1.0.0.jar
-org.eclipse.wst.wsdl.patch
-@dot
-src.zip
diff --git a/bundles/org.eclipse.wst.wsdl/.project b/bundles/org.eclipse.wst.wsdl/.project
deleted file mode 100644
index ebc53b6ba..000000000
--- 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/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.wst.wsdl/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index ae9d67cf5..000000000
--- a/bundles/org.eclipse.wst.wsdl/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,59 +0,0 @@
-#Mon Jan 30 23:40:08 EST 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/bundles/org.eclipse.wst.wsdl/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.wst.wsdl/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 17c50aa86..000000000
--- a/bundles/org.eclipse.wst.wsdl/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Jan 30 23:19:19 EST 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/bundles/org.eclipse.wst.wsdl/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.wsdl/META-INF/MANIFEST.MF
deleted file mode 100644
index b9ea33b8c..000000000
--- a/bundles/org.eclipse.wst.wsdl/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,35 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.wst.wsdl; singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.core.internal.compatibility.PluginActivator
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: model,
- org.eclipse.wst.wsdl,
- org.eclipse.wst.wsdl.binding.http,
- org.eclipse.wst.wsdl.binding.http.internal.generator,
- org.eclipse.wst.wsdl.binding.http.internal.impl,
- org.eclipse.wst.wsdl.binding.http.internal.util,
- org.eclipse.wst.wsdl.binding.mime,
- org.eclipse.wst.wsdl.binding.mime.internal.impl,
- org.eclipse.wst.wsdl.binding.mime.internal.util,
- org.eclipse.wst.wsdl.binding.soap,
- org.eclipse.wst.wsdl.binding.soap.internal.generator,
- org.eclipse.wst.wsdl.binding.soap.internal.impl,
- org.eclipse.wst.wsdl.binding.soap.internal.util,
- org.eclipse.wst.wsdl.internal.extensibility,
- org.eclipse.wst.wsdl.internal.generator,
- org.eclipse.wst.wsdl.internal.generator.extension,
- org.eclipse.wst.wsdl.internal.impl,
- org.eclipse.wst.wsdl.internal.impl.wsdl4j,
- org.eclipse.wst.wsdl.internal.util,
- org.eclipse.wst.wsdl.util
-Require-Bundle: org.eclipse.core.runtime.compatibility,
- org.eclipse.emf.ecore,
- org.eclipse.xsd,
- org.eclipse.core.resources,
- org.wsdl4j
-Eclipse-AutoStart: true
-Plugin-Class: org.eclipse.wst.wsdl.WSDLPluginImplementation
diff --git a/bundles/org.eclipse.wst.wsdl/about.html b/bundles/org.eclipse.wst.wsdl/about.html
deleted file mode 100644
index 6f6b96c4c..000000000
--- a/bundles/org.eclipse.wst.wsdl/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl/build.properties b/bundles/org.eclipse.wst.wsdl/build.properties
deleted file mode 100644
index ed6283e18..000000000
--- a/bundles/org.eclipse.wst.wsdl/build.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
-###############################################################################
-bin.includes = .,\
-               plugin.properties,\
-               plugin.xml,\
-               xsd/,\
-               META-INF/,\
-               about.html
-jars.compile.order = .
-source.. = src-http/,\
-                  src-mime/,\
-                  src-soap/,\
-                  src-wsdl/
-output.. = bin/
-src.includes = component.xml
diff --git a/bundles/org.eclipse.wst.wsdl/component.xml b/bundles/org.eclipse.wst.wsdl/component.xml
deleted file mode 100644
index c4619c76e..000000000
--- a/bundles/org.eclipse.wst.wsdl/component.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component xmlns="http://eclipse.org/wtp/releng/tools/component-model"
-	name="org.eclipse.wst.wsdl">
-	<component-depends unrestricted="true"></component-depends>
-	<plugin id="org.eclipse.wst.wsdl" fragment="false" />
-	<plugin id="org.eclipse.wst.wsdl.ui" fragment="false" />
-	<plugin id="org.eclipse.wst.wsdl.validation" fragment="false" />
-	<plugin id="org.wsdl4j" fragment="false" />
-	<package name="org.eclipse.wst.wsdl" api="false">
-		<type name="Binding"  implement="false" subclass="false" instantiate="false"/>	
-		<type name="BindingFault"  implement="false" subclass="false" instantiate="false"/>
-		<type name="BindingInput"  implement="false" subclass="false" instantiate="false"/>
-		<type name="BindingOperation"  implement="false" subclass="false" instantiate="false"/>		
-		<type name="BindingOutput"  implement="false" subclass="false" instantiate="false"/>
-		<type name="Definition"  implement="false" subclass="false" instantiate="false"/>
-    	<type name="ExtensibilityElement"  implement="false" subclass="false" instantiate="false"/>
-		<type name="ExtensibleElement"  implement="false" subclass="false" instantiate="false"/>
-		<type name="Fault"  implement="false" subclass="false" instantiate="false"/>
-		<type name="Import"  implement="false" subclass="false" instantiate="false"/>			
-		<type name="Input"  implement="false" subclass="false" instantiate="false"/>			
-		<type name="Message"  implement="false" subclass="false" instantiate="false"/>
-		<type name="MessageReference"  implement="false" subclass="false" instantiate="false"/>		
-		<type name="Namespace"  implement="false" subclass="false" instantiate="false"/>		
-		<type name="Operation"  implement="false" subclass="false" instantiate="false"/>	
-    	<type name="Output"  implement="false" subclass="false" instantiate="false"/>			
-     	<type name="Part"  implement="false" subclass="false" instantiate="false"/>			
-		<type name="Port"  implement="false" subclass="false" instantiate="false"/>		
-		<type name="PortType"  implement="false" subclass="false" instantiate="false"/>
-		<type name="Service"  implement="false" subclass="false" instantiate="false"/>
-		<type name="Types"  implement="false" subclass="false" instantiate="false"/>
-		<type name="UnknownExtensibilityElement"  implement="false" subclass="false" instantiate="false"/>
-		<type name="WSDLElement"  implement="false" subclass="false" instantiate="false"/>
-		<type name="WSDLFactory"  implement="false" subclass="false" instantiate="false"/>	
-<!--	<type name="WSDLPlugin"  implement="false" subclass="false" instantiate="false"/>-->
-		<type name="XSDSchemaExtensibilityElement"  implement="false" subclass="false" instantiate="false"/>	
-	</package>
-	<package name="org.eclipse.wst.wsdl.util" api="false">
-		<type name="WSDLConstants" implement="false" subclass="false" instantiate="false"/>
-<!--	<type name="ExtensibilityElementFactory" /> -->		
-<!--	<type name="ExtensibilityElementFactoryRegistry" />-->	
-<!--	<type name="WSDLResourceImpl" subclass="false"/>-->
-	</package>
-	
-<!-- these plugin's to be provided with non API disclaimers -->
-<!--	
-	<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>
-
-	<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 106edbf25..000000000
--- 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 d392f0e82..000000000
--- 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 4edaf9d7d..000000000
--- a/bundles/org.eclipse.wst.wsdl/plugin.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# ====================================================================
-# To code developer:
-#   Do NOT change the properties between this line and the
-#   "%%% END OF TRANSLATED PROPERTIES %%%" line.
-#   Make a new property name, append to the end of the file and change
-#   the code to use the new property.
-# ====================================================================
-
-# ====================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# ====================================================================
-
-pluginName = WSDL Model
-providerName = Eclipse.org
-
-xpExtensibilityElementFactories = WSDL Extensibility Element Factories
-xpPortAndBindingContentGenerators = Port and Binding Content Generators
-xpWSDLContentType = WSDL Content Type
-
-_ERROR_INVALID_WSDL = The input source is not a valid WSDL document.
-
diff --git a/bundles/org.eclipse.wst.wsdl/plugin.xml b/bundles/org.eclipse.wst.wsdl/plugin.xml
deleted file mode 100644
index 8c24012ad..000000000
--- a/bundles/org.eclipse.wst.wsdl/plugin.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-	<extension-point
-		id="extensibilityElementFactories"
-		name="%xpExtensibilityElementFactories" 
-		schema="schema/extensibilityElementFactories.exsd"/>
-	<extension-point
-		id="contentGenerators"
-		name="%xpPortAndBindingContentGenerators" 
-		schema="schema/contentGenerators.exsd"/>
-
-	<extension point="org.eclipse.emf.ecore.generated_package">
-		<package
-			uri="http://www.ibm.com/wsdl/2003/WSDL"
-			class="org.eclipse.wst.wsdl.WSDLPackage">
-		</package>
-	</extension>
-	<extension point="org.eclipse.emf.ecore.extension_parser">
-		<parser
-			type="wsdl"
-			class="org.eclipse.wst.wsdl.internal.util.WSDLResourceFactoryImpl">
-		</parser>
-	</extension>
-
-	<extension point="org.eclipse.emf.ecore.generated_package">
-		<package
-			uri="http://www.eclipse.org/wsdl/2003/HTTP"
-			class="org.eclipse.wst.wsdl.binding.http.HTTPPackage">
-		</package>
-	</extension>
-
-	<extension
-		point="org.eclipse.wst.wsdl.extensibilityElementFactories">
-		<extensibilityElementFactory
-			namespace="http://schemas.xmlsoap.org/wsdl/http/"
-			class="org.eclipse.wst.wsdl.binding.http.internal.util.HTTPExtensibilityElementFactory" />
-	</extension>
-
-	<extension point="org.eclipse.emf.ecore.generated_package">
-		<package
-			uri="http://www.eclipse.org/wsdl/2003/MIME"
-			class="org.eclipse.wst.wsdl.binding.mime.MIMEPackage">
-		</package>
-	</extension>
-
-	<extension
-		point="org.eclipse.wst.wsdl.extensibilityElementFactories">
-		<extensibilityElementFactory
-			namespace="http://schemas.xmlsoap.org/wsdl/mime/"
-			class="org.eclipse.wst.wsdl.binding.mime.internal.util.MIMEExtensibilityElementFactory" />
-	</extension>
-
-	<extension point="org.eclipse.emf.ecore.generated_package">
-		<package
-			uri="http://www.eclipse.org/wsdl/2003/SOAP"
-			class="org.eclipse.wst.wsdl.binding.soap.SOAPPackage">
-		</package>
-	</extension>
-
-	<extension
-		point="org.eclipse.wst.wsdl.extensibilityElementFactories">
-		<extensibilityElementFactory
-			namespace="http://schemas.xmlsoap.org/wsdl/soap/"
-			class="org.eclipse.wst.wsdl.binding.soap.internal.util.SOAPExtensibilityElementFactory" />
-	</extension>
-
-	<extension point="org.eclipse.wst.wsdl.contentGenerators">
-		<contentGenerator
-			name="SOAP"
-			namespace="http://schemas.xmlsoap.org/wsdl/soap/"
-			class="org.eclipse.wst.wsdl.binding.soap.internal.generator.SOAPContentGenerator">
-		</contentGenerator>
-	</extension>
-
-	<extension point="org.eclipse.wst.wsdl.contentGenerators">
-		<contentGenerator
-			name="HTTP"
-			namespace="http://schemas.xmlsoap.org/wsdl/http/"
-			class="org.eclipse.wst.wsdl.binding.http.internal.generator.HTTPContentGenerator">
-		</contentGenerator>
-	</extension>
-
-
-
-	<!-- define a wsdl content type -->
-	<extension point="org.eclipse.core.runtime.contentTypes">
-		<content-type
-			priority="high"
-			name="%xpWSDLContentType"
-			id="wsdlsource"
-			base-type="org.eclipse.core.runtime.xml"
-			default-charset="UTF-8"
-			file-extensions="wsdl" />
-	</extension>
-</plugin>
diff --git a/bundles/org.eclipse.wst.wsdl/schema/contentGenerators.exsd b/bundles/org.eclipse.wst.wsdl/schema/contentGenerators.exsd
deleted file mode 100644
index 052a447f8..000000000
--- a/bundles/org.eclipse.wst.wsdl/schema/contentGenerators.exsd
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.wsdl">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.wst.wsdl" id="contentGenerators" name="Port and Binding Content Generators"/>
-      </appInfo>
-      <documentation>
-         The Port and Binding Content Generators extension point allows clients to register custom generators for Ports and Bindings.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <documentation>
-            The Port and Binding Content Generators extension point allows clients to register custom content generators for WSDL Ports and Bindings.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="contentGenerator"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified identifier of the target extension point
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  an optional identifier of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  an optional name of the extension instance
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="contentGenerator">
-      <complexType>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  Name used for this particular extension point instance.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="namespace" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The namespace this extension point instance applies to.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The class that implements &lt;code&gt;org.eclipse.wst.wsdl.internal.generator.ContentGenerator&lt;/code&gt;.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         &lt;b&gt;This extension point is internal and should not be used by any other plugins.&lt;/b&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The following is an example of a content generator contribution:
-&lt;pre&gt;
-   &lt;extension
-         point=&quot;org.eclipse.wst.wsdl.contentGenerators&quot;&gt;
-      &lt;contentGenerator
-            name=&quot;SOAP&quot;
-            namespace=&quot;http://schemas.xmlsoap.org/wsdl/soap/&quot;
-            class=&quot;org.eclipse.wst.wsdl.binding.soap.internal.generator.SOAPContentGenerator&quot;/&gt;
-   &lt;/extension&gt;
-&lt;/pre&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         The supplied class must implement &lt;code&gt;org.eclipse.wst.wsdl.internal.generator.ContentGenerator&lt;/code&gt;.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2000, 2005 IBM Corporation and others.&lt;br&gt;
-All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
-this distribution, and is available at &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.wst.wsdl/schema/extensibilityElementFactories.exsd b/bundles/org.eclipse.wst.wsdl/schema/extensibilityElementFactories.exsd
deleted file mode 100644
index 924557efe..000000000
--- a/bundles/org.eclipse.wst.wsdl/schema/extensibilityElementFactories.exsd
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.wsdl">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.wst.wsdl" id="extensibilityElementFactories" name="WSDL Extensibility Element Factories"/>
-      </appInfo>
-      <documentation>
-         The WSDL Extensibility Element Factories extension point allows clients to register factories for creating custom extensibility elements.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="extensibilityElementFactory"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified identifier of the target extension point
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  an optional identifier of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  an optional name of the extension instance
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="extensibilityElementFactory">
-      <complexType>
-         <attribute name="namespace" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The namespace this extension point instance applies to.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The class that implements &lt;code&gt;org.eclipse.wst.wsdl.util.ExtensibilityElementFactory&lt;/code&gt;.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         &lt;b&gt;This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.&lt;/b&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The following is an example of an extensibility element factory contribution:
-&lt;pre&gt;
-   &lt;extension
-         point=&quot;org.eclipse.wst.wsdl.extensibilityElementFactories&quot;&gt;
-      &lt;extensibilityElementFactory
-            namespace=&quot;http://schemas.xmlsoap.org/wsdl/soap/&quot;
-            class=&quot;org.eclipse.wst.wsdl.binding.soap.internal.util.SOAPExtensibilityElementFactory&quot;/&gt;
-   &lt;/extension&gt;
-&lt;/pre&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         The supplied class must implement &lt;code&gt;org.eclipse.wst.wsdl.util.ExtensibilityElementFactory&lt;/code&gt;.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2000, 2005 IBM Corporation and others.&lt;br&gt;
-All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
-this distribution, and is available at &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.wst.wsdl/src-http/model/HTTP.genmodel b/bundles/org.eclipse.wst.wsdl/src-http/model/HTTP.genmodel
deleted file mode 100644
index fbc41586b..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/model/HTTP.genmodel
+++ /dev/null
@@ -1,411 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<genmodel:GenModel xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/com.ibm.etools.wsdl.binding.http/src"
-    editDirectory="/com.ibm.etools.wsdl.binding.http.edit/src" editorDirectory="/com.ibm.etools.wsdl.binding.http.editor/src"
-    modelPluginID="com.ibm.etools.wsdl.binding.http" modelName="HTTP" editPluginClass=""
-    editorPluginClass="" usedGenPackages="../../../org.eclipse.xsd/src/model/XSD.genmodel#//xsd">
-  <foreignModel>..\rose\http.mdl</foreignModel>
-  <foreignModel>VABASE_PLUGINS_PATH</foreignModel>
-  <foreignModel>../../..</foreignModel>
-  <genPackages prefix="WSDL" basePackage="com.ibm.etools" ecorePackage="wsdl.ecore#/">
-    <genDataTypes ecoreDataType="wsdl.ecore#//QName"/>
-    <genDataTypes ecoreDataType="wsdl.ecore#//OperationType"/>
-    <genDataTypes ecoreDataType="wsdl.ecore#//DOMElement"/>
-    <genDataTypes ecoreDataType="wsdl.ecore#//WSDLException"/>
-    <genDataTypes ecoreDataType="wsdl.ecore#//DOMDocument"/>
-    <genClasses ecoreClass="wsdl.ecore#//WSDLElement">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//WSDLElement/documentationElement"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//WSDLElement/element"/>
-      <genOperations ecoreOperation="wsdl.ecore#//WSDLElement/getEnclosingDefinition"/>
-      <genOperations ecoreOperation="wsdl.ecore#//WSDLElement/setEnclosingDefinition">
-        <genParameters ecoreParameter="wsdl.ecore#//WSDLElement/setEnclosingDefinition/definition"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//PortType">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//PortType/qName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//PortType/undefined"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//PortType/proxy"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//PortType/resourceURI"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//PortType/eOperations"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Operation">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Operation/style"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Operation/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Operation/undefined"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Operation/proxy"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Operation/resourceURI"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Operation/eInput"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Operation/eOutput"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Operation/eFaults"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Operation/eParameterOrdering"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Message">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Message/qName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Message/undefined"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Message/proxy"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Message/resourceURI"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Message/eParts"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Part">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Part/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Part/elementName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Part/typeName"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Part/typeDefinition"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Part/elementDeclaration"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Part/eMessage"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Binding">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Binding/qName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Binding/undefined"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Binding/proxy"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Binding/resourceURI"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Binding/ePortType"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Binding/eBindingOperations"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//BindingOperation">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//BindingOperation/name"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//BindingOperation/eOperation"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//BindingOperation/eBindingInput"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//BindingOperation/eBindingOutput"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//BindingOperation/eBindingFaults"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Service">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Service/qName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Service/undefined"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Service/proxy"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Service/resourceURI"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Service/ePorts"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Port">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Port/name"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Port/eBinding"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//ExtensibilityElement">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//ExtensibilityElement/required"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//ExtensibilityElement/elementType"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Definition">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Definition/targetNamespace"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Definition/location"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Definition/qName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Definition/encoding"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eMessages"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/ePortTypes"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eBindings"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eServices"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eNamespaces"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eTypes"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eImports"/>
-      <genOperations ecoreOperation="wsdl.ecore#//Definition/getDocument"/>
-      <genOperations ecoreOperation="wsdl.ecore#//Definition/setDocument">
-        <genParameters ecoreParameter="wsdl.ecore#//Definition/setDocument/document"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Import">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Import/namespaceURI"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Import/locationURI"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Import/eDefinition"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Import/eSchema"/>
-      <genOperations ecoreOperation="wsdl.ecore#//Import/getSchema"/>
-      <genOperations ecoreOperation="wsdl.ecore#//Import/setSchema">
-        <genParameters ecoreParameter="wsdl.ecore#//Import/setSchema/schema"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//ExtensibleElement">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//ExtensibleElement/eExtensibilityElements"/>
-      <genOperations ecoreOperation="wsdl.ecore#//ExtensibleElement/getExtensibilityElements"/>
-      <genOperations ecoreOperation="wsdl.ecore#//ExtensibleElement/addExtensibilityElement">
-        <genParameters ecoreParameter="wsdl.ecore#//ExtensibleElement/addExtensibilityElement/extElement"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Input"/>
-    <genClasses ecoreClass="wsdl.ecore#//Output"/>
-    <genClasses ecoreClass="wsdl.ecore#//Fault"/>
-    <genClasses ecoreClass="wsdl.ecore#//BindingInput">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//BindingInput/name"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//BindingInput/eInput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//BindingInput/getInput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//BindingInput/setInput">
-        <genParameters ecoreParameter="wsdl.ecore#//BindingInput/setInput/input"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//BindingOutput">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//BindingOutput/name"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//BindingOutput/eOutput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//BindingOutput/getOutput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//BindingOutput/setOutput">
-        <genParameters ecoreParameter="wsdl.ecore#//BindingOutput/setOutput/output"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//BindingFault">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//BindingFault/name"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//BindingFault/eFault"/>
-      <genOperations ecoreOperation="wsdl.ecore#//BindingFault/getFault"/>
-      <genOperations ecoreOperation="wsdl.ecore#//BindingFault/setFault">
-        <genParameters ecoreParameter="wsdl.ecore#//BindingFault/setFault/fault"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Namespace">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Namespace/URI"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Namespace/prefix"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IPortType">
-      <genOperations ecoreOperation="wsdl.ecore#//IPortType/addOperation">
-        <genParameters ecoreParameter="wsdl.ecore#//IPortType/addOperation/operation"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IPortType/getOperation">
-        <genParameters ecoreParameter="wsdl.ecore#//IPortType/getOperation/name"/>
-        <genParameters ecoreParameter="wsdl.ecore#//IPortType/getOperation/inputName"/>
-        <genParameters ecoreParameter="wsdl.ecore#//IPortType/getOperation/outputName"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IPortType/getOperations"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IOperation">
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/addFault">
-        <genParameters ecoreParameter="wsdl.ecore#//IOperation/addFault/fault"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/getFault">
-        <genParameters ecoreParameter="wsdl.ecore#//IOperation/getFault/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/getFaults"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/getParameterOrdering"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/setParameterOrdering">
-        <genParameters ecoreParameter="wsdl.ecore#//IOperation/setParameterOrdering/parameterOrder"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/getInput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/setInput">
-        <genParameters ecoreParameter="wsdl.ecore#//IOperation/setInput/input"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/getOutput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/setOutput">
-        <genParameters ecoreParameter="wsdl.ecore#//IOperation/setOutput/output"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IInput">
-      <genOperations ecoreOperation="wsdl.ecore#//IInput/getMessage"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IInput/setMessage">
-        <genParameters ecoreParameter="wsdl.ecore#//IInput/setMessage/message"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IOutput">
-      <genOperations ecoreOperation="wsdl.ecore#//IOutput/getMessage"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IOutput/setMessage">
-        <genParameters ecoreParameter="wsdl.ecore#//IOutput/setMessage/message"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IFault">
-      <genOperations ecoreOperation="wsdl.ecore#//IFault/getMessage"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IFault/setMessage">
-        <genParameters ecoreParameter="wsdl.ecore#//IFault/setMessage/message"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IMessage">
-      <genOperations ecoreOperation="wsdl.ecore#//IMessage/addPart">
-        <genParameters ecoreParameter="wsdl.ecore#//IMessage/addPart/part"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IMessage/getPart">
-        <genParameters ecoreParameter="wsdl.ecore#//IMessage/getPart/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IMessage/getParts"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IMessage/getOrderedParts">
-        <genParameters ecoreParameter="wsdl.ecore#//IMessage/getOrderedParts/partOrder"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IPart">
-      <genOperations ecoreOperation="wsdl.ecore#//IPart/setExtensionAttribute">
-        <genParameters ecoreParameter="wsdl.ecore#//IPart/setExtensionAttribute/name"/>
-        <genParameters ecoreParameter="wsdl.ecore#//IPart/setExtensionAttribute/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IPart/getExtensionAttributeNames"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IPart/getExtensionAttribute">
-        <genParameters ecoreParameter="wsdl.ecore#//IPart/getExtensionAttribute/name"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IService">
-      <genOperations ecoreOperation="wsdl.ecore#//IService/addPort">
-        <genParameters ecoreParameter="wsdl.ecore#//IService/addPort/port"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IService/getPorts"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IService/getPort">
-        <genParameters ecoreParameter="wsdl.ecore#//IService/getPort/name"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IPort">
-      <genOperations ecoreOperation="wsdl.ecore#//IPort/getBinding"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IPort/setBinding">
-        <genParameters ecoreParameter="wsdl.ecore#//IPort/setBinding/binding"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IBinding">
-      <genOperations ecoreOperation="wsdl.ecore#//IBinding/addBindingOperation">
-        <genParameters ecoreParameter="wsdl.ecore#//IBinding/addBindingOperation/bindingOperation"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IBinding/getBindingOperation">
-        <genParameters ecoreParameter="wsdl.ecore#//IBinding/getBindingOperation/name"/>
-        <genParameters ecoreParameter="wsdl.ecore#//IBinding/getBindingOperation/inputName"/>
-        <genParameters ecoreParameter="wsdl.ecore#//IBinding/getBindingOperation/outputName"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IBinding/getBindingOperations"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IBinding/getPortType"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IBinding/setPortType">
-        <genParameters ecoreParameter="wsdl.ecore#//IBinding/setPortType/portType"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IBindingOperation">
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/addBindingFault">
-        <genParameters ecoreParameter="wsdl.ecore#//IBindingOperation/addBindingFault/bindingFault"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/getBindingFault">
-        <genParameters ecoreParameter="wsdl.ecore#//IBindingOperation/getBindingFault/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/getBindingFaults"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/getOperation"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/setOperation">
-        <genParameters ecoreParameter="wsdl.ecore#//IBindingOperation/setOperation/operation"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/getBindingInput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/setBindingInput">
-        <genParameters ecoreParameter="wsdl.ecore#//IBindingOperation/setBindingInput/bindingInput"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/getBindingOutput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/setBindingOutput">
-        <genParameters ecoreParameter="wsdl.ecore#//IBindingOperation/setBindingOutput/bindingOutput"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IBindingInput"/>
-    <genClasses ecoreClass="wsdl.ecore#//IBindingOutput"/>
-    <genClasses ecoreClass="wsdl.ecore#//IBindingFault"/>
-    <genClasses ecoreClass="wsdl.ecore#//IExtensibilityElement"/>
-    <genClasses ecoreClass="wsdl.ecore#//IDefinition">
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addBinding">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addBinding/binding"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addImport">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addImport/importDef"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addMessage">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addMessage/message"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addNamespace">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addNamespace/prefix"/>
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addNamespace/namespaceURI"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addPortType">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addPortType/portType"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addService">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addService/service"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createBindingFault"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createBindingInput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createBindingOutput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createBindingOperation"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createBinding"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createFault"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createImport"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createInput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createMessage"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createOperation"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createOutput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createPart"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createPort"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createPortType"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createService"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getBinding">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getBinding/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getBindings"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getImports"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getImports.1">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getImports.1/namespaceURI"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getMessage">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getMessage/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getMessages"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getNamespace">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getNamespace/prefix"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getNamespaces"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getPortType">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getPortType/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getPortTypes"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getPrefix">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getPrefix/namespaceURI"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getService">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getService/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getServices"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getExtensionRegistry"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/setExtensionRegistry">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/setExtensionRegistry/extensionRegistry"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getDocumentBaseURI"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/setDocumentBaseURI">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/setDocumentBaseURI/documentBase"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createTypes"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/removeService">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/removeService/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/removeBinding">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/removeBinding/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/removePortType">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/removePortType/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/removeMessage">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/removeMessage/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getTypes"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/setTypes">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/setTypes/types"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IImport"/>
-    <genClasses ecoreClass="wsdl.ecore#//IList"/>
-    <genClasses ecoreClass="wsdl.ecore#//IMap"/>
-    <genClasses ecoreClass="wsdl.ecore#//IURL"/>
-    <genClasses ecoreClass="wsdl.ecore#//IExtensionRegistry"/>
-    <genClasses ecoreClass="wsdl.ecore#//Types">
-      <genOperations ecoreOperation="wsdl.ecore#//Types/getSchemas"/>
-      <genOperations ecoreOperation="wsdl.ecore#//Types/getSchemas.1">
-        <genParameters ecoreParameter="wsdl.ecore#//Types/getSchemas.1/namespaceURI"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IIterator"/>
-    <genClasses ecoreClass="wsdl.ecore#//ITypes"/>
-    <genClasses ecoreClass="wsdl.ecore#//UnknownExtensibilityElement">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//UnknownExtensibilityElement/parent"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//UnknownExtensibilityElement/children"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//XSDSchemaExtensibilityElement">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//XSDSchemaExtensibilityElement/schema"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//MessageReference">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//MessageReference/name"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//MessageReference/eMessage"/>
-    </genClasses>
-  </genPackages>
-  <genPackages prefix="HTTP" basePackage="com.ibm.etools.wsdl.binding" ecorePackage="http.ecore#/">
-    <genClasses ecoreClass="http.ecore#//HTTPBinding">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http.ecore#//HTTPBinding/verb"/>
-    </genClasses>
-    <genClasses ecoreClass="http.ecore#//HTTPOperation">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http.ecore#//HTTPOperation/locationURI"/>
-    </genClasses>
-    <genClasses ecoreClass="http.ecore#//HTTPUrlReplacement"/>
-    <genClasses ecoreClass="http.ecore#//HTTPUrlEncoded"/>
-    <genClasses ecoreClass="http.ecore#//HTTPAddress">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http.ecore#//HTTPAddress/locationURI"/>
-    </genClasses>
-    <genClasses ecoreClass="http.ecore#//IHTTPAddress"/>
-    <genClasses ecoreClass="http.ecore#//IHTTPBinding"/>
-    <genClasses ecoreClass="http.ecore#//IHTTPOperation"/>
-    <genClasses ecoreClass="http.ecore#//IHTTPUrlEncoded"/>
-    <genClasses ecoreClass="http.ecore#//IHTTPUrlReplacement"/>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/bundles/org.eclipse.wst.wsdl/src-http/model/com.ibm.etools.wsdl.bindings.HTTP.cat b/bundles/org.eclipse.wst.wsdl/src-http/model/com.ibm.etools.wsdl.bindings.HTTP.cat
deleted file mode 100644
index a63207abb..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/model/com.ibm.etools.wsdl.bindings.HTTP.cat
+++ /dev/null
@@ -1,378 +0,0 @@
-
-(object Petal
-    version    	42
-    _written   	"Rose 4.5.8054a"
-    charSet    	0)
-
-(object Class_Category "http"
-    is_unit    	TRUE
-    is_loaded  	TRUE
-    quid       	"3ABFD9AD01F8"
-    exportControl 	"Public"
-    logical_models 	(list unit_reference_list
-	(object Class "HTTPBinding"
-	    quid       	"3ABFE57C0136"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AE5FF1D0019"
-		    supplier   	"Logical View::wsdl::ExtensibilityElement"
-		    quidu      	"3AD5DBB602A9"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "verb"
-		    quid       	"3ABFE60D00DB"
-		    type       	"String"))
-	    language   	"Java")
-	(object Class "HTTPOperation"
-	    quid       	"3ABFE6AE0050"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AE5FF4B037C"
-		    supplier   	"Logical View::wsdl::ExtensibilityElement"
-		    quidu      	"3AD5DBB602A9"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "locationURI"
-		    quid       	"3ABFE70D0147"
-		    type       	"String"))
-	    language   	"Java")
-	(object Class "HTTPUrlReplacement"
-	    quid       	"3ABFEA1A017C"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AE728B802C3"
-		    supplier   	"Logical View::wsdl::ExtensibilityElement"
-		    quidu      	"3AD5DBB602A9"))
-	    language   	"Java")
-	(object Class "HTTPUrlEncoded"
-	    quid       	"3ABFEA6D0294"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AE728D50094"
-		    supplier   	"Logical View::wsdl::ExtensibilityElement"
-		    quidu      	"3AD5DBB602A9"))
-	    language   	"Java")
-	(object Class "HTTPAddress"
-	    quid       	"3AC3BF2500F5"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AE5FEA901B7"
-		    supplier   	"Logical View::wsdl::ExtensibilityElement"
-		    quidu      	"3AD5DBB602A9"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "locationURI"
-		    quid       	"3AC3BFA7012E"
-		    type       	"String"))
-	    language   	"Java"))
-    logical_presentations 	(list unit_reference_list
-	(object ClassDiagram "Port"
-	    quid       	"3AC11E5201FB"
-	    title      	"Port"
-	    zoom       	100
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	0
-	    origin_y   	0
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::http::HTTPAddress" @1
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(336, 432)
-		    label      	(object ItemLabel
-			Parent_View 	@1
-			location   	(135, 351)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	402
-			justify    	0
-			label      	"HTTPAddress")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AC3BF2500F5"
-		    width      	420
-		    height     	186
-		    annotation 	8
-		    autoResize 	TRUE)))
-	(object ClassDiagram "Extensibility"
-	    quid       	"3AE5FE3B037B"
-	    title      	"Extensibility"
-	    zoom       	100
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	0
-	    origin_y   	0
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::wsdl::ExtensibilityElement" @2
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(272, 128)
-		    font       	(object Font
-			italics    	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@2
-			location   	(70, 53)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	404
-			justify    	0
-			label      	"ExtensibilityElement")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5DBB602A9"
-		    width      	422
-		    height     	174
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::http::HTTPAddress" @3
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(272, 480)
-		    label      	(object ItemLabel
-			Parent_View 	@3
-			location   	(128, 428)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	288
-			justify    	0
-			label      	"HTTPAddress")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AC3BF2500F5"
-		    width      	306
-		    height     	128
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::http::HTTPBinding" @4
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(480, 640)
-		    label      	(object ItemLabel
-			Parent_View 	@4
-			location   	(344, 588)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	272
-			justify    	0
-			label      	"HTTPBinding")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3ABFE57C0136"
-		    width      	290
-		    height     	128
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritTreeView "" @5
-		    location   	(272, 305)
-		    line_color 	3342489
-		    fill_color 	13434879
-		    supplier   	@2
-		    vertices   	(list Points
-			(272, 305)
-			(272, 215)))
-		(object InheritView "" @6
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AE5FEA901B7"
-		    client     	@3
-		    supplier   	@2
-		    line_style 	3
-		    origin_attachment 	(272, 416)
-		    terminal_attachment 	(272, 305)
-		    drawSupplier 	@5)
-		(object InheritView "" @7
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AE5FF1D0019"
-		    client     	@4
-		    supplier   	@2
-		    line_style 	3
-		    origin_attachment 	(475, 576)
-		    terminal_attachment 	(475, 305)
-		    drawSupplier 	@5)
-		(object ClassView "Class" "Logical View::http::HTTPOperation" @8
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(672, 816)
-		    label      	(object ItemLabel
-			Parent_View 	@8
-			location   	(518, 764)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	308
-			justify    	0
-			label      	"HTTPOperation")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3ABFE6AE0050"
-		    width      	326
-		    height     	128
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @9
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AE5FF4B037C"
-		    client     	@8
-		    supplier   	@2
-		    line_style 	3
-		    origin_attachment 	(656, 752)
-		    terminal_attachment 	(656, 305)
-		    drawSupplier 	@5)
-		(object ClassView "Class" "Logical View::http::HTTPUrlReplacement" @10
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(816, 992)
-		    label      	(object ItemLabel
-			Parent_View 	@10
-			location   	(605, 941)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	422
-			justify    	0
-			label      	"HTTPUrlReplacement")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3ABFEA1A017C"
-		    width      	440
-		    height     	126
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @11
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AE728B802C3"
-		    client     	@10
-		    supplier   	@2
-		    line_style 	3
-		    origin_attachment 	(869, 929)
-		    terminal_attachment 	(869, 305)
-		    drawSupplier 	@5)
-		(object ClassView "Class" "Logical View::http::HTTPUrlEncoded" @12
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1072, 1168)
-		    label      	(object ItemLabel
-			Parent_View 	@12
-			location   	(900, 1117)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	344
-			justify    	0
-			label      	"HTTPUrlEncoded")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3ABFEA6D0294"
-		    width      	362
-		    height     	126
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @13
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AE728D50094"
-		    client     	@12
-		    supplier   	@2
-		    line_style 	3
-		    origin_attachment 	(1103, 1105)
-		    terminal_attachment 	(1103, 305)
-		    drawSupplier 	@5)))
-	(object ClassDiagram "Binding"
-	    quid       	"3AE72A7000A9"
-	    title      	"Binding"
-	    zoom       	100
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	0
-	    origin_y   	0
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::http::HTTPBinding" @14
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(336, 272)
-		    label      	(object ItemLabel
-			Parent_View 	@14
-			location   	(200, 220)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	272
-			justify    	0
-			label      	"HTTPBinding")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3ABFE57C0136"
-		    width      	290
-		    height     	128
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::http::HTTPOperation" @15
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(720, 272)
-		    label      	(object ItemLabel
-			Parent_View 	@15
-			location   	(519, 191)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	402
-			justify    	0
-			label      	"HTTPOperation")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3ABFE6AE0050"
-		    width      	420
-		    height     	186
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::http::HTTPUrlReplacement" @16
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(848, 592)
-		    label      	(object ItemLabel
-			Parent_View 	@16
-			location   	(637, 541)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	422
-			justify    	0
-			label      	"HTTPUrlReplacement")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3ABFEA1A017C"
-		    width      	440
-		    height     	126
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::http::HTTPUrlEncoded" @17
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(384, 592)
-		    label      	(object ItemLabel
-			Parent_View 	@17
-			location   	(212, 541)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	344
-			justify    	0
-			label      	"HTTPUrlEncoded")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3ABFEA6D0294"
-		    width      	362
-		    height     	126
-		    annotation 	8
-		    autoResize 	TRUE)))))
diff --git a/bundles/org.eclipse.wst.wsdl/src-http/model/http.ecore b/bundles/org.eclipse.wst.wsdl/src-http/model/http.ecore
deleted file mode 100644
index 831039d66..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/model/http.ecore
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="http"
-    nsURI="http://www.ibm.com/wsdl/2003/HTTP" nsPrefix="http">
-  <eClassifiers xsi:type="ecore:EClass" name="HTTPBinding" eSuperTypes="wsdl.ecore#//ExtensibilityElement #//IHTTPBinding">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="verb" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="HTTPOperation" eSuperTypes="wsdl.ecore#//ExtensibilityElement #//IHTTPOperation">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="locationURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="HTTPUrlReplacement" eSuperTypes="wsdl.ecore#//ExtensibilityElement #//IHTTPUrlReplacement"/>
-  <eClassifiers xsi:type="ecore:EClass" name="HTTPUrlEncoded" eSuperTypes="wsdl.ecore#//ExtensibilityElement #//IHTTPUrlEncoded"/>
-  <eClassifiers xsi:type="ecore:EClass" name="HTTPAddress" eSuperTypes="wsdl.ecore#//ExtensibilityElement #//IHTTPAddress">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="locationURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IHTTPAddress" instanceClassName="javax.wsdl.extensions.http.HTTPAddress"
-      abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="IHTTPBinding" instanceClassName="javax.wsdl.extensions.http.HTTPBinding"
-      abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="IHTTPOperation" instanceClassName="javax.wsdl.extensions.http.HTTPOperation"
-      abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="IHTTPUrlEncoded" instanceClassName="javax.wsdl.extensions.http.HTTPUrlEncoded"
-      abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="IHTTPUrlReplacement" instanceClassName="javax.wsdl.extensions.http.HTTPUrlReplacement"
-      abstract="true" interface="true"/>
-</ecore:EPackage>
diff --git a/bundles/org.eclipse.wst.wsdl/src-http/model/http.mdl b/bundles/org.eclipse.wst.wsdl/src-http/model/http.mdl
deleted file mode 100644
index 4de2bea62..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/model/http.mdl
+++ /dev/null
@@ -1,32383 +0,0 @@
-
-(object Petal
-    version    	42
-    _written   	"Rose 4.5.8054a"
-    charSet    	0)
-
-(object Design "Logical View"
-    is_unit    	TRUE
-    is_loaded  	TRUE
-    defaults   	(object defaults
-	rightMargin 	0.250000
-	leftMargin 	0.250000
-	topMargin  	0.250000
-	bottomMargin 	0.500000
-	pageOverlap 	0.250000
-	clipIconLabels 	TRUE
-	autoResize 	TRUE
-	snapToGrid 	TRUE
-	gridX      	16
-	gridY      	16
-	defaultFont 	(object Font
-	    size       	10
-	    face       	"Arial"
-	    bold       	FALSE
-	    italics    	FALSE
-	    underline  	FALSE
-	    strike     	FALSE
-	    color      	0
-	    default_color 	TRUE)
-	showMessageNum 	1
-	showClassOfObject 	TRUE
-	notation   	"Unified")
-    root_usecase_package 	(object Class_Category "Use Case View"
-	quid       	"3ABFD9A70151"
-	exportControl 	"Public"
-	global     	TRUE
-	logical_models 	(list unit_reference_list)
-	logical_presentations 	(list unit_reference_list
-	    (object UseCaseDiagram "Main"
-		quid       	"3ABFD9A7018C"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    root_category 	(object Class_Category "Logical View"
-	quid       	"3ABFD9A70150"
-	exportControl 	"Public"
-	global     	TRUE
-	subsystem  	"Component View"
-	quidu      	"3ABFD9A70152"
-	logical_models 	(list unit_reference_list
-	    (object Class_Category "http"
-		quid       	"3ABFD9AD01F8"
-		exportControl 	"Public"
-		logical_models 	(list unit_reference_list
-		    (object Class "HTTPBinding"
-			quid       	"3ABFE57C0136"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AE5FF1D0019"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9")
-			    (object Inheritance_Relationship
-				quid       	"409843F103C0"
-				supplier   	"Logical View::http::IHTTPBinding"
-				quidu      	"409843A702EB"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "verb"
-				quid       	"3ABFE60D00DB"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "HTTPOperation"
-			quid       	"3ABFE6AE0050"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AE5FF4B037C"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9")
-			    (object Inheritance_Relationship
-				quid       	"4098444602CC"
-				supplier   	"Logical View::http::IHTTPOperation"
-				quidu      	"409843FF02BB"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "locationURI"
-				quid       	"3ABFE70D0147"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "HTTPUrlReplacement"
-			quid       	"3ABFEA1A017C"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AE728B802C3"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9")
-			    (object Inheritance_Relationship
-				quid       	"409844D202C5"
-				supplier   	"Logical View::http::IHTTPUrlReplacement"
-				quidu      	"4098449600D8"))
-			language   	"Java")
-		    (object Class "HTTPUrlEncoded"
-			quid       	"3ABFEA6D0294"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AE728D50094"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9")
-			    (object Inheritance_Relationship
-				quid       	"409844910009"
-				supplier   	"Logical View::http::IHTTPUrlEncoded"
-				quidu      	"409844570063"))
-			language   	"Java")
-		    (object Class "HTTPAddress"
-			quid       	"3AC3BF2500F5"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AE5FEA901B7"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9")
-			    (object Inheritance_Relationship
-				quid       	"409840D800C4"
-				supplier   	"Logical View::http::IHTTPAddress"
-				quidu      	"4098408901A1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "locationURI"
-				quid       	"3AC3BFA7012E"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "IHTTPAddress"
-			quid       	"4098408901A1"
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.extensions.http.HTTPAddress"
-				quid       	"409840A4013A"
-				stereotype 	"javaclass"))
-			language   	"Java")
-		    (object Class "IHTTPBinding"
-			quid       	"409843A702EB"
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.extensions.http.HTTPBinding"
-				quid       	"409843CA0177"
-				stereotype 	"javaclass"))
-			language   	"Java")
-		    (object Class "IHTTPOperation"
-			quid       	"409843FF02BB"
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.extensions.http.HTTPOperation"
-				quid       	"409844130204"
-				stereotype 	"javaclass"))
-			language   	"Java")
-		    (object Class "IHTTPUrlEncoded"
-			quid       	"409844570063"
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.extensions.http.HTTPUrlEncoded"
-				quid       	"4098446D021C"
-				stereotype 	"javaclass"))
-			language   	"Java")
-		    (object Class "IHTTPUrlReplacement"
-			quid       	"4098449600D8"
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.extensions.http.HTTPUrlReplacement"
-				quid       	"409844AC01AB"
-				stereotype 	"javaclass"))
-			language   	"Java"))
-		logical_presentations 	(list unit_reference_list
-		    (object ClassDiagram "Port"
-			quid       	"3AC11E5201FB"
-			title      	"Port"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::http::HTTPAddress" @1
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(672, 784)
-				label      	(object ItemLabel
-				    Parent_View 	@1
-				    location   	(471, 703)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	402
-				    justify    	0
-				    label      	"HTTPAddress")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AC3BF2500F5"
-				compartment 	(object Compartment
-				    Parent_View 	@1
-				    location   	(471, 763)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	409)
-				width      	420
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::http::IHTTPAddress" @2
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(672, 288)
-				label      	(object ItemLabel
-				    Parent_View 	@2
-				    location   	(138, 229)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1068
-				    justify    	0
-				    label      	"IHTTPAddress")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@2
-				    location   	(138, 179)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	1068
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"4098408901A1"
-				compartment 	(object Compartment
-				    Parent_View 	@2
-				    location   	(138, 289)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	1065)
-				width      	1086
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @3
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"409840D800C4"
-				client     	@1
-				supplier   	@2
-				line_style 	0)))
-		    (object ClassDiagram "Extensibility"
-			quid       	"3AE5FE3B037B"
-			title      	"Extensibility"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::ExtensibilityElement" @4
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(272, 128)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@4
-				    location   	(70, 53)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	404
-				    justify    	0
-				    label      	"ExtensibilityElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5DBB602A9"
-				width      	422
-				height     	174
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::http::HTTPAddress" @5
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(272, 480)
-				label      	(object ItemLabel
-				    Parent_View 	@5
-				    location   	(128, 428)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	288
-				    justify    	0
-				    label      	"HTTPAddress")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AC3BF2500F5"
-				width      	306
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::http::HTTPBinding" @6
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(480, 640)
-				label      	(object ItemLabel
-				    Parent_View 	@6
-				    location   	(344, 588)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	272
-				    justify    	0
-				    label      	"HTTPBinding")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3ABFE57C0136"
-				width      	290
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @7
-				location   	(272, 305)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@4
-				vertices   	(list Points
-				    (272, 305)
-				    (272, 215)))
-			    (object InheritView "" @8
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AE5FEA901B7"
-				client     	@5
-				supplier   	@4
-				line_style 	3
-				origin_attachment 	(272, 416)
-				terminal_attachment 	(272, 305)
-				drawSupplier 	@7)
-			    (object InheritView "" @9
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AE5FF1D0019"
-				client     	@6
-				supplier   	@4
-				line_style 	3
-				origin_attachment 	(475, 576)
-				terminal_attachment 	(475, 305)
-				drawSupplier 	@7)
-			    (object ClassView "Class" "Logical View::http::HTTPOperation" @10
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(672, 816)
-				label      	(object ItemLabel
-				    Parent_View 	@10
-				    location   	(518, 764)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	308
-				    justify    	0
-				    label      	"HTTPOperation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3ABFE6AE0050"
-				width      	326
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @11
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AE5FF4B037C"
-				client     	@10
-				supplier   	@4
-				line_style 	3
-				origin_attachment 	(656, 752)
-				terminal_attachment 	(656, 305)
-				drawSupplier 	@7)
-			    (object ClassView "Class" "Logical View::http::HTTPUrlReplacement" @12
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(816, 992)
-				label      	(object ItemLabel
-				    Parent_View 	@12
-				    location   	(605, 941)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	422
-				    justify    	0
-				    label      	"HTTPUrlReplacement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3ABFEA1A017C"
-				width      	440
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @13
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AE728B802C3"
-				client     	@12
-				supplier   	@4
-				line_style 	3
-				origin_attachment 	(869, 929)
-				terminal_attachment 	(869, 305)
-				drawSupplier 	@7)
-			    (object ClassView "Class" "Logical View::http::HTTPUrlEncoded" @14
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1072, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@14
-				    location   	(900, 1117)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	344
-				    justify    	0
-				    label      	"HTTPUrlEncoded")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3ABFEA6D0294"
-				width      	362
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @15
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AE728D50094"
-				client     	@14
-				supplier   	@4
-				line_style 	3
-				origin_attachment 	(1103, 1105)
-				terminal_attachment 	(1103, 305)
-				drawSupplier 	@7)))
-		    (object ClassDiagram "Binding"
-			quid       	"3AE72A7000A9"
-			title      	"Binding"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::http::HTTPBinding" @16
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(576, 592)
-				label      	(object ItemLabel
-				    Parent_View 	@16
-				    location   	(440, 540)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	272
-				    justify    	0
-				    label      	"HTTPBinding")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3ABFE57C0136"
-				compartment 	(object Compartment
-				    Parent_View 	@16
-				    location   	(440, 600)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	275)
-				width      	290
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::http::HTTPOperation" @17
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1696, 608)
-				label      	(object ItemLabel
-				    Parent_View 	@17
-				    location   	(1495, 527)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	402
-				    justify    	0
-				    label      	"HTTPOperation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3ABFE6AE0050"
-				compartment 	(object Compartment
-				    Parent_View 	@17
-				    location   	(1495, 587)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	409)
-				width      	420
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::http::HTTPUrlReplacement" @18
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1616, 1808)
-				label      	(object ItemLabel
-				    Parent_View 	@18
-				    location   	(1405, 1757)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	422
-				    justify    	0
-				    label      	"HTTPUrlReplacement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3ABFEA1A017C"
-				width      	440
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::http::HTTPUrlEncoded" @19
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(608, 1520)
-				label      	(object ItemLabel
-				    Parent_View 	@19
-				    location   	(436, 1469)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	344
-				    justify    	0
-				    label      	"HTTPUrlEncoded")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3ABFEA6D0294"
-				width      	362
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::http::IHTTPBinding" @20
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(576, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@20
-				    location   	(50, 101)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1052
-				    justify    	0
-				    label      	"IHTTPBinding")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@20
-				    location   	(50, 51)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	1052
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"409843A702EB"
-				compartment 	(object Compartment
-				    Parent_View 	@20
-				    location   	(50, 161)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	1050)
-				width      	1070
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @21
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"409843F103C0"
-				client     	@16
-				supplier   	@20
-				line_style 	0)
-			    (object ClassView "Class" "Logical View::http::IHTTPOperation" @22
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1696, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@22
-				    location   	(1150, 101)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1092
-				    justify    	0
-				    label      	"IHTTPOperation")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@22
-				    location   	(1150, 51)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	1092
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"409843FF02BB"
-				compartment 	(object Compartment
-				    Parent_View 	@22
-				    location   	(1150, 161)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	1090)
-				width      	1110
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @23
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"4098444602CC"
-				client     	@17
-				supplier   	@22
-				line_style 	0)
-			    (object ClassView "Class" "Logical View::http::IHTTPUrlEncoded" @24
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(608, 1104)
-				label      	(object ItemLabel
-				    Parent_View 	@24
-				    location   	(44, 1045)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1128
-				    justify    	0
-				    label      	"IHTTPUrlEncoded")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@24
-				    location   	(44, 995)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	1128
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"409844570063"
-				compartment 	(object Compartment
-				    Parent_View 	@24
-				    location   	(44, 1105)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	1125)
-				width      	1146
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @25
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"409844910009"
-				client     	@19
-				supplier   	@24
-				line_style 	0)
-			    (object ClassView "Class" "Logical View::http::IHTTPUrlReplacement" @26
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1584, 1376)
-				label      	(object ItemLabel
-				    Parent_View 	@26
-				    location   	(981, 1317)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1206
-				    justify    	0
-				    label      	"IHTTPUrlReplacement")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@26
-				    location   	(981, 1267)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	1206
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"4098449600D8"
-				compartment 	(object Compartment
-				    Parent_View 	@26
-				    location   	(981, 1377)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	1203)
-				width      	1224
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @27
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"409844D202C5"
-				client     	@18
-				supplier   	@26
-				line_style 	0)))))
-	    (object Class_Category "wsdl"
-		quid       	"3ADFB8E5021E"
-		documentation 	
-|The WSDL model contains classes for the Web Services Description Language (WSDL).
-|
-|WSDL describes network services as sets of endpoints operating on messages. The operations and messages are described abstractly, and then bound to a concrete network protocol and message format to define an endpoint.
-|
-|WSDL describes the formats of the messages exchanged by the services, and supports the XML Schemas specification as its canonical type system. This package uses an XML Schema Infoset model package (see the XSD package) to describe the abstract message formats.
-|
-|The model contains the following diagrams, named after the corresponding chapters in the WSDL 1.1 specification (http://www.w3.org/TR/2001/NOTE-wsdl-20010315)
-|- 2.1 Definition, shows the WSDL definition element and the WSDL document structure
-|- 2.1.1 Naming and Linking, shows the namespace and import mechanism
-|- 2.1.3 Extensibility, shows the WSDL extensibility mechanism
-|- 2.2 Types, shows the use of XML Schema types in WSDL
-|- 2.3 Messages, 2.4 PortTypes, 2.5 Bindings and 2.7 Services, show the major WSDL elements and their relations.
-|
-|The WSDL classes extend the javax.wsdl interfaces defined by JSR 110. Classes with interface and datatype stereotypes are used to represent these non-MOF interfaces.
-		
-		exportControl 	"Public"
-		logical_models 	(list unit_reference_list
-		    (object Class "WSDLElement"
-			quid       	"3AD5C6A302DD"
-			documentation 	"This class represents a WSDL language element."
-			operations 	(list Operations
-			    (object Operation "getEnclosingDefinition"
-				quid       	"3CD1529600C8"
-				result     	"Definition"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setEnclosingDefinition"
-				quid       	"3CD152B80347"
-				parameters 	(list Parameters
-				    (object Parameter "definition"
-					type       	"Definition"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "documentationElement"
-				quid       	"3CCE443602A3"
-				type       	"DOMElement")
-			    (object ClassAttribute "element"
-				quid       	"3F97DBD30207"
-				type       	"DOMElement"))
-			language   	"Java"
-			abstract   	TRUE)
-		    (object Class "PortType"
-			quid       	"3AD5C7F001A5"
-			documentation 	"This class represents a WSDL portType element of the WSDL specification version 1.1 and an Interface component of the WSDL specification version 1.2. A port type or Interface is a named set of abstract operations and the abstract messages involved."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5C9B70150"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3F6F1FD8019F"
-				supplier   	"Logical View::wsdl::IPortType"
-				quidu      	"3B84A5BE0331"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "qName"
-				quid       	"3AEB488E0023"
-				type       	"QName")
-			    (object ClassAttribute "undefined"
-				quid       	"3BDDF1E301E5"
-				type       	"boolean")
-			    (object ClassAttribute "proxy"
-				quid       	"3D18CDEB0316"
-				type       	"boolean")
-			    (object ClassAttribute "resourceURI"
-				quid       	"3D18D4FD01BA"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "Operation"
-			quid       	"3AD5C80D03CE"
-			documentation 	"This class represents a WSDL operation element. A WSDL operation is an abstract description of an action supported by a service."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AE9DE98003C"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3F6F1FE20171"
-				supplier   	"Logical View::wsdl::IOperation"
-				quidu      	"3B84A77600D1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "style"
-				quid       	"3AEB472601AC"
-				type       	"OperationType")
-			    (object ClassAttribute "name"
-				quid       	"3BDD9643004C"
-				type       	"String")
-			    (object ClassAttribute "undefined"
-				quid       	"3BDDF235003E"
-				type       	"boolean")
-			    (object ClassAttribute "proxy"
-				quid       	"3D18CE2201AD"
-				type       	"boolean")
-			    (object ClassAttribute "resourceURI"
-				quid       	"3D18D520011B"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "Message"
-			quid       	"3AD5C9590078"
-			documentation 	"This class represents a WSDL message element. A WSDL message is an abstract, typed definition of the data being communicated."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5D05501C4"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3B84A8D102BA"
-				supplier   	"Logical View::wsdl::IMessage"
-				quidu      	"3B84A8AF004F"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "qName"
-				quid       	"3AEB487C01FE"
-				type       	"QName")
-			    (object ClassAttribute "undefined"
-				quid       	"3BDDF1D20226"
-				type       	"boolean")
-			    (object ClassAttribute "proxy"
-				quid       	"3D18CE4B02B0"
-				type       	"boolean")
-			    (object ClassAttribute "resourceURI"
-				quid       	"3D18D54200F1"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "Part"
-			quid       	"3AD5CE1C032E"
-			documentation 	"This class represents a WSDL part element. Parts describe the logical abstract content of a message. Each part is associated with a type from some type system. "
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B84A96D02F1"
-				supplier   	"Logical View::wsdl::IPart"
-				quidu      	"3B84A93F01BE")
-			    (object Inheritance_Relationship
-				quid       	"3B897E230237"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3BCE70B703C8"
-				type       	"String")
-			    (object ClassAttribute "elementName"
-				quid       	"3B84B08703DB"
-				type       	"QName")
-			    (object ClassAttribute "typeName"
-				quid       	"3BCE70C303C5"
-				type       	"QName"))
-			language   	"Java")
-		    (object Class "Binding"
-			quid       	"3AD5D2860261"
-			documentation 	"This class represents a WSDL binding element. A binding defines message format and protocol details for operations and messages defined by a particular portType. There may be any number of bindings for a given portType."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5FA0F02F0"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3B8595410129"
-				supplier   	"Logical View::wsdl::IBinding"
-				quidu      	"3B84ABC60219"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "qName"
-				quid       	"3AEB4899014B"
-				type       	"QName")
-			    (object ClassAttribute "undefined"
-				quid       	"3BDDF1F401A3"
-				type       	"boolean")
-			    (object ClassAttribute "proxy"
-				quid       	"3D18CE6D0151"
-				type       	"boolean")
-			    (object ClassAttribute "resourceURI"
-				quid       	"3D18D4DF035C"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "BindingOperation"
-			quid       	"3AD5D3CB0145"
-			documentation 	"This class represents a WSDL operation element within a binding. An operation element within a binding specifies binding information for the operation with the same name within the binding's portType. "
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD6009202F7"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3B84ADE401DC"
-				supplier   	"Logical View::wsdl::IBindingOperation"
-				quidu      	"3B84ADC00072"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3B89C4CB0199"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "Service"
-			quid       	"3AD5D8F002F8"
-			documentation 	"This class represents a WSDL service element. A service groups a set of related ports together."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5FA20025E"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3B85954E01B4"
-				supplier   	"Logical View::wsdl::IService"
-				quidu      	"3B84AB490287"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "qName"
-				quid       	"3AEB48A40151"
-				type       	"QName")
-			    (object ClassAttribute "undefined"
-				quid       	"3BDDF20D0203"
-				type       	"boolean")
-			    (object ClassAttribute "proxy"
-				quid       	"3D18D4810220"
-				type       	"boolean")
-			    (object ClassAttribute "resourceURI"
-				quid       	"3D18D4C501E2"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "Port"
-			quid       	"3AD5D9170286"
-			documentation 	"This class represents a WSDL port element. A port defines an individual endpoint by specifying a single address for a binding"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD600CB00AA"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3B85954502C9"
-				supplier   	"Logical View::wsdl::IPort"
-				quidu      	"3B84AB800326"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3AD5D9A00391"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "ExtensibilityElement"
-			quid       	"3AD5DBB602A9"
-			documentation 	"This class represents a WSDL extensibility element. WSDL allows extensibility elements representing a specific technology under various elements defined by WSDL."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B84B14903D0"
-				supplier   	"Logical View::wsdl::IExtensibilityElement"
-				quidu      	"3B84B12402AB")
-			    (object Inheritance_Relationship
-				quid       	"3BDDF53502C3"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "required"
-				quid       	"3AF9543C0073"
-				type       	"boolean")
-			    (object ClassAttribute "elementType"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3B85B21A0271"
-				type       	"QName"))
-			language   	"Java")
-		    (object Class "Definition"
-			quid       	"3AD5E43F008E"
-			documentation 	"This class represents a WSDL definitions element. The WSDL definitions element is the root element of a WSDL document."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5FDB803D4"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3B84B1F80382"
-				supplier   	"Logical View::wsdl::IDefinition"
-				quidu      	"3B84B1D90142"))
-			operations 	(list Operations
-			    (object Operation "getDocument"
-				quid       	"3CD14FC2012B"
-				result     	"DOMDocument"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setDocument"
-				quid       	"3CD150DE01E7"
-				parameters 	(list Parameters
-				    (object Parameter "document"
-					type       	"DOMDocument"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "targetNamespace"
-				quid       	"3AD5E474004E"
-				type       	"String")
-			    (object ClassAttribute "location"
-				quid       	"40352B7C0396"
-				type       	"String")
-			    (object ClassAttribute "qName"
-				quid       	"3AEB485702F5"
-				type       	"QName")
-			    (object ClassAttribute "encoding"
-				quid       	"3CADD00D000D"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "Import"
-			quid       	"3AD5E4F903DE"
-			documentation 	"This class represents WSDL import element. WSDL allows associating a namespace with a document location using an import element."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5EE58037A"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3F6F200D0340"
-				supplier   	"Logical View::wsdl::IImport"
-				quidu      	"3B84B2020119"))
-			operations 	(list Operations
-			    (object Operation "getSchema"
-				quid       	"3C8672C10379"
-				result     	"XSDSchema"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setSchema"
-				quid       	"3C8672C10397"
-				parameters 	(list Parameters
-				    (object Parameter "schema"
-					type       	"XSDSchema"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "namespaceURI"
-				quid       	"3AD5E50A0036"
-				type       	"String")
-			    (object ClassAttribute "locationURI"
-				quid       	"3AD5E5140211"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "ExtensibleElement"
-			quid       	"3AD5FCFA033A"
-			documentation 	" WSDL allows elements representing a specific technology (referred to here as extensibility elements) under various elements defined by WSDL. This class represents a WSDL point of extensibility."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5FE3C03D4"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD"))
-			operations 	(list Operations
-			    (object Operation "getExtensibilityElements"
-				quid       	"3B85C12C03CD"
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "addExtensibilityElement"
-				quid       	"3B85C1470295"
-				parameters 	(list Parameters
-				    (object Parameter "extElement"
-					type       	"IExtensibilityElement"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			language   	"Java"
-			abstract   	TRUE)
-		    (object Class "Input"
-			quid       	"3AE0789F0059"
-			documentation 	"This class represents a WSDL input element. An input element specifies the abstract message format for the input of the operation."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B85C504025F"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3F67722802E7"
-				supplier   	"Logical View::wsdl::MessageReference"
-				quidu      	"3F6771DB02DC")
-			    (object Inheritance_Relationship
-				quid       	"3F6F1FEE031D"
-				supplier   	"Logical View::wsdl::IInput"
-				quidu      	"3B84A7EE0015"))
-			language   	"Java")
-		    (object Class "Output"
-			quid       	"3AE078B60232"
-			documentation 	"This class represents a WSDL output element. An output element specifies the abstract message format for the output of the operation."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B85C50C035B"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3F67723500DD"
-				supplier   	"Logical View::wsdl::MessageReference"
-				quidu      	"3F6771DB02DC")
-			    (object Inheritance_Relationship
-				quid       	"3F6F1FF801CD"
-				supplier   	"Logical View::wsdl::IOutput"
-				quidu      	"3B84A829027D"))
-			language   	"Java")
-		    (object Class "Fault"
-			quid       	"3AE078BE0108"
-			documentation 	"This class represents a WSDL fault element. Fault elements specify the abstract message format for any error messages that may be output as the result of the operation "
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AE1C82002F2"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3F67723D0319"
-				supplier   	"Logical View::wsdl::MessageReference"
-				quidu      	"3F6771DB02DC")
-			    (object Inheritance_Relationship
-				quid       	"3F6F2002002D"
-				supplier   	"Logical View::wsdl::IFault"
-				quidu      	"3B84A861031D"))
-			language   	"Java")
-		    (object Class "BindingInput"
-			quid       	"3AE08A8202D4"
-			documentation 	"This class represents a WSDL input element within a operation within a binding. An input element within an operation within a binding specifies binding information for the input of the operation. "
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B84AE1B0113"
-				supplier   	"Logical View::wsdl::IBindingInput"
-				quidu      	"3B84ADEB0100")
-			    (object Inheritance_Relationship
-				quid       	"3B85B59B0072"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A"))
-			operations 	(list Operations
-			    (object Operation "getInput"
-				quid       	"3C8653A40203"
-				result     	"IInput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setInput"
-				quid       	"3C8653B503A2"
-				parameters 	(list Parameters
-				    (object Parameter "input"
-					type       	"IInput"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3B85C1EA020E"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "BindingOutput"
-			quid       	"3AE08A8F028C"
-			documentation 	"This class represents a WSDL output element within a operation within a binding. An output element within an operation within a binding specifies binding information for the output of the operation. "
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B84AE4302AB"
-				supplier   	"Logical View::wsdl::IBindingOutput"
-				quidu      	"3B84AE210111")
-			    (object Inheritance_Relationship
-				quid       	"3B85B5A4027E"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A"))
-			operations 	(list Operations
-			    (object Operation "getOutput"
-				quid       	"3C8653D900F1"
-				result     	"IOutput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setOutput"
-				quid       	"3C8653F10326"
-				parameters 	(list Parameters
-				    (object Parameter "output"
-					type       	"IOutput"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3B85C20200BE"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "BindingFault"
-			quid       	"3AE08A9E03A6"
-			documentation 	"This class represents a WSDL fault element within a operation within a binding. A fault element within an operation within a binding specifies binding information for the fault with the same name. "
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AE0938602C9"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3B84AE710333"
-				supplier   	"Logical View::wsdl::IBindingFault"
-				quidu      	"3B84AE4F00BD"))
-			operations 	(list Operations
-			    (object Operation "getFault"
-				quid       	"3C865413037F"
-				result     	"IFault"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setFault"
-				quid       	"3C8654210109"
-				parameters 	(list Parameters
-				    (object Parameter "fault"
-					type       	"IFault"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3B85BF9E014A"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "QName"
-			quid       	"3AE8ED220140"
-			documentation 	"This class represents the javax.wsdl.QName class. A QName is a fully qualified name."
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.xml.namespace.QName"
-				quid       	"3B849DA9003D"
-				stereotype 	"javaclass"))
-			language   	"Java")
-		    (object Class "Namespace"
-			quid       	"3AEA3CD30030"
-			documentation 	"This class represents a namespace and the corresponding namespace prefix used in a WSDL document."
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "URI"
-				quid       	"3AEA3D2901B1"
-				type       	"String")
-			    (object ClassAttribute "prefix"
-				quid       	"3AEA3D320236"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "OperationType"
-			quid       	"3AEB4782024F"
-			documentation 	
-|ONE_WAY=1
-|REQUEST_RESPONSE=2
-|SOLICIT_RESPONSE=3
-|NOTIFICATION=4
-			
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.OperationType"
-				quid       	"3B85C35303E3"
-				stereotype 	"javaclass"))
-			language   	"Java")
-		    (object Class "IPortType"
-			quid       	"3B84A5BE0331"
-			documentation 	"This class represents the javax.wsdl.PortType non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addOperation"
-				quid       	"3B896AC101CA"
-				parameters 	(list Parameters
-				    (object Parameter "operation"
-					type       	"IOperation"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getOperation"
-				quid       	"3B896BAF01A4"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"String")
-				    (object Parameter "inputName"
-					type       	"String")
-				    (object Parameter "outputName"
-					type       	"String"))
-				result     	"IOperation"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getOperations"
-				quid       	"3B896BF7031A"
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.PortType"
-				quid       	"3B84A632000D"
-				stereotype 	"javaclass")))
-		    (object Class "IOperation"
-			quid       	"3B84A77600D1"
-			documentation 	"This class represents the javax.wsdl.Operation non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addFault"
-				quid       	"3B896C420065"
-				parameters 	(list Parameters
-				    (object Parameter "fault"
-					type       	"IFault"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getFault"
-				quid       	"3B896C59028F"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"String"))
-				result     	"IFault"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getFaults"
-				quid       	"3B896C7102B1"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getParameterOrdering"
-				quid       	"3B896C8101B0"
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setParameterOrdering"
-				quid       	"3B896C99031D"
-				parameters 	(list Parameters
-				    (object Parameter "parameterOrder"
-					type       	"IList"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getInput"
-				quid       	"3C8654E5018D"
-				result     	"IInput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setInput"
-				quid       	"3C8662C40107"
-				parameters 	(list Parameters
-				    (object Parameter "input"
-					type       	"IInput"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getOutput"
-				quid       	"3C8662E40094"
-				result     	"IOutput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setOutput"
-				quid       	"3C8662F001D2"
-				parameters 	(list Parameters
-				    (object Parameter "output"
-					type       	"IOutput"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Operation"
-				quid       	"3B84A799012B"
-				stereotype 	"javaclass")))
-		    (object Class "IInput"
-			quid       	"3B84A7EE0015"
-			documentation 	"This class represents the javax.wsdl.Input non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "getMessage"
-				quid       	"3C86633100EF"
-				result     	"IMessage"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setMessage"
-				quid       	"3C8663470277"
-				parameters 	(list Parameters
-				    (object Parameter "message"
-					type       	"IMessage"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Input"
-				quid       	"3B84A8000039"
-				stereotype 	"javaclass")))
-		    (object Class "IOutput"
-			quid       	"3B84A829027D"
-			documentation 	"This class represents the javax.wsdl.Output non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "getMessage"
-				quid       	"3C86643A035D"
-				result     	"IMessage"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setMessage"
-				quid       	"3C86644501C8"
-				parameters 	(list Parameters
-				    (object Parameter "message"
-					type       	"IMessage"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Output"
-				quid       	"3B84A83901D5"
-				stereotype 	"javaclass")))
-		    (object Class "IFault"
-			quid       	"3B84A861031D"
-			documentation 	"This class represents the javax.wsdl.Fault non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "getMessage"
-				quid       	"3C86646A00BD"
-				result     	"IMessage"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setMessage"
-				quid       	"3C8664750131"
-				parameters 	(list Parameters
-				    (object Parameter "message"
-					type       	"IMessage"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Fault"
-				quid       	"3B84A8710208"
-				stereotype 	"javaclass")))
-		    (object Class "IMessage"
-			quid       	"3B84A8AF004F"
-			documentation 	"This class represents the javax.wsdl.Message non-MOF interface"
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addPart"
-				quid       	"3B8972240273"
-				parameters 	(list Parameters
-				    (object Parameter "part"
-					type       	"IPart"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPart"
-				quid       	"3B89723D0233"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"String"))
-				result     	"IPart"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getParts"
-				quid       	"3B897254025E"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getOrderedParts"
-				quid       	"3B897261020D"
-				parameters 	(list Parameters
-				    (object Parameter "partOrder"
-					type       	"IList"))
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Message"
-				quid       	"3B84A8BC0260"
-				stereotype 	"javaclass")))
-		    (object Class "IPart"
-			quid       	"3B84A93F01BE"
-			documentation 	"This class represents the javax.wsdl.Part non-MOF interface"
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "setExtensionAttribute"
-				quid       	"3C4688450052"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName")
-				    (object Parameter "value"
-					type       	"QName"))
-				exceptions 	"WSDLException"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getExtensionAttributeNames"
-				quid       	"3C468A0101C3"
-				result     	"IIterator"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getExtensionAttribute"
-				quid       	"3C468A2D02D5"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"QName"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Part"
-				quid       	"3B84A9500231"
-				stereotype 	"javaclass")))
-		    (object Class "IService"
-			quid       	"3B84AB490287"
-			documentation 	"This class represents the javax.wsdl.Service non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addPort"
-				quid       	"3B895D5601D1"
-				parameters 	(list Parameters
-				    (object Parameter "port"
-					type       	"IPort"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPorts"
-				quid       	"3B895DA20036"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPort"
-				quid       	"3B895DB001BC"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"String"))
-				result     	"IPort"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Service"
-				quid       	"3B84AB5B003E"
-				stereotype 	"javaclass")))
-		    (object Class "IPort"
-			quid       	"3B84AB800326"
-			documentation 	"This class represents the javax.wsdl.Port non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "getBinding"
-				quid       	"3C8651F302B5"
-				result     	"IBinding"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setBinding"
-				quid       	"3C86526302F2"
-				parameters 	(list Parameters
-				    (object Parameter "binding"
-					type       	"IBinding"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Port"
-				quid       	"3B84AB8C0016"
-				stereotype 	"javaclass")))
-		    (object Class "IBinding"
-			quid       	"3B84ABC60219"
-			documentation 	"This class represents the javax.wsdl.Binding non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addBindingOperation"
-				quid       	"3B895F160153"
-				parameters 	(list Parameters
-				    (object Parameter "bindingOperation"
-					type       	"IBindingOperation"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindingOperation"
-				quid       	"3B895F500066"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"String")
-				    (object Parameter "inputName"
-					type       	"String")
-				    (object Parameter "outputName"
-					type       	"String"))
-				result     	"IBindingOperation"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindingOperations"
-				quid       	"3B895FA401C5"
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPortType"
-				quid       	"3C8652A90284"
-				result     	"IPortType"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setPortType"
-				quid       	"3C8652BE01A8"
-				parameters 	(list Parameters
-				    (object Parameter "portType"
-					type       	"IPortType"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Binding"
-				quid       	"3B84ABCF0302"
-				stereotype 	"javaclass")))
-		    (object Class "IBindingOperation"
-			quid       	"3B84ADC00072"
-			documentation 	"This class represents the javax.wsdl.BindingOperation non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addBindingFault"
-				quid       	"3B8960BC0041"
-				parameters 	(list Parameters
-				    (object Parameter "bindingFault"
-					type       	"IBindingFault"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindingFault"
-				quid       	"3B8960D9009D"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"String"))
-				result     	"IBindingFault"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindingFaults"
-				quid       	"3B8960FC0061"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getOperation"
-				quid       	"3C86532D0017"
-				result     	"IOperation"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setOperation"
-				quid       	"3C86533F037B"
-				parameters 	(list Parameters
-				    (object Parameter "operation"
-					type       	"IOperation"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindingInput"
-				quid       	"3C86550900DA"
-				result     	"IBindingInput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setBindingInput"
-				quid       	"3C86551D007F"
-				parameters 	(list Parameters
-				    (object Parameter "bindingInput"
-					type       	"IBindingInput"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindingOutput"
-				quid       	"3C8655340349"
-				result     	"IBindingOutput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setBindingOutput"
-				quid       	"3C86554702A6"
-				parameters 	(list Parameters
-				    (object Parameter "bindingOutput"
-					type       	"IBindingOutput"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.BindingOperation"
-				quid       	"3B84ADCB021C"
-				stereotype 	"javaclass")))
-		    (object Class "IBindingInput"
-			quid       	"3B84ADEB0100"
-			documentation 	"This class represents the javax.wsdl.BindingInput non-MOF interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.BindingInput"
-				quid       	"3B84ADFE000D"
-				stereotype 	"javaclass")))
-		    (object Class "IBindingOutput"
-			quid       	"3B84AE210111"
-			documentation 	"This class represents the javax.wsdl.BindingOutput non-MOF interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.BindingOutput"
-				quid       	"3B84AE2D0050"
-				stereotype 	"javaclass")))
-		    (object Class "IBindingFault"
-			quid       	"3B84AE4F00BD"
-			documentation 	"This class represents the javax.wsdl.BindingFault non-MOF interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.BindingFault"
-				quid       	"3B84AE5F002A"
-				stereotype 	"javaclass")))
-		    (object Class "DOMElement"
-			quid       	"3B84AF3203DB"
-			documentation 	"This class represents the org.w3c.dom.Element non-MOF interface."
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "org.w3c.dom.Element"
-				quid       	"3B84AF560292"
-				stereotype 	"javaclass")))
-		    (object Class "IExtensibilityElement"
-			quid       	"3B84B12402AB"
-			documentation 	"This class represents the javax.wsdl.ExtensibilityElement non-MOF interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.extensions.ExtensibilityElement"
-				quid       	"3B84B13503D1"
-				stereotype 	"javaclass")))
-		    (object Class "IDefinition"
-			quid       	"3B84B1D90142"
-			documentation 	"This class represents the javax.wsdl.Definition non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addBinding"
-				quid       	"3B8988F1039D"
-				parameters 	(list Parameters
-				    (object Parameter "binding"
-					type       	"IBinding"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "addImport"
-				quid       	"3B8989490259"
-				parameters 	(list Parameters
-				    (object Parameter "importDef"
-					type       	"IImport"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "addMessage"
-				quid       	"3B89896E005E"
-				parameters 	(list Parameters
-				    (object Parameter "message"
-					type       	"IMessage"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "addNamespace"
-				quid       	"3B898984004B"
-				parameters 	(list Parameters
-				    (object Parameter "prefix"
-					type       	"String")
-				    (object Parameter "namespaceURI"
-					type       	"String"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "addPortType"
-				quid       	"3B8989C50045"
-				parameters 	(list Parameters
-				    (object Parameter "portType"
-					type       	"IPortType"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "addService"
-				quid       	"3B8989E401EE"
-				parameters 	(list Parameters
-				    (object Parameter "service"
-					type       	"IService"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createBindingFault"
-				quid       	"3B898A17038C"
-				result     	"IBindingFault"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createBindingInput"
-				quid       	"3B898A320286"
-				result     	"IBindingInput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createBindingOutput"
-				quid       	"3B898A46013B"
-				result     	"IBindingOutput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createBindingOperation"
-				quid       	"3B898A5C00B0"
-				result     	"IBindingOperation"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createBinding"
-				quid       	"3B8989FE037C"
-				result     	"IBinding"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createFault"
-				quid       	"3B898A7502E7"
-				result     	"IFault"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createImport"
-				quid       	"3B898A83014C"
-				result     	"IImport"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createInput"
-				quid       	"3B898A9D033E"
-				result     	"IInput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createMessage"
-				quid       	"3B898AAF0254"
-				result     	"IMessage"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createOperation"
-				quid       	"3B898AC203C4"
-				result     	"IOperation"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createOutput"
-				quid       	"3B898AE800ED"
-				result     	"IOutput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createPart"
-				quid       	"3B898AF8026D"
-				result     	"IPart"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createPort"
-				quid       	"3B898B0801DA"
-				result     	"IPort"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createPortType"
-				quid       	"3B898B15039B"
-				result     	"IPortType"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createService"
-				quid       	"3B898B32013A"
-				result     	"IService"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBinding"
-				quid       	"3B898B420075"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IBinding"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindings"
-				quid       	"3B898B920341"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getImports"
-				quid       	"3B898BCD0060"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getImports"
-				quid       	"3B898BE70144"
-				parameters 	(list Parameters
-				    (object Parameter "namespaceURI"
-					type       	"String"))
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getMessage"
-				quid       	"3B898C170107"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IMessage"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getMessages"
-				quid       	"3B898C3E001D"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getNamespace"
-				quid       	"3B898C62014B"
-				parameters 	(list Parameters
-				    (object Parameter "prefix"
-					type       	"String"))
-				result     	"String"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getNamespaces"
-				quid       	"3B898C740115"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPortType"
-				quid       	"3B898CBE0071"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IPortType"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPortTypes"
-				quid       	"3B898CDA01C6"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPrefix"
-				quid       	"3B898CFD0017"
-				parameters 	(list Parameters
-				    (object Parameter "namespaceURI"
-					type       	"String"))
-				result     	"String"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getService"
-				quid       	"3B898D2300A8"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IService"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getServices"
-				quid       	"3B898D3B03CE"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getExtensionRegistry"
-				quid       	"3B89D5B8012B"
-				result     	"IExtensionRegistry"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setExtensionRegistry"
-				quid       	"3B89D5D703BB"
-				parameters 	(list Parameters
-				    (object Parameter "extensionRegistry"
-					type       	"IExtensionRegistry"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getDocumentBaseURI"
-				quid       	"3B89D5FE0208"
-				result     	"String"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setDocumentBaseURI"
-				quid       	"3B89D6180328"
-				parameters 	(list Parameters
-				    (object Parameter "documentBase"
-					type       	"String"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createTypes"
-				quid       	"3CADD0560080"
-				result     	"ITypes"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "removeService"
-				quid       	"3CADD07E004C"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IService"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "removeBinding"
-				quid       	"3CADD0BA0355"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IBinding"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "removePortType"
-				quid       	"3CADD0D8029A"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IPortType"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "removeMessage"
-				quid       	"3CADD0FA0307"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IMessage"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getTypes"
-				quid       	"3C86706F031B"
-				result     	"ITypes"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setTypes"
-				quid       	"3C86709500EE"
-				parameters 	(list Parameters
-				    (object Parameter "types"
-					type       	"ITypes"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Definition"
-				quid       	"3B84B1E702A1"
-				stereotype 	"javaclass")))
-		    (object Class "IImport"
-			quid       	"3B84B2020119"
-			documentation 	"This class represents the javax.wsdl.Import non-MOF interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Import"
-				quid       	"3B84B20C02EA"
-				stereotype 	"javaclass")))
-		    (object Class "IList"
-			quid       	"3B85C0A203C5"
-			documentation 	"This class represents the non-MOF java.util.List interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "java.util.List"
-				quid       	"3B85C0AF0297"
-				stereotype 	"javaclass")))
-		    (object Class "IMap"
-			quid       	"3B896B0300D4"
-			documentation 	"This class represents the non-MOF java.util.Map interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "java.util.Map"
-				quid       	"3B896B1102B5"
-				stereotype 	"javaclass")))
-		    (object Class "IURL"
-			quid       	"3B89D5630274"
-			documentation 	"This class represents the non-MOF java.net.URL interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "java.net.URL"
-				quid       	"3B89D56E03E2"
-				stereotype 	"javaclass")))
-		    (object Class "IExtensionRegistry"
-			quid       	"3B89D59302A5"
-			documentation 	"This class represents the non-MOF javax.wsdl.extensions.ExtensionRegistry interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.extensions.ExtensionRegistry"
-				quid       	"3B89D59F02E8"
-				stereotype 	"javaclass")))
-		    (object Class "Types"
-			quid       	"3B8BE9A603A8"
-			documentation 	"This class represents a WSDL types element. The types element encloses data type definitions that are relevant for the exchanged messages."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B8BEB010311"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3CADCD3B0380"
-				supplier   	"Logical View::wsdl::ITypes"
-				quidu      	"3CADCBB20050"))
-			operations 	(list Operations
-			    (object Operation "getSchemas"
-				quid       	"3CADCF3803E6"
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getSchemas"
-				quid       	"3CADCF7E0301"
-				parameters 	(list Parameters
-				    (object Parameter "namespaceURI"
-					type       	"String"))
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)))
-		    (object Class "IIterator"
-			quid       	"3C4687DA0167"
-			documentation 	"This class represents the non-MOF java.util.Iterator interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "java.util.Iterator"
-				quid       	"3C46880800B9"
-				stereotype 	"javaclass")))
-		    (object Class "WSDLException"
-			quid       	"3C4689650313"
-			documentation 	"This class represents the javax.wsdl.Exception class."
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.WSDLException"
-				quid       	"3C4689740315"
-				stereotype 	"javaclass")))
-		    (object Class "ITypes"
-			quid       	"3CADCBB20050"
-			documentation 	"This class represents the javax.wsdl.Types non-MOF interface"
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Types"
-				quid       	"3CADCBF10173"
-				stereotype 	"javaclass")))
-		    (object Class "UnknownExtensibilityElement"
-			quid       	"3CB24AC002AE"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3CB24AEC01CB"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9")))
-		    (object Class "XSDSchemaExtensibilityElement"
-			quid       	"3CC360D7039C"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3CC3627F00B7"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9")))
-		    (object Class "DOMDocument"
-			quid       	"3CD1502C023B"
-			documentation 	"This class represents the org.w3c.dom.Document non-MOF interface."
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "org.w3c.dom.Document"
-				quid       	"3CD150600182"
-				stereotype 	"javaclass")))
-		    (object Class "MessageReference"
-			quid       	"3F6771DB02DC"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3F762A6A0308"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3F6780A001AB"
-				type       	"String"
-				exportControl 	"Protected"))
-			language   	"Java"
-			abstract   	TRUE)
-		    (object Association "$UNNAMED$0"
-			quid       	"3AD5C824018C"
-			roles      	(list role_list
-			    (object Role "portType"
-				quid       	"3AD5C82701C3"
-				label      	"portType"
-				supplier   	"Logical View::wsdl::PortType"
-				quidu      	"3AD5C7F001A5"
-				client_cardinality 	(value cardinality "1..1")
-				Containment 	"By Value"
-				is_aggregate 	TRUE)
-			    (object Role "eOperations"
-				quid       	"3AD5C82701CD"
-				label      	"eOperations"
-				supplier   	"Logical View::wsdl::Operation"
-				quidu      	"3AD5C80D03CE"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$1"
-			quid       	"3AD5CEBE00E2"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$2"
-				quid       	"3AD5CEBF0057"
-				supplier   	"Logical View::wsdl::Message"
-				quidu      	"3AD5C9590078"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eParts"
-				quid       	"3AD5CEBF0061"
-				label      	"eParts"
-				supplier   	"Logical View::wsdl::Part"
-				quidu      	"3AD5CE1C032E"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$3"
-			quid       	"3AD5D352010F"
-			roles      	(list role_list
-			    (object Role "ePortType"
-				quid       	"3AD5D3540176"
-				label      	"ePortType"
-				supplier   	"Logical View::wsdl::PortType"
-				quidu      	"3AD5C7F001A5"
-				client_cardinality 	(value cardinality "1..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$4"
-				quid       	"3AD5D3540180"
-				supplier   	"Logical View::wsdl::Binding"
-				quidu      	"3AD5D2860261")))
-		    (object Association "$UNNAMED$5"
-			quid       	"3AD5D3E10179"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$6"
-				quid       	"3AD5D3E20225"
-				supplier   	"Logical View::wsdl::Binding"
-				quidu      	"3AD5D2860261"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eBindingOperations"
-				quid       	"3AD5D3E20239"
-				label      	"eBindingOperations"
-				supplier   	"Logical View::wsdl::BindingOperation"
-				quidu      	"3AD5D3CB0145"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$7"
-			quid       	"3AD5D425038A"
-			roles      	(list role_list
-			    (object Role "eOperation"
-				quid       	"3AD5D42602F5"
-				label      	"eOperation"
-				supplier   	"Logical View::wsdl::Operation"
-				quidu      	"3AD5C80D03CE"
-				client_cardinality 	(value cardinality "1..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$8"
-				quid       	"3AD5D42602FF"
-				supplier   	"Logical View::wsdl::BindingOperation"
-				quidu      	"3AD5D3CB0145")))
-		    (object Association "$UNNAMED$9"
-			quid       	"3AD5D9400393"
-			roles      	(list role_list
-			    (object Role "ePorts"
-				quid       	"3AD5D941031C"
-				label      	"ePorts"
-				supplier   	"Logical View::wsdl::Port"
-				quidu      	"3AD5D9170286"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$10"
-				quid       	"3AD5D941031D"
-				supplier   	"Logical View::wsdl::Service"
-				quidu      	"3AD5D8F002F8"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$11"
-			quid       	"3AD5D9B8011F"
-			roles      	(list role_list
-			    (object Role "eBinding"
-				quid       	"3AD5D9B9024D"
-				label      	"eBinding"
-				supplier   	"Logical View::wsdl::Binding"
-				quidu      	"3AD5D2860261"
-				client_cardinality 	(value cardinality "1..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$12"
-				quid       	"3AD5D9B90261"
-				supplier   	"Logical View::wsdl::Port"
-				quidu      	"3AD5D9170286")))
-		    (object Association "$UNNAMED$13"
-			quid       	"3AD5E60301E2"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$14"
-				quid       	"3AD5E60400B7"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eMessages"
-				quid       	"3AD5E60400C1"
-				label      	"eMessages"
-				supplier   	"Logical View::wsdl::Message"
-				quidu      	"3AD5C9590078"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$15"
-			quid       	"3AD5E6710104"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$16"
-				quid       	"3AD5E672034A"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "ePortTypes"
-				quid       	"3AD5E6720354"
-				label      	"ePortTypes"
-				supplier   	"Logical View::wsdl::PortType"
-				quidu      	"3AD5C7F001A5"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$17"
-			quid       	"3AD5E6770095"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$18"
-				quid       	"3AD5E6780371"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eBindings"
-				quid       	"3AD5E678037B"
-				label      	"eBindings"
-				supplier   	"Logical View::wsdl::Binding"
-				quidu      	"3AD5D2860261"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$19"
-			quid       	"3AD5E67B0311"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$20"
-				quid       	"3AD5E67D007F"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eServices"
-				quid       	"3AD5E67D0089"
-				label      	"eServices"
-				supplier   	"Logical View::wsdl::Service"
-				quidu      	"3AD5D8F002F8"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$21"
-			quid       	"3AD5FD130079"
-			roles      	(list role_list
-			    (object Role "eExtensibilityElements"
-				quid       	"3AD5FD14019D"
-				label      	"eExtensibilityElements"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$22"
-				quid       	"3AD5FD14019E"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$23"
-			quid       	"3ADF2E6401F5"
-			roles      	(list role_list
-			    (object Role "eBindingInput"
-				quid       	"3ADF2E650251"
-				label      	"eBindingInput"
-				supplier   	"Logical View::wsdl::BindingInput"
-				quidu      	"3AE08A8202D4"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$24"
-				quid       	"3ADF2E650252"
-				supplier   	"Logical View::wsdl::BindingOperation"
-				quidu      	"3AD5D3CB0145"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$25"
-			quid       	"3ADF2EB30163"
-			roles      	(list role_list
-			    (object Role "eBindingOutput"
-				quid       	"3ADF2EB4013C"
-				label      	"eBindingOutput"
-				supplier   	"Logical View::wsdl::BindingOutput"
-				quidu      	"3AE08A8F028C"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$26"
-				quid       	"3ADF2EB4013D"
-				supplier   	"Logical View::wsdl::BindingOperation"
-				quidu      	"3AD5D3CB0145"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$27"
-			quid       	"3ADF2F94024D"
-			roles      	(list role_list
-			    (object Role "eInput"
-				quid       	"3ADF2F950190"
-				label      	"eInput"
-				supplier   	"Logical View::wsdl::Input"
-				quidu      	"3AE0789F0059"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$28"
-				quid       	"3ADF2F95019A"
-				supplier   	"Logical View::wsdl::Operation"
-				quidu      	"3AD5C80D03CE"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$29"
-			quid       	"3ADF2FB802F9"
-			roles      	(list role_list
-			    (object Role "eOutput"
-				quid       	"3ADF2FB9020A"
-				label      	"eOutput"
-				supplier   	"Logical View::wsdl::Output"
-				quidu      	"3AE078B60232"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$30"
-				quid       	"3ADF2FB9020B"
-				supplier   	"Logical View::wsdl::Operation"
-				quidu      	"3AD5C80D03CE"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$31"
-			quid       	"3ADF331601A4"
-			roles      	(list role_list
-			    (object Role "eFaults"
-				quid       	"3ADF33180387"
-				label      	"eFaults"
-				supplier   	"Logical View::wsdl::Fault"
-				quidu      	"3AE078BE0108"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$32"
-				quid       	"3ADF33180388"
-				supplier   	"Logical View::wsdl::Operation"
-				quidu      	"3AD5C80D03CE"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$33"
-			quid       	"3ADF340003E5"
-			roles      	(list role_list
-			    (object Role "eBindingFaults"
-				quid       	"3ADF340103AA"
-				label      	"eBindingFaults"
-				supplier   	"Logical View::wsdl::BindingFault"
-				quidu      	"3AE08A9E03A6"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$34"
-				quid       	"3ADF340103AB"
-				supplier   	"Logical View::wsdl::BindingOperation"
-				quidu      	"3AD5D3CB0145"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$35"
-			quid       	"3AE091F402F3"
-			roles      	(list role_list
-			    (object Role "eFault"
-				quid       	"3AE091F801FE"
-				label      	"eFault"
-				supplier   	"Logical View::wsdl::Fault"
-				quidu      	"3AE078BE0108"
-				client_cardinality 	(value cardinality "1..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$36"
-				quid       	"3AE091F801FF"
-				supplier   	"Logical View::wsdl::BindingFault"
-				quidu      	"3AE08A9E03A6")))
-		    (object Association "$UNNAMED$37"
-			quid       	"3AEA3D55002D"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$38"
-				quid       	"3AEA3D560328"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eNamespaces"
-				quid       	"3AEA3D560332"
-				label      	"eNamespaces"
-				supplier   	"Logical View::wsdl::Namespace"
-				quidu      	"3AEA3CD30030"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$39"
-			quid       	"3AEA3E3A002D"
-			roles      	(list role_list
-			    (object Role "eDefinition"
-				quid       	"3AEA3E3C01E8"
-				label      	"eDefinition"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$40"
-				quid       	"3AEA3E3C01F2"
-				supplier   	"Logical View::wsdl::Import"
-				quidu      	"3AD5E4F903DE")))
-		    (object Association "$UNNAMED$41"
-			quid       	"3AEA412F0035"
-			roles      	(list role_list
-			    (object Role "eParameterOrdering"
-				quid       	"3AEA41310255"
-				label      	"eParameterOrdering"
-				supplier   	"Logical View::wsdl::Part"
-				quidu      	"3AD5CE1C032E"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$42"
-				quid       	"3AEA4131025F"
-				supplier   	"Logical View::wsdl::Operation"
-				quidu      	"3AD5C80D03CE")))
-		    (object Association "$UNNAMED$43"
-			quid       	"3B84AD2400BD"
-			roles      	(list role_list
-			    (object Role "eInput"
-				quid       	"3B84AD250083"
-				label      	"eInput"
-				supplier   	"Logical View::wsdl::Input"
-				quidu      	"3AE0789F0059"
-				client_cardinality 	(value cardinality "1..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$44"
-				quid       	"3B84AD250084"
-				supplier   	"Logical View::wsdl::BindingInput"
-				quidu      	"3AE08A8202D4")))
-		    (object Association "$UNNAMED$45"
-			quid       	"3B84AD7900F2"
-			roles      	(list role_list
-			    (object Role "eOutput"
-				quid       	"3B84AD7A014D"
-				label      	"eOutput"
-				supplier   	"Logical View::wsdl::Output"
-				quidu      	"3AE078B60232"
-				client_cardinality 	(value cardinality "1..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$46"
-				quid       	"3B84AD7A014E"
-				supplier   	"Logical View::wsdl::BindingOutput"
-				quidu      	"3AE08A8F028C")))
-		    (object Association "$UNNAMED$47"
-			quid       	"3B8B1BE900C4"
-			roles      	(list role_list
-			    (object Role "typeDefinition"
-				quid       	"3B8B1BE90327"
-				label      	"typeDefinition"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$48"
-				quid       	"3B8B1BE90331"
-				supplier   	"Logical View::wsdl::Part"
-				quidu      	"3AD5CE1C032E")))
-		    (object Association "$UNNAMED$49"
-			quid       	"3B8B1C1203B2"
-			roles      	(list role_list
-			    (object Role "elementDeclaration"
-				quid       	"3B8B1C14001C"
-				label      	"elementDeclaration"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$50"
-				quid       	"3B8B1C140026"
-				supplier   	"Logical View::wsdl::Part"
-				quidu      	"3AD5CE1C032E")))
-		    (object Association "$UNNAMED$51"
-			quid       	"3B8B1DCC02E5"
-			roles      	(list role_list
-			    (object Role "eSchema"
-				quid       	"3B8B1DCE0270"
-				label      	"eSchema"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$52"
-				quid       	"3B8B1DCE027A"
-				supplier   	"Logical View::wsdl::Import"
-				quidu      	"3AD5E4F903DE")))
-		    (object Association "$UNNAMED$53"
-			quid       	"3B8BEA27029F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$54"
-				quid       	"3B8BEA290356"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eTypes"
-				quid       	"3B8BEA29036A"
-				label      	"eTypes"
-				supplier   	"Logical View::wsdl::Types"
-				quidu      	"3B8BE9A603A8"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$55"
-			quid       	"3C46829303E5"
-			roles      	(list role_list
-			    (object Role "eMessage"
-				quid       	"3C468296010E"
-				label      	"eMessage"
-				supplier   	"Logical View::wsdl::Message"
-				quidu      	"3AD5C9590078"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$56"
-				quid       	"3C4682960118"
-				supplier   	"Logical View::wsdl::Part"
-				quidu      	"3AD5CE1C032E")))
-		    (object Association "$UNNAMED$57"
-			quid       	"3C864DFF02EC"
-			roles      	(list role_list
-			    (object Role "eImports"
-				quid       	"3C864DFF02ED"
-				label      	"eImports"
-				supplier   	"Logical View::wsdl::Import"
-				quidu      	"3AD5E4F903DE"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$58"
-				quid       	"3C864DFF02EE"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$59"
-			quid       	"3CC3614500F2"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$60"
-				quid       	"3CC36146023D"
-				supplier   	"Logical View::wsdl::XSDSchemaExtensibilityElement"
-				quidu      	"3CC360D7039C"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "schema"
-				quid       	"3CC36146023E"
-				label      	"schema"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$61"
-			quid       	"3F74E78401B1"
-			roles      	(list role_list
-			    (object Role "eMessage"
-				quid       	"3F74E786000F"
-				label      	"eMessage"
-				supplier   	"Logical View::wsdl::Message"
-				quidu      	"3AD5C9590078"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$62"
-				quid       	"3F74E7860023"
-				supplier   	"Logical View::wsdl::MessageReference"
-				quidu      	"3F6771DB02DC")))
-		    (object Association "$UNNAMED$63"
-			quid       	"3F7896A2026E"
-			roles      	(list role_list
-			    (object Role "parent"
-				quid       	"3F7896A7012B"
-				label      	"parent"
-				supplier   	"Logical View::wsdl::UnknownExtensibilityElement"
-				quidu      	"3CB24AC002AE"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "children"
-				quid       	"3F7896A7012C"
-				label      	"children"
-				supplier   	"Logical View::wsdl::UnknownExtensibilityElement"
-				quidu      	"3CB24AC002AE"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE))))
-		logical_presentations 	(list unit_reference_list
-		    (object ClassDiagram "2.7 Services"
-			quid       	"39AD3EF60127"
-			title      	"2.7 Services"
-			zoom       	90
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::IBinding" @28
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1424, 800)
-				label      	(object ItemLabel
-				    Parent_View 	@28
-				    location   	(1173, 660)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	502
-				    justify    	0
-				    label      	"IBinding")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@28
-				    location   	(1173, 610)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	502
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84ABC60219"
-				width      	520
-				height     	404
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IPort" @29
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(816, 528)
-				label      	(object ItemLabel
-				    Parent_View 	@29
-				    location   	(686, 481)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	260
-				    justify    	0
-				    label      	"IPort")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@29
-				    location   	(686, 431)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	260
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84AB800326"
-				width      	278
-				height     	218
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IService" @30
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@30
-				    location   	(126, 90)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	228
-				    justify    	0
-				    label      	"IService")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@30
-				    location   	(126, 40)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	228
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84AB490287"
-				width      	246
-				height     	264
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Service" @31
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 528)
-				label      	(object ItemLabel
-				    Parent_View 	@31
-				    location   	(44, 389)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	392
-				    justify    	0
-				    label      	"Service")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D8F002F8"
-				width      	410
-				height     	302
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @32
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B85954E01B4"
-				client     	@31
-				supplier   	@30
-				line_style 	3
-				origin_attachment 	(240, 377)
-				terminal_attachment 	(240, 292))
-			    (object ClassView "Class" "Logical View::wsdl::Binding" @33
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1440, 1264)
-				label      	(object ItemLabel
-				    Parent_View 	@33
-				    location   	(1244, 1125)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	392
-				    justify    	0
-				    label      	"Binding")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D2860261"
-				width      	410
-				height     	302
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @34
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8595410129"
-				client     	@33
-				supplier   	@28
-				line_style 	3
-				origin_attachment 	(1430, 1113)
-				terminal_attachment 	(1430, 1002))
-			    (object ClassView "Class" "Logical View::wsdl::Port" @35
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(816, 912)
-				label      	(object ItemLabel
-				    Parent_View 	@35
-				    location   	(675, 840)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	282
-				    justify    	0
-				    label      	"Port")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D9170286"
-				width      	300
-				height     	168
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @36
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B85954502C9"
-				client     	@35
-				supplier   	@29
-				line_style 	3
-				origin_attachment 	(809, 828)
-				terminal_attachment 	(809, 637))
-			    (object AssociationViewNew "$UNNAMED$9" @37
-				location   	(343, 916)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5D9400393"
-				roleview_list 	(list RoleViews
-				    (object RoleView "ePorts" @38
-					Parent_View 	@37
-					location   	(-121, 644)
-					label      	(object SegLabel @39
-					    Parent_View 	@38
-					    location   	(413, 945)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	192
-					    justify    	0
-					    label      	"+ePorts"
-					    pctDist    	0.218978
-					    height     	29
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D941031C"
-					client     	@37
-					supplier   	@35
-					line_style 	3
-					origin_attachment 	(343, 916)
-					terminal_attachment 	(666, 916)
-					label      	(object SegLabel @40
-					    Parent_View 	@38
-					    location   	(539, 880)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	160
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.608000
-					    height     	37
-					    orientation 	0)
-					label      	(object SegLabel @41
-					    Parent_View 	@38
-					    location   	(448, 990)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	146
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.328467
-					    height     	74
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$10" @42
-					Parent_View 	@37
-					location   	(-121, 644)
-					label      	(object SegLabel @43
-					    Parent_View 	@42
-					    location   	(216, 744)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D941031D"
-					client     	@37
-					supplier   	@31
-					vertices   	(list Points
-					    (343, 916)
-					    (257, 916)
-					    (257, 679))
-					line_style 	3
-					origin_attachment 	(343, 916)
-					terminal_attachment 	(257, 679)
-					label      	(object SegLabel @44
-					    Parent_View 	@42
-					    location   	(301, 796)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.637097
-					    height     	44
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$11" @45
-				location   	(886, 1270)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5D9B8011F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eBinding" @46
-					Parent_View 	@45
-					location   	(38, 422)
-					label      	(object SegLabel @47
-					    Parent_View 	@46
-					    location   	(1112, 1235)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+eBinding"
-					    pctDist    	0.648571
-					    height     	36
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D9B9024D"
-					client     	@45
-					supplier   	@33
-					line_style 	3
-					origin_attachment 	(886, 1270)
-					terminal_attachment 	(1235, 1270)
-					label      	(object SegLabel @48
-					    Parent_View 	@46
-					    location   	(1170, 1313)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.814286
-					    height     	43
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$12" @49
-					Parent_View 	@45
-					location   	(38, 422)
-					label      	(object SegLabel @50
-					    Parent_View 	@49
-					    location   	(852, 1106)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	156
-					    justify    	0
-					    label      	""
-					    pctDist    	0.687943
-					    height     	40
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D9B90261"
-					client     	@45
-					supplier   	@35
-					vertices   	(list Points
-					    (886, 1270)
-					    (812, 1270)
-					    (812, 996))
-					line_style 	3
-					origin_attachment 	(886, 1270)
-					terminal_attachment 	(812, 996))))))
-		    (object ClassDiagram "2.5 Bindings"
-			quid       	"39AD51270252"
-			title      	"2.5 Bindings"
-			zoom       	85
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::IBinding" @51
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 240)
-				label      	(object ItemLabel
-				    Parent_View 	@51
-				    location   	(73, 114)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	462
-				    justify    	0
-				    label      	"IBinding")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@51
-				    location   	(73, 64)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	462
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84ABC60219"
-				width      	480
-				height     	376
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IBindingOperation" @52
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(976, 352)
-				label      	(object ItemLabel
-				    Parent_View 	@52
-				    location   	(780, 130)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	392
-				    justify    	0
-				    label      	"IBindingOperation")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@52
-				    location   	(780, 80)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	392
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84ADC00072"
-				width      	410
-				height     	568
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IBindingInput" @53
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(192, 1360)
-				label      	(object ItemLabel
-				    Parent_View 	@53
-				    location   	(62, 1334)
-				    fill_color 	16777215
-				    nlines     	1
-				    max_width  	260
-				    justify    	0
-				    label      	"IBindingInput")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@53
-				    location   	(62, 1284)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	260
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84ADEB0100"
-				width      	278
-				height     	176
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IBindingOutput" @54
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 1664)
-				label      	(object ItemLabel
-				    Parent_View 	@54
-				    location   	(61, 1638)
-				    fill_color 	16777215
-				    nlines     	1
-				    max_width  	294
-				    justify    	0
-				    label      	"IBindingOutput")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@54
-				    location   	(61, 1588)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	294
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84AE210111"
-				width      	312
-				height     	176
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IBindingFault" @55
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 1984)
-				label      	(object ItemLabel
-				    Parent_View 	@55
-				    location   	(72, 1958)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	272
-				    justify    	0
-				    label      	"IBindingFault")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@55
-				    location   	(72, 1908)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	272
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84AE4F00BD"
-				width      	290
-				height     	176
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::PortType" @56
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1904, 624)
-				label      	(object ItemLabel
-				    Parent_View 	@56
-				    location   	(1568, 486)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	673
-				    justify    	0
-				    label      	"PortType")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C7F001A5"
-				width      	691
-				height     	301
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Input" @57
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1904, 1360)
-				label      	(object ItemLabel
-				    Parent_View 	@57
-				    location   	(1756, 1283)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"Input")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE0789F0059"
-				width      	314
-				height     	178
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Output" @58
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1904, 1664)
-				label      	(object ItemLabel
-				    Parent_View 	@58
-				    location   	(1756, 1587)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"Output")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE078B60232"
-				width      	314
-				height     	178
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Binding" @59
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 688)
-				label      	(object ItemLabel
-				    Parent_View 	@59
-				    location   	(97, 539)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	414
-				    justify    	0
-				    label      	"Binding")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D2860261"
-				width      	432
-				height     	322
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @60
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8595410129"
-				client     	@59
-				supplier   	@51
-				line_style 	3
-				origin_attachment 	(279, 527)
-				terminal_attachment 	(279, 428))
-			    (object AssociationViewNew "$UNNAMED$3" @61
-				location   	(1039, 742)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5D352010F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "ePortType" @62
-					Parent_View 	@61
-					location   	(575, 598)
-					label      	(object SegLabel @63
-					    Parent_View 	@62
-					    location   	(1449, 781)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+ePortType"
-					    pctDist    	0.789292
-					    height     	39
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D3540176"
-					client     	@61
-					supplier   	@56
-					line_style 	3
-					origin_attachment 	(1039, 742)
-					terminal_attachment 	(1559, 742)
-					label      	(object SegLabel @64
-					    Parent_View 	@62
-					    location   	(1492, 716)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.872193
-					    height     	27
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$4" @65
-					Parent_View 	@61
-					location   	(575, 598)
-					label      	(object SegLabel @66
-					    Parent_View 	@65
-					    location   	(776, 697)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	108
-					    justify    	0
-					    label      	""
-					    pctDist    	0.509449
-					    height     	46
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D3540180"
-					client     	@61
-					supplier   	@59
-					line_style 	3
-					origin_attachment 	(1039, 742)
-					terminal_attachment 	(520, 742))))
-			    (object ClassView "Class" "Logical View::wsdl::Operation" @67
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1888, 1024)
-				label      	(object ItemLabel
-				    Parent_View 	@67
-				    location   	(1672, 851)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	432
-				    justify    	0
-				    label      	"Operation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C80D03CE"
-				width      	450
-				height     	370
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::BindingInput" @68
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(624, 1408)
-				label      	(object ItemLabel
-				    Parent_View 	@68
-				    location   	(476, 1283)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"BindingInput")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE08A8202D4"
-				width      	314
-				height     	274
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$43" @69
-				location   	(1264, 1359)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84AD2400BD"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eInput" @70
-					Parent_View 	@69
-					location   	(96, 287)
-					label      	(object SegLabel @71
-					    Parent_View 	@70
-					    location   	(1637, 1316)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	132
-					    justify    	0
-					    label      	"+eInput"
-					    pctDist    	0.775148
-					    height     	44
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B84AD250083"
-					client     	@69
-					supplier   	@57
-					line_style 	3
-					origin_attachment 	(1264, 1359)
-					terminal_attachment 	(1747, 1359)
-					label      	(object SegLabel @72
-					    Parent_View 	@70
-					    location   	(1694, 1398)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.889546
-					    height     	39
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$44" @73
-					Parent_View 	@69
-					location   	(96, 287)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B84AD250084"
-					client     	@69
-					supplier   	@68
-					line_style 	3
-					origin_attachment 	(1264, 1359)
-					terminal_attachment 	(781, 1359))))
-			    (object ClassView "Class" "Logical View::wsdl::BindingOutput" @74
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(960, 1664)
-				label      	(object ItemLabel
-				    Parent_View 	@74
-				    location   	(812, 1539)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"BindingOutput")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE08A8F028C"
-				width      	314
-				height     	274
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$45" @75
-				location   	(1432, 1654)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84AD7900F2"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eOutput" @76
-					Parent_View 	@75
-					location   	(-120, 374)
-					label      	(object SegLabel @77
-					    Parent_View 	@76
-					    location   	(1645, 1612)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+eOutput"
-					    pctDist    	0.674772
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B84AD7A014D"
-					client     	@75
-					supplier   	@58
-					line_style 	3
-					origin_attachment 	(1432, 1654)
-					terminal_attachment 	(1747, 1654)
-					label      	(object SegLabel @78
-					    Parent_View 	@76
-					    location   	(1681, 1697)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.790274
-					    height     	43
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$46" @79
-					Parent_View 	@75
-					location   	(-120, 374)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B84AD7A014E"
-					client     	@75
-					supplier   	@74
-					line_style 	3
-					origin_attachment 	(1432, 1654)
-					terminal_attachment 	(1117, 1654))))
-			    (object ClassView "Class" "Logical View::wsdl::BindingOperation" @80
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(992, 1008)
-				label      	(object ItemLabel
-				    Parent_View 	@80
-				    location   	(819, 931)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	346
-				    justify    	0
-				    label      	"BindingOperation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D3CB0145"
-				width      	364
-				height     	178
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @81
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84ADE401DC"
-				client     	@80
-				supplier   	@52
-				line_style 	3
-				origin_attachment 	(966, 919)
-				terminal_attachment 	(966, 636))
-			    (object AssociationViewNew "$UNNAMED$5" @82
-				location   	(457, 1022)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5D3E10179"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$6" @83
-					Parent_View 	@82
-					location   	(-1319, 494)
-					label      	(object SegLabel @84
-					    Parent_View 	@83
-					    location   	(235, 920)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D3E20225"
-					client     	@82
-					supplier   	@59
-					vertices   	(list Points
-					    (457, 1022)
-					    (276, 1022)
-					    (276, 849))
-					line_style 	3
-					origin_attachment 	(457, 1022)
-					terminal_attachment 	(276, 849)
-					label      	(object SegLabel @85
-					    Parent_View 	@83
-					    location   	(330, 884)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	1))
-				    (object RoleView "eBindingOperations" @86
-					Parent_View 	@82
-					location   	(-1319, 494)
-					label      	(object SegLabel @87
-					    Parent_View 	@86
-					    location   	(531, 977)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	384
-					    justify    	0
-					    label      	"+eBindingOperations"
-					    pctDist    	0.211699
-					    height     	46
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D3E20239"
-					client     	@82
-					supplier   	@80
-					line_style 	3
-					origin_attachment 	(457, 1022)
-					terminal_attachment 	(810, 1022)
-					label      	(object SegLabel @88
-					    Parent_View 	@86
-					    location   	(769, 980)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.884956
-					    height     	43
-					    orientation 	0)
-					label      	(object SegLabel @89
-					    Parent_View 	@86
-					    location   	(714, 1067)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	154
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.727564
-					    height     	45
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$7" @90
-				location   	(1418, 1040)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5D425038A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eOperation" @91
-					Parent_View 	@90
-					location   	(-358, 464)
-					label      	(object SegLabel @92
-					    Parent_View 	@91
-					    location   	(1520, 1079)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	228
-					    justify    	0
-					    label      	"+eOperation"
-					    pctDist    	0.420601
-					    height     	39
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D42602F5"
-					client     	@90
-					supplier   	@67
-					line_style 	3
-					origin_attachment 	(1418, 1040)
-					terminal_attachment 	(1663, 1040)
-					label      	(object SegLabel @93
-					    Parent_View 	@91
-					    location   	(1589, 1005)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.696721
-					    height     	36
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$8" @94
-					Parent_View 	@90
-					location   	(-358, 464)
-					label      	(object SegLabel @95
-					    Parent_View 	@94
-					    location   	(1273, 1070)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	192
-					    justify    	0
-					    label      	""
-					    pctDist    	0.595420
-					    height     	30
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D42602FF"
-					client     	@90
-					supplier   	@80
-					line_style 	3
-					origin_attachment 	(1418, 1040)
-					terminal_attachment 	(1174, 1040))))
-			    (object AssociationViewNew "$UNNAMED$23" @96
-				location   	(787, 1190)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3ADF2E6401F5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eBindingInput" @97
-					Parent_View 	@96
-					location   	(-381, 454)
-					label      	(object SegLabel @98
-					    Parent_View 	@97
-					    location   	(669, 1152)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+eBindingInput"
-					    pctDist    	0.511905
-					    height     	39
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2E650251"
-					client     	@96
-					supplier   	@68
-					vertices   	(list Points
-					    (787, 1190)
-					    (636, 1190)
-					    (636, 1271))
-					line_style 	3
-					origin_attachment 	(787, 1190)
-					terminal_attachment 	(636, 1271)
-					label      	(object SegLabel @99
-					    Parent_View 	@97
-					    location   	(685, 1222)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.440476
-					    height     	32
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$24" @100
-					Parent_View 	@96
-					location   	(-381, 454)
-					label      	(object SegLabel @101
-					    Parent_View 	@100
-					    location   	(885, 1144)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2E650252"
-					client     	@96
-					supplier   	@80
-					vertices   	(list Points
-					    (787, 1190)
-					    (926, 1190)
-					    (926, 1097))
-					line_style 	3
-					origin_attachment 	(787, 1190)
-					terminal_attachment 	(926, 1097)
-					label      	(object SegLabel @102
-					    Parent_View 	@100
-					    location   	(871, 1136)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.837758
-					    height     	56
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$25" @103
-				location   	(1024, 1312)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3ADF2EB30163"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eBindingOutput" @104
-					Parent_View 	@103
-					location   	(-150, 578)
-					label      	(object SegLabel @105
-					    Parent_View 	@104
-					    location   	(1012, 1429)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	306
-					    justify    	0
-					    label      	"+eBindingOutput"
-					    pctDist    	0.545082
-					    height     	13
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2EB4013C"
-					client     	@103
-					supplier   	@74
-					line_style 	3
-					origin_attachment 	(1024, 1312)
-					terminal_attachment 	(1024, 1527)
-					label      	(object SegLabel @106
-					    Parent_View 	@104
-					    location   	(967, 1479)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.774590
-					    height     	58
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$26" @107
-					Parent_View 	@103
-					location   	(-150, 578)
-					label      	(object SegLabel @108
-					    Parent_View 	@107
-					    location   	(983, 1140)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2EB4013D"
-					client     	@103
-					supplier   	@80
-					line_style 	3
-					origin_attachment 	(1024, 1312)
-					terminal_attachment 	(1024, 1097)
-					label      	(object SegLabel @109
-					    Parent_View 	@107
-					    location   	(1031, 1186)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.590164
-					    height     	7
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::wsdl::Fault" @110
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1920, 1984)
-				label      	(object ItemLabel
-				    Parent_View 	@110
-				    location   	(1772, 1907)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"Fault")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE078BE0108"
-				width      	314
-				height     	178
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::BindingFault" @111
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1360, 1984)
-				label      	(object ItemLabel
-				    Parent_View 	@111
-				    location   	(1212, 1859)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"BindingFault")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE08A9E03A6"
-				width      	314
-				height     	274
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @112
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84AE710333"
-				client     	@111
-				supplier   	@55
-				line_style 	3
-				origin_attachment 	(1203, 2007)
-				terminal_attachment 	(353, 2007))
-			    (object AssociationViewNew "$UNNAMED$33" @113
-				location   	(1356, 1352)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3ADF340003E5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eBindingFaults" @114
-					Parent_View 	@113
-					location   	(188, 616)
-					label      	(object SegLabel @115
-					    Parent_View 	@114
-					    location   	(1382, 1750)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	300
-					    justify    	0
-					    label      	"+eBindingFaults"
-					    pctDist    	0.803150
-					    height     	26
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF340103AA"
-					client     	@113
-					supplier   	@111
-					line_style 	3
-					origin_attachment 	(1356, 1352)
-					terminal_attachment 	(1356, 1847)
-					label      	(object SegLabel @116
-					    Parent_View 	@114
-					    location   	(1409, 1797)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.899194
-					    height     	53
-					    orientation 	0)
-					label      	(object SegLabel @117
-					    Parent_View 	@114
-					    location   	(1256, 1806)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	154
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.919291
-					    height     	101
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$34" @118
-					Parent_View 	@113
-					location   	(188, 616)
-					label      	(object SegLabel @119
-					    Parent_View 	@118
-					    location   	(1076, 1197)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF340103AB"
-					client     	@113
-					supplier   	@80
-					vertices   	(list Points
-					    (1356, 1352)
-					    (1356, 1217)
-					    (1117, 1217)
-					    (1117, 1097))
-					line_style 	3
-					origin_attachment 	(1356, 1352)
-					terminal_attachment 	(1117, 1097)
-					label      	(object SegLabel @120
-					    Parent_View 	@118
-					    location   	(1152, 1164)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.687008
-					    height     	54
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$35" @121
-				location   	(1640, 1970)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AE091F402F3"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eFault" @122
-					Parent_View 	@121
-					location   	(-344, 818)
-					label      	(object SegLabel @123
-					    Parent_View 	@122
-					    location   	(1674, 1915)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	144
-					    justify    	0
-					    label      	"+eFault"
-					    pctDist    	0.276423
-					    height     	56
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AE091F801FE"
-					client     	@121
-					supplier   	@110
-					line_style 	3
-					origin_attachment 	(1640, 1970)
-					terminal_attachment 	(1763, 1970)
-					label      	(object SegLabel @124
-					    Parent_View 	@122
-					    location   	(1718, 2012)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.642276
-					    height     	42
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$36" @125
-					Parent_View 	@121
-					location   	(-344, 818)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AE091F801FF"
-					client     	@121
-					supplier   	@111
-					line_style 	3
-					origin_attachment 	(1640, 1970)
-					terminal_attachment 	(1517, 1970))))
-			    (object InheritView "" @126
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84AE4302AB"
-				client     	@74
-				supplier   	@54
-				line_style 	3
-				origin_attachment 	(803, 1656)
-				terminal_attachment 	(364, 1656))
-			    (object InheritView "" @127
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84AE1B0113"
-				client     	@68
-				supplier   	@53
-				line_style 	3
-				origin_attachment 	(467, 1385)
-				terminal_attachment 	(331, 1385))))
-		    (object ClassDiagram "2.4 PortTypes"
-			quid       	"3AD5D1C40366"
-			title      	"2.4 PortTypes"
-			documentation 	"This class represents the non-MOF java.util.Iterator interface."
-			zoom       	80
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::IPortType" @128
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(496, 208)
-				label      	(object ItemLabel
-				    Parent_View 	@128
-				    location   	(146, 172)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	700
-				    justify    	0
-				    label      	"IPortType")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@128
-				    location   	(146, 122)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	700
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A5BE0331"
-				width      	718
-				height     	196
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::wsdl::IOperation" @129
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1552, 208)
-				label      	(object ItemLabel
-				    Parent_View 	@129
-				    location   	(1116, 176)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	873
-				    justify    	0
-				    label      	"IOperation")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@129
-				    location   	(1116, 126)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	873
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A77600D1"
-				width      	891
-				height     	188
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IInput" @130
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(368, 1472)
-				label      	(object ItemLabel
-				    Parent_View 	@130
-				    location   	(55, 1437)
-				    fill_color 	16777215
-				    nlines     	1
-				    max_width  	626
-				    justify    	0
-				    label      	"IInput")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@130
-				    location   	(55, 1387)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	626
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A7EE0015"
-				width      	644
-				height     	194
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IOutput" @131
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(384, 1792)
-				label      	(object ItemLabel
-				    Parent_View 	@131
-				    location   	(56, 1757)
-				    fill_color 	16777215
-				    nlines     	1
-				    max_width  	656
-				    justify    	0
-				    label      	"IOutput")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@131
-				    location   	(56, 1707)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	656
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A829027D"
-				width      	674
-				height     	194
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IFault" @132
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(368, 2112)
-				label      	(object ItemLabel
-				    Parent_View 	@132
-				    location   	(55, 2076)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	626
-				    justify    	0
-				    label      	"IFault")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@132
-				    location   	(55, 2026)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	626
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A861031D"
-				width      	644
-				height     	196
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::PortType" @133
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(496, 800)
-				label      	(object ItemLabel
-				    Parent_View 	@133
-				    location   	(158, 672)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	677
-				    justify    	0
-				    label      	"PortType")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C7F001A5"
-				width      	695
-				height     	281
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::wsdl::Part" @134
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2576, 800)
-				label      	(object ItemLabel
-				    Parent_View 	@134
-				    location   	(2325, 692)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	502
-				    justify    	0
-				    label      	"Part")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5CE1C032E"
-				width      	520
-				height     	240
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Fault" @135
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1728, 2112)
-				label      	(object ItemLabel
-				    Parent_View 	@135
-				    location   	(1647, 2060)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	162
-				    justify    	0
-				    label      	"Fault")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE078BE0108"
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Input" @136
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1056, 1472)
-				label      	(object ItemLabel
-				    Parent_View 	@136
-				    location   	(870, 1422)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	372
-				    justify    	0
-				    label      	"Input")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE0789F0059"
-				width      	390
-				height     	125
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::wsdl::Output" @137
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1360, 1792)
-				label      	(object ItemLabel
-				    Parent_View 	@137
-				    location   	(1232, 1742)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	256
-				    justify    	0
-				    label      	"Output")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE078B60232"
-				width      	274
-				height     	125
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Operation" @138
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1552, 784)
-				label      	(object ItemLabel
-				    Parent_View 	@138
-				    location   	(1214, 620)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	677
-				    justify    	0
-				    label      	"Operation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C80D03CE"
-				width      	695
-				height     	352
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$0" @139
-				location   	(1024, 797)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5C824018C"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eOperations" @140
-					Parent_View 	@139
-					location   	(592, 269)
-					label      	(object SegLabel @141
-					    Parent_View 	@140
-					    location   	(1088, 748)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	249
-					    justify    	0
-					    label      	"+eOperations"
-					    pctDist    	0.359649
-					    height     	50
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5C82701CD"
-					client     	@139
-					supplier   	@138
-					line_style 	3
-					origin_attachment 	(1024, 797)
-					terminal_attachment 	(1205, 797)
-					label      	(object SegLabel @142
-					    Parent_View 	@140
-					    location   	(1176, 861)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.840391
-					    height     	64
-					    orientation 	1)
-					label      	(object SegLabel @143
-					    Parent_View 	@140
-					    location   	(1074, 923)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	164
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.276243
-					    height     	126
-					    orientation 	1))
-				    (object RoleView "portType" @144
-					Parent_View 	@139
-					location   	(592, 269)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5C82701C3"
-					client     	@139
-					supplier   	@133
-					line_style 	3
-					origin_attachment 	(1024, 797)
-					terminal_attachment 	(843, 797)
-					label      	(object SegLabel @145
-					    Parent_View 	@144
-					    location   	(888, 757)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.753488
-					    height     	41
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$41" @146
-				location   	(2107, 773)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AEA412F0035"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eParameterOrdering" @147
-					Parent_View 	@146
-					location   	(1819, 101)
-					label      	(object SegLabel @148
-					    Parent_View 	@147
-					    location   	(2145, 647)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+eParameterOrdering"
-					    pctDist    	0.183333
-					    height     	127
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AEA41310255"
-					client     	@146
-					supplier   	@134
-					line_style 	3
-					origin_attachment 	(2107, 773)
-					terminal_attachment 	(2316, 773)
-					label      	(object SegLabel @149
-					    Parent_View 	@147
-					    location   	(2272, 822)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.796610
-					    height     	49
-					    orientation 	1)
-					label      	(object SegLabel @150
-					    Parent_View 	@147
-					    location   	(2171, 888)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	164
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.306220
-					    height     	115
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$42" @151
-					Parent_View 	@146
-					location   	(1819, 101)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AEA4131025F"
-					client     	@146
-					supplier   	@138
-					line_style 	3
-					origin_attachment 	(2107, 773)
-					terminal_attachment 	(1899, 773))))
-			    (object AssociationViewNew "$UNNAMED$31" @152
-				location   	(1702, 1504)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3ADF331601A4"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eFaults" @153
-					Parent_View 	@152
-					location   	(1414, 832)
-					label      	(object SegLabel @154
-					    Parent_View 	@153
-					    location   	(1815, 1982)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+eFaults"
-					    pctDist    	0.878992
-					    height     	113
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF33180387"
-					client     	@152
-					supplier   	@135
-					line_style 	3
-					origin_attachment 	(1702, 1504)
-					terminal_attachment 	(1702, 2048)
-					label      	(object SegLabel @155
-					    Parent_View 	@153
-					    location   	(1644, 2020)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.949580
-					    height     	59
-					    orientation 	1)
-					label      	(object SegLabel @156
-					    Parent_View 	@153
-					    location   	(1593, 1963)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	164
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.845378
-					    height     	110
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$32" @157
-					Parent_View 	@152
-					location   	(1414, 832)
-					label      	(object SegLabel @158
-					    Parent_View 	@157
-					    location   	(1661, 1069)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF33180388"
-					client     	@152
-					supplier   	@138
-					line_style 	3
-					origin_attachment 	(1702, 1504)
-					terminal_attachment 	(1702, 960)
-					label      	(object SegLabel @159
-					    Parent_View 	@157
-					    location   	(1821, 1039)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.857362
-					    height     	119
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$27" @160
-				location   	(1178, 1234)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3ADF2F94024D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eInput" @161
-					Parent_View 	@160
-					location   	(890, 562)
-					label      	(object SegLabel @162
-					    Parent_View 	@161
-					    location   	(878, 1343)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	132
-					    justify    	0
-					    label      	"+eInput"
-					    pctDist    	0.819820
-					    height     	103
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2F950190"
-					client     	@160
-					supplier   	@136
-					vertices   	(list Points
-					    (1178, 1234)
-					    (980, 1234)
-					    (980, 1410))
-					line_style 	3
-					origin_attachment 	(1178, 1234)
-					terminal_attachment 	(980, 1410)
-					label      	(object SegLabel @163
-					    Parent_View 	@161
-					    location   	(1046, 1364)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.877660
-					    height     	66
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$28" @164
-					Parent_View 	@160
-					location   	(890, 562)
-					label      	(object SegLabel @165
-					    Parent_View 	@164
-					    location   	(1236, 1036)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2F95019A"
-					client     	@160
-					supplier   	@138
-					vertices   	(list Points
-					    (1178, 1234)
-					    (1277, 1234)
-					    (1277, 960))
-					line_style 	3
-					origin_attachment 	(1178, 1234)
-					terminal_attachment 	(1277, 960)
-					label      	(object SegLabel @166
-					    Parent_View 	@164
-					    location   	(1197, 1058)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.736413
-					    height     	81
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$29" @167
-				location   	(1468, 1345)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3ADF2FB802F9"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eOutput" @168
-					Parent_View 	@167
-					location   	(1180, 673)
-					label      	(object SegLabel @169
-					    Parent_View 	@168
-					    location   	(1362, 1669)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+eOutput"
-					    pctDist    	0.840909
-					    height     	107
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2FB9020A"
-					client     	@167
-					supplier   	@137
-					line_style 	3
-					origin_attachment 	(1468, 1345)
-					terminal_attachment 	(1468, 1730)
-					label      	(object SegLabel @170
-					    Parent_View 	@168
-					    location   	(1546, 1676)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.863636
-					    height     	78
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$30" @171
-					Parent_View 	@167
-					location   	(1180, 673)
-					label      	(object SegLabel @172
-					    Parent_View 	@171
-					    location   	(1427, 1037)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2FB9020B"
-					client     	@167
-					supplier   	@138
-					line_style 	3
-					origin_attachment 	(1468, 1345)
-					terminal_attachment 	(1468, 960)
-					label      	(object SegLabel @173
-					    Parent_View 	@171
-					    location   	(1523, 1080)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.690341
-					    height     	55
-					    orientation 	1))))
-			    (object InheritView "" @174
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F6F1FD8019F"
-				client     	@133
-				supplier   	@128
-				line_style 	0)
-			    (object InheritView "" @175
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F6F1FE20171"
-				client     	@138
-				supplier   	@129
-				line_style 	0)
-			    (object InheritView "" @176
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F6F1FEE031D"
-				client     	@136
-				supplier   	@130
-				line_style 	0)
-			    (object InheritView "" @177
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F6F1FF801CD"
-				client     	@137
-				supplier   	@131
-				line_style 	0)
-			    (object InheritView "" @178
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F6F2002002D"
-				client     	@135
-				supplier   	@132
-				line_style 	0)
-			    (object ClassView "Class" "Logical View::wsdl::Message" @179
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2224, 1456)
-				label      	(object ItemLabel
-				    Parent_View 	@179
-				    location   	(1937, 1312)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	575
-				    justify    	0
-				    label      	"Message")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C9590078"
-				width      	593
-				height     	312
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::wsdl::MessageReference" @180
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1520, 2544)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@180
-				    location   	(1193, 2466)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	654
-				    justify    	0
-				    label      	"MessageReference")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3F6771DB02DC"
-				width      	672
-				height     	180
-				annotation 	8)
-			    (object InheritTreeView "" @181
-				location   	(1524, 2275)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@180
-				vertices   	(list Points
-				    (1524, 2275)
-				    (1524, 2454)))
-			    (object InheritView "" @182
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F67723D0319"
-				client     	@135
-				supplier   	@180
-				line_style 	3
-				origin_attachment 	(1776, 2176)
-				terminal_attachment 	(1776, 2275)
-				drawSupplier 	@181)
-			    (object InheritView "" @183
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F67723500DD"
-				client     	@137
-				supplier   	@180
-				line_style 	3
-				origin_attachment 	(1371, 1854)
-				terminal_attachment 	(1371, 2275)
-				drawSupplier 	@181)
-			    (object InheritView "" @184
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F67722802E7"
-				client     	@136
-				supplier   	@180
-				line_style 	3
-				origin_attachment 	(980, 1534)
-				terminal_attachment 	(980, 2275)
-				drawSupplier 	@181)
-			    (object AssociationViewNew "$UNNAMED$61" @185
-				location   	(2206, 2259)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F74E78401B1"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eMessage" @186
-					Parent_View 	@185
-					location   	(734, -285)
-					label      	(object SegLabel @187
-					    Parent_View 	@186
-					    location   	(2068, 1670)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+eMessage"
-					    pctDist    	0.912230
-					    height     	139
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3F74E786000F"
-					client     	@185
-					supplier   	@179
-					line_style 	3
-					origin_attachment 	(2206, 2259)
-					terminal_attachment 	(2206, 1612)
-					label      	(object SegLabel @188
-					    Parent_View 	@186
-					    location   	(2260, 1678)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$62" @189
-					Parent_View 	@185
-					location   	(734, -285)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3F74E7860023"
-					client     	@185
-					supplier   	@180
-					vertices   	(list Points
-					    (2206, 2259)
-					    (2206, 2556)
-					    (1856, 2556))
-					line_style 	3
-					origin_attachment 	(2206, 2259)
-					terminal_attachment 	(1856, 2556))))))
-		    (object ClassDiagram "2.1 Definitions"
-			quid       	"3AD5E48A0262"
-			title      	"2.1 Definitions"
-			zoom       	83
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::IDefinition" @190
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(432, 192)
-				label      	(object ItemLabel
-				    Parent_View 	@190
-				    location   	(88, 161)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	688
-				    justify    	0
-				    label      	"IDefinition")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@190
-				    location   	(88, 111)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	688
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84B1D90142"
-				width      	706
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Types" @191
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1824, 944)
-				label      	(object ItemLabel
-				    Parent_View 	@191
-				    location   	(1686, 896)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	276
-				    justify    	0
-				    label      	"Types")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B8BE9A603A8"
-				width      	294
-				height     	120
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Import" @192
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2144, 624)
-				label      	(object ItemLabel
-				    Parent_View 	@192
-				    location   	(1910, 545)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"Import")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5E4F903DE"
-				width      	486
-				height     	182
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Message" @193
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(2112, 1184)
-				label      	(object ItemLabel
-				    Parent_View 	@193
-				    location   	(1900, 1056)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	424
-				    justify    	0
-				    label      	"Message")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C9590078"
-				width      	442
-				height     	280
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::PortType" @194
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(1808, 1488)
-				label      	(object ItemLabel
-				    Parent_View 	@194
-				    location   	(1596, 1360)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	424
-				    justify    	0
-				    label      	"PortType")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C7F001A5"
-				width      	442
-				height     	280
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Binding" @195
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(2336, 1728)
-				label      	(object ItemLabel
-				    Parent_View 	@195
-				    location   	(2124, 1600)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	424
-				    justify    	0
-				    label      	"Binding")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D2860261"
-				width      	442
-				height     	280
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Definition" @196
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1328, 240)
-				label      	(object ItemLabel
-				    Parent_View 	@196
-				    location   	(1073, 39)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	510
-				    justify    	0
-				    label      	"Definition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5E43F008E"
-				width      	528
-				height     	426
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$53" @197
-				location   	(1358, 860)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8BEA27029F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$54" @198
-					Parent_View 	@197
-					location   	(62, -36)
-					label      	(object SegLabel @199
-					    Parent_View 	@198
-					    location   	(1317, 535)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8BEA290356"
-					client     	@197
-					supplier   	@196
-					line_style 	3
-					origin_attachment 	(1358, 860)
-					terminal_attachment 	(1358, 453)
-					label      	(object SegLabel @200
-					    Parent_View 	@198
-					    location   	(1403, 511)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.856649
-					    height     	45
-					    orientation 	1))
-				    (object RoleView "eTypes" @201
-					Parent_View 	@197
-					location   	(62, -36)
-					label      	(object SegLabel @202
-					    Parent_View 	@201
-					    location   	(1586, 909)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	156
-					    justify    	0
-					    label      	"+eTypes"
-					    pctDist    	0.779097
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8BEA29036A"
-					client     	@197
-					supplier   	@191
-					vertices   	(list Points
-					    (1358, 860)
-					    (1358, 948)
-					    (1677, 948))
-					line_style 	3
-					origin_attachment 	(1358, 860)
-					terminal_attachment 	(1677, 948)
-					label      	(object SegLabel @203
-					    Parent_View 	@201
-					    location   	(1632, 987)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.892655
-					    height     	39
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$57" @204
-				location   	(1612, 595)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C864DFF02EC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$58" @205
-					Parent_View 	@204
-					location   	(12, 227)
-					label      	(object SegLabel @206
-					    Parent_View 	@205
-					    location   	(1423, 512)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C864DFF02EE"
-					client     	@204
-					supplier   	@196
-					vertices   	(list Points
-					    (1612, 595)
-					    (1464, 595)
-					    (1464, 453))
-					line_style 	3
-					origin_attachment 	(1612, 595)
-					terminal_attachment 	(1464, 453)
-					label      	(object SegLabel @207
-					    Parent_View 	@205
-					    location   	(1524, 495)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.858667
-					    height     	60
-					    orientation 	1))
-				    (object RoleView "eImports" @208
-					Parent_View 	@204
-					location   	(12, 227)
-					label      	(object SegLabel @209
-					    Parent_View 	@208
-					    location   	(1692, 557)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	204
-					    justify    	0
-					    label      	"+eImports"
-					    pctDist    	0.280335
-					    height     	39
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C864DFF02ED"
-					client     	@204
-					supplier   	@192
-					line_style 	3
-					origin_attachment 	(1612, 595)
-					terminal_attachment 	(1901, 595)
-					label      	(object SegLabel @210
-					    Parent_View 	@208
-					    location   	(1854, 652)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.841004
-					    height     	57
-					    orientation 	1)
-					label      	(object SegLabel @211
-					    Parent_View 	@208
-					    location   	(1676, 646)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	158
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.225941
-					    height     	51
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$13" @212
-				location   	(1279, 1137)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5E60301E2"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$14" @213
-					Parent_View 	@212
-					location   	(271, 273)
-					label      	(object SegLabel @214
-					    Parent_View 	@213
-					    location   	(1238, 591)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E60400B7"
-					client     	@212
-					supplier   	@196
-					line_style 	3
-					origin_attachment 	(1279, 1137)
-					terminal_attachment 	(1279, 453)
-					label      	(object SegLabel @215
-					    Parent_View 	@213
-					    location   	(1320, 586)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.804974
-					    height     	41
-					    orientation 	1))
-				    (object RoleView "eMessages" @216
-					Parent_View 	@212
-					location   	(271, 273)
-					label      	(object SegLabel @217
-					    Parent_View 	@216
-					    location   	(1647, 1171)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+eMessages"
-					    pctDist    	0.643137
-					    height     	38
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E60400C1"
-					client     	@212
-					supplier   	@193
-					vertices   	(list Points
-					    (1279, 1137)
-					    (1279, 1208)
-					    (1891, 1208))
-					line_style 	3
-					origin_attachment 	(1279, 1137)
-					terminal_attachment 	(1891, 1208)
-					label      	(object SegLabel @218
-					    Parent_View 	@216
-					    location   	(1821, 1171)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.899346
-					    height     	38
-					    orientation 	0)
-					label      	(object SegLabel @219
-					    Parent_View 	@216
-					    location   	(1797, 1244)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	158
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.864407
-					    height     	36
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$15" @220
-				location   	(1212, 1159)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5E6710104"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$16" @221
-					Parent_View 	@220
-					location   	(-324, 215)
-					label      	(object SegLabel @222
-					    Parent_View 	@221
-					    location   	(1171, 594)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E672034A"
-					client     	@220
-					supplier   	@196
-					line_style 	3
-					origin_attachment 	(1212, 1159)
-					terminal_attachment 	(1212, 453)
-					label      	(object SegLabel @223
-					    Parent_View 	@221
-					    location   	(1251, 624)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.757962
-					    height     	39
-					    orientation 	1))
-				    (object RoleView "ePortTypes" @224
-					Parent_View 	@220
-					location   	(-324, 215)
-					label      	(object SegLabel @225
-					    Parent_View 	@224
-					    location   	(1391, 1451)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+ePortTypes"
-					    pctDist    	0.723698
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E6720354"
-					client     	@220
-					supplier   	@194
-					vertices   	(list Points
-					    (1212, 1159)
-					    (1212, 1490)
-					    (1587, 1490))
-					line_style 	3
-					origin_attachment 	(1212, 1159)
-					terminal_attachment 	(1587, 1490)
-					label      	(object SegLabel @226
-					    Parent_View 	@224
-					    location   	(1533, 1451)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.925611
-					    height     	40
-					    orientation 	0)
-					label      	(object SegLabel @227
-					    Parent_View 	@224
-					    location   	(1512, 1540)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	158
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.895855
-					    height     	50
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$17" @228
-				location   	(1114, 1585)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5E6770095"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$18" @229
-					Parent_View 	@228
-					location   	(-406, 241)
-					label      	(object SegLabel @230
-					    Parent_View 	@229
-					    location   	(1073, 680)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E6780371"
-					client     	@228
-					supplier   	@196
-					line_style 	3
-					origin_attachment 	(1114, 1585)
-					terminal_attachment 	(1114, 453)
-					label      	(object SegLabel @231
-					    Parent_View 	@229
-					    location   	(1155, 752)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.736704
-					    height     	41
-					    orientation 	1))
-				    (object RoleView "eBindings" @232
-					Parent_View 	@228
-					location   	(-406, 241)
-					label      	(object SegLabel @233
-					    Parent_View 	@232
-					    location   	(1851, 1674)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	204
-					    justify    	0
-					    label      	"+eBindings"
-					    pctDist    	0.766347
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E678037B"
-					client     	@228
-					supplier   	@195
-					vertices   	(list Points
-					    (1114, 1585)
-					    (1114, 1716)
-					    (2115, 1716))
-					line_style 	3
-					origin_attachment 	(1114, 1585)
-					terminal_attachment 	(2115, 1716)
-					label      	(object SegLabel @234
-					    Parent_View 	@232
-					    location   	(2053, 1677)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.945074
-					    height     	40
-					    orientation 	0)
-					label      	(object SegLabel @235
-					    Parent_View 	@232
-					    location   	(2014, 1754)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	158
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.911072
-					    height     	38
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::wsdl::Service" @236
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(1840, 2048)
-				label      	(object ItemLabel
-				    Parent_View 	@236
-				    location   	(1628, 1920)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	424
-				    justify    	0
-				    label      	"Service")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D8F002F8"
-				width      	442
-				height     	280
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$19" @237
-				location   	(1066, 1533)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5E67B0311"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$20" @238
-					Parent_View 	@237
-					location   	(-521, -111)
-					label      	(object SegLabel @239
-					    Parent_View 	@238
-					    location   	(1025, 669)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E67D007F"
-					client     	@237
-					supplier   	@196
-					line_style 	3
-					origin_attachment 	(1066, 1533)
-					terminal_attachment 	(1066, 453)
-					label      	(object SegLabel @240
-					    Parent_View 	@238
-					    location   	(1109, 756)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.719697
-					    height     	43
-					    orientation 	1))
-				    (object RoleView "eServices" @241
-					Parent_View 	@237
-					location   	(-521, -111)
-					label      	(object SegLabel @242
-					    Parent_View 	@241
-					    location   	(1393, 2028)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	204
-					    justify    	0
-					    label      	"+eServices"
-					    pctDist    	0.791824
-					    height     	32
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E67D0089"
-					client     	@237
-					supplier   	@236
-					vertices   	(list Points
-					    (1066, 1533)
-					    (1066, 2059)
-					    (1619, 2059))
-					line_style 	3
-					origin_attachment 	(1066, 1533)
-					terminal_attachment 	(1619, 2059)
-					label      	(object SegLabel @243
-					    Parent_View 	@241
-					    location   	(1554, 2031)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.940197
-					    height     	29
-					    orientation 	0)
-					label      	(object SegLabel @244
-					    Parent_View 	@241
-					    location   	(1532, 2113)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	158
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.920515
-					    height     	54
-					    orientation 	1))))
-			    (object InheritView "" @245
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84B1F80382"
-				client     	@196
-				supplier   	@190
-				line_style 	3
-				origin_attachment 	(1064, 263)
-				terminal_attachment 	(785, 263))))
-		    (object ClassDiagram "2.1.3 Extensibility"
-			quid       	"3AD60C510192"
-			title      	"2.1.3 Extensibility"
-			zoom       	80
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::Binding" @246
-				ShowCompartmentStereotypes 	TRUE
-				location   	(576, 1584)
-				label      	(object ItemLabel
-				    Parent_View 	@246
-				    location   	(494, 1531)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	164
-				    justify    	0
-				    label      	"Binding")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D2860261"
-				width      	182
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Port" @247
-				ShowCompartmentStereotypes 	TRUE
-				location   	(1568, 1888)
-				label      	(object ItemLabel
-				    Parent_View 	@247
-				    location   	(1487, 1836)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	162
-				    justify    	0
-				    label      	"Port")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D9170286"
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Service" @248
-				ShowCompartmentStereotypes 	TRUE
-				location   	(1424, 1728)
-				label      	(object ItemLabel
-				    Parent_View 	@248
-				    location   	(1342, 1675)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	164
-				    justify    	0
-				    label      	"Service")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D8F002F8"
-				width      	182
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::BindingFault" @249
-				ShowCompartmentStereotypes 	TRUE
-				location   	(1216, 2336)
-				label      	(object ItemLabel
-				    Parent_View 	@249
-				    location   	(1088, 2283)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	256
-				    justify    	0
-				    label      	"BindingFault")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE08A9E03A6"
-				width      	274
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::BindingOperation" @250
-				ShowCompartmentStereotypes 	TRUE
-				location   	(736, 1760)
-				label      	(object ItemLabel
-				    Parent_View 	@250
-				    location   	(563, 1707)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	346
-				    justify    	0
-				    label      	"BindingOperation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D3CB0145"
-				width      	364
-				height     	130
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IExtensibilityElement" @251
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1888, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@251
-				    location   	(1495, 136)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	786
-				    justify    	0
-				    label      	"IExtensibilityElement")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@251
-				    location   	(1495, 86)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	786
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84B12402AB"
-				width      	804
-				height     	172
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::BindingInput" @252
-				ShowCompartmentStereotypes 	TRUE
-				location   	(928, 1952)
-				label      	(object ItemLabel
-				    Parent_View 	@252
-				    location   	(800, 1899)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	256
-				    justify    	0
-				    label      	"BindingInput")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE08A8202D4"
-				width      	274
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::BindingOutput" @253
-				ShowCompartmentStereotypes 	TRUE
-				location   	(1008, 2144)
-				label      	(object ItemLabel
-				    Parent_View 	@253
-				    location   	(863, 2091)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	290
-				    justify    	0
-				    label      	"BindingOutput")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE08A8F028C"
-				width      	308
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Definition" @254
-				ShowCompartmentStereotypes 	TRUE
-				location   	(176, 1296)
-				label      	(object ItemLabel
-				    Parent_View 	@254
-				    location   	(74, 1235)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	204
-				    justify    	0
-				    label      	"Definition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5E43F008E"
-				width      	222
-				height     	146
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Types" @255
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(416, 1408)
-				label      	(object ItemLabel
-				    Parent_View 	@255
-				    location   	(335, 1356)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	162
-				    justify    	0
-				    label      	"Types")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B8BE9A603A8"
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::ExtensibleElement" @256
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(480, 688)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@256
-				    location   	(209, 580)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	542
-				    justify    	0
-				    label      	"ExtensibleElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5FCFA033A"
-				width      	560
-				height     	240
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @257
-				location   	(480, 1039)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@256
-				vertices   	(list Points
-				    (480, 1039)
-				    (480, 808)))
-			    (object InheritView "" @258
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD600CB00AA"
-				client     	@247
-				supplier   	@256
-				line_style 	3
-				origin_attachment 	(1566, 1824)
-				terminal_attachment 	(1566, 1039)
-				drawSupplier 	@257)
-			    (object InheritView "" @259
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B85B5A4027E"
-				client     	@253
-				supplier   	@256
-				line_style 	3
-				origin_attachment 	(1097, 2079)
-				terminal_attachment 	(1097, 1039)
-				drawSupplier 	@257)
-			    (object InheritView "" @260
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AE0938602C9"
-				client     	@249
-				supplier   	@256
-				line_style 	3
-				origin_attachment 	(1219, 2271)
-				terminal_attachment 	(1219, 1039)
-				drawSupplier 	@257)
-			    (object InheritView "" @261
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B85B59B0072"
-				client     	@252
-				supplier   	@256
-				line_style 	3
-				origin_attachment 	(988, 1887)
-				terminal_attachment 	(988, 1039)
-				drawSupplier 	@257)
-			    (object InheritView "" @262
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD6009202F7"
-				client     	@250
-				supplier   	@256
-				line_style 	3
-				origin_attachment 	(797, 1695)
-				terminal_attachment 	(797, 1039)
-				drawSupplier 	@257)
-			    (object InheritView "" @263
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5FA0F02F0"
-				client     	@246
-				supplier   	@256
-				line_style 	3
-				origin_attachment 	(601, 1519)
-				terminal_attachment 	(601, 1039)
-				drawSupplier 	@257)
-			    (object InheritView "" @264
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5FDB803D4"
-				client     	@254
-				supplier   	@256
-				line_style 	3
-				origin_attachment 	(211, 1223)
-				terminal_attachment 	(211, 1039)
-				drawSupplier 	@257)
-			    (object InheritView "" @265
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8BEB010311"
-				client     	@255
-				supplier   	@256
-				line_style 	3
-				origin_attachment 	(414, 1344)
-				terminal_attachment 	(414, 1039)
-				drawSupplier 	@257)
-			    (object InheritView "" @266
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5FA20025E"
-				client     	@248
-				supplier   	@256
-				line_style 	3
-				origin_attachment 	(1429, 1663)
-				terminal_attachment 	(1429, 1039)
-				drawSupplier 	@257)
-			    (object ClassView "Class" "Logical View::wsdl::ExtensibilityElement" @267
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1904, 688)
-				label      	(object ItemLabel
-				    Parent_View 	@267
-				    location   	(1632, 583)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	545
-				    justify    	0
-				    label      	"ExtensibilityElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5DBB602A9"
-				width      	563
-				height     	234
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$21" @268
-				location   	(1191, 672)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5FD130079"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$22" @269
-					Parent_View 	@268
-					location   	(23, 560)
-					label      	(object SegLabel @270
-					    Parent_View 	@269
-					    location   	(847, 631)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5FD14019E"
-					client     	@268
-					supplier   	@256
-					line_style 	3
-					origin_attachment 	(1191, 672)
-					terminal_attachment 	(760, 672)
-					label      	(object SegLabel @271
-					    Parent_View 	@269
-					    location   	(830, 628)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.839695
-					    height     	45
-					    orientation 	1))
-				    (object RoleView "eExtensibilityElements" @272
-					Parent_View 	@268
-					location   	(23, 560)
-					label      	(object SegLabel @273
-					    Parent_View 	@272
-					    location   	(1355, 522)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	"+eExtensibilityElements"
-					    pctDist    	0.379070
-					    height     	151
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5FD14019D"
-					client     	@268
-					supplier   	@267
-					line_style 	3
-					origin_attachment 	(1191, 672)
-					terminal_attachment 	(1623, 672)
-					label      	(object SegLabel @274
-					    Parent_View 	@272
-					    location   	(1496, 627)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.709402
-					    height     	46
-					    orientation 	0)
-					label      	(object SegLabel @275
-					    Parent_View 	@272
-					    location   	(1463, 764)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	164
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.632479
-					    height     	92
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::wsdl::WSDLElement" @276
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(1008, 192)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@276
-				    location   	(630, 84)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	756
-				    justify    	0
-				    label      	"WSDLElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C6A302DD"
-				width      	774
-				height     	240
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @277
-				location   	(1008, 402)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@276
-				vertices   	(list Points
-				    (1008, 402)
-				    (1008, 312)))
-			    (object InheritView "" @278
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5FE3C03D4"
-				client     	@256
-				supplier   	@276
-				line_style 	3
-				origin_attachment 	(492, 568)
-				terminal_attachment 	(492, 402)
-				drawSupplier 	@277)
-			    (object InheritView "" @279
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84B14903D0"
-				client     	@267
-				supplier   	@251
-				line_style 	3
-				origin_attachment 	(2015, 571)
-				terminal_attachment 	(2015, 246))
-			    (object InheritView "" @280
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BDDF53502C3"
-				client     	@267
-				supplier   	@276
-				line_style 	3
-				origin_attachment 	(1762, 571)
-				terminal_attachment 	(1762, 402)
-				drawSupplier 	@277)
-			    (object ClassView "Class" "Logical View::wsdl::UnknownExtensibilityElement" @281
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2016, 1360)
-				label      	(object ItemLabel
-				    Parent_View 	@281
-				    location   	(1731, 1307)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	570
-				    justify    	0
-				    label      	"UnknownExtensibilityElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3CB24AC002AE"
-				width      	588
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @282
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3CB24AEC01CB"
-				client     	@281
-				supplier   	@267
-				line_style 	3
-				origin_attachment 	(1796, 1295)
-				terminal_attachment 	(1796, 805))
-			    (object AssociationViewNew "$UNNAMED$63" @283
-				location   	(2311, 1686)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F7896A2026E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "parent" @284
-					Parent_View 	@283
-					location   	(279, 294)
-					label      	(object SegLabel @285
-					    Parent_View 	@284
-					    location   	(2422, 1333)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	144
-					    justify    	0
-					    label      	"+parent"
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3F7896A7012B"
-					client     	@283
-					supplier   	@281
-					vertices   	(list Points
-					    (2311, 1686)
-					    (2432, 1686)
-					    (2432, 1374)
-					    (2310, 1374))
-					line_style 	3
-					origin_attachment 	(2311, 1686)
-					terminal_attachment 	(2310, 1374)
-					label      	(object SegLabel @286
-					    Parent_View 	@284
-					    location   	(2366, 1428)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	0))
-				    (object RoleView "children" @287
-					Parent_View 	@283
-					location   	(279, 294)
-					label      	(object SegLabel @288
-					    Parent_View 	@287
-					    location   	(1899, 1537)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+children"
-					    pctDist    	0.798561
-					    height     	118
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3F7896A7012C"
-					client     	@283
-					supplier   	@281
-					vertices   	(list Points
-					    (2311, 1686)
-					    (2016, 1686)
-					    (2016, 1425))
-					line_style 	3
-					origin_attachment 	(2311, 1686)
-					terminal_attachment 	(2016, 1425)
-					label      	(object SegLabel @289
-					    Parent_View 	@287
-					    location   	(2070, 1481)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	1))))))
-		    (object ClassDiagram "2.1.1 Naming and Linking"
-			quid       	"3AE8ED7201BD"
-			title      	"2.1.1 Naming and Linking"
-			zoom       	90
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::IImport" @290
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1712, 224)
-				label      	(object ItemLabel
-				    Parent_View 	@290
-				    location   	(1422, 177)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	580
-				    justify    	0
-				    label      	"IImport")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@290
-				    location   	(1422, 127)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	580
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84B2020119"
-				width      	598
-				height     	218
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Namespace" @291
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(432, 1136)
-				label      	(object ItemLabel
-				    Parent_View 	@291
-				    location   	(202, 1041)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	461
-				    justify    	0
-				    label      	"Namespace")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AEA3CD30030"
-				width      	479
-				height     	215
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @292
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1632, 1216)
-				label      	(object ItemLabel
-				    Parent_View 	@292
-				    location   	(1294, 1142)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	676
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	694
-				height     	173
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Definition" @293
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(400, 384)
-				label      	(object ItemLabel
-				    Parent_View 	@293
-				    location   	(164, 236)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	472
-				    justify    	0
-				    label      	"Definition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5E43F008E"
-				width      	490
-				height     	320
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$37" @294
-				location   	(309, 786)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AEA3D55002D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eNamespaces" @295
-					Parent_View 	@294
-					location   	(-91, 258)
-					label      	(object SegLabel @296
-					    Parent_View 	@295
-					    location   	(461, 956)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	288
-					    justify    	0
-					    label      	"+eNamespaces"
-					    pctDist    	0.698842
-					    height     	152
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AEA3D560332"
-					client     	@294
-					supplier   	@291
-					line_style 	3
-					origin_attachment 	(309, 786)
-					terminal_attachment 	(309, 1029)
-					label      	(object SegLabel @297
-					    Parent_View 	@295
-					    location   	(248, 973)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.768707
-					    height     	62
-					    orientation 	1)
-					label      	(object SegLabel @298
-					    Parent_View 	@295
-					    location   	(228, 913)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	146
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.525097
-					    height     	82
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$38" @299
-					Parent_View 	@294
-					location   	(-91, 258)
-					label      	(object SegLabel @300
-					    Parent_View 	@299
-					    location   	(268, 592)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	192
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AEA3D560328"
-					client     	@294
-					supplier   	@293
-					line_style 	3
-					origin_attachment 	(309, 786)
-					terminal_attachment 	(309, 544)
-					label      	(object SegLabel @301
-					    Parent_View 	@299
-					    location   	(239, 583)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.844961
-					    height     	71
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::wsdl::Import" @302
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1472, 720)
-				label      	(object ItemLabel
-				    Parent_View 	@302
-				    location   	(1255, 580)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	434
-				    justify    	0
-				    label      	"Import")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5E4F903DE"
-				width      	452
-				height     	304
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$51" @303
-				location   	(1486, 1001)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8B1DCC02E5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eSchema" @304
-					Parent_View 	@303
-					location   	(510, -103)
-					label      	(object SegLabel @305
-					    Parent_View 	@304
-					    location   	(1737, 1018)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	204
-					    justify    	0
-					    label      	"+eSchema"
-					    pctDist    	0.592593
-					    height     	105
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8B1DCE0270"
-					client     	@303
-					supplier   	@292
-					vertices   	(list Points
-					    (1486, 1001)
-					    (1632, 1001)
-					    (1632, 1130))
-					line_style 	3
-					origin_attachment 	(1486, 1001)
-					terminal_attachment 	(1632, 1130)
-					label      	(object SegLabel @306
-					    Parent_View 	@304
-					    location   	(1563, 1018)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.592593
-					    height     	70
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$52" @307
-					Parent_View 	@303
-					location   	(510, -103)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8B1DCE027A"
-					client     	@303
-					supplier   	@302
-					line_style 	3
-					origin_attachment 	(1486, 1000)
-					terminal_attachment 	(1486, 872))))
-			    (object AssociationViewNew "$UNNAMED$39" @308
-				location   	(1087, 403)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AEA3E3A002D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$40" @309
-					Parent_View 	@308
-					location   	(687, -125)
-					label      	(object SegLabel @310
-					    Parent_View 	@309
-					    location   	(1406, 480)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AEA3E3C01F2"
-					client     	@308
-					supplier   	@302
-					vertices   	(list Points
-					    (1087, 403)
-					    (1364, 403)
-					    (1364, 568))
-					line_style 	3
-					origin_attachment 	(1087, 403)
-					terminal_attachment 	(1364, 568))
-				    (object RoleView "eDefinition" @311
-					Parent_View 	@308
-					location   	(687, -125)
-					label      	(object SegLabel @312
-					    Parent_View 	@311
-					    location   	(805, 363)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+eDefinition"
-					    pctDist    	0.637532
-					    height     	41
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AEA3E3C01E8"
-					client     	@308
-					supplier   	@293
-					line_style 	3
-					origin_attachment 	(1087, 403)
-					terminal_attachment 	(645, 403)
-					label      	(object SegLabel @313
-					    Parent_View 	@311
-					    location   	(727, 456)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.814910
-					    height     	53
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$57" @314
-				location   	(737, 826)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C864DFF02EC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$58" @315
-					Parent_View 	@314
-					location   	(-671, 106)
-					label      	(object SegLabel @316
-					    Parent_View 	@315
-					    location   	(552, 647)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C864DFF02EE"
-					client     	@314
-					supplier   	@293
-					vertices   	(list Points
-					    (737, 826)
-					    (510, 826)
-					    (510, 544))
-					line_style 	3
-					origin_attachment 	(737, 826)
-					terminal_attachment 	(510, 544)
-					label      	(object SegLabel @317
-					    Parent_View 	@315
-					    location   	(457, 595)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	0))
-				    (object RoleView "eImports" @318
-					Parent_View 	@314
-					location   	(-671, 106)
-					label      	(object SegLabel @319
-					    Parent_View 	@318
-					    location   	(1144, 773)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+eImports"
-					    pctDist    	0.799189
-					    height     	54
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C864DFF02ED"
-					client     	@314
-					supplier   	@302
-					line_style 	3
-					origin_attachment 	(737, 826)
-					terminal_attachment 	(1246, 826)
-					label      	(object SegLabel @320
-					    Parent_View 	@318
-					    location   	(1180, 879)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.872211
-					    height     	53
-					    orientation 	1)
-					label      	(object SegLabel @321
-					    Parent_View 	@318
-					    location   	(1162, 933)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	146
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.837728
-					    height     	107
-					    orientation 	1))))
-			    (object InheritView "" @322
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F6F200D0340"
-				client     	@302
-				supplier   	@290
-				line_style 	3
-				origin_attachment 	(1555, 568)
-				terminal_attachment 	(1555, 333))))
-		    (object ClassDiagram "2.2 Types"
-			quid       	"3B85AE59037E"
-			title      	"2.2 Types"
-			zoom       	90
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	81
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @323
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1136, 1232)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@323
-				    location   	(895, 1157)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	482
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ECD302A9"
-				width      	500
-				height     	174
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @324
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1136, 1600)
-				label      	(object ItemLabel
-				    Parent_View 	@324
-				    location   	(906, 1531)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	460
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				width      	478
-				height     	162
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Message" @325
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1280, 1968)
-				label      	(object ItemLabel
-				    Parent_View 	@325
-				    location   	(1022, 1828)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	517
-				    justify    	0
-				    label      	"Message")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C9590078"
-				width      	535
-				height     	305
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Part" @326
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(352, 1184)
-				label      	(object ItemLabel
-				    Parent_View 	@326
-				    location   	(128, 1067)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	448
-				    justify    	0
-				    label      	"Part")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5CE1C032E"
-				width      	466
-				height     	258
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$47" @327
-				location   	(735, 1172)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8B1BE900C4"
-				roleview_list 	(list RoleViews
-				    (object RoleView "typeDefinition" @328
-					Parent_View 	@327
-					location   	(143, 676)
-					label      	(object SegLabel @329
-					    Parent_View 	@328
-					    location   	(775, 1133)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+typeDefinition"
-					    pctDist    	0.269006
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8B1BE90327"
-					client     	@327
-					supplier   	@323
-					line_style 	3
-					origin_attachment 	(735, 1172)
-					terminal_attachment 	(886, 1172)
-					label      	(object SegLabel @330
-					    Parent_View 	@328
-					    location   	(839, 1207)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.688705
-					    height     	35
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$48" @331
-					Parent_View 	@327
-					location   	(143, 676)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8B1BE90331"
-					client     	@327
-					supplier   	@326
-					line_style 	3
-					origin_attachment 	(735, 1172)
-					terminal_attachment 	(585, 1172))))
-			    (object AssociationViewNew "$UNNAMED$49" @332
-				location   	(527, 1592)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8B1C1203B2"
-				roleview_list 	(list RoleViews
-				    (object RoleView "elementDeclaration" @333
-					Parent_View 	@332
-					location   	(-65, 1096)
-					label      	(object SegLabel @334
-					    Parent_View 	@333
-					    location   	(666, 1554)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+elementDeclaration"
-					    pctDist    	0.375394
-					    height     	39
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8B1C14001C"
-					client     	@332
-					supplier   	@324
-					line_style 	3
-					origin_attachment 	(527, 1592)
-					terminal_attachment 	(897, 1592)
-					label      	(object SegLabel @335
-					    Parent_View 	@333
-					    location   	(807, 1645)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.755877
-					    height     	53
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$50" @336
-					Parent_View 	@332
-					location   	(-65, 1096)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8B1C140026"
-					client     	@332
-					supplier   	@326
-					vertices   	(list Points
-					    (527, 1592)
-					    (437, 1592)
-					    (437, 1313))
-					line_style 	3
-					origin_attachment 	(527, 1592)
-					terminal_attachment 	(437, 1313))))
-			    (object AssociationViewNew "$UNNAMED$55" @337
-				location   	(322, 1911)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C46829303E5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eMessage" @338
-					Parent_View 	@337
-					location   	(-14, 1191)
-					label      	(object SegLabel @339
-					    Parent_View 	@338
-					    location   	(838, 1872)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+eMessage"
-					    pctDist    	0.748560
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C468296010E"
-					client     	@337
-					supplier   	@325
-					line_style 	3
-					origin_attachment 	(322, 1911)
-					terminal_attachment 	(1013, 1911)
-					label      	(object SegLabel @340
-					    Parent_View 	@338
-					    location   	(943, 1965)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$56" @341
-					Parent_View 	@337
-					location   	(-14, 1191)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C4682960118"
-					client     	@337
-					supplier   	@326
-					vertices   	(list Points
-					    (322, 1911)
-					    (229, 1911)
-					    (229, 1313))
-					line_style 	3
-					origin_attachment 	(322, 1911)
-					terminal_attachment 	(229, 1313))))
-			    (object ClassView "Class" "Logical View::wsdl::Types" @342
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(800, 608)
-				label      	(object ItemLabel
-				    Parent_View 	@342
-				    location   	(615, 512)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	371
-				    justify    	0
-				    label      	"Types")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B8BE9A603A8"
-				width      	389
-				height     	216
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Definition" @343
-				ShowCompartmentStereotypes 	TRUE
-				location   	(176, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@343
-				    location   	(74, 107)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	204
-				    justify    	0
-				    label      	"Definition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5E43F008E"
-				width      	222
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$53" @344
-				location   	(234, 604)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8BEA27029F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eTypes" @345
-					Parent_View 	@344
-					location   	(-150, 396)
-					label      	(object SegLabel @346
-					    Parent_View 	@345
-					    location   	(480, 640)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	207
-					    justify    	0
-					    label      	"+eTypes"
-					    pctDist    	0.661017
-					    height     	36
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8BEA29036A"
-					client     	@344
-					supplier   	@342
-					line_style 	3
-					origin_attachment 	(234, 604)
-					terminal_attachment 	(606, 604)
-					label      	(object SegLabel @347
-					    Parent_View 	@345
-					    location   	(526, 569)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.783883
-					    height     	36
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$54" @348
-					Parent_View 	@344
-					location   	(-150, 396)
-					label      	(object SegLabel @349
-					    Parent_View 	@348
-					    location   	(133, 313)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8BEA290356"
-					client     	@344
-					supplier   	@343
-					vertices   	(list Points
-					    (234, 604)
-					    (174, 604)
-					    (174, 225))
-					line_style 	3
-					origin_attachment 	(234, 604)
-					terminal_attachment 	(174, 225)
-					label      	(object SegLabel @350
-					    Parent_View 	@348
-					    location   	(228, 271)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.897729
-					    height     	54
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::wsdl::ITypes" @351
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(640, 224)
-				label      	(object ItemLabel
-				    Parent_View 	@351
-				    location   	(525, 203)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	230
-				    justify    	0
-				    label      	"ITypes")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@351
-				    location   	(525, 153)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	230
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3CADCBB20050"
-				width      	248
-				height     	166
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::XSDSchemaExtensibilityElement" @352
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1728, 800)
-				label      	(object ItemLabel
-				    Parent_View 	@352
-				    location   	(1359, 753)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	739
-				    justify    	0
-				    label      	"XSDSchemaExtensibilityElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3CC360D7039C"
-				width      	757
-				height     	118
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @353
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1856, 1216)
-				label      	(object ItemLabel
-				    Parent_View 	@353
-				    location   	(1529, 1103)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	655
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	673
-				height     	250
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$59" @354
-				location   	(1826, 975)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3CC3614500F2"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$60" @355
-					Parent_View 	@354
-					location   	(306, 447)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3CC36146023D"
-					client     	@354
-					supplier   	@352
-					line_style 	3
-					origin_attachment 	(1826, 975)
-					terminal_attachment 	(1826, 859)
-					label      	(object SegLabel @356
-					    Parent_View 	@355
-					    location   	(1774, 900)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.656489
-					    height     	53
-					    orientation 	0))
-				    (object RoleView "schema" @357
-					Parent_View 	@354
-					location   	(306, 447)
-					label      	(object SegLabel @358
-					    Parent_View 	@357
-					    location   	(2006, 1033)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+schema"
-					    pctDist    	0.507576
-					    height     	180
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3CC36146023E"
-					client     	@354
-					supplier   	@353
-					line_style 	3
-					origin_attachment 	(1826, 975)
-					terminal_attachment 	(1826, 1091)
-					label      	(object SegLabel @359
-					    Parent_View 	@357
-					    location   	(1788, 1050)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.651515
-					    height     	39
-					    orientation 	1))))
-			    (object InheritView "" @360
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3CADCD3B0380"
-				client     	@342
-				supplier   	@351
-				line_style 	3
-				origin_attachment 	(705, 500)
-				terminal_attachment 	(705, 307))
-			    (object ClassView "Class" "Logical View::wsdl::ExtensibleElement" @361
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1056, 224)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@361
-				    location   	(815, 130)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	482
-				    justify    	0
-				    label      	"ExtensibleElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5FCFA033A"
-				width      	500
-				height     	212
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @362
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8BEB010311"
-				client     	@342
-				supplier   	@361
-				line_style 	3
-				origin_attachment 	(854, 500)
-				terminal_attachment 	(854, 330))
-			    (object ClassView "Class" "Logical View::wsdl::ExtensibilityElement" @363
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(1824, 464)
-				label      	(object ItemLabel
-				    Parent_View 	@363
-				    location   	(1490, 368)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	669
-				    justify    	0
-				    label      	"ExtensibilityElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5DBB602A9"
-				width      	687
-				height     	216
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$21" @364
-				location   	(1206, 493)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5FD130079"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$22" @365
-					Parent_View 	@364
-					location   	(-586, 237)
-					label      	(object SegLabel @366
-					    Parent_View 	@365
-					    location   	(1136, 386)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5FD14019E"
-					client     	@364
-					supplier   	@361
-					vertices   	(list Points
-					    (1206, 493)
-					    (1094, 493)
-					    (1094, 330))
-					line_style 	3
-					origin_attachment 	(1206, 493)
-					terminal_attachment 	(1094, 330)
-					label      	(object SegLabel @367
-					    Parent_View 	@365
-					    location   	(1042, 377)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.828326
-					    height     	53
-					    orientation 	0))
-				    (object RoleView "eExtensibilityElements" @368
-					Parent_View 	@364
-					location   	(-586, 237)
-					label      	(object SegLabel @369
-					    Parent_View 	@368
-					    location   	(1196, 454)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	444
-					    justify    	0
-					    label      	"+eExtensibilityElements"
-					    pctDist    	-0.039711
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5FD14019D"
-					client     	@364
-					supplier   	@363
-					line_style 	3
-					origin_attachment 	(1206, 493)
-					terminal_attachment 	(1481, 493)
-					label      	(object SegLabel @370
-					    Parent_View 	@368
-					    location   	(1415, 546)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.764957
-					    height     	53
-					    orientation 	1)
-					label      	(object SegLabel @371
-					    Parent_View 	@368
-					    location   	(1396, 392)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	146
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.694915
-					    height     	102
-					    orientation 	0))))
-			    (object InheritView "" @372
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3CC3627F00B7"
-				client     	@352
-				supplier   	@363
-				line_style 	3
-				origin_attachment 	(1812, 741)
-				terminal_attachment 	(1812, 572))))
-		    (object ClassDiagram "2.3 Messages"
-			quid       	"3BCE853D02C8"
-			title      	"2.3 Messages"
-			zoom       	85
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::IMessage" @373
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(448, 224)
-				label      	(object ItemLabel
-				    Parent_View 	@373
-				    location   	(267, 122)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	362
-				    justify    	0
-				    label      	"IMessage")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@373
-				    location   	(267, 72)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	362
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A8AF004F"
-				width      	380
-				height     	328
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IPart" @374
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1328, 224)
-				label      	(object ItemLabel
-				    Parent_View 	@374
-				    location   	(1029, 124)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	599
-				    justify    	0
-				    label      	"IPart")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@374
-				    location   	(1029, 74)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	599
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A93F01BE"
-				width      	617
-				height     	324
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::wsdl::Part" @375
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1312, 816)
-				label      	(object ItemLabel
-				    Parent_View 	@375
-				    location   	(1075, 690)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	474
-				    justify    	0
-				    label      	"Part")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5CE1C032E"
-				width      	492
-				height     	276
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @376
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84A96D02F1"
-				client     	@375
-				supplier   	@374
-				line_style 	3
-				origin_attachment 	(1304, 678)
-				terminal_attachment 	(1304, 386))
-			    (object ClassView "Class" "Logical View::wsdl::Message" @377
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(448, 656)
-				label      	(object ItemLabel
-				    Parent_View 	@377
-				    location   	(241, 507)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	414
-				    justify    	0
-				    label      	"Message")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C9590078"
-				width      	432
-				height     	322
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @378
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84A8D102BA"
-				client     	@377
-				supplier   	@373
-				line_style 	3
-				origin_attachment 	(445, 495)
-				terminal_attachment 	(445, 388))
-			    (object AssociationViewNew "$UNNAMED$1" @379
-				location   	(688, 952)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5CEBE00E2"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eParts" @380
-					Parent_View 	@379
-					location   	(176, 328)
-					label      	(object SegLabel @381
-					    Parent_View 	@380
-					    location   	(952, 897)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	144
-					    justify    	0
-					    label      	"+eParts"
-					    pctDist    	0.697452
-					    height     	56
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5CEBF0061"
-					client     	@379
-					supplier   	@375
-					line_style 	3
-					origin_attachment 	(688, 952)
-					terminal_attachment 	(1066, 952)
-					label      	(object SegLabel @382
-					    Parent_View 	@380
-					    location   	(987, 1005)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.789809
-					    height     	53
-					    orientation 	1)
-					label      	(object SegLabel @383
-					    Parent_View 	@380
-					    location   	(967, 1061)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	154
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.742038
-					    height     	109
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$2" @384
-					Parent_View 	@379
-					location   	(176, 328)
-					label      	(object SegLabel @385
-					    Parent_View 	@384
-					    location   	(404, 893)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5CEBF0057"
-					client     	@379
-					supplier   	@377
-					vertices   	(list Points
-					    (688, 952)
-					    (445, 952)
-					    (445, 817))
-					line_style 	3
-					origin_attachment 	(688, 952)
-					terminal_attachment 	(445, 817)
-					label      	(object SegLabel @386
-					    Parent_View 	@384
-					    location   	(393, 912)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.747604
-					    height     	53
-					    orientation 	0))))))))
-	    (object Class_Category "xsd"
-		attributes 	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"prefix"
-			value      	"XSD")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"basePackage"
-			value      	"org.eclipse")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsPrefix"
-			value      	"xsd")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsURI"
-			value      	"http://www.eclipse.org/xsd/2002/XSD"))
-		quid       	"39ABDC6F01AA"
-		exportControl 	"Public"
-		logical_models 	(list unit_reference_list
-		    (object Class "XSDAnnotation"
-			quid       	"3B66EDC80233"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B69E1770116"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029")
-			    (object Inheritance_Relationship
-				quid       	"3B7FD4E20366"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDRedefineContent"
-				quidu      	"3B6AE2060172"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "applicationInformation"
-				quid       	"3BBF7EBF02C8"
-				stereotype 	"0..*"
-				type       	"DOMElement"
-				exportControl 	"Public")
-			    (object ClassAttribute "userInformation"
-				quid       	"3BBF7EEA0157"
-				stereotype 	"0..*"
-				type       	"DOMElement"
-				exportControl 	"Public")
-			    (object ClassAttribute "attributes"
-				quid       	"3BBF7F0501E2"
-				stereotype 	"0..*"
-				type       	"DOMAttr"
-				exportControl 	"Public")))
-		    (object Class "XSDAttributeDeclaration"
-			quid       	"3B66ED2E0192"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B69B7DC0193"
-				supplier   	"Logical View::xsd::XSDFeature"
-				quidu      	"3B69B537026C")
-			    (object Inheritance_Relationship
-				quid       	"3B688E6103BE"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDSchemaContent"
-				quidu      	"3B688CB800BA"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "attributeDeclarationReference"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C287F5202B4"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDAttributeGroupContent"
-			quid       	"3B6940200089"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B72D8E200EA"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"))
-			abstract   	TRUE)
-		    (object Class "XSDAttributeGroupDefinition"
-			quid       	"3B66ED840290"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B69403A0221"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDAttributeGroupContent"
-				quidu      	"3B6940200089")
-			    (object Inheritance_Relationship
-				quid       	"3B6AE2EB02A8"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDRedefineContent"
-				quidu      	"3B6AE2060172")
-			    (object Inheritance_Relationship
-				quid       	"3B7FCAC800D2"
-				supplier   	"Logical View::xsd::XSDRedefinableComponent"
-				quidu      	"3B7FCA8B020B"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "attributeGroupDefinitionReference"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C287F7B0386"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDAttributeUse"
-			quid       	"3B68354601A8"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B72D737038F"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDAttributeGroupContent"
-				quidu      	"3B6940200089")
-			    (object Inheritance_Relationship
-				quid       	"3B72D7BB0349"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "required"
-				quid       	"3B69CCF3027D"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "value"
-				quid       	"3B69CDDB03B7"
-				type       	"Value"
-				exportControl 	"Public")
-			    (object ClassAttribute "constraint"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69CDE002D8"
-				type       	"XSDConstraint"
-				exportControl 	"Public")
-			    (object ClassAttribute "use"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA7B0220382"
-				type       	"XSDAttributeUseCategory"
-				exportControl 	"Public")
-			    (object ClassAttribute "lexicalValue"
-				quid       	"3C2719D90341"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDBoundedFacet"
-			quid       	"3B6C751D0344"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C763C0224"
-				supplier   	"Logical View::xsd::XSDFundamentalFacet"
-				quidu      	"3B6C69E801D6"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C752A00CC"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDCardinalityFacet"
-			quid       	"3B6C755D03D2"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C764F0131"
-				supplier   	"Logical View::xsd::XSDFundamentalFacet"
-				quidu      	"3B6C69E801D6"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C756C0153"
-				type       	"XSDCardinality"
-				exportControl 	"Public")))
-		    (object Class "XSDComplexTypeContent"
-			quid       	"3B683BA00196"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6848B80286"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029"))
-			abstract   	TRUE)
-		    (object Class "XSDComplexTypeDefinition"
-			quid       	"3B682B82031A"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B69BAA20310"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDScope"
-				quidu      	"3B69B54000F2")
-			    (object Inheritance_Relationship
-				quid       	"3BA0D01901F1"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "derivationMethod"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69C6E4020E"
-				type       	"XSDDerivationMethod"
-				initv      	"restriction"
-				exportControl 	"Public")
-			    (object ClassAttribute "final"
-				quid       	"3B69C71D026A"
-				stereotype 	"0..*"
-				type       	"XSDComplexFinal"
-				exportControl 	"Public")
-			    (object ClassAttribute "abstract"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69C73800C5"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "contentTypeCategory"
-				quid       	"3B69CA4202B8"
-				type       	"XSDContentTypeCategory"
-				exportControl 	"Public")
-			    (object ClassAttribute "prohibitedSubstitutions"
-				quid       	"3B69CB8A03E6"
-				stereotype 	"0..*"
-				type       	"XSDProhibitedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "lexicalFinal"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0F618014D"
-				stereotype 	"0..*"
-				type       	"XSDComplexFinal"
-				exportControl 	"Public")
-			    (object ClassAttribute "block"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0FB97006E"
-				stereotype 	"0..*"
-				type       	"XSDProhibitedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "mixed"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3C31AF5E03A6"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDComponent"
-			quid       	"3B6846E90029"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3BA0CEA903D2"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"))
-			abstract   	TRUE)
-		    (object Class "XSDConcreteComponent"
-			quid       	"3B6AD7B40065"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "element"
-				quid       	"3B6ADDB501A5"
-				type       	"DOMElement"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDConstrainingFacet"
-			quid       	"3B6C6B340093"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C6C800394"
-				supplier   	"Logical View::xsd::XSDFacet"
-				quidu      	"3B6C359403D2"))
-			abstract   	TRUE)
-		    (object Class "XSDDiagnostic"
-			quid       	"3BFE5F910046"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3D4C0F4C01A1"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "severity"
-				quid       	"3BFE691C005D"
-				type       	"XSDDiagnosticSeverity"
-				exportControl 	"Public")
-			    (object ClassAttribute "message"
-				quid       	"3BFE5FDD0280"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "locationURI"
-				quid       	"3C063743016B"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "line"
-				quid       	"3BFE607E0213"
-				type       	"int"
-				initv      	"1"
-				exportControl 	"Public")
-			    (object ClassAttribute "column"
-				quid       	"3BFE611E0296"
-				type       	"int"
-				initv      	"1"
-				exportControl 	"Public")
-			    (object ClassAttribute "node"
-				quid       	"3C016B6B0200"
-				type       	"DOMNode"
-				exportControl 	"Public")
-			    (object ClassAttribute "annotationURI"
-				quid       	"3C06374F0186"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDElementDeclaration"
-			quid       	"3B66ED580214"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B69EDEE01BF"
-				supplier   	"Logical View::xsd::XSDFeature"
-				quidu      	"3B69B537026C")
-			    (object Inheritance_Relationship
-				quid       	"3B685F17002E"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDTerm"
-				quidu      	"3B683C5E0174")
-			    (object Inheritance_Relationship
-				quid       	"3B688E660339"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDSchemaContent"
-				quidu      	"3B688CB800BA"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "nillable"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69BFB4029F"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "disallowedSubstitutions"
-				quid       	"3B69C4680368"
-				stereotype 	"0..*"
-				type       	"XSDDisallowedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "substitutionGroupExclusions"
-				quid       	"3B69C4A003B9"
-				stereotype 	"0..*"
-				type       	"XSDSubstitutionGroupExclusions"
-				exportControl 	"Public")
-			    (object ClassAttribute "abstract"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69C4E0000E"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "lexicalFinal"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0D14C00B2"
-				stereotype 	"0..*"
-				type       	"XSDProhibitedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "block"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0D16801C1"
-				stereotype 	"0..*"
-				type       	"XSDDisallowedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "elementDeclarationReference"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C289F6203CF"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "circular"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C34DCB00018"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDEnumerationFacet"
-			quid       	"3B6C6ACE0141"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C6C9D03C7"
-				supplier   	"Logical View::xsd::XSDRepeatableFacet"
-				quidu      	"3B6C6AA6031A"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C7C640054"
-				stereotype 	"0..*"
-				type       	"Value"
-				exportControl 	"Public")))
-		    (object Class "XSDFacet"
-			quid       	"3B6C359403D2"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6D25680259"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "lexicalValue"
-				quid       	"3B6C73740253"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "facetName"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C289FB401EC"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "effectiveValue"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28AAE303B6"
-				type       	"Value"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDFeature"
-			quid       	"3B69B537026C"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3C290A2C0307"
-				supplier   	"Logical View::xsd::XSDNamedComponent"
-				quidu      	"3B6846D303A4"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B69BF81020F"
-				type       	"Value"
-				exportControl 	"Public")
-			    (object ClassAttribute "constraint"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69BF8800C5"
-				type       	"XSDConstraint"
-				exportControl 	"Public")
-			    (object ClassAttribute "form"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B9F902B033E"
-				type       	"XSDForm"
-				exportControl 	"Public")
-			    (object ClassAttribute "lexicalValue"
-				quid       	"3C271A1B016F"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "global"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A0070372"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "featureReference"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A0440185"
-				type       	"boolean"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDFixedFacet"
-			quid       	"3B6C699E00C1"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C6C8801B4"
-				supplier   	"Logical View::xsd::XSDConstrainingFacet"
-				quidu      	"3B6C6B340093"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "fixed"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B6C6A600201"
-				type       	"boolean"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDFractionDigitsFacet"
-			quid       	"3B6C79BE02EE"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B990016"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C79D2008A"
-				type       	"int"
-				exportControl 	"Public")))
-		    (object Class "XSDFundamentalFacet"
-			quid       	"3B6C69E801D6"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C6C7B0396"
-				supplier   	"Logical View::xsd::XSDFacet"
-				quidu      	"3B6C359403D2"))
-			abstract   	TRUE)
-		    (object Class "XSDIdentityConstraintDefinition"
-			quid       	"3B682B2603A2"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B684AA30242"
-				supplier   	"Logical View::xsd::XSDNamedComponent"
-				quidu      	"3B6846D303A4"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "identityConstraintCategory"
-				quid       	"3B69D1C70143"
-				type       	"XSDIdentityConstraintCategory"
-				exportControl 	"Public")))
-		    (object Class "XSDImport"
-			quid       	"3B688C93017F"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AD8D9003E"
-				supplier   	"Logical View::xsd::XSDSchemaDirective"
-				quidu      	"3B6AD8A202A2"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "namespace"
-				quid       	"3B6ADB15036C"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDInclude"
-			quid       	"3B688C7D0250"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AD8DC0381"
-				supplier   	"Logical View::xsd::XSDSchemaCompositor"
-				quidu      	"3C21DB4102AE")))
-		    (object Class "XSDLengthFacet"
-			quid       	"3B6C776200E7"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C778002DF"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C776C004B"
-				type       	"int"
-				exportControl 	"Public")))
-		    (object Class "XSDMaxExclusiveFacet"
-			quid       	"3B6C789600C2"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B8E0309"
-				supplier   	"Logical View::xsd::XSDMaxFacet"
-				quidu      	"3C0A1CEB010E")))
-		    (object Class "XSDMaxFacet"
-			quid       	"3C0A1CEB010E"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3C0A1D3103AD"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3C0A1EE201F7"
-				type       	"Value"
-				exportControl 	"Public")
-			    (object ClassAttribute "inclusive"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A174027D"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "exclusive"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A1930354"
-				type       	"boolean"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDMaxInclusiveFacet"
-			quid       	"3B6C787D00DA"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B8303B8"
-				supplier   	"Logical View::xsd::XSDMaxFacet"
-				quidu      	"3C0A1CEB010E")))
-		    (object Class "XSDMaxLengthFacet"
-			quid       	"3B6C77C70146"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B7D00FC"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C77DA00F3"
-				type       	"int"
-				exportControl 	"Public")))
-		    (object Class "XSDMinExclusiveFacet"
-			quid       	"3B6C792D000A"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B590281"
-				supplier   	"Logical View::xsd::XSDMinFacet"
-				quidu      	"3C0A1CDE037C")))
-		    (object Class "XSDMinFacet"
-			quid       	"3C0A1CDE037C"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3C0A1D240098"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3C0A1ED10398"
-				type       	"Value"
-				exportControl 	"Public")
-			    (object ClassAttribute "inclusive"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A1A2008E"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "exclusive"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A1BE03E2"
-				type       	"boolean"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDMinInclusiveFacet"
-			quid       	"3B6C788702C9"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B520353"
-				supplier   	"Logical View::xsd::XSDMinFacet"
-				quidu      	"3C0A1CDE037C")))
-		    (object Class "XSDMinLengthFacet"
-			quid       	"3B6C778C0065"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C77C400C0"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C7799015E"
-				type       	"int"
-				exportControl 	"Public")))
-		    (object Class "XSDModelGroup"
-			quid       	"3B6834E00291"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B684A640279"
-				supplier   	"Logical View::xsd::XSDTerm"
-				quidu      	"3B683C5E0174"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "compositor"
-				quid       	"3B69CF1D01CF"
-				type       	"XSDCompositor"
-				exportControl 	"Public")))
-		    (object Class "XSDModelGroupDefinition"
-			quid       	"3B66ED9A0205"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AE2E20381"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDRedefineContent"
-				quidu      	"3B6AE2060172")
-			    (object Inheritance_Relationship
-				quid       	"3B6BD2550385"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDParticleContent"
-				quidu      	"3B6BD22300C6")
-			    (object Inheritance_Relationship
-				quid       	"3B7FCAC40090"
-				supplier   	"Logical View::xsd::XSDRedefinableComponent"
-				quidu      	"3B7FCA8B020B"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "modelGroupDefinitionReference"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A1F602E8"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDNamedComponent"
-			quid       	"3B6846D303A4"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3BA0CEA20197"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3B6847000142"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "targetNamespace"
-				quid       	"3B684704031E"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "aliasName"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A57F0127"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "uRI"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A58700E2"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "aliasURI"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A5AA02AF"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "qName"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C290963025E"
-				type       	"String"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDNotationDeclaration"
-			quid       	"3B66EDAA021C"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B68494302F1"
-				supplier   	"Logical View::xsd::XSDNamedComponent"
-				quidu      	"3B6846D303A4")
-			    (object Inheritance_Relationship
-				quid       	"3B688E4F023C"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDSchemaContent"
-				quidu      	"3B688CB800BA"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "systemIdentifier"
-				quid       	"3B69D32E00F0"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "publicIdentifier"
-				quid       	"3B69D3340397"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDNumericFacet"
-			quid       	"3B6C75950206"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C76420074"
-				supplier   	"Logical View::xsd::XSDFundamentalFacet"
-				quidu      	"3B6C69E801D6"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C75A30012"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDOrderedFacet"
-			quid       	"3B6C74DD0248"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7659012C"
-				supplier   	"Logical View::xsd::XSDFundamentalFacet"
-				quidu      	"3B6C69E801D6"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C74F602DA"
-				type       	"XSDOrdered"
-				exportControl 	"Public")))
-		    (object Class "XSDParticle"
-			quid       	"3B682BBD01F7"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6848FC01E7"
-				supplier   	"Logical View::xsd::XSDComplexTypeContent"
-				quidu      	"3B683BA00196"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "minOccurs"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69CF8E03B2"
-				type       	"int"
-				initv      	"1"
-				exportControl 	"Public")
-			    (object ClassAttribute "maxOccurs"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69CF9903AE"
-				type       	"int"
-				initv      	"1"
-				exportControl 	"Public")))
-		    (object Class "XSDParticleContent"
-			quid       	"3B6BD22300C6"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B780BD90059"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"))
-			abstract   	TRUE)
-		    (object Class "XSDPatternFacet"
-			quid       	"3B6C6ADB026C"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C6CA5038D"
-				supplier   	"Logical View::xsd::XSDRepeatableFacet"
-				quidu      	"3B6C6AA6031A"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C7C790311"
-				stereotype 	"0..*"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDRedefinableComponent"
-			quid       	"3B7FCA8B020B"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B7FD4BA023C"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDRedefineContent"
-				quidu      	"3B6AE2060172")
-			    (object Inheritance_Relationship
-				quid       	"3C290A26036D"
-				supplier   	"Logical View::xsd::XSDNamedComponent"
-				quidu      	"3B6846D303A4"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "circular"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A6800216"
-				type       	"boolean"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDRedefineContent"
-			quid       	"3B6AE2060172"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AE2B301D5"
-				supplier   	"Logical View::xsd::XSDSchemaContent"
-				quidu      	"3B688CB800BA"))
-			abstract   	TRUE)
-		    (object Class "XSDRedefine"
-			quid       	"3B688C9B02AD"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3C21DB640240"
-				supplier   	"Logical View::xsd::XSDSchemaCompositor"
-				quidu      	"3C21DB4102AE")))
-		    (object Class "XSDRepeatableFacet"
-			quid       	"3B6C6AA6031A"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C6C8F002E"
-				supplier   	"Logical View::xsd::XSDConstrainingFacet"
-				quidu      	"3B6C6B340093"))
-			abstract   	TRUE)
-		    (object Class "XSDSchema"
-			quid       	"374B182500BB"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B7FCC4A0182"
-				supplier   	"Logical View::xsd::XSDScope"
-				quidu      	"3B69B54000F2"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "document"
-				quid       	"3C2784E503DD"
-				type       	"DOMDocument"
-				exportControl 	"Public")
-			    (object ClassAttribute "schemaLocation"
-				quid       	"3B6868EC0226"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "targetNamespace"
-				quid       	"3B9F9BFF0180"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "attributeFormDefault"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B9F904B0102"
-				type       	"XSDForm"
-				initv      	"unqualified"
-				exportControl 	"Public")
-			    (object ClassAttribute "elementFormDefault"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B9F907800AC"
-				type       	"XSDForm"
-				initv      	"unqualified"
-				exportControl 	"Public")
-			    (object ClassAttribute "finalDefault"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0C4A70038"
-				stereotype 	"0..*"
-				type       	"XSDProhibitedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "blockDefault"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0F59D02D8"
-				stereotype 	"0..*"
-				type       	"XSDDisallowedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "version"
-				quid       	"3D22D6D80356"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDSchemaCompositor"
-			quid       	"3C21DB4102AE"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3C21DB560092"
-				supplier   	"Logical View::xsd::XSDSchemaDirective"
-				quidu      	"3B6AD8A202A2"))
-			abstract   	TRUE)
-		    (object Class "XSDSchemaContent"
-			quid       	"3B688CB800BA"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AD8E60372"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"))
-			abstract   	TRUE)
-		    (object Class "XSDSchemaDirective"
-			quid       	"3B6AD8A202A2"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AE32102AF"
-				supplier   	"Logical View::xsd::XSDSchemaContent"
-				quidu      	"3B688CB800BA"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "schemaLocation"
-				quid       	"3B6AD9B30330"
-				type       	"String"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDScope"
-			quid       	"3B69B54000F2"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B7FCD640231"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029"))
-			abstract   	TRUE)
-		    (object Class "XSDSimpleTypeDefinition"
-			quid       	"3B682BA7005D"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B684A1302A2"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9")
-			    (object Inheritance_Relationship
-				quid       	"3B685F55032B"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDComplexTypeContent"
-				quidu      	"3B683BA00196"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "variety"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B6C315800A9"
-				type       	"XSDVariety"
-				exportControl 	"Public")
-			    (object ClassAttribute "final"
-				quid       	"3B6D544F0146"
-				stereotype 	"0..*"
-				type       	"XSDSimpleFinal"
-				exportControl 	"Public")
-			    (object ClassAttribute "lexicalFinal"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0F65E035A"
-				stereotype 	"0..*"
-				type       	"XSDSimpleFinal"
-				exportControl 	"Public")
-			    (object ClassAttribute "validFacets"
-				quid       	"3C28AB0F00B6"
-				stereotype 	"0..*"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDTerm"
-			quid       	"3B683C5E0174"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6848AA01D3"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029")
-			    (object Inheritance_Relationship
-				quid       	"3B6BD2440069"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDParticleContent"
-				quidu      	"3B6BD22300C6"))
-			abstract   	TRUE)
-		    (object Class "XSDTotalDigitsFacet"
-			quid       	"3B6C79A0020E"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B610337"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C79AB0232"
-				type       	"int"
-				exportControl 	"Public")))
-		    (object Class "XSDTypeDefinition"
-			quid       	"3B66ECD302A9"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AE2F5013A"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDRedefineContent"
-				quidu      	"3B6AE2060172")
-			    (object Inheritance_Relationship
-				quid       	"3B7FCAB1004D"
-				supplier   	"Logical View::xsd::XSDRedefinableComponent"
-				quidu      	"3B7FCA8B020B"))
-			abstract   	TRUE)
-		    (object Class "XSDWhiteSpaceFacet"
-			quid       	"3B6C784601B7"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C78620045"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C78500201"
-				type       	"XSDWhiteSpace"
-				exportControl 	"Public")))
-		    (object Class "XSDWildcard"
-			quid       	"3B6838370031"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B684A3A0041"
-				supplier   	"Logical View::xsd::XSDTerm"
-				quidu      	"3B683C5E0174"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "namespaceConstraintCategory"
-				quid       	"3B69D0E9019E"
-				type       	"XSDNamespaceConstraintCategory"
-				exportControl 	"Public")
-			    (object ClassAttribute "namespaceConstraint"
-				quid       	"3B97CF860223"
-				stereotype 	"0..*"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "processContents"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69D12E01E4"
-				type       	"XSDProcessContents"
-				exportControl 	"Public")
-			    (object ClassAttribute "lexicalNamespaceConstraint"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA7BDB701F9"
-				stereotype 	"0..*"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDXPathDefinition"
-			quid       	"3B6D83BB0355"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6D84F70092"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "variety"
-				quid       	"3B6D901503DE"
-				type       	"XSDXPathVariety"
-				exportControl 	"Public")
-			    (object ClassAttribute "value"
-				quid       	"3B7BBBE101B1"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "DOMAttr"
-			quid       	"3BBF8C8901B6"
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "org.w3c.dom.Attr"
-				quid       	"3BBF8CB000D5"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Class "DOMDocument"
-			quid       	"3C27850E0381"
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "org.w3c.dom.Document"
-				quid       	"3C27851B03C6"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Class "DOMElement"
-			quid       	"3B8189790200"
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "org.w3c.dom.Element"
-				quid       	"3B8189DB0374"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Class "DOMNode"
-			quid       	"3BFE64A50117"
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "org.w3c.dom.Node"
-				quid       	"3BFE65BF002D"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Class "Value"
-			quid       	"3C040B5B031F"
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "java.lang.Object"
-				quid       	"3C040B8D03D5"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Class "XSDAttributeUseCategory"
-			quid       	"3BA7B0E801A8"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "optional"
-				quid       	"3BA7B11502B7"
-				exportControl 	"Public")
-			    (object ClassAttribute "prohibited"
-				quid       	"3BA7B12202D3"
-				exportControl 	"Public")
-			    (object ClassAttribute "required"
-				quid       	"3BA7B12902F0"
-				exportControl 	"Public")))
-		    (object Class "XSDCardinality"
-			quid       	"3BC7715D009B"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "finite"
-				quid       	"3BC771DC02ED"
-				exportControl 	"Public")
-			    (object ClassAttribute "countablyInfinite"
-				quid       	"3BC771EC0141"
-				exportControl 	"Public")))
-		    (object Class "XSDComplexFinal"
-			quid       	"3B97C2CA01CB"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "extension"
-				quid       	"3B97C2E700DA"
-				exportControl 	"Public")
-			    (object ClassAttribute "restriction"
-				quid       	"3B97C2EA016A"
-				exportControl 	"Public")
-			    (object ClassAttribute "all"
-				quid       	"3BA0F6D20112"
-				exportControl 	"Public")))
-		    (object Class "XSDCompositor"
-			quid       	"3B869B620037"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "all"
-				quid       	"3B869BD00003"
-				exportControl 	"Public")
-			    (object ClassAttribute "choice"
-				quid       	"3B869CB8011E"
-				exportControl 	"Public")
-			    (object ClassAttribute "sequence"
-				quid       	"3B869CE50057"
-				exportControl 	"Public")))
-		    (object Class "XSDConstraint"
-			quid       	"3B869E2601AE"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "default"
-				quid       	"3B869E8E0258"
-				exportControl 	"Public")
-			    (object ClassAttribute "fixed"
-				quid       	"3B869E990271"
-				exportControl 	"Public")))
-		    (object Class "XSDContentTypeCategory"
-			quid       	"3B86A79F03A2"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "empty"
-				quid       	"3B86A7CD02F0"
-				exportControl 	"Public")
-			    (object ClassAttribute "simple"
-				quid       	"3B86A7D100CE"
-				exportControl 	"Public")
-			    (object ClassAttribute "mixed"
-				quid       	"3B86A7D301B7"
-				exportControl 	"Public")
-			    (object ClassAttribute "elementOnly"
-				quid       	"3B86A7D702E9"
-				exportControl 	"Public")))
-		    (object Class "XSDDerivationMethod"
-			quid       	"3B86A0B000CE"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "extension"
-				quid       	"3B86A0C80329"
-				exportControl 	"Public")
-			    (object ClassAttribute "restriction"
-				quid       	"3B86A0CC0162"
-				exportControl 	"Public")))
-		    (object Class "XSDDiagnosticSeverity"
-			quid       	"3BFE68A7032F"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "fatal"
-				quid       	"3BFE68C303D0"
-				exportControl 	"Public")
-			    (object ClassAttribute "error"
-				quid       	"3BFE68E700E3"
-				exportControl 	"Public")
-			    (object ClassAttribute "warning"
-				quid       	"3BFE68EA01FF"
-				exportControl 	"Public")
-			    (object ClassAttribute "information"
-				quid       	"3BFE7FC2019A"
-				exportControl 	"Public")))
-		    (object Class "XSDDisallowedSubstitutions"
-			quid       	"3B97C5A403DF"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "substitution"
-				quid       	"3B97C6790045"
-				exportControl 	"Public")
-			    (object ClassAttribute "extension"
-				quid       	"3B97C67F01AC"
-				exportControl 	"Public")
-			    (object ClassAttribute "restriction"
-				quid       	"3B97C683020B"
-				exportControl 	"Public")
-			    (object ClassAttribute "all"
-				quid       	"3BA0F2450069"
-				exportControl 	"Public")))
-		    (object Class "XSDForm"
-			quid       	"3B9F913B01EB"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "qualified"
-				quid       	"3B9F916F0023"
-				exportControl 	"Public")
-			    (object ClassAttribute "unqualified"
-				quid       	"3B9F918C007F"
-				exportControl 	"Public")))
-		    (object Class "XSDIdentityConstraintCategory"
-			quid       	"3B86A1E00272"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "key"
-				quid       	"3B86A2120085"
-				exportControl 	"Public")
-			    (object ClassAttribute "keyref"
-				quid       	"3B86A213014F"
-				exportControl 	"Public")
-			    (object ClassAttribute "unique"
-				quid       	"3B86A2160365"
-				exportControl 	"Public")))
-		    (object Class "XSDNamespaceConstraintCategory"
-			quid       	"3B97C5EA0023"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "any"
-				quid       	"3B97D0600034"
-				exportControl 	"Public")
-			    (object ClassAttribute "not"
-				quid       	"3B97D062005F"
-				exportControl 	"Public")
-			    (object ClassAttribute "set"
-				quid       	"3B97D0650117"
-				exportControl 	"Public")))
-		    (object Class "XSDOrdered"
-			quid       	"3BC7715202E4"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "false"
-				quid       	"3BC771A90271"
-				exportControl 	"Public")
-			    (object ClassAttribute "partial"
-				quid       	"3BC771BB01FF"
-				exportControl 	"Public")
-			    (object ClassAttribute "total"
-				quid       	"3BC771C401B2"
-				exportControl 	"Public")))
-		    (object Class "XSDProcessContents"
-			quid       	"3B8FF8C70284"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "strict"
-				quid       	"3B8FF8F80045"
-				exportControl 	"Public")
-			    (object ClassAttribute "lax"
-				quid       	"3B8FF8F6038B"
-				exportControl 	"Public")
-			    (object ClassAttribute "skip"
-				quid       	"3B8FF8E802BA"
-				exportControl 	"Public")))
-		    (object Class "XSDProhibitedSubstitutions"
-			quid       	"3B97C5BE0272"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "extension"
-				quid       	"3B97C68B00B8"
-				exportControl 	"Public")
-			    (object ClassAttribute "restriction"
-				quid       	"3B97C6940291"
-				exportControl 	"Public")
-			    (object ClassAttribute "all"
-				quid       	"3BA0F2500295"
-				exportControl 	"Public")))
-		    (object Class "XSDSimpleFinal"
-			quid       	"3B97C25D0295"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "list"
-				quid       	"3B97C2810230"
-				exportControl 	"Public")
-			    (object ClassAttribute "restriction"
-				quid       	"3B97C2830138"
-				exportControl 	"Public")
-			    (object ClassAttribute "union"
-				quid       	"3B97C288024E"
-				exportControl 	"Public")
-			    (object ClassAttribute "all"
-				quid       	"3BA0F6E00374"
-				exportControl 	"Public")))
-		    (object Class "XSDSubstitutionGroupExclusions"
-			quid       	"3B97C59100AE"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "extension"
-				quid       	"3B97C6640231"
-				exportControl 	"Public")
-			    (object ClassAttribute "restriction"
-				quid       	"3B97C66D0216"
-				exportControl 	"Public")))
-		    (object Class "XSDVariety"
-			quid       	"3B8FF7730249"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "atomic"
-				quid       	"3B8FF7A702DF"
-				exportControl 	"Public")
-			    (object ClassAttribute "list"
-				quid       	"3B8FF7AD0139"
-				exportControl 	"Public")
-			    (object ClassAttribute "union"
-				quid       	"3B8FF7AF039F"
-				exportControl 	"Public")))
-		    (object Class "XSDWhiteSpace"
-			quid       	"3BEED0F60342"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "preserve"
-				quid       	"3BEED10F0117"
-				exportControl 	"Public")
-			    (object ClassAttribute "replace"
-				quid       	"3BEED127034D"
-				exportControl 	"Public")
-			    (object ClassAttribute "collapse"
-				quid       	"3BEED1290396"
-				exportControl 	"Public")))
-		    (object Class "XSDXPathVariety"
-			quid       	"3B8FFB89033A"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "selector"
-				quid       	"3B8FFBAC0192"
-				exportControl 	"Public")
-			    (object ClassAttribute "field"
-				quid       	"3B8FFBB30278"
-				exportControl 	"Public")))
-		    (object Association "$UNNAMED$64"
-			quid       	"3C626EA70102"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$65"
-				quid       	"3C626EA90191"
-				supplier   	"Logical View::xsd::XSDRepeatableFacet"
-				quidu      	"3B6C6AA6031A"
-				is_aggregate 	TRUE)
-			    (object Role "annotations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C626EA90192"
-				label      	"annotations"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$66"
-			quid       	"3B69DADC02F5"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$67"
-				quid       	"3B69DADD0238"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DADD0242"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$68"
-			quid       	"3B6890D6006F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$69"
-				quid       	"3B6890D6030E"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				is_aggregate 	TRUE)
-			    (object Role "anonymousTypeDefinition"
-				quid       	"3B6890D60318"
-				label      	"anonymousTypeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$70"
-			quid       	"3B68356B02CB"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$71"
-				quid       	"3B68356D00A6"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				is_aggregate 	TRUE)
-			    (object Role "typeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B68356D00A7"
-				label      	"typeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$72"
-			quid       	"3B6B426B0194"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$73"
-				quid       	"3B6B426D0309"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				is_aggregate 	TRUE)
-			    (object Role "resolvedAttributeDeclaration"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6B426D0313"
-				label      	"resolvedAttributeDeclaration"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$74"
-			quid       	"3B69DB060291"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$75"
-				quid       	"3B69DB070171"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB070172"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$76"
-			quid       	"3B69404E0067"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$77"
-				quid       	"3B694050029B"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "contents"
-				quid       	"3B69405002A5"
-				label      	"contents"
-				supplier   	"Logical View::xsd::XSDAttributeGroupContent"
-				quidu      	"3B6940200089"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$78"
-			quid       	"3B68359F0086"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$79"
-				quid       	"3B6835A00069"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "attributeUses"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6835A0006A"
-				label      	"attributeUses"
-				supplier   	"Logical View::xsd::XSDAttributeUse"
-				quidu      	"3B68354601A8"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$80"
-			quid       	"3C275D320220"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$81"
-				quid       	"3C275D3C010C"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "attributeWildcardContent"
-				quid       	"3C275D3C010D"
-				label      	"attributeWildcardContent"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$82"
-			quid       	"3B6887BF0150"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$83"
-				quid       	"3B6887C000A7"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "attributeWildcard"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6887C000A8"
-				label      	"attributeWildcard"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$84"
-			quid       	"3B6B425E01F9"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$85"
-				quid       	"3B6B42620046"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "resolvedAttributeGroupDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6B42620050"
-				label      	"resolvedAttributeGroupDefinition"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$86"
-			quid       	"3B683585010D"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$87"
-				quid       	"3B68358600FA"
-				supplier   	"Logical View::xsd::XSDAttributeUse"
-				quidu      	"3B68354601A8"
-				is_aggregate 	TRUE)
-			    (object Role "attributeDeclaration"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B68358600FB"
-				label      	"attributeDeclaration"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$88"
-			quid       	"3B6F1DE9018A"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$89"
-				quid       	"3B6F1DEA036C"
-				supplier   	"Logical View::xsd::XSDAttributeUse"
-				quidu      	"3B68354601A8"
-				is_aggregate 	TRUE)
-			    (object Role "content"
-				quid       	"3B6F1DEA0380"
-				label      	"content"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$90"
-			quid       	"3B90068801C2"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$91"
-				quid       	"3B90068A0111"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "contentAnnotation"
-				quid       	"3B90068A011B"
-				label      	"contentAnnotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$92"
-			quid       	"3B6833350340"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$93"
-				quid       	"3B683336028D"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "baseTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B683336028E"
-				label      	"baseTypeDefinition"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$94"
-			quid       	"3B6FDDD70113"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$95"
-				quid       	"3B6FDDDA026B"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "content"
-				quid       	"3B6FDDDA0275"
-				label      	"content"
-				supplier   	"Logical View::xsd::XSDComplexTypeContent"
-				quidu      	"3B683BA00196"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$96"
-			quid       	"3B6837DF024F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$97"
-				quid       	"3B6837E100FD"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "contentType"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6837E100FE"
-				label      	"contentType"
-				supplier   	"Logical View::xsd::XSDComplexTypeContent"
-				quidu      	"3B683BA00196"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$98"
-			quid       	"3B683959006E"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$99"
-				quid       	"3B6839590349"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "attributeUses"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B683959034A"
-				label      	"attributeUses"
-				supplier   	"Logical View::xsd::XSDAttributeUse"
-				quidu      	"3B68354601A8"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$100"
-			quid       	"3B698E360386"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$101"
-				quid       	"3B698E380072"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "attributeContents"
-				quid       	"3B698E38007C"
-				label      	"attributeContents"
-				supplier   	"Logical View::xsd::XSDAttributeGroupContent"
-				quidu      	"3B6940200089"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$102"
-			quid       	"3B6851BA0126"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$103"
-				quid       	"3B6851BB0150"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "attributeWildcard"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6851BB0151"
-				label      	"attributeWildcard"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$104"
-			quid       	"3B751B0803C7"
-			roles      	(list role_list
-			    (object Role "container"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3B751B0C01CE"
-				label      	"container"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$105"
-				attributes 	(list Attribute_Set)
-				quid       	"3B751B0C01CF"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065")))
-		    (object Association "$UNNAMED$106"
-			quid       	"3B751B480261"
-			roles      	(list role_list
-			    (object Role "rootContainer"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3B751B4C0285"
-				label      	"rootContainer"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$107"
-				attributes 	(list Attribute_Set)
-				quid       	"3B751B4C0286"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065")))
-		    (object Association "$UNNAMED$108"
-			quid       	"3B751C310356"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$109"
-				attributes 	(list Attribute_Set)
-				quid       	"3B751C330331"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065")
-			    (object Role "schema"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3B751C33033B"
-				label      	"schema"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$110"
-			quid       	"3B69DB0A0066"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$111"
-				quid       	"3B69DB0B023F"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB0B0249"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$112"
-			quid       	"3B68911401AF"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$113"
-				quid       	"3B6891150016"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				is_aggregate 	TRUE)
-			    (object Role "anonymousTypeDefinition"
-				quid       	"3B6891150017"
-				label      	"anonymousTypeDefinition"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$114"
-			quid       	"3B68338C0058"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$115"
-				quid       	"3B68338C03BF"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				is_aggregate 	TRUE)
-			    (object Role "typeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B68338C03C0"
-				label      	"typeDefinition"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$116"
-			quid       	"3B6833EF0160"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$117"
-				quid       	"3B6833F00298"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				is_aggregate 	TRUE)
-			    (object Role "identityConstraintDefinitions"
-				quid       	"3B6833F00299"
-				label      	"identityConstraintDefinitions"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$118"
-			quid       	"3B6B41E60251"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$119"
-				quid       	"3B6B41EA02F7"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				is_aggregate 	TRUE)
-			    (object Role "resolvedElementDeclaration"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6B41EA030B"
-				label      	"resolvedElementDeclaration"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$120"
-			quid       	"3B69C0590198"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$121"
-				quid       	"3B69C05D01E3"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214")
-			    (object Role "substitutionGroupAffiliation"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B69C05D01ED"
-				label      	"substitutionGroupAffiliation"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$122"
-			quid       	"3C42DBDD0297"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$123"
-				quid       	"3C42DBE0011E"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				is_aggregate 	TRUE)
-			    (object Role "substitutionGroup"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C42DBE00128"
-				label      	"substitutionGroup"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$124"
-			quid       	"3B6D23B901CD"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$125"
-				quid       	"3B6D23BA01C4"
-				supplier   	"Logical View::xsd::XSDFacet"
-				quidu      	"3B6C359403D2"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B6D23BA01CE"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$126"
-			quid       	"3B6D597102EA"
-			roles      	(list role_list
-			    (object Role "simpleTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6D59750105"
-				label      	"simpleTypeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$127"
-				attributes 	(list Attribute_Set)
-				quid       	"3B6D59750119"
-				supplier   	"Logical View::xsd::XSDFacet"
-				quidu      	"3B6C359403D2")))
-		    (object Association "$UNNAMED$128"
-			quid       	"3B69B653017A"
-			roles      	(list role_list
-			    (object Role "scope"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3B69B654006D"
-				label      	"scope"
-				supplier   	"Logical View::xsd::XSDScope"
-				quidu      	"3B69B54000F2"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$129"
-				attributes 	(list Attribute_Set)
-				quid       	"3B69B654006E"
-				supplier   	"Logical View::xsd::XSDFeature"
-				quidu      	"3B69B537026C")))
-		    (object Association "$UNNAMED$130"
-			quid       	"3C29010602D7"
-			roles      	(list role_list
-			    (object Role "resolvedFeature"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C29010B000E"
-				label      	"resolvedFeature"
-				supplier   	"Logical View::xsd::XSDFeature"
-				quidu      	"3B69B537026C"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$131"
-				attributes 	(list Attribute_Set)
-				quid       	"3C29010B0018"
-				supplier   	"Logical View::xsd::XSDFeature"
-				quidu      	"3B69B537026C")))
-		    (object Association "$UNNAMED$132"
-			quid       	"3B69DB0D0183"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$133"
-				quid       	"3B69DB0D033C"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB0D0346"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$134"
-			quid       	"3B69D29E014D"
-			roles      	(list role_list
-			    (object Role "referencedKey"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B69D2A80165"
-				label      	"referencedKey"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$135"
-				attributes 	(list Attribute_Set)
-				quid       	"3B69D2A8016F"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2")))
-		    (object Association "$UNNAMED$136"
-			quid       	"3B6D8D3D003E"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$137"
-				quid       	"3B6D8D3E022A"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2"
-				is_aggregate 	TRUE)
-			    (object Role "selector"
-				quid       	"3B6D8D3E0234"
-				label      	"selector"
-				supplier   	"Logical View::xsd::XSDXPathDefinition"
-				quidu      	"3B6D83BB0355"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$138"
-			quid       	"3B6D8D330025"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$139"
-				quid       	"3B6D8D330365"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2"
-				is_aggregate 	TRUE)
-			    (object Role "fields"
-				quid       	"3B6D8D330379"
-				label      	"fields"
-				supplier   	"Logical View::xsd::XSDXPathDefinition"
-				quidu      	"3B6D83BB0355"
-				client_cardinality 	(value cardinality "1..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$140"
-			quid       	"3B6ADCD802FC"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$141"
-				quid       	"3B6ADCD9018B"
-				supplier   	"Logical View::xsd::XSDImport"
-				quidu      	"3B688C93017F"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B6ADCD9018C"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$142"
-			quid       	"3B6ADCC5007E"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$143"
-				quid       	"3B6ADCC6006B"
-				supplier   	"Logical View::xsd::XSDInclude"
-				quidu      	"3B688C7D0250"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B6ADCC6006C"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$144"
-			quid       	"3B69DB1702C8"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$145"
-				quid       	"3B69DB1803E2"
-				supplier   	"Logical View::xsd::XSDModelGroup"
-				quidu      	"3B6834E00291"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB190004"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$146"
-			quid       	"3B6BCEB102F8"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$147"
-				quid       	"3B6BCEB6001B"
-				supplier   	"Logical View::xsd::XSDModelGroup"
-				quidu      	"3B6834E00291"
-				is_aggregate 	TRUE)
-			    (object Role "contents"
-				quid       	"3B6BCEB60025"
-				label      	"contents"
-				supplier   	"Logical View::xsd::XSDParticle"
-				quidu      	"3B682BBD01F7"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$148"
-			quid       	"3B683606026F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$149"
-				quid       	"3B6836070221"
-				supplier   	"Logical View::xsd::XSDModelGroup"
-				quidu      	"3B6834E00291"
-				is_aggregate 	TRUE)
-			    (object Role "particles"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6836070222"
-				label      	"particles"
-				supplier   	"Logical View::xsd::XSDParticle"
-				quidu      	"3B682BBD01F7"
-				client_cardinality 	(value cardinality "1..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$150"
-			quid       	"3B69DB15008A"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$151"
-				quid       	"3B69DB160096"
-				supplier   	"Logical View::xsd::XSDModelGroupDefinition"
-				quidu      	"3B66ED9A0205"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB1600A0"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$152"
-			quid       	"3B6837AC025A"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$153"
-				quid       	"3B6837AD0338"
-				supplier   	"Logical View::xsd::XSDModelGroupDefinition"
-				quidu      	"3B66ED9A0205"
-				is_aggregate 	TRUE)
-			    (object Role "modelGroup"
-				quid       	"3B6837AD0339"
-				label      	"modelGroup"
-				supplier   	"Logical View::xsd::XSDModelGroup"
-				quidu      	"3B6834E00291"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$154"
-			quid       	"3B6B42450398"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$155"
-				quid       	"3B6B4249038A"
-				supplier   	"Logical View::xsd::XSDModelGroupDefinition"
-				quidu      	"3B66ED9A0205"
-				is_aggregate 	TRUE)
-			    (object Role "resolvedModelGroupDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6B4249039E"
-				label      	"resolvedModelGroupDefinition"
-				supplier   	"Logical View::xsd::XSDModelGroupDefinition"
-				quidu      	"3B66ED9A0205"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$156"
-			quid       	"3B69DB0F0212"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$157"
-				quid       	"3B69DB1000C9"
-				supplier   	"Logical View::xsd::XSDNotationDeclaration"
-				quidu      	"3B66EDAA021C"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB1000D3"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$158"
-			quid       	"3B6B47150119"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$159"
-				quid       	"3B6B471A03AB"
-				supplier   	"Logical View::xsd::XSDParticle"
-				quidu      	"3B682BBD01F7"
-				is_aggregate 	TRUE)
-			    (object Role "content"
-				quid       	"3B6B471A03B5"
-				label      	"content"
-				supplier   	"Logical View::xsd::XSDParticleContent"
-				quidu      	"3B6BD22300C6"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$160"
-			quid       	"3B683C890122"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$161"
-				quid       	"3B683C8A0110"
-				supplier   	"Logical View::xsd::XSDParticle"
-				quidu      	"3B682BBD01F7"
-				is_aggregate 	TRUE)
-			    (object Role "term"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B683C8A0111"
-				label      	"term"
-				supplier   	"Logical View::xsd::XSDTerm"
-				quidu      	"3B683C5E0174"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$162"
-			quid       	"3B6ADE42009A"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$163"
-				quid       	"3B6ADE4302FE"
-				supplier   	"Logical View::xsd::XSDRedefine"
-				quidu      	"3B688C9B02AD"
-				is_aggregate 	TRUE)
-			    (object Role "annotations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6ADE430308"
-				label      	"annotations"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$164"
-			quid       	"3B6AE8240051"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$165"
-				quid       	"3B6AE82602AD"
-				supplier   	"Logical View::xsd::XSDRedefine"
-				quidu      	"3B688C9B02AD"
-				is_aggregate 	TRUE)
-			    (object Role "contents"
-				quid       	"3B6AE82602B7"
-				label      	"contents"
-				supplier   	"Logical View::xsd::XSDRedefineContent"
-				quidu      	"3B6AE2060172"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$166"
-			quid       	"3B688E6B003D"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$167"
-				quid       	"3B688E6C0107"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "contents"
-				quid       	"3B688E6C0111"
-				label      	"contents"
-				supplier   	"Logical View::xsd::XSDSchemaContent"
-				quidu      	"3B688CB800BA"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$168"
-			quid       	"3B66EE8D01BF"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$169"
-				quid       	"3B66EE8E0198"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "elementDeclarations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B66EE8E0199"
-				label      	"elementDeclarations"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$170"
-			quid       	"3B66FDFA00C3"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$171"
-				quid       	"3B66FDFB027D"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "attributeDeclarations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B66FDFB027E"
-				label      	"attributeDeclarations"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$172"
-			quid       	"3B66EE920216"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$173"
-				quid       	"3B66EE93018B"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "attributeGroupDefinitions"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B66EE93018C"
-				label      	"attributeGroupDefinitions"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$174"
-			quid       	"3B66EE760049"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$175"
-				quid       	"3B66EE760374"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "typeDefinitions"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B66EE76037E"
-				label      	"typeDefinitions"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$176"
-			quid       	"3B66EEFF024F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$177"
-				quid       	"3B66EF00025A"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "modelGroupDefinitions"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B66EF000264"
-				label      	"modelGroupDefinitions"
-				supplier   	"Logical View::xsd::XSDModelGroupDefinition"
-				quidu      	"3B66ED9A0205"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$178"
-			quid       	"3BFC2A1701ED"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$179"
-				quid       	"3BFC2A1A0273"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "identityConstraintDefinitions"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3BFC2A1A027D"
-				label      	"identityConstraintDefinitions"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$180"
-			quid       	"3B66EEA7023E"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$181"
-				quid       	"3B66EEA8038A"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "notationDeclarations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B66EEA8038B"
-				label      	"notationDeclarations"
-				supplier   	"Logical View::xsd::XSDNotationDeclaration"
-				quidu      	"3B66EDAA021C"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$182"
-			quid       	"3B69E4560290"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$183"
-				quid       	"3B69E4570165"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "annotations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B69E457016F"
-				label      	"annotations"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$184"
-			quid       	"3B6D5CA50112"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$185"
-				quid       	"3B6D5CA703B4"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "contents"
-				quid       	"3B6D5CA703C8"
-				label      	"contents"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$186"
-			quid       	"3B6C35AD0374"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$187"
-				quid       	"3B6C35AF0006"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "facetContents"
-				quid       	"3B6C35AF0010"
-				label      	"facetContents"
-				supplier   	"Logical View::xsd::XSDConstrainingFacet"
-				quidu      	"3B6C6B340093"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$188"
-			quid       	"3BC8AE0203A8"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$189"
-				quid       	"3BC8AE060051"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "facets"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3BC8AE060065"
-				label      	"facets"
-				supplier   	"Logical View::xsd::XSDConstrainingFacet"
-				quidu      	"3B6C6B340093"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$190"
-			quid       	"3B6C34B70208"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$191"
-				quid       	"3B6C34BE0258"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "memberTypeDefinitions"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6C34BE0259"
-				label      	"memberTypeDefinitions"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$192"
-			quid       	"3B6C363201DB"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$193"
-				quid       	"3B6C36350059"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "fundamentalFacets"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3B6C36350063"
-				label      	"fundamentalFacets"
-				supplier   	"Logical View::xsd::XSDFundamentalFacet"
-				quidu      	"3B6C69E801D6"
-				client_cardinality 	(value cardinality "1..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$194"
-			quid       	"3B6D35AB0273"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$195"
-				quid       	"3B6D35B20291"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "baseTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6D35B202A5"
-				label      	"baseTypeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$196"
-			quid       	"3B6D5572016C"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$197"
-				quid       	"3B6D5575022F"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "primitiveTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6D55750243"
-				label      	"primitiveTypeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$198"
-			quid       	"3B69E2910158"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$199"
-				quid       	"3B69E292019F"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69E29201A9"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$200"
-			quid       	"3B9006CF0088"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$201"
-				quid       	"3B9006D1015D"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				is_aggregate 	TRUE)
-			    (object Role "derivationAnnotation"
-				quid       	"3B9006D10167"
-				label      	"derivationAnnotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$202"
-			quid       	"3B69DB330264"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$203"
-				quid       	"3B69DB340284"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				is_aggregate 	TRUE)
-			    (object Role "annotations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B69DB34028E"
-				label      	"annotations"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$204"
-			quid       	"3B69DB11026F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$205"
-				quid       	"3B69DB1201F9"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB120203"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$206"
-			quid       	"3C626EB30005"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$207"
-				quid       	"3C626EB40327"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				is_aggregate 	TRUE)
-			    (object Role "annotations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C626EB40332"
-				label      	"annotations"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$208"
-			quid       	"3BEBDC870247"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$209"
-				quid       	"3BEBDC8C02F9"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "attributeWildcardContent"
-				quid       	"3BEBDC8C0303"
-				label      	"attributeWildcardContent"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$210"
-			quid       	"3BFE622703CD"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$211"
-				attributes 	(list Attribute_Set)
-				quid       	"3BFE622B0061"
-				supplier   	"Logical View::xsd::XSDDiagnostic"
-				quidu      	"3BFE5F910046")
-			    (object Role "components"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3BFE622B006C"
-				label      	"components"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"
-				client_cardinality 	(value cardinality "1..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$212"
-			quid       	"3BFE62690165"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$213"
-				quid       	"3BFE626A0026"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"
-				is_aggregate 	TRUE)
-			    (object Role "diagnostics"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3BFE626A0027"
-				label      	"diagnostics"
-				supplier   	"Logical View::xsd::XSDDiagnostic"
-				quidu      	"3BFE5F910046"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$214"
-			quid       	"3BFE6431035F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$215"
-				quid       	"3BFE643201C6"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "allDiagnostics"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3BFE643201C7"
-				label      	"allDiagnostics"
-				supplier   	"Logical View::xsd::XSDDiagnostic"
-				quidu      	"3BFE5F910046"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$216"
-			quid       	"3C21DCC700EC"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$217"
-				quid       	"3C21DCCE0042"
-				supplier   	"Logical View::xsd::XSDSchemaDirective"
-				quidu      	"3B6AD8A202A2"
-				is_aggregate 	TRUE)
-			    (object Role "resolvedSchema"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C21DCCE0043"
-				label      	"resolvedSchema"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$218"
-			quid       	"3C21DD0C03DB"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$219"
-				quid       	"3C21DD100304"
-				supplier   	"Logical View::xsd::XSDSchemaCompositor"
-				quidu      	"3C21DB4102AE"
-				is_aggregate 	TRUE)
-			    (object Role "incorporatedSchema"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C21DD100305"
-				label      	"incorporatedSchema"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$220"
-			quid       	"3C239134004F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$221"
-				quid       	"3C23913600CA"
-				supplier   	"Logical View::xsd::XSDXPathDefinition"
-				quidu      	"3B6D83BB0355"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3C23913600D4"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$222"
-			quid       	"3C25D3A60131"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$223"
-				quid       	"3C25D3A90370"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB")
-			    (object Role "referencingDirectives"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C25D3A90371"
-				label      	"referencingDirectives"
-				supplier   	"Logical View::xsd::XSDSchemaDirective"
-				quidu      	"3B6AD8A202A2"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$224"
-			quid       	"3C25ECF0005E"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$225"
-				quid       	"3C25ECF4001E"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB")
-			    (object Role "rootVersion"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C25ECF40028"
-				label      	"rootVersion"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$226"
-			quid       	"3C25ED0B011B"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$227"
-				quid       	"3C25ED0F0121"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB")
-			    (object Role "originalVersion"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C25ED0F012B"
-				label      	"originalVersion"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$228"
-			quid       	"3C25EEAB001F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$229"
-				quid       	"3C25EEAF010B"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "incorporatedVersions"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C25EEAF0115"
-				label      	"incorporatedVersions"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$230"
-			quid       	"3C276DA000DE"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$231"
-				quid       	"3C276DA000DF"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "itemTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C276DA000E0"
-				label      	"itemTypeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$232"
-			quid       	"3C2784730194"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$233"
-				quid       	"3C27847501F1"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB")
-			    (object Role "schemaForSchema"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C27847501FB"
-				label      	"schemaForSchema"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$234"
-			quid       	"3C2880F503D9"
-			roles      	(list role_list
-			    (object Role "rootTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C2880F9003C"
-				label      	"rootTypeDefinition"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$235"
-				attributes 	(list Attribute_Set)
-				quid       	"3C2880F90046"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A")))
-		    (object Association "$UNNAMED$236"
-			quid       	"3C2882C50137"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$237"
-				attributes 	(list Attribute_Set)
-				quid       	"3C2882C70112"
-				supplier   	"Logical View::xsd::XSDDiagnostic"
-				quidu      	"3BFE5F910046")
-			    (object Role "primaryComponent"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C2882C70113"
-				label      	"primaryComponent"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$238"
-			quid       	"3C28A0F201A4"
-			roles      	(list role_list
-			    (object Role "type"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28A0F302E5"
-				label      	"type"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$239"
-				attributes 	(list Attribute_Set)
-				quid       	"3C28A0F302F0"
-				supplier   	"Logical View::xsd::XSDFeature"
-				quidu      	"3B69B537026C")))
-		    (object Association "$UNNAMED$240"
-			quid       	"3C28A6DB01E5"
-			roles      	(list role_list
-			    (object Role "rootType"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28A6DD03DD"
-				label      	"rootType"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$241"
-				attributes 	(list Attribute_Set)
-				quid       	"3C28A6DD03DE"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9")))
-		    (object Association "$UNNAMED$242"
-			quid       	"3C28A7120108"
-			roles      	(list role_list
-			    (object Role "baseType"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28A7140151"
-				label      	"baseType"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$243"
-				attributes 	(list Attribute_Set)
-				quid       	"3C28A714015B"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9")))
-		    (object Association "$UNNAMED$244"
-			quid       	"3C28A74B0178"
-			roles      	(list role_list
-			    (object Role "simpleType"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28A74D017B"
-				label      	"simpleType"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$245"
-				attributes 	(list Attribute_Set)
-				quid       	"3C28A74D0185"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9")))
-		    (object Association "$UNNAMED$246"
-			quid       	"3C28A7ED03C0"
-			roles      	(list role_list
-			    (object Role "complexType"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28A7F40117"
-				label      	"complexType"
-				supplier   	"Logical View::xsd::XSDParticle"
-				quidu      	"3B682BBD01F7"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$247"
-				attributes 	(list Attribute_Set)
-				quid       	"3C28A7F40121"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9")))
-		    (object Association "$UNNAMED$248"
-			quid       	"3C28A994030A"
-			roles      	(list role_list
-			    (object Role "rootTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28A99700DD"
-				label      	"rootTypeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$249"
-				attributes 	(list Attribute_Set)
-				quid       	"3C28A99700E7"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D")))
-		    (object Association "$UNNAMED$250"
-			quid       	"3C28B085025B"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$251"
-				quid       	"3C28B0860270"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "minFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B086027A"
-				label      	"minFacet"
-				supplier   	"Logical View::xsd::XSDMinFacet"
-				quidu      	"3C0A1CDE037C"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$252"
-			quid       	"3C28B08D0252"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$253"
-				quid       	"3C28B08E0091"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "maxFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B08E009B"
-				label      	"maxFacet"
-				supplier   	"Logical View::xsd::XSDMaxFacet"
-				quidu      	"3C0A1CEB010E"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$254"
-			quid       	"3C28B0AB0396"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$255"
-				quid       	"3C28B0AC03C9"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "maxInclusiveFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0AC03D4"
-				label      	"maxInclusiveFacet"
-				supplier   	"Logical View::xsd::XSDMaxInclusiveFacet"
-				quidu      	"3B6C787D00DA"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$256"
-			quid       	"3C28B0AF0338"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$257"
-				quid       	"3C28B0B001F9"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "minInclusiveFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0B00203"
-				label      	"minInclusiveFacet"
-				supplier   	"Logical View::xsd::XSDMinInclusiveFacet"
-				quidu      	"3B6C788702C9"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$258"
-			quid       	"3C28B0B30207"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$259"
-				quid       	"3C28B0B40190"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "minExclusiveFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0B4019A"
-				label      	"minExclusiveFacet"
-				supplier   	"Logical View::xsd::XSDMinExclusiveFacet"
-				quidu      	"3B6C792D000A"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$260"
-			quid       	"3C28B0B6028D"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$261"
-				quid       	"3C28B0B70217"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "maxExclusiveFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0B70221"
-				label      	"maxExclusiveFacet"
-				supplier   	"Logical View::xsd::XSDMaxExclusiveFacet"
-				quidu      	"3B6C789600C2"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$262"
-			quid       	"3C28B0BC0051"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$263"
-				quid       	"3C28B0BC0246"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "lengthFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0BC0250"
-				label      	"lengthFacet"
-				supplier   	"Logical View::xsd::XSDLengthFacet"
-				quidu      	"3B6C776200E7"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$264"
-			quid       	"3C28B0BF018C"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$265"
-				quid       	"3C28B0C0006B"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "whiteSpaceFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0C00075"
-				label      	"whiteSpaceFacet"
-				supplier   	"Logical View::xsd::XSDWhiteSpaceFacet"
-				quidu      	"3B6C784601B7"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$266"
-			quid       	"3C28B0C2021D"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$267"
-				quid       	"3C28B0C300AB"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "enumerationFacets"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0C300AC"
-				label      	"enumerationFacets"
-				supplier   	"Logical View::xsd::XSDEnumerationFacet"
-				quidu      	"3B6C6ACE0141"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$268"
-			quid       	"3C28B0C50159"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$269"
-				quid       	"3C28B0C600B0"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "patternFacets"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0C600BA"
-				label      	"patternFacets"
-				supplier   	"Logical View::xsd::XSDPatternFacet"
-				quidu      	"3B6C6ADB026C"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$270"
-			quid       	"3C28B0C802A7"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$271"
-				quid       	"3C28B0C901EA"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "cardinalityFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0C901F5"
-				label      	"cardinalityFacet"
-				supplier   	"Logical View::xsd::XSDCardinalityFacet"
-				quidu      	"3B6C755D03D2"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$272"
-			quid       	"3C28B0CB039C"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$273"
-				quid       	"3C28B0CC03D0"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "numericFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0CC03D1"
-				label      	"numericFacet"
-				supplier   	"Logical View::xsd::XSDNumericFacet"
-				quidu      	"3B6C75950206"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$274"
-			quid       	"3C28B0CF0199"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$275"
-				quid       	"3C28B0D20085"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "maxLengthFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0D2008F"
-				label      	"maxLengthFacet"
-				supplier   	"Logical View::xsd::XSDMaxLengthFacet"
-				quidu      	"3B6C77C70146"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$276"
-			quid       	"3C28B0D500C5"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$277"
-				quid       	"3C28B0D6001D"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "minLengthFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0D60027"
-				label      	"minLengthFacet"
-				supplier   	"Logical View::xsd::XSDMinLengthFacet"
-				quidu      	"3B6C778C0065"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$278"
-			quid       	"3C28B0D800DE"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$279"
-				quid       	"3C28B0D803CD"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "totalDigitsFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0D803D7"
-				label      	"totalDigitsFacet"
-				supplier   	"Logical View::xsd::XSDTotalDigitsFacet"
-				quidu      	"3B6C79A0020E"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$280"
-			quid       	"3C28B0DB0377"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$281"
-				quid       	"3C28B0DC035A"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "fractionDigitsFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0DC0364"
-				label      	"fractionDigitsFacet"
-				supplier   	"Logical View::xsd::XSDFractionDigitsFacet"
-				quidu      	"3B6C79BE02EE"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$282"
-			quid       	"3C28B0DF0048"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$283"
-				quid       	"3C28B0DF03B9"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "orderedFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0DF03C3"
-				label      	"orderedFacet"
-				supplier   	"Logical View::xsd::XSDOrderedFacet"
-				quidu      	"3B6C74DD0248"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$284"
-			quid       	"3C28B0E300D9"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$285"
-				quid       	"3C28B0E4038E"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "boundedFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0E40398"
-				label      	"boundedFacet"
-				supplier   	"Logical View::xsd::XSDBoundedFacet"
-				quidu      	"3B6C751D0344"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$286"
-			quid       	"3C28B44401EC"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$287"
-				quid       	"3C28B4450360"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveMaxFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B445036A"
-				label      	"effectiveMaxFacet"
-				supplier   	"Logical View::xsd::XSDMaxFacet"
-				quidu      	"3C0A1CEB010E"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$288"
-			quid       	"3C28B54F0145"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$289"
-				quid       	"3C28B550038C"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveWhiteSpaceFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B5500396"
-				label      	"effectiveWhiteSpaceFacet"
-				supplier   	"Logical View::xsd::XSDWhiteSpaceFacet"
-				quidu      	"3B6C784601B7"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$290"
-			quid       	"3C28B5C4011C"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$291"
-				quid       	"3C28B5C5020D"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveMaxLengthFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B5C50217"
-				label      	"effectiveMaxLengthFacet"
-				supplier   	"Logical View::xsd::XSDMaxLengthFacet"
-				quidu      	"3B6C77C70146"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$292"
-			quid       	"3C28B62A00AA"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$293"
-				quid       	"3C28B62B0138"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveFractionDigitsFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B62B0142"
-				label      	"effectiveFractionDigitsFacet"
-				supplier   	"Logical View::xsd::XSDFractionDigitsFacet"
-				quidu      	"3B6C79BE02EE"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$294"
-			quid       	"3C28B6B003A6"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$295"
-				quid       	"3C28B6B10311"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectivePatternFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B6B10312"
-				label      	"effectivePatternFacet"
-				supplier   	"Logical View::xsd::XSDPatternFacet"
-				quidu      	"3B6C6ADB026C"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$296"
-			quid       	"3C28B7CA026B"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$297"
-				quid       	"3C28B7CB0186"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveEnumerationFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B7CB0190"
-				label      	"effectiveEnumerationFacet"
-				supplier   	"Logical View::xsd::XSDEnumerationFacet"
-				quidu      	"3B6C6ACE0141"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$298"
-			quid       	"3C28B8400062"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$299"
-				quid       	"3C28B841001D"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveTotalDigitsFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B8410027"
-				label      	"effectiveTotalDigitsFacet"
-				supplier   	"Logical View::xsd::XSDTotalDigitsFacet"
-				quidu      	"3B6C79A0020E"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$300"
-			quid       	"3C28B898016D"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$301"
-				quid       	"3C28B8990056"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveMinLengthFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B8990060"
-				label      	"effectiveMinLengthFacet"
-				supplier   	"Logical View::xsd::XSDMinLengthFacet"
-				quidu      	"3B6C778C0065"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$302"
-			quid       	"3C28B8DC0052"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$303"
-				quid       	"3C28B8DC03B9"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveLengthFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B8DC03C3"
-				label      	"effectiveLengthFacet"
-				supplier   	"Logical View::xsd::XSDLengthFacet"
-				quidu      	"3B6C776200E7"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$304"
-			quid       	"3C28B97001DB"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$305"
-				quid       	"3C28B97100CF"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveMinFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B97100D9"
-				label      	"effectiveMinFacet"
-				supplier   	"Logical View::xsd::XSDMinFacet"
-				quidu      	"3C0A1CDE037C"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$306"
-			quid       	"3D4BB4AE01CC"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$307"
-				quid       	"3D4BB4AF010F"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "syntheticFacets"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3D4BB4AF011A"
-				label      	"syntheticFacets"
-				supplier   	"Logical View::xsd::XSDFacet"
-				quidu      	"3B6C359403D2"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$308"
-			quid       	"3D4BB4D3028E"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$309"
-				quid       	"3D4BB4D402F3"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "syntheticParticle"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3D4BB4D402FD"
-				label      	"syntheticParticle"
-				supplier   	"Logical View::xsd::XSDParticle"
-				quidu      	"3B682BBD01F7"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$310"
-			quid       	"3D4BB4D901F6"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$311"
-				quid       	"3D4BB4DA0284"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "syntheticWildcard"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3D4BB4DA028E"
-				label      	"syntheticWildcard"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$312"
-			quid       	"3D4C68FF01BF"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$313"
-				quid       	"3D4C69020317"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "syntheticWildcard"
-				quid       	"3D4C69020318"
-				label      	"syntheticWildcard"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE))))
-		logical_presentations 	(list unit_reference_list
-		    (object ClassDiagram "1. Component Hierarchy (Part 1: Structures)"
-			quid       	"3B6847680138"
-			title      	"1. Component Hierarchy (Part 1: Structures)"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDComponent" @387
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(928, 80)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@387
-				    location   	(766, 37)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846E90029"
-				width      	342
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDNamedComponent" @388
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1168, 560)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@388
-				    location   	(940, 517)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	456
-				    justify    	0
-				    label      	"XSDNamedComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846D303A4"
-				width      	474
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @389
-				location   	(928, 225)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@387
-				vertices   	(list Points
-				    (928, 225)
-				    (928, 135)))
-			    (object ClassView "Class" "Logical View::xsd::XSDTerm" @390
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1568, 320)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@390
-				    location   	(1460, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	216
-				    justify    	0
-				    label      	"XSDTerm")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683C5E0174"
-				width      	234
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @391
-				location   	(1203, 706)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@388
-				vertices   	(list Points
-				    (1203, 706)
-				    (1203, 615)))
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeContent" @392
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(624, 560)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@392
-				    location   	(372, 517)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	504
-				    justify    	0
-				    label      	"XSDComplexTypeContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683BA00196"
-				width      	522
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @393
-				location   	(444, 709)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@392
-				vertices   	(list Points
-				    (444, 709)
-				    (444, 615)))
-			    (object InheritTreeView "" @394
-				location   	(1572, 465)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@390
-				vertices   	(list Points
-				    (1572, 465)
-				    (1572, 375)))
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @395
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(416, 800)
-				label      	(object ItemLabel
-				    Parent_View 	@395
-				    location   	(290, 757)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	252
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	270
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @396
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(448, 1056)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@396
-				    location   	(262, 1013)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	372
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	390
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUse" @397
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1104, 320)
-				label      	(object ItemLabel
-				    Parent_View 	@397
-				    location   	(936, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	336
-				    justify    	0
-				    label      	"XSDAttributeUse")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B68354601A8"
-				width      	354
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @398
-				location   	(453, 1203)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@396
-				vertices   	(list Points
-				    (453, 1203)
-				    (453, 1111)))
-			    (object ClassView "Class" "Logical View::xsd::XSDScope" @399
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(176, 320)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@399
-				    location   	(62, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	228
-				    justify    	0
-				    label      	"XSDScope")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B54000F2"
-				width      	246
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDFeature" @400
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1872, 800)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@400
-				    location   	(1746, 757)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	252
-				    justify    	0
-				    label      	"XSDFeature")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B537026C"
-				width      	270
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @401
-				location   	(1872, 950)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@400
-				vertices   	(list Points
-				    (1872, 950)
-				    (1872, 855)))
-			    (object InheritTreeView "" @402
-				location   	(181, 465)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@399
-				vertices   	(list Points
-				    (181, 465)
-				    (181, 375)))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @403
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1936, 1280)
-				label      	(object ItemLabel
-				    Parent_View 	@403
-				    location   	(1670, 1233)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	532
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	550
-				height     	118
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @404
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1968, 1056)
-				label      	(object ItemLabel
-				    Parent_View 	@404
-				    location   	(1734, 1013)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				width      	486
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDIdentityConstraintDefinition" @405
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1888, 1488)
-				label      	(object ItemLabel
-				    Parent_View 	@405
-				    location   	(1569, 1444)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	638
-				    justify    	0
-				    label      	"XSDIdentityConstraintDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B2603A2"
-				width      	656
-				height     	112
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDNotationDeclaration" @406
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1184, 1488)
-				label      	(object ItemLabel
-				    Parent_View 	@406
-				    location   	(903, 1444)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	563
-				    justify    	0
-				    label      	"XSDNotationDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDAA021C"
-				width      	581
-				height     	112
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @407
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1600, 560)
-				label      	(object ItemLabel
-				    Parent_View 	@407
-				    location   	(1462, 517)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	276
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				width      	294
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @408
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1024, 1056)
-				label      	(object ItemLabel
-				    Parent_View 	@408
-				    location   	(778, 1013)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	492
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				width      	510
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroup" @409
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1968, 560)
-				label      	(object ItemLabel
-				    Parent_View 	@409
-				    location   	(1806, 517)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDModelGroup")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6834E00291"
-				width      	342
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @410
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(352, 1296)
-				label      	(object ItemLabel
-				    Parent_View 	@410
-				    location   	(106, 1253)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	492
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				width      	510
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @411
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(192, 560)
-				label      	(object ItemLabel
-				    Parent_View 	@411
-				    location   	(60, 517)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	264
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	282
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @412
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1072, 1280)
-				label      	(object ItemLabel
-				    Parent_View 	@412
-				    location   	(802, 1237)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	540
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	558
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @413
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(368, 1488)
-				label      	(object ItemLabel
-				    Parent_View 	@413
-				    location   	(30, 1441)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	676
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				width      	694
-				height     	119
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAnnotation" @414
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(576, 320)
-				label      	(object ItemLabel
-				    Parent_View 	@414
-				    location   	(426, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	300
-				    justify    	0
-				    label      	"XSDAnnotation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDC80233"
-				width      	318
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDXPathDefinition" @415
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2000, 320)
-				label      	(object ItemLabel
-				    Parent_View 	@415
-				    location   	(1808, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	384
-				    justify    	0
-				    label      	"XSDXPathDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6D83BB0355"
-				width      	402
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @416
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B72D7BB0349"
-				client     	@397
-				supplier   	@387
-				line_style 	3
-				origin_attachment 	(1094, 265)
-				terminal_attachment 	(1094, 225)
-				drawSupplier 	@389)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefinableComponent" @417
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(960, 800)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@417
-				    location   	(690, 757)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	540
-				    justify    	0
-				    label      	"XSDRedefinableComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B7FCA8B020B"
-				width      	558
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @418
-				location   	(962, 947)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@417
-				vertices   	(list Points
-				    (962, 947)
-				    (962, 855)))
-			    (object InheritView "" @419
-				stereotype 	(object SegLabel @420
-				    Parent_View 	@419
-				    location   	(218, 1154)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	212
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.163534
-				    height     	69
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B685F55032B"
-				client     	@410
-				supplier   	@392
-				line_style 	3
-				origin_attachment 	(149, 1241)
-				terminal_attachment 	(149, 709)
-				drawSupplier 	@393)
-			    (object InheritView "" @421
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A1302A2"
-				client     	@410
-				supplier   	@396
-				line_style 	3
-				origin_attachment 	(256, 1241)
-				terminal_attachment 	(256, 1203)
-				drawSupplier 	@398)
-			    (object InheritView "" @422
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCC4A0182"
-				client     	@411
-				supplier   	@399
-				line_style 	3
-				origin_attachment 	(284, 505)
-				terminal_attachment 	(284, 465)
-				drawSupplier 	@402)
-			    (object InheritView "" @423
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A640279"
-				client     	@409
-				supplier   	@390
-				line_style 	3
-				origin_attachment 	(2002, 505)
-				terminal_attachment 	(2002, 465)
-				drawSupplier 	@394)
-			    (object InheritView "" @424
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6848AA01D3"
-				client     	@390
-				supplier   	@387
-				line_style 	3
-				origin_attachment 	(1569, 265)
-				terminal_attachment 	(1569, 225)
-				drawSupplier 	@389)
-			    (object InheritView "" @425
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A3A0041"
-				client     	@407
-				supplier   	@390
-				line_style 	3
-				origin_attachment 	(1490, 505)
-				terminal_attachment 	(1490, 465)
-				drawSupplier 	@394)
-			    (object InheritView "" @426
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6848FC01E7"
-				client     	@395
-				supplier   	@392
-				line_style 	3
-				origin_attachment 	(510, 745)
-				terminal_attachment 	(510, 709)
-				drawSupplier 	@393)
-			    (object InheritView "" @427
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAC800D2"
-				client     	@412
-				supplier   	@417
-				line_style 	3
-				origin_attachment 	(1321, 1225)
-				terminal_attachment 	(1321, 947)
-				drawSupplier 	@418)
-			    (object InheritView "" @428
-				stereotype 	(object SegLabel @429
-				    Parent_View 	@428
-				    location   	(2137, 886)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	238
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.215812
-				    height     	64
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B685F17002E"
-				client     	@404
-				supplier   	@390
-				line_style 	3
-				origin_attachment 	(2200, 1001)
-				terminal_attachment 	(2200, 465)
-				drawSupplier 	@394)
-			    (object InheritView "" @430
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69EDEE01BF"
-				client     	@404
-				supplier   	@400
-				line_style 	3
-				origin_attachment 	(2093, 1001)
-				terminal_attachment 	(2093, 950)
-				drawSupplier 	@401)
-			    (object InheritView "" @431
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAB1004D"
-				client     	@396
-				supplier   	@417
-				line_style 	3
-				origin_attachment 	(450, 1001)
-				terminal_attachment 	(450, 947)
-				drawSupplier 	@418)
-			    (object InheritView "" @432
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCD640231"
-				client     	@399
-				supplier   	@387
-				line_style 	3
-				origin_attachment 	(147, 265)
-				terminal_attachment 	(147, 225)
-				drawSupplier 	@389)
-			    (object InheritView "" @433
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D84F70092"
-				client     	@415
-				supplier   	@387
-				line_style 	3
-				origin_attachment 	(2012, 265)
-				terminal_attachment 	(2012, 225)
-				drawSupplier 	@389)
-			    (object InheritView "" @434
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6848B80286"
-				client     	@392
-				supplier   	@387
-				line_style 	3
-				origin_attachment 	(834, 505)
-				terminal_attachment 	(834, 225)
-				drawSupplier 	@389)
-			    (object InheritView "" @435
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0CEA20197"
-				client     	@388
-				supplier   	@387
-				line_style 	3
-				origin_attachment 	(1350, 505)
-				terminal_attachment 	(1350, 225)
-				drawSupplier 	@389)
-			    (object InheritView "" @436
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69E1770116"
-				client     	@414
-				supplier   	@387
-				line_style 	3
-				origin_attachment 	(572, 265)
-				terminal_attachment 	(572, 225)
-				drawSupplier 	@389)
-			    (object InheritView "" @437
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69B7DC0193"
-				client     	@403
-				supplier   	@400
-				line_style 	3
-				origin_attachment 	(1693, 1221)
-				terminal_attachment 	(1693, 950)
-				drawSupplier 	@401)
-			    (object InheritView "" @438
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684AA30242"
-				client     	@405
-				supplier   	@388
-				line_style 	3
-				origin_attachment 	(1590, 1432)
-				terminal_attachment 	(1590, 706)
-				drawSupplier 	@391)
-			    (object InheritView "" @439
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B68494302F1"
-				client     	@406
-				supplier   	@388
-				line_style 	3
-				origin_attachment 	(1431, 1432)
-				terminal_attachment 	(1431, 706)
-				drawSupplier 	@391)
-			    (object InheritView "" @440
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A26036D"
-				client     	@417
-				supplier   	@388
-				line_style 	3
-				origin_attachment 	(959, 745)
-				terminal_attachment 	(959, 706)
-				drawSupplier 	@391)
-			    (object InheritView "" @441
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A2C0307"
-				client     	@400
-				supplier   	@388
-				line_style 	3
-				origin_attachment 	(1872, 745)
-				terminal_attachment 	(1872, 706)
-				drawSupplier 	@391)
-			    (object InheritView "" @442
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAC40090"
-				client     	@408
-				supplier   	@417
-				line_style 	3
-				origin_attachment 	(962, 1001)
-				terminal_attachment 	(962, 947)
-				drawSupplier 	@418)
-			    (object InheritView "" @443
-				stereotype 	(object SegLabel @444
-				    Parent_View 	@443
-				    location   	(95, 1388)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	187
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.042531
-				    height     	67
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B69BAA20310"
-				client     	@413
-				supplier   	@399
-				line_style 	3
-				origin_attachment 	(28, 1429)
-				terminal_attachment 	(28, 465)
-				drawSupplier 	@402)
-			    (object InheritView "" @445
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0D01901F1"
-				client     	@413
-				supplier   	@396
-				line_style 	3
-				origin_attachment 	(656, 1429)
-				terminal_attachment 	(656, 1203)
-				drawSupplier 	@398)))
-		    (object ClassDiagram "2. Component Relations (Part 1 : Structures)"
-			quid       	"374B18190028"
-			title      	"2. Component Relations (Part 1 : Structures)"
-			zoom       	96
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDScope" @446
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(784, 1632)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@446
-				    location   	(670, 1591)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	228
-				    justify    	0
-				    label      	"XSDScope")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B54000F2"
-				width      	246
-				height     	107
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDFeature" @447
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(192, 1632)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@447
-				    location   	(66, 1591)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	252
-				    justify    	0
-				    label      	"XSDFeature")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B537026C"
-				width      	270
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$128" @448
-				location   	(494, 1627)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69B653017A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "scope" @449
-					Parent_View 	@448
-					location   	(286, -485)
-					label      	(object SegLabel @450
-					    Parent_View 	@449
-					    location   	(555, 1589)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	132
-					    justify    	0
-					    label      	"+scope"
-					    pctDist    	0.371257
-					    height     	39
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69B654006D"
-					client     	@448
-					supplier   	@446
-					line_style 	3
-					origin_attachment 	(494, 1627)
-					terminal_attachment 	(661, 1627)
-					label      	(object SegLabel @451
-					    Parent_View 	@449
-					    location   	(576, 1664)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.491018
-					    height     	37
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$129" @452
-					Parent_View 	@448
-					location   	(286, -485)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69B654006E"
-					client     	@448
-					supplier   	@447
-					line_style 	3
-					origin_attachment 	(494, 1627)
-					terminal_attachment 	(327, 1627))))
-			    (object ClassView "Class" "Logical View::xsd::XSDTerm" @453
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2192, 1232)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@453
-				    location   	(2084, 1191)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	216
-				    justify    	0
-				    label      	"XSDTerm")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683C5E0174"
-				width      	234
-				height     	107
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @454
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2176, 992)
-				label      	(object ItemLabel
-				    Parent_View 	@454
-				    location   	(2051, 951)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	250
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	268
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$160" @455
-				location   	(2229, 1112)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B683C890122"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$161" @456
-					Parent_View 	@455
-					location   	(549, -248)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B683C8A0110"
-					client     	@455
-					supplier   	@454
-					line_style 	3
-					origin_attachment 	(2229, 1112)
-					terminal_attachment 	(2229, 1045))
-				    (object RoleView "term" @457
-					Parent_View 	@455
-					location   	(549, -248)
-					label      	(object SegLabel @458
-					    Parent_View 	@457
-					    location   	(2157, 1121)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	108
-					    justify    	0
-					    label      	"+term"
-					    pctDist    	0.134328
-					    height     	72
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B683C8A0111"
-					client     	@455
-					supplier   	@453
-					line_style 	3
-					origin_attachment 	(2229, 1112)
-					terminal_attachment 	(2229, 1179)
-					label      	(object SegLabel @459
-					    Parent_View 	@457
-					    location   	(2274, 1119)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.119403
-					    height     	45
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeContent" @460
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1328, 1232)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@460
-				    location   	(1076, 1191)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	504
-				    justify    	0
-				    label      	"XSDComplexTypeContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683BA00196"
-				width      	522
-				height     	107
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroup" @461
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2144, 768)
-				label      	(object ItemLabel
-				    Parent_View 	@461
-				    location   	(1977, 727)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	334
-				    justify    	0
-				    label      	"XSDModelGroup")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6834E00291"
-				width      	352
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$148" @462
-				location   	(2219, 880)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B683606026F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$149" @463
-					Parent_View 	@462
-					location   	(-357, -240)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6836070221"
-					client     	@462
-					supplier   	@461
-					line_style 	3
-					origin_attachment 	(2219, 880)
-					terminal_attachment 	(2219, 821))
-				    (object RoleView "particles" @464
-					Parent_View 	@462
-					location   	(-357, -240)
-					label      	(object SegLabel @465
-					    Parent_View 	@464
-					    location   	(2105, 888)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+particles"
-					    pctDist    	0.156627
-					    height     	115
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6836070222"
-					client     	@462
-					supplier   	@454
-					line_style 	3
-					origin_attachment 	(2219, 880)
-					terminal_attachment 	(2219, 939)
-					label      	(object SegLabel @466
-					    Parent_View 	@464
-					    location   	(2281, 888)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"1..*"
-					    pctDist    	0.156627
-					    height     	62
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @467
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1776, 992)
-				label      	(object ItemLabel
-				    Parent_View 	@467
-				    location   	(1639, 951)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	274
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				width      	292
-				height     	107
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUse" @468
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1072, 1424)
-				label      	(object ItemLabel
-				    Parent_View 	@468
-				    location   	(905, 1383)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	334
-				    justify    	0
-				    label      	"XSDAttributeUse")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B68354601A8"
-				width      	352
-				height     	107
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @469
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(432, 992)
-				label      	(object ItemLabel
-				    Parent_View 	@469
-				    location   	(187, 951)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	490
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				width      	508
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$194" @470
-				location   	(590, 1140)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D35AB0273"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$195" @471
-					Parent_View 	@470
-					location   	(302, 148)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D35B20291"
-					client     	@470
-					supplier   	@469
-					vertices   	(list Points
-					    (590, 1140)
-					    (540, 1140)
-					    (540, 1045))
-					line_style 	3
-					origin_attachment 	(590, 1140)
-					terminal_attachment 	(540, 1045))
-				    (object RoleView "baseTypeDefinition" @472
-					Parent_View 	@470
-					location   	(302, 148)
-					label      	(object SegLabel @473
-					    Parent_View 	@472
-					    location   	(643, 1171)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+baseTypeDefinition"
-					    pctDist    	1.053571
-					    height     	31
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D35B202A5"
-					client     	@470
-					supplier   	@469
-					vertices   	(list Points
-					    (590, 1140)
-					    (641, 1140)
-					    (641, 1045))
-					line_style 	3
-					origin_attachment 	(590, 1140)
-					terminal_attachment 	(641, 1045)
-					label      	(object SegLabel @474
-					    Parent_View 	@472
-					    location   	(584, 1097)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.122449
-					    height     	44
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @475
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1008, 992)
-				label      	(object ItemLabel
-				    Parent_View 	@475
-				    location   	(745, 951)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	526
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				width      	544
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$96" @476
-				location   	(1119, 1112)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6837DF024F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$97" @477
-					Parent_View 	@476
-					location   	(-1569, -8)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6837E100FD"
-					client     	@476
-					supplier   	@475
-					line_style 	3
-					origin_attachment 	(1119, 1112)
-					terminal_attachment 	(1119, 1045))
-				    (object RoleView "contentType" @478
-					Parent_View 	@476
-					location   	(-1569, -8)
-					label      	(object SegLabel @479
-					    Parent_View 	@478
-					    location   	(1259, 1126)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	252
-					    justify    	0
-					    label      	"+contentType"
-					    pctDist    	0.208955
-					    height     	140
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6837E100FE"
-					client     	@476
-					supplier   	@460
-					line_style 	3
-					origin_attachment 	(1119, 1112)
-					terminal_attachment 	(1119, 1179)
-					label      	(object SegLabel @480
-					    Parent_View 	@478
-					    location   	(1063, 1126)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.208955
-					    height     	57
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$102" @481
-				location   	(1455, 982)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6851BA0126"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$103" @482
-					Parent_View 	@481
-					location   	(159, -570)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6851BB0150"
-					client     	@481
-					supplier   	@475
-					line_style 	3
-					origin_attachment 	(1455, 982)
-					terminal_attachment 	(1280, 982))
-				    (object RoleView "attributeWildcard" @483
-					Parent_View 	@481
-					location   	(159, -570)
-					label      	(object SegLabel @484
-					    Parent_View 	@483
-					    location   	(1445, 929)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+attributeWildcard"
-					    pctDist    	-0.062857
-					    height     	54
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6851BB0151"
-					client     	@481
-					supplier   	@467
-					line_style 	3
-					origin_attachment 	(1455, 982)
-					terminal_attachment 	(1630, 982)
-					label      	(object SegLabel @485
-					    Parent_View 	@483
-					    location   	(1550, 1022)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.542857
-					    height     	40
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$98" @486
-				location   	(921, 1208)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B683959006E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$99" @487
-					Parent_View 	@486
-					location   	(-871, -376)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6839590349"
-					client     	@486
-					supplier   	@475
-					line_style 	3
-					origin_attachment 	(921, 1208)
-					terminal_attachment 	(921, 1045))
-				    (object RoleView "attributeUses" @488
-					Parent_View 	@486
-					location   	(-871, -376)
-					label      	(object SegLabel @489
-					    Parent_View 	@488
-					    location   	(778, 1251)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	264
-					    justify    	0
-					    label      	"+attributeUses"
-					    pctDist    	0.269939
-					    height     	144
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B683959034A"
-					client     	@486
-					supplier   	@468
-					line_style 	3
-					origin_attachment 	(921, 1208)
-					terminal_attachment 	(921, 1371)
-					label      	(object SegLabel @490
-					    Parent_View 	@488
-					    location   	(979, 1254)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.288344
-					    height     	58
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDXPathDefinition" @491
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1312, 768)
-				label      	(object ItemLabel
-				    Parent_View 	@491
-				    location   	(1122, 727)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	380
-				    justify    	0
-				    label      	"XSDXPathDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6D83BB0355"
-				width      	398
-				height     	107
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDNotationDeclaration" @492
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1856, 1632)
-				label      	(object ItemLabel
-				    Parent_View 	@492
-				    location   	(1623, 1591)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	466
-				    justify    	0
-				    label      	"XSDNotationDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDAA021C"
-				width      	484
-				height     	107
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @493
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2048, 448)
-				label      	(object ItemLabel
-				    Parent_View 	@493
-				    location   	(1803, 407)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	490
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				width      	508
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$152" @494
-				location   	(2216, 608)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6837AC025A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$153" @495
-					Parent_View 	@494
-					location   	(-552, -816)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6837AD0338"
-					client     	@494
-					supplier   	@493
-					line_style 	3
-					origin_attachment 	(2216, 608)
-					terminal_attachment 	(2216, 501))
-				    (object RoleView "modelGroup" @496
-					Parent_View 	@494
-					location   	(-552, -816)
-					label      	(object SegLabel @497
-					    Parent_View 	@496
-					    location   	(2080, 628)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	252
-					    justify    	0
-					    label      	"+modelGroup"
-					    pctDist    	0.182609
-					    height     	137
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6837AD0339"
-					client     	@494
-					supplier   	@461
-					line_style 	3
-					origin_attachment 	(2216, 608)
-					terminal_attachment 	(2216, 715)
-					label      	(object SegLabel @498
-					    Parent_View 	@496
-					    location   	(2256, 633)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.233645
-					    height     	40
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @499
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1888, 1424)
-				label      	(object ItemLabel
-				    Parent_View 	@499
-				    location   	(1619, 1383)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	538
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	556
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$82" @500
-				location   	(1676, 1208)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6887BF0150"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$83" @501
-					Parent_View 	@500
-					location   	(412, -344)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6887C000A7"
-					client     	@500
-					supplier   	@499
-					line_style 	3
-					origin_attachment 	(1676, 1208)
-					terminal_attachment 	(1676, 1371))
-				    (object RoleView "attributeWildcard" @502
-					Parent_View 	@500
-					location   	(412, -344)
-					label      	(object SegLabel @503
-					    Parent_View 	@502
-					    location   	(1857, 1106)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+attributeWildcard"
-					    pctDist    	0.625767
-					    height     	181
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6887C000A8"
-					client     	@500
-					supplier   	@467
-					line_style 	3
-					origin_attachment 	(1676, 1208)
-					terminal_attachment 	(1676, 1045)
-					label      	(object SegLabel @504
-					    Parent_View 	@502
-					    location   	(1618, 1108)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.619632
-					    height     	59
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$78" @505
-				location   	(1429, 1438)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B68359F0086"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$79" @506
-					Parent_View 	@505
-					location   	(-363, -146)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6835A00069"
-					client     	@505
-					supplier   	@499
-					line_style 	3
-					origin_attachment 	(1429, 1438)
-					terminal_attachment 	(1610, 1438))
-				    (object RoleView "attributeUses" @507
-					Parent_View 	@505
-					location   	(-363, -146)
-					label      	(object SegLabel @508
-					    Parent_View 	@507
-					    location   	(1405, 1506)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	264
-					    justify    	0
-					    label      	"+attributeUses"
-					    pctDist    	0.132597
-					    height     	68
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6835A0006A"
-					client     	@505
-					supplier   	@468
-					line_style 	3
-					origin_attachment 	(1429, 1438)
-					terminal_attachment 	(1248, 1438)
-					label      	(object SegLabel @509
-					    Parent_View 	@507
-					    location   	(1327, 1391)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.563536
-					    height     	48
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @510
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(416, 1424)
-				label      	(object ItemLabel
-				    Parent_View 	@510
-				    location   	(183, 1383)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	466
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	484
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$86" @511
-				location   	(777, 1425)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B683585010D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$87" @512
-					Parent_View 	@511
-					location   	(-519, -367)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B68358600FA"
-					client     	@511
-					supplier   	@468
-					line_style 	3
-					origin_attachment 	(777, 1425)
-					terminal_attachment 	(896, 1425))
-				    (object RoleView "attributeDeclaration" @513
-					Parent_View 	@511
-					location   	(-519, -367)
-					label      	(object SegLabel @514
-					    Parent_View 	@513
-					    location   	(784, 1508)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+attributeDeclaration"
-					    pctDist    	-0.059259
-					    height     	83
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B68358600FB"
-					client     	@511
-					supplier   	@510
-					line_style 	3
-					origin_attachment 	(777, 1425)
-					terminal_attachment 	(658, 1425)
-					label      	(object SegLabel @515
-					    Parent_View 	@513
-					    location   	(721, 1385)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.472441
-					    height     	41
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$70" @516
-				location   	(237, 1208)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B68356B02CB"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$71" @517
-					Parent_View 	@516
-					location   	(-1043, 72)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B68356D00A6"
-					client     	@516
-					supplier   	@510
-					line_style 	3
-					origin_attachment 	(237, 1208)
-					terminal_attachment 	(237, 1371))
-				    (object RoleView "typeDefinition" @518
-					Parent_View 	@516
-					location   	(-1043, 72)
-					label      	(object SegLabel @519
-					    Parent_View 	@518
-					    location   	(388, 1247)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+typeDefinition"
-					    pctDist    	-0.239264
-					    height     	151
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B68356D00A7"
-					client     	@516
-					supplier   	@469
-					line_style 	3
-					origin_attachment 	(237, 1208)
-					terminal_attachment 	(237, 1045)
-					label      	(object SegLabel @520
-					    Parent_View 	@518
-					    location   	(195, 1247)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.239264
-					    height     	43
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @521
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(384, 784)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@521
-				    location   	(198, 743)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	372
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	390
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$92" @522
-				location   	(728, 775)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6833350340"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$93" @523
-					Parent_View 	@522
-					location   	(-856, -57)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B683336028D"
-					client     	@522
-					supplier   	@475
-					vertices   	(list Points
-					    (728, 775)
-					    (788, 775)
-					    (788, 939))
-					line_style 	3
-					origin_attachment 	(728, 775)
-					terminal_attachment 	(788, 939))
-				    (object RoleView "baseTypeDefinition" @524
-					Parent_View 	@522
-					location   	(-856, -57)
-					label      	(object SegLabel @525
-					    Parent_View 	@524
-					    location   	(558, 883)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+baseTypeDefinition"
-					    pctDist    	1.140940
-					    height     	108
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B683336028E"
-					client     	@522
-					supplier   	@521
-					line_style 	3
-					origin_attachment 	(728, 775)
-					terminal_attachment 	(579, 775)
-					label      	(object SegLabel @526
-					    Parent_View 	@524
-					    location   	(750, 812)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.152439
-					    height     	37
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDIdentityConstraintDefinition" @527
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1312, 448)
-				label      	(object ItemLabel
-				    Parent_View 	@527
-				    location   	(1017, 407)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	590
-				    justify    	0
-				    label      	"XSDIdentityConstraintDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B2603A2"
-				width      	608
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$134" @528
-				location   	(1629, 574)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69D29E014D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "referencedKey" @529
-					Parent_View 	@528
-					location   	(-83, 94)
-					label      	(object SegLabel @530
-					    Parent_View 	@529
-					    location   	(1761, 608)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	288
-					    justify    	0
-					    label      	"+referencedKey"
-					    pctDist    	-1.797297
-					    height     	34
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69D2A80165"
-					client     	@528
-					supplier   	@527
-					vertices   	(list Points
-					    (1629, 574)
-					    (1555, 574)
-					    (1555, 501))
-					line_style 	3
-					origin_attachment 	(1629, 574)
-					terminal_attachment 	(1555, 501)
-					label      	(object SegLabel @531
-					    Parent_View 	@529
-					    location   	(1622, 539)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.047619
-					    height     	36
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$135" @532
-					Parent_View 	@528
-					location   	(-83, 94)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69D2A8016F"
-					client     	@528
-					supplier   	@527
-					vertices   	(list Points
-					    (1629, 574)
-					    (1689, 574)
-					    (1689, 444)
-					    (1616, 444))
-					line_style 	3
-					origin_attachment 	(1629, 574)
-					terminal_attachment 	(1616, 444))))
-			    (object AssociationViewNew "$UNNAMED$138" @533
-				location   	(1197, 608)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D8D330025"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$139" @534
-					Parent_View 	@533
-					location   	(-115, 32)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D330365"
-					client     	@533
-					supplier   	@527
-					line_style 	3
-					origin_attachment 	(1197, 608)
-					terminal_attachment 	(1197, 501))
-				    (object RoleView "fields" @535
-					Parent_View 	@533
-					location   	(-115, 32)
-					label      	(object SegLabel @536
-					    Parent_View 	@535
-					    location   	(1119, 655)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	120
-					    justify    	0
-					    label      	"+fields"
-					    pctDist    	0.439252
-					    height     	78
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D330379"
-					client     	@533
-					supplier   	@491
-					line_style 	3
-					origin_attachment 	(1197, 608)
-					terminal_attachment 	(1197, 715)
-					label      	(object SegLabel @537
-					    Parent_View 	@535
-					    location   	(1253, 654)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"1..*"
-					    pctDist    	0.429907
-					    height     	56
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$136" @538
-				location   	(1415, 608)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D8D3D003E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$137" @539
-					Parent_View 	@538
-					location   	(103, 32)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D3E022A"
-					client     	@538
-					supplier   	@527
-					line_style 	3
-					origin_attachment 	(1415, 608)
-					terminal_attachment 	(1415, 501))
-				    (object RoleView "selector" @540
-					Parent_View 	@538
-					location   	(103, 32)
-					label      	(object SegLabel @541
-					    Parent_View 	@540
-					    location   	(1513, 651)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+selector"
-					    pctDist    	0.411215
-					    height     	98
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D3E0234"
-					client     	@538
-					supplier   	@491
-					line_style 	3
-					origin_attachment 	(1415, 608)
-					terminal_attachment 	(1415, 715)
-					label      	(object SegLabel @542
-					    Parent_View 	@540
-					    location   	(1381, 650)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.392523
-					    height     	34
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @543
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				location   	(1312, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@543
-				    location   	(1022, 68)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	581
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	599
-				height     	209
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$180" @544
-				location   	(2395, 606)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B66EEA7023E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$181" @545
-					Parent_View 	@544
-					location   	(-853, 174)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EEA8038A"
-					client     	@544
-					supplier   	@543
-					vertices   	(list Points
-					    (2395, 606)
-					    (2395, 65)
-					    (1611, 65))
-					line_style 	3
-					origin_attachment 	(2395, 606)
-					terminal_attachment 	(1611, 65))
-				    (object RoleView "notationDeclarations" @546
-					Parent_View 	@544
-					location   	(-853, 174)
-					label      	(object SegLabel @547
-					    Parent_View 	@546
-					    location   	(2089, 104)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+notationDeclarations"
-					    pctDist    	-0.489776
-					    height     	307
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EEA8038B"
-					client     	@544
-					supplier   	@492
-					vertices   	(list Points
-					    (2395, 606)
-					    (2395, 1633)
-					    (2098, 1633))
-					line_style 	3
-					origin_attachment 	(2395, 606)
-					terminal_attachment 	(2098, 1633)
-					label      	(object SegLabel @548
-					    Parent_View 	@546
-					    location   	(2344, 105)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	-0.487829
-					    height     	52
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$176" @549
-				location   	(1772, 249)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B66EEFF024F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$177" @550
-					Parent_View 	@549
-					location   	(-948, -327)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EF00025A"
-					client     	@549
-					supplier   	@543
-					line_style 	3
-					origin_attachment 	(1772, 249)
-					terminal_attachment 	(1611, 249))
-				    (object RoleView "modelGroupDefinitions" @551
-					Parent_View 	@549
-					location   	(-948, -327)
-					label      	(object SegLabel @552
-					    Parent_View 	@551
-					    location   	(2076, 335)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	432
-					    justify    	0
-					    label      	"+modelGroupDefinitions"
-					    pctDist    	0.713592
-					    height     	244
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EF000264"
-					client     	@549
-					supplier   	@493
-					vertices   	(list Points
-					    (1772, 249)
-					    (1832, 249)
-					    (1832, 395))
-					line_style 	3
-					origin_attachment 	(1772, 249)
-					terminal_attachment 	(1832, 395)
-					label      	(object SegLabel @553
-					    Parent_View 	@551
-					    location   	(1781, 340)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.737864
-					    height     	52
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$172" @554
-				location   	(2346, 518)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B66EE920216"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$173" @555
-					Parent_View 	@554
-					location   	(154, 86)
-					label      	(object SegLabel @556
-					    Parent_View 	@555
-					    location   	(1872, 1857)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	-3.630072
-					    height     	475
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EE93018B"
-					client     	@554
-					supplier   	@543
-					vertices   	(list Points
-					    (2346, 518)
-					    (2346, 149)
-					    (1611, 149))
-					line_style 	3
-					origin_attachment 	(2346, 518)
-					terminal_attachment 	(1611, 149))
-				    (object RoleView "attributeGroupDefinitions" @557
-					Parent_View 	@554
-					location   	(154, 86)
-					label      	(object SegLabel @558
-					    Parent_View 	@557
-					    location   	(2008, 195)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	468
-					    justify    	0
-					    label      	"+attributeGroupDefinitions"
-					    pctDist    	-0.349946
-					    height     	339
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EE93018C"
-					client     	@554
-					supplier   	@499
-					vertices   	(list Points
-					    (2346, 518)
-					    (2346, 1441)
-					    (2166, 1441))
-					line_style 	3
-					origin_attachment 	(2346, 518)
-					terminal_attachment 	(2166, 1441)
-					label      	(object SegLabel @559
-					    Parent_View 	@557
-					    location   	(2299, 197)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	-0.348862
-					    height     	48
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$174" @560
-				location   	(203, 159)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B66EE760049"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$175" @561
-					Parent_View 	@560
-					location   	(-485, -273)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EE760374"
-					client     	@560
-					supplier   	@543
-					line_style 	3
-					origin_attachment 	(203, 159)
-					terminal_attachment 	(1013, 159))
-				    (object RoleView "typeDefinitions" @562
-					Parent_View 	@560
-					location   	(-485, -273)
-					label      	(object SegLabel @563
-					    Parent_View 	@562
-					    location   	(349, 196)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	288
-					    justify    	0
-					    label      	"+typeDefinitions"
-					    pctDist    	-1.475728
-					    height     	37
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EE76037E"
-					client     	@560
-					supplier   	@521
-					vertices   	(list Points
-					    (203, 159)
-					    (104, 159)
-					    (104, 784)
-					    (189, 784))
-					line_style 	3
-					origin_attachment 	(203, 159)
-					terminal_attachment 	(189, 784)
-					label      	(object SegLabel @564
-					    Parent_View 	@562
-					    location   	(155, 200)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.059701
-					    height     	41
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$178" @565
-				location   	(1087, 329)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BFC2A1701ED"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$179" @566
-					Parent_View 	@565
-					location   	(-577, -23)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFC2A1A0273"
-					client     	@565
-					supplier   	@543
-					line_style 	3
-					origin_attachment 	(1087, 329)
-					terminal_attachment 	(1087, 264))
-				    (object RoleView "identityConstraintDefinitions" @567
-					Parent_View 	@565
-					location   	(-577, -23)
-					label      	(object SegLabel @568
-					    Parent_View 	@567
-					    location   	(1375, 338)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	528
-					    justify    	0
-					    label      	"+identityConstraintDefinitions"
-					    pctDist    	0.130952
-					    height     	288
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFC2A1A027D"
-					client     	@565
-					supplier   	@527
-					line_style 	3
-					origin_attachment 	(1087, 329)
-					terminal_attachment 	(1087, 395)
-					label      	(object SegLabel @569
-					    Parent_View 	@567
-					    location   	(1018, 336)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.107143
-					    height     	70
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$170" @570
-				location   	(48, 320)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B66FDFA00C3"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$171" @571
-					Parent_View 	@570
-					location   	(-1072, -288)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66FDFB027D"
-					client     	@570
-					supplier   	@543
-					vertices   	(list Points
-					    (49, 322)
-					    (49, 68)
-					    (1013, 68))
-					line_style 	3
-					origin_attachment 	(49, 322)
-					terminal_attachment 	(1013, 68))
-				    (object RoleView "attributeDeclarations" @572
-					Parent_View 	@570
-					location   	(-1072, -288)
-					label      	(object SegLabel @573
-					    Parent_View 	@572
-					    location   	(338, 106)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+attributeDeclarations"
-					    pctDist    	-0.198536
-					    height     	289
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66FDFB027E"
-					client     	@570
-					supplier   	@510
-					vertices   	(list Points
-					    (49, 322)
-					    (49, 1415)
-					    (174, 1415))
-					line_style 	3
-					origin_attachment 	(49, 322)
-					terminal_attachment 	(174, 1415)
-					label      	(object SegLabel @574
-					    Parent_View 	@572
-					    location   	(91, 108)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	-0.196706
-					    height     	42
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @575
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(416, 448)
-				label      	(object ItemLabel
-				    Parent_View 	@575
-				    location   	(175, 412)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	483
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				width      	501
-				height     	97
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$120" @576
-				location   	(499, 589)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69C0590198"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$121" @577
-					Parent_View 	@576
-					location   	(-13, 109)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69C05D01E3"
-					client     	@576
-					supplier   	@575
-					vertices   	(list Points
-					    (499, 589)
-					    (452, 589)
-					    (452, 496))
-					line_style 	3
-					origin_attachment 	(499, 589)
-					terminal_attachment 	(452, 496))
-				    (object RoleView "substitutionGroupAffiliation" @578
-					Parent_View 	@576
-					location   	(-13, 109)
-					label      	(object SegLabel @579
-					    Parent_View 	@578
-					    location   	(811, 585)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	504
-					    justify    	0
-					    label      	"+substitutionGroupAffiliation"
-					    pctDist    	6.520833
-					    height     	5
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69C05D01ED"
-					client     	@576
-					supplier   	@575
-					vertices   	(list Points
-					    (499, 589)
-					    (547, 589)
-					    (547, 496))
-					line_style 	3
-					origin_attachment 	(499, 589)
-					terminal_attachment 	(547, 496)
-					label      	(object SegLabel @580
-					    Parent_View 	@578
-					    location   	(499, 559)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.000000
-					    height     	31
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$114" @581
-				location   	(241, 613)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B68338C0058"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$115" @582
-					Parent_View 	@581
-					location   	(-1343, -219)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B68338C03BF"
-					client     	@581
-					supplier   	@575
-					line_style 	3
-					origin_attachment 	(241, 613)
-					terminal_attachment 	(241, 496))
-				    (object RoleView "typeDefinition" @583
-					Parent_View 	@581
-					location   	(-1343, -219)
-					label      	(object SegLabel @584
-					    Parent_View 	@583
-					    location   	(408, 694)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+typeDefinition"
-					    pctDist    	0.686441
-					    height     	167
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B68338C03C0"
-					client     	@581
-					supplier   	@521
-					line_style 	3
-					origin_attachment 	(241, 613)
-					terminal_attachment 	(241, 731)
-					label      	(object SegLabel @585
-					    Parent_View 	@583
-					    location   	(202, 685)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.610169
-					    height     	39
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$116" @586
-				location   	(837, 460)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6833EF0160"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$117" @587
-					Parent_View 	@586
-					location   	(-1819, -68)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6833F00298"
-					client     	@586
-					supplier   	@575
-					line_style 	3
-					origin_attachment 	(837, 460)
-					terminal_attachment 	(666, 460))
-				    (object RoleView "identityConstraintDefinitions" @588
-					Parent_View 	@586
-					location   	(-1819, -68)
-					label      	(object SegLabel @589
-					    Parent_View 	@588
-					    location   	(880, 528)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	528
-					    justify    	0
-					    label      	"+identityConstraintDefinitions"
-					    pctDist    	0.251462
-					    height     	68
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6833F00299"
-					client     	@586
-					supplier   	@527
-					line_style 	3
-					origin_attachment 	(837, 460)
-					terminal_attachment 	(1008, 460)
-					label      	(object SegLabel @590
-					    Parent_View 	@588
-					    location   	(859, 407)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.130435
-					    height     	54
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$168" @591
-				location   	(541, 246)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B66EE8D01BF"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$169" @592
-					Parent_View 	@591
-					location   	(-1123, -186)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EE8E0198"
-					client     	@591
-					supplier   	@543
-					line_style 	3
-					origin_attachment 	(541, 246)
-					terminal_attachment 	(1013, 246))
-				    (object RoleView "elementDeclarations" @593
-					Parent_View 	@591
-					location   	(-1123, -186)
-					label      	(object SegLabel @594
-					    Parent_View 	@593
-					    location   	(443, 335)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+elementDeclarations"
-					    pctDist    	0.209302
-					    height     	89
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EE8E0199"
-					client     	@591
-					supplier   	@575
-					vertices   	(list Points
-					    (541, 246)
-					    (224, 246)
-					    (224, 400))
-					line_style 	3
-					origin_attachment 	(541, 246)
-					terminal_attachment 	(224, 400)
-					label      	(object SegLabel @595
-					    Parent_View 	@593
-					    location   	(186, 335)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.864693
-					    height     	39
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$122" @596
-				location   	(353, 621)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C42DBDD0297"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$123" @597
-					Parent_View 	@596
-					location   	(-63, 173)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C42DBE0011E"
-					client     	@596
-					supplier   	@575
-					vertices   	(list Points
-					    (353, 621)
-					    (306, 621)
-					    (306, 496))
-					line_style 	3
-					origin_attachment 	(353, 621)
-					terminal_attachment 	(306, 496))
-				    (object RoleView "substitutionGroup" @598
-					Parent_View 	@596
-					location   	(-63, 173)
-					label      	(object SegLabel @599
-					    Parent_View 	@598
-					    location   	(579, 636)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+substitutionGroup"
-					    pctDist    	4.808511
-					    height     	15
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C42DBE00128"
-					client     	@596
-					supplier   	@575
-					vertices   	(list Points
-					    (353, 621)
-					    (400, 621)
-					    (400, 496))
-					line_style 	3
-					origin_attachment 	(353, 621)
-					terminal_attachment 	(400, 496)
-					label      	(object SegLabel @600
-					    Parent_View 	@598
-					    location   	(350, 583)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	-0.069767
-					    height     	39
-					    orientation 	0))))))
-		    (object ClassDiagram "3. Component Attributes  (Part 1 : Structures)"
-			quid       	"3B69E78602C5"
-			title      	"3. Component Attributes  (Part 1 : Structures)"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDNamedComponent" @601
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 128)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@601
-				    location   	(46, 47)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	516
-				    justify    	0
-				    label      	"XSDNamedComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846D303A4"
-				compartment 	(object Compartment
-				    Parent_View 	@601
-				    location   	(46, 107)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	482
-				    compartmentItems 	(list Compartment
-					"+ name : String"
-					"+ targetNamespace : String"))
-				width      	534
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @602
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(288, 1648)
-				label      	(object ItemLabel
-				    Parent_View 	@602
-				    location   	(41, 1567)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	494
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	512
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @603
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2368, 1680)
-				label      	(object ItemLabel
-				    Parent_View 	@603
-				    location   	(1781, 1524)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1174
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				compartment 	(object Compartment
-				    Parent_View 	@603
-				    location   	(1781, 1584)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	5
-				    max_width  	1139
-				    compartmentItems 	(list Compartment
-					"+ derivationMethod : XSDDerivationMethod = restriction"
-					"<<0..*>> + final : XSDComplexFinal"
-					"+ abstract : boolean"
-					"+ contentTypeCategory : XSDContentTypeCategory"
-					"<<0..*>> + prohibitedSubstitutions : XSDProhibitedSubstitutions"))
-				width      	1192
-				height     	336
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @604
-				location   	(463, 362)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@601
-				vertices   	(list Points
-				    (463, 362)
-				    (463, 221)))
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @605
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1408, 1600)
-				label      	(object ItemLabel
-				    Parent_View 	@605
-				    location   	(1094, 1519)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	628
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				compartment 	(object Compartment
-				    Parent_View 	@605
-				    location   	(1094, 1579)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	592
-				    compartmentItems 	(list Compartment
-					"+ variety : XSDVariety"
-					"<<0..*>> + final : XSDSimpleFinal"))
-				width      	646
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUse" @606
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(912, 144)
-				label      	(object ItemLabel
-				    Parent_View 	@606
-				    location   	(647, 38)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	530
-				    justify    	0
-				    label      	"XSDAttributeUse")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B68354601A8"
-				compartment 	(object Compartment
-				    Parent_View 	@606
-				    location   	(647, 98)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	502
-				    compartmentItems 	(list Compartment
-					"+ required : boolean"
-					"+ value : Value"
-					"+ constraint : XSDConstraint"))
-				width      	548
-				height     	236
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @607
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(688, 1936)
-				label      	(object ItemLabel
-				    Parent_View 	@607
-				    location   	(45, 1830)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1286
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				compartment 	(object Compartment
-				    Parent_View 	@607
-				    location   	(45, 1890)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	1260
-				    compartmentItems 	(list Compartment
-					"+ namespaceConstraintCategory : XSDNamespaceConstraintCategory"
-					"<<0..*>> + namespaceConstraint : String"
-					"+ processContents : XSDProcessContents"))
-				width      	1304
-				height     	236
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroup" @608
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(336, 1440)
-				label      	(object ItemLabel
-				    Parent_View 	@608
-				    location   	(47, 1384)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	578
-				    justify    	0
-				    label      	"XSDModelGroup")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6834E00291"
-				width      	596
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDFeature" @609
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 512)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@609
-				    location   	(36, 431)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	536
-				    justify    	0
-				    label      	"XSDFeature")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B537026C"
-				compartment 	(object Compartment
-				    Parent_View 	@609
-				    location   	(36, 491)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	506
-				    compartmentItems 	(list Compartment
-					"+ value : Value"
-					"+ constraint : XSDConstraint"))
-				width      	554
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @610
-				location   	(294, 697)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@609
-				vertices   	(list Points
-				    (294, 697)
-				    (294, 605)))
-			    (object ClassView "Class" "Logical View::xsd::XSDXPathDefinition" @611
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2256, 128)
-				label      	(object ItemLabel
-				    Parent_View 	@611
-				    location   	(1995, 47)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	522
-				    justify    	0
-				    label      	"XSDXPathDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6D83BB0355"
-				width      	540
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefinableComponent" @612
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2688, 512)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@612
-				    location   	(2418, 460)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	540
-				    justify    	0
-				    label      	"XSDRedefinableComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B7FCA8B020B"
-				width      	558
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @613
-				location   	(2684, 962)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@612
-				vertices   	(list Points
-				    (2684, 962)
-				    (2684, 576)))
-			    (object ClassView "Class" "Logical View::xsd::XSDCompositor" @614
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 1200)
-				label      	(object ItemLabel
-				    Parent_View 	@614
-				    location   	(45, 1116)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"XSDCompositor")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@614
-				    location   	(45, 1066)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B869B620037"
-				width      	344
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDConstraint" @615
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(800, 528)
-				label      	(object ItemLabel
-				    Parent_View 	@615
-				    location   	(638, 469)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDConstraint")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@615
-				    location   	(638, 419)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B869E2601AE"
-				width      	342
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDDerivationMethod" @616
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2192, 2272)
-				label      	(object ItemLabel
-				    Parent_View 	@616
-				    location   	(1980, 2213)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	424
-				    justify    	0
-				    label      	"XSDDerivationMethod")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@616
-				    location   	(1980, 2163)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	424
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B86A0B000CE"
-				width      	442
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDIdentityConstraintCategory" @617
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1584, 176)
-				label      	(object ItemLabel
-				    Parent_View 	@617
-				    location   	(1281, 88)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	607
-				    justify    	0
-				    label      	"XSDIdentityConstraintCategory")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@617
-				    location   	(1281, 38)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	607
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B86A1E00272"
-				width      	625
-				height     	300
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDContentTypeCategory" @618
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2704, 2224)
-				label      	(object ItemLabel
-				    Parent_View 	@618
-				    location   	(2456, 2115)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	496
-				    justify    	0
-				    label      	"XSDContentTypeCategory")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@618
-				    location   	(2456, 2065)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	496
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B86A79F03A2"
-				width      	514
-				height     	342
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDVariety" @619
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(880, 1600)
-				label      	(object ItemLabel
-				    Parent_View 	@619
-				    location   	(708, 1516)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	344
-				    justify    	0
-				    label      	"XSDVariety")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@619
-				    location   	(708, 1466)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	344
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B8FF7730249"
-				width      	362
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDProcessContents" @620
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(976, 2240)
-				label      	(object ItemLabel
-				    Parent_View 	@620
-				    location   	(766, 2156)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	420
-				    justify    	0
-				    label      	"XSDProcessContents")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@620
-				    location   	(766, 2106)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	420
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B8FF8C70284"
-				width      	438
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDXPathVariety" @621
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2768, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@621
-				    location   	(2587, 97)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	363
-				    justify    	0
-				    label      	"XSDXPathVariety")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@621
-				    location   	(2587, 47)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	363
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B8FFB89033A"
-				width      	381
-				height     	250
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleFinal" @622
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1552, 1872)
-				label      	(object ItemLabel
-				    Parent_View 	@622
-				    location   	(1389, 1788)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"XSDSimpleFinal")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@622
-				    location   	(1389, 1738)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C25D0295"
-				compartment 	(object Compartment
-				    Parent_View 	@622
-				    location   	(1389, 1848)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	199
-				    compartmentItems 	(list Compartment
-					"+ list"
-					"+ restriction"
-					"+ union"))
-				width      	344
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexFinal" @623
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1968, 2000)
-				label      	(object ItemLabel
-				    Parent_View 	@623
-				    location   	(1786, 1941)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	364
-				    justify    	0
-				    label      	"XSDComplexFinal")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@623
-				    location   	(1786, 1891)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	364
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C2CA01CB"
-				compartment 	(object Compartment
-				    Parent_View 	@623
-				    location   	(1786, 2001)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	202
-				    compartmentItems 	(list Compartment
-					"+ extension"
-					"+ restriction"))
-				width      	382
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSubstitutionGroupExclusions" @624
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(800, 1184)
-				label      	(object ItemLabel
-				    Parent_View 	@624
-				    location   	(485, 1125)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	630
-				    justify    	0
-				    label      	"XSDSubstitutionGroupExclusions")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@624
-				    location   	(485, 1075)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	630
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C59100AE"
-				width      	648
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDDisallowedSubstitutions" @625
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1440, 1200)
-				label      	(object ItemLabel
-				    Parent_View 	@625
-				    location   	(1171, 1116)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	538
-				    justify    	0
-				    label      	"XSDDisallowedSubstitutions")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@625
-				    location   	(1171, 1066)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	538
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C5A403DF"
-				compartment 	(object Compartment
-				    Parent_View 	@625
-				    location   	(1171, 1176)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	236
-				    compartmentItems 	(list Compartment
-					"+ substitution"
-					"+ extension"
-					"+ restriction"))
-				width      	556
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDProhibitedSubstitutions" @626
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1664, 2272)
-				label      	(object ItemLabel
-				    Parent_View 	@626
-				    location   	(1398, 2213)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	532
-				    justify    	0
-				    label      	"XSDProhibitedSubstitutions")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@626
-				    location   	(1398, 2163)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	532
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C5BE0272"
-				compartment 	(object Compartment
-				    Parent_View 	@626
-				    location   	(1398, 2273)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	202
-				    compartmentItems 	(list Compartment
-					"+ extension"
-					"+ restriction"))
-				width      	550
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDNamespaceConstraintCategory" @627
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(384, 2240)
-				label      	(object ItemLabel
-				    Parent_View 	@627
-				    location   	(45, 2154)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	678
-				    justify    	0
-				    label      	"XSDNamespaceConstraintCategory")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@627
-				    location   	(45, 2104)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	678
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C5EA0023"
-				width      	696
-				height     	296
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @628
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1264, 880)
-				label      	(object ItemLabel
-				    Parent_View 	@628
-				    location   	(571, 749)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1386
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				compartment 	(object Compartment
-				    Parent_View 	@628
-				    location   	(571, 809)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	1357
-				    compartmentItems 	(list Compartment
-					"+ nillable : boolean"
-					"<<0..*>> + disallowedSubstitutions : XSDDisallowedSubstitutions"
-					"<<0..*>> + substitutionGroupExclusions : XSDSubstitutionGroupExclusions"
-					"+ abstract : boolean"))
-				width      	1404
-				height     	286
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @629
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69EDEE01BF"
-				client     	@628
-				supplier   	@609
-				line_style 	3
-				origin_attachment 	(681, 737)
-				terminal_attachment 	(681, 697)
-				drawSupplier 	@610)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @630
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(272, 864)
-				label      	(object ItemLabel
-				    Parent_View 	@630
-				    location   	(35, 812)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	474
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	492
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @631
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2688, 1152)
-				label      	(object ItemLabel
-				    Parent_View 	@631
-				    location   	(2420, 1100)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	536
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	554
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @632
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAC800D2"
-				client     	@631
-				supplier   	@612
-				line_style 	3
-				origin_attachment 	(2862, 1088)
-				terminal_attachment 	(2862, 962)
-				drawSupplier 	@613)
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @633
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2352, 1312)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@633
-				    location   	(2168, 1261)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	368
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	386
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @634
-				location   	(2375, 1465)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@633
-				vertices   	(list Points
-				    (2375, 1465)
-				    (2375, 1375)))
-			    (object InheritView "" @635
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAB1004D"
-				client     	@633
-				supplier   	@612
-				line_style 	3
-				origin_attachment 	(2368, 1249)
-				terminal_attachment 	(2368, 962)
-				drawSupplier 	@613)
-			    (object InheritView "" @636
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0D01901F1"
-				client     	@603
-				supplier   	@633
-				line_style 	3
-				origin_attachment 	(2818, 1512)
-				terminal_attachment 	(2818, 1465)
-				drawSupplier 	@634)
-			    (object InheritView "" @637
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A1302A2"
-				client     	@605
-				supplier   	@633
-				line_style 	3
-				origin_attachment 	(1406, 1507)
-				terminal_attachment 	(1406, 1465)
-				drawSupplier 	@634)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @638
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2064, 1152)
-				label      	(object ItemLabel
-				    Parent_View 	@638
-				    location   	(1818, 1101)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	492
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				width      	510
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @639
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAC40090"
-				client     	@638
-				supplier   	@612
-				line_style 	3
-				origin_attachment 	(2115, 1089)
-				terminal_attachment 	(2115, 962)
-				drawSupplier 	@613)
-			    (object ClassView "Class" "Logical View::xsd::XSDIdentityConstraintDefinition" @640
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1600, 528)
-				label      	(object ItemLabel
-				    Parent_View 	@640
-				    location   	(1034, 468)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1132
-				    justify    	0
-				    label      	"XSDIdentityConstraintDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B2603A2"
-				width      	1150
-				height     	144
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @641
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684AA30242"
-				client     	@640
-				supplier   	@601
-				line_style 	3
-				origin_attachment 	(1568, 456)
-				terminal_attachment 	(1568, 362)
-				drawSupplier 	@604)
-			    (object ClassView "Class" "Logical View::xsd::XSDNotationDeclaration" @642
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2320, 784)
-				label      	(object ItemLabel
-				    Parent_View 	@642
-				    location   	(2078, 703)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	484
-				    justify    	0
-				    label      	"XSDNotationDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDAA021C"
-				width      	502
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @643
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(176, 320)
-				label      	(object ItemLabel
-				    Parent_View 	@643
-				    location   	(43, 268)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	266
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	284
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @644
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B68494302F1"
-				client     	@642
-				supplier   	@601
-				line_style 	3
-				origin_attachment 	(2290, 691)
-				terminal_attachment 	(2290, 362)
-				drawSupplier 	@604)
-			    (object InheritView "" @645
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69B7DC0193"
-				client     	@630
-				supplier   	@609
-				line_style 	3
-				origin_attachment 	(141, 800)
-				terminal_attachment 	(141, 697)
-				drawSupplier 	@610)
-			    (object InheritView "" @646
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A2C0307"
-				client     	@609
-				supplier   	@601
-				line_style 	3
-				origin_attachment 	(372, 419)
-				terminal_attachment 	(372, 362)
-				drawSupplier 	@604)
-			    (object InheritView "" @647
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A26036D"
-				client     	@612
-				supplier   	@601
-				line_style 	3
-				origin_attachment 	(2687, 448)
-				terminal_attachment 	(2687, 362)
-				drawSupplier 	@604)))
-		    (object ClassDiagram "4. Component Hierarchy, Relations and Attributes (Part 2: Datatypes)"
-			quid       	"3B6C3265005F"
-			title      	"4. Component Hierarchy, Relations and Attributes (Part 2: Datatypes)"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDFixedFacet" @648
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(192, 896)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@648
-				    location   	(32, 840)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	320
-				    justify    	0
-				    label      	"XSDFixedFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C699E00C1"
-				width      	338
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRepeatableFacet" @649
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(720, 896)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@649
-				    location   	(504, 845)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	432
-				    justify    	0
-				    label      	"XSDRepeatableFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C6AA6031A"
-				width      	450
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDEnumerationFacet" @650
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(496, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@650
-				    location   	(266, 1112)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	460
-				    justify    	0
-				    label      	"XSDEnumerationFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C6ACE0141"
-				width      	478
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDPatternFacet" @651
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1008, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@651
-				    location   	(777, 1112)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	462
-				    justify    	0
-				    label      	"XSDPatternFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C6ADB026C"
-				width      	480
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @652
-				location   	(718, 1049)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@649
-				vertices   	(list Points
-				    (718, 1049)
-				    (718, 959)))
-			    (object ClassView "Class" "Logical View::xsd::XSDOrderedFacet" @653
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2000, 928)
-				label      	(object ItemLabel
-				    Parent_View 	@653
-				    location   	(1799, 872)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	402
-				    justify    	0
-				    label      	"XSDOrderedFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C74DD0248"
-				width      	420
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDBoundedFacet" @654
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1568, 928)
-				label      	(object ItemLabel
-				    Parent_View 	@654
-				    location   	(1383, 872)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	370
-				    justify    	0
-				    label      	"XSDBoundedFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C751D0344"
-				width      	388
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDCardinalityFacet" @655
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2032, 1104)
-				label      	(object ItemLabel
-				    Parent_View 	@655
-				    location   	(1807, 1048)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	450
-				    justify    	0
-				    label      	"XSDCardinalityFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C755D03D2"
-				width      	468
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDNumericFacet" @656
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1504, 1104)
-				label      	(object ItemLabel
-				    Parent_View 	@656
-				    location   	(1319, 1049)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	370
-				    justify    	0
-				    label      	"XSDNumericFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C75950206"
-				width      	388
-				height     	134
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDLengthFacet" @657
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(656, 1376)
-				label      	(object ItemLabel
-				    Parent_View 	@657
-				    location   	(491, 1320)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	330
-				    justify    	0
-				    label      	"XSDLengthFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C776200E7"
-				width      	348
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinLengthFacet" @658
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(608, 1552)
-				label      	(object ItemLabel
-				    Parent_View 	@658
-				    location   	(405, 1497)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	406
-				    justify    	0
-				    label      	"XSDMinLengthFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C778C0065"
-				width      	424
-				height     	134
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @659
-				location   	(144, 1262)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@648
-				vertices   	(list Points
-				    (144, 1262)
-				    (144, 964)))
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxLengthFacet" @660
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1216, 1552)
-				label      	(object ItemLabel
-				    Parent_View 	@660
-				    location   	(1007, 1497)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	418
-				    justify    	0
-				    label      	"XSDMaxLengthFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C77C70146"
-				width      	436
-				height     	134
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDWhiteSpaceFacet" @661
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1120, 1376)
-				label      	(object ItemLabel
-				    Parent_View 	@661
-				    location   	(880, 1320)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	480
-				    justify    	0
-				    label      	"XSDWhiteSpaceFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C784601B7"
-				width      	498
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxInclusiveFacet" @662
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1312, 1728)
-				label      	(object ItemLabel
-				    Parent_View 	@662
-				    location   	(1090, 1676)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	444
-				    justify    	0
-				    label      	"XSDMaxInclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C787D00DA"
-				width      	462
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxExclusiveFacet" @663
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1424, 1904)
-				label      	(object ItemLabel
-				    Parent_View 	@663
-				    location   	(1193, 1852)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	462
-				    justify    	0
-				    label      	"XSDMaxExclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C789600C2"
-				width      	480
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinInclusiveFacet" @664
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(496, 1728)
-				label      	(object ItemLabel
-				    Parent_View 	@664
-				    location   	(282, 1676)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	428
-				    justify    	0
-				    label      	"XSDMinInclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C788702C9"
-				width      	446
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinExclusiveFacet" @665
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(352, 1904)
-				label      	(object ItemLabel
-				    Parent_View 	@665
-				    location   	(124, 1852)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	456
-				    justify    	0
-				    label      	"XSDMinExclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C792D000A"
-				width      	474
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDTotalDigitsFacet" @666
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 2112)
-				label      	(object ItemLabel
-				    Parent_View 	@666
-				    location   	(52, 2056)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	408
-				    justify    	0
-				    label      	"XSDTotalDigitsFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C79A0020E"
-				width      	426
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDFractionDigitsFacet" @667
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1552, 2112)
-				label      	(object ItemLabel
-				    Parent_View 	@667
-				    location   	(1318, 2056)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"XSDFractionDigitsFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C79BE02EE"
-				width      	486
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @668
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C9D03C7"
-				client     	@650
-				supplier   	@649
-				line_style 	3
-				origin_attachment 	(394, 1100)
-				terminal_attachment 	(394, 1049)
-				drawSupplier 	@652)
-			    (object InheritView "" @669
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C78620045"
-				client     	@661
-				supplier   	@648
-				line_style 	3
-				origin_attachment 	(1119, 1308)
-				terminal_attachment 	(1119, 1262)
-				drawSupplier 	@659)
-			    (object ClassView "Class" "Logical View::xsd::XSDComponent" @670
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(336, 160)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@670
-				    location   	(174, 117)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846E90029"
-				width      	342
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @671
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6CA5038D"
-				client     	@651
-				supplier   	@649
-				line_style 	3
-				origin_attachment 	(1044, 1100)
-				terminal_attachment 	(1044, 1049)
-				drawSupplier 	@652)
-			    (object InheritView "" @672
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C778002DF"
-				client     	@657
-				supplier   	@648
-				line_style 	3
-				origin_attachment 	(663, 1308)
-				terminal_attachment 	(663, 1262)
-				drawSupplier 	@659)
-			    (object ClassView "Class" "Logical View::xsd::XSDOrdered" @673
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2048, 1408)
-				label      	(object ItemLabel
-				    Parent_View 	@673
-				    location   	(1835, 1324)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	426
-				    justify    	0
-				    label      	"XSDOrdered")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@673
-				    location   	(1835, 1274)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	426
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3BC7715202E4"
-				width      	444
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDCardinality" @674
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2048, 1728)
-				label      	(object ItemLabel
-				    Parent_View 	@674
-				    location   	(1835, 1669)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	426
-				    justify    	0
-				    label      	"XSDCardinality")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@674
-				    location   	(1835, 1619)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	426
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3BC7715D009B"
-				width      	444
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDWhiteSpace" @675
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2064, 2032)
-				label      	(object ItemLabel
-				    Parent_View 	@675
-				    location   	(1861, 1951)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	406
-				    justify    	0
-				    label      	"XSDWhiteSpace")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@675
-				    location   	(1861, 1901)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	406
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3BEED0F60342"
-				width      	424
-				height     	287
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::Value" @676
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(880, 2096)
-				label      	(object ItemLabel
-				    Parent_View 	@676
-				    location   	(571, 2062)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	618
-				    justify    	0
-				    label      	"Value")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@676
-				    location   	(571, 2012)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	618
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	14671839
-				quidu      	"3C040B5B031F"
-				width      	636
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @677
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B610337"
-				client     	@666
-				supplier   	@648
-				line_style 	3
-				origin_attachment 	(75, 2044)
-				terminal_attachment 	(75, 1262)
-				drawSupplier 	@659)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinFacet" @678
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 1376)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@678
-				    location   	(113, 1320)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	286
-				    justify    	0
-				    label      	"XSDMinFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C0A1CDE037C"
-				compartment 	(object Compartment
-				    Parent_View 	@678
-				    location   	(113, 1380)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	254
-				    compartmentItems 	(list Compartment
-					"+ value : Value"))
-				width      	304
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxFacet" @679
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1584, 1376)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@679
-				    location   	(1440, 1320)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	288
-				    justify    	0
-				    label      	"XSDMaxFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C0A1CEB010E"
-				compartment 	(object Compartment
-				    Parent_View 	@679
-				    location   	(1440, 1380)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	258
-				    compartmentItems 	(list Compartment
-					"+ value : Value"))
-				width      	306
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @680
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C0A1D240098"
-				client     	@678
-				supplier   	@648
-				line_style 	3
-				origin_attachment 	(235, 1308)
-				terminal_attachment 	(235, 1262)
-				drawSupplier 	@659)
-			    (object InheritView "" @681
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C0A1D3103AD"
-				client     	@679
-				supplier   	@648
-				line_style 	3
-				origin_attachment 	(1581, 1308)
-				terminal_attachment 	(1581, 1262)
-				drawSupplier 	@659)
-			    (object InheritView "" @682
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B520353"
-				client     	@664
-				supplier   	@678
-				line_style 	3
-				origin_attachment 	(285, 1664)
-				terminal_attachment 	(285, 1444))
-			    (object InheritView "" @683
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B8303B8"
-				client     	@662
-				supplier   	@679
-				line_style 	3
-				origin_attachment 	(1500, 1664)
-				terminal_attachment 	(1500, 1444))
-			    (object InheritView "" @684
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B8E0309"
-				client     	@663
-				supplier   	@679
-				line_style 	3
-				origin_attachment 	(1622, 1840)
-				terminal_attachment 	(1622, 1444))
-			    (object InheritView "" @685
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C77C400C0"
-				client     	@658
-				supplier   	@648
-				line_style 	3
-				origin_attachment 	(447, 1485)
-				terminal_attachment 	(447, 1262)
-				drawSupplier 	@659)
-			    (object InheritView "" @686
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B7D00FC"
-				client     	@660
-				supplier   	@648
-				line_style 	3
-				origin_attachment 	(1397, 1485)
-				terminal_attachment 	(1397, 1262)
-				drawSupplier 	@659)
-			    (object InheritView "" @687
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B990016"
-				client     	@667
-				supplier   	@648
-				line_style 	3
-				origin_attachment 	(1775, 2044)
-				terminal_attachment 	(1775, 1262)
-				drawSupplier 	@659)
-			    (object ClassView "Class" "Logical View::xsd::XSDFacet" @688
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(368, 368)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@688
-				    location   	(174, 318)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	388
-				    justify    	0
-				    label      	"XSDFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C359403D2"
-				width      	406
-				height     	125
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @689
-				location   	(366, 522)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@688
-				vertices   	(list Points
-				    (366, 522)
-				    (366, 430)))
-			    (object ClassView "Class" "Logical View::xsd::XSDConstrainingFacet" @690
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 624)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@690
-				    location   	(34, 573)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	444
-				    justify    	0
-				    label      	"XSDConstrainingFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C6B340093"
-				width      	462
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @691
-				location   	(272, 781)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@690
-				vertices   	(list Points
-				    (272, 781)
-				    (272, 687)))
-			    (object InheritView "" @692
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C8F002E"
-				client     	@649
-				supplier   	@690
-				line_style 	3
-				origin_attachment 	(594, 833)
-				terminal_attachment 	(594, 781)
-				drawSupplier 	@691)
-			    (object ClassView "Class" "Logical View::xsd::XSDFundamentalFacet" @693
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(752, 624)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@693
-				    location   	(526, 573)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	452
-				    justify    	0
-				    label      	"XSDFundamentalFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C69E801D6"
-				width      	470
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @694
-				location   	(768, 789)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@693
-				vertices   	(list Points
-				    (768, 789)
-				    (768, 687)))
-			    (object InheritView "" @695
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7659012C"
-				client     	@653
-				supplier   	@693
-				line_style 	3
-				origin_attachment 	(2050, 860)
-				terminal_attachment 	(2050, 789)
-				drawSupplier 	@694)
-			    (object InheritView "" @696
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C763C0224"
-				client     	@654
-				supplier   	@693
-				line_style 	3
-				origin_attachment 	(1525, 860)
-				terminal_attachment 	(1525, 789)
-				drawSupplier 	@694)
-			    (object InheritView "" @697
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C764F0131"
-				client     	@655
-				supplier   	@693
-				line_style 	3
-				origin_attachment 	(2237, 1036)
-				terminal_attachment 	(2237, 789)
-				drawSupplier 	@694)
-			    (object InheritView "" @698
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C76420074"
-				client     	@656
-				supplier   	@693
-				line_style 	3
-				origin_attachment 	(1328, 1037)
-				terminal_attachment 	(1328, 789)
-				drawSupplier 	@694)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @699
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1456, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@699
-				    location   	(1137, 47)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	638
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				compartment 	(object Compartment
-				    Parent_View 	@699
-				    location   	(1137, 107)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	598
-				    compartmentItems 	(list Compartment
-					"+ variety : XSDVariety"
-					"<<0..*>> + final : XSDSimpleFinal"))
-				width      	656
-				height     	250
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$126" @700
-				location   	(775, 178)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D597102EA"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$127" @701
-					Parent_View 	@700
-					location   	(-1209, -46)
-					label      	(object SegLabel @702
-					    Parent_View 	@701
-					    location   	(509, 235)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D59750119"
-					client     	@700
-					supplier   	@688
-					vertices   	(list Points
-					    (775, 178)
-					    (550, 178)
-					    (550, 306))
-					line_style 	3
-					origin_attachment 	(775, 178)
-					terminal_attachment 	(550, 306))
-				    (object RoleView "simpleTypeDefinition" @703
-					Parent_View 	@700
-					location   	(-1209, -46)
-					label      	(object SegLabel @704
-					    Parent_View 	@703
-					    location   	(875, 136)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+simpleTypeDefinition"
-					    pctDist    	0.283133
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D59750105"
-					client     	@700
-					supplier   	@699
-					line_style 	3
-					origin_attachment 	(775, 178)
-					terminal_attachment 	(1128, 178)
-					label      	(object SegLabel @705
-					    Parent_View 	@703
-					    location   	(1061, 215)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.812500
-					    height     	37
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$188" @706
-				location   	(369, 72)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BC8AE0203A8"
-				roleview_list 	(list RoleViews
-				    (object RoleView "facets" @707
-					Parent_View 	@706
-					location   	(-1615, -152)
-					label      	(object SegLabel @708
-					    Parent_View 	@707
-					    location   	(187, 496)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	132
-					    justify    	0
-					    label      	"+facets"
-					    pctDist    	0.913863
-					    height     	87
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BC8AE060065"
-					client     	@706
-					supplier   	@690
-					vertices   	(list Points
-					    (369, 72)
-					    (100, 72)
-					    (100, 561))
-					line_style 	3
-					origin_attachment 	(369, 72)
-					terminal_attachment 	(100, 561)
-					label      	(object SegLabel @709
-					    Parent_View 	@707
-					    location   	(60, 498)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.917900
-					    height     	41
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$189" @710
-					Parent_View 	@706
-					location   	(-1615, -152)
-					label      	(object SegLabel @711
-					    Parent_View 	@710
-					    location   	(976, 31)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BC8AE060051"
-					client     	@706
-					supplier   	@699
-					line_style 	3
-					origin_attachment 	(369, 72)
-					terminal_attachment 	(1128, 72))))
-			    (object AssociationViewNew "$UNNAMED$230" @712
-				location   	(1538, 508)
-				label      	(object SegLabel @713
-				    Parent_View 	@712
-				    location   	(1538, 449)
-				    font       	(object Font
-					italics    	TRUE)
-				    hidden     	TRUE
-				    anchor     	1
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	60
-				    justify    	0
-				    label      	""
-				    pctDist    	0.500000
-				    height     	60
-				    orientation 	0)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C276DA000DE"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$231" @714
-					Parent_View 	@712
-					location   	(-446, 284)
-					label      	(object SegLabel @715
-					    Parent_View 	@714
-					    location   	(1446, 340)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C276DA000DF"
-					client     	@712
-					supplier   	@699
-					vertices   	(list Points
-					    (1538, 508)
-					    (1487, 508)
-					    (1487, 285))
-					line_style 	3
-					origin_attachment 	(1538, 508)
-					terminal_attachment 	(1487, 285))
-				    (object RoleView "itemTypeDefinition" @716
-					Parent_View 	@712
-					location   	(-446, 284)
-					label      	(object SegLabel @717
-					    Parent_View 	@716
-					    location   	(1423, 577)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	360
-					    justify    	0
-					    label      	"+itemTypeDefinition"
-					    pctDist    	-2.211539
-					    height     	69
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C276DA000E0"
-					client     	@712
-					supplier   	@699
-					vertices   	(list Points
-					    (1538, 508)
-					    (1590, 508)
-					    (1590, 285))
-					line_style 	3
-					origin_attachment 	(1538, 508)
-					terminal_attachment 	(1590, 285)
-					label      	(object SegLabel @718
-					    Parent_View 	@716
-					    location   	(1539, 468)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.003984
-					    height     	41
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$190" @719
-				location   	(1729, 574)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C34B70208"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$191" @720
-					Parent_View 	@719
-					location   	(-255, 350)
-					label      	(object SegLabel @721
-					    Parent_View 	@720
-					    location   	(1637, 353)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6C34BE0258"
-					client     	@719
-					supplier   	@699
-					vertices   	(list Points
-					    (1729, 574)
-					    (1678, 574)
-					    (1678, 285))
-					line_style 	3
-					origin_attachment 	(1729, 574)
-					terminal_attachment 	(1678, 285))
-				    (object RoleView "memberTypeDefinitions" @722
-					Parent_View 	@719
-					location   	(-255, 350)
-					label      	(object SegLabel @723
-					    Parent_View 	@722
-					    location   	(1559, 654)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	444
-					    justify    	0
-					    label      	"+memberTypeDefinitions"
-					    pctDist    	-3.269231
-					    height     	80
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6C34BE0259"
-					client     	@719
-					supplier   	@699
-					vertices   	(list Points
-					    (1729, 574)
-					    (1781, 574)
-					    (1781, 285))
-					line_style 	3
-					origin_attachment 	(1729, 574)
-					terminal_attachment 	(1781, 285)
-					label      	(object SegLabel @724
-					    Parent_View 	@722
-					    location   	(1730, 520)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.312121
-					    height     	52
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$192" @725
-				location   	(748, 269)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C363201DB"
-				roleview_list 	(list RoleViews
-				    (object RoleView "fundamentalFacets" @726
-					Parent_View 	@725
-					location   	(-1236, 45)
-					label      	(object SegLabel @727
-					    Parent_View 	@726
-					    location   	(873, 312)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+fundamentalFacets"
-					    pctDist    	-1.409091
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6C36350063"
-					client     	@725
-					supplier   	@693
-					vertices   	(list Points
-					    (748, 269)
-					    (659, 269)
-					    (659, 561))
-					line_style 	3
-					origin_attachment 	(748, 269)
-					terminal_attachment 	(659, 561)
-					label      	(object SegLabel @728
-					    Parent_View 	@726
-					    location   	(728, 385)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..*"
-					    pctDist    	0.538028
-					    height     	69
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$193" @729
-					Parent_View 	@725
-					location   	(-1236, 45)
-					label      	(object SegLabel @730
-					    Parent_View 	@729
-					    location   	(1052, 228)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6C36350059"
-					client     	@725
-					supplier   	@699
-					line_style 	3
-					origin_attachment 	(748, 269)
-					terminal_attachment 	(1128, 269))))
-			    (object AssociationViewNew "$UNNAMED$194" @731
-				location   	(1175, 396)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D35AB0273"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$195" @732
-					Parent_View 	@731
-					location   	(-809, 172)
-					label      	(object SegLabel @733
-					    Parent_View 	@732
-					    location   	(1094, 316)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D35B20291"
-					client     	@731
-					supplier   	@699
-					vertices   	(list Points
-					    (1175, 396)
-					    (1135, 396)
-					    (1135, 285))
-					line_style 	3
-					origin_attachment 	(1175, 396)
-					terminal_attachment 	(1135, 285))
-				    (object RoleView "baseTypeDefinition" @734
-					Parent_View 	@731
-					location   	(-809, 172)
-					label      	(object SegLabel @735
-					    Parent_View 	@734
-					    location   	(1074, 443)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+baseTypeDefinition"
-					    pctDist    	-2.533333
-					    height     	47
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D35B202A5"
-					client     	@731
-					supplier   	@699
-					vertices   	(list Points
-					    (1175, 396)
-					    (1215, 396)
-					    (1215, 285))
-					line_style 	3
-					origin_attachment 	(1175, 396)
-					terminal_attachment 	(1215, 285)
-					label      	(object SegLabel @736
-					    Parent_View 	@734
-					    location   	(1172, 359)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.096154
-					    height     	38
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$196" @737
-				location   	(1360, 446)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D5572016C"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$197" @738
-					Parent_View 	@737
-					location   	(-624, 222)
-					label      	(object SegLabel @739
-					    Parent_View 	@738
-					    location   	(1268, 327)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D5575022F"
-					client     	@737
-					supplier   	@699
-					vertices   	(list Points
-					    (1360, 446)
-					    (1309, 446)
-					    (1309, 285))
-					line_style 	3
-					origin_attachment 	(1360, 446)
-					terminal_attachment 	(1309, 285))
-				    (object RoleView "primitiveTypeDefinition" @740
-					Parent_View 	@737
-					location   	(-624, 222)
-					label      	(object SegLabel @741
-					    Parent_View 	@740
-					    location   	(1204, 508)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	432
-					    justify    	0
-					    label      	"+primitiveTypeDefinition"
-					    pctDist    	-3.000000
-					    height     	62
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D55750243"
-					client     	@737
-					supplier   	@699
-					vertices   	(list Points
-					    (1360, 446)
-					    (1412, 446)
-					    (1412, 285))
-					line_style 	3
-					origin_attachment 	(1360, 446)
-					terminal_attachment 	(1412, 285)
-					label      	(object SegLabel @742
-					    Parent_View 	@740
-					    location   	(1373, 409)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.062147
-					    height     	38
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleFinal" @743
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2080, 512)
-				label      	(object ItemLabel
-				    Parent_View 	@743
-				    location   	(1917, 428)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"XSDSimpleFinal")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@743
-				    location   	(1917, 378)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C25D0295"
-				compartment 	(object Compartment
-				    Parent_View 	@743
-				    location   	(1917, 488)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	3
-				    max_width  	202
-				    compartmentItems 	(list Compartment
-					"+ list"
-					"+ restriction"
-					"+ union"))
-				width      	344
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDVariety" @744
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2080, 176)
-				label      	(object ItemLabel
-				    Parent_View 	@744
-				    location   	(1918, 92)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDVariety")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@744
-				    location   	(1918, 42)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B8FF7730249"
-				width      	342
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @745
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C7B0396"
-				client     	@693
-				supplier   	@688
-				line_style 	3
-				origin_attachment 	(591, 561)
-				terminal_attachment 	(591, 522)
-				drawSupplier 	@689)
-			    (object InheritView "" @746
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C800394"
-				client     	@690
-				supplier   	@688
-				line_style 	3
-				origin_attachment 	(272, 561)
-				terminal_attachment 	(272, 522)
-				drawSupplier 	@689)
-			    (object InheritView "" @747
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D25680259"
-				client     	@688
-				supplier   	@670
-				line_style 	3
-				origin_attachment 	(366, 306)
-				terminal_attachment 	(366, 215))
-			    (object InheritView "" @748
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C8801B4"
-				client     	@648
-				supplier   	@690
-				line_style 	3
-				origin_attachment 	(147, 828)
-				terminal_attachment 	(147, 781)
-				drawSupplier 	@691)
-			    (object InheritView "" @749
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B590281"
-				client     	@665
-				supplier   	@678
-				line_style 	3
-				origin_attachment 	(150, 1840)
-				terminal_attachment 	(150, 1444))))
-		    (object ClassDiagram "5. Component Annotations"
-			quid       	"3B69D68D00D2"
-			title      	"5. Component Annotations"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUse" @750
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 80)
-				label      	(object ItemLabel
-				    Parent_View 	@750
-				    location   	(88, 37)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	336
-				    justify    	0
-				    label      	"XSDAttributeUse")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B68354601A8"
-				width      	354
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @751
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 1696)
-				label      	(object ItemLabel
-				    Parent_View 	@751
-				    location   	(82, 1653)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	252
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	270
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @752
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1872, 1504)
-				label      	(object ItemLabel
-				    Parent_View 	@752
-				    location   	(1626, 1461)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	492
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				width      	510
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDConstrainingFacet" @753
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1888, 304)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@753
-				    location   	(1663, 261)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	450
-				    justify    	0
-				    label      	"XSDConstrainingFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C6B340093"
-				width      	468
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDIdentityConstraintDefinition" @754
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(368, 1360)
-				label      	(object ItemLabel
-				    Parent_View 	@754
-				    location   	(74, 1317)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	588
-				    justify    	0
-				    label      	"XSDIdentityConstraintDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B2603A2"
-				width      	606
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDNotationDeclaration" @755
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(320, 704)
-				label      	(object ItemLabel
-				    Parent_View 	@755
-				    location   	(86, 661)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"XSDNotationDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDAA021C"
-				width      	486
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @756
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(320, 1184)
-				label      	(object ItemLabel
-				    Parent_View 	@756
-				    location   	(74, 1141)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	492
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				width      	510
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @757
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(320, 544)
-				label      	(object ItemLabel
-				    Parent_View 	@757
-				    location   	(86, 501)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				width      	486
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @758
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1200, 80)
-				label      	(object ItemLabel
-				    Parent_View 	@758
-				    location   	(1068, 37)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	264
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	282
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @759
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1936, 1216)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@759
-				    location   	(1750, 1173)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	372
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	390
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @760
-				location   	(1994, 1412)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@759
-				vertices   	(list Points
-				    (1994, 1412)
-				    (1994, 1271)))
-			    (object InheritView "" @761
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A1302A2"
-				client     	@752
-				supplier   	@759
-				line_style 	3
-				origin_attachment 	(2084, 1449)
-				terminal_attachment 	(2084, 1412)
-				drawSupplier 	@760)
-			    (object ClassView "Class" "Logical View::xsd::XSDXPathDefinition" @762
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(272, 864)
-				label      	(object ItemLabel
-				    Parent_View 	@762
-				    location   	(80, 821)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	384
-				    justify    	0
-				    label      	"XSDXPathDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6D83BB0355"
-				width      	402
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDFacet" @763
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2000, 80)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@763
-				    location   	(1892, 37)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	216
-				    justify    	0
-				    label      	"XSDFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C359403D2"
-				width      	234
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @764
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(352, 384)
-				label      	(object ItemLabel
-				    Parent_View 	@764
-				    location   	(84, 341)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	536
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	554
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @765
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(320, 224)
-				label      	(object ItemLabel
-				    Parent_View 	@765
-				    location   	(86, 181)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	486
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @766
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1792, 1712)
-				label      	(object ItemLabel
-				    Parent_View 	@766
-				    location   	(1467, 1674)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	651
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				width      	669
-				height     	100
-				annotation 	8)
-			    (object InheritView "" @767
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0D01901F1"
-				client     	@766
-				supplier   	@759
-				line_style 	3
-				origin_attachment 	(1572, 1662)
-				terminal_attachment 	(1572, 1412)
-				drawSupplier 	@760)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroup" @768
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 1024)
-				label      	(object ItemLabel
-				    Parent_View 	@768
-				    location   	(78, 981)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDModelGroup")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6834E00291"
-				width      	342
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDRepeatableFacet" @769
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1904, 560)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@769
-				    location   	(1688, 517)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	432
-				    justify    	0
-				    label      	"XSDRepeatableFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C6AA6031A"
-				width      	450
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @770
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 1536)
-				label      	(object ItemLabel
-				    Parent_View 	@770
-				    location   	(71, 1493)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	274
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				width      	292
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAnnotation" @771
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1232, 944)
-				label      	(object ItemLabel
-				    Parent_View 	@771
-				    location   	(872, 685)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	720
-				    justify    	0
-				    label      	"XSDAnnotation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDC80233"
-				width      	738
-				height     	543
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$132" @772
-				location   	(865, 1359)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB0D0183"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$133" @773
-					Parent_View 	@772
-					location   	(-255, 559)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB0D033C"
-					client     	@772
-					supplier   	@754
-					line_style 	3
-					origin_attachment 	(865, 1359)
-					terminal_attachment 	(671, 1359))
-				    (object RoleView "annotation" @774
-					Parent_View 	@772
-					location   	(-255, 559)
-					label      	(object SegLabel @775
-					    Parent_View 	@774
-					    location   	(798, 1321)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	-1.116667
-					    height     	39
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB0D0346"
-					client     	@772
-					supplier   	@771
-					vertices   	(list Points
-					    (865, 1359)
-					    (925, 1359)
-					    (925, 1215))
-					line_style 	3
-					origin_attachment 	(865, 1359)
-					terminal_attachment 	(925, 1215)
-					label      	(object SegLabel @776
-					    Parent_View 	@774
-					    location   	(987, 1276)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.706422
-					    height     	62
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$156" @777
-				location   	(713, 709)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB0F0212"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$157" @778
-					Parent_View 	@777
-					location   	(-407, -90)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB1000C9"
-					client     	@777
-					supplier   	@755
-					line_style 	3
-					origin_attachment 	(713, 709)
-					terminal_attachment 	(563, 709))
-				    (object RoleView "annotation" @779
-					Parent_View 	@777
-					location   	(-407, -90)
-					label      	(object SegLabel @780
-					    Parent_View 	@779
-					    location   	(727, 667)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.095238
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB1000D3"
-					client     	@777
-					supplier   	@771
-					line_style 	3
-					origin_attachment 	(713, 709)
-					terminal_attachment 	(863, 709)
-					label      	(object SegLabel @781
-					    Parent_View 	@779
-					    location   	(796, 753)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.553571
-					    height     	44
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$150" @782
-				location   	(719, 1193)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB15008A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$151" @783
-					Parent_View 	@782
-					location   	(-401, 393)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB160096"
-					client     	@782
-					supplier   	@756
-					line_style 	3
-					origin_attachment 	(719, 1193)
-					terminal_attachment 	(575, 1193))
-				    (object RoleView "annotation" @784
-					Parent_View 	@782
-					location   	(-401, 393)
-					label      	(object SegLabel @785
-					    Parent_View 	@784
-					    location   	(720, 1147)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.006993
-					    height     	47
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB1600A0"
-					client     	@782
-					supplier   	@771
-					line_style 	3
-					origin_attachment 	(719, 1193)
-					terminal_attachment 	(863, 1193)
-					label      	(object SegLabel @786
-					    Parent_View 	@784
-					    location   	(806, 1240)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.604167
-					    height     	47
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$110" @787
-				location   	(785, 550)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB0A0066"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$111" @788
-					Parent_View 	@787
-					location   	(-335, -250)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB0B023F"
-					client     	@787
-					supplier   	@757
-					line_style 	3
-					origin_attachment 	(785, 550)
-					terminal_attachment 	(563, 550))
-				    (object RoleView "annotation" @789
-					Parent_View 	@787
-					location   	(-335, -250)
-					label      	(object SegLabel @790
-					    Parent_View 	@789
-					    location   	(779, 516)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	-0.070707
-					    height     	35
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB0B0249"
-					client     	@787
-					supplier   	@771
-					vertices   	(list Points
-					    (785, 550)
-					    (884, 550)
-					    (884, 673))
-					line_style 	3
-					origin_attachment 	(785, 550)
-					terminal_attachment 	(884, 673)
-					label      	(object SegLabel @791
-					    Parent_View 	@789
-					    location   	(935, 612)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.729730
-					    height     	51
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$182" @792
-				location   	(1184, 404)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69E4560290"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$183" @793
-					Parent_View 	@792
-					location   	(-32, -412)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69E4570165"
-					client     	@792
-					supplier   	@758
-					line_style 	3
-					origin_attachment 	(1184, 404)
-					terminal_attachment 	(1184, 135))
-				    (object RoleView "annotations" @794
-					Parent_View 	@792
-					location   	(-32, -412)
-					label      	(object SegLabel @795
-					    Parent_View 	@794
-					    location   	(1324, 226)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	249
-					    justify    	0
-					    label      	"+annotations"
-					    pctDist    	-0.665428
-					    height     	140
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69E457016F"
-					client     	@792
-					supplier   	@771
-					line_style 	3
-					origin_attachment 	(1184, 404)
-					terminal_attachment 	(1184, 673)
-					label      	(object SegLabel @796
-					    Parent_View 	@794
-					    location   	(1251, 615)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.784387
-					    height     	67
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$198" @797
-				location   	(1752, 1034)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69E2910158"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$199" @798
-					Parent_View 	@797
-					location   	(536, 218)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69E292019F"
-					client     	@797
-					supplier   	@759
-					vertices   	(list Points
-					    (1752, 1034)
-					    (1812, 1034)
-					    (1812, 1161))
-					line_style 	3
-					origin_attachment 	(1752, 1034)
-					terminal_attachment 	(1812, 1161))
-				    (object RoleView "annotation" @799
-					Parent_View 	@797
-					location   	(536, 218)
-					label      	(object SegLabel @800
-					    Parent_View 	@799
-					    location   	(1743, 997)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.059603
-					    height     	37
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69E29201A9"
-					client     	@797
-					supplier   	@771
-					line_style 	3
-					origin_attachment 	(1752, 1034)
-					terminal_attachment 	(1601, 1034)
-					label      	(object SegLabel @801
-					    Parent_View 	@799
-					    location   	(1684, 1066)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.450331
-					    height     	32
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$200" @802
-				location   	(1896, 881)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B9006CF0088"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$201" @803
-					Parent_View 	@802
-					location   	(621, 40)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B9006D1015D"
-					client     	@802
-					supplier   	@759
-					vertices   	(list Points
-					    (1896, 881)
-					    (1956, 881)
-					    (1956, 1161))
-					line_style 	3
-					origin_attachment 	(1896, 881)
-					terminal_attachment 	(1956, 1161))
-				    (object RoleView "derivationAnnotation" @804
-					Parent_View 	@802
-					location   	(621, 40)
-					label      	(object SegLabel @805
-					    Parent_View 	@804
-					    location   	(1821, 842)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	390
-					    justify    	0
-					    label      	"+derivationAnnotation"
-					    pctDist    	0.254237
-					    height     	40
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B9006D10167"
-					client     	@802
-					supplier   	@771
-					line_style 	3
-					origin_attachment 	(1896, 881)
-					terminal_attachment 	(1601, 881)
-					label      	(object SegLabel @806
-					    Parent_View 	@804
-					    location   	(1689, 914)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.705085
-					    height     	33
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$202" @807
-				location   	(2040, 715)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB330264"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$203" @808
-					Parent_View 	@807
-					location   	(920, -85)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB340284"
-					client     	@807
-					supplier   	@759
-					vertices   	(list Points
-					    (2040, 715)
-					    (2100, 715)
-					    (2100, 1161))
-					line_style 	3
-					origin_attachment 	(2040, 715)
-					terminal_attachment 	(2100, 1161))
-				    (object RoleView "annotations" @809
-					Parent_View 	@807
-					location   	(920, -85)
-					label      	(object SegLabel @810
-					    Parent_View 	@809
-					    location   	(1758, 681)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+annotations"
-					    pctDist    	0.643192
-					    height     	35
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB34028E"
-					client     	@807
-					supplier   	@771
-					line_style 	3
-					origin_attachment 	(2040, 715)
-					terminal_attachment 	(1601, 715)
-					label      	(object SegLabel @811
-					    Parent_View 	@809
-					    location   	(1685, 746)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.809313
-					    height     	31
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$220" @812
-				location   	(668, 865)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C239134004F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$221" @813
-					Parent_View 	@812
-					location   	(-612, 33)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C23913600CA"
-					client     	@812
-					supplier   	@762
-					line_style 	3
-					origin_attachment 	(668, 865)
-					terminal_attachment 	(473, 865))
-				    (object RoleView "annotation" @814
-					Parent_View 	@812
-					location   	(-612, 33)
-					label      	(object SegLabel @815
-					    Parent_View 	@814
-					    location   	(714, 825)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.234146
-					    height     	41
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C23913600D4"
-					client     	@812
-					supplier   	@771
-					line_style 	3
-					origin_attachment 	(668, 865)
-					terminal_attachment 	(863, 865)
-					label      	(object SegLabel @816
-					    Parent_View 	@814
-					    location   	(801, 903)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.682051
-					    height     	38
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$124" @817
-				location   	(1472, 167)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D23B901CD"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$125" @818
-					Parent_View 	@817
-					location   	(256, -649)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D23BA01C4"
-					client     	@817
-					supplier   	@763
-					vertices   	(list Points
-					    (1472, 167)
-					    (1472, 72)
-					    (1883, 72))
-					line_style 	3
-					origin_attachment 	(1472, 167)
-					terminal_attachment 	(1883, 72))
-				    (object RoleView "annotation" @819
-					Parent_View 	@817
-					location   	(256, -649)
-					label      	(object SegLabel @820
-					    Parent_View 	@819
-					    location   	(1604, 129)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	-0.076305
-					    height     	132
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D23BA01CE"
-					client     	@817
-					supplier   	@771
-					line_style 	3
-					origin_attachment 	(1472, 167)
-					terminal_attachment 	(1472, 673)
-					label      	(object SegLabel @821
-					    Parent_View 	@819
-					    location   	(1419, 618)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.893574
-					    height     	54
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$74" @822
-				location   	(927, 350)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB060291"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$75" @823
-					Parent_View 	@822
-					location   	(-193, -450)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB070171"
-					client     	@822
-					supplier   	@764
-					line_style 	3
-					origin_attachment 	(927, 350)
-					terminal_attachment 	(629, 350))
-				    (object RoleView "annotation" @824
-					Parent_View 	@822
-					location   	(-193, -450)
-					label      	(object SegLabel @825
-					    Parent_View 	@824
-					    location   	(878, 310)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	-0.816667
-					    height     	41
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB070172"
-					client     	@822
-					supplier   	@771
-					vertices   	(list Points
-					    (927, 350)
-					    (987, 350)
-					    (987, 673))
-					line_style 	3
-					origin_attachment 	(927, 350)
-					terminal_attachment 	(987, 673)
-					label      	(object SegLabel @826
-					    Parent_View 	@824
-					    location   	(1037, 612)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.843342
-					    height     	50
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$66" @827
-				location   	(1027, 222)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DADC02F5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$67" @828
-					Parent_View 	@827
-					location   	(-93, -578)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DADD0238"
-					client     	@827
-					supplier   	@765
-					line_style 	3
-					origin_attachment 	(1027, 222)
-					terminal_attachment 	(563, 222))
-				    (object RoleView "annotation" @829
-					Parent_View 	@827
-					location   	(-93, -578)
-					label      	(object SegLabel @830
-					    Parent_View 	@829
-					    location   	(1003, 188)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	-0.406250
-					    height     	35
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DADD0242"
-					client     	@827
-					supplier   	@771
-					vertices   	(list Points
-					    (1027, 222)
-					    (1087, 222)
-					    (1087, 673))
-					line_style 	3
-					origin_attachment 	(1027, 222)
-					terminal_attachment 	(1087, 673)
-					label      	(object SegLabel @831
-					    Parent_View 	@829
-					    location   	(1137, 613)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	100
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.882583
-					    height     	50
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$90" @832
-				location   	(1494, 1438)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B90068801C2"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$91" @833
-					Parent_View 	@832
-					location   	(214, 590)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B90068A0111"
-					client     	@832
-					supplier   	@766
-					line_style 	3
-					origin_attachment 	(1494, 1438)
-					terminal_attachment 	(1494, 1662))
-				    (object RoleView "contentAnnotation" @834
-					Parent_View 	@832
-					location   	(214, 590)
-					label      	(object SegLabel @835
-					    Parent_View 	@834
-					    location   	(1696, 1356)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	360
-					    justify    	0
-					    label      	"+contentAnnotation"
-					    pctDist    	0.367713
-					    height     	202
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B90068A011B"
-					client     	@832
-					supplier   	@771
-					line_style 	3
-					origin_attachment 	(1494, 1438)
-					terminal_attachment 	(1494, 1215)
-					label      	(object SegLabel @836
-					    Parent_View 	@834
-					    location   	(1443, 1279)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.713004
-					    height     	51
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$144" @837
-				location   	(637, 1022)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB1702C8"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$145" @838
-					Parent_View 	@837
-					location   	(-483, 222)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB1803E2"
-					client     	@837
-					supplier   	@768
-					line_style 	3
-					origin_attachment 	(637, 1022)
-					terminal_attachment 	(411, 1022))
-				    (object RoleView "annotation" @839
-					Parent_View 	@837
-					location   	(-483, 222)
-					label      	(object SegLabel @840
-					    Parent_View 	@839
-					    location   	(710, 979)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.328889
-					    height     	44
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB190004"
-					client     	@837
-					supplier   	@771
-					line_style 	3
-					origin_attachment 	(637, 1022)
-					terminal_attachment 	(863, 1022)
-					label      	(object SegLabel @841
-					    Parent_View 	@839
-					    location   	(802, 1062)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.730088
-					    height     	40
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$64" @842
-				location   	(1581, 607)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C626EA70102"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$65" @843
-					Parent_View 	@842
-					location   	(301, -225)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C626EA90191"
-					client     	@842
-					supplier   	@769
-					vertices   	(list Points
-					    (1581, 607)
-					    (1581, 547)
-					    (1679, 547))
-					line_style 	3
-					origin_attachment 	(1581, 607)
-					terminal_attachment 	(1679, 547))
-				    (object RoleView "annotations" @844
-					Parent_View 	@842
-					location   	(301, -225)
-					label      	(object SegLabel @845
-					    Parent_View 	@844
-					    location   	(1669, 462)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+annotations"
-					    pctDist    	-2.196970
-					    height     	88
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C626EA90192"
-					client     	@842
-					supplier   	@771
-					line_style 	3
-					origin_attachment 	(1581, 607)
-					terminal_attachment 	(1581, 673)
-					label      	(object SegLabel @846
-					    Parent_View 	@844
-					    location   	(1539, 620)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.196970
-					    height     	42
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$204" @847
-				location   	(849, 1496)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB11026F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$205" @848
-					Parent_View 	@847
-					location   	(-271, 696)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB1201F9"
-					client     	@847
-					supplier   	@770
-					line_style 	3
-					origin_attachment 	(849, 1496)
-					terminal_attachment 	(354, 1496))
-				    (object RoleView "annotation" @849
-					Parent_View 	@847
-					location   	(-271, 696)
-					label      	(object SegLabel @850
-					    Parent_View 	@849
-					    location   	(942, 1464)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.188259
-					    height     	33
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB120203"
-					client     	@847
-					supplier   	@771
-					vertices   	(list Points
-					    (849, 1496)
-					    (1062, 1496)
-					    (1062, 1215))
-					line_style 	3
-					origin_attachment 	(849, 1496)
-					terminal_attachment 	(1062, 1215)
-					label      	(object SegLabel @851
-					    Parent_View 	@849
-					    location   	(1115, 1279)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.872690
-					    height     	53
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$206" @852
-				location   	(952, 1565)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C626EB30005"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$207" @853
-					Parent_View 	@852
-					location   	(-328, 733)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C626EB40327"
-					client     	@852
-					supplier   	@770
-					line_style 	3
-					origin_attachment 	(952, 1565)
-					terminal_attachment 	(354, 1565))
-				    (object RoleView "annotations" @854
-					Parent_View 	@852
-					location   	(-328, 733)
-					label      	(object SegLabel @855
-					    Parent_View 	@854
-					    location   	(1075, 1538)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+annotations"
-					    pctDist    	0.204959
-					    height     	28
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C626EB40332"
-					client     	@852
-					supplier   	@771
-					vertices   	(list Points
-					    (952, 1565)
-					    (1200, 1565)
-					    (1200, 1215))
-					line_style 	3
-					origin_attachment 	(952, 1565)
-					terminal_attachment 	(1200, 1215)
-					label      	(object SegLabel @856
-					    Parent_View 	@854
-					    location   	(1254, 1275)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	1))))
-			    (object InheritView "" @857
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C800394"
-				client     	@753
-				supplier   	@763
-				line_style 	3
-				origin_attachment 	(1984, 249)
-				terminal_attachment 	(1984, 135))
-			    (object InheritView "" @858
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C8F002E"
-				client     	@769
-				supplier   	@753
-				line_style 	3
-				origin_attachment 	(1997, 505)
-				terminal_attachment 	(1997, 359))))
-		    (object ClassDiagram "6. Concrete Components"
-			quid       	"3B6AD74D03C4"
-			title      	"6. Concrete Components"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDComponent" @859
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(288, 416)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@859
-				    location   	(126, 373)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846E90029"
-				width      	342
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupContent" @860
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(832, 416)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@860
-				    location   	(568, 373)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	528
-				    justify    	0
-				    label      	"XSDAttributeGroupContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6940200089"
-				width      	546
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefineContent" @861
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1200, 672)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@861
-				    location   	(991, 629)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	418
-				    justify    	0
-				    label      	"XSDRedefineContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AE2060172"
-				width      	436
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaContent" @862
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1360, 416)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@862
-				    location   	(1156, 373)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	408
-				    justify    	0
-				    label      	"XSDSchemaContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B688CB800BA"
-				width      	426
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @863
-				location   	(1360, 561)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@862
-				vertices   	(list Points
-				    (1360, 561)
-				    (1360, 471)))
-			    (object ClassView "Class" "Logical View::xsd::XSDInclude" @864
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1632, 1200)
-				label      	(object ItemLabel
-				    Parent_View 	@864
-				    location   	(1512, 1157)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	240
-				    justify    	0
-				    label      	"XSDInclude")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B688C7D0250"
-				width      	258
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDImport" @865
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1408, 944)
-				label      	(object ItemLabel
-				    Parent_View 	@865
-				    location   	(1294, 901)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	228
-				    justify    	0
-				    label      	"XSDImport")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B688C93017F"
-				width      	246
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefine" @866
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1936, 1200)
-				label      	(object ItemLabel
-				    Parent_View 	@866
-				    location   	(1805, 1157)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	262
-				    justify    	0
-				    label      	"XSDRedefine")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B688C9B02AD"
-				width      	280
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAnnotation" @867
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(800, 1200)
-				label      	(object ItemLabel
-				    Parent_View 	@867
-				    location   	(375, 1153)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	851
-				    justify    	0
-				    label      	"XSDAnnotation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDC80233"
-				width      	869
-				height     	119
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$142" @868
-				location   	(1368, 1206)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6ADCC5007E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$143" @869
-					Parent_View 	@868
-					location   	(1160, 406)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6ADCC6006B"
-					client     	@868
-					supplier   	@864
-					line_style 	3
-					origin_attachment 	(1368, 1206)
-					terminal_attachment 	(1503, 1206))
-				    (object RoleView "annotation" @870
-					Parent_View 	@868
-					location   	(1160, 406)
-					label      	(object SegLabel @871
-					    Parent_View 	@870
-					    location   	(1347, 1154)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.154412
-					    height     	53
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6ADCC6006C"
-					client     	@868
-					supplier   	@867
-					line_style 	3
-					origin_attachment 	(1368, 1206)
-					terminal_attachment 	(1234, 1206)
-					label      	(object SegLabel @872
-					    Parent_View 	@870
-					    location   	(1300, 1253)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	107
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.514706
-					    height     	47
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$140" @873
-				location   	(1168, 1022)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6ADCD802FC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$141" @874
-					Parent_View 	@873
-					location   	(960, 222)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6ADCD9018B"
-					client     	@873
-					supplier   	@865
-					vertices   	(list Points
-					    (1168, 1022)
-					    (1168, 962)
-					    (1285, 962))
-					line_style 	3
-					origin_attachment 	(1168, 1022)
-					terminal_attachment 	(1285, 962))
-				    (object RoleView "annotation" @875
-					Parent_View 	@873
-					location   	(960, 222)
-					label      	(object SegLabel @876
-					    Parent_View 	@875
-					    location   	(1290, 1075)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.445378
-					    height     	122
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6ADCD9018C"
-					client     	@873
-					supplier   	@867
-					line_style 	3
-					origin_attachment 	(1168, 1022)
-					terminal_attachment 	(1168, 1141)
-					label      	(object SegLabel @877
-					    Parent_View 	@875
-					    location   	(1127, 1074)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.436975
-					    height     	41
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$162" @878
-				location   	(1563, 1353)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6ADE42009A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$163" @879
-					Parent_View 	@878
-					location   	(1355, 553)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6ADE4302FE"
-					client     	@878
-					supplier   	@866
-					vertices   	(list Points
-					    (1563, 1353)
-					    (1940, 1353)
-					    (1940, 1255))
-					line_style 	3
-					origin_attachment 	(1563, 1353)
-					terminal_attachment 	(1940, 1255))
-				    (object RoleView "annotations" @880
-					Parent_View 	@878
-					location   	(1355, 553)
-					label      	(object SegLabel @881
-					    Parent_View 	@880
-					    location   	(1317, 1322)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+annotations"
-					    pctDist    	0.516807
-					    height     	32
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6ADE430308"
-					client     	@878
-					supplier   	@867
-					vertices   	(list Points
-					    (1563, 1353)
-					    (1181, 1353)
-					    (1181, 1259))
-					line_style 	3
-					origin_attachment 	(1563, 1353)
-					terminal_attachment 	(1181, 1259)
-					label      	(object SegLabel @882
-					    Parent_View 	@880
-					    location   	(1130, 1326)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.861345
-					    height     	52
-					    orientation 	0))))
-			    (object InheritTreeView "" @883
-				location   	(288, 561)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@859
-				vertices   	(list Points
-				    (288, 561)
-				    (288, 471)))
-			    (object ClassView "Class" "Logical View::xsd::XSDNamedComponent" @884
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(688, 672)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@884
-				    location   	(460, 629)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	456
-				    justify    	0
-				    label      	"XSDNamedComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846D303A4"
-				width      	474
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDParticleContent" @885
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1856, 416)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@885
-				    location   	(1658, 373)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	396
-				    justify    	0
-				    label      	"XSDParticleContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6BD22300C6"
-				width      	414
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefinableComponent" @886
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(720, 960)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@886
-				    location   	(450, 917)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	540
-				    justify    	0
-				    label      	"XSDRedefinableComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B7FCA8B020B"
-				width      	558
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDScope" @887
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(224, 672)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@887
-				    location   	(110, 629)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	228
-				    justify    	0
-				    label      	"XSDScope")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B54000F2"
-				width      	246
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @888
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCD640231"
-				client     	@887
-				supplier   	@859
-				line_style 	3
-				origin_attachment 	(221, 617)
-				terminal_attachment 	(221, 561)
-				drawSupplier 	@883)
-			    (object InheritView "" @889
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0CEA20197"
-				client     	@884
-				supplier   	@859
-				line_style 	3
-				origin_attachment 	(589, 617)
-				terminal_attachment 	(589, 561)
-				drawSupplier 	@883)
-			    (object InheritView "" @890
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AE2B301D5"
-				client     	@861
-				supplier   	@862
-				line_style 	3
-				origin_attachment 	(1016, 617)
-				terminal_attachment 	(1016, 561)
-				drawSupplier 	@863)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaCompositor" @891
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1824, 944)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@891
-				    location   	(1590, 901)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"XSDSchemaCompositor")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C21DB4102AE"
-				width      	486
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @892
-				location   	(1824, 1089)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@891
-				vertices   	(list Points
-				    (1824, 1089)
-				    (1824, 999)))
-			    (object InheritView "" @893
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AD8DC0381"
-				client     	@864
-				supplier   	@891
-				line_style 	3
-				origin_attachment 	(1666, 1145)
-				terminal_attachment 	(1666, 1089)
-				drawSupplier 	@892)
-			    (object InheritView "" @894
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DB640240"
-				client     	@866
-				supplier   	@891
-				line_style 	3
-				origin_attachment 	(1934, 1145)
-				terminal_attachment 	(1934, 1089)
-				drawSupplier 	@892)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaDirective" @895
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1840, 672)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@895
-				    location   	(1630, 629)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	420
-				    justify    	0
-				    label      	"XSDSchemaDirective")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD8A202A2"
-				width      	438
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @896
-				location   	(1762, 819)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@895
-				vertices   	(list Points
-				    (1762, 819)
-				    (1762, 727)))
-			    (object InheritView "" @897
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AD8D9003E"
-				client     	@865
-				supplier   	@895
-				line_style 	3
-				origin_attachment 	(1416, 889)
-				terminal_attachment 	(1416, 819)
-				drawSupplier 	@896)
-			    (object InheritView "" @898
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AE32102AF"
-				client     	@895
-				supplier   	@862
-				line_style 	3
-				origin_attachment 	(1756, 617)
-				terminal_attachment 	(1756, 561)
-				drawSupplier 	@863)
-			    (object ClassView "Class" "Logical View::xsd::XSDConcreteComponent" @899
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				location   	(1120, 144)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@899
-				    location   	(875, 101)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	490
-				    justify    	0
-				    label      	"XSDConcreteComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD7B40065"
-				width      	508
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @900
-				location   	(1120, 289)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@899
-				vertices   	(list Points
-				    (1120, 289)
-				    (1120, 199)))
-			    (object AssociationViewNew "$UNNAMED$104" @901
-				location   	(1485, 215)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B751B0803C7"
-				roleview_list 	(list RoleViews
-				    (object RoleView "container" @902
-					Parent_View 	@901
-					location   	(989, 103)
-					label      	(object SegLabel @903
-					    Parent_View 	@902
-					    location   	(1604, 210)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	192
-					    justify    	0
-					    label      	"+container"
-					    pctDist    	0.033113
-					    height     	119
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B751B0C01CE"
-					client     	@901
-					supplier   	@899
-					vertices   	(list Points
-					    (1485, 215)
-					    (1485, 176)
-					    (1374, 176))
-					line_style 	3
-					origin_attachment 	(1485, 215)
-					terminal_attachment 	(1374, 176)
-					label      	(object SegLabel @904
-					    Parent_View 	@902
-					    location   	(1435, 226)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	69
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.602649
-					    height     	50
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$105" @905
-					Parent_View 	@901
-					location   	(989, 103)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B751B0C01CF"
-					client     	@901
-					supplier   	@899
-					vertices   	(list Points
-					    (1485, 215)
-					    (1485, 254)
-					    (1345, 254)
-					    (1345, 199))
-					line_style 	3
-					origin_attachment 	(1485, 215)
-					terminal_attachment 	(1345, 199))))
-			    (object AssociationViewNew "$UNNAMED$106" @906
-				location   	(773, 216)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B751B480261"
-				roleview_list 	(list RoleViews
-				    (object RoleView "rootContainer" @907
-					Parent_View 	@906
-					location   	(53, 104)
-					label      	(object SegLabel @908
-					    Parent_View 	@907
-					    location   	(614, 217)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	264
-					    justify    	0
-					    label      	"+rootContainer"
-					    pctDist    	-0.025000
-					    height     	160
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B751B4C0285"
-					client     	@906
-					supplier   	@899
-					vertices   	(list Points
-					    (773, 216)
-					    (773, 176)
-					    (866, 176))
-					line_style 	3
-					origin_attachment 	(773, 216)
-					terminal_attachment 	(866, 176)
-					label      	(object SegLabel @909
-					    Parent_View 	@907
-					    location   	(800, 228)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.300000
-					    height     	27
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$107" @910
-					Parent_View 	@906
-					location   	(53, 104)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B751B4C0286"
-					client     	@906
-					supplier   	@899
-					vertices   	(list Points
-					    (773, 216)
-					    (773, 257)
-					    (895, 257)
-					    (895, 199))
-					line_style 	3
-					origin_attachment 	(773, 216)
-					terminal_attachment 	(895, 199))))
-			    (object InheritView "" @911
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AD8E60372"
-				client     	@862
-				supplier   	@899
-				line_style 	3
-				origin_attachment 	(1367, 361)
-				terminal_attachment 	(1367, 289)
-				drawSupplier 	@900)
-			    (object InheritView "" @912
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B72D8E200EA"
-				client     	@860
-				supplier   	@899
-				line_style 	3
-				origin_attachment 	(752, 361)
-				terminal_attachment 	(752, 289)
-				drawSupplier 	@900)
-			    (object InheritView "" @913
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0CEA903D2"
-				client     	@859
-				supplier   	@899
-				line_style 	3
-				origin_attachment 	(299, 361)
-				terminal_attachment 	(299, 289)
-				drawSupplier 	@900)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @914
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(192, 1200)
-				label      	(object ItemLabel
-				    Parent_View 	@914
-				    location   	(61, 1157)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	262
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	280
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @915
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCC4A0182"
-				client     	@914
-				supplier   	@887
-				line_style 	3
-				origin_attachment 	(216, 1145)
-				terminal_attachment 	(216, 727))
-			    (object AssociationViewNew "$UNNAMED$218" @916
-				location   	(1382, 1425)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DD0C03DB"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$219" @917
-					Parent_View 	@916
-					location   	(1190, 225)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DD100304"
-					client     	@916
-					supplier   	@891
-					vertices   	(list Points
-					    (1382, 1425)
-					    (2147, 1425)
-					    (2147, 943)
-					    (2067, 943))
-					line_style 	3
-					origin_attachment 	(1382, 1425)
-					terminal_attachment 	(2067, 943))
-				    (object RoleView "incorporatedSchema" @918
-					Parent_View 	@916
-					location   	(1190, 225)
-					label      	(object SegLabel @919
-					    Parent_View 	@918
-					    location   	(445, 1389)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+incorporatedSchema"
-					    pctDist    	0.706546
-					    height     	37
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DD100305"
-					client     	@916
-					supplier   	@914
-					vertices   	(list Points
-					    (1382, 1425)
-					    (225, 1425)
-					    (225, 1255))
-					line_style 	3
-					origin_attachment 	(1382, 1425)
-					terminal_attachment 	(225, 1255)
-					label      	(object SegLabel @920
-					    Parent_View 	@918
-					    location   	(183, 1392)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.896915
-					    height     	43
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$216" @921
-				location   	(1505, 1503)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DCC700EC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$217" @922
-					Parent_View 	@921
-					location   	(1313, 303)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DCCE0042"
-					client     	@921
-					supplier   	@895
-					vertices   	(list Points
-					    (1505, 1503)
-					    (2188, 1503)
-					    (2188, 675)
-					    (2059, 675))
-					line_style 	3
-					origin_attachment 	(1505, 1503)
-					terminal_attachment 	(2059, 675))
-				    (object RoleView "resolvedSchema" @923
-					Parent_View 	@921
-					location   	(1313, 303)
-					label      	(object SegLabel @924
-					    Parent_View 	@923
-					    location   	(303, 1472)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	324
-					    justify    	0
-					    label      	"+resolvedSchema"
-					    pctDist    	0.733333
-					    height     	32
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DCCE0043"
-					client     	@921
-					supplier   	@914
-					vertices   	(list Points
-					    (1505, 1503)
-					    (113, 1503)
-					    (113, 1255))
-					line_style 	3
-					origin_attachment 	(1505, 1503)
-					terminal_attachment 	(113, 1255)
-					label      	(object SegLabel @925
-					    Parent_View 	@923
-					    location   	(73, 1472)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.867683
-					    height     	41
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$108" @926
-				location   	(66, 244)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B751C310356"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$109" @927
-					Parent_View 	@926
-					location   	(-94, -444)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B751C330331"
-					client     	@926
-					supplier   	@899
-					vertices   	(list Points
-					    (66, 244)
-					    (66, 144)
-					    (866, 144))
-					line_style 	3
-					origin_attachment 	(66, 244)
-					terminal_attachment 	(866, 144))
-				    (object RoleView "schema" @928
-					Parent_View 	@926
-					location   	(-94, -444)
-					label      	(object SegLabel @929
-					    Parent_View 	@928
-					    location   	(165, 93)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+schema"
-					    pctDist    	-0.168113
-					    height     	99
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B751C33033B"
-					client     	@926
-					supplier   	@914
-					line_style 	3
-					origin_attachment 	(66, 244)
-					terminal_attachment 	(66, 1145)
-					label      	(object SegLabel @930
-					    Parent_View 	@928
-					    location   	(136, 184)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	113
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	-0.066593
-					    height     	70
-					    orientation 	0))))
-			    (object InheritView "" @931
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B780BD90059"
-				client     	@885
-				supplier   	@899
-				line_style 	3
-				origin_attachment 	(1759, 361)
-				terminal_attachment 	(1759, 289)
-				drawSupplier 	@900)
-			    (object InheritView "" @932
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69E1770116"
-				client     	@867
-				supplier   	@859
-				line_style 	3
-				origin_attachment 	(400, 1141)
-				terminal_attachment 	(400, 561)
-				drawSupplier 	@883)
-			    (object InheritTreeView "" @933
-				location   	(1012, 837)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@861
-				vertices   	(list Points
-				    (1012, 837)
-				    (1012, 727)))
-			    (object InheritView "" @934
-				stereotype 	(object SegLabel @935
-				    Parent_View 	@934
-				    location   	(1071, 871)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	243
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.888158
-				    height     	34
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B7FD4E20366"
-				client     	@867
-				supplier   	@861
-				line_style 	3
-				origin_attachment 	(1037, 1141)
-				terminal_attachment 	(1037, 837)
-				drawSupplier 	@933)
-			    (object InheritView "" @936
-				stereotype 	(object SegLabel @937
-				    Parent_View 	@936
-				    location   	(890, 865)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	263
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.581633
-				    height     	36
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B7FD4BA023C"
-				client     	@886
-				supplier   	@861
-				line_style 	3
-				origin_attachment 	(925, 905)
-				terminal_attachment 	(925, 837)
-				drawSupplier 	@933)
-			    (object InheritView "" @938
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DB560092"
-				client     	@891
-				supplier   	@895
-				line_style 	3
-				origin_attachment 	(1828, 889)
-				terminal_attachment 	(1828, 819)
-				drawSupplier 	@896)))
-		    (object ClassDiagram "7. Concrete Attributes"
-			quid       	"3B9F8F7602C7"
-			title      	"7. Concrete Attributes"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDFeature" @939
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2144, 1440)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@939
-				    location   	(1938, 1359)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	412
-				    justify    	0
-				    label      	"XSDFeature")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B537026C"
-				compartment 	(object Compartment
-				    Parent_View 	@939
-				    location   	(1938, 1419)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	382
-				    compartmentItems 	(list Compartment
-					"+ form : XSDForm"
-					"+ lexicalValue : String"))
-				width      	430
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDForm" @940
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2560, 1424)
-				label      	(object ItemLabel
-				    Parent_View 	@940
-				    location   	(2398, 1365)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDForm")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@940
-				    location   	(2398, 1315)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B9F913B01EB"
-				width      	342
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDConcreteComponent" @941
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(368, 96)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@941
-				    location   	(40, 37)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	657
-				    justify    	0
-				    label      	"XSDConcreteComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD7B40065"
-				compartment 	(object Compartment
-				    Parent_View 	@941
-				    location   	(40, 97)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	446
-				    compartmentItems 	(list Compartment
-					"+ element : DOMElement"))
-				width      	675
-				height     	143
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDComponent" @942
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(848, 384)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@942
-				    location   	(687, 333)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	322
-				    justify    	0
-				    label      	"XSDComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846E90029"
-				width      	340
-				height     	126
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDNamedComponent" @943
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1904, 944)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@943
-				    location   	(1678, 892)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	452
-				    justify    	0
-				    label      	"XSDNamedComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846D303A4"
-				width      	470
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefinableComponent" @944
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1600, 1408)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@944
-				    location   	(1328, 1356)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	544
-				    justify    	0
-				    label      	"XSDRedefinableComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B7FCA8B020B"
-				width      	562
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDScope" @945
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(864, 624)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@945
-				    location   	(745, 573)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	238
-				    justify    	0
-				    label      	"XSDScope")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B54000F2"
-				width      	256
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @946
-				location   	(850, 537)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@942
-				vertices   	(list Points
-				    (850, 537)
-				    (850, 447)))
-			    (object ClassView "Class" "Logical View::xsd::DOMElement" @947
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1248, 128)
-				label      	(object ItemLabel
-				    Parent_View 	@947
-				    location   	(873, 90)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	751
-				    justify    	0
-				    label      	"DOMElement")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@947
-				    location   	(873, 40)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	751
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	14671839
-				quidu      	"3B8189790200"
-				width      	769
-				height     	200
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaDirective" @948
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(288, 640)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@948
-				    location   	(41, 584)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	494
-				    justify    	0
-				    label      	"XSDSchemaDirective")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD8A202A2"
-				width      	512
-				height     	136
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaContent" @949
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 384)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@949
-				    location   	(38, 333)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	404
-				    justify    	0
-				    label      	"XSDSchemaContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B688CB800BA"
-				width      	422
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @950
-				location   	(368, 263)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@941
-				vertices   	(list Points
-				    (368, 263)
-				    (368, 167)))
-			    (object ClassView "Class" "Logical View::xsd::XSDDisallowedSubstitutions" @951
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(992, 1456)
-				label      	(object ItemLabel
-				    Parent_View 	@951
-				    location   	(723, 1347)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	538
-				    justify    	0
-				    label      	"XSDDisallowedSubstitutions")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@951
-				    location   	(723, 1297)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	538
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C5A403DF"
-				compartment 	(object Compartment
-				    Parent_View 	@951
-				    location   	(723, 1407)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	225
-				    compartmentItems 	(list Compartment
-					"+ substitution"
-					"+ extension"
-					"+ restriction"
-					"+ all"))
-				width      	556
-				height     	342
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDProhibitedSubstitutions" @952
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(880, 1792)
-				label      	(object ItemLabel
-				    Parent_View 	@952
-				    location   	(614, 1708)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	532
-				    justify    	0
-				    label      	"XSDProhibitedSubstitutions")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@952
-				    location   	(614, 1658)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	532
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C5BE0272"
-				compartment 	(object Compartment
-				    Parent_View 	@952
-				    location   	(614, 1768)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	198
-				    compartmentItems 	(list Compartment
-					"+ extension"
-					"+ restriction"
-					"+ all"))
-				width      	550
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @953
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(912, 2096)
-				label      	(object ItemLabel
-				    Parent_View 	@953
-				    location   	(532, 2040)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	760
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				compartment 	(object Compartment
-				    Parent_View 	@953
-				    location   	(532, 2100)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	1
-				    max_width  	723
-				    compartmentItems 	(list Compartment
-					"<<0..*>> + lexicalFinal : XSDSimpleFinal"))
-				width      	778
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleFinal" @954
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 1984)
-				label      	(object ItemLabel
-				    Parent_View 	@954
-				    location   	(45, 1875)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"XSDSimpleFinal")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@954
-				    location   	(45, 1825)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C25D0295"
-				width      	344
-				height     	342
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexFinal" @955
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2544, 2016)
-				label      	(object ItemLabel
-				    Parent_View 	@955
-				    location   	(2362, 1932)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	364
-				    justify    	0
-				    label      	"XSDComplexFinal")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@955
-				    location   	(2362, 1882)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	364
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C2CA01CB"
-				width      	382
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUse" @956
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(352, 1360)
-				label      	(object ItemLabel
-				    Parent_View 	@956
-				    location   	(41, 1279)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	622
-				    justify    	0
-				    label      	"XSDAttributeUse")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B68354601A8"
-				compartment 	(object Compartment
-				    Parent_View 	@956
-				    location   	(41, 1339)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	588
-				    compartmentItems 	(list Compartment
-					"+ use : XSDAttributeUseCategory"
-					"+ lexicalValue : String"))
-				width      	640
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUseCategory" @957
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(288, 1632)
-				label      	(object ItemLabel
-				    Parent_View 	@957
-				    location   	(41, 1548)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	494
-				    justify    	0
-				    label      	"XSDAttributeUseCategory")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@957
-				    location   	(41, 1498)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	494
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3BA7B0E801A8"
-				width      	512
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDTerm" @958
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2608, 928)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@958
-				    location   	(2498, 881)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	220
-				    justify    	0
-				    label      	"XSDTerm")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683C5E0174"
-				width      	238
-				height     	119
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @959
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2240, 1712)
-				label      	(object ItemLabel
-				    Parent_View 	@959
-				    location   	(1757, 1631)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	966
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				compartment 	(object Compartment
-				    Parent_View 	@959
-				    location   	(1757, 1691)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	934
-				    compartmentItems 	(list Compartment
-					"<<0..*>> + lexicalFinal : XSDProhibitedSubstitutions"
-					"<<0..*>> + block : XSDDisallowedSubstitutions"))
-				width      	984
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @960
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2272, 1152)
-				label      	(object ItemLabel
-				    Parent_View 	@960
-				    location   	(1828, 1096)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	888
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				compartment 	(object Compartment
-				    Parent_View 	@960
-				    location   	(1828, 1156)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	852
-				    compartmentItems 	(list Compartment
-					"<<0..*>> + lexicalNamespaceConstraint : String"))
-				width      	906
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @961
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1120, 1008)
-				label      	(object ItemLabel
-				    Parent_View 	@961
-				    location   	(622, 777)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	996
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	1014
-				height     	486
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDImport" @962
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 960)
-				label      	(object ItemLabel
-				    Parent_View 	@962
-				    location   	(37, 904)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	406
-				    justify    	0
-				    label      	"XSDImport")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B688C93017F"
-				width      	424
-				height     	136
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDFacet" @963
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1344, 656)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@963
-				    location   	(1138, 600)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	412
-				    justify    	0
-				    label      	"XSDFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C359403D2"
-				compartment 	(object Compartment
-				    Parent_View 	@963
-				    location   	(1138, 660)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	378
-				    compartmentItems 	(list Compartment
-					"+ lexicalValue : String"))
-				width      	430
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @964
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1840, 2048)
-				label      	(object ItemLabel
-				    Parent_View 	@964
-				    location   	(1410, 1942)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	860
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				compartment 	(object Compartment
-				    Parent_View 	@964
-				    location   	(1410, 2002)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	822
-				    compartmentItems 	(list Compartment
-					"<<0..*>> + lexicalFinal : XSDComplexFinal"
-					"<<0..*>> + block : XSDProhibitedSubstitutions"
-					"+ mixed : boolean"))
-				width      	878
-				height     	236
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @965
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1488, 1696)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@965
-				    location   	(1304, 1644)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	368
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	386
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @966
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAB1004D"
-				client     	@965
-				supplier   	@944
-				line_style 	3
-				origin_attachment 	(1506, 1632)
-				terminal_attachment 	(1506, 1472))
-			    (object ClassView "Class" "Logical View::xsd::XSDAnnotation" @967
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2208, 704)
-				label      	(object ItemLabel
-				    Parent_View 	@967
-				    location   	(1758, 598)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	900
-				    justify    	0
-				    label      	"XSDAnnotation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDC80233"
-				width      	918
-				height     	236
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @968
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6848AA01D3"
-				client     	@958
-				supplier   	@942
-				line_style 	3
-				origin_attachment 	(2696, 869)
-				terminal_attachment 	(2696, 537)
-				drawSupplier 	@946)
-			    (object InheritView "" @969
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69EDEE01BF"
-				client     	@959
-				supplier   	@939
-				line_style 	3
-				origin_attachment 	(2094, 1619)
-				terminal_attachment 	(2094, 1533))
-			    (object InheritTreeView "" @970
-				location   	(1487, 1856)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@965
-				vertices   	(list Points
-				    (1487, 1856)
-				    (1487, 1760)))
-			    (object ClassView "Class" "Logical View::xsd::DOMAttr" @971
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2400, 384)
-				label      	(object ItemLabel
-				    Parent_View 	@971
-				    location   	(2080, 350)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	640
-				    justify    	0
-				    label      	"DOMAttr")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@971
-				    location   	(2080, 300)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	640
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	14671839
-				quidu      	"3BBF8C8901B6"
-				width      	658
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @972
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0D01901F1"
-				client     	@964
-				supplier   	@965
-				line_style 	3
-				origin_attachment 	(1734, 1930)
-				terminal_attachment 	(1734, 1856)
-				drawSupplier 	@970)
-			    (object InheritView "" @973
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D25680259"
-				client     	@963
-				supplier   	@942
-				line_style 	3
-				origin_attachment 	(1328, 588)
-				terminal_attachment 	(1328, 537)
-				drawSupplier 	@946)
-			    (object InheritView "" @974
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69E1770116"
-				client     	@967
-				supplier   	@942
-				line_style 	3
-				origin_attachment 	(2190, 586)
-				terminal_attachment 	(2190, 537)
-				drawSupplier 	@946)
-			    (object InheritView "" @975
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AE32102AF"
-				client     	@948
-				supplier   	@949
-				line_style 	3
-				origin_attachment 	(222, 572)
-				terminal_attachment 	(222, 447))
-			    (object InheritView "" @976
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AD8E60372"
-				client     	@949
-				supplier   	@941
-				line_style 	3
-				origin_attachment 	(260, 321)
-				terminal_attachment 	(260, 263)
-				drawSupplier 	@950)
-			    (object InheritView "" @977
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AD8D9003E"
-				client     	@962
-				supplier   	@948
-				line_style 	3
-				origin_attachment 	(223, 892)
-				terminal_attachment 	(223, 708))
-			    (object InheritView "" @978
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A3A0041"
-				client     	@960
-				supplier   	@958
-				line_style 	3
-				origin_attachment 	(2600, 1084)
-				terminal_attachment 	(2600, 987))
-			    (object ClassView "Class" "Logical View::xsd::DOMDocument" @979
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2336, 128)
-				label      	(object ItemLabel
-				    Parent_View 	@979
-				    location   	(1957, 94)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	758
-				    justify    	0
-				    label      	"DOMDocument")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@979
-				    location   	(1957, 44)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	758
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	14671839
-				quidu      	"3C27850E0381"
-				width      	776
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @980
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0CEA903D2"
-				client     	@942
-				supplier   	@941
-				line_style 	3
-				origin_attachment 	(856, 321)
-				terminal_attachment 	(856, 263)
-				drawSupplier 	@950)
-			    (object ClassView "Class" "Logical View::xsd::DOMNode" @981
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1568, 384)
-				label      	(object ItemLabel
-				    Parent_View 	@981
-				    location   	(1234, 350)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	668
-				    justify    	0
-				    label      	"DOMNode")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@981
-				    location   	(1234, 300)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	668
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	14671839
-				quidu      	"3BFE64A50117"
-				width      	686
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @982
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCD640231"
-				client     	@945
-				supplier   	@942
-				line_style 	3
-				origin_attachment 	(850, 561)
-				terminal_attachment 	(850, 537)
-				drawSupplier 	@946)
-			    (object InheritView "" @983
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B72D7BB0349"
-				client     	@956
-				supplier   	@942
-				line_style 	3
-				origin_attachment 	(575, 1267)
-				terminal_attachment 	(575, 537)
-				drawSupplier 	@946)
-			    (object InheritView "" @984
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0CEA20197"
-				client     	@943
-				supplier   	@942
-				line_style 	3
-				origin_attachment 	(1694, 880)
-				terminal_attachment 	(1694, 537)
-				drawSupplier 	@946)
-			    (object InheritView "" @985
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCC4A0182"
-				client     	@961
-				supplier   	@945
-				line_style 	3
-				origin_attachment 	(856, 765)
-				terminal_attachment 	(856, 687))
-			    (object InheritTreeView "" @986
-				location   	(1703, 1290)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@943
-				vertices   	(list Points
-				    (1703, 1290)
-				    (1703, 1008)))
-			    (object InheritView "" @987
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A26036D"
-				client     	@944
-				supplier   	@943
-				line_style 	3
-				origin_attachment 	(1503, 1344)
-				terminal_attachment 	(1503, 1290)
-				drawSupplier 	@986)
-			    (object InheritView "" @988
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A2C0307"
-				client     	@939
-				supplier   	@943
-				line_style 	3
-				origin_attachment 	(2093, 1347)
-				terminal_attachment 	(2093, 1290)
-				drawSupplier 	@986)
-			    (object InheritView "" @989
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A1302A2"
-				client     	@953
-				supplier   	@965
-				line_style 	3
-				origin_attachment 	(1253, 2028)
-				terminal_attachment 	(1253, 1856)
-				drawSupplier 	@970)))
-		    (object ClassDiagram "8. Concrete Containment"
-			quid       	"3B6A8097027A"
-			title      	"8. Concrete Containment"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDNotationDeclaration" @990
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2672, 992)
-				label      	(object ItemLabel
-				    Parent_View 	@990
-				    location   	(2439, 949)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	466
-				    justify    	0
-				    label      	"XSDNotationDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDAA021C"
-				width      	484
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaDirective" @991
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2640, 576)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@991
-				    location   	(2431, 533)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	418
-				    justify    	0
-				    label      	"XSDSchemaDirective")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD8A202A2"
-				width      	436
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefine" @992
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2144, 784)
-				label      	(object ItemLabel
-				    Parent_View 	@992
-				    location   	(2013, 741)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	262
-				    justify    	0
-				    label      	"XSDRedefine")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B688C9B02AD"
-				width      	280
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefineContent" @993
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2064, 576)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@993
-				    location   	(1854, 533)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	420
-				    justify    	0
-				    label      	"XSDRedefineContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AE2060172"
-				width      	438
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @994
-				location   	(1943, 868)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@993
-				vertices   	(list Points
-				    (1943, 868)
-				    (1943, 631)))
-			    (object AssociationViewNew "$UNNAMED$164" @995
-				location   	(2125, 680)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AE8240051"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$165" @996
-					Parent_View 	@995
-					location   	(157, 344)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6AE82602AD"
-					client     	@995
-					supplier   	@992
-					line_style 	3
-					origin_attachment 	(2125, 680)
-					terminal_attachment 	(2125, 729))
-				    (object RoleView "contents" @997
-					Parent_View 	@995
-					location   	(157, 344)
-					label      	(object SegLabel @998
-					    Parent_View 	@997
-					    location   	(2255, 671)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+contents"
-					    pctDist    	0.175439
-					    height     	130
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6AE82602B7"
-					client     	@995
-					supplier   	@993
-					line_style 	3
-					origin_attachment 	(2125, 680)
-					terminal_attachment 	(2125, 631)
-					label      	(object SegLabel @999
-					    Parent_View 	@997
-					    location   	(2067, 671)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.175439
-					    height     	59
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDTerm" @1000
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 320)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1000
-				    location   	(148, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	216
-				    justify    	0
-				    label      	"XSDTerm")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683C5E0174"
-				width      	234
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @1001
-				location   	(272, 465)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1000
-				vertices   	(list Points
-				    (272, 465)
-				    (272, 375)))
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @1002
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2656, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@1002
-				    location   	(2372, 1121)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	569
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				width      	587
-				height     	118
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroup" @1003
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 576)
-				label      	(object ItemLabel
-				    Parent_View 	@1003
-				    location   	(89, 533)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	334
-				    justify    	0
-				    label      	"XSDModelGroup")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6834E00291"
-				width      	352
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$152" @1004
-				location   	(1170, 1356)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6837AC025A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "modelGroup" @1005
-					Parent_View 	@1004
-					location   	(866, -20)
-					label      	(object SegLabel @1006
-					    Parent_View 	@1005
-					    location   	(269, 1389)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	252
-					    justify    	0
-					    label      	"+modelGroup"
-					    pctDist    	0.534044
-					    height     	33
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6837AD0339"
-					client     	@1004
-					supplier   	@1003
-					vertices   	(list Points
-					    (1170, 1356)
-					    (206, 1356)
-					    (206, 631))
-					line_style 	3
-					origin_attachment 	(1170, 1356)
-					terminal_attachment 	(206, 631)
-					label      	(object SegLabel @1007
-					    Parent_View 	@1005
-					    location   	(226, 1322)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.559146
-					    height     	35
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$153" @1008
-					Parent_View 	@1004
-					location   	(866, -20)
-					label      	(object SegLabel @1009
-					    Parent_View 	@1008
-					    location   	(2521, 1398)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6837AD0338"
-					client     	@1004
-					supplier   	@1002
-					vertices   	(list Points
-					    (1170, 1356)
-					    (2731, 1356)
-					    (2731, 1227))
-					line_style 	3
-					origin_attachment 	(1170, 1356)
-					terminal_attachment 	(2731, 1227))))
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @1010
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(160, 1696)
-				label      	(object ItemLabel
-				    Parent_View 	@1010
-				    location   	(35, 1653)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	250
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	268
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$146" @1011
-				location   	(122, 1136)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6BCEB102F8"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$147" @1012
-					Parent_View 	@1011
-					location   	(-630, -256)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6BCEB6001B"
-					client     	@1011
-					supplier   	@1003
-					line_style 	3
-					origin_attachment 	(122, 1136)
-					terminal_attachment 	(122, 631))
-				    (object RoleView "contents" @1013
-					Parent_View 	@1011
-					location   	(-630, -256)
-					label      	(object SegLabel @1014
-					    Parent_View 	@1013
-					    location   	(223, 1515)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+contents"
-					    pctDist    	0.750495
-					    height     	101
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6BCEB60025"
-					client     	@1011
-					supplier   	@1010
-					line_style 	3
-					origin_attachment 	(122, 1136)
-					terminal_attachment 	(122, 1641)
-					label      	(object SegLabel @1015
-					    Parent_View 	@1013
-					    location   	(180, 1581)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.881188
-					    height     	58
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDParticleContent" @1016
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(288, 80)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1016
-				    location   	(41, 42)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	495
-				    justify    	0
-				    label      	"XSDParticleContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6BD22300C6"
-				width      	513
-				height     	100
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$158" @1017
-				location   	(47, 885)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6B47150119"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$159" @1018
-					Parent_View 	@1017
-					location   	(-289, 821)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B471A03AB"
-					client     	@1017
-					supplier   	@1010
-					line_style 	3
-					origin_attachment 	(47, 885)
-					terminal_attachment 	(47, 1641))
-				    (object RoleView "content" @1019
-					Parent_View 	@1017
-					location   	(-289, 821)
-					label      	(object SegLabel @1020
-					    Parent_View 	@1019
-					    location   	(142, 189)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+content"
-					    pctDist    	0.921854
-					    height     	95
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B471A03B5"
-					client     	@1017
-					supplier   	@1016
-					line_style 	3
-					origin_attachment 	(47, 885)
-					terminal_attachment 	(47, 130)
-					label      	(object SegLabel @1021
-					    Parent_View 	@1019
-					    location   	(28, 192)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.917881
-					    height     	19
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUse" @1022
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1424, 896)
-				label      	(object ItemLabel
-				    Parent_View 	@1022
-				    location   	(1252, 849)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	345
-				    justify    	0
-				    label      	"XSDAttributeUse")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B68354601A8"
-				width      	363
-				height     	119
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @1023
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1408, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@1023
-				    location   	(1175, 1125)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	466
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	484
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$88" @1024
-				location   	(1319, 1034)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6F1DE9018A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$89" @1025
-					Parent_View 	@1024
-					location   	(-57, -102)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6F1DEA036C"
-					client     	@1024
-					supplier   	@1022
-					line_style 	3
-					origin_attachment 	(1319, 1034)
-					terminal_attachment 	(1319, 955))
-				    (object RoleView "content" @1026
-					Parent_View 	@1024
-					location   	(-57, -102)
-					label      	(object SegLabel @1027
-					    Parent_View 	@1026
-					    location   	(1439, 1039)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+content"
-					    pctDist    	0.073171
-					    height     	120
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6F1DEA0380"
-					client     	@1024
-					supplier   	@1023
-					line_style 	3
-					origin_attachment 	(1319, 1034)
-					terminal_attachment 	(1319, 1113)
-					label      	(object SegLabel @1028
-					    Parent_View 	@1026
-					    location   	(1279, 1031)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.040816
-					    height     	41
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::xsd::XSDConstrainingFacet" @1029
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2080, 1696)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1029
-				    location   	(1855, 1653)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	450
-				    justify    	0
-				    label      	"XSDConstrainingFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C6B340093"
-				width      	468
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @1030
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1280, 1696)
-				label      	(object ItemLabel
-				    Parent_View 	@1030
-				    location   	(1035, 1653)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	490
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				width      	508
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$184" @1031
-				location   	(1351, 1840)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D5CA50112"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$185" @1032
-					Parent_View 	@1031
-					location   	(-297, 224)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D5CA703B4"
-					client     	@1031
-					supplier   	@1030
-					vertices   	(list Points
-					    (1351, 1840)
-					    (1294, 1840)
-					    (1294, 1751))
-					line_style 	3
-					origin_attachment 	(1351, 1840)
-					terminal_attachment 	(1294, 1751))
-				    (object RoleView "contents" @1033
-					Parent_View 	@1031
-					location   	(-297, 224)
-					label      	(object SegLabel @1034
-					    Parent_View 	@1033
-					    location   	(1517, 1806)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+contents"
-					    pctDist    	0.632653
-					    height     	108
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D5CA703C8"
-					client     	@1031
-					supplier   	@1030
-					vertices   	(list Points
-					    (1351, 1840)
-					    (1409, 1840)
-					    (1409, 1751))
-					line_style 	3
-					origin_attachment 	(1351, 1840)
-					terminal_attachment 	(1409, 1751)
-					label      	(object SegLabel @1035
-					    Parent_View 	@1033
-					    location   	(1361, 1801)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.072848
-					    height     	40
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$68" @1036
-				location   	(1190, 1432)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6890D6006F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "anonymousTypeDefinition" @1037
-					Parent_View 	@1036
-					location   	(774, -1832)
-					label      	(object SegLabel @1038
-					    Parent_View 	@1037
-					    location   	(1462, 1525)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	492
-					    justify    	0
-					    label      	"+anonymousTypeDefinition"
-					    pctDist    	0.444976
-					    height     	272
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6890D60318"
-					client     	@1036
-					supplier   	@1030
-					line_style 	3
-					origin_attachment 	(1190, 1432)
-					terminal_attachment 	(1190, 1641)
-					label      	(object SegLabel @1039
-					    Parent_View 	@1037
-					    location   	(1143, 1527)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.454545
-					    height     	47
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$69" @1040
-					Parent_View 	@1036
-					location   	(774, -1832)
-					label      	(object SegLabel @1041
-					    Parent_View 	@1040
-					    location   	(1149, 1266)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6890D6030E"
-					client     	@1036
-					supplier   	@1023
-					line_style 	3
-					origin_attachment 	(1190, 1432)
-					terminal_attachment 	(1190, 1223))))
-			    (object AssociationViewNew "$UNNAMED$186" @1042
-				location   	(1690, 1684)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C35AD0374"
-				roleview_list 	(list RoleViews
-				    (object RoleView "facetContents" @1043
-					Parent_View 	@1042
-					location   	(-326, -12)
-					label      	(object SegLabel @1044
-					    Parent_View 	@1043
-					    location   	(1695, 1731)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+facetContents"
-					    pctDist    	0.032051
-					    height     	47
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6C35AF0010"
-					client     	@1042
-					supplier   	@1029
-					line_style 	3
-					origin_attachment 	(1690, 1684)
-					terminal_attachment 	(1846, 1684)
-					label      	(object SegLabel @1045
-					    Parent_View 	@1043
-					    location   	(1756, 1644)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	94
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.420732
-					    height     	41
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$187" @1046
-					Parent_View 	@1042
-					location   	(-326, -12)
-					label      	(object SegLabel @1047
-					    Parent_View 	@1046
-					    location   	(1566, 1643)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6C35AF0006"
-					client     	@1042
-					supplier   	@1030
-					line_style 	3
-					origin_attachment 	(1690, 1684)
-					terminal_attachment 	(1534, 1684))))
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaCompositor" @1048
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2624, 784)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1048
-				    location   	(2388, 741)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	472
-				    justify    	0
-				    label      	"XSDSchemaCompositor")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C21DB4102AE"
-				width      	490
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaContent" @1049
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1312, 320)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1049
-				    location   	(1108, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	408
-				    justify    	0
-				    label      	"XSDSchemaContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B688CB800BA"
-				width      	426
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @1050
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(688, 320)
-				label      	(object ItemLabel
-				    Parent_View 	@1050
-				    location   	(557, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	262
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	280
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$166" @1051
-				location   	(963, 319)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B688E6B003D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "contents" @1052
-					Parent_View 	@1051
-					location   	(595, -17)
-					label      	(object SegLabel @1053
-					    Parent_View 	@1052
-					    location   	(974, 361)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+contents"
-					    pctDist    	0.081081
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B688E6C0111"
-					client     	@1051
-					supplier   	@1049
-					line_style 	3
-					origin_attachment 	(963, 319)
-					terminal_attachment 	(1099, 319)
-					label      	(object SegLabel @1054
-					    Parent_View 	@1052
-					    location   	(1016, 290)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.396396
-					    height     	30
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$167" @1055
-					Parent_View 	@1051
-					location   	(595, -17)
-					label      	(object SegLabel @1056
-					    Parent_View 	@1055
-					    location   	(855, 361)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B688E6C0107"
-					client     	@1051
-					supplier   	@1050
-					line_style 	3
-					origin_attachment 	(963, 319)
-					terminal_attachment 	(828, 319))))
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @1057
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2160, 992)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1057
-				    location   	(1974, 949)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	372
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	390
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @1058
-				location   	(2322, 1593)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1057
-				vertices   	(list Points
-				    (2322, 1593)
-				    (2322, 1047)))
-			    (object InheritView "" @1059
-				stereotype 	(object SegLabel @1060
-				    Parent_View 	@1059
-				    location   	(2146, 905)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	225
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.460000
-				    height     	5
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B6AE2F5013A"
-				client     	@1057
-				supplier   	@993
-				line_style 	3
-				origin_attachment 	(2150, 937)
-				terminal_attachment 	(2150, 868)
-				drawSupplier 	@994)
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @1061
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(832, 576)
-				label      	(object ItemLabel
-				    Parent_View 	@1061
-				    location   	(510, 532)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	644
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				width      	662
-				height     	112
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$112" @1062
-				location   	(1498, 1431)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B68911401AF"
-				roleview_list 	(list RoleViews
-				    (object RoleView "anonymousTypeDefinition" @1063
-					Parent_View 	@1062
-					location   	(1038, -1810)
-					label      	(object SegLabel @1064
-					    Parent_View 	@1063
-					    location   	(2027, 1472)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	492
-					    justify    	0
-					    label      	"+anonymousTypeDefinition"
-					    pctDist    	0.454389
-					    height     	41
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6891150017"
-					client     	@1062
-					supplier   	@1057
-					vertices   	(list Points
-					    (1498, 1431)
-					    (2281, 1431)
-					    (2281, 1047))
-					line_style 	3
-					origin_attachment 	(1498, 1431)
-					terminal_attachment 	(2281, 1047)
-					label      	(object SegLabel @1065
-					    Parent_View 	@1063
-					    location   	(2204, 1397)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.605419
-					    height     	35
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$113" @1066
-					Parent_View 	@1062
-					location   	(1038, -1810)
-					label      	(object SegLabel @1067
-					    Parent_View 	@1066
-					    location   	(1090, 866)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6891150016"
-					client     	@1062
-					supplier   	@1061
-					vertices   	(list Points
-					    (1498, 1431)
-					    (1131, 1431)
-					    (1131, 632))
-					line_style 	3
-					origin_attachment 	(1498, 1431)
-					terminal_attachment 	(1131, 632))))
-			    (object ClassView "Class" "Logical View::xsd::XSDXPathDefinition" @1068
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(848, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@1068
-				    location   	(655, 1125)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	386
-				    justify    	0
-				    label      	"XSDXPathDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6D83BB0355"
-				width      	404
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDIdentityConstraintDefinition" @1069
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(800, 896)
-				label      	(object ItemLabel
-				    Parent_View 	@1069
-				    location   	(505, 853)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	590
-				    justify    	0
-				    label      	"XSDIdentityConstraintDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B2603A2"
-				width      	608
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$116" @1070
-				location   	(534, 736)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6833EF0160"
-				roleview_list 	(list RoleViews
-				    (object RoleView "identityConstraintDefinitions" @1071
-					Parent_View 	@1070
-					location   	(86, -2144)
-					label      	(object SegLabel @1072
-					    Parent_View 	@1071
-					    location   	(820, 748)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	550
-					    justify    	0
-					    label      	"+identityConstraintDefinitions"
-					    pctDist    	0.111111
-					    height     	286
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6833F00299"
-					client     	@1070
-					supplier   	@1069
-					line_style 	3
-					origin_attachment 	(534, 736)
-					terminal_attachment 	(534, 841)
-					label      	(object SegLabel @1073
-					    Parent_View 	@1071
-					    location   	(595, 807)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.675926
-					    height     	61
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$117" @1074
-					Parent_View 	@1070
-					location   	(86, -2144)
-					label      	(object SegLabel @1075
-					    Parent_View 	@1074
-					    location   	(576, 653)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6833F00298"
-					client     	@1070
-					supplier   	@1061
-					line_style 	3
-					origin_attachment 	(534, 736)
-					terminal_attachment 	(534, 632))))
-			    (object AssociationViewNew "$UNNAMED$136" @1076
-				location   	(900, 1032)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D8D3D003E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "selector" @1077
-					Parent_View 	@1076
-					location   	(84, 120)
-					label      	(object SegLabel @1078
-					    Parent_View 	@1077
-					    location   	(1013, 1042)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+selector"
-					    pctDist    	0.123288
-					    height     	113
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D3E0234"
-					client     	@1076
-					supplier   	@1068
-					line_style 	3
-					origin_attachment 	(900, 1032)
-					terminal_attachment 	(900, 1113)
-					label      	(object SegLabel @1079
-					    Parent_View 	@1077
-					    location   	(859, 1040)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.095890
-					    height     	42
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$137" @1080
-					Parent_View 	@1076
-					location   	(84, 120)
-					label      	(object SegLabel @1081
-					    Parent_View 	@1080
-					    location   	(859, 968)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D3E022A"
-					client     	@1076
-					supplier   	@1069
-					line_style 	3
-					origin_attachment 	(900, 1032)
-					terminal_attachment 	(900, 951))))
-			    (object AssociationViewNew "$UNNAMED$138" @1082
-				location   	(700, 1032)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D8D330025"
-				roleview_list 	(list RoleViews
-				    (object RoleView "fields" @1083
-					Parent_View 	@1082
-					location   	(-116, 120)
-					label      	(object SegLabel @1084
-					    Parent_View 	@1083
-					    location   	(616, 1036)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	120
-					    justify    	0
-					    label      	"+fields"
-					    pctDist    	0.054795
-					    height     	85
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D330379"
-					client     	@1082
-					supplier   	@1068
-					line_style 	3
-					origin_attachment 	(700, 1032)
-					terminal_attachment 	(700, 1113)
-					label      	(object SegLabel @1085
-					    Parent_View 	@1083
-					    location   	(771, 1042)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..*"
-					    pctDist    	0.123077
-					    height     	71
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$139" @1086
-					Parent_View 	@1082
-					location   	(-116, 120)
-					label      	(object SegLabel @1087
-					    Parent_View 	@1086
-					    location   	(659, 968)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D330365"
-					client     	@1082
-					supplier   	@1069
-					line_style 	3
-					origin_attachment 	(700, 1032)
-					terminal_attachment 	(700, 951))))
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeContent" @1088
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(752, 1440)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1088
-				    location   	(500, 1397)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	504
-				    justify    	0
-				    label      	"XSDComplexTypeContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683BA00196"
-				width      	522
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @1089
-				location   	(550, 1590)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1088
-				vertices   	(list Points
-				    (550, 1590)
-				    (550, 1495)))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupContent" @1090
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1504, 576)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1090
-				    location   	(1240, 533)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	528
-				    justify    	0
-				    label      	"XSDAttributeGroupContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6940200089"
-				width      	546
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @1091
-				location   	(1406, 765)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1090
-				vertices   	(list Points
-				    (1406, 765)
-				    (1406, 631)))
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @1092
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2656, 1696)
-				label      	(object ItemLabel
-				    Parent_View 	@1092
-				    location   	(2393, 1653)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	526
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				width      	544
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$94" @1093
-				location   	(1614, 1868)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6FDDD70113"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$95" @1094
-					Parent_View 	@1093
-					location   	(526, 476)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6FDDDA026B"
-					client     	@1093
-					supplier   	@1092
-					vertices   	(list Points
-					    (1614, 1868)
-					    (2500, 1868)
-					    (2500, 1751))
-					line_style 	3
-					origin_attachment 	(1614, 1868)
-					terminal_attachment 	(2500, 1751))
-				    (object RoleView "content" @1095
-					Parent_View 	@1093
-					location   	(526, 476)
-					label      	(object SegLabel @1096
-					    Parent_View 	@1095
-					    location   	(896, 1787)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+content"
-					    pctDist    	0.709870
-					    height     	89
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6FDDDA0275"
-					client     	@1093
-					supplier   	@1088
-					vertices   	(list Points
-					    (1614, 1868)
-					    (984, 1868)
-					    (984, 1495))
-					line_style 	3
-					origin_attachment 	(1614, 1868)
-					terminal_attachment 	(984, 1495)
-					label      	(object SegLabel @1097
-					    Parent_View 	@1095
-					    location   	(1042, 1824)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.571286
-					    height     	45
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$100" @1098
-				location   	(2927, 387)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B698E360386"
-				roleview_list 	(list RoleViews
-				    (object RoleView "attributeContents" @1099
-					Parent_View 	@1098
-					location   	(2463, -3757)
-					label      	(object SegLabel @1100
-					    Parent_View 	@1099
-					    location   	(1915, 357)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+attributeContents"
-					    pctDist    	0.773060
-					    height     	31
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B698E38007C"
-					client     	@1098
-					supplier   	@1090
-					vertices   	(list Points
-					    (2927, 387)
-					    (1750, 387)
-					    (1750, 521))
-					line_style 	3
-					origin_attachment 	(2927, 387)
-					terminal_attachment 	(1750, 521)
-					label      	(object SegLabel @1101
-					    Parent_View 	@1099
-					    location   	(1804, 425)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.857247
-					    height     	38
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$101" @1102
-					Parent_View 	@1098
-					location   	(2463, -3757)
-					label      	(object SegLabel @1103
-					    Parent_View 	@1102
-					    location   	(2946, 1448)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B698E380072"
-					client     	@1098
-					supplier   	@1092
-					vertices   	(list Points
-					    (2927, 387)
-					    (2987, 387)
-					    (2987, 1671)
-					    (2928, 1671))
-					line_style 	3
-					origin_attachment 	(2927, 387)
-					terminal_attachment 	(2928, 1671))))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @1104
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1968, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@1104
-				    location   	(1699, 1125)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	538
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	556
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$76" @1105
-				location   	(1750, 872)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69404E0067"
-				roleview_list 	(list RoleViews
-				    (object RoleView "contents" @1106
-					Parent_View 	@1105
-					location   	(1462, -2392)
-					label      	(object SegLabel @1107
-					    Parent_View 	@1106
-					    location   	(1640, 691)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+contents"
-					    pctDist    	0.751037
-					    height     	110
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69405002A5"
-					client     	@1105
-					supplier   	@1090
-					line_style 	3
-					origin_attachment 	(1750, 872)
-					terminal_attachment 	(1750, 631)
-					label      	(object SegLabel @1108
-					    Parent_View 	@1106
-					    location   	(1814, 695)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.734440
-					    height     	64
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$77" @1109
-					Parent_View 	@1105
-					location   	(1462, -2392)
-					label      	(object SegLabel @1110
-					    Parent_View 	@1109
-					    location   	(1709, 1065)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B694050029B"
-					client     	@1105
-					supplier   	@1104
-					line_style 	3
-					origin_attachment 	(1750, 872)
-					terminal_attachment 	(1750, 1113))))
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @1111
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(416, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@1111
-				    location   	(279, 1125)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	274
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				width      	292
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$208" @1112
-				location   	(1252, 1896)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BEBDC870247"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$209" @1113
-					Parent_View 	@1112
-					location   	(708, 1288)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BEBDC8C02F9"
-					client     	@1112
-					supplier   	@1092
-					vertices   	(list Points
-					    (1252, 1896)
-					    (2603, 1896)
-					    (2603, 1751))
-					line_style 	3
-					origin_attachment 	(1252, 1896)
-					terminal_attachment 	(2603, 1751))
-				    (object RoleView "attributeWildcardContent" @1114
-					Parent_View 	@1112
-					location   	(708, 1288)
-					label      	(object SegLabel @1115
-					    Parent_View 	@1114
-					    location   	(682, 1858)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	480
-					    justify    	0
-					    label      	"+attributeWildcardContent"
-					    pctDist    	0.381142
-					    height     	39
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BEBDC8C0303"
-					client     	@1112
-					supplier   	@1111
-					vertices   	(list Points
-					    (1252, 1896)
-					    (428, 1896)
-					    (428, 1223))
-					line_style 	3
-					origin_attachment 	(1252, 1896)
-					terminal_attachment 	(428, 1223)
-					label      	(object SegLabel @1116
-					    Parent_View 	@1114
-					    location   	(382, 1860)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.575033
-					    height     	47
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$80" @1117
-				location   	(1199, 1321)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C275D320220"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$81" @1118
-					Parent_View 	@1117
-					location   	(655, 713)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C275D3C010C"
-					client     	@1117
-					supplier   	@1104
-					vertices   	(list Points
-					    (1199, 1321)
-					    (1897, 1321)
-					    (1897, 1223))
-					line_style 	3
-					origin_attachment 	(1199, 1321)
-					terminal_attachment 	(1897, 1223))
-				    (object RoleView "attributeWildcardContent" @1119
-					Parent_View 	@1117
-					location   	(655, 713)
-					label      	(object SegLabel @1120
-					    Parent_View 	@1119
-					    location   	(857, 1279)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	480
-					    justify    	0
-					    label      	"+attributeWildcardContent"
-					    pctDist    	0.429569
-					    height     	43
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C275D3C010D"
-					client     	@1117
-					supplier   	@1111
-					vertices   	(list Points
-					    (1199, 1321)
-					    (500, 1321)
-					    (500, 1223))
-					line_style 	3
-					origin_attachment 	(1199, 1321)
-					terminal_attachment 	(500, 1223)
-					label      	(object SegLabel @1121
-					    Parent_View 	@1119
-					    location   	(576, 1279)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.782305
-					    height     	43
-					    orientation 	1))))
-			    (object InheritView "" @1122
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0D01901F1"
-				client     	@1092
-				supplier   	@1057
-				line_style 	3
-				origin_attachment 	(2606, 1641)
-				terminal_attachment 	(2606, 1593)
-				drawSupplier 	@1058)
-			    (object InheritView "" @1123
-				stereotype 	(object SegLabel @1124
-				    Parent_View 	@1123
-				    location   	(759, 495)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	243
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.446429
-				    height     	6
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B685F17002E"
-				client     	@1061
-				supplier   	@1000
-				line_style 	3
-				origin_attachment 	(753, 520)
-				terminal_attachment 	(753, 465)
-				drawSupplier 	@1001)
-			    (object InheritView "" @1125
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A1302A2"
-				client     	@1030
-				supplier   	@1057
-				line_style 	3
-				origin_attachment 	(1409, 1641)
-				terminal_attachment 	(1409, 1593)
-				drawSupplier 	@1058)
-			    (object InheritView "" @1126
-				stereotype 	(object SegLabel @1127
-				    Parent_View 	@1126
-				    location   	(759, 1591)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	219
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.980392
-				    height     	385
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B685F55032B"
-				client     	@1030
-				supplier   	@1088
-				line_style 	3
-				origin_attachment 	(1144, 1641)
-				terminal_attachment 	(1144, 1590)
-				drawSupplier 	@1089)
-			    (object InheritView "" @1128
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A640279"
-				client     	@1003
-				supplier   	@1000
-				line_style 	3
-				origin_attachment 	(166, 521)
-				terminal_attachment 	(166, 465)
-				drawSupplier 	@1001)
-			    (object InheritTreeView "" @1129
-				location   	(431, 222)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1016
-				vertices   	(list Points
-				    (431, 222)
-				    (431, 130)))
-			    (object InheritView "" @1130
-				stereotype 	(object SegLabel @1131
-				    Parent_View 	@1130
-				    location   	(361, 224)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	237
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.976744
-				    height     	86
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B6BD2440069"
-				client     	@1000
-				supplier   	@1016
-				line_style 	3
-				origin_attachment 	(275, 265)
-				terminal_attachment 	(275, 222)
-				drawSupplier 	@1129)
-			    (object InheritTreeView "" @1132
-				location   	(1309, 465)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1049
-				vertices   	(list Points
-				    (1309, 465)
-				    (1309, 375)))
-			    (object InheritView "" @1133
-				stereotype 	(object SegLabel @1134
-				    Parent_View 	@1133
-				    location   	(941, 495)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	225
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.464286
-				    height     	10
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B688E660339"
-				client     	@1061
-				supplier   	@1049
-				line_style 	3
-				origin_attachment 	(931, 520)
-				terminal_attachment 	(931, 465)
-				drawSupplier 	@1132)
-			    (object InheritView "" @1135
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6848FC01E7"
-				client     	@1010
-				supplier   	@1088
-				line_style 	3
-				origin_attachment 	(250, 1641)
-				terminal_attachment 	(250, 1590)
-				drawSupplier 	@1089)
-			    (object InheritView "" @1136
-				stereotype 	(object SegLabel @1137
-				    Parent_View 	@1136
-				    location   	(1205, 493)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	212
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.958333
-				    height     	8
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B688E6103BE"
-				client     	@1023
-				supplier   	@1049
-				line_style 	3
-				origin_attachment 	(1197, 1113)
-				terminal_attachment 	(1197, 465)
-				drawSupplier 	@1132)
-			    (object InheritView "" @1138
-				stereotype 	(object SegLabel @1139
-				    Parent_View 	@1138
-				    location   	(1951, 905)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	225
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.848980
-				    height     	73
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B6AE2EB02A8"
-				client     	@1104
-				supplier   	@993
-				line_style 	3
-				origin_attachment 	(1878, 1113)
-				terminal_attachment 	(1878, 868)
-				drawSupplier 	@994)
-			    (object InheritView "" @1140
-				stereotype 	(object SegLabel @1141
-				    Parent_View 	@1140
-				    location   	(1642, 807)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	187
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.879310
-				    height     	61
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B69403A0221"
-				client     	@1104
-				supplier   	@1090
-				line_style 	3
-				origin_attachment 	(1703, 1113)
-				terminal_attachment 	(1703, 765)
-				drawSupplier 	@1091)
-			    (object InheritView "" @1142
-				stereotype 	(object SegLabel @1143
-				    Parent_View 	@1142
-				    location   	(1354, 801)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	225
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.500000
-				    height     	70
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B72D737038F"
-				client     	@1022
-				supplier   	@1090
-				line_style 	3
-				origin_attachment 	(1284, 837)
-				terminal_attachment 	(1284, 765)
-				drawSupplier 	@1091)
-			    (object InheritView "" @1144
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DB640240"
-				client     	@992
-				supplier   	@1048
-				line_style 	3
-				origin_attachment 	(2284, 762)
-				terminal_attachment 	(2379, 762))
-			    (object InheritView "" @1145
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AE32102AF"
-				client     	@991
-				supplier   	@1049
-				line_style 	3
-				origin_attachment 	(2637, 521)
-				terminal_attachment 	(2637, 465)
-				drawSupplier 	@1132)
-			    (object InheritView "" @1146
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DB560092"
-				client     	@1048
-				supplier   	@991
-				line_style 	3
-				origin_attachment 	(2637, 729)
-				terminal_attachment 	(2637, 631))
-			    (object InheritView "" @1147
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AE2B301D5"
-				client     	@993
-				supplier   	@1049
-				line_style 	3
-				origin_attachment 	(1950, 521)
-				terminal_attachment 	(1950, 465)
-				drawSupplier 	@1132)
-			    (object InheritView "" @1148
-				stereotype 	(object SegLabel @1149
-				    Parent_View 	@1148
-				    location   	(2821, 897)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	181
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.087719
-				    height     	76
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B688E4F023C"
-				client     	@990
-				supplier   	@1049
-				line_style 	3
-				origin_attachment 	(2896, 937)
-				terminal_attachment 	(2896, 465)
-				drawSupplier 	@1132)
-			    (object InheritView "" @1150
-				stereotype 	(object SegLabel @1151
-				    Parent_View 	@1150
-				    location   	(2313, 904)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	207
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.850622
-				    height     	68
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B6AE2E20381"
-				client     	@1002
-				supplier   	@993
-				line_style 	3
-				origin_attachment 	(2381, 1109)
-				terminal_attachment 	(2381, 868)
-				drawSupplier 	@994)
-			    (object InheritView "" @1152
-				stereotype 	(object SegLabel @1153
-				    Parent_View 	@1152
-				    location   	(2878, 269)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	238
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.946667
-				    height     	66
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B6BD2550385"
-				client     	@1002
-				supplier   	@1016
-				line_style 	3
-				origin_attachment 	(2943, 1109)
-				terminal_attachment 	(2943, 222)
-				drawSupplier 	@1129)
-			    (object InheritView "" @1154
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A3A0041"
-				client     	@1111
-				supplier   	@1000
-				line_style 	3
-				origin_attachment 	(462, 1113)
-				terminal_attachment 	(462, 465)
-				drawSupplier 	@1001)))
-		    (object ClassDiagram "9. Concrete Schema Composition"
-			quid       	"3C25EB7A038C"
-			title      	"9. Concrete Schema Composition"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @1155
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 1536)
-				label      	(object ItemLabel
-				    Parent_View 	@1155
-				    location   	(73, 1493)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	462
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				width      	480
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$118" @1156
-				location   	(228, 1695)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6B41E60251"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$119" @1157
-					Parent_View 	@1156
-					location   	(-476, -385)
-					label      	(object SegLabel @1158
-					    Parent_View 	@1157
-					    location   	(217, 1623)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B41EA02F7"
-					client     	@1156
-					supplier   	@1155
-					vertices   	(list Points
-					    (228, 1695)
-					    (175, 1695)
-					    (175, 1591))
-					line_style 	3
-					origin_attachment 	(228, 1695)
-					terminal_attachment 	(175, 1591))
-				    (object RoleView "resolvedElementDeclaration" @1159
-					Parent_View 	@1156
-					location   	(-476, -385)
-					label      	(object SegLabel @1160
-					    Parent_View 	@1159
-					    location   	(329, 1740)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	528
-					    justify    	0
-					    label      	"+resolvedElementDeclaration"
-					    pctDist    	1.924528
-					    height     	45
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B41EA030B"
-					client     	@1156
-					supplier   	@1155
-					vertices   	(list Points
-					    (228, 1695)
-					    (281, 1695)
-					    (281, 1591))
-					line_style 	3
-					origin_attachment 	(228, 1695)
-					terminal_attachment 	(281, 1591)
-					label      	(object SegLabel @1161
-					    Parent_View 	@1159
-					    location   	(229, 1646)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.005714
-					    height     	50
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @1162
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1040, 1536)
-				label      	(object ItemLabel
-				    Parent_View 	@1162
-				    location   	(790, 1493)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	500
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				width      	518
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$154" @1163
-				location   	(952, 1698)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6B42450398"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$155" @1164
-					Parent_View 	@1163
-					location   	(-1288, -318)
-					label      	(object SegLabel @1165
-					    Parent_View 	@1164
-					    location   	(860, 1623)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B4249038A"
-					client     	@1163
-					supplier   	@1162
-					vertices   	(list Points
-					    (952, 1698)
-					    (901, 1698)
-					    (901, 1591))
-					line_style 	3
-					origin_attachment 	(952, 1698)
-					terminal_attachment 	(901, 1591))
-				    (object RoleView "resolvedModelGroupDefinition" @1166
-					Parent_View 	@1163
-					location   	(-1288, -318)
-					label      	(object SegLabel @1167
-					    Parent_View 	@1166
-					    location   	(1020, 1739)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	564
-					    justify    	0
-					    label      	"+resolvedModelGroupDefinition"
-					    pctDist    	1.326923
-					    height     	41
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B4249039E"
-					client     	@1163
-					supplier   	@1162
-					vertices   	(list Points
-					    (952, 1698)
-					    (1004, 1698)
-					    (1004, 1591))
-					line_style 	3
-					origin_attachment 	(952, 1698)
-					terminal_attachment 	(1004, 1591)
-					label      	(object SegLabel @1168
-					    Parent_View 	@1166
-					    location   	(952, 1649)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.000000
-					    height     	50
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaCompositor" @1169
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(656, 992)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1169
-				    location   	(420, 949)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	472
-				    justify    	0
-				    label      	"XSDSchemaCompositor")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C21DB4102AE"
-				width      	490
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaDirective" @1170
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(640, 784)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1170
-				    location   	(412, 737)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	457
-				    justify    	0
-				    label      	"XSDSchemaDirective")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD8A202A2"
-				width      	475
-				height     	118
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @1171
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(640, 416)
-				label      	(object ItemLabel
-				    Parent_View 	@1171
-				    location   	(446, 285)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	388
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	406
-				height     	287
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$218" @1172
-				location   	(1303, 679)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DD0C03DB"
-				roleview_list 	(list RoleViews
-				    (object RoleView "incorporatedSchema" @1173
-					Parent_View 	@1172
-					location   	(-41, -857)
-					label      	(object SegLabel @1174
-					    Parent_View 	@1173
-					    location   	(1059, 381)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+incorporatedSchema"
-					    pctDist    	0.700384
-					    height     	39
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DD100305"
-					client     	@1172
-					supplier   	@1171
-					vertices   	(list Points
-					    (1303, 679)
-					    (1303, 419)
-					    (843, 419))
-					line_style 	3
-					origin_attachment 	(1303, 679)
-					terminal_attachment 	(843, 419)
-					label      	(object SegLabel @1175
-					    Parent_View 	@1173
-					    location   	(922, 454)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.890746
-					    height     	35
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$219" @1176
-					Parent_View 	@1172
-					location   	(-41, -857)
-					label      	(object SegLabel @1177
-					    Parent_View 	@1176
-					    location   	(1045, 956)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DD100304"
-					client     	@1172
-					supplier   	@1169
-					vertices   	(list Points
-					    (1303, 679)
-					    (1303, 997)
-					    (901, 997))
-					line_style 	3
-					origin_attachment 	(1303, 679)
-					terminal_attachment 	(901, 997))))
-			    (object AssociationViewNew "$UNNAMED$216" @1178
-				location   	(1216, 649)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DCC700EC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "resolvedSchema" @1179
-					Parent_View 	@1178
-					location   	(336, -1399)
-					label      	(object SegLabel @1180
-					    Parent_View 	@1179
-					    location   	(1038, 500)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	324
-					    justify    	0
-					    label      	"+resolvedSchema"
-					    pctDist    	0.601923
-					    height     	35
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DCCE0043"
-					client     	@1178
-					supplier   	@1171
-					vertices   	(list Points
-					    (1216, 649)
-					    (1216, 534)
-					    (843, 534))
-					line_style 	3
-					origin_attachment 	(1216, 649)
-					terminal_attachment 	(843, 534)
-					label      	(object SegLabel @1181
-					    Parent_View 	@1179
-					    location   	(926, 577)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.831643
-					    height     	43
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$217" @1182
-					Parent_View 	@1178
-					location   	(336, -1399)
-					label      	(object SegLabel @1183
-					    Parent_View 	@1182
-					    location   	(974, 756)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DCCE0042"
-					client     	@1178
-					supplier   	@1170
-					vertices   	(list Points
-					    (1216, 649)
-					    (1216, 797)
-					    (877, 797))
-					line_style 	3
-					origin_attachment 	(1216, 649)
-					terminal_attachment 	(877, 797))))
-			    (object AssociationViewNew "$UNNAMED$222" @1184
-				location   	(662, 642)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C25D3A60131"
-				roleview_list 	(list RoleViews
-				    (object RoleView "referencingDirectives" @1185
-					Parent_View 	@1184
-					location   	(-234, 114)
-					label      	(object SegLabel @1186
-					    Parent_View 	@1185
-					    location   	(878, 675)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+referencingDirectives"
-					    pctDist    	0.408759
-					    height     	216
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25D3A90371"
-					client     	@1184
-					supplier   	@1170
-					line_style 	3
-					origin_attachment 	(662, 642)
-					terminal_attachment 	(662, 725)
-					label      	(object SegLabel @1187
-					    Parent_View 	@1185
-					    location   	(615, 678)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.430657
-					    height     	48
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$223" @1188
-					Parent_View 	@1184
-					location   	(-234, 114)
-					label      	(object SegLabel @1189
-					    Parent_View 	@1188
-					    location   	(621, 576)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25D3A90370"
-					client     	@1184
-					supplier   	@1171
-					line_style 	3
-					origin_attachment 	(662, 642)
-					terminal_attachment 	(662, 559))))
-			    (object AssociationViewNew "$UNNAMED$224" @1190
-				location   	(75, 188)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C25ECF0005E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$225" @1191
-					Parent_View 	@1190
-					location   	(-853, -308)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25ECF4001E"
-					client     	@1190
-					supplier   	@1171
-					vertices   	(list Points
-					    (75, 188)
-					    (75, 128)
-					    (510, 128)
-					    (510, 273))
-					line_style 	3
-					origin_attachment 	(75, 188)
-					terminal_attachment 	(510, 273))
-				    (object RoleView "rootVersion" @1192
-					Parent_View 	@1190
-					location   	(-853, -308)
-					label      	(object SegLabel @1193
-					    Parent_View 	@1192
-					    location   	(176, 74)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+rootVersion"
-					    pctDist    	-0.593750
-					    height     	101
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25ECF40028"
-					client     	@1190
-					supplier   	@1171
-					vertices   	(list Points
-					    (75, 188)
-					    (75, 380)
-					    (437, 380))
-					line_style 	3
-					origin_attachment 	(75, 188)
-					terminal_attachment 	(437, 380)
-					label      	(object SegLabel @1194
-					    Parent_View 	@1192
-					    location   	(368, 328)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.874755
-					    height     	53
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$226" @1195
-				location   	(1262, 134)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C25ED0B011B"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$227" @1196
-					Parent_View 	@1195
-					location   	(334, -362)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25ED0F0121"
-					client     	@1195
-					supplier   	@1171
-					vertices   	(list Points
-					    (1262, 134)
-					    (766, 134)
-					    (766, 273))
-					line_style 	3
-					origin_attachment 	(1262, 134)
-					terminal_attachment 	(766, 273))
-				    (object RoleView "originalVersion" @1197
-					Parent_View 	@1195
-					location   	(334, -362)
-					label      	(object SegLabel @1198
-					    Parent_View 	@1197
-					    location   	(1164, 97)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	288
-					    justify    	0
-					    label      	"+originalVersion"
-					    pctDist    	-1.650000
-					    height     	38
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25ED0F012B"
-					client     	@1195
-					supplier   	@1171
-					vertices   	(list Points
-					    (1262, 134)
-					    (1322, 134)
-					    (1322, 334)
-					    (843, 334))
-					line_style 	3
-					origin_attachment 	(1262, 134)
-					terminal_attachment 	(843, 334)
-					label      	(object SegLabel @1199
-					    Parent_View 	@1197
-					    location   	(919, 279)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.898108
-					    height     	56
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$228" @1200
-				location   	(126, 656)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C25EEAB001F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$229" @1201
-					Parent_View 	@1200
-					location   	(-834, 160)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25EEAF010B"
-					client     	@1200
-					supplier   	@1171
-					vertices   	(list Points
-					    (126, 656)
-					    (513, 656)
-					    (513, 559))
-					line_style 	3
-					origin_attachment 	(126, 656)
-					terminal_attachment 	(513, 559))
-				    (object RoleView "incorporatedVersions" @1202
-					Parent_View 	@1200
-					location   	(-834, 160)
-					label      	(object SegLabel @1203
-					    Parent_View 	@1202
-					    location   	(217, 431)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	408
-					    justify    	0
-					    label      	"+incorporatedVersions"
-					    pctDist    	0.643902
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25EEAF0115"
-					client     	@1200
-					supplier   	@1171
-					vertices   	(list Points
-					    (126, 656)
-					    (66, 656)
-					    (66, 472)
-					    (437, 472))
-					line_style 	3
-					origin_attachment 	(126, 656)
-					terminal_attachment 	(437, 472)
-					label      	(object SegLabel @1204
-					    Parent_View 	@1202
-					    location   	(356, 526)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.868468
-					    height     	54
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$232" @1205
-				location   	(642, 126)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C2784730194"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$233" @1206
-					Parent_View 	@1205
-					location   	(82, -418)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C27847501F1"
-					client     	@1205
-					supplier   	@1171
-					vertices   	(list Points
-					    (642, 126)
-					    (588, 126)
-					    (588, 273))
-					line_style 	3
-					origin_attachment 	(642, 126)
-					terminal_attachment 	(588, 273))
-				    (object RoleView "schemaForSchema" @1207
-					Parent_View 	@1205
-					location   	(82, -418)
-					label      	(object SegLabel @1208
-					    Parent_View 	@1207
-					    location   	(639, 74)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	384
-					    justify    	0
-					    label      	"+schemaForSchema"
-					    pctDist    	-0.055556
-					    height     	53
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C27847501FB"
-					client     	@1205
-					supplier   	@1171
-					vertices   	(list Points
-					    (642, 126)
-					    (697, 126)
-					    (697, 273))
-					line_style 	3
-					origin_attachment 	(642, 126)
-					terminal_attachment 	(697, 273)
-					label      	(object SegLabel @1209
-					    Parent_View 	@1207
-					    location   	(643, 213)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.701863
-					    height     	55
-					    orientation 	1))))
-			    (object InheritView "" @1210
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DB560092"
-				client     	@1169
-				supplier   	@1170
-				line_style 	3
-				origin_attachment 	(638, 937)
-				terminal_attachment 	(638, 843))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @1211
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 1184)
-				label      	(object ItemLabel
-				    Parent_View 	@1211
-				    location   	(67, 1141)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	474
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	492
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$72" @1212
-				location   	(234, 1340)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6B426B0194"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$73" @1213
-					Parent_View 	@1212
-					location   	(-310, -4)
-					label      	(object SegLabel @1214
-					    Parent_View 	@1213
-					    location   	(140, 1271)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B426D0309"
-					client     	@1212
-					supplier   	@1211
-					vertices   	(list Points
-					    (234, 1340)
-					    (181, 1340)
-					    (181, 1239))
-					line_style 	3
-					origin_attachment 	(234, 1340)
-					terminal_attachment 	(181, 1239))
-				    (object RoleView "resolvedAttributeDeclaration" @1215
-					Parent_View 	@1212
-					location   	(-310, -4)
-					label      	(object SegLabel @1216
-					    Parent_View 	@1215
-					    location   	(333, 1389)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	528
-					    justify    	0
-					    label      	"+resolvedAttributeDeclaration"
-					    pctDist    	1.867925
-					    height     	49
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B426D0313"
-					client     	@1212
-					supplier   	@1211
-					vertices   	(list Points
-					    (234, 1340)
-					    (287, 1340)
-					    (287, 1239))
-					line_style 	3
-					origin_attachment 	(234, 1340)
-					terminal_attachment 	(287, 1239)
-					label      	(object SegLabel @1217
-					    Parent_View 	@1215
-					    location   	(241, 1295)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.042945
-					    height     	46
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @1218
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1760, 144)
-				label      	(object ItemLabel
-				    Parent_View 	@1218
-				    location   	(1517, 101)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	486
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				width      	504
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDFacet" @1219
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1712, 416)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1219
-				    location   	(1599, 373)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	226
-				    justify    	0
-				    label      	"XSDFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C359403D2"
-				width      	244
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$306" @1220
-				location   	(1668, 280)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3D4BB4AE01CC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$307" @1221
-					Parent_View 	@1220
-					location   	(8, -152)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4BB4AF010F"
-					client     	@1220
-					supplier   	@1218
-					line_style 	3
-					origin_attachment 	(1668, 280)
-					terminal_attachment 	(1668, 199))
-				    (object RoleView "syntheticFacets" @1222
-					Parent_View 	@1220
-					location   	(8, -152)
-					label      	(object SegLabel @1223
-					    Parent_View 	@1222
-					    location   	(1852, 300)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	324
-					    justify    	0
-					    label      	"+syntheticFacets"
-					    pctDist    	0.246154
-					    height     	184
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4BB4AF011A"
-					client     	@1220
-					supplier   	@1219
-					line_style 	3
-					origin_attachment 	(1668, 280)
-					terminal_attachment 	(1668, 361)
-					label      	(object SegLabel @1224
-					    Parent_View 	@1222
-					    location   	(1625, 301)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.276923
-					    height     	44
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @1225
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1552, 944)
-				label      	(object ItemLabel
-				    Parent_View 	@1225
-				    location   	(1426, 901)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	252
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	270
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @1226
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1776, 640)
-				label      	(object ItemLabel
-				    Parent_View 	@1226
-				    location   	(1515, 597)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	522
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				width      	540
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$308" @1227
-				location   	(1508, 792)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3D4BB4D3028E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$309" @1228
-					Parent_View 	@1227
-					location   	(-12, -280)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4BB4D402F3"
-					client     	@1227
-					supplier   	@1226
-					line_style 	3
-					origin_attachment 	(1508, 792)
-					terminal_attachment 	(1508, 695))
-				    (object RoleView "syntheticParticle" @1229
-					Parent_View 	@1227
-					location   	(-12, -280)
-					label      	(object SegLabel @1230
-					    Parent_View 	@1229
-					    location   	(1695, 767)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+syntheticParticle"
-					    pctDist    	-0.259259
-					    height     	187
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4BB4D402FD"
-					client     	@1227
-					supplier   	@1225
-					line_style 	3
-					origin_attachment 	(1508, 792)
-					terminal_attachment 	(1508, 889)
-					label      	(object SegLabel @1231
-					    Parent_View 	@1229
-					    location   	(1454, 829)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.395062
-					    height     	55
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @1232
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1024, 1184)
-				label      	(object ItemLabel
-				    Parent_View 	@1232
-				    location   	(756, 1141)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	536
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	554
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$84" @1233
-				location   	(919, 1349)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6B425E01F9"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$85" @1234
-					Parent_View 	@1233
-					location   	(-233, -59)
-					label      	(object SegLabel @1235
-					    Parent_View 	@1234
-					    location   	(825, 1273)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B42620046"
-					client     	@1233
-					supplier   	@1232
-					vertices   	(list Points
-					    (919, 1349)
-					    (866, 1349)
-					    (866, 1239))
-					line_style 	3
-					origin_attachment 	(919, 1349)
-					terminal_attachment 	(866, 1239))
-				    (object RoleView "resolvedAttributeGroupDefinition" @1236
-					Parent_View 	@1233
-					location   	(-233, -59)
-					label      	(object SegLabel @1237
-					    Parent_View 	@1236
-					    location   	(993, 1393)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	600
-					    justify    	0
-					    label      	"+resolvedAttributeGroupDefinition"
-					    pctDist    	1.377358
-					    height     	44
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B42620050"
-					client     	@1233
-					supplier   	@1232
-					vertices   	(list Points
-					    (919, 1349)
-					    (973, 1349)
-					    (973, 1239))
-					line_style 	3
-					origin_attachment 	(919, 1349)
-					terminal_attachment 	(973, 1239)
-					label      	(object SegLabel @1238
-					    Parent_View 	@1236
-					    location   	(919, 1296)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.014925
-					    height     	54
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @1239
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1952, 944)
-				label      	(object ItemLabel
-				    Parent_View 	@1239
-				    location   	(1816, 901)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	272
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				width      	290
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$310" @1240
-				location   	(2025, 792)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3D4BB4D901F6"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$311" @1241
-					Parent_View 	@1240
-					location   	(153, -280)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4BB4DA0284"
-					client     	@1240
-					supplier   	@1226
-					line_style 	3
-					origin_attachment 	(2025, 792)
-					terminal_attachment 	(2025, 695))
-				    (object RoleView "syntheticWildcard" @1242
-					Parent_View 	@1240
-					location   	(153, -280)
-					label      	(object SegLabel @1243
-					    Parent_View 	@1242
-					    location   	(1826, 838)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+syntheticWildcard"
-					    pctDist    	0.488095
-					    height     	200
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4BB4DA028E"
-					client     	@1240
-					supplier   	@1239
-					line_style 	3
-					origin_attachment 	(2025, 792)
-					terminal_attachment 	(2025, 889)
-					label      	(object SegLabel @1244
-					    Parent_View 	@1242
-					    location   	(2098, 840)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.506173
-					    height     	73
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$312" @1245
-				location   	(1754, 1178)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3D4C68FF01BF"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$313" @1246
-					Parent_View 	@1245
-					location   	(-198, 234)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4C69020317"
-					client     	@1245
-					supplier   	@1232
-					line_style 	3
-					origin_attachment 	(1754, 1178)
-					terminal_attachment 	(1301, 1178))
-				    (object RoleView "syntheticWildcard" @1247
-					Parent_View 	@1245
-					location   	(-198, 234)
-					label      	(object SegLabel @1248
-					    Parent_View 	@1247
-					    location   	(1828, 1261)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+syntheticWildcard"
-					    pctDist    	0.163355
-					    height     	83
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4C69020318"
-					client     	@1245
-					supplier   	@1239
-					vertices   	(list Points
-					    (1754, 1178)
-					    (2028, 1178)
-					    (2028, 999))
-					line_style 	3
-					origin_attachment 	(1754, 1178)
-					terminal_attachment 	(2028, 999)
-					label      	(object SegLabel @1249
-					    Parent_View 	@1247
-					    location   	(2082, 1098)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.783664
-					    height     	54
-					    orientation 	1))))))
-		    (object ClassDiagram "10. Diagnostics"
-			quid       	"3BFE5F0803E2"
-			title      	"10. Diagnostics"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::DOMNode" @1250
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(400, 1024)
-				label      	(object ItemLabel
-				    Parent_View 	@1250
-				    location   	(66, 990)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	668
-				    justify    	0
-				    label      	"DOMNode")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@1250
-				    location   	(66, 940)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	668
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	14671839
-				quidu      	"3BFE64A50117"
-				width      	686
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDDiagnosticSeverity" @1251
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1040, 656)
-				label      	(object ItemLabel
-				    Parent_View 	@1251
-				    location   	(818, 547)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	444
-				    justify    	0
-				    label      	"XSDDiagnosticSeverity")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@1251
-				    location   	(818, 497)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	444
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3BFE68A7032F"
-				width      	462
-				height     	342
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @1252
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(192, 112)
-				label      	(object ItemLabel
-				    Parent_View 	@1252
-				    location   	(59, 60)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	266
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	284
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDConcreteComponent" @1253
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(896, 112)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1253
-				    location   	(540, 62)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	713
-				    justify    	0
-				    label      	"XSDConcreteComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD7B40065"
-				width      	731
-				height     	125
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDDiagnostic" @1254
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(384, 608)
-				label      	(object ItemLabel
-				    Parent_View 	@1254
-				    location   	(64, 402)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	640
-				    justify    	0
-				    label      	"XSDDiagnostic")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3BFE5F910046"
-				width      	658
-				height     	436
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$214" @1255
-				location   	(144, 283)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BFE6431035F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$215" @1256
-					Parent_View 	@1255
-					location   	(-1088, -661)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFE643201C6"
-					client     	@1255
-					supplier   	@1252
-					line_style 	3
-					origin_attachment 	(144, 283)
-					terminal_attachment 	(144, 176))
-				    (object RoleView "allDiagnostics" @1257
-					Parent_View 	@1255
-					location   	(-1088, -661)
-					label      	(object SegLabel @1258
-					    Parent_View 	@1257
-					    location   	(309, 330)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+allDiagnostics"
-					    pctDist    	0.448598
-					    height     	165
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFE643201C7"
-					client     	@1255
-					supplier   	@1254
-					line_style 	3
-					origin_attachment 	(144, 283)
-					terminal_attachment 	(144, 390)
-					label      	(object SegLabel @1259
-					    Parent_View 	@1257
-					    location   	(96, 327)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.420561
-					    height     	49
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$210" @1260
-				location   	(1028, 440)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BFE622703CD"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$211" @1261
-					Parent_View 	@1260
-					location   	(-396, -72)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFE622B0061"
-					client     	@1260
-					supplier   	@1254
-					line_style 	3
-					origin_attachment 	(1028, 440)
-					terminal_attachment 	(713, 440))
-				    (object RoleView "components" @1262
-					Parent_View 	@1260
-					location   	(-396, -72)
-					label      	(object SegLabel @1263
-					    Parent_View 	@1262
-					    location   	(938, 230)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	252
-					    justify    	0
-					    label      	"+components"
-					    pctDist    	0.829181
-					    height     	151
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFE622B006C"
-					client     	@1260
-					supplier   	@1253
-					vertices   	(list Points
-					    (1028, 440)
-					    (1088, 440)
-					    (1088, 174))
-					line_style 	3
-					origin_attachment 	(1028, 440)
-					terminal_attachment 	(1088, 174)
-					label      	(object SegLabel @1264
-					    Parent_View 	@1262
-					    location   	(1143, 232)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"1..*"
-					    pctDist    	0.823848
-					    height     	55
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$212" @1265
-				location   	(688, 282)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BFE62690165"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$213" @1266
-					Parent_View 	@1265
-					location   	(160, -278)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFE626A0026"
-					client     	@1265
-					supplier   	@1253
-					line_style 	3
-					origin_attachment 	(688, 282)
-					terminal_attachment 	(688, 174))
-				    (object RoleView "diagnostics" @1267
-					Parent_View 	@1265
-					location   	(160, -278)
-					label      	(object SegLabel @1268
-					    Parent_View 	@1267
-					    location   	(822, 330)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+diagnostics"
-					    pctDist    	0.452632
-					    height     	134
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFE626A0027"
-					client     	@1265
-					supplier   	@1254
-					line_style 	3
-					origin_attachment 	(688, 282)
-					terminal_attachment 	(688, 390)
-					label      	(object SegLabel @1269
-					    Parent_View 	@1267
-					    location   	(645, 335)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.494737
-					    height     	44
-					    orientation 	1))))
-			    (object InheritView "" @1270
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3D4C0F4C01A1"
-				client     	@1254
-				supplier   	@1253
-				line_style 	3
-				origin_attachment 	(575, 390)
-				terminal_attachment 	(575, 174))))
-		    (object ClassDiagram "11. Supplemental"
-			quid       	"3C287E49019B"
-			title      	"11. Supplemental"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @1271
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(464, 816)
-				label      	(object ItemLabel
-				    Parent_View 	@1271
-				    location   	(47, 760)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	834
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	852
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @1272
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2112, 880)
-				label      	(object ItemLabel
-				    Parent_View 	@1272
-				    location   	(1731, 824)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	762
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	780
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDConcreteComponent" @1273
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(288, 112)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1273
-				    location   	(48, 60)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	480
-				    justify    	0
-				    label      	"XSDConcreteComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD7B40065"
-				width      	498
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDDiagnostic" @1274
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2384, 112)
-				label      	(object ItemLabel
-				    Parent_View 	@1274
-				    location   	(2236, 60)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"XSDDiagnostic")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3BFE5F910046"
-				width      	314
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$236" @1275
-				location   	(1382, 84)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C2882C50137"
-				roleview_list 	(list RoleViews
-				    (object RoleView "primaryComponent" @1276
-					Parent_View 	@1275
-					location   	(-250, -508)
-					label      	(object SegLabel @1277
-					    Parent_View 	@1276
-					    location   	(756, 116)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+primaryComponent"
-					    pctDist    	0.740828
-					    height     	32
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C2882C70113"
-					client     	@1275
-					supplier   	@1273
-					line_style 	3
-					origin_attachment 	(1382, 84)
-					terminal_attachment 	(537, 84)
-					label      	(object SegLabel @1278
-					    Parent_View 	@1276
-					    location   	(624, 55)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.897260
-					    height     	30
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$237" @1279
-					Parent_View 	@1275
-					location   	(-250, -508)
-					label      	(object SegLabel @1280
-					    Parent_View 	@1279
-					    location   	(2058, 126)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C2882C70112"
-					client     	@1275
-					supplier   	@1274
-					line_style 	3
-					origin_attachment 	(1382, 84)
-					terminal_attachment 	(2227, 84))))
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @1281
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2160, 688)
-				label      	(object ItemLabel
-				    Parent_View 	@1281
-				    location   	(1778, 607)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	764
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				compartment 	(object Compartment
-				    Parent_View 	@1281
-				    location   	(1778, 667)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	722
-				    compartmentItems 	(list Compartment
-					"+ elementDeclarationReference : boolean"
-					"+ circular : boolean"))
-				width      	782
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDFacet" @1282
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2320, 1072)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1282
-				    location   	(2100, 991)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	440
-				    justify    	0
-				    label      	"XSDFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C359403D2"
-				compartment 	(object Compartment
-				    Parent_View 	@1282
-				    location   	(2100, 1051)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	423
-				    compartmentItems 	(list Compartment
-					"+ facetName : String"
-					"+ effectiveValue : Value"))
-				width      	458
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @1283
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(448, 624)
-				label      	(object ItemLabel
-				    Parent_View 	@1283
-				    location   	(47, 568)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	802
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				compartment 	(object Compartment
-				    Parent_View 	@1283
-				    location   	(47, 628)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	1
-				    max_width  	769
-				    compartmentItems 	(list Compartment
-					"+ modelGroupDefinitionReference : boolean"))
-				width      	820
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDNamedComponent" @1284
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1232, 288)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1284
-				    location   	(1005, 157)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	454
-				    justify    	0
-				    label      	"XSDNamedComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846D303A4"
-				compartment 	(object Compartment
-				    Parent_View 	@1284
-				    location   	(1005, 217)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	4
-				    max_width  	356
-				    compartmentItems 	(list Compartment
-					"+ aliasName : String"
-					"+ uRI : String"
-					"+ aliasURI : String"
-					"+ qName : String"))
-				width      	472
-				height     	286
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefinableComponent" @1285
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(320, 352)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1285
-				    location   	(48, 296)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	544
-				    justify    	0
-				    label      	"XSDRedefinableComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B7FCA8B020B"
-				width      	562
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @1286
-				location   	(320, 510)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1285
-				vertices   	(list Points
-				    (320, 510)
-				    (320, 420)))
-			    (object InheritView "" @1287
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAC40090"
-				client     	@1283
-				supplier   	@1285
-				line_style 	3
-				origin_attachment 	(81, 556)
-				terminal_attachment 	(81, 510)
-				drawSupplier 	@1286)
-			    (object InheritView "" @1288
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAC800D2"
-				client     	@1271
-				supplier   	@1285
-				line_style 	3
-				origin_attachment 	(877, 748)
-				terminal_attachment 	(877, 510)
-				drawSupplier 	@1286)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxInclusiveFacet" @1289
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2320, 1808)
-				label      	(object ItemLabel
-				    Parent_View 	@1289
-				    location   	(2101, 1761)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	438
-				    justify    	0
-				    label      	"XSDMaxInclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C787D00DA"
-				width      	456
-				height     	119
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinInclusiveFacet" @1290
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(272, 1776)
-				label      	(object ItemLabel
-				    Parent_View 	@1290
-				    location   	(35, 1729)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	475
-				    justify    	0
-				    label      	"XSDMinInclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C788702C9"
-				width      	493
-				height     	119
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinExclusiveFacet" @1291
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(272, 1936)
-				label      	(object ItemLabel
-				    Parent_View 	@1291
-				    location   	(35, 1889)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	475
-				    justify    	0
-				    label      	"XSDMinExclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C792D000A"
-				width      	493
-				height     	118
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxExclusiveFacet" @1292
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2304, 1968)
-				label      	(object ItemLabel
-				    Parent_View 	@1292
-				    location   	(2073, 1917)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	462
-				    justify    	0
-				    label      	"XSDMaxExclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C789600C2"
-				width      	480
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDCardinalityFacet" @1293
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2336, 1424)
-				label      	(object ItemLabel
-				    Parent_View 	@1293
-				    location   	(2134, 1372)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	404
-				    justify    	0
-				    label      	"XSDCardinalityFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C755D03D2"
-				width      	422
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDBoundedFacet" @1294
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2352, 1264)
-				label      	(object ItemLabel
-				    Parent_View 	@1294
-				    location   	(2163, 1212)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	378
-				    justify    	0
-				    label      	"XSDBoundedFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C751D0344"
-				width      	396
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDOrderedFacet" @1295
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(224, 1392)
-				label      	(object ItemLabel
-				    Parent_View 	@1295
-				    location   	(43, 1340)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	362
-				    justify    	0
-				    label      	"XSDOrderedFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C74DD0248"
-				width      	380
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDNumericFacet" @1296
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 1232)
-				label      	(object ItemLabel
-				    Parent_View 	@1296
-				    location   	(49, 1178)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	382
-				    justify    	0
-				    label      	"XSDNumericFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C75950206"
-				width      	400
-				height     	132
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxFacet" @1297
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2336, 1616)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1297
-				    location   	(2135, 1535)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	402
-				    justify    	0
-				    label      	"XSDMaxFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C0A1CEB010E"
-				compartment 	(object Compartment
-				    Parent_View 	@1297
-				    location   	(2135, 1595)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	363
-				    compartmentItems 	(list Compartment
-					"+ inclusive : boolean"
-					"+ exclusive : boolean"))
-				width      	420
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDWhiteSpaceFacet" @1298
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2320, 2288)
-				label      	(object ItemLabel
-				    Parent_View 	@1298
-				    location   	(2102, 2236)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	436
-				    justify    	0
-				    label      	"XSDWhiteSpaceFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C784601B7"
-				width      	454
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDFractionDigitsFacet" @1299
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2304, 2624)
-				label      	(object ItemLabel
-				    Parent_View 	@1299
-				    location   	(2074, 2572)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	460
-				    justify    	0
-				    label      	"XSDFractionDigitsFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C79BE02EE"
-				width      	478
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDPatternFacet" @1300
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2368, 2128)
-				label      	(object ItemLabel
-				    Parent_View 	@1300
-				    location   	(2196, 2076)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	344
-				    justify    	0
-				    label      	"XSDPatternFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C6ADB026C"
-				width      	362
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDEnumerationFacet" @1301
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 2096)
-				label      	(object ItemLabel
-				    Parent_View 	@1301
-				    location   	(36, 2044)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	440
-				    justify    	0
-				    label      	"XSDEnumerationFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C6ACE0141"
-				width      	458
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDLengthFacet" @1302
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 2272)
-				label      	(object ItemLabel
-				    Parent_View 	@1302
-				    location   	(38, 2220)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	340
-				    justify    	0
-				    label      	"XSDLengthFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C776200E7"
-				width      	358
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinFacet" @1303
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 1584)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1303
-				    location   	(38, 1503)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	404
-				    justify    	0
-				    label      	"XSDMinFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C0A1CDE037C"
-				compartment 	(object Compartment
-				    Parent_View 	@1303
-				    location   	(38, 1563)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	363
-				    compartmentItems 	(list Compartment
-					"+ inclusive : boolean"
-					"+ exclusive : boolean"))
-				width      	422
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxLengthFacet" @1304
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2320, 2464)
-				label      	(object ItemLabel
-				    Parent_View 	@1304
-				    location   	(2111, 2412)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	418
-				    justify    	0
-				    label      	"XSDMaxLengthFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C77C70146"
-				width      	436
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinLengthFacet" @1305
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 2448)
-				label      	(object ItemLabel
-				    Parent_View 	@1305
-				    location   	(39, 2396)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	402
-				    justify    	0
-				    label      	"XSDMinLengthFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C778C0065"
-				width      	420
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDTotalDigitsFacet" @1306
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 2608)
-				label      	(object ItemLabel
-				    Parent_View 	@1306
-				    location   	(38, 2556)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	404
-				    justify    	0
-				    label      	"XSDTotalDigitsFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C79A0020E"
-				width      	422
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @1307
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(928, 1152)
-				label      	(object ItemLabel
-				    Parent_View 	@1307
-				    location   	(667, 1100)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	522
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				width      	540
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @1308
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(176, 1072)
-				label      	(object ItemLabel
-				    Parent_View 	@1308
-				    location   	(50, 1020)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	252
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	270
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @1309
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1232, 1360)
-				label      	(object ItemLabel
-				    Parent_View 	@1309
-				    location   	(944, 1304)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	576
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				compartment 	(object Compartment
-				    Parent_View 	@1309
-				    location   	(944, 1364)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	538
-				    compartmentItems 	(list Compartment
-					"<<0..*>> + validFacets : String"))
-				width      	594
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$248" @1310
-				location   	(1446, 1218)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28A994030A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "rootTypeDefinition" @1311
-					Parent_View 	@1310
-					location   	(582, -78)
-					label      	(object SegLabel @1312
-					    Parent_View 	@1311
-					    location   	(1580, 1173)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+rootTypeDefinition"
-					    pctDist    	3.268293
-					    height     	46
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A99700DD"
-					client     	@1310
-					supplier   	@1309
-					vertices   	(list Points
-					    (1446, 1218)
-					    (1487, 1218)
-					    (1487, 1292))
-					line_style 	3
-					origin_attachment 	(1446, 1218)
-					terminal_attachment 	(1487, 1292)
-					label      	(object SegLabel @1313
-					    Parent_View 	@1311
-					    location   	(1439, 1257)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.184211
-					    height     	39
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$249" @1314
-					Parent_View 	@1310
-					location   	(582, -78)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A99700E7"
-					client     	@1310
-					supplier   	@1309
-					vertices   	(list Points
-					    (1446, 1218)
-					    (1405, 1218)
-					    (1405, 1292))
-					line_style 	3
-					origin_attachment 	(1446, 1218)
-					terminal_attachment 	(1405, 1292))))
-			    (object AssociationViewNew "$UNNAMED$252" @1315
-				location   	(1733, 1575)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B08D0252"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$253" @1316
-					Parent_View 	@1315
-					location   	(917, 7)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B08E0091"
-					client     	@1315
-					supplier   	@1309
-					vertices   	(list Points
-					    (1733, 1575)
-					    (1487, 1575)
-					    (1487, 1428))
-					line_style 	3
-					origin_attachment 	(1733, 1575)
-					terminal_attachment 	(1487, 1428))
-				    (object RoleView "maxFacet" @1317
-					Parent_View 	@1315
-					location   	(917, 7)
-					label      	(object SegLabel @1318
-					    Parent_View 	@1317
-					    location   	(1751, 1541)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	204
-					    justify    	0
-					    label      	"+maxFacet"
-					    pctDist    	0.046243
-					    height     	35
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B08E009B"
-					client     	@1315
-					supplier   	@1297
-					line_style 	3
-					origin_attachment 	(1733, 1575)
-					terminal_attachment 	(2126, 1575)
-					label      	(object SegLabel @1319
-					    Parent_View 	@1317
-					    location   	(2042, 1536)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.789157
-					    height     	40
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$254" @1320
-				location   	(1587, 1793)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0AB0396"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$255" @1321
-					Parent_View 	@1320
-					location   	(707, -31)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0AC03C9"
-					client     	@1320
-					supplier   	@1309
-					vertices   	(list Points
-					    (1587, 1793)
-					    (1447, 1793)
-					    (1447, 1428))
-					line_style 	3
-					origin_attachment 	(1587, 1793)
-					terminal_attachment 	(1447, 1428))
-				    (object RoleView "maxInclusiveFacet" @1322
-					Parent_View 	@1320
-					location   	(707, -31)
-					label      	(object SegLabel @1323
-					    Parent_View 	@1322
-					    location   	(1737, 1751)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	360
-					    justify    	0
-					    label      	"+maxInclusiveFacet"
-					    pctDist    	0.298441
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0AC03D4"
-					client     	@1320
-					supplier   	@1289
-					line_style 	3
-					origin_attachment 	(1587, 1793)
-					terminal_attachment 	(2092, 1793)
-					label      	(object SegLabel @1324
-					    Parent_View 	@1322
-					    location   	(2020, 1754)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.859155
-					    height     	40
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$256" @1325
-				location   	(937, 1787)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0AF0338"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$257" @1326
-					Parent_View 	@1325
-					location   	(617, -5)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0B001F9"
-					client     	@1325
-					supplier   	@1309
-					vertices   	(list Points
-					    (937, 1787)
-					    (997, 1787)
-					    (997, 1428))
-					line_style 	3
-					origin_attachment 	(937, 1787)
-					terminal_attachment 	(997, 1428))
-				    (object RoleView "minInclusiveFacet" @1327
-					Parent_View 	@1325
-					location   	(617, -5)
-					label      	(object SegLabel @1328
-					    Parent_View 	@1327
-					    location   	(792, 1745)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+minInclusiveFacet"
-					    pctDist    	0.346062
-					    height     	43
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0B00203"
-					client     	@1325
-					supplier   	@1290
-					line_style 	3
-					origin_attachment 	(937, 1787)
-					terminal_attachment 	(518, 1787)
-					label      	(object SegLabel @1329
-					    Parent_View 	@1327
-					    location   	(575, 1743)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.863962
-					    height     	45
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$258" @1330
-				location   	(981, 1937)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0B30207"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$259" @1331
-					Parent_View 	@1330
-					location   	(677, -79)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0B40190"
-					client     	@1330
-					supplier   	@1309
-					vertices   	(list Points
-					    (981, 1937)
-					    (1041, 1937)
-					    (1041, 1428))
-					line_style 	3
-					origin_attachment 	(981, 1937)
-					terminal_attachment 	(1041, 1428))
-				    (object RoleView "minExclusiveFacet" @1332
-					Parent_View 	@1330
-					location   	(677, -79)
-					label      	(object SegLabel @1333
-					    Parent_View 	@1332
-					    location   	(823, 1900)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+minExclusiveFacet"
-					    pctDist    	0.341253
-					    height     	38
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0B4019A"
-					client     	@1330
-					supplier   	@1291
-					line_style 	3
-					origin_attachment 	(981, 1937)
-					terminal_attachment 	(518, 1937)
-					label      	(object SegLabel @1334
-					    Parent_View 	@1332
-					    location   	(589, 1897)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.846652
-					    height     	41
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$260" @1335
-				location   	(1469, 1953)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0B6028D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$261" @1336
-					Parent_View 	@1335
-					location   	(621, -95)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0B70217"
-					client     	@1335
-					supplier   	@1309
-					vertices   	(list Points
-					    (1469, 1953)
-					    (1400, 1953)
-					    (1400, 1428))
-					line_style 	3
-					origin_attachment 	(1469, 1953)
-					terminal_attachment 	(1400, 1428))
-				    (object RoleView "maxExclusiveFacet" @1337
-					Parent_View 	@1335
-					location   	(621, -95)
-					label      	(object SegLabel @1338
-					    Parent_View 	@1337
-					    location   	(1646, 1913)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	384
-					    justify    	0
-					    label      	"+maxExclusiveFacet"
-					    pctDist    	0.298097
-					    height     	41
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0B70221"
-					client     	@1335
-					supplier   	@1292
-					line_style 	3
-					origin_attachment 	(1469, 1953)
-					terminal_attachment 	(2064, 1953)
-					label      	(object SegLabel @1339
-					    Parent_View 	@1337
-					    location   	(1961, 1913)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.827236
-					    height     	41
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$262" @1340
-				location   	(1122, 2180)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0BC0051"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$263" @1341
-					Parent_View 	@1340
-					location   	(-318, 628)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0BC0246"
-					client     	@1340
-					supplier   	@1309
-					line_style 	3
-					origin_attachment 	(1122, 2180)
-					terminal_attachment 	(1122, 1428))
-				    (object RoleView "lengthFacet" @1342
-					Parent_View 	@1340
-					location   	(-318, 628)
-					label      	(object SegLabel @1343
-					    Parent_View 	@1342
-					    location   	(804, 2204)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+lengthFacet"
-					    pctDist    	0.475472
-					    height     	37
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0BC0250"
-					client     	@1340
-					supplier   	@1302
-					vertices   	(list Points
-					    (1122, 2180)
-					    (1122, 2240)
-					    (387, 2240))
-					line_style 	3
-					origin_attachment 	(1122, 2180)
-					terminal_attachment 	(387, 2240)
-					label      	(object SegLabel @1344
-					    Parent_View 	@1342
-					    location   	(471, 2204)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.895597
-					    height     	37
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$266" @1345
-				location   	(1084, 1989)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0C2021D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$267" @1346
-					Parent_View 	@1345
-					location   	(-1380, 437)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C300AB"
-					client     	@1345
-					supplier   	@1309
-					line_style 	3
-					origin_attachment 	(1084, 1989)
-					terminal_attachment 	(1084, 1428))
-				    (object RoleView "enumerationFacets" @1347
-					Parent_View 	@1345
-					location   	(-1380, 437)
-					label      	(object SegLabel @1348
-					    Parent_View 	@1347
-					    location   	(837, 2016)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+enumerationFacets"
-					    pctDist    	0.465857
-					    height     	34
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C300AC"
-					client     	@1345
-					supplier   	@1301
-					vertices   	(list Points
-					    (1084, 1989)
-					    (1084, 2049)
-					    (485, 2049))
-					line_style 	3
-					origin_attachment 	(1084, 1989)
-					terminal_attachment 	(485, 2049)
-					label      	(object SegLabel @1349
-					    Parent_View 	@1347
-					    location   	(583, 2021)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.851290
-					    height     	29
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$268" @1350
-				location   	(1451, 2074)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0C50159"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$269" @1351
-					Parent_View 	@1350
-					location   	(-1525, 538)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C600B0"
-					client     	@1350
-					supplier   	@1309
-					vertices   	(list Points
-					    (1451, 2074)
-					    (1362, 2074)
-					    (1362, 1428))
-					line_style 	3
-					origin_attachment 	(1451, 2074)
-					terminal_attachment 	(1362, 1428))
-				    (object RoleView "patternFacets" @1352
-					Parent_View 	@1350
-					location   	(-1525, 538)
-					label      	(object SegLabel @1353
-					    Parent_View 	@1352
-					    location   	(1720, 2038)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+patternFacets"
-					    pctDist    	0.367223
-					    height     	37
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C600BA"
-					client     	@1350
-					supplier   	@1300
-					line_style 	3
-					origin_attachment 	(1451, 2074)
-					terminal_attachment 	(2187, 2074)
-					label      	(object SegLabel @1354
-					    Parent_View 	@1352
-					    location   	(1972, 2035)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.708649
-					    height     	40
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$270" @1355
-				location   	(1827, 1400)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0C802A7"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$271" @1356
-					Parent_View 	@1355
-					location   	(-1149, -472)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C901EA"
-					client     	@1355
-					supplier   	@1309
-					line_style 	3
-					origin_attachment 	(1827, 1400)
-					terminal_attachment 	(1529, 1400))
-				    (object RoleView "cardinalityFacet" @1357
-					Parent_View 	@1355
-					location   	(-1149, -472)
-					label      	(object SegLabel @1358
-					    Parent_View 	@1357
-					    location   	(1847, 1358)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	312
-					    justify    	0
-					    label      	"+cardinalityFacet"
-					    pctDist    	0.071730
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C901F5"
-					client     	@1355
-					supplier   	@1293
-					line_style 	3
-					origin_attachment 	(1827, 1400)
-					terminal_attachment 	(2125, 1400)
-					label      	(object SegLabel @1359
-					    Parent_View 	@1357
-					    location   	(2083, 1357)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.863426
-					    height     	44
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$280" @1360
-				location   	(1262, 2413)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0DB0377"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$281" @1361
-					Parent_View 	@1360
-					location   	(-786, 301)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0DC035A"
-					client     	@1360
-					supplier   	@1309
-					line_style 	3
-					origin_attachment 	(1262, 2413)
-					terminal_attachment 	(1262, 1428))
-				    (object RoleView "fractionDigitsFacet" @1362
-					Parent_View 	@1360
-					location   	(-786, 301)
-					label      	(object SegLabel @1363
-					    Parent_View 	@1362
-					    location   	(1608, 2556)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	360
-					    justify    	0
-					    label      	"+fractionDigitsFacet"
-					    pctDist    	0.537393
-					    height     	41
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0DC0364"
-					client     	@1360
-					supplier   	@1299
-					vertices   	(list Points
-					    (1262, 2413)
-					    (1262, 2596)
-					    (2065, 2596))
-					line_style 	3
-					origin_attachment 	(1262, 2413)
-					terminal_attachment 	(2065, 2596)
-					label      	(object SegLabel @1364
-					    Parent_View 	@1362
-					    location   	(1979, 2556)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.913886
-					    height     	41
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$284" @1365
-				location   	(1841, 1306)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0E300D9"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$285" @1366
-					Parent_View 	@1365
-					location   	(-1135, -790)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0E4038E"
-					client     	@1365
-					supplier   	@1309
-					line_style 	3
-					origin_attachment 	(1841, 1306)
-					terminal_attachment 	(1529, 1306))
-				    (object RoleView "boundedFacet" @1367
-					Parent_View 	@1365
-					location   	(-1135, -790)
-					label      	(object SegLabel @1368
-					    Parent_View 	@1367
-					    location   	(1832, 1270)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	288
-					    justify    	0
-					    label      	"+boundedFacet"
-					    pctDist    	-0.031746
-					    height     	37
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0E40398"
-					client     	@1365
-					supplier   	@1294
-					line_style 	3
-					origin_attachment 	(1841, 1306)
-					terminal_attachment 	(2154, 1306)
-					label      	(object SegLabel @1369
-					    Parent_View 	@1367
-					    location   	(2077, 1275)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.754717
-					    height     	32
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$264" @1370
-				location   	(1328, 2186)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0BF018C"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$265" @1371
-					Parent_View 	@1370
-					location   	(-640, 634)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C0006B"
-					client     	@1370
-					supplier   	@1309
-					line_style 	3
-					origin_attachment 	(1328, 2186)
-					terminal_attachment 	(1328, 1428))
-				    (object RoleView "whiteSpaceFacet" @1372
-					Parent_View 	@1370
-					location   	(-640, 634)
-					label      	(object SegLabel @1373
-					    Parent_View 	@1372
-					    location   	(1673, 2207)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+whiteSpaceFacet"
-					    pctDist    	0.490909
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C00075"
-					client     	@1370
-					supplier   	@1298
-					vertices   	(list Points
-					    (1328, 2186)
-					    (1328, 2246)
-					    (2093, 2246))
-					line_style 	3
-					origin_attachment 	(1328, 2186)
-					terminal_attachment 	(2093, 2246)
-					label      	(object SegLabel @1374
-					    Parent_View 	@1372
-					    location   	(2033, 2203)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.926763
-					    height     	44
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$282" @1375
-				location   	(674, 1390)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0DF0048"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$283" @1376
-					Parent_View 	@1375
-					location   	(-1854, -706)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0DF03B9"
-					client     	@1375
-					supplier   	@1309
-					line_style 	3
-					origin_attachment 	(674, 1390)
-					terminal_attachment 	(935, 1390))
-				    (object RoleView "orderedFacet" @1377
-					Parent_View 	@1375
-					location   	(-1854, -706)
-					label      	(object SegLabel @1378
-					    Parent_View 	@1377
-					    location   	(658, 1353)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	264
-					    justify    	0
-					    label      	"+orderedFacet"
-					    pctDist    	0.061538
-					    height     	38
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0DF03C3"
-					client     	@1375
-					supplier   	@1295
-					line_style 	3
-					origin_attachment 	(674, 1390)
-					terminal_attachment 	(414, 1390)
-					label      	(object SegLabel @1379
-					    Parent_View 	@1377
-					    location   	(510, 1355)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.634615
-					    height     	36
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$272" @1380
-				location   	(687, 1296)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0CB039C"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$273" @1381
-					Parent_View 	@1380
-					location   	(-1809, -576)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0CC03D0"
-					client     	@1380
-					supplier   	@1309
-					line_style 	3
-					origin_attachment 	(687, 1296)
-					terminal_attachment 	(935, 1296))
-				    (object RoleView "numericFacet" @1382
-					Parent_View 	@1380
-					location   	(-1809, -576)
-					label      	(object SegLabel @1383
-					    Parent_View 	@1382
-					    location   	(668, 1257)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+numericFacet"
-					    pctDist    	0.080972
-					    height     	40
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0CC03D1"
-					client     	@1380
-					supplier   	@1296
-					line_style 	3
-					origin_attachment 	(687, 1296)
-					terminal_attachment 	(440, 1296)
-					label      	(object SegLabel @1384
-					    Parent_View 	@1382
-					    location   	(506, 1260)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.736842
-					    height     	37
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$286" @1385
-				location   	(1689, 1662)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B44401EC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$287" @1386
-					Parent_View 	@1385
-					location   	(-183, -354)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B4450360"
-					client     	@1385
-					supplier   	@1309
-					vertices   	(list Points
-					    (1689, 1662)
-					    (1487, 1662)
-					    (1487, 1428))
-					line_style 	3
-					origin_attachment 	(1689, 1662)
-					terminal_attachment 	(1487, 1428))
-				    (object RoleView "effectiveMaxFacet" @1387
-					Parent_View 	@1385
-					location   	(-183, -354)
-					label      	(object SegLabel @1388
-					    Parent_View 	@1387
-					    location   	(1769, 1623)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+effectiveMaxFacet"
-					    pctDist    	0.182051
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B445036A"
-					client     	@1385
-					supplier   	@1297
-					line_style 	3
-					origin_attachment 	(1689, 1662)
-					terminal_attachment 	(2126, 1662)
-					label      	(object SegLabel @1389
-					    Parent_View 	@1387
-					    location   	(2044, 1627)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.815385
-					    height     	36
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$288" @1390
-				location   	(1328, 2258)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B54F0145"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$289" @1391
-					Parent_View 	@1390
-					location   	(-1072, -462)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B550038C"
-					client     	@1390
-					supplier   	@1309
-					line_style 	3
-					origin_attachment 	(1328, 2258)
-					terminal_attachment 	(1328, 1428))
-				    (object RoleView "effectiveWhiteSpaceFacet" @1392
-					Parent_View 	@1390
-					location   	(-1072, -462)
-					label      	(object SegLabel @1393
-					    Parent_View 	@1392
-					    location   	(1685, 2288)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	492
-					    justify    	0
-					    label      	"+effectiveWhiteSpaceFacet"
-					    pctDist    	0.508541
-					    height     	37
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B5500396"
-					client     	@1390
-					supplier   	@1298
-					vertices   	(list Points
-					    (1328, 2258)
-					    (1328, 2324)
-					    (2093, 2324))
-					line_style 	3
-					origin_attachment 	(1328, 2258)
-					terminal_attachment 	(2093, 2324)
-					label      	(object SegLabel @1394
-					    Parent_View 	@1392
-					    location   	(2009, 2293)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.898817
-					    height     	32
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$290" @1395
-				location   	(1297, 2366)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B5C4011C"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$291" @1396
-					Parent_View 	@1395
-					location   	(-607, -722)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B5C5020D"
-					client     	@1395
-					supplier   	@1309
-					line_style 	3
-					origin_attachment 	(1297, 2366)
-					terminal_attachment 	(1297, 1428))
-				    (object RoleView "effectiveMaxLengthFacet" @1397
-					Parent_View 	@1395
-					location   	(-607, -722)
-					label      	(object SegLabel @1398
-					    Parent_View 	@1397
-					    location   	(1657, 2463)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	480
-					    justify    	0
-					    label      	"+effectiveMaxLengthFacet"
-					    pctDist    	0.526906
-					    height     	37
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B5C50217"
-					client     	@1395
-					supplier   	@1304
-					vertices   	(list Points
-					    (1297, 2366)
-					    (1297, 2499)
-					    (2102, 2499))
-					line_style 	3
-					origin_attachment 	(1297, 2366)
-					terminal_attachment 	(2102, 2499)
-					label      	(object SegLabel @1399
-					    Parent_View 	@1397
-					    location   	(2007, 2471)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.899308
-					    height     	29
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$292" @1400
-				location   	(1262, 2449)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B62A00AA"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$293" @1401
-					Parent_View 	@1400
-					location   	(-1170, -815)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B62B0138"
-					client     	@1400
-					supplier   	@1309
-					line_style 	3
-					origin_attachment 	(1262, 2449)
-					terminal_attachment 	(1262, 1428))
-				    (object RoleView "effectiveFractionDigitsFacet" @1402
-					Parent_View 	@1400
-					location   	(-1170, -815)
-					label      	(object SegLabel @1403
-					    Parent_View 	@1402
-					    location   	(1640, 2634)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	528
-					    justify    	0
-					    label      	"+effectiveFractionDigitsFacet"
-					    pctDist    	0.585315
-					    height     	35
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B62B0142"
-					client     	@1400
-					supplier   	@1299
-					vertices   	(list Points
-					    (1262, 2449)
-					    (1262, 2668)
-					    (2065, 2668))
-					line_style 	3
-					origin_attachment 	(1262, 2449)
-					terminal_attachment 	(2065, 2668)
-					label      	(object SegLabel @1404
-					    Parent_View 	@1402
-					    location   	(1989, 2629)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.926485
-					    height     	40
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$294" @1405
-				location   	(1422, 2159)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B6B003A6"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$295" @1406
-					Parent_View 	@1405
-					location   	(-770, -1313)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B6B10311"
-					client     	@1405
-					supplier   	@1309
-					vertices   	(list Points
-					    (1422, 2159)
-					    (1362, 2159)
-					    (1362, 1428))
-					line_style 	3
-					origin_attachment 	(1422, 2159)
-					terminal_attachment 	(1362, 1428))
-				    (object RoleView "effectivePatternFacet" @1407
-					Parent_View 	@1405
-					location   	(-770, -1313)
-					label      	(object SegLabel @1408
-					    Parent_View 	@1407
-					    location   	(1727, 2125)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	408
-					    justify    	0
-					    label      	"+effectivePatternFacet"
-					    pctDist    	0.399090
-					    height     	35
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B6B10312"
-					client     	@1405
-					supplier   	@1300
-					line_style 	3
-					origin_attachment 	(1422, 2159)
-					terminal_attachment 	(2187, 2159)
-					label      	(object SegLabel @1409
-					    Parent_View 	@1407
-					    location   	(2102, 2119)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.889226
-					    height     	41
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$296" @1410
-				location   	(1084, 2083)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B7CA026B"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$297" @1411
-					Parent_View 	@1410
-					location   	(828, -1373)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B7CB0186"
-					client     	@1410
-					supplier   	@1309
-					line_style 	3
-					origin_attachment 	(1084, 2083)
-					terminal_attachment 	(1084, 1428))
-				    (object RoleView "effectiveEnumerationFacet" @1412
-					Parent_View 	@1410
-					location   	(828, -1373)
-					label      	(object SegLabel @1413
-					    Parent_View 	@1412
-					    location   	(822, 2101)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	504
-					    justify    	0
-					    label      	"+effectiveEnumerationFacet"
-					    pctDist    	0.488619
-					    height     	43
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B7CB0190"
-					client     	@1410
-					supplier   	@1301
-					vertices   	(list Points
-					    (1084, 2083)
-					    (1084, 2143)
-					    (485, 2143))
-					line_style 	3
-					origin_attachment 	(1084, 2083)
-					terminal_attachment 	(485, 2143)
-					label      	(object SegLabel @1414
-					    Parent_View 	@1412
-					    location   	(531, 2100)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.931715
-					    height     	44
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$302" @1415
-				location   	(1122, 2241)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B8DC0052"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$303" @1416
-					Parent_View 	@1415
-					location   	(866, -479)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B8DC03B9"
-					client     	@1415
-					supplier   	@1309
-					line_style 	3
-					origin_attachment 	(1122, 2241)
-					terminal_attachment 	(1122, 1428))
-				    (object RoleView "effectiveLengthFacet" @1417
-					Parent_View 	@1415
-					location   	(866, -479)
-					label      	(object SegLabel @1418
-					    Parent_View 	@1417
-					    location   	(800, 2279)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+effectiveLengthFacet"
-					    pctDist    	0.491731
-					    height     	40
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B8DC03C3"
-					client     	@1415
-					supplier   	@1302
-					vertices   	(list Points
-					    (1122, 2241)
-					    (1122, 2318)
-					    (387, 2318))
-					line_style 	3
-					origin_attachment 	(1122, 2241)
-					terminal_attachment 	(387, 2318)
-					label      	(object SegLabel @1419
-					    Parent_View 	@1417
-					    location   	(470, 2279)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.898567
-					    height     	40
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$250" @1420
-				location   	(773, 1565)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B085025B"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$251" @1421
-					Parent_View 	@1420
-					location   	(469, 13)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0860270"
-					client     	@1420
-					supplier   	@1309
-					vertices   	(list Points
-					    (773, 1565)
-					    (959, 1565)
-					    (959, 1428))
-					line_style 	3
-					origin_attachment 	(773, 1565)
-					terminal_attachment 	(959, 1428))
-				    (object RoleView "minFacet" @1422
-					Parent_View 	@1420
-					location   	(469, 13)
-					label      	(object SegLabel @1423
-					    Parent_View 	@1422
-					    location   	(753, 1532)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	192
-					    justify    	0
-					    label      	"+minFacet"
-					    pctDist    	0.063091
-					    height     	34
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B086027A"
-					client     	@1420
-					supplier   	@1303
-					line_style 	3
-					origin_attachment 	(773, 1565)
-					terminal_attachment 	(451, 1565)
-					label      	(object SegLabel @1424
-					    Parent_View 	@1422
-					    location   	(534, 1523)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.746667
-					    height     	43
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$304" @1425
-				location   	(816, 1650)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B97001DB"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$305" @1426
-					Parent_View 	@1425
-					location   	(496, -334)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B97100CF"
-					client     	@1425
-					supplier   	@1309
-					vertices   	(list Points
-					    (816, 1650)
-					    (959, 1650)
-					    (959, 1428))
-					line_style 	3
-					origin_attachment 	(816, 1650)
-					terminal_attachment 	(959, 1428))
-				    (object RoleView "effectiveMinFacet" @1427
-					Parent_View 	@1425
-					location   	(496, -334)
-					label      	(object SegLabel @1428
-					    Parent_View 	@1427
-					    location   	(764, 1614)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+effectiveMinFacet"
-					    pctDist    	0.141618
-					    height     	37
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B97100D9"
-					client     	@1425
-					supplier   	@1303
-					line_style 	3
-					origin_attachment 	(816, 1650)
-					terminal_attachment 	(451, 1650)
-					label      	(object SegLabel @1429
-					    Parent_View 	@1427
-					    location   	(523, 1606)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.802740
-					    height     	44
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$274" @1430
-				location   	(1297, 2321)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0CF0199"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$275" @1431
-					Parent_View 	@1430
-					location   	(-719, 497)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0D20085"
-					client     	@1430
-					supplier   	@1309
-					line_style 	3
-					origin_attachment 	(1297, 2321)
-					terminal_attachment 	(1297, 1428))
-				    (object RoleView "maxLengthFacet" @1432
-					Parent_View 	@1430
-					location   	(-719, 497)
-					label      	(object SegLabel @1433
-					    Parent_View 	@1432
-					    location   	(1630, 2380)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+maxLengthFacet"
-					    pctDist    	0.472255
-					    height     	30
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0D2008F"
-					client     	@1430
-					supplier   	@1304
-					vertices   	(list Points
-					    (1297, 2321)
-					    (1297, 2409)
-					    (2102, 2409))
-					line_style 	3
-					origin_attachment 	(1297, 2321)
-					terminal_attachment 	(2102, 2409)
-					label      	(object SegLabel @1434
-					    Parent_View 	@1432
-					    location   	(1994, 2366)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.879208
-					    height     	44
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$276" @1435
-				location   	(1159, 2273)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0D500C5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$277" @1436
-					Parent_View 	@1435
-					location   	(-281, 449)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0D6001D"
-					client     	@1435
-					supplier   	@1309
-					line_style 	3
-					origin_attachment 	(1159, 2273)
-					terminal_attachment 	(1159, 1428))
-				    (object RoleView "minLengthFacet" @1437
-					Parent_View 	@1435
-					location   	(-281, 449)
-					label      	(object SegLabel @1438
-					    Parent_View 	@1437
-					    location   	(857, 2372)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	324
-					    justify    	0
-					    label      	"+minLengthFacet"
-					    pctDist    	0.519527
-					    height     	38
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0D60027"
-					client     	@1435
-					supplier   	@1305
-					vertices   	(list Points
-					    (1159, 2273)
-					    (1159, 2409)
-					    (450, 2409))
-					line_style 	3
-					origin_attachment 	(1159, 2273)
-					terminal_attachment 	(450, 2409)
-					label      	(object SegLabel @1439
-					    Parent_View 	@1437
-					    location   	(523, 2369)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.913610
-					    height     	41
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$300" @1440
-				location   	(1197, 2334)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B898016D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$301" @1441
-					Parent_View 	@1440
-					location   	(941, -610)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B8990056"
-					client     	@1440
-					supplier   	@1309
-					line_style 	3
-					origin_attachment 	(1197, 2334)
-					terminal_attachment 	(1197, 1428))
-				    (object RoleView "effectiveMinLengthFacet" @1442
-					Parent_View 	@1440
-					location   	(941, -610)
-					label      	(object SegLabel @1443
-					    Parent_View 	@1442
-					    location   	(856, 2454)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	468
-					    justify    	0
-					    label      	"+effectiveMinLengthFacet"
-					    pctDist    	0.552604
-					    height     	40
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B8990060"
-					client     	@1440
-					supplier   	@1305
-					vertices   	(list Points
-					    (1197, 2334)
-					    (1197, 2493)
-					    (450, 2493))
-					line_style 	3
-					origin_attachment 	(1197, 2334)
-					terminal_attachment 	(450, 2493)
-					label      	(object SegLabel @1444
-					    Parent_View 	@1442
-					    location   	(527, 2451)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.916047
-					    height     	43
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$298" @1445
-				location   	(1231, 2438)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B8400062"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$299" @1446
-					Parent_View 	@1445
-					location   	(863, -746)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B841001D"
-					client     	@1445
-					supplier   	@1309
-					line_style 	3
-					origin_attachment 	(1231, 2438)
-					terminal_attachment 	(1231, 1428))
-				    (object RoleView "effectiveTotalDigitsFacet" @1447
-					Parent_View 	@1445
-					location   	(863, -746)
-					label      	(object SegLabel @1448
-					    Parent_View 	@1447
-					    location   	(859, 2632)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	468
-					    justify    	0
-					    label      	"+effectiveTotalDigitsFacet"
-					    pctDist    	0.597030
-					    height     	37
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B8410027"
-					client     	@1445
-					supplier   	@1306
-					vertices   	(list Points
-					    (1231, 2438)
-					    (1231, 2668)
-					    (451, 2668))
-					line_style 	3
-					origin_attachment 	(1231, 2438)
-					terminal_attachment 	(451, 2668)
-					label      	(object SegLabel @1449
-					    Parent_View 	@1447
-					    location   	(534, 2631)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.918812
-					    height     	38
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$278" @1450
-				location   	(1231, 2397)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0D800DE"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$279" @1451
-					Parent_View 	@1450
-					location   	(-209, 253)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0D803CD"
-					client     	@1450
-					supplier   	@1309
-					line_style 	3
-					origin_attachment 	(1231, 2397)
-					terminal_attachment 	(1231, 1428))
-				    (object RoleView "totalDigitsFacet" @1452
-					Parent_View 	@1450
-					location   	(-209, 253)
-					label      	(object SegLabel @1453
-					    Parent_View 	@1452
-					    location   	(853, 2550)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	312
-					    justify    	0
-					    label      	"+totalDigitsFacet"
-					    pctDist    	0.585567
-					    height     	38
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0D803D7"
-					client     	@1450
-					supplier   	@1306
-					vertices   	(list Points
-					    (1231, 2397)
-					    (1231, 2587)
-					    (451, 2587))
-					line_style 	3
-					origin_attachment 	(1231, 2397)
-					terminal_attachment 	(451, 2587)
-					label      	(object SegLabel @1454
-					    Parent_View 	@1452
-					    location   	(535, 2560)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.914647
-					    height     	28
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @1455
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1232, 768)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1455
-				    location   	(1019, 574)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	426
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	444
-				height     	413
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @1456
-				location   	(1209, 1065)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1455
-				vertices   	(list Points
-				    (1209, 1065)
-				    (1209, 974)))
-			    (object AssociationViewNew "$UNNAMED$234" @1457
-				location   	(1090, 1031)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C2880F503D9"
-				roleview_list 	(list RoleViews
-				    (object RoleView "rootTypeDefinition" @1458
-					Parent_View 	@1457
-					location   	(322, -25)
-					label      	(object SegLabel @1459
-					    Parent_View 	@1458
-					    location   	(897, 1036)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+rootTypeDefinition"
-					    pctDist    	-0.098765
-					    height     	194
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C2880F9003C"
-					client     	@1457
-					supplier   	@1455
-					line_style 	3
-					origin_attachment 	(1090, 1031)
-					terminal_attachment 	(1090, 974)
-					label      	(object SegLabel @1460
-					    Parent_View 	@1458
-					    location   	(1121, 1034)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.061728
-					    height     	31
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$235" @1461
-					Parent_View 	@1457
-					location   	(322, -25)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C2880F90046"
-					client     	@1457
-					supplier   	@1307
-					line_style 	3
-					origin_attachment 	(1090, 1031)
-					terminal_attachment 	(1090, 1088))))
-			    (object AssociationViewNew "$UNNAMED$240" @1462
-				location   	(1538, 873)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28A6DB01E5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "rootType" @1463
-					Parent_View 	@1462
-					location   	(178, 105)
-					label      	(object SegLabel @1464
-					    Parent_View 	@1463
-					    location   	(1558, 792)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+rootType"
-					    pctDist    	-1.760870
-					    height     	20
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A6DD03DD"
-					client     	@1462
-					supplier   	@1455
-					vertices   	(list Points
-					    (1538, 873)
-					    (1538, 919)
-					    (1454, 919))
-					line_style 	3
-					origin_attachment 	(1538, 873)
-					terminal_attachment 	(1454, 919)
-					label      	(object SegLabel @1465
-					    Parent_View 	@1463
-					    location   	(1509, 875)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.016667
-					    height     	30
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$241" @1466
-					Parent_View 	@1462
-					location   	(178, 105)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A6DD03DE"
-					client     	@1462
-					supplier   	@1455
-					vertices   	(list Points
-					    (1538, 873)
-					    (1538, 828)
-					    (1454, 828))
-					line_style 	3
-					origin_attachment 	(1538, 873)
-					terminal_attachment 	(1454, 828))))
-			    (object AssociationViewNew "$UNNAMED$242" @1467
-				location   	(1535, 684)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28A7120108"
-				roleview_list 	(list RoleViews
-				    (object RoleView "baseType" @1468
-					Parent_View 	@1467
-					location   	(175, -84)
-					label      	(object SegLabel @1469
-					    Parent_View 	@1468
-					    location   	(1559, 597)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	204
-					    justify    	0
-					    label      	"+baseType"
-					    pctDist    	-1.977273
-					    height     	24
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A7140151"
-					client     	@1467
-					supplier   	@1455
-					vertices   	(list Points
-					    (1535, 684)
-					    (1535, 728)
-					    (1454, 728))
-					line_style 	3
-					origin_attachment 	(1535, 684)
-					terminal_attachment 	(1454, 728)
-					label      	(object SegLabel @1470
-					    Parent_View 	@1468
-					    location   	(1506, 683)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.027778
-					    height     	30
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$243" @1471
-					Parent_View 	@1467
-					location   	(175, -84)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A714015B"
-					client     	@1467
-					supplier   	@1455
-					vertices   	(list Points
-					    (1535, 684)
-					    (1535, 641)
-					    (1454, 641))
-					line_style 	3
-					origin_attachment 	(1535, 684)
-					terminal_attachment 	(1454, 641))))
-			    (object AssociationViewNew "$UNNAMED$246" @1472
-				location   	(613, 940)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28A7ED03C0"
-				roleview_list 	(list RoleViews
-				    (object RoleView "complexType" @1473
-					Parent_View 	@1472
-					location   	(-747, 172)
-					label      	(object SegLabel @1474
-					    Parent_View 	@1473
-					    location   	(465, 983)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	264
-					    justify    	0
-					    label      	"+complexType"
-					    pctDist    	0.373057
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A7F40117"
-					client     	@1472
-					supplier   	@1308
-					vertices   	(list Points
-					    (613, 940)
-					    (284, 940)
-					    (284, 1008))
-					line_style 	3
-					origin_attachment 	(613, 940)
-					terminal_attachment 	(284, 1008)
-					label      	(object SegLabel @1475
-					    Parent_View 	@1473
-					    location   	(224, 972)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.909320
-					    height     	61
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$247" @1476
-					Parent_View 	@1472
-					location   	(-747, 172)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A7F40121"
-					client     	@1472
-					supplier   	@1455
-					line_style 	3
-					origin_attachment 	(613, 940)
-					terminal_attachment 	(1010, 940))))
-			    (object InheritView "" @1477
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAB1004D"
-				client     	@1455
-				supplier   	@1285
-				line_style 	3
-				origin_attachment 	(1112, 562)
-				terminal_attachment 	(1112, 510)
-				drawSupplier 	@1286)
-			    (object InheritView "" @1478
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0D01901F1"
-				client     	@1307
-				supplier   	@1455
-				line_style 	3
-				origin_attachment 	(1146, 1088)
-				terminal_attachment 	(1146, 1065)
-				drawSupplier 	@1456)
-			    (object AssociationViewNew "$UNNAMED$244" @1479
-				location   	(1362, 1133)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28A74B0178"
-				roleview_list 	(list RoleViews
-				    (object RoleView "simpleType" @1480
-					Parent_View 	@1479
-					location   	(-158, -163)
-					label      	(object SegLabel @1481
-					    Parent_View 	@1480
-					    location   	(1499, 1094)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+simpleType"
-					    pctDist    	-0.246753
-					    height     	137
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A74D017B"
-					client     	@1479
-					supplier   	@1309
-					line_style 	3
-					origin_attachment 	(1362, 1133)
-					terminal_attachment 	(1362, 1292)
-					label      	(object SegLabel @1482
-					    Parent_View 	@1480
-					    location   	(1321, 1097)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	-0.227273
-					    height     	42
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$245" @1483
-					Parent_View 	@1479
-					location   	(-158, -163)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A74D0185"
-					client     	@1479
-					supplier   	@1455
-					line_style 	3
-					origin_attachment 	(1362, 1133)
-					terminal_attachment 	(1362, 974))))
-			    (object ClassView "Class" "Logical View::xsd::XSDFeature" @1484
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2272, 384)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1484
-				    location   	(2002, 303)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	540
-				    justify    	0
-				    label      	"XSDFeature")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B537026C"
-				compartment 	(object Compartment
-				    Parent_View 	@1484
-				    location   	(2002, 363)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	508
-				    compartmentItems 	(list Compartment
-					"+ global : boolean"
-					"+ featureReference : boolean"))
-				width      	558
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @1485
-				location   	(2262, 568)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1484
-				vertices   	(list Points
-				    (2262, 568)
-				    (2262, 477)))
-			    (object InheritView "" @1486
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69EDEE01BF"
-				client     	@1281
-				supplier   	@1484
-				line_style 	3
-				origin_attachment 	(2346, 595)
-				terminal_attachment 	(2346, 568)
-				drawSupplier 	@1485)
-			    (object AssociationViewNew "$UNNAMED$238" @1487
-				location   	(1553, 453)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28A0F201A4"
-				roleview_list 	(list RoleViews
-				    (object RoleView "type" @1488
-					Parent_View 	@1487
-					location   	(801, 293)
-					label      	(object SegLabel @1489
-					    Parent_View 	@1488
-					    location   	(1331, 499)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	108
-					    justify    	0
-					    label      	"+type"
-					    pctDist    	0.506266
-					    height     	46
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A0F302E5"
-					client     	@1487
-					supplier   	@1455
-					vertices   	(list Points
-					    (1553, 453)
-					    (1222, 453)
-					    (1222, 562))
-					line_style 	3
-					origin_attachment 	(1553, 453)
-					terminal_attachment 	(1222, 562)
-					label      	(object SegLabel @1490
-					    Parent_View 	@1488
-					    location   	(1185, 479)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.812030
-					    height     	38
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$239" @1491
-					Parent_View 	@1487
-					location   	(801, 293)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A0F302F0"
-					client     	@1487
-					supplier   	@1484
-					line_style 	3
-					origin_attachment 	(1553, 453)
-					terminal_attachment 	(1993, 453))))
-			    (object AssociationViewNew "$UNNAMED$130" @1492
-				location   	(1908, 353)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C29010602D7"
-				roleview_list 	(list RoleViews
-				    (object RoleView "resolvedFeature" @1493
-					Parent_View 	@1492
-					location   	(-268, -159)
-					label      	(object SegLabel @1494
-					    Parent_View 	@1493
-					    location   	(1729, 352)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	312
-					    justify    	0
-					    label      	"+resolvedFeature"
-					    pctDist    	-0.029412
-					    height     	180
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C29010B000E"
-					client     	@1492
-					supplier   	@1484
-					vertices   	(list Points
-					    (1908, 353)
-					    (1908, 387)
-					    (1993, 387))
-					line_style 	3
-					origin_attachment 	(1908, 353)
-					terminal_attachment 	(1993, 387)
-					label      	(object SegLabel @1495
-					    Parent_View 	@1493
-					    location   	(1945, 354)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.596639
-					    height     	34
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$131" @1496
-					Parent_View 	@1492
-					location   	(-268, -159)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C29010B0018"
-					client     	@1492
-					supplier   	@1484
-					vertices   	(list Points
-					    (1908, 353)
-					    (1908, 319)
-					    (1993, 319))
-					line_style 	3
-					origin_attachment 	(1908, 353)
-					terminal_attachment 	(1993, 319))))
-			    (object InheritView "" @1497
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A26036D"
-				client     	@1285
-				supplier   	@1284
-				vertices   	(list Points
-				    (494, 284)
-				    (494, 244)
-				    (996, 244))
-				line_style 	3
-				origin_attachment 	(494, 284)
-				terminal_attachment 	(996, 244))
-			    (object InheritView "" @1498
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69B7DC0193"
-				client     	@1272
-				supplier   	@1484
-				line_style 	3
-				origin_attachment 	(1718, 812)
-				terminal_attachment 	(1718, 568)
-				drawSupplier 	@1485)
-			    (object InheritView "" @1499
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A1302A2"
-				client     	@1309
-				supplier   	@1455
-				line_style 	3
-				origin_attachment 	(1265, 1292)
-				terminal_attachment 	(1265, 1065)
-				drawSupplier 	@1456)
-			    (object InheritView "" @1500
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A2C0307"
-				client     	@1484
-				supplier   	@1284
-				vertices   	(list Points
-				    (2147, 291)
-				    (2147, 244)
-				    (1468, 244))
-				line_style 	3
-				origin_attachment 	(2147, 291)
-				terminal_attachment 	(1468, 244)))))))
-	logical_presentations 	(list unit_reference_list
-	    (object ClassDiagram "Main"
-		quid       	"3ABFD9A70163"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list
-		    (object CategoryView "Logical View::http" @1501
-			location   	(336, 224)
-			label      	(object ItemLabel
-			    Parent_View 	@1501
-			    location   	(192, 140)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"http")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"3ABFD9AD01F8"
-			width      	300
-			height     	180)
-		    (object CategoryView "Logical View::wsdl" @1502
-			location   	(784, 224)
-			label      	(object ItemLabel
-			    Parent_View 	@1502
-			    location   	(640, 140)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"wsdl")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"3ADFB8E5021E"
-			width      	300
-			height     	180)
-		    (object CategoryView "Logical View::xsd" @1503
-			location   	(1232, 224)
-			label      	(object ItemLabel
-			    Parent_View 	@1503
-			    location   	(1088, 140)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"xsd")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"39ABDC6F01AA"
-			width      	300
-			height     	180)))))
-    root_subsystem 	(object SubSystem "Component View"
-	quid       	"3ABFD9A70152"
-	physical_models 	(list unit_reference_list)
-	physical_presentations 	(list unit_reference_list
-	    (object Module_Diagram "Main"
-		quid       	"3ABFD9A7018B"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    process_structure 	(object Processes
-	quid       	"3ABFD9A70153"
-	ProcsNDevs 	(list
-	    (object Process_Diagram "Deployment View"
-		quid       	"3ABFD9A70155"
-		title      	"Deployment View"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    properties 	(object Properties
-	attributes 	(list Attribute_Set
-	    (object Attribute
-		tool       	"DDL"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"DDL"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"DDL"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"DataBase"
-			value      	("DataBaseSet" 800))
-		    (object Attribute
-			tool       	"DDL"
-			name       	"DataBaseSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"DDL"
-				name       	"ANSI"
-				value      	800)
-			    (object Attribute
-				tool       	"DDL"
-				name       	"Oracle"
-				value      	801)
-			    (object Attribute
-				tool       	"DDL"
-				name       	"SQLServer"
-				value      	802)
-			    (object Attribute
-				tool       	"DDL"
-				name       	"Sybase"
-				value      	803)
-			    (object Attribute
-				tool       	"DDL"
-				name       	"Watcom"
-				value      	804)))
-		    (object Attribute
-			tool       	"DDL"
-			name       	"PrimaryKeyColumnName"
-			value      	"Id")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"PrimaryKeyColumnType"
-			value      	"NUMBER(5)")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"ViewName"
-			value      	"V_")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"TableName"
-			value      	"T_")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"InheritSuffix"
-			value      	"_V")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"DropClause"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"BaseViews"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"DDLScriptFilename"
-			value      	"DDL1.SQL")))
-	    (object Attribute
-		tool       	"DDL"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"DDL"
-			name       	"ColumnType"
-			value      	"VARCHAR")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"Length"
-			value      	"")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"NullsOK"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"PrimaryKey"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"Unique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"CompositeUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"CheckConstraint"
-			value      	"")))
-	    (object Attribute
-		tool       	"DDL"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"framework"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"IDL"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"StopOnError"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GeneratePreserveRegions"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"ImplementationType"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"ConstValue"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateDefaultSpecifier"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"DefaultSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IDLElement"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IDLSpecificationType"
-			value      	("IDLSpecSet" 22))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IDLSpecSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Interface"
-				value      	22)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Typedef"
-				value      	54)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Enumeration"
-				value      	8)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Const"
-				value      	71)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Exception"
-				value      	61)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Struct"
-				value      	51)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Union"
-				value      	81)))))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CmIdentification"
-			value      	(value Text "  %X%  @(#) plugins/com.ibm.etools.ctc.binding.http/src/rose/httpbindingMdl.mdl, ctc, ibmctc"))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateIDLModule"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CmIdentification"
-			value      	(value Text "  %X%  @(#) plugins/com.ibm.etools.ctc.binding.http/src/rose/httpbindingMdl.mdl, ctc, ibmctc"))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"OperationIsOneWay"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Context"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Raises"
-			value      	"")))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IsConst"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"ConstValue"
-			value      	"")))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"NameIfUnlabeled"
-			value      	"the_$supplier")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"BoundedHasRelType"
-			value      	("HasRelTypeSet" 47))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"HasRelTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"NameIfUnlabeled"
-			value      	"the_$supplier")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"BoundedRoleType"
-			value      	("AssocTypeSet" 47))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"AssocTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Uses"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateForwardReference"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Subsystem"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Directory"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Java"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"Java"
-			name       	"UsePrefixes"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"InstanceVariablePrefix"
-			value      	"m_")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ClassVariablePrefix"
-			value      	"s_")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultAttributeDataType"
-			value      	"int")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultOperationReturnType"
-			value      	"void")
-		    (object Attribute
-			tool       	"Java"
-			name       	"RootDir"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"AutoSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ShowCodegenDlg"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocDefaultAuthor"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocDefaultVersion"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocDefaultSince"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocNumAsterisks"
-			value      	0)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MaxNumChars"
-			value      	80)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Editor"
-			value      	("EditorType" 100))
-		    (object Attribute
-			tool       	"Java"
-			name       	"VM"
-			value      	("VMType" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"ClassPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EditorType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"BuiltIn"
-				value      	100)
-			    (object Attribute
-				tool       	"Java"
-				name       	"WindowsShell"
-				value      	101)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"VMType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Sun"
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Microsoft"
-				value      	201)
-			    (object Attribute
-				tool       	"Java"
-				name       	"IBM"
-				value      	202)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"NoClassCustomDlg"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GlobalImports"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"OpenBraceClassStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"OpenBraceMethodStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"UseTabs"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"UseSpaces"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"SpacingItems"
-			value      	3)
-		    (object Attribute
-			tool       	"Java"
-			name       	"RoseDefaultCommentStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"AsteriskCommentStyle"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavaCommentStyle"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocAuthor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocSince"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocVersion"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Private"
-				value      	64)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DisableAutoSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletName"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContextRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsSingleThread"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIsSecure"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcher"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcherPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherInclude"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherForward"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletgetInfo"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttribute"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttributesNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestAttributes"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestParameters"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeader"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeaderNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForHeaders"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIntHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletDateHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletCookie"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForCookie"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContentType"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateHTML"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate_XML_DD"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCmpField"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBEnvironmentProperties"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCnxFactory"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReferences"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBNameInJAR"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType"
-			value      	("EJBSessionType_Set" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateless"
-				value      	201)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateful"
-				value      	202)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType"
-			value      	("EJBTransactionType_Set" 211))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	211)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	212)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType"
-			value      	("EJBPersistenceType_Set" 220))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	220)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	221)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	222)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReentrant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"BMP_Extend_CMP"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"CmIdentification"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"AdditionalImports"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"CmIdentification"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"AdditionalImports"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Abstract"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Native"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Synchronized"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Transient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Volatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"PropertyType"
-			value      	("BeanProperty_Set" 71))
-		    (object Attribute
-			tool       	"Java"
-			name       	"BeanProperty_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Not A Property"
-				value      	71)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Simple"
-				value      	72)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bound"
-				value      	73)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Constrained"
-				value      	74)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"IndividualChangeMgt"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write"
-			value      	("Read/Write_Set" 81))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read & Write"
-				value      	81)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read Only"
-				value      	82)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Write Only"
-				value      	83)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFullyQualifiedTypes"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Transient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Volatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"PropertyType"
-			value      	("BeanProperty_Set" 71))
-		    (object Attribute
-			tool       	"Java"
-			name       	"BeanProperty_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Not A Property"
-				value      	71)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Simple"
-				value      	72)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bound"
-				value      	73)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Constrained"
-				value      	74)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"IndividualChangeMgt"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write"
-			value      	("Read/Write_Set" 81))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read & Write"
-				value      	81)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read Only"
-				value      	82)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Write Only"
-				value      	83)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFullyQualifiedTypes"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsNavigable"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"propertyId"
-		value      	"360000002")
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"DDLScriptFilename"
-			value      	"DDL1.SQL")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"DropClause"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"PrimaryKeyColumnName"
-			value      	"_ID")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"PrimaryKeyColumnType"
-			value      	"NUMBER(5,0)")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"SchemaNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"SchemaNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TableNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TypeNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TypeNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ViewNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ViewNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"VarrayNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"VarrayNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NestedTableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NestedTableNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ObjectTableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ObjectTableNameSuffix"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsSchema"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OID"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"WhereClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CheckConstraint"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypeLength"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypePrecision"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypeScale"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionOfREFS"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"MethodKind"
-			value      	("MethodKindSet" 1903))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OverloadID"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsReadNoDataState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsReadNoProcessState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsWriteNoDataState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsWriteNoProcessState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsSelfish"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerType"
-			value      	("TriggerTypeSet" 1801))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerEvent"
-			value      	("TriggerEventSet" 1601))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerText"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerReferencingNames"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerForEach"
-			value      	("TriggerForEachSet" 1701))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerWhenClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"MethodKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"MapMethod"
-				value      	1901)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"OrderMethod"
-				value      	1902)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Function"
-				value      	1903)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Procedure"
-				value      	1904)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Operator"
-				value      	1905)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Constructor"
-				value      	1906)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Destructor"
-				value      	1907)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Trigger"
-				value      	1908)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Calculated"
-				value      	1909)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"AFTER"
-				value      	1801)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"BEFORE"
-				value      	1802)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSTEAD OF"
-				value      	1803)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerForEachSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"ROW"
-				value      	1701)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"STATEMENT"
-				value      	1702)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerEventSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT"
-				value      	1601)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"UPDATE"
-				value      	1602)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"DELETE"
-				value      	1603)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR UPDATE"
-				value      	1604)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR DELETE"
-				value      	1605)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"UPDATE OR DELETE"
-				value      	1606)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR UPDATE OR DELETE"
-				value      	1607)))))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NullsAllowed"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Length"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Precision"
-			value      	"2")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Scale"
-			value      	"6")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsIndex"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsPrimaryKey"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CompositeUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CheckConstraint"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"cg"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"UseMSVC"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileExtension"
-			value      	"h")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileBackupExtension"
-			value      	"h~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileTemporaryExtension"
-			value      	"h#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileExtension"
-			value      	"cpp")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileBackupExtension"
-			value      	"cp~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileTemporaryExtension"
-			value      	"cp#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ErrorLimit"
-			value      	30)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Directory"
-			value      	"$ROSECPP_SOURCE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"PathSeparator"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileNameFormat"
-			value      	"128vx_b")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BooleanType"
-			value      	"int")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowTemplates"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExplicitInstantiations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowProtectedInheritance"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CommentWidth"
-			value      	60)
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByValueContainer"
-			value      	"$targetClass")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByValueContainer"
-			value      	"OptionalByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByValueContainer"
-			value      	"BoundedListByValue<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByValueContainer"
-			value      	"BoundedSetByValue<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByReferenceContainer"
-			value      	"BoundedListByReference<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByReferenceContainer"
-			value      	"BoundedSetByReference<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByValueContainer"
-			value      	"UnboundedListByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByValueContainer"
-			value      	"UnboundedSetByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByReferenceContainer"
-			value      	"UnboundedListByReference<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByReferenceContainer"
-			value      	"UnboundedSetByReference<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByValueContainer"
-			value      	"AssociationByValue<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByValueContainer"
-			value      	"DictionaryByValue<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByReferenceContainer"
-			value      	"AssociationByReference<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByReferenceContainer"
-			value      	"DictionaryByReference<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GeneratePreserveRegions"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ImplementationType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ClassKey"
-			value      	"class")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"PutBodiesInSpec"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDefaultConstructor"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DefaultConstructorVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineDefaultConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ExplicitDefaultConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateCopyConstructor"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CopyConstructorVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineCopyConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ExplicitCopyConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDestructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DestructorVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DestructorKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineDestructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssignmentOperation"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssignmentVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssignmentKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineAssignmentOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEqualityOperations"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"EqualityVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"EqualityKind"
-			value      	("FriendKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineEqualityOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateRelationalOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"RelationalVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"RelationalKind"
-			value      	("FriendKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineRelationalOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateStorageMgmtOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StorageMgmtVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineStorageMgmtOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSubscriptOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SubscriptVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"SubscriptKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"SubscriptResultType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSubscriptOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDereferenceOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DereferenceVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DereferenceKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DereferenceResultType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineDereferenceOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateIndirectionOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IndirectionVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IndirectionKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IndirectionResultType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineIndirectionOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateStreamOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StreamVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineStreamOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ThreeKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"KindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"FriendKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"DeclareAndDefine"
-				value      	199)
-			    (object Attribute
-				tool       	"cg"
-				name       	"DeclareOnly"
-				value      	205)
-			    (object Attribute
-				tool       	"cg"
-				name       	"DoNotDeclare"
-				value      	206)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"VisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ConstValue"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDefaultSpecifier"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DefaultSpecifier"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CmIdentification"
-			value      	(value Text "  %X%  @(#) plugins/com.ibm.etools.ctc.binding.http/src/rose/httpbindingMdl.mdl, ctc, ibmctc"))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExtensionlessFileName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeFormat"
-			value      	(value Text 
-|// $package
-|#include "$file"
-|
-			))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludePrecompiledHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeOrder"
-			value      	"AMIR")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyle"
-			value      	("InliningStyleSet" 207))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"InClassDeclaration"
-				value      	208)
-			    (object Attribute
-				tool       	"cg"
-				name       	"FollowingClassDeclaration"
-				value      	207)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"TypesDefined"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeClosure"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CmIdentification"
-			value      	(value Text "  %X%  @(#) plugins/com.ibm.etools.ctc.binding.http/src/rose/httpbindingMdl.mdl, ctc, ibmctc"))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExtensionlessFileName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeFormat"
-			value      	(value Text 
-|// $package
-|#include "$file"
-|
-			))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludePrecompiledHeader"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeOrder"
-			value      	"AMIR")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyle"
-			value      	("InliningStyleSet" 207))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"InClassDeclaration"
-				value      	208)
-			    (object Attribute
-				tool       	"cg"
-				name       	"FollowingClassDeclaration"
-				value      	207)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"TypesDefined"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeClosure"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationKind"
-			value      	("OperationKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationIsConst"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationIsExplicit"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Inline"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"EntryCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ExitCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"BodyAnnotations"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationIsOneWay"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Context"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"Raises"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"Ordered"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"NameIfUnlabeled"
-			value      	"the_$supplier")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtRelationshipVisibility"
-				value      	210)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberFieldSize"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InitialValue"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetName"
-			value      	"get_$relationship")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetName"
-			value      	"set_$relationship")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKindsSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SelectorName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SelectorType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConstSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_Function"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetByReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ForwardReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedHasRelType"
-			value      	("HasRelTypeSet" 47))
-		    (object Attribute
-			tool       	"cg"
-			name       	"HasRelTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Association"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"NameIfUnlabeled"
-			value      	"the_$targetClass")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Inherit"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"InstanceArguments"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ForwardReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"NameIfUnlabeled"
-			value      	"the_$targetClass")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberName"
-			value      	"$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtRelationshipVisibility"
-				value      	210)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberFieldSize"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InitialValue"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerGet"
-			value      	"$data.get($keys)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerSet"
-			value      	"$data.set($keys,$value)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedContainer"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassContainer"
-			value      	"$supplier *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassInitialValue"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKindsSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetByReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetName"
-			value      	"get_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConstSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_Function"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetName"
-			value      	"set_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetSetByReference"
-			value      	("QualifiedGetSetByReferenceSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetSetByReferenceSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_GetSetByReference"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateQualifiedGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetName"
-			value      	"get_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineQualifiedGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateQualifiedSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedSetName"
-			value      	"set_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedSetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineQualifiedSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssocClassDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberName"
-			value      	"$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtRelationshipVisibility"
-				value      	210)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssocClassGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetName"
-			value      	"get_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineAssocClassGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssocClassSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassSetName"
-			value      	"set_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassSetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineAssocClassSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassForwardReferenceOnly"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedRoleType"
-			value      	("AssocTypeSet" 47))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberName"
-			value      	"$attribute")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtAttributeVisibility"
-				value      	211)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberFieldSize"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetName"
-			value      	"get_$attribute")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetName"
-			value      	"set_$attribute")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKindsSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConstSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_Function"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetByReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"IsReadOnly"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Uses"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"ForwardReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"BodyReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateForwardReference"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Subsystem"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DirectoryIsOnSearchList"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"PrecompiledHeader"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"IsNamespace"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Indent"
-			value      	2)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Version"
-			value      	"5.0")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCClassTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCClassTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Interface_Part"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Connection_Part"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Class_Factory"
-				value      	3)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CObjectFunctionality"
-			value      	("CObjectFunctionalitySet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CObjectFunctionalitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dynamic"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dyncreate"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Serial"
-				value      	3)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateOverrideGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateDataGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DATA_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateFieldGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_FIELD_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateMessageGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateMessageMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_MSG_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MESSAGE_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEFactory"
-			value      	("OLEFactorySet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEFactorySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Built_in"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Simple"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Licensed"
-				value      	3)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEName"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEClassID"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateOLECtlType"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLECtlType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateOLETypeLib"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLETypeLibID"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLETypeLibMajor"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLETypeLibMinor"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GeneratePropPageIDs"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEPropPageIDs"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateDispatchMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockProperties"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockFunctions"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DispatchDefValue"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateDispIdEnum"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISP_ID_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateInterfaceMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"INTERFACE_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"InitInterface"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateEventMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENT_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockEvents"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateEventSinkMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENTSINK_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PropNotifySinks"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateConnectionMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CONNECTION_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"ConnectionPointIID"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"InheritanceType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLECommands"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MFCDeclares"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MFCImplements"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"ATL_Declares"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateCOMMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"COM_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateConnectionPointMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CONNECTION_POINT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateMsgMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSG_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GeneratePropertyMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PROPERTY_MAP_Entries"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCOperationTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCOperationTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Virtual_Override"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Message_Handler"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dispatch_Handler"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Event_Firing_Function"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Event_Sink_Handler"
-				value      	5)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Std_OLE_Method"
-				value      	6)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Command_Parser"
-				value      	7)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Property_Get_Function"
-				value      	8)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Property_Set_Function"
-				value      	9)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Property_Notify_Function"
-				value      	10)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Macro_Generated_Function"
-				value      	11)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_MSG_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MESSAGE_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"BodyImage"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCAttributeTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCAttributeTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Member_Property"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Get_Set_Property"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dialog_Data"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Field_Data"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Stock_Property"
-				value      	5)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PointerBase"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockPropertyImplementation"
-			value      	"")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCAttributeTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCAttributeTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Member_Property"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Get_Set_Property"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dialog_Data"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Field_Data"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Stock_Property"
-				value      	5)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PointerBase"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockPropertyImplementation"
-			value      	"")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCAttributeTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCAttributeTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Member_Property"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Get_Set_Property"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dialog_Data"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Field_Data"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Stock_Property"
-				value      	5)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PointerBase"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockPropertyImplementation"
-			value      	"")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateIncludesGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_INCLUDES_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateInsertLocation"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateIncludesGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_INCLUDES_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateInsertLocation"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"SCC"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"TypeLibImporter"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"propertyId"
-		value      	"783606378")
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"CreatableSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Private"
-				value      	221)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"PublicNotCreatable"
-				value      	213)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"SingleUse"
-				value      	214)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"GlobalSingleUse"
-				value      	215)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"MultiUse"
-				value      	219)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"GlobalMultiUse"
-				value      	220)))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionBase"
-			value      	"0")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionExplicit"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionCompare"
-			value      	("CompareSet" 202))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Creatable"
-			value      	("CreatableSet" 221))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateInitialization"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateTermination"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"CollectionClass"
-			value      	"Collection")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"CompareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"None"
-				value      	202)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Binary"
-				value      	203)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Text"
-				value      	204)))))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OperationName"
-			value      	"$operation")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"LibraryName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"AliasName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"IsStatic"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"EntryCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ExitCode"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"IsConst"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"New"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"WithEvents"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Subscript"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"NameIfUnlabeled"
-			value      	"the$supplier")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateGetOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateSetOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateLetOperation"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"New"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"WithEvents"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Subscript"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"NameIfUnlabeled"
-			value      	"the$supplier")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateGetOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateSetOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateLetOperation"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Inherit"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ImplementsDelegation"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ProjectFile"
-			value      	"")))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"VisualStudio"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Editor"
-			value      	("EditorType" 100))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"IncludePath"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"StopOnError"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"EditorType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"BuiltIn"
-				value      	100)
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"WindowsShell"
-				value      	101)))))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ArrayDimensions"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ConstValue"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ImplementationType"
-			value      	"")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CmIdentification"
-			value      	(value Text "  %X% %Q% %Z% %W%"))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CmIdentification"
-			value      	(value Text "  %X% %Q% %Z% %W%"))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Context"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"OperationIsOneWay"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ArrayDimensions"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Order"
-			value      	"")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ArrayDimensions"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Order"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"BoundedRoleType"
-			value      	("AssocTypeSet" 47))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"AssocTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Uses"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"GenerateForwardReference"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Java"
-		name       	"Default_Servlet__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletName"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContextRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsSingleThread"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIsSecure"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcher"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcherPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherInclude"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherForward"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletgetInfo"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Private"
-				value      	64)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"Http_Servlet__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttribute"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttributesNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestAttributes"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestParameters"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeader"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeaderNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForHeaders"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIntHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletDateHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletCookie"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForCookie"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContentType"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateHTML"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Private"
-				value      	64)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"Default_EJB__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate_XML_DD"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCmpField"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBEnvironmentProperties"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCnxFactory"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReferences"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBNameInJAR"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType"
-			value      	("EJBSessionType_Set" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateless"
-				value      	201)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateful"
-				value      	202)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType"
-			value      	("EJBTransactionType_Set" 211))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	211)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	212)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType"
-			value      	("EJBPersistenceType_Set" 220))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	220)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	221)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	222)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReentrant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"BMP_Extend_CMP"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Private"
-				value      	64)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"R2Editor"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Rose Model Integrator"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Rose Web Publisher"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Version Control"
-		name       	"HiddenTool"
-		value      	FALSE))
-	quid       	"3ABFD9A70154"))
diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPAddress.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPAddress.java
deleted file mode 100644
index e5ab58873..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPAddress.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.http;
-
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Address</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.http.HTTPAddress#getLocationURI <em>Location URI</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.wsdl.binding.http.HTTPPackage#getHTTPAddress()
- * @model 
- * @generated
- */
-public interface HTTPAddress extends ExtensibilityElement, javax.wsdl.extensions.http.HTTPAddress {
-	/**
-	 * Returns the value of the '<em><b>Location URI</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Location URI</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Location URI</em>' attribute.
-	 * @see #setLocationURI(String)
-	 * @see org.eclipse.wst.wsdl.binding.http.HTTPPackage#getHTTPAddress_LocationURI()
-	 * @model 
-	 * @generated
-	 */
-	String getLocationURI();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.wsdl.binding.http.HTTPAddress#getLocationURI <em>Location URI</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Location URI</em>' attribute.
-	 * @see #getLocationURI()
-	 * @generated
-	 */
-	void setLocationURI(String value);
-
-} // HTTPAddress
diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPBinding.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPBinding.java
deleted file mode 100644
index 573254c0a..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPBinding.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.http;
-
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Binding</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.http.HTTPBinding#getVerb <em>Verb</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.wsdl.binding.http.HTTPPackage#getHTTPBinding()
- * @model 
- * @generated
- */
-public interface HTTPBinding extends ExtensibilityElement, javax.wsdl.extensions.http.HTTPBinding {
-	/**
-	 * Returns the value of the '<em><b>Verb</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Verb</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Verb</em>' attribute.
-	 * @see #setVerb(String)
-	 * @see org.eclipse.wst.wsdl.binding.http.HTTPPackage#getHTTPBinding_Verb()
-	 * @model 
-	 * @generated
-	 */
-	String getVerb();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.wsdl.binding.http.HTTPBinding#getVerb <em>Verb</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Verb</em>' attribute.
-	 * @see #getVerb()
-	 * @generated
-	 */
-	void setVerb(String value);
-
-} // HTTPBinding
diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPFactory.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPFactory.java
deleted file mode 100644
index bd582b172..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPFactory.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.http;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.wst.wsdl.binding.http.HTTPPackage
- * @generated
- */
-public interface HTTPFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	HTTPFactory eINSTANCE = new org.eclipse.wst.wsdl.binding.http.internal.impl.HTTPFactoryImpl();
-
-	/**
-	 * Returns a new object of class '<em>Binding</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Binding</em>'.
-	 * @generated
-	 */
-	HTTPBinding createHTTPBinding();
-
-	/**
-	 * Returns a new object of class '<em>Operation</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Operation</em>'.
-	 * @generated
-	 */
-	HTTPOperation createHTTPOperation();
-
-	/**
-	 * Returns a new object of class '<em>Url Replacement</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Url Replacement</em>'.
-	 * @generated
-	 */
-	HTTPUrlReplacement createHTTPUrlReplacement();
-
-	/**
-	 * Returns a new object of class '<em>Url Encoded</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Url Encoded</em>'.
-	 * @generated
-	 */
-	HTTPUrlEncoded createHTTPUrlEncoded();
-
-	/**
-	 * Returns a new object of class '<em>Address</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Address</em>'.
-	 * @generated
-	 */
-	HTTPAddress createHTTPAddress();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	HTTPPackage getHTTPPackage();
-
-} //HTTPFactory
diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPOperation.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPOperation.java
deleted file mode 100644
index 170a9a15b..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPOperation.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.http;
-
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Operation</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.http.HTTPOperation#getLocationURI <em>Location URI</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.wsdl.binding.http.HTTPPackage#getHTTPOperation()
- * @model 
- * @generated
- */
-public interface HTTPOperation extends ExtensibilityElement, javax.wsdl.extensions.http.HTTPOperation {
-	/**
-	 * Returns the value of the '<em><b>Location URI</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Location URI</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Location URI</em>' attribute.
-	 * @see #setLocationURI(String)
-	 * @see org.eclipse.wst.wsdl.binding.http.HTTPPackage#getHTTPOperation_LocationURI()
-	 * @model 
-	 * @generated
-	 */
-	String getLocationURI();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.wsdl.binding.http.HTTPOperation#getLocationURI <em>Location URI</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Location URI</em>' attribute.
-	 * @see #getLocationURI()
-	 * @generated
-	 */
-	void setLocationURI(String value);
-
-} // HTTPOperation
diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPPackage.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPPackage.java
deleted file mode 100644
index 19d659b7b..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPPackage.java
+++ /dev/null
@@ -1,612 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.http;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.wst.wsdl.WSDLPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.wst.wsdl.binding.http.HTTPFactory
- * @generated
- */
-public interface HTTPPackage extends EPackage{
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "http";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://www.ibm.com/wsdl/2003/HTTP";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "http";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	HTTPPackage eINSTANCE = org.eclipse.wst.wsdl.binding.http.internal.impl.HTTPPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.wsdl.binding.http.impl.HTTPBindingImpl <em>Binding</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.wst.wsdl.binding.http.impl.HTTPBindingImpl
-	 * @see org.eclipse.wst.wsdl.binding.http.impl.HTTPPackageImpl#getHTTPBinding()
-	 * @generated
-	 */
-	int HTTP_BINDING = 0;
-
-	/**
-	 * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_BINDING__DOCUMENTATION_ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_BINDING__ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Required</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_BINDING__REQUIRED = WSDLPackage.EXTENSIBILITY_ELEMENT__REQUIRED;
-
-	/**
-	 * The feature id for the '<em><b>Element Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_BINDING__ELEMENT_TYPE = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Verb</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_BINDING__VERB = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the the '<em>Binding</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_BINDING_FEATURE_COUNT = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.wsdl.binding.http.impl.HTTPOperationImpl <em>Operation</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.wst.wsdl.binding.http.impl.HTTPOperationImpl
-	 * @see org.eclipse.wst.wsdl.binding.http.impl.HTTPPackageImpl#getHTTPOperation()
-	 * @generated
-	 */
-	int HTTP_OPERATION = 1;
-
-	/**
-	 * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_OPERATION__DOCUMENTATION_ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_OPERATION__ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Required</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_OPERATION__REQUIRED = WSDLPackage.EXTENSIBILITY_ELEMENT__REQUIRED;
-
-	/**
-	 * The feature id for the '<em><b>Element Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_OPERATION__ELEMENT_TYPE = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Location URI</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_OPERATION__LOCATION_URI = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the the '<em>Operation</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_OPERATION_FEATURE_COUNT = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.wsdl.binding.http.impl.HTTPUrlReplacementImpl <em>Url Replacement</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.wst.wsdl.binding.http.impl.HTTPUrlReplacementImpl
-	 * @see org.eclipse.wst.wsdl.binding.http.impl.HTTPPackageImpl#getHTTPUrlReplacement()
-	 * @generated
-	 */
-	int HTTP_URL_REPLACEMENT = 2;
-
-	/**
-	 * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_URL_REPLACEMENT__DOCUMENTATION_ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_URL_REPLACEMENT__ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Required</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_URL_REPLACEMENT__REQUIRED = WSDLPackage.EXTENSIBILITY_ELEMENT__REQUIRED;
-
-	/**
-	 * The feature id for the '<em><b>Element Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_URL_REPLACEMENT__ELEMENT_TYPE = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT_TYPE;
-
-	/**
-	 * The number of structural features of the the '<em>Url Replacement</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_URL_REPLACEMENT_FEATURE_COUNT = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.wsdl.binding.http.impl.HTTPUrlEncodedImpl <em>Url Encoded</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.wst.wsdl.binding.http.impl.HTTPUrlEncodedImpl
-	 * @see org.eclipse.wst.wsdl.binding.http.impl.HTTPPackageImpl#getHTTPUrlEncoded()
-	 * @generated
-	 */
-	int HTTP_URL_ENCODED = 3;
-
-	/**
-	 * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_URL_ENCODED__DOCUMENTATION_ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_URL_ENCODED__ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Required</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_URL_ENCODED__REQUIRED = WSDLPackage.EXTENSIBILITY_ELEMENT__REQUIRED;
-
-	/**
-	 * The feature id for the '<em><b>Element Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_URL_ENCODED__ELEMENT_TYPE = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT_TYPE;
-
-	/**
-	 * The number of structural features of the the '<em>Url Encoded</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_URL_ENCODED_FEATURE_COUNT = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.wsdl.binding.http.impl.HTTPAddressImpl <em>Address</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.wst.wsdl.binding.http.impl.HTTPAddressImpl
-	 * @see org.eclipse.wst.wsdl.binding.http.impl.HTTPPackageImpl#getHTTPAddress()
-	 * @generated
-	 */
-	int HTTP_ADDRESS = 4;
-
-	/**
-	 * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_ADDRESS__DOCUMENTATION_ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_ADDRESS__ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Required</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_ADDRESS__REQUIRED = WSDLPackage.EXTENSIBILITY_ELEMENT__REQUIRED;
-
-	/**
-	 * The feature id for the '<em><b>Element Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_ADDRESS__ELEMENT_TYPE = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Location URI</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_ADDRESS__LOCATION_URI = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the the '<em>Address</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_ADDRESS_FEATURE_COUNT = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 1;
-
-
-	/**
-	 * The meta object id for the '{@link javax.wsdl.extensions.http.HTTPAddress <em>IHTTP Address</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see javax.wsdl.extensions.http.HTTPAddress
-	 * @see org.eclipse.wst.wsdl.binding.http.impl.HTTPPackageImpl#getIHTTPAddress()
-	 * @generated
-	 */
-	int IHTTP_ADDRESS = 5;
-
-	/**
-	 * The number of structural features of the the '<em>IHTTP Address</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IHTTP_ADDRESS_FEATURE_COUNT = 0;
-
-
-	/**
-	 * The meta object id for the '{@link javax.wsdl.extensions.http.HTTPBinding <em>IHTTP Binding</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see javax.wsdl.extensions.http.HTTPBinding
-	 * @see org.eclipse.wst.wsdl.binding.http.impl.HTTPPackageImpl#getIHTTPBinding()
-	 * @generated
-	 */
-	int IHTTP_BINDING = 6;
-
-	/**
-	 * The number of structural features of the the '<em>IHTTP Binding</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IHTTP_BINDING_FEATURE_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link javax.wsdl.extensions.http.HTTPOperation <em>IHTTP Operation</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see javax.wsdl.extensions.http.HTTPOperation
-	 * @see org.eclipse.wst.wsdl.binding.http.impl.HTTPPackageImpl#getIHTTPOperation()
-	 * @generated
-	 */
-	int IHTTP_OPERATION = 7;
-
-	/**
-	 * The number of structural features of the the '<em>IHTTP Operation</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IHTTP_OPERATION_FEATURE_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link javax.wsdl.extensions.http.HTTPUrlEncoded <em>IHTTP Url Encoded</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see javax.wsdl.extensions.http.HTTPUrlEncoded
-	 * @see org.eclipse.wst.wsdl.binding.http.impl.HTTPPackageImpl#getIHTTPUrlEncoded()
-	 * @generated
-	 */
-	int IHTTP_URL_ENCODED = 8;
-
-	/**
-	 * The number of structural features of the the '<em>IHTTP Url Encoded</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IHTTP_URL_ENCODED_FEATURE_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link javax.wsdl.extensions.http.HTTPUrlReplacement <em>IHTTP Url Replacement</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see javax.wsdl.extensions.http.HTTPUrlReplacement
-	 * @see org.eclipse.wst.wsdl.binding.http.impl.HTTPPackageImpl#getIHTTPUrlReplacement()
-	 * @generated
-	 */
-	int IHTTP_URL_REPLACEMENT = 9;
-
-	/**
-	 * The number of structural features of the the '<em>IHTTP Url Replacement</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IHTTP_URL_REPLACEMENT_FEATURE_COUNT = 0;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.wsdl.binding.http.HTTPBinding <em>Binding</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Binding</em>'.
-	 * @see org.eclipse.wst.wsdl.binding.http.HTTPBinding
-	 * @generated
-	 */
-	EClass getHTTPBinding();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.binding.http.HTTPBinding#getVerb <em>Verb</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Verb</em>'.
-	 * @see org.eclipse.wst.wsdl.binding.http.HTTPBinding#getVerb()
-	 * @see #getHTTPBinding()
-	 * @generated
-	 */
-	EAttribute getHTTPBinding_Verb();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.wsdl.binding.http.HTTPOperation <em>Operation</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Operation</em>'.
-	 * @see org.eclipse.wst.wsdl.binding.http.HTTPOperation
-	 * @generated
-	 */
-	EClass getHTTPOperation();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.binding.http.HTTPOperation#getLocationURI <em>Location URI</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Location URI</em>'.
-	 * @see org.eclipse.wst.wsdl.binding.http.HTTPOperation#getLocationURI()
-	 * @see #getHTTPOperation()
-	 * @generated
-	 */
-	EAttribute getHTTPOperation_LocationURI();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.wsdl.binding.http.HTTPUrlReplacement <em>Url Replacement</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Url Replacement</em>'.
-	 * @see org.eclipse.wst.wsdl.binding.http.HTTPUrlReplacement
-	 * @generated
-	 */
-	EClass getHTTPUrlReplacement();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.wsdl.binding.http.HTTPUrlEncoded <em>Url Encoded</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Url Encoded</em>'.
-	 * @see org.eclipse.wst.wsdl.binding.http.HTTPUrlEncoded
-	 * @generated
-	 */
-	EClass getHTTPUrlEncoded();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.wsdl.binding.http.HTTPAddress <em>Address</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Address</em>'.
-	 * @see org.eclipse.wst.wsdl.binding.http.HTTPAddress
-	 * @generated
-	 */
-	EClass getHTTPAddress();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.binding.http.HTTPAddress#getLocationURI <em>Location URI</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Location URI</em>'.
-	 * @see org.eclipse.wst.wsdl.binding.http.HTTPAddress#getLocationURI()
-	 * @see #getHTTPAddress()
-	 * @generated
-	 */
-	EAttribute getHTTPAddress_LocationURI();
-
-	/**
-	 * Returns the meta object for class '{@link javax.wsdl.extensions.http.HTTPAddress <em>IHTTP Address</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>IHTTP Address</em>'.
-	 * @see javax.wsdl.extensions.http.HTTPAddress
-	 * @model instanceClass="javax.wsdl.extensions.http.HTTPAddress" 
-	 * @generated
-	 */
-	EClass getIHTTPAddress();
-
-	/**
-	 * Returns the meta object for class '{@link javax.wsdl.extensions.http.HTTPBinding <em>IHTTP Binding</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>IHTTP Binding</em>'.
-	 * @see javax.wsdl.extensions.http.HTTPBinding
-	 * @model instanceClass="javax.wsdl.extensions.http.HTTPBinding" 
-	 * @generated
-	 */
-	EClass getIHTTPBinding();
-
-	/**
-	 * Returns the meta object for class '{@link javax.wsdl.extensions.http.HTTPOperation <em>IHTTP Operation</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>IHTTP Operation</em>'.
-	 * @see javax.wsdl.extensions.http.HTTPOperation
-	 * @model instanceClass="javax.wsdl.extensions.http.HTTPOperation" 
-	 * @generated
-	 */
-	EClass getIHTTPOperation();
-
-	/**
-	 * Returns the meta object for class '{@link javax.wsdl.extensions.http.HTTPUrlEncoded <em>IHTTP Url Encoded</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>IHTTP Url Encoded</em>'.
-	 * @see javax.wsdl.extensions.http.HTTPUrlEncoded
-	 * @model instanceClass="javax.wsdl.extensions.http.HTTPUrlEncoded" 
-	 * @generated
-	 */
-	EClass getIHTTPUrlEncoded();
-
-	/**
-	 * Returns the meta object for class '{@link javax.wsdl.extensions.http.HTTPUrlReplacement <em>IHTTP Url Replacement</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>IHTTP Url Replacement</em>'.
-	 * @see javax.wsdl.extensions.http.HTTPUrlReplacement
-	 * @model instanceClass="javax.wsdl.extensions.http.HTTPUrlReplacement" 
-	 * @generated
-	 */
-	EClass getIHTTPUrlReplacement();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	HTTPFactory getHTTPFactory();
-
-} //HTTPPackage
diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPUrlEncoded.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPUrlEncoded.java
deleted file mode 100644
index d06c0085b..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPUrlEncoded.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.http;
-
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Url Encoded</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.wst.wsdl.binding.http.HTTPPackage#getHTTPUrlEncoded()
- * @model 
- * @generated
- */
-public interface HTTPUrlEncoded extends ExtensibilityElement, javax.wsdl.extensions.http.HTTPUrlEncoded {
-} // HTTPUrlEncoded
diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPUrlReplacement.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPUrlReplacement.java
deleted file mode 100644
index 00d1dde49..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPUrlReplacement.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.http;
-
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Url Replacement</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.wst.wsdl.binding.http.HTTPPackage#getHTTPUrlReplacement()
- * @model 
- * @generated
- */
-public interface HTTPUrlReplacement extends ExtensibilityElement, javax.wsdl.extensions.http.HTTPUrlReplacement {
-} // HTTPUrlReplacement
diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/generator/HTTPContentGenerator.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/generator/HTTPContentGenerator.java
deleted file mode 100644
index eb8e5102b..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/generator/HTTPContentGenerator.java
+++ /dev/null
@@ -1,277 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.http.internal.generator;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.binding.http.HTTPAddress;
-import org.eclipse.wst.wsdl.binding.http.HTTPBinding;
-import org.eclipse.wst.wsdl.binding.http.HTTPFactory;
-import org.eclipse.wst.wsdl.binding.http.HTTPOperation;
-import org.eclipse.wst.wsdl.binding.http.HTTPUrlEncoded;
-import org.eclipse.wst.wsdl.internal.generator.ContentGenerator;
-import org.w3c.dom.Element;
-
-public class HTTPContentGenerator implements ContentGenerator
-{
-  public static final int VERB_POST = 0;
-  public static final int VERB_GET = 1;
-  public static final int VERB_NOT_SET = -1;
-
-  private int verbOption = VERB_NOT_SET;
-  protected String addressLocation = ContentGenerator.ADDRESS_LOCATION;
-
-  protected final static String[] requiredNamespaces = { "http://schemas.xmlsoap.org/wsdl/mime/", "http://schemas.xmlsoap.org/wsdl/http/" };
-
-  public void setVerb(int verb) {
-	  verbOption = verb;
-  }
-  
-  public void setAddressLocation(String addressLocation) {
-	  this.addressLocation = addressLocation;
-  }
-  
-  public String[] getRequiredNamespaces()
-  {
-    return requiredNamespaces;
-  }
-
-  public String getPreferredNamespacePrefix(String namespace)
-  {
-	  if (namespace.equals("http://schemas.xmlsoap.org/wsdl/mime/")) {
-		  return "mime";
-	  }
-	  else if (namespace.equals("http://schemas.xmlsoap.org/wsdl/http/")) {
-		  return "http";
-	  }
-
-	  return "";
-  }
-
-  public void generatePortContent(Port port)
-  {
-	  // We blow away any existing ExtensibilityElements/content before we generate it
-	  // Is it worth being smarter?  Look for matching content first and create those which aren't found????
-	  List removeList = new ArrayList(port.getEExtensibilityElements());
-	  removeExtensebilityElements(port.getEExtensibilityElements(), removeList);
-
-	  HTTPAddress httpAddress= HTTPFactory.eINSTANCE.createHTTPAddress();
-	  httpAddress.setLocationURI(addressLocation);
-	  port.addExtensibilityElement(httpAddress);
-  }
-
-  public void generateBindingContent(Binding binding, PortType portType)
-  {
-	  // We blow away any existing ExtensibilityElements/content before we generate it
-	  // Is it worth being smarter?  Look for matching content first and create those which aren't found????
-	  List removeList = new ArrayList(binding.getEExtensibilityElements());
-	  removeExtensebilityElements(binding.getEExtensibilityElements(), removeList);
-	
-	  HTTPBinding httpBinding = HTTPFactory.eINSTANCE.createHTTPBinding();
-	  httpBinding.setVerb(getVerbOption(binding) == VERB_POST ? "POST" : "GET");
-
-	  binding.addExtensibilityElement(httpBinding);
-  }
-
-  public void generateBindingOperationContent(BindingOperation bindingOperation, Operation operation)
-  {
-	  // We blow away any existing ExtensibilityElements/content before we generate it
-	  // Is it worth being smarter?  Look for matching content first and create those which aren't found????
-	  List removeList = new ArrayList(bindingOperation.getEExtensibilityElements());
-	  removeExtensebilityElements(bindingOperation.getEExtensibilityElements(), removeList);
-	
-	  HTTPOperation httpOperation = HTTPFactory.eINSTANCE.createHTTPOperation();
-	  httpOperation.setLocationURI("/" + operation.getName());
-	  bindingOperation.addExtensibilityElement(httpOperation);
-  }
-
-  public void generateBindingInputContent(BindingInput bindingInput, Input input)
-  {
-	  // We blow away any existing ExtensibilityElements/content before we generate it
-	  // Is it worth being smarter?  Look for matching content first and create those which aren't found????
-	  List removeList = new ArrayList(bindingInput.getEExtensibilityElements());
-	  
-	  // hack: we're being sneaky here. Set the 'verb' options now.
-	  int option = getVerbOption(bindingInput);
-	  removeExtensebilityElements(bindingInput.getEExtensibilityElements(), removeList);
-	  
-	  if (option == VERB_POST)
-	  {
-		  // TODO: Is there an equivalent HTTP Model Object for this?....
-		  Element element = createElement(bindingInput.getElement(), "mime", "content");
-		  element.setAttribute("type", "application/x-www-form-urlencoded");
-	  }
-	  else
-	  {
-		  HTTPUrlEncoded urlEncoded= HTTPFactory.eINSTANCE.createHTTPUrlEncoded();
-		  bindingInput.addExtensibilityElement(urlEncoded);
-	  }
-  }
-
-  public void generateBindingOutputContent(BindingOutput bindingOutput, Output output)
-  {
-	  // We blow away any existing ExtensibilityElements/content before we generate it
-	  // Is it worth being smarter?  Look for matching content first and create those which aren't found????
-	  List removeList = new ArrayList(bindingOutput.getEExtensibilityElements());
-
-	  // hack: we're being sneaky here. Set the 'verb' options now.
-	  getVerbOption(bindingOutput);
-	  removeExtensebilityElements(bindingOutput.getEExtensibilityElements(), removeList);
-
-	  // TODO: Is there an equivalent HTTP Model Object for this?....
-	  Element bindingOutputElement = bindingOutput.getElement();
-	  Element element = createElement(bindingOutputElement, "mime", "content");
-	  element.setAttribute("type", "text/xml");
-  }
-
-  public void generateBindingFaultContent(BindingFault bindingFault, Fault fault)
-  {
-    //TODO!!
-  }
-
-  protected Element createElement(Element parentElement, String prefix, String elementName)
-  {
-    String name = prefix != null ? (prefix + ":" + elementName) : elementName;
-    Element result = parentElement.getOwnerDocument().createElement(name);
-	parentElement.insertBefore(result, parentElement.getFirstChild());
-//    parentElement.appendChild(result);
-    return result;
-  }
-  
-  /////////////////////  
-  private int getVerbOption(Object genericBindingObject) {
-	  if (verbOption == VERB_NOT_SET && genericBindingObject != null) {
-		  // init() was never called, try to determine the 'verb' based on what we have/know
-		  Binding binding = getBindingObject(genericBindingObject);
-		  
-		  // Try to determine the verb from the Binding Object
-		  if (binding != null) {
-			  List list = binding.getEExtensibilityElements();
-			  Iterator valuesIt = getExtensibilityElementAttributeValue(list, "verb").iterator();
-
-			  while (valuesIt.hasNext()) {
-				  String verb = (String) valuesIt.next();
-				  
-				  if (verb.equals("POST")) {
-					  verbOption = VERB_POST;
-				  }
-				  else if (verb.equals("GET")) {
-					  verbOption = VERB_GET;
-				  }
-				  
-				  if (verbOption != VERB_NOT_SET) {
-					  break;
-				  }
-			  }
-		  }
-	  }
-	  
-	  if (verbOption == VERB_NOT_SET) {
-		  verbOption = VERB_GET;
-	  }
-	  
-	  return verbOption;
-  }
-  
-  private List getExtensibilityElementAttributeValue(List eeList, String attributeKey) {
-	  List values = new ArrayList();
-	  Iterator eeElementsIt = eeList.iterator();
-	  
-	  while (eeElementsIt.hasNext()) {
-		  ExtensibilityElement eeElement = (ExtensibilityElement) eeElementsIt.next();
-		  String attributeValue = eeElement.getElement().getAttribute(attributeKey);
-		  if (attributeValue != null && !attributeValue.equals("")) {
-			  values.add(attributeValue);
-		  }		  
-	  }
-	  
-	  return values;
-  }
-  
-  private Binding getBindingObject(Object genericBindingObject) {
-	  Object parent = genericBindingObject;
-	  
-	  int index = 0;
-	  while (parent != null && index < 5) {
-		  parent = getGenericBindingObjectParent(parent);
-		  if (parent instanceof Binding) {
-			  break;
-		  }
-		  index++;
-	  }
-
-	  return (parent instanceof Binding)? (Binding) parent : null;
-  }
-  
-  private List getMessageReferenceBindingObjects(Object genericBindingObject) {
-	  List list = new ArrayList();
-	  Binding binding = getBindingObject(genericBindingObject);
-	  
-	  if (binding != null) {
-		  Iterator operationsIt = binding.getEBindingOperations().iterator();
-	  
-		  while (operationsIt.hasNext()) {
-			  BindingOperation op = (BindingOperation) operationsIt.next();
-			  list.add(op.getEBindingInput());
-			  list.add(op.getEBindingOutput());
-			  list.addAll(op.getEBindingFaults());
-		  }	  
-	  }
-	  
-	  return list;
-  }
-  
-  private Object getGenericBindingObjectParent(Object genericBindingObject) {
-	  Object parent = null;
-	  
-	  if (genericBindingObject != null) {
-		  if (genericBindingObject instanceof BindingOperation) {
-			  parent = ((BindingOperation) genericBindingObject).getContainer();
-		  }
-		  else if (genericBindingObject instanceof BindingInput) {
-			  parent = ((BindingInput) genericBindingObject).getContainer();
-		  }
-		  else if (genericBindingObject instanceof BindingOutput) {
-			  parent = ((BindingOutput) genericBindingObject).getContainer();
-		  }
-		  else if (genericBindingObject instanceof BindingFault) {
-			  parent = ((BindingFault) genericBindingObject).getContainer();
-		  }	  
-	  }
-	  
-	  return parent;	  
-  }
-  
-  private void removeExtensebilityElements(List originalList, List removeList) {
-	  Iterator removeIt = removeList.iterator();
-	  while (removeIt.hasNext()) {
-		  originalList.remove(removeIt.next());
-	  }
-  }
-  
-  public String getProtocol() {
-	  return "HTTP";
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPAddressImpl.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPAddressImpl.java
deleted file mode 100644
index 741d45072..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPAddressImpl.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.http.internal.impl;
-
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.wst.wsdl.binding.http.HTTPAddress;
-import org.eclipse.wst.wsdl.binding.http.HTTPPackage;
-import org.eclipse.wst.wsdl.binding.http.internal.util.HTTPConstants;
-import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl;
-import org.w3c.dom.Element;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Address</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.http.impl.HTTPAddressImpl#getLocationURI <em>Location URI</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class HTTPAddressImpl extends ExtensibilityElementImpl implements HTTPAddress {
-	/**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-	 * The default value of the '{@link #getLocationURI() <em>Location URI</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLocationURI()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LOCATION_URI_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLocationURI() <em>Location URI</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLocationURI()
-	 * @generated
-	 * @ordered
-	 */
-	protected String locationURI = LOCATION_URI_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected HTTPAddressImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return HTTPPackage.eINSTANCE.getHTTPAddress();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLocationURI() {
-		return locationURI;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLocationURI(String newLocationURI) {
-		String oldLocationURI = locationURI;
-		locationURI = newLocationURI;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HTTPPackage.HTTP_ADDRESS__LOCATION_URI, oldLocationURI, locationURI));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case HTTPPackage.HTTP_ADDRESS__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case HTTPPackage.HTTP_ADDRESS__ELEMENT:
-				return getElement();
-			case HTTPPackage.HTTP_ADDRESS__REQUIRED:
-				return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-			case HTTPPackage.HTTP_ADDRESS__ELEMENT_TYPE:
-				return getElementType();
-			case HTTPPackage.HTTP_ADDRESS__LOCATION_URI:
-				return getLocationURI();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case HTTPPackage.HTTP_ADDRESS__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case HTTPPackage.HTTP_ADDRESS__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case HTTPPackage.HTTP_ADDRESS__REQUIRED:
-				setRequired(((Boolean)newValue).booleanValue());
-				return;
-			case HTTPPackage.HTTP_ADDRESS__ELEMENT_TYPE:
-				setElementType((QName)newValue);
-				return;
-			case HTTPPackage.HTTP_ADDRESS__LOCATION_URI:
-				setLocationURI((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case HTTPPackage.HTTP_ADDRESS__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case HTTPPackage.HTTP_ADDRESS__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case HTTPPackage.HTTP_ADDRESS__REQUIRED:
-				setRequired(REQUIRED_EDEFAULT);
-				return;
-			case HTTPPackage.HTTP_ADDRESS__ELEMENT_TYPE:
-				setElementType(ELEMENT_TYPE_EDEFAULT);
-				return;
-			case HTTPPackage.HTTP_ADDRESS__LOCATION_URI:
-				setLocationURI(LOCATION_URI_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case HTTPPackage.HTTP_ADDRESS__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case HTTPPackage.HTTP_ADDRESS__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case HTTPPackage.HTTP_ADDRESS__REQUIRED:
-				return required != REQUIRED_EDEFAULT;
-			case HTTPPackage.HTTP_ADDRESS__ELEMENT_TYPE:
-				return ELEMENT_TYPE_EDEFAULT == null ? elementType != null : !ELEMENT_TYPE_EDEFAULT.equals(elementType);
-			case HTTPPackage.HTTP_ADDRESS__LOCATION_URI:
-				return LOCATION_URI_EDEFAULT == null ? locationURI != null : !LOCATION_URI_EDEFAULT.equals(locationURI);
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (locationURI: ");
-		result.append(locationURI);
-		result.append(')');
-		return result.toString();
-	}
-
-  //
-  // Reconcile methods: DOM -> Model
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-  	setLocationURI
-      (HTTPConstants.getAttribute(changedElement, HTTPConstants.LOCATION_URI_ATTRIBUTE));
-    reconcileReferences(false);
-  }
-  
-  //
-  // For reconciliation: Model -> DOM
-  //
-
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeAttribute(eAttribute);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eAttribute == null || eAttribute == HTTPPackage.eINSTANCE.getHTTPAddress_LocationURI())
-        niceSetAttribute(theElement,HTTPConstants.LOCATION_URI_ATTRIBUTE,getLocationURI());
-    }
-  }
-  
-  public QName getElementType()
-  {
-    if (elementType == null)
-      elementType = new QName(HTTPConstants.HTTP_NAMESPACE_URI, HTTPConstants.ADDRESS_ELEMENT_TAG);
-    return elementType;
-  }
-} //HTTPAddressImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPBindingImpl.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPBindingImpl.java
deleted file mode 100644
index beb4bbbcc..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPBindingImpl.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.http.internal.impl;
-
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.wst.wsdl.binding.http.HTTPBinding;
-import org.eclipse.wst.wsdl.binding.http.HTTPPackage;
-import org.eclipse.wst.wsdl.binding.http.internal.util.HTTPConstants;
-import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl;
-import org.w3c.dom.Element;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Binding</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.http.impl.HTTPBindingImpl#getVerb <em>Verb</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class HTTPBindingImpl extends ExtensibilityElementImpl implements HTTPBinding {
-	/**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-	 * The default value of the '{@link #getVerb() <em>Verb</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVerb()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VERB_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getVerb() <em>Verb</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVerb()
-	 * @generated
-	 * @ordered
-	 */
-	protected String verb = VERB_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected HTTPBindingImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return HTTPPackage.eINSTANCE.getHTTPBinding();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getVerb() {
-		return verb;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setVerb(String newVerb) {
-		String oldVerb = verb;
-		verb = newVerb;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HTTPPackage.HTTP_BINDING__VERB, oldVerb, verb));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case HTTPPackage.HTTP_BINDING__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case HTTPPackage.HTTP_BINDING__ELEMENT:
-				return getElement();
-			case HTTPPackage.HTTP_BINDING__REQUIRED:
-				return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-			case HTTPPackage.HTTP_BINDING__ELEMENT_TYPE:
-				return getElementType();
-			case HTTPPackage.HTTP_BINDING__VERB:
-				return getVerb();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case HTTPPackage.HTTP_BINDING__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case HTTPPackage.HTTP_BINDING__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case HTTPPackage.HTTP_BINDING__REQUIRED:
-				setRequired(((Boolean)newValue).booleanValue());
-				return;
-			case HTTPPackage.HTTP_BINDING__ELEMENT_TYPE:
-				setElementType((QName)newValue);
-				return;
-			case HTTPPackage.HTTP_BINDING__VERB:
-				setVerb((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case HTTPPackage.HTTP_BINDING__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case HTTPPackage.HTTP_BINDING__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case HTTPPackage.HTTP_BINDING__REQUIRED:
-				setRequired(REQUIRED_EDEFAULT);
-				return;
-			case HTTPPackage.HTTP_BINDING__ELEMENT_TYPE:
-				setElementType(ELEMENT_TYPE_EDEFAULT);
-				return;
-			case HTTPPackage.HTTP_BINDING__VERB:
-				setVerb(VERB_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case HTTPPackage.HTTP_BINDING__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case HTTPPackage.HTTP_BINDING__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case HTTPPackage.HTTP_BINDING__REQUIRED:
-				return required != REQUIRED_EDEFAULT;
-			case HTTPPackage.HTTP_BINDING__ELEMENT_TYPE:
-				return ELEMENT_TYPE_EDEFAULT == null ? elementType != null : !ELEMENT_TYPE_EDEFAULT.equals(elementType);
-			case HTTPPackage.HTTP_BINDING__VERB:
-				return VERB_EDEFAULT == null ? verb != null : !VERB_EDEFAULT.equals(verb);
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (verb: ");
-		result.append(verb);
-		result.append(')');
-		return result.toString();
-	}
-
-  //
-  // Reconcile methods: DOM -> Model
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-  	setVerb
-      (HTTPConstants.getAttribute(changedElement, HTTPConstants.VERB_ATTRIBUTE));
-    reconcileReferences(false);
-  }
-  
-  //
-  // For reconciliation: Model -> DOM
-  //
-
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeAttribute(eAttribute);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eAttribute == null || eAttribute == HTTPPackage.eINSTANCE.getHTTPBinding_Verb())
-        niceSetAttribute(theElement,HTTPConstants.VERB_ATTRIBUTE,getVerb());
-    }
-  }
-
-  public QName getElementType()
-  {
-    if (elementType == null)
-      elementType = new QName(HTTPConstants.HTTP_NAMESPACE_URI, HTTPConstants.BINDING_ELEMENT_TAG);
-    return elementType;
-  }
-  
-} //HTTPBindingImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPFactoryImpl.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPFactoryImpl.java
deleted file mode 100644
index 9c1e97e9d..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPFactoryImpl.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.http.internal.impl;
-
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.wst.wsdl.binding.http.HTTPAddress;
-import org.eclipse.wst.wsdl.binding.http.HTTPBinding;
-import org.eclipse.wst.wsdl.binding.http.HTTPFactory;
-import org.eclipse.wst.wsdl.binding.http.HTTPOperation;
-import org.eclipse.wst.wsdl.binding.http.HTTPPackage;
-import org.eclipse.wst.wsdl.binding.http.HTTPUrlEncoded;
-import org.eclipse.wst.wsdl.binding.http.HTTPUrlReplacement;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class HTTPFactoryImpl extends EFactoryImpl implements HTTPFactory {
-	/**
-	 * Creates and instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public HTTPFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case HTTPPackage.HTTP_BINDING: return createHTTPBinding();
-			case HTTPPackage.HTTP_OPERATION: return createHTTPOperation();
-			case HTTPPackage.HTTP_URL_REPLACEMENT: return createHTTPUrlReplacement();
-			case HTTPPackage.HTTP_URL_ENCODED: return createHTTPUrlEncoded();
-			case HTTPPackage.HTTP_ADDRESS: return createHTTPAddress();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public HTTPBinding createHTTPBinding() {
-		HTTPBindingImpl httpBinding = new HTTPBindingImpl();
-		return httpBinding;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public HTTPOperation createHTTPOperation() {
-		HTTPOperationImpl httpOperation = new HTTPOperationImpl();
-		return httpOperation;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public HTTPUrlReplacement createHTTPUrlReplacement() {
-		HTTPUrlReplacementImpl httpUrlReplacement = new HTTPUrlReplacementImpl();
-		return httpUrlReplacement;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public HTTPUrlEncoded createHTTPUrlEncoded() {
-		HTTPUrlEncodedImpl httpUrlEncoded = new HTTPUrlEncodedImpl();
-		return httpUrlEncoded;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public HTTPAddress createHTTPAddress() {
-		HTTPAddressImpl httpAddress = new HTTPAddressImpl();
-		return httpAddress;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public HTTPPackage getHTTPPackage() {
-		return (HTTPPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	public static HTTPPackage getPackage() {
-		return HTTPPackage.eINSTANCE;
-	}
-} //HTTPFactoryImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPOperationImpl.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPOperationImpl.java
deleted file mode 100644
index d266baa69..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPOperationImpl.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.http.internal.impl;
-
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.wst.wsdl.binding.http.HTTPOperation;
-import org.eclipse.wst.wsdl.binding.http.HTTPPackage;
-import org.eclipse.wst.wsdl.binding.http.internal.util.HTTPConstants;
-import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl;
-import org.w3c.dom.Element;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Operation</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.http.impl.HTTPOperationImpl#getLocationURI <em>Location URI</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class HTTPOperationImpl extends ExtensibilityElementImpl implements HTTPOperation {
-	/**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-	 * The default value of the '{@link #getLocationURI() <em>Location URI</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLocationURI()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LOCATION_URI_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLocationURI() <em>Location URI</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLocationURI()
-	 * @generated
-	 * @ordered
-	 */
-	protected String locationURI = LOCATION_URI_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected HTTPOperationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return HTTPPackage.eINSTANCE.getHTTPOperation();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLocationURI() {
-		return locationURI;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLocationURI(String newLocationURI) {
-		String oldLocationURI = locationURI;
-		locationURI = newLocationURI;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HTTPPackage.HTTP_OPERATION__LOCATION_URI, oldLocationURI, locationURI));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case HTTPPackage.HTTP_OPERATION__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case HTTPPackage.HTTP_OPERATION__ELEMENT:
-				return getElement();
-			case HTTPPackage.HTTP_OPERATION__REQUIRED:
-				return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-			case HTTPPackage.HTTP_OPERATION__ELEMENT_TYPE:
-				return getElementType();
-			case HTTPPackage.HTTP_OPERATION__LOCATION_URI:
-				return getLocationURI();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case HTTPPackage.HTTP_OPERATION__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case HTTPPackage.HTTP_OPERATION__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case HTTPPackage.HTTP_OPERATION__REQUIRED:
-				setRequired(((Boolean)newValue).booleanValue());
-				return;
-			case HTTPPackage.HTTP_OPERATION__ELEMENT_TYPE:
-				setElementType((QName)newValue);
-				return;
-			case HTTPPackage.HTTP_OPERATION__LOCATION_URI:
-				setLocationURI((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case HTTPPackage.HTTP_OPERATION__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case HTTPPackage.HTTP_OPERATION__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case HTTPPackage.HTTP_OPERATION__REQUIRED:
-				setRequired(REQUIRED_EDEFAULT);
-				return;
-			case HTTPPackage.HTTP_OPERATION__ELEMENT_TYPE:
-				setElementType(ELEMENT_TYPE_EDEFAULT);
-				return;
-			case HTTPPackage.HTTP_OPERATION__LOCATION_URI:
-				setLocationURI(LOCATION_URI_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case HTTPPackage.HTTP_OPERATION__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case HTTPPackage.HTTP_OPERATION__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case HTTPPackage.HTTP_OPERATION__REQUIRED:
-				return required != REQUIRED_EDEFAULT;
-			case HTTPPackage.HTTP_OPERATION__ELEMENT_TYPE:
-				return ELEMENT_TYPE_EDEFAULT == null ? elementType != null : !ELEMENT_TYPE_EDEFAULT.equals(elementType);
-			case HTTPPackage.HTTP_OPERATION__LOCATION_URI:
-				return LOCATION_URI_EDEFAULT == null ? locationURI != null : !LOCATION_URI_EDEFAULT.equals(locationURI);
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (locationURI: ");
-		result.append(locationURI);
-		result.append(')');
-		return result.toString();
-	}
-
-  //
-  // Reconcile methods: DOM -> Model
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-  	setLocationURI
-      (HTTPConstants.getAttribute(changedElement, HTTPConstants.LOCATION_URI_ATTRIBUTE));
-    reconcileReferences(false);
-  }
-  
-  //
-  // For reconciliation: Model -> DOM
-  //
-
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeAttribute(eAttribute);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eAttribute == null || eAttribute == HTTPPackage.eINSTANCE.getHTTPOperation_LocationURI())
-        niceSetAttribute(theElement,HTTPConstants.LOCATION_URI_ATTRIBUTE,getLocationURI());
-    }
-  }
-  
-  public QName getElementType()
-  {
-    if (elementType == null)
-      elementType = new QName(HTTPConstants.HTTP_NAMESPACE_URI, HTTPConstants.OPERATION_ELEMENT_TAG);
-    return elementType;
-  }
-  
-} //HTTPOperationImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPPackageImpl.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPPackageImpl.java
deleted file mode 100644
index 4c1adabe5..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPPackageImpl.java
+++ /dev/null
@@ -1,412 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.http.internal.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.binding.http.HTTPAddress;
-import org.eclipse.wst.wsdl.binding.http.HTTPBinding;
-import org.eclipse.wst.wsdl.binding.http.HTTPFactory;
-import org.eclipse.wst.wsdl.binding.http.HTTPOperation;
-import org.eclipse.wst.wsdl.binding.http.HTTPPackage;
-import org.eclipse.wst.wsdl.binding.http.HTTPUrlEncoded;
-import org.eclipse.wst.wsdl.binding.http.HTTPUrlReplacement;
-import org.eclipse.wst.wsdl.internal.impl.WSDLPackageImpl;
-import org.eclipse.xsd.impl.XSDPackageImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class HTTPPackageImpl extends EPackageImpl implements HTTPPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass httpBindingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass httpOperationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass httpUrlReplacementEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass httpUrlEncodedEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass httpAddressEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ihttpAddressEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ihttpBindingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ihttpOperationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ihttpUrlEncodedEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ihttpUrlReplacementEClass = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.wst.wsdl.binding.http.HTTPPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private HTTPPackageImpl() {
-		super(eNS_URI, HTTPFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this
-	 * model, and for any others upon which it depends.  Simple
-	 * dependencies are satisfied by calling this method on all
-	 * dependent packages before doing anything else.  This method drives
-	 * initialization for interdependent packages directly, in parallel
-	 * with this package, itself.
-	 * <p>Of this package and its interdependencies, all packages which
-	 * have not yet been registered by their URI values are first created
-	 * and registered.  The packages are then initialized in two steps:
-	 * meta-model objects for all of the packages are created before any
-	 * are initialized, since one package's meta-model objects may refer to
-	 * those of another.
-	 * <p>Invocation of this method will not affect any packages that have
-	 * already been initialized.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static HTTPPackage init() {
-		if (isInited) return (HTTPPackage)EPackage.Registry.INSTANCE.get(HTTPPackage.eNS_URI);
-
-		// Obtain or create and register package.
-		HTTPPackageImpl theHTTPPackage = (HTTPPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.get(eNS_URI) : new HTTPPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		XSDPackageImpl.init();
-
-		// Obtain or create and register interdependencies
-		WSDLPackageImpl theWSDLPackage = (WSDLPackageImpl)(EPackage.Registry.INSTANCE.get(WSDLPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.get(WSDLPackage.eNS_URI) : WSDLPackageImpl.eINSTANCE);
-
-		// Step 1: create meta-model objects
-		theHTTPPackage.createPackageContents();
-		theWSDLPackage.createPackageContents();
-
-		// Step 2: complete initialization
-		theHTTPPackage.initializePackageContents();
-		theWSDLPackage.initializePackageContents();
-
-		return theHTTPPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getHTTPBinding() {
-		return httpBindingEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getHTTPBinding_Verb() {
-		return (EAttribute)httpBindingEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getHTTPOperation() {
-		return httpOperationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getHTTPOperation_LocationURI() {
-		return (EAttribute)httpOperationEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getHTTPUrlReplacement() {
-		return httpUrlReplacementEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getHTTPUrlEncoded() {
-		return httpUrlEncodedEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getHTTPAddress() {
-		return httpAddressEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getHTTPAddress_LocationURI() {
-		return (EAttribute)httpAddressEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getIHTTPAddress() {
-		return ihttpAddressEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getIHTTPBinding() {
-		return ihttpBindingEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getIHTTPOperation() {
-		return ihttpOperationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getIHTTPUrlEncoded() {
-		return ihttpUrlEncodedEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getIHTTPUrlReplacement() {
-		return ihttpUrlReplacementEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public HTTPFactory getHTTPFactory() {
-		return (HTTPFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		httpBindingEClass = createEClass(HTTP_BINDING);
-		createEAttribute(httpBindingEClass, HTTP_BINDING__VERB);
-
-		httpOperationEClass = createEClass(HTTP_OPERATION);
-		createEAttribute(httpOperationEClass, HTTP_OPERATION__LOCATION_URI);
-
-		httpUrlReplacementEClass = createEClass(HTTP_URL_REPLACEMENT);
-
-		httpUrlEncodedEClass = createEClass(HTTP_URL_ENCODED);
-
-		httpAddressEClass = createEClass(HTTP_ADDRESS);
-		createEAttribute(httpAddressEClass, HTTP_ADDRESS__LOCATION_URI);
-
-		ihttpAddressEClass = createEClass(IHTTP_ADDRESS);
-
-		ihttpBindingEClass = createEClass(IHTTP_BINDING);
-
-		ihttpOperationEClass = createEClass(IHTTP_OPERATION);
-
-		ihttpUrlEncodedEClass = createEClass(IHTTP_URL_ENCODED);
-
-		ihttpUrlReplacementEClass = createEClass(IHTTP_URL_REPLACEMENT);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		WSDLPackageImpl theWSDLPackage = (WSDLPackageImpl)EPackage.Registry.INSTANCE.getEPackage(WSDLPackage.eNS_URI);
-
-		// Add supertypes to classes
-		httpBindingEClass.getESuperTypes().add(theWSDLPackage.getExtensibilityElement());
-		httpBindingEClass.getESuperTypes().add(this.getIHTTPBinding());
-		httpOperationEClass.getESuperTypes().add(theWSDLPackage.getExtensibilityElement());
-		httpOperationEClass.getESuperTypes().add(this.getIHTTPOperation());
-		httpUrlReplacementEClass.getESuperTypes().add(theWSDLPackage.getExtensibilityElement());
-		httpUrlReplacementEClass.getESuperTypes().add(this.getIHTTPUrlReplacement());
-		httpUrlEncodedEClass.getESuperTypes().add(theWSDLPackage.getExtensibilityElement());
-		httpUrlEncodedEClass.getESuperTypes().add(this.getIHTTPUrlEncoded());
-		httpAddressEClass.getESuperTypes().add(theWSDLPackage.getExtensibilityElement());
-		httpAddressEClass.getESuperTypes().add(this.getIHTTPAddress());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(httpBindingEClass, HTTPBinding.class, "HTTPBinding", !IS_ABSTRACT, !IS_INTERFACE);
-		initEAttribute(getHTTPBinding_Verb(), ecorePackage.getEString(), "verb", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-
-		initEClass(httpOperationEClass, HTTPOperation.class, "HTTPOperation", !IS_ABSTRACT, !IS_INTERFACE);
-		initEAttribute(getHTTPOperation_LocationURI(), ecorePackage.getEString(), "locationURI", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-
-		initEClass(httpUrlReplacementEClass, HTTPUrlReplacement.class, "HTTPUrlReplacement", !IS_ABSTRACT, !IS_INTERFACE);
-
-		initEClass(httpUrlEncodedEClass, HTTPUrlEncoded.class, "HTTPUrlEncoded", !IS_ABSTRACT, !IS_INTERFACE);
-
-		initEClass(httpAddressEClass, HTTPAddress.class, "HTTPAddress", !IS_ABSTRACT, !IS_INTERFACE);
-		initEAttribute(getHTTPAddress_LocationURI(), ecorePackage.getEString(), "locationURI", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-
-		initEClass(ihttpAddressEClass, javax.wsdl.extensions.http.HTTPAddress.class, "IHTTPAddress", IS_ABSTRACT, IS_INTERFACE);
-
-		initEClass(ihttpBindingEClass, javax.wsdl.extensions.http.HTTPBinding.class, "IHTTPBinding", IS_ABSTRACT, IS_INTERFACE);
-
-		initEClass(ihttpOperationEClass, javax.wsdl.extensions.http.HTTPOperation.class, "IHTTPOperation", IS_ABSTRACT, IS_INTERFACE);
-
-		initEClass(ihttpUrlEncodedEClass, javax.wsdl.extensions.http.HTTPUrlEncoded.class, "IHTTPUrlEncoded", IS_ABSTRACT, IS_INTERFACE);
-
-		initEClass(ihttpUrlReplacementEClass, javax.wsdl.extensions.http.HTTPUrlReplacement.class, "IHTTPUrlReplacement", IS_ABSTRACT, IS_INTERFACE);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-} //HTTPPackageImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPUrlEncodedImpl.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPUrlEncodedImpl.java
deleted file mode 100644
index f681e94ce..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPUrlEncodedImpl.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.http.internal.impl;
-
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.wst.wsdl.binding.http.HTTPPackage;
-import org.eclipse.wst.wsdl.binding.http.HTTPUrlEncoded;
-import org.eclipse.wst.wsdl.binding.http.internal.util.HTTPConstants;
-import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl;
-import org.w3c.dom.Element;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Url Encoded</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class HTTPUrlEncodedImpl extends ExtensibilityElementImpl implements HTTPUrlEncoded {
-	/**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected HTTPUrlEncodedImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return HTTPPackage.eINSTANCE.getHTTPUrlEncoded();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case HTTPPackage.HTTP_URL_ENCODED__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case HTTPPackage.HTTP_URL_ENCODED__ELEMENT:
-				return getElement();
-			case HTTPPackage.HTTP_URL_ENCODED__REQUIRED:
-				return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-			case HTTPPackage.HTTP_URL_ENCODED__ELEMENT_TYPE:
-				return getElementType();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case HTTPPackage.HTTP_URL_ENCODED__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case HTTPPackage.HTTP_URL_ENCODED__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case HTTPPackage.HTTP_URL_ENCODED__REQUIRED:
-				setRequired(((Boolean)newValue).booleanValue());
-				return;
-			case HTTPPackage.HTTP_URL_ENCODED__ELEMENT_TYPE:
-				setElementType((QName)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case HTTPPackage.HTTP_URL_ENCODED__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case HTTPPackage.HTTP_URL_ENCODED__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case HTTPPackage.HTTP_URL_ENCODED__REQUIRED:
-				setRequired(REQUIRED_EDEFAULT);
-				return;
-			case HTTPPackage.HTTP_URL_ENCODED__ELEMENT_TYPE:
-				setElementType(ELEMENT_TYPE_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case HTTPPackage.HTTP_URL_ENCODED__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case HTTPPackage.HTTP_URL_ENCODED__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case HTTPPackage.HTTP_URL_ENCODED__REQUIRED:
-				return required != REQUIRED_EDEFAULT;
-			case HTTPPackage.HTTP_URL_ENCODED__ELEMENT_TYPE:
-				return ELEMENT_TYPE_EDEFAULT == null ? elementType != null : !ELEMENT_TYPE_EDEFAULT.equals(elementType);
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	  public QName getElementType()
-	  {
-	    if (elementType == null)
-	      elementType = new QName(HTTPConstants.HTTP_NAMESPACE_URI, HTTPConstants.URL_ENCODED_ELEMENT_TAG);
-	    return elementType;
-	  }
-	  
-} //HTTPUrlEncodedImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPUrlReplacementImpl.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPUrlReplacementImpl.java
deleted file mode 100644
index d58b4e888..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPUrlReplacementImpl.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.http.internal.impl;
-
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.wst.wsdl.binding.http.HTTPPackage;
-import org.eclipse.wst.wsdl.binding.http.HTTPUrlReplacement;
-import org.eclipse.wst.wsdl.binding.http.internal.util.HTTPConstants;
-import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl;
-import org.w3c.dom.Element;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Url Replacement</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class HTTPUrlReplacementImpl extends ExtensibilityElementImpl implements HTTPUrlReplacement {
-	/**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected HTTPUrlReplacementImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return HTTPPackage.eINSTANCE.getHTTPUrlReplacement();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case HTTPPackage.HTTP_URL_REPLACEMENT__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case HTTPPackage.HTTP_URL_REPLACEMENT__ELEMENT:
-				return getElement();
-			case HTTPPackage.HTTP_URL_REPLACEMENT__REQUIRED:
-				return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-			case HTTPPackage.HTTP_URL_REPLACEMENT__ELEMENT_TYPE:
-				return getElementType();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case HTTPPackage.HTTP_URL_REPLACEMENT__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case HTTPPackage.HTTP_URL_REPLACEMENT__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case HTTPPackage.HTTP_URL_REPLACEMENT__REQUIRED:
-				setRequired(((Boolean)newValue).booleanValue());
-				return;
-			case HTTPPackage.HTTP_URL_REPLACEMENT__ELEMENT_TYPE:
-				setElementType((QName)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case HTTPPackage.HTTP_URL_REPLACEMENT__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case HTTPPackage.HTTP_URL_REPLACEMENT__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case HTTPPackage.HTTP_URL_REPLACEMENT__REQUIRED:
-				setRequired(REQUIRED_EDEFAULT);
-				return;
-			case HTTPPackage.HTTP_URL_REPLACEMENT__ELEMENT_TYPE:
-				setElementType(ELEMENT_TYPE_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case HTTPPackage.HTTP_URL_REPLACEMENT__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case HTTPPackage.HTTP_URL_REPLACEMENT__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case HTTPPackage.HTTP_URL_REPLACEMENT__REQUIRED:
-				return required != REQUIRED_EDEFAULT;
-			case HTTPPackage.HTTP_URL_REPLACEMENT__ELEMENT_TYPE:
-				return ELEMENT_TYPE_EDEFAULT == null ? elementType != null : !ELEMENT_TYPE_EDEFAULT.equals(elementType);
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	  public QName getElementType()
-	  {
-	    if (elementType == null)
-	      elementType = new QName(HTTPConstants.HTTP_NAMESPACE_URI, HTTPConstants.URL_REPLACEMENT_ELEMENT_TAG);
-	    return elementType;
-	  }
-	  
-} //HTTPUrlReplacementImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPAdapterFactory.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPAdapterFactory.java
deleted file mode 100644
index bf7481a1d..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPAdapterFactory.java
+++ /dev/null
@@ -1,333 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.http.internal.util;
-
-import javax.wsdl.extensions.ExtensibilityElement;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.binding.http.HTTPAddress;
-import org.eclipse.wst.wsdl.binding.http.HTTPBinding;
-import org.eclipse.wst.wsdl.binding.http.HTTPOperation;
-import org.eclipse.wst.wsdl.binding.http.HTTPPackage;
-import org.eclipse.wst.wsdl.binding.http.HTTPUrlEncoded;
-import org.eclipse.wst.wsdl.binding.http.HTTPUrlReplacement;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.wst.wsdl.binding.http.HTTPPackage
- * @generated
- */
-public class HTTPAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static HTTPPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public HTTPAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = HTTPPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch the delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected HTTPSwitch modelSwitch =
-		new HTTPSwitch() {
-			public Object caseHTTPBinding(HTTPBinding object) {
-				return createHTTPBindingAdapter();
-			}
-			public Object caseHTTPOperation(HTTPOperation object) {
-				return createHTTPOperationAdapter();
-			}
-			public Object caseHTTPUrlReplacement(HTTPUrlReplacement object) {
-				return createHTTPUrlReplacementAdapter();
-			}
-			public Object caseHTTPUrlEncoded(HTTPUrlEncoded object) {
-				return createHTTPUrlEncodedAdapter();
-			}
-			public Object caseHTTPAddress(HTTPAddress object) {
-				return createHTTPAddressAdapter();
-			}
-			public Object caseIHTTPAddress(javax.wsdl.extensions.http.HTTPAddress object) {
-				return createIHTTPAddressAdapter();
-			}
-			public Object caseIHTTPBinding(javax.wsdl.extensions.http.HTTPBinding object) {
-				return createIHTTPBindingAdapter();
-			}
-			public Object caseIHTTPOperation(javax.wsdl.extensions.http.HTTPOperation object) {
-				return createIHTTPOperationAdapter();
-			}
-			public Object caseIHTTPUrlEncoded(javax.wsdl.extensions.http.HTTPUrlEncoded object) {
-				return createIHTTPUrlEncodedAdapter();
-			}
-			public Object caseIHTTPUrlReplacement(javax.wsdl.extensions.http.HTTPUrlReplacement object) {
-				return createIHTTPUrlReplacementAdapter();
-			}
-			public Object caseWSDLElement(WSDLElement object) {
-				return createWSDLElementAdapter();
-			}
-			public Object caseIExtensibilityElement(ExtensibilityElement object) {
-				return createIExtensibilityElementAdapter();
-			}
-			public Object caseExtensibilityElement(org.eclipse.wst.wsdl.ExtensibilityElement object) {
-				return createExtensibilityElementAdapter();
-			}
-			public Object defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	public Adapter createAdapter(Notifier target) {
-		return (Adapter)modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.wst.wsdl.binding.http.HTTPBinding <em>Binding</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.wst.wsdl.binding.http.HTTPBinding
-	 * @generated
-	 */
-	public Adapter createHTTPBindingAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.wst.wsdl.binding.http.HTTPOperation <em>Operation</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.wst.wsdl.binding.http.HTTPOperation
-	 * @generated
-	 */
-	public Adapter createHTTPOperationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.wst.wsdl.binding.http.HTTPUrlReplacement <em>Url Replacement</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.wst.wsdl.binding.http.HTTPUrlReplacement
-	 * @generated
-	 */
-	public Adapter createHTTPUrlReplacementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.wst.wsdl.binding.http.HTTPUrlEncoded <em>Url Encoded</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.wst.wsdl.binding.http.HTTPUrlEncoded
-	 * @generated
-	 */
-	public Adapter createHTTPUrlEncodedAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.wst.wsdl.binding.http.HTTPAddress <em>Address</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.wst.wsdl.binding.http.HTTPAddress
-	 * @generated
-	 */
-	public Adapter createHTTPAddressAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link javax.wsdl.extensions.http.HTTPAddress <em>IHTTP Address</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see javax.wsdl.extensions.http.HTTPAddress
-	 * @generated
-	 */
-	public Adapter createIHTTPAddressAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link javax.wsdl.extensions.http.HTTPBinding <em>IHTTP Binding</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see javax.wsdl.extensions.http.HTTPBinding
-	 * @generated
-	 */
-	public Adapter createIHTTPBindingAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link javax.wsdl.extensions.http.HTTPOperation <em>IHTTP Operation</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see javax.wsdl.extensions.http.HTTPOperation
-	 * @generated
-	 */
-	public Adapter createIHTTPOperationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link javax.wsdl.extensions.http.HTTPUrlEncoded <em>IHTTP Url Encoded</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see javax.wsdl.extensions.http.HTTPUrlEncoded
-	 * @generated
-	 */
-	public Adapter createIHTTPUrlEncodedAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link javax.wsdl.extensions.http.HTTPUrlReplacement <em>IHTTP Url Replacement</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see javax.wsdl.extensions.http.HTTPUrlReplacement
-	 * @generated
-	 */
-	public Adapter createIHTTPUrlReplacementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.wst.wsdl.WSDLElement <em>Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.wst.wsdl.WSDLElement
-	 * @generated
-	 */
-	public Adapter createWSDLElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link javax.wsdl.extensions.ExtensibilityElement <em>IExtensibility Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see javax.wsdl.extensions.ExtensibilityElement
-	 * @generated
-	 */
-	public Adapter createIExtensibilityElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.wst.wsdl.ExtensibilityElement <em>Extensibility Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.wst.wsdl.ExtensibilityElement
-	 * @generated
-	 */
-	public Adapter createExtensibilityElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //HTTPAdapterFactory
diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPConstants.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPConstants.java
deleted file mode 100644
index 1b46a1a99..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPConstants.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.http.internal.util;
-
-import org.w3c.dom.Element;
-
-public final class HTTPConstants 
-{
-  public static final String ADDRESS_ELEMENT_TAG = "address";
-  public static final String BINDING_ELEMENT_TAG = "binding";
-  public static final String OPERATION_ELEMENT_TAG = "operation";
-  public static final String URL_ENCODED_ELEMENT_TAG = "urlEncoded";
-  public static final String URL_REPLACEMENT_ELEMENT_TAG = "urlReplacement";
-  
-  public static final String HTTP_NAMESPACE_URI = "http://schemas.xmlsoap.org/wsdl/http/";
-
-  public static final String LOCATION_URI_ATTRIBUTE ="location";
-  public static final String VERB_ATTRIBUTE ="verb";
-  
-  public static String getAttribute(Element element, String attributeName)
-  {
-    return element.hasAttribute(attributeName) ? element.getAttribute(attributeName) : null;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPExtensibilityElementFactory.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPExtensibilityElementFactory.java
deleted file mode 100644
index ef962d1ce..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPExtensibilityElementFactory.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.http.internal.util;
-
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.binding.http.HTTPFactory;
-import org.eclipse.wst.wsdl.util.ExtensibilityElementFactory;
-
-public class HTTPExtensibilityElementFactory implements ExtensibilityElementFactory
-{
-  public ExtensibilityElement createExtensibilityElement(String namespace, String localName)
-  {
-    if (HTTPConstants.HTTP_NAMESPACE_URI.equals(namespace))
-    {
-      if (HTTPConstants.ADDRESS_ELEMENT_TAG.equals(localName))
-      {
-        return HTTPFactory.eINSTANCE.createHTTPAddress();
-      }
-      else if (HTTPConstants.BINDING_ELEMENT_TAG.equals(localName))
-      {
-        return HTTPFactory.eINSTANCE.createHTTPBinding();
-      }
-      else if (HTTPConstants.OPERATION_ELEMENT_TAG.equals(localName))
-      {
-        return HTTPFactory.eINSTANCE.createHTTPOperation();
-      }
-      else if (HTTPConstants.URL_ENCODED_ELEMENT_TAG.equals(localName))
-      {
-      	return HTTPFactory.eINSTANCE.createHTTPUrlEncoded();
-      }
-      else if (HTTPConstants.URL_REPLACEMENT_ELEMENT_TAG.equals(localName))
-      {
-      	return HTTPFactory.eINSTANCE.createHTTPUrlReplacement();
-      }
-      else
-      {
-        //System.out.println("Unhandled localName: " + localName);
-        return WSDLFactory.eINSTANCE.createUnknownExtensibilityElement();
-      }
-    }
-    else
-    {
-      //System.out.println("Unhandled namespace: " + namespace);
-      return WSDLFactory.eINSTANCE.createUnknownExtensibilityElement();
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPSwitch.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPSwitch.java
deleted file mode 100644
index 2dd03f2f9..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPSwitch.java
+++ /dev/null
@@ -1,336 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.http.internal.util;
-
-import javax.wsdl.extensions.ExtensibilityElement;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.binding.http.HTTPAddress;
-import org.eclipse.wst.wsdl.binding.http.HTTPBinding;
-import org.eclipse.wst.wsdl.binding.http.HTTPOperation;
-import org.eclipse.wst.wsdl.binding.http.HTTPPackage;
-import org.eclipse.wst.wsdl.binding.http.HTTPUrlEncoded;
-import org.eclipse.wst.wsdl.binding.http.HTTPUrlReplacement;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.wst.wsdl.binding.http.HTTPPackage
- * @generated
- */
-public class HTTPSwitch {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static HTTPPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public HTTPSwitch() {
-		if (modelPackage == null) {
-			modelPackage = HTTPPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	public Object doSwitch(EObject theEObject) {
-		EClass theEClass = theEObject.eClass();
-		if (theEClass.eContainer() == modelPackage) {
-			switch (theEClass.getClassifierID()) {
-				case HTTPPackage.HTTP_BINDING: {
-					HTTPBinding httpBinding = (HTTPBinding)theEObject;
-					Object result = caseHTTPBinding(httpBinding);
-					if (result == null) result = caseExtensibilityElement(httpBinding);
-					if (result == null) result = caseIHTTPBinding(httpBinding);
-					if (result == null) result = caseWSDLElement(httpBinding);
-					if (result == null) result = caseIExtensibilityElement(httpBinding);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case HTTPPackage.HTTP_OPERATION: {
-					HTTPOperation httpOperation = (HTTPOperation)theEObject;
-					Object result = caseHTTPOperation(httpOperation);
-					if (result == null) result = caseExtensibilityElement(httpOperation);
-					if (result == null) result = caseIHTTPOperation(httpOperation);
-					if (result == null) result = caseWSDLElement(httpOperation);
-					if (result == null) result = caseIExtensibilityElement(httpOperation);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case HTTPPackage.HTTP_URL_REPLACEMENT: {
-					HTTPUrlReplacement httpUrlReplacement = (HTTPUrlReplacement)theEObject;
-					Object result = caseHTTPUrlReplacement(httpUrlReplacement);
-					if (result == null) result = caseExtensibilityElement(httpUrlReplacement);
-					if (result == null) result = caseIHTTPUrlReplacement(httpUrlReplacement);
-					if (result == null) result = caseWSDLElement(httpUrlReplacement);
-					if (result == null) result = caseIExtensibilityElement(httpUrlReplacement);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case HTTPPackage.HTTP_URL_ENCODED: {
-					HTTPUrlEncoded httpUrlEncoded = (HTTPUrlEncoded)theEObject;
-					Object result = caseHTTPUrlEncoded(httpUrlEncoded);
-					if (result == null) result = caseExtensibilityElement(httpUrlEncoded);
-					if (result == null) result = caseIHTTPUrlEncoded(httpUrlEncoded);
-					if (result == null) result = caseWSDLElement(httpUrlEncoded);
-					if (result == null) result = caseIExtensibilityElement(httpUrlEncoded);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case HTTPPackage.HTTP_ADDRESS: {
-					HTTPAddress httpAddress = (HTTPAddress)theEObject;
-					Object result = caseHTTPAddress(httpAddress);
-					if (result == null) result = caseExtensibilityElement(httpAddress);
-					if (result == null) result = caseIHTTPAddress(httpAddress);
-					if (result == null) result = caseWSDLElement(httpAddress);
-					if (result == null) result = caseIExtensibilityElement(httpAddress);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				default: return defaultCase(theEObject);
-			}
-		}
-		return defaultCase(theEObject);
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Binding</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Binding</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseHTTPBinding(HTTPBinding object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Operation</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Operation</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseHTTPOperation(HTTPOperation object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Url Replacement</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Url Replacement</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseHTTPUrlReplacement(HTTPUrlReplacement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Url Encoded</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Url Encoded</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseHTTPUrlEncoded(HTTPUrlEncoded object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Address</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Address</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseHTTPAddress(HTTPAddress object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IHTTP Address</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IHTTP Address</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseIHTTPAddress(javax.wsdl.extensions.http.HTTPAddress object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IHTTP Binding</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IHTTP Binding</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseIHTTPBinding(javax.wsdl.extensions.http.HTTPBinding object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IHTTP Operation</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IHTTP Operation</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseIHTTPOperation(javax.wsdl.extensions.http.HTTPOperation object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IHTTP Url Encoded</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IHTTP Url Encoded</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseIHTTPUrlEncoded(javax.wsdl.extensions.http.HTTPUrlEncoded object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IHTTP Url Replacement</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IHTTP Url Replacement</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseIHTTPUrlReplacement(javax.wsdl.extensions.http.HTTPUrlReplacement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseWSDLElement(WSDLElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IExtensibility Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IExtensibility Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseIExtensibilityElement(ExtensibilityElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Extensibility Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Extensibility Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseExtensibilityElement(org.eclipse.wst.wsdl.ExtensibilityElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	public Object defaultCase(EObject object) {
-		return null;
-	}
-
-} //HTTPSwitch
diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/model/MIME.genmodel b/bundles/org.eclipse.wst.wsdl/src-mime/model/MIME.genmodel
deleted file mode 100644
index d70dc5b5d..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/model/MIME.genmodel
+++ /dev/null
@@ -1,428 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<genmodel:GenModel xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/com.ibm.etools.wsdl.binding.mime/src"
-    editDirectory="/com.ibm.etools.wsdl.binding.mime.edit/src" editorDirectory="/com.ibm.etools.wsdl.binding.mime.editor/src"
-    modelPluginID="com.ibm.etools.wsdl.binding.mime" modelName="MIME" editPluginClass=""
-    editorPluginClass="" usedGenPackages="../../../org.eclipse.xsd/src/model/XSD.genmodel#//xsd">
-  <foreignModel>..\rose\mime.mdl</foreignModel>
-  <foreignModel>VABASE_PLUGINS_PATH</foreignModel>
-  <foreignModel>../../..</foreignModel>
-  <genPackages prefix="MIME" basePackage="com.ibm.etools.wsdl.binding" ecorePackage="mime.ecore#/">
-    <genDataTypes ecoreDataType="mime.ecore#//List"/>
-    <genClasses ecoreClass="mime.ecore#//MIMEContent">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mime.ecore#//MIMEContent/type"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference mime.ecore#//MIMEContent/ePart"/>
-      <genOperations ecoreOperation="mime.ecore#//MIMEContent/setPart">
-        <genParameters ecoreParameter="mime.ecore#//MIMEContent/setPart/part"/>
-      </genOperations>
-      <genOperations ecoreOperation="mime.ecore#//MIMEContent/getPart"/>
-    </genClasses>
-    <genClasses ecoreClass="mime.ecore#//MIMEPart">
-      <genOperations ecoreOperation="mime.ecore#//MIMEPart/addExtensibilityElement">
-        <genParameters ecoreParameter="mime.ecore#//MIMEPart/addExtensibilityElement/extensibilityElement"/>
-      </genOperations>
-      <genOperations ecoreOperation="mime.ecore#//MIMEPart/getExtensibilityElements"/>
-    </genClasses>
-    <genClasses ecoreClass="mime.ecore#//MIMEMultipartRelated">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference mime.ecore#//MIMEMultipartRelated/eMIMEPart"/>
-      <genOperations ecoreOperation="mime.ecore#//MIMEMultipartRelated/addMIMEPart">
-        <genParameters ecoreParameter="mime.ecore#//MIMEMultipartRelated/addMIMEPart/mimePart"/>
-      </genOperations>
-      <genOperations ecoreOperation="mime.ecore#//MIMEMultipartRelated/getMIMEParts"/>
-    </genClasses>
-    <genClasses ecoreClass="mime.ecore#//MIMEMimeXml">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference mime.ecore#//MIMEMimeXml/ePart"/>
-      <genOperations ecoreOperation="mime.ecore#//MIMEMimeXml/setPart">
-        <genParameters ecoreParameter="mime.ecore#//MIMEMimeXml/setPart/part"/>
-      </genOperations>
-      <genOperations ecoreOperation="mime.ecore#//MIMEMimeXml/getPart"/>
-    </genClasses>
-    <genClasses ecoreClass="mime.ecore#//IMIMEPart"/>
-    <genClasses ecoreClass="mime.ecore#//IMIMEMultipartRelated"/>
-    <genClasses ecoreClass="mime.ecore#//IMIMEContent"/>
-    <genClasses ecoreClass="mime.ecore#//IMIMEMimeXml"/>
-  </genPackages>
-  <genPackages prefix="WSDL" basePackage="com.ibm.etools" ecorePackage="wsdl.ecore#/">
-    <genDataTypes ecoreDataType="wsdl.ecore#//QName"/>
-    <genDataTypes ecoreDataType="wsdl.ecore#//OperationType"/>
-    <genDataTypes ecoreDataType="wsdl.ecore#//DOMElement"/>
-    <genDataTypes ecoreDataType="wsdl.ecore#//WSDLException"/>
-    <genDataTypes ecoreDataType="wsdl.ecore#//DOMDocument"/>
-    <genClasses ecoreClass="wsdl.ecore#//WSDLElement">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//WSDLElement/documentationElement"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//WSDLElement/element"/>
-      <genOperations ecoreOperation="wsdl.ecore#//WSDLElement/getEnclosingDefinition"/>
-      <genOperations ecoreOperation="wsdl.ecore#//WSDLElement/setEnclosingDefinition">
-        <genParameters ecoreParameter="wsdl.ecore#//WSDLElement/setEnclosingDefinition/definition"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//PortType">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//PortType/qName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//PortType/undefined"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//PortType/proxy"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//PortType/resourceURI"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//PortType/eOperations"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Operation">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Operation/style"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Operation/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Operation/undefined"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Operation/proxy"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Operation/resourceURI"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Operation/eInput"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Operation/eOutput"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Operation/eFaults"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Operation/eParameterOrdering"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Message">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Message/qName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Message/undefined"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Message/proxy"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Message/resourceURI"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Message/eParts"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Part">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Part/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Part/elementName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Part/typeName"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Part/typeDefinition"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Part/elementDeclaration"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Part/eMessage"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Binding">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Binding/qName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Binding/undefined"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Binding/proxy"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Binding/resourceURI"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Binding/ePortType"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Binding/eBindingOperations"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//BindingOperation">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//BindingOperation/name"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//BindingOperation/eOperation"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//BindingOperation/eBindingInput"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//BindingOperation/eBindingOutput"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//BindingOperation/eBindingFaults"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Service">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Service/qName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Service/undefined"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Service/proxy"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Service/resourceURI"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Service/ePorts"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Port">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Port/name"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Port/eBinding"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//ExtensibilityElement">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//ExtensibilityElement/required"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//ExtensibilityElement/elementType"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Definition">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Definition/targetNamespace"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Definition/location"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Definition/qName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Definition/encoding"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eMessages"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/ePortTypes"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eBindings"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eServices"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eNamespaces"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eTypes"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eImports"/>
-      <genOperations ecoreOperation="wsdl.ecore#//Definition/getDocument"/>
-      <genOperations ecoreOperation="wsdl.ecore#//Definition/setDocument">
-        <genParameters ecoreParameter="wsdl.ecore#//Definition/setDocument/document"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Import">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Import/namespaceURI"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Import/locationURI"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Import/eDefinition"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Import/eSchema"/>
-      <genOperations ecoreOperation="wsdl.ecore#//Import/getSchema"/>
-      <genOperations ecoreOperation="wsdl.ecore#//Import/setSchema">
-        <genParameters ecoreParameter="wsdl.ecore#//Import/setSchema/schema"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//ExtensibleElement">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//ExtensibleElement/eExtensibilityElements"/>
-      <genOperations ecoreOperation="wsdl.ecore#//ExtensibleElement/getExtensibilityElements"/>
-      <genOperations ecoreOperation="wsdl.ecore#//ExtensibleElement/addExtensibilityElement">
-        <genParameters ecoreParameter="wsdl.ecore#//ExtensibleElement/addExtensibilityElement/extElement"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Input"/>
-    <genClasses ecoreClass="wsdl.ecore#//Output"/>
-    <genClasses ecoreClass="wsdl.ecore#//Fault"/>
-    <genClasses ecoreClass="wsdl.ecore#//BindingInput">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//BindingInput/name"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//BindingInput/eInput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//BindingInput/getInput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//BindingInput/setInput">
-        <genParameters ecoreParameter="wsdl.ecore#//BindingInput/setInput/input"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//BindingOutput">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//BindingOutput/name"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//BindingOutput/eOutput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//BindingOutput/getOutput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//BindingOutput/setOutput">
-        <genParameters ecoreParameter="wsdl.ecore#//BindingOutput/setOutput/output"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//BindingFault">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//BindingFault/name"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//BindingFault/eFault"/>
-      <genOperations ecoreOperation="wsdl.ecore#//BindingFault/getFault"/>
-      <genOperations ecoreOperation="wsdl.ecore#//BindingFault/setFault">
-        <genParameters ecoreParameter="wsdl.ecore#//BindingFault/setFault/fault"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Namespace">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Namespace/URI"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Namespace/prefix"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IPortType">
-      <genOperations ecoreOperation="wsdl.ecore#//IPortType/addOperation">
-        <genParameters ecoreParameter="wsdl.ecore#//IPortType/addOperation/operation"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IPortType/getOperation">
-        <genParameters ecoreParameter="wsdl.ecore#//IPortType/getOperation/name"/>
-        <genParameters ecoreParameter="wsdl.ecore#//IPortType/getOperation/inputName"/>
-        <genParameters ecoreParameter="wsdl.ecore#//IPortType/getOperation/outputName"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IPortType/getOperations"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IOperation">
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/addFault">
-        <genParameters ecoreParameter="wsdl.ecore#//IOperation/addFault/fault"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/getFault">
-        <genParameters ecoreParameter="wsdl.ecore#//IOperation/getFault/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/getFaults"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/getParameterOrdering"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/setParameterOrdering">
-        <genParameters ecoreParameter="wsdl.ecore#//IOperation/setParameterOrdering/parameterOrder"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/getInput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/setInput">
-        <genParameters ecoreParameter="wsdl.ecore#//IOperation/setInput/input"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/getOutput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/setOutput">
-        <genParameters ecoreParameter="wsdl.ecore#//IOperation/setOutput/output"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IInput">
-      <genOperations ecoreOperation="wsdl.ecore#//IInput/getMessage"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IInput/setMessage">
-        <genParameters ecoreParameter="wsdl.ecore#//IInput/setMessage/message"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IOutput">
-      <genOperations ecoreOperation="wsdl.ecore#//IOutput/getMessage"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IOutput/setMessage">
-        <genParameters ecoreParameter="wsdl.ecore#//IOutput/setMessage/message"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IFault">
-      <genOperations ecoreOperation="wsdl.ecore#//IFault/getMessage"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IFault/setMessage">
-        <genParameters ecoreParameter="wsdl.ecore#//IFault/setMessage/message"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IMessage">
-      <genOperations ecoreOperation="wsdl.ecore#//IMessage/addPart">
-        <genParameters ecoreParameter="wsdl.ecore#//IMessage/addPart/part"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IMessage/getPart">
-        <genParameters ecoreParameter="wsdl.ecore#//IMessage/getPart/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IMessage/getParts"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IMessage/getOrderedParts">
-        <genParameters ecoreParameter="wsdl.ecore#//IMessage/getOrderedParts/partOrder"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IPart">
-      <genOperations ecoreOperation="wsdl.ecore#//IPart/setExtensionAttribute">
-        <genParameters ecoreParameter="wsdl.ecore#//IPart/setExtensionAttribute/name"/>
-        <genParameters ecoreParameter="wsdl.ecore#//IPart/setExtensionAttribute/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IPart/getExtensionAttributeNames"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IPart/getExtensionAttribute">
-        <genParameters ecoreParameter="wsdl.ecore#//IPart/getExtensionAttribute/name"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IService">
-      <genOperations ecoreOperation="wsdl.ecore#//IService/addPort">
-        <genParameters ecoreParameter="wsdl.ecore#//IService/addPort/port"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IService/getPorts"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IService/getPort">
-        <genParameters ecoreParameter="wsdl.ecore#//IService/getPort/name"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IPort">
-      <genOperations ecoreOperation="wsdl.ecore#//IPort/getBinding"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IPort/setBinding">
-        <genParameters ecoreParameter="wsdl.ecore#//IPort/setBinding/binding"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IBinding">
-      <genOperations ecoreOperation="wsdl.ecore#//IBinding/addBindingOperation">
-        <genParameters ecoreParameter="wsdl.ecore#//IBinding/addBindingOperation/bindingOperation"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IBinding/getBindingOperation">
-        <genParameters ecoreParameter="wsdl.ecore#//IBinding/getBindingOperation/name"/>
-        <genParameters ecoreParameter="wsdl.ecore#//IBinding/getBindingOperation/inputName"/>
-        <genParameters ecoreParameter="wsdl.ecore#//IBinding/getBindingOperation/outputName"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IBinding/getBindingOperations"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IBinding/getPortType"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IBinding/setPortType">
-        <genParameters ecoreParameter="wsdl.ecore#//IBinding/setPortType/portType"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IBindingOperation">
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/addBindingFault">
-        <genParameters ecoreParameter="wsdl.ecore#//IBindingOperation/addBindingFault/bindingFault"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/getBindingFault">
-        <genParameters ecoreParameter="wsdl.ecore#//IBindingOperation/getBindingFault/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/getBindingFaults"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/getOperation"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/setOperation">
-        <genParameters ecoreParameter="wsdl.ecore#//IBindingOperation/setOperation/operation"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/getBindingInput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/setBindingInput">
-        <genParameters ecoreParameter="wsdl.ecore#//IBindingOperation/setBindingInput/bindingInput"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/getBindingOutput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/setBindingOutput">
-        <genParameters ecoreParameter="wsdl.ecore#//IBindingOperation/setBindingOutput/bindingOutput"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IBindingInput"/>
-    <genClasses ecoreClass="wsdl.ecore#//IBindingOutput"/>
-    <genClasses ecoreClass="wsdl.ecore#//IBindingFault"/>
-    <genClasses ecoreClass="wsdl.ecore#//IExtensibilityElement"/>
-    <genClasses ecoreClass="wsdl.ecore#//IDefinition">
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addBinding">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addBinding/binding"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addImport">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addImport/importDef"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addMessage">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addMessage/message"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addNamespace">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addNamespace/prefix"/>
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addNamespace/namespaceURI"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addPortType">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addPortType/portType"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addService">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addService/service"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createBindingFault"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createBindingInput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createBindingOutput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createBindingOperation"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createBinding"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createFault"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createImport"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createInput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createMessage"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createOperation"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createOutput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createPart"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createPort"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createPortType"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createService"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getBinding">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getBinding/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getBindings"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getImports"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getImports.1">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getImports.1/namespaceURI"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getMessage">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getMessage/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getMessages"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getNamespace">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getNamespace/prefix"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getNamespaces"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getPortType">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getPortType/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getPortTypes"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getPrefix">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getPrefix/namespaceURI"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getService">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getService/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getServices"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getExtensionRegistry"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/setExtensionRegistry">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/setExtensionRegistry/extensionRegistry"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getDocumentBaseURI"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/setDocumentBaseURI">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/setDocumentBaseURI/documentBase"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createTypes"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/removeService">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/removeService/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/removeBinding">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/removeBinding/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/removePortType">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/removePortType/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/removeMessage">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/removeMessage/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getTypes"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/setTypes">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/setTypes/types"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IImport"/>
-    <genClasses ecoreClass="wsdl.ecore#//IList"/>
-    <genClasses ecoreClass="wsdl.ecore#//IMap"/>
-    <genClasses ecoreClass="wsdl.ecore#//IURL"/>
-    <genClasses ecoreClass="wsdl.ecore#//IExtensionRegistry"/>
-    <genClasses ecoreClass="wsdl.ecore#//Types">
-      <genOperations ecoreOperation="wsdl.ecore#//Types/getSchemas"/>
-      <genOperations ecoreOperation="wsdl.ecore#//Types/getSchemas.1">
-        <genParameters ecoreParameter="wsdl.ecore#//Types/getSchemas.1/namespaceURI"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IIterator"/>
-    <genClasses ecoreClass="wsdl.ecore#//ITypes"/>
-    <genClasses ecoreClass="wsdl.ecore#//UnknownExtensibilityElement">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//UnknownExtensibilityElement/parent"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//UnknownExtensibilityElement/children"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//XSDSchemaExtensibilityElement">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//XSDSchemaExtensibilityElement/schema"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//MessageReference">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//MessageReference/name"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//MessageReference/eMessage"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/model/com.ibm.etools.wsdl.bindings.MIME.cat b/bundles/org.eclipse.wst.wsdl/src-mime/model/com.ibm.etools.wsdl.bindings.MIME.cat
deleted file mode 100644
index c47f921d1..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/model/com.ibm.etools.wsdl.bindings.MIME.cat
+++ /dev/null
@@ -1,630 +0,0 @@
-
-(object Petal
-    version    	42
-    _written   	"Rose 4.5.8054a"
-    charSet    	0)
-
-(object Class_Category "mime"
-    is_unit    	TRUE
-    is_loaded  	TRUE
-    quid       	"3AC9127C0266"
-    exportControl 	"Public"
-    logical_models 	(list unit_reference_list
-	(object Class "MIMEContent"
-	    quid       	"3AC9135B03A7"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AEF11CA038E"
-		    supplier   	"Logical View::wsdl::ExtensibilityElement"
-		    quidu      	"3AD5DBB602A9"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "type"
-		    quid       	"3AC91971036B"
-		    type       	"String"))
-	    language   	"Java")
-	(object Class "MIMEPart"
-	    quid       	"3AC913EE00EB"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AEF11400259"
-		    supplier   	"Logical View::wsdl::ExtensibleElement"
-		    quidu      	"3AD5FCFA033A"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "name"
-		    quid       	"3AE8B1AB015D"
-		    type       	"String"))
-	    language   	"Java")
-	(object Class "MIMEMultipartRelated"
-	    quid       	"3AC913FA025B"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AEF11D50330"
-		    supplier   	"Logical View::wsdl::ExtensibilityElement"
-		    quidu      	"3AD5DBB602A9"))
-	    language   	"Java")
-	(object Class "MIMEMimeXml"
-	    quid       	"3AC9145A01FF"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AEF11DD038B"
-		    supplier   	"Logical View::wsdl::ExtensibilityElement"
-		    quidu      	"3AD5DBB602A9"))
-	    language   	"Java")
-	(object Association "$UNNAMED$0"
-	    quid       	"3AE73B3C0356"
-	    roles      	(list role_list
-		(object Role "$UNNAMED$1"
-		    quid       	"3AE73B3D0090"
-		    supplier   	"Logical View::mime::MIMEContent"
-		    quidu      	"3AC9135B03A7")
-		(object Role "part"
-		    quid       	"3AE73B3D009A"
-		    label      	"part"
-		    supplier   	"Logical View::wsdl::Part"
-		    quidu      	"3AD5CE1C032E"
-		    client_cardinality 	(value cardinality "0..1")
-		    is_navigable 	TRUE)))
-	(object Association "$UNNAMED$2"
-	    quid       	"3AE73BB900D5"
-	    roles      	(list role_list
-		(object Role "part"
-		    quid       	"3AE73BB903CE"
-		    label      	"part"
-		    supplier   	"Logical View::wsdl::Part"
-		    quidu      	"3AD5CE1C032E"
-		    client_cardinality 	(value cardinality "0..1")
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$3"
-		    quid       	"3AE73BB903E2"
-		    supplier   	"Logical View::mime::MIMEMimeXml"
-		    quidu      	"3AC9145A01FF")))
-	(object Association "$UNNAMED$4"
-	    quid       	"3AEF12FE0387"
-	    roles      	(list role_list
-		(object Role "$UNNAMED$5"
-		    quid       	"3AEF130000D7"
-		    supplier   	"Logical View::mime::MIMEMultipartRelated"
-		    quidu      	"3AC913FA025B"
-		    is_aggregate 	TRUE)
-		(object Role "elements"
-		    quid       	"3AEF130000E1"
-		    label      	"elements"
-		    supplier   	"Logical View::mime::MIMEPart"
-		    quidu      	"3AC913EE00EB"
-		    client_cardinality 	(value cardinality "0..n")
-		    Constraints 	"ordered"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE))))
-    logical_presentations 	(list unit_reference_list
-	(object ClassDiagram "Bindings"
-	    quid       	"3AC9128B01F9"
-	    title      	"Bindings"
-	    zoom       	100
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	56
-	    origin_y   	0
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::mime::MIMEContent" @1
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1856, 336)
-		    label      	(object ItemLabel
-			Parent_View 	@1
-			location   	(1714, 255)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	284
-			justify    	0
-			label      	"MIMEContent")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AC9135B03A7"
-		    width      	302
-		    height     	186
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::Part" @2
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1504, 784)
-		    label      	(object ItemLabel
-			Parent_View 	@2
-			location   	(1354, 555)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	300
-			justify    	0
-			label      	"Part")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5CE1C032E"
-		    width      	318
-		    height     	482
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$0" @3
-		    location   	(1722, 505)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AE73B3C0356"
-		    roleview_list 	(list RoleViews
-			(object RoleView "$UNNAMED$1" @4
-			    Parent_View 	@3
-			    location   	(-326, -727)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AE73B3D0090"
-			    client     	@3
-			    supplier   	@1
-			    line_style 	0)
-			(object RoleView "part" @5
-			    Parent_View 	@3
-			    location   	(-326, -727)
-			    label      	(object SegLabel @6
-				Parent_View 	@5
-				location   	(1740, 508)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	96
-				justify    	0
-				label      	"+part"
-				pctDist    	-0.097934
-				height     	16
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AE73B3D009A"
-			    client     	@3
-			    supplier   	@2
-			    line_style 	0
-			    label      	(object SegLabel @7
-				Parent_View 	@5
-				location   	(1734, 569)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..1"
-				pctDist    	0.449103
-				height     	49
-				orientation 	0))))
-		(object ClassView "Class" "Logical View::mime::MIMEMimeXml" @8
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1216, 320)
-		    label      	(object ItemLabel
-			Parent_View 	@8
-			location   	(1061, 268)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	310
-			justify    	0
-			label      	"MIMEMimeXml")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AC9145A01FF"
-		    width      	328
-		    height     	128
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$2" @9
-		    location   	(1304, 463)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AE73BB900D5"
-		    roleview_list 	(list RoleViews
-			(object RoleView "part" @10
-			    Parent_View 	@9
-			    location   	(-184, -1185)
-			    label      	(object SegLabel @11
-				Parent_View 	@10
-				location   	(1311, 479)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	96
-				justify    	0
-				label      	"+part"
-				pctDist    	0.177941
-				height     	4
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AE73BB903CE"
-			    client     	@9
-			    supplier   	@2
-			    line_style 	0
-			    label      	(object SegLabel @12
-				Parent_View 	@10
-				location   	(1272, 554)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..1"
-				pctDist    	0.652270
-				height     	76
-				orientation 	1))
-			(object RoleView "$UNNAMED$3" @13
-			    Parent_View 	@9
-			    location   	(-184, -1185)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AE73BB903E2"
-			    client     	@9
-			    supplier   	@8
-			    line_style 	0)))
-		(object ClassView "Class" "Logical View::mime::MIMEMultipartRelated" @14
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(528, 320)
-		    label      	(object ItemLabel
-			Parent_View 	@14
-			location   	(312, 269)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	432
-			justify    	0
-			label      	"MIMEMultipartRelated")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AC913FA025B"
-		    width      	450
-		    height     	126
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::mime::MIMEPart" @15
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(528, 848)
-		    label      	(object ItemLabel
-			Parent_View 	@15
-			location   	(380, 767)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	296
-			justify    	0
-			label      	"MIMEPart")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AC913EE00EB"
-		    compartment 	(object Compartment
-			Parent_View 	@15
-			location   	(380, 827)
-			icon_style 	"Icon"
-			fill_color 	16777215
-			anchor     	2
-			nlines     	2
-			max_width  	303)
-		    width      	314
-		    height     	186
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$4" @16
-		    location   	(528, 568)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AEF12FE0387"
-		    roleview_list 	(list RoleViews
-			(object RoleView "$UNNAMED$5" @17
-			    Parent_View 	@16
-			    location   	(0, -136)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AEF130000D7"
-			    client     	@16
-			    supplier   	@14
-			    line_style 	0)
-			(object RoleView "elements" @18
-			    Parent_View 	@16
-			    location   	(0, -136)
-			    label      	(object SegLabel @19
-				Parent_View 	@18
-				location   	(535, 627)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	192
-				justify    	0
-				label      	"+elements"
-				pctDist    	0.320000
-				height     	7
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AEF130000E1"
-			    client     	@16
-			    supplier   	@15
-			    line_style 	0
-			    label      	(object SegLabel @20
-				Parent_View 	@18
-				location   	(471, 716)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..*"
-				pctDist    	0.794118
-				height     	58
-				orientation 	1)
-			    label      	(object SegLabel @21
-				Parent_View 	@18
-				location   	(636, 734)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	159
-				justify    	0
-				label      	"{ordered}"
-				pctDist    	0.900000
-				height     	108
-				orientation 	0))))))
-	(object ClassDiagram "Extensibility"
-	    quid       	"3AE73AA3032E"
-	    title      	"Extensibility"
-	    zoom       	100
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	0
-	    origin_y   	0
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::wsdl::ExtensibleElement" @22
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(400, 176)
-		    font       	(object Font
-			italics    	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@22
-			location   	(138, 42)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	524
-			justify    	0
-			label      	"ExtensibleElement")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5FCFA033A"
-		    width      	542
-		    height     	292
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::ExtensibilityElement" @23
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1344, 192)
-		    font       	(object Font
-			italics    	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@23
-			location   	(1115, 8)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	458
-			justify    	0
-			label      	"ExtensibilityElement")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5DBB602A9"
-		    width      	476
-		    height     	392
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "" @24
-		    location   	(888, 183)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD5FD130079"
-		    roleview_list 	(list RoleViews
-			(object RoleView "" @25
-			    Parent_View 	@24
-			    location   	(536, 23)
-			    label      	(object SegLabel @26
-				Parent_View 	@25
-				location   	(714, 222)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	450
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5FD14019E"
-			    client     	@24
-			    supplier   	@22
-			    line_style 	0
-			    label      	(object SegLabel @27
-				Parent_View 	@25
-				location   	(694, 233)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.900000
-				height     	54
-				orientation 	0))
-			(object RoleView "eExtensibilityElements" @28
-			    Parent_View 	@24
-			    location   	(536, 23)
-			    label      	(object SegLabel @29
-				Parent_View 	@28
-				location   	(996, 225)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	457
-				justify    	0
-				label      	"+eExtensibilityElements"
-				pctDist    	0.501538
-				height     	41
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5FD14019D"
-			    client     	@24
-			    supplier   	@23
-			    line_style 	0
-			    label      	(object SegLabel @30
-				Parent_View 	@28
-				location   	(1069, 132)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..n"
-				pctDist    	0.829630
-				height     	54
-				orientation 	0))))
-		(object ClassView "Class" "Logical View::mime::MIMEMimeXml" @31
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1504, 784)
-		    label      	(object ItemLabel
-			Parent_View 	@31
-			location   	(1349, 733)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	310
-			justify    	0
-			label      	"MIMEMimeXml")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AC9145A01FF"
-		    width      	328
-		    height     	126
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::mime::MIMEMultipartRelated" @32
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1248, 608)
-		    label      	(object ItemLabel
-			Parent_View 	@32
-			location   	(1032, 557)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	432
-			justify    	0
-			label      	"MIMEMultipartRelated")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AC913FA025B"
-		    width      	450
-		    height     	126
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::mime::MIMEPart" @33
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(400, 752)
-		    label      	(object ItemLabel
-			Parent_View 	@33
-			location   	(295, 700)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	210
-			justify    	0
-			label      	"MIMEPart")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AC913EE00EB"
-		    width      	228
-		    height     	128
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @34
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AEF11400259"
-		    client     	@33
-		    supplier   	@22
-		    line_style 	0)
-		(object ClassView "Class" "Logical View::mime::MIMEContent" @35
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1728, 976)
-		    label      	(object ItemLabel
-			Parent_View 	@35
-			location   	(1587, 924)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	282
-			justify    	0
-			label      	"MIMEContent")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AC9135B03A7"
-		    width      	300
-		    height     	128
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritTreeView "" @36
-		    location   	(1344, 549)
-		    line_color 	3342489
-		    fill_color 	13434879
-		    supplier   	@23
-		    vertices   	(list Points
-			(1344, 549)
-			(1344, 388)))
-		(object InheritView "" @37
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AEF11DD038B"
-		    client     	@31
-		    supplier   	@23
-		    line_style 	3
-		    origin_attachment 	(1541, 721)
-		    terminal_attachment 	(1541, 549)
-		    drawSupplier 	@36)
-		(object InheritView "" @38
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AEF11D50330"
-		    client     	@32
-		    supplier   	@23
-		    line_style 	3
-		    origin_attachment 	(1347, 545)
-		    terminal_attachment 	(1347, 549)
-		    drawSupplier 	@36)
-		(object InheritView "" @39
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AEF11CA038E"
-		    client     	@35
-		    supplier   	@23
-		    line_style 	3
-		    origin_attachment 	(1722, 912)
-		    terminal_attachment 	(1722, 549)
-		    drawSupplier 	@36)))))
diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/model/mime.ecore b/bundles/org.eclipse.wst.wsdl/src-mime/model/mime.ecore
deleted file mode 100644
index 697bfa598..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/model/mime.ecore
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="mime"
-    nsURI="http://www.ibm.com/wsdl/2003/MIME" nsPrefix="mime">
-  <eClassifiers xsi:type="ecore:EClass" name="MIMEContent" eSuperTypes="wsdl.ecore#//ExtensibilityElement #//IMIMEContent">
-    <eOperations name="setPart">
-      <eParameters name="part" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="getPart" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="ePart" eType="ecore:EClass wsdl.ecore#//Part"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MIMEPart" eSuperTypes="wsdl.ecore#//ExtensibilityElement #//IMIMEPart">
-    <eOperations name="addExtensibilityElement">
-      <eParameters name="extensibilityElement" eType="ecore:EClass wsdl.ecore#//IExtensibilityElement"/>
-    </eOperations>
-    <eOperations name="getExtensibilityElements" eType="#//List"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MIMEMultipartRelated" eSuperTypes="wsdl.ecore#//ExtensibilityElement #//IMIMEMultipartRelated">
-    <eOperations name="addMIMEPart">
-      <eParameters name="mimePart" eType="#//IMIMEPart"/>
-    </eOperations>
-    <eOperations name="getMIMEParts" eType="#//List"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eMIMEPart" upperBound="-1"
-        eType="#//MIMEPart" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MIMEMimeXml" eSuperTypes="wsdl.ecore#//ExtensibilityElement #//IMIMEMimeXml">
-    <eOperations name="setPart">
-      <eParameters name="part" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="getPart" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="ePart" eType="ecore:EClass wsdl.ecore#//Part"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IMIMEPart" instanceClassName="javax.wsdl.extensions.mime.MIMEPart"
-      abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="IMIMEMultipartRelated" instanceClassName="javax.wsdl.extensions.mime.MIMEMultipartRelated"
-      abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="IMIMEContent" instanceClassName="javax.wsdl.extensions.mime.MIMEContent"
-      abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="IMIMEMimeXml" instanceClassName="javax.wsdl.extensions.mime.MIMEMimeXml"
-      abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EDataType" name="List" instanceClassName="java.util.List"/>
-</ecore:EPackage>
diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/model/mime.mdl b/bundles/org.eclipse.wst.wsdl/src-mime/model/mime.mdl
deleted file mode 100644
index 5c76a50f2..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/model/mime.mdl
+++ /dev/null
@@ -1,32998 +0,0 @@
-
-(object Petal
-    version    	42
-    _written   	"Rose 4.5.8054a"
-    charSet    	0)
-
-(object Design "Logical View"
-    is_unit    	TRUE
-    is_loaded  	TRUE
-    defaults   	(object defaults
-	rightMargin 	0.250000
-	leftMargin 	0.250000
-	topMargin  	0.250000
-	bottomMargin 	0.500000
-	pageOverlap 	0.250000
-	clipIconLabels 	TRUE
-	autoResize 	TRUE
-	snapToGrid 	TRUE
-	gridX      	16
-	gridY      	16
-	defaultFont 	(object Font
-	    size       	10
-	    face       	"Arial"
-	    bold       	FALSE
-	    italics    	FALSE
-	    underline  	FALSE
-	    strike     	FALSE
-	    color      	0
-	    default_color 	TRUE)
-	showMessageNum 	1
-	showClassOfObject 	TRUE
-	notation   	"Unified")
-    root_usecase_package 	(object Class_Category "Use Case View"
-	quid       	"3AC91051031E"
-	exportControl 	"Public"
-	global     	TRUE
-	logical_models 	(list unit_reference_list)
-	logical_presentations 	(list unit_reference_list
-	    (object UseCaseDiagram "Main"
-		quid       	"3AC91052001B"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    root_category 	(object Class_Category "Logical View"
-	quid       	"3AC91051031D"
-	exportControl 	"Public"
-	global     	TRUE
-	subsystem  	"Component View"
-	quidu      	"3AC91051031F"
-	logical_models 	(list unit_reference_list
-	    (object Class_Category "mime"
-		quid       	"3AC9127C0266"
-		exportControl 	"Public"
-		logical_models 	(list unit_reference_list
-		    (object Class "MIMEContent"
-			quid       	"3AC9135B03A7"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AEF11CA038E"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9")
-			    (object Inheritance_Relationship
-				quid       	"40A106A30168"
-				supplier   	"Logical View::mime::IMIMEContent"
-				quidu      	"40A105E001CC"))
-			operations 	(list Operations
-			    (object Operation "setPart"
-				quid       	"40A1066F0023"
-				parameters 	(list Parameters
-				    (object Parameter "part"
-					type       	"String"))
-				result     	"void"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPart"
-				quid       	"40A1067D02CC"
-				result     	"String"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "type"
-				quid       	"3AC91971036B"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "MIMEPart"
-			quid       	"3AC913EE00EB"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"40A0FDEF0322"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9")
-			    (object Inheritance_Relationship
-				quid       	"40A102CD0175"
-				supplier   	"Logical View::mime::IMIMEPart"
-				quidu      	"40A1025D01A6"))
-			operations 	(list Operations
-			    (object Operation "addExtensibilityElement"
-				quid       	"40A1046401A2"
-				parameters 	(list Parameters
-				    (object Parameter "extensibilityElement"
-					type       	"IExtensibilityElement"))
-				result     	"void"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getExtensibilityElements"
-				quid       	"40A10484027B"
-				result     	"List"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			language   	"Java")
-		    (object Class "MIMEMultipartRelated"
-			quid       	"3AC913FA025B"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AEF11D50330"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9")
-			    (object Inheritance_Relationship
-				quid       	"40A103AD031C"
-				supplier   	"Logical View::mime::IMIMEMultipartRelated"
-				quidu      	"40A1033B00DD"))
-			operations 	(list Operations
-			    (object Operation "addMIMEPart"
-				quid       	"40A103F60172"
-				parameters 	(list Parameters
-				    (object Parameter "mimePart"
-					type       	"IMIMEPart"))
-				result     	"void"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getMIMEParts"
-				quid       	"40A10403038D"
-				result     	"List"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			language   	"Java")
-		    (object Class "MIMEMimeXml"
-			quid       	"3AC9145A01FF"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AEF11DD038B"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9")
-			    (object Inheritance_Relationship
-				quid       	"40A10747034E"
-				supplier   	"Logical View::mime::IMIMEMimeXml"
-				quidu      	"40A106EF008B"))
-			operations 	(list Operations
-			    (object Operation "setPart"
-				quid       	"40A106D401EB"
-				parameters 	(list Parameters
-				    (object Parameter "part"
-					type       	"String"))
-				result     	"void"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPart"
-				quid       	"40A106E10095"
-				result     	"String"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			language   	"Java")
-		    (object Class "IMIMEPart"
-			quid       	"40A1025D01A6"
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.extensions.mime.MIMEPart"
-				quid       	"40A1029D03D9"
-				stereotype 	"javaclass"))
-			language   	"Java")
-		    (object Class "IMIMEMultipartRelated"
-			quid       	"40A1033B00DD"
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.extensions.mime.MIMEMultipartRelated"
-				quid       	"40A10378018F"
-				stereotype 	"javaclass"))
-			language   	"Java")
-		    (object Class "IMIMEContent"
-			quid       	"40A105E001CC"
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.extensions.mime.MIMEContent"
-				quid       	"40A105F50226"
-				stereotype 	"javaclass"))
-			language   	"Java")
-		    (object Class "IMIMEMimeXml"
-			quid       	"40A106EF008B"
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.extensions.mime.MIMEMimeXml"
-				quid       	"40A1071E03B4"
-				stereotype 	"javaclass"))
-			language   	"Java")
-		    (object Class "List"
-			quid       	"40A10BFA0109"
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "java.util.List"
-				quid       	"40A10C0902A6"
-				stereotype 	"javaclass"))
-			language   	"Java")
-		    (object Association "$UNNAMED$0"
-			quid       	"3AE73B3C0356"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$1"
-				quid       	"3AE73B3D0090"
-				supplier   	"Logical View::mime::MIMEContent"
-				quidu      	"3AC9135B03A7")
-			    (object Role "ePart"
-				quid       	"3AE73B3D009A"
-				label      	"ePart"
-				supplier   	"Logical View::wsdl::Part"
-				quidu      	"3AD5CE1C032E"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$2"
-			quid       	"3AE73BB900D5"
-			roles      	(list role_list
-			    (object Role "ePart"
-				quid       	"3AE73BB903CE"
-				label      	"ePart"
-				supplier   	"Logical View::wsdl::Part"
-				quidu      	"3AD5CE1C032E"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$3"
-				quid       	"3AE73BB903E2"
-				supplier   	"Logical View::mime::MIMEMimeXml"
-				quidu      	"3AC9145A01FF")))
-		    (object Association "$UNNAMED$4"
-			quid       	"3AEF12FE0387"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$5"
-				quid       	"3AEF130000D7"
-				supplier   	"Logical View::mime::MIMEMultipartRelated"
-				quidu      	"3AC913FA025B"
-				is_aggregate 	TRUE)
-			    (object Role "eMIMEPart"
-				quid       	"3AEF130000E1"
-				label      	"eMIMEPart"
-				supplier   	"Logical View::mime::MIMEPart"
-				quidu      	"3AC913EE00EB"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE))))
-		logical_presentations 	(list unit_reference_list
-		    (object ClassDiagram "Bindings"
-			quid       	"3AC9128B01F9"
-			title      	"Bindings"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::mime::MIMEContent" @1
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1632, 848)
-				label      	(object ItemLabel
-				    Parent_View 	@1
-				    location   	(1490, 717)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	284
-				    justify    	0
-				    label      	"MIMEContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AC9135B03A7"
-				compartment 	(object Compartment
-				    Parent_View 	@1
-				    location   	(1490, 777)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	272)
-				width      	302
-				height     	286
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Part" @2
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1632, 1200)
-				label      	(object ItemLabel
-				    Parent_View 	@2
-				    location   	(1551, 1150)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	162
-				    justify    	0
-				    label      	"Part")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5CE1C032E"
-				height     	124
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$0" @3
-				location   	(1632, 1064)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AE73B3C0356"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$1" @4
-					Parent_View 	@3
-					location   	(-416, -168)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AE73B3D0090"
-					client     	@3
-					supplier   	@1
-					line_style 	0)
-				    (object RoleView "ePart" @5
-					Parent_View 	@3
-					location   	(-416, -168)
-					label      	(object SegLabel @6
-					    Parent_View 	@5
-					    location   	(1515, 1102)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	120
-					    justify    	0
-					    label      	"+ePart"
-					    pctDist    	0.539326
-					    height     	118
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AE73B3D009A"
-					client     	@3
-					supplier   	@2
-					line_style 	0
-					label      	(object SegLabel @7
-					    Parent_View 	@5
-					    location   	(1681, 1097)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.449103
-					    height     	49
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::mime::MIMEMimeXml" @8
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1632, 1504)
-				label      	(object ItemLabel
-				    Parent_View 	@8
-				    location   	(1478, 1398)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	308
-				    justify    	0
-				    label      	"MIMEMimeXml")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AC9145A01FF"
-				compartment 	(object Compartment
-				    Parent_View 	@8
-				    location   	(1478, 1458)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	206)
-				width      	326
-				height     	236
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$2" @9
-				location   	(1632, 1323)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AE73BB900D5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "ePart" @10
-					Parent_View 	@9
-					location   	(144, -325)
-					label      	(object SegLabel @11
-					    Parent_View 	@10
-					    location   	(1506, 1293)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	120
-					    justify    	0
-					    label      	"+ePart"
-					    pctDist    	0.489583
-					    height     	127
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AE73BB903CE"
-					client     	@9
-					supplier   	@2
-					line_style 	0
-					label      	(object SegLabel @12
-					    Parent_View 	@10
-					    location   	(1708, 1284)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.652270
-					    height     	76
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$3" @13
-					Parent_View 	@9
-					location   	(144, -325)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AE73BB903E2"
-					client     	@9
-					supplier   	@8
-					line_style 	0)))
-			    (object ClassView "Class" "Logical View::mime::MIMEMultipartRelated" @14
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(560, 592)
-				label      	(object ItemLabel
-				    Parent_View 	@14
-				    location   	(341, 486)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	438
-				    justify    	0
-				    label      	"MIMEMultipartRelated")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AC913FA025B"
-				compartment 	(object Compartment
-				    Parent_View 	@14
-				    location   	(341, 546)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	334)
-				width      	456
-				height     	236
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::mime::MIMEPart" @15
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(560, 1040)
-				label      	(object ItemLabel
-				    Parent_View 	@15
-				    location   	(296, 934)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	528
-				    justify    	0
-				    label      	"MIMEPart")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AC913EE00EB"
-				compartment 	(object Compartment
-				    Parent_View 	@15
-				    location   	(296, 994)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	525)
-				width      	546
-				height     	236
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$4" @16
-				location   	(560, 815)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AEF12FE0387"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$5" @17
-					Parent_View 	@16
-					location   	(32, 111)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AEF130000D7"
-					client     	@16
-					supplier   	@14
-					line_style 	0)
-				    (object RoleView "eMIMEPart" @18
-					Parent_View 	@16
-					location   	(32, 111)
-					label      	(object SegLabel @19
-					    Parent_View 	@18
-					    location   	(744, 890)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	228
-					    justify    	0
-					    label      	"+eMIMEPart"
-					    pctDist    	0.709402
-					    height     	184
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AEF130000E1"
-					client     	@16
-					supplier   	@15
-					line_style 	0
-					label      	(object SegLabel @20
-					    Parent_View 	@18
-					    location   	(503, 898)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.794118
-					    height     	58
-					    orientation 	1)
-					label      	(object SegLabel @21
-					    Parent_View 	@18
-					    location   	(364, 890)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	159
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.709402
-					    height     	197
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::mime::IMIMEPart" @22
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(720, 1456)
-				label      	(object ItemLabel
-				    Parent_View 	@22
-				    location   	(205, 1422)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1030
-				    justify    	0
-				    label      	"IMIMEPart")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@22
-				    location   	(205, 1372)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	1030
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"40A1025D01A6"
-				compartment 	(object Compartment
-				    Parent_View 	@22
-				    location   	(205, 1482)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	1
-				    max_width  	1028)
-				width      	1048
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @23
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"40A102CD0175"
-				client     	@15
-				supplier   	@22
-				line_style 	0)
-			    (object ClassView "Class" "Logical View::mime::IMIMEMultipartRelated" @24
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(768, 176)
-				label      	(object ItemLabel
-				    Parent_View 	@24
-				    location   	(143, 142)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1250
-				    justify    	0
-				    label      	"IMIMEMultipartRelated")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@24
-				    location   	(143, 92)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	1250
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"40A1033B00DD"
-				compartment 	(object Compartment
-				    Parent_View 	@24
-				    location   	(143, 202)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	1
-				    max_width  	1247)
-				width      	1268
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @25
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"40A103AD031C"
-				client     	@14
-				supplier   	@24
-				line_style 	0)
-			    (object ClassView "Class" "Logical View::mime::IMIMEContent" @26
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1632, 432)
-				label      	(object ItemLabel
-				    Parent_View 	@26
-				    location   	(1084, 398)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1096
-				    justify    	0
-				    label      	"IMIMEContent")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@26
-				    location   	(1084, 348)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	1096
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"40A105E001CC"
-				compartment 	(object Compartment
-				    Parent_View 	@26
-				    location   	(1084, 458)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	1
-				    max_width  	1094)
-				width      	1114
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @27
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"40A106A30168"
-				client     	@1
-				supplier   	@26
-				line_style 	0)
-			    (object ClassView "Class" "Logical View::mime::IMIMEMimeXml" @28
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1616, 1904)
-				label      	(object ItemLabel
-				    Parent_View 	@28
-				    location   	(1055, 1870)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1122
-				    justify    	0
-				    label      	"IMIMEMimeXml")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@28
-				    location   	(1055, 1820)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	1122
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"40A106EF008B"
-				compartment 	(object Compartment
-				    Parent_View 	@28
-				    location   	(1055, 1930)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	1
-				    max_width  	1119)
-				width      	1140
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @29
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"40A10747034E"
-				client     	@8
-				supplier   	@28
-				line_style 	0)
-			    (object ClassView "Class" "Logical View::mime::List" @30
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(448, 1760)
-				label      	(object ItemLabel
-				    Parent_View 	@30
-				    location   	(176, 1701)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	544
-				    justify    	0
-				    label      	"List")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@30
-				    location   	(176, 1651)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	544
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"40A10BFA0109"
-				compartment 	(object Compartment
-				    Parent_View 	@30
-				    location   	(176, 1761)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	541)
-				width      	562
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)))
-		    (object ClassDiagram "Extensibility"
-			quid       	"3AE73AA3032E"
-			title      	"Extensibility"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::ExtensibilityElement" @31
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(976, 192)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@31
-				    location   	(747, 87)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	458
-				    justify    	0
-				    label      	"ExtensibilityElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5DBB602A9"
-				compartment 	(object Compartment
-				    Parent_View 	@31
-				    location   	(747, 195)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	456)
-				width      	476
-				height     	234
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::mime::MIMEMimeXml" @32
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1328, 752)
-				label      	(object ItemLabel
-				    Parent_View 	@32
-				    location   	(1174, 646)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	308
-				    justify    	0
-				    label      	"MIMEMimeXml")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AC9145A01FF"
-				compartment 	(object Compartment
-				    Parent_View 	@32
-				    location   	(1174, 706)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	206)
-				width      	326
-				height     	236
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::mime::MIMEMultipartRelated" @33
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(752, 1136)
-				label      	(object ItemLabel
-				    Parent_View 	@33
-				    location   	(533, 1030)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	438
-				    justify    	0
-				    label      	"MIMEMultipartRelated")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AC913FA025B"
-				compartment 	(object Compartment
-				    Parent_View 	@33
-				    location   	(533, 1090)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	334)
-				width      	456
-				height     	236
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::mime::MIMEPart" @34
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 768)
-				label      	(object ItemLabel
-				    Parent_View 	@34
-				    location   	(40, 662)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	528
-				    justify    	0
-				    label      	"MIMEPart")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AC913EE00EB"
-				compartment 	(object Compartment
-				    Parent_View 	@34
-				    location   	(40, 722)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	525)
-				width      	546
-				height     	236
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::mime::MIMEContent" @35
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1792, 752)
-				label      	(object ItemLabel
-				    Parent_View 	@35
-				    location   	(1650, 646)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	284
-				    justify    	0
-				    label      	"MIMEContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AC9135B03A7"
-				compartment 	(object Compartment
-				    Parent_View 	@35
-				    location   	(1650, 706)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	206)
-				width      	302
-				height     	236
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @36
-				location   	(976, 526)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@31
-				vertices   	(list Points
-				    (976, 526)
-				    (976, 309)))
-			    (object InheritView "" @37
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AEF11DD038B"
-				client     	@32
-				supplier   	@31
-				line_style 	3
-				origin_attachment 	(1356, 634)
-				terminal_attachment 	(1356, 526)
-				drawSupplier 	@36)
-			    (object InheritView "" @38
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AEF11D50330"
-				client     	@33
-				supplier   	@31
-				line_style 	3
-				origin_attachment 	(844, 1018)
-				terminal_attachment 	(844, 526)
-				drawSupplier 	@36)
-			    (object InheritView "" @39
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AEF11CA038E"
-				client     	@35
-				supplier   	@31
-				line_style 	3
-				origin_attachment 	(1778, 634)
-				terminal_attachment 	(1778, 526)
-				drawSupplier 	@36)
-			    (object InheritView "" @40
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"40A0FDEF0322"
-				client     	@34
-				supplier   	@31
-				line_style 	3
-				origin_attachment 	(256, 650)
-				terminal_attachment 	(256, 526)
-				drawSupplier 	@36)))))
-	    (object Class_Category "wsdl"
-		quid       	"3ADFB8E5021E"
-		documentation 	
-|The WSDL model contains classes for the Web Services Description Language (WSDL).
-|
-|WSDL describes network services as sets of endpoints operating on messages. The operations and messages are described abstractly, and then bound to a concrete network protocol and message format to define an endpoint.
-|
-|WSDL describes the formats of the messages exchanged by the services, and supports the XML Schemas specification as its canonical type system. This package uses an XML Schema Infoset model package (see the XSD package) to describe the abstract message formats.
-|
-|The model contains the following diagrams, named after the corresponding chapters in the WSDL 1.1 specification (http://www.w3.org/TR/2001/NOTE-wsdl-20010315)
-|- 2.1 Definition, shows the WSDL definition element and the WSDL document structure
-|- 2.1.1 Naming and Linking, shows the namespace and import mechanism
-|- 2.1.3 Extensibility, shows the WSDL extensibility mechanism
-|- 2.2 Types, shows the use of XML Schema types in WSDL
-|- 2.3 Messages, 2.4 PortTypes, 2.5 Bindings and 2.7 Services, show the major WSDL elements and their relations.
-|
-|The WSDL classes extend the javax.wsdl interfaces defined by JSR 110. Classes with interface and datatype stereotypes are used to represent these non-MOF interfaces.
-		
-		exportControl 	"Public"
-		logical_models 	(list unit_reference_list
-		    (object Class "WSDLElement"
-			quid       	"3AD5C6A302DD"
-			documentation 	"This class represents a WSDL language element."
-			operations 	(list Operations
-			    (object Operation "getEnclosingDefinition"
-				quid       	"3CD1529600C8"
-				result     	"Definition"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setEnclosingDefinition"
-				quid       	"3CD152B80347"
-				parameters 	(list Parameters
-				    (object Parameter "definition"
-					type       	"Definition"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "documentationElement"
-				quid       	"3CCE443602A3"
-				type       	"DOMElement")
-			    (object ClassAttribute "element"
-				quid       	"3F97DBD30207"
-				type       	"DOMElement"))
-			language   	"Java"
-			abstract   	TRUE)
-		    (object Class "PortType"
-			quid       	"3AD5C7F001A5"
-			documentation 	"This class represents a WSDL portType element of the WSDL specification version 1.1 and an Interface component of the WSDL specification version 1.2. A port type or Interface is a named set of abstract operations and the abstract messages involved."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5C9B70150"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3F6F1FD8019F"
-				supplier   	"Logical View::wsdl::IPortType"
-				quidu      	"3B84A5BE0331"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "qName"
-				quid       	"3AEB488E0023"
-				type       	"QName")
-			    (object ClassAttribute "undefined"
-				quid       	"3BDDF1E301E5"
-				type       	"boolean")
-			    (object ClassAttribute "proxy"
-				quid       	"3D18CDEB0316"
-				type       	"boolean")
-			    (object ClassAttribute "resourceURI"
-				quid       	"3D18D4FD01BA"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "Operation"
-			quid       	"3AD5C80D03CE"
-			documentation 	"This class represents a WSDL operation element. A WSDL operation is an abstract description of an action supported by a service."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AE9DE98003C"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3F6F1FE20171"
-				supplier   	"Logical View::wsdl::IOperation"
-				quidu      	"3B84A77600D1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "style"
-				quid       	"3AEB472601AC"
-				type       	"OperationType")
-			    (object ClassAttribute "name"
-				quid       	"3BDD9643004C"
-				type       	"String")
-			    (object ClassAttribute "undefined"
-				quid       	"3BDDF235003E"
-				type       	"boolean")
-			    (object ClassAttribute "proxy"
-				quid       	"3D18CE2201AD"
-				type       	"boolean")
-			    (object ClassAttribute "resourceURI"
-				quid       	"3D18D520011B"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "Message"
-			quid       	"3AD5C9590078"
-			documentation 	"This class represents a WSDL message element. A WSDL message is an abstract, typed definition of the data being communicated."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5D05501C4"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3B84A8D102BA"
-				supplier   	"Logical View::wsdl::IMessage"
-				quidu      	"3B84A8AF004F"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "qName"
-				quid       	"3AEB487C01FE"
-				type       	"QName")
-			    (object ClassAttribute "undefined"
-				quid       	"3BDDF1D20226"
-				type       	"boolean")
-			    (object ClassAttribute "proxy"
-				quid       	"3D18CE4B02B0"
-				type       	"boolean")
-			    (object ClassAttribute "resourceURI"
-				quid       	"3D18D54200F1"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "Part"
-			quid       	"3AD5CE1C032E"
-			documentation 	"This class represents a WSDL part element. Parts describe the logical abstract content of a message. Each part is associated with a type from some type system. "
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B84A96D02F1"
-				supplier   	"Logical View::wsdl::IPart"
-				quidu      	"3B84A93F01BE")
-			    (object Inheritance_Relationship
-				quid       	"3B897E230237"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3BCE70B703C8"
-				type       	"String")
-			    (object ClassAttribute "elementName"
-				quid       	"3B84B08703DB"
-				type       	"QName")
-			    (object ClassAttribute "typeName"
-				quid       	"3BCE70C303C5"
-				type       	"QName"))
-			language   	"Java")
-		    (object Class "Binding"
-			quid       	"3AD5D2860261"
-			documentation 	"This class represents a WSDL binding element. A binding defines message format and protocol details for operations and messages defined by a particular portType. There may be any number of bindings for a given portType."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5FA0F02F0"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3B8595410129"
-				supplier   	"Logical View::wsdl::IBinding"
-				quidu      	"3B84ABC60219"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "qName"
-				quid       	"3AEB4899014B"
-				type       	"QName")
-			    (object ClassAttribute "undefined"
-				quid       	"3BDDF1F401A3"
-				type       	"boolean")
-			    (object ClassAttribute "proxy"
-				quid       	"3D18CE6D0151"
-				type       	"boolean")
-			    (object ClassAttribute "resourceURI"
-				quid       	"3D18D4DF035C"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "BindingOperation"
-			quid       	"3AD5D3CB0145"
-			documentation 	"This class represents a WSDL operation element within a binding. An operation element within a binding specifies binding information for the operation with the same name within the binding's portType. "
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD6009202F7"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3B84ADE401DC"
-				supplier   	"Logical View::wsdl::IBindingOperation"
-				quidu      	"3B84ADC00072"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3B89C4CB0199"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "Service"
-			quid       	"3AD5D8F002F8"
-			documentation 	"This class represents a WSDL service element. A service groups a set of related ports together."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5FA20025E"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3B85954E01B4"
-				supplier   	"Logical View::wsdl::IService"
-				quidu      	"3B84AB490287"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "qName"
-				quid       	"3AEB48A40151"
-				type       	"QName")
-			    (object ClassAttribute "undefined"
-				quid       	"3BDDF20D0203"
-				type       	"boolean")
-			    (object ClassAttribute "proxy"
-				quid       	"3D18D4810220"
-				type       	"boolean")
-			    (object ClassAttribute "resourceURI"
-				quid       	"3D18D4C501E2"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "Port"
-			quid       	"3AD5D9170286"
-			documentation 	"This class represents a WSDL port element. A port defines an individual endpoint by specifying a single address for a binding"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD600CB00AA"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3B85954502C9"
-				supplier   	"Logical View::wsdl::IPort"
-				quidu      	"3B84AB800326"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3AD5D9A00391"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "ExtensibilityElement"
-			quid       	"3AD5DBB602A9"
-			documentation 	"This class represents a WSDL extensibility element. WSDL allows extensibility elements representing a specific technology under various elements defined by WSDL."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B84B14903D0"
-				supplier   	"Logical View::wsdl::IExtensibilityElement"
-				quidu      	"3B84B12402AB")
-			    (object Inheritance_Relationship
-				quid       	"3BDDF53502C3"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "required"
-				quid       	"3AF9543C0073"
-				type       	"boolean")
-			    (object ClassAttribute "elementType"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3B85B21A0271"
-				type       	"QName"))
-			language   	"Java")
-		    (object Class "Definition"
-			quid       	"3AD5E43F008E"
-			documentation 	"This class represents a WSDL definitions element. The WSDL definitions element is the root element of a WSDL document."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5FDB803D4"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3B84B1F80382"
-				supplier   	"Logical View::wsdl::IDefinition"
-				quidu      	"3B84B1D90142"))
-			operations 	(list Operations
-			    (object Operation "getDocument"
-				quid       	"3CD14FC2012B"
-				result     	"DOMDocument"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setDocument"
-				quid       	"3CD150DE01E7"
-				parameters 	(list Parameters
-				    (object Parameter "document"
-					type       	"DOMDocument"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "targetNamespace"
-				quid       	"3AD5E474004E"
-				type       	"String")
-			    (object ClassAttribute "location"
-				quid       	"40352B7C0396"
-				type       	"String")
-			    (object ClassAttribute "qName"
-				quid       	"3AEB485702F5"
-				type       	"QName")
-			    (object ClassAttribute "encoding"
-				quid       	"3CADD00D000D"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "Import"
-			quid       	"3AD5E4F903DE"
-			documentation 	"This class represents WSDL import element. WSDL allows associating a namespace with a document location using an import element."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5EE58037A"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3F6F200D0340"
-				supplier   	"Logical View::wsdl::IImport"
-				quidu      	"3B84B2020119"))
-			operations 	(list Operations
-			    (object Operation "getSchema"
-				quid       	"3C8672C10379"
-				result     	"XSDSchema"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setSchema"
-				quid       	"3C8672C10397"
-				parameters 	(list Parameters
-				    (object Parameter "schema"
-					type       	"XSDSchema"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "namespaceURI"
-				quid       	"3AD5E50A0036"
-				type       	"String")
-			    (object ClassAttribute "locationURI"
-				quid       	"3AD5E5140211"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "ExtensibleElement"
-			quid       	"3AD5FCFA033A"
-			documentation 	" WSDL allows elements representing a specific technology (referred to here as extensibility elements) under various elements defined by WSDL. This class represents a WSDL point of extensibility."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5FE3C03D4"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD"))
-			operations 	(list Operations
-			    (object Operation "getExtensibilityElements"
-				quid       	"3B85C12C03CD"
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "addExtensibilityElement"
-				quid       	"3B85C1470295"
-				parameters 	(list Parameters
-				    (object Parameter "extElement"
-					type       	"IExtensibilityElement"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			language   	"Java"
-			abstract   	TRUE)
-		    (object Class "Input"
-			quid       	"3AE0789F0059"
-			documentation 	"This class represents a WSDL input element. An input element specifies the abstract message format for the input of the operation."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B85C504025F"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3F67722802E7"
-				supplier   	"Logical View::wsdl::MessageReference"
-				quidu      	"3F6771DB02DC")
-			    (object Inheritance_Relationship
-				quid       	"3F6F1FEE031D"
-				supplier   	"Logical View::wsdl::IInput"
-				quidu      	"3B84A7EE0015"))
-			language   	"Java")
-		    (object Class "Output"
-			quid       	"3AE078B60232"
-			documentation 	"This class represents a WSDL output element. An output element specifies the abstract message format for the output of the operation."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B85C50C035B"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3F67723500DD"
-				supplier   	"Logical View::wsdl::MessageReference"
-				quidu      	"3F6771DB02DC")
-			    (object Inheritance_Relationship
-				quid       	"3F6F1FF801CD"
-				supplier   	"Logical View::wsdl::IOutput"
-				quidu      	"3B84A829027D"))
-			language   	"Java")
-		    (object Class "Fault"
-			quid       	"3AE078BE0108"
-			documentation 	"This class represents a WSDL fault element. Fault elements specify the abstract message format for any error messages that may be output as the result of the operation "
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AE1C82002F2"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3F67723D0319"
-				supplier   	"Logical View::wsdl::MessageReference"
-				quidu      	"3F6771DB02DC")
-			    (object Inheritance_Relationship
-				quid       	"3F6F2002002D"
-				supplier   	"Logical View::wsdl::IFault"
-				quidu      	"3B84A861031D"))
-			language   	"Java")
-		    (object Class "BindingInput"
-			quid       	"3AE08A8202D4"
-			documentation 	"This class represents a WSDL input element within a operation within a binding. An input element within an operation within a binding specifies binding information for the input of the operation. "
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B84AE1B0113"
-				supplier   	"Logical View::wsdl::IBindingInput"
-				quidu      	"3B84ADEB0100")
-			    (object Inheritance_Relationship
-				quid       	"3B85B59B0072"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A"))
-			operations 	(list Operations
-			    (object Operation "getInput"
-				quid       	"3C8653A40203"
-				result     	"IInput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setInput"
-				quid       	"3C8653B503A2"
-				parameters 	(list Parameters
-				    (object Parameter "input"
-					type       	"IInput"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3B85C1EA020E"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "BindingOutput"
-			quid       	"3AE08A8F028C"
-			documentation 	"This class represents a WSDL output element within a operation within a binding. An output element within an operation within a binding specifies binding information for the output of the operation. "
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B84AE4302AB"
-				supplier   	"Logical View::wsdl::IBindingOutput"
-				quidu      	"3B84AE210111")
-			    (object Inheritance_Relationship
-				quid       	"3B85B5A4027E"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A"))
-			operations 	(list Operations
-			    (object Operation "getOutput"
-				quid       	"3C8653D900F1"
-				result     	"IOutput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setOutput"
-				quid       	"3C8653F10326"
-				parameters 	(list Parameters
-				    (object Parameter "output"
-					type       	"IOutput"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3B85C20200BE"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "BindingFault"
-			quid       	"3AE08A9E03A6"
-			documentation 	"This class represents a WSDL fault element within a operation within a binding. A fault element within an operation within a binding specifies binding information for the fault with the same name. "
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AE0938602C9"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3B84AE710333"
-				supplier   	"Logical View::wsdl::IBindingFault"
-				quidu      	"3B84AE4F00BD"))
-			operations 	(list Operations
-			    (object Operation "getFault"
-				quid       	"3C865413037F"
-				result     	"IFault"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setFault"
-				quid       	"3C8654210109"
-				parameters 	(list Parameters
-				    (object Parameter "fault"
-					type       	"IFault"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3B85BF9E014A"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "QName"
-			quid       	"3AE8ED220140"
-			documentation 	"This class represents the javax.wsdl.QName class. A QName is a fully qualified name."
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.xml.namespace.QName"
-				quid       	"3B849DA9003D"
-				stereotype 	"javaclass"))
-			language   	"Java")
-		    (object Class "Namespace"
-			quid       	"3AEA3CD30030"
-			documentation 	"This class represents a namespace and the corresponding namespace prefix used in a WSDL document."
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "URI"
-				quid       	"3AEA3D2901B1"
-				type       	"String")
-			    (object ClassAttribute "prefix"
-				quid       	"3AEA3D320236"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "OperationType"
-			quid       	"3AEB4782024F"
-			documentation 	
-|ONE_WAY=1
-|REQUEST_RESPONSE=2
-|SOLICIT_RESPONSE=3
-|NOTIFICATION=4
-			
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.OperationType"
-				quid       	"3B85C35303E3"
-				stereotype 	"javaclass"))
-			language   	"Java")
-		    (object Class "IPortType"
-			quid       	"3B84A5BE0331"
-			documentation 	"This class represents the javax.wsdl.PortType non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addOperation"
-				quid       	"3B896AC101CA"
-				parameters 	(list Parameters
-				    (object Parameter "operation"
-					type       	"IOperation"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getOperation"
-				quid       	"3B896BAF01A4"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"String")
-				    (object Parameter "inputName"
-					type       	"String")
-				    (object Parameter "outputName"
-					type       	"String"))
-				result     	"IOperation"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getOperations"
-				quid       	"3B896BF7031A"
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.PortType"
-				quid       	"3B84A632000D"
-				stereotype 	"javaclass")))
-		    (object Class "IOperation"
-			quid       	"3B84A77600D1"
-			documentation 	"This class represents the javax.wsdl.Operation non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addFault"
-				quid       	"3B896C420065"
-				parameters 	(list Parameters
-				    (object Parameter "fault"
-					type       	"IFault"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getFault"
-				quid       	"3B896C59028F"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"String"))
-				result     	"IFault"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getFaults"
-				quid       	"3B896C7102B1"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getParameterOrdering"
-				quid       	"3B896C8101B0"
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setParameterOrdering"
-				quid       	"3B896C99031D"
-				parameters 	(list Parameters
-				    (object Parameter "parameterOrder"
-					type       	"IList"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getInput"
-				quid       	"3C8654E5018D"
-				result     	"IInput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setInput"
-				quid       	"3C8662C40107"
-				parameters 	(list Parameters
-				    (object Parameter "input"
-					type       	"IInput"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getOutput"
-				quid       	"3C8662E40094"
-				result     	"IOutput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setOutput"
-				quid       	"3C8662F001D2"
-				parameters 	(list Parameters
-				    (object Parameter "output"
-					type       	"IOutput"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Operation"
-				quid       	"3B84A799012B"
-				stereotype 	"javaclass")))
-		    (object Class "IInput"
-			quid       	"3B84A7EE0015"
-			documentation 	"This class represents the javax.wsdl.Input non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "getMessage"
-				quid       	"3C86633100EF"
-				result     	"IMessage"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setMessage"
-				quid       	"3C8663470277"
-				parameters 	(list Parameters
-				    (object Parameter "message"
-					type       	"IMessage"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Input"
-				quid       	"3B84A8000039"
-				stereotype 	"javaclass")))
-		    (object Class "IOutput"
-			quid       	"3B84A829027D"
-			documentation 	"This class represents the javax.wsdl.Output non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "getMessage"
-				quid       	"3C86643A035D"
-				result     	"IMessage"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setMessage"
-				quid       	"3C86644501C8"
-				parameters 	(list Parameters
-				    (object Parameter "message"
-					type       	"IMessage"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Output"
-				quid       	"3B84A83901D5"
-				stereotype 	"javaclass")))
-		    (object Class "IFault"
-			quid       	"3B84A861031D"
-			documentation 	"This class represents the javax.wsdl.Fault non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "getMessage"
-				quid       	"3C86646A00BD"
-				result     	"IMessage"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setMessage"
-				quid       	"3C8664750131"
-				parameters 	(list Parameters
-				    (object Parameter "message"
-					type       	"IMessage"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Fault"
-				quid       	"3B84A8710208"
-				stereotype 	"javaclass")))
-		    (object Class "IMessage"
-			quid       	"3B84A8AF004F"
-			documentation 	"This class represents the javax.wsdl.Message non-MOF interface"
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addPart"
-				quid       	"3B8972240273"
-				parameters 	(list Parameters
-				    (object Parameter "part"
-					type       	"IPart"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPart"
-				quid       	"3B89723D0233"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"String"))
-				result     	"IPart"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getParts"
-				quid       	"3B897254025E"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getOrderedParts"
-				quid       	"3B897261020D"
-				parameters 	(list Parameters
-				    (object Parameter "partOrder"
-					type       	"IList"))
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Message"
-				quid       	"3B84A8BC0260"
-				stereotype 	"javaclass")))
-		    (object Class "IPart"
-			quid       	"3B84A93F01BE"
-			documentation 	"This class represents the javax.wsdl.Part non-MOF interface"
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "setExtensionAttribute"
-				quid       	"3C4688450052"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName")
-				    (object Parameter "value"
-					type       	"QName"))
-				exceptions 	"WSDLException"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getExtensionAttributeNames"
-				quid       	"3C468A0101C3"
-				result     	"IIterator"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getExtensionAttribute"
-				quid       	"3C468A2D02D5"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"QName"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Part"
-				quid       	"3B84A9500231"
-				stereotype 	"javaclass")))
-		    (object Class "IService"
-			quid       	"3B84AB490287"
-			documentation 	"This class represents the javax.wsdl.Service non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addPort"
-				quid       	"3B895D5601D1"
-				parameters 	(list Parameters
-				    (object Parameter "port"
-					type       	"IPort"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPorts"
-				quid       	"3B895DA20036"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPort"
-				quid       	"3B895DB001BC"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"String"))
-				result     	"IPort"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Service"
-				quid       	"3B84AB5B003E"
-				stereotype 	"javaclass")))
-		    (object Class "IPort"
-			quid       	"3B84AB800326"
-			documentation 	"This class represents the javax.wsdl.Port non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "getBinding"
-				quid       	"3C8651F302B5"
-				result     	"IBinding"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setBinding"
-				quid       	"3C86526302F2"
-				parameters 	(list Parameters
-				    (object Parameter "binding"
-					type       	"IBinding"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Port"
-				quid       	"3B84AB8C0016"
-				stereotype 	"javaclass")))
-		    (object Class "IBinding"
-			quid       	"3B84ABC60219"
-			documentation 	"This class represents the javax.wsdl.Binding non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addBindingOperation"
-				quid       	"3B895F160153"
-				parameters 	(list Parameters
-				    (object Parameter "bindingOperation"
-					type       	"IBindingOperation"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindingOperation"
-				quid       	"3B895F500066"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"String")
-				    (object Parameter "inputName"
-					type       	"String")
-				    (object Parameter "outputName"
-					type       	"String"))
-				result     	"IBindingOperation"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindingOperations"
-				quid       	"3B895FA401C5"
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPortType"
-				quid       	"3C8652A90284"
-				result     	"IPortType"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setPortType"
-				quid       	"3C8652BE01A8"
-				parameters 	(list Parameters
-				    (object Parameter "portType"
-					type       	"IPortType"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Binding"
-				quid       	"3B84ABCF0302"
-				stereotype 	"javaclass")))
-		    (object Class "IBindingOperation"
-			quid       	"3B84ADC00072"
-			documentation 	"This class represents the javax.wsdl.BindingOperation non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addBindingFault"
-				quid       	"3B8960BC0041"
-				parameters 	(list Parameters
-				    (object Parameter "bindingFault"
-					type       	"IBindingFault"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindingFault"
-				quid       	"3B8960D9009D"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"String"))
-				result     	"IBindingFault"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindingFaults"
-				quid       	"3B8960FC0061"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getOperation"
-				quid       	"3C86532D0017"
-				result     	"IOperation"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setOperation"
-				quid       	"3C86533F037B"
-				parameters 	(list Parameters
-				    (object Parameter "operation"
-					type       	"IOperation"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindingInput"
-				quid       	"3C86550900DA"
-				result     	"IBindingInput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setBindingInput"
-				quid       	"3C86551D007F"
-				parameters 	(list Parameters
-				    (object Parameter "bindingInput"
-					type       	"IBindingInput"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindingOutput"
-				quid       	"3C8655340349"
-				result     	"IBindingOutput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setBindingOutput"
-				quid       	"3C86554702A6"
-				parameters 	(list Parameters
-				    (object Parameter "bindingOutput"
-					type       	"IBindingOutput"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.BindingOperation"
-				quid       	"3B84ADCB021C"
-				stereotype 	"javaclass")))
-		    (object Class "IBindingInput"
-			quid       	"3B84ADEB0100"
-			documentation 	"This class represents the javax.wsdl.BindingInput non-MOF interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.BindingInput"
-				quid       	"3B84ADFE000D"
-				stereotype 	"javaclass")))
-		    (object Class "IBindingOutput"
-			quid       	"3B84AE210111"
-			documentation 	"This class represents the javax.wsdl.BindingOutput non-MOF interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.BindingOutput"
-				quid       	"3B84AE2D0050"
-				stereotype 	"javaclass")))
-		    (object Class "IBindingFault"
-			quid       	"3B84AE4F00BD"
-			documentation 	"This class represents the javax.wsdl.BindingFault non-MOF interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.BindingFault"
-				quid       	"3B84AE5F002A"
-				stereotype 	"javaclass")))
-		    (object Class "DOMElement"
-			quid       	"3B84AF3203DB"
-			documentation 	"This class represents the org.w3c.dom.Element non-MOF interface."
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "org.w3c.dom.Element"
-				quid       	"3B84AF560292"
-				stereotype 	"javaclass")))
-		    (object Class "IExtensibilityElement"
-			quid       	"3B84B12402AB"
-			documentation 	"This class represents the javax.wsdl.ExtensibilityElement non-MOF interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.extensions.ExtensibilityElement"
-				quid       	"3B84B13503D1"
-				stereotype 	"javaclass")))
-		    (object Class "IDefinition"
-			quid       	"3B84B1D90142"
-			documentation 	"This class represents the javax.wsdl.Definition non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addBinding"
-				quid       	"3B8988F1039D"
-				parameters 	(list Parameters
-				    (object Parameter "binding"
-					type       	"IBinding"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "addImport"
-				quid       	"3B8989490259"
-				parameters 	(list Parameters
-				    (object Parameter "importDef"
-					type       	"IImport"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "addMessage"
-				quid       	"3B89896E005E"
-				parameters 	(list Parameters
-				    (object Parameter "message"
-					type       	"IMessage"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "addNamespace"
-				quid       	"3B898984004B"
-				parameters 	(list Parameters
-				    (object Parameter "prefix"
-					type       	"String")
-				    (object Parameter "namespaceURI"
-					type       	"String"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "addPortType"
-				quid       	"3B8989C50045"
-				parameters 	(list Parameters
-				    (object Parameter "portType"
-					type       	"IPortType"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "addService"
-				quid       	"3B8989E401EE"
-				parameters 	(list Parameters
-				    (object Parameter "service"
-					type       	"IService"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createBindingFault"
-				quid       	"3B898A17038C"
-				result     	"IBindingFault"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createBindingInput"
-				quid       	"3B898A320286"
-				result     	"IBindingInput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createBindingOutput"
-				quid       	"3B898A46013B"
-				result     	"IBindingOutput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createBindingOperation"
-				quid       	"3B898A5C00B0"
-				result     	"IBindingOperation"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createBinding"
-				quid       	"3B8989FE037C"
-				result     	"IBinding"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createFault"
-				quid       	"3B898A7502E7"
-				result     	"IFault"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createImport"
-				quid       	"3B898A83014C"
-				result     	"IImport"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createInput"
-				quid       	"3B898A9D033E"
-				result     	"IInput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createMessage"
-				quid       	"3B898AAF0254"
-				result     	"IMessage"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createOperation"
-				quid       	"3B898AC203C4"
-				result     	"IOperation"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createOutput"
-				quid       	"3B898AE800ED"
-				result     	"IOutput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createPart"
-				quid       	"3B898AF8026D"
-				result     	"IPart"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createPort"
-				quid       	"3B898B0801DA"
-				result     	"IPort"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createPortType"
-				quid       	"3B898B15039B"
-				result     	"IPortType"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createService"
-				quid       	"3B898B32013A"
-				result     	"IService"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBinding"
-				quid       	"3B898B420075"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IBinding"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindings"
-				quid       	"3B898B920341"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getImports"
-				quid       	"3B898BCD0060"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getImports"
-				quid       	"3B898BE70144"
-				parameters 	(list Parameters
-				    (object Parameter "namespaceURI"
-					type       	"String"))
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getMessage"
-				quid       	"3B898C170107"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IMessage"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getMessages"
-				quid       	"3B898C3E001D"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getNamespace"
-				quid       	"3B898C62014B"
-				parameters 	(list Parameters
-				    (object Parameter "prefix"
-					type       	"String"))
-				result     	"String"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getNamespaces"
-				quid       	"3B898C740115"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPortType"
-				quid       	"3B898CBE0071"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IPortType"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPortTypes"
-				quid       	"3B898CDA01C6"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPrefix"
-				quid       	"3B898CFD0017"
-				parameters 	(list Parameters
-				    (object Parameter "namespaceURI"
-					type       	"String"))
-				result     	"String"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getService"
-				quid       	"3B898D2300A8"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IService"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getServices"
-				quid       	"3B898D3B03CE"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getExtensionRegistry"
-				quid       	"3B89D5B8012B"
-				result     	"IExtensionRegistry"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setExtensionRegistry"
-				quid       	"3B89D5D703BB"
-				parameters 	(list Parameters
-				    (object Parameter "extensionRegistry"
-					type       	"IExtensionRegistry"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getDocumentBaseURI"
-				quid       	"3B89D5FE0208"
-				result     	"String"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setDocumentBaseURI"
-				quid       	"3B89D6180328"
-				parameters 	(list Parameters
-				    (object Parameter "documentBase"
-					type       	"String"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createTypes"
-				quid       	"3CADD0560080"
-				result     	"ITypes"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "removeService"
-				quid       	"3CADD07E004C"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IService"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "removeBinding"
-				quid       	"3CADD0BA0355"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IBinding"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "removePortType"
-				quid       	"3CADD0D8029A"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IPortType"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "removeMessage"
-				quid       	"3CADD0FA0307"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IMessage"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getTypes"
-				quid       	"3C86706F031B"
-				result     	"ITypes"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setTypes"
-				quid       	"3C86709500EE"
-				parameters 	(list Parameters
-				    (object Parameter "types"
-					type       	"ITypes"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Definition"
-				quid       	"3B84B1E702A1"
-				stereotype 	"javaclass")))
-		    (object Class "IImport"
-			quid       	"3B84B2020119"
-			documentation 	"This class represents the javax.wsdl.Import non-MOF interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Import"
-				quid       	"3B84B20C02EA"
-				stereotype 	"javaclass")))
-		    (object Class "IList"
-			quid       	"3B85C0A203C5"
-			documentation 	"This class represents the non-MOF java.util.List interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "java.util.List"
-				quid       	"3B85C0AF0297"
-				stereotype 	"javaclass")))
-		    (object Class "IMap"
-			quid       	"3B896B0300D4"
-			documentation 	"This class represents the non-MOF java.util.Map interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "java.util.Map"
-				quid       	"3B896B1102B5"
-				stereotype 	"javaclass")))
-		    (object Class "IURL"
-			quid       	"3B89D5630274"
-			documentation 	"This class represents the non-MOF java.net.URL interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "java.net.URL"
-				quid       	"3B89D56E03E2"
-				stereotype 	"javaclass")))
-		    (object Class "IExtensionRegistry"
-			quid       	"3B89D59302A5"
-			documentation 	"This class represents the non-MOF javax.wsdl.extensions.ExtensionRegistry interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.extensions.ExtensionRegistry"
-				quid       	"3B89D59F02E8"
-				stereotype 	"javaclass")))
-		    (object Class "Types"
-			quid       	"3B8BE9A603A8"
-			documentation 	"This class represents a WSDL types element. The types element encloses data type definitions that are relevant for the exchanged messages."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B8BEB010311"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3CADCD3B0380"
-				supplier   	"Logical View::wsdl::ITypes"
-				quidu      	"3CADCBB20050"))
-			operations 	(list Operations
-			    (object Operation "getSchemas"
-				quid       	"3CADCF3803E6"
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getSchemas"
-				quid       	"3CADCF7E0301"
-				parameters 	(list Parameters
-				    (object Parameter "namespaceURI"
-					type       	"String"))
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)))
-		    (object Class "IIterator"
-			quid       	"3C4687DA0167"
-			documentation 	"This class represents the non-MOF java.util.Iterator interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "java.util.Iterator"
-				quid       	"3C46880800B9"
-				stereotype 	"javaclass")))
-		    (object Class "WSDLException"
-			quid       	"3C4689650313"
-			documentation 	"This class represents the javax.wsdl.Exception class."
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.WSDLException"
-				quid       	"3C4689740315"
-				stereotype 	"javaclass")))
-		    (object Class "ITypes"
-			quid       	"3CADCBB20050"
-			documentation 	"This class represents the javax.wsdl.Types non-MOF interface"
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Types"
-				quid       	"3CADCBF10173"
-				stereotype 	"javaclass")))
-		    (object Class "UnknownExtensibilityElement"
-			quid       	"3CB24AC002AE"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3CB24AEC01CB"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9")))
-		    (object Class "XSDSchemaExtensibilityElement"
-			quid       	"3CC360D7039C"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3CC3627F00B7"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9")))
-		    (object Class "DOMDocument"
-			quid       	"3CD1502C023B"
-			documentation 	"This class represents the org.w3c.dom.Document non-MOF interface."
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "org.w3c.dom.Document"
-				quid       	"3CD150600182"
-				stereotype 	"javaclass")))
-		    (object Class "MessageReference"
-			quid       	"3F6771DB02DC"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3F762A6A0308"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3F6780A001AB"
-				type       	"String"
-				exportControl 	"Protected"))
-			language   	"Java"
-			abstract   	TRUE)
-		    (object Association "$UNNAMED$6"
-			quid       	"3AD5C824018C"
-			roles      	(list role_list
-			    (object Role "portType"
-				quid       	"3AD5C82701C3"
-				label      	"portType"
-				supplier   	"Logical View::wsdl::PortType"
-				quidu      	"3AD5C7F001A5"
-				client_cardinality 	(value cardinality "1..1")
-				Containment 	"By Value"
-				is_aggregate 	TRUE)
-			    (object Role "eOperations"
-				quid       	"3AD5C82701CD"
-				label      	"eOperations"
-				supplier   	"Logical View::wsdl::Operation"
-				quidu      	"3AD5C80D03CE"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$7"
-			quid       	"3AD5CEBE00E2"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$8"
-				quid       	"3AD5CEBF0057"
-				supplier   	"Logical View::wsdl::Message"
-				quidu      	"3AD5C9590078"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eParts"
-				quid       	"3AD5CEBF0061"
-				label      	"eParts"
-				supplier   	"Logical View::wsdl::Part"
-				quidu      	"3AD5CE1C032E"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$9"
-			quid       	"3AD5D352010F"
-			roles      	(list role_list
-			    (object Role "ePortType"
-				quid       	"3AD5D3540176"
-				label      	"ePortType"
-				supplier   	"Logical View::wsdl::PortType"
-				quidu      	"3AD5C7F001A5"
-				client_cardinality 	(value cardinality "1..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$10"
-				quid       	"3AD5D3540180"
-				supplier   	"Logical View::wsdl::Binding"
-				quidu      	"3AD5D2860261")))
-		    (object Association "$UNNAMED$11"
-			quid       	"3AD5D3E10179"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$12"
-				quid       	"3AD5D3E20225"
-				supplier   	"Logical View::wsdl::Binding"
-				quidu      	"3AD5D2860261"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eBindingOperations"
-				quid       	"3AD5D3E20239"
-				label      	"eBindingOperations"
-				supplier   	"Logical View::wsdl::BindingOperation"
-				quidu      	"3AD5D3CB0145"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$13"
-			quid       	"3AD5D425038A"
-			roles      	(list role_list
-			    (object Role "eOperation"
-				quid       	"3AD5D42602F5"
-				label      	"eOperation"
-				supplier   	"Logical View::wsdl::Operation"
-				quidu      	"3AD5C80D03CE"
-				client_cardinality 	(value cardinality "1..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$14"
-				quid       	"3AD5D42602FF"
-				supplier   	"Logical View::wsdl::BindingOperation"
-				quidu      	"3AD5D3CB0145")))
-		    (object Association "$UNNAMED$15"
-			quid       	"3AD5D9400393"
-			roles      	(list role_list
-			    (object Role "ePorts"
-				quid       	"3AD5D941031C"
-				label      	"ePorts"
-				supplier   	"Logical View::wsdl::Port"
-				quidu      	"3AD5D9170286"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$16"
-				quid       	"3AD5D941031D"
-				supplier   	"Logical View::wsdl::Service"
-				quidu      	"3AD5D8F002F8"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$17"
-			quid       	"3AD5D9B8011F"
-			roles      	(list role_list
-			    (object Role "eBinding"
-				quid       	"3AD5D9B9024D"
-				label      	"eBinding"
-				supplier   	"Logical View::wsdl::Binding"
-				quidu      	"3AD5D2860261"
-				client_cardinality 	(value cardinality "1..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$18"
-				quid       	"3AD5D9B90261"
-				supplier   	"Logical View::wsdl::Port"
-				quidu      	"3AD5D9170286")))
-		    (object Association "$UNNAMED$19"
-			quid       	"3AD5E60301E2"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$20"
-				quid       	"3AD5E60400B7"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eMessages"
-				quid       	"3AD5E60400C1"
-				label      	"eMessages"
-				supplier   	"Logical View::wsdl::Message"
-				quidu      	"3AD5C9590078"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$21"
-			quid       	"3AD5E6710104"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$22"
-				quid       	"3AD5E672034A"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "ePortTypes"
-				quid       	"3AD5E6720354"
-				label      	"ePortTypes"
-				supplier   	"Logical View::wsdl::PortType"
-				quidu      	"3AD5C7F001A5"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$23"
-			quid       	"3AD5E6770095"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$24"
-				quid       	"3AD5E6780371"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eBindings"
-				quid       	"3AD5E678037B"
-				label      	"eBindings"
-				supplier   	"Logical View::wsdl::Binding"
-				quidu      	"3AD5D2860261"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$25"
-			quid       	"3AD5E67B0311"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$26"
-				quid       	"3AD5E67D007F"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eServices"
-				quid       	"3AD5E67D0089"
-				label      	"eServices"
-				supplier   	"Logical View::wsdl::Service"
-				quidu      	"3AD5D8F002F8"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$27"
-			quid       	"3AD5FD130079"
-			roles      	(list role_list
-			    (object Role "eExtensibilityElements"
-				quid       	"3AD5FD14019D"
-				label      	"eExtensibilityElements"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$28"
-				quid       	"3AD5FD14019E"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$29"
-			quid       	"3ADF2E6401F5"
-			roles      	(list role_list
-			    (object Role "eBindingInput"
-				quid       	"3ADF2E650251"
-				label      	"eBindingInput"
-				supplier   	"Logical View::wsdl::BindingInput"
-				quidu      	"3AE08A8202D4"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$30"
-				quid       	"3ADF2E650252"
-				supplier   	"Logical View::wsdl::BindingOperation"
-				quidu      	"3AD5D3CB0145"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$31"
-			quid       	"3ADF2EB30163"
-			roles      	(list role_list
-			    (object Role "eBindingOutput"
-				quid       	"3ADF2EB4013C"
-				label      	"eBindingOutput"
-				supplier   	"Logical View::wsdl::BindingOutput"
-				quidu      	"3AE08A8F028C"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$32"
-				quid       	"3ADF2EB4013D"
-				supplier   	"Logical View::wsdl::BindingOperation"
-				quidu      	"3AD5D3CB0145"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$33"
-			quid       	"3ADF2F94024D"
-			roles      	(list role_list
-			    (object Role "eInput"
-				quid       	"3ADF2F950190"
-				label      	"eInput"
-				supplier   	"Logical View::wsdl::Input"
-				quidu      	"3AE0789F0059"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$34"
-				quid       	"3ADF2F95019A"
-				supplier   	"Logical View::wsdl::Operation"
-				quidu      	"3AD5C80D03CE"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$35"
-			quid       	"3ADF2FB802F9"
-			roles      	(list role_list
-			    (object Role "eOutput"
-				quid       	"3ADF2FB9020A"
-				label      	"eOutput"
-				supplier   	"Logical View::wsdl::Output"
-				quidu      	"3AE078B60232"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$36"
-				quid       	"3ADF2FB9020B"
-				supplier   	"Logical View::wsdl::Operation"
-				quidu      	"3AD5C80D03CE"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$37"
-			quid       	"3ADF331601A4"
-			roles      	(list role_list
-			    (object Role "eFaults"
-				quid       	"3ADF33180387"
-				label      	"eFaults"
-				supplier   	"Logical View::wsdl::Fault"
-				quidu      	"3AE078BE0108"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$38"
-				quid       	"3ADF33180388"
-				supplier   	"Logical View::wsdl::Operation"
-				quidu      	"3AD5C80D03CE"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$39"
-			quid       	"3ADF340003E5"
-			roles      	(list role_list
-			    (object Role "eBindingFaults"
-				quid       	"3ADF340103AA"
-				label      	"eBindingFaults"
-				supplier   	"Logical View::wsdl::BindingFault"
-				quidu      	"3AE08A9E03A6"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$40"
-				quid       	"3ADF340103AB"
-				supplier   	"Logical View::wsdl::BindingOperation"
-				quidu      	"3AD5D3CB0145"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$41"
-			quid       	"3AE091F402F3"
-			roles      	(list role_list
-			    (object Role "eFault"
-				quid       	"3AE091F801FE"
-				label      	"eFault"
-				supplier   	"Logical View::wsdl::Fault"
-				quidu      	"3AE078BE0108"
-				client_cardinality 	(value cardinality "1..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$42"
-				quid       	"3AE091F801FF"
-				supplier   	"Logical View::wsdl::BindingFault"
-				quidu      	"3AE08A9E03A6")))
-		    (object Association "$UNNAMED$43"
-			quid       	"3AEA3D55002D"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$44"
-				quid       	"3AEA3D560328"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eNamespaces"
-				quid       	"3AEA3D560332"
-				label      	"eNamespaces"
-				supplier   	"Logical View::wsdl::Namespace"
-				quidu      	"3AEA3CD30030"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$45"
-			quid       	"3AEA3E3A002D"
-			roles      	(list role_list
-			    (object Role "eDefinition"
-				quid       	"3AEA3E3C01E8"
-				label      	"eDefinition"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$46"
-				quid       	"3AEA3E3C01F2"
-				supplier   	"Logical View::wsdl::Import"
-				quidu      	"3AD5E4F903DE")))
-		    (object Association "$UNNAMED$47"
-			quid       	"3AEA412F0035"
-			roles      	(list role_list
-			    (object Role "eParameterOrdering"
-				quid       	"3AEA41310255"
-				label      	"eParameterOrdering"
-				supplier   	"Logical View::wsdl::Part"
-				quidu      	"3AD5CE1C032E"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$48"
-				quid       	"3AEA4131025F"
-				supplier   	"Logical View::wsdl::Operation"
-				quidu      	"3AD5C80D03CE")))
-		    (object Association "$UNNAMED$49"
-			quid       	"3B84AD2400BD"
-			roles      	(list role_list
-			    (object Role "eInput"
-				quid       	"3B84AD250083"
-				label      	"eInput"
-				supplier   	"Logical View::wsdl::Input"
-				quidu      	"3AE0789F0059"
-				client_cardinality 	(value cardinality "1..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$50"
-				quid       	"3B84AD250084"
-				supplier   	"Logical View::wsdl::BindingInput"
-				quidu      	"3AE08A8202D4")))
-		    (object Association "$UNNAMED$51"
-			quid       	"3B84AD7900F2"
-			roles      	(list role_list
-			    (object Role "eOutput"
-				quid       	"3B84AD7A014D"
-				label      	"eOutput"
-				supplier   	"Logical View::wsdl::Output"
-				quidu      	"3AE078B60232"
-				client_cardinality 	(value cardinality "1..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$52"
-				quid       	"3B84AD7A014E"
-				supplier   	"Logical View::wsdl::BindingOutput"
-				quidu      	"3AE08A8F028C")))
-		    (object Association "$UNNAMED$53"
-			quid       	"3B8B1BE900C4"
-			roles      	(list role_list
-			    (object Role "typeDefinition"
-				quid       	"3B8B1BE90327"
-				label      	"typeDefinition"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$54"
-				quid       	"3B8B1BE90331"
-				supplier   	"Logical View::wsdl::Part"
-				quidu      	"3AD5CE1C032E")))
-		    (object Association "$UNNAMED$55"
-			quid       	"3B8B1C1203B2"
-			roles      	(list role_list
-			    (object Role "elementDeclaration"
-				quid       	"3B8B1C14001C"
-				label      	"elementDeclaration"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$56"
-				quid       	"3B8B1C140026"
-				supplier   	"Logical View::wsdl::Part"
-				quidu      	"3AD5CE1C032E")))
-		    (object Association "$UNNAMED$57"
-			quid       	"3B8B1DCC02E5"
-			roles      	(list role_list
-			    (object Role "eSchema"
-				quid       	"3B8B1DCE0270"
-				label      	"eSchema"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$58"
-				quid       	"3B8B1DCE027A"
-				supplier   	"Logical View::wsdl::Import"
-				quidu      	"3AD5E4F903DE")))
-		    (object Association "$UNNAMED$59"
-			quid       	"3B8BEA27029F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$60"
-				quid       	"3B8BEA290356"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eTypes"
-				quid       	"3B8BEA29036A"
-				label      	"eTypes"
-				supplier   	"Logical View::wsdl::Types"
-				quidu      	"3B8BE9A603A8"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$61"
-			quid       	"3C46829303E5"
-			roles      	(list role_list
-			    (object Role "eMessage"
-				quid       	"3C468296010E"
-				label      	"eMessage"
-				supplier   	"Logical View::wsdl::Message"
-				quidu      	"3AD5C9590078"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$62"
-				quid       	"3C4682960118"
-				supplier   	"Logical View::wsdl::Part"
-				quidu      	"3AD5CE1C032E")))
-		    (object Association "$UNNAMED$63"
-			quid       	"3C864DFF02EC"
-			roles      	(list role_list
-			    (object Role "eImports"
-				quid       	"3C864DFF02ED"
-				label      	"eImports"
-				supplier   	"Logical View::wsdl::Import"
-				quidu      	"3AD5E4F903DE"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$64"
-				quid       	"3C864DFF02EE"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$65"
-			quid       	"3CC3614500F2"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$66"
-				quid       	"3CC36146023D"
-				supplier   	"Logical View::wsdl::XSDSchemaExtensibilityElement"
-				quidu      	"3CC360D7039C"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "schema"
-				quid       	"3CC36146023E"
-				label      	"schema"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$67"
-			quid       	"3F74E78401B1"
-			roles      	(list role_list
-			    (object Role "eMessage"
-				quid       	"3F74E786000F"
-				label      	"eMessage"
-				supplier   	"Logical View::wsdl::Message"
-				quidu      	"3AD5C9590078"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$68"
-				quid       	"3F74E7860023"
-				supplier   	"Logical View::wsdl::MessageReference"
-				quidu      	"3F6771DB02DC")))
-		    (object Association "$UNNAMED$69"
-			quid       	"3F7896A2026E"
-			roles      	(list role_list
-			    (object Role "parent"
-				quid       	"3F7896A7012B"
-				label      	"parent"
-				supplier   	"Logical View::wsdl::UnknownExtensibilityElement"
-				quidu      	"3CB24AC002AE"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "children"
-				quid       	"3F7896A7012C"
-				label      	"children"
-				supplier   	"Logical View::wsdl::UnknownExtensibilityElement"
-				quidu      	"3CB24AC002AE"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE))))
-		logical_presentations 	(list unit_reference_list
-		    (object ClassDiagram "2.7 Services"
-			quid       	"39AD3EF60127"
-			title      	"2.7 Services"
-			zoom       	90
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::IBinding" @41
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1424, 800)
-				label      	(object ItemLabel
-				    Parent_View 	@41
-				    location   	(1173, 660)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	502
-				    justify    	0
-				    label      	"IBinding")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@41
-				    location   	(1173, 610)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	502
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84ABC60219"
-				compartment 	(object Compartment
-				    Parent_View 	@41
-				    location   	(1173, 715)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	5
-				    max_width  	471)
-				width      	520
-				height     	404
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IPort" @42
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(816, 528)
-				label      	(object ItemLabel
-				    Parent_View 	@42
-				    location   	(686, 481)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	260
-				    justify    	0
-				    label      	"IPort")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@42
-				    location   	(686, 431)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	260
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84AB800326"
-				compartment 	(object Compartment
-				    Parent_View 	@42
-				    location   	(686, 536)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	275)
-				width      	278
-				height     	218
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IService" @43
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@43
-				    location   	(126, 90)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	228
-				    justify    	0
-				    label      	"IService")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@43
-				    location   	(126, 40)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	228
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84AB490287"
-				compartment 	(object Compartment
-				    Parent_View 	@43
-				    location   	(126, 145)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	237)
-				width      	246
-				height     	264
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Service" @44
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 528)
-				label      	(object ItemLabel
-				    Parent_View 	@44
-				    location   	(44, 389)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	392
-				    justify    	0
-				    label      	"Service")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D8F002F8"
-				compartment 	(object Compartment
-				    Parent_View 	@44
-				    location   	(44, 444)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	5
-				    max_width  	425)
-				width      	410
-				height     	302
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @45
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B85954E01B4"
-				client     	@44
-				supplier   	@43
-				line_style 	3
-				origin_attachment 	(240, 377)
-				terminal_attachment 	(240, 292))
-			    (object ClassView "Class" "Logical View::wsdl::Binding" @46
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1440, 1264)
-				label      	(object ItemLabel
-				    Parent_View 	@46
-				    location   	(1244, 1125)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	392
-				    justify    	0
-				    label      	"Binding")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D2860261"
-				compartment 	(object Compartment
-				    Parent_View 	@46
-				    location   	(1244, 1180)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	5
-				    max_width  	425)
-				width      	410
-				height     	302
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @47
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8595410129"
-				client     	@46
-				supplier   	@41
-				line_style 	3
-				origin_attachment 	(1430, 1113)
-				terminal_attachment 	(1430, 1002))
-			    (object ClassView "Class" "Logical View::wsdl::Port" @48
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(816, 912)
-				label      	(object ItemLabel
-				    Parent_View 	@48
-				    location   	(675, 840)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	282
-				    justify    	0
-				    label      	"Port")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D9170286"
-				compartment 	(object Compartment
-				    Parent_View 	@48
-				    location   	(675, 895)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	303)
-				width      	300
-				height     	168
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @49
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B85954502C9"
-				client     	@48
-				supplier   	@42
-				line_style 	3
-				origin_attachment 	(809, 828)
-				terminal_attachment 	(809, 637))
-			    (object AssociationViewNew "$UNNAMED$15" @50
-				location   	(343, 916)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5D9400393"
-				roleview_list 	(list RoleViews
-				    (object RoleView "ePorts" @51
-					Parent_View 	@50
-					location   	(-121, 644)
-					label      	(object SegLabel @52
-					    Parent_View 	@51
-					    location   	(413, 945)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	192
-					    justify    	0
-					    label      	"+ePorts"
-					    pctDist    	0.218978
-					    height     	29
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D941031C"
-					client     	@50
-					supplier   	@48
-					line_style 	3
-					origin_attachment 	(343, 916)
-					terminal_attachment 	(666, 916)
-					label      	(object SegLabel @53
-					    Parent_View 	@51
-					    location   	(539, 880)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	160
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.608000
-					    height     	37
-					    orientation 	0)
-					label      	(object SegLabel @54
-					    Parent_View 	@51
-					    location   	(448, 990)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	146
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.328467
-					    height     	74
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$16" @55
-					Parent_View 	@50
-					location   	(-121, 644)
-					label      	(object SegLabel @56
-					    Parent_View 	@55
-					    location   	(216, 744)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D941031D"
-					client     	@50
-					supplier   	@44
-					vertices   	(list Points
-					    (343, 916)
-					    (257, 916)
-					    (257, 679))
-					line_style 	3
-					origin_attachment 	(343, 916)
-					terminal_attachment 	(257, 679)
-					label      	(object SegLabel @57
-					    Parent_View 	@55
-					    location   	(301, 796)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.637097
-					    height     	44
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$17" @58
-				location   	(886, 1270)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5D9B8011F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eBinding" @59
-					Parent_View 	@58
-					location   	(38, 422)
-					label      	(object SegLabel @60
-					    Parent_View 	@59
-					    location   	(1112, 1235)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+eBinding"
-					    pctDist    	0.648571
-					    height     	36
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D9B9024D"
-					client     	@58
-					supplier   	@46
-					line_style 	3
-					origin_attachment 	(886, 1270)
-					terminal_attachment 	(1235, 1270)
-					label      	(object SegLabel @61
-					    Parent_View 	@59
-					    location   	(1170, 1313)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.814286
-					    height     	43
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$18" @62
-					Parent_View 	@58
-					location   	(38, 422)
-					label      	(object SegLabel @63
-					    Parent_View 	@62
-					    location   	(852, 1106)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	156
-					    justify    	0
-					    label      	""
-					    pctDist    	0.687943
-					    height     	40
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D9B90261"
-					client     	@58
-					supplier   	@48
-					vertices   	(list Points
-					    (886, 1270)
-					    (812, 1270)
-					    (812, 996))
-					line_style 	3
-					origin_attachment 	(886, 1270)
-					terminal_attachment 	(812, 996))))))
-		    (object ClassDiagram "2.5 Bindings"
-			quid       	"39AD51270252"
-			title      	"2.5 Bindings"
-			zoom       	85
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::IBinding" @64
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 240)
-				label      	(object ItemLabel
-				    Parent_View 	@64
-				    location   	(73, 114)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	462
-				    justify    	0
-				    label      	"IBinding")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@64
-				    location   	(73, 64)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	462
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84ABC60219"
-				compartment 	(object Compartment
-				    Parent_View 	@64
-				    location   	(73, 172)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	5
-				    max_width  	471)
-				width      	480
-				height     	376
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IBindingOperation" @65
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(976, 352)
-				label      	(object ItemLabel
-				    Parent_View 	@65
-				    location   	(780, 130)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	392
-				    justify    	0
-				    label      	"IBindingOperation")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@65
-				    location   	(780, 80)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	392
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84ADC00072"
-				compartment 	(object Compartment
-				    Parent_View 	@65
-				    location   	(780, 188)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	9
-				    max_width  	396)
-				width      	410
-				height     	568
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IBindingInput" @66
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(192, 1360)
-				label      	(object ItemLabel
-				    Parent_View 	@66
-				    location   	(62, 1334)
-				    fill_color 	16777215
-				    nlines     	1
-				    max_width  	260
-				    justify    	0
-				    label      	"IBindingInput")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@66
-				    location   	(62, 1284)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	260
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84ADEB0100"
-				width      	278
-				height     	176
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IBindingOutput" @67
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 1664)
-				label      	(object ItemLabel
-				    Parent_View 	@67
-				    location   	(61, 1638)
-				    fill_color 	16777215
-				    nlines     	1
-				    max_width  	294
-				    justify    	0
-				    label      	"IBindingOutput")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@67
-				    location   	(61, 1588)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	294
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84AE210111"
-				width      	312
-				height     	176
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IBindingFault" @68
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 1984)
-				label      	(object ItemLabel
-				    Parent_View 	@68
-				    location   	(72, 1958)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	272
-				    justify    	0
-				    label      	"IBindingFault")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@68
-				    location   	(72, 1908)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	272
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84AE4F00BD"
-				width      	290
-				height     	176
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::PortType" @69
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1904, 624)
-				label      	(object ItemLabel
-				    Parent_View 	@69
-				    location   	(1568, 486)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	673
-				    justify    	0
-				    label      	"PortType")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C7F001A5"
-				compartment 	(object Compartment
-				    Parent_View 	@69
-				    location   	(1568, 544)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	5
-				    max_width  	425)
-				width      	691
-				height     	301
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Input" @70
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1904, 1360)
-				label      	(object ItemLabel
-				    Parent_View 	@70
-				    location   	(1756, 1283)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"Input")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE0789F0059"
-				width      	314
-				height     	178
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Output" @71
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1904, 1664)
-				label      	(object ItemLabel
-				    Parent_View 	@71
-				    location   	(1756, 1587)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"Output")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE078B60232"
-				width      	314
-				height     	178
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Binding" @72
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 688)
-				label      	(object ItemLabel
-				    Parent_View 	@72
-				    location   	(97, 539)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	414
-				    justify    	0
-				    label      	"Binding")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D2860261"
-				compartment 	(object Compartment
-				    Parent_View 	@72
-				    location   	(97, 597)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	5
-				    max_width  	425)
-				width      	432
-				height     	322
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @73
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8595410129"
-				client     	@72
-				supplier   	@64
-				line_style 	3
-				origin_attachment 	(279, 527)
-				terminal_attachment 	(279, 428))
-			    (object AssociationViewNew "$UNNAMED$9" @74
-				location   	(1039, 742)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5D352010F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "ePortType" @75
-					Parent_View 	@74
-					location   	(575, 598)
-					label      	(object SegLabel @76
-					    Parent_View 	@75
-					    location   	(1449, 781)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+ePortType"
-					    pctDist    	0.789292
-					    height     	39
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D3540176"
-					client     	@74
-					supplier   	@69
-					line_style 	3
-					origin_attachment 	(1039, 742)
-					terminal_attachment 	(1559, 742)
-					label      	(object SegLabel @77
-					    Parent_View 	@75
-					    location   	(1492, 716)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.872193
-					    height     	27
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$10" @78
-					Parent_View 	@74
-					location   	(575, 598)
-					label      	(object SegLabel @79
-					    Parent_View 	@78
-					    location   	(776, 697)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	108
-					    justify    	0
-					    label      	""
-					    pctDist    	0.509449
-					    height     	46
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D3540180"
-					client     	@74
-					supplier   	@72
-					line_style 	3
-					origin_attachment 	(1039, 742)
-					terminal_attachment 	(520, 742))))
-			    (object ClassView "Class" "Logical View::wsdl::Operation" @80
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1888, 1024)
-				label      	(object ItemLabel
-				    Parent_View 	@80
-				    location   	(1672, 851)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	432
-				    justify    	0
-				    label      	"Operation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C80D03CE"
-				compartment 	(object Compartment
-				    Parent_View 	@80
-				    location   	(1672, 909)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	6
-				    max_width  	446)
-				width      	450
-				height     	370
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::BindingInput" @81
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(624, 1408)
-				label      	(object ItemLabel
-				    Parent_View 	@81
-				    location   	(476, 1283)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"BindingInput")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE08A8202D4"
-				compartment 	(object Compartment
-				    Parent_View 	@81
-				    location   	(476, 1341)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	303)
-				width      	314
-				height     	274
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$49" @82
-				location   	(1264, 1359)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84AD2400BD"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eInput" @83
-					Parent_View 	@82
-					location   	(96, 287)
-					label      	(object SegLabel @84
-					    Parent_View 	@83
-					    location   	(1637, 1316)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	132
-					    justify    	0
-					    label      	"+eInput"
-					    pctDist    	0.775148
-					    height     	44
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B84AD250083"
-					client     	@82
-					supplier   	@70
-					line_style 	3
-					origin_attachment 	(1264, 1359)
-					terminal_attachment 	(1747, 1359)
-					label      	(object SegLabel @85
-					    Parent_View 	@83
-					    location   	(1694, 1398)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.889546
-					    height     	39
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$50" @86
-					Parent_View 	@82
-					location   	(96, 287)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B84AD250084"
-					client     	@82
-					supplier   	@81
-					line_style 	3
-					origin_attachment 	(1264, 1359)
-					terminal_attachment 	(781, 1359))))
-			    (object ClassView "Class" "Logical View::wsdl::BindingOutput" @87
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(960, 1664)
-				label      	(object ItemLabel
-				    Parent_View 	@87
-				    location   	(812, 1539)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"BindingOutput")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE08A8F028C"
-				compartment 	(object Compartment
-				    Parent_View 	@87
-				    location   	(812, 1597)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	303)
-				width      	314
-				height     	274
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$51" @88
-				location   	(1432, 1654)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84AD7900F2"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eOutput" @89
-					Parent_View 	@88
-					location   	(-120, 374)
-					label      	(object SegLabel @90
-					    Parent_View 	@89
-					    location   	(1645, 1612)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+eOutput"
-					    pctDist    	0.674772
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B84AD7A014D"
-					client     	@88
-					supplier   	@71
-					line_style 	3
-					origin_attachment 	(1432, 1654)
-					terminal_attachment 	(1747, 1654)
-					label      	(object SegLabel @91
-					    Parent_View 	@89
-					    location   	(1681, 1697)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.790274
-					    height     	43
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$52" @92
-					Parent_View 	@88
-					location   	(-120, 374)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B84AD7A014E"
-					client     	@88
-					supplier   	@87
-					line_style 	3
-					origin_attachment 	(1432, 1654)
-					terminal_attachment 	(1117, 1654))))
-			    (object ClassView "Class" "Logical View::wsdl::BindingOperation" @93
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(992, 1008)
-				label      	(object ItemLabel
-				    Parent_View 	@93
-				    location   	(819, 931)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	346
-				    justify    	0
-				    label      	"BindingOperation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D3CB0145"
-				compartment 	(object Compartment
-				    Parent_View 	@93
-				    location   	(819, 989)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	303)
-				width      	364
-				height     	178
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @94
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84ADE401DC"
-				client     	@93
-				supplier   	@65
-				line_style 	3
-				origin_attachment 	(966, 919)
-				terminal_attachment 	(966, 636))
-			    (object AssociationViewNew "$UNNAMED$11" @95
-				location   	(457, 1022)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5D3E10179"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$12" @96
-					Parent_View 	@95
-					location   	(-1319, 494)
-					label      	(object SegLabel @97
-					    Parent_View 	@96
-					    location   	(235, 920)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D3E20225"
-					client     	@95
-					supplier   	@72
-					vertices   	(list Points
-					    (457, 1022)
-					    (276, 1022)
-					    (276, 849))
-					line_style 	3
-					origin_attachment 	(457, 1022)
-					terminal_attachment 	(276, 849)
-					label      	(object SegLabel @98
-					    Parent_View 	@96
-					    location   	(330, 884)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	1))
-				    (object RoleView "eBindingOperations" @99
-					Parent_View 	@95
-					location   	(-1319, 494)
-					label      	(object SegLabel @100
-					    Parent_View 	@99
-					    location   	(531, 977)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	384
-					    justify    	0
-					    label      	"+eBindingOperations"
-					    pctDist    	0.211699
-					    height     	46
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D3E20239"
-					client     	@95
-					supplier   	@93
-					line_style 	3
-					origin_attachment 	(457, 1022)
-					terminal_attachment 	(810, 1022)
-					label      	(object SegLabel @101
-					    Parent_View 	@99
-					    location   	(769, 980)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.884956
-					    height     	43
-					    orientation 	0)
-					label      	(object SegLabel @102
-					    Parent_View 	@99
-					    location   	(714, 1067)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	154
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.727564
-					    height     	45
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$13" @103
-				location   	(1418, 1040)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5D425038A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eOperation" @104
-					Parent_View 	@103
-					location   	(-358, 464)
-					label      	(object SegLabel @105
-					    Parent_View 	@104
-					    location   	(1520, 1079)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	228
-					    justify    	0
-					    label      	"+eOperation"
-					    pctDist    	0.420601
-					    height     	39
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D42602F5"
-					client     	@103
-					supplier   	@80
-					line_style 	3
-					origin_attachment 	(1418, 1040)
-					terminal_attachment 	(1663, 1040)
-					label      	(object SegLabel @106
-					    Parent_View 	@104
-					    location   	(1589, 1005)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.696721
-					    height     	36
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$14" @107
-					Parent_View 	@103
-					location   	(-358, 464)
-					label      	(object SegLabel @108
-					    Parent_View 	@107
-					    location   	(1273, 1070)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	192
-					    justify    	0
-					    label      	""
-					    pctDist    	0.595420
-					    height     	30
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D42602FF"
-					client     	@103
-					supplier   	@93
-					line_style 	3
-					origin_attachment 	(1418, 1040)
-					terminal_attachment 	(1174, 1040))))
-			    (object AssociationViewNew "$UNNAMED$29" @109
-				location   	(787, 1190)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3ADF2E6401F5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eBindingInput" @110
-					Parent_View 	@109
-					location   	(-381, 454)
-					label      	(object SegLabel @111
-					    Parent_View 	@110
-					    location   	(669, 1152)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+eBindingInput"
-					    pctDist    	0.511905
-					    height     	39
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2E650251"
-					client     	@109
-					supplier   	@81
-					vertices   	(list Points
-					    (787, 1190)
-					    (636, 1190)
-					    (636, 1271))
-					line_style 	3
-					origin_attachment 	(787, 1190)
-					terminal_attachment 	(636, 1271)
-					label      	(object SegLabel @112
-					    Parent_View 	@110
-					    location   	(685, 1222)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.440476
-					    height     	32
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$30" @113
-					Parent_View 	@109
-					location   	(-381, 454)
-					label      	(object SegLabel @114
-					    Parent_View 	@113
-					    location   	(885, 1144)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2E650252"
-					client     	@109
-					supplier   	@93
-					vertices   	(list Points
-					    (787, 1190)
-					    (926, 1190)
-					    (926, 1097))
-					line_style 	3
-					origin_attachment 	(787, 1190)
-					terminal_attachment 	(926, 1097)
-					label      	(object SegLabel @115
-					    Parent_View 	@113
-					    location   	(871, 1136)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.837758
-					    height     	56
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$31" @116
-				location   	(1024, 1312)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3ADF2EB30163"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eBindingOutput" @117
-					Parent_View 	@116
-					location   	(-150, 578)
-					label      	(object SegLabel @118
-					    Parent_View 	@117
-					    location   	(1012, 1429)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	306
-					    justify    	0
-					    label      	"+eBindingOutput"
-					    pctDist    	0.545082
-					    height     	13
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2EB4013C"
-					client     	@116
-					supplier   	@87
-					line_style 	3
-					origin_attachment 	(1024, 1312)
-					terminal_attachment 	(1024, 1527)
-					label      	(object SegLabel @119
-					    Parent_View 	@117
-					    location   	(967, 1479)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.774590
-					    height     	58
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$32" @120
-					Parent_View 	@116
-					location   	(-150, 578)
-					label      	(object SegLabel @121
-					    Parent_View 	@120
-					    location   	(983, 1140)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2EB4013D"
-					client     	@116
-					supplier   	@93
-					line_style 	3
-					origin_attachment 	(1024, 1312)
-					terminal_attachment 	(1024, 1097)
-					label      	(object SegLabel @122
-					    Parent_View 	@120
-					    location   	(1031, 1186)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.590164
-					    height     	7
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::wsdl::Fault" @123
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1920, 1984)
-				label      	(object ItemLabel
-				    Parent_View 	@123
-				    location   	(1772, 1907)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"Fault")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE078BE0108"
-				width      	314
-				height     	178
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::BindingFault" @124
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1360, 1984)
-				label      	(object ItemLabel
-				    Parent_View 	@124
-				    location   	(1212, 1859)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"BindingFault")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE08A9E03A6"
-				compartment 	(object Compartment
-				    Parent_View 	@124
-				    location   	(1212, 1917)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	303)
-				width      	314
-				height     	274
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @125
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84AE710333"
-				client     	@124
-				supplier   	@68
-				line_style 	3
-				origin_attachment 	(1203, 2007)
-				terminal_attachment 	(353, 2007))
-			    (object AssociationViewNew "$UNNAMED$39" @126
-				location   	(1356, 1352)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3ADF340003E5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eBindingFaults" @127
-					Parent_View 	@126
-					location   	(188, 616)
-					label      	(object SegLabel @128
-					    Parent_View 	@127
-					    location   	(1382, 1750)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	300
-					    justify    	0
-					    label      	"+eBindingFaults"
-					    pctDist    	0.803150
-					    height     	26
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF340103AA"
-					client     	@126
-					supplier   	@124
-					line_style 	3
-					origin_attachment 	(1356, 1352)
-					terminal_attachment 	(1356, 1847)
-					label      	(object SegLabel @129
-					    Parent_View 	@127
-					    location   	(1409, 1797)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.899194
-					    height     	53
-					    orientation 	0)
-					label      	(object SegLabel @130
-					    Parent_View 	@127
-					    location   	(1256, 1806)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	154
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.919291
-					    height     	101
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$40" @131
-					Parent_View 	@126
-					location   	(188, 616)
-					label      	(object SegLabel @132
-					    Parent_View 	@131
-					    location   	(1076, 1197)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF340103AB"
-					client     	@126
-					supplier   	@93
-					vertices   	(list Points
-					    (1356, 1352)
-					    (1356, 1217)
-					    (1117, 1217)
-					    (1117, 1097))
-					line_style 	3
-					origin_attachment 	(1356, 1352)
-					terminal_attachment 	(1117, 1097)
-					label      	(object SegLabel @133
-					    Parent_View 	@131
-					    location   	(1152, 1164)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.687008
-					    height     	54
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$41" @134
-				location   	(1640, 1970)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AE091F402F3"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eFault" @135
-					Parent_View 	@134
-					location   	(-344, 818)
-					label      	(object SegLabel @136
-					    Parent_View 	@135
-					    location   	(1674, 1915)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	144
-					    justify    	0
-					    label      	"+eFault"
-					    pctDist    	0.276423
-					    height     	56
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AE091F801FE"
-					client     	@134
-					supplier   	@123
-					line_style 	3
-					origin_attachment 	(1640, 1970)
-					terminal_attachment 	(1763, 1970)
-					label      	(object SegLabel @137
-					    Parent_View 	@135
-					    location   	(1718, 2012)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.642276
-					    height     	42
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$42" @138
-					Parent_View 	@134
-					location   	(-344, 818)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AE091F801FF"
-					client     	@134
-					supplier   	@124
-					line_style 	3
-					origin_attachment 	(1640, 1970)
-					terminal_attachment 	(1517, 1970))))
-			    (object InheritView "" @139
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84AE4302AB"
-				client     	@87
-				supplier   	@67
-				line_style 	3
-				origin_attachment 	(803, 1656)
-				terminal_attachment 	(364, 1656))
-			    (object InheritView "" @140
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84AE1B0113"
-				client     	@81
-				supplier   	@66
-				line_style 	3
-				origin_attachment 	(467, 1385)
-				terminal_attachment 	(331, 1385))))
-		    (object ClassDiagram "2.4 PortTypes"
-			quid       	"3AD5D1C40366"
-			title      	"2.4 PortTypes"
-			documentation 	"This class represents the non-MOF java.util.Iterator interface."
-			zoom       	80
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::IPortType" @141
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(496, 208)
-				label      	(object ItemLabel
-				    Parent_View 	@141
-				    location   	(146, 172)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	700
-				    justify    	0
-				    label      	"IPortType")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@141
-				    location   	(146, 122)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	700
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A5BE0331"
-				compartment 	(object Compartment
-				    Parent_View 	@141
-				    location   	(146, 233)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	696)
-				width      	718
-				height     	196
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::wsdl::IOperation" @142
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1552, 208)
-				label      	(object ItemLabel
-				    Parent_View 	@142
-				    location   	(1116, 176)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	873
-				    justify    	0
-				    label      	"IOperation")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@142
-				    location   	(1116, 126)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	873
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A77600D1"
-				compartment 	(object Compartment
-				    Parent_View 	@142
-				    location   	(1116, 237)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	709)
-				width      	891
-				height     	188
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IInput" @143
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(368, 1472)
-				label      	(object ItemLabel
-				    Parent_View 	@143
-				    location   	(55, 1437)
-				    fill_color 	16777215
-				    nlines     	1
-				    max_width  	626
-				    justify    	0
-				    label      	"IInput")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@143
-				    location   	(55, 1387)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	626
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A7EE0015"
-				compartment 	(object Compartment
-				    Parent_View 	@143
-				    location   	(55, 1498)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	621)
-				width      	644
-				height     	194
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IOutput" @144
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(384, 1792)
-				label      	(object ItemLabel
-				    Parent_View 	@144
-				    location   	(56, 1757)
-				    fill_color 	16777215
-				    nlines     	1
-				    max_width  	656
-				    justify    	0
-				    label      	"IOutput")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@144
-				    location   	(56, 1707)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	656
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A829027D"
-				compartment 	(object Compartment
-				    Parent_View 	@144
-				    location   	(56, 1818)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	656)
-				width      	674
-				height     	194
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IFault" @145
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(368, 2112)
-				label      	(object ItemLabel
-				    Parent_View 	@145
-				    location   	(55, 2076)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	626
-				    justify    	0
-				    label      	"IFault")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@145
-				    location   	(55, 2026)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	626
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A861031D"
-				compartment 	(object Compartment
-				    Parent_View 	@145
-				    location   	(55, 2137)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	625)
-				width      	644
-				height     	196
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::PortType" @146
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(496, 800)
-				label      	(object ItemLabel
-				    Parent_View 	@146
-				    location   	(158, 672)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	677
-				    justify    	0
-				    label      	"PortType")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C7F001A5"
-				compartment 	(object Compartment
-				    Parent_View 	@146
-				    location   	(158, 733)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	425)
-				width      	695
-				height     	281
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::wsdl::Part" @147
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2576, 800)
-				label      	(object ItemLabel
-				    Parent_View 	@147
-				    location   	(2325, 692)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	502
-				    justify    	0
-				    label      	"Part")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5CE1C032E"
-				compartment 	(object Compartment
-				    Parent_View 	@147
-				    location   	(2325, 753)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	484)
-				width      	520
-				height     	240
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Fault" @148
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1728, 2112)
-				label      	(object ItemLabel
-				    Parent_View 	@148
-				    location   	(1647, 2060)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	162
-				    justify    	0
-				    label      	"Fault")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE078BE0108"
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Input" @149
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1056, 1472)
-				label      	(object ItemLabel
-				    Parent_View 	@149
-				    location   	(870, 1422)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	372
-				    justify    	0
-				    label      	"Input")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE0789F0059"
-				width      	390
-				height     	125
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::wsdl::Output" @150
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1360, 1792)
-				label      	(object ItemLabel
-				    Parent_View 	@150
-				    location   	(1232, 1742)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	256
-				    justify    	0
-				    label      	"Output")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE078B60232"
-				width      	274
-				height     	125
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Operation" @151
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1552, 784)
-				label      	(object ItemLabel
-				    Parent_View 	@151
-				    location   	(1214, 620)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	677
-				    justify    	0
-				    label      	"Operation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C80D03CE"
-				compartment 	(object Compartment
-				    Parent_View 	@151
-				    location   	(1214, 681)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	5
-				    max_width  	446)
-				width      	695
-				height     	352
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$6" @152
-				location   	(1024, 797)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5C824018C"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eOperations" @153
-					Parent_View 	@152
-					location   	(592, 269)
-					label      	(object SegLabel @154
-					    Parent_View 	@153
-					    location   	(1088, 748)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	249
-					    justify    	0
-					    label      	"+eOperations"
-					    pctDist    	0.359649
-					    height     	50
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5C82701CD"
-					client     	@152
-					supplier   	@151
-					line_style 	3
-					origin_attachment 	(1024, 797)
-					terminal_attachment 	(1205, 797)
-					label      	(object SegLabel @155
-					    Parent_View 	@153
-					    location   	(1176, 861)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.840391
-					    height     	64
-					    orientation 	1)
-					label      	(object SegLabel @156
-					    Parent_View 	@153
-					    location   	(1074, 923)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	164
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.276243
-					    height     	126
-					    orientation 	1))
-				    (object RoleView "portType" @157
-					Parent_View 	@152
-					location   	(592, 269)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5C82701C3"
-					client     	@152
-					supplier   	@146
-					line_style 	3
-					origin_attachment 	(1024, 797)
-					terminal_attachment 	(843, 797)
-					label      	(object SegLabel @158
-					    Parent_View 	@157
-					    location   	(888, 757)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.753488
-					    height     	41
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$47" @159
-				location   	(2107, 773)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AEA412F0035"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eParameterOrdering" @160
-					Parent_View 	@159
-					location   	(1819, 101)
-					label      	(object SegLabel @161
-					    Parent_View 	@160
-					    location   	(2145, 647)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+eParameterOrdering"
-					    pctDist    	0.183333
-					    height     	127
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AEA41310255"
-					client     	@159
-					supplier   	@147
-					line_style 	3
-					origin_attachment 	(2107, 773)
-					terminal_attachment 	(2316, 773)
-					label      	(object SegLabel @162
-					    Parent_View 	@160
-					    location   	(2272, 822)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.796610
-					    height     	49
-					    orientation 	1)
-					label      	(object SegLabel @163
-					    Parent_View 	@160
-					    location   	(2171, 888)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	164
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.306220
-					    height     	115
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$48" @164
-					Parent_View 	@159
-					location   	(1819, 101)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AEA4131025F"
-					client     	@159
-					supplier   	@151
-					line_style 	3
-					origin_attachment 	(2107, 773)
-					terminal_attachment 	(1899, 773))))
-			    (object AssociationViewNew "$UNNAMED$37" @165
-				location   	(1702, 1504)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3ADF331601A4"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eFaults" @166
-					Parent_View 	@165
-					location   	(1414, 832)
-					label      	(object SegLabel @167
-					    Parent_View 	@166
-					    location   	(1815, 1982)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+eFaults"
-					    pctDist    	0.878992
-					    height     	113
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF33180387"
-					client     	@165
-					supplier   	@148
-					line_style 	3
-					origin_attachment 	(1702, 1504)
-					terminal_attachment 	(1702, 2048)
-					label      	(object SegLabel @168
-					    Parent_View 	@166
-					    location   	(1644, 2020)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.949580
-					    height     	59
-					    orientation 	1)
-					label      	(object SegLabel @169
-					    Parent_View 	@166
-					    location   	(1593, 1963)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	164
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.845378
-					    height     	110
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$38" @170
-					Parent_View 	@165
-					location   	(1414, 832)
-					label      	(object SegLabel @171
-					    Parent_View 	@170
-					    location   	(1661, 1069)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF33180388"
-					client     	@165
-					supplier   	@151
-					line_style 	3
-					origin_attachment 	(1702, 1504)
-					terminal_attachment 	(1702, 960)
-					label      	(object SegLabel @172
-					    Parent_View 	@170
-					    location   	(1821, 1039)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.857362
-					    height     	119
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$33" @173
-				location   	(1178, 1234)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3ADF2F94024D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eInput" @174
-					Parent_View 	@173
-					location   	(890, 562)
-					label      	(object SegLabel @175
-					    Parent_View 	@174
-					    location   	(878, 1343)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	132
-					    justify    	0
-					    label      	"+eInput"
-					    pctDist    	0.819820
-					    height     	103
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2F950190"
-					client     	@173
-					supplier   	@149
-					vertices   	(list Points
-					    (1178, 1234)
-					    (980, 1234)
-					    (980, 1410))
-					line_style 	3
-					origin_attachment 	(1178, 1234)
-					terminal_attachment 	(980, 1410)
-					label      	(object SegLabel @176
-					    Parent_View 	@174
-					    location   	(1046, 1364)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.877660
-					    height     	66
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$34" @177
-					Parent_View 	@173
-					location   	(890, 562)
-					label      	(object SegLabel @178
-					    Parent_View 	@177
-					    location   	(1236, 1036)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2F95019A"
-					client     	@173
-					supplier   	@151
-					vertices   	(list Points
-					    (1178, 1234)
-					    (1277, 1234)
-					    (1277, 960))
-					line_style 	3
-					origin_attachment 	(1178, 1234)
-					terminal_attachment 	(1277, 960)
-					label      	(object SegLabel @179
-					    Parent_View 	@177
-					    location   	(1197, 1058)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.736413
-					    height     	81
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$35" @180
-				location   	(1468, 1345)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3ADF2FB802F9"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eOutput" @181
-					Parent_View 	@180
-					location   	(1180, 673)
-					label      	(object SegLabel @182
-					    Parent_View 	@181
-					    location   	(1362, 1669)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+eOutput"
-					    pctDist    	0.840909
-					    height     	107
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2FB9020A"
-					client     	@180
-					supplier   	@150
-					line_style 	3
-					origin_attachment 	(1468, 1345)
-					terminal_attachment 	(1468, 1730)
-					label      	(object SegLabel @183
-					    Parent_View 	@181
-					    location   	(1546, 1676)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.863636
-					    height     	78
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$36" @184
-					Parent_View 	@180
-					location   	(1180, 673)
-					label      	(object SegLabel @185
-					    Parent_View 	@184
-					    location   	(1427, 1037)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2FB9020B"
-					client     	@180
-					supplier   	@151
-					line_style 	3
-					origin_attachment 	(1468, 1345)
-					terminal_attachment 	(1468, 960)
-					label      	(object SegLabel @186
-					    Parent_View 	@184
-					    location   	(1523, 1080)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.690341
-					    height     	55
-					    orientation 	1))))
-			    (object InheritView "" @187
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F6F1FD8019F"
-				client     	@146
-				supplier   	@141
-				line_style 	0)
-			    (object InheritView "" @188
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F6F1FE20171"
-				client     	@151
-				supplier   	@142
-				line_style 	0)
-			    (object InheritView "" @189
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F6F1FEE031D"
-				client     	@149
-				supplier   	@143
-				line_style 	0)
-			    (object InheritView "" @190
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F6F1FF801CD"
-				client     	@150
-				supplier   	@144
-				line_style 	0)
-			    (object InheritView "" @191
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F6F2002002D"
-				client     	@148
-				supplier   	@145
-				line_style 	0)
-			    (object ClassView "Class" "Logical View::wsdl::Message" @192
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2224, 1456)
-				label      	(object ItemLabel
-				    Parent_View 	@192
-				    location   	(1937, 1312)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	575
-				    justify    	0
-				    label      	"Message")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C9590078"
-				compartment 	(object Compartment
-				    Parent_View 	@192
-				    location   	(1937, 1373)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	425)
-				width      	593
-				height     	312
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::wsdl::MessageReference" @193
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1520, 2544)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@193
-				    location   	(1193, 2466)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	654
-				    justify    	0
-				    label      	"MessageReference")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3F6771DB02DC"
-				compartment 	(object Compartment
-				    Parent_View 	@193
-				    location   	(1193, 2527)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	303)
-				width      	672
-				height     	180
-				annotation 	8)
-			    (object InheritTreeView "" @194
-				location   	(1524, 2275)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@193
-				vertices   	(list Points
-				    (1524, 2275)
-				    (1524, 2454)))
-			    (object InheritView "" @195
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F67723D0319"
-				client     	@148
-				supplier   	@193
-				line_style 	3
-				origin_attachment 	(1776, 2176)
-				terminal_attachment 	(1776, 2275)
-				drawSupplier 	@194)
-			    (object InheritView "" @196
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F67723500DD"
-				client     	@150
-				supplier   	@193
-				line_style 	3
-				origin_attachment 	(1371, 1854)
-				terminal_attachment 	(1371, 2275)
-				drawSupplier 	@194)
-			    (object InheritView "" @197
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F67722802E7"
-				client     	@149
-				supplier   	@193
-				line_style 	3
-				origin_attachment 	(980, 1534)
-				terminal_attachment 	(980, 2275)
-				drawSupplier 	@194)
-			    (object AssociationViewNew "$UNNAMED$67" @198
-				location   	(2206, 2259)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F74E78401B1"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eMessage" @199
-					Parent_View 	@198
-					location   	(734, -285)
-					label      	(object SegLabel @200
-					    Parent_View 	@199
-					    location   	(2068, 1670)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+eMessage"
-					    pctDist    	0.912230
-					    height     	139
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3F74E786000F"
-					client     	@198
-					supplier   	@192
-					line_style 	3
-					origin_attachment 	(2206, 2259)
-					terminal_attachment 	(2206, 1612)
-					label      	(object SegLabel @201
-					    Parent_View 	@199
-					    location   	(2260, 1678)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$68" @202
-					Parent_View 	@198
-					location   	(734, -285)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3F74E7860023"
-					client     	@198
-					supplier   	@193
-					vertices   	(list Points
-					    (2206, 2259)
-					    (2206, 2556)
-					    (1856, 2556))
-					line_style 	3
-					origin_attachment 	(2206, 2259)
-					terminal_attachment 	(1856, 2556))))))
-		    (object ClassDiagram "2.1 Definitions"
-			quid       	"3AD5E48A0262"
-			title      	"2.1 Definitions"
-			zoom       	83
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::IDefinition" @203
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(432, 192)
-				label      	(object ItemLabel
-				    Parent_View 	@203
-				    location   	(88, 161)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	688
-				    justify    	0
-				    label      	"IDefinition")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@203
-				    location   	(88, 111)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	688
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84B1D90142"
-				compartment 	(object Compartment
-				    Parent_View 	@203
-				    location   	(88, 220)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	700)
-				width      	706
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Types" @204
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1824, 944)
-				label      	(object ItemLabel
-				    Parent_View 	@204
-				    location   	(1686, 896)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	276
-				    justify    	0
-				    label      	"Types")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B8BE9A603A8"
-				width      	294
-				height     	120
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Import" @205
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2144, 624)
-				label      	(object ItemLabel
-				    Parent_View 	@205
-				    location   	(1910, 545)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"Import")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5E4F903DE"
-				compartment 	(object Compartment
-				    Parent_View 	@205
-				    location   	(1910, 604)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	478)
-				width      	486
-				height     	182
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Message" @206
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(2112, 1184)
-				label      	(object ItemLabel
-				    Parent_View 	@206
-				    location   	(1900, 1056)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	424
-				    justify    	0
-				    label      	"Message")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C9590078"
-				compartment 	(object Compartment
-				    Parent_View 	@206
-				    location   	(1900, 1115)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	425)
-				width      	442
-				height     	280
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::PortType" @207
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(1808, 1488)
-				label      	(object ItemLabel
-				    Parent_View 	@207
-				    location   	(1596, 1360)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	424
-				    justify    	0
-				    label      	"PortType")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C7F001A5"
-				compartment 	(object Compartment
-				    Parent_View 	@207
-				    location   	(1596, 1419)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	425)
-				width      	442
-				height     	280
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Binding" @208
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(2336, 1728)
-				label      	(object ItemLabel
-				    Parent_View 	@208
-				    location   	(2124, 1600)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	424
-				    justify    	0
-				    label      	"Binding")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D2860261"
-				compartment 	(object Compartment
-				    Parent_View 	@208
-				    location   	(2124, 1659)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	425)
-				width      	442
-				height     	280
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Definition" @209
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1328, 240)
-				label      	(object ItemLabel
-				    Parent_View 	@209
-				    location   	(1073, 39)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	510
-				    justify    	0
-				    label      	"Definition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5E43F008E"
-				compartment 	(object Compartment
-				    Parent_View 	@209
-				    location   	(1073, 98)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	7
-				    max_width  	521)
-				width      	528
-				height     	426
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$59" @210
-				location   	(1358, 860)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8BEA27029F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$60" @211
-					Parent_View 	@210
-					location   	(62, -36)
-					label      	(object SegLabel @212
-					    Parent_View 	@211
-					    location   	(1317, 535)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8BEA290356"
-					client     	@210
-					supplier   	@209
-					line_style 	3
-					origin_attachment 	(1358, 860)
-					terminal_attachment 	(1358, 453)
-					label      	(object SegLabel @213
-					    Parent_View 	@211
-					    location   	(1403, 511)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.856649
-					    height     	45
-					    orientation 	1))
-				    (object RoleView "eTypes" @214
-					Parent_View 	@210
-					location   	(62, -36)
-					label      	(object SegLabel @215
-					    Parent_View 	@214
-					    location   	(1586, 909)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	156
-					    justify    	0
-					    label      	"+eTypes"
-					    pctDist    	0.779097
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8BEA29036A"
-					client     	@210
-					supplier   	@204
-					vertices   	(list Points
-					    (1358, 860)
-					    (1358, 948)
-					    (1677, 948))
-					line_style 	3
-					origin_attachment 	(1358, 860)
-					terminal_attachment 	(1677, 948)
-					label      	(object SegLabel @216
-					    Parent_View 	@214
-					    location   	(1632, 987)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.892655
-					    height     	39
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$63" @217
-				location   	(1612, 595)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C864DFF02EC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$64" @218
-					Parent_View 	@217
-					location   	(12, 227)
-					label      	(object SegLabel @219
-					    Parent_View 	@218
-					    location   	(1423, 512)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C864DFF02EE"
-					client     	@217
-					supplier   	@209
-					vertices   	(list Points
-					    (1612, 595)
-					    (1464, 595)
-					    (1464, 453))
-					line_style 	3
-					origin_attachment 	(1612, 595)
-					terminal_attachment 	(1464, 453)
-					label      	(object SegLabel @220
-					    Parent_View 	@218
-					    location   	(1524, 495)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.858667
-					    height     	60
-					    orientation 	1))
-				    (object RoleView "eImports" @221
-					Parent_View 	@217
-					location   	(12, 227)
-					label      	(object SegLabel @222
-					    Parent_View 	@221
-					    location   	(1692, 557)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	204
-					    justify    	0
-					    label      	"+eImports"
-					    pctDist    	0.280335
-					    height     	39
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C864DFF02ED"
-					client     	@217
-					supplier   	@205
-					line_style 	3
-					origin_attachment 	(1612, 595)
-					terminal_attachment 	(1901, 595)
-					label      	(object SegLabel @223
-					    Parent_View 	@221
-					    location   	(1854, 652)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.841004
-					    height     	57
-					    orientation 	1)
-					label      	(object SegLabel @224
-					    Parent_View 	@221
-					    location   	(1676, 646)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	158
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.225941
-					    height     	51
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$19" @225
-				location   	(1279, 1137)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5E60301E2"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$20" @226
-					Parent_View 	@225
-					location   	(271, 273)
-					label      	(object SegLabel @227
-					    Parent_View 	@226
-					    location   	(1238, 591)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E60400B7"
-					client     	@225
-					supplier   	@209
-					line_style 	3
-					origin_attachment 	(1279, 1137)
-					terminal_attachment 	(1279, 453)
-					label      	(object SegLabel @228
-					    Parent_View 	@226
-					    location   	(1320, 586)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.804974
-					    height     	41
-					    orientation 	1))
-				    (object RoleView "eMessages" @229
-					Parent_View 	@225
-					location   	(271, 273)
-					label      	(object SegLabel @230
-					    Parent_View 	@229
-					    location   	(1647, 1171)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+eMessages"
-					    pctDist    	0.643137
-					    height     	38
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E60400C1"
-					client     	@225
-					supplier   	@206
-					vertices   	(list Points
-					    (1279, 1137)
-					    (1279, 1208)
-					    (1891, 1208))
-					line_style 	3
-					origin_attachment 	(1279, 1137)
-					terminal_attachment 	(1891, 1208)
-					label      	(object SegLabel @231
-					    Parent_View 	@229
-					    location   	(1821, 1171)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.899346
-					    height     	38
-					    orientation 	0)
-					label      	(object SegLabel @232
-					    Parent_View 	@229
-					    location   	(1797, 1244)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	158
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.864407
-					    height     	36
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$21" @233
-				location   	(1212, 1159)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5E6710104"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$22" @234
-					Parent_View 	@233
-					location   	(-324, 215)
-					label      	(object SegLabel @235
-					    Parent_View 	@234
-					    location   	(1171, 594)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E672034A"
-					client     	@233
-					supplier   	@209
-					line_style 	3
-					origin_attachment 	(1212, 1159)
-					terminal_attachment 	(1212, 453)
-					label      	(object SegLabel @236
-					    Parent_View 	@234
-					    location   	(1251, 624)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.757962
-					    height     	39
-					    orientation 	1))
-				    (object RoleView "ePortTypes" @237
-					Parent_View 	@233
-					location   	(-324, 215)
-					label      	(object SegLabel @238
-					    Parent_View 	@237
-					    location   	(1391, 1451)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+ePortTypes"
-					    pctDist    	0.723698
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E6720354"
-					client     	@233
-					supplier   	@207
-					vertices   	(list Points
-					    (1212, 1159)
-					    (1212, 1490)
-					    (1587, 1490))
-					line_style 	3
-					origin_attachment 	(1212, 1159)
-					terminal_attachment 	(1587, 1490)
-					label      	(object SegLabel @239
-					    Parent_View 	@237
-					    location   	(1533, 1451)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.925611
-					    height     	40
-					    orientation 	0)
-					label      	(object SegLabel @240
-					    Parent_View 	@237
-					    location   	(1512, 1540)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	158
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.895855
-					    height     	50
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$23" @241
-				location   	(1114, 1585)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5E6770095"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$24" @242
-					Parent_View 	@241
-					location   	(-406, 241)
-					label      	(object SegLabel @243
-					    Parent_View 	@242
-					    location   	(1073, 680)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E6780371"
-					client     	@241
-					supplier   	@209
-					line_style 	3
-					origin_attachment 	(1114, 1585)
-					terminal_attachment 	(1114, 453)
-					label      	(object SegLabel @244
-					    Parent_View 	@242
-					    location   	(1155, 752)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.736704
-					    height     	41
-					    orientation 	1))
-				    (object RoleView "eBindings" @245
-					Parent_View 	@241
-					location   	(-406, 241)
-					label      	(object SegLabel @246
-					    Parent_View 	@245
-					    location   	(1851, 1674)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	204
-					    justify    	0
-					    label      	"+eBindings"
-					    pctDist    	0.766347
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E678037B"
-					client     	@241
-					supplier   	@208
-					vertices   	(list Points
-					    (1114, 1585)
-					    (1114, 1716)
-					    (2115, 1716))
-					line_style 	3
-					origin_attachment 	(1114, 1585)
-					terminal_attachment 	(2115, 1716)
-					label      	(object SegLabel @247
-					    Parent_View 	@245
-					    location   	(2053, 1677)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.945074
-					    height     	40
-					    orientation 	0)
-					label      	(object SegLabel @248
-					    Parent_View 	@245
-					    location   	(2014, 1754)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	158
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.911072
-					    height     	38
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::wsdl::Service" @249
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(1840, 2048)
-				label      	(object ItemLabel
-				    Parent_View 	@249
-				    location   	(1628, 1920)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	424
-				    justify    	0
-				    label      	"Service")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D8F002F8"
-				compartment 	(object Compartment
-				    Parent_View 	@249
-				    location   	(1628, 1979)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	425)
-				width      	442
-				height     	280
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$25" @250
-				location   	(1066, 1533)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5E67B0311"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$26" @251
-					Parent_View 	@250
-					location   	(-521, -111)
-					label      	(object SegLabel @252
-					    Parent_View 	@251
-					    location   	(1025, 669)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E67D007F"
-					client     	@250
-					supplier   	@209
-					line_style 	3
-					origin_attachment 	(1066, 1533)
-					terminal_attachment 	(1066, 453)
-					label      	(object SegLabel @253
-					    Parent_View 	@251
-					    location   	(1109, 756)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.719697
-					    height     	43
-					    orientation 	1))
-				    (object RoleView "eServices" @254
-					Parent_View 	@250
-					location   	(-521, -111)
-					label      	(object SegLabel @255
-					    Parent_View 	@254
-					    location   	(1393, 2028)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	204
-					    justify    	0
-					    label      	"+eServices"
-					    pctDist    	0.791824
-					    height     	32
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E67D0089"
-					client     	@250
-					supplier   	@249
-					vertices   	(list Points
-					    (1066, 1533)
-					    (1066, 2059)
-					    (1619, 2059))
-					line_style 	3
-					origin_attachment 	(1066, 1533)
-					terminal_attachment 	(1619, 2059)
-					label      	(object SegLabel @256
-					    Parent_View 	@254
-					    location   	(1554, 2031)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.940197
-					    height     	29
-					    orientation 	0)
-					label      	(object SegLabel @257
-					    Parent_View 	@254
-					    location   	(1532, 2113)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	158
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.920515
-					    height     	54
-					    orientation 	1))))
-			    (object InheritView "" @258
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84B1F80382"
-				client     	@209
-				supplier   	@203
-				line_style 	3
-				origin_attachment 	(1064, 263)
-				terminal_attachment 	(785, 263))))
-		    (object ClassDiagram "2.1.3 Extensibility"
-			quid       	"3AD60C510192"
-			title      	"2.1.3 Extensibility"
-			zoom       	80
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::Binding" @259
-				ShowCompartmentStereotypes 	TRUE
-				location   	(576, 1584)
-				label      	(object ItemLabel
-				    Parent_View 	@259
-				    location   	(494, 1531)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	164
-				    justify    	0
-				    label      	"Binding")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D2860261"
-				width      	182
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Port" @260
-				ShowCompartmentStereotypes 	TRUE
-				location   	(1568, 1888)
-				label      	(object ItemLabel
-				    Parent_View 	@260
-				    location   	(1487, 1836)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	162
-				    justify    	0
-				    label      	"Port")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D9170286"
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Service" @261
-				ShowCompartmentStereotypes 	TRUE
-				location   	(1424, 1728)
-				label      	(object ItemLabel
-				    Parent_View 	@261
-				    location   	(1342, 1675)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	164
-				    justify    	0
-				    label      	"Service")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D8F002F8"
-				width      	182
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::BindingFault" @262
-				ShowCompartmentStereotypes 	TRUE
-				location   	(1216, 2336)
-				label      	(object ItemLabel
-				    Parent_View 	@262
-				    location   	(1088, 2283)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	256
-				    justify    	0
-				    label      	"BindingFault")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE08A9E03A6"
-				width      	274
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::BindingOperation" @263
-				ShowCompartmentStereotypes 	TRUE
-				location   	(736, 1760)
-				label      	(object ItemLabel
-				    Parent_View 	@263
-				    location   	(563, 1707)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	346
-				    justify    	0
-				    label      	"BindingOperation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D3CB0145"
-				width      	364
-				height     	130
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IExtensibilityElement" @264
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1888, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@264
-				    location   	(1495, 136)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	786
-				    justify    	0
-				    label      	"IExtensibilityElement")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@264
-				    location   	(1495, 86)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	786
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84B12402AB"
-				width      	804
-				height     	172
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::BindingInput" @265
-				ShowCompartmentStereotypes 	TRUE
-				location   	(928, 1952)
-				label      	(object ItemLabel
-				    Parent_View 	@265
-				    location   	(800, 1899)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	256
-				    justify    	0
-				    label      	"BindingInput")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE08A8202D4"
-				width      	274
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::BindingOutput" @266
-				ShowCompartmentStereotypes 	TRUE
-				location   	(1008, 2144)
-				label      	(object ItemLabel
-				    Parent_View 	@266
-				    location   	(863, 2091)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	290
-				    justify    	0
-				    label      	"BindingOutput")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE08A8F028C"
-				width      	308
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Definition" @267
-				ShowCompartmentStereotypes 	TRUE
-				location   	(176, 1296)
-				label      	(object ItemLabel
-				    Parent_View 	@267
-				    location   	(74, 1235)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	204
-				    justify    	0
-				    label      	"Definition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5E43F008E"
-				width      	222
-				height     	146
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Types" @268
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(416, 1408)
-				label      	(object ItemLabel
-				    Parent_View 	@268
-				    location   	(335, 1356)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	162
-				    justify    	0
-				    label      	"Types")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B8BE9A603A8"
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::ExtensibleElement" @269
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(480, 688)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@269
-				    location   	(209, 580)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	542
-				    justify    	0
-				    label      	"ExtensibleElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5FCFA033A"
-				compartment 	(object Compartment
-				    Parent_View 	@269
-				    location   	(209, 641)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	531)
-				width      	560
-				height     	240
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @270
-				location   	(480, 1039)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@269
-				vertices   	(list Points
-				    (480, 1039)
-				    (480, 808)))
-			    (object InheritView "" @271
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD600CB00AA"
-				client     	@260
-				supplier   	@269
-				line_style 	3
-				origin_attachment 	(1566, 1824)
-				terminal_attachment 	(1566, 1039)
-				drawSupplier 	@270)
-			    (object InheritView "" @272
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B85B5A4027E"
-				client     	@266
-				supplier   	@269
-				line_style 	3
-				origin_attachment 	(1097, 2079)
-				terminal_attachment 	(1097, 1039)
-				drawSupplier 	@270)
-			    (object InheritView "" @273
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AE0938602C9"
-				client     	@262
-				supplier   	@269
-				line_style 	3
-				origin_attachment 	(1219, 2271)
-				terminal_attachment 	(1219, 1039)
-				drawSupplier 	@270)
-			    (object InheritView "" @274
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B85B59B0072"
-				client     	@265
-				supplier   	@269
-				line_style 	3
-				origin_attachment 	(988, 1887)
-				terminal_attachment 	(988, 1039)
-				drawSupplier 	@270)
-			    (object InheritView "" @275
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD6009202F7"
-				client     	@263
-				supplier   	@269
-				line_style 	3
-				origin_attachment 	(797, 1695)
-				terminal_attachment 	(797, 1039)
-				drawSupplier 	@270)
-			    (object InheritView "" @276
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5FA0F02F0"
-				client     	@259
-				supplier   	@269
-				line_style 	3
-				origin_attachment 	(601, 1519)
-				terminal_attachment 	(601, 1039)
-				drawSupplier 	@270)
-			    (object InheritView "" @277
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5FDB803D4"
-				client     	@267
-				supplier   	@269
-				line_style 	3
-				origin_attachment 	(211, 1223)
-				terminal_attachment 	(211, 1039)
-				drawSupplier 	@270)
-			    (object InheritView "" @278
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8BEB010311"
-				client     	@268
-				supplier   	@269
-				line_style 	3
-				origin_attachment 	(414, 1344)
-				terminal_attachment 	(414, 1039)
-				drawSupplier 	@270)
-			    (object InheritView "" @279
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5FA20025E"
-				client     	@261
-				supplier   	@269
-				line_style 	3
-				origin_attachment 	(1429, 1663)
-				terminal_attachment 	(1429, 1039)
-				drawSupplier 	@270)
-			    (object ClassView "Class" "Logical View::wsdl::ExtensibilityElement" @280
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1904, 688)
-				label      	(object ItemLabel
-				    Parent_View 	@280
-				    location   	(1632, 583)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	545
-				    justify    	0
-				    label      	"ExtensibilityElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5DBB602A9"
-				compartment 	(object Compartment
-				    Parent_View 	@280
-				    location   	(1632, 644)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	465)
-				width      	563
-				height     	234
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$27" @281
-				location   	(1191, 672)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5FD130079"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$28" @282
-					Parent_View 	@281
-					location   	(23, 560)
-					label      	(object SegLabel @283
-					    Parent_View 	@282
-					    location   	(847, 631)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5FD14019E"
-					client     	@281
-					supplier   	@269
-					line_style 	3
-					origin_attachment 	(1191, 672)
-					terminal_attachment 	(760, 672)
-					label      	(object SegLabel @284
-					    Parent_View 	@282
-					    location   	(830, 628)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.839695
-					    height     	45
-					    orientation 	1))
-				    (object RoleView "eExtensibilityElements" @285
-					Parent_View 	@281
-					location   	(23, 560)
-					label      	(object SegLabel @286
-					    Parent_View 	@285
-					    location   	(1355, 522)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	"+eExtensibilityElements"
-					    pctDist    	0.379070
-					    height     	151
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5FD14019D"
-					client     	@281
-					supplier   	@280
-					line_style 	3
-					origin_attachment 	(1191, 672)
-					terminal_attachment 	(1623, 672)
-					label      	(object SegLabel @287
-					    Parent_View 	@285
-					    location   	(1496, 627)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.709402
-					    height     	46
-					    orientation 	0)
-					label      	(object SegLabel @288
-					    Parent_View 	@285
-					    location   	(1463, 764)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	164
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.632479
-					    height     	92
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::wsdl::WSDLElement" @289
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(1008, 192)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@289
-				    location   	(630, 84)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	756
-				    justify    	0
-				    label      	"WSDLElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C6A302DD"
-				compartment 	(object Compartment
-				    Parent_View 	@289
-				    location   	(630, 145)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	753)
-				width      	774
-				height     	240
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @290
-				location   	(1008, 402)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@289
-				vertices   	(list Points
-				    (1008, 402)
-				    (1008, 312)))
-			    (object InheritView "" @291
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5FE3C03D4"
-				client     	@269
-				supplier   	@289
-				line_style 	3
-				origin_attachment 	(492, 568)
-				terminal_attachment 	(492, 402)
-				drawSupplier 	@290)
-			    (object InheritView "" @292
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84B14903D0"
-				client     	@280
-				supplier   	@264
-				line_style 	3
-				origin_attachment 	(2015, 571)
-				terminal_attachment 	(2015, 246))
-			    (object InheritView "" @293
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BDDF53502C3"
-				client     	@280
-				supplier   	@289
-				line_style 	3
-				origin_attachment 	(1762, 571)
-				terminal_attachment 	(1762, 402)
-				drawSupplier 	@290)
-			    (object ClassView "Class" "Logical View::wsdl::UnknownExtensibilityElement" @294
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2016, 1360)
-				label      	(object ItemLabel
-				    Parent_View 	@294
-				    location   	(1731, 1307)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	570
-				    justify    	0
-				    label      	"UnknownExtensibilityElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3CB24AC002AE"
-				width      	588
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @295
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3CB24AEC01CB"
-				client     	@294
-				supplier   	@280
-				line_style 	3
-				origin_attachment 	(1796, 1295)
-				terminal_attachment 	(1796, 805))
-			    (object AssociationViewNew "$UNNAMED$69" @296
-				location   	(2311, 1686)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F7896A2026E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "parent" @297
-					Parent_View 	@296
-					location   	(279, 294)
-					label      	(object SegLabel @298
-					    Parent_View 	@297
-					    location   	(2422, 1333)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	144
-					    justify    	0
-					    label      	"+parent"
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3F7896A7012B"
-					client     	@296
-					supplier   	@294
-					vertices   	(list Points
-					    (2311, 1686)
-					    (2432, 1686)
-					    (2432, 1374)
-					    (2310, 1374))
-					line_style 	3
-					origin_attachment 	(2311, 1686)
-					terminal_attachment 	(2310, 1374)
-					label      	(object SegLabel @299
-					    Parent_View 	@297
-					    location   	(2366, 1428)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	0))
-				    (object RoleView "children" @300
-					Parent_View 	@296
-					location   	(279, 294)
-					label      	(object SegLabel @301
-					    Parent_View 	@300
-					    location   	(1899, 1537)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+children"
-					    pctDist    	0.798561
-					    height     	118
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3F7896A7012C"
-					client     	@296
-					supplier   	@294
-					vertices   	(list Points
-					    (2311, 1686)
-					    (2016, 1686)
-					    (2016, 1425))
-					line_style 	3
-					origin_attachment 	(2311, 1686)
-					terminal_attachment 	(2016, 1425)
-					label      	(object SegLabel @302
-					    Parent_View 	@300
-					    location   	(2070, 1481)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	1))))))
-		    (object ClassDiagram "2.1.1 Naming and Linking"
-			quid       	"3AE8ED7201BD"
-			title      	"2.1.1 Naming and Linking"
-			zoom       	90
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::IImport" @303
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1712, 224)
-				label      	(object ItemLabel
-				    Parent_View 	@303
-				    location   	(1422, 177)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	580
-				    justify    	0
-				    label      	"IImport")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@303
-				    location   	(1422, 127)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	580
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84B2020119"
-				width      	598
-				height     	218
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Namespace" @304
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(432, 1136)
-				label      	(object ItemLabel
-				    Parent_View 	@304
-				    location   	(202, 1041)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	461
-				    justify    	0
-				    label      	"Namespace")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AEA3CD30030"
-				width      	479
-				height     	215
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @305
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1632, 1216)
-				label      	(object ItemLabel
-				    Parent_View 	@305
-				    location   	(1294, 1142)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	676
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	694
-				height     	173
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Definition" @306
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(400, 384)
-				label      	(object ItemLabel
-				    Parent_View 	@306
-				    location   	(164, 236)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	472
-				    justify    	0
-				    label      	"Definition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5E43F008E"
-				width      	490
-				height     	320
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$43" @307
-				location   	(309, 786)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AEA3D55002D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eNamespaces" @308
-					Parent_View 	@307
-					location   	(-91, 258)
-					label      	(object SegLabel @309
-					    Parent_View 	@308
-					    location   	(461, 956)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	288
-					    justify    	0
-					    label      	"+eNamespaces"
-					    pctDist    	0.698842
-					    height     	152
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AEA3D560332"
-					client     	@307
-					supplier   	@304
-					line_style 	3
-					origin_attachment 	(309, 786)
-					terminal_attachment 	(309, 1029)
-					label      	(object SegLabel @310
-					    Parent_View 	@308
-					    location   	(248, 973)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.768707
-					    height     	62
-					    orientation 	1)
-					label      	(object SegLabel @311
-					    Parent_View 	@308
-					    location   	(228, 913)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	146
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.525097
-					    height     	82
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$44" @312
-					Parent_View 	@307
-					location   	(-91, 258)
-					label      	(object SegLabel @313
-					    Parent_View 	@312
-					    location   	(268, 592)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	192
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AEA3D560328"
-					client     	@307
-					supplier   	@306
-					line_style 	3
-					origin_attachment 	(309, 786)
-					terminal_attachment 	(309, 544)
-					label      	(object SegLabel @314
-					    Parent_View 	@312
-					    location   	(239, 583)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.844961
-					    height     	71
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::wsdl::Import" @315
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1472, 720)
-				label      	(object ItemLabel
-				    Parent_View 	@315
-				    location   	(1255, 580)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	434
-				    justify    	0
-				    label      	"Import")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5E4F903DE"
-				width      	452
-				height     	304
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$57" @316
-				location   	(1486, 1001)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8B1DCC02E5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eSchema" @317
-					Parent_View 	@316
-					location   	(510, -103)
-					label      	(object SegLabel @318
-					    Parent_View 	@317
-					    location   	(1737, 1018)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	204
-					    justify    	0
-					    label      	"+eSchema"
-					    pctDist    	0.592593
-					    height     	105
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8B1DCE0270"
-					client     	@316
-					supplier   	@305
-					vertices   	(list Points
-					    (1486, 1001)
-					    (1632, 1001)
-					    (1632, 1130))
-					line_style 	3
-					origin_attachment 	(1486, 1001)
-					terminal_attachment 	(1632, 1130)
-					label      	(object SegLabel @319
-					    Parent_View 	@317
-					    location   	(1563, 1018)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.592593
-					    height     	70
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$58" @320
-					Parent_View 	@316
-					location   	(510, -103)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8B1DCE027A"
-					client     	@316
-					supplier   	@315
-					line_style 	3
-					origin_attachment 	(1486, 1000)
-					terminal_attachment 	(1486, 872))))
-			    (object AssociationViewNew "$UNNAMED$45" @321
-				location   	(1087, 403)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AEA3E3A002D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$46" @322
-					Parent_View 	@321
-					location   	(687, -125)
-					label      	(object SegLabel @323
-					    Parent_View 	@322
-					    location   	(1406, 480)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AEA3E3C01F2"
-					client     	@321
-					supplier   	@315
-					vertices   	(list Points
-					    (1087, 403)
-					    (1364, 403)
-					    (1364, 568))
-					line_style 	3
-					origin_attachment 	(1087, 403)
-					terminal_attachment 	(1364, 568))
-				    (object RoleView "eDefinition" @324
-					Parent_View 	@321
-					location   	(687, -125)
-					label      	(object SegLabel @325
-					    Parent_View 	@324
-					    location   	(805, 363)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+eDefinition"
-					    pctDist    	0.637532
-					    height     	41
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AEA3E3C01E8"
-					client     	@321
-					supplier   	@306
-					line_style 	3
-					origin_attachment 	(1087, 403)
-					terminal_attachment 	(645, 403)
-					label      	(object SegLabel @326
-					    Parent_View 	@324
-					    location   	(727, 456)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.814910
-					    height     	53
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$63" @327
-				location   	(737, 826)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C864DFF02EC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$64" @328
-					Parent_View 	@327
-					location   	(-671, 106)
-					label      	(object SegLabel @329
-					    Parent_View 	@328
-					    location   	(552, 647)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C864DFF02EE"
-					client     	@327
-					supplier   	@306
-					vertices   	(list Points
-					    (737, 826)
-					    (510, 826)
-					    (510, 544))
-					line_style 	3
-					origin_attachment 	(737, 826)
-					terminal_attachment 	(510, 544)
-					label      	(object SegLabel @330
-					    Parent_View 	@328
-					    location   	(457, 595)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	0))
-				    (object RoleView "eImports" @331
-					Parent_View 	@327
-					location   	(-671, 106)
-					label      	(object SegLabel @332
-					    Parent_View 	@331
-					    location   	(1144, 773)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+eImports"
-					    pctDist    	0.799189
-					    height     	54
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C864DFF02ED"
-					client     	@327
-					supplier   	@315
-					line_style 	3
-					origin_attachment 	(737, 826)
-					terminal_attachment 	(1246, 826)
-					label      	(object SegLabel @333
-					    Parent_View 	@331
-					    location   	(1180, 879)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.872211
-					    height     	53
-					    orientation 	1)
-					label      	(object SegLabel @334
-					    Parent_View 	@331
-					    location   	(1162, 933)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	146
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.837728
-					    height     	107
-					    orientation 	1))))
-			    (object InheritView "" @335
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F6F200D0340"
-				client     	@315
-				supplier   	@303
-				line_style 	3
-				origin_attachment 	(1555, 568)
-				terminal_attachment 	(1555, 333))))
-		    (object ClassDiagram "2.2 Types"
-			quid       	"3B85AE59037E"
-			title      	"2.2 Types"
-			zoom       	90
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	81
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @336
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1136, 1232)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@336
-				    location   	(895, 1157)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	482
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ECD302A9"
-				width      	500
-				height     	174
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @337
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1136, 1600)
-				label      	(object ItemLabel
-				    Parent_View 	@337
-				    location   	(906, 1531)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	460
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				width      	478
-				height     	162
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Message" @338
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1280, 1968)
-				label      	(object ItemLabel
-				    Parent_View 	@338
-				    location   	(1022, 1828)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	517
-				    justify    	0
-				    label      	"Message")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C9590078"
-				compartment 	(object Compartment
-				    Parent_View 	@338
-				    location   	(1022, 1883)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	5
-				    max_width  	425)
-				width      	535
-				height     	305
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Part" @339
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(352, 1184)
-				label      	(object ItemLabel
-				    Parent_View 	@339
-				    location   	(128, 1067)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	448
-				    justify    	0
-				    label      	"Part")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5CE1C032E"
-				compartment 	(object Compartment
-				    Parent_View 	@339
-				    location   	(128, 1122)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	484)
-				width      	466
-				height     	258
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$53" @340
-				location   	(735, 1172)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8B1BE900C4"
-				roleview_list 	(list RoleViews
-				    (object RoleView "typeDefinition" @341
-					Parent_View 	@340
-					location   	(143, 676)
-					label      	(object SegLabel @342
-					    Parent_View 	@341
-					    location   	(775, 1133)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+typeDefinition"
-					    pctDist    	0.269006
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8B1BE90327"
-					client     	@340
-					supplier   	@336
-					line_style 	3
-					origin_attachment 	(735, 1172)
-					terminal_attachment 	(886, 1172)
-					label      	(object SegLabel @343
-					    Parent_View 	@341
-					    location   	(839, 1207)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.688705
-					    height     	35
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$54" @344
-					Parent_View 	@340
-					location   	(143, 676)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8B1BE90331"
-					client     	@340
-					supplier   	@339
-					line_style 	3
-					origin_attachment 	(735, 1172)
-					terminal_attachment 	(585, 1172))))
-			    (object AssociationViewNew "$UNNAMED$55" @345
-				location   	(527, 1592)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8B1C1203B2"
-				roleview_list 	(list RoleViews
-				    (object RoleView "elementDeclaration" @346
-					Parent_View 	@345
-					location   	(-65, 1096)
-					label      	(object SegLabel @347
-					    Parent_View 	@346
-					    location   	(666, 1554)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+elementDeclaration"
-					    pctDist    	0.375394
-					    height     	39
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8B1C14001C"
-					client     	@345
-					supplier   	@337
-					line_style 	3
-					origin_attachment 	(527, 1592)
-					terminal_attachment 	(897, 1592)
-					label      	(object SegLabel @348
-					    Parent_View 	@346
-					    location   	(807, 1645)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.755877
-					    height     	53
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$56" @349
-					Parent_View 	@345
-					location   	(-65, 1096)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8B1C140026"
-					client     	@345
-					supplier   	@339
-					vertices   	(list Points
-					    (527, 1592)
-					    (437, 1592)
-					    (437, 1313))
-					line_style 	3
-					origin_attachment 	(527, 1592)
-					terminal_attachment 	(437, 1313))))
-			    (object AssociationViewNew "$UNNAMED$61" @350
-				location   	(322, 1911)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C46829303E5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eMessage" @351
-					Parent_View 	@350
-					location   	(-14, 1191)
-					label      	(object SegLabel @352
-					    Parent_View 	@351
-					    location   	(838, 1872)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+eMessage"
-					    pctDist    	0.748560
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C468296010E"
-					client     	@350
-					supplier   	@338
-					line_style 	3
-					origin_attachment 	(322, 1911)
-					terminal_attachment 	(1013, 1911)
-					label      	(object SegLabel @353
-					    Parent_View 	@351
-					    location   	(943, 1965)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$62" @354
-					Parent_View 	@350
-					location   	(-14, 1191)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C4682960118"
-					client     	@350
-					supplier   	@339
-					vertices   	(list Points
-					    (322, 1911)
-					    (229, 1911)
-					    (229, 1313))
-					line_style 	3
-					origin_attachment 	(322, 1911)
-					terminal_attachment 	(229, 1313))))
-			    (object ClassView "Class" "Logical View::wsdl::Types" @355
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(800, 608)
-				label      	(object ItemLabel
-				    Parent_View 	@355
-				    location   	(615, 512)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	371
-				    justify    	0
-				    label      	"Types")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B8BE9A603A8"
-				compartment 	(object Compartment
-				    Parent_View 	@355
-				    location   	(615, 567)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	312)
-				width      	389
-				height     	216
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Definition" @356
-				ShowCompartmentStereotypes 	TRUE
-				location   	(176, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@356
-				    location   	(74, 107)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	204
-				    justify    	0
-				    label      	"Definition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5E43F008E"
-				width      	222
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$59" @357
-				location   	(234, 604)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8BEA27029F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eTypes" @358
-					Parent_View 	@357
-					location   	(-150, 396)
-					label      	(object SegLabel @359
-					    Parent_View 	@358
-					    location   	(480, 640)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	207
-					    justify    	0
-					    label      	"+eTypes"
-					    pctDist    	0.661017
-					    height     	36
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8BEA29036A"
-					client     	@357
-					supplier   	@355
-					line_style 	3
-					origin_attachment 	(234, 604)
-					terminal_attachment 	(606, 604)
-					label      	(object SegLabel @360
-					    Parent_View 	@358
-					    location   	(526, 569)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.783883
-					    height     	36
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$60" @361
-					Parent_View 	@357
-					location   	(-150, 396)
-					label      	(object SegLabel @362
-					    Parent_View 	@361
-					    location   	(133, 313)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8BEA290356"
-					client     	@357
-					supplier   	@356
-					vertices   	(list Points
-					    (234, 604)
-					    (174, 604)
-					    (174, 225))
-					line_style 	3
-					origin_attachment 	(234, 604)
-					terminal_attachment 	(174, 225)
-					label      	(object SegLabel @363
-					    Parent_View 	@361
-					    location   	(228, 271)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.897729
-					    height     	54
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::wsdl::ITypes" @364
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(640, 224)
-				label      	(object ItemLabel
-				    Parent_View 	@364
-				    location   	(525, 203)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	230
-				    justify    	0
-				    label      	"ITypes")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@364
-				    location   	(525, 153)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	230
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3CADCBB20050"
-				width      	248
-				height     	166
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::XSDSchemaExtensibilityElement" @365
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1728, 800)
-				label      	(object ItemLabel
-				    Parent_View 	@365
-				    location   	(1359, 753)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	739
-				    justify    	0
-				    label      	"XSDSchemaExtensibilityElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3CC360D7039C"
-				width      	757
-				height     	118
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @366
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1856, 1216)
-				label      	(object ItemLabel
-				    Parent_View 	@366
-				    location   	(1529, 1103)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	655
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	673
-				height     	250
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$65" @367
-				location   	(1826, 975)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3CC3614500F2"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$66" @368
-					Parent_View 	@367
-					location   	(306, 447)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3CC36146023D"
-					client     	@367
-					supplier   	@365
-					line_style 	3
-					origin_attachment 	(1826, 975)
-					terminal_attachment 	(1826, 859)
-					label      	(object SegLabel @369
-					    Parent_View 	@368
-					    location   	(1774, 900)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.656489
-					    height     	53
-					    orientation 	0))
-				    (object RoleView "schema" @370
-					Parent_View 	@367
-					location   	(306, 447)
-					label      	(object SegLabel @371
-					    Parent_View 	@370
-					    location   	(2006, 1033)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+schema"
-					    pctDist    	0.507576
-					    height     	180
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3CC36146023E"
-					client     	@367
-					supplier   	@366
-					line_style 	3
-					origin_attachment 	(1826, 975)
-					terminal_attachment 	(1826, 1091)
-					label      	(object SegLabel @372
-					    Parent_View 	@370
-					    location   	(1788, 1050)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.651515
-					    height     	39
-					    orientation 	1))))
-			    (object InheritView "" @373
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3CADCD3B0380"
-				client     	@355
-				supplier   	@364
-				line_style 	3
-				origin_attachment 	(705, 500)
-				terminal_attachment 	(705, 307))
-			    (object ClassView "Class" "Logical View::wsdl::ExtensibleElement" @374
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1056, 224)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@374
-				    location   	(815, 130)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	482
-				    justify    	0
-				    label      	"ExtensibleElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5FCFA033A"
-				compartment 	(object Compartment
-				    Parent_View 	@374
-				    location   	(815, 185)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	531)
-				width      	500
-				height     	212
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @375
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8BEB010311"
-				client     	@355
-				supplier   	@374
-				line_style 	3
-				origin_attachment 	(854, 500)
-				terminal_attachment 	(854, 330))
-			    (object ClassView "Class" "Logical View::wsdl::ExtensibilityElement" @376
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(1824, 464)
-				label      	(object ItemLabel
-				    Parent_View 	@376
-				    location   	(1490, 368)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	669
-				    justify    	0
-				    label      	"ExtensibilityElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5DBB602A9"
-				compartment 	(object Compartment
-				    Parent_View 	@376
-				    location   	(1490, 423)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	465)
-				width      	687
-				height     	216
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$27" @377
-				location   	(1206, 493)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5FD130079"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$28" @378
-					Parent_View 	@377
-					location   	(-586, 237)
-					label      	(object SegLabel @379
-					    Parent_View 	@378
-					    location   	(1136, 386)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5FD14019E"
-					client     	@377
-					supplier   	@374
-					vertices   	(list Points
-					    (1206, 493)
-					    (1094, 493)
-					    (1094, 330))
-					line_style 	3
-					origin_attachment 	(1206, 493)
-					terminal_attachment 	(1094, 330)
-					label      	(object SegLabel @380
-					    Parent_View 	@378
-					    location   	(1042, 377)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.828326
-					    height     	53
-					    orientation 	0))
-				    (object RoleView "eExtensibilityElements" @381
-					Parent_View 	@377
-					location   	(-586, 237)
-					label      	(object SegLabel @382
-					    Parent_View 	@381
-					    location   	(1196, 454)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	444
-					    justify    	0
-					    label      	"+eExtensibilityElements"
-					    pctDist    	-0.039711
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5FD14019D"
-					client     	@377
-					supplier   	@376
-					line_style 	3
-					origin_attachment 	(1206, 493)
-					terminal_attachment 	(1481, 493)
-					label      	(object SegLabel @383
-					    Parent_View 	@381
-					    location   	(1415, 546)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.764957
-					    height     	53
-					    orientation 	1)
-					label      	(object SegLabel @384
-					    Parent_View 	@381
-					    location   	(1396, 392)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	146
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.694915
-					    height     	102
-					    orientation 	0))))
-			    (object InheritView "" @385
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3CC3627F00B7"
-				client     	@365
-				supplier   	@376
-				line_style 	3
-				origin_attachment 	(1812, 741)
-				terminal_attachment 	(1812, 572))))
-		    (object ClassDiagram "2.3 Messages"
-			quid       	"3BCE853D02C8"
-			title      	"2.3 Messages"
-			zoom       	85
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::IMessage" @386
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(448, 224)
-				label      	(object ItemLabel
-				    Parent_View 	@386
-				    location   	(267, 122)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	362
-				    justify    	0
-				    label      	"IMessage")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@386
-				    location   	(267, 72)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	362
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A8AF004F"
-				compartment 	(object Compartment
-				    Parent_View 	@386
-				    location   	(267, 180)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	381)
-				width      	380
-				height     	328
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IPart" @387
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1328, 224)
-				label      	(object ItemLabel
-				    Parent_View 	@387
-				    location   	(1029, 124)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	599
-				    justify    	0
-				    label      	"IPart")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@387
-				    location   	(1029, 74)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	599
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A93F01BE"
-				compartment 	(object Compartment
-				    Parent_View 	@387
-				    location   	(1029, 182)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	603)
-				width      	617
-				height     	324
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::wsdl::Part" @388
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1312, 816)
-				label      	(object ItemLabel
-				    Parent_View 	@388
-				    location   	(1075, 690)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	474
-				    justify    	0
-				    label      	"Part")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5CE1C032E"
-				compartment 	(object Compartment
-				    Parent_View 	@388
-				    location   	(1075, 748)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	484)
-				width      	492
-				height     	276
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @389
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84A96D02F1"
-				client     	@388
-				supplier   	@387
-				line_style 	3
-				origin_attachment 	(1304, 678)
-				terminal_attachment 	(1304, 386))
-			    (object ClassView "Class" "Logical View::wsdl::Message" @390
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(448, 656)
-				label      	(object ItemLabel
-				    Parent_View 	@390
-				    location   	(241, 507)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	414
-				    justify    	0
-				    label      	"Message")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C9590078"
-				compartment 	(object Compartment
-				    Parent_View 	@390
-				    location   	(241, 565)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	5
-				    max_width  	425)
-				width      	432
-				height     	322
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @391
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84A8D102BA"
-				client     	@390
-				supplier   	@386
-				line_style 	3
-				origin_attachment 	(445, 495)
-				terminal_attachment 	(445, 388))
-			    (object AssociationViewNew "$UNNAMED$7" @392
-				location   	(688, 952)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5CEBE00E2"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eParts" @393
-					Parent_View 	@392
-					location   	(176, 328)
-					label      	(object SegLabel @394
-					    Parent_View 	@393
-					    location   	(952, 897)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	144
-					    justify    	0
-					    label      	"+eParts"
-					    pctDist    	0.697452
-					    height     	56
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5CEBF0061"
-					client     	@392
-					supplier   	@388
-					line_style 	3
-					origin_attachment 	(688, 952)
-					terminal_attachment 	(1066, 952)
-					label      	(object SegLabel @395
-					    Parent_View 	@393
-					    location   	(987, 1005)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.789809
-					    height     	53
-					    orientation 	1)
-					label      	(object SegLabel @396
-					    Parent_View 	@393
-					    location   	(967, 1061)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	154
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.742038
-					    height     	109
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$8" @397
-					Parent_View 	@392
-					location   	(176, 328)
-					label      	(object SegLabel @398
-					    Parent_View 	@397
-					    location   	(404, 893)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5CEBF0057"
-					client     	@392
-					supplier   	@390
-					vertices   	(list Points
-					    (688, 952)
-					    (445, 952)
-					    (445, 817))
-					line_style 	3
-					origin_attachment 	(688, 952)
-					terminal_attachment 	(445, 817)
-					label      	(object SegLabel @399
-					    Parent_View 	@397
-					    location   	(393, 912)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.747604
-					    height     	53
-					    orientation 	0))))))))
-	    (object Class_Category "xsd"
-		attributes 	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"prefix"
-			value      	"XSD")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"basePackage"
-			value      	"org.eclipse")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsPrefix"
-			value      	"xsd")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsURI"
-			value      	"http://www.eclipse.org/xsd/2002/XSD"))
-		quid       	"39ABDC6F01AA"
-		exportControl 	"Public"
-		logical_models 	(list unit_reference_list
-		    (object Class "XSDAnnotation"
-			quid       	"3B66EDC80233"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B69E1770116"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029")
-			    (object Inheritance_Relationship
-				quid       	"3B7FD4E20366"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDRedefineContent"
-				quidu      	"3B6AE2060172"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "applicationInformation"
-				quid       	"3BBF7EBF02C8"
-				stereotype 	"0..*"
-				type       	"DOMElement"
-				exportControl 	"Public")
-			    (object ClassAttribute "userInformation"
-				quid       	"3BBF7EEA0157"
-				stereotype 	"0..*"
-				type       	"DOMElement"
-				exportControl 	"Public")
-			    (object ClassAttribute "attributes"
-				quid       	"3BBF7F0501E2"
-				stereotype 	"0..*"
-				type       	"DOMAttr"
-				exportControl 	"Public")))
-		    (object Class "XSDAttributeDeclaration"
-			quid       	"3B66ED2E0192"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B69B7DC0193"
-				supplier   	"Logical View::xsd::XSDFeature"
-				quidu      	"3B69B537026C")
-			    (object Inheritance_Relationship
-				quid       	"3B688E6103BE"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDSchemaContent"
-				quidu      	"3B688CB800BA"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "attributeDeclarationReference"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C287F5202B4"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDAttributeGroupContent"
-			quid       	"3B6940200089"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B72D8E200EA"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"))
-			abstract   	TRUE)
-		    (object Class "XSDAttributeGroupDefinition"
-			quid       	"3B66ED840290"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B69403A0221"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDAttributeGroupContent"
-				quidu      	"3B6940200089")
-			    (object Inheritance_Relationship
-				quid       	"3B6AE2EB02A8"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDRedefineContent"
-				quidu      	"3B6AE2060172")
-			    (object Inheritance_Relationship
-				quid       	"3B7FCAC800D2"
-				supplier   	"Logical View::xsd::XSDRedefinableComponent"
-				quidu      	"3B7FCA8B020B"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "attributeGroupDefinitionReference"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C287F7B0386"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDAttributeUse"
-			quid       	"3B68354601A8"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B72D737038F"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDAttributeGroupContent"
-				quidu      	"3B6940200089")
-			    (object Inheritance_Relationship
-				quid       	"3B72D7BB0349"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "required"
-				quid       	"3B69CCF3027D"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "value"
-				quid       	"3B69CDDB03B7"
-				type       	"Value"
-				exportControl 	"Public")
-			    (object ClassAttribute "constraint"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69CDE002D8"
-				type       	"XSDConstraint"
-				exportControl 	"Public")
-			    (object ClassAttribute "use"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA7B0220382"
-				type       	"XSDAttributeUseCategory"
-				exportControl 	"Public")
-			    (object ClassAttribute "lexicalValue"
-				quid       	"3C2719D90341"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDBoundedFacet"
-			quid       	"3B6C751D0344"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C763C0224"
-				supplier   	"Logical View::xsd::XSDFundamentalFacet"
-				quidu      	"3B6C69E801D6"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C752A00CC"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDCardinalityFacet"
-			quid       	"3B6C755D03D2"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C764F0131"
-				supplier   	"Logical View::xsd::XSDFundamentalFacet"
-				quidu      	"3B6C69E801D6"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C756C0153"
-				type       	"XSDCardinality"
-				exportControl 	"Public")))
-		    (object Class "XSDComplexTypeContent"
-			quid       	"3B683BA00196"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6848B80286"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029"))
-			abstract   	TRUE)
-		    (object Class "XSDComplexTypeDefinition"
-			quid       	"3B682B82031A"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B69BAA20310"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDScope"
-				quidu      	"3B69B54000F2")
-			    (object Inheritance_Relationship
-				quid       	"3BA0D01901F1"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "derivationMethod"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69C6E4020E"
-				type       	"XSDDerivationMethod"
-				initv      	"restriction"
-				exportControl 	"Public")
-			    (object ClassAttribute "final"
-				quid       	"3B69C71D026A"
-				stereotype 	"0..*"
-				type       	"XSDComplexFinal"
-				exportControl 	"Public")
-			    (object ClassAttribute "abstract"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69C73800C5"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "contentTypeCategory"
-				quid       	"3B69CA4202B8"
-				type       	"XSDContentTypeCategory"
-				exportControl 	"Public")
-			    (object ClassAttribute "prohibitedSubstitutions"
-				quid       	"3B69CB8A03E6"
-				stereotype 	"0..*"
-				type       	"XSDProhibitedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "lexicalFinal"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0F618014D"
-				stereotype 	"0..*"
-				type       	"XSDComplexFinal"
-				exportControl 	"Public")
-			    (object ClassAttribute "block"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0FB97006E"
-				stereotype 	"0..*"
-				type       	"XSDProhibitedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "mixed"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3C31AF5E03A6"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDComponent"
-			quid       	"3B6846E90029"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3BA0CEA903D2"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"))
-			abstract   	TRUE)
-		    (object Class "XSDConcreteComponent"
-			quid       	"3B6AD7B40065"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "element"
-				quid       	"3B6ADDB501A5"
-				type       	"DOMElement"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDConstrainingFacet"
-			quid       	"3B6C6B340093"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C6C800394"
-				supplier   	"Logical View::xsd::XSDFacet"
-				quidu      	"3B6C359403D2"))
-			abstract   	TRUE)
-		    (object Class "XSDDiagnostic"
-			quid       	"3BFE5F910046"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3D4C0F4C01A1"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "severity"
-				quid       	"3BFE691C005D"
-				type       	"XSDDiagnosticSeverity"
-				exportControl 	"Public")
-			    (object ClassAttribute "message"
-				quid       	"3BFE5FDD0280"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "locationURI"
-				quid       	"3C063743016B"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "line"
-				quid       	"3BFE607E0213"
-				type       	"int"
-				initv      	"1"
-				exportControl 	"Public")
-			    (object ClassAttribute "column"
-				quid       	"3BFE611E0296"
-				type       	"int"
-				initv      	"1"
-				exportControl 	"Public")
-			    (object ClassAttribute "node"
-				quid       	"3C016B6B0200"
-				type       	"DOMNode"
-				exportControl 	"Public")
-			    (object ClassAttribute "annotationURI"
-				quid       	"3C06374F0186"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDElementDeclaration"
-			quid       	"3B66ED580214"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B69EDEE01BF"
-				supplier   	"Logical View::xsd::XSDFeature"
-				quidu      	"3B69B537026C")
-			    (object Inheritance_Relationship
-				quid       	"3B685F17002E"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDTerm"
-				quidu      	"3B683C5E0174")
-			    (object Inheritance_Relationship
-				quid       	"3B688E660339"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDSchemaContent"
-				quidu      	"3B688CB800BA"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "nillable"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69BFB4029F"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "disallowedSubstitutions"
-				quid       	"3B69C4680368"
-				stereotype 	"0..*"
-				type       	"XSDDisallowedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "substitutionGroupExclusions"
-				quid       	"3B69C4A003B9"
-				stereotype 	"0..*"
-				type       	"XSDSubstitutionGroupExclusions"
-				exportControl 	"Public")
-			    (object ClassAttribute "abstract"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69C4E0000E"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "lexicalFinal"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0D14C00B2"
-				stereotype 	"0..*"
-				type       	"XSDProhibitedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "block"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0D16801C1"
-				stereotype 	"0..*"
-				type       	"XSDDisallowedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "elementDeclarationReference"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C289F6203CF"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "circular"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C34DCB00018"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDEnumerationFacet"
-			quid       	"3B6C6ACE0141"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C6C9D03C7"
-				supplier   	"Logical View::xsd::XSDRepeatableFacet"
-				quidu      	"3B6C6AA6031A"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C7C640054"
-				stereotype 	"0..*"
-				type       	"Value"
-				exportControl 	"Public")))
-		    (object Class "XSDFacet"
-			quid       	"3B6C359403D2"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6D25680259"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "lexicalValue"
-				quid       	"3B6C73740253"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "facetName"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C289FB401EC"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "effectiveValue"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28AAE303B6"
-				type       	"Value"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDFeature"
-			quid       	"3B69B537026C"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3C290A2C0307"
-				supplier   	"Logical View::xsd::XSDNamedComponent"
-				quidu      	"3B6846D303A4"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B69BF81020F"
-				type       	"Value"
-				exportControl 	"Public")
-			    (object ClassAttribute "constraint"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69BF8800C5"
-				type       	"XSDConstraint"
-				exportControl 	"Public")
-			    (object ClassAttribute "form"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B9F902B033E"
-				type       	"XSDForm"
-				exportControl 	"Public")
-			    (object ClassAttribute "lexicalValue"
-				quid       	"3C271A1B016F"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "global"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A0070372"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "featureReference"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A0440185"
-				type       	"boolean"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDFixedFacet"
-			quid       	"3B6C699E00C1"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C6C8801B4"
-				supplier   	"Logical View::xsd::XSDConstrainingFacet"
-				quidu      	"3B6C6B340093"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "fixed"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B6C6A600201"
-				type       	"boolean"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDFractionDigitsFacet"
-			quid       	"3B6C79BE02EE"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B990016"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C79D2008A"
-				type       	"int"
-				exportControl 	"Public")))
-		    (object Class "XSDFundamentalFacet"
-			quid       	"3B6C69E801D6"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C6C7B0396"
-				supplier   	"Logical View::xsd::XSDFacet"
-				quidu      	"3B6C359403D2"))
-			abstract   	TRUE)
-		    (object Class "XSDIdentityConstraintDefinition"
-			quid       	"3B682B2603A2"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B684AA30242"
-				supplier   	"Logical View::xsd::XSDNamedComponent"
-				quidu      	"3B6846D303A4"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "identityConstraintCategory"
-				quid       	"3B69D1C70143"
-				type       	"XSDIdentityConstraintCategory"
-				exportControl 	"Public")))
-		    (object Class "XSDImport"
-			quid       	"3B688C93017F"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AD8D9003E"
-				supplier   	"Logical View::xsd::XSDSchemaDirective"
-				quidu      	"3B6AD8A202A2"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "namespace"
-				quid       	"3B6ADB15036C"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDInclude"
-			quid       	"3B688C7D0250"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AD8DC0381"
-				supplier   	"Logical View::xsd::XSDSchemaCompositor"
-				quidu      	"3C21DB4102AE")))
-		    (object Class "XSDLengthFacet"
-			quid       	"3B6C776200E7"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C778002DF"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C776C004B"
-				type       	"int"
-				exportControl 	"Public")))
-		    (object Class "XSDMaxExclusiveFacet"
-			quid       	"3B6C789600C2"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B8E0309"
-				supplier   	"Logical View::xsd::XSDMaxFacet"
-				quidu      	"3C0A1CEB010E")))
-		    (object Class "XSDMaxFacet"
-			quid       	"3C0A1CEB010E"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3C0A1D3103AD"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3C0A1EE201F7"
-				type       	"Value"
-				exportControl 	"Public")
-			    (object ClassAttribute "inclusive"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A174027D"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "exclusive"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A1930354"
-				type       	"boolean"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDMaxInclusiveFacet"
-			quid       	"3B6C787D00DA"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B8303B8"
-				supplier   	"Logical View::xsd::XSDMaxFacet"
-				quidu      	"3C0A1CEB010E")))
-		    (object Class "XSDMaxLengthFacet"
-			quid       	"3B6C77C70146"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B7D00FC"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C77DA00F3"
-				type       	"int"
-				exportControl 	"Public")))
-		    (object Class "XSDMinExclusiveFacet"
-			quid       	"3B6C792D000A"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B590281"
-				supplier   	"Logical View::xsd::XSDMinFacet"
-				quidu      	"3C0A1CDE037C")))
-		    (object Class "XSDMinFacet"
-			quid       	"3C0A1CDE037C"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3C0A1D240098"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3C0A1ED10398"
-				type       	"Value"
-				exportControl 	"Public")
-			    (object ClassAttribute "inclusive"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A1A2008E"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "exclusive"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A1BE03E2"
-				type       	"boolean"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDMinInclusiveFacet"
-			quid       	"3B6C788702C9"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B520353"
-				supplier   	"Logical View::xsd::XSDMinFacet"
-				quidu      	"3C0A1CDE037C")))
-		    (object Class "XSDMinLengthFacet"
-			quid       	"3B6C778C0065"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C77C400C0"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C7799015E"
-				type       	"int"
-				exportControl 	"Public")))
-		    (object Class "XSDModelGroup"
-			quid       	"3B6834E00291"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B684A640279"
-				supplier   	"Logical View::xsd::XSDTerm"
-				quidu      	"3B683C5E0174"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "compositor"
-				quid       	"3B69CF1D01CF"
-				type       	"XSDCompositor"
-				exportControl 	"Public")))
-		    (object Class "XSDModelGroupDefinition"
-			quid       	"3B66ED9A0205"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AE2E20381"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDRedefineContent"
-				quidu      	"3B6AE2060172")
-			    (object Inheritance_Relationship
-				quid       	"3B6BD2550385"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDParticleContent"
-				quidu      	"3B6BD22300C6")
-			    (object Inheritance_Relationship
-				quid       	"3B7FCAC40090"
-				supplier   	"Logical View::xsd::XSDRedefinableComponent"
-				quidu      	"3B7FCA8B020B"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "modelGroupDefinitionReference"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A1F602E8"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDNamedComponent"
-			quid       	"3B6846D303A4"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3BA0CEA20197"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3B6847000142"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "targetNamespace"
-				quid       	"3B684704031E"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "aliasName"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A57F0127"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "uRI"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A58700E2"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "aliasURI"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A5AA02AF"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "qName"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C290963025E"
-				type       	"String"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDNotationDeclaration"
-			quid       	"3B66EDAA021C"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B68494302F1"
-				supplier   	"Logical View::xsd::XSDNamedComponent"
-				quidu      	"3B6846D303A4")
-			    (object Inheritance_Relationship
-				quid       	"3B688E4F023C"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDSchemaContent"
-				quidu      	"3B688CB800BA"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "systemIdentifier"
-				quid       	"3B69D32E00F0"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "publicIdentifier"
-				quid       	"3B69D3340397"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDNumericFacet"
-			quid       	"3B6C75950206"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C76420074"
-				supplier   	"Logical View::xsd::XSDFundamentalFacet"
-				quidu      	"3B6C69E801D6"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C75A30012"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDOrderedFacet"
-			quid       	"3B6C74DD0248"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7659012C"
-				supplier   	"Logical View::xsd::XSDFundamentalFacet"
-				quidu      	"3B6C69E801D6"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C74F602DA"
-				type       	"XSDOrdered"
-				exportControl 	"Public")))
-		    (object Class "XSDParticle"
-			quid       	"3B682BBD01F7"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6848FC01E7"
-				supplier   	"Logical View::xsd::XSDComplexTypeContent"
-				quidu      	"3B683BA00196"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "minOccurs"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69CF8E03B2"
-				type       	"int"
-				initv      	"1"
-				exportControl 	"Public")
-			    (object ClassAttribute "maxOccurs"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69CF9903AE"
-				type       	"int"
-				initv      	"1"
-				exportControl 	"Public")))
-		    (object Class "XSDParticleContent"
-			quid       	"3B6BD22300C6"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B780BD90059"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"))
-			abstract   	TRUE)
-		    (object Class "XSDPatternFacet"
-			quid       	"3B6C6ADB026C"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C6CA5038D"
-				supplier   	"Logical View::xsd::XSDRepeatableFacet"
-				quidu      	"3B6C6AA6031A"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C7C790311"
-				stereotype 	"0..*"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDRedefinableComponent"
-			quid       	"3B7FCA8B020B"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B7FD4BA023C"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDRedefineContent"
-				quidu      	"3B6AE2060172")
-			    (object Inheritance_Relationship
-				quid       	"3C290A26036D"
-				supplier   	"Logical View::xsd::XSDNamedComponent"
-				quidu      	"3B6846D303A4"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "circular"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A6800216"
-				type       	"boolean"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDRedefineContent"
-			quid       	"3B6AE2060172"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AE2B301D5"
-				supplier   	"Logical View::xsd::XSDSchemaContent"
-				quidu      	"3B688CB800BA"))
-			abstract   	TRUE)
-		    (object Class "XSDRedefine"
-			quid       	"3B688C9B02AD"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3C21DB640240"
-				supplier   	"Logical View::xsd::XSDSchemaCompositor"
-				quidu      	"3C21DB4102AE")))
-		    (object Class "XSDRepeatableFacet"
-			quid       	"3B6C6AA6031A"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C6C8F002E"
-				supplier   	"Logical View::xsd::XSDConstrainingFacet"
-				quidu      	"3B6C6B340093"))
-			abstract   	TRUE)
-		    (object Class "XSDSchema"
-			quid       	"374B182500BB"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B7FCC4A0182"
-				supplier   	"Logical View::xsd::XSDScope"
-				quidu      	"3B69B54000F2"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "document"
-				quid       	"3C2784E503DD"
-				type       	"DOMDocument"
-				exportControl 	"Public")
-			    (object ClassAttribute "schemaLocation"
-				quid       	"3B6868EC0226"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "targetNamespace"
-				quid       	"3B9F9BFF0180"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "attributeFormDefault"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B9F904B0102"
-				type       	"XSDForm"
-				initv      	"unqualified"
-				exportControl 	"Public")
-			    (object ClassAttribute "elementFormDefault"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B9F907800AC"
-				type       	"XSDForm"
-				initv      	"unqualified"
-				exportControl 	"Public")
-			    (object ClassAttribute "finalDefault"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0C4A70038"
-				stereotype 	"0..*"
-				type       	"XSDProhibitedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "blockDefault"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0F59D02D8"
-				stereotype 	"0..*"
-				type       	"XSDDisallowedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "version"
-				quid       	"3D22D6D80356"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDSchemaCompositor"
-			quid       	"3C21DB4102AE"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3C21DB560092"
-				supplier   	"Logical View::xsd::XSDSchemaDirective"
-				quidu      	"3B6AD8A202A2"))
-			abstract   	TRUE)
-		    (object Class "XSDSchemaContent"
-			quid       	"3B688CB800BA"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AD8E60372"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"))
-			abstract   	TRUE)
-		    (object Class "XSDSchemaDirective"
-			quid       	"3B6AD8A202A2"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AE32102AF"
-				supplier   	"Logical View::xsd::XSDSchemaContent"
-				quidu      	"3B688CB800BA"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "schemaLocation"
-				quid       	"3B6AD9B30330"
-				type       	"String"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDScope"
-			quid       	"3B69B54000F2"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B7FCD640231"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029"))
-			abstract   	TRUE)
-		    (object Class "XSDSimpleTypeDefinition"
-			quid       	"3B682BA7005D"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B684A1302A2"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9")
-			    (object Inheritance_Relationship
-				quid       	"3B685F55032B"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDComplexTypeContent"
-				quidu      	"3B683BA00196"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "variety"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B6C315800A9"
-				type       	"XSDVariety"
-				exportControl 	"Public")
-			    (object ClassAttribute "final"
-				quid       	"3B6D544F0146"
-				stereotype 	"0..*"
-				type       	"XSDSimpleFinal"
-				exportControl 	"Public")
-			    (object ClassAttribute "lexicalFinal"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0F65E035A"
-				stereotype 	"0..*"
-				type       	"XSDSimpleFinal"
-				exportControl 	"Public")
-			    (object ClassAttribute "validFacets"
-				quid       	"3C28AB0F00B6"
-				stereotype 	"0..*"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDTerm"
-			quid       	"3B683C5E0174"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6848AA01D3"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029")
-			    (object Inheritance_Relationship
-				quid       	"3B6BD2440069"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDParticleContent"
-				quidu      	"3B6BD22300C6"))
-			abstract   	TRUE)
-		    (object Class "XSDTotalDigitsFacet"
-			quid       	"3B6C79A0020E"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B610337"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C79AB0232"
-				type       	"int"
-				exportControl 	"Public")))
-		    (object Class "XSDTypeDefinition"
-			quid       	"3B66ECD302A9"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AE2F5013A"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDRedefineContent"
-				quidu      	"3B6AE2060172")
-			    (object Inheritance_Relationship
-				quid       	"3B7FCAB1004D"
-				supplier   	"Logical View::xsd::XSDRedefinableComponent"
-				quidu      	"3B7FCA8B020B"))
-			abstract   	TRUE)
-		    (object Class "XSDWhiteSpaceFacet"
-			quid       	"3B6C784601B7"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C78620045"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C78500201"
-				type       	"XSDWhiteSpace"
-				exportControl 	"Public")))
-		    (object Class "XSDWildcard"
-			quid       	"3B6838370031"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B684A3A0041"
-				supplier   	"Logical View::xsd::XSDTerm"
-				quidu      	"3B683C5E0174"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "namespaceConstraintCategory"
-				quid       	"3B69D0E9019E"
-				type       	"XSDNamespaceConstraintCategory"
-				exportControl 	"Public")
-			    (object ClassAttribute "namespaceConstraint"
-				quid       	"3B97CF860223"
-				stereotype 	"0..*"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "processContents"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69D12E01E4"
-				type       	"XSDProcessContents"
-				exportControl 	"Public")
-			    (object ClassAttribute "lexicalNamespaceConstraint"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA7BDB701F9"
-				stereotype 	"0..*"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDXPathDefinition"
-			quid       	"3B6D83BB0355"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6D84F70092"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "variety"
-				quid       	"3B6D901503DE"
-				type       	"XSDXPathVariety"
-				exportControl 	"Public")
-			    (object ClassAttribute "value"
-				quid       	"3B7BBBE101B1"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "DOMAttr"
-			quid       	"3BBF8C8901B6"
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "org.w3c.dom.Attr"
-				quid       	"3BBF8CB000D5"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Class "DOMDocument"
-			quid       	"3C27850E0381"
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "org.w3c.dom.Document"
-				quid       	"3C27851B03C6"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Class "DOMElement"
-			quid       	"3B8189790200"
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "org.w3c.dom.Element"
-				quid       	"3B8189DB0374"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Class "DOMNode"
-			quid       	"3BFE64A50117"
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "org.w3c.dom.Node"
-				quid       	"3BFE65BF002D"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Class "Value"
-			quid       	"3C040B5B031F"
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "java.lang.Object"
-				quid       	"3C040B8D03D5"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Class "XSDAttributeUseCategory"
-			quid       	"3BA7B0E801A8"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "optional"
-				quid       	"3BA7B11502B7"
-				exportControl 	"Public")
-			    (object ClassAttribute "prohibited"
-				quid       	"3BA7B12202D3"
-				exportControl 	"Public")
-			    (object ClassAttribute "required"
-				quid       	"3BA7B12902F0"
-				exportControl 	"Public")))
-		    (object Class "XSDCardinality"
-			quid       	"3BC7715D009B"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "finite"
-				quid       	"3BC771DC02ED"
-				exportControl 	"Public")
-			    (object ClassAttribute "countablyInfinite"
-				quid       	"3BC771EC0141"
-				exportControl 	"Public")))
-		    (object Class "XSDComplexFinal"
-			quid       	"3B97C2CA01CB"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "extension"
-				quid       	"3B97C2E700DA"
-				exportControl 	"Public")
-			    (object ClassAttribute "restriction"
-				quid       	"3B97C2EA016A"
-				exportControl 	"Public")
-			    (object ClassAttribute "all"
-				quid       	"3BA0F6D20112"
-				exportControl 	"Public")))
-		    (object Class "XSDCompositor"
-			quid       	"3B869B620037"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "all"
-				quid       	"3B869BD00003"
-				exportControl 	"Public")
-			    (object ClassAttribute "choice"
-				quid       	"3B869CB8011E"
-				exportControl 	"Public")
-			    (object ClassAttribute "sequence"
-				quid       	"3B869CE50057"
-				exportControl 	"Public")))
-		    (object Class "XSDConstraint"
-			quid       	"3B869E2601AE"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "default"
-				quid       	"3B869E8E0258"
-				exportControl 	"Public")
-			    (object ClassAttribute "fixed"
-				quid       	"3B869E990271"
-				exportControl 	"Public")))
-		    (object Class "XSDContentTypeCategory"
-			quid       	"3B86A79F03A2"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "empty"
-				quid       	"3B86A7CD02F0"
-				exportControl 	"Public")
-			    (object ClassAttribute "simple"
-				quid       	"3B86A7D100CE"
-				exportControl 	"Public")
-			    (object ClassAttribute "mixed"
-				quid       	"3B86A7D301B7"
-				exportControl 	"Public")
-			    (object ClassAttribute "elementOnly"
-				quid       	"3B86A7D702E9"
-				exportControl 	"Public")))
-		    (object Class "XSDDerivationMethod"
-			quid       	"3B86A0B000CE"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "extension"
-				quid       	"3B86A0C80329"
-				exportControl 	"Public")
-			    (object ClassAttribute "restriction"
-				quid       	"3B86A0CC0162"
-				exportControl 	"Public")))
-		    (object Class "XSDDiagnosticSeverity"
-			quid       	"3BFE68A7032F"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "fatal"
-				quid       	"3BFE68C303D0"
-				exportControl 	"Public")
-			    (object ClassAttribute "error"
-				quid       	"3BFE68E700E3"
-				exportControl 	"Public")
-			    (object ClassAttribute "warning"
-				quid       	"3BFE68EA01FF"
-				exportControl 	"Public")
-			    (object ClassAttribute "information"
-				quid       	"3BFE7FC2019A"
-				exportControl 	"Public")))
-		    (object Class "XSDDisallowedSubstitutions"
-			quid       	"3B97C5A403DF"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "substitution"
-				quid       	"3B97C6790045"
-				exportControl 	"Public")
-			    (object ClassAttribute "extension"
-				quid       	"3B97C67F01AC"
-				exportControl 	"Public")
-			    (object ClassAttribute "restriction"
-				quid       	"3B97C683020B"
-				exportControl 	"Public")
-			    (object ClassAttribute "all"
-				quid       	"3BA0F2450069"
-				exportControl 	"Public")))
-		    (object Class "XSDForm"
-			quid       	"3B9F913B01EB"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "qualified"
-				quid       	"3B9F916F0023"
-				exportControl 	"Public")
-			    (object ClassAttribute "unqualified"
-				quid       	"3B9F918C007F"
-				exportControl 	"Public")))
-		    (object Class "XSDIdentityConstraintCategory"
-			quid       	"3B86A1E00272"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "key"
-				quid       	"3B86A2120085"
-				exportControl 	"Public")
-			    (object ClassAttribute "keyref"
-				quid       	"3B86A213014F"
-				exportControl 	"Public")
-			    (object ClassAttribute "unique"
-				quid       	"3B86A2160365"
-				exportControl 	"Public")))
-		    (object Class "XSDNamespaceConstraintCategory"
-			quid       	"3B97C5EA0023"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "any"
-				quid       	"3B97D0600034"
-				exportControl 	"Public")
-			    (object ClassAttribute "not"
-				quid       	"3B97D062005F"
-				exportControl 	"Public")
-			    (object ClassAttribute "set"
-				quid       	"3B97D0650117"
-				exportControl 	"Public")))
-		    (object Class "XSDOrdered"
-			quid       	"3BC7715202E4"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "false"
-				quid       	"3BC771A90271"
-				exportControl 	"Public")
-			    (object ClassAttribute "partial"
-				quid       	"3BC771BB01FF"
-				exportControl 	"Public")
-			    (object ClassAttribute "total"
-				quid       	"3BC771C401B2"
-				exportControl 	"Public")))
-		    (object Class "XSDProcessContents"
-			quid       	"3B8FF8C70284"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "strict"
-				quid       	"3B8FF8F80045"
-				exportControl 	"Public")
-			    (object ClassAttribute "lax"
-				quid       	"3B8FF8F6038B"
-				exportControl 	"Public")
-			    (object ClassAttribute "skip"
-				quid       	"3B8FF8E802BA"
-				exportControl 	"Public")))
-		    (object Class "XSDProhibitedSubstitutions"
-			quid       	"3B97C5BE0272"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "extension"
-				quid       	"3B97C68B00B8"
-				exportControl 	"Public")
-			    (object ClassAttribute "restriction"
-				quid       	"3B97C6940291"
-				exportControl 	"Public")
-			    (object ClassAttribute "all"
-				quid       	"3BA0F2500295"
-				exportControl 	"Public")))
-		    (object Class "XSDSimpleFinal"
-			quid       	"3B97C25D0295"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "list"
-				quid       	"3B97C2810230"
-				exportControl 	"Public")
-			    (object ClassAttribute "restriction"
-				quid       	"3B97C2830138"
-				exportControl 	"Public")
-			    (object ClassAttribute "union"
-				quid       	"3B97C288024E"
-				exportControl 	"Public")
-			    (object ClassAttribute "all"
-				quid       	"3BA0F6E00374"
-				exportControl 	"Public")))
-		    (object Class "XSDSubstitutionGroupExclusions"
-			quid       	"3B97C59100AE"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "extension"
-				quid       	"3B97C6640231"
-				exportControl 	"Public")
-			    (object ClassAttribute "restriction"
-				quid       	"3B97C66D0216"
-				exportControl 	"Public")))
-		    (object Class "XSDVariety"
-			quid       	"3B8FF7730249"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "atomic"
-				quid       	"3B8FF7A702DF"
-				exportControl 	"Public")
-			    (object ClassAttribute "list"
-				quid       	"3B8FF7AD0139"
-				exportControl 	"Public")
-			    (object ClassAttribute "union"
-				quid       	"3B8FF7AF039F"
-				exportControl 	"Public")))
-		    (object Class "XSDWhiteSpace"
-			quid       	"3BEED0F60342"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "preserve"
-				quid       	"3BEED10F0117"
-				exportControl 	"Public")
-			    (object ClassAttribute "replace"
-				quid       	"3BEED127034D"
-				exportControl 	"Public")
-			    (object ClassAttribute "collapse"
-				quid       	"3BEED1290396"
-				exportControl 	"Public")))
-		    (object Class "XSDXPathVariety"
-			quid       	"3B8FFB89033A"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "selector"
-				quid       	"3B8FFBAC0192"
-				exportControl 	"Public")
-			    (object ClassAttribute "field"
-				quid       	"3B8FFBB30278"
-				exportControl 	"Public")))
-		    (object Association "$UNNAMED$70"
-			quid       	"3C626EA70102"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$71"
-				quid       	"3C626EA90191"
-				supplier   	"Logical View::xsd::XSDRepeatableFacet"
-				quidu      	"3B6C6AA6031A"
-				is_aggregate 	TRUE)
-			    (object Role "annotations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C626EA90192"
-				label      	"annotations"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$72"
-			quid       	"3B69DADC02F5"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$73"
-				quid       	"3B69DADD0238"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DADD0242"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$74"
-			quid       	"3B6890D6006F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$75"
-				quid       	"3B6890D6030E"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				is_aggregate 	TRUE)
-			    (object Role "anonymousTypeDefinition"
-				quid       	"3B6890D60318"
-				label      	"anonymousTypeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$76"
-			quid       	"3B68356B02CB"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$77"
-				quid       	"3B68356D00A6"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				is_aggregate 	TRUE)
-			    (object Role "typeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B68356D00A7"
-				label      	"typeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$78"
-			quid       	"3B6B426B0194"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$79"
-				quid       	"3B6B426D0309"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				is_aggregate 	TRUE)
-			    (object Role "resolvedAttributeDeclaration"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6B426D0313"
-				label      	"resolvedAttributeDeclaration"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$80"
-			quid       	"3B69DB060291"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$81"
-				quid       	"3B69DB070171"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB070172"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$82"
-			quid       	"3B69404E0067"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$83"
-				quid       	"3B694050029B"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "contents"
-				quid       	"3B69405002A5"
-				label      	"contents"
-				supplier   	"Logical View::xsd::XSDAttributeGroupContent"
-				quidu      	"3B6940200089"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$84"
-			quid       	"3B68359F0086"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$85"
-				quid       	"3B6835A00069"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "attributeUses"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6835A0006A"
-				label      	"attributeUses"
-				supplier   	"Logical View::xsd::XSDAttributeUse"
-				quidu      	"3B68354601A8"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$86"
-			quid       	"3C275D320220"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$87"
-				quid       	"3C275D3C010C"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "attributeWildcardContent"
-				quid       	"3C275D3C010D"
-				label      	"attributeWildcardContent"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$88"
-			quid       	"3B6887BF0150"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$89"
-				quid       	"3B6887C000A7"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "attributeWildcard"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6887C000A8"
-				label      	"attributeWildcard"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$90"
-			quid       	"3B6B425E01F9"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$91"
-				quid       	"3B6B42620046"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "resolvedAttributeGroupDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6B42620050"
-				label      	"resolvedAttributeGroupDefinition"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$92"
-			quid       	"3B683585010D"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$93"
-				quid       	"3B68358600FA"
-				supplier   	"Logical View::xsd::XSDAttributeUse"
-				quidu      	"3B68354601A8"
-				is_aggregate 	TRUE)
-			    (object Role "attributeDeclaration"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B68358600FB"
-				label      	"attributeDeclaration"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$94"
-			quid       	"3B6F1DE9018A"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$95"
-				quid       	"3B6F1DEA036C"
-				supplier   	"Logical View::xsd::XSDAttributeUse"
-				quidu      	"3B68354601A8"
-				is_aggregate 	TRUE)
-			    (object Role "content"
-				quid       	"3B6F1DEA0380"
-				label      	"content"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$96"
-			quid       	"3B90068801C2"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$97"
-				quid       	"3B90068A0111"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "contentAnnotation"
-				quid       	"3B90068A011B"
-				label      	"contentAnnotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$98"
-			quid       	"3B6833350340"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$99"
-				quid       	"3B683336028D"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "baseTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B683336028E"
-				label      	"baseTypeDefinition"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$100"
-			quid       	"3B6FDDD70113"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$101"
-				quid       	"3B6FDDDA026B"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "content"
-				quid       	"3B6FDDDA0275"
-				label      	"content"
-				supplier   	"Logical View::xsd::XSDComplexTypeContent"
-				quidu      	"3B683BA00196"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$102"
-			quid       	"3B6837DF024F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$103"
-				quid       	"3B6837E100FD"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "contentType"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6837E100FE"
-				label      	"contentType"
-				supplier   	"Logical View::xsd::XSDComplexTypeContent"
-				quidu      	"3B683BA00196"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$104"
-			quid       	"3B683959006E"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$105"
-				quid       	"3B6839590349"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "attributeUses"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B683959034A"
-				label      	"attributeUses"
-				supplier   	"Logical View::xsd::XSDAttributeUse"
-				quidu      	"3B68354601A8"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$106"
-			quid       	"3B698E360386"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$107"
-				quid       	"3B698E380072"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "attributeContents"
-				quid       	"3B698E38007C"
-				label      	"attributeContents"
-				supplier   	"Logical View::xsd::XSDAttributeGroupContent"
-				quidu      	"3B6940200089"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$108"
-			quid       	"3B6851BA0126"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$109"
-				quid       	"3B6851BB0150"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "attributeWildcard"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6851BB0151"
-				label      	"attributeWildcard"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$110"
-			quid       	"3B751B0803C7"
-			roles      	(list role_list
-			    (object Role "container"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3B751B0C01CE"
-				label      	"container"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$111"
-				attributes 	(list Attribute_Set)
-				quid       	"3B751B0C01CF"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065")))
-		    (object Association "$UNNAMED$112"
-			quid       	"3B751B480261"
-			roles      	(list role_list
-			    (object Role "rootContainer"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3B751B4C0285"
-				label      	"rootContainer"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$113"
-				attributes 	(list Attribute_Set)
-				quid       	"3B751B4C0286"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065")))
-		    (object Association "$UNNAMED$114"
-			quid       	"3B751C310356"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$115"
-				attributes 	(list Attribute_Set)
-				quid       	"3B751C330331"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065")
-			    (object Role "schema"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3B751C33033B"
-				label      	"schema"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$116"
-			quid       	"3B69DB0A0066"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$117"
-				quid       	"3B69DB0B023F"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB0B0249"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$118"
-			quid       	"3B68911401AF"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$119"
-				quid       	"3B6891150016"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				is_aggregate 	TRUE)
-			    (object Role "anonymousTypeDefinition"
-				quid       	"3B6891150017"
-				label      	"anonymousTypeDefinition"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$120"
-			quid       	"3B68338C0058"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$121"
-				quid       	"3B68338C03BF"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				is_aggregate 	TRUE)
-			    (object Role "typeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B68338C03C0"
-				label      	"typeDefinition"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$122"
-			quid       	"3B6833EF0160"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$123"
-				quid       	"3B6833F00298"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				is_aggregate 	TRUE)
-			    (object Role "identityConstraintDefinitions"
-				quid       	"3B6833F00299"
-				label      	"identityConstraintDefinitions"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$124"
-			quid       	"3B6B41E60251"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$125"
-				quid       	"3B6B41EA02F7"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				is_aggregate 	TRUE)
-			    (object Role "resolvedElementDeclaration"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6B41EA030B"
-				label      	"resolvedElementDeclaration"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$126"
-			quid       	"3B69C0590198"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$127"
-				quid       	"3B69C05D01E3"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214")
-			    (object Role "substitutionGroupAffiliation"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B69C05D01ED"
-				label      	"substitutionGroupAffiliation"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$128"
-			quid       	"3C42DBDD0297"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$129"
-				quid       	"3C42DBE0011E"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				is_aggregate 	TRUE)
-			    (object Role "substitutionGroup"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C42DBE00128"
-				label      	"substitutionGroup"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$130"
-			quid       	"3B6D23B901CD"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$131"
-				quid       	"3B6D23BA01C4"
-				supplier   	"Logical View::xsd::XSDFacet"
-				quidu      	"3B6C359403D2"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B6D23BA01CE"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$132"
-			quid       	"3B6D597102EA"
-			roles      	(list role_list
-			    (object Role "simpleTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6D59750105"
-				label      	"simpleTypeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$133"
-				attributes 	(list Attribute_Set)
-				quid       	"3B6D59750119"
-				supplier   	"Logical View::xsd::XSDFacet"
-				quidu      	"3B6C359403D2")))
-		    (object Association "$UNNAMED$134"
-			quid       	"3B69B653017A"
-			roles      	(list role_list
-			    (object Role "scope"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3B69B654006D"
-				label      	"scope"
-				supplier   	"Logical View::xsd::XSDScope"
-				quidu      	"3B69B54000F2"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$135"
-				attributes 	(list Attribute_Set)
-				quid       	"3B69B654006E"
-				supplier   	"Logical View::xsd::XSDFeature"
-				quidu      	"3B69B537026C")))
-		    (object Association "$UNNAMED$136"
-			quid       	"3C29010602D7"
-			roles      	(list role_list
-			    (object Role "resolvedFeature"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C29010B000E"
-				label      	"resolvedFeature"
-				supplier   	"Logical View::xsd::XSDFeature"
-				quidu      	"3B69B537026C"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$137"
-				attributes 	(list Attribute_Set)
-				quid       	"3C29010B0018"
-				supplier   	"Logical View::xsd::XSDFeature"
-				quidu      	"3B69B537026C")))
-		    (object Association "$UNNAMED$138"
-			quid       	"3B69DB0D0183"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$139"
-				quid       	"3B69DB0D033C"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB0D0346"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$140"
-			quid       	"3B69D29E014D"
-			roles      	(list role_list
-			    (object Role "referencedKey"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B69D2A80165"
-				label      	"referencedKey"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$141"
-				attributes 	(list Attribute_Set)
-				quid       	"3B69D2A8016F"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2")))
-		    (object Association "$UNNAMED$142"
-			quid       	"3B6D8D3D003E"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$143"
-				quid       	"3B6D8D3E022A"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2"
-				is_aggregate 	TRUE)
-			    (object Role "selector"
-				quid       	"3B6D8D3E0234"
-				label      	"selector"
-				supplier   	"Logical View::xsd::XSDXPathDefinition"
-				quidu      	"3B6D83BB0355"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$144"
-			quid       	"3B6D8D330025"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$145"
-				quid       	"3B6D8D330365"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2"
-				is_aggregate 	TRUE)
-			    (object Role "fields"
-				quid       	"3B6D8D330379"
-				label      	"fields"
-				supplier   	"Logical View::xsd::XSDXPathDefinition"
-				quidu      	"3B6D83BB0355"
-				client_cardinality 	(value cardinality "1..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$146"
-			quid       	"3B6ADCD802FC"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$147"
-				quid       	"3B6ADCD9018B"
-				supplier   	"Logical View::xsd::XSDImport"
-				quidu      	"3B688C93017F"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B6ADCD9018C"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$148"
-			quid       	"3B6ADCC5007E"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$149"
-				quid       	"3B6ADCC6006B"
-				supplier   	"Logical View::xsd::XSDInclude"
-				quidu      	"3B688C7D0250"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B6ADCC6006C"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$150"
-			quid       	"3B69DB1702C8"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$151"
-				quid       	"3B69DB1803E2"
-				supplier   	"Logical View::xsd::XSDModelGroup"
-				quidu      	"3B6834E00291"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB190004"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$152"
-			quid       	"3B6BCEB102F8"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$153"
-				quid       	"3B6BCEB6001B"
-				supplier   	"Logical View::xsd::XSDModelGroup"
-				quidu      	"3B6834E00291"
-				is_aggregate 	TRUE)
-			    (object Role "contents"
-				quid       	"3B6BCEB60025"
-				label      	"contents"
-				supplier   	"Logical View::xsd::XSDParticle"
-				quidu      	"3B682BBD01F7"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$154"
-			quid       	"3B683606026F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$155"
-				quid       	"3B6836070221"
-				supplier   	"Logical View::xsd::XSDModelGroup"
-				quidu      	"3B6834E00291"
-				is_aggregate 	TRUE)
-			    (object Role "particles"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6836070222"
-				label      	"particles"
-				supplier   	"Logical View::xsd::XSDParticle"
-				quidu      	"3B682BBD01F7"
-				client_cardinality 	(value cardinality "1..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$156"
-			quid       	"3B69DB15008A"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$157"
-				quid       	"3B69DB160096"
-				supplier   	"Logical View::xsd::XSDModelGroupDefinition"
-				quidu      	"3B66ED9A0205"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB1600A0"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$158"
-			quid       	"3B6837AC025A"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$159"
-				quid       	"3B6837AD0338"
-				supplier   	"Logical View::xsd::XSDModelGroupDefinition"
-				quidu      	"3B66ED9A0205"
-				is_aggregate 	TRUE)
-			    (object Role "modelGroup"
-				quid       	"3B6837AD0339"
-				label      	"modelGroup"
-				supplier   	"Logical View::xsd::XSDModelGroup"
-				quidu      	"3B6834E00291"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$160"
-			quid       	"3B6B42450398"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$161"
-				quid       	"3B6B4249038A"
-				supplier   	"Logical View::xsd::XSDModelGroupDefinition"
-				quidu      	"3B66ED9A0205"
-				is_aggregate 	TRUE)
-			    (object Role "resolvedModelGroupDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6B4249039E"
-				label      	"resolvedModelGroupDefinition"
-				supplier   	"Logical View::xsd::XSDModelGroupDefinition"
-				quidu      	"3B66ED9A0205"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$162"
-			quid       	"3B69DB0F0212"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$163"
-				quid       	"3B69DB1000C9"
-				supplier   	"Logical View::xsd::XSDNotationDeclaration"
-				quidu      	"3B66EDAA021C"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB1000D3"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$164"
-			quid       	"3B6B47150119"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$165"
-				quid       	"3B6B471A03AB"
-				supplier   	"Logical View::xsd::XSDParticle"
-				quidu      	"3B682BBD01F7"
-				is_aggregate 	TRUE)
-			    (object Role "content"
-				quid       	"3B6B471A03B5"
-				label      	"content"
-				supplier   	"Logical View::xsd::XSDParticleContent"
-				quidu      	"3B6BD22300C6"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$166"
-			quid       	"3B683C890122"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$167"
-				quid       	"3B683C8A0110"
-				supplier   	"Logical View::xsd::XSDParticle"
-				quidu      	"3B682BBD01F7"
-				is_aggregate 	TRUE)
-			    (object Role "term"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B683C8A0111"
-				label      	"term"
-				supplier   	"Logical View::xsd::XSDTerm"
-				quidu      	"3B683C5E0174"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$168"
-			quid       	"3B6ADE42009A"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$169"
-				quid       	"3B6ADE4302FE"
-				supplier   	"Logical View::xsd::XSDRedefine"
-				quidu      	"3B688C9B02AD"
-				is_aggregate 	TRUE)
-			    (object Role "annotations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6ADE430308"
-				label      	"annotations"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$170"
-			quid       	"3B6AE8240051"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$171"
-				quid       	"3B6AE82602AD"
-				supplier   	"Logical View::xsd::XSDRedefine"
-				quidu      	"3B688C9B02AD"
-				is_aggregate 	TRUE)
-			    (object Role "contents"
-				quid       	"3B6AE82602B7"
-				label      	"contents"
-				supplier   	"Logical View::xsd::XSDRedefineContent"
-				quidu      	"3B6AE2060172"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$172"
-			quid       	"3B688E6B003D"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$173"
-				quid       	"3B688E6C0107"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "contents"
-				quid       	"3B688E6C0111"
-				label      	"contents"
-				supplier   	"Logical View::xsd::XSDSchemaContent"
-				quidu      	"3B688CB800BA"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$174"
-			quid       	"3B66EE8D01BF"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$175"
-				quid       	"3B66EE8E0198"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "elementDeclarations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B66EE8E0199"
-				label      	"elementDeclarations"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$176"
-			quid       	"3B66FDFA00C3"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$177"
-				quid       	"3B66FDFB027D"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "attributeDeclarations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B66FDFB027E"
-				label      	"attributeDeclarations"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$178"
-			quid       	"3B66EE920216"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$179"
-				quid       	"3B66EE93018B"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "attributeGroupDefinitions"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B66EE93018C"
-				label      	"attributeGroupDefinitions"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$180"
-			quid       	"3B66EE760049"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$181"
-				quid       	"3B66EE760374"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "typeDefinitions"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B66EE76037E"
-				label      	"typeDefinitions"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$182"
-			quid       	"3B66EEFF024F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$183"
-				quid       	"3B66EF00025A"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "modelGroupDefinitions"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B66EF000264"
-				label      	"modelGroupDefinitions"
-				supplier   	"Logical View::xsd::XSDModelGroupDefinition"
-				quidu      	"3B66ED9A0205"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$184"
-			quid       	"3BFC2A1701ED"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$185"
-				quid       	"3BFC2A1A0273"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "identityConstraintDefinitions"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3BFC2A1A027D"
-				label      	"identityConstraintDefinitions"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$186"
-			quid       	"3B66EEA7023E"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$187"
-				quid       	"3B66EEA8038A"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "notationDeclarations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B66EEA8038B"
-				label      	"notationDeclarations"
-				supplier   	"Logical View::xsd::XSDNotationDeclaration"
-				quidu      	"3B66EDAA021C"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$188"
-			quid       	"3B69E4560290"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$189"
-				quid       	"3B69E4570165"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "annotations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B69E457016F"
-				label      	"annotations"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$190"
-			quid       	"3B6D5CA50112"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$191"
-				quid       	"3B6D5CA703B4"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "contents"
-				quid       	"3B6D5CA703C8"
-				label      	"contents"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$192"
-			quid       	"3B6C35AD0374"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$193"
-				quid       	"3B6C35AF0006"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "facetContents"
-				quid       	"3B6C35AF0010"
-				label      	"facetContents"
-				supplier   	"Logical View::xsd::XSDConstrainingFacet"
-				quidu      	"3B6C6B340093"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$194"
-			quid       	"3BC8AE0203A8"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$195"
-				quid       	"3BC8AE060051"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "facets"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3BC8AE060065"
-				label      	"facets"
-				supplier   	"Logical View::xsd::XSDConstrainingFacet"
-				quidu      	"3B6C6B340093"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$196"
-			quid       	"3B6C34B70208"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$197"
-				quid       	"3B6C34BE0258"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "memberTypeDefinitions"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6C34BE0259"
-				label      	"memberTypeDefinitions"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$198"
-			quid       	"3B6C363201DB"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$199"
-				quid       	"3B6C36350059"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "fundamentalFacets"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3B6C36350063"
-				label      	"fundamentalFacets"
-				supplier   	"Logical View::xsd::XSDFundamentalFacet"
-				quidu      	"3B6C69E801D6"
-				client_cardinality 	(value cardinality "1..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$200"
-			quid       	"3B6D35AB0273"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$201"
-				quid       	"3B6D35B20291"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "baseTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6D35B202A5"
-				label      	"baseTypeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$202"
-			quid       	"3B6D5572016C"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$203"
-				quid       	"3B6D5575022F"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "primitiveTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6D55750243"
-				label      	"primitiveTypeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$204"
-			quid       	"3B69E2910158"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$205"
-				quid       	"3B69E292019F"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69E29201A9"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$206"
-			quid       	"3B9006CF0088"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$207"
-				quid       	"3B9006D1015D"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				is_aggregate 	TRUE)
-			    (object Role "derivationAnnotation"
-				quid       	"3B9006D10167"
-				label      	"derivationAnnotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$208"
-			quid       	"3B69DB330264"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$209"
-				quid       	"3B69DB340284"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				is_aggregate 	TRUE)
-			    (object Role "annotations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B69DB34028E"
-				label      	"annotations"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$210"
-			quid       	"3B69DB11026F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$211"
-				quid       	"3B69DB1201F9"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB120203"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$212"
-			quid       	"3C626EB30005"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$213"
-				quid       	"3C626EB40327"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				is_aggregate 	TRUE)
-			    (object Role "annotations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C626EB40332"
-				label      	"annotations"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$214"
-			quid       	"3BEBDC870247"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$215"
-				quid       	"3BEBDC8C02F9"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "attributeWildcardContent"
-				quid       	"3BEBDC8C0303"
-				label      	"attributeWildcardContent"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$216"
-			quid       	"3BFE622703CD"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$217"
-				attributes 	(list Attribute_Set)
-				quid       	"3BFE622B0061"
-				supplier   	"Logical View::xsd::XSDDiagnostic"
-				quidu      	"3BFE5F910046")
-			    (object Role "components"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3BFE622B006C"
-				label      	"components"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"
-				client_cardinality 	(value cardinality "1..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$218"
-			quid       	"3BFE62690165"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$219"
-				quid       	"3BFE626A0026"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"
-				is_aggregate 	TRUE)
-			    (object Role "diagnostics"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3BFE626A0027"
-				label      	"diagnostics"
-				supplier   	"Logical View::xsd::XSDDiagnostic"
-				quidu      	"3BFE5F910046"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$220"
-			quid       	"3BFE6431035F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$221"
-				quid       	"3BFE643201C6"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "allDiagnostics"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3BFE643201C7"
-				label      	"allDiagnostics"
-				supplier   	"Logical View::xsd::XSDDiagnostic"
-				quidu      	"3BFE5F910046"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$222"
-			quid       	"3C21DCC700EC"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$223"
-				quid       	"3C21DCCE0042"
-				supplier   	"Logical View::xsd::XSDSchemaDirective"
-				quidu      	"3B6AD8A202A2"
-				is_aggregate 	TRUE)
-			    (object Role "resolvedSchema"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C21DCCE0043"
-				label      	"resolvedSchema"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$224"
-			quid       	"3C21DD0C03DB"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$225"
-				quid       	"3C21DD100304"
-				supplier   	"Logical View::xsd::XSDSchemaCompositor"
-				quidu      	"3C21DB4102AE"
-				is_aggregate 	TRUE)
-			    (object Role "incorporatedSchema"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C21DD100305"
-				label      	"incorporatedSchema"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$226"
-			quid       	"3C239134004F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$227"
-				quid       	"3C23913600CA"
-				supplier   	"Logical View::xsd::XSDXPathDefinition"
-				quidu      	"3B6D83BB0355"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3C23913600D4"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$228"
-			quid       	"3C25D3A60131"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$229"
-				quid       	"3C25D3A90370"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB")
-			    (object Role "referencingDirectives"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C25D3A90371"
-				label      	"referencingDirectives"
-				supplier   	"Logical View::xsd::XSDSchemaDirective"
-				quidu      	"3B6AD8A202A2"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$230"
-			quid       	"3C25ECF0005E"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$231"
-				quid       	"3C25ECF4001E"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB")
-			    (object Role "rootVersion"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C25ECF40028"
-				label      	"rootVersion"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$232"
-			quid       	"3C25ED0B011B"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$233"
-				quid       	"3C25ED0F0121"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB")
-			    (object Role "originalVersion"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C25ED0F012B"
-				label      	"originalVersion"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$234"
-			quid       	"3C25EEAB001F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$235"
-				quid       	"3C25EEAF010B"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "incorporatedVersions"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C25EEAF0115"
-				label      	"incorporatedVersions"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$236"
-			quid       	"3C276DA000DE"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$237"
-				quid       	"3C276DA000DF"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "itemTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C276DA000E0"
-				label      	"itemTypeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$238"
-			quid       	"3C2784730194"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$239"
-				quid       	"3C27847501F1"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB")
-			    (object Role "schemaForSchema"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C27847501FB"
-				label      	"schemaForSchema"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$240"
-			quid       	"3C2880F503D9"
-			roles      	(list role_list
-			    (object Role "rootTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C2880F9003C"
-				label      	"rootTypeDefinition"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$241"
-				attributes 	(list Attribute_Set)
-				quid       	"3C2880F90046"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A")))
-		    (object Association "$UNNAMED$242"
-			quid       	"3C2882C50137"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$243"
-				attributes 	(list Attribute_Set)
-				quid       	"3C2882C70112"
-				supplier   	"Logical View::xsd::XSDDiagnostic"
-				quidu      	"3BFE5F910046")
-			    (object Role "primaryComponent"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C2882C70113"
-				label      	"primaryComponent"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$244"
-			quid       	"3C28A0F201A4"
-			roles      	(list role_list
-			    (object Role "type"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28A0F302E5"
-				label      	"type"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$245"
-				attributes 	(list Attribute_Set)
-				quid       	"3C28A0F302F0"
-				supplier   	"Logical View::xsd::XSDFeature"
-				quidu      	"3B69B537026C")))
-		    (object Association "$UNNAMED$246"
-			quid       	"3C28A6DB01E5"
-			roles      	(list role_list
-			    (object Role "rootType"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28A6DD03DD"
-				label      	"rootType"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$247"
-				attributes 	(list Attribute_Set)
-				quid       	"3C28A6DD03DE"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9")))
-		    (object Association "$UNNAMED$248"
-			quid       	"3C28A7120108"
-			roles      	(list role_list
-			    (object Role "baseType"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28A7140151"
-				label      	"baseType"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$249"
-				attributes 	(list Attribute_Set)
-				quid       	"3C28A714015B"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9")))
-		    (object Association "$UNNAMED$250"
-			quid       	"3C28A74B0178"
-			roles      	(list role_list
-			    (object Role "simpleType"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28A74D017B"
-				label      	"simpleType"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$251"
-				attributes 	(list Attribute_Set)
-				quid       	"3C28A74D0185"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9")))
-		    (object Association "$UNNAMED$252"
-			quid       	"3C28A7ED03C0"
-			roles      	(list role_list
-			    (object Role "complexType"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28A7F40117"
-				label      	"complexType"
-				supplier   	"Logical View::xsd::XSDParticle"
-				quidu      	"3B682BBD01F7"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$253"
-				attributes 	(list Attribute_Set)
-				quid       	"3C28A7F40121"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9")))
-		    (object Association "$UNNAMED$254"
-			quid       	"3C28A994030A"
-			roles      	(list role_list
-			    (object Role "rootTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28A99700DD"
-				label      	"rootTypeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$255"
-				attributes 	(list Attribute_Set)
-				quid       	"3C28A99700E7"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D")))
-		    (object Association "$UNNAMED$256"
-			quid       	"3C28B085025B"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$257"
-				quid       	"3C28B0860270"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "minFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B086027A"
-				label      	"minFacet"
-				supplier   	"Logical View::xsd::XSDMinFacet"
-				quidu      	"3C0A1CDE037C"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$258"
-			quid       	"3C28B08D0252"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$259"
-				quid       	"3C28B08E0091"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "maxFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B08E009B"
-				label      	"maxFacet"
-				supplier   	"Logical View::xsd::XSDMaxFacet"
-				quidu      	"3C0A1CEB010E"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$260"
-			quid       	"3C28B0AB0396"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$261"
-				quid       	"3C28B0AC03C9"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "maxInclusiveFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0AC03D4"
-				label      	"maxInclusiveFacet"
-				supplier   	"Logical View::xsd::XSDMaxInclusiveFacet"
-				quidu      	"3B6C787D00DA"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$262"
-			quid       	"3C28B0AF0338"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$263"
-				quid       	"3C28B0B001F9"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "minInclusiveFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0B00203"
-				label      	"minInclusiveFacet"
-				supplier   	"Logical View::xsd::XSDMinInclusiveFacet"
-				quidu      	"3B6C788702C9"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$264"
-			quid       	"3C28B0B30207"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$265"
-				quid       	"3C28B0B40190"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "minExclusiveFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0B4019A"
-				label      	"minExclusiveFacet"
-				supplier   	"Logical View::xsd::XSDMinExclusiveFacet"
-				quidu      	"3B6C792D000A"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$266"
-			quid       	"3C28B0B6028D"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$267"
-				quid       	"3C28B0B70217"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "maxExclusiveFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0B70221"
-				label      	"maxExclusiveFacet"
-				supplier   	"Logical View::xsd::XSDMaxExclusiveFacet"
-				quidu      	"3B6C789600C2"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$268"
-			quid       	"3C28B0BC0051"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$269"
-				quid       	"3C28B0BC0246"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "lengthFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0BC0250"
-				label      	"lengthFacet"
-				supplier   	"Logical View::xsd::XSDLengthFacet"
-				quidu      	"3B6C776200E7"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$270"
-			quid       	"3C28B0BF018C"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$271"
-				quid       	"3C28B0C0006B"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "whiteSpaceFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0C00075"
-				label      	"whiteSpaceFacet"
-				supplier   	"Logical View::xsd::XSDWhiteSpaceFacet"
-				quidu      	"3B6C784601B7"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$272"
-			quid       	"3C28B0C2021D"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$273"
-				quid       	"3C28B0C300AB"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "enumerationFacets"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0C300AC"
-				label      	"enumerationFacets"
-				supplier   	"Logical View::xsd::XSDEnumerationFacet"
-				quidu      	"3B6C6ACE0141"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$274"
-			quid       	"3C28B0C50159"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$275"
-				quid       	"3C28B0C600B0"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "patternFacets"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0C600BA"
-				label      	"patternFacets"
-				supplier   	"Logical View::xsd::XSDPatternFacet"
-				quidu      	"3B6C6ADB026C"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$276"
-			quid       	"3C28B0C802A7"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$277"
-				quid       	"3C28B0C901EA"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "cardinalityFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0C901F5"
-				label      	"cardinalityFacet"
-				supplier   	"Logical View::xsd::XSDCardinalityFacet"
-				quidu      	"3B6C755D03D2"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$278"
-			quid       	"3C28B0CB039C"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$279"
-				quid       	"3C28B0CC03D0"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "numericFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0CC03D1"
-				label      	"numericFacet"
-				supplier   	"Logical View::xsd::XSDNumericFacet"
-				quidu      	"3B6C75950206"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$280"
-			quid       	"3C28B0CF0199"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$281"
-				quid       	"3C28B0D20085"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "maxLengthFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0D2008F"
-				label      	"maxLengthFacet"
-				supplier   	"Logical View::xsd::XSDMaxLengthFacet"
-				quidu      	"3B6C77C70146"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$282"
-			quid       	"3C28B0D500C5"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$283"
-				quid       	"3C28B0D6001D"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "minLengthFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0D60027"
-				label      	"minLengthFacet"
-				supplier   	"Logical View::xsd::XSDMinLengthFacet"
-				quidu      	"3B6C778C0065"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$284"
-			quid       	"3C28B0D800DE"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$285"
-				quid       	"3C28B0D803CD"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "totalDigitsFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0D803D7"
-				label      	"totalDigitsFacet"
-				supplier   	"Logical View::xsd::XSDTotalDigitsFacet"
-				quidu      	"3B6C79A0020E"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$286"
-			quid       	"3C28B0DB0377"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$287"
-				quid       	"3C28B0DC035A"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "fractionDigitsFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0DC0364"
-				label      	"fractionDigitsFacet"
-				supplier   	"Logical View::xsd::XSDFractionDigitsFacet"
-				quidu      	"3B6C79BE02EE"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$288"
-			quid       	"3C28B0DF0048"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$289"
-				quid       	"3C28B0DF03B9"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "orderedFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0DF03C3"
-				label      	"orderedFacet"
-				supplier   	"Logical View::xsd::XSDOrderedFacet"
-				quidu      	"3B6C74DD0248"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$290"
-			quid       	"3C28B0E300D9"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$291"
-				quid       	"3C28B0E4038E"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "boundedFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0E40398"
-				label      	"boundedFacet"
-				supplier   	"Logical View::xsd::XSDBoundedFacet"
-				quidu      	"3B6C751D0344"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$292"
-			quid       	"3C28B44401EC"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$293"
-				quid       	"3C28B4450360"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveMaxFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B445036A"
-				label      	"effectiveMaxFacet"
-				supplier   	"Logical View::xsd::XSDMaxFacet"
-				quidu      	"3C0A1CEB010E"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$294"
-			quid       	"3C28B54F0145"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$295"
-				quid       	"3C28B550038C"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveWhiteSpaceFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B5500396"
-				label      	"effectiveWhiteSpaceFacet"
-				supplier   	"Logical View::xsd::XSDWhiteSpaceFacet"
-				quidu      	"3B6C784601B7"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$296"
-			quid       	"3C28B5C4011C"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$297"
-				quid       	"3C28B5C5020D"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveMaxLengthFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B5C50217"
-				label      	"effectiveMaxLengthFacet"
-				supplier   	"Logical View::xsd::XSDMaxLengthFacet"
-				quidu      	"3B6C77C70146"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$298"
-			quid       	"3C28B62A00AA"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$299"
-				quid       	"3C28B62B0138"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveFractionDigitsFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B62B0142"
-				label      	"effectiveFractionDigitsFacet"
-				supplier   	"Logical View::xsd::XSDFractionDigitsFacet"
-				quidu      	"3B6C79BE02EE"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$300"
-			quid       	"3C28B6B003A6"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$301"
-				quid       	"3C28B6B10311"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectivePatternFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B6B10312"
-				label      	"effectivePatternFacet"
-				supplier   	"Logical View::xsd::XSDPatternFacet"
-				quidu      	"3B6C6ADB026C"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$302"
-			quid       	"3C28B7CA026B"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$303"
-				quid       	"3C28B7CB0186"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveEnumerationFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B7CB0190"
-				label      	"effectiveEnumerationFacet"
-				supplier   	"Logical View::xsd::XSDEnumerationFacet"
-				quidu      	"3B6C6ACE0141"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$304"
-			quid       	"3C28B8400062"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$305"
-				quid       	"3C28B841001D"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveTotalDigitsFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B8410027"
-				label      	"effectiveTotalDigitsFacet"
-				supplier   	"Logical View::xsd::XSDTotalDigitsFacet"
-				quidu      	"3B6C79A0020E"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$306"
-			quid       	"3C28B898016D"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$307"
-				quid       	"3C28B8990056"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveMinLengthFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B8990060"
-				label      	"effectiveMinLengthFacet"
-				supplier   	"Logical View::xsd::XSDMinLengthFacet"
-				quidu      	"3B6C778C0065"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$308"
-			quid       	"3C28B8DC0052"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$309"
-				quid       	"3C28B8DC03B9"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveLengthFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B8DC03C3"
-				label      	"effectiveLengthFacet"
-				supplier   	"Logical View::xsd::XSDLengthFacet"
-				quidu      	"3B6C776200E7"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$310"
-			quid       	"3C28B97001DB"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$311"
-				quid       	"3C28B97100CF"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveMinFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B97100D9"
-				label      	"effectiveMinFacet"
-				supplier   	"Logical View::xsd::XSDMinFacet"
-				quidu      	"3C0A1CDE037C"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$312"
-			quid       	"3D4BB4AE01CC"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$313"
-				quid       	"3D4BB4AF010F"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "syntheticFacets"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3D4BB4AF011A"
-				label      	"syntheticFacets"
-				supplier   	"Logical View::xsd::XSDFacet"
-				quidu      	"3B6C359403D2"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$314"
-			quid       	"3D4BB4D3028E"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$315"
-				quid       	"3D4BB4D402F3"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "syntheticParticle"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3D4BB4D402FD"
-				label      	"syntheticParticle"
-				supplier   	"Logical View::xsd::XSDParticle"
-				quidu      	"3B682BBD01F7"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$316"
-			quid       	"3D4BB4D901F6"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$317"
-				quid       	"3D4BB4DA0284"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "syntheticWildcard"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3D4BB4DA028E"
-				label      	"syntheticWildcard"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$318"
-			quid       	"3D4C68FF01BF"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$319"
-				quid       	"3D4C69020317"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "syntheticWildcard"
-				quid       	"3D4C69020318"
-				label      	"syntheticWildcard"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE))))
-		logical_presentations 	(list unit_reference_list
-		    (object ClassDiagram "1. Component Hierarchy (Part 1: Structures)"
-			quid       	"3B6847680138"
-			title      	"1. Component Hierarchy (Part 1: Structures)"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDComponent" @400
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(928, 80)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@400
-				    location   	(766, 37)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846E90029"
-				width      	342
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDNamedComponent" @401
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1168, 560)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@401
-				    location   	(940, 517)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	456
-				    justify    	0
-				    label      	"XSDNamedComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846D303A4"
-				width      	474
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @402
-				location   	(928, 225)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@400
-				vertices   	(list Points
-				    (928, 225)
-				    (928, 135)))
-			    (object ClassView "Class" "Logical View::xsd::XSDTerm" @403
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1568, 320)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@403
-				    location   	(1460, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	216
-				    justify    	0
-				    label      	"XSDTerm")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683C5E0174"
-				width      	234
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @404
-				location   	(1203, 706)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@401
-				vertices   	(list Points
-				    (1203, 706)
-				    (1203, 615)))
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeContent" @405
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(624, 560)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@405
-				    location   	(372, 517)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	504
-				    justify    	0
-				    label      	"XSDComplexTypeContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683BA00196"
-				width      	522
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @406
-				location   	(444, 709)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@405
-				vertices   	(list Points
-				    (444, 709)
-				    (444, 615)))
-			    (object InheritTreeView "" @407
-				location   	(1572, 465)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@403
-				vertices   	(list Points
-				    (1572, 465)
-				    (1572, 375)))
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @408
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(416, 800)
-				label      	(object ItemLabel
-				    Parent_View 	@408
-				    location   	(290, 757)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	252
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	270
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @409
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(448, 1056)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@409
-				    location   	(262, 1013)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	372
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	390
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUse" @410
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1104, 320)
-				label      	(object ItemLabel
-				    Parent_View 	@410
-				    location   	(936, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	336
-				    justify    	0
-				    label      	"XSDAttributeUse")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B68354601A8"
-				width      	354
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @411
-				location   	(453, 1203)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@409
-				vertices   	(list Points
-				    (453, 1203)
-				    (453, 1111)))
-			    (object ClassView "Class" "Logical View::xsd::XSDScope" @412
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(176, 320)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@412
-				    location   	(62, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	228
-				    justify    	0
-				    label      	"XSDScope")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B54000F2"
-				width      	246
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDFeature" @413
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1872, 800)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@413
-				    location   	(1746, 757)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	252
-				    justify    	0
-				    label      	"XSDFeature")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B537026C"
-				width      	270
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @414
-				location   	(1872, 950)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@413
-				vertices   	(list Points
-				    (1872, 950)
-				    (1872, 855)))
-			    (object InheritTreeView "" @415
-				location   	(181, 465)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@412
-				vertices   	(list Points
-				    (181, 465)
-				    (181, 375)))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @416
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1936, 1280)
-				label      	(object ItemLabel
-				    Parent_View 	@416
-				    location   	(1670, 1233)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	532
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	550
-				height     	118
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @417
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1968, 1056)
-				label      	(object ItemLabel
-				    Parent_View 	@417
-				    location   	(1734, 1013)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				width      	486
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDIdentityConstraintDefinition" @418
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1888, 1488)
-				label      	(object ItemLabel
-				    Parent_View 	@418
-				    location   	(1569, 1444)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	638
-				    justify    	0
-				    label      	"XSDIdentityConstraintDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B2603A2"
-				width      	656
-				height     	112
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDNotationDeclaration" @419
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1184, 1488)
-				label      	(object ItemLabel
-				    Parent_View 	@419
-				    location   	(903, 1444)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	563
-				    justify    	0
-				    label      	"XSDNotationDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDAA021C"
-				width      	581
-				height     	112
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @420
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1600, 560)
-				label      	(object ItemLabel
-				    Parent_View 	@420
-				    location   	(1462, 517)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	276
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				width      	294
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @421
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1024, 1056)
-				label      	(object ItemLabel
-				    Parent_View 	@421
-				    location   	(778, 1013)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	492
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				width      	510
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroup" @422
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1968, 560)
-				label      	(object ItemLabel
-				    Parent_View 	@422
-				    location   	(1806, 517)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDModelGroup")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6834E00291"
-				width      	342
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @423
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(352, 1296)
-				label      	(object ItemLabel
-				    Parent_View 	@423
-				    location   	(106, 1253)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	492
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				width      	510
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @424
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(192, 560)
-				label      	(object ItemLabel
-				    Parent_View 	@424
-				    location   	(60, 517)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	264
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	282
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @425
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1072, 1280)
-				label      	(object ItemLabel
-				    Parent_View 	@425
-				    location   	(802, 1237)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	540
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	558
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @426
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(368, 1488)
-				label      	(object ItemLabel
-				    Parent_View 	@426
-				    location   	(30, 1441)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	676
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				width      	694
-				height     	119
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAnnotation" @427
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(576, 320)
-				label      	(object ItemLabel
-				    Parent_View 	@427
-				    location   	(426, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	300
-				    justify    	0
-				    label      	"XSDAnnotation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDC80233"
-				width      	318
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDXPathDefinition" @428
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2000, 320)
-				label      	(object ItemLabel
-				    Parent_View 	@428
-				    location   	(1808, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	384
-				    justify    	0
-				    label      	"XSDXPathDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6D83BB0355"
-				width      	402
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @429
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B72D7BB0349"
-				client     	@410
-				supplier   	@400
-				line_style 	3
-				origin_attachment 	(1094, 265)
-				terminal_attachment 	(1094, 225)
-				drawSupplier 	@402)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefinableComponent" @430
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(960, 800)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@430
-				    location   	(690, 757)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	540
-				    justify    	0
-				    label      	"XSDRedefinableComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B7FCA8B020B"
-				width      	558
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @431
-				location   	(962, 947)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@430
-				vertices   	(list Points
-				    (962, 947)
-				    (962, 855)))
-			    (object InheritView "" @432
-				stereotype 	(object SegLabel @433
-				    Parent_View 	@432
-				    location   	(218, 1154)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	212
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.163534
-				    height     	69
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B685F55032B"
-				client     	@423
-				supplier   	@405
-				line_style 	3
-				origin_attachment 	(149, 1241)
-				terminal_attachment 	(149, 709)
-				drawSupplier 	@406)
-			    (object InheritView "" @434
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A1302A2"
-				client     	@423
-				supplier   	@409
-				line_style 	3
-				origin_attachment 	(256, 1241)
-				terminal_attachment 	(256, 1203)
-				drawSupplier 	@411)
-			    (object InheritView "" @435
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCC4A0182"
-				client     	@424
-				supplier   	@412
-				line_style 	3
-				origin_attachment 	(284, 505)
-				terminal_attachment 	(284, 465)
-				drawSupplier 	@415)
-			    (object InheritView "" @436
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A640279"
-				client     	@422
-				supplier   	@403
-				line_style 	3
-				origin_attachment 	(2002, 505)
-				terminal_attachment 	(2002, 465)
-				drawSupplier 	@407)
-			    (object InheritView "" @437
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6848AA01D3"
-				client     	@403
-				supplier   	@400
-				line_style 	3
-				origin_attachment 	(1569, 265)
-				terminal_attachment 	(1569, 225)
-				drawSupplier 	@402)
-			    (object InheritView "" @438
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A3A0041"
-				client     	@420
-				supplier   	@403
-				line_style 	3
-				origin_attachment 	(1490, 505)
-				terminal_attachment 	(1490, 465)
-				drawSupplier 	@407)
-			    (object InheritView "" @439
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6848FC01E7"
-				client     	@408
-				supplier   	@405
-				line_style 	3
-				origin_attachment 	(510, 745)
-				terminal_attachment 	(510, 709)
-				drawSupplier 	@406)
-			    (object InheritView "" @440
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAC800D2"
-				client     	@425
-				supplier   	@430
-				line_style 	3
-				origin_attachment 	(1321, 1225)
-				terminal_attachment 	(1321, 947)
-				drawSupplier 	@431)
-			    (object InheritView "" @441
-				stereotype 	(object SegLabel @442
-				    Parent_View 	@441
-				    location   	(2137, 886)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	238
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.215812
-				    height     	64
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B685F17002E"
-				client     	@417
-				supplier   	@403
-				line_style 	3
-				origin_attachment 	(2200, 1001)
-				terminal_attachment 	(2200, 465)
-				drawSupplier 	@407)
-			    (object InheritView "" @443
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69EDEE01BF"
-				client     	@417
-				supplier   	@413
-				line_style 	3
-				origin_attachment 	(2093, 1001)
-				terminal_attachment 	(2093, 950)
-				drawSupplier 	@414)
-			    (object InheritView "" @444
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAB1004D"
-				client     	@409
-				supplier   	@430
-				line_style 	3
-				origin_attachment 	(450, 1001)
-				terminal_attachment 	(450, 947)
-				drawSupplier 	@431)
-			    (object InheritView "" @445
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCD640231"
-				client     	@412
-				supplier   	@400
-				line_style 	3
-				origin_attachment 	(147, 265)
-				terminal_attachment 	(147, 225)
-				drawSupplier 	@402)
-			    (object InheritView "" @446
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D84F70092"
-				client     	@428
-				supplier   	@400
-				line_style 	3
-				origin_attachment 	(2012, 265)
-				terminal_attachment 	(2012, 225)
-				drawSupplier 	@402)
-			    (object InheritView "" @447
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6848B80286"
-				client     	@405
-				supplier   	@400
-				line_style 	3
-				origin_attachment 	(834, 505)
-				terminal_attachment 	(834, 225)
-				drawSupplier 	@402)
-			    (object InheritView "" @448
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0CEA20197"
-				client     	@401
-				supplier   	@400
-				line_style 	3
-				origin_attachment 	(1350, 505)
-				terminal_attachment 	(1350, 225)
-				drawSupplier 	@402)
-			    (object InheritView "" @449
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69E1770116"
-				client     	@427
-				supplier   	@400
-				line_style 	3
-				origin_attachment 	(572, 265)
-				terminal_attachment 	(572, 225)
-				drawSupplier 	@402)
-			    (object InheritView "" @450
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69B7DC0193"
-				client     	@416
-				supplier   	@413
-				line_style 	3
-				origin_attachment 	(1693, 1221)
-				terminal_attachment 	(1693, 950)
-				drawSupplier 	@414)
-			    (object InheritView "" @451
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684AA30242"
-				client     	@418
-				supplier   	@401
-				line_style 	3
-				origin_attachment 	(1590, 1432)
-				terminal_attachment 	(1590, 706)
-				drawSupplier 	@404)
-			    (object InheritView "" @452
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B68494302F1"
-				client     	@419
-				supplier   	@401
-				line_style 	3
-				origin_attachment 	(1431, 1432)
-				terminal_attachment 	(1431, 706)
-				drawSupplier 	@404)
-			    (object InheritView "" @453
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A26036D"
-				client     	@430
-				supplier   	@401
-				line_style 	3
-				origin_attachment 	(959, 745)
-				terminal_attachment 	(959, 706)
-				drawSupplier 	@404)
-			    (object InheritView "" @454
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A2C0307"
-				client     	@413
-				supplier   	@401
-				line_style 	3
-				origin_attachment 	(1872, 745)
-				terminal_attachment 	(1872, 706)
-				drawSupplier 	@404)
-			    (object InheritView "" @455
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAC40090"
-				client     	@421
-				supplier   	@430
-				line_style 	3
-				origin_attachment 	(962, 1001)
-				terminal_attachment 	(962, 947)
-				drawSupplier 	@431)
-			    (object InheritView "" @456
-				stereotype 	(object SegLabel @457
-				    Parent_View 	@456
-				    location   	(95, 1388)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	187
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.042531
-				    height     	67
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B69BAA20310"
-				client     	@426
-				supplier   	@412
-				line_style 	3
-				origin_attachment 	(28, 1429)
-				terminal_attachment 	(28, 465)
-				drawSupplier 	@415)
-			    (object InheritView "" @458
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0D01901F1"
-				client     	@426
-				supplier   	@409
-				line_style 	3
-				origin_attachment 	(656, 1429)
-				terminal_attachment 	(656, 1203)
-				drawSupplier 	@411)))
-		    (object ClassDiagram "2. Component Relations (Part 1 : Structures)"
-			quid       	"374B18190028"
-			title      	"2. Component Relations (Part 1 : Structures)"
-			zoom       	96
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDScope" @459
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(784, 1632)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@459
-				    location   	(670, 1591)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	228
-				    justify    	0
-				    label      	"XSDScope")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B54000F2"
-				width      	246
-				height     	107
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDFeature" @460
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(192, 1632)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@460
-				    location   	(66, 1591)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	252
-				    justify    	0
-				    label      	"XSDFeature")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B537026C"
-				width      	270
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$134" @461
-				location   	(494, 1627)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69B653017A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "scope" @462
-					Parent_View 	@461
-					location   	(286, -485)
-					label      	(object SegLabel @463
-					    Parent_View 	@462
-					    location   	(555, 1589)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	132
-					    justify    	0
-					    label      	"+scope"
-					    pctDist    	0.371257
-					    height     	39
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69B654006D"
-					client     	@461
-					supplier   	@459
-					line_style 	3
-					origin_attachment 	(494, 1627)
-					terminal_attachment 	(661, 1627)
-					label      	(object SegLabel @464
-					    Parent_View 	@462
-					    location   	(576, 1664)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.491018
-					    height     	37
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$135" @465
-					Parent_View 	@461
-					location   	(286, -485)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69B654006E"
-					client     	@461
-					supplier   	@460
-					line_style 	3
-					origin_attachment 	(494, 1627)
-					terminal_attachment 	(327, 1627))))
-			    (object ClassView "Class" "Logical View::xsd::XSDTerm" @466
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2192, 1232)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@466
-				    location   	(2084, 1191)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	216
-				    justify    	0
-				    label      	"XSDTerm")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683C5E0174"
-				width      	234
-				height     	107
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @467
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2176, 992)
-				label      	(object ItemLabel
-				    Parent_View 	@467
-				    location   	(2051, 951)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	250
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	268
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$166" @468
-				location   	(2229, 1112)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B683C890122"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$167" @469
-					Parent_View 	@468
-					location   	(549, -248)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B683C8A0110"
-					client     	@468
-					supplier   	@467
-					line_style 	3
-					origin_attachment 	(2229, 1112)
-					terminal_attachment 	(2229, 1045))
-				    (object RoleView "term" @470
-					Parent_View 	@468
-					location   	(549, -248)
-					label      	(object SegLabel @471
-					    Parent_View 	@470
-					    location   	(2157, 1121)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	108
-					    justify    	0
-					    label      	"+term"
-					    pctDist    	0.134328
-					    height     	72
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B683C8A0111"
-					client     	@468
-					supplier   	@466
-					line_style 	3
-					origin_attachment 	(2229, 1112)
-					terminal_attachment 	(2229, 1179)
-					label      	(object SegLabel @472
-					    Parent_View 	@470
-					    location   	(2274, 1119)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.119403
-					    height     	45
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeContent" @473
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1328, 1232)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@473
-				    location   	(1076, 1191)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	504
-				    justify    	0
-				    label      	"XSDComplexTypeContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683BA00196"
-				width      	522
-				height     	107
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroup" @474
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2144, 768)
-				label      	(object ItemLabel
-				    Parent_View 	@474
-				    location   	(1977, 727)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	334
-				    justify    	0
-				    label      	"XSDModelGroup")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6834E00291"
-				width      	352
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$154" @475
-				location   	(2219, 880)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B683606026F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$155" @476
-					Parent_View 	@475
-					location   	(-357, -240)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6836070221"
-					client     	@475
-					supplier   	@474
-					line_style 	3
-					origin_attachment 	(2219, 880)
-					terminal_attachment 	(2219, 821))
-				    (object RoleView "particles" @477
-					Parent_View 	@475
-					location   	(-357, -240)
-					label      	(object SegLabel @478
-					    Parent_View 	@477
-					    location   	(2105, 888)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+particles"
-					    pctDist    	0.156627
-					    height     	115
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6836070222"
-					client     	@475
-					supplier   	@467
-					line_style 	3
-					origin_attachment 	(2219, 880)
-					terminal_attachment 	(2219, 939)
-					label      	(object SegLabel @479
-					    Parent_View 	@477
-					    location   	(2281, 888)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"1..*"
-					    pctDist    	0.156627
-					    height     	62
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @480
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1776, 992)
-				label      	(object ItemLabel
-				    Parent_View 	@480
-				    location   	(1639, 951)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	274
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				width      	292
-				height     	107
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUse" @481
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1072, 1424)
-				label      	(object ItemLabel
-				    Parent_View 	@481
-				    location   	(905, 1383)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	334
-				    justify    	0
-				    label      	"XSDAttributeUse")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B68354601A8"
-				width      	352
-				height     	107
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @482
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(432, 992)
-				label      	(object ItemLabel
-				    Parent_View 	@482
-				    location   	(187, 951)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	490
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				width      	508
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$200" @483
-				location   	(590, 1140)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D35AB0273"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$201" @484
-					Parent_View 	@483
-					location   	(302, 148)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D35B20291"
-					client     	@483
-					supplier   	@482
-					vertices   	(list Points
-					    (590, 1140)
-					    (540, 1140)
-					    (540, 1045))
-					line_style 	3
-					origin_attachment 	(590, 1140)
-					terminal_attachment 	(540, 1045))
-				    (object RoleView "baseTypeDefinition" @485
-					Parent_View 	@483
-					location   	(302, 148)
-					label      	(object SegLabel @486
-					    Parent_View 	@485
-					    location   	(643, 1171)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+baseTypeDefinition"
-					    pctDist    	1.053571
-					    height     	31
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D35B202A5"
-					client     	@483
-					supplier   	@482
-					vertices   	(list Points
-					    (590, 1140)
-					    (641, 1140)
-					    (641, 1045))
-					line_style 	3
-					origin_attachment 	(590, 1140)
-					terminal_attachment 	(641, 1045)
-					label      	(object SegLabel @487
-					    Parent_View 	@485
-					    location   	(584, 1097)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.122449
-					    height     	44
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @488
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1008, 992)
-				label      	(object ItemLabel
-				    Parent_View 	@488
-				    location   	(745, 951)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	526
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				width      	544
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$102" @489
-				location   	(1119, 1112)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6837DF024F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$103" @490
-					Parent_View 	@489
-					location   	(-1569, -8)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6837E100FD"
-					client     	@489
-					supplier   	@488
-					line_style 	3
-					origin_attachment 	(1119, 1112)
-					terminal_attachment 	(1119, 1045))
-				    (object RoleView "contentType" @491
-					Parent_View 	@489
-					location   	(-1569, -8)
-					label      	(object SegLabel @492
-					    Parent_View 	@491
-					    location   	(1259, 1126)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	252
-					    justify    	0
-					    label      	"+contentType"
-					    pctDist    	0.208955
-					    height     	140
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6837E100FE"
-					client     	@489
-					supplier   	@473
-					line_style 	3
-					origin_attachment 	(1119, 1112)
-					terminal_attachment 	(1119, 1179)
-					label      	(object SegLabel @493
-					    Parent_View 	@491
-					    location   	(1063, 1126)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.208955
-					    height     	57
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$108" @494
-				location   	(1455, 982)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6851BA0126"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$109" @495
-					Parent_View 	@494
-					location   	(159, -570)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6851BB0150"
-					client     	@494
-					supplier   	@488
-					line_style 	3
-					origin_attachment 	(1455, 982)
-					terminal_attachment 	(1280, 982))
-				    (object RoleView "attributeWildcard" @496
-					Parent_View 	@494
-					location   	(159, -570)
-					label      	(object SegLabel @497
-					    Parent_View 	@496
-					    location   	(1445, 929)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+attributeWildcard"
-					    pctDist    	-0.062857
-					    height     	54
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6851BB0151"
-					client     	@494
-					supplier   	@480
-					line_style 	3
-					origin_attachment 	(1455, 982)
-					terminal_attachment 	(1630, 982)
-					label      	(object SegLabel @498
-					    Parent_View 	@496
-					    location   	(1550, 1022)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.542857
-					    height     	40
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$104" @499
-				location   	(921, 1208)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B683959006E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$105" @500
-					Parent_View 	@499
-					location   	(-871, -376)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6839590349"
-					client     	@499
-					supplier   	@488
-					line_style 	3
-					origin_attachment 	(921, 1208)
-					terminal_attachment 	(921, 1045))
-				    (object RoleView "attributeUses" @501
-					Parent_View 	@499
-					location   	(-871, -376)
-					label      	(object SegLabel @502
-					    Parent_View 	@501
-					    location   	(778, 1251)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	264
-					    justify    	0
-					    label      	"+attributeUses"
-					    pctDist    	0.269939
-					    height     	144
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B683959034A"
-					client     	@499
-					supplier   	@481
-					line_style 	3
-					origin_attachment 	(921, 1208)
-					terminal_attachment 	(921, 1371)
-					label      	(object SegLabel @503
-					    Parent_View 	@501
-					    location   	(979, 1254)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.288344
-					    height     	58
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDXPathDefinition" @504
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1312, 768)
-				label      	(object ItemLabel
-				    Parent_View 	@504
-				    location   	(1122, 727)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	380
-				    justify    	0
-				    label      	"XSDXPathDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6D83BB0355"
-				width      	398
-				height     	107
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDNotationDeclaration" @505
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1856, 1632)
-				label      	(object ItemLabel
-				    Parent_View 	@505
-				    location   	(1623, 1591)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	466
-				    justify    	0
-				    label      	"XSDNotationDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDAA021C"
-				width      	484
-				height     	107
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @506
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2048, 448)
-				label      	(object ItemLabel
-				    Parent_View 	@506
-				    location   	(1803, 407)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	490
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				width      	508
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$158" @507
-				location   	(2216, 608)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6837AC025A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$159" @508
-					Parent_View 	@507
-					location   	(-552, -816)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6837AD0338"
-					client     	@507
-					supplier   	@506
-					line_style 	3
-					origin_attachment 	(2216, 608)
-					terminal_attachment 	(2216, 501))
-				    (object RoleView "modelGroup" @509
-					Parent_View 	@507
-					location   	(-552, -816)
-					label      	(object SegLabel @510
-					    Parent_View 	@509
-					    location   	(2080, 628)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	252
-					    justify    	0
-					    label      	"+modelGroup"
-					    pctDist    	0.182609
-					    height     	137
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6837AD0339"
-					client     	@507
-					supplier   	@474
-					line_style 	3
-					origin_attachment 	(2216, 608)
-					terminal_attachment 	(2216, 715)
-					label      	(object SegLabel @511
-					    Parent_View 	@509
-					    location   	(2256, 633)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.233645
-					    height     	40
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @512
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1888, 1424)
-				label      	(object ItemLabel
-				    Parent_View 	@512
-				    location   	(1619, 1383)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	538
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	556
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$88" @513
-				location   	(1676, 1208)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6887BF0150"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$89" @514
-					Parent_View 	@513
-					location   	(412, -344)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6887C000A7"
-					client     	@513
-					supplier   	@512
-					line_style 	3
-					origin_attachment 	(1676, 1208)
-					terminal_attachment 	(1676, 1371))
-				    (object RoleView "attributeWildcard" @515
-					Parent_View 	@513
-					location   	(412, -344)
-					label      	(object SegLabel @516
-					    Parent_View 	@515
-					    location   	(1857, 1106)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+attributeWildcard"
-					    pctDist    	0.625767
-					    height     	181
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6887C000A8"
-					client     	@513
-					supplier   	@480
-					line_style 	3
-					origin_attachment 	(1676, 1208)
-					terminal_attachment 	(1676, 1045)
-					label      	(object SegLabel @517
-					    Parent_View 	@515
-					    location   	(1618, 1108)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.619632
-					    height     	59
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$84" @518
-				location   	(1429, 1438)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B68359F0086"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$85" @519
-					Parent_View 	@518
-					location   	(-363, -146)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6835A00069"
-					client     	@518
-					supplier   	@512
-					line_style 	3
-					origin_attachment 	(1429, 1438)
-					terminal_attachment 	(1610, 1438))
-				    (object RoleView "attributeUses" @520
-					Parent_View 	@518
-					location   	(-363, -146)
-					label      	(object SegLabel @521
-					    Parent_View 	@520
-					    location   	(1405, 1506)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	264
-					    justify    	0
-					    label      	"+attributeUses"
-					    pctDist    	0.132597
-					    height     	68
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6835A0006A"
-					client     	@518
-					supplier   	@481
-					line_style 	3
-					origin_attachment 	(1429, 1438)
-					terminal_attachment 	(1248, 1438)
-					label      	(object SegLabel @522
-					    Parent_View 	@520
-					    location   	(1327, 1391)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.563536
-					    height     	48
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @523
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(416, 1424)
-				label      	(object ItemLabel
-				    Parent_View 	@523
-				    location   	(183, 1383)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	466
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	484
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$92" @524
-				location   	(777, 1425)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B683585010D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$93" @525
-					Parent_View 	@524
-					location   	(-519, -367)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B68358600FA"
-					client     	@524
-					supplier   	@481
-					line_style 	3
-					origin_attachment 	(777, 1425)
-					terminal_attachment 	(896, 1425))
-				    (object RoleView "attributeDeclaration" @526
-					Parent_View 	@524
-					location   	(-519, -367)
-					label      	(object SegLabel @527
-					    Parent_View 	@526
-					    location   	(784, 1508)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+attributeDeclaration"
-					    pctDist    	-0.059259
-					    height     	83
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B68358600FB"
-					client     	@524
-					supplier   	@523
-					line_style 	3
-					origin_attachment 	(777, 1425)
-					terminal_attachment 	(658, 1425)
-					label      	(object SegLabel @528
-					    Parent_View 	@526
-					    location   	(721, 1385)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.472441
-					    height     	41
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$76" @529
-				location   	(237, 1208)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B68356B02CB"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$77" @530
-					Parent_View 	@529
-					location   	(-1043, 72)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B68356D00A6"
-					client     	@529
-					supplier   	@523
-					line_style 	3
-					origin_attachment 	(237, 1208)
-					terminal_attachment 	(237, 1371))
-				    (object RoleView "typeDefinition" @531
-					Parent_View 	@529
-					location   	(-1043, 72)
-					label      	(object SegLabel @532
-					    Parent_View 	@531
-					    location   	(388, 1247)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+typeDefinition"
-					    pctDist    	-0.239264
-					    height     	151
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B68356D00A7"
-					client     	@529
-					supplier   	@482
-					line_style 	3
-					origin_attachment 	(237, 1208)
-					terminal_attachment 	(237, 1045)
-					label      	(object SegLabel @533
-					    Parent_View 	@531
-					    location   	(195, 1247)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.239264
-					    height     	43
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @534
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(384, 784)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@534
-				    location   	(198, 743)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	372
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	390
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$98" @535
-				location   	(728, 775)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6833350340"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$99" @536
-					Parent_View 	@535
-					location   	(-856, -57)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B683336028D"
-					client     	@535
-					supplier   	@488
-					vertices   	(list Points
-					    (728, 775)
-					    (788, 775)
-					    (788, 939))
-					line_style 	3
-					origin_attachment 	(728, 775)
-					terminal_attachment 	(788, 939))
-				    (object RoleView "baseTypeDefinition" @537
-					Parent_View 	@535
-					location   	(-856, -57)
-					label      	(object SegLabel @538
-					    Parent_View 	@537
-					    location   	(558, 883)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+baseTypeDefinition"
-					    pctDist    	1.140940
-					    height     	108
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B683336028E"
-					client     	@535
-					supplier   	@534
-					line_style 	3
-					origin_attachment 	(728, 775)
-					terminal_attachment 	(579, 775)
-					label      	(object SegLabel @539
-					    Parent_View 	@537
-					    location   	(750, 812)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.152439
-					    height     	37
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDIdentityConstraintDefinition" @540
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1312, 448)
-				label      	(object ItemLabel
-				    Parent_View 	@540
-				    location   	(1017, 407)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	590
-				    justify    	0
-				    label      	"XSDIdentityConstraintDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B2603A2"
-				width      	608
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$140" @541
-				location   	(1629, 574)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69D29E014D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "referencedKey" @542
-					Parent_View 	@541
-					location   	(-83, 94)
-					label      	(object SegLabel @543
-					    Parent_View 	@542
-					    location   	(1761, 608)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	288
-					    justify    	0
-					    label      	"+referencedKey"
-					    pctDist    	-1.797297
-					    height     	34
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69D2A80165"
-					client     	@541
-					supplier   	@540
-					vertices   	(list Points
-					    (1629, 574)
-					    (1555, 574)
-					    (1555, 501))
-					line_style 	3
-					origin_attachment 	(1629, 574)
-					terminal_attachment 	(1555, 501)
-					label      	(object SegLabel @544
-					    Parent_View 	@542
-					    location   	(1622, 539)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.047619
-					    height     	36
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$141" @545
-					Parent_View 	@541
-					location   	(-83, 94)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69D2A8016F"
-					client     	@541
-					supplier   	@540
-					vertices   	(list Points
-					    (1629, 574)
-					    (1689, 574)
-					    (1689, 444)
-					    (1616, 444))
-					line_style 	3
-					origin_attachment 	(1629, 574)
-					terminal_attachment 	(1616, 444))))
-			    (object AssociationViewNew "$UNNAMED$144" @546
-				location   	(1197, 608)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D8D330025"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$145" @547
-					Parent_View 	@546
-					location   	(-115, 32)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D330365"
-					client     	@546
-					supplier   	@540
-					line_style 	3
-					origin_attachment 	(1197, 608)
-					terminal_attachment 	(1197, 501))
-				    (object RoleView "fields" @548
-					Parent_View 	@546
-					location   	(-115, 32)
-					label      	(object SegLabel @549
-					    Parent_View 	@548
-					    location   	(1119, 655)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	120
-					    justify    	0
-					    label      	"+fields"
-					    pctDist    	0.439252
-					    height     	78
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D330379"
-					client     	@546
-					supplier   	@504
-					line_style 	3
-					origin_attachment 	(1197, 608)
-					terminal_attachment 	(1197, 715)
-					label      	(object SegLabel @550
-					    Parent_View 	@548
-					    location   	(1253, 654)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"1..*"
-					    pctDist    	0.429907
-					    height     	56
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$142" @551
-				location   	(1415, 608)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D8D3D003E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$143" @552
-					Parent_View 	@551
-					location   	(103, 32)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D3E022A"
-					client     	@551
-					supplier   	@540
-					line_style 	3
-					origin_attachment 	(1415, 608)
-					terminal_attachment 	(1415, 501))
-				    (object RoleView "selector" @553
-					Parent_View 	@551
-					location   	(103, 32)
-					label      	(object SegLabel @554
-					    Parent_View 	@553
-					    location   	(1513, 651)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+selector"
-					    pctDist    	0.411215
-					    height     	98
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D3E0234"
-					client     	@551
-					supplier   	@504
-					line_style 	3
-					origin_attachment 	(1415, 608)
-					terminal_attachment 	(1415, 715)
-					label      	(object SegLabel @555
-					    Parent_View 	@553
-					    location   	(1381, 650)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.392523
-					    height     	34
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @556
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				location   	(1312, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@556
-				    location   	(1022, 68)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	581
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	599
-				height     	209
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$186" @557
-				location   	(2395, 606)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B66EEA7023E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$187" @558
-					Parent_View 	@557
-					location   	(-853, 174)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EEA8038A"
-					client     	@557
-					supplier   	@556
-					vertices   	(list Points
-					    (2395, 606)
-					    (2395, 65)
-					    (1611, 65))
-					line_style 	3
-					origin_attachment 	(2395, 606)
-					terminal_attachment 	(1611, 65))
-				    (object RoleView "notationDeclarations" @559
-					Parent_View 	@557
-					location   	(-853, 174)
-					label      	(object SegLabel @560
-					    Parent_View 	@559
-					    location   	(2089, 104)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+notationDeclarations"
-					    pctDist    	-0.489776
-					    height     	307
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EEA8038B"
-					client     	@557
-					supplier   	@505
-					vertices   	(list Points
-					    (2395, 606)
-					    (2395, 1633)
-					    (2098, 1633))
-					line_style 	3
-					origin_attachment 	(2395, 606)
-					terminal_attachment 	(2098, 1633)
-					label      	(object SegLabel @561
-					    Parent_View 	@559
-					    location   	(2344, 105)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	-0.487829
-					    height     	52
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$182" @562
-				location   	(1772, 249)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B66EEFF024F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$183" @563
-					Parent_View 	@562
-					location   	(-948, -327)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EF00025A"
-					client     	@562
-					supplier   	@556
-					line_style 	3
-					origin_attachment 	(1772, 249)
-					terminal_attachment 	(1611, 249))
-				    (object RoleView "modelGroupDefinitions" @564
-					Parent_View 	@562
-					location   	(-948, -327)
-					label      	(object SegLabel @565
-					    Parent_View 	@564
-					    location   	(2076, 335)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	432
-					    justify    	0
-					    label      	"+modelGroupDefinitions"
-					    pctDist    	0.713592
-					    height     	244
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EF000264"
-					client     	@562
-					supplier   	@506
-					vertices   	(list Points
-					    (1772, 249)
-					    (1832, 249)
-					    (1832, 395))
-					line_style 	3
-					origin_attachment 	(1772, 249)
-					terminal_attachment 	(1832, 395)
-					label      	(object SegLabel @566
-					    Parent_View 	@564
-					    location   	(1781, 340)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.737864
-					    height     	52
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$178" @567
-				location   	(2346, 518)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B66EE920216"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$179" @568
-					Parent_View 	@567
-					location   	(154, 86)
-					label      	(object SegLabel @569
-					    Parent_View 	@568
-					    location   	(1872, 1857)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	-3.630072
-					    height     	475
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EE93018B"
-					client     	@567
-					supplier   	@556
-					vertices   	(list Points
-					    (2346, 518)
-					    (2346, 149)
-					    (1611, 149))
-					line_style 	3
-					origin_attachment 	(2346, 518)
-					terminal_attachment 	(1611, 149))
-				    (object RoleView "attributeGroupDefinitions" @570
-					Parent_View 	@567
-					location   	(154, 86)
-					label      	(object SegLabel @571
-					    Parent_View 	@570
-					    location   	(2008, 195)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	468
-					    justify    	0
-					    label      	"+attributeGroupDefinitions"
-					    pctDist    	-0.349946
-					    height     	339
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EE93018C"
-					client     	@567
-					supplier   	@512
-					vertices   	(list Points
-					    (2346, 518)
-					    (2346, 1441)
-					    (2166, 1441))
-					line_style 	3
-					origin_attachment 	(2346, 518)
-					terminal_attachment 	(2166, 1441)
-					label      	(object SegLabel @572
-					    Parent_View 	@570
-					    location   	(2299, 197)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	-0.348862
-					    height     	48
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$180" @573
-				location   	(203, 159)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B66EE760049"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$181" @574
-					Parent_View 	@573
-					location   	(-485, -273)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EE760374"
-					client     	@573
-					supplier   	@556
-					line_style 	3
-					origin_attachment 	(203, 159)
-					terminal_attachment 	(1013, 159))
-				    (object RoleView "typeDefinitions" @575
-					Parent_View 	@573
-					location   	(-485, -273)
-					label      	(object SegLabel @576
-					    Parent_View 	@575
-					    location   	(349, 196)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	288
-					    justify    	0
-					    label      	"+typeDefinitions"
-					    pctDist    	-1.475728
-					    height     	37
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EE76037E"
-					client     	@573
-					supplier   	@534
-					vertices   	(list Points
-					    (203, 159)
-					    (104, 159)
-					    (104, 784)
-					    (189, 784))
-					line_style 	3
-					origin_attachment 	(203, 159)
-					terminal_attachment 	(189, 784)
-					label      	(object SegLabel @577
-					    Parent_View 	@575
-					    location   	(155, 200)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.059701
-					    height     	41
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$184" @578
-				location   	(1087, 329)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BFC2A1701ED"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$185" @579
-					Parent_View 	@578
-					location   	(-577, -23)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFC2A1A0273"
-					client     	@578
-					supplier   	@556
-					line_style 	3
-					origin_attachment 	(1087, 329)
-					terminal_attachment 	(1087, 264))
-				    (object RoleView "identityConstraintDefinitions" @580
-					Parent_View 	@578
-					location   	(-577, -23)
-					label      	(object SegLabel @581
-					    Parent_View 	@580
-					    location   	(1375, 338)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	528
-					    justify    	0
-					    label      	"+identityConstraintDefinitions"
-					    pctDist    	0.130952
-					    height     	288
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFC2A1A027D"
-					client     	@578
-					supplier   	@540
-					line_style 	3
-					origin_attachment 	(1087, 329)
-					terminal_attachment 	(1087, 395)
-					label      	(object SegLabel @582
-					    Parent_View 	@580
-					    location   	(1018, 336)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.107143
-					    height     	70
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$176" @583
-				location   	(48, 320)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B66FDFA00C3"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$177" @584
-					Parent_View 	@583
-					location   	(-1072, -288)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66FDFB027D"
-					client     	@583
-					supplier   	@556
-					vertices   	(list Points
-					    (49, 322)
-					    (49, 68)
-					    (1013, 68))
-					line_style 	3
-					origin_attachment 	(49, 322)
-					terminal_attachment 	(1013, 68))
-				    (object RoleView "attributeDeclarations" @585
-					Parent_View 	@583
-					location   	(-1072, -288)
-					label      	(object SegLabel @586
-					    Parent_View 	@585
-					    location   	(338, 106)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+attributeDeclarations"
-					    pctDist    	-0.198536
-					    height     	289
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66FDFB027E"
-					client     	@583
-					supplier   	@523
-					vertices   	(list Points
-					    (49, 322)
-					    (49, 1415)
-					    (174, 1415))
-					line_style 	3
-					origin_attachment 	(49, 322)
-					terminal_attachment 	(174, 1415)
-					label      	(object SegLabel @587
-					    Parent_View 	@585
-					    location   	(91, 108)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	-0.196706
-					    height     	42
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @588
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(416, 448)
-				label      	(object ItemLabel
-				    Parent_View 	@588
-				    location   	(175, 412)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	483
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				width      	501
-				height     	97
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$126" @589
-				location   	(499, 589)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69C0590198"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$127" @590
-					Parent_View 	@589
-					location   	(-13, 109)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69C05D01E3"
-					client     	@589
-					supplier   	@588
-					vertices   	(list Points
-					    (499, 589)
-					    (452, 589)
-					    (452, 496))
-					line_style 	3
-					origin_attachment 	(499, 589)
-					terminal_attachment 	(452, 496))
-				    (object RoleView "substitutionGroupAffiliation" @591
-					Parent_View 	@589
-					location   	(-13, 109)
-					label      	(object SegLabel @592
-					    Parent_View 	@591
-					    location   	(811, 585)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	504
-					    justify    	0
-					    label      	"+substitutionGroupAffiliation"
-					    pctDist    	6.520833
-					    height     	5
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69C05D01ED"
-					client     	@589
-					supplier   	@588
-					vertices   	(list Points
-					    (499, 589)
-					    (547, 589)
-					    (547, 496))
-					line_style 	3
-					origin_attachment 	(499, 589)
-					terminal_attachment 	(547, 496)
-					label      	(object SegLabel @593
-					    Parent_View 	@591
-					    location   	(499, 559)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.000000
-					    height     	31
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$120" @594
-				location   	(241, 613)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B68338C0058"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$121" @595
-					Parent_View 	@594
-					location   	(-1343, -219)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B68338C03BF"
-					client     	@594
-					supplier   	@588
-					line_style 	3
-					origin_attachment 	(241, 613)
-					terminal_attachment 	(241, 496))
-				    (object RoleView "typeDefinition" @596
-					Parent_View 	@594
-					location   	(-1343, -219)
-					label      	(object SegLabel @597
-					    Parent_View 	@596
-					    location   	(408, 694)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+typeDefinition"
-					    pctDist    	0.686441
-					    height     	167
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B68338C03C0"
-					client     	@594
-					supplier   	@534
-					line_style 	3
-					origin_attachment 	(241, 613)
-					terminal_attachment 	(241, 731)
-					label      	(object SegLabel @598
-					    Parent_View 	@596
-					    location   	(202, 685)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.610169
-					    height     	39
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$122" @599
-				location   	(837, 460)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6833EF0160"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$123" @600
-					Parent_View 	@599
-					location   	(-1819, -68)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6833F00298"
-					client     	@599
-					supplier   	@588
-					line_style 	3
-					origin_attachment 	(837, 460)
-					terminal_attachment 	(666, 460))
-				    (object RoleView "identityConstraintDefinitions" @601
-					Parent_View 	@599
-					location   	(-1819, -68)
-					label      	(object SegLabel @602
-					    Parent_View 	@601
-					    location   	(880, 528)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	528
-					    justify    	0
-					    label      	"+identityConstraintDefinitions"
-					    pctDist    	0.251462
-					    height     	68
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6833F00299"
-					client     	@599
-					supplier   	@540
-					line_style 	3
-					origin_attachment 	(837, 460)
-					terminal_attachment 	(1008, 460)
-					label      	(object SegLabel @603
-					    Parent_View 	@601
-					    location   	(859, 407)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.130435
-					    height     	54
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$174" @604
-				location   	(541, 246)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B66EE8D01BF"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$175" @605
-					Parent_View 	@604
-					location   	(-1123, -186)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EE8E0198"
-					client     	@604
-					supplier   	@556
-					line_style 	3
-					origin_attachment 	(541, 246)
-					terminal_attachment 	(1013, 246))
-				    (object RoleView "elementDeclarations" @606
-					Parent_View 	@604
-					location   	(-1123, -186)
-					label      	(object SegLabel @607
-					    Parent_View 	@606
-					    location   	(443, 335)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+elementDeclarations"
-					    pctDist    	0.209302
-					    height     	89
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EE8E0199"
-					client     	@604
-					supplier   	@588
-					vertices   	(list Points
-					    (541, 246)
-					    (224, 246)
-					    (224, 400))
-					line_style 	3
-					origin_attachment 	(541, 246)
-					terminal_attachment 	(224, 400)
-					label      	(object SegLabel @608
-					    Parent_View 	@606
-					    location   	(186, 335)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.864693
-					    height     	39
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$128" @609
-				location   	(353, 621)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C42DBDD0297"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$129" @610
-					Parent_View 	@609
-					location   	(-63, 173)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C42DBE0011E"
-					client     	@609
-					supplier   	@588
-					vertices   	(list Points
-					    (353, 621)
-					    (306, 621)
-					    (306, 496))
-					line_style 	3
-					origin_attachment 	(353, 621)
-					terminal_attachment 	(306, 496))
-				    (object RoleView "substitutionGroup" @611
-					Parent_View 	@609
-					location   	(-63, 173)
-					label      	(object SegLabel @612
-					    Parent_View 	@611
-					    location   	(579, 636)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+substitutionGroup"
-					    pctDist    	4.808511
-					    height     	15
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C42DBE00128"
-					client     	@609
-					supplier   	@588
-					vertices   	(list Points
-					    (353, 621)
-					    (400, 621)
-					    (400, 496))
-					line_style 	3
-					origin_attachment 	(353, 621)
-					terminal_attachment 	(400, 496)
-					label      	(object SegLabel @613
-					    Parent_View 	@611
-					    location   	(350, 583)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	-0.069767
-					    height     	39
-					    orientation 	0))))))
-		    (object ClassDiagram "3. Component Attributes  (Part 1 : Structures)"
-			quid       	"3B69E78602C5"
-			title      	"3. Component Attributes  (Part 1 : Structures)"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDNamedComponent" @614
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 128)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@614
-				    location   	(46, 47)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	516
-				    justify    	0
-				    label      	"XSDNamedComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846D303A4"
-				compartment 	(object Compartment
-				    Parent_View 	@614
-				    location   	(46, 107)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	524
-				    compartmentItems 	(list Compartment
-					"+ name : String"
-					"+ targetNamespace : String"))
-				width      	534
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @615
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(288, 1648)
-				label      	(object ItemLabel
-				    Parent_View 	@615
-				    location   	(41, 1567)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	494
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	512
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @616
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2368, 1680)
-				label      	(object ItemLabel
-				    Parent_View 	@616
-				    location   	(1781, 1524)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1174
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				compartment 	(object Compartment
-				    Parent_View 	@616
-				    location   	(1781, 1584)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	5
-				    max_width  	1177
-				    compartmentItems 	(list Compartment
-					"+ derivationMethod : XSDDerivationMethod = restriction"
-					"<<0..*>> + final : XSDComplexFinal"
-					"+ abstract : boolean"
-					"+ contentTypeCategory : XSDContentTypeCategory"
-					"<<0..*>> + prohibitedSubstitutions : XSDProhibitedSubstitutions"))
-				width      	1192
-				height     	336
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @617
-				location   	(463, 362)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@614
-				vertices   	(list Points
-				    (463, 362)
-				    (463, 221)))
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @618
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1408, 1600)
-				label      	(object ItemLabel
-				    Parent_View 	@618
-				    location   	(1094, 1519)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	628
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				compartment 	(object Compartment
-				    Parent_View 	@618
-				    location   	(1094, 1579)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	628
-				    compartmentItems 	(list Compartment
-					"+ variety : XSDVariety"
-					"<<0..*>> + final : XSDSimpleFinal"))
-				width      	646
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUse" @619
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(912, 144)
-				label      	(object ItemLabel
-				    Parent_View 	@619
-				    location   	(647, 38)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	530
-				    justify    	0
-				    label      	"XSDAttributeUse")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B68354601A8"
-				compartment 	(object Compartment
-				    Parent_View 	@619
-				    location   	(647, 98)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	538
-				    compartmentItems 	(list Compartment
-					"+ required : boolean"
-					"+ value : Value"
-					"+ constraint : XSDConstraint"))
-				width      	548
-				height     	236
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @620
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(688, 1936)
-				label      	(object ItemLabel
-				    Parent_View 	@620
-				    location   	(45, 1830)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1286
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				compartment 	(object Compartment
-				    Parent_View 	@620
-				    location   	(45, 1890)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	1294
-				    compartmentItems 	(list Compartment
-					"+ namespaceConstraintCategory : XSDNamespaceConstraintCategory"
-					"<<0..*>> + namespaceConstraint : String"
-					"+ processContents : XSDProcessContents"))
-				width      	1304
-				height     	236
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroup" @621
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(336, 1440)
-				label      	(object ItemLabel
-				    Parent_View 	@621
-				    location   	(47, 1384)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	578
-				    justify    	0
-				    label      	"XSDModelGroup")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6834E00291"
-				width      	596
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDFeature" @622
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 512)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@622
-				    location   	(36, 431)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	536
-				    justify    	0
-				    label      	"XSDFeature")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B537026C"
-				compartment 	(object Compartment
-				    Parent_View 	@622
-				    location   	(36, 491)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	548
-				    compartmentItems 	(list Compartment
-					"+ value : Value"
-					"+ constraint : XSDConstraint"))
-				width      	554
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @623
-				location   	(294, 697)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@622
-				vertices   	(list Points
-				    (294, 697)
-				    (294, 605)))
-			    (object ClassView "Class" "Logical View::xsd::XSDXPathDefinition" @624
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2256, 128)
-				label      	(object ItemLabel
-				    Parent_View 	@624
-				    location   	(1995, 47)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	522
-				    justify    	0
-				    label      	"XSDXPathDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6D83BB0355"
-				width      	540
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefinableComponent" @625
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2688, 512)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@625
-				    location   	(2418, 460)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	540
-				    justify    	0
-				    label      	"XSDRedefinableComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B7FCA8B020B"
-				width      	558
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @626
-				location   	(2684, 962)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@625
-				vertices   	(list Points
-				    (2684, 962)
-				    (2684, 576)))
-			    (object ClassView "Class" "Logical View::xsd::XSDCompositor" @627
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 1200)
-				label      	(object ItemLabel
-				    Parent_View 	@627
-				    location   	(45, 1116)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"XSDCompositor")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@627
-				    location   	(45, 1066)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B869B620037"
-				width      	344
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDConstraint" @628
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(800, 528)
-				label      	(object ItemLabel
-				    Parent_View 	@628
-				    location   	(638, 469)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDConstraint")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@628
-				    location   	(638, 419)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B869E2601AE"
-				width      	342
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDDerivationMethod" @629
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2192, 2272)
-				label      	(object ItemLabel
-				    Parent_View 	@629
-				    location   	(1980, 2213)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	424
-				    justify    	0
-				    label      	"XSDDerivationMethod")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@629
-				    location   	(1980, 2163)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	424
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B86A0B000CE"
-				width      	442
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDIdentityConstraintCategory" @630
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1584, 176)
-				label      	(object ItemLabel
-				    Parent_View 	@630
-				    location   	(1281, 88)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	607
-				    justify    	0
-				    label      	"XSDIdentityConstraintCategory")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@630
-				    location   	(1281, 38)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	607
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B86A1E00272"
-				width      	625
-				height     	300
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDContentTypeCategory" @631
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2704, 2224)
-				label      	(object ItemLabel
-				    Parent_View 	@631
-				    location   	(2456, 2115)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	496
-				    justify    	0
-				    label      	"XSDContentTypeCategory")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@631
-				    location   	(2456, 2065)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	496
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B86A79F03A2"
-				width      	514
-				height     	342
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDVariety" @632
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(880, 1600)
-				label      	(object ItemLabel
-				    Parent_View 	@632
-				    location   	(708, 1516)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	344
-				    justify    	0
-				    label      	"XSDVariety")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@632
-				    location   	(708, 1466)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	344
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B8FF7730249"
-				width      	362
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDProcessContents" @633
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(976, 2240)
-				label      	(object ItemLabel
-				    Parent_View 	@633
-				    location   	(766, 2156)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	420
-				    justify    	0
-				    label      	"XSDProcessContents")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@633
-				    location   	(766, 2106)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	420
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B8FF8C70284"
-				width      	438
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDXPathVariety" @634
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2768, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@634
-				    location   	(2587, 97)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	363
-				    justify    	0
-				    label      	"XSDXPathVariety")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@634
-				    location   	(2587, 47)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	363
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B8FFB89033A"
-				width      	381
-				height     	250
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleFinal" @635
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1552, 1872)
-				label      	(object ItemLabel
-				    Parent_View 	@635
-				    location   	(1389, 1788)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"XSDSimpleFinal")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@635
-				    location   	(1389, 1738)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C25D0295"
-				compartment 	(object Compartment
-				    Parent_View 	@635
-				    location   	(1389, 1848)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	241
-				    compartmentItems 	(list Compartment
-					"+ list"
-					"+ restriction"
-					"+ union"))
-				width      	344
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexFinal" @636
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1968, 2000)
-				label      	(object ItemLabel
-				    Parent_View 	@636
-				    location   	(1786, 1941)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	364
-				    justify    	0
-				    label      	"XSDComplexFinal")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@636
-				    location   	(1786, 1891)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	364
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C2CA01CB"
-				compartment 	(object Compartment
-				    Parent_View 	@636
-				    location   	(1786, 2001)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	238
-				    compartmentItems 	(list Compartment
-					"+ extension"
-					"+ restriction"))
-				width      	382
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSubstitutionGroupExclusions" @637
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(800, 1184)
-				label      	(object ItemLabel
-				    Parent_View 	@637
-				    location   	(485, 1125)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	630
-				    justify    	0
-				    label      	"XSDSubstitutionGroupExclusions")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@637
-				    location   	(485, 1075)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	630
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C59100AE"
-				width      	648
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDDisallowedSubstitutions" @638
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1440, 1200)
-				label      	(object ItemLabel
-				    Parent_View 	@638
-				    location   	(1171, 1116)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	538
-				    justify    	0
-				    label      	"XSDDisallowedSubstitutions")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@638
-				    location   	(1171, 1066)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	538
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C5A403DF"
-				compartment 	(object Compartment
-				    Parent_View 	@638
-				    location   	(1171, 1176)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	264
-				    compartmentItems 	(list Compartment
-					"+ substitution"
-					"+ extension"
-					"+ restriction"))
-				width      	556
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDProhibitedSubstitutions" @639
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1664, 2272)
-				label      	(object ItemLabel
-				    Parent_View 	@639
-				    location   	(1398, 2213)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	532
-				    justify    	0
-				    label      	"XSDProhibitedSubstitutions")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@639
-				    location   	(1398, 2163)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	532
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C5BE0272"
-				compartment 	(object Compartment
-				    Parent_View 	@639
-				    location   	(1398, 2273)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	238
-				    compartmentItems 	(list Compartment
-					"+ extension"
-					"+ restriction"))
-				width      	550
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDNamespaceConstraintCategory" @640
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(384, 2240)
-				label      	(object ItemLabel
-				    Parent_View 	@640
-				    location   	(45, 2154)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	678
-				    justify    	0
-				    label      	"XSDNamespaceConstraintCategory")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@640
-				    location   	(45, 2104)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	678
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C5EA0023"
-				width      	696
-				height     	296
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @641
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1264, 880)
-				label      	(object ItemLabel
-				    Parent_View 	@641
-				    location   	(571, 749)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1386
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				compartment 	(object Compartment
-				    Parent_View 	@641
-				    location   	(571, 809)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	1396
-				    compartmentItems 	(list Compartment
-					"+ nillable : boolean"
-					"<<0..*>> + disallowedSubstitutions : XSDDisallowedSubstitutions"
-					"<<0..*>> + substitutionGroupExclusions : XSDSubstitutionGroupExclusions"
-					"+ abstract : boolean"))
-				width      	1404
-				height     	286
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @642
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69EDEE01BF"
-				client     	@641
-				supplier   	@622
-				line_style 	3
-				origin_attachment 	(681, 737)
-				terminal_attachment 	(681, 697)
-				drawSupplier 	@623)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @643
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(272, 864)
-				label      	(object ItemLabel
-				    Parent_View 	@643
-				    location   	(35, 812)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	474
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	492
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @644
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2688, 1152)
-				label      	(object ItemLabel
-				    Parent_View 	@644
-				    location   	(2420, 1100)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	536
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	554
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @645
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAC800D2"
-				client     	@644
-				supplier   	@625
-				line_style 	3
-				origin_attachment 	(2862, 1088)
-				terminal_attachment 	(2862, 962)
-				drawSupplier 	@626)
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @646
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2352, 1312)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@646
-				    location   	(2168, 1261)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	368
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	386
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @647
-				location   	(2375, 1465)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@646
-				vertices   	(list Points
-				    (2375, 1465)
-				    (2375, 1375)))
-			    (object InheritView "" @648
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAB1004D"
-				client     	@646
-				supplier   	@625
-				line_style 	3
-				origin_attachment 	(2368, 1249)
-				terminal_attachment 	(2368, 962)
-				drawSupplier 	@626)
-			    (object InheritView "" @649
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0D01901F1"
-				client     	@616
-				supplier   	@646
-				line_style 	3
-				origin_attachment 	(2818, 1512)
-				terminal_attachment 	(2818, 1465)
-				drawSupplier 	@647)
-			    (object InheritView "" @650
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A1302A2"
-				client     	@618
-				supplier   	@646
-				line_style 	3
-				origin_attachment 	(1406, 1507)
-				terminal_attachment 	(1406, 1465)
-				drawSupplier 	@647)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @651
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2064, 1152)
-				label      	(object ItemLabel
-				    Parent_View 	@651
-				    location   	(1818, 1101)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	492
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				width      	510
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @652
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAC40090"
-				client     	@651
-				supplier   	@625
-				line_style 	3
-				origin_attachment 	(2115, 1089)
-				terminal_attachment 	(2115, 962)
-				drawSupplier 	@626)
-			    (object ClassView "Class" "Logical View::xsd::XSDIdentityConstraintDefinition" @653
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1600, 528)
-				label      	(object ItemLabel
-				    Parent_View 	@653
-				    location   	(1034, 468)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1132
-				    justify    	0
-				    label      	"XSDIdentityConstraintDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B2603A2"
-				width      	1150
-				height     	144
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @654
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684AA30242"
-				client     	@653
-				supplier   	@614
-				line_style 	3
-				origin_attachment 	(1568, 456)
-				terminal_attachment 	(1568, 362)
-				drawSupplier 	@617)
-			    (object ClassView "Class" "Logical View::xsd::XSDNotationDeclaration" @655
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2320, 784)
-				label      	(object ItemLabel
-				    Parent_View 	@655
-				    location   	(2078, 703)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	484
-				    justify    	0
-				    label      	"XSDNotationDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDAA021C"
-				width      	502
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @656
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(176, 320)
-				label      	(object ItemLabel
-				    Parent_View 	@656
-				    location   	(43, 268)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	266
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	284
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @657
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B68494302F1"
-				client     	@655
-				supplier   	@614
-				line_style 	3
-				origin_attachment 	(2290, 691)
-				terminal_attachment 	(2290, 362)
-				drawSupplier 	@617)
-			    (object InheritView "" @658
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69B7DC0193"
-				client     	@643
-				supplier   	@622
-				line_style 	3
-				origin_attachment 	(141, 800)
-				terminal_attachment 	(141, 697)
-				drawSupplier 	@623)
-			    (object InheritView "" @659
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A2C0307"
-				client     	@622
-				supplier   	@614
-				line_style 	3
-				origin_attachment 	(372, 419)
-				terminal_attachment 	(372, 362)
-				drawSupplier 	@617)
-			    (object InheritView "" @660
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A26036D"
-				client     	@625
-				supplier   	@614
-				line_style 	3
-				origin_attachment 	(2687, 448)
-				terminal_attachment 	(2687, 362)
-				drawSupplier 	@617)))
-		    (object ClassDiagram "4. Component Hierarchy, Relations and Attributes (Part 2: Datatypes)"
-			quid       	"3B6C3265005F"
-			title      	"4. Component Hierarchy, Relations and Attributes (Part 2: Datatypes)"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDFixedFacet" @661
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(192, 896)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@661
-				    location   	(32, 840)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	320
-				    justify    	0
-				    label      	"XSDFixedFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C699E00C1"
-				width      	338
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRepeatableFacet" @662
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(720, 896)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@662
-				    location   	(504, 845)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	432
-				    justify    	0
-				    label      	"XSDRepeatableFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C6AA6031A"
-				width      	450
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDEnumerationFacet" @663
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(496, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@663
-				    location   	(266, 1112)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	460
-				    justify    	0
-				    label      	"XSDEnumerationFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C6ACE0141"
-				width      	478
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDPatternFacet" @664
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1008, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@664
-				    location   	(777, 1112)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	462
-				    justify    	0
-				    label      	"XSDPatternFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C6ADB026C"
-				width      	480
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @665
-				location   	(718, 1049)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@662
-				vertices   	(list Points
-				    (718, 1049)
-				    (718, 959)))
-			    (object ClassView "Class" "Logical View::xsd::XSDOrderedFacet" @666
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2000, 928)
-				label      	(object ItemLabel
-				    Parent_View 	@666
-				    location   	(1799, 872)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	402
-				    justify    	0
-				    label      	"XSDOrderedFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C74DD0248"
-				width      	420
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDBoundedFacet" @667
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1568, 928)
-				label      	(object ItemLabel
-				    Parent_View 	@667
-				    location   	(1383, 872)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	370
-				    justify    	0
-				    label      	"XSDBoundedFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C751D0344"
-				width      	388
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDCardinalityFacet" @668
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2032, 1104)
-				label      	(object ItemLabel
-				    Parent_View 	@668
-				    location   	(1807, 1048)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	450
-				    justify    	0
-				    label      	"XSDCardinalityFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C755D03D2"
-				width      	468
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDNumericFacet" @669
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1504, 1104)
-				label      	(object ItemLabel
-				    Parent_View 	@669
-				    location   	(1319, 1049)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	370
-				    justify    	0
-				    label      	"XSDNumericFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C75950206"
-				width      	388
-				height     	134
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDLengthFacet" @670
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(656, 1376)
-				label      	(object ItemLabel
-				    Parent_View 	@670
-				    location   	(491, 1320)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	330
-				    justify    	0
-				    label      	"XSDLengthFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C776200E7"
-				width      	348
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinLengthFacet" @671
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(608, 1552)
-				label      	(object ItemLabel
-				    Parent_View 	@671
-				    location   	(405, 1497)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	406
-				    justify    	0
-				    label      	"XSDMinLengthFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C778C0065"
-				width      	424
-				height     	134
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @672
-				location   	(144, 1262)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@661
-				vertices   	(list Points
-				    (144, 1262)
-				    (144, 964)))
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxLengthFacet" @673
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1216, 1552)
-				label      	(object ItemLabel
-				    Parent_View 	@673
-				    location   	(1007, 1497)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	418
-				    justify    	0
-				    label      	"XSDMaxLengthFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C77C70146"
-				width      	436
-				height     	134
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDWhiteSpaceFacet" @674
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1120, 1376)
-				label      	(object ItemLabel
-				    Parent_View 	@674
-				    location   	(880, 1320)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	480
-				    justify    	0
-				    label      	"XSDWhiteSpaceFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C784601B7"
-				width      	498
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxInclusiveFacet" @675
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1312, 1728)
-				label      	(object ItemLabel
-				    Parent_View 	@675
-				    location   	(1090, 1676)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	444
-				    justify    	0
-				    label      	"XSDMaxInclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C787D00DA"
-				width      	462
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxExclusiveFacet" @676
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1424, 1904)
-				label      	(object ItemLabel
-				    Parent_View 	@676
-				    location   	(1193, 1852)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	462
-				    justify    	0
-				    label      	"XSDMaxExclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C789600C2"
-				width      	480
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinInclusiveFacet" @677
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(496, 1728)
-				label      	(object ItemLabel
-				    Parent_View 	@677
-				    location   	(282, 1676)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	428
-				    justify    	0
-				    label      	"XSDMinInclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C788702C9"
-				width      	446
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinExclusiveFacet" @678
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(352, 1904)
-				label      	(object ItemLabel
-				    Parent_View 	@678
-				    location   	(124, 1852)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	456
-				    justify    	0
-				    label      	"XSDMinExclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C792D000A"
-				width      	474
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDTotalDigitsFacet" @679
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 2112)
-				label      	(object ItemLabel
-				    Parent_View 	@679
-				    location   	(52, 2056)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	408
-				    justify    	0
-				    label      	"XSDTotalDigitsFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C79A0020E"
-				width      	426
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDFractionDigitsFacet" @680
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1552, 2112)
-				label      	(object ItemLabel
-				    Parent_View 	@680
-				    location   	(1318, 2056)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"XSDFractionDigitsFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C79BE02EE"
-				width      	486
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @681
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C9D03C7"
-				client     	@663
-				supplier   	@662
-				line_style 	3
-				origin_attachment 	(394, 1100)
-				terminal_attachment 	(394, 1049)
-				drawSupplier 	@665)
-			    (object InheritView "" @682
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C78620045"
-				client     	@674
-				supplier   	@661
-				line_style 	3
-				origin_attachment 	(1119, 1308)
-				terminal_attachment 	(1119, 1262)
-				drawSupplier 	@672)
-			    (object ClassView "Class" "Logical View::xsd::XSDComponent" @683
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(336, 160)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@683
-				    location   	(174, 117)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846E90029"
-				width      	342
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @684
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6CA5038D"
-				client     	@664
-				supplier   	@662
-				line_style 	3
-				origin_attachment 	(1044, 1100)
-				terminal_attachment 	(1044, 1049)
-				drawSupplier 	@665)
-			    (object InheritView "" @685
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C778002DF"
-				client     	@670
-				supplier   	@661
-				line_style 	3
-				origin_attachment 	(663, 1308)
-				terminal_attachment 	(663, 1262)
-				drawSupplier 	@672)
-			    (object ClassView "Class" "Logical View::xsd::XSDOrdered" @686
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2048, 1408)
-				label      	(object ItemLabel
-				    Parent_View 	@686
-				    location   	(1835, 1324)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	426
-				    justify    	0
-				    label      	"XSDOrdered")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@686
-				    location   	(1835, 1274)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	426
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3BC7715202E4"
-				width      	444
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDCardinality" @687
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2048, 1728)
-				label      	(object ItemLabel
-				    Parent_View 	@687
-				    location   	(1835, 1669)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	426
-				    justify    	0
-				    label      	"XSDCardinality")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@687
-				    location   	(1835, 1619)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	426
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3BC7715D009B"
-				width      	444
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDWhiteSpace" @688
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2064, 2032)
-				label      	(object ItemLabel
-				    Parent_View 	@688
-				    location   	(1861, 1951)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	406
-				    justify    	0
-				    label      	"XSDWhiteSpace")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@688
-				    location   	(1861, 1901)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	406
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3BEED0F60342"
-				width      	424
-				height     	287
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::Value" @689
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(880, 2096)
-				label      	(object ItemLabel
-				    Parent_View 	@689
-				    location   	(571, 2062)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	618
-				    justify    	0
-				    label      	"Value")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@689
-				    location   	(571, 2012)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	618
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	14671839
-				quidu      	"3C040B5B031F"
-				width      	636
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @690
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B610337"
-				client     	@679
-				supplier   	@661
-				line_style 	3
-				origin_attachment 	(75, 2044)
-				terminal_attachment 	(75, 1262)
-				drawSupplier 	@672)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinFacet" @691
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 1376)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@691
-				    location   	(113, 1320)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	286
-				    justify    	0
-				    label      	"XSDMinFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C0A1CDE037C"
-				compartment 	(object Compartment
-				    Parent_View 	@691
-				    location   	(113, 1380)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	290
-				    compartmentItems 	(list Compartment
-					"+ value : Value"))
-				width      	304
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxFacet" @692
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1584, 1376)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@692
-				    location   	(1440, 1320)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	288
-				    justify    	0
-				    label      	"XSDMaxFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C0A1CEB010E"
-				compartment 	(object Compartment
-				    Parent_View 	@692
-				    location   	(1440, 1380)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	294
-				    compartmentItems 	(list Compartment
-					"+ value : Value"))
-				width      	306
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @693
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C0A1D240098"
-				client     	@691
-				supplier   	@661
-				line_style 	3
-				origin_attachment 	(235, 1308)
-				terminal_attachment 	(235, 1262)
-				drawSupplier 	@672)
-			    (object InheritView "" @694
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C0A1D3103AD"
-				client     	@692
-				supplier   	@661
-				line_style 	3
-				origin_attachment 	(1581, 1308)
-				terminal_attachment 	(1581, 1262)
-				drawSupplier 	@672)
-			    (object InheritView "" @695
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B520353"
-				client     	@677
-				supplier   	@691
-				line_style 	3
-				origin_attachment 	(285, 1664)
-				terminal_attachment 	(285, 1444))
-			    (object InheritView "" @696
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B8303B8"
-				client     	@675
-				supplier   	@692
-				line_style 	3
-				origin_attachment 	(1500, 1664)
-				terminal_attachment 	(1500, 1444))
-			    (object InheritView "" @697
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B8E0309"
-				client     	@676
-				supplier   	@692
-				line_style 	3
-				origin_attachment 	(1622, 1840)
-				terminal_attachment 	(1622, 1444))
-			    (object InheritView "" @698
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C77C400C0"
-				client     	@671
-				supplier   	@661
-				line_style 	3
-				origin_attachment 	(447, 1485)
-				terminal_attachment 	(447, 1262)
-				drawSupplier 	@672)
-			    (object InheritView "" @699
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B7D00FC"
-				client     	@673
-				supplier   	@661
-				line_style 	3
-				origin_attachment 	(1397, 1485)
-				terminal_attachment 	(1397, 1262)
-				drawSupplier 	@672)
-			    (object InheritView "" @700
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B990016"
-				client     	@680
-				supplier   	@661
-				line_style 	3
-				origin_attachment 	(1775, 2044)
-				terminal_attachment 	(1775, 1262)
-				drawSupplier 	@672)
-			    (object ClassView "Class" "Logical View::xsd::XSDFacet" @701
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(368, 368)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@701
-				    location   	(174, 318)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	388
-				    justify    	0
-				    label      	"XSDFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C359403D2"
-				width      	406
-				height     	125
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @702
-				location   	(366, 522)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@701
-				vertices   	(list Points
-				    (366, 522)
-				    (366, 430)))
-			    (object ClassView "Class" "Logical View::xsd::XSDConstrainingFacet" @703
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 624)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@703
-				    location   	(34, 573)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	444
-				    justify    	0
-				    label      	"XSDConstrainingFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C6B340093"
-				width      	462
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @704
-				location   	(272, 781)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@703
-				vertices   	(list Points
-				    (272, 781)
-				    (272, 687)))
-			    (object InheritView "" @705
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C8F002E"
-				client     	@662
-				supplier   	@703
-				line_style 	3
-				origin_attachment 	(594, 833)
-				terminal_attachment 	(594, 781)
-				drawSupplier 	@704)
-			    (object ClassView "Class" "Logical View::xsd::XSDFundamentalFacet" @706
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(752, 624)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@706
-				    location   	(526, 573)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	452
-				    justify    	0
-				    label      	"XSDFundamentalFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C69E801D6"
-				width      	470
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @707
-				location   	(768, 789)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@706
-				vertices   	(list Points
-				    (768, 789)
-				    (768, 687)))
-			    (object InheritView "" @708
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7659012C"
-				client     	@666
-				supplier   	@706
-				line_style 	3
-				origin_attachment 	(2050, 860)
-				terminal_attachment 	(2050, 789)
-				drawSupplier 	@707)
-			    (object InheritView "" @709
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C763C0224"
-				client     	@667
-				supplier   	@706
-				line_style 	3
-				origin_attachment 	(1525, 860)
-				terminal_attachment 	(1525, 789)
-				drawSupplier 	@707)
-			    (object InheritView "" @710
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C764F0131"
-				client     	@668
-				supplier   	@706
-				line_style 	3
-				origin_attachment 	(2237, 1036)
-				terminal_attachment 	(2237, 789)
-				drawSupplier 	@707)
-			    (object InheritView "" @711
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C76420074"
-				client     	@669
-				supplier   	@706
-				line_style 	3
-				origin_attachment 	(1328, 1037)
-				terminal_attachment 	(1328, 789)
-				drawSupplier 	@707)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @712
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1456, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@712
-				    location   	(1137, 47)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	638
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				compartment 	(object Compartment
-				    Parent_View 	@712
-				    location   	(1137, 107)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	628
-				    compartmentItems 	(list Compartment
-					"+ variety : XSDVariety"
-					"<<0..*>> + final : XSDSimpleFinal"))
-				width      	656
-				height     	250
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$132" @713
-				location   	(775, 178)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D597102EA"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$133" @714
-					Parent_View 	@713
-					location   	(-1209, -46)
-					label      	(object SegLabel @715
-					    Parent_View 	@714
-					    location   	(509, 235)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D59750119"
-					client     	@713
-					supplier   	@701
-					vertices   	(list Points
-					    (775, 178)
-					    (550, 178)
-					    (550, 306))
-					line_style 	3
-					origin_attachment 	(775, 178)
-					terminal_attachment 	(550, 306))
-				    (object RoleView "simpleTypeDefinition" @716
-					Parent_View 	@713
-					location   	(-1209, -46)
-					label      	(object SegLabel @717
-					    Parent_View 	@716
-					    location   	(875, 136)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+simpleTypeDefinition"
-					    pctDist    	0.283133
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D59750105"
-					client     	@713
-					supplier   	@712
-					line_style 	3
-					origin_attachment 	(775, 178)
-					terminal_attachment 	(1128, 178)
-					label      	(object SegLabel @718
-					    Parent_View 	@716
-					    location   	(1061, 215)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.812500
-					    height     	37
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$194" @719
-				location   	(369, 72)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BC8AE0203A8"
-				roleview_list 	(list RoleViews
-				    (object RoleView "facets" @720
-					Parent_View 	@719
-					location   	(-1615, -152)
-					label      	(object SegLabel @721
-					    Parent_View 	@720
-					    location   	(187, 496)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	132
-					    justify    	0
-					    label      	"+facets"
-					    pctDist    	0.913863
-					    height     	87
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BC8AE060065"
-					client     	@719
-					supplier   	@703
-					vertices   	(list Points
-					    (369, 72)
-					    (100, 72)
-					    (100, 561))
-					line_style 	3
-					origin_attachment 	(369, 72)
-					terminal_attachment 	(100, 561)
-					label      	(object SegLabel @722
-					    Parent_View 	@720
-					    location   	(60, 498)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.917900
-					    height     	41
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$195" @723
-					Parent_View 	@719
-					location   	(-1615, -152)
-					label      	(object SegLabel @724
-					    Parent_View 	@723
-					    location   	(976, 31)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BC8AE060051"
-					client     	@719
-					supplier   	@712
-					line_style 	3
-					origin_attachment 	(369, 72)
-					terminal_attachment 	(1128, 72))))
-			    (object AssociationViewNew "$UNNAMED$236" @725
-				location   	(1538, 508)
-				label      	(object SegLabel @726
-				    Parent_View 	@725
-				    location   	(1538, 449)
-				    font       	(object Font
-					italics    	TRUE)
-				    hidden     	TRUE
-				    anchor     	1
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	60
-				    justify    	0
-				    label      	""
-				    pctDist    	0.500000
-				    height     	60
-				    orientation 	0)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C276DA000DE"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$237" @727
-					Parent_View 	@725
-					location   	(-446, 284)
-					label      	(object SegLabel @728
-					    Parent_View 	@727
-					    location   	(1446, 340)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C276DA000DF"
-					client     	@725
-					supplier   	@712
-					vertices   	(list Points
-					    (1538, 508)
-					    (1487, 508)
-					    (1487, 285))
-					line_style 	3
-					origin_attachment 	(1538, 508)
-					terminal_attachment 	(1487, 285))
-				    (object RoleView "itemTypeDefinition" @729
-					Parent_View 	@725
-					location   	(-446, 284)
-					label      	(object SegLabel @730
-					    Parent_View 	@729
-					    location   	(1423, 577)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	360
-					    justify    	0
-					    label      	"+itemTypeDefinition"
-					    pctDist    	-2.211539
-					    height     	69
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C276DA000E0"
-					client     	@725
-					supplier   	@712
-					vertices   	(list Points
-					    (1538, 508)
-					    (1590, 508)
-					    (1590, 285))
-					line_style 	3
-					origin_attachment 	(1538, 508)
-					terminal_attachment 	(1590, 285)
-					label      	(object SegLabel @731
-					    Parent_View 	@729
-					    location   	(1539, 468)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.003984
-					    height     	41
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$196" @732
-				location   	(1729, 574)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C34B70208"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$197" @733
-					Parent_View 	@732
-					location   	(-255, 350)
-					label      	(object SegLabel @734
-					    Parent_View 	@733
-					    location   	(1637, 353)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6C34BE0258"
-					client     	@732
-					supplier   	@712
-					vertices   	(list Points
-					    (1729, 574)
-					    (1678, 574)
-					    (1678, 285))
-					line_style 	3
-					origin_attachment 	(1729, 574)
-					terminal_attachment 	(1678, 285))
-				    (object RoleView "memberTypeDefinitions" @735
-					Parent_View 	@732
-					location   	(-255, 350)
-					label      	(object SegLabel @736
-					    Parent_View 	@735
-					    location   	(1559, 654)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	444
-					    justify    	0
-					    label      	"+memberTypeDefinitions"
-					    pctDist    	-3.269231
-					    height     	80
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6C34BE0259"
-					client     	@732
-					supplier   	@712
-					vertices   	(list Points
-					    (1729, 574)
-					    (1781, 574)
-					    (1781, 285))
-					line_style 	3
-					origin_attachment 	(1729, 574)
-					terminal_attachment 	(1781, 285)
-					label      	(object SegLabel @737
-					    Parent_View 	@735
-					    location   	(1730, 520)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.312121
-					    height     	52
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$198" @738
-				location   	(748, 269)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C363201DB"
-				roleview_list 	(list RoleViews
-				    (object RoleView "fundamentalFacets" @739
-					Parent_View 	@738
-					location   	(-1236, 45)
-					label      	(object SegLabel @740
-					    Parent_View 	@739
-					    location   	(873, 312)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+fundamentalFacets"
-					    pctDist    	-1.409091
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6C36350063"
-					client     	@738
-					supplier   	@706
-					vertices   	(list Points
-					    (748, 269)
-					    (659, 269)
-					    (659, 561))
-					line_style 	3
-					origin_attachment 	(748, 269)
-					terminal_attachment 	(659, 561)
-					label      	(object SegLabel @741
-					    Parent_View 	@739
-					    location   	(728, 385)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..*"
-					    pctDist    	0.538028
-					    height     	69
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$199" @742
-					Parent_View 	@738
-					location   	(-1236, 45)
-					label      	(object SegLabel @743
-					    Parent_View 	@742
-					    location   	(1052, 228)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6C36350059"
-					client     	@738
-					supplier   	@712
-					line_style 	3
-					origin_attachment 	(748, 269)
-					terminal_attachment 	(1128, 269))))
-			    (object AssociationViewNew "$UNNAMED$200" @744
-				location   	(1175, 396)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D35AB0273"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$201" @745
-					Parent_View 	@744
-					location   	(-809, 172)
-					label      	(object SegLabel @746
-					    Parent_View 	@745
-					    location   	(1094, 316)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D35B20291"
-					client     	@744
-					supplier   	@712
-					vertices   	(list Points
-					    (1175, 396)
-					    (1135, 396)
-					    (1135, 285))
-					line_style 	3
-					origin_attachment 	(1175, 396)
-					terminal_attachment 	(1135, 285))
-				    (object RoleView "baseTypeDefinition" @747
-					Parent_View 	@744
-					location   	(-809, 172)
-					label      	(object SegLabel @748
-					    Parent_View 	@747
-					    location   	(1074, 443)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+baseTypeDefinition"
-					    pctDist    	-2.533333
-					    height     	47
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D35B202A5"
-					client     	@744
-					supplier   	@712
-					vertices   	(list Points
-					    (1175, 396)
-					    (1215, 396)
-					    (1215, 285))
-					line_style 	3
-					origin_attachment 	(1175, 396)
-					terminal_attachment 	(1215, 285)
-					label      	(object SegLabel @749
-					    Parent_View 	@747
-					    location   	(1172, 359)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.096154
-					    height     	38
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$202" @750
-				location   	(1360, 446)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D5572016C"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$203" @751
-					Parent_View 	@750
-					location   	(-624, 222)
-					label      	(object SegLabel @752
-					    Parent_View 	@751
-					    location   	(1268, 327)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D5575022F"
-					client     	@750
-					supplier   	@712
-					vertices   	(list Points
-					    (1360, 446)
-					    (1309, 446)
-					    (1309, 285))
-					line_style 	3
-					origin_attachment 	(1360, 446)
-					terminal_attachment 	(1309, 285))
-				    (object RoleView "primitiveTypeDefinition" @753
-					Parent_View 	@750
-					location   	(-624, 222)
-					label      	(object SegLabel @754
-					    Parent_View 	@753
-					    location   	(1204, 508)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	432
-					    justify    	0
-					    label      	"+primitiveTypeDefinition"
-					    pctDist    	-3.000000
-					    height     	62
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D55750243"
-					client     	@750
-					supplier   	@712
-					vertices   	(list Points
-					    (1360, 446)
-					    (1412, 446)
-					    (1412, 285))
-					line_style 	3
-					origin_attachment 	(1360, 446)
-					terminal_attachment 	(1412, 285)
-					label      	(object SegLabel @755
-					    Parent_View 	@753
-					    location   	(1373, 409)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.062147
-					    height     	38
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleFinal" @756
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2080, 512)
-				label      	(object ItemLabel
-				    Parent_View 	@756
-				    location   	(1917, 428)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"XSDSimpleFinal")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@756
-				    location   	(1917, 378)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C25D0295"
-				compartment 	(object Compartment
-				    Parent_View 	@756
-				    location   	(1917, 488)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	3
-				    max_width  	238
-				    compartmentItems 	(list Compartment
-					"+ list"
-					"+ restriction"
-					"+ union"))
-				width      	344
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDVariety" @757
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2080, 176)
-				label      	(object ItemLabel
-				    Parent_View 	@757
-				    location   	(1918, 92)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDVariety")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@757
-				    location   	(1918, 42)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B8FF7730249"
-				width      	342
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @758
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C7B0396"
-				client     	@706
-				supplier   	@701
-				line_style 	3
-				origin_attachment 	(591, 561)
-				terminal_attachment 	(591, 522)
-				drawSupplier 	@702)
-			    (object InheritView "" @759
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C800394"
-				client     	@703
-				supplier   	@701
-				line_style 	3
-				origin_attachment 	(272, 561)
-				terminal_attachment 	(272, 522)
-				drawSupplier 	@702)
-			    (object InheritView "" @760
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D25680259"
-				client     	@701
-				supplier   	@683
-				line_style 	3
-				origin_attachment 	(366, 306)
-				terminal_attachment 	(366, 215))
-			    (object InheritView "" @761
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C8801B4"
-				client     	@661
-				supplier   	@703
-				line_style 	3
-				origin_attachment 	(147, 828)
-				terminal_attachment 	(147, 781)
-				drawSupplier 	@704)
-			    (object InheritView "" @762
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B590281"
-				client     	@678
-				supplier   	@691
-				line_style 	3
-				origin_attachment 	(150, 1840)
-				terminal_attachment 	(150, 1444))))
-		    (object ClassDiagram "5. Component Annotations"
-			quid       	"3B69D68D00D2"
-			title      	"5. Component Annotations"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUse" @763
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 80)
-				label      	(object ItemLabel
-				    Parent_View 	@763
-				    location   	(88, 37)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	336
-				    justify    	0
-				    label      	"XSDAttributeUse")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B68354601A8"
-				width      	354
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @764
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 1696)
-				label      	(object ItemLabel
-				    Parent_View 	@764
-				    location   	(82, 1653)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	252
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	270
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @765
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1872, 1504)
-				label      	(object ItemLabel
-				    Parent_View 	@765
-				    location   	(1626, 1461)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	492
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				width      	510
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDConstrainingFacet" @766
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1888, 304)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@766
-				    location   	(1663, 261)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	450
-				    justify    	0
-				    label      	"XSDConstrainingFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C6B340093"
-				width      	468
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDIdentityConstraintDefinition" @767
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(368, 1360)
-				label      	(object ItemLabel
-				    Parent_View 	@767
-				    location   	(74, 1317)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	588
-				    justify    	0
-				    label      	"XSDIdentityConstraintDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B2603A2"
-				width      	606
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDNotationDeclaration" @768
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(320, 704)
-				label      	(object ItemLabel
-				    Parent_View 	@768
-				    location   	(86, 661)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"XSDNotationDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDAA021C"
-				width      	486
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @769
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(320, 1184)
-				label      	(object ItemLabel
-				    Parent_View 	@769
-				    location   	(74, 1141)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	492
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				width      	510
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @770
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(320, 544)
-				label      	(object ItemLabel
-				    Parent_View 	@770
-				    location   	(86, 501)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				width      	486
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @771
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1200, 80)
-				label      	(object ItemLabel
-				    Parent_View 	@771
-				    location   	(1068, 37)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	264
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	282
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @772
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1936, 1216)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@772
-				    location   	(1750, 1173)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	372
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	390
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @773
-				location   	(1994, 1412)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@772
-				vertices   	(list Points
-				    (1994, 1412)
-				    (1994, 1271)))
-			    (object InheritView "" @774
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A1302A2"
-				client     	@765
-				supplier   	@772
-				line_style 	3
-				origin_attachment 	(2084, 1449)
-				terminal_attachment 	(2084, 1412)
-				drawSupplier 	@773)
-			    (object ClassView "Class" "Logical View::xsd::XSDXPathDefinition" @775
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(272, 864)
-				label      	(object ItemLabel
-				    Parent_View 	@775
-				    location   	(80, 821)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	384
-				    justify    	0
-				    label      	"XSDXPathDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6D83BB0355"
-				width      	402
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDFacet" @776
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2000, 80)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@776
-				    location   	(1892, 37)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	216
-				    justify    	0
-				    label      	"XSDFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C359403D2"
-				width      	234
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @777
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(352, 384)
-				label      	(object ItemLabel
-				    Parent_View 	@777
-				    location   	(84, 341)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	536
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	554
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @778
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(320, 224)
-				label      	(object ItemLabel
-				    Parent_View 	@778
-				    location   	(86, 181)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	486
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @779
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1792, 1712)
-				label      	(object ItemLabel
-				    Parent_View 	@779
-				    location   	(1467, 1674)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	651
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				width      	669
-				height     	100
-				annotation 	8)
-			    (object InheritView "" @780
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0D01901F1"
-				client     	@779
-				supplier   	@772
-				line_style 	3
-				origin_attachment 	(1572, 1662)
-				terminal_attachment 	(1572, 1412)
-				drawSupplier 	@773)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroup" @781
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 1024)
-				label      	(object ItemLabel
-				    Parent_View 	@781
-				    location   	(78, 981)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDModelGroup")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6834E00291"
-				width      	342
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDRepeatableFacet" @782
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1904, 560)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@782
-				    location   	(1688, 517)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	432
-				    justify    	0
-				    label      	"XSDRepeatableFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C6AA6031A"
-				width      	450
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @783
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 1536)
-				label      	(object ItemLabel
-				    Parent_View 	@783
-				    location   	(71, 1493)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	274
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				width      	292
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAnnotation" @784
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1232, 944)
-				label      	(object ItemLabel
-				    Parent_View 	@784
-				    location   	(872, 685)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	720
-				    justify    	0
-				    label      	"XSDAnnotation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDC80233"
-				width      	738
-				height     	543
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$138" @785
-				location   	(865, 1359)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB0D0183"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$139" @786
-					Parent_View 	@785
-					location   	(-255, 559)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB0D033C"
-					client     	@785
-					supplier   	@767
-					line_style 	3
-					origin_attachment 	(865, 1359)
-					terminal_attachment 	(671, 1359))
-				    (object RoleView "annotation" @787
-					Parent_View 	@785
-					location   	(-255, 559)
-					label      	(object SegLabel @788
-					    Parent_View 	@787
-					    location   	(798, 1321)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	-1.116667
-					    height     	39
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB0D0346"
-					client     	@785
-					supplier   	@784
-					vertices   	(list Points
-					    (865, 1359)
-					    (925, 1359)
-					    (925, 1215))
-					line_style 	3
-					origin_attachment 	(865, 1359)
-					terminal_attachment 	(925, 1215)
-					label      	(object SegLabel @789
-					    Parent_View 	@787
-					    location   	(987, 1276)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.706422
-					    height     	62
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$162" @790
-				location   	(713, 709)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB0F0212"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$163" @791
-					Parent_View 	@790
-					location   	(-407, -90)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB1000C9"
-					client     	@790
-					supplier   	@768
-					line_style 	3
-					origin_attachment 	(713, 709)
-					terminal_attachment 	(563, 709))
-				    (object RoleView "annotation" @792
-					Parent_View 	@790
-					location   	(-407, -90)
-					label      	(object SegLabel @793
-					    Parent_View 	@792
-					    location   	(727, 667)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.095238
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB1000D3"
-					client     	@790
-					supplier   	@784
-					line_style 	3
-					origin_attachment 	(713, 709)
-					terminal_attachment 	(863, 709)
-					label      	(object SegLabel @794
-					    Parent_View 	@792
-					    location   	(796, 753)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.553571
-					    height     	44
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$156" @795
-				location   	(719, 1193)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB15008A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$157" @796
-					Parent_View 	@795
-					location   	(-401, 393)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB160096"
-					client     	@795
-					supplier   	@769
-					line_style 	3
-					origin_attachment 	(719, 1193)
-					terminal_attachment 	(575, 1193))
-				    (object RoleView "annotation" @797
-					Parent_View 	@795
-					location   	(-401, 393)
-					label      	(object SegLabel @798
-					    Parent_View 	@797
-					    location   	(720, 1147)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.006993
-					    height     	47
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB1600A0"
-					client     	@795
-					supplier   	@784
-					line_style 	3
-					origin_attachment 	(719, 1193)
-					terminal_attachment 	(863, 1193)
-					label      	(object SegLabel @799
-					    Parent_View 	@797
-					    location   	(806, 1240)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.604167
-					    height     	47
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$116" @800
-				location   	(785, 550)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB0A0066"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$117" @801
-					Parent_View 	@800
-					location   	(-335, -250)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB0B023F"
-					client     	@800
-					supplier   	@770
-					line_style 	3
-					origin_attachment 	(785, 550)
-					terminal_attachment 	(563, 550))
-				    (object RoleView "annotation" @802
-					Parent_View 	@800
-					location   	(-335, -250)
-					label      	(object SegLabel @803
-					    Parent_View 	@802
-					    location   	(779, 516)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	-0.070707
-					    height     	35
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB0B0249"
-					client     	@800
-					supplier   	@784
-					vertices   	(list Points
-					    (785, 550)
-					    (884, 550)
-					    (884, 673))
-					line_style 	3
-					origin_attachment 	(785, 550)
-					terminal_attachment 	(884, 673)
-					label      	(object SegLabel @804
-					    Parent_View 	@802
-					    location   	(935, 612)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.729730
-					    height     	51
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$188" @805
-				location   	(1184, 404)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69E4560290"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$189" @806
-					Parent_View 	@805
-					location   	(-32, -412)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69E4570165"
-					client     	@805
-					supplier   	@771
-					line_style 	3
-					origin_attachment 	(1184, 404)
-					terminal_attachment 	(1184, 135))
-				    (object RoleView "annotations" @807
-					Parent_View 	@805
-					location   	(-32, -412)
-					label      	(object SegLabel @808
-					    Parent_View 	@807
-					    location   	(1324, 226)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	249
-					    justify    	0
-					    label      	"+annotations"
-					    pctDist    	-0.665428
-					    height     	140
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69E457016F"
-					client     	@805
-					supplier   	@784
-					line_style 	3
-					origin_attachment 	(1184, 404)
-					terminal_attachment 	(1184, 673)
-					label      	(object SegLabel @809
-					    Parent_View 	@807
-					    location   	(1251, 615)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.784387
-					    height     	67
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$204" @810
-				location   	(1752, 1034)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69E2910158"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$205" @811
-					Parent_View 	@810
-					location   	(536, 218)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69E292019F"
-					client     	@810
-					supplier   	@772
-					vertices   	(list Points
-					    (1752, 1034)
-					    (1812, 1034)
-					    (1812, 1161))
-					line_style 	3
-					origin_attachment 	(1752, 1034)
-					terminal_attachment 	(1812, 1161))
-				    (object RoleView "annotation" @812
-					Parent_View 	@810
-					location   	(536, 218)
-					label      	(object SegLabel @813
-					    Parent_View 	@812
-					    location   	(1743, 997)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.059603
-					    height     	37
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69E29201A9"
-					client     	@810
-					supplier   	@784
-					line_style 	3
-					origin_attachment 	(1752, 1034)
-					terminal_attachment 	(1601, 1034)
-					label      	(object SegLabel @814
-					    Parent_View 	@812
-					    location   	(1684, 1066)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.450331
-					    height     	32
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$206" @815
-				location   	(1896, 881)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B9006CF0088"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$207" @816
-					Parent_View 	@815
-					location   	(621, 40)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B9006D1015D"
-					client     	@815
-					supplier   	@772
-					vertices   	(list Points
-					    (1896, 881)
-					    (1956, 881)
-					    (1956, 1161))
-					line_style 	3
-					origin_attachment 	(1896, 881)
-					terminal_attachment 	(1956, 1161))
-				    (object RoleView "derivationAnnotation" @817
-					Parent_View 	@815
-					location   	(621, 40)
-					label      	(object SegLabel @818
-					    Parent_View 	@817
-					    location   	(1821, 842)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	390
-					    justify    	0
-					    label      	"+derivationAnnotation"
-					    pctDist    	0.254237
-					    height     	40
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B9006D10167"
-					client     	@815
-					supplier   	@784
-					line_style 	3
-					origin_attachment 	(1896, 881)
-					terminal_attachment 	(1601, 881)
-					label      	(object SegLabel @819
-					    Parent_View 	@817
-					    location   	(1689, 914)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.705085
-					    height     	33
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$208" @820
-				location   	(2040, 715)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB330264"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$209" @821
-					Parent_View 	@820
-					location   	(920, -85)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB340284"
-					client     	@820
-					supplier   	@772
-					vertices   	(list Points
-					    (2040, 715)
-					    (2100, 715)
-					    (2100, 1161))
-					line_style 	3
-					origin_attachment 	(2040, 715)
-					terminal_attachment 	(2100, 1161))
-				    (object RoleView "annotations" @822
-					Parent_View 	@820
-					location   	(920, -85)
-					label      	(object SegLabel @823
-					    Parent_View 	@822
-					    location   	(1758, 681)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+annotations"
-					    pctDist    	0.643192
-					    height     	35
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB34028E"
-					client     	@820
-					supplier   	@784
-					line_style 	3
-					origin_attachment 	(2040, 715)
-					terminal_attachment 	(1601, 715)
-					label      	(object SegLabel @824
-					    Parent_View 	@822
-					    location   	(1685, 746)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.809313
-					    height     	31
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$226" @825
-				location   	(668, 865)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C239134004F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$227" @826
-					Parent_View 	@825
-					location   	(-612, 33)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C23913600CA"
-					client     	@825
-					supplier   	@775
-					line_style 	3
-					origin_attachment 	(668, 865)
-					terminal_attachment 	(473, 865))
-				    (object RoleView "annotation" @827
-					Parent_View 	@825
-					location   	(-612, 33)
-					label      	(object SegLabel @828
-					    Parent_View 	@827
-					    location   	(714, 825)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.234146
-					    height     	41
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C23913600D4"
-					client     	@825
-					supplier   	@784
-					line_style 	3
-					origin_attachment 	(668, 865)
-					terminal_attachment 	(863, 865)
-					label      	(object SegLabel @829
-					    Parent_View 	@827
-					    location   	(801, 903)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.682051
-					    height     	38
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$130" @830
-				location   	(1472, 167)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D23B901CD"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$131" @831
-					Parent_View 	@830
-					location   	(256, -649)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D23BA01C4"
-					client     	@830
-					supplier   	@776
-					vertices   	(list Points
-					    (1472, 167)
-					    (1472, 72)
-					    (1883, 72))
-					line_style 	3
-					origin_attachment 	(1472, 167)
-					terminal_attachment 	(1883, 72))
-				    (object RoleView "annotation" @832
-					Parent_View 	@830
-					location   	(256, -649)
-					label      	(object SegLabel @833
-					    Parent_View 	@832
-					    location   	(1604, 129)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	-0.076305
-					    height     	132
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D23BA01CE"
-					client     	@830
-					supplier   	@784
-					line_style 	3
-					origin_attachment 	(1472, 167)
-					terminal_attachment 	(1472, 673)
-					label      	(object SegLabel @834
-					    Parent_View 	@832
-					    location   	(1419, 618)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.893574
-					    height     	54
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$80" @835
-				location   	(927, 350)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB060291"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$81" @836
-					Parent_View 	@835
-					location   	(-193, -450)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB070171"
-					client     	@835
-					supplier   	@777
-					line_style 	3
-					origin_attachment 	(927, 350)
-					terminal_attachment 	(629, 350))
-				    (object RoleView "annotation" @837
-					Parent_View 	@835
-					location   	(-193, -450)
-					label      	(object SegLabel @838
-					    Parent_View 	@837
-					    location   	(878, 310)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	-0.816667
-					    height     	41
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB070172"
-					client     	@835
-					supplier   	@784
-					vertices   	(list Points
-					    (927, 350)
-					    (987, 350)
-					    (987, 673))
-					line_style 	3
-					origin_attachment 	(927, 350)
-					terminal_attachment 	(987, 673)
-					label      	(object SegLabel @839
-					    Parent_View 	@837
-					    location   	(1037, 612)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.843342
-					    height     	50
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$72" @840
-				location   	(1027, 222)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DADC02F5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$73" @841
-					Parent_View 	@840
-					location   	(-93, -578)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DADD0238"
-					client     	@840
-					supplier   	@778
-					line_style 	3
-					origin_attachment 	(1027, 222)
-					terminal_attachment 	(563, 222))
-				    (object RoleView "annotation" @842
-					Parent_View 	@840
-					location   	(-93, -578)
-					label      	(object SegLabel @843
-					    Parent_View 	@842
-					    location   	(1003, 188)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	-0.406250
-					    height     	35
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DADD0242"
-					client     	@840
-					supplier   	@784
-					vertices   	(list Points
-					    (1027, 222)
-					    (1087, 222)
-					    (1087, 673))
-					line_style 	3
-					origin_attachment 	(1027, 222)
-					terminal_attachment 	(1087, 673)
-					label      	(object SegLabel @844
-					    Parent_View 	@842
-					    location   	(1137, 613)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	100
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.882583
-					    height     	50
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$96" @845
-				location   	(1494, 1438)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B90068801C2"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$97" @846
-					Parent_View 	@845
-					location   	(214, 590)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B90068A0111"
-					client     	@845
-					supplier   	@779
-					line_style 	3
-					origin_attachment 	(1494, 1438)
-					terminal_attachment 	(1494, 1662))
-				    (object RoleView "contentAnnotation" @847
-					Parent_View 	@845
-					location   	(214, 590)
-					label      	(object SegLabel @848
-					    Parent_View 	@847
-					    location   	(1696, 1356)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	360
-					    justify    	0
-					    label      	"+contentAnnotation"
-					    pctDist    	0.367713
-					    height     	202
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B90068A011B"
-					client     	@845
-					supplier   	@784
-					line_style 	3
-					origin_attachment 	(1494, 1438)
-					terminal_attachment 	(1494, 1215)
-					label      	(object SegLabel @849
-					    Parent_View 	@847
-					    location   	(1443, 1279)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.713004
-					    height     	51
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$150" @850
-				location   	(637, 1022)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB1702C8"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$151" @851
-					Parent_View 	@850
-					location   	(-483, 222)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB1803E2"
-					client     	@850
-					supplier   	@781
-					line_style 	3
-					origin_attachment 	(637, 1022)
-					terminal_attachment 	(411, 1022))
-				    (object RoleView "annotation" @852
-					Parent_View 	@850
-					location   	(-483, 222)
-					label      	(object SegLabel @853
-					    Parent_View 	@852
-					    location   	(710, 979)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.328889
-					    height     	44
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB190004"
-					client     	@850
-					supplier   	@784
-					line_style 	3
-					origin_attachment 	(637, 1022)
-					terminal_attachment 	(863, 1022)
-					label      	(object SegLabel @854
-					    Parent_View 	@852
-					    location   	(802, 1062)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.730088
-					    height     	40
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$70" @855
-				location   	(1581, 607)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C626EA70102"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$71" @856
-					Parent_View 	@855
-					location   	(301, -225)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C626EA90191"
-					client     	@855
-					supplier   	@782
-					vertices   	(list Points
-					    (1581, 607)
-					    (1581, 547)
-					    (1679, 547))
-					line_style 	3
-					origin_attachment 	(1581, 607)
-					terminal_attachment 	(1679, 547))
-				    (object RoleView "annotations" @857
-					Parent_View 	@855
-					location   	(301, -225)
-					label      	(object SegLabel @858
-					    Parent_View 	@857
-					    location   	(1669, 462)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+annotations"
-					    pctDist    	-2.196970
-					    height     	88
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C626EA90192"
-					client     	@855
-					supplier   	@784
-					line_style 	3
-					origin_attachment 	(1581, 607)
-					terminal_attachment 	(1581, 673)
-					label      	(object SegLabel @859
-					    Parent_View 	@857
-					    location   	(1539, 620)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.196970
-					    height     	42
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$210" @860
-				location   	(849, 1496)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB11026F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$211" @861
-					Parent_View 	@860
-					location   	(-271, 696)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB1201F9"
-					client     	@860
-					supplier   	@783
-					line_style 	3
-					origin_attachment 	(849, 1496)
-					terminal_attachment 	(354, 1496))
-				    (object RoleView "annotation" @862
-					Parent_View 	@860
-					location   	(-271, 696)
-					label      	(object SegLabel @863
-					    Parent_View 	@862
-					    location   	(942, 1464)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.188259
-					    height     	33
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB120203"
-					client     	@860
-					supplier   	@784
-					vertices   	(list Points
-					    (849, 1496)
-					    (1062, 1496)
-					    (1062, 1215))
-					line_style 	3
-					origin_attachment 	(849, 1496)
-					terminal_attachment 	(1062, 1215)
-					label      	(object SegLabel @864
-					    Parent_View 	@862
-					    location   	(1115, 1279)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.872690
-					    height     	53
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$212" @865
-				location   	(952, 1565)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C626EB30005"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$213" @866
-					Parent_View 	@865
-					location   	(-328, 733)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C626EB40327"
-					client     	@865
-					supplier   	@783
-					line_style 	3
-					origin_attachment 	(952, 1565)
-					terminal_attachment 	(354, 1565))
-				    (object RoleView "annotations" @867
-					Parent_View 	@865
-					location   	(-328, 733)
-					label      	(object SegLabel @868
-					    Parent_View 	@867
-					    location   	(1075, 1538)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+annotations"
-					    pctDist    	0.204959
-					    height     	28
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C626EB40332"
-					client     	@865
-					supplier   	@784
-					vertices   	(list Points
-					    (952, 1565)
-					    (1200, 1565)
-					    (1200, 1215))
-					line_style 	3
-					origin_attachment 	(952, 1565)
-					terminal_attachment 	(1200, 1215)
-					label      	(object SegLabel @869
-					    Parent_View 	@867
-					    location   	(1254, 1275)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	1))))
-			    (object InheritView "" @870
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C800394"
-				client     	@766
-				supplier   	@776
-				line_style 	3
-				origin_attachment 	(1984, 249)
-				terminal_attachment 	(1984, 135))
-			    (object InheritView "" @871
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C8F002E"
-				client     	@782
-				supplier   	@766
-				line_style 	3
-				origin_attachment 	(1997, 505)
-				terminal_attachment 	(1997, 359))))
-		    (object ClassDiagram "6. Concrete Components"
-			quid       	"3B6AD74D03C4"
-			title      	"6. Concrete Components"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDComponent" @872
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(288, 416)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@872
-				    location   	(126, 373)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846E90029"
-				width      	342
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupContent" @873
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(832, 416)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@873
-				    location   	(568, 373)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	528
-				    justify    	0
-				    label      	"XSDAttributeGroupContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6940200089"
-				width      	546
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefineContent" @874
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1200, 672)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@874
-				    location   	(991, 629)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	418
-				    justify    	0
-				    label      	"XSDRedefineContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AE2060172"
-				width      	436
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaContent" @875
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1360, 416)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@875
-				    location   	(1156, 373)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	408
-				    justify    	0
-				    label      	"XSDSchemaContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B688CB800BA"
-				width      	426
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @876
-				location   	(1360, 561)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@875
-				vertices   	(list Points
-				    (1360, 561)
-				    (1360, 471)))
-			    (object ClassView "Class" "Logical View::xsd::XSDInclude" @877
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1632, 1200)
-				label      	(object ItemLabel
-				    Parent_View 	@877
-				    location   	(1512, 1157)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	240
-				    justify    	0
-				    label      	"XSDInclude")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B688C7D0250"
-				width      	258
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDImport" @878
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1408, 944)
-				label      	(object ItemLabel
-				    Parent_View 	@878
-				    location   	(1294, 901)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	228
-				    justify    	0
-				    label      	"XSDImport")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B688C93017F"
-				width      	246
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefine" @879
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1936, 1200)
-				label      	(object ItemLabel
-				    Parent_View 	@879
-				    location   	(1805, 1157)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	262
-				    justify    	0
-				    label      	"XSDRedefine")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B688C9B02AD"
-				width      	280
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAnnotation" @880
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(800, 1200)
-				label      	(object ItemLabel
-				    Parent_View 	@880
-				    location   	(375, 1153)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	851
-				    justify    	0
-				    label      	"XSDAnnotation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDC80233"
-				width      	869
-				height     	119
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$148" @881
-				location   	(1368, 1206)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6ADCC5007E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$149" @882
-					Parent_View 	@881
-					location   	(1160, 406)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6ADCC6006B"
-					client     	@881
-					supplier   	@877
-					line_style 	3
-					origin_attachment 	(1368, 1206)
-					terminal_attachment 	(1503, 1206))
-				    (object RoleView "annotation" @883
-					Parent_View 	@881
-					location   	(1160, 406)
-					label      	(object SegLabel @884
-					    Parent_View 	@883
-					    location   	(1347, 1154)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.154412
-					    height     	53
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6ADCC6006C"
-					client     	@881
-					supplier   	@880
-					line_style 	3
-					origin_attachment 	(1368, 1206)
-					terminal_attachment 	(1234, 1206)
-					label      	(object SegLabel @885
-					    Parent_View 	@883
-					    location   	(1300, 1253)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	107
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.514706
-					    height     	47
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$146" @886
-				location   	(1168, 1022)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6ADCD802FC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$147" @887
-					Parent_View 	@886
-					location   	(960, 222)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6ADCD9018B"
-					client     	@886
-					supplier   	@878
-					vertices   	(list Points
-					    (1168, 1022)
-					    (1168, 962)
-					    (1285, 962))
-					line_style 	3
-					origin_attachment 	(1168, 1022)
-					terminal_attachment 	(1285, 962))
-				    (object RoleView "annotation" @888
-					Parent_View 	@886
-					location   	(960, 222)
-					label      	(object SegLabel @889
-					    Parent_View 	@888
-					    location   	(1290, 1075)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.445378
-					    height     	122
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6ADCD9018C"
-					client     	@886
-					supplier   	@880
-					line_style 	3
-					origin_attachment 	(1168, 1022)
-					terminal_attachment 	(1168, 1141)
-					label      	(object SegLabel @890
-					    Parent_View 	@888
-					    location   	(1127, 1074)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.436975
-					    height     	41
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$168" @891
-				location   	(1563, 1353)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6ADE42009A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$169" @892
-					Parent_View 	@891
-					location   	(1355, 553)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6ADE4302FE"
-					client     	@891
-					supplier   	@879
-					vertices   	(list Points
-					    (1563, 1353)
-					    (1940, 1353)
-					    (1940, 1255))
-					line_style 	3
-					origin_attachment 	(1563, 1353)
-					terminal_attachment 	(1940, 1255))
-				    (object RoleView "annotations" @893
-					Parent_View 	@891
-					location   	(1355, 553)
-					label      	(object SegLabel @894
-					    Parent_View 	@893
-					    location   	(1317, 1322)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+annotations"
-					    pctDist    	0.516807
-					    height     	32
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6ADE430308"
-					client     	@891
-					supplier   	@880
-					vertices   	(list Points
-					    (1563, 1353)
-					    (1181, 1353)
-					    (1181, 1259))
-					line_style 	3
-					origin_attachment 	(1563, 1353)
-					terminal_attachment 	(1181, 1259)
-					label      	(object SegLabel @895
-					    Parent_View 	@893
-					    location   	(1130, 1326)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.861345
-					    height     	52
-					    orientation 	0))))
-			    (object InheritTreeView "" @896
-				location   	(288, 561)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@872
-				vertices   	(list Points
-				    (288, 561)
-				    (288, 471)))
-			    (object ClassView "Class" "Logical View::xsd::XSDNamedComponent" @897
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(688, 672)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@897
-				    location   	(460, 629)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	456
-				    justify    	0
-				    label      	"XSDNamedComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846D303A4"
-				width      	474
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDParticleContent" @898
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1856, 416)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@898
-				    location   	(1658, 373)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	396
-				    justify    	0
-				    label      	"XSDParticleContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6BD22300C6"
-				width      	414
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefinableComponent" @899
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(720, 960)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@899
-				    location   	(450, 917)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	540
-				    justify    	0
-				    label      	"XSDRedefinableComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B7FCA8B020B"
-				width      	558
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDScope" @900
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(224, 672)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@900
-				    location   	(110, 629)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	228
-				    justify    	0
-				    label      	"XSDScope")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B54000F2"
-				width      	246
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @901
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCD640231"
-				client     	@900
-				supplier   	@872
-				line_style 	3
-				origin_attachment 	(221, 617)
-				terminal_attachment 	(221, 561)
-				drawSupplier 	@896)
-			    (object InheritView "" @902
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0CEA20197"
-				client     	@897
-				supplier   	@872
-				line_style 	3
-				origin_attachment 	(589, 617)
-				terminal_attachment 	(589, 561)
-				drawSupplier 	@896)
-			    (object InheritView "" @903
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AE2B301D5"
-				client     	@874
-				supplier   	@875
-				line_style 	3
-				origin_attachment 	(1016, 617)
-				terminal_attachment 	(1016, 561)
-				drawSupplier 	@876)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaCompositor" @904
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1824, 944)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@904
-				    location   	(1590, 901)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"XSDSchemaCompositor")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C21DB4102AE"
-				width      	486
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @905
-				location   	(1824, 1089)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@904
-				vertices   	(list Points
-				    (1824, 1089)
-				    (1824, 999)))
-			    (object InheritView "" @906
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AD8DC0381"
-				client     	@877
-				supplier   	@904
-				line_style 	3
-				origin_attachment 	(1666, 1145)
-				terminal_attachment 	(1666, 1089)
-				drawSupplier 	@905)
-			    (object InheritView "" @907
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DB640240"
-				client     	@879
-				supplier   	@904
-				line_style 	3
-				origin_attachment 	(1934, 1145)
-				terminal_attachment 	(1934, 1089)
-				drawSupplier 	@905)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaDirective" @908
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1840, 672)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@908
-				    location   	(1630, 629)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	420
-				    justify    	0
-				    label      	"XSDSchemaDirective")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD8A202A2"
-				width      	438
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @909
-				location   	(1762, 819)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@908
-				vertices   	(list Points
-				    (1762, 819)
-				    (1762, 727)))
-			    (object InheritView "" @910
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AD8D9003E"
-				client     	@878
-				supplier   	@908
-				line_style 	3
-				origin_attachment 	(1416, 889)
-				terminal_attachment 	(1416, 819)
-				drawSupplier 	@909)
-			    (object InheritView "" @911
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AE32102AF"
-				client     	@908
-				supplier   	@875
-				line_style 	3
-				origin_attachment 	(1756, 617)
-				terminal_attachment 	(1756, 561)
-				drawSupplier 	@876)
-			    (object ClassView "Class" "Logical View::xsd::XSDConcreteComponent" @912
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				location   	(1120, 144)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@912
-				    location   	(875, 101)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	490
-				    justify    	0
-				    label      	"XSDConcreteComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD7B40065"
-				width      	508
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @913
-				location   	(1120, 289)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@912
-				vertices   	(list Points
-				    (1120, 289)
-				    (1120, 199)))
-			    (object AssociationViewNew "$UNNAMED$110" @914
-				location   	(1485, 215)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B751B0803C7"
-				roleview_list 	(list RoleViews
-				    (object RoleView "container" @915
-					Parent_View 	@914
-					location   	(989, 103)
-					label      	(object SegLabel @916
-					    Parent_View 	@915
-					    location   	(1604, 210)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	192
-					    justify    	0
-					    label      	"+container"
-					    pctDist    	0.033113
-					    height     	119
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B751B0C01CE"
-					client     	@914
-					supplier   	@912
-					vertices   	(list Points
-					    (1485, 215)
-					    (1485, 176)
-					    (1374, 176))
-					line_style 	3
-					origin_attachment 	(1485, 215)
-					terminal_attachment 	(1374, 176)
-					label      	(object SegLabel @917
-					    Parent_View 	@915
-					    location   	(1435, 226)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	69
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.602649
-					    height     	50
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$111" @918
-					Parent_View 	@914
-					location   	(989, 103)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B751B0C01CF"
-					client     	@914
-					supplier   	@912
-					vertices   	(list Points
-					    (1485, 215)
-					    (1485, 254)
-					    (1345, 254)
-					    (1345, 199))
-					line_style 	3
-					origin_attachment 	(1485, 215)
-					terminal_attachment 	(1345, 199))))
-			    (object AssociationViewNew "$UNNAMED$112" @919
-				location   	(773, 216)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B751B480261"
-				roleview_list 	(list RoleViews
-				    (object RoleView "rootContainer" @920
-					Parent_View 	@919
-					location   	(53, 104)
-					label      	(object SegLabel @921
-					    Parent_View 	@920
-					    location   	(614, 217)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	264
-					    justify    	0
-					    label      	"+rootContainer"
-					    pctDist    	-0.025000
-					    height     	160
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B751B4C0285"
-					client     	@919
-					supplier   	@912
-					vertices   	(list Points
-					    (773, 216)
-					    (773, 176)
-					    (866, 176))
-					line_style 	3
-					origin_attachment 	(773, 216)
-					terminal_attachment 	(866, 176)
-					label      	(object SegLabel @922
-					    Parent_View 	@920
-					    location   	(800, 228)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.300000
-					    height     	27
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$113" @923
-					Parent_View 	@919
-					location   	(53, 104)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B751B4C0286"
-					client     	@919
-					supplier   	@912
-					vertices   	(list Points
-					    (773, 216)
-					    (773, 257)
-					    (895, 257)
-					    (895, 199))
-					line_style 	3
-					origin_attachment 	(773, 216)
-					terminal_attachment 	(895, 199))))
-			    (object InheritView "" @924
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AD8E60372"
-				client     	@875
-				supplier   	@912
-				line_style 	3
-				origin_attachment 	(1367, 361)
-				terminal_attachment 	(1367, 289)
-				drawSupplier 	@913)
-			    (object InheritView "" @925
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B72D8E200EA"
-				client     	@873
-				supplier   	@912
-				line_style 	3
-				origin_attachment 	(752, 361)
-				terminal_attachment 	(752, 289)
-				drawSupplier 	@913)
-			    (object InheritView "" @926
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0CEA903D2"
-				client     	@872
-				supplier   	@912
-				line_style 	3
-				origin_attachment 	(299, 361)
-				terminal_attachment 	(299, 289)
-				drawSupplier 	@913)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @927
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(192, 1200)
-				label      	(object ItemLabel
-				    Parent_View 	@927
-				    location   	(61, 1157)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	262
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	280
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @928
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCC4A0182"
-				client     	@927
-				supplier   	@900
-				line_style 	3
-				origin_attachment 	(216, 1145)
-				terminal_attachment 	(216, 727))
-			    (object AssociationViewNew "$UNNAMED$224" @929
-				location   	(1382, 1425)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DD0C03DB"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$225" @930
-					Parent_View 	@929
-					location   	(1190, 225)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DD100304"
-					client     	@929
-					supplier   	@904
-					vertices   	(list Points
-					    (1382, 1425)
-					    (2147, 1425)
-					    (2147, 943)
-					    (2067, 943))
-					line_style 	3
-					origin_attachment 	(1382, 1425)
-					terminal_attachment 	(2067, 943))
-				    (object RoleView "incorporatedSchema" @931
-					Parent_View 	@929
-					location   	(1190, 225)
-					label      	(object SegLabel @932
-					    Parent_View 	@931
-					    location   	(445, 1389)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+incorporatedSchema"
-					    pctDist    	0.706546
-					    height     	37
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DD100305"
-					client     	@929
-					supplier   	@927
-					vertices   	(list Points
-					    (1382, 1425)
-					    (225, 1425)
-					    (225, 1255))
-					line_style 	3
-					origin_attachment 	(1382, 1425)
-					terminal_attachment 	(225, 1255)
-					label      	(object SegLabel @933
-					    Parent_View 	@931
-					    location   	(183, 1392)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.896915
-					    height     	43
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$222" @934
-				location   	(1505, 1503)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DCC700EC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$223" @935
-					Parent_View 	@934
-					location   	(1313, 303)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DCCE0042"
-					client     	@934
-					supplier   	@908
-					vertices   	(list Points
-					    (1505, 1503)
-					    (2188, 1503)
-					    (2188, 675)
-					    (2059, 675))
-					line_style 	3
-					origin_attachment 	(1505, 1503)
-					terminal_attachment 	(2059, 675))
-				    (object RoleView "resolvedSchema" @936
-					Parent_View 	@934
-					location   	(1313, 303)
-					label      	(object SegLabel @937
-					    Parent_View 	@936
-					    location   	(303, 1472)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	324
-					    justify    	0
-					    label      	"+resolvedSchema"
-					    pctDist    	0.733333
-					    height     	32
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DCCE0043"
-					client     	@934
-					supplier   	@927
-					vertices   	(list Points
-					    (1505, 1503)
-					    (113, 1503)
-					    (113, 1255))
-					line_style 	3
-					origin_attachment 	(1505, 1503)
-					terminal_attachment 	(113, 1255)
-					label      	(object SegLabel @938
-					    Parent_View 	@936
-					    location   	(73, 1472)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.867683
-					    height     	41
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$114" @939
-				location   	(66, 244)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B751C310356"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$115" @940
-					Parent_View 	@939
-					location   	(-94, -444)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B751C330331"
-					client     	@939
-					supplier   	@912
-					vertices   	(list Points
-					    (66, 244)
-					    (66, 144)
-					    (866, 144))
-					line_style 	3
-					origin_attachment 	(66, 244)
-					terminal_attachment 	(866, 144))
-				    (object RoleView "schema" @941
-					Parent_View 	@939
-					location   	(-94, -444)
-					label      	(object SegLabel @942
-					    Parent_View 	@941
-					    location   	(165, 93)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+schema"
-					    pctDist    	-0.168113
-					    height     	99
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B751C33033B"
-					client     	@939
-					supplier   	@927
-					line_style 	3
-					origin_attachment 	(66, 244)
-					terminal_attachment 	(66, 1145)
-					label      	(object SegLabel @943
-					    Parent_View 	@941
-					    location   	(136, 184)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	113
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	-0.066593
-					    height     	70
-					    orientation 	0))))
-			    (object InheritView "" @944
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B780BD90059"
-				client     	@898
-				supplier   	@912
-				line_style 	3
-				origin_attachment 	(1759, 361)
-				terminal_attachment 	(1759, 289)
-				drawSupplier 	@913)
-			    (object InheritView "" @945
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69E1770116"
-				client     	@880
-				supplier   	@872
-				line_style 	3
-				origin_attachment 	(400, 1141)
-				terminal_attachment 	(400, 561)
-				drawSupplier 	@896)
-			    (object InheritTreeView "" @946
-				location   	(1012, 837)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@874
-				vertices   	(list Points
-				    (1012, 837)
-				    (1012, 727)))
-			    (object InheritView "" @947
-				stereotype 	(object SegLabel @948
-				    Parent_View 	@947
-				    location   	(1071, 871)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	243
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.888158
-				    height     	34
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B7FD4E20366"
-				client     	@880
-				supplier   	@874
-				line_style 	3
-				origin_attachment 	(1037, 1141)
-				terminal_attachment 	(1037, 837)
-				drawSupplier 	@946)
-			    (object InheritView "" @949
-				stereotype 	(object SegLabel @950
-				    Parent_View 	@949
-				    location   	(890, 865)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	263
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.581633
-				    height     	36
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B7FD4BA023C"
-				client     	@899
-				supplier   	@874
-				line_style 	3
-				origin_attachment 	(925, 905)
-				terminal_attachment 	(925, 837)
-				drawSupplier 	@946)
-			    (object InheritView "" @951
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DB560092"
-				client     	@904
-				supplier   	@908
-				line_style 	3
-				origin_attachment 	(1828, 889)
-				terminal_attachment 	(1828, 819)
-				drawSupplier 	@909)))
-		    (object ClassDiagram "7. Concrete Attributes"
-			quid       	"3B9F8F7602C7"
-			title      	"7. Concrete Attributes"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDFeature" @952
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2144, 1440)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@952
-				    location   	(1938, 1359)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	412
-				    justify    	0
-				    label      	"XSDFeature")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B537026C"
-				compartment 	(object Compartment
-				    Parent_View 	@952
-				    location   	(1938, 1419)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	412
-				    compartmentItems 	(list Compartment
-					"+ form : XSDForm"
-					"+ lexicalValue : String"))
-				width      	430
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDForm" @953
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2560, 1424)
-				label      	(object ItemLabel
-				    Parent_View 	@953
-				    location   	(2398, 1365)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDForm")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@953
-				    location   	(2398, 1315)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B9F913B01EB"
-				width      	342
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDConcreteComponent" @954
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(368, 96)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@954
-				    location   	(40, 37)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	657
-				    justify    	0
-				    label      	"XSDConcreteComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD7B40065"
-				compartment 	(object Compartment
-				    Parent_View 	@954
-				    location   	(40, 97)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	482
-				    compartmentItems 	(list Compartment
-					"+ element : DOMElement"))
-				width      	675
-				height     	143
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDComponent" @955
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(848, 384)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@955
-				    location   	(687, 333)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	322
-				    justify    	0
-				    label      	"XSDComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846E90029"
-				width      	340
-				height     	126
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDNamedComponent" @956
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1904, 944)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@956
-				    location   	(1678, 892)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	452
-				    justify    	0
-				    label      	"XSDNamedComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846D303A4"
-				width      	470
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefinableComponent" @957
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1600, 1408)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@957
-				    location   	(1328, 1356)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	544
-				    justify    	0
-				    label      	"XSDRedefinableComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B7FCA8B020B"
-				width      	562
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDScope" @958
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(864, 624)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@958
-				    location   	(745, 573)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	238
-				    justify    	0
-				    label      	"XSDScope")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B54000F2"
-				width      	256
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @959
-				location   	(850, 537)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@955
-				vertices   	(list Points
-				    (850, 537)
-				    (850, 447)))
-			    (object ClassView "Class" "Logical View::xsd::DOMElement" @960
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1248, 128)
-				label      	(object ItemLabel
-				    Parent_View 	@960
-				    location   	(873, 90)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	751
-				    justify    	0
-				    label      	"DOMElement")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@960
-				    location   	(873, 40)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	751
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	14671839
-				quidu      	"3B8189790200"
-				width      	769
-				height     	200
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaDirective" @961
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(288, 640)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@961
-				    location   	(41, 584)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	494
-				    justify    	0
-				    label      	"XSDSchemaDirective")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD8A202A2"
-				width      	512
-				height     	136
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaContent" @962
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 384)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@962
-				    location   	(38, 333)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	404
-				    justify    	0
-				    label      	"XSDSchemaContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B688CB800BA"
-				width      	422
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @963
-				location   	(368, 263)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@954
-				vertices   	(list Points
-				    (368, 263)
-				    (368, 167)))
-			    (object ClassView "Class" "Logical View::xsd::XSDDisallowedSubstitutions" @964
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(992, 1456)
-				label      	(object ItemLabel
-				    Parent_View 	@964
-				    location   	(723, 1347)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	538
-				    justify    	0
-				    label      	"XSDDisallowedSubstitutions")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@964
-				    location   	(723, 1297)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	538
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C5A403DF"
-				compartment 	(object Compartment
-				    Parent_View 	@964
-				    location   	(723, 1407)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	264
-				    compartmentItems 	(list Compartment
-					"+ substitution"
-					"+ extension"
-					"+ restriction"
-					"+ all"))
-				width      	556
-				height     	342
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDProhibitedSubstitutions" @965
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(880, 1792)
-				label      	(object ItemLabel
-				    Parent_View 	@965
-				    location   	(614, 1708)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	532
-				    justify    	0
-				    label      	"XSDProhibitedSubstitutions")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@965
-				    location   	(614, 1658)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	532
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C5BE0272"
-				compartment 	(object Compartment
-				    Parent_View 	@965
-				    location   	(614, 1768)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	234
-				    compartmentItems 	(list Compartment
-					"+ extension"
-					"+ restriction"
-					"+ all"))
-				width      	550
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @966
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(912, 2096)
-				label      	(object ItemLabel
-				    Parent_View 	@966
-				    location   	(532, 2040)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	760
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				compartment 	(object Compartment
-				    Parent_View 	@966
-				    location   	(532, 2100)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	1
-				    max_width  	764
-				    compartmentItems 	(list Compartment
-					"<<0..*>> + lexicalFinal : XSDSimpleFinal"))
-				width      	778
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleFinal" @967
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 1984)
-				label      	(object ItemLabel
-				    Parent_View 	@967
-				    location   	(45, 1875)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"XSDSimpleFinal")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@967
-				    location   	(45, 1825)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C25D0295"
-				width      	344
-				height     	342
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexFinal" @968
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2544, 2016)
-				label      	(object ItemLabel
-				    Parent_View 	@968
-				    location   	(2362, 1932)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	364
-				    justify    	0
-				    label      	"XSDComplexFinal")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@968
-				    location   	(2362, 1882)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	364
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C2CA01CB"
-				width      	382
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUse" @969
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(352, 1360)
-				label      	(object ItemLabel
-				    Parent_View 	@969
-				    location   	(41, 1279)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	622
-				    justify    	0
-				    label      	"XSDAttributeUse")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B68354601A8"
-				compartment 	(object Compartment
-				    Parent_View 	@969
-				    location   	(41, 1339)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	630
-				    compartmentItems 	(list Compartment
-					"+ use : XSDAttributeUseCategory"
-					"+ lexicalValue : String"))
-				width      	640
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUseCategory" @970
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(288, 1632)
-				label      	(object ItemLabel
-				    Parent_View 	@970
-				    location   	(41, 1548)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	494
-				    justify    	0
-				    label      	"XSDAttributeUseCategory")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@970
-				    location   	(41, 1498)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	494
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3BA7B0E801A8"
-				width      	512
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDTerm" @971
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2608, 928)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@971
-				    location   	(2498, 881)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	220
-				    justify    	0
-				    label      	"XSDTerm")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683C5E0174"
-				width      	238
-				height     	119
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @972
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2240, 1712)
-				label      	(object ItemLabel
-				    Parent_View 	@972
-				    location   	(1757, 1631)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	966
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				compartment 	(object Compartment
-				    Parent_View 	@972
-				    location   	(1757, 1691)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	973
-				    compartmentItems 	(list Compartment
-					"<<0..*>> + lexicalFinal : XSDProhibitedSubstitutions"
-					"<<0..*>> + block : XSDDisallowedSubstitutions"))
-				width      	984
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @973
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2272, 1152)
-				label      	(object ItemLabel
-				    Parent_View 	@973
-				    location   	(1828, 1096)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	888
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				compartment 	(object Compartment
-				    Parent_View 	@973
-				    location   	(1828, 1156)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	888
-				    compartmentItems 	(list Compartment
-					"<<0..*>> + lexicalNamespaceConstraint : String"))
-				width      	906
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @974
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1120, 1008)
-				label      	(object ItemLabel
-				    Parent_View 	@974
-				    location   	(622, 777)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	996
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	1014
-				height     	486
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDImport" @975
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 960)
-				label      	(object ItemLabel
-				    Parent_View 	@975
-				    location   	(37, 904)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	406
-				    justify    	0
-				    label      	"XSDImport")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B688C93017F"
-				width      	424
-				height     	136
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDFacet" @976
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1344, 656)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@976
-				    location   	(1138, 600)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	412
-				    justify    	0
-				    label      	"XSDFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C359403D2"
-				compartment 	(object Compartment
-				    Parent_View 	@976
-				    location   	(1138, 660)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	414
-				    compartmentItems 	(list Compartment
-					"+ lexicalValue : String"))
-				width      	430
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @977
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1840, 2048)
-				label      	(object ItemLabel
-				    Parent_View 	@977
-				    location   	(1410, 1942)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	860
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				compartment 	(object Compartment
-				    Parent_View 	@977
-				    location   	(1410, 2002)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	870
-				    compartmentItems 	(list Compartment
-					"<<0..*>> + lexicalFinal : XSDComplexFinal"
-					"<<0..*>> + block : XSDProhibitedSubstitutions"
-					"+ mixed : boolean"))
-				width      	878
-				height     	236
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @978
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1488, 1696)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@978
-				    location   	(1304, 1644)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	368
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	386
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @979
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAB1004D"
-				client     	@978
-				supplier   	@957
-				line_style 	3
-				origin_attachment 	(1506, 1632)
-				terminal_attachment 	(1506, 1472))
-			    (object ClassView "Class" "Logical View::xsd::XSDAnnotation" @980
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2208, 704)
-				label      	(object ItemLabel
-				    Parent_View 	@980
-				    location   	(1758, 598)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	900
-				    justify    	0
-				    label      	"XSDAnnotation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDC80233"
-				width      	918
-				height     	236
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @981
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6848AA01D3"
-				client     	@971
-				supplier   	@955
-				line_style 	3
-				origin_attachment 	(2696, 869)
-				terminal_attachment 	(2696, 537)
-				drawSupplier 	@959)
-			    (object InheritView "" @982
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69EDEE01BF"
-				client     	@972
-				supplier   	@952
-				line_style 	3
-				origin_attachment 	(2094, 1619)
-				terminal_attachment 	(2094, 1533))
-			    (object InheritTreeView "" @983
-				location   	(1487, 1856)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@978
-				vertices   	(list Points
-				    (1487, 1856)
-				    (1487, 1760)))
-			    (object ClassView "Class" "Logical View::xsd::DOMAttr" @984
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2400, 384)
-				label      	(object ItemLabel
-				    Parent_View 	@984
-				    location   	(2080, 350)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	640
-				    justify    	0
-				    label      	"DOMAttr")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@984
-				    location   	(2080, 300)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	640
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	14671839
-				quidu      	"3BBF8C8901B6"
-				width      	658
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @985
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0D01901F1"
-				client     	@977
-				supplier   	@978
-				line_style 	3
-				origin_attachment 	(1734, 1930)
-				terminal_attachment 	(1734, 1856)
-				drawSupplier 	@983)
-			    (object InheritView "" @986
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D25680259"
-				client     	@976
-				supplier   	@955
-				line_style 	3
-				origin_attachment 	(1328, 588)
-				terminal_attachment 	(1328, 537)
-				drawSupplier 	@959)
-			    (object InheritView "" @987
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69E1770116"
-				client     	@980
-				supplier   	@955
-				line_style 	3
-				origin_attachment 	(2190, 586)
-				terminal_attachment 	(2190, 537)
-				drawSupplier 	@959)
-			    (object InheritView "" @988
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AE32102AF"
-				client     	@961
-				supplier   	@962
-				line_style 	3
-				origin_attachment 	(222, 572)
-				terminal_attachment 	(222, 447))
-			    (object InheritView "" @989
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AD8E60372"
-				client     	@962
-				supplier   	@954
-				line_style 	3
-				origin_attachment 	(260, 321)
-				terminal_attachment 	(260, 263)
-				drawSupplier 	@963)
-			    (object InheritView "" @990
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AD8D9003E"
-				client     	@975
-				supplier   	@961
-				line_style 	3
-				origin_attachment 	(223, 892)
-				terminal_attachment 	(223, 708))
-			    (object InheritView "" @991
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A3A0041"
-				client     	@973
-				supplier   	@971
-				line_style 	3
-				origin_attachment 	(2600, 1084)
-				terminal_attachment 	(2600, 987))
-			    (object ClassView "Class" "Logical View::xsd::DOMDocument" @992
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2336, 128)
-				label      	(object ItemLabel
-				    Parent_View 	@992
-				    location   	(1957, 94)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	758
-				    justify    	0
-				    label      	"DOMDocument")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@992
-				    location   	(1957, 44)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	758
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	14671839
-				quidu      	"3C27850E0381"
-				width      	776
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @993
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0CEA903D2"
-				client     	@955
-				supplier   	@954
-				line_style 	3
-				origin_attachment 	(856, 321)
-				terminal_attachment 	(856, 263)
-				drawSupplier 	@963)
-			    (object ClassView "Class" "Logical View::xsd::DOMNode" @994
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1568, 384)
-				label      	(object ItemLabel
-				    Parent_View 	@994
-				    location   	(1234, 350)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	668
-				    justify    	0
-				    label      	"DOMNode")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@994
-				    location   	(1234, 300)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	668
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	14671839
-				quidu      	"3BFE64A50117"
-				width      	686
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @995
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCD640231"
-				client     	@958
-				supplier   	@955
-				line_style 	3
-				origin_attachment 	(850, 561)
-				terminal_attachment 	(850, 537)
-				drawSupplier 	@959)
-			    (object InheritView "" @996
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B72D7BB0349"
-				client     	@969
-				supplier   	@955
-				line_style 	3
-				origin_attachment 	(575, 1267)
-				terminal_attachment 	(575, 537)
-				drawSupplier 	@959)
-			    (object InheritView "" @997
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0CEA20197"
-				client     	@956
-				supplier   	@955
-				line_style 	3
-				origin_attachment 	(1694, 880)
-				terminal_attachment 	(1694, 537)
-				drawSupplier 	@959)
-			    (object InheritView "" @998
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCC4A0182"
-				client     	@974
-				supplier   	@958
-				line_style 	3
-				origin_attachment 	(856, 765)
-				terminal_attachment 	(856, 687))
-			    (object InheritTreeView "" @999
-				location   	(1703, 1290)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@956
-				vertices   	(list Points
-				    (1703, 1290)
-				    (1703, 1008)))
-			    (object InheritView "" @1000
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A26036D"
-				client     	@957
-				supplier   	@956
-				line_style 	3
-				origin_attachment 	(1503, 1344)
-				terminal_attachment 	(1503, 1290)
-				drawSupplier 	@999)
-			    (object InheritView "" @1001
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A2C0307"
-				client     	@952
-				supplier   	@956
-				line_style 	3
-				origin_attachment 	(2093, 1347)
-				terminal_attachment 	(2093, 1290)
-				drawSupplier 	@999)
-			    (object InheritView "" @1002
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A1302A2"
-				client     	@966
-				supplier   	@978
-				line_style 	3
-				origin_attachment 	(1253, 2028)
-				terminal_attachment 	(1253, 1856)
-				drawSupplier 	@983)))
-		    (object ClassDiagram "8. Concrete Containment"
-			quid       	"3B6A8097027A"
-			title      	"8. Concrete Containment"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDNotationDeclaration" @1003
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2672, 992)
-				label      	(object ItemLabel
-				    Parent_View 	@1003
-				    location   	(2439, 949)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	466
-				    justify    	0
-				    label      	"XSDNotationDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDAA021C"
-				width      	484
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaDirective" @1004
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2640, 576)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1004
-				    location   	(2431, 533)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	418
-				    justify    	0
-				    label      	"XSDSchemaDirective")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD8A202A2"
-				width      	436
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefine" @1005
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2144, 784)
-				label      	(object ItemLabel
-				    Parent_View 	@1005
-				    location   	(2013, 741)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	262
-				    justify    	0
-				    label      	"XSDRedefine")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B688C9B02AD"
-				width      	280
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefineContent" @1006
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2064, 576)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1006
-				    location   	(1854, 533)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	420
-				    justify    	0
-				    label      	"XSDRedefineContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AE2060172"
-				width      	438
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @1007
-				location   	(1943, 868)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1006
-				vertices   	(list Points
-				    (1943, 868)
-				    (1943, 631)))
-			    (object AssociationViewNew "$UNNAMED$170" @1008
-				location   	(2125, 680)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AE8240051"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$171" @1009
-					Parent_View 	@1008
-					location   	(157, 344)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6AE82602AD"
-					client     	@1008
-					supplier   	@1005
-					line_style 	3
-					origin_attachment 	(2125, 680)
-					terminal_attachment 	(2125, 729))
-				    (object RoleView "contents" @1010
-					Parent_View 	@1008
-					location   	(157, 344)
-					label      	(object SegLabel @1011
-					    Parent_View 	@1010
-					    location   	(2255, 671)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+contents"
-					    pctDist    	0.175439
-					    height     	130
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6AE82602B7"
-					client     	@1008
-					supplier   	@1006
-					line_style 	3
-					origin_attachment 	(2125, 680)
-					terminal_attachment 	(2125, 631)
-					label      	(object SegLabel @1012
-					    Parent_View 	@1010
-					    location   	(2067, 671)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.175439
-					    height     	59
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDTerm" @1013
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 320)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1013
-				    location   	(148, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	216
-				    justify    	0
-				    label      	"XSDTerm")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683C5E0174"
-				width      	234
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @1014
-				location   	(272, 465)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1013
-				vertices   	(list Points
-				    (272, 465)
-				    (272, 375)))
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @1015
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2656, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@1015
-				    location   	(2372, 1121)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	569
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				width      	587
-				height     	118
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroup" @1016
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 576)
-				label      	(object ItemLabel
-				    Parent_View 	@1016
-				    location   	(89, 533)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	334
-				    justify    	0
-				    label      	"XSDModelGroup")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6834E00291"
-				width      	352
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$158" @1017
-				location   	(1170, 1356)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6837AC025A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "modelGroup" @1018
-					Parent_View 	@1017
-					location   	(866, -20)
-					label      	(object SegLabel @1019
-					    Parent_View 	@1018
-					    location   	(269, 1389)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	252
-					    justify    	0
-					    label      	"+modelGroup"
-					    pctDist    	0.534044
-					    height     	33
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6837AD0339"
-					client     	@1017
-					supplier   	@1016
-					vertices   	(list Points
-					    (1170, 1356)
-					    (206, 1356)
-					    (206, 631))
-					line_style 	3
-					origin_attachment 	(1170, 1356)
-					terminal_attachment 	(206, 631)
-					label      	(object SegLabel @1020
-					    Parent_View 	@1018
-					    location   	(226, 1322)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.559146
-					    height     	35
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$159" @1021
-					Parent_View 	@1017
-					location   	(866, -20)
-					label      	(object SegLabel @1022
-					    Parent_View 	@1021
-					    location   	(2521, 1398)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6837AD0338"
-					client     	@1017
-					supplier   	@1015
-					vertices   	(list Points
-					    (1170, 1356)
-					    (2731, 1356)
-					    (2731, 1227))
-					line_style 	3
-					origin_attachment 	(1170, 1356)
-					terminal_attachment 	(2731, 1227))))
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @1023
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(160, 1696)
-				label      	(object ItemLabel
-				    Parent_View 	@1023
-				    location   	(35, 1653)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	250
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	268
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$152" @1024
-				location   	(122, 1136)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6BCEB102F8"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$153" @1025
-					Parent_View 	@1024
-					location   	(-630, -256)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6BCEB6001B"
-					client     	@1024
-					supplier   	@1016
-					line_style 	3
-					origin_attachment 	(122, 1136)
-					terminal_attachment 	(122, 631))
-				    (object RoleView "contents" @1026
-					Parent_View 	@1024
-					location   	(-630, -256)
-					label      	(object SegLabel @1027
-					    Parent_View 	@1026
-					    location   	(223, 1515)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+contents"
-					    pctDist    	0.750495
-					    height     	101
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6BCEB60025"
-					client     	@1024
-					supplier   	@1023
-					line_style 	3
-					origin_attachment 	(122, 1136)
-					terminal_attachment 	(122, 1641)
-					label      	(object SegLabel @1028
-					    Parent_View 	@1026
-					    location   	(180, 1581)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.881188
-					    height     	58
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDParticleContent" @1029
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(288, 80)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1029
-				    location   	(41, 42)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	495
-				    justify    	0
-				    label      	"XSDParticleContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6BD22300C6"
-				width      	513
-				height     	100
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$164" @1030
-				location   	(47, 885)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6B47150119"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$165" @1031
-					Parent_View 	@1030
-					location   	(-289, 821)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B471A03AB"
-					client     	@1030
-					supplier   	@1023
-					line_style 	3
-					origin_attachment 	(47, 885)
-					terminal_attachment 	(47, 1641))
-				    (object RoleView "content" @1032
-					Parent_View 	@1030
-					location   	(-289, 821)
-					label      	(object SegLabel @1033
-					    Parent_View 	@1032
-					    location   	(142, 189)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+content"
-					    pctDist    	0.921854
-					    height     	95
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B471A03B5"
-					client     	@1030
-					supplier   	@1029
-					line_style 	3
-					origin_attachment 	(47, 885)
-					terminal_attachment 	(47, 130)
-					label      	(object SegLabel @1034
-					    Parent_View 	@1032
-					    location   	(28, 192)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.917881
-					    height     	19
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUse" @1035
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1424, 896)
-				label      	(object ItemLabel
-				    Parent_View 	@1035
-				    location   	(1252, 849)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	345
-				    justify    	0
-				    label      	"XSDAttributeUse")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B68354601A8"
-				width      	363
-				height     	119
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @1036
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1408, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@1036
-				    location   	(1175, 1125)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	466
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	484
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$94" @1037
-				location   	(1319, 1034)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6F1DE9018A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$95" @1038
-					Parent_View 	@1037
-					location   	(-57, -102)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6F1DEA036C"
-					client     	@1037
-					supplier   	@1035
-					line_style 	3
-					origin_attachment 	(1319, 1034)
-					terminal_attachment 	(1319, 955))
-				    (object RoleView "content" @1039
-					Parent_View 	@1037
-					location   	(-57, -102)
-					label      	(object SegLabel @1040
-					    Parent_View 	@1039
-					    location   	(1439, 1039)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+content"
-					    pctDist    	0.073171
-					    height     	120
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6F1DEA0380"
-					client     	@1037
-					supplier   	@1036
-					line_style 	3
-					origin_attachment 	(1319, 1034)
-					terminal_attachment 	(1319, 1113)
-					label      	(object SegLabel @1041
-					    Parent_View 	@1039
-					    location   	(1279, 1031)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.040816
-					    height     	41
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::xsd::XSDConstrainingFacet" @1042
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2080, 1696)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1042
-				    location   	(1855, 1653)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	450
-				    justify    	0
-				    label      	"XSDConstrainingFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C6B340093"
-				width      	468
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @1043
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1280, 1696)
-				label      	(object ItemLabel
-				    Parent_View 	@1043
-				    location   	(1035, 1653)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	490
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				width      	508
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$190" @1044
-				location   	(1351, 1840)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D5CA50112"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$191" @1045
-					Parent_View 	@1044
-					location   	(-297, 224)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D5CA703B4"
-					client     	@1044
-					supplier   	@1043
-					vertices   	(list Points
-					    (1351, 1840)
-					    (1294, 1840)
-					    (1294, 1751))
-					line_style 	3
-					origin_attachment 	(1351, 1840)
-					terminal_attachment 	(1294, 1751))
-				    (object RoleView "contents" @1046
-					Parent_View 	@1044
-					location   	(-297, 224)
-					label      	(object SegLabel @1047
-					    Parent_View 	@1046
-					    location   	(1517, 1806)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+contents"
-					    pctDist    	0.632653
-					    height     	108
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D5CA703C8"
-					client     	@1044
-					supplier   	@1043
-					vertices   	(list Points
-					    (1351, 1840)
-					    (1409, 1840)
-					    (1409, 1751))
-					line_style 	3
-					origin_attachment 	(1351, 1840)
-					terminal_attachment 	(1409, 1751)
-					label      	(object SegLabel @1048
-					    Parent_View 	@1046
-					    location   	(1361, 1801)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.072848
-					    height     	40
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$74" @1049
-				location   	(1190, 1432)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6890D6006F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "anonymousTypeDefinition" @1050
-					Parent_View 	@1049
-					location   	(774, -1832)
-					label      	(object SegLabel @1051
-					    Parent_View 	@1050
-					    location   	(1462, 1525)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	492
-					    justify    	0
-					    label      	"+anonymousTypeDefinition"
-					    pctDist    	0.444976
-					    height     	272
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6890D60318"
-					client     	@1049
-					supplier   	@1043
-					line_style 	3
-					origin_attachment 	(1190, 1432)
-					terminal_attachment 	(1190, 1641)
-					label      	(object SegLabel @1052
-					    Parent_View 	@1050
-					    location   	(1143, 1527)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.454545
-					    height     	47
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$75" @1053
-					Parent_View 	@1049
-					location   	(774, -1832)
-					label      	(object SegLabel @1054
-					    Parent_View 	@1053
-					    location   	(1149, 1266)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6890D6030E"
-					client     	@1049
-					supplier   	@1036
-					line_style 	3
-					origin_attachment 	(1190, 1432)
-					terminal_attachment 	(1190, 1223))))
-			    (object AssociationViewNew "$UNNAMED$192" @1055
-				location   	(1690, 1684)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C35AD0374"
-				roleview_list 	(list RoleViews
-				    (object RoleView "facetContents" @1056
-					Parent_View 	@1055
-					location   	(-326, -12)
-					label      	(object SegLabel @1057
-					    Parent_View 	@1056
-					    location   	(1695, 1731)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+facetContents"
-					    pctDist    	0.032051
-					    height     	47
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6C35AF0010"
-					client     	@1055
-					supplier   	@1042
-					line_style 	3
-					origin_attachment 	(1690, 1684)
-					terminal_attachment 	(1846, 1684)
-					label      	(object SegLabel @1058
-					    Parent_View 	@1056
-					    location   	(1756, 1644)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	94
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.420732
-					    height     	41
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$193" @1059
-					Parent_View 	@1055
-					location   	(-326, -12)
-					label      	(object SegLabel @1060
-					    Parent_View 	@1059
-					    location   	(1566, 1643)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6C35AF0006"
-					client     	@1055
-					supplier   	@1043
-					line_style 	3
-					origin_attachment 	(1690, 1684)
-					terminal_attachment 	(1534, 1684))))
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaCompositor" @1061
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2624, 784)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1061
-				    location   	(2388, 741)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	472
-				    justify    	0
-				    label      	"XSDSchemaCompositor")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C21DB4102AE"
-				width      	490
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaContent" @1062
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1312, 320)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1062
-				    location   	(1108, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	408
-				    justify    	0
-				    label      	"XSDSchemaContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B688CB800BA"
-				width      	426
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @1063
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(688, 320)
-				label      	(object ItemLabel
-				    Parent_View 	@1063
-				    location   	(557, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	262
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	280
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$172" @1064
-				location   	(963, 319)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B688E6B003D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "contents" @1065
-					Parent_View 	@1064
-					location   	(595, -17)
-					label      	(object SegLabel @1066
-					    Parent_View 	@1065
-					    location   	(974, 361)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+contents"
-					    pctDist    	0.081081
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B688E6C0111"
-					client     	@1064
-					supplier   	@1062
-					line_style 	3
-					origin_attachment 	(963, 319)
-					terminal_attachment 	(1099, 319)
-					label      	(object SegLabel @1067
-					    Parent_View 	@1065
-					    location   	(1016, 290)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.396396
-					    height     	30
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$173" @1068
-					Parent_View 	@1064
-					location   	(595, -17)
-					label      	(object SegLabel @1069
-					    Parent_View 	@1068
-					    location   	(855, 361)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B688E6C0107"
-					client     	@1064
-					supplier   	@1063
-					line_style 	3
-					origin_attachment 	(963, 319)
-					terminal_attachment 	(828, 319))))
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @1070
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2160, 992)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1070
-				    location   	(1974, 949)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	372
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	390
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @1071
-				location   	(2322, 1593)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1070
-				vertices   	(list Points
-				    (2322, 1593)
-				    (2322, 1047)))
-			    (object InheritView "" @1072
-				stereotype 	(object SegLabel @1073
-				    Parent_View 	@1072
-				    location   	(2146, 905)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	225
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.460000
-				    height     	5
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B6AE2F5013A"
-				client     	@1070
-				supplier   	@1006
-				line_style 	3
-				origin_attachment 	(2150, 937)
-				terminal_attachment 	(2150, 868)
-				drawSupplier 	@1007)
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @1074
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(832, 576)
-				label      	(object ItemLabel
-				    Parent_View 	@1074
-				    location   	(510, 532)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	644
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				width      	662
-				height     	112
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$118" @1075
-				location   	(1498, 1431)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B68911401AF"
-				roleview_list 	(list RoleViews
-				    (object RoleView "anonymousTypeDefinition" @1076
-					Parent_View 	@1075
-					location   	(1038, -1810)
-					label      	(object SegLabel @1077
-					    Parent_View 	@1076
-					    location   	(2027, 1472)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	492
-					    justify    	0
-					    label      	"+anonymousTypeDefinition"
-					    pctDist    	0.454389
-					    height     	41
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6891150017"
-					client     	@1075
-					supplier   	@1070
-					vertices   	(list Points
-					    (1498, 1431)
-					    (2281, 1431)
-					    (2281, 1047))
-					line_style 	3
-					origin_attachment 	(1498, 1431)
-					terminal_attachment 	(2281, 1047)
-					label      	(object SegLabel @1078
-					    Parent_View 	@1076
-					    location   	(2204, 1397)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.605419
-					    height     	35
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$119" @1079
-					Parent_View 	@1075
-					location   	(1038, -1810)
-					label      	(object SegLabel @1080
-					    Parent_View 	@1079
-					    location   	(1090, 866)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6891150016"
-					client     	@1075
-					supplier   	@1074
-					vertices   	(list Points
-					    (1498, 1431)
-					    (1131, 1431)
-					    (1131, 632))
-					line_style 	3
-					origin_attachment 	(1498, 1431)
-					terminal_attachment 	(1131, 632))))
-			    (object ClassView "Class" "Logical View::xsd::XSDXPathDefinition" @1081
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(848, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@1081
-				    location   	(655, 1125)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	386
-				    justify    	0
-				    label      	"XSDXPathDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6D83BB0355"
-				width      	404
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDIdentityConstraintDefinition" @1082
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(800, 896)
-				label      	(object ItemLabel
-				    Parent_View 	@1082
-				    location   	(505, 853)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	590
-				    justify    	0
-				    label      	"XSDIdentityConstraintDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B2603A2"
-				width      	608
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$122" @1083
-				location   	(534, 736)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6833EF0160"
-				roleview_list 	(list RoleViews
-				    (object RoleView "identityConstraintDefinitions" @1084
-					Parent_View 	@1083
-					location   	(86, -2144)
-					label      	(object SegLabel @1085
-					    Parent_View 	@1084
-					    location   	(820, 748)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	550
-					    justify    	0
-					    label      	"+identityConstraintDefinitions"
-					    pctDist    	0.111111
-					    height     	286
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6833F00299"
-					client     	@1083
-					supplier   	@1082
-					line_style 	3
-					origin_attachment 	(534, 736)
-					terminal_attachment 	(534, 841)
-					label      	(object SegLabel @1086
-					    Parent_View 	@1084
-					    location   	(595, 807)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.675926
-					    height     	61
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$123" @1087
-					Parent_View 	@1083
-					location   	(86, -2144)
-					label      	(object SegLabel @1088
-					    Parent_View 	@1087
-					    location   	(576, 653)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6833F00298"
-					client     	@1083
-					supplier   	@1074
-					line_style 	3
-					origin_attachment 	(534, 736)
-					terminal_attachment 	(534, 632))))
-			    (object AssociationViewNew "$UNNAMED$142" @1089
-				location   	(900, 1032)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D8D3D003E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "selector" @1090
-					Parent_View 	@1089
-					location   	(84, 120)
-					label      	(object SegLabel @1091
-					    Parent_View 	@1090
-					    location   	(1013, 1042)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+selector"
-					    pctDist    	0.123288
-					    height     	113
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D3E0234"
-					client     	@1089
-					supplier   	@1081
-					line_style 	3
-					origin_attachment 	(900, 1032)
-					terminal_attachment 	(900, 1113)
-					label      	(object SegLabel @1092
-					    Parent_View 	@1090
-					    location   	(859, 1040)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.095890
-					    height     	42
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$143" @1093
-					Parent_View 	@1089
-					location   	(84, 120)
-					label      	(object SegLabel @1094
-					    Parent_View 	@1093
-					    location   	(859, 968)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D3E022A"
-					client     	@1089
-					supplier   	@1082
-					line_style 	3
-					origin_attachment 	(900, 1032)
-					terminal_attachment 	(900, 951))))
-			    (object AssociationViewNew "$UNNAMED$144" @1095
-				location   	(700, 1032)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D8D330025"
-				roleview_list 	(list RoleViews
-				    (object RoleView "fields" @1096
-					Parent_View 	@1095
-					location   	(-116, 120)
-					label      	(object SegLabel @1097
-					    Parent_View 	@1096
-					    location   	(616, 1036)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	120
-					    justify    	0
-					    label      	"+fields"
-					    pctDist    	0.054795
-					    height     	85
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D330379"
-					client     	@1095
-					supplier   	@1081
-					line_style 	3
-					origin_attachment 	(700, 1032)
-					terminal_attachment 	(700, 1113)
-					label      	(object SegLabel @1098
-					    Parent_View 	@1096
-					    location   	(771, 1042)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..*"
-					    pctDist    	0.123077
-					    height     	71
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$145" @1099
-					Parent_View 	@1095
-					location   	(-116, 120)
-					label      	(object SegLabel @1100
-					    Parent_View 	@1099
-					    location   	(659, 968)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D330365"
-					client     	@1095
-					supplier   	@1082
-					line_style 	3
-					origin_attachment 	(700, 1032)
-					terminal_attachment 	(700, 951))))
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeContent" @1101
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(752, 1440)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1101
-				    location   	(500, 1397)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	504
-				    justify    	0
-				    label      	"XSDComplexTypeContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683BA00196"
-				width      	522
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @1102
-				location   	(550, 1590)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1101
-				vertices   	(list Points
-				    (550, 1590)
-				    (550, 1495)))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupContent" @1103
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1504, 576)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1103
-				    location   	(1240, 533)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	528
-				    justify    	0
-				    label      	"XSDAttributeGroupContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6940200089"
-				width      	546
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @1104
-				location   	(1406, 765)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1103
-				vertices   	(list Points
-				    (1406, 765)
-				    (1406, 631)))
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @1105
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2656, 1696)
-				label      	(object ItemLabel
-				    Parent_View 	@1105
-				    location   	(2393, 1653)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	526
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				width      	544
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$100" @1106
-				location   	(1614, 1868)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6FDDD70113"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$101" @1107
-					Parent_View 	@1106
-					location   	(526, 476)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6FDDDA026B"
-					client     	@1106
-					supplier   	@1105
-					vertices   	(list Points
-					    (1614, 1868)
-					    (2500, 1868)
-					    (2500, 1751))
-					line_style 	3
-					origin_attachment 	(1614, 1868)
-					terminal_attachment 	(2500, 1751))
-				    (object RoleView "content" @1108
-					Parent_View 	@1106
-					location   	(526, 476)
-					label      	(object SegLabel @1109
-					    Parent_View 	@1108
-					    location   	(896, 1787)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+content"
-					    pctDist    	0.709870
-					    height     	89
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6FDDDA0275"
-					client     	@1106
-					supplier   	@1101
-					vertices   	(list Points
-					    (1614, 1868)
-					    (984, 1868)
-					    (984, 1495))
-					line_style 	3
-					origin_attachment 	(1614, 1868)
-					terminal_attachment 	(984, 1495)
-					label      	(object SegLabel @1110
-					    Parent_View 	@1108
-					    location   	(1042, 1824)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.571286
-					    height     	45
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$106" @1111
-				location   	(2927, 387)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B698E360386"
-				roleview_list 	(list RoleViews
-				    (object RoleView "attributeContents" @1112
-					Parent_View 	@1111
-					location   	(2463, -3757)
-					label      	(object SegLabel @1113
-					    Parent_View 	@1112
-					    location   	(1915, 357)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+attributeContents"
-					    pctDist    	0.773060
-					    height     	31
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B698E38007C"
-					client     	@1111
-					supplier   	@1103
-					vertices   	(list Points
-					    (2927, 387)
-					    (1750, 387)
-					    (1750, 521))
-					line_style 	3
-					origin_attachment 	(2927, 387)
-					terminal_attachment 	(1750, 521)
-					label      	(object SegLabel @1114
-					    Parent_View 	@1112
-					    location   	(1804, 425)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.857247
-					    height     	38
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$107" @1115
-					Parent_View 	@1111
-					location   	(2463, -3757)
-					label      	(object SegLabel @1116
-					    Parent_View 	@1115
-					    location   	(2946, 1448)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B698E380072"
-					client     	@1111
-					supplier   	@1105
-					vertices   	(list Points
-					    (2927, 387)
-					    (2987, 387)
-					    (2987, 1671)
-					    (2928, 1671))
-					line_style 	3
-					origin_attachment 	(2927, 387)
-					terminal_attachment 	(2928, 1671))))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @1117
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1968, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@1117
-				    location   	(1699, 1125)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	538
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	556
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$82" @1118
-				location   	(1750, 872)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69404E0067"
-				roleview_list 	(list RoleViews
-				    (object RoleView "contents" @1119
-					Parent_View 	@1118
-					location   	(1462, -2392)
-					label      	(object SegLabel @1120
-					    Parent_View 	@1119
-					    location   	(1640, 691)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+contents"
-					    pctDist    	0.751037
-					    height     	110
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69405002A5"
-					client     	@1118
-					supplier   	@1103
-					line_style 	3
-					origin_attachment 	(1750, 872)
-					terminal_attachment 	(1750, 631)
-					label      	(object SegLabel @1121
-					    Parent_View 	@1119
-					    location   	(1814, 695)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.734440
-					    height     	64
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$83" @1122
-					Parent_View 	@1118
-					location   	(1462, -2392)
-					label      	(object SegLabel @1123
-					    Parent_View 	@1122
-					    location   	(1709, 1065)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B694050029B"
-					client     	@1118
-					supplier   	@1117
-					line_style 	3
-					origin_attachment 	(1750, 872)
-					terminal_attachment 	(1750, 1113))))
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @1124
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(416, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@1124
-				    location   	(279, 1125)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	274
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				width      	292
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$214" @1125
-				location   	(1252, 1896)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BEBDC870247"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$215" @1126
-					Parent_View 	@1125
-					location   	(708, 1288)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BEBDC8C02F9"
-					client     	@1125
-					supplier   	@1105
-					vertices   	(list Points
-					    (1252, 1896)
-					    (2603, 1896)
-					    (2603, 1751))
-					line_style 	3
-					origin_attachment 	(1252, 1896)
-					terminal_attachment 	(2603, 1751))
-				    (object RoleView "attributeWildcardContent" @1127
-					Parent_View 	@1125
-					location   	(708, 1288)
-					label      	(object SegLabel @1128
-					    Parent_View 	@1127
-					    location   	(682, 1858)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	480
-					    justify    	0
-					    label      	"+attributeWildcardContent"
-					    pctDist    	0.381142
-					    height     	39
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BEBDC8C0303"
-					client     	@1125
-					supplier   	@1124
-					vertices   	(list Points
-					    (1252, 1896)
-					    (428, 1896)
-					    (428, 1223))
-					line_style 	3
-					origin_attachment 	(1252, 1896)
-					terminal_attachment 	(428, 1223)
-					label      	(object SegLabel @1129
-					    Parent_View 	@1127
-					    location   	(382, 1860)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.575033
-					    height     	47
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$86" @1130
-				location   	(1199, 1321)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C275D320220"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$87" @1131
-					Parent_View 	@1130
-					location   	(655, 713)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C275D3C010C"
-					client     	@1130
-					supplier   	@1117
-					vertices   	(list Points
-					    (1199, 1321)
-					    (1897, 1321)
-					    (1897, 1223))
-					line_style 	3
-					origin_attachment 	(1199, 1321)
-					terminal_attachment 	(1897, 1223))
-				    (object RoleView "attributeWildcardContent" @1132
-					Parent_View 	@1130
-					location   	(655, 713)
-					label      	(object SegLabel @1133
-					    Parent_View 	@1132
-					    location   	(857, 1279)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	480
-					    justify    	0
-					    label      	"+attributeWildcardContent"
-					    pctDist    	0.429569
-					    height     	43
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C275D3C010D"
-					client     	@1130
-					supplier   	@1124
-					vertices   	(list Points
-					    (1199, 1321)
-					    (500, 1321)
-					    (500, 1223))
-					line_style 	3
-					origin_attachment 	(1199, 1321)
-					terminal_attachment 	(500, 1223)
-					label      	(object SegLabel @1134
-					    Parent_View 	@1132
-					    location   	(576, 1279)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.782305
-					    height     	43
-					    orientation 	1))))
-			    (object InheritView "" @1135
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0D01901F1"
-				client     	@1105
-				supplier   	@1070
-				line_style 	3
-				origin_attachment 	(2606, 1641)
-				terminal_attachment 	(2606, 1593)
-				drawSupplier 	@1071)
-			    (object InheritView "" @1136
-				stereotype 	(object SegLabel @1137
-				    Parent_View 	@1136
-				    location   	(759, 495)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	243
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.446429
-				    height     	6
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B685F17002E"
-				client     	@1074
-				supplier   	@1013
-				line_style 	3
-				origin_attachment 	(753, 520)
-				terminal_attachment 	(753, 465)
-				drawSupplier 	@1014)
-			    (object InheritView "" @1138
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A1302A2"
-				client     	@1043
-				supplier   	@1070
-				line_style 	3
-				origin_attachment 	(1409, 1641)
-				terminal_attachment 	(1409, 1593)
-				drawSupplier 	@1071)
-			    (object InheritView "" @1139
-				stereotype 	(object SegLabel @1140
-				    Parent_View 	@1139
-				    location   	(759, 1591)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	219
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.980392
-				    height     	385
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B685F55032B"
-				client     	@1043
-				supplier   	@1101
-				line_style 	3
-				origin_attachment 	(1144, 1641)
-				terminal_attachment 	(1144, 1590)
-				drawSupplier 	@1102)
-			    (object InheritView "" @1141
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A640279"
-				client     	@1016
-				supplier   	@1013
-				line_style 	3
-				origin_attachment 	(166, 521)
-				terminal_attachment 	(166, 465)
-				drawSupplier 	@1014)
-			    (object InheritTreeView "" @1142
-				location   	(431, 222)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1029
-				vertices   	(list Points
-				    (431, 222)
-				    (431, 130)))
-			    (object InheritView "" @1143
-				stereotype 	(object SegLabel @1144
-				    Parent_View 	@1143
-				    location   	(361, 224)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	237
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.976744
-				    height     	86
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B6BD2440069"
-				client     	@1013
-				supplier   	@1029
-				line_style 	3
-				origin_attachment 	(275, 265)
-				terminal_attachment 	(275, 222)
-				drawSupplier 	@1142)
-			    (object InheritTreeView "" @1145
-				location   	(1309, 465)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1062
-				vertices   	(list Points
-				    (1309, 465)
-				    (1309, 375)))
-			    (object InheritView "" @1146
-				stereotype 	(object SegLabel @1147
-				    Parent_View 	@1146
-				    location   	(941, 495)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	225
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.464286
-				    height     	10
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B688E660339"
-				client     	@1074
-				supplier   	@1062
-				line_style 	3
-				origin_attachment 	(931, 520)
-				terminal_attachment 	(931, 465)
-				drawSupplier 	@1145)
-			    (object InheritView "" @1148
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6848FC01E7"
-				client     	@1023
-				supplier   	@1101
-				line_style 	3
-				origin_attachment 	(250, 1641)
-				terminal_attachment 	(250, 1590)
-				drawSupplier 	@1102)
-			    (object InheritView "" @1149
-				stereotype 	(object SegLabel @1150
-				    Parent_View 	@1149
-				    location   	(1205, 493)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	212
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.958333
-				    height     	8
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B688E6103BE"
-				client     	@1036
-				supplier   	@1062
-				line_style 	3
-				origin_attachment 	(1197, 1113)
-				terminal_attachment 	(1197, 465)
-				drawSupplier 	@1145)
-			    (object InheritView "" @1151
-				stereotype 	(object SegLabel @1152
-				    Parent_View 	@1151
-				    location   	(1951, 905)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	225
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.848980
-				    height     	73
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B6AE2EB02A8"
-				client     	@1117
-				supplier   	@1006
-				line_style 	3
-				origin_attachment 	(1878, 1113)
-				terminal_attachment 	(1878, 868)
-				drawSupplier 	@1007)
-			    (object InheritView "" @1153
-				stereotype 	(object SegLabel @1154
-				    Parent_View 	@1153
-				    location   	(1642, 807)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	187
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.879310
-				    height     	61
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B69403A0221"
-				client     	@1117
-				supplier   	@1103
-				line_style 	3
-				origin_attachment 	(1703, 1113)
-				terminal_attachment 	(1703, 765)
-				drawSupplier 	@1104)
-			    (object InheritView "" @1155
-				stereotype 	(object SegLabel @1156
-				    Parent_View 	@1155
-				    location   	(1354, 801)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	225
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.500000
-				    height     	70
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B72D737038F"
-				client     	@1035
-				supplier   	@1103
-				line_style 	3
-				origin_attachment 	(1284, 837)
-				terminal_attachment 	(1284, 765)
-				drawSupplier 	@1104)
-			    (object InheritView "" @1157
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DB640240"
-				client     	@1005
-				supplier   	@1061
-				line_style 	3
-				origin_attachment 	(2284, 762)
-				terminal_attachment 	(2379, 762))
-			    (object InheritView "" @1158
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AE32102AF"
-				client     	@1004
-				supplier   	@1062
-				line_style 	3
-				origin_attachment 	(2637, 521)
-				terminal_attachment 	(2637, 465)
-				drawSupplier 	@1145)
-			    (object InheritView "" @1159
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DB560092"
-				client     	@1061
-				supplier   	@1004
-				line_style 	3
-				origin_attachment 	(2637, 729)
-				terminal_attachment 	(2637, 631))
-			    (object InheritView "" @1160
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AE2B301D5"
-				client     	@1006
-				supplier   	@1062
-				line_style 	3
-				origin_attachment 	(1950, 521)
-				terminal_attachment 	(1950, 465)
-				drawSupplier 	@1145)
-			    (object InheritView "" @1161
-				stereotype 	(object SegLabel @1162
-				    Parent_View 	@1161
-				    location   	(2821, 897)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	181
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.087719
-				    height     	76
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B688E4F023C"
-				client     	@1003
-				supplier   	@1062
-				line_style 	3
-				origin_attachment 	(2896, 937)
-				terminal_attachment 	(2896, 465)
-				drawSupplier 	@1145)
-			    (object InheritView "" @1163
-				stereotype 	(object SegLabel @1164
-				    Parent_View 	@1163
-				    location   	(2313, 904)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	207
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.850622
-				    height     	68
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B6AE2E20381"
-				client     	@1015
-				supplier   	@1006
-				line_style 	3
-				origin_attachment 	(2381, 1109)
-				terminal_attachment 	(2381, 868)
-				drawSupplier 	@1007)
-			    (object InheritView "" @1165
-				stereotype 	(object SegLabel @1166
-				    Parent_View 	@1165
-				    location   	(2878, 269)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	238
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.946667
-				    height     	66
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B6BD2550385"
-				client     	@1015
-				supplier   	@1029
-				line_style 	3
-				origin_attachment 	(2943, 1109)
-				terminal_attachment 	(2943, 222)
-				drawSupplier 	@1142)
-			    (object InheritView "" @1167
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A3A0041"
-				client     	@1124
-				supplier   	@1013
-				line_style 	3
-				origin_attachment 	(462, 1113)
-				terminal_attachment 	(462, 465)
-				drawSupplier 	@1014)))
-		    (object ClassDiagram "9. Concrete Schema Composition"
-			quid       	"3C25EB7A038C"
-			title      	"9. Concrete Schema Composition"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @1168
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 1536)
-				label      	(object ItemLabel
-				    Parent_View 	@1168
-				    location   	(73, 1493)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	462
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				width      	480
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$124" @1169
-				location   	(228, 1695)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6B41E60251"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$125" @1170
-					Parent_View 	@1169
-					location   	(-476, -385)
-					label      	(object SegLabel @1171
-					    Parent_View 	@1170
-					    location   	(217, 1623)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B41EA02F7"
-					client     	@1169
-					supplier   	@1168
-					vertices   	(list Points
-					    (228, 1695)
-					    (175, 1695)
-					    (175, 1591))
-					line_style 	3
-					origin_attachment 	(228, 1695)
-					terminal_attachment 	(175, 1591))
-				    (object RoleView "resolvedElementDeclaration" @1172
-					Parent_View 	@1169
-					location   	(-476, -385)
-					label      	(object SegLabel @1173
-					    Parent_View 	@1172
-					    location   	(329, 1740)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	528
-					    justify    	0
-					    label      	"+resolvedElementDeclaration"
-					    pctDist    	1.924528
-					    height     	45
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B41EA030B"
-					client     	@1169
-					supplier   	@1168
-					vertices   	(list Points
-					    (228, 1695)
-					    (281, 1695)
-					    (281, 1591))
-					line_style 	3
-					origin_attachment 	(228, 1695)
-					terminal_attachment 	(281, 1591)
-					label      	(object SegLabel @1174
-					    Parent_View 	@1172
-					    location   	(229, 1646)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.005714
-					    height     	50
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @1175
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1040, 1536)
-				label      	(object ItemLabel
-				    Parent_View 	@1175
-				    location   	(790, 1493)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	500
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				width      	518
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$160" @1176
-				location   	(952, 1698)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6B42450398"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$161" @1177
-					Parent_View 	@1176
-					location   	(-1288, -318)
-					label      	(object SegLabel @1178
-					    Parent_View 	@1177
-					    location   	(860, 1623)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B4249038A"
-					client     	@1176
-					supplier   	@1175
-					vertices   	(list Points
-					    (952, 1698)
-					    (901, 1698)
-					    (901, 1591))
-					line_style 	3
-					origin_attachment 	(952, 1698)
-					terminal_attachment 	(901, 1591))
-				    (object RoleView "resolvedModelGroupDefinition" @1179
-					Parent_View 	@1176
-					location   	(-1288, -318)
-					label      	(object SegLabel @1180
-					    Parent_View 	@1179
-					    location   	(1020, 1739)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	564
-					    justify    	0
-					    label      	"+resolvedModelGroupDefinition"
-					    pctDist    	1.326923
-					    height     	41
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B4249039E"
-					client     	@1176
-					supplier   	@1175
-					vertices   	(list Points
-					    (952, 1698)
-					    (1004, 1698)
-					    (1004, 1591))
-					line_style 	3
-					origin_attachment 	(952, 1698)
-					terminal_attachment 	(1004, 1591)
-					label      	(object SegLabel @1181
-					    Parent_View 	@1179
-					    location   	(952, 1649)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.000000
-					    height     	50
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaCompositor" @1182
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(656, 992)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1182
-				    location   	(420, 949)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	472
-				    justify    	0
-				    label      	"XSDSchemaCompositor")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C21DB4102AE"
-				width      	490
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaDirective" @1183
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(640, 784)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1183
-				    location   	(412, 737)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	457
-				    justify    	0
-				    label      	"XSDSchemaDirective")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD8A202A2"
-				width      	475
-				height     	118
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @1184
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(640, 416)
-				label      	(object ItemLabel
-				    Parent_View 	@1184
-				    location   	(446, 285)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	388
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	406
-				height     	287
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$224" @1185
-				location   	(1303, 679)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DD0C03DB"
-				roleview_list 	(list RoleViews
-				    (object RoleView "incorporatedSchema" @1186
-					Parent_View 	@1185
-					location   	(-41, -857)
-					label      	(object SegLabel @1187
-					    Parent_View 	@1186
-					    location   	(1059, 381)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+incorporatedSchema"
-					    pctDist    	0.700384
-					    height     	39
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DD100305"
-					client     	@1185
-					supplier   	@1184
-					vertices   	(list Points
-					    (1303, 679)
-					    (1303, 419)
-					    (843, 419))
-					line_style 	3
-					origin_attachment 	(1303, 679)
-					terminal_attachment 	(843, 419)
-					label      	(object SegLabel @1188
-					    Parent_View 	@1186
-					    location   	(922, 454)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.890746
-					    height     	35
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$225" @1189
-					Parent_View 	@1185
-					location   	(-41, -857)
-					label      	(object SegLabel @1190
-					    Parent_View 	@1189
-					    location   	(1045, 956)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DD100304"
-					client     	@1185
-					supplier   	@1182
-					vertices   	(list Points
-					    (1303, 679)
-					    (1303, 997)
-					    (901, 997))
-					line_style 	3
-					origin_attachment 	(1303, 679)
-					terminal_attachment 	(901, 997))))
-			    (object AssociationViewNew "$UNNAMED$222" @1191
-				location   	(1216, 649)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DCC700EC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "resolvedSchema" @1192
-					Parent_View 	@1191
-					location   	(336, -1399)
-					label      	(object SegLabel @1193
-					    Parent_View 	@1192
-					    location   	(1038, 500)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	324
-					    justify    	0
-					    label      	"+resolvedSchema"
-					    pctDist    	0.601923
-					    height     	35
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DCCE0043"
-					client     	@1191
-					supplier   	@1184
-					vertices   	(list Points
-					    (1216, 649)
-					    (1216, 534)
-					    (843, 534))
-					line_style 	3
-					origin_attachment 	(1216, 649)
-					terminal_attachment 	(843, 534)
-					label      	(object SegLabel @1194
-					    Parent_View 	@1192
-					    location   	(926, 577)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.831643
-					    height     	43
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$223" @1195
-					Parent_View 	@1191
-					location   	(336, -1399)
-					label      	(object SegLabel @1196
-					    Parent_View 	@1195
-					    location   	(974, 756)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DCCE0042"
-					client     	@1191
-					supplier   	@1183
-					vertices   	(list Points
-					    (1216, 649)
-					    (1216, 797)
-					    (877, 797))
-					line_style 	3
-					origin_attachment 	(1216, 649)
-					terminal_attachment 	(877, 797))))
-			    (object AssociationViewNew "$UNNAMED$228" @1197
-				location   	(662, 642)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C25D3A60131"
-				roleview_list 	(list RoleViews
-				    (object RoleView "referencingDirectives" @1198
-					Parent_View 	@1197
-					location   	(-234, 114)
-					label      	(object SegLabel @1199
-					    Parent_View 	@1198
-					    location   	(878, 675)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+referencingDirectives"
-					    pctDist    	0.408759
-					    height     	216
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25D3A90371"
-					client     	@1197
-					supplier   	@1183
-					line_style 	3
-					origin_attachment 	(662, 642)
-					terminal_attachment 	(662, 725)
-					label      	(object SegLabel @1200
-					    Parent_View 	@1198
-					    location   	(615, 678)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.430657
-					    height     	48
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$229" @1201
-					Parent_View 	@1197
-					location   	(-234, 114)
-					label      	(object SegLabel @1202
-					    Parent_View 	@1201
-					    location   	(621, 576)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25D3A90370"
-					client     	@1197
-					supplier   	@1184
-					line_style 	3
-					origin_attachment 	(662, 642)
-					terminal_attachment 	(662, 559))))
-			    (object AssociationViewNew "$UNNAMED$230" @1203
-				location   	(75, 188)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C25ECF0005E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$231" @1204
-					Parent_View 	@1203
-					location   	(-853, -308)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25ECF4001E"
-					client     	@1203
-					supplier   	@1184
-					vertices   	(list Points
-					    (75, 188)
-					    (75, 128)
-					    (510, 128)
-					    (510, 273))
-					line_style 	3
-					origin_attachment 	(75, 188)
-					terminal_attachment 	(510, 273))
-				    (object RoleView "rootVersion" @1205
-					Parent_View 	@1203
-					location   	(-853, -308)
-					label      	(object SegLabel @1206
-					    Parent_View 	@1205
-					    location   	(176, 74)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+rootVersion"
-					    pctDist    	-0.593750
-					    height     	101
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25ECF40028"
-					client     	@1203
-					supplier   	@1184
-					vertices   	(list Points
-					    (75, 188)
-					    (75, 380)
-					    (437, 380))
-					line_style 	3
-					origin_attachment 	(75, 188)
-					terminal_attachment 	(437, 380)
-					label      	(object SegLabel @1207
-					    Parent_View 	@1205
-					    location   	(368, 328)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.874755
-					    height     	53
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$232" @1208
-				location   	(1262, 134)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C25ED0B011B"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$233" @1209
-					Parent_View 	@1208
-					location   	(334, -362)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25ED0F0121"
-					client     	@1208
-					supplier   	@1184
-					vertices   	(list Points
-					    (1262, 134)
-					    (766, 134)
-					    (766, 273))
-					line_style 	3
-					origin_attachment 	(1262, 134)
-					terminal_attachment 	(766, 273))
-				    (object RoleView "originalVersion" @1210
-					Parent_View 	@1208
-					location   	(334, -362)
-					label      	(object SegLabel @1211
-					    Parent_View 	@1210
-					    location   	(1164, 97)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	288
-					    justify    	0
-					    label      	"+originalVersion"
-					    pctDist    	-1.650000
-					    height     	38
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25ED0F012B"
-					client     	@1208
-					supplier   	@1184
-					vertices   	(list Points
-					    (1262, 134)
-					    (1322, 134)
-					    (1322, 334)
-					    (843, 334))
-					line_style 	3
-					origin_attachment 	(1262, 134)
-					terminal_attachment 	(843, 334)
-					label      	(object SegLabel @1212
-					    Parent_View 	@1210
-					    location   	(919, 279)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.898108
-					    height     	56
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$234" @1213
-				location   	(126, 656)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C25EEAB001F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$235" @1214
-					Parent_View 	@1213
-					location   	(-834, 160)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25EEAF010B"
-					client     	@1213
-					supplier   	@1184
-					vertices   	(list Points
-					    (126, 656)
-					    (513, 656)
-					    (513, 559))
-					line_style 	3
-					origin_attachment 	(126, 656)
-					terminal_attachment 	(513, 559))
-				    (object RoleView "incorporatedVersions" @1215
-					Parent_View 	@1213
-					location   	(-834, 160)
-					label      	(object SegLabel @1216
-					    Parent_View 	@1215
-					    location   	(217, 431)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	408
-					    justify    	0
-					    label      	"+incorporatedVersions"
-					    pctDist    	0.643902
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25EEAF0115"
-					client     	@1213
-					supplier   	@1184
-					vertices   	(list Points
-					    (126, 656)
-					    (66, 656)
-					    (66, 472)
-					    (437, 472))
-					line_style 	3
-					origin_attachment 	(126, 656)
-					terminal_attachment 	(437, 472)
-					label      	(object SegLabel @1217
-					    Parent_View 	@1215
-					    location   	(356, 526)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.868468
-					    height     	54
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$238" @1218
-				location   	(642, 126)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C2784730194"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$239" @1219
-					Parent_View 	@1218
-					location   	(82, -418)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C27847501F1"
-					client     	@1218
-					supplier   	@1184
-					vertices   	(list Points
-					    (642, 126)
-					    (588, 126)
-					    (588, 273))
-					line_style 	3
-					origin_attachment 	(642, 126)
-					terminal_attachment 	(588, 273))
-				    (object RoleView "schemaForSchema" @1220
-					Parent_View 	@1218
-					location   	(82, -418)
-					label      	(object SegLabel @1221
-					    Parent_View 	@1220
-					    location   	(639, 74)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	384
-					    justify    	0
-					    label      	"+schemaForSchema"
-					    pctDist    	-0.055556
-					    height     	53
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C27847501FB"
-					client     	@1218
-					supplier   	@1184
-					vertices   	(list Points
-					    (642, 126)
-					    (697, 126)
-					    (697, 273))
-					line_style 	3
-					origin_attachment 	(642, 126)
-					terminal_attachment 	(697, 273)
-					label      	(object SegLabel @1222
-					    Parent_View 	@1220
-					    location   	(643, 213)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.701863
-					    height     	55
-					    orientation 	1))))
-			    (object InheritView "" @1223
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DB560092"
-				client     	@1182
-				supplier   	@1183
-				line_style 	3
-				origin_attachment 	(638, 937)
-				terminal_attachment 	(638, 843))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @1224
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 1184)
-				label      	(object ItemLabel
-				    Parent_View 	@1224
-				    location   	(67, 1141)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	474
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	492
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$78" @1225
-				location   	(234, 1340)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6B426B0194"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$79" @1226
-					Parent_View 	@1225
-					location   	(-310, -4)
-					label      	(object SegLabel @1227
-					    Parent_View 	@1226
-					    location   	(140, 1271)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B426D0309"
-					client     	@1225
-					supplier   	@1224
-					vertices   	(list Points
-					    (234, 1340)
-					    (181, 1340)
-					    (181, 1239))
-					line_style 	3
-					origin_attachment 	(234, 1340)
-					terminal_attachment 	(181, 1239))
-				    (object RoleView "resolvedAttributeDeclaration" @1228
-					Parent_View 	@1225
-					location   	(-310, -4)
-					label      	(object SegLabel @1229
-					    Parent_View 	@1228
-					    location   	(333, 1389)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	528
-					    justify    	0
-					    label      	"+resolvedAttributeDeclaration"
-					    pctDist    	1.867925
-					    height     	49
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B426D0313"
-					client     	@1225
-					supplier   	@1224
-					vertices   	(list Points
-					    (234, 1340)
-					    (287, 1340)
-					    (287, 1239))
-					line_style 	3
-					origin_attachment 	(234, 1340)
-					terminal_attachment 	(287, 1239)
-					label      	(object SegLabel @1230
-					    Parent_View 	@1228
-					    location   	(241, 1295)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.042945
-					    height     	46
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @1231
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1760, 144)
-				label      	(object ItemLabel
-				    Parent_View 	@1231
-				    location   	(1517, 101)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	486
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				width      	504
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDFacet" @1232
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1712, 416)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1232
-				    location   	(1599, 373)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	226
-				    justify    	0
-				    label      	"XSDFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C359403D2"
-				width      	244
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$312" @1233
-				location   	(1668, 280)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3D4BB4AE01CC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$313" @1234
-					Parent_View 	@1233
-					location   	(8, -152)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4BB4AF010F"
-					client     	@1233
-					supplier   	@1231
-					line_style 	3
-					origin_attachment 	(1668, 280)
-					terminal_attachment 	(1668, 199))
-				    (object RoleView "syntheticFacets" @1235
-					Parent_View 	@1233
-					location   	(8, -152)
-					label      	(object SegLabel @1236
-					    Parent_View 	@1235
-					    location   	(1852, 300)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	324
-					    justify    	0
-					    label      	"+syntheticFacets"
-					    pctDist    	0.246154
-					    height     	184
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4BB4AF011A"
-					client     	@1233
-					supplier   	@1232
-					line_style 	3
-					origin_attachment 	(1668, 280)
-					terminal_attachment 	(1668, 361)
-					label      	(object SegLabel @1237
-					    Parent_View 	@1235
-					    location   	(1625, 301)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.276923
-					    height     	44
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @1238
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1552, 944)
-				label      	(object ItemLabel
-				    Parent_View 	@1238
-				    location   	(1426, 901)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	252
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	270
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @1239
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1776, 640)
-				label      	(object ItemLabel
-				    Parent_View 	@1239
-				    location   	(1515, 597)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	522
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				width      	540
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$314" @1240
-				location   	(1508, 792)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3D4BB4D3028E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$315" @1241
-					Parent_View 	@1240
-					location   	(-12, -280)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4BB4D402F3"
-					client     	@1240
-					supplier   	@1239
-					line_style 	3
-					origin_attachment 	(1508, 792)
-					terminal_attachment 	(1508, 695))
-				    (object RoleView "syntheticParticle" @1242
-					Parent_View 	@1240
-					location   	(-12, -280)
-					label      	(object SegLabel @1243
-					    Parent_View 	@1242
-					    location   	(1695, 767)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+syntheticParticle"
-					    pctDist    	-0.259259
-					    height     	187
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4BB4D402FD"
-					client     	@1240
-					supplier   	@1238
-					line_style 	3
-					origin_attachment 	(1508, 792)
-					terminal_attachment 	(1508, 889)
-					label      	(object SegLabel @1244
-					    Parent_View 	@1242
-					    location   	(1454, 829)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.395062
-					    height     	55
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @1245
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1024, 1184)
-				label      	(object ItemLabel
-				    Parent_View 	@1245
-				    location   	(756, 1141)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	536
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	554
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$90" @1246
-				location   	(919, 1349)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6B425E01F9"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$91" @1247
-					Parent_View 	@1246
-					location   	(-233, -59)
-					label      	(object SegLabel @1248
-					    Parent_View 	@1247
-					    location   	(825, 1273)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B42620046"
-					client     	@1246
-					supplier   	@1245
-					vertices   	(list Points
-					    (919, 1349)
-					    (866, 1349)
-					    (866, 1239))
-					line_style 	3
-					origin_attachment 	(919, 1349)
-					terminal_attachment 	(866, 1239))
-				    (object RoleView "resolvedAttributeGroupDefinition" @1249
-					Parent_View 	@1246
-					location   	(-233, -59)
-					label      	(object SegLabel @1250
-					    Parent_View 	@1249
-					    location   	(993, 1393)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	600
-					    justify    	0
-					    label      	"+resolvedAttributeGroupDefinition"
-					    pctDist    	1.377358
-					    height     	44
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B42620050"
-					client     	@1246
-					supplier   	@1245
-					vertices   	(list Points
-					    (919, 1349)
-					    (973, 1349)
-					    (973, 1239))
-					line_style 	3
-					origin_attachment 	(919, 1349)
-					terminal_attachment 	(973, 1239)
-					label      	(object SegLabel @1251
-					    Parent_View 	@1249
-					    location   	(919, 1296)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.014925
-					    height     	54
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @1252
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1952, 944)
-				label      	(object ItemLabel
-				    Parent_View 	@1252
-				    location   	(1816, 901)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	272
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				width      	290
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$316" @1253
-				location   	(2025, 792)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3D4BB4D901F6"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$317" @1254
-					Parent_View 	@1253
-					location   	(153, -280)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4BB4DA0284"
-					client     	@1253
-					supplier   	@1239
-					line_style 	3
-					origin_attachment 	(2025, 792)
-					terminal_attachment 	(2025, 695))
-				    (object RoleView "syntheticWildcard" @1255
-					Parent_View 	@1253
-					location   	(153, -280)
-					label      	(object SegLabel @1256
-					    Parent_View 	@1255
-					    location   	(1826, 838)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+syntheticWildcard"
-					    pctDist    	0.488095
-					    height     	200
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4BB4DA028E"
-					client     	@1253
-					supplier   	@1252
-					line_style 	3
-					origin_attachment 	(2025, 792)
-					terminal_attachment 	(2025, 889)
-					label      	(object SegLabel @1257
-					    Parent_View 	@1255
-					    location   	(2098, 840)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.506173
-					    height     	73
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$318" @1258
-				location   	(1754, 1178)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3D4C68FF01BF"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$319" @1259
-					Parent_View 	@1258
-					location   	(-198, 234)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4C69020317"
-					client     	@1258
-					supplier   	@1245
-					line_style 	3
-					origin_attachment 	(1754, 1178)
-					terminal_attachment 	(1301, 1178))
-				    (object RoleView "syntheticWildcard" @1260
-					Parent_View 	@1258
-					location   	(-198, 234)
-					label      	(object SegLabel @1261
-					    Parent_View 	@1260
-					    location   	(1828, 1261)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+syntheticWildcard"
-					    pctDist    	0.163355
-					    height     	83
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4C69020318"
-					client     	@1258
-					supplier   	@1252
-					vertices   	(list Points
-					    (1754, 1178)
-					    (2028, 1178)
-					    (2028, 999))
-					line_style 	3
-					origin_attachment 	(1754, 1178)
-					terminal_attachment 	(2028, 999)
-					label      	(object SegLabel @1262
-					    Parent_View 	@1260
-					    location   	(2082, 1098)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.783664
-					    height     	54
-					    orientation 	1))))))
-		    (object ClassDiagram "10. Diagnostics"
-			quid       	"3BFE5F0803E2"
-			title      	"10. Diagnostics"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::DOMNode" @1263
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(400, 1024)
-				label      	(object ItemLabel
-				    Parent_View 	@1263
-				    location   	(66, 990)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	668
-				    justify    	0
-				    label      	"DOMNode")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@1263
-				    location   	(66, 940)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	668
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	14671839
-				quidu      	"3BFE64A50117"
-				width      	686
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDDiagnosticSeverity" @1264
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1040, 656)
-				label      	(object ItemLabel
-				    Parent_View 	@1264
-				    location   	(818, 547)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	444
-				    justify    	0
-				    label      	"XSDDiagnosticSeverity")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@1264
-				    location   	(818, 497)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	444
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3BFE68A7032F"
-				width      	462
-				height     	342
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @1265
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(192, 112)
-				label      	(object ItemLabel
-				    Parent_View 	@1265
-				    location   	(59, 60)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	266
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	284
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDConcreteComponent" @1266
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(896, 112)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1266
-				    location   	(540, 62)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	713
-				    justify    	0
-				    label      	"XSDConcreteComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD7B40065"
-				width      	731
-				height     	125
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDDiagnostic" @1267
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(384, 608)
-				label      	(object ItemLabel
-				    Parent_View 	@1267
-				    location   	(64, 402)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	640
-				    justify    	0
-				    label      	"XSDDiagnostic")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3BFE5F910046"
-				width      	658
-				height     	436
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$220" @1268
-				location   	(144, 283)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BFE6431035F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$221" @1269
-					Parent_View 	@1268
-					location   	(-1088, -661)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFE643201C6"
-					client     	@1268
-					supplier   	@1265
-					line_style 	3
-					origin_attachment 	(144, 283)
-					terminal_attachment 	(144, 176))
-				    (object RoleView "allDiagnostics" @1270
-					Parent_View 	@1268
-					location   	(-1088, -661)
-					label      	(object SegLabel @1271
-					    Parent_View 	@1270
-					    location   	(309, 330)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+allDiagnostics"
-					    pctDist    	0.448598
-					    height     	165
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFE643201C7"
-					client     	@1268
-					supplier   	@1267
-					line_style 	3
-					origin_attachment 	(144, 283)
-					terminal_attachment 	(144, 390)
-					label      	(object SegLabel @1272
-					    Parent_View 	@1270
-					    location   	(96, 327)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.420561
-					    height     	49
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$216" @1273
-				location   	(1028, 440)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BFE622703CD"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$217" @1274
-					Parent_View 	@1273
-					location   	(-396, -72)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFE622B0061"
-					client     	@1273
-					supplier   	@1267
-					line_style 	3
-					origin_attachment 	(1028, 440)
-					terminal_attachment 	(713, 440))
-				    (object RoleView "components" @1275
-					Parent_View 	@1273
-					location   	(-396, -72)
-					label      	(object SegLabel @1276
-					    Parent_View 	@1275
-					    location   	(938, 230)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	252
-					    justify    	0
-					    label      	"+components"
-					    pctDist    	0.829181
-					    height     	151
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFE622B006C"
-					client     	@1273
-					supplier   	@1266
-					vertices   	(list Points
-					    (1028, 440)
-					    (1088, 440)
-					    (1088, 174))
-					line_style 	3
-					origin_attachment 	(1028, 440)
-					terminal_attachment 	(1088, 174)
-					label      	(object SegLabel @1277
-					    Parent_View 	@1275
-					    location   	(1143, 232)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"1..*"
-					    pctDist    	0.823848
-					    height     	55
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$218" @1278
-				location   	(688, 282)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BFE62690165"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$219" @1279
-					Parent_View 	@1278
-					location   	(160, -278)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFE626A0026"
-					client     	@1278
-					supplier   	@1266
-					line_style 	3
-					origin_attachment 	(688, 282)
-					terminal_attachment 	(688, 174))
-				    (object RoleView "diagnostics" @1280
-					Parent_View 	@1278
-					location   	(160, -278)
-					label      	(object SegLabel @1281
-					    Parent_View 	@1280
-					    location   	(822, 330)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+diagnostics"
-					    pctDist    	0.452632
-					    height     	134
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFE626A0027"
-					client     	@1278
-					supplier   	@1267
-					line_style 	3
-					origin_attachment 	(688, 282)
-					terminal_attachment 	(688, 390)
-					label      	(object SegLabel @1282
-					    Parent_View 	@1280
-					    location   	(645, 335)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.494737
-					    height     	44
-					    orientation 	1))))
-			    (object InheritView "" @1283
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3D4C0F4C01A1"
-				client     	@1267
-				supplier   	@1266
-				line_style 	3
-				origin_attachment 	(575, 390)
-				terminal_attachment 	(575, 174))))
-		    (object ClassDiagram "11. Supplemental"
-			quid       	"3C287E49019B"
-			title      	"11. Supplemental"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @1284
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(464, 816)
-				label      	(object ItemLabel
-				    Parent_View 	@1284
-				    location   	(47, 760)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	834
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	852
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @1285
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2112, 880)
-				label      	(object ItemLabel
-				    Parent_View 	@1285
-				    location   	(1731, 824)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	762
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	780
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDConcreteComponent" @1286
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(288, 112)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1286
-				    location   	(48, 60)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	480
-				    justify    	0
-				    label      	"XSDConcreteComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD7B40065"
-				width      	498
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDDiagnostic" @1287
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2384, 112)
-				label      	(object ItemLabel
-				    Parent_View 	@1287
-				    location   	(2236, 60)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"XSDDiagnostic")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3BFE5F910046"
-				width      	314
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$242" @1288
-				location   	(1382, 84)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C2882C50137"
-				roleview_list 	(list RoleViews
-				    (object RoleView "primaryComponent" @1289
-					Parent_View 	@1288
-					location   	(-250, -508)
-					label      	(object SegLabel @1290
-					    Parent_View 	@1289
-					    location   	(756, 116)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+primaryComponent"
-					    pctDist    	0.740828
-					    height     	32
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C2882C70113"
-					client     	@1288
-					supplier   	@1286
-					line_style 	3
-					origin_attachment 	(1382, 84)
-					terminal_attachment 	(537, 84)
-					label      	(object SegLabel @1291
-					    Parent_View 	@1289
-					    location   	(624, 55)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.897260
-					    height     	30
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$243" @1292
-					Parent_View 	@1288
-					location   	(-250, -508)
-					label      	(object SegLabel @1293
-					    Parent_View 	@1292
-					    location   	(2058, 126)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C2882C70112"
-					client     	@1288
-					supplier   	@1287
-					line_style 	3
-					origin_attachment 	(1382, 84)
-					terminal_attachment 	(2227, 84))))
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @1294
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2160, 688)
-				label      	(object ItemLabel
-				    Parent_View 	@1294
-				    location   	(1778, 607)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	764
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				compartment 	(object Compartment
-				    Parent_View 	@1294
-				    location   	(1778, 667)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	764
-				    compartmentItems 	(list Compartment
-					"+ elementDeclarationReference : boolean"
-					"+ circular : boolean"))
-				width      	782
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDFacet" @1295
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2320, 1072)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1295
-				    location   	(2100, 991)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	440
-				    justify    	0
-				    label      	"XSDFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C359403D2"
-				compartment 	(object Compartment
-				    Parent_View 	@1295
-				    location   	(2100, 1051)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	459
-				    compartmentItems 	(list Compartment
-					"+ facetName : String"
-					"+ effectiveValue : Value"))
-				width      	458
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @1296
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(448, 624)
-				label      	(object ItemLabel
-				    Parent_View 	@1296
-				    location   	(47, 568)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	802
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				compartment 	(object Compartment
-				    Parent_View 	@1296
-				    location   	(47, 628)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	1
-				    max_width  	805
-				    compartmentItems 	(list Compartment
-					"+ modelGroupDefinitionReference : boolean"))
-				width      	820
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDNamedComponent" @1297
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1232, 288)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1297
-				    location   	(1005, 157)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	454
-				    justify    	0
-				    label      	"XSDNamedComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846D303A4"
-				compartment 	(object Compartment
-				    Parent_View 	@1297
-				    location   	(1005, 217)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	4
-				    max_width  	392
-				    compartmentItems 	(list Compartment
-					"+ aliasName : String"
-					"+ uRI : String"
-					"+ aliasURI : String"
-					"+ qName : String"))
-				width      	472
-				height     	286
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefinableComponent" @1298
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(320, 352)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1298
-				    location   	(48, 296)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	544
-				    justify    	0
-				    label      	"XSDRedefinableComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B7FCA8B020B"
-				width      	562
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @1299
-				location   	(320, 510)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1298
-				vertices   	(list Points
-				    (320, 510)
-				    (320, 420)))
-			    (object InheritView "" @1300
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAC40090"
-				client     	@1296
-				supplier   	@1298
-				line_style 	3
-				origin_attachment 	(81, 556)
-				terminal_attachment 	(81, 510)
-				drawSupplier 	@1299)
-			    (object InheritView "" @1301
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAC800D2"
-				client     	@1284
-				supplier   	@1298
-				line_style 	3
-				origin_attachment 	(877, 748)
-				terminal_attachment 	(877, 510)
-				drawSupplier 	@1299)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxInclusiveFacet" @1302
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2320, 1808)
-				label      	(object ItemLabel
-				    Parent_View 	@1302
-				    location   	(2101, 1761)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	438
-				    justify    	0
-				    label      	"XSDMaxInclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C787D00DA"
-				width      	456
-				height     	119
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinInclusiveFacet" @1303
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(272, 1776)
-				label      	(object ItemLabel
-				    Parent_View 	@1303
-				    location   	(35, 1729)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	475
-				    justify    	0
-				    label      	"XSDMinInclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C788702C9"
-				width      	493
-				height     	119
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinExclusiveFacet" @1304
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(272, 1936)
-				label      	(object ItemLabel
-				    Parent_View 	@1304
-				    location   	(35, 1889)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	475
-				    justify    	0
-				    label      	"XSDMinExclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C792D000A"
-				width      	493
-				height     	118
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxExclusiveFacet" @1305
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2304, 1968)
-				label      	(object ItemLabel
-				    Parent_View 	@1305
-				    location   	(2073, 1917)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	462
-				    justify    	0
-				    label      	"XSDMaxExclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C789600C2"
-				width      	480
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDCardinalityFacet" @1306
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2336, 1424)
-				label      	(object ItemLabel
-				    Parent_View 	@1306
-				    location   	(2134, 1372)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	404
-				    justify    	0
-				    label      	"XSDCardinalityFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C755D03D2"
-				width      	422
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDBoundedFacet" @1307
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2352, 1264)
-				label      	(object ItemLabel
-				    Parent_View 	@1307
-				    location   	(2163, 1212)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	378
-				    justify    	0
-				    label      	"XSDBoundedFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C751D0344"
-				width      	396
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDOrderedFacet" @1308
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(224, 1392)
-				label      	(object ItemLabel
-				    Parent_View 	@1308
-				    location   	(43, 1340)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	362
-				    justify    	0
-				    label      	"XSDOrderedFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C74DD0248"
-				width      	380
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDNumericFacet" @1309
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 1232)
-				label      	(object ItemLabel
-				    Parent_View 	@1309
-				    location   	(49, 1178)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	382
-				    justify    	0
-				    label      	"XSDNumericFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C75950206"
-				width      	400
-				height     	132
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxFacet" @1310
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2336, 1616)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1310
-				    location   	(2135, 1535)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	402
-				    justify    	0
-				    label      	"XSDMaxFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C0A1CEB010E"
-				compartment 	(object Compartment
-				    Parent_View 	@1310
-				    location   	(2135, 1595)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	405
-				    compartmentItems 	(list Compartment
-					"+ inclusive : boolean"
-					"+ exclusive : boolean"))
-				width      	420
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDWhiteSpaceFacet" @1311
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2320, 2288)
-				label      	(object ItemLabel
-				    Parent_View 	@1311
-				    location   	(2102, 2236)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	436
-				    justify    	0
-				    label      	"XSDWhiteSpaceFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C784601B7"
-				width      	454
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDFractionDigitsFacet" @1312
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2304, 2624)
-				label      	(object ItemLabel
-				    Parent_View 	@1312
-				    location   	(2074, 2572)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	460
-				    justify    	0
-				    label      	"XSDFractionDigitsFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C79BE02EE"
-				width      	478
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDPatternFacet" @1313
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2368, 2128)
-				label      	(object ItemLabel
-				    Parent_View 	@1313
-				    location   	(2196, 2076)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	344
-				    justify    	0
-				    label      	"XSDPatternFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C6ADB026C"
-				width      	362
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDEnumerationFacet" @1314
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 2096)
-				label      	(object ItemLabel
-				    Parent_View 	@1314
-				    location   	(36, 2044)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	440
-				    justify    	0
-				    label      	"XSDEnumerationFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C6ACE0141"
-				width      	458
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDLengthFacet" @1315
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 2272)
-				label      	(object ItemLabel
-				    Parent_View 	@1315
-				    location   	(38, 2220)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	340
-				    justify    	0
-				    label      	"XSDLengthFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C776200E7"
-				width      	358
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinFacet" @1316
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 1584)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1316
-				    location   	(38, 1503)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	404
-				    justify    	0
-				    label      	"XSDMinFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C0A1CDE037C"
-				compartment 	(object Compartment
-				    Parent_View 	@1316
-				    location   	(38, 1563)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	405
-				    compartmentItems 	(list Compartment
-					"+ inclusive : boolean"
-					"+ exclusive : boolean"))
-				width      	422
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxLengthFacet" @1317
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2320, 2464)
-				label      	(object ItemLabel
-				    Parent_View 	@1317
-				    location   	(2111, 2412)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	418
-				    justify    	0
-				    label      	"XSDMaxLengthFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C77C70146"
-				width      	436
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinLengthFacet" @1318
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 2448)
-				label      	(object ItemLabel
-				    Parent_View 	@1318
-				    location   	(39, 2396)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	402
-				    justify    	0
-				    label      	"XSDMinLengthFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C778C0065"
-				width      	420
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDTotalDigitsFacet" @1319
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 2608)
-				label      	(object ItemLabel
-				    Parent_View 	@1319
-				    location   	(38, 2556)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	404
-				    justify    	0
-				    label      	"XSDTotalDigitsFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C79A0020E"
-				width      	422
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @1320
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(928, 1152)
-				label      	(object ItemLabel
-				    Parent_View 	@1320
-				    location   	(667, 1100)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	522
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				width      	540
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @1321
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(176, 1072)
-				label      	(object ItemLabel
-				    Parent_View 	@1321
-				    location   	(50, 1020)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	252
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	270
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @1322
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1232, 1360)
-				label      	(object ItemLabel
-				    Parent_View 	@1322
-				    location   	(944, 1304)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	576
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				compartment 	(object Compartment
-				    Parent_View 	@1322
-				    location   	(944, 1364)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	575
-				    compartmentItems 	(list Compartment
-					"<<0..*>> + validFacets : String"))
-				width      	594
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$254" @1323
-				location   	(1446, 1218)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28A994030A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "rootTypeDefinition" @1324
-					Parent_View 	@1323
-					location   	(582, -78)
-					label      	(object SegLabel @1325
-					    Parent_View 	@1324
-					    location   	(1580, 1173)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+rootTypeDefinition"
-					    pctDist    	3.268293
-					    height     	46
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A99700DD"
-					client     	@1323
-					supplier   	@1322
-					vertices   	(list Points
-					    (1446, 1218)
-					    (1487, 1218)
-					    (1487, 1292))
-					line_style 	3
-					origin_attachment 	(1446, 1218)
-					terminal_attachment 	(1487, 1292)
-					label      	(object SegLabel @1326
-					    Parent_View 	@1324
-					    location   	(1439, 1257)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.184211
-					    height     	39
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$255" @1327
-					Parent_View 	@1323
-					location   	(582, -78)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A99700E7"
-					client     	@1323
-					supplier   	@1322
-					vertices   	(list Points
-					    (1446, 1218)
-					    (1405, 1218)
-					    (1405, 1292))
-					line_style 	3
-					origin_attachment 	(1446, 1218)
-					terminal_attachment 	(1405, 1292))))
-			    (object AssociationViewNew "$UNNAMED$258" @1328
-				location   	(1733, 1575)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B08D0252"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$259" @1329
-					Parent_View 	@1328
-					location   	(917, 7)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B08E0091"
-					client     	@1328
-					supplier   	@1322
-					vertices   	(list Points
-					    (1733, 1575)
-					    (1487, 1575)
-					    (1487, 1428))
-					line_style 	3
-					origin_attachment 	(1733, 1575)
-					terminal_attachment 	(1487, 1428))
-				    (object RoleView "maxFacet" @1330
-					Parent_View 	@1328
-					location   	(917, 7)
-					label      	(object SegLabel @1331
-					    Parent_View 	@1330
-					    location   	(1751, 1541)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	204
-					    justify    	0
-					    label      	"+maxFacet"
-					    pctDist    	0.046243
-					    height     	35
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B08E009B"
-					client     	@1328
-					supplier   	@1310
-					line_style 	3
-					origin_attachment 	(1733, 1575)
-					terminal_attachment 	(2126, 1575)
-					label      	(object SegLabel @1332
-					    Parent_View 	@1330
-					    location   	(2042, 1536)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.789157
-					    height     	40
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$260" @1333
-				location   	(1587, 1793)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0AB0396"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$261" @1334
-					Parent_View 	@1333
-					location   	(707, -31)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0AC03C9"
-					client     	@1333
-					supplier   	@1322
-					vertices   	(list Points
-					    (1587, 1793)
-					    (1447, 1793)
-					    (1447, 1428))
-					line_style 	3
-					origin_attachment 	(1587, 1793)
-					terminal_attachment 	(1447, 1428))
-				    (object RoleView "maxInclusiveFacet" @1335
-					Parent_View 	@1333
-					location   	(707, -31)
-					label      	(object SegLabel @1336
-					    Parent_View 	@1335
-					    location   	(1737, 1751)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	360
-					    justify    	0
-					    label      	"+maxInclusiveFacet"
-					    pctDist    	0.298441
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0AC03D4"
-					client     	@1333
-					supplier   	@1302
-					line_style 	3
-					origin_attachment 	(1587, 1793)
-					terminal_attachment 	(2092, 1793)
-					label      	(object SegLabel @1337
-					    Parent_View 	@1335
-					    location   	(2020, 1754)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.859155
-					    height     	40
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$262" @1338
-				location   	(937, 1787)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0AF0338"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$263" @1339
-					Parent_View 	@1338
-					location   	(617, -5)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0B001F9"
-					client     	@1338
-					supplier   	@1322
-					vertices   	(list Points
-					    (937, 1787)
-					    (997, 1787)
-					    (997, 1428))
-					line_style 	3
-					origin_attachment 	(937, 1787)
-					terminal_attachment 	(997, 1428))
-				    (object RoleView "minInclusiveFacet" @1340
-					Parent_View 	@1338
-					location   	(617, -5)
-					label      	(object SegLabel @1341
-					    Parent_View 	@1340
-					    location   	(792, 1745)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+minInclusiveFacet"
-					    pctDist    	0.346062
-					    height     	43
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0B00203"
-					client     	@1338
-					supplier   	@1303
-					line_style 	3
-					origin_attachment 	(937, 1787)
-					terminal_attachment 	(518, 1787)
-					label      	(object SegLabel @1342
-					    Parent_View 	@1340
-					    location   	(575, 1743)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.863962
-					    height     	45
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$264" @1343
-				location   	(981, 1937)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0B30207"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$265" @1344
-					Parent_View 	@1343
-					location   	(677, -79)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0B40190"
-					client     	@1343
-					supplier   	@1322
-					vertices   	(list Points
-					    (981, 1937)
-					    (1041, 1937)
-					    (1041, 1428))
-					line_style 	3
-					origin_attachment 	(981, 1937)
-					terminal_attachment 	(1041, 1428))
-				    (object RoleView "minExclusiveFacet" @1345
-					Parent_View 	@1343
-					location   	(677, -79)
-					label      	(object SegLabel @1346
-					    Parent_View 	@1345
-					    location   	(823, 1900)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+minExclusiveFacet"
-					    pctDist    	0.341253
-					    height     	38
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0B4019A"
-					client     	@1343
-					supplier   	@1304
-					line_style 	3
-					origin_attachment 	(981, 1937)
-					terminal_attachment 	(518, 1937)
-					label      	(object SegLabel @1347
-					    Parent_View 	@1345
-					    location   	(589, 1897)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.846652
-					    height     	41
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$266" @1348
-				location   	(1469, 1953)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0B6028D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$267" @1349
-					Parent_View 	@1348
-					location   	(621, -95)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0B70217"
-					client     	@1348
-					supplier   	@1322
-					vertices   	(list Points
-					    (1469, 1953)
-					    (1400, 1953)
-					    (1400, 1428))
-					line_style 	3
-					origin_attachment 	(1469, 1953)
-					terminal_attachment 	(1400, 1428))
-				    (object RoleView "maxExclusiveFacet" @1350
-					Parent_View 	@1348
-					location   	(621, -95)
-					label      	(object SegLabel @1351
-					    Parent_View 	@1350
-					    location   	(1646, 1913)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	384
-					    justify    	0
-					    label      	"+maxExclusiveFacet"
-					    pctDist    	0.298097
-					    height     	41
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0B70221"
-					client     	@1348
-					supplier   	@1305
-					line_style 	3
-					origin_attachment 	(1469, 1953)
-					terminal_attachment 	(2064, 1953)
-					label      	(object SegLabel @1352
-					    Parent_View 	@1350
-					    location   	(1961, 1913)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.827236
-					    height     	41
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$268" @1353
-				location   	(1122, 2180)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0BC0051"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$269" @1354
-					Parent_View 	@1353
-					location   	(-318, 628)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0BC0246"
-					client     	@1353
-					supplier   	@1322
-					line_style 	3
-					origin_attachment 	(1122, 2180)
-					terminal_attachment 	(1122, 1428))
-				    (object RoleView "lengthFacet" @1355
-					Parent_View 	@1353
-					location   	(-318, 628)
-					label      	(object SegLabel @1356
-					    Parent_View 	@1355
-					    location   	(804, 2204)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+lengthFacet"
-					    pctDist    	0.475472
-					    height     	37
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0BC0250"
-					client     	@1353
-					supplier   	@1315
-					vertices   	(list Points
-					    (1122, 2180)
-					    (1122, 2240)
-					    (387, 2240))
-					line_style 	3
-					origin_attachment 	(1122, 2180)
-					terminal_attachment 	(387, 2240)
-					label      	(object SegLabel @1357
-					    Parent_View 	@1355
-					    location   	(471, 2204)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.895597
-					    height     	37
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$272" @1358
-				location   	(1084, 1989)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0C2021D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$273" @1359
-					Parent_View 	@1358
-					location   	(-1380, 437)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C300AB"
-					client     	@1358
-					supplier   	@1322
-					line_style 	3
-					origin_attachment 	(1084, 1989)
-					terminal_attachment 	(1084, 1428))
-				    (object RoleView "enumerationFacets" @1360
-					Parent_View 	@1358
-					location   	(-1380, 437)
-					label      	(object SegLabel @1361
-					    Parent_View 	@1360
-					    location   	(837, 2016)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+enumerationFacets"
-					    pctDist    	0.465857
-					    height     	34
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C300AC"
-					client     	@1358
-					supplier   	@1314
-					vertices   	(list Points
-					    (1084, 1989)
-					    (1084, 2049)
-					    (485, 2049))
-					line_style 	3
-					origin_attachment 	(1084, 1989)
-					terminal_attachment 	(485, 2049)
-					label      	(object SegLabel @1362
-					    Parent_View 	@1360
-					    location   	(583, 2021)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.851290
-					    height     	29
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$274" @1363
-				location   	(1451, 2074)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0C50159"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$275" @1364
-					Parent_View 	@1363
-					location   	(-1525, 538)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C600B0"
-					client     	@1363
-					supplier   	@1322
-					vertices   	(list Points
-					    (1451, 2074)
-					    (1362, 2074)
-					    (1362, 1428))
-					line_style 	3
-					origin_attachment 	(1451, 2074)
-					terminal_attachment 	(1362, 1428))
-				    (object RoleView "patternFacets" @1365
-					Parent_View 	@1363
-					location   	(-1525, 538)
-					label      	(object SegLabel @1366
-					    Parent_View 	@1365
-					    location   	(1720, 2038)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+patternFacets"
-					    pctDist    	0.367223
-					    height     	37
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C600BA"
-					client     	@1363
-					supplier   	@1313
-					line_style 	3
-					origin_attachment 	(1451, 2074)
-					terminal_attachment 	(2187, 2074)
-					label      	(object SegLabel @1367
-					    Parent_View 	@1365
-					    location   	(1972, 2035)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.708649
-					    height     	40
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$276" @1368
-				location   	(1827, 1400)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0C802A7"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$277" @1369
-					Parent_View 	@1368
-					location   	(-1149, -472)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C901EA"
-					client     	@1368
-					supplier   	@1322
-					line_style 	3
-					origin_attachment 	(1827, 1400)
-					terminal_attachment 	(1529, 1400))
-				    (object RoleView "cardinalityFacet" @1370
-					Parent_View 	@1368
-					location   	(-1149, -472)
-					label      	(object SegLabel @1371
-					    Parent_View 	@1370
-					    location   	(1847, 1358)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	312
-					    justify    	0
-					    label      	"+cardinalityFacet"
-					    pctDist    	0.071730
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C901F5"
-					client     	@1368
-					supplier   	@1306
-					line_style 	3
-					origin_attachment 	(1827, 1400)
-					terminal_attachment 	(2125, 1400)
-					label      	(object SegLabel @1372
-					    Parent_View 	@1370
-					    location   	(2083, 1357)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.863426
-					    height     	44
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$286" @1373
-				location   	(1262, 2413)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0DB0377"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$287" @1374
-					Parent_View 	@1373
-					location   	(-786, 301)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0DC035A"
-					client     	@1373
-					supplier   	@1322
-					line_style 	3
-					origin_attachment 	(1262, 2413)
-					terminal_attachment 	(1262, 1428))
-				    (object RoleView "fractionDigitsFacet" @1375
-					Parent_View 	@1373
-					location   	(-786, 301)
-					label      	(object SegLabel @1376
-					    Parent_View 	@1375
-					    location   	(1608, 2556)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	360
-					    justify    	0
-					    label      	"+fractionDigitsFacet"
-					    pctDist    	0.537393
-					    height     	41
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0DC0364"
-					client     	@1373
-					supplier   	@1312
-					vertices   	(list Points
-					    (1262, 2413)
-					    (1262, 2596)
-					    (2065, 2596))
-					line_style 	3
-					origin_attachment 	(1262, 2413)
-					terminal_attachment 	(2065, 2596)
-					label      	(object SegLabel @1377
-					    Parent_View 	@1375
-					    location   	(1979, 2556)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.913886
-					    height     	41
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$290" @1378
-				location   	(1841, 1306)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0E300D9"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$291" @1379
-					Parent_View 	@1378
-					location   	(-1135, -790)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0E4038E"
-					client     	@1378
-					supplier   	@1322
-					line_style 	3
-					origin_attachment 	(1841, 1306)
-					terminal_attachment 	(1529, 1306))
-				    (object RoleView "boundedFacet" @1380
-					Parent_View 	@1378
-					location   	(-1135, -790)
-					label      	(object SegLabel @1381
-					    Parent_View 	@1380
-					    location   	(1832, 1270)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	288
-					    justify    	0
-					    label      	"+boundedFacet"
-					    pctDist    	-0.031746
-					    height     	37
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0E40398"
-					client     	@1378
-					supplier   	@1307
-					line_style 	3
-					origin_attachment 	(1841, 1306)
-					terminal_attachment 	(2154, 1306)
-					label      	(object SegLabel @1382
-					    Parent_View 	@1380
-					    location   	(2077, 1275)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.754717
-					    height     	32
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$270" @1383
-				location   	(1328, 2186)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0BF018C"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$271" @1384
-					Parent_View 	@1383
-					location   	(-640, 634)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C0006B"
-					client     	@1383
-					supplier   	@1322
-					line_style 	3
-					origin_attachment 	(1328, 2186)
-					terminal_attachment 	(1328, 1428))
-				    (object RoleView "whiteSpaceFacet" @1385
-					Parent_View 	@1383
-					location   	(-640, 634)
-					label      	(object SegLabel @1386
-					    Parent_View 	@1385
-					    location   	(1673, 2207)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+whiteSpaceFacet"
-					    pctDist    	0.490909
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C00075"
-					client     	@1383
-					supplier   	@1311
-					vertices   	(list Points
-					    (1328, 2186)
-					    (1328, 2246)
-					    (2093, 2246))
-					line_style 	3
-					origin_attachment 	(1328, 2186)
-					terminal_attachment 	(2093, 2246)
-					label      	(object SegLabel @1387
-					    Parent_View 	@1385
-					    location   	(2033, 2203)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.926763
-					    height     	44
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$288" @1388
-				location   	(674, 1390)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0DF0048"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$289" @1389
-					Parent_View 	@1388
-					location   	(-1854, -706)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0DF03B9"
-					client     	@1388
-					supplier   	@1322
-					line_style 	3
-					origin_attachment 	(674, 1390)
-					terminal_attachment 	(935, 1390))
-				    (object RoleView "orderedFacet" @1390
-					Parent_View 	@1388
-					location   	(-1854, -706)
-					label      	(object SegLabel @1391
-					    Parent_View 	@1390
-					    location   	(658, 1353)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	264
-					    justify    	0
-					    label      	"+orderedFacet"
-					    pctDist    	0.061538
-					    height     	38
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0DF03C3"
-					client     	@1388
-					supplier   	@1308
-					line_style 	3
-					origin_attachment 	(674, 1390)
-					terminal_attachment 	(414, 1390)
-					label      	(object SegLabel @1392
-					    Parent_View 	@1390
-					    location   	(510, 1355)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.634615
-					    height     	36
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$278" @1393
-				location   	(687, 1296)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0CB039C"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$279" @1394
-					Parent_View 	@1393
-					location   	(-1809, -576)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0CC03D0"
-					client     	@1393
-					supplier   	@1322
-					line_style 	3
-					origin_attachment 	(687, 1296)
-					terminal_attachment 	(935, 1296))
-				    (object RoleView "numericFacet" @1395
-					Parent_View 	@1393
-					location   	(-1809, -576)
-					label      	(object SegLabel @1396
-					    Parent_View 	@1395
-					    location   	(668, 1257)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+numericFacet"
-					    pctDist    	0.080972
-					    height     	40
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0CC03D1"
-					client     	@1393
-					supplier   	@1309
-					line_style 	3
-					origin_attachment 	(687, 1296)
-					terminal_attachment 	(440, 1296)
-					label      	(object SegLabel @1397
-					    Parent_View 	@1395
-					    location   	(506, 1260)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.736842
-					    height     	37
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$292" @1398
-				location   	(1689, 1662)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B44401EC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$293" @1399
-					Parent_View 	@1398
-					location   	(-183, -354)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B4450360"
-					client     	@1398
-					supplier   	@1322
-					vertices   	(list Points
-					    (1689, 1662)
-					    (1487, 1662)
-					    (1487, 1428))
-					line_style 	3
-					origin_attachment 	(1689, 1662)
-					terminal_attachment 	(1487, 1428))
-				    (object RoleView "effectiveMaxFacet" @1400
-					Parent_View 	@1398
-					location   	(-183, -354)
-					label      	(object SegLabel @1401
-					    Parent_View 	@1400
-					    location   	(1769, 1623)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+effectiveMaxFacet"
-					    pctDist    	0.182051
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B445036A"
-					client     	@1398
-					supplier   	@1310
-					line_style 	3
-					origin_attachment 	(1689, 1662)
-					terminal_attachment 	(2126, 1662)
-					label      	(object SegLabel @1402
-					    Parent_View 	@1400
-					    location   	(2044, 1627)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.815385
-					    height     	36
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$294" @1403
-				location   	(1328, 2258)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B54F0145"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$295" @1404
-					Parent_View 	@1403
-					location   	(-1072, -462)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B550038C"
-					client     	@1403
-					supplier   	@1322
-					line_style 	3
-					origin_attachment 	(1328, 2258)
-					terminal_attachment 	(1328, 1428))
-				    (object RoleView "effectiveWhiteSpaceFacet" @1405
-					Parent_View 	@1403
-					location   	(-1072, -462)
-					label      	(object SegLabel @1406
-					    Parent_View 	@1405
-					    location   	(1685, 2288)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	492
-					    justify    	0
-					    label      	"+effectiveWhiteSpaceFacet"
-					    pctDist    	0.508541
-					    height     	37
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B5500396"
-					client     	@1403
-					supplier   	@1311
-					vertices   	(list Points
-					    (1328, 2258)
-					    (1328, 2324)
-					    (2093, 2324))
-					line_style 	3
-					origin_attachment 	(1328, 2258)
-					terminal_attachment 	(2093, 2324)
-					label      	(object SegLabel @1407
-					    Parent_View 	@1405
-					    location   	(2009, 2293)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.898817
-					    height     	32
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$296" @1408
-				location   	(1297, 2366)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B5C4011C"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$297" @1409
-					Parent_View 	@1408
-					location   	(-607, -722)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B5C5020D"
-					client     	@1408
-					supplier   	@1322
-					line_style 	3
-					origin_attachment 	(1297, 2366)
-					terminal_attachment 	(1297, 1428))
-				    (object RoleView "effectiveMaxLengthFacet" @1410
-					Parent_View 	@1408
-					location   	(-607, -722)
-					label      	(object SegLabel @1411
-					    Parent_View 	@1410
-					    location   	(1657, 2463)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	480
-					    justify    	0
-					    label      	"+effectiveMaxLengthFacet"
-					    pctDist    	0.526906
-					    height     	37
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B5C50217"
-					client     	@1408
-					supplier   	@1317
-					vertices   	(list Points
-					    (1297, 2366)
-					    (1297, 2499)
-					    (2102, 2499))
-					line_style 	3
-					origin_attachment 	(1297, 2366)
-					terminal_attachment 	(2102, 2499)
-					label      	(object SegLabel @1412
-					    Parent_View 	@1410
-					    location   	(2007, 2471)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.899308
-					    height     	29
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$298" @1413
-				location   	(1262, 2449)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B62A00AA"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$299" @1414
-					Parent_View 	@1413
-					location   	(-1170, -815)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B62B0138"
-					client     	@1413
-					supplier   	@1322
-					line_style 	3
-					origin_attachment 	(1262, 2449)
-					terminal_attachment 	(1262, 1428))
-				    (object RoleView "effectiveFractionDigitsFacet" @1415
-					Parent_View 	@1413
-					location   	(-1170, -815)
-					label      	(object SegLabel @1416
-					    Parent_View 	@1415
-					    location   	(1640, 2634)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	528
-					    justify    	0
-					    label      	"+effectiveFractionDigitsFacet"
-					    pctDist    	0.585315
-					    height     	35
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B62B0142"
-					client     	@1413
-					supplier   	@1312
-					vertices   	(list Points
-					    (1262, 2449)
-					    (1262, 2668)
-					    (2065, 2668))
-					line_style 	3
-					origin_attachment 	(1262, 2449)
-					terminal_attachment 	(2065, 2668)
-					label      	(object SegLabel @1417
-					    Parent_View 	@1415
-					    location   	(1989, 2629)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.926485
-					    height     	40
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$300" @1418
-				location   	(1422, 2159)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B6B003A6"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$301" @1419
-					Parent_View 	@1418
-					location   	(-770, -1313)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B6B10311"
-					client     	@1418
-					supplier   	@1322
-					vertices   	(list Points
-					    (1422, 2159)
-					    (1362, 2159)
-					    (1362, 1428))
-					line_style 	3
-					origin_attachment 	(1422, 2159)
-					terminal_attachment 	(1362, 1428))
-				    (object RoleView "effectivePatternFacet" @1420
-					Parent_View 	@1418
-					location   	(-770, -1313)
-					label      	(object SegLabel @1421
-					    Parent_View 	@1420
-					    location   	(1727, 2125)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	408
-					    justify    	0
-					    label      	"+effectivePatternFacet"
-					    pctDist    	0.399090
-					    height     	35
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B6B10312"
-					client     	@1418
-					supplier   	@1313
-					line_style 	3
-					origin_attachment 	(1422, 2159)
-					terminal_attachment 	(2187, 2159)
-					label      	(object SegLabel @1422
-					    Parent_View 	@1420
-					    location   	(2102, 2119)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.889226
-					    height     	41
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$302" @1423
-				location   	(1084, 2083)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B7CA026B"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$303" @1424
-					Parent_View 	@1423
-					location   	(828, -1373)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B7CB0186"
-					client     	@1423
-					supplier   	@1322
-					line_style 	3
-					origin_attachment 	(1084, 2083)
-					terminal_attachment 	(1084, 1428))
-				    (object RoleView "effectiveEnumerationFacet" @1425
-					Parent_View 	@1423
-					location   	(828, -1373)
-					label      	(object SegLabel @1426
-					    Parent_View 	@1425
-					    location   	(822, 2101)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	504
-					    justify    	0
-					    label      	"+effectiveEnumerationFacet"
-					    pctDist    	0.488619
-					    height     	43
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B7CB0190"
-					client     	@1423
-					supplier   	@1314
-					vertices   	(list Points
-					    (1084, 2083)
-					    (1084, 2143)
-					    (485, 2143))
-					line_style 	3
-					origin_attachment 	(1084, 2083)
-					terminal_attachment 	(485, 2143)
-					label      	(object SegLabel @1427
-					    Parent_View 	@1425
-					    location   	(531, 2100)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.931715
-					    height     	44
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$308" @1428
-				location   	(1122, 2241)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B8DC0052"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$309" @1429
-					Parent_View 	@1428
-					location   	(866, -479)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B8DC03B9"
-					client     	@1428
-					supplier   	@1322
-					line_style 	3
-					origin_attachment 	(1122, 2241)
-					terminal_attachment 	(1122, 1428))
-				    (object RoleView "effectiveLengthFacet" @1430
-					Parent_View 	@1428
-					location   	(866, -479)
-					label      	(object SegLabel @1431
-					    Parent_View 	@1430
-					    location   	(800, 2279)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+effectiveLengthFacet"
-					    pctDist    	0.491731
-					    height     	40
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B8DC03C3"
-					client     	@1428
-					supplier   	@1315
-					vertices   	(list Points
-					    (1122, 2241)
-					    (1122, 2318)
-					    (387, 2318))
-					line_style 	3
-					origin_attachment 	(1122, 2241)
-					terminal_attachment 	(387, 2318)
-					label      	(object SegLabel @1432
-					    Parent_View 	@1430
-					    location   	(470, 2279)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.898567
-					    height     	40
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$256" @1433
-				location   	(773, 1565)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B085025B"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$257" @1434
-					Parent_View 	@1433
-					location   	(469, 13)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0860270"
-					client     	@1433
-					supplier   	@1322
-					vertices   	(list Points
-					    (773, 1565)
-					    (959, 1565)
-					    (959, 1428))
-					line_style 	3
-					origin_attachment 	(773, 1565)
-					terminal_attachment 	(959, 1428))
-				    (object RoleView "minFacet" @1435
-					Parent_View 	@1433
-					location   	(469, 13)
-					label      	(object SegLabel @1436
-					    Parent_View 	@1435
-					    location   	(753, 1532)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	192
-					    justify    	0
-					    label      	"+minFacet"
-					    pctDist    	0.063091
-					    height     	34
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B086027A"
-					client     	@1433
-					supplier   	@1316
-					line_style 	3
-					origin_attachment 	(773, 1565)
-					terminal_attachment 	(451, 1565)
-					label      	(object SegLabel @1437
-					    Parent_View 	@1435
-					    location   	(534, 1523)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.746667
-					    height     	43
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$310" @1438
-				location   	(816, 1650)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B97001DB"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$311" @1439
-					Parent_View 	@1438
-					location   	(496, -334)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B97100CF"
-					client     	@1438
-					supplier   	@1322
-					vertices   	(list Points
-					    (816, 1650)
-					    (959, 1650)
-					    (959, 1428))
-					line_style 	3
-					origin_attachment 	(816, 1650)
-					terminal_attachment 	(959, 1428))
-				    (object RoleView "effectiveMinFacet" @1440
-					Parent_View 	@1438
-					location   	(496, -334)
-					label      	(object SegLabel @1441
-					    Parent_View 	@1440
-					    location   	(764, 1614)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+effectiveMinFacet"
-					    pctDist    	0.141618
-					    height     	37
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B97100D9"
-					client     	@1438
-					supplier   	@1316
-					line_style 	3
-					origin_attachment 	(816, 1650)
-					terminal_attachment 	(451, 1650)
-					label      	(object SegLabel @1442
-					    Parent_View 	@1440
-					    location   	(523, 1606)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.802740
-					    height     	44
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$280" @1443
-				location   	(1297, 2321)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0CF0199"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$281" @1444
-					Parent_View 	@1443
-					location   	(-719, 497)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0D20085"
-					client     	@1443
-					supplier   	@1322
-					line_style 	3
-					origin_attachment 	(1297, 2321)
-					terminal_attachment 	(1297, 1428))
-				    (object RoleView "maxLengthFacet" @1445
-					Parent_View 	@1443
-					location   	(-719, 497)
-					label      	(object SegLabel @1446
-					    Parent_View 	@1445
-					    location   	(1630, 2380)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+maxLengthFacet"
-					    pctDist    	0.472255
-					    height     	30
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0D2008F"
-					client     	@1443
-					supplier   	@1317
-					vertices   	(list Points
-					    (1297, 2321)
-					    (1297, 2409)
-					    (2102, 2409))
-					line_style 	3
-					origin_attachment 	(1297, 2321)
-					terminal_attachment 	(2102, 2409)
-					label      	(object SegLabel @1447
-					    Parent_View 	@1445
-					    location   	(1994, 2366)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.879208
-					    height     	44
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$282" @1448
-				location   	(1159, 2273)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0D500C5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$283" @1449
-					Parent_View 	@1448
-					location   	(-281, 449)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0D6001D"
-					client     	@1448
-					supplier   	@1322
-					line_style 	3
-					origin_attachment 	(1159, 2273)
-					terminal_attachment 	(1159, 1428))
-				    (object RoleView "minLengthFacet" @1450
-					Parent_View 	@1448
-					location   	(-281, 449)
-					label      	(object SegLabel @1451
-					    Parent_View 	@1450
-					    location   	(857, 2372)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	324
-					    justify    	0
-					    label      	"+minLengthFacet"
-					    pctDist    	0.519527
-					    height     	38
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0D60027"
-					client     	@1448
-					supplier   	@1318
-					vertices   	(list Points
-					    (1159, 2273)
-					    (1159, 2409)
-					    (450, 2409))
-					line_style 	3
-					origin_attachment 	(1159, 2273)
-					terminal_attachment 	(450, 2409)
-					label      	(object SegLabel @1452
-					    Parent_View 	@1450
-					    location   	(523, 2369)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.913610
-					    height     	41
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$306" @1453
-				location   	(1197, 2334)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B898016D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$307" @1454
-					Parent_View 	@1453
-					location   	(941, -610)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B8990056"
-					client     	@1453
-					supplier   	@1322
-					line_style 	3
-					origin_attachment 	(1197, 2334)
-					terminal_attachment 	(1197, 1428))
-				    (object RoleView "effectiveMinLengthFacet" @1455
-					Parent_View 	@1453
-					location   	(941, -610)
-					label      	(object SegLabel @1456
-					    Parent_View 	@1455
-					    location   	(856, 2454)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	468
-					    justify    	0
-					    label      	"+effectiveMinLengthFacet"
-					    pctDist    	0.552604
-					    height     	40
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B8990060"
-					client     	@1453
-					supplier   	@1318
-					vertices   	(list Points
-					    (1197, 2334)
-					    (1197, 2493)
-					    (450, 2493))
-					line_style 	3
-					origin_attachment 	(1197, 2334)
-					terminal_attachment 	(450, 2493)
-					label      	(object SegLabel @1457
-					    Parent_View 	@1455
-					    location   	(527, 2451)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.916047
-					    height     	43
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$304" @1458
-				location   	(1231, 2438)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B8400062"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$305" @1459
-					Parent_View 	@1458
-					location   	(863, -746)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B841001D"
-					client     	@1458
-					supplier   	@1322
-					line_style 	3
-					origin_attachment 	(1231, 2438)
-					terminal_attachment 	(1231, 1428))
-				    (object RoleView "effectiveTotalDigitsFacet" @1460
-					Parent_View 	@1458
-					location   	(863, -746)
-					label      	(object SegLabel @1461
-					    Parent_View 	@1460
-					    location   	(859, 2632)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	468
-					    justify    	0
-					    label      	"+effectiveTotalDigitsFacet"
-					    pctDist    	0.597030
-					    height     	37
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B8410027"
-					client     	@1458
-					supplier   	@1319
-					vertices   	(list Points
-					    (1231, 2438)
-					    (1231, 2668)
-					    (451, 2668))
-					line_style 	3
-					origin_attachment 	(1231, 2438)
-					terminal_attachment 	(451, 2668)
-					label      	(object SegLabel @1462
-					    Parent_View 	@1460
-					    location   	(534, 2631)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.918812
-					    height     	38
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$284" @1463
-				location   	(1231, 2397)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0D800DE"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$285" @1464
-					Parent_View 	@1463
-					location   	(-209, 253)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0D803CD"
-					client     	@1463
-					supplier   	@1322
-					line_style 	3
-					origin_attachment 	(1231, 2397)
-					terminal_attachment 	(1231, 1428))
-				    (object RoleView "totalDigitsFacet" @1465
-					Parent_View 	@1463
-					location   	(-209, 253)
-					label      	(object SegLabel @1466
-					    Parent_View 	@1465
-					    location   	(853, 2550)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	312
-					    justify    	0
-					    label      	"+totalDigitsFacet"
-					    pctDist    	0.585567
-					    height     	38
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0D803D7"
-					client     	@1463
-					supplier   	@1319
-					vertices   	(list Points
-					    (1231, 2397)
-					    (1231, 2587)
-					    (451, 2587))
-					line_style 	3
-					origin_attachment 	(1231, 2397)
-					terminal_attachment 	(451, 2587)
-					label      	(object SegLabel @1467
-					    Parent_View 	@1465
-					    location   	(535, 2560)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.914647
-					    height     	28
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @1468
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1232, 768)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1468
-				    location   	(1019, 574)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	426
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	444
-				height     	413
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @1469
-				location   	(1209, 1065)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1468
-				vertices   	(list Points
-				    (1209, 1065)
-				    (1209, 974)))
-			    (object AssociationViewNew "$UNNAMED$240" @1470
-				location   	(1090, 1031)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C2880F503D9"
-				roleview_list 	(list RoleViews
-				    (object RoleView "rootTypeDefinition" @1471
-					Parent_View 	@1470
-					location   	(322, -25)
-					label      	(object SegLabel @1472
-					    Parent_View 	@1471
-					    location   	(897, 1036)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+rootTypeDefinition"
-					    pctDist    	-0.098765
-					    height     	194
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C2880F9003C"
-					client     	@1470
-					supplier   	@1468
-					line_style 	3
-					origin_attachment 	(1090, 1031)
-					terminal_attachment 	(1090, 974)
-					label      	(object SegLabel @1473
-					    Parent_View 	@1471
-					    location   	(1121, 1034)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.061728
-					    height     	31
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$241" @1474
-					Parent_View 	@1470
-					location   	(322, -25)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C2880F90046"
-					client     	@1470
-					supplier   	@1320
-					line_style 	3
-					origin_attachment 	(1090, 1031)
-					terminal_attachment 	(1090, 1088))))
-			    (object AssociationViewNew "$UNNAMED$246" @1475
-				location   	(1538, 873)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28A6DB01E5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "rootType" @1476
-					Parent_View 	@1475
-					location   	(178, 105)
-					label      	(object SegLabel @1477
-					    Parent_View 	@1476
-					    location   	(1558, 792)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+rootType"
-					    pctDist    	-1.760870
-					    height     	20
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A6DD03DD"
-					client     	@1475
-					supplier   	@1468
-					vertices   	(list Points
-					    (1538, 873)
-					    (1538, 919)
-					    (1454, 919))
-					line_style 	3
-					origin_attachment 	(1538, 873)
-					terminal_attachment 	(1454, 919)
-					label      	(object SegLabel @1478
-					    Parent_View 	@1476
-					    location   	(1509, 875)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.016667
-					    height     	30
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$247" @1479
-					Parent_View 	@1475
-					location   	(178, 105)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A6DD03DE"
-					client     	@1475
-					supplier   	@1468
-					vertices   	(list Points
-					    (1538, 873)
-					    (1538, 828)
-					    (1454, 828))
-					line_style 	3
-					origin_attachment 	(1538, 873)
-					terminal_attachment 	(1454, 828))))
-			    (object AssociationViewNew "$UNNAMED$248" @1480
-				location   	(1535, 684)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28A7120108"
-				roleview_list 	(list RoleViews
-				    (object RoleView "baseType" @1481
-					Parent_View 	@1480
-					location   	(175, -84)
-					label      	(object SegLabel @1482
-					    Parent_View 	@1481
-					    location   	(1559, 597)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	204
-					    justify    	0
-					    label      	"+baseType"
-					    pctDist    	-1.977273
-					    height     	24
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A7140151"
-					client     	@1480
-					supplier   	@1468
-					vertices   	(list Points
-					    (1535, 684)
-					    (1535, 728)
-					    (1454, 728))
-					line_style 	3
-					origin_attachment 	(1535, 684)
-					terminal_attachment 	(1454, 728)
-					label      	(object SegLabel @1483
-					    Parent_View 	@1481
-					    location   	(1506, 683)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.027778
-					    height     	30
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$249" @1484
-					Parent_View 	@1480
-					location   	(175, -84)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A714015B"
-					client     	@1480
-					supplier   	@1468
-					vertices   	(list Points
-					    (1535, 684)
-					    (1535, 641)
-					    (1454, 641))
-					line_style 	3
-					origin_attachment 	(1535, 684)
-					terminal_attachment 	(1454, 641))))
-			    (object AssociationViewNew "$UNNAMED$252" @1485
-				location   	(613, 940)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28A7ED03C0"
-				roleview_list 	(list RoleViews
-				    (object RoleView "complexType" @1486
-					Parent_View 	@1485
-					location   	(-747, 172)
-					label      	(object SegLabel @1487
-					    Parent_View 	@1486
-					    location   	(465, 983)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	264
-					    justify    	0
-					    label      	"+complexType"
-					    pctDist    	0.373057
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A7F40117"
-					client     	@1485
-					supplier   	@1321
-					vertices   	(list Points
-					    (613, 940)
-					    (284, 940)
-					    (284, 1008))
-					line_style 	3
-					origin_attachment 	(613, 940)
-					terminal_attachment 	(284, 1008)
-					label      	(object SegLabel @1488
-					    Parent_View 	@1486
-					    location   	(224, 972)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.909320
-					    height     	61
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$253" @1489
-					Parent_View 	@1485
-					location   	(-747, 172)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A7F40121"
-					client     	@1485
-					supplier   	@1468
-					line_style 	3
-					origin_attachment 	(613, 940)
-					terminal_attachment 	(1010, 940))))
-			    (object InheritView "" @1490
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAB1004D"
-				client     	@1468
-				supplier   	@1298
-				line_style 	3
-				origin_attachment 	(1112, 562)
-				terminal_attachment 	(1112, 510)
-				drawSupplier 	@1299)
-			    (object InheritView "" @1491
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0D01901F1"
-				client     	@1320
-				supplier   	@1468
-				line_style 	3
-				origin_attachment 	(1146, 1088)
-				terminal_attachment 	(1146, 1065)
-				drawSupplier 	@1469)
-			    (object AssociationViewNew "$UNNAMED$250" @1492
-				location   	(1362, 1133)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28A74B0178"
-				roleview_list 	(list RoleViews
-				    (object RoleView "simpleType" @1493
-					Parent_View 	@1492
-					location   	(-158, -163)
-					label      	(object SegLabel @1494
-					    Parent_View 	@1493
-					    location   	(1499, 1094)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+simpleType"
-					    pctDist    	-0.246753
-					    height     	137
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A74D017B"
-					client     	@1492
-					supplier   	@1322
-					line_style 	3
-					origin_attachment 	(1362, 1133)
-					terminal_attachment 	(1362, 1292)
-					label      	(object SegLabel @1495
-					    Parent_View 	@1493
-					    location   	(1321, 1097)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	-0.227273
-					    height     	42
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$251" @1496
-					Parent_View 	@1492
-					location   	(-158, -163)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A74D0185"
-					client     	@1492
-					supplier   	@1468
-					line_style 	3
-					origin_attachment 	(1362, 1133)
-					terminal_attachment 	(1362, 974))))
-			    (object ClassView "Class" "Logical View::xsd::XSDFeature" @1497
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2272, 384)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1497
-				    location   	(2002, 303)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	540
-				    justify    	0
-				    label      	"XSDFeature")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B537026C"
-				compartment 	(object Compartment
-				    Parent_View 	@1497
-				    location   	(2002, 363)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	550
-				    compartmentItems 	(list Compartment
-					"+ global : boolean"
-					"+ featureReference : boolean"))
-				width      	558
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @1498
-				location   	(2262, 568)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1497
-				vertices   	(list Points
-				    (2262, 568)
-				    (2262, 477)))
-			    (object InheritView "" @1499
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69EDEE01BF"
-				client     	@1294
-				supplier   	@1497
-				line_style 	3
-				origin_attachment 	(2346, 595)
-				terminal_attachment 	(2346, 568)
-				drawSupplier 	@1498)
-			    (object AssociationViewNew "$UNNAMED$244" @1500
-				location   	(1553, 453)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28A0F201A4"
-				roleview_list 	(list RoleViews
-				    (object RoleView "type" @1501
-					Parent_View 	@1500
-					location   	(801, 293)
-					label      	(object SegLabel @1502
-					    Parent_View 	@1501
-					    location   	(1331, 499)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	108
-					    justify    	0
-					    label      	"+type"
-					    pctDist    	0.506266
-					    height     	46
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A0F302E5"
-					client     	@1500
-					supplier   	@1468
-					vertices   	(list Points
-					    (1553, 453)
-					    (1222, 453)
-					    (1222, 562))
-					line_style 	3
-					origin_attachment 	(1553, 453)
-					terminal_attachment 	(1222, 562)
-					label      	(object SegLabel @1503
-					    Parent_View 	@1501
-					    location   	(1185, 479)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.812030
-					    height     	38
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$245" @1504
-					Parent_View 	@1500
-					location   	(801, 293)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A0F302F0"
-					client     	@1500
-					supplier   	@1497
-					line_style 	3
-					origin_attachment 	(1553, 453)
-					terminal_attachment 	(1993, 453))))
-			    (object AssociationViewNew "$UNNAMED$136" @1505
-				location   	(1908, 353)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C29010602D7"
-				roleview_list 	(list RoleViews
-				    (object RoleView "resolvedFeature" @1506
-					Parent_View 	@1505
-					location   	(-268, -159)
-					label      	(object SegLabel @1507
-					    Parent_View 	@1506
-					    location   	(1729, 352)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	312
-					    justify    	0
-					    label      	"+resolvedFeature"
-					    pctDist    	-0.029412
-					    height     	180
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C29010B000E"
-					client     	@1505
-					supplier   	@1497
-					vertices   	(list Points
-					    (1908, 353)
-					    (1908, 387)
-					    (1993, 387))
-					line_style 	3
-					origin_attachment 	(1908, 353)
-					terminal_attachment 	(1993, 387)
-					label      	(object SegLabel @1508
-					    Parent_View 	@1506
-					    location   	(1945, 354)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.596639
-					    height     	34
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$137" @1509
-					Parent_View 	@1505
-					location   	(-268, -159)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C29010B0018"
-					client     	@1505
-					supplier   	@1497
-					vertices   	(list Points
-					    (1908, 353)
-					    (1908, 319)
-					    (1993, 319))
-					line_style 	3
-					origin_attachment 	(1908, 353)
-					terminal_attachment 	(1993, 319))))
-			    (object InheritView "" @1510
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A26036D"
-				client     	@1298
-				supplier   	@1297
-				vertices   	(list Points
-				    (494, 284)
-				    (494, 244)
-				    (996, 244))
-				line_style 	3
-				origin_attachment 	(494, 284)
-				terminal_attachment 	(996, 244))
-			    (object InheritView "" @1511
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69B7DC0193"
-				client     	@1285
-				supplier   	@1497
-				line_style 	3
-				origin_attachment 	(1718, 812)
-				terminal_attachment 	(1718, 568)
-				drawSupplier 	@1498)
-			    (object InheritView "" @1512
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A1302A2"
-				client     	@1322
-				supplier   	@1468
-				line_style 	3
-				origin_attachment 	(1265, 1292)
-				terminal_attachment 	(1265, 1065)
-				drawSupplier 	@1469)
-			    (object InheritView "" @1513
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A2C0307"
-				client     	@1497
-				supplier   	@1297
-				vertices   	(list Points
-				    (2147, 291)
-				    (2147, 244)
-				    (1468, 244))
-				line_style 	3
-				origin_attachment 	(2147, 291)
-				terminal_attachment 	(1468, 244)))))))
-	logical_presentations 	(list unit_reference_list
-	    (object ClassDiagram "Main"
-		quid       	"3AC9105103B2"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list
-		    (object CategoryView "Logical View::mime" @1514
-			location   	(400, 240)
-			label      	(object ItemLabel
-			    Parent_View 	@1514
-			    location   	(256, 156)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"mime")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"3AC9127C0266"
-			width      	300
-			height     	180)
-		    (object CategoryView "Logical View::wsdl" @1515
-			location   	(880, 240)
-			label      	(object ItemLabel
-			    Parent_View 	@1515
-			    location   	(736, 156)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"wsdl")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"3ADFB8E5021E"
-			width      	300
-			height     	180)
-		    (object CategoryView "Logical View::xsd" @1516
-			location   	(1376, 240)
-			label      	(object ItemLabel
-			    Parent_View 	@1516
-			    location   	(1232, 156)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"xsd")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"39ABDC6F01AA"
-			width      	300
-			height     	180)))))
-    root_subsystem 	(object SubSystem "Component View"
-	quid       	"3AC91051031F"
-	physical_models 	(list unit_reference_list)
-	physical_presentations 	(list unit_reference_list
-	    (object Module_Diagram "Main"
-		quid       	"3AC91052001A"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    process_structure 	(object Processes
-	quid       	"3AC910510326"
-	ProcsNDevs 	(list
-	    (object Process_Diagram "Deployment View"
-		quid       	"3AC910510328"
-		title      	"Deployment View"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    properties 	(object Properties
-	attributes 	(list Attribute_Set
-	    (object Attribute
-		tool       	"DDL"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"DDL"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"DDL"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"DataBase"
-			value      	("DataBaseSet" 800))
-		    (object Attribute
-			tool       	"DDL"
-			name       	"DataBaseSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"DDL"
-				name       	"ANSI"
-				value      	800)
-			    (object Attribute
-				tool       	"DDL"
-				name       	"Oracle"
-				value      	801)
-			    (object Attribute
-				tool       	"DDL"
-				name       	"SQLServer"
-				value      	802)
-			    (object Attribute
-				tool       	"DDL"
-				name       	"Sybase"
-				value      	803)
-			    (object Attribute
-				tool       	"DDL"
-				name       	"Watcom"
-				value      	804)))
-		    (object Attribute
-			tool       	"DDL"
-			name       	"PrimaryKeyColumnName"
-			value      	"Id")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"PrimaryKeyColumnType"
-			value      	"NUMBER(5)")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"ViewName"
-			value      	"V_")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"TableName"
-			value      	"T_")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"InheritSuffix"
-			value      	"_V")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"DropClause"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"BaseViews"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"DDLScriptFilename"
-			value      	"DDL1.SQL")))
-	    (object Attribute
-		tool       	"DDL"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"DDL"
-			name       	"ColumnType"
-			value      	"VARCHAR")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"Length"
-			value      	"")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"NullsOK"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"PrimaryKey"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"Unique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"CompositeUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"CheckConstraint"
-			value      	"")))
-	    (object Attribute
-		tool       	"DDL"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"framework"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"IDL"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"StopOnError"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GeneratePreserveRegions"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"ImplementationType"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"ConstValue"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateDefaultSpecifier"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"DefaultSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IDLElement"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IDLSpecificationType"
-			value      	("IDLSpecSet" 22))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IDLSpecSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Interface"
-				value      	22)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Typedef"
-				value      	54)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Enumeration"
-				value      	8)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Const"
-				value      	71)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Exception"
-				value      	61)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Struct"
-				value      	51)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Union"
-				value      	81)))))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CmIdentification"
-			value      	(value Text "  %X%  @(#) plugins/com.ibm.etools.ctc.binding.mime/src/rose/mimebindingMDL.mdl, ctc, ibmctc"))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateIDLModule"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CmIdentification"
-			value      	(value Text "  %X%  @(#) plugins/com.ibm.etools.ctc.binding.mime/src/rose/mimebindingMDL.mdl, ctc, ibmctc"))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"OperationIsOneWay"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Context"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Raises"
-			value      	"")))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IsConst"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"ConstValue"
-			value      	"")))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"NameIfUnlabeled"
-			value      	"the_$supplier")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"BoundedHasRelType"
-			value      	("HasRelTypeSet" 47))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"HasRelTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"NameIfUnlabeled"
-			value      	"the_$supplier")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"BoundedRoleType"
-			value      	("AssocTypeSet" 47))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"AssocTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Uses"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateForwardReference"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Subsystem"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Directory"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Java"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"Java"
-			name       	"UsePrefixes"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"InstanceVariablePrefix"
-			value      	"m_")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ClassVariablePrefix"
-			value      	"s_")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultAttributeDataType"
-			value      	"int")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultOperationReturnType"
-			value      	"void")
-		    (object Attribute
-			tool       	"Java"
-			name       	"RootDir"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"AutoSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ShowCodegenDlg"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocDefaultAuthor"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocDefaultVersion"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocDefaultSince"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocNumAsterisks"
-			value      	0)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MaxNumChars"
-			value      	80)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Editor"
-			value      	("EditorType" 100))
-		    (object Attribute
-			tool       	"Java"
-			name       	"VM"
-			value      	("VMType" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"ClassPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EditorType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"BuiltIn"
-				value      	100)
-			    (object Attribute
-				tool       	"Java"
-				name       	"WindowsShell"
-				value      	101)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"VMType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Sun"
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Microsoft"
-				value      	201)
-			    (object Attribute
-				tool       	"Java"
-				name       	"IBM"
-				value      	202)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"NoClassCustomDlg"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GlobalImports"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"OpenBraceClassStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"OpenBraceMethodStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"UseTabs"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"UseSpaces"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"SpacingItems"
-			value      	3)
-		    (object Attribute
-			tool       	"Java"
-			name       	"RoseDefaultCommentStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"AsteriskCommentStyle"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavaCommentStyle"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocAuthor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocSince"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocVersion"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Private"
-				value      	64)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DisableAutoSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletName"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContextRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsSingleThread"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIsSecure"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcher"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcherPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherInclude"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherForward"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletgetInfo"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttribute"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttributesNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestAttributes"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestParameters"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeader"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeaderNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForHeaders"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIntHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletDateHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletCookie"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForCookie"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContentType"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateHTML"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate_XML_DD"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCmpField"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBEnvironmentProperties"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCnxFactory"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReferences"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBNameInJAR"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType"
-			value      	("EJBSessionType_Set" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateless"
-				value      	201)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateful"
-				value      	202)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType"
-			value      	("EJBTransactionType_Set" 211))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	211)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	212)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType"
-			value      	("EJBPersistenceType_Set" 220))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	220)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	221)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	222)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReentrant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"BMP_Extend_CMP"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"CmIdentification"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"AdditionalImports"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"CmIdentification"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"AdditionalImports"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Abstract"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Native"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Synchronized"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Transient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Volatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"PropertyType"
-			value      	("BeanProperty_Set" 71))
-		    (object Attribute
-			tool       	"Java"
-			name       	"BeanProperty_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Not A Property"
-				value      	71)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Simple"
-				value      	72)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bound"
-				value      	73)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Constrained"
-				value      	74)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"IndividualChangeMgt"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write"
-			value      	("Read/Write_Set" 81))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read & Write"
-				value      	81)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read Only"
-				value      	82)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Write Only"
-				value      	83)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFullyQualifiedTypes"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Transient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Volatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"PropertyType"
-			value      	("BeanProperty_Set" 71))
-		    (object Attribute
-			tool       	"Java"
-			name       	"BeanProperty_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Not A Property"
-				value      	71)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Simple"
-				value      	72)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bound"
-				value      	73)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Constrained"
-				value      	74)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"IndividualChangeMgt"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write"
-			value      	("Read/Write_Set" 81))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read & Write"
-				value      	81)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read Only"
-				value      	82)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Write Only"
-				value      	83)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFullyQualifiedTypes"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsNavigable"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"propertyId"
-		value      	"360000002")
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"DDLScriptFilename"
-			value      	"DDL1.SQL")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"DropClause"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"PrimaryKeyColumnName"
-			value      	"_ID")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"PrimaryKeyColumnType"
-			value      	"NUMBER(5,0)")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"SchemaNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"SchemaNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TableNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TypeNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TypeNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ViewNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ViewNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"VarrayNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"VarrayNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NestedTableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NestedTableNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ObjectTableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ObjectTableNameSuffix"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsSchema"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OID"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"WhereClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CheckConstraint"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypeLength"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypePrecision"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypeScale"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionOfREFS"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"MethodKind"
-			value      	("MethodKindSet" 1903))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OverloadID"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsReadNoDataState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsReadNoProcessState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsWriteNoDataState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsWriteNoProcessState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsSelfish"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerType"
-			value      	("TriggerTypeSet" 1801))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerEvent"
-			value      	("TriggerEventSet" 1601))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerText"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerReferencingNames"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerForEach"
-			value      	("TriggerForEachSet" 1701))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerWhenClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"MethodKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"MapMethod"
-				value      	1901)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"OrderMethod"
-				value      	1902)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Function"
-				value      	1903)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Procedure"
-				value      	1904)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Operator"
-				value      	1905)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Constructor"
-				value      	1906)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Destructor"
-				value      	1907)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Trigger"
-				value      	1908)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Calculated"
-				value      	1909)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"AFTER"
-				value      	1801)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"BEFORE"
-				value      	1802)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSTEAD OF"
-				value      	1803)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerForEachSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"ROW"
-				value      	1701)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"STATEMENT"
-				value      	1702)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerEventSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT"
-				value      	1601)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"UPDATE"
-				value      	1602)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"DELETE"
-				value      	1603)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR UPDATE"
-				value      	1604)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR DELETE"
-				value      	1605)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"UPDATE OR DELETE"
-				value      	1606)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR UPDATE OR DELETE"
-				value      	1607)))))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NullsAllowed"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Length"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Precision"
-			value      	"2")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Scale"
-			value      	"6")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsIndex"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsPrimaryKey"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CompositeUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CheckConstraint"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"cg"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"UseMSVC"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileExtension"
-			value      	"h")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileBackupExtension"
-			value      	"h~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileTemporaryExtension"
-			value      	"h#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileExtension"
-			value      	"cpp")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileBackupExtension"
-			value      	"cp~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileTemporaryExtension"
-			value      	"cp#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ErrorLimit"
-			value      	30)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Directory"
-			value      	"$ROSECPP_SOURCE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"PathSeparator"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileNameFormat"
-			value      	"128vx_b")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BooleanType"
-			value      	"int")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowTemplates"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExplicitInstantiations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowProtectedInheritance"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CommentWidth"
-			value      	60)
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByValueContainer"
-			value      	"$targetClass")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByValueContainer"
-			value      	"OptionalByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByValueContainer"
-			value      	"BoundedListByValue<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByValueContainer"
-			value      	"BoundedSetByValue<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByReferenceContainer"
-			value      	"BoundedListByReference<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByReferenceContainer"
-			value      	"BoundedSetByReference<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByValueContainer"
-			value      	"UnboundedListByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByValueContainer"
-			value      	"UnboundedSetByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByReferenceContainer"
-			value      	"UnboundedListByReference<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByReferenceContainer"
-			value      	"UnboundedSetByReference<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByValueContainer"
-			value      	"AssociationByValue<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByValueContainer"
-			value      	"DictionaryByValue<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByReferenceContainer"
-			value      	"AssociationByReference<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByReferenceContainer"
-			value      	"DictionaryByReference<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GeneratePreserveRegions"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ImplementationType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ClassKey"
-			value      	"class")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"PutBodiesInSpec"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDefaultConstructor"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DefaultConstructorVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineDefaultConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ExplicitDefaultConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateCopyConstructor"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CopyConstructorVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineCopyConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ExplicitCopyConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDestructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DestructorVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DestructorKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineDestructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssignmentOperation"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssignmentVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssignmentKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineAssignmentOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEqualityOperations"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"EqualityVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"EqualityKind"
-			value      	("FriendKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineEqualityOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateRelationalOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"RelationalVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"RelationalKind"
-			value      	("FriendKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineRelationalOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateStorageMgmtOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StorageMgmtVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineStorageMgmtOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSubscriptOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SubscriptVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"SubscriptKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"SubscriptResultType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSubscriptOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDereferenceOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DereferenceVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DereferenceKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DereferenceResultType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineDereferenceOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateIndirectionOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IndirectionVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IndirectionKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IndirectionResultType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineIndirectionOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateStreamOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StreamVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineStreamOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ThreeKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"KindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"FriendKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"DeclareAndDefine"
-				value      	199)
-			    (object Attribute
-				tool       	"cg"
-				name       	"DeclareOnly"
-				value      	205)
-			    (object Attribute
-				tool       	"cg"
-				name       	"DoNotDeclare"
-				value      	206)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"VisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ConstValue"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDefaultSpecifier"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DefaultSpecifier"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CmIdentification"
-			value      	(value Text "  %X%  @(#) plugins/com.ibm.etools.ctc.binding.mime/src/rose/mimebindingMDL.mdl, ctc, ibmctc"))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExtensionlessFileName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeFormat"
-			value      	(value Text 
-|// $package
-|#include "$file"
-|
-			))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludePrecompiledHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeOrder"
-			value      	"AMIR")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyle"
-			value      	("InliningStyleSet" 207))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"InClassDeclaration"
-				value      	208)
-			    (object Attribute
-				tool       	"cg"
-				name       	"FollowingClassDeclaration"
-				value      	207)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"TypesDefined"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeClosure"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CmIdentification"
-			value      	(value Text "  %X%  @(#) plugins/com.ibm.etools.ctc.binding.mime/src/rose/mimebindingMDL.mdl, ctc, ibmctc"))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExtensionlessFileName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeFormat"
-			value      	(value Text 
-|// $package
-|#include "$file"
-|
-			))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludePrecompiledHeader"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeOrder"
-			value      	"AMIR")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyle"
-			value      	("InliningStyleSet" 207))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"InClassDeclaration"
-				value      	208)
-			    (object Attribute
-				tool       	"cg"
-				name       	"FollowingClassDeclaration"
-				value      	207)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"TypesDefined"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeClosure"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationKind"
-			value      	("OperationKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationIsConst"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationIsExplicit"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Inline"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"EntryCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ExitCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"BodyAnnotations"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationIsOneWay"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Context"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"Raises"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"Ordered"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"NameIfUnlabeled"
-			value      	"the_$supplier")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtRelationshipVisibility"
-				value      	210)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberFieldSize"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InitialValue"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetName"
-			value      	"get_$relationship")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetName"
-			value      	"set_$relationship")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKindsSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SelectorName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SelectorType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConstSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_Function"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetByReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ForwardReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedHasRelType"
-			value      	("HasRelTypeSet" 47))
-		    (object Attribute
-			tool       	"cg"
-			name       	"HasRelTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Association"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"NameIfUnlabeled"
-			value      	"the_$targetClass")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Inherit"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"InstanceArguments"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ForwardReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"NameIfUnlabeled"
-			value      	"the_$targetClass")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberName"
-			value      	"$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtRelationshipVisibility"
-				value      	210)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberFieldSize"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InitialValue"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerGet"
-			value      	"$data.get($keys)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerSet"
-			value      	"$data.set($keys,$value)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedContainer"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassContainer"
-			value      	"$supplier *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassInitialValue"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKindsSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetByReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetName"
-			value      	"get_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConstSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_Function"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetName"
-			value      	"set_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetSetByReference"
-			value      	("QualifiedGetSetByReferenceSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetSetByReferenceSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_GetSetByReference"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateQualifiedGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetName"
-			value      	"get_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineQualifiedGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateQualifiedSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedSetName"
-			value      	"set_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedSetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineQualifiedSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssocClassDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberName"
-			value      	"$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtRelationshipVisibility"
-				value      	210)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssocClassGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetName"
-			value      	"get_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineAssocClassGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssocClassSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassSetName"
-			value      	"set_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassSetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineAssocClassSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassForwardReferenceOnly"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedRoleType"
-			value      	("AssocTypeSet" 47))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberName"
-			value      	"$attribute")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtAttributeVisibility"
-				value      	211)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberFieldSize"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetName"
-			value      	"get_$attribute")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetName"
-			value      	"set_$attribute")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKindsSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConstSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_Function"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetByReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"IsReadOnly"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Uses"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"ForwardReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"BodyReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateForwardReference"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Subsystem"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DirectoryIsOnSearchList"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"PrecompiledHeader"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"IsNamespace"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Indent"
-			value      	2)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Version"
-			value      	"5.0")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCClassTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCClassTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Interface_Part"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Connection_Part"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Class_Factory"
-				value      	3)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CObjectFunctionality"
-			value      	("CObjectFunctionalitySet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CObjectFunctionalitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dynamic"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dyncreate"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Serial"
-				value      	3)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateOverrideGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateDataGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DATA_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateFieldGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_FIELD_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateMessageGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateMessageMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_MSG_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MESSAGE_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEFactory"
-			value      	("OLEFactorySet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEFactorySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Built_in"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Simple"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Licensed"
-				value      	3)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEName"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEClassID"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateOLECtlType"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLECtlType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateOLETypeLib"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLETypeLibID"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLETypeLibMajor"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLETypeLibMinor"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GeneratePropPageIDs"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEPropPageIDs"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateDispatchMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockProperties"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockFunctions"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DispatchDefValue"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateDispIdEnum"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISP_ID_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateInterfaceMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"INTERFACE_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"InitInterface"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateEventMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENT_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockEvents"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateEventSinkMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENTSINK_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PropNotifySinks"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateConnectionMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CONNECTION_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"ConnectionPointIID"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"InheritanceType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLECommands"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MFCDeclares"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MFCImplements"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"ATL_Declares"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateCOMMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"COM_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateConnectionPointMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CONNECTION_POINT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateMsgMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSG_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GeneratePropertyMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PROPERTY_MAP_Entries"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCOperationTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCOperationTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Virtual_Override"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Message_Handler"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dispatch_Handler"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Event_Firing_Function"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Event_Sink_Handler"
-				value      	5)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Std_OLE_Method"
-				value      	6)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Command_Parser"
-				value      	7)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Property_Get_Function"
-				value      	8)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Property_Set_Function"
-				value      	9)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Property_Notify_Function"
-				value      	10)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Macro_Generated_Function"
-				value      	11)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_MSG_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MESSAGE_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"BodyImage"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCAttributeTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCAttributeTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Member_Property"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Get_Set_Property"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dialog_Data"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Field_Data"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Stock_Property"
-				value      	5)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PointerBase"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockPropertyImplementation"
-			value      	"")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCAttributeTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCAttributeTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Member_Property"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Get_Set_Property"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dialog_Data"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Field_Data"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Stock_Property"
-				value      	5)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PointerBase"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockPropertyImplementation"
-			value      	"")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCAttributeTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCAttributeTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Member_Property"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Get_Set_Property"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dialog_Data"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Field_Data"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Stock_Property"
-				value      	5)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PointerBase"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockPropertyImplementation"
-			value      	"")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateIncludesGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_INCLUDES_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateInsertLocation"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateIncludesGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_INCLUDES_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateInsertLocation"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"SCC"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"TypeLibImporter"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"propertyId"
-		value      	"783606378")
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"CreatableSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Private"
-				value      	221)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"PublicNotCreatable"
-				value      	213)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"SingleUse"
-				value      	214)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"GlobalSingleUse"
-				value      	215)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"MultiUse"
-				value      	219)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"GlobalMultiUse"
-				value      	220)))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionBase"
-			value      	"0")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionExplicit"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionCompare"
-			value      	("CompareSet" 202))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Creatable"
-			value      	("CreatableSet" 221))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateInitialization"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateTermination"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"CollectionClass"
-			value      	"Collection")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"CompareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"None"
-				value      	202)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Binary"
-				value      	203)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Text"
-				value      	204)))))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OperationName"
-			value      	"$operation")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"LibraryName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"AliasName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"IsStatic"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"EntryCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ExitCode"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"IsConst"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"New"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"WithEvents"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Subscript"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"NameIfUnlabeled"
-			value      	"the$supplier")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateGetOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateSetOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateLetOperation"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"New"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"WithEvents"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Subscript"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"NameIfUnlabeled"
-			value      	"the$supplier")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateGetOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateSetOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateLetOperation"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Inherit"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ImplementsDelegation"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ProjectFile"
-			value      	"")))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"VisualStudio"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Editor"
-			value      	("EditorType" 100))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"IncludePath"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"StopOnError"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"EditorType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"BuiltIn"
-				value      	100)
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"WindowsShell"
-				value      	101)))))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ArrayDimensions"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ConstValue"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ImplementationType"
-			value      	"")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CmIdentification"
-			value      	(value Text "  %X% %Q% %Z% %W%"))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CmIdentification"
-			value      	(value Text "  %X% %Q% %Z% %W%"))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Context"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"OperationIsOneWay"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ArrayDimensions"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Order"
-			value      	"")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ArrayDimensions"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Order"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"BoundedRoleType"
-			value      	("AssocTypeSet" 47))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"AssocTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Uses"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"GenerateForwardReference"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Java"
-		name       	"Default_Servlet__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletName"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContextRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsSingleThread"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIsSecure"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcher"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcherPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherInclude"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherForward"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletgetInfo"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Private"
-				value      	64)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"Http_Servlet__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttribute"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttributesNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestAttributes"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestParameters"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeader"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeaderNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForHeaders"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIntHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletDateHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletCookie"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForCookie"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContentType"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateHTML"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Private"
-				value      	64)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"Default_EJB__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate_XML_DD"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCmpField"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBEnvironmentProperties"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCnxFactory"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReferences"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBNameInJAR"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType"
-			value      	("EJBSessionType_Set" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateless"
-				value      	201)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateful"
-				value      	202)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType"
-			value      	("EJBTransactionType_Set" 211))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	211)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	212)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType"
-			value      	("EJBPersistenceType_Set" 220))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	220)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	221)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	222)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReentrant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"BMP_Extend_CMP"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Private"
-				value      	64)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"R2Editor"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Rose Model Integrator"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Rose Web Publisher"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Version Control"
-		name       	"HiddenTool"
-		value      	FALSE))
-	quid       	"3AC910510327"))
diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEContent.java b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEContent.java
deleted file mode 100644
index 6866f8302..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEContent.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.mime;
-
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.Part;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Content</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.mime.MIMEContent#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.mime.MIMEContent#getEPart <em>EPart</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.wsdl.binding.mime.MIMEPackage#getMIMEContent()
- * @model 
- * @generated
- */
-public interface MIMEContent extends ExtensibilityElement, javax.wsdl.extensions.mime.MIMEContent {
-	/**
-	 * Returns the value of the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Type</em>' attribute.
-	 * @see #setType(String)
-	 * @see org.eclipse.wst.wsdl.binding.mime.MIMEPackage#getMIMEContent_Type()
-	 * @model 
-	 * @generated
-	 */
-	String getType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.wsdl.binding.mime.MIMEContent#getType <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' attribute.
-	 * @see #getType()
-	 * @generated
-	 */
-	void setType(String value);
-
-	/**
-	 * Returns the value of the '<em><b>EPart</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>EPart</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>EPart</em>' reference.
-	 * @see #setEPart(Part)
-	 * @see org.eclipse.wst.wsdl.binding.mime.MIMEPackage#getMIMEContent_EPart()
-	 * @model 
-	 * @generated
-	 */
-	Part getEPart();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.wsdl.binding.mime.MIMEContent#getEPart <em>EPart</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>EPart</em>' reference.
-	 * @see #getEPart()
-	 * @generated
-	 */
-	void setEPart(Part value);
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model 
-	 * @generated
-	 */
-	void setPart(String part);
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Part</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @model parameters=""
-	 * @generated
-	 */
-	String getPart();
-
-} // MIMEContent
diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEFactory.java b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEFactory.java
deleted file mode 100644
index 855e11930..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEFactory.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.mime;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.wst.wsdl.binding.mime.MIMEPackage
- * @generated
- */
-public interface MIMEFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	MIMEFactory eINSTANCE = new org.eclipse.wst.wsdl.binding.mime.internal.impl.MIMEFactoryImpl();
-
-	/**
-	 * Returns a new object of class '<em>Content</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Content</em>'.
-	 * @generated
-	 */
-	MIMEContent createMIMEContent();
-
-	/**
-	 * Returns a new object of class '<em>Part</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Part</em>'.
-	 * @generated
-	 */
-	MIMEPart createMIMEPart();
-
-	/**
-	 * Returns a new object of class '<em>Multipart Related</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Multipart Related</em>'.
-	 * @generated
-	 */
-	MIMEMultipartRelated createMIMEMultipartRelated();
-
-	/**
-	 * Returns a new object of class '<em>Mime Xml</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Mime Xml</em>'.
-	 * @generated
-	 */
-	MIMEMimeXml createMIMEMimeXml();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	MIMEPackage getMIMEPackage();
-
-} //MIMEFactory
diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEMimeXml.java b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEMimeXml.java
deleted file mode 100644
index 64794c56b..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEMimeXml.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.mime;
-
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.Part;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Mime Xml</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.mime.MIMEMimeXml#getEPart <em>EPart</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.wsdl.binding.mime.MIMEPackage#getMIMEMimeXml()
- * @model 
- * @generated
- */
-public interface MIMEMimeXml extends ExtensibilityElement, javax.wsdl.extensions.mime.MIMEMimeXml {
-	/**
-	 * Returns the value of the '<em><b>EPart</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>EPart</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>EPart</em>' reference.
-	 * @see #setEPart(Part)
-	 * @see org.eclipse.wst.wsdl.binding.mime.MIMEPackage#getMIMEMimeXml_EPart()
-	 * @model 
-	 * @generated
-	 */
-	Part getEPart();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.wsdl.binding.mime.MIMEMimeXml#getEPart <em>EPart</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>EPart</em>' reference.
-	 * @see #getEPart()
-	 * @generated
-	 */
-	void setEPart(Part value);
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model 
-	 * @generated
-	 */
-	void setPart(String part);
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Part</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @model parameters=""
-	 * @generated
-	 */
-	String getPart();
-
-} // MIMEMimeXml
diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEMultipartRelated.java b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEMultipartRelated.java
deleted file mode 100644
index 35a7b363f..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEMultipartRelated.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.mime;
-
-import java.util.List;
-
-import javax.wsdl.extensions.mime.MIMEPart;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Multipart Related</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.mime.MIMEMultipartRelated#getEMIMEPart <em>EMIME Part</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.wsdl.binding.mime.MIMEPackage#getMIMEMultipartRelated()
- * @model 
- * @generated
- */
-public interface MIMEMultipartRelated extends ExtensibilityElement, javax.wsdl.extensions.mime.MIMEMultipartRelated {
-	/**
-	 * Returns the value of the '<em><b>EMIME Part</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.wst.wsdl.binding.mime.MIMEPart}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>EMIME Part</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>EMIME Part</em>' containment reference list.
-	 * @see org.eclipse.wst.wsdl.binding.mime.MIMEPackage#getMIMEMultipartRelated_EMIMEPart()
-	 * @model type="org.eclipse.wst.wsdl.binding.mime.MIMEPart" containment="true"
-	 * @generated
-	 */
-	EList getEMIMEPart();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model 
-	 * @generated
-	 */
-	void addMIMEPart(MIMEPart mimePart);
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model dataType="org.eclipse.wst.wsdl.binding.mime.List" parameters=""
-	 * @generated
-	 */
-	List getMIMEParts();
-
-} // MIMEMultipartRelated
diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEPackage.java b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEPackage.java
deleted file mode 100644
index 2f876e5e5..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEPackage.java
+++ /dev/null
@@ -1,559 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.mime;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.wst.wsdl.WSDLPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.wst.wsdl.binding.mime.MIMEFactory
- * @generated
- */
-public interface MIMEPackage extends EPackage{
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "mime";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://www.ibm.com/wsdl/2003/MIME";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "mime";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	MIMEPackage eINSTANCE = org.eclipse.wst.wsdl.binding.mime.internal.impl.MIMEPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.wsdl.binding.mime.impl.MIMEContentImpl <em>Content</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.wst.wsdl.binding.mime.impl.MIMEContentImpl
-	 * @see org.eclipse.wst.wsdl.binding.mime.impl.MIMEPackageImpl#getMIMEContent()
-	 * @generated
-	 */
-	int MIME_CONTENT = 0;
-
-	/**
-	 * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_CONTENT__DOCUMENTATION_ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_CONTENT__ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Required</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_CONTENT__REQUIRED = WSDLPackage.EXTENSIBILITY_ELEMENT__REQUIRED;
-
-	/**
-	 * The feature id for the '<em><b>Element Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_CONTENT__ELEMENT_TYPE = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_CONTENT__TYPE = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>EPart</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_CONTENT__EPART = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the the '<em>Content</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_CONTENT_FEATURE_COUNT = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.wsdl.binding.mime.impl.MIMEPartImpl <em>Part</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.wst.wsdl.binding.mime.impl.MIMEPartImpl
-	 * @see org.eclipse.wst.wsdl.binding.mime.impl.MIMEPackageImpl#getMIMEPart()
-	 * @generated
-	 */
-	int MIME_PART = 1;
-
-	/**
-	 * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_PART__DOCUMENTATION_ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_PART__ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Required</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_PART__REQUIRED = WSDLPackage.EXTENSIBILITY_ELEMENT__REQUIRED;
-
-	/**
-	 * The feature id for the '<em><b>Element Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_PART__ELEMENT_TYPE = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT_TYPE;
-
-	/**
-	 * The number of structural features of the the '<em>Part</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_PART_FEATURE_COUNT = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.wsdl.binding.mime.impl.MIMEMultipartRelatedImpl <em>Multipart Related</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.wst.wsdl.binding.mime.impl.MIMEMultipartRelatedImpl
-	 * @see org.eclipse.wst.wsdl.binding.mime.impl.MIMEPackageImpl#getMIMEMultipartRelated()
-	 * @generated
-	 */
-	int MIME_MULTIPART_RELATED = 2;
-
-	/**
-	 * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_MULTIPART_RELATED__DOCUMENTATION_ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_MULTIPART_RELATED__ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Required</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_MULTIPART_RELATED__REQUIRED = WSDLPackage.EXTENSIBILITY_ELEMENT__REQUIRED;
-
-	/**
-	 * The feature id for the '<em><b>Element Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_MULTIPART_RELATED__ELEMENT_TYPE = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>EMIME Part</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_MULTIPART_RELATED__EMIME_PART = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the the '<em>Multipart Related</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_MULTIPART_RELATED_FEATURE_COUNT = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.wsdl.binding.mime.impl.MIMEMimeXmlImpl <em>Mime Xml</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.wst.wsdl.binding.mime.impl.MIMEMimeXmlImpl
-	 * @see org.eclipse.wst.wsdl.binding.mime.impl.MIMEPackageImpl#getMIMEMimeXml()
-	 * @generated
-	 */
-	int MIME_MIME_XML = 3;
-
-	/**
-	 * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_MIME_XML__DOCUMENTATION_ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_MIME_XML__ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Required</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_MIME_XML__REQUIRED = WSDLPackage.EXTENSIBILITY_ELEMENT__REQUIRED;
-
-	/**
-	 * The feature id for the '<em><b>Element Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_MIME_XML__ELEMENT_TYPE = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>EPart</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_MIME_XML__EPART = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the the '<em>Mime Xml</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_MIME_XML_FEATURE_COUNT = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 1;
-
-
-	/**
-	 * The meta object id for the '{@link javax.wsdl.extensions.mime.MIMEPart <em>IMIME Part</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see javax.wsdl.extensions.mime.MIMEPart
-	 * @see org.eclipse.wst.wsdl.binding.mime.impl.MIMEPackageImpl#getIMIMEPart()
-	 * @generated
-	 */
-	int IMIME_PART = 4;
-
-	/**
-	 * The number of structural features of the the '<em>IMIME Part</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMIME_PART_FEATURE_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link javax.wsdl.extensions.mime.MIMEMultipartRelated <em>IMIME Multipart Related</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see javax.wsdl.extensions.mime.MIMEMultipartRelated
-	 * @see org.eclipse.wst.wsdl.binding.mime.impl.MIMEPackageImpl#getIMIMEMultipartRelated()
-	 * @generated
-	 */
-	int IMIME_MULTIPART_RELATED = 5;
-
-	/**
-	 * The number of structural features of the the '<em>IMIME Multipart Related</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMIME_MULTIPART_RELATED_FEATURE_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link javax.wsdl.extensions.mime.MIMEContent <em>IMIME Content</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see javax.wsdl.extensions.mime.MIMEContent
-	 * @see org.eclipse.wst.wsdl.binding.mime.impl.MIMEPackageImpl#getIMIMEContent()
-	 * @generated
-	 */
-	int IMIME_CONTENT = 6;
-
-	/**
-	 * The number of structural features of the the '<em>IMIME Content</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMIME_CONTENT_FEATURE_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link javax.wsdl.extensions.mime.MIMEMimeXml <em>IMIME Mime Xml</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see javax.wsdl.extensions.mime.MIMEMimeXml
-	 * @see org.eclipse.wst.wsdl.binding.mime.impl.MIMEPackageImpl#getIMIMEMimeXml()
-	 * @generated
-	 */
-	int IMIME_MIME_XML = 7;
-
-	/**
-	 * The number of structural features of the the '<em>IMIME Mime Xml</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMIME_MIME_XML_FEATURE_COUNT = 0;
-
-	/**
-	 * The meta object id for the '<em>List</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.util.List
-	 * @see org.eclipse.wst.wsdl.binding.mime.impl.MIMEPackageImpl#getList()
-	 * @generated
-	 */
-	int LIST = 8;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.wsdl.binding.mime.MIMEContent <em>Content</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Content</em>'.
-	 * @see org.eclipse.wst.wsdl.binding.mime.MIMEContent
-	 * @generated
-	 */
-	EClass getMIMEContent();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.binding.mime.MIMEContent#getType <em>Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Type</em>'.
-	 * @see org.eclipse.wst.wsdl.binding.mime.MIMEContent#getType()
-	 * @see #getMIMEContent()
-	 * @generated
-	 */
-	EAttribute getMIMEContent_Type();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.wst.wsdl.binding.mime.MIMEContent#getEPart <em>EPart</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>EPart</em>'.
-	 * @see org.eclipse.wst.wsdl.binding.mime.MIMEContent#getEPart()
-	 * @see #getMIMEContent()
-	 * @generated
-	 */
-	EReference getMIMEContent_EPart();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.wsdl.binding.mime.MIMEPart <em>Part</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Part</em>'.
-	 * @see org.eclipse.wst.wsdl.binding.mime.MIMEPart
-	 * @generated
-	 */
-	EClass getMIMEPart();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.wsdl.binding.mime.MIMEMultipartRelated <em>Multipart Related</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Multipart Related</em>'.
-	 * @see org.eclipse.wst.wsdl.binding.mime.MIMEMultipartRelated
-	 * @generated
-	 */
-	EClass getMIMEMultipartRelated();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.wst.wsdl.binding.mime.MIMEMultipartRelated#getEMIMEPart <em>EMIME Part</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>EMIME Part</em>'.
-	 * @see org.eclipse.wst.wsdl.binding.mime.MIMEMultipartRelated#getEMIMEPart()
-	 * @see #getMIMEMultipartRelated()
-	 * @generated
-	 */
-	EReference getMIMEMultipartRelated_EMIMEPart();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.wsdl.binding.mime.MIMEMimeXml <em>Mime Xml</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Mime Xml</em>'.
-	 * @see org.eclipse.wst.wsdl.binding.mime.MIMEMimeXml
-	 * @generated
-	 */
-	EClass getMIMEMimeXml();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.wst.wsdl.binding.mime.MIMEMimeXml#getEPart <em>EPart</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>EPart</em>'.
-	 * @see org.eclipse.wst.wsdl.binding.mime.MIMEMimeXml#getEPart()
-	 * @see #getMIMEMimeXml()
-	 * @generated
-	 */
-	EReference getMIMEMimeXml_EPart();
-
-	/**
-	 * Returns the meta object for class '{@link javax.wsdl.extensions.mime.MIMEPart <em>IMIME Part</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>IMIME Part</em>'.
-	 * @see javax.wsdl.extensions.mime.MIMEPart
-	 * @model instanceClass="javax.wsdl.extensions.mime.MIMEPart" 
-	 * @generated
-	 */
-	EClass getIMIMEPart();
-
-	/**
-	 * Returns the meta object for class '{@link javax.wsdl.extensions.mime.MIMEMultipartRelated <em>IMIME Multipart Related</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>IMIME Multipart Related</em>'.
-	 * @see javax.wsdl.extensions.mime.MIMEMultipartRelated
-	 * @model instanceClass="javax.wsdl.extensions.mime.MIMEMultipartRelated" 
-	 * @generated
-	 */
-	EClass getIMIMEMultipartRelated();
-
-	/**
-	 * Returns the meta object for class '{@link javax.wsdl.extensions.mime.MIMEContent <em>IMIME Content</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>IMIME Content</em>'.
-	 * @see javax.wsdl.extensions.mime.MIMEContent
-	 * @model instanceClass="javax.wsdl.extensions.mime.MIMEContent" 
-	 * @generated
-	 */
-	EClass getIMIMEContent();
-
-	/**
-	 * Returns the meta object for class '{@link javax.wsdl.extensions.mime.MIMEMimeXml <em>IMIME Mime Xml</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>IMIME Mime Xml</em>'.
-	 * @see javax.wsdl.extensions.mime.MIMEMimeXml
-	 * @model instanceClass="javax.wsdl.extensions.mime.MIMEMimeXml" 
-	 * @generated
-	 */
-	EClass getIMIMEMimeXml();
-
-	/**
-	 * Returns the meta object for data type '{@link java.util.List <em>List</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>List</em>'.
-	 * @see java.util.List
-	 * @model instanceClass="java.util.List"
-	 * @generated
-	 */
-	EDataType getList();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	MIMEFactory getMIMEFactory();
-
-} //MIMEPackage
diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEPart.java b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEPart.java
deleted file mode 100644
index 22cb823fb..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEPart.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.mime;
-
-import java.util.List;
-
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Part</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.wst.wsdl.binding.mime.MIMEPackage#getMIMEPart()
- * @model 
- * @generated
- */
-public interface MIMEPart extends ExtensibilityElement, javax.wsdl.extensions.mime.MIMEPart {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model 
-	 * @generated
-	 */
-	void addExtensibilityElement(javax.wsdl.extensions.ExtensibilityElement extensibilityElement);
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model dataType="org.eclipse.wst.wsdl.binding.mime.List" parameters=""
-	 * @generated
-	 */
-	List getExtensibilityElements();
-
-} // MIMEPart
diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEContentImpl.java b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEContentImpl.java
deleted file mode 100644
index ac0f0848e..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEContentImpl.java
+++ /dev/null
@@ -1,330 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.mime.internal.impl;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.binding.mime.MIMEContent;
-import org.eclipse.wst.wsdl.binding.mime.MIMEPackage;
-import org.eclipse.wst.wsdl.binding.mime.internal.util.MIMEConstants;
-import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl;
-import org.w3c.dom.Element;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Content</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.mime.impl.MIMEContentImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.mime.impl.MIMEContentImpl#getEPart <em>EPart</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class MIMEContentImpl extends ExtensibilityElementImpl implements MIMEContent {
-	/**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected String type = TYPE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getEPart() <em>EPart</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEPart()
-	 * @generated
-	 * @ordered
-	 */
-	protected Part ePart = null;
-	
-    private String part; // TBD
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MIMEContentImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return MIMEPackage.eINSTANCE.getMIMEContent();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getType() {
-		return type;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setType(String newType) {
-		String oldType = type;
-		type = newType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MIMEPackage.MIME_CONTENT__TYPE, oldType, type));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Part getEPart() {
-		if (ePart != null && ePart.eIsProxy()) {
-			Part oldEPart = ePart;
-			ePart = (Part)eResolveProxy((InternalEObject)ePart);
-			if (ePart != oldEPart) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, MIMEPackage.MIME_CONTENT__EPART, oldEPart, ePart));
-			}
-		}
-		return ePart;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Part basicGetEPart() {
-		return ePart;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEPart(Part newEPart) {
-		Part oldEPart = ePart;
-		ePart = newEPart;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MIMEPackage.MIME_CONTENT__EPART, oldEPart, ePart));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public void setPart(String part) {
-      this.part = part;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public String getPart() {
-      return part;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MIMEPackage.MIME_CONTENT__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case MIMEPackage.MIME_CONTENT__ELEMENT:
-				return getElement();
-			case MIMEPackage.MIME_CONTENT__REQUIRED:
-				return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-			case MIMEPackage.MIME_CONTENT__ELEMENT_TYPE:
-				return getElementType();
-			case MIMEPackage.MIME_CONTENT__TYPE:
-				return getType();
-			case MIMEPackage.MIME_CONTENT__EPART:
-				if (resolve) return getEPart();
-				return basicGetEPart();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MIMEPackage.MIME_CONTENT__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case MIMEPackage.MIME_CONTENT__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case MIMEPackage.MIME_CONTENT__REQUIRED:
-				setRequired(((Boolean)newValue).booleanValue());
-				return;
-			case MIMEPackage.MIME_CONTENT__ELEMENT_TYPE:
-				setElementType((QName)newValue);
-				return;
-			case MIMEPackage.MIME_CONTENT__TYPE:
-				setType((String)newValue);
-				return;
-			case MIMEPackage.MIME_CONTENT__EPART:
-				setEPart((Part)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MIMEPackage.MIME_CONTENT__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case MIMEPackage.MIME_CONTENT__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case MIMEPackage.MIME_CONTENT__REQUIRED:
-				setRequired(REQUIRED_EDEFAULT);
-				return;
-			case MIMEPackage.MIME_CONTENT__ELEMENT_TYPE:
-				setElementType(ELEMENT_TYPE_EDEFAULT);
-				return;
-			case MIMEPackage.MIME_CONTENT__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
-			case MIMEPackage.MIME_CONTENT__EPART:
-				setEPart((Part)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MIMEPackage.MIME_CONTENT__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case MIMEPackage.MIME_CONTENT__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case MIMEPackage.MIME_CONTENT__REQUIRED:
-				return required != REQUIRED_EDEFAULT;
-			case MIMEPackage.MIME_CONTENT__ELEMENT_TYPE:
-				return ELEMENT_TYPE_EDEFAULT == null ? elementType != null : !ELEMENT_TYPE_EDEFAULT.equals(elementType);
-			case MIMEPackage.MIME_CONTENT__TYPE:
-				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
-			case MIMEPackage.MIME_CONTENT__EPART:
-				return ePart != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (type: ");
-		result.append(type);
-		result.append(')');
-		return result.toString();
-	}
-
-  //
-  // Reconcile methods: DOM -> Model
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-  	setPart
-      (MIMEConstants.getAttribute(changedElement, MIMEConstants.PART_ATTRIBUTE));
-  	setType
-      (MIMEConstants.getAttribute(changedElement, MIMEConstants.TYPE_ATTRIBUTE));
-    reconcileReferences(false);
-  }
-  
-  //
-  // For reconciliation: Model -> DOM
-  //
-
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeAttribute(eAttribute);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eAttribute == null || eAttribute == MIMEPackage.eINSTANCE. getMIMEContent_EPart())
-        niceSetAttribute(theElement,MIMEConstants.PART_ATTRIBUTE,getPart());
-      if (eAttribute == null || eAttribute == MIMEPackage.eINSTANCE. getMIMEContent_Type())
-        niceSetAttribute(theElement,MIMEConstants.TYPE_ATTRIBUTE,getType());
-    }
-  }
-
-} //MIMEContentImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEFactoryImpl.java b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEFactoryImpl.java
deleted file mode 100644
index d6607aabe..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEFactoryImpl.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.mime.internal.impl;
-
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.wst.wsdl.binding.mime.MIMEContent;
-import org.eclipse.wst.wsdl.binding.mime.MIMEFactory;
-import org.eclipse.wst.wsdl.binding.mime.MIMEMimeXml;
-import org.eclipse.wst.wsdl.binding.mime.MIMEMultipartRelated;
-import org.eclipse.wst.wsdl.binding.mime.MIMEPackage;
-import org.eclipse.wst.wsdl.binding.mime.MIMEPart;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class MIMEFactoryImpl extends EFactoryImpl implements MIMEFactory {
-	/**
-	 * Creates and instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MIMEFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case MIMEPackage.MIME_CONTENT: return createMIMEContent();
-			case MIMEPackage.MIME_PART: return createMIMEPart();
-			case MIMEPackage.MIME_MULTIPART_RELATED: return createMIMEMultipartRelated();
-			case MIMEPackage.MIME_MIME_XML: return createMIMEMimeXml();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case MIMEPackage.LIST:
-				return createListFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case MIMEPackage.LIST:
-				return convertListToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MIMEContent createMIMEContent() {
-		MIMEContentImpl mimeContent = new MIMEContentImpl();
-		return mimeContent;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MIMEPart createMIMEPart() {
-		MIMEPartImpl mimePart = new MIMEPartImpl();
-		return mimePart;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MIMEMultipartRelated createMIMEMultipartRelated() {
-		MIMEMultipartRelatedImpl mimeMultipartRelated = new MIMEMultipartRelatedImpl();
-		return mimeMultipartRelated;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MIMEMimeXml createMIMEMimeXml() {
-		MIMEMimeXmlImpl mimeMimeXml = new MIMEMimeXmlImpl();
-		return mimeMimeXml;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List createListFromString(EDataType eDataType, String initialValue) {
-		return (List)super.createFromString(eDataType, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertListToString(EDataType eDataType, Object instanceValue) {
-		return super.convertToString(eDataType, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MIMEPackage getMIMEPackage() {
-		return (MIMEPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	public static MIMEPackage getPackage() {
-		return MIMEPackage.eINSTANCE;
-	}
-} //MIMEFactoryImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEMimeXmlImpl.java b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEMimeXmlImpl.java
deleted file mode 100644
index 1b5c1f803..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEMimeXmlImpl.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.mime.internal.impl;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.binding.mime.MIMEMimeXml;
-import org.eclipse.wst.wsdl.binding.mime.MIMEPackage;
-import org.eclipse.wst.wsdl.binding.mime.internal.util.MIMEConstants;
-import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl;
-import org.w3c.dom.Element;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Mime Xml</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.mime.impl.MIMEMimeXmlImpl#getEPart <em>EPart</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class MIMEMimeXmlImpl extends ExtensibilityElementImpl implements MIMEMimeXml {
-	/**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-	 * The cached value of the '{@link #getEPart() <em>EPart</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEPart()
-	 * @generated
-	 * @ordered
-	 */
-	protected Part ePart = null;
-	
-    private String part;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MIMEMimeXmlImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return MIMEPackage.eINSTANCE.getMIMEMimeXml();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Part getEPart() {
-		if (ePart != null && ePart.eIsProxy()) {
-			Part oldEPart = ePart;
-			ePart = (Part)eResolveProxy((InternalEObject)ePart);
-			if (ePart != oldEPart) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, MIMEPackage.MIME_MIME_XML__EPART, oldEPart, ePart));
-			}
-		}
-		return ePart;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Part basicGetEPart() {
-		return ePart;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEPart(Part newEPart) {
-		Part oldEPart = ePart;
-		ePart = newEPart;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MIMEPackage.MIME_MIME_XML__EPART, oldEPart, ePart));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public void setPart(String part) {
-      this.part = part;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public String getPart() {
-      return part;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MIMEPackage.MIME_MIME_XML__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case MIMEPackage.MIME_MIME_XML__ELEMENT:
-				return getElement();
-			case MIMEPackage.MIME_MIME_XML__REQUIRED:
-				return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-			case MIMEPackage.MIME_MIME_XML__ELEMENT_TYPE:
-				return getElementType();
-			case MIMEPackage.MIME_MIME_XML__EPART:
-				if (resolve) return getEPart();
-				return basicGetEPart();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MIMEPackage.MIME_MIME_XML__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case MIMEPackage.MIME_MIME_XML__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case MIMEPackage.MIME_MIME_XML__REQUIRED:
-				setRequired(((Boolean)newValue).booleanValue());
-				return;
-			case MIMEPackage.MIME_MIME_XML__ELEMENT_TYPE:
-				setElementType((QName)newValue);
-				return;
-			case MIMEPackage.MIME_MIME_XML__EPART:
-				setEPart((Part)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MIMEPackage.MIME_MIME_XML__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case MIMEPackage.MIME_MIME_XML__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case MIMEPackage.MIME_MIME_XML__REQUIRED:
-				setRequired(REQUIRED_EDEFAULT);
-				return;
-			case MIMEPackage.MIME_MIME_XML__ELEMENT_TYPE:
-				setElementType(ELEMENT_TYPE_EDEFAULT);
-				return;
-			case MIMEPackage.MIME_MIME_XML__EPART:
-				setEPart((Part)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MIMEPackage.MIME_MIME_XML__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case MIMEPackage.MIME_MIME_XML__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case MIMEPackage.MIME_MIME_XML__REQUIRED:
-				return required != REQUIRED_EDEFAULT;
-			case MIMEPackage.MIME_MIME_XML__ELEMENT_TYPE:
-				return ELEMENT_TYPE_EDEFAULT == null ? elementType != null : !ELEMENT_TYPE_EDEFAULT.equals(elementType);
-			case MIMEPackage.MIME_MIME_XML__EPART:
-				return ePart != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-  //
-  // Reconcile methods: DOM -> Model
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-  	setPart
-      (MIMEConstants.getAttribute(changedElement, MIMEConstants.PART_ATTRIBUTE));
-    reconcileReferences(false);
-  }
-  
-  //
-  // For reconciliation: Model -> DOM
-  //
-
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeAttribute(eAttribute);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eAttribute == null || eAttribute == MIMEPackage.eINSTANCE. getMIMEContent_EPart())
-        niceSetAttribute(theElement,MIMEConstants.PART_ATTRIBUTE,getPart());
-    }
-  }
-
-} //MIMEMimeXmlImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEMultipartRelatedImpl.java b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEMultipartRelatedImpl.java
deleted file mode 100644
index 865752083..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEMultipartRelatedImpl.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.mime.internal.impl;
-
-import org.eclipse.wst.wsdl.binding.mime.internal.util.MIMEConstants;
-import org.eclipse.wst.wsdl.binding.mime.MIMEFactory;
-
-import java.util.Collection;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.wst.wsdl.binding.mime.MIMEMultipartRelated;
-import org.eclipse.wst.wsdl.binding.mime.MIMEPackage;
-import org.eclipse.wst.wsdl.binding.mime.MIMEPart;
-import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl;
-import org.w3c.dom.Element;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Multipart Related</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.mime.impl.MIMEMultipartRelatedImpl#getEMIMEPart <em>EMIME Part</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class MIMEMultipartRelatedImpl extends ExtensibilityElementImpl implements MIMEMultipartRelated {
-	/**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-  /**
-	 * The cached value of the '{@link #getEMIMEPart() <em>EMIME Part</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEMIMEPart()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList eMIMEPart = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MIMEMultipartRelatedImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return MIMEPackage.eINSTANCE.getMIMEMultipartRelated();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getEMIMEPart() {
-		if (eMIMEPart == null) {
-			eMIMEPart = new EObjectContainmentEList(MIMEPart.class, this, MIMEPackage.MIME_MULTIPART_RELATED__EMIME_PART);
-		}
-		return eMIMEPart;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public void addMIMEPart(javax.wsdl.extensions.mime.MIMEPart mimePart) {
-		getEMIMEPart().add(mimePart);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getMIMEParts() {
-		// TODO: implement this method
-		// Ensure that you remove @generated or mark it @generated NOT
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case MIMEPackage.MIME_MULTIPART_RELATED__EMIME_PART:
-					return ((InternalEList)getEMIMEPart()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MIMEPackage.MIME_MULTIPART_RELATED__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case MIMEPackage.MIME_MULTIPART_RELATED__ELEMENT:
-				return getElement();
-			case MIMEPackage.MIME_MULTIPART_RELATED__REQUIRED:
-				return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-			case MIMEPackage.MIME_MULTIPART_RELATED__ELEMENT_TYPE:
-				return getElementType();
-			case MIMEPackage.MIME_MULTIPART_RELATED__EMIME_PART:
-				return getEMIMEPart();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MIMEPackage.MIME_MULTIPART_RELATED__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case MIMEPackage.MIME_MULTIPART_RELATED__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case MIMEPackage.MIME_MULTIPART_RELATED__REQUIRED:
-				setRequired(((Boolean)newValue).booleanValue());
-				return;
-			case MIMEPackage.MIME_MULTIPART_RELATED__ELEMENT_TYPE:
-				setElementType((QName)newValue);
-				return;
-			case MIMEPackage.MIME_MULTIPART_RELATED__EMIME_PART:
-				getEMIMEPart().clear();
-				getEMIMEPart().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MIMEPackage.MIME_MULTIPART_RELATED__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case MIMEPackage.MIME_MULTIPART_RELATED__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case MIMEPackage.MIME_MULTIPART_RELATED__REQUIRED:
-				setRequired(REQUIRED_EDEFAULT);
-				return;
-			case MIMEPackage.MIME_MULTIPART_RELATED__ELEMENT_TYPE:
-				setElementType(ELEMENT_TYPE_EDEFAULT);
-				return;
-			case MIMEPackage.MIME_MULTIPART_RELATED__EMIME_PART:
-				getEMIMEPart().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MIMEPackage.MIME_MULTIPART_RELATED__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case MIMEPackage.MIME_MULTIPART_RELATED__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case MIMEPackage.MIME_MULTIPART_RELATED__REQUIRED:
-				return required != REQUIRED_EDEFAULT;
-			case MIMEPackage.MIME_MULTIPART_RELATED__ELEMENT_TYPE:
-				return ELEMENT_TYPE_EDEFAULT == null ? elementType != null : !ELEMENT_TYPE_EDEFAULT.equals(elementType);
-			case MIMEPackage.MIME_MULTIPART_RELATED__EMIME_PART:
-				return eMIMEPart != null && !eMIMEPart.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-	
-    public void handleUnreconciledElement(Element child, Collection remainingModelObjects)
-    {
-      if (MIMEConstants.PART_ELEMENT_TAG.equals(child.getLocalName()))
-      {
-        MIMEPart mimePart = MIMEFactory.eINSTANCE.createMIMEPart();
-	    mimePart.setEnclosingDefinition(getEnclosingDefinition());
-	    mimePart.setElement(child);
-        addMIMEPart(mimePart);
-      }
-    }
-} //MIMEMultipartRelatedImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEPackageImpl.java b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEPackageImpl.java
deleted file mode 100644
index ea54c9186..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEPackageImpl.java
+++ /dev/null
@@ -1,427 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.mime.internal.impl;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EOperation;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.binding.mime.MIMEContent;
-import org.eclipse.wst.wsdl.binding.mime.MIMEFactory;
-import org.eclipse.wst.wsdl.binding.mime.MIMEMimeXml;
-import org.eclipse.wst.wsdl.binding.mime.MIMEMultipartRelated;
-import org.eclipse.wst.wsdl.binding.mime.MIMEPackage;
-import org.eclipse.wst.wsdl.binding.mime.MIMEPart;
-import org.eclipse.wst.wsdl.internal.impl.WSDLPackageImpl;
-import org.eclipse.xsd.impl.XSDPackageImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class MIMEPackageImpl extends EPackageImpl implements MIMEPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass mimeContentEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass mimePartEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass mimeMultipartRelatedEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass mimeMimeXmlEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass imimePartEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass imimeMultipartRelatedEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass imimeContentEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass imimeMimeXmlEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType listEDataType = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.wst.wsdl.binding.mime.MIMEPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private MIMEPackageImpl() {
-		super(eNS_URI, MIMEFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this
-	 * model, and for any others upon which it depends.  Simple
-	 * dependencies are satisfied by calling this method on all
-	 * dependent packages before doing anything else.  This method drives
-	 * initialization for interdependent packages directly, in parallel
-	 * with this package, itself.
-	 * <p>Of this package and its interdependencies, all packages which
-	 * have not yet been registered by their URI values are first created
-	 * and registered.  The packages are then initialized in two steps:
-	 * meta-model objects for all of the packages are created before any
-	 * are initialized, since one package's meta-model objects may refer to
-	 * those of another.
-	 * <p>Invocation of this method will not affect any packages that have
-	 * already been initialized.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static MIMEPackage init() {
-		if (isInited) return (MIMEPackage)EPackage.Registry.INSTANCE.get(MIMEPackage.eNS_URI);
-
-		// Obtain or create and register package.
-		MIMEPackageImpl theMIMEPackage = (MIMEPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.get(eNS_URI) : new MIMEPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		XSDPackageImpl.init();
-
-		// Obtain or create and register interdependencies
-		WSDLPackageImpl theWSDLPackage = (WSDLPackageImpl)(EPackage.Registry.INSTANCE.get(WSDLPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.get(WSDLPackage.eNS_URI) : WSDLPackageImpl.eINSTANCE);
-
-		// Step 1: create meta-model objects
-		theMIMEPackage.createPackageContents();
-		theWSDLPackage.createPackageContents();
-
-		// Step 2: complete initialization
-		theMIMEPackage.initializePackageContents();
-		theWSDLPackage.initializePackageContents();
-
-		return theMIMEPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMIMEContent() {
-		return mimeContentEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMIMEContent_Type() {
-		return (EAttribute)mimeContentEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMIMEContent_EPart() {
-		return (EReference)mimeContentEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMIMEPart() {
-		return mimePartEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMIMEMultipartRelated() {
-		return mimeMultipartRelatedEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMIMEMultipartRelated_EMIMEPart() {
-		return (EReference)mimeMultipartRelatedEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMIMEMimeXml() {
-		return mimeMimeXmlEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMIMEMimeXml_EPart() {
-		return (EReference)mimeMimeXmlEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getIMIMEPart() {
-		return imimePartEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getIMIMEMultipartRelated() {
-		return imimeMultipartRelatedEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getIMIMEContent() {
-		return imimeContentEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getIMIMEMimeXml() {
-		return imimeMimeXmlEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getList() {
-		return listEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MIMEFactory getMIMEFactory() {
-		return (MIMEFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		mimeContentEClass = createEClass(MIME_CONTENT);
-		createEAttribute(mimeContentEClass, MIME_CONTENT__TYPE);
-		createEReference(mimeContentEClass, MIME_CONTENT__EPART);
-
-		mimePartEClass = createEClass(MIME_PART);
-
-		mimeMultipartRelatedEClass = createEClass(MIME_MULTIPART_RELATED);
-		createEReference(mimeMultipartRelatedEClass, MIME_MULTIPART_RELATED__EMIME_PART);
-
-		mimeMimeXmlEClass = createEClass(MIME_MIME_XML);
-		createEReference(mimeMimeXmlEClass, MIME_MIME_XML__EPART);
-
-		imimePartEClass = createEClass(IMIME_PART);
-
-		imimeMultipartRelatedEClass = createEClass(IMIME_MULTIPART_RELATED);
-
-		imimeContentEClass = createEClass(IMIME_CONTENT);
-
-		imimeMimeXmlEClass = createEClass(IMIME_MIME_XML);
-
-		// Create data types
-		listEDataType = createEDataType(LIST);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		WSDLPackageImpl theWSDLPackage = (WSDLPackageImpl)EPackage.Registry.INSTANCE.getEPackage(WSDLPackage.eNS_URI);
-
-		// Add supertypes to classes
-		mimeContentEClass.getESuperTypes().add(theWSDLPackage.getExtensibilityElement());
-		mimeContentEClass.getESuperTypes().add(this.getIMIMEContent());
-		mimePartEClass.getESuperTypes().add(theWSDLPackage.getExtensibilityElement());
-		mimePartEClass.getESuperTypes().add(this.getIMIMEPart());
-		mimeMultipartRelatedEClass.getESuperTypes().add(theWSDLPackage.getExtensibilityElement());
-		mimeMultipartRelatedEClass.getESuperTypes().add(this.getIMIMEMultipartRelated());
-		mimeMimeXmlEClass.getESuperTypes().add(theWSDLPackage.getExtensibilityElement());
-		mimeMimeXmlEClass.getESuperTypes().add(this.getIMIMEMimeXml());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(mimeContentEClass, MIMEContent.class, "MIMEContent", !IS_ABSTRACT, !IS_INTERFACE);
-		initEAttribute(getMIMEContent_Type(), ecorePackage.getEString(), "type", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-		initEReference(getMIMEContent_EPart(), theWSDLPackage.getPart(), null, "ePart", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);
-
-		EOperation op = addEOperation(mimeContentEClass, null, "setPart");
-		addEParameter(op, ecorePackage.getEString(), "part");
-
-		addEOperation(mimeContentEClass, ecorePackage.getEString(), "getPart");
-
-		initEClass(mimePartEClass, MIMEPart.class, "MIMEPart", !IS_ABSTRACT, !IS_INTERFACE);
-
-		op = addEOperation(mimePartEClass, null, "addExtensibilityElement");
-		addEParameter(op, theWSDLPackage.getIExtensibilityElement(), "extensibilityElement");
-
-		addEOperation(mimePartEClass, this.getList(), "getExtensibilityElements");
-
-		initEClass(mimeMultipartRelatedEClass, MIMEMultipartRelated.class, "MIMEMultipartRelated", !IS_ABSTRACT, !IS_INTERFACE);
-		initEReference(getMIMEMultipartRelated_EMIMEPart(), this.getMIMEPart(), null, "eMIMEPart", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);
-
-		op = addEOperation(mimeMultipartRelatedEClass, null, "addMIMEPart");
-		addEParameter(op, this.getIMIMEPart(), "mimePart");
-
-		addEOperation(mimeMultipartRelatedEClass, this.getList(), "getMIMEParts");
-
-		initEClass(mimeMimeXmlEClass, MIMEMimeXml.class, "MIMEMimeXml", !IS_ABSTRACT, !IS_INTERFACE);
-		initEReference(getMIMEMimeXml_EPart(), theWSDLPackage.getPart(), null, "ePart", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);
-
-		op = addEOperation(mimeMimeXmlEClass, null, "setPart");
-		addEParameter(op, ecorePackage.getEString(), "part");
-
-		addEOperation(mimeMimeXmlEClass, ecorePackage.getEString(), "getPart");
-
-		initEClass(imimePartEClass, javax.wsdl.extensions.mime.MIMEPart.class, "IMIMEPart", IS_ABSTRACT, IS_INTERFACE);
-
-		initEClass(imimeMultipartRelatedEClass, javax.wsdl.extensions.mime.MIMEMultipartRelated.class, "IMIMEMultipartRelated", IS_ABSTRACT, IS_INTERFACE);
-
-		initEClass(imimeContentEClass, javax.wsdl.extensions.mime.MIMEContent.class, "IMIMEContent", IS_ABSTRACT, IS_INTERFACE);
-
-		initEClass(imimeMimeXmlEClass, javax.wsdl.extensions.mime.MIMEMimeXml.class, "IMIMEMimeXml", IS_ABSTRACT, IS_INTERFACE);
-
-		// Initialize data types
-		initEDataType(listEDataType, List.class, "List", IS_SERIALIZABLE);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-} //MIMEPackageImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEPartImpl.java b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEPartImpl.java
deleted file mode 100644
index b729a4c5e..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEPartImpl.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.mime.internal.impl;
-
-import java.util.List;
-import java.util.Collection;
-
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.wst.wsdl.binding.mime.MIMEPackage;
-import org.eclipse.wst.wsdl.binding.mime.MIMEPart;
-import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl;
-import org.eclipse.wst.wsdl.internal.impl.WSDLFactoryImpl;
-import org.eclipse.wst.wsdl.internal.impl.DefinitionImpl;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-
-import org.w3c.dom.Element;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Part</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class MIMEPartImpl extends ExtensibilityElementImpl implements MIMEPart {
-	
-    /**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-    private List extensibilityElements = new java.util.Vector();
-	
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MIMEPartImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return MIMEPackage.eINSTANCE.getMIMEPart();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public void addExtensibilityElement(ExtensibilityElement extensibilityElement) {
-      getExtensibilityElements().add(extensibilityElement);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public List getExtensibilityElements() {
-      return extensibilityElements;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MIMEPackage.MIME_PART__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case MIMEPackage.MIME_PART__ELEMENT:
-				return getElement();
-			case MIMEPackage.MIME_PART__REQUIRED:
-				return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-			case MIMEPackage.MIME_PART__ELEMENT_TYPE:
-				return getElementType();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MIMEPackage.MIME_PART__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case MIMEPackage.MIME_PART__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case MIMEPackage.MIME_PART__REQUIRED:
-				setRequired(((Boolean)newValue).booleanValue());
-				return;
-			case MIMEPackage.MIME_PART__ELEMENT_TYPE:
-				setElementType((QName)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MIMEPackage.MIME_PART__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case MIMEPackage.MIME_PART__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case MIMEPackage.MIME_PART__REQUIRED:
-				setRequired(REQUIRED_EDEFAULT);
-				return;
-			case MIMEPackage.MIME_PART__ELEMENT_TYPE:
-				setElementType(ELEMENT_TYPE_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MIMEPackage.MIME_PART__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case MIMEPackage.MIME_PART__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case MIMEPackage.MIME_PART__REQUIRED:
-				return required != REQUIRED_EDEFAULT;
-			case MIMEPackage.MIME_PART__ELEMENT_TYPE:
-				return ELEMENT_TYPE_EDEFAULT == null ? elementType != null : !ELEMENT_TYPE_EDEFAULT.equals(elementType);
-		}
-		return eDynamicIsSet(eFeature);
-	}
-	
-  //
-  // Reconciliation: DOM -> MODEL
-  //
-  public void handleUnreconciledElement(Element child, Collection remainingModelObjects)
-  {
-    if (!WSDLConstants.isMatchingNamespace(child.getNamespaceURI(), WSDLConstants.WSDL_NAMESPACE_URI))
-    {  
-      org.eclipse.wst.wsdl.ExtensibilityElement extensibilityElement = useExtensionFactories() ? 
-        ((WSDLFactoryImpl)WSDLFactory.eINSTANCE).createExtensibilityElement(getNamespace(child),getLocalName(child)) :
-            ((WSDLFactoryImpl)WSDLFactory.eINSTANCE).createUnknownExtensibilityElement();
-	          
-      extensibilityElement.setEnclosingDefinition(getEnclosingDefinition());
-      extensibilityElement.setElement(child);
-      addExtensibilityElement(extensibilityElement);
-    }
-  }
-	  
-  private boolean useExtensionFactories()
-  {
-  	// Use extension factories by default.
-    return getEnclosingDefinition() == null ? 
-      true : ((DefinitionImpl)getEnclosingDefinition()).getUseExtensionFactories();
-  }
-
-} //MIMEPartImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMEAdapterFactory.java b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMEAdapterFactory.java
deleted file mode 100644
index aa887e121..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMEAdapterFactory.java
+++ /dev/null
@@ -1,298 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.mime.internal.util;
-
-import javax.wsdl.extensions.ExtensibilityElement;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.binding.mime.MIMEContent;
-import org.eclipse.wst.wsdl.binding.mime.MIMEMimeXml;
-import org.eclipse.wst.wsdl.binding.mime.MIMEMultipartRelated;
-import org.eclipse.wst.wsdl.binding.mime.MIMEPackage;
-import org.eclipse.wst.wsdl.binding.mime.MIMEPart;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.wst.wsdl.binding.mime.MIMEPackage
- * @generated
- */
-public class MIMEAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static MIMEPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MIMEAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = MIMEPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch the delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MIMESwitch modelSwitch =
-		new MIMESwitch() {
-			public Object caseMIMEContent(MIMEContent object) {
-				return createMIMEContentAdapter();
-			}
-			public Object caseMIMEPart(MIMEPart object) {
-				return createMIMEPartAdapter();
-			}
-			public Object caseMIMEMultipartRelated(MIMEMultipartRelated object) {
-				return createMIMEMultipartRelatedAdapter();
-			}
-			public Object caseMIMEMimeXml(MIMEMimeXml object) {
-				return createMIMEMimeXmlAdapter();
-			}
-			public Object caseIMIMEPart(javax.wsdl.extensions.mime.MIMEPart object) {
-				return createIMIMEPartAdapter();
-			}
-			public Object caseIMIMEMultipartRelated(javax.wsdl.extensions.mime.MIMEMultipartRelated object) {
-				return createIMIMEMultipartRelatedAdapter();
-			}
-			public Object caseIMIMEContent(javax.wsdl.extensions.mime.MIMEContent object) {
-				return createIMIMEContentAdapter();
-			}
-			public Object caseIMIMEMimeXml(javax.wsdl.extensions.mime.MIMEMimeXml object) {
-				return createIMIMEMimeXmlAdapter();
-			}
-			public Object caseWSDLElement(WSDLElement object) {
-				return createWSDLElementAdapter();
-			}
-			public Object caseIExtensibilityElement(ExtensibilityElement object) {
-				return createIExtensibilityElementAdapter();
-			}
-			public Object caseExtensibilityElement(org.eclipse.wst.wsdl.ExtensibilityElement object) {
-				return createExtensibilityElementAdapter();
-			}
-			public Object defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	public Adapter createAdapter(Notifier target) {
-		return (Adapter)modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.wst.wsdl.binding.mime.MIMEContent <em>Content</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.wst.wsdl.binding.mime.MIMEContent
-	 * @generated
-	 */
-	public Adapter createMIMEContentAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.wst.wsdl.binding.mime.MIMEPart <em>Part</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.wst.wsdl.binding.mime.MIMEPart
-	 * @generated
-	 */
-	public Adapter createMIMEPartAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.wst.wsdl.binding.mime.MIMEMultipartRelated <em>Multipart Related</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.wst.wsdl.binding.mime.MIMEMultipartRelated
-	 * @generated
-	 */
-	public Adapter createMIMEMultipartRelatedAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.wst.wsdl.binding.mime.MIMEMimeXml <em>Mime Xml</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.wst.wsdl.binding.mime.MIMEMimeXml
-	 * @generated
-	 */
-	public Adapter createMIMEMimeXmlAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link javax.wsdl.extensions.mime.MIMEPart <em>IMIME Part</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see javax.wsdl.extensions.mime.MIMEPart
-	 * @generated
-	 */
-	public Adapter createIMIMEPartAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link javax.wsdl.extensions.mime.MIMEMultipartRelated <em>IMIME Multipart Related</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see javax.wsdl.extensions.mime.MIMEMultipartRelated
-	 * @generated
-	 */
-	public Adapter createIMIMEMultipartRelatedAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link javax.wsdl.extensions.mime.MIMEContent <em>IMIME Content</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see javax.wsdl.extensions.mime.MIMEContent
-	 * @generated
-	 */
-	public Adapter createIMIMEContentAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link javax.wsdl.extensions.mime.MIMEMimeXml <em>IMIME Mime Xml</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see javax.wsdl.extensions.mime.MIMEMimeXml
-	 * @generated
-	 */
-	public Adapter createIMIMEMimeXmlAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.wst.wsdl.WSDLElement <em>Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.wst.wsdl.WSDLElement
-	 * @generated
-	 */
-	public Adapter createWSDLElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link javax.wsdl.extensions.ExtensibilityElement <em>IExtensibility Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see javax.wsdl.extensions.ExtensibilityElement
-	 * @generated
-	 */
-	public Adapter createIExtensibilityElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.wst.wsdl.ExtensibilityElement <em>Extensibility Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.wst.wsdl.ExtensibilityElement
-	 * @generated
-	 */
-	public Adapter createExtensibilityElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //MIMEAdapterFactory
diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMEConstants.java b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMEConstants.java
deleted file mode 100644
index de8989732..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMEConstants.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.mime.internal.util;
-
-import org.w3c.dom.Element;
-
-public final class MIMEConstants 
-{
-  public static final String CONTENT_ELEMENT_TAG = "content";
-  public static final String MIME_XML_ELEMENT_TAG = "mimeXML";
-  public static final String MULTIPART_RELATED_ELEMENT_TAG = "multipartRelated";
-  public static final String PART_ELEMENT_TAG = "part";
-	  
-  public static final String MIME_NAMESPACE_URI = "http://schemas.xmlsoap.org/wsdl/mime/";
-
-  public static final String PART_ATTRIBUTE ="part";
-  public static final String TYPE_ATTRIBUTE ="type";
-  
-  public static String getAttribute(Element element, String attributeName)
-  {
-    return element.hasAttribute(attributeName) ? element.getAttribute(attributeName) : null;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMEExtensibilityElementFactory.java b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMEExtensibilityElementFactory.java
deleted file mode 100644
index 8a5d7bb65..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMEExtensibilityElementFactory.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.mime.internal.util;
-
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.binding.mime.MIMEFactory;
-import org.eclipse.wst.wsdl.util.ExtensibilityElementFactory;
-
-public class MIMEExtensibilityElementFactory implements ExtensibilityElementFactory
-{
-  public ExtensibilityElement createExtensibilityElement(String namespace, String localName)
-  {
-    if (MIMEConstants.MIME_NAMESPACE_URI.equals(namespace))
-    {
-      if (MIMEConstants.CONTENT_ELEMENT_TAG.equals(localName))
-      {
-        return MIMEFactory.eINSTANCE.createMIMEContent();
-      }
-      else if (MIMEConstants.MIME_XML_ELEMENT_TAG.equals(localName))
-      {
-        return MIMEFactory.eINSTANCE.createMIMEMimeXml();
-      }
-      else if (MIMEConstants.MULTIPART_RELATED_ELEMENT_TAG.equals(localName))
-      {
-        return MIMEFactory.eINSTANCE.createMIMEMultipartRelated();
-      }
-      /* TODO - fix the rose model
-      else if ("part".equals(localName))
-      {
-        return MIMEFactory.eINSTANCE.createMIMEPart();
-      }
-      */
-	  else
-	  {
-	    //System.out.println("Unhandled localName: " + localName);
-	    return WSDLFactory.eINSTANCE.createUnknownExtensibilityElement();
-      }
-    }
-    else
-    {
-      //System.out.println("Unhandled namespace: " + namespace);
-      return WSDLFactory.eINSTANCE.createUnknownExtensibilityElement();
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMESwitch.java b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMESwitch.java
deleted file mode 100644
index 53a56dfaa..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMESwitch.java
+++ /dev/null
@@ -1,295 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.mime.internal.util;
-
-import javax.wsdl.extensions.ExtensibilityElement;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.binding.mime.MIMEContent;
-import org.eclipse.wst.wsdl.binding.mime.MIMEMimeXml;
-import org.eclipse.wst.wsdl.binding.mime.MIMEMultipartRelated;
-import org.eclipse.wst.wsdl.binding.mime.MIMEPackage;
-import org.eclipse.wst.wsdl.binding.mime.MIMEPart;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.wst.wsdl.binding.mime.MIMEPackage
- * @generated
- */
-public class MIMESwitch {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static MIMEPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MIMESwitch() {
-		if (modelPackage == null) {
-			modelPackage = MIMEPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	public Object doSwitch(EObject theEObject) {
-		EClass theEClass = theEObject.eClass();
-		if (theEClass.eContainer() == modelPackage) {
-			switch (theEClass.getClassifierID()) {
-				case MIMEPackage.MIME_CONTENT: {
-					MIMEContent mimeContent = (MIMEContent)theEObject;
-					Object result = caseMIMEContent(mimeContent);
-					if (result == null) result = caseExtensibilityElement(mimeContent);
-					if (result == null) result = caseIMIMEContent(mimeContent);
-					if (result == null) result = caseWSDLElement(mimeContent);
-					if (result == null) result = caseIExtensibilityElement(mimeContent);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case MIMEPackage.MIME_PART: {
-					MIMEPart mimePart = (MIMEPart)theEObject;
-					Object result = caseMIMEPart(mimePart);
-					if (result == null) result = caseExtensibilityElement(mimePart);
-					if (result == null) result = caseIMIMEPart(mimePart);
-					if (result == null) result = caseWSDLElement(mimePart);
-					if (result == null) result = caseIExtensibilityElement(mimePart);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case MIMEPackage.MIME_MULTIPART_RELATED: {
-					MIMEMultipartRelated mimeMultipartRelated = (MIMEMultipartRelated)theEObject;
-					Object result = caseMIMEMultipartRelated(mimeMultipartRelated);
-					if (result == null) result = caseExtensibilityElement(mimeMultipartRelated);
-					if (result == null) result = caseIMIMEMultipartRelated(mimeMultipartRelated);
-					if (result == null) result = caseWSDLElement(mimeMultipartRelated);
-					if (result == null) result = caseIExtensibilityElement(mimeMultipartRelated);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case MIMEPackage.MIME_MIME_XML: {
-					MIMEMimeXml mimeMimeXml = (MIMEMimeXml)theEObject;
-					Object result = caseMIMEMimeXml(mimeMimeXml);
-					if (result == null) result = caseExtensibilityElement(mimeMimeXml);
-					if (result == null) result = caseIMIMEMimeXml(mimeMimeXml);
-					if (result == null) result = caseWSDLElement(mimeMimeXml);
-					if (result == null) result = caseIExtensibilityElement(mimeMimeXml);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				default: return defaultCase(theEObject);
-			}
-		}
-		return defaultCase(theEObject);
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Content</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Content</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMIMEContent(MIMEContent object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Part</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Part</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMIMEPart(MIMEPart object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Multipart Related</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Multipart Related</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMIMEMultipartRelated(MIMEMultipartRelated object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Mime Xml</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Mime Xml</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMIMEMimeXml(MIMEMimeXml object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IMIME Part</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IMIME Part</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseIMIMEPart(javax.wsdl.extensions.mime.MIMEPart object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IMIME Multipart Related</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IMIME Multipart Related</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseIMIMEMultipartRelated(javax.wsdl.extensions.mime.MIMEMultipartRelated object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IMIME Content</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IMIME Content</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseIMIMEContent(javax.wsdl.extensions.mime.MIMEContent object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IMIME Mime Xml</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IMIME Mime Xml</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseIMIMEMimeXml(javax.wsdl.extensions.mime.MIMEMimeXml object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseWSDLElement(WSDLElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IExtensibility Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IExtensibility Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseIExtensibilityElement(ExtensibilityElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Extensibility Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Extensibility Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseExtensibilityElement(org.eclipse.wst.wsdl.ExtensibilityElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	public Object defaultCase(EObject object) {
-		return null;
-	}
-
-} //MIMESwitch
diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/model/SOAP.genmodel b/bundles/org.eclipse.wst.wsdl/src-soap/model/SOAP.genmodel
deleted file mode 100644
index bc441cf82..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/model/SOAP.genmodel
+++ /dev/null
@@ -1,429 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<genmodel:GenModel xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/com.ibm.etools.wsdl.binding.soap/src"
-    editDirectory="/com.ibm.etools.wsdl.binding.soap.edit/src" editorDirectory="/com.ibm.etools.wsdl.binding.soap.editor/src"
-    modelPluginID="com.ibm.etools.wsdl.binding.soap" modelName="SOAP" editPluginClass=""
-    editorPluginClass="" usedGenPackages="../../../org.eclipse.xsd/src/model/XSD.genmodel#//xsd">
-  <foreignModel>..\rose\soap.mdl</foreignModel>
-  <foreignModel>VABASE_PLUGINS_PATH</foreignModel>
-  <foreignModel>../../..</foreignModel>
-  <genPackages prefix="SOAP" basePackage="com.ibm.etools.wsdl.binding" ecorePackage="soap.ecore#/">
-    <genDataTypes ecoreDataType="soap.ecore#//IString"/>
-    <genClasses ecoreClass="soap.ecore#//SOAPBinding">
-      <genFeatures ecoreFeature="ecore:EAttribute soap.ecore#//SOAPBinding/transportURI"/>
-      <genFeatures ecoreFeature="ecore:EAttribute soap.ecore#//SOAPBinding/style"/>
-    </genClasses>
-    <genClasses ecoreClass="soap.ecore#//SOAPBody">
-      <genFeatures ecoreFeature="ecore:EAttribute soap.ecore#//SOAPBody/use"/>
-      <genFeatures ecoreFeature="ecore:EAttribute soap.ecore#//SOAPBody/namespaceURI"/>
-      <genFeatures ecoreFeature="ecore:EAttribute soap.ecore#//SOAPBody/encodingStyles"/>
-      <genFeatures notify="false" ecoreFeature="ecore:EReference soap.ecore#//SOAPBody/parts"/>
-    </genClasses>
-    <genClasses ecoreClass="soap.ecore#//SOAPHeaderBase">
-      <genFeatures ecoreFeature="ecore:EAttribute soap.ecore#//SOAPHeaderBase/use"/>
-      <genFeatures ecoreFeature="ecore:EAttribute soap.ecore#//SOAPHeaderBase/namespaceURI"/>
-      <genFeatures ecoreFeature="ecore:EAttribute soap.ecore#//SOAPHeaderBase/encodingStyles"/>
-      <genFeatures notify="false" ecoreFeature="ecore:EReference soap.ecore#//SOAPHeaderBase/message"/>
-      <genFeatures notify="false" ecoreFeature="ecore:EReference soap.ecore#//SOAPHeaderBase/part"/>
-    </genClasses>
-    <genClasses ecoreClass="soap.ecore#//SOAPFault">
-      <genFeatures ecoreFeature="ecore:EAttribute soap.ecore#//SOAPFault/use"/>
-      <genFeatures ecoreFeature="ecore:EAttribute soap.ecore#//SOAPFault/namespaceURI"/>
-      <genFeatures ecoreFeature="ecore:EAttribute soap.ecore#//SOAPFault/encodingStyles"/>
-    </genClasses>
-    <genClasses ecoreClass="soap.ecore#//SOAPOperation">
-      <genFeatures ecoreFeature="ecore:EAttribute soap.ecore#//SOAPOperation/soapActionURI"/>
-      <genFeatures ecoreFeature="ecore:EAttribute soap.ecore#//SOAPOperation/style"/>
-    </genClasses>
-    <genClasses ecoreClass="soap.ecore#//SOAPAddress">
-      <genFeatures ecoreFeature="ecore:EAttribute soap.ecore#//SOAPAddress/locationURI"/>
-    </genClasses>
-    <genClasses ecoreClass="soap.ecore#//SOAPHeaderFault"/>
-    <genClasses ecoreClass="soap.ecore#//SOAPHeader">
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference soap.ecore#//SOAPHeader/headerFaults"/>
-    </genClasses>
-  </genPackages>
-  <genPackages prefix="WSDL" basePackage="com.ibm.etools" ecorePackage="wsdl.ecore#/">
-    <genDataTypes ecoreDataType="wsdl.ecore#//QName"/>
-    <genDataTypes ecoreDataType="wsdl.ecore#//OperationType"/>
-    <genDataTypes ecoreDataType="wsdl.ecore#//DOMElement"/>
-    <genDataTypes ecoreDataType="wsdl.ecore#//WSDLException"/>
-    <genDataTypes ecoreDataType="wsdl.ecore#//DOMDocument"/>
-    <genClasses ecoreClass="wsdl.ecore#//WSDLElement">
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//WSDLElement/documentationElement"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//WSDLElement/element"/>
-      <genOperations ecoreOperation="wsdl.ecore#//WSDLElement/getEnclosingDefinition"/>
-      <genOperations ecoreOperation="wsdl.ecore#//WSDLElement/setEnclosingDefinition">
-        <genParameters ecoreParameter="wsdl.ecore#//WSDLElement/setEnclosingDefinition/definition"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//PortType">
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//PortType/qName"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//PortType/undefined"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//PortType/proxy"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//PortType/resourceURI"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdl.ecore#//PortType/eOperations"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Operation">
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Operation/style"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Operation/name"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Operation/undefined"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Operation/proxy"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Operation/resourceURI"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdl.ecore#//Operation/eInput"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdl.ecore#//Operation/eOutput"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdl.ecore#//Operation/eFaults"/>
-      <genFeatures notify="false" ecoreFeature="ecore:EReference wsdl.ecore#//Operation/eParameterOrdering"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Message">
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Message/qName"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Message/undefined"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Message/proxy"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Message/resourceURI"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdl.ecore#//Message/eParts"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Part">
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Part/name"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Part/elementName"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Part/typeName"/>
-      <genFeatures notify="false" ecoreFeature="ecore:EReference wsdl.ecore#//Part/typeDefinition"/>
-      <genFeatures notify="false" ecoreFeature="ecore:EReference wsdl.ecore#//Part/elementDeclaration"/>
-      <genFeatures notify="false" ecoreFeature="ecore:EReference wsdl.ecore#//Part/eMessage"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Binding">
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Binding/qName"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Binding/undefined"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Binding/proxy"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Binding/resourceURI"/>
-      <genFeatures notify="false" ecoreFeature="ecore:EReference wsdl.ecore#//Binding/ePortType"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdl.ecore#//Binding/eBindingOperations"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//BindingOperation">
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//BindingOperation/name"/>
-      <genFeatures notify="false" ecoreFeature="ecore:EReference wsdl.ecore#//BindingOperation/eOperation"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdl.ecore#//BindingOperation/eBindingInput"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdl.ecore#//BindingOperation/eBindingOutput"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdl.ecore#//BindingOperation/eBindingFaults"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Service">
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Service/qName"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Service/undefined"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Service/proxy"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Service/resourceURI"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdl.ecore#//Service/ePorts"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Port">
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Port/name"/>
-      <genFeatures notify="false" ecoreFeature="ecore:EReference wsdl.ecore#//Port/eBinding"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//ExtensibilityElement">
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//ExtensibilityElement/required"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//ExtensibilityElement/elementType"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Definition">
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Definition/targetNamespace"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Definition/location"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Definition/qName"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Definition/encoding"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eMessages"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/ePortTypes"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eBindings"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eServices"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eNamespaces"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eTypes"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eImports"/>
-      <genOperations ecoreOperation="wsdl.ecore#//Definition/getDocument"/>
-      <genOperations ecoreOperation="wsdl.ecore#//Definition/setDocument">
-        <genParameters ecoreParameter="wsdl.ecore#//Definition/setDocument/document"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Import">
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Import/namespaceURI"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Import/locationURI"/>
-      <genFeatures notify="false" ecoreFeature="ecore:EReference wsdl.ecore#//Import/eDefinition"/>
-      <genFeatures notify="false" ecoreFeature="ecore:EReference wsdl.ecore#//Import/eSchema"/>
-      <genOperations ecoreOperation="wsdl.ecore#//Import/getSchema"/>
-      <genOperations ecoreOperation="wsdl.ecore#//Import/setSchema">
-        <genParameters ecoreParameter="wsdl.ecore#//Import/setSchema/schema"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//ExtensibleElement">
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdl.ecore#//ExtensibleElement/eExtensibilityElements"/>
-      <genOperations ecoreOperation="wsdl.ecore#//ExtensibleElement/getExtensibilityElements"/>
-      <genOperations ecoreOperation="wsdl.ecore#//ExtensibleElement/addExtensibilityElement">
-        <genParameters ecoreParameter="wsdl.ecore#//ExtensibleElement/addExtensibilityElement/extElement"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Input"/>
-    <genClasses ecoreClass="wsdl.ecore#//Output"/>
-    <genClasses ecoreClass="wsdl.ecore#//Fault"/>
-    <genClasses ecoreClass="wsdl.ecore#//BindingInput">
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//BindingInput/name"/>
-      <genFeatures notify="false" ecoreFeature="ecore:EReference wsdl.ecore#//BindingInput/eInput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//BindingInput/getInput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//BindingInput/setInput">
-        <genParameters ecoreParameter="wsdl.ecore#//BindingInput/setInput/input"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//BindingOutput">
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//BindingOutput/name"/>
-      <genFeatures notify="false" ecoreFeature="ecore:EReference wsdl.ecore#//BindingOutput/eOutput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//BindingOutput/getOutput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//BindingOutput/setOutput">
-        <genParameters ecoreParameter="wsdl.ecore#//BindingOutput/setOutput/output"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//BindingFault">
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//BindingFault/name"/>
-      <genFeatures notify="false" ecoreFeature="ecore:EReference wsdl.ecore#//BindingFault/eFault"/>
-      <genOperations ecoreOperation="wsdl.ecore#//BindingFault/getFault"/>
-      <genOperations ecoreOperation="wsdl.ecore#//BindingFault/setFault">
-        <genParameters ecoreParameter="wsdl.ecore#//BindingFault/setFault/fault"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Namespace">
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Namespace/URI"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Namespace/prefix"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IPortType">
-      <genOperations ecoreOperation="wsdl.ecore#//IPortType/addOperation">
-        <genParameters ecoreParameter="wsdl.ecore#//IPortType/addOperation/operation"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IPortType/getOperation">
-        <genParameters ecoreParameter="wsdl.ecore#//IPortType/getOperation/name"/>
-        <genParameters ecoreParameter="wsdl.ecore#//IPortType/getOperation/inputName"/>
-        <genParameters ecoreParameter="wsdl.ecore#//IPortType/getOperation/outputName"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IPortType/getOperations"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IOperation">
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/addFault">
-        <genParameters ecoreParameter="wsdl.ecore#//IOperation/addFault/fault"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/getFault">
-        <genParameters ecoreParameter="wsdl.ecore#//IOperation/getFault/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/getFaults"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/getParameterOrdering"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/setParameterOrdering">
-        <genParameters ecoreParameter="wsdl.ecore#//IOperation/setParameterOrdering/parameterOrder"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/getInput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/setInput">
-        <genParameters ecoreParameter="wsdl.ecore#//IOperation/setInput/input"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/getOutput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/setOutput">
-        <genParameters ecoreParameter="wsdl.ecore#//IOperation/setOutput/output"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IInput">
-      <genOperations ecoreOperation="wsdl.ecore#//IInput/getMessage"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IInput/setMessage">
-        <genParameters ecoreParameter="wsdl.ecore#//IInput/setMessage/message"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IOutput">
-      <genOperations ecoreOperation="wsdl.ecore#//IOutput/getMessage"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IOutput/setMessage">
-        <genParameters ecoreParameter="wsdl.ecore#//IOutput/setMessage/message"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IFault">
-      <genOperations ecoreOperation="wsdl.ecore#//IFault/getMessage"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IFault/setMessage">
-        <genParameters ecoreParameter="wsdl.ecore#//IFault/setMessage/message"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IMessage">
-      <genOperations ecoreOperation="wsdl.ecore#//IMessage/addPart">
-        <genParameters ecoreParameter="wsdl.ecore#//IMessage/addPart/part"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IMessage/getPart">
-        <genParameters ecoreParameter="wsdl.ecore#//IMessage/getPart/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IMessage/getParts"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IMessage/getOrderedParts">
-        <genParameters ecoreParameter="wsdl.ecore#//IMessage/getOrderedParts/partOrder"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IPart">
-      <genOperations ecoreOperation="wsdl.ecore#//IPart/setExtensionAttribute">
-        <genParameters ecoreParameter="wsdl.ecore#//IPart/setExtensionAttribute/name"/>
-        <genParameters ecoreParameter="wsdl.ecore#//IPart/setExtensionAttribute/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IPart/getExtensionAttributeNames"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IPart/getExtensionAttribute">
-        <genParameters ecoreParameter="wsdl.ecore#//IPart/getExtensionAttribute/name"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IService">
-      <genOperations ecoreOperation="wsdl.ecore#//IService/addPort">
-        <genParameters ecoreParameter="wsdl.ecore#//IService/addPort/port"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IService/getPorts"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IService/getPort">
-        <genParameters ecoreParameter="wsdl.ecore#//IService/getPort/name"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IPort">
-      <genOperations ecoreOperation="wsdl.ecore#//IPort/getBinding"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IPort/setBinding">
-        <genParameters ecoreParameter="wsdl.ecore#//IPort/setBinding/binding"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IBinding">
-      <genOperations ecoreOperation="wsdl.ecore#//IBinding/addBindingOperation">
-        <genParameters ecoreParameter="wsdl.ecore#//IBinding/addBindingOperation/bindingOperation"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IBinding/getBindingOperation">
-        <genParameters ecoreParameter="wsdl.ecore#//IBinding/getBindingOperation/name"/>
-        <genParameters ecoreParameter="wsdl.ecore#//IBinding/getBindingOperation/inputName"/>
-        <genParameters ecoreParameter="wsdl.ecore#//IBinding/getBindingOperation/outputName"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IBinding/getBindingOperations"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IBinding/getPortType"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IBinding/setPortType">
-        <genParameters ecoreParameter="wsdl.ecore#//IBinding/setPortType/portType"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IBindingOperation">
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/addBindingFault">
-        <genParameters ecoreParameter="wsdl.ecore#//IBindingOperation/addBindingFault/bindingFault"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/getBindingFault">
-        <genParameters ecoreParameter="wsdl.ecore#//IBindingOperation/getBindingFault/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/getBindingFaults"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/getOperation"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/setOperation">
-        <genParameters ecoreParameter="wsdl.ecore#//IBindingOperation/setOperation/operation"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/getBindingInput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/setBindingInput">
-        <genParameters ecoreParameter="wsdl.ecore#//IBindingOperation/setBindingInput/bindingInput"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/getBindingOutput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/setBindingOutput">
-        <genParameters ecoreParameter="wsdl.ecore#//IBindingOperation/setBindingOutput/bindingOutput"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IBindingInput"/>
-    <genClasses ecoreClass="wsdl.ecore#//IBindingOutput"/>
-    <genClasses ecoreClass="wsdl.ecore#//IBindingFault"/>
-    <genClasses ecoreClass="wsdl.ecore#//IExtensibilityElement"/>
-    <genClasses ecoreClass="wsdl.ecore#//IDefinition">
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addBinding">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addBinding/binding"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addImport">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addImport/importDef"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addMessage">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addMessage/message"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addNamespace">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addNamespace/prefix"/>
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addNamespace/namespaceURI"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addPortType">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addPortType/portType"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addService">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addService/service"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createBindingFault"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createBindingInput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createBindingOutput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createBindingOperation"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createBinding"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createFault"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createImport"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createInput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createMessage"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createOperation"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createOutput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createPart"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createPort"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createPortType"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createService"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getBinding">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getBinding/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getBindings"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getImports"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getImports.1">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getImports.1/namespaceURI"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getMessage">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getMessage/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getMessages"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getNamespace">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getNamespace/prefix"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getNamespaces"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getPortType">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getPortType/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getPortTypes"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getPrefix">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getPrefix/namespaceURI"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getService">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getService/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getServices"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getExtensionRegistry"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/setExtensionRegistry">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/setExtensionRegistry/extensionRegistry"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getDocumentBaseURI"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/setDocumentBaseURI">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/setDocumentBaseURI/documentBase"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createTypes"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/removeService">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/removeService/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/removeBinding">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/removeBinding/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/removePortType">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/removePortType/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/removeMessage">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/removeMessage/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getTypes"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/setTypes">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/setTypes/types"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IImport"/>
-    <genClasses ecoreClass="wsdl.ecore#//IList"/>
-    <genClasses ecoreClass="wsdl.ecore#//IMap"/>
-    <genClasses ecoreClass="wsdl.ecore#//IURL"/>
-    <genClasses ecoreClass="wsdl.ecore#//IExtensionRegistry"/>
-    <genClasses ecoreClass="wsdl.ecore#//Types">
-      <genOperations ecoreOperation="wsdl.ecore#//Types/getSchemas"/>
-      <genOperations ecoreOperation="wsdl.ecore#//Types/getSchemas.1">
-        <genParameters ecoreParameter="wsdl.ecore#//Types/getSchemas.1/namespaceURI"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IIterator"/>
-    <genClasses ecoreClass="wsdl.ecore#//ITypes"/>
-    <genClasses ecoreClass="wsdl.ecore#//UnknownExtensibilityElement">
-      <genFeatures notify="false" ecoreFeature="ecore:EReference wsdl.ecore#//UnknownExtensibilityElement/parent"/>
-      <genFeatures notify="false" ecoreFeature="ecore:EReference wsdl.ecore#//UnknownExtensibilityElement/children"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//XSDSchemaExtensibilityElement">
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdl.ecore#//XSDSchemaExtensibilityElement/schema"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//MessageReference">
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//MessageReference/name"/>
-      <genFeatures notify="false" ecoreFeature="ecore:EReference wsdl.ecore#//MessageReference/eMessage"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/model/com.ibm.etools.wsdl.bindings.SOAP.cat b/bundles/org.eclipse.wst.wsdl/src-soap/model/com.ibm.etools.wsdl.bindings.SOAP.cat
deleted file mode 100644
index a2b034f9c..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/model/com.ibm.etools.wsdl.bindings.SOAP.cat
+++ /dev/null
@@ -1,945 +0,0 @@
-
-(object Petal
-    version    	42
-    _written   	"Rose 4.5.8054a"
-    charSet    	0)
-
-(object Class_Category "soap"
-    is_unit    	TRUE
-    is_loaded  	TRUE
-    quid       	"3A01CF0C01A2"
-    exportControl 	"Public"
-    logical_models 	(list unit_reference_list
-	(object Class "SOAPBinding"
-	    quid       	"3A01D3B901AD"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AE09A3801AB"
-		    supplier   	"Logical View::wsdl::ExtensibilityElement"
-		    quidu      	"3AD5DBB602A9"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "transportURI"
-		    quid       	"3A01D3DF01E4"
-		    type       	"String")
-		(object ClassAttribute "style"
-		    quid       	"3A01D3F1029E"
-		    type       	"String"))
-	    language   	"Java")
-	(object Class "SOAPBody"
-	    quid       	"3A01DED5031F"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AE09A450041"
-		    supplier   	"Logical View::wsdl::ExtensibilityElement"
-		    quidu      	"3AD5DBB602A9"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "use"
-		    quid       	"3A01E2D501A5"
-		    type       	"String")
-		(object ClassAttribute "namespaceURI"
-		    quid       	"3A93477C01B2"
-		    type       	"String")
-		(object ClassAttribute "encodingStyles"
-		    quid       	"3EE4A4DB0072"
-		    stereotype 	"0..*"
-		    type       	"IString"))
-	    language   	"Java")
-	(object Class "SOAPHeaderBase"
-	    quid       	"3A01DEE7034D"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AE09A3E0326"
-		    supplier   	"Logical View::wsdl::ExtensibilityElement"
-		    quidu      	"3AD5DBB602A9"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "use"
-		    quid       	"3AD62E9C0056"
-		    type       	"String")
-		(object ClassAttribute "namespaceURI"
-		    quid       	"3AD62EA2025D"
-		    type       	"String")
-		(object ClassAttribute "encodingStyles"
-		    quid       	"3EE4A58F01AE"
-		    stereotype 	"0..*"
-		    type       	"IString"))
-	    language   	"Java")
-	(object Class "SOAPFault"
-	    quid       	"3A06D9FA00F7"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AE09A4A0020"
-		    supplier   	"Logical View::wsdl::ExtensibilityElement"
-		    quidu      	"3AD5DBB602A9"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "use"
-		    quid       	"3A09821A012B"
-		    type       	"String")
-		(object ClassAttribute "namespaceURI"
-		    quid       	"3AD6204803AE"
-		    type       	"String")
-		(object ClassAttribute "encodingStyles"
-		    quid       	"3EE4A56303AF"
-		    stereotype 	"0..*"
-		    type       	"IString"))
-	    language   	"Java")
-	(object Class "SOAPOperation"
-	    quid       	"3A0AD45500E8"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AE09A4E031F"
-		    supplier   	"Logical View::wsdl::ExtensibilityElement"
-		    quidu      	"3AD5DBB602A9"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "soapActionURI"
-		    quid       	"3A0AD464004A"
-		    type       	"String")
-		(object ClassAttribute "style"
-		    quid       	"3A0AD46C018C"
-		    type       	"String"))
-	    language   	"Java")
-	(object Class "SOAPAddress"
-	    quid       	"3AD1FF750287"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AE095350098"
-		    supplier   	"Logical View::wsdl::ExtensibilityElement"
-		    quidu      	"3AD5DBB602A9"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "locationURI"
-		    quid       	"3AD211C9025C"
-		    type       	"String"))
-	    language   	"Java")
-	(object Class "SOAPHeaderFault"
-	    quid       	"3AD632B803DD"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AD633340038"
-		    supplier   	"Logical View::soap::SOAPHeaderBase"
-		    quidu      	"3A01DEE7034D"))
-	    language   	"Java")
-	(object Class "SOAPHeader"
-	    quid       	"3AD63309016D"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AD63330017D"
-		    supplier   	"Logical View::soap::SOAPHeaderBase"
-		    quidu      	"3A01DEE7034D"))
-	    language   	"Java")
-	(object Class "IString"
-	    quid       	"3B8DD90C0220"
-	    stereotype 	"datatype"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "java.lang.String"
-		    quid       	"3B8DD9320383"
-		    stereotype 	"javaclass")))
-	(object Association "$UNNAMED$0"
-	    quid       	"3A06E0B50036"
-	    roles      	(list role_list
-		(object Role "$UNNAMED$1"
-		    quid       	"3A06E0B600C4"
-		    supplier   	"Logical View::soap::SOAPBody"
-		    quidu      	"3A01DED5031F")
-		(object Role "parts"
-		    quid       	"3A06E0B600C5"
-		    label      	"parts"
-		    supplier   	"Logical View::wsdl::Part"
-		    quidu      	"3AD5CE1C032E"
-		    client_cardinality 	(value cardinality "0..n")
-		    Containment 	"By Reference"
-		    is_navigable 	TRUE)))
-	(object Association "$UNNAMED$2"
-	    quid       	"3AD62DE60130"
-	    roles      	(list role_list
-		(object Role "message"
-		    quid       	"3AD62DE7004B"
-		    label      	"message"
-		    supplier   	"Logical View::wsdl::Message"
-		    quidu      	"3AD5C9590078"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$3"
-		    quid       	"3AD62DE70055"
-		    supplier   	"Logical View::soap::SOAPHeaderBase"
-		    quidu      	"3A01DEE7034D")))
-	(object Association "$UNNAMED$4"
-	    quid       	"3AD62DF802D1"
-	    roles      	(list role_list
-		(object Role "part"
-		    quid       	"3AD62DFA0002"
-		    label      	"part"
-		    supplier   	"Logical View::wsdl::Part"
-		    quidu      	"3AD5CE1C032E"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$5"
-		    quid       	"3AD62DFA0003"
-		    supplier   	"Logical View::soap::SOAPHeaderBase"
-		    quidu      	"3A01DEE7034D")))
-	(object Association "$UNNAMED$6"
-	    quid       	"3AD6333701CD"
-	    roles      	(list role_list
-		(object Role "$UNNAMED$7"
-		    quid       	"3AD633370372"
-		    supplier   	"Logical View::soap::SOAPHeader"
-		    quidu      	"3AD63309016D"
-		    is_aggregate 	TRUE)
-		(object Role "headerFaults"
-		    quid       	"3AD633370373"
-		    label      	"headerFaults"
-		    supplier   	"Logical View::soap::SOAPHeaderFault"
-		    quidu      	"3AD632B803DD"
-		    client_cardinality 	(value cardinality "0..n")
-		    Constraints 	"ordered"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE))))
-    logical_presentations 	(list unit_reference_list
-	(object ClassDiagram "Binding"
-	    quid       	"3A01CF23029F"
-	    title      	"Binding"
-	    zoom       	87
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	0
-	    origin_y   	324
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::soap::SOAPBinding" @1
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(272, 208)
-		    label      	(object ItemLabel
-			Parent_View 	@1
-			location   	(55, 100)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	434
-			justify    	0
-			label      	"SOAPBinding")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3A01D3B901AD"
-		    width      	452
-		    height     	240
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::soap::SOAPOperation" @2
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1040, 208)
-		    label      	(object ItemLabel
-			Parent_View 	@2
-			location   	(803, 100)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	474
-			justify    	0
-			label      	"SOAPOperation")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3A0AD45500E8"
-		    width      	492
-		    height     	240
-		    annotation 	8)
-		(object ClassView "Class" "Logical View::soap::SOAPHeader" @3
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(560, 960)
-		    label      	(object ItemLabel
-			Parent_View 	@3
-			location   	(395, 907)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	330
-			justify    	0
-			label      	"SOAPHeader")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD63309016D"
-		    width      	348
-		    height     	130
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::soap::SOAPHeaderFault" @4
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1360, 960)
-		    label      	(object ItemLabel
-			Parent_View 	@4
-			location   	(1142, 907)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	436
-			justify    	0
-			label      	"SOAPHeaderFault")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD632B803DD"
-		    width      	454
-		    height     	130
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$6" @5
-		    location   	(933, 961)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD6333701CD"
-		    roleview_list 	(list RoleViews
-			(object RoleView "$UNNAMED$7" @6
-			    Parent_View 	@5
-			    location   	(277, -543)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD633370372"
-			    client     	@5
-			    supplier   	@3
-			    line_style 	3
-			    origin_attachment 	(933, 961)
-			    terminal_attachment 	(734, 961))
-			(object RoleView "headerFaults" @7
-			    Parent_View 	@5
-			    location   	(277, -543)
-			    label      	(object SegLabel @8
-				Parent_View 	@7
-				location   	(928, 921)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	346
-				justify    	0
-				label      	"+headerFaults"
-				pctDist    	-0.030702
-				height     	41
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD633370373"
-			    client     	@5
-			    supplier   	@4
-			    line_style 	3
-			    origin_attachment 	(933, 961)
-			    terminal_attachment 	(1133, 961)
-			    label      	(object SegLabel @9
-				Parent_View 	@7
-				location   	(1080, 924)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..*"
-				pctDist    	0.736842
-				height     	38
-				orientation 	0)
-			    label      	(object SegLabel @10
-				Parent_View 	@7
-				location   	(1056, 999)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	151
-				justify    	0
-				label      	"{ordered}"
-				pctDist    	0.614035
-				height     	38
-				orientation 	1))))
-		(object ClassView "Class" "Logical View::wsdl::Message" @11
-		    ShowCompartmentStereotypes 	TRUE
-		    location   	(1824, 496)
-		    label      	(object ItemLabel
-			Parent_View 	@11
-			location   	(1701, 419)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	246
-			justify    	0
-			label      	"Message")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5C9590078"
-		    width      	264
-		    height     	178
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::soap::SOAPHeaderBase" @12
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1040, 528)
-		    label      	(object ItemLabel
-			Parent_View 	@12
-			location   	(794, 420)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	492
-			justify    	0
-			label      	"SOAPHeaderBase")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3A01DEE7034D"
-		    width      	510
-		    height     	240
-		    annotation 	8)
-		(object AssociationViewNew "$UNNAMED$2" @13
-		    location   	(1493, 485)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD62DE60130"
-		    roleview_list 	(list RoleViews
-			(object RoleView "message" @14
-			    Parent_View 	@13
-			    location   	(341, -683)
-			    label      	(object SegLabel @15
-				Parent_View 	@14
-				location   	(1574, 515)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	256
-				justify    	0
-				label      	"+message"
-				pctDist    	0.412322
-				height     	30
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD62DE7004B"
-			    client     	@13
-			    supplier   	@11
-			    line_style 	3
-			    origin_attachment 	(1493, 485)
-			    terminal_attachment 	(1692, 485)
-			    label      	(object SegLabel @16
-				Parent_View 	@14
-				location   	(1630, 448)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.687204
-				height     	38
-				orientation 	0))
-			(object RoleView "$UNNAMED$3" @17
-			    Parent_View 	@13
-			    location   	(341, -683)
-			    label      	(object SegLabel @18
-				Parent_View 	@17
-				location   	(1420, 525)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	192
-				justify    	0
-				label      	""
-				pctDist    	0.372254
-				height     	40
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD62DE70055"
-			    client     	@13
-			    supplier   	@12
-			    line_style 	3
-			    origin_attachment 	(1493, 485)
-			    terminal_attachment 	(1295, 485))))
-		(object ClassView "Class" "Logical View::soap::SOAPBody" @19
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1040, 1344)
-		    label      	(object ItemLabel
-			Parent_View 	@19
-			location   	(794, 1236)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	492
-			justify    	0
-			label      	"SOAPBody")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3A01DED5031F"
-		    width      	510
-		    height     	240
-		    annotation 	8)
-		(object ClassView "Class" "Logical View::wsdl::Part" @20
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1824, 1200)
-		    label      	(object ItemLabel
-			Parent_View 	@20
-			location   	(1628, 956)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	392
-			justify    	0
-			label      	"Part")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5CE1C032E"
-		    width      	410
-		    height     	512
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$4" @21
-		    location   	(1590, 704)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD62DF802D1"
-		    roleview_list 	(list RoleViews
-			(object RoleView "part" @22
-			    Parent_View 	@21
-			    location   	(438, -464)
-			    label      	(object SegLabel @23
-				Parent_View 	@22
-				location   	(1917, 886)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	120
-				justify    	0
-				label      	"+part"
-				pctDist    	0.881465
-				height     	90
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD62DFA0002"
-			    client     	@21
-			    supplier   	@20
-			    vertices   	(list Points
-				(1590, 704)
-				(1827, 704)
-				(1827, 944))
-			    line_style 	3
-			    origin_attachment 	(1590, 704)
-			    terminal_attachment 	(1827, 944)
-			    label      	(object SegLabel @24
-				Parent_View 	@22
-				location   	(1774, 886)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.881465
-				height     	54
-				orientation 	1))
-			(object RoleView "$UNNAMED$5" @25
-			    Parent_View 	@21
-			    location   	(438, -464)
-			    label      	(object SegLabel @26
-				Parent_View 	@25
-				location   	(1209, 746)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	120
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD62DFA0003"
-			    client     	@21
-			    supplier   	@12
-			    vertices   	(list Points
-				(1590, 704)
-				(1170, 704)
-				(1170, 648))
-			    line_style 	3
-			    origin_attachment 	(1590, 704)
-			    terminal_attachment 	(1170, 648))))
-		(object AssociationViewNew "$UNNAMED$0" @27
-		    location   	(1457, 1390)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3A06E0B50036"
-		    roleview_list 	(list RoleViews
-			(object RoleView "$UNNAMED$1" @28
-			    Parent_View 	@27
-			    location   	(225, -914)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A06E0B600C4"
-			    client     	@27
-			    supplier   	@19
-			    line_style 	3
-			    origin_attachment 	(1457, 1390)
-			    terminal_attachment 	(1295, 1390))
-			(object RoleView "parts" @29
-			    Parent_View 	@27
-			    location   	(225, -914)
-			    label      	(object SegLabel @30
-				Parent_View 	@29
-				location   	(1591, 1494)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	159
-				justify    	0
-				label      	"+parts"
-				pctDist    	0.833856
-				height     	104
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A06E0B600C5"
-			    client     	@27
-			    supplier   	@20
-			    line_style 	3
-			    origin_attachment 	(1457, 1390)
-			    terminal_attachment 	(1619, 1390)
-			    label      	(object SegLabel @31
-				Parent_View 	@29
-				location   	(1591, 1344)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..*"
-				pctDist    	0.833856
-				height     	47
-				orientation 	0))))
-		(object ClassView "Class" "Logical View::soap::SOAPFault" @32
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1040, 1648)
-		    label      	(object ItemLabel
-			Parent_View 	@32
-			location   	(794, 1540)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	492
-			justify    	0
-			label      	"SOAPFault")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3A06D9FA00F7"
-		    width      	510
-		    height     	240
-		    annotation 	8)
-		(object ClassView "Class" "Logical View::soap::IString" @33
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(240, 1360)
-		    label      	(object ItemLabel
-			Parent_View 	@33
-			location   	(66, 1332)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	348
-			justify    	0
-			label      	"IString")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@33
-			location   	(66, 1282)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	348
-			justify    	0
-			label      	"<<datatype>>")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B8DD90C0220"
-		    width      	366
-		    height     	180
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritTreeView "" @34
-		    location   	(1040, 750)
-		    line_color 	3342489
-		    fill_color 	13434879
-		    supplier   	@12
-		    vertices   	(list Points
-			(1040, 750)
-			(1040, 648)))
-		(object InheritView "" @35
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD63330017D"
-		    client     	@3
-		    supplier   	@12
-		    line_style 	3
-		    origin_attachment 	(645, 895)
-		    terminal_attachment 	(645, 750)
-		    drawSupplier 	@34)
-		(object InheritView "" @36
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD633340038"
-		    client     	@4
-		    supplier   	@12
-		    line_style 	3
-		    origin_attachment 	(1316, 895)
-		    terminal_attachment 	(1316, 750)
-		    drawSupplier 	@34)))
-	(object ClassDiagram "Port"
-	    quid       	"3A085E30035C"
-	    title      	"Port"
-	    zoom       	90
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	0
-	    origin_y   	0
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::soap::SOAPAddress" @37
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(352, 320)
-		    label      	(object ItemLabel
-			Parent_View 	@37
-			location   	(151, 239)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	402
-			justify    	0
-			label      	"SOAPAddress")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD1FF750287"
-		    width      	420
-		    height     	186
-		    annotation 	8
-		    autoResize 	TRUE)))
-	(object ClassDiagram "Extensibility"
-	    quid       	"3AE099B10161"
-	    title      	"Extensibility"
-	    zoom       	90
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	0
-	    origin_y   	0
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::soap::SOAPAddress" @38
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1520, 576)
-		    label      	(object ItemLabel
-			Parent_View 	@38
-			location   	(1371, 527)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	298
-			justify    	0
-			label      	"SOAPAddress")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD1FF750287"
-		    width      	316
-		    height     	122
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::soap::SOAPBinding" @39
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(304, 592)
-		    label      	(object ItemLabel
-			Parent_View 	@39
-			location   	(162, 543)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	284
-			justify    	0
-			label      	"SOAPBinding")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3A01D3B901AD"
-		    width      	302
-		    height     	122
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::soap::SOAPBody" @40
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1072, 1104)
-		    label      	(object ItemLabel
-			Parent_View 	@40
-			location   	(950, 1055)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	244
-			justify    	0
-			label      	"SOAPBody")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3A01DED5031F"
-		    width      	262
-		    height     	122
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::soap::SOAPFault" @41
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1232, 1264)
-		    label      	(object ItemLabel
-			Parent_View 	@41
-			location   	(1112, 1215)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	240
-			justify    	0
-			label      	"SOAPFault")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3A06D9FA00F7"
-		    width      	258
-		    height     	122
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::soap::SOAPOperation" @42
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(512, 752)
-		    label      	(object ItemLabel
-			Parent_View 	@42
-			location   	(344, 703)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	336
-			justify    	0
-			label      	"SOAPOperation")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3A0AD45500E8"
-		    width      	354
-		    height     	122
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::soap::SOAPHeaderBase" @43
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(816, 928)
-		    label      	(object ItemLabel
-			Parent_View 	@43
-			location   	(627, 879)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	378
-			justify    	0
-			label      	"SOAPHeaderBase")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3A01DEE7034D"
-		    width      	396
-		    height     	122
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::ExtensibilityElement" @44
-		    ShowCompartmentStereotypes 	TRUE
-		    location   	(608, 128)
-		    font       	(object Font
-			italics    	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@44
-			location   	(408, 53)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	400
-			justify    	0
-			label      	"ExtensibilityElement")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5DBB602A9"
-		    width      	418
-		    height     	174
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritTreeView "" @45
-		    location   	(608, 305)
-		    line_color 	3342489
-		    fill_color 	13434879
-		    supplier   	@44
-		    vertices   	(list Points
-			(608, 305)
-			(608, 215)))
-		(object InheritView "" @46
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AE09A3801AB"
-		    client     	@39
-		    supplier   	@44
-		    line_style 	3
-		    origin_attachment 	(344, 531)
-		    terminal_attachment 	(344, 305)
-		    drawSupplier 	@45)
-		(object InheritView "" @47
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AE09A3E0326"
-		    client     	@43
-		    supplier   	@44
-		    line_style 	3
-		    origin_attachment 	(815, 867)
-		    terminal_attachment 	(815, 305)
-		    drawSupplier 	@45)
-		(object InheritView "" @48
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AE09A450041"
-		    client     	@40
-		    supplier   	@44
-		    line_style 	3
-		    origin_attachment 	(1068, 1043)
-		    terminal_attachment 	(1068, 305)
-		    drawSupplier 	@45)
-		(object InheritView "" @49
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AE09A4E031F"
-		    client     	@42
-		    supplier   	@44
-		    line_style 	3
-		    origin_attachment 	(506, 691)
-		    terminal_attachment 	(506, 305)
-		    drawSupplier 	@45)
-		(object InheritView "" @50
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AE09A4A0020"
-		    client     	@41
-		    supplier   	@44
-		    line_style 	3
-		    origin_attachment 	(1231, 1203)
-		    terminal_attachment 	(1231, 305)
-		    drawSupplier 	@45)
-		(object InheritView "" @51
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AE095350098"
-		    client     	@38
-		    supplier   	@44
-		    line_style 	3
-		    origin_attachment 	(1520, 515)
-		    terminal_attachment 	(1520, 305)
-		    drawSupplier 	@45)))))
diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/model/soap.ecore b/bundles/org.eclipse.wst.wsdl/src-soap/model/soap.ecore
deleted file mode 100644
index 17aecb86f..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/model/soap.ecore
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<ecore:EPackage xmi:version="2.0"
-  xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="soap"
-    nsURI="http://www.ibm.com/wsdl/2003/SOAP" nsPrefix="soap">
-  <eClassifiers xsi:type="ecore:EClass" name="SOAPBinding" eSuperTypes="wsdl.ecore#//ExtensibilityElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="transportURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="style" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SOAPBody" eSuperTypes="wsdl.ecore#//ExtensibilityElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="use" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="namespaceURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="encodingStyles" upperBound="-1"
-        eType="#//IString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="parts" upperBound="-1"
-        eType="ecore:EClass wsdl.ecore#//Part"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SOAPHeaderBase" eSuperTypes="wsdl.ecore#//ExtensibilityElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="use" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="namespaceURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="encodingStyles" upperBound="-1"
-        eType="#//IString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="message" lowerBound="1"
-        eType="ecore:EClass wsdl.ecore#//Message"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="part" lowerBound="1" eType="ecore:EClass wsdl.ecore#//Part"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SOAPFault" eSuperTypes="wsdl.ecore#//ExtensibilityElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="use" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="namespaceURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="encodingStyles" upperBound="-1"
-        eType="#//IString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SOAPOperation" eSuperTypes="wsdl.ecore#//ExtensibilityElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="soapActionURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="style" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SOAPAddress" eSuperTypes="wsdl.ecore#//ExtensibilityElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="locationURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SOAPHeaderFault" eSuperTypes="#//SOAPHeaderBase"/>
-  <eClassifiers xsi:type="ecore:EClass" name="SOAPHeader" eSuperTypes="#//SOAPHeaderBase">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="headerFaults" upperBound="-1"
-        eType="#//SOAPHeaderFault" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="IString" instanceClassName="java.lang.String"/>
-</ecore:EPackage>
diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/model/soap.mdl b/bundles/org.eclipse.wst.wsdl/src-soap/model/soap.mdl
deleted file mode 100644
index 43d0aa9b4..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/model/soap.mdl
+++ /dev/null
@@ -1,32688 +0,0 @@
-
-(object Petal
-    version    	42
-    _written   	"Rose 4.5.8054a"
-    charSet    	0)
-
-(object Design "Logical View"
-    is_unit    	TRUE
-    is_loaded  	TRUE
-    defaults   	(object defaults
-	rightMargin 	0.250000
-	leftMargin 	0.250000
-	topMargin  	0.250000
-	bottomMargin 	0.500000
-	pageOverlap 	0.250000
-	clipIconLabels 	TRUE
-	autoResize 	TRUE
-	snapToGrid 	TRUE
-	gridX      	16
-	gridY      	16
-	defaultFont 	(object Font
-	    size       	10
-	    face       	"Arial"
-	    bold       	FALSE
-	    italics    	FALSE
-	    underline  	FALSE
-	    strike     	FALSE
-	    color      	0
-	    default_color 	TRUE)
-	showMessageNum 	1
-	showClassOfObject 	TRUE
-	notation   	"Unified")
-    root_usecase_package 	(object Class_Category "Use Case View"
-	quid       	"39E27F080064"
-	exportControl 	"Public"
-	global     	TRUE
-	logical_models 	(list unit_reference_list)
-	logical_presentations 	(list unit_reference_list
-	    (object UseCaseDiagram "Main"
-		quid       	"39E27F080078"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    root_category 	(object Class_Category "Logical View"
-	quid       	"39E27F080063"
-	exportControl 	"Public"
-	global     	TRUE
-	subsystem  	"Component View"
-	quidu      	"39E27F080065"
-	logical_models 	(list unit_reference_list
-	    (object Class_Category "wsdl"
-		quid       	"3ADFB8E5021E"
-		documentation 	
-|The WSDL model contains classes for the Web Services Description Language (WSDL).
-|
-|WSDL describes network services as sets of endpoints operating on messages. The operations and messages are described abstractly, and then bound to a concrete network protocol and message format to define an endpoint.
-|
-|WSDL describes the formats of the messages exchanged by the services, and supports the XML Schemas specification as its canonical type system. This package uses an XML Schema Infoset model package (see the XSD package) to describe the abstract message formats.
-|
-|The model contains the following diagrams, named after the corresponding chapters in the WSDL 1.1 specification (http://www.w3.org/TR/2001/NOTE-wsdl-20010315)
-|- 2.1 Definition, shows the WSDL definition element and the WSDL document structure
-|- 2.1.1 Naming and Linking, shows the namespace and import mechanism
-|- 2.1.3 Extensibility, shows the WSDL extensibility mechanism
-|- 2.2 Types, shows the use of XML Schema types in WSDL
-|- 2.3 Messages, 2.4 PortTypes, 2.5 Bindings and 2.7 Services, show the major WSDL elements and their relations.
-|
-|The WSDL classes extend the javax.wsdl interfaces defined by JSR 110. Classes with interface and datatype stereotypes are used to represent these non-MOF interfaces.
-		
-		exportControl 	"Public"
-		logical_models 	(list unit_reference_list
-		    (object Class "WSDLElement"
-			quid       	"3AD5C6A302DD"
-			documentation 	"This class represents a WSDL language element."
-			operations 	(list Operations
-			    (object Operation "getEnclosingDefinition"
-				quid       	"3CD1529600C8"
-				result     	"Definition"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setEnclosingDefinition"
-				quid       	"3CD152B80347"
-				parameters 	(list Parameters
-				    (object Parameter "definition"
-					type       	"Definition"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "documentationElement"
-				quid       	"3CCE443602A3"
-				type       	"DOMElement")
-			    (object ClassAttribute "element"
-				quid       	"3F97DBD30207"
-				type       	"DOMElement"))
-			language   	"Java"
-			abstract   	TRUE)
-		    (object Class "PortType"
-			quid       	"3AD5C7F001A5"
-			documentation 	"This class represents a WSDL portType element of the WSDL specification version 1.1 and an Interface component of the WSDL specification version 1.2. A port type or Interface is a named set of abstract operations and the abstract messages involved."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5C9B70150"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3F6F1FD8019F"
-				supplier   	"Logical View::wsdl::IPortType"
-				quidu      	"3B84A5BE0331"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "qName"
-				quid       	"3AEB488E0023"
-				type       	"QName")
-			    (object ClassAttribute "undefined"
-				quid       	"3BDDF1E301E5"
-				type       	"boolean")
-			    (object ClassAttribute "proxy"
-				quid       	"3D18CDEB0316"
-				type       	"boolean")
-			    (object ClassAttribute "resourceURI"
-				quid       	"3D18D4FD01BA"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "Operation"
-			quid       	"3AD5C80D03CE"
-			documentation 	"This class represents a WSDL operation element. A WSDL operation is an abstract description of an action supported by a service."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AE9DE98003C"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3F6F1FE20171"
-				supplier   	"Logical View::wsdl::IOperation"
-				quidu      	"3B84A77600D1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "style"
-				quid       	"3AEB472601AC"
-				type       	"OperationType")
-			    (object ClassAttribute "name"
-				quid       	"3BDD9643004C"
-				type       	"String")
-			    (object ClassAttribute "undefined"
-				quid       	"3BDDF235003E"
-				type       	"boolean")
-			    (object ClassAttribute "proxy"
-				quid       	"3D18CE2201AD"
-				type       	"boolean")
-			    (object ClassAttribute "resourceURI"
-				quid       	"3D18D520011B"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "Message"
-			quid       	"3AD5C9590078"
-			documentation 	"This class represents a WSDL message element. A WSDL message is an abstract, typed definition of the data being communicated."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5D05501C4"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3B84A8D102BA"
-				supplier   	"Logical View::wsdl::IMessage"
-				quidu      	"3B84A8AF004F"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "qName"
-				quid       	"3AEB487C01FE"
-				type       	"QName")
-			    (object ClassAttribute "undefined"
-				quid       	"3BDDF1D20226"
-				type       	"boolean")
-			    (object ClassAttribute "proxy"
-				quid       	"3D18CE4B02B0"
-				type       	"boolean")
-			    (object ClassAttribute "resourceURI"
-				quid       	"3D18D54200F1"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "Part"
-			quid       	"3AD5CE1C032E"
-			documentation 	"This class represents a WSDL part element. Parts describe the logical abstract content of a message. Each part is associated with a type from some type system. "
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B84A96D02F1"
-				supplier   	"Logical View::wsdl::IPart"
-				quidu      	"3B84A93F01BE")
-			    (object Inheritance_Relationship
-				quid       	"3B897E230237"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3BCE70B703C8"
-				type       	"String")
-			    (object ClassAttribute "elementName"
-				quid       	"3B84B08703DB"
-				type       	"QName")
-			    (object ClassAttribute "typeName"
-				quid       	"3BCE70C303C5"
-				type       	"QName"))
-			language   	"Java")
-		    (object Class "Binding"
-			quid       	"3AD5D2860261"
-			documentation 	"This class represents a WSDL binding element. A binding defines message format and protocol details for operations and messages defined by a particular portType. There may be any number of bindings for a given portType."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5FA0F02F0"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3B8595410129"
-				supplier   	"Logical View::wsdl::IBinding"
-				quidu      	"3B84ABC60219"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "qName"
-				quid       	"3AEB4899014B"
-				type       	"QName")
-			    (object ClassAttribute "undefined"
-				quid       	"3BDDF1F401A3"
-				type       	"boolean")
-			    (object ClassAttribute "proxy"
-				quid       	"3D18CE6D0151"
-				type       	"boolean")
-			    (object ClassAttribute "resourceURI"
-				quid       	"3D18D4DF035C"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "BindingOperation"
-			quid       	"3AD5D3CB0145"
-			documentation 	"This class represents a WSDL operation element within a binding. An operation element within a binding specifies binding information for the operation with the same name within the binding's portType. "
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD6009202F7"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3B84ADE401DC"
-				supplier   	"Logical View::wsdl::IBindingOperation"
-				quidu      	"3B84ADC00072"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3B89C4CB0199"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "Service"
-			quid       	"3AD5D8F002F8"
-			documentation 	"This class represents a WSDL service element. A service groups a set of related ports together."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5FA20025E"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3B85954E01B4"
-				supplier   	"Logical View::wsdl::IService"
-				quidu      	"3B84AB490287"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "qName"
-				quid       	"3AEB48A40151"
-				type       	"QName")
-			    (object ClassAttribute "undefined"
-				quid       	"3BDDF20D0203"
-				type       	"boolean")
-			    (object ClassAttribute "proxy"
-				quid       	"3D18D4810220"
-				type       	"boolean")
-			    (object ClassAttribute "resourceURI"
-				quid       	"3D18D4C501E2"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "Port"
-			quid       	"3AD5D9170286"
-			documentation 	"This class represents a WSDL port element. A port defines an individual endpoint by specifying a single address for a binding"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD600CB00AA"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3B85954502C9"
-				supplier   	"Logical View::wsdl::IPort"
-				quidu      	"3B84AB800326"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3AD5D9A00391"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "ExtensibilityElement"
-			quid       	"3AD5DBB602A9"
-			documentation 	"This class represents a WSDL extensibility element. WSDL allows extensibility elements representing a specific technology under various elements defined by WSDL."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B84B14903D0"
-				supplier   	"Logical View::wsdl::IExtensibilityElement"
-				quidu      	"3B84B12402AB")
-			    (object Inheritance_Relationship
-				quid       	"3BDDF53502C3"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "required"
-				quid       	"3AF9543C0073"
-				type       	"boolean")
-			    (object ClassAttribute "elementType"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3B85B21A0271"
-				type       	"QName"))
-			language   	"Java")
-		    (object Class "Definition"
-			quid       	"3AD5E43F008E"
-			documentation 	"This class represents a WSDL definitions element. The WSDL definitions element is the root element of a WSDL document."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5FDB803D4"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3B84B1F80382"
-				supplier   	"Logical View::wsdl::IDefinition"
-				quidu      	"3B84B1D90142"))
-			operations 	(list Operations
-			    (object Operation "getDocument"
-				quid       	"3CD14FC2012B"
-				result     	"DOMDocument"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setDocument"
-				quid       	"3CD150DE01E7"
-				parameters 	(list Parameters
-				    (object Parameter "document"
-					type       	"DOMDocument"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "targetNamespace"
-				quid       	"3AD5E474004E"
-				type       	"String")
-			    (object ClassAttribute "location"
-				quid       	"40352B7C0396"
-				type       	"String")
-			    (object ClassAttribute "qName"
-				quid       	"3AEB485702F5"
-				type       	"QName")
-			    (object ClassAttribute "encoding"
-				quid       	"3CADD00D000D"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "Import"
-			quid       	"3AD5E4F903DE"
-			documentation 	"This class represents WSDL import element. WSDL allows associating a namespace with a document location using an import element."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5EE58037A"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3F6F200D0340"
-				supplier   	"Logical View::wsdl::IImport"
-				quidu      	"3B84B2020119"))
-			operations 	(list Operations
-			    (object Operation "getSchema"
-				quid       	"3C8672C10379"
-				result     	"XSDSchema"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setSchema"
-				quid       	"3C8672C10397"
-				parameters 	(list Parameters
-				    (object Parameter "schema"
-					type       	"XSDSchema"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "namespaceURI"
-				quid       	"3AD5E50A0036"
-				type       	"String")
-			    (object ClassAttribute "locationURI"
-				quid       	"3AD5E5140211"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "ExtensibleElement"
-			quid       	"3AD5FCFA033A"
-			documentation 	" WSDL allows elements representing a specific technology (referred to here as extensibility elements) under various elements defined by WSDL. This class represents a WSDL point of extensibility."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5FE3C03D4"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD"))
-			operations 	(list Operations
-			    (object Operation "getExtensibilityElements"
-				quid       	"3B85C12C03CD"
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "addExtensibilityElement"
-				quid       	"3B85C1470295"
-				parameters 	(list Parameters
-				    (object Parameter "extElement"
-					type       	"IExtensibilityElement"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			language   	"Java"
-			abstract   	TRUE)
-		    (object Class "Input"
-			quid       	"3AE0789F0059"
-			documentation 	"This class represents a WSDL input element. An input element specifies the abstract message format for the input of the operation."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B85C504025F"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3F67722802E7"
-				supplier   	"Logical View::wsdl::MessageReference"
-				quidu      	"3F6771DB02DC")
-			    (object Inheritance_Relationship
-				quid       	"3F6F1FEE031D"
-				supplier   	"Logical View::wsdl::IInput"
-				quidu      	"3B84A7EE0015"))
-			language   	"Java")
-		    (object Class "Output"
-			quid       	"3AE078B60232"
-			documentation 	"This class represents a WSDL output element. An output element specifies the abstract message format for the output of the operation."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B85C50C035B"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3F67723500DD"
-				supplier   	"Logical View::wsdl::MessageReference"
-				quidu      	"3F6771DB02DC")
-			    (object Inheritance_Relationship
-				quid       	"3F6F1FF801CD"
-				supplier   	"Logical View::wsdl::IOutput"
-				quidu      	"3B84A829027D"))
-			language   	"Java")
-		    (object Class "Fault"
-			quid       	"3AE078BE0108"
-			documentation 	"This class represents a WSDL fault element. Fault elements specify the abstract message format for any error messages that may be output as the result of the operation "
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AE1C82002F2"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3F67723D0319"
-				supplier   	"Logical View::wsdl::MessageReference"
-				quidu      	"3F6771DB02DC")
-			    (object Inheritance_Relationship
-				quid       	"3F6F2002002D"
-				supplier   	"Logical View::wsdl::IFault"
-				quidu      	"3B84A861031D"))
-			language   	"Java")
-		    (object Class "BindingInput"
-			quid       	"3AE08A8202D4"
-			documentation 	"This class represents a WSDL input element within a operation within a binding. An input element within an operation within a binding specifies binding information for the input of the operation. "
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B84AE1B0113"
-				supplier   	"Logical View::wsdl::IBindingInput"
-				quidu      	"3B84ADEB0100")
-			    (object Inheritance_Relationship
-				quid       	"3B85B59B0072"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A"))
-			operations 	(list Operations
-			    (object Operation "getInput"
-				quid       	"3C8653A40203"
-				result     	"IInput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setInput"
-				quid       	"3C8653B503A2"
-				parameters 	(list Parameters
-				    (object Parameter "input"
-					type       	"IInput"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3B85C1EA020E"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "BindingOutput"
-			quid       	"3AE08A8F028C"
-			documentation 	"This class represents a WSDL output element within a operation within a binding. An output element within an operation within a binding specifies binding information for the output of the operation. "
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B84AE4302AB"
-				supplier   	"Logical View::wsdl::IBindingOutput"
-				quidu      	"3B84AE210111")
-			    (object Inheritance_Relationship
-				quid       	"3B85B5A4027E"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A"))
-			operations 	(list Operations
-			    (object Operation "getOutput"
-				quid       	"3C8653D900F1"
-				result     	"IOutput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setOutput"
-				quid       	"3C8653F10326"
-				parameters 	(list Parameters
-				    (object Parameter "output"
-					type       	"IOutput"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3B85C20200BE"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "BindingFault"
-			quid       	"3AE08A9E03A6"
-			documentation 	"This class represents a WSDL fault element within a operation within a binding. A fault element within an operation within a binding specifies binding information for the fault with the same name. "
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AE0938602C9"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3B84AE710333"
-				supplier   	"Logical View::wsdl::IBindingFault"
-				quidu      	"3B84AE4F00BD"))
-			operations 	(list Operations
-			    (object Operation "getFault"
-				quid       	"3C865413037F"
-				result     	"IFault"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setFault"
-				quid       	"3C8654210109"
-				parameters 	(list Parameters
-				    (object Parameter "fault"
-					type       	"IFault"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3B85BF9E014A"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "QName"
-			quid       	"3AE8ED220140"
-			documentation 	"This class represents the javax.wsdl.QName class. A QName is a fully qualified name."
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.xml.namespace.QName"
-				quid       	"3B849DA9003D"
-				stereotype 	"javaclass"))
-			language   	"Java")
-		    (object Class "Namespace"
-			quid       	"3AEA3CD30030"
-			documentation 	"This class represents a namespace and the corresponding namespace prefix used in a WSDL document."
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "URI"
-				quid       	"3AEA3D2901B1"
-				type       	"String")
-			    (object ClassAttribute "prefix"
-				quid       	"3AEA3D320236"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "OperationType"
-			quid       	"3AEB4782024F"
-			documentation 	
-|ONE_WAY=1
-|REQUEST_RESPONSE=2
-|SOLICIT_RESPONSE=3
-|NOTIFICATION=4
-			
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.OperationType"
-				quid       	"3B85C35303E3"
-				stereotype 	"javaclass"))
-			language   	"Java")
-		    (object Class "IPortType"
-			quid       	"3B84A5BE0331"
-			documentation 	"This class represents the javax.wsdl.PortType non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addOperation"
-				quid       	"3B896AC101CA"
-				parameters 	(list Parameters
-				    (object Parameter "operation"
-					type       	"IOperation"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getOperation"
-				quid       	"3B896BAF01A4"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"String")
-				    (object Parameter "inputName"
-					type       	"String")
-				    (object Parameter "outputName"
-					type       	"String"))
-				result     	"IOperation"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getOperations"
-				quid       	"3B896BF7031A"
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.PortType"
-				quid       	"3B84A632000D"
-				stereotype 	"javaclass")))
-		    (object Class "IOperation"
-			quid       	"3B84A77600D1"
-			documentation 	"This class represents the javax.wsdl.Operation non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addFault"
-				quid       	"3B896C420065"
-				parameters 	(list Parameters
-				    (object Parameter "fault"
-					type       	"IFault"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getFault"
-				quid       	"3B896C59028F"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"String"))
-				result     	"IFault"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getFaults"
-				quid       	"3B896C7102B1"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getParameterOrdering"
-				quid       	"3B896C8101B0"
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setParameterOrdering"
-				quid       	"3B896C99031D"
-				parameters 	(list Parameters
-				    (object Parameter "parameterOrder"
-					type       	"IList"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getInput"
-				quid       	"3C8654E5018D"
-				result     	"IInput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setInput"
-				quid       	"3C8662C40107"
-				parameters 	(list Parameters
-				    (object Parameter "input"
-					type       	"IInput"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getOutput"
-				quid       	"3C8662E40094"
-				result     	"IOutput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setOutput"
-				quid       	"3C8662F001D2"
-				parameters 	(list Parameters
-				    (object Parameter "output"
-					type       	"IOutput"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Operation"
-				quid       	"3B84A799012B"
-				stereotype 	"javaclass")))
-		    (object Class "IInput"
-			quid       	"3B84A7EE0015"
-			documentation 	"This class represents the javax.wsdl.Input non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "getMessage"
-				quid       	"3C86633100EF"
-				result     	"IMessage"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setMessage"
-				quid       	"3C8663470277"
-				parameters 	(list Parameters
-				    (object Parameter "message"
-					type       	"IMessage"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Input"
-				quid       	"3B84A8000039"
-				stereotype 	"javaclass")))
-		    (object Class "IOutput"
-			quid       	"3B84A829027D"
-			documentation 	"This class represents the javax.wsdl.Output non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "getMessage"
-				quid       	"3C86643A035D"
-				result     	"IMessage"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setMessage"
-				quid       	"3C86644501C8"
-				parameters 	(list Parameters
-				    (object Parameter "message"
-					type       	"IMessage"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Output"
-				quid       	"3B84A83901D5"
-				stereotype 	"javaclass")))
-		    (object Class "IFault"
-			quid       	"3B84A861031D"
-			documentation 	"This class represents the javax.wsdl.Fault non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "getMessage"
-				quid       	"3C86646A00BD"
-				result     	"IMessage"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setMessage"
-				quid       	"3C8664750131"
-				parameters 	(list Parameters
-				    (object Parameter "message"
-					type       	"IMessage"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Fault"
-				quid       	"3B84A8710208"
-				stereotype 	"javaclass")))
-		    (object Class "IMessage"
-			quid       	"3B84A8AF004F"
-			documentation 	"This class represents the javax.wsdl.Message non-MOF interface"
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addPart"
-				quid       	"3B8972240273"
-				parameters 	(list Parameters
-				    (object Parameter "part"
-					type       	"IPart"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPart"
-				quid       	"3B89723D0233"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"String"))
-				result     	"IPart"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getParts"
-				quid       	"3B897254025E"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getOrderedParts"
-				quid       	"3B897261020D"
-				parameters 	(list Parameters
-				    (object Parameter "partOrder"
-					type       	"IList"))
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Message"
-				quid       	"3B84A8BC0260"
-				stereotype 	"javaclass")))
-		    (object Class "IPart"
-			quid       	"3B84A93F01BE"
-			documentation 	"This class represents the javax.wsdl.Part non-MOF interface"
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "setExtensionAttribute"
-				quid       	"3C4688450052"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName")
-				    (object Parameter "value"
-					type       	"QName"))
-				exceptions 	"WSDLException"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getExtensionAttributeNames"
-				quid       	"3C468A0101C3"
-				result     	"IIterator"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getExtensionAttribute"
-				quid       	"3C468A2D02D5"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"QName"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Part"
-				quid       	"3B84A9500231"
-				stereotype 	"javaclass")))
-		    (object Class "IService"
-			quid       	"3B84AB490287"
-			documentation 	"This class represents the javax.wsdl.Service non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addPort"
-				quid       	"3B895D5601D1"
-				parameters 	(list Parameters
-				    (object Parameter "port"
-					type       	"IPort"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPorts"
-				quid       	"3B895DA20036"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPort"
-				quid       	"3B895DB001BC"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"String"))
-				result     	"IPort"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Service"
-				quid       	"3B84AB5B003E"
-				stereotype 	"javaclass")))
-		    (object Class "IPort"
-			quid       	"3B84AB800326"
-			documentation 	"This class represents the javax.wsdl.Port non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "getBinding"
-				quid       	"3C8651F302B5"
-				result     	"IBinding"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setBinding"
-				quid       	"3C86526302F2"
-				parameters 	(list Parameters
-				    (object Parameter "binding"
-					type       	"IBinding"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Port"
-				quid       	"3B84AB8C0016"
-				stereotype 	"javaclass")))
-		    (object Class "IBinding"
-			quid       	"3B84ABC60219"
-			documentation 	"This class represents the javax.wsdl.Binding non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addBindingOperation"
-				quid       	"3B895F160153"
-				parameters 	(list Parameters
-				    (object Parameter "bindingOperation"
-					type       	"IBindingOperation"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindingOperation"
-				quid       	"3B895F500066"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"String")
-				    (object Parameter "inputName"
-					type       	"String")
-				    (object Parameter "outputName"
-					type       	"String"))
-				result     	"IBindingOperation"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindingOperations"
-				quid       	"3B895FA401C5"
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPortType"
-				quid       	"3C8652A90284"
-				result     	"IPortType"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setPortType"
-				quid       	"3C8652BE01A8"
-				parameters 	(list Parameters
-				    (object Parameter "portType"
-					type       	"IPortType"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Binding"
-				quid       	"3B84ABCF0302"
-				stereotype 	"javaclass")))
-		    (object Class "IBindingOperation"
-			quid       	"3B84ADC00072"
-			documentation 	"This class represents the javax.wsdl.BindingOperation non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addBindingFault"
-				quid       	"3B8960BC0041"
-				parameters 	(list Parameters
-				    (object Parameter "bindingFault"
-					type       	"IBindingFault"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindingFault"
-				quid       	"3B8960D9009D"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"String"))
-				result     	"IBindingFault"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindingFaults"
-				quid       	"3B8960FC0061"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getOperation"
-				quid       	"3C86532D0017"
-				result     	"IOperation"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setOperation"
-				quid       	"3C86533F037B"
-				parameters 	(list Parameters
-				    (object Parameter "operation"
-					type       	"IOperation"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindingInput"
-				quid       	"3C86550900DA"
-				result     	"IBindingInput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setBindingInput"
-				quid       	"3C86551D007F"
-				parameters 	(list Parameters
-				    (object Parameter "bindingInput"
-					type       	"IBindingInput"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindingOutput"
-				quid       	"3C8655340349"
-				result     	"IBindingOutput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setBindingOutput"
-				quid       	"3C86554702A6"
-				parameters 	(list Parameters
-				    (object Parameter "bindingOutput"
-					type       	"IBindingOutput"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.BindingOperation"
-				quid       	"3B84ADCB021C"
-				stereotype 	"javaclass")))
-		    (object Class "IBindingInput"
-			quid       	"3B84ADEB0100"
-			documentation 	"This class represents the javax.wsdl.BindingInput non-MOF interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.BindingInput"
-				quid       	"3B84ADFE000D"
-				stereotype 	"javaclass")))
-		    (object Class "IBindingOutput"
-			quid       	"3B84AE210111"
-			documentation 	"This class represents the javax.wsdl.BindingOutput non-MOF interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.BindingOutput"
-				quid       	"3B84AE2D0050"
-				stereotype 	"javaclass")))
-		    (object Class "IBindingFault"
-			quid       	"3B84AE4F00BD"
-			documentation 	"This class represents the javax.wsdl.BindingFault non-MOF interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.BindingFault"
-				quid       	"3B84AE5F002A"
-				stereotype 	"javaclass")))
-		    (object Class "DOMElement"
-			quid       	"3B84AF3203DB"
-			documentation 	"This class represents the org.w3c.dom.Element non-MOF interface."
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "org.w3c.dom.Element"
-				quid       	"3B84AF560292"
-				stereotype 	"javaclass")))
-		    (object Class "IExtensibilityElement"
-			quid       	"3B84B12402AB"
-			documentation 	"This class represents the javax.wsdl.ExtensibilityElement non-MOF interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.extensions.ExtensibilityElement"
-				quid       	"3B84B13503D1"
-				stereotype 	"javaclass")))
-		    (object Class "IDefinition"
-			quid       	"3B84B1D90142"
-			documentation 	"This class represents the javax.wsdl.Definition non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addBinding"
-				quid       	"3B8988F1039D"
-				parameters 	(list Parameters
-				    (object Parameter "binding"
-					type       	"IBinding"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "addImport"
-				quid       	"3B8989490259"
-				parameters 	(list Parameters
-				    (object Parameter "importDef"
-					type       	"IImport"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "addMessage"
-				quid       	"3B89896E005E"
-				parameters 	(list Parameters
-				    (object Parameter "message"
-					type       	"IMessage"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "addNamespace"
-				quid       	"3B898984004B"
-				parameters 	(list Parameters
-				    (object Parameter "prefix"
-					type       	"String")
-				    (object Parameter "namespaceURI"
-					type       	"String"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "addPortType"
-				quid       	"3B8989C50045"
-				parameters 	(list Parameters
-				    (object Parameter "portType"
-					type       	"IPortType"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "addService"
-				quid       	"3B8989E401EE"
-				parameters 	(list Parameters
-				    (object Parameter "service"
-					type       	"IService"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createBindingFault"
-				quid       	"3B898A17038C"
-				result     	"IBindingFault"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createBindingInput"
-				quid       	"3B898A320286"
-				result     	"IBindingInput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createBindingOutput"
-				quid       	"3B898A46013B"
-				result     	"IBindingOutput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createBindingOperation"
-				quid       	"3B898A5C00B0"
-				result     	"IBindingOperation"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createBinding"
-				quid       	"3B8989FE037C"
-				result     	"IBinding"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createFault"
-				quid       	"3B898A7502E7"
-				result     	"IFault"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createImport"
-				quid       	"3B898A83014C"
-				result     	"IImport"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createInput"
-				quid       	"3B898A9D033E"
-				result     	"IInput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createMessage"
-				quid       	"3B898AAF0254"
-				result     	"IMessage"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createOperation"
-				quid       	"3B898AC203C4"
-				result     	"IOperation"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createOutput"
-				quid       	"3B898AE800ED"
-				result     	"IOutput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createPart"
-				quid       	"3B898AF8026D"
-				result     	"IPart"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createPort"
-				quid       	"3B898B0801DA"
-				result     	"IPort"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createPortType"
-				quid       	"3B898B15039B"
-				result     	"IPortType"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createService"
-				quid       	"3B898B32013A"
-				result     	"IService"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBinding"
-				quid       	"3B898B420075"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IBinding"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindings"
-				quid       	"3B898B920341"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getImports"
-				quid       	"3B898BCD0060"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getImports"
-				quid       	"3B898BE70144"
-				parameters 	(list Parameters
-				    (object Parameter "namespaceURI"
-					type       	"String"))
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getMessage"
-				quid       	"3B898C170107"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IMessage"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getMessages"
-				quid       	"3B898C3E001D"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getNamespace"
-				quid       	"3B898C62014B"
-				parameters 	(list Parameters
-				    (object Parameter "prefix"
-					type       	"String"))
-				result     	"String"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getNamespaces"
-				quid       	"3B898C740115"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPortType"
-				quid       	"3B898CBE0071"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IPortType"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPortTypes"
-				quid       	"3B898CDA01C6"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPrefix"
-				quid       	"3B898CFD0017"
-				parameters 	(list Parameters
-				    (object Parameter "namespaceURI"
-					type       	"String"))
-				result     	"String"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getService"
-				quid       	"3B898D2300A8"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IService"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getServices"
-				quid       	"3B898D3B03CE"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getExtensionRegistry"
-				quid       	"3B89D5B8012B"
-				result     	"IExtensionRegistry"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setExtensionRegistry"
-				quid       	"3B89D5D703BB"
-				parameters 	(list Parameters
-				    (object Parameter "extensionRegistry"
-					type       	"IExtensionRegistry"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getDocumentBaseURI"
-				quid       	"3B89D5FE0208"
-				result     	"String"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setDocumentBaseURI"
-				quid       	"3B89D6180328"
-				parameters 	(list Parameters
-				    (object Parameter "documentBase"
-					type       	"String"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createTypes"
-				quid       	"3CADD0560080"
-				result     	"ITypes"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "removeService"
-				quid       	"3CADD07E004C"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IService"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "removeBinding"
-				quid       	"3CADD0BA0355"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IBinding"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "removePortType"
-				quid       	"3CADD0D8029A"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IPortType"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "removeMessage"
-				quid       	"3CADD0FA0307"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IMessage"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getTypes"
-				quid       	"3C86706F031B"
-				result     	"ITypes"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setTypes"
-				quid       	"3C86709500EE"
-				parameters 	(list Parameters
-				    (object Parameter "types"
-					type       	"ITypes"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Definition"
-				quid       	"3B84B1E702A1"
-				stereotype 	"javaclass")))
-		    (object Class "IImport"
-			quid       	"3B84B2020119"
-			documentation 	"This class represents the javax.wsdl.Import non-MOF interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Import"
-				quid       	"3B84B20C02EA"
-				stereotype 	"javaclass")))
-		    (object Class "IList"
-			quid       	"3B85C0A203C5"
-			documentation 	"This class represents the non-MOF java.util.List interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "java.util.List"
-				quid       	"3B85C0AF0297"
-				stereotype 	"javaclass")))
-		    (object Class "IMap"
-			quid       	"3B896B0300D4"
-			documentation 	"This class represents the non-MOF java.util.Map interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "java.util.Map"
-				quid       	"3B896B1102B5"
-				stereotype 	"javaclass")))
-		    (object Class "IURL"
-			quid       	"3B89D5630274"
-			documentation 	"This class represents the non-MOF java.net.URL interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "java.net.URL"
-				quid       	"3B89D56E03E2"
-				stereotype 	"javaclass")))
-		    (object Class "IExtensionRegistry"
-			quid       	"3B89D59302A5"
-			documentation 	"This class represents the non-MOF javax.wsdl.extensions.ExtensionRegistry interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.extensions.ExtensionRegistry"
-				quid       	"3B89D59F02E8"
-				stereotype 	"javaclass")))
-		    (object Class "Types"
-			quid       	"3B8BE9A603A8"
-			documentation 	"This class represents a WSDL types element. The types element encloses data type definitions that are relevant for the exchanged messages."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B8BEB010311"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3CADCD3B0380"
-				supplier   	"Logical View::wsdl::ITypes"
-				quidu      	"3CADCBB20050"))
-			operations 	(list Operations
-			    (object Operation "getSchemas"
-				quid       	"3CADCF3803E6"
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getSchemas"
-				quid       	"3CADCF7E0301"
-				parameters 	(list Parameters
-				    (object Parameter "namespaceURI"
-					type       	"String"))
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)))
-		    (object Class "IIterator"
-			quid       	"3C4687DA0167"
-			documentation 	"This class represents the non-MOF java.util.Iterator interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "java.util.Iterator"
-				quid       	"3C46880800B9"
-				stereotype 	"javaclass")))
-		    (object Class "WSDLException"
-			quid       	"3C4689650313"
-			documentation 	"This class represents the javax.wsdl.Exception class."
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.WSDLException"
-				quid       	"3C4689740315"
-				stereotype 	"javaclass")))
-		    (object Class "ITypes"
-			quid       	"3CADCBB20050"
-			documentation 	"This class represents the javax.wsdl.Types non-MOF interface"
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Types"
-				quid       	"3CADCBF10173"
-				stereotype 	"javaclass")))
-		    (object Class "UnknownExtensibilityElement"
-			quid       	"3CB24AC002AE"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3CB24AEC01CB"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9")))
-		    (object Class "XSDSchemaExtensibilityElement"
-			quid       	"3CC360D7039C"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3CC3627F00B7"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9")))
-		    (object Class "DOMDocument"
-			quid       	"3CD1502C023B"
-			documentation 	"This class represents the org.w3c.dom.Document non-MOF interface."
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "org.w3c.dom.Document"
-				quid       	"3CD150600182"
-				stereotype 	"javaclass")))
-		    (object Class "MessageReference"
-			quid       	"3F6771DB02DC"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3F762A6A0308"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3F6780A001AB"
-				type       	"String"
-				exportControl 	"Protected"))
-			language   	"Java"
-			abstract   	TRUE)
-		    (object Association "$UNNAMED$0"
-			quid       	"3AD5C824018C"
-			roles      	(list role_list
-			    (object Role "portType"
-				quid       	"3AD5C82701C3"
-				label      	"portType"
-				supplier   	"Logical View::wsdl::PortType"
-				quidu      	"3AD5C7F001A5"
-				client_cardinality 	(value cardinality "1..1")
-				Containment 	"By Value"
-				is_aggregate 	TRUE)
-			    (object Role "eOperations"
-				quid       	"3AD5C82701CD"
-				label      	"eOperations"
-				supplier   	"Logical View::wsdl::Operation"
-				quidu      	"3AD5C80D03CE"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$1"
-			quid       	"3AD5CEBE00E2"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$2"
-				quid       	"3AD5CEBF0057"
-				supplier   	"Logical View::wsdl::Message"
-				quidu      	"3AD5C9590078"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eParts"
-				quid       	"3AD5CEBF0061"
-				label      	"eParts"
-				supplier   	"Logical View::wsdl::Part"
-				quidu      	"3AD5CE1C032E"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$3"
-			quid       	"3AD5D352010F"
-			roles      	(list role_list
-			    (object Role "ePortType"
-				quid       	"3AD5D3540176"
-				label      	"ePortType"
-				supplier   	"Logical View::wsdl::PortType"
-				quidu      	"3AD5C7F001A5"
-				client_cardinality 	(value cardinality "1..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$4"
-				quid       	"3AD5D3540180"
-				supplier   	"Logical View::wsdl::Binding"
-				quidu      	"3AD5D2860261")))
-		    (object Association "$UNNAMED$5"
-			quid       	"3AD5D3E10179"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$6"
-				quid       	"3AD5D3E20225"
-				supplier   	"Logical View::wsdl::Binding"
-				quidu      	"3AD5D2860261"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eBindingOperations"
-				quid       	"3AD5D3E20239"
-				label      	"eBindingOperations"
-				supplier   	"Logical View::wsdl::BindingOperation"
-				quidu      	"3AD5D3CB0145"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$7"
-			quid       	"3AD5D425038A"
-			roles      	(list role_list
-			    (object Role "eOperation"
-				quid       	"3AD5D42602F5"
-				label      	"eOperation"
-				supplier   	"Logical View::wsdl::Operation"
-				quidu      	"3AD5C80D03CE"
-				client_cardinality 	(value cardinality "1..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$8"
-				quid       	"3AD5D42602FF"
-				supplier   	"Logical View::wsdl::BindingOperation"
-				quidu      	"3AD5D3CB0145")))
-		    (object Association "$UNNAMED$9"
-			quid       	"3AD5D9400393"
-			roles      	(list role_list
-			    (object Role "ePorts"
-				quid       	"3AD5D941031C"
-				label      	"ePorts"
-				supplier   	"Logical View::wsdl::Port"
-				quidu      	"3AD5D9170286"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$10"
-				quid       	"3AD5D941031D"
-				supplier   	"Logical View::wsdl::Service"
-				quidu      	"3AD5D8F002F8"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$11"
-			quid       	"3AD5D9B8011F"
-			roles      	(list role_list
-			    (object Role "eBinding"
-				quid       	"3AD5D9B9024D"
-				label      	"eBinding"
-				supplier   	"Logical View::wsdl::Binding"
-				quidu      	"3AD5D2860261"
-				client_cardinality 	(value cardinality "1..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$12"
-				quid       	"3AD5D9B90261"
-				supplier   	"Logical View::wsdl::Port"
-				quidu      	"3AD5D9170286")))
-		    (object Association "$UNNAMED$13"
-			quid       	"3AD5E60301E2"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$14"
-				quid       	"3AD5E60400B7"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eMessages"
-				quid       	"3AD5E60400C1"
-				label      	"eMessages"
-				supplier   	"Logical View::wsdl::Message"
-				quidu      	"3AD5C9590078"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$15"
-			quid       	"3AD5E6710104"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$16"
-				quid       	"3AD5E672034A"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "ePortTypes"
-				quid       	"3AD5E6720354"
-				label      	"ePortTypes"
-				supplier   	"Logical View::wsdl::PortType"
-				quidu      	"3AD5C7F001A5"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$17"
-			quid       	"3AD5E6770095"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$18"
-				quid       	"3AD5E6780371"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eBindings"
-				quid       	"3AD5E678037B"
-				label      	"eBindings"
-				supplier   	"Logical View::wsdl::Binding"
-				quidu      	"3AD5D2860261"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$19"
-			quid       	"3AD5E67B0311"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$20"
-				quid       	"3AD5E67D007F"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eServices"
-				quid       	"3AD5E67D0089"
-				label      	"eServices"
-				supplier   	"Logical View::wsdl::Service"
-				quidu      	"3AD5D8F002F8"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$21"
-			quid       	"3AD5FD130079"
-			roles      	(list role_list
-			    (object Role "eExtensibilityElements"
-				quid       	"3AD5FD14019D"
-				label      	"eExtensibilityElements"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$22"
-				quid       	"3AD5FD14019E"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$23"
-			quid       	"3ADF2E6401F5"
-			roles      	(list role_list
-			    (object Role "eBindingInput"
-				quid       	"3ADF2E650251"
-				label      	"eBindingInput"
-				supplier   	"Logical View::wsdl::BindingInput"
-				quidu      	"3AE08A8202D4"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$24"
-				quid       	"3ADF2E650252"
-				supplier   	"Logical View::wsdl::BindingOperation"
-				quidu      	"3AD5D3CB0145"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$25"
-			quid       	"3ADF2EB30163"
-			roles      	(list role_list
-			    (object Role "eBindingOutput"
-				quid       	"3ADF2EB4013C"
-				label      	"eBindingOutput"
-				supplier   	"Logical View::wsdl::BindingOutput"
-				quidu      	"3AE08A8F028C"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$26"
-				quid       	"3ADF2EB4013D"
-				supplier   	"Logical View::wsdl::BindingOperation"
-				quidu      	"3AD5D3CB0145"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$27"
-			quid       	"3ADF2F94024D"
-			roles      	(list role_list
-			    (object Role "eInput"
-				quid       	"3ADF2F950190"
-				label      	"eInput"
-				supplier   	"Logical View::wsdl::Input"
-				quidu      	"3AE0789F0059"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$28"
-				quid       	"3ADF2F95019A"
-				supplier   	"Logical View::wsdl::Operation"
-				quidu      	"3AD5C80D03CE"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$29"
-			quid       	"3ADF2FB802F9"
-			roles      	(list role_list
-			    (object Role "eOutput"
-				quid       	"3ADF2FB9020A"
-				label      	"eOutput"
-				supplier   	"Logical View::wsdl::Output"
-				quidu      	"3AE078B60232"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$30"
-				quid       	"3ADF2FB9020B"
-				supplier   	"Logical View::wsdl::Operation"
-				quidu      	"3AD5C80D03CE"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$31"
-			quid       	"3ADF331601A4"
-			roles      	(list role_list
-			    (object Role "eFaults"
-				quid       	"3ADF33180387"
-				label      	"eFaults"
-				supplier   	"Logical View::wsdl::Fault"
-				quidu      	"3AE078BE0108"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$32"
-				quid       	"3ADF33180388"
-				supplier   	"Logical View::wsdl::Operation"
-				quidu      	"3AD5C80D03CE"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$33"
-			quid       	"3ADF340003E5"
-			roles      	(list role_list
-			    (object Role "eBindingFaults"
-				quid       	"3ADF340103AA"
-				label      	"eBindingFaults"
-				supplier   	"Logical View::wsdl::BindingFault"
-				quidu      	"3AE08A9E03A6"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$34"
-				quid       	"3ADF340103AB"
-				supplier   	"Logical View::wsdl::BindingOperation"
-				quidu      	"3AD5D3CB0145"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$35"
-			quid       	"3AE091F402F3"
-			roles      	(list role_list
-			    (object Role "eFault"
-				quid       	"3AE091F801FE"
-				label      	"eFault"
-				supplier   	"Logical View::wsdl::Fault"
-				quidu      	"3AE078BE0108"
-				client_cardinality 	(value cardinality "1..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$36"
-				quid       	"3AE091F801FF"
-				supplier   	"Logical View::wsdl::BindingFault"
-				quidu      	"3AE08A9E03A6")))
-		    (object Association "$UNNAMED$37"
-			quid       	"3AEA3D55002D"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$38"
-				quid       	"3AEA3D560328"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eNamespaces"
-				quid       	"3AEA3D560332"
-				label      	"eNamespaces"
-				supplier   	"Logical View::wsdl::Namespace"
-				quidu      	"3AEA3CD30030"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$39"
-			quid       	"3AEA3E3A002D"
-			roles      	(list role_list
-			    (object Role "eDefinition"
-				quid       	"3AEA3E3C01E8"
-				label      	"eDefinition"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$40"
-				quid       	"3AEA3E3C01F2"
-				supplier   	"Logical View::wsdl::Import"
-				quidu      	"3AD5E4F903DE")))
-		    (object Association "$UNNAMED$41"
-			quid       	"3AEA412F0035"
-			roles      	(list role_list
-			    (object Role "eParameterOrdering"
-				quid       	"3AEA41310255"
-				label      	"eParameterOrdering"
-				supplier   	"Logical View::wsdl::Part"
-				quidu      	"3AD5CE1C032E"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$42"
-				quid       	"3AEA4131025F"
-				supplier   	"Logical View::wsdl::Operation"
-				quidu      	"3AD5C80D03CE")))
-		    (object Association "$UNNAMED$43"
-			quid       	"3B84AD2400BD"
-			roles      	(list role_list
-			    (object Role "eInput"
-				quid       	"3B84AD250083"
-				label      	"eInput"
-				supplier   	"Logical View::wsdl::Input"
-				quidu      	"3AE0789F0059"
-				client_cardinality 	(value cardinality "1..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$44"
-				quid       	"3B84AD250084"
-				supplier   	"Logical View::wsdl::BindingInput"
-				quidu      	"3AE08A8202D4")))
-		    (object Association "$UNNAMED$45"
-			quid       	"3B84AD7900F2"
-			roles      	(list role_list
-			    (object Role "eOutput"
-				quid       	"3B84AD7A014D"
-				label      	"eOutput"
-				supplier   	"Logical View::wsdl::Output"
-				quidu      	"3AE078B60232"
-				client_cardinality 	(value cardinality "1..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$46"
-				quid       	"3B84AD7A014E"
-				supplier   	"Logical View::wsdl::BindingOutput"
-				quidu      	"3AE08A8F028C")))
-		    (object Association "$UNNAMED$47"
-			quid       	"3B8B1BE900C4"
-			roles      	(list role_list
-			    (object Role "typeDefinition"
-				quid       	"3B8B1BE90327"
-				label      	"typeDefinition"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$48"
-				quid       	"3B8B1BE90331"
-				supplier   	"Logical View::wsdl::Part"
-				quidu      	"3AD5CE1C032E")))
-		    (object Association "$UNNAMED$49"
-			quid       	"3B8B1C1203B2"
-			roles      	(list role_list
-			    (object Role "elementDeclaration"
-				quid       	"3B8B1C14001C"
-				label      	"elementDeclaration"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$50"
-				quid       	"3B8B1C140026"
-				supplier   	"Logical View::wsdl::Part"
-				quidu      	"3AD5CE1C032E")))
-		    (object Association "$UNNAMED$51"
-			quid       	"3B8B1DCC02E5"
-			roles      	(list role_list
-			    (object Role "eSchema"
-				quid       	"3B8B1DCE0270"
-				label      	"eSchema"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$52"
-				quid       	"3B8B1DCE027A"
-				supplier   	"Logical View::wsdl::Import"
-				quidu      	"3AD5E4F903DE")))
-		    (object Association "$UNNAMED$53"
-			quid       	"3B8BEA27029F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$54"
-				quid       	"3B8BEA290356"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eTypes"
-				quid       	"3B8BEA29036A"
-				label      	"eTypes"
-				supplier   	"Logical View::wsdl::Types"
-				quidu      	"3B8BE9A603A8"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$55"
-			quid       	"3C46829303E5"
-			roles      	(list role_list
-			    (object Role "eMessage"
-				quid       	"3C468296010E"
-				label      	"eMessage"
-				supplier   	"Logical View::wsdl::Message"
-				quidu      	"3AD5C9590078"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$56"
-				quid       	"3C4682960118"
-				supplier   	"Logical View::wsdl::Part"
-				quidu      	"3AD5CE1C032E")))
-		    (object Association "$UNNAMED$57"
-			quid       	"3C864DFF02EC"
-			roles      	(list role_list
-			    (object Role "eImports"
-				quid       	"3C864DFF02ED"
-				label      	"eImports"
-				supplier   	"Logical View::wsdl::Import"
-				quidu      	"3AD5E4F903DE"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$58"
-				quid       	"3C864DFF02EE"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$59"
-			quid       	"3CC3614500F2"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$60"
-				quid       	"3CC36146023D"
-				supplier   	"Logical View::wsdl::XSDSchemaExtensibilityElement"
-				quidu      	"3CC360D7039C"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "schema"
-				quid       	"3CC36146023E"
-				label      	"schema"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$61"
-			quid       	"3F74E78401B1"
-			roles      	(list role_list
-			    (object Role "eMessage"
-				quid       	"3F74E786000F"
-				label      	"eMessage"
-				supplier   	"Logical View::wsdl::Message"
-				quidu      	"3AD5C9590078"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$62"
-				quid       	"3F74E7860023"
-				supplier   	"Logical View::wsdl::MessageReference"
-				quidu      	"3F6771DB02DC")))
-		    (object Association "$UNNAMED$63"
-			quid       	"3F7896A2026E"
-			roles      	(list role_list
-			    (object Role "parent"
-				quid       	"3F7896A7012B"
-				label      	"parent"
-				supplier   	"Logical View::wsdl::UnknownExtensibilityElement"
-				quidu      	"3CB24AC002AE"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "children"
-				quid       	"3F7896A7012C"
-				label      	"children"
-				supplier   	"Logical View::wsdl::UnknownExtensibilityElement"
-				quidu      	"3CB24AC002AE"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE))))
-		logical_presentations 	(list unit_reference_list
-		    (object ClassDiagram "2.7 Services"
-			quid       	"39AD3EF60127"
-			title      	"2.7 Services"
-			zoom       	90
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::IBinding" @1
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1424, 800)
-				label      	(object ItemLabel
-				    Parent_View 	@1
-				    location   	(1173, 660)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	502
-				    justify    	0
-				    label      	"IBinding")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@1
-				    location   	(1173, 610)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	502
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84ABC60219"
-				width      	520
-				height     	404
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IPort" @2
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(816, 528)
-				label      	(object ItemLabel
-				    Parent_View 	@2
-				    location   	(686, 481)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	260
-				    justify    	0
-				    label      	"IPort")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@2
-				    location   	(686, 431)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	260
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84AB800326"
-				width      	278
-				height     	218
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IService" @3
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@3
-				    location   	(126, 90)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	228
-				    justify    	0
-				    label      	"IService")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@3
-				    location   	(126, 40)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	228
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84AB490287"
-				width      	246
-				height     	264
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Service" @4
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 528)
-				label      	(object ItemLabel
-				    Parent_View 	@4
-				    location   	(44, 389)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	392
-				    justify    	0
-				    label      	"Service")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D8F002F8"
-				width      	410
-				height     	302
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @5
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B85954E01B4"
-				client     	@4
-				supplier   	@3
-				line_style 	3
-				origin_attachment 	(240, 377)
-				terminal_attachment 	(240, 292))
-			    (object ClassView "Class" "Logical View::wsdl::Binding" @6
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1440, 1264)
-				label      	(object ItemLabel
-				    Parent_View 	@6
-				    location   	(1244, 1125)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	392
-				    justify    	0
-				    label      	"Binding")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D2860261"
-				width      	410
-				height     	302
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @7
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8595410129"
-				client     	@6
-				supplier   	@1
-				line_style 	3
-				origin_attachment 	(1430, 1113)
-				terminal_attachment 	(1430, 1002))
-			    (object ClassView "Class" "Logical View::wsdl::Port" @8
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(816, 912)
-				label      	(object ItemLabel
-				    Parent_View 	@8
-				    location   	(675, 840)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	282
-				    justify    	0
-				    label      	"Port")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D9170286"
-				width      	300
-				height     	168
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @9
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B85954502C9"
-				client     	@8
-				supplier   	@2
-				line_style 	3
-				origin_attachment 	(809, 828)
-				terminal_attachment 	(809, 637))
-			    (object AssociationViewNew "$UNNAMED$9" @10
-				location   	(343, 916)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5D9400393"
-				roleview_list 	(list RoleViews
-				    (object RoleView "ePorts" @11
-					Parent_View 	@10
-					location   	(-121, 644)
-					label      	(object SegLabel @12
-					    Parent_View 	@11
-					    location   	(413, 945)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	192
-					    justify    	0
-					    label      	"+ePorts"
-					    pctDist    	0.218978
-					    height     	29
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D941031C"
-					client     	@10
-					supplier   	@8
-					line_style 	3
-					origin_attachment 	(343, 916)
-					terminal_attachment 	(666, 916)
-					label      	(object SegLabel @13
-					    Parent_View 	@11
-					    location   	(539, 880)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	160
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.608000
-					    height     	37
-					    orientation 	0)
-					label      	(object SegLabel @14
-					    Parent_View 	@11
-					    location   	(448, 990)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	146
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.328467
-					    height     	74
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$10" @15
-					Parent_View 	@10
-					location   	(-121, 644)
-					label      	(object SegLabel @16
-					    Parent_View 	@15
-					    location   	(216, 744)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D941031D"
-					client     	@10
-					supplier   	@4
-					vertices   	(list Points
-					    (343, 916)
-					    (257, 916)
-					    (257, 679))
-					line_style 	3
-					origin_attachment 	(343, 916)
-					terminal_attachment 	(257, 679)
-					label      	(object SegLabel @17
-					    Parent_View 	@15
-					    location   	(301, 796)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.637097
-					    height     	44
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$11" @18
-				location   	(886, 1270)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5D9B8011F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eBinding" @19
-					Parent_View 	@18
-					location   	(38, 422)
-					label      	(object SegLabel @20
-					    Parent_View 	@19
-					    location   	(1112, 1235)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+eBinding"
-					    pctDist    	0.648571
-					    height     	36
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D9B9024D"
-					client     	@18
-					supplier   	@6
-					line_style 	3
-					origin_attachment 	(886, 1270)
-					terminal_attachment 	(1235, 1270)
-					label      	(object SegLabel @21
-					    Parent_View 	@19
-					    location   	(1170, 1313)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.814286
-					    height     	43
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$12" @22
-					Parent_View 	@18
-					location   	(38, 422)
-					label      	(object SegLabel @23
-					    Parent_View 	@22
-					    location   	(852, 1106)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	156
-					    justify    	0
-					    label      	""
-					    pctDist    	0.687943
-					    height     	40
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D9B90261"
-					client     	@18
-					supplier   	@8
-					vertices   	(list Points
-					    (886, 1270)
-					    (812, 1270)
-					    (812, 996))
-					line_style 	3
-					origin_attachment 	(886, 1270)
-					terminal_attachment 	(812, 996))))))
-		    (object ClassDiagram "2.5 Bindings"
-			quid       	"39AD51270252"
-			title      	"2.5 Bindings"
-			zoom       	85
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::IBinding" @24
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 240)
-				label      	(object ItemLabel
-				    Parent_View 	@24
-				    location   	(73, 114)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	462
-				    justify    	0
-				    label      	"IBinding")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@24
-				    location   	(73, 64)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	462
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84ABC60219"
-				width      	480
-				height     	376
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IBindingOperation" @25
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(976, 352)
-				label      	(object ItemLabel
-				    Parent_View 	@25
-				    location   	(780, 130)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	392
-				    justify    	0
-				    label      	"IBindingOperation")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@25
-				    location   	(780, 80)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	392
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84ADC00072"
-				width      	410
-				height     	568
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IBindingInput" @26
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(192, 1360)
-				label      	(object ItemLabel
-				    Parent_View 	@26
-				    location   	(62, 1334)
-				    fill_color 	16777215
-				    nlines     	1
-				    max_width  	260
-				    justify    	0
-				    label      	"IBindingInput")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@26
-				    location   	(62, 1284)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	260
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84ADEB0100"
-				width      	278
-				height     	176
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IBindingOutput" @27
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 1664)
-				label      	(object ItemLabel
-				    Parent_View 	@27
-				    location   	(61, 1638)
-				    fill_color 	16777215
-				    nlines     	1
-				    max_width  	294
-				    justify    	0
-				    label      	"IBindingOutput")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@27
-				    location   	(61, 1588)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	294
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84AE210111"
-				width      	312
-				height     	176
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IBindingFault" @28
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 1984)
-				label      	(object ItemLabel
-				    Parent_View 	@28
-				    location   	(72, 1958)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	272
-				    justify    	0
-				    label      	"IBindingFault")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@28
-				    location   	(72, 1908)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	272
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84AE4F00BD"
-				width      	290
-				height     	176
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::PortType" @29
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1904, 624)
-				label      	(object ItemLabel
-				    Parent_View 	@29
-				    location   	(1568, 486)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	673
-				    justify    	0
-				    label      	"PortType")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C7F001A5"
-				width      	691
-				height     	301
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Input" @30
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1904, 1360)
-				label      	(object ItemLabel
-				    Parent_View 	@30
-				    location   	(1756, 1283)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"Input")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE0789F0059"
-				width      	314
-				height     	178
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Output" @31
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1904, 1664)
-				label      	(object ItemLabel
-				    Parent_View 	@31
-				    location   	(1756, 1587)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"Output")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE078B60232"
-				width      	314
-				height     	178
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Binding" @32
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 688)
-				label      	(object ItemLabel
-				    Parent_View 	@32
-				    location   	(97, 539)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	414
-				    justify    	0
-				    label      	"Binding")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D2860261"
-				width      	432
-				height     	322
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @33
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8595410129"
-				client     	@32
-				supplier   	@24
-				line_style 	3
-				origin_attachment 	(279, 527)
-				terminal_attachment 	(279, 428))
-			    (object AssociationViewNew "$UNNAMED$3" @34
-				location   	(1039, 742)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5D352010F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "ePortType" @35
-					Parent_View 	@34
-					location   	(575, 598)
-					label      	(object SegLabel @36
-					    Parent_View 	@35
-					    location   	(1449, 781)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+ePortType"
-					    pctDist    	0.789292
-					    height     	39
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D3540176"
-					client     	@34
-					supplier   	@29
-					line_style 	3
-					origin_attachment 	(1039, 742)
-					terminal_attachment 	(1559, 742)
-					label      	(object SegLabel @37
-					    Parent_View 	@35
-					    location   	(1492, 716)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.872193
-					    height     	27
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$4" @38
-					Parent_View 	@34
-					location   	(575, 598)
-					label      	(object SegLabel @39
-					    Parent_View 	@38
-					    location   	(776, 697)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	108
-					    justify    	0
-					    label      	""
-					    pctDist    	0.509449
-					    height     	46
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D3540180"
-					client     	@34
-					supplier   	@32
-					line_style 	3
-					origin_attachment 	(1039, 742)
-					terminal_attachment 	(520, 742))))
-			    (object ClassView "Class" "Logical View::wsdl::Operation" @40
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1888, 1024)
-				label      	(object ItemLabel
-				    Parent_View 	@40
-				    location   	(1672, 851)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	432
-				    justify    	0
-				    label      	"Operation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C80D03CE"
-				width      	450
-				height     	370
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::BindingInput" @41
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(624, 1408)
-				label      	(object ItemLabel
-				    Parent_View 	@41
-				    location   	(476, 1283)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"BindingInput")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE08A8202D4"
-				width      	314
-				height     	274
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$43" @42
-				location   	(1264, 1359)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84AD2400BD"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eInput" @43
-					Parent_View 	@42
-					location   	(96, 287)
-					label      	(object SegLabel @44
-					    Parent_View 	@43
-					    location   	(1637, 1316)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	132
-					    justify    	0
-					    label      	"+eInput"
-					    pctDist    	0.775148
-					    height     	44
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B84AD250083"
-					client     	@42
-					supplier   	@30
-					line_style 	3
-					origin_attachment 	(1264, 1359)
-					terminal_attachment 	(1747, 1359)
-					label      	(object SegLabel @45
-					    Parent_View 	@43
-					    location   	(1694, 1398)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.889546
-					    height     	39
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$44" @46
-					Parent_View 	@42
-					location   	(96, 287)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B84AD250084"
-					client     	@42
-					supplier   	@41
-					line_style 	3
-					origin_attachment 	(1264, 1359)
-					terminal_attachment 	(781, 1359))))
-			    (object ClassView "Class" "Logical View::wsdl::BindingOutput" @47
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(960, 1664)
-				label      	(object ItemLabel
-				    Parent_View 	@47
-				    location   	(812, 1539)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"BindingOutput")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE08A8F028C"
-				width      	314
-				height     	274
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$45" @48
-				location   	(1432, 1654)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84AD7900F2"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eOutput" @49
-					Parent_View 	@48
-					location   	(-120, 374)
-					label      	(object SegLabel @50
-					    Parent_View 	@49
-					    location   	(1645, 1612)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+eOutput"
-					    pctDist    	0.674772
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B84AD7A014D"
-					client     	@48
-					supplier   	@31
-					line_style 	3
-					origin_attachment 	(1432, 1654)
-					terminal_attachment 	(1747, 1654)
-					label      	(object SegLabel @51
-					    Parent_View 	@49
-					    location   	(1681, 1697)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.790274
-					    height     	43
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$46" @52
-					Parent_View 	@48
-					location   	(-120, 374)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B84AD7A014E"
-					client     	@48
-					supplier   	@47
-					line_style 	3
-					origin_attachment 	(1432, 1654)
-					terminal_attachment 	(1117, 1654))))
-			    (object ClassView "Class" "Logical View::wsdl::BindingOperation" @53
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(992, 1008)
-				label      	(object ItemLabel
-				    Parent_View 	@53
-				    location   	(819, 931)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	346
-				    justify    	0
-				    label      	"BindingOperation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D3CB0145"
-				width      	364
-				height     	178
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @54
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84ADE401DC"
-				client     	@53
-				supplier   	@25
-				line_style 	3
-				origin_attachment 	(966, 919)
-				terminal_attachment 	(966, 636))
-			    (object AssociationViewNew "$UNNAMED$5" @55
-				location   	(457, 1022)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5D3E10179"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$6" @56
-					Parent_View 	@55
-					location   	(-1319, 494)
-					label      	(object SegLabel @57
-					    Parent_View 	@56
-					    location   	(235, 920)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D3E20225"
-					client     	@55
-					supplier   	@32
-					vertices   	(list Points
-					    (457, 1022)
-					    (276, 1022)
-					    (276, 849))
-					line_style 	3
-					origin_attachment 	(457, 1022)
-					terminal_attachment 	(276, 849)
-					label      	(object SegLabel @58
-					    Parent_View 	@56
-					    location   	(330, 884)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	1))
-				    (object RoleView "eBindingOperations" @59
-					Parent_View 	@55
-					location   	(-1319, 494)
-					label      	(object SegLabel @60
-					    Parent_View 	@59
-					    location   	(531, 977)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	384
-					    justify    	0
-					    label      	"+eBindingOperations"
-					    pctDist    	0.211699
-					    height     	46
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D3E20239"
-					client     	@55
-					supplier   	@53
-					line_style 	3
-					origin_attachment 	(457, 1022)
-					terminal_attachment 	(810, 1022)
-					label      	(object SegLabel @61
-					    Parent_View 	@59
-					    location   	(769, 980)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.884956
-					    height     	43
-					    orientation 	0)
-					label      	(object SegLabel @62
-					    Parent_View 	@59
-					    location   	(714, 1067)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	154
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.727564
-					    height     	45
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$7" @63
-				location   	(1418, 1040)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5D425038A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eOperation" @64
-					Parent_View 	@63
-					location   	(-358, 464)
-					label      	(object SegLabel @65
-					    Parent_View 	@64
-					    location   	(1520, 1079)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	228
-					    justify    	0
-					    label      	"+eOperation"
-					    pctDist    	0.420601
-					    height     	39
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D42602F5"
-					client     	@63
-					supplier   	@40
-					line_style 	3
-					origin_attachment 	(1418, 1040)
-					terminal_attachment 	(1663, 1040)
-					label      	(object SegLabel @66
-					    Parent_View 	@64
-					    location   	(1589, 1005)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.696721
-					    height     	36
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$8" @67
-					Parent_View 	@63
-					location   	(-358, 464)
-					label      	(object SegLabel @68
-					    Parent_View 	@67
-					    location   	(1273, 1070)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	192
-					    justify    	0
-					    label      	""
-					    pctDist    	0.595420
-					    height     	30
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D42602FF"
-					client     	@63
-					supplier   	@53
-					line_style 	3
-					origin_attachment 	(1418, 1040)
-					terminal_attachment 	(1174, 1040))))
-			    (object AssociationViewNew "$UNNAMED$23" @69
-				location   	(787, 1190)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3ADF2E6401F5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eBindingInput" @70
-					Parent_View 	@69
-					location   	(-381, 454)
-					label      	(object SegLabel @71
-					    Parent_View 	@70
-					    location   	(669, 1152)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+eBindingInput"
-					    pctDist    	0.511905
-					    height     	39
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2E650251"
-					client     	@69
-					supplier   	@41
-					vertices   	(list Points
-					    (787, 1190)
-					    (636, 1190)
-					    (636, 1271))
-					line_style 	3
-					origin_attachment 	(787, 1190)
-					terminal_attachment 	(636, 1271)
-					label      	(object SegLabel @72
-					    Parent_View 	@70
-					    location   	(685, 1222)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.440476
-					    height     	32
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$24" @73
-					Parent_View 	@69
-					location   	(-381, 454)
-					label      	(object SegLabel @74
-					    Parent_View 	@73
-					    location   	(885, 1144)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2E650252"
-					client     	@69
-					supplier   	@53
-					vertices   	(list Points
-					    (787, 1190)
-					    (926, 1190)
-					    (926, 1097))
-					line_style 	3
-					origin_attachment 	(787, 1190)
-					terminal_attachment 	(926, 1097)
-					label      	(object SegLabel @75
-					    Parent_View 	@73
-					    location   	(871, 1136)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.837758
-					    height     	56
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$25" @76
-				location   	(1024, 1312)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3ADF2EB30163"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eBindingOutput" @77
-					Parent_View 	@76
-					location   	(-150, 578)
-					label      	(object SegLabel @78
-					    Parent_View 	@77
-					    location   	(1012, 1429)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	306
-					    justify    	0
-					    label      	"+eBindingOutput"
-					    pctDist    	0.545082
-					    height     	13
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2EB4013C"
-					client     	@76
-					supplier   	@47
-					line_style 	3
-					origin_attachment 	(1024, 1312)
-					terminal_attachment 	(1024, 1527)
-					label      	(object SegLabel @79
-					    Parent_View 	@77
-					    location   	(967, 1479)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.774590
-					    height     	58
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$26" @80
-					Parent_View 	@76
-					location   	(-150, 578)
-					label      	(object SegLabel @81
-					    Parent_View 	@80
-					    location   	(983, 1140)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2EB4013D"
-					client     	@76
-					supplier   	@53
-					line_style 	3
-					origin_attachment 	(1024, 1312)
-					terminal_attachment 	(1024, 1097)
-					label      	(object SegLabel @82
-					    Parent_View 	@80
-					    location   	(1031, 1186)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.590164
-					    height     	7
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::wsdl::Fault" @83
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1920, 1984)
-				label      	(object ItemLabel
-				    Parent_View 	@83
-				    location   	(1772, 1907)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"Fault")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE078BE0108"
-				width      	314
-				height     	178
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::BindingFault" @84
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1360, 1984)
-				label      	(object ItemLabel
-				    Parent_View 	@84
-				    location   	(1212, 1859)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"BindingFault")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE08A9E03A6"
-				width      	314
-				height     	274
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @85
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84AE710333"
-				client     	@84
-				supplier   	@28
-				line_style 	3
-				origin_attachment 	(1203, 2007)
-				terminal_attachment 	(353, 2007))
-			    (object AssociationViewNew "$UNNAMED$33" @86
-				location   	(1356, 1352)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3ADF340003E5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eBindingFaults" @87
-					Parent_View 	@86
-					location   	(188, 616)
-					label      	(object SegLabel @88
-					    Parent_View 	@87
-					    location   	(1382, 1750)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	300
-					    justify    	0
-					    label      	"+eBindingFaults"
-					    pctDist    	0.803150
-					    height     	26
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF340103AA"
-					client     	@86
-					supplier   	@84
-					line_style 	3
-					origin_attachment 	(1356, 1352)
-					terminal_attachment 	(1356, 1847)
-					label      	(object SegLabel @89
-					    Parent_View 	@87
-					    location   	(1409, 1797)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.899194
-					    height     	53
-					    orientation 	0)
-					label      	(object SegLabel @90
-					    Parent_View 	@87
-					    location   	(1256, 1806)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	154
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.919291
-					    height     	101
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$34" @91
-					Parent_View 	@86
-					location   	(188, 616)
-					label      	(object SegLabel @92
-					    Parent_View 	@91
-					    location   	(1076, 1197)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF340103AB"
-					client     	@86
-					supplier   	@53
-					vertices   	(list Points
-					    (1356, 1352)
-					    (1356, 1217)
-					    (1117, 1217)
-					    (1117, 1097))
-					line_style 	3
-					origin_attachment 	(1356, 1352)
-					terminal_attachment 	(1117, 1097)
-					label      	(object SegLabel @93
-					    Parent_View 	@91
-					    location   	(1152, 1164)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.687008
-					    height     	54
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$35" @94
-				location   	(1640, 1970)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AE091F402F3"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eFault" @95
-					Parent_View 	@94
-					location   	(-344, 818)
-					label      	(object SegLabel @96
-					    Parent_View 	@95
-					    location   	(1674, 1915)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	144
-					    justify    	0
-					    label      	"+eFault"
-					    pctDist    	0.276423
-					    height     	56
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AE091F801FE"
-					client     	@94
-					supplier   	@83
-					line_style 	3
-					origin_attachment 	(1640, 1970)
-					terminal_attachment 	(1763, 1970)
-					label      	(object SegLabel @97
-					    Parent_View 	@95
-					    location   	(1718, 2012)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.642276
-					    height     	42
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$36" @98
-					Parent_View 	@94
-					location   	(-344, 818)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AE091F801FF"
-					client     	@94
-					supplier   	@84
-					line_style 	3
-					origin_attachment 	(1640, 1970)
-					terminal_attachment 	(1517, 1970))))
-			    (object InheritView "" @99
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84AE4302AB"
-				client     	@47
-				supplier   	@27
-				line_style 	3
-				origin_attachment 	(803, 1656)
-				terminal_attachment 	(364, 1656))
-			    (object InheritView "" @100
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84AE1B0113"
-				client     	@41
-				supplier   	@26
-				line_style 	3
-				origin_attachment 	(467, 1385)
-				terminal_attachment 	(331, 1385))))
-		    (object ClassDiagram "2.4 PortTypes"
-			quid       	"3AD5D1C40366"
-			title      	"2.4 PortTypes"
-			documentation 	"This class represents the non-MOF java.util.Iterator interface."
-			zoom       	80
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::IPortType" @101
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(496, 208)
-				label      	(object ItemLabel
-				    Parent_View 	@101
-				    location   	(146, 172)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	700
-				    justify    	0
-				    label      	"IPortType")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@101
-				    location   	(146, 122)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	700
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A5BE0331"
-				width      	718
-				height     	196
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::wsdl::IOperation" @102
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1552, 208)
-				label      	(object ItemLabel
-				    Parent_View 	@102
-				    location   	(1116, 176)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	873
-				    justify    	0
-				    label      	"IOperation")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@102
-				    location   	(1116, 126)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	873
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A77600D1"
-				width      	891
-				height     	188
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IInput" @103
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(368, 1472)
-				label      	(object ItemLabel
-				    Parent_View 	@103
-				    location   	(55, 1437)
-				    fill_color 	16777215
-				    nlines     	1
-				    max_width  	626
-				    justify    	0
-				    label      	"IInput")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@103
-				    location   	(55, 1387)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	626
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A7EE0015"
-				width      	644
-				height     	194
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IOutput" @104
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(384, 1792)
-				label      	(object ItemLabel
-				    Parent_View 	@104
-				    location   	(56, 1757)
-				    fill_color 	16777215
-				    nlines     	1
-				    max_width  	656
-				    justify    	0
-				    label      	"IOutput")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@104
-				    location   	(56, 1707)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	656
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A829027D"
-				width      	674
-				height     	194
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IFault" @105
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(368, 2112)
-				label      	(object ItemLabel
-				    Parent_View 	@105
-				    location   	(55, 2076)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	626
-				    justify    	0
-				    label      	"IFault")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@105
-				    location   	(55, 2026)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	626
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A861031D"
-				width      	644
-				height     	196
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::PortType" @106
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(496, 800)
-				label      	(object ItemLabel
-				    Parent_View 	@106
-				    location   	(158, 672)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	677
-				    justify    	0
-				    label      	"PortType")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C7F001A5"
-				width      	695
-				height     	281
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::wsdl::Part" @107
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2576, 800)
-				label      	(object ItemLabel
-				    Parent_View 	@107
-				    location   	(2325, 692)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	502
-				    justify    	0
-				    label      	"Part")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5CE1C032E"
-				width      	520
-				height     	240
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Fault" @108
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1728, 2112)
-				label      	(object ItemLabel
-				    Parent_View 	@108
-				    location   	(1647, 2060)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	162
-				    justify    	0
-				    label      	"Fault")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE078BE0108"
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Input" @109
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1056, 1472)
-				label      	(object ItemLabel
-				    Parent_View 	@109
-				    location   	(870, 1422)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	372
-				    justify    	0
-				    label      	"Input")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE0789F0059"
-				width      	390
-				height     	125
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::wsdl::Output" @110
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1360, 1792)
-				label      	(object ItemLabel
-				    Parent_View 	@110
-				    location   	(1232, 1742)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	256
-				    justify    	0
-				    label      	"Output")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE078B60232"
-				width      	274
-				height     	125
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Operation" @111
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1552, 784)
-				label      	(object ItemLabel
-				    Parent_View 	@111
-				    location   	(1214, 620)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	677
-				    justify    	0
-				    label      	"Operation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C80D03CE"
-				width      	695
-				height     	352
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$0" @112
-				location   	(1024, 797)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5C824018C"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eOperations" @113
-					Parent_View 	@112
-					location   	(592, 269)
-					label      	(object SegLabel @114
-					    Parent_View 	@113
-					    location   	(1088, 748)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	249
-					    justify    	0
-					    label      	"+eOperations"
-					    pctDist    	0.359649
-					    height     	50
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5C82701CD"
-					client     	@112
-					supplier   	@111
-					line_style 	3
-					origin_attachment 	(1024, 797)
-					terminal_attachment 	(1205, 797)
-					label      	(object SegLabel @115
-					    Parent_View 	@113
-					    location   	(1176, 861)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.840391
-					    height     	64
-					    orientation 	1)
-					label      	(object SegLabel @116
-					    Parent_View 	@113
-					    location   	(1074, 923)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	164
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.276243
-					    height     	126
-					    orientation 	1))
-				    (object RoleView "portType" @117
-					Parent_View 	@112
-					location   	(592, 269)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5C82701C3"
-					client     	@112
-					supplier   	@106
-					line_style 	3
-					origin_attachment 	(1024, 797)
-					terminal_attachment 	(843, 797)
-					label      	(object SegLabel @118
-					    Parent_View 	@117
-					    location   	(888, 757)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.753488
-					    height     	41
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$41" @119
-				location   	(2107, 773)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AEA412F0035"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eParameterOrdering" @120
-					Parent_View 	@119
-					location   	(1819, 101)
-					label      	(object SegLabel @121
-					    Parent_View 	@120
-					    location   	(2145, 647)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+eParameterOrdering"
-					    pctDist    	0.183333
-					    height     	127
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AEA41310255"
-					client     	@119
-					supplier   	@107
-					line_style 	3
-					origin_attachment 	(2107, 773)
-					terminal_attachment 	(2316, 773)
-					label      	(object SegLabel @122
-					    Parent_View 	@120
-					    location   	(2272, 822)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.796610
-					    height     	49
-					    orientation 	1)
-					label      	(object SegLabel @123
-					    Parent_View 	@120
-					    location   	(2171, 888)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	164
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.306220
-					    height     	115
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$42" @124
-					Parent_View 	@119
-					location   	(1819, 101)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AEA4131025F"
-					client     	@119
-					supplier   	@111
-					line_style 	3
-					origin_attachment 	(2107, 773)
-					terminal_attachment 	(1899, 773))))
-			    (object AssociationViewNew "$UNNAMED$31" @125
-				location   	(1702, 1504)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3ADF331601A4"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eFaults" @126
-					Parent_View 	@125
-					location   	(1414, 832)
-					label      	(object SegLabel @127
-					    Parent_View 	@126
-					    location   	(1815, 1982)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+eFaults"
-					    pctDist    	0.878992
-					    height     	113
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF33180387"
-					client     	@125
-					supplier   	@108
-					line_style 	3
-					origin_attachment 	(1702, 1504)
-					terminal_attachment 	(1702, 2048)
-					label      	(object SegLabel @128
-					    Parent_View 	@126
-					    location   	(1644, 2020)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.949580
-					    height     	59
-					    orientation 	1)
-					label      	(object SegLabel @129
-					    Parent_View 	@126
-					    location   	(1593, 1963)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	164
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.845378
-					    height     	110
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$32" @130
-					Parent_View 	@125
-					location   	(1414, 832)
-					label      	(object SegLabel @131
-					    Parent_View 	@130
-					    location   	(1661, 1069)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF33180388"
-					client     	@125
-					supplier   	@111
-					line_style 	3
-					origin_attachment 	(1702, 1504)
-					terminal_attachment 	(1702, 960)
-					label      	(object SegLabel @132
-					    Parent_View 	@130
-					    location   	(1821, 1039)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.857362
-					    height     	119
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$27" @133
-				location   	(1178, 1234)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3ADF2F94024D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eInput" @134
-					Parent_View 	@133
-					location   	(890, 562)
-					label      	(object SegLabel @135
-					    Parent_View 	@134
-					    location   	(878, 1343)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	132
-					    justify    	0
-					    label      	"+eInput"
-					    pctDist    	0.819820
-					    height     	103
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2F950190"
-					client     	@133
-					supplier   	@109
-					vertices   	(list Points
-					    (1178, 1234)
-					    (980, 1234)
-					    (980, 1410))
-					line_style 	3
-					origin_attachment 	(1178, 1234)
-					terminal_attachment 	(980, 1410)
-					label      	(object SegLabel @136
-					    Parent_View 	@134
-					    location   	(1046, 1364)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.877660
-					    height     	66
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$28" @137
-					Parent_View 	@133
-					location   	(890, 562)
-					label      	(object SegLabel @138
-					    Parent_View 	@137
-					    location   	(1236, 1036)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2F95019A"
-					client     	@133
-					supplier   	@111
-					vertices   	(list Points
-					    (1178, 1234)
-					    (1277, 1234)
-					    (1277, 960))
-					line_style 	3
-					origin_attachment 	(1178, 1234)
-					terminal_attachment 	(1277, 960)
-					label      	(object SegLabel @139
-					    Parent_View 	@137
-					    location   	(1197, 1058)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.736413
-					    height     	81
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$29" @140
-				location   	(1468, 1345)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3ADF2FB802F9"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eOutput" @141
-					Parent_View 	@140
-					location   	(1180, 673)
-					label      	(object SegLabel @142
-					    Parent_View 	@141
-					    location   	(1362, 1669)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+eOutput"
-					    pctDist    	0.840909
-					    height     	107
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2FB9020A"
-					client     	@140
-					supplier   	@110
-					line_style 	3
-					origin_attachment 	(1468, 1345)
-					terminal_attachment 	(1468, 1730)
-					label      	(object SegLabel @143
-					    Parent_View 	@141
-					    location   	(1546, 1676)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.863636
-					    height     	78
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$30" @144
-					Parent_View 	@140
-					location   	(1180, 673)
-					label      	(object SegLabel @145
-					    Parent_View 	@144
-					    location   	(1427, 1037)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2FB9020B"
-					client     	@140
-					supplier   	@111
-					line_style 	3
-					origin_attachment 	(1468, 1345)
-					terminal_attachment 	(1468, 960)
-					label      	(object SegLabel @146
-					    Parent_View 	@144
-					    location   	(1523, 1080)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.690341
-					    height     	55
-					    orientation 	1))))
-			    (object InheritView "" @147
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F6F1FD8019F"
-				client     	@106
-				supplier   	@101
-				line_style 	0)
-			    (object InheritView "" @148
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F6F1FE20171"
-				client     	@111
-				supplier   	@102
-				line_style 	0)
-			    (object InheritView "" @149
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F6F1FEE031D"
-				client     	@109
-				supplier   	@103
-				line_style 	0)
-			    (object InheritView "" @150
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F6F1FF801CD"
-				client     	@110
-				supplier   	@104
-				line_style 	0)
-			    (object InheritView "" @151
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F6F2002002D"
-				client     	@108
-				supplier   	@105
-				line_style 	0)
-			    (object ClassView "Class" "Logical View::wsdl::Message" @152
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2224, 1456)
-				label      	(object ItemLabel
-				    Parent_View 	@152
-				    location   	(1937, 1312)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	575
-				    justify    	0
-				    label      	"Message")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C9590078"
-				width      	593
-				height     	312
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::wsdl::MessageReference" @153
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1520, 2544)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@153
-				    location   	(1193, 2468)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	654
-				    justify    	0
-				    label      	"MessageReference")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3F6771DB02DC"
-				width      	672
-				height     	180
-				annotation 	8)
-			    (object InheritTreeView "" @154
-				location   	(1524, 2275)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@153
-				vertices   	(list Points
-				    (1524, 2275)
-				    (1524, 2454)))
-			    (object InheritView "" @155
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F67723D0319"
-				client     	@108
-				supplier   	@153
-				line_style 	3
-				origin_attachment 	(1776, 2176)
-				terminal_attachment 	(1776, 2275)
-				drawSupplier 	@154)
-			    (object InheritView "" @156
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F67723500DD"
-				client     	@110
-				supplier   	@153
-				line_style 	3
-				origin_attachment 	(1371, 1854)
-				terminal_attachment 	(1371, 2275)
-				drawSupplier 	@154)
-			    (object InheritView "" @157
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F67722802E7"
-				client     	@109
-				supplier   	@153
-				line_style 	3
-				origin_attachment 	(980, 1534)
-				terminal_attachment 	(980, 2275)
-				drawSupplier 	@154)
-			    (object AssociationViewNew "$UNNAMED$61" @158
-				location   	(2206, 2259)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F74E78401B1"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eMessage" @159
-					Parent_View 	@158
-					location   	(734, -285)
-					label      	(object SegLabel @160
-					    Parent_View 	@159
-					    location   	(2068, 1670)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+eMessage"
-					    pctDist    	0.912230
-					    height     	139
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3F74E786000F"
-					client     	@158
-					supplier   	@152
-					line_style 	3
-					origin_attachment 	(2206, 2259)
-					terminal_attachment 	(2206, 1612)
-					label      	(object SegLabel @161
-					    Parent_View 	@159
-					    location   	(2260, 1678)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$62" @162
-					Parent_View 	@158
-					location   	(734, -285)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3F74E7860023"
-					client     	@158
-					supplier   	@153
-					vertices   	(list Points
-					    (2206, 2259)
-					    (2206, 2556)
-					    (1856, 2556))
-					line_style 	3
-					origin_attachment 	(2206, 2259)
-					terminal_attachment 	(1856, 2556))))))
-		    (object ClassDiagram "2.1 Definitions"
-			quid       	"3AD5E48A0262"
-			title      	"2.1 Definitions"
-			zoom       	83
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::IDefinition" @163
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(432, 192)
-				label      	(object ItemLabel
-				    Parent_View 	@163
-				    location   	(88, 161)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	688
-				    justify    	0
-				    label      	"IDefinition")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@163
-				    location   	(88, 111)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	688
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84B1D90142"
-				width      	706
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Types" @164
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1824, 944)
-				label      	(object ItemLabel
-				    Parent_View 	@164
-				    location   	(1686, 896)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	276
-				    justify    	0
-				    label      	"Types")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B8BE9A603A8"
-				width      	294
-				height     	120
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Import" @165
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2144, 624)
-				label      	(object ItemLabel
-				    Parent_View 	@165
-				    location   	(1910, 545)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"Import")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5E4F903DE"
-				width      	486
-				height     	182
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Message" @166
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(2112, 1184)
-				label      	(object ItemLabel
-				    Parent_View 	@166
-				    location   	(1900, 1056)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	424
-				    justify    	0
-				    label      	"Message")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C9590078"
-				width      	442
-				height     	280
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::PortType" @167
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(1808, 1488)
-				label      	(object ItemLabel
-				    Parent_View 	@167
-				    location   	(1596, 1360)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	424
-				    justify    	0
-				    label      	"PortType")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C7F001A5"
-				width      	442
-				height     	280
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Binding" @168
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(2336, 1728)
-				label      	(object ItemLabel
-				    Parent_View 	@168
-				    location   	(2124, 1600)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	424
-				    justify    	0
-				    label      	"Binding")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D2860261"
-				width      	442
-				height     	280
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Definition" @169
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1328, 240)
-				label      	(object ItemLabel
-				    Parent_View 	@169
-				    location   	(1073, 39)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	510
-				    justify    	0
-				    label      	"Definition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5E43F008E"
-				width      	528
-				height     	426
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$53" @170
-				location   	(1358, 860)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8BEA27029F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$54" @171
-					Parent_View 	@170
-					location   	(62, -36)
-					label      	(object SegLabel @172
-					    Parent_View 	@171
-					    location   	(1317, 535)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8BEA290356"
-					client     	@170
-					supplier   	@169
-					line_style 	3
-					origin_attachment 	(1358, 860)
-					terminal_attachment 	(1358, 453)
-					label      	(object SegLabel @173
-					    Parent_View 	@171
-					    location   	(1403, 511)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.856649
-					    height     	45
-					    orientation 	1))
-				    (object RoleView "eTypes" @174
-					Parent_View 	@170
-					location   	(62, -36)
-					label      	(object SegLabel @175
-					    Parent_View 	@174
-					    location   	(1586, 909)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	156
-					    justify    	0
-					    label      	"+eTypes"
-					    pctDist    	0.779097
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8BEA29036A"
-					client     	@170
-					supplier   	@164
-					vertices   	(list Points
-					    (1358, 860)
-					    (1358, 948)
-					    (1677, 948))
-					line_style 	3
-					origin_attachment 	(1358, 860)
-					terminal_attachment 	(1677, 948)
-					label      	(object SegLabel @176
-					    Parent_View 	@174
-					    location   	(1632, 987)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.892655
-					    height     	39
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$57" @177
-				location   	(1612, 595)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C864DFF02EC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$58" @178
-					Parent_View 	@177
-					location   	(12, 227)
-					label      	(object SegLabel @179
-					    Parent_View 	@178
-					    location   	(1423, 512)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C864DFF02EE"
-					client     	@177
-					supplier   	@169
-					vertices   	(list Points
-					    (1612, 595)
-					    (1464, 595)
-					    (1464, 453))
-					line_style 	3
-					origin_attachment 	(1612, 595)
-					terminal_attachment 	(1464, 453)
-					label      	(object SegLabel @180
-					    Parent_View 	@178
-					    location   	(1524, 495)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.858667
-					    height     	60
-					    orientation 	1))
-				    (object RoleView "eImports" @181
-					Parent_View 	@177
-					location   	(12, 227)
-					label      	(object SegLabel @182
-					    Parent_View 	@181
-					    location   	(1692, 557)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	204
-					    justify    	0
-					    label      	"+eImports"
-					    pctDist    	0.280335
-					    height     	39
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C864DFF02ED"
-					client     	@177
-					supplier   	@165
-					line_style 	3
-					origin_attachment 	(1612, 595)
-					terminal_attachment 	(1901, 595)
-					label      	(object SegLabel @183
-					    Parent_View 	@181
-					    location   	(1854, 652)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.841004
-					    height     	57
-					    orientation 	1)
-					label      	(object SegLabel @184
-					    Parent_View 	@181
-					    location   	(1676, 646)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	158
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.225941
-					    height     	51
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$13" @185
-				location   	(1279, 1137)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5E60301E2"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$14" @186
-					Parent_View 	@185
-					location   	(271, 273)
-					label      	(object SegLabel @187
-					    Parent_View 	@186
-					    location   	(1238, 591)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E60400B7"
-					client     	@185
-					supplier   	@169
-					line_style 	3
-					origin_attachment 	(1279, 1137)
-					terminal_attachment 	(1279, 453)
-					label      	(object SegLabel @188
-					    Parent_View 	@186
-					    location   	(1320, 586)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.804974
-					    height     	41
-					    orientation 	1))
-				    (object RoleView "eMessages" @189
-					Parent_View 	@185
-					location   	(271, 273)
-					label      	(object SegLabel @190
-					    Parent_View 	@189
-					    location   	(1647, 1171)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+eMessages"
-					    pctDist    	0.643137
-					    height     	38
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E60400C1"
-					client     	@185
-					supplier   	@166
-					vertices   	(list Points
-					    (1279, 1137)
-					    (1279, 1208)
-					    (1891, 1208))
-					line_style 	3
-					origin_attachment 	(1279, 1137)
-					terminal_attachment 	(1891, 1208)
-					label      	(object SegLabel @191
-					    Parent_View 	@189
-					    location   	(1821, 1171)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.899346
-					    height     	38
-					    orientation 	0)
-					label      	(object SegLabel @192
-					    Parent_View 	@189
-					    location   	(1797, 1244)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	158
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.864407
-					    height     	36
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$15" @193
-				location   	(1212, 1159)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5E6710104"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$16" @194
-					Parent_View 	@193
-					location   	(-324, 215)
-					label      	(object SegLabel @195
-					    Parent_View 	@194
-					    location   	(1171, 594)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E672034A"
-					client     	@193
-					supplier   	@169
-					line_style 	3
-					origin_attachment 	(1212, 1159)
-					terminal_attachment 	(1212, 453)
-					label      	(object SegLabel @196
-					    Parent_View 	@194
-					    location   	(1251, 624)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.757962
-					    height     	39
-					    orientation 	1))
-				    (object RoleView "ePortTypes" @197
-					Parent_View 	@193
-					location   	(-324, 215)
-					label      	(object SegLabel @198
-					    Parent_View 	@197
-					    location   	(1391, 1451)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+ePortTypes"
-					    pctDist    	0.723698
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E6720354"
-					client     	@193
-					supplier   	@167
-					vertices   	(list Points
-					    (1212, 1159)
-					    (1212, 1490)
-					    (1587, 1490))
-					line_style 	3
-					origin_attachment 	(1212, 1159)
-					terminal_attachment 	(1587, 1490)
-					label      	(object SegLabel @199
-					    Parent_View 	@197
-					    location   	(1533, 1451)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.925611
-					    height     	40
-					    orientation 	0)
-					label      	(object SegLabel @200
-					    Parent_View 	@197
-					    location   	(1512, 1540)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	158
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.895855
-					    height     	50
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$17" @201
-				location   	(1114, 1585)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5E6770095"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$18" @202
-					Parent_View 	@201
-					location   	(-406, 241)
-					label      	(object SegLabel @203
-					    Parent_View 	@202
-					    location   	(1073, 680)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E6780371"
-					client     	@201
-					supplier   	@169
-					line_style 	3
-					origin_attachment 	(1114, 1585)
-					terminal_attachment 	(1114, 453)
-					label      	(object SegLabel @204
-					    Parent_View 	@202
-					    location   	(1155, 752)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.736704
-					    height     	41
-					    orientation 	1))
-				    (object RoleView "eBindings" @205
-					Parent_View 	@201
-					location   	(-406, 241)
-					label      	(object SegLabel @206
-					    Parent_View 	@205
-					    location   	(1851, 1674)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	204
-					    justify    	0
-					    label      	"+eBindings"
-					    pctDist    	0.766347
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E678037B"
-					client     	@201
-					supplier   	@168
-					vertices   	(list Points
-					    (1114, 1585)
-					    (1114, 1716)
-					    (2115, 1716))
-					line_style 	3
-					origin_attachment 	(1114, 1585)
-					terminal_attachment 	(2115, 1716)
-					label      	(object SegLabel @207
-					    Parent_View 	@205
-					    location   	(2053, 1677)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.945074
-					    height     	40
-					    orientation 	0)
-					label      	(object SegLabel @208
-					    Parent_View 	@205
-					    location   	(2014, 1754)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	158
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.911072
-					    height     	38
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::wsdl::Service" @209
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(1840, 2048)
-				label      	(object ItemLabel
-				    Parent_View 	@209
-				    location   	(1628, 1920)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	424
-				    justify    	0
-				    label      	"Service")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D8F002F8"
-				width      	442
-				height     	280
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$19" @210
-				location   	(1066, 1533)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5E67B0311"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$20" @211
-					Parent_View 	@210
-					location   	(-521, -111)
-					label      	(object SegLabel @212
-					    Parent_View 	@211
-					    location   	(1025, 669)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E67D007F"
-					client     	@210
-					supplier   	@169
-					line_style 	3
-					origin_attachment 	(1066, 1533)
-					terminal_attachment 	(1066, 453)
-					label      	(object SegLabel @213
-					    Parent_View 	@211
-					    location   	(1109, 756)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.719697
-					    height     	43
-					    orientation 	1))
-				    (object RoleView "eServices" @214
-					Parent_View 	@210
-					location   	(-521, -111)
-					label      	(object SegLabel @215
-					    Parent_View 	@214
-					    location   	(1393, 2028)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	204
-					    justify    	0
-					    label      	"+eServices"
-					    pctDist    	0.791824
-					    height     	32
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E67D0089"
-					client     	@210
-					supplier   	@209
-					vertices   	(list Points
-					    (1066, 1533)
-					    (1066, 2059)
-					    (1619, 2059))
-					line_style 	3
-					origin_attachment 	(1066, 1533)
-					terminal_attachment 	(1619, 2059)
-					label      	(object SegLabel @216
-					    Parent_View 	@214
-					    location   	(1554, 2031)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.940197
-					    height     	29
-					    orientation 	0)
-					label      	(object SegLabel @217
-					    Parent_View 	@214
-					    location   	(1532, 2113)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	158
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.920515
-					    height     	54
-					    orientation 	1))))
-			    (object InheritView "" @218
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84B1F80382"
-				client     	@169
-				supplier   	@163
-				line_style 	3
-				origin_attachment 	(1064, 263)
-				terminal_attachment 	(785, 263))))
-		    (object ClassDiagram "2.1.3 Extensibility"
-			quid       	"3AD60C510192"
-			title      	"2.1.3 Extensibility"
-			zoom       	80
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::Binding" @219
-				ShowCompartmentStereotypes 	TRUE
-				location   	(576, 1584)
-				label      	(object ItemLabel
-				    Parent_View 	@219
-				    location   	(494, 1531)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	164
-				    justify    	0
-				    label      	"Binding")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D2860261"
-				width      	182
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Port" @220
-				ShowCompartmentStereotypes 	TRUE
-				location   	(1568, 1888)
-				label      	(object ItemLabel
-				    Parent_View 	@220
-				    location   	(1487, 1836)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	162
-				    justify    	0
-				    label      	"Port")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D9170286"
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Service" @221
-				ShowCompartmentStereotypes 	TRUE
-				location   	(1424, 1728)
-				label      	(object ItemLabel
-				    Parent_View 	@221
-				    location   	(1342, 1675)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	164
-				    justify    	0
-				    label      	"Service")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D8F002F8"
-				width      	182
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::BindingFault" @222
-				ShowCompartmentStereotypes 	TRUE
-				location   	(1216, 2336)
-				label      	(object ItemLabel
-				    Parent_View 	@222
-				    location   	(1088, 2283)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	256
-				    justify    	0
-				    label      	"BindingFault")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE08A9E03A6"
-				width      	274
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::BindingOperation" @223
-				ShowCompartmentStereotypes 	TRUE
-				location   	(736, 1760)
-				label      	(object ItemLabel
-				    Parent_View 	@223
-				    location   	(563, 1707)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	346
-				    justify    	0
-				    label      	"BindingOperation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D3CB0145"
-				width      	364
-				height     	130
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IExtensibilityElement" @224
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1888, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@224
-				    location   	(1495, 136)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	786
-				    justify    	0
-				    label      	"IExtensibilityElement")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@224
-				    location   	(1495, 86)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	786
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84B12402AB"
-				width      	804
-				height     	172
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::BindingInput" @225
-				ShowCompartmentStereotypes 	TRUE
-				location   	(928, 1952)
-				label      	(object ItemLabel
-				    Parent_View 	@225
-				    location   	(800, 1899)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	256
-				    justify    	0
-				    label      	"BindingInput")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE08A8202D4"
-				width      	274
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::BindingOutput" @226
-				ShowCompartmentStereotypes 	TRUE
-				location   	(1008, 2144)
-				label      	(object ItemLabel
-				    Parent_View 	@226
-				    location   	(863, 2091)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	290
-				    justify    	0
-				    label      	"BindingOutput")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE08A8F028C"
-				width      	308
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Definition" @227
-				ShowCompartmentStereotypes 	TRUE
-				location   	(176, 1296)
-				label      	(object ItemLabel
-				    Parent_View 	@227
-				    location   	(74, 1235)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	204
-				    justify    	0
-				    label      	"Definition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5E43F008E"
-				width      	222
-				height     	146
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Types" @228
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(416, 1408)
-				label      	(object ItemLabel
-				    Parent_View 	@228
-				    location   	(335, 1356)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	162
-				    justify    	0
-				    label      	"Types")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B8BE9A603A8"
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::ExtensibleElement" @229
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(480, 688)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@229
-				    location   	(209, 582)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	542
-				    justify    	0
-				    label      	"ExtensibleElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5FCFA033A"
-				width      	560
-				height     	240
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @230
-				location   	(480, 1039)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@229
-				vertices   	(list Points
-				    (480, 1039)
-				    (480, 808)))
-			    (object InheritView "" @231
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD600CB00AA"
-				client     	@220
-				supplier   	@229
-				line_style 	3
-				origin_attachment 	(1566, 1824)
-				terminal_attachment 	(1566, 1039)
-				drawSupplier 	@230)
-			    (object InheritView "" @232
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B85B5A4027E"
-				client     	@226
-				supplier   	@229
-				line_style 	3
-				origin_attachment 	(1097, 2079)
-				terminal_attachment 	(1097, 1039)
-				drawSupplier 	@230)
-			    (object InheritView "" @233
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AE0938602C9"
-				client     	@222
-				supplier   	@229
-				line_style 	3
-				origin_attachment 	(1219, 2271)
-				terminal_attachment 	(1219, 1039)
-				drawSupplier 	@230)
-			    (object InheritView "" @234
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B85B59B0072"
-				client     	@225
-				supplier   	@229
-				line_style 	3
-				origin_attachment 	(988, 1887)
-				terminal_attachment 	(988, 1039)
-				drawSupplier 	@230)
-			    (object InheritView "" @235
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD6009202F7"
-				client     	@223
-				supplier   	@229
-				line_style 	3
-				origin_attachment 	(797, 1695)
-				terminal_attachment 	(797, 1039)
-				drawSupplier 	@230)
-			    (object InheritView "" @236
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5FA0F02F0"
-				client     	@219
-				supplier   	@229
-				line_style 	3
-				origin_attachment 	(601, 1519)
-				terminal_attachment 	(601, 1039)
-				drawSupplier 	@230)
-			    (object InheritView "" @237
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5FDB803D4"
-				client     	@227
-				supplier   	@229
-				line_style 	3
-				origin_attachment 	(211, 1223)
-				terminal_attachment 	(211, 1039)
-				drawSupplier 	@230)
-			    (object InheritView "" @238
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8BEB010311"
-				client     	@228
-				supplier   	@229
-				line_style 	3
-				origin_attachment 	(414, 1344)
-				terminal_attachment 	(414, 1039)
-				drawSupplier 	@230)
-			    (object InheritView "" @239
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5FA20025E"
-				client     	@221
-				supplier   	@229
-				line_style 	3
-				origin_attachment 	(1429, 1663)
-				terminal_attachment 	(1429, 1039)
-				drawSupplier 	@230)
-			    (object ClassView "Class" "Logical View::wsdl::ExtensibilityElement" @240
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1904, 688)
-				label      	(object ItemLabel
-				    Parent_View 	@240
-				    location   	(1632, 583)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	545
-				    justify    	0
-				    label      	"ExtensibilityElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5DBB602A9"
-				width      	563
-				height     	234
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$21" @241
-				location   	(1191, 672)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5FD130079"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$22" @242
-					Parent_View 	@241
-					location   	(23, 560)
-					label      	(object SegLabel @243
-					    Parent_View 	@242
-					    location   	(847, 631)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5FD14019E"
-					client     	@241
-					supplier   	@229
-					line_style 	3
-					origin_attachment 	(1191, 672)
-					terminal_attachment 	(760, 672)
-					label      	(object SegLabel @244
-					    Parent_View 	@242
-					    location   	(830, 628)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.839695
-					    height     	45
-					    orientation 	1))
-				    (object RoleView "eExtensibilityElements" @245
-					Parent_View 	@241
-					location   	(23, 560)
-					label      	(object SegLabel @246
-					    Parent_View 	@245
-					    location   	(1355, 522)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	"+eExtensibilityElements"
-					    pctDist    	0.379070
-					    height     	151
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5FD14019D"
-					client     	@241
-					supplier   	@240
-					line_style 	3
-					origin_attachment 	(1191, 672)
-					terminal_attachment 	(1623, 672)
-					label      	(object SegLabel @247
-					    Parent_View 	@245
-					    location   	(1496, 627)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.709402
-					    height     	46
-					    orientation 	0)
-					label      	(object SegLabel @248
-					    Parent_View 	@245
-					    location   	(1463, 764)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	164
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.632479
-					    height     	92
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::wsdl::WSDLElement" @249
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(1008, 192)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@249
-				    location   	(630, 86)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	756
-				    justify    	0
-				    label      	"WSDLElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C6A302DD"
-				width      	774
-				height     	240
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @250
-				location   	(1008, 402)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@249
-				vertices   	(list Points
-				    (1008, 402)
-				    (1008, 312)))
-			    (object InheritView "" @251
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5FE3C03D4"
-				client     	@229
-				supplier   	@249
-				line_style 	3
-				origin_attachment 	(492, 568)
-				terminal_attachment 	(492, 402)
-				drawSupplier 	@250)
-			    (object InheritView "" @252
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84B14903D0"
-				client     	@240
-				supplier   	@224
-				line_style 	3
-				origin_attachment 	(2015, 571)
-				terminal_attachment 	(2015, 246))
-			    (object InheritView "" @253
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BDDF53502C3"
-				client     	@240
-				supplier   	@249
-				line_style 	3
-				origin_attachment 	(1762, 571)
-				terminal_attachment 	(1762, 402)
-				drawSupplier 	@250)
-			    (object ClassView "Class" "Logical View::wsdl::UnknownExtensibilityElement" @254
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2016, 1360)
-				label      	(object ItemLabel
-				    Parent_View 	@254
-				    location   	(1731, 1307)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	570
-				    justify    	0
-				    label      	"UnknownExtensibilityElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3CB24AC002AE"
-				width      	588
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @255
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3CB24AEC01CB"
-				client     	@254
-				supplier   	@240
-				line_style 	3
-				origin_attachment 	(1796, 1295)
-				terminal_attachment 	(1796, 805))
-			    (object AssociationViewNew "$UNNAMED$63" @256
-				location   	(2311, 1686)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F7896A2026E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "parent" @257
-					Parent_View 	@256
-					location   	(279, 294)
-					label      	(object SegLabel @258
-					    Parent_View 	@257
-					    location   	(2422, 1333)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	144
-					    justify    	0
-					    label      	"+parent"
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3F7896A7012B"
-					client     	@256
-					supplier   	@254
-					vertices   	(list Points
-					    (2311, 1686)
-					    (2432, 1686)
-					    (2432, 1374)
-					    (2310, 1374))
-					line_style 	3
-					origin_attachment 	(2311, 1686)
-					terminal_attachment 	(2310, 1374)
-					label      	(object SegLabel @259
-					    Parent_View 	@257
-					    location   	(2366, 1428)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	0))
-				    (object RoleView "children" @260
-					Parent_View 	@256
-					location   	(279, 294)
-					label      	(object SegLabel @261
-					    Parent_View 	@260
-					    location   	(1899, 1537)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+children"
-					    pctDist    	0.798561
-					    height     	118
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3F7896A7012C"
-					client     	@256
-					supplier   	@254
-					vertices   	(list Points
-					    (2311, 1686)
-					    (2016, 1686)
-					    (2016, 1425))
-					line_style 	3
-					origin_attachment 	(2311, 1686)
-					terminal_attachment 	(2016, 1425)
-					label      	(object SegLabel @262
-					    Parent_View 	@260
-					    location   	(2070, 1481)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	1))))))
-		    (object ClassDiagram "2.1.1 Naming and Linking"
-			quid       	"3AE8ED7201BD"
-			title      	"2.1.1 Naming and Linking"
-			zoom       	90
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::IImport" @263
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1712, 224)
-				label      	(object ItemLabel
-				    Parent_View 	@263
-				    location   	(1422, 177)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	580
-				    justify    	0
-				    label      	"IImport")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@263
-				    location   	(1422, 127)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	580
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84B2020119"
-				width      	598
-				height     	218
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Namespace" @264
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(432, 1136)
-				label      	(object ItemLabel
-				    Parent_View 	@264
-				    location   	(202, 1041)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	461
-				    justify    	0
-				    label      	"Namespace")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AEA3CD30030"
-				width      	479
-				height     	215
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @265
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1632, 1216)
-				label      	(object ItemLabel
-				    Parent_View 	@265
-				    location   	(1294, 1142)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	676
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	694
-				height     	173
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Definition" @266
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(400, 384)
-				label      	(object ItemLabel
-				    Parent_View 	@266
-				    location   	(164, 236)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	472
-				    justify    	0
-				    label      	"Definition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5E43F008E"
-				width      	490
-				height     	320
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$37" @267
-				location   	(309, 786)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AEA3D55002D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eNamespaces" @268
-					Parent_View 	@267
-					location   	(-91, 258)
-					label      	(object SegLabel @269
-					    Parent_View 	@268
-					    location   	(461, 956)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	288
-					    justify    	0
-					    label      	"+eNamespaces"
-					    pctDist    	0.698842
-					    height     	152
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AEA3D560332"
-					client     	@267
-					supplier   	@264
-					line_style 	3
-					origin_attachment 	(309, 786)
-					terminal_attachment 	(309, 1029)
-					label      	(object SegLabel @270
-					    Parent_View 	@268
-					    location   	(248, 973)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.768707
-					    height     	62
-					    orientation 	1)
-					label      	(object SegLabel @271
-					    Parent_View 	@268
-					    location   	(228, 913)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	146
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.525097
-					    height     	82
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$38" @272
-					Parent_View 	@267
-					location   	(-91, 258)
-					label      	(object SegLabel @273
-					    Parent_View 	@272
-					    location   	(268, 592)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	192
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AEA3D560328"
-					client     	@267
-					supplier   	@266
-					line_style 	3
-					origin_attachment 	(309, 786)
-					terminal_attachment 	(309, 544)
-					label      	(object SegLabel @274
-					    Parent_View 	@272
-					    location   	(239, 583)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.844961
-					    height     	71
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::wsdl::Import" @275
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1472, 720)
-				label      	(object ItemLabel
-				    Parent_View 	@275
-				    location   	(1255, 580)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	434
-				    justify    	0
-				    label      	"Import")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5E4F903DE"
-				width      	452
-				height     	304
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$51" @276
-				location   	(1486, 1001)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8B1DCC02E5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eSchema" @277
-					Parent_View 	@276
-					location   	(510, -103)
-					label      	(object SegLabel @278
-					    Parent_View 	@277
-					    location   	(1737, 1018)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	204
-					    justify    	0
-					    label      	"+eSchema"
-					    pctDist    	0.592593
-					    height     	105
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8B1DCE0270"
-					client     	@276
-					supplier   	@265
-					vertices   	(list Points
-					    (1486, 1001)
-					    (1632, 1001)
-					    (1632, 1130))
-					line_style 	3
-					origin_attachment 	(1486, 1001)
-					terminal_attachment 	(1632, 1130)
-					label      	(object SegLabel @279
-					    Parent_View 	@277
-					    location   	(1563, 1018)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.592593
-					    height     	70
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$52" @280
-					Parent_View 	@276
-					location   	(510, -103)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8B1DCE027A"
-					client     	@276
-					supplier   	@275
-					line_style 	3
-					origin_attachment 	(1486, 872)
-					terminal_attachment 	(1486, 872))))
-			    (object AssociationViewNew "$UNNAMED$39" @281
-				location   	(1087, 403)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AEA3E3A002D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$40" @282
-					Parent_View 	@281
-					location   	(687, -125)
-					label      	(object SegLabel @283
-					    Parent_View 	@282
-					    location   	(1406, 480)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AEA3E3C01F2"
-					client     	@281
-					supplier   	@275
-					vertices   	(list Points
-					    (1087, 403)
-					    (1364, 403)
-					    (1364, 568))
-					line_style 	3
-					origin_attachment 	(1087, 403)
-					terminal_attachment 	(1364, 568))
-				    (object RoleView "eDefinition" @284
-					Parent_View 	@281
-					location   	(687, -125)
-					label      	(object SegLabel @285
-					    Parent_View 	@284
-					    location   	(805, 363)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+eDefinition"
-					    pctDist    	0.637532
-					    height     	41
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AEA3E3C01E8"
-					client     	@281
-					supplier   	@266
-					line_style 	3
-					origin_attachment 	(1087, 403)
-					terminal_attachment 	(645, 403)
-					label      	(object SegLabel @286
-					    Parent_View 	@284
-					    location   	(727, 456)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.814910
-					    height     	53
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$57" @287
-				location   	(737, 826)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C864DFF02EC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$58" @288
-					Parent_View 	@287
-					location   	(-671, 106)
-					label      	(object SegLabel @289
-					    Parent_View 	@288
-					    location   	(552, 647)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C864DFF02EE"
-					client     	@287
-					supplier   	@266
-					vertices   	(list Points
-					    (737, 826)
-					    (510, 826)
-					    (510, 544))
-					line_style 	3
-					origin_attachment 	(737, 826)
-					terminal_attachment 	(510, 544)
-					label      	(object SegLabel @290
-					    Parent_View 	@288
-					    location   	(457, 595)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	0))
-				    (object RoleView "eImports" @291
-					Parent_View 	@287
-					location   	(-671, 106)
-					label      	(object SegLabel @292
-					    Parent_View 	@291
-					    location   	(1144, 773)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+eImports"
-					    pctDist    	0.799189
-					    height     	54
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C864DFF02ED"
-					client     	@287
-					supplier   	@275
-					line_style 	3
-					origin_attachment 	(737, 826)
-					terminal_attachment 	(1246, 826)
-					label      	(object SegLabel @293
-					    Parent_View 	@291
-					    location   	(1180, 879)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.872211
-					    height     	53
-					    orientation 	1)
-					label      	(object SegLabel @294
-					    Parent_View 	@291
-					    location   	(1162, 933)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	146
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.837728
-					    height     	107
-					    orientation 	1))))
-			    (object InheritView "" @295
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F6F200D0340"
-				client     	@275
-				supplier   	@263
-				line_style 	3
-				origin_attachment 	(1555, 568)
-				terminal_attachment 	(1555, 333))))
-		    (object ClassDiagram "2.2 Types"
-			quid       	"3B85AE59037E"
-			title      	"2.2 Types"
-			zoom       	90
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	81
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @296
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1136, 1232)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@296
-				    location   	(895, 1159)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	482
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ECD302A9"
-				width      	500
-				height     	174
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @297
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1136, 1600)
-				label      	(object ItemLabel
-				    Parent_View 	@297
-				    location   	(906, 1531)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	460
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				width      	478
-				height     	162
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Message" @298
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1280, 1968)
-				label      	(object ItemLabel
-				    Parent_View 	@298
-				    location   	(1022, 1828)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	517
-				    justify    	0
-				    label      	"Message")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C9590078"
-				width      	535
-				height     	305
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Part" @299
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(352, 1184)
-				label      	(object ItemLabel
-				    Parent_View 	@299
-				    location   	(128, 1067)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	448
-				    justify    	0
-				    label      	"Part")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5CE1C032E"
-				width      	466
-				height     	258
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$47" @300
-				location   	(735, 1172)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8B1BE900C4"
-				roleview_list 	(list RoleViews
-				    (object RoleView "typeDefinition" @301
-					Parent_View 	@300
-					location   	(143, 676)
-					label      	(object SegLabel @302
-					    Parent_View 	@301
-					    location   	(775, 1133)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+typeDefinition"
-					    pctDist    	0.269006
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8B1BE90327"
-					client     	@300
-					supplier   	@296
-					line_style 	3
-					origin_attachment 	(735, 1172)
-					terminal_attachment 	(886, 1172)
-					label      	(object SegLabel @303
-					    Parent_View 	@301
-					    location   	(839, 1207)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.688705
-					    height     	35
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$48" @304
-					Parent_View 	@300
-					location   	(143, 676)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8B1BE90331"
-					client     	@300
-					supplier   	@299
-					line_style 	3
-					origin_attachment 	(735, 1172)
-					terminal_attachment 	(585, 1172))))
-			    (object AssociationViewNew "$UNNAMED$49" @305
-				location   	(527, 1592)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8B1C1203B2"
-				roleview_list 	(list RoleViews
-				    (object RoleView "elementDeclaration" @306
-					Parent_View 	@305
-					location   	(-65, 1096)
-					label      	(object SegLabel @307
-					    Parent_View 	@306
-					    location   	(666, 1554)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+elementDeclaration"
-					    pctDist    	0.375394
-					    height     	39
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8B1C14001C"
-					client     	@305
-					supplier   	@297
-					line_style 	3
-					origin_attachment 	(527, 1592)
-					terminal_attachment 	(897, 1592)
-					label      	(object SegLabel @308
-					    Parent_View 	@306
-					    location   	(807, 1645)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.755877
-					    height     	53
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$50" @309
-					Parent_View 	@305
-					location   	(-65, 1096)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8B1C140026"
-					client     	@305
-					supplier   	@299
-					vertices   	(list Points
-					    (527, 1592)
-					    (437, 1592)
-					    (437, 1313))
-					line_style 	3
-					origin_attachment 	(527, 1592)
-					terminal_attachment 	(437, 1313))))
-			    (object AssociationViewNew "$UNNAMED$55" @310
-				location   	(322, 1911)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C46829303E5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eMessage" @311
-					Parent_View 	@310
-					location   	(-14, 1191)
-					label      	(object SegLabel @312
-					    Parent_View 	@311
-					    location   	(838, 1872)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+eMessage"
-					    pctDist    	0.748560
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C468296010E"
-					client     	@310
-					supplier   	@298
-					line_style 	3
-					origin_attachment 	(322, 1911)
-					terminal_attachment 	(1013, 1911)
-					label      	(object SegLabel @313
-					    Parent_View 	@311
-					    location   	(943, 1965)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$56" @314
-					Parent_View 	@310
-					location   	(-14, 1191)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C4682960118"
-					client     	@310
-					supplier   	@299
-					vertices   	(list Points
-					    (322, 1911)
-					    (229, 1911)
-					    (229, 1313))
-					line_style 	3
-					origin_attachment 	(322, 1911)
-					terminal_attachment 	(229, 1313))))
-			    (object ClassView "Class" "Logical View::wsdl::Types" @315
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(800, 608)
-				label      	(object ItemLabel
-				    Parent_View 	@315
-				    location   	(615, 512)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	371
-				    justify    	0
-				    label      	"Types")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B8BE9A603A8"
-				width      	389
-				height     	216
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Definition" @316
-				ShowCompartmentStereotypes 	TRUE
-				location   	(176, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@316
-				    location   	(74, 107)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	204
-				    justify    	0
-				    label      	"Definition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5E43F008E"
-				width      	222
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$53" @317
-				location   	(234, 604)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8BEA27029F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eTypes" @318
-					Parent_View 	@317
-					location   	(-150, 396)
-					label      	(object SegLabel @319
-					    Parent_View 	@318
-					    location   	(480, 640)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	207
-					    justify    	0
-					    label      	"+eTypes"
-					    pctDist    	0.661017
-					    height     	36
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8BEA29036A"
-					client     	@317
-					supplier   	@315
-					line_style 	3
-					origin_attachment 	(234, 604)
-					terminal_attachment 	(606, 604)
-					label      	(object SegLabel @320
-					    Parent_View 	@318
-					    location   	(526, 569)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.783883
-					    height     	36
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$54" @321
-					Parent_View 	@317
-					location   	(-150, 396)
-					label      	(object SegLabel @322
-					    Parent_View 	@321
-					    location   	(133, 313)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8BEA290356"
-					client     	@317
-					supplier   	@316
-					vertices   	(list Points
-					    (234, 604)
-					    (174, 604)
-					    (174, 225))
-					line_style 	3
-					origin_attachment 	(234, 604)
-					terminal_attachment 	(174, 225)
-					label      	(object SegLabel @323
-					    Parent_View 	@321
-					    location   	(228, 271)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.897729
-					    height     	54
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::wsdl::ITypes" @324
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(640, 224)
-				label      	(object ItemLabel
-				    Parent_View 	@324
-				    location   	(525, 203)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	230
-				    justify    	0
-				    label      	"ITypes")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@324
-				    location   	(525, 153)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	230
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3CADCBB20050"
-				width      	248
-				height     	166
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::XSDSchemaExtensibilityElement" @325
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1728, 800)
-				label      	(object ItemLabel
-				    Parent_View 	@325
-				    location   	(1359, 753)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	739
-				    justify    	0
-				    label      	"XSDSchemaExtensibilityElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3CC360D7039C"
-				width      	757
-				height     	118
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @326
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1856, 1216)
-				label      	(object ItemLabel
-				    Parent_View 	@326
-				    location   	(1529, 1103)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	655
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	673
-				height     	250
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$59" @327
-				location   	(1826, 975)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3CC3614500F2"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$60" @328
-					Parent_View 	@327
-					location   	(306, 447)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3CC36146023D"
-					client     	@327
-					supplier   	@325
-					line_style 	3
-					origin_attachment 	(1826, 975)
-					terminal_attachment 	(1826, 859)
-					label      	(object SegLabel @329
-					    Parent_View 	@328
-					    location   	(1774, 900)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.656489
-					    height     	53
-					    orientation 	0))
-				    (object RoleView "schema" @330
-					Parent_View 	@327
-					location   	(306, 447)
-					label      	(object SegLabel @331
-					    Parent_View 	@330
-					    location   	(2006, 1033)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+schema"
-					    pctDist    	0.507576
-					    height     	180
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3CC36146023E"
-					client     	@327
-					supplier   	@326
-					line_style 	3
-					origin_attachment 	(1826, 975)
-					terminal_attachment 	(1826, 1091)
-					label      	(object SegLabel @332
-					    Parent_View 	@330
-					    location   	(1788, 1050)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.651515
-					    height     	39
-					    orientation 	1))))
-			    (object InheritView "" @333
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3CADCD3B0380"
-				client     	@315
-				supplier   	@324
-				line_style 	3
-				origin_attachment 	(705, 500)
-				terminal_attachment 	(705, 307))
-			    (object ClassView "Class" "Logical View::wsdl::ExtensibleElement" @334
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1056, 224)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@334
-				    location   	(815, 132)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	482
-				    justify    	0
-				    label      	"ExtensibleElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5FCFA033A"
-				width      	500
-				height     	212
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @335
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8BEB010311"
-				client     	@315
-				supplier   	@334
-				line_style 	3
-				origin_attachment 	(854, 500)
-				terminal_attachment 	(854, 330))
-			    (object ClassView "Class" "Logical View::wsdl::ExtensibilityElement" @336
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(1824, 464)
-				label      	(object ItemLabel
-				    Parent_View 	@336
-				    location   	(1490, 368)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	669
-				    justify    	0
-				    label      	"ExtensibilityElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5DBB602A9"
-				width      	687
-				height     	216
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$21" @337
-				location   	(1206, 493)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5FD130079"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$22" @338
-					Parent_View 	@337
-					location   	(-586, 237)
-					label      	(object SegLabel @339
-					    Parent_View 	@338
-					    location   	(1136, 386)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5FD14019E"
-					client     	@337
-					supplier   	@334
-					vertices   	(list Points
-					    (1206, 493)
-					    (1094, 493)
-					    (1094, 330))
-					line_style 	3
-					origin_attachment 	(1206, 493)
-					terminal_attachment 	(1094, 330)
-					label      	(object SegLabel @340
-					    Parent_View 	@338
-					    location   	(1042, 377)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.828326
-					    height     	53
-					    orientation 	0))
-				    (object RoleView "eExtensibilityElements" @341
-					Parent_View 	@337
-					location   	(-586, 237)
-					label      	(object SegLabel @342
-					    Parent_View 	@341
-					    location   	(1196, 454)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	444
-					    justify    	0
-					    label      	"+eExtensibilityElements"
-					    pctDist    	-0.039711
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5FD14019D"
-					client     	@337
-					supplier   	@336
-					line_style 	3
-					origin_attachment 	(1206, 493)
-					terminal_attachment 	(1481, 493)
-					label      	(object SegLabel @343
-					    Parent_View 	@341
-					    location   	(1415, 546)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.764957
-					    height     	53
-					    orientation 	1)
-					label      	(object SegLabel @344
-					    Parent_View 	@341
-					    location   	(1396, 392)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	146
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.694915
-					    height     	102
-					    orientation 	0))))
-			    (object InheritView "" @345
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3CC3627F00B7"
-				client     	@325
-				supplier   	@336
-				line_style 	3
-				origin_attachment 	(1812, 741)
-				terminal_attachment 	(1812, 572))))
-		    (object ClassDiagram "2.3 Messages"
-			quid       	"3BCE853D02C8"
-			title      	"2.3 Messages"
-			zoom       	85
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::IMessage" @346
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(448, 224)
-				label      	(object ItemLabel
-				    Parent_View 	@346
-				    location   	(267, 122)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	362
-				    justify    	0
-				    label      	"IMessage")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@346
-				    location   	(267, 72)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	362
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A8AF004F"
-				width      	380
-				height     	328
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IPart" @347
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1328, 224)
-				label      	(object ItemLabel
-				    Parent_View 	@347
-				    location   	(1029, 124)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	599
-				    justify    	0
-				    label      	"IPart")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@347
-				    location   	(1029, 74)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	599
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A93F01BE"
-				width      	617
-				height     	324
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::wsdl::Part" @348
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1312, 816)
-				label      	(object ItemLabel
-				    Parent_View 	@348
-				    location   	(1075, 690)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	474
-				    justify    	0
-				    label      	"Part")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5CE1C032E"
-				width      	492
-				height     	276
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @349
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84A96D02F1"
-				client     	@348
-				supplier   	@347
-				line_style 	3
-				origin_attachment 	(1304, 678)
-				terminal_attachment 	(1304, 386))
-			    (object ClassView "Class" "Logical View::wsdl::Message" @350
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(448, 656)
-				label      	(object ItemLabel
-				    Parent_View 	@350
-				    location   	(241, 507)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	414
-				    justify    	0
-				    label      	"Message")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C9590078"
-				width      	432
-				height     	322
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @351
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84A8D102BA"
-				client     	@350
-				supplier   	@346
-				line_style 	3
-				origin_attachment 	(445, 495)
-				terminal_attachment 	(445, 388))
-			    (object AssociationViewNew "$UNNAMED$1" @352
-				location   	(688, 952)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5CEBE00E2"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eParts" @353
-					Parent_View 	@352
-					location   	(176, 328)
-					label      	(object SegLabel @354
-					    Parent_View 	@353
-					    location   	(952, 897)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	144
-					    justify    	0
-					    label      	"+eParts"
-					    pctDist    	0.697452
-					    height     	56
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5CEBF0061"
-					client     	@352
-					supplier   	@348
-					line_style 	3
-					origin_attachment 	(688, 952)
-					terminal_attachment 	(1066, 952)
-					label      	(object SegLabel @355
-					    Parent_View 	@353
-					    location   	(987, 1005)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.789809
-					    height     	53
-					    orientation 	1)
-					label      	(object SegLabel @356
-					    Parent_View 	@353
-					    location   	(967, 1061)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	154
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.742038
-					    height     	109
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$2" @357
-					Parent_View 	@352
-					location   	(176, 328)
-					label      	(object SegLabel @358
-					    Parent_View 	@357
-					    location   	(404, 893)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5CEBF0057"
-					client     	@352
-					supplier   	@350
-					vertices   	(list Points
-					    (688, 952)
-					    (445, 952)
-					    (445, 817))
-					line_style 	3
-					origin_attachment 	(688, 952)
-					terminal_attachment 	(445, 817)
-					label      	(object SegLabel @359
-					    Parent_View 	@357
-					    location   	(393, 912)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.747604
-					    height     	53
-					    orientation 	0))))))))
-	    (object Class_Category "soap"
-		quid       	"3A01CF0C01A2"
-		exportControl 	"Public"
-		logical_models 	(list unit_reference_list
-		    (object Class "SOAPBinding"
-			quid       	"3A01D3B901AD"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AE09A3801AB"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "transportURI"
-				quid       	"3A01D3DF01E4"
-				type       	"String")
-			    (object ClassAttribute "style"
-				quid       	"3A01D3F1029E"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "SOAPBody"
-			quid       	"3A01DED5031F"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AE09A450041"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "use"
-				quid       	"3A01E2D501A5"
-				type       	"String")
-			    (object ClassAttribute "namespaceURI"
-				quid       	"3A93477C01B2"
-				type       	"String")
-			    (object ClassAttribute "encodingStyles"
-				quid       	"3EE4A4DB0072"
-				stereotype 	"0..*"
-				type       	"IString"))
-			language   	"Java")
-		    (object Class "SOAPHeaderBase"
-			quid       	"3A01DEE7034D"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AE09A3E0326"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "use"
-				quid       	"3AD62E9C0056"
-				type       	"String")
-			    (object ClassAttribute "namespaceURI"
-				quid       	"3AD62EA2025D"
-				type       	"String")
-			    (object ClassAttribute "encodingStyles"
-				quid       	"3EE4A58F01AE"
-				stereotype 	"0..*"
-				type       	"IString"))
-			language   	"Java")
-		    (object Class "SOAPFault"
-			quid       	"3A06D9FA00F7"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AE09A4A0020"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "use"
-				quid       	"3A09821A012B"
-				type       	"String")
-			    (object ClassAttribute "namespaceURI"
-				quid       	"3AD6204803AE"
-				type       	"String")
-			    (object ClassAttribute "encodingStyles"
-				quid       	"3EE4A56303AF"
-				stereotype 	"0..*"
-				type       	"IString"))
-			language   	"Java")
-		    (object Class "SOAPOperation"
-			quid       	"3A0AD45500E8"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AE09A4E031F"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "soapActionURI"
-				quid       	"3A0AD464004A"
-				type       	"String")
-			    (object ClassAttribute "style"
-				quid       	"3A0AD46C018C"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "SOAPAddress"
-			quid       	"3AD1FF750287"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AE095350098"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "locationURI"
-				quid       	"3AD211C9025C"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "SOAPHeaderFault"
-			quid       	"3AD632B803DD"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD633340038"
-				supplier   	"Logical View::soap::SOAPHeaderBase"
-				quidu      	"3A01DEE7034D"))
-			language   	"Java")
-		    (object Class "SOAPHeader"
-			quid       	"3AD63309016D"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD63330017D"
-				supplier   	"Logical View::soap::SOAPHeaderBase"
-				quidu      	"3A01DEE7034D"))
-			language   	"Java")
-		    (object Class "IString"
-			quid       	"3B8DD90C0220"
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "java.lang.String"
-				quid       	"3B8DD9320383"
-				stereotype 	"javaclass")))
-		    (object Association "$UNNAMED$64"
-			quid       	"3A06E0B50036"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$65"
-				quid       	"3A06E0B600C4"
-				supplier   	"Logical View::soap::SOAPBody"
-				quidu      	"3A01DED5031F")
-			    (object Role "parts"
-				quid       	"3A06E0B600C5"
-				label      	"parts"
-				supplier   	"Logical View::wsdl::Part"
-				quidu      	"3AD5CE1C032E"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$66"
-			quid       	"3AD62DE60130"
-			roles      	(list role_list
-			    (object Role "message"
-				quid       	"3AD62DE7004B"
-				label      	"message"
-				supplier   	"Logical View::wsdl::Message"
-				quidu      	"3AD5C9590078"
-				client_cardinality 	(value cardinality "1..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$67"
-				quid       	"3AD62DE70055"
-				supplier   	"Logical View::soap::SOAPHeaderBase"
-				quidu      	"3A01DEE7034D")))
-		    (object Association "$UNNAMED$68"
-			quid       	"3AD62DF802D1"
-			roles      	(list role_list
-			    (object Role "part"
-				quid       	"3AD62DFA0002"
-				label      	"part"
-				supplier   	"Logical View::wsdl::Part"
-				quidu      	"3AD5CE1C032E"
-				client_cardinality 	(value cardinality "1..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$69"
-				quid       	"3AD62DFA0003"
-				supplier   	"Logical View::soap::SOAPHeaderBase"
-				quidu      	"3A01DEE7034D")))
-		    (object Association "$UNNAMED$70"
-			quid       	"3AD6333701CD"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$71"
-				quid       	"3AD633370372"
-				supplier   	"Logical View::soap::SOAPHeader"
-				quidu      	"3AD63309016D"
-				is_aggregate 	TRUE)
-			    (object Role "headerFaults"
-				quid       	"3AD633370373"
-				label      	"headerFaults"
-				supplier   	"Logical View::soap::SOAPHeaderFault"
-				quidu      	"3AD632B803DD"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE))))
-		logical_presentations 	(list unit_reference_list
-		    (object ClassDiagram "Binding"
-			quid       	"3A01CF23029F"
-			title      	"Binding"
-			zoom       	87
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	324
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::soap::SOAPBinding" @360
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(272, 208)
-				label      	(object ItemLabel
-				    Parent_View 	@360
-				    location   	(55, 100)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	434
-				    justify    	0
-				    label      	"SOAPBinding")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3A01D3B901AD"
-				compartment 	(object Compartment
-				    Parent_View 	@360
-				    location   	(55, 157)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	428)
-				width      	452
-				height     	240
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::soap::SOAPOperation" @361
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1040, 208)
-				label      	(object ItemLabel
-				    Parent_View 	@361
-				    location   	(803, 100)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	474
-				    justify    	0
-				    label      	"SOAPOperation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3A0AD45500E8"
-				compartment 	(object Compartment
-				    Parent_View 	@361
-				    location   	(803, 157)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	471)
-				width      	492
-				height     	240
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::soap::SOAPHeader" @362
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(560, 960)
-				label      	(object ItemLabel
-				    Parent_View 	@362
-				    location   	(395, 907)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	330
-				    justify    	0
-				    label      	"SOAPHeader")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD63309016D"
-				width      	348
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::soap::SOAPHeaderFault" @363
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1360, 960)
-				label      	(object ItemLabel
-				    Parent_View 	@363
-				    location   	(1142, 907)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	436
-				    justify    	0
-				    label      	"SOAPHeaderFault")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD632B803DD"
-				width      	454
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$70" @364
-				location   	(933, 961)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD6333701CD"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$71" @365
-					Parent_View 	@364
-					location   	(277, -543)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD633370372"
-					client     	@364
-					supplier   	@362
-					line_style 	3
-					origin_attachment 	(933, 961)
-					terminal_attachment 	(734, 961))
-				    (object RoleView "headerFaults" @366
-					Parent_View 	@364
-					location   	(277, -543)
-					label      	(object SegLabel @367
-					    Parent_View 	@366
-					    location   	(928, 921)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	346
-					    justify    	0
-					    label      	"+headerFaults"
-					    pctDist    	-0.030702
-					    height     	41
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD633370373"
-					client     	@364
-					supplier   	@363
-					line_style 	3
-					origin_attachment 	(933, 961)
-					terminal_attachment 	(1133, 961)
-					label      	(object SegLabel @368
-					    Parent_View 	@366
-					    location   	(1080, 924)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.736842
-					    height     	38
-					    orientation 	0)
-					label      	(object SegLabel @369
-					    Parent_View 	@366
-					    location   	(1056, 999)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	151
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.614035
-					    height     	38
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::wsdl::Message" @370
-				ShowCompartmentStereotypes 	TRUE
-				location   	(1824, 496)
-				label      	(object ItemLabel
-				    Parent_View 	@370
-				    location   	(1701, 419)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	246
-				    justify    	0
-				    label      	"Message")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C9590078"
-				width      	264
-				height     	178
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::soap::SOAPHeaderBase" @371
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1040, 528)
-				label      	(object ItemLabel
-				    Parent_View 	@371
-				    location   	(794, 420)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	492
-				    justify    	0
-				    label      	"SOAPHeaderBase")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3A01DEE7034D"
-				compartment 	(object Compartment
-				    Parent_View 	@371
-				    location   	(794, 477)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	665)
-				width      	510
-				height     	240
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$66" @372
-				location   	(1493, 485)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD62DE60130"
-				roleview_list 	(list RoleViews
-				    (object RoleView "message" @373
-					Parent_View 	@372
-					location   	(341, -683)
-					label      	(object SegLabel @374
-					    Parent_View 	@373
-					    location   	(1574, 515)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	256
-					    justify    	0
-					    label      	"+message"
-					    pctDist    	0.412322
-					    height     	30
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD62DE7004B"
-					client     	@372
-					supplier   	@370
-					line_style 	3
-					origin_attachment 	(1493, 485)
-					terminal_attachment 	(1692, 485)
-					label      	(object SegLabel @375
-					    Parent_View 	@373
-					    location   	(1630, 448)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.687204
-					    height     	38
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$67" @376
-					Parent_View 	@372
-					location   	(341, -683)
-					label      	(object SegLabel @377
-					    Parent_View 	@376
-					    location   	(1420, 525)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	192
-					    justify    	0
-					    label      	""
-					    pctDist    	0.372254
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD62DE70055"
-					client     	@372
-					supplier   	@371
-					line_style 	3
-					origin_attachment 	(1493, 485)
-					terminal_attachment 	(1295, 485))))
-			    (object ClassView "Class" "Logical View::soap::SOAPBody" @378
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1040, 1344)
-				label      	(object ItemLabel
-				    Parent_View 	@378
-				    location   	(794, 1236)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	492
-				    justify    	0
-				    label      	"SOAPBody")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3A01DED5031F"
-				compartment 	(object Compartment
-				    Parent_View 	@378
-				    location   	(794, 1293)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	665)
-				width      	510
-				height     	240
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::wsdl::Part" @379
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1824, 1200)
-				label      	(object ItemLabel
-				    Parent_View 	@379
-				    location   	(1628, 956)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	392
-				    justify    	0
-				    label      	"Part")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5CE1C032E"
-				width      	410
-				height     	512
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$68" @380
-				location   	(1590, 704)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD62DF802D1"
-				roleview_list 	(list RoleViews
-				    (object RoleView "part" @381
-					Parent_View 	@380
-					location   	(438, -464)
-					label      	(object SegLabel @382
-					    Parent_View 	@381
-					    location   	(1917, 886)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	120
-					    justify    	0
-					    label      	"+part"
-					    pctDist    	0.881465
-					    height     	90
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD62DFA0002"
-					client     	@380
-					supplier   	@379
-					vertices   	(list Points
-					    (1590, 704)
-					    (1827, 704)
-					    (1827, 944))
-					line_style 	3
-					origin_attachment 	(1590, 704)
-					terminal_attachment 	(1827, 944)
-					label      	(object SegLabel @383
-					    Parent_View 	@381
-					    location   	(1774, 886)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.881465
-					    height     	54
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$69" @384
-					Parent_View 	@380
-					location   	(438, -464)
-					label      	(object SegLabel @385
-					    Parent_View 	@384
-					    location   	(1209, 746)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	120
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD62DFA0003"
-					client     	@380
-					supplier   	@371
-					vertices   	(list Points
-					    (1590, 704)
-					    (1170, 704)
-					    (1170, 648))
-					line_style 	3
-					origin_attachment 	(1590, 704)
-					terminal_attachment 	(1170, 648))))
-			    (object AssociationViewNew "$UNNAMED$64" @386
-				location   	(1457, 1390)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3A06E0B50036"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$65" @387
-					Parent_View 	@386
-					location   	(225, -914)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3A06E0B600C4"
-					client     	@386
-					supplier   	@378
-					line_style 	3
-					origin_attachment 	(1457, 1390)
-					terminal_attachment 	(1295, 1390))
-				    (object RoleView "parts" @388
-					Parent_View 	@386
-					location   	(225, -914)
-					label      	(object SegLabel @389
-					    Parent_View 	@388
-					    location   	(1591, 1494)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	159
-					    justify    	0
-					    label      	"+parts"
-					    pctDist    	0.833856
-					    height     	104
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3A06E0B600C5"
-					client     	@386
-					supplier   	@379
-					line_style 	3
-					origin_attachment 	(1457, 1390)
-					terminal_attachment 	(1619, 1390)
-					label      	(object SegLabel @390
-					    Parent_View 	@388
-					    location   	(1591, 1344)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.833856
-					    height     	47
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::soap::SOAPFault" @391
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1040, 1648)
-				label      	(object ItemLabel
-				    Parent_View 	@391
-				    location   	(794, 1540)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	492
-				    justify    	0
-				    label      	"SOAPFault")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3A06D9FA00F7"
-				compartment 	(object Compartment
-				    Parent_View 	@391
-				    location   	(794, 1597)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	665)
-				width      	510
-				height     	240
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::soap::IString" @392
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 1360)
-				label      	(object ItemLabel
-				    Parent_View 	@392
-				    location   	(66, 1332)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	348
-				    justify    	0
-				    label      	"IString")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@392
-				    location   	(66, 1282)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	348
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B8DD90C0220"
-				width      	366
-				height     	180
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @393
-				location   	(1040, 750)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@371
-				vertices   	(list Points
-				    (1040, 750)
-				    (1040, 648)))
-			    (object InheritView "" @394
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD63330017D"
-				client     	@362
-				supplier   	@371
-				line_style 	3
-				origin_attachment 	(645, 895)
-				terminal_attachment 	(645, 750)
-				drawSupplier 	@393)
-			    (object InheritView "" @395
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD633340038"
-				client     	@363
-				supplier   	@371
-				line_style 	3
-				origin_attachment 	(1316, 895)
-				terminal_attachment 	(1316, 750)
-				drawSupplier 	@393)))
-		    (object ClassDiagram "Port"
-			quid       	"3A085E30035C"
-			title      	"Port"
-			zoom       	90
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::soap::SOAPAddress" @396
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(352, 320)
-				label      	(object ItemLabel
-				    Parent_View 	@396
-				    location   	(151, 239)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	402
-				    justify    	0
-				    label      	"SOAPAddress")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD1FF750287"
-				compartment 	(object Compartment
-				    Parent_View 	@396
-				    location   	(151, 294)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	409)
-				width      	420
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)))
-		    (object ClassDiagram "Extensibility"
-			quid       	"3AE099B10161"
-			title      	"Extensibility"
-			zoom       	90
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::soap::SOAPAddress" @397
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1520, 576)
-				label      	(object ItemLabel
-				    Parent_View 	@397
-				    location   	(1371, 527)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	298
-				    justify    	0
-				    label      	"SOAPAddress")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD1FF750287"
-				width      	316
-				height     	122
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::soap::SOAPBinding" @398
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 592)
-				label      	(object ItemLabel
-				    Parent_View 	@398
-				    location   	(162, 543)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	284
-				    justify    	0
-				    label      	"SOAPBinding")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3A01D3B901AD"
-				width      	302
-				height     	122
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::soap::SOAPBody" @399
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1072, 1104)
-				label      	(object ItemLabel
-				    Parent_View 	@399
-				    location   	(950, 1055)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	244
-				    justify    	0
-				    label      	"SOAPBody")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3A01DED5031F"
-				width      	262
-				height     	122
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::soap::SOAPFault" @400
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1232, 1264)
-				label      	(object ItemLabel
-				    Parent_View 	@400
-				    location   	(1112, 1215)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	240
-				    justify    	0
-				    label      	"SOAPFault")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3A06D9FA00F7"
-				width      	258
-				height     	122
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::soap::SOAPOperation" @401
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(512, 752)
-				label      	(object ItemLabel
-				    Parent_View 	@401
-				    location   	(344, 703)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	336
-				    justify    	0
-				    label      	"SOAPOperation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3A0AD45500E8"
-				width      	354
-				height     	122
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::soap::SOAPHeaderBase" @402
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(816, 928)
-				label      	(object ItemLabel
-				    Parent_View 	@402
-				    location   	(627, 879)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	378
-				    justify    	0
-				    label      	"SOAPHeaderBase")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3A01DEE7034D"
-				width      	396
-				height     	122
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::ExtensibilityElement" @403
-				ShowCompartmentStereotypes 	TRUE
-				location   	(608, 128)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@403
-				    location   	(408, 55)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	400
-				    justify    	0
-				    label      	"ExtensibilityElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5DBB602A9"
-				width      	418
-				height     	174
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @404
-				location   	(608, 305)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@403
-				vertices   	(list Points
-				    (608, 305)
-				    (608, 215)))
-			    (object InheritView "" @405
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AE09A3801AB"
-				client     	@398
-				supplier   	@403
-				line_style 	3
-				origin_attachment 	(344, 531)
-				terminal_attachment 	(344, 305)
-				drawSupplier 	@404)
-			    (object InheritView "" @406
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AE09A3E0326"
-				client     	@402
-				supplier   	@403
-				line_style 	3
-				origin_attachment 	(815, 867)
-				terminal_attachment 	(815, 305)
-				drawSupplier 	@404)
-			    (object InheritView "" @407
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AE09A450041"
-				client     	@399
-				supplier   	@403
-				line_style 	3
-				origin_attachment 	(1068, 1043)
-				terminal_attachment 	(1068, 305)
-				drawSupplier 	@404)
-			    (object InheritView "" @408
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AE09A4E031F"
-				client     	@401
-				supplier   	@403
-				line_style 	3
-				origin_attachment 	(506, 691)
-				terminal_attachment 	(506, 305)
-				drawSupplier 	@404)
-			    (object InheritView "" @409
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AE09A4A0020"
-				client     	@400
-				supplier   	@403
-				line_style 	3
-				origin_attachment 	(1231, 1203)
-				terminal_attachment 	(1231, 305)
-				drawSupplier 	@404)
-			    (object InheritView "" @410
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AE095350098"
-				client     	@397
-				supplier   	@403
-				line_style 	3
-				origin_attachment 	(1520, 515)
-				terminal_attachment 	(1520, 305)
-				drawSupplier 	@404)))))
-	    (object Class_Category "xsd"
-		attributes 	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"prefix"
-			value      	"XSD")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"basePackage"
-			value      	"org.eclipse")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsPrefix"
-			value      	"xsd")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsURI"
-			value      	"http://www.eclipse.org/xsd/2002/XSD"))
-		quid       	"39ABDC6F01AA"
-		exportControl 	"Public"
-		logical_models 	(list unit_reference_list
-		    (object Class "XSDAnnotation"
-			quid       	"3B66EDC80233"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B69E1770116"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029")
-			    (object Inheritance_Relationship
-				quid       	"3B7FD4E20366"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDRedefineContent"
-				quidu      	"3B6AE2060172"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "applicationInformation"
-				quid       	"3BBF7EBF02C8"
-				stereotype 	"0..*"
-				type       	"DOMElement"
-				exportControl 	"Public")
-			    (object ClassAttribute "userInformation"
-				quid       	"3BBF7EEA0157"
-				stereotype 	"0..*"
-				type       	"DOMElement"
-				exportControl 	"Public")
-			    (object ClassAttribute "attributes"
-				quid       	"3BBF7F0501E2"
-				stereotype 	"0..*"
-				type       	"DOMAttr"
-				exportControl 	"Public")))
-		    (object Class "XSDAttributeDeclaration"
-			quid       	"3B66ED2E0192"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B69B7DC0193"
-				supplier   	"Logical View::xsd::XSDFeature"
-				quidu      	"3B69B537026C")
-			    (object Inheritance_Relationship
-				quid       	"3B688E6103BE"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDSchemaContent"
-				quidu      	"3B688CB800BA"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "attributeDeclarationReference"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C287F5202B4"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDAttributeGroupContent"
-			quid       	"3B6940200089"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B72D8E200EA"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"))
-			abstract   	TRUE)
-		    (object Class "XSDAttributeGroupDefinition"
-			quid       	"3B66ED840290"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B69403A0221"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDAttributeGroupContent"
-				quidu      	"3B6940200089")
-			    (object Inheritance_Relationship
-				quid       	"3B6AE2EB02A8"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDRedefineContent"
-				quidu      	"3B6AE2060172")
-			    (object Inheritance_Relationship
-				quid       	"3B7FCAC800D2"
-				supplier   	"Logical View::xsd::XSDRedefinableComponent"
-				quidu      	"3B7FCA8B020B"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "attributeGroupDefinitionReference"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C287F7B0386"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDAttributeUse"
-			quid       	"3B68354601A8"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B72D737038F"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDAttributeGroupContent"
-				quidu      	"3B6940200089")
-			    (object Inheritance_Relationship
-				quid       	"3B72D7BB0349"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "required"
-				quid       	"3B69CCF3027D"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "value"
-				quid       	"3B69CDDB03B7"
-				type       	"Value"
-				exportControl 	"Public")
-			    (object ClassAttribute "constraint"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69CDE002D8"
-				type       	"XSDConstraint"
-				exportControl 	"Public")
-			    (object ClassAttribute "use"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA7B0220382"
-				type       	"XSDAttributeUseCategory"
-				exportControl 	"Public")
-			    (object ClassAttribute "lexicalValue"
-				quid       	"3C2719D90341"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDBoundedFacet"
-			quid       	"3B6C751D0344"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C763C0224"
-				supplier   	"Logical View::xsd::XSDFundamentalFacet"
-				quidu      	"3B6C69E801D6"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C752A00CC"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDCardinalityFacet"
-			quid       	"3B6C755D03D2"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C764F0131"
-				supplier   	"Logical View::xsd::XSDFundamentalFacet"
-				quidu      	"3B6C69E801D6"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C756C0153"
-				type       	"XSDCardinality"
-				exportControl 	"Public")))
-		    (object Class "XSDComplexTypeContent"
-			quid       	"3B683BA00196"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6848B80286"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029"))
-			abstract   	TRUE)
-		    (object Class "XSDComplexTypeDefinition"
-			quid       	"3B682B82031A"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B69BAA20310"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDScope"
-				quidu      	"3B69B54000F2")
-			    (object Inheritance_Relationship
-				quid       	"3BA0D01901F1"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "derivationMethod"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69C6E4020E"
-				type       	"XSDDerivationMethod"
-				initv      	"restriction"
-				exportControl 	"Public")
-			    (object ClassAttribute "final"
-				quid       	"3B69C71D026A"
-				stereotype 	"0..*"
-				type       	"XSDComplexFinal"
-				exportControl 	"Public")
-			    (object ClassAttribute "abstract"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69C73800C5"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "contentTypeCategory"
-				quid       	"3B69CA4202B8"
-				type       	"XSDContentTypeCategory"
-				exportControl 	"Public")
-			    (object ClassAttribute "prohibitedSubstitutions"
-				quid       	"3B69CB8A03E6"
-				stereotype 	"0..*"
-				type       	"XSDProhibitedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "lexicalFinal"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0F618014D"
-				stereotype 	"0..*"
-				type       	"XSDComplexFinal"
-				exportControl 	"Public")
-			    (object ClassAttribute "block"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0FB97006E"
-				stereotype 	"0..*"
-				type       	"XSDProhibitedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "mixed"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3C31AF5E03A6"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDComponent"
-			quid       	"3B6846E90029"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3BA0CEA903D2"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"))
-			abstract   	TRUE)
-		    (object Class "XSDConcreteComponent"
-			quid       	"3B6AD7B40065"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "element"
-				quid       	"3B6ADDB501A5"
-				type       	"DOMElement"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDConstrainingFacet"
-			quid       	"3B6C6B340093"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C6C800394"
-				supplier   	"Logical View::xsd::XSDFacet"
-				quidu      	"3B6C359403D2"))
-			abstract   	TRUE)
-		    (object Class "XSDDiagnostic"
-			quid       	"3BFE5F910046"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3D4C0F4C01A1"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "severity"
-				quid       	"3BFE691C005D"
-				type       	"XSDDiagnosticSeverity"
-				exportControl 	"Public")
-			    (object ClassAttribute "message"
-				quid       	"3BFE5FDD0280"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "locationURI"
-				quid       	"3C063743016B"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "line"
-				quid       	"3BFE607E0213"
-				type       	"int"
-				initv      	"1"
-				exportControl 	"Public")
-			    (object ClassAttribute "column"
-				quid       	"3BFE611E0296"
-				type       	"int"
-				initv      	"1"
-				exportControl 	"Public")
-			    (object ClassAttribute "node"
-				quid       	"3C016B6B0200"
-				type       	"DOMNode"
-				exportControl 	"Public")
-			    (object ClassAttribute "annotationURI"
-				quid       	"3C06374F0186"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDElementDeclaration"
-			quid       	"3B66ED580214"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B69EDEE01BF"
-				supplier   	"Logical View::xsd::XSDFeature"
-				quidu      	"3B69B537026C")
-			    (object Inheritance_Relationship
-				quid       	"3B685F17002E"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDTerm"
-				quidu      	"3B683C5E0174")
-			    (object Inheritance_Relationship
-				quid       	"3B688E660339"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDSchemaContent"
-				quidu      	"3B688CB800BA"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "nillable"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69BFB4029F"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "disallowedSubstitutions"
-				quid       	"3B69C4680368"
-				stereotype 	"0..*"
-				type       	"XSDDisallowedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "substitutionGroupExclusions"
-				quid       	"3B69C4A003B9"
-				stereotype 	"0..*"
-				type       	"XSDSubstitutionGroupExclusions"
-				exportControl 	"Public")
-			    (object ClassAttribute "abstract"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69C4E0000E"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "lexicalFinal"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0D14C00B2"
-				stereotype 	"0..*"
-				type       	"XSDProhibitedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "block"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0D16801C1"
-				stereotype 	"0..*"
-				type       	"XSDDisallowedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "elementDeclarationReference"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C289F6203CF"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "circular"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C34DCB00018"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDEnumerationFacet"
-			quid       	"3B6C6ACE0141"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C6C9D03C7"
-				supplier   	"Logical View::xsd::XSDRepeatableFacet"
-				quidu      	"3B6C6AA6031A"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C7C640054"
-				stereotype 	"0..*"
-				type       	"Value"
-				exportControl 	"Public")))
-		    (object Class "XSDFacet"
-			quid       	"3B6C359403D2"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6D25680259"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "lexicalValue"
-				quid       	"3B6C73740253"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "facetName"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C289FB401EC"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "effectiveValue"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28AAE303B6"
-				type       	"Value"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDFeature"
-			quid       	"3B69B537026C"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3C290A2C0307"
-				supplier   	"Logical View::xsd::XSDNamedComponent"
-				quidu      	"3B6846D303A4"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B69BF81020F"
-				type       	"Value"
-				exportControl 	"Public")
-			    (object ClassAttribute "constraint"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69BF8800C5"
-				type       	"XSDConstraint"
-				exportControl 	"Public")
-			    (object ClassAttribute "form"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B9F902B033E"
-				type       	"XSDForm"
-				exportControl 	"Public")
-			    (object ClassAttribute "lexicalValue"
-				quid       	"3C271A1B016F"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "global"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A0070372"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "featureReference"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A0440185"
-				type       	"boolean"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDFixedFacet"
-			quid       	"3B6C699E00C1"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C6C8801B4"
-				supplier   	"Logical View::xsd::XSDConstrainingFacet"
-				quidu      	"3B6C6B340093"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "fixed"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B6C6A600201"
-				type       	"boolean"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDFractionDigitsFacet"
-			quid       	"3B6C79BE02EE"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B990016"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C79D2008A"
-				type       	"int"
-				exportControl 	"Public")))
-		    (object Class "XSDFundamentalFacet"
-			quid       	"3B6C69E801D6"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C6C7B0396"
-				supplier   	"Logical View::xsd::XSDFacet"
-				quidu      	"3B6C359403D2"))
-			abstract   	TRUE)
-		    (object Class "XSDIdentityConstraintDefinition"
-			quid       	"3B682B2603A2"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B684AA30242"
-				supplier   	"Logical View::xsd::XSDNamedComponent"
-				quidu      	"3B6846D303A4"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "identityConstraintCategory"
-				quid       	"3B69D1C70143"
-				type       	"XSDIdentityConstraintCategory"
-				exportControl 	"Public")))
-		    (object Class "XSDImport"
-			quid       	"3B688C93017F"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AD8D9003E"
-				supplier   	"Logical View::xsd::XSDSchemaDirective"
-				quidu      	"3B6AD8A202A2"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "namespace"
-				quid       	"3B6ADB15036C"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDInclude"
-			quid       	"3B688C7D0250"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AD8DC0381"
-				supplier   	"Logical View::xsd::XSDSchemaCompositor"
-				quidu      	"3C21DB4102AE")))
-		    (object Class "XSDLengthFacet"
-			quid       	"3B6C776200E7"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C778002DF"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C776C004B"
-				type       	"int"
-				exportControl 	"Public")))
-		    (object Class "XSDMaxExclusiveFacet"
-			quid       	"3B6C789600C2"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B8E0309"
-				supplier   	"Logical View::xsd::XSDMaxFacet"
-				quidu      	"3C0A1CEB010E")))
-		    (object Class "XSDMaxFacet"
-			quid       	"3C0A1CEB010E"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3C0A1D3103AD"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3C0A1EE201F7"
-				type       	"Value"
-				exportControl 	"Public")
-			    (object ClassAttribute "inclusive"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A174027D"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "exclusive"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A1930354"
-				type       	"boolean"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDMaxInclusiveFacet"
-			quid       	"3B6C787D00DA"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B8303B8"
-				supplier   	"Logical View::xsd::XSDMaxFacet"
-				quidu      	"3C0A1CEB010E")))
-		    (object Class "XSDMaxLengthFacet"
-			quid       	"3B6C77C70146"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B7D00FC"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C77DA00F3"
-				type       	"int"
-				exportControl 	"Public")))
-		    (object Class "XSDMinExclusiveFacet"
-			quid       	"3B6C792D000A"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B590281"
-				supplier   	"Logical View::xsd::XSDMinFacet"
-				quidu      	"3C0A1CDE037C")))
-		    (object Class "XSDMinFacet"
-			quid       	"3C0A1CDE037C"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3C0A1D240098"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3C0A1ED10398"
-				type       	"Value"
-				exportControl 	"Public")
-			    (object ClassAttribute "inclusive"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A1A2008E"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "exclusive"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A1BE03E2"
-				type       	"boolean"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDMinInclusiveFacet"
-			quid       	"3B6C788702C9"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B520353"
-				supplier   	"Logical View::xsd::XSDMinFacet"
-				quidu      	"3C0A1CDE037C")))
-		    (object Class "XSDMinLengthFacet"
-			quid       	"3B6C778C0065"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C77C400C0"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C7799015E"
-				type       	"int"
-				exportControl 	"Public")))
-		    (object Class "XSDModelGroup"
-			quid       	"3B6834E00291"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B684A640279"
-				supplier   	"Logical View::xsd::XSDTerm"
-				quidu      	"3B683C5E0174"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "compositor"
-				quid       	"3B69CF1D01CF"
-				type       	"XSDCompositor"
-				exportControl 	"Public")))
-		    (object Class "XSDModelGroupDefinition"
-			quid       	"3B66ED9A0205"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AE2E20381"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDRedefineContent"
-				quidu      	"3B6AE2060172")
-			    (object Inheritance_Relationship
-				quid       	"3B6BD2550385"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDParticleContent"
-				quidu      	"3B6BD22300C6")
-			    (object Inheritance_Relationship
-				quid       	"3B7FCAC40090"
-				supplier   	"Logical View::xsd::XSDRedefinableComponent"
-				quidu      	"3B7FCA8B020B"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "modelGroupDefinitionReference"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A1F602E8"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDNamedComponent"
-			quid       	"3B6846D303A4"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3BA0CEA20197"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3B6847000142"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "targetNamespace"
-				quid       	"3B684704031E"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "aliasName"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A57F0127"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "uRI"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A58700E2"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "aliasURI"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A5AA02AF"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "qName"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C290963025E"
-				type       	"String"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDNotationDeclaration"
-			quid       	"3B66EDAA021C"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B68494302F1"
-				supplier   	"Logical View::xsd::XSDNamedComponent"
-				quidu      	"3B6846D303A4")
-			    (object Inheritance_Relationship
-				quid       	"3B688E4F023C"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDSchemaContent"
-				quidu      	"3B688CB800BA"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "systemIdentifier"
-				quid       	"3B69D32E00F0"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "publicIdentifier"
-				quid       	"3B69D3340397"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDNumericFacet"
-			quid       	"3B6C75950206"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C76420074"
-				supplier   	"Logical View::xsd::XSDFundamentalFacet"
-				quidu      	"3B6C69E801D6"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C75A30012"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDOrderedFacet"
-			quid       	"3B6C74DD0248"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7659012C"
-				supplier   	"Logical View::xsd::XSDFundamentalFacet"
-				quidu      	"3B6C69E801D6"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C74F602DA"
-				type       	"XSDOrdered"
-				exportControl 	"Public")))
-		    (object Class "XSDParticle"
-			quid       	"3B682BBD01F7"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6848FC01E7"
-				supplier   	"Logical View::xsd::XSDComplexTypeContent"
-				quidu      	"3B683BA00196"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "minOccurs"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69CF8E03B2"
-				type       	"int"
-				initv      	"1"
-				exportControl 	"Public")
-			    (object ClassAttribute "maxOccurs"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69CF9903AE"
-				type       	"int"
-				initv      	"1"
-				exportControl 	"Public")))
-		    (object Class "XSDParticleContent"
-			quid       	"3B6BD22300C6"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B780BD90059"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"))
-			abstract   	TRUE)
-		    (object Class "XSDPatternFacet"
-			quid       	"3B6C6ADB026C"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C6CA5038D"
-				supplier   	"Logical View::xsd::XSDRepeatableFacet"
-				quidu      	"3B6C6AA6031A"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C7C790311"
-				stereotype 	"0..*"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDRedefinableComponent"
-			quid       	"3B7FCA8B020B"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B7FD4BA023C"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDRedefineContent"
-				quidu      	"3B6AE2060172")
-			    (object Inheritance_Relationship
-				quid       	"3C290A26036D"
-				supplier   	"Logical View::xsd::XSDNamedComponent"
-				quidu      	"3B6846D303A4"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "circular"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A6800216"
-				type       	"boolean"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDRedefineContent"
-			quid       	"3B6AE2060172"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AE2B301D5"
-				supplier   	"Logical View::xsd::XSDSchemaContent"
-				quidu      	"3B688CB800BA"))
-			abstract   	TRUE)
-		    (object Class "XSDRedefine"
-			quid       	"3B688C9B02AD"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3C21DB640240"
-				supplier   	"Logical View::xsd::XSDSchemaCompositor"
-				quidu      	"3C21DB4102AE")))
-		    (object Class "XSDRepeatableFacet"
-			quid       	"3B6C6AA6031A"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C6C8F002E"
-				supplier   	"Logical View::xsd::XSDConstrainingFacet"
-				quidu      	"3B6C6B340093"))
-			abstract   	TRUE)
-		    (object Class "XSDSchema"
-			quid       	"374B182500BB"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B7FCC4A0182"
-				supplier   	"Logical View::xsd::XSDScope"
-				quidu      	"3B69B54000F2"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "document"
-				quid       	"3C2784E503DD"
-				type       	"DOMDocument"
-				exportControl 	"Public")
-			    (object ClassAttribute "schemaLocation"
-				quid       	"3B6868EC0226"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "targetNamespace"
-				quid       	"3B9F9BFF0180"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "attributeFormDefault"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B9F904B0102"
-				type       	"XSDForm"
-				initv      	"unqualified"
-				exportControl 	"Public")
-			    (object ClassAttribute "elementFormDefault"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B9F907800AC"
-				type       	"XSDForm"
-				initv      	"unqualified"
-				exportControl 	"Public")
-			    (object ClassAttribute "finalDefault"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0C4A70038"
-				stereotype 	"0..*"
-				type       	"XSDProhibitedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "blockDefault"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0F59D02D8"
-				stereotype 	"0..*"
-				type       	"XSDDisallowedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "version"
-				quid       	"3D22D6D80356"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDSchemaCompositor"
-			quid       	"3C21DB4102AE"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3C21DB560092"
-				supplier   	"Logical View::xsd::XSDSchemaDirective"
-				quidu      	"3B6AD8A202A2"))
-			abstract   	TRUE)
-		    (object Class "XSDSchemaContent"
-			quid       	"3B688CB800BA"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AD8E60372"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"))
-			abstract   	TRUE)
-		    (object Class "XSDSchemaDirective"
-			quid       	"3B6AD8A202A2"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AE32102AF"
-				supplier   	"Logical View::xsd::XSDSchemaContent"
-				quidu      	"3B688CB800BA"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "schemaLocation"
-				quid       	"3B6AD9B30330"
-				type       	"String"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDScope"
-			quid       	"3B69B54000F2"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B7FCD640231"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029"))
-			abstract   	TRUE)
-		    (object Class "XSDSimpleTypeDefinition"
-			quid       	"3B682BA7005D"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B684A1302A2"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9")
-			    (object Inheritance_Relationship
-				quid       	"3B685F55032B"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDComplexTypeContent"
-				quidu      	"3B683BA00196"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "variety"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B6C315800A9"
-				type       	"XSDVariety"
-				exportControl 	"Public")
-			    (object ClassAttribute "final"
-				quid       	"3B6D544F0146"
-				stereotype 	"0..*"
-				type       	"XSDSimpleFinal"
-				exportControl 	"Public")
-			    (object ClassAttribute "lexicalFinal"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0F65E035A"
-				stereotype 	"0..*"
-				type       	"XSDSimpleFinal"
-				exportControl 	"Public")
-			    (object ClassAttribute "validFacets"
-				quid       	"3C28AB0F00B6"
-				stereotype 	"0..*"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDTerm"
-			quid       	"3B683C5E0174"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6848AA01D3"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029")
-			    (object Inheritance_Relationship
-				quid       	"3B6BD2440069"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDParticleContent"
-				quidu      	"3B6BD22300C6"))
-			abstract   	TRUE)
-		    (object Class "XSDTotalDigitsFacet"
-			quid       	"3B6C79A0020E"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B610337"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C79AB0232"
-				type       	"int"
-				exportControl 	"Public")))
-		    (object Class "XSDTypeDefinition"
-			quid       	"3B66ECD302A9"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AE2F5013A"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDRedefineContent"
-				quidu      	"3B6AE2060172")
-			    (object Inheritance_Relationship
-				quid       	"3B7FCAB1004D"
-				supplier   	"Logical View::xsd::XSDRedefinableComponent"
-				quidu      	"3B7FCA8B020B"))
-			abstract   	TRUE)
-		    (object Class "XSDWhiteSpaceFacet"
-			quid       	"3B6C784601B7"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C78620045"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C78500201"
-				type       	"XSDWhiteSpace"
-				exportControl 	"Public")))
-		    (object Class "XSDWildcard"
-			quid       	"3B6838370031"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B684A3A0041"
-				supplier   	"Logical View::xsd::XSDTerm"
-				quidu      	"3B683C5E0174"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "namespaceConstraintCategory"
-				quid       	"3B69D0E9019E"
-				type       	"XSDNamespaceConstraintCategory"
-				exportControl 	"Public")
-			    (object ClassAttribute "namespaceConstraint"
-				quid       	"3B97CF860223"
-				stereotype 	"0..*"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "processContents"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69D12E01E4"
-				type       	"XSDProcessContents"
-				exportControl 	"Public")
-			    (object ClassAttribute "lexicalNamespaceConstraint"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA7BDB701F9"
-				stereotype 	"0..*"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDXPathDefinition"
-			quid       	"3B6D83BB0355"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6D84F70092"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "variety"
-				quid       	"3B6D901503DE"
-				type       	"XSDXPathVariety"
-				exportControl 	"Public")
-			    (object ClassAttribute "value"
-				quid       	"3B7BBBE101B1"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "DOMAttr"
-			quid       	"3BBF8C8901B6"
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "org.w3c.dom.Attr"
-				quid       	"3BBF8CB000D5"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Class "DOMDocument"
-			quid       	"3C27850E0381"
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "org.w3c.dom.Document"
-				quid       	"3C27851B03C6"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Class "DOMElement"
-			quid       	"3B8189790200"
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "org.w3c.dom.Element"
-				quid       	"3B8189DB0374"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Class "DOMNode"
-			quid       	"3BFE64A50117"
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "org.w3c.dom.Node"
-				quid       	"3BFE65BF002D"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Class "Value"
-			quid       	"3C040B5B031F"
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "java.lang.Object"
-				quid       	"3C040B8D03D5"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Class "XSDAttributeUseCategory"
-			quid       	"3BA7B0E801A8"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "optional"
-				quid       	"3BA7B11502B7"
-				exportControl 	"Public")
-			    (object ClassAttribute "prohibited"
-				quid       	"3BA7B12202D3"
-				exportControl 	"Public")
-			    (object ClassAttribute "required"
-				quid       	"3BA7B12902F0"
-				exportControl 	"Public")))
-		    (object Class "XSDCardinality"
-			quid       	"3BC7715D009B"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "finite"
-				quid       	"3BC771DC02ED"
-				exportControl 	"Public")
-			    (object ClassAttribute "countablyInfinite"
-				quid       	"3BC771EC0141"
-				exportControl 	"Public")))
-		    (object Class "XSDComplexFinal"
-			quid       	"3B97C2CA01CB"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "extension"
-				quid       	"3B97C2E700DA"
-				exportControl 	"Public")
-			    (object ClassAttribute "restriction"
-				quid       	"3B97C2EA016A"
-				exportControl 	"Public")
-			    (object ClassAttribute "all"
-				quid       	"3BA0F6D20112"
-				exportControl 	"Public")))
-		    (object Class "XSDCompositor"
-			quid       	"3B869B620037"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "all"
-				quid       	"3B869BD00003"
-				exportControl 	"Public")
-			    (object ClassAttribute "choice"
-				quid       	"3B869CB8011E"
-				exportControl 	"Public")
-			    (object ClassAttribute "sequence"
-				quid       	"3B869CE50057"
-				exportControl 	"Public")))
-		    (object Class "XSDConstraint"
-			quid       	"3B869E2601AE"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "default"
-				quid       	"3B869E8E0258"
-				exportControl 	"Public")
-			    (object ClassAttribute "fixed"
-				quid       	"3B869E990271"
-				exportControl 	"Public")))
-		    (object Class "XSDContentTypeCategory"
-			quid       	"3B86A79F03A2"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "empty"
-				quid       	"3B86A7CD02F0"
-				exportControl 	"Public")
-			    (object ClassAttribute "simple"
-				quid       	"3B86A7D100CE"
-				exportControl 	"Public")
-			    (object ClassAttribute "mixed"
-				quid       	"3B86A7D301B7"
-				exportControl 	"Public")
-			    (object ClassAttribute "elementOnly"
-				quid       	"3B86A7D702E9"
-				exportControl 	"Public")))
-		    (object Class "XSDDerivationMethod"
-			quid       	"3B86A0B000CE"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "extension"
-				quid       	"3B86A0C80329"
-				exportControl 	"Public")
-			    (object ClassAttribute "restriction"
-				quid       	"3B86A0CC0162"
-				exportControl 	"Public")))
-		    (object Class "XSDDiagnosticSeverity"
-			quid       	"3BFE68A7032F"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "fatal"
-				quid       	"3BFE68C303D0"
-				exportControl 	"Public")
-			    (object ClassAttribute "error"
-				quid       	"3BFE68E700E3"
-				exportControl 	"Public")
-			    (object ClassAttribute "warning"
-				quid       	"3BFE68EA01FF"
-				exportControl 	"Public")
-			    (object ClassAttribute "information"
-				quid       	"3BFE7FC2019A"
-				exportControl 	"Public")))
-		    (object Class "XSDDisallowedSubstitutions"
-			quid       	"3B97C5A403DF"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "substitution"
-				quid       	"3B97C6790045"
-				exportControl 	"Public")
-			    (object ClassAttribute "extension"
-				quid       	"3B97C67F01AC"
-				exportControl 	"Public")
-			    (object ClassAttribute "restriction"
-				quid       	"3B97C683020B"
-				exportControl 	"Public")
-			    (object ClassAttribute "all"
-				quid       	"3BA0F2450069"
-				exportControl 	"Public")))
-		    (object Class "XSDForm"
-			quid       	"3B9F913B01EB"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "qualified"
-				quid       	"3B9F916F0023"
-				exportControl 	"Public")
-			    (object ClassAttribute "unqualified"
-				quid       	"3B9F918C007F"
-				exportControl 	"Public")))
-		    (object Class "XSDIdentityConstraintCategory"
-			quid       	"3B86A1E00272"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "key"
-				quid       	"3B86A2120085"
-				exportControl 	"Public")
-			    (object ClassAttribute "keyref"
-				quid       	"3B86A213014F"
-				exportControl 	"Public")
-			    (object ClassAttribute "unique"
-				quid       	"3B86A2160365"
-				exportControl 	"Public")))
-		    (object Class "XSDNamespaceConstraintCategory"
-			quid       	"3B97C5EA0023"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "any"
-				quid       	"3B97D0600034"
-				exportControl 	"Public")
-			    (object ClassAttribute "not"
-				quid       	"3B97D062005F"
-				exportControl 	"Public")
-			    (object ClassAttribute "set"
-				quid       	"3B97D0650117"
-				exportControl 	"Public")))
-		    (object Class "XSDOrdered"
-			quid       	"3BC7715202E4"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "false"
-				quid       	"3BC771A90271"
-				exportControl 	"Public")
-			    (object ClassAttribute "partial"
-				quid       	"3BC771BB01FF"
-				exportControl 	"Public")
-			    (object ClassAttribute "total"
-				quid       	"3BC771C401B2"
-				exportControl 	"Public")))
-		    (object Class "XSDProcessContents"
-			quid       	"3B8FF8C70284"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "strict"
-				quid       	"3B8FF8F80045"
-				exportControl 	"Public")
-			    (object ClassAttribute "lax"
-				quid       	"3B8FF8F6038B"
-				exportControl 	"Public")
-			    (object ClassAttribute "skip"
-				quid       	"3B8FF8E802BA"
-				exportControl 	"Public")))
-		    (object Class "XSDProhibitedSubstitutions"
-			quid       	"3B97C5BE0272"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "extension"
-				quid       	"3B97C68B00B8"
-				exportControl 	"Public")
-			    (object ClassAttribute "restriction"
-				quid       	"3B97C6940291"
-				exportControl 	"Public")
-			    (object ClassAttribute "all"
-				quid       	"3BA0F2500295"
-				exportControl 	"Public")))
-		    (object Class "XSDSimpleFinal"
-			quid       	"3B97C25D0295"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "list"
-				quid       	"3B97C2810230"
-				exportControl 	"Public")
-			    (object ClassAttribute "restriction"
-				quid       	"3B97C2830138"
-				exportControl 	"Public")
-			    (object ClassAttribute "union"
-				quid       	"3B97C288024E"
-				exportControl 	"Public")
-			    (object ClassAttribute "all"
-				quid       	"3BA0F6E00374"
-				exportControl 	"Public")))
-		    (object Class "XSDSubstitutionGroupExclusions"
-			quid       	"3B97C59100AE"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "extension"
-				quid       	"3B97C6640231"
-				exportControl 	"Public")
-			    (object ClassAttribute "restriction"
-				quid       	"3B97C66D0216"
-				exportControl 	"Public")))
-		    (object Class "XSDVariety"
-			quid       	"3B8FF7730249"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "atomic"
-				quid       	"3B8FF7A702DF"
-				exportControl 	"Public")
-			    (object ClassAttribute "list"
-				quid       	"3B8FF7AD0139"
-				exportControl 	"Public")
-			    (object ClassAttribute "union"
-				quid       	"3B8FF7AF039F"
-				exportControl 	"Public")))
-		    (object Class "XSDWhiteSpace"
-			quid       	"3BEED0F60342"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "preserve"
-				quid       	"3BEED10F0117"
-				exportControl 	"Public")
-			    (object ClassAttribute "replace"
-				quid       	"3BEED127034D"
-				exportControl 	"Public")
-			    (object ClassAttribute "collapse"
-				quid       	"3BEED1290396"
-				exportControl 	"Public")))
-		    (object Class "XSDXPathVariety"
-			quid       	"3B8FFB89033A"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "selector"
-				quid       	"3B8FFBAC0192"
-				exportControl 	"Public")
-			    (object ClassAttribute "field"
-				quid       	"3B8FFBB30278"
-				exportControl 	"Public")))
-		    (object Association "$UNNAMED$72"
-			quid       	"3C626EA70102"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$73"
-				quid       	"3C626EA90191"
-				supplier   	"Logical View::xsd::XSDRepeatableFacet"
-				quidu      	"3B6C6AA6031A"
-				is_aggregate 	TRUE)
-			    (object Role "annotations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C626EA90192"
-				label      	"annotations"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$74"
-			quid       	"3B69DADC02F5"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$75"
-				quid       	"3B69DADD0238"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DADD0242"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$76"
-			quid       	"3B6890D6006F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$77"
-				quid       	"3B6890D6030E"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				is_aggregate 	TRUE)
-			    (object Role "anonymousTypeDefinition"
-				quid       	"3B6890D60318"
-				label      	"anonymousTypeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$78"
-			quid       	"3B68356B02CB"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$79"
-				quid       	"3B68356D00A6"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				is_aggregate 	TRUE)
-			    (object Role "typeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B68356D00A7"
-				label      	"typeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$80"
-			quid       	"3B6B426B0194"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$81"
-				quid       	"3B6B426D0309"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				is_aggregate 	TRUE)
-			    (object Role "resolvedAttributeDeclaration"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6B426D0313"
-				label      	"resolvedAttributeDeclaration"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$82"
-			quid       	"3B69DB060291"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$83"
-				quid       	"3B69DB070171"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB070172"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$84"
-			quid       	"3B69404E0067"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$85"
-				quid       	"3B694050029B"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "contents"
-				quid       	"3B69405002A5"
-				label      	"contents"
-				supplier   	"Logical View::xsd::XSDAttributeGroupContent"
-				quidu      	"3B6940200089"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$86"
-			quid       	"3B68359F0086"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$87"
-				quid       	"3B6835A00069"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "attributeUses"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6835A0006A"
-				label      	"attributeUses"
-				supplier   	"Logical View::xsd::XSDAttributeUse"
-				quidu      	"3B68354601A8"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$88"
-			quid       	"3C275D320220"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$89"
-				quid       	"3C275D3C010C"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "attributeWildcardContent"
-				quid       	"3C275D3C010D"
-				label      	"attributeWildcardContent"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$90"
-			quid       	"3B6887BF0150"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$91"
-				quid       	"3B6887C000A7"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "attributeWildcard"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6887C000A8"
-				label      	"attributeWildcard"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$92"
-			quid       	"3B6B425E01F9"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$93"
-				quid       	"3B6B42620046"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "resolvedAttributeGroupDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6B42620050"
-				label      	"resolvedAttributeGroupDefinition"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$94"
-			quid       	"3B683585010D"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$95"
-				quid       	"3B68358600FA"
-				supplier   	"Logical View::xsd::XSDAttributeUse"
-				quidu      	"3B68354601A8"
-				is_aggregate 	TRUE)
-			    (object Role "attributeDeclaration"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B68358600FB"
-				label      	"attributeDeclaration"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$96"
-			quid       	"3B6F1DE9018A"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$97"
-				quid       	"3B6F1DEA036C"
-				supplier   	"Logical View::xsd::XSDAttributeUse"
-				quidu      	"3B68354601A8"
-				is_aggregate 	TRUE)
-			    (object Role "content"
-				quid       	"3B6F1DEA0380"
-				label      	"content"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$98"
-			quid       	"3B90068801C2"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$99"
-				quid       	"3B90068A0111"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "contentAnnotation"
-				quid       	"3B90068A011B"
-				label      	"contentAnnotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$100"
-			quid       	"3B6833350340"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$101"
-				quid       	"3B683336028D"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "baseTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B683336028E"
-				label      	"baseTypeDefinition"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$102"
-			quid       	"3B6FDDD70113"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$103"
-				quid       	"3B6FDDDA026B"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "content"
-				quid       	"3B6FDDDA0275"
-				label      	"content"
-				supplier   	"Logical View::xsd::XSDComplexTypeContent"
-				quidu      	"3B683BA00196"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$104"
-			quid       	"3B6837DF024F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$105"
-				quid       	"3B6837E100FD"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "contentType"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6837E100FE"
-				label      	"contentType"
-				supplier   	"Logical View::xsd::XSDComplexTypeContent"
-				quidu      	"3B683BA00196"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$106"
-			quid       	"3B683959006E"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$107"
-				quid       	"3B6839590349"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "attributeUses"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B683959034A"
-				label      	"attributeUses"
-				supplier   	"Logical View::xsd::XSDAttributeUse"
-				quidu      	"3B68354601A8"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$108"
-			quid       	"3B698E360386"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$109"
-				quid       	"3B698E380072"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "attributeContents"
-				quid       	"3B698E38007C"
-				label      	"attributeContents"
-				supplier   	"Logical View::xsd::XSDAttributeGroupContent"
-				quidu      	"3B6940200089"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$110"
-			quid       	"3B6851BA0126"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$111"
-				quid       	"3B6851BB0150"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "attributeWildcard"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6851BB0151"
-				label      	"attributeWildcard"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$112"
-			quid       	"3B751B0803C7"
-			roles      	(list role_list
-			    (object Role "container"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3B751B0C01CE"
-				label      	"container"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$113"
-				attributes 	(list Attribute_Set)
-				quid       	"3B751B0C01CF"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065")))
-		    (object Association "$UNNAMED$114"
-			quid       	"3B751B480261"
-			roles      	(list role_list
-			    (object Role "rootContainer"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3B751B4C0285"
-				label      	"rootContainer"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$115"
-				attributes 	(list Attribute_Set)
-				quid       	"3B751B4C0286"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065")))
-		    (object Association "$UNNAMED$116"
-			quid       	"3B751C310356"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$117"
-				attributes 	(list Attribute_Set)
-				quid       	"3B751C330331"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065")
-			    (object Role "schema"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3B751C33033B"
-				label      	"schema"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$118"
-			quid       	"3B69DB0A0066"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$119"
-				quid       	"3B69DB0B023F"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB0B0249"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$120"
-			quid       	"3B68911401AF"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$121"
-				quid       	"3B6891150016"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				is_aggregate 	TRUE)
-			    (object Role "anonymousTypeDefinition"
-				quid       	"3B6891150017"
-				label      	"anonymousTypeDefinition"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$122"
-			quid       	"3B68338C0058"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$123"
-				quid       	"3B68338C03BF"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				is_aggregate 	TRUE)
-			    (object Role "typeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B68338C03C0"
-				label      	"typeDefinition"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$124"
-			quid       	"3B6833EF0160"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$125"
-				quid       	"3B6833F00298"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				is_aggregate 	TRUE)
-			    (object Role "identityConstraintDefinitions"
-				quid       	"3B6833F00299"
-				label      	"identityConstraintDefinitions"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$126"
-			quid       	"3B6B41E60251"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$127"
-				quid       	"3B6B41EA02F7"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				is_aggregate 	TRUE)
-			    (object Role "resolvedElementDeclaration"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6B41EA030B"
-				label      	"resolvedElementDeclaration"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$128"
-			quid       	"3B69C0590198"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$129"
-				quid       	"3B69C05D01E3"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214")
-			    (object Role "substitutionGroupAffiliation"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B69C05D01ED"
-				label      	"substitutionGroupAffiliation"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$130"
-			quid       	"3C42DBDD0297"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$131"
-				quid       	"3C42DBE0011E"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				is_aggregate 	TRUE)
-			    (object Role "substitutionGroup"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C42DBE00128"
-				label      	"substitutionGroup"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$132"
-			quid       	"3B6D23B901CD"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$133"
-				quid       	"3B6D23BA01C4"
-				supplier   	"Logical View::xsd::XSDFacet"
-				quidu      	"3B6C359403D2"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B6D23BA01CE"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$134"
-			quid       	"3B6D597102EA"
-			roles      	(list role_list
-			    (object Role "simpleTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6D59750105"
-				label      	"simpleTypeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$135"
-				attributes 	(list Attribute_Set)
-				quid       	"3B6D59750119"
-				supplier   	"Logical View::xsd::XSDFacet"
-				quidu      	"3B6C359403D2")))
-		    (object Association "$UNNAMED$136"
-			quid       	"3B69B653017A"
-			roles      	(list role_list
-			    (object Role "scope"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3B69B654006D"
-				label      	"scope"
-				supplier   	"Logical View::xsd::XSDScope"
-				quidu      	"3B69B54000F2"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$137"
-				attributes 	(list Attribute_Set)
-				quid       	"3B69B654006E"
-				supplier   	"Logical View::xsd::XSDFeature"
-				quidu      	"3B69B537026C")))
-		    (object Association "$UNNAMED$138"
-			quid       	"3C29010602D7"
-			roles      	(list role_list
-			    (object Role "resolvedFeature"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C29010B000E"
-				label      	"resolvedFeature"
-				supplier   	"Logical View::xsd::XSDFeature"
-				quidu      	"3B69B537026C"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$139"
-				attributes 	(list Attribute_Set)
-				quid       	"3C29010B0018"
-				supplier   	"Logical View::xsd::XSDFeature"
-				quidu      	"3B69B537026C")))
-		    (object Association "$UNNAMED$140"
-			quid       	"3B69DB0D0183"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$141"
-				quid       	"3B69DB0D033C"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB0D0346"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$142"
-			quid       	"3B69D29E014D"
-			roles      	(list role_list
-			    (object Role "referencedKey"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B69D2A80165"
-				label      	"referencedKey"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$143"
-				attributes 	(list Attribute_Set)
-				quid       	"3B69D2A8016F"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2")))
-		    (object Association "$UNNAMED$144"
-			quid       	"3B6D8D3D003E"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$145"
-				quid       	"3B6D8D3E022A"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2"
-				is_aggregate 	TRUE)
-			    (object Role "selector"
-				quid       	"3B6D8D3E0234"
-				label      	"selector"
-				supplier   	"Logical View::xsd::XSDXPathDefinition"
-				quidu      	"3B6D83BB0355"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$146"
-			quid       	"3B6D8D330025"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$147"
-				quid       	"3B6D8D330365"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2"
-				is_aggregate 	TRUE)
-			    (object Role "fields"
-				quid       	"3B6D8D330379"
-				label      	"fields"
-				supplier   	"Logical View::xsd::XSDXPathDefinition"
-				quidu      	"3B6D83BB0355"
-				client_cardinality 	(value cardinality "1..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$148"
-			quid       	"3B6ADCD802FC"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$149"
-				quid       	"3B6ADCD9018B"
-				supplier   	"Logical View::xsd::XSDImport"
-				quidu      	"3B688C93017F"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B6ADCD9018C"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$150"
-			quid       	"3B6ADCC5007E"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$151"
-				quid       	"3B6ADCC6006B"
-				supplier   	"Logical View::xsd::XSDInclude"
-				quidu      	"3B688C7D0250"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B6ADCC6006C"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$152"
-			quid       	"3B69DB1702C8"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$153"
-				quid       	"3B69DB1803E2"
-				supplier   	"Logical View::xsd::XSDModelGroup"
-				quidu      	"3B6834E00291"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB190004"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$154"
-			quid       	"3B6BCEB102F8"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$155"
-				quid       	"3B6BCEB6001B"
-				supplier   	"Logical View::xsd::XSDModelGroup"
-				quidu      	"3B6834E00291"
-				is_aggregate 	TRUE)
-			    (object Role "contents"
-				quid       	"3B6BCEB60025"
-				label      	"contents"
-				supplier   	"Logical View::xsd::XSDParticle"
-				quidu      	"3B682BBD01F7"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$156"
-			quid       	"3B683606026F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$157"
-				quid       	"3B6836070221"
-				supplier   	"Logical View::xsd::XSDModelGroup"
-				quidu      	"3B6834E00291"
-				is_aggregate 	TRUE)
-			    (object Role "particles"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6836070222"
-				label      	"particles"
-				supplier   	"Logical View::xsd::XSDParticle"
-				quidu      	"3B682BBD01F7"
-				client_cardinality 	(value cardinality "1..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$158"
-			quid       	"3B69DB15008A"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$159"
-				quid       	"3B69DB160096"
-				supplier   	"Logical View::xsd::XSDModelGroupDefinition"
-				quidu      	"3B66ED9A0205"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB1600A0"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$160"
-			quid       	"3B6837AC025A"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$161"
-				quid       	"3B6837AD0338"
-				supplier   	"Logical View::xsd::XSDModelGroupDefinition"
-				quidu      	"3B66ED9A0205"
-				is_aggregate 	TRUE)
-			    (object Role "modelGroup"
-				quid       	"3B6837AD0339"
-				label      	"modelGroup"
-				supplier   	"Logical View::xsd::XSDModelGroup"
-				quidu      	"3B6834E00291"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$162"
-			quid       	"3B6B42450398"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$163"
-				quid       	"3B6B4249038A"
-				supplier   	"Logical View::xsd::XSDModelGroupDefinition"
-				quidu      	"3B66ED9A0205"
-				is_aggregate 	TRUE)
-			    (object Role "resolvedModelGroupDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6B4249039E"
-				label      	"resolvedModelGroupDefinition"
-				supplier   	"Logical View::xsd::XSDModelGroupDefinition"
-				quidu      	"3B66ED9A0205"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$164"
-			quid       	"3B69DB0F0212"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$165"
-				quid       	"3B69DB1000C9"
-				supplier   	"Logical View::xsd::XSDNotationDeclaration"
-				quidu      	"3B66EDAA021C"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB1000D3"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$166"
-			quid       	"3B6B47150119"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$167"
-				quid       	"3B6B471A03AB"
-				supplier   	"Logical View::xsd::XSDParticle"
-				quidu      	"3B682BBD01F7"
-				is_aggregate 	TRUE)
-			    (object Role "content"
-				quid       	"3B6B471A03B5"
-				label      	"content"
-				supplier   	"Logical View::xsd::XSDParticleContent"
-				quidu      	"3B6BD22300C6"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$168"
-			quid       	"3B683C890122"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$169"
-				quid       	"3B683C8A0110"
-				supplier   	"Logical View::xsd::XSDParticle"
-				quidu      	"3B682BBD01F7"
-				is_aggregate 	TRUE)
-			    (object Role "term"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B683C8A0111"
-				label      	"term"
-				supplier   	"Logical View::xsd::XSDTerm"
-				quidu      	"3B683C5E0174"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$170"
-			quid       	"3B6ADE42009A"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$171"
-				quid       	"3B6ADE4302FE"
-				supplier   	"Logical View::xsd::XSDRedefine"
-				quidu      	"3B688C9B02AD"
-				is_aggregate 	TRUE)
-			    (object Role "annotations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6ADE430308"
-				label      	"annotations"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$172"
-			quid       	"3B6AE8240051"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$173"
-				quid       	"3B6AE82602AD"
-				supplier   	"Logical View::xsd::XSDRedefine"
-				quidu      	"3B688C9B02AD"
-				is_aggregate 	TRUE)
-			    (object Role "contents"
-				quid       	"3B6AE82602B7"
-				label      	"contents"
-				supplier   	"Logical View::xsd::XSDRedefineContent"
-				quidu      	"3B6AE2060172"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$174"
-			quid       	"3B688E6B003D"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$175"
-				quid       	"3B688E6C0107"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "contents"
-				quid       	"3B688E6C0111"
-				label      	"contents"
-				supplier   	"Logical View::xsd::XSDSchemaContent"
-				quidu      	"3B688CB800BA"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$176"
-			quid       	"3B66EE8D01BF"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$177"
-				quid       	"3B66EE8E0198"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "elementDeclarations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B66EE8E0199"
-				label      	"elementDeclarations"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$178"
-			quid       	"3B66FDFA00C3"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$179"
-				quid       	"3B66FDFB027D"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "attributeDeclarations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B66FDFB027E"
-				label      	"attributeDeclarations"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$180"
-			quid       	"3B66EE920216"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$181"
-				quid       	"3B66EE93018B"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "attributeGroupDefinitions"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B66EE93018C"
-				label      	"attributeGroupDefinitions"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$182"
-			quid       	"3B66EE760049"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$183"
-				quid       	"3B66EE760374"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "typeDefinitions"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B66EE76037E"
-				label      	"typeDefinitions"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$184"
-			quid       	"3B66EEFF024F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$185"
-				quid       	"3B66EF00025A"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "modelGroupDefinitions"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B66EF000264"
-				label      	"modelGroupDefinitions"
-				supplier   	"Logical View::xsd::XSDModelGroupDefinition"
-				quidu      	"3B66ED9A0205"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$186"
-			quid       	"3BFC2A1701ED"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$187"
-				quid       	"3BFC2A1A0273"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "identityConstraintDefinitions"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3BFC2A1A027D"
-				label      	"identityConstraintDefinitions"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$188"
-			quid       	"3B66EEA7023E"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$189"
-				quid       	"3B66EEA8038A"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "notationDeclarations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B66EEA8038B"
-				label      	"notationDeclarations"
-				supplier   	"Logical View::xsd::XSDNotationDeclaration"
-				quidu      	"3B66EDAA021C"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$190"
-			quid       	"3B69E4560290"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$191"
-				quid       	"3B69E4570165"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "annotations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B69E457016F"
-				label      	"annotations"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$192"
-			quid       	"3B6D5CA50112"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$193"
-				quid       	"3B6D5CA703B4"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "contents"
-				quid       	"3B6D5CA703C8"
-				label      	"contents"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$194"
-			quid       	"3B6C35AD0374"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$195"
-				quid       	"3B6C35AF0006"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "facetContents"
-				quid       	"3B6C35AF0010"
-				label      	"facetContents"
-				supplier   	"Logical View::xsd::XSDConstrainingFacet"
-				quidu      	"3B6C6B340093"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$196"
-			quid       	"3BC8AE0203A8"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$197"
-				quid       	"3BC8AE060051"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "facets"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3BC8AE060065"
-				label      	"facets"
-				supplier   	"Logical View::xsd::XSDConstrainingFacet"
-				quidu      	"3B6C6B340093"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$198"
-			quid       	"3B6C34B70208"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$199"
-				quid       	"3B6C34BE0258"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "memberTypeDefinitions"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6C34BE0259"
-				label      	"memberTypeDefinitions"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$200"
-			quid       	"3B6C363201DB"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$201"
-				quid       	"3B6C36350059"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "fundamentalFacets"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3B6C36350063"
-				label      	"fundamentalFacets"
-				supplier   	"Logical View::xsd::XSDFundamentalFacet"
-				quidu      	"3B6C69E801D6"
-				client_cardinality 	(value cardinality "1..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$202"
-			quid       	"3B6D35AB0273"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$203"
-				quid       	"3B6D35B20291"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "baseTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6D35B202A5"
-				label      	"baseTypeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$204"
-			quid       	"3B6D5572016C"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$205"
-				quid       	"3B6D5575022F"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "primitiveTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6D55750243"
-				label      	"primitiveTypeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$206"
-			quid       	"3B69E2910158"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$207"
-				quid       	"3B69E292019F"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69E29201A9"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$208"
-			quid       	"3B9006CF0088"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$209"
-				quid       	"3B9006D1015D"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				is_aggregate 	TRUE)
-			    (object Role "derivationAnnotation"
-				quid       	"3B9006D10167"
-				label      	"derivationAnnotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$210"
-			quid       	"3B69DB330264"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$211"
-				quid       	"3B69DB340284"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				is_aggregate 	TRUE)
-			    (object Role "annotations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B69DB34028E"
-				label      	"annotations"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$212"
-			quid       	"3B69DB11026F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$213"
-				quid       	"3B69DB1201F9"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB120203"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$214"
-			quid       	"3C626EB30005"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$215"
-				quid       	"3C626EB40327"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				is_aggregate 	TRUE)
-			    (object Role "annotations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C626EB40332"
-				label      	"annotations"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$216"
-			quid       	"3BEBDC870247"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$217"
-				quid       	"3BEBDC8C02F9"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "attributeWildcardContent"
-				quid       	"3BEBDC8C0303"
-				label      	"attributeWildcardContent"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$218"
-			quid       	"3BFE622703CD"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$219"
-				attributes 	(list Attribute_Set)
-				quid       	"3BFE622B0061"
-				supplier   	"Logical View::xsd::XSDDiagnostic"
-				quidu      	"3BFE5F910046")
-			    (object Role "components"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3BFE622B006C"
-				label      	"components"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"
-				client_cardinality 	(value cardinality "1..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$220"
-			quid       	"3BFE62690165"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$221"
-				quid       	"3BFE626A0026"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"
-				is_aggregate 	TRUE)
-			    (object Role "diagnostics"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3BFE626A0027"
-				label      	"diagnostics"
-				supplier   	"Logical View::xsd::XSDDiagnostic"
-				quidu      	"3BFE5F910046"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$222"
-			quid       	"3BFE6431035F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$223"
-				quid       	"3BFE643201C6"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "allDiagnostics"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3BFE643201C7"
-				label      	"allDiagnostics"
-				supplier   	"Logical View::xsd::XSDDiagnostic"
-				quidu      	"3BFE5F910046"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$224"
-			quid       	"3C21DCC700EC"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$225"
-				quid       	"3C21DCCE0042"
-				supplier   	"Logical View::xsd::XSDSchemaDirective"
-				quidu      	"3B6AD8A202A2"
-				is_aggregate 	TRUE)
-			    (object Role "resolvedSchema"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C21DCCE0043"
-				label      	"resolvedSchema"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$226"
-			quid       	"3C21DD0C03DB"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$227"
-				quid       	"3C21DD100304"
-				supplier   	"Logical View::xsd::XSDSchemaCompositor"
-				quidu      	"3C21DB4102AE"
-				is_aggregate 	TRUE)
-			    (object Role "incorporatedSchema"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C21DD100305"
-				label      	"incorporatedSchema"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$228"
-			quid       	"3C239134004F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$229"
-				quid       	"3C23913600CA"
-				supplier   	"Logical View::xsd::XSDXPathDefinition"
-				quidu      	"3B6D83BB0355"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3C23913600D4"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$230"
-			quid       	"3C25D3A60131"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$231"
-				quid       	"3C25D3A90370"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB")
-			    (object Role "referencingDirectives"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C25D3A90371"
-				label      	"referencingDirectives"
-				supplier   	"Logical View::xsd::XSDSchemaDirective"
-				quidu      	"3B6AD8A202A2"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$232"
-			quid       	"3C25ECF0005E"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$233"
-				quid       	"3C25ECF4001E"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB")
-			    (object Role "rootVersion"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C25ECF40028"
-				label      	"rootVersion"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$234"
-			quid       	"3C25ED0B011B"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$235"
-				quid       	"3C25ED0F0121"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB")
-			    (object Role "originalVersion"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C25ED0F012B"
-				label      	"originalVersion"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$236"
-			quid       	"3C25EEAB001F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$237"
-				quid       	"3C25EEAF010B"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "incorporatedVersions"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C25EEAF0115"
-				label      	"incorporatedVersions"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$238"
-			quid       	"3C276DA000DE"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$239"
-				quid       	"3C276DA000DF"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "itemTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C276DA000E0"
-				label      	"itemTypeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$240"
-			quid       	"3C2784730194"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$241"
-				quid       	"3C27847501F1"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB")
-			    (object Role "schemaForSchema"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C27847501FB"
-				label      	"schemaForSchema"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$242"
-			quid       	"3C2880F503D9"
-			roles      	(list role_list
-			    (object Role "rootTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C2880F9003C"
-				label      	"rootTypeDefinition"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$243"
-				attributes 	(list Attribute_Set)
-				quid       	"3C2880F90046"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A")))
-		    (object Association "$UNNAMED$244"
-			quid       	"3C2882C50137"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$245"
-				attributes 	(list Attribute_Set)
-				quid       	"3C2882C70112"
-				supplier   	"Logical View::xsd::XSDDiagnostic"
-				quidu      	"3BFE5F910046")
-			    (object Role "primaryComponent"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C2882C70113"
-				label      	"primaryComponent"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$246"
-			quid       	"3C28A0F201A4"
-			roles      	(list role_list
-			    (object Role "type"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28A0F302E5"
-				label      	"type"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$247"
-				attributes 	(list Attribute_Set)
-				quid       	"3C28A0F302F0"
-				supplier   	"Logical View::xsd::XSDFeature"
-				quidu      	"3B69B537026C")))
-		    (object Association "$UNNAMED$248"
-			quid       	"3C28A6DB01E5"
-			roles      	(list role_list
-			    (object Role "rootType"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28A6DD03DD"
-				label      	"rootType"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$249"
-				attributes 	(list Attribute_Set)
-				quid       	"3C28A6DD03DE"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9")))
-		    (object Association "$UNNAMED$250"
-			quid       	"3C28A7120108"
-			roles      	(list role_list
-			    (object Role "baseType"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28A7140151"
-				label      	"baseType"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$251"
-				attributes 	(list Attribute_Set)
-				quid       	"3C28A714015B"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9")))
-		    (object Association "$UNNAMED$252"
-			quid       	"3C28A74B0178"
-			roles      	(list role_list
-			    (object Role "simpleType"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28A74D017B"
-				label      	"simpleType"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$253"
-				attributes 	(list Attribute_Set)
-				quid       	"3C28A74D0185"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9")))
-		    (object Association "$UNNAMED$254"
-			quid       	"3C28A7ED03C0"
-			roles      	(list role_list
-			    (object Role "complexType"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28A7F40117"
-				label      	"complexType"
-				supplier   	"Logical View::xsd::XSDParticle"
-				quidu      	"3B682BBD01F7"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$255"
-				attributes 	(list Attribute_Set)
-				quid       	"3C28A7F40121"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9")))
-		    (object Association "$UNNAMED$256"
-			quid       	"3C28A994030A"
-			roles      	(list role_list
-			    (object Role "rootTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28A99700DD"
-				label      	"rootTypeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$257"
-				attributes 	(list Attribute_Set)
-				quid       	"3C28A99700E7"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D")))
-		    (object Association "$UNNAMED$258"
-			quid       	"3C28B085025B"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$259"
-				quid       	"3C28B0860270"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "minFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B086027A"
-				label      	"minFacet"
-				supplier   	"Logical View::xsd::XSDMinFacet"
-				quidu      	"3C0A1CDE037C"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$260"
-			quid       	"3C28B08D0252"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$261"
-				quid       	"3C28B08E0091"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "maxFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B08E009B"
-				label      	"maxFacet"
-				supplier   	"Logical View::xsd::XSDMaxFacet"
-				quidu      	"3C0A1CEB010E"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$262"
-			quid       	"3C28B0AB0396"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$263"
-				quid       	"3C28B0AC03C9"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "maxInclusiveFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0AC03D4"
-				label      	"maxInclusiveFacet"
-				supplier   	"Logical View::xsd::XSDMaxInclusiveFacet"
-				quidu      	"3B6C787D00DA"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$264"
-			quid       	"3C28B0AF0338"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$265"
-				quid       	"3C28B0B001F9"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "minInclusiveFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0B00203"
-				label      	"minInclusiveFacet"
-				supplier   	"Logical View::xsd::XSDMinInclusiveFacet"
-				quidu      	"3B6C788702C9"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$266"
-			quid       	"3C28B0B30207"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$267"
-				quid       	"3C28B0B40190"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "minExclusiveFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0B4019A"
-				label      	"minExclusiveFacet"
-				supplier   	"Logical View::xsd::XSDMinExclusiveFacet"
-				quidu      	"3B6C792D000A"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$268"
-			quid       	"3C28B0B6028D"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$269"
-				quid       	"3C28B0B70217"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "maxExclusiveFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0B70221"
-				label      	"maxExclusiveFacet"
-				supplier   	"Logical View::xsd::XSDMaxExclusiveFacet"
-				quidu      	"3B6C789600C2"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$270"
-			quid       	"3C28B0BC0051"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$271"
-				quid       	"3C28B0BC0246"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "lengthFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0BC0250"
-				label      	"lengthFacet"
-				supplier   	"Logical View::xsd::XSDLengthFacet"
-				quidu      	"3B6C776200E7"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$272"
-			quid       	"3C28B0BF018C"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$273"
-				quid       	"3C28B0C0006B"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "whiteSpaceFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0C00075"
-				label      	"whiteSpaceFacet"
-				supplier   	"Logical View::xsd::XSDWhiteSpaceFacet"
-				quidu      	"3B6C784601B7"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$274"
-			quid       	"3C28B0C2021D"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$275"
-				quid       	"3C28B0C300AB"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "enumerationFacets"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0C300AC"
-				label      	"enumerationFacets"
-				supplier   	"Logical View::xsd::XSDEnumerationFacet"
-				quidu      	"3B6C6ACE0141"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$276"
-			quid       	"3C28B0C50159"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$277"
-				quid       	"3C28B0C600B0"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "patternFacets"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0C600BA"
-				label      	"patternFacets"
-				supplier   	"Logical View::xsd::XSDPatternFacet"
-				quidu      	"3B6C6ADB026C"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$278"
-			quid       	"3C28B0C802A7"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$279"
-				quid       	"3C28B0C901EA"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "cardinalityFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0C901F5"
-				label      	"cardinalityFacet"
-				supplier   	"Logical View::xsd::XSDCardinalityFacet"
-				quidu      	"3B6C755D03D2"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$280"
-			quid       	"3C28B0CB039C"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$281"
-				quid       	"3C28B0CC03D0"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "numericFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0CC03D1"
-				label      	"numericFacet"
-				supplier   	"Logical View::xsd::XSDNumericFacet"
-				quidu      	"3B6C75950206"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$282"
-			quid       	"3C28B0CF0199"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$283"
-				quid       	"3C28B0D20085"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "maxLengthFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0D2008F"
-				label      	"maxLengthFacet"
-				supplier   	"Logical View::xsd::XSDMaxLengthFacet"
-				quidu      	"3B6C77C70146"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$284"
-			quid       	"3C28B0D500C5"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$285"
-				quid       	"3C28B0D6001D"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "minLengthFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0D60027"
-				label      	"minLengthFacet"
-				supplier   	"Logical View::xsd::XSDMinLengthFacet"
-				quidu      	"3B6C778C0065"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$286"
-			quid       	"3C28B0D800DE"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$287"
-				quid       	"3C28B0D803CD"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "totalDigitsFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0D803D7"
-				label      	"totalDigitsFacet"
-				supplier   	"Logical View::xsd::XSDTotalDigitsFacet"
-				quidu      	"3B6C79A0020E"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$288"
-			quid       	"3C28B0DB0377"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$289"
-				quid       	"3C28B0DC035A"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "fractionDigitsFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0DC0364"
-				label      	"fractionDigitsFacet"
-				supplier   	"Logical View::xsd::XSDFractionDigitsFacet"
-				quidu      	"3B6C79BE02EE"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$290"
-			quid       	"3C28B0DF0048"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$291"
-				quid       	"3C28B0DF03B9"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "orderedFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0DF03C3"
-				label      	"orderedFacet"
-				supplier   	"Logical View::xsd::XSDOrderedFacet"
-				quidu      	"3B6C74DD0248"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$292"
-			quid       	"3C28B0E300D9"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$293"
-				quid       	"3C28B0E4038E"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "boundedFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0E40398"
-				label      	"boundedFacet"
-				supplier   	"Logical View::xsd::XSDBoundedFacet"
-				quidu      	"3B6C751D0344"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$294"
-			quid       	"3C28B44401EC"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$295"
-				quid       	"3C28B4450360"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveMaxFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B445036A"
-				label      	"effectiveMaxFacet"
-				supplier   	"Logical View::xsd::XSDMaxFacet"
-				quidu      	"3C0A1CEB010E"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$296"
-			quid       	"3C28B54F0145"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$297"
-				quid       	"3C28B550038C"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveWhiteSpaceFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B5500396"
-				label      	"effectiveWhiteSpaceFacet"
-				supplier   	"Logical View::xsd::XSDWhiteSpaceFacet"
-				quidu      	"3B6C784601B7"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$298"
-			quid       	"3C28B5C4011C"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$299"
-				quid       	"3C28B5C5020D"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveMaxLengthFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B5C50217"
-				label      	"effectiveMaxLengthFacet"
-				supplier   	"Logical View::xsd::XSDMaxLengthFacet"
-				quidu      	"3B6C77C70146"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$300"
-			quid       	"3C28B62A00AA"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$301"
-				quid       	"3C28B62B0138"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveFractionDigitsFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B62B0142"
-				label      	"effectiveFractionDigitsFacet"
-				supplier   	"Logical View::xsd::XSDFractionDigitsFacet"
-				quidu      	"3B6C79BE02EE"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$302"
-			quid       	"3C28B6B003A6"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$303"
-				quid       	"3C28B6B10311"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectivePatternFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B6B10312"
-				label      	"effectivePatternFacet"
-				supplier   	"Logical View::xsd::XSDPatternFacet"
-				quidu      	"3B6C6ADB026C"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$304"
-			quid       	"3C28B7CA026B"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$305"
-				quid       	"3C28B7CB0186"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveEnumerationFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B7CB0190"
-				label      	"effectiveEnumerationFacet"
-				supplier   	"Logical View::xsd::XSDEnumerationFacet"
-				quidu      	"3B6C6ACE0141"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$306"
-			quid       	"3C28B8400062"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$307"
-				quid       	"3C28B841001D"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveTotalDigitsFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B8410027"
-				label      	"effectiveTotalDigitsFacet"
-				supplier   	"Logical View::xsd::XSDTotalDigitsFacet"
-				quidu      	"3B6C79A0020E"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$308"
-			quid       	"3C28B898016D"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$309"
-				quid       	"3C28B8990056"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveMinLengthFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B8990060"
-				label      	"effectiveMinLengthFacet"
-				supplier   	"Logical View::xsd::XSDMinLengthFacet"
-				quidu      	"3B6C778C0065"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$310"
-			quid       	"3C28B8DC0052"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$311"
-				quid       	"3C28B8DC03B9"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveLengthFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B8DC03C3"
-				label      	"effectiveLengthFacet"
-				supplier   	"Logical View::xsd::XSDLengthFacet"
-				quidu      	"3B6C776200E7"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$312"
-			quid       	"3C28B97001DB"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$313"
-				quid       	"3C28B97100CF"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveMinFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B97100D9"
-				label      	"effectiveMinFacet"
-				supplier   	"Logical View::xsd::XSDMinFacet"
-				quidu      	"3C0A1CDE037C"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$314"
-			quid       	"3D4BB4AE01CC"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$315"
-				quid       	"3D4BB4AF010F"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "syntheticFacets"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3D4BB4AF011A"
-				label      	"syntheticFacets"
-				supplier   	"Logical View::xsd::XSDFacet"
-				quidu      	"3B6C359403D2"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$316"
-			quid       	"3D4BB4D3028E"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$317"
-				quid       	"3D4BB4D402F3"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "syntheticParticle"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3D4BB4D402FD"
-				label      	"syntheticParticle"
-				supplier   	"Logical View::xsd::XSDParticle"
-				quidu      	"3B682BBD01F7"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$318"
-			quid       	"3D4BB4D901F6"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$319"
-				quid       	"3D4BB4DA0284"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "syntheticWildcard"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3D4BB4DA028E"
-				label      	"syntheticWildcard"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$320"
-			quid       	"3D4C68FF01BF"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$321"
-				quid       	"3D4C69020317"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "syntheticWildcard"
-				quid       	"3D4C69020318"
-				label      	"syntheticWildcard"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE))))
-		logical_presentations 	(list unit_reference_list
-		    (object ClassDiagram "1. Component Hierarchy (Part 1: Structures)"
-			quid       	"3B6847680138"
-			title      	"1. Component Hierarchy (Part 1: Structures)"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDComponent" @411
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(928, 80)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@411
-				    location   	(766, 39)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846E90029"
-				width      	342
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDNamedComponent" @412
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1168, 560)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@412
-				    location   	(940, 519)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	456
-				    justify    	0
-				    label      	"XSDNamedComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846D303A4"
-				width      	474
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @413
-				location   	(928, 225)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@411
-				vertices   	(list Points
-				    (928, 225)
-				    (928, 135)))
-			    (object ClassView "Class" "Logical View::xsd::XSDTerm" @414
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1568, 320)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@414
-				    location   	(1460, 279)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	216
-				    justify    	0
-				    label      	"XSDTerm")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683C5E0174"
-				width      	234
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @415
-				location   	(1203, 706)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@412
-				vertices   	(list Points
-				    (1203, 706)
-				    (1203, 615)))
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeContent" @416
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(624, 560)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@416
-				    location   	(372, 519)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	504
-				    justify    	0
-				    label      	"XSDComplexTypeContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683BA00196"
-				width      	522
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @417
-				location   	(444, 709)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@416
-				vertices   	(list Points
-				    (444, 709)
-				    (444, 615)))
-			    (object InheritTreeView "" @418
-				location   	(1572, 465)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@414
-				vertices   	(list Points
-				    (1572, 465)
-				    (1572, 375)))
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @419
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(416, 800)
-				label      	(object ItemLabel
-				    Parent_View 	@419
-				    location   	(290, 757)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	252
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	270
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @420
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(448, 1056)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@420
-				    location   	(262, 1015)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	372
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	390
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUse" @421
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1104, 320)
-				label      	(object ItemLabel
-				    Parent_View 	@421
-				    location   	(936, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	336
-				    justify    	0
-				    label      	"XSDAttributeUse")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B68354601A8"
-				width      	354
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @422
-				location   	(453, 1203)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@420
-				vertices   	(list Points
-				    (453, 1203)
-				    (453, 1111)))
-			    (object ClassView "Class" "Logical View::xsd::XSDScope" @423
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(176, 320)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@423
-				    location   	(62, 279)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	228
-				    justify    	0
-				    label      	"XSDScope")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B54000F2"
-				width      	246
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDFeature" @424
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1872, 800)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@424
-				    location   	(1746, 759)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	252
-				    justify    	0
-				    label      	"XSDFeature")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B537026C"
-				width      	270
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @425
-				location   	(1872, 950)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@424
-				vertices   	(list Points
-				    (1872, 950)
-				    (1872, 855)))
-			    (object InheritTreeView "" @426
-				location   	(181, 465)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@423
-				vertices   	(list Points
-				    (181, 465)
-				    (181, 375)))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @427
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1936, 1280)
-				label      	(object ItemLabel
-				    Parent_View 	@427
-				    location   	(1670, 1233)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	532
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	550
-				height     	118
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @428
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1968, 1056)
-				label      	(object ItemLabel
-				    Parent_View 	@428
-				    location   	(1734, 1013)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				width      	486
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDIdentityConstraintDefinition" @429
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1888, 1488)
-				label      	(object ItemLabel
-				    Parent_View 	@429
-				    location   	(1569, 1444)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	638
-				    justify    	0
-				    label      	"XSDIdentityConstraintDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B2603A2"
-				width      	656
-				height     	112
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDNotationDeclaration" @430
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1184, 1488)
-				label      	(object ItemLabel
-				    Parent_View 	@430
-				    location   	(903, 1444)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	563
-				    justify    	0
-				    label      	"XSDNotationDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDAA021C"
-				width      	581
-				height     	112
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @431
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1600, 560)
-				label      	(object ItemLabel
-				    Parent_View 	@431
-				    location   	(1462, 517)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	276
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				width      	294
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @432
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1024, 1056)
-				label      	(object ItemLabel
-				    Parent_View 	@432
-				    location   	(778, 1013)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	492
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				width      	510
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroup" @433
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1968, 560)
-				label      	(object ItemLabel
-				    Parent_View 	@433
-				    location   	(1806, 517)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDModelGroup")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6834E00291"
-				width      	342
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @434
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(352, 1296)
-				label      	(object ItemLabel
-				    Parent_View 	@434
-				    location   	(106, 1253)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	492
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				width      	510
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @435
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(192, 560)
-				label      	(object ItemLabel
-				    Parent_View 	@435
-				    location   	(60, 517)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	264
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	282
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @436
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1072, 1280)
-				label      	(object ItemLabel
-				    Parent_View 	@436
-				    location   	(802, 1237)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	540
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	558
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @437
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(368, 1488)
-				label      	(object ItemLabel
-				    Parent_View 	@437
-				    location   	(30, 1441)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	676
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				width      	694
-				height     	119
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAnnotation" @438
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(576, 320)
-				label      	(object ItemLabel
-				    Parent_View 	@438
-				    location   	(426, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	300
-				    justify    	0
-				    label      	"XSDAnnotation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDC80233"
-				width      	318
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDXPathDefinition" @439
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2000, 320)
-				label      	(object ItemLabel
-				    Parent_View 	@439
-				    location   	(1808, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	384
-				    justify    	0
-				    label      	"XSDXPathDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6D83BB0355"
-				width      	402
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @440
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B72D7BB0349"
-				client     	@421
-				supplier   	@411
-				line_style 	3
-				origin_attachment 	(1094, 265)
-				terminal_attachment 	(1094, 225)
-				drawSupplier 	@413)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefinableComponent" @441
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(960, 800)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@441
-				    location   	(690, 759)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	540
-				    justify    	0
-				    label      	"XSDRedefinableComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B7FCA8B020B"
-				width      	558
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @442
-				location   	(962, 947)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@441
-				vertices   	(list Points
-				    (962, 947)
-				    (962, 855)))
-			    (object InheritView "" @443
-				stereotype 	(object SegLabel @444
-				    Parent_View 	@443
-				    location   	(218, 1154)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	212
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.163534
-				    height     	69
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B685F55032B"
-				client     	@434
-				supplier   	@416
-				line_style 	3
-				origin_attachment 	(149, 1241)
-				terminal_attachment 	(149, 709)
-				drawSupplier 	@417)
-			    (object InheritView "" @445
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A1302A2"
-				client     	@434
-				supplier   	@420
-				line_style 	3
-				origin_attachment 	(256, 1241)
-				terminal_attachment 	(256, 1203)
-				drawSupplier 	@422)
-			    (object InheritView "" @446
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCC4A0182"
-				client     	@435
-				supplier   	@423
-				line_style 	3
-				origin_attachment 	(284, 505)
-				terminal_attachment 	(284, 465)
-				drawSupplier 	@426)
-			    (object InheritView "" @447
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A640279"
-				client     	@433
-				supplier   	@414
-				line_style 	3
-				origin_attachment 	(2002, 505)
-				terminal_attachment 	(2002, 465)
-				drawSupplier 	@418)
-			    (object InheritView "" @448
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6848AA01D3"
-				client     	@414
-				supplier   	@411
-				line_style 	3
-				origin_attachment 	(1569, 265)
-				terminal_attachment 	(1569, 225)
-				drawSupplier 	@413)
-			    (object InheritView "" @449
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A3A0041"
-				client     	@431
-				supplier   	@414
-				line_style 	3
-				origin_attachment 	(1490, 505)
-				terminal_attachment 	(1490, 465)
-				drawSupplier 	@418)
-			    (object InheritView "" @450
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6848FC01E7"
-				client     	@419
-				supplier   	@416
-				line_style 	3
-				origin_attachment 	(510, 745)
-				terminal_attachment 	(510, 709)
-				drawSupplier 	@417)
-			    (object InheritView "" @451
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAC800D2"
-				client     	@436
-				supplier   	@441
-				line_style 	3
-				origin_attachment 	(1321, 1225)
-				terminal_attachment 	(1321, 947)
-				drawSupplier 	@442)
-			    (object InheritView "" @452
-				stereotype 	(object SegLabel @453
-				    Parent_View 	@452
-				    location   	(2137, 886)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	238
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.215812
-				    height     	64
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B685F17002E"
-				client     	@428
-				supplier   	@414
-				line_style 	3
-				origin_attachment 	(2200, 1001)
-				terminal_attachment 	(2200, 465)
-				drawSupplier 	@418)
-			    (object InheritView "" @454
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69EDEE01BF"
-				client     	@428
-				supplier   	@424
-				line_style 	3
-				origin_attachment 	(2093, 1001)
-				terminal_attachment 	(2093, 950)
-				drawSupplier 	@425)
-			    (object InheritView "" @455
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAB1004D"
-				client     	@420
-				supplier   	@441
-				line_style 	3
-				origin_attachment 	(450, 1001)
-				terminal_attachment 	(450, 947)
-				drawSupplier 	@442)
-			    (object InheritView "" @456
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCD640231"
-				client     	@423
-				supplier   	@411
-				line_style 	3
-				origin_attachment 	(147, 265)
-				terminal_attachment 	(147, 225)
-				drawSupplier 	@413)
-			    (object InheritView "" @457
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D84F70092"
-				client     	@439
-				supplier   	@411
-				line_style 	3
-				origin_attachment 	(2012, 265)
-				terminal_attachment 	(2012, 225)
-				drawSupplier 	@413)
-			    (object InheritView "" @458
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6848B80286"
-				client     	@416
-				supplier   	@411
-				line_style 	3
-				origin_attachment 	(834, 505)
-				terminal_attachment 	(834, 225)
-				drawSupplier 	@413)
-			    (object InheritView "" @459
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0CEA20197"
-				client     	@412
-				supplier   	@411
-				line_style 	3
-				origin_attachment 	(1350, 505)
-				terminal_attachment 	(1350, 225)
-				drawSupplier 	@413)
-			    (object InheritView "" @460
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69E1770116"
-				client     	@438
-				supplier   	@411
-				line_style 	3
-				origin_attachment 	(572, 265)
-				terminal_attachment 	(572, 225)
-				drawSupplier 	@413)
-			    (object InheritView "" @461
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69B7DC0193"
-				client     	@427
-				supplier   	@424
-				line_style 	3
-				origin_attachment 	(1693, 1221)
-				terminal_attachment 	(1693, 950)
-				drawSupplier 	@425)
-			    (object InheritView "" @462
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684AA30242"
-				client     	@429
-				supplier   	@412
-				line_style 	3
-				origin_attachment 	(1590, 1432)
-				terminal_attachment 	(1590, 706)
-				drawSupplier 	@415)
-			    (object InheritView "" @463
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B68494302F1"
-				client     	@430
-				supplier   	@412
-				line_style 	3
-				origin_attachment 	(1431, 1432)
-				terminal_attachment 	(1431, 706)
-				drawSupplier 	@415)
-			    (object InheritView "" @464
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A26036D"
-				client     	@441
-				supplier   	@412
-				line_style 	3
-				origin_attachment 	(959, 745)
-				terminal_attachment 	(959, 706)
-				drawSupplier 	@415)
-			    (object InheritView "" @465
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A2C0307"
-				client     	@424
-				supplier   	@412
-				line_style 	3
-				origin_attachment 	(1872, 745)
-				terminal_attachment 	(1872, 706)
-				drawSupplier 	@415)
-			    (object InheritView "" @466
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAC40090"
-				client     	@432
-				supplier   	@441
-				line_style 	3
-				origin_attachment 	(962, 1001)
-				terminal_attachment 	(962, 947)
-				drawSupplier 	@442)
-			    (object InheritView "" @467
-				stereotype 	(object SegLabel @468
-				    Parent_View 	@467
-				    location   	(95, 1388)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	187
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.042531
-				    height     	67
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B69BAA20310"
-				client     	@437
-				supplier   	@423
-				line_style 	3
-				origin_attachment 	(28, 1429)
-				terminal_attachment 	(28, 465)
-				drawSupplier 	@426)
-			    (object InheritView "" @469
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0D01901F1"
-				client     	@437
-				supplier   	@420
-				line_style 	3
-				origin_attachment 	(656, 1429)
-				terminal_attachment 	(656, 1203)
-				drawSupplier 	@422)))
-		    (object ClassDiagram "2. Component Relations (Part 1 : Structures)"
-			quid       	"374B18190028"
-			title      	"2. Component Relations (Part 1 : Structures)"
-			zoom       	96
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDScope" @470
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(784, 1632)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@470
-				    location   	(670, 1593)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	228
-				    justify    	0
-				    label      	"XSDScope")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B54000F2"
-				width      	246
-				height     	107
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDFeature" @471
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(192, 1632)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@471
-				    location   	(66, 1593)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	252
-				    justify    	0
-				    label      	"XSDFeature")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B537026C"
-				width      	270
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$136" @472
-				location   	(494, 1627)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69B653017A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "scope" @473
-					Parent_View 	@472
-					location   	(286, -485)
-					label      	(object SegLabel @474
-					    Parent_View 	@473
-					    location   	(555, 1589)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	132
-					    justify    	0
-					    label      	"+scope"
-					    pctDist    	0.371257
-					    height     	39
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69B654006D"
-					client     	@472
-					supplier   	@470
-					line_style 	3
-					origin_attachment 	(494, 1627)
-					terminal_attachment 	(661, 1627)
-					label      	(object SegLabel @475
-					    Parent_View 	@473
-					    location   	(576, 1664)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.491018
-					    height     	37
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$137" @476
-					Parent_View 	@472
-					location   	(286, -485)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69B654006E"
-					client     	@472
-					supplier   	@471
-					line_style 	3
-					origin_attachment 	(494, 1627)
-					terminal_attachment 	(327, 1627))))
-			    (object ClassView "Class" "Logical View::xsd::XSDTerm" @477
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2192, 1232)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@477
-				    location   	(2084, 1193)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	216
-				    justify    	0
-				    label      	"XSDTerm")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683C5E0174"
-				width      	234
-				height     	107
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @478
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2176, 992)
-				label      	(object ItemLabel
-				    Parent_View 	@478
-				    location   	(2051, 951)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	250
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	268
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$168" @479
-				location   	(2229, 1112)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B683C890122"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$169" @480
-					Parent_View 	@479
-					location   	(549, -248)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B683C8A0110"
-					client     	@479
-					supplier   	@478
-					line_style 	3
-					origin_attachment 	(2229, 1112)
-					terminal_attachment 	(2229, 1045))
-				    (object RoleView "term" @481
-					Parent_View 	@479
-					location   	(549, -248)
-					label      	(object SegLabel @482
-					    Parent_View 	@481
-					    location   	(2157, 1121)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	108
-					    justify    	0
-					    label      	"+term"
-					    pctDist    	0.134328
-					    height     	72
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B683C8A0111"
-					client     	@479
-					supplier   	@477
-					line_style 	3
-					origin_attachment 	(2229, 1112)
-					terminal_attachment 	(2229, 1179)
-					label      	(object SegLabel @483
-					    Parent_View 	@481
-					    location   	(2274, 1119)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.119403
-					    height     	45
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeContent" @484
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1328, 1232)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@484
-				    location   	(1076, 1193)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	504
-				    justify    	0
-				    label      	"XSDComplexTypeContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683BA00196"
-				width      	522
-				height     	107
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroup" @485
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2144, 768)
-				label      	(object ItemLabel
-				    Parent_View 	@485
-				    location   	(1977, 727)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	334
-				    justify    	0
-				    label      	"XSDModelGroup")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6834E00291"
-				width      	352
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$156" @486
-				location   	(2219, 880)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B683606026F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$157" @487
-					Parent_View 	@486
-					location   	(-357, -240)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6836070221"
-					client     	@486
-					supplier   	@485
-					line_style 	3
-					origin_attachment 	(2219, 880)
-					terminal_attachment 	(2219, 821))
-				    (object RoleView "particles" @488
-					Parent_View 	@486
-					location   	(-357, -240)
-					label      	(object SegLabel @489
-					    Parent_View 	@488
-					    location   	(2105, 888)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+particles"
-					    pctDist    	0.156627
-					    height     	115
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6836070222"
-					client     	@486
-					supplier   	@478
-					line_style 	3
-					origin_attachment 	(2219, 880)
-					terminal_attachment 	(2219, 939)
-					label      	(object SegLabel @490
-					    Parent_View 	@488
-					    location   	(2281, 888)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"1..*"
-					    pctDist    	0.156627
-					    height     	62
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @491
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1776, 992)
-				label      	(object ItemLabel
-				    Parent_View 	@491
-				    location   	(1639, 951)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	274
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				width      	292
-				height     	107
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUse" @492
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1072, 1424)
-				label      	(object ItemLabel
-				    Parent_View 	@492
-				    location   	(905, 1383)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	334
-				    justify    	0
-				    label      	"XSDAttributeUse")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B68354601A8"
-				width      	352
-				height     	107
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @493
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(432, 992)
-				label      	(object ItemLabel
-				    Parent_View 	@493
-				    location   	(187, 951)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	490
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				width      	508
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$202" @494
-				location   	(590, 1140)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D35AB0273"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$203" @495
-					Parent_View 	@494
-					location   	(302, 148)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D35B20291"
-					client     	@494
-					supplier   	@493
-					vertices   	(list Points
-					    (590, 1140)
-					    (540, 1140)
-					    (540, 1045))
-					line_style 	3
-					origin_attachment 	(590, 1140)
-					terminal_attachment 	(540, 1045))
-				    (object RoleView "baseTypeDefinition" @496
-					Parent_View 	@494
-					location   	(302, 148)
-					label      	(object SegLabel @497
-					    Parent_View 	@496
-					    location   	(643, 1171)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+baseTypeDefinition"
-					    pctDist    	1.053571
-					    height     	31
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D35B202A5"
-					client     	@494
-					supplier   	@493
-					vertices   	(list Points
-					    (590, 1140)
-					    (641, 1140)
-					    (641, 1045))
-					line_style 	3
-					origin_attachment 	(590, 1140)
-					terminal_attachment 	(641, 1045)
-					label      	(object SegLabel @498
-					    Parent_View 	@496
-					    location   	(584, 1097)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.122449
-					    height     	44
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @499
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1008, 992)
-				label      	(object ItemLabel
-				    Parent_View 	@499
-				    location   	(745, 951)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	526
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				width      	544
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$104" @500
-				location   	(1119, 1112)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6837DF024F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$105" @501
-					Parent_View 	@500
-					location   	(-1569, -8)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6837E100FD"
-					client     	@500
-					supplier   	@499
-					line_style 	3
-					origin_attachment 	(1119, 1112)
-					terminal_attachment 	(1119, 1045))
-				    (object RoleView "contentType" @502
-					Parent_View 	@500
-					location   	(-1569, -8)
-					label      	(object SegLabel @503
-					    Parent_View 	@502
-					    location   	(1259, 1126)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	252
-					    justify    	0
-					    label      	"+contentType"
-					    pctDist    	0.208955
-					    height     	140
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6837E100FE"
-					client     	@500
-					supplier   	@484
-					line_style 	3
-					origin_attachment 	(1119, 1112)
-					terminal_attachment 	(1119, 1179)
-					label      	(object SegLabel @504
-					    Parent_View 	@502
-					    location   	(1063, 1126)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.208955
-					    height     	57
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$110" @505
-				location   	(1455, 982)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6851BA0126"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$111" @506
-					Parent_View 	@505
-					location   	(159, -570)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6851BB0150"
-					client     	@505
-					supplier   	@499
-					line_style 	3
-					origin_attachment 	(1455, 982)
-					terminal_attachment 	(1280, 982))
-				    (object RoleView "attributeWildcard" @507
-					Parent_View 	@505
-					location   	(159, -570)
-					label      	(object SegLabel @508
-					    Parent_View 	@507
-					    location   	(1445, 929)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+attributeWildcard"
-					    pctDist    	-0.062857
-					    height     	54
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6851BB0151"
-					client     	@505
-					supplier   	@491
-					line_style 	3
-					origin_attachment 	(1455, 982)
-					terminal_attachment 	(1630, 982)
-					label      	(object SegLabel @509
-					    Parent_View 	@507
-					    location   	(1550, 1022)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.542857
-					    height     	40
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$106" @510
-				location   	(921, 1208)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B683959006E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$107" @511
-					Parent_View 	@510
-					location   	(-871, -376)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6839590349"
-					client     	@510
-					supplier   	@499
-					line_style 	3
-					origin_attachment 	(921, 1208)
-					terminal_attachment 	(921, 1045))
-				    (object RoleView "attributeUses" @512
-					Parent_View 	@510
-					location   	(-871, -376)
-					label      	(object SegLabel @513
-					    Parent_View 	@512
-					    location   	(778, 1251)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	264
-					    justify    	0
-					    label      	"+attributeUses"
-					    pctDist    	0.269939
-					    height     	144
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B683959034A"
-					client     	@510
-					supplier   	@492
-					line_style 	3
-					origin_attachment 	(921, 1208)
-					terminal_attachment 	(921, 1371)
-					label      	(object SegLabel @514
-					    Parent_View 	@512
-					    location   	(979, 1254)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.288344
-					    height     	58
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDXPathDefinition" @515
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1312, 768)
-				label      	(object ItemLabel
-				    Parent_View 	@515
-				    location   	(1122, 727)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	380
-				    justify    	0
-				    label      	"XSDXPathDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6D83BB0355"
-				width      	398
-				height     	107
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDNotationDeclaration" @516
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1856, 1632)
-				label      	(object ItemLabel
-				    Parent_View 	@516
-				    location   	(1623, 1591)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	466
-				    justify    	0
-				    label      	"XSDNotationDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDAA021C"
-				width      	484
-				height     	107
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @517
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2048, 448)
-				label      	(object ItemLabel
-				    Parent_View 	@517
-				    location   	(1803, 407)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	490
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				width      	508
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$160" @518
-				location   	(2216, 608)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6837AC025A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$161" @519
-					Parent_View 	@518
-					location   	(-552, -816)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6837AD0338"
-					client     	@518
-					supplier   	@517
-					line_style 	3
-					origin_attachment 	(2216, 608)
-					terminal_attachment 	(2216, 501))
-				    (object RoleView "modelGroup" @520
-					Parent_View 	@518
-					location   	(-552, -816)
-					label      	(object SegLabel @521
-					    Parent_View 	@520
-					    location   	(2080, 628)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	252
-					    justify    	0
-					    label      	"+modelGroup"
-					    pctDist    	0.182609
-					    height     	137
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6837AD0339"
-					client     	@518
-					supplier   	@485
-					line_style 	3
-					origin_attachment 	(2216, 608)
-					terminal_attachment 	(2216, 715)
-					label      	(object SegLabel @522
-					    Parent_View 	@520
-					    location   	(2256, 633)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.233645
-					    height     	40
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @523
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1888, 1424)
-				label      	(object ItemLabel
-				    Parent_View 	@523
-				    location   	(1619, 1383)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	538
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	556
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$90" @524
-				location   	(1676, 1208)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6887BF0150"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$91" @525
-					Parent_View 	@524
-					location   	(412, -344)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6887C000A7"
-					client     	@524
-					supplier   	@523
-					line_style 	3
-					origin_attachment 	(1676, 1208)
-					terminal_attachment 	(1676, 1371))
-				    (object RoleView "attributeWildcard" @526
-					Parent_View 	@524
-					location   	(412, -344)
-					label      	(object SegLabel @527
-					    Parent_View 	@526
-					    location   	(1857, 1106)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+attributeWildcard"
-					    pctDist    	0.625767
-					    height     	181
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6887C000A8"
-					client     	@524
-					supplier   	@491
-					line_style 	3
-					origin_attachment 	(1676, 1208)
-					terminal_attachment 	(1676, 1045)
-					label      	(object SegLabel @528
-					    Parent_View 	@526
-					    location   	(1618, 1108)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.619632
-					    height     	59
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$86" @529
-				location   	(1429, 1438)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B68359F0086"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$87" @530
-					Parent_View 	@529
-					location   	(-363, -146)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6835A00069"
-					client     	@529
-					supplier   	@523
-					line_style 	3
-					origin_attachment 	(1429, 1438)
-					terminal_attachment 	(1610, 1438))
-				    (object RoleView "attributeUses" @531
-					Parent_View 	@529
-					location   	(-363, -146)
-					label      	(object SegLabel @532
-					    Parent_View 	@531
-					    location   	(1405, 1506)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	264
-					    justify    	0
-					    label      	"+attributeUses"
-					    pctDist    	0.132597
-					    height     	68
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6835A0006A"
-					client     	@529
-					supplier   	@492
-					line_style 	3
-					origin_attachment 	(1429, 1438)
-					terminal_attachment 	(1248, 1438)
-					label      	(object SegLabel @533
-					    Parent_View 	@531
-					    location   	(1327, 1391)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.563536
-					    height     	48
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @534
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(416, 1424)
-				label      	(object ItemLabel
-				    Parent_View 	@534
-				    location   	(183, 1383)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	466
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	484
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$94" @535
-				location   	(777, 1425)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B683585010D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$95" @536
-					Parent_View 	@535
-					location   	(-519, -367)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B68358600FA"
-					client     	@535
-					supplier   	@492
-					line_style 	3
-					origin_attachment 	(777, 1425)
-					terminal_attachment 	(896, 1425))
-				    (object RoleView "attributeDeclaration" @537
-					Parent_View 	@535
-					location   	(-519, -367)
-					label      	(object SegLabel @538
-					    Parent_View 	@537
-					    location   	(784, 1508)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+attributeDeclaration"
-					    pctDist    	-0.059259
-					    height     	83
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B68358600FB"
-					client     	@535
-					supplier   	@534
-					line_style 	3
-					origin_attachment 	(777, 1425)
-					terminal_attachment 	(658, 1425)
-					label      	(object SegLabel @539
-					    Parent_View 	@537
-					    location   	(721, 1385)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.472441
-					    height     	41
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$78" @540
-				location   	(237, 1208)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B68356B02CB"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$79" @541
-					Parent_View 	@540
-					location   	(-1043, 72)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B68356D00A6"
-					client     	@540
-					supplier   	@534
-					line_style 	3
-					origin_attachment 	(237, 1208)
-					terminal_attachment 	(237, 1371))
-				    (object RoleView "typeDefinition" @542
-					Parent_View 	@540
-					location   	(-1043, 72)
-					label      	(object SegLabel @543
-					    Parent_View 	@542
-					    location   	(388, 1247)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+typeDefinition"
-					    pctDist    	-0.239264
-					    height     	151
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B68356D00A7"
-					client     	@540
-					supplier   	@493
-					line_style 	3
-					origin_attachment 	(237, 1208)
-					terminal_attachment 	(237, 1045)
-					label      	(object SegLabel @544
-					    Parent_View 	@542
-					    location   	(195, 1247)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.239264
-					    height     	43
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @545
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(384, 784)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@545
-				    location   	(198, 745)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	372
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	390
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$100" @546
-				location   	(728, 775)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6833350340"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$101" @547
-					Parent_View 	@546
-					location   	(-856, -57)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B683336028D"
-					client     	@546
-					supplier   	@499
-					vertices   	(list Points
-					    (728, 775)
-					    (788, 775)
-					    (788, 939))
-					line_style 	3
-					origin_attachment 	(728, 775)
-					terminal_attachment 	(788, 939))
-				    (object RoleView "baseTypeDefinition" @548
-					Parent_View 	@546
-					location   	(-856, -57)
-					label      	(object SegLabel @549
-					    Parent_View 	@548
-					    location   	(558, 883)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+baseTypeDefinition"
-					    pctDist    	1.140940
-					    height     	108
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B683336028E"
-					client     	@546
-					supplier   	@545
-					line_style 	3
-					origin_attachment 	(728, 775)
-					terminal_attachment 	(579, 775)
-					label      	(object SegLabel @550
-					    Parent_View 	@548
-					    location   	(750, 812)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.152439
-					    height     	37
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDIdentityConstraintDefinition" @551
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1312, 448)
-				label      	(object ItemLabel
-				    Parent_View 	@551
-				    location   	(1017, 407)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	590
-				    justify    	0
-				    label      	"XSDIdentityConstraintDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B2603A2"
-				width      	608
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$142" @552
-				location   	(1629, 574)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69D29E014D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "referencedKey" @553
-					Parent_View 	@552
-					location   	(-83, 94)
-					label      	(object SegLabel @554
-					    Parent_View 	@553
-					    location   	(1761, 608)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	288
-					    justify    	0
-					    label      	"+referencedKey"
-					    pctDist    	-1.797297
-					    height     	34
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69D2A80165"
-					client     	@552
-					supplier   	@551
-					vertices   	(list Points
-					    (1629, 574)
-					    (1555, 574)
-					    (1555, 501))
-					line_style 	3
-					origin_attachment 	(1629, 574)
-					terminal_attachment 	(1555, 501)
-					label      	(object SegLabel @555
-					    Parent_View 	@553
-					    location   	(1622, 539)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.047619
-					    height     	36
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$143" @556
-					Parent_View 	@552
-					location   	(-83, 94)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69D2A8016F"
-					client     	@552
-					supplier   	@551
-					vertices   	(list Points
-					    (1629, 574)
-					    (1689, 574)
-					    (1689, 444)
-					    (1616, 444))
-					line_style 	3
-					origin_attachment 	(1629, 574)
-					terminal_attachment 	(1616, 444))))
-			    (object AssociationViewNew "$UNNAMED$146" @557
-				location   	(1197, 608)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D8D330025"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$147" @558
-					Parent_View 	@557
-					location   	(-115, 32)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D330365"
-					client     	@557
-					supplier   	@551
-					line_style 	3
-					origin_attachment 	(1197, 608)
-					terminal_attachment 	(1197, 501))
-				    (object RoleView "fields" @559
-					Parent_View 	@557
-					location   	(-115, 32)
-					label      	(object SegLabel @560
-					    Parent_View 	@559
-					    location   	(1119, 655)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	120
-					    justify    	0
-					    label      	"+fields"
-					    pctDist    	0.439252
-					    height     	78
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D330379"
-					client     	@557
-					supplier   	@515
-					line_style 	3
-					origin_attachment 	(1197, 608)
-					terminal_attachment 	(1197, 715)
-					label      	(object SegLabel @561
-					    Parent_View 	@559
-					    location   	(1253, 654)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"1..*"
-					    pctDist    	0.429907
-					    height     	56
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$144" @562
-				location   	(1415, 608)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D8D3D003E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$145" @563
-					Parent_View 	@562
-					location   	(103, 32)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D3E022A"
-					client     	@562
-					supplier   	@551
-					line_style 	3
-					origin_attachment 	(1415, 608)
-					terminal_attachment 	(1415, 501))
-				    (object RoleView "selector" @564
-					Parent_View 	@562
-					location   	(103, 32)
-					label      	(object SegLabel @565
-					    Parent_View 	@564
-					    location   	(1513, 651)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+selector"
-					    pctDist    	0.411215
-					    height     	98
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D3E0234"
-					client     	@562
-					supplier   	@515
-					line_style 	3
-					origin_attachment 	(1415, 608)
-					terminal_attachment 	(1415, 715)
-					label      	(object SegLabel @566
-					    Parent_View 	@564
-					    location   	(1381, 650)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.392523
-					    height     	34
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @567
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				location   	(1312, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@567
-				    location   	(1022, 68)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	581
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	599
-				height     	209
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$188" @568
-				location   	(2395, 606)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B66EEA7023E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$189" @569
-					Parent_View 	@568
-					location   	(-853, 174)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EEA8038A"
-					client     	@568
-					supplier   	@567
-					vertices   	(list Points
-					    (2395, 606)
-					    (2395, 65)
-					    (1611, 65))
-					line_style 	3
-					origin_attachment 	(2395, 606)
-					terminal_attachment 	(1611, 65))
-				    (object RoleView "notationDeclarations" @570
-					Parent_View 	@568
-					location   	(-853, 174)
-					label      	(object SegLabel @571
-					    Parent_View 	@570
-					    location   	(2089, 104)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+notationDeclarations"
-					    pctDist    	-0.489776
-					    height     	307
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EEA8038B"
-					client     	@568
-					supplier   	@516
-					vertices   	(list Points
-					    (2395, 606)
-					    (2395, 1633)
-					    (2098, 1633))
-					line_style 	3
-					origin_attachment 	(2395, 606)
-					terminal_attachment 	(2098, 1633)
-					label      	(object SegLabel @572
-					    Parent_View 	@570
-					    location   	(2344, 105)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	-0.487829
-					    height     	52
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$184" @573
-				location   	(1772, 249)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B66EEFF024F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$185" @574
-					Parent_View 	@573
-					location   	(-948, -327)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EF00025A"
-					client     	@573
-					supplier   	@567
-					line_style 	3
-					origin_attachment 	(1772, 249)
-					terminal_attachment 	(1611, 249))
-				    (object RoleView "modelGroupDefinitions" @575
-					Parent_View 	@573
-					location   	(-948, -327)
-					label      	(object SegLabel @576
-					    Parent_View 	@575
-					    location   	(2076, 335)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	432
-					    justify    	0
-					    label      	"+modelGroupDefinitions"
-					    pctDist    	0.713592
-					    height     	244
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EF000264"
-					client     	@573
-					supplier   	@517
-					vertices   	(list Points
-					    (1772, 249)
-					    (1832, 249)
-					    (1832, 395))
-					line_style 	3
-					origin_attachment 	(1772, 249)
-					terminal_attachment 	(1832, 395)
-					label      	(object SegLabel @577
-					    Parent_View 	@575
-					    location   	(1781, 340)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.737864
-					    height     	52
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$180" @578
-				location   	(2346, 518)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B66EE920216"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$181" @579
-					Parent_View 	@578
-					location   	(154, 86)
-					label      	(object SegLabel @580
-					    Parent_View 	@579
-					    location   	(1872, 1857)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	-3.630072
-					    height     	475
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EE93018B"
-					client     	@578
-					supplier   	@567
-					vertices   	(list Points
-					    (2346, 518)
-					    (2346, 149)
-					    (1611, 149))
-					line_style 	3
-					origin_attachment 	(2346, 518)
-					terminal_attachment 	(1611, 149))
-				    (object RoleView "attributeGroupDefinitions" @581
-					Parent_View 	@578
-					location   	(154, 86)
-					label      	(object SegLabel @582
-					    Parent_View 	@581
-					    location   	(2008, 195)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	468
-					    justify    	0
-					    label      	"+attributeGroupDefinitions"
-					    pctDist    	-0.349946
-					    height     	339
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EE93018C"
-					client     	@578
-					supplier   	@523
-					vertices   	(list Points
-					    (2346, 518)
-					    (2346, 1441)
-					    (2166, 1441))
-					line_style 	3
-					origin_attachment 	(2346, 518)
-					terminal_attachment 	(2166, 1441)
-					label      	(object SegLabel @583
-					    Parent_View 	@581
-					    location   	(2299, 197)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	-0.348862
-					    height     	48
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$182" @584
-				location   	(203, 159)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B66EE760049"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$183" @585
-					Parent_View 	@584
-					location   	(-485, -273)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EE760374"
-					client     	@584
-					supplier   	@567
-					line_style 	3
-					origin_attachment 	(203, 159)
-					terminal_attachment 	(1013, 159))
-				    (object RoleView "typeDefinitions" @586
-					Parent_View 	@584
-					location   	(-485, -273)
-					label      	(object SegLabel @587
-					    Parent_View 	@586
-					    location   	(349, 196)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	288
-					    justify    	0
-					    label      	"+typeDefinitions"
-					    pctDist    	-1.475728
-					    height     	37
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EE76037E"
-					client     	@584
-					supplier   	@545
-					vertices   	(list Points
-					    (203, 159)
-					    (104, 159)
-					    (104, 784)
-					    (189, 784))
-					line_style 	3
-					origin_attachment 	(203, 159)
-					terminal_attachment 	(189, 784)
-					label      	(object SegLabel @588
-					    Parent_View 	@586
-					    location   	(155, 200)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.059701
-					    height     	41
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$186" @589
-				location   	(1087, 329)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BFC2A1701ED"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$187" @590
-					Parent_View 	@589
-					location   	(-577, -23)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFC2A1A0273"
-					client     	@589
-					supplier   	@567
-					line_style 	3
-					origin_attachment 	(1087, 329)
-					terminal_attachment 	(1087, 264))
-				    (object RoleView "identityConstraintDefinitions" @591
-					Parent_View 	@589
-					location   	(-577, -23)
-					label      	(object SegLabel @592
-					    Parent_View 	@591
-					    location   	(1375, 338)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	528
-					    justify    	0
-					    label      	"+identityConstraintDefinitions"
-					    pctDist    	0.130952
-					    height     	288
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFC2A1A027D"
-					client     	@589
-					supplier   	@551
-					line_style 	3
-					origin_attachment 	(1087, 329)
-					terminal_attachment 	(1087, 395)
-					label      	(object SegLabel @593
-					    Parent_View 	@591
-					    location   	(1018, 336)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.107143
-					    height     	70
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$178" @594
-				location   	(48, 320)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B66FDFA00C3"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$179" @595
-					Parent_View 	@594
-					location   	(-1072, -288)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66FDFB027D"
-					client     	@594
-					supplier   	@567
-					vertices   	(list Points
-					    (49, 322)
-					    (49, 68)
-					    (1013, 68))
-					line_style 	3
-					origin_attachment 	(49, 322)
-					terminal_attachment 	(1013, 68))
-				    (object RoleView "attributeDeclarations" @596
-					Parent_View 	@594
-					location   	(-1072, -288)
-					label      	(object SegLabel @597
-					    Parent_View 	@596
-					    location   	(338, 106)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+attributeDeclarations"
-					    pctDist    	-0.198536
-					    height     	289
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66FDFB027E"
-					client     	@594
-					supplier   	@534
-					vertices   	(list Points
-					    (49, 322)
-					    (49, 1415)
-					    (174, 1415))
-					line_style 	3
-					origin_attachment 	(49, 322)
-					terminal_attachment 	(174, 1415)
-					label      	(object SegLabel @598
-					    Parent_View 	@596
-					    location   	(91, 108)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	-0.196706
-					    height     	42
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @599
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(416, 448)
-				label      	(object ItemLabel
-				    Parent_View 	@599
-				    location   	(175, 412)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	483
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				width      	501
-				height     	97
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$128" @600
-				location   	(499, 589)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69C0590198"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$129" @601
-					Parent_View 	@600
-					location   	(-13, 109)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69C05D01E3"
-					client     	@600
-					supplier   	@599
-					vertices   	(list Points
-					    (499, 589)
-					    (452, 589)
-					    (452, 496))
-					line_style 	3
-					origin_attachment 	(499, 589)
-					terminal_attachment 	(452, 496))
-				    (object RoleView "substitutionGroupAffiliation" @602
-					Parent_View 	@600
-					location   	(-13, 109)
-					label      	(object SegLabel @603
-					    Parent_View 	@602
-					    location   	(811, 585)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	504
-					    justify    	0
-					    label      	"+substitutionGroupAffiliation"
-					    pctDist    	6.520833
-					    height     	5
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69C05D01ED"
-					client     	@600
-					supplier   	@599
-					vertices   	(list Points
-					    (499, 589)
-					    (547, 589)
-					    (547, 496))
-					line_style 	3
-					origin_attachment 	(499, 589)
-					terminal_attachment 	(547, 496)
-					label      	(object SegLabel @604
-					    Parent_View 	@602
-					    location   	(499, 559)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.000000
-					    height     	31
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$122" @605
-				location   	(241, 613)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B68338C0058"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$123" @606
-					Parent_View 	@605
-					location   	(-1343, -219)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B68338C03BF"
-					client     	@605
-					supplier   	@599
-					line_style 	3
-					origin_attachment 	(241, 613)
-					terminal_attachment 	(241, 496))
-				    (object RoleView "typeDefinition" @607
-					Parent_View 	@605
-					location   	(-1343, -219)
-					label      	(object SegLabel @608
-					    Parent_View 	@607
-					    location   	(408, 694)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+typeDefinition"
-					    pctDist    	0.686441
-					    height     	167
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B68338C03C0"
-					client     	@605
-					supplier   	@545
-					line_style 	3
-					origin_attachment 	(241, 613)
-					terminal_attachment 	(241, 731)
-					label      	(object SegLabel @609
-					    Parent_View 	@607
-					    location   	(202, 685)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.610169
-					    height     	39
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$124" @610
-				location   	(837, 460)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6833EF0160"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$125" @611
-					Parent_View 	@610
-					location   	(-1819, -68)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6833F00298"
-					client     	@610
-					supplier   	@599
-					line_style 	3
-					origin_attachment 	(837, 460)
-					terminal_attachment 	(666, 460))
-				    (object RoleView "identityConstraintDefinitions" @612
-					Parent_View 	@610
-					location   	(-1819, -68)
-					label      	(object SegLabel @613
-					    Parent_View 	@612
-					    location   	(880, 528)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	528
-					    justify    	0
-					    label      	"+identityConstraintDefinitions"
-					    pctDist    	0.251462
-					    height     	68
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6833F00299"
-					client     	@610
-					supplier   	@551
-					line_style 	3
-					origin_attachment 	(837, 460)
-					terminal_attachment 	(1008, 460)
-					label      	(object SegLabel @614
-					    Parent_View 	@612
-					    location   	(859, 407)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.130435
-					    height     	54
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$176" @615
-				location   	(541, 246)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B66EE8D01BF"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$177" @616
-					Parent_View 	@615
-					location   	(-1123, -186)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EE8E0198"
-					client     	@615
-					supplier   	@567
-					line_style 	3
-					origin_attachment 	(541, 246)
-					terminal_attachment 	(1013, 246))
-				    (object RoleView "elementDeclarations" @617
-					Parent_View 	@615
-					location   	(-1123, -186)
-					label      	(object SegLabel @618
-					    Parent_View 	@617
-					    location   	(443, 335)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+elementDeclarations"
-					    pctDist    	0.209302
-					    height     	89
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EE8E0199"
-					client     	@615
-					supplier   	@599
-					vertices   	(list Points
-					    (541, 246)
-					    (224, 246)
-					    (224, 400))
-					line_style 	3
-					origin_attachment 	(541, 246)
-					terminal_attachment 	(224, 400)
-					label      	(object SegLabel @619
-					    Parent_View 	@617
-					    location   	(186, 335)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.864693
-					    height     	39
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$130" @620
-				location   	(353, 621)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C42DBDD0297"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$131" @621
-					Parent_View 	@620
-					location   	(-63, 173)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C42DBE0011E"
-					client     	@620
-					supplier   	@599
-					vertices   	(list Points
-					    (353, 621)
-					    (306, 621)
-					    (306, 496))
-					line_style 	3
-					origin_attachment 	(353, 621)
-					terminal_attachment 	(306, 496))
-				    (object RoleView "substitutionGroup" @622
-					Parent_View 	@620
-					location   	(-63, 173)
-					label      	(object SegLabel @623
-					    Parent_View 	@622
-					    location   	(579, 636)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+substitutionGroup"
-					    pctDist    	4.808511
-					    height     	15
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C42DBE00128"
-					client     	@620
-					supplier   	@599
-					vertices   	(list Points
-					    (353, 621)
-					    (400, 621)
-					    (400, 496))
-					line_style 	3
-					origin_attachment 	(353, 621)
-					terminal_attachment 	(400, 496)
-					label      	(object SegLabel @624
-					    Parent_View 	@622
-					    location   	(350, 583)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	-0.069767
-					    height     	39
-					    orientation 	0))))))
-		    (object ClassDiagram "3. Component Attributes  (Part 1 : Structures)"
-			quid       	"3B69E78602C5"
-			title      	"3. Component Attributes  (Part 1 : Structures)"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDNamedComponent" @625
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 128)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@625
-				    location   	(46, 49)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	516
-				    justify    	0
-				    label      	"XSDNamedComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846D303A4"
-				compartment 	(object Compartment
-				    Parent_View 	@625
-				    location   	(46, 115)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	482
-				    compartmentItems 	(list Compartment
-					"+ name : String"
-					"+ targetNamespace : String"))
-				width      	534
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @626
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(288, 1648)
-				label      	(object ItemLabel
-				    Parent_View 	@626
-				    location   	(41, 1567)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	494
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	512
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @627
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2368, 1680)
-				label      	(object ItemLabel
-				    Parent_View 	@627
-				    location   	(1781, 1524)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1174
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				compartment 	(object Compartment
-				    Parent_View 	@627
-				    location   	(1781, 1584)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	5
-				    max_width  	1139
-				    compartmentItems 	(list Compartment
-					"+ derivationMethod : XSDDerivationMethod = restriction"
-					"<<0..*>> + final : XSDComplexFinal"
-					"+ abstract : boolean"
-					"+ contentTypeCategory : XSDContentTypeCategory"
-					"<<0..*>> + prohibitedSubstitutions : XSDProhibitedSubstitutions"))
-				width      	1192
-				height     	336
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @628
-				location   	(463, 362)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@625
-				vertices   	(list Points
-				    (463, 362)
-				    (463, 221)))
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @629
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1408, 1600)
-				label      	(object ItemLabel
-				    Parent_View 	@629
-				    location   	(1094, 1519)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	628
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				compartment 	(object Compartment
-				    Parent_View 	@629
-				    location   	(1094, 1579)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	592
-				    compartmentItems 	(list Compartment
-					"+ variety : XSDVariety"
-					"<<0..*>> + final : XSDSimpleFinal"))
-				width      	646
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUse" @630
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(912, 144)
-				label      	(object ItemLabel
-				    Parent_View 	@630
-				    location   	(647, 38)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	530
-				    justify    	0
-				    label      	"XSDAttributeUse")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B68354601A8"
-				compartment 	(object Compartment
-				    Parent_View 	@630
-				    location   	(647, 98)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	502
-				    compartmentItems 	(list Compartment
-					"+ required : boolean"
-					"+ value : Value"
-					"+ constraint : XSDConstraint"))
-				width      	548
-				height     	236
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @631
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(688, 1936)
-				label      	(object ItemLabel
-				    Parent_View 	@631
-				    location   	(45, 1830)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1286
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				compartment 	(object Compartment
-				    Parent_View 	@631
-				    location   	(45, 1890)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	1260
-				    compartmentItems 	(list Compartment
-					"+ namespaceConstraintCategory : XSDNamespaceConstraintCategory"
-					"<<0..*>> + namespaceConstraint : String"
-					"+ processContents : XSDProcessContents"))
-				width      	1304
-				height     	236
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroup" @632
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(336, 1440)
-				label      	(object ItemLabel
-				    Parent_View 	@632
-				    location   	(47, 1384)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	578
-				    justify    	0
-				    label      	"XSDModelGroup")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6834E00291"
-				width      	596
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDFeature" @633
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 512)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@633
-				    location   	(36, 433)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	536
-				    justify    	0
-				    label      	"XSDFeature")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B537026C"
-				compartment 	(object Compartment
-				    Parent_View 	@633
-				    location   	(36, 499)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	506
-				    compartmentItems 	(list Compartment
-					"+ value : Value"
-					"+ constraint : XSDConstraint"))
-				width      	554
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @634
-				location   	(294, 697)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@633
-				vertices   	(list Points
-				    (294, 697)
-				    (294, 605)))
-			    (object ClassView "Class" "Logical View::xsd::XSDXPathDefinition" @635
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2256, 128)
-				label      	(object ItemLabel
-				    Parent_View 	@635
-				    location   	(1995, 47)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	522
-				    justify    	0
-				    label      	"XSDXPathDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6D83BB0355"
-				width      	540
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefinableComponent" @636
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2688, 512)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@636
-				    location   	(2418, 462)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	540
-				    justify    	0
-				    label      	"XSDRedefinableComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B7FCA8B020B"
-				width      	558
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @637
-				location   	(2684, 962)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@636
-				vertices   	(list Points
-				    (2684, 962)
-				    (2684, 576)))
-			    (object ClassView "Class" "Logical View::xsd::XSDCompositor" @638
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 1200)
-				label      	(object ItemLabel
-				    Parent_View 	@638
-				    location   	(45, 1116)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"XSDCompositor")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@638
-				    location   	(45, 1066)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B869B620037"
-				width      	344
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDConstraint" @639
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(800, 528)
-				label      	(object ItemLabel
-				    Parent_View 	@639
-				    location   	(638, 469)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDConstraint")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@639
-				    location   	(638, 419)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B869E2601AE"
-				width      	342
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDDerivationMethod" @640
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2192, 2272)
-				label      	(object ItemLabel
-				    Parent_View 	@640
-				    location   	(1980, 2213)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	424
-				    justify    	0
-				    label      	"XSDDerivationMethod")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@640
-				    location   	(1980, 2163)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	424
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B86A0B000CE"
-				width      	442
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDIdentityConstraintCategory" @641
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1584, 176)
-				label      	(object ItemLabel
-				    Parent_View 	@641
-				    location   	(1281, 88)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	607
-				    justify    	0
-				    label      	"XSDIdentityConstraintCategory")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@641
-				    location   	(1281, 38)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	607
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B86A1E00272"
-				width      	625
-				height     	300
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDContentTypeCategory" @642
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2704, 2224)
-				label      	(object ItemLabel
-				    Parent_View 	@642
-				    location   	(2456, 2115)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	496
-				    justify    	0
-				    label      	"XSDContentTypeCategory")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@642
-				    location   	(2456, 2065)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	496
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B86A79F03A2"
-				width      	514
-				height     	342
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDVariety" @643
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(880, 1600)
-				label      	(object ItemLabel
-				    Parent_View 	@643
-				    location   	(708, 1516)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	344
-				    justify    	0
-				    label      	"XSDVariety")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@643
-				    location   	(708, 1466)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	344
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B8FF7730249"
-				width      	362
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDProcessContents" @644
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(976, 2240)
-				label      	(object ItemLabel
-				    Parent_View 	@644
-				    location   	(766, 2156)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	420
-				    justify    	0
-				    label      	"XSDProcessContents")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@644
-				    location   	(766, 2106)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	420
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B8FF8C70284"
-				width      	438
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDXPathVariety" @645
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2768, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@645
-				    location   	(2587, 97)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	363
-				    justify    	0
-				    label      	"XSDXPathVariety")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@645
-				    location   	(2587, 47)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	363
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B8FFB89033A"
-				width      	381
-				height     	250
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleFinal" @646
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1552, 1872)
-				label      	(object ItemLabel
-				    Parent_View 	@646
-				    location   	(1389, 1788)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"XSDSimpleFinal")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@646
-				    location   	(1389, 1738)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C25D0295"
-				compartment 	(object Compartment
-				    Parent_View 	@646
-				    location   	(1389, 1848)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	199
-				    compartmentItems 	(list Compartment
-					"+ list"
-					"+ restriction"
-					"+ union"))
-				width      	344
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexFinal" @647
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1968, 2000)
-				label      	(object ItemLabel
-				    Parent_View 	@647
-				    location   	(1786, 1941)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	364
-				    justify    	0
-				    label      	"XSDComplexFinal")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@647
-				    location   	(1786, 1891)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	364
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C2CA01CB"
-				compartment 	(object Compartment
-				    Parent_View 	@647
-				    location   	(1786, 2001)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	202
-				    compartmentItems 	(list Compartment
-					"+ extension"
-					"+ restriction"))
-				width      	382
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSubstitutionGroupExclusions" @648
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(800, 1184)
-				label      	(object ItemLabel
-				    Parent_View 	@648
-				    location   	(485, 1125)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	630
-				    justify    	0
-				    label      	"XSDSubstitutionGroupExclusions")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@648
-				    location   	(485, 1075)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	630
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C59100AE"
-				width      	648
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDDisallowedSubstitutions" @649
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1440, 1200)
-				label      	(object ItemLabel
-				    Parent_View 	@649
-				    location   	(1171, 1116)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	538
-				    justify    	0
-				    label      	"XSDDisallowedSubstitutions")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@649
-				    location   	(1171, 1066)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	538
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C5A403DF"
-				compartment 	(object Compartment
-				    Parent_View 	@649
-				    location   	(1171, 1176)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	236
-				    compartmentItems 	(list Compartment
-					"+ substitution"
-					"+ extension"
-					"+ restriction"))
-				width      	556
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDProhibitedSubstitutions" @650
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1664, 2272)
-				label      	(object ItemLabel
-				    Parent_View 	@650
-				    location   	(1398, 2213)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	532
-				    justify    	0
-				    label      	"XSDProhibitedSubstitutions")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@650
-				    location   	(1398, 2163)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	532
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C5BE0272"
-				compartment 	(object Compartment
-				    Parent_View 	@650
-				    location   	(1398, 2273)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	202
-				    compartmentItems 	(list Compartment
-					"+ extension"
-					"+ restriction"))
-				width      	550
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDNamespaceConstraintCategory" @651
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(384, 2240)
-				label      	(object ItemLabel
-				    Parent_View 	@651
-				    location   	(45, 2154)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	678
-				    justify    	0
-				    label      	"XSDNamespaceConstraintCategory")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@651
-				    location   	(45, 2104)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	678
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C5EA0023"
-				width      	696
-				height     	296
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @652
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1264, 880)
-				label      	(object ItemLabel
-				    Parent_View 	@652
-				    location   	(571, 749)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1386
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				compartment 	(object Compartment
-				    Parent_View 	@652
-				    location   	(571, 809)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	1357
-				    compartmentItems 	(list Compartment
-					"+ nillable : boolean"
-					"<<0..*>> + disallowedSubstitutions : XSDDisallowedSubstitutions"
-					"<<0..*>> + substitutionGroupExclusions : XSDSubstitutionGroupExclusions"
-					"+ abstract : boolean"))
-				width      	1404
-				height     	286
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @653
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69EDEE01BF"
-				client     	@652
-				supplier   	@633
-				line_style 	3
-				origin_attachment 	(681, 737)
-				terminal_attachment 	(681, 697)
-				drawSupplier 	@634)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @654
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(272, 864)
-				label      	(object ItemLabel
-				    Parent_View 	@654
-				    location   	(35, 812)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	474
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	492
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @655
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2688, 1152)
-				label      	(object ItemLabel
-				    Parent_View 	@655
-				    location   	(2420, 1100)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	536
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	554
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @656
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAC800D2"
-				client     	@655
-				supplier   	@636
-				line_style 	3
-				origin_attachment 	(2862, 1088)
-				terminal_attachment 	(2862, 962)
-				drawSupplier 	@637)
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @657
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2352, 1312)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@657
-				    location   	(2168, 1263)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	368
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	386
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @658
-				location   	(2375, 1465)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@657
-				vertices   	(list Points
-				    (2375, 1465)
-				    (2375, 1375)))
-			    (object InheritView "" @659
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAB1004D"
-				client     	@657
-				supplier   	@636
-				line_style 	3
-				origin_attachment 	(2368, 1249)
-				terminal_attachment 	(2368, 962)
-				drawSupplier 	@637)
-			    (object InheritView "" @660
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0D01901F1"
-				client     	@627
-				supplier   	@657
-				line_style 	3
-				origin_attachment 	(2818, 1512)
-				terminal_attachment 	(2818, 1465)
-				drawSupplier 	@658)
-			    (object InheritView "" @661
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A1302A2"
-				client     	@629
-				supplier   	@657
-				line_style 	3
-				origin_attachment 	(1406, 1507)
-				terminal_attachment 	(1406, 1465)
-				drawSupplier 	@658)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @662
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2064, 1152)
-				label      	(object ItemLabel
-				    Parent_View 	@662
-				    location   	(1818, 1101)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	492
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				width      	510
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @663
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAC40090"
-				client     	@662
-				supplier   	@636
-				line_style 	3
-				origin_attachment 	(2115, 1089)
-				terminal_attachment 	(2115, 962)
-				drawSupplier 	@637)
-			    (object ClassView "Class" "Logical View::xsd::XSDIdentityConstraintDefinition" @664
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1600, 528)
-				label      	(object ItemLabel
-				    Parent_View 	@664
-				    location   	(1034, 468)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1132
-				    justify    	0
-				    label      	"XSDIdentityConstraintDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B2603A2"
-				width      	1150
-				height     	144
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @665
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684AA30242"
-				client     	@664
-				supplier   	@625
-				line_style 	3
-				origin_attachment 	(1568, 456)
-				terminal_attachment 	(1568, 362)
-				drawSupplier 	@628)
-			    (object ClassView "Class" "Logical View::xsd::XSDNotationDeclaration" @666
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2320, 784)
-				label      	(object ItemLabel
-				    Parent_View 	@666
-				    location   	(2078, 703)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	484
-				    justify    	0
-				    label      	"XSDNotationDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDAA021C"
-				width      	502
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @667
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(176, 320)
-				label      	(object ItemLabel
-				    Parent_View 	@667
-				    location   	(43, 268)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	266
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	284
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @668
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B68494302F1"
-				client     	@666
-				supplier   	@625
-				line_style 	3
-				origin_attachment 	(2290, 691)
-				terminal_attachment 	(2290, 362)
-				drawSupplier 	@628)
-			    (object InheritView "" @669
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69B7DC0193"
-				client     	@654
-				supplier   	@633
-				line_style 	3
-				origin_attachment 	(141, 800)
-				terminal_attachment 	(141, 697)
-				drawSupplier 	@634)
-			    (object InheritView "" @670
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A2C0307"
-				client     	@633
-				supplier   	@625
-				line_style 	3
-				origin_attachment 	(372, 419)
-				terminal_attachment 	(372, 362)
-				drawSupplier 	@628)
-			    (object InheritView "" @671
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A26036D"
-				client     	@636
-				supplier   	@625
-				line_style 	3
-				origin_attachment 	(2687, 448)
-				terminal_attachment 	(2687, 362)
-				drawSupplier 	@628)))
-		    (object ClassDiagram "4. Component Hierarchy, Relations and Attributes (Part 2: Datatypes)"
-			quid       	"3B6C3265005F"
-			title      	"4. Component Hierarchy, Relations and Attributes (Part 2: Datatypes)"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDFixedFacet" @672
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(192, 896)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@672
-				    location   	(32, 842)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	320
-				    justify    	0
-				    label      	"XSDFixedFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C699E00C1"
-				width      	338
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRepeatableFacet" @673
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(720, 896)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@673
-				    location   	(504, 847)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	432
-				    justify    	0
-				    label      	"XSDRepeatableFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C6AA6031A"
-				width      	450
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDEnumerationFacet" @674
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(496, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@674
-				    location   	(266, 1112)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	460
-				    justify    	0
-				    label      	"XSDEnumerationFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C6ACE0141"
-				width      	478
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDPatternFacet" @675
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1008, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@675
-				    location   	(777, 1112)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	462
-				    justify    	0
-				    label      	"XSDPatternFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C6ADB026C"
-				width      	480
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @676
-				location   	(718, 1049)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@673
-				vertices   	(list Points
-				    (718, 1049)
-				    (718, 959)))
-			    (object ClassView "Class" "Logical View::xsd::XSDOrderedFacet" @677
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2000, 928)
-				label      	(object ItemLabel
-				    Parent_View 	@677
-				    location   	(1799, 872)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	402
-				    justify    	0
-				    label      	"XSDOrderedFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C74DD0248"
-				width      	420
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDBoundedFacet" @678
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1568, 928)
-				label      	(object ItemLabel
-				    Parent_View 	@678
-				    location   	(1383, 872)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	370
-				    justify    	0
-				    label      	"XSDBoundedFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C751D0344"
-				width      	388
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDCardinalityFacet" @679
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2032, 1104)
-				label      	(object ItemLabel
-				    Parent_View 	@679
-				    location   	(1807, 1048)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	450
-				    justify    	0
-				    label      	"XSDCardinalityFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C755D03D2"
-				width      	468
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDNumericFacet" @680
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1504, 1104)
-				label      	(object ItemLabel
-				    Parent_View 	@680
-				    location   	(1319, 1049)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	370
-				    justify    	0
-				    label      	"XSDNumericFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C75950206"
-				width      	388
-				height     	134
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDLengthFacet" @681
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(656, 1376)
-				label      	(object ItemLabel
-				    Parent_View 	@681
-				    location   	(491, 1320)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	330
-				    justify    	0
-				    label      	"XSDLengthFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C776200E7"
-				width      	348
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinLengthFacet" @682
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(608, 1552)
-				label      	(object ItemLabel
-				    Parent_View 	@682
-				    location   	(405, 1497)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	406
-				    justify    	0
-				    label      	"XSDMinLengthFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C778C0065"
-				width      	424
-				height     	134
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @683
-				location   	(144, 1262)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@672
-				vertices   	(list Points
-				    (144, 1262)
-				    (144, 964)))
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxLengthFacet" @684
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1216, 1552)
-				label      	(object ItemLabel
-				    Parent_View 	@684
-				    location   	(1007, 1497)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	418
-				    justify    	0
-				    label      	"XSDMaxLengthFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C77C70146"
-				width      	436
-				height     	134
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDWhiteSpaceFacet" @685
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1120, 1376)
-				label      	(object ItemLabel
-				    Parent_View 	@685
-				    location   	(880, 1320)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	480
-				    justify    	0
-				    label      	"XSDWhiteSpaceFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C784601B7"
-				width      	498
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxInclusiveFacet" @686
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1312, 1728)
-				label      	(object ItemLabel
-				    Parent_View 	@686
-				    location   	(1090, 1676)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	444
-				    justify    	0
-				    label      	"XSDMaxInclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C787D00DA"
-				width      	462
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxExclusiveFacet" @687
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1424, 1904)
-				label      	(object ItemLabel
-				    Parent_View 	@687
-				    location   	(1193, 1852)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	462
-				    justify    	0
-				    label      	"XSDMaxExclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C789600C2"
-				width      	480
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinInclusiveFacet" @688
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(496, 1728)
-				label      	(object ItemLabel
-				    Parent_View 	@688
-				    location   	(282, 1676)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	428
-				    justify    	0
-				    label      	"XSDMinInclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C788702C9"
-				width      	446
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinExclusiveFacet" @689
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(352, 1904)
-				label      	(object ItemLabel
-				    Parent_View 	@689
-				    location   	(124, 1852)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	456
-				    justify    	0
-				    label      	"XSDMinExclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C792D000A"
-				width      	474
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDTotalDigitsFacet" @690
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 2112)
-				label      	(object ItemLabel
-				    Parent_View 	@690
-				    location   	(52, 2056)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	408
-				    justify    	0
-				    label      	"XSDTotalDigitsFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C79A0020E"
-				width      	426
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDFractionDigitsFacet" @691
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1552, 2112)
-				label      	(object ItemLabel
-				    Parent_View 	@691
-				    location   	(1318, 2056)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"XSDFractionDigitsFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C79BE02EE"
-				width      	486
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @692
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C9D03C7"
-				client     	@674
-				supplier   	@673
-				line_style 	3
-				origin_attachment 	(394, 1100)
-				terminal_attachment 	(394, 1049)
-				drawSupplier 	@676)
-			    (object InheritView "" @693
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C78620045"
-				client     	@685
-				supplier   	@672
-				line_style 	3
-				origin_attachment 	(1119, 1308)
-				terminal_attachment 	(1119, 1262)
-				drawSupplier 	@683)
-			    (object ClassView "Class" "Logical View::xsd::XSDComponent" @694
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(336, 160)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@694
-				    location   	(174, 119)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846E90029"
-				width      	342
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @695
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6CA5038D"
-				client     	@675
-				supplier   	@673
-				line_style 	3
-				origin_attachment 	(1044, 1100)
-				terminal_attachment 	(1044, 1049)
-				drawSupplier 	@676)
-			    (object InheritView "" @696
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C778002DF"
-				client     	@681
-				supplier   	@672
-				line_style 	3
-				origin_attachment 	(663, 1308)
-				terminal_attachment 	(663, 1262)
-				drawSupplier 	@683)
-			    (object ClassView "Class" "Logical View::xsd::XSDOrdered" @697
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2048, 1408)
-				label      	(object ItemLabel
-				    Parent_View 	@697
-				    location   	(1835, 1324)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	426
-				    justify    	0
-				    label      	"XSDOrdered")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@697
-				    location   	(1835, 1274)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	426
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3BC7715202E4"
-				width      	444
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDCardinality" @698
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2048, 1728)
-				label      	(object ItemLabel
-				    Parent_View 	@698
-				    location   	(1835, 1669)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	426
-				    justify    	0
-				    label      	"XSDCardinality")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@698
-				    location   	(1835, 1619)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	426
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3BC7715D009B"
-				width      	444
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDWhiteSpace" @699
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2064, 2032)
-				label      	(object ItemLabel
-				    Parent_View 	@699
-				    location   	(1861, 1951)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	406
-				    justify    	0
-				    label      	"XSDWhiteSpace")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@699
-				    location   	(1861, 1901)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	406
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3BEED0F60342"
-				width      	424
-				height     	287
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::Value" @700
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(880, 2096)
-				label      	(object ItemLabel
-				    Parent_View 	@700
-				    location   	(571, 2062)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	618
-				    justify    	0
-				    label      	"Value")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@700
-				    location   	(571, 2012)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	618
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	14671839
-				quidu      	"3C040B5B031F"
-				width      	636
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @701
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B610337"
-				client     	@690
-				supplier   	@672
-				line_style 	3
-				origin_attachment 	(75, 2044)
-				terminal_attachment 	(75, 1262)
-				drawSupplier 	@683)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinFacet" @702
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 1376)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@702
-				    location   	(113, 1322)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	286
-				    justify    	0
-				    label      	"XSDMinFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C0A1CDE037C"
-				compartment 	(object Compartment
-				    Parent_View 	@702
-				    location   	(113, 1388)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	254
-				    compartmentItems 	(list Compartment
-					"+ value : Value"))
-				width      	304
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxFacet" @703
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1584, 1376)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@703
-				    location   	(1440, 1322)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	288
-				    justify    	0
-				    label      	"XSDMaxFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C0A1CEB010E"
-				compartment 	(object Compartment
-				    Parent_View 	@703
-				    location   	(1440, 1388)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	258
-				    compartmentItems 	(list Compartment
-					"+ value : Value"))
-				width      	306
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @704
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C0A1D240098"
-				client     	@702
-				supplier   	@672
-				line_style 	3
-				origin_attachment 	(235, 1308)
-				terminal_attachment 	(235, 1262)
-				drawSupplier 	@683)
-			    (object InheritView "" @705
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C0A1D3103AD"
-				client     	@703
-				supplier   	@672
-				line_style 	3
-				origin_attachment 	(1581, 1308)
-				terminal_attachment 	(1581, 1262)
-				drawSupplier 	@683)
-			    (object InheritView "" @706
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B520353"
-				client     	@688
-				supplier   	@702
-				line_style 	3
-				origin_attachment 	(285, 1664)
-				terminal_attachment 	(285, 1444))
-			    (object InheritView "" @707
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B8303B8"
-				client     	@686
-				supplier   	@703
-				line_style 	3
-				origin_attachment 	(1500, 1664)
-				terminal_attachment 	(1500, 1444))
-			    (object InheritView "" @708
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B8E0309"
-				client     	@687
-				supplier   	@703
-				line_style 	3
-				origin_attachment 	(1622, 1840)
-				terminal_attachment 	(1622, 1444))
-			    (object InheritView "" @709
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C77C400C0"
-				client     	@682
-				supplier   	@672
-				line_style 	3
-				origin_attachment 	(447, 1485)
-				terminal_attachment 	(447, 1262)
-				drawSupplier 	@683)
-			    (object InheritView "" @710
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B7D00FC"
-				client     	@684
-				supplier   	@672
-				line_style 	3
-				origin_attachment 	(1397, 1485)
-				terminal_attachment 	(1397, 1262)
-				drawSupplier 	@683)
-			    (object InheritView "" @711
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B990016"
-				client     	@691
-				supplier   	@672
-				line_style 	3
-				origin_attachment 	(1775, 2044)
-				terminal_attachment 	(1775, 1262)
-				drawSupplier 	@683)
-			    (object ClassView "Class" "Logical View::xsd::XSDFacet" @712
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(368, 368)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@712
-				    location   	(174, 320)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	388
-				    justify    	0
-				    label      	"XSDFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C359403D2"
-				width      	406
-				height     	125
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @713
-				location   	(366, 522)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@712
-				vertices   	(list Points
-				    (366, 522)
-				    (366, 430)))
-			    (object ClassView "Class" "Logical View::xsd::XSDConstrainingFacet" @714
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 624)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@714
-				    location   	(34, 575)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	444
-				    justify    	0
-				    label      	"XSDConstrainingFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C6B340093"
-				width      	462
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @715
-				location   	(272, 781)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@714
-				vertices   	(list Points
-				    (272, 781)
-				    (272, 687)))
-			    (object InheritView "" @716
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C8F002E"
-				client     	@673
-				supplier   	@714
-				line_style 	3
-				origin_attachment 	(594, 833)
-				terminal_attachment 	(594, 781)
-				drawSupplier 	@715)
-			    (object ClassView "Class" "Logical View::xsd::XSDFundamentalFacet" @717
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(752, 624)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@717
-				    location   	(526, 575)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	452
-				    justify    	0
-				    label      	"XSDFundamentalFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C69E801D6"
-				width      	470
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @718
-				location   	(768, 789)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@717
-				vertices   	(list Points
-				    (768, 789)
-				    (768, 687)))
-			    (object InheritView "" @719
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7659012C"
-				client     	@677
-				supplier   	@717
-				line_style 	3
-				origin_attachment 	(2050, 860)
-				terminal_attachment 	(2050, 789)
-				drawSupplier 	@718)
-			    (object InheritView "" @720
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C763C0224"
-				client     	@678
-				supplier   	@717
-				line_style 	3
-				origin_attachment 	(1525, 860)
-				terminal_attachment 	(1525, 789)
-				drawSupplier 	@718)
-			    (object InheritView "" @721
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C764F0131"
-				client     	@679
-				supplier   	@717
-				line_style 	3
-				origin_attachment 	(2237, 1036)
-				terminal_attachment 	(2237, 789)
-				drawSupplier 	@718)
-			    (object InheritView "" @722
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C76420074"
-				client     	@680
-				supplier   	@717
-				line_style 	3
-				origin_attachment 	(1328, 1037)
-				terminal_attachment 	(1328, 789)
-				drawSupplier 	@718)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @723
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1456, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@723
-				    location   	(1137, 47)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	638
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				compartment 	(object Compartment
-				    Parent_View 	@723
-				    location   	(1137, 107)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	598
-				    compartmentItems 	(list Compartment
-					"+ variety : XSDVariety"
-					"<<0..*>> + final : XSDSimpleFinal"))
-				width      	656
-				height     	250
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$134" @724
-				location   	(775, 178)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D597102EA"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$135" @725
-					Parent_View 	@724
-					location   	(-1209, -46)
-					label      	(object SegLabel @726
-					    Parent_View 	@725
-					    location   	(509, 235)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D59750119"
-					client     	@724
-					supplier   	@712
-					vertices   	(list Points
-					    (775, 178)
-					    (550, 178)
-					    (550, 306))
-					line_style 	3
-					origin_attachment 	(775, 178)
-					terminal_attachment 	(550, 306))
-				    (object RoleView "simpleTypeDefinition" @727
-					Parent_View 	@724
-					location   	(-1209, -46)
-					label      	(object SegLabel @728
-					    Parent_View 	@727
-					    location   	(875, 136)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+simpleTypeDefinition"
-					    pctDist    	0.283133
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D59750105"
-					client     	@724
-					supplier   	@723
-					line_style 	3
-					origin_attachment 	(775, 178)
-					terminal_attachment 	(1128, 178)
-					label      	(object SegLabel @729
-					    Parent_View 	@727
-					    location   	(1061, 215)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.812500
-					    height     	37
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$196" @730
-				location   	(369, 72)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BC8AE0203A8"
-				roleview_list 	(list RoleViews
-				    (object RoleView "facets" @731
-					Parent_View 	@730
-					location   	(-1615, -152)
-					label      	(object SegLabel @732
-					    Parent_View 	@731
-					    location   	(187, 496)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	132
-					    justify    	0
-					    label      	"+facets"
-					    pctDist    	0.913863
-					    height     	87
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BC8AE060065"
-					client     	@730
-					supplier   	@714
-					vertices   	(list Points
-					    (369, 72)
-					    (100, 72)
-					    (100, 561))
-					line_style 	3
-					origin_attachment 	(369, 72)
-					terminal_attachment 	(100, 561)
-					label      	(object SegLabel @733
-					    Parent_View 	@731
-					    location   	(60, 498)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.917900
-					    height     	41
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$197" @734
-					Parent_View 	@730
-					location   	(-1615, -152)
-					label      	(object SegLabel @735
-					    Parent_View 	@734
-					    location   	(976, 31)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BC8AE060051"
-					client     	@730
-					supplier   	@723
-					line_style 	3
-					origin_attachment 	(369, 72)
-					terminal_attachment 	(1128, 72))))
-			    (object AssociationViewNew "$UNNAMED$238" @736
-				location   	(1538, 508)
-				label      	(object SegLabel @737
-				    Parent_View 	@736
-				    location   	(1538, 449)
-				    font       	(object Font
-					italics    	TRUE)
-				    hidden     	TRUE
-				    anchor     	1
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	60
-				    justify    	0
-				    label      	""
-				    pctDist    	0.500000
-				    height     	60
-				    orientation 	0)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C276DA000DE"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$239" @738
-					Parent_View 	@736
-					location   	(-446, 284)
-					label      	(object SegLabel @739
-					    Parent_View 	@738
-					    location   	(1446, 340)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C276DA000DF"
-					client     	@736
-					supplier   	@723
-					vertices   	(list Points
-					    (1538, 508)
-					    (1487, 508)
-					    (1487, 285))
-					line_style 	3
-					origin_attachment 	(1538, 508)
-					terminal_attachment 	(1487, 285))
-				    (object RoleView "itemTypeDefinition" @740
-					Parent_View 	@736
-					location   	(-446, 284)
-					label      	(object SegLabel @741
-					    Parent_View 	@740
-					    location   	(1423, 577)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	360
-					    justify    	0
-					    label      	"+itemTypeDefinition"
-					    pctDist    	-2.211539
-					    height     	69
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C276DA000E0"
-					client     	@736
-					supplier   	@723
-					vertices   	(list Points
-					    (1538, 508)
-					    (1590, 508)
-					    (1590, 285))
-					line_style 	3
-					origin_attachment 	(1538, 508)
-					terminal_attachment 	(1590, 285)
-					label      	(object SegLabel @742
-					    Parent_View 	@740
-					    location   	(1539, 468)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.003984
-					    height     	41
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$198" @743
-				location   	(1729, 574)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C34B70208"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$199" @744
-					Parent_View 	@743
-					location   	(-255, 350)
-					label      	(object SegLabel @745
-					    Parent_View 	@744
-					    location   	(1637, 353)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6C34BE0258"
-					client     	@743
-					supplier   	@723
-					vertices   	(list Points
-					    (1729, 574)
-					    (1678, 574)
-					    (1678, 285))
-					line_style 	3
-					origin_attachment 	(1729, 574)
-					terminal_attachment 	(1678, 285))
-				    (object RoleView "memberTypeDefinitions" @746
-					Parent_View 	@743
-					location   	(-255, 350)
-					label      	(object SegLabel @747
-					    Parent_View 	@746
-					    location   	(1559, 654)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	444
-					    justify    	0
-					    label      	"+memberTypeDefinitions"
-					    pctDist    	-3.269231
-					    height     	80
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6C34BE0259"
-					client     	@743
-					supplier   	@723
-					vertices   	(list Points
-					    (1729, 574)
-					    (1781, 574)
-					    (1781, 285))
-					line_style 	3
-					origin_attachment 	(1729, 574)
-					terminal_attachment 	(1781, 285)
-					label      	(object SegLabel @748
-					    Parent_View 	@746
-					    location   	(1730, 520)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.312121
-					    height     	52
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$200" @749
-				location   	(748, 269)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C363201DB"
-				roleview_list 	(list RoleViews
-				    (object RoleView "fundamentalFacets" @750
-					Parent_View 	@749
-					location   	(-1236, 45)
-					label      	(object SegLabel @751
-					    Parent_View 	@750
-					    location   	(873, 312)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+fundamentalFacets"
-					    pctDist    	-1.409091
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6C36350063"
-					client     	@749
-					supplier   	@717
-					vertices   	(list Points
-					    (748, 269)
-					    (659, 269)
-					    (659, 561))
-					line_style 	3
-					origin_attachment 	(748, 269)
-					terminal_attachment 	(659, 561)
-					label      	(object SegLabel @752
-					    Parent_View 	@750
-					    location   	(728, 385)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..*"
-					    pctDist    	0.538028
-					    height     	69
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$201" @753
-					Parent_View 	@749
-					location   	(-1236, 45)
-					label      	(object SegLabel @754
-					    Parent_View 	@753
-					    location   	(1052, 228)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6C36350059"
-					client     	@749
-					supplier   	@723
-					line_style 	3
-					origin_attachment 	(748, 269)
-					terminal_attachment 	(1128, 269))))
-			    (object AssociationViewNew "$UNNAMED$202" @755
-				location   	(1175, 396)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D35AB0273"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$203" @756
-					Parent_View 	@755
-					location   	(-809, 172)
-					label      	(object SegLabel @757
-					    Parent_View 	@756
-					    location   	(1094, 316)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D35B20291"
-					client     	@755
-					supplier   	@723
-					vertices   	(list Points
-					    (1175, 396)
-					    (1135, 396)
-					    (1135, 285))
-					line_style 	3
-					origin_attachment 	(1175, 396)
-					terminal_attachment 	(1135, 285))
-				    (object RoleView "baseTypeDefinition" @758
-					Parent_View 	@755
-					location   	(-809, 172)
-					label      	(object SegLabel @759
-					    Parent_View 	@758
-					    location   	(1074, 443)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+baseTypeDefinition"
-					    pctDist    	-2.533333
-					    height     	47
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D35B202A5"
-					client     	@755
-					supplier   	@723
-					vertices   	(list Points
-					    (1175, 396)
-					    (1215, 396)
-					    (1215, 285))
-					line_style 	3
-					origin_attachment 	(1175, 396)
-					terminal_attachment 	(1215, 285)
-					label      	(object SegLabel @760
-					    Parent_View 	@758
-					    location   	(1172, 359)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.096154
-					    height     	38
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$204" @761
-				location   	(1360, 446)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D5572016C"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$205" @762
-					Parent_View 	@761
-					location   	(-624, 222)
-					label      	(object SegLabel @763
-					    Parent_View 	@762
-					    location   	(1268, 327)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D5575022F"
-					client     	@761
-					supplier   	@723
-					vertices   	(list Points
-					    (1360, 446)
-					    (1309, 446)
-					    (1309, 285))
-					line_style 	3
-					origin_attachment 	(1360, 446)
-					terminal_attachment 	(1309, 285))
-				    (object RoleView "primitiveTypeDefinition" @764
-					Parent_View 	@761
-					location   	(-624, 222)
-					label      	(object SegLabel @765
-					    Parent_View 	@764
-					    location   	(1204, 508)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	432
-					    justify    	0
-					    label      	"+primitiveTypeDefinition"
-					    pctDist    	-3.000000
-					    height     	62
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D55750243"
-					client     	@761
-					supplier   	@723
-					vertices   	(list Points
-					    (1360, 446)
-					    (1412, 446)
-					    (1412, 285))
-					line_style 	3
-					origin_attachment 	(1360, 446)
-					terminal_attachment 	(1412, 285)
-					label      	(object SegLabel @766
-					    Parent_View 	@764
-					    location   	(1373, 409)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.062147
-					    height     	38
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleFinal" @767
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2080, 512)
-				label      	(object ItemLabel
-				    Parent_View 	@767
-				    location   	(1917, 428)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"XSDSimpleFinal")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@767
-				    location   	(1917, 378)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C25D0295"
-				compartment 	(object Compartment
-				    Parent_View 	@767
-				    location   	(1917, 488)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	3
-				    max_width  	202
-				    compartmentItems 	(list Compartment
-					"+ list"
-					"+ restriction"
-					"+ union"))
-				width      	344
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDVariety" @768
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2080, 176)
-				label      	(object ItemLabel
-				    Parent_View 	@768
-				    location   	(1918, 92)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDVariety")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@768
-				    location   	(1918, 42)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B8FF7730249"
-				width      	342
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @769
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C7B0396"
-				client     	@717
-				supplier   	@712
-				line_style 	3
-				origin_attachment 	(591, 561)
-				terminal_attachment 	(591, 522)
-				drawSupplier 	@713)
-			    (object InheritView "" @770
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C800394"
-				client     	@714
-				supplier   	@712
-				line_style 	3
-				origin_attachment 	(272, 561)
-				terminal_attachment 	(272, 522)
-				drawSupplier 	@713)
-			    (object InheritView "" @771
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D25680259"
-				client     	@712
-				supplier   	@694
-				line_style 	3
-				origin_attachment 	(366, 306)
-				terminal_attachment 	(366, 215))
-			    (object InheritView "" @772
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C8801B4"
-				client     	@672
-				supplier   	@714
-				line_style 	3
-				origin_attachment 	(147, 828)
-				terminal_attachment 	(147, 781)
-				drawSupplier 	@715)
-			    (object InheritView "" @773
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B590281"
-				client     	@689
-				supplier   	@702
-				line_style 	3
-				origin_attachment 	(150, 1840)
-				terminal_attachment 	(150, 1444))))
-		    (object ClassDiagram "5. Component Annotations"
-			quid       	"3B69D68D00D2"
-			title      	"5. Component Annotations"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUse" @774
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 80)
-				label      	(object ItemLabel
-				    Parent_View 	@774
-				    location   	(88, 37)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	336
-				    justify    	0
-				    label      	"XSDAttributeUse")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B68354601A8"
-				width      	354
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @775
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 1696)
-				label      	(object ItemLabel
-				    Parent_View 	@775
-				    location   	(82, 1653)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	252
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	270
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @776
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1872, 1504)
-				label      	(object ItemLabel
-				    Parent_View 	@776
-				    location   	(1626, 1461)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	492
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				width      	510
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDConstrainingFacet" @777
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1888, 304)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@777
-				    location   	(1663, 263)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	450
-				    justify    	0
-				    label      	"XSDConstrainingFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C6B340093"
-				width      	468
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDIdentityConstraintDefinition" @778
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(368, 1360)
-				label      	(object ItemLabel
-				    Parent_View 	@778
-				    location   	(74, 1317)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	588
-				    justify    	0
-				    label      	"XSDIdentityConstraintDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B2603A2"
-				width      	606
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDNotationDeclaration" @779
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(320, 704)
-				label      	(object ItemLabel
-				    Parent_View 	@779
-				    location   	(86, 661)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"XSDNotationDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDAA021C"
-				width      	486
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @780
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(320, 1184)
-				label      	(object ItemLabel
-				    Parent_View 	@780
-				    location   	(74, 1141)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	492
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				width      	510
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @781
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(320, 544)
-				label      	(object ItemLabel
-				    Parent_View 	@781
-				    location   	(86, 501)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				width      	486
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @782
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1200, 80)
-				label      	(object ItemLabel
-				    Parent_View 	@782
-				    location   	(1068, 37)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	264
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	282
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @783
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1936, 1216)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@783
-				    location   	(1750, 1175)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	372
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	390
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @784
-				location   	(1994, 1412)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@783
-				vertices   	(list Points
-				    (1994, 1412)
-				    (1994, 1271)))
-			    (object InheritView "" @785
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A1302A2"
-				client     	@776
-				supplier   	@783
-				line_style 	3
-				origin_attachment 	(2084, 1449)
-				terminal_attachment 	(2084, 1412)
-				drawSupplier 	@784)
-			    (object ClassView "Class" "Logical View::xsd::XSDXPathDefinition" @786
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(272, 864)
-				label      	(object ItemLabel
-				    Parent_View 	@786
-				    location   	(80, 821)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	384
-				    justify    	0
-				    label      	"XSDXPathDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6D83BB0355"
-				width      	402
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDFacet" @787
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2000, 80)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@787
-				    location   	(1892, 39)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	216
-				    justify    	0
-				    label      	"XSDFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C359403D2"
-				width      	234
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @788
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(352, 384)
-				label      	(object ItemLabel
-				    Parent_View 	@788
-				    location   	(84, 341)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	536
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	554
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @789
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(320, 224)
-				label      	(object ItemLabel
-				    Parent_View 	@789
-				    location   	(86, 181)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	486
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @790
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1792, 1712)
-				label      	(object ItemLabel
-				    Parent_View 	@790
-				    location   	(1467, 1674)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	651
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				width      	669
-				height     	100
-				annotation 	8)
-			    (object InheritView "" @791
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0D01901F1"
-				client     	@790
-				supplier   	@783
-				line_style 	3
-				origin_attachment 	(1572, 1662)
-				terminal_attachment 	(1572, 1412)
-				drawSupplier 	@784)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroup" @792
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 1024)
-				label      	(object ItemLabel
-				    Parent_View 	@792
-				    location   	(78, 981)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDModelGroup")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6834E00291"
-				width      	342
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDRepeatableFacet" @793
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1904, 560)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@793
-				    location   	(1688, 519)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	432
-				    justify    	0
-				    label      	"XSDRepeatableFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C6AA6031A"
-				width      	450
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @794
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 1536)
-				label      	(object ItemLabel
-				    Parent_View 	@794
-				    location   	(71, 1493)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	274
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				width      	292
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAnnotation" @795
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1232, 944)
-				label      	(object ItemLabel
-				    Parent_View 	@795
-				    location   	(872, 685)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	720
-				    justify    	0
-				    label      	"XSDAnnotation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDC80233"
-				width      	738
-				height     	543
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$140" @796
-				location   	(865, 1359)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB0D0183"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$141" @797
-					Parent_View 	@796
-					location   	(-255, 559)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB0D033C"
-					client     	@796
-					supplier   	@778
-					line_style 	3
-					origin_attachment 	(865, 1359)
-					terminal_attachment 	(671, 1359))
-				    (object RoleView "annotation" @798
-					Parent_View 	@796
-					location   	(-255, 559)
-					label      	(object SegLabel @799
-					    Parent_View 	@798
-					    location   	(798, 1321)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	-1.116667
-					    height     	39
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB0D0346"
-					client     	@796
-					supplier   	@795
-					vertices   	(list Points
-					    (865, 1359)
-					    (925, 1359)
-					    (925, 1215))
-					line_style 	3
-					origin_attachment 	(865, 1359)
-					terminal_attachment 	(925, 1215)
-					label      	(object SegLabel @800
-					    Parent_View 	@798
-					    location   	(987, 1276)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.706422
-					    height     	62
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$164" @801
-				location   	(713, 709)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB0F0212"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$165" @802
-					Parent_View 	@801
-					location   	(-407, -90)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB1000C9"
-					client     	@801
-					supplier   	@779
-					line_style 	3
-					origin_attachment 	(713, 709)
-					terminal_attachment 	(563, 709))
-				    (object RoleView "annotation" @803
-					Parent_View 	@801
-					location   	(-407, -90)
-					label      	(object SegLabel @804
-					    Parent_View 	@803
-					    location   	(727, 667)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.095238
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB1000D3"
-					client     	@801
-					supplier   	@795
-					line_style 	3
-					origin_attachment 	(713, 709)
-					terminal_attachment 	(863, 709)
-					label      	(object SegLabel @805
-					    Parent_View 	@803
-					    location   	(796, 753)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.553571
-					    height     	44
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$158" @806
-				location   	(719, 1193)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB15008A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$159" @807
-					Parent_View 	@806
-					location   	(-401, 393)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB160096"
-					client     	@806
-					supplier   	@780
-					line_style 	3
-					origin_attachment 	(719, 1193)
-					terminal_attachment 	(575, 1193))
-				    (object RoleView "annotation" @808
-					Parent_View 	@806
-					location   	(-401, 393)
-					label      	(object SegLabel @809
-					    Parent_View 	@808
-					    location   	(720, 1147)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.006993
-					    height     	47
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB1600A0"
-					client     	@806
-					supplier   	@795
-					line_style 	3
-					origin_attachment 	(719, 1193)
-					terminal_attachment 	(863, 1193)
-					label      	(object SegLabel @810
-					    Parent_View 	@808
-					    location   	(806, 1240)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.604167
-					    height     	47
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$118" @811
-				location   	(785, 550)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB0A0066"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$119" @812
-					Parent_View 	@811
-					location   	(-335, -250)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB0B023F"
-					client     	@811
-					supplier   	@781
-					line_style 	3
-					origin_attachment 	(785, 550)
-					terminal_attachment 	(563, 550))
-				    (object RoleView "annotation" @813
-					Parent_View 	@811
-					location   	(-335, -250)
-					label      	(object SegLabel @814
-					    Parent_View 	@813
-					    location   	(779, 516)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	-0.070707
-					    height     	35
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB0B0249"
-					client     	@811
-					supplier   	@795
-					vertices   	(list Points
-					    (785, 550)
-					    (884, 550)
-					    (884, 673))
-					line_style 	3
-					origin_attachment 	(785, 550)
-					terminal_attachment 	(884, 673)
-					label      	(object SegLabel @815
-					    Parent_View 	@813
-					    location   	(935, 612)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.729730
-					    height     	51
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$190" @816
-				location   	(1184, 404)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69E4560290"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$191" @817
-					Parent_View 	@816
-					location   	(-32, -412)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69E4570165"
-					client     	@816
-					supplier   	@782
-					line_style 	3
-					origin_attachment 	(1184, 404)
-					terminal_attachment 	(1184, 135))
-				    (object RoleView "annotations" @818
-					Parent_View 	@816
-					location   	(-32, -412)
-					label      	(object SegLabel @819
-					    Parent_View 	@818
-					    location   	(1324, 226)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	249
-					    justify    	0
-					    label      	"+annotations"
-					    pctDist    	-0.665428
-					    height     	140
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69E457016F"
-					client     	@816
-					supplier   	@795
-					line_style 	3
-					origin_attachment 	(1184, 404)
-					terminal_attachment 	(1184, 673)
-					label      	(object SegLabel @820
-					    Parent_View 	@818
-					    location   	(1251, 615)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.784387
-					    height     	67
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$206" @821
-				location   	(1752, 1034)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69E2910158"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$207" @822
-					Parent_View 	@821
-					location   	(536, 218)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69E292019F"
-					client     	@821
-					supplier   	@783
-					vertices   	(list Points
-					    (1752, 1034)
-					    (1812, 1034)
-					    (1812, 1161))
-					line_style 	3
-					origin_attachment 	(1752, 1034)
-					terminal_attachment 	(1812, 1161))
-				    (object RoleView "annotation" @823
-					Parent_View 	@821
-					location   	(536, 218)
-					label      	(object SegLabel @824
-					    Parent_View 	@823
-					    location   	(1743, 997)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.059603
-					    height     	37
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69E29201A9"
-					client     	@821
-					supplier   	@795
-					line_style 	3
-					origin_attachment 	(1752, 1034)
-					terminal_attachment 	(1601, 1034)
-					label      	(object SegLabel @825
-					    Parent_View 	@823
-					    location   	(1684, 1066)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.450331
-					    height     	32
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$208" @826
-				location   	(1896, 881)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B9006CF0088"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$209" @827
-					Parent_View 	@826
-					location   	(621, 40)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B9006D1015D"
-					client     	@826
-					supplier   	@783
-					vertices   	(list Points
-					    (1896, 881)
-					    (1956, 881)
-					    (1956, 1161))
-					line_style 	3
-					origin_attachment 	(1896, 881)
-					terminal_attachment 	(1956, 1161))
-				    (object RoleView "derivationAnnotation" @828
-					Parent_View 	@826
-					location   	(621, 40)
-					label      	(object SegLabel @829
-					    Parent_View 	@828
-					    location   	(1821, 842)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	390
-					    justify    	0
-					    label      	"+derivationAnnotation"
-					    pctDist    	0.254237
-					    height     	40
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B9006D10167"
-					client     	@826
-					supplier   	@795
-					line_style 	3
-					origin_attachment 	(1896, 881)
-					terminal_attachment 	(1601, 881)
-					label      	(object SegLabel @830
-					    Parent_View 	@828
-					    location   	(1689, 914)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.705085
-					    height     	33
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$210" @831
-				location   	(2040, 715)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB330264"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$211" @832
-					Parent_View 	@831
-					location   	(920, -85)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB340284"
-					client     	@831
-					supplier   	@783
-					vertices   	(list Points
-					    (2040, 715)
-					    (2100, 715)
-					    (2100, 1161))
-					line_style 	3
-					origin_attachment 	(2040, 715)
-					terminal_attachment 	(2100, 1161))
-				    (object RoleView "annotations" @833
-					Parent_View 	@831
-					location   	(920, -85)
-					label      	(object SegLabel @834
-					    Parent_View 	@833
-					    location   	(1758, 681)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+annotations"
-					    pctDist    	0.643192
-					    height     	35
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB34028E"
-					client     	@831
-					supplier   	@795
-					line_style 	3
-					origin_attachment 	(2040, 715)
-					terminal_attachment 	(1601, 715)
-					label      	(object SegLabel @835
-					    Parent_View 	@833
-					    location   	(1685, 746)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.809313
-					    height     	31
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$228" @836
-				location   	(668, 865)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C239134004F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$229" @837
-					Parent_View 	@836
-					location   	(-612, 33)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C23913600CA"
-					client     	@836
-					supplier   	@786
-					line_style 	3
-					origin_attachment 	(668, 865)
-					terminal_attachment 	(473, 865))
-				    (object RoleView "annotation" @838
-					Parent_View 	@836
-					location   	(-612, 33)
-					label      	(object SegLabel @839
-					    Parent_View 	@838
-					    location   	(714, 825)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.234146
-					    height     	41
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C23913600D4"
-					client     	@836
-					supplier   	@795
-					line_style 	3
-					origin_attachment 	(668, 865)
-					terminal_attachment 	(863, 865)
-					label      	(object SegLabel @840
-					    Parent_View 	@838
-					    location   	(801, 903)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.682051
-					    height     	38
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$132" @841
-				location   	(1472, 167)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D23B901CD"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$133" @842
-					Parent_View 	@841
-					location   	(256, -649)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D23BA01C4"
-					client     	@841
-					supplier   	@787
-					vertices   	(list Points
-					    (1472, 167)
-					    (1472, 72)
-					    (1883, 72))
-					line_style 	3
-					origin_attachment 	(1472, 167)
-					terminal_attachment 	(1883, 72))
-				    (object RoleView "annotation" @843
-					Parent_View 	@841
-					location   	(256, -649)
-					label      	(object SegLabel @844
-					    Parent_View 	@843
-					    location   	(1604, 129)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	-0.076305
-					    height     	132
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D23BA01CE"
-					client     	@841
-					supplier   	@795
-					line_style 	3
-					origin_attachment 	(1472, 167)
-					terminal_attachment 	(1472, 673)
-					label      	(object SegLabel @845
-					    Parent_View 	@843
-					    location   	(1419, 618)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.893574
-					    height     	54
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$82" @846
-				location   	(927, 350)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB060291"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$83" @847
-					Parent_View 	@846
-					location   	(-193, -450)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB070171"
-					client     	@846
-					supplier   	@788
-					line_style 	3
-					origin_attachment 	(927, 350)
-					terminal_attachment 	(629, 350))
-				    (object RoleView "annotation" @848
-					Parent_View 	@846
-					location   	(-193, -450)
-					label      	(object SegLabel @849
-					    Parent_View 	@848
-					    location   	(878, 310)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	-0.816667
-					    height     	41
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB070172"
-					client     	@846
-					supplier   	@795
-					vertices   	(list Points
-					    (927, 350)
-					    (987, 350)
-					    (987, 673))
-					line_style 	3
-					origin_attachment 	(927, 350)
-					terminal_attachment 	(987, 673)
-					label      	(object SegLabel @850
-					    Parent_View 	@848
-					    location   	(1037, 612)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.843342
-					    height     	50
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$74" @851
-				location   	(1027, 222)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DADC02F5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$75" @852
-					Parent_View 	@851
-					location   	(-93, -578)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DADD0238"
-					client     	@851
-					supplier   	@789
-					line_style 	3
-					origin_attachment 	(1027, 222)
-					terminal_attachment 	(563, 222))
-				    (object RoleView "annotation" @853
-					Parent_View 	@851
-					location   	(-93, -578)
-					label      	(object SegLabel @854
-					    Parent_View 	@853
-					    location   	(1003, 188)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	-0.406250
-					    height     	35
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DADD0242"
-					client     	@851
-					supplier   	@795
-					vertices   	(list Points
-					    (1027, 222)
-					    (1087, 222)
-					    (1087, 673))
-					line_style 	3
-					origin_attachment 	(1027, 222)
-					terminal_attachment 	(1087, 673)
-					label      	(object SegLabel @855
-					    Parent_View 	@853
-					    location   	(1137, 613)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	100
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.882583
-					    height     	50
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$98" @856
-				location   	(1494, 1438)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B90068801C2"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$99" @857
-					Parent_View 	@856
-					location   	(214, 590)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B90068A0111"
-					client     	@856
-					supplier   	@790
-					line_style 	3
-					origin_attachment 	(1494, 1438)
-					terminal_attachment 	(1494, 1662))
-				    (object RoleView "contentAnnotation" @858
-					Parent_View 	@856
-					location   	(214, 590)
-					label      	(object SegLabel @859
-					    Parent_View 	@858
-					    location   	(1696, 1356)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	360
-					    justify    	0
-					    label      	"+contentAnnotation"
-					    pctDist    	0.367713
-					    height     	202
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B90068A011B"
-					client     	@856
-					supplier   	@795
-					line_style 	3
-					origin_attachment 	(1494, 1438)
-					terminal_attachment 	(1494, 1215)
-					label      	(object SegLabel @860
-					    Parent_View 	@858
-					    location   	(1443, 1279)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.713004
-					    height     	51
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$152" @861
-				location   	(637, 1022)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB1702C8"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$153" @862
-					Parent_View 	@861
-					location   	(-483, 222)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB1803E2"
-					client     	@861
-					supplier   	@792
-					line_style 	3
-					origin_attachment 	(637, 1022)
-					terminal_attachment 	(411, 1022))
-				    (object RoleView "annotation" @863
-					Parent_View 	@861
-					location   	(-483, 222)
-					label      	(object SegLabel @864
-					    Parent_View 	@863
-					    location   	(710, 979)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.328889
-					    height     	44
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB190004"
-					client     	@861
-					supplier   	@795
-					line_style 	3
-					origin_attachment 	(637, 1022)
-					terminal_attachment 	(863, 1022)
-					label      	(object SegLabel @865
-					    Parent_View 	@863
-					    location   	(802, 1062)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.730088
-					    height     	40
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$72" @866
-				location   	(1581, 607)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C626EA70102"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$73" @867
-					Parent_View 	@866
-					location   	(301, -225)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C626EA90191"
-					client     	@866
-					supplier   	@793
-					vertices   	(list Points
-					    (1581, 607)
-					    (1581, 547)
-					    (1679, 547))
-					line_style 	3
-					origin_attachment 	(1581, 607)
-					terminal_attachment 	(1679, 547))
-				    (object RoleView "annotations" @868
-					Parent_View 	@866
-					location   	(301, -225)
-					label      	(object SegLabel @869
-					    Parent_View 	@868
-					    location   	(1669, 462)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+annotations"
-					    pctDist    	-2.196970
-					    height     	88
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C626EA90192"
-					client     	@866
-					supplier   	@795
-					line_style 	3
-					origin_attachment 	(1581, 607)
-					terminal_attachment 	(1581, 673)
-					label      	(object SegLabel @870
-					    Parent_View 	@868
-					    location   	(1539, 620)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.196970
-					    height     	42
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$212" @871
-				location   	(849, 1496)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB11026F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$213" @872
-					Parent_View 	@871
-					location   	(-271, 696)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB1201F9"
-					client     	@871
-					supplier   	@794
-					line_style 	3
-					origin_attachment 	(849, 1496)
-					terminal_attachment 	(354, 1496))
-				    (object RoleView "annotation" @873
-					Parent_View 	@871
-					location   	(-271, 696)
-					label      	(object SegLabel @874
-					    Parent_View 	@873
-					    location   	(942, 1464)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.188259
-					    height     	33
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB120203"
-					client     	@871
-					supplier   	@795
-					vertices   	(list Points
-					    (849, 1496)
-					    (1062, 1496)
-					    (1062, 1215))
-					line_style 	3
-					origin_attachment 	(849, 1496)
-					terminal_attachment 	(1062, 1215)
-					label      	(object SegLabel @875
-					    Parent_View 	@873
-					    location   	(1115, 1279)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.872690
-					    height     	53
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$214" @876
-				location   	(952, 1565)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C626EB30005"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$215" @877
-					Parent_View 	@876
-					location   	(-328, 733)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C626EB40327"
-					client     	@876
-					supplier   	@794
-					line_style 	3
-					origin_attachment 	(952, 1565)
-					terminal_attachment 	(354, 1565))
-				    (object RoleView "annotations" @878
-					Parent_View 	@876
-					location   	(-328, 733)
-					label      	(object SegLabel @879
-					    Parent_View 	@878
-					    location   	(1075, 1538)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+annotations"
-					    pctDist    	0.204959
-					    height     	28
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C626EB40332"
-					client     	@876
-					supplier   	@795
-					vertices   	(list Points
-					    (952, 1565)
-					    (1200, 1565)
-					    (1200, 1215))
-					line_style 	3
-					origin_attachment 	(952, 1565)
-					terminal_attachment 	(1200, 1215)
-					label      	(object SegLabel @880
-					    Parent_View 	@878
-					    location   	(1254, 1275)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	1))))
-			    (object InheritView "" @881
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C800394"
-				client     	@777
-				supplier   	@787
-				line_style 	3
-				origin_attachment 	(1984, 249)
-				terminal_attachment 	(1984, 135))
-			    (object InheritView "" @882
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C8F002E"
-				client     	@793
-				supplier   	@777
-				line_style 	3
-				origin_attachment 	(1997, 505)
-				terminal_attachment 	(1997, 359))))
-		    (object ClassDiagram "6. Concrete Components"
-			quid       	"3B6AD74D03C4"
-			title      	"6. Concrete Components"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDComponent" @883
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(288, 416)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@883
-				    location   	(126, 375)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846E90029"
-				width      	342
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupContent" @884
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(832, 416)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@884
-				    location   	(568, 375)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	528
-				    justify    	0
-				    label      	"XSDAttributeGroupContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6940200089"
-				width      	546
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefineContent" @885
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1200, 672)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@885
-				    location   	(991, 631)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	418
-				    justify    	0
-				    label      	"XSDRedefineContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AE2060172"
-				width      	436
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaContent" @886
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1360, 416)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@886
-				    location   	(1156, 375)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	408
-				    justify    	0
-				    label      	"XSDSchemaContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B688CB800BA"
-				width      	426
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @887
-				location   	(1360, 561)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@886
-				vertices   	(list Points
-				    (1360, 561)
-				    (1360, 471)))
-			    (object ClassView "Class" "Logical View::xsd::XSDInclude" @888
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1632, 1200)
-				label      	(object ItemLabel
-				    Parent_View 	@888
-				    location   	(1512, 1157)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	240
-				    justify    	0
-				    label      	"XSDInclude")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B688C7D0250"
-				width      	258
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDImport" @889
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1408, 944)
-				label      	(object ItemLabel
-				    Parent_View 	@889
-				    location   	(1294, 901)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	228
-				    justify    	0
-				    label      	"XSDImport")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B688C93017F"
-				width      	246
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefine" @890
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1936, 1200)
-				label      	(object ItemLabel
-				    Parent_View 	@890
-				    location   	(1805, 1157)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	262
-				    justify    	0
-				    label      	"XSDRedefine")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B688C9B02AD"
-				width      	280
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAnnotation" @891
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(800, 1200)
-				label      	(object ItemLabel
-				    Parent_View 	@891
-				    location   	(375, 1153)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	851
-				    justify    	0
-				    label      	"XSDAnnotation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDC80233"
-				width      	869
-				height     	119
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$150" @892
-				location   	(1368, 1206)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6ADCC5007E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$151" @893
-					Parent_View 	@892
-					location   	(1160, 406)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6ADCC6006B"
-					client     	@892
-					supplier   	@888
-					line_style 	3
-					origin_attachment 	(1368, 1206)
-					terminal_attachment 	(1503, 1206))
-				    (object RoleView "annotation" @894
-					Parent_View 	@892
-					location   	(1160, 406)
-					label      	(object SegLabel @895
-					    Parent_View 	@894
-					    location   	(1347, 1154)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.154412
-					    height     	53
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6ADCC6006C"
-					client     	@892
-					supplier   	@891
-					line_style 	3
-					origin_attachment 	(1368, 1206)
-					terminal_attachment 	(1234, 1206)
-					label      	(object SegLabel @896
-					    Parent_View 	@894
-					    location   	(1300, 1253)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	107
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.514706
-					    height     	47
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$148" @897
-				location   	(1168, 1022)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6ADCD802FC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$149" @898
-					Parent_View 	@897
-					location   	(960, 222)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6ADCD9018B"
-					client     	@897
-					supplier   	@889
-					vertices   	(list Points
-					    (1168, 1022)
-					    (1168, 962)
-					    (1285, 962))
-					line_style 	3
-					origin_attachment 	(1168, 1022)
-					terminal_attachment 	(1285, 962))
-				    (object RoleView "annotation" @899
-					Parent_View 	@897
-					location   	(960, 222)
-					label      	(object SegLabel @900
-					    Parent_View 	@899
-					    location   	(1290, 1075)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.445378
-					    height     	122
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6ADCD9018C"
-					client     	@897
-					supplier   	@891
-					line_style 	3
-					origin_attachment 	(1168, 1022)
-					terminal_attachment 	(1168, 1141)
-					label      	(object SegLabel @901
-					    Parent_View 	@899
-					    location   	(1127, 1074)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.436975
-					    height     	41
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$170" @902
-				location   	(1563, 1353)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6ADE42009A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$171" @903
-					Parent_View 	@902
-					location   	(1355, 553)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6ADE4302FE"
-					client     	@902
-					supplier   	@890
-					vertices   	(list Points
-					    (1563, 1353)
-					    (1940, 1353)
-					    (1940, 1255))
-					line_style 	3
-					origin_attachment 	(1563, 1353)
-					terminal_attachment 	(1940, 1255))
-				    (object RoleView "annotations" @904
-					Parent_View 	@902
-					location   	(1355, 553)
-					label      	(object SegLabel @905
-					    Parent_View 	@904
-					    location   	(1317, 1322)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+annotations"
-					    pctDist    	0.516807
-					    height     	32
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6ADE430308"
-					client     	@902
-					supplier   	@891
-					vertices   	(list Points
-					    (1563, 1353)
-					    (1181, 1353)
-					    (1181, 1259))
-					line_style 	3
-					origin_attachment 	(1563, 1353)
-					terminal_attachment 	(1181, 1259)
-					label      	(object SegLabel @906
-					    Parent_View 	@904
-					    location   	(1130, 1326)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.861345
-					    height     	52
-					    orientation 	0))))
-			    (object InheritTreeView "" @907
-				location   	(288, 561)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@883
-				vertices   	(list Points
-				    (288, 561)
-				    (288, 471)))
-			    (object ClassView "Class" "Logical View::xsd::XSDNamedComponent" @908
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(688, 672)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@908
-				    location   	(460, 631)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	456
-				    justify    	0
-				    label      	"XSDNamedComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846D303A4"
-				width      	474
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDParticleContent" @909
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1856, 416)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@909
-				    location   	(1658, 375)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	396
-				    justify    	0
-				    label      	"XSDParticleContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6BD22300C6"
-				width      	414
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefinableComponent" @910
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(720, 960)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@910
-				    location   	(450, 919)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	540
-				    justify    	0
-				    label      	"XSDRedefinableComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B7FCA8B020B"
-				width      	558
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDScope" @911
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(224, 672)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@911
-				    location   	(110, 631)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	228
-				    justify    	0
-				    label      	"XSDScope")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B54000F2"
-				width      	246
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @912
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCD640231"
-				client     	@911
-				supplier   	@883
-				line_style 	3
-				origin_attachment 	(221, 617)
-				terminal_attachment 	(221, 561)
-				drawSupplier 	@907)
-			    (object InheritView "" @913
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0CEA20197"
-				client     	@908
-				supplier   	@883
-				line_style 	3
-				origin_attachment 	(589, 617)
-				terminal_attachment 	(589, 561)
-				drawSupplier 	@907)
-			    (object InheritView "" @914
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AE2B301D5"
-				client     	@885
-				supplier   	@886
-				line_style 	3
-				origin_attachment 	(1016, 617)
-				terminal_attachment 	(1016, 561)
-				drawSupplier 	@887)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaCompositor" @915
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1824, 944)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@915
-				    location   	(1590, 903)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"XSDSchemaCompositor")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C21DB4102AE"
-				width      	486
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @916
-				location   	(1824, 1089)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@915
-				vertices   	(list Points
-				    (1824, 1089)
-				    (1824, 999)))
-			    (object InheritView "" @917
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AD8DC0381"
-				client     	@888
-				supplier   	@915
-				line_style 	3
-				origin_attachment 	(1666, 1145)
-				terminal_attachment 	(1666, 1089)
-				drawSupplier 	@916)
-			    (object InheritView "" @918
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DB640240"
-				client     	@890
-				supplier   	@915
-				line_style 	3
-				origin_attachment 	(1934, 1145)
-				terminal_attachment 	(1934, 1089)
-				drawSupplier 	@916)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaDirective" @919
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1840, 672)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@919
-				    location   	(1630, 631)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	420
-				    justify    	0
-				    label      	"XSDSchemaDirective")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD8A202A2"
-				width      	438
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @920
-				location   	(1762, 819)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@919
-				vertices   	(list Points
-				    (1762, 819)
-				    (1762, 727)))
-			    (object InheritView "" @921
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AD8D9003E"
-				client     	@889
-				supplier   	@919
-				line_style 	3
-				origin_attachment 	(1416, 889)
-				terminal_attachment 	(1416, 819)
-				drawSupplier 	@920)
-			    (object InheritView "" @922
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AE32102AF"
-				client     	@919
-				supplier   	@886
-				line_style 	3
-				origin_attachment 	(1756, 617)
-				terminal_attachment 	(1756, 561)
-				drawSupplier 	@887)
-			    (object ClassView "Class" "Logical View::xsd::XSDConcreteComponent" @923
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				location   	(1120, 144)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@923
-				    location   	(875, 103)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	490
-				    justify    	0
-				    label      	"XSDConcreteComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD7B40065"
-				width      	508
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @924
-				location   	(1120, 289)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@923
-				vertices   	(list Points
-				    (1120, 289)
-				    (1120, 199)))
-			    (object AssociationViewNew "$UNNAMED$112" @925
-				location   	(1485, 215)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B751B0803C7"
-				roleview_list 	(list RoleViews
-				    (object RoleView "container" @926
-					Parent_View 	@925
-					location   	(989, 103)
-					label      	(object SegLabel @927
-					    Parent_View 	@926
-					    location   	(1604, 210)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	192
-					    justify    	0
-					    label      	"+container"
-					    pctDist    	0.033113
-					    height     	119
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B751B0C01CE"
-					client     	@925
-					supplier   	@923
-					vertices   	(list Points
-					    (1485, 215)
-					    (1485, 176)
-					    (1374, 176))
-					line_style 	3
-					origin_attachment 	(1485, 215)
-					terminal_attachment 	(1374, 176)
-					label      	(object SegLabel @928
-					    Parent_View 	@926
-					    location   	(1435, 226)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	69
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.602649
-					    height     	50
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$113" @929
-					Parent_View 	@925
-					location   	(989, 103)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B751B0C01CF"
-					client     	@925
-					supplier   	@923
-					vertices   	(list Points
-					    (1485, 215)
-					    (1485, 254)
-					    (1345, 254)
-					    (1345, 199))
-					line_style 	3
-					origin_attachment 	(1485, 215)
-					terminal_attachment 	(1345, 199))))
-			    (object AssociationViewNew "$UNNAMED$114" @930
-				location   	(773, 216)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B751B480261"
-				roleview_list 	(list RoleViews
-				    (object RoleView "rootContainer" @931
-					Parent_View 	@930
-					location   	(53, 104)
-					label      	(object SegLabel @932
-					    Parent_View 	@931
-					    location   	(614, 217)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	264
-					    justify    	0
-					    label      	"+rootContainer"
-					    pctDist    	-0.025000
-					    height     	160
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B751B4C0285"
-					client     	@930
-					supplier   	@923
-					vertices   	(list Points
-					    (773, 216)
-					    (773, 176)
-					    (866, 176))
-					line_style 	3
-					origin_attachment 	(773, 216)
-					terminal_attachment 	(866, 176)
-					label      	(object SegLabel @933
-					    Parent_View 	@931
-					    location   	(800, 228)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.300000
-					    height     	27
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$115" @934
-					Parent_View 	@930
-					location   	(53, 104)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B751B4C0286"
-					client     	@930
-					supplier   	@923
-					vertices   	(list Points
-					    (773, 216)
-					    (773, 257)
-					    (895, 257)
-					    (895, 199))
-					line_style 	3
-					origin_attachment 	(773, 216)
-					terminal_attachment 	(895, 199))))
-			    (object InheritView "" @935
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AD8E60372"
-				client     	@886
-				supplier   	@923
-				line_style 	3
-				origin_attachment 	(1367, 361)
-				terminal_attachment 	(1367, 289)
-				drawSupplier 	@924)
-			    (object InheritView "" @936
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B72D8E200EA"
-				client     	@884
-				supplier   	@923
-				line_style 	3
-				origin_attachment 	(752, 361)
-				terminal_attachment 	(752, 289)
-				drawSupplier 	@924)
-			    (object InheritView "" @937
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0CEA903D2"
-				client     	@883
-				supplier   	@923
-				line_style 	3
-				origin_attachment 	(299, 361)
-				terminal_attachment 	(299, 289)
-				drawSupplier 	@924)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @938
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(192, 1200)
-				label      	(object ItemLabel
-				    Parent_View 	@938
-				    location   	(61, 1157)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	262
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	280
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @939
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCC4A0182"
-				client     	@938
-				supplier   	@911
-				line_style 	3
-				origin_attachment 	(216, 1145)
-				terminal_attachment 	(216, 727))
-			    (object AssociationViewNew "$UNNAMED$226" @940
-				location   	(1382, 1425)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DD0C03DB"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$227" @941
-					Parent_View 	@940
-					location   	(1190, 225)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DD100304"
-					client     	@940
-					supplier   	@915
-					vertices   	(list Points
-					    (1382, 1425)
-					    (2147, 1425)
-					    (2147, 943)
-					    (2067, 943))
-					line_style 	3
-					origin_attachment 	(1382, 1425)
-					terminal_attachment 	(2067, 943))
-				    (object RoleView "incorporatedSchema" @942
-					Parent_View 	@940
-					location   	(1190, 225)
-					label      	(object SegLabel @943
-					    Parent_View 	@942
-					    location   	(445, 1389)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+incorporatedSchema"
-					    pctDist    	0.706546
-					    height     	37
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DD100305"
-					client     	@940
-					supplier   	@938
-					vertices   	(list Points
-					    (1382, 1425)
-					    (225, 1425)
-					    (225, 1255))
-					line_style 	3
-					origin_attachment 	(1382, 1425)
-					terminal_attachment 	(225, 1255)
-					label      	(object SegLabel @944
-					    Parent_View 	@942
-					    location   	(183, 1392)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.896915
-					    height     	43
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$224" @945
-				location   	(1505, 1503)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DCC700EC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$225" @946
-					Parent_View 	@945
-					location   	(1313, 303)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DCCE0042"
-					client     	@945
-					supplier   	@919
-					vertices   	(list Points
-					    (1505, 1503)
-					    (2188, 1503)
-					    (2188, 675)
-					    (2059, 675))
-					line_style 	3
-					origin_attachment 	(1505, 1503)
-					terminal_attachment 	(2059, 675))
-				    (object RoleView "resolvedSchema" @947
-					Parent_View 	@945
-					location   	(1313, 303)
-					label      	(object SegLabel @948
-					    Parent_View 	@947
-					    location   	(303, 1472)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	324
-					    justify    	0
-					    label      	"+resolvedSchema"
-					    pctDist    	0.733333
-					    height     	32
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DCCE0043"
-					client     	@945
-					supplier   	@938
-					vertices   	(list Points
-					    (1505, 1503)
-					    (113, 1503)
-					    (113, 1255))
-					line_style 	3
-					origin_attachment 	(1505, 1503)
-					terminal_attachment 	(113, 1255)
-					label      	(object SegLabel @949
-					    Parent_View 	@947
-					    location   	(73, 1472)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.867683
-					    height     	41
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$116" @950
-				location   	(66, 244)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B751C310356"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$117" @951
-					Parent_View 	@950
-					location   	(-94, -444)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B751C330331"
-					client     	@950
-					supplier   	@923
-					vertices   	(list Points
-					    (66, 244)
-					    (66, 144)
-					    (866, 144))
-					line_style 	3
-					origin_attachment 	(66, 244)
-					terminal_attachment 	(866, 144))
-				    (object RoleView "schema" @952
-					Parent_View 	@950
-					location   	(-94, -444)
-					label      	(object SegLabel @953
-					    Parent_View 	@952
-					    location   	(165, 93)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+schema"
-					    pctDist    	-0.168113
-					    height     	99
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B751C33033B"
-					client     	@950
-					supplier   	@938
-					line_style 	3
-					origin_attachment 	(66, 244)
-					terminal_attachment 	(66, 1145)
-					label      	(object SegLabel @954
-					    Parent_View 	@952
-					    location   	(136, 184)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	113
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	-0.066593
-					    height     	70
-					    orientation 	0))))
-			    (object InheritView "" @955
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B780BD90059"
-				client     	@909
-				supplier   	@923
-				line_style 	3
-				origin_attachment 	(1759, 361)
-				terminal_attachment 	(1759, 289)
-				drawSupplier 	@924)
-			    (object InheritView "" @956
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69E1770116"
-				client     	@891
-				supplier   	@883
-				line_style 	3
-				origin_attachment 	(400, 1141)
-				terminal_attachment 	(400, 561)
-				drawSupplier 	@907)
-			    (object InheritTreeView "" @957
-				location   	(1012, 837)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@885
-				vertices   	(list Points
-				    (1012, 837)
-				    (1012, 727)))
-			    (object InheritView "" @958
-				stereotype 	(object SegLabel @959
-				    Parent_View 	@958
-				    location   	(1071, 871)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	243
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.888158
-				    height     	34
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B7FD4E20366"
-				client     	@891
-				supplier   	@885
-				line_style 	3
-				origin_attachment 	(1037, 1141)
-				terminal_attachment 	(1037, 837)
-				drawSupplier 	@957)
-			    (object InheritView "" @960
-				stereotype 	(object SegLabel @961
-				    Parent_View 	@960
-				    location   	(890, 865)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	263
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.581633
-				    height     	36
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B7FD4BA023C"
-				client     	@910
-				supplier   	@885
-				line_style 	3
-				origin_attachment 	(925, 905)
-				terminal_attachment 	(925, 837)
-				drawSupplier 	@957)
-			    (object InheritView "" @962
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DB560092"
-				client     	@915
-				supplier   	@919
-				line_style 	3
-				origin_attachment 	(1828, 889)
-				terminal_attachment 	(1828, 819)
-				drawSupplier 	@920)))
-		    (object ClassDiagram "7. Concrete Attributes"
-			quid       	"3B9F8F7602C7"
-			title      	"7. Concrete Attributes"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDFeature" @963
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2144, 1440)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@963
-				    location   	(1938, 1361)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	412
-				    justify    	0
-				    label      	"XSDFeature")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B537026C"
-				compartment 	(object Compartment
-				    Parent_View 	@963
-				    location   	(1938, 1427)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	382
-				    compartmentItems 	(list Compartment
-					"+ form : XSDForm"
-					"+ lexicalValue : String"))
-				width      	430
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDForm" @964
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2560, 1424)
-				label      	(object ItemLabel
-				    Parent_View 	@964
-				    location   	(2398, 1365)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDForm")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@964
-				    location   	(2398, 1315)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B9F913B01EB"
-				width      	342
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDConcreteComponent" @965
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(368, 96)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@965
-				    location   	(40, 39)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	657
-				    justify    	0
-				    label      	"XSDConcreteComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD7B40065"
-				compartment 	(object Compartment
-				    Parent_View 	@965
-				    location   	(40, 105)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	446
-				    compartmentItems 	(list Compartment
-					"+ element : DOMElement"))
-				width      	675
-				height     	143
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDComponent" @966
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(848, 384)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@966
-				    location   	(687, 335)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	322
-				    justify    	0
-				    label      	"XSDComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846E90029"
-				width      	340
-				height     	126
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDNamedComponent" @967
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1904, 944)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@967
-				    location   	(1678, 894)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	452
-				    justify    	0
-				    label      	"XSDNamedComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846D303A4"
-				width      	470
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefinableComponent" @968
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1600, 1408)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@968
-				    location   	(1328, 1358)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	544
-				    justify    	0
-				    label      	"XSDRedefinableComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B7FCA8B020B"
-				width      	562
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDScope" @969
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(864, 624)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@969
-				    location   	(745, 575)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	238
-				    justify    	0
-				    label      	"XSDScope")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B54000F2"
-				width      	256
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @970
-				location   	(850, 537)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@966
-				vertices   	(list Points
-				    (850, 537)
-				    (850, 447)))
-			    (object ClassView "Class" "Logical View::xsd::DOMElement" @971
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1248, 128)
-				label      	(object ItemLabel
-				    Parent_View 	@971
-				    location   	(873, 90)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	751
-				    justify    	0
-				    label      	"DOMElement")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@971
-				    location   	(873, 40)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	751
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	14671839
-				quidu      	"3B8189790200"
-				width      	769
-				height     	200
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaDirective" @972
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(288, 640)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@972
-				    location   	(41, 586)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	494
-				    justify    	0
-				    label      	"XSDSchemaDirective")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD8A202A2"
-				width      	512
-				height     	136
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaContent" @973
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 384)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@973
-				    location   	(38, 335)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	404
-				    justify    	0
-				    label      	"XSDSchemaContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B688CB800BA"
-				width      	422
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @974
-				location   	(368, 263)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@965
-				vertices   	(list Points
-				    (368, 263)
-				    (368, 167)))
-			    (object ClassView "Class" "Logical View::xsd::XSDDisallowedSubstitutions" @975
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(992, 1456)
-				label      	(object ItemLabel
-				    Parent_View 	@975
-				    location   	(723, 1347)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	538
-				    justify    	0
-				    label      	"XSDDisallowedSubstitutions")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@975
-				    location   	(723, 1297)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	538
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C5A403DF"
-				compartment 	(object Compartment
-				    Parent_View 	@975
-				    location   	(723, 1407)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	225
-				    compartmentItems 	(list Compartment
-					"+ substitution"
-					"+ extension"
-					"+ restriction"
-					"+ all"))
-				width      	556
-				height     	342
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDProhibitedSubstitutions" @976
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(880, 1792)
-				label      	(object ItemLabel
-				    Parent_View 	@976
-				    location   	(614, 1708)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	532
-				    justify    	0
-				    label      	"XSDProhibitedSubstitutions")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@976
-				    location   	(614, 1658)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	532
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C5BE0272"
-				compartment 	(object Compartment
-				    Parent_View 	@976
-				    location   	(614, 1768)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	198
-				    compartmentItems 	(list Compartment
-					"+ extension"
-					"+ restriction"
-					"+ all"))
-				width      	550
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @977
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(912, 2096)
-				label      	(object ItemLabel
-				    Parent_View 	@977
-				    location   	(532, 2040)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	760
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				compartment 	(object Compartment
-				    Parent_View 	@977
-				    location   	(532, 2100)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	1
-				    max_width  	723
-				    compartmentItems 	(list Compartment
-					"<<0..*>> + lexicalFinal : XSDSimpleFinal"))
-				width      	778
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleFinal" @978
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 1984)
-				label      	(object ItemLabel
-				    Parent_View 	@978
-				    location   	(45, 1875)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"XSDSimpleFinal")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@978
-				    location   	(45, 1825)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C25D0295"
-				width      	344
-				height     	342
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexFinal" @979
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2544, 2016)
-				label      	(object ItemLabel
-				    Parent_View 	@979
-				    location   	(2362, 1932)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	364
-				    justify    	0
-				    label      	"XSDComplexFinal")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@979
-				    location   	(2362, 1882)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	364
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C2CA01CB"
-				width      	382
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUse" @980
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(352, 1360)
-				label      	(object ItemLabel
-				    Parent_View 	@980
-				    location   	(41, 1279)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	622
-				    justify    	0
-				    label      	"XSDAttributeUse")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B68354601A8"
-				compartment 	(object Compartment
-				    Parent_View 	@980
-				    location   	(41, 1339)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	588
-				    compartmentItems 	(list Compartment
-					"+ use : XSDAttributeUseCategory"
-					"+ lexicalValue : String"))
-				width      	640
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUseCategory" @981
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(288, 1632)
-				label      	(object ItemLabel
-				    Parent_View 	@981
-				    location   	(41, 1548)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	494
-				    justify    	0
-				    label      	"XSDAttributeUseCategory")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@981
-				    location   	(41, 1498)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	494
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3BA7B0E801A8"
-				width      	512
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDTerm" @982
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2608, 928)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@982
-				    location   	(2498, 883)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	220
-				    justify    	0
-				    label      	"XSDTerm")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683C5E0174"
-				width      	238
-				height     	119
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @983
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2240, 1712)
-				label      	(object ItemLabel
-				    Parent_View 	@983
-				    location   	(1757, 1631)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	966
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				compartment 	(object Compartment
-				    Parent_View 	@983
-				    location   	(1757, 1691)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	934
-				    compartmentItems 	(list Compartment
-					"<<0..*>> + lexicalFinal : XSDProhibitedSubstitutions"
-					"<<0..*>> + block : XSDDisallowedSubstitutions"))
-				width      	984
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @984
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2272, 1152)
-				label      	(object ItemLabel
-				    Parent_View 	@984
-				    location   	(1828, 1096)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	888
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				compartment 	(object Compartment
-				    Parent_View 	@984
-				    location   	(1828, 1156)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	852
-				    compartmentItems 	(list Compartment
-					"<<0..*>> + lexicalNamespaceConstraint : String"))
-				width      	906
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @985
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1120, 1008)
-				label      	(object ItemLabel
-				    Parent_View 	@985
-				    location   	(622, 777)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	996
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	1014
-				height     	486
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDImport" @986
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 960)
-				label      	(object ItemLabel
-				    Parent_View 	@986
-				    location   	(37, 904)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	406
-				    justify    	0
-				    label      	"XSDImport")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B688C93017F"
-				width      	424
-				height     	136
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDFacet" @987
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1344, 656)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@987
-				    location   	(1138, 602)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	412
-				    justify    	0
-				    label      	"XSDFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C359403D2"
-				compartment 	(object Compartment
-				    Parent_View 	@987
-				    location   	(1138, 668)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	378
-				    compartmentItems 	(list Compartment
-					"+ lexicalValue : String"))
-				width      	430
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @988
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1840, 2048)
-				label      	(object ItemLabel
-				    Parent_View 	@988
-				    location   	(1410, 1942)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	860
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				compartment 	(object Compartment
-				    Parent_View 	@988
-				    location   	(1410, 2002)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	822
-				    compartmentItems 	(list Compartment
-					"<<0..*>> + lexicalFinal : XSDComplexFinal"
-					"<<0..*>> + block : XSDProhibitedSubstitutions"
-					"+ mixed : boolean"))
-				width      	878
-				height     	236
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @989
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1488, 1696)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@989
-				    location   	(1304, 1646)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	368
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	386
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @990
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAB1004D"
-				client     	@989
-				supplier   	@968
-				line_style 	3
-				origin_attachment 	(1506, 1632)
-				terminal_attachment 	(1506, 1472))
-			    (object ClassView "Class" "Logical View::xsd::XSDAnnotation" @991
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2208, 704)
-				label      	(object ItemLabel
-				    Parent_View 	@991
-				    location   	(1758, 598)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	900
-				    justify    	0
-				    label      	"XSDAnnotation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDC80233"
-				width      	918
-				height     	236
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @992
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6848AA01D3"
-				client     	@982
-				supplier   	@966
-				line_style 	3
-				origin_attachment 	(2696, 869)
-				terminal_attachment 	(2696, 537)
-				drawSupplier 	@970)
-			    (object InheritView "" @993
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69EDEE01BF"
-				client     	@983
-				supplier   	@963
-				line_style 	3
-				origin_attachment 	(2094, 1619)
-				terminal_attachment 	(2094, 1533))
-			    (object InheritTreeView "" @994
-				location   	(1487, 1856)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@989
-				vertices   	(list Points
-				    (1487, 1856)
-				    (1487, 1760)))
-			    (object ClassView "Class" "Logical View::xsd::DOMAttr" @995
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2400, 384)
-				label      	(object ItemLabel
-				    Parent_View 	@995
-				    location   	(2080, 350)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	640
-				    justify    	0
-				    label      	"DOMAttr")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@995
-				    location   	(2080, 300)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	640
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	14671839
-				quidu      	"3BBF8C8901B6"
-				width      	658
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @996
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0D01901F1"
-				client     	@988
-				supplier   	@989
-				line_style 	3
-				origin_attachment 	(1734, 1930)
-				terminal_attachment 	(1734, 1856)
-				drawSupplier 	@994)
-			    (object InheritView "" @997
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D25680259"
-				client     	@987
-				supplier   	@966
-				line_style 	3
-				origin_attachment 	(1328, 588)
-				terminal_attachment 	(1328, 537)
-				drawSupplier 	@970)
-			    (object InheritView "" @998
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69E1770116"
-				client     	@991
-				supplier   	@966
-				line_style 	3
-				origin_attachment 	(2190, 586)
-				terminal_attachment 	(2190, 537)
-				drawSupplier 	@970)
-			    (object InheritView "" @999
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AE32102AF"
-				client     	@972
-				supplier   	@973
-				line_style 	3
-				origin_attachment 	(222, 572)
-				terminal_attachment 	(222, 447))
-			    (object InheritView "" @1000
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AD8E60372"
-				client     	@973
-				supplier   	@965
-				line_style 	3
-				origin_attachment 	(260, 321)
-				terminal_attachment 	(260, 263)
-				drawSupplier 	@974)
-			    (object InheritView "" @1001
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AD8D9003E"
-				client     	@986
-				supplier   	@972
-				line_style 	3
-				origin_attachment 	(223, 892)
-				terminal_attachment 	(223, 708))
-			    (object InheritView "" @1002
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A3A0041"
-				client     	@984
-				supplier   	@982
-				line_style 	3
-				origin_attachment 	(2600, 1084)
-				terminal_attachment 	(2600, 987))
-			    (object ClassView "Class" "Logical View::xsd::DOMDocument" @1003
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2336, 128)
-				label      	(object ItemLabel
-				    Parent_View 	@1003
-				    location   	(1957, 94)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	758
-				    justify    	0
-				    label      	"DOMDocument")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@1003
-				    location   	(1957, 44)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	758
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	14671839
-				quidu      	"3C27850E0381"
-				width      	776
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @1004
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0CEA903D2"
-				client     	@966
-				supplier   	@965
-				line_style 	3
-				origin_attachment 	(856, 321)
-				terminal_attachment 	(856, 263)
-				drawSupplier 	@974)
-			    (object ClassView "Class" "Logical View::xsd::DOMNode" @1005
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1568, 384)
-				label      	(object ItemLabel
-				    Parent_View 	@1005
-				    location   	(1234, 350)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	668
-				    justify    	0
-				    label      	"DOMNode")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@1005
-				    location   	(1234, 300)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	668
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	14671839
-				quidu      	"3BFE64A50117"
-				width      	686
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @1006
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCD640231"
-				client     	@969
-				supplier   	@966
-				line_style 	3
-				origin_attachment 	(850, 561)
-				terminal_attachment 	(850, 537)
-				drawSupplier 	@970)
-			    (object InheritView "" @1007
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B72D7BB0349"
-				client     	@980
-				supplier   	@966
-				line_style 	3
-				origin_attachment 	(575, 1267)
-				terminal_attachment 	(575, 537)
-				drawSupplier 	@970)
-			    (object InheritView "" @1008
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0CEA20197"
-				client     	@967
-				supplier   	@966
-				line_style 	3
-				origin_attachment 	(1694, 880)
-				terminal_attachment 	(1694, 537)
-				drawSupplier 	@970)
-			    (object InheritView "" @1009
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCC4A0182"
-				client     	@985
-				supplier   	@969
-				line_style 	3
-				origin_attachment 	(856, 765)
-				terminal_attachment 	(856, 687))
-			    (object InheritTreeView "" @1010
-				location   	(1703, 1290)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@967
-				vertices   	(list Points
-				    (1703, 1290)
-				    (1703, 1008)))
-			    (object InheritView "" @1011
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A26036D"
-				client     	@968
-				supplier   	@967
-				line_style 	3
-				origin_attachment 	(1503, 1344)
-				terminal_attachment 	(1503, 1290)
-				drawSupplier 	@1010)
-			    (object InheritView "" @1012
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A2C0307"
-				client     	@963
-				supplier   	@967
-				line_style 	3
-				origin_attachment 	(2093, 1347)
-				terminal_attachment 	(2093, 1290)
-				drawSupplier 	@1010)
-			    (object InheritView "" @1013
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A1302A2"
-				client     	@977
-				supplier   	@989
-				line_style 	3
-				origin_attachment 	(1253, 2028)
-				terminal_attachment 	(1253, 1856)
-				drawSupplier 	@994)))
-		    (object ClassDiagram "8. Concrete Containment"
-			quid       	"3B6A8097027A"
-			title      	"8. Concrete Containment"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDNotationDeclaration" @1014
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2672, 992)
-				label      	(object ItemLabel
-				    Parent_View 	@1014
-				    location   	(2439, 949)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	466
-				    justify    	0
-				    label      	"XSDNotationDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDAA021C"
-				width      	484
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaDirective" @1015
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2640, 576)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1015
-				    location   	(2431, 535)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	418
-				    justify    	0
-				    label      	"XSDSchemaDirective")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD8A202A2"
-				width      	436
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefine" @1016
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2144, 784)
-				label      	(object ItemLabel
-				    Parent_View 	@1016
-				    location   	(2013, 741)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	262
-				    justify    	0
-				    label      	"XSDRedefine")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B688C9B02AD"
-				width      	280
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefineContent" @1017
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2064, 576)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1017
-				    location   	(1854, 535)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	420
-				    justify    	0
-				    label      	"XSDRedefineContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AE2060172"
-				width      	438
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @1018
-				location   	(1943, 868)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1017
-				vertices   	(list Points
-				    (1943, 868)
-				    (1943, 631)))
-			    (object AssociationViewNew "$UNNAMED$172" @1019
-				location   	(2125, 680)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AE8240051"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$173" @1020
-					Parent_View 	@1019
-					location   	(157, 344)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6AE82602AD"
-					client     	@1019
-					supplier   	@1016
-					line_style 	3
-					origin_attachment 	(2125, 680)
-					terminal_attachment 	(2125, 729))
-				    (object RoleView "contents" @1021
-					Parent_View 	@1019
-					location   	(157, 344)
-					label      	(object SegLabel @1022
-					    Parent_View 	@1021
-					    location   	(2255, 671)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+contents"
-					    pctDist    	0.175439
-					    height     	130
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6AE82602B7"
-					client     	@1019
-					supplier   	@1017
-					line_style 	3
-					origin_attachment 	(2125, 680)
-					terminal_attachment 	(2125, 631)
-					label      	(object SegLabel @1023
-					    Parent_View 	@1021
-					    location   	(2067, 671)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.175439
-					    height     	59
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDTerm" @1024
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 320)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1024
-				    location   	(148, 279)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	216
-				    justify    	0
-				    label      	"XSDTerm")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683C5E0174"
-				width      	234
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @1025
-				location   	(272, 465)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1024
-				vertices   	(list Points
-				    (272, 465)
-				    (272, 375)))
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @1026
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2656, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@1026
-				    location   	(2372, 1121)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	569
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				width      	587
-				height     	118
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroup" @1027
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 576)
-				label      	(object ItemLabel
-				    Parent_View 	@1027
-				    location   	(89, 533)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	334
-				    justify    	0
-				    label      	"XSDModelGroup")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6834E00291"
-				width      	352
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$160" @1028
-				location   	(1170, 1356)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6837AC025A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "modelGroup" @1029
-					Parent_View 	@1028
-					location   	(866, -20)
-					label      	(object SegLabel @1030
-					    Parent_View 	@1029
-					    location   	(269, 1389)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	252
-					    justify    	0
-					    label      	"+modelGroup"
-					    pctDist    	0.534044
-					    height     	33
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6837AD0339"
-					client     	@1028
-					supplier   	@1027
-					vertices   	(list Points
-					    (1170, 1356)
-					    (206, 1356)
-					    (206, 631))
-					line_style 	3
-					origin_attachment 	(1170, 1356)
-					terminal_attachment 	(206, 631)
-					label      	(object SegLabel @1031
-					    Parent_View 	@1029
-					    location   	(226, 1322)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.559146
-					    height     	35
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$161" @1032
-					Parent_View 	@1028
-					location   	(866, -20)
-					label      	(object SegLabel @1033
-					    Parent_View 	@1032
-					    location   	(2521, 1398)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6837AD0338"
-					client     	@1028
-					supplier   	@1026
-					vertices   	(list Points
-					    (1170, 1356)
-					    (2731, 1356)
-					    (2731, 1227))
-					line_style 	3
-					origin_attachment 	(1170, 1356)
-					terminal_attachment 	(2731, 1227))))
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @1034
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(160, 1696)
-				label      	(object ItemLabel
-				    Parent_View 	@1034
-				    location   	(35, 1653)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	250
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	268
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$154" @1035
-				location   	(122, 1136)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6BCEB102F8"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$155" @1036
-					Parent_View 	@1035
-					location   	(-630, -256)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6BCEB6001B"
-					client     	@1035
-					supplier   	@1027
-					line_style 	3
-					origin_attachment 	(122, 1136)
-					terminal_attachment 	(122, 631))
-				    (object RoleView "contents" @1037
-					Parent_View 	@1035
-					location   	(-630, -256)
-					label      	(object SegLabel @1038
-					    Parent_View 	@1037
-					    location   	(223, 1515)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+contents"
-					    pctDist    	0.750495
-					    height     	101
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6BCEB60025"
-					client     	@1035
-					supplier   	@1034
-					line_style 	3
-					origin_attachment 	(122, 1136)
-					terminal_attachment 	(122, 1641)
-					label      	(object SegLabel @1039
-					    Parent_View 	@1037
-					    location   	(180, 1581)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.881188
-					    height     	58
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDParticleContent" @1040
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(288, 80)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1040
-				    location   	(41, 44)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	495
-				    justify    	0
-				    label      	"XSDParticleContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6BD22300C6"
-				width      	513
-				height     	100
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$166" @1041
-				location   	(47, 885)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6B47150119"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$167" @1042
-					Parent_View 	@1041
-					location   	(-289, 821)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B471A03AB"
-					client     	@1041
-					supplier   	@1034
-					line_style 	3
-					origin_attachment 	(47, 885)
-					terminal_attachment 	(47, 1641))
-				    (object RoleView "content" @1043
-					Parent_View 	@1041
-					location   	(-289, 821)
-					label      	(object SegLabel @1044
-					    Parent_View 	@1043
-					    location   	(142, 189)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+content"
-					    pctDist    	0.921854
-					    height     	95
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B471A03B5"
-					client     	@1041
-					supplier   	@1040
-					line_style 	3
-					origin_attachment 	(47, 885)
-					terminal_attachment 	(47, 130)
-					label      	(object SegLabel @1045
-					    Parent_View 	@1043
-					    location   	(28, 192)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.917881
-					    height     	19
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUse" @1046
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1424, 896)
-				label      	(object ItemLabel
-				    Parent_View 	@1046
-				    location   	(1252, 849)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	345
-				    justify    	0
-				    label      	"XSDAttributeUse")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B68354601A8"
-				width      	363
-				height     	119
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @1047
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1408, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@1047
-				    location   	(1175, 1125)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	466
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	484
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$96" @1048
-				location   	(1319, 1034)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6F1DE9018A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$97" @1049
-					Parent_View 	@1048
-					location   	(-57, -102)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6F1DEA036C"
-					client     	@1048
-					supplier   	@1046
-					line_style 	3
-					origin_attachment 	(1319, 1034)
-					terminal_attachment 	(1319, 955))
-				    (object RoleView "content" @1050
-					Parent_View 	@1048
-					location   	(-57, -102)
-					label      	(object SegLabel @1051
-					    Parent_View 	@1050
-					    location   	(1439, 1039)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+content"
-					    pctDist    	0.073171
-					    height     	120
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6F1DEA0380"
-					client     	@1048
-					supplier   	@1047
-					line_style 	3
-					origin_attachment 	(1319, 1034)
-					terminal_attachment 	(1319, 1113)
-					label      	(object SegLabel @1052
-					    Parent_View 	@1050
-					    location   	(1279, 1031)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.040816
-					    height     	41
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::xsd::XSDConstrainingFacet" @1053
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2080, 1696)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1053
-				    location   	(1855, 1655)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	450
-				    justify    	0
-				    label      	"XSDConstrainingFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C6B340093"
-				width      	468
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @1054
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1280, 1696)
-				label      	(object ItemLabel
-				    Parent_View 	@1054
-				    location   	(1035, 1653)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	490
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				width      	508
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$192" @1055
-				location   	(1351, 1840)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D5CA50112"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$193" @1056
-					Parent_View 	@1055
-					location   	(-297, 224)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D5CA703B4"
-					client     	@1055
-					supplier   	@1054
-					vertices   	(list Points
-					    (1351, 1840)
-					    (1294, 1840)
-					    (1294, 1751))
-					line_style 	3
-					origin_attachment 	(1351, 1840)
-					terminal_attachment 	(1294, 1751))
-				    (object RoleView "contents" @1057
-					Parent_View 	@1055
-					location   	(-297, 224)
-					label      	(object SegLabel @1058
-					    Parent_View 	@1057
-					    location   	(1517, 1806)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+contents"
-					    pctDist    	0.632653
-					    height     	108
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D5CA703C8"
-					client     	@1055
-					supplier   	@1054
-					vertices   	(list Points
-					    (1351, 1840)
-					    (1409, 1840)
-					    (1409, 1751))
-					line_style 	3
-					origin_attachment 	(1351, 1840)
-					terminal_attachment 	(1409, 1751)
-					label      	(object SegLabel @1059
-					    Parent_View 	@1057
-					    location   	(1361, 1801)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.072848
-					    height     	40
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$76" @1060
-				location   	(1190, 1432)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6890D6006F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "anonymousTypeDefinition" @1061
-					Parent_View 	@1060
-					location   	(774, -1832)
-					label      	(object SegLabel @1062
-					    Parent_View 	@1061
-					    location   	(1462, 1525)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	492
-					    justify    	0
-					    label      	"+anonymousTypeDefinition"
-					    pctDist    	0.444976
-					    height     	272
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6890D60318"
-					client     	@1060
-					supplier   	@1054
-					line_style 	3
-					origin_attachment 	(1190, 1432)
-					terminal_attachment 	(1190, 1641)
-					label      	(object SegLabel @1063
-					    Parent_View 	@1061
-					    location   	(1143, 1527)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.454545
-					    height     	47
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$77" @1064
-					Parent_View 	@1060
-					location   	(774, -1832)
-					label      	(object SegLabel @1065
-					    Parent_View 	@1064
-					    location   	(1149, 1266)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6890D6030E"
-					client     	@1060
-					supplier   	@1047
-					line_style 	3
-					origin_attachment 	(1190, 1432)
-					terminal_attachment 	(1190, 1223))))
-			    (object AssociationViewNew "$UNNAMED$194" @1066
-				location   	(1690, 1684)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C35AD0374"
-				roleview_list 	(list RoleViews
-				    (object RoleView "facetContents" @1067
-					Parent_View 	@1066
-					location   	(-326, -12)
-					label      	(object SegLabel @1068
-					    Parent_View 	@1067
-					    location   	(1695, 1731)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+facetContents"
-					    pctDist    	0.032051
-					    height     	47
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6C35AF0010"
-					client     	@1066
-					supplier   	@1053
-					line_style 	3
-					origin_attachment 	(1690, 1684)
-					terminal_attachment 	(1846, 1684)
-					label      	(object SegLabel @1069
-					    Parent_View 	@1067
-					    location   	(1756, 1644)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	94
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.420732
-					    height     	41
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$195" @1070
-					Parent_View 	@1066
-					location   	(-326, -12)
-					label      	(object SegLabel @1071
-					    Parent_View 	@1070
-					    location   	(1566, 1643)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6C35AF0006"
-					client     	@1066
-					supplier   	@1054
-					line_style 	3
-					origin_attachment 	(1690, 1684)
-					terminal_attachment 	(1534, 1684))))
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaCompositor" @1072
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2624, 784)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1072
-				    location   	(2388, 743)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	472
-				    justify    	0
-				    label      	"XSDSchemaCompositor")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C21DB4102AE"
-				width      	490
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaContent" @1073
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1312, 320)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1073
-				    location   	(1108, 279)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	408
-				    justify    	0
-				    label      	"XSDSchemaContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B688CB800BA"
-				width      	426
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @1074
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(688, 320)
-				label      	(object ItemLabel
-				    Parent_View 	@1074
-				    location   	(557, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	262
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	280
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$174" @1075
-				location   	(963, 319)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B688E6B003D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "contents" @1076
-					Parent_View 	@1075
-					location   	(595, -17)
-					label      	(object SegLabel @1077
-					    Parent_View 	@1076
-					    location   	(974, 361)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+contents"
-					    pctDist    	0.081081
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B688E6C0111"
-					client     	@1075
-					supplier   	@1073
-					line_style 	3
-					origin_attachment 	(963, 319)
-					terminal_attachment 	(1099, 319)
-					label      	(object SegLabel @1078
-					    Parent_View 	@1076
-					    location   	(1016, 290)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.396396
-					    height     	30
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$175" @1079
-					Parent_View 	@1075
-					location   	(595, -17)
-					label      	(object SegLabel @1080
-					    Parent_View 	@1079
-					    location   	(855, 361)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B688E6C0107"
-					client     	@1075
-					supplier   	@1074
-					line_style 	3
-					origin_attachment 	(963, 319)
-					terminal_attachment 	(828, 319))))
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @1081
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2160, 992)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1081
-				    location   	(1974, 951)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	372
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	390
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @1082
-				location   	(2322, 1593)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1081
-				vertices   	(list Points
-				    (2322, 1593)
-				    (2322, 1047)))
-			    (object InheritView "" @1083
-				stereotype 	(object SegLabel @1084
-				    Parent_View 	@1083
-				    location   	(2146, 905)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	225
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.460000
-				    height     	5
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B6AE2F5013A"
-				client     	@1081
-				supplier   	@1017
-				line_style 	3
-				origin_attachment 	(2150, 937)
-				terminal_attachment 	(2150, 868)
-				drawSupplier 	@1018)
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @1085
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(832, 576)
-				label      	(object ItemLabel
-				    Parent_View 	@1085
-				    location   	(510, 532)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	644
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				width      	662
-				height     	112
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$120" @1086
-				location   	(1498, 1431)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B68911401AF"
-				roleview_list 	(list RoleViews
-				    (object RoleView "anonymousTypeDefinition" @1087
-					Parent_View 	@1086
-					location   	(1038, -1810)
-					label      	(object SegLabel @1088
-					    Parent_View 	@1087
-					    location   	(2027, 1472)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	492
-					    justify    	0
-					    label      	"+anonymousTypeDefinition"
-					    pctDist    	0.454389
-					    height     	41
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6891150017"
-					client     	@1086
-					supplier   	@1081
-					vertices   	(list Points
-					    (1498, 1431)
-					    (2281, 1431)
-					    (2281, 1047))
-					line_style 	3
-					origin_attachment 	(1498, 1431)
-					terminal_attachment 	(2281, 1047)
-					label      	(object SegLabel @1089
-					    Parent_View 	@1087
-					    location   	(2204, 1397)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.605419
-					    height     	35
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$121" @1090
-					Parent_View 	@1086
-					location   	(1038, -1810)
-					label      	(object SegLabel @1091
-					    Parent_View 	@1090
-					    location   	(1090, 866)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6891150016"
-					client     	@1086
-					supplier   	@1085
-					vertices   	(list Points
-					    (1498, 1431)
-					    (1131, 1431)
-					    (1131, 632))
-					line_style 	3
-					origin_attachment 	(1498, 1431)
-					terminal_attachment 	(1131, 632))))
-			    (object ClassView "Class" "Logical View::xsd::XSDXPathDefinition" @1092
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(848, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@1092
-				    location   	(655, 1125)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	386
-				    justify    	0
-				    label      	"XSDXPathDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6D83BB0355"
-				width      	404
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDIdentityConstraintDefinition" @1093
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(800, 896)
-				label      	(object ItemLabel
-				    Parent_View 	@1093
-				    location   	(505, 853)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	590
-				    justify    	0
-				    label      	"XSDIdentityConstraintDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B2603A2"
-				width      	608
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$124" @1094
-				location   	(534, 736)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6833EF0160"
-				roleview_list 	(list RoleViews
-				    (object RoleView "identityConstraintDefinitions" @1095
-					Parent_View 	@1094
-					location   	(86, -2144)
-					label      	(object SegLabel @1096
-					    Parent_View 	@1095
-					    location   	(820, 748)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	550
-					    justify    	0
-					    label      	"+identityConstraintDefinitions"
-					    pctDist    	0.111111
-					    height     	286
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6833F00299"
-					client     	@1094
-					supplier   	@1093
-					line_style 	3
-					origin_attachment 	(534, 736)
-					terminal_attachment 	(534, 841)
-					label      	(object SegLabel @1097
-					    Parent_View 	@1095
-					    location   	(595, 807)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.675926
-					    height     	61
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$125" @1098
-					Parent_View 	@1094
-					location   	(86, -2144)
-					label      	(object SegLabel @1099
-					    Parent_View 	@1098
-					    location   	(576, 653)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6833F00298"
-					client     	@1094
-					supplier   	@1085
-					line_style 	3
-					origin_attachment 	(534, 736)
-					terminal_attachment 	(534, 632))))
-			    (object AssociationViewNew "$UNNAMED$144" @1100
-				location   	(900, 1032)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D8D3D003E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "selector" @1101
-					Parent_View 	@1100
-					location   	(84, 120)
-					label      	(object SegLabel @1102
-					    Parent_View 	@1101
-					    location   	(1013, 1042)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+selector"
-					    pctDist    	0.123288
-					    height     	113
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D3E0234"
-					client     	@1100
-					supplier   	@1092
-					line_style 	3
-					origin_attachment 	(900, 1032)
-					terminal_attachment 	(900, 1113)
-					label      	(object SegLabel @1103
-					    Parent_View 	@1101
-					    location   	(859, 1040)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.095890
-					    height     	42
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$145" @1104
-					Parent_View 	@1100
-					location   	(84, 120)
-					label      	(object SegLabel @1105
-					    Parent_View 	@1104
-					    location   	(859, 968)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D3E022A"
-					client     	@1100
-					supplier   	@1093
-					line_style 	3
-					origin_attachment 	(900, 1032)
-					terminal_attachment 	(900, 951))))
-			    (object AssociationViewNew "$UNNAMED$146" @1106
-				location   	(700, 1032)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D8D330025"
-				roleview_list 	(list RoleViews
-				    (object RoleView "fields" @1107
-					Parent_View 	@1106
-					location   	(-116, 120)
-					label      	(object SegLabel @1108
-					    Parent_View 	@1107
-					    location   	(616, 1036)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	120
-					    justify    	0
-					    label      	"+fields"
-					    pctDist    	0.054795
-					    height     	85
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D330379"
-					client     	@1106
-					supplier   	@1092
-					line_style 	3
-					origin_attachment 	(700, 1032)
-					terminal_attachment 	(700, 1113)
-					label      	(object SegLabel @1109
-					    Parent_View 	@1107
-					    location   	(771, 1042)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..*"
-					    pctDist    	0.123077
-					    height     	71
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$147" @1110
-					Parent_View 	@1106
-					location   	(-116, 120)
-					label      	(object SegLabel @1111
-					    Parent_View 	@1110
-					    location   	(659, 968)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D330365"
-					client     	@1106
-					supplier   	@1093
-					line_style 	3
-					origin_attachment 	(700, 1032)
-					terminal_attachment 	(700, 951))))
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeContent" @1112
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(752, 1440)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1112
-				    location   	(500, 1399)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	504
-				    justify    	0
-				    label      	"XSDComplexTypeContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683BA00196"
-				width      	522
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @1113
-				location   	(550, 1590)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1112
-				vertices   	(list Points
-				    (550, 1590)
-				    (550, 1495)))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupContent" @1114
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1504, 576)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1114
-				    location   	(1240, 535)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	528
-				    justify    	0
-				    label      	"XSDAttributeGroupContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6940200089"
-				width      	546
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @1115
-				location   	(1406, 765)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1114
-				vertices   	(list Points
-				    (1406, 765)
-				    (1406, 631)))
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @1116
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2656, 1696)
-				label      	(object ItemLabel
-				    Parent_View 	@1116
-				    location   	(2393, 1653)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	526
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				width      	544
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$102" @1117
-				location   	(1614, 1868)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6FDDD70113"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$103" @1118
-					Parent_View 	@1117
-					location   	(526, 476)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6FDDDA026B"
-					client     	@1117
-					supplier   	@1116
-					vertices   	(list Points
-					    (1614, 1868)
-					    (2500, 1868)
-					    (2500, 1751))
-					line_style 	3
-					origin_attachment 	(1614, 1868)
-					terminal_attachment 	(2500, 1751))
-				    (object RoleView "content" @1119
-					Parent_View 	@1117
-					location   	(526, 476)
-					label      	(object SegLabel @1120
-					    Parent_View 	@1119
-					    location   	(896, 1787)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+content"
-					    pctDist    	0.709870
-					    height     	89
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6FDDDA0275"
-					client     	@1117
-					supplier   	@1112
-					vertices   	(list Points
-					    (1614, 1868)
-					    (984, 1868)
-					    (984, 1495))
-					line_style 	3
-					origin_attachment 	(1614, 1868)
-					terminal_attachment 	(984, 1495)
-					label      	(object SegLabel @1121
-					    Parent_View 	@1119
-					    location   	(1042, 1824)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.571286
-					    height     	45
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$108" @1122
-				location   	(2927, 387)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B698E360386"
-				roleview_list 	(list RoleViews
-				    (object RoleView "attributeContents" @1123
-					Parent_View 	@1122
-					location   	(2463, -3757)
-					label      	(object SegLabel @1124
-					    Parent_View 	@1123
-					    location   	(1915, 357)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+attributeContents"
-					    pctDist    	0.773060
-					    height     	31
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B698E38007C"
-					client     	@1122
-					supplier   	@1114
-					vertices   	(list Points
-					    (2927, 387)
-					    (1750, 387)
-					    (1750, 521))
-					line_style 	3
-					origin_attachment 	(2927, 387)
-					terminal_attachment 	(1750, 521)
-					label      	(object SegLabel @1125
-					    Parent_View 	@1123
-					    location   	(1804, 425)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.857247
-					    height     	38
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$109" @1126
-					Parent_View 	@1122
-					location   	(2463, -3757)
-					label      	(object SegLabel @1127
-					    Parent_View 	@1126
-					    location   	(2946, 1448)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B698E380072"
-					client     	@1122
-					supplier   	@1116
-					vertices   	(list Points
-					    (2927, 387)
-					    (2987, 387)
-					    (2987, 1671)
-					    (2928, 1671))
-					line_style 	3
-					origin_attachment 	(2927, 387)
-					terminal_attachment 	(2928, 1671))))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @1128
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1968, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@1128
-				    location   	(1699, 1125)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	538
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	556
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$84" @1129
-				location   	(1750, 872)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69404E0067"
-				roleview_list 	(list RoleViews
-				    (object RoleView "contents" @1130
-					Parent_View 	@1129
-					location   	(1462, -2392)
-					label      	(object SegLabel @1131
-					    Parent_View 	@1130
-					    location   	(1640, 691)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+contents"
-					    pctDist    	0.751037
-					    height     	110
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69405002A5"
-					client     	@1129
-					supplier   	@1114
-					line_style 	3
-					origin_attachment 	(1750, 872)
-					terminal_attachment 	(1750, 631)
-					label      	(object SegLabel @1132
-					    Parent_View 	@1130
-					    location   	(1814, 695)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.734440
-					    height     	64
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$85" @1133
-					Parent_View 	@1129
-					location   	(1462, -2392)
-					label      	(object SegLabel @1134
-					    Parent_View 	@1133
-					    location   	(1709, 1065)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B694050029B"
-					client     	@1129
-					supplier   	@1128
-					line_style 	3
-					origin_attachment 	(1750, 872)
-					terminal_attachment 	(1750, 1113))))
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @1135
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(416, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@1135
-				    location   	(279, 1125)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	274
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				width      	292
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$216" @1136
-				location   	(1252, 1896)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BEBDC870247"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$217" @1137
-					Parent_View 	@1136
-					location   	(708, 1288)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BEBDC8C02F9"
-					client     	@1136
-					supplier   	@1116
-					vertices   	(list Points
-					    (1252, 1896)
-					    (2603, 1896)
-					    (2603, 1751))
-					line_style 	3
-					origin_attachment 	(1252, 1896)
-					terminal_attachment 	(2603, 1751))
-				    (object RoleView "attributeWildcardContent" @1138
-					Parent_View 	@1136
-					location   	(708, 1288)
-					label      	(object SegLabel @1139
-					    Parent_View 	@1138
-					    location   	(682, 1858)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	480
-					    justify    	0
-					    label      	"+attributeWildcardContent"
-					    pctDist    	0.381142
-					    height     	39
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BEBDC8C0303"
-					client     	@1136
-					supplier   	@1135
-					vertices   	(list Points
-					    (1252, 1896)
-					    (428, 1896)
-					    (428, 1223))
-					line_style 	3
-					origin_attachment 	(1252, 1896)
-					terminal_attachment 	(428, 1223)
-					label      	(object SegLabel @1140
-					    Parent_View 	@1138
-					    location   	(382, 1860)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.575033
-					    height     	47
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$88" @1141
-				location   	(1199, 1321)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C275D320220"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$89" @1142
-					Parent_View 	@1141
-					location   	(655, 713)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C275D3C010C"
-					client     	@1141
-					supplier   	@1128
-					vertices   	(list Points
-					    (1199, 1321)
-					    (1897, 1321)
-					    (1897, 1223))
-					line_style 	3
-					origin_attachment 	(1199, 1321)
-					terminal_attachment 	(1897, 1223))
-				    (object RoleView "attributeWildcardContent" @1143
-					Parent_View 	@1141
-					location   	(655, 713)
-					label      	(object SegLabel @1144
-					    Parent_View 	@1143
-					    location   	(857, 1279)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	480
-					    justify    	0
-					    label      	"+attributeWildcardContent"
-					    pctDist    	0.429569
-					    height     	43
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C275D3C010D"
-					client     	@1141
-					supplier   	@1135
-					vertices   	(list Points
-					    (1199, 1321)
-					    (500, 1321)
-					    (500, 1223))
-					line_style 	3
-					origin_attachment 	(1199, 1321)
-					terminal_attachment 	(500, 1223)
-					label      	(object SegLabel @1145
-					    Parent_View 	@1143
-					    location   	(576, 1279)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.782305
-					    height     	43
-					    orientation 	1))))
-			    (object InheritView "" @1146
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0D01901F1"
-				client     	@1116
-				supplier   	@1081
-				line_style 	3
-				origin_attachment 	(2606, 1641)
-				terminal_attachment 	(2606, 1593)
-				drawSupplier 	@1082)
-			    (object InheritView "" @1147
-				stereotype 	(object SegLabel @1148
-				    Parent_View 	@1147
-				    location   	(759, 495)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	243
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.446429
-				    height     	6
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B685F17002E"
-				client     	@1085
-				supplier   	@1024
-				line_style 	3
-				origin_attachment 	(753, 520)
-				terminal_attachment 	(753, 465)
-				drawSupplier 	@1025)
-			    (object InheritView "" @1149
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A1302A2"
-				client     	@1054
-				supplier   	@1081
-				line_style 	3
-				origin_attachment 	(1409, 1641)
-				terminal_attachment 	(1409, 1593)
-				drawSupplier 	@1082)
-			    (object InheritView "" @1150
-				stereotype 	(object SegLabel @1151
-				    Parent_View 	@1150
-				    location   	(759, 1591)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	219
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.980392
-				    height     	385
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B685F55032B"
-				client     	@1054
-				supplier   	@1112
-				line_style 	3
-				origin_attachment 	(1144, 1641)
-				terminal_attachment 	(1144, 1590)
-				drawSupplier 	@1113)
-			    (object InheritView "" @1152
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A640279"
-				client     	@1027
-				supplier   	@1024
-				line_style 	3
-				origin_attachment 	(166, 521)
-				terminal_attachment 	(166, 465)
-				drawSupplier 	@1025)
-			    (object InheritTreeView "" @1153
-				location   	(431, 222)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1040
-				vertices   	(list Points
-				    (431, 222)
-				    (431, 130)))
-			    (object InheritView "" @1154
-				stereotype 	(object SegLabel @1155
-				    Parent_View 	@1154
-				    location   	(361, 224)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	237
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.976744
-				    height     	86
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B6BD2440069"
-				client     	@1024
-				supplier   	@1040
-				line_style 	3
-				origin_attachment 	(275, 265)
-				terminal_attachment 	(275, 222)
-				drawSupplier 	@1153)
-			    (object InheritTreeView "" @1156
-				location   	(1309, 465)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1073
-				vertices   	(list Points
-				    (1309, 465)
-				    (1309, 375)))
-			    (object InheritView "" @1157
-				stereotype 	(object SegLabel @1158
-				    Parent_View 	@1157
-				    location   	(941, 495)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	225
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.464286
-				    height     	10
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B688E660339"
-				client     	@1085
-				supplier   	@1073
-				line_style 	3
-				origin_attachment 	(931, 520)
-				terminal_attachment 	(931, 465)
-				drawSupplier 	@1156)
-			    (object InheritView "" @1159
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6848FC01E7"
-				client     	@1034
-				supplier   	@1112
-				line_style 	3
-				origin_attachment 	(250, 1641)
-				terminal_attachment 	(250, 1590)
-				drawSupplier 	@1113)
-			    (object InheritView "" @1160
-				stereotype 	(object SegLabel @1161
-				    Parent_View 	@1160
-				    location   	(1205, 493)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	212
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.958333
-				    height     	8
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B688E6103BE"
-				client     	@1047
-				supplier   	@1073
-				line_style 	3
-				origin_attachment 	(1197, 1113)
-				terminal_attachment 	(1197, 465)
-				drawSupplier 	@1156)
-			    (object InheritView "" @1162
-				stereotype 	(object SegLabel @1163
-				    Parent_View 	@1162
-				    location   	(1951, 905)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	225
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.848980
-				    height     	73
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B6AE2EB02A8"
-				client     	@1128
-				supplier   	@1017
-				line_style 	3
-				origin_attachment 	(1878, 1113)
-				terminal_attachment 	(1878, 868)
-				drawSupplier 	@1018)
-			    (object InheritView "" @1164
-				stereotype 	(object SegLabel @1165
-				    Parent_View 	@1164
-				    location   	(1642, 807)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	187
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.879310
-				    height     	61
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B69403A0221"
-				client     	@1128
-				supplier   	@1114
-				line_style 	3
-				origin_attachment 	(1703, 1113)
-				terminal_attachment 	(1703, 765)
-				drawSupplier 	@1115)
-			    (object InheritView "" @1166
-				stereotype 	(object SegLabel @1167
-				    Parent_View 	@1166
-				    location   	(1354, 801)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	225
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.500000
-				    height     	70
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B72D737038F"
-				client     	@1046
-				supplier   	@1114
-				line_style 	3
-				origin_attachment 	(1284, 837)
-				terminal_attachment 	(1284, 765)
-				drawSupplier 	@1115)
-			    (object InheritView "" @1168
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DB640240"
-				client     	@1016
-				supplier   	@1072
-				line_style 	3
-				origin_attachment 	(2284, 762)
-				terminal_attachment 	(2379, 762))
-			    (object InheritView "" @1169
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AE32102AF"
-				client     	@1015
-				supplier   	@1073
-				line_style 	3
-				origin_attachment 	(2637, 521)
-				terminal_attachment 	(2637, 465)
-				drawSupplier 	@1156)
-			    (object InheritView "" @1170
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DB560092"
-				client     	@1072
-				supplier   	@1015
-				line_style 	3
-				origin_attachment 	(2637, 729)
-				terminal_attachment 	(2637, 631))
-			    (object InheritView "" @1171
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AE2B301D5"
-				client     	@1017
-				supplier   	@1073
-				line_style 	3
-				origin_attachment 	(1950, 521)
-				terminal_attachment 	(1950, 465)
-				drawSupplier 	@1156)
-			    (object InheritView "" @1172
-				stereotype 	(object SegLabel @1173
-				    Parent_View 	@1172
-				    location   	(2821, 897)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	181
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.087719
-				    height     	76
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B688E4F023C"
-				client     	@1014
-				supplier   	@1073
-				line_style 	3
-				origin_attachment 	(2896, 937)
-				terminal_attachment 	(2896, 465)
-				drawSupplier 	@1156)
-			    (object InheritView "" @1174
-				stereotype 	(object SegLabel @1175
-				    Parent_View 	@1174
-				    location   	(2313, 904)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	207
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.850622
-				    height     	68
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B6AE2E20381"
-				client     	@1026
-				supplier   	@1017
-				line_style 	3
-				origin_attachment 	(2381, 1109)
-				terminal_attachment 	(2381, 868)
-				drawSupplier 	@1018)
-			    (object InheritView "" @1176
-				stereotype 	(object SegLabel @1177
-				    Parent_View 	@1176
-				    location   	(2878, 269)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	238
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.946667
-				    height     	66
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B6BD2550385"
-				client     	@1026
-				supplier   	@1040
-				line_style 	3
-				origin_attachment 	(2943, 1109)
-				terminal_attachment 	(2943, 222)
-				drawSupplier 	@1153)
-			    (object InheritView "" @1178
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A3A0041"
-				client     	@1135
-				supplier   	@1024
-				line_style 	3
-				origin_attachment 	(462, 1113)
-				terminal_attachment 	(462, 465)
-				drawSupplier 	@1025)))
-		    (object ClassDiagram "9. Concrete Schema Composition"
-			quid       	"3C25EB7A038C"
-			title      	"9. Concrete Schema Composition"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @1179
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 1536)
-				label      	(object ItemLabel
-				    Parent_View 	@1179
-				    location   	(73, 1493)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	462
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				width      	480
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$126" @1180
-				location   	(228, 1695)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6B41E60251"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$127" @1181
-					Parent_View 	@1180
-					location   	(-476, -385)
-					label      	(object SegLabel @1182
-					    Parent_View 	@1181
-					    location   	(217, 1623)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B41EA02F7"
-					client     	@1180
-					supplier   	@1179
-					vertices   	(list Points
-					    (228, 1695)
-					    (175, 1695)
-					    (175, 1591))
-					line_style 	3
-					origin_attachment 	(228, 1695)
-					terminal_attachment 	(175, 1591))
-				    (object RoleView "resolvedElementDeclaration" @1183
-					Parent_View 	@1180
-					location   	(-476, -385)
-					label      	(object SegLabel @1184
-					    Parent_View 	@1183
-					    location   	(329, 1740)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	528
-					    justify    	0
-					    label      	"+resolvedElementDeclaration"
-					    pctDist    	1.924528
-					    height     	45
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B41EA030B"
-					client     	@1180
-					supplier   	@1179
-					vertices   	(list Points
-					    (228, 1695)
-					    (281, 1695)
-					    (281, 1591))
-					line_style 	3
-					origin_attachment 	(228, 1695)
-					terminal_attachment 	(281, 1591)
-					label      	(object SegLabel @1185
-					    Parent_View 	@1183
-					    location   	(229, 1646)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.005714
-					    height     	50
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @1186
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1040, 1536)
-				label      	(object ItemLabel
-				    Parent_View 	@1186
-				    location   	(790, 1493)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	500
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				width      	518
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$162" @1187
-				location   	(952, 1698)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6B42450398"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$163" @1188
-					Parent_View 	@1187
-					location   	(-1288, -318)
-					label      	(object SegLabel @1189
-					    Parent_View 	@1188
-					    location   	(860, 1623)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B4249038A"
-					client     	@1187
-					supplier   	@1186
-					vertices   	(list Points
-					    (952, 1698)
-					    (901, 1698)
-					    (901, 1591))
-					line_style 	3
-					origin_attachment 	(952, 1698)
-					terminal_attachment 	(901, 1591))
-				    (object RoleView "resolvedModelGroupDefinition" @1190
-					Parent_View 	@1187
-					location   	(-1288, -318)
-					label      	(object SegLabel @1191
-					    Parent_View 	@1190
-					    location   	(1020, 1739)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	564
-					    justify    	0
-					    label      	"+resolvedModelGroupDefinition"
-					    pctDist    	1.326923
-					    height     	41
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B4249039E"
-					client     	@1187
-					supplier   	@1186
-					vertices   	(list Points
-					    (952, 1698)
-					    (1004, 1698)
-					    (1004, 1591))
-					line_style 	3
-					origin_attachment 	(952, 1698)
-					terminal_attachment 	(1004, 1591)
-					label      	(object SegLabel @1192
-					    Parent_View 	@1190
-					    location   	(952, 1649)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.000000
-					    height     	50
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaCompositor" @1193
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(656, 992)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1193
-				    location   	(420, 951)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	472
-				    justify    	0
-				    label      	"XSDSchemaCompositor")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C21DB4102AE"
-				width      	490
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaDirective" @1194
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(640, 784)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1194
-				    location   	(412, 739)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	457
-				    justify    	0
-				    label      	"XSDSchemaDirective")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD8A202A2"
-				width      	475
-				height     	118
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @1195
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(640, 416)
-				label      	(object ItemLabel
-				    Parent_View 	@1195
-				    location   	(446, 285)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	388
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	406
-				height     	287
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$226" @1196
-				location   	(1303, 679)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DD0C03DB"
-				roleview_list 	(list RoleViews
-				    (object RoleView "incorporatedSchema" @1197
-					Parent_View 	@1196
-					location   	(-41, -857)
-					label      	(object SegLabel @1198
-					    Parent_View 	@1197
-					    location   	(1059, 381)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+incorporatedSchema"
-					    pctDist    	0.700384
-					    height     	39
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DD100305"
-					client     	@1196
-					supplier   	@1195
-					vertices   	(list Points
-					    (1303, 679)
-					    (1303, 419)
-					    (843, 419))
-					line_style 	3
-					origin_attachment 	(1303, 679)
-					terminal_attachment 	(843, 419)
-					label      	(object SegLabel @1199
-					    Parent_View 	@1197
-					    location   	(922, 454)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.890746
-					    height     	35
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$227" @1200
-					Parent_View 	@1196
-					location   	(-41, -857)
-					label      	(object SegLabel @1201
-					    Parent_View 	@1200
-					    location   	(1045, 956)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DD100304"
-					client     	@1196
-					supplier   	@1193
-					vertices   	(list Points
-					    (1303, 679)
-					    (1303, 997)
-					    (901, 997))
-					line_style 	3
-					origin_attachment 	(1303, 679)
-					terminal_attachment 	(901, 997))))
-			    (object AssociationViewNew "$UNNAMED$224" @1202
-				location   	(1216, 649)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DCC700EC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "resolvedSchema" @1203
-					Parent_View 	@1202
-					location   	(336, -1399)
-					label      	(object SegLabel @1204
-					    Parent_View 	@1203
-					    location   	(1038, 500)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	324
-					    justify    	0
-					    label      	"+resolvedSchema"
-					    pctDist    	0.601923
-					    height     	35
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DCCE0043"
-					client     	@1202
-					supplier   	@1195
-					vertices   	(list Points
-					    (1216, 649)
-					    (1216, 534)
-					    (843, 534))
-					line_style 	3
-					origin_attachment 	(1216, 649)
-					terminal_attachment 	(843, 534)
-					label      	(object SegLabel @1205
-					    Parent_View 	@1203
-					    location   	(926, 577)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.831643
-					    height     	43
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$225" @1206
-					Parent_View 	@1202
-					location   	(336, -1399)
-					label      	(object SegLabel @1207
-					    Parent_View 	@1206
-					    location   	(974, 756)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DCCE0042"
-					client     	@1202
-					supplier   	@1194
-					vertices   	(list Points
-					    (1216, 649)
-					    (1216, 797)
-					    (877, 797))
-					line_style 	3
-					origin_attachment 	(1216, 649)
-					terminal_attachment 	(877, 797))))
-			    (object AssociationViewNew "$UNNAMED$230" @1208
-				location   	(662, 642)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C25D3A60131"
-				roleview_list 	(list RoleViews
-				    (object RoleView "referencingDirectives" @1209
-					Parent_View 	@1208
-					location   	(-234, 114)
-					label      	(object SegLabel @1210
-					    Parent_View 	@1209
-					    location   	(878, 675)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+referencingDirectives"
-					    pctDist    	0.408759
-					    height     	216
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25D3A90371"
-					client     	@1208
-					supplier   	@1194
-					line_style 	3
-					origin_attachment 	(662, 642)
-					terminal_attachment 	(662, 725)
-					label      	(object SegLabel @1211
-					    Parent_View 	@1209
-					    location   	(615, 678)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.430657
-					    height     	48
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$231" @1212
-					Parent_View 	@1208
-					location   	(-234, 114)
-					label      	(object SegLabel @1213
-					    Parent_View 	@1212
-					    location   	(621, 576)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25D3A90370"
-					client     	@1208
-					supplier   	@1195
-					line_style 	3
-					origin_attachment 	(662, 642)
-					terminal_attachment 	(662, 559))))
-			    (object AssociationViewNew "$UNNAMED$232" @1214
-				location   	(75, 188)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C25ECF0005E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$233" @1215
-					Parent_View 	@1214
-					location   	(-853, -308)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25ECF4001E"
-					client     	@1214
-					supplier   	@1195
-					vertices   	(list Points
-					    (75, 188)
-					    (75, 128)
-					    (510, 128)
-					    (510, 273))
-					line_style 	3
-					origin_attachment 	(75, 188)
-					terminal_attachment 	(510, 273))
-				    (object RoleView "rootVersion" @1216
-					Parent_View 	@1214
-					location   	(-853, -308)
-					label      	(object SegLabel @1217
-					    Parent_View 	@1216
-					    location   	(176, 74)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+rootVersion"
-					    pctDist    	-0.593750
-					    height     	101
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25ECF40028"
-					client     	@1214
-					supplier   	@1195
-					vertices   	(list Points
-					    (75, 188)
-					    (75, 380)
-					    (437, 380))
-					line_style 	3
-					origin_attachment 	(75, 188)
-					terminal_attachment 	(437, 380)
-					label      	(object SegLabel @1218
-					    Parent_View 	@1216
-					    location   	(368, 328)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.874755
-					    height     	53
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$234" @1219
-				location   	(1262, 134)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C25ED0B011B"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$235" @1220
-					Parent_View 	@1219
-					location   	(334, -362)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25ED0F0121"
-					client     	@1219
-					supplier   	@1195
-					vertices   	(list Points
-					    (1262, 134)
-					    (766, 134)
-					    (766, 273))
-					line_style 	3
-					origin_attachment 	(1262, 134)
-					terminal_attachment 	(766, 273))
-				    (object RoleView "originalVersion" @1221
-					Parent_View 	@1219
-					location   	(334, -362)
-					label      	(object SegLabel @1222
-					    Parent_View 	@1221
-					    location   	(1164, 97)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	288
-					    justify    	0
-					    label      	"+originalVersion"
-					    pctDist    	-1.650000
-					    height     	38
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25ED0F012B"
-					client     	@1219
-					supplier   	@1195
-					vertices   	(list Points
-					    (1262, 134)
-					    (1322, 134)
-					    (1322, 334)
-					    (843, 334))
-					line_style 	3
-					origin_attachment 	(1262, 134)
-					terminal_attachment 	(843, 334)
-					label      	(object SegLabel @1223
-					    Parent_View 	@1221
-					    location   	(919, 279)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.898108
-					    height     	56
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$236" @1224
-				location   	(126, 656)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C25EEAB001F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$237" @1225
-					Parent_View 	@1224
-					location   	(-834, 160)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25EEAF010B"
-					client     	@1224
-					supplier   	@1195
-					vertices   	(list Points
-					    (126, 656)
-					    (513, 656)
-					    (513, 559))
-					line_style 	3
-					origin_attachment 	(126, 656)
-					terminal_attachment 	(513, 559))
-				    (object RoleView "incorporatedVersions" @1226
-					Parent_View 	@1224
-					location   	(-834, 160)
-					label      	(object SegLabel @1227
-					    Parent_View 	@1226
-					    location   	(217, 431)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	408
-					    justify    	0
-					    label      	"+incorporatedVersions"
-					    pctDist    	0.643902
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25EEAF0115"
-					client     	@1224
-					supplier   	@1195
-					vertices   	(list Points
-					    (126, 656)
-					    (66, 656)
-					    (66, 472)
-					    (437, 472))
-					line_style 	3
-					origin_attachment 	(126, 656)
-					terminal_attachment 	(437, 472)
-					label      	(object SegLabel @1228
-					    Parent_View 	@1226
-					    location   	(356, 526)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.868468
-					    height     	54
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$240" @1229
-				location   	(642, 126)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C2784730194"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$241" @1230
-					Parent_View 	@1229
-					location   	(82, -418)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C27847501F1"
-					client     	@1229
-					supplier   	@1195
-					vertices   	(list Points
-					    (642, 126)
-					    (588, 126)
-					    (588, 273))
-					line_style 	3
-					origin_attachment 	(642, 126)
-					terminal_attachment 	(588, 273))
-				    (object RoleView "schemaForSchema" @1231
-					Parent_View 	@1229
-					location   	(82, -418)
-					label      	(object SegLabel @1232
-					    Parent_View 	@1231
-					    location   	(639, 74)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	384
-					    justify    	0
-					    label      	"+schemaForSchema"
-					    pctDist    	-0.055556
-					    height     	53
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C27847501FB"
-					client     	@1229
-					supplier   	@1195
-					vertices   	(list Points
-					    (642, 126)
-					    (697, 126)
-					    (697, 273))
-					line_style 	3
-					origin_attachment 	(642, 126)
-					terminal_attachment 	(697, 273)
-					label      	(object SegLabel @1233
-					    Parent_View 	@1231
-					    location   	(643, 213)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.701863
-					    height     	55
-					    orientation 	1))))
-			    (object InheritView "" @1234
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DB560092"
-				client     	@1193
-				supplier   	@1194
-				line_style 	3
-				origin_attachment 	(638, 937)
-				terminal_attachment 	(638, 843))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @1235
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 1184)
-				label      	(object ItemLabel
-				    Parent_View 	@1235
-				    location   	(67, 1141)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	474
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	492
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$80" @1236
-				location   	(234, 1340)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6B426B0194"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$81" @1237
-					Parent_View 	@1236
-					location   	(-310, -4)
-					label      	(object SegLabel @1238
-					    Parent_View 	@1237
-					    location   	(140, 1271)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B426D0309"
-					client     	@1236
-					supplier   	@1235
-					vertices   	(list Points
-					    (234, 1340)
-					    (181, 1340)
-					    (181, 1239))
-					line_style 	3
-					origin_attachment 	(234, 1340)
-					terminal_attachment 	(181, 1239))
-				    (object RoleView "resolvedAttributeDeclaration" @1239
-					Parent_View 	@1236
-					location   	(-310, -4)
-					label      	(object SegLabel @1240
-					    Parent_View 	@1239
-					    location   	(333, 1389)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	528
-					    justify    	0
-					    label      	"+resolvedAttributeDeclaration"
-					    pctDist    	1.867925
-					    height     	49
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B426D0313"
-					client     	@1236
-					supplier   	@1235
-					vertices   	(list Points
-					    (234, 1340)
-					    (287, 1340)
-					    (287, 1239))
-					line_style 	3
-					origin_attachment 	(234, 1340)
-					terminal_attachment 	(287, 1239)
-					label      	(object SegLabel @1241
-					    Parent_View 	@1239
-					    location   	(241, 1295)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.042945
-					    height     	46
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @1242
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1760, 144)
-				label      	(object ItemLabel
-				    Parent_View 	@1242
-				    location   	(1517, 101)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	486
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				width      	504
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDFacet" @1243
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1712, 416)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1243
-				    location   	(1599, 375)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	226
-				    justify    	0
-				    label      	"XSDFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C359403D2"
-				width      	244
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$314" @1244
-				location   	(1668, 280)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3D4BB4AE01CC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$315" @1245
-					Parent_View 	@1244
-					location   	(8, -152)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4BB4AF010F"
-					client     	@1244
-					supplier   	@1242
-					line_style 	3
-					origin_attachment 	(1668, 280)
-					terminal_attachment 	(1668, 199))
-				    (object RoleView "syntheticFacets" @1246
-					Parent_View 	@1244
-					location   	(8, -152)
-					label      	(object SegLabel @1247
-					    Parent_View 	@1246
-					    location   	(1852, 300)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	324
-					    justify    	0
-					    label      	"+syntheticFacets"
-					    pctDist    	0.246154
-					    height     	184
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4BB4AF011A"
-					client     	@1244
-					supplier   	@1243
-					line_style 	3
-					origin_attachment 	(1668, 280)
-					terminal_attachment 	(1668, 361)
-					label      	(object SegLabel @1248
-					    Parent_View 	@1246
-					    location   	(1625, 301)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.276923
-					    height     	44
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @1249
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1552, 944)
-				label      	(object ItemLabel
-				    Parent_View 	@1249
-				    location   	(1426, 901)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	252
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	270
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @1250
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1776, 640)
-				label      	(object ItemLabel
-				    Parent_View 	@1250
-				    location   	(1515, 597)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	522
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				width      	540
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$316" @1251
-				location   	(1508, 792)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3D4BB4D3028E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$317" @1252
-					Parent_View 	@1251
-					location   	(-12, -280)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4BB4D402F3"
-					client     	@1251
-					supplier   	@1250
-					line_style 	3
-					origin_attachment 	(1508, 792)
-					terminal_attachment 	(1508, 695))
-				    (object RoleView "syntheticParticle" @1253
-					Parent_View 	@1251
-					location   	(-12, -280)
-					label      	(object SegLabel @1254
-					    Parent_View 	@1253
-					    location   	(1695, 767)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+syntheticParticle"
-					    pctDist    	-0.259259
-					    height     	187
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4BB4D402FD"
-					client     	@1251
-					supplier   	@1249
-					line_style 	3
-					origin_attachment 	(1508, 792)
-					terminal_attachment 	(1508, 889)
-					label      	(object SegLabel @1255
-					    Parent_View 	@1253
-					    location   	(1454, 829)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.395062
-					    height     	55
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @1256
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1024, 1184)
-				label      	(object ItemLabel
-				    Parent_View 	@1256
-				    location   	(756, 1141)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	536
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	554
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$92" @1257
-				location   	(919, 1349)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6B425E01F9"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$93" @1258
-					Parent_View 	@1257
-					location   	(-233, -59)
-					label      	(object SegLabel @1259
-					    Parent_View 	@1258
-					    location   	(825, 1273)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B42620046"
-					client     	@1257
-					supplier   	@1256
-					vertices   	(list Points
-					    (919, 1349)
-					    (866, 1349)
-					    (866, 1239))
-					line_style 	3
-					origin_attachment 	(919, 1349)
-					terminal_attachment 	(866, 1239))
-				    (object RoleView "resolvedAttributeGroupDefinition" @1260
-					Parent_View 	@1257
-					location   	(-233, -59)
-					label      	(object SegLabel @1261
-					    Parent_View 	@1260
-					    location   	(993, 1393)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	600
-					    justify    	0
-					    label      	"+resolvedAttributeGroupDefinition"
-					    pctDist    	1.377358
-					    height     	44
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B42620050"
-					client     	@1257
-					supplier   	@1256
-					vertices   	(list Points
-					    (919, 1349)
-					    (973, 1349)
-					    (973, 1239))
-					line_style 	3
-					origin_attachment 	(919, 1349)
-					terminal_attachment 	(973, 1239)
-					label      	(object SegLabel @1262
-					    Parent_View 	@1260
-					    location   	(919, 1296)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.014925
-					    height     	54
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @1263
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1952, 944)
-				label      	(object ItemLabel
-				    Parent_View 	@1263
-				    location   	(1816, 901)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	272
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				width      	290
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$318" @1264
-				location   	(2025, 792)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3D4BB4D901F6"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$319" @1265
-					Parent_View 	@1264
-					location   	(153, -280)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4BB4DA0284"
-					client     	@1264
-					supplier   	@1250
-					line_style 	3
-					origin_attachment 	(2025, 792)
-					terminal_attachment 	(2025, 695))
-				    (object RoleView "syntheticWildcard" @1266
-					Parent_View 	@1264
-					location   	(153, -280)
-					label      	(object SegLabel @1267
-					    Parent_View 	@1266
-					    location   	(1826, 838)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+syntheticWildcard"
-					    pctDist    	0.488095
-					    height     	200
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4BB4DA028E"
-					client     	@1264
-					supplier   	@1263
-					line_style 	3
-					origin_attachment 	(2025, 792)
-					terminal_attachment 	(2025, 889)
-					label      	(object SegLabel @1268
-					    Parent_View 	@1266
-					    location   	(2098, 840)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.506173
-					    height     	73
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$320" @1269
-				location   	(1754, 1178)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3D4C68FF01BF"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$321" @1270
-					Parent_View 	@1269
-					location   	(-198, 234)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4C69020317"
-					client     	@1269
-					supplier   	@1256
-					line_style 	3
-					origin_attachment 	(1754, 1178)
-					terminal_attachment 	(1301, 1178))
-				    (object RoleView "syntheticWildcard" @1271
-					Parent_View 	@1269
-					location   	(-198, 234)
-					label      	(object SegLabel @1272
-					    Parent_View 	@1271
-					    location   	(1828, 1261)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+syntheticWildcard"
-					    pctDist    	0.163355
-					    height     	83
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4C69020318"
-					client     	@1269
-					supplier   	@1263
-					vertices   	(list Points
-					    (1754, 1178)
-					    (2028, 1178)
-					    (2028, 999))
-					line_style 	3
-					origin_attachment 	(1754, 1178)
-					terminal_attachment 	(2028, 999)
-					label      	(object SegLabel @1273
-					    Parent_View 	@1271
-					    location   	(2082, 1098)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.783664
-					    height     	54
-					    orientation 	1))))))
-		    (object ClassDiagram "10. Diagnostics"
-			quid       	"3BFE5F0803E2"
-			title      	"10. Diagnostics"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::DOMNode" @1274
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(400, 1024)
-				label      	(object ItemLabel
-				    Parent_View 	@1274
-				    location   	(66, 990)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	668
-				    justify    	0
-				    label      	"DOMNode")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@1274
-				    location   	(66, 940)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	668
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	14671839
-				quidu      	"3BFE64A50117"
-				width      	686
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDDiagnosticSeverity" @1275
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1040, 656)
-				label      	(object ItemLabel
-				    Parent_View 	@1275
-				    location   	(818, 547)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	444
-				    justify    	0
-				    label      	"XSDDiagnosticSeverity")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@1275
-				    location   	(818, 497)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	444
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3BFE68A7032F"
-				width      	462
-				height     	342
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @1276
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(192, 112)
-				label      	(object ItemLabel
-				    Parent_View 	@1276
-				    location   	(59, 60)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	266
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	284
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDConcreteComponent" @1277
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(896, 112)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1277
-				    location   	(540, 64)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	713
-				    justify    	0
-				    label      	"XSDConcreteComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD7B40065"
-				width      	731
-				height     	125
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDDiagnostic" @1278
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(384, 608)
-				label      	(object ItemLabel
-				    Parent_View 	@1278
-				    location   	(64, 402)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	640
-				    justify    	0
-				    label      	"XSDDiagnostic")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3BFE5F910046"
-				width      	658
-				height     	436
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$222" @1279
-				location   	(144, 283)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BFE6431035F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$223" @1280
-					Parent_View 	@1279
-					location   	(-1088, -661)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFE643201C6"
-					client     	@1279
-					supplier   	@1276
-					line_style 	3
-					origin_attachment 	(144, 283)
-					terminal_attachment 	(144, 176))
-				    (object RoleView "allDiagnostics" @1281
-					Parent_View 	@1279
-					location   	(-1088, -661)
-					label      	(object SegLabel @1282
-					    Parent_View 	@1281
-					    location   	(309, 330)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+allDiagnostics"
-					    pctDist    	0.448598
-					    height     	165
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFE643201C7"
-					client     	@1279
-					supplier   	@1278
-					line_style 	3
-					origin_attachment 	(144, 283)
-					terminal_attachment 	(144, 390)
-					label      	(object SegLabel @1283
-					    Parent_View 	@1281
-					    location   	(96, 327)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.420561
-					    height     	49
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$218" @1284
-				location   	(1028, 440)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BFE622703CD"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$219" @1285
-					Parent_View 	@1284
-					location   	(-396, -72)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFE622B0061"
-					client     	@1284
-					supplier   	@1278
-					line_style 	3
-					origin_attachment 	(1028, 440)
-					terminal_attachment 	(713, 440))
-				    (object RoleView "components" @1286
-					Parent_View 	@1284
-					location   	(-396, -72)
-					label      	(object SegLabel @1287
-					    Parent_View 	@1286
-					    location   	(938, 230)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	252
-					    justify    	0
-					    label      	"+components"
-					    pctDist    	0.829181
-					    height     	151
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFE622B006C"
-					client     	@1284
-					supplier   	@1277
-					vertices   	(list Points
-					    (1028, 440)
-					    (1088, 440)
-					    (1088, 174))
-					line_style 	3
-					origin_attachment 	(1028, 440)
-					terminal_attachment 	(1088, 174)
-					label      	(object SegLabel @1288
-					    Parent_View 	@1286
-					    location   	(1143, 232)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"1..*"
-					    pctDist    	0.823848
-					    height     	55
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$220" @1289
-				location   	(688, 282)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BFE62690165"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$221" @1290
-					Parent_View 	@1289
-					location   	(160, -278)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFE626A0026"
-					client     	@1289
-					supplier   	@1277
-					line_style 	3
-					origin_attachment 	(688, 282)
-					terminal_attachment 	(688, 174))
-				    (object RoleView "diagnostics" @1291
-					Parent_View 	@1289
-					location   	(160, -278)
-					label      	(object SegLabel @1292
-					    Parent_View 	@1291
-					    location   	(822, 330)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+diagnostics"
-					    pctDist    	0.452632
-					    height     	134
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFE626A0027"
-					client     	@1289
-					supplier   	@1278
-					line_style 	3
-					origin_attachment 	(688, 282)
-					terminal_attachment 	(688, 390)
-					label      	(object SegLabel @1293
-					    Parent_View 	@1291
-					    location   	(645, 335)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.494737
-					    height     	44
-					    orientation 	1))))
-			    (object InheritView "" @1294
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3D4C0F4C01A1"
-				client     	@1278
-				supplier   	@1277
-				line_style 	3
-				origin_attachment 	(575, 390)
-				terminal_attachment 	(575, 174))))
-		    (object ClassDiagram "11. Supplemental"
-			quid       	"3C287E49019B"
-			title      	"11. Supplemental"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @1295
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(464, 816)
-				label      	(object ItemLabel
-				    Parent_View 	@1295
-				    location   	(47, 760)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	834
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	852
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @1296
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2112, 880)
-				label      	(object ItemLabel
-				    Parent_View 	@1296
-				    location   	(1731, 824)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	762
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	780
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDConcreteComponent" @1297
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(288, 112)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1297
-				    location   	(48, 62)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	480
-				    justify    	0
-				    label      	"XSDConcreteComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD7B40065"
-				width      	498
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDDiagnostic" @1298
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2384, 112)
-				label      	(object ItemLabel
-				    Parent_View 	@1298
-				    location   	(2236, 60)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"XSDDiagnostic")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3BFE5F910046"
-				width      	314
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$244" @1299
-				location   	(1382, 84)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C2882C50137"
-				roleview_list 	(list RoleViews
-				    (object RoleView "primaryComponent" @1300
-					Parent_View 	@1299
-					location   	(-250, -508)
-					label      	(object SegLabel @1301
-					    Parent_View 	@1300
-					    location   	(756, 116)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+primaryComponent"
-					    pctDist    	0.740828
-					    height     	32
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C2882C70113"
-					client     	@1299
-					supplier   	@1297
-					line_style 	3
-					origin_attachment 	(1382, 84)
-					terminal_attachment 	(537, 84)
-					label      	(object SegLabel @1302
-					    Parent_View 	@1300
-					    location   	(624, 55)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.897260
-					    height     	30
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$245" @1303
-					Parent_View 	@1299
-					location   	(-250, -508)
-					label      	(object SegLabel @1304
-					    Parent_View 	@1303
-					    location   	(2058, 126)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C2882C70112"
-					client     	@1299
-					supplier   	@1298
-					line_style 	3
-					origin_attachment 	(1382, 84)
-					terminal_attachment 	(2227, 84))))
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @1305
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2160, 688)
-				label      	(object ItemLabel
-				    Parent_View 	@1305
-				    location   	(1778, 607)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	764
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				compartment 	(object Compartment
-				    Parent_View 	@1305
-				    location   	(1778, 667)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	722
-				    compartmentItems 	(list Compartment
-					"+ elementDeclarationReference : boolean"
-					"+ circular : boolean"))
-				width      	782
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDFacet" @1306
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2320, 1072)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1306
-				    location   	(2100, 993)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	440
-				    justify    	0
-				    label      	"XSDFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C359403D2"
-				compartment 	(object Compartment
-				    Parent_View 	@1306
-				    location   	(2100, 1059)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	423
-				    compartmentItems 	(list Compartment
-					"+ facetName : String"
-					"+ effectiveValue : Value"))
-				width      	458
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @1307
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(448, 624)
-				label      	(object ItemLabel
-				    Parent_View 	@1307
-				    location   	(47, 568)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	802
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				compartment 	(object Compartment
-				    Parent_View 	@1307
-				    location   	(47, 628)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	1
-				    max_width  	769
-				    compartmentItems 	(list Compartment
-					"+ modelGroupDefinitionReference : boolean"))
-				width      	820
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDNamedComponent" @1308
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1232, 288)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1308
-				    location   	(1005, 159)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	454
-				    justify    	0
-				    label      	"XSDNamedComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846D303A4"
-				compartment 	(object Compartment
-				    Parent_View 	@1308
-				    location   	(1005, 225)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	4
-				    max_width  	356
-				    compartmentItems 	(list Compartment
-					"+ aliasName : String"
-					"+ uRI : String"
-					"+ aliasURI : String"
-					"+ qName : String"))
-				width      	472
-				height     	286
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefinableComponent" @1309
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(320, 352)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1309
-				    location   	(48, 298)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	544
-				    justify    	0
-				    label      	"XSDRedefinableComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B7FCA8B020B"
-				width      	562
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @1310
-				location   	(320, 510)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1309
-				vertices   	(list Points
-				    (320, 510)
-				    (320, 420)))
-			    (object InheritView "" @1311
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAC40090"
-				client     	@1307
-				supplier   	@1309
-				line_style 	3
-				origin_attachment 	(81, 556)
-				terminal_attachment 	(81, 510)
-				drawSupplier 	@1310)
-			    (object InheritView "" @1312
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAC800D2"
-				client     	@1295
-				supplier   	@1309
-				line_style 	3
-				origin_attachment 	(877, 748)
-				terminal_attachment 	(877, 510)
-				drawSupplier 	@1310)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxInclusiveFacet" @1313
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2320, 1808)
-				label      	(object ItemLabel
-				    Parent_View 	@1313
-				    location   	(2101, 1761)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	438
-				    justify    	0
-				    label      	"XSDMaxInclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C787D00DA"
-				width      	456
-				height     	119
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinInclusiveFacet" @1314
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(272, 1776)
-				label      	(object ItemLabel
-				    Parent_View 	@1314
-				    location   	(35, 1729)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	475
-				    justify    	0
-				    label      	"XSDMinInclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C788702C9"
-				width      	493
-				height     	119
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinExclusiveFacet" @1315
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(272, 1936)
-				label      	(object ItemLabel
-				    Parent_View 	@1315
-				    location   	(35, 1889)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	475
-				    justify    	0
-				    label      	"XSDMinExclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C792D000A"
-				width      	493
-				height     	118
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxExclusiveFacet" @1316
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2304, 1968)
-				label      	(object ItemLabel
-				    Parent_View 	@1316
-				    location   	(2073, 1917)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	462
-				    justify    	0
-				    label      	"XSDMaxExclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C789600C2"
-				width      	480
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDCardinalityFacet" @1317
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2336, 1424)
-				label      	(object ItemLabel
-				    Parent_View 	@1317
-				    location   	(2134, 1372)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	404
-				    justify    	0
-				    label      	"XSDCardinalityFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C755D03D2"
-				width      	422
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDBoundedFacet" @1318
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2352, 1264)
-				label      	(object ItemLabel
-				    Parent_View 	@1318
-				    location   	(2163, 1212)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	378
-				    justify    	0
-				    label      	"XSDBoundedFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C751D0344"
-				width      	396
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDOrderedFacet" @1319
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(224, 1392)
-				label      	(object ItemLabel
-				    Parent_View 	@1319
-				    location   	(43, 1340)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	362
-				    justify    	0
-				    label      	"XSDOrderedFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C74DD0248"
-				width      	380
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDNumericFacet" @1320
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 1232)
-				label      	(object ItemLabel
-				    Parent_View 	@1320
-				    location   	(49, 1178)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	382
-				    justify    	0
-				    label      	"XSDNumericFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C75950206"
-				width      	400
-				height     	132
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxFacet" @1321
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2336, 1616)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1321
-				    location   	(2135, 1537)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	402
-				    justify    	0
-				    label      	"XSDMaxFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C0A1CEB010E"
-				compartment 	(object Compartment
-				    Parent_View 	@1321
-				    location   	(2135, 1603)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	363
-				    compartmentItems 	(list Compartment
-					"+ inclusive : boolean"
-					"+ exclusive : boolean"))
-				width      	420
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDWhiteSpaceFacet" @1322
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2320, 2288)
-				label      	(object ItemLabel
-				    Parent_View 	@1322
-				    location   	(2102, 2236)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	436
-				    justify    	0
-				    label      	"XSDWhiteSpaceFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C784601B7"
-				width      	454
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDFractionDigitsFacet" @1323
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2304, 2624)
-				label      	(object ItemLabel
-				    Parent_View 	@1323
-				    location   	(2074, 2572)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	460
-				    justify    	0
-				    label      	"XSDFractionDigitsFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C79BE02EE"
-				width      	478
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDPatternFacet" @1324
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2368, 2128)
-				label      	(object ItemLabel
-				    Parent_View 	@1324
-				    location   	(2196, 2076)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	344
-				    justify    	0
-				    label      	"XSDPatternFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C6ADB026C"
-				width      	362
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDEnumerationFacet" @1325
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 2096)
-				label      	(object ItemLabel
-				    Parent_View 	@1325
-				    location   	(36, 2044)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	440
-				    justify    	0
-				    label      	"XSDEnumerationFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C6ACE0141"
-				width      	458
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDLengthFacet" @1326
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 2272)
-				label      	(object ItemLabel
-				    Parent_View 	@1326
-				    location   	(38, 2220)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	340
-				    justify    	0
-				    label      	"XSDLengthFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C776200E7"
-				width      	358
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinFacet" @1327
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 1584)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1327
-				    location   	(38, 1505)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	404
-				    justify    	0
-				    label      	"XSDMinFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C0A1CDE037C"
-				compartment 	(object Compartment
-				    Parent_View 	@1327
-				    location   	(38, 1571)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	363
-				    compartmentItems 	(list Compartment
-					"+ inclusive : boolean"
-					"+ exclusive : boolean"))
-				width      	422
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxLengthFacet" @1328
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2320, 2464)
-				label      	(object ItemLabel
-				    Parent_View 	@1328
-				    location   	(2111, 2412)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	418
-				    justify    	0
-				    label      	"XSDMaxLengthFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C77C70146"
-				width      	436
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinLengthFacet" @1329
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 2448)
-				label      	(object ItemLabel
-				    Parent_View 	@1329
-				    location   	(39, 2396)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	402
-				    justify    	0
-				    label      	"XSDMinLengthFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C778C0065"
-				width      	420
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDTotalDigitsFacet" @1330
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 2608)
-				label      	(object ItemLabel
-				    Parent_View 	@1330
-				    location   	(38, 2556)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	404
-				    justify    	0
-				    label      	"XSDTotalDigitsFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C79A0020E"
-				width      	422
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @1331
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(928, 1152)
-				label      	(object ItemLabel
-				    Parent_View 	@1331
-				    location   	(667, 1100)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	522
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				width      	540
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @1332
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(176, 1072)
-				label      	(object ItemLabel
-				    Parent_View 	@1332
-				    location   	(50, 1020)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	252
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	270
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @1333
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1232, 1360)
-				label      	(object ItemLabel
-				    Parent_View 	@1333
-				    location   	(944, 1304)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	576
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				compartment 	(object Compartment
-				    Parent_View 	@1333
-				    location   	(944, 1364)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	538
-				    compartmentItems 	(list Compartment
-					"<<0..*>> + validFacets : String"))
-				width      	594
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$256" @1334
-				location   	(1446, 1218)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28A994030A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "rootTypeDefinition" @1335
-					Parent_View 	@1334
-					location   	(582, -78)
-					label      	(object SegLabel @1336
-					    Parent_View 	@1335
-					    location   	(1580, 1173)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+rootTypeDefinition"
-					    pctDist    	3.268293
-					    height     	46
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A99700DD"
-					client     	@1334
-					supplier   	@1333
-					vertices   	(list Points
-					    (1446, 1218)
-					    (1487, 1218)
-					    (1487, 1292))
-					line_style 	3
-					origin_attachment 	(1446, 1218)
-					terminal_attachment 	(1487, 1292)
-					label      	(object SegLabel @1337
-					    Parent_View 	@1335
-					    location   	(1439, 1257)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.184211
-					    height     	39
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$257" @1338
-					Parent_View 	@1334
-					location   	(582, -78)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A99700E7"
-					client     	@1334
-					supplier   	@1333
-					vertices   	(list Points
-					    (1446, 1218)
-					    (1405, 1218)
-					    (1405, 1292))
-					line_style 	3
-					origin_attachment 	(1446, 1218)
-					terminal_attachment 	(1405, 1292))))
-			    (object AssociationViewNew "$UNNAMED$260" @1339
-				location   	(1733, 1575)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B08D0252"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$261" @1340
-					Parent_View 	@1339
-					location   	(917, 7)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B08E0091"
-					client     	@1339
-					supplier   	@1333
-					vertices   	(list Points
-					    (1733, 1575)
-					    (1487, 1575)
-					    (1487, 1428))
-					line_style 	3
-					origin_attachment 	(1733, 1575)
-					terminal_attachment 	(1487, 1428))
-				    (object RoleView "maxFacet" @1341
-					Parent_View 	@1339
-					location   	(917, 7)
-					label      	(object SegLabel @1342
-					    Parent_View 	@1341
-					    location   	(1751, 1541)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	204
-					    justify    	0
-					    label      	"+maxFacet"
-					    pctDist    	0.046243
-					    height     	35
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B08E009B"
-					client     	@1339
-					supplier   	@1321
-					line_style 	3
-					origin_attachment 	(1733, 1575)
-					terminal_attachment 	(2126, 1575)
-					label      	(object SegLabel @1343
-					    Parent_View 	@1341
-					    location   	(2042, 1536)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.789157
-					    height     	40
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$262" @1344
-				location   	(1587, 1793)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0AB0396"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$263" @1345
-					Parent_View 	@1344
-					location   	(707, -31)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0AC03C9"
-					client     	@1344
-					supplier   	@1333
-					vertices   	(list Points
-					    (1587, 1793)
-					    (1447, 1793)
-					    (1447, 1428))
-					line_style 	3
-					origin_attachment 	(1587, 1793)
-					terminal_attachment 	(1447, 1428))
-				    (object RoleView "maxInclusiveFacet" @1346
-					Parent_View 	@1344
-					location   	(707, -31)
-					label      	(object SegLabel @1347
-					    Parent_View 	@1346
-					    location   	(1737, 1751)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	360
-					    justify    	0
-					    label      	"+maxInclusiveFacet"
-					    pctDist    	0.298441
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0AC03D4"
-					client     	@1344
-					supplier   	@1313
-					line_style 	3
-					origin_attachment 	(1587, 1793)
-					terminal_attachment 	(2092, 1793)
-					label      	(object SegLabel @1348
-					    Parent_View 	@1346
-					    location   	(2020, 1754)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.859155
-					    height     	40
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$264" @1349
-				location   	(937, 1787)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0AF0338"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$265" @1350
-					Parent_View 	@1349
-					location   	(617, -5)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0B001F9"
-					client     	@1349
-					supplier   	@1333
-					vertices   	(list Points
-					    (937, 1787)
-					    (997, 1787)
-					    (997, 1428))
-					line_style 	3
-					origin_attachment 	(937, 1787)
-					terminal_attachment 	(997, 1428))
-				    (object RoleView "minInclusiveFacet" @1351
-					Parent_View 	@1349
-					location   	(617, -5)
-					label      	(object SegLabel @1352
-					    Parent_View 	@1351
-					    location   	(792, 1745)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+minInclusiveFacet"
-					    pctDist    	0.346062
-					    height     	43
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0B00203"
-					client     	@1349
-					supplier   	@1314
-					line_style 	3
-					origin_attachment 	(937, 1787)
-					terminal_attachment 	(518, 1787)
-					label      	(object SegLabel @1353
-					    Parent_View 	@1351
-					    location   	(575, 1743)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.863962
-					    height     	45
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$266" @1354
-				location   	(981, 1937)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0B30207"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$267" @1355
-					Parent_View 	@1354
-					location   	(677, -79)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0B40190"
-					client     	@1354
-					supplier   	@1333
-					vertices   	(list Points
-					    (981, 1937)
-					    (1041, 1937)
-					    (1041, 1428))
-					line_style 	3
-					origin_attachment 	(981, 1937)
-					terminal_attachment 	(1041, 1428))
-				    (object RoleView "minExclusiveFacet" @1356
-					Parent_View 	@1354
-					location   	(677, -79)
-					label      	(object SegLabel @1357
-					    Parent_View 	@1356
-					    location   	(823, 1900)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+minExclusiveFacet"
-					    pctDist    	0.341253
-					    height     	38
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0B4019A"
-					client     	@1354
-					supplier   	@1315
-					line_style 	3
-					origin_attachment 	(981, 1937)
-					terminal_attachment 	(518, 1937)
-					label      	(object SegLabel @1358
-					    Parent_View 	@1356
-					    location   	(589, 1897)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.846652
-					    height     	41
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$268" @1359
-				location   	(1469, 1953)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0B6028D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$269" @1360
-					Parent_View 	@1359
-					location   	(621, -95)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0B70217"
-					client     	@1359
-					supplier   	@1333
-					vertices   	(list Points
-					    (1469, 1953)
-					    (1400, 1953)
-					    (1400, 1428))
-					line_style 	3
-					origin_attachment 	(1469, 1953)
-					terminal_attachment 	(1400, 1428))
-				    (object RoleView "maxExclusiveFacet" @1361
-					Parent_View 	@1359
-					location   	(621, -95)
-					label      	(object SegLabel @1362
-					    Parent_View 	@1361
-					    location   	(1646, 1913)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	384
-					    justify    	0
-					    label      	"+maxExclusiveFacet"
-					    pctDist    	0.298097
-					    height     	41
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0B70221"
-					client     	@1359
-					supplier   	@1316
-					line_style 	3
-					origin_attachment 	(1469, 1953)
-					terminal_attachment 	(2064, 1953)
-					label      	(object SegLabel @1363
-					    Parent_View 	@1361
-					    location   	(1961, 1913)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.827236
-					    height     	41
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$270" @1364
-				location   	(1122, 2180)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0BC0051"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$271" @1365
-					Parent_View 	@1364
-					location   	(-318, 628)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0BC0246"
-					client     	@1364
-					supplier   	@1333
-					line_style 	3
-					origin_attachment 	(1122, 2180)
-					terminal_attachment 	(1122, 1428))
-				    (object RoleView "lengthFacet" @1366
-					Parent_View 	@1364
-					location   	(-318, 628)
-					label      	(object SegLabel @1367
-					    Parent_View 	@1366
-					    location   	(804, 2204)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+lengthFacet"
-					    pctDist    	0.475472
-					    height     	37
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0BC0250"
-					client     	@1364
-					supplier   	@1326
-					vertices   	(list Points
-					    (1122, 2180)
-					    (1122, 2240)
-					    (387, 2240))
-					line_style 	3
-					origin_attachment 	(1122, 2180)
-					terminal_attachment 	(387, 2240)
-					label      	(object SegLabel @1368
-					    Parent_View 	@1366
-					    location   	(471, 2204)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.895597
-					    height     	37
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$274" @1369
-				location   	(1084, 1989)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0C2021D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$275" @1370
-					Parent_View 	@1369
-					location   	(-1380, 437)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C300AB"
-					client     	@1369
-					supplier   	@1333
-					line_style 	3
-					origin_attachment 	(1084, 1989)
-					terminal_attachment 	(1084, 1428))
-				    (object RoleView "enumerationFacets" @1371
-					Parent_View 	@1369
-					location   	(-1380, 437)
-					label      	(object SegLabel @1372
-					    Parent_View 	@1371
-					    location   	(837, 2016)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+enumerationFacets"
-					    pctDist    	0.465857
-					    height     	34
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C300AC"
-					client     	@1369
-					supplier   	@1325
-					vertices   	(list Points
-					    (1084, 1989)
-					    (1084, 2049)
-					    (485, 2049))
-					line_style 	3
-					origin_attachment 	(1084, 1989)
-					terminal_attachment 	(485, 2049)
-					label      	(object SegLabel @1373
-					    Parent_View 	@1371
-					    location   	(583, 2021)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.851290
-					    height     	29
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$276" @1374
-				location   	(1451, 2074)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0C50159"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$277" @1375
-					Parent_View 	@1374
-					location   	(-1525, 538)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C600B0"
-					client     	@1374
-					supplier   	@1333
-					vertices   	(list Points
-					    (1451, 2074)
-					    (1362, 2074)
-					    (1362, 1428))
-					line_style 	3
-					origin_attachment 	(1451, 2074)
-					terminal_attachment 	(1362, 1428))
-				    (object RoleView "patternFacets" @1376
-					Parent_View 	@1374
-					location   	(-1525, 538)
-					label      	(object SegLabel @1377
-					    Parent_View 	@1376
-					    location   	(1720, 2038)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+patternFacets"
-					    pctDist    	0.367223
-					    height     	37
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C600BA"
-					client     	@1374
-					supplier   	@1324
-					line_style 	3
-					origin_attachment 	(1451, 2074)
-					terminal_attachment 	(2187, 2074)
-					label      	(object SegLabel @1378
-					    Parent_View 	@1376
-					    location   	(1972, 2035)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.708649
-					    height     	40
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$278" @1379
-				location   	(1827, 1400)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0C802A7"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$279" @1380
-					Parent_View 	@1379
-					location   	(-1149, -472)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C901EA"
-					client     	@1379
-					supplier   	@1333
-					line_style 	3
-					origin_attachment 	(1827, 1400)
-					terminal_attachment 	(1529, 1400))
-				    (object RoleView "cardinalityFacet" @1381
-					Parent_View 	@1379
-					location   	(-1149, -472)
-					label      	(object SegLabel @1382
-					    Parent_View 	@1381
-					    location   	(1847, 1358)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	312
-					    justify    	0
-					    label      	"+cardinalityFacet"
-					    pctDist    	0.071730
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C901F5"
-					client     	@1379
-					supplier   	@1317
-					line_style 	3
-					origin_attachment 	(1827, 1400)
-					terminal_attachment 	(2125, 1400)
-					label      	(object SegLabel @1383
-					    Parent_View 	@1381
-					    location   	(2083, 1357)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.863426
-					    height     	44
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$288" @1384
-				location   	(1262, 2413)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0DB0377"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$289" @1385
-					Parent_View 	@1384
-					location   	(-786, 301)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0DC035A"
-					client     	@1384
-					supplier   	@1333
-					line_style 	3
-					origin_attachment 	(1262, 2413)
-					terminal_attachment 	(1262, 1428))
-				    (object RoleView "fractionDigitsFacet" @1386
-					Parent_View 	@1384
-					location   	(-786, 301)
-					label      	(object SegLabel @1387
-					    Parent_View 	@1386
-					    location   	(1608, 2556)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	360
-					    justify    	0
-					    label      	"+fractionDigitsFacet"
-					    pctDist    	0.537393
-					    height     	41
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0DC0364"
-					client     	@1384
-					supplier   	@1323
-					vertices   	(list Points
-					    (1262, 2413)
-					    (1262, 2596)
-					    (2065, 2596))
-					line_style 	3
-					origin_attachment 	(1262, 2413)
-					terminal_attachment 	(2065, 2596)
-					label      	(object SegLabel @1388
-					    Parent_View 	@1386
-					    location   	(1979, 2556)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.913886
-					    height     	41
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$292" @1389
-				location   	(1841, 1306)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0E300D9"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$293" @1390
-					Parent_View 	@1389
-					location   	(-1135, -790)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0E4038E"
-					client     	@1389
-					supplier   	@1333
-					line_style 	3
-					origin_attachment 	(1841, 1306)
-					terminal_attachment 	(1529, 1306))
-				    (object RoleView "boundedFacet" @1391
-					Parent_View 	@1389
-					location   	(-1135, -790)
-					label      	(object SegLabel @1392
-					    Parent_View 	@1391
-					    location   	(1832, 1270)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	288
-					    justify    	0
-					    label      	"+boundedFacet"
-					    pctDist    	-0.031746
-					    height     	37
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0E40398"
-					client     	@1389
-					supplier   	@1318
-					line_style 	3
-					origin_attachment 	(1841, 1306)
-					terminal_attachment 	(2154, 1306)
-					label      	(object SegLabel @1393
-					    Parent_View 	@1391
-					    location   	(2077, 1275)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.754717
-					    height     	32
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$272" @1394
-				location   	(1328, 2186)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0BF018C"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$273" @1395
-					Parent_View 	@1394
-					location   	(-640, 634)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C0006B"
-					client     	@1394
-					supplier   	@1333
-					line_style 	3
-					origin_attachment 	(1328, 2186)
-					terminal_attachment 	(1328, 1428))
-				    (object RoleView "whiteSpaceFacet" @1396
-					Parent_View 	@1394
-					location   	(-640, 634)
-					label      	(object SegLabel @1397
-					    Parent_View 	@1396
-					    location   	(1673, 2207)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+whiteSpaceFacet"
-					    pctDist    	0.490909
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C00075"
-					client     	@1394
-					supplier   	@1322
-					vertices   	(list Points
-					    (1328, 2186)
-					    (1328, 2246)
-					    (2093, 2246))
-					line_style 	3
-					origin_attachment 	(1328, 2186)
-					terminal_attachment 	(2093, 2246)
-					label      	(object SegLabel @1398
-					    Parent_View 	@1396
-					    location   	(2033, 2203)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.926763
-					    height     	44
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$290" @1399
-				location   	(674, 1390)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0DF0048"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$291" @1400
-					Parent_View 	@1399
-					location   	(-1854, -706)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0DF03B9"
-					client     	@1399
-					supplier   	@1333
-					line_style 	3
-					origin_attachment 	(674, 1390)
-					terminal_attachment 	(935, 1390))
-				    (object RoleView "orderedFacet" @1401
-					Parent_View 	@1399
-					location   	(-1854, -706)
-					label      	(object SegLabel @1402
-					    Parent_View 	@1401
-					    location   	(658, 1353)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	264
-					    justify    	0
-					    label      	"+orderedFacet"
-					    pctDist    	0.061538
-					    height     	38
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0DF03C3"
-					client     	@1399
-					supplier   	@1319
-					line_style 	3
-					origin_attachment 	(674, 1390)
-					terminal_attachment 	(414, 1390)
-					label      	(object SegLabel @1403
-					    Parent_View 	@1401
-					    location   	(510, 1355)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.634615
-					    height     	36
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$280" @1404
-				location   	(687, 1296)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0CB039C"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$281" @1405
-					Parent_View 	@1404
-					location   	(-1809, -576)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0CC03D0"
-					client     	@1404
-					supplier   	@1333
-					line_style 	3
-					origin_attachment 	(687, 1296)
-					terminal_attachment 	(935, 1296))
-				    (object RoleView "numericFacet" @1406
-					Parent_View 	@1404
-					location   	(-1809, -576)
-					label      	(object SegLabel @1407
-					    Parent_View 	@1406
-					    location   	(668, 1257)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+numericFacet"
-					    pctDist    	0.080972
-					    height     	40
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0CC03D1"
-					client     	@1404
-					supplier   	@1320
-					line_style 	3
-					origin_attachment 	(687, 1296)
-					terminal_attachment 	(440, 1296)
-					label      	(object SegLabel @1408
-					    Parent_View 	@1406
-					    location   	(506, 1260)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.736842
-					    height     	37
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$294" @1409
-				location   	(1689, 1662)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B44401EC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$295" @1410
-					Parent_View 	@1409
-					location   	(-183, -354)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B4450360"
-					client     	@1409
-					supplier   	@1333
-					vertices   	(list Points
-					    (1689, 1662)
-					    (1487, 1662)
-					    (1487, 1428))
-					line_style 	3
-					origin_attachment 	(1689, 1662)
-					terminal_attachment 	(1487, 1428))
-				    (object RoleView "effectiveMaxFacet" @1411
-					Parent_View 	@1409
-					location   	(-183, -354)
-					label      	(object SegLabel @1412
-					    Parent_View 	@1411
-					    location   	(1769, 1623)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+effectiveMaxFacet"
-					    pctDist    	0.182051
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B445036A"
-					client     	@1409
-					supplier   	@1321
-					line_style 	3
-					origin_attachment 	(1689, 1662)
-					terminal_attachment 	(2126, 1662)
-					label      	(object SegLabel @1413
-					    Parent_View 	@1411
-					    location   	(2044, 1627)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.815385
-					    height     	36
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$296" @1414
-				location   	(1328, 2258)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B54F0145"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$297" @1415
-					Parent_View 	@1414
-					location   	(-1072, -462)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B550038C"
-					client     	@1414
-					supplier   	@1333
-					line_style 	3
-					origin_attachment 	(1328, 2258)
-					terminal_attachment 	(1328, 1428))
-				    (object RoleView "effectiveWhiteSpaceFacet" @1416
-					Parent_View 	@1414
-					location   	(-1072, -462)
-					label      	(object SegLabel @1417
-					    Parent_View 	@1416
-					    location   	(1685, 2288)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	492
-					    justify    	0
-					    label      	"+effectiveWhiteSpaceFacet"
-					    pctDist    	0.508541
-					    height     	37
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B5500396"
-					client     	@1414
-					supplier   	@1322
-					vertices   	(list Points
-					    (1328, 2258)
-					    (1328, 2324)
-					    (2093, 2324))
-					line_style 	3
-					origin_attachment 	(1328, 2258)
-					terminal_attachment 	(2093, 2324)
-					label      	(object SegLabel @1418
-					    Parent_View 	@1416
-					    location   	(2009, 2293)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.898817
-					    height     	32
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$298" @1419
-				location   	(1297, 2366)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B5C4011C"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$299" @1420
-					Parent_View 	@1419
-					location   	(-607, -722)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B5C5020D"
-					client     	@1419
-					supplier   	@1333
-					line_style 	3
-					origin_attachment 	(1297, 2366)
-					terminal_attachment 	(1297, 1428))
-				    (object RoleView "effectiveMaxLengthFacet" @1421
-					Parent_View 	@1419
-					location   	(-607, -722)
-					label      	(object SegLabel @1422
-					    Parent_View 	@1421
-					    location   	(1657, 2463)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	480
-					    justify    	0
-					    label      	"+effectiveMaxLengthFacet"
-					    pctDist    	0.526906
-					    height     	37
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B5C50217"
-					client     	@1419
-					supplier   	@1328
-					vertices   	(list Points
-					    (1297, 2366)
-					    (1297, 2499)
-					    (2102, 2499))
-					line_style 	3
-					origin_attachment 	(1297, 2366)
-					terminal_attachment 	(2102, 2499)
-					label      	(object SegLabel @1423
-					    Parent_View 	@1421
-					    location   	(2007, 2471)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.899308
-					    height     	29
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$300" @1424
-				location   	(1262, 2449)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B62A00AA"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$301" @1425
-					Parent_View 	@1424
-					location   	(-1170, -815)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B62B0138"
-					client     	@1424
-					supplier   	@1333
-					line_style 	3
-					origin_attachment 	(1262, 2449)
-					terminal_attachment 	(1262, 1428))
-				    (object RoleView "effectiveFractionDigitsFacet" @1426
-					Parent_View 	@1424
-					location   	(-1170, -815)
-					label      	(object SegLabel @1427
-					    Parent_View 	@1426
-					    location   	(1640, 2634)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	528
-					    justify    	0
-					    label      	"+effectiveFractionDigitsFacet"
-					    pctDist    	0.585315
-					    height     	35
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B62B0142"
-					client     	@1424
-					supplier   	@1323
-					vertices   	(list Points
-					    (1262, 2449)
-					    (1262, 2668)
-					    (2065, 2668))
-					line_style 	3
-					origin_attachment 	(1262, 2449)
-					terminal_attachment 	(2065, 2668)
-					label      	(object SegLabel @1428
-					    Parent_View 	@1426
-					    location   	(1989, 2629)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.926485
-					    height     	40
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$302" @1429
-				location   	(1422, 2159)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B6B003A6"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$303" @1430
-					Parent_View 	@1429
-					location   	(-770, -1313)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B6B10311"
-					client     	@1429
-					supplier   	@1333
-					vertices   	(list Points
-					    (1422, 2159)
-					    (1362, 2159)
-					    (1362, 1428))
-					line_style 	3
-					origin_attachment 	(1422, 2159)
-					terminal_attachment 	(1362, 1428))
-				    (object RoleView "effectivePatternFacet" @1431
-					Parent_View 	@1429
-					location   	(-770, -1313)
-					label      	(object SegLabel @1432
-					    Parent_View 	@1431
-					    location   	(1727, 2125)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	408
-					    justify    	0
-					    label      	"+effectivePatternFacet"
-					    pctDist    	0.399090
-					    height     	35
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B6B10312"
-					client     	@1429
-					supplier   	@1324
-					line_style 	3
-					origin_attachment 	(1422, 2159)
-					terminal_attachment 	(2187, 2159)
-					label      	(object SegLabel @1433
-					    Parent_View 	@1431
-					    location   	(2102, 2119)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.889226
-					    height     	41
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$304" @1434
-				location   	(1084, 2083)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B7CA026B"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$305" @1435
-					Parent_View 	@1434
-					location   	(828, -1373)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B7CB0186"
-					client     	@1434
-					supplier   	@1333
-					line_style 	3
-					origin_attachment 	(1084, 2083)
-					terminal_attachment 	(1084, 1428))
-				    (object RoleView "effectiveEnumerationFacet" @1436
-					Parent_View 	@1434
-					location   	(828, -1373)
-					label      	(object SegLabel @1437
-					    Parent_View 	@1436
-					    location   	(822, 2101)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	504
-					    justify    	0
-					    label      	"+effectiveEnumerationFacet"
-					    pctDist    	0.488619
-					    height     	43
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B7CB0190"
-					client     	@1434
-					supplier   	@1325
-					vertices   	(list Points
-					    (1084, 2083)
-					    (1084, 2143)
-					    (485, 2143))
-					line_style 	3
-					origin_attachment 	(1084, 2083)
-					terminal_attachment 	(485, 2143)
-					label      	(object SegLabel @1438
-					    Parent_View 	@1436
-					    location   	(531, 2100)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.931715
-					    height     	44
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$310" @1439
-				location   	(1122, 2241)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B8DC0052"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$311" @1440
-					Parent_View 	@1439
-					location   	(866, -479)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B8DC03B9"
-					client     	@1439
-					supplier   	@1333
-					line_style 	3
-					origin_attachment 	(1122, 2241)
-					terminal_attachment 	(1122, 1428))
-				    (object RoleView "effectiveLengthFacet" @1441
-					Parent_View 	@1439
-					location   	(866, -479)
-					label      	(object SegLabel @1442
-					    Parent_View 	@1441
-					    location   	(800, 2279)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+effectiveLengthFacet"
-					    pctDist    	0.491731
-					    height     	40
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B8DC03C3"
-					client     	@1439
-					supplier   	@1326
-					vertices   	(list Points
-					    (1122, 2241)
-					    (1122, 2318)
-					    (387, 2318))
-					line_style 	3
-					origin_attachment 	(1122, 2241)
-					terminal_attachment 	(387, 2318)
-					label      	(object SegLabel @1443
-					    Parent_View 	@1441
-					    location   	(470, 2279)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.898567
-					    height     	40
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$258" @1444
-				location   	(773, 1565)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B085025B"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$259" @1445
-					Parent_View 	@1444
-					location   	(469, 13)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0860270"
-					client     	@1444
-					supplier   	@1333
-					vertices   	(list Points
-					    (773, 1565)
-					    (959, 1565)
-					    (959, 1428))
-					line_style 	3
-					origin_attachment 	(773, 1565)
-					terminal_attachment 	(959, 1428))
-				    (object RoleView "minFacet" @1446
-					Parent_View 	@1444
-					location   	(469, 13)
-					label      	(object SegLabel @1447
-					    Parent_View 	@1446
-					    location   	(753, 1532)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	192
-					    justify    	0
-					    label      	"+minFacet"
-					    pctDist    	0.063091
-					    height     	34
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B086027A"
-					client     	@1444
-					supplier   	@1327
-					line_style 	3
-					origin_attachment 	(773, 1565)
-					terminal_attachment 	(451, 1565)
-					label      	(object SegLabel @1448
-					    Parent_View 	@1446
-					    location   	(534, 1523)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.746667
-					    height     	43
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$312" @1449
-				location   	(816, 1650)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B97001DB"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$313" @1450
-					Parent_View 	@1449
-					location   	(496, -334)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B97100CF"
-					client     	@1449
-					supplier   	@1333
-					vertices   	(list Points
-					    (816, 1650)
-					    (959, 1650)
-					    (959, 1428))
-					line_style 	3
-					origin_attachment 	(816, 1650)
-					terminal_attachment 	(959, 1428))
-				    (object RoleView "effectiveMinFacet" @1451
-					Parent_View 	@1449
-					location   	(496, -334)
-					label      	(object SegLabel @1452
-					    Parent_View 	@1451
-					    location   	(764, 1614)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+effectiveMinFacet"
-					    pctDist    	0.141618
-					    height     	37
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B97100D9"
-					client     	@1449
-					supplier   	@1327
-					line_style 	3
-					origin_attachment 	(816, 1650)
-					terminal_attachment 	(451, 1650)
-					label      	(object SegLabel @1453
-					    Parent_View 	@1451
-					    location   	(523, 1606)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.802740
-					    height     	44
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$282" @1454
-				location   	(1297, 2321)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0CF0199"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$283" @1455
-					Parent_View 	@1454
-					location   	(-719, 497)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0D20085"
-					client     	@1454
-					supplier   	@1333
-					line_style 	3
-					origin_attachment 	(1297, 2321)
-					terminal_attachment 	(1297, 1428))
-				    (object RoleView "maxLengthFacet" @1456
-					Parent_View 	@1454
-					location   	(-719, 497)
-					label      	(object SegLabel @1457
-					    Parent_View 	@1456
-					    location   	(1630, 2380)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+maxLengthFacet"
-					    pctDist    	0.472255
-					    height     	30
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0D2008F"
-					client     	@1454
-					supplier   	@1328
-					vertices   	(list Points
-					    (1297, 2321)
-					    (1297, 2409)
-					    (2102, 2409))
-					line_style 	3
-					origin_attachment 	(1297, 2321)
-					terminal_attachment 	(2102, 2409)
-					label      	(object SegLabel @1458
-					    Parent_View 	@1456
-					    location   	(1994, 2366)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.879208
-					    height     	44
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$284" @1459
-				location   	(1159, 2273)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0D500C5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$285" @1460
-					Parent_View 	@1459
-					location   	(-281, 449)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0D6001D"
-					client     	@1459
-					supplier   	@1333
-					line_style 	3
-					origin_attachment 	(1159, 2273)
-					terminal_attachment 	(1159, 1428))
-				    (object RoleView "minLengthFacet" @1461
-					Parent_View 	@1459
-					location   	(-281, 449)
-					label      	(object SegLabel @1462
-					    Parent_View 	@1461
-					    location   	(857, 2372)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	324
-					    justify    	0
-					    label      	"+minLengthFacet"
-					    pctDist    	0.519527
-					    height     	38
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0D60027"
-					client     	@1459
-					supplier   	@1329
-					vertices   	(list Points
-					    (1159, 2273)
-					    (1159, 2409)
-					    (450, 2409))
-					line_style 	3
-					origin_attachment 	(1159, 2273)
-					terminal_attachment 	(450, 2409)
-					label      	(object SegLabel @1463
-					    Parent_View 	@1461
-					    location   	(523, 2369)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.913610
-					    height     	41
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$308" @1464
-				location   	(1197, 2334)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B898016D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$309" @1465
-					Parent_View 	@1464
-					location   	(941, -610)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B8990056"
-					client     	@1464
-					supplier   	@1333
-					line_style 	3
-					origin_attachment 	(1197, 2334)
-					terminal_attachment 	(1197, 1428))
-				    (object RoleView "effectiveMinLengthFacet" @1466
-					Parent_View 	@1464
-					location   	(941, -610)
-					label      	(object SegLabel @1467
-					    Parent_View 	@1466
-					    location   	(856, 2454)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	468
-					    justify    	0
-					    label      	"+effectiveMinLengthFacet"
-					    pctDist    	0.552604
-					    height     	40
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B8990060"
-					client     	@1464
-					supplier   	@1329
-					vertices   	(list Points
-					    (1197, 2334)
-					    (1197, 2493)
-					    (450, 2493))
-					line_style 	3
-					origin_attachment 	(1197, 2334)
-					terminal_attachment 	(450, 2493)
-					label      	(object SegLabel @1468
-					    Parent_View 	@1466
-					    location   	(527, 2451)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.916047
-					    height     	43
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$306" @1469
-				location   	(1231, 2438)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B8400062"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$307" @1470
-					Parent_View 	@1469
-					location   	(863, -746)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B841001D"
-					client     	@1469
-					supplier   	@1333
-					line_style 	3
-					origin_attachment 	(1231, 2438)
-					terminal_attachment 	(1231, 1428))
-				    (object RoleView "effectiveTotalDigitsFacet" @1471
-					Parent_View 	@1469
-					location   	(863, -746)
-					label      	(object SegLabel @1472
-					    Parent_View 	@1471
-					    location   	(859, 2632)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	468
-					    justify    	0
-					    label      	"+effectiveTotalDigitsFacet"
-					    pctDist    	0.597030
-					    height     	37
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B8410027"
-					client     	@1469
-					supplier   	@1330
-					vertices   	(list Points
-					    (1231, 2438)
-					    (1231, 2668)
-					    (451, 2668))
-					line_style 	3
-					origin_attachment 	(1231, 2438)
-					terminal_attachment 	(451, 2668)
-					label      	(object SegLabel @1473
-					    Parent_View 	@1471
-					    location   	(534, 2631)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.918812
-					    height     	38
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$286" @1474
-				location   	(1231, 2397)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0D800DE"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$287" @1475
-					Parent_View 	@1474
-					location   	(-209, 253)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0D803CD"
-					client     	@1474
-					supplier   	@1333
-					line_style 	3
-					origin_attachment 	(1231, 2397)
-					terminal_attachment 	(1231, 1428))
-				    (object RoleView "totalDigitsFacet" @1476
-					Parent_View 	@1474
-					location   	(-209, 253)
-					label      	(object SegLabel @1477
-					    Parent_View 	@1476
-					    location   	(853, 2550)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	312
-					    justify    	0
-					    label      	"+totalDigitsFacet"
-					    pctDist    	0.585567
-					    height     	38
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0D803D7"
-					client     	@1474
-					supplier   	@1330
-					vertices   	(list Points
-					    (1231, 2397)
-					    (1231, 2587)
-					    (451, 2587))
-					line_style 	3
-					origin_attachment 	(1231, 2397)
-					terminal_attachment 	(451, 2587)
-					label      	(object SegLabel @1478
-					    Parent_View 	@1476
-					    location   	(535, 2560)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.914647
-					    height     	28
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @1479
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1232, 768)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1479
-				    location   	(1019, 576)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	426
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	444
-				height     	413
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @1480
-				location   	(1209, 1065)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1479
-				vertices   	(list Points
-				    (1209, 1065)
-				    (1209, 974)))
-			    (object AssociationViewNew "$UNNAMED$242" @1481
-				location   	(1090, 1031)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C2880F503D9"
-				roleview_list 	(list RoleViews
-				    (object RoleView "rootTypeDefinition" @1482
-					Parent_View 	@1481
-					location   	(322, -25)
-					label      	(object SegLabel @1483
-					    Parent_View 	@1482
-					    location   	(897, 1036)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+rootTypeDefinition"
-					    pctDist    	-0.098765
-					    height     	194
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C2880F9003C"
-					client     	@1481
-					supplier   	@1479
-					line_style 	3
-					origin_attachment 	(1090, 1031)
-					terminal_attachment 	(1090, 974)
-					label      	(object SegLabel @1484
-					    Parent_View 	@1482
-					    location   	(1121, 1034)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.061728
-					    height     	31
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$243" @1485
-					Parent_View 	@1481
-					location   	(322, -25)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C2880F90046"
-					client     	@1481
-					supplier   	@1331
-					line_style 	3
-					origin_attachment 	(1090, 1031)
-					terminal_attachment 	(1090, 1088))))
-			    (object AssociationViewNew "$UNNAMED$248" @1486
-				location   	(1538, 873)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28A6DB01E5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "rootType" @1487
-					Parent_View 	@1486
-					location   	(178, 105)
-					label      	(object SegLabel @1488
-					    Parent_View 	@1487
-					    location   	(1558, 792)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+rootType"
-					    pctDist    	-1.760870
-					    height     	20
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A6DD03DD"
-					client     	@1486
-					supplier   	@1479
-					vertices   	(list Points
-					    (1538, 873)
-					    (1538, 919)
-					    (1454, 919))
-					line_style 	3
-					origin_attachment 	(1538, 873)
-					terminal_attachment 	(1454, 919)
-					label      	(object SegLabel @1489
-					    Parent_View 	@1487
-					    location   	(1509, 875)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.016667
-					    height     	30
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$249" @1490
-					Parent_View 	@1486
-					location   	(178, 105)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A6DD03DE"
-					client     	@1486
-					supplier   	@1479
-					vertices   	(list Points
-					    (1538, 873)
-					    (1538, 828)
-					    (1454, 828))
-					line_style 	3
-					origin_attachment 	(1538, 873)
-					terminal_attachment 	(1454, 828))))
-			    (object AssociationViewNew "$UNNAMED$250" @1491
-				location   	(1535, 684)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28A7120108"
-				roleview_list 	(list RoleViews
-				    (object RoleView "baseType" @1492
-					Parent_View 	@1491
-					location   	(175, -84)
-					label      	(object SegLabel @1493
-					    Parent_View 	@1492
-					    location   	(1559, 597)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	204
-					    justify    	0
-					    label      	"+baseType"
-					    pctDist    	-1.977273
-					    height     	24
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A7140151"
-					client     	@1491
-					supplier   	@1479
-					vertices   	(list Points
-					    (1535, 684)
-					    (1535, 728)
-					    (1454, 728))
-					line_style 	3
-					origin_attachment 	(1535, 684)
-					terminal_attachment 	(1454, 728)
-					label      	(object SegLabel @1494
-					    Parent_View 	@1492
-					    location   	(1506, 683)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.027778
-					    height     	30
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$251" @1495
-					Parent_View 	@1491
-					location   	(175, -84)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A714015B"
-					client     	@1491
-					supplier   	@1479
-					vertices   	(list Points
-					    (1535, 684)
-					    (1535, 641)
-					    (1454, 641))
-					line_style 	3
-					origin_attachment 	(1535, 684)
-					terminal_attachment 	(1454, 641))))
-			    (object AssociationViewNew "$UNNAMED$254" @1496
-				location   	(613, 940)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28A7ED03C0"
-				roleview_list 	(list RoleViews
-				    (object RoleView "complexType" @1497
-					Parent_View 	@1496
-					location   	(-747, 172)
-					label      	(object SegLabel @1498
-					    Parent_View 	@1497
-					    location   	(465, 983)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	264
-					    justify    	0
-					    label      	"+complexType"
-					    pctDist    	0.373057
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A7F40117"
-					client     	@1496
-					supplier   	@1332
-					vertices   	(list Points
-					    (613, 940)
-					    (284, 940)
-					    (284, 1008))
-					line_style 	3
-					origin_attachment 	(613, 940)
-					terminal_attachment 	(284, 1008)
-					label      	(object SegLabel @1499
-					    Parent_View 	@1497
-					    location   	(224, 972)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.909320
-					    height     	61
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$255" @1500
-					Parent_View 	@1496
-					location   	(-747, 172)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A7F40121"
-					client     	@1496
-					supplier   	@1479
-					line_style 	3
-					origin_attachment 	(613, 940)
-					terminal_attachment 	(1010, 940))))
-			    (object InheritView "" @1501
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAB1004D"
-				client     	@1479
-				supplier   	@1309
-				line_style 	3
-				origin_attachment 	(1112, 562)
-				terminal_attachment 	(1112, 510)
-				drawSupplier 	@1310)
-			    (object InheritView "" @1502
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0D01901F1"
-				client     	@1331
-				supplier   	@1479
-				line_style 	3
-				origin_attachment 	(1146, 1088)
-				terminal_attachment 	(1146, 1065)
-				drawSupplier 	@1480)
-			    (object AssociationViewNew "$UNNAMED$252" @1503
-				location   	(1362, 1133)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28A74B0178"
-				roleview_list 	(list RoleViews
-				    (object RoleView "simpleType" @1504
-					Parent_View 	@1503
-					location   	(-158, -163)
-					label      	(object SegLabel @1505
-					    Parent_View 	@1504
-					    location   	(1499, 1094)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+simpleType"
-					    pctDist    	-0.246753
-					    height     	137
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A74D017B"
-					client     	@1503
-					supplier   	@1333
-					line_style 	3
-					origin_attachment 	(1362, 1133)
-					terminal_attachment 	(1362, 1292)
-					label      	(object SegLabel @1506
-					    Parent_View 	@1504
-					    location   	(1321, 1097)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	-0.227273
-					    height     	42
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$253" @1507
-					Parent_View 	@1503
-					location   	(-158, -163)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A74D0185"
-					client     	@1503
-					supplier   	@1479
-					line_style 	3
-					origin_attachment 	(1362, 1133)
-					terminal_attachment 	(1362, 974))))
-			    (object ClassView "Class" "Logical View::xsd::XSDFeature" @1508
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2272, 384)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1508
-				    location   	(2002, 305)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	540
-				    justify    	0
-				    label      	"XSDFeature")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B537026C"
-				compartment 	(object Compartment
-				    Parent_View 	@1508
-				    location   	(2002, 371)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	508
-				    compartmentItems 	(list Compartment
-					"+ global : boolean"
-					"+ featureReference : boolean"))
-				width      	558
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @1509
-				location   	(2262, 568)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1508
-				vertices   	(list Points
-				    (2262, 568)
-				    (2262, 477)))
-			    (object InheritView "" @1510
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69EDEE01BF"
-				client     	@1305
-				supplier   	@1508
-				line_style 	3
-				origin_attachment 	(2346, 595)
-				terminal_attachment 	(2346, 568)
-				drawSupplier 	@1509)
-			    (object AssociationViewNew "$UNNAMED$246" @1511
-				location   	(1553, 453)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28A0F201A4"
-				roleview_list 	(list RoleViews
-				    (object RoleView "type" @1512
-					Parent_View 	@1511
-					location   	(801, 293)
-					label      	(object SegLabel @1513
-					    Parent_View 	@1512
-					    location   	(1331, 499)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	108
-					    justify    	0
-					    label      	"+type"
-					    pctDist    	0.506266
-					    height     	46
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A0F302E5"
-					client     	@1511
-					supplier   	@1479
-					vertices   	(list Points
-					    (1553, 453)
-					    (1222, 453)
-					    (1222, 562))
-					line_style 	3
-					origin_attachment 	(1553, 453)
-					terminal_attachment 	(1222, 562)
-					label      	(object SegLabel @1514
-					    Parent_View 	@1512
-					    location   	(1185, 479)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.812030
-					    height     	38
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$247" @1515
-					Parent_View 	@1511
-					location   	(801, 293)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A0F302F0"
-					client     	@1511
-					supplier   	@1508
-					line_style 	3
-					origin_attachment 	(1553, 453)
-					terminal_attachment 	(1993, 453))))
-			    (object AssociationViewNew "$UNNAMED$138" @1516
-				location   	(1908, 353)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C29010602D7"
-				roleview_list 	(list RoleViews
-				    (object RoleView "resolvedFeature" @1517
-					Parent_View 	@1516
-					location   	(-268, -159)
-					label      	(object SegLabel @1518
-					    Parent_View 	@1517
-					    location   	(1729, 352)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	312
-					    justify    	0
-					    label      	"+resolvedFeature"
-					    pctDist    	-0.029412
-					    height     	180
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C29010B000E"
-					client     	@1516
-					supplier   	@1508
-					vertices   	(list Points
-					    (1908, 353)
-					    (1908, 387)
-					    (1993, 387))
-					line_style 	3
-					origin_attachment 	(1908, 353)
-					terminal_attachment 	(1993, 387)
-					label      	(object SegLabel @1519
-					    Parent_View 	@1517
-					    location   	(1945, 354)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.596639
-					    height     	34
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$139" @1520
-					Parent_View 	@1516
-					location   	(-268, -159)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C29010B0018"
-					client     	@1516
-					supplier   	@1508
-					vertices   	(list Points
-					    (1908, 353)
-					    (1908, 319)
-					    (1993, 319))
-					line_style 	3
-					origin_attachment 	(1908, 353)
-					terminal_attachment 	(1993, 319))))
-			    (object InheritView "" @1521
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A26036D"
-				client     	@1309
-				supplier   	@1308
-				vertices   	(list Points
-				    (494, 284)
-				    (494, 244)
-				    (996, 244))
-				line_style 	3
-				origin_attachment 	(494, 284)
-				terminal_attachment 	(996, 244))
-			    (object InheritView "" @1522
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69B7DC0193"
-				client     	@1296
-				supplier   	@1508
-				line_style 	3
-				origin_attachment 	(1718, 812)
-				terminal_attachment 	(1718, 568)
-				drawSupplier 	@1509)
-			    (object InheritView "" @1523
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A1302A2"
-				client     	@1333
-				supplier   	@1479
-				line_style 	3
-				origin_attachment 	(1265, 1292)
-				terminal_attachment 	(1265, 1065)
-				drawSupplier 	@1480)
-			    (object InheritView "" @1524
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A2C0307"
-				client     	@1508
-				supplier   	@1308
-				vertices   	(list Points
-				    (2147, 291)
-				    (2147, 244)
-				    (1468, 244))
-				line_style 	3
-				origin_attachment 	(2147, 291)
-				terminal_attachment 	(1468, 244)))))))
-	logical_presentations 	(list unit_reference_list
-	    (object ClassDiagram "Main"
-		quid       	"39E27F080076"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list
-		    (object CategoryView "Logical View::wsdl" @1525
-			location   	(272, 256)
-			label      	(object ItemLabel
-			    Parent_View 	@1525
-			    location   	(128, 172)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"wsdl")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"3ADFB8E5021E"
-			width      	300
-			height     	180)
-		    (object CategoryView "Logical View::soap" @1526
-			location   	(704, 256)
-			label      	(object ItemLabel
-			    Parent_View 	@1526
-			    location   	(560, 172)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"soap")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"3A01CF0C01A2"
-			width      	300
-			height     	180)
-		    (object CategoryView "Logical View::xsd" @1527
-			location   	(1152, 256)
-			label      	(object ItemLabel
-			    Parent_View 	@1527
-			    location   	(1008, 172)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"xsd")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"39ABDC6F01AA"
-			width      	300
-			height     	180)))))
-    root_subsystem 	(object SubSystem "Component View"
-	quid       	"39E27F080065"
-	physical_models 	(list unit_reference_list)
-	physical_presentations 	(list unit_reference_list
-	    (object Module_Diagram "Main"
-		quid       	"39E27F080077"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    process_structure 	(object Processes
-	quid       	"39E27F080066"
-	ProcsNDevs 	(list
-	    (object Process_Diagram "Deployment View"
-		quid       	"39E27F080068"
-		title      	"Deployment View"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    properties 	(object Properties
-	attributes 	(list Attribute_Set
-	    (object Attribute
-		tool       	"DDL"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"DDL"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"DDL"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"DataBase"
-			value      	("DataBaseSet" 800))
-		    (object Attribute
-			tool       	"DDL"
-			name       	"DataBaseSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"DDL"
-				name       	"ANSI"
-				value      	800)
-			    (object Attribute
-				tool       	"DDL"
-				name       	"Oracle"
-				value      	801)
-			    (object Attribute
-				tool       	"DDL"
-				name       	"SQLServer"
-				value      	802)
-			    (object Attribute
-				tool       	"DDL"
-				name       	"Sybase"
-				value      	803)
-			    (object Attribute
-				tool       	"DDL"
-				name       	"Watcom"
-				value      	804)))
-		    (object Attribute
-			tool       	"DDL"
-			name       	"PrimaryKeyColumnName"
-			value      	"Id")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"PrimaryKeyColumnType"
-			value      	"NUMBER(5)")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"ViewName"
-			value      	"V_")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"TableName"
-			value      	"T_")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"InheritSuffix"
-			value      	"_V")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"DropClause"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"BaseViews"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"DDLScriptFilename"
-			value      	"DDL1.SQL")))
-	    (object Attribute
-		tool       	"DDL"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"DDL"
-			name       	"ColumnType"
-			value      	"VARCHAR")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"Length"
-			value      	"")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"NullsOK"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"PrimaryKey"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"Unique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"CompositeUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"CheckConstraint"
-			value      	"")))
-	    (object Attribute
-		tool       	"DDL"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"framework"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"IDL"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"StopOnError"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GeneratePreserveRegions"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"ImplementationType"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"ConstValue"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateDefaultSpecifier"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"DefaultSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IDLElement"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IDLSpecificationType"
-			value      	("IDLSpecSet" 22))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IDLSpecSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Interface"
-				value      	22)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Typedef"
-				value      	54)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Enumeration"
-				value      	8)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Const"
-				value      	71)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Exception"
-				value      	61)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Struct"
-				value      	51)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Union"
-				value      	81)))))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CmIdentification"
-			value      	(value Text "  %X%  @(#) plugins/com.ibm.etools.ctc.binding.soap/src/rose/soapbindingMdl.mdl, ctc, ibmctc"))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateIDLModule"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CmIdentification"
-			value      	(value Text "  %X%  @(#) plugins/com.ibm.etools.ctc.binding.soap/src/rose/soapbindingMdl.mdl, ctc, ibmctc"))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"OperationIsOneWay"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Context"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Raises"
-			value      	"")))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IsConst"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"ConstValue"
-			value      	"")))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"NameIfUnlabeled"
-			value      	"the_$supplier")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"BoundedHasRelType"
-			value      	("HasRelTypeSet" 47))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"HasRelTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"NameIfUnlabeled"
-			value      	"the_$supplier")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"BoundedRoleType"
-			value      	("AssocTypeSet" 47))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"AssocTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Uses"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateForwardReference"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Subsystem"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Directory"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Java"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"Java"
-			name       	"UsePrefixes"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"InstanceVariablePrefix"
-			value      	"m_")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ClassVariablePrefix"
-			value      	"s_")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultAttributeDataType"
-			value      	"int")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultOperationReturnType"
-			value      	"void")
-		    (object Attribute
-			tool       	"Java"
-			name       	"RootDir"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"AutoSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ShowCodegenDlg"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocDefaultAuthor"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocDefaultVersion"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocDefaultSince"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocNumAsterisks"
-			value      	0)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MaxNumChars"
-			value      	80)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Editor"
-			value      	("EditorType" 100))
-		    (object Attribute
-			tool       	"Java"
-			name       	"VM"
-			value      	("VMType" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"ClassPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EditorType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"BuiltIn"
-				value      	100)
-			    (object Attribute
-				tool       	"Java"
-				name       	"WindowsShell"
-				value      	101)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"VMType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Sun"
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Microsoft"
-				value      	201)
-			    (object Attribute
-				tool       	"Java"
-				name       	"IBM"
-				value      	202)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"NoClassCustomDlg"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GlobalImports"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"OpenBraceClassStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"OpenBraceMethodStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"UseTabs"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"UseSpaces"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"SpacingItems"
-			value      	3)
-		    (object Attribute
-			tool       	"Java"
-			name       	"RoseDefaultCommentStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"AsteriskCommentStyle"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavaCommentStyle"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocAuthor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocSince"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocVersion"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Private"
-				value      	64)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DisableAutoSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletName"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContextRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsSingleThread"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIsSecure"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcher"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcherPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherInclude"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherForward"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletgetInfo"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttribute"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttributesNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestAttributes"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestParameters"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeader"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeaderNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForHeaders"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIntHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletDateHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletCookie"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForCookie"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContentType"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateHTML"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate_XML_DD"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCmpField"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBEnvironmentProperties"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCnxFactory"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReferences"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBNameInJAR"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType"
-			value      	("EJBSessionType_Set" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateless"
-				value      	201)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateful"
-				value      	202)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType"
-			value      	("EJBTransactionType_Set" 211))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	211)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	212)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType"
-			value      	("EJBPersistenceType_Set" 220))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	220)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	221)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	222)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReentrant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"BMP_Extend_CMP"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"CmIdentification"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"AdditionalImports"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"CmIdentification"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"AdditionalImports"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Abstract"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Native"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Synchronized"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Transient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Volatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"PropertyType"
-			value      	("BeanProperty_Set" 71))
-		    (object Attribute
-			tool       	"Java"
-			name       	"BeanProperty_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Not A Property"
-				value      	71)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Simple"
-				value      	72)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bound"
-				value      	73)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Constrained"
-				value      	74)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"IndividualChangeMgt"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write"
-			value      	("Read/Write_Set" 81))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read & Write"
-				value      	81)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read Only"
-				value      	82)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Write Only"
-				value      	83)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFullyQualifiedTypes"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Transient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Volatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"PropertyType"
-			value      	("BeanProperty_Set" 71))
-		    (object Attribute
-			tool       	"Java"
-			name       	"BeanProperty_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Not A Property"
-				value      	71)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Simple"
-				value      	72)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bound"
-				value      	73)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Constrained"
-				value      	74)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"IndividualChangeMgt"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write"
-			value      	("Read/Write_Set" 81))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read & Write"
-				value      	81)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read Only"
-				value      	82)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Write Only"
-				value      	83)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFullyQualifiedTypes"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsNavigable"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"propertyId"
-		value      	"360000002")
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"DDLScriptFilename"
-			value      	"DDL1.SQL")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"DropClause"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"PrimaryKeyColumnName"
-			value      	"_ID")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"PrimaryKeyColumnType"
-			value      	"NUMBER(5,0)")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"SchemaNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"SchemaNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TableNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TypeNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TypeNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ViewNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ViewNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"VarrayNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"VarrayNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NestedTableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NestedTableNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ObjectTableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ObjectTableNameSuffix"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsSchema"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OID"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"WhereClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CheckConstraint"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypeLength"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypePrecision"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypeScale"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionOfREFS"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"MethodKind"
-			value      	("MethodKindSet" 1903))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OverloadID"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsReadNoDataState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsReadNoProcessState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsWriteNoDataState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsWriteNoProcessState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsSelfish"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerType"
-			value      	("TriggerTypeSet" 1801))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerEvent"
-			value      	("TriggerEventSet" 1601))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerText"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerReferencingNames"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerForEach"
-			value      	("TriggerForEachSet" 1701))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerWhenClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"MethodKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"MapMethod"
-				value      	1901)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"OrderMethod"
-				value      	1902)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Function"
-				value      	1903)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Procedure"
-				value      	1904)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Operator"
-				value      	1905)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Constructor"
-				value      	1906)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Destructor"
-				value      	1907)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Trigger"
-				value      	1908)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Calculated"
-				value      	1909)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"AFTER"
-				value      	1801)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"BEFORE"
-				value      	1802)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSTEAD OF"
-				value      	1803)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerForEachSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"ROW"
-				value      	1701)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"STATEMENT"
-				value      	1702)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerEventSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT"
-				value      	1601)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"UPDATE"
-				value      	1602)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"DELETE"
-				value      	1603)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR UPDATE"
-				value      	1604)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR DELETE"
-				value      	1605)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"UPDATE OR DELETE"
-				value      	1606)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR UPDATE OR DELETE"
-				value      	1607)))))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NullsAllowed"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Length"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Precision"
-			value      	"2")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Scale"
-			value      	"6")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsIndex"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsPrimaryKey"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CompositeUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CheckConstraint"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Repository"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"cg"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"UseMSVC"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileExtension"
-			value      	"h")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileBackupExtension"
-			value      	"h~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileTemporaryExtension"
-			value      	"h#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileExtension"
-			value      	"cpp")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileBackupExtension"
-			value      	"cp~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileTemporaryExtension"
-			value      	"cp#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ErrorLimit"
-			value      	30)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Directory"
-			value      	"$ROSECPP_SOURCE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"PathSeparator"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileNameFormat"
-			value      	"128vx_b")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BooleanType"
-			value      	"int")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowTemplates"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExplicitInstantiations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowProtectedInheritance"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CommentWidth"
-			value      	60)
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByValueContainer"
-			value      	"$targetClass")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByValueContainer"
-			value      	"OptionalByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByValueContainer"
-			value      	"BoundedListByValue<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByValueContainer"
-			value      	"BoundedSetByValue<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByReferenceContainer"
-			value      	"BoundedListByReference<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByReferenceContainer"
-			value      	"BoundedSetByReference<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByValueContainer"
-			value      	"UnboundedListByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByValueContainer"
-			value      	"UnboundedSetByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByReferenceContainer"
-			value      	"UnboundedListByReference<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByReferenceContainer"
-			value      	"UnboundedSetByReference<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByValueContainer"
-			value      	"AssociationByValue<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByValueContainer"
-			value      	"DictionaryByValue<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByReferenceContainer"
-			value      	"AssociationByReference<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByReferenceContainer"
-			value      	"DictionaryByReference<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GeneratePreserveRegions"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ImplementationType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ClassKey"
-			value      	"class")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"PutBodiesInSpec"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDefaultConstructor"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DefaultConstructorVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineDefaultConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ExplicitDefaultConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateCopyConstructor"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CopyConstructorVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineCopyConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ExplicitCopyConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDestructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DestructorVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DestructorKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineDestructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssignmentOperation"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssignmentVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssignmentKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineAssignmentOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEqualityOperations"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"EqualityVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"EqualityKind"
-			value      	("FriendKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineEqualityOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateRelationalOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"RelationalVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"RelationalKind"
-			value      	("FriendKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineRelationalOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateStorageMgmtOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StorageMgmtVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineStorageMgmtOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSubscriptOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SubscriptVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"SubscriptKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"SubscriptResultType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSubscriptOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDereferenceOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DereferenceVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DereferenceKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DereferenceResultType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineDereferenceOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateIndirectionOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IndirectionVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IndirectionKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IndirectionResultType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineIndirectionOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateStreamOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StreamVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineStreamOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ThreeKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"KindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"FriendKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"DeclareAndDefine"
-				value      	199)
-			    (object Attribute
-				tool       	"cg"
-				name       	"DeclareOnly"
-				value      	205)
-			    (object Attribute
-				tool       	"cg"
-				name       	"DoNotDeclare"
-				value      	206)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"VisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ConstValue"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDefaultSpecifier"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DefaultSpecifier"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CmIdentification"
-			value      	(value Text "  %X%  @(#) plugins/com.ibm.etools.ctc.binding.soap/src/rose/soapbindingMdl.mdl, ctc, ibmctc"))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExtensionlessFileName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeFormat"
-			value      	(value Text 
-|// $package
-|#include "$file"
-|
-			))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludePrecompiledHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeOrder"
-			value      	"AMIR")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyle"
-			value      	("InliningStyleSet" 207))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"InClassDeclaration"
-				value      	208)
-			    (object Attribute
-				tool       	"cg"
-				name       	"FollowingClassDeclaration"
-				value      	207)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"TypesDefined"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeClosure"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CmIdentification"
-			value      	(value Text "  %X%  @(#) plugins/com.ibm.etools.ctc.binding.soap/src/rose/soapbindingMdl.mdl, ctc, ibmctc"))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExtensionlessFileName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeFormat"
-			value      	(value Text 
-|// $package
-|#include "$file"
-|
-			))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludePrecompiledHeader"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeOrder"
-			value      	"AMIR")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyle"
-			value      	("InliningStyleSet" 207))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"InClassDeclaration"
-				value      	208)
-			    (object Attribute
-				tool       	"cg"
-				name       	"FollowingClassDeclaration"
-				value      	207)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"TypesDefined"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeClosure"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationKind"
-			value      	("OperationKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationIsConst"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationIsExplicit"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Inline"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"EntryCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ExitCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"BodyAnnotations"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationIsOneWay"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Context"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"Raises"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"Ordered"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"NameIfUnlabeled"
-			value      	"the_$supplier")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtRelationshipVisibility"
-				value      	210)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberFieldSize"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InitialValue"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetName"
-			value      	"get_$relationship")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetName"
-			value      	"set_$relationship")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKindsSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SelectorName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SelectorType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConstSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_Function"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetByReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ForwardReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedHasRelType"
-			value      	("HasRelTypeSet" 47))
-		    (object Attribute
-			tool       	"cg"
-			name       	"HasRelTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Association"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"NameIfUnlabeled"
-			value      	"the_$targetClass")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Inherit"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"InstanceArguments"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ForwardReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"NameIfUnlabeled"
-			value      	"the_$targetClass")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberName"
-			value      	"$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtRelationshipVisibility"
-				value      	210)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberFieldSize"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InitialValue"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerGet"
-			value      	"$data.get($keys)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerSet"
-			value      	"$data.set($keys,$value)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedContainer"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassContainer"
-			value      	"$supplier *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassInitialValue"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKindsSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetByReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetName"
-			value      	"get_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConstSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_Function"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetName"
-			value      	"set_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetSetByReference"
-			value      	("QualifiedGetSetByReferenceSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetSetByReferenceSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_GetSetByReference"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateQualifiedGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetName"
-			value      	"get_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineQualifiedGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateQualifiedSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedSetName"
-			value      	"set_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedSetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineQualifiedSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssocClassDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberName"
-			value      	"$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtRelationshipVisibility"
-				value      	210)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssocClassGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetName"
-			value      	"get_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineAssocClassGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssocClassSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassSetName"
-			value      	"set_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassSetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineAssocClassSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassForwardReferenceOnly"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedRoleType"
-			value      	("AssocTypeSet" 47))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberName"
-			value      	"$attribute")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtAttributeVisibility"
-				value      	211)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberFieldSize"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetName"
-			value      	"get_$attribute")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetName"
-			value      	"set_$attribute")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKindsSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConstSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_Function"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetByReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"IsReadOnly"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Uses"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"ForwardReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"BodyReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateForwardReference"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Subsystem"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DirectoryIsOnSearchList"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"PrecompiledHeader"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"IsNamespace"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Indent"
-			value      	2)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Version"
-			value      	"5.0")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCClassTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCClassTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Interface_Part"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Connection_Part"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Class_Factory"
-				value      	3)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CObjectFunctionality"
-			value      	("CObjectFunctionalitySet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CObjectFunctionalitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dynamic"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dyncreate"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Serial"
-				value      	3)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateOverrideGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateDataGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DATA_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateFieldGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_FIELD_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateMessageGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateMessageMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_MSG_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MESSAGE_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEFactory"
-			value      	("OLEFactorySet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEFactorySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Built_in"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Simple"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Licensed"
-				value      	3)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEName"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEClassID"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateOLECtlType"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLECtlType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateOLETypeLib"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLETypeLibID"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLETypeLibMajor"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLETypeLibMinor"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GeneratePropPageIDs"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEPropPageIDs"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateDispatchMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockProperties"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockFunctions"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DispatchDefValue"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateDispIdEnum"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISP_ID_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateInterfaceMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"INTERFACE_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"InitInterface"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateEventMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENT_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockEvents"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateEventSinkMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENTSINK_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PropNotifySinks"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateConnectionMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CONNECTION_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"ConnectionPointIID"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"InheritanceType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLECommands"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MFCDeclares"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MFCImplements"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"ATL_Declares"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateCOMMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"COM_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateConnectionPointMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CONNECTION_POINT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateMsgMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSG_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GeneratePropertyMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PROPERTY_MAP_Entries"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCOperationTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCOperationTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Virtual_Override"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Message_Handler"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dispatch_Handler"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Event_Firing_Function"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Event_Sink_Handler"
-				value      	5)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Std_OLE_Method"
-				value      	6)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Command_Parser"
-				value      	7)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Property_Get_Function"
-				value      	8)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Property_Set_Function"
-				value      	9)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Property_Notify_Function"
-				value      	10)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Macro_Generated_Function"
-				value      	11)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_MSG_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MESSAGE_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"BodyImage"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCAttributeTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCAttributeTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Member_Property"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Get_Set_Property"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dialog_Data"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Field_Data"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Stock_Property"
-				value      	5)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PointerBase"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockPropertyImplementation"
-			value      	"")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCAttributeTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCAttributeTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Member_Property"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Get_Set_Property"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dialog_Data"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Field_Data"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Stock_Property"
-				value      	5)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PointerBase"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockPropertyImplementation"
-			value      	"")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCAttributeTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCAttributeTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Member_Property"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Get_Set_Property"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dialog_Data"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Field_Data"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Stock_Property"
-				value      	5)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PointerBase"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockPropertyImplementation"
-			value      	"")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateIncludesGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_INCLUDES_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateInsertLocation"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateIncludesGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_INCLUDES_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateInsertLocation"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"SCC"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"TypeLibImporter"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"propertyId"
-		value      	"783606378")
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"CreatableSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Private"
-				value      	221)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"PublicNotCreatable"
-				value      	213)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"SingleUse"
-				value      	214)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"GlobalSingleUse"
-				value      	215)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"MultiUse"
-				value      	219)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"GlobalMultiUse"
-				value      	220)))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionBase"
-			value      	"0")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionExplicit"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionCompare"
-			value      	("CompareSet" 202))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Creatable"
-			value      	("CreatableSet" 221))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateInitialization"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateTermination"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"CollectionClass"
-			value      	"Collection")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"CompareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"None"
-				value      	202)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Binary"
-				value      	203)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Text"
-				value      	204)))))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OperationName"
-			value      	"$operation")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"LibraryName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"AliasName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"IsStatic"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"EntryCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ExitCode"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"IsConst"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"New"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"WithEvents"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Subscript"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"NameIfUnlabeled"
-			value      	"the$supplier")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateGetOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateSetOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateLetOperation"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"New"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"WithEvents"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Subscript"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"NameIfUnlabeled"
-			value      	"the$supplier")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateGetOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateSetOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateLetOperation"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Inherit"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ImplementsDelegation"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ProjectFile"
-			value      	"")))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"VisualStudio"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Editor"
-			value      	("EditorType" 100))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"IncludePath"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"StopOnError"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"EditorType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"BuiltIn"
-				value      	100)
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"WindowsShell"
-				value      	101)))))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ArrayDimensions"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ConstValue"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ImplementationType"
-			value      	"")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CmIdentification"
-			value      	(value Text "  %X% %Q% %Z% %W%"))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CmIdentification"
-			value      	(value Text "  %X% %Q% %Z% %W%"))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Context"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"OperationIsOneWay"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ArrayDimensions"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Order"
-			value      	"")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ArrayDimensions"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Order"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"BoundedRoleType"
-			value      	("AssocTypeSet" 47))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"AssocTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Uses"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"GenerateForwardReference"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Java"
-		name       	"Default_Servlet__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletName"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContextRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsSingleThread"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIsSecure"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcher"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcherPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherInclude"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherForward"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletgetInfo"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Private"
-				value      	64)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"Http_Servlet__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttribute"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttributesNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestAttributes"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestParameters"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeader"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeaderNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForHeaders"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIntHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletDateHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletCookie"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForCookie"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContentType"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateHTML"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Private"
-				value      	64)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"Default_EJB__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate_XML_DD"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCmpField"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBEnvironmentProperties"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCnxFactory"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReferences"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBNameInJAR"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType"
-			value      	("EJBSessionType_Set" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateless"
-				value      	201)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateful"
-				value      	202)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType"
-			value      	("EJBTransactionType_Set" 211))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	211)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	212)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType"
-			value      	("EJBPersistenceType_Set" 220))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	220)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	221)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	222)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReentrant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"BMP_Extend_CMP"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Private"
-				value      	64)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"R2Editor"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Rose Model Integrator"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Rose Web Publisher"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Version Control"
-		name       	"HiddenTool"
-		value      	FALSE))
-	quid       	"39E27F080067"))
diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPAddress.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPAddress.java
deleted file mode 100644
index 5a7f60fbd..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPAddress.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.soap;
-
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Address</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.SOAPAddress#getLocationURI <em>Location URI</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.wsdl.binding.soap.SOAPPackage#getSOAPAddress()
- * @model 
- * @generated
- */
-public interface SOAPAddress extends ExtensibilityElement, javax.wsdl.extensions.soap.SOAPAddress {
-
-
-} // SOAPAddress
diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPBinding.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPBinding.java
deleted file mode 100644
index ffa285fa4..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPBinding.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.soap;
-
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Binding</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.SOAPBinding#getTransportURI <em>Transport URI</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.SOAPBinding#getStyle <em>Style</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.wsdl.binding.soap.SOAPPackage#getSOAPBinding()
- * @model 
- * @generated
- */
-public interface SOAPBinding extends ExtensibilityElement, javax.wsdl.extensions.soap.SOAPBinding {
-} // SOAPBinding
diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPBody.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPBody.java
deleted file mode 100644
index 429ce9508..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPBody.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.soap;
-
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Body</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.SOAPBody#getUse <em>Use</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.SOAPBody#getNamespaceURI <em>Namespace URI</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.SOAPBody#getEncodingStyles <em>Encoding Styles</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.SOAPBody#getParts <em>Parts</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.wsdl.binding.soap.SOAPPackage#getSOAPBody()
- * @model 
- * @generated
- */
-public interface SOAPBody extends ExtensibilityElement, javax.wsdl.extensions.soap.SOAPBody {
-} // SOAPBody
diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPFactory.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPFactory.java
deleted file mode 100644
index 201d301d3..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPFactory.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.soap;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.wst.wsdl.binding.soap.SOAPPackage
- * @generated
- */
-public interface SOAPFactory extends EFactory{
-  /**
-   * The singleton instance of the factory.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	SOAPFactory eINSTANCE = new org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPFactoryImpl();
-
-  /**
-   * Returns a new object of class '<em>Binding</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Binding</em>'.
-   * @generated
-   */
-	SOAPBinding createSOAPBinding();
-
-  /**
-   * Returns a new object of class '<em>Body</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Body</em>'.
-   * @generated
-   */
-	SOAPBody createSOAPBody();
-
-  /**
-   * Returns a new object of class '<em>Header Base</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Header Base</em>'.
-   * @generated
-   */
-	SOAPHeaderBase createSOAPHeaderBase();
-
-  /**
-   * Returns a new object of class '<em>Fault</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Fault</em>'.
-   * @generated
-   */
-	SOAPFault createSOAPFault();
-
-  /**
-   * Returns a new object of class '<em>Operation</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Operation</em>'.
-   * @generated
-   */
-	SOAPOperation createSOAPOperation();
-
-  /**
-   * Returns a new object of class '<em>Address</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Address</em>'.
-   * @generated
-   */
-	SOAPAddress createSOAPAddress();
-
-  /**
-   * Returns a new object of class '<em>Header Fault</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Header Fault</em>'.
-   * @generated
-   */
-	SOAPHeaderFault createSOAPHeaderFault();
-
-  /**
-   * Returns a new object of class '<em>Header</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Header</em>'.
-   * @generated
-   */
-	SOAPHeader createSOAPHeader();
-
-  /*
-   * Returns the package supported by this factory.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the package supported by this factory.
-   * @generated NOT
-   */
-	//SOAPPackage getSOAPPackage();
-
-} //SOAPFactory
diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPFault.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPFault.java
deleted file mode 100644
index 86c995711..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPFault.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.soap;
-
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Fault</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.SOAPFault#getUse <em>Use</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.SOAPFault#getNamespaceURI <em>Namespace URI</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.SOAPFault#getEncodingStyles <em>Encoding Styles</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.wsdl.binding.soap.SOAPPackage#getSOAPFault()
- * @model 
- * @generated
- */
-public interface SOAPFault extends ExtensibilityElement, javax.wsdl.extensions.soap.SOAPFault {
-
-} // SOAPFault
diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPHeader.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPHeader.java
deleted file mode 100644
index e5f107562..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPHeader.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.soap;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Header</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeader#getHeaderFaults <em>Header Faults</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.wsdl.binding.soap.SOAPPackage#getSOAPHeader()
- * @model 
- * @generated
- */
-public interface SOAPHeader extends SOAPHeaderBase {
-  /**
-   * Returns the value of the '<em><b>Header Faults</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.wst.wsdl.binding.soap.SOAPHeaderFault}.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Header Faults</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>Header Faults</em>' containment reference list.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPPackage#getSOAPHeader_HeaderFaults()
-   * @model type="org.eclipse.wst.wsdl.binding.soap.SOAPHeaderFault" containment="true"
-   * @generated
-   */
-	EList getHeaderFaults();
-
-} // SOAPHeader
diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPHeaderBase.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPHeaderBase.java
deleted file mode 100644
index 2eeaa9b04..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPHeaderBase.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.soap;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Part;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Header Base</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase#getUse <em>Use</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase#getNamespaceURI <em>Namespace URI</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase#getEncodingStyles <em>Encoding Styles</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase#getMessage <em>Message</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase#getPart <em>Part</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.wsdl.binding.soap.SOAPPackage#getSOAPHeaderBase()
- * @model 
- * @generated
- */
-public interface SOAPHeaderBase extends ExtensibilityElement{
-  /**
-   * Returns the value of the '<em><b>Use</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Use</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>Use</em>' attribute.
-   * @see #setUse(String)
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPPackage#getSOAPHeaderBase_Use()
-   * @model 
-   * @generated
-   */
-	String getUse();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase#getUse <em>Use</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Use</em>' attribute.
-   * @see #getUse()
-   * @generated
-   */
-	void setUse(String value);
-
-  /**
-   * Returns the value of the '<em><b>Namespace URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Namespace URI</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>Namespace URI</em>' attribute.
-   * @see #setNamespaceURI(String)
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPPackage#getSOAPHeaderBase_NamespaceURI()
-   * @model 
-   * @generated
-   */
-	String getNamespaceURI();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase#getNamespaceURI <em>Namespace URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Namespace URI</em>' attribute.
-   * @see #getNamespaceURI()
-   * @generated
-   */
-	void setNamespaceURI(String value);
-
-  /**
-   * Returns the value of the '<em><b>Encoding Styles</b></em>' attribute list.
-   * The list contents are of type {@link java.lang.String}.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Encoding Styles</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>Encoding Styles</em>' attribute list.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPPackage#getSOAPHeaderBase_EncodingStyles()
-   * @model type="java.lang.String" dataType="org.eclipse.wst.wsdl.binding.soap.IString"
-   * @generated
-   */
-	EList getEncodingStyles();
-
-  /**
-   * Returns the value of the '<em><b>Message</b></em>' reference.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Message</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>Message</em>' reference.
-   * @see #setMessage(Message)
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPPackage#getSOAPHeaderBase_Message()
-   * @model required="true"
-   * @generated
-   */
-	Message getMessage();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase#getMessage <em>Message</em>}' reference.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Message</em>' reference.
-   * @see #getMessage()
-   * @generated
-   */
-	void setMessage(Message value);
-
-  /**
-   * Returns the value of the '<em><b>Part</b></em>' reference.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Part</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>Part</em>' reference.
-   * @see #setPart(Part)
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPPackage#getSOAPHeaderBase_Part()
-   * @model required="true"
-   * @generated
-   */
-	Part getPart();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase#getPart <em>Part</em>}' reference.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Part</em>' reference.
-   * @see #getPart()
-   * @generated
-   */
-	void setPart(Part value);
-
-} // SOAPHeaderBase
diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPHeaderFault.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPHeaderFault.java
deleted file mode 100644
index a3924e749..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPHeaderFault.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.soap;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Header Fault</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.wst.wsdl.bindings.soap.SOAPPackage#getSOAPHeaderFault()
- * @model 
- * @generated
- */
-public interface SOAPHeaderFault extends SOAPHeaderBase {
-} // SOAPHeaderFault
diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPOperation.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPOperation.java
deleted file mode 100644
index f370492b2..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPOperation.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.soap;
-
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Operation</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.SOAPOperation#getSoapActionURI <em>Soap Action URI</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.SOAPOperation#getStyle <em>Style</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.wsdl.binding.soap.SOAPPackage#getSOAPOperation()
- * @model 
- * @generated
- */
-public interface SOAPOperation extends ExtensibilityElement, javax.wsdl.extensions.soap.SOAPOperation {
-} // SOAPOperation
diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPPackage.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPPackage.java
deleted file mode 100644
index 66e564962..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPPackage.java
+++ /dev/null
@@ -1,1068 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.soap;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.wst.wsdl.WSDLPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.wst.wsdl.binding.soap.SOAPFactory
- * @generated
- */
-public interface SOAPPackage extends EPackage{
-  /**
-   * The package name.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	String eNAME = "soap";
-
-  /**
-   * The package namespace URI.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	String eNS_URI = "http://www.ibm.com/wsdl/2003/SOAP";
-
-  /**
-   * The package namespace name.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	String eNS_PREFIX = "soap";
-
-  /**
-   * The singleton instance of the package.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	SOAPPackage eINSTANCE = org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPPackageImpl.init();
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPBindingImpl <em>Binding</em>}' class.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPBindingImpl
-   * @see org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPPackageImpl#getSOAPBinding()
-   * @generated
-   */
-	int SOAP_BINDING = 0;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_BINDING__DOCUMENTATION_ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_BINDING__ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Required</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_BINDING__REQUIRED = WSDLPackage.EXTENSIBILITY_ELEMENT__REQUIRED;
-
-  /**
-   * The feature id for the '<em><b>Element Type</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_BINDING__ELEMENT_TYPE = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT_TYPE;
-
-  /**
-   * The feature id for the '<em><b>Transport URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_BINDING__TRANSPORT_URI = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Style</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_BINDING__STYLE = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The number of structural features of the the '<em>Binding</em>' class.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_BINDING_FEATURE_COUNT = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 2;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPBodyImpl <em>Body</em>}' class.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPBodyImpl
-   * @see org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPPackageImpl#getSOAPBody()
-   * @generated
-   */
-	int SOAP_BODY = 1;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_BODY__DOCUMENTATION_ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_BODY__ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Required</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_BODY__REQUIRED = WSDLPackage.EXTENSIBILITY_ELEMENT__REQUIRED;
-
-  /**
-   * The feature id for the '<em><b>Element Type</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_BODY__ELEMENT_TYPE = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT_TYPE;
-
-  /**
-   * The feature id for the '<em><b>Use</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_BODY__USE = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Namespace URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_BODY__NAMESPACE_URI = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The feature id for the '<em><b>Encoding Styles</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_BODY__ENCODING_STYLES = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 2;
-
-  /**
-   * The feature id for the '<em><b>Parts</b></em>' reference list.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_BODY__PARTS = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 3;
-
-  /**
-   * The number of structural features of the the '<em>Body</em>' class.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_BODY_FEATURE_COUNT = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 4;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPHeaderBaseImpl <em>Header Base</em>}' class.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPHeaderBaseImpl
-   * @see org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPPackageImpl#getSOAPHeaderBase()
-   * @generated
-   */
-	int SOAP_HEADER_BASE = 2;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER_BASE__DOCUMENTATION_ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER_BASE__ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Required</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER_BASE__REQUIRED = WSDLPackage.EXTENSIBILITY_ELEMENT__REQUIRED;
-
-  /**
-   * The feature id for the '<em><b>Element Type</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER_BASE__ELEMENT_TYPE = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT_TYPE;
-
-  /**
-   * The feature id for the '<em><b>Use</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER_BASE__USE = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Namespace URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER_BASE__NAMESPACE_URI = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The feature id for the '<em><b>Encoding Styles</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER_BASE__ENCODING_STYLES = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 2;
-
-  /**
-   * The feature id for the '<em><b>Message</b></em>' reference.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER_BASE__MESSAGE = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 3;
-
-  /**
-   * The feature id for the '<em><b>Part</b></em>' reference.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER_BASE__PART = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 4;
-
-  /**
-   * The number of structural features of the the '<em>Header Base</em>' class.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER_BASE_FEATURE_COUNT = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 5;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPFaultImpl <em>Fault</em>}' class.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPFaultImpl
-   * @see org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPPackageImpl#getSOAPFault()
-   * @generated
-   */
-	int SOAP_FAULT = 3;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_FAULT__DOCUMENTATION_ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_FAULT__ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Required</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_FAULT__REQUIRED = WSDLPackage.EXTENSIBILITY_ELEMENT__REQUIRED;
-
-  /**
-   * The feature id for the '<em><b>Element Type</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_FAULT__ELEMENT_TYPE = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT_TYPE;
-
-  /**
-   * The feature id for the '<em><b>Use</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_FAULT__USE = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Namespace URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_FAULT__NAMESPACE_URI = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The feature id for the '<em><b>Encoding Styles</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_FAULT__ENCODING_STYLES = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 2;
-
-  /**
-   * The number of structural features of the the '<em>Fault</em>' class.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_FAULT_FEATURE_COUNT = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 3;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPOperationImpl <em>Operation</em>}' class.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPOperationImpl
-   * @see org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPPackageImpl#getSOAPOperation()
-   * @generated
-   */
-	int SOAP_OPERATION = 4;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_OPERATION__DOCUMENTATION_ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_OPERATION__ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Required</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_OPERATION__REQUIRED = WSDLPackage.EXTENSIBILITY_ELEMENT__REQUIRED;
-
-  /**
-   * The feature id for the '<em><b>Element Type</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_OPERATION__ELEMENT_TYPE = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT_TYPE;
-
-  /**
-   * The feature id for the '<em><b>Soap Action URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_OPERATION__SOAP_ACTION_URI = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Style</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_OPERATION__STYLE = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The number of structural features of the the '<em>Operation</em>' class.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_OPERATION_FEATURE_COUNT = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 2;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPAddressImpl <em>Address</em>}' class.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPAddressImpl
-   * @see org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPPackageImpl#getSOAPAddress()
-   * @generated
-   */
-	int SOAP_ADDRESS = 5;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_ADDRESS__DOCUMENTATION_ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_ADDRESS__ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Required</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_ADDRESS__REQUIRED = WSDLPackage.EXTENSIBILITY_ELEMENT__REQUIRED;
-
-  /**
-   * The feature id for the '<em><b>Element Type</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_ADDRESS__ELEMENT_TYPE = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT_TYPE;
-
-  /**
-   * The feature id for the '<em><b>Location URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_ADDRESS__LOCATION_URI = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The number of structural features of the the '<em>Address</em>' class.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_ADDRESS_FEATURE_COUNT = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPHeaderFaultImpl <em>Header Fault</em>}' class.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPHeaderFaultImpl
-   * @see org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPPackageImpl#getSOAPHeaderFault()
-   * @generated
-   */
-	int SOAP_HEADER_FAULT = 6;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER_FAULT__DOCUMENTATION_ELEMENT = SOAP_HEADER_BASE__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER_FAULT__ELEMENT = SOAP_HEADER_BASE__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Required</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER_FAULT__REQUIRED = SOAP_HEADER_BASE__REQUIRED;
-
-  /**
-   * The feature id for the '<em><b>Element Type</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER_FAULT__ELEMENT_TYPE = SOAP_HEADER_BASE__ELEMENT_TYPE;
-
-  /**
-   * The feature id for the '<em><b>Use</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER_FAULT__USE = SOAP_HEADER_BASE__USE;
-
-  /**
-   * The feature id for the '<em><b>Namespace URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER_FAULT__NAMESPACE_URI = SOAP_HEADER_BASE__NAMESPACE_URI;
-
-  /**
-   * The feature id for the '<em><b>Encoding Styles</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER_FAULT__ENCODING_STYLES = SOAP_HEADER_BASE__ENCODING_STYLES;
-
-  /**
-   * The feature id for the '<em><b>Message</b></em>' reference.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER_FAULT__MESSAGE = SOAP_HEADER_BASE__MESSAGE;
-
-  /**
-   * The feature id for the '<em><b>Part</b></em>' reference.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER_FAULT__PART = SOAP_HEADER_BASE__PART;
-
-  /**
-   * The number of structural features of the the '<em>Header Fault</em>' class.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER_FAULT_FEATURE_COUNT = SOAP_HEADER_BASE_FEATURE_COUNT + 0;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPHeaderImpl <em>Header</em>}' class.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPHeaderImpl
-   * @see org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPPackageImpl#getSOAPHeader()
-   * @generated
-   */
-	int SOAP_HEADER = 7;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER__DOCUMENTATION_ELEMENT = SOAP_HEADER_BASE__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER__ELEMENT = SOAP_HEADER_BASE__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Required</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER__REQUIRED = SOAP_HEADER_BASE__REQUIRED;
-
-  /**
-   * The feature id for the '<em><b>Element Type</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER__ELEMENT_TYPE = SOAP_HEADER_BASE__ELEMENT_TYPE;
-
-  /**
-   * The feature id for the '<em><b>Use</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER__USE = SOAP_HEADER_BASE__USE;
-
-  /**
-   * The feature id for the '<em><b>Namespace URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER__NAMESPACE_URI = SOAP_HEADER_BASE__NAMESPACE_URI;
-
-  /**
-   * The feature id for the '<em><b>Encoding Styles</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER__ENCODING_STYLES = SOAP_HEADER_BASE__ENCODING_STYLES;
-
-  /**
-   * The feature id for the '<em><b>Message</b></em>' reference.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER__MESSAGE = SOAP_HEADER_BASE__MESSAGE;
-
-  /**
-   * The feature id for the '<em><b>Part</b></em>' reference.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER__PART = SOAP_HEADER_BASE__PART;
-
-  /**
-   * The feature id for the '<em><b>Header Faults</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER__HEADER_FAULTS = SOAP_HEADER_BASE_FEATURE_COUNT + 0;
-
-  /**
-   * The number of structural features of the the '<em>Header</em>' class.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER_FEATURE_COUNT = SOAP_HEADER_BASE_FEATURE_COUNT + 1;
-
-  /**
-   * The meta object id for the '<em>IString</em>' data type.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see java.lang.String
-   * @see org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPPackageImpl#getIString()
-   * @generated
-   */
-	int ISTRING = 8;
-
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.binding.soap.SOAPBinding <em>Binding</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Binding</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPBinding
-   * @generated
-   */
-	EClass getSOAPBinding();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.binding.soap.SOAPBinding#getTransportURI <em>Transport URI</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Transport URI</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPBinding#getTransportURI()
-   * @see #getSOAPBinding()
-   * @generated
-   */
-	EAttribute getSOAPBinding_TransportURI();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.binding.soap.SOAPBinding#getStyle <em>Style</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Style</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPBinding#getStyle()
-   * @see #getSOAPBinding()
-   * @generated
-   */
-	EAttribute getSOAPBinding_Style();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.binding.soap.SOAPBody <em>Body</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Body</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPBody
-   * @generated
-   */
-	EClass getSOAPBody();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.binding.soap.SOAPBody#getUse <em>Use</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Use</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPBody#getUse()
-   * @see #getSOAPBody()
-   * @generated
-   */
-	EAttribute getSOAPBody_Use();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.binding.soap.SOAPBody#getNamespaceURI <em>Namespace URI</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Namespace URI</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPBody#getNamespaceURI()
-   * @see #getSOAPBody()
-   * @generated
-   */
-	EAttribute getSOAPBody_NamespaceURI();
-
-  /**
-   * Returns the meta object for the attribute list '{@link org.eclipse.wst.wsdl.binding.soap.SOAPBody#getEncodingStyles <em>Encoding Styles</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for the attribute list '<em>Encoding Styles</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPBody#getEncodingStyles()
-   * @see #getSOAPBody()
-   * @generated
-   */
-	EAttribute getSOAPBody_EncodingStyles();
-
-  /**
-   * Returns the meta object for the reference list '{@link org.eclipse.wst.wsdl.binding.soap.SOAPBody#getParts <em>Parts</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for the reference list '<em>Parts</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPBody#getParts()
-   * @see #getSOAPBody()
-   * @generated
-   */
-	EReference getSOAPBody_Parts();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase <em>Header Base</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Header Base</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase
-   * @generated
-   */
-	EClass getSOAPHeaderBase();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase#getUse <em>Use</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Use</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase#getUse()
-   * @see #getSOAPHeaderBase()
-   * @generated
-   */
-	EAttribute getSOAPHeaderBase_Use();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase#getNamespaceURI <em>Namespace URI</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Namespace URI</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase#getNamespaceURI()
-   * @see #getSOAPHeaderBase()
-   * @generated
-   */
-	EAttribute getSOAPHeaderBase_NamespaceURI();
-
-  /**
-   * Returns the meta object for the attribute list '{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase#getEncodingStyles <em>Encoding Styles</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for the attribute list '<em>Encoding Styles</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase#getEncodingStyles()
-   * @see #getSOAPHeaderBase()
-   * @generated
-   */
-	EAttribute getSOAPHeaderBase_EncodingStyles();
-
-  /**
-   * Returns the meta object for the reference '{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase#getMessage <em>Message</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for the reference '<em>Message</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase#getMessage()
-   * @see #getSOAPHeaderBase()
-   * @generated
-   */
-	EReference getSOAPHeaderBase_Message();
-
-  /**
-   * Returns the meta object for the reference '{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase#getPart <em>Part</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for the reference '<em>Part</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase#getPart()
-   * @see #getSOAPHeaderBase()
-   * @generated
-   */
-	EReference getSOAPHeaderBase_Part();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.binding.soap.SOAPFault <em>Fault</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Fault</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPFault
-   * @generated
-   */
-	EClass getSOAPFault();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.binding.soap.SOAPFault#getUse <em>Use</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Use</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPFault#getUse()
-   * @see #getSOAPFault()
-   * @generated
-   */
-	EAttribute getSOAPFault_Use();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.binding.soap.SOAPFault#getNamespaceURI <em>Namespace URI</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Namespace URI</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPFault#getNamespaceURI()
-   * @see #getSOAPFault()
-   * @generated
-   */
-	EAttribute getSOAPFault_NamespaceURI();
-
-  /**
-   * Returns the meta object for the attribute list '{@link org.eclipse.wst.wsdl.binding.soap.SOAPFault#getEncodingStyles <em>Encoding Styles</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for the attribute list '<em>Encoding Styles</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPFault#getEncodingStyles()
-   * @see #getSOAPFault()
-   * @generated
-   */
-	EAttribute getSOAPFault_EncodingStyles();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.binding.soap.SOAPOperation <em>Operation</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Operation</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPOperation
-   * @generated
-   */
-	EClass getSOAPOperation();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.binding.soap.SOAPOperation#getSoapActionURI <em>Soap Action URI</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Soap Action URI</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPOperation#getSoapActionURI()
-   * @see #getSOAPOperation()
-   * @generated
-   */
-	EAttribute getSOAPOperation_SoapActionURI();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.binding.soap.SOAPOperation#getStyle <em>Style</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Style</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPOperation#getStyle()
-   * @see #getSOAPOperation()
-   * @generated
-   */
-	EAttribute getSOAPOperation_Style();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.binding.soap.SOAPAddress <em>Address</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Address</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPAddress
-   * @generated
-   */
-	EClass getSOAPAddress();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.binding.soap.SOAPAddress#getLocationURI <em>Location URI</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Location URI</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPAddress#getLocationURI()
-   * @see #getSOAPAddress()
-   * @generated
-   */
-	EAttribute getSOAPAddress_LocationURI();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeaderFault <em>Header Fault</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Header Fault</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPHeaderFault
-   * @generated
-   */
-	EClass getSOAPHeaderFault();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeader <em>Header</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Header</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPHeader
-   * @generated
-   */
-	EClass getSOAPHeader();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeader#getHeaderFaults <em>Header Faults</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>Header Faults</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPHeader#getHeaderFaults()
-   * @see #getSOAPHeader()
-   * @generated
-   */
-	EReference getSOAPHeader_HeaderFaults();
-
-  /**
-   * Returns the meta object for data type '{@link java.lang.String <em>IString</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for data type '<em>IString</em>'.
-   * @see java.lang.String
-   * @model instanceClass="java.lang.String"
-   * @generated
-   */
-	EDataType getIString();
-
-  /**
-   * Returns the factory that creates the instances of the model.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the factory that creates the instances of the model.
-   * @generated
-   */
-	SOAPFactory getSOAPFactory();
-
-} //SOAPPackage
diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/generator/SOAPContentGenerator.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/generator/SOAPContentGenerator.java
deleted file mode 100644
index 023eed619..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/generator/SOAPContentGenerator.java
+++ /dev/null
@@ -1,376 +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 Common Public License v1.0
- * which accompanies this distribution, 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.soap.internal.generator;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.binding.soap.SOAPAddress;
-import org.eclipse.wst.wsdl.binding.soap.SOAPBinding;
-import org.eclipse.wst.wsdl.binding.soap.SOAPBody;
-import org.eclipse.wst.wsdl.binding.soap.SOAPFactory;
-import org.eclipse.wst.wsdl.binding.soap.SOAPFault;
-import org.eclipse.wst.wsdl.binding.soap.SOAPOperation;
-import org.eclipse.wst.wsdl.internal.generator.ContentGenerator;
-
-public class SOAPContentGenerator implements ContentGenerator
-{	
-	public static final int OPTION_NOT_SET = -1;
-	
-	public static final int STYLE_DOCUMENT = 1;
-	public static final int STYLE_RPC = 2;
-	
-	public static final int USE_LITERAL = 1;
-	public static final int USE_ENCODED = 2;
-	
-	private int styleOption = OPTION_NOT_SET;
-	private int useOption = OPTION_NOT_SET;
-
-  protected String namespaceValue = "";
-  protected String addressLocation = ContentGenerator.ADDRESS_LOCATION;
-
-  protected final static String[] requiredNamespaces = {"http://schemas.xmlsoap.org/wsdl/soap/"};
-  protected final static String[] preferredNamespacePrefixes = {"soap"};
-  
-     
-  public String[] getRequiredNamespaces()
-  {
-    return requiredNamespaces;
-  }
-  
-  public String getPreferredNamespacePrefix(String namespace)
-  {
-	  if (namespace.equals("http://schemas.xmlsoap.org/wsdl/soap/")) {
-		  return "soap";
-	  }
-	  
-	  return "";
-  }
-  
-  public void setStyle(int style) {
-	  styleOption = style;
-  }
-  
-  public void setUse(int use) {
-	  useOption = use;
-  }
-  
-  public void setAddressLocation(String addressLocation) {
-	  this.addressLocation = addressLocation;
-  }
-
-  public void generatePortContent(Port port)
-  {
-	  // We blow away any existing ExtensibilityElements/content before we generate it
-	  // Is it worth being smarter?  Look for matching content first and create those which aren't found????
-	  List removeList = new ArrayList(port.getEExtensibilityElements());	  
-	  removeExtensebilityElements(port.getEExtensibilityElements(), removeList);
-
-	  SOAPAddress soapAddress= SOAPFactory.eINSTANCE.createSOAPAddress();
-	  soapAddress.setLocationURI(addressLocation);
-	  port.addExtensibilityElement(soapAddress);
-  }  
-
-  public void generateBindingContent(Binding binding, PortType portType)
-  {	  
-	  // We blow away any existing ExtensibilityElements/content before we generate it
-	  // Is it worth being smarter?  Look for matching content first and create those which aren't found????
-	  List removeList = new ArrayList(binding.getEExtensibilityElements());	  
-	  removeExtensebilityElements(binding.getEExtensibilityElements(), removeList);
-	
-	SOAPFactory soapFactory = SOAPFactory.eINSTANCE;
-	SOAPBinding soapBinding = soapFactory.createSOAPBinding();
-	soapBinding.setStyle((getStyleOption(binding) == STYLE_DOCUMENT) ? "document" : "rpc");
-	soapBinding.setTransportURI("http://schemas.xmlsoap.org/soap/http");
-	
-	binding.addExtensibilityElement(soapBinding);	
-  }
-
-  public void generateBindingOperationContent(BindingOperation bindingOperation, Operation operation)
-  {
-	  // We blow away any existing ExtensibilityElements/content before we generate it
-	  // Is it worth being smarter?  Look for matching content first and create those which aren't found????
-	  List removeList = new ArrayList(bindingOperation.getEExtensibilityElements());
-	removeExtensebilityElements(bindingOperation.getEExtensibilityElements(), removeList);
-	
-	SOAPOperation soapOperation = SOAPFactory.eINSTANCE.createSOAPOperation();	
-	
-    String soapActionValue = getNamespace(bindingOperation);
-    if (!soapActionValue.endsWith("/"))
-    {                
-      soapActionValue += "/";
-    }                        
-    soapActionValue += operation.getName();
-	
-	soapOperation.setSoapActionURI(soapActionValue);
-	
-	bindingOperation.addExtensibilityElement(soapOperation);	
-  }  
-
-  public void generateBindingInputContent(BindingInput bindingInput, Input input)
-  {
-	  // We blow away any existing ExtensibilityElements/content before we generate it
-	  // Is it worth being smarter?  Look for matching content first and create those which aren't found????
-	  List removeList = new ArrayList(bindingInput.getEExtensibilityElements());
-	removeExtensebilityElements(bindingInput.getEExtensibilityElements(), removeList);
-	
-	SOAPFactory soapFactory = SOAPFactory.eINSTANCE;
-	SOAPBody soapBody = soapFactory.createSOAPBody();
-	soapBody.setUse((getUseOption(null) == USE_ENCODED) ? "encoded" : "literal");
-	if (getUseOption(bindingInput) == USE_ENCODED && getStyleOption(bindingInput) == STYLE_RPC)
-    {
-		List encodingList = new BasicEList();
-		encodingList.add("http://schemas.xmlsoap.org/soap/encoding/");
-		soapBody.setEncodingStyles(encodingList);
-	  	soapBody.setNamespaceURI(getNamespace(bindingInput));
-    }
-    else if (getUseOption(bindingInput) == USE_LITERAL && getStyleOption(bindingInput) == STYLE_RPC) {
-	  	soapBody.setNamespaceURI(getNamespace(bindingInput));
-    }
-	
-	bindingInput.addExtensibilityElement(soapBody);
-  }
-
-  public void generateBindingOutputContent(BindingOutput bindingOutput, Output output)
-  {
-	  // We blow away any existing ExtensibilityElements/content before we generate it
-	  // Is it worth being smarter?  Look for matching content first and create those which aren't found????
-	  List removeList = new ArrayList(bindingOutput.getEExtensibilityElements());
-	removeExtensebilityElements(bindingOutput.getEExtensibilityElements(), removeList);
-	
-	SOAPFactory soapFactory = SOAPFactory.eINSTANCE;
-	SOAPBody soapBody = soapFactory.createSOAPBody();
-	soapBody.setUse((getUseOption(bindingOutput) == USE_ENCODED) ? "encoded" : "literal");
-	if (getUseOption(bindingOutput) == USE_ENCODED && getStyleOption(bindingOutput) == STYLE_RPC)
-    {
-		List encodingList = new BasicEList();
-		encodingList.add("http://schemas.xmlsoap.org/soap/encoding/");
-		soapBody.setEncodingStyles(encodingList);
-	  	soapBody.setNamespaceURI(getNamespace(bindingOutput));
-    }
-    else if (getUseOption(bindingOutput) == USE_LITERAL && getStyleOption(bindingOutput) == STYLE_RPC) {
-	  	soapBody.setNamespaceURI(getNamespace(bindingOutput));
-    }
-	
-	bindingOutput.addExtensibilityElement(soapBody);	
-  }         
-
-  public void generateBindingFaultContent(BindingFault bindingFault, Fault fault)
-  {                            
-	  // We blow away any existing ExtensibilityElements/content before we generate it
-	  // Is it worth being smarter?  Look for matching content first and create those which aren't found????
-	  List removeList = new ArrayList(bindingFault.getEExtensibilityElements());
-	removeExtensebilityElements(bindingFault.getEExtensibilityElements(), removeList);
-	
-	SOAPFactory soapFactory = SOAPFactory.eINSTANCE;
-	SOAPFault soapFault = soapFactory.createSOAPFault();
-	soapFault.setUse((getUseOption(bindingFault) == USE_ENCODED) ? "encoded" : "literal");
-	soapFault.setName(fault.getName());
-//	soapFault.setNamespaceURI(getNamespace(bindingFault));
-
-	if (getUseOption(bindingFault) == USE_ENCODED && getStyleOption(bindingFault) == STYLE_RPC)
-    {
-		List encodingList = new BasicEList();
-		encodingList.add("http://schemas.xmlsoap.org/soap/encoding/");
-		soapFault.setEncodingStyles(encodingList);
-    }
-	
-	bindingFault.addExtensibilityElement(soapFault);
-  }
-  
-  private String getNamespace(WSDLElement wsdlElement) {
-	  if (namespaceValue.equals("") && wsdlElement != null) {
-		  namespaceValue = wsdlElement.getEnclosingDefinition().getTargetNamespace();
-	  }
-	  if (namespaceValue == null) {
-		  namespaceValue = "";
-	  }
-	  
-	  return namespaceValue;
-  }
-  
-  private void removeExtensebilityElements(List originalList, List removeList) {
-	  Iterator removeIt = removeList.iterator();
-	  while (removeIt.hasNext()) {
-		  originalList.remove(removeIt.next());
-	  }
-  }
-  
-  private Binding getBindingObject(Object genericBindingObject) {
-	  Object parent = genericBindingObject;
-	  
-	  int index = 0;
-	  while (parent != null && index < 5) {
-		  parent = getGenericBindingObjectParent(parent);
-		  if (parent instanceof Binding) {
-			  break;
-		  }
-		  index++;
-	  }
-
-	  return (parent instanceof Binding)? (Binding) parent : null;
-  }
-  
-  private Object getGenericBindingObjectParent(Object genericBindingObject) {
-	  Object parent = null;
-	  
-	  if (genericBindingObject != null) {
-		  if (genericBindingObject instanceof BindingOperation) {
-			  parent = ((BindingOperation) genericBindingObject).getContainer();
-		  }
-		  else if (genericBindingObject instanceof BindingInput) {
-			  parent = ((BindingInput) genericBindingObject).getContainer();
-		  }
-		  else if (genericBindingObject instanceof BindingOutput) {
-			  parent = ((BindingOutput) genericBindingObject).getContainer();
-		  }
-		  else if (genericBindingObject instanceof BindingFault) {
-			  parent = ((BindingFault) genericBindingObject).getContainer();
-		  }	  
-	  }
-	  
-	  return parent;	  
-  }
-  
-    private int getStyleOption(Object genericBindingObject) {
-	  if (styleOption == OPTION_NOT_SET && genericBindingObject != null) {
-		  // init() was never called, try to determine the 'style' based on what we have/know
-		  Binding binding = getBindingObject(genericBindingObject);
-		  
-		  // Try to determine the style from the Binding Object
-		  if (binding != null) {
-			  List list = binding.getEExtensibilityElements();
-			  Iterator valuesIt = getExtensibilityElementAttributeValue(list, "style").iterator();
-
-			  while (valuesIt.hasNext()) {
-				  String style = (String) valuesIt.next();
-				  
-				  if (style.equals("document")) {
-					  styleOption = STYLE_DOCUMENT;
-				  }
-				  else if (style.equals("rpc")) {
-					  styleOption = STYLE_RPC;  
-				  }
-				  
-				  if (styleOption != OPTION_NOT_SET) {
-					  break;
-				  }
-			  }
-		  }
-	  }
-	  
-	  if (styleOption == OPTION_NOT_SET) {
-		  styleOption = STYLE_DOCUMENT;
-	  }
-	  
-	  return styleOption;
-  }
-	
-	  private int getUseOption(Object genericBindingObject) {
-		  if (useOption == OPTION_NOT_SET) {
-			  // init() was never called, try to determine the 'use' based on what we have/know
-			  Iterator messageRefIt = getMessageReferenceBindingObjects(genericBindingObject).iterator();
-			  
-			  // Try to determine the use from the list of BindingInputs, BindingOutputs, and BindingFaults
-			  while (messageRefIt.hasNext()) {
-				  Object messageRef = messageRefIt.next();
-				  List values = new ArrayList();
-				  
-				  if (messageRef instanceof BindingInput) {
-					  List list = ((BindingInput) messageRef).getEExtensibilityElements();
-					  values = getExtensibilityElementAttributeValue(list, "use");
-				  }
-				  else if (messageRef instanceof BindingOutput) {
-					  List list = ((BindingOutput) messageRef).getEExtensibilityElements();
-					  values = getExtensibilityElementAttributeValue(list, "use");
-				  }
-				  else if (messageRef instanceof BindingFault) {
-					  List list = ((BindingFault) messageRef).getEExtensibilityElements();
-					  values = getExtensibilityElementAttributeValue(list, "use");				  
-				  }
-
-				  Iterator valuesIt = values.iterator();
-				  while (valuesIt.hasNext()) {
-					  String use = (String) valuesIt.next();
-					  
-					  if (use.equals("literal")) {
-						  useOption = USE_LITERAL;
-					  }
-					  else if (use.equals("encoded")) {
-						  useOption = USE_ENCODED;  
-					  }
-				  }
-				  
-				  if (useOption != OPTION_NOT_SET) {
-					  break;
-				  }
-			  }
-		  }
-
-		  if (useOption == OPTION_NOT_SET) {
-			  useOption = USE_LITERAL;
-		  }
-		  
-		  return useOption;
-	  }
-	  
-	  private List getMessageReferenceBindingObjects(Object genericBindingObject) {
-		  List list = new ArrayList();
-		  Binding binding = getBindingObject(genericBindingObject);
-		  
-		  if (binding != null) {
-			  Iterator operationsIt = binding.getEBindingOperations().iterator();
-		  
-			  while (operationsIt.hasNext()) {
-				  BindingOperation op = (BindingOperation) operationsIt.next();
-				  list.add(op.getEBindingInput());
-				  list.add(op.getEBindingOutput());
-				  list.addAll(op.getEBindingFaults());
-			  }	  
-		  }
-		  
-		  return list;
-	  }
-	
-	  private List getExtensibilityElementAttributeValue(List eeList, String attributeKey) {
-		  List values = new ArrayList();
-		  Iterator eeElementsIt = eeList.iterator();
-		  
-		  while (eeElementsIt.hasNext()) {
-			  ExtensibilityElement eeElement = (ExtensibilityElement) eeElementsIt.next();
-			  String attributeValue = eeElement.getElement().getAttribute(attributeKey);
-			  if (attributeValue != null && !attributeValue.equals("")) {
-				  values.add(attributeValue);
-			  }		  
-		  }
-		  
-		  return values;
-	  }
-	  
-	  public String getProtocol() {
-		  return "SOAP";
-	  }
-} 
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPAddressImpl.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPAddressImpl.java
deleted file mode 100644
index c59a4e117..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPAddressImpl.java
+++ /dev/null
@@ -1,264 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.soap.internal.impl;
-
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.wst.wsdl.binding.soap.SOAPAddress;
-import org.eclipse.wst.wsdl.binding.soap.SOAPPackage;
-import org.eclipse.wst.wsdl.binding.soap.internal.util.SOAPConstants;
-import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl;
-import org.w3c.dom.Element;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Address</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPAddressImpl#getLocationURI <em>Location URI</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class SOAPAddressImpl extends ExtensibilityElementImpl implements SOAPAddress {
-  /**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * The default value of the '{@link #getLocationURI() <em>Location URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getLocationURI()
-   * @generated
-   * @ordered
-   */
-	protected static final String LOCATION_URI_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getLocationURI() <em>Location URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getLocationURI()
-   * @generated
-   * @ordered
-   */
-	protected String locationURI = LOCATION_URI_EDEFAULT;
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	protected SOAPAddressImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	protected EClass eStaticClass()
-  {
-    return SOAPPackage.eINSTANCE.getSOAPAddress();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public String getLocationURI()
-  {
-    return locationURI;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void setLocationURI(String newLocationURI)
-  {
-    String oldLocationURI = locationURI;
-    locationURI = newLocationURI;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SOAPPackage.SOAP_ADDRESS__LOCATION_URI, oldLocationURI, locationURI));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_ADDRESS__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case SOAPPackage.SOAP_ADDRESS__ELEMENT:
-        return getElement();
-      case SOAPPackage.SOAP_ADDRESS__REQUIRED:
-        return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-      case SOAPPackage.SOAP_ADDRESS__ELEMENT_TYPE:
-        return getElementType();
-      case SOAPPackage.SOAP_ADDRESS__LOCATION_URI:
-        return getLocationURI();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_ADDRESS__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case SOAPPackage.SOAP_ADDRESS__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case SOAPPackage.SOAP_ADDRESS__REQUIRED:
-        setRequired(((Boolean)newValue).booleanValue());
-        return;
-      case SOAPPackage.SOAP_ADDRESS__ELEMENT_TYPE:
-        setElementType((QName)newValue);
-        return;
-      case SOAPPackage.SOAP_ADDRESS__LOCATION_URI:
-        setLocationURI((String)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_ADDRESS__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_ADDRESS__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_ADDRESS__REQUIRED:
-        setRequired(REQUIRED_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_ADDRESS__ELEMENT_TYPE:
-        setElementType(ELEMENT_TYPE_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_ADDRESS__LOCATION_URI:
-        setLocationURI(LOCATION_URI_EDEFAULT);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_ADDRESS__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case SOAPPackage.SOAP_ADDRESS__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case SOAPPackage.SOAP_ADDRESS__REQUIRED:
-        return required != REQUIRED_EDEFAULT;
-      case SOAPPackage.SOAP_ADDRESS__ELEMENT_TYPE:
-        return ELEMENT_TYPE_EDEFAULT == null ? elementType != null : !ELEMENT_TYPE_EDEFAULT.equals(elementType);
-      case SOAPPackage.SOAP_ADDRESS__LOCATION_URI:
-        return LOCATION_URI_EDEFAULT == null ? locationURI != null : !LOCATION_URI_EDEFAULT.equals(locationURI);
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (locationURI: ");
-    result.append(locationURI);
-    result.append(')');
-    return result.toString();
-  }
-	
-  //
-  // Reconcile methods: DOM -> Model
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-    setLocationURI
-      (SOAPConstants.getAttribute(changedElement, SOAPConstants.LOCATION_ATTRIBUTE));
-    reconcileReferences(false);
-  }
-  
-  //
-  // For reconciliation: Model -> DOM
-  //
-
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeAttribute(eAttribute);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eAttribute == null || eAttribute == SOAPPackage.eINSTANCE.getSOAPAddress_LocationURI())
-        niceSetAttribute(theElement,SOAPConstants.LOCATION_ATTRIBUTE,getLocationURI());
-    }
-  }
-  
-  public QName getElementType()
-  {
-    if (elementType == null)
-      elementType = new QName(SOAPConstants.SOAP_NAMESPACE_URI, SOAPConstants.ADDRESS_ELEMENT_TAG);
-    return elementType;
-  } 
-} //SOAPAddressImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPBindingImpl.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPBindingImpl.java
deleted file mode 100644
index 6accd6635..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPBindingImpl.java
+++ /dev/null
@@ -1,324 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.soap.internal.impl;
-
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.wst.wsdl.binding.soap.SOAPBinding;
-import org.eclipse.wst.wsdl.binding.soap.SOAPPackage;
-import org.eclipse.wst.wsdl.binding.soap.internal.util.SOAPConstants;
-import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl;
-import org.w3c.dom.Element;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Binding</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPBindingImpl#getTransportURI <em>Transport URI</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPBindingImpl#getStyle <em>Style</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class SOAPBindingImpl extends ExtensibilityElementImpl implements SOAPBinding {
-  /**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * The default value of the '{@link #getTransportURI() <em>Transport URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getTransportURI()
-   * @generated
-   * @ordered
-   */
-	protected static final String TRANSPORT_URI_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getTransportURI() <em>Transport URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getTransportURI()
-   * @generated
-   * @ordered
-   */
-	protected String transportURI = TRANSPORT_URI_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getStyle()
-   * @generated
-   * @ordered
-   */
-	protected static final String STYLE_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getStyle()
-   * @generated
-   * @ordered
-   */
-	protected String style = STYLE_EDEFAULT;
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	protected SOAPBindingImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	protected EClass eStaticClass()
-  {
-    return SOAPPackage.eINSTANCE.getSOAPBinding();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public String getTransportURI()
-  {
-    return transportURI;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void setTransportURI(String newTransportURI)
-  {
-    String oldTransportURI = transportURI;
-    transportURI = newTransportURI;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SOAPPackage.SOAP_BINDING__TRANSPORT_URI, oldTransportURI, transportURI));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public String getStyle()
-  {
-    return style;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void setStyle(String newStyle)
-  {
-    String oldStyle = style;
-    style = newStyle;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SOAPPackage.SOAP_BINDING__STYLE, oldStyle, style));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_BINDING__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case SOAPPackage.SOAP_BINDING__ELEMENT:
-        return getElement();
-      case SOAPPackage.SOAP_BINDING__REQUIRED:
-        return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-      case SOAPPackage.SOAP_BINDING__ELEMENT_TYPE:
-        return getElementType();
-      case SOAPPackage.SOAP_BINDING__TRANSPORT_URI:
-        return getTransportURI();
-      case SOAPPackage.SOAP_BINDING__STYLE:
-        return getStyle();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_BINDING__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case SOAPPackage.SOAP_BINDING__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case SOAPPackage.SOAP_BINDING__REQUIRED:
-        setRequired(((Boolean)newValue).booleanValue());
-        return;
-      case SOAPPackage.SOAP_BINDING__ELEMENT_TYPE:
-        setElementType((QName)newValue);
-        return;
-      case SOAPPackage.SOAP_BINDING__TRANSPORT_URI:
-        setTransportURI((String)newValue);
-        return;
-      case SOAPPackage.SOAP_BINDING__STYLE:
-        setStyle((String)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_BINDING__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_BINDING__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_BINDING__REQUIRED:
-        setRequired(REQUIRED_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_BINDING__ELEMENT_TYPE:
-        setElementType(ELEMENT_TYPE_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_BINDING__TRANSPORT_URI:
-        setTransportURI(TRANSPORT_URI_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_BINDING__STYLE:
-        setStyle(STYLE_EDEFAULT);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_BINDING__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case SOAPPackage.SOAP_BINDING__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case SOAPPackage.SOAP_BINDING__REQUIRED:
-        return required != REQUIRED_EDEFAULT;
-      case SOAPPackage.SOAP_BINDING__ELEMENT_TYPE:
-        return ELEMENT_TYPE_EDEFAULT == null ? elementType != null : !ELEMENT_TYPE_EDEFAULT.equals(elementType);
-      case SOAPPackage.SOAP_BINDING__TRANSPORT_URI:
-        return TRANSPORT_URI_EDEFAULT == null ? transportURI != null : !TRANSPORT_URI_EDEFAULT.equals(transportURI);
-      case SOAPPackage.SOAP_BINDING__STYLE:
-        return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (transportURI: ");
-    result.append(transportURI);
-    result.append(", style: ");
-    result.append(style);
-    result.append(')');
-    return result.toString();
-  }
-	
-  //
-  // Reconcile methods
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-    setStyle
-      (SOAPConstants.getAttribute(changedElement, SOAPConstants.STYLE_ATTRIBUTE));
-    setTransportURI
-      (SOAPConstants.getAttribute(changedElement, SOAPConstants.TRANSPORT_ATTRIBUTE));
-    reconcileReferences(false);
-  }
-  
-  //
-  // For reconciliation: Model -> DOM
-  //
-
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeAttribute(eAttribute);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eAttribute == null || eAttribute == SOAPPackage.eINSTANCE.getSOAPBinding_Style())
-        niceSetAttribute(theElement,SOAPConstants.STYLE_ATTRIBUTE,getStyle());
-      if (eAttribute == null || eAttribute == SOAPPackage.eINSTANCE.getSOAPBinding_TransportURI())
-        niceSetAttribute(theElement,SOAPConstants.TRANSPORT_ATTRIBUTE,getTransportURI());
-    }
-  }
-  
-  public QName getElementType()
-  {
-    if (elementType == null)
-      elementType = new QName(SOAPConstants.SOAP_NAMESPACE_URI, SOAPConstants.BINDING_ELEMENT_TAG);
-    return elementType;
-  }
-} //SOAPBindingImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPBodyImpl.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPBodyImpl.java
deleted file mode 100644
index bac90fe00..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPBodyImpl.java
+++ /dev/null
@@ -1,556 +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 Common Public License v1.0
- * which accompanies this distribution, 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.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.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.binding.soap.SOAPBody;
-import org.eclipse.wst.wsdl.binding.soap.SOAPPackage;
-import org.eclipse.wst.wsdl.binding.soap.internal.util.SOAPConstants;
-import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl;
-import org.w3c.dom.Element;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Body</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPBodyImpl#getUse <em>Use</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPBodyImpl#getNamespaceURI <em>Namespace URI</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPBodyImpl#getEncodingStyles <em>Encoding Styles</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPBodyImpl#getParts <em>Parts</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class SOAPBodyImpl extends ExtensibilityElementImpl implements SOAPBody {
-  /**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * The default value of the '{@link #getUse() <em>Use</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getUse()
-   * @generated
-   * @ordered
-   */
-	protected static final String USE_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getUse() <em>Use</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getUse()
-   * @generated
-   * @ordered
-   */
-	protected String use = USE_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getNamespaceURI() <em>Namespace URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getNamespaceURI()
-   * @generated
-   * @ordered
-   */
-	protected static final String NAMESPACE_URI_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getNamespaceURI() <em>Namespace URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getNamespaceURI()
-   * @generated
-   * @ordered
-   */
-	protected String namespaceURI = NAMESPACE_URI_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getEncodingStyles() <em>Encoding Styles</em>}' attribute list.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getEncodingStyles()
-   * @generated
-   * @ordered
-   */
-	protected EList encodingStyles = null;
-
-  /**
-   * The cached value of the '{@link #getParts() <em>Parts</em>}' reference list.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getParts()
-   * @generated NOT
-   * @ordered
-   */
-	protected List parts = null;
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	protected SOAPBodyImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	protected EClass eStaticClass()
-  {
-    return SOAPPackage.eINSTANCE.getSOAPBody();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public String getUse()
-  {
-    return use;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void setUse(String newUse)
-  {
-    String oldUse = use;
-    use = newUse;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SOAPPackage.SOAP_BODY__USE, oldUse, use));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public String getNamespaceURI()
-  {
-    return namespaceURI;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void setNamespaceURI(String newNamespaceURI)
-  {
-    String oldNamespaceURI = namespaceURI;
-    namespaceURI = newNamespaceURI;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SOAPPackage.SOAP_BODY__NAMESPACE_URI, oldNamespaceURI, namespaceURI));
-  }
-
-public void setEncodingStyles(List list)
-{
-  encodingStyles = (EList)list;
-}
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public List getEncodingStyles()
-  {
-    if (encodingStyles == null)
-    {
-      encodingStyles = new EDataTypeUniqueEList(String.class, this, SOAPPackage.SOAP_BODY__ENCODING_STYLES);
-    }
-    return encodingStyles;
-  }
-
-  public void setParts(List list)
-  {
-    parts = list;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public List getParts()
-  {
-    if (parts == null)
-    {
-      parts = new EObjectResolvingEList(Part.class, this, SOAPPackage.SOAP_BODY__PARTS);
-      return getImplicitParts();
-    }
-    
-    if (parts.size() == 0)
-    {
-      return getImplicitParts();
-    }
-    
-    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)
-  {
-    if (element != null && element.hasAttribute(SOAPConstants.PARTS_ATTRIBUTE))
-    // Synchronize 'parts' variable from element's attribute.
-    {
-      Message message = getMessage();
-      if (message == null)
-        return;
-      
-      String partNames = element.getAttribute(SOAPConstants.PARTS_ATTRIBUTE);
-      StringTokenizer parser = new StringTokenizer(partNames," ");
-      String partName = null;
-      Part newPart = null;
-      getParts().clear();
-      while(parser.hasMoreTokens())
-      {
-        partName = parser.nextToken();
-        newPart = (message != null) ? (Part) message.getPart(partName) : null;
-        if (newPart != null)
-          // Do not use getParts() here since it will return a list of
-          // implicitly collected parts.
-          parts.add(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.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);
-      }
-    }
-  }
-  
-  protected void changeReference(EReference eReference)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeReference(eReference);
-    //
-    // Update the element's "parts" attribute value.
-    //
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eReference == null || eReference == SOAPPackage.eINSTANCE.getSOAPBody_Parts())
-      {
-        Part part;
-        String partNames = "";
-        Iterator iter = getParts().iterator();
-        while (iter.hasNext())
-        {
-          part = (Part)iter.next();
-          partNames = partNames + " " + part.getName();
-        } 
-        partNames.trim();
-        niceSetAttribute(theElement, SOAPConstants.PARTS_ATTRIBUTE, partNames);
-      }     
-    }
-  } 
-  
-  /*
-  public void handleUnreconciledElement(Element child, Collection remainingModelObjects)
-  {
-    switch (WSDLUtil.getInstance().getWSDLType(child))
-    {
-      case WSDLConstants.PART :
-        Part part = WSDLFactory.eINSTANCE.createPart();
-        part.setEnclosingDefinition(getEnclosingDefinition());
-        part.setElement(child);
-        getParts().add(part);
-        break;
-      default :
-        break;
-    }
-  }
-  */
-  
-  public QName getElementType()
-  {
-    if (elementType == null)
-      elementType = new QName(SOAPConstants.SOAP_NAMESPACE_URI, SOAPConstants.BODY_ELEMENT_TAG);
-    return elementType;
-  } 
- 
-  private List getImplicitParts()
-  {
-    List implicitParts = new java.util.Vector();
-    Message message = getMessage();
-    if(message != null && message.getEParts().size() > 0)
-    {
-      implicitParts.addAll(message.getEParts());
-    }
-    return implicitParts;
-  }
-  
-  private Message getMessage()
-  {
-    Message message = null;
-    
-    if(eContainer() instanceof BindingInput)
-    {
-      if(((BindingInput)eContainer()).getEInput() != null)
-  	    message = ((BindingInput)eContainer()).getEInput().getEMessage();
-    }
-    if(eContainer() instanceof BindingOutput)
-    {
-      if (((BindingOutput)eContainer()).getEOutput() != null)
-  	  message = ((BindingOutput)eContainer()).getEOutput().getEMessage();
-    }
-    if(eContainer() instanceof BindingFault)
-    {
-      if(((BindingFault)eContainer()).getEFault() != null)
-  	  message = ((BindingFault)eContainer()).getEFault().getEMessage();
-    }
-    return message;
-  }
-
-
-} //SOAPBodyImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPFactoryImpl.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPFactoryImpl.java
deleted file mode 100644
index e204e9d06..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPFactoryImpl.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.soap.internal.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.wst.wsdl.binding.soap.SOAPAddress;
-import org.eclipse.wst.wsdl.binding.soap.SOAPBinding;
-import org.eclipse.wst.wsdl.binding.soap.SOAPBody;
-import org.eclipse.wst.wsdl.binding.soap.SOAPFactory;
-import org.eclipse.wst.wsdl.binding.soap.SOAPFault;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeader;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeaderFault;
-import org.eclipse.wst.wsdl.binding.soap.SOAPOperation;
-import org.eclipse.wst.wsdl.binding.soap.SOAPPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class SOAPFactoryImpl extends EFactoryImpl implements SOAPFactory {
-  /**
-   * Creates and instance of the factory.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public SOAPFactoryImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EObject create(EClass eClass)
-  {
-    switch (eClass.getClassifierID())
-    {
-      case SOAPPackage.SOAP_BINDING: return createSOAPBinding();
-      case SOAPPackage.SOAP_BODY: return createSOAPBody();
-      case SOAPPackage.SOAP_HEADER_BASE: return createSOAPHeaderBase();
-      case SOAPPackage.SOAP_FAULT: return createSOAPFault();
-      case SOAPPackage.SOAP_OPERATION: return createSOAPOperation();
-      case SOAPPackage.SOAP_ADDRESS: return createSOAPAddress();
-      case SOAPPackage.SOAP_HEADER_FAULT: return createSOAPHeaderFault();
-      case SOAPPackage.SOAP_HEADER: return createSOAPHeader();
-      default:
-        throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public Object createFromString(EDataType eDataType, String initialValue)
-  {
-    switch (eDataType.getClassifierID())
-    {
-      case SOAPPackage.ISTRING:
-        return createIStringFromString(eDataType, initialValue);
-      default:
-        throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public String convertToString(EDataType eDataType, Object instanceValue)
-  {
-    switch (eDataType.getClassifierID())
-    {
-      case SOAPPackage.ISTRING:
-        return convertIStringToString(eDataType, instanceValue);
-      default:
-        throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public SOAPBinding createSOAPBinding()
-  {
-    SOAPBindingImpl soapBinding = new SOAPBindingImpl();
-    return soapBinding;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public SOAPBody createSOAPBody()
-  {
-    SOAPBodyImpl soapBody = new SOAPBodyImpl();
-    return soapBody;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public SOAPHeaderBase createSOAPHeaderBase()
-  {
-    SOAPHeaderBaseImpl soapHeaderBase = new SOAPHeaderBaseImpl();
-    return soapHeaderBase;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public SOAPFault createSOAPFault()
-  {
-    SOAPFaultImpl soapFault = new SOAPFaultImpl();
-    return soapFault;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public SOAPOperation createSOAPOperation()
-  {
-    SOAPOperationImpl soapOperation = new SOAPOperationImpl();
-    return soapOperation;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public SOAPAddress createSOAPAddress()
-  {
-    SOAPAddressImpl soapAddress = new SOAPAddressImpl();
-    return soapAddress;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public SOAPHeaderFault createSOAPHeaderFault()
-  {
-    SOAPHeaderFaultImpl soapHeaderFault = new SOAPHeaderFaultImpl();
-    return soapHeaderFault;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public SOAPHeader createSOAPHeader()
-  {
-    SOAPHeaderImpl soapHeader = new SOAPHeaderImpl();
-    return soapHeader;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public String createIStringFromString(EDataType eDataType, String initialValue)
-  {
-    return (String)super.createFromString(eDataType, initialValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public String convertIStringToString(EDataType eDataType, Object instanceValue)
-  {
-    return super.convertToString(eDataType, instanceValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public SOAPPackage getSOAPPackage()
-  {
-    return (SOAPPackage)getEPackage();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @deprecated
-   * @generated
-   */
-	public static SOAPPackage getPackage()
-  {
-    return SOAPPackage.eINSTANCE;
-  }
-} //SOAPFactoryImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPFaultImpl.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPFaultImpl.java
deleted file mode 100644
index 07809ad6d..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPFaultImpl.java
+++ /dev/null
@@ -1,406 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.soap.internal.impl;
-
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-import org.eclipse.wst.wsdl.binding.soap.SOAPFault;
-import org.eclipse.wst.wsdl.binding.soap.SOAPPackage;
-import org.eclipse.wst.wsdl.binding.soap.internal.util.SOAPConstants;
-import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl;
-import org.w3c.dom.Element;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Fault</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPFaultImpl#getUse <em>Use</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPFaultImpl#getNamespaceURI <em>Namespace URI</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPFaultImpl#getEncodingStyles <em>Encoding Styles</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class SOAPFaultImpl extends ExtensibilityElementImpl implements SOAPFault {
-  /**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * The default value of the '{@link #getUse() <em>Use</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getUse()
-   * @generated
-   * @ordered
-   */
-	protected static final String USE_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getUse() <em>Use</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getUse()
-   * @generated
-   * @ordered
-   */
-	protected String use = USE_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getNamespaceURI() <em>Namespace URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getNamespaceURI()
-   * @generated
-   * @ordered
-   */
-	protected static final String NAMESPACE_URI_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getNamespaceURI() <em>Namespace URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getNamespaceURI()
-   * @generated
-   * @ordered
-   */
-	protected String namespaceURI = NAMESPACE_URI_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getEncodingStyles() <em>Encoding Styles</em>}' attribute list.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getEncodingStyles()
-   * @generated
-   * @ordered
-   */
-	protected EList encodingStyles = null;
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	protected SOAPFaultImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	protected EClass eStaticClass()
-  {
-    return SOAPPackage.eINSTANCE.getSOAPFault();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public String getUse()
-  {
-    return use;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void setUse(String newUse)
-  {
-    String oldUse = use;
-    use = newUse;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SOAPPackage.SOAP_FAULT__USE, oldUse, use));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public String getNamespaceURI()
-  {
-    return namespaceURI;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void setNamespaceURI(String newNamespaceURI)
-  {
-    String oldNamespaceURI = namespaceURI;
-    namespaceURI = newNamespaceURI;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SOAPPackage.SOAP_FAULT__NAMESPACE_URI, oldNamespaceURI, namespaceURI));
-  }
-
-private String name;
-public String getName()
-{
-  return name;
-}
-
-public void setName(String name)
-{
-  this.name = name;
-}
-
-public void setEncodingStyles(List list)
-{
-  encodingStyles = (EList)list;
-}
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public List getEncodingStyles()
-  {
-    if (encodingStyles == null)
-    {
-      encodingStyles = new EDataTypeUniqueEList(String.class, this, SOAPPackage.SOAP_FAULT__ENCODING_STYLES);
-    }
-    return encodingStyles;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_FAULT__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case SOAPPackage.SOAP_FAULT__ELEMENT:
-        return getElement();
-      case SOAPPackage.SOAP_FAULT__REQUIRED:
-        return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-      case SOAPPackage.SOAP_FAULT__ELEMENT_TYPE:
-        return getElementType();
-      case SOAPPackage.SOAP_FAULT__USE:
-        return getUse();
-      case SOAPPackage.SOAP_FAULT__NAMESPACE_URI:
-        return getNamespaceURI();
-      case SOAPPackage.SOAP_FAULT__ENCODING_STYLES:
-        return getEncodingStyles();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_FAULT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case SOAPPackage.SOAP_FAULT__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case SOAPPackage.SOAP_FAULT__REQUIRED:
-        setRequired(((Boolean)newValue).booleanValue());
-        return;
-      case SOAPPackage.SOAP_FAULT__ELEMENT_TYPE:
-        setElementType((QName)newValue);
-        return;
-      case SOAPPackage.SOAP_FAULT__USE:
-        setUse((String)newValue);
-        return;
-      case SOAPPackage.SOAP_FAULT__NAMESPACE_URI:
-        setNamespaceURI((String)newValue);
-        return;
-      case SOAPPackage.SOAP_FAULT__ENCODING_STYLES:
-        getEncodingStyles().clear();
-        getEncodingStyles().addAll((Collection)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_FAULT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_FAULT__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_FAULT__REQUIRED:
-        setRequired(REQUIRED_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_FAULT__ELEMENT_TYPE:
-        setElementType(ELEMENT_TYPE_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_FAULT__USE:
-        setUse(USE_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_FAULT__NAMESPACE_URI:
-        setNamespaceURI(NAMESPACE_URI_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_FAULT__ENCODING_STYLES:
-        getEncodingStyles().clear();
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_FAULT__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case SOAPPackage.SOAP_FAULT__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case SOAPPackage.SOAP_FAULT__REQUIRED:
-        return required != REQUIRED_EDEFAULT;
-      case SOAPPackage.SOAP_FAULT__ELEMENT_TYPE:
-        return ELEMENT_TYPE_EDEFAULT == null ? elementType != null : !ELEMENT_TYPE_EDEFAULT.equals(elementType);
-      case SOAPPackage.SOAP_FAULT__USE:
-        return USE_EDEFAULT == null ? use != null : !USE_EDEFAULT.equals(use);
-      case SOAPPackage.SOAP_FAULT__NAMESPACE_URI:
-        return NAMESPACE_URI_EDEFAULT == null ? namespaceURI != null : !NAMESPACE_URI_EDEFAULT.equals(namespaceURI);
-      case SOAPPackage.SOAP_FAULT__ENCODING_STYLES:
-        return encodingStyles != null && !encodingStyles.isEmpty();
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (use: ");
-    result.append(use);
-    result.append(", namespaceURI: ");
-    result.append(namespaceURI);
-    result.append(", encodingStyles: ");
-    result.append(encodingStyles);
-    result.append(')');
-    return result.toString();
-  }
-	
-  //
-  // Reconcile methods: DOM -> Model
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-    setName
-      (SOAPConstants.getAttribute(changedElement, SOAPConstants.NAME_ATTRIBUTE));
-    setNamespaceURI
-      (SOAPConstants.getAttribute(changedElement, SOAPConstants.NAMESPACE_URI_ATTRIBUTE));
-    setUse
-      (SOAPConstants.getAttribute(changedElement, SOAPConstants.USE_ATTRIBUTE));
-    
-    // TBD - handle encodingStyles
-    
-    reconcileReferences(false);
-  }
-  
-  //
-  // For reconciliation: Model -> DOM
-  //
-
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeAttribute(eAttribute);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eAttribute == null || eAttribute == SOAPPackage.eINSTANCE.getSOAPFault_NamespaceURI())
-        niceSetAttribute(theElement,SOAPConstants.NAMESPACE_ATTRIBUTE,getNamespaceURI());
-      if (eAttribute == null || eAttribute == SOAPPackage.eINSTANCE.getSOAPFault_Use())
-        niceSetAttribute(theElement,SOAPConstants.USE_ATTRIBUTE,getUse());
-      if (eAttribute == null || eAttribute == SOAPPackage.eINSTANCE.getSOAPFault_EncodingStyles())
-	  {
-	        List encodingStyleList = getEncodingStyles();
-	        String encodingStyles = "";
-	        Iterator iterator = encodingStyleList.iterator();
-	        while (iterator.hasNext())
-	        {
-	          if (encodingStyles.equals("")) // first iteration
-	            encodingStyles += (String)iterator.next();
-	          else
-	          	encodingStyles += " " + (String)iterator.next();
-	        }
-	        if (!encodingStyles.equals(""))
-	          niceSetAttribute(theElement,SOAPConstants.ENCODING_STYLE_ATTRIBUTE,encodingStyles);
-	      } // TBD - Is this the proper way to handle encodingStyles
-      if (getName() != null)
-      	niceSetAttribute(theElement,SOAPConstants.NAME_ATTRIBUTE,getName()); // Revisit Rose model
-    }
-  }
-  
-  public QName getElementType()
-  {
-    if (elementType == null)
-      elementType = new QName(SOAPConstants.SOAP_NAMESPACE_URI, SOAPConstants.FAULT_ELEMENT_TAG);
-    return elementType;
-  }
-
-} //SOAPFaultImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPHeaderBaseImpl.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPHeaderBaseImpl.java
deleted file mode 100644
index a065e63f8..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPHeaderBaseImpl.java
+++ /dev/null
@@ -1,564 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.soap.internal.impl;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase;
-import org.eclipse.wst.wsdl.binding.soap.SOAPPackage;
-import org.eclipse.wst.wsdl.binding.soap.internal.util.SOAPConstants;
-import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl;
-import org.w3c.dom.Element;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Header Base</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPHeaderBaseImpl#getUse <em>Use</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPHeaderBaseImpl#getNamespaceURI <em>Namespace URI</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPHeaderBaseImpl#getEncodingStyles <em>Encoding Styles</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPHeaderBaseImpl#getMessage <em>Message</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPHeaderBaseImpl#getPart <em>Part</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class SOAPHeaderBaseImpl extends ExtensibilityElementImpl implements SOAPHeaderBase {
-  /**
-   * The default value of the '{@link #getUse() <em>Use</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getUse()
-   * @generated
-   * @ordered
-   */
-	protected static final String USE_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getUse() <em>Use</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getUse()
-   * @generated
-   * @ordered
-   */
-	protected String use = USE_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getNamespaceURI() <em>Namespace URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getNamespaceURI()
-   * @generated
-   * @ordered
-   */
-	protected static final String NAMESPACE_URI_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getNamespaceURI() <em>Namespace URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getNamespaceURI()
-   * @generated
-   * @ordered
-   */
-	protected String namespaceURI = NAMESPACE_URI_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getEncodingStyles() <em>Encoding Styles</em>}' attribute list.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getEncodingStyles()
-   * @generated
-   * @ordered
-   */
-	protected EList encodingStyles = null;
-
-  /**
-   * The cached value of the '{@link #getMessage() <em>Message</em>}' reference.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getMessage()
-   * @generated
-   * @ordered
-   */
-	protected Message message = null;
-
-  /**
-   * The cached value of the '{@link #getPart() <em>Part</em>}' reference.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getPart()
-   * @generated
-   * @ordered
-   */
-	protected Part part = null;
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	protected SOAPHeaderBaseImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	protected EClass eStaticClass()
-  {
-    return SOAPPackage.eINSTANCE.getSOAPHeaderBase();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public String getUse()
-  {
-    return use;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void setUse(String newUse)
-  {
-    String oldUse = use;
-    use = newUse;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SOAPPackage.SOAP_HEADER_BASE__USE, oldUse, use));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public String getNamespaceURI()
-  {
-    return namespaceURI;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void setNamespaceURI(String newNamespaceURI)
-  {
-    String oldNamespaceURI = namespaceURI;
-    namespaceURI = newNamespaceURI;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SOAPPackage.SOAP_HEADER_BASE__NAMESPACE_URI, oldNamespaceURI, namespaceURI));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EList getEncodingStyles()
-  {
-    if (encodingStyles == null)
-    {
-      encodingStyles = new EDataTypeUniqueEList(String.class, this, SOAPPackage.SOAP_HEADER_BASE__ENCODING_STYLES);
-    }
-    return encodingStyles;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public Message getMessage()
-  {
-    if (message != null && message.eIsProxy())
-    {
-      Message oldMessage = message;
-      message = (Message)eResolveProxy((InternalEObject)message);
-      if (message != oldMessage)
-      {
-        if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, SOAPPackage.SOAP_HEADER_BASE__MESSAGE, oldMessage, message));
-      }
-    }
-    return message;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public Message basicGetMessage()
-  {
-    return message;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void setMessage(Message newMessage)
-  {
-    Message oldMessage = message;
-    message = newMessage;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SOAPPackage.SOAP_HEADER_BASE__MESSAGE, oldMessage, message));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public Part getPart()
-  {
-    if (part != null && part.eIsProxy())
-    {
-      Part oldPart = part;
-      part = (Part)eResolveProxy((InternalEObject)part);
-      if (part != oldPart)
-      {
-        if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, SOAPPackage.SOAP_HEADER_BASE__PART, oldPart, part));
-      }
-    }
-    return part;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public Part basicGetPart()
-  {
-    return part;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void setPart(Part newPart)
-  {
-    Part oldPart = part;
-    part = newPart;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SOAPPackage.SOAP_HEADER_BASE__PART, oldPart, part));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_HEADER_BASE__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case SOAPPackage.SOAP_HEADER_BASE__ELEMENT:
-        return getElement();
-      case SOAPPackage.SOAP_HEADER_BASE__REQUIRED:
-        return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-      case SOAPPackage.SOAP_HEADER_BASE__ELEMENT_TYPE:
-        return getElementType();
-      case SOAPPackage.SOAP_HEADER_BASE__USE:
-        return getUse();
-      case SOAPPackage.SOAP_HEADER_BASE__NAMESPACE_URI:
-        return getNamespaceURI();
-      case SOAPPackage.SOAP_HEADER_BASE__ENCODING_STYLES:
-        return getEncodingStyles();
-      case SOAPPackage.SOAP_HEADER_BASE__MESSAGE:
-        if (resolve) return getMessage();
-        return basicGetMessage();
-      case SOAPPackage.SOAP_HEADER_BASE__PART:
-        if (resolve) return getPart();
-        return basicGetPart();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_HEADER_BASE__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case SOAPPackage.SOAP_HEADER_BASE__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case SOAPPackage.SOAP_HEADER_BASE__REQUIRED:
-        setRequired(((Boolean)newValue).booleanValue());
-        return;
-      case SOAPPackage.SOAP_HEADER_BASE__ELEMENT_TYPE:
-        setElementType((QName)newValue);
-        return;
-      case SOAPPackage.SOAP_HEADER_BASE__USE:
-        setUse((String)newValue);
-        return;
-      case SOAPPackage.SOAP_HEADER_BASE__NAMESPACE_URI:
-        setNamespaceURI((String)newValue);
-        return;
-      case SOAPPackage.SOAP_HEADER_BASE__ENCODING_STYLES:
-        getEncodingStyles().clear();
-        getEncodingStyles().addAll((Collection)newValue);
-        return;
-      case SOAPPackage.SOAP_HEADER_BASE__MESSAGE:
-        setMessage((Message)newValue);
-        return;
-      case SOAPPackage.SOAP_HEADER_BASE__PART:
-        setPart((Part)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_HEADER_BASE__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_HEADER_BASE__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_HEADER_BASE__REQUIRED:
-        setRequired(REQUIRED_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_HEADER_BASE__ELEMENT_TYPE:
-        setElementType(ELEMENT_TYPE_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_HEADER_BASE__USE:
-        setUse(USE_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_HEADER_BASE__NAMESPACE_URI:
-        setNamespaceURI(NAMESPACE_URI_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_HEADER_BASE__ENCODING_STYLES:
-        getEncodingStyles().clear();
-        return;
-      case SOAPPackage.SOAP_HEADER_BASE__MESSAGE:
-        setMessage((Message)null);
-        return;
-      case SOAPPackage.SOAP_HEADER_BASE__PART:
-        setPart((Part)null);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_HEADER_BASE__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case SOAPPackage.SOAP_HEADER_BASE__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case SOAPPackage.SOAP_HEADER_BASE__REQUIRED:
-        return required != REQUIRED_EDEFAULT;
-      case SOAPPackage.SOAP_HEADER_BASE__ELEMENT_TYPE:
-        return ELEMENT_TYPE_EDEFAULT == null ? elementType != null : !ELEMENT_TYPE_EDEFAULT.equals(elementType);
-      case SOAPPackage.SOAP_HEADER_BASE__USE:
-        return USE_EDEFAULT == null ? use != null : !USE_EDEFAULT.equals(use);
-      case SOAPPackage.SOAP_HEADER_BASE__NAMESPACE_URI:
-        return NAMESPACE_URI_EDEFAULT == null ? namespaceURI != null : !NAMESPACE_URI_EDEFAULT.equals(namespaceURI);
-      case SOAPPackage.SOAP_HEADER_BASE__ENCODING_STYLES:
-        return encodingStyles != null && !encodingStyles.isEmpty();
-      case SOAPPackage.SOAP_HEADER_BASE__MESSAGE:
-        return message != null;
-      case SOAPPackage.SOAP_HEADER_BASE__PART:
-        return part != null;
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (use: ");
-    result.append(use);
-    result.append(", namespaceURI: ");
-    result.append(namespaceURI);
-    result.append(", encodingStyles: ");
-    result.append(encodingStyles);
-    result.append(')');
-    return result.toString();
-  }
-
-  //
-  // Reconcile methods: DOM -> Model
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-    if (changedElement.hasAttribute(SOAPConstants.USE_ATTRIBUTE))
-      setUse(changedElement.getAttribute(SOAPConstants.USE_ATTRIBUTE));
-    if (changedElement.hasAttribute(SOAPConstants.NAMESPACE_ATTRIBUTE))
-      setNamespaceURI(changedElement.getAttribute(SOAPConstants.NAMESPACE_ATTRIBUTE));
-    if (changedElement.hasAttribute(SOAPConstants.ENCODING_STYLE_ATTRIBUTE)) 
-    {
-      String encodingStyles = changedElement.getAttribute(SOAPConstants.ENCODING_STYLE_ATTRIBUTE);
-      StringTokenizer tokenizer = new StringTokenizer(encodingStyles);
-      while (tokenizer.hasMoreTokens())
-      	getEncodingStyles().add(tokenizer.nextToken());
-    } 
-    
-    reconcileReferences(false);
-  }
-  
-  public void reconcileReferences(boolean deep)
-  {
-    if (element != null && element.hasAttribute(SOAPConstants.MESSAGE_ATTRIBUTE))
-    {
-      Definition definition = getEnclosingDefinition();
-      QName messageQName = createQName(definition, element.getAttribute(SOAPConstants.MESSAGE_ATTRIBUTE));
-      Message newMessage = (messageQName != null) ? (Message) definition.getMessage(messageQName) : null;
-      if (newMessage != null && newMessage != getMessage())
-        setMessage(newMessage);
-      
-      if (element.hasAttribute(SOAPConstants.PART_ATTRIBUTE))
-      {
-        String partName = element.getAttribute(SOAPConstants.PART_ATTRIBUTE);
-        Part newPart = (newMessage != null) ? (Part) newMessage.getPart(partName) : null;
-        if (newPart != null && newPart != getPart())
-          setPart(newPart);
-      }   
-    }
-    super.reconcileReferences(deep);
-  }	  
- 
-  //
-  // For reconciliation: Model -> DOM
-  //
-
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeAttribute(eAttribute);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eAttribute == null || eAttribute == SOAPPackage.eINSTANCE.getSOAPHeaderBase_Use())
-        niceSetAttribute(theElement,SOAPConstants.USE_ATTRIBUTE,getUse());
-      if(eAttribute == null || eAttribute == SOAPPackage.eINSTANCE.getSOAPHeaderBase_NamespaceURI())
-        niceSetAttribute(theElement,SOAPConstants.NAMESPACE_ATTRIBUTE,getNamespaceURI());
-      if (eAttribute == null || eAttribute == SOAPPackage.eINSTANCE.getSOAPHeaderBase_EncodingStyles())
-      {
-        List encodingStyleList = getEncodingStyles();
-        String encodingStyles = "";
-        Iterator iterator = encodingStyleList.iterator();
-        while (iterator.hasNext())
-        {
-          if (encodingStyles.equals("")) // first iteration
-            encodingStyles += (String)iterator.next();
-          else
-  	        encodingStyles += " " + (String)iterator.next();
-        }
-        if (!encodingStyles.equals(""))
-          niceSetAttribute(theElement,SOAPConstants.ENCODING_STYLE_ATTRIBUTE,encodingStyles);
-      }
-    }
-  }
-  
-  protected void changeReference(EReference eReference)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeReference(eReference);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eReference == null || eReference == SOAPPackage.eINSTANCE.getSOAPHeaderBase_Message())
-      {
-        Message message = getMessage();
-        if (message != null)
-        {
-          QName qName = message.getQName();
-          niceSetAttributeURIValue(theElement, SOAPConstants.MESSAGE_ATTRIBUTE, qName.getNamespaceURI() + "#" + qName.getLocalPart());
-        }
-      }
-      
-      if (eReference == null || eReference == SOAPPackage.eINSTANCE.getSOAPHeaderBase_Part())
-      {
-        Part part = getPart();
-        if (part != null)
-        {
-          String partName = part.getName();
-          niceSetAttribute(theElement, SOAPConstants.PART_ATTRIBUTE,partName);
-        }
-      }
-    }
-  }
-} //SOAPHeaderBaseImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPHeaderFaultImpl.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPHeaderFaultImpl.java
deleted file mode 100644
index 403240079..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPHeaderFaultImpl.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.soap.internal.impl;
-
-import java.util.Collection;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeaderFault;
-import org.eclipse.wst.wsdl.binding.soap.SOAPPackage;
-import org.eclipse.wst.wsdl.binding.soap.internal.util.SOAPConstants;
-import org.w3c.dom.Element;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Header Fault</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class SOAPHeaderFaultImpl extends SOAPHeaderBaseImpl implements SOAPHeaderFault {
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	protected SOAPHeaderFaultImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	protected EClass eStaticClass()
-  {
-    return SOAPPackage.eINSTANCE.getSOAPHeaderFault();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_HEADER_FAULT__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case SOAPPackage.SOAP_HEADER_FAULT__ELEMENT:
-        return getElement();
-      case SOAPPackage.SOAP_HEADER_FAULT__REQUIRED:
-        return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-      case SOAPPackage.SOAP_HEADER_FAULT__ELEMENT_TYPE:
-        return getElementType();
-      case SOAPPackage.SOAP_HEADER_FAULT__USE:
-        return getUse();
-      case SOAPPackage.SOAP_HEADER_FAULT__NAMESPACE_URI:
-        return getNamespaceURI();
-      case SOAPPackage.SOAP_HEADER_FAULT__ENCODING_STYLES:
-        return getEncodingStyles();
-      case SOAPPackage.SOAP_HEADER_FAULT__MESSAGE:
-        if (resolve) return getMessage();
-        return basicGetMessage();
-      case SOAPPackage.SOAP_HEADER_FAULT__PART:
-        if (resolve) return getPart();
-        return basicGetPart();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_HEADER_FAULT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case SOAPPackage.SOAP_HEADER_FAULT__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case SOAPPackage.SOAP_HEADER_FAULT__REQUIRED:
-        setRequired(((Boolean)newValue).booleanValue());
-        return;
-      case SOAPPackage.SOAP_HEADER_FAULT__ELEMENT_TYPE:
-        setElementType((QName)newValue);
-        return;
-      case SOAPPackage.SOAP_HEADER_FAULT__USE:
-        setUse((String)newValue);
-        return;
-      case SOAPPackage.SOAP_HEADER_FAULT__NAMESPACE_URI:
-        setNamespaceURI((String)newValue);
-        return;
-      case SOAPPackage.SOAP_HEADER_FAULT__ENCODING_STYLES:
-        getEncodingStyles().clear();
-        getEncodingStyles().addAll((Collection)newValue);
-        return;
-      case SOAPPackage.SOAP_HEADER_FAULT__MESSAGE:
-        setMessage((Message)newValue);
-        return;
-      case SOAPPackage.SOAP_HEADER_FAULT__PART:
-        setPart((Part)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_HEADER_FAULT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_HEADER_FAULT__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_HEADER_FAULT__REQUIRED:
-        setRequired(REQUIRED_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_HEADER_FAULT__ELEMENT_TYPE:
-        setElementType(ELEMENT_TYPE_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_HEADER_FAULT__USE:
-        setUse(USE_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_HEADER_FAULT__NAMESPACE_URI:
-        setNamespaceURI(NAMESPACE_URI_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_HEADER_FAULT__ENCODING_STYLES:
-        getEncodingStyles().clear();
-        return;
-      case SOAPPackage.SOAP_HEADER_FAULT__MESSAGE:
-        setMessage((Message)null);
-        return;
-      case SOAPPackage.SOAP_HEADER_FAULT__PART:
-        setPart((Part)null);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_HEADER_FAULT__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case SOAPPackage.SOAP_HEADER_FAULT__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case SOAPPackage.SOAP_HEADER_FAULT__REQUIRED:
-        return required != REQUIRED_EDEFAULT;
-      case SOAPPackage.SOAP_HEADER_FAULT__ELEMENT_TYPE:
-        return ELEMENT_TYPE_EDEFAULT == null ? elementType != null : !ELEMENT_TYPE_EDEFAULT.equals(elementType);
-      case SOAPPackage.SOAP_HEADER_FAULT__USE:
-        return USE_EDEFAULT == null ? use != null : !USE_EDEFAULT.equals(use);
-      case SOAPPackage.SOAP_HEADER_FAULT__NAMESPACE_URI:
-        return NAMESPACE_URI_EDEFAULT == null ? namespaceURI != null : !NAMESPACE_URI_EDEFAULT.equals(namespaceURI);
-      case SOAPPackage.SOAP_HEADER_FAULT__ENCODING_STYLES:
-        return encodingStyles != null && !encodingStyles.isEmpty();
-      case SOAPPackage.SOAP_HEADER_FAULT__MESSAGE:
-        return message != null;
-      case SOAPPackage.SOAP_HEADER_FAULT__PART:
-        return part != null;
-    }
-    return eDynamicIsSet(eFeature);
-  }
-  
-  public QName getElementType()
-  {
-    if (elementType == null)
-      elementType = new QName(SOAPConstants.SOAP_NAMESPACE_URI, SOAPConstants.HEADER_FAULT_ELEMENT_TAG);
-    return elementType;
-  } 
-
-} //SOAPHeaderFaultImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPHeaderImpl.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPHeaderImpl.java
deleted file mode 100644
index da6241437..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPHeaderImpl.java
+++ /dev/null
@@ -1,303 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.soap.internal.impl;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.binding.soap.SOAPFactory;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeader;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeaderFault;
-import org.eclipse.wst.wsdl.binding.soap.SOAPPackage;
-import org.eclipse.wst.wsdl.binding.soap.internal.util.SOAPConstants;
-import org.w3c.dom.Element;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Header</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPHeaderImpl#getHeaderFaults <em>Header Faults</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class SOAPHeaderImpl extends SOAPHeaderBaseImpl implements SOAPHeader {
-  /**
-   * The cached value of the '{@link #getHeaderFaults() <em>Header Faults</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getHeaderFaults()
-   * @generated
-   * @ordered
-   */
-	protected EList headerFaults = null;
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	protected SOAPHeaderImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	protected EClass eStaticClass()
-  {
-    return SOAPPackage.eINSTANCE.getSOAPHeader();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EList getHeaderFaults()
-  {
-    if (headerFaults == null)
-    {
-      headerFaults = new EObjectContainmentEList(SOAPHeaderFault.class, this, SOAPPackage.SOAP_HEADER__HEADER_FAULTS);
-    }
-    return headerFaults;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs)
-  {
-    if (featureID >= 0)
-    {
-      switch (eDerivedStructuralFeatureID(featureID, baseClass))
-      {
-        case SOAPPackage.SOAP_HEADER__HEADER_FAULTS:
-          return ((InternalEList)getHeaderFaults()).basicRemove(otherEnd, msgs);
-        default:
-          return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-      }
-    }
-    return eBasicSetContainer(null, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_HEADER__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case SOAPPackage.SOAP_HEADER__ELEMENT:
-        return getElement();
-      case SOAPPackage.SOAP_HEADER__REQUIRED:
-        return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-      case SOAPPackage.SOAP_HEADER__ELEMENT_TYPE:
-        return getElementType();
-      case SOAPPackage.SOAP_HEADER__USE:
-        return getUse();
-      case SOAPPackage.SOAP_HEADER__NAMESPACE_URI:
-        return getNamespaceURI();
-      case SOAPPackage.SOAP_HEADER__ENCODING_STYLES:
-        return getEncodingStyles();
-      case SOAPPackage.SOAP_HEADER__MESSAGE:
-        if (resolve) return getMessage();
-        return basicGetMessage();
-      case SOAPPackage.SOAP_HEADER__PART:
-        if (resolve) return getPart();
-        return basicGetPart();
-      case SOAPPackage.SOAP_HEADER__HEADER_FAULTS:
-        return getHeaderFaults();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_HEADER__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case SOAPPackage.SOAP_HEADER__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case SOAPPackage.SOAP_HEADER__REQUIRED:
-        setRequired(((Boolean)newValue).booleanValue());
-        return;
-      case SOAPPackage.SOAP_HEADER__ELEMENT_TYPE:
-        setElementType((QName)newValue);
-        return;
-      case SOAPPackage.SOAP_HEADER__USE:
-        setUse((String)newValue);
-        return;
-      case SOAPPackage.SOAP_HEADER__NAMESPACE_URI:
-        setNamespaceURI((String)newValue);
-        return;
-      case SOAPPackage.SOAP_HEADER__ENCODING_STYLES:
-        getEncodingStyles().clear();
-        getEncodingStyles().addAll((Collection)newValue);
-        return;
-      case SOAPPackage.SOAP_HEADER__MESSAGE:
-        setMessage((Message)newValue);
-        return;
-      case SOAPPackage.SOAP_HEADER__PART:
-        setPart((Part)newValue);
-        return;
-      case SOAPPackage.SOAP_HEADER__HEADER_FAULTS:
-        getHeaderFaults().clear();
-        getHeaderFaults().addAll((Collection)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_HEADER__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_HEADER__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_HEADER__REQUIRED:
-        setRequired(REQUIRED_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_HEADER__ELEMENT_TYPE:
-        setElementType(ELEMENT_TYPE_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_HEADER__USE:
-        setUse(USE_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_HEADER__NAMESPACE_URI:
-        setNamespaceURI(NAMESPACE_URI_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_HEADER__ENCODING_STYLES:
-        getEncodingStyles().clear();
-        return;
-      case SOAPPackage.SOAP_HEADER__MESSAGE:
-        setMessage((Message)null);
-        return;
-      case SOAPPackage.SOAP_HEADER__PART:
-        setPart((Part)null);
-        return;
-      case SOAPPackage.SOAP_HEADER__HEADER_FAULTS:
-        getHeaderFaults().clear();
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_HEADER__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case SOAPPackage.SOAP_HEADER__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case SOAPPackage.SOAP_HEADER__REQUIRED:
-        return required != REQUIRED_EDEFAULT;
-      case SOAPPackage.SOAP_HEADER__ELEMENT_TYPE:
-        return ELEMENT_TYPE_EDEFAULT == null ? elementType != null : !ELEMENT_TYPE_EDEFAULT.equals(elementType);
-      case SOAPPackage.SOAP_HEADER__USE:
-        return USE_EDEFAULT == null ? use != null : !USE_EDEFAULT.equals(use);
-      case SOAPPackage.SOAP_HEADER__NAMESPACE_URI:
-        return NAMESPACE_URI_EDEFAULT == null ? namespaceURI != null : !NAMESPACE_URI_EDEFAULT.equals(namespaceURI);
-      case SOAPPackage.SOAP_HEADER__ENCODING_STYLES:
-        return encodingStyles != null && !encodingStyles.isEmpty();
-      case SOAPPackage.SOAP_HEADER__MESSAGE:
-        return message != null;
-      case SOAPPackage.SOAP_HEADER__PART:
-        return part != null;
-      case SOAPPackage.SOAP_HEADER__HEADER_FAULTS:
-        return headerFaults != null && !headerFaults.isEmpty();
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  public void handleUnreconciledElement(Element child, Collection remainingModelObjects)
-  {
-    if (SOAPConstants.HEADER_FAULT_ELEMENT_TAG.equals(child.getLocalName()))
-    {
-      SOAPHeaderFault fault = SOAPFactory.eINSTANCE.createSOAPHeaderFault();
-      fault.setEnclosingDefinition(getEnclosingDefinition());
-      fault.setElement(child);
-      getHeaderFaults().add(fault);
-    }
-  }
-  
-  protected void handleReconciliation(Collection remainingModelObjects)
-  {
-    for (Iterator i = remainingModelObjects.iterator(); i.hasNext();)
-    {
-      remove(this, i.next());
-    }
-  }
-
-  protected void remove(Object component, Object modelObject)
-  {
-    SOAPHeader header = (SOAPHeader) component;
-    if (modelObject instanceof SOAPHeaderFault)
-    {
-      header.getHeaderFaults().remove(modelObject);
-    }
-  }
-  
-  public QName getElementType()
-  {
-    if (elementType == null)
-      elementType = new QName(SOAPConstants.SOAP_NAMESPACE_URI, SOAPConstants.HEADER_ELEMENT_TAG);
-    return elementType;
-  } 
-
-} //SOAPHeaderImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPOperationImpl.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPOperationImpl.java
deleted file mode 100644
index a94e27611..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPOperationImpl.java
+++ /dev/null
@@ -1,325 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.soap.internal.impl;
-
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.wst.wsdl.binding.soap.SOAPOperation;
-import org.eclipse.wst.wsdl.binding.soap.SOAPPackage;
-import org.eclipse.wst.wsdl.binding.soap.internal.util.SOAPConstants;
-import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl;
-import org.w3c.dom.Element;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Operation</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPOperationImpl#getSoapActionURI <em>Soap Action URI</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPOperationImpl#getStyle <em>Style</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class SOAPOperationImpl extends ExtensibilityElementImpl implements SOAPOperation {
-  /**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * The default value of the '{@link #getSoapActionURI() <em>Soap Action URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getSoapActionURI()
-   * @generated
-   * @ordered
-   */
-	protected static final String SOAP_ACTION_URI_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getSoapActionURI() <em>Soap Action URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getSoapActionURI()
-   * @generated
-   * @ordered
-   */
-	protected String soapActionURI = SOAP_ACTION_URI_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getStyle()
-   * @generated
-   * @ordered
-   */
-	protected static final String STYLE_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getStyle()
-   * @generated
-   * @ordered
-   */
-	protected String style = STYLE_EDEFAULT;
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	protected SOAPOperationImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	protected EClass eStaticClass()
-  {
-    return SOAPPackage.eINSTANCE.getSOAPOperation();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public String getSoapActionURI()
-  {
-    return soapActionURI;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void setSoapActionURI(String newSoapActionURI)
-  {
-    String oldSoapActionURI = soapActionURI;
-    soapActionURI = newSoapActionURI;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SOAPPackage.SOAP_OPERATION__SOAP_ACTION_URI, oldSoapActionURI, soapActionURI));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public String getStyle()
-  {
-    return style;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void setStyle(String newStyle)
-  {
-    String oldStyle = style;
-    style = newStyle;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SOAPPackage.SOAP_OPERATION__STYLE, oldStyle, style));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_OPERATION__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case SOAPPackage.SOAP_OPERATION__ELEMENT:
-        return getElement();
-      case SOAPPackage.SOAP_OPERATION__REQUIRED:
-        return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-      case SOAPPackage.SOAP_OPERATION__ELEMENT_TYPE:
-        return getElementType();
-      case SOAPPackage.SOAP_OPERATION__SOAP_ACTION_URI:
-        return getSoapActionURI();
-      case SOAPPackage.SOAP_OPERATION__STYLE:
-        return getStyle();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_OPERATION__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case SOAPPackage.SOAP_OPERATION__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case SOAPPackage.SOAP_OPERATION__REQUIRED:
-        setRequired(((Boolean)newValue).booleanValue());
-        return;
-      case SOAPPackage.SOAP_OPERATION__ELEMENT_TYPE:
-        setElementType((QName)newValue);
-        return;
-      case SOAPPackage.SOAP_OPERATION__SOAP_ACTION_URI:
-        setSoapActionURI((String)newValue);
-        return;
-      case SOAPPackage.SOAP_OPERATION__STYLE:
-        setStyle((String)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_OPERATION__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_OPERATION__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_OPERATION__REQUIRED:
-        setRequired(REQUIRED_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_OPERATION__ELEMENT_TYPE:
-        setElementType(ELEMENT_TYPE_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_OPERATION__SOAP_ACTION_URI:
-        setSoapActionURI(SOAP_ACTION_URI_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_OPERATION__STYLE:
-        setStyle(STYLE_EDEFAULT);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_OPERATION__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case SOAPPackage.SOAP_OPERATION__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case SOAPPackage.SOAP_OPERATION__REQUIRED:
-        return required != REQUIRED_EDEFAULT;
-      case SOAPPackage.SOAP_OPERATION__ELEMENT_TYPE:
-        return ELEMENT_TYPE_EDEFAULT == null ? elementType != null : !ELEMENT_TYPE_EDEFAULT.equals(elementType);
-      case SOAPPackage.SOAP_OPERATION__SOAP_ACTION_URI:
-        return SOAP_ACTION_URI_EDEFAULT == null ? soapActionURI != null : !SOAP_ACTION_URI_EDEFAULT.equals(soapActionURI);
-      case SOAPPackage.SOAP_OPERATION__STYLE:
-        return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (soapActionURI: ");
-    result.append(soapActionURI);
-    result.append(", style: ");
-    result.append(style);
-    result.append(')');
-    return result.toString();
-  }
-	
-  //
-  // Reconcile methods: DOM -> Model
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-    setSoapActionURI
-      (SOAPConstants.getAttribute(changedElement, SOAPConstants.SOAP_ACTION_ATTRIBUTE));
-    setStyle
-      (SOAPConstants.getAttribute(changedElement, SOAPConstants.STYLE_ATTRIBUTE));
-    reconcileReferences(false);
-  }
-  
-  //
-  // For reconciliation: Model -> DOM
-  //
-
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeAttribute(eAttribute);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eAttribute == null || eAttribute == SOAPPackage.eINSTANCE.getSOAPOperation_SoapActionURI())
-        niceSetAttribute(theElement,SOAPConstants.SOAP_ACTION_ATTRIBUTE,getSoapActionURI());
-      if (eAttribute == null || eAttribute == SOAPPackage.eINSTANCE.getSOAPOperation_Style())
-        niceSetAttribute(theElement,SOAPConstants.STYLE_ATTRIBUTE,getStyle());
-    }
-  }
-  
-  public QName getElementType()
-  {
-    if (elementType == null)
-      elementType = new QName(SOAPConstants.SOAP_NAMESPACE_URI, SOAPConstants.OPERATION_ELEMENT_TAG);
-    return elementType;
-  } 
-
-} //SOAPOperationImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPPackageImpl.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPPackageImpl.java
deleted file mode 100644
index 8e1d126f8..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPPackageImpl.java
+++ /dev/null
@@ -1,594 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.soap.internal.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.binding.soap.SOAPAddress;
-import org.eclipse.wst.wsdl.binding.soap.SOAPBinding;
-import org.eclipse.wst.wsdl.binding.soap.SOAPBody;
-import org.eclipse.wst.wsdl.binding.soap.SOAPFactory;
-import org.eclipse.wst.wsdl.binding.soap.SOAPFault;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeader;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeaderFault;
-import org.eclipse.wst.wsdl.binding.soap.SOAPOperation;
-import org.eclipse.wst.wsdl.binding.soap.SOAPPackage;
-import org.eclipse.wst.wsdl.internal.impl.WSDLPackageImpl;
-import org.eclipse.xsd.impl.XSDPackageImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class SOAPPackageImpl extends EPackageImpl implements SOAPPackage {
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	private EClass soapBindingEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	private EClass soapBodyEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	private EClass soapHeaderBaseEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	private EClass soapFaultEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	private EClass soapOperationEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	private EClass soapAddressEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	private EClass soapHeaderFaultEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	private EClass soapHeaderEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	private EDataType iStringEDataType = null;
-
-  /**
-   * Creates an instance of the model <b>Package</b>, registered with
-   * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-   * package URI value.
-   * <p>Note: the correct way to create the package is via the static
-   * factory method {@link #init init()}, which also performs
-   * initialization of the package, or returns the registered package,
-   * if one already exists.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see org.eclipse.emf.ecore.EPackage.Registry
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPPackage#eNS_URI
-   * @see #init()
-   * @generated
-   */
-	private SOAPPackageImpl()
-  {
-    super(eNS_URI, SOAPFactory.eINSTANCE);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	private static boolean isInited = false;
-
-  /**
-   * Creates, registers, and initializes the <b>Package</b> for this
-   * model, and for any others upon which it depends.  Simple
-   * dependencies are satisfied by calling this method on all
-   * dependent packages before doing anything else.  This method drives
-   * initialization for interdependent packages directly, in parallel
-   * with this package, itself.
-   * <p>Of this package and its interdependencies, all packages which
-   * have not yet been registered by their URI values are first created
-   * and registered.  The packages are then initialized in two steps:
-   * meta-model objects for all of the packages are created before any
-   * are initialized, since one package's meta-model objects may refer to
-   * those of another.
-   * <p>Invocation of this method will not affect any packages that have
-   * already been initialized.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #eNS_URI
-   * @see #createPackageContents()
-   * @see #initializePackageContents()
-   * @generated
-   */
-	public static SOAPPackage init()
-  {
-    if (isInited) return (SOAPPackage)EPackage.Registry.INSTANCE.get(SOAPPackage.eNS_URI);
-
-    // Obtain or create and register package.
-    SOAPPackageImpl theSOAPPackage = (SOAPPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.get(eNS_URI) : new SOAPPackageImpl());
-
-    isInited = true;
-
-    // Initialize simple dependencies
-    XSDPackageImpl.init();
-
-    // Obtain or create and register interdependencies
-    WSDLPackageImpl theWSDLPackage = (WSDLPackageImpl)(EPackage.Registry.INSTANCE.get(WSDLPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.get(WSDLPackage.eNS_URI) : WSDLPackageImpl.eINSTANCE);
-
-    // Step 1: create meta-model objects
-    theSOAPPackage.createPackageContents();
-    theWSDLPackage.createPackageContents();
-
-    // Step 2: complete initialization
-    theSOAPPackage.initializePackageContents();
-    theWSDLPackage.initializePackageContents();
-
-    return theSOAPPackage;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EClass getSOAPBinding()
-  {
-    return soapBindingEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EAttribute getSOAPBinding_TransportURI()
-  {
-    return (EAttribute)soapBindingEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EAttribute getSOAPBinding_Style()
-  {
-    return (EAttribute)soapBindingEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EClass getSOAPBody()
-  {
-    return soapBodyEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EAttribute getSOAPBody_Use()
-  {
-    return (EAttribute)soapBodyEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EAttribute getSOAPBody_NamespaceURI()
-  {
-    return (EAttribute)soapBodyEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EAttribute getSOAPBody_EncodingStyles()
-  {
-    return (EAttribute)soapBodyEClass.getEStructuralFeatures().get(2);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EReference getSOAPBody_Parts()
-  {
-    return (EReference)soapBodyEClass.getEStructuralFeatures().get(3);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EClass getSOAPHeaderBase()
-  {
-    return soapHeaderBaseEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EAttribute getSOAPHeaderBase_Use()
-  {
-    return (EAttribute)soapHeaderBaseEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EAttribute getSOAPHeaderBase_NamespaceURI()
-  {
-    return (EAttribute)soapHeaderBaseEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EAttribute getSOAPHeaderBase_EncodingStyles()
-  {
-    return (EAttribute)soapHeaderBaseEClass.getEStructuralFeatures().get(2);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EReference getSOAPHeaderBase_Message()
-  {
-    return (EReference)soapHeaderBaseEClass.getEStructuralFeatures().get(3);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EReference getSOAPHeaderBase_Part()
-  {
-    return (EReference)soapHeaderBaseEClass.getEStructuralFeatures().get(4);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EClass getSOAPFault()
-  {
-    return soapFaultEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EAttribute getSOAPFault_Use()
-  {
-    return (EAttribute)soapFaultEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EAttribute getSOAPFault_NamespaceURI()
-  {
-    return (EAttribute)soapFaultEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EAttribute getSOAPFault_EncodingStyles()
-  {
-    return (EAttribute)soapFaultEClass.getEStructuralFeatures().get(2);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EClass getSOAPOperation()
-  {
-    return soapOperationEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EAttribute getSOAPOperation_SoapActionURI()
-  {
-    return (EAttribute)soapOperationEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EAttribute getSOAPOperation_Style()
-  {
-    return (EAttribute)soapOperationEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EClass getSOAPAddress()
-  {
-    return soapAddressEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EAttribute getSOAPAddress_LocationURI()
-  {
-    return (EAttribute)soapAddressEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EClass getSOAPHeaderFault()
-  {
-    return soapHeaderFaultEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EClass getSOAPHeader()
-  {
-    return soapHeaderEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EReference getSOAPHeader_HeaderFaults()
-  {
-    return (EReference)soapHeaderEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EDataType getIString()
-  {
-    return iStringEDataType;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public SOAPFactory getSOAPFactory()
-  {
-    return (SOAPFactory)getEFactoryInstance();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	private boolean isCreated = false;
-
-  /**
-   * Creates the meta-model objects for the package.  This method is
-   * guarded to have no affect on any invocation but its first.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void createPackageContents()
-  {
-    if (isCreated) return;
-    isCreated = true;
-
-    // Create classes and their features
-    soapBindingEClass = createEClass(SOAP_BINDING);
-    createEAttribute(soapBindingEClass, SOAP_BINDING__TRANSPORT_URI);
-    createEAttribute(soapBindingEClass, SOAP_BINDING__STYLE);
-
-    soapBodyEClass = createEClass(SOAP_BODY);
-    createEAttribute(soapBodyEClass, SOAP_BODY__USE);
-    createEAttribute(soapBodyEClass, SOAP_BODY__NAMESPACE_URI);
-    createEAttribute(soapBodyEClass, SOAP_BODY__ENCODING_STYLES);
-    createEReference(soapBodyEClass, SOAP_BODY__PARTS);
-
-    soapHeaderBaseEClass = createEClass(SOAP_HEADER_BASE);
-    createEAttribute(soapHeaderBaseEClass, SOAP_HEADER_BASE__USE);
-    createEAttribute(soapHeaderBaseEClass, SOAP_HEADER_BASE__NAMESPACE_URI);
-    createEAttribute(soapHeaderBaseEClass, SOAP_HEADER_BASE__ENCODING_STYLES);
-    createEReference(soapHeaderBaseEClass, SOAP_HEADER_BASE__MESSAGE);
-    createEReference(soapHeaderBaseEClass, SOAP_HEADER_BASE__PART);
-
-    soapFaultEClass = createEClass(SOAP_FAULT);
-    createEAttribute(soapFaultEClass, SOAP_FAULT__USE);
-    createEAttribute(soapFaultEClass, SOAP_FAULT__NAMESPACE_URI);
-    createEAttribute(soapFaultEClass, SOAP_FAULT__ENCODING_STYLES);
-
-    soapOperationEClass = createEClass(SOAP_OPERATION);
-    createEAttribute(soapOperationEClass, SOAP_OPERATION__SOAP_ACTION_URI);
-    createEAttribute(soapOperationEClass, SOAP_OPERATION__STYLE);
-
-    soapAddressEClass = createEClass(SOAP_ADDRESS);
-    createEAttribute(soapAddressEClass, SOAP_ADDRESS__LOCATION_URI);
-
-    soapHeaderFaultEClass = createEClass(SOAP_HEADER_FAULT);
-
-    soapHeaderEClass = createEClass(SOAP_HEADER);
-    createEReference(soapHeaderEClass, SOAP_HEADER__HEADER_FAULTS);
-
-    // Create data types
-    iStringEDataType = createEDataType(ISTRING);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	private boolean isInitialized = false;
-
-  /**
-   * Complete the initialization of the package and its meta-model.  This
-   * method is guarded to have no affect on any invocation but its first.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void initializePackageContents()
-  {
-    if (isInitialized) return;
-    isInitialized = true;
-
-    // Initialize package
-    setName(eNAME);
-    setNsPrefix(eNS_PREFIX);
-    setNsURI(eNS_URI);
-
-    // Obtain other dependent packages
-    WSDLPackageImpl theWSDLPackage = (WSDLPackageImpl)EPackage.Registry.INSTANCE.getEPackage(WSDLPackage.eNS_URI);
-
-    // Add supertypes to classes
-    soapBindingEClass.getESuperTypes().add(theWSDLPackage.getExtensibilityElement());
-    soapBodyEClass.getESuperTypes().add(theWSDLPackage.getExtensibilityElement());
-    soapHeaderBaseEClass.getESuperTypes().add(theWSDLPackage.getExtensibilityElement());
-    soapFaultEClass.getESuperTypes().add(theWSDLPackage.getExtensibilityElement());
-    soapOperationEClass.getESuperTypes().add(theWSDLPackage.getExtensibilityElement());
-    soapAddressEClass.getESuperTypes().add(theWSDLPackage.getExtensibilityElement());
-    soapHeaderFaultEClass.getESuperTypes().add(this.getSOAPHeaderBase());
-    soapHeaderEClass.getESuperTypes().add(this.getSOAPHeaderBase());
-
-    // Initialize classes and features; add operations and parameters
-    initEClass(soapBindingEClass, SOAPBinding.class, "SOAPBinding", !IS_ABSTRACT, !IS_INTERFACE);
-    initEAttribute(getSOAPBinding_TransportURI(), ecorePackage.getEString(), "transportURI", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-    initEAttribute(getSOAPBinding_Style(), ecorePackage.getEString(), "style", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-
-    initEClass(soapBodyEClass, SOAPBody.class, "SOAPBody", !IS_ABSTRACT, !IS_INTERFACE);
-    initEAttribute(getSOAPBody_Use(), ecorePackage.getEString(), "use", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-    initEAttribute(getSOAPBody_NamespaceURI(), ecorePackage.getEString(), "namespaceURI", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-    initEAttribute(getSOAPBody_EncodingStyles(), this.getIString(), "encodingStyles", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-    initEReference(getSOAPBody_Parts(), theWSDLPackage.getPart(), null, "parts", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);
-
-    initEClass(soapHeaderBaseEClass, SOAPHeaderBase.class, "SOAPHeaderBase", !IS_ABSTRACT, !IS_INTERFACE);
-    initEAttribute(getSOAPHeaderBase_Use(), ecorePackage.getEString(), "use", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-    initEAttribute(getSOAPHeaderBase_NamespaceURI(), ecorePackage.getEString(), "namespaceURI", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-    initEAttribute(getSOAPHeaderBase_EncodingStyles(), this.getIString(), "encodingStyles", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-    initEReference(getSOAPHeaderBase_Message(), theWSDLPackage.getMessage(), null, "message", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);
-    initEReference(getSOAPHeaderBase_Part(), theWSDLPackage.getPart(), null, "part", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);
-
-    initEClass(soapFaultEClass, SOAPFault.class, "SOAPFault", !IS_ABSTRACT, !IS_INTERFACE);
-    initEAttribute(getSOAPFault_Use(), ecorePackage.getEString(), "use", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-    initEAttribute(getSOAPFault_NamespaceURI(), ecorePackage.getEString(), "namespaceURI", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-    initEAttribute(getSOAPFault_EncodingStyles(), this.getIString(), "encodingStyles", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-
-    initEClass(soapOperationEClass, SOAPOperation.class, "SOAPOperation", !IS_ABSTRACT, !IS_INTERFACE);
-    initEAttribute(getSOAPOperation_SoapActionURI(), ecorePackage.getEString(), "soapActionURI", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-    initEAttribute(getSOAPOperation_Style(), ecorePackage.getEString(), "style", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-
-    initEClass(soapAddressEClass, SOAPAddress.class, "SOAPAddress", !IS_ABSTRACT, !IS_INTERFACE);
-    initEAttribute(getSOAPAddress_LocationURI(), ecorePackage.getEString(), "locationURI", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-
-    initEClass(soapHeaderFaultEClass, SOAPHeaderFault.class, "SOAPHeaderFault", !IS_ABSTRACT, !IS_INTERFACE);
-
-    initEClass(soapHeaderEClass, SOAPHeader.class, "SOAPHeader", !IS_ABSTRACT, !IS_INTERFACE);
-    initEReference(getSOAPHeader_HeaderFaults(), this.getSOAPHeaderFault(), null, "headerFaults", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);
-
-    // Initialize data types
-    initEDataType(iStringEDataType, String.class, "IString", IS_SERIALIZABLE);
-
-    // Create resource
-    createResource(eNS_URI);
-  }
-} //SOAPPackageImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPAdapterFactory.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPAdapterFactory.java
deleted file mode 100644
index 2fbe03317..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPAdapterFactory.java
+++ /dev/null
@@ -1,333 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.soap.internal.util;
-
-import javax.wsdl.extensions.ExtensibilityElement;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.binding.soap.SOAPAddress;
-import org.eclipse.wst.wsdl.binding.soap.SOAPBinding;
-import org.eclipse.wst.wsdl.binding.soap.SOAPBody;
-import org.eclipse.wst.wsdl.binding.soap.SOAPFault;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeader;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeaderFault;
-import org.eclipse.wst.wsdl.binding.soap.SOAPOperation;
-import org.eclipse.wst.wsdl.binding.soap.SOAPPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.wst.wsdl.binding.soap.SOAPPackage
- * @generated
- */
-public class SOAPAdapterFactory extends AdapterFactoryImpl {
-  /**
-   * The cached model package.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	protected static SOAPPackage modelPackage;
-
-  /**
-   * Creates an instance of the adapter factory.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public SOAPAdapterFactory()
-  {
-    if (modelPackage == null)
-    {
-      modelPackage = SOAPPackage.eINSTANCE;
-    }
-  }
-
-  /**
-   * Returns whether this factory is applicable for the type of the object.
-   * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-   * @return whether this factory is applicable for the type of the object.
-   * @generated
-   */
-	public boolean isFactoryForType(Object object)
-  {
-    if (object == modelPackage)
-    {
-      return true;
-    }
-    if (object instanceof EObject)
-    {
-      return ((EObject)object).eClass().getEPackage() == modelPackage;
-    }
-    return false;
-  }
-
-  /**
-   * The switch the delegates to the <code>createXXX</code> methods.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	protected SOAPSwitch modelSwitch =
-    new SOAPSwitch()
-    {
-      public Object caseSOAPBinding(SOAPBinding object)
-      {
-        return createSOAPBindingAdapter();
-      }
-      public Object caseSOAPBody(SOAPBody object)
-      {
-        return createSOAPBodyAdapter();
-      }
-      public Object caseSOAPHeaderBase(SOAPHeaderBase object)
-      {
-        return createSOAPHeaderBaseAdapter();
-      }
-      public Object caseSOAPFault(SOAPFault object)
-      {
-        return createSOAPFaultAdapter();
-      }
-      public Object caseSOAPOperation(SOAPOperation object)
-      {
-        return createSOAPOperationAdapter();
-      }
-      public Object caseSOAPAddress(SOAPAddress object)
-      {
-        return createSOAPAddressAdapter();
-      }
-      public Object caseSOAPHeaderFault(SOAPHeaderFault object)
-      {
-        return createSOAPHeaderFaultAdapter();
-      }
-      public Object caseSOAPHeader(SOAPHeader object)
-      {
-        return createSOAPHeaderAdapter();
-      }
-      public Object caseWSDLElement(WSDLElement object)
-      {
-        return createWSDLElementAdapter();
-      }
-      public Object caseIExtensibilityElement(ExtensibilityElement object)
-      {
-        return createIExtensibilityElementAdapter();
-      }
-      public Object caseExtensibilityElement(org.eclipse.wst.wsdl.ExtensibilityElement object)
-      {
-        return createExtensibilityElementAdapter();
-      }
-      public Object defaultCase(EObject object)
-      {
-        return createEObjectAdapter();
-      }
-    };
-
-  /**
-   * Creates an adapter for the <code>target</code>.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param target the object to adapt.
-   * @return the adapter for the <code>target</code>.
-   * @generated
-   */
-	public Adapter createAdapter(Notifier target)
-  {
-    return (Adapter)modelSwitch.doSwitch((EObject)target);
-  }
-
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wst.wsdl.binding.soap.SOAPBinding <em>Binding</em>}'.
-   * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPBinding
-   * @generated
-   */
-	public Adapter createSOAPBindingAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wst.wsdl.binding.soap.SOAPBody <em>Body</em>}'.
-   * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPBody
-   * @generated
-   */
-	public Adapter createSOAPBodyAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase <em>Header Base</em>}'.
-   * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase
-   * @generated
-   */
-	public Adapter createSOAPHeaderBaseAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wst.wsdl.binding.soap.SOAPFault <em>Fault</em>}'.
-   * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPFault
-   * @generated
-   */
-	public Adapter createSOAPFaultAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wst.wsdl.binding.soap.SOAPOperation <em>Operation</em>}'.
-   * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPOperation
-   * @generated
-   */
-	public Adapter createSOAPOperationAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wst.wsdl.binding.soap.SOAPAddress <em>Address</em>}'.
-   * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPAddress
-   * @generated
-   */
-	public Adapter createSOAPAddressAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeaderFault <em>Header Fault</em>}'.
-   * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPHeaderFault
-   * @generated
-   */
-	public Adapter createSOAPHeaderFaultAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeader <em>Header</em>}'.
-   * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPHeader
-   * @generated
-   */
-	public Adapter createSOAPHeaderAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wst.wsdl.WSDLElement <em>Element</em>}'.
-   * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.WSDLElement
-   * @generated
-   */
-	public Adapter createWSDLElementAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link javax.wsdl.extensions.ExtensibilityElement <em>IExtensibility Element</em>}'.
-   * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see javax.wsdl.extensions.ExtensibilityElement
-   * @generated
-   */
-	public Adapter createIExtensibilityElementAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wst.wsdl.ExtensibilityElement <em>Extensibility Element</em>}'.
-   * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.ExtensibilityElement
-   * @generated
-   */
-	public Adapter createExtensibilityElementAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for the default case.
-   * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @generated
-   */
-	public Adapter createEObjectAdapter()
-  {
-    return null;
-  }
-
-} //SOAPAdapterFactory
diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPConstants.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPConstants.java
deleted file mode 100644
index 56f34967d..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPConstants.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 Common Public License v1.0
- * which accompanies this distribution, 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.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 final String PARTS_ATTRIBUTE ="parts";
-  
-  public static String getAttribute(Element element, String attributeName)
-  {
-    return element.hasAttribute(attributeName) ? element.getAttribute(attributeName) : null;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPExtensibilityElementFactory.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPExtensibilityElementFactory.java
deleted file mode 100644
index 0fa3a978f..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPExtensibilityElementFactory.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.soap.internal.util;
-
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.binding.soap.SOAPFactory;
-import org.eclipse.wst.wsdl.util.ExtensibilityElementFactory;
-
-public class SOAPExtensibilityElementFactory implements ExtensibilityElementFactory
-{
-  public ExtensibilityElement createExtensibilityElement(String namespace, String localName)
-  {
-    if (SOAPConstants.SOAP_NAMESPACE_URI.equals(namespace))
-    {
-      if (SOAPConstants.ADDRESS_ELEMENT_TAG.equals(localName))
-      {
-        return SOAPFactory.eINSTANCE.createSOAPAddress();
-      }
-      else if (SOAPConstants.BINDING_ELEMENT_TAG.equals(localName))
-      {
-        return SOAPFactory.eINSTANCE.createSOAPBinding();
-      }
-      else if (SOAPConstants.BODY_ELEMENT_TAG.equals(localName))
-      {
-        return SOAPFactory.eINSTANCE.createSOAPBody();
-      }
-      else if (SOAPConstants.FAULT_ELEMENT_TAG.equals(localName))
-      {
-      	return SOAPFactory.eINSTANCE.createSOAPFault();
-      }
-      else if (SOAPConstants.OPERATION_ELEMENT_TAG.equals(localName))
-      {
-      	return SOAPFactory.eINSTANCE.createSOAPOperation();
-      }
-      else if (SOAPConstants.HEADER_ELEMENT_TAG.equals(localName))
-      {
-      	return SOAPFactory.eINSTANCE.createSOAPHeader();
-      }
-      else if (SOAPConstants.HEADER_FAULT_ELEMENT_TAG.equals(localName))
-      {
-      	return SOAPFactory.eINSTANCE.createSOAPHeaderFault();
-      }
-      else
-      {
-        //System.out.println("Unhandled localName: " + localName);
-        return WSDLFactory.eINSTANCE.createUnknownExtensibilityElement();
-      }
-    }
-    else
-    {
-      //System.out.println("Unhandled namespace: " + namespace);
-      return WSDLFactory.eINSTANCE.createUnknownExtensibilityElement();
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPSwitch.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPSwitch.java
deleted file mode 100644
index 25ac8bfb2..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPSwitch.java
+++ /dev/null
@@ -1,358 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.soap.internal.util;
-
-import javax.wsdl.extensions.ExtensibilityElement;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.binding.soap.SOAPAddress;
-import org.eclipse.wst.wsdl.binding.soap.SOAPBinding;
-import org.eclipse.wst.wsdl.binding.soap.SOAPBody;
-import org.eclipse.wst.wsdl.binding.soap.SOAPFault;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeader;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeaderFault;
-import org.eclipse.wst.wsdl.binding.soap.SOAPOperation;
-import org.eclipse.wst.wsdl.binding.soap.SOAPPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.wst.wsdl.binding.soap.SOAPPackage
- * @generated
- */
-public class SOAPSwitch {
-  /**
-   * The cached model package
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	protected static SOAPPackage modelPackage;
-
-  /**
-   * Creates an instance of the switch.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public SOAPSwitch()
-  {
-    if (modelPackage == null)
-    {
-      modelPackage = SOAPPackage.eINSTANCE;
-    }
-  }
-
-  /**
-   * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the first non-null result returned by a <code>caseXXX</code> call.
-   * @generated
-   */
-	public Object doSwitch(EObject theEObject)
-  {
-    EClass theEClass = theEObject.eClass();
-    if (theEClass.eContainer() == modelPackage)
-    {
-      switch (theEClass.getClassifierID())
-      {
-        case SOAPPackage.SOAP_BINDING:
-        {
-          SOAPBinding soapBinding = (SOAPBinding)theEObject;
-          Object result = caseSOAPBinding(soapBinding);
-          if (result == null) result = caseExtensibilityElement(soapBinding);
-          if (result == null) result = caseWSDLElement(soapBinding);
-          if (result == null) result = caseIExtensibilityElement(soapBinding);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case SOAPPackage.SOAP_BODY:
-        {
-          SOAPBody soapBody = (SOAPBody)theEObject;
-          Object result = caseSOAPBody(soapBody);
-          if (result == null) result = caseExtensibilityElement(soapBody);
-          if (result == null) result = caseWSDLElement(soapBody);
-          if (result == null) result = caseIExtensibilityElement(soapBody);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case SOAPPackage.SOAP_HEADER_BASE:
-        {
-          SOAPHeaderBase soapHeaderBase = (SOAPHeaderBase)theEObject;
-          Object result = caseSOAPHeaderBase(soapHeaderBase);
-          if (result == null) result = caseExtensibilityElement(soapHeaderBase);
-          if (result == null) result = caseWSDLElement(soapHeaderBase);
-          if (result == null) result = caseIExtensibilityElement(soapHeaderBase);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case SOAPPackage.SOAP_FAULT:
-        {
-          SOAPFault soapFault = (SOAPFault)theEObject;
-          Object result = caseSOAPFault(soapFault);
-          if (result == null) result = caseExtensibilityElement(soapFault);
-          if (result == null) result = caseWSDLElement(soapFault);
-          if (result == null) result = caseIExtensibilityElement(soapFault);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case SOAPPackage.SOAP_OPERATION:
-        {
-          SOAPOperation soapOperation = (SOAPOperation)theEObject;
-          Object result = caseSOAPOperation(soapOperation);
-          if (result == null) result = caseExtensibilityElement(soapOperation);
-          if (result == null) result = caseWSDLElement(soapOperation);
-          if (result == null) result = caseIExtensibilityElement(soapOperation);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case SOAPPackage.SOAP_ADDRESS:
-        {
-          SOAPAddress soapAddress = (SOAPAddress)theEObject;
-          Object result = caseSOAPAddress(soapAddress);
-          if (result == null) result = caseExtensibilityElement(soapAddress);
-          if (result == null) result = caseWSDLElement(soapAddress);
-          if (result == null) result = caseIExtensibilityElement(soapAddress);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case SOAPPackage.SOAP_HEADER_FAULT:
-        {
-          SOAPHeaderFault soapHeaderFault = (SOAPHeaderFault)theEObject;
-          Object result = caseSOAPHeaderFault(soapHeaderFault);
-          if (result == null) result = caseSOAPHeaderBase(soapHeaderFault);
-          if (result == null) result = caseExtensibilityElement(soapHeaderFault);
-          if (result == null) result = caseWSDLElement(soapHeaderFault);
-          if (result == null) result = caseIExtensibilityElement(soapHeaderFault);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case SOAPPackage.SOAP_HEADER:
-        {
-          SOAPHeader soapHeader = (SOAPHeader)theEObject;
-          Object result = caseSOAPHeader(soapHeader);
-          if (result == null) result = caseSOAPHeaderBase(soapHeader);
-          if (result == null) result = caseExtensibilityElement(soapHeader);
-          if (result == null) result = caseWSDLElement(soapHeader);
-          if (result == null) result = caseIExtensibilityElement(soapHeader);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        default: return defaultCase(theEObject);
-      }
-    }
-    return defaultCase(theEObject);
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Binding</em>'.
-   * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Binding</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-	public Object caseSOAPBinding(SOAPBinding object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Body</em>'.
-   * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Body</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-	public Object caseSOAPBody(SOAPBody object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Header Base</em>'.
-   * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Header Base</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-	public Object caseSOAPHeaderBase(SOAPHeaderBase object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Fault</em>'.
-   * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Fault</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-	public Object caseSOAPFault(SOAPFault object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Operation</em>'.
-   * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Operation</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-	public Object caseSOAPOperation(SOAPOperation object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Address</em>'.
-   * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Address</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-	public Object caseSOAPAddress(SOAPAddress object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Header Fault</em>'.
-   * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Header Fault</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-	public Object caseSOAPHeaderFault(SOAPHeaderFault object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Header</em>'.
-   * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Header</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-	public Object caseSOAPHeader(SOAPHeader object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Element</em>'.
-   * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Element</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-	public Object caseWSDLElement(WSDLElement object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>IExtensibility Element</em>'.
-   * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>IExtensibility Element</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-	public Object caseIExtensibilityElement(ExtensibilityElement object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Extensibility Element</em>'.
-   * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Extensibility Element</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-	public Object caseExtensibilityElement(org.eclipse.wst.wsdl.ExtensibilityElement object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
-   * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-   * @generated
-   */
-	public Object defaultCase(EObject object)
-  {
-    return null;
-  }
-
-} //SOAPSwitch
diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/package.html b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/package.html
deleted file mode 100644
index 9554345e4..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/package.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<html>
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="../../../../../..//apistyles.css" type="text/css">
-<title>WSDL Model SOAP Binding Extension API Overview</title>
-</head>
-<body>
-<p>
-        The WSDL model API allows clients to work with the WSDL 1.1 documents.
-		</p>
-<table width="500">
-<tr>
-<td>
-<p>The WSDL model API allows clients to load, modify, and save WSDL 1.1 documents.
-		</p>
-</td>
-</tr>
-</table>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/package.xml b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/package.xml
deleted file mode 100644
index c2cb92a1c..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/package.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html>
-	<head>
-		<meta
-			name="root"
-	
-			content="../../../../../../" />
-		<title>WSDL Model SOAP Binding Extension API Overview</title>
-	</head>
-
-	<body>
-		<abstract>
-        The WSDL model API allows clients to work with the WSDL 1.1 documents.
-		</abstract>
-		<p>The WSDL model API allows clients to load, modify, and save WSDL 1.1 documents.
-		</p> 
-	</body>
-</html>
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/model/WSDL.mdl b/bundles/org.eclipse.wst.wsdl/src-wsdl/model/WSDL.mdl
deleted file mode 100644
index c1dea8d11..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/model/WSDL.mdl
+++ /dev/null
@@ -1,31023 +0,0 @@
-
-(object Petal
-    version    	42
-    _written   	"Rose 4.5.8054a"
-    charSet    	0)
-
-(object Design "Logical View"
-    is_unit    	TRUE
-    is_loaded  	TRUE
-    defaults   	(object defaults
-	rightMargin 	0.250000
-	leftMargin 	0.250000
-	topMargin  	0.250000
-	bottomMargin 	0.500000
-	pageOverlap 	0.250000
-	clipIconLabels 	TRUE
-	autoResize 	TRUE
-	snapToGrid 	TRUE
-	gridX      	16
-	gridY      	16
-	defaultFont 	(object Font
-	    size       	10
-	    face       	"Arial"
-	    bold       	FALSE
-	    italics    	FALSE
-	    underline  	FALSE
-	    strike     	FALSE
-	    color      	0
-	    default_color 	TRUE)
-	showMessageNum 	1
-	showClassOfObject 	TRUE
-	notation   	"Unified")
-    root_usecase_package 	(object Class_Category "Use Case View"
-	quid       	"39E27F080064"
-	exportControl 	"Public"
-	global     	TRUE
-	logical_models 	(list unit_reference_list)
-	logical_presentations 	(list unit_reference_list
-	    (object UseCaseDiagram "Main"
-		quid       	"39E27F080078"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    root_category 	(object Class_Category "Logical View"
-	quid       	"39E27F080063"
-	exportControl 	"Public"
-	global     	TRUE
-	subsystem  	"Component View"
-	quidu      	"39E27F080065"
-	logical_models 	(list unit_reference_list
-	    (object Class_Category "wsdl"
-		quid       	"3ADFB8E5021E"
-		documentation 	
-|The WSDL model contains classes for the Web Services Description Language (WSDL).
-|
-|WSDL describes network services as sets of endpoints operating on messages. The operations and messages are described abstractly, and then bound to a concrete network protocol and message format to define an endpoint.
-|
-|WSDL describes the formats of the messages exchanged by the services, and supports the XML Schemas specification as its canonical type system. This package uses an XML Schema Infoset model package (see the XSD package) to describe the abstract message formats.
-|
-|The model contains the following diagrams, named after the corresponding chapters in the WSDL 1.1 specification (http://www.w3.org/TR/2001/NOTE-wsdl-20010315)
-|- 2.1 Definition, shows the WSDL definition element and the WSDL document structure
-|- 2.1.1 Naming and Linking, shows the namespace and import mechanism
-|- 2.1.3 Extensibility, shows the WSDL extensibility mechanism
-|- 2.2 Types, shows the use of XML Schema types in WSDL
-|- 2.3 Messages, 2.4 PortTypes, 2.5 Bindings and 2.7 Services, show the major WSDL elements and their relations.
-|
-|The WSDL classes extend the javax.wsdl interfaces defined by JSR 110. Classes with interface and datatype stereotypes are used to represent these non-MOF interfaces.
-		
-		exportControl 	"Public"
-		logical_models 	(list unit_reference_list
-		    (object Class "WSDLElement"
-			quid       	"3AD5C6A302DD"
-			documentation 	"This class represents a WSDL language element."
-			operations 	(list Operations
-			    (object Operation "getEnclosingDefinition"
-				quid       	"3CD1529600C8"
-				result     	"Definition"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setEnclosingDefinition"
-				quid       	"3CD152B80347"
-				parameters 	(list Parameters
-				    (object Parameter "definition"
-					type       	"Definition"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "documentationElement"
-				quid       	"3CCE443602A3"
-				type       	"DOMElement")
-			    (object ClassAttribute "element"
-				quid       	"3F97DBD30207"
-				type       	"DOMElement"))
-			language   	"Java"
-			abstract   	TRUE)
-		    (object Class "PortType"
-			quid       	"3AD5C7F001A5"
-			documentation 	"This class represents a WSDL portType element of the WSDL specification version 1.1 and an Interface component of the WSDL specification version 1.2. A port type or Interface is a named set of abstract operations and the abstract messages involved."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5C9B70150"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3F6F1FD8019F"
-				supplier   	"Logical View::wsdl::IPortType"
-				quidu      	"3B84A5BE0331"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "qName"
-				quid       	"3AEB488E0023"
-				type       	"QName")
-			    (object ClassAttribute "undefined"
-				quid       	"3BDDF1E301E5"
-				type       	"boolean"))
-			language   	"Java")
-		    (object Class "Operation"
-			quid       	"3AD5C80D03CE"
-			documentation 	"This class represents a WSDL operation element. A WSDL operation is an abstract description of an action supported by a service."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AE9DE98003C"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3F6F1FE20171"
-				supplier   	"Logical View::wsdl::IOperation"
-				quidu      	"3B84A77600D1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "style"
-				quid       	"3AEB472601AC"
-				type       	"OperationType")
-			    (object ClassAttribute "name"
-				quid       	"3BDD9643004C"
-				type       	"String")
-			    (object ClassAttribute "undefined"
-				quid       	"3BDDF235003E"
-				type       	"boolean"))
-			language   	"Java")
-		    (object Class "Message"
-			quid       	"3AD5C9590078"
-			documentation 	"This class represents a WSDL message element. A WSDL message is an abstract, typed definition of the data being communicated."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5D05501C4"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3B84A8D102BA"
-				supplier   	"Logical View::wsdl::IMessage"
-				quidu      	"3B84A8AF004F"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "qName"
-				quid       	"3AEB487C01FE"
-				type       	"QName")
-			    (object ClassAttribute "undefined"
-				quid       	"3BDDF1D20226"
-				type       	"boolean"))
-			language   	"Java")
-		    (object Class "Part"
-			quid       	"3AD5CE1C032E"
-			documentation 	"This class represents a WSDL part element. Parts describe the logical abstract content of a message. Each part is associated with a type from some type system. "
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B84A96D02F1"
-				supplier   	"Logical View::wsdl::IPart"
-				quidu      	"3B84A93F01BE")
-			    (object Inheritance_Relationship
-				quid       	"3B897E230237"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3BCE70B703C8"
-				type       	"String")
-			    (object ClassAttribute "elementName"
-				quid       	"3B84B08703DB"
-				type       	"QName")
-			    (object ClassAttribute "typeName"
-				quid       	"3BCE70C303C5"
-				type       	"QName"))
-			language   	"Java")
-		    (object Class "Binding"
-			quid       	"3AD5D2860261"
-			documentation 	"This class represents a WSDL binding element. A binding defines message format and protocol details for operations and messages defined by a particular portType. There may be any number of bindings for a given portType."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5FA0F02F0"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3B8595410129"
-				supplier   	"Logical View::wsdl::IBinding"
-				quidu      	"3B84ABC60219"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "qName"
-				quid       	"3AEB4899014B"
-				type       	"QName")
-			    (object ClassAttribute "undefined"
-				quid       	"3BDDF1F401A3"
-				type       	"boolean"))
-			language   	"Java")
-		    (object Class "BindingOperation"
-			quid       	"3AD5D3CB0145"
-			documentation 	"This class represents a WSDL operation element within a binding. An operation element within a binding specifies binding information for the operation with the same name within the binding's portType. "
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD6009202F7"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3B84ADE401DC"
-				supplier   	"Logical View::wsdl::IBindingOperation"
-				quidu      	"3B84ADC00072"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3B89C4CB0199"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "Service"
-			quid       	"3AD5D8F002F8"
-			documentation 	"This class represents a WSDL service element. A service groups a set of related ports together."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5FA20025E"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3B85954E01B4"
-				supplier   	"Logical View::wsdl::IService"
-				quidu      	"3B84AB490287"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "qName"
-				quid       	"3AEB48A40151"
-				type       	"QName")
-			    (object ClassAttribute "undefined"
-				quid       	"3BDDF20D0203"
-				type       	"boolean"))
-			language   	"Java")
-		    (object Class "Port"
-			quid       	"3AD5D9170286"
-			documentation 	"This class represents a WSDL port element. A port defines an individual endpoint by specifying a single address for a binding"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD600CB00AA"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3B85954502C9"
-				supplier   	"Logical View::wsdl::IPort"
-				quidu      	"3B84AB800326"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3AD5D9A00391"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "ExtensibilityElement"
-			quid       	"3AD5DBB602A9"
-			documentation 	"This class represents a WSDL extensibility element. WSDL allows extensibility elements representing a specific technology under various elements defined by WSDL."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B84B14903D0"
-				supplier   	"Logical View::wsdl::IExtensibilityElement"
-				quidu      	"3B84B12402AB")
-			    (object Inheritance_Relationship
-				quid       	"3BDDF53502C3"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "required"
-				quid       	"3AF9543C0073"
-				type       	"boolean")
-			    (object ClassAttribute "elementType"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3B85B21A0271"
-				type       	"QName"))
-			language   	"Java")
-		    (object Class "Definition"
-			quid       	"3AD5E43F008E"
-			documentation 	"This class represents a WSDL definitions element. The WSDL definitions element is the root element of a WSDL document."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5FDB803D4"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3B84B1F80382"
-				supplier   	"Logical View::wsdl::IDefinition"
-				quidu      	"3B84B1D90142"))
-			operations 	(list Operations
-			    (object Operation "getDocument"
-				quid       	"3CD14FC2012B"
-				result     	"DOMDocument"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setDocument"
-				quid       	"3CD150DE01E7"
-				parameters 	(list Parameters
-				    (object Parameter "document"
-					type       	"DOMDocument"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "targetNamespace"
-				quid       	"3AD5E474004E"
-				type       	"String")
-			    (object ClassAttribute "location"
-				quid       	"40352B7C0396"
-				type       	"String")
-			    (object ClassAttribute "qName"
-				quid       	"3AEB485702F5"
-				type       	"QName")
-			    (object ClassAttribute "encoding"
-				quid       	"3CADD00D000D"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "Import"
-			quid       	"3AD5E4F903DE"
-			documentation 	"This class represents WSDL import element. WSDL allows associating a namespace with a document location using an import element."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5EE58037A"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3F6F200D0340"
-				supplier   	"Logical View::wsdl::IImport"
-				quidu      	"3B84B2020119"))
-			operations 	(list Operations
-			    (object Operation "getSchema"
-				quid       	"3C8672C10379"
-				result     	"XSDSchema"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setSchema"
-				quid       	"3C8672C10397"
-				parameters 	(list Parameters
-				    (object Parameter "schema"
-					type       	"XSDSchema"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "namespaceURI"
-				quid       	"3AD5E50A0036"
-				type       	"String")
-			    (object ClassAttribute "locationURI"
-				quid       	"3AD5E5140211"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "ExtensibleElement"
-			quid       	"3AD5FCFA033A"
-			documentation 	" WSDL allows elements representing a specific technology (referred to here as extensibility elements) under various elements defined by WSDL. This class represents a WSDL point of extensibility."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5FE3C03D4"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD"))
-			operations 	(list Operations
-			    (object Operation "getExtensibilityElements"
-				quid       	"3B85C12C03CD"
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "addExtensibilityElement"
-				quid       	"3B85C1470295"
-				parameters 	(list Parameters
-				    (object Parameter "extElement"
-					type       	"IExtensibilityElement"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			language   	"Java"
-			abstract   	TRUE)
-		    (object Class "Input"
-			quid       	"3AE0789F0059"
-			documentation 	"This class represents a WSDL input element. An input element specifies the abstract message format for the input of the operation."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B85C504025F"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3F67722802E7"
-				supplier   	"Logical View::wsdl::MessageReference"
-				quidu      	"3F6771DB02DC")
-			    (object Inheritance_Relationship
-				quid       	"3F6F1FEE031D"
-				supplier   	"Logical View::wsdl::IInput"
-				quidu      	"3B84A7EE0015"))
-			language   	"Java")
-		    (object Class "Output"
-			quid       	"3AE078B60232"
-			documentation 	"This class represents a WSDL output element. An output element specifies the abstract message format for the output of the operation."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B85C50C035B"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3F67723500DD"
-				supplier   	"Logical View::wsdl::MessageReference"
-				quidu      	"3F6771DB02DC")
-			    (object Inheritance_Relationship
-				quid       	"3F6F1FF801CD"
-				supplier   	"Logical View::wsdl::IOutput"
-				quidu      	"3B84A829027D"))
-			language   	"Java")
-		    (object Class "Fault"
-			quid       	"3AE078BE0108"
-			documentation 	"This class represents a WSDL fault element. Fault elements specify the abstract message format for any error messages that may be output as the result of the operation "
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AE1C82002F2"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3F67723D0319"
-				supplier   	"Logical View::wsdl::MessageReference"
-				quidu      	"3F6771DB02DC")
-			    (object Inheritance_Relationship
-				quid       	"3F6F2002002D"
-				supplier   	"Logical View::wsdl::IFault"
-				quidu      	"3B84A861031D"))
-			language   	"Java")
-		    (object Class "BindingInput"
-			quid       	"3AE08A8202D4"
-			documentation 	"This class represents a WSDL input element within a operation within a binding. An input element within an operation within a binding specifies binding information for the input of the operation. "
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B84AE1B0113"
-				supplier   	"Logical View::wsdl::IBindingInput"
-				quidu      	"3B84ADEB0100")
-			    (object Inheritance_Relationship
-				quid       	"3B85B59B0072"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A"))
-			operations 	(list Operations
-			    (object Operation "getInput"
-				quid       	"3C8653A40203"
-				result     	"IInput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setInput"
-				quid       	"3C8653B503A2"
-				parameters 	(list Parameters
-				    (object Parameter "input"
-					type       	"IInput"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3B85C1EA020E"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "BindingOutput"
-			quid       	"3AE08A8F028C"
-			documentation 	"This class represents a WSDL output element within a operation within a binding. An output element within an operation within a binding specifies binding information for the output of the operation. "
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B84AE4302AB"
-				supplier   	"Logical View::wsdl::IBindingOutput"
-				quidu      	"3B84AE210111")
-			    (object Inheritance_Relationship
-				quid       	"3B85B5A4027E"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A"))
-			operations 	(list Operations
-			    (object Operation "getOutput"
-				quid       	"3C8653D900F1"
-				result     	"IOutput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setOutput"
-				quid       	"3C8653F10326"
-				parameters 	(list Parameters
-				    (object Parameter "output"
-					type       	"IOutput"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3B85C20200BE"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "BindingFault"
-			quid       	"3AE08A9E03A6"
-			documentation 	"This class represents a WSDL fault element within a operation within a binding. A fault element within an operation within a binding specifies binding information for the fault with the same name. "
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AE0938602C9"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3B84AE710333"
-				supplier   	"Logical View::wsdl::IBindingFault"
-				quidu      	"3B84AE4F00BD"))
-			operations 	(list Operations
-			    (object Operation "getFault"
-				quid       	"3C865413037F"
-				result     	"IFault"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setFault"
-				quid       	"3C8654210109"
-				parameters 	(list Parameters
-				    (object Parameter "fault"
-					type       	"IFault"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3B85BF9E014A"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "QName"
-			quid       	"3AE8ED220140"
-			documentation 	"This class represents the javax.wsdl.QName class. A QName is a fully qualified name."
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.xml.namespace.QName"
-				quid       	"3B849DA9003D"
-				stereotype 	"javaclass"))
-			language   	"Java")
-		    (object Class "Namespace"
-			quid       	"3AEA3CD30030"
-			documentation 	"This class represents a namespace and the corresponding namespace prefix used in a WSDL document."
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "URI"
-				quid       	"3AEA3D2901B1"
-				type       	"String")
-			    (object ClassAttribute "prefix"
-				quid       	"3AEA3D320236"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "OperationType"
-			quid       	"3AEB4782024F"
-			documentation 	
-|ONE_WAY=1
-|REQUEST_RESPONSE=2
-|SOLICIT_RESPONSE=3
-|NOTIFICATION=4
-			
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.OperationType"
-				quid       	"3B85C35303E3"
-				stereotype 	"javaclass"))
-			language   	"Java")
-		    (object Class "IPortType"
-			quid       	"3B84A5BE0331"
-			documentation 	"This class represents the javax.wsdl.PortType non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addOperation"
-				quid       	"3B896AC101CA"
-				parameters 	(list Parameters
-				    (object Parameter "operation"
-					type       	"IOperation"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getOperation"
-				quid       	"3B896BAF01A4"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"String")
-				    (object Parameter "inputName"
-					type       	"String")
-				    (object Parameter "outputName"
-					type       	"String"))
-				result     	"IOperation"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getOperations"
-				quid       	"3B896BF7031A"
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.PortType"
-				quid       	"3B84A632000D"
-				stereotype 	"javaclass")))
-		    (object Class "IOperation"
-			quid       	"3B84A77600D1"
-			documentation 	"This class represents the javax.wsdl.Operation non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addFault"
-				quid       	"3B896C420065"
-				parameters 	(list Parameters
-				    (object Parameter "fault"
-					type       	"IFault"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getFault"
-				quid       	"3B896C59028F"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"String"))
-				result     	"IFault"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getFaults"
-				quid       	"3B896C7102B1"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getParameterOrdering"
-				quid       	"3B896C8101B0"
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setParameterOrdering"
-				quid       	"3B896C99031D"
-				parameters 	(list Parameters
-				    (object Parameter "parameterOrder"
-					type       	"IList"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getInput"
-				quid       	"3C8654E5018D"
-				result     	"IInput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setInput"
-				quid       	"3C8662C40107"
-				parameters 	(list Parameters
-				    (object Parameter "input"
-					type       	"IInput"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getOutput"
-				quid       	"3C8662E40094"
-				result     	"IOutput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setOutput"
-				quid       	"3C8662F001D2"
-				parameters 	(list Parameters
-				    (object Parameter "output"
-					type       	"IOutput"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Operation"
-				quid       	"3B84A799012B"
-				stereotype 	"javaclass")))
-		    (object Class "IInput"
-			quid       	"3B84A7EE0015"
-			documentation 	"This class represents the javax.wsdl.Input non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "getMessage"
-				quid       	"3C86633100EF"
-				result     	"IMessage"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setMessage"
-				quid       	"3C8663470277"
-				parameters 	(list Parameters
-				    (object Parameter "message"
-					type       	"IMessage"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Input"
-				quid       	"3B84A8000039"
-				stereotype 	"javaclass")))
-		    (object Class "IOutput"
-			quid       	"3B84A829027D"
-			documentation 	"This class represents the javax.wsdl.Output non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "getMessage"
-				quid       	"3C86643A035D"
-				result     	"IMessage"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setMessage"
-				quid       	"3C86644501C8"
-				parameters 	(list Parameters
-				    (object Parameter "message"
-					type       	"IMessage"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Output"
-				quid       	"3B84A83901D5"
-				stereotype 	"javaclass")))
-		    (object Class "IFault"
-			quid       	"3B84A861031D"
-			documentation 	"This class represents the javax.wsdl.Fault non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "getMessage"
-				quid       	"3C86646A00BD"
-				result     	"IMessage"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setMessage"
-				quid       	"3C8664750131"
-				parameters 	(list Parameters
-				    (object Parameter "message"
-					type       	"IMessage"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Fault"
-				quid       	"3B84A8710208"
-				stereotype 	"javaclass")))
-		    (object Class "IMessage"
-			quid       	"3B84A8AF004F"
-			documentation 	"This class represents the javax.wsdl.Message non-MOF interface"
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addPart"
-				quid       	"3B8972240273"
-				parameters 	(list Parameters
-				    (object Parameter "part"
-					type       	"IPart"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPart"
-				quid       	"3B89723D0233"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"String"))
-				result     	"IPart"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getParts"
-				quid       	"3B897254025E"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getOrderedParts"
-				quid       	"3B897261020D"
-				parameters 	(list Parameters
-				    (object Parameter "partOrder"
-					type       	"IList"))
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Message"
-				quid       	"3B84A8BC0260"
-				stereotype 	"javaclass")))
-		    (object Class "IPart"
-			quid       	"3B84A93F01BE"
-			documentation 	"This class represents the javax.wsdl.Part non-MOF interface"
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "setExtensionAttribute"
-				quid       	"3C4688450052"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName")
-				    (object Parameter "value"
-					type       	"QName"))
-				exceptions 	"WSDLException"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getExtensionAttributeNames"
-				quid       	"3C468A0101C3"
-				result     	"IIterator"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getExtensionAttribute"
-				quid       	"3C468A2D02D5"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"QName"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Part"
-				quid       	"3B84A9500231"
-				stereotype 	"javaclass")))
-		    (object Class "IService"
-			quid       	"3B84AB490287"
-			documentation 	"This class represents the javax.wsdl.Service non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addPort"
-				quid       	"3B895D5601D1"
-				parameters 	(list Parameters
-				    (object Parameter "port"
-					type       	"IPort"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPorts"
-				quid       	"3B895DA20036"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPort"
-				quid       	"3B895DB001BC"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"String"))
-				result     	"IPort"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Service"
-				quid       	"3B84AB5B003E"
-				stereotype 	"javaclass")))
-		    (object Class "IPort"
-			quid       	"3B84AB800326"
-			documentation 	"This class represents the javax.wsdl.Port non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "getBinding"
-				quid       	"3C8651F302B5"
-				result     	"IBinding"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setBinding"
-				quid       	"3C86526302F2"
-				parameters 	(list Parameters
-				    (object Parameter "binding"
-					type       	"IBinding"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Port"
-				quid       	"3B84AB8C0016"
-				stereotype 	"javaclass")))
-		    (object Class "IBinding"
-			quid       	"3B84ABC60219"
-			documentation 	"This class represents the javax.wsdl.Binding non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addBindingOperation"
-				quid       	"3B895F160153"
-				parameters 	(list Parameters
-				    (object Parameter "bindingOperation"
-					type       	"IBindingOperation"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindingOperation"
-				quid       	"3B895F500066"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"String")
-				    (object Parameter "inputName"
-					type       	"String")
-				    (object Parameter "outputName"
-					type       	"String"))
-				result     	"IBindingOperation"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindingOperations"
-				quid       	"3B895FA401C5"
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPortType"
-				quid       	"3C8652A90284"
-				result     	"IPortType"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setPortType"
-				quid       	"3C8652BE01A8"
-				parameters 	(list Parameters
-				    (object Parameter "portType"
-					type       	"IPortType"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Binding"
-				quid       	"3B84ABCF0302"
-				stereotype 	"javaclass")))
-		    (object Class "IBindingOperation"
-			quid       	"3B84ADC00072"
-			documentation 	"This class represents the javax.wsdl.BindingOperation non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addBindingFault"
-				quid       	"3B8960BC0041"
-				parameters 	(list Parameters
-				    (object Parameter "bindingFault"
-					type       	"IBindingFault"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindingFault"
-				quid       	"3B8960D9009D"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"String"))
-				result     	"IBindingFault"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindingFaults"
-				quid       	"3B8960FC0061"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getOperation"
-				quid       	"3C86532D0017"
-				result     	"IOperation"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setOperation"
-				quid       	"3C86533F037B"
-				parameters 	(list Parameters
-				    (object Parameter "operation"
-					type       	"IOperation"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindingInput"
-				quid       	"3C86550900DA"
-				result     	"IBindingInput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setBindingInput"
-				quid       	"3C86551D007F"
-				parameters 	(list Parameters
-				    (object Parameter "bindingInput"
-					type       	"IBindingInput"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindingOutput"
-				quid       	"3C8655340349"
-				result     	"IBindingOutput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setBindingOutput"
-				quid       	"3C86554702A6"
-				parameters 	(list Parameters
-				    (object Parameter "bindingOutput"
-					type       	"IBindingOutput"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.BindingOperation"
-				quid       	"3B84ADCB021C"
-				stereotype 	"javaclass")))
-		    (object Class "IBindingInput"
-			quid       	"3B84ADEB0100"
-			documentation 	"This class represents the javax.wsdl.BindingInput non-MOF interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.BindingInput"
-				quid       	"3B84ADFE000D"
-				stereotype 	"javaclass")))
-		    (object Class "IBindingOutput"
-			quid       	"3B84AE210111"
-			documentation 	"This class represents the javax.wsdl.BindingOutput non-MOF interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.BindingOutput"
-				quid       	"3B84AE2D0050"
-				stereotype 	"javaclass")))
-		    (object Class "IBindingFault"
-			quid       	"3B84AE4F00BD"
-			documentation 	"This class represents the javax.wsdl.BindingFault non-MOF interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.BindingFault"
-				quid       	"3B84AE5F002A"
-				stereotype 	"javaclass")))
-		    (object Class "DOMElement"
-			quid       	"3B84AF3203DB"
-			documentation 	"This class represents the org.w3c.dom.Element non-MOF interface."
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "org.w3c.dom.Element"
-				quid       	"3B84AF560292"
-				stereotype 	"javaclass")))
-		    (object Class "IExtensibilityElement"
-			quid       	"3B84B12402AB"
-			documentation 	"This class represents the javax.wsdl.ExtensibilityElement non-MOF interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.extensions.ExtensibilityElement"
-				quid       	"3B84B13503D1"
-				stereotype 	"javaclass")))
-		    (object Class "IDefinition"
-			quid       	"3B84B1D90142"
-			documentation 	"This class represents the javax.wsdl.Definition non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addBinding"
-				quid       	"3B8988F1039D"
-				parameters 	(list Parameters
-				    (object Parameter "binding"
-					type       	"IBinding"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "addImport"
-				quid       	"3B8989490259"
-				parameters 	(list Parameters
-				    (object Parameter "importDef"
-					type       	"IImport"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "addMessage"
-				quid       	"3B89896E005E"
-				parameters 	(list Parameters
-				    (object Parameter "message"
-					type       	"IMessage"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "addNamespace"
-				quid       	"3B898984004B"
-				parameters 	(list Parameters
-				    (object Parameter "prefix"
-					type       	"String")
-				    (object Parameter "namespaceURI"
-					type       	"String"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "addPortType"
-				quid       	"3B8989C50045"
-				parameters 	(list Parameters
-				    (object Parameter "portType"
-					type       	"IPortType"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "addService"
-				quid       	"3B8989E401EE"
-				parameters 	(list Parameters
-				    (object Parameter "service"
-					type       	"IService"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createBindingFault"
-				quid       	"3B898A17038C"
-				result     	"IBindingFault"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createBindingInput"
-				quid       	"3B898A320286"
-				result     	"IBindingInput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createBindingOutput"
-				quid       	"3B898A46013B"
-				result     	"IBindingOutput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createBindingOperation"
-				quid       	"3B898A5C00B0"
-				result     	"IBindingOperation"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createBinding"
-				quid       	"3B8989FE037C"
-				result     	"IBinding"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createFault"
-				quid       	"3B898A7502E7"
-				result     	"IFault"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createImport"
-				quid       	"3B898A83014C"
-				result     	"IImport"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createInput"
-				quid       	"3B898A9D033E"
-				result     	"IInput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createMessage"
-				quid       	"3B898AAF0254"
-				result     	"IMessage"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createOperation"
-				quid       	"3B898AC203C4"
-				result     	"IOperation"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createOutput"
-				quid       	"3B898AE800ED"
-				result     	"IOutput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createPart"
-				quid       	"3B898AF8026D"
-				result     	"IPart"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createPort"
-				quid       	"3B898B0801DA"
-				result     	"IPort"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createPortType"
-				quid       	"3B898B15039B"
-				result     	"IPortType"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createService"
-				quid       	"3B898B32013A"
-				result     	"IService"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBinding"
-				quid       	"3B898B420075"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IBinding"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindings"
-				quid       	"3B898B920341"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getImports"
-				quid       	"3B898BCD0060"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getImports"
-				quid       	"3B898BE70144"
-				parameters 	(list Parameters
-				    (object Parameter "namespaceURI"
-					type       	"String"))
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getMessage"
-				quid       	"3B898C170107"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IMessage"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getMessages"
-				quid       	"3B898C3E001D"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getNamespace"
-				quid       	"3B898C62014B"
-				parameters 	(list Parameters
-				    (object Parameter "prefix"
-					type       	"String"))
-				result     	"String"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getNamespaces"
-				quid       	"3B898C740115"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPortType"
-				quid       	"3B898CBE0071"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IPortType"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPortTypes"
-				quid       	"3B898CDA01C6"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPrefix"
-				quid       	"3B898CFD0017"
-				parameters 	(list Parameters
-				    (object Parameter "namespaceURI"
-					type       	"String"))
-				result     	"String"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getService"
-				quid       	"3B898D2300A8"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IService"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getServices"
-				quid       	"3B898D3B03CE"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getExtensionRegistry"
-				quid       	"3B89D5B8012B"
-				result     	"IExtensionRegistry"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setExtensionRegistry"
-				quid       	"3B89D5D703BB"
-				parameters 	(list Parameters
-				    (object Parameter "extensionRegistry"
-					type       	"IExtensionRegistry"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getDocumentBaseURI"
-				quid       	"3B89D5FE0208"
-				result     	"String"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setDocumentBaseURI"
-				quid       	"3B89D6180328"
-				parameters 	(list Parameters
-				    (object Parameter "documentBase"
-					type       	"String"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createTypes"
-				quid       	"3CADD0560080"
-				result     	"ITypes"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "removeService"
-				quid       	"3CADD07E004C"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IService"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "removeBinding"
-				quid       	"3CADD0BA0355"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IBinding"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "removePortType"
-				quid       	"3CADD0D8029A"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IPortType"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "removeMessage"
-				quid       	"3CADD0FA0307"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IMessage"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getTypes"
-				quid       	"3C86706F031B"
-				result     	"ITypes"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setTypes"
-				quid       	"3C86709500EE"
-				parameters 	(list Parameters
-				    (object Parameter "types"
-					type       	"ITypes"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Definition"
-				quid       	"3B84B1E702A1"
-				stereotype 	"javaclass")))
-		    (object Class "IImport"
-			quid       	"3B84B2020119"
-			documentation 	"This class represents the javax.wsdl.Import non-MOF interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Import"
-				quid       	"3B84B20C02EA"
-				stereotype 	"javaclass")))
-		    (object Class "IList"
-			quid       	"3B85C0A203C5"
-			documentation 	"This class represents the non-MOF java.util.List interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "java.util.List"
-				quid       	"3B85C0AF0297"
-				stereotype 	"javaclass")))
-		    (object Class "IMap"
-			quid       	"3B896B0300D4"
-			documentation 	"This class represents the non-MOF java.util.Map interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "java.util.Map"
-				quid       	"3B896B1102B5"
-				stereotype 	"javaclass")))
-		    (object Class "IURL"
-			quid       	"3B89D5630274"
-			documentation 	"This class represents the non-MOF java.net.URL interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "java.net.URL"
-				quid       	"3B89D56E03E2"
-				stereotype 	"javaclass")))
-		    (object Class "IExtensionRegistry"
-			quid       	"3B89D59302A5"
-			documentation 	"This class represents the non-MOF javax.wsdl.extensions.ExtensionRegistry interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.extensions.ExtensionRegistry"
-				quid       	"3B89D59F02E8"
-				stereotype 	"javaclass")))
-		    (object Class "Types"
-			quid       	"3B8BE9A603A8"
-			documentation 	"This class represents a WSDL types element. The types element encloses data type definitions that are relevant for the exchanged messages."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B8BEB010311"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3CADCD3B0380"
-				supplier   	"Logical View::wsdl::ITypes"
-				quidu      	"3CADCBB20050"))
-			operations 	(list Operations
-			    (object Operation "getSchemas"
-				quid       	"3CADCF3803E6"
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getSchemas"
-				quid       	"3CADCF7E0301"
-				parameters 	(list Parameters
-				    (object Parameter "namespaceURI"
-					type       	"String"))
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)))
-		    (object Class "IIterator"
-			quid       	"3C4687DA0167"
-			documentation 	"This class represents the non-MOF java.util.Iterator interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "java.util.Iterator"
-				quid       	"3C46880800B9"
-				stereotype 	"javaclass")))
-		    (object Class "WSDLException"
-			quid       	"3C4689650313"
-			documentation 	"This class represents the javax.wsdl.Exception class."
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.WSDLException"
-				quid       	"3C4689740315"
-				stereotype 	"javaclass")))
-		    (object Class "ITypes"
-			quid       	"3CADCBB20050"
-			documentation 	"This class represents the javax.wsdl.Types non-MOF interface"
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Types"
-				quid       	"3CADCBF10173"
-				stereotype 	"javaclass")))
-		    (object Class "UnknownExtensibilityElement"
-			quid       	"3CB24AC002AE"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3CB24AEC01CB"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9")))
-		    (object Class "XSDSchemaExtensibilityElement"
-			quid       	"3CC360D7039C"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3CC3627F00B7"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9")))
-		    (object Class "DOMDocument"
-			quid       	"3CD1502C023B"
-			documentation 	"This class represents the org.w3c.dom.Document non-MOF interface."
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "org.w3c.dom.Document"
-				quid       	"3CD150600182"
-				stereotype 	"javaclass")))
-		    (object Class "MessageReference"
-			quid       	"3F6771DB02DC"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3F762A6A0308"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3F6780A001AB"
-				type       	"String"
-				exportControl 	"Protected"))
-			language   	"Java"
-			abstract   	TRUE)
-		    (object Association "$UNNAMED$0"
-			quid       	"3AD5C824018C"
-			roles      	(list role_list
-			    (object Role "portType"
-				quid       	"3AD5C82701C3"
-				label      	"portType"
-				supplier   	"Logical View::wsdl::PortType"
-				quidu      	"3AD5C7F001A5"
-				client_cardinality 	(value cardinality "1..1")
-				Containment 	"By Value"
-				is_aggregate 	TRUE)
-			    (object Role "eOperations"
-				quid       	"3AD5C82701CD"
-				label      	"eOperations"
-				supplier   	"Logical View::wsdl::Operation"
-				quidu      	"3AD5C80D03CE"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$1"
-			quid       	"3AD5CEBE00E2"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$2"
-				quid       	"3AD5CEBF0057"
-				supplier   	"Logical View::wsdl::Message"
-				quidu      	"3AD5C9590078"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eParts"
-				quid       	"3AD5CEBF0061"
-				label      	"eParts"
-				supplier   	"Logical View::wsdl::Part"
-				quidu      	"3AD5CE1C032E"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$3"
-			quid       	"3AD5D352010F"
-			roles      	(list role_list
-			    (object Role "ePortType"
-				quid       	"3AD5D3540176"
-				label      	"ePortType"
-				supplier   	"Logical View::wsdl::PortType"
-				quidu      	"3AD5C7F001A5"
-				client_cardinality 	(value cardinality "1..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$4"
-				quid       	"3AD5D3540180"
-				supplier   	"Logical View::wsdl::Binding"
-				quidu      	"3AD5D2860261")))
-		    (object Association "$UNNAMED$5"
-			quid       	"3AD5D3E10179"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$6"
-				quid       	"3AD5D3E20225"
-				supplier   	"Logical View::wsdl::Binding"
-				quidu      	"3AD5D2860261"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eBindingOperations"
-				quid       	"3AD5D3E20239"
-				label      	"eBindingOperations"
-				supplier   	"Logical View::wsdl::BindingOperation"
-				quidu      	"3AD5D3CB0145"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$7"
-			quid       	"3AD5D425038A"
-			roles      	(list role_list
-			    (object Role "eOperation"
-				quid       	"3AD5D42602F5"
-				label      	"eOperation"
-				supplier   	"Logical View::wsdl::Operation"
-				quidu      	"3AD5C80D03CE"
-				client_cardinality 	(value cardinality "1..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$8"
-				quid       	"3AD5D42602FF"
-				supplier   	"Logical View::wsdl::BindingOperation"
-				quidu      	"3AD5D3CB0145")))
-		    (object Association "$UNNAMED$9"
-			quid       	"3AD5D9400393"
-			roles      	(list role_list
-			    (object Role "ePorts"
-				quid       	"3AD5D941031C"
-				label      	"ePorts"
-				supplier   	"Logical View::wsdl::Port"
-				quidu      	"3AD5D9170286"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$10"
-				quid       	"3AD5D941031D"
-				supplier   	"Logical View::wsdl::Service"
-				quidu      	"3AD5D8F002F8"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$11"
-			quid       	"3AD5D9B8011F"
-			roles      	(list role_list
-			    (object Role "eBinding"
-				quid       	"3AD5D9B9024D"
-				label      	"eBinding"
-				supplier   	"Logical View::wsdl::Binding"
-				quidu      	"3AD5D2860261"
-				client_cardinality 	(value cardinality "1..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$12"
-				quid       	"3AD5D9B90261"
-				supplier   	"Logical View::wsdl::Port"
-				quidu      	"3AD5D9170286")))
-		    (object Association "$UNNAMED$13"
-			quid       	"3AD5E60301E2"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$14"
-				quid       	"3AD5E60400B7"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eMessages"
-				quid       	"3AD5E60400C1"
-				label      	"eMessages"
-				supplier   	"Logical View::wsdl::Message"
-				quidu      	"3AD5C9590078"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$15"
-			quid       	"3AD5E6710104"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$16"
-				quid       	"3AD5E672034A"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "ePortTypes"
-				quid       	"3AD5E6720354"
-				label      	"ePortTypes"
-				supplier   	"Logical View::wsdl::PortType"
-				quidu      	"3AD5C7F001A5"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$17"
-			quid       	"3AD5E6770095"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$18"
-				quid       	"3AD5E6780371"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eBindings"
-				quid       	"3AD5E678037B"
-				label      	"eBindings"
-				supplier   	"Logical View::wsdl::Binding"
-				quidu      	"3AD5D2860261"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$19"
-			quid       	"3AD5E67B0311"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$20"
-				quid       	"3AD5E67D007F"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eServices"
-				quid       	"3AD5E67D0089"
-				label      	"eServices"
-				supplier   	"Logical View::wsdl::Service"
-				quidu      	"3AD5D8F002F8"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$21"
-			quid       	"3AD5FD130079"
-			roles      	(list role_list
-			    (object Role "eExtensibilityElements"
-				quid       	"3AD5FD14019D"
-				label      	"eExtensibilityElements"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$22"
-				quid       	"3AD5FD14019E"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$23"
-			quid       	"3ADF2E6401F5"
-			roles      	(list role_list
-			    (object Role "eBindingInput"
-				quid       	"3ADF2E650251"
-				label      	"eBindingInput"
-				supplier   	"Logical View::wsdl::BindingInput"
-				quidu      	"3AE08A8202D4"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$24"
-				quid       	"3ADF2E650252"
-				supplier   	"Logical View::wsdl::BindingOperation"
-				quidu      	"3AD5D3CB0145"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$25"
-			quid       	"3ADF2EB30163"
-			roles      	(list role_list
-			    (object Role "eBindingOutput"
-				quid       	"3ADF2EB4013C"
-				label      	"eBindingOutput"
-				supplier   	"Logical View::wsdl::BindingOutput"
-				quidu      	"3AE08A8F028C"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$26"
-				quid       	"3ADF2EB4013D"
-				supplier   	"Logical View::wsdl::BindingOperation"
-				quidu      	"3AD5D3CB0145"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$27"
-			quid       	"3ADF2F94024D"
-			roles      	(list role_list
-			    (object Role "eInput"
-				quid       	"3ADF2F950190"
-				label      	"eInput"
-				supplier   	"Logical View::wsdl::Input"
-				quidu      	"3AE0789F0059"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$28"
-				quid       	"3ADF2F95019A"
-				supplier   	"Logical View::wsdl::Operation"
-				quidu      	"3AD5C80D03CE"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$29"
-			quid       	"3ADF2FB802F9"
-			roles      	(list role_list
-			    (object Role "eOutput"
-				quid       	"3ADF2FB9020A"
-				label      	"eOutput"
-				supplier   	"Logical View::wsdl::Output"
-				quidu      	"3AE078B60232"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$30"
-				quid       	"3ADF2FB9020B"
-				supplier   	"Logical View::wsdl::Operation"
-				quidu      	"3AD5C80D03CE"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$31"
-			quid       	"3ADF331601A4"
-			roles      	(list role_list
-			    (object Role "eFaults"
-				quid       	"3ADF33180387"
-				label      	"eFaults"
-				supplier   	"Logical View::wsdl::Fault"
-				quidu      	"3AE078BE0108"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$32"
-				quid       	"3ADF33180388"
-				supplier   	"Logical View::wsdl::Operation"
-				quidu      	"3AD5C80D03CE"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$33"
-			quid       	"3ADF340003E5"
-			roles      	(list role_list
-			    (object Role "eBindingFaults"
-				quid       	"3ADF340103AA"
-				label      	"eBindingFaults"
-				supplier   	"Logical View::wsdl::BindingFault"
-				quidu      	"3AE08A9E03A6"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$34"
-				quid       	"3ADF340103AB"
-				supplier   	"Logical View::wsdl::BindingOperation"
-				quidu      	"3AD5D3CB0145"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$35"
-			quid       	"3AE091F402F3"
-			roles      	(list role_list
-			    (object Role "eFault"
-				quid       	"3AE091F801FE"
-				label      	"eFault"
-				supplier   	"Logical View::wsdl::Fault"
-				quidu      	"3AE078BE0108"
-				client_cardinality 	(value cardinality "1..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$36"
-				quid       	"3AE091F801FF"
-				supplier   	"Logical View::wsdl::BindingFault"
-				quidu      	"3AE08A9E03A6")))
-		    (object Association "$UNNAMED$37"
-			quid       	"3AEA3D55002D"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$38"
-				quid       	"3AEA3D560328"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eNamespaces"
-				quid       	"3AEA3D560332"
-				label      	"eNamespaces"
-				supplier   	"Logical View::wsdl::Namespace"
-				quidu      	"3AEA3CD30030"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$39"
-			quid       	"3AEA3E3A002D"
-			roles      	(list role_list
-			    (object Role "eDefinition"
-				quid       	"3AEA3E3C01E8"
-				label      	"eDefinition"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$40"
-				quid       	"3AEA3E3C01F2"
-				supplier   	"Logical View::wsdl::Import"
-				quidu      	"3AD5E4F903DE")))
-		    (object Association "$UNNAMED$41"
-			quid       	"3AEA412F0035"
-			roles      	(list role_list
-			    (object Role "eParameterOrdering"
-				quid       	"3AEA41310255"
-				label      	"eParameterOrdering"
-				supplier   	"Logical View::wsdl::Part"
-				quidu      	"3AD5CE1C032E"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$42"
-				quid       	"3AEA4131025F"
-				supplier   	"Logical View::wsdl::Operation"
-				quidu      	"3AD5C80D03CE")))
-		    (object Association "$UNNAMED$43"
-			quid       	"3B84AD2400BD"
-			roles      	(list role_list
-			    (object Role "eInput"
-				quid       	"3B84AD250083"
-				label      	"eInput"
-				supplier   	"Logical View::wsdl::Input"
-				quidu      	"3AE0789F0059"
-				client_cardinality 	(value cardinality "1..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$44"
-				quid       	"3B84AD250084"
-				supplier   	"Logical View::wsdl::BindingInput"
-				quidu      	"3AE08A8202D4")))
-		    (object Association "$UNNAMED$45"
-			quid       	"3B84AD7900F2"
-			roles      	(list role_list
-			    (object Role "eOutput"
-				quid       	"3B84AD7A014D"
-				label      	"eOutput"
-				supplier   	"Logical View::wsdl::Output"
-				quidu      	"3AE078B60232"
-				client_cardinality 	(value cardinality "1..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$46"
-				quid       	"3B84AD7A014E"
-				supplier   	"Logical View::wsdl::BindingOutput"
-				quidu      	"3AE08A8F028C")))
-		    (object Association "$UNNAMED$47"
-			quid       	"3B8B1BE900C4"
-			roles      	(list role_list
-			    (object Role "typeDefinition"
-				quid       	"3B8B1BE90327"
-				label      	"typeDefinition"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$48"
-				quid       	"3B8B1BE90331"
-				supplier   	"Logical View::wsdl::Part"
-				quidu      	"3AD5CE1C032E")))
-		    (object Association "$UNNAMED$49"
-			quid       	"3B8B1C1203B2"
-			roles      	(list role_list
-			    (object Role "elementDeclaration"
-				quid       	"3B8B1C14001C"
-				label      	"elementDeclaration"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$50"
-				quid       	"3B8B1C140026"
-				supplier   	"Logical View::wsdl::Part"
-				quidu      	"3AD5CE1C032E")))
-		    (object Association "$UNNAMED$51"
-			quid       	"3B8B1DCC02E5"
-			roles      	(list role_list
-			    (object Role "eSchema"
-				quid       	"3B8B1DCE0270"
-				label      	"eSchema"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$52"
-				quid       	"3B8B1DCE027A"
-				supplier   	"Logical View::wsdl::Import"
-				quidu      	"3AD5E4F903DE")))
-		    (object Association "$UNNAMED$53"
-			quid       	"3B8BEA27029F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$54"
-				quid       	"3B8BEA290356"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eTypes"
-				quid       	"3B8BEA29036A"
-				label      	"eTypes"
-				supplier   	"Logical View::wsdl::Types"
-				quidu      	"3B8BE9A603A8"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$55"
-			quid       	"3C46829303E5"
-			roles      	(list role_list
-			    (object Role "eMessage"
-				quid       	"3C468296010E"
-				label      	"eMessage"
-				supplier   	"Logical View::wsdl::Message"
-				quidu      	"3AD5C9590078"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$56"
-				quid       	"3C4682960118"
-				supplier   	"Logical View::wsdl::Part"
-				quidu      	"3AD5CE1C032E")))
-		    (object Association "$UNNAMED$57"
-			quid       	"3C864DFF02EC"
-			roles      	(list role_list
-			    (object Role "eImports"
-				quid       	"3C864DFF02ED"
-				label      	"eImports"
-				supplier   	"Logical View::wsdl::Import"
-				quidu      	"3AD5E4F903DE"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$58"
-				quid       	"3C864DFF02EE"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$59"
-			quid       	"3CC3614500F2"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$60"
-				quid       	"3CC36146023D"
-				supplier   	"Logical View::wsdl::XSDSchemaExtensibilityElement"
-				quidu      	"3CC360D7039C"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "schema"
-				quid       	"3CC36146023E"
-				label      	"schema"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$61"
-			quid       	"3F74E78401B1"
-			roles      	(list role_list
-			    (object Role "eMessage"
-				quid       	"3F74E786000F"
-				label      	"eMessage"
-				supplier   	"Logical View::wsdl::Message"
-				quidu      	"3AD5C9590078"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$62"
-				quid       	"3F74E7860023"
-				supplier   	"Logical View::wsdl::MessageReference"
-				quidu      	"3F6771DB02DC")))
-		    (object Association "$UNNAMED$63"
-			quid       	"3F7896A2026E"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$64"
-				quid       	"3F7896A7012B"
-				supplier   	"Logical View::wsdl::UnknownExtensibilityElement"
-				quidu      	"3CB24AC002AE"
-				client_cardinality 	(value cardinality "1")
-				is_aggregate 	TRUE)
-			    (object Role "children"
-				quid       	"3F7896A7012C"
-				label      	"children"
-				supplier   	"Logical View::wsdl::UnknownExtensibilityElement"
-				quidu      	"3CB24AC002AE"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE))))
-		logical_presentations 	(list unit_reference_list
-		    (object ClassDiagram "2.7 Services"
-			quid       	"39AD3EF60127"
-			title      	"2.7 Services"
-			zoom       	90
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::IBinding" @1
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1424, 800)
-				label      	(object ItemLabel
-				    Parent_View 	@1
-				    location   	(1173, 660)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	502
-				    justify    	0
-				    label      	"IBinding")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@1
-				    location   	(1173, 610)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	502
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84ABC60219"
-				compartment 	(object Compartment
-				    Parent_View 	@1
-				    location   	(1173, 715)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	5
-				    max_width  	471)
-				width      	520
-				height     	404
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IPort" @2
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(816, 528)
-				label      	(object ItemLabel
-				    Parent_View 	@2
-				    location   	(686, 481)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	260
-				    justify    	0
-				    label      	"IPort")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@2
-				    location   	(686, 431)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	260
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84AB800326"
-				compartment 	(object Compartment
-				    Parent_View 	@2
-				    location   	(686, 536)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	275)
-				width      	278
-				height     	218
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IService" @3
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@3
-				    location   	(126, 90)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	228
-				    justify    	0
-				    label      	"IService")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@3
-				    location   	(126, 40)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	228
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84AB490287"
-				compartment 	(object Compartment
-				    Parent_View 	@3
-				    location   	(126, 145)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	237)
-				width      	246
-				height     	264
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Service" @4
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 528)
-				label      	(object ItemLabel
-				    Parent_View 	@4
-				    location   	(44, 432)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	392
-				    justify    	0
-				    label      	"Service")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D8F002F8"
-				compartment 	(object Compartment
-				    Parent_View 	@4
-				    location   	(44, 487)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	389)
-				width      	410
-				height     	214
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @5
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B85954E01B4"
-				client     	@4
-				supplier   	@3
-				line_style 	3
-				origin_attachment 	(240, 421)
-				terminal_attachment 	(240, 292))
-			    (object ClassView "Class" "Logical View::wsdl::Binding" @6
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1440, 1264)
-				label      	(object ItemLabel
-				    Parent_View 	@6
-				    location   	(1244, 1168)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	392
-				    justify    	0
-				    label      	"Binding")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D2860261"
-				compartment 	(object Compartment
-				    Parent_View 	@6
-				    location   	(1244, 1223)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	389)
-				width      	410
-				height     	214
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @7
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8595410129"
-				client     	@6
-				supplier   	@1
-				line_style 	3
-				origin_attachment 	(1430, 1157)
-				terminal_attachment 	(1430, 1002))
-			    (object ClassView "Class" "Logical View::wsdl::Port" @8
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(816, 912)
-				label      	(object ItemLabel
-				    Parent_View 	@8
-				    location   	(675, 840)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	282
-				    justify    	0
-				    label      	"Port")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D9170286"
-				compartment 	(object Compartment
-				    Parent_View 	@8
-				    location   	(675, 895)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	303)
-				width      	300
-				height     	168
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @9
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B85954502C9"
-				client     	@8
-				supplier   	@2
-				line_style 	3
-				origin_attachment 	(809, 828)
-				terminal_attachment 	(809, 637))
-			    (object AssociationViewNew "$UNNAMED$9" @10
-				location   	(321, 916)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5D9400393"
-				roleview_list 	(list RoleViews
-				    (object RoleView "ePorts" @11
-					Parent_View 	@10
-					location   	(-143, 644)
-					label      	(object SegLabel @12
-					    Parent_View 	@11
-					    location   	(397, 945)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	192
-					    justify    	0
-					    label      	"+ePorts"
-					    pctDist    	0.218978
-					    height     	29
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D941031C"
-					client     	@10
-					supplier   	@8
-					line_style 	3
-					origin_attachment 	(321, 916)
-					terminal_attachment 	(666, 916)
-					label      	(object SegLabel @13
-					    Parent_View 	@11
-					    location   	(530, 880)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	160
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.608000
-					    height     	37
-					    orientation 	0)
-					label      	(object SegLabel @14
-					    Parent_View 	@11
-					    location   	(433, 990)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	146
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.328467
-					    height     	74
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$10" @15
-					Parent_View 	@10
-					location   	(-143, 644)
-					label      	(object SegLabel @16
-					    Parent_View 	@15
-					    location   	(216, 704)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D941031D"
-					client     	@10
-					supplier   	@4
-					vertices   	(list Points
-					    (321, 916)
-					    (257, 916)
-					    (257, 635))
-					line_style 	3
-					origin_attachment 	(321, 916)
-					terminal_attachment 	(257, 635)
-					label      	(object SegLabel @17
-					    Parent_View 	@15
-					    location   	(301, 760)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.637097
-					    height     	44
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$11" @18
-				location   	(886, 1270)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5D9B8011F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eBinding" @19
-					Parent_View 	@18
-					location   	(38, 422)
-					label      	(object SegLabel @20
-					    Parent_View 	@19
-					    location   	(1112, 1235)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+eBinding"
-					    pctDist    	0.648571
-					    height     	36
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D9B9024D"
-					client     	@18
-					supplier   	@6
-					line_style 	3
-					origin_attachment 	(886, 1270)
-					terminal_attachment 	(1235, 1270)
-					label      	(object SegLabel @21
-					    Parent_View 	@19
-					    location   	(1170, 1313)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.814286
-					    height     	43
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$12" @22
-					Parent_View 	@18
-					location   	(38, 422)
-					label      	(object SegLabel @23
-					    Parent_View 	@22
-					    location   	(852, 1106)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	156
-					    justify    	0
-					    label      	""
-					    pctDist    	0.687943
-					    height     	40
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D9B90261"
-					client     	@18
-					supplier   	@8
-					vertices   	(list Points
-					    (886, 1270)
-					    (812, 1270)
-					    (812, 996))
-					line_style 	3
-					origin_attachment 	(886, 1270)
-					terminal_attachment 	(812, 996))))))
-		    (object ClassDiagram "2.5 Bindings"
-			quid       	"39AD51270252"
-			title      	"2.5 Bindings"
-			zoom       	85
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::IBinding" @24
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 240)
-				label      	(object ItemLabel
-				    Parent_View 	@24
-				    location   	(73, 114)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	462
-				    justify    	0
-				    label      	"IBinding")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@24
-				    location   	(73, 64)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	462
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84ABC60219"
-				compartment 	(object Compartment
-				    Parent_View 	@24
-				    location   	(73, 172)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	5
-				    max_width  	471)
-				width      	480
-				height     	376
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IBindingOperation" @25
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(976, 352)
-				label      	(object ItemLabel
-				    Parent_View 	@25
-				    location   	(780, 130)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	392
-				    justify    	0
-				    label      	"IBindingOperation")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@25
-				    location   	(780, 80)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	392
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84ADC00072"
-				compartment 	(object Compartment
-				    Parent_View 	@25
-				    location   	(780, 188)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	9
-				    max_width  	396)
-				width      	410
-				height     	568
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IBindingInput" @26
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(192, 1360)
-				label      	(object ItemLabel
-				    Parent_View 	@26
-				    location   	(62, 1334)
-				    fill_color 	16777215
-				    nlines     	1
-				    max_width  	260
-				    justify    	0
-				    label      	"IBindingInput")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@26
-				    location   	(62, 1284)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	260
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84ADEB0100"
-				width      	278
-				height     	176
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IBindingOutput" @27
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 1664)
-				label      	(object ItemLabel
-				    Parent_View 	@27
-				    location   	(61, 1638)
-				    fill_color 	16777215
-				    nlines     	1
-				    max_width  	294
-				    justify    	0
-				    label      	"IBindingOutput")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@27
-				    location   	(61, 1588)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	294
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84AE210111"
-				width      	312
-				height     	176
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IBindingFault" @28
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 1984)
-				label      	(object ItemLabel
-				    Parent_View 	@28
-				    location   	(72, 1958)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	272
-				    justify    	0
-				    label      	"IBindingFault")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@28
-				    location   	(72, 1908)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	272
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84AE4F00BD"
-				width      	290
-				height     	176
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::PortType" @29
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1904, 624)
-				label      	(object ItemLabel
-				    Parent_View 	@29
-				    location   	(1697, 522)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	414
-				    justify    	0
-				    label      	"PortType")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C7F001A5"
-				compartment 	(object Compartment
-				    Parent_View 	@29
-				    location   	(1697, 580)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	411)
-				width      	432
-				height     	228
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Input" @30
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1904, 1360)
-				label      	(object ItemLabel
-				    Parent_View 	@30
-				    location   	(1756, 1283)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"Input")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE0789F0059"
-				width      	314
-				height     	178
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Output" @31
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1904, 1664)
-				label      	(object ItemLabel
-				    Parent_View 	@31
-				    location   	(1756, 1587)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"Output")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE078B60232"
-				width      	314
-				height     	178
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Binding" @32
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 688)
-				label      	(object ItemLabel
-				    Parent_View 	@32
-				    location   	(97, 586)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	414
-				    justify    	0
-				    label      	"Binding")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D2860261"
-				compartment 	(object Compartment
-				    Parent_View 	@32
-				    location   	(97, 644)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	411)
-				width      	432
-				height     	228
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @33
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8595410129"
-				client     	@32
-				supplier   	@24
-				line_style 	3
-				origin_attachment 	(279, 574)
-				terminal_attachment 	(279, 428))
-			    (object AssociationViewNew "$UNNAMED$3" @34
-				location   	(1104, 742)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5D352010F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "ePortType" @35
-					Parent_View 	@34
-					location   	(640, 598)
-					label      	(object SegLabel @36
-					    Parent_View 	@35
-					    location   	(1565, 781)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+ePortType"
-					    pctDist    	0.789292
-					    height     	39
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D3540176"
-					client     	@34
-					supplier   	@29
-					line_style 	3
-					origin_attachment 	(1104, 742)
-					terminal_attachment 	(1688, 742)
-					label      	(object SegLabel @37
-					    Parent_View 	@35
-					    location   	(1613, 716)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.872193
-					    height     	27
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$4" @38
-					Parent_View 	@34
-					location   	(640, 598)
-					label      	(object SegLabel @39
-					    Parent_View 	@38
-					    location   	(806, 697)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	108
-					    justify    	0
-					    label      	""
-					    pctDist    	0.509449
-					    height     	46
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D3540180"
-					client     	@34
-					supplier   	@32
-					line_style 	3
-					origin_attachment 	(1104, 742)
-					terminal_attachment 	(520, 742))))
-			    (object ClassView "Class" "Logical View::wsdl::Operation" @40
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1888, 1024)
-				label      	(object ItemLabel
-				    Parent_View 	@40
-				    location   	(1672, 898)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	432
-				    justify    	0
-				    label      	"Operation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C80D03CE"
-				compartment 	(object Compartment
-				    Parent_View 	@40
-				    location   	(1672, 956)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	430)
-				width      	450
-				height     	276
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::BindingInput" @41
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(624, 1408)
-				label      	(object ItemLabel
-				    Parent_View 	@41
-				    location   	(476, 1283)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"BindingInput")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE08A8202D4"
-				compartment 	(object Compartment
-				    Parent_View 	@41
-				    location   	(476, 1341)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	303)
-				width      	314
-				height     	274
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$43" @42
-				location   	(1264, 1359)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84AD2400BD"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eInput" @43
-					Parent_View 	@42
-					location   	(96, 287)
-					label      	(object SegLabel @44
-					    Parent_View 	@43
-					    location   	(1637, 1316)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	132
-					    justify    	0
-					    label      	"+eInput"
-					    pctDist    	0.775148
-					    height     	44
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B84AD250083"
-					client     	@42
-					supplier   	@30
-					line_style 	3
-					origin_attachment 	(1264, 1359)
-					terminal_attachment 	(1747, 1359)
-					label      	(object SegLabel @45
-					    Parent_View 	@43
-					    location   	(1694, 1398)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.889546
-					    height     	39
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$44" @46
-					Parent_View 	@42
-					location   	(96, 287)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B84AD250084"
-					client     	@42
-					supplier   	@41
-					line_style 	3
-					origin_attachment 	(1264, 1359)
-					terminal_attachment 	(781, 1359))))
-			    (object ClassView "Class" "Logical View::wsdl::BindingOutput" @47
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(960, 1664)
-				label      	(object ItemLabel
-				    Parent_View 	@47
-				    location   	(812, 1539)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"BindingOutput")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE08A8F028C"
-				compartment 	(object Compartment
-				    Parent_View 	@47
-				    location   	(812, 1597)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	303)
-				width      	314
-				height     	274
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$45" @48
-				location   	(1432, 1654)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84AD7900F2"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eOutput" @49
-					Parent_View 	@48
-					location   	(-120, 374)
-					label      	(object SegLabel @50
-					    Parent_View 	@49
-					    location   	(1645, 1612)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+eOutput"
-					    pctDist    	0.674772
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B84AD7A014D"
-					client     	@48
-					supplier   	@31
-					line_style 	3
-					origin_attachment 	(1432, 1654)
-					terminal_attachment 	(1747, 1654)
-					label      	(object SegLabel @51
-					    Parent_View 	@49
-					    location   	(1681, 1697)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.790274
-					    height     	43
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$46" @52
-					Parent_View 	@48
-					location   	(-120, 374)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B84AD7A014E"
-					client     	@48
-					supplier   	@47
-					line_style 	3
-					origin_attachment 	(1432, 1654)
-					terminal_attachment 	(1117, 1654))))
-			    (object ClassView "Class" "Logical View::wsdl::BindingOperation" @53
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(992, 1008)
-				label      	(object ItemLabel
-				    Parent_View 	@53
-				    location   	(819, 931)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	346
-				    justify    	0
-				    label      	"BindingOperation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D3CB0145"
-				compartment 	(object Compartment
-				    Parent_View 	@53
-				    location   	(819, 989)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	303)
-				width      	364
-				height     	178
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @54
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84ADE401DC"
-				client     	@53
-				supplier   	@25
-				line_style 	3
-				origin_attachment 	(966, 919)
-				terminal_attachment 	(966, 636))
-			    (object AssociationViewNew "$UNNAMED$5" @55
-				location   	(433, 1022)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5D3E10179"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$6" @56
-					Parent_View 	@55
-					location   	(-1343, 494)
-					label      	(object SegLabel @57
-					    Parent_View 	@56
-					    location   	(235, 877)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D3E20225"
-					client     	@55
-					supplier   	@32
-					vertices   	(list Points
-					    (433, 1022)
-					    (276, 1022)
-					    (276, 802))
-					line_style 	3
-					origin_attachment 	(433, 1022)
-					terminal_attachment 	(276, 802)
-					label      	(object SegLabel @58
-					    Parent_View 	@56
-					    location   	(330, 841)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	1))
-				    (object RoleView "eBindingOperations" @59
-					Parent_View 	@55
-					location   	(-1343, 494)
-					label      	(object SegLabel @60
-					    Parent_View 	@59
-					    location   	(513, 977)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	384
-					    justify    	0
-					    label      	"+eBindingOperations"
-					    pctDist    	0.211699
-					    height     	46
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D3E20239"
-					client     	@55
-					supplier   	@53
-					line_style 	3
-					origin_attachment 	(433, 1022)
-					terminal_attachment 	(810, 1022)
-					label      	(object SegLabel @61
-					    Parent_View 	@59
-					    location   	(766, 980)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.884956
-					    height     	43
-					    orientation 	0)
-					label      	(object SegLabel @62
-					    Parent_View 	@59
-					    location   	(706, 1067)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	154
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.727564
-					    height     	45
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$7" @63
-				location   	(1418, 1040)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5D425038A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eOperation" @64
-					Parent_View 	@63
-					location   	(-358, 464)
-					label      	(object SegLabel @65
-					    Parent_View 	@64
-					    location   	(1520, 1079)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	228
-					    justify    	0
-					    label      	"+eOperation"
-					    pctDist    	0.420601
-					    height     	39
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D42602F5"
-					client     	@63
-					supplier   	@40
-					line_style 	3
-					origin_attachment 	(1418, 1040)
-					terminal_attachment 	(1663, 1040)
-					label      	(object SegLabel @66
-					    Parent_View 	@64
-					    location   	(1589, 1005)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.696721
-					    height     	36
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$8" @67
-					Parent_View 	@63
-					location   	(-358, 464)
-					label      	(object SegLabel @68
-					    Parent_View 	@67
-					    location   	(1273, 1070)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	192
-					    justify    	0
-					    label      	""
-					    pctDist    	0.595420
-					    height     	30
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D42602FF"
-					client     	@63
-					supplier   	@53
-					line_style 	3
-					origin_attachment 	(1418, 1040)
-					terminal_attachment 	(1174, 1040))))
-			    (object AssociationViewNew "$UNNAMED$23" @69
-				location   	(787, 1190)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3ADF2E6401F5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eBindingInput" @70
-					Parent_View 	@69
-					location   	(-381, 454)
-					label      	(object SegLabel @71
-					    Parent_View 	@70
-					    location   	(669, 1152)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+eBindingInput"
-					    pctDist    	0.511905
-					    height     	39
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2E650251"
-					client     	@69
-					supplier   	@41
-					vertices   	(list Points
-					    (787, 1190)
-					    (636, 1190)
-					    (636, 1271))
-					line_style 	3
-					origin_attachment 	(787, 1190)
-					terminal_attachment 	(636, 1271)
-					label      	(object SegLabel @72
-					    Parent_View 	@70
-					    location   	(685, 1222)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.440476
-					    height     	32
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$24" @73
-					Parent_View 	@69
-					location   	(-381, 454)
-					label      	(object SegLabel @74
-					    Parent_View 	@73
-					    location   	(885, 1144)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2E650252"
-					client     	@69
-					supplier   	@53
-					vertices   	(list Points
-					    (787, 1190)
-					    (926, 1190)
-					    (926, 1097))
-					line_style 	3
-					origin_attachment 	(787, 1190)
-					terminal_attachment 	(926, 1097)
-					label      	(object SegLabel @75
-					    Parent_View 	@73
-					    location   	(871, 1136)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.837758
-					    height     	56
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$25" @76
-				location   	(1024, 1312)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3ADF2EB30163"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eBindingOutput" @77
-					Parent_View 	@76
-					location   	(-150, 578)
-					label      	(object SegLabel @78
-					    Parent_View 	@77
-					    location   	(1012, 1429)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	306
-					    justify    	0
-					    label      	"+eBindingOutput"
-					    pctDist    	0.545082
-					    height     	13
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2EB4013C"
-					client     	@76
-					supplier   	@47
-					line_style 	3
-					origin_attachment 	(1024, 1312)
-					terminal_attachment 	(1024, 1527)
-					label      	(object SegLabel @79
-					    Parent_View 	@77
-					    location   	(967, 1479)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.774590
-					    height     	58
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$26" @80
-					Parent_View 	@76
-					location   	(-150, 578)
-					label      	(object SegLabel @81
-					    Parent_View 	@80
-					    location   	(983, 1140)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2EB4013D"
-					client     	@76
-					supplier   	@53
-					line_style 	3
-					origin_attachment 	(1024, 1312)
-					terminal_attachment 	(1024, 1097)
-					label      	(object SegLabel @82
-					    Parent_View 	@80
-					    location   	(1031, 1186)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.590164
-					    height     	7
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::wsdl::Fault" @83
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1920, 1984)
-				label      	(object ItemLabel
-				    Parent_View 	@83
-				    location   	(1772, 1907)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"Fault")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE078BE0108"
-				width      	314
-				height     	178
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::BindingFault" @84
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1360, 1984)
-				label      	(object ItemLabel
-				    Parent_View 	@84
-				    location   	(1212, 1859)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"BindingFault")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE08A9E03A6"
-				compartment 	(object Compartment
-				    Parent_View 	@84
-				    location   	(1212, 1917)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	303)
-				width      	314
-				height     	274
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @85
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84AE710333"
-				client     	@84
-				supplier   	@28
-				line_style 	3
-				origin_attachment 	(1203, 2007)
-				terminal_attachment 	(353, 2007))
-			    (object AssociationViewNew "$UNNAMED$33" @86
-				location   	(1356, 1352)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3ADF340003E5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eBindingFaults" @87
-					Parent_View 	@86
-					location   	(188, 616)
-					label      	(object SegLabel @88
-					    Parent_View 	@87
-					    location   	(1382, 1750)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	300
-					    justify    	0
-					    label      	"+eBindingFaults"
-					    pctDist    	0.803150
-					    height     	26
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF340103AA"
-					client     	@86
-					supplier   	@84
-					line_style 	3
-					origin_attachment 	(1356, 1352)
-					terminal_attachment 	(1356, 1847)
-					label      	(object SegLabel @89
-					    Parent_View 	@87
-					    location   	(1409, 1797)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.899194
-					    height     	53
-					    orientation 	0)
-					label      	(object SegLabel @90
-					    Parent_View 	@87
-					    location   	(1256, 1806)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	154
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.919291
-					    height     	101
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$34" @91
-					Parent_View 	@86
-					location   	(188, 616)
-					label      	(object SegLabel @92
-					    Parent_View 	@91
-					    location   	(1076, 1197)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF340103AB"
-					client     	@86
-					supplier   	@53
-					vertices   	(list Points
-					    (1356, 1352)
-					    (1356, 1217)
-					    (1117, 1217)
-					    (1117, 1097))
-					line_style 	3
-					origin_attachment 	(1356, 1352)
-					terminal_attachment 	(1117, 1097)
-					label      	(object SegLabel @93
-					    Parent_View 	@91
-					    location   	(1152, 1164)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.687008
-					    height     	54
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$35" @94
-				location   	(1640, 1970)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AE091F402F3"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eFault" @95
-					Parent_View 	@94
-					location   	(-344, 818)
-					label      	(object SegLabel @96
-					    Parent_View 	@95
-					    location   	(1674, 1915)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	144
-					    justify    	0
-					    label      	"+eFault"
-					    pctDist    	0.276423
-					    height     	56
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AE091F801FE"
-					client     	@94
-					supplier   	@83
-					line_style 	3
-					origin_attachment 	(1640, 1970)
-					terminal_attachment 	(1763, 1970)
-					label      	(object SegLabel @97
-					    Parent_View 	@95
-					    location   	(1718, 2012)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.642276
-					    height     	42
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$36" @98
-					Parent_View 	@94
-					location   	(-344, 818)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AE091F801FF"
-					client     	@94
-					supplier   	@84
-					line_style 	3
-					origin_attachment 	(1640, 1970)
-					terminal_attachment 	(1517, 1970))))
-			    (object InheritView "" @99
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84AE4302AB"
-				client     	@47
-				supplier   	@27
-				line_style 	3
-				origin_attachment 	(803, 1656)
-				terminal_attachment 	(364, 1656))
-			    (object InheritView "" @100
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84AE1B0113"
-				client     	@41
-				supplier   	@26
-				line_style 	3
-				origin_attachment 	(467, 1385)
-				terminal_attachment 	(331, 1385))))
-		    (object ClassDiagram "2.4 PortTypes"
-			quid       	"3AD5D1C40366"
-			title      	"2.4 PortTypes"
-			documentation 	"This class represents the non-MOF java.util.Iterator interface."
-			zoom       	80
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::IPortType" @101
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(496, 208)
-				label      	(object ItemLabel
-				    Parent_View 	@101
-				    location   	(146, 172)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	700
-				    justify    	0
-				    label      	"IPortType")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@101
-				    location   	(146, 122)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	700
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A5BE0331"
-				compartment 	(object Compartment
-				    Parent_View 	@101
-				    location   	(146, 233)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	696)
-				width      	718
-				height     	196
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::wsdl::IOperation" @102
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1552, 208)
-				label      	(object ItemLabel
-				    Parent_View 	@102
-				    location   	(1116, 176)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	873
-				    justify    	0
-				    label      	"IOperation")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@102
-				    location   	(1116, 126)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	873
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A77600D1"
-				compartment 	(object Compartment
-				    Parent_View 	@102
-				    location   	(1116, 237)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	709)
-				width      	891
-				height     	188
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IInput" @103
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(368, 1472)
-				label      	(object ItemLabel
-				    Parent_View 	@103
-				    location   	(55, 1437)
-				    fill_color 	16777215
-				    nlines     	1
-				    max_width  	626
-				    justify    	0
-				    label      	"IInput")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@103
-				    location   	(55, 1387)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	626
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A7EE0015"
-				compartment 	(object Compartment
-				    Parent_View 	@103
-				    location   	(55, 1498)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	621)
-				width      	644
-				height     	194
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IOutput" @104
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(384, 1792)
-				label      	(object ItemLabel
-				    Parent_View 	@104
-				    location   	(56, 1757)
-				    fill_color 	16777215
-				    nlines     	1
-				    max_width  	656
-				    justify    	0
-				    label      	"IOutput")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@104
-				    location   	(56, 1707)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	656
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A829027D"
-				compartment 	(object Compartment
-				    Parent_View 	@104
-				    location   	(56, 1818)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	656)
-				width      	674
-				height     	194
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IFault" @105
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(368, 2112)
-				label      	(object ItemLabel
-				    Parent_View 	@105
-				    location   	(55, 2076)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	626
-				    justify    	0
-				    label      	"IFault")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@105
-				    location   	(55, 2026)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	626
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A861031D"
-				compartment 	(object Compartment
-				    Parent_View 	@105
-				    location   	(55, 2137)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	625)
-				width      	644
-				height     	196
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::PortType" @106
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(496, 800)
-				label      	(object ItemLabel
-				    Parent_View 	@106
-				    location   	(158, 672)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	677
-				    justify    	0
-				    label      	"PortType")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C7F001A5"
-				compartment 	(object Compartment
-				    Parent_View 	@106
-				    location   	(158, 733)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	409)
-				width      	695
-				height     	281
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::wsdl::Part" @107
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2576, 800)
-				label      	(object ItemLabel
-				    Parent_View 	@107
-				    location   	(2325, 692)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	502
-				    justify    	0
-				    label      	"Part")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5CE1C032E"
-				compartment 	(object Compartment
-				    Parent_View 	@107
-				    location   	(2325, 753)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	484)
-				width      	520
-				height     	240
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Fault" @108
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1728, 2112)
-				label      	(object ItemLabel
-				    Parent_View 	@108
-				    location   	(1647, 2060)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	162
-				    justify    	0
-				    label      	"Fault")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE078BE0108"
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Input" @109
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1056, 1472)
-				label      	(object ItemLabel
-				    Parent_View 	@109
-				    location   	(870, 1422)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	372
-				    justify    	0
-				    label      	"Input")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE0789F0059"
-				width      	390
-				height     	125
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::wsdl::Output" @110
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1360, 1792)
-				label      	(object ItemLabel
-				    Parent_View 	@110
-				    location   	(1232, 1742)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	256
-				    justify    	0
-				    label      	"Output")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE078B60232"
-				width      	274
-				height     	125
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Operation" @111
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1552, 784)
-				label      	(object ItemLabel
-				    Parent_View 	@111
-				    location   	(1214, 620)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	677
-				    justify    	0
-				    label      	"Operation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C80D03CE"
-				compartment 	(object Compartment
-				    Parent_View 	@111
-				    location   	(1214, 681)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	446)
-				width      	695
-				height     	352
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$0" @112
-				location   	(1024, 797)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5C824018C"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eOperations" @113
-					Parent_View 	@112
-					location   	(592, 269)
-					label      	(object SegLabel @114
-					    Parent_View 	@113
-					    location   	(1088, 748)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	249
-					    justify    	0
-					    label      	"+eOperations"
-					    pctDist    	0.359649
-					    height     	50
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5C82701CD"
-					client     	@112
-					supplier   	@111
-					line_style 	3
-					origin_attachment 	(1024, 797)
-					terminal_attachment 	(1205, 797)
-					label      	(object SegLabel @115
-					    Parent_View 	@113
-					    location   	(1176, 861)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.840391
-					    height     	64
-					    orientation 	1)
-					label      	(object SegLabel @116
-					    Parent_View 	@113
-					    location   	(1074, 923)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	164
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.276243
-					    height     	126
-					    orientation 	1))
-				    (object RoleView "portType" @117
-					Parent_View 	@112
-					location   	(592, 269)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5C82701C3"
-					client     	@112
-					supplier   	@106
-					line_style 	3
-					origin_attachment 	(1024, 797)
-					terminal_attachment 	(843, 797)
-					label      	(object SegLabel @118
-					    Parent_View 	@117
-					    location   	(888, 757)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.753488
-					    height     	41
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$41" @119
-				location   	(2107, 773)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AEA412F0035"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eParameterOrdering" @120
-					Parent_View 	@119
-					location   	(1819, 101)
-					label      	(object SegLabel @121
-					    Parent_View 	@120
-					    location   	(2145, 647)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+eParameterOrdering"
-					    pctDist    	0.183333
-					    height     	127
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AEA41310255"
-					client     	@119
-					supplier   	@107
-					line_style 	3
-					origin_attachment 	(2107, 773)
-					terminal_attachment 	(2316, 773)
-					label      	(object SegLabel @122
-					    Parent_View 	@120
-					    location   	(2272, 822)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.796610
-					    height     	49
-					    orientation 	1)
-					label      	(object SegLabel @123
-					    Parent_View 	@120
-					    location   	(2171, 888)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	164
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.306220
-					    height     	115
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$42" @124
-					Parent_View 	@119
-					location   	(1819, 101)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AEA4131025F"
-					client     	@119
-					supplier   	@111
-					line_style 	3
-					origin_attachment 	(2107, 773)
-					terminal_attachment 	(1899, 773))))
-			    (object AssociationViewNew "$UNNAMED$31" @125
-				location   	(1702, 1504)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3ADF331601A4"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eFaults" @126
-					Parent_View 	@125
-					location   	(1414, 832)
-					label      	(object SegLabel @127
-					    Parent_View 	@126
-					    location   	(1815, 1982)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+eFaults"
-					    pctDist    	0.878992
-					    height     	113
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF33180387"
-					client     	@125
-					supplier   	@108
-					line_style 	3
-					origin_attachment 	(1702, 1504)
-					terminal_attachment 	(1702, 2048)
-					label      	(object SegLabel @128
-					    Parent_View 	@126
-					    location   	(1644, 2020)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.949580
-					    height     	59
-					    orientation 	1)
-					label      	(object SegLabel @129
-					    Parent_View 	@126
-					    location   	(1593, 1963)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	164
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.845378
-					    height     	110
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$32" @130
-					Parent_View 	@125
-					location   	(1414, 832)
-					label      	(object SegLabel @131
-					    Parent_View 	@130
-					    location   	(1661, 1069)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF33180388"
-					client     	@125
-					supplier   	@111
-					line_style 	3
-					origin_attachment 	(1702, 1504)
-					terminal_attachment 	(1702, 960)
-					label      	(object SegLabel @132
-					    Parent_View 	@130
-					    location   	(1821, 1039)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.857362
-					    height     	119
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$27" @133
-				location   	(1178, 1234)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3ADF2F94024D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eInput" @134
-					Parent_View 	@133
-					location   	(890, 562)
-					label      	(object SegLabel @135
-					    Parent_View 	@134
-					    location   	(878, 1343)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	132
-					    justify    	0
-					    label      	"+eInput"
-					    pctDist    	0.819820
-					    height     	103
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2F950190"
-					client     	@133
-					supplier   	@109
-					vertices   	(list Points
-					    (1178, 1234)
-					    (980, 1234)
-					    (980, 1410))
-					line_style 	3
-					origin_attachment 	(1178, 1234)
-					terminal_attachment 	(980, 1410)
-					label      	(object SegLabel @136
-					    Parent_View 	@134
-					    location   	(1046, 1364)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.877660
-					    height     	66
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$28" @137
-					Parent_View 	@133
-					location   	(890, 562)
-					label      	(object SegLabel @138
-					    Parent_View 	@137
-					    location   	(1236, 1036)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2F95019A"
-					client     	@133
-					supplier   	@111
-					vertices   	(list Points
-					    (1178, 1234)
-					    (1277, 1234)
-					    (1277, 960))
-					line_style 	3
-					origin_attachment 	(1178, 1234)
-					terminal_attachment 	(1277, 960)
-					label      	(object SegLabel @139
-					    Parent_View 	@137
-					    location   	(1197, 1058)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.736413
-					    height     	81
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$29" @140
-				location   	(1468, 1345)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3ADF2FB802F9"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eOutput" @141
-					Parent_View 	@140
-					location   	(1180, 673)
-					label      	(object SegLabel @142
-					    Parent_View 	@141
-					    location   	(1362, 1669)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+eOutput"
-					    pctDist    	0.840909
-					    height     	107
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2FB9020A"
-					client     	@140
-					supplier   	@110
-					line_style 	3
-					origin_attachment 	(1468, 1345)
-					terminal_attachment 	(1468, 1730)
-					label      	(object SegLabel @143
-					    Parent_View 	@141
-					    location   	(1546, 1676)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.863636
-					    height     	78
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$30" @144
-					Parent_View 	@140
-					location   	(1180, 673)
-					label      	(object SegLabel @145
-					    Parent_View 	@144
-					    location   	(1427, 1037)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2FB9020B"
-					client     	@140
-					supplier   	@111
-					line_style 	3
-					origin_attachment 	(1468, 1345)
-					terminal_attachment 	(1468, 960)
-					label      	(object SegLabel @146
-					    Parent_View 	@144
-					    location   	(1523, 1080)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.690341
-					    height     	55
-					    orientation 	1))))
-			    (object InheritView "" @147
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F6F1FD8019F"
-				client     	@106
-				supplier   	@101
-				line_style 	0)
-			    (object InheritView "" @148
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F6F1FE20171"
-				client     	@111
-				supplier   	@102
-				line_style 	0)
-			    (object InheritView "" @149
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F6F1FEE031D"
-				client     	@109
-				supplier   	@103
-				line_style 	0)
-			    (object InheritView "" @150
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F6F1FF801CD"
-				client     	@110
-				supplier   	@104
-				line_style 	0)
-			    (object InheritView "" @151
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F6F2002002D"
-				client     	@108
-				supplier   	@105
-				line_style 	0)
-			    (object ClassView "Class" "Logical View::wsdl::Message" @152
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2224, 1456)
-				label      	(object ItemLabel
-				    Parent_View 	@152
-				    location   	(1937, 1312)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	575
-				    justify    	0
-				    label      	"Message")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C9590078"
-				compartment 	(object Compartment
-				    Parent_View 	@152
-				    location   	(1937, 1371)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	425)
-				width      	593
-				height     	312
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::wsdl::MessageReference" @153
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1520, 2544)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@153
-				    location   	(1193, 2466)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	654
-				    justify    	0
-				    label      	"MessageReference")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3F6771DB02DC"
-				compartment 	(object Compartment
-				    Parent_View 	@153
-				    location   	(1193, 2527)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	303)
-				width      	672
-				height     	180
-				annotation 	8)
-			    (object InheritTreeView "" @154
-				location   	(1524, 2275)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@153
-				vertices   	(list Points
-				    (1524, 2275)
-				    (1524, 2454)))
-			    (object InheritView "" @155
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F67723D0319"
-				client     	@108
-				supplier   	@153
-				line_style 	3
-				origin_attachment 	(1776, 2176)
-				terminal_attachment 	(1776, 2275)
-				drawSupplier 	@154)
-			    (object InheritView "" @156
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F67723500DD"
-				client     	@110
-				supplier   	@153
-				line_style 	3
-				origin_attachment 	(1371, 1854)
-				terminal_attachment 	(1371, 2275)
-				drawSupplier 	@154)
-			    (object InheritView "" @157
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F67722802E7"
-				client     	@109
-				supplier   	@153
-				line_style 	3
-				origin_attachment 	(980, 1534)
-				terminal_attachment 	(980, 2275)
-				drawSupplier 	@154)
-			    (object AssociationViewNew "$UNNAMED$61" @158
-				location   	(2206, 2259)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F74E78401B1"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eMessage" @159
-					Parent_View 	@158
-					location   	(734, -285)
-					label      	(object SegLabel @160
-					    Parent_View 	@159
-					    location   	(2068, 1670)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+eMessage"
-					    pctDist    	0.912230
-					    height     	139
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3F74E786000F"
-					client     	@158
-					supplier   	@152
-					line_style 	3
-					origin_attachment 	(2206, 2259)
-					terminal_attachment 	(2206, 1612)
-					label      	(object SegLabel @161
-					    Parent_View 	@159
-					    location   	(2260, 1678)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$62" @162
-					Parent_View 	@158
-					location   	(734, -285)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3F74E7860023"
-					client     	@158
-					supplier   	@153
-					vertices   	(list Points
-					    (2206, 2259)
-					    (2206, 2556)
-					    (1856, 2556))
-					line_style 	3
-					origin_attachment 	(2206, 2259)
-					terminal_attachment 	(1856, 2556))))))
-		    (object ClassDiagram "2.1 Definitions"
-			quid       	"3AD5E48A0262"
-			title      	"2.1 Definitions"
-			zoom       	83
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::IDefinition" @163
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(432, 192)
-				label      	(object ItemLabel
-				    Parent_View 	@163
-				    location   	(88, 161)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	688
-				    justify    	0
-				    label      	"IDefinition")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@163
-				    location   	(88, 111)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	688
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84B1D90142"
-				compartment 	(object Compartment
-				    Parent_View 	@163
-				    location   	(88, 220)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	700)
-				width      	706
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Types" @164
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1824, 944)
-				label      	(object ItemLabel
-				    Parent_View 	@164
-				    location   	(1686, 896)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	276
-				    justify    	0
-				    label      	"Types")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B8BE9A603A8"
-				width      	294
-				height     	120
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Import" @165
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2144, 624)
-				label      	(object ItemLabel
-				    Parent_View 	@165
-				    location   	(1910, 545)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"Import")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5E4F903DE"
-				compartment 	(object Compartment
-				    Parent_View 	@165
-				    location   	(1910, 604)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	478)
-				width      	486
-				height     	182
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Message" @166
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(2112, 1184)
-				label      	(object ItemLabel
-				    Parent_View 	@166
-				    location   	(1900, 1105)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	424
-				    justify    	0
-				    label      	"Message")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C9590078"
-				compartment 	(object Compartment
-				    Parent_View 	@166
-				    location   	(1900, 1164)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	422)
-				width      	442
-				height     	182
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::PortType" @167
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(1808, 1488)
-				label      	(object ItemLabel
-				    Parent_View 	@167
-				    location   	(1596, 1409)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	424
-				    justify    	0
-				    label      	"PortType")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C7F001A5"
-				compartment 	(object Compartment
-				    Parent_View 	@167
-				    location   	(1596, 1468)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	422)
-				width      	442
-				height     	182
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Binding" @168
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(2336, 1728)
-				label      	(object ItemLabel
-				    Parent_View 	@168
-				    location   	(2124, 1649)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	424
-				    justify    	0
-				    label      	"Binding")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D2860261"
-				compartment 	(object Compartment
-				    Parent_View 	@168
-				    location   	(2124, 1708)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	422)
-				width      	442
-				height     	182
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Definition" @169
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1328, 240)
-				label      	(object ItemLabel
-				    Parent_View 	@169
-				    location   	(1073, 39)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	510
-				    justify    	0
-				    label      	"Definition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5E43F008E"
-				compartment 	(object Compartment
-				    Parent_View 	@169
-				    location   	(1073, 98)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	7
-				    max_width  	521)
-				width      	528
-				height     	426
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$53" @170
-				location   	(1358, 860)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8BEA27029F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$54" @171
-					Parent_View 	@170
-					location   	(62, -36)
-					label      	(object SegLabel @172
-					    Parent_View 	@171
-					    location   	(1317, 535)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8BEA290356"
-					client     	@170
-					supplier   	@169
-					line_style 	3
-					origin_attachment 	(1358, 860)
-					terminal_attachment 	(1358, 453)
-					label      	(object SegLabel @173
-					    Parent_View 	@171
-					    location   	(1403, 511)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.856649
-					    height     	45
-					    orientation 	1))
-				    (object RoleView "eTypes" @174
-					Parent_View 	@170
-					location   	(62, -36)
-					label      	(object SegLabel @175
-					    Parent_View 	@174
-					    location   	(1586, 909)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	156
-					    justify    	0
-					    label      	"+eTypes"
-					    pctDist    	0.779097
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8BEA29036A"
-					client     	@170
-					supplier   	@164
-					vertices   	(list Points
-					    (1358, 860)
-					    (1358, 948)
-					    (1677, 948))
-					line_style 	3
-					origin_attachment 	(1358, 860)
-					terminal_attachment 	(1677, 948)
-					label      	(object SegLabel @176
-					    Parent_View 	@174
-					    location   	(1632, 987)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.892655
-					    height     	39
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$57" @177
-				location   	(1612, 595)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C864DFF02EC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$58" @178
-					Parent_View 	@177
-					location   	(12, 227)
-					label      	(object SegLabel @179
-					    Parent_View 	@178
-					    location   	(1423, 512)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C864DFF02EE"
-					client     	@177
-					supplier   	@169
-					vertices   	(list Points
-					    (1612, 595)
-					    (1464, 595)
-					    (1464, 453))
-					line_style 	3
-					origin_attachment 	(1612, 595)
-					terminal_attachment 	(1464, 453)
-					label      	(object SegLabel @180
-					    Parent_View 	@178
-					    location   	(1524, 495)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.858667
-					    height     	60
-					    orientation 	1))
-				    (object RoleView "eImports" @181
-					Parent_View 	@177
-					location   	(12, 227)
-					label      	(object SegLabel @182
-					    Parent_View 	@181
-					    location   	(1692, 557)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	204
-					    justify    	0
-					    label      	"+eImports"
-					    pctDist    	0.280335
-					    height     	39
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C864DFF02ED"
-					client     	@177
-					supplier   	@165
-					line_style 	3
-					origin_attachment 	(1612, 595)
-					terminal_attachment 	(1901, 595)
-					label      	(object SegLabel @183
-					    Parent_View 	@181
-					    location   	(1854, 652)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.841004
-					    height     	57
-					    orientation 	1)
-					label      	(object SegLabel @184
-					    Parent_View 	@181
-					    location   	(1676, 646)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	158
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.225941
-					    height     	51
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$13" @185
-				location   	(1279, 1136)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5E60301E2"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$14" @186
-					Parent_View 	@185
-					location   	(271, 272)
-					label      	(object SegLabel @187
-					    Parent_View 	@186
-					    location   	(1238, 591)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E60400B7"
-					client     	@185
-					supplier   	@169
-					line_style 	3
-					origin_attachment 	(1279, 1136)
-					terminal_attachment 	(1279, 453)
-					label      	(object SegLabel @188
-					    Parent_View 	@186
-					    location   	(1320, 587)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.804974
-					    height     	41
-					    orientation 	1))
-				    (object RoleView "eMessages" @189
-					Parent_View 	@185
-					location   	(271, 272)
-					label      	(object SegLabel @190
-					    Parent_View 	@189
-					    location   	(1647, 1171)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+eMessages"
-					    pctDist    	0.643137
-					    height     	38
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E60400C1"
-					client     	@185
-					supplier   	@166
-					vertices   	(list Points
-					    (1279, 1136)
-					    (1279, 1208)
-					    (1891, 1208))
-					line_style 	3
-					origin_attachment 	(1279, 1136)
-					terminal_attachment 	(1891, 1208)
-					label      	(object SegLabel @191
-					    Parent_View 	@189
-					    location   	(1821, 1171)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.899346
-					    height     	38
-					    orientation 	0)
-					label      	(object SegLabel @192
-					    Parent_View 	@189
-					    location   	(1797, 1244)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	158
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.864407
-					    height     	36
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$15" @193
-				location   	(1212, 1159)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5E6710104"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$16" @194
-					Parent_View 	@193
-					location   	(-324, 215)
-					label      	(object SegLabel @195
-					    Parent_View 	@194
-					    location   	(1171, 594)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E672034A"
-					client     	@193
-					supplier   	@169
-					line_style 	3
-					origin_attachment 	(1212, 1159)
-					terminal_attachment 	(1212, 453)
-					label      	(object SegLabel @196
-					    Parent_View 	@194
-					    location   	(1251, 624)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.757962
-					    height     	39
-					    orientation 	1))
-				    (object RoleView "ePortTypes" @197
-					Parent_View 	@193
-					location   	(-324, 215)
-					label      	(object SegLabel @198
-					    Parent_View 	@197
-					    location   	(1391, 1451)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+ePortTypes"
-					    pctDist    	0.723698
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E6720354"
-					client     	@193
-					supplier   	@167
-					vertices   	(list Points
-					    (1212, 1159)
-					    (1212, 1490)
-					    (1587, 1490))
-					line_style 	3
-					origin_attachment 	(1212, 1159)
-					terminal_attachment 	(1587, 1490)
-					label      	(object SegLabel @199
-					    Parent_View 	@197
-					    location   	(1533, 1451)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.925611
-					    height     	40
-					    orientation 	0)
-					label      	(object SegLabel @200
-					    Parent_View 	@197
-					    location   	(1512, 1540)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	158
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.895855
-					    height     	50
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$17" @201
-				location   	(1114, 1585)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5E6770095"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$18" @202
-					Parent_View 	@201
-					location   	(-406, 241)
-					label      	(object SegLabel @203
-					    Parent_View 	@202
-					    location   	(1073, 680)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E6780371"
-					client     	@201
-					supplier   	@169
-					line_style 	3
-					origin_attachment 	(1114, 1585)
-					terminal_attachment 	(1114, 453)
-					label      	(object SegLabel @204
-					    Parent_View 	@202
-					    location   	(1155, 752)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.736704
-					    height     	41
-					    orientation 	1))
-				    (object RoleView "eBindings" @205
-					Parent_View 	@201
-					location   	(-406, 241)
-					label      	(object SegLabel @206
-					    Parent_View 	@205
-					    location   	(1851, 1674)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	204
-					    justify    	0
-					    label      	"+eBindings"
-					    pctDist    	0.766347
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E678037B"
-					client     	@201
-					supplier   	@168
-					vertices   	(list Points
-					    (1114, 1585)
-					    (1114, 1716)
-					    (2115, 1716))
-					line_style 	3
-					origin_attachment 	(1114, 1585)
-					terminal_attachment 	(2115, 1716)
-					label      	(object SegLabel @207
-					    Parent_View 	@205
-					    location   	(2053, 1677)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.945074
-					    height     	40
-					    orientation 	0)
-					label      	(object SegLabel @208
-					    Parent_View 	@205
-					    location   	(2014, 1754)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	158
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.911072
-					    height     	38
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::wsdl::Service" @209
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(1840, 2048)
-				label      	(object ItemLabel
-				    Parent_View 	@209
-				    location   	(1628, 1969)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	424
-				    justify    	0
-				    label      	"Service")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D8F002F8"
-				compartment 	(object Compartment
-				    Parent_View 	@209
-				    location   	(1628, 2028)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	422)
-				width      	442
-				height     	182
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$19" @210
-				location   	(1066, 1532)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5E67B0311"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$20" @211
-					Parent_View 	@210
-					location   	(-521, -112)
-					label      	(object SegLabel @212
-					    Parent_View 	@211
-					    location   	(1025, 670)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E67D007F"
-					client     	@210
-					supplier   	@169
-					line_style 	3
-					origin_attachment 	(1066, 1532)
-					terminal_attachment 	(1066, 453)
-					label      	(object SegLabel @213
-					    Parent_View 	@211
-					    location   	(1109, 756)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.719697
-					    height     	43
-					    orientation 	1))
-				    (object RoleView "eServices" @214
-					Parent_View 	@210
-					location   	(-521, -112)
-					label      	(object SegLabel @215
-					    Parent_View 	@214
-					    location   	(1393, 2028)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	204
-					    justify    	0
-					    label      	"+eServices"
-					    pctDist    	0.791824
-					    height     	32
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E67D0089"
-					client     	@210
-					supplier   	@209
-					vertices   	(list Points
-					    (1066, 1532)
-					    (1066, 2059)
-					    (1619, 2059))
-					line_style 	3
-					origin_attachment 	(1066, 1532)
-					terminal_attachment 	(1619, 2059)
-					label      	(object SegLabel @216
-					    Parent_View 	@214
-					    location   	(1554, 2031)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.940197
-					    height     	29
-					    orientation 	0)
-					label      	(object SegLabel @217
-					    Parent_View 	@214
-					    location   	(1532, 2113)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	158
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.920515
-					    height     	54
-					    orientation 	1))))
-			    (object InheritView "" @218
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84B1F80382"
-				client     	@169
-				supplier   	@163
-				line_style 	3
-				origin_attachment 	(1064, 263)
-				terminal_attachment 	(785, 263))))
-		    (object ClassDiagram "2.1.3 Extensibility"
-			quid       	"3AD60C510192"
-			title      	"2.1.3 Extensibility"
-			zoom       	80
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::Binding" @219
-				ShowCompartmentStereotypes 	TRUE
-				location   	(576, 1584)
-				label      	(object ItemLabel
-				    Parent_View 	@219
-				    location   	(494, 1531)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	164
-				    justify    	0
-				    label      	"Binding")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D2860261"
-				width      	182
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Port" @220
-				ShowCompartmentStereotypes 	TRUE
-				location   	(1568, 1888)
-				label      	(object ItemLabel
-				    Parent_View 	@220
-				    location   	(1487, 1836)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	162
-				    justify    	0
-				    label      	"Port")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D9170286"
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Service" @221
-				ShowCompartmentStereotypes 	TRUE
-				location   	(1424, 1728)
-				label      	(object ItemLabel
-				    Parent_View 	@221
-				    location   	(1343, 1675)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	162
-				    justify    	0
-				    label      	"Service")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D8F002F8"
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::BindingFault" @222
-				ShowCompartmentStereotypes 	TRUE
-				location   	(1216, 2336)
-				label      	(object ItemLabel
-				    Parent_View 	@222
-				    location   	(1088, 2283)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	256
-				    justify    	0
-				    label      	"BindingFault")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE08A9E03A6"
-				width      	274
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::BindingOperation" @223
-				ShowCompartmentStereotypes 	TRUE
-				location   	(736, 1760)
-				label      	(object ItemLabel
-				    Parent_View 	@223
-				    location   	(563, 1707)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	346
-				    justify    	0
-				    label      	"BindingOperation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D3CB0145"
-				width      	364
-				height     	130
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IExtensibilityElement" @224
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1888, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@224
-				    location   	(1495, 136)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	786
-				    justify    	0
-				    label      	"IExtensibilityElement")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@224
-				    location   	(1495, 86)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	786
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84B12402AB"
-				width      	804
-				height     	172
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::BindingInput" @225
-				ShowCompartmentStereotypes 	TRUE
-				location   	(928, 1952)
-				label      	(object ItemLabel
-				    Parent_View 	@225
-				    location   	(800, 1899)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	256
-				    justify    	0
-				    label      	"BindingInput")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE08A8202D4"
-				width      	274
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::BindingOutput" @226
-				ShowCompartmentStereotypes 	TRUE
-				location   	(1008, 2144)
-				label      	(object ItemLabel
-				    Parent_View 	@226
-				    location   	(863, 2091)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	290
-				    justify    	0
-				    label      	"BindingOutput")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE08A8F028C"
-				width      	308
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Definition" @227
-				ShowCompartmentStereotypes 	TRUE
-				location   	(176, 1296)
-				label      	(object ItemLabel
-				    Parent_View 	@227
-				    location   	(74, 1235)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	204
-				    justify    	0
-				    label      	"Definition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5E43F008E"
-				width      	222
-				height     	146
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Types" @228
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(416, 1408)
-				label      	(object ItemLabel
-				    Parent_View 	@228
-				    location   	(335, 1356)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	162
-				    justify    	0
-				    label      	"Types")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B8BE9A603A8"
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::ExtensibleElement" @229
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(480, 688)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@229
-				    location   	(209, 580)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	542
-				    justify    	0
-				    label      	"ExtensibleElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5FCFA033A"
-				compartment 	(object Compartment
-				    Parent_View 	@229
-				    location   	(209, 641)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	531)
-				width      	560
-				height     	240
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @230
-				location   	(480, 1039)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@229
-				vertices   	(list Points
-				    (480, 1039)
-				    (480, 808)))
-			    (object InheritView "" @231
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD600CB00AA"
-				client     	@220
-				supplier   	@229
-				line_style 	3
-				origin_attachment 	(1566, 1824)
-				terminal_attachment 	(1566, 1039)
-				drawSupplier 	@230)
-			    (object InheritView "" @232
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B85B5A4027E"
-				client     	@226
-				supplier   	@229
-				line_style 	3
-				origin_attachment 	(1097, 2079)
-				terminal_attachment 	(1097, 1039)
-				drawSupplier 	@230)
-			    (object InheritView "" @233
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AE0938602C9"
-				client     	@222
-				supplier   	@229
-				line_style 	3
-				origin_attachment 	(1219, 2271)
-				terminal_attachment 	(1219, 1039)
-				drawSupplier 	@230)
-			    (object InheritView "" @234
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B85B59B0072"
-				client     	@225
-				supplier   	@229
-				line_style 	3
-				origin_attachment 	(988, 1887)
-				terminal_attachment 	(988, 1039)
-				drawSupplier 	@230)
-			    (object InheritView "" @235
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD6009202F7"
-				client     	@223
-				supplier   	@229
-				line_style 	3
-				origin_attachment 	(797, 1695)
-				terminal_attachment 	(797, 1039)
-				drawSupplier 	@230)
-			    (object InheritView "" @236
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5FA0F02F0"
-				client     	@219
-				supplier   	@229
-				line_style 	3
-				origin_attachment 	(601, 1519)
-				terminal_attachment 	(601, 1039)
-				drawSupplier 	@230)
-			    (object InheritView "" @237
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5FDB803D4"
-				client     	@227
-				supplier   	@229
-				line_style 	3
-				origin_attachment 	(211, 1223)
-				terminal_attachment 	(211, 1039)
-				drawSupplier 	@230)
-			    (object InheritView "" @238
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8BEB010311"
-				client     	@228
-				supplier   	@229
-				line_style 	3
-				origin_attachment 	(414, 1344)
-				terminal_attachment 	(414, 1039)
-				drawSupplier 	@230)
-			    (object InheritView "" @239
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5FA20025E"
-				client     	@221
-				supplier   	@229
-				line_style 	3
-				origin_attachment 	(1429, 1663)
-				terminal_attachment 	(1429, 1039)
-				drawSupplier 	@230)
-			    (object ClassView "Class" "Logical View::wsdl::ExtensibilityElement" @240
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1904, 688)
-				label      	(object ItemLabel
-				    Parent_View 	@240
-				    location   	(1632, 583)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	545
-				    justify    	0
-				    label      	"ExtensibilityElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5DBB602A9"
-				compartment 	(object Compartment
-				    Parent_View 	@240
-				    location   	(1632, 644)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	465)
-				width      	563
-				height     	234
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$21" @241
-				location   	(1191, 672)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5FD130079"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$22" @242
-					Parent_View 	@241
-					location   	(23, 560)
-					label      	(object SegLabel @243
-					    Parent_View 	@242
-					    location   	(847, 631)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5FD14019E"
-					client     	@241
-					supplier   	@229
-					line_style 	3
-					origin_attachment 	(1191, 672)
-					terminal_attachment 	(760, 672)
-					label      	(object SegLabel @244
-					    Parent_View 	@242
-					    location   	(830, 628)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.839695
-					    height     	45
-					    orientation 	1))
-				    (object RoleView "eExtensibilityElements" @245
-					Parent_View 	@241
-					location   	(23, 560)
-					label      	(object SegLabel @246
-					    Parent_View 	@245
-					    location   	(1355, 522)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	"+eExtensibilityElements"
-					    pctDist    	0.379070
-					    height     	151
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5FD14019D"
-					client     	@241
-					supplier   	@240
-					line_style 	3
-					origin_attachment 	(1191, 672)
-					terminal_attachment 	(1623, 672)
-					label      	(object SegLabel @247
-					    Parent_View 	@245
-					    location   	(1496, 627)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.709402
-					    height     	46
-					    orientation 	0)
-					label      	(object SegLabel @248
-					    Parent_View 	@245
-					    location   	(1463, 764)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	164
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.632479
-					    height     	92
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::wsdl::WSDLElement" @249
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(1008, 192)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@249
-				    location   	(630, 84)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	756
-				    justify    	0
-				    label      	"WSDLElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C6A302DD"
-				compartment 	(object Compartment
-				    Parent_View 	@249
-				    location   	(630, 145)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	753)
-				width      	774
-				height     	240
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @250
-				location   	(1008, 402)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@249
-				vertices   	(list Points
-				    (1008, 402)
-				    (1008, 312)))
-			    (object InheritView "" @251
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5FE3C03D4"
-				client     	@229
-				supplier   	@249
-				line_style 	3
-				origin_attachment 	(492, 568)
-				terminal_attachment 	(492, 402)
-				drawSupplier 	@250)
-			    (object InheritView "" @252
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84B14903D0"
-				client     	@240
-				supplier   	@224
-				line_style 	3
-				origin_attachment 	(2015, 571)
-				terminal_attachment 	(2015, 246))
-			    (object InheritView "" @253
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BDDF53502C3"
-				client     	@240
-				supplier   	@249
-				line_style 	3
-				origin_attachment 	(1762, 571)
-				terminal_attachment 	(1762, 402)
-				drawSupplier 	@250)
-			    (object ClassView "Class" "Logical View::wsdl::UnknownExtensibilityElement" @254
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2192, 1408)
-				label      	(object ItemLabel
-				    Parent_View 	@254
-				    location   	(1729, 1303)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	927
-				    justify    	0
-				    label      	"UnknownExtensibilityElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3CB24AC002AE"
-				width      	945
-				height     	235
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @255
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3CB24AEC01CB"
-				client     	@254
-				supplier   	@240
-				line_style 	3
-				origin_attachment 	(1796, 1291)
-				terminal_attachment 	(1796, 805))
-			    (object AssociationViewNew "$UNNAMED$63" @256
-				location   	(2639, 1734)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F7896A2026E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$64" @257
-					Parent_View 	@256
-					location   	(607, 342)
-					label      	(object SegLabel @258
-					    Parent_View 	@257
-					    location   	(2797, 1380)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3F7896A7012B"
-					client     	@256
-					supplier   	@254
-					vertices   	(list Points
-					    (2639, 1734)
-					    (2824, 1734)
-					    (2824, 1421)
-					    (2664, 1421))
-					line_style 	3
-					origin_attachment 	(2639, 1734)
-					terminal_attachment 	(2664, 1421)
-					label      	(object SegLabel @259
-					    Parent_View 	@257
-					    location   	(2731, 1475)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	0))
-				    (object RoleView "children" @260
-					Parent_View 	@256
-					location   	(607, 342)
-					label      	(object SegLabel @261
-					    Parent_View 	@260
-					    location   	(2074, 1658)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+children"
-					    pctDist    	0.798561
-					    height     	118
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3F7896A7012C"
-					client     	@256
-					supplier   	@254
-					vertices   	(list Points
-					    (2639, 1734)
-					    (2191, 1734)
-					    (2191, 1525))
-					line_style 	3
-					origin_attachment 	(2639, 1734)
-					terminal_attachment 	(2191, 1525)
-					label      	(object SegLabel @262
-					    Parent_View 	@260
-					    location   	(2245, 1591)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	1))))))
-		    (object ClassDiagram "2.1.1 Naming and Linking"
-			quid       	"3AE8ED7201BD"
-			title      	"2.1.1 Naming and Linking"
-			zoom       	90
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::IImport" @263
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1712, 224)
-				label      	(object ItemLabel
-				    Parent_View 	@263
-				    location   	(1422, 177)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	580
-				    justify    	0
-				    label      	"IImport")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@263
-				    location   	(1422, 127)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	580
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84B2020119"
-				compartment 	(object Compartment
-				    Parent_View 	@263
-				    location   	(1422, 232)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	646)
-				width      	598
-				height     	218
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Namespace" @264
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(432, 1136)
-				label      	(object ItemLabel
-				    Parent_View 	@264
-				    location   	(202, 1041)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	461
-				    justify    	0
-				    label      	"Namespace")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AEA3CD30030"
-				compartment 	(object Compartment
-				    Parent_View 	@264
-				    location   	(202, 1096)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	300)
-				width      	479
-				height     	215
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @265
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1632, 1216)
-				label      	(object ItemLabel
-				    Parent_View 	@265
-				    location   	(1294, 1142)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	676
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	694
-				height     	173
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Definition" @266
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(400, 384)
-				label      	(object ItemLabel
-				    Parent_View 	@266
-				    location   	(164, 236)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	472
-				    justify    	0
-				    label      	"Definition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5E43F008E"
-				compartment 	(object Compartment
-				    Parent_View 	@266
-				    location   	(164, 291)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	5
-				    max_width  	521)
-				width      	490
-				height     	320
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$37" @267
-				location   	(309, 786)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AEA3D55002D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eNamespaces" @268
-					Parent_View 	@267
-					location   	(-91, 258)
-					label      	(object SegLabel @269
-					    Parent_View 	@268
-					    location   	(461, 956)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	288
-					    justify    	0
-					    label      	"+eNamespaces"
-					    pctDist    	0.698842
-					    height     	152
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AEA3D560332"
-					client     	@267
-					supplier   	@264
-					line_style 	3
-					origin_attachment 	(309, 786)
-					terminal_attachment 	(309, 1029)
-					label      	(object SegLabel @270
-					    Parent_View 	@268
-					    location   	(248, 973)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.768707
-					    height     	62
-					    orientation 	1)
-					label      	(object SegLabel @271
-					    Parent_View 	@268
-					    location   	(228, 913)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	146
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.525097
-					    height     	82
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$38" @272
-					Parent_View 	@267
-					location   	(-91, 258)
-					label      	(object SegLabel @273
-					    Parent_View 	@272
-					    location   	(268, 592)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	192
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AEA3D560328"
-					client     	@267
-					supplier   	@266
-					line_style 	3
-					origin_attachment 	(309, 786)
-					terminal_attachment 	(309, 544)
-					label      	(object SegLabel @274
-					    Parent_View 	@272
-					    location   	(239, 583)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.844961
-					    height     	71
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::wsdl::Import" @275
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1472, 720)
-				label      	(object ItemLabel
-				    Parent_View 	@275
-				    location   	(1255, 580)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	434
-				    justify    	0
-				    label      	"Import")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5E4F903DE"
-				compartment 	(object Compartment
-				    Parent_View 	@275
-				    location   	(1255, 635)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	5
-				    max_width  	478)
-				width      	452
-				height     	304
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$51" @276
-				location   	(1486, 1001)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8B1DCC02E5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eSchema" @277
-					Parent_View 	@276
-					location   	(510, -103)
-					label      	(object SegLabel @278
-					    Parent_View 	@277
-					    location   	(1737, 1018)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	204
-					    justify    	0
-					    label      	"+eSchema"
-					    pctDist    	0.592593
-					    height     	105
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8B1DCE0270"
-					client     	@276
-					supplier   	@265
-					vertices   	(list Points
-					    (1486, 1001)
-					    (1632, 1001)
-					    (1632, 1130))
-					line_style 	3
-					origin_attachment 	(1486, 1001)
-					terminal_attachment 	(1632, 1130)
-					label      	(object SegLabel @279
-					    Parent_View 	@277
-					    location   	(1563, 1018)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.592593
-					    height     	70
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$52" @280
-					Parent_View 	@276
-					location   	(510, -103)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8B1DCE027A"
-					client     	@276
-					supplier   	@275
-					line_style 	3
-					origin_attachment 	(1486, 872)
-					terminal_attachment 	(1486, 872))))
-			    (object AssociationViewNew "$UNNAMED$39" @281
-				location   	(1087, 403)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AEA3E3A002D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$40" @282
-					Parent_View 	@281
-					location   	(687, -125)
-					label      	(object SegLabel @283
-					    Parent_View 	@282
-					    location   	(1406, 480)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AEA3E3C01F2"
-					client     	@281
-					supplier   	@275
-					vertices   	(list Points
-					    (1087, 403)
-					    (1364, 403)
-					    (1364, 568))
-					line_style 	3
-					origin_attachment 	(1087, 403)
-					terminal_attachment 	(1364, 568))
-				    (object RoleView "eDefinition" @284
-					Parent_View 	@281
-					location   	(687, -125)
-					label      	(object SegLabel @285
-					    Parent_View 	@284
-					    location   	(805, 363)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+eDefinition"
-					    pctDist    	0.637532
-					    height     	41
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AEA3E3C01E8"
-					client     	@281
-					supplier   	@266
-					line_style 	3
-					origin_attachment 	(1087, 403)
-					terminal_attachment 	(645, 403)
-					label      	(object SegLabel @286
-					    Parent_View 	@284
-					    location   	(727, 456)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.814910
-					    height     	53
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$57" @287
-				location   	(737, 826)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C864DFF02EC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$58" @288
-					Parent_View 	@287
-					location   	(-671, 106)
-					label      	(object SegLabel @289
-					    Parent_View 	@288
-					    location   	(552, 647)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C864DFF02EE"
-					client     	@287
-					supplier   	@266
-					vertices   	(list Points
-					    (737, 826)
-					    (510, 826)
-					    (510, 544))
-					line_style 	3
-					origin_attachment 	(737, 826)
-					terminal_attachment 	(510, 544)
-					label      	(object SegLabel @290
-					    Parent_View 	@288
-					    location   	(457, 595)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	0))
-				    (object RoleView "eImports" @291
-					Parent_View 	@287
-					location   	(-671, 106)
-					label      	(object SegLabel @292
-					    Parent_View 	@291
-					    location   	(1144, 773)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+eImports"
-					    pctDist    	0.799189
-					    height     	54
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C864DFF02ED"
-					client     	@287
-					supplier   	@275
-					line_style 	3
-					origin_attachment 	(737, 826)
-					terminal_attachment 	(1246, 826)
-					label      	(object SegLabel @293
-					    Parent_View 	@291
-					    location   	(1180, 879)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.872211
-					    height     	53
-					    orientation 	1)
-					label      	(object SegLabel @294
-					    Parent_View 	@291
-					    location   	(1162, 933)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	146
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.837728
-					    height     	107
-					    orientation 	1))))
-			    (object InheritView "" @295
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F6F200D0340"
-				client     	@275
-				supplier   	@263
-				line_style 	3
-				origin_attachment 	(1555, 568)
-				terminal_attachment 	(1555, 333))))
-		    (object ClassDiagram "2.2 Types"
-			quid       	"3B85AE59037E"
-			title      	"2.2 Types"
-			zoom       	90
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	81
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @296
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1136, 1232)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@296
-				    location   	(895, 1157)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	482
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ECD302A9"
-				width      	500
-				height     	174
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @297
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1136, 1600)
-				label      	(object ItemLabel
-				    Parent_View 	@297
-				    location   	(906, 1531)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	460
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				width      	478
-				height     	162
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Message" @298
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1280, 1968)
-				label      	(object ItemLabel
-				    Parent_View 	@298
-				    location   	(1022, 1828)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	517
-				    justify    	0
-				    label      	"Message")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C9590078"
-				compartment 	(object Compartment
-				    Parent_View 	@298
-				    location   	(1022, 1900)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	30)
-				width      	535
-				height     	305
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Part" @299
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(352, 1184)
-				label      	(object ItemLabel
-				    Parent_View 	@299
-				    location   	(128, 1067)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	448
-				    justify    	0
-				    label      	"Part")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5CE1C032E"
-				width      	466
-				height     	258
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$47" @300
-				location   	(735, 1172)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8B1BE900C4"
-				roleview_list 	(list RoleViews
-				    (object RoleView "typeDefinition" @301
-					Parent_View 	@300
-					location   	(143, 676)
-					label      	(object SegLabel @302
-					    Parent_View 	@301
-					    location   	(775, 1133)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+typeDefinition"
-					    pctDist    	0.269006
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8B1BE90327"
-					client     	@300
-					supplier   	@296
-					line_style 	3
-					origin_attachment 	(735, 1172)
-					terminal_attachment 	(886, 1172)
-					label      	(object SegLabel @303
-					    Parent_View 	@301
-					    location   	(839, 1207)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.688705
-					    height     	35
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$48" @304
-					Parent_View 	@300
-					location   	(143, 676)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8B1BE90331"
-					client     	@300
-					supplier   	@299
-					line_style 	3
-					origin_attachment 	(735, 1172)
-					terminal_attachment 	(585, 1172))))
-			    (object AssociationViewNew "$UNNAMED$49" @305
-				location   	(527, 1592)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8B1C1203B2"
-				roleview_list 	(list RoleViews
-				    (object RoleView "elementDeclaration" @306
-					Parent_View 	@305
-					location   	(-65, 1096)
-					label      	(object SegLabel @307
-					    Parent_View 	@306
-					    location   	(666, 1554)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+elementDeclaration"
-					    pctDist    	0.375394
-					    height     	39
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8B1C14001C"
-					client     	@305
-					supplier   	@297
-					line_style 	3
-					origin_attachment 	(527, 1592)
-					terminal_attachment 	(897, 1592)
-					label      	(object SegLabel @308
-					    Parent_View 	@306
-					    location   	(807, 1645)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.755877
-					    height     	53
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$50" @309
-					Parent_View 	@305
-					location   	(-65, 1096)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8B1C140026"
-					client     	@305
-					supplier   	@299
-					vertices   	(list Points
-					    (527, 1592)
-					    (437, 1592)
-					    (437, 1313))
-					line_style 	3
-					origin_attachment 	(527, 1592)
-					terminal_attachment 	(437, 1313))))
-			    (object AssociationViewNew "$UNNAMED$55" @310
-				location   	(322, 1911)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C46829303E5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eMessage" @311
-					Parent_View 	@310
-					location   	(-14, 1191)
-					label      	(object SegLabel @312
-					    Parent_View 	@311
-					    location   	(838, 1872)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+eMessage"
-					    pctDist    	0.748560
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C468296010E"
-					client     	@310
-					supplier   	@298
-					line_style 	3
-					origin_attachment 	(322, 1911)
-					terminal_attachment 	(1013, 1911)
-					label      	(object SegLabel @313
-					    Parent_View 	@311
-					    location   	(943, 1965)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$56" @314
-					Parent_View 	@310
-					location   	(-14, 1191)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C4682960118"
-					client     	@310
-					supplier   	@299
-					vertices   	(list Points
-					    (322, 1911)
-					    (229, 1911)
-					    (229, 1313))
-					line_style 	3
-					origin_attachment 	(322, 1911)
-					terminal_attachment 	(229, 1313))))
-			    (object ClassView "Class" "Logical View::wsdl::Types" @315
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(800, 608)
-				label      	(object ItemLabel
-				    Parent_View 	@315
-				    location   	(615, 512)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	371
-				    justify    	0
-				    label      	"Types")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B8BE9A603A8"
-				width      	389
-				height     	216
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Definition" @316
-				ShowCompartmentStereotypes 	TRUE
-				location   	(176, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@316
-				    location   	(74, 107)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	204
-				    justify    	0
-				    label      	"Definition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5E43F008E"
-				width      	222
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$53" @317
-				location   	(234, 604)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8BEA27029F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eTypes" @318
-					Parent_View 	@317
-					location   	(-150, 396)
-					label      	(object SegLabel @319
-					    Parent_View 	@318
-					    location   	(480, 640)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	207
-					    justify    	0
-					    label      	"+eTypes"
-					    pctDist    	0.661017
-					    height     	36
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8BEA29036A"
-					client     	@317
-					supplier   	@315
-					line_style 	3
-					origin_attachment 	(234, 604)
-					terminal_attachment 	(606, 604)
-					label      	(object SegLabel @320
-					    Parent_View 	@318
-					    location   	(526, 569)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.783883
-					    height     	36
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$54" @321
-					Parent_View 	@317
-					location   	(-150, 396)
-					label      	(object SegLabel @322
-					    Parent_View 	@321
-					    location   	(133, 313)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8BEA290356"
-					client     	@317
-					supplier   	@316
-					vertices   	(list Points
-					    (234, 604)
-					    (174, 604)
-					    (174, 225))
-					line_style 	3
-					origin_attachment 	(234, 604)
-					terminal_attachment 	(174, 225)
-					label      	(object SegLabel @323
-					    Parent_View 	@321
-					    location   	(228, 271)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.897729
-					    height     	54
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::wsdl::ITypes" @324
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(640, 224)
-				label      	(object ItemLabel
-				    Parent_View 	@324
-				    location   	(525, 203)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	230
-				    justify    	0
-				    label      	"ITypes")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@324
-				    location   	(525, 153)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	230
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3CADCBB20050"
-				width      	248
-				height     	166
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::XSDSchemaExtensibilityElement" @325
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1728, 800)
-				label      	(object ItemLabel
-				    Parent_View 	@325
-				    location   	(1359, 753)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	739
-				    justify    	0
-				    label      	"XSDSchemaExtensibilityElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3CC360D7039C"
-				width      	757
-				height     	118
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @326
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1856, 1216)
-				label      	(object ItemLabel
-				    Parent_View 	@326
-				    location   	(1529, 1103)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	655
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	673
-				height     	250
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$59" @327
-				location   	(1826, 975)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3CC3614500F2"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$60" @328
-					Parent_View 	@327
-					location   	(306, 447)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3CC36146023D"
-					client     	@327
-					supplier   	@325
-					line_style 	3
-					origin_attachment 	(1826, 975)
-					terminal_attachment 	(1826, 859)
-					label      	(object SegLabel @329
-					    Parent_View 	@328
-					    location   	(1774, 900)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.656489
-					    height     	53
-					    orientation 	0))
-				    (object RoleView "schema" @330
-					Parent_View 	@327
-					location   	(306, 447)
-					label      	(object SegLabel @331
-					    Parent_View 	@330
-					    location   	(2006, 1033)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+schema"
-					    pctDist    	0.507576
-					    height     	180
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3CC36146023E"
-					client     	@327
-					supplier   	@326
-					line_style 	3
-					origin_attachment 	(1826, 975)
-					terminal_attachment 	(1826, 1091)
-					label      	(object SegLabel @332
-					    Parent_View 	@330
-					    location   	(1788, 1050)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.651515
-					    height     	39
-					    orientation 	1))))
-			    (object InheritView "" @333
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3CADCD3B0380"
-				client     	@315
-				supplier   	@324
-				line_style 	3
-				origin_attachment 	(705, 500)
-				terminal_attachment 	(705, 307))
-			    (object ClassView "Class" "Logical View::wsdl::ExtensibleElement" @334
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1056, 224)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@334
-				    location   	(815, 130)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	482
-				    justify    	0
-				    label      	"ExtensibleElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5FCFA033A"
-				width      	500
-				height     	212
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @335
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8BEB010311"
-				client     	@315
-				supplier   	@334
-				line_style 	3
-				origin_attachment 	(854, 500)
-				terminal_attachment 	(854, 330))
-			    (object ClassView "Class" "Logical View::wsdl::ExtensibilityElement" @336
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(1824, 464)
-				label      	(object ItemLabel
-				    Parent_View 	@336
-				    location   	(1490, 368)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	669
-				    justify    	0
-				    label      	"ExtensibilityElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5DBB602A9"
-				width      	687
-				height     	216
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$21" @337
-				location   	(1206, 493)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5FD130079"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$22" @338
-					Parent_View 	@337
-					location   	(-586, 237)
-					label      	(object SegLabel @339
-					    Parent_View 	@338
-					    location   	(1136, 386)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5FD14019E"
-					client     	@337
-					supplier   	@334
-					vertices   	(list Points
-					    (1206, 493)
-					    (1094, 493)
-					    (1094, 330))
-					line_style 	3
-					origin_attachment 	(1206, 493)
-					terminal_attachment 	(1094, 330)
-					label      	(object SegLabel @340
-					    Parent_View 	@338
-					    location   	(1042, 377)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.828326
-					    height     	53
-					    orientation 	0))
-				    (object RoleView "eExtensibilityElements" @341
-					Parent_View 	@337
-					location   	(-586, 237)
-					label      	(object SegLabel @342
-					    Parent_View 	@341
-					    location   	(1196, 454)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	444
-					    justify    	0
-					    label      	"+eExtensibilityElements"
-					    pctDist    	-0.039711
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5FD14019D"
-					client     	@337
-					supplier   	@336
-					line_style 	3
-					origin_attachment 	(1206, 493)
-					terminal_attachment 	(1481, 493)
-					label      	(object SegLabel @343
-					    Parent_View 	@341
-					    location   	(1415, 546)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.764957
-					    height     	53
-					    orientation 	1)
-					label      	(object SegLabel @344
-					    Parent_View 	@341
-					    location   	(1396, 392)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	146
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.694915
-					    height     	102
-					    orientation 	0))))
-			    (object InheritView "" @345
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3CC3627F00B7"
-				client     	@325
-				supplier   	@336
-				line_style 	3
-				origin_attachment 	(1812, 741)
-				terminal_attachment 	(1812, 572))))
-		    (object ClassDiagram "2.3 Messages"
-			quid       	"3BCE853D02C8"
-			title      	"2.3 Messages"
-			zoom       	85
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::IMessage" @346
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(448, 224)
-				label      	(object ItemLabel
-				    Parent_View 	@346
-				    location   	(267, 122)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	362
-				    justify    	0
-				    label      	"IMessage")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@346
-				    location   	(267, 72)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	362
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A8AF004F"
-				width      	380
-				height     	328
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IPart" @347
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1328, 224)
-				label      	(object ItemLabel
-				    Parent_View 	@347
-				    location   	(1029, 124)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	599
-				    justify    	0
-				    label      	"IPart")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@347
-				    location   	(1029, 74)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	599
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A93F01BE"
-				width      	617
-				height     	324
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::wsdl::Part" @348
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1312, 816)
-				label      	(object ItemLabel
-				    Parent_View 	@348
-				    location   	(1075, 690)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	474
-				    justify    	0
-				    label      	"Part")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5CE1C032E"
-				width      	492
-				height     	276
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @349
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84A96D02F1"
-				client     	@348
-				supplier   	@347
-				line_style 	3
-				origin_attachment 	(1304, 678)
-				terminal_attachment 	(1304, 386))
-			    (object ClassView "Class" "Logical View::wsdl::Message" @350
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(448, 656)
-				label      	(object ItemLabel
-				    Parent_View 	@350
-				    location   	(241, 507)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	414
-				    justify    	0
-				    label      	"Message")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C9590078"
-				compartment 	(object Compartment
-				    Parent_View 	@350
-				    location   	(241, 579)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	30)
-				width      	432
-				height     	322
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @351
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84A8D102BA"
-				client     	@350
-				supplier   	@346
-				line_style 	3
-				origin_attachment 	(445, 495)
-				terminal_attachment 	(445, 388))
-			    (object AssociationViewNew "$UNNAMED$1" @352
-				location   	(688, 952)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5CEBE00E2"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eParts" @353
-					Parent_View 	@352
-					location   	(176, 328)
-					label      	(object SegLabel @354
-					    Parent_View 	@353
-					    location   	(952, 897)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	144
-					    justify    	0
-					    label      	"+eParts"
-					    pctDist    	0.697452
-					    height     	56
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5CEBF0061"
-					client     	@352
-					supplier   	@348
-					line_style 	3
-					origin_attachment 	(688, 952)
-					terminal_attachment 	(1066, 952)
-					label      	(object SegLabel @355
-					    Parent_View 	@353
-					    location   	(987, 1005)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.789809
-					    height     	53
-					    orientation 	1)
-					label      	(object SegLabel @356
-					    Parent_View 	@353
-					    location   	(967, 1061)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	154
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.742038
-					    height     	109
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$2" @357
-					Parent_View 	@352
-					location   	(176, 328)
-					label      	(object SegLabel @358
-					    Parent_View 	@357
-					    location   	(404, 893)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5CEBF0057"
-					client     	@352
-					supplier   	@350
-					vertices   	(list Points
-					    (688, 952)
-					    (445, 952)
-					    (445, 817))
-					line_style 	3
-					origin_attachment 	(688, 952)
-					terminal_attachment 	(445, 817)
-					label      	(object SegLabel @359
-					    Parent_View 	@357
-					    location   	(393, 912)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.747604
-					    height     	53
-					    orientation 	0))))))))
-	    (object Class_Category "xsd"
-		attributes 	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"prefix"
-			value      	"XSD")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"basePackage"
-			value      	"org.eclipse")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsPrefix"
-			value      	"xsd")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsURI"
-			value      	"http://www.eclipse.org/xsd/2002/XSD"))
-		quid       	"39ABDC6F01AA"
-		exportControl 	"Public"
-		logical_models 	(list unit_reference_list
-		    (object Class "XSDAnnotation"
-			quid       	"3B66EDC80233"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B69E1770116"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029")
-			    (object Inheritance_Relationship
-				quid       	"3B7FD4E20366"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDRedefineContent"
-				quidu      	"3B6AE2060172"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "applicationInformation"
-				quid       	"3BBF7EBF02C8"
-				stereotype 	"0..*"
-				type       	"DOMElement"
-				exportControl 	"Public")
-			    (object ClassAttribute "userInformation"
-				quid       	"3BBF7EEA0157"
-				stereotype 	"0..*"
-				type       	"DOMElement"
-				exportControl 	"Public")
-			    (object ClassAttribute "attributes"
-				quid       	"3BBF7F0501E2"
-				stereotype 	"0..*"
-				type       	"DOMAttr"
-				exportControl 	"Public")))
-		    (object Class "XSDAttributeDeclaration"
-			quid       	"3B66ED2E0192"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B69B7DC0193"
-				supplier   	"Logical View::xsd::XSDFeature"
-				quidu      	"3B69B537026C")
-			    (object Inheritance_Relationship
-				quid       	"3B688E6103BE"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDSchemaContent"
-				quidu      	"3B688CB800BA"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "attributeDeclarationReference"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C287F5202B4"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDAttributeGroupContent"
-			quid       	"3B6940200089"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B72D8E200EA"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"))
-			abstract   	TRUE)
-		    (object Class "XSDAttributeGroupDefinition"
-			quid       	"3B66ED840290"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B69403A0221"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDAttributeGroupContent"
-				quidu      	"3B6940200089")
-			    (object Inheritance_Relationship
-				quid       	"3B6AE2EB02A8"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDRedefineContent"
-				quidu      	"3B6AE2060172")
-			    (object Inheritance_Relationship
-				quid       	"3B7FCAC800D2"
-				supplier   	"Logical View::xsd::XSDRedefinableComponent"
-				quidu      	"3B7FCA8B020B"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "attributeGroupDefinitionReference"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C287F7B0386"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDAttributeUse"
-			quid       	"3B68354601A8"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B72D737038F"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDAttributeGroupContent"
-				quidu      	"3B6940200089")
-			    (object Inheritance_Relationship
-				quid       	"3B72D7BB0349"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "required"
-				quid       	"3B69CCF3027D"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "value"
-				quid       	"3B69CDDB03B7"
-				type       	"Value"
-				exportControl 	"Public")
-			    (object ClassAttribute "constraint"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69CDE002D8"
-				type       	"XSDConstraint"
-				exportControl 	"Public")
-			    (object ClassAttribute "use"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA7B0220382"
-				type       	"XSDAttributeUseCategory"
-				exportControl 	"Public")
-			    (object ClassAttribute "lexicalValue"
-				quid       	"3C2719D90341"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDBoundedFacet"
-			quid       	"3B6C751D0344"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C763C0224"
-				supplier   	"Logical View::xsd::XSDFundamentalFacet"
-				quidu      	"3B6C69E801D6"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C752A00CC"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDCardinalityFacet"
-			quid       	"3B6C755D03D2"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C764F0131"
-				supplier   	"Logical View::xsd::XSDFundamentalFacet"
-				quidu      	"3B6C69E801D6"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C756C0153"
-				type       	"XSDCardinality"
-				exportControl 	"Public")))
-		    (object Class "XSDComplexTypeContent"
-			quid       	"3B683BA00196"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6848B80286"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029"))
-			abstract   	TRUE)
-		    (object Class "XSDComplexTypeDefinition"
-			quid       	"3B682B82031A"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B69BAA20310"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDScope"
-				quidu      	"3B69B54000F2")
-			    (object Inheritance_Relationship
-				quid       	"3BA0D01901F1"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "derivationMethod"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69C6E4020E"
-				type       	"XSDDerivationMethod"
-				initv      	"restriction"
-				exportControl 	"Public")
-			    (object ClassAttribute "final"
-				quid       	"3B69C71D026A"
-				stereotype 	"0..*"
-				type       	"XSDComplexFinal"
-				exportControl 	"Public")
-			    (object ClassAttribute "abstract"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69C73800C5"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "contentTypeCategory"
-				quid       	"3B69CA4202B8"
-				type       	"XSDContentTypeCategory"
-				exportControl 	"Public")
-			    (object ClassAttribute "prohibitedSubstitutions"
-				quid       	"3B69CB8A03E6"
-				stereotype 	"0..*"
-				type       	"XSDProhibitedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "lexicalFinal"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0F618014D"
-				stereotype 	"0..*"
-				type       	"XSDComplexFinal"
-				exportControl 	"Public")
-			    (object ClassAttribute "block"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0FB97006E"
-				stereotype 	"0..*"
-				type       	"XSDProhibitedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "mixed"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3C31AF5E03A6"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDComponent"
-			quid       	"3B6846E90029"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3BA0CEA903D2"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"))
-			abstract   	TRUE)
-		    (object Class "XSDConcreteComponent"
-			quid       	"3B6AD7B40065"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "element"
-				quid       	"3B6ADDB501A5"
-				type       	"DOMElement"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDConstrainingFacet"
-			quid       	"3B6C6B340093"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C6C800394"
-				supplier   	"Logical View::xsd::XSDFacet"
-				quidu      	"3B6C359403D2"))
-			abstract   	TRUE)
-		    (object Class "XSDDiagnostic"
-			quid       	"3BFE5F910046"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3D4C0F4C01A1"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "severity"
-				quid       	"3BFE691C005D"
-				type       	"XSDDiagnosticSeverity"
-				exportControl 	"Public")
-			    (object ClassAttribute "message"
-				quid       	"3BFE5FDD0280"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "locationURI"
-				quid       	"3C063743016B"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "line"
-				quid       	"3BFE607E0213"
-				type       	"int"
-				initv      	"1"
-				exportControl 	"Public")
-			    (object ClassAttribute "column"
-				quid       	"3BFE611E0296"
-				type       	"int"
-				initv      	"1"
-				exportControl 	"Public")
-			    (object ClassAttribute "node"
-				quid       	"3C016B6B0200"
-				type       	"DOMNode"
-				exportControl 	"Public")
-			    (object ClassAttribute "annotationURI"
-				quid       	"3C06374F0186"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDElementDeclaration"
-			quid       	"3B66ED580214"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B69EDEE01BF"
-				supplier   	"Logical View::xsd::XSDFeature"
-				quidu      	"3B69B537026C")
-			    (object Inheritance_Relationship
-				quid       	"3B685F17002E"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDTerm"
-				quidu      	"3B683C5E0174")
-			    (object Inheritance_Relationship
-				quid       	"3B688E660339"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDSchemaContent"
-				quidu      	"3B688CB800BA"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "nillable"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69BFB4029F"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "disallowedSubstitutions"
-				quid       	"3B69C4680368"
-				stereotype 	"0..*"
-				type       	"XSDDisallowedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "substitutionGroupExclusions"
-				quid       	"3B69C4A003B9"
-				stereotype 	"0..*"
-				type       	"XSDSubstitutionGroupExclusions"
-				exportControl 	"Public")
-			    (object ClassAttribute "abstract"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69C4E0000E"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "lexicalFinal"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0D14C00B2"
-				stereotype 	"0..*"
-				type       	"XSDProhibitedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "block"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0D16801C1"
-				stereotype 	"0..*"
-				type       	"XSDDisallowedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "elementDeclarationReference"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C289F6203CF"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "circular"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C34DCB00018"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDEnumerationFacet"
-			quid       	"3B6C6ACE0141"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C6C9D03C7"
-				supplier   	"Logical View::xsd::XSDRepeatableFacet"
-				quidu      	"3B6C6AA6031A"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C7C640054"
-				stereotype 	"0..*"
-				type       	"Value"
-				exportControl 	"Public")))
-		    (object Class "XSDFacet"
-			quid       	"3B6C359403D2"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6D25680259"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "lexicalValue"
-				quid       	"3B6C73740253"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "facetName"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C289FB401EC"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "effectiveValue"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28AAE303B6"
-				type       	"Value"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDFeature"
-			quid       	"3B69B537026C"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3C290A2C0307"
-				supplier   	"Logical View::xsd::XSDNamedComponent"
-				quidu      	"3B6846D303A4"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B69BF81020F"
-				type       	"Value"
-				exportControl 	"Public")
-			    (object ClassAttribute "constraint"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69BF8800C5"
-				type       	"XSDConstraint"
-				exportControl 	"Public")
-			    (object ClassAttribute "form"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B9F902B033E"
-				type       	"XSDForm"
-				exportControl 	"Public")
-			    (object ClassAttribute "lexicalValue"
-				quid       	"3C271A1B016F"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "global"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A0070372"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "featureReference"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A0440185"
-				type       	"boolean"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDFixedFacet"
-			quid       	"3B6C699E00C1"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C6C8801B4"
-				supplier   	"Logical View::xsd::XSDConstrainingFacet"
-				quidu      	"3B6C6B340093"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "fixed"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B6C6A600201"
-				type       	"boolean"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDFractionDigitsFacet"
-			quid       	"3B6C79BE02EE"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B990016"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C79D2008A"
-				type       	"int"
-				exportControl 	"Public")))
-		    (object Class "XSDFundamentalFacet"
-			quid       	"3B6C69E801D6"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C6C7B0396"
-				supplier   	"Logical View::xsd::XSDFacet"
-				quidu      	"3B6C359403D2"))
-			abstract   	TRUE)
-		    (object Class "XSDIdentityConstraintDefinition"
-			quid       	"3B682B2603A2"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B684AA30242"
-				supplier   	"Logical View::xsd::XSDNamedComponent"
-				quidu      	"3B6846D303A4"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "identityConstraintCategory"
-				quid       	"3B69D1C70143"
-				type       	"XSDIdentityConstraintCategory"
-				exportControl 	"Public")))
-		    (object Class "XSDImport"
-			quid       	"3B688C93017F"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AD8D9003E"
-				supplier   	"Logical View::xsd::XSDSchemaDirective"
-				quidu      	"3B6AD8A202A2"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "namespace"
-				quid       	"3B6ADB15036C"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDInclude"
-			quid       	"3B688C7D0250"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AD8DC0381"
-				supplier   	"Logical View::xsd::XSDSchemaCompositor"
-				quidu      	"3C21DB4102AE")))
-		    (object Class "XSDLengthFacet"
-			quid       	"3B6C776200E7"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C778002DF"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C776C004B"
-				type       	"int"
-				exportControl 	"Public")))
-		    (object Class "XSDMaxExclusiveFacet"
-			quid       	"3B6C789600C2"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B8E0309"
-				supplier   	"Logical View::xsd::XSDMaxFacet"
-				quidu      	"3C0A1CEB010E")))
-		    (object Class "XSDMaxFacet"
-			quid       	"3C0A1CEB010E"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3C0A1D3103AD"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3C0A1EE201F7"
-				type       	"Value"
-				exportControl 	"Public")
-			    (object ClassAttribute "inclusive"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A174027D"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "exclusive"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A1930354"
-				type       	"boolean"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDMaxInclusiveFacet"
-			quid       	"3B6C787D00DA"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B8303B8"
-				supplier   	"Logical View::xsd::XSDMaxFacet"
-				quidu      	"3C0A1CEB010E")))
-		    (object Class "XSDMaxLengthFacet"
-			quid       	"3B6C77C70146"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B7D00FC"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C77DA00F3"
-				type       	"int"
-				exportControl 	"Public")))
-		    (object Class "XSDMinExclusiveFacet"
-			quid       	"3B6C792D000A"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B590281"
-				supplier   	"Logical View::xsd::XSDMinFacet"
-				quidu      	"3C0A1CDE037C")))
-		    (object Class "XSDMinFacet"
-			quid       	"3C0A1CDE037C"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3C0A1D240098"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3C0A1ED10398"
-				type       	"Value"
-				exportControl 	"Public")
-			    (object ClassAttribute "inclusive"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A1A2008E"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "exclusive"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A1BE03E2"
-				type       	"boolean"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDMinInclusiveFacet"
-			quid       	"3B6C788702C9"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B520353"
-				supplier   	"Logical View::xsd::XSDMinFacet"
-				quidu      	"3C0A1CDE037C")))
-		    (object Class "XSDMinLengthFacet"
-			quid       	"3B6C778C0065"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C77C400C0"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C7799015E"
-				type       	"int"
-				exportControl 	"Public")))
-		    (object Class "XSDModelGroup"
-			quid       	"3B6834E00291"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B684A640279"
-				supplier   	"Logical View::xsd::XSDTerm"
-				quidu      	"3B683C5E0174"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "compositor"
-				quid       	"3B69CF1D01CF"
-				type       	"XSDCompositor"
-				exportControl 	"Public")))
-		    (object Class "XSDModelGroupDefinition"
-			quid       	"3B66ED9A0205"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AE2E20381"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDRedefineContent"
-				quidu      	"3B6AE2060172")
-			    (object Inheritance_Relationship
-				quid       	"3B6BD2550385"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDParticleContent"
-				quidu      	"3B6BD22300C6")
-			    (object Inheritance_Relationship
-				quid       	"3B7FCAC40090"
-				supplier   	"Logical View::xsd::XSDRedefinableComponent"
-				quidu      	"3B7FCA8B020B"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "modelGroupDefinitionReference"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A1F602E8"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDNamedComponent"
-			quid       	"3B6846D303A4"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3BA0CEA20197"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3B6847000142"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "targetNamespace"
-				quid       	"3B684704031E"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "aliasName"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A57F0127"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "uRI"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A58700E2"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "aliasURI"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A5AA02AF"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "qName"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C290963025E"
-				type       	"String"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDNotationDeclaration"
-			quid       	"3B66EDAA021C"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B68494302F1"
-				supplier   	"Logical View::xsd::XSDNamedComponent"
-				quidu      	"3B6846D303A4")
-			    (object Inheritance_Relationship
-				quid       	"3B688E4F023C"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDSchemaContent"
-				quidu      	"3B688CB800BA"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "systemIdentifier"
-				quid       	"3B69D32E00F0"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "publicIdentifier"
-				quid       	"3B69D3340397"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDNumericFacet"
-			quid       	"3B6C75950206"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C76420074"
-				supplier   	"Logical View::xsd::XSDFundamentalFacet"
-				quidu      	"3B6C69E801D6"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C75A30012"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDOrderedFacet"
-			quid       	"3B6C74DD0248"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7659012C"
-				supplier   	"Logical View::xsd::XSDFundamentalFacet"
-				quidu      	"3B6C69E801D6"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C74F602DA"
-				type       	"XSDOrdered"
-				exportControl 	"Public")))
-		    (object Class "XSDParticle"
-			quid       	"3B682BBD01F7"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6848FC01E7"
-				supplier   	"Logical View::xsd::XSDComplexTypeContent"
-				quidu      	"3B683BA00196"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "minOccurs"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69CF8E03B2"
-				type       	"int"
-				initv      	"1"
-				exportControl 	"Public")
-			    (object ClassAttribute "maxOccurs"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69CF9903AE"
-				type       	"int"
-				initv      	"1"
-				exportControl 	"Public")))
-		    (object Class "XSDParticleContent"
-			quid       	"3B6BD22300C6"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B780BD90059"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"))
-			abstract   	TRUE)
-		    (object Class "XSDPatternFacet"
-			quid       	"3B6C6ADB026C"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C6CA5038D"
-				supplier   	"Logical View::xsd::XSDRepeatableFacet"
-				quidu      	"3B6C6AA6031A"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C7C790311"
-				stereotype 	"0..*"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDRedefinableComponent"
-			quid       	"3B7FCA8B020B"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B7FD4BA023C"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDRedefineContent"
-				quidu      	"3B6AE2060172")
-			    (object Inheritance_Relationship
-				quid       	"3C290A26036D"
-				supplier   	"Logical View::xsd::XSDNamedComponent"
-				quidu      	"3B6846D303A4"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "circular"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A6800216"
-				type       	"boolean"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDRedefineContent"
-			quid       	"3B6AE2060172"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AE2B301D5"
-				supplier   	"Logical View::xsd::XSDSchemaContent"
-				quidu      	"3B688CB800BA"))
-			abstract   	TRUE)
-		    (object Class "XSDRedefine"
-			quid       	"3B688C9B02AD"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3C21DB640240"
-				supplier   	"Logical View::xsd::XSDSchemaCompositor"
-				quidu      	"3C21DB4102AE")))
-		    (object Class "XSDRepeatableFacet"
-			quid       	"3B6C6AA6031A"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C6C8F002E"
-				supplier   	"Logical View::xsd::XSDConstrainingFacet"
-				quidu      	"3B6C6B340093"))
-			abstract   	TRUE)
-		    (object Class "XSDSchema"
-			quid       	"374B182500BB"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B7FCC4A0182"
-				supplier   	"Logical View::xsd::XSDScope"
-				quidu      	"3B69B54000F2"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "document"
-				quid       	"3C2784E503DD"
-				type       	"DOMDocument"
-				exportControl 	"Public")
-			    (object ClassAttribute "schemaLocation"
-				quid       	"3B6868EC0226"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "targetNamespace"
-				quid       	"3B9F9BFF0180"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "attributeFormDefault"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B9F904B0102"
-				type       	"XSDForm"
-				initv      	"unqualified"
-				exportControl 	"Public")
-			    (object ClassAttribute "elementFormDefault"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B9F907800AC"
-				type       	"XSDForm"
-				initv      	"unqualified"
-				exportControl 	"Public")
-			    (object ClassAttribute "finalDefault"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0C4A70038"
-				stereotype 	"0..*"
-				type       	"XSDProhibitedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "blockDefault"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0F59D02D8"
-				stereotype 	"0..*"
-				type       	"XSDDisallowedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "version"
-				quid       	"3D22D6D80356"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDSchemaCompositor"
-			quid       	"3C21DB4102AE"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3C21DB560092"
-				supplier   	"Logical View::xsd::XSDSchemaDirective"
-				quidu      	"3B6AD8A202A2"))
-			abstract   	TRUE)
-		    (object Class "XSDSchemaContent"
-			quid       	"3B688CB800BA"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AD8E60372"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"))
-			abstract   	TRUE)
-		    (object Class "XSDSchemaDirective"
-			quid       	"3B6AD8A202A2"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AE32102AF"
-				supplier   	"Logical View::xsd::XSDSchemaContent"
-				quidu      	"3B688CB800BA"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "schemaLocation"
-				quid       	"3B6AD9B30330"
-				type       	"String"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDScope"
-			quid       	"3B69B54000F2"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B7FCD640231"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029"))
-			abstract   	TRUE)
-		    (object Class "XSDSimpleTypeDefinition"
-			quid       	"3B682BA7005D"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B684A1302A2"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9")
-			    (object Inheritance_Relationship
-				quid       	"3B685F55032B"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDComplexTypeContent"
-				quidu      	"3B683BA00196"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "variety"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B6C315800A9"
-				type       	"XSDVariety"
-				exportControl 	"Public")
-			    (object ClassAttribute "final"
-				quid       	"3B6D544F0146"
-				stereotype 	"0..*"
-				type       	"XSDSimpleFinal"
-				exportControl 	"Public")
-			    (object ClassAttribute "lexicalFinal"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0F65E035A"
-				stereotype 	"0..*"
-				type       	"XSDSimpleFinal"
-				exportControl 	"Public")
-			    (object ClassAttribute "validFacets"
-				quid       	"3C28AB0F00B6"
-				stereotype 	"0..*"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDTerm"
-			quid       	"3B683C5E0174"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6848AA01D3"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029")
-			    (object Inheritance_Relationship
-				quid       	"3B6BD2440069"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDParticleContent"
-				quidu      	"3B6BD22300C6"))
-			abstract   	TRUE)
-		    (object Class "XSDTotalDigitsFacet"
-			quid       	"3B6C79A0020E"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B610337"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C79AB0232"
-				type       	"int"
-				exportControl 	"Public")))
-		    (object Class "XSDTypeDefinition"
-			quid       	"3B66ECD302A9"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AE2F5013A"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDRedefineContent"
-				quidu      	"3B6AE2060172")
-			    (object Inheritance_Relationship
-				quid       	"3B7FCAB1004D"
-				supplier   	"Logical View::xsd::XSDRedefinableComponent"
-				quidu      	"3B7FCA8B020B"))
-			abstract   	TRUE)
-		    (object Class "XSDWhiteSpaceFacet"
-			quid       	"3B6C784601B7"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C78620045"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C78500201"
-				type       	"XSDWhiteSpace"
-				exportControl 	"Public")))
-		    (object Class "XSDWildcard"
-			quid       	"3B6838370031"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B684A3A0041"
-				supplier   	"Logical View::xsd::XSDTerm"
-				quidu      	"3B683C5E0174"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "namespaceConstraintCategory"
-				quid       	"3B69D0E9019E"
-				type       	"XSDNamespaceConstraintCategory"
-				exportControl 	"Public")
-			    (object ClassAttribute "namespaceConstraint"
-				quid       	"3B97CF860223"
-				stereotype 	"0..*"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "processContents"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69D12E01E4"
-				type       	"XSDProcessContents"
-				exportControl 	"Public")
-			    (object ClassAttribute "lexicalNamespaceConstraint"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA7BDB701F9"
-				stereotype 	"0..*"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDXPathDefinition"
-			quid       	"3B6D83BB0355"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6D84F70092"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "variety"
-				quid       	"3B6D901503DE"
-				type       	"XSDXPathVariety"
-				exportControl 	"Public")
-			    (object ClassAttribute "value"
-				quid       	"3B7BBBE101B1"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "DOMAttr"
-			quid       	"3BBF8C8901B6"
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "org.w3c.dom.Attr"
-				quid       	"3BBF8CB000D5"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Class "DOMDocument"
-			quid       	"3C27850E0381"
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "org.w3c.dom.Document"
-				quid       	"3C27851B03C6"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Class "DOMElement"
-			quid       	"3B8189790200"
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "org.w3c.dom.Element"
-				quid       	"3B8189DB0374"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Class "DOMNode"
-			quid       	"3BFE64A50117"
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "org.w3c.dom.Node"
-				quid       	"3BFE65BF002D"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Class "Value"
-			quid       	"3C040B5B031F"
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "java.lang.Object"
-				quid       	"3C040B8D03D5"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Class "XSDAttributeUseCategory"
-			quid       	"3BA7B0E801A8"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "optional"
-				quid       	"3BA7B11502B7"
-				exportControl 	"Public")
-			    (object ClassAttribute "prohibited"
-				quid       	"3BA7B12202D3"
-				exportControl 	"Public")
-			    (object ClassAttribute "required"
-				quid       	"3BA7B12902F0"
-				exportControl 	"Public")))
-		    (object Class "XSDCardinality"
-			quid       	"3BC7715D009B"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "finite"
-				quid       	"3BC771DC02ED"
-				exportControl 	"Public")
-			    (object ClassAttribute "countablyInfinite"
-				quid       	"3BC771EC0141"
-				exportControl 	"Public")))
-		    (object Class "XSDComplexFinal"
-			quid       	"3B97C2CA01CB"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "extension"
-				quid       	"3B97C2E700DA"
-				exportControl 	"Public")
-			    (object ClassAttribute "restriction"
-				quid       	"3B97C2EA016A"
-				exportControl 	"Public")
-			    (object ClassAttribute "all"
-				quid       	"3BA0F6D20112"
-				exportControl 	"Public")))
-		    (object Class "XSDCompositor"
-			quid       	"3B869B620037"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "all"
-				quid       	"3B869BD00003"
-				exportControl 	"Public")
-			    (object ClassAttribute "choice"
-				quid       	"3B869CB8011E"
-				exportControl 	"Public")
-			    (object ClassAttribute "sequence"
-				quid       	"3B869CE50057"
-				exportControl 	"Public")))
-		    (object Class "XSDConstraint"
-			quid       	"3B869E2601AE"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "default"
-				quid       	"3B869E8E0258"
-				exportControl 	"Public")
-			    (object ClassAttribute "fixed"
-				quid       	"3B869E990271"
-				exportControl 	"Public")))
-		    (object Class "XSDContentTypeCategory"
-			quid       	"3B86A79F03A2"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "empty"
-				quid       	"3B86A7CD02F0"
-				exportControl 	"Public")
-			    (object ClassAttribute "simple"
-				quid       	"3B86A7D100CE"
-				exportControl 	"Public")
-			    (object ClassAttribute "mixed"
-				quid       	"3B86A7D301B7"
-				exportControl 	"Public")
-			    (object ClassAttribute "elementOnly"
-				quid       	"3B86A7D702E9"
-				exportControl 	"Public")))
-		    (object Class "XSDDerivationMethod"
-			quid       	"3B86A0B000CE"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "extension"
-				quid       	"3B86A0C80329"
-				exportControl 	"Public")
-			    (object ClassAttribute "restriction"
-				quid       	"3B86A0CC0162"
-				exportControl 	"Public")))
-		    (object Class "XSDDiagnosticSeverity"
-			quid       	"3BFE68A7032F"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "fatal"
-				quid       	"3BFE68C303D0"
-				exportControl 	"Public")
-			    (object ClassAttribute "error"
-				quid       	"3BFE68E700E3"
-				exportControl 	"Public")
-			    (object ClassAttribute "warning"
-				quid       	"3BFE68EA01FF"
-				exportControl 	"Public")
-			    (object ClassAttribute "information"
-				quid       	"3BFE7FC2019A"
-				exportControl 	"Public")))
-		    (object Class "XSDDisallowedSubstitutions"
-			quid       	"3B97C5A403DF"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "substitution"
-				quid       	"3B97C6790045"
-				exportControl 	"Public")
-			    (object ClassAttribute "extension"
-				quid       	"3B97C67F01AC"
-				exportControl 	"Public")
-			    (object ClassAttribute "restriction"
-				quid       	"3B97C683020B"
-				exportControl 	"Public")
-			    (object ClassAttribute "all"
-				quid       	"3BA0F2450069"
-				exportControl 	"Public")))
-		    (object Class "XSDForm"
-			quid       	"3B9F913B01EB"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "qualified"
-				quid       	"3B9F916F0023"
-				exportControl 	"Public")
-			    (object ClassAttribute "unqualified"
-				quid       	"3B9F918C007F"
-				exportControl 	"Public")))
-		    (object Class "XSDIdentityConstraintCategory"
-			quid       	"3B86A1E00272"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "key"
-				quid       	"3B86A2120085"
-				exportControl 	"Public")
-			    (object ClassAttribute "keyref"
-				quid       	"3B86A213014F"
-				exportControl 	"Public")
-			    (object ClassAttribute "unique"
-				quid       	"3B86A2160365"
-				exportControl 	"Public")))
-		    (object Class "XSDNamespaceConstraintCategory"
-			quid       	"3B97C5EA0023"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "any"
-				quid       	"3B97D0600034"
-				exportControl 	"Public")
-			    (object ClassAttribute "not"
-				quid       	"3B97D062005F"
-				exportControl 	"Public")
-			    (object ClassAttribute "set"
-				quid       	"3B97D0650117"
-				exportControl 	"Public")))
-		    (object Class "XSDOrdered"
-			quid       	"3BC7715202E4"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "false"
-				quid       	"3BC771A90271"
-				exportControl 	"Public")
-			    (object ClassAttribute "partial"
-				quid       	"3BC771BB01FF"
-				exportControl 	"Public")
-			    (object ClassAttribute "total"
-				quid       	"3BC771C401B2"
-				exportControl 	"Public")))
-		    (object Class "XSDProcessContents"
-			quid       	"3B8FF8C70284"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "strict"
-				quid       	"3B8FF8F80045"
-				exportControl 	"Public")
-			    (object ClassAttribute "lax"
-				quid       	"3B8FF8F6038B"
-				exportControl 	"Public")
-			    (object ClassAttribute "skip"
-				quid       	"3B8FF8E802BA"
-				exportControl 	"Public")))
-		    (object Class "XSDProhibitedSubstitutions"
-			quid       	"3B97C5BE0272"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "extension"
-				quid       	"3B97C68B00B8"
-				exportControl 	"Public")
-			    (object ClassAttribute "restriction"
-				quid       	"3B97C6940291"
-				exportControl 	"Public")
-			    (object ClassAttribute "all"
-				quid       	"3BA0F2500295"
-				exportControl 	"Public")))
-		    (object Class "XSDSimpleFinal"
-			quid       	"3B97C25D0295"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "list"
-				quid       	"3B97C2810230"
-				exportControl 	"Public")
-			    (object ClassAttribute "restriction"
-				quid       	"3B97C2830138"
-				exportControl 	"Public")
-			    (object ClassAttribute "union"
-				quid       	"3B97C288024E"
-				exportControl 	"Public")
-			    (object ClassAttribute "all"
-				quid       	"3BA0F6E00374"
-				exportControl 	"Public")))
-		    (object Class "XSDSubstitutionGroupExclusions"
-			quid       	"3B97C59100AE"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "extension"
-				quid       	"3B97C6640231"
-				exportControl 	"Public")
-			    (object ClassAttribute "restriction"
-				quid       	"3B97C66D0216"
-				exportControl 	"Public")))
-		    (object Class "XSDVariety"
-			quid       	"3B8FF7730249"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "atomic"
-				quid       	"3B8FF7A702DF"
-				exportControl 	"Public")
-			    (object ClassAttribute "list"
-				quid       	"3B8FF7AD0139"
-				exportControl 	"Public")
-			    (object ClassAttribute "union"
-				quid       	"3B8FF7AF039F"
-				exportControl 	"Public")))
-		    (object Class "XSDWhiteSpace"
-			quid       	"3BEED0F60342"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "preserve"
-				quid       	"3BEED10F0117"
-				exportControl 	"Public")
-			    (object ClassAttribute "replace"
-				quid       	"3BEED127034D"
-				exportControl 	"Public")
-			    (object ClassAttribute "collapse"
-				quid       	"3BEED1290396"
-				exportControl 	"Public")))
-		    (object Class "XSDXPathVariety"
-			quid       	"3B8FFB89033A"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "selector"
-				quid       	"3B8FFBAC0192"
-				exportControl 	"Public")
-			    (object ClassAttribute "field"
-				quid       	"3B8FFBB30278"
-				exportControl 	"Public")))
-		    (object Association "$UNNAMED$65"
-			quid       	"3C626EA70102"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$66"
-				quid       	"3C626EA90191"
-				supplier   	"Logical View::xsd::XSDRepeatableFacet"
-				quidu      	"3B6C6AA6031A"
-				is_aggregate 	TRUE)
-			    (object Role "annotations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C626EA90192"
-				label      	"annotations"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$67"
-			quid       	"3B69DADC02F5"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$68"
-				quid       	"3B69DADD0238"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DADD0242"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$69"
-			quid       	"3B6890D6006F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$70"
-				quid       	"3B6890D6030E"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				is_aggregate 	TRUE)
-			    (object Role "anonymousTypeDefinition"
-				quid       	"3B6890D60318"
-				label      	"anonymousTypeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$71"
-			quid       	"3B68356B02CB"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$72"
-				quid       	"3B68356D00A6"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				is_aggregate 	TRUE)
-			    (object Role "typeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B68356D00A7"
-				label      	"typeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$73"
-			quid       	"3B6B426B0194"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$74"
-				quid       	"3B6B426D0309"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				is_aggregate 	TRUE)
-			    (object Role "resolvedAttributeDeclaration"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6B426D0313"
-				label      	"resolvedAttributeDeclaration"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$75"
-			quid       	"3B69DB060291"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$76"
-				quid       	"3B69DB070171"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB070172"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$77"
-			quid       	"3B69404E0067"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$78"
-				quid       	"3B694050029B"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "contents"
-				quid       	"3B69405002A5"
-				label      	"contents"
-				supplier   	"Logical View::xsd::XSDAttributeGroupContent"
-				quidu      	"3B6940200089"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$79"
-			quid       	"3B68359F0086"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$80"
-				quid       	"3B6835A00069"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "attributeUses"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6835A0006A"
-				label      	"attributeUses"
-				supplier   	"Logical View::xsd::XSDAttributeUse"
-				quidu      	"3B68354601A8"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$81"
-			quid       	"3C275D320220"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$82"
-				quid       	"3C275D3C010C"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "attributeWildcardContent"
-				quid       	"3C275D3C010D"
-				label      	"attributeWildcardContent"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$83"
-			quid       	"3B6887BF0150"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$84"
-				quid       	"3B6887C000A7"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "attributeWildcard"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6887C000A8"
-				label      	"attributeWildcard"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$85"
-			quid       	"3B6B425E01F9"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$86"
-				quid       	"3B6B42620046"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "resolvedAttributeGroupDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6B42620050"
-				label      	"resolvedAttributeGroupDefinition"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$87"
-			quid       	"3B683585010D"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$88"
-				quid       	"3B68358600FA"
-				supplier   	"Logical View::xsd::XSDAttributeUse"
-				quidu      	"3B68354601A8"
-				is_aggregate 	TRUE)
-			    (object Role "attributeDeclaration"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B68358600FB"
-				label      	"attributeDeclaration"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$89"
-			quid       	"3B6F1DE9018A"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$90"
-				quid       	"3B6F1DEA036C"
-				supplier   	"Logical View::xsd::XSDAttributeUse"
-				quidu      	"3B68354601A8"
-				is_aggregate 	TRUE)
-			    (object Role "content"
-				quid       	"3B6F1DEA0380"
-				label      	"content"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$91"
-			quid       	"3B90068801C2"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$92"
-				quid       	"3B90068A0111"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "contentAnnotation"
-				quid       	"3B90068A011B"
-				label      	"contentAnnotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$93"
-			quid       	"3B6833350340"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$94"
-				quid       	"3B683336028D"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "baseTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B683336028E"
-				label      	"baseTypeDefinition"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$95"
-			quid       	"3B6FDDD70113"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$96"
-				quid       	"3B6FDDDA026B"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "content"
-				quid       	"3B6FDDDA0275"
-				label      	"content"
-				supplier   	"Logical View::xsd::XSDComplexTypeContent"
-				quidu      	"3B683BA00196"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$97"
-			quid       	"3B6837DF024F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$98"
-				quid       	"3B6837E100FD"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "contentType"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6837E100FE"
-				label      	"contentType"
-				supplier   	"Logical View::xsd::XSDComplexTypeContent"
-				quidu      	"3B683BA00196"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$99"
-			quid       	"3B683959006E"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$100"
-				quid       	"3B6839590349"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "attributeUses"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B683959034A"
-				label      	"attributeUses"
-				supplier   	"Logical View::xsd::XSDAttributeUse"
-				quidu      	"3B68354601A8"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$101"
-			quid       	"3B698E360386"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$102"
-				quid       	"3B698E380072"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "attributeContents"
-				quid       	"3B698E38007C"
-				label      	"attributeContents"
-				supplier   	"Logical View::xsd::XSDAttributeGroupContent"
-				quidu      	"3B6940200089"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$103"
-			quid       	"3B6851BA0126"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$104"
-				quid       	"3B6851BB0150"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "attributeWildcard"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6851BB0151"
-				label      	"attributeWildcard"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$105"
-			quid       	"3B751B0803C7"
-			roles      	(list role_list
-			    (object Role "container"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3B751B0C01CE"
-				label      	"container"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$106"
-				attributes 	(list Attribute_Set)
-				quid       	"3B751B0C01CF"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065")))
-		    (object Association "$UNNAMED$107"
-			quid       	"3B751B480261"
-			roles      	(list role_list
-			    (object Role "rootContainer"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3B751B4C0285"
-				label      	"rootContainer"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$108"
-				attributes 	(list Attribute_Set)
-				quid       	"3B751B4C0286"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065")))
-		    (object Association "$UNNAMED$109"
-			quid       	"3B751C310356"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$110"
-				attributes 	(list Attribute_Set)
-				quid       	"3B751C330331"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065")
-			    (object Role "schema"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3B751C33033B"
-				label      	"schema"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$111"
-			quid       	"3B69DB0A0066"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$112"
-				quid       	"3B69DB0B023F"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB0B0249"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$113"
-			quid       	"3B68911401AF"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$114"
-				quid       	"3B6891150016"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				is_aggregate 	TRUE)
-			    (object Role "anonymousTypeDefinition"
-				quid       	"3B6891150017"
-				label      	"anonymousTypeDefinition"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$115"
-			quid       	"3B68338C0058"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$116"
-				quid       	"3B68338C03BF"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				is_aggregate 	TRUE)
-			    (object Role "typeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B68338C03C0"
-				label      	"typeDefinition"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$117"
-			quid       	"3B6833EF0160"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$118"
-				quid       	"3B6833F00298"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				is_aggregate 	TRUE)
-			    (object Role "identityConstraintDefinitions"
-				quid       	"3B6833F00299"
-				label      	"identityConstraintDefinitions"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$119"
-			quid       	"3B6B41E60251"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$120"
-				quid       	"3B6B41EA02F7"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				is_aggregate 	TRUE)
-			    (object Role "resolvedElementDeclaration"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6B41EA030B"
-				label      	"resolvedElementDeclaration"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$121"
-			quid       	"3B69C0590198"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$122"
-				quid       	"3B69C05D01E3"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214")
-			    (object Role "substitutionGroupAffiliation"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B69C05D01ED"
-				label      	"substitutionGroupAffiliation"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$123"
-			quid       	"3C42DBDD0297"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$124"
-				quid       	"3C42DBE0011E"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				is_aggregate 	TRUE)
-			    (object Role "substitutionGroup"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C42DBE00128"
-				label      	"substitutionGroup"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$125"
-			quid       	"3B6D23B901CD"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$126"
-				quid       	"3B6D23BA01C4"
-				supplier   	"Logical View::xsd::XSDFacet"
-				quidu      	"3B6C359403D2"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B6D23BA01CE"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$127"
-			quid       	"3B6D597102EA"
-			roles      	(list role_list
-			    (object Role "simpleTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6D59750105"
-				label      	"simpleTypeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$128"
-				attributes 	(list Attribute_Set)
-				quid       	"3B6D59750119"
-				supplier   	"Logical View::xsd::XSDFacet"
-				quidu      	"3B6C359403D2")))
-		    (object Association "$UNNAMED$129"
-			quid       	"3B69B653017A"
-			roles      	(list role_list
-			    (object Role "scope"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3B69B654006D"
-				label      	"scope"
-				supplier   	"Logical View::xsd::XSDScope"
-				quidu      	"3B69B54000F2"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$130"
-				attributes 	(list Attribute_Set)
-				quid       	"3B69B654006E"
-				supplier   	"Logical View::xsd::XSDFeature"
-				quidu      	"3B69B537026C")))
-		    (object Association "$UNNAMED$131"
-			quid       	"3C29010602D7"
-			roles      	(list role_list
-			    (object Role "resolvedFeature"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C29010B000E"
-				label      	"resolvedFeature"
-				supplier   	"Logical View::xsd::XSDFeature"
-				quidu      	"3B69B537026C"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$132"
-				attributes 	(list Attribute_Set)
-				quid       	"3C29010B0018"
-				supplier   	"Logical View::xsd::XSDFeature"
-				quidu      	"3B69B537026C")))
-		    (object Association "$UNNAMED$133"
-			quid       	"3B69DB0D0183"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$134"
-				quid       	"3B69DB0D033C"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB0D0346"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$135"
-			quid       	"3B69D29E014D"
-			roles      	(list role_list
-			    (object Role "referencedKey"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B69D2A80165"
-				label      	"referencedKey"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$136"
-				attributes 	(list Attribute_Set)
-				quid       	"3B69D2A8016F"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2")))
-		    (object Association "$UNNAMED$137"
-			quid       	"3B6D8D3D003E"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$138"
-				quid       	"3B6D8D3E022A"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2"
-				is_aggregate 	TRUE)
-			    (object Role "selector"
-				quid       	"3B6D8D3E0234"
-				label      	"selector"
-				supplier   	"Logical View::xsd::XSDXPathDefinition"
-				quidu      	"3B6D83BB0355"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$139"
-			quid       	"3B6D8D330025"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$140"
-				quid       	"3B6D8D330365"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2"
-				is_aggregate 	TRUE)
-			    (object Role "fields"
-				quid       	"3B6D8D330379"
-				label      	"fields"
-				supplier   	"Logical View::xsd::XSDXPathDefinition"
-				quidu      	"3B6D83BB0355"
-				client_cardinality 	(value cardinality "1..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$141"
-			quid       	"3B6ADCD802FC"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$142"
-				quid       	"3B6ADCD9018B"
-				supplier   	"Logical View::xsd::XSDImport"
-				quidu      	"3B688C93017F"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B6ADCD9018C"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$143"
-			quid       	"3B6ADCC5007E"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$144"
-				quid       	"3B6ADCC6006B"
-				supplier   	"Logical View::xsd::XSDInclude"
-				quidu      	"3B688C7D0250"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B6ADCC6006C"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$145"
-			quid       	"3B69DB1702C8"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$146"
-				quid       	"3B69DB1803E2"
-				supplier   	"Logical View::xsd::XSDModelGroup"
-				quidu      	"3B6834E00291"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB190004"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$147"
-			quid       	"3B6BCEB102F8"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$148"
-				quid       	"3B6BCEB6001B"
-				supplier   	"Logical View::xsd::XSDModelGroup"
-				quidu      	"3B6834E00291"
-				is_aggregate 	TRUE)
-			    (object Role "contents"
-				quid       	"3B6BCEB60025"
-				label      	"contents"
-				supplier   	"Logical View::xsd::XSDParticle"
-				quidu      	"3B682BBD01F7"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$149"
-			quid       	"3B683606026F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$150"
-				quid       	"3B6836070221"
-				supplier   	"Logical View::xsd::XSDModelGroup"
-				quidu      	"3B6834E00291"
-				is_aggregate 	TRUE)
-			    (object Role "particles"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6836070222"
-				label      	"particles"
-				supplier   	"Logical View::xsd::XSDParticle"
-				quidu      	"3B682BBD01F7"
-				client_cardinality 	(value cardinality "1..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$151"
-			quid       	"3B69DB15008A"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$152"
-				quid       	"3B69DB160096"
-				supplier   	"Logical View::xsd::XSDModelGroupDefinition"
-				quidu      	"3B66ED9A0205"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB1600A0"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$153"
-			quid       	"3B6837AC025A"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$154"
-				quid       	"3B6837AD0338"
-				supplier   	"Logical View::xsd::XSDModelGroupDefinition"
-				quidu      	"3B66ED9A0205"
-				is_aggregate 	TRUE)
-			    (object Role "modelGroup"
-				quid       	"3B6837AD0339"
-				label      	"modelGroup"
-				supplier   	"Logical View::xsd::XSDModelGroup"
-				quidu      	"3B6834E00291"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$155"
-			quid       	"3B6B42450398"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$156"
-				quid       	"3B6B4249038A"
-				supplier   	"Logical View::xsd::XSDModelGroupDefinition"
-				quidu      	"3B66ED9A0205"
-				is_aggregate 	TRUE)
-			    (object Role "resolvedModelGroupDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6B4249039E"
-				label      	"resolvedModelGroupDefinition"
-				supplier   	"Logical View::xsd::XSDModelGroupDefinition"
-				quidu      	"3B66ED9A0205"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$157"
-			quid       	"3B69DB0F0212"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$158"
-				quid       	"3B69DB1000C9"
-				supplier   	"Logical View::xsd::XSDNotationDeclaration"
-				quidu      	"3B66EDAA021C"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB1000D3"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$159"
-			quid       	"3B6B47150119"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$160"
-				quid       	"3B6B471A03AB"
-				supplier   	"Logical View::xsd::XSDParticle"
-				quidu      	"3B682BBD01F7"
-				is_aggregate 	TRUE)
-			    (object Role "content"
-				quid       	"3B6B471A03B5"
-				label      	"content"
-				supplier   	"Logical View::xsd::XSDParticleContent"
-				quidu      	"3B6BD22300C6"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$161"
-			quid       	"3B683C890122"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$162"
-				quid       	"3B683C8A0110"
-				supplier   	"Logical View::xsd::XSDParticle"
-				quidu      	"3B682BBD01F7"
-				is_aggregate 	TRUE)
-			    (object Role "term"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B683C8A0111"
-				label      	"term"
-				supplier   	"Logical View::xsd::XSDTerm"
-				quidu      	"3B683C5E0174"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$163"
-			quid       	"3B6ADE42009A"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$164"
-				quid       	"3B6ADE4302FE"
-				supplier   	"Logical View::xsd::XSDRedefine"
-				quidu      	"3B688C9B02AD"
-				is_aggregate 	TRUE)
-			    (object Role "annotations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6ADE430308"
-				label      	"annotations"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$165"
-			quid       	"3B6AE8240051"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$166"
-				quid       	"3B6AE82602AD"
-				supplier   	"Logical View::xsd::XSDRedefine"
-				quidu      	"3B688C9B02AD"
-				is_aggregate 	TRUE)
-			    (object Role "contents"
-				quid       	"3B6AE82602B7"
-				label      	"contents"
-				supplier   	"Logical View::xsd::XSDRedefineContent"
-				quidu      	"3B6AE2060172"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$167"
-			quid       	"3B688E6B003D"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$168"
-				quid       	"3B688E6C0107"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "contents"
-				quid       	"3B688E6C0111"
-				label      	"contents"
-				supplier   	"Logical View::xsd::XSDSchemaContent"
-				quidu      	"3B688CB800BA"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$169"
-			quid       	"3B66EE8D01BF"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$170"
-				quid       	"3B66EE8E0198"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "elementDeclarations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B66EE8E0199"
-				label      	"elementDeclarations"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$171"
-			quid       	"3B66FDFA00C3"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$172"
-				quid       	"3B66FDFB027D"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "attributeDeclarations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B66FDFB027E"
-				label      	"attributeDeclarations"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$173"
-			quid       	"3B66EE920216"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$174"
-				quid       	"3B66EE93018B"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "attributeGroupDefinitions"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B66EE93018C"
-				label      	"attributeGroupDefinitions"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$175"
-			quid       	"3B66EE760049"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$176"
-				quid       	"3B66EE760374"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "typeDefinitions"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B66EE76037E"
-				label      	"typeDefinitions"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$177"
-			quid       	"3B66EEFF024F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$178"
-				quid       	"3B66EF00025A"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "modelGroupDefinitions"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B66EF000264"
-				label      	"modelGroupDefinitions"
-				supplier   	"Logical View::xsd::XSDModelGroupDefinition"
-				quidu      	"3B66ED9A0205"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$179"
-			quid       	"3BFC2A1701ED"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$180"
-				quid       	"3BFC2A1A0273"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "identityConstraintDefinitions"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3BFC2A1A027D"
-				label      	"identityConstraintDefinitions"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$181"
-			quid       	"3B66EEA7023E"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$182"
-				quid       	"3B66EEA8038A"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "notationDeclarations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B66EEA8038B"
-				label      	"notationDeclarations"
-				supplier   	"Logical View::xsd::XSDNotationDeclaration"
-				quidu      	"3B66EDAA021C"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$183"
-			quid       	"3B69E4560290"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$184"
-				quid       	"3B69E4570165"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "annotations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B69E457016F"
-				label      	"annotations"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$185"
-			quid       	"3B6D5CA50112"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$186"
-				quid       	"3B6D5CA703B4"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "contents"
-				quid       	"3B6D5CA703C8"
-				label      	"contents"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$187"
-			quid       	"3B6C35AD0374"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$188"
-				quid       	"3B6C35AF0006"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "facetContents"
-				quid       	"3B6C35AF0010"
-				label      	"facetContents"
-				supplier   	"Logical View::xsd::XSDConstrainingFacet"
-				quidu      	"3B6C6B340093"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$189"
-			quid       	"3BC8AE0203A8"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$190"
-				quid       	"3BC8AE060051"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "facets"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3BC8AE060065"
-				label      	"facets"
-				supplier   	"Logical View::xsd::XSDConstrainingFacet"
-				quidu      	"3B6C6B340093"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$191"
-			quid       	"3B6C34B70208"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$192"
-				quid       	"3B6C34BE0258"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "memberTypeDefinitions"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6C34BE0259"
-				label      	"memberTypeDefinitions"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$193"
-			quid       	"3B6C363201DB"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$194"
-				quid       	"3B6C36350059"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "fundamentalFacets"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3B6C36350063"
-				label      	"fundamentalFacets"
-				supplier   	"Logical View::xsd::XSDFundamentalFacet"
-				quidu      	"3B6C69E801D6"
-				client_cardinality 	(value cardinality "1..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$195"
-			quid       	"3B6D35AB0273"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$196"
-				quid       	"3B6D35B20291"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "baseTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6D35B202A5"
-				label      	"baseTypeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$197"
-			quid       	"3B6D5572016C"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$198"
-				quid       	"3B6D5575022F"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "primitiveTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6D55750243"
-				label      	"primitiveTypeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$199"
-			quid       	"3B69E2910158"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$200"
-				quid       	"3B69E292019F"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69E29201A9"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$201"
-			quid       	"3B9006CF0088"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$202"
-				quid       	"3B9006D1015D"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				is_aggregate 	TRUE)
-			    (object Role "derivationAnnotation"
-				quid       	"3B9006D10167"
-				label      	"derivationAnnotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$203"
-			quid       	"3B69DB330264"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$204"
-				quid       	"3B69DB340284"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				is_aggregate 	TRUE)
-			    (object Role "annotations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B69DB34028E"
-				label      	"annotations"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$205"
-			quid       	"3B69DB11026F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$206"
-				quid       	"3B69DB1201F9"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB120203"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$207"
-			quid       	"3C626EB30005"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$208"
-				quid       	"3C626EB40327"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				is_aggregate 	TRUE)
-			    (object Role "annotations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C626EB40332"
-				label      	"annotations"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$209"
-			quid       	"3BEBDC870247"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$210"
-				quid       	"3BEBDC8C02F9"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "attributeWildcardContent"
-				quid       	"3BEBDC8C0303"
-				label      	"attributeWildcardContent"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$211"
-			quid       	"3BFE622703CD"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$212"
-				attributes 	(list Attribute_Set)
-				quid       	"3BFE622B0061"
-				supplier   	"Logical View::xsd::XSDDiagnostic"
-				quidu      	"3BFE5F910046")
-			    (object Role "components"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3BFE622B006C"
-				label      	"components"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"
-				client_cardinality 	(value cardinality "1..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$213"
-			quid       	"3BFE62690165"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$214"
-				quid       	"3BFE626A0026"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"
-				is_aggregate 	TRUE)
-			    (object Role "diagnostics"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3BFE626A0027"
-				label      	"diagnostics"
-				supplier   	"Logical View::xsd::XSDDiagnostic"
-				quidu      	"3BFE5F910046"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$215"
-			quid       	"3BFE6431035F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$216"
-				quid       	"3BFE643201C6"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "allDiagnostics"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3BFE643201C7"
-				label      	"allDiagnostics"
-				supplier   	"Logical View::xsd::XSDDiagnostic"
-				quidu      	"3BFE5F910046"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$217"
-			quid       	"3C21DCC700EC"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$218"
-				quid       	"3C21DCCE0042"
-				supplier   	"Logical View::xsd::XSDSchemaDirective"
-				quidu      	"3B6AD8A202A2"
-				is_aggregate 	TRUE)
-			    (object Role "resolvedSchema"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C21DCCE0043"
-				label      	"resolvedSchema"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$219"
-			quid       	"3C21DD0C03DB"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$220"
-				quid       	"3C21DD100304"
-				supplier   	"Logical View::xsd::XSDSchemaCompositor"
-				quidu      	"3C21DB4102AE"
-				is_aggregate 	TRUE)
-			    (object Role "incorporatedSchema"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C21DD100305"
-				label      	"incorporatedSchema"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$221"
-			quid       	"3C239134004F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$222"
-				quid       	"3C23913600CA"
-				supplier   	"Logical View::xsd::XSDXPathDefinition"
-				quidu      	"3B6D83BB0355"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3C23913600D4"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$223"
-			quid       	"3C25D3A60131"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$224"
-				quid       	"3C25D3A90370"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB")
-			    (object Role "referencingDirectives"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C25D3A90371"
-				label      	"referencingDirectives"
-				supplier   	"Logical View::xsd::XSDSchemaDirective"
-				quidu      	"3B6AD8A202A2"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$225"
-			quid       	"3C25ECF0005E"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$226"
-				quid       	"3C25ECF4001E"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB")
-			    (object Role "rootVersion"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C25ECF40028"
-				label      	"rootVersion"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$227"
-			quid       	"3C25ED0B011B"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$228"
-				quid       	"3C25ED0F0121"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB")
-			    (object Role "originalVersion"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C25ED0F012B"
-				label      	"originalVersion"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$229"
-			quid       	"3C25EEAB001F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$230"
-				quid       	"3C25EEAF010B"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "incorporatedVersions"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C25EEAF0115"
-				label      	"incorporatedVersions"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$231"
-			quid       	"3C276DA000DE"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$232"
-				quid       	"3C276DA000DF"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "itemTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C276DA000E0"
-				label      	"itemTypeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$233"
-			quid       	"3C2784730194"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$234"
-				quid       	"3C27847501F1"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB")
-			    (object Role "schemaForSchema"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C27847501FB"
-				label      	"schemaForSchema"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$235"
-			quid       	"3C2880F503D9"
-			roles      	(list role_list
-			    (object Role "rootTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C2880F9003C"
-				label      	"rootTypeDefinition"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$236"
-				attributes 	(list Attribute_Set)
-				quid       	"3C2880F90046"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A")))
-		    (object Association "$UNNAMED$237"
-			quid       	"3C2882C50137"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$238"
-				attributes 	(list Attribute_Set)
-				quid       	"3C2882C70112"
-				supplier   	"Logical View::xsd::XSDDiagnostic"
-				quidu      	"3BFE5F910046")
-			    (object Role "primaryComponent"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C2882C70113"
-				label      	"primaryComponent"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$239"
-			quid       	"3C28A0F201A4"
-			roles      	(list role_list
-			    (object Role "type"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28A0F302E5"
-				label      	"type"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$240"
-				attributes 	(list Attribute_Set)
-				quid       	"3C28A0F302F0"
-				supplier   	"Logical View::xsd::XSDFeature"
-				quidu      	"3B69B537026C")))
-		    (object Association "$UNNAMED$241"
-			quid       	"3C28A6DB01E5"
-			roles      	(list role_list
-			    (object Role "rootType"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28A6DD03DD"
-				label      	"rootType"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$242"
-				attributes 	(list Attribute_Set)
-				quid       	"3C28A6DD03DE"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9")))
-		    (object Association "$UNNAMED$243"
-			quid       	"3C28A7120108"
-			roles      	(list role_list
-			    (object Role "baseType"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28A7140151"
-				label      	"baseType"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$244"
-				attributes 	(list Attribute_Set)
-				quid       	"3C28A714015B"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9")))
-		    (object Association "$UNNAMED$245"
-			quid       	"3C28A74B0178"
-			roles      	(list role_list
-			    (object Role "simpleType"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28A74D017B"
-				label      	"simpleType"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$246"
-				attributes 	(list Attribute_Set)
-				quid       	"3C28A74D0185"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9")))
-		    (object Association "$UNNAMED$247"
-			quid       	"3C28A7ED03C0"
-			roles      	(list role_list
-			    (object Role "complexType"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28A7F40117"
-				label      	"complexType"
-				supplier   	"Logical View::xsd::XSDParticle"
-				quidu      	"3B682BBD01F7"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$248"
-				attributes 	(list Attribute_Set)
-				quid       	"3C28A7F40121"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9")))
-		    (object Association "$UNNAMED$249"
-			quid       	"3C28A994030A"
-			roles      	(list role_list
-			    (object Role "rootTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28A99700DD"
-				label      	"rootTypeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$250"
-				attributes 	(list Attribute_Set)
-				quid       	"3C28A99700E7"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D")))
-		    (object Association "$UNNAMED$251"
-			quid       	"3C28B085025B"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$252"
-				quid       	"3C28B0860270"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "minFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B086027A"
-				label      	"minFacet"
-				supplier   	"Logical View::xsd::XSDMinFacet"
-				quidu      	"3C0A1CDE037C"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$253"
-			quid       	"3C28B08D0252"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$254"
-				quid       	"3C28B08E0091"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "maxFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B08E009B"
-				label      	"maxFacet"
-				supplier   	"Logical View::xsd::XSDMaxFacet"
-				quidu      	"3C0A1CEB010E"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$255"
-			quid       	"3C28B0AB0396"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$256"
-				quid       	"3C28B0AC03C9"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "maxInclusiveFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0AC03D4"
-				label      	"maxInclusiveFacet"
-				supplier   	"Logical View::xsd::XSDMaxInclusiveFacet"
-				quidu      	"3B6C787D00DA"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$257"
-			quid       	"3C28B0AF0338"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$258"
-				quid       	"3C28B0B001F9"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "minInclusiveFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0B00203"
-				label      	"minInclusiveFacet"
-				supplier   	"Logical View::xsd::XSDMinInclusiveFacet"
-				quidu      	"3B6C788702C9"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$259"
-			quid       	"3C28B0B30207"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$260"
-				quid       	"3C28B0B40190"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "minExclusiveFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0B4019A"
-				label      	"minExclusiveFacet"
-				supplier   	"Logical View::xsd::XSDMinExclusiveFacet"
-				quidu      	"3B6C792D000A"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$261"
-			quid       	"3C28B0B6028D"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$262"
-				quid       	"3C28B0B70217"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "maxExclusiveFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0B70221"
-				label      	"maxExclusiveFacet"
-				supplier   	"Logical View::xsd::XSDMaxExclusiveFacet"
-				quidu      	"3B6C789600C2"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$263"
-			quid       	"3C28B0BC0051"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$264"
-				quid       	"3C28B0BC0246"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "lengthFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0BC0250"
-				label      	"lengthFacet"
-				supplier   	"Logical View::xsd::XSDLengthFacet"
-				quidu      	"3B6C776200E7"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$265"
-			quid       	"3C28B0BF018C"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$266"
-				quid       	"3C28B0C0006B"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "whiteSpaceFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0C00075"
-				label      	"whiteSpaceFacet"
-				supplier   	"Logical View::xsd::XSDWhiteSpaceFacet"
-				quidu      	"3B6C784601B7"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$267"
-			quid       	"3C28B0C2021D"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$268"
-				quid       	"3C28B0C300AB"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "enumerationFacets"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0C300AC"
-				label      	"enumerationFacets"
-				supplier   	"Logical View::xsd::XSDEnumerationFacet"
-				quidu      	"3B6C6ACE0141"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$269"
-			quid       	"3C28B0C50159"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$270"
-				quid       	"3C28B0C600B0"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "patternFacets"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0C600BA"
-				label      	"patternFacets"
-				supplier   	"Logical View::xsd::XSDPatternFacet"
-				quidu      	"3B6C6ADB026C"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$271"
-			quid       	"3C28B0C802A7"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$272"
-				quid       	"3C28B0C901EA"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "cardinalityFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0C901F5"
-				label      	"cardinalityFacet"
-				supplier   	"Logical View::xsd::XSDCardinalityFacet"
-				quidu      	"3B6C755D03D2"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$273"
-			quid       	"3C28B0CB039C"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$274"
-				quid       	"3C28B0CC03D0"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "numericFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0CC03D1"
-				label      	"numericFacet"
-				supplier   	"Logical View::xsd::XSDNumericFacet"
-				quidu      	"3B6C75950206"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$275"
-			quid       	"3C28B0CF0199"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$276"
-				quid       	"3C28B0D20085"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "maxLengthFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0D2008F"
-				label      	"maxLengthFacet"
-				supplier   	"Logical View::xsd::XSDMaxLengthFacet"
-				quidu      	"3B6C77C70146"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$277"
-			quid       	"3C28B0D500C5"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$278"
-				quid       	"3C28B0D6001D"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "minLengthFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0D60027"
-				label      	"minLengthFacet"
-				supplier   	"Logical View::xsd::XSDMinLengthFacet"
-				quidu      	"3B6C778C0065"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$279"
-			quid       	"3C28B0D800DE"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$280"
-				quid       	"3C28B0D803CD"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "totalDigitsFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0D803D7"
-				label      	"totalDigitsFacet"
-				supplier   	"Logical View::xsd::XSDTotalDigitsFacet"
-				quidu      	"3B6C79A0020E"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$281"
-			quid       	"3C28B0DB0377"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$282"
-				quid       	"3C28B0DC035A"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "fractionDigitsFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0DC0364"
-				label      	"fractionDigitsFacet"
-				supplier   	"Logical View::xsd::XSDFractionDigitsFacet"
-				quidu      	"3B6C79BE02EE"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$283"
-			quid       	"3C28B0DF0048"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$284"
-				quid       	"3C28B0DF03B9"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "orderedFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0DF03C3"
-				label      	"orderedFacet"
-				supplier   	"Logical View::xsd::XSDOrderedFacet"
-				quidu      	"3B6C74DD0248"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$285"
-			quid       	"3C28B0E300D9"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$286"
-				quid       	"3C28B0E4038E"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "boundedFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0E40398"
-				label      	"boundedFacet"
-				supplier   	"Logical View::xsd::XSDBoundedFacet"
-				quidu      	"3B6C751D0344"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$287"
-			quid       	"3C28B44401EC"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$288"
-				quid       	"3C28B4450360"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveMaxFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B445036A"
-				label      	"effectiveMaxFacet"
-				supplier   	"Logical View::xsd::XSDMaxFacet"
-				quidu      	"3C0A1CEB010E"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$289"
-			quid       	"3C28B54F0145"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$290"
-				quid       	"3C28B550038C"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveWhiteSpaceFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B5500396"
-				label      	"effectiveWhiteSpaceFacet"
-				supplier   	"Logical View::xsd::XSDWhiteSpaceFacet"
-				quidu      	"3B6C784601B7"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$291"
-			quid       	"3C28B5C4011C"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$292"
-				quid       	"3C28B5C5020D"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveMaxLengthFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B5C50217"
-				label      	"effectiveMaxLengthFacet"
-				supplier   	"Logical View::xsd::XSDMaxLengthFacet"
-				quidu      	"3B6C77C70146"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$293"
-			quid       	"3C28B62A00AA"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$294"
-				quid       	"3C28B62B0138"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveFractionDigitsFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B62B0142"
-				label      	"effectiveFractionDigitsFacet"
-				supplier   	"Logical View::xsd::XSDFractionDigitsFacet"
-				quidu      	"3B6C79BE02EE"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$295"
-			quid       	"3C28B6B003A6"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$296"
-				quid       	"3C28B6B10311"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectivePatternFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B6B10312"
-				label      	"effectivePatternFacet"
-				supplier   	"Logical View::xsd::XSDPatternFacet"
-				quidu      	"3B6C6ADB026C"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$297"
-			quid       	"3C28B7CA026B"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$298"
-				quid       	"3C28B7CB0186"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveEnumerationFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B7CB0190"
-				label      	"effectiveEnumerationFacet"
-				supplier   	"Logical View::xsd::XSDEnumerationFacet"
-				quidu      	"3B6C6ACE0141"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$299"
-			quid       	"3C28B8400062"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$300"
-				quid       	"3C28B841001D"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveTotalDigitsFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B8410027"
-				label      	"effectiveTotalDigitsFacet"
-				supplier   	"Logical View::xsd::XSDTotalDigitsFacet"
-				quidu      	"3B6C79A0020E"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$301"
-			quid       	"3C28B898016D"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$302"
-				quid       	"3C28B8990056"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveMinLengthFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B8990060"
-				label      	"effectiveMinLengthFacet"
-				supplier   	"Logical View::xsd::XSDMinLengthFacet"
-				quidu      	"3B6C778C0065"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$303"
-			quid       	"3C28B8DC0052"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$304"
-				quid       	"3C28B8DC03B9"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveLengthFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B8DC03C3"
-				label      	"effectiveLengthFacet"
-				supplier   	"Logical View::xsd::XSDLengthFacet"
-				quidu      	"3B6C776200E7"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$305"
-			quid       	"3C28B97001DB"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$306"
-				quid       	"3C28B97100CF"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveMinFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B97100D9"
-				label      	"effectiveMinFacet"
-				supplier   	"Logical View::xsd::XSDMinFacet"
-				quidu      	"3C0A1CDE037C"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$307"
-			quid       	"3D4BB4AE01CC"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$308"
-				quid       	"3D4BB4AF010F"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "syntheticFacets"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3D4BB4AF011A"
-				label      	"syntheticFacets"
-				supplier   	"Logical View::xsd::XSDFacet"
-				quidu      	"3B6C359403D2"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$309"
-			quid       	"3D4BB4D3028E"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$310"
-				quid       	"3D4BB4D402F3"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "syntheticParticle"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3D4BB4D402FD"
-				label      	"syntheticParticle"
-				supplier   	"Logical View::xsd::XSDParticle"
-				quidu      	"3B682BBD01F7"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$311"
-			quid       	"3D4BB4D901F6"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$312"
-				quid       	"3D4BB4DA0284"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "syntheticWildcard"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3D4BB4DA028E"
-				label      	"syntheticWildcard"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$313"
-			quid       	"3D4C68FF01BF"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$314"
-				quid       	"3D4C69020317"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "syntheticWildcard"
-				quid       	"3D4C69020318"
-				label      	"syntheticWildcard"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE))))
-		logical_presentations 	(list unit_reference_list
-		    (object ClassDiagram "1. Component Hierarchy (Part 1: Structures)"
-			quid       	"3B6847680138"
-			title      	"1. Component Hierarchy (Part 1: Structures)"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDComponent" @360
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(928, 80)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@360
-				    location   	(766, 37)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846E90029"
-				width      	342
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDNamedComponent" @361
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1168, 560)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@361
-				    location   	(940, 517)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	456
-				    justify    	0
-				    label      	"XSDNamedComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846D303A4"
-				width      	474
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @362
-				location   	(928, 225)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@360
-				vertices   	(list Points
-				    (928, 225)
-				    (928, 135)))
-			    (object ClassView "Class" "Logical View::xsd::XSDTerm" @363
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1568, 320)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@363
-				    location   	(1460, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	216
-				    justify    	0
-				    label      	"XSDTerm")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683C5E0174"
-				width      	234
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @364
-				location   	(1203, 706)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@361
-				vertices   	(list Points
-				    (1203, 706)
-				    (1203, 615)))
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeContent" @365
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(624, 560)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@365
-				    location   	(372, 517)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	504
-				    justify    	0
-				    label      	"XSDComplexTypeContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683BA00196"
-				width      	522
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @366
-				location   	(444, 709)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@365
-				vertices   	(list Points
-				    (444, 709)
-				    (444, 615)))
-			    (object InheritTreeView "" @367
-				location   	(1572, 465)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@363
-				vertices   	(list Points
-				    (1572, 465)
-				    (1572, 375)))
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @368
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(416, 800)
-				label      	(object ItemLabel
-				    Parent_View 	@368
-				    location   	(290, 757)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	252
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	270
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @369
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(448, 1056)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@369
-				    location   	(262, 1013)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	372
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	390
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUse" @370
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1104, 320)
-				label      	(object ItemLabel
-				    Parent_View 	@370
-				    location   	(936, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	336
-				    justify    	0
-				    label      	"XSDAttributeUse")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B68354601A8"
-				width      	354
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @371
-				location   	(453, 1203)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@369
-				vertices   	(list Points
-				    (453, 1203)
-				    (453, 1111)))
-			    (object ClassView "Class" "Logical View::xsd::XSDScope" @372
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(176, 320)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@372
-				    location   	(62, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	228
-				    justify    	0
-				    label      	"XSDScope")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B54000F2"
-				width      	246
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDFeature" @373
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1872, 800)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@373
-				    location   	(1746, 757)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	252
-				    justify    	0
-				    label      	"XSDFeature")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B537026C"
-				width      	270
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @374
-				location   	(1872, 950)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@373
-				vertices   	(list Points
-				    (1872, 950)
-				    (1872, 855)))
-			    (object InheritTreeView "" @375
-				location   	(181, 465)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@372
-				vertices   	(list Points
-				    (181, 465)
-				    (181, 375)))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @376
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1936, 1280)
-				label      	(object ItemLabel
-				    Parent_View 	@376
-				    location   	(1670, 1233)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	532
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	550
-				height     	118
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @377
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1968, 1056)
-				label      	(object ItemLabel
-				    Parent_View 	@377
-				    location   	(1734, 1013)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				width      	486
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDIdentityConstraintDefinition" @378
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1888, 1488)
-				label      	(object ItemLabel
-				    Parent_View 	@378
-				    location   	(1569, 1444)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	638
-				    justify    	0
-				    label      	"XSDIdentityConstraintDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B2603A2"
-				width      	656
-				height     	112
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDNotationDeclaration" @379
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1184, 1488)
-				label      	(object ItemLabel
-				    Parent_View 	@379
-				    location   	(903, 1444)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	563
-				    justify    	0
-				    label      	"XSDNotationDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDAA021C"
-				width      	581
-				height     	112
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @380
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1600, 560)
-				label      	(object ItemLabel
-				    Parent_View 	@380
-				    location   	(1462, 517)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	276
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				width      	294
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @381
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1024, 1056)
-				label      	(object ItemLabel
-				    Parent_View 	@381
-				    location   	(778, 1013)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	492
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				width      	510
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroup" @382
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1968, 560)
-				label      	(object ItemLabel
-				    Parent_View 	@382
-				    location   	(1806, 517)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDModelGroup")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6834E00291"
-				width      	342
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @383
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(352, 1296)
-				label      	(object ItemLabel
-				    Parent_View 	@383
-				    location   	(106, 1253)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	492
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				width      	510
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @384
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(192, 560)
-				label      	(object ItemLabel
-				    Parent_View 	@384
-				    location   	(60, 517)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	264
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	282
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @385
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1072, 1280)
-				label      	(object ItemLabel
-				    Parent_View 	@385
-				    location   	(802, 1237)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	540
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	558
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @386
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(368, 1488)
-				label      	(object ItemLabel
-				    Parent_View 	@386
-				    location   	(30, 1441)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	676
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				width      	694
-				height     	119
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAnnotation" @387
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(576, 320)
-				label      	(object ItemLabel
-				    Parent_View 	@387
-				    location   	(426, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	300
-				    justify    	0
-				    label      	"XSDAnnotation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDC80233"
-				width      	318
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDXPathDefinition" @388
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2000, 320)
-				label      	(object ItemLabel
-				    Parent_View 	@388
-				    location   	(1808, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	384
-				    justify    	0
-				    label      	"XSDXPathDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6D83BB0355"
-				width      	402
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @389
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B72D7BB0349"
-				client     	@370
-				supplier   	@360
-				line_style 	3
-				origin_attachment 	(1094, 265)
-				terminal_attachment 	(1094, 225)
-				drawSupplier 	@362)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefinableComponent" @390
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(960, 800)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@390
-				    location   	(690, 757)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	540
-				    justify    	0
-				    label      	"XSDRedefinableComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B7FCA8B020B"
-				width      	558
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @391
-				location   	(962, 947)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@390
-				vertices   	(list Points
-				    (962, 947)
-				    (962, 855)))
-			    (object InheritView "" @392
-				stereotype 	(object SegLabel @393
-				    Parent_View 	@392
-				    location   	(218, 1154)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	212
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.163534
-				    height     	69
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B685F55032B"
-				client     	@383
-				supplier   	@365
-				line_style 	3
-				origin_attachment 	(149, 1241)
-				terminal_attachment 	(149, 709)
-				drawSupplier 	@366)
-			    (object InheritView "" @394
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A1302A2"
-				client     	@383
-				supplier   	@369
-				line_style 	3
-				origin_attachment 	(256, 1241)
-				terminal_attachment 	(256, 1203)
-				drawSupplier 	@371)
-			    (object InheritView "" @395
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCC4A0182"
-				client     	@384
-				supplier   	@372
-				line_style 	3
-				origin_attachment 	(284, 505)
-				terminal_attachment 	(284, 465)
-				drawSupplier 	@375)
-			    (object InheritView "" @396
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A640279"
-				client     	@382
-				supplier   	@363
-				line_style 	3
-				origin_attachment 	(2002, 505)
-				terminal_attachment 	(2002, 465)
-				drawSupplier 	@367)
-			    (object InheritView "" @397
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6848AA01D3"
-				client     	@363
-				supplier   	@360
-				line_style 	3
-				origin_attachment 	(1569, 265)
-				terminal_attachment 	(1569, 225)
-				drawSupplier 	@362)
-			    (object InheritView "" @398
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A3A0041"
-				client     	@380
-				supplier   	@363
-				line_style 	3
-				origin_attachment 	(1490, 505)
-				terminal_attachment 	(1490, 465)
-				drawSupplier 	@367)
-			    (object InheritView "" @399
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6848FC01E7"
-				client     	@368
-				supplier   	@365
-				line_style 	3
-				origin_attachment 	(510, 745)
-				terminal_attachment 	(510, 709)
-				drawSupplier 	@366)
-			    (object InheritView "" @400
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAC800D2"
-				client     	@385
-				supplier   	@390
-				line_style 	3
-				origin_attachment 	(1321, 1225)
-				terminal_attachment 	(1321, 947)
-				drawSupplier 	@391)
-			    (object InheritView "" @401
-				stereotype 	(object SegLabel @402
-				    Parent_View 	@401
-				    location   	(2137, 886)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	238
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.215812
-				    height     	64
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B685F17002E"
-				client     	@377
-				supplier   	@363
-				line_style 	3
-				origin_attachment 	(2200, 1001)
-				terminal_attachment 	(2200, 465)
-				drawSupplier 	@367)
-			    (object InheritView "" @403
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69EDEE01BF"
-				client     	@377
-				supplier   	@373
-				line_style 	3
-				origin_attachment 	(2093, 1001)
-				terminal_attachment 	(2093, 950)
-				drawSupplier 	@374)
-			    (object InheritView "" @404
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAB1004D"
-				client     	@369
-				supplier   	@390
-				line_style 	3
-				origin_attachment 	(450, 1001)
-				terminal_attachment 	(450, 947)
-				drawSupplier 	@391)
-			    (object InheritView "" @405
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCD640231"
-				client     	@372
-				supplier   	@360
-				line_style 	3
-				origin_attachment 	(147, 265)
-				terminal_attachment 	(147, 225)
-				drawSupplier 	@362)
-			    (object InheritView "" @406
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D84F70092"
-				client     	@388
-				supplier   	@360
-				line_style 	3
-				origin_attachment 	(2012, 265)
-				terminal_attachment 	(2012, 225)
-				drawSupplier 	@362)
-			    (object InheritView "" @407
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6848B80286"
-				client     	@365
-				supplier   	@360
-				line_style 	3
-				origin_attachment 	(834, 505)
-				terminal_attachment 	(834, 225)
-				drawSupplier 	@362)
-			    (object InheritView "" @408
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0CEA20197"
-				client     	@361
-				supplier   	@360
-				line_style 	3
-				origin_attachment 	(1350, 505)
-				terminal_attachment 	(1350, 225)
-				drawSupplier 	@362)
-			    (object InheritView "" @409
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69E1770116"
-				client     	@387
-				supplier   	@360
-				line_style 	3
-				origin_attachment 	(572, 265)
-				terminal_attachment 	(572, 225)
-				drawSupplier 	@362)
-			    (object InheritView "" @410
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69B7DC0193"
-				client     	@376
-				supplier   	@373
-				line_style 	3
-				origin_attachment 	(1693, 1221)
-				terminal_attachment 	(1693, 950)
-				drawSupplier 	@374)
-			    (object InheritView "" @411
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684AA30242"
-				client     	@378
-				supplier   	@361
-				line_style 	3
-				origin_attachment 	(1590, 1432)
-				terminal_attachment 	(1590, 706)
-				drawSupplier 	@364)
-			    (object InheritView "" @412
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B68494302F1"
-				client     	@379
-				supplier   	@361
-				line_style 	3
-				origin_attachment 	(1431, 1432)
-				terminal_attachment 	(1431, 706)
-				drawSupplier 	@364)
-			    (object InheritView "" @413
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A26036D"
-				client     	@390
-				supplier   	@361
-				line_style 	3
-				origin_attachment 	(959, 745)
-				terminal_attachment 	(959, 706)
-				drawSupplier 	@364)
-			    (object InheritView "" @414
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A2C0307"
-				client     	@373
-				supplier   	@361
-				line_style 	3
-				origin_attachment 	(1872, 745)
-				terminal_attachment 	(1872, 706)
-				drawSupplier 	@364)
-			    (object InheritView "" @415
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAC40090"
-				client     	@381
-				supplier   	@390
-				line_style 	3
-				origin_attachment 	(962, 1001)
-				terminal_attachment 	(962, 947)
-				drawSupplier 	@391)
-			    (object InheritView "" @416
-				stereotype 	(object SegLabel @417
-				    Parent_View 	@416
-				    location   	(95, 1388)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	187
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.042531
-				    height     	67
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B69BAA20310"
-				client     	@386
-				supplier   	@372
-				line_style 	3
-				origin_attachment 	(28, 1429)
-				terminal_attachment 	(28, 465)
-				drawSupplier 	@375)
-			    (object InheritView "" @418
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0D01901F1"
-				client     	@386
-				supplier   	@369
-				line_style 	3
-				origin_attachment 	(656, 1429)
-				terminal_attachment 	(656, 1203)
-				drawSupplier 	@371)))
-		    (object ClassDiagram "2. Component Relations (Part 1 : Structures)"
-			quid       	"374B18190028"
-			title      	"2. Component Relations (Part 1 : Structures)"
-			zoom       	96
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDScope" @419
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(784, 1632)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@419
-				    location   	(670, 1591)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	228
-				    justify    	0
-				    label      	"XSDScope")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B54000F2"
-				width      	246
-				height     	107
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDFeature" @420
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(192, 1632)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@420
-				    location   	(66, 1591)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	252
-				    justify    	0
-				    label      	"XSDFeature")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B537026C"
-				width      	270
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$129" @421
-				location   	(494, 1627)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69B653017A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "scope" @422
-					Parent_View 	@421
-					location   	(286, -485)
-					label      	(object SegLabel @423
-					    Parent_View 	@422
-					    location   	(555, 1589)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	132
-					    justify    	0
-					    label      	"+scope"
-					    pctDist    	0.371257
-					    height     	39
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69B654006D"
-					client     	@421
-					supplier   	@419
-					line_style 	3
-					origin_attachment 	(494, 1627)
-					terminal_attachment 	(661, 1627)
-					label      	(object SegLabel @424
-					    Parent_View 	@422
-					    location   	(576, 1664)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.491018
-					    height     	37
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$130" @425
-					Parent_View 	@421
-					location   	(286, -485)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69B654006E"
-					client     	@421
-					supplier   	@420
-					line_style 	3
-					origin_attachment 	(494, 1627)
-					terminal_attachment 	(327, 1627))))
-			    (object ClassView "Class" "Logical View::xsd::XSDTerm" @426
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2192, 1232)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@426
-				    location   	(2084, 1191)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	216
-				    justify    	0
-				    label      	"XSDTerm")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683C5E0174"
-				width      	234
-				height     	107
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @427
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2176, 992)
-				label      	(object ItemLabel
-				    Parent_View 	@427
-				    location   	(2051, 951)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	250
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	268
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$161" @428
-				location   	(2229, 1112)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B683C890122"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$162" @429
-					Parent_View 	@428
-					location   	(549, -248)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B683C8A0110"
-					client     	@428
-					supplier   	@427
-					line_style 	3
-					origin_attachment 	(2229, 1112)
-					terminal_attachment 	(2229, 1045))
-				    (object RoleView "term" @430
-					Parent_View 	@428
-					location   	(549, -248)
-					label      	(object SegLabel @431
-					    Parent_View 	@430
-					    location   	(2157, 1121)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	108
-					    justify    	0
-					    label      	"+term"
-					    pctDist    	0.134328
-					    height     	72
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B683C8A0111"
-					client     	@428
-					supplier   	@426
-					line_style 	3
-					origin_attachment 	(2229, 1112)
-					terminal_attachment 	(2229, 1179)
-					label      	(object SegLabel @432
-					    Parent_View 	@430
-					    location   	(2274, 1119)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.119403
-					    height     	45
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeContent" @433
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1328, 1232)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@433
-				    location   	(1076, 1191)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	504
-				    justify    	0
-				    label      	"XSDComplexTypeContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683BA00196"
-				width      	522
-				height     	107
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroup" @434
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2144, 768)
-				label      	(object ItemLabel
-				    Parent_View 	@434
-				    location   	(1977, 727)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	334
-				    justify    	0
-				    label      	"XSDModelGroup")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6834E00291"
-				width      	352
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$149" @435
-				location   	(2219, 880)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B683606026F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$150" @436
-					Parent_View 	@435
-					location   	(-357, -240)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6836070221"
-					client     	@435
-					supplier   	@434
-					line_style 	3
-					origin_attachment 	(2219, 880)
-					terminal_attachment 	(2219, 821))
-				    (object RoleView "particles" @437
-					Parent_View 	@435
-					location   	(-357, -240)
-					label      	(object SegLabel @438
-					    Parent_View 	@437
-					    location   	(2105, 888)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+particles"
-					    pctDist    	0.156627
-					    height     	115
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6836070222"
-					client     	@435
-					supplier   	@427
-					line_style 	3
-					origin_attachment 	(2219, 880)
-					terminal_attachment 	(2219, 939)
-					label      	(object SegLabel @439
-					    Parent_View 	@437
-					    location   	(2281, 888)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"1..*"
-					    pctDist    	0.156627
-					    height     	62
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @440
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1776, 992)
-				label      	(object ItemLabel
-				    Parent_View 	@440
-				    location   	(1639, 951)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	274
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				width      	292
-				height     	107
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUse" @441
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1072, 1424)
-				label      	(object ItemLabel
-				    Parent_View 	@441
-				    location   	(905, 1383)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	334
-				    justify    	0
-				    label      	"XSDAttributeUse")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B68354601A8"
-				width      	352
-				height     	107
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @442
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(432, 992)
-				label      	(object ItemLabel
-				    Parent_View 	@442
-				    location   	(187, 951)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	490
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				width      	508
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$195" @443
-				location   	(590, 1140)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D35AB0273"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$196" @444
-					Parent_View 	@443
-					location   	(302, 148)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D35B20291"
-					client     	@443
-					supplier   	@442
-					vertices   	(list Points
-					    (590, 1140)
-					    (540, 1140)
-					    (540, 1045))
-					line_style 	3
-					origin_attachment 	(590, 1140)
-					terminal_attachment 	(540, 1045))
-				    (object RoleView "baseTypeDefinition" @445
-					Parent_View 	@443
-					location   	(302, 148)
-					label      	(object SegLabel @446
-					    Parent_View 	@445
-					    location   	(643, 1171)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+baseTypeDefinition"
-					    pctDist    	1.053571
-					    height     	31
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D35B202A5"
-					client     	@443
-					supplier   	@442
-					vertices   	(list Points
-					    (590, 1140)
-					    (641, 1140)
-					    (641, 1045))
-					line_style 	3
-					origin_attachment 	(590, 1140)
-					terminal_attachment 	(641, 1045)
-					label      	(object SegLabel @447
-					    Parent_View 	@445
-					    location   	(584, 1097)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.122449
-					    height     	44
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @448
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1008, 992)
-				label      	(object ItemLabel
-				    Parent_View 	@448
-				    location   	(745, 951)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	526
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				width      	544
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$97" @449
-				location   	(1119, 1112)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6837DF024F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$98" @450
-					Parent_View 	@449
-					location   	(-1569, -8)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6837E100FD"
-					client     	@449
-					supplier   	@448
-					line_style 	3
-					origin_attachment 	(1119, 1112)
-					terminal_attachment 	(1119, 1045))
-				    (object RoleView "contentType" @451
-					Parent_View 	@449
-					location   	(-1569, -8)
-					label      	(object SegLabel @452
-					    Parent_View 	@451
-					    location   	(1259, 1126)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	252
-					    justify    	0
-					    label      	"+contentType"
-					    pctDist    	0.208955
-					    height     	140
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6837E100FE"
-					client     	@449
-					supplier   	@433
-					line_style 	3
-					origin_attachment 	(1119, 1112)
-					terminal_attachment 	(1119, 1179)
-					label      	(object SegLabel @453
-					    Parent_View 	@451
-					    location   	(1063, 1126)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.208955
-					    height     	57
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$103" @454
-				location   	(1455, 982)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6851BA0126"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$104" @455
-					Parent_View 	@454
-					location   	(159, -570)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6851BB0150"
-					client     	@454
-					supplier   	@448
-					line_style 	3
-					origin_attachment 	(1455, 982)
-					terminal_attachment 	(1280, 982))
-				    (object RoleView "attributeWildcard" @456
-					Parent_View 	@454
-					location   	(159, -570)
-					label      	(object SegLabel @457
-					    Parent_View 	@456
-					    location   	(1445, 929)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+attributeWildcard"
-					    pctDist    	-0.062857
-					    height     	54
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6851BB0151"
-					client     	@454
-					supplier   	@440
-					line_style 	3
-					origin_attachment 	(1455, 982)
-					terminal_attachment 	(1630, 982)
-					label      	(object SegLabel @458
-					    Parent_View 	@456
-					    location   	(1550, 1022)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.542857
-					    height     	40
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$99" @459
-				location   	(921, 1208)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B683959006E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$100" @460
-					Parent_View 	@459
-					location   	(-871, -376)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6839590349"
-					client     	@459
-					supplier   	@448
-					line_style 	3
-					origin_attachment 	(921, 1208)
-					terminal_attachment 	(921, 1045))
-				    (object RoleView "attributeUses" @461
-					Parent_View 	@459
-					location   	(-871, -376)
-					label      	(object SegLabel @462
-					    Parent_View 	@461
-					    location   	(778, 1251)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	264
-					    justify    	0
-					    label      	"+attributeUses"
-					    pctDist    	0.269939
-					    height     	144
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B683959034A"
-					client     	@459
-					supplier   	@441
-					line_style 	3
-					origin_attachment 	(921, 1208)
-					terminal_attachment 	(921, 1371)
-					label      	(object SegLabel @463
-					    Parent_View 	@461
-					    location   	(979, 1254)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.288344
-					    height     	58
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDXPathDefinition" @464
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1312, 768)
-				label      	(object ItemLabel
-				    Parent_View 	@464
-				    location   	(1122, 727)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	380
-				    justify    	0
-				    label      	"XSDXPathDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6D83BB0355"
-				width      	398
-				height     	107
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDNotationDeclaration" @465
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1856, 1632)
-				label      	(object ItemLabel
-				    Parent_View 	@465
-				    location   	(1623, 1591)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	466
-				    justify    	0
-				    label      	"XSDNotationDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDAA021C"
-				width      	484
-				height     	107
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @466
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2048, 448)
-				label      	(object ItemLabel
-				    Parent_View 	@466
-				    location   	(1803, 407)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	490
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				width      	508
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$153" @467
-				location   	(2216, 608)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6837AC025A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$154" @468
-					Parent_View 	@467
-					location   	(-552, -816)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6837AD0338"
-					client     	@467
-					supplier   	@466
-					line_style 	3
-					origin_attachment 	(2216, 608)
-					terminal_attachment 	(2216, 501))
-				    (object RoleView "modelGroup" @469
-					Parent_View 	@467
-					location   	(-552, -816)
-					label      	(object SegLabel @470
-					    Parent_View 	@469
-					    location   	(2080, 628)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	252
-					    justify    	0
-					    label      	"+modelGroup"
-					    pctDist    	0.182609
-					    height     	137
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6837AD0339"
-					client     	@467
-					supplier   	@434
-					line_style 	3
-					origin_attachment 	(2216, 608)
-					terminal_attachment 	(2216, 715)
-					label      	(object SegLabel @471
-					    Parent_View 	@469
-					    location   	(2256, 633)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.233645
-					    height     	40
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @472
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1888, 1424)
-				label      	(object ItemLabel
-				    Parent_View 	@472
-				    location   	(1619, 1383)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	538
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	556
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$83" @473
-				location   	(1676, 1208)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6887BF0150"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$84" @474
-					Parent_View 	@473
-					location   	(412, -344)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6887C000A7"
-					client     	@473
-					supplier   	@472
-					line_style 	3
-					origin_attachment 	(1676, 1208)
-					terminal_attachment 	(1676, 1371))
-				    (object RoleView "attributeWildcard" @475
-					Parent_View 	@473
-					location   	(412, -344)
-					label      	(object SegLabel @476
-					    Parent_View 	@475
-					    location   	(1857, 1106)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+attributeWildcard"
-					    pctDist    	0.625767
-					    height     	181
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6887C000A8"
-					client     	@473
-					supplier   	@440
-					line_style 	3
-					origin_attachment 	(1676, 1208)
-					terminal_attachment 	(1676, 1045)
-					label      	(object SegLabel @477
-					    Parent_View 	@475
-					    location   	(1618, 1108)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.619632
-					    height     	59
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$79" @478
-				location   	(1429, 1438)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B68359F0086"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$80" @479
-					Parent_View 	@478
-					location   	(-363, -146)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6835A00069"
-					client     	@478
-					supplier   	@472
-					line_style 	3
-					origin_attachment 	(1429, 1438)
-					terminal_attachment 	(1610, 1438))
-				    (object RoleView "attributeUses" @480
-					Parent_View 	@478
-					location   	(-363, -146)
-					label      	(object SegLabel @481
-					    Parent_View 	@480
-					    location   	(1405, 1506)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	264
-					    justify    	0
-					    label      	"+attributeUses"
-					    pctDist    	0.132597
-					    height     	68
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6835A0006A"
-					client     	@478
-					supplier   	@441
-					line_style 	3
-					origin_attachment 	(1429, 1438)
-					terminal_attachment 	(1248, 1438)
-					label      	(object SegLabel @482
-					    Parent_View 	@480
-					    location   	(1327, 1391)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.563536
-					    height     	48
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @483
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(416, 1424)
-				label      	(object ItemLabel
-				    Parent_View 	@483
-				    location   	(183, 1383)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	466
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	484
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$87" @484
-				location   	(777, 1425)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B683585010D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$88" @485
-					Parent_View 	@484
-					location   	(-519, -367)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B68358600FA"
-					client     	@484
-					supplier   	@441
-					line_style 	3
-					origin_attachment 	(777, 1425)
-					terminal_attachment 	(896, 1425))
-				    (object RoleView "attributeDeclaration" @486
-					Parent_View 	@484
-					location   	(-519, -367)
-					label      	(object SegLabel @487
-					    Parent_View 	@486
-					    location   	(784, 1508)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+attributeDeclaration"
-					    pctDist    	-0.059259
-					    height     	83
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B68358600FB"
-					client     	@484
-					supplier   	@483
-					line_style 	3
-					origin_attachment 	(777, 1425)
-					terminal_attachment 	(658, 1425)
-					label      	(object SegLabel @488
-					    Parent_View 	@486
-					    location   	(721, 1385)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.472441
-					    height     	41
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$71" @489
-				location   	(237, 1208)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B68356B02CB"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$72" @490
-					Parent_View 	@489
-					location   	(-1043, 72)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B68356D00A6"
-					client     	@489
-					supplier   	@483
-					line_style 	3
-					origin_attachment 	(237, 1208)
-					terminal_attachment 	(237, 1371))
-				    (object RoleView "typeDefinition" @491
-					Parent_View 	@489
-					location   	(-1043, 72)
-					label      	(object SegLabel @492
-					    Parent_View 	@491
-					    location   	(388, 1247)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+typeDefinition"
-					    pctDist    	-0.239264
-					    height     	151
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B68356D00A7"
-					client     	@489
-					supplier   	@442
-					line_style 	3
-					origin_attachment 	(237, 1208)
-					terminal_attachment 	(237, 1045)
-					label      	(object SegLabel @493
-					    Parent_View 	@491
-					    location   	(195, 1247)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.239264
-					    height     	43
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @494
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(384, 784)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@494
-				    location   	(198, 743)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	372
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	390
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$93" @495
-				location   	(728, 775)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6833350340"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$94" @496
-					Parent_View 	@495
-					location   	(-856, -57)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B683336028D"
-					client     	@495
-					supplier   	@448
-					vertices   	(list Points
-					    (728, 775)
-					    (788, 775)
-					    (788, 939))
-					line_style 	3
-					origin_attachment 	(728, 775)
-					terminal_attachment 	(788, 939))
-				    (object RoleView "baseTypeDefinition" @497
-					Parent_View 	@495
-					location   	(-856, -57)
-					label      	(object SegLabel @498
-					    Parent_View 	@497
-					    location   	(558, 883)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+baseTypeDefinition"
-					    pctDist    	1.140940
-					    height     	108
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B683336028E"
-					client     	@495
-					supplier   	@494
-					line_style 	3
-					origin_attachment 	(728, 775)
-					terminal_attachment 	(579, 775)
-					label      	(object SegLabel @499
-					    Parent_View 	@497
-					    location   	(750, 812)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.152439
-					    height     	37
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDIdentityConstraintDefinition" @500
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1312, 448)
-				label      	(object ItemLabel
-				    Parent_View 	@500
-				    location   	(1017, 407)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	590
-				    justify    	0
-				    label      	"XSDIdentityConstraintDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B2603A2"
-				width      	608
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$135" @501
-				location   	(1629, 574)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69D29E014D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "referencedKey" @502
-					Parent_View 	@501
-					location   	(-83, 94)
-					label      	(object SegLabel @503
-					    Parent_View 	@502
-					    location   	(1761, 608)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	288
-					    justify    	0
-					    label      	"+referencedKey"
-					    pctDist    	-1.797297
-					    height     	34
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69D2A80165"
-					client     	@501
-					supplier   	@500
-					vertices   	(list Points
-					    (1629, 574)
-					    (1555, 574)
-					    (1555, 501))
-					line_style 	3
-					origin_attachment 	(1629, 574)
-					terminal_attachment 	(1555, 501)
-					label      	(object SegLabel @504
-					    Parent_View 	@502
-					    location   	(1622, 539)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.047619
-					    height     	36
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$136" @505
-					Parent_View 	@501
-					location   	(-83, 94)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69D2A8016F"
-					client     	@501
-					supplier   	@500
-					vertices   	(list Points
-					    (1629, 574)
-					    (1689, 574)
-					    (1689, 444)
-					    (1616, 444))
-					line_style 	3
-					origin_attachment 	(1629, 574)
-					terminal_attachment 	(1616, 444))))
-			    (object AssociationViewNew "$UNNAMED$139" @506
-				location   	(1197, 608)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D8D330025"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$140" @507
-					Parent_View 	@506
-					location   	(-115, 32)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D330365"
-					client     	@506
-					supplier   	@500
-					line_style 	3
-					origin_attachment 	(1197, 608)
-					terminal_attachment 	(1197, 501))
-				    (object RoleView "fields" @508
-					Parent_View 	@506
-					location   	(-115, 32)
-					label      	(object SegLabel @509
-					    Parent_View 	@508
-					    location   	(1119, 655)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	120
-					    justify    	0
-					    label      	"+fields"
-					    pctDist    	0.439252
-					    height     	78
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D330379"
-					client     	@506
-					supplier   	@464
-					line_style 	3
-					origin_attachment 	(1197, 608)
-					terminal_attachment 	(1197, 715)
-					label      	(object SegLabel @510
-					    Parent_View 	@508
-					    location   	(1253, 654)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"1..*"
-					    pctDist    	0.429907
-					    height     	56
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$137" @511
-				location   	(1415, 608)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D8D3D003E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$138" @512
-					Parent_View 	@511
-					location   	(103, 32)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D3E022A"
-					client     	@511
-					supplier   	@500
-					line_style 	3
-					origin_attachment 	(1415, 608)
-					terminal_attachment 	(1415, 501))
-				    (object RoleView "selector" @513
-					Parent_View 	@511
-					location   	(103, 32)
-					label      	(object SegLabel @514
-					    Parent_View 	@513
-					    location   	(1513, 651)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+selector"
-					    pctDist    	0.411215
-					    height     	98
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D3E0234"
-					client     	@511
-					supplier   	@464
-					line_style 	3
-					origin_attachment 	(1415, 608)
-					terminal_attachment 	(1415, 715)
-					label      	(object SegLabel @515
-					    Parent_View 	@513
-					    location   	(1381, 650)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.392523
-					    height     	34
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @516
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				location   	(1312, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@516
-				    location   	(1022, 68)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	581
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	599
-				height     	209
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$181" @517
-				location   	(2395, 606)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B66EEA7023E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$182" @518
-					Parent_View 	@517
-					location   	(-853, 174)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EEA8038A"
-					client     	@517
-					supplier   	@516
-					vertices   	(list Points
-					    (2395, 606)
-					    (2395, 65)
-					    (1611, 65))
-					line_style 	3
-					origin_attachment 	(2395, 606)
-					terminal_attachment 	(1611, 65))
-				    (object RoleView "notationDeclarations" @519
-					Parent_View 	@517
-					location   	(-853, 174)
-					label      	(object SegLabel @520
-					    Parent_View 	@519
-					    location   	(2089, 104)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+notationDeclarations"
-					    pctDist    	-0.489776
-					    height     	307
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EEA8038B"
-					client     	@517
-					supplier   	@465
-					vertices   	(list Points
-					    (2395, 606)
-					    (2395, 1633)
-					    (2098, 1633))
-					line_style 	3
-					origin_attachment 	(2395, 606)
-					terminal_attachment 	(2098, 1633)
-					label      	(object SegLabel @521
-					    Parent_View 	@519
-					    location   	(2344, 105)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	-0.487829
-					    height     	52
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$177" @522
-				location   	(1772, 249)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B66EEFF024F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$178" @523
-					Parent_View 	@522
-					location   	(-948, -327)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EF00025A"
-					client     	@522
-					supplier   	@516
-					line_style 	3
-					origin_attachment 	(1772, 249)
-					terminal_attachment 	(1611, 249))
-				    (object RoleView "modelGroupDefinitions" @524
-					Parent_View 	@522
-					location   	(-948, -327)
-					label      	(object SegLabel @525
-					    Parent_View 	@524
-					    location   	(2076, 335)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	432
-					    justify    	0
-					    label      	"+modelGroupDefinitions"
-					    pctDist    	0.713592
-					    height     	244
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EF000264"
-					client     	@522
-					supplier   	@466
-					vertices   	(list Points
-					    (1772, 249)
-					    (1832, 249)
-					    (1832, 395))
-					line_style 	3
-					origin_attachment 	(1772, 249)
-					terminal_attachment 	(1832, 395)
-					label      	(object SegLabel @526
-					    Parent_View 	@524
-					    location   	(1781, 340)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.737864
-					    height     	52
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$173" @527
-				location   	(2346, 518)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B66EE920216"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$174" @528
-					Parent_View 	@527
-					location   	(154, 86)
-					label      	(object SegLabel @529
-					    Parent_View 	@528
-					    location   	(1872, 1857)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	-3.630072
-					    height     	475
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EE93018B"
-					client     	@527
-					supplier   	@516
-					vertices   	(list Points
-					    (2346, 518)
-					    (2346, 149)
-					    (1611, 149))
-					line_style 	3
-					origin_attachment 	(2346, 518)
-					terminal_attachment 	(1611, 149))
-				    (object RoleView "attributeGroupDefinitions" @530
-					Parent_View 	@527
-					location   	(154, 86)
-					label      	(object SegLabel @531
-					    Parent_View 	@530
-					    location   	(2008, 195)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	468
-					    justify    	0
-					    label      	"+attributeGroupDefinitions"
-					    pctDist    	-0.349946
-					    height     	339
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EE93018C"
-					client     	@527
-					supplier   	@472
-					vertices   	(list Points
-					    (2346, 518)
-					    (2346, 1441)
-					    (2166, 1441))
-					line_style 	3
-					origin_attachment 	(2346, 518)
-					terminal_attachment 	(2166, 1441)
-					label      	(object SegLabel @532
-					    Parent_View 	@530
-					    location   	(2299, 197)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	-0.348862
-					    height     	48
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$175" @533
-				location   	(203, 159)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B66EE760049"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$176" @534
-					Parent_View 	@533
-					location   	(-485, -273)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EE760374"
-					client     	@533
-					supplier   	@516
-					line_style 	3
-					origin_attachment 	(203, 159)
-					terminal_attachment 	(1013, 159))
-				    (object RoleView "typeDefinitions" @535
-					Parent_View 	@533
-					location   	(-485, -273)
-					label      	(object SegLabel @536
-					    Parent_View 	@535
-					    location   	(349, 196)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	288
-					    justify    	0
-					    label      	"+typeDefinitions"
-					    pctDist    	-1.475728
-					    height     	37
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EE76037E"
-					client     	@533
-					supplier   	@494
-					vertices   	(list Points
-					    (203, 159)
-					    (104, 159)
-					    (104, 784)
-					    (189, 784))
-					line_style 	3
-					origin_attachment 	(203, 159)
-					terminal_attachment 	(189, 784)
-					label      	(object SegLabel @537
-					    Parent_View 	@535
-					    location   	(155, 200)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.059701
-					    height     	41
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$179" @538
-				location   	(1087, 329)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BFC2A1701ED"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$180" @539
-					Parent_View 	@538
-					location   	(-577, -23)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFC2A1A0273"
-					client     	@538
-					supplier   	@516
-					line_style 	3
-					origin_attachment 	(1087, 329)
-					terminal_attachment 	(1087, 264))
-				    (object RoleView "identityConstraintDefinitions" @540
-					Parent_View 	@538
-					location   	(-577, -23)
-					label      	(object SegLabel @541
-					    Parent_View 	@540
-					    location   	(1375, 338)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	528
-					    justify    	0
-					    label      	"+identityConstraintDefinitions"
-					    pctDist    	0.130952
-					    height     	288
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFC2A1A027D"
-					client     	@538
-					supplier   	@500
-					line_style 	3
-					origin_attachment 	(1087, 329)
-					terminal_attachment 	(1087, 395)
-					label      	(object SegLabel @542
-					    Parent_View 	@540
-					    location   	(1018, 336)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.107143
-					    height     	70
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$171" @543
-				location   	(48, 320)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B66FDFA00C3"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$172" @544
-					Parent_View 	@543
-					location   	(-1072, -288)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66FDFB027D"
-					client     	@543
-					supplier   	@516
-					vertices   	(list Points
-					    (49, 322)
-					    (49, 68)
-					    (1013, 68))
-					line_style 	3
-					origin_attachment 	(49, 322)
-					terminal_attachment 	(1013, 68))
-				    (object RoleView "attributeDeclarations" @545
-					Parent_View 	@543
-					location   	(-1072, -288)
-					label      	(object SegLabel @546
-					    Parent_View 	@545
-					    location   	(338, 106)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+attributeDeclarations"
-					    pctDist    	-0.198536
-					    height     	289
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66FDFB027E"
-					client     	@543
-					supplier   	@483
-					vertices   	(list Points
-					    (49, 322)
-					    (49, 1415)
-					    (174, 1415))
-					line_style 	3
-					origin_attachment 	(49, 322)
-					terminal_attachment 	(174, 1415)
-					label      	(object SegLabel @547
-					    Parent_View 	@545
-					    location   	(91, 108)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	-0.196706
-					    height     	42
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @548
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(416, 448)
-				label      	(object ItemLabel
-				    Parent_View 	@548
-				    location   	(175, 412)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	483
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				width      	501
-				height     	97
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$121" @549
-				location   	(499, 589)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69C0590198"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$122" @550
-					Parent_View 	@549
-					location   	(-13, 109)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69C05D01E3"
-					client     	@549
-					supplier   	@548
-					vertices   	(list Points
-					    (499, 589)
-					    (452, 589)
-					    (452, 496))
-					line_style 	3
-					origin_attachment 	(499, 589)
-					terminal_attachment 	(452, 496))
-				    (object RoleView "substitutionGroupAffiliation" @551
-					Parent_View 	@549
-					location   	(-13, 109)
-					label      	(object SegLabel @552
-					    Parent_View 	@551
-					    location   	(811, 585)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	504
-					    justify    	0
-					    label      	"+substitutionGroupAffiliation"
-					    pctDist    	6.520833
-					    height     	5
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69C05D01ED"
-					client     	@549
-					supplier   	@548
-					vertices   	(list Points
-					    (499, 589)
-					    (547, 589)
-					    (547, 496))
-					line_style 	3
-					origin_attachment 	(499, 589)
-					terminal_attachment 	(547, 496)
-					label      	(object SegLabel @553
-					    Parent_View 	@551
-					    location   	(499, 559)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.000000
-					    height     	31
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$115" @554
-				location   	(241, 613)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B68338C0058"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$116" @555
-					Parent_View 	@554
-					location   	(-1343, -219)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B68338C03BF"
-					client     	@554
-					supplier   	@548
-					line_style 	3
-					origin_attachment 	(241, 613)
-					terminal_attachment 	(241, 496))
-				    (object RoleView "typeDefinition" @556
-					Parent_View 	@554
-					location   	(-1343, -219)
-					label      	(object SegLabel @557
-					    Parent_View 	@556
-					    location   	(408, 694)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+typeDefinition"
-					    pctDist    	0.686441
-					    height     	167
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B68338C03C0"
-					client     	@554
-					supplier   	@494
-					line_style 	3
-					origin_attachment 	(241, 613)
-					terminal_attachment 	(241, 731)
-					label      	(object SegLabel @558
-					    Parent_View 	@556
-					    location   	(202, 685)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.610169
-					    height     	39
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$117" @559
-				location   	(837, 460)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6833EF0160"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$118" @560
-					Parent_View 	@559
-					location   	(-1819, -68)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6833F00298"
-					client     	@559
-					supplier   	@548
-					line_style 	3
-					origin_attachment 	(837, 460)
-					terminal_attachment 	(666, 460))
-				    (object RoleView "identityConstraintDefinitions" @561
-					Parent_View 	@559
-					location   	(-1819, -68)
-					label      	(object SegLabel @562
-					    Parent_View 	@561
-					    location   	(880, 528)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	528
-					    justify    	0
-					    label      	"+identityConstraintDefinitions"
-					    pctDist    	0.251462
-					    height     	68
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6833F00299"
-					client     	@559
-					supplier   	@500
-					line_style 	3
-					origin_attachment 	(837, 460)
-					terminal_attachment 	(1008, 460)
-					label      	(object SegLabel @563
-					    Parent_View 	@561
-					    location   	(859, 407)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.130435
-					    height     	54
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$169" @564
-				location   	(541, 246)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B66EE8D01BF"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$170" @565
-					Parent_View 	@564
-					location   	(-1123, -186)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EE8E0198"
-					client     	@564
-					supplier   	@516
-					line_style 	3
-					origin_attachment 	(541, 246)
-					terminal_attachment 	(1013, 246))
-				    (object RoleView "elementDeclarations" @566
-					Parent_View 	@564
-					location   	(-1123, -186)
-					label      	(object SegLabel @567
-					    Parent_View 	@566
-					    location   	(443, 335)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+elementDeclarations"
-					    pctDist    	0.209302
-					    height     	89
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EE8E0199"
-					client     	@564
-					supplier   	@548
-					vertices   	(list Points
-					    (541, 246)
-					    (224, 246)
-					    (224, 400))
-					line_style 	3
-					origin_attachment 	(541, 246)
-					terminal_attachment 	(224, 400)
-					label      	(object SegLabel @568
-					    Parent_View 	@566
-					    location   	(186, 335)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.864693
-					    height     	39
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$123" @569
-				location   	(353, 621)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C42DBDD0297"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$124" @570
-					Parent_View 	@569
-					location   	(-63, 173)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C42DBE0011E"
-					client     	@569
-					supplier   	@548
-					vertices   	(list Points
-					    (353, 621)
-					    (306, 621)
-					    (306, 496))
-					line_style 	3
-					origin_attachment 	(353, 621)
-					terminal_attachment 	(306, 496))
-				    (object RoleView "substitutionGroup" @571
-					Parent_View 	@569
-					location   	(-63, 173)
-					label      	(object SegLabel @572
-					    Parent_View 	@571
-					    location   	(579, 636)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+substitutionGroup"
-					    pctDist    	4.808511
-					    height     	15
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C42DBE00128"
-					client     	@569
-					supplier   	@548
-					vertices   	(list Points
-					    (353, 621)
-					    (400, 621)
-					    (400, 496))
-					line_style 	3
-					origin_attachment 	(353, 621)
-					terminal_attachment 	(400, 496)
-					label      	(object SegLabel @573
-					    Parent_View 	@571
-					    location   	(350, 583)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	-0.069767
-					    height     	39
-					    orientation 	0))))))
-		    (object ClassDiagram "3. Component Attributes  (Part 1 : Structures)"
-			quid       	"3B69E78602C5"
-			title      	"3. Component Attributes  (Part 1 : Structures)"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDNamedComponent" @574
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 128)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@574
-				    location   	(46, 47)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	516
-				    justify    	0
-				    label      	"XSDNamedComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846D303A4"
-				compartment 	(object Compartment
-				    Parent_View 	@574
-				    location   	(46, 107)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	524
-				    compartmentItems 	(list Compartment
-					"+ name : String"
-					"+ targetNamespace : String"))
-				width      	534
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @575
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(288, 1648)
-				label      	(object ItemLabel
-				    Parent_View 	@575
-				    location   	(41, 1567)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	494
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	512
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @576
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2368, 1680)
-				label      	(object ItemLabel
-				    Parent_View 	@576
-				    location   	(1781, 1524)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1174
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				compartment 	(object Compartment
-				    Parent_View 	@576
-				    location   	(1781, 1584)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	5
-				    max_width  	1177
-				    compartmentItems 	(list Compartment
-					"+ derivationMethod : XSDDerivationMethod = restriction"
-					"<<0..*>> + final : XSDComplexFinal"
-					"+ abstract : boolean"
-					"+ contentTypeCategory : XSDContentTypeCategory"
-					"<<0..*>> + prohibitedSubstitutions : XSDProhibitedSubstitutions"))
-				width      	1192
-				height     	336
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @577
-				location   	(463, 362)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@574
-				vertices   	(list Points
-				    (463, 362)
-				    (463, 221)))
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @578
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1408, 1600)
-				label      	(object ItemLabel
-				    Parent_View 	@578
-				    location   	(1094, 1519)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	628
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				compartment 	(object Compartment
-				    Parent_View 	@578
-				    location   	(1094, 1579)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	628
-				    compartmentItems 	(list Compartment
-					"+ variety : XSDVariety"
-					"<<0..*>> + final : XSDSimpleFinal"))
-				width      	646
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUse" @579
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(912, 144)
-				label      	(object ItemLabel
-				    Parent_View 	@579
-				    location   	(647, 38)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	530
-				    justify    	0
-				    label      	"XSDAttributeUse")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B68354601A8"
-				compartment 	(object Compartment
-				    Parent_View 	@579
-				    location   	(647, 98)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	538
-				    compartmentItems 	(list Compartment
-					"+ required : boolean"
-					"+ value : Value"
-					"+ constraint : XSDConstraint"))
-				width      	548
-				height     	236
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @580
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(688, 1936)
-				label      	(object ItemLabel
-				    Parent_View 	@580
-				    location   	(45, 1830)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1286
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				compartment 	(object Compartment
-				    Parent_View 	@580
-				    location   	(45, 1890)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	1294
-				    compartmentItems 	(list Compartment
-					"+ namespaceConstraintCategory : XSDNamespaceConstraintCategory"
-					"<<0..*>> + namespaceConstraint : String"
-					"+ processContents : XSDProcessContents"))
-				width      	1304
-				height     	236
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroup" @581
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(336, 1440)
-				label      	(object ItemLabel
-				    Parent_View 	@581
-				    location   	(47, 1384)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	578
-				    justify    	0
-				    label      	"XSDModelGroup")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6834E00291"
-				width      	596
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDFeature" @582
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 512)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@582
-				    location   	(36, 431)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	536
-				    justify    	0
-				    label      	"XSDFeature")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B537026C"
-				compartment 	(object Compartment
-				    Parent_View 	@582
-				    location   	(36, 491)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	548
-				    compartmentItems 	(list Compartment
-					"+ value : Value"
-					"+ constraint : XSDConstraint"))
-				width      	554
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @583
-				location   	(294, 697)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@582
-				vertices   	(list Points
-				    (294, 697)
-				    (294, 605)))
-			    (object ClassView "Class" "Logical View::xsd::XSDXPathDefinition" @584
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2256, 128)
-				label      	(object ItemLabel
-				    Parent_View 	@584
-				    location   	(1995, 47)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	522
-				    justify    	0
-				    label      	"XSDXPathDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6D83BB0355"
-				width      	540
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefinableComponent" @585
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2688, 512)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@585
-				    location   	(2418, 460)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	540
-				    justify    	0
-				    label      	"XSDRedefinableComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B7FCA8B020B"
-				width      	558
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @586
-				location   	(2684, 962)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@585
-				vertices   	(list Points
-				    (2684, 962)
-				    (2684, 576)))
-			    (object ClassView "Class" "Logical View::xsd::XSDCompositor" @587
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 1200)
-				label      	(object ItemLabel
-				    Parent_View 	@587
-				    location   	(45, 1116)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"XSDCompositor")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@587
-				    location   	(45, 1066)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B869B620037"
-				width      	344
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDConstraint" @588
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(800, 528)
-				label      	(object ItemLabel
-				    Parent_View 	@588
-				    location   	(638, 469)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDConstraint")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@588
-				    location   	(638, 419)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B869E2601AE"
-				width      	342
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDDerivationMethod" @589
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2192, 2272)
-				label      	(object ItemLabel
-				    Parent_View 	@589
-				    location   	(1980, 2213)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	424
-				    justify    	0
-				    label      	"XSDDerivationMethod")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@589
-				    location   	(1980, 2163)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	424
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B86A0B000CE"
-				width      	442
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDIdentityConstraintCategory" @590
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1584, 176)
-				label      	(object ItemLabel
-				    Parent_View 	@590
-				    location   	(1281, 88)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	607
-				    justify    	0
-				    label      	"XSDIdentityConstraintCategory")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@590
-				    location   	(1281, 38)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	607
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B86A1E00272"
-				width      	625
-				height     	300
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDContentTypeCategory" @591
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2704, 2224)
-				label      	(object ItemLabel
-				    Parent_View 	@591
-				    location   	(2456, 2115)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	496
-				    justify    	0
-				    label      	"XSDContentTypeCategory")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@591
-				    location   	(2456, 2065)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	496
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B86A79F03A2"
-				width      	514
-				height     	342
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDVariety" @592
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(880, 1600)
-				label      	(object ItemLabel
-				    Parent_View 	@592
-				    location   	(708, 1516)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	344
-				    justify    	0
-				    label      	"XSDVariety")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@592
-				    location   	(708, 1466)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	344
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B8FF7730249"
-				width      	362
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDProcessContents" @593
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(976, 2240)
-				label      	(object ItemLabel
-				    Parent_View 	@593
-				    location   	(766, 2156)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	420
-				    justify    	0
-				    label      	"XSDProcessContents")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@593
-				    location   	(766, 2106)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	420
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B8FF8C70284"
-				width      	438
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDXPathVariety" @594
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2768, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@594
-				    location   	(2587, 97)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	363
-				    justify    	0
-				    label      	"XSDXPathVariety")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@594
-				    location   	(2587, 47)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	363
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B8FFB89033A"
-				width      	381
-				height     	250
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleFinal" @595
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1552, 1872)
-				label      	(object ItemLabel
-				    Parent_View 	@595
-				    location   	(1389, 1788)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"XSDSimpleFinal")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@595
-				    location   	(1389, 1738)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C25D0295"
-				compartment 	(object Compartment
-				    Parent_View 	@595
-				    location   	(1389, 1848)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	241
-				    compartmentItems 	(list Compartment
-					"+ list"
-					"+ restriction"
-					"+ union"))
-				width      	344
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexFinal" @596
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1968, 2000)
-				label      	(object ItemLabel
-				    Parent_View 	@596
-				    location   	(1786, 1941)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	364
-				    justify    	0
-				    label      	"XSDComplexFinal")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@596
-				    location   	(1786, 1891)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	364
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C2CA01CB"
-				compartment 	(object Compartment
-				    Parent_View 	@596
-				    location   	(1786, 2001)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	238
-				    compartmentItems 	(list Compartment
-					"+ extension"
-					"+ restriction"))
-				width      	382
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSubstitutionGroupExclusions" @597
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(800, 1184)
-				label      	(object ItemLabel
-				    Parent_View 	@597
-				    location   	(485, 1125)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	630
-				    justify    	0
-				    label      	"XSDSubstitutionGroupExclusions")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@597
-				    location   	(485, 1075)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	630
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C59100AE"
-				width      	648
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDDisallowedSubstitutions" @598
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1440, 1200)
-				label      	(object ItemLabel
-				    Parent_View 	@598
-				    location   	(1171, 1116)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	538
-				    justify    	0
-				    label      	"XSDDisallowedSubstitutions")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@598
-				    location   	(1171, 1066)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	538
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C5A403DF"
-				compartment 	(object Compartment
-				    Parent_View 	@598
-				    location   	(1171, 1176)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	264
-				    compartmentItems 	(list Compartment
-					"+ substitution"
-					"+ extension"
-					"+ restriction"))
-				width      	556
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDProhibitedSubstitutions" @599
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1664, 2272)
-				label      	(object ItemLabel
-				    Parent_View 	@599
-				    location   	(1398, 2213)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	532
-				    justify    	0
-				    label      	"XSDProhibitedSubstitutions")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@599
-				    location   	(1398, 2163)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	532
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C5BE0272"
-				compartment 	(object Compartment
-				    Parent_View 	@599
-				    location   	(1398, 2273)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	238
-				    compartmentItems 	(list Compartment
-					"+ extension"
-					"+ restriction"))
-				width      	550
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDNamespaceConstraintCategory" @600
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(384, 2240)
-				label      	(object ItemLabel
-				    Parent_View 	@600
-				    location   	(45, 2154)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	678
-				    justify    	0
-				    label      	"XSDNamespaceConstraintCategory")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@600
-				    location   	(45, 2104)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	678
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C5EA0023"
-				width      	696
-				height     	296
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @601
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1264, 880)
-				label      	(object ItemLabel
-				    Parent_View 	@601
-				    location   	(571, 749)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1386
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				compartment 	(object Compartment
-				    Parent_View 	@601
-				    location   	(571, 809)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	1396
-				    compartmentItems 	(list Compartment
-					"+ nillable : boolean"
-					"<<0..*>> + disallowedSubstitutions : XSDDisallowedSubstitutions"
-					"<<0..*>> + substitutionGroupExclusions : XSDSubstitutionGroupExclusions"
-					"+ abstract : boolean"))
-				width      	1404
-				height     	286
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @602
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69EDEE01BF"
-				client     	@601
-				supplier   	@582
-				line_style 	3
-				origin_attachment 	(681, 737)
-				terminal_attachment 	(681, 697)
-				drawSupplier 	@583)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @603
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(272, 864)
-				label      	(object ItemLabel
-				    Parent_View 	@603
-				    location   	(35, 812)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	474
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	492
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @604
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2688, 1152)
-				label      	(object ItemLabel
-				    Parent_View 	@604
-				    location   	(2420, 1100)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	536
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	554
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @605
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAC800D2"
-				client     	@604
-				supplier   	@585
-				line_style 	3
-				origin_attachment 	(2862, 1088)
-				terminal_attachment 	(2862, 962)
-				drawSupplier 	@586)
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @606
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2352, 1312)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@606
-				    location   	(2168, 1261)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	368
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	386
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @607
-				location   	(2375, 1465)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@606
-				vertices   	(list Points
-				    (2375, 1465)
-				    (2375, 1375)))
-			    (object InheritView "" @608
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAB1004D"
-				client     	@606
-				supplier   	@585
-				line_style 	3
-				origin_attachment 	(2368, 1249)
-				terminal_attachment 	(2368, 962)
-				drawSupplier 	@586)
-			    (object InheritView "" @609
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0D01901F1"
-				client     	@576
-				supplier   	@606
-				line_style 	3
-				origin_attachment 	(2818, 1512)
-				terminal_attachment 	(2818, 1465)
-				drawSupplier 	@607)
-			    (object InheritView "" @610
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A1302A2"
-				client     	@578
-				supplier   	@606
-				line_style 	3
-				origin_attachment 	(1406, 1507)
-				terminal_attachment 	(1406, 1465)
-				drawSupplier 	@607)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @611
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2064, 1152)
-				label      	(object ItemLabel
-				    Parent_View 	@611
-				    location   	(1818, 1101)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	492
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				width      	510
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @612
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAC40090"
-				client     	@611
-				supplier   	@585
-				line_style 	3
-				origin_attachment 	(2115, 1089)
-				terminal_attachment 	(2115, 962)
-				drawSupplier 	@586)
-			    (object ClassView "Class" "Logical View::xsd::XSDIdentityConstraintDefinition" @613
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1600, 528)
-				label      	(object ItemLabel
-				    Parent_View 	@613
-				    location   	(1034, 468)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1132
-				    justify    	0
-				    label      	"XSDIdentityConstraintDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B2603A2"
-				width      	1150
-				height     	144
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @614
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684AA30242"
-				client     	@613
-				supplier   	@574
-				line_style 	3
-				origin_attachment 	(1568, 456)
-				terminal_attachment 	(1568, 362)
-				drawSupplier 	@577)
-			    (object ClassView "Class" "Logical View::xsd::XSDNotationDeclaration" @615
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2320, 784)
-				label      	(object ItemLabel
-				    Parent_View 	@615
-				    location   	(2078, 703)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	484
-				    justify    	0
-				    label      	"XSDNotationDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDAA021C"
-				width      	502
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @616
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(176, 320)
-				label      	(object ItemLabel
-				    Parent_View 	@616
-				    location   	(43, 268)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	266
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	284
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @617
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B68494302F1"
-				client     	@615
-				supplier   	@574
-				line_style 	3
-				origin_attachment 	(2290, 691)
-				terminal_attachment 	(2290, 362)
-				drawSupplier 	@577)
-			    (object InheritView "" @618
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69B7DC0193"
-				client     	@603
-				supplier   	@582
-				line_style 	3
-				origin_attachment 	(141, 800)
-				terminal_attachment 	(141, 697)
-				drawSupplier 	@583)
-			    (object InheritView "" @619
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A2C0307"
-				client     	@582
-				supplier   	@574
-				line_style 	3
-				origin_attachment 	(372, 419)
-				terminal_attachment 	(372, 362)
-				drawSupplier 	@577)
-			    (object InheritView "" @620
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A26036D"
-				client     	@585
-				supplier   	@574
-				line_style 	3
-				origin_attachment 	(2687, 448)
-				terminal_attachment 	(2687, 362)
-				drawSupplier 	@577)))
-		    (object ClassDiagram "4. Component Hierarchy, Relations and Attributes (Part 2: Datatypes)"
-			quid       	"3B6C3265005F"
-			title      	"4. Component Hierarchy, Relations and Attributes (Part 2: Datatypes)"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDFixedFacet" @621
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(192, 896)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@621
-				    location   	(32, 840)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	320
-				    justify    	0
-				    label      	"XSDFixedFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C699E00C1"
-				width      	338
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRepeatableFacet" @622
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(720, 896)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@622
-				    location   	(504, 845)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	432
-				    justify    	0
-				    label      	"XSDRepeatableFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C6AA6031A"
-				width      	450
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDEnumerationFacet" @623
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(496, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@623
-				    location   	(266, 1112)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	460
-				    justify    	0
-				    label      	"XSDEnumerationFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C6ACE0141"
-				width      	478
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDPatternFacet" @624
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1008, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@624
-				    location   	(777, 1112)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	462
-				    justify    	0
-				    label      	"XSDPatternFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C6ADB026C"
-				width      	480
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @625
-				location   	(718, 1049)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@622
-				vertices   	(list Points
-				    (718, 1049)
-				    (718, 959)))
-			    (object ClassView "Class" "Logical View::xsd::XSDOrderedFacet" @626
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2000, 928)
-				label      	(object ItemLabel
-				    Parent_View 	@626
-				    location   	(1799, 872)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	402
-				    justify    	0
-				    label      	"XSDOrderedFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C74DD0248"
-				width      	420
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDBoundedFacet" @627
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1568, 928)
-				label      	(object ItemLabel
-				    Parent_View 	@627
-				    location   	(1383, 872)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	370
-				    justify    	0
-				    label      	"XSDBoundedFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C751D0344"
-				width      	388
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDCardinalityFacet" @628
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2032, 1104)
-				label      	(object ItemLabel
-				    Parent_View 	@628
-				    location   	(1807, 1048)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	450
-				    justify    	0
-				    label      	"XSDCardinalityFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C755D03D2"
-				width      	468
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDNumericFacet" @629
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1504, 1104)
-				label      	(object ItemLabel
-				    Parent_View 	@629
-				    location   	(1319, 1049)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	370
-				    justify    	0
-				    label      	"XSDNumericFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C75950206"
-				width      	388
-				height     	134
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDLengthFacet" @630
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(656, 1376)
-				label      	(object ItemLabel
-				    Parent_View 	@630
-				    location   	(491, 1320)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	330
-				    justify    	0
-				    label      	"XSDLengthFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C776200E7"
-				width      	348
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinLengthFacet" @631
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(608, 1552)
-				label      	(object ItemLabel
-				    Parent_View 	@631
-				    location   	(405, 1497)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	406
-				    justify    	0
-				    label      	"XSDMinLengthFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C778C0065"
-				width      	424
-				height     	134
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @632
-				location   	(144, 1262)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@621
-				vertices   	(list Points
-				    (144, 1262)
-				    (144, 964)))
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxLengthFacet" @633
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1216, 1552)
-				label      	(object ItemLabel
-				    Parent_View 	@633
-				    location   	(1007, 1497)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	418
-				    justify    	0
-				    label      	"XSDMaxLengthFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C77C70146"
-				width      	436
-				height     	134
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDWhiteSpaceFacet" @634
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1120, 1376)
-				label      	(object ItemLabel
-				    Parent_View 	@634
-				    location   	(880, 1320)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	480
-				    justify    	0
-				    label      	"XSDWhiteSpaceFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C784601B7"
-				width      	498
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxInclusiveFacet" @635
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1312, 1728)
-				label      	(object ItemLabel
-				    Parent_View 	@635
-				    location   	(1090, 1676)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	444
-				    justify    	0
-				    label      	"XSDMaxInclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C787D00DA"
-				width      	462
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxExclusiveFacet" @636
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1424, 1904)
-				label      	(object ItemLabel
-				    Parent_View 	@636
-				    location   	(1193, 1852)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	462
-				    justify    	0
-				    label      	"XSDMaxExclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C789600C2"
-				width      	480
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinInclusiveFacet" @637
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(496, 1728)
-				label      	(object ItemLabel
-				    Parent_View 	@637
-				    location   	(282, 1676)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	428
-				    justify    	0
-				    label      	"XSDMinInclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C788702C9"
-				width      	446
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinExclusiveFacet" @638
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(352, 1904)
-				label      	(object ItemLabel
-				    Parent_View 	@638
-				    location   	(124, 1852)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	456
-				    justify    	0
-				    label      	"XSDMinExclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C792D000A"
-				width      	474
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDTotalDigitsFacet" @639
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 2112)
-				label      	(object ItemLabel
-				    Parent_View 	@639
-				    location   	(52, 2056)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	408
-				    justify    	0
-				    label      	"XSDTotalDigitsFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C79A0020E"
-				width      	426
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDFractionDigitsFacet" @640
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1552, 2112)
-				label      	(object ItemLabel
-				    Parent_View 	@640
-				    location   	(1318, 2056)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"XSDFractionDigitsFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C79BE02EE"
-				width      	486
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @641
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C9D03C7"
-				client     	@623
-				supplier   	@622
-				line_style 	3
-				origin_attachment 	(394, 1100)
-				terminal_attachment 	(394, 1049)
-				drawSupplier 	@625)
-			    (object InheritView "" @642
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C78620045"
-				client     	@634
-				supplier   	@621
-				line_style 	3
-				origin_attachment 	(1119, 1308)
-				terminal_attachment 	(1119, 1262)
-				drawSupplier 	@632)
-			    (object ClassView "Class" "Logical View::xsd::XSDComponent" @643
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(336, 160)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@643
-				    location   	(174, 117)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846E90029"
-				width      	342
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @644
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6CA5038D"
-				client     	@624
-				supplier   	@622
-				line_style 	3
-				origin_attachment 	(1044, 1100)
-				terminal_attachment 	(1044, 1049)
-				drawSupplier 	@625)
-			    (object InheritView "" @645
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C778002DF"
-				client     	@630
-				supplier   	@621
-				line_style 	3
-				origin_attachment 	(663, 1308)
-				terminal_attachment 	(663, 1262)
-				drawSupplier 	@632)
-			    (object ClassView "Class" "Logical View::xsd::XSDOrdered" @646
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2048, 1408)
-				label      	(object ItemLabel
-				    Parent_View 	@646
-				    location   	(1835, 1324)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	426
-				    justify    	0
-				    label      	"XSDOrdered")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@646
-				    location   	(1835, 1274)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	426
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3BC7715202E4"
-				width      	444
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDCardinality" @647
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2048, 1728)
-				label      	(object ItemLabel
-				    Parent_View 	@647
-				    location   	(1835, 1669)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	426
-				    justify    	0
-				    label      	"XSDCardinality")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@647
-				    location   	(1835, 1619)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	426
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3BC7715D009B"
-				width      	444
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDWhiteSpace" @648
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2064, 2032)
-				label      	(object ItemLabel
-				    Parent_View 	@648
-				    location   	(1861, 1951)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	406
-				    justify    	0
-				    label      	"XSDWhiteSpace")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@648
-				    location   	(1861, 1901)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	406
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3BEED0F60342"
-				width      	424
-				height     	287
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::Value" @649
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(880, 2096)
-				label      	(object ItemLabel
-				    Parent_View 	@649
-				    location   	(571, 2062)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	618
-				    justify    	0
-				    label      	"Value")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@649
-				    location   	(571, 2012)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	618
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	14671839
-				quidu      	"3C040B5B031F"
-				width      	636
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @650
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B610337"
-				client     	@639
-				supplier   	@621
-				line_style 	3
-				origin_attachment 	(75, 2044)
-				terminal_attachment 	(75, 1262)
-				drawSupplier 	@632)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinFacet" @651
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 1376)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@651
-				    location   	(113, 1320)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	286
-				    justify    	0
-				    label      	"XSDMinFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C0A1CDE037C"
-				compartment 	(object Compartment
-				    Parent_View 	@651
-				    location   	(113, 1380)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	290
-				    compartmentItems 	(list Compartment
-					"+ value : Value"))
-				width      	304
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxFacet" @652
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1584, 1376)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@652
-				    location   	(1440, 1320)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	288
-				    justify    	0
-				    label      	"XSDMaxFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C0A1CEB010E"
-				compartment 	(object Compartment
-				    Parent_View 	@652
-				    location   	(1440, 1380)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	294
-				    compartmentItems 	(list Compartment
-					"+ value : Value"))
-				width      	306
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @653
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C0A1D240098"
-				client     	@651
-				supplier   	@621
-				line_style 	3
-				origin_attachment 	(235, 1308)
-				terminal_attachment 	(235, 1262)
-				drawSupplier 	@632)
-			    (object InheritView "" @654
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C0A1D3103AD"
-				client     	@652
-				supplier   	@621
-				line_style 	3
-				origin_attachment 	(1581, 1308)
-				terminal_attachment 	(1581, 1262)
-				drawSupplier 	@632)
-			    (object InheritView "" @655
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B520353"
-				client     	@637
-				supplier   	@651
-				line_style 	3
-				origin_attachment 	(285, 1664)
-				terminal_attachment 	(285, 1444))
-			    (object InheritView "" @656
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B8303B8"
-				client     	@635
-				supplier   	@652
-				line_style 	3
-				origin_attachment 	(1500, 1664)
-				terminal_attachment 	(1500, 1444))
-			    (object InheritView "" @657
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B8E0309"
-				client     	@636
-				supplier   	@652
-				line_style 	3
-				origin_attachment 	(1622, 1840)
-				terminal_attachment 	(1622, 1444))
-			    (object InheritView "" @658
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C77C400C0"
-				client     	@631
-				supplier   	@621
-				line_style 	3
-				origin_attachment 	(447, 1485)
-				terminal_attachment 	(447, 1262)
-				drawSupplier 	@632)
-			    (object InheritView "" @659
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B7D00FC"
-				client     	@633
-				supplier   	@621
-				line_style 	3
-				origin_attachment 	(1397, 1485)
-				terminal_attachment 	(1397, 1262)
-				drawSupplier 	@632)
-			    (object InheritView "" @660
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B990016"
-				client     	@640
-				supplier   	@621
-				line_style 	3
-				origin_attachment 	(1775, 2044)
-				terminal_attachment 	(1775, 1262)
-				drawSupplier 	@632)
-			    (object ClassView "Class" "Logical View::xsd::XSDFacet" @661
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(368, 368)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@661
-				    location   	(174, 318)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	388
-				    justify    	0
-				    label      	"XSDFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C359403D2"
-				width      	406
-				height     	125
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @662
-				location   	(366, 522)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@661
-				vertices   	(list Points
-				    (366, 522)
-				    (366, 430)))
-			    (object ClassView "Class" "Logical View::xsd::XSDConstrainingFacet" @663
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 624)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@663
-				    location   	(34, 573)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	444
-				    justify    	0
-				    label      	"XSDConstrainingFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C6B340093"
-				width      	462
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @664
-				location   	(272, 781)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@663
-				vertices   	(list Points
-				    (272, 781)
-				    (272, 687)))
-			    (object InheritView "" @665
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C8F002E"
-				client     	@622
-				supplier   	@663
-				line_style 	3
-				origin_attachment 	(594, 833)
-				terminal_attachment 	(594, 781)
-				drawSupplier 	@664)
-			    (object ClassView "Class" "Logical View::xsd::XSDFundamentalFacet" @666
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(752, 624)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@666
-				    location   	(526, 573)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	452
-				    justify    	0
-				    label      	"XSDFundamentalFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C69E801D6"
-				width      	470
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @667
-				location   	(768, 789)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@666
-				vertices   	(list Points
-				    (768, 789)
-				    (768, 687)))
-			    (object InheritView "" @668
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7659012C"
-				client     	@626
-				supplier   	@666
-				line_style 	3
-				origin_attachment 	(2050, 860)
-				terminal_attachment 	(2050, 789)
-				drawSupplier 	@667)
-			    (object InheritView "" @669
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C763C0224"
-				client     	@627
-				supplier   	@666
-				line_style 	3
-				origin_attachment 	(1525, 860)
-				terminal_attachment 	(1525, 789)
-				drawSupplier 	@667)
-			    (object InheritView "" @670
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C764F0131"
-				client     	@628
-				supplier   	@666
-				line_style 	3
-				origin_attachment 	(2237, 1036)
-				terminal_attachment 	(2237, 789)
-				drawSupplier 	@667)
-			    (object InheritView "" @671
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C76420074"
-				client     	@629
-				supplier   	@666
-				line_style 	3
-				origin_attachment 	(1328, 1037)
-				terminal_attachment 	(1328, 789)
-				drawSupplier 	@667)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @672
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1456, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@672
-				    location   	(1137, 47)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	638
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				compartment 	(object Compartment
-				    Parent_View 	@672
-				    location   	(1137, 107)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	628
-				    compartmentItems 	(list Compartment
-					"+ variety : XSDVariety"
-					"<<0..*>> + final : XSDSimpleFinal"))
-				width      	656
-				height     	250
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$127" @673
-				location   	(775, 178)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D597102EA"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$128" @674
-					Parent_View 	@673
-					location   	(-1209, -46)
-					label      	(object SegLabel @675
-					    Parent_View 	@674
-					    location   	(509, 235)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D59750119"
-					client     	@673
-					supplier   	@661
-					vertices   	(list Points
-					    (775, 178)
-					    (550, 178)
-					    (550, 306))
-					line_style 	3
-					origin_attachment 	(775, 178)
-					terminal_attachment 	(550, 306))
-				    (object RoleView "simpleTypeDefinition" @676
-					Parent_View 	@673
-					location   	(-1209, -46)
-					label      	(object SegLabel @677
-					    Parent_View 	@676
-					    location   	(875, 136)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+simpleTypeDefinition"
-					    pctDist    	0.283133
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D59750105"
-					client     	@673
-					supplier   	@672
-					line_style 	3
-					origin_attachment 	(775, 178)
-					terminal_attachment 	(1128, 178)
-					label      	(object SegLabel @678
-					    Parent_View 	@676
-					    location   	(1061, 215)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.812500
-					    height     	37
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$189" @679
-				location   	(369, 72)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BC8AE0203A8"
-				roleview_list 	(list RoleViews
-				    (object RoleView "facets" @680
-					Parent_View 	@679
-					location   	(-1615, -152)
-					label      	(object SegLabel @681
-					    Parent_View 	@680
-					    location   	(187, 496)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	132
-					    justify    	0
-					    label      	"+facets"
-					    pctDist    	0.913863
-					    height     	87
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BC8AE060065"
-					client     	@679
-					supplier   	@663
-					vertices   	(list Points
-					    (369, 72)
-					    (100, 72)
-					    (100, 561))
-					line_style 	3
-					origin_attachment 	(369, 72)
-					terminal_attachment 	(100, 561)
-					label      	(object SegLabel @682
-					    Parent_View 	@680
-					    location   	(60, 498)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.917900
-					    height     	41
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$190" @683
-					Parent_View 	@679
-					location   	(-1615, -152)
-					label      	(object SegLabel @684
-					    Parent_View 	@683
-					    location   	(976, 31)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BC8AE060051"
-					client     	@679
-					supplier   	@672
-					line_style 	3
-					origin_attachment 	(369, 72)
-					terminal_attachment 	(1128, 72))))
-			    (object AssociationViewNew "$UNNAMED$231" @685
-				location   	(1538, 508)
-				label      	(object SegLabel @686
-				    Parent_View 	@685
-				    location   	(1538, 449)
-				    font       	(object Font
-					italics    	TRUE)
-				    hidden     	TRUE
-				    anchor     	1
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	60
-				    justify    	0
-				    label      	""
-				    pctDist    	0.500000
-				    height     	60
-				    orientation 	0)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C276DA000DE"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$232" @687
-					Parent_View 	@685
-					location   	(-446, 284)
-					label      	(object SegLabel @688
-					    Parent_View 	@687
-					    location   	(1446, 340)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C276DA000DF"
-					client     	@685
-					supplier   	@672
-					vertices   	(list Points
-					    (1538, 508)
-					    (1487, 508)
-					    (1487, 285))
-					line_style 	3
-					origin_attachment 	(1538, 508)
-					terminal_attachment 	(1487, 285))
-				    (object RoleView "itemTypeDefinition" @689
-					Parent_View 	@685
-					location   	(-446, 284)
-					label      	(object SegLabel @690
-					    Parent_View 	@689
-					    location   	(1423, 577)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	360
-					    justify    	0
-					    label      	"+itemTypeDefinition"
-					    pctDist    	-2.211539
-					    height     	69
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C276DA000E0"
-					client     	@685
-					supplier   	@672
-					vertices   	(list Points
-					    (1538, 508)
-					    (1590, 508)
-					    (1590, 285))
-					line_style 	3
-					origin_attachment 	(1538, 508)
-					terminal_attachment 	(1590, 285)
-					label      	(object SegLabel @691
-					    Parent_View 	@689
-					    location   	(1539, 468)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.003984
-					    height     	41
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$191" @692
-				location   	(1729, 574)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C34B70208"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$192" @693
-					Parent_View 	@692
-					location   	(-255, 350)
-					label      	(object SegLabel @694
-					    Parent_View 	@693
-					    location   	(1637, 353)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6C34BE0258"
-					client     	@692
-					supplier   	@672
-					vertices   	(list Points
-					    (1729, 574)
-					    (1678, 574)
-					    (1678, 285))
-					line_style 	3
-					origin_attachment 	(1729, 574)
-					terminal_attachment 	(1678, 285))
-				    (object RoleView "memberTypeDefinitions" @695
-					Parent_View 	@692
-					location   	(-255, 350)
-					label      	(object SegLabel @696
-					    Parent_View 	@695
-					    location   	(1559, 654)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	444
-					    justify    	0
-					    label      	"+memberTypeDefinitions"
-					    pctDist    	-3.269231
-					    height     	80
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6C34BE0259"
-					client     	@692
-					supplier   	@672
-					vertices   	(list Points
-					    (1729, 574)
-					    (1781, 574)
-					    (1781, 285))
-					line_style 	3
-					origin_attachment 	(1729, 574)
-					terminal_attachment 	(1781, 285)
-					label      	(object SegLabel @697
-					    Parent_View 	@695
-					    location   	(1730, 520)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.312121
-					    height     	52
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$193" @698
-				location   	(748, 269)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C363201DB"
-				roleview_list 	(list RoleViews
-				    (object RoleView "fundamentalFacets" @699
-					Parent_View 	@698
-					location   	(-1236, 45)
-					label      	(object SegLabel @700
-					    Parent_View 	@699
-					    location   	(873, 312)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+fundamentalFacets"
-					    pctDist    	-1.409091
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6C36350063"
-					client     	@698
-					supplier   	@666
-					vertices   	(list Points
-					    (748, 269)
-					    (659, 269)
-					    (659, 561))
-					line_style 	3
-					origin_attachment 	(748, 269)
-					terminal_attachment 	(659, 561)
-					label      	(object SegLabel @701
-					    Parent_View 	@699
-					    location   	(728, 385)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..*"
-					    pctDist    	0.538028
-					    height     	69
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$194" @702
-					Parent_View 	@698
-					location   	(-1236, 45)
-					label      	(object SegLabel @703
-					    Parent_View 	@702
-					    location   	(1052, 228)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6C36350059"
-					client     	@698
-					supplier   	@672
-					line_style 	3
-					origin_attachment 	(748, 269)
-					terminal_attachment 	(1128, 269))))
-			    (object AssociationViewNew "$UNNAMED$195" @704
-				location   	(1175, 396)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D35AB0273"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$196" @705
-					Parent_View 	@704
-					location   	(-809, 172)
-					label      	(object SegLabel @706
-					    Parent_View 	@705
-					    location   	(1094, 316)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D35B20291"
-					client     	@704
-					supplier   	@672
-					vertices   	(list Points
-					    (1175, 396)
-					    (1135, 396)
-					    (1135, 285))
-					line_style 	3
-					origin_attachment 	(1175, 396)
-					terminal_attachment 	(1135, 285))
-				    (object RoleView "baseTypeDefinition" @707
-					Parent_View 	@704
-					location   	(-809, 172)
-					label      	(object SegLabel @708
-					    Parent_View 	@707
-					    location   	(1074, 443)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+baseTypeDefinition"
-					    pctDist    	-2.533333
-					    height     	47
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D35B202A5"
-					client     	@704
-					supplier   	@672
-					vertices   	(list Points
-					    (1175, 396)
-					    (1215, 396)
-					    (1215, 285))
-					line_style 	3
-					origin_attachment 	(1175, 396)
-					terminal_attachment 	(1215, 285)
-					label      	(object SegLabel @709
-					    Parent_View 	@707
-					    location   	(1172, 359)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.096154
-					    height     	38
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$197" @710
-				location   	(1360, 446)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D5572016C"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$198" @711
-					Parent_View 	@710
-					location   	(-624, 222)
-					label      	(object SegLabel @712
-					    Parent_View 	@711
-					    location   	(1268, 327)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D5575022F"
-					client     	@710
-					supplier   	@672
-					vertices   	(list Points
-					    (1360, 446)
-					    (1309, 446)
-					    (1309, 285))
-					line_style 	3
-					origin_attachment 	(1360, 446)
-					terminal_attachment 	(1309, 285))
-				    (object RoleView "primitiveTypeDefinition" @713
-					Parent_View 	@710
-					location   	(-624, 222)
-					label      	(object SegLabel @714
-					    Parent_View 	@713
-					    location   	(1204, 508)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	432
-					    justify    	0
-					    label      	"+primitiveTypeDefinition"
-					    pctDist    	-3.000000
-					    height     	62
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D55750243"
-					client     	@710
-					supplier   	@672
-					vertices   	(list Points
-					    (1360, 446)
-					    (1412, 446)
-					    (1412, 285))
-					line_style 	3
-					origin_attachment 	(1360, 446)
-					terminal_attachment 	(1412, 285)
-					label      	(object SegLabel @715
-					    Parent_View 	@713
-					    location   	(1373, 409)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.062147
-					    height     	38
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleFinal" @716
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2080, 512)
-				label      	(object ItemLabel
-				    Parent_View 	@716
-				    location   	(1917, 428)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"XSDSimpleFinal")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@716
-				    location   	(1917, 378)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C25D0295"
-				compartment 	(object Compartment
-				    Parent_View 	@716
-				    location   	(1917, 488)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	3
-				    max_width  	238
-				    compartmentItems 	(list Compartment
-					"+ list"
-					"+ restriction"
-					"+ union"))
-				width      	344
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDVariety" @717
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2080, 176)
-				label      	(object ItemLabel
-				    Parent_View 	@717
-				    location   	(1918, 92)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDVariety")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@717
-				    location   	(1918, 42)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B8FF7730249"
-				width      	342
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @718
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C7B0396"
-				client     	@666
-				supplier   	@661
-				line_style 	3
-				origin_attachment 	(591, 561)
-				terminal_attachment 	(591, 522)
-				drawSupplier 	@662)
-			    (object InheritView "" @719
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C800394"
-				client     	@663
-				supplier   	@661
-				line_style 	3
-				origin_attachment 	(272, 561)
-				terminal_attachment 	(272, 522)
-				drawSupplier 	@662)
-			    (object InheritView "" @720
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D25680259"
-				client     	@661
-				supplier   	@643
-				line_style 	3
-				origin_attachment 	(366, 306)
-				terminal_attachment 	(366, 215))
-			    (object InheritView "" @721
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C8801B4"
-				client     	@621
-				supplier   	@663
-				line_style 	3
-				origin_attachment 	(147, 828)
-				terminal_attachment 	(147, 781)
-				drawSupplier 	@664)
-			    (object InheritView "" @722
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B590281"
-				client     	@638
-				supplier   	@651
-				line_style 	3
-				origin_attachment 	(150, 1840)
-				terminal_attachment 	(150, 1444))))
-		    (object ClassDiagram "5. Component Annotations"
-			quid       	"3B69D68D00D2"
-			title      	"5. Component Annotations"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUse" @723
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 80)
-				label      	(object ItemLabel
-				    Parent_View 	@723
-				    location   	(88, 37)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	336
-				    justify    	0
-				    label      	"XSDAttributeUse")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B68354601A8"
-				width      	354
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @724
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 1696)
-				label      	(object ItemLabel
-				    Parent_View 	@724
-				    location   	(82, 1653)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	252
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	270
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @725
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1872, 1504)
-				label      	(object ItemLabel
-				    Parent_View 	@725
-				    location   	(1626, 1461)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	492
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				width      	510
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDConstrainingFacet" @726
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1888, 304)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@726
-				    location   	(1663, 261)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	450
-				    justify    	0
-				    label      	"XSDConstrainingFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C6B340093"
-				width      	468
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDIdentityConstraintDefinition" @727
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(368, 1360)
-				label      	(object ItemLabel
-				    Parent_View 	@727
-				    location   	(74, 1317)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	588
-				    justify    	0
-				    label      	"XSDIdentityConstraintDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B2603A2"
-				width      	606
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDNotationDeclaration" @728
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(320, 704)
-				label      	(object ItemLabel
-				    Parent_View 	@728
-				    location   	(86, 661)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"XSDNotationDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDAA021C"
-				width      	486
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @729
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(320, 1184)
-				label      	(object ItemLabel
-				    Parent_View 	@729
-				    location   	(74, 1141)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	492
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				width      	510
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @730
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(320, 544)
-				label      	(object ItemLabel
-				    Parent_View 	@730
-				    location   	(86, 501)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				width      	486
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @731
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1200, 80)
-				label      	(object ItemLabel
-				    Parent_View 	@731
-				    location   	(1068, 37)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	264
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	282
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @732
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1936, 1216)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@732
-				    location   	(1750, 1173)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	372
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	390
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @733
-				location   	(1994, 1412)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@732
-				vertices   	(list Points
-				    (1994, 1412)
-				    (1994, 1271)))
-			    (object InheritView "" @734
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A1302A2"
-				client     	@725
-				supplier   	@732
-				line_style 	3
-				origin_attachment 	(2084, 1449)
-				terminal_attachment 	(2084, 1412)
-				drawSupplier 	@733)
-			    (object ClassView "Class" "Logical View::xsd::XSDXPathDefinition" @735
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(272, 864)
-				label      	(object ItemLabel
-				    Parent_View 	@735
-				    location   	(80, 821)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	384
-				    justify    	0
-				    label      	"XSDXPathDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6D83BB0355"
-				width      	402
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDFacet" @736
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2000, 80)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@736
-				    location   	(1892, 37)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	216
-				    justify    	0
-				    label      	"XSDFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C359403D2"
-				width      	234
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @737
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(352, 384)
-				label      	(object ItemLabel
-				    Parent_View 	@737
-				    location   	(84, 341)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	536
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	554
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @738
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(320, 224)
-				label      	(object ItemLabel
-				    Parent_View 	@738
-				    location   	(86, 181)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	486
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @739
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1792, 1712)
-				label      	(object ItemLabel
-				    Parent_View 	@739
-				    location   	(1467, 1674)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	651
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				width      	669
-				height     	100
-				annotation 	8)
-			    (object InheritView "" @740
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0D01901F1"
-				client     	@739
-				supplier   	@732
-				line_style 	3
-				origin_attachment 	(1572, 1662)
-				terminal_attachment 	(1572, 1412)
-				drawSupplier 	@733)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroup" @741
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 1024)
-				label      	(object ItemLabel
-				    Parent_View 	@741
-				    location   	(78, 981)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDModelGroup")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6834E00291"
-				width      	342
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDRepeatableFacet" @742
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1904, 560)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@742
-				    location   	(1688, 517)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	432
-				    justify    	0
-				    label      	"XSDRepeatableFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C6AA6031A"
-				width      	450
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @743
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 1536)
-				label      	(object ItemLabel
-				    Parent_View 	@743
-				    location   	(71, 1493)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	274
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				width      	292
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAnnotation" @744
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1232, 944)
-				label      	(object ItemLabel
-				    Parent_View 	@744
-				    location   	(872, 685)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	720
-				    justify    	0
-				    label      	"XSDAnnotation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDC80233"
-				width      	738
-				height     	543
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$133" @745
-				location   	(865, 1359)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB0D0183"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$134" @746
-					Parent_View 	@745
-					location   	(-255, 559)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB0D033C"
-					client     	@745
-					supplier   	@727
-					line_style 	3
-					origin_attachment 	(865, 1359)
-					terminal_attachment 	(671, 1359))
-				    (object RoleView "annotation" @747
-					Parent_View 	@745
-					location   	(-255, 559)
-					label      	(object SegLabel @748
-					    Parent_View 	@747
-					    location   	(798, 1321)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	-1.116667
-					    height     	39
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB0D0346"
-					client     	@745
-					supplier   	@744
-					vertices   	(list Points
-					    (865, 1359)
-					    (925, 1359)
-					    (925, 1215))
-					line_style 	3
-					origin_attachment 	(865, 1359)
-					terminal_attachment 	(925, 1215)
-					label      	(object SegLabel @749
-					    Parent_View 	@747
-					    location   	(987, 1276)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.706422
-					    height     	62
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$157" @750
-				location   	(713, 709)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB0F0212"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$158" @751
-					Parent_View 	@750
-					location   	(-407, -90)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB1000C9"
-					client     	@750
-					supplier   	@728
-					line_style 	3
-					origin_attachment 	(713, 709)
-					terminal_attachment 	(563, 709))
-				    (object RoleView "annotation" @752
-					Parent_View 	@750
-					location   	(-407, -90)
-					label      	(object SegLabel @753
-					    Parent_View 	@752
-					    location   	(727, 667)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.095238
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB1000D3"
-					client     	@750
-					supplier   	@744
-					line_style 	3
-					origin_attachment 	(713, 709)
-					terminal_attachment 	(863, 709)
-					label      	(object SegLabel @754
-					    Parent_View 	@752
-					    location   	(796, 753)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.553571
-					    height     	44
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$151" @755
-				location   	(719, 1193)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB15008A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$152" @756
-					Parent_View 	@755
-					location   	(-401, 393)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB160096"
-					client     	@755
-					supplier   	@729
-					line_style 	3
-					origin_attachment 	(719, 1193)
-					terminal_attachment 	(575, 1193))
-				    (object RoleView "annotation" @757
-					Parent_View 	@755
-					location   	(-401, 393)
-					label      	(object SegLabel @758
-					    Parent_View 	@757
-					    location   	(720, 1147)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.006993
-					    height     	47
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB1600A0"
-					client     	@755
-					supplier   	@744
-					line_style 	3
-					origin_attachment 	(719, 1193)
-					terminal_attachment 	(863, 1193)
-					label      	(object SegLabel @759
-					    Parent_View 	@757
-					    location   	(806, 1240)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.604167
-					    height     	47
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$111" @760
-				location   	(785, 550)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB0A0066"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$112" @761
-					Parent_View 	@760
-					location   	(-335, -250)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB0B023F"
-					client     	@760
-					supplier   	@730
-					line_style 	3
-					origin_attachment 	(785, 550)
-					terminal_attachment 	(563, 550))
-				    (object RoleView "annotation" @762
-					Parent_View 	@760
-					location   	(-335, -250)
-					label      	(object SegLabel @763
-					    Parent_View 	@762
-					    location   	(779, 516)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	-0.070707
-					    height     	35
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB0B0249"
-					client     	@760
-					supplier   	@744
-					vertices   	(list Points
-					    (785, 550)
-					    (884, 550)
-					    (884, 673))
-					line_style 	3
-					origin_attachment 	(785, 550)
-					terminal_attachment 	(884, 673)
-					label      	(object SegLabel @764
-					    Parent_View 	@762
-					    location   	(935, 612)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.729730
-					    height     	51
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$183" @765
-				location   	(1184, 404)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69E4560290"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$184" @766
-					Parent_View 	@765
-					location   	(-32, -412)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69E4570165"
-					client     	@765
-					supplier   	@731
-					line_style 	3
-					origin_attachment 	(1184, 404)
-					terminal_attachment 	(1184, 135))
-				    (object RoleView "annotations" @767
-					Parent_View 	@765
-					location   	(-32, -412)
-					label      	(object SegLabel @768
-					    Parent_View 	@767
-					    location   	(1324, 226)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	249
-					    justify    	0
-					    label      	"+annotations"
-					    pctDist    	-0.665428
-					    height     	140
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69E457016F"
-					client     	@765
-					supplier   	@744
-					line_style 	3
-					origin_attachment 	(1184, 404)
-					terminal_attachment 	(1184, 673)
-					label      	(object SegLabel @769
-					    Parent_View 	@767
-					    location   	(1251, 615)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.784387
-					    height     	67
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$199" @770
-				location   	(1752, 1034)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69E2910158"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$200" @771
-					Parent_View 	@770
-					location   	(536, 218)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69E292019F"
-					client     	@770
-					supplier   	@732
-					vertices   	(list Points
-					    (1752, 1034)
-					    (1812, 1034)
-					    (1812, 1161))
-					line_style 	3
-					origin_attachment 	(1752, 1034)
-					terminal_attachment 	(1812, 1161))
-				    (object RoleView "annotation" @772
-					Parent_View 	@770
-					location   	(536, 218)
-					label      	(object SegLabel @773
-					    Parent_View 	@772
-					    location   	(1743, 997)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.059603
-					    height     	37
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69E29201A9"
-					client     	@770
-					supplier   	@744
-					line_style 	3
-					origin_attachment 	(1752, 1034)
-					terminal_attachment 	(1601, 1034)
-					label      	(object SegLabel @774
-					    Parent_View 	@772
-					    location   	(1684, 1066)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.450331
-					    height     	32
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$201" @775
-				location   	(1896, 881)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B9006CF0088"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$202" @776
-					Parent_View 	@775
-					location   	(621, 40)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B9006D1015D"
-					client     	@775
-					supplier   	@732
-					vertices   	(list Points
-					    (1896, 881)
-					    (1956, 881)
-					    (1956, 1161))
-					line_style 	3
-					origin_attachment 	(1896, 881)
-					terminal_attachment 	(1956, 1161))
-				    (object RoleView "derivationAnnotation" @777
-					Parent_View 	@775
-					location   	(621, 40)
-					label      	(object SegLabel @778
-					    Parent_View 	@777
-					    location   	(1821, 842)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	390
-					    justify    	0
-					    label      	"+derivationAnnotation"
-					    pctDist    	0.254237
-					    height     	40
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B9006D10167"
-					client     	@775
-					supplier   	@744
-					line_style 	3
-					origin_attachment 	(1896, 881)
-					terminal_attachment 	(1601, 881)
-					label      	(object SegLabel @779
-					    Parent_View 	@777
-					    location   	(1689, 914)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.705085
-					    height     	33
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$203" @780
-				location   	(2040, 715)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB330264"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$204" @781
-					Parent_View 	@780
-					location   	(920, -85)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB340284"
-					client     	@780
-					supplier   	@732
-					vertices   	(list Points
-					    (2040, 715)
-					    (2100, 715)
-					    (2100, 1161))
-					line_style 	3
-					origin_attachment 	(2040, 715)
-					terminal_attachment 	(2100, 1161))
-				    (object RoleView "annotations" @782
-					Parent_View 	@780
-					location   	(920, -85)
-					label      	(object SegLabel @783
-					    Parent_View 	@782
-					    location   	(1758, 681)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+annotations"
-					    pctDist    	0.643192
-					    height     	35
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB34028E"
-					client     	@780
-					supplier   	@744
-					line_style 	3
-					origin_attachment 	(2040, 715)
-					terminal_attachment 	(1601, 715)
-					label      	(object SegLabel @784
-					    Parent_View 	@782
-					    location   	(1685, 746)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.809313
-					    height     	31
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$221" @785
-				location   	(668, 865)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C239134004F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$222" @786
-					Parent_View 	@785
-					location   	(-612, 33)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C23913600CA"
-					client     	@785
-					supplier   	@735
-					line_style 	3
-					origin_attachment 	(668, 865)
-					terminal_attachment 	(473, 865))
-				    (object RoleView "annotation" @787
-					Parent_View 	@785
-					location   	(-612, 33)
-					label      	(object SegLabel @788
-					    Parent_View 	@787
-					    location   	(714, 825)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.234146
-					    height     	41
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C23913600D4"
-					client     	@785
-					supplier   	@744
-					line_style 	3
-					origin_attachment 	(668, 865)
-					terminal_attachment 	(863, 865)
-					label      	(object SegLabel @789
-					    Parent_View 	@787
-					    location   	(801, 903)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.682051
-					    height     	38
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$125" @790
-				location   	(1472, 167)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D23B901CD"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$126" @791
-					Parent_View 	@790
-					location   	(256, -649)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D23BA01C4"
-					client     	@790
-					supplier   	@736
-					vertices   	(list Points
-					    (1472, 167)
-					    (1472, 72)
-					    (1883, 72))
-					line_style 	3
-					origin_attachment 	(1472, 167)
-					terminal_attachment 	(1883, 72))
-				    (object RoleView "annotation" @792
-					Parent_View 	@790
-					location   	(256, -649)
-					label      	(object SegLabel @793
-					    Parent_View 	@792
-					    location   	(1604, 129)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	-0.076305
-					    height     	132
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D23BA01CE"
-					client     	@790
-					supplier   	@744
-					line_style 	3
-					origin_attachment 	(1472, 167)
-					terminal_attachment 	(1472, 673)
-					label      	(object SegLabel @794
-					    Parent_View 	@792
-					    location   	(1419, 618)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.893574
-					    height     	54
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$75" @795
-				location   	(927, 350)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB060291"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$76" @796
-					Parent_View 	@795
-					location   	(-193, -450)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB070171"
-					client     	@795
-					supplier   	@737
-					line_style 	3
-					origin_attachment 	(927, 350)
-					terminal_attachment 	(629, 350))
-				    (object RoleView "annotation" @797
-					Parent_View 	@795
-					location   	(-193, -450)
-					label      	(object SegLabel @798
-					    Parent_View 	@797
-					    location   	(878, 310)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	-0.816667
-					    height     	41
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB070172"
-					client     	@795
-					supplier   	@744
-					vertices   	(list Points
-					    (927, 350)
-					    (987, 350)
-					    (987, 673))
-					line_style 	3
-					origin_attachment 	(927, 350)
-					terminal_attachment 	(987, 673)
-					label      	(object SegLabel @799
-					    Parent_View 	@797
-					    location   	(1037, 612)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.843342
-					    height     	50
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$67" @800
-				location   	(1027, 222)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DADC02F5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$68" @801
-					Parent_View 	@800
-					location   	(-93, -578)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DADD0238"
-					client     	@800
-					supplier   	@738
-					line_style 	3
-					origin_attachment 	(1027, 222)
-					terminal_attachment 	(563, 222))
-				    (object RoleView "annotation" @802
-					Parent_View 	@800
-					location   	(-93, -578)
-					label      	(object SegLabel @803
-					    Parent_View 	@802
-					    location   	(1003, 188)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	-0.406250
-					    height     	35
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DADD0242"
-					client     	@800
-					supplier   	@744
-					vertices   	(list Points
-					    (1027, 222)
-					    (1087, 222)
-					    (1087, 673))
-					line_style 	3
-					origin_attachment 	(1027, 222)
-					terminal_attachment 	(1087, 673)
-					label      	(object SegLabel @804
-					    Parent_View 	@802
-					    location   	(1137, 613)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	100
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.882583
-					    height     	50
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$91" @805
-				location   	(1494, 1438)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B90068801C2"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$92" @806
-					Parent_View 	@805
-					location   	(214, 590)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B90068A0111"
-					client     	@805
-					supplier   	@739
-					line_style 	3
-					origin_attachment 	(1494, 1438)
-					terminal_attachment 	(1494, 1662))
-				    (object RoleView "contentAnnotation" @807
-					Parent_View 	@805
-					location   	(214, 590)
-					label      	(object SegLabel @808
-					    Parent_View 	@807
-					    location   	(1696, 1356)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	360
-					    justify    	0
-					    label      	"+contentAnnotation"
-					    pctDist    	0.367713
-					    height     	202
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B90068A011B"
-					client     	@805
-					supplier   	@744
-					line_style 	3
-					origin_attachment 	(1494, 1438)
-					terminal_attachment 	(1494, 1215)
-					label      	(object SegLabel @809
-					    Parent_View 	@807
-					    location   	(1443, 1279)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.713004
-					    height     	51
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$145" @810
-				location   	(637, 1022)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB1702C8"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$146" @811
-					Parent_View 	@810
-					location   	(-483, 222)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB1803E2"
-					client     	@810
-					supplier   	@741
-					line_style 	3
-					origin_attachment 	(637, 1022)
-					terminal_attachment 	(411, 1022))
-				    (object RoleView "annotation" @812
-					Parent_View 	@810
-					location   	(-483, 222)
-					label      	(object SegLabel @813
-					    Parent_View 	@812
-					    location   	(710, 979)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.328889
-					    height     	44
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB190004"
-					client     	@810
-					supplier   	@744
-					line_style 	3
-					origin_attachment 	(637, 1022)
-					terminal_attachment 	(863, 1022)
-					label      	(object SegLabel @814
-					    Parent_View 	@812
-					    location   	(802, 1062)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.730088
-					    height     	40
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$65" @815
-				location   	(1581, 607)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C626EA70102"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$66" @816
-					Parent_View 	@815
-					location   	(301, -225)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C626EA90191"
-					client     	@815
-					supplier   	@742
-					vertices   	(list Points
-					    (1581, 607)
-					    (1581, 547)
-					    (1679, 547))
-					line_style 	3
-					origin_attachment 	(1581, 607)
-					terminal_attachment 	(1679, 547))
-				    (object RoleView "annotations" @817
-					Parent_View 	@815
-					location   	(301, -225)
-					label      	(object SegLabel @818
-					    Parent_View 	@817
-					    location   	(1669, 462)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+annotations"
-					    pctDist    	-2.196970
-					    height     	88
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C626EA90192"
-					client     	@815
-					supplier   	@744
-					line_style 	3
-					origin_attachment 	(1581, 607)
-					terminal_attachment 	(1581, 673)
-					label      	(object SegLabel @819
-					    Parent_View 	@817
-					    location   	(1539, 620)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.196970
-					    height     	42
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$205" @820
-				location   	(849, 1496)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB11026F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$206" @821
-					Parent_View 	@820
-					location   	(-271, 696)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB1201F9"
-					client     	@820
-					supplier   	@743
-					line_style 	3
-					origin_attachment 	(849, 1496)
-					terminal_attachment 	(354, 1496))
-				    (object RoleView "annotation" @822
-					Parent_View 	@820
-					location   	(-271, 696)
-					label      	(object SegLabel @823
-					    Parent_View 	@822
-					    location   	(942, 1464)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.188259
-					    height     	33
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB120203"
-					client     	@820
-					supplier   	@744
-					vertices   	(list Points
-					    (849, 1496)
-					    (1062, 1496)
-					    (1062, 1215))
-					line_style 	3
-					origin_attachment 	(849, 1496)
-					terminal_attachment 	(1062, 1215)
-					label      	(object SegLabel @824
-					    Parent_View 	@822
-					    location   	(1115, 1279)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.872690
-					    height     	53
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$207" @825
-				location   	(952, 1565)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C626EB30005"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$208" @826
-					Parent_View 	@825
-					location   	(-328, 733)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C626EB40327"
-					client     	@825
-					supplier   	@743
-					line_style 	3
-					origin_attachment 	(952, 1565)
-					terminal_attachment 	(354, 1565))
-				    (object RoleView "annotations" @827
-					Parent_View 	@825
-					location   	(-328, 733)
-					label      	(object SegLabel @828
-					    Parent_View 	@827
-					    location   	(1075, 1538)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+annotations"
-					    pctDist    	0.204959
-					    height     	28
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C626EB40332"
-					client     	@825
-					supplier   	@744
-					vertices   	(list Points
-					    (952, 1565)
-					    (1200, 1565)
-					    (1200, 1215))
-					line_style 	3
-					origin_attachment 	(952, 1565)
-					terminal_attachment 	(1200, 1215)
-					label      	(object SegLabel @829
-					    Parent_View 	@827
-					    location   	(1254, 1275)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	1))))
-			    (object InheritView "" @830
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C800394"
-				client     	@726
-				supplier   	@736
-				line_style 	3
-				origin_attachment 	(1984, 249)
-				terminal_attachment 	(1984, 135))
-			    (object InheritView "" @831
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C8F002E"
-				client     	@742
-				supplier   	@726
-				line_style 	3
-				origin_attachment 	(1997, 505)
-				terminal_attachment 	(1997, 359))))
-		    (object ClassDiagram "6. Concrete Components"
-			quid       	"3B6AD74D03C4"
-			title      	"6. Concrete Components"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDComponent" @832
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(288, 416)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@832
-				    location   	(126, 373)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846E90029"
-				width      	342
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupContent" @833
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(832, 416)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@833
-				    location   	(568, 373)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	528
-				    justify    	0
-				    label      	"XSDAttributeGroupContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6940200089"
-				width      	546
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefineContent" @834
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1200, 672)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@834
-				    location   	(991, 629)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	418
-				    justify    	0
-				    label      	"XSDRedefineContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AE2060172"
-				width      	436
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaContent" @835
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1360, 416)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@835
-				    location   	(1156, 373)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	408
-				    justify    	0
-				    label      	"XSDSchemaContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B688CB800BA"
-				width      	426
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @836
-				location   	(1360, 561)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@835
-				vertices   	(list Points
-				    (1360, 561)
-				    (1360, 471)))
-			    (object ClassView "Class" "Logical View::xsd::XSDInclude" @837
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1632, 1200)
-				label      	(object ItemLabel
-				    Parent_View 	@837
-				    location   	(1512, 1157)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	240
-				    justify    	0
-				    label      	"XSDInclude")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B688C7D0250"
-				width      	258
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDImport" @838
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1408, 944)
-				label      	(object ItemLabel
-				    Parent_View 	@838
-				    location   	(1294, 901)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	228
-				    justify    	0
-				    label      	"XSDImport")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B688C93017F"
-				width      	246
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefine" @839
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1936, 1200)
-				label      	(object ItemLabel
-				    Parent_View 	@839
-				    location   	(1805, 1157)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	262
-				    justify    	0
-				    label      	"XSDRedefine")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B688C9B02AD"
-				width      	280
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAnnotation" @840
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(800, 1200)
-				label      	(object ItemLabel
-				    Parent_View 	@840
-				    location   	(375, 1153)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	851
-				    justify    	0
-				    label      	"XSDAnnotation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDC80233"
-				width      	869
-				height     	119
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$143" @841
-				location   	(1368, 1206)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6ADCC5007E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$144" @842
-					Parent_View 	@841
-					location   	(1160, 406)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6ADCC6006B"
-					client     	@841
-					supplier   	@837
-					line_style 	3
-					origin_attachment 	(1368, 1206)
-					terminal_attachment 	(1503, 1206))
-				    (object RoleView "annotation" @843
-					Parent_View 	@841
-					location   	(1160, 406)
-					label      	(object SegLabel @844
-					    Parent_View 	@843
-					    location   	(1347, 1154)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.154412
-					    height     	53
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6ADCC6006C"
-					client     	@841
-					supplier   	@840
-					line_style 	3
-					origin_attachment 	(1368, 1206)
-					terminal_attachment 	(1234, 1206)
-					label      	(object SegLabel @845
-					    Parent_View 	@843
-					    location   	(1300, 1253)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	107
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.514706
-					    height     	47
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$141" @846
-				location   	(1168, 1022)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6ADCD802FC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$142" @847
-					Parent_View 	@846
-					location   	(960, 222)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6ADCD9018B"
-					client     	@846
-					supplier   	@838
-					vertices   	(list Points
-					    (1168, 1022)
-					    (1168, 962)
-					    (1285, 962))
-					line_style 	3
-					origin_attachment 	(1168, 1022)
-					terminal_attachment 	(1285, 962))
-				    (object RoleView "annotation" @848
-					Parent_View 	@846
-					location   	(960, 222)
-					label      	(object SegLabel @849
-					    Parent_View 	@848
-					    location   	(1290, 1075)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.445378
-					    height     	122
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6ADCD9018C"
-					client     	@846
-					supplier   	@840
-					line_style 	3
-					origin_attachment 	(1168, 1022)
-					terminal_attachment 	(1168, 1141)
-					label      	(object SegLabel @850
-					    Parent_View 	@848
-					    location   	(1127, 1074)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.436975
-					    height     	41
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$163" @851
-				location   	(1563, 1353)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6ADE42009A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$164" @852
-					Parent_View 	@851
-					location   	(1355, 553)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6ADE4302FE"
-					client     	@851
-					supplier   	@839
-					vertices   	(list Points
-					    (1563, 1353)
-					    (1940, 1353)
-					    (1940, 1255))
-					line_style 	3
-					origin_attachment 	(1563, 1353)
-					terminal_attachment 	(1940, 1255))
-				    (object RoleView "annotations" @853
-					Parent_View 	@851
-					location   	(1355, 553)
-					label      	(object SegLabel @854
-					    Parent_View 	@853
-					    location   	(1317, 1322)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+annotations"
-					    pctDist    	0.516807
-					    height     	32
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6ADE430308"
-					client     	@851
-					supplier   	@840
-					vertices   	(list Points
-					    (1563, 1353)
-					    (1181, 1353)
-					    (1181, 1259))
-					line_style 	3
-					origin_attachment 	(1563, 1353)
-					terminal_attachment 	(1181, 1259)
-					label      	(object SegLabel @855
-					    Parent_View 	@853
-					    location   	(1130, 1326)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.861345
-					    height     	52
-					    orientation 	0))))
-			    (object InheritTreeView "" @856
-				location   	(288, 561)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@832
-				vertices   	(list Points
-				    (288, 561)
-				    (288, 471)))
-			    (object ClassView "Class" "Logical View::xsd::XSDNamedComponent" @857
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(688, 672)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@857
-				    location   	(460, 629)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	456
-				    justify    	0
-				    label      	"XSDNamedComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846D303A4"
-				width      	474
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDParticleContent" @858
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1856, 416)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@858
-				    location   	(1658, 373)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	396
-				    justify    	0
-				    label      	"XSDParticleContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6BD22300C6"
-				width      	414
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefinableComponent" @859
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(720, 960)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@859
-				    location   	(450, 917)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	540
-				    justify    	0
-				    label      	"XSDRedefinableComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B7FCA8B020B"
-				width      	558
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDScope" @860
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(224, 672)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@860
-				    location   	(110, 629)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	228
-				    justify    	0
-				    label      	"XSDScope")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B54000F2"
-				width      	246
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @861
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCD640231"
-				client     	@860
-				supplier   	@832
-				line_style 	3
-				origin_attachment 	(221, 617)
-				terminal_attachment 	(221, 561)
-				drawSupplier 	@856)
-			    (object InheritView "" @862
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0CEA20197"
-				client     	@857
-				supplier   	@832
-				line_style 	3
-				origin_attachment 	(589, 617)
-				terminal_attachment 	(589, 561)
-				drawSupplier 	@856)
-			    (object InheritView "" @863
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AE2B301D5"
-				client     	@834
-				supplier   	@835
-				line_style 	3
-				origin_attachment 	(1016, 617)
-				terminal_attachment 	(1016, 561)
-				drawSupplier 	@836)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaCompositor" @864
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1824, 944)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@864
-				    location   	(1590, 901)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"XSDSchemaCompositor")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C21DB4102AE"
-				width      	486
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @865
-				location   	(1824, 1089)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@864
-				vertices   	(list Points
-				    (1824, 1089)
-				    (1824, 999)))
-			    (object InheritView "" @866
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AD8DC0381"
-				client     	@837
-				supplier   	@864
-				line_style 	3
-				origin_attachment 	(1666, 1145)
-				terminal_attachment 	(1666, 1089)
-				drawSupplier 	@865)
-			    (object InheritView "" @867
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DB640240"
-				client     	@839
-				supplier   	@864
-				line_style 	3
-				origin_attachment 	(1934, 1145)
-				terminal_attachment 	(1934, 1089)
-				drawSupplier 	@865)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaDirective" @868
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1840, 672)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@868
-				    location   	(1630, 629)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	420
-				    justify    	0
-				    label      	"XSDSchemaDirective")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD8A202A2"
-				width      	438
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @869
-				location   	(1762, 819)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@868
-				vertices   	(list Points
-				    (1762, 819)
-				    (1762, 727)))
-			    (object InheritView "" @870
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AD8D9003E"
-				client     	@838
-				supplier   	@868
-				line_style 	3
-				origin_attachment 	(1416, 889)
-				terminal_attachment 	(1416, 819)
-				drawSupplier 	@869)
-			    (object InheritView "" @871
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AE32102AF"
-				client     	@868
-				supplier   	@835
-				line_style 	3
-				origin_attachment 	(1756, 617)
-				terminal_attachment 	(1756, 561)
-				drawSupplier 	@836)
-			    (object ClassView "Class" "Logical View::xsd::XSDConcreteComponent" @872
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				location   	(1120, 144)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@872
-				    location   	(875, 101)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	490
-				    justify    	0
-				    label      	"XSDConcreteComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD7B40065"
-				width      	508
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @873
-				location   	(1120, 289)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@872
-				vertices   	(list Points
-				    (1120, 289)
-				    (1120, 199)))
-			    (object AssociationViewNew "$UNNAMED$105" @874
-				location   	(1485, 215)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B751B0803C7"
-				roleview_list 	(list RoleViews
-				    (object RoleView "container" @875
-					Parent_View 	@874
-					location   	(989, 103)
-					label      	(object SegLabel @876
-					    Parent_View 	@875
-					    location   	(1604, 210)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	192
-					    justify    	0
-					    label      	"+container"
-					    pctDist    	0.033113
-					    height     	119
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B751B0C01CE"
-					client     	@874
-					supplier   	@872
-					vertices   	(list Points
-					    (1485, 215)
-					    (1485, 176)
-					    (1374, 176))
-					line_style 	3
-					origin_attachment 	(1485, 215)
-					terminal_attachment 	(1374, 176)
-					label      	(object SegLabel @877
-					    Parent_View 	@875
-					    location   	(1435, 226)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	69
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.602649
-					    height     	50
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$106" @878
-					Parent_View 	@874
-					location   	(989, 103)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B751B0C01CF"
-					client     	@874
-					supplier   	@872
-					vertices   	(list Points
-					    (1485, 215)
-					    (1485, 254)
-					    (1345, 254)
-					    (1345, 199))
-					line_style 	3
-					origin_attachment 	(1485, 215)
-					terminal_attachment 	(1345, 199))))
-			    (object AssociationViewNew "$UNNAMED$107" @879
-				location   	(773, 216)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B751B480261"
-				roleview_list 	(list RoleViews
-				    (object RoleView "rootContainer" @880
-					Parent_View 	@879
-					location   	(53, 104)
-					label      	(object SegLabel @881
-					    Parent_View 	@880
-					    location   	(614, 217)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	264
-					    justify    	0
-					    label      	"+rootContainer"
-					    pctDist    	-0.025000
-					    height     	160
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B751B4C0285"
-					client     	@879
-					supplier   	@872
-					vertices   	(list Points
-					    (773, 216)
-					    (773, 176)
-					    (866, 176))
-					line_style 	3
-					origin_attachment 	(773, 216)
-					terminal_attachment 	(866, 176)
-					label      	(object SegLabel @882
-					    Parent_View 	@880
-					    location   	(800, 228)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.300000
-					    height     	27
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$108" @883
-					Parent_View 	@879
-					location   	(53, 104)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B751B4C0286"
-					client     	@879
-					supplier   	@872
-					vertices   	(list Points
-					    (773, 216)
-					    (773, 257)
-					    (895, 257)
-					    (895, 199))
-					line_style 	3
-					origin_attachment 	(773, 216)
-					terminal_attachment 	(895, 199))))
-			    (object InheritView "" @884
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AD8E60372"
-				client     	@835
-				supplier   	@872
-				line_style 	3
-				origin_attachment 	(1367, 361)
-				terminal_attachment 	(1367, 289)
-				drawSupplier 	@873)
-			    (object InheritView "" @885
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B72D8E200EA"
-				client     	@833
-				supplier   	@872
-				line_style 	3
-				origin_attachment 	(752, 361)
-				terminal_attachment 	(752, 289)
-				drawSupplier 	@873)
-			    (object InheritView "" @886
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0CEA903D2"
-				client     	@832
-				supplier   	@872
-				line_style 	3
-				origin_attachment 	(299, 361)
-				terminal_attachment 	(299, 289)
-				drawSupplier 	@873)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @887
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(192, 1200)
-				label      	(object ItemLabel
-				    Parent_View 	@887
-				    location   	(61, 1157)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	262
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	280
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @888
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCC4A0182"
-				client     	@887
-				supplier   	@860
-				line_style 	3
-				origin_attachment 	(216, 1145)
-				terminal_attachment 	(216, 727))
-			    (object AssociationViewNew "$UNNAMED$219" @889
-				location   	(1382, 1425)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DD0C03DB"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$220" @890
-					Parent_View 	@889
-					location   	(1190, 225)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DD100304"
-					client     	@889
-					supplier   	@864
-					vertices   	(list Points
-					    (1382, 1425)
-					    (2147, 1425)
-					    (2147, 943)
-					    (2067, 943))
-					line_style 	3
-					origin_attachment 	(1382, 1425)
-					terminal_attachment 	(2067, 943))
-				    (object RoleView "incorporatedSchema" @891
-					Parent_View 	@889
-					location   	(1190, 225)
-					label      	(object SegLabel @892
-					    Parent_View 	@891
-					    location   	(445, 1389)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+incorporatedSchema"
-					    pctDist    	0.706546
-					    height     	37
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DD100305"
-					client     	@889
-					supplier   	@887
-					vertices   	(list Points
-					    (1382, 1425)
-					    (225, 1425)
-					    (225, 1255))
-					line_style 	3
-					origin_attachment 	(1382, 1425)
-					terminal_attachment 	(225, 1255)
-					label      	(object SegLabel @893
-					    Parent_View 	@891
-					    location   	(183, 1392)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.896915
-					    height     	43
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$217" @894
-				location   	(1505, 1503)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DCC700EC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$218" @895
-					Parent_View 	@894
-					location   	(1313, 303)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DCCE0042"
-					client     	@894
-					supplier   	@868
-					vertices   	(list Points
-					    (1505, 1503)
-					    (2188, 1503)
-					    (2188, 675)
-					    (2059, 675))
-					line_style 	3
-					origin_attachment 	(1505, 1503)
-					terminal_attachment 	(2059, 675))
-				    (object RoleView "resolvedSchema" @896
-					Parent_View 	@894
-					location   	(1313, 303)
-					label      	(object SegLabel @897
-					    Parent_View 	@896
-					    location   	(303, 1472)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	324
-					    justify    	0
-					    label      	"+resolvedSchema"
-					    pctDist    	0.733333
-					    height     	32
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DCCE0043"
-					client     	@894
-					supplier   	@887
-					vertices   	(list Points
-					    (1505, 1503)
-					    (113, 1503)
-					    (113, 1255))
-					line_style 	3
-					origin_attachment 	(1505, 1503)
-					terminal_attachment 	(113, 1255)
-					label      	(object SegLabel @898
-					    Parent_View 	@896
-					    location   	(73, 1472)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.867683
-					    height     	41
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$109" @899
-				location   	(66, 244)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B751C310356"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$110" @900
-					Parent_View 	@899
-					location   	(-94, -444)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B751C330331"
-					client     	@899
-					supplier   	@872
-					vertices   	(list Points
-					    (66, 244)
-					    (66, 144)
-					    (866, 144))
-					line_style 	3
-					origin_attachment 	(66, 244)
-					terminal_attachment 	(866, 144))
-				    (object RoleView "schema" @901
-					Parent_View 	@899
-					location   	(-94, -444)
-					label      	(object SegLabel @902
-					    Parent_View 	@901
-					    location   	(165, 93)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+schema"
-					    pctDist    	-0.168113
-					    height     	99
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B751C33033B"
-					client     	@899
-					supplier   	@887
-					line_style 	3
-					origin_attachment 	(66, 244)
-					terminal_attachment 	(66, 1145)
-					label      	(object SegLabel @903
-					    Parent_View 	@901
-					    location   	(136, 184)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	113
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	-0.066593
-					    height     	70
-					    orientation 	0))))
-			    (object InheritView "" @904
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B780BD90059"
-				client     	@858
-				supplier   	@872
-				line_style 	3
-				origin_attachment 	(1759, 361)
-				terminal_attachment 	(1759, 289)
-				drawSupplier 	@873)
-			    (object InheritView "" @905
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69E1770116"
-				client     	@840
-				supplier   	@832
-				line_style 	3
-				origin_attachment 	(400, 1141)
-				terminal_attachment 	(400, 561)
-				drawSupplier 	@856)
-			    (object InheritTreeView "" @906
-				location   	(1012, 837)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@834
-				vertices   	(list Points
-				    (1012, 837)
-				    (1012, 727)))
-			    (object InheritView "" @907
-				stereotype 	(object SegLabel @908
-				    Parent_View 	@907
-				    location   	(1071, 871)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	243
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.888158
-				    height     	34
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B7FD4E20366"
-				client     	@840
-				supplier   	@834
-				line_style 	3
-				origin_attachment 	(1037, 1141)
-				terminal_attachment 	(1037, 837)
-				drawSupplier 	@906)
-			    (object InheritView "" @909
-				stereotype 	(object SegLabel @910
-				    Parent_View 	@909
-				    location   	(890, 865)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	263
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.581633
-				    height     	36
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B7FD4BA023C"
-				client     	@859
-				supplier   	@834
-				line_style 	3
-				origin_attachment 	(925, 905)
-				terminal_attachment 	(925, 837)
-				drawSupplier 	@906)
-			    (object InheritView "" @911
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DB560092"
-				client     	@864
-				supplier   	@868
-				line_style 	3
-				origin_attachment 	(1828, 889)
-				terminal_attachment 	(1828, 819)
-				drawSupplier 	@869)))
-		    (object ClassDiagram "7. Concrete Attributes"
-			quid       	"3B9F8F7602C7"
-			title      	"7. Concrete Attributes"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDFeature" @912
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2144, 1440)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@912
-				    location   	(1938, 1359)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	412
-				    justify    	0
-				    label      	"XSDFeature")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B537026C"
-				compartment 	(object Compartment
-				    Parent_View 	@912
-				    location   	(1938, 1419)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	412
-				    compartmentItems 	(list Compartment
-					"+ form : XSDForm"
-					"+ lexicalValue : String"))
-				width      	430
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDForm" @913
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2560, 1424)
-				label      	(object ItemLabel
-				    Parent_View 	@913
-				    location   	(2398, 1365)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDForm")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@913
-				    location   	(2398, 1315)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B9F913B01EB"
-				width      	342
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDConcreteComponent" @914
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(368, 96)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@914
-				    location   	(40, 37)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	657
-				    justify    	0
-				    label      	"XSDConcreteComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD7B40065"
-				compartment 	(object Compartment
-				    Parent_View 	@914
-				    location   	(40, 97)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	482
-				    compartmentItems 	(list Compartment
-					"+ element : DOMElement"))
-				width      	675
-				height     	143
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDComponent" @915
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(848, 384)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@915
-				    location   	(687, 333)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	322
-				    justify    	0
-				    label      	"XSDComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846E90029"
-				width      	340
-				height     	126
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDNamedComponent" @916
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1904, 944)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@916
-				    location   	(1678, 892)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	452
-				    justify    	0
-				    label      	"XSDNamedComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846D303A4"
-				width      	470
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefinableComponent" @917
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1600, 1408)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@917
-				    location   	(1328, 1356)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	544
-				    justify    	0
-				    label      	"XSDRedefinableComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B7FCA8B020B"
-				width      	562
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDScope" @918
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(864, 624)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@918
-				    location   	(745, 573)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	238
-				    justify    	0
-				    label      	"XSDScope")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B54000F2"
-				width      	256
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @919
-				location   	(850, 537)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@915
-				vertices   	(list Points
-				    (850, 537)
-				    (850, 447)))
-			    (object ClassView "Class" "Logical View::xsd::DOMElement" @920
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1248, 128)
-				label      	(object ItemLabel
-				    Parent_View 	@920
-				    location   	(873, 90)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	751
-				    justify    	0
-				    label      	"DOMElement")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@920
-				    location   	(873, 40)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	751
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	14671839
-				quidu      	"3B8189790200"
-				width      	769
-				height     	200
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaDirective" @921
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(288, 640)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@921
-				    location   	(41, 584)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	494
-				    justify    	0
-				    label      	"XSDSchemaDirective")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD8A202A2"
-				width      	512
-				height     	136
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaContent" @922
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 384)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@922
-				    location   	(38, 333)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	404
-				    justify    	0
-				    label      	"XSDSchemaContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B688CB800BA"
-				width      	422
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @923
-				location   	(368, 263)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@914
-				vertices   	(list Points
-				    (368, 263)
-				    (368, 167)))
-			    (object ClassView "Class" "Logical View::xsd::XSDDisallowedSubstitutions" @924
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(992, 1456)
-				label      	(object ItemLabel
-				    Parent_View 	@924
-				    location   	(723, 1347)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	538
-				    justify    	0
-				    label      	"XSDDisallowedSubstitutions")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@924
-				    location   	(723, 1297)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	538
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C5A403DF"
-				compartment 	(object Compartment
-				    Parent_View 	@924
-				    location   	(723, 1407)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	264
-				    compartmentItems 	(list Compartment
-					"+ substitution"
-					"+ extension"
-					"+ restriction"
-					"+ all"))
-				width      	556
-				height     	342
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDProhibitedSubstitutions" @925
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(880, 1792)
-				label      	(object ItemLabel
-				    Parent_View 	@925
-				    location   	(614, 1708)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	532
-				    justify    	0
-				    label      	"XSDProhibitedSubstitutions")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@925
-				    location   	(614, 1658)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	532
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C5BE0272"
-				compartment 	(object Compartment
-				    Parent_View 	@925
-				    location   	(614, 1768)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	234
-				    compartmentItems 	(list Compartment
-					"+ extension"
-					"+ restriction"
-					"+ all"))
-				width      	550
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @926
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(912, 2096)
-				label      	(object ItemLabel
-				    Parent_View 	@926
-				    location   	(532, 2040)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	760
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				compartment 	(object Compartment
-				    Parent_View 	@926
-				    location   	(532, 2100)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	1
-				    max_width  	764
-				    compartmentItems 	(list Compartment
-					"<<0..*>> + lexicalFinal : XSDSimpleFinal"))
-				width      	778
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleFinal" @927
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 1984)
-				label      	(object ItemLabel
-				    Parent_View 	@927
-				    location   	(45, 1875)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"XSDSimpleFinal")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@927
-				    location   	(45, 1825)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C25D0295"
-				width      	344
-				height     	342
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexFinal" @928
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2544, 2016)
-				label      	(object ItemLabel
-				    Parent_View 	@928
-				    location   	(2362, 1932)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	364
-				    justify    	0
-				    label      	"XSDComplexFinal")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@928
-				    location   	(2362, 1882)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	364
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C2CA01CB"
-				width      	382
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUse" @929
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(352, 1360)
-				label      	(object ItemLabel
-				    Parent_View 	@929
-				    location   	(41, 1279)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	622
-				    justify    	0
-				    label      	"XSDAttributeUse")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B68354601A8"
-				compartment 	(object Compartment
-				    Parent_View 	@929
-				    location   	(41, 1339)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	630
-				    compartmentItems 	(list Compartment
-					"+ use : XSDAttributeUseCategory"
-					"+ lexicalValue : String"))
-				width      	640
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUseCategory" @930
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(288, 1632)
-				label      	(object ItemLabel
-				    Parent_View 	@930
-				    location   	(41, 1548)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	494
-				    justify    	0
-				    label      	"XSDAttributeUseCategory")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@930
-				    location   	(41, 1498)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	494
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3BA7B0E801A8"
-				width      	512
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDTerm" @931
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2608, 928)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@931
-				    location   	(2498, 881)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	220
-				    justify    	0
-				    label      	"XSDTerm")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683C5E0174"
-				width      	238
-				height     	119
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @932
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2240, 1712)
-				label      	(object ItemLabel
-				    Parent_View 	@932
-				    location   	(1757, 1631)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	966
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				compartment 	(object Compartment
-				    Parent_View 	@932
-				    location   	(1757, 1691)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	973
-				    compartmentItems 	(list Compartment
-					"<<0..*>> + lexicalFinal : XSDProhibitedSubstitutions"
-					"<<0..*>> + block : XSDDisallowedSubstitutions"))
-				width      	984
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @933
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2272, 1152)
-				label      	(object ItemLabel
-				    Parent_View 	@933
-				    location   	(1828, 1096)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	888
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				compartment 	(object Compartment
-				    Parent_View 	@933
-				    location   	(1828, 1156)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	888
-				    compartmentItems 	(list Compartment
-					"<<0..*>> + lexicalNamespaceConstraint : String"))
-				width      	906
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @934
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1120, 1008)
-				label      	(object ItemLabel
-				    Parent_View 	@934
-				    location   	(622, 777)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	996
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	1014
-				height     	486
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDImport" @935
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 960)
-				label      	(object ItemLabel
-				    Parent_View 	@935
-				    location   	(37, 904)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	406
-				    justify    	0
-				    label      	"XSDImport")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B688C93017F"
-				width      	424
-				height     	136
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDFacet" @936
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1344, 656)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@936
-				    location   	(1138, 600)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	412
-				    justify    	0
-				    label      	"XSDFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C359403D2"
-				compartment 	(object Compartment
-				    Parent_View 	@936
-				    location   	(1138, 660)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	414
-				    compartmentItems 	(list Compartment
-					"+ lexicalValue : String"))
-				width      	430
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @937
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1840, 2048)
-				label      	(object ItemLabel
-				    Parent_View 	@937
-				    location   	(1410, 1942)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	860
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				compartment 	(object Compartment
-				    Parent_View 	@937
-				    location   	(1410, 2002)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	870
-				    compartmentItems 	(list Compartment
-					"<<0..*>> + lexicalFinal : XSDComplexFinal"
-					"<<0..*>> + block : XSDProhibitedSubstitutions"
-					"+ mixed : boolean"))
-				width      	878
-				height     	236
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @938
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1488, 1696)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@938
-				    location   	(1304, 1644)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	368
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	386
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @939
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAB1004D"
-				client     	@938
-				supplier   	@917
-				line_style 	3
-				origin_attachment 	(1506, 1632)
-				terminal_attachment 	(1506, 1472))
-			    (object ClassView "Class" "Logical View::xsd::XSDAnnotation" @940
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2208, 704)
-				label      	(object ItemLabel
-				    Parent_View 	@940
-				    location   	(1758, 598)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	900
-				    justify    	0
-				    label      	"XSDAnnotation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDC80233"
-				width      	918
-				height     	236
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @941
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6848AA01D3"
-				client     	@931
-				supplier   	@915
-				line_style 	3
-				origin_attachment 	(2696, 869)
-				terminal_attachment 	(2696, 537)
-				drawSupplier 	@919)
-			    (object InheritView "" @942
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69EDEE01BF"
-				client     	@932
-				supplier   	@912
-				line_style 	3
-				origin_attachment 	(2094, 1619)
-				terminal_attachment 	(2094, 1533))
-			    (object InheritTreeView "" @943
-				location   	(1487, 1856)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@938
-				vertices   	(list Points
-				    (1487, 1856)
-				    (1487, 1760)))
-			    (object ClassView "Class" "Logical View::xsd::DOMAttr" @944
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2400, 384)
-				label      	(object ItemLabel
-				    Parent_View 	@944
-				    location   	(2080, 350)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	640
-				    justify    	0
-				    label      	"DOMAttr")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@944
-				    location   	(2080, 300)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	640
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	14671839
-				quidu      	"3BBF8C8901B6"
-				width      	658
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @945
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0D01901F1"
-				client     	@937
-				supplier   	@938
-				line_style 	3
-				origin_attachment 	(1734, 1930)
-				terminal_attachment 	(1734, 1856)
-				drawSupplier 	@943)
-			    (object InheritView "" @946
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D25680259"
-				client     	@936
-				supplier   	@915
-				line_style 	3
-				origin_attachment 	(1328, 588)
-				terminal_attachment 	(1328, 537)
-				drawSupplier 	@919)
-			    (object InheritView "" @947
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69E1770116"
-				client     	@940
-				supplier   	@915
-				line_style 	3
-				origin_attachment 	(2190, 586)
-				terminal_attachment 	(2190, 537)
-				drawSupplier 	@919)
-			    (object InheritView "" @948
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AE32102AF"
-				client     	@921
-				supplier   	@922
-				line_style 	3
-				origin_attachment 	(222, 572)
-				terminal_attachment 	(222, 447))
-			    (object InheritView "" @949
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AD8E60372"
-				client     	@922
-				supplier   	@914
-				line_style 	3
-				origin_attachment 	(260, 321)
-				terminal_attachment 	(260, 263)
-				drawSupplier 	@923)
-			    (object InheritView "" @950
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AD8D9003E"
-				client     	@935
-				supplier   	@921
-				line_style 	3
-				origin_attachment 	(223, 892)
-				terminal_attachment 	(223, 708))
-			    (object InheritView "" @951
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A3A0041"
-				client     	@933
-				supplier   	@931
-				line_style 	3
-				origin_attachment 	(2600, 1084)
-				terminal_attachment 	(2600, 987))
-			    (object ClassView "Class" "Logical View::xsd::DOMDocument" @952
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2336, 128)
-				label      	(object ItemLabel
-				    Parent_View 	@952
-				    location   	(1957, 94)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	758
-				    justify    	0
-				    label      	"DOMDocument")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@952
-				    location   	(1957, 44)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	758
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	14671839
-				quidu      	"3C27850E0381"
-				width      	776
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @953
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0CEA903D2"
-				client     	@915
-				supplier   	@914
-				line_style 	3
-				origin_attachment 	(856, 321)
-				terminal_attachment 	(856, 263)
-				drawSupplier 	@923)
-			    (object ClassView "Class" "Logical View::xsd::DOMNode" @954
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1568, 384)
-				label      	(object ItemLabel
-				    Parent_View 	@954
-				    location   	(1234, 350)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	668
-				    justify    	0
-				    label      	"DOMNode")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@954
-				    location   	(1234, 300)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	668
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	14671839
-				quidu      	"3BFE64A50117"
-				width      	686
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @955
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCD640231"
-				client     	@918
-				supplier   	@915
-				line_style 	3
-				origin_attachment 	(850, 561)
-				terminal_attachment 	(850, 537)
-				drawSupplier 	@919)
-			    (object InheritView "" @956
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B72D7BB0349"
-				client     	@929
-				supplier   	@915
-				line_style 	3
-				origin_attachment 	(575, 1267)
-				terminal_attachment 	(575, 537)
-				drawSupplier 	@919)
-			    (object InheritView "" @957
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0CEA20197"
-				client     	@916
-				supplier   	@915
-				line_style 	3
-				origin_attachment 	(1694, 880)
-				terminal_attachment 	(1694, 537)
-				drawSupplier 	@919)
-			    (object InheritView "" @958
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCC4A0182"
-				client     	@934
-				supplier   	@918
-				line_style 	3
-				origin_attachment 	(856, 765)
-				terminal_attachment 	(856, 687))
-			    (object InheritTreeView "" @959
-				location   	(1703, 1290)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@916
-				vertices   	(list Points
-				    (1703, 1290)
-				    (1703, 1008)))
-			    (object InheritView "" @960
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A26036D"
-				client     	@917
-				supplier   	@916
-				line_style 	3
-				origin_attachment 	(1503, 1344)
-				terminal_attachment 	(1503, 1290)
-				drawSupplier 	@959)
-			    (object InheritView "" @961
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A2C0307"
-				client     	@912
-				supplier   	@916
-				line_style 	3
-				origin_attachment 	(2093, 1347)
-				terminal_attachment 	(2093, 1290)
-				drawSupplier 	@959)
-			    (object InheritView "" @962
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A1302A2"
-				client     	@926
-				supplier   	@938
-				line_style 	3
-				origin_attachment 	(1253, 2028)
-				terminal_attachment 	(1253, 1856)
-				drawSupplier 	@943)))
-		    (object ClassDiagram "8. Concrete Containment"
-			quid       	"3B6A8097027A"
-			title      	"8. Concrete Containment"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDNotationDeclaration" @963
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2672, 992)
-				label      	(object ItemLabel
-				    Parent_View 	@963
-				    location   	(2439, 949)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	466
-				    justify    	0
-				    label      	"XSDNotationDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDAA021C"
-				width      	484
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaDirective" @964
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2640, 576)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@964
-				    location   	(2431, 533)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	418
-				    justify    	0
-				    label      	"XSDSchemaDirective")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD8A202A2"
-				width      	436
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefine" @965
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2144, 784)
-				label      	(object ItemLabel
-				    Parent_View 	@965
-				    location   	(2013, 741)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	262
-				    justify    	0
-				    label      	"XSDRedefine")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B688C9B02AD"
-				width      	280
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefineContent" @966
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2064, 576)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@966
-				    location   	(1854, 533)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	420
-				    justify    	0
-				    label      	"XSDRedefineContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AE2060172"
-				width      	438
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @967
-				location   	(1943, 868)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@966
-				vertices   	(list Points
-				    (1943, 868)
-				    (1943, 631)))
-			    (object AssociationViewNew "$UNNAMED$165" @968
-				location   	(2125, 680)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AE8240051"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$166" @969
-					Parent_View 	@968
-					location   	(157, 344)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6AE82602AD"
-					client     	@968
-					supplier   	@965
-					line_style 	3
-					origin_attachment 	(2125, 680)
-					terminal_attachment 	(2125, 729))
-				    (object RoleView "contents" @970
-					Parent_View 	@968
-					location   	(157, 344)
-					label      	(object SegLabel @971
-					    Parent_View 	@970
-					    location   	(2255, 671)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+contents"
-					    pctDist    	0.175439
-					    height     	130
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6AE82602B7"
-					client     	@968
-					supplier   	@966
-					line_style 	3
-					origin_attachment 	(2125, 680)
-					terminal_attachment 	(2125, 631)
-					label      	(object SegLabel @972
-					    Parent_View 	@970
-					    location   	(2067, 671)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.175439
-					    height     	59
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDTerm" @973
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 320)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@973
-				    location   	(148, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	216
-				    justify    	0
-				    label      	"XSDTerm")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683C5E0174"
-				width      	234
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @974
-				location   	(272, 465)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@973
-				vertices   	(list Points
-				    (272, 465)
-				    (272, 375)))
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @975
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2656, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@975
-				    location   	(2372, 1121)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	569
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				width      	587
-				height     	118
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroup" @976
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 576)
-				label      	(object ItemLabel
-				    Parent_View 	@976
-				    location   	(89, 533)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	334
-				    justify    	0
-				    label      	"XSDModelGroup")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6834E00291"
-				width      	352
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$153" @977
-				location   	(1170, 1356)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6837AC025A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "modelGroup" @978
-					Parent_View 	@977
-					location   	(866, -20)
-					label      	(object SegLabel @979
-					    Parent_View 	@978
-					    location   	(269, 1389)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	252
-					    justify    	0
-					    label      	"+modelGroup"
-					    pctDist    	0.534044
-					    height     	33
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6837AD0339"
-					client     	@977
-					supplier   	@976
-					vertices   	(list Points
-					    (1170, 1356)
-					    (206, 1356)
-					    (206, 631))
-					line_style 	3
-					origin_attachment 	(1170, 1356)
-					terminal_attachment 	(206, 631)
-					label      	(object SegLabel @980
-					    Parent_View 	@978
-					    location   	(226, 1322)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.559146
-					    height     	35
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$154" @981
-					Parent_View 	@977
-					location   	(866, -20)
-					label      	(object SegLabel @982
-					    Parent_View 	@981
-					    location   	(2521, 1398)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6837AD0338"
-					client     	@977
-					supplier   	@975
-					vertices   	(list Points
-					    (1170, 1356)
-					    (2731, 1356)
-					    (2731, 1227))
-					line_style 	3
-					origin_attachment 	(1170, 1356)
-					terminal_attachment 	(2731, 1227))))
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @983
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(160, 1696)
-				label      	(object ItemLabel
-				    Parent_View 	@983
-				    location   	(35, 1653)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	250
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	268
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$147" @984
-				location   	(122, 1136)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6BCEB102F8"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$148" @985
-					Parent_View 	@984
-					location   	(-630, -256)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6BCEB6001B"
-					client     	@984
-					supplier   	@976
-					line_style 	3
-					origin_attachment 	(122, 1136)
-					terminal_attachment 	(122, 631))
-				    (object RoleView "contents" @986
-					Parent_View 	@984
-					location   	(-630, -256)
-					label      	(object SegLabel @987
-					    Parent_View 	@986
-					    location   	(223, 1515)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+contents"
-					    pctDist    	0.750495
-					    height     	101
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6BCEB60025"
-					client     	@984
-					supplier   	@983
-					line_style 	3
-					origin_attachment 	(122, 1136)
-					terminal_attachment 	(122, 1641)
-					label      	(object SegLabel @988
-					    Parent_View 	@986
-					    location   	(180, 1581)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.881188
-					    height     	58
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDParticleContent" @989
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(288, 80)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@989
-				    location   	(41, 42)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	495
-				    justify    	0
-				    label      	"XSDParticleContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6BD22300C6"
-				width      	513
-				height     	100
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$159" @990
-				location   	(47, 885)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6B47150119"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$160" @991
-					Parent_View 	@990
-					location   	(-289, 821)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B471A03AB"
-					client     	@990
-					supplier   	@983
-					line_style 	3
-					origin_attachment 	(47, 885)
-					terminal_attachment 	(47, 1641))
-				    (object RoleView "content" @992
-					Parent_View 	@990
-					location   	(-289, 821)
-					label      	(object SegLabel @993
-					    Parent_View 	@992
-					    location   	(142, 189)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+content"
-					    pctDist    	0.921854
-					    height     	95
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B471A03B5"
-					client     	@990
-					supplier   	@989
-					line_style 	3
-					origin_attachment 	(47, 885)
-					terminal_attachment 	(47, 130)
-					label      	(object SegLabel @994
-					    Parent_View 	@992
-					    location   	(28, 192)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.917881
-					    height     	19
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUse" @995
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1424, 896)
-				label      	(object ItemLabel
-				    Parent_View 	@995
-				    location   	(1252, 849)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	345
-				    justify    	0
-				    label      	"XSDAttributeUse")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B68354601A8"
-				width      	363
-				height     	119
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @996
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1408, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@996
-				    location   	(1175, 1125)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	466
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	484
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$89" @997
-				location   	(1319, 1034)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6F1DE9018A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$90" @998
-					Parent_View 	@997
-					location   	(-57, -102)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6F1DEA036C"
-					client     	@997
-					supplier   	@995
-					line_style 	3
-					origin_attachment 	(1319, 1034)
-					terminal_attachment 	(1319, 955))
-				    (object RoleView "content" @999
-					Parent_View 	@997
-					location   	(-57, -102)
-					label      	(object SegLabel @1000
-					    Parent_View 	@999
-					    location   	(1439, 1039)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+content"
-					    pctDist    	0.073171
-					    height     	120
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6F1DEA0380"
-					client     	@997
-					supplier   	@996
-					line_style 	3
-					origin_attachment 	(1319, 1034)
-					terminal_attachment 	(1319, 1113)
-					label      	(object SegLabel @1001
-					    Parent_View 	@999
-					    location   	(1279, 1031)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.040816
-					    height     	41
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::xsd::XSDConstrainingFacet" @1002
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2080, 1696)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1002
-				    location   	(1855, 1653)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	450
-				    justify    	0
-				    label      	"XSDConstrainingFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C6B340093"
-				width      	468
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @1003
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1280, 1696)
-				label      	(object ItemLabel
-				    Parent_View 	@1003
-				    location   	(1035, 1653)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	490
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				width      	508
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$185" @1004
-				location   	(1351, 1840)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D5CA50112"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$186" @1005
-					Parent_View 	@1004
-					location   	(-297, 224)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D5CA703B4"
-					client     	@1004
-					supplier   	@1003
-					vertices   	(list Points
-					    (1351, 1840)
-					    (1294, 1840)
-					    (1294, 1751))
-					line_style 	3
-					origin_attachment 	(1351, 1840)
-					terminal_attachment 	(1294, 1751))
-				    (object RoleView "contents" @1006
-					Parent_View 	@1004
-					location   	(-297, 224)
-					label      	(object SegLabel @1007
-					    Parent_View 	@1006
-					    location   	(1517, 1806)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+contents"
-					    pctDist    	0.632653
-					    height     	108
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D5CA703C8"
-					client     	@1004
-					supplier   	@1003
-					vertices   	(list Points
-					    (1351, 1840)
-					    (1409, 1840)
-					    (1409, 1751))
-					line_style 	3
-					origin_attachment 	(1351, 1840)
-					terminal_attachment 	(1409, 1751)
-					label      	(object SegLabel @1008
-					    Parent_View 	@1006
-					    location   	(1361, 1801)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.072848
-					    height     	40
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$69" @1009
-				location   	(1190, 1432)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6890D6006F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "anonymousTypeDefinition" @1010
-					Parent_View 	@1009
-					location   	(774, -1832)
-					label      	(object SegLabel @1011
-					    Parent_View 	@1010
-					    location   	(1462, 1525)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	492
-					    justify    	0
-					    label      	"+anonymousTypeDefinition"
-					    pctDist    	0.444976
-					    height     	272
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6890D60318"
-					client     	@1009
-					supplier   	@1003
-					line_style 	3
-					origin_attachment 	(1190, 1432)
-					terminal_attachment 	(1190, 1641)
-					label      	(object SegLabel @1012
-					    Parent_View 	@1010
-					    location   	(1143, 1527)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.454545
-					    height     	47
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$70" @1013
-					Parent_View 	@1009
-					location   	(774, -1832)
-					label      	(object SegLabel @1014
-					    Parent_View 	@1013
-					    location   	(1149, 1266)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6890D6030E"
-					client     	@1009
-					supplier   	@996
-					line_style 	3
-					origin_attachment 	(1190, 1432)
-					terminal_attachment 	(1190, 1223))))
-			    (object AssociationViewNew "$UNNAMED$187" @1015
-				location   	(1690, 1684)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C35AD0374"
-				roleview_list 	(list RoleViews
-				    (object RoleView "facetContents" @1016
-					Parent_View 	@1015
-					location   	(-326, -12)
-					label      	(object SegLabel @1017
-					    Parent_View 	@1016
-					    location   	(1695, 1731)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+facetContents"
-					    pctDist    	0.032051
-					    height     	47
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6C35AF0010"
-					client     	@1015
-					supplier   	@1002
-					line_style 	3
-					origin_attachment 	(1690, 1684)
-					terminal_attachment 	(1846, 1684)
-					label      	(object SegLabel @1018
-					    Parent_View 	@1016
-					    location   	(1756, 1644)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	94
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.420732
-					    height     	41
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$188" @1019
-					Parent_View 	@1015
-					location   	(-326, -12)
-					label      	(object SegLabel @1020
-					    Parent_View 	@1019
-					    location   	(1566, 1643)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6C35AF0006"
-					client     	@1015
-					supplier   	@1003
-					line_style 	3
-					origin_attachment 	(1690, 1684)
-					terminal_attachment 	(1534, 1684))))
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaCompositor" @1021
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2624, 784)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1021
-				    location   	(2388, 741)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	472
-				    justify    	0
-				    label      	"XSDSchemaCompositor")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C21DB4102AE"
-				width      	490
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaContent" @1022
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1312, 320)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1022
-				    location   	(1108, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	408
-				    justify    	0
-				    label      	"XSDSchemaContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B688CB800BA"
-				width      	426
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @1023
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(688, 320)
-				label      	(object ItemLabel
-				    Parent_View 	@1023
-				    location   	(557, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	262
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	280
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$167" @1024
-				location   	(963, 319)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B688E6B003D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "contents" @1025
-					Parent_View 	@1024
-					location   	(595, -17)
-					label      	(object SegLabel @1026
-					    Parent_View 	@1025
-					    location   	(974, 361)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+contents"
-					    pctDist    	0.081081
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B688E6C0111"
-					client     	@1024
-					supplier   	@1022
-					line_style 	3
-					origin_attachment 	(963, 319)
-					terminal_attachment 	(1099, 319)
-					label      	(object SegLabel @1027
-					    Parent_View 	@1025
-					    location   	(1016, 290)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.396396
-					    height     	30
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$168" @1028
-					Parent_View 	@1024
-					location   	(595, -17)
-					label      	(object SegLabel @1029
-					    Parent_View 	@1028
-					    location   	(855, 361)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B688E6C0107"
-					client     	@1024
-					supplier   	@1023
-					line_style 	3
-					origin_attachment 	(963, 319)
-					terminal_attachment 	(828, 319))))
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @1030
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2160, 992)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1030
-				    location   	(1974, 949)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	372
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	390
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @1031
-				location   	(2322, 1593)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1030
-				vertices   	(list Points
-				    (2322, 1593)
-				    (2322, 1047)))
-			    (object InheritView "" @1032
-				stereotype 	(object SegLabel @1033
-				    Parent_View 	@1032
-				    location   	(2146, 905)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	225
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.460000
-				    height     	5
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B6AE2F5013A"
-				client     	@1030
-				supplier   	@966
-				line_style 	3
-				origin_attachment 	(2150, 937)
-				terminal_attachment 	(2150, 868)
-				drawSupplier 	@967)
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @1034
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(832, 576)
-				label      	(object ItemLabel
-				    Parent_View 	@1034
-				    location   	(510, 532)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	644
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				width      	662
-				height     	112
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$113" @1035
-				location   	(1498, 1431)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B68911401AF"
-				roleview_list 	(list RoleViews
-				    (object RoleView "anonymousTypeDefinition" @1036
-					Parent_View 	@1035
-					location   	(1038, -1810)
-					label      	(object SegLabel @1037
-					    Parent_View 	@1036
-					    location   	(2027, 1472)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	492
-					    justify    	0
-					    label      	"+anonymousTypeDefinition"
-					    pctDist    	0.454389
-					    height     	41
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6891150017"
-					client     	@1035
-					supplier   	@1030
-					vertices   	(list Points
-					    (1498, 1431)
-					    (2281, 1431)
-					    (2281, 1047))
-					line_style 	3
-					origin_attachment 	(1498, 1431)
-					terminal_attachment 	(2281, 1047)
-					label      	(object SegLabel @1038
-					    Parent_View 	@1036
-					    location   	(2204, 1397)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.605419
-					    height     	35
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$114" @1039
-					Parent_View 	@1035
-					location   	(1038, -1810)
-					label      	(object SegLabel @1040
-					    Parent_View 	@1039
-					    location   	(1090, 866)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6891150016"
-					client     	@1035
-					supplier   	@1034
-					vertices   	(list Points
-					    (1498, 1431)
-					    (1131, 1431)
-					    (1131, 632))
-					line_style 	3
-					origin_attachment 	(1498, 1431)
-					terminal_attachment 	(1131, 632))))
-			    (object ClassView "Class" "Logical View::xsd::XSDXPathDefinition" @1041
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(848, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@1041
-				    location   	(655, 1125)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	386
-				    justify    	0
-				    label      	"XSDXPathDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6D83BB0355"
-				width      	404
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDIdentityConstraintDefinition" @1042
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(800, 896)
-				label      	(object ItemLabel
-				    Parent_View 	@1042
-				    location   	(505, 853)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	590
-				    justify    	0
-				    label      	"XSDIdentityConstraintDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B2603A2"
-				width      	608
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$117" @1043
-				location   	(534, 736)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6833EF0160"
-				roleview_list 	(list RoleViews
-				    (object RoleView "identityConstraintDefinitions" @1044
-					Parent_View 	@1043
-					location   	(86, -2144)
-					label      	(object SegLabel @1045
-					    Parent_View 	@1044
-					    location   	(820, 748)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	550
-					    justify    	0
-					    label      	"+identityConstraintDefinitions"
-					    pctDist    	0.111111
-					    height     	286
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6833F00299"
-					client     	@1043
-					supplier   	@1042
-					line_style 	3
-					origin_attachment 	(534, 736)
-					terminal_attachment 	(534, 841)
-					label      	(object SegLabel @1046
-					    Parent_View 	@1044
-					    location   	(595, 807)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.675926
-					    height     	61
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$118" @1047
-					Parent_View 	@1043
-					location   	(86, -2144)
-					label      	(object SegLabel @1048
-					    Parent_View 	@1047
-					    location   	(576, 653)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6833F00298"
-					client     	@1043
-					supplier   	@1034
-					line_style 	3
-					origin_attachment 	(534, 736)
-					terminal_attachment 	(534, 632))))
-			    (object AssociationViewNew "$UNNAMED$137" @1049
-				location   	(900, 1032)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D8D3D003E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "selector" @1050
-					Parent_View 	@1049
-					location   	(84, 120)
-					label      	(object SegLabel @1051
-					    Parent_View 	@1050
-					    location   	(1013, 1042)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+selector"
-					    pctDist    	0.123288
-					    height     	113
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D3E0234"
-					client     	@1049
-					supplier   	@1041
-					line_style 	3
-					origin_attachment 	(900, 1032)
-					terminal_attachment 	(900, 1113)
-					label      	(object SegLabel @1052
-					    Parent_View 	@1050
-					    location   	(859, 1040)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.095890
-					    height     	42
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$138" @1053
-					Parent_View 	@1049
-					location   	(84, 120)
-					label      	(object SegLabel @1054
-					    Parent_View 	@1053
-					    location   	(859, 968)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D3E022A"
-					client     	@1049
-					supplier   	@1042
-					line_style 	3
-					origin_attachment 	(900, 1032)
-					terminal_attachment 	(900, 951))))
-			    (object AssociationViewNew "$UNNAMED$139" @1055
-				location   	(700, 1032)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D8D330025"
-				roleview_list 	(list RoleViews
-				    (object RoleView "fields" @1056
-					Parent_View 	@1055
-					location   	(-116, 120)
-					label      	(object SegLabel @1057
-					    Parent_View 	@1056
-					    location   	(616, 1036)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	120
-					    justify    	0
-					    label      	"+fields"
-					    pctDist    	0.054795
-					    height     	85
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D330379"
-					client     	@1055
-					supplier   	@1041
-					line_style 	3
-					origin_attachment 	(700, 1032)
-					terminal_attachment 	(700, 1113)
-					label      	(object SegLabel @1058
-					    Parent_View 	@1056
-					    location   	(771, 1042)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..*"
-					    pctDist    	0.123077
-					    height     	71
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$140" @1059
-					Parent_View 	@1055
-					location   	(-116, 120)
-					label      	(object SegLabel @1060
-					    Parent_View 	@1059
-					    location   	(659, 968)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D330365"
-					client     	@1055
-					supplier   	@1042
-					line_style 	3
-					origin_attachment 	(700, 1032)
-					terminal_attachment 	(700, 951))))
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeContent" @1061
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(752, 1440)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1061
-				    location   	(500, 1397)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	504
-				    justify    	0
-				    label      	"XSDComplexTypeContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683BA00196"
-				width      	522
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @1062
-				location   	(550, 1590)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1061
-				vertices   	(list Points
-				    (550, 1590)
-				    (550, 1495)))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupContent" @1063
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1504, 576)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1063
-				    location   	(1240, 533)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	528
-				    justify    	0
-				    label      	"XSDAttributeGroupContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6940200089"
-				width      	546
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @1064
-				location   	(1406, 765)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1063
-				vertices   	(list Points
-				    (1406, 765)
-				    (1406, 631)))
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @1065
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2656, 1696)
-				label      	(object ItemLabel
-				    Parent_View 	@1065
-				    location   	(2393, 1653)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	526
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				width      	544
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$95" @1066
-				location   	(1614, 1868)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6FDDD70113"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$96" @1067
-					Parent_View 	@1066
-					location   	(526, 476)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6FDDDA026B"
-					client     	@1066
-					supplier   	@1065
-					vertices   	(list Points
-					    (1614, 1868)
-					    (2500, 1868)
-					    (2500, 1751))
-					line_style 	3
-					origin_attachment 	(1614, 1868)
-					terminal_attachment 	(2500, 1751))
-				    (object RoleView "content" @1068
-					Parent_View 	@1066
-					location   	(526, 476)
-					label      	(object SegLabel @1069
-					    Parent_View 	@1068
-					    location   	(896, 1787)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+content"
-					    pctDist    	0.709870
-					    height     	89
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6FDDDA0275"
-					client     	@1066
-					supplier   	@1061
-					vertices   	(list Points
-					    (1614, 1868)
-					    (984, 1868)
-					    (984, 1495))
-					line_style 	3
-					origin_attachment 	(1614, 1868)
-					terminal_attachment 	(984, 1495)
-					label      	(object SegLabel @1070
-					    Parent_View 	@1068
-					    location   	(1042, 1824)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.571286
-					    height     	45
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$101" @1071
-				location   	(2927, 387)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B698E360386"
-				roleview_list 	(list RoleViews
-				    (object RoleView "attributeContents" @1072
-					Parent_View 	@1071
-					location   	(2463, -3757)
-					label      	(object SegLabel @1073
-					    Parent_View 	@1072
-					    location   	(1915, 357)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+attributeContents"
-					    pctDist    	0.773060
-					    height     	31
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B698E38007C"
-					client     	@1071
-					supplier   	@1063
-					vertices   	(list Points
-					    (2927, 387)
-					    (1750, 387)
-					    (1750, 521))
-					line_style 	3
-					origin_attachment 	(2927, 387)
-					terminal_attachment 	(1750, 521)
-					label      	(object SegLabel @1074
-					    Parent_View 	@1072
-					    location   	(1804, 425)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.857247
-					    height     	38
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$102" @1075
-					Parent_View 	@1071
-					location   	(2463, -3757)
-					label      	(object SegLabel @1076
-					    Parent_View 	@1075
-					    location   	(2946, 1448)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B698E380072"
-					client     	@1071
-					supplier   	@1065
-					vertices   	(list Points
-					    (2927, 387)
-					    (2987, 387)
-					    (2987, 1671)
-					    (2928, 1671))
-					line_style 	3
-					origin_attachment 	(2927, 387)
-					terminal_attachment 	(2928, 1671))))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @1077
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1968, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@1077
-				    location   	(1699, 1125)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	538
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	556
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$77" @1078
-				location   	(1750, 872)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69404E0067"
-				roleview_list 	(list RoleViews
-				    (object RoleView "contents" @1079
-					Parent_View 	@1078
-					location   	(1462, -2392)
-					label      	(object SegLabel @1080
-					    Parent_View 	@1079
-					    location   	(1640, 691)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+contents"
-					    pctDist    	0.751037
-					    height     	110
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69405002A5"
-					client     	@1078
-					supplier   	@1063
-					line_style 	3
-					origin_attachment 	(1750, 872)
-					terminal_attachment 	(1750, 631)
-					label      	(object SegLabel @1081
-					    Parent_View 	@1079
-					    location   	(1814, 695)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.734440
-					    height     	64
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$78" @1082
-					Parent_View 	@1078
-					location   	(1462, -2392)
-					label      	(object SegLabel @1083
-					    Parent_View 	@1082
-					    location   	(1709, 1065)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B694050029B"
-					client     	@1078
-					supplier   	@1077
-					line_style 	3
-					origin_attachment 	(1750, 872)
-					terminal_attachment 	(1750, 1113))))
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @1084
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(416, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@1084
-				    location   	(279, 1125)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	274
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				width      	292
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$209" @1085
-				location   	(1252, 1896)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BEBDC870247"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$210" @1086
-					Parent_View 	@1085
-					location   	(708, 1288)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BEBDC8C02F9"
-					client     	@1085
-					supplier   	@1065
-					vertices   	(list Points
-					    (1252, 1896)
-					    (2603, 1896)
-					    (2603, 1751))
-					line_style 	3
-					origin_attachment 	(1252, 1896)
-					terminal_attachment 	(2603, 1751))
-				    (object RoleView "attributeWildcardContent" @1087
-					Parent_View 	@1085
-					location   	(708, 1288)
-					label      	(object SegLabel @1088
-					    Parent_View 	@1087
-					    location   	(682, 1858)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	480
-					    justify    	0
-					    label      	"+attributeWildcardContent"
-					    pctDist    	0.381142
-					    height     	39
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BEBDC8C0303"
-					client     	@1085
-					supplier   	@1084
-					vertices   	(list Points
-					    (1252, 1896)
-					    (428, 1896)
-					    (428, 1223))
-					line_style 	3
-					origin_attachment 	(1252, 1896)
-					terminal_attachment 	(428, 1223)
-					label      	(object SegLabel @1089
-					    Parent_View 	@1087
-					    location   	(382, 1860)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.575033
-					    height     	47
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$81" @1090
-				location   	(1199, 1321)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C275D320220"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$82" @1091
-					Parent_View 	@1090
-					location   	(655, 713)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C275D3C010C"
-					client     	@1090
-					supplier   	@1077
-					vertices   	(list Points
-					    (1199, 1321)
-					    (1897, 1321)
-					    (1897, 1223))
-					line_style 	3
-					origin_attachment 	(1199, 1321)
-					terminal_attachment 	(1897, 1223))
-				    (object RoleView "attributeWildcardContent" @1092
-					Parent_View 	@1090
-					location   	(655, 713)
-					label      	(object SegLabel @1093
-					    Parent_View 	@1092
-					    location   	(857, 1279)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	480
-					    justify    	0
-					    label      	"+attributeWildcardContent"
-					    pctDist    	0.429569
-					    height     	43
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C275D3C010D"
-					client     	@1090
-					supplier   	@1084
-					vertices   	(list Points
-					    (1199, 1321)
-					    (500, 1321)
-					    (500, 1223))
-					line_style 	3
-					origin_attachment 	(1199, 1321)
-					terminal_attachment 	(500, 1223)
-					label      	(object SegLabel @1094
-					    Parent_View 	@1092
-					    location   	(576, 1279)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.782305
-					    height     	43
-					    orientation 	1))))
-			    (object InheritView "" @1095
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0D01901F1"
-				client     	@1065
-				supplier   	@1030
-				line_style 	3
-				origin_attachment 	(2606, 1641)
-				terminal_attachment 	(2606, 1593)
-				drawSupplier 	@1031)
-			    (object InheritView "" @1096
-				stereotype 	(object SegLabel @1097
-				    Parent_View 	@1096
-				    location   	(759, 495)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	243
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.446429
-				    height     	6
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B685F17002E"
-				client     	@1034
-				supplier   	@973
-				line_style 	3
-				origin_attachment 	(753, 520)
-				terminal_attachment 	(753, 465)
-				drawSupplier 	@974)
-			    (object InheritView "" @1098
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A1302A2"
-				client     	@1003
-				supplier   	@1030
-				line_style 	3
-				origin_attachment 	(1409, 1641)
-				terminal_attachment 	(1409, 1593)
-				drawSupplier 	@1031)
-			    (object InheritView "" @1099
-				stereotype 	(object SegLabel @1100
-				    Parent_View 	@1099
-				    location   	(759, 1591)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	219
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.980392
-				    height     	385
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B685F55032B"
-				client     	@1003
-				supplier   	@1061
-				line_style 	3
-				origin_attachment 	(1144, 1641)
-				terminal_attachment 	(1144, 1590)
-				drawSupplier 	@1062)
-			    (object InheritView "" @1101
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A640279"
-				client     	@976
-				supplier   	@973
-				line_style 	3
-				origin_attachment 	(166, 521)
-				terminal_attachment 	(166, 465)
-				drawSupplier 	@974)
-			    (object InheritTreeView "" @1102
-				location   	(431, 222)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@989
-				vertices   	(list Points
-				    (431, 222)
-				    (431, 130)))
-			    (object InheritView "" @1103
-				stereotype 	(object SegLabel @1104
-				    Parent_View 	@1103
-				    location   	(361, 224)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	237
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.976744
-				    height     	86
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B6BD2440069"
-				client     	@973
-				supplier   	@989
-				line_style 	3
-				origin_attachment 	(275, 265)
-				terminal_attachment 	(275, 222)
-				drawSupplier 	@1102)
-			    (object InheritTreeView "" @1105
-				location   	(1309, 465)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1022
-				vertices   	(list Points
-				    (1309, 465)
-				    (1309, 375)))
-			    (object InheritView "" @1106
-				stereotype 	(object SegLabel @1107
-				    Parent_View 	@1106
-				    location   	(941, 495)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	225
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.464286
-				    height     	10
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B688E660339"
-				client     	@1034
-				supplier   	@1022
-				line_style 	3
-				origin_attachment 	(931, 520)
-				terminal_attachment 	(931, 465)
-				drawSupplier 	@1105)
-			    (object InheritView "" @1108
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6848FC01E7"
-				client     	@983
-				supplier   	@1061
-				line_style 	3
-				origin_attachment 	(250, 1641)
-				terminal_attachment 	(250, 1590)
-				drawSupplier 	@1062)
-			    (object InheritView "" @1109
-				stereotype 	(object SegLabel @1110
-				    Parent_View 	@1109
-				    location   	(1205, 493)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	212
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.958333
-				    height     	8
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B688E6103BE"
-				client     	@996
-				supplier   	@1022
-				line_style 	3
-				origin_attachment 	(1197, 1113)
-				terminal_attachment 	(1197, 465)
-				drawSupplier 	@1105)
-			    (object InheritView "" @1111
-				stereotype 	(object SegLabel @1112
-				    Parent_View 	@1111
-				    location   	(1951, 905)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	225
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.848980
-				    height     	73
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B6AE2EB02A8"
-				client     	@1077
-				supplier   	@966
-				line_style 	3
-				origin_attachment 	(1878, 1113)
-				terminal_attachment 	(1878, 868)
-				drawSupplier 	@967)
-			    (object InheritView "" @1113
-				stereotype 	(object SegLabel @1114
-				    Parent_View 	@1113
-				    location   	(1642, 807)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	187
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.879310
-				    height     	61
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B69403A0221"
-				client     	@1077
-				supplier   	@1063
-				line_style 	3
-				origin_attachment 	(1703, 1113)
-				terminal_attachment 	(1703, 765)
-				drawSupplier 	@1064)
-			    (object InheritView "" @1115
-				stereotype 	(object SegLabel @1116
-				    Parent_View 	@1115
-				    location   	(1354, 801)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	225
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.500000
-				    height     	70
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B72D737038F"
-				client     	@995
-				supplier   	@1063
-				line_style 	3
-				origin_attachment 	(1284, 837)
-				terminal_attachment 	(1284, 765)
-				drawSupplier 	@1064)
-			    (object InheritView "" @1117
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DB640240"
-				client     	@965
-				supplier   	@1021
-				line_style 	3
-				origin_attachment 	(2284, 762)
-				terminal_attachment 	(2379, 762))
-			    (object InheritView "" @1118
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AE32102AF"
-				client     	@964
-				supplier   	@1022
-				line_style 	3
-				origin_attachment 	(2637, 521)
-				terminal_attachment 	(2637, 465)
-				drawSupplier 	@1105)
-			    (object InheritView "" @1119
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DB560092"
-				client     	@1021
-				supplier   	@964
-				line_style 	3
-				origin_attachment 	(2637, 729)
-				terminal_attachment 	(2637, 631))
-			    (object InheritView "" @1120
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AE2B301D5"
-				client     	@966
-				supplier   	@1022
-				line_style 	3
-				origin_attachment 	(1950, 521)
-				terminal_attachment 	(1950, 465)
-				drawSupplier 	@1105)
-			    (object InheritView "" @1121
-				stereotype 	(object SegLabel @1122
-				    Parent_View 	@1121
-				    location   	(2821, 897)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	181
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.087719
-				    height     	76
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B688E4F023C"
-				client     	@963
-				supplier   	@1022
-				line_style 	3
-				origin_attachment 	(2896, 937)
-				terminal_attachment 	(2896, 465)
-				drawSupplier 	@1105)
-			    (object InheritView "" @1123
-				stereotype 	(object SegLabel @1124
-				    Parent_View 	@1123
-				    location   	(2313, 904)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	207
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.850622
-				    height     	68
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B6AE2E20381"
-				client     	@975
-				supplier   	@966
-				line_style 	3
-				origin_attachment 	(2381, 1109)
-				terminal_attachment 	(2381, 868)
-				drawSupplier 	@967)
-			    (object InheritView "" @1125
-				stereotype 	(object SegLabel @1126
-				    Parent_View 	@1125
-				    location   	(2878, 269)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	238
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.946667
-				    height     	66
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B6BD2550385"
-				client     	@975
-				supplier   	@989
-				line_style 	3
-				origin_attachment 	(2943, 1109)
-				terminal_attachment 	(2943, 222)
-				drawSupplier 	@1102)
-			    (object InheritView "" @1127
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A3A0041"
-				client     	@1084
-				supplier   	@973
-				line_style 	3
-				origin_attachment 	(462, 1113)
-				terminal_attachment 	(462, 465)
-				drawSupplier 	@974)))
-		    (object ClassDiagram "9. Concrete Schema Composition"
-			quid       	"3C25EB7A038C"
-			title      	"9. Concrete Schema Composition"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @1128
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 1536)
-				label      	(object ItemLabel
-				    Parent_View 	@1128
-				    location   	(73, 1493)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	462
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				width      	480
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$119" @1129
-				location   	(228, 1695)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6B41E60251"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$120" @1130
-					Parent_View 	@1129
-					location   	(-476, -385)
-					label      	(object SegLabel @1131
-					    Parent_View 	@1130
-					    location   	(217, 1623)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B41EA02F7"
-					client     	@1129
-					supplier   	@1128
-					vertices   	(list Points
-					    (228, 1695)
-					    (175, 1695)
-					    (175, 1591))
-					line_style 	3
-					origin_attachment 	(228, 1695)
-					terminal_attachment 	(175, 1591))
-				    (object RoleView "resolvedElementDeclaration" @1132
-					Parent_View 	@1129
-					location   	(-476, -385)
-					label      	(object SegLabel @1133
-					    Parent_View 	@1132
-					    location   	(329, 1740)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	528
-					    justify    	0
-					    label      	"+resolvedElementDeclaration"
-					    pctDist    	1.924528
-					    height     	45
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B41EA030B"
-					client     	@1129
-					supplier   	@1128
-					vertices   	(list Points
-					    (228, 1695)
-					    (281, 1695)
-					    (281, 1591))
-					line_style 	3
-					origin_attachment 	(228, 1695)
-					terminal_attachment 	(281, 1591)
-					label      	(object SegLabel @1134
-					    Parent_View 	@1132
-					    location   	(229, 1646)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.005714
-					    height     	50
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @1135
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1040, 1536)
-				label      	(object ItemLabel
-				    Parent_View 	@1135
-				    location   	(790, 1493)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	500
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				width      	518
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$155" @1136
-				location   	(952, 1698)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6B42450398"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$156" @1137
-					Parent_View 	@1136
-					location   	(-1288, -318)
-					label      	(object SegLabel @1138
-					    Parent_View 	@1137
-					    location   	(860, 1623)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B4249038A"
-					client     	@1136
-					supplier   	@1135
-					vertices   	(list Points
-					    (952, 1698)
-					    (901, 1698)
-					    (901, 1591))
-					line_style 	3
-					origin_attachment 	(952, 1698)
-					terminal_attachment 	(901, 1591))
-				    (object RoleView "resolvedModelGroupDefinition" @1139
-					Parent_View 	@1136
-					location   	(-1288, -318)
-					label      	(object SegLabel @1140
-					    Parent_View 	@1139
-					    location   	(1020, 1739)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	564
-					    justify    	0
-					    label      	"+resolvedModelGroupDefinition"
-					    pctDist    	1.326923
-					    height     	41
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B4249039E"
-					client     	@1136
-					supplier   	@1135
-					vertices   	(list Points
-					    (952, 1698)
-					    (1004, 1698)
-					    (1004, 1591))
-					line_style 	3
-					origin_attachment 	(952, 1698)
-					terminal_attachment 	(1004, 1591)
-					label      	(object SegLabel @1141
-					    Parent_View 	@1139
-					    location   	(952, 1649)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.000000
-					    height     	50
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaCompositor" @1142
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(656, 992)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1142
-				    location   	(420, 949)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	472
-				    justify    	0
-				    label      	"XSDSchemaCompositor")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C21DB4102AE"
-				width      	490
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaDirective" @1143
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(640, 784)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1143
-				    location   	(412, 737)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	457
-				    justify    	0
-				    label      	"XSDSchemaDirective")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD8A202A2"
-				width      	475
-				height     	118
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @1144
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(640, 416)
-				label      	(object ItemLabel
-				    Parent_View 	@1144
-				    location   	(446, 285)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	388
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	406
-				height     	287
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$219" @1145
-				location   	(1303, 679)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DD0C03DB"
-				roleview_list 	(list RoleViews
-				    (object RoleView "incorporatedSchema" @1146
-					Parent_View 	@1145
-					location   	(-41, -857)
-					label      	(object SegLabel @1147
-					    Parent_View 	@1146
-					    location   	(1059, 381)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+incorporatedSchema"
-					    pctDist    	0.700384
-					    height     	39
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DD100305"
-					client     	@1145
-					supplier   	@1144
-					vertices   	(list Points
-					    (1303, 679)
-					    (1303, 419)
-					    (843, 419))
-					line_style 	3
-					origin_attachment 	(1303, 679)
-					terminal_attachment 	(843, 419)
-					label      	(object SegLabel @1148
-					    Parent_View 	@1146
-					    location   	(922, 454)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.890746
-					    height     	35
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$220" @1149
-					Parent_View 	@1145
-					location   	(-41, -857)
-					label      	(object SegLabel @1150
-					    Parent_View 	@1149
-					    location   	(1045, 956)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DD100304"
-					client     	@1145
-					supplier   	@1142
-					vertices   	(list Points
-					    (1303, 679)
-					    (1303, 997)
-					    (901, 997))
-					line_style 	3
-					origin_attachment 	(1303, 679)
-					terminal_attachment 	(901, 997))))
-			    (object AssociationViewNew "$UNNAMED$217" @1151
-				location   	(1216, 649)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DCC700EC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "resolvedSchema" @1152
-					Parent_View 	@1151
-					location   	(336, -1399)
-					label      	(object SegLabel @1153
-					    Parent_View 	@1152
-					    location   	(1038, 500)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	324
-					    justify    	0
-					    label      	"+resolvedSchema"
-					    pctDist    	0.601923
-					    height     	35
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DCCE0043"
-					client     	@1151
-					supplier   	@1144
-					vertices   	(list Points
-					    (1216, 649)
-					    (1216, 534)
-					    (843, 534))
-					line_style 	3
-					origin_attachment 	(1216, 649)
-					terminal_attachment 	(843, 534)
-					label      	(object SegLabel @1154
-					    Parent_View 	@1152
-					    location   	(926, 577)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.831643
-					    height     	43
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$218" @1155
-					Parent_View 	@1151
-					location   	(336, -1399)
-					label      	(object SegLabel @1156
-					    Parent_View 	@1155
-					    location   	(974, 756)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DCCE0042"
-					client     	@1151
-					supplier   	@1143
-					vertices   	(list Points
-					    (1216, 649)
-					    (1216, 797)
-					    (877, 797))
-					line_style 	3
-					origin_attachment 	(1216, 649)
-					terminal_attachment 	(877, 797))))
-			    (object AssociationViewNew "$UNNAMED$223" @1157
-				location   	(662, 642)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C25D3A60131"
-				roleview_list 	(list RoleViews
-				    (object RoleView "referencingDirectives" @1158
-					Parent_View 	@1157
-					location   	(-234, 114)
-					label      	(object SegLabel @1159
-					    Parent_View 	@1158
-					    location   	(878, 675)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+referencingDirectives"
-					    pctDist    	0.408759
-					    height     	216
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25D3A90371"
-					client     	@1157
-					supplier   	@1143
-					line_style 	3
-					origin_attachment 	(662, 642)
-					terminal_attachment 	(662, 725)
-					label      	(object SegLabel @1160
-					    Parent_View 	@1158
-					    location   	(615, 678)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.430657
-					    height     	48
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$224" @1161
-					Parent_View 	@1157
-					location   	(-234, 114)
-					label      	(object SegLabel @1162
-					    Parent_View 	@1161
-					    location   	(621, 576)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25D3A90370"
-					client     	@1157
-					supplier   	@1144
-					line_style 	3
-					origin_attachment 	(662, 642)
-					terminal_attachment 	(662, 559))))
-			    (object AssociationViewNew "$UNNAMED$225" @1163
-				location   	(75, 188)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C25ECF0005E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$226" @1164
-					Parent_View 	@1163
-					location   	(-853, -308)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25ECF4001E"
-					client     	@1163
-					supplier   	@1144
-					vertices   	(list Points
-					    (75, 188)
-					    (75, 128)
-					    (510, 128)
-					    (510, 273))
-					line_style 	3
-					origin_attachment 	(75, 188)
-					terminal_attachment 	(510, 273))
-				    (object RoleView "rootVersion" @1165
-					Parent_View 	@1163
-					location   	(-853, -308)
-					label      	(object SegLabel @1166
-					    Parent_View 	@1165
-					    location   	(176, 74)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+rootVersion"
-					    pctDist    	-0.593750
-					    height     	101
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25ECF40028"
-					client     	@1163
-					supplier   	@1144
-					vertices   	(list Points
-					    (75, 188)
-					    (75, 380)
-					    (437, 380))
-					line_style 	3
-					origin_attachment 	(75, 188)
-					terminal_attachment 	(437, 380)
-					label      	(object SegLabel @1167
-					    Parent_View 	@1165
-					    location   	(368, 328)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.874755
-					    height     	53
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$227" @1168
-				location   	(1262, 134)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C25ED0B011B"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$228" @1169
-					Parent_View 	@1168
-					location   	(334, -362)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25ED0F0121"
-					client     	@1168
-					supplier   	@1144
-					vertices   	(list Points
-					    (1262, 134)
-					    (766, 134)
-					    (766, 273))
-					line_style 	3
-					origin_attachment 	(1262, 134)
-					terminal_attachment 	(766, 273))
-				    (object RoleView "originalVersion" @1170
-					Parent_View 	@1168
-					location   	(334, -362)
-					label      	(object SegLabel @1171
-					    Parent_View 	@1170
-					    location   	(1164, 97)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	288
-					    justify    	0
-					    label      	"+originalVersion"
-					    pctDist    	-1.650000
-					    height     	38
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25ED0F012B"
-					client     	@1168
-					supplier   	@1144
-					vertices   	(list Points
-					    (1262, 134)
-					    (1322, 134)
-					    (1322, 334)
-					    (843, 334))
-					line_style 	3
-					origin_attachment 	(1262, 134)
-					terminal_attachment 	(843, 334)
-					label      	(object SegLabel @1172
-					    Parent_View 	@1170
-					    location   	(919, 279)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.898108
-					    height     	56
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$229" @1173
-				location   	(126, 656)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C25EEAB001F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$230" @1174
-					Parent_View 	@1173
-					location   	(-834, 160)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25EEAF010B"
-					client     	@1173
-					supplier   	@1144
-					vertices   	(list Points
-					    (126, 656)
-					    (513, 656)
-					    (513, 559))
-					line_style 	3
-					origin_attachment 	(126, 656)
-					terminal_attachment 	(513, 559))
-				    (object RoleView "incorporatedVersions" @1175
-					Parent_View 	@1173
-					location   	(-834, 160)
-					label      	(object SegLabel @1176
-					    Parent_View 	@1175
-					    location   	(217, 431)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	408
-					    justify    	0
-					    label      	"+incorporatedVersions"
-					    pctDist    	0.643902
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25EEAF0115"
-					client     	@1173
-					supplier   	@1144
-					vertices   	(list Points
-					    (126, 656)
-					    (66, 656)
-					    (66, 472)
-					    (437, 472))
-					line_style 	3
-					origin_attachment 	(126, 656)
-					terminal_attachment 	(437, 472)
-					label      	(object SegLabel @1177
-					    Parent_View 	@1175
-					    location   	(356, 526)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.868468
-					    height     	54
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$233" @1178
-				location   	(642, 126)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C2784730194"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$234" @1179
-					Parent_View 	@1178
-					location   	(82, -418)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C27847501F1"
-					client     	@1178
-					supplier   	@1144
-					vertices   	(list Points
-					    (642, 126)
-					    (588, 126)
-					    (588, 273))
-					line_style 	3
-					origin_attachment 	(642, 126)
-					terminal_attachment 	(588, 273))
-				    (object RoleView "schemaForSchema" @1180
-					Parent_View 	@1178
-					location   	(82, -418)
-					label      	(object SegLabel @1181
-					    Parent_View 	@1180
-					    location   	(639, 74)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	384
-					    justify    	0
-					    label      	"+schemaForSchema"
-					    pctDist    	-0.055556
-					    height     	53
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C27847501FB"
-					client     	@1178
-					supplier   	@1144
-					vertices   	(list Points
-					    (642, 126)
-					    (697, 126)
-					    (697, 273))
-					line_style 	3
-					origin_attachment 	(642, 126)
-					terminal_attachment 	(697, 273)
-					label      	(object SegLabel @1182
-					    Parent_View 	@1180
-					    location   	(643, 213)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.701863
-					    height     	55
-					    orientation 	1))))
-			    (object InheritView "" @1183
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DB560092"
-				client     	@1142
-				supplier   	@1143
-				line_style 	3
-				origin_attachment 	(638, 937)
-				terminal_attachment 	(638, 843))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @1184
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 1184)
-				label      	(object ItemLabel
-				    Parent_View 	@1184
-				    location   	(67, 1141)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	474
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	492
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$73" @1185
-				location   	(234, 1340)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6B426B0194"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$74" @1186
-					Parent_View 	@1185
-					location   	(-310, -4)
-					label      	(object SegLabel @1187
-					    Parent_View 	@1186
-					    location   	(140, 1271)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B426D0309"
-					client     	@1185
-					supplier   	@1184
-					vertices   	(list Points
-					    (234, 1340)
-					    (181, 1340)
-					    (181, 1239))
-					line_style 	3
-					origin_attachment 	(234, 1340)
-					terminal_attachment 	(181, 1239))
-				    (object RoleView "resolvedAttributeDeclaration" @1188
-					Parent_View 	@1185
-					location   	(-310, -4)
-					label      	(object SegLabel @1189
-					    Parent_View 	@1188
-					    location   	(333, 1389)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	528
-					    justify    	0
-					    label      	"+resolvedAttributeDeclaration"
-					    pctDist    	1.867925
-					    height     	49
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B426D0313"
-					client     	@1185
-					supplier   	@1184
-					vertices   	(list Points
-					    (234, 1340)
-					    (287, 1340)
-					    (287, 1239))
-					line_style 	3
-					origin_attachment 	(234, 1340)
-					terminal_attachment 	(287, 1239)
-					label      	(object SegLabel @1190
-					    Parent_View 	@1188
-					    location   	(241, 1295)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.042945
-					    height     	46
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @1191
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1760, 144)
-				label      	(object ItemLabel
-				    Parent_View 	@1191
-				    location   	(1517, 101)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	486
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				width      	504
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDFacet" @1192
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1712, 416)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1192
-				    location   	(1599, 373)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	226
-				    justify    	0
-				    label      	"XSDFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C359403D2"
-				width      	244
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$307" @1193
-				location   	(1668, 280)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3D4BB4AE01CC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$308" @1194
-					Parent_View 	@1193
-					location   	(8, -152)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4BB4AF010F"
-					client     	@1193
-					supplier   	@1191
-					line_style 	3
-					origin_attachment 	(1668, 280)
-					terminal_attachment 	(1668, 199))
-				    (object RoleView "syntheticFacets" @1195
-					Parent_View 	@1193
-					location   	(8, -152)
-					label      	(object SegLabel @1196
-					    Parent_View 	@1195
-					    location   	(1852, 300)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	324
-					    justify    	0
-					    label      	"+syntheticFacets"
-					    pctDist    	0.246154
-					    height     	184
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4BB4AF011A"
-					client     	@1193
-					supplier   	@1192
-					line_style 	3
-					origin_attachment 	(1668, 280)
-					terminal_attachment 	(1668, 361)
-					label      	(object SegLabel @1197
-					    Parent_View 	@1195
-					    location   	(1625, 301)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.276923
-					    height     	44
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @1198
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1552, 944)
-				label      	(object ItemLabel
-				    Parent_View 	@1198
-				    location   	(1426, 901)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	252
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	270
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @1199
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1776, 640)
-				label      	(object ItemLabel
-				    Parent_View 	@1199
-				    location   	(1515, 597)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	522
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				width      	540
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$309" @1200
-				location   	(1508, 792)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3D4BB4D3028E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$310" @1201
-					Parent_View 	@1200
-					location   	(-12, -280)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4BB4D402F3"
-					client     	@1200
-					supplier   	@1199
-					line_style 	3
-					origin_attachment 	(1508, 792)
-					terminal_attachment 	(1508, 695))
-				    (object RoleView "syntheticParticle" @1202
-					Parent_View 	@1200
-					location   	(-12, -280)
-					label      	(object SegLabel @1203
-					    Parent_View 	@1202
-					    location   	(1695, 767)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+syntheticParticle"
-					    pctDist    	-0.259259
-					    height     	187
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4BB4D402FD"
-					client     	@1200
-					supplier   	@1198
-					line_style 	3
-					origin_attachment 	(1508, 792)
-					terminal_attachment 	(1508, 889)
-					label      	(object SegLabel @1204
-					    Parent_View 	@1202
-					    location   	(1454, 829)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.395062
-					    height     	55
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @1205
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1024, 1184)
-				label      	(object ItemLabel
-				    Parent_View 	@1205
-				    location   	(756, 1141)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	536
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	554
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$85" @1206
-				location   	(919, 1349)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6B425E01F9"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$86" @1207
-					Parent_View 	@1206
-					location   	(-233, -59)
-					label      	(object SegLabel @1208
-					    Parent_View 	@1207
-					    location   	(825, 1273)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B42620046"
-					client     	@1206
-					supplier   	@1205
-					vertices   	(list Points
-					    (919, 1349)
-					    (866, 1349)
-					    (866, 1239))
-					line_style 	3
-					origin_attachment 	(919, 1349)
-					terminal_attachment 	(866, 1239))
-				    (object RoleView "resolvedAttributeGroupDefinition" @1209
-					Parent_View 	@1206
-					location   	(-233, -59)
-					label      	(object SegLabel @1210
-					    Parent_View 	@1209
-					    location   	(993, 1393)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	600
-					    justify    	0
-					    label      	"+resolvedAttributeGroupDefinition"
-					    pctDist    	1.377358
-					    height     	44
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B42620050"
-					client     	@1206
-					supplier   	@1205
-					vertices   	(list Points
-					    (919, 1349)
-					    (973, 1349)
-					    (973, 1239))
-					line_style 	3
-					origin_attachment 	(919, 1349)
-					terminal_attachment 	(973, 1239)
-					label      	(object SegLabel @1211
-					    Parent_View 	@1209
-					    location   	(919, 1296)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.014925
-					    height     	54
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @1212
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1952, 944)
-				label      	(object ItemLabel
-				    Parent_View 	@1212
-				    location   	(1816, 901)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	272
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				width      	290
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$311" @1213
-				location   	(2025, 792)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3D4BB4D901F6"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$312" @1214
-					Parent_View 	@1213
-					location   	(153, -280)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4BB4DA0284"
-					client     	@1213
-					supplier   	@1199
-					line_style 	3
-					origin_attachment 	(2025, 792)
-					terminal_attachment 	(2025, 695))
-				    (object RoleView "syntheticWildcard" @1215
-					Parent_View 	@1213
-					location   	(153, -280)
-					label      	(object SegLabel @1216
-					    Parent_View 	@1215
-					    location   	(1826, 838)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+syntheticWildcard"
-					    pctDist    	0.488095
-					    height     	200
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4BB4DA028E"
-					client     	@1213
-					supplier   	@1212
-					line_style 	3
-					origin_attachment 	(2025, 792)
-					terminal_attachment 	(2025, 889)
-					label      	(object SegLabel @1217
-					    Parent_View 	@1215
-					    location   	(2098, 840)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.506173
-					    height     	73
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$313" @1218
-				location   	(1754, 1178)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3D4C68FF01BF"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$314" @1219
-					Parent_View 	@1218
-					location   	(-198, 234)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4C69020317"
-					client     	@1218
-					supplier   	@1205
-					line_style 	3
-					origin_attachment 	(1754, 1178)
-					terminal_attachment 	(1301, 1178))
-				    (object RoleView "syntheticWildcard" @1220
-					Parent_View 	@1218
-					location   	(-198, 234)
-					label      	(object SegLabel @1221
-					    Parent_View 	@1220
-					    location   	(1828, 1261)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+syntheticWildcard"
-					    pctDist    	0.163355
-					    height     	83
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4C69020318"
-					client     	@1218
-					supplier   	@1212
-					vertices   	(list Points
-					    (1754, 1178)
-					    (2028, 1178)
-					    (2028, 999))
-					line_style 	3
-					origin_attachment 	(1754, 1178)
-					terminal_attachment 	(2028, 999)
-					label      	(object SegLabel @1222
-					    Parent_View 	@1220
-					    location   	(2082, 1098)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.783664
-					    height     	54
-					    orientation 	1))))))
-		    (object ClassDiagram "10. Diagnostics"
-			quid       	"3BFE5F0803E2"
-			title      	"10. Diagnostics"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::DOMNode" @1223
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(400, 1024)
-				label      	(object ItemLabel
-				    Parent_View 	@1223
-				    location   	(66, 990)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	668
-				    justify    	0
-				    label      	"DOMNode")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@1223
-				    location   	(66, 940)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	668
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	14671839
-				quidu      	"3BFE64A50117"
-				width      	686
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDDiagnosticSeverity" @1224
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1040, 656)
-				label      	(object ItemLabel
-				    Parent_View 	@1224
-				    location   	(818, 547)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	444
-				    justify    	0
-				    label      	"XSDDiagnosticSeverity")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@1224
-				    location   	(818, 497)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	444
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3BFE68A7032F"
-				width      	462
-				height     	342
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @1225
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(192, 112)
-				label      	(object ItemLabel
-				    Parent_View 	@1225
-				    location   	(59, 60)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	266
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	284
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDConcreteComponent" @1226
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(896, 112)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1226
-				    location   	(540, 62)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	713
-				    justify    	0
-				    label      	"XSDConcreteComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD7B40065"
-				width      	731
-				height     	125
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDDiagnostic" @1227
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(384, 608)
-				label      	(object ItemLabel
-				    Parent_View 	@1227
-				    location   	(64, 402)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	640
-				    justify    	0
-				    label      	"XSDDiagnostic")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3BFE5F910046"
-				width      	658
-				height     	436
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$215" @1228
-				location   	(144, 283)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BFE6431035F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$216" @1229
-					Parent_View 	@1228
-					location   	(-1088, -661)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFE643201C6"
-					client     	@1228
-					supplier   	@1225
-					line_style 	3
-					origin_attachment 	(144, 283)
-					terminal_attachment 	(144, 176))
-				    (object RoleView "allDiagnostics" @1230
-					Parent_View 	@1228
-					location   	(-1088, -661)
-					label      	(object SegLabel @1231
-					    Parent_View 	@1230
-					    location   	(309, 330)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+allDiagnostics"
-					    pctDist    	0.448598
-					    height     	165
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFE643201C7"
-					client     	@1228
-					supplier   	@1227
-					line_style 	3
-					origin_attachment 	(144, 283)
-					terminal_attachment 	(144, 390)
-					label      	(object SegLabel @1232
-					    Parent_View 	@1230
-					    location   	(96, 327)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.420561
-					    height     	49
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$211" @1233
-				location   	(1028, 440)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BFE622703CD"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$212" @1234
-					Parent_View 	@1233
-					location   	(-396, -72)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFE622B0061"
-					client     	@1233
-					supplier   	@1227
-					line_style 	3
-					origin_attachment 	(1028, 440)
-					terminal_attachment 	(713, 440))
-				    (object RoleView "components" @1235
-					Parent_View 	@1233
-					location   	(-396, -72)
-					label      	(object SegLabel @1236
-					    Parent_View 	@1235
-					    location   	(938, 230)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	252
-					    justify    	0
-					    label      	"+components"
-					    pctDist    	0.829181
-					    height     	151
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFE622B006C"
-					client     	@1233
-					supplier   	@1226
-					vertices   	(list Points
-					    (1028, 440)
-					    (1088, 440)
-					    (1088, 174))
-					line_style 	3
-					origin_attachment 	(1028, 440)
-					terminal_attachment 	(1088, 174)
-					label      	(object SegLabel @1237
-					    Parent_View 	@1235
-					    location   	(1143, 232)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"1..*"
-					    pctDist    	0.823848
-					    height     	55
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$213" @1238
-				location   	(688, 282)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BFE62690165"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$214" @1239
-					Parent_View 	@1238
-					location   	(160, -278)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFE626A0026"
-					client     	@1238
-					supplier   	@1226
-					line_style 	3
-					origin_attachment 	(688, 282)
-					terminal_attachment 	(688, 174))
-				    (object RoleView "diagnostics" @1240
-					Parent_View 	@1238
-					location   	(160, -278)
-					label      	(object SegLabel @1241
-					    Parent_View 	@1240
-					    location   	(822, 330)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+diagnostics"
-					    pctDist    	0.452632
-					    height     	134
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFE626A0027"
-					client     	@1238
-					supplier   	@1227
-					line_style 	3
-					origin_attachment 	(688, 282)
-					terminal_attachment 	(688, 390)
-					label      	(object SegLabel @1242
-					    Parent_View 	@1240
-					    location   	(645, 335)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.494737
-					    height     	44
-					    orientation 	1))))
-			    (object InheritView "" @1243
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3D4C0F4C01A1"
-				client     	@1227
-				supplier   	@1226
-				line_style 	3
-				origin_attachment 	(575, 390)
-				terminal_attachment 	(575, 174))))
-		    (object ClassDiagram "11. Supplemental"
-			quid       	"3C287E49019B"
-			title      	"11. Supplemental"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @1244
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(464, 816)
-				label      	(object ItemLabel
-				    Parent_View 	@1244
-				    location   	(47, 760)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	834
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	852
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @1245
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2112, 880)
-				label      	(object ItemLabel
-				    Parent_View 	@1245
-				    location   	(1731, 824)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	762
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	780
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDConcreteComponent" @1246
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(288, 112)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1246
-				    location   	(48, 60)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	480
-				    justify    	0
-				    label      	"XSDConcreteComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD7B40065"
-				width      	498
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDDiagnostic" @1247
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2384, 112)
-				label      	(object ItemLabel
-				    Parent_View 	@1247
-				    location   	(2236, 60)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"XSDDiagnostic")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3BFE5F910046"
-				width      	314
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$237" @1248
-				location   	(1382, 84)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C2882C50137"
-				roleview_list 	(list RoleViews
-				    (object RoleView "primaryComponent" @1249
-					Parent_View 	@1248
-					location   	(-250, -508)
-					label      	(object SegLabel @1250
-					    Parent_View 	@1249
-					    location   	(756, 116)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+primaryComponent"
-					    pctDist    	0.740828
-					    height     	32
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C2882C70113"
-					client     	@1248
-					supplier   	@1246
-					line_style 	3
-					origin_attachment 	(1382, 84)
-					terminal_attachment 	(537, 84)
-					label      	(object SegLabel @1251
-					    Parent_View 	@1249
-					    location   	(624, 55)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.897260
-					    height     	30
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$238" @1252
-					Parent_View 	@1248
-					location   	(-250, -508)
-					label      	(object SegLabel @1253
-					    Parent_View 	@1252
-					    location   	(2058, 126)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C2882C70112"
-					client     	@1248
-					supplier   	@1247
-					line_style 	3
-					origin_attachment 	(1382, 84)
-					terminal_attachment 	(2227, 84))))
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @1254
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2160, 688)
-				label      	(object ItemLabel
-				    Parent_View 	@1254
-				    location   	(1778, 607)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	764
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				compartment 	(object Compartment
-				    Parent_View 	@1254
-				    location   	(1778, 667)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	764
-				    compartmentItems 	(list Compartment
-					"+ elementDeclarationReference : boolean"
-					"+ circular : boolean"))
-				width      	782
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDFacet" @1255
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2320, 1072)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1255
-				    location   	(2100, 991)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	440
-				    justify    	0
-				    label      	"XSDFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C359403D2"
-				compartment 	(object Compartment
-				    Parent_View 	@1255
-				    location   	(2100, 1051)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	459
-				    compartmentItems 	(list Compartment
-					"+ facetName : String"
-					"+ effectiveValue : Value"))
-				width      	458
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @1256
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(448, 624)
-				label      	(object ItemLabel
-				    Parent_View 	@1256
-				    location   	(47, 568)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	802
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				compartment 	(object Compartment
-				    Parent_View 	@1256
-				    location   	(47, 628)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	1
-				    max_width  	805
-				    compartmentItems 	(list Compartment
-					"+ modelGroupDefinitionReference : boolean"))
-				width      	820
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDNamedComponent" @1257
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1232, 288)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1257
-				    location   	(1005, 157)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	454
-				    justify    	0
-				    label      	"XSDNamedComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846D303A4"
-				compartment 	(object Compartment
-				    Parent_View 	@1257
-				    location   	(1005, 217)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	4
-				    max_width  	392
-				    compartmentItems 	(list Compartment
-					"+ aliasName : String"
-					"+ uRI : String"
-					"+ aliasURI : String"
-					"+ qName : String"))
-				width      	472
-				height     	286
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefinableComponent" @1258
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(320, 352)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1258
-				    location   	(48, 296)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	544
-				    justify    	0
-				    label      	"XSDRedefinableComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B7FCA8B020B"
-				width      	562
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @1259
-				location   	(320, 510)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1258
-				vertices   	(list Points
-				    (320, 510)
-				    (320, 420)))
-			    (object InheritView "" @1260
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAC40090"
-				client     	@1256
-				supplier   	@1258
-				line_style 	3
-				origin_attachment 	(81, 556)
-				terminal_attachment 	(81, 510)
-				drawSupplier 	@1259)
-			    (object InheritView "" @1261
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAC800D2"
-				client     	@1244
-				supplier   	@1258
-				line_style 	3
-				origin_attachment 	(877, 748)
-				terminal_attachment 	(877, 510)
-				drawSupplier 	@1259)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxInclusiveFacet" @1262
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2320, 1808)
-				label      	(object ItemLabel
-				    Parent_View 	@1262
-				    location   	(2101, 1761)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	438
-				    justify    	0
-				    label      	"XSDMaxInclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C787D00DA"
-				width      	456
-				height     	119
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinInclusiveFacet" @1263
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(272, 1776)
-				label      	(object ItemLabel
-				    Parent_View 	@1263
-				    location   	(35, 1729)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	475
-				    justify    	0
-				    label      	"XSDMinInclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C788702C9"
-				width      	493
-				height     	119
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinExclusiveFacet" @1264
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(272, 1936)
-				label      	(object ItemLabel
-				    Parent_View 	@1264
-				    location   	(35, 1889)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	475
-				    justify    	0
-				    label      	"XSDMinExclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C792D000A"
-				width      	493
-				height     	118
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxExclusiveFacet" @1265
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2304, 1968)
-				label      	(object ItemLabel
-				    Parent_View 	@1265
-				    location   	(2073, 1917)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	462
-				    justify    	0
-				    label      	"XSDMaxExclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C789600C2"
-				width      	480
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDCardinalityFacet" @1266
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2336, 1424)
-				label      	(object ItemLabel
-				    Parent_View 	@1266
-				    location   	(2134, 1372)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	404
-				    justify    	0
-				    label      	"XSDCardinalityFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C755D03D2"
-				width      	422
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDBoundedFacet" @1267
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2352, 1264)
-				label      	(object ItemLabel
-				    Parent_View 	@1267
-				    location   	(2163, 1212)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	378
-				    justify    	0
-				    label      	"XSDBoundedFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C751D0344"
-				width      	396
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDOrderedFacet" @1268
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(224, 1392)
-				label      	(object ItemLabel
-				    Parent_View 	@1268
-				    location   	(43, 1340)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	362
-				    justify    	0
-				    label      	"XSDOrderedFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C74DD0248"
-				width      	380
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDNumericFacet" @1269
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 1232)
-				label      	(object ItemLabel
-				    Parent_View 	@1269
-				    location   	(49, 1178)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	382
-				    justify    	0
-				    label      	"XSDNumericFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C75950206"
-				width      	400
-				height     	132
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxFacet" @1270
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2336, 1616)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1270
-				    location   	(2135, 1535)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	402
-				    justify    	0
-				    label      	"XSDMaxFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C0A1CEB010E"
-				compartment 	(object Compartment
-				    Parent_View 	@1270
-				    location   	(2135, 1595)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	405
-				    compartmentItems 	(list Compartment
-					"+ inclusive : boolean"
-					"+ exclusive : boolean"))
-				width      	420
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDWhiteSpaceFacet" @1271
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2320, 2288)
-				label      	(object ItemLabel
-				    Parent_View 	@1271
-				    location   	(2102, 2236)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	436
-				    justify    	0
-				    label      	"XSDWhiteSpaceFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C784601B7"
-				width      	454
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDFractionDigitsFacet" @1272
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2304, 2624)
-				label      	(object ItemLabel
-				    Parent_View 	@1272
-				    location   	(2074, 2572)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	460
-				    justify    	0
-				    label      	"XSDFractionDigitsFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C79BE02EE"
-				width      	478
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDPatternFacet" @1273
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2368, 2128)
-				label      	(object ItemLabel
-				    Parent_View 	@1273
-				    location   	(2196, 2076)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	344
-				    justify    	0
-				    label      	"XSDPatternFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C6ADB026C"
-				width      	362
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDEnumerationFacet" @1274
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 2096)
-				label      	(object ItemLabel
-				    Parent_View 	@1274
-				    location   	(36, 2044)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	440
-				    justify    	0
-				    label      	"XSDEnumerationFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C6ACE0141"
-				width      	458
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDLengthFacet" @1275
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 2272)
-				label      	(object ItemLabel
-				    Parent_View 	@1275
-				    location   	(38, 2220)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	340
-				    justify    	0
-				    label      	"XSDLengthFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C776200E7"
-				width      	358
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinFacet" @1276
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 1584)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1276
-				    location   	(38, 1503)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	404
-				    justify    	0
-				    label      	"XSDMinFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C0A1CDE037C"
-				compartment 	(object Compartment
-				    Parent_View 	@1276
-				    location   	(38, 1563)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	405
-				    compartmentItems 	(list Compartment
-					"+ inclusive : boolean"
-					"+ exclusive : boolean"))
-				width      	422
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxLengthFacet" @1277
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2320, 2464)
-				label      	(object ItemLabel
-				    Parent_View 	@1277
-				    location   	(2111, 2412)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	418
-				    justify    	0
-				    label      	"XSDMaxLengthFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C77C70146"
-				width      	436
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinLengthFacet" @1278
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 2448)
-				label      	(object ItemLabel
-				    Parent_View 	@1278
-				    location   	(39, 2396)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	402
-				    justify    	0
-				    label      	"XSDMinLengthFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C778C0065"
-				width      	420
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDTotalDigitsFacet" @1279
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 2608)
-				label      	(object ItemLabel
-				    Parent_View 	@1279
-				    location   	(38, 2556)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	404
-				    justify    	0
-				    label      	"XSDTotalDigitsFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C79A0020E"
-				width      	422
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @1280
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(928, 1152)
-				label      	(object ItemLabel
-				    Parent_View 	@1280
-				    location   	(667, 1100)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	522
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				width      	540
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @1281
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(176, 1072)
-				label      	(object ItemLabel
-				    Parent_View 	@1281
-				    location   	(50, 1020)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	252
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	270
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @1282
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1232, 1360)
-				label      	(object ItemLabel
-				    Parent_View 	@1282
-				    location   	(944, 1304)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	576
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				compartment 	(object Compartment
-				    Parent_View 	@1282
-				    location   	(944, 1364)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	575
-				    compartmentItems 	(list Compartment
-					"<<0..*>> + validFacets : String"))
-				width      	594
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$249" @1283
-				location   	(1446, 1218)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28A994030A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "rootTypeDefinition" @1284
-					Parent_View 	@1283
-					location   	(582, -78)
-					label      	(object SegLabel @1285
-					    Parent_View 	@1284
-					    location   	(1580, 1173)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+rootTypeDefinition"
-					    pctDist    	3.268293
-					    height     	46
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A99700DD"
-					client     	@1283
-					supplier   	@1282
-					vertices   	(list Points
-					    (1446, 1218)
-					    (1487, 1218)
-					    (1487, 1292))
-					line_style 	3
-					origin_attachment 	(1446, 1218)
-					terminal_attachment 	(1487, 1292)
-					label      	(object SegLabel @1286
-					    Parent_View 	@1284
-					    location   	(1439, 1257)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.184211
-					    height     	39
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$250" @1287
-					Parent_View 	@1283
-					location   	(582, -78)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A99700E7"
-					client     	@1283
-					supplier   	@1282
-					vertices   	(list Points
-					    (1446, 1218)
-					    (1405, 1218)
-					    (1405, 1292))
-					line_style 	3
-					origin_attachment 	(1446, 1218)
-					terminal_attachment 	(1405, 1292))))
-			    (object AssociationViewNew "$UNNAMED$253" @1288
-				location   	(1733, 1575)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B08D0252"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$254" @1289
-					Parent_View 	@1288
-					location   	(917, 7)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B08E0091"
-					client     	@1288
-					supplier   	@1282
-					vertices   	(list Points
-					    (1733, 1575)
-					    (1487, 1575)
-					    (1487, 1428))
-					line_style 	3
-					origin_attachment 	(1733, 1575)
-					terminal_attachment 	(1487, 1428))
-				    (object RoleView "maxFacet" @1290
-					Parent_View 	@1288
-					location   	(917, 7)
-					label      	(object SegLabel @1291
-					    Parent_View 	@1290
-					    location   	(1751, 1541)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	204
-					    justify    	0
-					    label      	"+maxFacet"
-					    pctDist    	0.046243
-					    height     	35
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B08E009B"
-					client     	@1288
-					supplier   	@1270
-					line_style 	3
-					origin_attachment 	(1733, 1575)
-					terminal_attachment 	(2126, 1575)
-					label      	(object SegLabel @1292
-					    Parent_View 	@1290
-					    location   	(2042, 1536)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.789157
-					    height     	40
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$255" @1293
-				location   	(1587, 1793)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0AB0396"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$256" @1294
-					Parent_View 	@1293
-					location   	(707, -31)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0AC03C9"
-					client     	@1293
-					supplier   	@1282
-					vertices   	(list Points
-					    (1587, 1793)
-					    (1447, 1793)
-					    (1447, 1428))
-					line_style 	3
-					origin_attachment 	(1587, 1793)
-					terminal_attachment 	(1447, 1428))
-				    (object RoleView "maxInclusiveFacet" @1295
-					Parent_View 	@1293
-					location   	(707, -31)
-					label      	(object SegLabel @1296
-					    Parent_View 	@1295
-					    location   	(1737, 1751)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	360
-					    justify    	0
-					    label      	"+maxInclusiveFacet"
-					    pctDist    	0.298441
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0AC03D4"
-					client     	@1293
-					supplier   	@1262
-					line_style 	3
-					origin_attachment 	(1587, 1793)
-					terminal_attachment 	(2092, 1793)
-					label      	(object SegLabel @1297
-					    Parent_View 	@1295
-					    location   	(2020, 1754)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.859155
-					    height     	40
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$257" @1298
-				location   	(937, 1787)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0AF0338"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$258" @1299
-					Parent_View 	@1298
-					location   	(617, -5)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0B001F9"
-					client     	@1298
-					supplier   	@1282
-					vertices   	(list Points
-					    (937, 1787)
-					    (997, 1787)
-					    (997, 1428))
-					line_style 	3
-					origin_attachment 	(937, 1787)
-					terminal_attachment 	(997, 1428))
-				    (object RoleView "minInclusiveFacet" @1300
-					Parent_View 	@1298
-					location   	(617, -5)
-					label      	(object SegLabel @1301
-					    Parent_View 	@1300
-					    location   	(792, 1745)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+minInclusiveFacet"
-					    pctDist    	0.346062
-					    height     	43
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0B00203"
-					client     	@1298
-					supplier   	@1263
-					line_style 	3
-					origin_attachment 	(937, 1787)
-					terminal_attachment 	(518, 1787)
-					label      	(object SegLabel @1302
-					    Parent_View 	@1300
-					    location   	(575, 1743)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.863962
-					    height     	45
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$259" @1303
-				location   	(981, 1937)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0B30207"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$260" @1304
-					Parent_View 	@1303
-					location   	(677, -79)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0B40190"
-					client     	@1303
-					supplier   	@1282
-					vertices   	(list Points
-					    (981, 1937)
-					    (1041, 1937)
-					    (1041, 1428))
-					line_style 	3
-					origin_attachment 	(981, 1937)
-					terminal_attachment 	(1041, 1428))
-				    (object RoleView "minExclusiveFacet" @1305
-					Parent_View 	@1303
-					location   	(677, -79)
-					label      	(object SegLabel @1306
-					    Parent_View 	@1305
-					    location   	(823, 1900)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+minExclusiveFacet"
-					    pctDist    	0.341253
-					    height     	38
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0B4019A"
-					client     	@1303
-					supplier   	@1264
-					line_style 	3
-					origin_attachment 	(981, 1937)
-					terminal_attachment 	(518, 1937)
-					label      	(object SegLabel @1307
-					    Parent_View 	@1305
-					    location   	(589, 1897)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.846652
-					    height     	41
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$261" @1308
-				location   	(1469, 1953)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0B6028D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$262" @1309
-					Parent_View 	@1308
-					location   	(621, -95)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0B70217"
-					client     	@1308
-					supplier   	@1282
-					vertices   	(list Points
-					    (1469, 1953)
-					    (1400, 1953)
-					    (1400, 1428))
-					line_style 	3
-					origin_attachment 	(1469, 1953)
-					terminal_attachment 	(1400, 1428))
-				    (object RoleView "maxExclusiveFacet" @1310
-					Parent_View 	@1308
-					location   	(621, -95)
-					label      	(object SegLabel @1311
-					    Parent_View 	@1310
-					    location   	(1646, 1913)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	384
-					    justify    	0
-					    label      	"+maxExclusiveFacet"
-					    pctDist    	0.298097
-					    height     	41
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0B70221"
-					client     	@1308
-					supplier   	@1265
-					line_style 	3
-					origin_attachment 	(1469, 1953)
-					terminal_attachment 	(2064, 1953)
-					label      	(object SegLabel @1312
-					    Parent_View 	@1310
-					    location   	(1961, 1913)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.827236
-					    height     	41
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$263" @1313
-				location   	(1122, 2180)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0BC0051"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$264" @1314
-					Parent_View 	@1313
-					location   	(-318, 628)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0BC0246"
-					client     	@1313
-					supplier   	@1282
-					line_style 	3
-					origin_attachment 	(1122, 2180)
-					terminal_attachment 	(1122, 1428))
-				    (object RoleView "lengthFacet" @1315
-					Parent_View 	@1313
-					location   	(-318, 628)
-					label      	(object SegLabel @1316
-					    Parent_View 	@1315
-					    location   	(804, 2204)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+lengthFacet"
-					    pctDist    	0.475472
-					    height     	37
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0BC0250"
-					client     	@1313
-					supplier   	@1275
-					vertices   	(list Points
-					    (1122, 2180)
-					    (1122, 2240)
-					    (387, 2240))
-					line_style 	3
-					origin_attachment 	(1122, 2180)
-					terminal_attachment 	(387, 2240)
-					label      	(object SegLabel @1317
-					    Parent_View 	@1315
-					    location   	(471, 2204)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.895597
-					    height     	37
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$267" @1318
-				location   	(1084, 1989)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0C2021D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$268" @1319
-					Parent_View 	@1318
-					location   	(-1380, 437)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C300AB"
-					client     	@1318
-					supplier   	@1282
-					line_style 	3
-					origin_attachment 	(1084, 1989)
-					terminal_attachment 	(1084, 1428))
-				    (object RoleView "enumerationFacets" @1320
-					Parent_View 	@1318
-					location   	(-1380, 437)
-					label      	(object SegLabel @1321
-					    Parent_View 	@1320
-					    location   	(837, 2016)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+enumerationFacets"
-					    pctDist    	0.465857
-					    height     	34
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C300AC"
-					client     	@1318
-					supplier   	@1274
-					vertices   	(list Points
-					    (1084, 1989)
-					    (1084, 2049)
-					    (485, 2049))
-					line_style 	3
-					origin_attachment 	(1084, 1989)
-					terminal_attachment 	(485, 2049)
-					label      	(object SegLabel @1322
-					    Parent_View 	@1320
-					    location   	(583, 2021)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.851290
-					    height     	29
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$269" @1323
-				location   	(1451, 2074)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0C50159"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$270" @1324
-					Parent_View 	@1323
-					location   	(-1525, 538)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C600B0"
-					client     	@1323
-					supplier   	@1282
-					vertices   	(list Points
-					    (1451, 2074)
-					    (1362, 2074)
-					    (1362, 1428))
-					line_style 	3
-					origin_attachment 	(1451, 2074)
-					terminal_attachment 	(1362, 1428))
-				    (object RoleView "patternFacets" @1325
-					Parent_View 	@1323
-					location   	(-1525, 538)
-					label      	(object SegLabel @1326
-					    Parent_View 	@1325
-					    location   	(1720, 2038)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+patternFacets"
-					    pctDist    	0.367223
-					    height     	37
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C600BA"
-					client     	@1323
-					supplier   	@1273
-					line_style 	3
-					origin_attachment 	(1451, 2074)
-					terminal_attachment 	(2187, 2074)
-					label      	(object SegLabel @1327
-					    Parent_View 	@1325
-					    location   	(1972, 2035)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.708649
-					    height     	40
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$271" @1328
-				location   	(1827, 1400)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0C802A7"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$272" @1329
-					Parent_View 	@1328
-					location   	(-1149, -472)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C901EA"
-					client     	@1328
-					supplier   	@1282
-					line_style 	3
-					origin_attachment 	(1827, 1400)
-					terminal_attachment 	(1529, 1400))
-				    (object RoleView "cardinalityFacet" @1330
-					Parent_View 	@1328
-					location   	(-1149, -472)
-					label      	(object SegLabel @1331
-					    Parent_View 	@1330
-					    location   	(1847, 1358)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	312
-					    justify    	0
-					    label      	"+cardinalityFacet"
-					    pctDist    	0.071730
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C901F5"
-					client     	@1328
-					supplier   	@1266
-					line_style 	3
-					origin_attachment 	(1827, 1400)
-					terminal_attachment 	(2125, 1400)
-					label      	(object SegLabel @1332
-					    Parent_View 	@1330
-					    location   	(2083, 1357)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.863426
-					    height     	44
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$281" @1333
-				location   	(1262, 2413)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0DB0377"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$282" @1334
-					Parent_View 	@1333
-					location   	(-786, 301)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0DC035A"
-					client     	@1333
-					supplier   	@1282
-					line_style 	3
-					origin_attachment 	(1262, 2413)
-					terminal_attachment 	(1262, 1428))
-				    (object RoleView "fractionDigitsFacet" @1335
-					Parent_View 	@1333
-					location   	(-786, 301)
-					label      	(object SegLabel @1336
-					    Parent_View 	@1335
-					    location   	(1608, 2556)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	360
-					    justify    	0
-					    label      	"+fractionDigitsFacet"
-					    pctDist    	0.537393
-					    height     	41
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0DC0364"
-					client     	@1333
-					supplier   	@1272
-					vertices   	(list Points
-					    (1262, 2413)
-					    (1262, 2596)
-					    (2065, 2596))
-					line_style 	3
-					origin_attachment 	(1262, 2413)
-					terminal_attachment 	(2065, 2596)
-					label      	(object SegLabel @1337
-					    Parent_View 	@1335
-					    location   	(1979, 2556)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.913886
-					    height     	41
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$285" @1338
-				location   	(1841, 1306)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0E300D9"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$286" @1339
-					Parent_View 	@1338
-					location   	(-1135, -790)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0E4038E"
-					client     	@1338
-					supplier   	@1282
-					line_style 	3
-					origin_attachment 	(1841, 1306)
-					terminal_attachment 	(1529, 1306))
-				    (object RoleView "boundedFacet" @1340
-					Parent_View 	@1338
-					location   	(-1135, -790)
-					label      	(object SegLabel @1341
-					    Parent_View 	@1340
-					    location   	(1832, 1270)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	288
-					    justify    	0
-					    label      	"+boundedFacet"
-					    pctDist    	-0.031746
-					    height     	37
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0E40398"
-					client     	@1338
-					supplier   	@1267
-					line_style 	3
-					origin_attachment 	(1841, 1306)
-					terminal_attachment 	(2154, 1306)
-					label      	(object SegLabel @1342
-					    Parent_View 	@1340
-					    location   	(2077, 1275)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.754717
-					    height     	32
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$265" @1343
-				location   	(1328, 2186)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0BF018C"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$266" @1344
-					Parent_View 	@1343
-					location   	(-640, 634)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C0006B"
-					client     	@1343
-					supplier   	@1282
-					line_style 	3
-					origin_attachment 	(1328, 2186)
-					terminal_attachment 	(1328, 1428))
-				    (object RoleView "whiteSpaceFacet" @1345
-					Parent_View 	@1343
-					location   	(-640, 634)
-					label      	(object SegLabel @1346
-					    Parent_View 	@1345
-					    location   	(1673, 2207)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+whiteSpaceFacet"
-					    pctDist    	0.490909
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C00075"
-					client     	@1343
-					supplier   	@1271
-					vertices   	(list Points
-					    (1328, 2186)
-					    (1328, 2246)
-					    (2093, 2246))
-					line_style 	3
-					origin_attachment 	(1328, 2186)
-					terminal_attachment 	(2093, 2246)
-					label      	(object SegLabel @1347
-					    Parent_View 	@1345
-					    location   	(2033, 2203)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.926763
-					    height     	44
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$283" @1348
-				location   	(674, 1390)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0DF0048"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$284" @1349
-					Parent_View 	@1348
-					location   	(-1854, -706)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0DF03B9"
-					client     	@1348
-					supplier   	@1282
-					line_style 	3
-					origin_attachment 	(674, 1390)
-					terminal_attachment 	(935, 1390))
-				    (object RoleView "orderedFacet" @1350
-					Parent_View 	@1348
-					location   	(-1854, -706)
-					label      	(object SegLabel @1351
-					    Parent_View 	@1350
-					    location   	(658, 1353)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	264
-					    justify    	0
-					    label      	"+orderedFacet"
-					    pctDist    	0.061538
-					    height     	38
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0DF03C3"
-					client     	@1348
-					supplier   	@1268
-					line_style 	3
-					origin_attachment 	(674, 1390)
-					terminal_attachment 	(414, 1390)
-					label      	(object SegLabel @1352
-					    Parent_View 	@1350
-					    location   	(510, 1355)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.634615
-					    height     	36
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$273" @1353
-				location   	(687, 1296)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0CB039C"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$274" @1354
-					Parent_View 	@1353
-					location   	(-1809, -576)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0CC03D0"
-					client     	@1353
-					supplier   	@1282
-					line_style 	3
-					origin_attachment 	(687, 1296)
-					terminal_attachment 	(935, 1296))
-				    (object RoleView "numericFacet" @1355
-					Parent_View 	@1353
-					location   	(-1809, -576)
-					label      	(object SegLabel @1356
-					    Parent_View 	@1355
-					    location   	(668, 1257)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+numericFacet"
-					    pctDist    	0.080972
-					    height     	40
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0CC03D1"
-					client     	@1353
-					supplier   	@1269
-					line_style 	3
-					origin_attachment 	(687, 1296)
-					terminal_attachment 	(440, 1296)
-					label      	(object SegLabel @1357
-					    Parent_View 	@1355
-					    location   	(506, 1260)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.736842
-					    height     	37
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$287" @1358
-				location   	(1689, 1662)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B44401EC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$288" @1359
-					Parent_View 	@1358
-					location   	(-183, -354)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B4450360"
-					client     	@1358
-					supplier   	@1282
-					vertices   	(list Points
-					    (1689, 1662)
-					    (1487, 1662)
-					    (1487, 1428))
-					line_style 	3
-					origin_attachment 	(1689, 1662)
-					terminal_attachment 	(1487, 1428))
-				    (object RoleView "effectiveMaxFacet" @1360
-					Parent_View 	@1358
-					location   	(-183, -354)
-					label      	(object SegLabel @1361
-					    Parent_View 	@1360
-					    location   	(1769, 1623)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+effectiveMaxFacet"
-					    pctDist    	0.182051
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B445036A"
-					client     	@1358
-					supplier   	@1270
-					line_style 	3
-					origin_attachment 	(1689, 1662)
-					terminal_attachment 	(2126, 1662)
-					label      	(object SegLabel @1362
-					    Parent_View 	@1360
-					    location   	(2044, 1627)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.815385
-					    height     	36
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$289" @1363
-				location   	(1328, 2258)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B54F0145"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$290" @1364
-					Parent_View 	@1363
-					location   	(-1072, -462)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B550038C"
-					client     	@1363
-					supplier   	@1282
-					line_style 	3
-					origin_attachment 	(1328, 2258)
-					terminal_attachment 	(1328, 1428))
-				    (object RoleView "effectiveWhiteSpaceFacet" @1365
-					Parent_View 	@1363
-					location   	(-1072, -462)
-					label      	(object SegLabel @1366
-					    Parent_View 	@1365
-					    location   	(1685, 2288)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	492
-					    justify    	0
-					    label      	"+effectiveWhiteSpaceFacet"
-					    pctDist    	0.508541
-					    height     	37
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B5500396"
-					client     	@1363
-					supplier   	@1271
-					vertices   	(list Points
-					    (1328, 2258)
-					    (1328, 2324)
-					    (2093, 2324))
-					line_style 	3
-					origin_attachment 	(1328, 2258)
-					terminal_attachment 	(2093, 2324)
-					label      	(object SegLabel @1367
-					    Parent_View 	@1365
-					    location   	(2009, 2293)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.898817
-					    height     	32
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$291" @1368
-				location   	(1297, 2366)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B5C4011C"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$292" @1369
-					Parent_View 	@1368
-					location   	(-607, -722)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B5C5020D"
-					client     	@1368
-					supplier   	@1282
-					line_style 	3
-					origin_attachment 	(1297, 2366)
-					terminal_attachment 	(1297, 1428))
-				    (object RoleView "effectiveMaxLengthFacet" @1370
-					Parent_View 	@1368
-					location   	(-607, -722)
-					label      	(object SegLabel @1371
-					    Parent_View 	@1370
-					    location   	(1657, 2463)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	480
-					    justify    	0
-					    label      	"+effectiveMaxLengthFacet"
-					    pctDist    	0.526906
-					    height     	37
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B5C50217"
-					client     	@1368
-					supplier   	@1277
-					vertices   	(list Points
-					    (1297, 2366)
-					    (1297, 2499)
-					    (2102, 2499))
-					line_style 	3
-					origin_attachment 	(1297, 2366)
-					terminal_attachment 	(2102, 2499)
-					label      	(object SegLabel @1372
-					    Parent_View 	@1370
-					    location   	(2007, 2471)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.899308
-					    height     	29
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$293" @1373
-				location   	(1262, 2449)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B62A00AA"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$294" @1374
-					Parent_View 	@1373
-					location   	(-1170, -815)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B62B0138"
-					client     	@1373
-					supplier   	@1282
-					line_style 	3
-					origin_attachment 	(1262, 2449)
-					terminal_attachment 	(1262, 1428))
-				    (object RoleView "effectiveFractionDigitsFacet" @1375
-					Parent_View 	@1373
-					location   	(-1170, -815)
-					label      	(object SegLabel @1376
-					    Parent_View 	@1375
-					    location   	(1640, 2634)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	528
-					    justify    	0
-					    label      	"+effectiveFractionDigitsFacet"
-					    pctDist    	0.585315
-					    height     	35
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B62B0142"
-					client     	@1373
-					supplier   	@1272
-					vertices   	(list Points
-					    (1262, 2449)
-					    (1262, 2668)
-					    (2065, 2668))
-					line_style 	3
-					origin_attachment 	(1262, 2449)
-					terminal_attachment 	(2065, 2668)
-					label      	(object SegLabel @1377
-					    Parent_View 	@1375
-					    location   	(1989, 2629)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.926485
-					    height     	40
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$295" @1378
-				location   	(1422, 2159)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B6B003A6"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$296" @1379
-					Parent_View 	@1378
-					location   	(-770, -1313)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B6B10311"
-					client     	@1378
-					supplier   	@1282
-					vertices   	(list Points
-					    (1422, 2159)
-					    (1362, 2159)
-					    (1362, 1428))
-					line_style 	3
-					origin_attachment 	(1422, 2159)
-					terminal_attachment 	(1362, 1428))
-				    (object RoleView "effectivePatternFacet" @1380
-					Parent_View 	@1378
-					location   	(-770, -1313)
-					label      	(object SegLabel @1381
-					    Parent_View 	@1380
-					    location   	(1727, 2125)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	408
-					    justify    	0
-					    label      	"+effectivePatternFacet"
-					    pctDist    	0.399090
-					    height     	35
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B6B10312"
-					client     	@1378
-					supplier   	@1273
-					line_style 	3
-					origin_attachment 	(1422, 2159)
-					terminal_attachment 	(2187, 2159)
-					label      	(object SegLabel @1382
-					    Parent_View 	@1380
-					    location   	(2102, 2119)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.889226
-					    height     	41
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$297" @1383
-				location   	(1084, 2083)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B7CA026B"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$298" @1384
-					Parent_View 	@1383
-					location   	(828, -1373)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B7CB0186"
-					client     	@1383
-					supplier   	@1282
-					line_style 	3
-					origin_attachment 	(1084, 2083)
-					terminal_attachment 	(1084, 1428))
-				    (object RoleView "effectiveEnumerationFacet" @1385
-					Parent_View 	@1383
-					location   	(828, -1373)
-					label      	(object SegLabel @1386
-					    Parent_View 	@1385
-					    location   	(822, 2101)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	504
-					    justify    	0
-					    label      	"+effectiveEnumerationFacet"
-					    pctDist    	0.488619
-					    height     	43
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B7CB0190"
-					client     	@1383
-					supplier   	@1274
-					vertices   	(list Points
-					    (1084, 2083)
-					    (1084, 2143)
-					    (485, 2143))
-					line_style 	3
-					origin_attachment 	(1084, 2083)
-					terminal_attachment 	(485, 2143)
-					label      	(object SegLabel @1387
-					    Parent_View 	@1385
-					    location   	(531, 2100)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.931715
-					    height     	44
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$303" @1388
-				location   	(1122, 2241)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B8DC0052"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$304" @1389
-					Parent_View 	@1388
-					location   	(866, -479)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B8DC03B9"
-					client     	@1388
-					supplier   	@1282
-					line_style 	3
-					origin_attachment 	(1122, 2241)
-					terminal_attachment 	(1122, 1428))
-				    (object RoleView "effectiveLengthFacet" @1390
-					Parent_View 	@1388
-					location   	(866, -479)
-					label      	(object SegLabel @1391
-					    Parent_View 	@1390
-					    location   	(800, 2279)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+effectiveLengthFacet"
-					    pctDist    	0.491731
-					    height     	40
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B8DC03C3"
-					client     	@1388
-					supplier   	@1275
-					vertices   	(list Points
-					    (1122, 2241)
-					    (1122, 2318)
-					    (387, 2318))
-					line_style 	3
-					origin_attachment 	(1122, 2241)
-					terminal_attachment 	(387, 2318)
-					label      	(object SegLabel @1392
-					    Parent_View 	@1390
-					    location   	(470, 2279)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.898567
-					    height     	40
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$251" @1393
-				location   	(773, 1565)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B085025B"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$252" @1394
-					Parent_View 	@1393
-					location   	(469, 13)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0860270"
-					client     	@1393
-					supplier   	@1282
-					vertices   	(list Points
-					    (773, 1565)
-					    (959, 1565)
-					    (959, 1428))
-					line_style 	3
-					origin_attachment 	(773, 1565)
-					terminal_attachment 	(959, 1428))
-				    (object RoleView "minFacet" @1395
-					Parent_View 	@1393
-					location   	(469, 13)
-					label      	(object SegLabel @1396
-					    Parent_View 	@1395
-					    location   	(753, 1532)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	192
-					    justify    	0
-					    label      	"+minFacet"
-					    pctDist    	0.063091
-					    height     	34
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B086027A"
-					client     	@1393
-					supplier   	@1276
-					line_style 	3
-					origin_attachment 	(773, 1565)
-					terminal_attachment 	(451, 1565)
-					label      	(object SegLabel @1397
-					    Parent_View 	@1395
-					    location   	(534, 1523)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.746667
-					    height     	43
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$305" @1398
-				location   	(816, 1650)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B97001DB"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$306" @1399
-					Parent_View 	@1398
-					location   	(496, -334)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B97100CF"
-					client     	@1398
-					supplier   	@1282
-					vertices   	(list Points
-					    (816, 1650)
-					    (959, 1650)
-					    (959, 1428))
-					line_style 	3
-					origin_attachment 	(816, 1650)
-					terminal_attachment 	(959, 1428))
-				    (object RoleView "effectiveMinFacet" @1400
-					Parent_View 	@1398
-					location   	(496, -334)
-					label      	(object SegLabel @1401
-					    Parent_View 	@1400
-					    location   	(764, 1614)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+effectiveMinFacet"
-					    pctDist    	0.141618
-					    height     	37
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B97100D9"
-					client     	@1398
-					supplier   	@1276
-					line_style 	3
-					origin_attachment 	(816, 1650)
-					terminal_attachment 	(451, 1650)
-					label      	(object SegLabel @1402
-					    Parent_View 	@1400
-					    location   	(523, 1606)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.802740
-					    height     	44
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$275" @1403
-				location   	(1297, 2321)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0CF0199"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$276" @1404
-					Parent_View 	@1403
-					location   	(-719, 497)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0D20085"
-					client     	@1403
-					supplier   	@1282
-					line_style 	3
-					origin_attachment 	(1297, 2321)
-					terminal_attachment 	(1297, 1428))
-				    (object RoleView "maxLengthFacet" @1405
-					Parent_View 	@1403
-					location   	(-719, 497)
-					label      	(object SegLabel @1406
-					    Parent_View 	@1405
-					    location   	(1630, 2380)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+maxLengthFacet"
-					    pctDist    	0.472255
-					    height     	30
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0D2008F"
-					client     	@1403
-					supplier   	@1277
-					vertices   	(list Points
-					    (1297, 2321)
-					    (1297, 2409)
-					    (2102, 2409))
-					line_style 	3
-					origin_attachment 	(1297, 2321)
-					terminal_attachment 	(2102, 2409)
-					label      	(object SegLabel @1407
-					    Parent_View 	@1405
-					    location   	(1994, 2366)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.879208
-					    height     	44
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$277" @1408
-				location   	(1159, 2273)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0D500C5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$278" @1409
-					Parent_View 	@1408
-					location   	(-281, 449)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0D6001D"
-					client     	@1408
-					supplier   	@1282
-					line_style 	3
-					origin_attachment 	(1159, 2273)
-					terminal_attachment 	(1159, 1428))
-				    (object RoleView "minLengthFacet" @1410
-					Parent_View 	@1408
-					location   	(-281, 449)
-					label      	(object SegLabel @1411
-					    Parent_View 	@1410
-					    location   	(857, 2372)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	324
-					    justify    	0
-					    label      	"+minLengthFacet"
-					    pctDist    	0.519527
-					    height     	38
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0D60027"
-					client     	@1408
-					supplier   	@1278
-					vertices   	(list Points
-					    (1159, 2273)
-					    (1159, 2409)
-					    (450, 2409))
-					line_style 	3
-					origin_attachment 	(1159, 2273)
-					terminal_attachment 	(450, 2409)
-					label      	(object SegLabel @1412
-					    Parent_View 	@1410
-					    location   	(523, 2369)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.913610
-					    height     	41
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$301" @1413
-				location   	(1197, 2334)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B898016D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$302" @1414
-					Parent_View 	@1413
-					location   	(941, -610)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B8990056"
-					client     	@1413
-					supplier   	@1282
-					line_style 	3
-					origin_attachment 	(1197, 2334)
-					terminal_attachment 	(1197, 1428))
-				    (object RoleView "effectiveMinLengthFacet" @1415
-					Parent_View 	@1413
-					location   	(941, -610)
-					label      	(object SegLabel @1416
-					    Parent_View 	@1415
-					    location   	(856, 2454)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	468
-					    justify    	0
-					    label      	"+effectiveMinLengthFacet"
-					    pctDist    	0.552604
-					    height     	40
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B8990060"
-					client     	@1413
-					supplier   	@1278
-					vertices   	(list Points
-					    (1197, 2334)
-					    (1197, 2493)
-					    (450, 2493))
-					line_style 	3
-					origin_attachment 	(1197, 2334)
-					terminal_attachment 	(450, 2493)
-					label      	(object SegLabel @1417
-					    Parent_View 	@1415
-					    location   	(527, 2451)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.916047
-					    height     	43
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$299" @1418
-				location   	(1231, 2438)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B8400062"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$300" @1419
-					Parent_View 	@1418
-					location   	(863, -746)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B841001D"
-					client     	@1418
-					supplier   	@1282
-					line_style 	3
-					origin_attachment 	(1231, 2438)
-					terminal_attachment 	(1231, 1428))
-				    (object RoleView "effectiveTotalDigitsFacet" @1420
-					Parent_View 	@1418
-					location   	(863, -746)
-					label      	(object SegLabel @1421
-					    Parent_View 	@1420
-					    location   	(859, 2632)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	468
-					    justify    	0
-					    label      	"+effectiveTotalDigitsFacet"
-					    pctDist    	0.597030
-					    height     	37
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B8410027"
-					client     	@1418
-					supplier   	@1279
-					vertices   	(list Points
-					    (1231, 2438)
-					    (1231, 2668)
-					    (451, 2668))
-					line_style 	3
-					origin_attachment 	(1231, 2438)
-					terminal_attachment 	(451, 2668)
-					label      	(object SegLabel @1422
-					    Parent_View 	@1420
-					    location   	(534, 2631)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.918812
-					    height     	38
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$279" @1423
-				location   	(1231, 2397)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0D800DE"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$280" @1424
-					Parent_View 	@1423
-					location   	(-209, 253)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0D803CD"
-					client     	@1423
-					supplier   	@1282
-					line_style 	3
-					origin_attachment 	(1231, 2397)
-					terminal_attachment 	(1231, 1428))
-				    (object RoleView "totalDigitsFacet" @1425
-					Parent_View 	@1423
-					location   	(-209, 253)
-					label      	(object SegLabel @1426
-					    Parent_View 	@1425
-					    location   	(853, 2550)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	312
-					    justify    	0
-					    label      	"+totalDigitsFacet"
-					    pctDist    	0.585567
-					    height     	38
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0D803D7"
-					client     	@1423
-					supplier   	@1279
-					vertices   	(list Points
-					    (1231, 2397)
-					    (1231, 2587)
-					    (451, 2587))
-					line_style 	3
-					origin_attachment 	(1231, 2397)
-					terminal_attachment 	(451, 2587)
-					label      	(object SegLabel @1427
-					    Parent_View 	@1425
-					    location   	(535, 2560)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.914647
-					    height     	28
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @1428
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1232, 768)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1428
-				    location   	(1019, 574)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	426
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	444
-				height     	413
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @1429
-				location   	(1209, 1065)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1428
-				vertices   	(list Points
-				    (1209, 1065)
-				    (1209, 974)))
-			    (object AssociationViewNew "$UNNAMED$235" @1430
-				location   	(1090, 1031)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C2880F503D9"
-				roleview_list 	(list RoleViews
-				    (object RoleView "rootTypeDefinition" @1431
-					Parent_View 	@1430
-					location   	(322, -25)
-					label      	(object SegLabel @1432
-					    Parent_View 	@1431
-					    location   	(897, 1036)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+rootTypeDefinition"
-					    pctDist    	-0.098765
-					    height     	194
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C2880F9003C"
-					client     	@1430
-					supplier   	@1428
-					line_style 	3
-					origin_attachment 	(1090, 1031)
-					terminal_attachment 	(1090, 974)
-					label      	(object SegLabel @1433
-					    Parent_View 	@1431
-					    location   	(1121, 1034)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.061728
-					    height     	31
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$236" @1434
-					Parent_View 	@1430
-					location   	(322, -25)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C2880F90046"
-					client     	@1430
-					supplier   	@1280
-					line_style 	3
-					origin_attachment 	(1090, 1031)
-					terminal_attachment 	(1090, 1088))))
-			    (object AssociationViewNew "$UNNAMED$241" @1435
-				location   	(1538, 873)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28A6DB01E5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "rootType" @1436
-					Parent_View 	@1435
-					location   	(178, 105)
-					label      	(object SegLabel @1437
-					    Parent_View 	@1436
-					    location   	(1558, 792)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+rootType"
-					    pctDist    	-1.760870
-					    height     	20
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A6DD03DD"
-					client     	@1435
-					supplier   	@1428
-					vertices   	(list Points
-					    (1538, 873)
-					    (1538, 919)
-					    (1454, 919))
-					line_style 	3
-					origin_attachment 	(1538, 873)
-					terminal_attachment 	(1454, 919)
-					label      	(object SegLabel @1438
-					    Parent_View 	@1436
-					    location   	(1509, 875)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.016667
-					    height     	30
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$242" @1439
-					Parent_View 	@1435
-					location   	(178, 105)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A6DD03DE"
-					client     	@1435
-					supplier   	@1428
-					vertices   	(list Points
-					    (1538, 873)
-					    (1538, 828)
-					    (1454, 828))
-					line_style 	3
-					origin_attachment 	(1538, 873)
-					terminal_attachment 	(1454, 828))))
-			    (object AssociationViewNew "$UNNAMED$243" @1440
-				location   	(1535, 684)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28A7120108"
-				roleview_list 	(list RoleViews
-				    (object RoleView "baseType" @1441
-					Parent_View 	@1440
-					location   	(175, -84)
-					label      	(object SegLabel @1442
-					    Parent_View 	@1441
-					    location   	(1559, 597)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	204
-					    justify    	0
-					    label      	"+baseType"
-					    pctDist    	-1.977273
-					    height     	24
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A7140151"
-					client     	@1440
-					supplier   	@1428
-					vertices   	(list Points
-					    (1535, 684)
-					    (1535, 728)
-					    (1454, 728))
-					line_style 	3
-					origin_attachment 	(1535, 684)
-					terminal_attachment 	(1454, 728)
-					label      	(object SegLabel @1443
-					    Parent_View 	@1441
-					    location   	(1506, 683)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.027778
-					    height     	30
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$244" @1444
-					Parent_View 	@1440
-					location   	(175, -84)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A714015B"
-					client     	@1440
-					supplier   	@1428
-					vertices   	(list Points
-					    (1535, 684)
-					    (1535, 641)
-					    (1454, 641))
-					line_style 	3
-					origin_attachment 	(1535, 684)
-					terminal_attachment 	(1454, 641))))
-			    (object AssociationViewNew "$UNNAMED$247" @1445
-				location   	(613, 940)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28A7ED03C0"
-				roleview_list 	(list RoleViews
-				    (object RoleView "complexType" @1446
-					Parent_View 	@1445
-					location   	(-747, 172)
-					label      	(object SegLabel @1447
-					    Parent_View 	@1446
-					    location   	(465, 983)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	264
-					    justify    	0
-					    label      	"+complexType"
-					    pctDist    	0.373057
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A7F40117"
-					client     	@1445
-					supplier   	@1281
-					vertices   	(list Points
-					    (613, 940)
-					    (284, 940)
-					    (284, 1008))
-					line_style 	3
-					origin_attachment 	(613, 940)
-					terminal_attachment 	(284, 1008)
-					label      	(object SegLabel @1448
-					    Parent_View 	@1446
-					    location   	(224, 972)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.909320
-					    height     	61
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$248" @1449
-					Parent_View 	@1445
-					location   	(-747, 172)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A7F40121"
-					client     	@1445
-					supplier   	@1428
-					line_style 	3
-					origin_attachment 	(613, 940)
-					terminal_attachment 	(1010, 940))))
-			    (object InheritView "" @1450
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAB1004D"
-				client     	@1428
-				supplier   	@1258
-				line_style 	3
-				origin_attachment 	(1112, 562)
-				terminal_attachment 	(1112, 510)
-				drawSupplier 	@1259)
-			    (object InheritView "" @1451
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0D01901F1"
-				client     	@1280
-				supplier   	@1428
-				line_style 	3
-				origin_attachment 	(1146, 1088)
-				terminal_attachment 	(1146, 1065)
-				drawSupplier 	@1429)
-			    (object AssociationViewNew "$UNNAMED$245" @1452
-				location   	(1362, 1133)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28A74B0178"
-				roleview_list 	(list RoleViews
-				    (object RoleView "simpleType" @1453
-					Parent_View 	@1452
-					location   	(-158, -163)
-					label      	(object SegLabel @1454
-					    Parent_View 	@1453
-					    location   	(1499, 1094)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+simpleType"
-					    pctDist    	-0.246753
-					    height     	137
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A74D017B"
-					client     	@1452
-					supplier   	@1282
-					line_style 	3
-					origin_attachment 	(1362, 1133)
-					terminal_attachment 	(1362, 1292)
-					label      	(object SegLabel @1455
-					    Parent_View 	@1453
-					    location   	(1321, 1097)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	-0.227273
-					    height     	42
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$246" @1456
-					Parent_View 	@1452
-					location   	(-158, -163)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A74D0185"
-					client     	@1452
-					supplier   	@1428
-					line_style 	3
-					origin_attachment 	(1362, 1133)
-					terminal_attachment 	(1362, 974))))
-			    (object ClassView "Class" "Logical View::xsd::XSDFeature" @1457
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2272, 384)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1457
-				    location   	(2002, 303)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	540
-				    justify    	0
-				    label      	"XSDFeature")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B537026C"
-				compartment 	(object Compartment
-				    Parent_View 	@1457
-				    location   	(2002, 363)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	550
-				    compartmentItems 	(list Compartment
-					"+ global : boolean"
-					"+ featureReference : boolean"))
-				width      	558
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @1458
-				location   	(2262, 568)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1457
-				vertices   	(list Points
-				    (2262, 568)
-				    (2262, 477)))
-			    (object InheritView "" @1459
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69EDEE01BF"
-				client     	@1254
-				supplier   	@1457
-				line_style 	3
-				origin_attachment 	(2346, 595)
-				terminal_attachment 	(2346, 568)
-				drawSupplier 	@1458)
-			    (object AssociationViewNew "$UNNAMED$239" @1460
-				location   	(1553, 453)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28A0F201A4"
-				roleview_list 	(list RoleViews
-				    (object RoleView "type" @1461
-					Parent_View 	@1460
-					location   	(801, 293)
-					label      	(object SegLabel @1462
-					    Parent_View 	@1461
-					    location   	(1331, 499)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	108
-					    justify    	0
-					    label      	"+type"
-					    pctDist    	0.506266
-					    height     	46
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A0F302E5"
-					client     	@1460
-					supplier   	@1428
-					vertices   	(list Points
-					    (1553, 453)
-					    (1222, 453)
-					    (1222, 562))
-					line_style 	3
-					origin_attachment 	(1553, 453)
-					terminal_attachment 	(1222, 562)
-					label      	(object SegLabel @1463
-					    Parent_View 	@1461
-					    location   	(1185, 479)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.812030
-					    height     	38
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$240" @1464
-					Parent_View 	@1460
-					location   	(801, 293)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A0F302F0"
-					client     	@1460
-					supplier   	@1457
-					line_style 	3
-					origin_attachment 	(1553, 453)
-					terminal_attachment 	(1993, 453))))
-			    (object AssociationViewNew "$UNNAMED$131" @1465
-				location   	(1908, 353)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C29010602D7"
-				roleview_list 	(list RoleViews
-				    (object RoleView "resolvedFeature" @1466
-					Parent_View 	@1465
-					location   	(-268, -159)
-					label      	(object SegLabel @1467
-					    Parent_View 	@1466
-					    location   	(1729, 352)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	312
-					    justify    	0
-					    label      	"+resolvedFeature"
-					    pctDist    	-0.029412
-					    height     	180
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C29010B000E"
-					client     	@1465
-					supplier   	@1457
-					vertices   	(list Points
-					    (1908, 353)
-					    (1908, 387)
-					    (1993, 387))
-					line_style 	3
-					origin_attachment 	(1908, 353)
-					terminal_attachment 	(1993, 387)
-					label      	(object SegLabel @1468
-					    Parent_View 	@1466
-					    location   	(1945, 354)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.596639
-					    height     	34
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$132" @1469
-					Parent_View 	@1465
-					location   	(-268, -159)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C29010B0018"
-					client     	@1465
-					supplier   	@1457
-					vertices   	(list Points
-					    (1908, 353)
-					    (1908, 319)
-					    (1993, 319))
-					line_style 	3
-					origin_attachment 	(1908, 353)
-					terminal_attachment 	(1993, 319))))
-			    (object InheritView "" @1470
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A26036D"
-				client     	@1258
-				supplier   	@1257
-				vertices   	(list Points
-				    (494, 284)
-				    (494, 244)
-				    (996, 244))
-				line_style 	3
-				origin_attachment 	(494, 284)
-				terminal_attachment 	(996, 244))
-			    (object InheritView "" @1471
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69B7DC0193"
-				client     	@1245
-				supplier   	@1457
-				line_style 	3
-				origin_attachment 	(1718, 812)
-				terminal_attachment 	(1718, 568)
-				drawSupplier 	@1458)
-			    (object InheritView "" @1472
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A1302A2"
-				client     	@1282
-				supplier   	@1428
-				line_style 	3
-				origin_attachment 	(1265, 1292)
-				terminal_attachment 	(1265, 1065)
-				drawSupplier 	@1429)
-			    (object InheritView "" @1473
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A2C0307"
-				client     	@1457
-				supplier   	@1257
-				vertices   	(list Points
-				    (2147, 291)
-				    (2147, 244)
-				    (1468, 244))
-				line_style 	3
-				origin_attachment 	(2147, 291)
-				terminal_attachment 	(1468, 244)))))))
-	logical_presentations 	(list unit_reference_list
-	    (object ClassDiagram "Main"
-		quid       	"39E27F080076"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list
-		    (object CategoryView "Logical View::wsdl" @1474
-			location   	(272, 256)
-			label      	(object ItemLabel
-			    Parent_View 	@1474
-			    location   	(128, 172)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"wsdl")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"3ADFB8E5021E"
-			width      	300
-			height     	180)
-		    (object CategoryView "Logical View::xsd" @1475
-			location   	(272, 576)
-			label      	(object ItemLabel
-			    Parent_View 	@1475
-			    location   	(128, 492)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"xsd")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"39ABDC6F01AA"
-			width      	300
-			height     	180)))))
-    root_subsystem 	(object SubSystem "Component View"
-	quid       	"39E27F080065"
-	physical_models 	(list unit_reference_list)
-	physical_presentations 	(list unit_reference_list
-	    (object Module_Diagram "Main"
-		quid       	"39E27F080077"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    process_structure 	(object Processes
-	quid       	"39E27F080066"
-	ProcsNDevs 	(list
-	    (object Process_Diagram "Deployment View"
-		quid       	"39E27F080068"
-		title      	"Deployment View"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    properties 	(object Properties
-	attributes 	(list Attribute_Set
-	    (object Attribute
-		tool       	"DDL"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"DDL"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"DDL"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"DataBase"
-			value      	("DataBaseSet" 800))
-		    (object Attribute
-			tool       	"DDL"
-			name       	"DataBaseSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"DDL"
-				name       	"ANSI"
-				value      	800)
-			    (object Attribute
-				tool       	"DDL"
-				name       	"Oracle"
-				value      	801)
-			    (object Attribute
-				tool       	"DDL"
-				name       	"SQLServer"
-				value      	802)
-			    (object Attribute
-				tool       	"DDL"
-				name       	"Sybase"
-				value      	803)
-			    (object Attribute
-				tool       	"DDL"
-				name       	"Watcom"
-				value      	804)))
-		    (object Attribute
-			tool       	"DDL"
-			name       	"PrimaryKeyColumnName"
-			value      	"Id")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"PrimaryKeyColumnType"
-			value      	"NUMBER(5)")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"ViewName"
-			value      	"V_")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"TableName"
-			value      	"T_")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"InheritSuffix"
-			value      	"_V")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"DropClause"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"BaseViews"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"DDLScriptFilename"
-			value      	"DDL1.SQL")))
-	    (object Attribute
-		tool       	"DDL"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"DDL"
-			name       	"ColumnType"
-			value      	"VARCHAR")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"Length"
-			value      	"")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"NullsOK"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"PrimaryKey"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"Unique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"CompositeUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"CheckConstraint"
-			value      	"")))
-	    (object Attribute
-		tool       	"DDL"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"framework"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"IDL"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"StopOnError"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GeneratePreserveRegions"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"ImplementationType"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"ConstValue"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateDefaultSpecifier"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"DefaultSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IDLElement"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IDLSpecificationType"
-			value      	("IDLSpecSet" 22))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IDLSpecSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Interface"
-				value      	22)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Typedef"
-				value      	54)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Enumeration"
-				value      	8)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Const"
-				value      	71)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Exception"
-				value      	61)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Struct"
-				value      	51)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Union"
-				value      	81)))))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CmIdentification"
-			value      	(value Text "  %X%  @(#) plugins/com.ibm.etools.ctc.services/src/rose/wsdlMdl.mdl, ctc, ibmctc"))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateIDLModule"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CmIdentification"
-			value      	(value Text "  %X%  @(#) plugins/com.ibm.etools.ctc.services/src/rose/wsdlMdl.mdl, ctc, ibmctc"))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"OperationIsOneWay"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Context"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Raises"
-			value      	"")))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IsConst"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"ConstValue"
-			value      	"")))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"NameIfUnlabeled"
-			value      	"the_$supplier")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"BoundedHasRelType"
-			value      	("HasRelTypeSet" 47))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"HasRelTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"NameIfUnlabeled"
-			value      	"the_$supplier")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"BoundedRoleType"
-			value      	("AssocTypeSet" 47))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"AssocTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Uses"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateForwardReference"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Subsystem"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Directory"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Java"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"Java"
-			name       	"UsePrefixes"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"InstanceVariablePrefix"
-			value      	"m_")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ClassVariablePrefix"
-			value      	"s_")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultAttributeDataType"
-			value      	"int")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultOperationReturnType"
-			value      	"void")))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Private"
-				value      	64)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"CmIdentification"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"AdditionalImports"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"CmIdentification"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"AdditionalImports"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Abstract"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Native"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Synchronized"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Transient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Volatile"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Transient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Volatile"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"propertyId"
-		value      	"360000002")
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"DDLScriptFilename"
-			value      	"DDL1.SQL")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"DropClause"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"PrimaryKeyColumnName"
-			value      	"_ID")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"PrimaryKeyColumnType"
-			value      	"NUMBER(5,0)")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"SchemaNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"SchemaNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TableNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TypeNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TypeNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ViewNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ViewNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"VarrayNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"VarrayNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NestedTableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NestedTableNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ObjectTableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ObjectTableNameSuffix"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsSchema"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OID"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"WhereClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CheckConstraint"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypeLength"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypePrecision"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypeScale"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionOfREFS"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"MethodKind"
-			value      	("MethodKindSet" 1903))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OverloadID"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsReadNoDataState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsReadNoProcessState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsWriteNoDataState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsWriteNoProcessState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsSelfish"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerType"
-			value      	("TriggerTypeSet" 1801))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerEvent"
-			value      	("TriggerEventSet" 1601))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerText"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerReferencingNames"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerForEach"
-			value      	("TriggerForEachSet" 1701))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerWhenClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"MethodKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"MapMethod"
-				value      	1901)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"OrderMethod"
-				value      	1902)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Function"
-				value      	1903)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Procedure"
-				value      	1904)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Operator"
-				value      	1905)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Constructor"
-				value      	1906)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Destructor"
-				value      	1907)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Trigger"
-				value      	1908)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Calculated"
-				value      	1909)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"AFTER"
-				value      	1801)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"BEFORE"
-				value      	1802)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSTEAD OF"
-				value      	1803)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerForEachSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"ROW"
-				value      	1701)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"STATEMENT"
-				value      	1702)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerEventSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT"
-				value      	1601)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"UPDATE"
-				value      	1602)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"DELETE"
-				value      	1603)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR UPDATE"
-				value      	1604)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR DELETE"
-				value      	1605)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"UPDATE OR DELETE"
-				value      	1606)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR UPDATE OR DELETE"
-				value      	1607)))))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NullsAllowed"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Length"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Precision"
-			value      	"2")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Scale"
-			value      	"6")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsIndex"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsPrimaryKey"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CompositeUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CheckConstraint"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Repository"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"cg"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"UseMSVC"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileExtension"
-			value      	"h")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileBackupExtension"
-			value      	"h~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileTemporaryExtension"
-			value      	"h#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileExtension"
-			value      	"cpp")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileBackupExtension"
-			value      	"cp~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileTemporaryExtension"
-			value      	"cp#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ErrorLimit"
-			value      	30)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Directory"
-			value      	"$ROSECPP_SOURCE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"PathSeparator"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileNameFormat"
-			value      	"128vx_b")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BooleanType"
-			value      	"int")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowTemplates"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExplicitInstantiations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowProtectedInheritance"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CommentWidth"
-			value      	60)
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByValueContainer"
-			value      	"$targetClass")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByValueContainer"
-			value      	"OptionalByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByValueContainer"
-			value      	"BoundedListByValue<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByValueContainer"
-			value      	"BoundedSetByValue<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByReferenceContainer"
-			value      	"BoundedListByReference<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByReferenceContainer"
-			value      	"BoundedSetByReference<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByValueContainer"
-			value      	"UnboundedListByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByValueContainer"
-			value      	"UnboundedSetByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByReferenceContainer"
-			value      	"UnboundedListByReference<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByReferenceContainer"
-			value      	"UnboundedSetByReference<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByValueContainer"
-			value      	"AssociationByValue<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByValueContainer"
-			value      	"DictionaryByValue<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByReferenceContainer"
-			value      	"AssociationByReference<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByReferenceContainer"
-			value      	"DictionaryByReference<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GeneratePreserveRegions"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ImplementationType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ClassKey"
-			value      	"class")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"PutBodiesInSpec"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDefaultConstructor"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DefaultConstructorVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineDefaultConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ExplicitDefaultConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateCopyConstructor"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CopyConstructorVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineCopyConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ExplicitCopyConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDestructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DestructorVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DestructorKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineDestructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssignmentOperation"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssignmentVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssignmentKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineAssignmentOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEqualityOperations"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"EqualityVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"EqualityKind"
-			value      	("FriendKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineEqualityOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateRelationalOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"RelationalVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"RelationalKind"
-			value      	("FriendKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineRelationalOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateStorageMgmtOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StorageMgmtVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineStorageMgmtOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSubscriptOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SubscriptVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"SubscriptKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"SubscriptResultType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSubscriptOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDereferenceOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DereferenceVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DereferenceKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DereferenceResultType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineDereferenceOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateIndirectionOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IndirectionVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IndirectionKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IndirectionResultType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineIndirectionOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateStreamOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StreamVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineStreamOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ThreeKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"KindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"FriendKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"DeclareAndDefine"
-				value      	199)
-			    (object Attribute
-				tool       	"cg"
-				name       	"DeclareOnly"
-				value      	205)
-			    (object Attribute
-				tool       	"cg"
-				name       	"DoNotDeclare"
-				value      	206)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"VisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ConstValue"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDefaultSpecifier"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DefaultSpecifier"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CmIdentification"
-			value      	(value Text "  %X%  @(#) plugins/com.ibm.etools.ctc.services/src/rose/wsdlMdl.mdl, ctc, ibmctc"))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExtensionlessFileName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeFormat"
-			value      	(value Text 
-|// $package
-|#include "$file"
-|
-			))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludePrecompiledHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeOrder"
-			value      	"AMIR")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyle"
-			value      	("InliningStyleSet" 207))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"InClassDeclaration"
-				value      	208)
-			    (object Attribute
-				tool       	"cg"
-				name       	"FollowingClassDeclaration"
-				value      	207)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"TypesDefined"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeClosure"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CmIdentification"
-			value      	(value Text "  %X%  @(#) plugins/com.ibm.etools.ctc.services/src/rose/wsdlMdl.mdl, ctc, ibmctc"))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExtensionlessFileName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeFormat"
-			value      	(value Text 
-|// $package
-|#include "$file"
-|
-			))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludePrecompiledHeader"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeOrder"
-			value      	"AMIR")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyle"
-			value      	("InliningStyleSet" 207))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"InClassDeclaration"
-				value      	208)
-			    (object Attribute
-				tool       	"cg"
-				name       	"FollowingClassDeclaration"
-				value      	207)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"TypesDefined"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeClosure"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationKind"
-			value      	("OperationKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationIsConst"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationIsExplicit"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Inline"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"EntryCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ExitCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"BodyAnnotations"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationIsOneWay"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Context"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"Raises"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"Ordered"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"NameIfUnlabeled"
-			value      	"the_$supplier")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtRelationshipVisibility"
-				value      	210)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberFieldSize"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InitialValue"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetName"
-			value      	"get_$relationship")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetName"
-			value      	"set_$relationship")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKindsSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SelectorName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SelectorType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConstSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_Function"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetByReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ForwardReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedHasRelType"
-			value      	("HasRelTypeSet" 47))
-		    (object Attribute
-			tool       	"cg"
-			name       	"HasRelTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Association"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"NameIfUnlabeled"
-			value      	"the_$targetClass")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Inherit"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"InstanceArguments"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ForwardReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"NameIfUnlabeled"
-			value      	"the_$targetClass")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberName"
-			value      	"$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtRelationshipVisibility"
-				value      	210)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberFieldSize"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InitialValue"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerGet"
-			value      	"$data.get($keys)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerSet"
-			value      	"$data.set($keys,$value)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedContainer"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassContainer"
-			value      	"$supplier *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassInitialValue"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKindsSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetByReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetName"
-			value      	"get_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConstSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_Function"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetName"
-			value      	"set_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetSetByReference"
-			value      	("QualifiedGetSetByReferenceSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetSetByReferenceSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_GetSetByReference"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateQualifiedGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetName"
-			value      	"get_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineQualifiedGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateQualifiedSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedSetName"
-			value      	"set_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedSetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineQualifiedSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssocClassDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberName"
-			value      	"$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtRelationshipVisibility"
-				value      	210)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssocClassGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetName"
-			value      	"get_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineAssocClassGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssocClassSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassSetName"
-			value      	"set_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassSetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineAssocClassSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassForwardReferenceOnly"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedRoleType"
-			value      	("AssocTypeSet" 47))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberName"
-			value      	"$attribute")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtAttributeVisibility"
-				value      	211)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberFieldSize"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetName"
-			value      	"get_$attribute")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetName"
-			value      	"set_$attribute")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKindsSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConstSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_Function"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetByReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"IsReadOnly"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Uses"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"ForwardReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"BodyReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateForwardReference"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Subsystem"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DirectoryIsOnSearchList"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"PrecompiledHeader"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"IsNamespace"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Indent"
-			value      	2)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Version"
-			value      	"5.0")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCClassTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCClassTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Interface_Part"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Connection_Part"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Class_Factory"
-				value      	3)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CObjectFunctionality"
-			value      	("CObjectFunctionalitySet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CObjectFunctionalitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dynamic"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dyncreate"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Serial"
-				value      	3)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateOverrideGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateDataGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DATA_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateFieldGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_FIELD_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateMessageGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateMessageMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_MSG_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MESSAGE_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEFactory"
-			value      	("OLEFactorySet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEFactorySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Built_in"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Simple"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Licensed"
-				value      	3)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEName"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEClassID"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateOLECtlType"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLECtlType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateOLETypeLib"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLETypeLibID"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLETypeLibMajor"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLETypeLibMinor"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GeneratePropPageIDs"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEPropPageIDs"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateDispatchMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockProperties"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockFunctions"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DispatchDefValue"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateDispIdEnum"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISP_ID_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateInterfaceMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"INTERFACE_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"InitInterface"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateEventMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENT_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockEvents"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateEventSinkMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENTSINK_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PropNotifySinks"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateConnectionMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CONNECTION_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"ConnectionPointIID"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"InheritanceType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLECommands"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MFCDeclares"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MFCImplements"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"ATL_Declares"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateCOMMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"COM_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateConnectionPointMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CONNECTION_POINT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateMsgMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSG_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GeneratePropertyMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PROPERTY_MAP_Entries"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCOperationTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCOperationTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Virtual_Override"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Message_Handler"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dispatch_Handler"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Event_Firing_Function"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Event_Sink_Handler"
-				value      	5)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Std_OLE_Method"
-				value      	6)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Command_Parser"
-				value      	7)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Property_Get_Function"
-				value      	8)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Property_Set_Function"
-				value      	9)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Property_Notify_Function"
-				value      	10)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Macro_Generated_Function"
-				value      	11)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_MSG_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MESSAGE_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"BodyImage"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCAttributeTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCAttributeTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Member_Property"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Get_Set_Property"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dialog_Data"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Field_Data"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Stock_Property"
-				value      	5)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PointerBase"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockPropertyImplementation"
-			value      	"")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCAttributeTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCAttributeTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Member_Property"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Get_Set_Property"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dialog_Data"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Field_Data"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Stock_Property"
-				value      	5)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PointerBase"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockPropertyImplementation"
-			value      	"")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCAttributeTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCAttributeTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Member_Property"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Get_Set_Property"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dialog_Data"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Field_Data"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Stock_Property"
-				value      	5)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PointerBase"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockPropertyImplementation"
-			value      	"")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateIncludesGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_INCLUDES_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateInsertLocation"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateIncludesGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_INCLUDES_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateInsertLocation"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"SCC"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"TypeLibImporter"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"propertyId"
-		value      	"783606378")
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"CreatableSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Private"
-				value      	221)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"PublicNotCreatable"
-				value      	213)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"SingleUse"
-				value      	214)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"GlobalSingleUse"
-				value      	215)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"MultiUse"
-				value      	219)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"GlobalMultiUse"
-				value      	220)))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionBase"
-			value      	"0")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionExplicit"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionCompare"
-			value      	("CompareSet" 202))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Creatable"
-			value      	("CreatableSet" 221))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateInitialization"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateTermination"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"CollectionClass"
-			value      	"Collection")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"CompareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"None"
-				value      	202)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Binary"
-				value      	203)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Text"
-				value      	204)))))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OperationName"
-			value      	"$operation")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"LibraryName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"AliasName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"IsStatic"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"EntryCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ExitCode"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"IsConst"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"New"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"WithEvents"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Subscript"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"NameIfUnlabeled"
-			value      	"the$supplier")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateGetOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateSetOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateLetOperation"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"New"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"WithEvents"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Subscript"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"NameIfUnlabeled"
-			value      	"the$supplier")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateGetOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateSetOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateLetOperation"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Inherit"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ImplementsDelegation"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ProjectFile"
-			value      	"")))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"VisualStudio"
-		name       	"HiddenTool"
-		value      	FALSE))
-	quid       	"39E27F080067"))
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/model/com.ibm.etools.WSDL.cat b/bundles/org.eclipse.wst.wsdl/src-wsdl/model/com.ibm.etools.WSDL.cat
deleted file mode 100644
index 4627bd78a..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/model/com.ibm.etools.WSDL.cat
+++ /dev/null
@@ -1,6997 +0,0 @@
-
-(object Petal
-    version    	42
-    _written   	"Rose 4.5.8054a"
-    charSet    	0)
-
-(object Class_Category "wsdl"
-    is_unit    	TRUE
-    is_loaded  	TRUE
-    quid       	"3ADFB8E5021E"
-    documentation 	
-|The WSDL model contains classes for the Web Services Description Language (WSDL).
-|
-|WSDL describes network services as sets of endpoints operating on messages. The operations and messages are described abstractly, and then bound to a concrete network protocol and message format to define an endpoint.
-|
-|WSDL describes the formats of the messages exchanged by the services, and supports the XML Schemas specification as its canonical type system. This package uses an XML Schema Infoset model package (see the XSD package) to describe the abstract message formats.
-|
-|The model contains the following diagrams, named after the corresponding chapters in the WSDL 1.1 specification (http://www.w3.org/TR/2001/NOTE-wsdl-20010315)
-|- 2.1 Definition, shows the WSDL definition element and the WSDL document structure
-|- 2.1.1 Naming and Linking, shows the namespace and import mechanism
-|- 2.1.3 Extensibility, shows the WSDL extensibility mechanism
-|- 2.2 Types, shows the use of XML Schema types in WSDL
-|- 2.3 Messages, 2.4 PortTypes, 2.5 Bindings and 2.7 Services, show the major WSDL elements and their relations.
-|
-|The WSDL classes extend the javax.wsdl interfaces defined by JSR 110. Classes with interface and datatype stereotypes are used to represent these non-MOF interfaces.
-    
-    exportControl 	"Public"
-    logical_models 	(list unit_reference_list
-	(object Class "WSDLElement"
-	    quid       	"3AD5C6A302DD"
-	    documentation 	"This class represents a WSDL language element."
-	    operations 	(list Operations
-		(object Operation "getEnclosingDefinition"
-		    quid       	"3CD1529600C8"
-		    result     	"Definition"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "setEnclosingDefinition"
-		    quid       	"3CD152B80347"
-		    parameters 	(list Parameters
-			(object Parameter "definition"
-			    type       	"Definition"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "documentationElement"
-		    quid       	"3CCE443602A3"
-		    type       	"DOMElement")
-		(object ClassAttribute "element"
-		    quid       	"3F97DBD30207"
-		    type       	"DOMElement"))
-	    language   	"Java"
-	    abstract   	TRUE)
-	(object Class "PortType"
-	    quid       	"3AD5C7F001A5"
-	    documentation 	"This class represents a WSDL portType element of the WSDL specification version 1.1 and an Interface component of the WSDL specification version 1.2. A port type or Interface is a named set of abstract operations and the abstract messages involved."
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AD5C9B70150"
-		    supplier   	"Logical View::wsdl::WSDLElement"
-		    quidu      	"3AD5C6A302DD")
-		(object Inheritance_Relationship
-		    quid       	"3F6F1FD8019F"
-		    supplier   	"Logical View::wsdl::IPortType"
-		    quidu      	"3B84A5BE0331"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "qName"
-		    quid       	"3AEB488E0023"
-		    type       	"QName")
-		(object ClassAttribute "undefined"
-		    quid       	"3BDDF1E301E5"
-		    type       	"boolean")
-		(object ClassAttribute "proxy"
-		    quid       	"3D18CDEB0316"
-		    type       	"boolean")
-		(object ClassAttribute "resourceURI"
-		    quid       	"3D18D4FD01BA"
-		    type       	"String"))
-	    language   	"Java")
-	(object Class "Operation"
-	    quid       	"3AD5C80D03CE"
-	    documentation 	"This class represents a WSDL operation element. A WSDL operation is an abstract description of an action supported by a service."
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AE9DE98003C"
-		    supplier   	"Logical View::wsdl::WSDLElement"
-		    quidu      	"3AD5C6A302DD")
-		(object Inheritance_Relationship
-		    quid       	"3F6F1FE20171"
-		    supplier   	"Logical View::wsdl::IOperation"
-		    quidu      	"3B84A77600D1"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "style"
-		    quid       	"3AEB472601AC"
-		    type       	"OperationType")
-		(object ClassAttribute "name"
-		    quid       	"3BDD9643004C"
-		    type       	"String")
-		(object ClassAttribute "undefined"
-		    quid       	"3BDDF235003E"
-		    type       	"boolean")
-		(object ClassAttribute "proxy"
-		    quid       	"3D18CE2201AD"
-		    type       	"boolean")
-		(object ClassAttribute "resourceURI"
-		    quid       	"3D18D520011B"
-		    type       	"String"))
-	    language   	"Java")
-	(object Class "Message"
-	    quid       	"3AD5C9590078"
-	    documentation 	"This class represents a WSDL message element. A WSDL message is an abstract, typed definition of the data being communicated."
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AD5D05501C4"
-		    supplier   	"Logical View::wsdl::WSDLElement"
-		    quidu      	"3AD5C6A302DD")
-		(object Inheritance_Relationship
-		    quid       	"3B84A8D102BA"
-		    supplier   	"Logical View::wsdl::IMessage"
-		    quidu      	"3B84A8AF004F"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "qName"
-		    quid       	"3AEB487C01FE"
-		    type       	"QName")
-		(object ClassAttribute "undefined"
-		    quid       	"3BDDF1D20226"
-		    type       	"boolean")
-		(object ClassAttribute "proxy"
-		    quid       	"3D18CE4B02B0"
-		    type       	"boolean")
-		(object ClassAttribute "resourceURI"
-		    quid       	"3D18D54200F1"
-		    type       	"String"))
-	    language   	"Java")
-	(object Class "Part"
-	    quid       	"3AD5CE1C032E"
-	    documentation 	"This class represents a WSDL part element. Parts describe the logical abstract content of a message. Each part is associated with a type from some type system. "
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3B84A96D02F1"
-		    supplier   	"Logical View::wsdl::IPart"
-		    quidu      	"3B84A93F01BE")
-		(object Inheritance_Relationship
-		    quid       	"3B897E230237"
-		    supplier   	"Logical View::wsdl::WSDLElement"
-		    quidu      	"3AD5C6A302DD"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "name"
-		    quid       	"3BCE70B703C8"
-		    type       	"String")
-		(object ClassAttribute "elementName"
-		    quid       	"3B84B08703DB"
-		    type       	"QName")
-		(object ClassAttribute "typeName"
-		    quid       	"3BCE70C303C5"
-		    type       	"QName"))
-	    language   	"Java")
-	(object Class "Binding"
-	    quid       	"3AD5D2860261"
-	    documentation 	"This class represents a WSDL binding element. A binding defines message format and protocol details for operations and messages defined by a particular portType. There may be any number of bindings for a given portType."
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AD5FA0F02F0"
-		    supplier   	"Logical View::wsdl::ExtensibleElement"
-		    quidu      	"3AD5FCFA033A")
-		(object Inheritance_Relationship
-		    quid       	"3B8595410129"
-		    supplier   	"Logical View::wsdl::IBinding"
-		    quidu      	"3B84ABC60219"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "qName"
-		    quid       	"3AEB4899014B"
-		    type       	"QName")
-		(object ClassAttribute "undefined"
-		    quid       	"3BDDF1F401A3"
-		    type       	"boolean")
-		(object ClassAttribute "proxy"
-		    quid       	"3D18CE6D0151"
-		    type       	"boolean")
-		(object ClassAttribute "resourceURI"
-		    quid       	"3D18D4DF035C"
-		    type       	"String"))
-	    language   	"Java")
-	(object Class "BindingOperation"
-	    quid       	"3AD5D3CB0145"
-	    documentation 	"This class represents a WSDL operation element within a binding. An operation element within a binding specifies binding information for the operation with the same name within the binding's portType. "
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AD6009202F7"
-		    supplier   	"Logical View::wsdl::ExtensibleElement"
-		    quidu      	"3AD5FCFA033A")
-		(object Inheritance_Relationship
-		    quid       	"3B84ADE401DC"
-		    supplier   	"Logical View::wsdl::IBindingOperation"
-		    quidu      	"3B84ADC00072"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "name"
-		    quid       	"3B89C4CB0199"
-		    type       	"String"))
-	    language   	"Java")
-	(object Class "Service"
-	    quid       	"3AD5D8F002F8"
-	    documentation 	"This class represents a WSDL service element. A service groups a set of related ports together."
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AD5FA20025E"
-		    supplier   	"Logical View::wsdl::ExtensibleElement"
-		    quidu      	"3AD5FCFA033A")
-		(object Inheritance_Relationship
-		    quid       	"3B85954E01B4"
-		    supplier   	"Logical View::wsdl::IService"
-		    quidu      	"3B84AB490287"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "qName"
-		    quid       	"3AEB48A40151"
-		    type       	"QName")
-		(object ClassAttribute "undefined"
-		    quid       	"3BDDF20D0203"
-		    type       	"boolean")
-		(object ClassAttribute "proxy"
-		    quid       	"3D18D4810220"
-		    type       	"boolean")
-		(object ClassAttribute "resourceURI"
-		    quid       	"3D18D4C501E2"
-		    type       	"String"))
-	    language   	"Java")
-	(object Class "Port"
-	    quid       	"3AD5D9170286"
-	    documentation 	"This class represents a WSDL port element. A port defines an individual endpoint by specifying a single address for a binding"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AD600CB00AA"
-		    supplier   	"Logical View::wsdl::ExtensibleElement"
-		    quidu      	"3AD5FCFA033A")
-		(object Inheritance_Relationship
-		    quid       	"3B85954502C9"
-		    supplier   	"Logical View::wsdl::IPort"
-		    quidu      	"3B84AB800326"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "name"
-		    quid       	"3AD5D9A00391"
-		    type       	"String"))
-	    language   	"Java")
-	(object Class "ExtensibilityElement"
-	    quid       	"3AD5DBB602A9"
-	    documentation 	"This class represents a WSDL extensibility element. WSDL allows extensibility elements representing a specific technology under various elements defined by WSDL."
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3B84B14903D0"
-		    supplier   	"Logical View::wsdl::IExtensibilityElement"
-		    quidu      	"3B84B12402AB")
-		(object Inheritance_Relationship
-		    quid       	"3BDDF53502C3"
-		    supplier   	"Logical View::wsdl::WSDLElement"
-		    quidu      	"3AD5C6A302DD"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "required"
-		    quid       	"3AF9543C0073"
-		    type       	"boolean")
-		(object ClassAttribute "elementType"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isTransient"
-			    value      	TRUE))
-		    quid       	"3B85B21A0271"
-		    type       	"QName"))
-	    language   	"Java")
-	(object Class "Definition"
-	    quid       	"3AD5E43F008E"
-	    documentation 	"This class represents a WSDL definitions element. The WSDL definitions element is the root element of a WSDL document."
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AD5FDB803D4"
-		    supplier   	"Logical View::wsdl::ExtensibleElement"
-		    quidu      	"3AD5FCFA033A")
-		(object Inheritance_Relationship
-		    quid       	"3B84B1F80382"
-		    supplier   	"Logical View::wsdl::IDefinition"
-		    quidu      	"3B84B1D90142"))
-	    operations 	(list Operations
-		(object Operation "getDocument"
-		    quid       	"3CD14FC2012B"
-		    result     	"DOMDocument"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "setDocument"
-		    quid       	"3CD150DE01E7"
-		    parameters 	(list Parameters
-			(object Parameter "document"
-			    type       	"DOMDocument"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "targetNamespace"
-		    quid       	"3AD5E474004E"
-		    type       	"String")
-		(object ClassAttribute "location"
-		    quid       	"40352B7C0396"
-		    type       	"String")
-		(object ClassAttribute "qName"
-		    quid       	"3AEB485702F5"
-		    type       	"QName")
-		(object ClassAttribute "encoding"
-		    quid       	"3CADD00D000D"
-		    type       	"String"))
-	    language   	"Java")
-	(object Class "Import"
-	    quid       	"3AD5E4F903DE"
-	    documentation 	"This class represents WSDL import element. WSDL allows associating a namespace with a document location using an import element."
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AD5EE58037A"
-		    supplier   	"Logical View::wsdl::WSDLElement"
-		    quidu      	"3AD5C6A302DD")
-		(object Inheritance_Relationship
-		    quid       	"3F6F200D0340"
-		    supplier   	"Logical View::wsdl::IImport"
-		    quidu      	"3B84B2020119"))
-	    operations 	(list Operations
-		(object Operation "getSchema"
-		    quid       	"3C8672C10379"
-		    result     	"XSDSchema"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "setSchema"
-		    quid       	"3C8672C10397"
-		    parameters 	(list Parameters
-			(object Parameter "schema"
-			    type       	"XSDSchema"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "namespaceURI"
-		    quid       	"3AD5E50A0036"
-		    type       	"String")
-		(object ClassAttribute "locationURI"
-		    quid       	"3AD5E5140211"
-		    type       	"String"))
-	    language   	"Java")
-	(object Class "ExtensibleElement"
-	    quid       	"3AD5FCFA033A"
-	    documentation 	" WSDL allows elements representing a specific technology (referred to here as extensibility elements) under various elements defined by WSDL. This class represents a WSDL point of extensibility."
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AD5FE3C03D4"
-		    supplier   	"Logical View::wsdl::WSDLElement"
-		    quidu      	"3AD5C6A302DD"))
-	    operations 	(list Operations
-		(object Operation "getExtensibilityElements"
-		    quid       	"3B85C12C03CD"
-		    result     	"IList"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "addExtensibilityElement"
-		    quid       	"3B85C1470295"
-		    parameters 	(list Parameters
-			(object Parameter "extElement"
-			    type       	"IExtensibilityElement"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0))
-	    language   	"Java"
-	    abstract   	TRUE)
-	(object Class "Input"
-	    quid       	"3AE0789F0059"
-	    documentation 	"This class represents a WSDL input element. An input element specifies the abstract message format for the input of the operation."
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3B85C504025F"
-		    supplier   	"Logical View::wsdl::WSDLElement"
-		    quidu      	"3AD5C6A302DD")
-		(object Inheritance_Relationship
-		    quid       	"3F67722802E7"
-		    supplier   	"Logical View::wsdl::MessageReference"
-		    quidu      	"3F6771DB02DC")
-		(object Inheritance_Relationship
-		    quid       	"3F6F1FEE031D"
-		    supplier   	"Logical View::wsdl::IInput"
-		    quidu      	"3B84A7EE0015"))
-	    language   	"Java")
-	(object Class "Output"
-	    quid       	"3AE078B60232"
-	    documentation 	"This class represents a WSDL output element. An output element specifies the abstract message format for the output of the operation."
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3B85C50C035B"
-		    supplier   	"Logical View::wsdl::WSDLElement"
-		    quidu      	"3AD5C6A302DD")
-		(object Inheritance_Relationship
-		    quid       	"3F67723500DD"
-		    supplier   	"Logical View::wsdl::MessageReference"
-		    quidu      	"3F6771DB02DC")
-		(object Inheritance_Relationship
-		    quid       	"3F6F1FF801CD"
-		    supplier   	"Logical View::wsdl::IOutput"
-		    quidu      	"3B84A829027D"))
-	    language   	"Java")
-	(object Class "Fault"
-	    quid       	"3AE078BE0108"
-	    documentation 	"This class represents a WSDL fault element. Fault elements specify the abstract message format for any error messages that may be output as the result of the operation "
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AE1C82002F2"
-		    supplier   	"Logical View::wsdl::WSDLElement"
-		    quidu      	"3AD5C6A302DD")
-		(object Inheritance_Relationship
-		    quid       	"3F67723D0319"
-		    supplier   	"Logical View::wsdl::MessageReference"
-		    quidu      	"3F6771DB02DC")
-		(object Inheritance_Relationship
-		    quid       	"3F6F2002002D"
-		    supplier   	"Logical View::wsdl::IFault"
-		    quidu      	"3B84A861031D"))
-	    language   	"Java")
-	(object Class "BindingInput"
-	    quid       	"3AE08A8202D4"
-	    documentation 	"This class represents a WSDL input element within a operation within a binding. An input element within an operation within a binding specifies binding information for the input of the operation. "
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3B84AE1B0113"
-		    supplier   	"Logical View::wsdl::IBindingInput"
-		    quidu      	"3B84ADEB0100")
-		(object Inheritance_Relationship
-		    quid       	"3B85B59B0072"
-		    supplier   	"Logical View::wsdl::ExtensibleElement"
-		    quidu      	"3AD5FCFA033A"))
-	    operations 	(list Operations
-		(object Operation "getInput"
-		    quid       	"3C8653A40203"
-		    result     	"IInput"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "setInput"
-		    quid       	"3C8653B503A2"
-		    parameters 	(list Parameters
-			(object Parameter "input"
-			    type       	"IInput"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "name"
-		    quid       	"3B85C1EA020E"
-		    type       	"String"))
-	    language   	"Java")
-	(object Class "BindingOutput"
-	    quid       	"3AE08A8F028C"
-	    documentation 	"This class represents a WSDL output element within a operation within a binding. An output element within an operation within a binding specifies binding information for the output of the operation. "
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3B84AE4302AB"
-		    supplier   	"Logical View::wsdl::IBindingOutput"
-		    quidu      	"3B84AE210111")
-		(object Inheritance_Relationship
-		    quid       	"3B85B5A4027E"
-		    supplier   	"Logical View::wsdl::ExtensibleElement"
-		    quidu      	"3AD5FCFA033A"))
-	    operations 	(list Operations
-		(object Operation "getOutput"
-		    quid       	"3C8653D900F1"
-		    result     	"IOutput"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "setOutput"
-		    quid       	"3C8653F10326"
-		    parameters 	(list Parameters
-			(object Parameter "output"
-			    type       	"IOutput"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "name"
-		    quid       	"3B85C20200BE"
-		    type       	"String"))
-	    language   	"Java")
-	(object Class "BindingFault"
-	    quid       	"3AE08A9E03A6"
-	    documentation 	"This class represents a WSDL fault element within a operation within a binding. A fault element within an operation within a binding specifies binding information for the fault with the same name. "
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AE0938602C9"
-		    supplier   	"Logical View::wsdl::ExtensibleElement"
-		    quidu      	"3AD5FCFA033A")
-		(object Inheritance_Relationship
-		    quid       	"3B84AE710333"
-		    supplier   	"Logical View::wsdl::IBindingFault"
-		    quidu      	"3B84AE4F00BD"))
-	    operations 	(list Operations
-		(object Operation "getFault"
-		    quid       	"3C865413037F"
-		    result     	"IFault"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "setFault"
-		    quid       	"3C8654210109"
-		    parameters 	(list Parameters
-			(object Parameter "fault"
-			    type       	"IFault"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "name"
-		    quid       	"3B85BF9E014A"
-		    type       	"String"))
-	    language   	"Java")
-	(object Class "QName"
-	    quid       	"3AE8ED220140"
-	    documentation 	"This class represents the javax.wsdl.QName class. A QName is a fully qualified name."
-	    stereotype 	"datatype"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "javax.xml.namespace.QName"
-		    quid       	"3B849DA9003D"
-		    stereotype 	"javaclass"))
-	    language   	"Java")
-	(object Class "Namespace"
-	    quid       	"3AEA3CD30030"
-	    documentation 	"This class represents a namespace and the corresponding namespace prefix used in a WSDL document."
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "URI"
-		    quid       	"3AEA3D2901B1"
-		    type       	"String")
-		(object ClassAttribute "prefix"
-		    quid       	"3AEA3D320236"
-		    type       	"String"))
-	    language   	"Java")
-	(object Class "OperationType"
-	    quid       	"3AEB4782024F"
-	    documentation 	
-|ONE_WAY=1
-|REQUEST_RESPONSE=2
-|SOLICIT_RESPONSE=3
-|NOTIFICATION=4
-	    
-	    stereotype 	"datatype"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "javax.wsdl.OperationType"
-		    quid       	"3B85C35303E3"
-		    stereotype 	"javaclass"))
-	    language   	"Java")
-	(object Class "IPortType"
-	    quid       	"3B84A5BE0331"
-	    documentation 	"This class represents the javax.wsdl.PortType non-MOF interface."
-	    stereotype 	"Interface"
-	    operations 	(list Operations
-		(object Operation "addOperation"
-		    quid       	"3B896AC101CA"
-		    parameters 	(list Parameters
-			(object Parameter "operation"
-			    type       	"IOperation"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getOperation"
-		    quid       	"3B896BAF01A4"
-		    parameters 	(list Parameters
-			(object Parameter "name"
-			    type       	"String")
-			(object Parameter "inputName"
-			    type       	"String")
-			(object Parameter "outputName"
-			    type       	"String"))
-		    result     	"IOperation"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getOperations"
-		    quid       	"3B896BF7031A"
-		    result     	"IList"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "javax.wsdl.PortType"
-		    quid       	"3B84A632000D"
-		    stereotype 	"javaclass")))
-	(object Class "IOperation"
-	    quid       	"3B84A77600D1"
-	    documentation 	"This class represents the javax.wsdl.Operation non-MOF interface."
-	    stereotype 	"Interface"
-	    operations 	(list Operations
-		(object Operation "addFault"
-		    quid       	"3B896C420065"
-		    parameters 	(list Parameters
-			(object Parameter "fault"
-			    type       	"IFault"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getFault"
-		    quid       	"3B896C59028F"
-		    parameters 	(list Parameters
-			(object Parameter "name"
-			    type       	"String"))
-		    result     	"IFault"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getFaults"
-		    quid       	"3B896C7102B1"
-		    result     	"IMap"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getParameterOrdering"
-		    quid       	"3B896C8101B0"
-		    result     	"IList"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "setParameterOrdering"
-		    quid       	"3B896C99031D"
-		    parameters 	(list Parameters
-			(object Parameter "parameterOrder"
-			    type       	"IList"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getInput"
-		    quid       	"3C8654E5018D"
-		    result     	"IInput"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "setInput"
-		    quid       	"3C8662C40107"
-		    parameters 	(list Parameters
-			(object Parameter "input"
-			    type       	"IInput"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getOutput"
-		    quid       	"3C8662E40094"
-		    result     	"IOutput"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "setOutput"
-		    quid       	"3C8662F001D2"
-		    parameters 	(list Parameters
-			(object Parameter "output"
-			    type       	"IOutput"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "javax.wsdl.Operation"
-		    quid       	"3B84A799012B"
-		    stereotype 	"javaclass")))
-	(object Class "IInput"
-	    quid       	"3B84A7EE0015"
-	    documentation 	"This class represents the javax.wsdl.Input non-MOF interface."
-	    stereotype 	"Interface"
-	    operations 	(list Operations
-		(object Operation "getMessage"
-		    quid       	"3C86633100EF"
-		    result     	"IMessage"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "setMessage"
-		    quid       	"3C8663470277"
-		    parameters 	(list Parameters
-			(object Parameter "message"
-			    type       	"IMessage"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "javax.wsdl.Input"
-		    quid       	"3B84A8000039"
-		    stereotype 	"javaclass")))
-	(object Class "IOutput"
-	    quid       	"3B84A829027D"
-	    documentation 	"This class represents the javax.wsdl.Output non-MOF interface."
-	    stereotype 	"Interface"
-	    operations 	(list Operations
-		(object Operation "getMessage"
-		    quid       	"3C86643A035D"
-		    result     	"IMessage"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "setMessage"
-		    quid       	"3C86644501C8"
-		    parameters 	(list Parameters
-			(object Parameter "message"
-			    type       	"IMessage"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "javax.wsdl.Output"
-		    quid       	"3B84A83901D5"
-		    stereotype 	"javaclass")))
-	(object Class "IFault"
-	    quid       	"3B84A861031D"
-	    documentation 	"This class represents the javax.wsdl.Fault non-MOF interface."
-	    stereotype 	"Interface"
-	    operations 	(list Operations
-		(object Operation "getMessage"
-		    quid       	"3C86646A00BD"
-		    result     	"IMessage"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "setMessage"
-		    quid       	"3C8664750131"
-		    parameters 	(list Parameters
-			(object Parameter "message"
-			    type       	"IMessage"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "javax.wsdl.Fault"
-		    quid       	"3B84A8710208"
-		    stereotype 	"javaclass")))
-	(object Class "IMessage"
-	    quid       	"3B84A8AF004F"
-	    documentation 	"This class represents the javax.wsdl.Message non-MOF interface"
-	    stereotype 	"Interface"
-	    operations 	(list Operations
-		(object Operation "addPart"
-		    quid       	"3B8972240273"
-		    parameters 	(list Parameters
-			(object Parameter "part"
-			    type       	"IPart"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getPart"
-		    quid       	"3B89723D0233"
-		    parameters 	(list Parameters
-			(object Parameter "name"
-			    type       	"String"))
-		    result     	"IPart"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getParts"
-		    quid       	"3B897254025E"
-		    result     	"IMap"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getOrderedParts"
-		    quid       	"3B897261020D"
-		    parameters 	(list Parameters
-			(object Parameter "partOrder"
-			    type       	"IList"))
-		    result     	"IList"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "javax.wsdl.Message"
-		    quid       	"3B84A8BC0260"
-		    stereotype 	"javaclass")))
-	(object Class "IPart"
-	    quid       	"3B84A93F01BE"
-	    documentation 	"This class represents the javax.wsdl.Part non-MOF interface"
-	    stereotype 	"Interface"
-	    operations 	(list Operations
-		(object Operation "setExtensionAttribute"
-		    quid       	"3C4688450052"
-		    parameters 	(list Parameters
-			(object Parameter "name"
-			    type       	"QName")
-			(object Parameter "value"
-			    type       	"QName"))
-		    exceptions 	"WSDLException"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getExtensionAttributeNames"
-		    quid       	"3C468A0101C3"
-		    result     	"IIterator"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getExtensionAttribute"
-		    quid       	"3C468A2D02D5"
-		    parameters 	(list Parameters
-			(object Parameter "name"
-			    type       	"QName"))
-		    result     	"QName"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "javax.wsdl.Part"
-		    quid       	"3B84A9500231"
-		    stereotype 	"javaclass")))
-	(object Class "IService"
-	    quid       	"3B84AB490287"
-	    documentation 	"This class represents the javax.wsdl.Service non-MOF interface."
-	    stereotype 	"Interface"
-	    operations 	(list Operations
-		(object Operation "addPort"
-		    quid       	"3B895D5601D1"
-		    parameters 	(list Parameters
-			(object Parameter "port"
-			    type       	"IPort"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getPorts"
-		    quid       	"3B895DA20036"
-		    result     	"IMap"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getPort"
-		    quid       	"3B895DB001BC"
-		    parameters 	(list Parameters
-			(object Parameter "name"
-			    type       	"String"))
-		    result     	"IPort"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "javax.wsdl.Service"
-		    quid       	"3B84AB5B003E"
-		    stereotype 	"javaclass")))
-	(object Class "IPort"
-	    quid       	"3B84AB800326"
-	    documentation 	"This class represents the javax.wsdl.Port non-MOF interface."
-	    stereotype 	"Interface"
-	    operations 	(list Operations
-		(object Operation "getBinding"
-		    quid       	"3C8651F302B5"
-		    result     	"IBinding"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "setBinding"
-		    quid       	"3C86526302F2"
-		    parameters 	(list Parameters
-			(object Parameter "binding"
-			    type       	"IBinding"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "javax.wsdl.Port"
-		    quid       	"3B84AB8C0016"
-		    stereotype 	"javaclass")))
-	(object Class "IBinding"
-	    quid       	"3B84ABC60219"
-	    documentation 	"This class represents the javax.wsdl.Binding non-MOF interface."
-	    stereotype 	"Interface"
-	    operations 	(list Operations
-		(object Operation "addBindingOperation"
-		    quid       	"3B895F160153"
-		    parameters 	(list Parameters
-			(object Parameter "bindingOperation"
-			    type       	"IBindingOperation"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getBindingOperation"
-		    quid       	"3B895F500066"
-		    parameters 	(list Parameters
-			(object Parameter "name"
-			    type       	"String")
-			(object Parameter "inputName"
-			    type       	"String")
-			(object Parameter "outputName"
-			    type       	"String"))
-		    result     	"IBindingOperation"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getBindingOperations"
-		    quid       	"3B895FA401C5"
-		    result     	"IList"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getPortType"
-		    quid       	"3C8652A90284"
-		    result     	"IPortType"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "setPortType"
-		    quid       	"3C8652BE01A8"
-		    parameters 	(list Parameters
-			(object Parameter "portType"
-			    type       	"IPortType"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "javax.wsdl.Binding"
-		    quid       	"3B84ABCF0302"
-		    stereotype 	"javaclass")))
-	(object Class "IBindingOperation"
-	    quid       	"3B84ADC00072"
-	    documentation 	"This class represents the javax.wsdl.BindingOperation non-MOF interface."
-	    stereotype 	"Interface"
-	    operations 	(list Operations
-		(object Operation "addBindingFault"
-		    quid       	"3B8960BC0041"
-		    parameters 	(list Parameters
-			(object Parameter "bindingFault"
-			    type       	"IBindingFault"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getBindingFault"
-		    quid       	"3B8960D9009D"
-		    parameters 	(list Parameters
-			(object Parameter "name"
-			    type       	"String"))
-		    result     	"IBindingFault"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getBindingFaults"
-		    quid       	"3B8960FC0061"
-		    result     	"IMap"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getOperation"
-		    quid       	"3C86532D0017"
-		    result     	"IOperation"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "setOperation"
-		    quid       	"3C86533F037B"
-		    parameters 	(list Parameters
-			(object Parameter "operation"
-			    type       	"IOperation"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getBindingInput"
-		    quid       	"3C86550900DA"
-		    result     	"IBindingInput"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "setBindingInput"
-		    quid       	"3C86551D007F"
-		    parameters 	(list Parameters
-			(object Parameter "bindingInput"
-			    type       	"IBindingInput"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getBindingOutput"
-		    quid       	"3C8655340349"
-		    result     	"IBindingOutput"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "setBindingOutput"
-		    quid       	"3C86554702A6"
-		    parameters 	(list Parameters
-			(object Parameter "bindingOutput"
-			    type       	"IBindingOutput"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "javax.wsdl.BindingOperation"
-		    quid       	"3B84ADCB021C"
-		    stereotype 	"javaclass")))
-	(object Class "IBindingInput"
-	    quid       	"3B84ADEB0100"
-	    documentation 	"This class represents the javax.wsdl.BindingInput non-MOF interface."
-	    stereotype 	"Interface"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "javax.wsdl.BindingInput"
-		    quid       	"3B84ADFE000D"
-		    stereotype 	"javaclass")))
-	(object Class "IBindingOutput"
-	    quid       	"3B84AE210111"
-	    documentation 	"This class represents the javax.wsdl.BindingOutput non-MOF interface."
-	    stereotype 	"Interface"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "javax.wsdl.BindingOutput"
-		    quid       	"3B84AE2D0050"
-		    stereotype 	"javaclass")))
-	(object Class "IBindingFault"
-	    quid       	"3B84AE4F00BD"
-	    documentation 	"This class represents the javax.wsdl.BindingFault non-MOF interface."
-	    stereotype 	"Interface"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "javax.wsdl.BindingFault"
-		    quid       	"3B84AE5F002A"
-		    stereotype 	"javaclass")))
-	(object Class "DOMElement"
-	    quid       	"3B84AF3203DB"
-	    documentation 	"This class represents the org.w3c.dom.Element non-MOF interface."
-	    stereotype 	"datatype"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "org.w3c.dom.Element"
-		    quid       	"3B84AF560292"
-		    stereotype 	"javaclass")))
-	(object Class "IExtensibilityElement"
-	    quid       	"3B84B12402AB"
-	    documentation 	"This class represents the javax.wsdl.ExtensibilityElement non-MOF interface."
-	    stereotype 	"Interface"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "javax.wsdl.extensions.ExtensibilityElement"
-		    quid       	"3B84B13503D1"
-		    stereotype 	"javaclass")))
-	(object Class "IDefinition"
-	    quid       	"3B84B1D90142"
-	    documentation 	"This class represents the javax.wsdl.Definition non-MOF interface."
-	    stereotype 	"Interface"
-	    operations 	(list Operations
-		(object Operation "addBinding"
-		    quid       	"3B8988F1039D"
-		    parameters 	(list Parameters
-			(object Parameter "binding"
-			    type       	"IBinding"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "addImport"
-		    quid       	"3B8989490259"
-		    parameters 	(list Parameters
-			(object Parameter "importDef"
-			    type       	"IImport"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "addMessage"
-		    quid       	"3B89896E005E"
-		    parameters 	(list Parameters
-			(object Parameter "message"
-			    type       	"IMessage"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "addNamespace"
-		    quid       	"3B898984004B"
-		    parameters 	(list Parameters
-			(object Parameter "prefix"
-			    type       	"String")
-			(object Parameter "namespaceURI"
-			    type       	"String"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "addPortType"
-		    quid       	"3B8989C50045"
-		    parameters 	(list Parameters
-			(object Parameter "portType"
-			    type       	"IPortType"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "addService"
-		    quid       	"3B8989E401EE"
-		    parameters 	(list Parameters
-			(object Parameter "service"
-			    type       	"IService"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "createBindingFault"
-		    quid       	"3B898A17038C"
-		    result     	"IBindingFault"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "createBindingInput"
-		    quid       	"3B898A320286"
-		    result     	"IBindingInput"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "createBindingOutput"
-		    quid       	"3B898A46013B"
-		    result     	"IBindingOutput"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "createBindingOperation"
-		    quid       	"3B898A5C00B0"
-		    result     	"IBindingOperation"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "createBinding"
-		    quid       	"3B8989FE037C"
-		    result     	"IBinding"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "createFault"
-		    quid       	"3B898A7502E7"
-		    result     	"IFault"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "createImport"
-		    quid       	"3B898A83014C"
-		    result     	"IImport"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "createInput"
-		    quid       	"3B898A9D033E"
-		    result     	"IInput"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "createMessage"
-		    quid       	"3B898AAF0254"
-		    result     	"IMessage"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "createOperation"
-		    quid       	"3B898AC203C4"
-		    result     	"IOperation"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "createOutput"
-		    quid       	"3B898AE800ED"
-		    result     	"IOutput"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "createPart"
-		    quid       	"3B898AF8026D"
-		    result     	"IPart"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "createPort"
-		    quid       	"3B898B0801DA"
-		    result     	"IPort"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "createPortType"
-		    quid       	"3B898B15039B"
-		    result     	"IPortType"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "createService"
-		    quid       	"3B898B32013A"
-		    result     	"IService"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getBinding"
-		    quid       	"3B898B420075"
-		    parameters 	(list Parameters
-			(object Parameter "name"
-			    type       	"QName"))
-		    result     	"IBinding"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getBindings"
-		    quid       	"3B898B920341"
-		    result     	"IMap"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getImports"
-		    quid       	"3B898BCD0060"
-		    result     	"IMap"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getImports"
-		    quid       	"3B898BE70144"
-		    parameters 	(list Parameters
-			(object Parameter "namespaceURI"
-			    type       	"String"))
-		    result     	"IList"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getMessage"
-		    quid       	"3B898C170107"
-		    parameters 	(list Parameters
-			(object Parameter "name"
-			    type       	"QName"))
-		    result     	"IMessage"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getMessages"
-		    quid       	"3B898C3E001D"
-		    result     	"IMap"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getNamespace"
-		    quid       	"3B898C62014B"
-		    parameters 	(list Parameters
-			(object Parameter "prefix"
-			    type       	"String"))
-		    result     	"String"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getNamespaces"
-		    quid       	"3B898C740115"
-		    result     	"IMap"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getPortType"
-		    quid       	"3B898CBE0071"
-		    parameters 	(list Parameters
-			(object Parameter "name"
-			    type       	"QName"))
-		    result     	"IPortType"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getPortTypes"
-		    quid       	"3B898CDA01C6"
-		    result     	"IMap"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getPrefix"
-		    quid       	"3B898CFD0017"
-		    parameters 	(list Parameters
-			(object Parameter "namespaceURI"
-			    type       	"String"))
-		    result     	"String"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getService"
-		    quid       	"3B898D2300A8"
-		    parameters 	(list Parameters
-			(object Parameter "name"
-			    type       	"QName"))
-		    result     	"IService"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getServices"
-		    quid       	"3B898D3B03CE"
-		    result     	"IMap"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getExtensionRegistry"
-		    quid       	"3B89D5B8012B"
-		    result     	"IExtensionRegistry"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "setExtensionRegistry"
-		    quid       	"3B89D5D703BB"
-		    parameters 	(list Parameters
-			(object Parameter "extensionRegistry"
-			    type       	"IExtensionRegistry"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getDocumentBaseURI"
-		    quid       	"3B89D5FE0208"
-		    result     	"String"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "setDocumentBaseURI"
-		    quid       	"3B89D6180328"
-		    parameters 	(list Parameters
-			(object Parameter "documentBase"
-			    type       	"String"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "createTypes"
-		    quid       	"3CADD0560080"
-		    result     	"ITypes"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "removeService"
-		    quid       	"3CADD07E004C"
-		    parameters 	(list Parameters
-			(object Parameter "name"
-			    type       	"QName"))
-		    result     	"IService"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "removeBinding"
-		    quid       	"3CADD0BA0355"
-		    parameters 	(list Parameters
-			(object Parameter "name"
-			    type       	"QName"))
-		    result     	"IBinding"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "removePortType"
-		    quid       	"3CADD0D8029A"
-		    parameters 	(list Parameters
-			(object Parameter "name"
-			    type       	"QName"))
-		    result     	"IPortType"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "removeMessage"
-		    quid       	"3CADD0FA0307"
-		    parameters 	(list Parameters
-			(object Parameter "name"
-			    type       	"QName"))
-		    result     	"IMessage"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getTypes"
-		    quid       	"3C86706F031B"
-		    result     	"ITypes"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "setTypes"
-		    quid       	"3C86709500EE"
-		    parameters 	(list Parameters
-			(object Parameter "types"
-			    type       	"ITypes"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "javax.wsdl.Definition"
-		    quid       	"3B84B1E702A1"
-		    stereotype 	"javaclass")))
-	(object Class "IImport"
-	    quid       	"3B84B2020119"
-	    documentation 	"This class represents the javax.wsdl.Import non-MOF interface."
-	    stereotype 	"Interface"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "javax.wsdl.Import"
-		    quid       	"3B84B20C02EA"
-		    stereotype 	"javaclass")))
-	(object Class "IList"
-	    quid       	"3B85C0A203C5"
-	    documentation 	"This class represents the non-MOF java.util.List interface."
-	    stereotype 	"Interface"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "java.util.List"
-		    quid       	"3B85C0AF0297"
-		    stereotype 	"javaclass")))
-	(object Class "IMap"
-	    quid       	"3B896B0300D4"
-	    documentation 	"This class represents the non-MOF java.util.Map interface."
-	    stereotype 	"Interface"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "java.util.Map"
-		    quid       	"3B896B1102B5"
-		    stereotype 	"javaclass")))
-	(object Class "IURL"
-	    quid       	"3B89D5630274"
-	    documentation 	"This class represents the non-MOF java.net.URL interface."
-	    stereotype 	"Interface"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "java.net.URL"
-		    quid       	"3B89D56E03E2"
-		    stereotype 	"javaclass")))
-	(object Class "IExtensionRegistry"
-	    quid       	"3B89D59302A5"
-	    documentation 	"This class represents the non-MOF javax.wsdl.extensions.ExtensionRegistry interface."
-	    stereotype 	"Interface"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "javax.wsdl.extensions.ExtensionRegistry"
-		    quid       	"3B89D59F02E8"
-		    stereotype 	"javaclass")))
-	(object Class "Types"
-	    quid       	"3B8BE9A603A8"
-	    documentation 	"This class represents a WSDL types element. The types element encloses data type definitions that are relevant for the exchanged messages."
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3B8BEB010311"
-		    supplier   	"Logical View::wsdl::ExtensibleElement"
-		    quidu      	"3AD5FCFA033A")
-		(object Inheritance_Relationship
-		    quid       	"3CADCD3B0380"
-		    supplier   	"Logical View::wsdl::ITypes"
-		    quidu      	"3CADCBB20050"))
-	    operations 	(list Operations
-		(object Operation "getSchemas"
-		    quid       	"3CADCF3803E6"
-		    result     	"IList"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getSchemas"
-		    quid       	"3CADCF7E0301"
-		    parameters 	(list Parameters
-			(object Parameter "namespaceURI"
-			    type       	"String"))
-		    result     	"IList"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)))
-	(object Class "IIterator"
-	    quid       	"3C4687DA0167"
-	    documentation 	"This class represents the non-MOF java.util.Iterator interface."
-	    stereotype 	"Interface"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "java.util.Iterator"
-		    quid       	"3C46880800B9"
-		    stereotype 	"javaclass")))
-	(object Class "WSDLException"
-	    quid       	"3C4689650313"
-	    documentation 	"This class represents the javax.wsdl.Exception class."
-	    stereotype 	"datatype"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "javax.wsdl.WSDLException"
-		    quid       	"3C4689740315"
-		    stereotype 	"javaclass")))
-	(object Class "ITypes"
-	    quid       	"3CADCBB20050"
-	    documentation 	"This class represents the javax.wsdl.Types non-MOF interface"
-	    stereotype 	"Interface"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "javax.wsdl.Types"
-		    quid       	"3CADCBF10173"
-		    stereotype 	"javaclass")))
-	(object Class "UnknownExtensibilityElement"
-	    quid       	"3CB24AC002AE"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3CB24AEC01CB"
-		    supplier   	"Logical View::wsdl::ExtensibilityElement"
-		    quidu      	"3AD5DBB602A9")))
-	(object Class "XSDSchemaExtensibilityElement"
-	    quid       	"3CC360D7039C"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3CC3627F00B7"
-		    supplier   	"Logical View::wsdl::ExtensibilityElement"
-		    quidu      	"3AD5DBB602A9")))
-	(object Class "DOMDocument"
-	    quid       	"3CD1502C023B"
-	    documentation 	"This class represents the org.w3c.dom.Document non-MOF interface."
-	    stereotype 	"datatype"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "org.w3c.dom.Document"
-		    quid       	"3CD150600182"
-		    stereotype 	"javaclass")))
-	(object Class "MessageReference"
-	    quid       	"3F6771DB02DC"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3F762A6A0308"
-		    supplier   	"Logical View::wsdl::WSDLElement"
-		    quidu      	"3AD5C6A302DD"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "name"
-		    quid       	"3F6780A001AB"
-		    type       	"String"
-		    exportControl 	"Protected"))
-	    language   	"Java"
-	    abstract   	TRUE)
-	(object Association "$UNNAMED$0"
-	    quid       	"3AD5C824018C"
-	    roles      	(list role_list
-		(object Role "portType"
-		    quid       	"3AD5C82701C3"
-		    label      	"portType"
-		    supplier   	"Logical View::wsdl::PortType"
-		    quidu      	"3AD5C7F001A5"
-		    client_cardinality 	(value cardinality "1..1")
-		    Containment 	"By Value"
-		    is_aggregate 	TRUE)
-		(object Role "eOperations"
-		    quid       	"3AD5C82701CD"
-		    label      	"eOperations"
-		    supplier   	"Logical View::wsdl::Operation"
-		    quidu      	"3AD5C80D03CE"
-		    client_cardinality 	(value cardinality "0..n")
-		    Constraints 	"ordered"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)))
-	(object Association "$UNNAMED$1"
-	    quid       	"3AD5CEBE00E2"
-	    roles      	(list role_list
-		(object Role "$UNNAMED$2"
-		    quid       	"3AD5CEBF0057"
-		    supplier   	"Logical View::wsdl::Message"
-		    quidu      	"3AD5C9590078"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_aggregate 	TRUE)
-		(object Role "eParts"
-		    quid       	"3AD5CEBF0061"
-		    label      	"eParts"
-		    supplier   	"Logical View::wsdl::Part"
-		    quidu      	"3AD5CE1C032E"
-		    client_cardinality 	(value cardinality "0..n")
-		    Constraints 	"ordered"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)))
-	(object Association "$UNNAMED$3"
-	    quid       	"3AD5D352010F"
-	    roles      	(list role_list
-		(object Role "ePortType"
-		    quid       	"3AD5D3540176"
-		    label      	"ePortType"
-		    supplier   	"Logical View::wsdl::PortType"
-		    quidu      	"3AD5C7F001A5"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$4"
-		    quid       	"3AD5D3540180"
-		    supplier   	"Logical View::wsdl::Binding"
-		    quidu      	"3AD5D2860261")))
-	(object Association "$UNNAMED$5"
-	    quid       	"3AD5D3E10179"
-	    roles      	(list role_list
-		(object Role "$UNNAMED$6"
-		    quid       	"3AD5D3E20225"
-		    supplier   	"Logical View::wsdl::Binding"
-		    quidu      	"3AD5D2860261"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_aggregate 	TRUE)
-		(object Role "eBindingOperations"
-		    quid       	"3AD5D3E20239"
-		    label      	"eBindingOperations"
-		    supplier   	"Logical View::wsdl::BindingOperation"
-		    quidu      	"3AD5D3CB0145"
-		    client_cardinality 	(value cardinality "0..n")
-		    Constraints 	"ordered"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)))
-	(object Association "$UNNAMED$7"
-	    quid       	"3AD5D425038A"
-	    roles      	(list role_list
-		(object Role "eOperation"
-		    quid       	"3AD5D42602F5"
-		    label      	"eOperation"
-		    supplier   	"Logical View::wsdl::Operation"
-		    quidu      	"3AD5C80D03CE"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$8"
-		    quid       	"3AD5D42602FF"
-		    supplier   	"Logical View::wsdl::BindingOperation"
-		    quidu      	"3AD5D3CB0145")))
-	(object Association "$UNNAMED$9"
-	    quid       	"3AD5D9400393"
-	    roles      	(list role_list
-		(object Role "ePorts"
-		    quid       	"3AD5D941031C"
-		    label      	"ePorts"
-		    supplier   	"Logical View::wsdl::Port"
-		    quidu      	"3AD5D9170286"
-		    client_cardinality 	(value cardinality "0..n")
-		    Constraints 	"ordered"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$10"
-		    quid       	"3AD5D941031D"
-		    supplier   	"Logical View::wsdl::Service"
-		    quidu      	"3AD5D8F002F8"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$11"
-	    quid       	"3AD5D9B8011F"
-	    roles      	(list role_list
-		(object Role "eBinding"
-		    quid       	"3AD5D9B9024D"
-		    label      	"eBinding"
-		    supplier   	"Logical View::wsdl::Binding"
-		    quidu      	"3AD5D2860261"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$12"
-		    quid       	"3AD5D9B90261"
-		    supplier   	"Logical View::wsdl::Port"
-		    quidu      	"3AD5D9170286")))
-	(object Association "$UNNAMED$13"
-	    quid       	"3AD5E60301E2"
-	    roles      	(list role_list
-		(object Role "$UNNAMED$14"
-		    quid       	"3AD5E60400B7"
-		    supplier   	"Logical View::wsdl::Definition"
-		    quidu      	"3AD5E43F008E"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_aggregate 	TRUE)
-		(object Role "eMessages"
-		    quid       	"3AD5E60400C1"
-		    label      	"eMessages"
-		    supplier   	"Logical View::wsdl::Message"
-		    quidu      	"3AD5C9590078"
-		    client_cardinality 	(value cardinality "0..n")
-		    Constraints 	"ordered"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)))
-	(object Association "$UNNAMED$15"
-	    quid       	"3AD5E6710104"
-	    roles      	(list role_list
-		(object Role "$UNNAMED$16"
-		    quid       	"3AD5E672034A"
-		    supplier   	"Logical View::wsdl::Definition"
-		    quidu      	"3AD5E43F008E"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_aggregate 	TRUE)
-		(object Role "ePortTypes"
-		    quid       	"3AD5E6720354"
-		    label      	"ePortTypes"
-		    supplier   	"Logical View::wsdl::PortType"
-		    quidu      	"3AD5C7F001A5"
-		    client_cardinality 	(value cardinality "0..n")
-		    Constraints 	"ordered"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)))
-	(object Association "$UNNAMED$17"
-	    quid       	"3AD5E6770095"
-	    roles      	(list role_list
-		(object Role "$UNNAMED$18"
-		    quid       	"3AD5E6780371"
-		    supplier   	"Logical View::wsdl::Definition"
-		    quidu      	"3AD5E43F008E"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_aggregate 	TRUE)
-		(object Role "eBindings"
-		    quid       	"3AD5E678037B"
-		    label      	"eBindings"
-		    supplier   	"Logical View::wsdl::Binding"
-		    quidu      	"3AD5D2860261"
-		    client_cardinality 	(value cardinality "0..n")
-		    Constraints 	"ordered"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)))
-	(object Association "$UNNAMED$19"
-	    quid       	"3AD5E67B0311"
-	    roles      	(list role_list
-		(object Role "$UNNAMED$20"
-		    quid       	"3AD5E67D007F"
-		    supplier   	"Logical View::wsdl::Definition"
-		    quidu      	"3AD5E43F008E"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_aggregate 	TRUE)
-		(object Role "eServices"
-		    quid       	"3AD5E67D0089"
-		    label      	"eServices"
-		    supplier   	"Logical View::wsdl::Service"
-		    quidu      	"3AD5D8F002F8"
-		    client_cardinality 	(value cardinality "0..n")
-		    Constraints 	"ordered"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)))
-	(object Association "$UNNAMED$21"
-	    quid       	"3AD5FD130079"
-	    roles      	(list role_list
-		(object Role "eExtensibilityElements"
-		    quid       	"3AD5FD14019D"
-		    label      	"eExtensibilityElements"
-		    supplier   	"Logical View::wsdl::ExtensibilityElement"
-		    quidu      	"3AD5DBB602A9"
-		    client_cardinality 	(value cardinality "0..n")
-		    Constraints 	"ordered"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$22"
-		    quid       	"3AD5FD14019E"
-		    supplier   	"Logical View::wsdl::ExtensibleElement"
-		    quidu      	"3AD5FCFA033A"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$23"
-	    quid       	"3ADF2E6401F5"
-	    roles      	(list role_list
-		(object Role "eBindingInput"
-		    quid       	"3ADF2E650251"
-		    label      	"eBindingInput"
-		    supplier   	"Logical View::wsdl::BindingInput"
-		    quidu      	"3AE08A8202D4"
-		    client_cardinality 	(value cardinality "0..1")
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$24"
-		    quid       	"3ADF2E650252"
-		    supplier   	"Logical View::wsdl::BindingOperation"
-		    quidu      	"3AD5D3CB0145"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$25"
-	    quid       	"3ADF2EB30163"
-	    roles      	(list role_list
-		(object Role "eBindingOutput"
-		    quid       	"3ADF2EB4013C"
-		    label      	"eBindingOutput"
-		    supplier   	"Logical View::wsdl::BindingOutput"
-		    quidu      	"3AE08A8F028C"
-		    client_cardinality 	(value cardinality "0..1")
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$26"
-		    quid       	"3ADF2EB4013D"
-		    supplier   	"Logical View::wsdl::BindingOperation"
-		    quidu      	"3AD5D3CB0145"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$27"
-	    quid       	"3ADF2F94024D"
-	    roles      	(list role_list
-		(object Role "eInput"
-		    quid       	"3ADF2F950190"
-		    label      	"eInput"
-		    supplier   	"Logical View::wsdl::Input"
-		    quidu      	"3AE0789F0059"
-		    client_cardinality 	(value cardinality "0..1")
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$28"
-		    quid       	"3ADF2F95019A"
-		    supplier   	"Logical View::wsdl::Operation"
-		    quidu      	"3AD5C80D03CE"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$29"
-	    quid       	"3ADF2FB802F9"
-	    roles      	(list role_list
-		(object Role "eOutput"
-		    quid       	"3ADF2FB9020A"
-		    label      	"eOutput"
-		    supplier   	"Logical View::wsdl::Output"
-		    quidu      	"3AE078B60232"
-		    client_cardinality 	(value cardinality "0..1")
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$30"
-		    quid       	"3ADF2FB9020B"
-		    supplier   	"Logical View::wsdl::Operation"
-		    quidu      	"3AD5C80D03CE"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$31"
-	    quid       	"3ADF331601A4"
-	    roles      	(list role_list
-		(object Role "eFaults"
-		    quid       	"3ADF33180387"
-		    label      	"eFaults"
-		    supplier   	"Logical View::wsdl::Fault"
-		    quidu      	"3AE078BE0108"
-		    client_cardinality 	(value cardinality "0..n")
-		    Constraints 	"ordered"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$32"
-		    quid       	"3ADF33180388"
-		    supplier   	"Logical View::wsdl::Operation"
-		    quidu      	"3AD5C80D03CE"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$33"
-	    quid       	"3ADF340003E5"
-	    roles      	(list role_list
-		(object Role "eBindingFaults"
-		    quid       	"3ADF340103AA"
-		    label      	"eBindingFaults"
-		    supplier   	"Logical View::wsdl::BindingFault"
-		    quidu      	"3AE08A9E03A6"
-		    client_cardinality 	(value cardinality "0..n")
-		    Constraints 	"ordered"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$34"
-		    quid       	"3ADF340103AB"
-		    supplier   	"Logical View::wsdl::BindingOperation"
-		    quidu      	"3AD5D3CB0145"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$35"
-	    quid       	"3AE091F402F3"
-	    roles      	(list role_list
-		(object Role "eFault"
-		    quid       	"3AE091F801FE"
-		    label      	"eFault"
-		    supplier   	"Logical View::wsdl::Fault"
-		    quidu      	"3AE078BE0108"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$36"
-		    quid       	"3AE091F801FF"
-		    supplier   	"Logical View::wsdl::BindingFault"
-		    quidu      	"3AE08A9E03A6")))
-	(object Association "$UNNAMED$37"
-	    quid       	"3AEA3D55002D"
-	    roles      	(list role_list
-		(object Role "$UNNAMED$38"
-		    quid       	"3AEA3D560328"
-		    supplier   	"Logical View::wsdl::Definition"
-		    quidu      	"3AD5E43F008E"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_aggregate 	TRUE)
-		(object Role "eNamespaces"
-		    quid       	"3AEA3D560332"
-		    label      	"eNamespaces"
-		    supplier   	"Logical View::wsdl::Namespace"
-		    quidu      	"3AEA3CD30030"
-		    client_cardinality 	(value cardinality "0..n")
-		    Constraints 	"ordered"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)))
-	(object Association "$UNNAMED$39"
-	    quid       	"3AEA3E3A002D"
-	    roles      	(list role_list
-		(object Role "eDefinition"
-		    quid       	"3AEA3E3C01E8"
-		    label      	"eDefinition"
-		    supplier   	"Logical View::wsdl::Definition"
-		    quidu      	"3AD5E43F008E"
-		    client_cardinality 	(value cardinality "0..1")
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$40"
-		    quid       	"3AEA3E3C01F2"
-		    supplier   	"Logical View::wsdl::Import"
-		    quidu      	"3AD5E4F903DE")))
-	(object Association "$UNNAMED$41"
-	    quid       	"3AEA412F0035"
-	    roles      	(list role_list
-		(object Role "eParameterOrdering"
-		    quid       	"3AEA41310255"
-		    label      	"eParameterOrdering"
-		    supplier   	"Logical View::wsdl::Part"
-		    quidu      	"3AD5CE1C032E"
-		    client_cardinality 	(value cardinality "0..n")
-		    Constraints 	"ordered"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$42"
-		    quid       	"3AEA4131025F"
-		    supplier   	"Logical View::wsdl::Operation"
-		    quidu      	"3AD5C80D03CE")))
-	(object Association "$UNNAMED$43"
-	    quid       	"3B84AD2400BD"
-	    roles      	(list role_list
-		(object Role "eInput"
-		    quid       	"3B84AD250083"
-		    label      	"eInput"
-		    supplier   	"Logical View::wsdl::Input"
-		    quidu      	"3AE0789F0059"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$44"
-		    quid       	"3B84AD250084"
-		    supplier   	"Logical View::wsdl::BindingInput"
-		    quidu      	"3AE08A8202D4")))
-	(object Association "$UNNAMED$45"
-	    quid       	"3B84AD7900F2"
-	    roles      	(list role_list
-		(object Role "eOutput"
-		    quid       	"3B84AD7A014D"
-		    label      	"eOutput"
-		    supplier   	"Logical View::wsdl::Output"
-		    quidu      	"3AE078B60232"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$46"
-		    quid       	"3B84AD7A014E"
-		    supplier   	"Logical View::wsdl::BindingOutput"
-		    quidu      	"3AE08A8F028C")))
-	(object Association "$UNNAMED$47"
-	    quid       	"3B8B1BE900C4"
-	    roles      	(list role_list
-		(object Role "typeDefinition"
-		    quid       	"3B8B1BE90327"
-		    label      	"typeDefinition"
-		    supplier   	"Logical View::xsd::XSDTypeDefinition"
-		    quidu      	"3B66ECD302A9"
-		    client_cardinality 	(value cardinality "0..1")
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$48"
-		    quid       	"3B8B1BE90331"
-		    supplier   	"Logical View::wsdl::Part"
-		    quidu      	"3AD5CE1C032E")))
-	(object Association "$UNNAMED$49"
-	    quid       	"3B8B1C1203B2"
-	    roles      	(list role_list
-		(object Role "elementDeclaration"
-		    quid       	"3B8B1C14001C"
-		    label      	"elementDeclaration"
-		    supplier   	"Logical View::xsd::XSDElementDeclaration"
-		    quidu      	"3B66ED580214"
-		    client_cardinality 	(value cardinality "0..1")
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$50"
-		    quid       	"3B8B1C140026"
-		    supplier   	"Logical View::wsdl::Part"
-		    quidu      	"3AD5CE1C032E")))
-	(object Association "$UNNAMED$51"
-	    quid       	"3B8B1DCC02E5"
-	    roles      	(list role_list
-		(object Role "eSchema"
-		    quid       	"3B8B1DCE0270"
-		    label      	"eSchema"
-		    supplier   	"Logical View::xsd::XSDSchema"
-		    quidu      	"374B182500BB"
-		    client_cardinality 	(value cardinality "0..1")
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$52"
-		    quid       	"3B8B1DCE027A"
-		    supplier   	"Logical View::wsdl::Import"
-		    quidu      	"3AD5E4F903DE")))
-	(object Association "$UNNAMED$53"
-	    quid       	"3B8BEA27029F"
-	    roles      	(list role_list
-		(object Role "$UNNAMED$54"
-		    quid       	"3B8BEA290356"
-		    supplier   	"Logical View::wsdl::Definition"
-		    quidu      	"3AD5E43F008E"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_aggregate 	TRUE)
-		(object Role "eTypes"
-		    quid       	"3B8BEA29036A"
-		    label      	"eTypes"
-		    supplier   	"Logical View::wsdl::Types"
-		    quidu      	"3B8BE9A603A8"
-		    client_cardinality 	(value cardinality "0..1")
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)))
-	(object Association "$UNNAMED$55"
-	    quid       	"3C46829303E5"
-	    roles      	(list role_list
-		(object Role "eMessage"
-		    quid       	"3C468296010E"
-		    label      	"eMessage"
-		    supplier   	"Logical View::wsdl::Message"
-		    quidu      	"3AD5C9590078"
-		    client_cardinality 	(value cardinality "0..1")
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$56"
-		    quid       	"3C4682960118"
-		    supplier   	"Logical View::wsdl::Part"
-		    quidu      	"3AD5CE1C032E")))
-	(object Association "$UNNAMED$57"
-	    quid       	"3C864DFF02EC"
-	    roles      	(list role_list
-		(object Role "eImports"
-		    quid       	"3C864DFF02ED"
-		    label      	"eImports"
-		    supplier   	"Logical View::wsdl::Import"
-		    quidu      	"3AD5E4F903DE"
-		    client_cardinality 	(value cardinality "0..n")
-		    Constraints 	"ordered"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$58"
-		    quid       	"3C864DFF02EE"
-		    supplier   	"Logical View::wsdl::Definition"
-		    quidu      	"3AD5E43F008E"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$59"
-	    quid       	"3CC3614500F2"
-	    roles      	(list role_list
-		(object Role "$UNNAMED$60"
-		    quid       	"3CC36146023D"
-		    supplier   	"Logical View::wsdl::XSDSchemaExtensibilityElement"
-		    quidu      	"3CC360D7039C"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_aggregate 	TRUE)
-		(object Role "schema"
-		    quid       	"3CC36146023E"
-		    label      	"schema"
-		    supplier   	"Logical View::xsd::XSDSchema"
-		    quidu      	"374B182500BB"
-		    client_cardinality 	(value cardinality "0..1")
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)))
-	(object Association "$UNNAMED$61"
-	    quid       	"3F74E78401B1"
-	    roles      	(list role_list
-		(object Role "eMessage"
-		    quid       	"3F74E786000F"
-		    label      	"eMessage"
-		    supplier   	"Logical View::wsdl::Message"
-		    quidu      	"3AD5C9590078"
-		    client_cardinality 	(value cardinality "1")
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$62"
-		    quid       	"3F74E7860023"
-		    supplier   	"Logical View::wsdl::MessageReference"
-		    quidu      	"3F6771DB02DC")))
-	(object Association "$UNNAMED$63"
-	    quid       	"3F7896A2026E"
-	    roles      	(list role_list
-		(object Role "parent"
-		    quid       	"3F7896A7012B"
-		    label      	"parent"
-		    supplier   	"Logical View::wsdl::UnknownExtensibilityElement"
-		    quidu      	"3CB24AC002AE"
-		    client_cardinality 	(value cardinality "0..1")
-		    is_navigable 	TRUE)
-		(object Role "children"
-		    quid       	"3F7896A7012C"
-		    label      	"children"
-		    supplier   	"Logical View::wsdl::UnknownExtensibilityElement"
-		    quidu      	"3CB24AC002AE"
-		    client_cardinality 	(value cardinality "0..n")
-		    is_navigable 	TRUE))))
-    logical_presentations 	(list unit_reference_list
-	(object ClassDiagram "2.7 Services"
-	    quid       	"39AD3EF60127"
-	    title      	"2.7 Services"
-	    zoom       	90
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	0
-	    origin_y   	0
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::wsdl::IBinding" @1
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1424, 800)
-		    label      	(object ItemLabel
-			Parent_View 	@1
-			location   	(1173, 660)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	502
-			justify    	0
-			label      	"IBinding")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@1
-			location   	(1173, 610)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	502
-			justify    	0
-			label      	"<<Interface>>")
-		    icon       	"Interface"
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B84ABC60219"
-		    width      	520
-		    height     	404
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::IPort" @2
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(816, 528)
-		    label      	(object ItemLabel
-			Parent_View 	@2
-			location   	(686, 481)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	260
-			justify    	0
-			label      	"IPort")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@2
-			location   	(686, 431)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	260
-			justify    	0
-			label      	"<<Interface>>")
-		    icon       	"Interface"
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B84AB800326"
-		    width      	278
-		    height     	218
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::IService" @3
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressAttribute 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(240, 160)
-		    label      	(object ItemLabel
-			Parent_View 	@3
-			location   	(126, 90)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	228
-			justify    	0
-			label      	"IService")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@3
-			location   	(126, 40)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	228
-			justify    	0
-			label      	"<<Interface>>")
-		    icon       	"Interface"
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B84AB490287"
-		    width      	246
-		    height     	264
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::Service" @4
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(240, 528)
-		    label      	(object ItemLabel
-			Parent_View 	@4
-			location   	(44, 389)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	392
-			justify    	0
-			label      	"Service")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5D8F002F8"
-		    width      	410
-		    height     	302
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @5
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B85954E01B4"
-		    client     	@4
-		    supplier   	@3
-		    line_style 	3
-		    origin_attachment 	(240, 377)
-		    terminal_attachment 	(240, 292))
-		(object ClassView "Class" "Logical View::wsdl::Binding" @6
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1440, 1264)
-		    label      	(object ItemLabel
-			Parent_View 	@6
-			location   	(1244, 1125)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	392
-			justify    	0
-			label      	"Binding")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5D2860261"
-		    width      	410
-		    height     	302
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @7
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B8595410129"
-		    client     	@6
-		    supplier   	@1
-		    line_style 	3
-		    origin_attachment 	(1430, 1113)
-		    terminal_attachment 	(1430, 1002))
-		(object ClassView "Class" "Logical View::wsdl::Port" @8
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(816, 912)
-		    label      	(object ItemLabel
-			Parent_View 	@8
-			location   	(675, 840)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	282
-			justify    	0
-			label      	"Port")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5D9170286"
-		    width      	300
-		    height     	168
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @9
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B85954502C9"
-		    client     	@8
-		    supplier   	@2
-		    line_style 	3
-		    origin_attachment 	(809, 828)
-		    terminal_attachment 	(809, 637))
-		(object AssociationViewNew "$UNNAMED$9" @10
-		    location   	(343, 916)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD5D9400393"
-		    roleview_list 	(list RoleViews
-			(object RoleView "ePorts" @11
-			    Parent_View 	@10
-			    location   	(-121, 644)
-			    label      	(object SegLabel @12
-				Parent_View 	@11
-				location   	(413, 945)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	192
-				justify    	0
-				label      	"+ePorts"
-				pctDist    	0.218978
-				height     	29
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5D941031C"
-			    client     	@10
-			    supplier   	@8
-			    line_style 	3
-			    origin_attachment 	(343, 916)
-			    terminal_attachment 	(666, 916)
-			    label      	(object SegLabel @13
-				Parent_View 	@11
-				location   	(539, 880)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	160
-				justify    	0
-				label      	"0..*"
-				pctDist    	0.608000
-				height     	37
-				orientation 	0)
-			    label      	(object SegLabel @14
-				Parent_View 	@11
-				location   	(448, 990)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	146
-				justify    	0
-				label      	"{ordered}"
-				pctDist    	0.328467
-				height     	74
-				orientation 	1))
-			(object RoleView "$UNNAMED$10" @15
-			    Parent_View 	@10
-			    location   	(-121, 644)
-			    label      	(object SegLabel @16
-				Parent_View 	@15
-				location   	(216, 744)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	60
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5D941031D"
-			    client     	@10
-			    supplier   	@4
-			    vertices   	(list Points
-				(343, 916)
-				(257, 916)
-				(257, 679))
-			    line_style 	3
-			    origin_attachment 	(343, 916)
-			    terminal_attachment 	(257, 679)
-			    label      	(object SegLabel @17
-				Parent_View 	@15
-				location   	(301, 796)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.637097
-				height     	44
-				orientation 	1))))
-		(object AssociationViewNew "$UNNAMED$11" @18
-		    location   	(886, 1270)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD5D9B8011F"
-		    roleview_list 	(list RoleViews
-			(object RoleView "eBinding" @19
-			    Parent_View 	@18
-			    location   	(38, 422)
-			    label      	(object SegLabel @20
-				Parent_View 	@19
-				location   	(1112, 1235)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	180
-				justify    	0
-				label      	"+eBinding"
-				pctDist    	0.648571
-				height     	36
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5D9B9024D"
-			    client     	@18
-			    supplier   	@6
-			    line_style 	3
-			    origin_attachment 	(886, 1270)
-			    terminal_attachment 	(1235, 1270)
-			    label      	(object SegLabel @21
-				Parent_View 	@19
-				location   	(1170, 1313)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.814286
-				height     	43
-				orientation 	1))
-			(object RoleView "$UNNAMED$12" @22
-			    Parent_View 	@18
-			    location   	(38, 422)
-			    label      	(object SegLabel @23
-				Parent_View 	@22
-				location   	(852, 1106)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	156
-				justify    	0
-				label      	""
-				pctDist    	0.687943
-				height     	40
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5D9B90261"
-			    client     	@18
-			    supplier   	@8
-			    vertices   	(list Points
-				(886, 1270)
-				(812, 1270)
-				(812, 996))
-			    line_style 	3
-			    origin_attachment 	(886, 1270)
-			    terminal_attachment 	(812, 996))))))
-	(object ClassDiagram "2.5 Bindings"
-	    quid       	"39AD51270252"
-	    title      	"2.5 Bindings"
-	    zoom       	85
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	0
-	    origin_y   	0
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::wsdl::IBinding" @24
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressAttribute 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(304, 240)
-		    label      	(object ItemLabel
-			Parent_View 	@24
-			location   	(73, 114)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	462
-			justify    	0
-			label      	"IBinding")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@24
-			location   	(73, 64)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	462
-			justify    	0
-			label      	"<<Interface>>")
-		    icon       	"Interface"
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B84ABC60219"
-		    width      	480
-		    height     	376
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::IBindingOperation" @25
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressAttribute 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(976, 352)
-		    label      	(object ItemLabel
-			Parent_View 	@25
-			location   	(780, 130)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	392
-			justify    	0
-			label      	"IBindingOperation")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@25
-			location   	(780, 80)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	392
-			justify    	0
-			label      	"<<Interface>>")
-		    icon       	"Interface"
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B84ADC00072"
-		    width      	410
-		    height     	568
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::IBindingInput" @26
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(192, 1360)
-		    label      	(object ItemLabel
-			Parent_View 	@26
-			location   	(62, 1334)
-			fill_color 	16777215
-			nlines     	1
-			max_width  	260
-			justify    	0
-			label      	"IBindingInput")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@26
-			location   	(62, 1284)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	260
-			justify    	0
-			label      	"<<Interface>>")
-		    icon       	"Interface"
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B84ADEB0100"
-		    width      	278
-		    height     	176
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::IBindingOutput" @27
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(208, 1664)
-		    label      	(object ItemLabel
-			Parent_View 	@27
-			location   	(61, 1638)
-			fill_color 	16777215
-			nlines     	1
-			max_width  	294
-			justify    	0
-			label      	"IBindingOutput")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@27
-			location   	(61, 1588)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	294
-			justify    	0
-			label      	"<<Interface>>")
-		    icon       	"Interface"
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B84AE210111"
-		    width      	312
-		    height     	176
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::IBindingFault" @28
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressAttribute 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(208, 1984)
-		    label      	(object ItemLabel
-			Parent_View 	@28
-			location   	(72, 1958)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	272
-			justify    	0
-			label      	"IBindingFault")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@28
-			location   	(72, 1908)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	272
-			justify    	0
-			label      	"<<Interface>>")
-		    icon       	"Interface"
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B84AE4F00BD"
-		    width      	290
-		    height     	176
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::PortType" @29
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1904, 624)
-		    label      	(object ItemLabel
-			Parent_View 	@29
-			location   	(1568, 486)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	673
-			justify    	0
-			label      	"PortType")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5C7F001A5"
-		    width      	691
-		    height     	301
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::Input" @30
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1904, 1360)
-		    label      	(object ItemLabel
-			Parent_View 	@30
-			location   	(1756, 1283)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	296
-			justify    	0
-			label      	"Input")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AE0789F0059"
-		    width      	314
-		    height     	178
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::Output" @31
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1904, 1664)
-		    label      	(object ItemLabel
-			Parent_View 	@31
-			location   	(1756, 1587)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	296
-			justify    	0
-			label      	"Output")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AE078B60232"
-		    width      	314
-		    height     	178
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::Binding" @32
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(304, 688)
-		    label      	(object ItemLabel
-			Parent_View 	@32
-			location   	(97, 539)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	414
-			justify    	0
-			label      	"Binding")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5D2860261"
-		    width      	432
-		    height     	322
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @33
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B8595410129"
-		    client     	@32
-		    supplier   	@24
-		    line_style 	3
-		    origin_attachment 	(279, 527)
-		    terminal_attachment 	(279, 428))
-		(object AssociationViewNew "$UNNAMED$3" @34
-		    location   	(1039, 742)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD5D352010F"
-		    roleview_list 	(list RoleViews
-			(object RoleView "ePortType" @35
-			    Parent_View 	@34
-			    location   	(575, 598)
-			    label      	(object SegLabel @36
-				Parent_View 	@35
-				location   	(1449, 781)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	216
-				justify    	0
-				label      	"+ePortType"
-				pctDist    	0.789292
-				height     	39
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5D3540176"
-			    client     	@34
-			    supplier   	@29
-			    line_style 	3
-			    origin_attachment 	(1039, 742)
-			    terminal_attachment 	(1559, 742)
-			    label      	(object SegLabel @37
-				Parent_View 	@35
-				location   	(1492, 716)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.872193
-				height     	27
-				orientation 	0))
-			(object RoleView "$UNNAMED$4" @38
-			    Parent_View 	@34
-			    location   	(575, 598)
-			    label      	(object SegLabel @39
-				Parent_View 	@38
-				location   	(776, 697)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	108
-				justify    	0
-				label      	""
-				pctDist    	0.509449
-				height     	46
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5D3540180"
-			    client     	@34
-			    supplier   	@32
-			    line_style 	3
-			    origin_attachment 	(1039, 742)
-			    terminal_attachment 	(520, 742))))
-		(object ClassView "Class" "Logical View::wsdl::Operation" @40
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1888, 1024)
-		    label      	(object ItemLabel
-			Parent_View 	@40
-			location   	(1672, 851)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	432
-			justify    	0
-			label      	"Operation")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5C80D03CE"
-		    width      	450
-		    height     	370
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::BindingInput" @41
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(624, 1408)
-		    label      	(object ItemLabel
-			Parent_View 	@41
-			location   	(476, 1283)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	296
-			justify    	0
-			label      	"BindingInput")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AE08A8202D4"
-		    width      	314
-		    height     	274
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$43" @42
-		    location   	(1264, 1359)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B84AD2400BD"
-		    roleview_list 	(list RoleViews
-			(object RoleView "eInput" @43
-			    Parent_View 	@42
-			    location   	(96, 287)
-			    label      	(object SegLabel @44
-				Parent_View 	@43
-				location   	(1637, 1316)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	132
-				justify    	0
-				label      	"+eInput"
-				pctDist    	0.775148
-				height     	44
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3B84AD250083"
-			    client     	@42
-			    supplier   	@30
-			    line_style 	3
-			    origin_attachment 	(1264, 1359)
-			    terminal_attachment 	(1747, 1359)
-			    label      	(object SegLabel @45
-				Parent_View 	@43
-				location   	(1694, 1398)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.889546
-				height     	39
-				orientation 	1))
-			(object RoleView "$UNNAMED$44" @46
-			    Parent_View 	@42
-			    location   	(96, 287)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3B84AD250084"
-			    client     	@42
-			    supplier   	@41
-			    line_style 	3
-			    origin_attachment 	(1264, 1359)
-			    terminal_attachment 	(781, 1359))))
-		(object ClassView "Class" "Logical View::wsdl::BindingOutput" @47
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(960, 1664)
-		    label      	(object ItemLabel
-			Parent_View 	@47
-			location   	(812, 1539)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	296
-			justify    	0
-			label      	"BindingOutput")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AE08A8F028C"
-		    width      	314
-		    height     	274
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$45" @48
-		    location   	(1432, 1654)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B84AD7900F2"
-		    roleview_list 	(list RoleViews
-			(object RoleView "eOutput" @49
-			    Parent_View 	@48
-			    location   	(-120, 374)
-			    label      	(object SegLabel @50
-				Parent_View 	@49
-				location   	(1645, 1612)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	168
-				justify    	0
-				label      	"+eOutput"
-				pctDist    	0.674772
-				height     	43
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3B84AD7A014D"
-			    client     	@48
-			    supplier   	@31
-			    line_style 	3
-			    origin_attachment 	(1432, 1654)
-			    terminal_attachment 	(1747, 1654)
-			    label      	(object SegLabel @51
-				Parent_View 	@49
-				location   	(1681, 1697)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.790274
-				height     	43
-				orientation 	1))
-			(object RoleView "$UNNAMED$46" @52
-			    Parent_View 	@48
-			    location   	(-120, 374)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3B84AD7A014E"
-			    client     	@48
-			    supplier   	@47
-			    line_style 	3
-			    origin_attachment 	(1432, 1654)
-			    terminal_attachment 	(1117, 1654))))
-		(object ClassView "Class" "Logical View::wsdl::BindingOperation" @53
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(992, 1008)
-		    label      	(object ItemLabel
-			Parent_View 	@53
-			location   	(819, 931)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	346
-			justify    	0
-			label      	"BindingOperation")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5D3CB0145"
-		    width      	364
-		    height     	178
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @54
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B84ADE401DC"
-		    client     	@53
-		    supplier   	@25
-		    line_style 	3
-		    origin_attachment 	(966, 919)
-		    terminal_attachment 	(966, 636))
-		(object AssociationViewNew "$UNNAMED$5" @55
-		    location   	(457, 1022)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD5D3E10179"
-		    roleview_list 	(list RoleViews
-			(object RoleView "$UNNAMED$6" @56
-			    Parent_View 	@55
-			    location   	(-1319, 494)
-			    label      	(object SegLabel @57
-				Parent_View 	@56
-				location   	(235, 920)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	60
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5D3E20225"
-			    client     	@55
-			    supplier   	@32
-			    vertices   	(list Points
-				(457, 1022)
-				(276, 1022)
-				(276, 849))
-			    line_style 	3
-			    origin_attachment 	(457, 1022)
-			    terminal_attachment 	(276, 849)
-			    label      	(object SegLabel @58
-				Parent_View 	@56
-				location   	(330, 884)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.900000
-				height     	54
-				orientation 	1))
-			(object RoleView "eBindingOperations" @59
-			    Parent_View 	@55
-			    location   	(-1319, 494)
-			    label      	(object SegLabel @60
-				Parent_View 	@59
-				location   	(531, 977)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	384
-				justify    	0
-				label      	"+eBindingOperations"
-				pctDist    	0.211699
-				height     	46
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5D3E20239"
-			    client     	@55
-			    supplier   	@53
-			    line_style 	3
-			    origin_attachment 	(457, 1022)
-			    terminal_attachment 	(810, 1022)
-			    label      	(object SegLabel @61
-				Parent_View 	@59
-				location   	(769, 980)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..*"
-				pctDist    	0.884956
-				height     	43
-				orientation 	0)
-			    label      	(object SegLabel @62
-				Parent_View 	@59
-				location   	(714, 1067)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	154
-				justify    	0
-				label      	"{ordered}"
-				pctDist    	0.727564
-				height     	45
-				orientation 	1))))
-		(object AssociationViewNew "$UNNAMED$7" @63
-		    location   	(1418, 1040)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD5D425038A"
-		    roleview_list 	(list RoleViews
-			(object RoleView "eOperation" @64
-			    Parent_View 	@63
-			    location   	(-358, 464)
-			    label      	(object SegLabel @65
-				Parent_View 	@64
-				location   	(1520, 1079)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	228
-				justify    	0
-				label      	"+eOperation"
-				pctDist    	0.420601
-				height     	39
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5D42602F5"
-			    client     	@63
-			    supplier   	@40
-			    line_style 	3
-			    origin_attachment 	(1418, 1040)
-			    terminal_attachment 	(1663, 1040)
-			    label      	(object SegLabel @66
-				Parent_View 	@64
-				location   	(1589, 1005)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.696721
-				height     	36
-				orientation 	0))
-			(object RoleView "$UNNAMED$8" @67
-			    Parent_View 	@63
-			    location   	(-358, 464)
-			    label      	(object SegLabel @68
-				Parent_View 	@67
-				location   	(1273, 1070)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	192
-				justify    	0
-				label      	""
-				pctDist    	0.595420
-				height     	30
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5D42602FF"
-			    client     	@63
-			    supplier   	@53
-			    line_style 	3
-			    origin_attachment 	(1418, 1040)
-			    terminal_attachment 	(1174, 1040))))
-		(object AssociationViewNew "$UNNAMED$23" @69
-		    location   	(787, 1190)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3ADF2E6401F5"
-		    roleview_list 	(list RoleViews
-			(object RoleView "eBindingInput" @70
-			    Parent_View 	@69
-			    location   	(-381, 454)
-			    label      	(object SegLabel @71
-				Parent_View 	@70
-				location   	(669, 1152)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	276
-				justify    	0
-				label      	"+eBindingInput"
-				pctDist    	0.511905
-				height     	39
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3ADF2E650251"
-			    client     	@69
-			    supplier   	@41
-			    vertices   	(list Points
-				(787, 1190)
-				(636, 1190)
-				(636, 1271))
-			    line_style 	3
-			    origin_attachment 	(787, 1190)
-			    terminal_attachment 	(636, 1271)
-			    label      	(object SegLabel @72
-				Parent_View 	@70
-				location   	(685, 1222)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..1"
-				pctDist    	0.440476
-				height     	32
-				orientation 	0))
-			(object RoleView "$UNNAMED$24" @73
-			    Parent_View 	@69
-			    location   	(-381, 454)
-			    label      	(object SegLabel @74
-				Parent_View 	@73
-				location   	(885, 1144)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	60
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3ADF2E650252"
-			    client     	@69
-			    supplier   	@53
-			    vertices   	(list Points
-				(787, 1190)
-				(926, 1190)
-				(926, 1097))
-			    line_style 	3
-			    origin_attachment 	(787, 1190)
-			    terminal_attachment 	(926, 1097)
-			    label      	(object SegLabel @75
-				Parent_View 	@73
-				location   	(871, 1136)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.837758
-				height     	56
-				orientation 	0))))
-		(object AssociationViewNew "$UNNAMED$25" @76
-		    location   	(1024, 1312)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3ADF2EB30163"
-		    roleview_list 	(list RoleViews
-			(object RoleView "eBindingOutput" @77
-			    Parent_View 	@76
-			    location   	(-150, 578)
-			    label      	(object SegLabel @78
-				Parent_View 	@77
-				location   	(1012, 1429)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	306
-				justify    	0
-				label      	"+eBindingOutput"
-				pctDist    	0.545082
-				height     	13
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3ADF2EB4013C"
-			    client     	@76
-			    supplier   	@47
-			    line_style 	3
-			    origin_attachment 	(1024, 1312)
-			    terminal_attachment 	(1024, 1527)
-			    label      	(object SegLabel @79
-				Parent_View 	@77
-				location   	(967, 1479)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..1"
-				pctDist    	0.774590
-				height     	58
-				orientation 	1))
-			(object RoleView "$UNNAMED$26" @80
-			    Parent_View 	@76
-			    location   	(-150, 578)
-			    label      	(object SegLabel @81
-				Parent_View 	@80
-				location   	(983, 1140)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	60
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3ADF2EB4013D"
-			    client     	@76
-			    supplier   	@53
-			    line_style 	3
-			    origin_attachment 	(1024, 1312)
-			    terminal_attachment 	(1024, 1097)
-			    label      	(object SegLabel @82
-				Parent_View 	@80
-				location   	(1031, 1186)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.590164
-				height     	7
-				orientation 	1))))
-		(object ClassView "Class" "Logical View::wsdl::Fault" @83
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1920, 1984)
-		    label      	(object ItemLabel
-			Parent_View 	@83
-			location   	(1772, 1907)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	296
-			justify    	0
-			label      	"Fault")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AE078BE0108"
-		    width      	314
-		    height     	178
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::BindingFault" @84
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1360, 1984)
-		    label      	(object ItemLabel
-			Parent_View 	@84
-			location   	(1212, 1859)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	296
-			justify    	0
-			label      	"BindingFault")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AE08A9E03A6"
-		    width      	314
-		    height     	274
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @85
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B84AE710333"
-		    client     	@84
-		    supplier   	@28
-		    line_style 	3
-		    origin_attachment 	(1203, 2007)
-		    terminal_attachment 	(353, 2007))
-		(object AssociationViewNew "$UNNAMED$33" @86
-		    location   	(1356, 1352)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3ADF340003E5"
-		    roleview_list 	(list RoleViews
-			(object RoleView "eBindingFaults" @87
-			    Parent_View 	@86
-			    location   	(188, 616)
-			    label      	(object SegLabel @88
-				Parent_View 	@87
-				location   	(1382, 1750)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	300
-				justify    	0
-				label      	"+eBindingFaults"
-				pctDist    	0.803150
-				height     	26
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3ADF340103AA"
-			    client     	@86
-			    supplier   	@84
-			    line_style 	3
-			    origin_attachment 	(1356, 1352)
-			    terminal_attachment 	(1356, 1847)
-			    label      	(object SegLabel @89
-				Parent_View 	@87
-				location   	(1409, 1797)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..*"
-				pctDist    	0.899194
-				height     	53
-				orientation 	0)
-			    label      	(object SegLabel @90
-				Parent_View 	@87
-				location   	(1256, 1806)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	154
-				justify    	0
-				label      	"{ordered}"
-				pctDist    	0.919291
-				height     	101
-				orientation 	1))
-			(object RoleView "$UNNAMED$34" @91
-			    Parent_View 	@86
-			    location   	(188, 616)
-			    label      	(object SegLabel @92
-				Parent_View 	@91
-				location   	(1076, 1197)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	60
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3ADF340103AB"
-			    client     	@86
-			    supplier   	@53
-			    vertices   	(list Points
-				(1356, 1352)
-				(1356, 1217)
-				(1117, 1217)
-				(1117, 1097))
-			    line_style 	3
-			    origin_attachment 	(1356, 1352)
-			    terminal_attachment 	(1117, 1097)
-			    label      	(object SegLabel @93
-				Parent_View 	@91
-				location   	(1152, 1164)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.687008
-				height     	54
-				orientation 	1))))
-		(object AssociationViewNew "$UNNAMED$35" @94
-		    location   	(1640, 1970)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AE091F402F3"
-		    roleview_list 	(list RoleViews
-			(object RoleView "eFault" @95
-			    Parent_View 	@94
-			    location   	(-344, 818)
-			    label      	(object SegLabel @96
-				Parent_View 	@95
-				location   	(1674, 1915)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	144
-				justify    	0
-				label      	"+eFault"
-				pctDist    	0.276423
-				height     	56
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AE091F801FE"
-			    client     	@94
-			    supplier   	@83
-			    line_style 	3
-			    origin_attachment 	(1640, 1970)
-			    terminal_attachment 	(1763, 1970)
-			    label      	(object SegLabel @97
-				Parent_View 	@95
-				location   	(1718, 2012)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.642276
-				height     	42
-				orientation 	1))
-			(object RoleView "$UNNAMED$36" @98
-			    Parent_View 	@94
-			    location   	(-344, 818)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AE091F801FF"
-			    client     	@94
-			    supplier   	@84
-			    line_style 	3
-			    origin_attachment 	(1640, 1970)
-			    terminal_attachment 	(1517, 1970))))
-		(object InheritView "" @99
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B84AE4302AB"
-		    client     	@47
-		    supplier   	@27
-		    line_style 	3
-		    origin_attachment 	(803, 1656)
-		    terminal_attachment 	(364, 1656))
-		(object InheritView "" @100
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B84AE1B0113"
-		    client     	@41
-		    supplier   	@26
-		    line_style 	3
-		    origin_attachment 	(467, 1385)
-		    terminal_attachment 	(331, 1385))))
-	(object ClassDiagram "2.4 PortTypes"
-	    quid       	"3AD5D1C40366"
-	    title      	"2.4 PortTypes"
-	    documentation 	"This class represents the non-MOF java.util.Iterator interface."
-	    zoom       	80
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	0
-	    origin_y   	0
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::wsdl::IPortType" @101
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressOperation 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(496, 208)
-		    label      	(object ItemLabel
-			Parent_View 	@101
-			location   	(146, 172)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	700
-			justify    	0
-			label      	"IPortType")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@101
-			location   	(146, 122)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	700
-			justify    	0
-			label      	"<<Interface>>")
-		    icon       	"Interface"
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B84A5BE0331"
-		    width      	718
-		    height     	196
-		    annotation 	8)
-		(object ClassView "Class" "Logical View::wsdl::IOperation" @102
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressOperation 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1552, 208)
-		    label      	(object ItemLabel
-			Parent_View 	@102
-			location   	(1116, 176)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	873
-			justify    	0
-			label      	"IOperation")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@102
-			location   	(1116, 126)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	873
-			justify    	0
-			label      	"<<Interface>>")
-		    icon       	"Interface"
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B84A77600D1"
-		    width      	891
-		    height     	188
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::IInput" @103
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressOperation 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(368, 1472)
-		    label      	(object ItemLabel
-			Parent_View 	@103
-			location   	(55, 1437)
-			fill_color 	16777215
-			nlines     	1
-			max_width  	626
-			justify    	0
-			label      	"IInput")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@103
-			location   	(55, 1387)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	626
-			justify    	0
-			label      	"<<Interface>>")
-		    icon       	"Interface"
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B84A7EE0015"
-		    width      	644
-		    height     	194
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::IOutput" @104
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressOperation 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(384, 1792)
-		    label      	(object ItemLabel
-			Parent_View 	@104
-			location   	(56, 1757)
-			fill_color 	16777215
-			nlines     	1
-			max_width  	656
-			justify    	0
-			label      	"IOutput")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@104
-			location   	(56, 1707)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	656
-			justify    	0
-			label      	"<<Interface>>")
-		    icon       	"Interface"
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B84A829027D"
-		    width      	674
-		    height     	194
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::IFault" @105
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressOperation 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(368, 2112)
-		    label      	(object ItemLabel
-			Parent_View 	@105
-			location   	(55, 2076)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	626
-			justify    	0
-			label      	"IFault")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@105
-			location   	(55, 2026)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	626
-			justify    	0
-			label      	"<<Interface>>")
-		    icon       	"Interface"
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B84A861031D"
-		    width      	644
-		    height     	196
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::PortType" @106
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressOperation 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(496, 800)
-		    label      	(object ItemLabel
-			Parent_View 	@106
-			location   	(158, 672)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	677
-			justify    	0
-			label      	"PortType")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5C7F001A5"
-		    width      	695
-		    height     	281
-		    annotation 	8)
-		(object ClassView "Class" "Logical View::wsdl::Part" @107
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressOperation 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(2576, 800)
-		    label      	(object ItemLabel
-			Parent_View 	@107
-			location   	(2325, 692)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	502
-			justify    	0
-			label      	"Part")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5CE1C032E"
-		    width      	520
-		    height     	240
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::Fault" @108
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressOperation 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1728, 2112)
-		    label      	(object ItemLabel
-			Parent_View 	@108
-			location   	(1647, 2060)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	162
-			justify    	0
-			label      	"Fault")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AE078BE0108"
-		    height     	128
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::Input" @109
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressOperation 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1056, 1472)
-		    label      	(object ItemLabel
-			Parent_View 	@109
-			location   	(870, 1422)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	372
-			justify    	0
-			label      	"Input")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AE0789F0059"
-		    width      	390
-		    height     	125
-		    annotation 	8)
-		(object ClassView "Class" "Logical View::wsdl::Output" @110
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressOperation 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1360, 1792)
-		    label      	(object ItemLabel
-			Parent_View 	@110
-			location   	(1232, 1742)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	256
-			justify    	0
-			label      	"Output")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AE078B60232"
-		    width      	274
-		    height     	125
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::Operation" @111
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressOperation 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1552, 784)
-		    label      	(object ItemLabel
-			Parent_View 	@111
-			location   	(1214, 620)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	677
-			justify    	0
-			label      	"Operation")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5C80D03CE"
-		    width      	695
-		    height     	352
-		    annotation 	8)
-		(object AssociationViewNew "$UNNAMED$0" @112
-		    location   	(1024, 797)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD5C824018C"
-		    roleview_list 	(list RoleViews
-			(object RoleView "eOperations" @113
-			    Parent_View 	@112
-			    location   	(592, 269)
-			    label      	(object SegLabel @114
-				Parent_View 	@113
-				location   	(1088, 748)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	249
-				justify    	0
-				label      	"+eOperations"
-				pctDist    	0.359649
-				height     	50
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5C82701CD"
-			    client     	@112
-			    supplier   	@111
-			    line_style 	3
-			    origin_attachment 	(1024, 797)
-			    terminal_attachment 	(1205, 797)
-			    label      	(object SegLabel @115
-				Parent_View 	@113
-				location   	(1176, 861)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..*"
-				pctDist    	0.840391
-				height     	64
-				orientation 	1)
-			    label      	(object SegLabel @116
-				Parent_View 	@113
-				location   	(1074, 923)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	164
-				justify    	0
-				label      	"{ordered}"
-				pctDist    	0.276243
-				height     	126
-				orientation 	1))
-			(object RoleView "portType" @117
-			    Parent_View 	@112
-			    location   	(592, 269)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5C82701C3"
-			    client     	@112
-			    supplier   	@106
-			    line_style 	3
-			    origin_attachment 	(1024, 797)
-			    terminal_attachment 	(843, 797)
-			    label      	(object SegLabel @118
-				Parent_View 	@117
-				location   	(888, 757)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.753488
-				height     	41
-				orientation 	1))))
-		(object AssociationViewNew "$UNNAMED$41" @119
-		    location   	(2107, 773)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AEA412F0035"
-		    roleview_list 	(list RoleViews
-			(object RoleView "eParameterOrdering" @120
-			    Parent_View 	@119
-			    location   	(1819, 101)
-			    label      	(object SegLabel @121
-				Parent_View 	@120
-				location   	(2145, 647)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	396
-				justify    	0
-				label      	"+eParameterOrdering"
-				pctDist    	0.183333
-				height     	127
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AEA41310255"
-			    client     	@119
-			    supplier   	@107
-			    line_style 	3
-			    origin_attachment 	(2107, 773)
-			    terminal_attachment 	(2316, 773)
-			    label      	(object SegLabel @122
-				Parent_View 	@120
-				location   	(2272, 822)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..*"
-				pctDist    	0.796610
-				height     	49
-				orientation 	1)
-			    label      	(object SegLabel @123
-				Parent_View 	@120
-				location   	(2171, 888)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	164
-				justify    	0
-				label      	"{ordered}"
-				pctDist    	0.306220
-				height     	115
-				orientation 	1))
-			(object RoleView "$UNNAMED$42" @124
-			    Parent_View 	@119
-			    location   	(1819, 101)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AEA4131025F"
-			    client     	@119
-			    supplier   	@111
-			    line_style 	3
-			    origin_attachment 	(2107, 773)
-			    terminal_attachment 	(1899, 773))))
-		(object AssociationViewNew "$UNNAMED$31" @125
-		    location   	(1702, 1504)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3ADF331601A4"
-		    roleview_list 	(list RoleViews
-			(object RoleView "eFaults" @126
-			    Parent_View 	@125
-			    location   	(1414, 832)
-			    label      	(object SegLabel @127
-				Parent_View 	@126
-				location   	(1815, 1982)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	168
-				justify    	0
-				label      	"+eFaults"
-				pctDist    	0.878992
-				height     	113
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3ADF33180387"
-			    client     	@125
-			    supplier   	@108
-			    line_style 	3
-			    origin_attachment 	(1702, 1504)
-			    terminal_attachment 	(1702, 2048)
-			    label      	(object SegLabel @128
-				Parent_View 	@126
-				location   	(1644, 2020)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..*"
-				pctDist    	0.949580
-				height     	59
-				orientation 	1)
-			    label      	(object SegLabel @129
-				Parent_View 	@126
-				location   	(1593, 1963)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	164
-				justify    	0
-				label      	"{ordered}"
-				pctDist    	0.845378
-				height     	110
-				orientation 	1))
-			(object RoleView "$UNNAMED$32" @130
-			    Parent_View 	@125
-			    location   	(1414, 832)
-			    label      	(object SegLabel @131
-				Parent_View 	@130
-				location   	(1661, 1069)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	60
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3ADF33180388"
-			    client     	@125
-			    supplier   	@111
-			    line_style 	3
-			    origin_attachment 	(1702, 1504)
-			    terminal_attachment 	(1702, 960)
-			    label      	(object SegLabel @132
-				Parent_View 	@130
-				location   	(1821, 1039)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.857362
-				height     	119
-				orientation 	1))))
-		(object AssociationViewNew "$UNNAMED$27" @133
-		    location   	(1178, 1234)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3ADF2F94024D"
-		    roleview_list 	(list RoleViews
-			(object RoleView "eInput" @134
-			    Parent_View 	@133
-			    location   	(890, 562)
-			    label      	(object SegLabel @135
-				Parent_View 	@134
-				location   	(878, 1343)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	132
-				justify    	0
-				label      	"+eInput"
-				pctDist    	0.819820
-				height     	103
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3ADF2F950190"
-			    client     	@133
-			    supplier   	@109
-			    vertices   	(list Points
-				(1178, 1234)
-				(980, 1234)
-				(980, 1410))
-			    line_style 	3
-			    origin_attachment 	(1178, 1234)
-			    terminal_attachment 	(980, 1410)
-			    label      	(object SegLabel @136
-				Parent_View 	@134
-				location   	(1046, 1364)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..1"
-				pctDist    	0.877660
-				height     	66
-				orientation 	0))
-			(object RoleView "$UNNAMED$28" @137
-			    Parent_View 	@133
-			    location   	(890, 562)
-			    label      	(object SegLabel @138
-				Parent_View 	@137
-				location   	(1236, 1036)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	60
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3ADF2F95019A"
-			    client     	@133
-			    supplier   	@111
-			    vertices   	(list Points
-				(1178, 1234)
-				(1277, 1234)
-				(1277, 960))
-			    line_style 	3
-			    origin_attachment 	(1178, 1234)
-			    terminal_attachment 	(1277, 960)
-			    label      	(object SegLabel @139
-				Parent_View 	@137
-				location   	(1197, 1058)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.736413
-				height     	81
-				orientation 	0))))
-		(object AssociationViewNew "$UNNAMED$29" @140
-		    location   	(1468, 1345)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3ADF2FB802F9"
-		    roleview_list 	(list RoleViews
-			(object RoleView "eOutput" @141
-			    Parent_View 	@140
-			    location   	(1180, 673)
-			    label      	(object SegLabel @142
-				Parent_View 	@141
-				location   	(1362, 1669)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	168
-				justify    	0
-				label      	"+eOutput"
-				pctDist    	0.840909
-				height     	107
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3ADF2FB9020A"
-			    client     	@140
-			    supplier   	@110
-			    line_style 	3
-			    origin_attachment 	(1468, 1345)
-			    terminal_attachment 	(1468, 1730)
-			    label      	(object SegLabel @143
-				Parent_View 	@141
-				location   	(1546, 1676)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..1"
-				pctDist    	0.863636
-				height     	78
-				orientation 	0))
-			(object RoleView "$UNNAMED$30" @144
-			    Parent_View 	@140
-			    location   	(1180, 673)
-			    label      	(object SegLabel @145
-				Parent_View 	@144
-				location   	(1427, 1037)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	60
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3ADF2FB9020B"
-			    client     	@140
-			    supplier   	@111
-			    line_style 	3
-			    origin_attachment 	(1468, 1345)
-			    terminal_attachment 	(1468, 960)
-			    label      	(object SegLabel @146
-				Parent_View 	@144
-				location   	(1523, 1080)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.690341
-				height     	55
-				orientation 	1))))
-		(object InheritView "" @147
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F6F1FD8019F"
-		    client     	@106
-		    supplier   	@101
-		    line_style 	0)
-		(object InheritView "" @148
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F6F1FE20171"
-		    client     	@111
-		    supplier   	@102
-		    line_style 	0)
-		(object InheritView "" @149
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F6F1FEE031D"
-		    client     	@109
-		    supplier   	@103
-		    line_style 	0)
-		(object InheritView "" @150
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F6F1FF801CD"
-		    client     	@110
-		    supplier   	@104
-		    line_style 	0)
-		(object InheritView "" @151
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F6F2002002D"
-		    client     	@108
-		    supplier   	@105
-		    line_style 	0)
-		(object ClassView "Class" "Logical View::wsdl::Message" @152
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressOperation 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(2224, 1456)
-		    label      	(object ItemLabel
-			Parent_View 	@152
-			location   	(1937, 1312)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	575
-			justify    	0
-			label      	"Message")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5C9590078"
-		    width      	593
-		    height     	312
-		    annotation 	8)
-		(object ClassView "Class" "Logical View::wsdl::MessageReference" @153
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressOperation 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1520, 2544)
-		    font       	(object Font
-			italics    	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@153
-			location   	(1193, 2466)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	654
-			justify    	0
-			label      	"MessageReference")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3F6771DB02DC"
-		    width      	672
-		    height     	180
-		    annotation 	8)
-		(object InheritTreeView "" @154
-		    location   	(1524, 2275)
-		    line_color 	3342489
-		    fill_color 	13434879
-		    supplier   	@153
-		    vertices   	(list Points
-			(1524, 2275)
-			(1524, 2454)))
-		(object InheritView "" @155
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F67723D0319"
-		    client     	@108
-		    supplier   	@153
-		    line_style 	3
-		    origin_attachment 	(1776, 2176)
-		    terminal_attachment 	(1776, 2275)
-		    drawSupplier 	@154)
-		(object InheritView "" @156
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F67723500DD"
-		    client     	@110
-		    supplier   	@153
-		    line_style 	3
-		    origin_attachment 	(1371, 1854)
-		    terminal_attachment 	(1371, 2275)
-		    drawSupplier 	@154)
-		(object InheritView "" @157
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F67722802E7"
-		    client     	@109
-		    supplier   	@153
-		    line_style 	3
-		    origin_attachment 	(980, 1534)
-		    terminal_attachment 	(980, 2275)
-		    drawSupplier 	@154)
-		(object AssociationViewNew "$UNNAMED$61" @158
-		    location   	(2206, 2259)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F74E78401B1"
-		    roleview_list 	(list RoleViews
-			(object RoleView "eMessage" @159
-			    Parent_View 	@158
-			    location   	(734, -285)
-			    label      	(object SegLabel @160
-				Parent_View 	@159
-				location   	(2068, 1670)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	216
-				justify    	0
-				label      	"+eMessage"
-				pctDist    	0.912230
-				height     	139
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3F74E786000F"
-			    client     	@158
-			    supplier   	@152
-			    line_style 	3
-			    origin_attachment 	(2206, 2259)
-			    terminal_attachment 	(2206, 1612)
-			    label      	(object SegLabel @161
-				Parent_View 	@159
-				location   	(2260, 1678)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1"
-				pctDist    	0.900000
-				height     	54
-				orientation 	1))
-			(object RoleView "$UNNAMED$62" @162
-			    Parent_View 	@158
-			    location   	(734, -285)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3F74E7860023"
-			    client     	@158
-			    supplier   	@153
-			    vertices   	(list Points
-				(2206, 2259)
-				(2206, 2556)
-				(1856, 2556))
-			    line_style 	3
-			    origin_attachment 	(2206, 2259)
-			    terminal_attachment 	(1856, 2556))))))
-	(object ClassDiagram "2.1 Definitions"
-	    quid       	"3AD5E48A0262"
-	    title      	"2.1 Definitions"
-	    zoom       	83
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	0
-	    origin_y   	0
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::wsdl::IDefinition" @163
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressOperation 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(432, 192)
-		    label      	(object ItemLabel
-			Parent_View 	@163
-			location   	(88, 161)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	688
-			justify    	0
-			label      	"IDefinition")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@163
-			location   	(88, 111)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	688
-			justify    	0
-			label      	"<<Interface>>")
-		    icon       	"Interface"
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B84B1D90142"
-		    width      	706
-		    height     	186
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::Types" @164
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressOperation 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1824, 944)
-		    label      	(object ItemLabel
-			Parent_View 	@164
-			location   	(1686, 896)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	276
-			justify    	0
-			label      	"Types")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B8BE9A603A8"
-		    width      	294
-		    height     	120
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::Import" @165
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressOperation 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(2144, 624)
-		    label      	(object ItemLabel
-			Parent_View 	@165
-			location   	(1910, 545)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	468
-			justify    	0
-			label      	"Import")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5E4F903DE"
-		    width      	486
-		    height     	182
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::Message" @166
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressOperation 	TRUE
-		    IncludeAttribute 	TRUE
-		    location   	(2112, 1184)
-		    label      	(object ItemLabel
-			Parent_View 	@166
-			location   	(1900, 1056)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	424
-			justify    	0
-			label      	"Message")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5C9590078"
-		    width      	442
-		    height     	280
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::PortType" @167
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressOperation 	TRUE
-		    IncludeAttribute 	TRUE
-		    location   	(1808, 1488)
-		    label      	(object ItemLabel
-			Parent_View 	@167
-			location   	(1596, 1360)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	424
-			justify    	0
-			label      	"PortType")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5C7F001A5"
-		    width      	442
-		    height     	280
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::Binding" @168
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressOperation 	TRUE
-		    IncludeAttribute 	TRUE
-		    location   	(2336, 1728)
-		    label      	(object ItemLabel
-			Parent_View 	@168
-			location   	(2124, 1600)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	424
-			justify    	0
-			label      	"Binding")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5D2860261"
-		    width      	442
-		    height     	280
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::Definition" @169
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1328, 240)
-		    label      	(object ItemLabel
-			Parent_View 	@169
-			location   	(1073, 39)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	510
-			justify    	0
-			label      	"Definition")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5E43F008E"
-		    width      	528
-		    height     	426
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$53" @170
-		    location   	(1358, 860)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B8BEA27029F"
-		    roleview_list 	(list RoleViews
-			(object RoleView "$UNNAMED$54" @171
-			    Parent_View 	@170
-			    location   	(62, -36)
-			    label      	(object SegLabel @172
-				Parent_View 	@171
-				location   	(1317, 535)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	60
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3B8BEA290356"
-			    client     	@170
-			    supplier   	@169
-			    line_style 	3
-			    origin_attachment 	(1358, 860)
-			    terminal_attachment 	(1358, 453)
-			    label      	(object SegLabel @173
-				Parent_View 	@171
-				location   	(1403, 511)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.856649
-				height     	45
-				orientation 	1))
-			(object RoleView "eTypes" @174
-			    Parent_View 	@170
-			    location   	(62, -36)
-			    label      	(object SegLabel @175
-				Parent_View 	@174
-				location   	(1586, 909)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	156
-				justify    	0
-				label      	"+eTypes"
-				pctDist    	0.779097
-				height     	40
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3B8BEA29036A"
-			    client     	@170
-			    supplier   	@164
-			    vertices   	(list Points
-				(1358, 860)
-				(1358, 948)
-				(1677, 948))
-			    line_style 	3
-			    origin_attachment 	(1358, 860)
-			    terminal_attachment 	(1677, 948)
-			    label      	(object SegLabel @176
-				Parent_View 	@174
-				location   	(1632, 987)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..1"
-				pctDist    	0.892655
-				height     	39
-				orientation 	1))))
-		(object AssociationViewNew "$UNNAMED$57" @177
-		    location   	(1612, 595)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3C864DFF02EC"
-		    roleview_list 	(list RoleViews
-			(object RoleView "$UNNAMED$58" @178
-			    Parent_View 	@177
-			    location   	(12, 227)
-			    label      	(object SegLabel @179
-				Parent_View 	@178
-				location   	(1423, 512)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	60
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3C864DFF02EE"
-			    client     	@177
-			    supplier   	@169
-			    vertices   	(list Points
-				(1612, 595)
-				(1464, 595)
-				(1464, 453))
-			    line_style 	3
-			    origin_attachment 	(1612, 595)
-			    terminal_attachment 	(1464, 453)
-			    label      	(object SegLabel @180
-				Parent_View 	@178
-				location   	(1524, 495)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.858667
-				height     	60
-				orientation 	1))
-			(object RoleView "eImports" @181
-			    Parent_View 	@177
-			    location   	(12, 227)
-			    label      	(object SegLabel @182
-				Parent_View 	@181
-				location   	(1692, 557)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	204
-				justify    	0
-				label      	"+eImports"
-				pctDist    	0.280335
-				height     	39
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3C864DFF02ED"
-			    client     	@177
-			    supplier   	@165
-			    line_style 	3
-			    origin_attachment 	(1612, 595)
-			    terminal_attachment 	(1901, 595)
-			    label      	(object SegLabel @183
-				Parent_View 	@181
-				location   	(1854, 652)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..*"
-				pctDist    	0.841004
-				height     	57
-				orientation 	1)
-			    label      	(object SegLabel @184
-				Parent_View 	@181
-				location   	(1676, 646)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	158
-				justify    	0
-				label      	"{ordered}"
-				pctDist    	0.225941
-				height     	51
-				orientation 	1))))
-		(object AssociationViewNew "$UNNAMED$13" @185
-		    location   	(1279, 1137)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD5E60301E2"
-		    roleview_list 	(list RoleViews
-			(object RoleView "$UNNAMED$14" @186
-			    Parent_View 	@185
-			    location   	(271, 273)
-			    label      	(object SegLabel @187
-				Parent_View 	@186
-				location   	(1238, 591)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	60
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5E60400B7"
-			    client     	@185
-			    supplier   	@169
-			    line_style 	3
-			    origin_attachment 	(1279, 1137)
-			    terminal_attachment 	(1279, 453)
-			    label      	(object SegLabel @188
-				Parent_View 	@186
-				location   	(1320, 586)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.804974
-				height     	41
-				orientation 	1))
-			(object RoleView "eMessages" @189
-			    Parent_View 	@185
-			    location   	(271, 273)
-			    label      	(object SegLabel @190
-				Parent_View 	@189
-				location   	(1647, 1171)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	240
-				justify    	0
-				label      	"+eMessages"
-				pctDist    	0.643137
-				height     	38
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5E60400C1"
-			    client     	@185
-			    supplier   	@166
-			    vertices   	(list Points
-				(1279, 1137)
-				(1279, 1208)
-				(1891, 1208))
-			    line_style 	3
-			    origin_attachment 	(1279, 1137)
-			    terminal_attachment 	(1891, 1208)
-			    label      	(object SegLabel @191
-				Parent_View 	@189
-				location   	(1821, 1171)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..*"
-				pctDist    	0.899346
-				height     	38
-				orientation 	0)
-			    label      	(object SegLabel @192
-				Parent_View 	@189
-				location   	(1797, 1244)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	158
-				justify    	0
-				label      	"{ordered}"
-				pctDist    	0.864407
-				height     	36
-				orientation 	1))))
-		(object AssociationViewNew "$UNNAMED$15" @193
-		    location   	(1212, 1159)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD5E6710104"
-		    roleview_list 	(list RoleViews
-			(object RoleView "$UNNAMED$16" @194
-			    Parent_View 	@193
-			    location   	(-324, 215)
-			    label      	(object SegLabel @195
-				Parent_View 	@194
-				location   	(1171, 594)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	60
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5E672034A"
-			    client     	@193
-			    supplier   	@169
-			    line_style 	3
-			    origin_attachment 	(1212, 1159)
-			    terminal_attachment 	(1212, 453)
-			    label      	(object SegLabel @196
-				Parent_View 	@194
-				location   	(1251, 624)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.757962
-				height     	39
-				orientation 	1))
-			(object RoleView "ePortTypes" @197
-			    Parent_View 	@193
-			    location   	(-324, 215)
-			    label      	(object SegLabel @198
-				Parent_View 	@197
-				location   	(1391, 1451)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	240
-				justify    	0
-				label      	"+ePortTypes"
-				pctDist    	0.723698
-				height     	40
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5E6720354"
-			    client     	@193
-			    supplier   	@167
-			    vertices   	(list Points
-				(1212, 1159)
-				(1212, 1490)
-				(1587, 1490))
-			    line_style 	3
-			    origin_attachment 	(1212, 1159)
-			    terminal_attachment 	(1587, 1490)
-			    label      	(object SegLabel @199
-				Parent_View 	@197
-				location   	(1533, 1451)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..*"
-				pctDist    	0.925611
-				height     	40
-				orientation 	0)
-			    label      	(object SegLabel @200
-				Parent_View 	@197
-				location   	(1512, 1540)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	158
-				justify    	0
-				label      	"{ordered}"
-				pctDist    	0.895855
-				height     	50
-				orientation 	1))))
-		(object AssociationViewNew "$UNNAMED$17" @201
-		    location   	(1114, 1585)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD5E6770095"
-		    roleview_list 	(list RoleViews
-			(object RoleView "$UNNAMED$18" @202
-			    Parent_View 	@201
-			    location   	(-406, 241)
-			    label      	(object SegLabel @203
-				Parent_View 	@202
-				location   	(1073, 680)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	60
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5E6780371"
-			    client     	@201
-			    supplier   	@169
-			    line_style 	3
-			    origin_attachment 	(1114, 1585)
-			    terminal_attachment 	(1114, 453)
-			    label      	(object SegLabel @204
-				Parent_View 	@202
-				location   	(1155, 752)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.736704
-				height     	41
-				orientation 	1))
-			(object RoleView "eBindings" @205
-			    Parent_View 	@201
-			    location   	(-406, 241)
-			    label      	(object SegLabel @206
-				Parent_View 	@205
-				location   	(1851, 1674)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	204
-				justify    	0
-				label      	"+eBindings"
-				pctDist    	0.766347
-				height     	43
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5E678037B"
-			    client     	@201
-			    supplier   	@168
-			    vertices   	(list Points
-				(1114, 1585)
-				(1114, 1716)
-				(2115, 1716))
-			    line_style 	3
-			    origin_attachment 	(1114, 1585)
-			    terminal_attachment 	(2115, 1716)
-			    label      	(object SegLabel @207
-				Parent_View 	@205
-				location   	(2053, 1677)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..*"
-				pctDist    	0.945074
-				height     	40
-				orientation 	0)
-			    label      	(object SegLabel @208
-				Parent_View 	@205
-				location   	(2014, 1754)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	158
-				justify    	0
-				label      	"{ordered}"
-				pctDist    	0.911072
-				height     	38
-				orientation 	1))))
-		(object ClassView "Class" "Logical View::wsdl::Service" @209
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressOperation 	TRUE
-		    IncludeAttribute 	TRUE
-		    location   	(1840, 2048)
-		    label      	(object ItemLabel
-			Parent_View 	@209
-			location   	(1628, 1920)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	424
-			justify    	0
-			label      	"Service")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5D8F002F8"
-		    width      	442
-		    height     	280
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$19" @210
-		    location   	(1066, 1533)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD5E67B0311"
-		    roleview_list 	(list RoleViews
-			(object RoleView "$UNNAMED$20" @211
-			    Parent_View 	@210
-			    location   	(-521, -111)
-			    label      	(object SegLabel @212
-				Parent_View 	@211
-				location   	(1025, 669)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	60
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5E67D007F"
-			    client     	@210
-			    supplier   	@169
-			    line_style 	3
-			    origin_attachment 	(1066, 1533)
-			    terminal_attachment 	(1066, 453)
-			    label      	(object SegLabel @213
-				Parent_View 	@211
-				location   	(1109, 756)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.719697
-				height     	43
-				orientation 	1))
-			(object RoleView "eServices" @214
-			    Parent_View 	@210
-			    location   	(-521, -111)
-			    label      	(object SegLabel @215
-				Parent_View 	@214
-				location   	(1393, 2028)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	204
-				justify    	0
-				label      	"+eServices"
-				pctDist    	0.791824
-				height     	32
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5E67D0089"
-			    client     	@210
-			    supplier   	@209
-			    vertices   	(list Points
-				(1066, 1533)
-				(1066, 2059)
-				(1619, 2059))
-			    line_style 	3
-			    origin_attachment 	(1066, 1533)
-			    terminal_attachment 	(1619, 2059)
-			    label      	(object SegLabel @216
-				Parent_View 	@214
-				location   	(1554, 2031)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..*"
-				pctDist    	0.940197
-				height     	29
-				orientation 	0)
-			    label      	(object SegLabel @217
-				Parent_View 	@214
-				location   	(1532, 2113)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	158
-				justify    	0
-				label      	"{ordered}"
-				pctDist    	0.920515
-				height     	54
-				orientation 	1))))
-		(object InheritView "" @218
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B84B1F80382"
-		    client     	@169
-		    supplier   	@163
-		    line_style 	3
-		    origin_attachment 	(1064, 263)
-		    terminal_attachment 	(785, 263))))
-	(object ClassDiagram "2.1.3 Extensibility"
-	    quid       	"3AD60C510192"
-	    title      	"2.1.3 Extensibility"
-	    zoom       	80
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	0
-	    origin_y   	0
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::wsdl::Binding" @219
-		    ShowCompartmentStereotypes 	TRUE
-		    location   	(576, 1584)
-		    label      	(object ItemLabel
-			Parent_View 	@219
-			location   	(494, 1531)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	164
-			justify    	0
-			label      	"Binding")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5D2860261"
-		    width      	182
-		    height     	130
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::Port" @220
-		    ShowCompartmentStereotypes 	TRUE
-		    location   	(1568, 1888)
-		    label      	(object ItemLabel
-			Parent_View 	@220
-			location   	(1487, 1836)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	162
-			justify    	0
-			label      	"Port")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5D9170286"
-		    height     	128
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::Service" @221
-		    ShowCompartmentStereotypes 	TRUE
-		    location   	(1424, 1728)
-		    label      	(object ItemLabel
-			Parent_View 	@221
-			location   	(1342, 1675)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	164
-			justify    	0
-			label      	"Service")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5D8F002F8"
-		    width      	182
-		    height     	130
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::BindingFault" @222
-		    ShowCompartmentStereotypes 	TRUE
-		    location   	(1216, 2336)
-		    label      	(object ItemLabel
-			Parent_View 	@222
-			location   	(1088, 2283)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	256
-			justify    	0
-			label      	"BindingFault")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AE08A9E03A6"
-		    width      	274
-		    height     	130
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::BindingOperation" @223
-		    ShowCompartmentStereotypes 	TRUE
-		    location   	(736, 1760)
-		    label      	(object ItemLabel
-			Parent_View 	@223
-			location   	(563, 1707)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	346
-			justify    	0
-			label      	"BindingOperation")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5D3CB0145"
-		    width      	364
-		    height     	130
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::IExtensibilityElement" @224
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressAttribute 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1888, 160)
-		    label      	(object ItemLabel
-			Parent_View 	@224
-			location   	(1495, 136)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	786
-			justify    	0
-			label      	"IExtensibilityElement")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@224
-			location   	(1495, 86)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	786
-			justify    	0
-			label      	"<<Interface>>")
-		    icon       	"Interface"
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B84B12402AB"
-		    width      	804
-		    height     	172
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::BindingInput" @225
-		    ShowCompartmentStereotypes 	TRUE
-		    location   	(928, 1952)
-		    label      	(object ItemLabel
-			Parent_View 	@225
-			location   	(800, 1899)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	256
-			justify    	0
-			label      	"BindingInput")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AE08A8202D4"
-		    width      	274
-		    height     	130
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::BindingOutput" @226
-		    ShowCompartmentStereotypes 	TRUE
-		    location   	(1008, 2144)
-		    label      	(object ItemLabel
-			Parent_View 	@226
-			location   	(863, 2091)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	290
-			justify    	0
-			label      	"BindingOutput")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AE08A8F028C"
-		    width      	308
-		    height     	130
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::Definition" @227
-		    ShowCompartmentStereotypes 	TRUE
-		    location   	(176, 1296)
-		    label      	(object ItemLabel
-			Parent_View 	@227
-			location   	(74, 1235)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	204
-			justify    	0
-			label      	"Definition")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5E43F008E"
-		    width      	222
-		    height     	146
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::Types" @228
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    location   	(416, 1408)
-		    label      	(object ItemLabel
-			Parent_View 	@228
-			location   	(335, 1356)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	162
-			justify    	0
-			label      	"Types")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B8BE9A603A8"
-		    height     	128
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::ExtensibleElement" @229
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(480, 688)
-		    font       	(object Font
-			italics    	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@229
-			location   	(209, 580)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	542
-			justify    	0
-			label      	"ExtensibleElement")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5FCFA033A"
-		    width      	560
-		    height     	240
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritTreeView "" @230
-		    location   	(480, 1039)
-		    line_color 	3342489
-		    fill_color 	13434879
-		    supplier   	@229
-		    vertices   	(list Points
-			(480, 1039)
-			(480, 808)))
-		(object InheritView "" @231
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD600CB00AA"
-		    client     	@220
-		    supplier   	@229
-		    line_style 	3
-		    origin_attachment 	(1566, 1824)
-		    terminal_attachment 	(1566, 1039)
-		    drawSupplier 	@230)
-		(object InheritView "" @232
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B85B5A4027E"
-		    client     	@226
-		    supplier   	@229
-		    line_style 	3
-		    origin_attachment 	(1097, 2079)
-		    terminal_attachment 	(1097, 1039)
-		    drawSupplier 	@230)
-		(object InheritView "" @233
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AE0938602C9"
-		    client     	@222
-		    supplier   	@229
-		    line_style 	3
-		    origin_attachment 	(1219, 2271)
-		    terminal_attachment 	(1219, 1039)
-		    drawSupplier 	@230)
-		(object InheritView "" @234
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B85B59B0072"
-		    client     	@225
-		    supplier   	@229
-		    line_style 	3
-		    origin_attachment 	(988, 1887)
-		    terminal_attachment 	(988, 1039)
-		    drawSupplier 	@230)
-		(object InheritView "" @235
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD6009202F7"
-		    client     	@223
-		    supplier   	@229
-		    line_style 	3
-		    origin_attachment 	(797, 1695)
-		    terminal_attachment 	(797, 1039)
-		    drawSupplier 	@230)
-		(object InheritView "" @236
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD5FA0F02F0"
-		    client     	@219
-		    supplier   	@229
-		    line_style 	3
-		    origin_attachment 	(601, 1519)
-		    terminal_attachment 	(601, 1039)
-		    drawSupplier 	@230)
-		(object InheritView "" @237
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD5FDB803D4"
-		    client     	@227
-		    supplier   	@229
-		    line_style 	3
-		    origin_attachment 	(211, 1223)
-		    terminal_attachment 	(211, 1039)
-		    drawSupplier 	@230)
-		(object InheritView "" @238
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B8BEB010311"
-		    client     	@228
-		    supplier   	@229
-		    line_style 	3
-		    origin_attachment 	(414, 1344)
-		    terminal_attachment 	(414, 1039)
-		    drawSupplier 	@230)
-		(object InheritView "" @239
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD5FA20025E"
-		    client     	@221
-		    supplier   	@229
-		    line_style 	3
-		    origin_attachment 	(1429, 1663)
-		    terminal_attachment 	(1429, 1039)
-		    drawSupplier 	@230)
-		(object ClassView "Class" "Logical View::wsdl::ExtensibilityElement" @240
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1904, 688)
-		    label      	(object ItemLabel
-			Parent_View 	@240
-			location   	(1632, 583)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	545
-			justify    	0
-			label      	"ExtensibilityElement")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5DBB602A9"
-		    width      	563
-		    height     	234
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$21" @241
-		    location   	(1191, 672)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD5FD130079"
-		    roleview_list 	(list RoleViews
-			(object RoleView "$UNNAMED$22" @242
-			    Parent_View 	@241
-			    location   	(23, 560)
-			    label      	(object SegLabel @243
-				Parent_View 	@242
-				location   	(847, 631)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	60
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5FD14019E"
-			    client     	@241
-			    supplier   	@229
-			    line_style 	3
-			    origin_attachment 	(1191, 672)
-			    terminal_attachment 	(760, 672)
-			    label      	(object SegLabel @244
-				Parent_View 	@242
-				location   	(830, 628)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.839695
-				height     	45
-				orientation 	1))
-			(object RoleView "eExtensibilityElements" @245
-			    Parent_View 	@241
-			    location   	(23, 560)
-			    label      	(object SegLabel @246
-				Parent_View 	@245
-				location   	(1355, 522)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	450
-				justify    	0
-				label      	"+eExtensibilityElements"
-				pctDist    	0.379070
-				height     	151
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5FD14019D"
-			    client     	@241
-			    supplier   	@240
-			    line_style 	3
-			    origin_attachment 	(1191, 672)
-			    terminal_attachment 	(1623, 672)
-			    label      	(object SegLabel @247
-				Parent_View 	@245
-				location   	(1496, 627)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..*"
-				pctDist    	0.709402
-				height     	46
-				orientation 	0)
-			    label      	(object SegLabel @248
-				Parent_View 	@245
-				location   	(1463, 764)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	164
-				justify    	0
-				label      	"{ordered}"
-				pctDist    	0.632479
-				height     	92
-				orientation 	1))))
-		(object ClassView "Class" "Logical View::wsdl::WSDLElement" @249
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    location   	(1008, 192)
-		    font       	(object Font
-			italics    	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@249
-			location   	(630, 84)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	756
-			justify    	0
-			label      	"WSDLElement")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5C6A302DD"
-		    width      	774
-		    height     	240
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritTreeView "" @250
-		    location   	(1008, 402)
-		    line_color 	3342489
-		    fill_color 	13434879
-		    supplier   	@249
-		    vertices   	(list Points
-			(1008, 402)
-			(1008, 312)))
-		(object InheritView "" @251
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD5FE3C03D4"
-		    client     	@229
-		    supplier   	@249
-		    line_style 	3
-		    origin_attachment 	(492, 568)
-		    terminal_attachment 	(492, 402)
-		    drawSupplier 	@250)
-		(object InheritView "" @252
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B84B14903D0"
-		    client     	@240
-		    supplier   	@224
-		    line_style 	3
-		    origin_attachment 	(2015, 571)
-		    terminal_attachment 	(2015, 246))
-		(object InheritView "" @253
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3BDDF53502C3"
-		    client     	@240
-		    supplier   	@249
-		    line_style 	3
-		    origin_attachment 	(1762, 571)
-		    terminal_attachment 	(1762, 402)
-		    drawSupplier 	@250)
-		(object ClassView "Class" "Logical View::wsdl::UnknownExtensibilityElement" @254
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(2016, 1360)
-		    label      	(object ItemLabel
-			Parent_View 	@254
-			location   	(1731, 1307)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	570
-			justify    	0
-			label      	"UnknownExtensibilityElement")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3CB24AC002AE"
-		    width      	588
-		    height     	130
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @255
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3CB24AEC01CB"
-		    client     	@254
-		    supplier   	@240
-		    line_style 	3
-		    origin_attachment 	(1796, 1295)
-		    terminal_attachment 	(1796, 805))
-		(object AssociationViewNew "$UNNAMED$63" @256
-		    location   	(2311, 1686)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F7896A2026E"
-		    roleview_list 	(list RoleViews
-			(object RoleView "parent" @257
-			    Parent_View 	@256
-			    location   	(279, 294)
-			    label      	(object SegLabel @258
-				Parent_View 	@257
-				location   	(2422, 1333)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	144
-				justify    	0
-				label      	"+parent"
-				pctDist    	0.800000
-				height     	42
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3F7896A7012B"
-			    client     	@256
-			    supplier   	@254
-			    vertices   	(list Points
-				(2311, 1686)
-				(2432, 1686)
-				(2432, 1374)
-				(2310, 1374))
-			    line_style 	3
-			    origin_attachment 	(2311, 1686)
-			    terminal_attachment 	(2310, 1374)
-			    label      	(object SegLabel @259
-				Parent_View 	@257
-				location   	(2366, 1428)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..1"
-				pctDist    	0.900000
-				height     	54
-				orientation 	0))
-			(object RoleView "children" @260
-			    Parent_View 	@256
-			    location   	(279, 294)
-			    label      	(object SegLabel @261
-				Parent_View 	@260
-				location   	(1899, 1537)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	168
-				justify    	0
-				label      	"+children"
-				pctDist    	0.798561
-				height     	118
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3F7896A7012C"
-			    client     	@256
-			    supplier   	@254
-			    vertices   	(list Points
-				(2311, 1686)
-				(2016, 1686)
-				(2016, 1425))
-			    line_style 	3
-			    origin_attachment 	(2311, 1686)
-			    terminal_attachment 	(2016, 1425)
-			    label      	(object SegLabel @262
-				Parent_View 	@260
-				location   	(2070, 1481)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..*"
-				pctDist    	0.900000
-				height     	54
-				orientation 	1))))))
-	(object ClassDiagram "2.1.1 Naming and Linking"
-	    quid       	"3AE8ED7201BD"
-	    title      	"2.1.1 Naming and Linking"
-	    zoom       	90
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	0
-	    origin_y   	0
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::wsdl::IImport" @263
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1712, 224)
-		    label      	(object ItemLabel
-			Parent_View 	@263
-			location   	(1422, 177)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	580
-			justify    	0
-			label      	"IImport")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@263
-			location   	(1422, 127)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	580
-			justify    	0
-			label      	"<<Interface>>")
-		    icon       	"Interface"
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B84B2020119"
-		    width      	598
-		    height     	218
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::Namespace" @264
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(432, 1136)
-		    label      	(object ItemLabel
-			Parent_View 	@264
-			location   	(202, 1041)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	461
-			justify    	0
-			label      	"Namespace")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AEA3CD30030"
-		    width      	479
-		    height     	215
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::xsd::XSDSchema" @265
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1632, 1216)
-		    label      	(object ItemLabel
-			Parent_View 	@265
-			location   	(1294, 1142)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	676
-			justify    	0
-			label      	"XSDSchema")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"374B182500BB"
-		    width      	694
-		    height     	173
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::Definition" @266
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    location   	(400, 384)
-		    label      	(object ItemLabel
-			Parent_View 	@266
-			location   	(164, 236)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	472
-			justify    	0
-			label      	"Definition")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5E43F008E"
-		    width      	490
-		    height     	320
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$37" @267
-		    location   	(309, 786)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AEA3D55002D"
-		    roleview_list 	(list RoleViews
-			(object RoleView "eNamespaces" @268
-			    Parent_View 	@267
-			    location   	(-91, 258)
-			    label      	(object SegLabel @269
-				Parent_View 	@268
-				location   	(461, 956)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	288
-				justify    	0
-				label      	"+eNamespaces"
-				pctDist    	0.698842
-				height     	152
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AEA3D560332"
-			    client     	@267
-			    supplier   	@264
-			    line_style 	3
-			    origin_attachment 	(309, 786)
-			    terminal_attachment 	(309, 1029)
-			    label      	(object SegLabel @270
-				Parent_View 	@268
-				location   	(248, 973)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..*"
-				pctDist    	0.768707
-				height     	62
-				orientation 	1)
-			    label      	(object SegLabel @271
-				Parent_View 	@268
-				location   	(228, 913)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	146
-				justify    	0
-				label      	"{ordered}"
-				pctDist    	0.525097
-				height     	82
-				orientation 	1))
-			(object RoleView "$UNNAMED$38" @272
-			    Parent_View 	@267
-			    location   	(-91, 258)
-			    label      	(object SegLabel @273
-				Parent_View 	@272
-				location   	(268, 592)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	192
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AEA3D560328"
-			    client     	@267
-			    supplier   	@266
-			    line_style 	3
-			    origin_attachment 	(309, 786)
-			    terminal_attachment 	(309, 544)
-			    label      	(object SegLabel @274
-				Parent_View 	@272
-				location   	(239, 583)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.844961
-				height     	71
-				orientation 	0))))
-		(object ClassView "Class" "Logical View::wsdl::Import" @275
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1472, 720)
-		    label      	(object ItemLabel
-			Parent_View 	@275
-			location   	(1255, 580)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	434
-			justify    	0
-			label      	"Import")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5E4F903DE"
-		    width      	452
-		    height     	304
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$51" @276
-		    location   	(1486, 1001)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B8B1DCC02E5"
-		    roleview_list 	(list RoleViews
-			(object RoleView "eSchema" @277
-			    Parent_View 	@276
-			    location   	(510, -103)
-			    label      	(object SegLabel @278
-				Parent_View 	@277
-				location   	(1737, 1018)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	204
-				justify    	0
-				label      	"+eSchema"
-				pctDist    	0.592593
-				height     	105
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3B8B1DCE0270"
-			    client     	@276
-			    supplier   	@265
-			    vertices   	(list Points
-				(1486, 1001)
-				(1632, 1001)
-				(1632, 1130))
-			    line_style 	3
-			    origin_attachment 	(1486, 1001)
-			    terminal_attachment 	(1632, 1130)
-			    label      	(object SegLabel @279
-				Parent_View 	@277
-				location   	(1563, 1018)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..1"
-				pctDist    	0.592593
-				height     	70
-				orientation 	1))
-			(object RoleView "$UNNAMED$52" @280
-			    Parent_View 	@276
-			    location   	(510, -103)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3B8B1DCE027A"
-			    client     	@276
-			    supplier   	@275
-			    line_style 	3
-			    origin_attachment 	(1486, 872)
-			    terminal_attachment 	(1486, 872))))
-		(object AssociationViewNew "$UNNAMED$39" @281
-		    location   	(1087, 403)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AEA3E3A002D"
-		    roleview_list 	(list RoleViews
-			(object RoleView "$UNNAMED$40" @282
-			    Parent_View 	@281
-			    location   	(687, -125)
-			    label      	(object SegLabel @283
-				Parent_View 	@282
-				location   	(1406, 480)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	450
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AEA3E3C01F2"
-			    client     	@281
-			    supplier   	@275
-			    vertices   	(list Points
-				(1087, 403)
-				(1364, 403)
-				(1364, 568))
-			    line_style 	3
-			    origin_attachment 	(1087, 403)
-			    terminal_attachment 	(1364, 568))
-			(object RoleView "eDefinition" @284
-			    Parent_View 	@281
-			    location   	(687, -125)
-			    label      	(object SegLabel @285
-				Parent_View 	@284
-				location   	(805, 363)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	216
-				justify    	0
-				label      	"+eDefinition"
-				pctDist    	0.637532
-				height     	41
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AEA3E3C01E8"
-			    client     	@281
-			    supplier   	@266
-			    line_style 	3
-			    origin_attachment 	(1087, 403)
-			    terminal_attachment 	(645, 403)
-			    label      	(object SegLabel @286
-				Parent_View 	@284
-				location   	(727, 456)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..1"
-				pctDist    	0.814910
-				height     	53
-				orientation 	0))))
-		(object AssociationViewNew "$UNNAMED$57" @287
-		    location   	(737, 826)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3C864DFF02EC"
-		    roleview_list 	(list RoleViews
-			(object RoleView "$UNNAMED$58" @288
-			    Parent_View 	@287
-			    location   	(-671, 106)
-			    label      	(object SegLabel @289
-				Parent_View 	@288
-				location   	(552, 647)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	450
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3C864DFF02EE"
-			    client     	@287
-			    supplier   	@266
-			    vertices   	(list Points
-				(737, 826)
-				(510, 826)
-				(510, 544))
-			    line_style 	3
-			    origin_attachment 	(737, 826)
-			    terminal_attachment 	(510, 544)
-			    label      	(object SegLabel @290
-				Parent_View 	@288
-				location   	(457, 595)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.900000
-				height     	54
-				orientation 	0))
-			(object RoleView "eImports" @291
-			    Parent_View 	@287
-			    location   	(-671, 106)
-			    label      	(object SegLabel @292
-				Parent_View 	@291
-				location   	(1144, 773)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	180
-				justify    	0
-				label      	"+eImports"
-				pctDist    	0.799189
-				height     	54
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3C864DFF02ED"
-			    client     	@287
-			    supplier   	@275
-			    line_style 	3
-			    origin_attachment 	(737, 826)
-			    terminal_attachment 	(1246, 826)
-			    label      	(object SegLabel @293
-				Parent_View 	@291
-				location   	(1180, 879)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..*"
-				pctDist    	0.872211
-				height     	53
-				orientation 	1)
-			    label      	(object SegLabel @294
-				Parent_View 	@291
-				location   	(1162, 933)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	146
-				justify    	0
-				label      	"{ordered}"
-				pctDist    	0.837728
-				height     	107
-				orientation 	1))))
-		(object InheritView "" @295
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F6F200D0340"
-		    client     	@275
-		    supplier   	@263
-		    line_style 	3
-		    origin_attachment 	(1555, 568)
-		    terminal_attachment 	(1555, 333))))
-	(object ClassDiagram "2.2 Types"
-	    quid       	"3B85AE59037E"
-	    title      	"2.2 Types"
-	    zoom       	90
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	0
-	    origin_y   	81
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @296
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1136, 1232)
-		    font       	(object Font
-			italics    	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@296
-			location   	(895, 1157)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	482
-			justify    	0
-			label      	"XSDTypeDefinition")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B66ECD302A9"
-		    width      	500
-		    height     	174
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @297
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1136, 1600)
-		    label      	(object ItemLabel
-			Parent_View 	@297
-			location   	(906, 1531)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	460
-			justify    	0
-			label      	"XSDElementDeclaration")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B66ED580214"
-		    width      	478
-		    height     	162
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::Message" @298
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1280, 1968)
-		    label      	(object ItemLabel
-			Parent_View 	@298
-			location   	(1022, 1828)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	517
-			justify    	0
-			label      	"Message")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5C9590078"
-		    width      	535
-		    height     	305
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::Part" @299
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(352, 1184)
-		    label      	(object ItemLabel
-			Parent_View 	@299
-			location   	(128, 1067)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	448
-			justify    	0
-			label      	"Part")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5CE1C032E"
-		    width      	466
-		    height     	258
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$47" @300
-		    location   	(735, 1172)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B8B1BE900C4"
-		    roleview_list 	(list RoleViews
-			(object RoleView "typeDefinition" @301
-			    Parent_View 	@300
-			    location   	(143, 676)
-			    label      	(object SegLabel @302
-				Parent_View 	@301
-				location   	(775, 1133)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	276
-				justify    	0
-				label      	"+typeDefinition"
-				pctDist    	0.269006
-				height     	40
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3B8B1BE90327"
-			    client     	@300
-			    supplier   	@296
-			    line_style 	3
-			    origin_attachment 	(735, 1172)
-			    terminal_attachment 	(886, 1172)
-			    label      	(object SegLabel @303
-				Parent_View 	@301
-				location   	(839, 1207)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..1"
-				pctDist    	0.688705
-				height     	35
-				orientation 	1))
-			(object RoleView "$UNNAMED$48" @304
-			    Parent_View 	@300
-			    location   	(143, 676)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3B8B1BE90331"
-			    client     	@300
-			    supplier   	@299
-			    line_style 	3
-			    origin_attachment 	(735, 1172)
-			    terminal_attachment 	(585, 1172))))
-		(object AssociationViewNew "$UNNAMED$49" @305
-		    location   	(527, 1592)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B8B1C1203B2"
-		    roleview_list 	(list RoleViews
-			(object RoleView "elementDeclaration" @306
-			    Parent_View 	@305
-			    location   	(-65, 1096)
-			    label      	(object SegLabel @307
-				Parent_View 	@306
-				location   	(666, 1554)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	372
-				justify    	0
-				label      	"+elementDeclaration"
-				pctDist    	0.375394
-				height     	39
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3B8B1C14001C"
-			    client     	@305
-			    supplier   	@297
-			    line_style 	3
-			    origin_attachment 	(527, 1592)
-			    terminal_attachment 	(897, 1592)
-			    label      	(object SegLabel @308
-				Parent_View 	@306
-				location   	(807, 1645)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..1"
-				pctDist    	0.755877
-				height     	53
-				orientation 	1))
-			(object RoleView "$UNNAMED$50" @309
-			    Parent_View 	@305
-			    location   	(-65, 1096)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3B8B1C140026"
-			    client     	@305
-			    supplier   	@299
-			    vertices   	(list Points
-				(527, 1592)
-				(437, 1592)
-				(437, 1313))
-			    line_style 	3
-			    origin_attachment 	(527, 1592)
-			    terminal_attachment 	(437, 1313))))
-		(object AssociationViewNew "$UNNAMED$55" @310
-		    location   	(322, 1911)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3C46829303E5"
-		    roleview_list 	(list RoleViews
-			(object RoleView "eMessage" @311
-			    Parent_View 	@310
-			    location   	(-14, 1191)
-			    label      	(object SegLabel @312
-				Parent_View 	@311
-				location   	(838, 1872)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	216
-				justify    	0
-				label      	"+eMessage"
-				pctDist    	0.748560
-				height     	40
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3C468296010E"
-			    client     	@310
-			    supplier   	@298
-			    line_style 	3
-			    origin_attachment 	(322, 1911)
-			    terminal_attachment 	(1013, 1911)
-			    label      	(object SegLabel @313
-				Parent_View 	@311
-				location   	(943, 1965)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..1"
-				pctDist    	0.900000
-				height     	54
-				orientation 	1))
-			(object RoleView "$UNNAMED$56" @314
-			    Parent_View 	@310
-			    location   	(-14, 1191)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3C4682960118"
-			    client     	@310
-			    supplier   	@299
-			    vertices   	(list Points
-				(322, 1911)
-				(229, 1911)
-				(229, 1313))
-			    line_style 	3
-			    origin_attachment 	(322, 1911)
-			    terminal_attachment 	(229, 1313))))
-		(object ClassView "Class" "Logical View::wsdl::Types" @315
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(800, 608)
-		    label      	(object ItemLabel
-			Parent_View 	@315
-			location   	(615, 512)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	371
-			justify    	0
-			label      	"Types")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B8BE9A603A8"
-		    width      	389
-		    height     	216
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::Definition" @316
-		    ShowCompartmentStereotypes 	TRUE
-		    location   	(176, 160)
-		    label      	(object ItemLabel
-			Parent_View 	@316
-			location   	(74, 107)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	204
-			justify    	0
-			label      	"Definition")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5E43F008E"
-		    width      	222
-		    height     	130
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$53" @317
-		    location   	(234, 604)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B8BEA27029F"
-		    roleview_list 	(list RoleViews
-			(object RoleView "eTypes" @318
-			    Parent_View 	@317
-			    location   	(-150, 396)
-			    label      	(object SegLabel @319
-				Parent_View 	@318
-				location   	(480, 640)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	207
-				justify    	0
-				label      	"+eTypes"
-				pctDist    	0.661017
-				height     	36
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3B8BEA29036A"
-			    client     	@317
-			    supplier   	@315
-			    line_style 	3
-			    origin_attachment 	(234, 604)
-			    terminal_attachment 	(606, 604)
-			    label      	(object SegLabel @320
-				Parent_View 	@318
-				location   	(526, 569)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..1"
-				pctDist    	0.783883
-				height     	36
-				orientation 	0))
-			(object RoleView "$UNNAMED$54" @321
-			    Parent_View 	@317
-			    location   	(-150, 396)
-			    label      	(object SegLabel @322
-				Parent_View 	@321
-				location   	(133, 313)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	60
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3B8BEA290356"
-			    client     	@317
-			    supplier   	@316
-			    vertices   	(list Points
-				(234, 604)
-				(174, 604)
-				(174, 225))
-			    line_style 	3
-			    origin_attachment 	(234, 604)
-			    terminal_attachment 	(174, 225)
-			    label      	(object SegLabel @323
-				Parent_View 	@321
-				location   	(228, 271)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.897729
-				height     	54
-				orientation 	1))))
-		(object ClassView "Class" "Logical View::wsdl::ITypes" @324
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(640, 224)
-		    label      	(object ItemLabel
-			Parent_View 	@324
-			location   	(525, 203)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	230
-			justify    	0
-			label      	"ITypes")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@324
-			location   	(525, 153)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	230
-			justify    	0
-			label      	"<<Interface>>")
-		    icon       	"Interface"
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3CADCBB20050"
-		    width      	248
-		    height     	166
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::XSDSchemaExtensibilityElement" @325
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1728, 800)
-		    label      	(object ItemLabel
-			Parent_View 	@325
-			location   	(1359, 753)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	739
-			justify    	0
-			label      	"XSDSchemaExtensibilityElement")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3CC360D7039C"
-		    width      	757
-		    height     	118
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::xsd::XSDSchema" @326
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1856, 1216)
-		    label      	(object ItemLabel
-			Parent_View 	@326
-			location   	(1529, 1103)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	655
-			justify    	0
-			label      	"XSDSchema")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"374B182500BB"
-		    width      	673
-		    height     	250
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$59" @327
-		    location   	(1826, 975)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3CC3614500F2"
-		    roleview_list 	(list RoleViews
-			(object RoleView "$UNNAMED$60" @328
-			    Parent_View 	@327
-			    location   	(306, 447)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3CC36146023D"
-			    client     	@327
-			    supplier   	@325
-			    line_style 	3
-			    origin_attachment 	(1826, 975)
-			    terminal_attachment 	(1826, 859)
-			    label      	(object SegLabel @329
-				Parent_View 	@328
-				location   	(1774, 900)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.656489
-				height     	53
-				orientation 	0))
-			(object RoleView "schema" @330
-			    Parent_View 	@327
-			    location   	(306, 447)
-			    label      	(object SegLabel @331
-				Parent_View 	@330
-				location   	(2006, 1033)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	168
-				justify    	0
-				label      	"+schema"
-				pctDist    	0.507576
-				height     	180
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3CC36146023E"
-			    client     	@327
-			    supplier   	@326
-			    line_style 	3
-			    origin_attachment 	(1826, 975)
-			    terminal_attachment 	(1826, 1091)
-			    label      	(object SegLabel @332
-				Parent_View 	@330
-				location   	(1788, 1050)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..1"
-				pctDist    	0.651515
-				height     	39
-				orientation 	1))))
-		(object InheritView "" @333
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3CADCD3B0380"
-		    client     	@315
-		    supplier   	@324
-		    line_style 	3
-		    origin_attachment 	(705, 500)
-		    terminal_attachment 	(705, 307))
-		(object ClassView "Class" "Logical View::wsdl::ExtensibleElement" @334
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1056, 224)
-		    font       	(object Font
-			italics    	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@334
-			location   	(815, 130)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	482
-			justify    	0
-			label      	"ExtensibleElement")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5FCFA033A"
-		    width      	500
-		    height     	212
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @335
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B8BEB010311"
-		    client     	@315
-		    supplier   	@334
-		    line_style 	3
-		    origin_attachment 	(854, 500)
-		    terminal_attachment 	(854, 330))
-		(object ClassView "Class" "Logical View::wsdl::ExtensibilityElement" @336
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    location   	(1824, 464)
-		    label      	(object ItemLabel
-			Parent_View 	@336
-			location   	(1490, 368)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	669
-			justify    	0
-			label      	"ExtensibilityElement")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5DBB602A9"
-		    width      	687
-		    height     	216
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$21" @337
-		    location   	(1206, 493)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD5FD130079"
-		    roleview_list 	(list RoleViews
-			(object RoleView "$UNNAMED$22" @338
-			    Parent_View 	@337
-			    location   	(-586, 237)
-			    label      	(object SegLabel @339
-				Parent_View 	@338
-				location   	(1136, 386)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	450
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5FD14019E"
-			    client     	@337
-			    supplier   	@334
-			    vertices   	(list Points
-				(1206, 493)
-				(1094, 493)
-				(1094, 330))
-			    line_style 	3
-			    origin_attachment 	(1206, 493)
-			    terminal_attachment 	(1094, 330)
-			    label      	(object SegLabel @340
-				Parent_View 	@338
-				location   	(1042, 377)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.828326
-				height     	53
-				orientation 	0))
-			(object RoleView "eExtensibilityElements" @341
-			    Parent_View 	@337
-			    location   	(-586, 237)
-			    label      	(object SegLabel @342
-				Parent_View 	@341
-				location   	(1196, 454)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	444
-				justify    	0
-				label      	"+eExtensibilityElements"
-				pctDist    	-0.039711
-				height     	40
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5FD14019D"
-			    client     	@337
-			    supplier   	@336
-			    line_style 	3
-			    origin_attachment 	(1206, 493)
-			    terminal_attachment 	(1481, 493)
-			    label      	(object SegLabel @343
-				Parent_View 	@341
-				location   	(1415, 546)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..*"
-				pctDist    	0.764957
-				height     	53
-				orientation 	1)
-			    label      	(object SegLabel @344
-				Parent_View 	@341
-				location   	(1396, 392)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	146
-				justify    	0
-				label      	"{ordered}"
-				pctDist    	0.694915
-				height     	102
-				orientation 	0))))
-		(object InheritView "" @345
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3CC3627F00B7"
-		    client     	@325
-		    supplier   	@336
-		    line_style 	3
-		    origin_attachment 	(1812, 741)
-		    terminal_attachment 	(1812, 572))))
-	(object ClassDiagram "2.3 Messages"
-	    quid       	"3BCE853D02C8"
-	    title      	"2.3 Messages"
-	    zoom       	85
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	0
-	    origin_y   	0
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::wsdl::IMessage" @346
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(448, 224)
-		    label      	(object ItemLabel
-			Parent_View 	@346
-			location   	(267, 122)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	362
-			justify    	0
-			label      	"IMessage")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@346
-			location   	(267, 72)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	362
-			justify    	0
-			label      	"<<Interface>>")
-		    icon       	"Interface"
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B84A8AF004F"
-		    width      	380
-		    height     	328
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::IPart" @347
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressAttribute 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1328, 224)
-		    label      	(object ItemLabel
-			Parent_View 	@347
-			location   	(1029, 124)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	599
-			justify    	0
-			label      	"IPart")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@347
-			location   	(1029, 74)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	599
-			justify    	0
-			label      	"<<Interface>>")
-		    icon       	"Interface"
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B84A93F01BE"
-		    width      	617
-		    height     	324
-		    annotation 	8)
-		(object ClassView "Class" "Logical View::wsdl::Part" @348
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1312, 816)
-		    label      	(object ItemLabel
-			Parent_View 	@348
-			location   	(1075, 690)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	474
-			justify    	0
-			label      	"Part")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5CE1C032E"
-		    width      	492
-		    height     	276
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @349
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B84A96D02F1"
-		    client     	@348
-		    supplier   	@347
-		    line_style 	3
-		    origin_attachment 	(1304, 678)
-		    terminal_attachment 	(1304, 386))
-		(object ClassView "Class" "Logical View::wsdl::Message" @350
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(448, 656)
-		    label      	(object ItemLabel
-			Parent_View 	@350
-			location   	(241, 507)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	414
-			justify    	0
-			label      	"Message")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5C9590078"
-		    width      	432
-		    height     	322
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @351
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B84A8D102BA"
-		    client     	@350
-		    supplier   	@346
-		    line_style 	3
-		    origin_attachment 	(445, 495)
-		    terminal_attachment 	(445, 388))
-		(object AssociationViewNew "$UNNAMED$1" @352
-		    location   	(688, 952)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD5CEBE00E2"
-		    roleview_list 	(list RoleViews
-			(object RoleView "eParts" @353
-			    Parent_View 	@352
-			    location   	(176, 328)
-			    label      	(object SegLabel @354
-				Parent_View 	@353
-				location   	(952, 897)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	144
-				justify    	0
-				label      	"+eParts"
-				pctDist    	0.697452
-				height     	56
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5CEBF0061"
-			    client     	@352
-			    supplier   	@348
-			    line_style 	3
-			    origin_attachment 	(688, 952)
-			    terminal_attachment 	(1066, 952)
-			    label      	(object SegLabel @355
-				Parent_View 	@353
-				location   	(987, 1005)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..*"
-				pctDist    	0.789809
-				height     	53
-				orientation 	1)
-			    label      	(object SegLabel @356
-				Parent_View 	@353
-				location   	(967, 1061)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	154
-				justify    	0
-				label      	"{ordered}"
-				pctDist    	0.742038
-				height     	109
-				orientation 	1))
-			(object RoleView "$UNNAMED$2" @357
-			    Parent_View 	@352
-			    location   	(176, 328)
-			    label      	(object SegLabel @358
-				Parent_View 	@357
-				location   	(404, 893)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	60
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5CEBF0057"
-			    client     	@352
-			    supplier   	@350
-			    vertices   	(list Points
-				(688, 952)
-				(445, 952)
-				(445, 817))
-			    line_style 	3
-			    origin_attachment 	(688, 952)
-			    terminal_attachment 	(445, 817)
-			    label      	(object SegLabel @359
-				Parent_View 	@357
-				location   	(393, 912)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.747604
-				height     	53
-				orientation 	0))))))))
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/model/wsdl.ecore b/bundles/org.eclipse.wst.wsdl/src-wsdl/model/wsdl.ecore
deleted file mode 100644
index 317735fe7..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/model/wsdl.ecore
+++ /dev/null
@@ -1,606 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="wsdl"
-    nsURI="http://www.eclipse.org/wsdl/2003/WSDL" nsPrefix="wsdl">
-  <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-    <details key="documentation" value="The WSDL model contains classes for the Web Services Description Language (WSDL).&#xD;&#xA;&#xD;&#xA;WSDL describes network services as sets of endpoints operating on messages. The operations and messages are described abstractly, and then bound to a concrete network protocol and message format to define an endpoint.&#xD;&#xA;&#xD;&#xA;WSDL describes the formats of the messages exchanged by the services, and supports the XML Schemas specification as its canonical type system. This package uses an XML Schema Infoset model package (see the XSD package) to describe the abstract message formats.&#xD;&#xA;&#xD;&#xA;The model contains the following diagrams, named after the corresponding chapters in the WSDL 1.1 specification (http://www.w3.org/TR/2001/NOTE-wsdl-20010315)&#xD;&#xA;- 2.1 Definition, shows the WSDL definition element and the WSDL document structure&#xD;&#xA;- 2.1.1 Naming and Linking, shows the namespace and import mechanism&#xD;&#xA;- 2.1.3 Extensibility, shows the WSDL extensibility mechanism&#xD;&#xA;- 2.2 Types, shows the use of XML Schema types in WSDL&#xD;&#xA;- 2.3 Messages, 2.4 PortTypes, 2.5 Bindings and 2.7 Services, show the major WSDL elements and their relations.&#xD;&#xA;&#xD;&#xA;The WSDL classes extend the javax.wsdl interfaces defined by JSR 110. Classes with interface and datatype stereotypes are used to represent these non-MOF interfaces."/>
-  </eAnnotations>
-  <eClassifiers xsi:type="ecore:EClass" name="WSDLElement" abstract="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents a WSDL language element."/>
-    </eAnnotations>
-    <eOperations name="getEnclosingDefinition" eType="#//Definition"/>
-    <eOperations name="setEnclosingDefinition">
-      <eParameters name="definition" eType="#//Definition"/>
-    </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="documentationElement" eType="#//DOMElement"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="element" eType="#//DOMElement"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PortType" eSuperTypes="#//WSDLElement #//IPortType">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents a WSDL portType element of the WSDL specification version 1.1 and an Interface component of the WSDL specification version 1.2. A port type or Interface is a named set of abstract operations and the abstract messages involved."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="qName" eType="#//QName"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="undefined" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="proxy" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="resourceURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eOperations" upperBound="-1"
-        eType="#//Operation" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Operation" eSuperTypes="#//WSDLElement #//IOperation">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents a WSDL operation element. A WSDL operation is an abstract description of an action supported by a service."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="style" eType="#//OperationType"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="undefined" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="proxy" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="resourceURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eInput" eType="#//Input"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eOutput" eType="#//Output"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eFaults" upperBound="-1"
-        eType="#//Fault" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eParameterOrdering" upperBound="-1"
-        eType="#//Part"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Message" eSuperTypes="#//WSDLElement #//IMessage">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents a WSDL message element. A WSDL message is an abstract, typed definition of the data being communicated."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="qName" eType="#//QName"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="undefined" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="proxy" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="resourceURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eParts" upperBound="-1"
-        eType="#//Part" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Part" eSuperTypes="#//WSDLElement #//IPart">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents a WSDL part element. Parts describe the logical abstract content of a message. Each part is associated with a type from some type system. "/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="elementName" eType="#//QName"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeName" eType="#//QName"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="typeDefinition" eType="ecore:EClass ../../../org.eclipse.xsd/src-xsd/model/XSD.ecore#//XSDTypeDefinition"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="elementDeclaration" eType="ecore:EClass ../../../org.eclipse.xsd/src-xsd/model/XSD.ecore#//XSDElementDeclaration"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eMessage" eType="#//Message"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Binding" eSuperTypes="#//ExtensibleElement #//IBinding">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents a WSDL binding element. A binding defines message format and protocol details for operations and messages defined by a particular portType. There may be any number of bindings for a given portType."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="qName" eType="#//QName"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="undefined" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="proxy" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="resourceURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="ePortType" lowerBound="1"
-        eType="#//PortType"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eBindingOperations" upperBound="-1"
-        eType="#//BindingOperation" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="BindingOperation" eSuperTypes="#//ExtensibleElement #//IBindingOperation">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents a WSDL operation element within a binding. An operation element within a binding specifies binding information for the operation with the same name within the binding's portType. "/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eOperation" lowerBound="1"
-        eType="#//Operation"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eBindingInput" eType="#//BindingInput"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eBindingOutput" eType="#//BindingOutput"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eBindingFaults" upperBound="-1"
-        eType="#//BindingFault" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Service" eSuperTypes="#//ExtensibleElement #//IService">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents a WSDL service element. A service groups a set of related ports together."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="qName" eType="#//QName"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="undefined" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="proxy" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="resourceURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="ePorts" upperBound="-1"
-        eType="#//Port" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Port" eSuperTypes="#//ExtensibleElement #//IPort">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents a WSDL port element. A port defines an individual endpoint by specifying a single address for a binding"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eBinding" lowerBound="1"
-        eType="#//Binding"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ExtensibilityElement" eSuperTypes="#//WSDLElement #//IExtensibilityElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents a WSDL extensibility element. WSDL allows extensibility elements representing a specific technology under various elements defined by WSDL."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="required" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="elementType" eType="#//QName"
-        transient="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Definition" eSuperTypes="#//ExtensibleElement #//IDefinition">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents a WSDL definitions element. The WSDL definitions element is the root element of a WSDL document."/>
-    </eAnnotations>
-    <eOperations name="getDocument" eType="#//DOMDocument"/>
-    <eOperations name="setDocument">
-      <eParameters name="document" eType="#//DOMDocument"/>
-    </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="targetNamespace" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="location" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="qName" eType="#//QName"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="encoding" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eMessages" upperBound="-1"
-        eType="#//Message" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="ePortTypes" upperBound="-1"
-        eType="#//PortType" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eBindings" upperBound="-1"
-        eType="#//Binding" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eServices" upperBound="-1"
-        eType="#//Service" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eNamespaces" upperBound="-1"
-        eType="#//Namespace" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eTypes" eType="#//Types"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eImports" upperBound="-1"
-        eType="#//Import" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Import" eSuperTypes="#//WSDLElement #//IImport">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents WSDL import element. WSDL allows associating a namespace with a document location using an import element."/>
-    </eAnnotations>
-    <eOperations name="getSchema" eType="ecore:EClass ../../../org.eclipse.xsd/src-xsd/model/XSD.ecore#//XSDSchema"/>
-    <eOperations name="setSchema">
-      <eParameters name="schema" eType="ecore:EClass ../../../org.eclipse.xsd/src-xsd/model/XSD.ecore#//XSDSchema"/>
-    </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="namespaceURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="locationURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eDefinition" eType="#//Definition"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eSchema" eType="ecore:EClass ../../../org.eclipse.xsd/src-xsd/model/XSD.ecore#//XSDSchema"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ExtensibleElement" abstract="true" eSuperTypes="#//WSDLElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value=" WSDL allows elements representing a specific technology (referred to here as extensibility elements) under various elements defined by WSDL. This class represents a WSDL point of extensibility."/>
-    </eAnnotations>
-    <eOperations name="getExtensibilityElements" eType="#//IList"/>
-    <eOperations name="addExtensibilityElement">
-      <eParameters name="extElement" eType="#//IExtensibilityElement"/>
-    </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eExtensibilityElements"
-        upperBound="-1" eType="#//ExtensibilityElement" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Input" eSuperTypes="#//MessageReference #//WSDLElement #//IInput">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents a WSDL input element. An input element specifies the abstract message format for the input of the operation."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Output" eSuperTypes="#//MessageReference #//WSDLElement #//IOutput">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents a WSDL output element. An output element specifies the abstract message format for the output of the operation."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Fault" eSuperTypes="#//MessageReference #//WSDLElement #//IFault">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents a WSDL fault element. Fault elements specify the abstract message format for any error messages that may be output as the result of the operation "/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="BindingInput" eSuperTypes="#//ExtensibleElement #//IBindingInput">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents a WSDL input element within a operation within a binding. An input element within an operation within a binding specifies binding information for the input of the operation. "/>
-    </eAnnotations>
-    <eOperations name="getInput" eType="#//IInput"/>
-    <eOperations name="setInput">
-      <eParameters name="input" eType="#//IInput"/>
-    </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eInput" lowerBound="1"
-        eType="#//Input"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="BindingOutput" eSuperTypes="#//ExtensibleElement #//IBindingOutput">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents a WSDL output element within a operation within a binding. An output element within an operation within a binding specifies binding information for the output of the operation. "/>
-    </eAnnotations>
-    <eOperations name="getOutput" eType="#//IOutput"/>
-    <eOperations name="setOutput">
-      <eParameters name="output" eType="#//IOutput"/>
-    </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eOutput" lowerBound="1"
-        eType="#//Output"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="BindingFault" eSuperTypes="#//ExtensibleElement #//IBindingFault">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents a WSDL fault element within a operation within a binding. A fault element within an operation within a binding specifies binding information for the fault with the same name. "/>
-    </eAnnotations>
-    <eOperations name="getFault" eType="#//IFault"/>
-    <eOperations name="setFault">
-      <eParameters name="fault" eType="#//IFault"/>
-    </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eFault" lowerBound="1"
-        eType="#//Fault"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="QName" instanceClassName="javax.xml.namespace.QName">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the javax.wsdl.QName class. A QName is a fully qualified name."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Namespace">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents a namespace and the corresponding namespace prefix used in a WSDL document."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="URI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="prefix" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="OperationType" instanceClassName="javax.wsdl.OperationType">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="ONE_WAY=1&#xD;&#xA;REQUEST_RESPONSE=2&#xD;&#xA;SOLICIT_RESPONSE=3&#xD;&#xA;NOTIFICATION=4"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IPortType" instanceClassName="javax.wsdl.PortType"
-      abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the javax.wsdl.PortType non-MOF interface."/>
-    </eAnnotations>
-    <eOperations name="addOperation">
-      <eParameters name="operation" eType="#//IOperation"/>
-    </eOperations>
-    <eOperations name="getOperation" eType="#//IOperation">
-      <eParameters name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eParameters name="inputName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eParameters name="outputName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="getOperations" eType="#//IList"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IOperation" instanceClassName="javax.wsdl.Operation"
-      abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the javax.wsdl.Operation non-MOF interface."/>
-    </eAnnotations>
-    <eOperations name="addFault">
-      <eParameters name="fault" eType="#//IFault"/>
-    </eOperations>
-    <eOperations name="getFault" eType="#//IFault">
-      <eParameters name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="getFaults" eType="#//IMap"/>
-    <eOperations name="getParameterOrdering" eType="#//IList"/>
-    <eOperations name="setParameterOrdering">
-      <eParameters name="parameterOrder" eType="#//IList"/>
-    </eOperations>
-    <eOperations name="getInput" eType="#//IInput"/>
-    <eOperations name="setInput">
-      <eParameters name="input" eType="#//IInput"/>
-    </eOperations>
-    <eOperations name="getOutput" eType="#//IOutput"/>
-    <eOperations name="setOutput">
-      <eParameters name="output" eType="#//IOutput"/>
-    </eOperations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IInput" instanceClassName="javax.wsdl.Input"
-      abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the javax.wsdl.Input non-MOF interface."/>
-    </eAnnotations>
-    <eOperations name="getMessage" eType="#//IMessage"/>
-    <eOperations name="setMessage">
-      <eParameters name="message" eType="#//IMessage"/>
-    </eOperations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IOutput" instanceClassName="javax.wsdl.Output"
-      abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the javax.wsdl.Output non-MOF interface."/>
-    </eAnnotations>
-    <eOperations name="getMessage" eType="#//IMessage"/>
-    <eOperations name="setMessage">
-      <eParameters name="message" eType="#//IMessage"/>
-    </eOperations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IFault" instanceClassName="javax.wsdl.Fault"
-      abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the javax.wsdl.Fault non-MOF interface."/>
-    </eAnnotations>
-    <eOperations name="getMessage" eType="#//IMessage"/>
-    <eOperations name="setMessage">
-      <eParameters name="message" eType="#//IMessage"/>
-    </eOperations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IMessage" instanceClassName="javax.wsdl.Message"
-      abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the javax.wsdl.Message non-MOF interface"/>
-    </eAnnotations>
-    <eOperations name="addPart">
-      <eParameters name="part" eType="#//IPart"/>
-    </eOperations>
-    <eOperations name="getPart" eType="#//IPart">
-      <eParameters name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="getParts" eType="#//IMap"/>
-    <eOperations name="getOrderedParts" eType="#//IList">
-      <eParameters name="partOrder" eType="#//IList"/>
-    </eOperations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IPart" instanceClassName="javax.wsdl.Part"
-      abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the javax.wsdl.Part non-MOF interface"/>
-    </eAnnotations>
-    <eOperations name="setExtensionAttribute" eExceptions="#//WSDLException">
-      <eParameters name="name" eType="#//QName"/>
-      <eParameters name="value" eType="#//QName"/>
-    </eOperations>
-    <eOperations name="getExtensionAttributeNames" eType="#//IIterator"/>
-    <eOperations name="getExtensionAttribute" eType="#//QName">
-      <eParameters name="name" eType="#//QName"/>
-    </eOperations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IService" instanceClassName="javax.wsdl.Service"
-      abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the javax.wsdl.Service non-MOF interface."/>
-    </eAnnotations>
-    <eOperations name="addPort">
-      <eParameters name="port" eType="#//IPort"/>
-    </eOperations>
-    <eOperations name="getPorts" eType="#//IMap"/>
-    <eOperations name="getPort" eType="#//IPort">
-      <eParameters name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IPort" instanceClassName="javax.wsdl.Port"
-      abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the javax.wsdl.Port non-MOF interface."/>
-    </eAnnotations>
-    <eOperations name="getBinding" eType="#//IBinding"/>
-    <eOperations name="setBinding">
-      <eParameters name="binding" eType="#//IBinding"/>
-    </eOperations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IBinding" instanceClassName="javax.wsdl.Binding"
-      abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the javax.wsdl.Binding non-MOF interface."/>
-    </eAnnotations>
-    <eOperations name="addBindingOperation">
-      <eParameters name="bindingOperation" eType="#//IBindingOperation"/>
-    </eOperations>
-    <eOperations name="getBindingOperation" eType="#//IBindingOperation">
-      <eParameters name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eParameters name="inputName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eParameters name="outputName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="getBindingOperations" eType="#//IList"/>
-    <eOperations name="getPortType" eType="#//IPortType"/>
-    <eOperations name="setPortType">
-      <eParameters name="portType" eType="#//IPortType"/>
-    </eOperations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IBindingOperation" instanceClassName="javax.wsdl.BindingOperation"
-      abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the javax.wsdl.BindingOperation non-MOF interface."/>
-    </eAnnotations>
-    <eOperations name="addBindingFault">
-      <eParameters name="bindingFault" eType="#//IBindingFault"/>
-    </eOperations>
-    <eOperations name="getBindingFault" eType="#//IBindingFault">
-      <eParameters name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="getBindingFaults" eType="#//IMap"/>
-    <eOperations name="getOperation" eType="#//IOperation"/>
-    <eOperations name="setOperation">
-      <eParameters name="operation" eType="#//IOperation"/>
-    </eOperations>
-    <eOperations name="getBindingInput" eType="#//IBindingInput"/>
-    <eOperations name="setBindingInput">
-      <eParameters name="bindingInput" eType="#//IBindingInput"/>
-    </eOperations>
-    <eOperations name="getBindingOutput" eType="#//IBindingOutput"/>
-    <eOperations name="setBindingOutput">
-      <eParameters name="bindingOutput" eType="#//IBindingOutput"/>
-    </eOperations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IBindingInput" instanceClassName="javax.wsdl.BindingInput"
-      abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the javax.wsdl.BindingInput non-MOF interface."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IBindingOutput" instanceClassName="javax.wsdl.BindingOutput"
-      abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the javax.wsdl.BindingOutput non-MOF interface."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IBindingFault" instanceClassName="javax.wsdl.BindingFault"
-      abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the javax.wsdl.BindingFault non-MOF interface."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="DOMElement" instanceClassName="org.w3c.dom.Element">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the org.w3c.dom.Element non-MOF interface."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IExtensibilityElement" instanceClassName="javax.wsdl.extensions.ExtensibilityElement"
-      abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the javax.wsdl.ExtensibilityElement non-MOF interface."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IDefinition" instanceClassName="javax.wsdl.Definition"
-      abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the javax.wsdl.Definition non-MOF interface."/>
-    </eAnnotations>
-    <eOperations name="addBinding">
-      <eParameters name="binding" eType="#//IBinding"/>
-    </eOperations>
-    <eOperations name="addImport">
-      <eParameters name="importDef" eType="#//IImport"/>
-    </eOperations>
-    <eOperations name="addMessage">
-      <eParameters name="message" eType="#//IMessage"/>
-    </eOperations>
-    <eOperations name="addNamespace">
-      <eParameters name="prefix" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eParameters name="namespaceURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="addPortType">
-      <eParameters name="portType" eType="#//IPortType"/>
-    </eOperations>
-    <eOperations name="addService">
-      <eParameters name="service" eType="#//IService"/>
-    </eOperations>
-    <eOperations name="createBindingFault" eType="#//IBindingFault"/>
-    <eOperations name="createBindingInput" eType="#//IBindingInput"/>
-    <eOperations name="createBindingOutput" eType="#//IBindingOutput"/>
-    <eOperations name="createBindingOperation" eType="#//IBindingOperation"/>
-    <eOperations name="createBinding" eType="#//IBinding"/>
-    <eOperations name="createFault" eType="#//IFault"/>
-    <eOperations name="createImport" eType="#//IImport"/>
-    <eOperations name="createInput" eType="#//IInput"/>
-    <eOperations name="createMessage" eType="#//IMessage"/>
-    <eOperations name="createOperation" eType="#//IOperation"/>
-    <eOperations name="createOutput" eType="#//IOutput"/>
-    <eOperations name="createPart" eType="#//IPart"/>
-    <eOperations name="createPort" eType="#//IPort"/>
-    <eOperations name="createPortType" eType="#//IPortType"/>
-    <eOperations name="createService" eType="#//IService"/>
-    <eOperations name="getBinding" eType="#//IBinding">
-      <eParameters name="name" eType="#//QName"/>
-    </eOperations>
-    <eOperations name="getBindings" eType="#//IMap"/>
-    <eOperations name="getImports" eType="#//IMap"/>
-    <eOperations name="getImports" eType="#//IList">
-      <eParameters name="namespaceURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="getMessage" eType="#//IMessage">
-      <eParameters name="name" eType="#//QName"/>
-    </eOperations>
-    <eOperations name="getMessages" eType="#//IMap"/>
-    <eOperations name="getNamespace" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eParameters name="prefix" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="getNamespaces" eType="#//IMap"/>
-    <eOperations name="getPortType" eType="#//IPortType">
-      <eParameters name="name" eType="#//QName"/>
-    </eOperations>
-    <eOperations name="getPortTypes" eType="#//IMap"/>
-    <eOperations name="getPrefix" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eParameters name="namespaceURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="getService" eType="#//IService">
-      <eParameters name="name" eType="#//QName"/>
-    </eOperations>
-    <eOperations name="getServices" eType="#//IMap"/>
-    <eOperations name="getExtensionRegistry" eType="#//IExtensionRegistry"/>
-    <eOperations name="setExtensionRegistry">
-      <eParameters name="extensionRegistry" eType="#//IExtensionRegistry"/>
-    </eOperations>
-    <eOperations name="getDocumentBaseURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eOperations name="setDocumentBaseURI">
-      <eParameters name="documentBase" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="createTypes" eType="#//ITypes"/>
-    <eOperations name="removeService" eType="#//IService">
-      <eParameters name="name" eType="#//QName"/>
-    </eOperations>
-    <eOperations name="removeBinding" eType="#//IBinding">
-      <eParameters name="name" eType="#//QName"/>
-    </eOperations>
-    <eOperations name="removePortType" eType="#//IPortType">
-      <eParameters name="name" eType="#//QName"/>
-    </eOperations>
-    <eOperations name="removeMessage" eType="#//IMessage">
-      <eParameters name="name" eType="#//QName"/>
-    </eOperations>
-    <eOperations name="getTypes" eType="#//ITypes"/>
-    <eOperations name="setTypes">
-      <eParameters name="types" eType="#//ITypes"/>
-    </eOperations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IImport" instanceClassName="javax.wsdl.Import"
-      abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the javax.wsdl.Import non-MOF interface."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IList" instanceClassName="java.util.List"
-      abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the non-MOF java.util.List interface."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IMap" instanceClassName="java.util.Map"
-      abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the non-MOF java.util.Map interface."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IURL" instanceClassName="java.net.URL"
-      abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the non-MOF java.net.URL interface."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IExtensionRegistry" instanceClassName="javax.wsdl.extensions.ExtensionRegistry"
-      abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the non-MOF javax.wsdl.extensions.ExtensionRegistry interface."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Types" eSuperTypes="#//ExtensibleElement #//ITypes">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents a WSDL types element. The types element encloses data type definitions that are relevant for the exchanged messages."/>
-    </eAnnotations>
-    <eOperations name="getSchemas" eType="#//IList"/>
-    <eOperations name="getSchemas" eType="#//IList">
-      <eParameters name="namespaceURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IIterator" instanceClassName="java.util.Iterator"
-      abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the non-MOF java.util.Iterator interface."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="WSDLException" instanceClassName="javax.wsdl.WSDLException">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the javax.wsdl.Exception class."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ITypes" instanceClassName="javax.wsdl.Types"
-      abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the javax.wsdl.Types non-MOF interface"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="UnknownExtensibilityElement" eSuperTypes="#//ExtensibilityElement">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
-        eType="#//UnknownExtensibilityElement" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XSDSchemaExtensibilityElement" eSuperTypes="#//ExtensibilityElement">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="schema" eType="ecore:EClass ../../../org.eclipse.xsd/src-xsd/model/XSD.ecore#//XSDSchema"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="DOMDocument" instanceClassName="org.w3c.dom.Document">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the org.w3c.dom.Document non-MOF interface."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MessageReference" abstract="true" eSuperTypes="#//WSDLElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eMessage" lowerBound="1"
-        eType="#//Message"/>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/model/wsdl.genmodel b/bundles/org.eclipse.wst.wsdl/src-wsdl/model/wsdl.genmodel
deleted file mode 100644
index d3cc8d0b7..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/model/wsdl.genmodel
+++ /dev/null
@@ -1,393 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.wst.wsdl/src"
-    editDirectory="/org.eclipse.wst.wsdl.edit/src" editorDirectory="org.eclipse.wst.wsdl.editor/src"
-    modelPluginID="org.eclipse.wst.wsdl" modelName="WSDL" editPluginClass="" editorPluginClass=""
-    usedGenPackages="../../../org.eclipse.xsd/src-xsd/model/XSD.genmodel#//xsd">
-  <foreignModel>..\rose\WSDL.mdl</foreignModel>
-  <foreignModel>VABASE_PLUGINS_PATH</foreignModel>
-  <foreignModel>../../..</foreignModel>
-  <genPackages prefix="WSDL" basePackage="org.eclipse.wst" disposableProviderFactory="true"
-      ecorePackage="wsdl.ecore#/">
-    <genDataTypes ecoreDataType="wsdl.ecore#//QName"/>
-    <genDataTypes ecoreDataType="wsdl.ecore#//OperationType"/>
-    <genDataTypes ecoreDataType="wsdl.ecore#//DOMElement"/>
-    <genDataTypes ecoreDataType="wsdl.ecore#//WSDLException"/>
-    <genDataTypes ecoreDataType="wsdl.ecore#//DOMDocument"/>
-    <genClasses ecoreClass="wsdl.ecore#//WSDLElement">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//WSDLElement/documentationElement"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//WSDLElement/element"/>
-      <genOperations ecoreOperation="wsdl.ecore#//WSDLElement/getEnclosingDefinition"/>
-      <genOperations ecoreOperation="wsdl.ecore#//WSDLElement/setEnclosingDefinition">
-        <genParameters ecoreParameter="wsdl.ecore#//WSDLElement/setEnclosingDefinition/definition"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//PortType">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//PortType/qName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//PortType/undefined"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//PortType/proxy"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//PortType/resourceURI"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//PortType/eOperations"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Operation">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Operation/style"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Operation/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Operation/undefined"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Operation/proxy"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Operation/resourceURI"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Operation/eInput"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Operation/eOutput"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Operation/eFaults"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Operation/eParameterOrdering"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Message">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Message/qName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Message/undefined"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Message/proxy"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Message/resourceURI"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Message/eParts"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Part">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Part/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Part/elementName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Part/typeName"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Part/typeDefinition"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Part/elementDeclaration"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Part/eMessage"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Binding">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Binding/qName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Binding/undefined"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Binding/proxy"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Binding/resourceURI"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Binding/ePortType"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Binding/eBindingOperations"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//BindingOperation">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//BindingOperation/name"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//BindingOperation/eOperation"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//BindingOperation/eBindingInput"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//BindingOperation/eBindingOutput"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//BindingOperation/eBindingFaults"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Service">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Service/qName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Service/undefined"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Service/proxy"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Service/resourceURI"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Service/ePorts"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Port">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Port/name"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Port/eBinding"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//ExtensibilityElement">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//ExtensibilityElement/required"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//ExtensibilityElement/elementType"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Definition">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Definition/targetNamespace"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Definition/location"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Definition/qName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Definition/encoding"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eMessages"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/ePortTypes"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eBindings"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eServices"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eNamespaces"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eTypes"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eImports"/>
-      <genOperations ecoreOperation="wsdl.ecore#//Definition/getDocument"/>
-      <genOperations ecoreOperation="wsdl.ecore#//Definition/setDocument">
-        <genParameters ecoreParameter="wsdl.ecore#//Definition/setDocument/document"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Import">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Import/namespaceURI"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Import/locationURI"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Import/eDefinition"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Import/eSchema"/>
-      <genOperations ecoreOperation="wsdl.ecore#//Import/getSchema"/>
-      <genOperations ecoreOperation="wsdl.ecore#//Import/setSchema">
-        <genParameters ecoreParameter="wsdl.ecore#//Import/setSchema/schema"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//ExtensibleElement">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//ExtensibleElement/eExtensibilityElements"/>
-      <genOperations ecoreOperation="wsdl.ecore#//ExtensibleElement/getExtensibilityElements"/>
-      <genOperations ecoreOperation="wsdl.ecore#//ExtensibleElement/addExtensibilityElement">
-        <genParameters ecoreParameter="wsdl.ecore#//ExtensibleElement/addExtensibilityElement/extElement"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Input"/>
-    <genClasses ecoreClass="wsdl.ecore#//Output"/>
-    <genClasses ecoreClass="wsdl.ecore#//Fault"/>
-    <genClasses ecoreClass="wsdl.ecore#//BindingInput">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//BindingInput/name"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//BindingInput/eInput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//BindingInput/getInput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//BindingInput/setInput">
-        <genParameters ecoreParameter="wsdl.ecore#//BindingInput/setInput/input"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//BindingOutput">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//BindingOutput/name"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//BindingOutput/eOutput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//BindingOutput/getOutput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//BindingOutput/setOutput">
-        <genParameters ecoreParameter="wsdl.ecore#//BindingOutput/setOutput/output"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//BindingFault">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//BindingFault/name"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//BindingFault/eFault"/>
-      <genOperations ecoreOperation="wsdl.ecore#//BindingFault/getFault"/>
-      <genOperations ecoreOperation="wsdl.ecore#//BindingFault/setFault">
-        <genParameters ecoreParameter="wsdl.ecore#//BindingFault/setFault/fault"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Namespace">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Namespace/URI"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Namespace/prefix"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IPortType">
-      <genOperations ecoreOperation="wsdl.ecore#//IPortType/addOperation">
-        <genParameters ecoreParameter="wsdl.ecore#//IPortType/addOperation/operation"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IPortType/getOperation">
-        <genParameters ecoreParameter="wsdl.ecore#//IPortType/getOperation/name"/>
-        <genParameters ecoreParameter="wsdl.ecore#//IPortType/getOperation/inputName"/>
-        <genParameters ecoreParameter="wsdl.ecore#//IPortType/getOperation/outputName"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IPortType/getOperations"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IOperation">
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/addFault">
-        <genParameters ecoreParameter="wsdl.ecore#//IOperation/addFault/fault"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/getFault">
-        <genParameters ecoreParameter="wsdl.ecore#//IOperation/getFault/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/getFaults"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/getParameterOrdering"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/setParameterOrdering">
-        <genParameters ecoreParameter="wsdl.ecore#//IOperation/setParameterOrdering/parameterOrder"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/getInput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/setInput">
-        <genParameters ecoreParameter="wsdl.ecore#//IOperation/setInput/input"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/getOutput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/setOutput">
-        <genParameters ecoreParameter="wsdl.ecore#//IOperation/setOutput/output"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IInput">
-      <genOperations ecoreOperation="wsdl.ecore#//IInput/getMessage"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IInput/setMessage">
-        <genParameters ecoreParameter="wsdl.ecore#//IInput/setMessage/message"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IOutput">
-      <genOperations ecoreOperation="wsdl.ecore#//IOutput/getMessage"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IOutput/setMessage">
-        <genParameters ecoreParameter="wsdl.ecore#//IOutput/setMessage/message"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IFault">
-      <genOperations ecoreOperation="wsdl.ecore#//IFault/getMessage"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IFault/setMessage">
-        <genParameters ecoreParameter="wsdl.ecore#//IFault/setMessage/message"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IMessage">
-      <genOperations ecoreOperation="wsdl.ecore#//IMessage/addPart">
-        <genParameters ecoreParameter="wsdl.ecore#//IMessage/addPart/part"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IMessage/getPart">
-        <genParameters ecoreParameter="wsdl.ecore#//IMessage/getPart/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IMessage/getParts"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IMessage/getOrderedParts">
-        <genParameters ecoreParameter="wsdl.ecore#//IMessage/getOrderedParts/partOrder"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IPart">
-      <genOperations ecoreOperation="wsdl.ecore#//IPart/setExtensionAttribute">
-        <genParameters ecoreParameter="wsdl.ecore#//IPart/setExtensionAttribute/name"/>
-        <genParameters ecoreParameter="wsdl.ecore#//IPart/setExtensionAttribute/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IPart/getExtensionAttributeNames"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IPart/getExtensionAttribute">
-        <genParameters ecoreParameter="wsdl.ecore#//IPart/getExtensionAttribute/name"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IService">
-      <genOperations ecoreOperation="wsdl.ecore#//IService/addPort">
-        <genParameters ecoreParameter="wsdl.ecore#//IService/addPort/port"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IService/getPorts"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IService/getPort">
-        <genParameters ecoreParameter="wsdl.ecore#//IService/getPort/name"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IPort">
-      <genOperations ecoreOperation="wsdl.ecore#//IPort/getBinding"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IPort/setBinding">
-        <genParameters ecoreParameter="wsdl.ecore#//IPort/setBinding/binding"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IBinding">
-      <genOperations ecoreOperation="wsdl.ecore#//IBinding/addBindingOperation">
-        <genParameters ecoreParameter="wsdl.ecore#//IBinding/addBindingOperation/bindingOperation"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IBinding/getBindingOperation">
-        <genParameters ecoreParameter="wsdl.ecore#//IBinding/getBindingOperation/name"/>
-        <genParameters ecoreParameter="wsdl.ecore#//IBinding/getBindingOperation/inputName"/>
-        <genParameters ecoreParameter="wsdl.ecore#//IBinding/getBindingOperation/outputName"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IBinding/getBindingOperations"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IBinding/getPortType"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IBinding/setPortType">
-        <genParameters ecoreParameter="wsdl.ecore#//IBinding/setPortType/portType"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IBindingOperation">
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/addBindingFault">
-        <genParameters ecoreParameter="wsdl.ecore#//IBindingOperation/addBindingFault/bindingFault"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/getBindingFault">
-        <genParameters ecoreParameter="wsdl.ecore#//IBindingOperation/getBindingFault/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/getBindingFaults"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/getOperation"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/setOperation">
-        <genParameters ecoreParameter="wsdl.ecore#//IBindingOperation/setOperation/operation"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/getBindingInput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/setBindingInput">
-        <genParameters ecoreParameter="wsdl.ecore#//IBindingOperation/setBindingInput/bindingInput"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/getBindingOutput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/setBindingOutput">
-        <genParameters ecoreParameter="wsdl.ecore#//IBindingOperation/setBindingOutput/bindingOutput"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IBindingInput"/>
-    <genClasses ecoreClass="wsdl.ecore#//IBindingOutput"/>
-    <genClasses ecoreClass="wsdl.ecore#//IBindingFault"/>
-    <genClasses ecoreClass="wsdl.ecore#//IExtensibilityElement"/>
-    <genClasses ecoreClass="wsdl.ecore#//IDefinition">
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addBinding">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addBinding/binding"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addImport">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addImport/importDef"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addMessage">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addMessage/message"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addNamespace">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addNamespace/prefix"/>
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addNamespace/namespaceURI"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addPortType">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addPortType/portType"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addService">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addService/service"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createBindingFault"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createBindingInput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createBindingOutput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createBindingOperation"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createBinding"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createFault"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createImport"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createInput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createMessage"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createOperation"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createOutput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createPart"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createPort"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createPortType"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createService"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getBinding">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getBinding/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getBindings"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getImports"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getImports.1">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getImports.1/namespaceURI"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getMessage">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getMessage/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getMessages"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getNamespace">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getNamespace/prefix"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getNamespaces"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getPortType">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getPortType/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getPortTypes"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getPrefix">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getPrefix/namespaceURI"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getService">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getService/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getServices"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getExtensionRegistry"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/setExtensionRegistry">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/setExtensionRegistry/extensionRegistry"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getDocumentBaseURI"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/setDocumentBaseURI">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/setDocumentBaseURI/documentBase"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createTypes"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/removeService">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/removeService/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/removeBinding">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/removeBinding/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/removePortType">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/removePortType/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/removeMessage">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/removeMessage/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getTypes"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/setTypes">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/setTypes/types"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IImport"/>
-    <genClasses ecoreClass="wsdl.ecore#//IList"/>
-    <genClasses ecoreClass="wsdl.ecore#//IMap"/>
-    <genClasses ecoreClass="wsdl.ecore#//IURL"/>
-    <genClasses ecoreClass="wsdl.ecore#//IExtensionRegistry"/>
-    <genClasses ecoreClass="wsdl.ecore#//Types">
-      <genOperations ecoreOperation="wsdl.ecore#//Types/getSchemas"/>
-      <genOperations ecoreOperation="wsdl.ecore#//Types/getSchemas.1">
-        <genParameters ecoreParameter="wsdl.ecore#//Types/getSchemas.1/namespaceURI"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IIterator"/>
-    <genClasses ecoreClass="wsdl.ecore#//ITypes"/>
-    <genClasses ecoreClass="wsdl.ecore#//UnknownExtensibilityElement">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//UnknownExtensibilityElement/children"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//XSDSchemaExtensibilityElement">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//XSDSchemaExtensibilityElement/schema"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//MessageReference">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//MessageReference/name"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//MessageReference/eMessage"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Binding.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Binding.java
deleted file mode 100644
index 6f639d899..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Binding.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-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>'.
- * @since 1.0
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This class represents a WSDL binding element. A binding defines message format and protocol details for operations and messages defined by a particular portType. There may be any number of bindings for a given portType.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.Binding#getQName <em>QName</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Binding#isUndefined <em>Undefined</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Binding#isProxy <em>Proxy</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Binding#getResourceURI <em>Resource URI</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Binding#getEPortType <em>EPort Type</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Binding#getEBindingOperations <em>EBinding Operations</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wsdl.WSDLPackage#getBinding()
- * @model 
- * @generated
- */
-public interface Binding extends ExtensibleElement, javax.wsdl.Binding{
-  /**
-   * Returns the value of the '<em><b>QName</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>QName</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>QName</em>' attribute.
-   * @see #setQName(QName)
-   * @see org.eclipse.wsdl.WSDLPackage#getBinding_QName()
-   * @model dataType="org.eclipse.wsdl.QName"
-   * @generated
-   */
-	QName getQName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Binding#getQName <em>QName</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>QName</em>' attribute.
-   * @see #getQName()
-   * @generated
-   */
-	void setQName(QName value);
-
-  /**
-   * Returns the value of the '<em><b>Undefined</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Undefined</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>Undefined</em>' attribute.
-   * @see #setUndefined(boolean)
-   * @see org.eclipse.wsdl.WSDLPackage#getBinding_Undefined()
-   * @model 
-   * @generated
-   */
-	boolean isUndefined();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Binding#isUndefined <em>Undefined</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Undefined</em>' attribute.
-   * @see #isUndefined()
-   * @generated
-   */
-	void setUndefined(boolean value);
-
-  /**
-   * Returns the value of the '<em><b>EPort Type</b></em>' reference.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>EPort Type</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>EPort Type</em>' reference.
-   * @see #setEPortType(PortType)
-   * @see org.eclipse.wsdl.WSDLPackage#getBinding_EPortType()
-   * @model required="true"
-   * @generated
-   */
-	PortType getEPortType();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Binding#getEPortType <em>EPort Type</em>}' reference.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>EPort Type</em>' reference.
-   * @see #getEPortType()
-   * @generated
-   */
-	void setEPortType(PortType value);
-
-  /**
-   * Returns the value of the '<em><b>EBinding Operations</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.wsdl.BindingOperation}.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>EBinding Operations</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>EBinding Operations</em>' containment reference list.
-   * @see org.eclipse.wsdl.WSDLPackage#getBinding_EBindingOperations()
-   * @model type="org.eclipse.wsdl.BindingOperation" containment="true"
-   * @generated
-   */
-	EList getEBindingOperations();
-
-} // Binding
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/BindingFault.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/BindingFault.java
deleted file mode 100644
index 20a9109f3..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/BindingFault.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Binding Fault</b></em>'.
- * @since 1.0
- * <!-- 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 -->
-   * This method is same as getEFault() and compatible with the JWSDL API.
-   * @see #getEFault()
-   * @return the value of the '<em>EFault</em>' reference.
-   * @ignore
-   * <!-- end-user-doc -->
-   * @model parameters=""
-   * @generated
-   */
-	javax.wsdl.Fault getFault();
-
-  /**
-   * <!-- begin-user-doc -->
-   * This method is same as setEFault(Fault) and compatible with the JWSDL API.
-   * @see #setEFault(Fault)
-   * @param fault the new value of the '<em>EFault</em>' reference.
-   * @ignore
-   * <!-- end-user-doc -->
-   * @model 
-   * @generated
-   */
-	void setFault(javax.wsdl.Fault fault);
-
-} // BindingFault
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/BindingInput.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/BindingInput.java
deleted file mode 100644
index c4c66587f..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/BindingInput.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Binding Input</b></em>'.
- * @since 1.0
- * <!-- 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 -->
-   * This method is same as getEInput() and compatible with the JWSDL API.
-   * @see #getEInput()
-   * @return the value of the '<em>EInput</em>' reference.
-   * @ignore
-   * <!-- end-user-doc -->
-   * @model parameters=""
-   * @generated
-   */
-	javax.wsdl.Input getInput();
-
-  /**
-   * <!-- begin-user-doc -->
-   * This method is same as setEInput(Input) and compatible with the JWSDL API.
-   * @see #setEInput(Input)
-   * @param input the new value of the '<em>EInput</em>' reference.
-   * @ignore
-   * <!-- end-user-doc -->
-   * @model 
-   * @generated
-   */
-	void setInput(javax.wsdl.Input input);
-
-} // BindingInput
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/BindingOperation.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/BindingOperation.java
deleted file mode 100644
index f47d01dde..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/BindingOperation.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Binding Operation</b></em>'.
- * @since 1.0
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This class represents a WSDL operation element within a binding. An operation element within a binding specifies binding information for the operation with the same name within the binding's portType. 
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.BindingOperation#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wsdl.BindingOperation#getEOperation <em>EOperation</em>}</li>
- *   <li>{@link org.eclipse.wsdl.BindingOperation#getEBindingInput <em>EBinding Input</em>}</li>
- *   <li>{@link org.eclipse.wsdl.BindingOperation#getEBindingOutput <em>EBinding Output</em>}</li>
- *   <li>{@link org.eclipse.wsdl.BindingOperation#getEBindingFaults <em>EBinding Faults</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wsdl.WSDLPackage#getBindingOperation()
- * @model 
- * @generated
- */
-public interface BindingOperation extends ExtensibleElement, javax.wsdl.BindingOperation{
-  /**
-   * Returns the value of the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>Name</em>' attribute.
-   * @see #setName(String)
-   * @see org.eclipse.wsdl.WSDLPackage#getBindingOperation_Name()
-   * @model 
-   * @generated
-   */
-	String getName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.BindingOperation#getName <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Name</em>' attribute.
-   * @see #getName()
-   * @generated
-   */
-	void setName(String value);
-
-  /**
-   * Returns the value of the '<em><b>EOperation</b></em>' reference.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>EOperation</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>EOperation</em>' reference.
-   * @see #setEOperation(Operation)
-   * @see org.eclipse.wsdl.WSDLPackage#getBindingOperation_EOperation()
-   * @model required="true"
-   * @generated
-   */
-	Operation getEOperation();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.BindingOperation#getEOperation <em>EOperation</em>}' reference.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>EOperation</em>' reference.
-   * @see #getEOperation()
-   * @generated
-   */
-	void setEOperation(Operation value);
-
-  /**
-   * Returns the value of the '<em><b>EBinding Input</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>EBinding Input</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>EBinding Input</em>' containment reference.
-   * @see #setEBindingInput(BindingInput)
-   * @see org.eclipse.wsdl.WSDLPackage#getBindingOperation_EBindingInput()
-   * @model containment="true"
-   * @generated
-   */
-	BindingInput getEBindingInput();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.BindingOperation#getEBindingInput <em>EBinding Input</em>}' containment reference.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>EBinding Input</em>' containment reference.
-   * @see #getEBindingInput()
-   * @generated
-   */
-	void setEBindingInput(BindingInput value);
-
-  /**
-   * Returns the value of the '<em><b>EBinding Output</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>EBinding Output</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>EBinding Output</em>' containment reference.
-   * @see #setEBindingOutput(BindingOutput)
-   * @see org.eclipse.wsdl.WSDLPackage#getBindingOperation_EBindingOutput()
-   * @model containment="true"
-   * @generated
-   */
-	BindingOutput getEBindingOutput();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.BindingOperation#getEBindingOutput <em>EBinding Output</em>}' containment reference.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>EBinding Output</em>' containment reference.
-   * @see #getEBindingOutput()
-   * @generated
-   */
-	void setEBindingOutput(BindingOutput value);
-
-  /**
-   * Returns the value of the '<em><b>EBinding Faults</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.wsdl.BindingFault}.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>EBinding Faults</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>EBinding Faults</em>' containment reference list.
-   * @see org.eclipse.wsdl.WSDLPackage#getBindingOperation_EBindingFaults()
-   * @model type="org.eclipse.wsdl.BindingFault" containment="true"
-   * @generated
-   */
-	EList getEBindingFaults();
-
-} // BindingOperation
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/BindingOutput.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/BindingOutput.java
deleted file mode 100644
index 4f209016e..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/BindingOutput.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Binding Output</b></em>'.
- * @since 1.0
- * @ignore
- * <!-- 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 -->
-   * This method is same as getEOutput() and compatible with the JWSDL API.
-   * @see #getEOutput()
-   * @return the value of the '<em>EOutput</em>' reference.
-   * @ignore
-   * <!-- end-user-doc -->
-   * @model parameters=""
-   * @generated
-   */
-	javax.wsdl.Output getOutput();
-
-  /**
-   * <!-- begin-user-doc -->
-   * This method is same as setEOutput(Output) and compatible with the JWSDL API.
-   * @see #setEOutput(Output)
-   * @param output the new value of the '<em>EOutput</em>' reference.
-   * @ignore
-   * <!-- end-user-doc -->
-   * @model 
-   * @generated
-   */
-	void setOutput(javax.wsdl.Output output);
-
-} // BindingOutput
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Definition.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Definition.java
deleted file mode 100644
index 993b66d9a..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Definition.java
+++ /dev/null
@@ -1,299 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-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>'.
- * @since 1.0
- * @ignore
- * <!-- 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 -->
-   * Returns a W3C DOM Document built from the input WSDL document.
-   * @return W3C DOM Document.
-   * @ignore
-   * <!-- end-user-doc -->
-   * @model dataType="org.eclipse.wsdl.DOMDocument" parameters=""
-   * @generated
-   */
-  Document getDocument();
-
-  /**
-   * <!-- begin-user-doc -->
-   * Sets a W3C DOM Document to be used when building up a DOM Element tree for the WSDL model.
-   * @param document W3C DOM Document.
-   * @ignore
-   * <!-- end-user-doc -->
-   * @model parameters="org.eclipse.wsdl.DOMDocument"
-   * @generated
-   */
-  void setDocument(Document document);
-
-} // Definition
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/ExtensibilityElement.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/ExtensibilityElement.java
deleted file mode 100644
index bf269011b..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/ExtensibilityElement.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-import javax.xml.namespace.QName;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Extensibility Element</b></em>'.
- * @since 1.0
- * @ignore
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This class represents a WSDL extensibility element. WSDL allows extensibility elements representing a specific technology under various elements defined by WSDL.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.ExtensibilityElement#isRequired <em>Required</em>}</li>
- *   <li>{@link org.eclipse.wsdl.ExtensibilityElement#getElementType <em>Element Type</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wsdl.WSDLPackage#getExtensibilityElement()
- * @model 
- * @generated
- */
-public interface ExtensibilityElement extends WSDLElement, javax.wsdl.extensions.ExtensibilityElement{
-  /**
-   * Returns the value of the '<em><b>Required</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Required</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>Required</em>' attribute.
-   * @see #setRequired(boolean)
-   * @see org.eclipse.wsdl.WSDLPackage#getExtensibilityElement_Required()
-   * @model 
-   * @generated
-   */
-	boolean isRequired();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.ExtensibilityElement#isRequired <em>Required</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Required</em>' attribute.
-   * @see #isRequired()
-   * @generated
-   */
-	void setRequired(boolean value);
-
-  /**
-   * Returns the value of the '<em><b>Element Type</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Element Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>Element Type</em>' attribute.
-   * @see #setElementType(QName)
-   * @see org.eclipse.wsdl.WSDLPackage#getExtensibilityElement_ElementType()
-   * @model dataType="org.eclipse.wsdl.QName" transient="true"
-   * @generated
-   */
-	QName getElementType();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.ExtensibilityElement#getElementType <em>Element Type</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Element Type</em>' attribute.
-   * @see #getElementType()
-   * @generated
-   */
-	void setElementType(QName value);
-
-} // ExtensibilityElement
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/ExtensibleElement.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/ExtensibleElement.java
deleted file mode 100644
index 5b4e85083..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/ExtensibleElement.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-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>'.
- * @since 1.0
- * @ignore
- * <!-- 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 -->
-   * This method is same as getEExtensibilityElements() and compatible with the JWSDL API.
-   * @see #getEExtensibilityElements()
-   * @return the value of the '<em>EFault</em>' reference.
-   * @ignore
-   * <!-- end-user-doc -->
-   * @model parameters=""
-   * @generated
-   */
-  List getExtensibilityElements();
-
-  /**
-   * <!-- begin-user-doc -->
-   * Adds an ExtensibilityElement to the '<em>EExtensibility Elements</em>' containment reference list.
-   * @param extElement An ExtensibilityElement to be added.
-   * @ignore
-   * <!-- end-user-doc -->
-   * @model 
-   * @generated
-   */
-  void addExtensibilityElement(ExtensibilityElement extElement);
-
-} // ExtensibleElement
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Fault.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Fault.java
deleted file mode 100644
index 976d25d3e..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Fault.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Fault</b></em>'.
- * @since 1.0
- * @ignore
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This class represents a WSDL fault element. Fault elements specify the abstract message format for any error messages that may be output as the result of the operation 
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.wsdl.WSDLPackage#getFault()
- * @model 
- * @generated
- */
-public interface Fault extends MessageReference, WSDLElement, javax.wsdl.Fault{
-} // Fault
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Import.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Import.java
deleted file mode 100644
index 1a014095d..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Import.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-import org.eclipse.xsd.XSDSchema;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Import</b></em>'.
- * @since 1.0
- * @ignore
- * <!-- 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 -->
-   * This method is same as getESchema().
-   * @see #getESchema()
-   * @return the value of the '<em>ESchema</em>' reference.
-   * @ignore
-   * <!-- end-user-doc -->
-   * @model parameters=""
-   * @generated
-   */
-  XSDSchema getSchema();
-
-  /**
-   * <!-- begin-user-doc -->
-   * This method is same as setESchema(XSDSchema).
-   * @see #setESchema(XSDSchema)
-   * @param schema the new value of the '<em>ESchema</em>' reference.
-   * @ignore
-   * <!-- end-user-doc -->
-   * @model 
-   * @generated
-   */
-  void setSchema(XSDSchema schema);
-
-} // Import
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Input.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Input.java
deleted file mode 100644
index b2c4045c0..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Input.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Input</b></em>'.
- * @since 1.0
- * @ignore
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This class represents a WSDL input element. An input element specifies the abstract message format for the input of the operation.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.wsdl.WSDLPackage#getInput()
- * @model 
- * @generated
- */
-public interface Input extends MessageReference, WSDLElement, javax.wsdl.Input{
-} // Input
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Message.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Message.java
deleted file mode 100644
index a1914d45f..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Message.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-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>'.
- * @since 1.0
- * @ignore
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This class represents a WSDL message element. A WSDL message is an abstract, typed definition of the data being communicated.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.Message#getQName <em>QName</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Message#isUndefined <em>Undefined</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Message#isProxy <em>Proxy</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Message#getResourceURI <em>Resource URI</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Message#getEParts <em>EParts</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wsdl.WSDLPackage#getMessage()
- * @model 
- * @generated
- */
-public interface Message extends WSDLElement, javax.wsdl.Message{
-  /**
-   * Returns the value of the '<em><b>QName</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>QName</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>QName</em>' attribute.
-   * @see #setQName(QName)
-   * @see org.eclipse.wsdl.WSDLPackage#getMessage_QName()
-   * @model dataType="org.eclipse.wsdl.QName"
-   * @generated
-   */
-	QName getQName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Message#getQName <em>QName</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>QName</em>' attribute.
-   * @see #getQName()
-   * @generated
-   */
-	void setQName(QName value);
-
-  /**
-   * Returns the value of the '<em><b>Undefined</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Undefined</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>Undefined</em>' attribute.
-   * @see #setUndefined(boolean)
-   * @see org.eclipse.wsdl.WSDLPackage#getMessage_Undefined()
-   * @model 
-   * @generated
-   */
-	boolean isUndefined();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Message#isUndefined <em>Undefined</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Undefined</em>' attribute.
-   * @see #isUndefined()
-   * @generated
-   */
-	void setUndefined(boolean value);
-
-  /**
-   * Returns the value of the '<em><b>EParts</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.wsdl.Part}.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>EParts</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>EParts</em>' containment reference list.
-   * @see org.eclipse.wsdl.WSDLPackage#getMessage_EParts()
-   * @model type="org.eclipse.wsdl.Part" containment="true"
-   * @generated
-   */
-	EList getEParts();
-
-} // Message
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/MessageReference.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/MessageReference.java
deleted file mode 100644
index 00c3b447b..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/MessageReference.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Message Reference</b></em>'.
- * @since 1.0
- * @ignore
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.MessageReference#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wsdl.MessageReference#getEMessage <em>EMessage</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wsdl.WSDLPackage#getMessageReference()
- * @model abstract="true"
- * @generated
- */
-public interface MessageReference extends WSDLElement{
-  /**
-   * Returns the value of the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>Name</em>' attribute.
-   * @see #setName(String)
-   * @see org.eclipse.wsdl.WSDLPackage#getMessageReference_Name()
-   * @model 
-   * @generated
-   */
-	String getName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.MessageReference#getName <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Name</em>' attribute.
-   * @see #getName()
-   * @generated
-   */
-	void setName(String value);
-
-  /**
-   * Returns the value of the '<em><b>EMessage</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>EMessage</em>' reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>EMessage</em>' reference.
-   * @see #setEMessage(Message)
-   * @see org.eclipse.wsdl.WSDLPackage#getMessageReference_EMessage()
-   * @model required="true"
-   * @generated
-   */
-  Message getEMessage();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.MessageReference#getEMessage <em>EMessage</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>EMessage</em>' reference.
-   * @see #getEMessage()
-   * @generated
-   */
-  void setEMessage(Message value);
-
-} // MessageReference
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Namespace.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Namespace.java
deleted file mode 100644
index 6cbadaa57..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Namespace.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Namespace</b></em>'.
- * @since 1.0
- * @ignore
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This class represents a namespace and the corresponding namespace prefix used in a WSDL document.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.Namespace#getURI <em>URI</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Namespace#getPrefix <em>Prefix</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wsdl.WSDLPackage#getNamespace()
- * @model 
- * @generated
- */
-public interface Namespace extends EObject{
-  /**
-   * Returns the value of the '<em><b>URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>URI</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>URI</em>' attribute.
-   * @see #setURI(String)
-   * @see org.eclipse.wsdl.WSDLPackage#getNamespace_URI()
-   * @model 
-   * @generated
-   */
-	String getURI();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Namespace#getURI <em>URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>URI</em>' attribute.
-   * @see #getURI()
-   * @generated
-   */
-	void setURI(String value);
-
-  /**
-   * Returns the value of the '<em><b>Prefix</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Prefix</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>Prefix</em>' attribute.
-   * @see #setPrefix(String)
-   * @see org.eclipse.wsdl.WSDLPackage#getNamespace_Prefix()
-   * @model 
-   * @generated
-   */
-	String getPrefix();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Namespace#getPrefix <em>Prefix</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Prefix</em>' attribute.
-   * @see #getPrefix()
-   * @generated
-   */
-	void setPrefix(String value);
-
-} // Namespace
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Operation.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Operation.java
deleted file mode 100644
index 2d011039f..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Operation.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-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>'.
- * @since 1.0
- * @ignore
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This class represents a WSDL operation element. A WSDL operation is an abstract description of an action supported by a service.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.Operation#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Operation#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Operation#isUndefined <em>Undefined</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Operation#isProxy <em>Proxy</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Operation#getResourceURI <em>Resource URI</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Operation#getEInput <em>EInput</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Operation#getEOutput <em>EOutput</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Operation#getEFaults <em>EFaults</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Operation#getEParameterOrdering <em>EParameter Ordering</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wsdl.WSDLPackage#getOperation()
- * @model 
- * @generated
- */
-public interface Operation extends WSDLElement, javax.wsdl.Operation{
-  /**
-   * Returns the value of the '<em><b>Style</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Style</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>Style</em>' attribute.
-   * @see #setStyle(OperationType)
-   * @see org.eclipse.wsdl.WSDLPackage#getOperation_Style()
-   * @model dataType="org.eclipse.wsdl.OperationType"
-   * @generated
-   */
-	OperationType getStyle();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Operation#getStyle <em>Style</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Style</em>' attribute.
-   * @see #getStyle()
-   * @generated
-   */
-	void setStyle(OperationType value);
-
-  /**
-   * Returns the value of the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>Name</em>' attribute.
-   * @see #setName(String)
-   * @see org.eclipse.wsdl.WSDLPackage#getOperation_Name()
-   * @model 
-   * @generated
-   */
-	String getName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Operation#getName <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Name</em>' attribute.
-   * @see #getName()
-   * @generated
-   */
-	void setName(String value);
-
-  /**
-   * Returns the value of the '<em><b>Undefined</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Undefined</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>Undefined</em>' attribute.
-   * @see #setUndefined(boolean)
-   * @see org.eclipse.wsdl.WSDLPackage#getOperation_Undefined()
-   * @model 
-   * @generated
-   */
-	boolean isUndefined();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Operation#isUndefined <em>Undefined</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Undefined</em>' attribute.
-   * @see #isUndefined()
-   * @generated
-   */
-	void setUndefined(boolean value);
-
-  /**
-   * Returns the value of the '<em><b>EInput</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>EInput</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>EInput</em>' containment reference.
-   * @see #setEInput(Input)
-   * @see org.eclipse.wsdl.WSDLPackage#getOperation_EInput()
-   * @model containment="true"
-   * @generated
-   */
-	Input getEInput();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Operation#getEInput <em>EInput</em>}' containment reference.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>EInput</em>' containment reference.
-   * @see #getEInput()
-   * @generated
-   */
-	void setEInput(Input value);
-
-  /**
-   * Returns the value of the '<em><b>EOutput</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>EOutput</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>EOutput</em>' containment reference.
-   * @see #setEOutput(Output)
-   * @see org.eclipse.wsdl.WSDLPackage#getOperation_EOutput()
-   * @model containment="true"
-   * @generated
-   */
-	Output getEOutput();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Operation#getEOutput <em>EOutput</em>}' containment reference.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>EOutput</em>' containment reference.
-   * @see #getEOutput()
-   * @generated
-   */
-	void setEOutput(Output value);
-
-  /**
-   * Returns the value of the '<em><b>EFaults</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.wsdl.Fault}.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>EFaults</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>EFaults</em>' containment reference list.
-   * @see org.eclipse.wsdl.WSDLPackage#getOperation_EFaults()
-   * @model type="org.eclipse.wsdl.Fault" containment="true"
-   * @generated
-   */
-	EList getEFaults();
-
-  /**
-   * Returns the value of the '<em><b>EParameter Ordering</b></em>' reference list.
-   * The list contents are of type {@link org.eclipse.wsdl.Part}.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>EParameter Ordering</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>EParameter Ordering</em>' reference list.
-   * @see org.eclipse.wsdl.WSDLPackage#getOperation_EParameterOrdering()
-   * @model type="org.eclipse.wsdl.Part"
-   * @generated
-   */
-	EList getEParameterOrdering();
-
-} // Operation
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Output.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Output.java
deleted file mode 100644
index 319b67393..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Output.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Output</b></em>'.
- * @since 1.0
- * @ignore
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This class represents a WSDL output element. An output element specifies the abstract message format for the output of the operation.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.wsdl.WSDLPackage#getOutput()
- * @model 
- * @generated
- */
-public interface Output extends MessageReference, WSDLElement, javax.wsdl.Output{
-} // Output
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Part.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Part.java
deleted file mode 100644
index 10ce25830..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Part.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-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>'.
- * @since 1.0
- * @ignore
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This class represents a WSDL part element. Parts describe the logical abstract content of a message. Each part is associated with a type from some type system. 
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.Part#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Part#getElementName <em>Element Name</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Part#getTypeName <em>Type Name</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Part#getTypeDefinition <em>Type Definition</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Part#getElementDeclaration <em>Element Declaration</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Part#getEMessage <em>EMessage</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wsdl.WSDLPackage#getPart()
- * @model 
- * @generated
- */
-public interface Part extends WSDLElement, javax.wsdl.Part{
-  /**
-   * Returns the value of the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>Name</em>' attribute.
-   * @see #setName(String)
-   * @see org.eclipse.wsdl.WSDLPackage#getPart_Name()
-   * @model 
-   * @generated
-   */
-	String getName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Part#getName <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Name</em>' attribute.
-   * @see #getName()
-   * @generated
-   */
-	void setName(String value);
-
-  /**
-   * Returns the value of the '<em><b>Element Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Element Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>Element Name</em>' attribute.
-   * @see #setElementName(QName)
-   * @see org.eclipse.wsdl.WSDLPackage#getPart_ElementName()
-   * @model dataType="org.eclipse.wsdl.QName"
-   * @generated
-   */
-	QName getElementName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Part#getElementName <em>Element Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Element Name</em>' attribute.
-   * @see #getElementName()
-   * @generated
-   */
-	void setElementName(QName value);
-
-  /**
-   * Returns the value of the '<em><b>Type Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Type Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>Type Name</em>' attribute.
-   * @see #setTypeName(QName)
-   * @see org.eclipse.wsdl.WSDLPackage#getPart_TypeName()
-   * @model dataType="org.eclipse.wsdl.QName"
-   * @generated
-   */
-	QName getTypeName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Part#getTypeName <em>Type Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Type Name</em>' attribute.
-   * @see #getTypeName()
-   * @generated
-   */
-	void setTypeName(QName value);
-
-  /**
-   * Returns the value of the '<em><b>Type Definition</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Type Definition</em>' reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Type Definition</em>' reference.
-   * @see #setTypeDefinition(XSDTypeDefinition)
-   * @see org.eclipse.wsdl.WSDLPackage#getPart_TypeDefinition()
-   * @model 
-   * @generated
-   */
-  XSDTypeDefinition getTypeDefinition();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Part#getTypeDefinition <em>Type Definition</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Type Definition</em>' reference.
-   * @see #getTypeDefinition()
-   * @generated
-   */
-  void setTypeDefinition(XSDTypeDefinition value);
-
-  /**
-   * Returns the value of the '<em><b>Element Declaration</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Element Declaration</em>' reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Element Declaration</em>' reference.
-   * @see #setElementDeclaration(XSDElementDeclaration)
-   * @see org.eclipse.wsdl.WSDLPackage#getPart_ElementDeclaration()
-   * @model 
-   * @generated
-   */
-  XSDElementDeclaration getElementDeclaration();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Part#getElementDeclaration <em>Element Declaration</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Element Declaration</em>' reference.
-   * @see #getElementDeclaration()
-   * @generated
-   */
-  void setElementDeclaration(XSDElementDeclaration value);
-
-  /**
-   * Returns the value of the '<em><b>EMessage</b></em>' reference.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>EMessage</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>EMessage</em>' reference.
-   * @see #setEMessage(Message)
-   * @see org.eclipse.wsdl.WSDLPackage#getPart_EMessage()
-   * @model 
-   * @generated
-   */
-	Message getEMessage();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Part#getEMessage <em>EMessage</em>}' reference.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>EMessage</em>' reference.
-   * @see #getEMessage()
-   * @generated
-   */
-	void setEMessage(Message value);
-
-} // Part
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Port.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Port.java
deleted file mode 100644
index ba6d284f6..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Port.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Port</b></em>'.
- * @since 1.0
- * @ignore
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This class represents a WSDL port element. A port defines an individual endpoint by specifying a single address for a binding
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.Port#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Port#getEBinding <em>EBinding</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wsdl.WSDLPackage#getPort()
- * @model 
- * @generated
- */
-public interface Port extends ExtensibleElement, javax.wsdl.Port{
-  /**
-   * Returns the value of the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>Name</em>' attribute.
-   * @see #setName(String)
-   * @see org.eclipse.wsdl.WSDLPackage#getPort_Name()
-   * @model 
-   * @generated
-   */
-	String getName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Port#getName <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Name</em>' attribute.
-   * @see #getName()
-   * @generated
-   */
-	void setName(String value);
-
-  /**
-   * Returns the value of the '<em><b>EBinding</b></em>' reference.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>EBinding</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>EBinding</em>' reference.
-   * @see #setEBinding(Binding)
-   * @see org.eclipse.wsdl.WSDLPackage#getPort_EBinding()
-   * @model required="true"
-   * @generated
-   */
-	Binding getEBinding();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Port#getEBinding <em>EBinding</em>}' reference.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>EBinding</em>' reference.
-   * @see #getEBinding()
-   * @generated
-   */
-	void setEBinding(Binding value);
-
-} // Port
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/PortType.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/PortType.java
deleted file mode 100644
index 5b42ef7d4..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/PortType.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-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>'.
- * @since 1.0
- * @ignore
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This class represents a WSDL portType element of the WSDL specification version 1.1 and an Interface component of the WSDL specification version 1.2. A port type or Interface is a named set of abstract operations and the abstract messages involved.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.PortType#getQName <em>QName</em>}</li>
- *   <li>{@link org.eclipse.wsdl.PortType#isUndefined <em>Undefined</em>}</li>
- *   <li>{@link org.eclipse.wsdl.PortType#isProxy <em>Proxy</em>}</li>
- *   <li>{@link org.eclipse.wsdl.PortType#getResourceURI <em>Resource URI</em>}</li>
- *   <li>{@link org.eclipse.wsdl.PortType#getEOperations <em>EOperations</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wsdl.WSDLPackage#getPortType()
- * @model 
- * @generated
- */
-public interface PortType extends WSDLElement, javax.wsdl.PortType{
-  /**
-   * Returns the value of the '<em><b>QName</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>QName</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>QName</em>' attribute.
-   * @see #setQName(QName)
-   * @see org.eclipse.wsdl.WSDLPackage#getPortType_QName()
-   * @model dataType="org.eclipse.wsdl.QName"
-   * @generated
-   */
-	QName getQName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.PortType#getQName <em>QName</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>QName</em>' attribute.
-   * @see #getQName()
-   * @generated
-   */
-	void setQName(QName value);
-
-  /**
-   * Returns the value of the '<em><b>Undefined</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Undefined</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>Undefined</em>' attribute.
-   * @see #setUndefined(boolean)
-   * @see org.eclipse.wsdl.WSDLPackage#getPortType_Undefined()
-   * @model 
-   * @generated
-   */
-	boolean isUndefined();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.PortType#isUndefined <em>Undefined</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Undefined</em>' attribute.
-   * @see #isUndefined()
-   * @generated
-   */
-	void setUndefined(boolean value);
-
-  /**
-   * Returns the value of the '<em><b>EOperations</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.wsdl.Operation}.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>EOperations</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>EOperations</em>' containment reference list.
-   * @see org.eclipse.wsdl.WSDLPackage#getPortType_EOperations()
-   * @model type="org.eclipse.wsdl.Operation" containment="true"
-   * @generated
-   */
-	EList getEOperations();
-
-} // PortType
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Service.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Service.java
deleted file mode 100644
index 6ad045229..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Service.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-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>'.
- * @since 1.0
- * @ignore
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This class represents a WSDL service element. A service groups a set of related ports together.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.Service#getQName <em>QName</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Service#isUndefined <em>Undefined</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Service#isProxy <em>Proxy</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Service#getResourceURI <em>Resource URI</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Service#getEPorts <em>EPorts</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wsdl.WSDLPackage#getService()
- * @model 
- * @generated
- */
-public interface Service extends ExtensibleElement, javax.wsdl.Service{
-  /**
-   * Returns the value of the '<em><b>QName</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>QName</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>QName</em>' attribute.
-   * @see #setQName(QName)
-   * @see org.eclipse.wsdl.WSDLPackage#getService_QName()
-   * @model dataType="org.eclipse.wsdl.QName"
-   * @generated
-   */
-	QName getQName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Service#getQName <em>QName</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>QName</em>' attribute.
-   * @see #getQName()
-   * @generated
-   */
-	void setQName(QName value);
-
-  /**
-   * Returns the value of the '<em><b>Undefined</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Undefined</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>Undefined</em>' attribute.
-   * @see #setUndefined(boolean)
-   * @see org.eclipse.wsdl.WSDLPackage#getService_Undefined()
-   * @model 
-   * @generated
-   */
-	boolean isUndefined();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Service#isUndefined <em>Undefined</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Undefined</em>' attribute.
-   * @see #isUndefined()
-   * @generated
-   */
-	void setUndefined(boolean value);
-
-  /**
-   * Returns the value of the '<em><b>EPorts</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.wsdl.Port}.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>EPorts</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>EPorts</em>' containment reference list.
-   * @see org.eclipse.wsdl.WSDLPackage#getService_EPorts()
-   * @model type="org.eclipse.wsdl.Port" containment="true"
-   * @generated
-   */
-	EList getEPorts();
-
-} // Service
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Types.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Types.java
deleted file mode 100644
index d9a9bf4b4..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Types.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Types</b></em>'.
- * @since 1.0
- * @ignore
- * <!-- 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 -->
-   * Returns a List of inline XSDSchema instances in this Types. 
-   * @return List of XSDSchema instances.
-   * @see org.eclipse.xsd.XSDSchema
-   * @ignore
-   * <!-- end-user-doc -->
-   * @model parameters=""
-   * @generated
-   */
-  List getSchemas();
-
-  /**
-   * <!-- begin-user-doc -->
-   * Returns a List of inline XSDSchema instances in this Types. The targetNamespace of
-   * the schemas are the same as namespaceURI argument value.
-   * @param namespaceURI targetNamespace of the schemas to be searched for.
-   * @return List of XSDSchema instances.
-   * @see org.eclipse.xsd.XSDSchema
-   * @ignore
-   * <!-- end-user-doc -->
-   * @model 
-   * @generated
-   */
-  List getSchemas(String namespaceURI);
-
-} // Types
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/UnknownExtensibilityElement.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/UnknownExtensibilityElement.java
deleted file mode 100644
index 9052f746e..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/UnknownExtensibilityElement.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Unknown Extensibility Element</b></em>'.
- * @since 1.0
- * @ignore
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.UnknownExtensibilityElement#getParent <em>Parent</em>}</li>
- *   <li>{@link org.eclipse.wsdl.UnknownExtensibilityElement#getChildren <em>Children</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wsdl.WSDLPackage#getUnknownExtensibilityElement()
- * @model 
- * @generated
- */
-public interface UnknownExtensibilityElement extends ExtensibilityElement{
-  /**
-   * Returns the value of the '<em><b>Children</b></em>' reference list.
-   * The list contents are of type {@link org.eclipse.wsdl.UnknownExtensibilityElement}.
-   * It is bidirectional and its opposite is '{@link org.eclipse.wsdl.UnknownExtensibilityElement#getParent <em>Parent</em>}'.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Children</em>' reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Children</em>' reference list.
-   * @see org.eclipse.wsdl.WSDLPackage#getUnknownExtensibilityElement_Children()
-   * @see org.eclipse.wsdl.UnknownExtensibilityElement#getParent
-   * @model type="org.eclipse.wsdl.UnknownExtensibilityElement" opposite="parent"
-   * @generated
-   */
-  EList getChildren();
-
-} // UnknownExtensibilityElement
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLElement.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLElement.java
deleted file mode 100644
index b560a16e0..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLElement.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-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>'.
- * @since 1.0
- * @ignore
- * <!-- 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 -->
-   * Returns the Definition that contains this WSDL element.
-   * @return the Definition that contains this WSDL element.
-   * <!-- end-user-doc -->
-   * @model parameters=""
-   * @generated
-   */
-  Definition getEnclosingDefinition();
-
-  /**
-   * <!-- begin-user-doc -->
-   * Sets the enclosing definition of this WSDL element.
-   * @param definition the Definition that contains this WSDL element.
-   * <!-- 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.
-   * @param changedElement the DOM element changed for this instance.
-   */
-  void elementChanged(Element changedElement);
-
-} // WSDLElement
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLFactory.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLFactory.java
deleted file mode 100644
index f1d4ed198..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLFactory.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-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.
- * @since 1.0
- * @ignore
- * <!-- end-user-doc -->
- * @see org.eclipse.wsdl.WSDLPackage
- * @generated
- */
-public interface WSDLFactory extends EFactory{
-  /**
-   * The singleton instance of the factory.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	WSDLFactory eINSTANCE = new org.eclipse.wst.wsdl.internal.impl.WSDLFactoryImpl();
-
-  /**
-   * Returns a new object of class '<em>Port Type</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Port Type</em>'.
-   * @generated
-   */
-	PortType createPortType();
-
-  /**
-   * Returns a new object of class '<em>Operation</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Operation</em>'.
-   * @generated
-   */
-	Operation createOperation();
-
-  /**
-   * Returns a new object of class '<em>Message</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Message</em>'.
-   * @generated
-   */
-	Message createMessage();
-
-  /**
-   * Returns a new object of class '<em>Part</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Part</em>'.
-   * @generated
-   */
-	Part createPart();
-
-  /**
-   * Returns a new object of class '<em>Binding</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Binding</em>'.
-   * @generated
-   */
-	Binding createBinding();
-
-  /**
-   * Returns a new object of class '<em>Binding Operation</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Binding Operation</em>'.
-   * @generated
-   */
-	BindingOperation createBindingOperation();
-
-  /**
-   * Returns a new object of class '<em>Service</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Service</em>'.
-   * @generated
-   */
-	Service createService();
-
-  /**
-   * Returns a new object of class '<em>Port</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Port</em>'.
-   * @generated
-   */
-	Port createPort();
-
-  /**
-   * Returns a new object of class '<em>Extensibility Element</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Extensibility Element</em>'.
-   * @generated
-   */
-  ExtensibilityElement createExtensibilityElement();
-
-  /**
-   * Returns a new object of class '<em>Definition</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Definition</em>'.
-   * @generated
-   */
-	Definition createDefinition();
-
-  /**
-   * Returns a new object of class '<em>Import</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Import</em>'.
-   * @generated
-   */
-	Import createImport();
-
-  /**
-   * Returns a new object of class '<em>Input</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Input</em>'.
-   * @generated
-   */
-	Input createInput();
-
-  /**
-   * Returns a new object of class '<em>Output</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Output</em>'.
-   * @generated
-   */
-	Output createOutput();
-
-  /**
-   * Returns a new object of class '<em>Fault</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Fault</em>'.
-   * @generated
-   */
-	Fault createFault();
-
-  /**
-   * Returns a new object of class '<em>Binding Input</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Binding Input</em>'.
-   * @generated
-   */
-	BindingInput createBindingInput();
-
-  /**
-   * Returns a new object of class '<em>Binding Output</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Binding Output</em>'.
-   * @generated
-   */
-	BindingOutput createBindingOutput();
-
-  /**
-   * Returns a new object of class '<em>Binding Fault</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Binding Fault</em>'.
-   * @generated
-   */
-	BindingFault createBindingFault();
-
-  /**
-   * Returns a new object of class '<em>Namespace</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Namespace</em>'.
-   * @generated
-   */
-	Namespace createNamespace();
-
-  /**
-   * Returns a new object of class '<em>Types</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Types</em>'.
-   * @generated
-   */
-	Types createTypes();
-
-  /**
-   * Returns a new object of class '<em>Unknown Extensibility Element</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Unknown Extensibility Element</em>'.
-   * @generated
-   */
-	UnknownExtensibilityElement createUnknownExtensibilityElement();
-
-  /**
-   * Returns a new object of class '<em>XSD Schema Extensibility Element</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>XSD Schema Extensibility Element</em>'.
-   * @generated
-   */
-	XSDSchemaExtensibilityElement createXSDSchemaExtensibilityElement();
-
-  /*
-   * Returns the package supported by this factory.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the package supported by this factory.
-   * @generated NOT
-   */
-	//WSDLPackage getWSDLPackage();
-
-} //WSDLFactory
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLPackage.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLPackage.java
deleted file mode 100644
index d4b46c946..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLPackage.java
+++ /dev/null
@@ -1,3658 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-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>
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 1.0
- * @ignore
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * The WSDL model contains classes for the Web Services Description Language (WSDL).
- * 
- * WSDL describes network services as sets of endpoints operating on messages. The operations and messages are described abstractly, and then bound to a concrete network protocol and message format to define an endpoint.
- * 
- * WSDL describes the formats of the messages exchanged by the services, and supports the XML Schemas specification as its canonical type system. This package uses an XML Schema Infoset model package (see the XSD package) to describe the abstract message formats.
- * 
- * The model contains the following diagrams, named after the corresponding chapters in the WSDL 1.1 specification (http://www.w3.org/TR/2001/NOTE-wsdl-20010315)
- * - 2.1 Definition, shows the WSDL definition element and the WSDL document structure
- * - 2.1.1 Naming and Linking, shows the namespace and import mechanism
- * - 2.1.3 Extensibility, shows the WSDL extensibility mechanism
- * - 2.2 Types, shows the use of XML Schema types in WSDL
- * - 2.3 Messages, 2.4 PortTypes, 2.5 Bindings and 2.7 Services, show the major WSDL elements and their relations.
- * 
- * The WSDL classes extend the javax.wsdl interfaces defined by JSR 110. Classes with interface and datatype stereotypes are used to represent these non-MOF interfaces.
- * <!-- end-model-doc -->
- * @see org.eclipse.wsdl.WSDLFactory
- * @generated
- */
-public interface WSDLPackage extends EPackage
-{
-  /**
-   * The package name.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  String eNAME = "wsdl";
-
-  /**
-   * The package namespace URI.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  String eNS_URI = "http://www.ibm.com/wsdl/2003/WSDL";
-
-  /**
-   * The package namespace name.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  String eNS_PREFIX = "wsdl";
-
-  /**
-   * The singleton instance of the package.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  WSDLPackage eINSTANCE = org.eclipse.wst.wsdl.internal.impl.WSDLPackageImpl.init();
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wsdl.impl.WSDLElementImpl <em>Element</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.impl.WSDLElementImpl
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getWSDLElement()
-   * @generated
-   */
-  int WSDL_ELEMENT = 0;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int WSDL_ELEMENT__DOCUMENTATION_ELEMENT = 0;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int WSDL_ELEMENT__ELEMENT = 1;
-
-  /**
-   * The number of structural features of the the '<em>Element</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int WSDL_ELEMENT_FEATURE_COUNT = 2;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.impl.PortTypeImpl <em>Port Type</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.impl.PortTypeImpl
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getPortType()
-   * @generated
-   */
-  int PORT_TYPE = 1;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PORT_TYPE__DOCUMENTATION_ELEMENT = WSDL_ELEMENT__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PORT_TYPE__ELEMENT = WSDL_ELEMENT__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>QName</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PORT_TYPE__QNAME = WSDL_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Undefined</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PORT_TYPE__UNDEFINED = WSDL_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The feature id for the '<em><b>Proxy</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PORT_TYPE__PROXY = WSDL_ELEMENT_FEATURE_COUNT + 2;
-
-  /**
-   * The feature id for the '<em><b>Resource URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PORT_TYPE__RESOURCE_URI = WSDL_ELEMENT_FEATURE_COUNT + 3;
-
-  /**
-   * The feature id for the '<em><b>EOperations</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PORT_TYPE__EOPERATIONS = WSDL_ELEMENT_FEATURE_COUNT + 4;
-
-  /**
-   * The number of structural features of the the '<em>Port Type</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PORT_TYPE_FEATURE_COUNT = WSDL_ELEMENT_FEATURE_COUNT + 5;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.impl.OperationImpl <em>Operation</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.impl.OperationImpl
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getOperation()
-   * @generated
-   */
-  int OPERATION = 2;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int OPERATION__DOCUMENTATION_ELEMENT = WSDL_ELEMENT__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int OPERATION__ELEMENT = WSDL_ELEMENT__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Style</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int OPERATION__STYLE = WSDL_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int OPERATION__NAME = WSDL_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The feature id for the '<em><b>Undefined</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int OPERATION__UNDEFINED = WSDL_ELEMENT_FEATURE_COUNT + 2;
-
-  /**
-   * The feature id for the '<em><b>Proxy</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int OPERATION__PROXY = WSDL_ELEMENT_FEATURE_COUNT + 3;
-
-  /**
-   * The feature id for the '<em><b>Resource URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int OPERATION__RESOURCE_URI = WSDL_ELEMENT_FEATURE_COUNT + 4;
-
-  /**
-   * The feature id for the '<em><b>EInput</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int OPERATION__EINPUT = WSDL_ELEMENT_FEATURE_COUNT + 5;
-
-  /**
-   * The feature id for the '<em><b>EOutput</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int OPERATION__EOUTPUT = WSDL_ELEMENT_FEATURE_COUNT + 6;
-
-  /**
-   * The feature id for the '<em><b>EFaults</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int OPERATION__EFAULTS = WSDL_ELEMENT_FEATURE_COUNT + 7;
-
-  /**
-   * The feature id for the '<em><b>EParameter Ordering</b></em>' reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int OPERATION__EPARAMETER_ORDERING = WSDL_ELEMENT_FEATURE_COUNT + 8;
-
-  /**
-   * The number of structural features of the the '<em>Operation</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int OPERATION_FEATURE_COUNT = WSDL_ELEMENT_FEATURE_COUNT + 9;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.impl.MessageImpl <em>Message</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.impl.MessageImpl
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getMessage()
-   * @generated
-   */
-  int MESSAGE = 3;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int MESSAGE__DOCUMENTATION_ELEMENT = WSDL_ELEMENT__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int MESSAGE__ELEMENT = WSDL_ELEMENT__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>QName</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int MESSAGE__QNAME = WSDL_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Undefined</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int MESSAGE__UNDEFINED = WSDL_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The feature id for the '<em><b>Proxy</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int MESSAGE__PROXY = WSDL_ELEMENT_FEATURE_COUNT + 2;
-
-  /**
-   * The feature id for the '<em><b>Resource URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int MESSAGE__RESOURCE_URI = WSDL_ELEMENT_FEATURE_COUNT + 3;
-
-  /**
-   * The feature id for the '<em><b>EParts</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int MESSAGE__EPARTS = WSDL_ELEMENT_FEATURE_COUNT + 4;
-
-  /**
-   * The number of structural features of the the '<em>Message</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int MESSAGE_FEATURE_COUNT = WSDL_ELEMENT_FEATURE_COUNT + 5;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.impl.PartImpl <em>Part</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.impl.PartImpl
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getPart()
-   * @generated
-   */
-  int PART = 4;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PART__DOCUMENTATION_ELEMENT = WSDL_ELEMENT__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PART__ELEMENT = WSDL_ELEMENT__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PART__NAME = WSDL_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Element Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PART__ELEMENT_NAME = WSDL_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The feature id for the '<em><b>Type Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PART__TYPE_NAME = WSDL_ELEMENT_FEATURE_COUNT + 2;
-
-  /**
-   * The feature id for the '<em><b>Type Definition</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PART__TYPE_DEFINITION = WSDL_ELEMENT_FEATURE_COUNT + 3;
-
-  /**
-   * The feature id for the '<em><b>Element Declaration</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PART__ELEMENT_DECLARATION = WSDL_ELEMENT_FEATURE_COUNT + 4;
-
-  /**
-   * The feature id for the '<em><b>EMessage</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PART__EMESSAGE = WSDL_ELEMENT_FEATURE_COUNT + 5;
-
-  /**
-   * The number of structural features of the the '<em>Part</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PART_FEATURE_COUNT = WSDL_ELEMENT_FEATURE_COUNT + 6;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.impl.ExtensibleElementImpl <em>Extensible Element</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.impl.ExtensibleElementImpl
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getExtensibleElement()
-   * @generated
-   */
-  int EXTENSIBLE_ELEMENT = 12;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int EXTENSIBLE_ELEMENT__DOCUMENTATION_ELEMENT = WSDL_ELEMENT__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int EXTENSIBLE_ELEMENT__ELEMENT = WSDL_ELEMENT__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>EExtensibility Elements</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int EXTENSIBLE_ELEMENT__EEXTENSIBILITY_ELEMENTS = WSDL_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The number of structural features of the the '<em>Extensible Element</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int EXTENSIBLE_ELEMENT_FEATURE_COUNT = WSDL_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.impl.BindingImpl <em>Binding</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.impl.BindingImpl
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getBinding()
-   * @generated
-   */
-  int BINDING = 5;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING__DOCUMENTATION_ELEMENT = EXTENSIBLE_ELEMENT__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING__ELEMENT = EXTENSIBLE_ELEMENT__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>EExtensibility Elements</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING__EEXTENSIBILITY_ELEMENTS = EXTENSIBLE_ELEMENT__EEXTENSIBILITY_ELEMENTS;
-
-  /**
-   * The feature id for the '<em><b>QName</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING__QNAME = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Undefined</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING__UNDEFINED = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The feature id for the '<em><b>Proxy</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING__PROXY = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 2;
-
-  /**
-   * The feature id for the '<em><b>Resource URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING__RESOURCE_URI = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 3;
-
-  /**
-   * The feature id for the '<em><b>EPort Type</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING__EPORT_TYPE = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 4;
-
-  /**
-   * The feature id for the '<em><b>EBinding Operations</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING__EBINDING_OPERATIONS = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 5;
-
-  /**
-   * The number of structural features of the the '<em>Binding</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_FEATURE_COUNT = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 6;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.impl.BindingOperationImpl <em>Binding Operation</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.impl.BindingOperationImpl
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getBindingOperation()
-   * @generated
-   */
-  int BINDING_OPERATION = 6;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_OPERATION__DOCUMENTATION_ELEMENT = EXTENSIBLE_ELEMENT__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_OPERATION__ELEMENT = EXTENSIBLE_ELEMENT__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>EExtensibility Elements</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_OPERATION__EEXTENSIBILITY_ELEMENTS = EXTENSIBLE_ELEMENT__EEXTENSIBILITY_ELEMENTS;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_OPERATION__NAME = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>EOperation</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_OPERATION__EOPERATION = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The feature id for the '<em><b>EBinding Input</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_OPERATION__EBINDING_INPUT = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 2;
-
-  /**
-   * The feature id for the '<em><b>EBinding Output</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_OPERATION__EBINDING_OUTPUT = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 3;
-
-  /**
-   * The feature id for the '<em><b>EBinding Faults</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_OPERATION__EBINDING_FAULTS = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 4;
-
-  /**
-   * The number of structural features of the the '<em>Binding Operation</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_OPERATION_FEATURE_COUNT = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 5;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.impl.ServiceImpl <em>Service</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.impl.ServiceImpl
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getService()
-   * @generated
-   */
-  int SERVICE = 7;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SERVICE__DOCUMENTATION_ELEMENT = EXTENSIBLE_ELEMENT__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SERVICE__ELEMENT = EXTENSIBLE_ELEMENT__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>EExtensibility Elements</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SERVICE__EEXTENSIBILITY_ELEMENTS = EXTENSIBLE_ELEMENT__EEXTENSIBILITY_ELEMENTS;
-
-  /**
-   * The feature id for the '<em><b>QName</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SERVICE__QNAME = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Undefined</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SERVICE__UNDEFINED = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The feature id for the '<em><b>Proxy</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SERVICE__PROXY = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 2;
-
-  /**
-   * The feature id for the '<em><b>Resource URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SERVICE__RESOURCE_URI = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 3;
-
-  /**
-   * The feature id for the '<em><b>EPorts</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SERVICE__EPORTS = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 4;
-
-  /**
-   * The number of structural features of the the '<em>Service</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SERVICE_FEATURE_COUNT = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 5;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.impl.PortImpl <em>Port</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.impl.PortImpl
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getPort()
-   * @generated
-   */
-  int PORT = 8;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PORT__DOCUMENTATION_ELEMENT = EXTENSIBLE_ELEMENT__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PORT__ELEMENT = EXTENSIBLE_ELEMENT__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>EExtensibility Elements</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PORT__EEXTENSIBILITY_ELEMENTS = EXTENSIBLE_ELEMENT__EEXTENSIBILITY_ELEMENTS;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PORT__NAME = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>EBinding</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PORT__EBINDING = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The number of structural features of the the '<em>Port</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PORT_FEATURE_COUNT = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 2;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.impl.ExtensibilityElementImpl <em>Extensibility Element</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.impl.ExtensibilityElementImpl
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getExtensibilityElement()
-   * @generated
-   */
-  int EXTENSIBILITY_ELEMENT = 9;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT = WSDL_ELEMENT__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int EXTENSIBILITY_ELEMENT__ELEMENT = WSDL_ELEMENT__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Required</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int EXTENSIBILITY_ELEMENT__REQUIRED = WSDL_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Element Type</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int EXTENSIBILITY_ELEMENT__ELEMENT_TYPE = WSDL_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The number of structural features of the the '<em>Extensibility Element</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int EXTENSIBILITY_ELEMENT_FEATURE_COUNT = WSDL_ELEMENT_FEATURE_COUNT + 2;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.impl.DefinitionImpl <em>Definition</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.impl.DefinitionImpl
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getDefinition()
-   * @generated
-   */
-  int DEFINITION = 10;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int DEFINITION__DOCUMENTATION_ELEMENT = EXTENSIBLE_ELEMENT__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int DEFINITION__ELEMENT = EXTENSIBLE_ELEMENT__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>EExtensibility Elements</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int DEFINITION__EEXTENSIBILITY_ELEMENTS = EXTENSIBLE_ELEMENT__EEXTENSIBILITY_ELEMENTS;
-
-  /**
-   * The feature id for the '<em><b>Target Namespace</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int DEFINITION__TARGET_NAMESPACE = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Location</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int DEFINITION__LOCATION = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The feature id for the '<em><b>QName</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int DEFINITION__QNAME = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 2;
-
-  /**
-   * The feature id for the '<em><b>Encoding</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int DEFINITION__ENCODING = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 3;
-
-  /**
-   * The feature id for the '<em><b>EMessages</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int DEFINITION__EMESSAGES = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 4;
-
-  /**
-   * The feature id for the '<em><b>EPort Types</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int DEFINITION__EPORT_TYPES = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 5;
-
-  /**
-   * The feature id for the '<em><b>EBindings</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int DEFINITION__EBINDINGS = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 6;
-
-  /**
-   * The feature id for the '<em><b>EServices</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int DEFINITION__ESERVICES = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 7;
-
-  /**
-   * The feature id for the '<em><b>ENamespaces</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int DEFINITION__ENAMESPACES = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 8;
-
-  /**
-   * The feature id for the '<em><b>ETypes</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int DEFINITION__ETYPES = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 9;
-
-  /**
-   * The feature id for the '<em><b>EImports</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int DEFINITION__EIMPORTS = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 10;
-
-  /**
-   * The number of structural features of the the '<em>Definition</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int DEFINITION_FEATURE_COUNT = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 11;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.impl.ImportImpl <em>Import</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.impl.ImportImpl
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getImport()
-   * @generated
-   */
-  int IMPORT = 11;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IMPORT__DOCUMENTATION_ELEMENT = WSDL_ELEMENT__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IMPORT__ELEMENT = WSDL_ELEMENT__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Namespace URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IMPORT__NAMESPACE_URI = WSDL_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Location URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IMPORT__LOCATION_URI = WSDL_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The feature id for the '<em><b>EDefinition</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IMPORT__EDEFINITION = WSDL_ELEMENT_FEATURE_COUNT + 2;
-
-  /**
-   * The feature id for the '<em><b>ESchema</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IMPORT__ESCHEMA = WSDL_ELEMENT_FEATURE_COUNT + 3;
-
-  /**
-   * The number of structural features of the the '<em>Import</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IMPORT_FEATURE_COUNT = WSDL_ELEMENT_FEATURE_COUNT + 4;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.impl.MessageReferenceImpl <em>Message Reference</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.impl.MessageReferenceImpl
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getMessageReference()
-   * @generated
-   */
-  int MESSAGE_REFERENCE = 46;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int MESSAGE_REFERENCE__DOCUMENTATION_ELEMENT = WSDL_ELEMENT__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int MESSAGE_REFERENCE__ELEMENT = WSDL_ELEMENT__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int MESSAGE_REFERENCE__NAME = WSDL_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>EMessage</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int MESSAGE_REFERENCE__EMESSAGE = WSDL_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The number of structural features of the the '<em>Message Reference</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int MESSAGE_REFERENCE_FEATURE_COUNT = WSDL_ELEMENT_FEATURE_COUNT + 2;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.impl.InputImpl <em>Input</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.impl.InputImpl
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getInput()
-   * @generated
-   */
-  int INPUT = 13;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int INPUT__DOCUMENTATION_ELEMENT = MESSAGE_REFERENCE__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int INPUT__ELEMENT = MESSAGE_REFERENCE__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int INPUT__NAME = MESSAGE_REFERENCE__NAME;
-
-  /**
-   * The feature id for the '<em><b>EMessage</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int INPUT__EMESSAGE = MESSAGE_REFERENCE__EMESSAGE;
-
-  /**
-   * The number of structural features of the the '<em>Input</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int INPUT_FEATURE_COUNT = MESSAGE_REFERENCE_FEATURE_COUNT + 0;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.impl.OutputImpl <em>Output</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.impl.OutputImpl
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getOutput()
-   * @generated
-   */
-  int OUTPUT = 14;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int OUTPUT__DOCUMENTATION_ELEMENT = MESSAGE_REFERENCE__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int OUTPUT__ELEMENT = MESSAGE_REFERENCE__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int OUTPUT__NAME = MESSAGE_REFERENCE__NAME;
-
-  /**
-   * The feature id for the '<em><b>EMessage</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int OUTPUT__EMESSAGE = MESSAGE_REFERENCE__EMESSAGE;
-
-  /**
-   * The number of structural features of the the '<em>Output</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int OUTPUT_FEATURE_COUNT = MESSAGE_REFERENCE_FEATURE_COUNT + 0;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.impl.FaultImpl <em>Fault</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.impl.FaultImpl
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getFault()
-   * @generated
-   */
-  int FAULT = 15;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int FAULT__DOCUMENTATION_ELEMENT = MESSAGE_REFERENCE__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int FAULT__ELEMENT = MESSAGE_REFERENCE__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int FAULT__NAME = MESSAGE_REFERENCE__NAME;
-
-  /**
-   * The feature id for the '<em><b>EMessage</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int FAULT__EMESSAGE = MESSAGE_REFERENCE__EMESSAGE;
-
-  /**
-   * The number of structural features of the the '<em>Fault</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int FAULT_FEATURE_COUNT = MESSAGE_REFERENCE_FEATURE_COUNT + 0;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.impl.BindingInputImpl <em>Binding Input</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.impl.BindingInputImpl
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getBindingInput()
-   * @generated
-   */
-  int BINDING_INPUT = 16;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_INPUT__DOCUMENTATION_ELEMENT = EXTENSIBLE_ELEMENT__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_INPUT__ELEMENT = EXTENSIBLE_ELEMENT__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>EExtensibility Elements</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_INPUT__EEXTENSIBILITY_ELEMENTS = EXTENSIBLE_ELEMENT__EEXTENSIBILITY_ELEMENTS;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_INPUT__NAME = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>EInput</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_INPUT__EINPUT = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The number of structural features of the the '<em>Binding Input</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_INPUT_FEATURE_COUNT = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 2;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.impl.BindingOutputImpl <em>Binding Output</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.impl.BindingOutputImpl
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getBindingOutput()
-   * @generated
-   */
-  int BINDING_OUTPUT = 17;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_OUTPUT__DOCUMENTATION_ELEMENT = EXTENSIBLE_ELEMENT__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_OUTPUT__ELEMENT = EXTENSIBLE_ELEMENT__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>EExtensibility Elements</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_OUTPUT__EEXTENSIBILITY_ELEMENTS = EXTENSIBLE_ELEMENT__EEXTENSIBILITY_ELEMENTS;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_OUTPUT__NAME = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>EOutput</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_OUTPUT__EOUTPUT = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The number of structural features of the the '<em>Binding Output</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_OUTPUT_FEATURE_COUNT = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 2;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.impl.BindingFaultImpl <em>Binding Fault</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.impl.BindingFaultImpl
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getBindingFault()
-   * @generated
-   */
-  int BINDING_FAULT = 18;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_FAULT__DOCUMENTATION_ELEMENT = EXTENSIBLE_ELEMENT__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_FAULT__ELEMENT = EXTENSIBLE_ELEMENT__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>EExtensibility Elements</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_FAULT__EEXTENSIBILITY_ELEMENTS = EXTENSIBLE_ELEMENT__EEXTENSIBILITY_ELEMENTS;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_FAULT__NAME = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>EFault</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_FAULT__EFAULT = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The number of structural features of the the '<em>Binding Fault</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_FAULT_FEATURE_COUNT = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 2;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.impl.NamespaceImpl <em>Namespace</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.impl.NamespaceImpl
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getNamespace()
-   * @generated
-   */
-  int NAMESPACE = 19;
-
-  /**
-   * The feature id for the '<em><b>URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int NAMESPACE__URI = 0;
-
-  /**
-   * The feature id for the '<em><b>Prefix</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int NAMESPACE__PREFIX = 1;
-
-  /**
-   * The number of structural features of the the '<em>Namespace</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int NAMESPACE_FEATURE_COUNT = 2;
-
-  /**
-   * The meta object id for the '{@link javax.wsdl.PortType <em>IPort Type</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see javax.wsdl.PortType
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getIPortType()
-   * @generated
-   */
-  int IPORT_TYPE = 20;
-
-  /**
-   * The number of structural features of the the '<em>IPort Type</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IPORT_TYPE_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link javax.wsdl.Operation <em>IOperation</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see javax.wsdl.Operation
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getIOperation()
-   * @generated
-   */
-  int IOPERATION = 21;
-
-  /**
-   * The number of structural features of the the '<em>IOperation</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IOPERATION_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link javax.wsdl.Input <em>IInput</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see javax.wsdl.Input
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getIInput()
-   * @generated
-   */
-  int IINPUT = 22;
-
-  /**
-   * The number of structural features of the the '<em>IInput</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IINPUT_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link javax.wsdl.Output <em>IOutput</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see javax.wsdl.Output
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getIOutput()
-   * @generated
-   */
-  int IOUTPUT = 23;
-
-  /**
-   * The number of structural features of the the '<em>IOutput</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IOUTPUT_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link javax.wsdl.Fault <em>IFault</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see javax.wsdl.Fault
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getIFault()
-   * @generated
-   */
-  int IFAULT = 24;
-
-  /**
-   * The number of structural features of the the '<em>IFault</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IFAULT_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link javax.wsdl.Message <em>IMessage</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see javax.wsdl.Message
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getIMessage()
-   * @generated
-   */
-  int IMESSAGE = 25;
-
-  /**
-   * The number of structural features of the the '<em>IMessage</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IMESSAGE_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link javax.wsdl.Part <em>IPart</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see javax.wsdl.Part
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getIPart()
-   * @generated
-   */
-  int IPART = 26;
-
-  /**
-   * The number of structural features of the the '<em>IPart</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IPART_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link javax.wsdl.Service <em>IService</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see javax.wsdl.Service
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getIService()
-   * @generated
-   */
-  int ISERVICE = 27;
-
-  /**
-   * The number of structural features of the the '<em>IService</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ISERVICE_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link javax.wsdl.Port <em>IPort</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see javax.wsdl.Port
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getIPort()
-   * @generated
-   */
-  int IPORT = 28;
-
-  /**
-   * The number of structural features of the the '<em>IPort</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IPORT_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link javax.wsdl.Binding <em>IBinding</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see javax.wsdl.Binding
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getIBinding()
-   * @generated
-   */
-  int IBINDING = 29;
-
-  /**
-   * The number of structural features of the the '<em>IBinding</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IBINDING_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link javax.wsdl.BindingOperation <em>IBinding Operation</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see javax.wsdl.BindingOperation
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getIBindingOperation()
-   * @generated
-   */
-  int IBINDING_OPERATION = 30;
-
-  /**
-   * The number of structural features of the the '<em>IBinding Operation</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IBINDING_OPERATION_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link javax.wsdl.BindingInput <em>IBinding Input</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see javax.wsdl.BindingInput
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getIBindingInput()
-   * @generated
-   */
-  int IBINDING_INPUT = 31;
-
-  /**
-   * The number of structural features of the the '<em>IBinding Input</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IBINDING_INPUT_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link javax.wsdl.BindingOutput <em>IBinding Output</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see javax.wsdl.BindingOutput
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getIBindingOutput()
-   * @generated
-   */
-  int IBINDING_OUTPUT = 32;
-
-  /**
-   * The number of structural features of the the '<em>IBinding Output</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IBINDING_OUTPUT_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link javax.wsdl.BindingFault <em>IBinding Fault</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see javax.wsdl.BindingFault
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getIBindingFault()
-   * @generated
-   */
-  int IBINDING_FAULT = 33;
-
-  /**
-   * The number of structural features of the the '<em>IBinding Fault</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IBINDING_FAULT_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link javax.wsdl.extensions.ExtensibilityElement <em>IExtensibility Element</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see javax.wsdl.extensions.ExtensibilityElement
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getIExtensibilityElement()
-   * @generated
-   */
-  int IEXTENSIBILITY_ELEMENT = 34;
-
-  /**
-   * The number of structural features of the the '<em>IExtensibility Element</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IEXTENSIBILITY_ELEMENT_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link javax.wsdl.Definition <em>IDefinition</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see javax.wsdl.Definition
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getIDefinition()
-   * @generated
-   */
-  int IDEFINITION = 35;
-
-  /**
-   * The number of structural features of the the '<em>IDefinition</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IDEFINITION_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link javax.wsdl.Import <em>IImport</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see javax.wsdl.Import
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getIImport()
-   * @generated
-   */
-  int IIMPORT = 36;
-
-  /**
-   * The number of structural features of the the '<em>IImport</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IIMPORT_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link java.util.List <em>IList</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see java.util.List
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getIList()
-   * @generated
-   */
-  int ILIST = 37;
-
-  /**
-   * The number of structural features of the the '<em>IList</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ILIST_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link java.util.Map <em>IMap</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see java.util.Map
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getIMap()
-   * @generated
-   */
-  int IMAP = 38;
-
-  /**
-   * The number of structural features of the the '<em>IMap</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IMAP_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link java.net.URL <em>IURL</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see java.net.URL
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getIURL()
-   * @generated
-   */
-  int IURL = 39;
-
-  /**
-   * The number of structural features of the the '<em>IURL</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IURL_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link javax.wsdl.extensions.ExtensionRegistry <em>IExtension Registry</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see javax.wsdl.extensions.ExtensionRegistry
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getIExtensionRegistry()
-   * @generated
-   */
-  int IEXTENSION_REGISTRY = 40;
-
-  /**
-   * The number of structural features of the the '<em>IExtension Registry</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IEXTENSION_REGISTRY_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.impl.TypesImpl <em>Types</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.impl.TypesImpl
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getTypes()
-   * @generated
-   */
-  int TYPES = 41;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int TYPES__DOCUMENTATION_ELEMENT = EXTENSIBLE_ELEMENT__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int TYPES__ELEMENT = EXTENSIBLE_ELEMENT__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>EExtensibility Elements</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int TYPES__EEXTENSIBILITY_ELEMENTS = EXTENSIBLE_ELEMENT__EEXTENSIBILITY_ELEMENTS;
-
-  /**
-   * The number of structural features of the the '<em>Types</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int TYPES_FEATURE_COUNT = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The meta object id for the '{@link java.util.Iterator <em>IIterator</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see java.util.Iterator
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getIIterator()
-   * @generated
-   */
-  int IITERATOR = 42;
-
-  /**
-   * The number of structural features of the the '<em>IIterator</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IITERATOR_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link javax.wsdl.Types <em>ITypes</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see javax.wsdl.Types
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getITypes()
-   * @generated
-   */
-  int ITYPES = 43;
-
-  /**
-   * The number of structural features of the the '<em>ITypes</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ITYPES_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.impl.UnknownExtensibilityElementImpl <em>Unknown Extensibility Element</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.impl.UnknownExtensibilityElementImpl
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getUnknownExtensibilityElement()
-   * @generated
-   */
-  int UNKNOWN_EXTENSIBILITY_ELEMENT = 44;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int UNKNOWN_EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT = EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int UNKNOWN_EXTENSIBILITY_ELEMENT__ELEMENT = EXTENSIBILITY_ELEMENT__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Required</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int UNKNOWN_EXTENSIBILITY_ELEMENT__REQUIRED = EXTENSIBILITY_ELEMENT__REQUIRED;
-
-  /**
-   * The feature id for the '<em><b>Element Type</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int UNKNOWN_EXTENSIBILITY_ELEMENT__ELEMENT_TYPE = EXTENSIBILITY_ELEMENT__ELEMENT_TYPE;
-
-  /**
-   * The feature id for the '<em><b>Children</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int UNKNOWN_EXTENSIBILITY_ELEMENT__CHILDREN = EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The number of structural features of the the '<em>Unknown Extensibility Element</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int UNKNOWN_EXTENSIBILITY_ELEMENT_FEATURE_COUNT = EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.impl.XSDSchemaExtensibilityElementImpl <em>XSD Schema Extensibility Element</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.impl.XSDSchemaExtensibilityElementImpl
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getXSDSchemaExtensibilityElement()
-   * @generated
-   */
-  int XSD_SCHEMA_EXTENSIBILITY_ELEMENT = 45;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int XSD_SCHEMA_EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT = EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int XSD_SCHEMA_EXTENSIBILITY_ELEMENT__ELEMENT = EXTENSIBILITY_ELEMENT__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Required</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int XSD_SCHEMA_EXTENSIBILITY_ELEMENT__REQUIRED = EXTENSIBILITY_ELEMENT__REQUIRED;
-
-  /**
-   * The feature id for the '<em><b>Element Type</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int XSD_SCHEMA_EXTENSIBILITY_ELEMENT__ELEMENT_TYPE = EXTENSIBILITY_ELEMENT__ELEMENT_TYPE;
-
-  /**
-   * The feature id for the '<em><b>Schema</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int XSD_SCHEMA_EXTENSIBILITY_ELEMENT__SCHEMA = EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The number of structural features of the the '<em>XSD Schema Extensibility Element</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int XSD_SCHEMA_EXTENSIBILITY_ELEMENT_FEATURE_COUNT = EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The meta object id for the '<em>QName</em>' data type.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see javax.xml.namespace.QName
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getQName()
-   * @generated
-   */
-  int QNAME = 47;
-
-  /**
-   * The meta object id for the '<em>Operation Type</em>' data type.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see javax.wsdl.OperationType
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getOperationType()
-   * @generated
-   */
-  int OPERATION_TYPE = 48;
-
-  /**
-   * The meta object id for the '<em>DOM Element</em>' data type.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.w3c.dom.Element
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getDOMElement()
-   * @generated
-   */
-  int DOM_ELEMENT = 49;
-
-  /**
-   * The meta object id for the '<em>Exception</em>' data type.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see javax.wsdl.WSDLException
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getWSDLException()
-   * @generated
-   */
-  int WSDL_EXCEPTION = 50;
-
-  /**
-   * The meta object id for the '<em>DOM Document</em>' data type.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.w3c.dom.Document
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getDOMDocument()
-   * @generated
-   */
-  int DOM_DOCUMENT = 51;
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.WSDLElement <em>Element</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Element</em>'.
-   * @see org.eclipse.wst.wsdl.WSDLElement
-   * @generated
-   */
-  EClass getWSDLElement();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.WSDLElement#getDocumentationElement <em>Documentation Element</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Documentation Element</em>'.
-   * @see org.eclipse.wst.wsdl.WSDLElement#getDocumentationElement()
-   * @see #getWSDLElement()
-   * @generated
-   */
-  EAttribute getWSDLElement_DocumentationElement();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.WSDLElement#getElement <em>Element</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Element</em>'.
-   * @see org.eclipse.wst.wsdl.WSDLElement#getElement()
-   * @see #getWSDLElement()
-   * @generated
-   */
-  EAttribute getWSDLElement_Element();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.PortType <em>Port Type</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Port Type</em>'.
-   * @see org.eclipse.wst.wsdl.PortType
-   * @generated
-   */
-  EClass getPortType();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.PortType#getQName <em>QName</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>QName</em>'.
-   * @see org.eclipse.wst.wsdl.PortType#getQName()
-   * @see #getPortType()
-   * @generated
-   */
-  EAttribute getPortType_QName();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.PortType#isUndefined <em>Undefined</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Undefined</em>'.
-   * @see org.eclipse.wst.wsdl.PortType#isUndefined()
-   * @see #getPortType()
-   * @generated
-   */
-  EAttribute getPortType_Undefined();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.PortType#isProxy <em>Proxy</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Proxy</em>'.
-   * @see org.eclipse.wst.wsdl.PortType#isProxy()
-   * @see #getPortType()
-   * @generated
-   */
-  EAttribute getPortType_Proxy();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.PortType#getResourceURI <em>Resource URI</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Resource URI</em>'.
-   * @see org.eclipse.wst.wsdl.PortType#getResourceURI()
-   * @see #getPortType()
-   * @generated
-   */
-  EAttribute getPortType_ResourceURI();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.wst.wsdl.PortType#getEOperations <em>EOperations</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>EOperations</em>'.
-   * @see org.eclipse.wst.wsdl.PortType#getEOperations()
-   * @see #getPortType()
-   * @generated
-   */
-  EReference getPortType_EOperations();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.Operation <em>Operation</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Operation</em>'.
-   * @see org.eclipse.wst.wsdl.Operation
-   * @generated
-   */
-  EClass getOperation();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Operation#getStyle <em>Style</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Style</em>'.
-   * @see org.eclipse.wst.wsdl.Operation#getStyle()
-   * @see #getOperation()
-   * @generated
-   */
-  EAttribute getOperation_Style();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Operation#getName <em>Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Name</em>'.
-   * @see org.eclipse.wst.wsdl.Operation#getName()
-   * @see #getOperation()
-   * @generated
-   */
-  EAttribute getOperation_Name();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Operation#isUndefined <em>Undefined</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Undefined</em>'.
-   * @see org.eclipse.wst.wsdl.Operation#isUndefined()
-   * @see #getOperation()
-   * @generated
-   */
-  EAttribute getOperation_Undefined();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Operation#isProxy <em>Proxy</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Proxy</em>'.
-   * @see org.eclipse.wst.wsdl.Operation#isProxy()
-   * @see #getOperation()
-   * @generated
-   */
-  EAttribute getOperation_Proxy();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Operation#getResourceURI <em>Resource URI</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Resource URI</em>'.
-   * @see org.eclipse.wst.wsdl.Operation#getResourceURI()
-   * @see #getOperation()
-   * @generated
-   */
-  EAttribute getOperation_ResourceURI();
-
-  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.wst.wsdl.Operation#getEInput <em>EInput</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>EInput</em>'.
-   * @see org.eclipse.wst.wsdl.Operation#getEInput()
-   * @see #getOperation()
-   * @generated
-   */
-  EReference getOperation_EInput();
-
-  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.wst.wsdl.Operation#getEOutput <em>EOutput</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>EOutput</em>'.
-   * @see org.eclipse.wst.wsdl.Operation#getEOutput()
-   * @see #getOperation()
-   * @generated
-   */
-  EReference getOperation_EOutput();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.wst.wsdl.Operation#getEFaults <em>EFaults</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>EFaults</em>'.
-   * @see org.eclipse.wst.wsdl.Operation#getEFaults()
-   * @see #getOperation()
-   * @generated
-   */
-  EReference getOperation_EFaults();
-
-  /**
-   * Returns the meta object for the reference list '{@link org.eclipse.wst.wsdl.Operation#getEParameterOrdering <em>EParameter Ordering</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the reference list '<em>EParameter Ordering</em>'.
-   * @see org.eclipse.wst.wsdl.Operation#getEParameterOrdering()
-   * @see #getOperation()
-   * @generated
-   */
-  EReference getOperation_EParameterOrdering();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.Message <em>Message</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Message</em>'.
-   * @see org.eclipse.wst.wsdl.Message
-   * @generated
-   */
-  EClass getMessage();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Message#getQName <em>QName</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>QName</em>'.
-   * @see org.eclipse.wst.wsdl.Message#getQName()
-   * @see #getMessage()
-   * @generated
-   */
-  EAttribute getMessage_QName();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Message#isUndefined <em>Undefined</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Undefined</em>'.
-   * @see org.eclipse.wst.wsdl.Message#isUndefined()
-   * @see #getMessage()
-   * @generated
-   */
-  EAttribute getMessage_Undefined();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Message#isProxy <em>Proxy</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Proxy</em>'.
-   * @see org.eclipse.wst.wsdl.Message#isProxy()
-   * @see #getMessage()
-   * @generated
-   */
-  EAttribute getMessage_Proxy();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Message#getResourceURI <em>Resource URI</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Resource URI</em>'.
-   * @see org.eclipse.wst.wsdl.Message#getResourceURI()
-   * @see #getMessage()
-   * @generated
-   */
-  EAttribute getMessage_ResourceURI();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.wst.wsdl.Message#getEParts <em>EParts</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>EParts</em>'.
-   * @see org.eclipse.wst.wsdl.Message#getEParts()
-   * @see #getMessage()
-   * @generated
-   */
-  EReference getMessage_EParts();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.Part <em>Part</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Part</em>'.
-   * @see org.eclipse.wst.wsdl.Part
-   * @generated
-   */
-  EClass getPart();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Part#getName <em>Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Name</em>'.
-   * @see org.eclipse.wst.wsdl.Part#getName()
-   * @see #getPart()
-   * @generated
-   */
-  EAttribute getPart_Name();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Part#getElementName <em>Element Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Element Name</em>'.
-   * @see org.eclipse.wst.wsdl.Part#getElementName()
-   * @see #getPart()
-   * @generated
-   */
-  EAttribute getPart_ElementName();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Part#getTypeName <em>Type Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Type Name</em>'.
-   * @see org.eclipse.wst.wsdl.Part#getTypeName()
-   * @see #getPart()
-   * @generated
-   */
-  EAttribute getPart_TypeName();
-
-  /**
-   * Returns the meta object for the reference '{@link org.eclipse.wst.wsdl.Part#getTypeDefinition <em>Type Definition</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the reference '<em>Type Definition</em>'.
-   * @see org.eclipse.wst.wsdl.Part#getTypeDefinition()
-   * @see #getPart()
-   * @generated
-   */
-  EReference getPart_TypeDefinition();
-
-  /**
-   * Returns the meta object for the reference '{@link org.eclipse.wst.wsdl.Part#getElementDeclaration <em>Element Declaration</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the reference '<em>Element Declaration</em>'.
-   * @see org.eclipse.wst.wsdl.Part#getElementDeclaration()
-   * @see #getPart()
-   * @generated
-   */
-  EReference getPart_ElementDeclaration();
-
-  /**
-   * Returns the meta object for the reference '{@link org.eclipse.wst.wsdl.Part#getEMessage <em>EMessage</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the reference '<em>EMessage</em>'.
-   * @see org.eclipse.wst.wsdl.Part#getEMessage()
-   * @see #getPart()
-   * @generated
-   */
-  EReference getPart_EMessage();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.Binding <em>Binding</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Binding</em>'.
-   * @see org.eclipse.wst.wsdl.Binding
-   * @generated
-   */
-  EClass getBinding();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Binding#getQName <em>QName</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>QName</em>'.
-   * @see org.eclipse.wst.wsdl.Binding#getQName()
-   * @see #getBinding()
-   * @generated
-   */
-  EAttribute getBinding_QName();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Binding#isUndefined <em>Undefined</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Undefined</em>'.
-   * @see org.eclipse.wst.wsdl.Binding#isUndefined()
-   * @see #getBinding()
-   * @generated
-   */
-  EAttribute getBinding_Undefined();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Binding#isProxy <em>Proxy</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Proxy</em>'.
-   * @see org.eclipse.wst.wsdl.Binding#isProxy()
-   * @see #getBinding()
-   * @generated
-   */
-  EAttribute getBinding_Proxy();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Binding#getResourceURI <em>Resource URI</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Resource URI</em>'.
-   * @see org.eclipse.wst.wsdl.Binding#getResourceURI()
-   * @see #getBinding()
-   * @generated
-   */
-  EAttribute getBinding_ResourceURI();
-
-  /**
-   * Returns the meta object for the reference '{@link org.eclipse.wst.wsdl.Binding#getEPortType <em>EPort Type</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the reference '<em>EPort Type</em>'.
-   * @see org.eclipse.wst.wsdl.Binding#getEPortType()
-   * @see #getBinding()
-   * @generated
-   */
-  EReference getBinding_EPortType();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.wst.wsdl.Binding#getEBindingOperations <em>EBinding Operations</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>EBinding Operations</em>'.
-   * @see org.eclipse.wst.wsdl.Binding#getEBindingOperations()
-   * @see #getBinding()
-   * @generated
-   */
-  EReference getBinding_EBindingOperations();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.BindingOperation <em>Binding Operation</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Binding Operation</em>'.
-   * @see org.eclipse.wst.wsdl.BindingOperation
-   * @generated
-   */
-  EClass getBindingOperation();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.BindingOperation#getName <em>Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Name</em>'.
-   * @see org.eclipse.wst.wsdl.BindingOperation#getName()
-   * @see #getBindingOperation()
-   * @generated
-   */
-  EAttribute getBindingOperation_Name();
-
-  /**
-   * Returns the meta object for the reference '{@link org.eclipse.wst.wsdl.BindingOperation#getEOperation <em>EOperation</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the reference '<em>EOperation</em>'.
-   * @see org.eclipse.wst.wsdl.BindingOperation#getEOperation()
-   * @see #getBindingOperation()
-   * @generated
-   */
-  EReference getBindingOperation_EOperation();
-
-  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.wst.wsdl.BindingOperation#getEBindingInput <em>EBinding Input</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>EBinding Input</em>'.
-   * @see org.eclipse.wst.wsdl.BindingOperation#getEBindingInput()
-   * @see #getBindingOperation()
-   * @generated
-   */
-  EReference getBindingOperation_EBindingInput();
-
-  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.wst.wsdl.BindingOperation#getEBindingOutput <em>EBinding Output</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>EBinding Output</em>'.
-   * @see org.eclipse.wst.wsdl.BindingOperation#getEBindingOutput()
-   * @see #getBindingOperation()
-   * @generated
-   */
-  EReference getBindingOperation_EBindingOutput();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.wst.wsdl.BindingOperation#getEBindingFaults <em>EBinding Faults</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>EBinding Faults</em>'.
-   * @see org.eclipse.wst.wsdl.BindingOperation#getEBindingFaults()
-   * @see #getBindingOperation()
-   * @generated
-   */
-  EReference getBindingOperation_EBindingFaults();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.Service <em>Service</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Service</em>'.
-   * @see org.eclipse.wst.wsdl.Service
-   * @generated
-   */
-  EClass getService();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Service#getQName <em>QName</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>QName</em>'.
-   * @see org.eclipse.wst.wsdl.Service#getQName()
-   * @see #getService()
-   * @generated
-   */
-  EAttribute getService_QName();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Service#isUndefined <em>Undefined</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Undefined</em>'.
-   * @see org.eclipse.wst.wsdl.Service#isUndefined()
-   * @see #getService()
-   * @generated
-   */
-  EAttribute getService_Undefined();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Service#isProxy <em>Proxy</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Proxy</em>'.
-   * @see org.eclipse.wst.wsdl.Service#isProxy()
-   * @see #getService()
-   * @generated
-   */
-  EAttribute getService_Proxy();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Service#getResourceURI <em>Resource URI</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Resource URI</em>'.
-   * @see org.eclipse.wst.wsdl.Service#getResourceURI()
-   * @see #getService()
-   * @generated
-   */
-  EAttribute getService_ResourceURI();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.wst.wsdl.Service#getEPorts <em>EPorts</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>EPorts</em>'.
-   * @see org.eclipse.wst.wsdl.Service#getEPorts()
-   * @see #getService()
-   * @generated
-   */
-  EReference getService_EPorts();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.Port <em>Port</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Port</em>'.
-   * @see org.eclipse.wst.wsdl.Port
-   * @generated
-   */
-  EClass getPort();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Port#getName <em>Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Name</em>'.
-   * @see org.eclipse.wst.wsdl.Port#getName()
-   * @see #getPort()
-   * @generated
-   */
-  EAttribute getPort_Name();
-
-  /**
-   * Returns the meta object for the reference '{@link org.eclipse.wst.wsdl.Port#getEBinding <em>EBinding</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the reference '<em>EBinding</em>'.
-   * @see org.eclipse.wst.wsdl.Port#getEBinding()
-   * @see #getPort()
-   * @generated
-   */
-  EReference getPort_EBinding();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.ExtensibilityElement <em>Extensibility Element</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Extensibility Element</em>'.
-   * @see org.eclipse.wst.wsdl.ExtensibilityElement
-   * @generated
-   */
-  EClass getExtensibilityElement();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.ExtensibilityElement#isRequired <em>Required</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Required</em>'.
-   * @see org.eclipse.wst.wsdl.ExtensibilityElement#isRequired()
-   * @see #getExtensibilityElement()
-   * @generated
-   */
-  EAttribute getExtensibilityElement_Required();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.ExtensibilityElement#getElementType <em>Element Type</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Element Type</em>'.
-   * @see org.eclipse.wst.wsdl.ExtensibilityElement#getElementType()
-   * @see #getExtensibilityElement()
-   * @generated
-   */
-  EAttribute getExtensibilityElement_ElementType();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.Definition <em>Definition</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Definition</em>'.
-   * @see org.eclipse.wst.wsdl.Definition
-   * @generated
-   */
-  EClass getDefinition();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Definition#getTargetNamespace <em>Target Namespace</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Target Namespace</em>'.
-   * @see org.eclipse.wst.wsdl.Definition#getTargetNamespace()
-   * @see #getDefinition()
-   * @generated
-   */
-  EAttribute getDefinition_TargetNamespace();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Definition#getLocation <em>Location</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Location</em>'.
-   * @see org.eclipse.wst.wsdl.Definition#getLocation()
-   * @see #getDefinition()
-   * @generated
-   */
-  EAttribute getDefinition_Location();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Definition#getQName <em>QName</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>QName</em>'.
-   * @see org.eclipse.wst.wsdl.Definition#getQName()
-   * @see #getDefinition()
-   * @generated
-   */
-  EAttribute getDefinition_QName();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Definition#getEncoding <em>Encoding</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Encoding</em>'.
-   * @see org.eclipse.wst.wsdl.Definition#getEncoding()
-   * @see #getDefinition()
-   * @generated
-   */
-  EAttribute getDefinition_Encoding();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.wst.wsdl.Definition#getEMessages <em>EMessages</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>EMessages</em>'.
-   * @see org.eclipse.wst.wsdl.Definition#getEMessages()
-   * @see #getDefinition()
-   * @generated
-   */
-  EReference getDefinition_EMessages();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.wst.wsdl.Definition#getEPortTypes <em>EPort Types</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>EPort Types</em>'.
-   * @see org.eclipse.wst.wsdl.Definition#getEPortTypes()
-   * @see #getDefinition()
-   * @generated
-   */
-  EReference getDefinition_EPortTypes();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.wst.wsdl.Definition#getEBindings <em>EBindings</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>EBindings</em>'.
-   * @see org.eclipse.wst.wsdl.Definition#getEBindings()
-   * @see #getDefinition()
-   * @generated
-   */
-  EReference getDefinition_EBindings();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.wst.wsdl.Definition#getEServices <em>EServices</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>EServices</em>'.
-   * @see org.eclipse.wst.wsdl.Definition#getEServices()
-   * @see #getDefinition()
-   * @generated
-   */
-  EReference getDefinition_EServices();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.wst.wsdl.Definition#getENamespaces <em>ENamespaces</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>ENamespaces</em>'.
-   * @see org.eclipse.wst.wsdl.Definition#getENamespaces()
-   * @see #getDefinition()
-   * @generated
-   */
-  EReference getDefinition_ENamespaces();
-
-  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.wst.wsdl.Definition#getETypes <em>ETypes</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>ETypes</em>'.
-   * @see org.eclipse.wst.wsdl.Definition#getETypes()
-   * @see #getDefinition()
-   * @generated
-   */
-  EReference getDefinition_ETypes();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.wst.wsdl.Definition#getEImports <em>EImports</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>EImports</em>'.
-   * @see org.eclipse.wst.wsdl.Definition#getEImports()
-   * @see #getDefinition()
-   * @generated
-   */
-  EReference getDefinition_EImports();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.Import <em>Import</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Import</em>'.
-   * @see org.eclipse.wst.wsdl.Import
-   * @generated
-   */
-  EClass getImport();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Import#getNamespaceURI <em>Namespace URI</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Namespace URI</em>'.
-   * @see org.eclipse.wst.wsdl.Import#getNamespaceURI()
-   * @see #getImport()
-   * @generated
-   */
-  EAttribute getImport_NamespaceURI();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Import#getLocationURI <em>Location URI</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Location URI</em>'.
-   * @see org.eclipse.wst.wsdl.Import#getLocationURI()
-   * @see #getImport()
-   * @generated
-   */
-  EAttribute getImport_LocationURI();
-
-  /**
-   * Returns the meta object for the reference '{@link org.eclipse.wst.wsdl.Import#getEDefinition <em>EDefinition</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the reference '<em>EDefinition</em>'.
-   * @see org.eclipse.wst.wsdl.Import#getEDefinition()
-   * @see #getImport()
-   * @generated
-   */
-  EReference getImport_EDefinition();
-
-  /**
-   * Returns the meta object for the reference '{@link org.eclipse.wst.wsdl.Import#getESchema <em>ESchema</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the reference '<em>ESchema</em>'.
-   * @see org.eclipse.wst.wsdl.Import#getESchema()
-   * @see #getImport()
-   * @generated
-   */
-  EReference getImport_ESchema();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.ExtensibleElement <em>Extensible Element</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Extensible Element</em>'.
-   * @see org.eclipse.wst.wsdl.ExtensibleElement
-   * @generated
-   */
-  EClass getExtensibleElement();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.wst.wsdl.ExtensibleElement#getEExtensibilityElements <em>EExtensibility Elements</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>EExtensibility Elements</em>'.
-   * @see org.eclipse.wst.wsdl.ExtensibleElement#getEExtensibilityElements()
-   * @see #getExtensibleElement()
-   * @generated
-   */
-  EReference getExtensibleElement_EExtensibilityElements();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.Input <em>Input</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Input</em>'.
-   * @see org.eclipse.wst.wsdl.Input
-   * @generated
-   */
-  EClass getInput();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.Output <em>Output</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Output</em>'.
-   * @see org.eclipse.wst.wsdl.Output
-   * @generated
-   */
-  EClass getOutput();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.Fault <em>Fault</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Fault</em>'.
-   * @see org.eclipse.wst.wsdl.Fault
-   * @generated
-   */
-  EClass getFault();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.BindingInput <em>Binding Input</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Binding Input</em>'.
-   * @see org.eclipse.wst.wsdl.BindingInput
-   * @generated
-   */
-  EClass getBindingInput();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.BindingInput#getName <em>Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Name</em>'.
-   * @see org.eclipse.wst.wsdl.BindingInput#getName()
-   * @see #getBindingInput()
-   * @generated
-   */
-  EAttribute getBindingInput_Name();
-
-  /**
-   * Returns the meta object for the reference '{@link org.eclipse.wst.wsdl.BindingInput#getEInput <em>EInput</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the reference '<em>EInput</em>'.
-   * @see org.eclipse.wst.wsdl.BindingInput#getEInput()
-   * @see #getBindingInput()
-   * @generated
-   */
-  EReference getBindingInput_EInput();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.BindingOutput <em>Binding Output</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Binding Output</em>'.
-   * @see org.eclipse.wst.wsdl.BindingOutput
-   * @generated
-   */
-  EClass getBindingOutput();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.BindingOutput#getName <em>Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Name</em>'.
-   * @see org.eclipse.wst.wsdl.BindingOutput#getName()
-   * @see #getBindingOutput()
-   * @generated
-   */
-  EAttribute getBindingOutput_Name();
-
-  /**
-   * Returns the meta object for the reference '{@link org.eclipse.wst.wsdl.BindingOutput#getEOutput <em>EOutput</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the reference '<em>EOutput</em>'.
-   * @see org.eclipse.wst.wsdl.BindingOutput#getEOutput()
-   * @see #getBindingOutput()
-   * @generated
-   */
-  EReference getBindingOutput_EOutput();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.BindingFault <em>Binding Fault</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Binding Fault</em>'.
-   * @see org.eclipse.wst.wsdl.BindingFault
-   * @generated
-   */
-  EClass getBindingFault();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.BindingFault#getName <em>Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Name</em>'.
-   * @see org.eclipse.wst.wsdl.BindingFault#getName()
-   * @see #getBindingFault()
-   * @generated
-   */
-  EAttribute getBindingFault_Name();
-
-  /**
-   * Returns the meta object for the reference '{@link org.eclipse.wst.wsdl.BindingFault#getEFault <em>EFault</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the reference '<em>EFault</em>'.
-   * @see org.eclipse.wst.wsdl.BindingFault#getEFault()
-   * @see #getBindingFault()
-   * @generated
-   */
-  EReference getBindingFault_EFault();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.Namespace <em>Namespace</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Namespace</em>'.
-   * @see org.eclipse.wst.wsdl.Namespace
-   * @generated
-   */
-  EClass getNamespace();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Namespace#getURI <em>URI</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>URI</em>'.
-   * @see org.eclipse.wst.wsdl.Namespace#getURI()
-   * @see #getNamespace()
-   * @generated
-   */
-  EAttribute getNamespace_URI();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Namespace#getPrefix <em>Prefix</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Prefix</em>'.
-   * @see org.eclipse.wst.wsdl.Namespace#getPrefix()
-   * @see #getNamespace()
-   * @generated
-   */
-  EAttribute getNamespace_Prefix();
-
-  /**
-   * Returns the meta object for class '{@link javax.wsdl.PortType <em>IPort Type</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>IPort Type</em>'.
-   * @see javax.wsdl.PortType
-   * @model instanceClass="javax.wsdl.PortType" 
-   * @generated
-   */
-  EClass getIPortType();
-
-  /**
-   * Returns the meta object for class '{@link javax.wsdl.Operation <em>IOperation</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>IOperation</em>'.
-   * @see javax.wsdl.Operation
-   * @model instanceClass="javax.wsdl.Operation" 
-   * @generated
-   */
-  EClass getIOperation();
-
-  /**
-   * Returns the meta object for class '{@link javax.wsdl.Input <em>IInput</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>IInput</em>'.
-   * @see javax.wsdl.Input
-   * @model instanceClass="javax.wsdl.Input" 
-   * @generated
-   */
-  EClass getIInput();
-
-  /**
-   * Returns the meta object for class '{@link javax.wsdl.Output <em>IOutput</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>IOutput</em>'.
-   * @see javax.wsdl.Output
-   * @model instanceClass="javax.wsdl.Output" 
-   * @generated
-   */
-  EClass getIOutput();
-
-  /**
-   * Returns the meta object for class '{@link javax.wsdl.Fault <em>IFault</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>IFault</em>'.
-   * @see javax.wsdl.Fault
-   * @model instanceClass="javax.wsdl.Fault" 
-   * @generated
-   */
-  EClass getIFault();
-
-  /**
-   * Returns the meta object for class '{@link javax.wsdl.Message <em>IMessage</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>IMessage</em>'.
-   * @see javax.wsdl.Message
-   * @model instanceClass="javax.wsdl.Message" 
-   * @generated
-   */
-  EClass getIMessage();
-
-  /**
-   * Returns the meta object for class '{@link javax.wsdl.Part <em>IPart</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>IPart</em>'.
-   * @see javax.wsdl.Part
-   * @model instanceClass="javax.wsdl.Part" 
-   * @generated
-   */
-  EClass getIPart();
-
-  /**
-   * Returns the meta object for class '{@link javax.wsdl.Service <em>IService</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>IService</em>'.
-   * @see javax.wsdl.Service
-   * @model instanceClass="javax.wsdl.Service" 
-   * @generated
-   */
-  EClass getIService();
-
-  /**
-   * Returns the meta object for class '{@link javax.wsdl.Port <em>IPort</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>IPort</em>'.
-   * @see javax.wsdl.Port
-   * @model instanceClass="javax.wsdl.Port" 
-   * @generated
-   */
-  EClass getIPort();
-
-  /**
-   * Returns the meta object for class '{@link javax.wsdl.Binding <em>IBinding</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>IBinding</em>'.
-   * @see javax.wsdl.Binding
-   * @model instanceClass="javax.wsdl.Binding" 
-   * @generated
-   */
-  EClass getIBinding();
-
-  /**
-   * Returns the meta object for class '{@link javax.wsdl.BindingOperation <em>IBinding Operation</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>IBinding Operation</em>'.
-   * @see javax.wsdl.BindingOperation
-   * @model instanceClass="javax.wsdl.BindingOperation" 
-   * @generated
-   */
-  EClass getIBindingOperation();
-
-  /**
-   * Returns the meta object for class '{@link javax.wsdl.BindingInput <em>IBinding Input</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>IBinding Input</em>'.
-   * @see javax.wsdl.BindingInput
-   * @model instanceClass="javax.wsdl.BindingInput" 
-   * @generated
-   */
-  EClass getIBindingInput();
-
-  /**
-   * Returns the meta object for class '{@link javax.wsdl.BindingOutput <em>IBinding Output</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>IBinding Output</em>'.
-   * @see javax.wsdl.BindingOutput
-   * @model instanceClass="javax.wsdl.BindingOutput" 
-   * @generated
-   */
-  EClass getIBindingOutput();
-
-  /**
-   * Returns the meta object for class '{@link javax.wsdl.BindingFault <em>IBinding Fault</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>IBinding Fault</em>'.
-   * @see javax.wsdl.BindingFault
-   * @model instanceClass="javax.wsdl.BindingFault" 
-   * @generated
-   */
-  EClass getIBindingFault();
-
-  /**
-   * Returns the meta object for class '{@link javax.wsdl.extensions.ExtensibilityElement <em>IExtensibility Element</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>IExtensibility Element</em>'.
-   * @see javax.wsdl.extensions.ExtensibilityElement
-   * @model instanceClass="javax.wsdl.extensions.ExtensibilityElement" 
-   * @generated
-   */
-  EClass getIExtensibilityElement();
-
-  /**
-   * Returns the meta object for class '{@link javax.wsdl.Definition <em>IDefinition</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>IDefinition</em>'.
-   * @see javax.wsdl.Definition
-   * @model instanceClass="javax.wsdl.Definition" 
-   * @generated
-   */
-  EClass getIDefinition();
-
-  /**
-   * Returns the meta object for class '{@link javax.wsdl.Import <em>IImport</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>IImport</em>'.
-   * @see javax.wsdl.Import
-   * @model instanceClass="javax.wsdl.Import" 
-   * @generated
-   */
-  EClass getIImport();
-
-  /**
-   * Returns the meta object for class '{@link java.util.List <em>IList</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>IList</em>'.
-   * @see java.util.List
-   * @model instanceClass="java.util.List" 
-   * @generated
-   */
-  EClass getIList();
-
-  /**
-   * Returns the meta object for class '{@link java.util.Map <em>IMap</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>IMap</em>'.
-   * @see java.util.Map
-   * @model instanceClass="java.util.Map" 
-   * @generated
-   */
-  EClass getIMap();
-
-  /**
-   * Returns the meta object for class '{@link java.net.URL <em>IURL</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>IURL</em>'.
-   * @see java.net.URL
-   * @model instanceClass="java.net.URL" 
-   * @generated
-   */
-  EClass getIURL();
-
-  /**
-   * Returns the meta object for class '{@link javax.wsdl.extensions.ExtensionRegistry <em>IExtension Registry</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>IExtension Registry</em>'.
-   * @see javax.wsdl.extensions.ExtensionRegistry
-   * @model instanceClass="javax.wsdl.extensions.ExtensionRegistry" 
-   * @generated
-   */
-  EClass getIExtensionRegistry();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.Types <em>Types</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Types</em>'.
-   * @see org.eclipse.wst.wsdl.Types
-   * @generated
-   */
-  EClass getTypes();
-
-  /**
-   * Returns the meta object for class '{@link java.util.Iterator <em>IIterator</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>IIterator</em>'.
-   * @see java.util.Iterator
-   * @model instanceClass="java.util.Iterator" 
-   * @generated
-   */
-  EClass getIIterator();
-
-  /**
-   * Returns the meta object for class '{@link javax.wsdl.Types <em>ITypes</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>ITypes</em>'.
-   * @see javax.wsdl.Types
-   * @model instanceClass="javax.wsdl.Types" 
-   * @generated
-   */
-  EClass getITypes();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.UnknownExtensibilityElement <em>Unknown Extensibility Element</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Unknown Extensibility Element</em>'.
-   * @see org.eclipse.wst.wsdl.UnknownExtensibilityElement
-   * @generated
-   */
-  EClass getUnknownExtensibilityElement();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.wst.wsdl.UnknownExtensibilityElement#getChildren <em>Children</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>Children</em>'.
-   * @see org.eclipse.wst.wsdl.UnknownExtensibilityElement#getChildren()
-   * @see #getUnknownExtensibilityElement()
-   * @generated
-   */
-  EReference getUnknownExtensibilityElement_Children();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement <em>XSD Schema Extensibility Element</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>XSD Schema Extensibility Element</em>'.
-   * @see org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement
-   * @generated
-   */
-  EClass getXSDSchemaExtensibilityElement();
-
-  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement#getSchema <em>Schema</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Schema</em>'.
-   * @see org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement#getSchema()
-   * @see #getXSDSchemaExtensibilityElement()
-   * @generated
-   */
-  EReference getXSDSchemaExtensibilityElement_Schema();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.MessageReference <em>Message Reference</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Message Reference</em>'.
-   * @see org.eclipse.wst.wsdl.MessageReference
-   * @generated
-   */
-  EClass getMessageReference();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.MessageReference#getName <em>Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Name</em>'.
-   * @see org.eclipse.wst.wsdl.MessageReference#getName()
-   * @see #getMessageReference()
-   * @generated
-   */
-  EAttribute getMessageReference_Name();
-
-  /**
-   * Returns the meta object for the reference '{@link org.eclipse.wst.wsdl.MessageReference#getEMessage <em>EMessage</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the reference '<em>EMessage</em>'.
-   * @see org.eclipse.wst.wsdl.MessageReference#getEMessage()
-   * @see #getMessageReference()
-   * @generated
-   */
-  EReference getMessageReference_EMessage();
-
-  /**
-   * Returns the meta object for data type '{@link javax.xml.namespace.QName <em>QName</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for data type '<em>QName</em>'.
-   * @see javax.xml.namespace.QName
-   * @model instanceClass="javax.xml.namespace.QName"
-   * @generated
-   */
-  EDataType getQName();
-
-  /**
-   * Returns the meta object for data type '{@link javax.wsdl.OperationType <em>Operation Type</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for data type '<em>Operation Type</em>'.
-   * @see javax.wsdl.OperationType
-   * @model instanceClass="javax.wsdl.OperationType"
-   * @generated
-   */
-  EDataType getOperationType();
-
-  /**
-   * Returns the meta object for data type '{@link org.w3c.dom.Element <em>DOM Element</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for data type '<em>DOM Element</em>'.
-   * @see org.w3c.dom.Element
-   * @model instanceClass="org.w3c.dom.Element"
-   * @generated
-   */
-  EDataType getDOMElement();
-
-  /**
-   * Returns the meta object for data type '{@link javax.wsdl.WSDLException <em>Exception</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for data type '<em>Exception</em>'.
-   * @see javax.wsdl.WSDLException
-   * @model instanceClass="javax.wsdl.WSDLException"
-   * @generated
-   */
-  EDataType getWSDLException();
-
-  /**
-   * Returns the meta object for data type '{@link org.w3c.dom.Document <em>DOM Document</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for data type '<em>DOM Document</em>'.
-   * @see org.w3c.dom.Document
-   * @model instanceClass="org.w3c.dom.Document"
-   * @generated
-   */
-  EDataType getDOMDocument();
-
-  /**
-   * Returns the factory that creates the instances of the model.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the factory that creates the instances of the model.
-   * @generated
-   */
-  WSDLFactory getWSDLFactory();
-
-} //WSDLPackage
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLPlugin.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLPlugin.java
deleted file mode 100644
index 239bf3b34..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLPlugin.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-import javax.wsdl.factory.WSDLFactory;
-
-import org.eclipse.emf.common.EMFPlugin;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.wst.wsdl.internal.extensibility.ExtensibilityElementFactoryRegistryImpl;
-import org.eclipse.wst.wsdl.internal.extensibility.ExtensibilityElementFactoryRegistryReader;
-import org.eclipse.wst.wsdl.internal.impl.wsdl4j.WSDLFactoryImpl;
-import org.eclipse.wst.wsdl.util.ExtensibilityElementFactory;
-import org.eclipse.wst.wsdl.util.ExtensibilityElementFactoryRegistry;
-
-
-/**
- * The <b>Plugin</b> for the model.
- * The WSDL model needs to be able to run within an Eclipse workbench,
- * within a headless Eclipse workspace, or just stand-alone as part 
- * of some other application.
- * To support this, all access is directed to the static methods,
- * which can redirect the service as appopriate to the runtime.
- * During stand-alone invocation no plugin initialization takes place.
- * In this case you will need the resources jar on the class path.
- * @see #getBaseURL
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 1.0
- */
-public final class WSDLPlugin extends EMFPlugin 
-{
-  /**
-   * The singleton instance of the plugin.
-   */
-  public static final WSDLPlugin INSTANCE = new WSDLPlugin();
-
-  /**
-   * The one instance of this class.
-   */
-  static WSDLPluginImplementation plugin;
-  
-  private ExtensibilityElementFactoryRegistryImpl extensibilityElementFactoryRegistry;
-
-  /**
-   * Creates the singleton instance.
-   */
-  private WSDLPlugin()
-  {
-    super(new ResourceLocator[] {});
-  }
-
-  /*
-   * Javadoc copied from base class.
-   */
-  public ResourceLocator getPluginResourceLocator()
-  {
-    return plugin;
-  }
-
-  /**
-   * Returns the singleton instance of the Eclipse plugin.
-   * @return the singleton instance.
-   */
-  public static WSDLPluginImplementation getPlugin()
-  {
-    return plugin;
-  }
-
-  private ExtensibilityElementFactoryRegistryImpl internalGetExtensibilityElementFactoryRegistry()
-  {
-    if (extensibilityElementFactoryRegistry == null)
-    {
-      extensibilityElementFactoryRegistry = new ExtensibilityElementFactoryRegistryImpl();
-      if (plugin != null)
-      {  
-        new ExtensibilityElementFactoryRegistryReader(extensibilityElementFactoryRegistry).readRegistry();
-      }  
-    }
-    return extensibilityElementFactoryRegistry;
-  }
-  
-  public ExtensibilityElementFactory getExtensibilityElementFactory(String namespace)
-  {
-    return internalGetExtensibilityElementFactoryRegistry().getExtensibilityElementFactory(namespace);
-  }
-  
-  public ExtensibilityElementFactoryRegistry getExtensibilityElementFactoryRegistry()
-  {   
-    return internalGetExtensibilityElementFactoryRegistry();
-  }
-  
-  public WSDLFactory createWSDL4JFactory()
-  {
-    return new WSDLFactoryImpl();   	
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLPluginImplementation.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLPluginImplementation.java
deleted file mode 100644
index a07de7a0a..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLPluginImplementation.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.emf.common.EMFPlugin.EclipsePlugin;
-
-/**
- * The actual implementation of the Eclipse <b>Plugin</b>.
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 1.0
- */
-  public class WSDLPluginImplementation extends EclipsePlugin
-  {
-    /**
-     * Creates an instance.
-     * @param descriptor the description of the plugin.
-     */
-    public WSDLPluginImplementation(IPluginDescriptor descriptor)
-    {
-      super(descriptor);
-
-      // Remember the static instance.
-      //
-      WSDLPlugin.plugin = this;
-    }
-  }
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/XSDSchemaExtensibilityElement.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/XSDSchemaExtensibilityElement.java
deleted file mode 100644
index d2554f919..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/XSDSchemaExtensibilityElement.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-import org.eclipse.xsd.XSDSchema;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>XSD Schema Extensibility Element</b></em>'.
- * @since 1.0
- * @ignore
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.XSDSchemaExtensibilityElement#getSchema <em>Schema</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wsdl.WSDLPackage#getXSDSchemaExtensibilityElement()
- * @model 
- * @generated
- */
-public interface XSDSchemaExtensibilityElement extends ExtensibilityElement{
-  /**
-   * Returns the value of the '<em><b>Schema</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Schema</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Schema</em>' containment reference.
-   * @see #setSchema(XSDSchema)
-   * @see org.eclipse.wsdl.WSDLPackage#getXSDSchemaExtensibilityElement_Schema()
-   * @model containment="true"
-   * @generated
-   */
-  XSDSchema getSchema();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.XSDSchemaExtensibilityElement#getSchema <em>Schema</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Schema</em>' containment reference.
-   * @see #getSchema()
-   * @generated
-   */
-  void setSchema(XSDSchema value);
-
-} // XSDSchemaExtensibilityElement
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/extensibility/ExtensibilityElementFactoryDescriptor.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/extensibility/ExtensibilityElementFactoryDescriptor.java
deleted file mode 100644
index 040b799ad..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/extensibility/ExtensibilityElementFactoryDescriptor.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.extensibility;
-
-import org.eclipse.wst.wsdl.util.ExtensibilityElementFactory;
-
-public class ExtensibilityElementFactoryDescriptor
-{
-  private final static String CLASS_LOADING_ERROR = "CLASS_LOADING_ERROR";
-  
-  protected ClassLoader classLoader;
-  protected String namespace;
-  protected String className;  
-  protected Object factory;
-
-  public ExtensibilityElementFactoryDescriptor(String className, String namespace, ClassLoader classLoader)
-  {
-    this.classLoader = classLoader;
-    this.className = className;
-    this.namespace = namespace;
-  }
-
-  public ExtensibilityElementFactory getExtensiblityElementFactory()
-  {
-    if (factory == null)
-    {
-      try
-      {
-        Class theClass = classLoader != null ? classLoader.loadClass(className) : Class.forName(className);
-        factory = (ExtensibilityElementFactory)theClass.newInstance();
-      }
-      catch (Exception e)
-      {
-        factory = CLASS_LOADING_ERROR;
-        e.printStackTrace();
-      }
-    }
-    return factory != CLASS_LOADING_ERROR ? (ExtensibilityElementFactory)factory : null;
-  }
-  
-  public void setExtensiblityElementFactory(ExtensibilityElementFactory factory)
-  {
-    this.factory = factory;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/extensibility/ExtensibilityElementFactoryRegistryImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/extensibility/ExtensibilityElementFactoryRegistryImpl.java
deleted file mode 100644
index fbbc01408..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/extensibility/ExtensibilityElementFactoryRegistryImpl.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.extensibility;
-
-import java.util.HashMap;
-
-import org.eclipse.wst.wsdl.util.ExtensibilityElementFactory;
-import org.eclipse.wst.wsdl.util.ExtensibilityElementFactoryRegistry;
-
-
-public class ExtensibilityElementFactoryRegistryImpl implements ExtensibilityElementFactoryRegistry
-{
-  protected HashMap map = new HashMap();
-  
-  public void put(String namespace, ExtensibilityElementFactoryDescriptor descriptor)
-  {
-    map.put(namespace, descriptor);
-  }
-  
-  public ExtensibilityElementFactory getExtensibilityElementFactory(String namespace)
-  {
-    ExtensibilityElementFactory result = null;
-    ExtensibilityElementFactoryDescriptor descriptor = (ExtensibilityElementFactoryDescriptor)map.get(namespace);
-    if (descriptor != null)
-    {
-      result = descriptor.getExtensiblityElementFactory();
-    }
-    return result;
-  }
-  
-  public void registerFactory(String namespace, ExtensibilityElementFactory factory)
-  {
-    ExtensibilityElementFactoryDescriptor descriptor = new ExtensibilityElementFactoryDescriptor(null,namespace,null);
-    descriptor.setExtensiblityElementFactory(factory);
-    map.put(namespace,descriptor);
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/extensibility/ExtensibilityElementFactoryRegistryReader.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/extensibility/ExtensibilityElementFactoryRegistryReader.java
deleted file mode 100644
index ddc5407c2..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/extensibility/ExtensibilityElementFactoryRegistryReader.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.extensibility;
-import java.net.URL;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IPluginRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.wsdl.WSDLPlugin;
-
-
-public class ExtensibilityElementFactoryRegistryReader
-{
-  protected static final String PLUGIN_ID = WSDLPlugin.getPlugin().getDescriptor().getUniqueIdentifier();
-  protected static final String EXTENSION_POINT_ID = "extensibilityElementFactories";
-  protected static final String ELEMENT_NAME = "extensibilityElementFactory";
-  protected static final String ATT_NAMESPACE = "namespace";
-  protected static final String ATT_CLASS = "class";
-  protected ExtensibilityElementFactoryRegistryImpl extensibilityElementFactoryRegistry;
-
-  public ExtensibilityElementFactoryRegistryReader(ExtensibilityElementFactoryRegistryImpl extensibilityElementFactoryRegistry)
-  {
-    this.extensibilityElementFactoryRegistry = extensibilityElementFactoryRegistry;
-  }
-
-  /**
-   * read from plugin registry and parse it.
-   */
-  public void readRegistry()
-  {
-    IPluginRegistry pluginRegistry = Platform.getPluginRegistry();
-    IExtensionPoint point = pluginRegistry.getExtensionPoint(PLUGIN_ID, EXTENSION_POINT_ID);
-    if (point != null)
-    {
-      IConfigurationElement[] elements = point.getConfigurationElements();
-      for (int i = 0; i < elements.length; i++)
-      {
-        readElement(elements[i]);
-      }
-    }
-  }
-
-  public String resolve(URL platformURL, String relativePath) throws Exception
-  {
-    URL resolvedURL = Platform.resolve(platformURL);
-    return resolvedURL.toString() + relativePath;
-  }
-
-  protected void readElement(IConfigurationElement element)
-  {
-    if (element.getName().equals(ELEMENT_NAME))
-    {
-      try
-      {
-        IConfigurationElement childElement = (IConfigurationElement) element;
-        String namespace = childElement.getAttribute(ATT_NAMESPACE);
-        if (namespace != null)
-        {
-          ClassLoader pluginClasssLoader = element.getDeclaringExtension().getDeclaringPluginDescriptor().getPluginClassLoader();
-          String className = childElement.getAttribute(ATT_CLASS);
-          ExtensibilityElementFactoryDescriptor descriptor = new ExtensibilityElementFactoryDescriptor(className,namespace,pluginClasssLoader);
-          extensibilityElementFactoryRegistry.put(namespace, descriptor);
-        }
-      }
-      catch (Exception e)
-      {
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/BaseGenerator.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/BaseGenerator.java
deleted file mode 100644
index cf9345f3b..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/BaseGenerator.java
+++ /dev/null
@@ -1,66 +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 Common Public License v1.0
- * which accompanies this distribution, 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.generator;
-
-import org.eclipse.wst.wsdl.Definition;
-
-public abstract class BaseGenerator {
-	private String name;
-	private String refName;
-	private boolean overwrite;
-	protected Definition definition;
-	protected ContentGenerator contentGenerator;
-	
-	
-	public void setContentGenerator(ContentGenerator generator) {
-		contentGenerator = generator;
-	}
-	
-	public ContentGenerator getContentGenerator() {
-		return contentGenerator;
-	}
-
-	public void setOverwrite(boolean overwrite) {
-		this.overwrite = overwrite;
-	}
-	
-	public boolean getOverwrite() {
-		return overwrite;
-	}
-	
-	public void setName(String name) {
-		this.name = name;
-	}
-	
-	public void setRefName(String refName) {
-		this.refName = refName;
-	}
-	
-	public String getName() {
-		return name;
-	}
-	
-	public String getRefName() {
-		return refName;
-	}
-	
-	public Definition getDefinition() {
-		return definition;
-	}
-	
-	public String getProtocol() {
-		if (contentGenerator != null) {
-			return contentGenerator.getProtocol();
-		}
-		
-		return null;
-	}
-}
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/BindingGenerator.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/BindingGenerator.java
deleted file mode 100644
index 313fab386..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/BindingGenerator.java
+++ /dev/null
@@ -1,621 +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 Common Public License v1.0
- * which accompanies this distribution, 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.generator;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.ExtensibleElement;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.internal.generator.extension.ContentGeneratorExtensionFactoryRegistry;
-
-/*
- * Class used to generate the Binding and it's content.  We look in the registry for
- * appropriate ContentGenerator classes based on the existing Binding Content's namespace.
- * Alternatively, users can pass in a namespace through the constructor to specify which
- * namespace to use when searching the registry.
- * 
- * The ContentGenerator may also be set manually by calling
- * setContentGenerator(ContentGenerator).
- */
-public class BindingGenerator extends BaseGenerator {
-	private WSDLFactory factory = WSDLFactory.eINSTANCE;
-	private Binding binding;
-
-	/*
-	 * When the constructor is used, automatically attempt to retrieve a proper
-	 * ContentGenerator based on the Binding given.  The ContentGenerator may
-	 * be replaced by calling setContentGenerator(ContentGenerator).
-	 */
-	public BindingGenerator(Definition definition, Binding binding) {	
-		this.definition = definition;
-		this.binding = binding;
-		contentGenerator = getContentGenerator(binding);
-	}
-
-	/*
-	 * When the constructor is used, automatically attempt to retrieve a proper
-	 * ContentGenerator based on the namespace given.  The ContentGenerator may
-	 * be replaced by calling setContentGenerator(ContentGenerator).
-	 */
-	public BindingGenerator(Definition definition, Binding binding, String namespace) {
-		this.definition = definition;
-		this.binding = binding;
-		contentGenerator = getContentGenerator(namespace);
-	}
-
-	public static ContentGenerator getContentGenerator(Binding binding) {
-		if (binding == null) {
-			return null;
-		}
-		/******************************************************
-		 * Find the regeistered Content Generator for the Binding
-		 ******************************************************/
-		// Get BindingContent namespace
-		String namespace = null;
-		List eeList = binding.getEExtensibilityElements();
-		if (eeList.size() > 0) {
-	        ExtensibilityElement ee = (ExtensibilityElement) eeList.get(0);			
-			// TODO: QName qName = ee.getElementType(); go get the namespace instead?
-	        namespace = ee.getElement().getNamespaceURI();
-			return getContentGenerator(namespace);
-		}
-	
-		return null;
-	}
-	
-	public static ContentGenerator getContentGenerator(String namespace) {
-		ContentGenerator contentGen = null;
-		if (namespace != null) {
-			ContentGeneratorExtensionFactoryRegistry factoryRegistry = ContentGeneratorExtensionFactoryRegistry.getInstance(); 
-			contentGen = factoryRegistry.getGeneratorClassFromNamespace(namespace);
-		}
-		
-		return contentGen;		
-	}
-	
-	private Binding createEmptyBinding(String localName) {
-		String name = localName;
-		if (localName == null) {
-			name = "";
-		}
-	    Binding newBinding = WSDLFactory.eINSTANCE.createBinding();
-		newBinding.setQName(new QName(definition.getTargetNamespace(),localName));
-		newBinding.setEnclosingDefinition(definition);
-	    definition.addBinding(newBinding);
-		
-		return newBinding;
-	}
-
-	/*
-	 * TODO: Scenario:
-	 * 1)overwrite == false
-	 * 2)BindingOperation with 1 input
-	 * 3)Corresponding Operation (with same name) with 1 input and 1 output
-	 * If we generate with overwrite == false, nothing is done.  Thus,  an
-	 * output is not generated on the BindingOperation.  This is because we
-	 * search for existing Elements only at the level of BindingOperations.
-	 * For example, if there is a corresponding BindingOperation with the same
-	 * name as our Operation, leave it alone.... but since there is already
-	 * a BindingOperation with the same name, we don't create a new BindingOperation.
-	 * 
-	 * The correct implementation is reduce this granularity to the MessageReference
-	 * level.  The code is almost there except for how we generate the Binding element
-	 * content.  Look at BindingGenrator.generateBindingOperation() and
-	 * SOAPContentGenerator.java and it's content generation method
-	 * for a good place to start.
-	 * 
-	 * For wtp RC1, We shall only look at the Operation level (as we do in the previous
-	 * version).
-	 */
-	public Binding generateBinding() {
-		try {
-		// If Binding is null (No Binding was passed into the constructor), we create an empty Binding first.
-		if (binding == null) {
-			binding = createEmptyBinding(getName());
-		}
-		if (getName() != null && !binding.getQName().getLocalPart().equals(getName())) {
-			binding.setQName(new QName(binding.getQName().getNamespaceURI(), getName()));
-		}
-		if (getRefName() != null) {
-			PortType portType = getPortType();
-			binding.setEPortType(portType);
-			if (portType == null) {
-				//The model doesn't reconile with it's Element properly when we're setting a null for it's PortType
-				binding.getElement().setAttribute("type", "");
-			}
-		}
-
-		List bindingOperations = binding.getEBindingOperations();		
-		PortType portType = binding.getEPortType();
-		
-		if (!getOverwrite()) {
-			// Don't Overwrite
-			if (portType == null) {
-				return binding;
-			}
-			else {
-				addRequiredNamespaces(binding);				
-				List operations = portType.getOperations();
-				
-				/*******************************************************************************
-				 * Determine which Operations require new a new corresponding BindingOperations
-				 *******************************************************************************/
-				List newBindingOpsNeeded = new ArrayList();
-				for (int index = 0; index < operations.size(); index++) {
-					Operation operation = (Operation) operations.get(index);
-					
-					boolean foundMatch = false;
-					Iterator bindingOperationsIt = bindingOperations.iterator();
-					while (bindingOperationsIt.hasNext()) {
-						BindingOperation bindingOperation = (BindingOperation) bindingOperationsIt.next();
-						
-						if (namesEqual(bindingOperation.getName(), operation.getName())) {
-							foundMatch = true;
-							break;
-						}
-					}
-					
-					if (!foundMatch){
-						newBindingOpsNeeded.add(operation);
-					}
-				}
-				// newBindingOpsNeeded is the List of Operations needing new corresponding
-				// BindingOperation's
-				List newBindingOps = createNewBindingOperations(newBindingOpsNeeded);
-				
-				// Generate the contents of the new BindingOperation's
-				Iterator newBindingOpsIt = newBindingOps.iterator();
-				while (newBindingOpsIt.hasNext()) {
-					BindingOperation newBindingOp = (BindingOperation) newBindingOpsIt.next();
-					generateBindingOperation(newBindingOp);
-					generateBindingOperationContent(newBindingOp);
-				}
-			}
-			
-			generateBindingContent(binding);	
-		}
-		else {
-			// Overwrite
-			if (portType == null) {
-				// We need to blow away everything under the Binding.  No PortType associated with this Binding
-				bindingOperations.clear();
-				return binding;
-			}
-			else {
-				addRequiredNamespaces(binding);				
-				List operations = portType.getOperations();
-				
-				/******************************************************
-				 * Compare the Operations
-				 ******************************************************/
-				// Remove any BindingOperations which are no longer used
-				for (int index = 0; index < bindingOperations.size(); index++) {
-					BindingOperation bindingOperation = (BindingOperation) bindingOperations.get(index);
-					
-					boolean foundMatch = false;
-					Iterator operationsIt = operations.iterator();
-					while (operationsIt.hasNext()) {
-						Operation operation = (Operation) operationsIt.next();
-						
-						if (namesEqual(bindingOperation.getName(), operation.getName())) {
-							foundMatch = true;
-							break;
-						}
-					}
-					
-					if (!foundMatch){
-						// We need to remove this BindingFault from the bindingFaults List
-						bindingOperations.remove(index);
-						index--;
-					}			
-				}
-				
-				// Remove any Operations which already exists in bindingOperations.  What we
-				// have left are the Operations which needs newly created BindingOperations
-				List bindingOperationsNeeded = new ArrayList();
-				for (int index = 0; index < operations.size(); index++) {
-					Operation operation = (Operation) operations.get(index);
-					
-					boolean foundMatch = false;
-					Iterator bindingOperationsIt = bindingOperations.iterator();
-					while (bindingOperationsIt.hasNext()) {
-						BindingOperation bindingOperation = (BindingOperation) bindingOperationsIt.next();
-						
-						if (namesEqual(bindingOperation.getName(), operation.getName())) {
-							foundMatch = true;
-							break;
-						}
-					}
-					
-					if (!foundMatch){
-						// We need to remove this BindingFault from the bindingFaults List
-						bindingOperationsNeeded.add(operation); // Store the actual Operation
-					}			
-				}		
-				
-				// Create required BindingOperations
-				createNewBindingOperations(bindingOperationsNeeded);
-
-				/******************************************************
-				 * Process the contents of the Operations
-				 ******************************************************/
-				Iterator bindingOperationsIt = binding.getEBindingOperations().iterator();
-				while (bindingOperationsIt.hasNext()) {
-					generateBindingOperation((BindingOperation) bindingOperationsIt.next());
-				}
-				
-				generateBindingContent(binding);
-				
-				return binding;
-			}			
-		}
-		}
-		catch (Exception e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-	
-	private List createNewBindingOperations(List operations) {
-		List newBindingOps = new ArrayList();
-		
-		Iterator neededBindingOperationsIt = operations.iterator();
-		while (neededBindingOperationsIt.hasNext()) {
-			Operation operation = (Operation) neededBindingOperationsIt.next();
-			BindingOperation newBindingOperation = factory.createBindingOperation();
-			newBindingOperation.setEOperation(operation);
-			newBindingOperation.setName(operation.getName());
-			binding.addBindingOperation(newBindingOperation);
-			
-			newBindingOps.add(newBindingOperation);
-		}
-		
-		return newBindingOps;
-	}
-	
-	private void generateBindingOperation(BindingOperation bindingOperation) {
-		BindingInput bindingInput = bindingOperation.getEBindingInput();
-		BindingOutput bindingOutput = bindingOperation.getEBindingOutput();
-		List bindingFaults = bindingOperation.getEBindingFaults();
-		
-		Operation operation = bindingOperation.getEOperation();
-		Input input = operation.getEInput();
-		Output output = operation.getEOutput();
-		List faults = operation.getEFaults();
-
-		/******************************************************
-		 * Compare the Operation names
-		 ******************************************************/		
-		if (!namesEqual(bindingOperation.getName(), operation.getName())) {
-			bindingOperation.setName(operation.getName());
-		}
-		
-		
-		/******************************************************
-		 * Compare the Output
-		 ******************************************************/
-		if (output == null) {
-			bindingOperation.setBindingOutput(null);			
-		}
-		else {
-			// Create BindingOutput if necessary
-			if (bindingOutput == null) {
-				BindingOutput newBindingOutput = factory.createBindingOutput();
-				newBindingOutput.setEOutput(output);
-				newBindingOutput.setName(output.getName());
-				bindingOperation.setBindingOutput(newBindingOutput);				
-			}
-			else {
-				// Compare the Output names
-				if (!namesEqual(bindingOutput.getName(), output.getName())) {
-					bindingOutput.setName(output.getName());
-				}				
-			}
-		}
-		generateBindingOutputContent(bindingOperation.getEBindingOutput());
-		
-		/******************************************************
-		 * Compare the Input
-		 ******************************************************/
-		if (input == null) {
-			bindingOperation.setBindingInput(null);			
-		}
-		else {
-			// Create BindingInput if necessary
-			if (bindingInput == null) {
-				BindingInput newBindingInput = factory.createBindingInput();
-				newBindingInput.setEInput(input);
-				newBindingInput.setName(input.getName());
-				bindingOperation.setBindingInput(newBindingInput);
-			}
-			else {
-				// Compare the Input names
-				if (!namesEqual(bindingInput.getName(), input.getName())) {
-					bindingInput.setName(input.getName());
-				}
-			}
-		}
-		generateBindingInputContent(bindingOperation.getEBindingInput());
-		
-		
-		/******************************************************
-		 * Compare the Faults
-		 ******************************************************/
-		// Remove any BindingFaults which are no longer used
-		for (int index = 0; index < bindingFaults.size(); index++) {
-			BindingFault bindingFault = (BindingFault) bindingFaults.get(index);
-			
-			boolean foundMatch = false;
-			Iterator faultsIt = faults.iterator();
-			while (faultsIt.hasNext()) {
-				Fault fault = (Fault) faultsIt.next();
-				if (namesEqual(bindingFault.getName(), fault.getName())) {
-					foundMatch = true;
-					break;
-				}
-			}
-			
-			if (!foundMatch){
-				// We need to remove this BindingFault from the bindingFaults List
-				bindingFaults.remove(index);
-				index--;
-			}			
-		}
-		
-		// Remove any Faults which already exists in bindingFaults.  What we
-		// have left are the Faults which needs newly created BindingFaults
-		List bindingFaultsNeeded = new ArrayList();
-		for (int index = 0; index < faults.size(); index++) {
-			Fault fault = (Fault) faults.get(index);
-			
-			boolean foundMatch = false;
-			Iterator bindingFaultsIt = bindingFaults.iterator();
-			while (bindingFaultsIt.hasNext()) {
-				BindingFault bindingFault = (BindingFault) bindingFaultsIt.next();
-				if (namesEqual(bindingFault.getName(), fault.getName())) {
-					foundMatch = true;
-					break;
-				}
-			}
-			
-			if (!foundMatch){
-				// We need to remove this BindingFault from the bindingFaults List
-				bindingFaultsNeeded.add(fault);
-			}			
-		}		
-		
-		// bindingFaultsNeeded contains the needed BindingFault's we need to create
-		Iterator neededBindingFaultsIt = bindingFaultsNeeded.iterator();
-		while (neededBindingFaultsIt.hasNext()) {
-			Fault fault = (Fault) neededBindingFaultsIt.next();
-			BindingFault newBindingFault = factory.createBindingFault();
-			newBindingFault.setEFault(fault);
-			newBindingFault.setName(fault.getName());
-			bindingOperation.addBindingFault(newBindingFault);
-		}
-		
-		// Create the contents for each BindingFault
-		Iterator faultContentIt = bindingOperation.getEBindingFaults().iterator();
-		while (faultContentIt.hasNext()) {
-			BindingFault bindingFault = (BindingFault) faultContentIt.next();
-			generateBindingFaultContent(bindingFault);
-		}
-		
-		generateBindingOperationContent(bindingOperation);
-	}
-	
-	private boolean namesEqual(String name1, String name2) {
-		boolean match = false;
-		
-		if (name1 != null ^ name2 != null) {
-			// one is null
-			match = false;
-		}
-		else if (name1 != null && name2 != null) {
-			// neither is null
-			match = name1.equals(name2);
-		}
-		else {
-			// both are null
-			match = true;
-		}		
-		
-		return match;
-	}
-
-	protected void generateBindingContent(Binding binding) {
-		if (contentGenerator != null) {
-			if (getOverwrite() || binding.getEExtensibilityElements().size() == 0) {
-				contentGenerator.generateBindingContent(binding, (PortType) binding.getEPortType());
-			}
-		}
-		else {
-			removeExtensibilityElements(binding);
-		}
-	}
-
-	protected void generateBindingOperationContent(BindingOperation bindingOperation) {
-		if (bindingOperation != null && contentGenerator != null) {
-			contentGenerator.generateBindingOperationContent(bindingOperation, bindingOperation.getEOperation());
-		}
-		else {
-			removeExtensibilityElements(bindingOperation);
-		}
-	}
-	
-	protected void generateBindingInputContent(BindingInput bindingInput) {
-		if (bindingInput != null && contentGenerator != null) {
-			contentGenerator.generateBindingInputContent(bindingInput, bindingInput.getEInput());
-		}
-		else {
-			removeExtensibilityElements(bindingInput);
-		}
-	}
-	
-	protected void generateBindingOutputContent(BindingOutput bindingOutput) {
-		if (bindingOutput != null && contentGenerator != null) {
-			contentGenerator.generateBindingOutputContent(bindingOutput, bindingOutput.getEOutput());
-		}
-		else {
-			removeExtensibilityElements(bindingOutput);
-		}
-	}
-
-	protected void generateBindingFaultContent(BindingFault bindingFault) {
-		if (bindingFault != null && contentGenerator != null) {
-			contentGenerator.generateBindingFaultContent(bindingFault, bindingFault.getEFault());
-		}
-		else {
-			removeExtensibilityElements(bindingFault);
-		}
-	}
-	
-	private void removeExtensibilityElements(ExtensibleElement ee) {
-		if (ee != null) {
-			ee.getEExtensibilityElements().clear();
-		}
-	}
-	
-	/*
-	 * Generate Port Content for all Ports with a reference to the Binding
-	 * which was passed in through the constructor (or a reference to the
-	 * newly created Binding).
-	 */
-	public void generatePortContent() {
-		if (binding != null && contentGenerator != null) {
-			List portsToUpdate = new ArrayList();
-			
-			Iterator servicesIt = binding.getEnclosingDefinition().getEServices().iterator();
-			while (servicesIt.hasNext()) {
-				Service service = (Service) servicesIt.next();
-				Iterator portsIt = service.getEPorts().iterator();
-				while (portsIt.hasNext()) {
-					Port port = (Port) portsIt.next();
-					if (binding.equals(port.getEBinding())) {
-						// Found a match
-						portsToUpdate.add(port);
-					}
-				}
-			}
-			
-			Iterator portsToUpdateIt = portsToUpdate.iterator();
-			while (portsToUpdateIt.hasNext()) {
-				contentGenerator.generatePortContent((Port) portsToUpdateIt.next());
-			}
-		}	
-	}
-	
-	/*
-	 * methods addRequiredNamespaces() and computeUniquePrefix() are used to add necessary
-	 * namespaces 
-	 * 
-	 * TODO:
-	 * Does this belong here?  This is copied from wsdl.ui.  Can we sync up in some way?
-	 */
-	protected void addRequiredNamespaces(Binding binding) {
-		if (contentGenerator != null) {
-			String[] namespaceNames = contentGenerator.getRequiredNamespaces();
-			String[] preferredPrefixes = new String[namespaceNames.length];
-			for (int index = 0; index < namespaceNames.length; index++) {
-				preferredPrefixes[index] = contentGenerator.getPreferredNamespacePrefix(namespaceNames[index]);				
-			}
-	
-			Map map = binding.getEnclosingDefinition().getNamespaces();
-			
-		      for (int i = 0; i < namespaceNames.length; i++) {
-		        String namespace = namespaceNames[i];
-		        if (!map.containsValue(namespace)) {
-		          String prefix = (i < preferredPrefixes.length) ? preferredPrefixes[i] : "p0";
-		          if (map.containsKey(prefix)) {
-		            prefix = computeUniquePrefix("p", map);
-		          }
-				  binding.getEnclosingDefinition().addNamespace(prefix, namespace);
-		        }
-		      }
-		}
-	}
-	
-	private String computeUniquePrefix(String base, Map table){
-	    int i = 0;
-	    String prefix = base;
-	    while (true) {
-	      if (!table.containsKey(prefix)) {
-	        break;
-	      }
-	      else {
-	        prefix = base + i;
-	        i++;
-	      }
-	    }
-	    return prefix;
-	}
-	
-	private PortType getPortType() {
-		if (getRefName().equals("")) {
-			// Means we should set the PortType to Unspecified
-			return null;
-		}
-		
-		if (getRefName() != null) {
-			Iterator portTypeIt = definition.getEPortTypes().iterator();			
-
-			while (portTypeIt.hasNext()) {
-				PortType pt = (PortType) portTypeIt.next();
-				List prefixedNames = getPrefixedNames(pt);
-				if (prefixedNames.contains(getRefName())) {
-					return pt;
-				}
-			}
-		}
-		
-		return binding.getEPortType();
-	}
-	
-	private List getPrefixedNames(PortType portType) {
-		List prefixedNames = new ArrayList();
-		String currentPortTypeName = portType.getQName().getLocalPart();
-		String currentNamespace = portType.getQName().getNamespaceURI();
-
-		Map namespaceMap = definition.getNamespaces();
-		Iterator keys = namespaceMap.keySet().iterator();
-		while (keys.hasNext()) {
-			Object key = keys.next();
-			Object value = namespaceMap.get(key);
-
-			if (currentNamespace.equals(value)) {
-				// Found a match.  Add to our list
-				prefixedNames.add(key + ":" + currentPortTypeName);
-			}
-		}
-		
-		return prefixedNames;
-		
-	}
-}
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/ContentGenerator.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/ContentGenerator.java
deleted file mode 100644
index 2fc848b61..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/ContentGenerator.java
+++ /dev/null
@@ -1,42 +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 Common Public License v1.0
- * which accompanies this distribution, 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.generator;
-
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-
-public interface ContentGenerator
-{	
-  public static String ADDRESS_LOCATION = "http://www.example.org/"; 
-
-  public String[] getRequiredNamespaces();
-  public String getPreferredNamespacePrefix(String namespace);
-
-  // generates the 'address' extensiblity element for a port
-  public void generatePortContent(Port port);
- 
-  public void generateBindingContent(Binding binding, PortType portType);
-  public void generateBindingOperationContent(BindingOperation bindingOperation, Operation operation); 
-  public void generateBindingInputContent(BindingInput bindingInput, Input input);    
-  public void generateBindingOutputContent(BindingOutput bindingOutput, Output output);
-  public void generateBindingFaultContent(BindingFault bindingFault, Fault fault);
-  
-  public String getProtocol();
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/PortGenerator.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/PortGenerator.java
deleted file mode 100644
index c16557bd8..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/PortGenerator.java
+++ /dev/null
@@ -1,179 +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 Common Public License v1.0
- * which accompanies this distribution, 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.generator;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.WSDLFactory;
-
-public class PortGenerator extends BaseGenerator {
-	private Service service;
-	
-    /**
-     * Constructs a port generator given the target service.
-     * @param service the target Service, must not be null.
-     */
-	public PortGenerator(Service service) {
-		this.service = service;
-		definition = service.getEnclosingDefinition();
-	}
-	
-    /**
-     * Generates a service port given it's name and binding name.
-     * The port is then added to the service passed in the constructor.
-     * @return the Port instance
-     */
-	public Port generatePort() {
-	  String portName = getName();
-	  String bindingName = getRefName();		
-	  
-	  Binding binding = getBinding(bindingName);
-	  
-	  Port port = WSDLFactory.eINSTANCE.createPort();
-	  port.setName(portName);
-	  port.setEnclosingDefinition(definition);
-	  port.setBinding(binding);
-	  
-	  service.addPort(port);
-	  
-	  ContentGenerator contentGenerator = getContentGenerator(); 
-	  
-	  if (contentGenerator != null) {
-	    contentGenerator.generatePortContent(port);
-	  }
-	  
-	  return port;
-	}
-	
-	/**
-	 * Locates a binding given its prefixed name (someNSPrefix:someBindingName).
-	 * 
-	 * @param bindingName the qname of the desired binding.
-	 * @return a Binding with the given name, or null if one is not found.
-	 */
-	private Binding getBinding(String bindingName) {
-      List allBindings = getAllBindings();
-      Iterator bindingIterator = allBindings.iterator();
-	  
-	  while (bindingIterator.hasNext()) {
-	    Binding binding = (Binding)bindingIterator.next();
-	    
-	    List prefixedNames = getPrefixedNames(binding);
-	    
-	    if (prefixedNames.contains(bindingName)) {
-	      return binding;
-	    }
-	  }
-	  
-	  return null;
-	}
-	
-	/**
-	 * Locates all the bindings available in this definition and all its
-	 * imported definitions.
-	 * 
-	 * @return a List with all available bindings.
-	 */
-	public List getAllBindings() {
-	  List allBindings = new ArrayList();
-	  List allDefinitions = getAllDefinitions();
-	  
-	  Iterator defsIterator = allDefinitions.iterator();
-	  
-	  while (defsIterator.hasNext()) {
-	    Definition definition = (Definition) defsIterator.next();
-	    Map bindings = definition.getBindings();
-	    
-	    // ISSUE A possible problem here if somehow a binding is duplicated in one of the imports?
-	    // In that case we should iterate over and check them one by one.
-	    
-	    allBindings.addAll(bindings.values());
-	  }
-	  
-	  return allBindings;
-	}
-	
-	/**
-	 * Attempts to locate and add to the list all the definitions imported by the
-	 * definition passed in. Recursively tries to locate all definitions.
-	 * 
-	 * @param definition the start Definition. Must not be null.
-	 * @param list used to collect all the imported definitions. Must not be null.
-	 */
-	private void addDefinition(Definition definition, List list) {
-	  list.add(definition);
-	  List imports = definition.getEImports();
-	  Iterator importsIterator = imports.iterator();
-	  
-	  while (importsIterator.hasNext()) {
-	    Import theImport = (Import)importsIterator.next();
-	    
-	    String importLocationURI = theImport.getLocationURI();
-	    if (importLocationURI != null && 
-	        // ISSUE This assumption seems a bit weak.
-            importLocationURI.endsWith("wsdl")) {
-	      Definition importedDefinition = theImport.getEDefinition();
-	      
-	      if (importedDefinition != null && 
-              !list.contains(importedDefinition)) {
-	        // Recursively try to locate all definitions.
-
-            addDefinition(importedDefinition, list);
-	      }
-	    }
-	  }
-	}
-	
-	/**
-	 * Attempts to locate all definitions imported by the current definition and
-     * all their imports in turn. 
-	 * 
-	 * @return a List with all definitions imported by the current definition.
-	 */
-	private List getAllDefinitions()
-	{
-	  List list = new ArrayList();
-	  addDefinition(definition, list);
-	  return list;
-	}
-	
-	private List getPrefixedNames(Binding binding) {
-		List prefixedNames = new ArrayList();
-		String currentBindingName = binding.getQName().getLocalPart();
-		String currentNamespace = binding.getQName().getNamespaceURI();
-
-		Map namespaceMap = definition.getNamespaces();
-		Iterator keys = namespaceMap.keySet().iterator();
-		while (keys.hasNext()) {
-			Object key = keys.next();
-			Object value = namespaceMap.get(key);
-			
-			if (currentNamespace.equals(value)) {
-				// Found a match.  Add to our list
-				prefixedNames.add(key + ":" + currentBindingName); //$NON-NLS-1$
-			}
-		}
-		
-		return prefixedNames;
-	}
-	
-	public Service getService() {
-		return service;
-	}
-}
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/extension/ContentGeneratorExtensionDescriptor.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/extension/ContentGeneratorExtensionDescriptor.java
deleted file mode 100644
index c49e99c2e..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/extension/ContentGeneratorExtensionDescriptor.java
+++ /dev/null
@@ -1,52 +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 Common Public License v1.0
- * which accompanies this distribution, 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.generator.extension;
-
-import org.eclipse.wst.wsdl.internal.generator.ContentGenerator;
-
-/*
- * Class which acts as a container to hold information about the extension.
- */
-public class ContentGeneratorExtensionDescriptor {
-	protected ClassLoader classLoader;
-	protected ContentGenerator contentGenerator;
-	protected String namespace;
-	protected String name;
-	protected String className;
-	
-	public ContentGeneratorExtensionDescriptor(ClassLoader classLoader, String classString, String namespace, String name) {
-		this.classLoader = classLoader;
-		this.namespace = namespace;
-		this.name = name;
-		this.className = classString;
-	}
-	
-	
-	public Object getContentGenerator() {
-		try {
-	        Class theClass = classLoader != null ? classLoader.loadClass(className) : Class.forName(className);
-	        contentGenerator = (ContentGenerator) theClass.newInstance();
-	      }
-	      catch (Exception e) {
-	        e.printStackTrace();
-	      }
-		
-		return contentGenerator;
-	}
-	
-	public String getNamespace() {
-		return namespace;
-	}
-	
-	public String getName() {
-		return name;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/extension/ContentGeneratorExtensionFactoryRegistry.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/extension/ContentGeneratorExtensionFactoryRegistry.java
deleted file mode 100644
index dbd9f96f5..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/extension/ContentGeneratorExtensionFactoryRegistry.java
+++ /dev/null
@@ -1,168 +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 Common Public License v1.0
- * which accompanies this distribution, 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.generator.extension;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.wst.wsdl.internal.generator.ContentGenerator;
-
-
-
-public class ContentGeneratorExtensionFactoryRegistry {
-	protected Map map;
-	protected static ContentGeneratorExtensionFactoryRegistry instance;
-	
-	public static ContentGeneratorExtensionFactoryRegistry getInstance() {
-		if (instance == null) {
-			instance = new ContentGeneratorExtensionFactoryRegistry();
-			
-			// TODO... don't read the registry until an 'get'occurs
-			//
-			ContentGeneratorExtensionRegistryReader reader = new ContentGeneratorExtensionRegistryReader(instance); 
-			reader.readRegistry();
-		}
-		
-		return instance;
-	}
-	
-	protected ContentGeneratorExtensionFactoryRegistry() {
-		map = new HashMap();
-	}
-	
-	public void put(String namespace, String name, ContentGeneratorExtensionDescriptor descriptor) {
-		// Check if this namespace/name key is already in the Map
-		List foundKey = findExistingKey(namespace, name);
-		
-		// Did we find an existing key with the same namespace/key pairing?
-		if (foundKey != null) {
-			// Simply add the descriptor to the list of descriptors associated
-			// with this namespace/name key
-			List descriptorList = (List) map.get(foundKey);
-			descriptorList.add(descriptor);
-		}
-		else {
-			// We need to create a new entry in the Map for this namespace/name key
-			List newKey = new ArrayList(2);
-			newKey.add(namespace);
-			newKey.add(name);
-			
-			List newDescriptorList = new ArrayList();
-			newDescriptorList.add(descriptor);
-			
-			map.put(newKey, newDescriptorList);
-		}		
-	}
-	
-	/*
-	 * Returns the 'name' attribute for this extension.
-	 */
-	public List getBindingExtensionNames() {
-		List list = new ArrayList();
-		
-		Iterator keyIt = map.keySet().iterator();
-		List key = null;
-		while (keyIt.hasNext()) {
-			key = (List) keyIt.next();
-			list.add(key.get(1));
-		}
-		
-		return list;
-	}
-	
-	/*
-	 * Return the class specified for this extension based on the namespace
-	 * attribute.
-	 */
-	public ContentGenerator getGeneratorClassFromNamespace(String namespace) {
-		ContentGenerator generatorClass = null;
-		List key = findExistingKeyFromNamespace(namespace);
-		
-		if (key != null) {
-			List descriptors = (List) map.get(key);
-			
-			// Grab the first descriptor available
-			if (descriptors.size() > 0) {
-				ContentGeneratorExtensionDescriptor extensionDescriptor = (ContentGeneratorExtensionDescriptor) descriptors.get(0);
-				generatorClass = (ContentGenerator) extensionDescriptor.getContentGenerator();
-			}
-		}
-		
-		return generatorClass;
-	}
-
-	/*
-	 * Return the class specified for this extension based on the name
-	 * attribute.
-	 */
-	public ContentGenerator getGeneratorClassFromName(String name) {
-		ContentGenerator generatorClass = null;
-		List key = findExistingKeyFromName(name);
-		
-		if (key != null) {
-			List descriptors = (List) map.get(key);
-			
-			// Grab the first descriptor available
-			if (descriptors.size() > 0) {
-				ContentGeneratorExtensionDescriptor extensionDescriptor = (ContentGeneratorExtensionDescriptor) descriptors.get(0);
-				generatorClass = (ContentGenerator) extensionDescriptor.getContentGenerator();
-			}
-		}
-		
-		return generatorClass;
-	}
-	
-	// TODO: We need to common the following three methods up.......
-	private List findExistingKeyFromNamespace(String namespace) {
-		Iterator keyIt = map.keySet().iterator();
-		List foundKey = null;
-		while (keyIt.hasNext()) {
-			foundKey = (List) keyIt.next();
-			if (namespace.equals(foundKey.get(0))) {
-				break;
-			}
-			foundKey = null;
-		}
-
-		return foundKey;
-	}
-	
-	private List findExistingKeyFromName(String name) {
-		Iterator keyIt = map.keySet().iterator();
-		List foundKey = null;
-		while (keyIt.hasNext()) {
-			foundKey = (List) keyIt.next();
-			if (name.equals(foundKey.get(1))) {
-				break;
-			}
-			foundKey = null;
-		}
-
-		return foundKey;
-	}
-	
-	private List findExistingKey(String namespace, String name) {
-		Iterator keyIt = map.keySet().iterator();
-		List foundKey = null;
-		while (keyIt.hasNext()) {
-			foundKey = (List) keyIt.next();
-			if (namespace.equals(foundKey.get(0)) && name.equals(foundKey.get(1))) {
-				break;
-			}
-			foundKey = null;
-		}
-
-		return foundKey;
-	}
-}
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/extension/ContentGeneratorExtensionRegistryReader.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/extension/ContentGeneratorExtensionRegistryReader.java
deleted file mode 100644
index 57075b682..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/extension/ContentGeneratorExtensionRegistryReader.java
+++ /dev/null
@@ -1,73 +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 Common Public License v1.0
- * which accompanies this distribution, 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.generator.extension;
-
-import java.net.URL;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IPluginRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.wsdl.WSDLPlugin;
-
-public class ContentGeneratorExtensionRegistryReader {
-	  protected static final String PLUGIN_ID = WSDLPlugin.getPlugin().getDescriptor().getUniqueIdentifier();
-	  protected static final String EXTENSION_POINT_ID = "contentGenerators";
-	  protected static final String ELEMENT_NAME = "contentGenerator";
-	  protected static final String ATT_NAMESPACE = "namespace";
-	  protected static final String ATT_NAME = "name";
-	  protected static final String ATT_CLASS = "class";
-	  protected ContentGeneratorExtensionFactoryRegistry contentGeneratorExtensionFactoryRegistry;
-
-	  public ContentGeneratorExtensionRegistryReader(ContentGeneratorExtensionFactoryRegistry generatorExtensionFactoryRegistry) {
-	    this.contentGeneratorExtensionFactoryRegistry = generatorExtensionFactoryRegistry;
-	  }
-	
-	
-	  /**
-	   * read from plugin registry and parse it.
-	   */
-	  public void readRegistry() {
-	    IPluginRegistry pluginRegistry = Platform.getPluginRegistry();
-	    IExtensionPoint point = pluginRegistry.getExtensionPoint(PLUGIN_ID, EXTENSION_POINT_ID);
-	    if (point != null) {
-	      IConfigurationElement[] elements = point.getConfigurationElements();
-	      for (int i = 0; i < elements.length; i++) {
-	        readElement(elements[i]);
-	      }
-	    }
-	  }
-
-	  public String resolve(URL platformURL, String relativePath) throws Exception {
-	    URL resolvedURL = Platform.resolve(platformURL);
-	    return resolvedURL.toString() + relativePath;
-	  }
-
-	  protected void readElement(IConfigurationElement element) {
-	    if (element.getName().equals(ELEMENT_NAME)) {
-	      try {
-	        IConfigurationElement childElement = (IConfigurationElement) element;
-			String name = childElement.getAttribute(ATT_NAME);
-	        String namespace = childElement.getAttribute(ATT_NAMESPACE);
-			
-	        if (namespace != null) {
-	          ClassLoader pluginClasssLoader = element.getDeclaringExtension().getDeclaringPluginDescriptor().getPluginClassLoader();
-	          String className = childElement.getAttribute(ATT_CLASS);
-	          ContentGeneratorExtensionDescriptor descriptor = new ContentGeneratorExtensionDescriptor(pluginClasssLoader, className, namespace, name);
-	          contentGeneratorExtensionFactoryRegistry.put(namespace, name, descriptor);
-	        }
-	      }
-	      catch (Exception e) {
-			  e.printStackTrace();
-	      }
-	    }
-	  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingFaultImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingFaultImpl.java
deleted file mode 100644
index ce72c476e..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingFaultImpl.java
+++ /dev/null
@@ -1,419 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Binding Fault</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.impl.BindingFaultImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.BindingFaultImpl#getEFault <em>EFault</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class BindingFaultImpl extends ExtensibleElementImpl implements BindingFault
-{
-  /**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected static final String NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected String name = NAME_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getEFault() <em>EFault</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEFault()
-   * @generated
-   * @ordered
-   */
-  protected Fault eFault = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected BindingFaultImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return WSDLPackage.eINSTANCE.getBindingFault();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getName()
-  {
-    return name;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setName(String newName)
-  {
-    String oldName = name;
-    name = newName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.BINDING_FAULT__NAME, oldName, name));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Fault getEFault()
-  {
-    if (eFault != null && eFault.eIsProxy())
-    {
-      Fault oldEFault = eFault;
-      eFault = (Fault)eResolveProxy((InternalEObject)eFault);
-      if (eFault != oldEFault)
-      {
-        if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, WSDLPackage.BINDING_FAULT__EFAULT, oldEFault, eFault));
-      }
-    }
-    return eFault;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Fault basicGetEFault()
-  {
-    return eFault;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setEFault(Fault newEFault)
-  {
-    Fault oldEFault = eFault;
-    eFault = newEFault;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.BINDING_FAULT__EFAULT, oldEFault, eFault));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Fault getFault()
-  {
-    return getEFault();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setFault(javax.wsdl.Fault fault)
-  {
-    setEFault((Fault) fault);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs)
-  {
-    if (featureID >= 0)
-    {
-      switch (eDerivedStructuralFeatureID(featureID, baseClass))
-      {
-        case WSDLPackage.BINDING_FAULT__EEXTENSIBILITY_ELEMENTS:
-          return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-        default:
-          return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-      }
-    }
-    return eBasicSetContainer(null, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.BINDING_FAULT__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case WSDLPackage.BINDING_FAULT__ELEMENT:
-        return getElement();
-      case WSDLPackage.BINDING_FAULT__EEXTENSIBILITY_ELEMENTS:
-        return getEExtensibilityElements();
-      case WSDLPackage.BINDING_FAULT__NAME:
-        return getName();
-      case WSDLPackage.BINDING_FAULT__EFAULT:
-        if (resolve) return getEFault();
-        return basicGetEFault();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.BINDING_FAULT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case WSDLPackage.BINDING_FAULT__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case WSDLPackage.BINDING_FAULT__EEXTENSIBILITY_ELEMENTS:
-        getEExtensibilityElements().clear();
-        getEExtensibilityElements().addAll((Collection)newValue);
-        return;
-      case WSDLPackage.BINDING_FAULT__NAME:
-        setName((String)newValue);
-        return;
-      case WSDLPackage.BINDING_FAULT__EFAULT:
-        setEFault((Fault)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.BINDING_FAULT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.BINDING_FAULT__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.BINDING_FAULT__EEXTENSIBILITY_ELEMENTS:
-        getEExtensibilityElements().clear();
-        return;
-      case WSDLPackage.BINDING_FAULT__NAME:
-        setName(NAME_EDEFAULT);
-        return;
-      case WSDLPackage.BINDING_FAULT__EFAULT:
-        setEFault((Fault)null);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.BINDING_FAULT__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case WSDLPackage.BINDING_FAULT__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case WSDLPackage.BINDING_FAULT__EEXTENSIBILITY_ELEMENTS:
-        return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-      case WSDLPackage.BINDING_FAULT__NAME:
-        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-      case WSDLPackage.BINDING_FAULT__EFAULT:
-        return eFault != null;
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (name: ");
-    result.append(name);
-    result.append(')');
-    return result.toString();
-  }
-
-  //
-  // Reconcile methods
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-    String name = changedElement.getAttribute("name");
-    if (name != null)
-    {
-      setName(name);
-    }
-  }
-
-  public void handleUnreconciledElement(Element child, Collection remainingModelObjects)
-  {
-    super.handleUnreconciledElement(child,remainingModelObjects);
-  }
-
-  protected void handleReconciliation(Collection remainingModelObjects)
-  {
-    for (Iterator i = remainingModelObjects.iterator(); i.hasNext();)
-    {
-      getEExtensibilityElements().remove(i.next());
-    }
-  }
-
-  public Collection getModelObjects(Object component)
-  {
-    BindingFault bindingFault = (BindingFault) component;
-    List list = new ArrayList();
-    list.addAll(bindingFault.getEExtensibilityElements());
-    return list;
-  }
-
-  //
-  // For reconciliation: Model -> DOM
-  //
-
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeAttribute(eAttribute);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eAttribute == null || eAttribute == WSDLPackage.eINSTANCE.getBindingFault_Name())
-        niceSetAttribute(theElement, WSDLConstants.NAME_ATTRIBUTE, getName());
-    }
-  }
-
-  public Element createElement()
-  {
-    Element newElement = createElement(WSDLConstants.FAULT);
-    setElement(newElement);
-
-    Iterator iterator = getExtensibilityElements().iterator();
-    while (iterator.hasNext())
-    {
-      ExtensibilityElement extensibilityElement = (ExtensibilityElement) iterator.next();
-      Element child = ((ExtensibilityElementImpl) extensibilityElement).createElement();
-      newElement.appendChild(child);
-    }
-
-    return newElement;
-  }
-  
-  // Resolve the reference to Fault
-  public void reconcileReferences(boolean deep)
-  {
-    if (element != null)
-    {
-      BindingOperation bop = (BindingOperation)getContainer();
-      Operation op = bop.getEOperation();
-      if (op != null)
-      {
-      	// TBD - Revisit API. Get the first Fault.
-        setFault((Fault)op.getEFaults().get(0));
-      }
-    }
-    super.reconcileReferences(deep);
-  }
-} //BindingFaultImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingImpl.java
deleted file mode 100644
index 1b46347b4..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingImpl.java
+++ /dev/null
@@ -1,786 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.internal.util.WSDLUtil;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Binding</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.impl.BindingImpl#getQName <em>QName</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.BindingImpl#isUndefined <em>Undefined</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.BindingImpl#isProxy <em>Proxy</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.BindingImpl#getResourceURI <em>Resource URI</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.BindingImpl#getEPortType <em>EPort Type</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.BindingImpl#getEBindingOperations <em>EBinding Operations</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class BindingImpl extends ExtensibleElementImpl implements Binding
-{
-  /**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * The default value of the '{@link #getQName() <em>QName</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getQName()
-   * @generated
-   * @ordered
-   */
-  protected static final QName QNAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getQName() <em>QName</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getQName()
-   * @generated
-   * @ordered
-   */
-  protected QName qName = QNAME_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #isUndefined() <em>Undefined</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isUndefined()
-   * @generated
-   * @ordered
-   */
-  protected static final boolean UNDEFINED_EDEFAULT = false;
-
-  /**
-   * The cached value of the '{@link #isUndefined() <em>Undefined</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isUndefined()
-   * @generated
-   * @ordered
-   */
-  protected boolean undefined = UNDEFINED_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #isProxy() <em>Proxy</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isProxy()
-   * @generated
-   * @ordered
-   */
-  protected static final boolean PROXY_EDEFAULT = false;
-
-  /**
-   * The cached value of the '{@link #isProxy() <em>Proxy</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isProxy()
-   * @generated
-   * @ordered
-   */
-  protected boolean proxy = PROXY_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getResourceURI() <em>Resource URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getResourceURI()
-   * @generated
-   * @ordered
-   */
-  protected static final String RESOURCE_URI_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getResourceURI() <em>Resource URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getResourceURI()
-   * @generated
-   * @ordered
-   */
-  protected String resourceURI = RESOURCE_URI_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getEPortType() <em>EPort Type</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEPortType()
-   * @generated
-   * @ordered
-   */
-  protected PortType ePortType = null;
-
-  /**
-   * The cached value of the '{@link #getEBindingOperations() <em>EBinding Operations</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEBindingOperations()
-   * @generated
-   * @ordered
-   */
-  protected EList eBindingOperations = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected BindingImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return WSDLPackage.eINSTANCE.getBinding();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public QName getQName()
-  {
-    return qName;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setQName(QName newQName)
-  {
-    QName oldQName = qName;
-    qName = newQName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.BINDING__QNAME, oldQName, qName));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isUndefined()
-  {
-    return undefined;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setUndefined(boolean newUndefined)
-  {
-    boolean oldUndefined = undefined;
-    undefined = newUndefined;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.BINDING__UNDEFINED, oldUndefined, undefined));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isProxy()
-  {
-    return proxy;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setProxy(boolean newProxy)
-  {
-    boolean oldProxy = proxy;
-    proxy = newProxy;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.BINDING__PROXY, oldProxy, proxy));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getResourceURI()
-  {
-    return resourceURI;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setResourceURI(String newResourceURI)
-  {
-    String oldResourceURI = resourceURI;
-    resourceURI = newResourceURI;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.BINDING__RESOURCE_URI, oldResourceURI, resourceURI));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public PortType getEPortType()
-  {
-    if (ePortType != null && ePortType.eIsProxy())
-    {
-      PortType oldEPortType = ePortType;
-      ePortType = (PortType)eResolveProxy((InternalEObject)ePortType);
-      if (ePortType != oldEPortType)
-      {
-        if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, WSDLPackage.BINDING__EPORT_TYPE, oldEPortType, ePortType));
-      }
-    }
-    return ePortType;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public PortType basicGetEPortType()
-  {
-    return ePortType;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setEPortType(PortType newEPortType)
-  {
-    PortType oldEPortType = ePortType;
-    ePortType = newEPortType;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.BINDING__EPORT_TYPE, oldEPortType, ePortType));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList getEBindingOperations()
-  {
-    if (eBindingOperations == null)
-    {
-      eBindingOperations = new EObjectContainmentEList(BindingOperation.class, this, WSDLPackage.BINDING__EBINDING_OPERATIONS);
-    }
-    return eBindingOperations;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Add an operation binding to binding.
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void addBindingOperation(javax.wsdl.BindingOperation bindingOperation)
-  {
-    getBindingOperations().add(bindingOperation);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Get the specified operation binding. Note that operation names can
-   * be overloaded within a PortType. In case of overloading, the
-   * names of the input and output messages can be used to further
-   * refine the search.
-   * @param name the name of the desired operation binding.
-   * @param inputName the name of the input message; if this is null
-   * it will be ignored.
-   * @param outputName the name of the output message; if this is null
-   * it will be ignored.
-   * @return the corresponding operation binding, or null if there wasn't
-   * any matching operation binding
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.BindingOperation getBindingOperation(String name, String inputName, String outputName)
-  {
-    Iterator opBindingIterator = getBindingOperations().iterator();
-    while (opBindingIterator.hasNext())
-    {
-      javax.wsdl.BindingOperation op = (javax.wsdl.BindingOperation) opBindingIterator.next();
-      if (op == null)
-        continue;
-
-      String opName = op.getName();
-      if (name != null && opName != null)
-      {
-        if (!name.equals(opName))
-          op = null;
-      }
-      else if (name != null || opName != null)
-      {
-        op = null;
-      }
-
-      if (op != null && inputName != null)
-      {
-        javax.wsdl.BindingInput input = op.getBindingInput();
-        if (input != null)
-        {
-          String opInputName = input.getName();
-          if (opInputName == null || !opInputName.equals(inputName))
-            op = null;
-        }
-        else
-          op = null;
-      }
-
-      if (op != null && outputName != null)
-      {
-        javax.wsdl.BindingOutput output = op.getBindingOutput();
-        if (output != null)
-        {
-          String opOutputName = output.getName();
-          if (opOutputName == null || !opOutputName.equals(outputName))
-            op = null;
-        }
-        else
-          op = null;
-      }
-
-      if (op != null)
-        return op;
-    } // end while
-    return null; // binding operation not found
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Get all the operation bindings defined here.
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public List getBindingOperations()
-  {
-    return getEBindingOperations();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.PortType getPortType()
-  {
-    return getEPortType();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setPortType(javax.wsdl.PortType portType)
-  {
-    setEPortType((PortType) portType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs)
-  {
-    if (featureID >= 0)
-    {
-      switch (eDerivedStructuralFeatureID(featureID, baseClass))
-      {
-        case WSDLPackage.BINDING__EEXTENSIBILITY_ELEMENTS:
-          return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-        case WSDLPackage.BINDING__EBINDING_OPERATIONS:
-          return ((InternalEList)getEBindingOperations()).basicRemove(otherEnd, msgs);
-        default:
-          return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-      }
-    }
-    return eBasicSetContainer(null, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.BINDING__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case WSDLPackage.BINDING__ELEMENT:
-        return getElement();
-      case WSDLPackage.BINDING__EEXTENSIBILITY_ELEMENTS:
-        return getEExtensibilityElements();
-      case WSDLPackage.BINDING__QNAME:
-        return getQName();
-      case WSDLPackage.BINDING__UNDEFINED:
-        return isUndefined() ? Boolean.TRUE : Boolean.FALSE;
-      case WSDLPackage.BINDING__PROXY:
-        return isProxy() ? Boolean.TRUE : Boolean.FALSE;
-      case WSDLPackage.BINDING__RESOURCE_URI:
-        return getResourceURI();
-      case WSDLPackage.BINDING__EPORT_TYPE:
-        if (resolve) return getEPortType();
-        return basicGetEPortType();
-      case WSDLPackage.BINDING__EBINDING_OPERATIONS:
-        return getEBindingOperations();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.BINDING__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case WSDLPackage.BINDING__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case WSDLPackage.BINDING__EEXTENSIBILITY_ELEMENTS:
-        getEExtensibilityElements().clear();
-        getEExtensibilityElements().addAll((Collection)newValue);
-        return;
-      case WSDLPackage.BINDING__QNAME:
-        setQName((QName)newValue);
-        return;
-      case WSDLPackage.BINDING__UNDEFINED:
-        setUndefined(((Boolean)newValue).booleanValue());
-        return;
-      case WSDLPackage.BINDING__PROXY:
-        setProxy(((Boolean)newValue).booleanValue());
-        return;
-      case WSDLPackage.BINDING__RESOURCE_URI:
-        setResourceURI((String)newValue);
-        return;
-      case WSDLPackage.BINDING__EPORT_TYPE:
-        setEPortType((PortType)newValue);
-        return;
-      case WSDLPackage.BINDING__EBINDING_OPERATIONS:
-        getEBindingOperations().clear();
-        getEBindingOperations().addAll((Collection)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.BINDING__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.BINDING__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.BINDING__EEXTENSIBILITY_ELEMENTS:
-        getEExtensibilityElements().clear();
-        return;
-      case WSDLPackage.BINDING__QNAME:
-        setQName(QNAME_EDEFAULT);
-        return;
-      case WSDLPackage.BINDING__UNDEFINED:
-        setUndefined(UNDEFINED_EDEFAULT);
-        return;
-      case WSDLPackage.BINDING__PROXY:
-        setProxy(PROXY_EDEFAULT);
-        return;
-      case WSDLPackage.BINDING__RESOURCE_URI:
-        setResourceURI(RESOURCE_URI_EDEFAULT);
-        return;
-      case WSDLPackage.BINDING__EPORT_TYPE:
-        setEPortType((PortType)null);
-        return;
-      case WSDLPackage.BINDING__EBINDING_OPERATIONS:
-        getEBindingOperations().clear();
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.BINDING__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case WSDLPackage.BINDING__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case WSDLPackage.BINDING__EEXTENSIBILITY_ELEMENTS:
-        return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-      case WSDLPackage.BINDING__QNAME:
-        return QNAME_EDEFAULT == null ? qName != null : !QNAME_EDEFAULT.equals(qName);
-      case WSDLPackage.BINDING__UNDEFINED:
-        return undefined != UNDEFINED_EDEFAULT;
-      case WSDLPackage.BINDING__PROXY:
-        return proxy != PROXY_EDEFAULT;
-      case WSDLPackage.BINDING__RESOURCE_URI:
-        return RESOURCE_URI_EDEFAULT == null ? resourceURI != null : !RESOURCE_URI_EDEFAULT.equals(resourceURI);
-      case WSDLPackage.BINDING__EPORT_TYPE:
-        return ePortType != null;
-      case WSDLPackage.BINDING__EBINDING_OPERATIONS:
-        return eBindingOperations != null && !eBindingOperations.isEmpty();
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (qName: ");
-    result.append(qName);
-    result.append(", undefined: ");
-    result.append(undefined);
-    result.append(", proxy: ");
-    result.append(proxy);
-    result.append(", resourceURI: ");
-    result.append(resourceURI);
-    result.append(')');
-    return result.toString();
-  }
-
-  //
-  // Reconcile methods
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-    Definition definition = getEnclosingDefinition();
-
-    QName qname = new QName(definition.getTargetNamespace(), changedElement.getAttribute("name"));
-    setQName(qname);
-    reconcileReferences(false);
-  }
-
-  public Collection getModelObjects(Object component)
-  {
-    Binding binding = (Binding) component;
-
-    List list = new ArrayList();
-    list.addAll(binding.getEBindingOperations());
-    list.addAll(binding.getEExtensibilityElements());
-    return list;
-  }
-
-  public void handleUnreconciledElement(Element child, Collection remainingModelObjects)
-  {
-    switch (WSDLUtil.getInstance().getWSDLType(child))
-    {
-      case WSDLConstants.OPERATION :
-        BindingOperation operation = WSDLFactory.eINSTANCE.createBindingOperation();
-        operation.setEnclosingDefinition(getEnclosingDefinition());
-        operation.setElement(child);
-        addBindingOperation(operation);
-        break;
-      default :
-        super.handleUnreconciledElement(child,remainingModelObjects);
-        break;
-    }
-  }
-
-  protected void handleReconciliation(Collection remainingModelObjects)
-  {
-    for (Iterator i = remainingModelObjects.iterator(); i.hasNext();)
-    {
-      remove(this, i.next());
-    }
-  }
-
-  protected void remove(Object component, Object modelObject)
-  {
-    List list = getList(component, modelObject);
-    if (list != null)
-    {
-      list.remove(modelObject);
-    }
-  }
-
-  private List getList(Object component, Object modelObject)
-  {
-    List result = null;
-    Binding binding = (Binding) component;
-    if (modelObject instanceof BindingOperation)
-    {
-      result = binding.getEBindingOperations();
-    }
-    else if (modelObject instanceof ExtensibilityElement)
-    {
-      result = binding.getEExtensibilityElements();
-    }
-    return result;
-  }
-
-  //
-  // For reconciliation: Model -> DOM
-  //
-
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeAttribute(eAttribute);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eAttribute == null || eAttribute == WSDLPackage.eINSTANCE.getBinding_QName())
-        niceSetAttribute(theElement, WSDLConstants.NAME_ATTRIBUTE, getQName().getLocalPart());
-    }
-  }
-
-  protected void changeReference(EReference eReference)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeReference(eReference);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eReference == null || eReference == WSDLPackage.eINSTANCE.getBinding_EPortType())
-      {
-        PortType portType = getEPortType();
-        if (portType != null)
-        {
-          QName qName = portType.getQName();
-          niceSetAttributeURIValue(theElement, WSDLConstants.TYPE_ATTRIBUTE, qName.getNamespaceURI() + "#" + qName.getLocalPart());
-        }
-      }
-    }
-  }
-
-  protected Element createElement()
-  {
-    Element newElement = createElement(WSDLConstants.BINDING);
-    setElement(newElement);
-	
-	Iterator iterator = getExtensibilityElements().iterator();
-    while (iterator.hasNext())
-    {
-      ExtensibilityElement extensibilityElement = (ExtensibilityElement) iterator.next();
-      Element child = ((ExtensibilityElementImpl) extensibilityElement).createElement();
-      newElement.appendChild(child);
-    }
-	
-    iterator = getEBindingOperations().iterator();
-    while (iterator.hasNext())
-    {
-      BindingOperation operation = (BindingOperation) iterator.next();
-      Element child = ((BindingOperationImpl) operation).createElement();
-      newElement.appendChild(child);
-    }
-
-    return newElement;
-  }
-
-  public void reconcileReferences(boolean deep)
-  {
-    if (element != null)
-    {
-      Definition definition = (Definition) getEnclosingDefinition();
-      QName portTypeQName = createQName(definition, element.getAttribute("type"));
-      PortType newPortType = portTypeQName != null ? (PortType) definition.getPortType(portTypeQName) : null;
-      if (newPortType != getEPortType())
-      {
-        setEPortType(newPortType);
-      }
-    }
-    super.reconcileReferences(deep);
-  }
-} //BindingImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingInputImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingInputImpl.java
deleted file mode 100644
index 31ea5225a..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingInputImpl.java
+++ /dev/null
@@ -1,420 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Binding Input</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.impl.BindingInputImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.BindingInputImpl#getEInput <em>EInput</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class BindingInputImpl extends ExtensibleElementImpl implements BindingInput
-{
-  /**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected static final String NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected String name = NAME_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getEInput() <em>EInput</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEInput()
-   * @generated
-   * @ordered
-   */
-  protected Input eInput = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected BindingInputImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return WSDLPackage.eINSTANCE.getBindingInput();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getName()
-  {
-    return name;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setName(String newName)
-  {
-    String oldName = name;
-    name = newName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.BINDING_INPUT__NAME, oldName, name));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Input getEInput()
-  {
-    if (eInput != null && eInput.eIsProxy())
-    {
-      Input oldEInput = eInput;
-      eInput = (Input)eResolveProxy((InternalEObject)eInput);
-      if (eInput != oldEInput)
-      {
-        if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, WSDLPackage.BINDING_INPUT__EINPUT, oldEInput, eInput));
-      }
-    }
-    return eInput;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Input basicGetEInput()
-  {
-    return eInput;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setEInput(Input newEInput)
-  {
-    Input oldEInput = eInput;
-    eInput = newEInput;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.BINDING_INPUT__EINPUT, oldEInput, eInput));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Input getInput()
-  {
-    return getEInput();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setInput(javax.wsdl.Input input)
-  {
-    setEInput((Input) input);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs)
-  {
-    if (featureID >= 0)
-    {
-      switch (eDerivedStructuralFeatureID(featureID, baseClass))
-      {
-        case WSDLPackage.BINDING_INPUT__EEXTENSIBILITY_ELEMENTS:
-          return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-        default:
-          return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-      }
-    }
-    return eBasicSetContainer(null, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.BINDING_INPUT__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case WSDLPackage.BINDING_INPUT__ELEMENT:
-        return getElement();
-      case WSDLPackage.BINDING_INPUT__EEXTENSIBILITY_ELEMENTS:
-        return getEExtensibilityElements();
-      case WSDLPackage.BINDING_INPUT__NAME:
-        return getName();
-      case WSDLPackage.BINDING_INPUT__EINPUT:
-        if (resolve) return getEInput();
-        return basicGetEInput();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.BINDING_INPUT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case WSDLPackage.BINDING_INPUT__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case WSDLPackage.BINDING_INPUT__EEXTENSIBILITY_ELEMENTS:
-        getEExtensibilityElements().clear();
-        getEExtensibilityElements().addAll((Collection)newValue);
-        return;
-      case WSDLPackage.BINDING_INPUT__NAME:
-        setName((String)newValue);
-        return;
-      case WSDLPackage.BINDING_INPUT__EINPUT:
-        setEInput((Input)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.BINDING_INPUT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.BINDING_INPUT__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.BINDING_INPUT__EEXTENSIBILITY_ELEMENTS:
-        getEExtensibilityElements().clear();
-        return;
-      case WSDLPackage.BINDING_INPUT__NAME:
-        setName(NAME_EDEFAULT);
-        return;
-      case WSDLPackage.BINDING_INPUT__EINPUT:
-        setEInput((Input)null);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.BINDING_INPUT__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case WSDLPackage.BINDING_INPUT__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case WSDLPackage.BINDING_INPUT__EEXTENSIBILITY_ELEMENTS:
-        return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-      case WSDLPackage.BINDING_INPUT__NAME:
-        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-      case WSDLPackage.BINDING_INPUT__EINPUT:
-        return eInput != null;
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (name: ");
-    result.append(name);
-    result.append(')');
-    return result.toString();
-  }
-
-  //
-  // Reconciliation methods
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-	if (changedElement.hasAttribute("name"))
-	{
-      String name = changedElement.getAttribute("name");
-      if (name != null)
-      {
-        setName(name);
-      }
-	}
-  }
-
-  public void handleUnreconciledElement(Element child, Collection remainingModelObjects)
-  {
-    super.handleUnreconciledElement(child,remainingModelObjects);
-  }
-
-  protected void handleReconciliation(Collection remainingModelObjects)
-  {
-    for (Iterator i = remainingModelObjects.iterator(); i.hasNext();)
-    {
-      getEExtensibilityElements().remove(i.next());
-    }
-  }
-
-  public Collection getModelObjects(Object component)
-  {
-    BindingInput bindingInput = (BindingInput) component;
-    List list = new ArrayList();
-    list.addAll(bindingInput.getEExtensibilityElements());
-    return list;
-  }
-
-  //
-  // For reconciliation: Model -> DOM
-  //
-
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeAttribute(eAttribute);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eAttribute == null || eAttribute == WSDLPackage.eINSTANCE.getBindingInput_Name())
-        niceSetAttribute(theElement, WSDLConstants.NAME_ATTRIBUTE, getName());
-    }
-  }
-
-  public Element createElement()
-  {
-    Element newElement = createElement(WSDLConstants.INPUT);
-    setElement(newElement);
-
-    Iterator iterator = getExtensibilityElements().iterator();
-    while (iterator.hasNext())
-    {
-      ExtensibilityElement extensibilityElement = (ExtensibilityElement) iterator.next();
-      Element child = ((ExtensibilityElementImpl) extensibilityElement).createElement();
-      newElement.appendChild(child);
-    }
-
-    return newElement;
-  }
-  
-  // Resolve the reference to Input
-  public void reconcileReferences(boolean deep)
-  {
-    if (element != null)
-    {
-      BindingOperation bop = (BindingOperation)getContainer();
-      Operation op = bop.getEOperation();
-      if (op != null)
-      {
-        setInput(op.getEInput());
-      }
-    }
-    super.reconcileReferences(deep);
-  }
-} //BindingInputImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingOperationImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingOperationImpl.java
deleted file mode 100644
index b63c8c6c2..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingOperationImpl.java
+++ /dev/null
@@ -1,797 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.internal.util.WSDLUtil;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Binding Operation</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.impl.BindingOperationImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.BindingOperationImpl#getEOperation <em>EOperation</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.BindingOperationImpl#getEBindingInput <em>EBinding Input</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.BindingOperationImpl#getEBindingOutput <em>EBinding Output</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.BindingOperationImpl#getEBindingFaults <em>EBinding Faults</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class BindingOperationImpl extends ExtensibleElementImpl implements BindingOperation
-{
-  /**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected static final String NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected String name = NAME_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getEOperation() <em>EOperation</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEOperation()
-   * @generated
-   * @ordered
-   */
-  protected Operation eOperation = null;
-
-  /**
-   * The cached value of the '{@link #getEBindingInput() <em>EBinding Input</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEBindingInput()
-   * @generated
-   * @ordered
-   */
-  protected BindingInput eBindingInput = null;
-
-  /**
-   * The cached value of the '{@link #getEBindingOutput() <em>EBinding Output</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEBindingOutput()
-   * @generated
-   * @ordered
-   */
-  protected BindingOutput eBindingOutput = null;
-
-  /**
-   * The cached value of the '{@link #getEBindingFaults() <em>EBinding Faults</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEBindingFaults()
-   * @generated
-   * @ordered
-   */
-  protected EList eBindingFaults = null;
-
-  private Map bindingFaults;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected BindingOperationImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return WSDLPackage.eINSTANCE.getBindingOperation();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getName()
-  {
-    return name;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setName(String newName)
-  {
-    String oldName = name;
-    name = newName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.BINDING_OPERATION__NAME, oldName, name));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Operation getEOperation()
-  {
-    if (eOperation != null && eOperation.eIsProxy())
-    {
-      Operation oldEOperation = eOperation;
-      eOperation = (Operation)eResolveProxy((InternalEObject)eOperation);
-      if (eOperation != oldEOperation)
-      {
-        if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, WSDLPackage.BINDING_OPERATION__EOPERATION, oldEOperation, eOperation));
-      }
-    }
-    return eOperation;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Operation basicGetEOperation()
-  {
-    return eOperation;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setEOperation(Operation newEOperation)
-  {
-    Operation oldEOperation = eOperation;
-    eOperation = newEOperation;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.BINDING_OPERATION__EOPERATION, oldEOperation, eOperation));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public BindingInput getEBindingInput()
-  {
-    return eBindingInput;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetEBindingInput(BindingInput newEBindingInput, NotificationChain msgs)
-  {
-    BindingInput oldEBindingInput = eBindingInput;
-    eBindingInput = newEBindingInput;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WSDLPackage.BINDING_OPERATION__EBINDING_INPUT, oldEBindingInput, newEBindingInput);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setEBindingInput(BindingInput newEBindingInput)
-  {
-    if (newEBindingInput != eBindingInput)
-    {
-      NotificationChain msgs = null;
-      if (eBindingInput != null)
-        msgs = ((InternalEObject)eBindingInput).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WSDLPackage.BINDING_OPERATION__EBINDING_INPUT, null, msgs);
-      if (newEBindingInput != null)
-        msgs = ((InternalEObject)newEBindingInput).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WSDLPackage.BINDING_OPERATION__EBINDING_INPUT, null, msgs);
-      msgs = basicSetEBindingInput(newEBindingInput, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.BINDING_OPERATION__EBINDING_INPUT, newEBindingInput, newEBindingInput));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public BindingOutput getEBindingOutput()
-  {
-    return eBindingOutput;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetEBindingOutput(BindingOutput newEBindingOutput, NotificationChain msgs)
-  {
-    BindingOutput oldEBindingOutput = eBindingOutput;
-    eBindingOutput = newEBindingOutput;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WSDLPackage.BINDING_OPERATION__EBINDING_OUTPUT, oldEBindingOutput, newEBindingOutput);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setEBindingOutput(BindingOutput newEBindingOutput)
-  {
-    if (newEBindingOutput != eBindingOutput)
-    {
-      NotificationChain msgs = null;
-      if (eBindingOutput != null)
-        msgs = ((InternalEObject)eBindingOutput).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WSDLPackage.BINDING_OPERATION__EBINDING_OUTPUT, null, msgs);
-      if (newEBindingOutput != null)
-        msgs = ((InternalEObject)newEBindingOutput).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WSDLPackage.BINDING_OPERATION__EBINDING_OUTPUT, null, msgs);
-      msgs = basicSetEBindingOutput(newEBindingOutput, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.BINDING_OPERATION__EBINDING_OUTPUT, newEBindingOutput, newEBindingOutput));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList getEBindingFaults()
-  {
-    if (eBindingFaults == null)
-    {
-      eBindingFaults = new EObjectContainmentEList(BindingFault.class, this, WSDLPackage.BINDING_OPERATION__EBINDING_FAULTS);
-    }
-    return eBindingFaults;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Add a fault binding.
-   * @param fault the new fault binding
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void addBindingFault(javax.wsdl.BindingFault bindingFault)
-  {
-    getEBindingFaults().add((BindingFault)bindingFault);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Get the specified fault binding.
-   * @param name the name of the desired fault binding.
-   * @return the corresponding fault binding, or null if there wasn't
-   * any matching fault binding
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.BindingFault getBindingFault(String name)
-  {
-    BindingFault result = null;
-    for (Iterator i = getEBindingFaults().iterator(); i.hasNext();)
-    {
-      BindingFault fault = (BindingFault) i.next();
-      if (name.equals(fault.getName()))
-      {
-        result = fault;
-        break;
-      }
-    }
-    return result;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Get all the fault bindings associated with this operation binding.
-   * @return names of fault bindings
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Map getBindingFaults()
-  {
-    HashMap hashMap = new HashMap();
-    for (Iterator i = getEBindingFaults().iterator(); i.hasNext();)
-    {
-      BindingFault bindingFault = (BindingFault) i.next();
-      hashMap.put(bindingFault.getName(), bindingFault);
-    }
-    return hashMap;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Operation getOperation()
-  {
-    return getEOperation();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setOperation(javax.wsdl.Operation operation)
-  {
-    setEOperation((Operation) operation);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.BindingInput getBindingInput()
-  {
-    return getEBindingInput();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Set the input of this operation binding.
-   * @param input the desired input
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setBindingInput(javax.wsdl.BindingInput bindingInput)
-  {
-    setEBindingInput((BindingInput) bindingInput);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.BindingOutput getBindingOutput()
-  {
-    return getEBindingOutput();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Set the output of this operation binding.
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setBindingOutput(javax.wsdl.BindingOutput bindingOutput)
-  {
-    setEBindingOutput((BindingOutput) bindingOutput);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs)
-  {
-    if (featureID >= 0)
-    {
-      switch (eDerivedStructuralFeatureID(featureID, baseClass))
-      {
-        case WSDLPackage.BINDING_OPERATION__EEXTENSIBILITY_ELEMENTS:
-          return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-        case WSDLPackage.BINDING_OPERATION__EBINDING_INPUT:
-          return basicSetEBindingInput(null, msgs);
-        case WSDLPackage.BINDING_OPERATION__EBINDING_OUTPUT:
-          return basicSetEBindingOutput(null, msgs);
-        case WSDLPackage.BINDING_OPERATION__EBINDING_FAULTS:
-          return ((InternalEList)getEBindingFaults()).basicRemove(otherEnd, msgs);
-        default:
-          return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-      }
-    }
-    return eBasicSetContainer(null, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.BINDING_OPERATION__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case WSDLPackage.BINDING_OPERATION__ELEMENT:
-        return getElement();
-      case WSDLPackage.BINDING_OPERATION__EEXTENSIBILITY_ELEMENTS:
-        return getEExtensibilityElements();
-      case WSDLPackage.BINDING_OPERATION__NAME:
-        return getName();
-      case WSDLPackage.BINDING_OPERATION__EOPERATION:
-        if (resolve) return getEOperation();
-        return basicGetEOperation();
-      case WSDLPackage.BINDING_OPERATION__EBINDING_INPUT:
-        return getEBindingInput();
-      case WSDLPackage.BINDING_OPERATION__EBINDING_OUTPUT:
-        return getEBindingOutput();
-      case WSDLPackage.BINDING_OPERATION__EBINDING_FAULTS:
-        return getEBindingFaults();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.BINDING_OPERATION__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case WSDLPackage.BINDING_OPERATION__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case WSDLPackage.BINDING_OPERATION__EEXTENSIBILITY_ELEMENTS:
-        getEExtensibilityElements().clear();
-        getEExtensibilityElements().addAll((Collection)newValue);
-        return;
-      case WSDLPackage.BINDING_OPERATION__NAME:
-        setName((String)newValue);
-        return;
-      case WSDLPackage.BINDING_OPERATION__EOPERATION:
-        setEOperation((Operation)newValue);
-        return;
-      case WSDLPackage.BINDING_OPERATION__EBINDING_INPUT:
-        setEBindingInput((BindingInput)newValue);
-        return;
-      case WSDLPackage.BINDING_OPERATION__EBINDING_OUTPUT:
-        setEBindingOutput((BindingOutput)newValue);
-        return;
-      case WSDLPackage.BINDING_OPERATION__EBINDING_FAULTS:
-        getEBindingFaults().clear();
-        getEBindingFaults().addAll((Collection)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.BINDING_OPERATION__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.BINDING_OPERATION__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.BINDING_OPERATION__EEXTENSIBILITY_ELEMENTS:
-        getEExtensibilityElements().clear();
-        return;
-      case WSDLPackage.BINDING_OPERATION__NAME:
-        setName(NAME_EDEFAULT);
-        return;
-      case WSDLPackage.BINDING_OPERATION__EOPERATION:
-        setEOperation((Operation)null);
-        return;
-      case WSDLPackage.BINDING_OPERATION__EBINDING_INPUT:
-        setEBindingInput((BindingInput)null);
-        return;
-      case WSDLPackage.BINDING_OPERATION__EBINDING_OUTPUT:
-        setEBindingOutput((BindingOutput)null);
-        return;
-      case WSDLPackage.BINDING_OPERATION__EBINDING_FAULTS:
-        getEBindingFaults().clear();
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.BINDING_OPERATION__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case WSDLPackage.BINDING_OPERATION__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case WSDLPackage.BINDING_OPERATION__EEXTENSIBILITY_ELEMENTS:
-        return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-      case WSDLPackage.BINDING_OPERATION__NAME:
-        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-      case WSDLPackage.BINDING_OPERATION__EOPERATION:
-        return eOperation != null;
-      case WSDLPackage.BINDING_OPERATION__EBINDING_INPUT:
-        return eBindingInput != null;
-      case WSDLPackage.BINDING_OPERATION__EBINDING_OUTPUT:
-        return eBindingOutput != null;
-      case WSDLPackage.BINDING_OPERATION__EBINDING_FAULTS:
-        return eBindingFaults != null && !eBindingFaults.isEmpty();
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (name: ");
-    result.append(name);
-    result.append(')');
-    return result.toString();
-  }
-
-  //
-  // Reconcile methods
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-    String name = changedElement.getAttribute("name");
-    if (name != null)
-    {
-      setName(name);
-    }
-  }
-
-  public void handleUnreconciledElement(Element child, Collection remainingModelObjects)
-  {
-    Definition definition = getEnclosingDefinition();
-
-    switch (WSDLUtil.getInstance().getWSDLType(child))
-    {
-      case WSDLConstants.INPUT :
-      {
-        BindingInput input = WSDLFactory.eINSTANCE.createBindingInput();
-        input.setEnclosingDefinition(definition);
-        input.setElement(child);
-        setBindingInput(input);
-        break;
-      }
-      case WSDLConstants.OUTPUT :
-      {
-        BindingOutput output = WSDLFactory.eINSTANCE.createBindingOutput();
-        output.setEnclosingDefinition(definition);
-        output.setElement(child);
-        setBindingOutput(output);
-        break;
-      }
-      case WSDLConstants.FAULT :
-      {
-        BindingFault fault = WSDLFactory.eINSTANCE.createBindingFault();
-        fault.setEnclosingDefinition(definition);
-        fault.setElement(child);
-        addBindingFault(fault);
-        break;
-      }
-      default :
-      {
-        super.handleUnreconciledElement(child,remainingModelObjects);
-        break;
-      }
-    }
-  }
-
-  protected void handleReconciliation(Collection remainingModelObjects)
-  {
-    for (Iterator i = remainingModelObjects.iterator(); i.hasNext();)
-    {
-      remove(this, i.next());
-    }
-  }
-
-  protected void remove(Object component, Object modelObject)
-  {
-    BindingOperation bindingOperation = (BindingOperation) component;
-    if (modelObject instanceof BindingInput)
-    {
-      bindingOperation.setEBindingInput(null);
-    }
-    else if (modelObject instanceof BindingOutput)
-    {
-      bindingOperation.setEBindingOutput(null);
-    }
-    else if (modelObject instanceof BindingFault)
-    {
-      bindingOperation.getEBindingFaults().remove(modelObject);
-    }
-    else
-    {
-      bindingOperation.getEExtensibilityElements().remove(modelObject);
-    }
-  }
-
-  public Collection getModelObjects(Object component)
-  {
-    BindingOperation bindingOperation = (BindingOperation) component;
-
-    List list = new ArrayList();
-
-    if (bindingOperation.getEBindingInput() != null)
-    {
-      list.add(bindingOperation.getEBindingInput());
-    }
-
-    if (bindingOperation.getEBindingOutput() != null)
-    {
-      list.add(bindingOperation.getEBindingOutput());
-    }
-
-    list.addAll(bindingOperation.getEBindingFaults());
-    list.addAll(bindingOperation.getEExtensibilityElements());
-
-    return list;
-  }
-
-  //
-  // For reconciliation: Model -> DOM
-  //
-
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeAttribute(eAttribute);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eAttribute == null || eAttribute == WSDLPackage.eINSTANCE.getBindingOperation_Name())
-        niceSetAttribute(theElement, WSDLConstants.NAME_ATTRIBUTE, getName());
-    }
-  }
-
-  public Element createElement()
-  {
-    Element newElement = createElement(WSDLConstants.OPERATION);
-    setElement(newElement);
-
-	Iterator iterator = getExtensibilityElements().iterator();
-    while (iterator.hasNext())
-    {
-      ExtensibilityElement extensibilityElement = (ExtensibilityElement) iterator.next();
-      Element child = ((ExtensibilityElementImpl) extensibilityElement).createElement();
-      newElement.appendChild(child);
-    }
-	
-    BindingInput input = getEBindingInput();
-    if (input != null)
-    {
-      Element child = ((BindingInputImpl) input).createElement();
-      newElement.appendChild(child);
-    }
-
-    BindingOutput output = getEBindingOutput();
-    if (output != null)
-    {
-      Element child = ((BindingOutputImpl) output).createElement();
-      newElement.appendChild(child);
-    }
-
-    iterator = getEBindingFaults().iterator();
-    while (iterator.hasNext())
-    {
-      BindingFault fault = (BindingFault) iterator.next();
-      Element child = ((BindingFaultImpl) fault).createElement();
-      newElement.appendChild(child);
-    }
-
-    return newElement;
-  }
-  
-  // Resolve the reference to Operation
-  public void reconcileReferences(boolean deep)
-  {
-    if (element != null)
-    {
-      Binding binding = (Binding)getContainer();
-      PortType portType = binding.getEPortType();
-      if (portType != null)
-      {
-        setOperation(portType.getOperation(getName(),null,null));
-      }
-    }
-    super.reconcileReferences(deep);
-  }
-} //BindingOperationImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingOutputImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingOutputImpl.java
deleted file mode 100644
index d350d911d..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingOutputImpl.java
+++ /dev/null
@@ -1,420 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Binding Output</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.impl.BindingOutputImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.BindingOutputImpl#getEOutput <em>EOutput</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class BindingOutputImpl extends ExtensibleElementImpl implements BindingOutput
-{
-  /**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected static final String NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected String name = NAME_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getEOutput() <em>EOutput</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEOutput()
-   * @generated
-   * @ordered
-   */
-  protected Output eOutput = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected BindingOutputImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return WSDLPackage.eINSTANCE.getBindingOutput();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getName()
-  {
-    return name;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setName(String newName)
-  {
-    String oldName = name;
-    name = newName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.BINDING_OUTPUT__NAME, oldName, name));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Output getEOutput()
-  {
-    if (eOutput != null && eOutput.eIsProxy())
-    {
-      Output oldEOutput = eOutput;
-      eOutput = (Output)eResolveProxy((InternalEObject)eOutput);
-      if (eOutput != oldEOutput)
-      {
-        if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, WSDLPackage.BINDING_OUTPUT__EOUTPUT, oldEOutput, eOutput));
-      }
-    }
-    return eOutput;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Output basicGetEOutput()
-  {
-    return eOutput;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setEOutput(Output newEOutput)
-  {
-    Output oldEOutput = eOutput;
-    eOutput = newEOutput;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.BINDING_OUTPUT__EOUTPUT, oldEOutput, eOutput));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Output getOutput()
-  {
-    return getEOutput();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setOutput(javax.wsdl.Output output)
-  {
-    setEOutput((Output) output);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs)
-  {
-    if (featureID >= 0)
-    {
-      switch (eDerivedStructuralFeatureID(featureID, baseClass))
-      {
-        case WSDLPackage.BINDING_OUTPUT__EEXTENSIBILITY_ELEMENTS:
-          return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-        default:
-          return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-      }
-    }
-    return eBasicSetContainer(null, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.BINDING_OUTPUT__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case WSDLPackage.BINDING_OUTPUT__ELEMENT:
-        return getElement();
-      case WSDLPackage.BINDING_OUTPUT__EEXTENSIBILITY_ELEMENTS:
-        return getEExtensibilityElements();
-      case WSDLPackage.BINDING_OUTPUT__NAME:
-        return getName();
-      case WSDLPackage.BINDING_OUTPUT__EOUTPUT:
-        if (resolve) return getEOutput();
-        return basicGetEOutput();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.BINDING_OUTPUT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case WSDLPackage.BINDING_OUTPUT__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case WSDLPackage.BINDING_OUTPUT__EEXTENSIBILITY_ELEMENTS:
-        getEExtensibilityElements().clear();
-        getEExtensibilityElements().addAll((Collection)newValue);
-        return;
-      case WSDLPackage.BINDING_OUTPUT__NAME:
-        setName((String)newValue);
-        return;
-      case WSDLPackage.BINDING_OUTPUT__EOUTPUT:
-        setEOutput((Output)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.BINDING_OUTPUT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.BINDING_OUTPUT__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.BINDING_OUTPUT__EEXTENSIBILITY_ELEMENTS:
-        getEExtensibilityElements().clear();
-        return;
-      case WSDLPackage.BINDING_OUTPUT__NAME:
-        setName(NAME_EDEFAULT);
-        return;
-      case WSDLPackage.BINDING_OUTPUT__EOUTPUT:
-        setEOutput((Output)null);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.BINDING_OUTPUT__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case WSDLPackage.BINDING_OUTPUT__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case WSDLPackage.BINDING_OUTPUT__EEXTENSIBILITY_ELEMENTS:
-        return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-      case WSDLPackage.BINDING_OUTPUT__NAME:
-        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-      case WSDLPackage.BINDING_OUTPUT__EOUTPUT:
-        return eOutput != null;
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (name: ");
-    result.append(name);
-    result.append(')');
-    return result.toString();
-  }
-
-  //
-  // Reconcile methods
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-	if (changedElement.hasAttribute("name"))
-	{
-      String name = changedElement.getAttribute("name");
-      if (name != null)
-      {
-        setName(name);
-      }
-	}
-  }
-
-  public void handleUnreconciledElement(Element child, Collection remainingModelObjects)
-  {
-    super.handleUnreconciledElement(child,remainingModelObjects);
-  }
-
-  protected void handleReconciliation(Collection remainingModelObjects)
-  {
-    for (Iterator i = remainingModelObjects.iterator(); i.hasNext();)
-    {
-      getEExtensibilityElements().remove(i.next());
-    }
-  }
-
-  public Collection getModelObjects(Object component)
-  {
-    BindingOutput bindingOutput = (BindingOutput) component;
-    List list = new ArrayList();
-    list.addAll(bindingOutput.getEExtensibilityElements());
-    return list;
-  }
-
-  //
-  // For reconciliation: Model -> DOM
-  //
-
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeAttribute(eAttribute);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eAttribute == null || eAttribute == WSDLPackage.eINSTANCE.getBindingOutput_Name())
-        niceSetAttribute(theElement, WSDLConstants.NAME_ATTRIBUTE, getName());
-    }
-  }
-
-  public Element createElement()
-  {
-    Element newElement = createElement(WSDLConstants.OUTPUT);
-    setElement(newElement);
-
-    Iterator iterator = getExtensibilityElements().iterator();
-    while (iterator.hasNext())
-    {
-      ExtensibilityElement extensibilityElement = (ExtensibilityElement) iterator.next();
-      Element child = ((ExtensibilityElementImpl) extensibilityElement).createElement();
-      newElement.appendChild(child);
-    }
-
-    return newElement;
-  }
-  
-  // Resolve the reference to Output
-  public void reconcileReferences(boolean deep)
-  {
-    if (element != null)
-    {
-      BindingOperation bop = (BindingOperation)getContainer();
-      Operation op = bop.getEOperation();
-      if (op != null)
-      {
-        setOutput(op.getEOutput());
-      }
-    }
-    super.reconcileReferences(deep);
-  }
-} //BindingOutputImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/DefinitionImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/DefinitionImpl.java
deleted file mode 100644
index e4604c4ed..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/DefinitionImpl.java
+++ /dev/null
@@ -1,2291 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.wsdl.BindingFault;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.BindingOutput;
-import javax.wsdl.Fault;
-import javax.wsdl.Input;
-import javax.wsdl.Operation;
-import javax.wsdl.Output;
-import javax.wsdl.Part;
-import javax.wsdl.Port;
-import javax.wsdl.extensions.ExtensionRegistry;
-import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Namespace;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.Types;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.WSDLPlugin;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.wsdl.internal.util.WSDLResourceFactoryImpl;
-import org.eclipse.wst.wsdl.internal.util.WSDLUtil;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDImport;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.eclipse.xsd.impl.XSDImportImpl;
-import org.eclipse.xsd.impl.XSDSchemaImpl;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.events.Event;
-import org.w3c.dom.events.EventListener;
-import org.w3c.dom.events.EventTarget;
-import org.w3c.dom.events.MutationEvent;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Definition</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.impl.DefinitionImpl#getTargetNamespace <em>Target Namespace</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.DefinitionImpl#getLocation <em>Location</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.DefinitionImpl#getQName <em>QName</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.DefinitionImpl#getEncoding <em>Encoding</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.DefinitionImpl#getEMessages <em>EMessages</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.DefinitionImpl#getEPortTypes <em>EPort Types</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.DefinitionImpl#getEBindings <em>EBindings</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.DefinitionImpl#getEServices <em>EServices</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.DefinitionImpl#getENamespaces <em>ENamespaces</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.DefinitionImpl#getETypes <em>ETypes</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.DefinitionImpl#getEImports <em>EImports</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DefinitionImpl extends ExtensibleElementImpl implements Definition
-{
-  /**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * The default value of the '{@link #getTargetNamespace() <em>Target Namespace</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getTargetNamespace()
-   * @generated
-   * @ordered
-   */
-  protected static final String TARGET_NAMESPACE_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getTargetNamespace() <em>Target Namespace</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getTargetNamespace()
-   * @generated
-   * @ordered
-   */
-  protected String targetNamespace = TARGET_NAMESPACE_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getLocation() <em>Location</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getLocation()
-   * @generated
-   * @ordered
-   */
-  protected static final String LOCATION_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getLocation() <em>Location</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getLocation()
-   * @generated
-   * @ordered
-   */
-  protected String location = LOCATION_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getQName() <em>QName</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getQName()
-   * @generated
-   * @ordered
-   */
-  protected static final QName QNAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getQName() <em>QName</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getQName()
-   * @generated
-   * @ordered
-   */
-  protected QName qName = QNAME_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getEncoding() <em>Encoding</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEncoding()
-   * @generated
-   * @ordered
-   */
-  protected static final String ENCODING_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getEncoding() <em>Encoding</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEncoding()
-   * @generated
-   * @ordered
-   */
-  protected String encoding = ENCODING_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getEMessages() <em>EMessages</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEMessages()
-   * @generated
-   * @ordered
-   */
-  protected EList eMessages = null;
-
-  /**
-   * The cached value of the '{@link #getEPortTypes() <em>EPort Types</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEPortTypes()
-   * @generated
-   * @ordered
-   */
-  protected EList ePortTypes = null;
-
-  /**
-   * The cached value of the '{@link #getEBindings() <em>EBindings</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEBindings()
-   * @generated
-   * @ordered
-   */
-  protected EList eBindings = null;
-
-  /**
-   * The cached value of the '{@link #getEServices() <em>EServices</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEServices()
-   * @generated
-   * @ordered
-   */
-  protected EList eServices = null;
-
-  /**
-   * The cached value of the '{@link #getENamespaces() <em>ENamespaces</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getENamespaces()
-   * @generated
-   * @ordered
-   */
-  protected EList eNamespaces = null;
-
-  /**
-   * The cached value of the '{@link #getETypes() <em>ETypes</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getETypes()
-   * @generated
-   * @ordered
-   */
-  protected Types eTypes = null;
-
-  /**
-   * The cached value of the '{@link #getEImports() <em>EImports</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEImports()
-   * @generated
-   * @ordered
-   */
-  protected EList eImports = null;
-
-  private ExtensionRegistry extensionRegistry;
-  private Document document;
-  private HashMap namespaces = new HashMap();
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected DefinitionImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return WSDLPackage.eINSTANCE.getDefinition();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getTargetNamespace()
-  {
-    return targetNamespace;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setTargetNamespace(String newTargetNamespace)
-  {
-    String oldTargetNamespace = targetNamespace;
-    targetNamespace = newTargetNamespace;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.DEFINITION__TARGET_NAMESPACE, oldTargetNamespace, targetNamespace));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getLocation()
-  {
-    return location;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setLocation(String newLocation)
-  {
-    String oldLocation = location;
-    location = newLocation;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.DEFINITION__LOCATION, oldLocation, location));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public QName getQName()
-  {
-    return qName;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setQName(QName newQName)
-  {
-    QName oldQName = qName;
-    qName = newQName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.DEFINITION__QNAME, oldQName, qName));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getEncoding()
-  {
-    return encoding;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setEncoding(String newEncoding)
-  {
-    String oldEncoding = encoding;
-    encoding = newEncoding;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.DEFINITION__ENCODING, oldEncoding, encoding));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList getEMessages()
-  {
-    if (eMessages == null)
-    {
-      eMessages = new EObjectContainmentEList(Message.class, this, WSDLPackage.DEFINITION__EMESSAGES);
-    }
-    return eMessages;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList getEPortTypes()
-  {
-    if (ePortTypes == null)
-    {
-      ePortTypes = new EObjectContainmentEList(PortType.class, this, WSDLPackage.DEFINITION__EPORT_TYPES);
-    }
-    return ePortTypes;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList getEBindings()
-  {
-    if (eBindings == null)
-    {
-      eBindings = new EObjectContainmentEList(Binding.class, this, WSDLPackage.DEFINITION__EBINDINGS);
-    }
-    return eBindings;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList getEServices()
-  {
-    if (eServices == null)
-    {
-      eServices = new EObjectContainmentEList(Service.class, this, WSDLPackage.DEFINITION__ESERVICES);
-    }
-    return eServices;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * @deprecated
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList getENamespaces()
-  {
-    if (eNamespaces == null)
-    {
-      eNamespaces = new EObjectContainmentEList(Namespace.class, this, WSDLPackage.DEFINITION__ENAMESPACES);
-    }
-    return eNamespaces;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Types getETypes()
-  {
-    return eTypes;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetETypes(Types newETypes, NotificationChain msgs)
-  {
-    Types oldETypes = eTypes;
-    eTypes = newETypes;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WSDLPackage.DEFINITION__ETYPES, oldETypes, newETypes);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setETypes(Types newETypes)
-  {
-    if (newETypes != eTypes)
-    {
-      NotificationChain msgs = null;
-      if (eTypes != null)
-        msgs = ((InternalEObject)eTypes).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WSDLPackage.DEFINITION__ETYPES, null, msgs);
-      if (newETypes != null)
-        msgs = ((InternalEObject)newETypes).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WSDLPackage.DEFINITION__ETYPES, null, msgs);
-      msgs = basicSetETypes(newETypes, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.DEFINITION__ETYPES, newETypes, newETypes));
-  }
-  
-  public void eNotify(Notification msg)
-  {
-    super.eNotify(msg);
-    
-    // cs.. if we've added a Types element, and this definition is already attached to a resource
-    // we need to set the schemaLocations for any inline schemaLocations.
-    // If not yet attached to a resource, the schemaLocation's will be set via WSDLResourceImpl.attached(EObject o)
-    //
-    if (msg.getFeature() == WSDLPackage.eINSTANCE.getDefinition_ETypes() &&
-        msg.getEventType() == Notification.SET)
-    {
-      if (eResource() instanceof WSDLResourceImpl && getEnclosingDefinition() != null)
-      {
-        setInlineSchemaLocations(eResource());
-      }    
-    }        
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList getEImports()
-  {
-    if (eImports == null)
-    {
-      eImports = new EObjectContainmentEList(Import.class, this, WSDLPackage.DEFINITION__EIMPORTS);
-    }
-    return eImports;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Add a binding to this WSDL description.
-   * @param binding the binding to be added
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void addBinding(javax.wsdl.Binding binding)
-  {
-    getEBindings().add((Binding) binding);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Add an import to this WSDL description.
-   * @param importDef the import to be added
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void addImport(javax.wsdl.Import importDef)
-  {
-    getEImports().add((Import) importDef);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Add a message to this WSDL description.
-   * @param message the message to be added
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void addMessage(javax.wsdl.Message message)
-  {
-    getEMessages().add((Message)message);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * This is a way to add a namespace association to a definition.
-   * It is similar to adding a namespace prefix declaration to the
-   * top of a &lt;wsdl:definition&gt; element. This has nothing to do
-   * with the &lt;wsdl:import&gt; element; there are separate methods for
-   * dealing with information described by &lt;wsdl:import&gt; elements.
-   * There is a default namespace association (which can be
-   * overridden) between the null prefix and
-   * http://schemas.xmlsoap.org/wsdl/.
-   * @param prefix the prefix to use for this namespace (when
-   * rendering this information as XML). Use null or an empty string
-   * to describe the default namespace (i.e. xmlns="...").
-   * @param namespaceURI the namespace URI to associate the prefix
-   * with. If you use null, the namespace association will be removed.
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void addNamespace(String prefix, String namespaceURI)
-  {
-    if (prefix == null)
-      prefix = "";
-
-    if (namespaceURI != null)
-    {
-      // First, check if there is this namespace already.
-      String existingPrefix = getPrefix(namespaceURI);
-      if (existingPrefix != null)
-        return;
-
-      // Make sure the prefix is not already used for a different namespace
-      Map namespaces = getNamespaces();
-      String existingNamespace = (String) namespaces.get(prefix);
-      if (existingNamespace == null)
-      {
-        namespaces.put(prefix, namespaceURI);
-        
-        // Support for Namespace
-        Namespace ens = WSDLFactory.eINSTANCE.createNamespace();
-        ens.setPrefix(prefix);
-        ens.setURI(namespaceURI);
-        getENamespaces().add(ens);
-        
-        return;
-      }
-      
-      // The prefix is taken already. Make a unique prefix
-      if (prefix.endsWith("1"))
-        prefix = prefix.substring(0, prefix.length() - 1);
-
-      for (int i = 2;; i++)
-      {
-        String newPrefix = prefix + i;
-        if (!namespaces.containsKey(newPrefix))
-        {
-          namespaces.put(newPrefix, namespaceURI);
-          
-          // Support for Namespace
-          Namespace ens = WSDLFactory.eINSTANCE.createNamespace();
-          ens.setPrefix(prefix);
-          ens.setURI(namespaceURI);
-          getENamespaces().add(ens);
-          
-          return;
-        }
-      }
-    } // end if (namespaceURI != null)
-    else
-    {
-      getNamespaces().remove(prefix);
-      
-      // Support for Namespace
-      getENamespaces().remove(prefix);
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Add a portType to this WSDL description.
-   * @param portType the portType to be added
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void addPortType(javax.wsdl.PortType portType)
-  {
-    getEPortTypes().add((PortType)portType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Add a service to this WSDL description.
-   * @param service the service to be added
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void addService(javax.wsdl.Service service)
-  {
-    getEServices().add((Service)service);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Create a new binding fault.
-   * @return the newly created binding fault
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public BindingFault createBindingFault()
-  {
-    javax.wsdl.BindingFault bindingFault = WSDLFactoryImpl.eINSTANCE.createBindingFault();
-    return bindingFault;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Create a new binding input.
-   * @return the newly created binding input
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public BindingInput createBindingInput()
-  {
-    javax.wsdl.BindingInput bindingInput = WSDLFactoryImpl.eINSTANCE.createBindingInput();
-    return bindingInput;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Create a new binding output.
-   * @return the newly created binding output
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public BindingOutput createBindingOutput()
-  {
-    javax.wsdl.BindingOutput bindingOutput = WSDLFactoryImpl.eINSTANCE.createBindingOutput();
-    return bindingOutput;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Create a new binding operation.
-   * @return the newly created binding operation
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public BindingOperation createBindingOperation()
-  {
-    javax.wsdl.BindingOperation bindingOperation = WSDLFactoryImpl.eINSTANCE.createBindingOperation();
-    return bindingOperation;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Create a new binding.
-   * @return the newly created binding
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Binding createBinding()
-  {
-    javax.wsdl.Binding binding = WSDLFactoryImpl.eINSTANCE.createBinding();
-    binding.setUndefined(true);
-    return binding;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Create a new fault.
-   * @return the newly created fault
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Fault createFault()
-  {
-    javax.wsdl.Fault fault = WSDLFactoryImpl.eINSTANCE.createFault();
-    return fault;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Create a new import.
-   * @return the newly created import
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Import createImport()
-  {
-    javax.wsdl.Import importDef = WSDLFactoryImpl.eINSTANCE.createImport();
-    return importDef;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Create a new input.
-   * @return the newly created input
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Input createInput()
-  {
-    javax.wsdl.Input input = WSDLFactoryImpl.eINSTANCE.createInput();
-    return input;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Create a new message.
-   * @return the newly created message
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Message createMessage()
-  {
-    javax.wsdl.Message message = WSDLFactoryImpl.eINSTANCE.createMessage();
-    message.setUndefined(true);
-    return message;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Create a new operation.
-   * @return the newly created operation
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Operation createOperation()
-  {
-    javax.wsdl.Operation operation = WSDLFactoryImpl.eINSTANCE.createOperation();
-    operation.setUndefined(true);
-    return operation;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Create a new output.
-   * @return the newly created output
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Output createOutput()
-  {
-    javax.wsdl.Output output = WSDLFactoryImpl.eINSTANCE.createOutput();
-    return output;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Create a new part.
-   * @return the newly created part
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Part createPart()
-  {
-    javax.wsdl.Part part = WSDLFactoryImpl.eINSTANCE.createPart();
-    return part;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Create a new port.
-   * @return the newly created port
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Port createPort()
-  {
-    javax.wsdl.Port port = WSDLFactoryImpl.eINSTANCE.createPort();
-    return port;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Create a new port type.
-   * @return the newly created port type
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.PortType createPortType()
-  {
-    javax.wsdl.PortType portType = WSDLFactoryImpl.eINSTANCE.createPortType();
-    portType.setUndefined(true);
-    return portType;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Create a new service.
-   * @return the newly created service
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Service createService()
-  {
-    javax.wsdl.Service service = WSDLFactoryImpl.eINSTANCE.createService();
-    return service;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Get the specified binding. Also checks imported documents.
-   * @param name the name of the desired binding.
-   * @return the corresponding binding, or null if there wasn't
-   * any matching binding
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Binding getBinding(QName name)
-  {
-    return (javax.wsdl.Binding) resolveWSDLElement(WSDLConstants.BINDING, name);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Get all the bindings defined here.
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Map getBindings()
-  {
-    return createMap(WSDLConstants.BINDING, getEBindings());
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-    * Get a map of lists containing all the imports defined here.
-    * The map's keys are the namespaceURIs, and the map's values
-    * are lists. There is one list for each namespaceURI for which
-    * imports have been defined.
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Map getImports()
-  {
-    HashMap map = new HashMap();
-    for (Iterator i = getEImports().iterator(); i.hasNext();)
-    {
-      Import theImport = (Import) i.next();
-      String key = theImport.getNamespaceURI();
-      if (key == null)
-      {
-        key = "";
-      }
-      
-      List list = null;
-      if (map.containsKey(key))
-      {
-        list = (List)map.get(key);
-        list.add(theImport); 
-      }
-      else
-      {
-        list = new ArrayList();
-        list.add(theImport);       
-      }
-      map.put(key,list);      
-    }
-    return map;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Get the list of imports for the specified namespaceURI.
-   * @param namespaceURI the namespaceURI associated with the
-   * desired imports.
-   * @return a list of the corresponding imports
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public List getImports(String namespaceURI)
-  {
-    List list = new ArrayList();
-    for (Iterator i = getEImports().iterator(); i.hasNext();)
-    {
-      Import theImport = (Import) i.next();
-      if (WSDLConstants.isMatchingNamespace(namespaceURI, theImport.getNamespaceURI()))
-      {
-        list.add(theImport);
-      }
-    }
-    return list;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Get the specified message. Also checks imported documents.
-   * @param name the name of the desired message.
-   * @return the corresponding message, or null if there wasn't
-   * any matching message
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Message getMessage(QName name)
-  {
-    return (javax.wsdl.Message) resolveWSDLElement(WSDLConstants.MESSAGE, name);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Get all the messages defined here.
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Map getMessages()
-  {
-    return createMap(WSDLConstants.MESSAGE, getEMessages());
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Get the namespace URI associated with this prefix. Or null if
-   * there is no namespace URI associated with this prefix. This is
-   * unrelated to the &lt;wsdl:import&gt; element.
-   * @see #addNamespace(String, String)
-   * @see #getPrefix(String)
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String getNamespace(String prefix)
-  {
-    return (String) getNamespaces().get(prefix);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Get all namespace associations in this definition. The keys are
-   * the prefixes, and the namespace URIs are the values. This is
-   * unrelated to the &lt;wsdl:import&gt; element.
-   * @see #addNamespace(String, String)
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Map getNamespaces()
-  {    
-    return namespaces;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Get the specified portType. Also checks imported documents.
-   * @param name the name of the desired portType.
-   * @return the corresponding portType, or null if there wasn't
-   * any matching portType
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.PortType getPortType(QName name)
-  {
-    return (javax.wsdl.PortType) resolveWSDLElement(WSDLConstants.PORT_TYPE, name);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Get all the portTypes defined here.
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Map getPortTypes()
-  {
-    return createMap(WSDLConstants.PORT_TYPE, getEPortTypes());
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Get a prefix associated with this namespace URI. Or null if
-   * there are no prefixes associated with this namespace URI. This is
-   * unrelated to the &lt;wsdl:import&gt; element.
-   * @see #addNamespace(String, String)
-   * @see #getNamespace(String)
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String getPrefix(String namespaceURI)
-  {
-    if (namespaceURI == null)
-      return null;
-
-    Iterator entryIterator = getNamespaces().entrySet().iterator();
-    while (entryIterator.hasNext())
-    {
-      Map.Entry entry = (Map.Entry) entryIterator.next();
-      String prefix = (String) entry.getKey();
-      String assocNamespaceURI = (String) entry.getValue();
-
-      if (namespaceURI.equals(assocNamespaceURI) && prefix != "") // default namespace
-        return prefix;
-    }
-    return null;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Get the specified service. Also checks imported documents.
-   * @param name the name of the desired service.
-   * @return the corresponding service, or null if there wasn't
-   * any matching service
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Service getService(QName name)
-  {
-    return (javax.wsdl.Service) resolveWSDLElement(WSDLConstants.SERVICE, name);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Get all the services defined here.
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Map getServices()
-  {
-    return createMap(WSDLConstants.SERVICE, getEServices());
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Get a reference to the ExtensionRegistry for this Definition.
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public ExtensionRegistry getExtensionRegistry()
-  {
-    return extensionRegistry;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Set the ExtensionRegistry for this Definition.
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setExtensionRegistry(ExtensionRegistry extensionRegistry)
-  {
-    this.extensionRegistry = extensionRegistry;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String getDocumentBaseURI()
-  {
-    return getLocation();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setDocumentBaseURI(String documentBase)
-  {
-    setLocation(documentBase);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Types createTypes()
-  {
-    javax.wsdl.Types types = WSDLFactoryImpl.eINSTANCE.createTypes();
-    return types;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Service removeService(QName name)
-  {
-    return (javax.wsdl.Service) getServices().remove(name);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Binding removeBinding(QName name)
-  {
-    return (javax.wsdl.Binding) getBindings().remove(name);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.PortType removePortType(QName name)
-  {
-    return (javax.wsdl.PortType) getPortTypes().remove(name);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Message removeMessage(QName name)
-  {
-    return (javax.wsdl.Message) getMessages().remove(name);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Types getTypes()
-  {
-    return getETypes();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setTypes(javax.wsdl.Types types)
-  {
-    setETypes((Types) types);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Document getDocument()
-  {
-    return document;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Sets the owner document.
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setDocument(Document document)
-  {
-    this.document = document;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs)
-  {
-    if (featureID >= 0)
-    {
-      switch (eDerivedStructuralFeatureID(featureID, baseClass))
-      {
-        case WSDLPackage.DEFINITION__EEXTENSIBILITY_ELEMENTS:
-          return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-        case WSDLPackage.DEFINITION__EMESSAGES:
-          return ((InternalEList)getEMessages()).basicRemove(otherEnd, msgs);
-        case WSDLPackage.DEFINITION__EPORT_TYPES:
-          return ((InternalEList)getEPortTypes()).basicRemove(otherEnd, msgs);
-        case WSDLPackage.DEFINITION__EBINDINGS:
-          return ((InternalEList)getEBindings()).basicRemove(otherEnd, msgs);
-        case WSDLPackage.DEFINITION__ESERVICES:
-          return ((InternalEList)getEServices()).basicRemove(otherEnd, msgs);
-        case WSDLPackage.DEFINITION__ENAMESPACES:
-          return ((InternalEList)getENamespaces()).basicRemove(otherEnd, msgs);
-        case WSDLPackage.DEFINITION__ETYPES:
-          return basicSetETypes(null, msgs);
-        case WSDLPackage.DEFINITION__EIMPORTS:
-          return ((InternalEList)getEImports()).basicRemove(otherEnd, msgs);
-        default:
-          return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-      }
-    }
-    return eBasicSetContainer(null, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.DEFINITION__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case WSDLPackage.DEFINITION__ELEMENT:
-        return getElement();
-      case WSDLPackage.DEFINITION__EEXTENSIBILITY_ELEMENTS:
-        return getEExtensibilityElements();
-      case WSDLPackage.DEFINITION__TARGET_NAMESPACE:
-        return getTargetNamespace();
-      case WSDLPackage.DEFINITION__LOCATION:
-        return getLocation();
-      case WSDLPackage.DEFINITION__QNAME:
-        return getQName();
-      case WSDLPackage.DEFINITION__ENCODING:
-        return getEncoding();
-      case WSDLPackage.DEFINITION__EMESSAGES:
-        return getEMessages();
-      case WSDLPackage.DEFINITION__EPORT_TYPES:
-        return getEPortTypes();
-      case WSDLPackage.DEFINITION__EBINDINGS:
-        return getEBindings();
-      case WSDLPackage.DEFINITION__ESERVICES:
-        return getEServices();
-      case WSDLPackage.DEFINITION__ENAMESPACES:
-        return getENamespaces();
-      case WSDLPackage.DEFINITION__ETYPES:
-        return getETypes();
-      case WSDLPackage.DEFINITION__EIMPORTS:
-        return getEImports();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.DEFINITION__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case WSDLPackage.DEFINITION__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case WSDLPackage.DEFINITION__EEXTENSIBILITY_ELEMENTS:
-        getEExtensibilityElements().clear();
-        getEExtensibilityElements().addAll((Collection)newValue);
-        return;
-      case WSDLPackage.DEFINITION__TARGET_NAMESPACE:
-        setTargetNamespace((String)newValue);
-        return;
-      case WSDLPackage.DEFINITION__LOCATION:
-        setLocation((String)newValue);
-        return;
-      case WSDLPackage.DEFINITION__QNAME:
-        setQName((QName)newValue);
-        return;
-      case WSDLPackage.DEFINITION__ENCODING:
-        setEncoding((String)newValue);
-        return;
-      case WSDLPackage.DEFINITION__EMESSAGES:
-        getEMessages().clear();
-        getEMessages().addAll((Collection)newValue);
-        return;
-      case WSDLPackage.DEFINITION__EPORT_TYPES:
-        getEPortTypes().clear();
-        getEPortTypes().addAll((Collection)newValue);
-        return;
-      case WSDLPackage.DEFINITION__EBINDINGS:
-        getEBindings().clear();
-        getEBindings().addAll((Collection)newValue);
-        return;
-      case WSDLPackage.DEFINITION__ESERVICES:
-        getEServices().clear();
-        getEServices().addAll((Collection)newValue);
-        return;
-      case WSDLPackage.DEFINITION__ENAMESPACES:
-        getENamespaces().clear();
-        getENamespaces().addAll((Collection)newValue);
-        return;
-      case WSDLPackage.DEFINITION__ETYPES:
-        setETypes((Types)newValue);
-        return;
-      case WSDLPackage.DEFINITION__EIMPORTS:
-        getEImports().clear();
-        getEImports().addAll((Collection)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.DEFINITION__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.DEFINITION__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.DEFINITION__EEXTENSIBILITY_ELEMENTS:
-        getEExtensibilityElements().clear();
-        return;
-      case WSDLPackage.DEFINITION__TARGET_NAMESPACE:
-        setTargetNamespace(TARGET_NAMESPACE_EDEFAULT);
-        return;
-      case WSDLPackage.DEFINITION__LOCATION:
-        setLocation(LOCATION_EDEFAULT);
-        return;
-      case WSDLPackage.DEFINITION__QNAME:
-        setQName(QNAME_EDEFAULT);
-        return;
-      case WSDLPackage.DEFINITION__ENCODING:
-        setEncoding(ENCODING_EDEFAULT);
-        return;
-      case WSDLPackage.DEFINITION__EMESSAGES:
-        getEMessages().clear();
-        return;
-      case WSDLPackage.DEFINITION__EPORT_TYPES:
-        getEPortTypes().clear();
-        return;
-      case WSDLPackage.DEFINITION__EBINDINGS:
-        getEBindings().clear();
-        return;
-      case WSDLPackage.DEFINITION__ESERVICES:
-        getEServices().clear();
-        return;
-      case WSDLPackage.DEFINITION__ENAMESPACES:
-        getENamespaces().clear();
-        return;
-      case WSDLPackage.DEFINITION__ETYPES:
-        setETypes((Types)null);
-        return;
-      case WSDLPackage.DEFINITION__EIMPORTS:
-        getEImports().clear();
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.DEFINITION__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case WSDLPackage.DEFINITION__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case WSDLPackage.DEFINITION__EEXTENSIBILITY_ELEMENTS:
-        return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-      case WSDLPackage.DEFINITION__TARGET_NAMESPACE:
-        return TARGET_NAMESPACE_EDEFAULT == null ? targetNamespace != null : !TARGET_NAMESPACE_EDEFAULT.equals(targetNamespace);
-      case WSDLPackage.DEFINITION__LOCATION:
-        return LOCATION_EDEFAULT == null ? location != null : !LOCATION_EDEFAULT.equals(location);
-      case WSDLPackage.DEFINITION__QNAME:
-        return QNAME_EDEFAULT == null ? qName != null : !QNAME_EDEFAULT.equals(qName);
-      case WSDLPackage.DEFINITION__ENCODING:
-        return ENCODING_EDEFAULT == null ? encoding != null : !ENCODING_EDEFAULT.equals(encoding);
-      case WSDLPackage.DEFINITION__EMESSAGES:
-        return eMessages != null && !eMessages.isEmpty();
-      case WSDLPackage.DEFINITION__EPORT_TYPES:
-        return ePortTypes != null && !ePortTypes.isEmpty();
-      case WSDLPackage.DEFINITION__EBINDINGS:
-        return eBindings != null && !eBindings.isEmpty();
-      case WSDLPackage.DEFINITION__ESERVICES:
-        return eServices != null && !eServices.isEmpty();
-      case WSDLPackage.DEFINITION__ENAMESPACES:
-        return eNamespaces != null && !eNamespaces.isEmpty();
-      case WSDLPackage.DEFINITION__ETYPES:
-        return eTypes != null;
-      case WSDLPackage.DEFINITION__EIMPORTS:
-        return eImports != null && !eImports.isEmpty();
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (targetNamespace: ");
-    result.append(targetNamespace);
-    result.append(", location: ");
-    result.append(location);
-    result.append(", qName: ");
-    result.append(qName);
-    result.append(", encoding: ");
-    result.append(encoding);
-    result.append(')');
-    return result.toString();
-  }
-
-  //
-  // Hand-coded methods
-  //
-
-  protected static ResourceSet globalResourceSet;
-
-  public static synchronized ResourceSet getGlobalResourceSet()
-  {
-    if (globalResourceSet == null)
-    {
-      globalResourceSet = createResourceSet();
-      //String baseURL = WSDLPlugin.INSTANCE.getBaseURL().toString();
-      //System.out.println("Base URL is: " + baseURL);
-    }
-
-    return globalResourceSet;
-  }
-
-  public static ResourceSet createResourceSet()
-  {
-    ResourceSet result = new ResourceSetImpl();
-    result.getResourceFactoryRegistry().getExtensionToFactoryMap().put("wsdl", new WSDLResourceFactoryImpl());
-    return result;
-  }
-
-  public static Definition createDefinition(Node node)
-  {
-    return createDefinition(node, null);
-  }
-
-  public static Definition createDefinition(Node node, String location)
-  {
-    return createDefinition(node,location,true);
-  }
-  
-  public static Definition createDefinition(Node node, String location, boolean useExtensionFactories)
-  {
-    Definition definition = WSDLFactory.eINSTANCE.createDefinition();
-    ((DefinitionImpl)definition).setUseExtensionFactories(useExtensionFactories);
-    definition.setElement((Element) node);
-    definition.setDocumentBaseURI(location);
-    return definition;
-  }
-  
-  private WSDLElement resolveWSDLElement(int type, List list, javax.xml.namespace.QName qname)
-  {
-    WSDLElement result = null;
-    if (qname != null)
-    {
-      for (Iterator i = list.iterator(); i.hasNext();)
-      {
-        WSDLElement wsdlElement = (WSDLElement) i.next();
-        QName theQName = getQNameForWSDLElement(type, wsdlElement);
-        if (qname.equals(theQName))
-        {
-          result = wsdlElement;
-          break;
-        }
-      }
-    }
-    return result;
-  }
-
-  private HashMap createMap(int type, List list)
-  {
-    HashMap map = new HashMap();
-    for (Iterator i = list.iterator(); i.hasNext();)
-    {
-      WSDLElement wsdlElement = (WSDLElement) i.next();
-      QName theQName = getQNameForWSDLElement(type, wsdlElement);
-      if (theQName != null)
-      {
-        map.put(theQName, wsdlElement);
-      }
-    }
-    return map;
-  }
-
-  private QName getQNameForWSDLElement(int type, WSDLElement wsdlElement)
-  {
-    QName result = null;
-    switch (type)
-    {
-      case WSDLConstants.MESSAGE :
-        result = ((Message) wsdlElement).getQName();
-        break;
-      case WSDLConstants.PORT_TYPE :
-        result = ((PortType) wsdlElement).getQName();
-        break;
-      case WSDLConstants.BINDING :
-        result = ((Binding) wsdlElement).getQName();
-        break;
-      case WSDLConstants.SERVICE :
-        result = ((Service) wsdlElement).getQName();
-        break;
-    }
-    return result;
-  }
-
-  /*
-   * TBD - Revisit
-   * Look for an object in the imported definitions.
-   */
-  private WSDLElement resolveWSDLElement(int type, javax.xml.namespace.QName qname)
-  {
-    WSDLElement result = null;
-    if (qname.getNamespaceURI() != null)
-    {
-      for (Iterator i = getDefinitions(qname.getNamespaceURI()).iterator(); i.hasNext();)
-      {
-        Definition definition = (Definition) i.next();
-        switch (type)
-        {
-          case WSDLConstants.MESSAGE :
-            result = resolveWSDLElement(type, definition.getEMessages(), qname);
-            break;
-          case WSDLConstants.PORT_TYPE :
-            result = resolveWSDLElement(type, definition.getEPortTypes(), qname);
-            break;
-          case WSDLConstants.BINDING :
-            result = resolveWSDLElement(type, definition.getEBindings(), qname);
-            break;
-          case WSDLConstants.SERVICE :
-            result = resolveWSDLElement(type, definition.getEServices(), qname);
-            break;
-        }
-        if (result != null)
-        {
-          break;
-        }
-      }
-    }
-    return result;
-  }  
-
-  //
-  // Reconciliation methods
-  //
-
-  public void setElement(Element element)
-  {
-    Element oldElement = getElement();
-    if (oldElement instanceof EventTarget)
-    {
-      EventTarget oldEventTarget = ((EventTarget)oldElement);
-      oldEventTarget.removeEventListener("DOMNodeInserted", getEventListener(), true);
-      oldEventTarget.removeEventListener("DOMNodeRemoved", getEventListener(), true);
-      oldEventTarget.removeEventListener("DOMAttrModified", getEventListener(), true);
-    }
-    super.setElement(element);
-    if (element instanceof EventTarget)
-    {
-      EventTarget eventTarget = ((EventTarget)element);
-      eventTarget.addEventListener("DOMNodeInserted", getEventListener(), true);
-      eventTarget.addEventListener("DOMNodeRemoved", getEventListener(), true);
-      eventTarget.addEventListener("DOMAttrModified", getEventListener(), true);
-    }
-    if (element != null)
-    {
-      document = element.getOwnerDocument();
-    }
-  }
-
-  protected void reconcileAttributes(Element changedElement)
-  {
-    super.reconcileAttributes(changedElement);
-
-    if (changedElement == getElement())
-    { 
-      if (changedElement.hasAttribute("targetNamespace"))
-        setTargetNamespace(changedElement.getAttribute("targetNamespace"));
-	  if (changedElement.hasAttribute("name"))
-        setQName(new QName(WSDLConstants.WSDL_NAMESPACE_URI, changedElement.getAttribute("name")));
-      getENamespaces().clear();
-      getNamespaces().clear();
-      //getNamespaces().put("", null);
-
-      NamedNodeMap map = changedElement.getAttributes();
-      int mapLength = map.getLength();
-      for (int i = 0; i < mapLength; i++)
-      {
-        Attr attr = (Attr) map.item(i);
-        String nsPrefix = null;
-        if ("xmlns".equals(attr.getPrefix()))
-        {
-          nsPrefix = attr.getLocalName();
-        }
-        else if ("xmlns".equals(attr.getNodeName()))
-        {
-          nsPrefix = "";
-        }
-
-        if (nsPrefix != null)
-        {
-          getNamespaces().put(nsPrefix, attr.getValue());
-        }
-      }
-    }
-  }
-
-  public void handleUnreconciledElement(Element child, Collection remainingModelObjects)
-  {
-    switch (WSDLUtil.getInstance().getWSDLType(child))
-    {
-      case WSDLConstants.BINDING :
-        {
-          Binding binding = WSDLFactory.eINSTANCE.createBinding();
-          binding.setEnclosingDefinition(this);
-          binding.setElement(child);
-          addBinding(binding);
-          break;
-        }
-      case WSDLConstants.DOCUMENTATION :
-        {
-          // CS: we need to figure out how to unset this element when its removed
-          //definition.setDocumentationElement(child);  
-          break;
-        }
-      case WSDLConstants.IMPORT :
-        {
-          Import i = WSDLFactory.eINSTANCE.createImport();
-          i.setEnclosingDefinition(this);
-          i.setElement(child);
-          addImport(i);
-          break;
-        }
-      case WSDLConstants.MESSAGE :
-        {
-          Message message = WSDLFactory.eINSTANCE.createMessage();
-          message.setEnclosingDefinition(this);
-          message.setElement(child);
-          addMessage(message);
-          break;
-        }
-      case WSDLConstants.PORT_TYPE :
-        {
-          PortType portType = WSDLFactory.eINSTANCE.createPortType();
-          portType.setEnclosingDefinition(this);
-          portType.setElement(child);
-          addPortType(portType);
-          break;
-        }
-      case WSDLConstants.SERVICE :
-        {
-          Service service = WSDLFactoryImpl.eINSTANCE.createService();
-          service.setEnclosingDefinition(this);
-          service.setElement(child);
-          addService(service);
-          break;
-        }
-      case WSDLConstants.TYPES :
-        {
-          if (getETypes() == null)
-          {
-            Types types = WSDLFactoryImpl.eINSTANCE.createTypes();
-            types.setEnclosingDefinition(this);
-            types.setElement(child);
-            setETypes(types);
-          }
-          break;
-        }
-      default :
-      {
-        ExtensibilityElement extensibilityElement = getUseExtensionFactories() ? 
-          ((WSDLFactoryImpl)WSDLFactory.eINSTANCE).createExtensibilityElement(getNamespace(child),getLocalName(child)) :
-          ((WSDLFactoryImpl)WSDLFactory.eINSTANCE).createUnknownExtensibilityElement();
-        	   		                                              
-        extensibilityElement.setEnclosingDefinition(this);
-        extensibilityElement.setElement(child);
-        getEExtensibilityElements().add(extensibilityElement);
-        break;
-      }
-    }
-  }
-
-  protected void handleReconciliation(Collection remainingModelObjects)
-  {
-    for (Iterator i = remainingModelObjects.iterator(); i.hasNext();)
-    {
-      remove(this, i.next());
-    }
-    reconcileReferences(true);
-  }
-
-  protected void remove(Object component, Object modelObject)
-  {
-    if (modelObject instanceof Types)
-    {
-      Definition definition = (Definition) component;
-      if (definition.getETypes() == modelObject)
-      {
-        definition.setETypes(null);
-      }
-    }
-    else
-    {
-      List list = getList(component, modelObject);
-      if (list != null)
-      {
-        list.remove(modelObject);
-      }
-    }
-  }
-
-  private List getList(Object component, Object modelObject)
-  {
-    List result = null;
-    Definition definition = (Definition) component;
-
-    // todo... use WSDLSwitch
-    //
-    if (modelObject instanceof Binding)
-    {
-      result = definition.getEBindings();
-    }
-    else if (modelObject instanceof Import)
-    {
-      result = definition.getEImports();
-    }
-    else if (modelObject instanceof Message)
-    {
-      result = definition.getEMessages();
-    }
-    else if (modelObject instanceof PortType)
-    {
-      result = definition.getEPortTypes();
-    }
-    else if (modelObject instanceof Service)
-    {
-      result = definition.getEServices();
-    }
-    else if (modelObject instanceof ExtensibilityElement)
-    {
-      result = definition.getEExtensibilityElements();
-    }
-    return result;
-  }
-
-  public Collection getModelObjects(Object component)
-  {
-    List list = new ArrayList();
-    Definition definition = (Definition) component;
-    list.addAll(definition.getEImports());
-    list.add(definition.getETypes());
-    list.addAll(definition.getEMessages());
-    list.addAll(definition.getEPortTypes());
-    list.addAll(definition.getEBindings());
-    list.addAll(definition.getEServices());
-    list.addAll(definition.getEExtensibilityElements());
-    return list;
-  }
-
-  //
-  // For reconciliation: Model -> DOM
-  //
-
-  public Document updateDocument()
-  {
-    document = createDocument();
-    return document;
-  }
-
-  private Document createDocument()
-  {
-    try
-    {
-      DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
-      documentBuilderFactory.setNamespaceAware(true);
-      documentBuilderFactory.setValidating(false);
-      DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
-      return documentBuilder.newDocument();
-    }
-    catch (ParserConfigurationException exception)
-    {
-      WSDLPlugin.INSTANCE.log(exception);
-      return null;
-    }
-  }
-
-  public Element createElement()
-  {
-    Element newElement = createElement(WSDLConstants.DEFINITION);
-    setElement(newElement);
-    addChildElements(newElement, getEExtensibilityElements());
-
-    Types types = getETypes();
-    if (types != null)
-    {
-      Element child = ((TypesImpl) types).createElement();
-      newElement.appendChild(child);
-    }
-
-    addChildElements(newElement, getEImports());
-    addChildElements(newElement, getEMessages());
-    addChildElements(newElement, getEPortTypes());
-    addChildElements(newElement, getEBindings());
-    addChildElements(newElement, getEServices());
-
-    return newElement;
-  }
-
-  protected void addChildElements(Element parent, List c)
-  {
-    for (Iterator iterator = c.iterator(); iterator.hasNext();)
-    {
-      WSDLElementImpl wsdlElement = (WSDLElementImpl) iterator.next();
-      Element child = wsdlElement.createElement();
-      parent.appendChild(child);
-    }
-  }
-
-  protected void changeReference(EReference eReference)
-  {
-    // Add namespace prefix info
-    // TBD - Need to revisit.
-    Element theElement = getElement();
-    if (eReference == null && theElement != null) 
-    // We are updating the Definition element.
-    {
-      Iterator iterator = getNamespaces().entrySet().iterator();
-      String prefix = null;
-      String uri = null;
-      while (iterator.hasNext())
-      {
-        Map.Entry entry = (Map.Entry) iterator.next();
-        prefix = (String) entry.getKey();
-        uri = (String) entry.getValue();
-        if (prefix != "")
-          theElement.setAttributeNS(XSDConstants.XMLNS_URI_2000, "xmlns:" + prefix, uri);
-        else if (uri != null)
-          // Handle default namespace, e.g. xmlns="http://schemas.xmlsoap.org/wsdl/"
-          theElement.setAttributeNS(XSDConstants.XMLNS_URI_2000, "xmlns", uri);
-      }
-    }
-  }
-  
-  protected void changeAttribute(EAttribute eAttribute)
-  {    
-    if (isReconciling)
-      return; 
-    
-    super.changeAttribute(eAttribute);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      //if (eAttribute == null || eAttribute == WSDLPackage.eINSTANCE.getDefinition_Encoding())
-      //  niceSetAttribute(theElement, WSDLConstants.ENCODING_ATTRIBUTE, getEncoding());
-      if (eAttribute == null || eAttribute == WSDLPackage.eINSTANCE.getDefinition_QName())
-        if (getQName() != null)
-          niceSetAttribute(theElement, WSDLConstants.NAME_ATTRIBUTE, getQName().getLocalPart());
-      if (eAttribute == null || eAttribute == WSDLPackage.eINSTANCE.getDefinition_TargetNamespace())
-        if (getTargetNamespace() != null)
-          niceSetAttribute(theElement, WSDLConstants.TARGETNAMESPACE_ATTRIBUTE, getTargetNamespace());
-    }
-  }
-
-  protected List getDefinitions(String namespace)
-  {
-    List list = new ArrayList();
-    if (WSDLConstants.isMatchingNamespace(namespace, getTargetNamespace()))
-    {
-      list.add(this);
-    }
-    for (Iterator i = getImports(namespace).iterator(); i.hasNext();)
-    {
-      Import theImport = (Import) i.next();
-      ((ImportImpl) theImport).importDefinitionOrSchema();
-      Definition importedDefinition = theImport.getEDefinition();
-      if (importedDefinition != null && WSDLConstants.isMatchingNamespace(namespace, importedDefinition.getTargetNamespace()))
-      {
-        list.add(importedDefinition);
-      }
-    }
-    return list;
-  }
-
-  public XSDElementDeclaration resolveElementDeclarationURI(String uri)
-  {
-    XSDElementDeclaration result = null;
-    int index = uri.lastIndexOf("#");
-    if (index != -1)
-    {
-      result = resolveElementDeclaration(uri.substring(0, index), uri.substring(index + 1));
-    }
-    return result;
-  }
-
-  public XSDElementDeclaration resolveElementDeclaration(String namespace, String localName)
-  {
-    XSDElementDeclaration result = null;
-    for (Iterator i = resolveSchema(namespace).iterator(); i.hasNext();)
-    {
-      XSDSchema schema = (XSDSchema) i.next();
-      result = schema.resolveElementDeclaration(namespace, localName);
-      if (result != null)
-        return result;
-    }
-    
-    // Could not resolve. Try against all <import>ed and inlined schemas.
-    for (Iterator i = getImportedOrInlinedSchemas().iterator(); i.hasNext();)
-    {
-      XSDSchema schema = (XSDSchema)i.next();
-      result = schema.resolveElementDeclaration(namespace, localName);
-      if (result != null)
-        return result;
-    }
-    
-    return result;
-  }
-
-  public XSDTypeDefinition resolveTypeDefinitionURI(String uri)
-  {
-    XSDTypeDefinition result = null;
-    int index = uri.lastIndexOf("#");
-    if (index != -1)
-    {
-      result = resolveTypeDefinition(uri.substring(0, index), uri.substring(index + 1));
-    }
-    return result;
-  }
-
-  public XSDTypeDefinition resolveTypeDefinition(String namespace, String localName)
-  {
-    XSDTypeDefinition result = null;
-    for (Iterator i = resolveSchema(namespace).iterator(); i.hasNext();)
-    {
-      XSDSchema schema = (XSDSchema)i.next();
-      result = schema.resolveTypeDefinition(namespace, localName);
-      if (result != null)
-        return result;
-    }
-    
-    // Could not resolve. Try against all <import>ed and inlined schemas.
-    for (Iterator i = getImportedOrInlinedSchemas().iterator(); i.hasNext();)
-    {
-      XSDSchema schema = (XSDSchema)i.next();
-      result = schema.resolveTypeDefinition(namespace, localName);
-      if (result != null)
-        return result;
-    }
-    
-    return result; // Failed to resolve.
-  }
-
-  /**
-  	* This returns set of schemas with the given namespace as it's target namespace.
-  	*/
-  public Collection resolveSchema(String namespace)
-  {
-    if ("".equals(namespace))
-    {
-      namespace = null;
-    }
-
-    if (XSDConstants.isSchemaForSchemaNamespace(namespace))
-    {
-      return Collections.singleton(XSDSchemaImpl.getSchemaForSchema(namespace));
-    }
-    else if (XSDConstants.isSchemaInstanceNamespace(namespace))
-    {
-      return Collections.singleton(XSDSchemaImpl.getSchemaInstance(namespace));
-    }
-    else
-    {
-      return getImportedOrInlinedSchemas(namespace);
-    }
-  }
-  
-  protected List getImportedOrInlinedSchemas(String namespace)
-  {
-    if (namespace == null)
-    {
-      namespace = "";
-    }
-
-    List list = new ArrayList();
-    for (Iterator i = getEImports().iterator(); i.hasNext();)
-    {
-      Import theImport = (Import) i.next();
-      if (WSDLConstants.isMatchingNamespace(theImport.getNamespaceURI(), namespace))
-      {
-        ((ImportImpl) theImport).importDefinitionOrSchema();
-        XSDSchema schema = theImport.getESchema();
-        if (schema != null && WSDLConstants.isMatchingNamespace(schema.getTargetNamespace(), namespace))
-        {
-          list.add(schema);
-        }
-      }
-    }
-    if (getETypes() != null)
-    {
-      for (Iterator i = getETypes().getSchemas().iterator(); i.hasNext();)
-      {
-        XSDSchema schema = (XSDSchema) i.next();
-        String targetNamespace = schema.getTargetNamespace();
-        if (namespace.equals(targetNamespace))
-        {  
-          list.add(schema);
-        }
-        
-        for (Iterator j = schema.getContents().iterator(); j.hasNext(); )
-        {
-          Object component = j.next();
-          if (component instanceof XSDImport)
-          {
-            XSDImport theImport = (XSDImport)component;
-            if (namespace.equals(theImport.getNamespace()))
-            {
-              ((XSDImportImpl)theImport).importSchema();
-              XSDSchema importedSchema = theImport.getResolvedSchema();             
-              if (importedSchema != null)
-              {  
-                list.add(importedSchema);
-              }  
-            }  
-          }  
-        }  
-        
-      }     
-    }
-    return list;
-  }
-  
-  private List getImportedOrInlinedSchemas()
-  {
-    List list = new ArrayList();
-    for (Iterator i = getEImports().iterator(); i.hasNext();)
-    {
-      Import theImport = (Import) i.next();
-      ((ImportImpl) theImport).importDefinitionOrSchema();
-      XSDSchema schema = theImport.getESchema();
-      if (schema != null)
-        list.add(schema);
-    }
-    
-    if (getETypes() != null)
-    {
-      list.addAll(getETypes().getSchemas());
-    }
-    return list;
-  }
-  
-  protected EventListener eventListener;
-  protected Node deletionNode;
-
-  public Node getDeletionNode()
-  {
-    return deletionNode;
-  }
-
-  protected EventListener getEventListener()
-  {
-    if (eventListener == null)
-    {
-      eventListener = 
-        new EventListener()
-        {
-          public void handleEvent(Event event) 
-          {
-            if (event instanceof MutationEvent)
-            {
-              MutationEvent mutationEvent = (MutationEvent)event;
-              if (mutationEvent.getTarget() instanceof Node)
-              {
-                Node node = (Node)mutationEvent.getTarget();
-                while (node.getNodeType() != Node.ELEMENT_NODE)
-                {
-                  node = node.getParentNode();
-                }
-                if (mutationEvent.getAttrChange() == 0)
-                {
-                  WSDLElementImpl listener = (WSDLElementImpl)getCorrespondingComponent(node.getParentNode());
-                  if (listener != null)
-                  {
-                    if (event.getType().equals("DOMNodeRemoved"))
-                    {
-                      deletionNode = (Node)event.getTarget();
-                    }
-                    listener.elementContentsChanged((Element)node.getParentNode());
-                    deletionNode = null;
-                  }
-                }
-                else
-                {
-                  WSDLElementImpl listener = (WSDLElementImpl)getCorrespondingComponent(node);
-                  if (listener != null)
-                  {
-                    listener.elementAttributesChanged((Element)node);
-                  }
-                }
-              }
-            }
-          }
-        };
-    }
-    return eventListener;
-  }
-  
-  public WSDLElement getCorrespondingComponent(Node node)
-  {
-    // We consider all parents so that they can handle other contained nodes that otherwise don't correspond to a component.
-    //
-    List parents = new ArrayList();
-  
-    if (node.getNodeType() == Node.ATTRIBUTE_NODE)
-    {
-      node = ((Attr)node).getOwnerElement();
-    }
-    else
-    {
-      // Skip ahead to an element.
-      //
-      for (Node scanNode = node; scanNode != null; scanNode = scanNode.getNextSibling())
-      {
-        if (scanNode.getNodeType() == Node.ELEMENT_NODE)
-        {
-          node = scanNode;
-          break;
-        }
-      }
-  
-      // Skip back to an element.
-      //
-      for (Node scanNode = node; scanNode != null; scanNode = scanNode.getPreviousSibling())
-      {
-        if (scanNode.getNodeType() == Node.ELEMENT_NODE)
-        {
-          node = scanNode;
-          break;
-        }
-      }
-    }
-  
-    // Navigate out through the elements.
-    //
-    for (Node parent = node; parent != null; parent = parent.getParentNode())
-    {
-      if (parent.getNodeType() == Node.ELEMENT_NODE)
-      {
-        parents.add(parent);
-      }
-    }
-
-    WSDLElement bestWSDLElement = getBestWSDLElement(parents);
-    return bestWSDLElement;
-  }
-  
-  //
-  //
-  //
-  private boolean useExtensionFactories = true; 
-  
-  public void setUseExtensionFactories(boolean value)
-  {
-  	useExtensionFactories = value;
-  }
-  
-  public boolean getUseExtensionFactories()
-  {
-  	return useExtensionFactories;
-  }
-  
-  // See Bug 5366
-  public void removeAll()
-  {
-    try
-    {
-     isReconciling = true;
-     document = null;
-     element = null;
-     getEServices().clear();
-     getEBindings().clear();
-     getEPortTypes().clear();
-     getEMessages().clear();
-     setETypes(null);
-     getEImports().clear();
-     getEExtensibilityElements().clear();     
-    }
-    catch (Exception e)
-    {
-      
-    }
-    finally
-    {
-     isReconciling = false;
-    } 
-  }
-  
-  public void setInlineSchemaLocations(Resource resource)
-  {
-    // Initialize the inline schemas location 
-    Types types = this.getETypes();
-    if (types != null)
-    {
-      for (Iterator j = types.getEExtensibilityElements().iterator(); j.hasNext();)
-      {
-        XSDSchemaExtensibilityElement el = (XSDSchemaExtensibilityElement) j.next();
-        XSDSchema schema = el.getSchema();
-        if (schema != null)
-        {  
-        	// We need this try-catch block in case we encounter an exception while attempting
-        	// to resolve the schema.  In the case of the WSDL Editor, we get a
-        	// 'cannot create part exception'......See eclipse bugzilla bug 89855
-        	try
-        	{
-        		schema.setSchemaLocation(resource.getURI().toString());
-        	}
-        	catch (Exception e) {
-
-        	}
-        }  
-      }        
-    }      
-  }  
-  
-} //DefinitionImpl
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ExtensibilityElementImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ExtensibilityElementImpl.java
deleted file mode 100644
index bb842472b..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ExtensibilityElementImpl.java
+++ /dev/null
@@ -1,409 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl;
-
-import java.beans.BeanInfo;
-import java.beans.IntrospectionException;
-import java.beans.Introspector;
-import java.beans.PropertyDescriptor;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Extensibility Element</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.impl.ExtensibilityElementImpl#isRequired <em>Required</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.ExtensibilityElementImpl#getElementType <em>Element Type</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ExtensibilityElementImpl extends WSDLElementImpl implements ExtensibilityElement
-{
-  /**
-   * The default value of the '{@link #isRequired() <em>Required</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isRequired()
-   * @generated
-   * @ordered
-   */
-  protected static final boolean REQUIRED_EDEFAULT = false;
-
-  /**
-   * The cached value of the '{@link #isRequired() <em>Required</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isRequired()
-   * @generated
-   * @ordered
-   */
-  protected boolean required = REQUIRED_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getElementType() <em>Element Type</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getElementType()
-   * @generated
-   * @ordered
-   */
-  protected static final QName ELEMENT_TYPE_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getElementType() <em>Element Type</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getElementType()
-   * @generated
-   * @ordered
-   */
-  protected QName elementType = ELEMENT_TYPE_EDEFAULT;
-
-  private HashMap beanPropertyDescriptors;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected ExtensibilityElementImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return WSDLPackage.eINSTANCE.getExtensibilityElement();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isRequired()
-  {
-    return required;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setRequired(boolean newRequired)
-  {
-    boolean oldRequired = required;
-    required = newRequired;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.EXTENSIBILITY_ELEMENT__REQUIRED, oldRequired, required));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public QName getElementType()
-  {
-    if (elementType == null)
-      elementType = new QName(eClass().getEPackage().getNsURI(), eClass().getName());
-
-    return elementType;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setElementType(QName newElementType)
-  {
-    QName oldElementType = elementType;
-    elementType = newElementType;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT_TYPE, oldElementType, elementType));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT:
-        return getElement();
-      case WSDLPackage.EXTENSIBILITY_ELEMENT__REQUIRED:
-        return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-      case WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT_TYPE:
-        return getElementType();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case WSDLPackage.EXTENSIBILITY_ELEMENT__REQUIRED:
-        setRequired(((Boolean)newValue).booleanValue());
-        return;
-      case WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT_TYPE:
-        setElementType((QName)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.EXTENSIBILITY_ELEMENT__REQUIRED:
-        setRequired(REQUIRED_EDEFAULT);
-        return;
-      case WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT_TYPE:
-        setElementType(ELEMENT_TYPE_EDEFAULT);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case WSDLPackage.EXTENSIBILITY_ELEMENT__REQUIRED:
-        return required != REQUIRED_EDEFAULT;
-      case WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT_TYPE:
-        return ELEMENT_TYPE_EDEFAULT == null ? elementType != null : !ELEMENT_TYPE_EDEFAULT.equals(elementType);
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (required: ");
-    result.append(required);
-    result.append(", elementType: ");
-    result.append(elementType);
-    result.append(')');
-    return result.toString();
-  }
-
-  /**
-   * @see javax.wsdl.extensions.ExtensibilityElement#getRequired()
-   */
-  public Boolean getRequired()
-  {
-    return new Boolean(isRequired());
-  }
-
-  /**
-   * @see javax.wsdl.extensions.ExtensibilityElement#setRequired(Boolean)
-   */
-  public void setRequired(Boolean required)
-  {
-    setRequired(required.booleanValue());
-  }
-
-  /**
-   * Returns the property descriptors for a given class.
-   */
-  public java.util.Map getPropertyDescriptors(java.lang.Class clazz)
-  {
-    // Lookup properties cache
-    Map properties = null;
-    if (beanPropertyDescriptors == null)
-      beanPropertyDescriptors = new HashMap();
-    else
-      properties = (Map) beanPropertyDescriptors.get(clazz);
-
-    if (properties == null)
-    {
-      // Introspect the bean
-      ArrayList binfos = new ArrayList();
-      try
-      {
-        BeanInfo binfo = Introspector.getBeanInfo(clazz);
-        if (binfo != null)
-        {
-          binfos.add(binfo);
-          BeanInfo[] abinfo = binfo.getAdditionalBeanInfo();
-          if (abinfo != null)
-          {
-            for (int b = 0; b < abinfo.length; b++)
-              binfos.add(abinfo[b]);
-          }
-        }
-      }
-      catch (IntrospectionException e)
-      {
-        // TBD - handle exception
-      }
-
-      properties = new HashMap();
-      for (Iterator b = binfos.iterator(); b.hasNext();)
-      {
-        BeanInfo binfo = (BeanInfo) b.next();
-        PropertyDescriptor[] pdesc = binfo.getPropertyDescriptors();
-        if (pdesc == null)
-          continue;
-        for (int p = 0; p < pdesc.length; p++)
-          properties.put(pdesc[p].getName(), pdesc[p]);
-      }
-      beanPropertyDescriptors.put(clazz, properties);
-    }
-    return properties;
-  }
-
-  //
-  // Reconcile methods
-  //
-
-  public void setElement(Element element)
-  {
-    if (element == null && !isReconciling)
-    {
-      //System.out.println("ExtensibilityElement.setElement(): Preserving old element");
-    }
-    else
-    {
-      setElementGen(element);
-    }
-  }
-
-  public void reconcileAttributes(Element changedElement)
-  {
-    super.reconcileAttributes(changedElement);
-  }
-
-  public void handleUnreconciledElement(Element child, Collection remainingModelObjects)
-  {
-    super.handleUnreconciledElement(child,remainingModelObjects);
-  }
-
-  protected void handleReconciliation(Collection remainingModelObjects)
-  {
-    super.handleReconciliation(remainingModelObjects);
-  }
-
-  //
-  // For reconciliation: EMF -> DOM
-  //
-
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeAttribute(eAttribute);
-  }
-
-  public Element createElement()
-  {
-    Definition definition = getEnclosingDefinition();
-    if (definition == null)
-      return null;
-
-    Document document = definition.getDocument();
-    if (document == null)
-      document = ((DefinitionImpl) definition).updateDocument();
-
-    Element newElement = null;
-    if (element != null) // This is an old element.
-    {
-      newElement = (Element) document.importNode(element, true); 
-      element = newElement;
-    }
-    else
-    {
-      String namespace = getElementType().getNamespaceURI();
-      String qualifier = definition.getPrefix(namespace);
-      newElement = document.createElementNS(namespace, (qualifier == null ? "" : qualifier + ":") + getElementType().getLocalPart());
-      element = newElement;
-    }
-
-    return newElement;
-  }
-} //ExtensibilityElementImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ExtensibleElementImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ExtensibleElementImpl.java
deleted file mode 100644
index d3ce61db3..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ExtensibleElementImpl.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.ExtensibleElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Extensible Element</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.impl.ExtensibleElementImpl#getEExtensibilityElements <em>EExtensibility Elements</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class ExtensibleElementImpl extends WSDLElementImpl implements ExtensibleElement
-{
-  /**
-   * The cached value of the '{@link #getEExtensibilityElements() <em>EExtensibility Elements</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEExtensibilityElements()
-   * @generated
-   * @ordered
-   */
-  protected EList eExtensibilityElements = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected ExtensibleElementImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return WSDLPackage.eINSTANCE.getExtensibleElement();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList getEExtensibilityElements()
-  {
-    if (eExtensibilityElements == null)
-    {
-      eExtensibilityElements = new EObjectContainmentEList(ExtensibilityElement.class, this, WSDLPackage.EXTENSIBLE_ELEMENT__EEXTENSIBILITY_ELEMENTS);
-    }
-    return eExtensibilityElements;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public List getExtensibilityElements()
-  {
-    return getEExtensibilityElements();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void addExtensibilityElement(javax.wsdl.extensions.ExtensibilityElement extElement)
-  {
-    getExtensibilityElements().add(extElement);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs)
-  {
-    if (featureID >= 0)
-    {
-      switch (eDerivedStructuralFeatureID(featureID, baseClass))
-      {
-        case WSDLPackage.EXTENSIBLE_ELEMENT__EEXTENSIBILITY_ELEMENTS:
-          return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-        default:
-          return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-      }
-    }
-    return eBasicSetContainer(null, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.EXTENSIBLE_ELEMENT__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case WSDLPackage.EXTENSIBLE_ELEMENT__ELEMENT:
-        return getElement();
-      case WSDLPackage.EXTENSIBLE_ELEMENT__EEXTENSIBILITY_ELEMENTS:
-        return getEExtensibilityElements();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.EXTENSIBLE_ELEMENT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case WSDLPackage.EXTENSIBLE_ELEMENT__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case WSDLPackage.EXTENSIBLE_ELEMENT__EEXTENSIBILITY_ELEMENTS:
-        getEExtensibilityElements().clear();
-        getEExtensibilityElements().addAll((Collection)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.EXTENSIBLE_ELEMENT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.EXTENSIBLE_ELEMENT__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.EXTENSIBLE_ELEMENT__EEXTENSIBILITY_ELEMENTS:
-        getEExtensibilityElements().clear();
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.EXTENSIBLE_ELEMENT__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case WSDLPackage.EXTENSIBLE_ELEMENT__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case WSDLPackage.EXTENSIBLE_ELEMENT__EEXTENSIBILITY_ELEMENTS:
-        return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  //
-  //
-  //
-  public void handleUnreconciledElement(Element child, Collection remainingModelObjects)
-  {
-    if (!WSDLConstants.isMatchingNamespace(child.getNamespaceURI(), WSDLConstants.WSDL_NAMESPACE_URI))
-    {  
-      ExtensibilityElement extensibilityElement = useExtensionFactories() ? 
-          ((WSDLFactoryImpl)WSDLFactory.eINSTANCE).createExtensibilityElement(getNamespace(child),getLocalName(child)) :
-            ((WSDLFactoryImpl)WSDLFactory.eINSTANCE).createUnknownExtensibilityElement();
-          
-          extensibilityElement.setEnclosingDefinition(getEnclosingDefinition());
-          extensibilityElement.setElement(child);
-          getEExtensibilityElements().add(extensibilityElement);
-    }
-  }
-  
-  private boolean useExtensionFactories()
-  {
-  	// Use extension factories by default.
-    return getEnclosingDefinition() == null ? 
-      true : 
-      ((DefinitionImpl)getEnclosingDefinition()).getUseExtensionFactories();
-  }
-  
-} //ExtensibleElementImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/FaultImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/FaultImpl.java
deleted file mode 100644
index 3fb46044c..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/FaultImpl.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Fault</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class FaultImpl extends MessageReferenceImpl implements Fault
-{
-  /**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected FaultImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return WSDLPackage.eINSTANCE.getFault();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Message getMessage()
-  {
-    return getEMessage();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setMessage(javax.wsdl.Message message)
-  {
-    setEMessage((Message) message);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.FAULT__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case WSDLPackage.FAULT__ELEMENT:
-        return getElement();
-      case WSDLPackage.FAULT__NAME:
-        return getName();
-      case WSDLPackage.FAULT__EMESSAGE:
-        if (resolve) return getEMessage();
-        return basicGetEMessage();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.FAULT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case WSDLPackage.FAULT__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case WSDLPackage.FAULT__NAME:
-        setName((String)newValue);
-        return;
-      case WSDLPackage.FAULT__EMESSAGE:
-        setEMessage((org.eclipse.wst.wsdl.Message)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.FAULT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.FAULT__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.FAULT__NAME:
-        setName(NAME_EDEFAULT);
-        return;
-      case WSDLPackage.FAULT__EMESSAGE:
-        setEMessage((org.eclipse.wst.wsdl.Message)null);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.FAULT__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case WSDLPackage.FAULT__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case WSDLPackage.FAULT__NAME:
-        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-      case WSDLPackage.FAULT__EMESSAGE:
-        return eMessage != null;
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  public Element createElement()
-  {
-    Element newElement = createElement(WSDLConstants.FAULT);
-    setElement(newElement);
-    return newElement;
-  }
-} //FaultImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ImportImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ImportImpl.java
deleted file mode 100644
index 72ad9eb7f..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ImportImpl.java
+++ /dev/null
@@ -1,592 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.internal.util.WSDLModelLocator;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.util.XSDResourceImpl;
-import org.w3c.dom.Element;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Import</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.impl.ImportImpl#getNamespaceURI <em>Namespace URI</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.ImportImpl#getLocationURI <em>Location URI</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.ImportImpl#getEDefinition <em>EDefinition</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.ImportImpl#getESchema <em>ESchema</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ImportImpl extends WSDLElementImpl implements Import
-{
-  /**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  protected boolean resolved;
-
-  /**
-   * The default value of the '{@link #getNamespaceURI() <em>Namespace URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getNamespaceURI()
-   * @generated
-   * @ordered
-   */
-  protected static final String NAMESPACE_URI_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getNamespaceURI() <em>Namespace URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getNamespaceURI()
-   * @generated
-   * @ordered
-   */
-  protected String namespaceURI = NAMESPACE_URI_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getLocationURI() <em>Location URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getLocationURI()
-   * @generated
-   * @ordered
-   */
-  protected static final String LOCATION_URI_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getLocationURI() <em>Location URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getLocationURI()
-   * @generated
-   * @ordered
-   */
-  protected String locationURI = LOCATION_URI_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getEDefinition() <em>EDefinition</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEDefinition()
-   * @generated
-   * @ordered
-   */
-  protected Definition eDefinition = null;
-
-  /**
-   * The cached value of the '{@link #getESchema() <em>ESchema</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getESchema()
-   * @generated
-   * @ordered
-   */
-  protected XSDSchema eSchema = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected ImportImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return WSDLPackage.eINSTANCE.getImport();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getNamespaceURI()
-  {
-    return namespaceURI;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setNamespaceURI(String newNamespaceURI)
-  {
-    String oldNamespaceURI = namespaceURI;
-    namespaceURI = newNamespaceURI;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.IMPORT__NAMESPACE_URI, oldNamespaceURI, namespaceURI));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getLocationURI()
-  {
-    return locationURI;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setLocationURI(String newLocationURI)
-  {
-    String oldLocationURI = locationURI;
-    locationURI = newLocationURI;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.IMPORT__LOCATION_URI, oldLocationURI, locationURI));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Definition getEDefinition()
-  {
-    if (eDefinition != null && eDefinition.eIsProxy())
-    {
-      Definition oldEDefinition = eDefinition;
-      eDefinition = (Definition)eResolveProxy((InternalEObject)eDefinition);
-      if (eDefinition != oldEDefinition)
-      {
-        if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, WSDLPackage.IMPORT__EDEFINITION, oldEDefinition, eDefinition));
-      }
-    }
-    return eDefinition;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Definition basicGetEDefinition()
-  {
-    return eDefinition;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setEDefinition(Definition newEDefinition)
-  {
-    Definition oldEDefinition = eDefinition;
-    eDefinition = newEDefinition;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.IMPORT__EDEFINITION, oldEDefinition, eDefinition));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public XSDSchema getESchema()
-  {
-    if (eSchema != null && eSchema.eIsProxy())
-    {
-      XSDSchema oldESchema = eSchema;
-      eSchema = (XSDSchema)eResolveProxy((InternalEObject)eSchema);
-      if (eSchema != oldESchema)
-      {
-        if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, WSDLPackage.IMPORT__ESCHEMA, oldESchema, eSchema));
-      }
-    }
-    return eSchema;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public XSDSchema basicGetESchema()
-  {
-    return eSchema;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setESchema(XSDSchema newESchema)
-  {
-    XSDSchema oldESchema = eSchema;
-    eSchema = newESchema;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.IMPORT__ESCHEMA, oldESchema, eSchema));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public XSDSchema getSchema()
-  {
-    return getESchema();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setSchema(XSDSchema schema)
-  {
-    setESchema(schema);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.IMPORT__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case WSDLPackage.IMPORT__ELEMENT:
-        return getElement();
-      case WSDLPackage.IMPORT__NAMESPACE_URI:
-        return getNamespaceURI();
-      case WSDLPackage.IMPORT__LOCATION_URI:
-        return getLocationURI();
-      case WSDLPackage.IMPORT__EDEFINITION:
-        if (resolve) return getEDefinition();
-        return basicGetEDefinition();
-      case WSDLPackage.IMPORT__ESCHEMA:
-        if (resolve) return getESchema();
-        return basicGetESchema();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.IMPORT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case WSDLPackage.IMPORT__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case WSDLPackage.IMPORT__NAMESPACE_URI:
-        setNamespaceURI((String)newValue);
-        return;
-      case WSDLPackage.IMPORT__LOCATION_URI:
-        setLocationURI((String)newValue);
-        return;
-      case WSDLPackage.IMPORT__EDEFINITION:
-        setEDefinition((Definition)newValue);
-        return;
-      case WSDLPackage.IMPORT__ESCHEMA:
-        setESchema((XSDSchema)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.IMPORT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.IMPORT__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.IMPORT__NAMESPACE_URI:
-        setNamespaceURI(NAMESPACE_URI_EDEFAULT);
-        return;
-      case WSDLPackage.IMPORT__LOCATION_URI:
-        setLocationURI(LOCATION_URI_EDEFAULT);
-        return;
-      case WSDLPackage.IMPORT__EDEFINITION:
-        setEDefinition((Definition)null);
-        return;
-      case WSDLPackage.IMPORT__ESCHEMA:
-        setESchema((XSDSchema)null);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.IMPORT__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case WSDLPackage.IMPORT__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case WSDLPackage.IMPORT__NAMESPACE_URI:
-        return NAMESPACE_URI_EDEFAULT == null ? namespaceURI != null : !NAMESPACE_URI_EDEFAULT.equals(namespaceURI);
-      case WSDLPackage.IMPORT__LOCATION_URI:
-        return LOCATION_URI_EDEFAULT == null ? locationURI != null : !LOCATION_URI_EDEFAULT.equals(locationURI);
-      case WSDLPackage.IMPORT__EDEFINITION:
-        return eDefinition != null;
-      case WSDLPackage.IMPORT__ESCHEMA:
-        return eSchema != null;
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (namespaceURI: ");
-    result.append(namespaceURI);
-    result.append(", locationURI: ");
-    result.append(locationURI);
-    result.append(')');
-    return result.toString();
-  }
-
-  /**
-   * @see Import#getDefinition()
-   */
-  public javax.wsdl.Definition getDefinition()
-  {
-    return getEDefinition();
-  }
-
-  /**
-   * @see Import#setDefinition(Definition)
-   */
-  public void setDefinition(javax.wsdl.Definition definition)
-  {
-    setEDefinition((org.eclipse.wst.wsdl.Definition) definition);
-  }
-
-  //
-  // Reconcile methods
-  //
-  public void reconcileAttributes(Element changedElement)
-  {
-    setNamespaceURI(WSDLConstants.getAttribute(changedElement, WSDLConstants.NAMESPACE_ATTRIBUTE));
-    setLocationURI(WSDLConstants.getAttribute(changedElement, WSDLConstants.LOCATION_ATTRIBUTE));
-  }
-
-  //
-  // For reconciliation: Model -> DOM
-  //
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-    // We need to set this boolean to false because the Import may point to a different location.
-    // So we need we should view this import as unresolved.
-    resolved = false;
-    
-    if (isReconciling)
-      return;
-
-    super.changeAttribute(eAttribute);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eAttribute == null || eAttribute == WSDLPackage.eINSTANCE.getImport_NamespaceURI())
-        niceSetAttribute(theElement, WSDLConstants.NAMESPACE_ATTRIBUTE, getNamespaceURI());
-
-      if (eAttribute == null || eAttribute == WSDLPackage.eINSTANCE.getImport_LocationURI())
-        niceSetAttribute(theElement, WSDLConstants.LOCATION_ATTRIBUTE, getLocationURI());
-    }
-  }
-
-  public Element createElement()
-  {
-    Element newElement = createElement(WSDLConstants.IMPORT);
-    setElement(newElement);
-    return newElement;
-  }
-
-  public void importDefinitionOrSchema()
-  {
-    resolve(getNamespaceURI(), getLocationURI());
-  }
-
-  protected void resolve(String namespace, String location)
-  {
-    if (!resolved)
-    {
-      Definition definition = getEnclosingDefinition();
-      if (definition != null && definition.getDocumentBaseURI() != null)
-      {
-        Resource resource = definition.eResource();
-        if (resource != null)
-        {
-          ResourceSet resourceSet = resource.getResourceSet();
-          if (resourceSet != null)
-          {
-            if (namespace == null)
-            {
-              namespace = definition.getTargetNamespace();
-            }
-
-            String resolvedLocation = resolveLocation(definition, namespace, location);
-
-            URI uri = URI.createURI(resolvedLocation);
-            Resource resolvedResource = resourceSet.getResource(uri, false);
-            if (resolvedResource == null)
-            {
-              try
-              {
-                InputStream inputStream = resourceSet.getURIConverter().createInputStream(uri);
-                resolvedResource = resourceSet.createResource(uri);
-                resolvedResource.load(inputStream, resourceSet.getLoadOptions());
-              }
-              catch (IOException exception)
-              {
-                // It is generally not an error to fail to resolve.
-                // If a resource is actually created, 
-                // which happens only when we can create an input stream,
-                // then it's an error if it's not a good wsdl or schema
-              }
-            }
-
-            if (resolvedResource != null)
-            {
-              if (resolvedResource instanceof WSDLResourceImpl)
-              {
-                eDefinition = ((WSDLResourceImpl) resolvedResource).getDefinition();
-              }
-              else if (resolvedResource instanceof XSDResourceImpl)
-              {
-                eSchema = ((XSDResourceImpl) resolvedResource).getSchema();
-              }
-              else
-              {
-                eDefinition = WSDLFactory.eINSTANCE.createDefinition();
-              }
-            }
-            resolved = true;
-          }
-        }
-      }
-    }
-  }
-
-  protected String resolveLocation(Definition definition, String namespace, String schemaLocation)
-  {
-    String result = null;
-    WSDLModelLocator locator = (WSDLModelLocator)EcoreUtil.getRegisteredAdapter(definition.eResource(), WSDLModelLocator.class);
-    if (locator != null)
-    {
-      result = locator.resolveURI(definition.getDocumentBaseURI(), namespace, schemaLocation);
-    }
-    else
-    {
-      // TODO... there's some default resolving we'll need to do here
-      // see XSDSchemaDirective
-      URI baseLocationURI = createURI(definition.getDocumentBaseURI());
-      URI locationURI = URI.createURI(schemaLocation);
-      return locationURI.resolve(baseLocationURI).toString();
-    }  
-    return result;
-  }
-  
-  //TODO... push down to EMF
-  private static URI createURI(String uriString)
-  {
-    if (hasProtocol(uriString))
-       return URI.createURI(uriString);
-    else
-       return URI.createFileURI(uriString);
-  }
-
-  //TODO... push down to EMF  
-  private static boolean hasProtocol(String uri)
-  {
-    boolean result = false;     
-    if (uri != null)
-    {
-      int index = uri.indexOf(":");
-      if (index != -1 && index > 2) // assume protocol with be length 3 so that the'C' in 'C:/' is not interpreted as a protocol
-      {
-        result = true;
-      }
-    }
-    return result;
-  }    
-} //ImportImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/InputImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/InputImpl.java
deleted file mode 100644
index d5aaa7cc6..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/InputImpl.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Input</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class InputImpl extends MessageReferenceImpl implements Input
-{
-  /**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected InputImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return WSDLPackage.eINSTANCE.getInput();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Message getMessage()
-  {
-    return getEMessage();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setMessage(javax.wsdl.Message message)
-  {
-    setEMessage((Message) message);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.INPUT__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case WSDLPackage.INPUT__ELEMENT:
-        return getElement();
-      case WSDLPackage.INPUT__NAME:
-        return getName();
-      case WSDLPackage.INPUT__EMESSAGE:
-        if (resolve) return getEMessage();
-        return basicGetEMessage();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.INPUT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case WSDLPackage.INPUT__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case WSDLPackage.INPUT__NAME:
-        setName((String)newValue);
-        return;
-      case WSDLPackage.INPUT__EMESSAGE:
-        setEMessage((org.eclipse.wst.wsdl.Message)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.INPUT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.INPUT__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.INPUT__NAME:
-        setName(NAME_EDEFAULT);
-        return;
-      case WSDLPackage.INPUT__EMESSAGE:
-        setEMessage((org.eclipse.wst.wsdl.Message)null);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.INPUT__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case WSDLPackage.INPUT__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case WSDLPackage.INPUT__NAME:
-        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-      case WSDLPackage.INPUT__EMESSAGE:
-        return eMessage != null;
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  public Element createElement()
-  {
-    Element newElement = createElement(WSDLConstants.INPUT);
-    setElement(newElement);
-    return newElement;
-  }
-} //InputImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/MessageImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/MessageImpl.java
deleted file mode 100644
index ed6a0cf4d..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/MessageImpl.java
+++ /dev/null
@@ -1,617 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.internal.util.WSDLUtil;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Message</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.impl.MessageImpl#getQName <em>QName</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.MessageImpl#isUndefined <em>Undefined</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.MessageImpl#isProxy <em>Proxy</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.MessageImpl#getResourceURI <em>Resource URI</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.MessageImpl#getEParts <em>EParts</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class MessageImpl extends WSDLElementImpl implements Message
-{
-  /**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * The default value of the '{@link #getQName() <em>QName</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getQName()
-   * @generated
-   * @ordered
-   */
-  protected static final QName QNAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getQName() <em>QName</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getQName()
-   * @generated
-   * @ordered
-   */
-  protected QName qName = QNAME_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #isUndefined() <em>Undefined</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isUndefined()
-   * @generated
-   * @ordered
-   */
-  protected static final boolean UNDEFINED_EDEFAULT = false;
-
-  /**
-   * The cached value of the '{@link #isUndefined() <em>Undefined</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isUndefined()
-   * @generated
-   * @ordered
-   */
-  protected boolean undefined = UNDEFINED_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #isProxy() <em>Proxy</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isProxy()
-   * @generated
-   * @ordered
-   */
-  protected static final boolean PROXY_EDEFAULT = false;
-
-  /**
-   * The cached value of the '{@link #isProxy() <em>Proxy</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isProxy()
-   * @generated
-   * @ordered
-   */
-  protected boolean proxy = PROXY_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getResourceURI() <em>Resource URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getResourceURI()
-   * @generated
-   * @ordered
-   */
-  protected static final String RESOURCE_URI_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getResourceURI() <em>Resource URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getResourceURI()
-   * @generated
-   * @ordered
-   */
-  protected String resourceURI = RESOURCE_URI_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getEParts() <em>EParts</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEParts()
-   * @generated
-   * @ordered
-   */
-  protected EList eParts = null;
-
-  private Map parts;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected MessageImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return WSDLPackage.eINSTANCE.getMessage();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public QName getQName()
-  {
-    return qName;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setQName(QName newQName)
-  {
-    QName oldQName = qName;
-    qName = newQName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.MESSAGE__QNAME, oldQName, qName));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isUndefined()
-  {
-    return undefined;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setUndefined(boolean newUndefined)
-  {
-    boolean oldUndefined = undefined;
-    undefined = newUndefined;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.MESSAGE__UNDEFINED, oldUndefined, undefined));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isProxy()
-  {
-    return proxy;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setProxy(boolean newProxy)
-  {
-    boolean oldProxy = proxy;
-    proxy = newProxy;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.MESSAGE__PROXY, oldProxy, proxy));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getResourceURI()
-  {
-    return resourceURI;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setResourceURI(String newResourceURI)
-  {
-    String oldResourceURI = resourceURI;
-    resourceURI = newResourceURI;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.MESSAGE__RESOURCE_URI, oldResourceURI, resourceURI));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList getEParts()
-  {
-    if (eParts == null)
-    {
-      eParts = new EObjectContainmentEList(Part.class, this, WSDLPackage.MESSAGE__EPARTS);
-    }
-    return eParts;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Add a part to this message.
-   * @param part the part to be added
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void addPart(javax.wsdl.Part part)
-  {
-    getEParts().add((Part)part);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Get the specified part.
-   * @param name the name of the desired part.
-   * @return the corresponding part, or null if there wasn't
-   * any matching part
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Part getPart(String name)
-  {
-    Part result = null;
-    for (Iterator i = getEParts().iterator(); i.hasNext();)
-    {
-      Part part = (Part) i.next();
-      if (name.equals(part.getName()))
-      {
-        result = part;
-        break;
-      }
-    }
-    return result;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Get all the parts defined here.
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Map getParts()
-  {
-    HashMap hashMap = new HashMap();
-    for (Iterator i = getEParts().iterator(); i.hasNext();)
-    {
-      Part part = (Part) i.next();
-      hashMap.put(part.getName(), part);
-    }
-    return hashMap;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public List getOrderedParts(List partOrder)
-  {
-    List orderedParts = new Vector();
-    if (partOrder == null)
-    {
-      orderedParts.addAll(getEParts());
-      return orderedParts;
-    }
-
-    Iterator partNameIterator = partOrder.iterator();
-    while (partNameIterator.hasNext())
-    {
-      String partName = (String) partNameIterator.next();
-      javax.wsdl.Part part = getPart(partName);
-      if (part != null)
-        orderedParts.add(part);
-    }
-
-    return orderedParts;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs)
-  {
-    if (featureID >= 0)
-    {
-      switch (eDerivedStructuralFeatureID(featureID, baseClass))
-      {
-        case WSDLPackage.MESSAGE__EPARTS:
-          return ((InternalEList)getEParts()).basicRemove(otherEnd, msgs);
-        default:
-          return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-      }
-    }
-    return eBasicSetContainer(null, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.MESSAGE__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case WSDLPackage.MESSAGE__ELEMENT:
-        return getElement();
-      case WSDLPackage.MESSAGE__QNAME:
-        return getQName();
-      case WSDLPackage.MESSAGE__UNDEFINED:
-        return isUndefined() ? Boolean.TRUE : Boolean.FALSE;
-      case WSDLPackage.MESSAGE__PROXY:
-        return isProxy() ? Boolean.TRUE : Boolean.FALSE;
-      case WSDLPackage.MESSAGE__RESOURCE_URI:
-        return getResourceURI();
-      case WSDLPackage.MESSAGE__EPARTS:
-        return getEParts();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.MESSAGE__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case WSDLPackage.MESSAGE__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case WSDLPackage.MESSAGE__QNAME:
-        setQName((QName)newValue);
-        return;
-      case WSDLPackage.MESSAGE__UNDEFINED:
-        setUndefined(((Boolean)newValue).booleanValue());
-        return;
-      case WSDLPackage.MESSAGE__PROXY:
-        setProxy(((Boolean)newValue).booleanValue());
-        return;
-      case WSDLPackage.MESSAGE__RESOURCE_URI:
-        setResourceURI((String)newValue);
-        return;
-      case WSDLPackage.MESSAGE__EPARTS:
-        getEParts().clear();
-        getEParts().addAll((Collection)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.MESSAGE__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.MESSAGE__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.MESSAGE__QNAME:
-        setQName(QNAME_EDEFAULT);
-        return;
-      case WSDLPackage.MESSAGE__UNDEFINED:
-        setUndefined(UNDEFINED_EDEFAULT);
-        return;
-      case WSDLPackage.MESSAGE__PROXY:
-        setProxy(PROXY_EDEFAULT);
-        return;
-      case WSDLPackage.MESSAGE__RESOURCE_URI:
-        setResourceURI(RESOURCE_URI_EDEFAULT);
-        return;
-      case WSDLPackage.MESSAGE__EPARTS:
-        getEParts().clear();
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.MESSAGE__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case WSDLPackage.MESSAGE__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case WSDLPackage.MESSAGE__QNAME:
-        return QNAME_EDEFAULT == null ? qName != null : !QNAME_EDEFAULT.equals(qName);
-      case WSDLPackage.MESSAGE__UNDEFINED:
-        return undefined != UNDEFINED_EDEFAULT;
-      case WSDLPackage.MESSAGE__PROXY:
-        return proxy != PROXY_EDEFAULT;
-      case WSDLPackage.MESSAGE__RESOURCE_URI:
-        return RESOURCE_URI_EDEFAULT == null ? resourceURI != null : !RESOURCE_URI_EDEFAULT.equals(resourceURI);
-      case WSDLPackage.MESSAGE__EPARTS:
-        return eParts != null && !eParts.isEmpty();
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (qName: ");
-    result.append(qName);
-    result.append(", undefined: ");
-    result.append(undefined);
-    result.append(", proxy: ");
-    result.append(proxy);
-    result.append(", resourceURI: ");
-    result.append(resourceURI);
-    result.append(')');
-    return result.toString();
-  }
-
-  //
-  // Reconcile methods
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-    Definition definition = getEnclosingDefinition();
-    String newName = null;
-    if (changedElement.hasAttribute("name"))
-    {
-      newName = changedElement.getAttribute("name");
-    }
-    if (newName != null)
-    {
-      QName qname = new QName(definition.getTargetNamespace(), newName);
-      setQName(qname);
-    }
-  }
-
-  public void handleUnreconciledElement(Element child, Collection remainingModelObjects)
-  {
-    switch (WSDLUtil.getInstance().getWSDLType(child))
-    {
-      case WSDLConstants.PART :
-        {
-          Part part = ((WSDLPackage) EPackage.Registry.INSTANCE.getEPackage(WSDLPackage.eNS_URI)).getWSDLFactory().createPart();
-          part.setEnclosingDefinition(getEnclosingDefinition());
-          part.setElement(child);
-          getEParts().add(part);
-          break;
-        }
-    }
-  }
-
-  protected void handleReconciliation(Collection remainingModelObjects)
-  {
-    for (Iterator i = remainingModelObjects.iterator(); i.hasNext();)
-    {
-      remove(this, i.next());
-    }
-  }
-  
-  protected void remove(Object component, Object modelObject)
-  {
-    Message message = (Message) component;
-    if (modelObject instanceof Part)
-    {
-      message.getEParts().clear();
-    }
-  }
-
-  //
-  // For reconciliation: Model -> DOM
-  //
-
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeAttribute(eAttribute);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eAttribute == null || eAttribute == WSDLPackage.eINSTANCE.getMessage_QName())
-        niceSetAttribute(theElement, WSDLConstants.NAME_ATTRIBUTE, getQName().getLocalPart());
-    }
-  }
-
-  public Element createElement()
-  {
-    Element newElement = createElement(WSDLConstants.MESSAGE);
-    setElement(newElement);
-
-    Iterator iterator = getEParts().iterator();
-    while (iterator.hasNext())
-    {
-      Object obj = iterator.next();
-      if (obj instanceof Part)
-      {
-        Part part = (Part) obj;
-        Element child = ((PartImpl) part).createElement();
-        newElement.appendChild(child);
-      }
-    }
-    return newElement;
-  }
-} //MessageImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/MessageReferenceImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/MessageReferenceImpl.java
deleted file mode 100644
index 96a7b9004..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/MessageReferenceImpl.java
+++ /dev/null
@@ -1,344 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl;
-
-import java.util.Collection;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.MessageReference;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Message Reference</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.impl.MessageReferenceImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.MessageReferenceImpl#getEMessage <em>EMessage</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class MessageReferenceImpl extends WSDLElementImpl implements MessageReference
-{
-  /**
-   * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected static final String NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected String name = NAME_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getEMessage() <em>EMessage</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEMessage()
-   * @generated
-   * @ordered
-   */
-  protected Message eMessage = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected MessageReferenceImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return WSDLPackage.eINSTANCE.getMessageReference();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getName()
-  {
-    return name;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setName(String newName)
-  {
-    String oldName = name;
-    name = newName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.MESSAGE_REFERENCE__NAME, oldName, name));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Message getEMessage()
-  {
-    if (eMessage != null && eMessage.eIsProxy())
-    {
-      Message oldEMessage = eMessage;
-      eMessage = (Message)eResolveProxy((InternalEObject)eMessage);
-      if (eMessage != oldEMessage)
-      {
-        if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, WSDLPackage.MESSAGE_REFERENCE__EMESSAGE, oldEMessage, eMessage));
-      }
-    }
-    return eMessage;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Message basicGetEMessage()
-  {
-    return eMessage;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setEMessage(Message newEMessage)
-  {
-    Message oldEMessage = eMessage;
-    eMessage = newEMessage;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.MESSAGE_REFERENCE__EMESSAGE, oldEMessage, eMessage));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.MESSAGE_REFERENCE__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case WSDLPackage.MESSAGE_REFERENCE__ELEMENT:
-        return getElement();
-      case WSDLPackage.MESSAGE_REFERENCE__NAME:
-        return getName();
-      case WSDLPackage.MESSAGE_REFERENCE__EMESSAGE:
-        if (resolve) return getEMessage();
-        return basicGetEMessage();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.MESSAGE_REFERENCE__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case WSDLPackage.MESSAGE_REFERENCE__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case WSDLPackage.MESSAGE_REFERENCE__NAME:
-        setName((String)newValue);
-        return;
-      case WSDLPackage.MESSAGE_REFERENCE__EMESSAGE:
-        setEMessage((Message)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.MESSAGE_REFERENCE__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.MESSAGE_REFERENCE__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.MESSAGE_REFERENCE__NAME:
-        setName(NAME_EDEFAULT);
-        return;
-      case WSDLPackage.MESSAGE_REFERENCE__EMESSAGE:
-        setEMessage((Message)null);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.MESSAGE_REFERENCE__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case WSDLPackage.MESSAGE_REFERENCE__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case WSDLPackage.MESSAGE_REFERENCE__NAME:
-        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-      case WSDLPackage.MESSAGE_REFERENCE__EMESSAGE:
-        return eMessage != null;
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (name: ");
-    result.append(name);
-    result.append(')');
-    return result.toString();
-  }
-
-  //
-  // Reconciliation methods
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-    setName(WSDLConstants.getAttribute(changedElement, "name"));
-    reconcileReferences(false);
-  }
-
-  public void handleUnreconciledElement(Element child, Collection remainingModelObjects)
-  {
-  }
-
-  protected void handleReconciliation(Collection remainingModelObjects)
-  {
-  }
-
-  //
-  // For reconciliation: Model -> DOM
-  //
-
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeAttribute(eAttribute);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eAttribute == null || eAttribute == WSDLPackage.eINSTANCE.getMessageReference_Name())
-        niceSetAttribute(theElement, WSDLConstants.NAME_ATTRIBUTE, getName());
-    }
-  }
-
-  protected void changeReference(EReference eReference)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeReference(eReference);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eReference == null || eReference == WSDLPackage.eINSTANCE.getMessageReference_EMessage())
-      {
-        Message message = getEMessage();
-        if (message != null)
-        {
-          QName qName = message.getQName();
-          niceSetAttributeURIValue(theElement, WSDLConstants.MESSAGE_ATTRIBUTE, qName.getNamespaceURI() + "#" + qName.getLocalPart());
-        }
-      }
-    }
-  }
-
-  public void reconcileReferences(boolean deep)
-  {
-    if (element != null)
-    {
-      Definition definition = getEnclosingDefinition();      
-      QName messageQName = createQName(definition, element.getAttribute("message"));
-      Message newMessage = messageQName != null ? (Message) definition.getMessage(messageQName) : null;
-      if (newMessage != getEMessage())
-      {
-        setEMessage(newMessage);
-      }
-    }
-    super.reconcileReferences(deep);
-  }
-} //MessageReferenceImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/NamespaceImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/NamespaceImpl.java
deleted file mode 100644
index e0c28a954..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/NamespaceImpl.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.wst.wsdl.Namespace;
-import org.eclipse.wst.wsdl.WSDLPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Namespace</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.impl.NamespaceImpl#getURI <em>URI</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.NamespaceImpl#getPrefix <em>Prefix</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class NamespaceImpl extends EObjectImpl implements Namespace
-{
-  /**
-   * The default value of the '{@link #getURI() <em>URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getURI()
-   * @generated
-   * @ordered
-   */
-  protected static final String URI_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getURI() <em>URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getURI()
-   * @generated
-   * @ordered
-   */
-  protected String uri = URI_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getPrefix() <em>Prefix</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getPrefix()
-   * @generated
-   * @ordered
-   */
-  protected static final String PREFIX_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getPrefix() <em>Prefix</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getPrefix()
-   * @generated
-   * @ordered
-   */
-  protected String prefix = PREFIX_EDEFAULT;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected NamespaceImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return WSDLPackage.eINSTANCE.getNamespace();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getURI()
-  {
-    return uri;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setURI(String newURI)
-  {
-    String oldURI = uri;
-    uri = newURI;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.NAMESPACE__URI, oldURI, uri));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getPrefix()
-  {
-    return prefix;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setPrefix(String newPrefix)
-  {
-    String oldPrefix = prefix;
-    prefix = newPrefix;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.NAMESPACE__PREFIX, oldPrefix, prefix));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.NAMESPACE__URI:
-        return getURI();
-      case WSDLPackage.NAMESPACE__PREFIX:
-        return getPrefix();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.NAMESPACE__URI:
-        setURI((String)newValue);
-        return;
-      case WSDLPackage.NAMESPACE__PREFIX:
-        setPrefix((String)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.NAMESPACE__URI:
-        setURI(URI_EDEFAULT);
-        return;
-      case WSDLPackage.NAMESPACE__PREFIX:
-        setPrefix(PREFIX_EDEFAULT);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.NAMESPACE__URI:
-        return URI_EDEFAULT == null ? uri != null : !URI_EDEFAULT.equals(uri);
-      case WSDLPackage.NAMESPACE__PREFIX:
-        return PREFIX_EDEFAULT == null ? prefix != null : !PREFIX_EDEFAULT.equals(prefix);
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (URI: ");
-    result.append(uri);
-    result.append(", prefix: ");
-    result.append(prefix);
-    result.append(')');
-    return result.toString();
-  }
-
-} //NamespaceImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/OperationImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/OperationImpl.java
deleted file mode 100644
index b0235fce2..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/OperationImpl.java
+++ /dev/null
@@ -1,1199 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.wsdl.OperationType;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.internal.util.WSDLUtil;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Operation</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.impl.OperationImpl#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.OperationImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.OperationImpl#isUndefined <em>Undefined</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.OperationImpl#isProxy <em>Proxy</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.OperationImpl#getResourceURI <em>Resource URI</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.OperationImpl#getEInput <em>EInput</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.OperationImpl#getEOutput <em>EOutput</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.OperationImpl#getEFaults <em>EFaults</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.OperationImpl#getEParameterOrdering <em>EParameter Ordering</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class OperationImpl extends WSDLElementImpl implements Operation
-{
-  /**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getStyle()
-   * @generated
-   * @ordered
-   */
-  protected static final OperationType STYLE_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getStyle()
-   * @generated
-   * @ordered
-   */
-  protected OperationType style = STYLE_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected static final String NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected String name = NAME_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #isUndefined() <em>Undefined</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isUndefined()
-   * @generated
-   * @ordered
-   */
-  protected static final boolean UNDEFINED_EDEFAULT = false;
-
-  /**
-   * The cached value of the '{@link #isUndefined() <em>Undefined</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isUndefined()
-   * @generated
-   * @ordered
-   */
-  protected boolean undefined = UNDEFINED_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #isProxy() <em>Proxy</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isProxy()
-   * @generated
-   * @ordered
-   */
-  protected static final boolean PROXY_EDEFAULT = false;
-
-  /**
-   * The cached value of the '{@link #isProxy() <em>Proxy</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isProxy()
-   * @generated
-   * @ordered
-   */
-  protected boolean proxy = PROXY_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getResourceURI() <em>Resource URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getResourceURI()
-   * @generated
-   * @ordered
-   */
-  protected static final String RESOURCE_URI_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getResourceURI() <em>Resource URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getResourceURI()
-   * @generated
-   * @ordered
-   */
-  protected String resourceURI = RESOURCE_URI_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getEInput() <em>EInput</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEInput()
-   * @generated
-   * @ordered
-   */
-  protected Input eInput = null;
-
-  /**
-   * The cached value of the '{@link #getEOutput() <em>EOutput</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEOutput()
-   * @generated
-   * @ordered
-   */
-  protected Output eOutput = null;
-
-  /**
-   * The cached value of the '{@link #getEFaults() <em>EFaults</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEFaults()
-   * @generated
-   * @ordered
-   */
-  protected EList eFaults = null;
-
-  /**
-   * The cached value of the '{@link #getEParameterOrdering() <em>EParameter Ordering</em>}' reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEParameterOrdering()
-   * @generated
-   * @ordered
-   */
-  protected EList eParameterOrdering = null; // a list of parts (EMF)
-  
-  private List parameterOrdering = null; // a list of part names (WSDL4J)
-
-  private Map faults;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected OperationImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return WSDLPackage.eINSTANCE.getOperation();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public OperationType getStyle()
-  {
-    if (style == null)
-      style = deduceOperationType(getElement());
-    
-    // The value of style is updated when
-    // 1) the WSDL is loaded for the first time,
-    // 2) the setStyle() method is called, and
-    // 3) the children of the Operation (DOM) element are manipulated.
-    return style;
-  }
-
-  private OperationType deduceOperationType(Element operation)
-  {
-    if (operation == null)
-      return null;
-       
-  	int state = 0;
-  	int messageRefType = -1;
-  	Node child = null;
-  	NodeList children = operation.getChildNodes();
-  	
-    for (int i=0; i<children.getLength(); i++)
-    {
-      child = children.item(i);
-      if (child.getNodeType() != Node.ELEMENT_NODE)
-        continue;
-      
-      messageRefType = WSDLUtil.getInstance().getWSDLType((Element)child);
-      switch (state)
-	  {
-        case 0: // initial state     
-          if (WSDLConstants.INPUT == messageRefType)
-            state = 1; 
-          else if (WSDLConstants.OUTPUT == messageRefType)
-            state = 2; 
-          else if (WSDLConstants.DOCUMENTATION == messageRefType)
-          	state = 0;
-          else
-            state = -1; // cannot happen
-          break;
-        case 1: // one-way or request-response
-          if (WSDLConstants.FAULT == messageRefType)
-            state = 11; // one-way
-          else if (WSDLConstants.OUTPUT == messageRefType)
-            state = 3; // request-response
-          else
-            state = -1; // cannot happen
-          break;
-        case 11: // one-way
-          if (WSDLConstants.FAULT == messageRefType)
-            state = 11; // one-way
-          else
-            state = -1; // cannot happen
-          break;
-        case 2: // solicit-response or notification
-          if (WSDLConstants.INPUT == messageRefType)
-            state = 4; // solicit-response
-          else if (WSDLConstants.FAULT == messageRefType)
-            state = 21; // notification
-          else
-            state = -1; // cannot happen
-          break;
-        case 21: // notification
-          if (WSDLConstants.FAULT == messageRefType)
-            state = 21; // notification
-          else
-            state = -1; // cannot happen
-          break;
-        case 3: // request-response 
-          if (WSDLConstants.FAULT == messageRefType)
-            state = 3;
-          else
-            state = -1; // cannot happen
-          break;
-        case 4: // solicit-response
-          if (WSDLConstants.FAULT == messageRefType)
-            state = 4;
-          else
-            state = -1; // cannot happen
-          break;
-        default: // cannot happen (-1)
-          break;
-	  }
-    }
-    
-    OperationType opType = null;
-    switch (state)
-	{
-      case 1:
-      case 11:
-      	opType = OperationType.ONE_WAY;
-        break;
-      case 2:
-      case 21:
-      	opType = OperationType.NOTIFICATION;
-        break;
-      case 3:
-      	opType = OperationType.REQUEST_RESPONSE;
-        break;
-      case 4:
-      	opType = OperationType.SOLICIT_RESPONSE;
-        break;
-      default: // invalid
-        break;
-	}
-    return opType;    
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setStyle(OperationType newStyle)
-  {
-    OperationType oldStyle = style;
-    style = newStyle;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.OPERATION__STYLE, oldStyle, style));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getName()
-  {
-    return name;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setName(String newName)
-  {
-    String oldName = name;
-    name = newName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.OPERATION__NAME, oldName, name));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isUndefined()
-  {
-    return undefined;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setUndefined(boolean newUndefined)
-  {
-    boolean oldUndefined = undefined;
-    undefined = newUndefined;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.OPERATION__UNDEFINED, oldUndefined, undefined));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isProxy()
-  {
-    return proxy;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setProxy(boolean newProxy)
-  {
-    boolean oldProxy = proxy;
-    proxy = newProxy;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.OPERATION__PROXY, oldProxy, proxy));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getResourceURI()
-  {
-    return resourceURI;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setResourceURI(String newResourceURI)
-  {
-    String oldResourceURI = resourceURI;
-    resourceURI = newResourceURI;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.OPERATION__RESOURCE_URI, oldResourceURI, resourceURI));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Input getEInput()
-  {
-    return eInput;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetEInput(Input newEInput, NotificationChain msgs)
-  {
-    Input oldEInput = eInput;
-    eInput = newEInput;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WSDLPackage.OPERATION__EINPUT, oldEInput, newEInput);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setEInput(Input newEInput)
-  {
-    if (newEInput != eInput)
-    {
-      NotificationChain msgs = null;
-      if (eInput != null)
-        msgs = ((InternalEObject)eInput).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WSDLPackage.OPERATION__EINPUT, null, msgs);
-      if (newEInput != null)
-        msgs = ((InternalEObject)newEInput).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WSDLPackage.OPERATION__EINPUT, null, msgs);
-      msgs = basicSetEInput(newEInput, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.OPERATION__EINPUT, newEInput, newEInput));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Output getEOutput()
-  {
-    return eOutput;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetEOutput(Output newEOutput, NotificationChain msgs)
-  {
-    Output oldEOutput = eOutput;
-    eOutput = newEOutput;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WSDLPackage.OPERATION__EOUTPUT, oldEOutput, newEOutput);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setEOutput(Output newEOutput)
-  {
-    if (newEOutput != eOutput)
-    {
-      NotificationChain msgs = null;
-      if (eOutput != null)
-        msgs = ((InternalEObject)eOutput).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WSDLPackage.OPERATION__EOUTPUT, null, msgs);
-      if (newEOutput != null)
-        msgs = ((InternalEObject)newEOutput).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WSDLPackage.OPERATION__EOUTPUT, null, msgs);
-      msgs = basicSetEOutput(newEOutput, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.OPERATION__EOUTPUT, newEOutput, newEOutput));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList getEFaults()
-  {
-    if (eFaults == null)
-    {
-      eFaults = new EObjectContainmentEList(Fault.class, this, WSDLPackage.OPERATION__EFAULTS);
-    }
-    return eFaults;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList getEParameterOrdering()
-  {
-    if (eParameterOrdering == null)
-    {
-      eParameterOrdering = new EObjectResolvingEList(Part.class, this, WSDLPackage.OPERATION__EPARAMETER_ORDERING);
-    }
-    return eParameterOrdering;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Add a fault message that must be associated with this
-   * operation.
-   * @param fault the new fault message
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void addFault(javax.wsdl.Fault fault)
-  {
-    getEFaults().add((Fault)fault);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Get the specified fault message.
-   * @param name the name of the desired fault message.
-   * @return the corresponding fault message, or null if there wasn't
-   * any matching message
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Fault getFault(String name)
-  {
-    Fault result = null;
-    for (Iterator i = getEFaults().iterator(); i.hasNext();)
-    {
-      Fault fault = (Fault) i.next();
-      if (name.equals(fault.getName()))
-      {
-        result = fault;
-        break;
-      }
-    }
-    return result;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Get all the fault messages associated with this operation.
-   * @return names of fault messages
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Map getFaults()
-  {
-    HashMap hashMap = new HashMap();
-    for (Iterator i = getEFaults().iterator(); i.hasNext();)
-    {
-      Fault fault = (Fault) i.next();
-      hashMap.put(fault.getName(), fault);
-    }
-    return hashMap;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Returns a collection of Part names. Note that 
-   * getParameterEOrdering() returns a collection of Parts.
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public List getParameterOrdering()
-  {
-    parameterOrdering = new ArrayList();
-    for (Iterator i = getEParameterOrdering().iterator(); i.hasNext();)
-    {
-      try
-      {
-        Part part = (Part) i.next();
-		parameterOrdering.add(part.getName());
-      }
-      catch (Exception e)
-      {
-        // TBD - handle exception
-      }
-    }
-    return parameterOrdering.isEmpty() ? null : parameterOrdering;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setParameterOrdering(List parameterOrder)
-  {
-    parameterOrdering = parameterOrder;
-    getEParameterOrdering().clear();
-    if (parameterOrder != null)
-    {
-      for (Iterator i = parameterOrder.iterator(); i.hasNext();)
-      {
-        // KB: We should be resolving parts based on the part names in parameterOrder.
-        Part part = WSDLFactory.eINSTANCE.createPart();
-        part.setName((String) i.next());
-        getEParameterOrdering().add(part);
-      }
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Input getInput()
-  {
-    return getEInput();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setInput(javax.wsdl.Input input)
-  {
-    setEInput((Input) input);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Output getOutput()
-  {
-    return getEOutput();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setOutput(javax.wsdl.Output output)
-  {
-    setEOutput((Output) output);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs)
-  {
-    if (featureID >= 0)
-    {
-      switch (eDerivedStructuralFeatureID(featureID, baseClass))
-      {
-        case WSDLPackage.OPERATION__EINPUT:
-          return basicSetEInput(null, msgs);
-        case WSDLPackage.OPERATION__EOUTPUT:
-          return basicSetEOutput(null, msgs);
-        case WSDLPackage.OPERATION__EFAULTS:
-          return ((InternalEList)getEFaults()).basicRemove(otherEnd, msgs);
-        default:
-          return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-      }
-    }
-    return eBasicSetContainer(null, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.OPERATION__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case WSDLPackage.OPERATION__ELEMENT:
-        return getElement();
-      case WSDLPackage.OPERATION__STYLE:
-        return getStyle();
-      case WSDLPackage.OPERATION__NAME:
-        return getName();
-      case WSDLPackage.OPERATION__UNDEFINED:
-        return isUndefined() ? Boolean.TRUE : Boolean.FALSE;
-      case WSDLPackage.OPERATION__PROXY:
-        return isProxy() ? Boolean.TRUE : Boolean.FALSE;
-      case WSDLPackage.OPERATION__RESOURCE_URI:
-        return getResourceURI();
-      case WSDLPackage.OPERATION__EINPUT:
-        return getEInput();
-      case WSDLPackage.OPERATION__EOUTPUT:
-        return getEOutput();
-      case WSDLPackage.OPERATION__EFAULTS:
-        return getEFaults();
-      case WSDLPackage.OPERATION__EPARAMETER_ORDERING:
-        return getEParameterOrdering();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.OPERATION__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case WSDLPackage.OPERATION__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case WSDLPackage.OPERATION__STYLE:
-        setStyle((OperationType)newValue);
-        return;
-      case WSDLPackage.OPERATION__NAME:
-        setName((String)newValue);
-        return;
-      case WSDLPackage.OPERATION__UNDEFINED:
-        setUndefined(((Boolean)newValue).booleanValue());
-        return;
-      case WSDLPackage.OPERATION__PROXY:
-        setProxy(((Boolean)newValue).booleanValue());
-        return;
-      case WSDLPackage.OPERATION__RESOURCE_URI:
-        setResourceURI((String)newValue);
-        return;
-      case WSDLPackage.OPERATION__EINPUT:
-        setEInput((Input)newValue);
-        return;
-      case WSDLPackage.OPERATION__EOUTPUT:
-        setEOutput((Output)newValue);
-        return;
-      case WSDLPackage.OPERATION__EFAULTS:
-        getEFaults().clear();
-        getEFaults().addAll((Collection)newValue);
-        return;
-      case WSDLPackage.OPERATION__EPARAMETER_ORDERING:
-        getEParameterOrdering().clear();
-        getEParameterOrdering().addAll((Collection)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.OPERATION__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.OPERATION__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.OPERATION__STYLE:
-        setStyle(STYLE_EDEFAULT);
-        return;
-      case WSDLPackage.OPERATION__NAME:
-        setName(NAME_EDEFAULT);
-        return;
-      case WSDLPackage.OPERATION__UNDEFINED:
-        setUndefined(UNDEFINED_EDEFAULT);
-        return;
-      case WSDLPackage.OPERATION__PROXY:
-        setProxy(PROXY_EDEFAULT);
-        return;
-      case WSDLPackage.OPERATION__RESOURCE_URI:
-        setResourceURI(RESOURCE_URI_EDEFAULT);
-        return;
-      case WSDLPackage.OPERATION__EINPUT:
-        setEInput((Input)null);
-        return;
-      case WSDLPackage.OPERATION__EOUTPUT:
-        setEOutput((Output)null);
-        return;
-      case WSDLPackage.OPERATION__EFAULTS:
-        getEFaults().clear();
-        return;
-      case WSDLPackage.OPERATION__EPARAMETER_ORDERING:
-        getEParameterOrdering().clear();
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.OPERATION__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case WSDLPackage.OPERATION__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case WSDLPackage.OPERATION__STYLE:
-        return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
-      case WSDLPackage.OPERATION__NAME:
-        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-      case WSDLPackage.OPERATION__UNDEFINED:
-        return undefined != UNDEFINED_EDEFAULT;
-      case WSDLPackage.OPERATION__PROXY:
-        return proxy != PROXY_EDEFAULT;
-      case WSDLPackage.OPERATION__RESOURCE_URI:
-        return RESOURCE_URI_EDEFAULT == null ? resourceURI != null : !RESOURCE_URI_EDEFAULT.equals(resourceURI);
-      case WSDLPackage.OPERATION__EINPUT:
-        return eInput != null;
-      case WSDLPackage.OPERATION__EOUTPUT:
-        return eOutput != null;
-      case WSDLPackage.OPERATION__EFAULTS:
-        return eFaults != null && !eFaults.isEmpty();
-      case WSDLPackage.OPERATION__EPARAMETER_ORDERING:
-        return eParameterOrdering != null && !eParameterOrdering.isEmpty();
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (style: ");
-    result.append(style);
-    result.append(", name: ");
-    result.append(name);
-    result.append(", undefined: ");
-    result.append(undefined);
-    result.append(", proxy: ");
-    result.append(proxy);
-    result.append(", resourceURI: ");
-    result.append(resourceURI);
-    result.append(')');
-    return result.toString();
-  }
-
-  // 
-  // Reconcile methods
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-	if (changedElement.hasAttribute("name"))
-	{
-      String name = changedElement.getAttribute("name");
-      if (name != null)
-      {
-        setName(name);
-      }
-    }  
-    
-    if (changedElement.hasAttribute("parameterOrder"))
-    {
-      String parameterOrder = changedElement.getAttribute("parameterOrder");
-      if (parameterOrder != null)
-      {
-        String[] array = parameterOrder.split(" ");
-        List l = Arrays.asList(array);
-        setParameterOrdering(l);
-      }
-    }
-
-  }
-
-  public void elementChanged(Element changedElement)
-  {
-    style = deduceOperationType(changedElement);
-    super.elementChanged(changedElement);
-  }
-  
-  public void handleUnreconciledElement(Element child, Collection remainingModelObjects)
-  {
-    Definition definition = getEnclosingDefinition();
-
-    switch (WSDLUtil.getInstance().getWSDLType(child))
-    {
-      case WSDLConstants.INPUT :
-        {
-          Input input = WSDLFactory.eINSTANCE.createInput();
-          input.setEnclosingDefinition(definition);
-          input.setElement(child);
-          setInput(input);
-          break;
-        }
-      case WSDLConstants.OUTPUT :
-        {
-          Output output = WSDLFactory.eINSTANCE.createOutput();
-          output.setEnclosingDefinition(definition);
-          output.setElement(child);
-          setOutput(output);
-          break;
-        }
-      case WSDLConstants.FAULT :
-        {
-          Fault fault = WSDLFactory.eINSTANCE.createFault();
-          fault.setEnclosingDefinition(definition);
-          fault.setElement(child);
-          addFault(fault);
-          break;
-        }
-    }
-  }
-
-  protected void handleReconciliation(Collection remainingModelObjects)
-  {
-    for (Iterator i = remainingModelObjects.iterator(); i.hasNext();)
-    {
-      remove(this, i.next());
-    }
-  }
-
-  protected void remove(Object component, Object modelObject)
-  {
-    Operation operation = (Operation) component;
-    if (modelObject instanceof Input)
-    {
-      operation.setEInput(null);
-    }
-    else if (modelObject instanceof Output)
-    {
-      operation.setEOutput(null);
-    }
-    else if (modelObject instanceof Fault)
-    {
-      operation.getEFaults().remove(modelObject);
-    }
-  }
-
-  public Collection getModelObjects(Object component)
-  {
-    Operation operation = (Operation) component;
-
-    List list = new ArrayList();
-
-    if (operation.getEInput() != null)
-    {
-      list.add(operation.getEInput());
-    }
-
-    if (operation.getEOutput() != null)
-    {
-      list.add(operation.getEOutput());
-    }
-
-    list.addAll(operation.getEFaults());
-
-    return list;
-  }
-
-  //
-  // For reconciliation: Model -> DOM
-  //
-
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeAttribute(eAttribute);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eAttribute == null || eAttribute == WSDLPackage.eINSTANCE.getOperation_Name())
-        niceSetAttribute(theElement, WSDLConstants.NAME_ATTRIBUTE, getName());
-      if (eAttribute == WSDLPackage.eINSTANCE.getOperation_Style())
-      {
-        OperationType targetType = getStyle();
-        OperationType currentType = deduceOperationType(theElement);
-        if (targetType.equals(currentType))
-          return;
-        else if ((targetType.equals(OperationType.REQUEST_RESPONSE) || targetType.equals(OperationType.SOLICIT_RESPONSE))
-                  && (currentType.equals(OperationType.REQUEST_RESPONSE) || currentType.equals(OperationType.SOLICIT_RESPONSE)))
-        	reorderChildren();
-        else
-          style = deduceOperationType(theElement); // switch back. no support for the other types
-      }
-    }
-  }
-  
-  protected void changeReference(EReference eReference)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeReference(eReference);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eReference == null || eReference == WSDLPackage.eINSTANCE.getOperation_EParameterOrdering())
-      {
-        // Build up a string of concatenated part names (parameterOrder) from eParameterOrdering.
-		  
-        Iterator parts = getEParameterOrdering().iterator();
-		Part part = null;
-		String partNames = "";
-        while (parts.hasNext())
-		{
-          part = (Part)parts.next();
-		  partNames = partNames + part.getName() + " ";
-		}
-		
-		if ((partNames = partNames.trim()).length() != 0)		
-		  // Update the element's attrubute
-		  niceSetAttribute(theElement, "parameterOrder", partNames);
-      }
-    }
-    //
-  }
-  
-  // Switch <input> and <output>
-  private void reorderChildren()
-  {
-    // Find out the positions of <input> and <output>
-    Node input = null;
-    Node output = null;
-    Node reference = null;
-    for (Node current=getElement().getFirstChild(); current!= null;current=current.getNextSibling())
-    {
-      if (current.getNodeType() == Node.ELEMENT_NODE)
-      {
-      	if (WSDLConstants.INPUT == WSDLUtil.getInstance().getWSDLType((Element)current))
-        {
-          input = current;
-          if (output != null)
-          { 
-            // cs.. for safety use current.getNextSibling() instead of nodeList.item(i+1)            
-            reference = current.getNextSibling();
-          }  
-        }
-        else if (WSDLConstants.OUTPUT == WSDLUtil.getInstance().getWSDLType((Element)current))
-        {
-          output = current;
-          if (input != null)
-          {
-            // cs.. for safety use current.getNextSibling() instead of nodeList.item(i+1)            
-            reference = current.getNextSibling();
-          }  
-        }
-      }
-    } // end for
-    
-    if (input != null && output != null)
-    {
-      Element parent = getElement();
-      if (getStyle().equals(OperationType.REQUEST_RESPONSE))
-      {
-      	// current order: <output> <input>
-        switchChildren(parent,output,input,reference);
-      }
-      else if (getStyle().equals(OperationType.SOLICIT_RESPONSE))
-      {
-        // current order: <input> <output>
-        switchChildren(parent,input,output,reference);
-      }
-    }
-  }
-  
-  private void switchChildren(Node parent, Node child1, Node child2, Node nextOfChild2)
-  {
-    // current node sequence: <child1> <child2> <nextOfChild2>
-    niceRemoveChild(parent,child2);
-    niceInsertBefore(parent,child2,child1);
-    niceRemoveChild(parent,child1);
-    niceInsertBefore(parent,child1,nextOfChild2);
-  }
-
-  public Element createElement()
-  {
-    Element newElement = createElement(WSDLConstants.OPERATION);
-    setElement(newElement);
-
-    Input input = getEInput();
-    if (input != null)
-    {
-      Element child = ((InputImpl) input).createElement();
-      newElement.appendChild(child);
-    }
-
-    Output output = getEOutput();
-    if (output != null)
-    {
-      Element child = ((OutputImpl) output).createElement();
-      newElement.appendChild(child);
-    }
-
-    Iterator iterator = getEFaults().iterator();
-    while (iterator.hasNext())
-    {
-      Fault fault = (Fault) iterator.next();
-      Element child = ((FaultImpl) fault).createElement();
-      newElement.appendChild(child);
-    }
-
-    return newElement;
-  } 
-  
-} //OperationImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/OutputImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/OutputImpl.java
deleted file mode 100644
index ea7e7a51c..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/OutputImpl.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Output</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class OutputImpl extends MessageReferenceImpl implements Output
-{
-  /**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected OutputImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return WSDLPackage.eINSTANCE.getOutput();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Message getMessage()
-  {
-    return getEMessage();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setMessage(javax.wsdl.Message message)
-  {
-    setEMessage((Message) message);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.OUTPUT__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case WSDLPackage.OUTPUT__ELEMENT:
-        return getElement();
-      case WSDLPackage.OUTPUT__NAME:
-        return getName();
-      case WSDLPackage.OUTPUT__EMESSAGE:
-        if (resolve) return getEMessage();
-        return basicGetEMessage();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.OUTPUT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case WSDLPackage.OUTPUT__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case WSDLPackage.OUTPUT__NAME:
-        setName((String)newValue);
-        return;
-      case WSDLPackage.OUTPUT__EMESSAGE:
-        setEMessage((org.eclipse.wst.wsdl.Message)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.OUTPUT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.OUTPUT__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.OUTPUT__NAME:
-        setName(NAME_EDEFAULT);
-        return;
-      case WSDLPackage.OUTPUT__EMESSAGE:
-        setEMessage((org.eclipse.wst.wsdl.Message)null);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.OUTPUT__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case WSDLPackage.OUTPUT__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case WSDLPackage.OUTPUT__NAME:
-        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-      case WSDLPackage.OUTPUT__EMESSAGE:
-        return eMessage != null;
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  public Element createElement()
-  {
-    Element newElement = createElement(WSDLConstants.OUTPUT);
-    setElement(newElement);
-    return newElement;
-  }
-} //OutputImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PartImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PartImpl.java
deleted file mode 100644
index 670da206f..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PartImpl.java
+++ /dev/null
@@ -1,765 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.w3c.dom.Element;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Part</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.impl.PartImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.PartImpl#getElementName <em>Element Name</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.PartImpl#getTypeName <em>Type Name</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.PartImpl#getTypeDefinition <em>Type Definition</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.PartImpl#getElementDeclaration <em>Element Declaration</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.PartImpl#getEMessage <em>EMessage</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PartImpl extends WSDLElementImpl implements Part
-{
-  /**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected static final String NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected String name = NAME_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getElementName() <em>Element Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getElementName()
-   * @generated
-   * @ordered
-   */
-  protected static final QName ELEMENT_NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getElementName() <em>Element Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getElementName()
-   * @generated
-   * @ordered
-   */
-  protected QName elementName = ELEMENT_NAME_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getTypeName() <em>Type Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getTypeName()
-   * @generated
-   * @ordered
-   */
-  protected static final QName TYPE_NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getTypeName() <em>Type Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getTypeName()
-   * @generated
-   * @ordered
-   */
-  protected QName typeName = TYPE_NAME_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getTypeDefinition() <em>Type Definition</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getTypeDefinition()
-   * @generated
-   * @ordered
-   */
-  protected XSDTypeDefinition typeDefinition = null;
-
-  /**
-   * The cached value of the '{@link #getElementDeclaration() <em>Element Declaration</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getElementDeclaration()
-   * @generated
-   * @ordered
-   */
-  protected XSDElementDeclaration elementDeclaration = null;
-
-  /**
-   * The cached value of the '{@link #getEMessage() <em>EMessage</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEMessage()
-   * @generated
-   * @ordered
-   */
-  protected Message eMessage = null;
-
-  public static final String NS_URI_PART_EXTENSIONS = "http://schemas.xmlsoap.org/wsdl/part-extensions/";
-  public static final String ATTR_MESSAGE = "message";
-  private Map extensionAttributes = new ExtensionAttributeMap();
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected PartImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return WSDLPackage.eINSTANCE.getPart();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getName()
-  {
-    return name;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setName(String newName)
-  {
-    String oldName = name;
-    name = newName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.PART__NAME, oldName, name));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public QName getElementName()
-  {
-    return elementName;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setElementName(QName newElementName)
-  {
-    QName oldElementName = elementName;
-    elementName = newElementName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.PART__ELEMENT_NAME, oldElementName, elementName));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public QName getTypeName()
-  {
-    return typeName;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setTypeName(QName newTypeName)
-  {
-    QName oldTypeName = typeName;
-    typeName = newTypeName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.PART__TYPE_NAME, oldTypeName, typeName));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public XSDTypeDefinition getTypeDefinition()
-  {
-    if (typeDefinition != null && typeDefinition.eIsProxy())
-    {
-      XSDTypeDefinition oldTypeDefinition = typeDefinition;
-      typeDefinition = (XSDTypeDefinition)eResolveProxy((InternalEObject)typeDefinition);
-      if (typeDefinition != oldTypeDefinition)
-      {
-        if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, WSDLPackage.PART__TYPE_DEFINITION, oldTypeDefinition, typeDefinition));
-      }
-    }
-    return typeDefinition;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public XSDTypeDefinition basicGetTypeDefinition()
-  {
-    return typeDefinition;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setTypeDefinition(XSDTypeDefinition newTypeDefinition)
-  {
-    XSDTypeDefinition oldTypeDefinition = typeDefinition;
-    typeDefinition = newTypeDefinition;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.PART__TYPE_DEFINITION, oldTypeDefinition, typeDefinition));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public XSDElementDeclaration getElementDeclaration()
-  {
-    if (elementDeclaration != null && elementDeclaration.eIsProxy())
-    {
-      XSDElementDeclaration oldElementDeclaration = elementDeclaration;
-      elementDeclaration = (XSDElementDeclaration)eResolveProxy((InternalEObject)elementDeclaration);
-      if (elementDeclaration != oldElementDeclaration)
-      {
-        if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, WSDLPackage.PART__ELEMENT_DECLARATION, oldElementDeclaration, elementDeclaration));
-      }
-    }
-    return elementDeclaration;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public XSDElementDeclaration basicGetElementDeclaration()
-  {
-    return elementDeclaration;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setElementDeclaration(XSDElementDeclaration newElementDeclaration)
-  {
-    XSDElementDeclaration oldElementDeclaration = elementDeclaration;
-    elementDeclaration = newElementDeclaration;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.PART__ELEMENT_DECLARATION, oldElementDeclaration, elementDeclaration));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Message getEMessage()
-  {
-    if (eMessage != null && eMessage.eIsProxy())
-    {
-      Message oldEMessage = eMessage;
-      eMessage = (Message)eResolveProxy((InternalEObject)eMessage);
-      if (eMessage != oldEMessage)
-      {
-        if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, WSDLPackage.PART__EMESSAGE, oldEMessage, eMessage));
-      }
-    }
-    return eMessage;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Message basicGetEMessage()
-  {
-    return eMessage;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setEMessage(Message newEMessage)
-  {
-    Message oldEMessage = eMessage;
-    eMessage = newEMessage;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.PART__EMESSAGE, oldEMessage, eMessage));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setExtensionAttribute(QName name, QName value)
-  {
-    String localName = name.getLocalPart();
-    String nsURI = name.getNamespaceURI();
-    if (localName == null)
-      return;
-
-    if (value == null)
-      extensionAttributes.remove(name);
-    else
-      extensionAttributes.put(name, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Iterator getExtensionAttributeNames()
-  {
-    Map map = new HashMap(extensionAttributes);
-
-    // Adjust messageName attribute
-    QName messageName = getMessage() != null ? getMessage().getQName() : null;
-    if (messageName != null)
-      map.put(new QName(NS_URI_PART_EXTENSIONS, ATTR_MESSAGE), messageName);
-    else
-      map.remove(new QName(NS_URI_PART_EXTENSIONS, ATTR_MESSAGE));
-
-    return map.keySet().iterator();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public QName getExtensionAttribute(QName name)
-  {
-    if (name.equals(new QName(NS_URI_PART_EXTENSIONS, ATTR_MESSAGE)))
-      return getMessage() != null ? getMessage().getQName() : null;
-    else
-      return (QName) extensionAttributes.get(name);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setMessage(javax.wsdl.Message message)
-  {
-    setEMessage((Message) message);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Message getMessage()
-  {
-    return getEMessage();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.PART__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case WSDLPackage.PART__ELEMENT:
-        return getElement();
-      case WSDLPackage.PART__NAME:
-        return getName();
-      case WSDLPackage.PART__ELEMENT_NAME:
-        return getElementName();
-      case WSDLPackage.PART__TYPE_NAME:
-        return getTypeName();
-      case WSDLPackage.PART__TYPE_DEFINITION:
-        if (resolve) return getTypeDefinition();
-        return basicGetTypeDefinition();
-      case WSDLPackage.PART__ELEMENT_DECLARATION:
-        if (resolve) return getElementDeclaration();
-        return basicGetElementDeclaration();
-      case WSDLPackage.PART__EMESSAGE:
-        if (resolve) return getEMessage();
-        return basicGetEMessage();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.PART__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case WSDLPackage.PART__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case WSDLPackage.PART__NAME:
-        setName((String)newValue);
-        return;
-      case WSDLPackage.PART__ELEMENT_NAME:
-        setElementName((QName)newValue);
-        return;
-      case WSDLPackage.PART__TYPE_NAME:
-        setTypeName((QName)newValue);
-        return;
-      case WSDLPackage.PART__TYPE_DEFINITION:
-        setTypeDefinition((XSDTypeDefinition)newValue);
-        return;
-      case WSDLPackage.PART__ELEMENT_DECLARATION:
-        setElementDeclaration((XSDElementDeclaration)newValue);
-        return;
-      case WSDLPackage.PART__EMESSAGE:
-        setEMessage((Message)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.PART__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.PART__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.PART__NAME:
-        setName(NAME_EDEFAULT);
-        return;
-      case WSDLPackage.PART__ELEMENT_NAME:
-        setElementName(ELEMENT_NAME_EDEFAULT);
-        return;
-      case WSDLPackage.PART__TYPE_NAME:
-        setTypeName(TYPE_NAME_EDEFAULT);
-        return;
-      case WSDLPackage.PART__TYPE_DEFINITION:
-        setTypeDefinition((XSDTypeDefinition)null);
-        return;
-      case WSDLPackage.PART__ELEMENT_DECLARATION:
-        setElementDeclaration((XSDElementDeclaration)null);
-        return;
-      case WSDLPackage.PART__EMESSAGE:
-        setEMessage((Message)null);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.PART__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case WSDLPackage.PART__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case WSDLPackage.PART__NAME:
-        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-      case WSDLPackage.PART__ELEMENT_NAME:
-        return ELEMENT_NAME_EDEFAULT == null ? elementName != null : !ELEMENT_NAME_EDEFAULT.equals(elementName);
-      case WSDLPackage.PART__TYPE_NAME:
-        return TYPE_NAME_EDEFAULT == null ? typeName != null : !TYPE_NAME_EDEFAULT.equals(typeName);
-      case WSDLPackage.PART__TYPE_DEFINITION:
-        return typeDefinition != null;
-      case WSDLPackage.PART__ELEMENT_DECLARATION:
-        return elementDeclaration != null;
-      case WSDLPackage.PART__EMESSAGE:
-        return eMessage != null;
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (name: ");
-    result.append(name);
-    result.append(", elementName: ");
-    result.append(elementName);
-    result.append(", typeName: ");
-    result.append(typeName);
-    result.append(')');
-    return result.toString();
-  }
-
-  public Map getExtensionAttributes()
-  {
-    return extensionAttributes;
-  }
-
-  class ExtensionAttributeMap extends HashMap
-  {
-    /**
-     * This class is not intended to be serialized.
-     * serialVersionUID is assigned with 1L to avoid
-     * compiler warning messages.
-     */
-    private static final long serialVersionUID = 1L;
-
-    ExtensionAttributeMap()
-    {
-      super();
-    }
-
-    public Object put(Object key, Object val)
-    {
-      QName name = (QName) key;
-      QName value = (QName) val;
-      String lName = name.getLocalPart();
-      String nSpace = name.getNamespaceURI();
-
-      if (NS_URI_PART_EXTENSIONS.equals(nSpace) && ATTR_MESSAGE.equals(lName))
-      {
-        javax.wsdl.Message messageProxy = new MessageImpl();
-        messageProxy.setQName(value);
-        setEMessage((Message) messageProxy);
-      }
-      return super.put(key, value);
-    }
-  }
-
-  //
-  // Reconcile methods
-  //
-  public void reconcileAttributes(Element changedElement)
-  {
-    Definition definition = getEnclosingDefinition();
-
-    String name = changedElement.getAttributeNS(null, "name");
-    if (name != null)
-    {
-      setName(name);
-    }
-
-    String elementAttr = WSDLConstants.getAttribute(changedElement, WSDLConstants.ELEMENT_ATTRIBUTE);
-    setElementName(elementAttr != null ? createQName(definition, elementAttr) : null);
-		    
-    String typeAttr = WSDLConstants.getAttribute(changedElement, WSDLConstants.TYPE_ATTRIBUTE);
-    setTypeName(typeAttr != null ? createQName(definition, typeAttr) : null);
-
-    reconcileReferences(false);
-  }
-
-
-  //
-  // For reconciliation: Model -> DOM
-  //
-
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-    if (isReconciling)
-      return;
-
-    //super.changeAttribute(eAttribute);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eAttribute == null || eAttribute == WSDLPackage.eINSTANCE.getPart_Name())
-        niceSetAttribute(theElement, WSDLConstants.NAME_ATTRIBUTE, getName());
-
-      if (eAttribute == null || eAttribute == WSDLPackage.eINSTANCE.getPart_TypeName())
-        if (getTypeName() != null)
-          niceSetAttributeURIValue(theElement, WSDLConstants.TYPE_ATTRIBUTE, getTypeName().getNamespaceURI() + "#" + getTypeName().getLocalPart());
-        
-      if (eAttribute == null || eAttribute == WSDLPackage.eINSTANCE.getPart_ElementName())
-        if (getElementName() != null)
-          niceSetAttributeURIValue(theElement, WSDLConstants.ELEMENT_ATTRIBUTE, getElementName().getNamespaceURI() + "#" + getElementName().getLocalPart());
-        
-    }
-  }
-
-  protected void changeReference(EReference eReference)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeReference(eReference);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eReference == null || eReference == WSDLPackage.eINSTANCE.getPart_TypeDefinition())
-      {
-        XSDTypeDefinition typeDefinition = getTypeDefinition();
-        if (typeDefinition != null)
-        {
-          niceSetAttributeURIValue(theElement, WSDLConstants.TYPE_ATTRIBUTE, typeDefinition.getURI());
-        }
-      }
-      if (eReference == null || eReference == WSDLPackage.eINSTANCE.getPart_ElementDeclaration())
-      {
-        XSDElementDeclaration elementDecl = getElementDeclaration();
-        if (elementDecl != null)
-        {
-          niceSetAttributeURIValue(theElement, WSDLConstants.ELEMENT_ATTRIBUTE, elementDecl.getURI());
-        }
-      }      
-    }
-  }
-
-  public Element createElement()
-  {
-    Element newElement = createElement(WSDLConstants.PART);
-    setElement(newElement);
-    return newElement;
-  }
-
-  public void reconcileReferences(boolean deep)
-  {
-    XSDElementDeclaration newElementDeclaration = resolveElementDeclaration(elementName);
-    if (newElementDeclaration != elementDeclaration)
-    {
-      setElementDeclaration(newElementDeclaration);
-    }
-
-    XSDTypeDefinition newTypeDefinition = resolveTypeDefinition(typeName);
-    if (newTypeDefinition != typeDefinition)
-    {
-      setTypeDefinition(newTypeDefinition);
-    }
-
-    super.reconcileReferences(deep);
-  }
-
-  private XSDElementDeclaration resolveElementDeclaration(QName qname)
-  {
-    XSDElementDeclaration result = null;
-    if (qname != null)
-    {
-      DefinitionImpl definition = (DefinitionImpl) getEnclosingDefinition();
-      if (definition != null)
-      {
-        result = definition.resolveElementDeclaration(qname.getNamespaceURI(), qname.getLocalPart());
-      }
-    }
-    return result;
-  }
-
-  private XSDTypeDefinition resolveTypeDefinition(QName qname)
-  {
-    XSDTypeDefinition result = null;
-    if (qname != null)
-    {
-      DefinitionImpl definition = (DefinitionImpl) getEnclosingDefinition();
-      if (definition != null)
-      {
-        result = definition.resolveTypeDefinition(qname.getNamespaceURI(), qname.getLocalPart());
-      }
-    }
-    return result;
-  }
-} //PartImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PortImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PortImpl.java
deleted file mode 100644
index d1f9403fe..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PortImpl.java
+++ /dev/null
@@ -1,438 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Port</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.impl.PortImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.PortImpl#getEBinding <em>EBinding</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PortImpl extends ExtensibleElementImpl implements Port
-{
-  /**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected static final String NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected String name = NAME_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getEBinding() <em>EBinding</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEBinding()
-   * @generated
-   * @ordered
-   */
-  protected Binding eBinding = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected PortImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return WSDLPackage.eINSTANCE.getPort();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getName()
-  {
-    return name;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setName(String newName)
-  {
-    String oldName = name;
-    name = newName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.PORT__NAME, oldName, name));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Binding getEBinding()
-  {
-    if (eBinding != null && eBinding.eIsProxy())
-    {
-      Binding oldEBinding = eBinding;
-      eBinding = (Binding)eResolveProxy((InternalEObject)eBinding);
-      if (eBinding != oldEBinding)
-      {
-        if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, WSDLPackage.PORT__EBINDING, oldEBinding, eBinding));
-      }
-    }
-    return eBinding;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Binding basicGetEBinding()
-  {
-    return eBinding;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setEBinding(Binding newEBinding)
-  {
-    Binding oldEBinding = eBinding;
-    eBinding = newEBinding;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.PORT__EBINDING, oldEBinding, eBinding));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Binding getBinding()
-  {
-    return getEBinding();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setBinding(javax.wsdl.Binding binding)
-  {
-    setEBinding((Binding) binding);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs)
-  {
-    if (featureID >= 0)
-    {
-      switch (eDerivedStructuralFeatureID(featureID, baseClass))
-      {
-        case WSDLPackage.PORT__EEXTENSIBILITY_ELEMENTS:
-          return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-        default:
-          return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-      }
-    }
-    return eBasicSetContainer(null, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.PORT__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case WSDLPackage.PORT__ELEMENT:
-        return getElement();
-      case WSDLPackage.PORT__EEXTENSIBILITY_ELEMENTS:
-        return getEExtensibilityElements();
-      case WSDLPackage.PORT__NAME:
-        return getName();
-      case WSDLPackage.PORT__EBINDING:
-        if (resolve) return getEBinding();
-        return basicGetEBinding();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.PORT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case WSDLPackage.PORT__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case WSDLPackage.PORT__EEXTENSIBILITY_ELEMENTS:
-        getEExtensibilityElements().clear();
-        getEExtensibilityElements().addAll((Collection)newValue);
-        return;
-      case WSDLPackage.PORT__NAME:
-        setName((String)newValue);
-        return;
-      case WSDLPackage.PORT__EBINDING:
-        setEBinding((Binding)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.PORT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.PORT__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.PORT__EEXTENSIBILITY_ELEMENTS:
-        getEExtensibilityElements().clear();
-        return;
-      case WSDLPackage.PORT__NAME:
-        setName(NAME_EDEFAULT);
-        return;
-      case WSDLPackage.PORT__EBINDING:
-        setEBinding((Binding)null);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.PORT__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case WSDLPackage.PORT__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case WSDLPackage.PORT__EEXTENSIBILITY_ELEMENTS:
-        return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-      case WSDLPackage.PORT__NAME:
-        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-      case WSDLPackage.PORT__EBINDING:
-        return eBinding != null;
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (name: ");
-    result.append(name);
-    result.append(')');
-    return result.toString();
-  }
-
-  //
-  // Reconcile methods
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-    Definition definition = getEnclosingDefinition();
-    setName(changedElement.getAttribute("name"));
-    reconcileReferences(false);
-  }
-  
-  public void handleUnreconciledElement(Element child, Collection remainingModelObjects)
-  {
-    super.handleUnreconciledElement(child,remainingModelObjects);
-  }
-
-  protected void handleReconciliation(Collection remainingModelObjects)
-  {
-    for (Iterator i = remainingModelObjects.iterator(); i.hasNext();)
-    {
-      getEExtensibilityElements().remove(i.next());
-    }
-  }
-
-  public Collection getModelObjects(Object component)
-  {
-    Port port = (Port) component;
-    List list = new ArrayList();
-    list.addAll(port.getEExtensibilityElements());
-    return list;
-  }
-
-  //
-  // For reconciliation: Model -> DOM
-  //
-
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeAttribute(eAttribute);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eAttribute == null || eAttribute == WSDLPackage.eINSTANCE.getPort_Name())
-        niceSetAttribute(theElement, WSDLConstants.NAME_ATTRIBUTE, getName());
-    }
-  }
-
-  protected void changeReference(EReference eReference)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeReference(eReference);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eReference == null || eReference == WSDLPackage.eINSTANCE.getPort_EBinding())
-      {
-        Binding binding = getEBinding();
-        if (binding != null)
-        {
-          QName qName = binding.getQName();
-          niceSetAttributeURIValue(theElement, WSDLConstants.BINDING_ATTRIBUTE, qName.getNamespaceURI() + "#" + qName.getLocalPart());
-        }
-      }
-    }
-  }
-
-  protected Element createElement()
-  {
-    Element newElement = createElement(WSDLConstants.PORT);
-    setElement(newElement);
-
-    Iterator iterator = getExtensibilityElements().iterator();
-    while (iterator.hasNext())
-    {
-      ExtensibilityElement extensibilityElement = (ExtensibilityElement) iterator.next();
-      Element child = ((ExtensibilityElementImpl) extensibilityElement).createElement();
-      newElement.appendChild(child);
-    }
-    return newElement;
-  }
-
-  public void reconcileReferences(boolean deep)
-  {
-    if (element != null)
-    {
-      Definition definition = getEnclosingDefinition();
-      QName bindingQName = createQName(definition, element.getAttribute("binding"));
-      Binding newBinding = (bindingQName != null) ? (Binding) definition.getBinding(bindingQName) : null;
-      if (newBinding != getEBinding())
-      {
-        setEBinding(newBinding);
-      }
-    }
-    super.reconcileReferences(deep);
-  }
-
-} //PortImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PortTypeImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PortTypeImpl.java
deleted file mode 100644
index e37cfd817..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PortTypeImpl.java
+++ /dev/null
@@ -1,635 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.internal.util.WSDLUtil;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Port Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.impl.PortTypeImpl#getQName <em>QName</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.PortTypeImpl#isUndefined <em>Undefined</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.PortTypeImpl#isProxy <em>Proxy</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.PortTypeImpl#getResourceURI <em>Resource URI</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.PortTypeImpl#getEOperations <em>EOperations</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PortTypeImpl extends WSDLElementImpl implements PortType
-{
-  /**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * The default value of the '{@link #getQName() <em>QName</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getQName()
-   * @generated
-   * @ordered
-   */
-  protected static final QName QNAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getQName() <em>QName</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getQName()
-   * @generated
-   * @ordered
-   */
-  protected QName qName = QNAME_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #isUndefined() <em>Undefined</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isUndefined()
-   * @generated
-   * @ordered
-   */
-  protected static final boolean UNDEFINED_EDEFAULT = false;
-
-  /**
-   * The cached value of the '{@link #isUndefined() <em>Undefined</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isUndefined()
-   * @generated
-   * @ordered
-   */
-  protected boolean undefined = UNDEFINED_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #isProxy() <em>Proxy</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isProxy()
-   * @generated
-   * @ordered
-   */
-  protected static final boolean PROXY_EDEFAULT = false;
-
-  /**
-   * The cached value of the '{@link #isProxy() <em>Proxy</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isProxy()
-   * @generated
-   * @ordered
-   */
-  protected boolean proxy = PROXY_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getResourceURI() <em>Resource URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getResourceURI()
-   * @generated
-   * @ordered
-   */
-  protected static final String RESOURCE_URI_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getResourceURI() <em>Resource URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getResourceURI()
-   * @generated
-   * @ordered
-   */
-  protected String resourceURI = RESOURCE_URI_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getEOperations() <em>EOperations</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEOperations()
-   * @generated
-   * @ordered
-   */
-  protected EList eOperations = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected PortTypeImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return WSDLPackage.eINSTANCE.getPortType();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public QName getQName()
-  {
-    return qName;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setQName(QName newQName)
-  {
-    QName oldQName = qName;
-    qName = newQName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.PORT_TYPE__QNAME, oldQName, qName));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isUndefined()
-  {
-    return undefined;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setUndefined(boolean newUndefined)
-  {
-    boolean oldUndefined = undefined;
-    undefined = newUndefined;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.PORT_TYPE__UNDEFINED, oldUndefined, undefined));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isProxy()
-  {
-    return proxy;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setProxy(boolean newProxy)
-  {
-    boolean oldProxy = proxy;
-    proxy = newProxy;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.PORT_TYPE__PROXY, oldProxy, proxy));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getResourceURI()
-  {
-    return resourceURI;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setResourceURI(String newResourceURI)
-  {
-    String oldResourceURI = resourceURI;
-    resourceURI = newResourceURI;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.PORT_TYPE__RESOURCE_URI, oldResourceURI, resourceURI));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList getEOperations()
-  {
-    if (eOperations == null)
-    {
-      eOperations = new EObjectContainmentEList(Operation.class, this, WSDLPackage.PORT_TYPE__EOPERATIONS);
-    }
-    return eOperations;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Add an operation to this port type.
-   * @param operation the operation to be added
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void addOperation(javax.wsdl.Operation operation)
-  {
-    if (!operation.isUndefined())
-      getEOperations().add(operation);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Get the specified operation. Note that operation names can
-   * be overloaded within a PortType. In case of overloading, the
-   * names of the input and output messages can be used to further
-   * refine the search.
-   * @param name the name of the desired operation.
-   * @param inputName the name of the input message; if this is null
-   *        it will be ignored.
-   * @param outputName the name of the output message; if this is null
-   *        it will be ignored.
-   * @return the corresponding operation, or null if there wasn't
-   *         any matching operation
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Operation getOperation(String name, String inputName, String outputName)
-  {
-    Iterator opIterator = getOperations().iterator();
-    while (opIterator.hasNext())
-    {
-      javax.wsdl.Operation op = (javax.wsdl.Operation) opIterator.next();
-      if (op == null)
-        continue;
-
-      String opName = op.getName();
-      if (name != null && opName != null)
-      {
-        if (!name.equals(opName))
-          op = null;
-      }
-      else if (name != null || opName != null)
-        op = null;
-
-      if (op != null && inputName != null)
-      {
-        javax.wsdl.Input input = op.getInput();
-        if (input != null)
-        {
-          String opInputName = input.getName();
-          if (opInputName == null || !opInputName.equals(inputName))
-            op = null;
-        }
-        else
-          op = null;
-      }
-
-      if (op != null && outputName != null)
-      {
-        javax.wsdl.Output output = op.getOutput();
-        if (output != null)
-        {
-          String opOutputName = output.getName();
-          if (opOutputName == null || !opOutputName.equals(outputName))
-            op = null;
-        }
-        else
-          op = null;
-      }
-
-      if (op != null)
-        return op;
-    } // end while
-    return null;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Get all the operations defined here.
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public List getOperations()
-  {
-    if (!isUndefined())
-      return getEOperations();
-    else
-      return new ArrayList();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs)
-  {
-    if (featureID >= 0)
-    {
-      switch (eDerivedStructuralFeatureID(featureID, baseClass))
-      {
-        case WSDLPackage.PORT_TYPE__EOPERATIONS:
-          return ((InternalEList)getEOperations()).basicRemove(otherEnd, msgs);
-        default:
-          return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-      }
-    }
-    return eBasicSetContainer(null, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.PORT_TYPE__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case WSDLPackage.PORT_TYPE__ELEMENT:
-        return getElement();
-      case WSDLPackage.PORT_TYPE__QNAME:
-        return getQName();
-      case WSDLPackage.PORT_TYPE__UNDEFINED:
-        return isUndefined() ? Boolean.TRUE : Boolean.FALSE;
-      case WSDLPackage.PORT_TYPE__PROXY:
-        return isProxy() ? Boolean.TRUE : Boolean.FALSE;
-      case WSDLPackage.PORT_TYPE__RESOURCE_URI:
-        return getResourceURI();
-      case WSDLPackage.PORT_TYPE__EOPERATIONS:
-        return getEOperations();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.PORT_TYPE__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case WSDLPackage.PORT_TYPE__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case WSDLPackage.PORT_TYPE__QNAME:
-        setQName((QName)newValue);
-        return;
-      case WSDLPackage.PORT_TYPE__UNDEFINED:
-        setUndefined(((Boolean)newValue).booleanValue());
-        return;
-      case WSDLPackage.PORT_TYPE__PROXY:
-        setProxy(((Boolean)newValue).booleanValue());
-        return;
-      case WSDLPackage.PORT_TYPE__RESOURCE_URI:
-        setResourceURI((String)newValue);
-        return;
-      case WSDLPackage.PORT_TYPE__EOPERATIONS:
-        getEOperations().clear();
-        getEOperations().addAll((Collection)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.PORT_TYPE__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.PORT_TYPE__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.PORT_TYPE__QNAME:
-        setQName(QNAME_EDEFAULT);
-        return;
-      case WSDLPackage.PORT_TYPE__UNDEFINED:
-        setUndefined(UNDEFINED_EDEFAULT);
-        return;
-      case WSDLPackage.PORT_TYPE__PROXY:
-        setProxy(PROXY_EDEFAULT);
-        return;
-      case WSDLPackage.PORT_TYPE__RESOURCE_URI:
-        setResourceURI(RESOURCE_URI_EDEFAULT);
-        return;
-      case WSDLPackage.PORT_TYPE__EOPERATIONS:
-        getEOperations().clear();
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.PORT_TYPE__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case WSDLPackage.PORT_TYPE__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case WSDLPackage.PORT_TYPE__QNAME:
-        return QNAME_EDEFAULT == null ? qName != null : !QNAME_EDEFAULT.equals(qName);
-      case WSDLPackage.PORT_TYPE__UNDEFINED:
-        return undefined != UNDEFINED_EDEFAULT;
-      case WSDLPackage.PORT_TYPE__PROXY:
-        return proxy != PROXY_EDEFAULT;
-      case WSDLPackage.PORT_TYPE__RESOURCE_URI:
-        return RESOURCE_URI_EDEFAULT == null ? resourceURI != null : !RESOURCE_URI_EDEFAULT.equals(resourceURI);
-      case WSDLPackage.PORT_TYPE__EOPERATIONS:
-        return eOperations != null && !eOperations.isEmpty();
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (qName: ");
-    result.append(qName);
-    result.append(", undefined: ");
-    result.append(undefined);
-    result.append(", proxy: ");
-    result.append(proxy);
-    result.append(", resourceURI: ");
-    result.append(resourceURI);
-    result.append(')');
-    return result.toString();
-  }
-
-  //
-  // Reconcile methods
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-    Definition definition = getEnclosingDefinition();
-    QName qname = new QName(definition.getTargetNamespace(), changedElement.getAttribute("name"));
-    setQName(qname);
-  }
-
-  public void handleUnreconciledElement(Element child, Collection remainingModelObjects)
-  {
-    switch (WSDLUtil.getInstance().getWSDLType(child))
-    {
-      case WSDLConstants.OPERATION :
-        {
-          Operation operation = WSDLFactory.eINSTANCE.createOperation();
-          operation.setEnclosingDefinition(getEnclosingDefinition());
-          operation.setElement(child);
-          getEOperations().add(operation);
-          break;
-        }
-    }
-  }
-
-  protected void handleReconciliation(Collection remainingModelObjects)
-  {
-    for (Iterator i = remainingModelObjects.iterator(); i.hasNext();)
-    {
-      remove(this, i.next());
-    }
-  }
-
-  protected void remove(Object component, Object modelObject)
-  {
-    List list = getList(component, modelObject);
-    if (list != null)
-    {
-      list.remove(modelObject);
-    }
-  }
-
-  private List getList(Object component, Object modelObject)
-  {
-    List result = null;
-    PortType portType = (PortType) component;
-    if (modelObject instanceof Operation)
-    {
-      result = portType.getEOperations();
-    }
-    return result;
-  }
-
-  public Collection getModelObjects(Object component)
-  {
-    PortType portType = (PortType) component;
-
-    List list = portType.getEOperations();
-    return list;
-  }
-
-  //
-  // For reconciliation: Model -> DOM
-  //
-
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeAttribute(eAttribute);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eAttribute == null || eAttribute == WSDLPackage.eINSTANCE.getPortType_QName())
-        niceSetAttribute(theElement, WSDLConstants.NAME_ATTRIBUTE, getQName().getLocalPart());
-    }
-  }
-
-  public Element createElement()
-  {
-    Element newElement = createElement(WSDLConstants.PORT_TYPE);
-    setElement(newElement);
-
-    Iterator iterator = getEOperations().iterator();
-    while (iterator.hasNext())
-    {
-      Operation operation = (Operation) iterator.next();
-      Element child = ((OperationImpl) operation).createElement();
-      newElement.appendChild(child);
-    }
-
-    return newElement;
-  }
-} //PortTypeImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ServiceImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ServiceImpl.java
deleted file mode 100644
index bf38f3c66..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ServiceImpl.java
+++ /dev/null
@@ -1,628 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.internal.util.WSDLUtil;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Service</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.impl.ServiceImpl#getQName <em>QName</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.ServiceImpl#isUndefined <em>Undefined</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.ServiceImpl#isProxy <em>Proxy</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.ServiceImpl#getResourceURI <em>Resource URI</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.ServiceImpl#getEPorts <em>EPorts</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ServiceImpl extends ExtensibleElementImpl implements Service
-{
-  /**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * The default value of the '{@link #getQName() <em>QName</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getQName()
-   * @generated
-   * @ordered
-   */
-  protected static final QName QNAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getQName() <em>QName</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getQName()
-   * @generated
-   * @ordered
-   */
-  protected QName qName = QNAME_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #isUndefined() <em>Undefined</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isUndefined()
-   * @generated
-   * @ordered
-   */
-  protected static final boolean UNDEFINED_EDEFAULT = false;
-
-  /**
-   * The cached value of the '{@link #isUndefined() <em>Undefined</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isUndefined()
-   * @generated
-   * @ordered
-   */
-  protected boolean undefined = UNDEFINED_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #isProxy() <em>Proxy</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isProxy()
-   * @generated
-   * @ordered
-   */
-  protected static final boolean PROXY_EDEFAULT = false;
-
-  /**
-   * The cached value of the '{@link #isProxy() <em>Proxy</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isProxy()
-   * @generated
-   * @ordered
-   */
-  protected boolean proxy = PROXY_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getResourceURI() <em>Resource URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getResourceURI()
-   * @generated
-   * @ordered
-   */
-  protected static final String RESOURCE_URI_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getResourceURI() <em>Resource URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getResourceURI()
-   * @generated
-   * @ordered
-   */
-  protected String resourceURI = RESOURCE_URI_EDEFAULT;
-
-  private Map ports;
-
-  /**
-   * The cached value of the '{@link #getEPorts() <em>EPorts</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEPorts()
-   * @generated
-   * @ordered
-   */
-  protected EList ePorts = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected ServiceImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return WSDLPackage.eINSTANCE.getService();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public QName getQName()
-  {
-    return qName;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setQName(QName newQName)
-  {
-    QName oldQName = qName;
-    qName = newQName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.SERVICE__QNAME, oldQName, qName));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isUndefined()
-  {
-    return undefined;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setUndefined(boolean newUndefined)
-  {
-    boolean oldUndefined = undefined;
-    undefined = newUndefined;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.SERVICE__UNDEFINED, oldUndefined, undefined));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isProxy()
-  {
-    return proxy;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setProxy(boolean newProxy)
-  {
-    boolean oldProxy = proxy;
-    proxy = newProxy;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.SERVICE__PROXY, oldProxy, proxy));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getResourceURI()
-  {
-    return resourceURI;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setResourceURI(String newResourceURI)
-  {
-    String oldResourceURI = resourceURI;
-    resourceURI = newResourceURI;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.SERVICE__RESOURCE_URI, oldResourceURI, resourceURI));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList getEPorts()
-  {
-    if (ePorts == null)
-    {
-      ePorts = new EObjectContainmentEList(Port.class, this, WSDLPackage.SERVICE__EPORTS);
-    }
-    return ePorts;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Add a port to this service.
-   * @param port the port to be added
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void addPort(javax.wsdl.Port port)
-  {
-    getEPorts().add((Port)port);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Get all the ports defined here.
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Map getPorts()
-  {
-    HashMap hashMap = new HashMap();
-    for (Iterator i = getEPorts().iterator(); i.hasNext();)
-    {
-      Port port = (Port) i.next();
-      hashMap.put(port.getName(), port);
-    }
-    return hashMap;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Get the specified port.
-   *
-   * @param name the name of the desired port.
-   * @return the corresponding port, or null if there wasn't
-   * any matching port
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Port getPort(String name)
-  {
-    Port result = null;
-    for (Iterator i = getEPorts().iterator(); i.hasNext();)
-    {
-      Port port = (Port) i.next();
-      if (name.equals(port.getName()))
-      {
-        result = port;
-        break;
-      }
-    }
-    return result;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs)
-  {
-    if (featureID >= 0)
-    {
-      switch (eDerivedStructuralFeatureID(featureID, baseClass))
-      {
-        case WSDLPackage.SERVICE__EEXTENSIBILITY_ELEMENTS:
-          return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-        case WSDLPackage.SERVICE__EPORTS:
-          return ((InternalEList)getEPorts()).basicRemove(otherEnd, msgs);
-        default:
-          return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-      }
-    }
-    return eBasicSetContainer(null, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.SERVICE__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case WSDLPackage.SERVICE__ELEMENT:
-        return getElement();
-      case WSDLPackage.SERVICE__EEXTENSIBILITY_ELEMENTS:
-        return getEExtensibilityElements();
-      case WSDLPackage.SERVICE__QNAME:
-        return getQName();
-      case WSDLPackage.SERVICE__UNDEFINED:
-        return isUndefined() ? Boolean.TRUE : Boolean.FALSE;
-      case WSDLPackage.SERVICE__PROXY:
-        return isProxy() ? Boolean.TRUE : Boolean.FALSE;
-      case WSDLPackage.SERVICE__RESOURCE_URI:
-        return getResourceURI();
-      case WSDLPackage.SERVICE__EPORTS:
-        return getEPorts();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.SERVICE__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case WSDLPackage.SERVICE__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case WSDLPackage.SERVICE__EEXTENSIBILITY_ELEMENTS:
-        getEExtensibilityElements().clear();
-        getEExtensibilityElements().addAll((Collection)newValue);
-        return;
-      case WSDLPackage.SERVICE__QNAME:
-        setQName((QName)newValue);
-        return;
-      case WSDLPackage.SERVICE__UNDEFINED:
-        setUndefined(((Boolean)newValue).booleanValue());
-        return;
-      case WSDLPackage.SERVICE__PROXY:
-        setProxy(((Boolean)newValue).booleanValue());
-        return;
-      case WSDLPackage.SERVICE__RESOURCE_URI:
-        setResourceURI((String)newValue);
-        return;
-      case WSDLPackage.SERVICE__EPORTS:
-        getEPorts().clear();
-        getEPorts().addAll((Collection)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.SERVICE__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.SERVICE__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.SERVICE__EEXTENSIBILITY_ELEMENTS:
-        getEExtensibilityElements().clear();
-        return;
-      case WSDLPackage.SERVICE__QNAME:
-        setQName(QNAME_EDEFAULT);
-        return;
-      case WSDLPackage.SERVICE__UNDEFINED:
-        setUndefined(UNDEFINED_EDEFAULT);
-        return;
-      case WSDLPackage.SERVICE__PROXY:
-        setProxy(PROXY_EDEFAULT);
-        return;
-      case WSDLPackage.SERVICE__RESOURCE_URI:
-        setResourceURI(RESOURCE_URI_EDEFAULT);
-        return;
-      case WSDLPackage.SERVICE__EPORTS:
-        getEPorts().clear();
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.SERVICE__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case WSDLPackage.SERVICE__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case WSDLPackage.SERVICE__EEXTENSIBILITY_ELEMENTS:
-        return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-      case WSDLPackage.SERVICE__QNAME:
-        return QNAME_EDEFAULT == null ? qName != null : !QNAME_EDEFAULT.equals(qName);
-      case WSDLPackage.SERVICE__UNDEFINED:
-        return undefined != UNDEFINED_EDEFAULT;
-      case WSDLPackage.SERVICE__PROXY:
-        return proxy != PROXY_EDEFAULT;
-      case WSDLPackage.SERVICE__RESOURCE_URI:
-        return RESOURCE_URI_EDEFAULT == null ? resourceURI != null : !RESOURCE_URI_EDEFAULT.equals(resourceURI);
-      case WSDLPackage.SERVICE__EPORTS:
-        return ePorts != null && !ePorts.isEmpty();
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (qName: ");
-    result.append(qName);
-    result.append(", undefined: ");
-    result.append(undefined);
-    result.append(", proxy: ");
-    result.append(proxy);
-    result.append(", resourceURI: ");
-    result.append(resourceURI);
-    result.append(')');
-    return result.toString();
-  }
-
-  //
-  // Reconcile methods
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-    Definition definition = getEnclosingDefinition();
-
-    QName qname = new QName(definition.getTargetNamespace(), changedElement.getAttribute("name"));
-    setQName(qname);
-  }
-
-  public void handleUnreconciledElement(Element child, Collection remainingModelObjects)
-  {
-    switch (WSDLUtil.getInstance().getWSDLType(child))
-    {
-      case WSDLConstants.PORT :
-        {
-          Port port = (Port) ((WSDLPackage) EPackage.Registry.INSTANCE.getEPackage(WSDLPackage.eNS_URI)).getWSDLFactory().createPort();
-          port.setEnclosingDefinition(getEnclosingDefinition());
-          getEPorts().add(port);
-          port.setElement(child);
-          break;
-        }
-      case WSDLConstants.DOCUMENTATION :
-        {
-          setDocumentationElement(child);
-          break;
-        }
-      default :
-      {
-        super.handleUnreconciledElement(child,remainingModelObjects);
-        break;
-      }
-    }
-  }
-
-  protected void handleReconciliation(Collection remainingModelObjects)
-  {
-    for (Iterator i = remainingModelObjects.iterator(); i.hasNext();)
-    {
-      remove(i.next());
-    }
-  }
-
-  private void remove(Object modelObject)
-  {
-    List list = getList(modelObject);
-    if (list != null)
-    {
-      list.remove(modelObject);
-    }
-  }
-
-  private List getList(Object modelObject)
-  {
-    List result = null;
-    if (modelObject instanceof Port)
-    {
-      result = getEPorts();
-    }
-    else if (modelObject instanceof ExtensibilityElement)
-    {
-      result = getExtensibilityElements();
-    }
-    return result;
-  }
-
-  //
-  // For reconciliation: Model -> DOM
-  //
-
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeAttribute(eAttribute);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eAttribute == null || eAttribute == WSDLPackage.eINSTANCE.getService_QName())
-        niceSetAttribute(theElement, WSDLConstants.NAME_ATTRIBUTE, getQName().getLocalPart());
-    }
-  }
-
-  public Element createElement()
-  {
-    Element newElement = createElement(WSDLConstants.SERVICE);
-    setElement(newElement);
-
-	Iterator iterator = getExtensibilityElements().iterator();
-    while (iterator.hasNext())
-    {
-      ExtensibilityElement extensibilityElement = (ExtensibilityElement) iterator.next();
-      Element child = ((ExtensibilityElementImpl) extensibilityElement).createElement();
-      newElement.appendChild(child);
-    }
-	
-    iterator = getEPorts().iterator();
-    while (iterator.hasNext())
-    {
-      Port port = (Port) iterator.next();
-      Element child = ((PortImpl) port).createElement();
-      newElement.appendChild(child);
-    }
-
-    return newElement;
-  }
-
-} //ServiceImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/TypesImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/TypesImpl.java
deleted file mode 100644
index 363ddf717..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/TypesImpl.java
+++ /dev/null
@@ -1,334 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.Types;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.eclipse.xsd.XSDSchema;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-//import com.ibm.wsdl.factory.WSDLFactoryImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Types</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class TypesImpl extends ExtensibleElementImpl implements Types
-{
-  /**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected TypesImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return WSDLPackage.eINSTANCE.getTypes();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public List getSchemas()
-  {
-    List arrayList = new ArrayList();
-    for (Iterator i = getEExtensibilityElements().iterator(); i.hasNext();)
-    {
-      XSDSchemaExtensibilityElement xsdee = (XSDSchemaExtensibilityElement) i.next();
-      if (xsdee.getSchema() != null)
-      {
-        arrayList.add(xsdee.getSchema());
-      }
-    }
-    return arrayList;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public List getSchemas(String namespaceURI)
-  {
-    List schemas = new ArrayList();
-    for (Iterator i = getSchemas().iterator(); i.hasNext();)
-    {
-      XSDSchema schema = (XSDSchema) i.next();
-      if (namespaceURI == null && schema.getTargetNamespace() == null) {
-    	  schemas.add(schema);
-      }
-      else if (namespaceURI != null && namespaceURI.equals(schema.getTargetNamespace())) {
-        schemas.add(schema);
-      }
-    }
-    return schemas;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs)
-  {
-    if (featureID >= 0)
-    {
-      switch (eDerivedStructuralFeatureID(featureID, baseClass))
-      {
-        case WSDLPackage.TYPES__EEXTENSIBILITY_ELEMENTS:
-          return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-        default:
-          return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-      }
-    }
-    return eBasicSetContainer(null, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.TYPES__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case WSDLPackage.TYPES__ELEMENT:
-        return getElement();
-      case WSDLPackage.TYPES__EEXTENSIBILITY_ELEMENTS:
-        return getEExtensibilityElements();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.TYPES__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case WSDLPackage.TYPES__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case WSDLPackage.TYPES__EEXTENSIBILITY_ELEMENTS:
-        getEExtensibilityElements().clear();
-        getEExtensibilityElements().addAll((Collection)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.TYPES__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.TYPES__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.TYPES__EEXTENSIBILITY_ELEMENTS:
-        getEExtensibilityElements().clear();
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.TYPES__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case WSDLPackage.TYPES__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case WSDLPackage.TYPES__EEXTENSIBILITY_ELEMENTS:
-        return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-    }
-    return eDynamicIsSet(eFeature);
-  }
-  
-  public void eNotify(Notification msg)
-  {
-    super.eNotify(msg);
-    
-    // cs.. if we've added an XSDSchemaExtensibilityElementImpl and the Types object is already attached 
-    // to a resource we need to set the schemaLocation for the inline schema.
-    // If not yet attached to a resource, the schemaLocation's will be set via WSDLResourceImpl.attached(EObject o)
-    //     
-    if (msg.getFeature() == WSDLPackage.eINSTANCE.getExtensibleElement_EExtensibilityElements() &&
-        msg.getEventType() == Notification.ADD)
-    {
-      if (msg.getNewValue() instanceof XSDSchemaExtensibilityElementImpl)
-      {
-        XSDSchemaExtensibilityElementImpl ee = (XSDSchemaExtensibilityElementImpl)msg.getNewValue();
-        if (ee.getSchema() != null && ee.getSchema().eResource() != null)
-        {
-           ee.getSchema().setSchemaLocation(ee.getSchema().eResource().getURI().toString());
-        }  
-      }  
-    }  
-  }
-
-  //
-  // Reconcile methods
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-  }
-
-  public void handleUnreconciledElement(Element child, Collection remainingModelObjects)
-  {
-    if ("schema".equals(child.getLocalName()))
-    {
-      try
-      {
-        XSDSchemaExtensibilityElement xsdee = WSDLFactory.eINSTANCE.createXSDSchemaExtensibilityElement();
-        xsdee.setEnclosingDefinition(getEnclosingDefinition());
-        xsdee.setElement(child); // cs : this has the side effect of creating the inline schema               
-        addExtensibilityElement(xsdee);       
-      }
-      catch (Exception e)
-      {
-        e.printStackTrace();
-      }
-    }
-  }
-
-  protected void handleReconciliation(Collection remainingModelObjects)
-  {
-    for (Iterator i = remainingModelObjects.iterator(); i.hasNext();)
-    {
-      remove(this, i.next());
-    }
-    ((DefinitionImpl)getEnclosingDefinition()).reconcileReferences(true);
-  }
-
-  protected void remove(Object component, Object modelObject)
-  {
-    Types types = (Types) component;
-    List list = types.getEExtensibilityElements();
-    list.remove(modelObject);
-  }
-
-  public Collection getModelObjects(Object component)
-  {
-    Types types = (Types) component;
-    List list = new ArrayList();
-    list.addAll(types.getEExtensibilityElements());
-    return list;
-  }
-
-  public Element createElement()
-  {
-    Element newElement = createElement(WSDLConstants.TYPES);
-    setElement(newElement);
-
-    // Add children
-    Definition definition = getEnclosingDefinition();
-    if (definition == null)
-      return newElement;
-
-    Document document = definition.getDocument();
-    if (document == null)
-      document = ((DefinitionImpl) definition).updateDocument();
-
-    Iterator iter = getEExtensibilityElements().iterator();
-    Element el = null;
-    while (iter.hasNext())
-    {
-      ExtensibilityElement extensibility = (ExtensibilityElement) iter.next();
-      el = extensibility.getElement();
-      if (el != null)
-      {
-        try
-        {
-          Element reParented = (Element) document.importNode(el, true);
-          extensibility.setElement(reParented); // replace with the new one
-          newElement.appendChild(reParented);
-        }
-        catch (DOMException e)
-        {
-          e.printStackTrace();
-          return newElement;
-        }
-      }
-      else
-      {
-      	Element child = ((ExtensibilityElementImpl)extensibility).createElement();
-      	newElement.appendChild(child);
-      }
-    }
-
-    return newElement;
-  }
-} //TypesImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/UnknownExtensibilityElementImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/UnknownExtensibilityElementImpl.java
deleted file mode 100644
index b2ddd0cb7..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/UnknownExtensibilityElementImpl.java
+++ /dev/null
@@ -1,320 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.UnknownExtensibilityElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Unknown Extensibility Element</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.impl.UnknownExtensibilityElementImpl#getChildren <em>Children</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class UnknownExtensibilityElementImpl extends ExtensibilityElementImpl implements UnknownExtensibilityElement
-{
-    /**
-     * The cached value of the '{@link #getChildren() <em>Children</em>}' containment reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getChildren()
-     * @generated
-     * @ordered
-     */
-    protected EList children = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected UnknownExtensibilityElementImpl()
-    {
-        super();
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected EClass eStaticClass()
-    {
-        return WSDLPackage.eINSTANCE.getUnknownExtensibilityElement();
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EList getChildren()
-    {
-        if (children == null)
-        {
-            children = new EObjectContainmentEList(UnknownExtensibilityElement.class, this, WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT__CHILDREN);
-        }
-        return children;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs)
-    {
-        if (featureID >= 0)
-        {
-            switch (eDerivedStructuralFeatureID(featureID, baseClass))
-            {
-            case WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT__CHILDREN:
-                return ((InternalEList) getChildren()).basicRemove(otherEnd, msgs);
-            default:
-                return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-            }
-        }
-        return eBasicSetContainer(null, featureID, msgs);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Object eGet(EStructuralFeature eFeature, boolean resolve)
-    {
-        switch (eDerivedStructuralFeatureID(eFeature))
-        {
-        case WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT:
-            return getDocumentationElement();
-        case WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT__ELEMENT:
-            return getElement();
-        case WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT__REQUIRED:
-            return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-        case WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT__ELEMENT_TYPE:
-            return getElementType();
-        case WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT__CHILDREN:
-            return getChildren();
-        }
-        return eDynamicGet(eFeature, resolve);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void eSet(EStructuralFeature eFeature, Object newValue)
-    {
-        switch (eDerivedStructuralFeatureID(eFeature))
-        {
-        case WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT:
-            setDocumentationElement((Element) newValue);
-            return;
-        case WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT__ELEMENT:
-            setElement((Element) newValue);
-            return;
-        case WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT__REQUIRED:
-            setRequired(((Boolean) newValue).booleanValue());
-            return;
-        case WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT__ELEMENT_TYPE:
-            setElementType((QName) newValue);
-            return;
-        case WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT__CHILDREN:
-            getChildren().clear();
-            getChildren().addAll((Collection) newValue);
-            return;
-        }
-        eDynamicSet(eFeature, newValue);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void eUnset(EStructuralFeature eFeature)
-    {
-        switch (eDerivedStructuralFeatureID(eFeature))
-        {
-        case WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT:
-            setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-            return;
-        case WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT__ELEMENT:
-            setElement(ELEMENT_EDEFAULT);
-            return;
-        case WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT__REQUIRED:
-            setRequired(REQUIRED_EDEFAULT);
-            return;
-        case WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT__ELEMENT_TYPE:
-            setElementType(ELEMENT_TYPE_EDEFAULT);
-            return;
-        case WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT__CHILDREN:
-            getChildren().clear();
-            return;
-        }
-        eDynamicUnset(eFeature);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean eIsSet(EStructuralFeature eFeature)
-    {
-        switch (eDerivedStructuralFeatureID(eFeature))
-        {
-        case WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT:
-            return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-        case WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT__ELEMENT:
-            return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-        case WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT__REQUIRED:
-            return required != REQUIRED_EDEFAULT;
-        case WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT__ELEMENT_TYPE:
-            return ELEMENT_TYPE_EDEFAULT == null ? elementType != null : !ELEMENT_TYPE_EDEFAULT.equals(elementType);
-        case WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT__CHILDREN:
-            return children != null && !children.isEmpty();
-        }
-        return eDynamicIsSet(eFeature);
-    }
-
-    // 
-    // Reconcile methods
-    //
-
-    public void setElement(Element element)
-    {
-        if (element == null && !isReconciling)
-        {
-            //System.out.println("ExtensibilityElement.setElement(): Preserving old element");
-        } 
-        else
-        {
-            setElementGen(element);
-        }
-    }
-
-    public void reconcileAttributes(Element changedElement)
-    {
-        //System.out.println("UnknownExtensibilityElementImpl.reconcileAttributes()");
-    }
-
-    public void handleUnreconciledElement(Element child, Collection remainingModelObjects)
-    {
-        //System.out.println("UnknownExtensibilityElementImpl.handleUnreconciledElement()");
-        UnknownExtensibilityElement extensibilityElement = WSDLFactory.eINSTANCE.createUnknownExtensibilityElement();
-        extensibilityElement.setEnclosingDefinition(getEnclosingDefinition());
-        extensibilityElement.setElement(child);
-        
-        // TODO..  we need to figure out where the child should go in the in current list
-        // so that it doesn't always end up going to the end of the list 
-        // (since a new element might be added at the start)
-        getChildren().add(extensibilityElement);         
-    }
-
-    protected void handleReconciliation(Collection remainingModelObjects)
-    {
-        for (Iterator i = remainingModelObjects.iterator(); i.hasNext();)
-        {
-            remove(this, i.next());
-        }
-    }
-
-    protected void remove(Object component, Object modelObject)
-    {
-        UnknownExtensibilityElement uee = (UnknownExtensibilityElement) component;
-        if (modelObject instanceof UnknownExtensibilityElement)
-        {
-            uee.getChildren().remove(modelObject);
-        }
-    }
-
-    public Element createElement()
-    {
-        Definition definition = getEnclosingDefinition();
-        if (definition == null)
-            return null;
-
-        Document document = definition.getDocument();
-        if (document == null)
-            document = ((DefinitionImpl) definition).updateDocument();
-
-        Element newElement = null;
-        if (element != null) // This is an old element.
-        {
-            newElement = (Element) document.importNode(element, true);
-            element = newElement;
-        } 
-        else
-        {
-            String namespace = getElementType().getNamespaceURI();
-            String qualifier = definition.getPrefix(namespace);
-            newElement = document.createElementNS(namespace, (qualifier == null ? "" : qualifier + ":") + getElementType().getLocalPart());
-            element = newElement;
-        }
-
-        return newElement;
-    }
-
-    private java.util.Map properties = new java.util.HashMap();
-
-    public void setAttribute(String key, String value)
-    {
-        properties.put(key, value);
-    }
-
-    protected void changeAttribute(EAttribute eAttribute)
-    {
-        if (isReconciling)
-            return;
-
-        super.changeAttribute(eAttribute);
-        Element theElement = getElement();
-        if (theElement != null)
-        {
-            Iterator iterator = properties.entrySet().iterator();
-            java.util.Map.Entry entry = null;
-            while (iterator.hasNext())
-            {
-                entry = (java.util.Map.Entry) iterator.next();
-                String attribute = (String) entry.getKey();
-                String value = (String) entry.getValue();
-                niceSetAttribute(theElement, attribute, value);
-            }
-        }
-    }
-} //UnknownExtensibilityElementImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/WSDLElementImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/WSDLElementImpl.java
deleted file mode 100644
index fc9092956..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/WSDLElementImpl.java
+++ /dev/null
@@ -1,1487 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.StringTokenizer;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EContentsEList;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Namespace;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.Text;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Element</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.impl.WSDLElementImpl#getDocumentationElement <em>Documentation Element</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.WSDLElementImpl#getElement <em>Element</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class WSDLElementImpl extends EObjectImpl implements WSDLElement
-{
-  /**
-   * The default value of the '{@link #getDocumentationElement() <em>Documentation Element</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getDocumentationElement()
-   * @generated
-   * @ordered
-   */
-  protected static final Element DOCUMENTATION_ELEMENT_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getDocumentationElement() <em>Documentation Element</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getDocumentationElement()
-   * @generated
-   * @ordered
-   */
-  protected Element documentationElement = DOCUMENTATION_ELEMENT_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getElement() <em>Element</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getElement()
-   * @generated
-   * @ordered
-   */
-  protected static final Element ELEMENT_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getElement() <em>Element</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getElement()
-   * @generated
-   * @ordered
-   */
-  protected Element element = ELEMENT_EDEFAULT;
-
-  protected boolean isReconciling = false;
-  protected boolean updatingDOM = false;
-  protected EList wsdlContents;
-
-  private Definition enclosingDefinition;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected WSDLElementImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return WSDLPackage.eINSTANCE.getWSDLElement();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Element getDocumentationElement()
-  {
-    return documentationElement;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setDocumentationElement(Element newDocumentationElement)
-  {
-    Element oldDocumentationElement = documentationElement;
-    documentationElement = newDocumentationElement;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.WSDL_ELEMENT__DOCUMENTATION_ELEMENT, oldDocumentationElement, documentationElement));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Element getElement()
-  {
-    return element;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setElementGen(Element newElement)
-  {
-    Element oldElement = element;
-    element = newElement;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.WSDL_ELEMENT__ELEMENT, oldElement, element));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setEnclosingDefinition(Definition definition)
-  {
-    enclosingDefinition = definition;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.WSDL_ELEMENT__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case WSDLPackage.WSDL_ELEMENT__ELEMENT:
-        return getElement();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.WSDL_ELEMENT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case WSDLPackage.WSDL_ELEMENT__ELEMENT:
-        setElement((Element)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.WSDL_ELEMENT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.WSDL_ELEMENT__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.WSDL_ELEMENT__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case WSDLPackage.WSDL_ELEMENT__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (documentationElement: ");
-    result.append(documentationElement);
-    result.append(", element: ");
-    result.append(element);
-    result.append(')');
-    return result.toString();
-  }
-
-  //
-  // Reconcilation methods: DOM -> Model
-  //
-
-  public static class WSDLContentsEList extends EContentsEList
-  {
-    WSDLContentsEList(EObject eObject, EStructuralFeature[] eStructuralFeatures)
-    {
-      super(eObject, eStructuralFeatures);
-    }
-
-    protected ListIterator newListIterator()
-    {
-      return new FeatureIteratorImpl(eObject, eStructuralFeatures);
-    }
-
-    protected boolean isIncluded(EStructuralFeature eStructuralFeature)
-    {
-      EReference eReference = (EReference) eStructuralFeature;
-      return !eReference.isTransient();
-    }
-
-    public List basicList()
-    {
-      return new WSDLContentsEList(eObject, eStructuralFeatures);
-    }
-
-    public Iterator basicIterator()
-    {
-      return new FeatureIteratorImpl(eObject, eStructuralFeatures);
-    }
-
-    public static class FeatureIteratorImpl extends EContentsEList.FeatureIteratorImpl
-    {
-      public FeatureIteratorImpl(EObject eObject)
-      {
-        super(eObject, (EStructuralFeature[]) ((BasicEList) eObject.eClass().getEAllReferences()).data());
-      }
-
-      public FeatureIteratorImpl(EObject eObject, EStructuralFeature[] eStructuralFeatures)
-      {
-        super(eObject, eStructuralFeatures);
-      }
-
-      protected boolean isIncluded(EStructuralFeature eStructuralFeature)
-      {
-        EReference eReference = (EReference) eStructuralFeature;
-        return !eReference.isTransient();
-      }
-    }
-  }
-
-  public EList getWSDLContents()
-  {
-    if (wsdlContents == null)
-    {
-      wsdlContents = new WSDLContentsEList(this, (EStructuralFeature[]) ((BasicEList) eClass().getEAllContainments()).data());
-    }
-
-    return wsdlContents;
-  }
-
-  public void setElement(Element element)
-  {
-    if (element == null)
-    {
-      isReconciling = true;
-      setElementGen(null);
-      for (Iterator contents = getWSDLContents().iterator(); contents.hasNext();)
-      {
-        Object obj = contents.next();
-        if (obj instanceof WSDLElementImpl)
-        {
-          WSDLElementImpl content = (WSDLElementImpl) obj;
-          content.setElement(null);
-        }
-      }
-      isReconciling = false;
-    }
-    else
-    {
-      setElementGen(element);
-    }
-  }
-
-  public boolean eNotificationRequired()
-  {
-    return true;
-  }
-
-  public void eNotify(Notification msg)
-  {
-    int eventType = msg.getEventType();
-    Object feature = msg.getFeature();
-    Object oldValue = msg.getOldValue();
-    Object newValue = msg.getNewValue();
-
-    if (eClass().getEAllReferences().contains(feature))
-    {
-      EReference eReference = (EReference) feature;
-      if (eReference.isContainment() && !eReference.isTransient())
-      {
-        switch (eventType)
-        {
-          case Notification.ADD :
-          {
-              adoptContent(eReference,newValue);
-            break;
-          }
-          case Notification.ADD_MANY :
-          {
-            for (Iterator newValues = ((Collection) newValue).iterator(); newValues.hasNext();)
-            {
-              WSDLElement wsdlElement = (WSDLElement) newValues.next();
-              adoptContent(eReference, wsdlElement);
-            }
-            break;
-          }
-          case Notification.REMOVE :
-          {
-            if (oldValue != null)
-            {
-              orphanContent(eReference, (WSDLElement) oldValue);
-            }
-            break;
-          }
-          case Notification.REMOVE_MANY :
-          {
-            for (Iterator oldValues = ((Collection) oldValue).iterator(); oldValues.hasNext();)
-            {
-              EObject object = (EObject) oldValues.next();
-              orphanContent(eReference, object);
-            }
-            break;
-          }
-          case Notification.MOVE :
-          {
-            moveContent(eReference, (WSDLElement) newValue);
-            break;
-          }
-          case Notification.SET :
-          case Notification.UNSET :
-          {
-            if (oldValue != null)
-            {
-              orphanContent(eReference, oldValue);
-            }
-            if (newValue != null)
-            {
-              adoptContent(eReference, newValue);
-            }
-            break;
-          }
-        }
-      }
-      else
-      {
-        switch (eventType)
-        {
-          case Notification.ADD :
-          case Notification.ADD_MANY :
-          case Notification.REMOVE :
-          case Notification.REMOVE_MANY :
-          case Notification.MOVE :
-          case Notification.SET :
-          case Notification.UNSET :
-          {
-            changeReference(eReference);
-            break;
-          }
-        }
-      }
-    }
-    else if (eClass().getEAllAttributes().contains(feature))
-    {
-      EAttribute eAttribute = (EAttribute) feature;
-      switch (eventType)
-      {
-        case Notification.ADD :
-        case Notification.ADD_MANY :
-        case Notification.REMOVE :
-        case Notification.REMOVE_MANY :
-        case Notification.MOVE :
-        case Notification.SET :
-        case Notification.UNSET :
-        {
-          changeAttribute(eAttribute);
-          break;
-        }
-      }
-    }
-    super.eNotify(msg);
-  }
-
-  protected void orphanContent(EReference eReference, Object obj)
-  {
-    if (!isReconciling)
-    {
-      Element parent = getElement();
-      if (parent != null && obj != null && obj instanceof WSDLElement)
-      {
-      	WSDLElement wsdlElement = (WSDLElement)obj;
-        Element contentElement = wsdlElement.getElement();
-        if (contentElement != null)
-          niceRemoveChild(contentElement.getParentNode(), contentElement);
-      }
-      else
-      	;//System.out.println("WSDLElement.orphanContent(), Object is: " + obj);
-    }
-  }
-  
-  protected void niceRemoveChild(Node parent, Node child)
-  {
-    if (isReconciling)
-    {
-      // System.out.println("**** cyclic dom writeback avoided " + eClass().getName());
-      return;
-    }
-    forceNiceRemoveChild(parent, child);
-  }
-  
-  public void forceNiceRemoveChild(Node parent, Node child)
-  {
-    updatingDOM = true;
-
-    boolean done = false;
-
-// System.out.println("?*");
-    Node previous = child.getPreviousSibling();
-    if (previous != null && previous.getNodeType() == Node.TEXT_NODE)
-    {
-      Text text = (Text)previous;
-      String data = text.getData();
-      int index = data.lastIndexOf('\n');
-      if (index != -1)
-      {
-        if (index - 1 > 0 && data.charAt(index - 1) == '\r')
-        {
-//System.out.println("1*");
-          text.deleteData(index - 1, data.length() - index + 1);
-        }
-        else
-        {
-//System.out.println("2*");
-          text.deleteData(index, data.length() - index);
-        }
-        done = true;
-      }
-      else
-      {
-        //System.out.println("No return before!");
-      }
-    }
-    else
-    {
-      // System.out.println("No text node before!");
-    }
-
-
-    if (!done)
-    {
-      for (Node next = child.getNextSibling(); next != null; next = next.getNextSibling())
-      {
-        if (next.getNodeType() == Node.TEXT_NODE)
-        {
-          Text text = (Text)next;
-          String data = text.getData();
-/*
-           System.out.print("xx " + data.length() + ":: ");
-          for (int i = 0; i < data.length(); ++i)
-          {
-             System.out.print(" " + Integer.toHexString((int)data.charAt(i)));
-          }
-          System.out.println();
-*/
-
-          int index = data.indexOf('\n');
-          if (index != -1)
-          {
-            if (index + 1 < data.length() && data.charAt(index + 1) == '\r')
-            {
-    // System.out.println("3*");
-              text.deleteData(0, index + 2);
-            }
-            else
-            {
-    //System.out.println("4*");
-              text.deleteData(0, index + 1);
-            }
-            break;
-          }
-          else
-          {
-            // System.out.println("No return after!");
-          }
-        }
-        else if (next.getNodeType() == Node.ELEMENT_NODE)
-        {
-          break;
-        }
-      }
-    }
-
-// System.out.println("Removing from--------\n     " + parent);
-// System.out.println("Removing--------\n     " + child);
-    if (parent != null)
-    	parent.removeChild(child);
-
-    updatingDOM=false;
-  }
- 
-  protected void moveContent(EReference eReference, WSDLElement wsdlElement)
-  {
-    if (isReconciling)
-    {
-      // System.out.println("**** cyclic dom writeback avoided " + eClass().getName());
-      return;
-    }
-    //System.out.println("moving " + xsdConcreteComponent);
-    Node parent = getAdoptionParentNode(eReference);
-    if (parent != null)
-    {
-      Element child = wsdlElement.getElement();
-      if (child != null)
-      {
-        List contents = getWSDLContents();
-        int index = contents.indexOf(wsdlElement);
-        niceRemoveChild(parent, child);
-        niceInsertBefore
-          (parent, 
-            child, 
-            ++index == contents.size() ?  
-              null : 
-              ((WSDLElement)contents.get(index)).getElement());
-      }
-    }
-    //System.out.println("moved " + xsdConcreteComponent);
-
-  }
-
-  protected void adoptContent(EReference eReference, Object object)
-  {
-    if (object instanceof WSDLElement)
-    {
-      WSDLElement wsdlElement = (WSDLElement) object;
-      if (isReconciling)
-      {
-        if (wsdlElement.getElement() != null)
-        {
-          ((WSDLElementImpl) wsdlElement).elementChanged(wsdlElement.getElement());
-        }
-      }
-      else
-      {
-        Element childElement = wsdlElement.getElement();
-        if (getElement() != null && (childElement == null || childElement.getParentNode() == null))
-        {
-          if (childElement != null && childElement.getOwnerDocument() != getElement().getOwnerDocument())
-          {
-            wsdlElement.setElement(null);
-            childElement = null;
-          }
-
-          handleElementForAdopt(eReference, wsdlElement);
-          ((WSDLElementImpl) wsdlElement).updateElement();
-        }
-      }
-
-      Definition definition = getEnclosingDefinition();
-      if (definition != null)
-      {
-        ((WSDLElementImpl) wsdlElement).adoptBy(definition);
-      }
-    }
-    else if (object instanceof Namespace)
-    {
-      // Add a namespace attribute to the Definitions element.
-      Namespace ns = (Namespace)object;
-      Node adoptionParent = getAdoptionParentNode(eReference); // Definitions node
-      // KB: Assumption - The prefix is unique if we are here (by the Definitions model). 
-	  if (adoptionParent != null) {
-		  ((Element)adoptionParent).setAttribute("xmlns:"+ns.getPrefix(),ns.getURI());
-	  }
-    }
-  }
-
-  protected Node getAdoptionParentNode(EReference eReference)
-  {
-    return getElement();
-  }
-  
-  protected void handleElementForAdopt(EReference eReference, WSDLElement wsdlElement)
-  { 
-    // Establish DOM parent-child relationship
-    
-    Node adoptionParent = getAdoptionParentNode(eReference);
-    Element childElement = wsdlElement.getElement();
-    Element referencedElement = null;
-    
-    for (Iterator contents = getWSDLContents().iterator(); contents.hasNext(); )
-    {
-      if (contents.next() == wsdlElement)
-      {
-        if (contents.hasNext())
-        {
-          Object next = contents.next();
-          if (next instanceof WSDLElement)
-          {
-            referencedElement = ((WSDLElement)next).getElement();
-            while (referencedElement != null)
-            {
-              Node parent = referencedElement.getParentNode(); 
-              if (parent == null )
-              {
-                referencedElement = null;
-                break;
-              }
-              else if (parent == adoptionParent)
-              {
-                break;
-              }
-              else if (parent.getNodeType() == Node.ELEMENT_NODE)
-              {
-                referencedElement = (Element)parent;
-              }
-              else
-              {
-                break;
-              }
-            }
-          }
-        }
-        break;
-      }
-    }
-   
-    boolean isNew = false;
-    if (childElement == null)
-    {
-      ((WSDLElementImpl)wsdlElement).isReconciling = true;
-      childElement = ((WSDLElementImpl)wsdlElement).createElement();
-      ((WSDLElementImpl)wsdlElement).isReconciling = false;
-      isNew = true;
-      if (childElement == null)
-      {
-         //System.out.println("not created! " + wsdlElement);
-         return;
-      }
-    }
-
-    boolean isAttached = false;
-    for (Node rootDocument = childElement; rootDocument != null; rootDocument = rootDocument.getParentNode())
-    {
-      if (WSDLConstants.nodeType(rootDocument) == WSDLConstants.DEFINITION)
-      {
-        isAttached = true;
-        break;
-      }
-    }
-    
-    if (!isAttached)
-    {
-      if (referencedElement == null && 
-          !eReference.isMany())
-    {
-      for (Node child = adoptionParent.getFirstChild(); child != null; child = child.getNextSibling())
-      {
-        if (child.getNodeType() == Node.ELEMENT_NODE)
-        {
-          referencedElement = (Element)child;
-          break;
-        }
-      }
-    }
-      //referencedElement = computeTopLevelRefChild(adoptionParent,childElement);     
-      niceInsertBefore(adoptionParent, childElement, referencedElement);
-    }
-  }
-
-  public void niceInsertBefore(Node parent, Node newChild, Node referenceChild)
-  {
-    if (isReconciling)
-    {
-      // System.out.println("**** cyclic dom writeback avoided " + eClass().getName());
-      return;
-    }
-
-    forceNiceInsertBefore(parent, newChild, referenceChild);
-  }
-
-  public void forceNiceInsertBefore(Node parent, Node newChild, Node referenceChild)
-  {
-    updatingDOM = true;
-
-    LOOP:
-    for (Node child = referenceChild == null ? parent.getLastChild() : referenceChild.getPreviousSibling(); 
-         child != null; 
-         child = child.getPreviousSibling())
-    {
-      switch (child.getNodeType())
-      {
-        case Node.TEXT_NODE:
-        {
-          Text text = (Text)child;
-          String data = text.getData();
-
-/*
-          System.out.print("xx " + data.length() + ":: ");
-          for (int i = 0; i < data.length(); ++i)
-          {
-            System.out.print(" " + Integer.toHexString((int)data.charAt(i)));
-          }
-          System.out.println();
-*/
-
-          int index = data.lastIndexOf('\n');
-          if (index != -1)
-          {
-// System.out.println("In here");
-
-            StringBuffer indent = new StringBuffer();
-            for (Node ancestor = parent.getParentNode(); 
-                 ancestor != null && ancestor.getNodeType() != Node.DOCUMENT_NODE; 
-                 ancestor = ancestor.getParentNode())
-            {
-              indent.append("    ");
-            }
-
-            if (index + 1 < data.length() && data.charAt(index + 1) == '\r')
-            {
-              ++index;
-            }
-            text.replaceData(index + 1, data.length() - index - 1, indent + "    ");
-
-            // setCorrectIndentation(indent, newText);
-            if (referenceChild != null)
-            {
-              indent.append("    ");
-            }
-            Text newText = parent.getOwnerDocument().createTextNode("\n" + indent);
-// System.out.println("Inserted..." + newText);
-            parent.insertBefore(newText, referenceChild);
-            referenceChild = newText;
-            break LOOP;
-          }
-
-          break;
-        } 
-        case Node.ELEMENT_NODE:
-        {
-          break LOOP;
-        }
-      }
-    }
-
-// System.out.println("Inserted..." + newChild);
-    parent.insertBefore(newChild, referenceChild);
-
-    updatingDOM = false;
-  }
-
-  protected Element computeTopLevelRefChild(Node parentNode, Node nodeToAdd)
-  {
-  	Element result = null;
-    int a = getPrecedence(nodeToAdd);
-      	
-    for (Node node = parentNode.getFirstChild(); node != null; node = node.getNextSibling())
-    {
-      if (node.getNodeType() == Node.ELEMENT_NODE)
-      {
-		    int b = getPrecedence(node);
-		    if (b >= a)
-		    {
-		      result = (Element)node;	
-	        break;	    
-		    }        
-      } 
-    }
-    return result;
-  }
-  
-  private HashMap precedenceMap = createPrecedenceMap();
-
-  private int getPrecedence(Node node)
-  {
-  	int result = 2;
-  	String localName = node.getLocalName();
-  	if (localName != null)
-  	{  	
-      Integer integer = (Integer)precedenceMap.get(localName);
-      if (integer != null)
-      {      
-        result = integer.intValue();
-      }
-  	}
-  	return result;
-  }
-    
-  private HashMap createPrecedenceMap()
-	{
-		HashMap hashMap = new HashMap();
-		hashMap.put(WSDLConstants.DOCUMENTATION_ELEMENT_TAG, new Integer(1));
-		hashMap.put(WSDLConstants.IMPORT_ELEMENT_TAG, new Integer(3));
-		hashMap.put(WSDLConstants.TYPES_ELEMENT_TAG, new Integer(4));
-		hashMap.put(WSDLConstants.MESSAGE_ELEMENT_TAG, new Integer(5));
-		hashMap.put(WSDLConstants.PORT_TYPE_ELEMENT_TAG, new Integer(6));
-		hashMap.put(WSDLConstants.BINDING_ELEMENT_TAG, new Integer(7));
-		hashMap.put(WSDLConstants.SERVICE_ELEMENT_TAG, new Integer(8));
-		return hashMap;
-	}
-
-  protected void adoptBy(Definition definition)
-  {
-    for (Iterator components = getWSDLContents().iterator(); components.hasNext();)
-    {
-      Object child = components.next();
-      if (child instanceof WSDLElementImpl)
-      {
-        ((WSDLElementImpl) child).adoptBy(definition);
-      }
-    }
-  }
-
-  protected boolean isUpdatingDOM()
-  {
-    return updatingDOM;
-  }
-
-  public void elementChanged(Element changedElement)
-  {
-    if (!isUpdatingDOM())
-    {
-      if (!isReconciling)
-      {
-        //System.out.println("**** changeFor " + eClass().getName());
-        isReconciling = true;
-        reconcile(changedElement);
-
-        WSDLElement theContainer = getContainer();
-        if (theContainer != null && theContainer.getElement() == changedElement)
-        {
-          ((WSDLElementImpl) theContainer).elementChanged(changedElement);
-        }
-
-        isReconciling = false;
-        traverseToRootForPatching();
-      }
-      else
-      {
-        ; //System.out.println("**** cyclic internal reconcile avoided " + eClass().getName());
-      }
-    }
-    else
-    {
-      ; //System.out.println("**** cyclic DOM reconcile avoided " + eClass().getName());
-    }
-  }
-
-  protected void handleUnreconciledElement(Element child, Collection remainingModelObjects)
-  {
-  }
-
-  protected void handleReconciliation(Collection remainingModelObjects)
-  {
-  }
-
-  /**
-   * @deprecated
-   * TODO... remove this method!
-   */
-  public Collection getModelObjects(Object component)
-  {
-    return getWSDLContents();
-  }
-
-  /*
-  protected Element getElementForModelObject(Object modelObject)
-  {
-    Element result = null;
-    if (modelObject instanceof Element)
-    {
-      result = (Element) modelObject;
-    }
-    else if (modelObject instanceof WSDLElement)
-    {
-      result = ((WSDLElement) modelObject).getElement();
-    }
-    return result;
-  }
-  */
-
-  private Collection getContentNodes(Element changedElement)
-  {
-    Collection result = new ArrayList();
-    for (Node child = changedElement.getFirstChild(); child != null; child = child.getNextSibling())
-    {
-      if (child.getNodeType() == Node.ELEMENT_NODE)
-      {
-        result.add(child);
-      }
-    }
-    return result;
-  }
-
-  // Some subclasses use this method
-  protected QName createQName(Definition definition, String prefixedName)
-  {
-    QName qname = null;
-    if (prefixedName != null)
-    {
-      int index = prefixedName.indexOf(":");
-      String prefix = (index == -1) ? "" : prefixedName.substring(0, index);
-      String namespace = definition.getNamespace(prefix);
-      if (namespace != null)
-      {
-        String localPart = prefixedName.substring(index + 1);
-        qname = new QName(namespace, localPart);       
-      }
-    }
-    return qname;
-  }
-
-  //
-  // For reconciliation: Model -> DOM
-  //
-
-  public void updateElement(boolean deep)
-  {
-    if (deep || getElement() == null)
-    {
-      updateElement();
-    }
-    else
-    {
-      changeAttribute(null);
-      changeReference(null);
-    }
-  }
-
-  public void updateElement()
-  {
-    if (getElement() == null)
-    {
-      isReconciling = true;
-      createElement();
-      isReconciling = false;
-    }
-
-    changeAttribute(null);
-    changeReference(null);
-
-    Object obj = null;
-    for (Iterator containments = eClass().getEAllContainments().iterator(); containments.hasNext();)
-    {
-      EReference eReference = (EReference) containments.next();
-      if (eReference == WSDLPackage.eINSTANCE.getXSDSchemaExtensibilityElement_Schema())
-      {
-        // TBD - This is an instance of XSDSchemaExtensibilityElement and
-        // eRefernce is XSDSchema. What do we want to do for update?
-      }
-      else if (!eReference.isTransient())
-      {
-        if (eReference.isMany())
-        {
-          for (Iterator objects = ((Collection) eGet(eReference)).iterator(); objects.hasNext();)
-          {
-            obj = objects.next();
-            if (!(obj instanceof WSDLElement) || obj == null)
-            {
-              // Skip it. Probably this is Namespace.
-            }
-            else
-            {
-              WSDLElement wsdlElement = (WSDLElement) obj;
-              //handleElementForAdopt(eReference, wsdlElement);
-               ((WSDLElementImpl) wsdlElement).updateElement();
-            }
-          }
-        }
-        else
-        {
-          WSDLElement wsdlElement = (WSDLElement) eGet(eReference);
-          if (wsdlElement != null)
-          {
-            //handleElementForAdopt(eReference,  wsdlElement);
-             ((WSDLElementImpl) wsdlElement).updateElement();
-          }
-        }
-      } // end else if
-    } // end for
-  }
-
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-    if (eAttribute == WSDLPackage.eINSTANCE.getWSDLElement_Element())
-    {
-      Element theElement = getElement();
-      if (theElement != null && !isReconciling)
-      {
-        for (Node rootDocument = theElement.getParentNode(); rootDocument != null; rootDocument = rootDocument.getParentNode())
-        {
-          if (rootDocument.getNodeType() == Node.DOCUMENT_NODE)
-          {
-            isReconciling = true;
-            if (getEnclosingDefinition() == null)
-            {
-              reconcileAttributes(getElement());
-              isReconciling = false;
-            }
-            else
-            {
-              reconcile(getElement());
-              isReconciling = false;
-              traverseToRootForPatching();
-            }
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  protected void traverseToRootForPatching()
-  {
-    if (!isReconciling)
-    {
-      WSDLElementImpl container = (WSDLElementImpl)getContainer();
-      if (container != null)
-      {
-        container.traverseToRootForPatching();
-      }
-    }
-  }
-
-  protected void reconcile(Element changedElement)
-  {
-    reconcileAttributes(changedElement);
-    reconcileContents(changedElement);
-  }
-
-  protected void reconcileAttributes(Element changedElement)
-  {
-  }
-
-  protected void reconcileContents(Element changedElement)
-  {
-    List remainingModelObjects = new ArrayList(getWSDLContents());
-
-    Collection contentNodes = getContentNodes(changedElement);
-
-    Element theDocumentationElement = null;
-    
-    // for each applicable child node of changedElement
-    LOOP : for (Iterator i = contentNodes.iterator(); i.hasNext();)
-    {
-      Element child = (Element) i.next();
-      // Set Documentation element if exists
-      if (WSDLConstants.DOCUMENTATION_ELEMENT_TAG.equals(child.getLocalName()) &&
-          WSDLConstants.isMatchingNamespace(child.getNamespaceURI(), WSDLConstants.WSDL_NAMESPACE_URI))
-      {
-        // assume the first 'documentation' element is 'the' documentation element
-        // 'there can be only one!'
-        if (theDocumentationElement == null)
-        {  
-          theDocumentationElement = child;
-        }   
-      } 
-      // go thru the model objects to collect matching object for reuse
-      for (Iterator contents = remainingModelObjects.iterator(); contents.hasNext();)
-      {
-        Object modelObject = (Object) contents.next();
-        if (((WSDLElement) modelObject).getElement() == child)
-        {
-          contents.remove(); // removes the 'child' Node from the remainingModelObjects list
-          continue LOOP;
-        }
-      }
-
-      // if the documentation element has changed... update it
-      //
-      if (theDocumentationElement != getDocumentationElement())
-      {
-        setDocumentationElement(theDocumentationElement);  
-      }  
-      
-      // we haven't found a matching model object for the Node, se we may need to
-      // create a new model object
-      handleUnreconciledElement(child, remainingModelObjects);
-    }
-
-    // now we can remove the remaining model objects
-    handleReconciliation(remainingModelObjects);
-
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Definition getEnclosingDefinition()
-  {
-    if (enclosingDefinition != null)
-      return enclosingDefinition;
-
-    // TBD - Revisit
-    //EObject c = eContaier(); c != null; c = c.eContainter())
-    //{
-
-    for (WSDLElement container = this; container != null; container = ((WSDLElementImpl) container).getContainer())
-    {
-      if (container instanceof Definition)
-      {
-        enclosingDefinition = (Definition) container;
-        return enclosingDefinition;
-      }
-    }
-
-    return null;
-  }
-
-  /*
-  public Definition getRootEnclosingDefinition()
-  {
-    if (enclosingDefinition == null)
-     {
-      Resource resource = eResource();
-      List contents = resource.getContents();
-      if (contents.size() == 1 
-          && contents.get(0) instanceof Definition)
-        enclosingDefinition = (Definition)contents.get(0);
-    } 
-    return enclosingDefinition;
-  }
-  */
-
-  public WSDLElement getContainer()
-  {
-    return eContainer() instanceof WSDLElement ? (WSDLElement) eContainer() : null;
-  }
-
-  protected void niceSetAttribute(Element element, String attribute, String value)
-  {
-    if (isReconciling)
-    {
-      //System.out.println("**** cyclic dom attribute writeback avoided " + eClass().getName());
-      return;
-    }
-
-    if (value == null)
-    {
-      if (element.hasAttributeNS(null, attribute))
-      {
-        updatingDOM = true;
-        element.removeAttribute(attribute);
-        updatingDOM = false;
-      }
-    }
-    else if (!element.hasAttributeNS(null, attribute) || !element.getAttributeNS(null, attribute).equals(value))
-    {
-      updatingDOM = true;
-      element.setAttributeNS(null, attribute, value);
-      updatingDOM = false;
-    }
-  }
-
-  protected String niceCreateNamespaceAttribute(String namespace)
-  {
-    // Create and return a unique prefix for "namespace."
-    return null;
-  }
-
-  protected void niceSetAttributeURIValue(Element element, String attribute, String uriList)
-  {
-    if (isReconciling)
-    {
-      // System.out.println("**** cyclic dom attribute writeback avoided " + eClass().getName());
-      return;
-    }
-
-    if (uriList == null)
-    {
-      updatingDOM = true;
-      element.removeAttribute(attribute);
-      updatingDOM = false;
-    }
-    else
-    {
-      StringBuffer value = new StringBuffer();
-      for (StringTokenizer stringTokenizer = new StringTokenizer(uriList, " "); stringTokenizer.hasMoreElements();)
-      {
-        String uri = stringTokenizer.nextToken();
-        String namespace = null;
-        String localName = uri;
-        int index = uri.lastIndexOf("#");
-        if (index != -1)
-        {
-          if (index > 0)
-          {
-            namespace = uri.substring(0, index);
-          }
-          localName = uri.substring(index + 1);
-        }
-        String qualifier = XSDConstants.lookupQualifier(element, namespace);
-        if (qualifier == null)
-        {
-          qualifier = niceCreateNamespaceAttribute(namespace);
-        }
-
-        String qName = qualifier == null || qualifier.length() == 0 ? localName : qualifier + ":" + localName;
-
-        if (value.length() != 0)
-        {
-          value.append(' ');
-        }
-        value.append(qName);
-      }
-
-      if (!element.hasAttributeNS(null, attribute) || !element.getAttributeNS(null, attribute).equals(value.toString()))
-      {
-        updatingDOM = true;
-        element.setAttributeNS(null, attribute, value.toString());
-        updatingDOM = false;
-      }
-    }
-  }
-
-  protected void changeReference(EReference eReference)
-  {
-  }
-
-  protected Element createElement() // Should I make this abstract?
-  {
-    return null;
-  }
-
-  protected final Element createElement(int nodeType)
-  {
-    Definition definition = null;
-    if (this instanceof Definition)
-      definition = (Definition) this;
-    else
-      definition = getEnclosingDefinition();
-
-    if (definition == null)
-      return null;
-
-    Document document = definition.getDocument();
-    if (document == null)
-      document = ((DefinitionImpl) definition).updateDocument();
-
-    // Retrieve the namespace prefix for the WSDL namespace
-    String wsdlNamespace = WSDLConstants.WSDL_NAMESPACE_URI;
-    String qualifier = definition.getPrefix(wsdlNamespace);
-
-    Element newElement = document.createElementNS(wsdlNamespace, (qualifier == null ? "" : qualifier + ":") + WSDLConstants.getElementTag(nodeType));
-
-    if (document.getDocumentElement() == null)
-      document.appendChild(newElement);
-
-    if (getDocumentationElement() != null)
-      newElement.appendChild(document.importNode(getDocumentationElement(), true));
-
-    return newElement;
-  }
-
-  public void reconcileReferences(boolean deep)
-  {
-    if (deep)
-    {
-      for (Iterator contents = getWSDLContents().iterator(); contents.hasNext();)
-      {
-        Object content = contents.next();
-        if (content instanceof WSDLElementImpl)
-        {
-          WSDLElementImpl element = (WSDLElementImpl) content;
-          element.isReconciling = true;
-          element.reconcileReferences(true);
-          element.isReconciling = false;
-        }
-      }
-    }
-  }
-  
-  public WSDLElement getBestWSDLElement(List elementPath)
-  {
-    WSDLElement result = this;
-    for (Iterator components = getWSDLContents().iterator(); components.hasNext(); )
-    {
-      WSDLElementImpl childWSDLElement = (WSDLElementImpl)components.next();
-      if (elementPath.contains(childWSDLElement.getElement()))
-      {
-        result = childWSDLElement;
-        WSDLElement betterWSDLElement = childWSDLElement.getBestWSDLElement(elementPath);
-        if (betterWSDLElement != null)
-        {
-          result = betterWSDLElement;
-        }
-
-        if (!considerAllContainsForBestWSDLElement())
-        {
-          break;
-        }
-      }
-    }
-
-    return result;
-  }
-
-  protected boolean considerAllContainsForBestWSDLElement()
-  {
-    return false;
-  }
-  
-    public void elementAttributesChanged(Element changedElement)
-  {
-    if (!isUpdatingDOM())
-    {
-      if (!isReconciling)
-      {
-        // System.out.println("**** changeFor " + eClass().getName());
-    
-        isReconciling = true;
-        reconcileAttributes(changedElement);
-
-        WSDLElementImpl theContainer = (WSDLElementImpl)getContainer();
-        if (theContainer != null && theContainer.getElement() == changedElement)
-        {
-          theContainer.elementAttributesChanged(changedElement);
-        }
-
-        isReconciling = false;
-        traverseToRootForPatching();
-      }
-      else
-      {
-        // System.out.println("**** cyclic internal reconcile avoided " + eClass().getName());
-      }
-    }
-    else
-    {
-      // System.out.println("**** cyclic DOM reconcile avoided " + eClass().getName());
-    }
-  }
-
-  public void elementContentsChanged(Element changedElement)
-  {
-    if (!isUpdatingDOM())
-    {
-      if (!isReconciling)
-      {
-        // System.out.println("**** changeFor " + eClass().getName());
-    
-        isReconciling = true;
-        reconcileContents(changedElement);
-
-        WSDLElementImpl theContainer = (WSDLElementImpl)getContainer();
-        if (theContainer != null && theContainer.getElement() == changedElement)
-        {
-          theContainer.elementContentsChanged(changedElement);
-        }
-
-        isReconciling = false;
-        traverseToRootForPatching();
-      }
-      else
-      {
-        // System.out.println("**** cyclic internal reconcile avoided " + eClass().getName());
-      }
-    }
-    else
-    {
-      // System.out.println("**** cyclic DOM reconcile avoided " + eClass().getName());
-    }
-  }
-  
-  protected void updatePrefix(Node node, String namespace, String oldPrefix, String newPrefix)
-  {
-    if ((namespace == null ? node.getNamespaceURI() == null : namespace.equals(node.getNamespaceURI())) &&
-          (oldPrefix == null ? node.getPrefix() == null : oldPrefix.equals(node.getPrefix())))
-    {
-      node.setPrefix(newPrefix);
-    }
-
-    for (Node child = node.getFirstChild(); child != null; child = child.getNextSibling())
-    {
-      updatePrefix(child, namespace, oldPrefix, newPrefix);
-    }
-  } 
-
-  protected String getNamespace(Element element)
-  {
-    String name = element.getTagName();
-    int index = name.indexOf(":");
-    if (index == -1)
-      return null;
-    else if (getEnclosingDefinition() != null)
-      return getEnclosingDefinition().getNamespace(name.substring(0,index));
-    else
-      return null;
-  }
-  
-  protected String getLocalName(Element element)
-  {
-    String name = element.getTagName();
-    int index = name.indexOf(":");
-    if ( index == -1)
-      return name;
-    else
-      return name.substring(index+1);
-  }
-
-} //WSDLElementImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/WSDLFactoryImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/WSDLFactoryImpl.java
deleted file mode 100644
index c6cdfd3d9..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/WSDLFactoryImpl.java
+++ /dev/null
@@ -1,523 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl;
-
-import javax.wsdl.OperationType;
-import javax.wsdl.WSDLException;
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Namespace;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.Types;
-import org.eclipse.wst.wsdl.UnknownExtensibilityElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.WSDLPlugin;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.wsdl.util.ExtensibilityElementFactory;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class WSDLFactoryImpl extends EFactoryImpl implements WSDLFactory
-{
-  /**
-   * Creates and instance of the factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public WSDLFactoryImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EObject create(EClass eClass)
-  {
-    switch (eClass.getClassifierID())
-    {
-      case WSDLPackage.PORT_TYPE: return createPortType();
-      case WSDLPackage.OPERATION: return createOperation();
-      case WSDLPackage.MESSAGE: return createMessage();
-      case WSDLPackage.PART: return createPart();
-      case WSDLPackage.BINDING: return createBinding();
-      case WSDLPackage.BINDING_OPERATION: return createBindingOperation();
-      case WSDLPackage.SERVICE: return createService();
-      case WSDLPackage.PORT: return createPort();
-      case WSDLPackage.EXTENSIBILITY_ELEMENT: return createExtensibilityElement();
-      case WSDLPackage.DEFINITION: return createDefinition();
-      case WSDLPackage.IMPORT: return createImport();
-      case WSDLPackage.INPUT: return createInput();
-      case WSDLPackage.OUTPUT: return createOutput();
-      case WSDLPackage.FAULT: return createFault();
-      case WSDLPackage.BINDING_INPUT: return createBindingInput();
-      case WSDLPackage.BINDING_OUTPUT: return createBindingOutput();
-      case WSDLPackage.BINDING_FAULT: return createBindingFault();
-      case WSDLPackage.NAMESPACE: return createNamespace();
-      case WSDLPackage.TYPES: return createTypes();
-      case WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT: return createUnknownExtensibilityElement();
-      case WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT: return createXSDSchemaExtensibilityElement();
-      default:
-        throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object createFromString(EDataType eDataType, String initialValue)
-  {
-    switch (eDataType.getClassifierID())
-    {
-      case WSDLPackage.QNAME:
-        return createQNameFromString(eDataType, initialValue);
-      case WSDLPackage.OPERATION_TYPE:
-        return createOperationTypeFromString(eDataType, initialValue);
-      case WSDLPackage.DOM_ELEMENT:
-        return createDOMElementFromString(eDataType, initialValue);
-      case WSDLPackage.WSDL_EXCEPTION:
-        return createWSDLExceptionFromString(eDataType, initialValue);
-      case WSDLPackage.DOM_DOCUMENT:
-        return createDOMDocumentFromString(eDataType, initialValue);
-      default:
-        throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String convertToString(EDataType eDataType, Object instanceValue)
-  {
-    switch (eDataType.getClassifierID())
-    {
-      case WSDLPackage.QNAME:
-        return convertQNameToString(eDataType, instanceValue);
-      case WSDLPackage.OPERATION_TYPE:
-        return convertOperationTypeToString(eDataType, instanceValue);
-      case WSDLPackage.DOM_ELEMENT:
-        return convertDOMElementToString(eDataType, instanceValue);
-      case WSDLPackage.WSDL_EXCEPTION:
-        return convertWSDLExceptionToString(eDataType, instanceValue);
-      case WSDLPackage.DOM_DOCUMENT:
-        return convertDOMDocumentToString(eDataType, instanceValue);
-      default:
-        throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public PortType createPortType()
-  {
-    PortTypeImpl portType = new PortTypeImpl();
-    return portType;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Operation createOperation()
-  {
-    OperationImpl operation = new OperationImpl();
-    return operation;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Message createMessage()
-  {
-    MessageImpl message = new MessageImpl();
-    return message;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Part createPart()
-  {
-    PartImpl part = new PartImpl();
-    return part;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Binding createBinding()
-  {
-    BindingImpl binding = new BindingImpl();
-    return binding;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public BindingOperation createBindingOperation()
-  {
-    BindingOperationImpl bindingOperation = new BindingOperationImpl();
-    return bindingOperation;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Service createService()
-  {
-    ServiceImpl service = new ServiceImpl();
-    return service;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Port createPort()
-  {
-    PortImpl port = new PortImpl();
-    return port;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ExtensibilityElement createExtensibilityElement()
-  {
-    ExtensibilityElementImpl extensibilityElement = new ExtensibilityElementImpl();
-    return extensibilityElement;
-  }   
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Definition createDefinition()
-  {
-    DefinitionImpl definition = new DefinitionImpl();
-    return definition;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Import createImport()
-  {
-    ImportImpl import_ = new ImportImpl();
-    return import_;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Input createInput()
-  {
-    InputImpl input = new InputImpl();
-    return input;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Output createOutput()
-  {
-    OutputImpl output = new OutputImpl();
-    return output;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Fault createFault()
-  {
-    FaultImpl fault = new FaultImpl();
-    return fault;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public BindingInput createBindingInput()
-  {
-    BindingInputImpl bindingInput = new BindingInputImpl();
-    return bindingInput;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public BindingOutput createBindingOutput()
-  {
-    BindingOutputImpl bindingOutput = new BindingOutputImpl();
-    return bindingOutput;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public BindingFault createBindingFault()
-  {
-    BindingFaultImpl bindingFault = new BindingFaultImpl();
-    return bindingFault;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Namespace createNamespace()
-  {
-    NamespaceImpl namespace = new NamespaceImpl();
-    return namespace;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Types createTypes()
-  {
-    TypesImpl types = new TypesImpl();
-    return types;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public UnknownExtensibilityElement createUnknownExtensibilityElement()
-  {
-    UnknownExtensibilityElementImpl unknownExtensibilityElement = new UnknownExtensibilityElementImpl();
-    return unknownExtensibilityElement;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public XSDSchemaExtensibilityElement createXSDSchemaExtensibilityElement()
-  {
-    XSDSchemaExtensibilityElementImpl xsdSchemaExtensibilityElement = new XSDSchemaExtensibilityElementImpl();
-    return xsdSchemaExtensibilityElement;
-  }
-  
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public QName createQNameFromString(EDataType eDataType, String initialValue)
-  {
-    return (QName)super.createFromString(eDataType, initialValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String convertQNameToString(EDataType eDataType, Object instanceValue)
-  {
-    return super.convertToString(eDataType, instanceValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public OperationType createOperationTypeFromString(EDataType eDataType, String initialValue)
-  {
-    return (OperationType)super.createFromString(eDataType, initialValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String convertOperationTypeToString(EDataType eDataType, Object instanceValue)
-  {
-    return super.convertToString(eDataType, instanceValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Element createDOMElementFromString(EDataType eDataType, String initialValue)
-  {
-    return (Element)super.createFromString(eDataType, initialValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String convertDOMElementToString(EDataType eDataType, Object instanceValue)
-  {
-    return super.convertToString(eDataType, instanceValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public WSDLException createWSDLExceptionFromString(EDataType eDataType, String initialValue)
-  {
-    return (WSDLException)super.createFromString(eDataType, initialValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String convertWSDLExceptionToString(EDataType eDataType, Object instanceValue)
-  {
-    return super.convertToString(eDataType, instanceValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Document createDOMDocumentFromString(EDataType eDataType, String initialValue)
-  {
-    return (Document)super.createFromString(eDataType, initialValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String convertDOMDocumentToString(EDataType eDataType, Object instanceValue)
-  {
-    return super.convertToString(eDataType, instanceValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public WSDLPackage getWSDLPackage()
-  {
-    return (WSDLPackage)getEPackage();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @deprecated
-   * @generated
-   */
-  public static WSDLPackage getPackage()
-  {
-    return WSDLPackage.eINSTANCE;
-  }
-  
-  //
-  //
-  //
-  public ExtensibilityElement createExtensibilityElement(String namespace, String localName)
-  {
-    ExtensibilityElementFactory factory = WSDLPlugin.INSTANCE.getExtensibilityElementFactory(namespace);
-    if (factory != null)
-      return factory.createExtensibilityElement(namespace, localName);
-    else
-      return createUnknownExtensibilityElement();
-  }
-  
-  /*
-  public void setAlwaysUseUnknownExtensibilityElement(boolean value)
-  {
-    System.out.println("Deprecated: WSDLFactoryImpl.setUseExtensionFactories");
-  }
-  */
-} //WSDLFactoryImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/WSDLPackageImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/WSDLPackageImpl.java
deleted file mode 100644
index 2b3111bf9..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/WSDLPackageImpl.java
+++ /dev/null
@@ -1,2506 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl;
-
-import java.net.URL;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.wsdl.OperationType;
-import javax.wsdl.WSDLException;
-import javax.wsdl.extensions.ExtensionRegistry;
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EOperation;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.ExtensibleElement;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.MessageReference;
-import org.eclipse.wst.wsdl.Namespace;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.Types;
-import org.eclipse.wst.wsdl.UnknownExtensibilityElement;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.xsd.XSDPackage;
-import org.eclipse.xsd.impl.XSDPackageImpl;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class WSDLPackageImpl extends EPackageImpl implements WSDLPackage
-{
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass wsdlElementEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass portTypeEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass operationEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass messageEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass partEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass bindingEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass bindingOperationEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass serviceEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass portEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass extensibilityElementEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass definitionEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass importEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass extensibleElementEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass inputEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass outputEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass faultEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass bindingInputEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass bindingOutputEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass bindingFaultEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass namespaceEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass iPortTypeEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass iOperationEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass iInputEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass iOutputEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass iFaultEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass iMessageEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass iPartEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass iServiceEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass iPortEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass iBindingEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass iBindingOperationEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass iBindingInputEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass iBindingOutputEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass iBindingFaultEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass iExtensibilityElementEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass iDefinitionEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass iImportEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass iListEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass iMapEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass iurlEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass iExtensionRegistryEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass typesEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass iIteratorEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass iTypesEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass unknownExtensibilityElementEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass xsdSchemaExtensibilityElementEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass messageReferenceEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EDataType qNameEDataType = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EDataType operationTypeEDataType = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EDataType domElementEDataType = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EDataType wsdlExceptionEDataType = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EDataType domDocumentEDataType = null;
-
-    /**
-     * Creates an instance of the model <b>Package</b>, registered with
-     * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-     * package URI value.
-     * <p>Note: the correct way to create the package is via the static
-     * factory method {@link #init init()}, which also performs
-     * initialization of the package, or returns the registered package,
-     * if one already exists.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.emf.ecore.EPackage.Registry
-     * @see org.eclipse.wst.wsdl.WSDLPackage#eNS_URI
-     * @see #init()
-     * @generated
-     */
-    private WSDLPackageImpl()
-    {
-        super(eNS_URI, WSDLFactory.eINSTANCE);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private static boolean isInited = false;
-
-    /**
-     * Creates, registers, and initializes the <b>Package</b> for this
-     * model, and for any others upon which it depends.  Simple
-     * dependencies are satisfied by calling this method on all
-     * dependent packages before doing anything else.  This method drives
-     * initialization for interdependent packages directly, in parallel
-     * with this package, itself.
-     * <p>Of this package and its interdependencies, all packages which
-     * have not yet been registered by their URI values are first created
-     * and registered.  The packages are then initialized in two steps:
-     * meta-model objects for all of the packages are created before any
-     * are initialized, since one package's meta-model objects may refer to
-     * those of another.
-     * <p>Invocation of this method will not affect any packages that have
-     * already been initialized.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #eNS_URI
-     * @see #createPackageContents()
-     * @see #initializePackageContents()
-     * @generated
-     */
-    public static WSDLPackage init()
-    {
-        if (isInited) return (WSDLPackage)EPackage.Registry.INSTANCE.getEPackage(WSDLPackage.eNS_URI);
-
-        // Obtain or create and register package
-        WSDLPackageImpl theWSDLPackage = (WSDLPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof WSDLPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new WSDLPackageImpl());
-
-        isInited = true;
-
-        // Initialize simple dependencies
-        XSDPackageImpl.init();
-
-        // Create package meta-data objects
-        theWSDLPackage.createPackageContents();
-
-        theWSDLPackage.initializePackageContents();
-
-        // Mark meta-data to indicate it can't be changed
-        theWSDLPackage.freeze();
-
-        return theWSDLPackage;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getWSDLElement()
-    {
-        return wsdlElementEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getWSDLElement_DocumentationElement()
-    {
-        return (EAttribute) wsdlElementEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getWSDLElement_Element()
-    {
-        return (EAttribute) wsdlElementEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getPortType()
-    {
-        return portTypeEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getPortType_QName()
-    {
-        return (EAttribute) portTypeEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getPortType_Undefined()
-    {
-        return (EAttribute) portTypeEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getPortType_Proxy()
-    {
-        return (EAttribute) portTypeEClass.getEStructuralFeatures().get(2);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getPortType_ResourceURI()
-    {
-        return (EAttribute) portTypeEClass.getEStructuralFeatures().get(3);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getPortType_EOperations()
-    {
-        return (EReference) portTypeEClass.getEStructuralFeatures().get(4);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getOperation()
-    {
-        return operationEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getOperation_Style()
-    {
-        return (EAttribute) operationEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getOperation_Name()
-    {
-        return (EAttribute) operationEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getOperation_Undefined()
-    {
-        return (EAttribute) operationEClass.getEStructuralFeatures().get(2);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getOperation_Proxy()
-    {
-        return (EAttribute) operationEClass.getEStructuralFeatures().get(3);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getOperation_ResourceURI()
-    {
-        return (EAttribute) operationEClass.getEStructuralFeatures().get(4);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getOperation_EInput()
-    {
-        return (EReference) operationEClass.getEStructuralFeatures().get(5);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getOperation_EOutput()
-    {
-        return (EReference) operationEClass.getEStructuralFeatures().get(6);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getOperation_EFaults()
-    {
-        return (EReference) operationEClass.getEStructuralFeatures().get(7);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getOperation_EParameterOrdering()
-    {
-        return (EReference) operationEClass.getEStructuralFeatures().get(8);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getMessage()
-    {
-        return messageEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getMessage_QName()
-    {
-        return (EAttribute) messageEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getMessage_Undefined()
-    {
-        return (EAttribute) messageEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getMessage_Proxy()
-    {
-        return (EAttribute) messageEClass.getEStructuralFeatures().get(2);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getMessage_ResourceURI()
-    {
-        return (EAttribute) messageEClass.getEStructuralFeatures().get(3);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getMessage_EParts()
-    {
-        return (EReference) messageEClass.getEStructuralFeatures().get(4);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getPart()
-    {
-        return partEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getPart_Name()
-    {
-        return (EAttribute) partEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getPart_ElementName()
-    {
-        return (EAttribute) partEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getPart_TypeName()
-    {
-        return (EAttribute) partEClass.getEStructuralFeatures().get(2);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getPart_TypeDefinition()
-    {
-        return (EReference) partEClass.getEStructuralFeatures().get(3);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getPart_ElementDeclaration()
-    {
-        return (EReference) partEClass.getEStructuralFeatures().get(4);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getPart_EMessage()
-    {
-        return (EReference) partEClass.getEStructuralFeatures().get(5);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getBinding()
-    {
-        return bindingEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getBinding_QName()
-    {
-        return (EAttribute) bindingEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getBinding_Undefined()
-    {
-        return (EAttribute) bindingEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getBinding_Proxy()
-    {
-        return (EAttribute) bindingEClass.getEStructuralFeatures().get(2);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getBinding_ResourceURI()
-    {
-        return (EAttribute) bindingEClass.getEStructuralFeatures().get(3);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getBinding_EPortType()
-    {
-        return (EReference) bindingEClass.getEStructuralFeatures().get(4);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getBinding_EBindingOperations()
-    {
-        return (EReference) bindingEClass.getEStructuralFeatures().get(5);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getBindingOperation()
-    {
-        return bindingOperationEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getBindingOperation_Name()
-    {
-        return (EAttribute) bindingOperationEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getBindingOperation_EOperation()
-    {
-        return (EReference) bindingOperationEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getBindingOperation_EBindingInput()
-    {
-        return (EReference) bindingOperationEClass.getEStructuralFeatures().get(2);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getBindingOperation_EBindingOutput()
-    {
-        return (EReference) bindingOperationEClass.getEStructuralFeatures().get(3);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getBindingOperation_EBindingFaults()
-    {
-        return (EReference) bindingOperationEClass.getEStructuralFeatures().get(4);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getService()
-    {
-        return serviceEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getService_QName()
-    {
-        return (EAttribute) serviceEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getService_Undefined()
-    {
-        return (EAttribute) serviceEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getService_Proxy()
-    {
-        return (EAttribute) serviceEClass.getEStructuralFeatures().get(2);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getService_ResourceURI()
-    {
-        return (EAttribute) serviceEClass.getEStructuralFeatures().get(3);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getService_EPorts()
-    {
-        return (EReference) serviceEClass.getEStructuralFeatures().get(4);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getPort()
-    {
-        return portEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getPort_Name()
-    {
-        return (EAttribute) portEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getPort_EBinding()
-    {
-        return (EReference) portEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getExtensibilityElement()
-    {
-        return extensibilityElementEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getExtensibilityElement_Required()
-    {
-        return (EAttribute) extensibilityElementEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getExtensibilityElement_ElementType()
-    {
-        return (EAttribute) extensibilityElementEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getDefinition()
-    {
-        return definitionEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getDefinition_TargetNamespace()
-    {
-        return (EAttribute) definitionEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getDefinition_Location()
-    {
-        return (EAttribute) definitionEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getDefinition_QName()
-    {
-        return (EAttribute) definitionEClass.getEStructuralFeatures().get(2);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getDefinition_Encoding()
-    {
-        return (EAttribute) definitionEClass.getEStructuralFeatures().get(3);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getDefinition_EMessages()
-    {
-        return (EReference) definitionEClass.getEStructuralFeatures().get(4);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getDefinition_EPortTypes()
-    {
-        return (EReference) definitionEClass.getEStructuralFeatures().get(5);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getDefinition_EBindings()
-    {
-        return (EReference) definitionEClass.getEStructuralFeatures().get(6);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getDefinition_EServices()
-    {
-        return (EReference) definitionEClass.getEStructuralFeatures().get(7);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getDefinition_ENamespaces()
-    {
-        return (EReference) definitionEClass.getEStructuralFeatures().get(8);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getDefinition_ETypes()
-    {
-        return (EReference) definitionEClass.getEStructuralFeatures().get(9);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getDefinition_EImports()
-    {
-        return (EReference) definitionEClass.getEStructuralFeatures().get(10);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getImport()
-    {
-        return importEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getImport_NamespaceURI()
-    {
-        return (EAttribute) importEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getImport_LocationURI()
-    {
-        return (EAttribute) importEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getImport_EDefinition()
-    {
-        return (EReference) importEClass.getEStructuralFeatures().get(2);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getImport_ESchema()
-    {
-        return (EReference) importEClass.getEStructuralFeatures().get(3);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getExtensibleElement()
-    {
-        return extensibleElementEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getExtensibleElement_EExtensibilityElements()
-    {
-        return (EReference) extensibleElementEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getInput()
-    {
-        return inputEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getOutput()
-    {
-        return outputEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getFault()
-    {
-        return faultEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getBindingInput()
-    {
-        return bindingInputEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getBindingInput_Name()
-    {
-        return (EAttribute) bindingInputEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getBindingInput_EInput()
-    {
-        return (EReference) bindingInputEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getBindingOutput()
-    {
-        return bindingOutputEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getBindingOutput_Name()
-    {
-        return (EAttribute) bindingOutputEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getBindingOutput_EOutput()
-    {
-        return (EReference) bindingOutputEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getBindingFault()
-    {
-        return bindingFaultEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getBindingFault_Name()
-    {
-        return (EAttribute) bindingFaultEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getBindingFault_EFault()
-    {
-        return (EReference) bindingFaultEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getNamespace()
-    {
-        return namespaceEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getNamespace_URI()
-    {
-        return (EAttribute) namespaceEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getNamespace_Prefix()
-    {
-        return (EAttribute) namespaceEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getIPortType()
-    {
-        return iPortTypeEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getIOperation()
-    {
-        return iOperationEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getIInput()
-    {
-        return iInputEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getIOutput()
-    {
-        return iOutputEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getIFault()
-    {
-        return iFaultEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getIMessage()
-    {
-        return iMessageEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getIPart()
-    {
-        return iPartEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getIService()
-    {
-        return iServiceEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getIPort()
-    {
-        return iPortEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getIBinding()
-    {
-        return iBindingEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getIBindingOperation()
-    {
-        return iBindingOperationEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getIBindingInput()
-    {
-        return iBindingInputEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getIBindingOutput()
-    {
-        return iBindingOutputEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getIBindingFault()
-    {
-        return iBindingFaultEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getIExtensibilityElement()
-    {
-        return iExtensibilityElementEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getIDefinition()
-    {
-        return iDefinitionEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getIImport()
-    {
-        return iImportEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getIList()
-    {
-        return iListEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getIMap()
-    {
-        return iMapEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getIURL()
-    {
-        return iurlEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getIExtensionRegistry()
-    {
-        return iExtensionRegistryEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getTypes()
-    {
-        return typesEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getIIterator()
-    {
-        return iIteratorEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getITypes()
-    {
-        return iTypesEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getUnknownExtensibilityElement()
-    {
-        return unknownExtensibilityElementEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getUnknownExtensibilityElement_Children()
-    {
-        return (EReference) unknownExtensibilityElementEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getXSDSchemaExtensibilityElement()
-    {
-        return xsdSchemaExtensibilityElementEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getXSDSchemaExtensibilityElement_Schema()
-    {
-        return (EReference) xsdSchemaExtensibilityElementEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getMessageReference()
-    {
-        return messageReferenceEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getMessageReference_Name()
-    {
-        return (EAttribute) messageReferenceEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getMessageReference_EMessage()
-    {
-        return (EReference) messageReferenceEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EDataType getQName()
-    {
-        return qNameEDataType;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EDataType getOperationType()
-    {
-        return operationTypeEDataType;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EDataType getDOMElement()
-    {
-        return domElementEDataType;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EDataType getWSDLException()
-    {
-        return wsdlExceptionEDataType;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EDataType getDOMDocument()
-    {
-        return domDocumentEDataType;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public WSDLFactory getWSDLFactory()
-    {
-        return (WSDLFactory) getEFactoryInstance();
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private boolean isCreated = false;
-
-    /**
-     * Creates the meta-model objects for the package.  This method is
-     * guarded to have no affect on any invocation but its first.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void createPackageContents()
-    {
-        if (isCreated) return;
-        isCreated = true;
-
-        // Create classes and their features
-        wsdlElementEClass = createEClass(WSDL_ELEMENT);
-        createEAttribute(wsdlElementEClass, WSDL_ELEMENT__DOCUMENTATION_ELEMENT);
-        createEAttribute(wsdlElementEClass, WSDL_ELEMENT__ELEMENT);
-
-        portTypeEClass = createEClass(PORT_TYPE);
-        createEAttribute(portTypeEClass, PORT_TYPE__QNAME);
-        createEAttribute(portTypeEClass, PORT_TYPE__UNDEFINED);
-        createEAttribute(portTypeEClass, PORT_TYPE__PROXY);
-        createEAttribute(portTypeEClass, PORT_TYPE__RESOURCE_URI);
-        createEReference(portTypeEClass, PORT_TYPE__EOPERATIONS);
-
-        operationEClass = createEClass(OPERATION);
-        createEAttribute(operationEClass, OPERATION__STYLE);
-        createEAttribute(operationEClass, OPERATION__NAME);
-        createEAttribute(operationEClass, OPERATION__UNDEFINED);
-        createEAttribute(operationEClass, OPERATION__PROXY);
-        createEAttribute(operationEClass, OPERATION__RESOURCE_URI);
-        createEReference(operationEClass, OPERATION__EINPUT);
-        createEReference(operationEClass, OPERATION__EOUTPUT);
-        createEReference(operationEClass, OPERATION__EFAULTS);
-        createEReference(operationEClass, OPERATION__EPARAMETER_ORDERING);
-
-        messageEClass = createEClass(MESSAGE);
-        createEAttribute(messageEClass, MESSAGE__QNAME);
-        createEAttribute(messageEClass, MESSAGE__UNDEFINED);
-        createEAttribute(messageEClass, MESSAGE__PROXY);
-        createEAttribute(messageEClass, MESSAGE__RESOURCE_URI);
-        createEReference(messageEClass, MESSAGE__EPARTS);
-
-        partEClass = createEClass(PART);
-        createEAttribute(partEClass, PART__NAME);
-        createEAttribute(partEClass, PART__ELEMENT_NAME);
-        createEAttribute(partEClass, PART__TYPE_NAME);
-        createEReference(partEClass, PART__TYPE_DEFINITION);
-        createEReference(partEClass, PART__ELEMENT_DECLARATION);
-        createEReference(partEClass, PART__EMESSAGE);
-
-        bindingEClass = createEClass(BINDING);
-        createEAttribute(bindingEClass, BINDING__QNAME);
-        createEAttribute(bindingEClass, BINDING__UNDEFINED);
-        createEAttribute(bindingEClass, BINDING__PROXY);
-        createEAttribute(bindingEClass, BINDING__RESOURCE_URI);
-        createEReference(bindingEClass, BINDING__EPORT_TYPE);
-        createEReference(bindingEClass, BINDING__EBINDING_OPERATIONS);
-
-        bindingOperationEClass = createEClass(BINDING_OPERATION);
-        createEAttribute(bindingOperationEClass, BINDING_OPERATION__NAME);
-        createEReference(bindingOperationEClass, BINDING_OPERATION__EOPERATION);
-        createEReference(bindingOperationEClass, BINDING_OPERATION__EBINDING_INPUT);
-        createEReference(bindingOperationEClass, BINDING_OPERATION__EBINDING_OUTPUT);
-        createEReference(bindingOperationEClass, BINDING_OPERATION__EBINDING_FAULTS);
-
-        serviceEClass = createEClass(SERVICE);
-        createEAttribute(serviceEClass, SERVICE__QNAME);
-        createEAttribute(serviceEClass, SERVICE__UNDEFINED);
-        createEAttribute(serviceEClass, SERVICE__PROXY);
-        createEAttribute(serviceEClass, SERVICE__RESOURCE_URI);
-        createEReference(serviceEClass, SERVICE__EPORTS);
-
-        portEClass = createEClass(PORT);
-        createEAttribute(portEClass, PORT__NAME);
-        createEReference(portEClass, PORT__EBINDING);
-
-        extensibilityElementEClass = createEClass(EXTENSIBILITY_ELEMENT);
-        createEAttribute(extensibilityElementEClass, EXTENSIBILITY_ELEMENT__REQUIRED);
-        createEAttribute(extensibilityElementEClass, EXTENSIBILITY_ELEMENT__ELEMENT_TYPE);
-
-        definitionEClass = createEClass(DEFINITION);
-        createEAttribute(definitionEClass, DEFINITION__TARGET_NAMESPACE);
-        createEAttribute(definitionEClass, DEFINITION__LOCATION);
-        createEAttribute(definitionEClass, DEFINITION__QNAME);
-        createEAttribute(definitionEClass, DEFINITION__ENCODING);
-        createEReference(definitionEClass, DEFINITION__EMESSAGES);
-        createEReference(definitionEClass, DEFINITION__EPORT_TYPES);
-        createEReference(definitionEClass, DEFINITION__EBINDINGS);
-        createEReference(definitionEClass, DEFINITION__ESERVICES);
-        createEReference(definitionEClass, DEFINITION__ENAMESPACES);
-        createEReference(definitionEClass, DEFINITION__ETYPES);
-        createEReference(definitionEClass, DEFINITION__EIMPORTS);
-
-        importEClass = createEClass(IMPORT);
-        createEAttribute(importEClass, IMPORT__NAMESPACE_URI);
-        createEAttribute(importEClass, IMPORT__LOCATION_URI);
-        createEReference(importEClass, IMPORT__EDEFINITION);
-        createEReference(importEClass, IMPORT__ESCHEMA);
-
-        extensibleElementEClass = createEClass(EXTENSIBLE_ELEMENT);
-        createEReference(extensibleElementEClass, EXTENSIBLE_ELEMENT__EEXTENSIBILITY_ELEMENTS);
-
-        inputEClass = createEClass(INPUT);
-
-        outputEClass = createEClass(OUTPUT);
-
-        faultEClass = createEClass(FAULT);
-
-        bindingInputEClass = createEClass(BINDING_INPUT);
-        createEAttribute(bindingInputEClass, BINDING_INPUT__NAME);
-        createEReference(bindingInputEClass, BINDING_INPUT__EINPUT);
-
-        bindingOutputEClass = createEClass(BINDING_OUTPUT);
-        createEAttribute(bindingOutputEClass, BINDING_OUTPUT__NAME);
-        createEReference(bindingOutputEClass, BINDING_OUTPUT__EOUTPUT);
-
-        bindingFaultEClass = createEClass(BINDING_FAULT);
-        createEAttribute(bindingFaultEClass, BINDING_FAULT__NAME);
-        createEReference(bindingFaultEClass, BINDING_FAULT__EFAULT);
-
-        namespaceEClass = createEClass(NAMESPACE);
-        createEAttribute(namespaceEClass, NAMESPACE__URI);
-        createEAttribute(namespaceEClass, NAMESPACE__PREFIX);
-
-        iPortTypeEClass = createEClass(IPORT_TYPE);
-
-        iOperationEClass = createEClass(IOPERATION);
-
-        iInputEClass = createEClass(IINPUT);
-
-        iOutputEClass = createEClass(IOUTPUT);
-
-        iFaultEClass = createEClass(IFAULT);
-
-        iMessageEClass = createEClass(IMESSAGE);
-
-        iPartEClass = createEClass(IPART);
-
-        iServiceEClass = createEClass(ISERVICE);
-
-        iPortEClass = createEClass(IPORT);
-
-        iBindingEClass = createEClass(IBINDING);
-
-        iBindingOperationEClass = createEClass(IBINDING_OPERATION);
-
-        iBindingInputEClass = createEClass(IBINDING_INPUT);
-
-        iBindingOutputEClass = createEClass(IBINDING_OUTPUT);
-
-        iBindingFaultEClass = createEClass(IBINDING_FAULT);
-
-        iExtensibilityElementEClass = createEClass(IEXTENSIBILITY_ELEMENT);
-
-        iDefinitionEClass = createEClass(IDEFINITION);
-
-        iImportEClass = createEClass(IIMPORT);
-
-        iListEClass = createEClass(ILIST);
-
-        iMapEClass = createEClass(IMAP);
-
-        iurlEClass = createEClass(IURL);
-
-        iExtensionRegistryEClass = createEClass(IEXTENSION_REGISTRY);
-
-        typesEClass = createEClass(TYPES);
-
-        iIteratorEClass = createEClass(IITERATOR);
-
-        iTypesEClass = createEClass(ITYPES);
-
-        unknownExtensibilityElementEClass = createEClass(UNKNOWN_EXTENSIBILITY_ELEMENT);
-        createEReference(unknownExtensibilityElementEClass, UNKNOWN_EXTENSIBILITY_ELEMENT__CHILDREN);
-
-        xsdSchemaExtensibilityElementEClass = createEClass(XSD_SCHEMA_EXTENSIBILITY_ELEMENT);
-        createEReference(xsdSchemaExtensibilityElementEClass, XSD_SCHEMA_EXTENSIBILITY_ELEMENT__SCHEMA);
-
-        messageReferenceEClass = createEClass(MESSAGE_REFERENCE);
-        createEAttribute(messageReferenceEClass, MESSAGE_REFERENCE__NAME);
-        createEReference(messageReferenceEClass, MESSAGE_REFERENCE__EMESSAGE);
-
-        // Create data types
-        qNameEDataType = createEDataType(QNAME);
-        operationTypeEDataType = createEDataType(OPERATION_TYPE);
-        domElementEDataType = createEDataType(DOM_ELEMENT);
-        wsdlExceptionEDataType = createEDataType(WSDL_EXCEPTION);
-        domDocumentEDataType = createEDataType(DOM_DOCUMENT);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private boolean isInitialized = false;
-
-    /**
-     * Complete the initialization of the package and its meta-model.  This
-     * method is guarded to have no affect on any invocation but its first.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void initializePackageContents()
-    {
-        if (isInitialized) return;
-        isInitialized = true;
-
-        // Initialize package
-        setName(eNAME);
-        setNsPrefix(eNS_PREFIX);
-        setNsURI(eNS_URI);
-
-        // Obtain other dependent packages
-        XSDPackageImpl theXSDPackage = (XSDPackageImpl) EPackage.Registry.INSTANCE.getEPackage(XSDPackage.eNS_URI);
-
-        // Add supertypes to classes
-        portTypeEClass.getESuperTypes().add(this.getWSDLElement());
-        portTypeEClass.getESuperTypes().add(this.getIPortType());
-        operationEClass.getESuperTypes().add(this.getWSDLElement());
-        operationEClass.getESuperTypes().add(this.getIOperation());
-        messageEClass.getESuperTypes().add(this.getWSDLElement());
-        messageEClass.getESuperTypes().add(this.getIMessage());
-        partEClass.getESuperTypes().add(this.getWSDLElement());
-        partEClass.getESuperTypes().add(this.getIPart());
-        bindingEClass.getESuperTypes().add(this.getExtensibleElement());
-        bindingEClass.getESuperTypes().add(this.getIBinding());
-        bindingOperationEClass.getESuperTypes().add(this.getExtensibleElement());
-        bindingOperationEClass.getESuperTypes().add(this.getIBindingOperation());
-        serviceEClass.getESuperTypes().add(this.getExtensibleElement());
-        serviceEClass.getESuperTypes().add(this.getIService());
-        portEClass.getESuperTypes().add(this.getExtensibleElement());
-        portEClass.getESuperTypes().add(this.getIPort());
-        extensibilityElementEClass.getESuperTypes().add(this.getWSDLElement());
-        extensibilityElementEClass.getESuperTypes().add(this.getIExtensibilityElement());
-        definitionEClass.getESuperTypes().add(this.getExtensibleElement());
-        definitionEClass.getESuperTypes().add(this.getIDefinition());
-        importEClass.getESuperTypes().add(this.getWSDLElement());
-        importEClass.getESuperTypes().add(this.getIImport());
-        extensibleElementEClass.getESuperTypes().add(this.getWSDLElement());
-        inputEClass.getESuperTypes().add(this.getMessageReference());
-        inputEClass.getESuperTypes().add(this.getWSDLElement());
-        inputEClass.getESuperTypes().add(this.getIInput());
-        outputEClass.getESuperTypes().add(this.getMessageReference());
-        outputEClass.getESuperTypes().add(this.getWSDLElement());
-        outputEClass.getESuperTypes().add(this.getIOutput());
-        faultEClass.getESuperTypes().add(this.getMessageReference());
-        faultEClass.getESuperTypes().add(this.getWSDLElement());
-        faultEClass.getESuperTypes().add(this.getIFault());
-        bindingInputEClass.getESuperTypes().add(this.getExtensibleElement());
-        bindingInputEClass.getESuperTypes().add(this.getIBindingInput());
-        bindingOutputEClass.getESuperTypes().add(this.getExtensibleElement());
-        bindingOutputEClass.getESuperTypes().add(this.getIBindingOutput());
-        bindingFaultEClass.getESuperTypes().add(this.getExtensibleElement());
-        bindingFaultEClass.getESuperTypes().add(this.getIBindingFault());
-        typesEClass.getESuperTypes().add(this.getExtensibleElement());
-        typesEClass.getESuperTypes().add(this.getITypes());
-        unknownExtensibilityElementEClass.getESuperTypes().add(this.getExtensibilityElement());
-        xsdSchemaExtensibilityElementEClass.getESuperTypes().add(this.getExtensibilityElement());
-        messageReferenceEClass.getESuperTypes().add(this.getWSDLElement());
-
-        // Initialize classes and features; add operations and parameters
-        initEClass(wsdlElementEClass, WSDLElement.class, "WSDLElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getWSDLElement_DocumentationElement(), this.getDOMElement(), "documentationElement", null, 0, 1, WSDLElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getWSDLElement_Element(), this.getDOMElement(), "element", null, 0, 1, WSDLElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        addEOperation(wsdlElementEClass, this.getDefinition(), "getEnclosingDefinition");
-
-        EOperation op = addEOperation(wsdlElementEClass, null, "setEnclosingDefinition");
-        addEParameter(op, this.getDefinition(), "definition");
-
-        initEClass(portTypeEClass, PortType.class, "PortType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getPortType_QName(), this.getQName(), "qName", null, 0, 1, PortType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getPortType_Undefined(), ecorePackage.getEBoolean(), "undefined", null, 0, 1, PortType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getPortType_Proxy(), ecorePackage.getEBoolean(), "proxy", null, 0, 1, PortType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getPortType_ResourceURI(), ecorePackage.getEString(), "resourceURI", null, 0, 1, PortType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getPortType_EOperations(), this.getOperation(), null, "eOperations", null, 0, -1, PortType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(operationEClass, Operation.class, "Operation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getOperation_Style(), this.getOperationType(), "style", null, 0, 1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getOperation_Name(), ecorePackage.getEString(), "name", null, 0, 1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getOperation_Undefined(), ecorePackage.getEBoolean(), "undefined", null, 0, 1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getOperation_Proxy(), ecorePackage.getEBoolean(), "proxy", null, 0, 1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getOperation_ResourceURI(), ecorePackage.getEString(), "resourceURI", null, 0, 1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getOperation_EInput(), this.getInput(), null, "eInput", null, 0, 1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getOperation_EOutput(), this.getOutput(), null, "eOutput", null, 0, 1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getOperation_EFaults(), this.getFault(), null, "eFaults", null, 0, -1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getOperation_EParameterOrdering(), this.getPart(), null, "eParameterOrdering", null, 0, -1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(messageEClass, Message.class, "Message", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getMessage_QName(), this.getQName(), "qName", null, 0, 1, Message.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getMessage_Undefined(), ecorePackage.getEBoolean(), "undefined", null, 0, 1, Message.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getMessage_Proxy(), ecorePackage.getEBoolean(), "proxy", null, 0, 1, Message.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getMessage_ResourceURI(), ecorePackage.getEString(), "resourceURI", null, 0, 1, Message.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getMessage_EParts(), this.getPart(), null, "eParts", null, 0, -1, Message.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(partEClass, Part.class, "Part", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getPart_Name(), ecorePackage.getEString(), "name", null, 0, 1, Part.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getPart_ElementName(), this.getQName(), "elementName", null, 0, 1, Part.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getPart_TypeName(), this.getQName(), "typeName", null, 0, 1, Part.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getPart_TypeDefinition(), theXSDPackage.getXSDTypeDefinition(), null, "typeDefinition", null, 0, 1, Part.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getPart_ElementDeclaration(), theXSDPackage.getXSDElementDeclaration(), null, "elementDeclaration", null, 0, 1, Part.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getPart_EMessage(), this.getMessage(), null, "eMessage", null, 0, 1, Part.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(bindingEClass, Binding.class, "Binding", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getBinding_QName(), this.getQName(), "qName", null, 0, 1, Binding.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getBinding_Undefined(), ecorePackage.getEBoolean(), "undefined", null, 0, 1, Binding.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getBinding_Proxy(), ecorePackage.getEBoolean(), "proxy", null, 0, 1, Binding.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getBinding_ResourceURI(), ecorePackage.getEString(), "resourceURI", null, 0, 1, Binding.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getBinding_EPortType(), this.getPortType(), null, "ePortType", null, 1, 1, Binding.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getBinding_EBindingOperations(), this.getBindingOperation(), null, "eBindingOperations", null, 0, -1, Binding.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(bindingOperationEClass, BindingOperation.class, "BindingOperation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getBindingOperation_Name(), ecorePackage.getEString(), "name", null, 0, 1, BindingOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getBindingOperation_EOperation(), this.getOperation(), null, "eOperation", null, 1, 1, BindingOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getBindingOperation_EBindingInput(), this.getBindingInput(), null, "eBindingInput", null, 0, 1, BindingOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getBindingOperation_EBindingOutput(), this.getBindingOutput(), null, "eBindingOutput", null, 0, 1, BindingOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getBindingOperation_EBindingFaults(), this.getBindingFault(), null, "eBindingFaults", null, 0, -1, BindingOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(serviceEClass, Service.class, "Service", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getService_QName(), this.getQName(), "qName", null, 0, 1, Service.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getService_Undefined(), ecorePackage.getEBoolean(), "undefined", null, 0, 1, Service.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getService_Proxy(), ecorePackage.getEBoolean(), "proxy", null, 0, 1, Service.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getService_ResourceURI(), ecorePackage.getEString(), "resourceURI", null, 0, 1, Service.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getService_EPorts(), this.getPort(), null, "ePorts", null, 0, -1, Service.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(portEClass, Port.class, "Port", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getPort_Name(), ecorePackage.getEString(), "name", null, 0, 1, Port.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getPort_EBinding(), this.getBinding(), null, "eBinding", null, 1, 1, Port.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(extensibilityElementEClass, ExtensibilityElement.class, "ExtensibilityElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getExtensibilityElement_Required(), ecorePackage.getEBoolean(), "required", null, 0, 1, ExtensibilityElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getExtensibilityElement_ElementType(), this.getQName(), "elementType", null, 0, 1, ExtensibilityElement.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(definitionEClass, Definition.class, "Definition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getDefinition_TargetNamespace(), ecorePackage.getEString(), "targetNamespace", null, 0, 1, Definition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getDefinition_Location(), ecorePackage.getEString(), "location", null, 0, 1, Definition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getDefinition_QName(), this.getQName(), "qName", null, 0, 1, Definition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getDefinition_Encoding(), ecorePackage.getEString(), "encoding", null, 0, 1, Definition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getDefinition_EMessages(), this.getMessage(), null, "eMessages", null, 0, -1, Definition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getDefinition_EPortTypes(), this.getPortType(), null, "ePortTypes", null, 0, -1, Definition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getDefinition_EBindings(), this.getBinding(), null, "eBindings", null, 0, -1, Definition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getDefinition_EServices(), this.getService(), null, "eServices", null, 0, -1, Definition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getDefinition_ENamespaces(), this.getNamespace(), null, "eNamespaces", null, 0, -1, Definition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getDefinition_ETypes(), this.getTypes(), null, "eTypes", null, 0, 1, Definition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getDefinition_EImports(), this.getImport(), null, "eImports", null, 0, -1, Definition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        addEOperation(definitionEClass, this.getDOMDocument(), "getDocument");
-
-        op = addEOperation(definitionEClass, null, "setDocument");
-        addEParameter(op, this.getDOMDocument(), "document");
-
-        initEClass(importEClass, Import.class, "Import", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getImport_NamespaceURI(), ecorePackage.getEString(), "namespaceURI", null, 0, 1, Import.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getImport_LocationURI(), ecorePackage.getEString(), "locationURI", null, 0, 1, Import.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getImport_EDefinition(), this.getDefinition(), null, "eDefinition", null, 0, 1, Import.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getImport_ESchema(), theXSDPackage.getXSDSchema(), null, "eSchema", null, 0, 1, Import.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        addEOperation(importEClass, theXSDPackage.getXSDSchema(), "getSchema");
-
-        op = addEOperation(importEClass, null, "setSchema");
-        addEParameter(op, theXSDPackage.getXSDSchema(), "schema");
-
-        initEClass(extensibleElementEClass, ExtensibleElement.class, "ExtensibleElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getExtensibleElement_EExtensibilityElements(), this.getExtensibilityElement(), null, "eExtensibilityElements", null, 0, -1, ExtensibleElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        addEOperation(extensibleElementEClass, this.getIList(), "getExtensibilityElements");
-
-        op = addEOperation(extensibleElementEClass, null, "addExtensibilityElement");
-        addEParameter(op, this.getIExtensibilityElement(), "extElement");
-
-        initEClass(inputEClass, Input.class, "Input", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(outputEClass, Output.class, "Output", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(faultEClass, Fault.class, "Fault", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(bindingInputEClass, BindingInput.class, "BindingInput", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getBindingInput_Name(), ecorePackage.getEString(), "name", null, 0, 1, BindingInput.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getBindingInput_EInput(), this.getInput(), null, "eInput", null, 1, 1, BindingInput.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        addEOperation(bindingInputEClass, this.getIInput(), "getInput");
-
-        op = addEOperation(bindingInputEClass, null, "setInput");
-        addEParameter(op, this.getIInput(), "input");
-
-        initEClass(bindingOutputEClass, BindingOutput.class, "BindingOutput", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getBindingOutput_Name(), ecorePackage.getEString(), "name", null, 0, 1, BindingOutput.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getBindingOutput_EOutput(), this.getOutput(), null, "eOutput", null, 1, 1, BindingOutput.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        addEOperation(bindingOutputEClass, this.getIOutput(), "getOutput");
-
-        op = addEOperation(bindingOutputEClass, null, "setOutput");
-        addEParameter(op, this.getIOutput(), "output");
-
-        initEClass(bindingFaultEClass, BindingFault.class, "BindingFault", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getBindingFault_Name(), ecorePackage.getEString(), "name", null, 0, 1, BindingFault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getBindingFault_EFault(), this.getFault(), null, "eFault", null, 1, 1, BindingFault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        addEOperation(bindingFaultEClass, this.getIFault(), "getFault");
-
-        op = addEOperation(bindingFaultEClass, null, "setFault");
-        addEParameter(op, this.getIFault(), "fault");
-
-        initEClass(namespaceEClass, Namespace.class, "Namespace", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getNamespace_URI(), ecorePackage.getEString(), "URI", null, 0, 1, Namespace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getNamespace_Prefix(), ecorePackage.getEString(), "prefix", null, 0, 1, Namespace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(iPortTypeEClass, javax.wsdl.PortType.class, "IPortType", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-        op = addEOperation(iPortTypeEClass, null, "addOperation");
-        addEParameter(op, this.getIOperation(), "operation");
-
-        op = addEOperation(iPortTypeEClass, this.getIOperation(), "getOperation");
-        addEParameter(op, ecorePackage.getEString(), "name");
-        addEParameter(op, ecorePackage.getEString(), "inputName");
-        addEParameter(op, ecorePackage.getEString(), "outputName");
-
-        addEOperation(iPortTypeEClass, this.getIList(), "getOperations");
-
-        initEClass(iOperationEClass, javax.wsdl.Operation.class, "IOperation", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-        op = addEOperation(iOperationEClass, null, "addFault");
-        addEParameter(op, this.getIFault(), "fault");
-
-        op = addEOperation(iOperationEClass, this.getIFault(), "getFault");
-        addEParameter(op, ecorePackage.getEString(), "name");
-
-        addEOperation(iOperationEClass, this.getIMap(), "getFaults");
-
-        addEOperation(iOperationEClass, this.getIList(), "getParameterOrdering");
-
-        op = addEOperation(iOperationEClass, null, "setParameterOrdering");
-        addEParameter(op, this.getIList(), "parameterOrder");
-
-        addEOperation(iOperationEClass, this.getIInput(), "getInput");
-
-        op = addEOperation(iOperationEClass, null, "setInput");
-        addEParameter(op, this.getIInput(), "input");
-
-        addEOperation(iOperationEClass, this.getIOutput(), "getOutput");
-
-        op = addEOperation(iOperationEClass, null, "setOutput");
-        addEParameter(op, this.getIOutput(), "output");
-
-        initEClass(iInputEClass, javax.wsdl.Input.class, "IInput", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-        addEOperation(iInputEClass, this.getIMessage(), "getMessage");
-
-        op = addEOperation(iInputEClass, null, "setMessage");
-        addEParameter(op, this.getIMessage(), "message");
-
-        initEClass(iOutputEClass, javax.wsdl.Output.class, "IOutput", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-        addEOperation(iOutputEClass, this.getIMessage(), "getMessage");
-
-        op = addEOperation(iOutputEClass, null, "setMessage");
-        addEParameter(op, this.getIMessage(), "message");
-
-        initEClass(iFaultEClass, javax.wsdl.Fault.class, "IFault", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-        addEOperation(iFaultEClass, this.getIMessage(), "getMessage");
-
-        op = addEOperation(iFaultEClass, null, "setMessage");
-        addEParameter(op, this.getIMessage(), "message");
-
-        initEClass(iMessageEClass, javax.wsdl.Message.class, "IMessage", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-        op = addEOperation(iMessageEClass, null, "addPart");
-        addEParameter(op, this.getIPart(), "part");
-
-        op = addEOperation(iMessageEClass, this.getIPart(), "getPart");
-        addEParameter(op, ecorePackage.getEString(), "name");
-
-        addEOperation(iMessageEClass, this.getIMap(), "getParts");
-
-        op = addEOperation(iMessageEClass, this.getIList(), "getOrderedParts");
-        addEParameter(op, this.getIList(), "partOrder");
-
-        initEClass(iPartEClass, javax.wsdl.Part.class, "IPart", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-        op = addEOperation(iPartEClass, null, "setExtensionAttribute");
-        addEParameter(op, this.getQName(), "name");
-        addEParameter(op, this.getQName(), "value");
-        addEException(op, this.getWSDLException());
-
-        addEOperation(iPartEClass, this.getIIterator(), "getExtensionAttributeNames");
-
-        op = addEOperation(iPartEClass, this.getQName(), "getExtensionAttribute");
-        addEParameter(op, this.getQName(), "name");
-
-        initEClass(iServiceEClass, javax.wsdl.Service.class, "IService", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-        op = addEOperation(iServiceEClass, null, "addPort");
-        addEParameter(op, this.getIPort(), "port");
-
-        addEOperation(iServiceEClass, this.getIMap(), "getPorts");
-
-        op = addEOperation(iServiceEClass, this.getIPort(), "getPort");
-        addEParameter(op, ecorePackage.getEString(), "name");
-
-        initEClass(iPortEClass, javax.wsdl.Port.class, "IPort", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-        addEOperation(iPortEClass, this.getIBinding(), "getBinding");
-
-        op = addEOperation(iPortEClass, null, "setBinding");
-        addEParameter(op, this.getIBinding(), "binding");
-
-        initEClass(iBindingEClass, javax.wsdl.Binding.class, "IBinding", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-        op = addEOperation(iBindingEClass, null, "addBindingOperation");
-        addEParameter(op, this.getIBindingOperation(), "bindingOperation");
-
-        op = addEOperation(iBindingEClass, this.getIBindingOperation(), "getBindingOperation");
-        addEParameter(op, ecorePackage.getEString(), "name");
-        addEParameter(op, ecorePackage.getEString(), "inputName");
-        addEParameter(op, ecorePackage.getEString(), "outputName");
-
-        addEOperation(iBindingEClass, this.getIList(), "getBindingOperations");
-
-        addEOperation(iBindingEClass, this.getIPortType(), "getPortType");
-
-        op = addEOperation(iBindingEClass, null, "setPortType");
-        addEParameter(op, this.getIPortType(), "portType");
-
-        initEClass(iBindingOperationEClass, javax.wsdl.BindingOperation.class, "IBindingOperation", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-        op = addEOperation(iBindingOperationEClass, null, "addBindingFault");
-        addEParameter(op, this.getIBindingFault(), "bindingFault");
-
-        op = addEOperation(iBindingOperationEClass, this.getIBindingFault(), "getBindingFault");
-        addEParameter(op, ecorePackage.getEString(), "name");
-
-        addEOperation(iBindingOperationEClass, this.getIMap(), "getBindingFaults");
-
-        addEOperation(iBindingOperationEClass, this.getIOperation(), "getOperation");
-
-        op = addEOperation(iBindingOperationEClass, null, "setOperation");
-        addEParameter(op, this.getIOperation(), "operation");
-
-        addEOperation(iBindingOperationEClass, this.getIBindingInput(), "getBindingInput");
-
-        op = addEOperation(iBindingOperationEClass, null, "setBindingInput");
-        addEParameter(op, this.getIBindingInput(), "bindingInput");
-
-        addEOperation(iBindingOperationEClass, this.getIBindingOutput(), "getBindingOutput");
-
-        op = addEOperation(iBindingOperationEClass, null, "setBindingOutput");
-        addEParameter(op, this.getIBindingOutput(), "bindingOutput");
-
-        initEClass(iBindingInputEClass, javax.wsdl.BindingInput.class, "IBindingInput", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(iBindingOutputEClass, javax.wsdl.BindingOutput.class, "IBindingOutput", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(iBindingFaultEClass, javax.wsdl.BindingFault.class, "IBindingFault", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(iExtensibilityElementEClass, javax.wsdl.extensions.ExtensibilityElement.class, "IExtensibilityElement", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(iDefinitionEClass, javax.wsdl.Definition.class, "IDefinition", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-        op = addEOperation(iDefinitionEClass, null, "addBinding");
-        addEParameter(op, this.getIBinding(), "binding");
-
-        op = addEOperation(iDefinitionEClass, null, "addImport");
-        addEParameter(op, this.getIImport(), "importDef");
-
-        op = addEOperation(iDefinitionEClass, null, "addMessage");
-        addEParameter(op, this.getIMessage(), "message");
-
-        op = addEOperation(iDefinitionEClass, null, "addNamespace");
-        addEParameter(op, ecorePackage.getEString(), "prefix");
-        addEParameter(op, ecorePackage.getEString(), "namespaceURI");
-
-        op = addEOperation(iDefinitionEClass, null, "addPortType");
-        addEParameter(op, this.getIPortType(), "portType");
-
-        op = addEOperation(iDefinitionEClass, null, "addService");
-        addEParameter(op, this.getIService(), "service");
-
-        addEOperation(iDefinitionEClass, this.getIBindingFault(), "createBindingFault");
-
-        addEOperation(iDefinitionEClass, this.getIBindingInput(), "createBindingInput");
-
-        addEOperation(iDefinitionEClass, this.getIBindingOutput(), "createBindingOutput");
-
-        addEOperation(iDefinitionEClass, this.getIBindingOperation(), "createBindingOperation");
-
-        addEOperation(iDefinitionEClass, this.getIBinding(), "createBinding");
-
-        addEOperation(iDefinitionEClass, this.getIFault(), "createFault");
-
-        addEOperation(iDefinitionEClass, this.getIImport(), "createImport");
-
-        addEOperation(iDefinitionEClass, this.getIInput(), "createInput");
-
-        addEOperation(iDefinitionEClass, this.getIMessage(), "createMessage");
-
-        addEOperation(iDefinitionEClass, this.getIOperation(), "createOperation");
-
-        addEOperation(iDefinitionEClass, this.getIOutput(), "createOutput");
-
-        addEOperation(iDefinitionEClass, this.getIPart(), "createPart");
-
-        addEOperation(iDefinitionEClass, this.getIPort(), "createPort");
-
-        addEOperation(iDefinitionEClass, this.getIPortType(), "createPortType");
-
-        addEOperation(iDefinitionEClass, this.getIService(), "createService");
-
-        op = addEOperation(iDefinitionEClass, this.getIBinding(), "getBinding");
-        addEParameter(op, this.getQName(), "name");
-
-        addEOperation(iDefinitionEClass, this.getIMap(), "getBindings");
-
-        addEOperation(iDefinitionEClass, this.getIMap(), "getImports");
-
-        op = addEOperation(iDefinitionEClass, this.getIList(), "getImports");
-        addEParameter(op, ecorePackage.getEString(), "namespaceURI");
-
-        op = addEOperation(iDefinitionEClass, this.getIMessage(), "getMessage");
-        addEParameter(op, this.getQName(), "name");
-
-        addEOperation(iDefinitionEClass, this.getIMap(), "getMessages");
-
-        op = addEOperation(iDefinitionEClass, ecorePackage.getEString(), "getNamespace");
-        addEParameter(op, ecorePackage.getEString(), "prefix");
-
-        addEOperation(iDefinitionEClass, this.getIMap(), "getNamespaces");
-
-        op = addEOperation(iDefinitionEClass, this.getIPortType(), "getPortType");
-        addEParameter(op, this.getQName(), "name");
-
-        addEOperation(iDefinitionEClass, this.getIMap(), "getPortTypes");
-
-        op = addEOperation(iDefinitionEClass, ecorePackage.getEString(), "getPrefix");
-        addEParameter(op, ecorePackage.getEString(), "namespaceURI");
-
-        op = addEOperation(iDefinitionEClass, this.getIService(), "getService");
-        addEParameter(op, this.getQName(), "name");
-
-        addEOperation(iDefinitionEClass, this.getIMap(), "getServices");
-
-        addEOperation(iDefinitionEClass, this.getIExtensionRegistry(), "getExtensionRegistry");
-
-        op = addEOperation(iDefinitionEClass, null, "setExtensionRegistry");
-        addEParameter(op, this.getIExtensionRegistry(), "extensionRegistry");
-
-        addEOperation(iDefinitionEClass, ecorePackage.getEString(), "getDocumentBaseURI");
-
-        op = addEOperation(iDefinitionEClass, null, "setDocumentBaseURI");
-        addEParameter(op, ecorePackage.getEString(), "documentBase");
-
-        addEOperation(iDefinitionEClass, this.getITypes(), "createTypes");
-
-        op = addEOperation(iDefinitionEClass, this.getIService(), "removeService");
-        addEParameter(op, this.getQName(), "name");
-
-        op = addEOperation(iDefinitionEClass, this.getIBinding(), "removeBinding");
-        addEParameter(op, this.getQName(), "name");
-
-        op = addEOperation(iDefinitionEClass, this.getIPortType(), "removePortType");
-        addEParameter(op, this.getQName(), "name");
-
-        op = addEOperation(iDefinitionEClass, this.getIMessage(), "removeMessage");
-        addEParameter(op, this.getQName(), "name");
-
-        addEOperation(iDefinitionEClass, this.getITypes(), "getTypes");
-
-        op = addEOperation(iDefinitionEClass, null, "setTypes");
-        addEParameter(op, this.getITypes(), "types");
-
-        initEClass(iImportEClass, javax.wsdl.Import.class, "IImport", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(iListEClass, List.class, "IList", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(iMapEClass, Map.class, "IMap", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(iurlEClass, URL.class, "IURL", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(iExtensionRegistryEClass, ExtensionRegistry.class, "IExtensionRegistry", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(typesEClass, Types.class, "Types", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-        addEOperation(typesEClass, this.getIList(), "getSchemas");
-
-        op = addEOperation(typesEClass, this.getIList(), "getSchemas");
-        addEParameter(op, ecorePackage.getEString(), "namespaceURI");
-
-        initEClass(iIteratorEClass, Iterator.class, "IIterator", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(iTypesEClass, javax.wsdl.Types.class, "ITypes", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(unknownExtensibilityElementEClass, UnknownExtensibilityElement.class, "UnknownExtensibilityElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getUnknownExtensibilityElement_Children(), this.getUnknownExtensibilityElement(), null, "children", null, 0, -1, UnknownExtensibilityElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(xsdSchemaExtensibilityElementEClass, XSDSchemaExtensibilityElement.class, "XSDSchemaExtensibilityElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getXSDSchemaExtensibilityElement_Schema(), theXSDPackage.getXSDSchema(), null, "schema", null, 0, 1, XSDSchemaExtensibilityElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(messageReferenceEClass, MessageReference.class, "MessageReference", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getMessageReference_Name(), ecorePackage.getEString(), "name", null, 0, 1, MessageReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getMessageReference_EMessage(), this.getMessage(), null, "eMessage", null, 1, 1, MessageReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        // Initialize data types
-        initEDataType(qNameEDataType, QName.class, "QName", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-        initEDataType(operationTypeEDataType, OperationType.class, "OperationType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-        initEDataType(domElementEDataType, Element.class, "DOMElement", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-        initEDataType(wsdlExceptionEDataType, WSDLException.class, "WSDLException", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-        initEDataType(domDocumentEDataType, Document.class, "DOMDocument", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-
-        // Create resource
-        createResource(eNS_URI);
-    }
-
-} //WSDLPackageImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/XSDSchemaExtensibilityElementImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/XSDSchemaExtensibilityElementImpl.java
deleted file mode 100644
index bef721527..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/XSDSchemaExtensibilityElementImpl.java
+++ /dev/null
@@ -1,414 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.xsd.XSDFactory;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.impl.XSDSchemaImpl;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>XSD Schema Extensibility Element</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.impl.XSDSchemaExtensibilityElementImpl#getSchema <em>Schema</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class XSDSchemaExtensibilityElementImpl extends ExtensibilityElementImpl implements XSDSchemaExtensibilityElement
-{
-  /**
-   * The cached value of the '{@link #getSchema() <em>Schema</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getSchema()
-   * @generated
-   * @ordered
-   */
-  protected XSDSchema schema = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected XSDSchemaExtensibilityElementImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return WSDLPackage.eINSTANCE.getXSDSchemaExtensibilityElement();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public XSDSchema getSchema()
-  {
-    return schema;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetSchema(XSDSchema newSchema, NotificationChain msgs)
-  {
-    XSDSchema oldSchema = schema;
-    schema = newSchema;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__SCHEMA, oldSchema, newSchema);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setSchema(XSDSchema newSchema)
-  {
-    if (newSchema != schema)
-    {
-      NotificationChain msgs = null;
-      if (schema != null)
-        msgs = ((InternalEObject)schema).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__SCHEMA, null, msgs);
-      if (newSchema != null)
-        msgs = ((InternalEObject)newSchema).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__SCHEMA, null, msgs);
-      msgs = basicSetSchema(newSchema, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__SCHEMA, newSchema, newSchema));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs)
-  {
-    if (featureID >= 0)
-    {
-      switch (eDerivedStructuralFeatureID(featureID, baseClass))
-      {
-        case WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__SCHEMA:
-          return basicSetSchema(null, msgs);
-        default:
-          return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-      }
-    }
-    return eBasicSetContainer(null, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__ELEMENT:
-        return getElement();
-      case WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__REQUIRED:
-        return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-      case WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__ELEMENT_TYPE:
-        return getElementType();
-      case WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__SCHEMA:
-        return getSchema();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__REQUIRED:
-        setRequired(((Boolean)newValue).booleanValue());
-        return;
-      case WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__ELEMENT_TYPE:
-        setElementType((QName)newValue);
-        return;
-      case WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__SCHEMA:
-        setSchema((XSDSchema)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__REQUIRED:
-        setRequired(REQUIRED_EDEFAULT);
-        return;
-      case WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__ELEMENT_TYPE:
-        setElementType(ELEMENT_TYPE_EDEFAULT);
-        return;
-      case WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__SCHEMA:
-        setSchema((XSDSchema)null);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__REQUIRED:
-        return required != REQUIRED_EDEFAULT;
-      case WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__ELEMENT_TYPE:
-        return ELEMENT_TYPE_EDEFAULT == null ? elementType != null : !ELEMENT_TYPE_EDEFAULT.equals(elementType);
-      case WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__SCHEMA:
-        return schema != null;
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wsdl.impl.WSDLElementImpl#reconcile(org.w3c.dom.Element)
-   */
-  protected void reconcile(Element changedElement)
-  {
-    element = changedElement; // This line may not needed.    
-    if (schema == null)
-    {
-      XSDSchema newSchema = XSDSchemaImpl.createSchema(changedElement);
-      setSchema(newSchema);
-    }
-  }
-
-  public XSDSchema createSchema(Element element)
-  {
-    if (element.getLocalName().equals("schema") && XSDConstants.isSchemaForSchemaNamespace(element.getNamespaceURI()))
-    {     
-      XSDSchema xsdSchema = XSDFactory.eINSTANCE.createXSDSchema(); 
-      xsdSchema.setElement(element);
-      return xsdSchema;      
-    }
-    else
-    {
-      return null;
-    }
-  }
-
-  public Element getElement()
-  {
-    if (element != null)
-      return element;
-    else if (getSchema() != null)
-      element = getSchema().getElement();
-
-    return element;
-  }
-  
-  public void setElement(Element newElement)
-  {
-    if (newElement == null && !isReconciling)
-    {
-      element = null;
-    }
-    else
-    {
-      setElementGen(newElement);
-    }
-  }
-  
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public QName getElementType()
-  {
-    if (elementType == null)
-      elementType = new QName(XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001,XSDConstants.SCHEMA_ELEMENT_TAG);
-
-    return elementType;
-  }
-  
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setElementType(QName newElementType)
-  {
-    // Should not do anything.
-  }  
-  
-  public void reconcileAttributes(Element changedElement)
-  {
-    super.reconcileAttributes(changedElement);
-  }
-  
-  public Element createElement()
-  {
-  	if (schema == null) // kb Note: This case is not supposed to happen.
-  	{     
-  	  // cs ... why do we do this if its not supposed to happen?
-  	  // Is there a scenario where this is a usefull fallback?
-  	  // Under what conditions does this code get executed (i.e. why would schema == null)?
-      schema = XSDFactory.eINSTANCE.createXSDSchema();
-      schema.setSchemaForSchemaQNamePrefix("xsd");
-      schema.setTargetNamespace("http://tempuri.org/");
-      java.util.Map qNamePrefixToNamespaceMap = schema.getQNamePrefixToNamespaceMap();
-      qNamePrefixToNamespaceMap.put("", schema.getTargetNamespace());
-      qNamePrefixToNamespaceMap.put
-        (schema.getSchemaForSchemaQNamePrefix(),org.eclipse.xsd.util.XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001);
-      adopt(schema);
-      schema.updateElement(true);
-      return schema.getElement();
-    }
-    else
-    {
-      element = schema.getElement();
-      if (element == null)
-      {
-      	adopt(schema);
-        schema.updateElement(true);
-      }
-      element = schema.getElement();
-      return element;
-    }
-  }
- 
-  private void adopt(XSDSchema xsdSchema)
-  {
-    Definition definition = getEnclosingDefinition();
-    if (definition == null)
-      return;
-
-    Document document = definition.getDocument();
-    if (document == null)
-      document = ((DefinitionImpl) definition).updateDocument();
-    
-    if (xsdSchema.getDocument() != null)
-    	xsdSchema.setDocument(null);
-    
-    xsdSchema.setDocument(document);
-  }
-  
-  /*
-  private Element adopt(Element element)
-  {
-    Definition definition = getEnclosingDefinition();
-    if (definition == null)
-      return element;
-
-    Document document = definition.getDocument();
-    if (document == null)
-      document = ((DefinitionImpl) definition).updateDocument();
-    
-    return (Element)document.importNode(element,true);
-  }
-  */
-  
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-	  if (isReconciling)
-		  return;
-	  
-	  // TODO... revist this block of code
-	  //
-	  if (eAttribute == null || eAttribute == WSDLPackage.eINSTANCE.getXSDSchemaExtensibilityElement_Schema())
-	  {
-		  // We got a new schema so re-parent it.
-		  // cs... are we really doing the right thing here?  this seems strange
-		  if (schema != null)
-		  {
-			  if ((schema.getElement() == null && getElement() == null) ||
-					  (schema.getElement() != getElement()))
-			  {	
-				  schema.setDocument(null);
-				  schema.setElement(null);
-				  adopt(schema);
-				  schema.updateElement();
-			  }  
-		  }
-	  }    
-	  else if (eAttribute == WSDLPackage.eINSTANCE.getWSDLElement_Element())
-	  {
-		  setSchema(createSchema(element)); // element is not null
-	  }    
-  }
-} //XSDSchemaExtensibilityElementImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/wsdl4j/WSDLFactoryImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/wsdl4j/WSDLFactoryImpl.java
deleted file mode 100644
index b1bb1803c..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/wsdl4j/WSDLFactoryImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl.wsdl4j;
-
-import javax.wsdl.Definition;
-import javax.wsdl.extensions.ExtensionRegistry;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLReader;
-import javax.wsdl.xml.WSDLWriter;
-
-public final class WSDLFactoryImpl extends WSDLFactory
-{
-  
-  //public static WSDLFactory newInstance() throws WSDLException
-  //{
-  //  return new WSDLFactoryImpl();
-  //}
-  
-  public WSDLFactoryImpl()
-  {
-  }
-  
-  public Definition newDefinition()
-  {
-    return org.eclipse.wst.wsdl.internal.impl.WSDLFactoryImpl.eINSTANCE.createDefinition();
-  }
-  
-  public ExtensionRegistry newPopulatedExtensionRegistry()
-  {
-    return null;
-  }
-  
-  public WSDLReader newWSDLReader()
-  {
-    WSDLReader reader = new WSDLReaderImpl();
-    reader.setFactoryImplName(getClass().getName());
-    return reader;
-  }
-  
-  public WSDLWriter newWSDLWriter()
-  {
-    return new WSDLWriterImpl();
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/wsdl4j/WSDLReaderImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/wsdl4j/WSDLReaderImpl.java
deleted file mode 100644
index 3838d790d..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/wsdl4j/WSDLReaderImpl.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl.wsdl4j;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import javax.wsdl.Definition;
-import javax.wsdl.WSDLException;
-import javax.wsdl.extensions.ExtensionRegistry;
-import javax.wsdl.xml.WSDLLocator;
-import javax.wsdl.xml.WSDLReader;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.wst.wsdl.internal.util.WSDLResourceFactoryImpl;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.InputSource;
-
-
-public final class WSDLReaderImpl implements WSDLReader
-{
-  private String factoryImplName;
-  private ExtensionRegistry extReg;
-  
-  public ExtensionRegistry getExtensionRegistry()
-  {
-    return extReg;
-  }
-  
-  public void setExtensionRegistry(ExtensionRegistry extReg)
-  {
-    this.extReg = extReg;
-  }
-  
-  public String getFactoryImplName()
-  {
-    return factoryImplName;
-  }
-  
-  public void setFactoryImplName(String factoryImplName) throws UnsupportedOperationException
-  {
-    this.factoryImplName = factoryImplName;
-  }
-
-  
-  public boolean getFeature(String name) throws IllegalArgumentException
-  { 
-    return false;
-  }
-  
-  public void setFeature(String name, boolean value) throws IllegalArgumentException
-  {
-    throw new IllegalArgumentException("Not Implemented");
-  }
-  
-  /**
-   * Read the WSDL document accessible via the specified
-   * URI into a WSDL definition.
-   *
-   * @param wsdlURI a URI (can be a filename or URL) pointing to a
-   * WSDL XML definition.
-   * @return the definition.
-   */
-  public Definition readWSDL(String wsdlURI) throws WSDLException
-  {
-    URI uri;    
-    if (hasProtocol(wsdlURI))
-       uri = URI.createURI(wsdlURI);
-    else
-       uri = URI.createFileURI(wsdlURI);
-  
-    // Create a resource set, create a wsdl resource, and load the main wsdl file into it.
-    
-  	ResourceSet resourceSet = new ResourceSetImpl();  	
-  	resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("wsdl", new WSDLResourceFactoryImpl());
-
-  	WSDLResourceImpl wsdlMainResource = (WSDLResourceImpl)resourceSet.createResource(URI.createURI("*.wsdl"));
-  	wsdlMainResource.setURI(uri);
-  	
-    try
-    {
-      InputStream inputStream = resourceSet.getURIConverter().createInputStream(uri);
-      wsdlMainResource.load(inputStream, resourceSet.getLoadOptions());
-      //wsdlMainResource.load(resourceSet.getLoadOptions());
-    }
-    catch (IOException e)
-    {
-      throw new WSDLException(WSDLException.INVALID_WSDL,"WSDL URI: "+wsdlURI,e);
-    }
-    
-    // Return the definitions of the main resource.
-    return wsdlMainResource.getDefinition();
-  }
-
-  private boolean hasProtocol(String uri)
-  {
-		boolean result = false;     
-		if (uri != null)
-		{
-		  int index = uri.indexOf(":");
-		  if (index != -1 && index > 2) // assume protocol with be length 3 so that the'C' in 'C:/' is not interpreted as a protocol
-		  {
-				result = true;
-		  }
-		}
-		return result;
-  } 
-  
-  /**
-   * Read the WSDL document accessible via the specified
-   * URI into a WSDL definition.
-   *
-   * @param contextURI the context in which to resolve the
-   * wsdlURI, if the wsdlURI is relative. Can be null, in which
-   * case it will be ignored.
-   * @param wsdlURI a URI (can be a filename or URL) pointing to a
-   * WSDL XML definition.
-   * @return the definition.
-   */
-  public Definition readWSDL(String contextURI, String wsdlURI) throws WSDLException
-  {
-    throw new WSDLException(WSDLException.OTHER_ERROR,"Not Implemented");
-  }
-
-  /**
-   * Read the specified &lt;wsdl:definitions&gt; element into a WSDL
-   * definition.
-   *
-   * @param documentBaseURI the document base URI of the WSDL definition
-   * described by the element. Will be set as the documentBaseURI
-   * of the returned Definition. Can be null, in which case it
-   * will be ignored.
-   * @param definitionsElement the &lt;wsdl:definitions&gt; element
-   * @return the definition described by the element.
-   */
-  public Definition readWSDL(String documentBaseURI, Element definitionsElement)
-    throws WSDLException
-  {
-    throw new WSDLException(WSDLException.OTHER_ERROR,"Not Implemented");
-  }
-
-  /**
-   * Read the specified WSDL document into a WSDL definition.
-   *
-   * @param documentBaseURI the document base URI of the WSDL definition
-   * described by the document. Will be set as the documentBaseURI
-   * of the returned Definition. Can be null, in which case it
-   * will be ignored.
-   * @param wsdlDocument the WSDL document, an XML 
-   * document obeying the WSDL schema.
-   * @return the definition described in the document.
-   */
-  public Definition readWSDL(String documentBaseURI, Document wsdlDocument)
-    throws WSDLException
-  {
-    throw new WSDLException(WSDLException.OTHER_ERROR,"Not Implemented");
-  }
-
-  /**
-   * Read a WSDL document into a WSDL definition.
-   *
-   * @param documentBaseURI the document base URI of the WSDL definition
-   * described by the document. Will be set as the documentBaseURI
-   * of the returned Definition. Can be null, in which case it
-   * will be ignored.
-   * @param inputSource an InputSource pointing to the
-   * WSDL document, an XML document obeying the WSDL schema.
-   * @return the definition described in the document pointed to
-   * by the InputSource.
-   */
-  public Definition readWSDL(String documentBaseURI, InputSource inputSource)
-    throws WSDLException
-  {
-  	ResourceSet resourceSet = new ResourceSetImpl();
-  	resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("wsdl", new WSDLResourceFactoryImpl());
-    WSDLResourceImpl wsdlMainResource = (WSDLResourceImpl)resourceSet.createResource(URI.createURI("*.wsdl"));
-
-  	try
-    {
-      if (documentBaseURI != null)
-        wsdlMainResource.setURI(createURI(documentBaseURI));
-      resourceSet.getLoadOptions().put(WSDLResourceImpl.CONTINUE_ON_LOAD_ERROR,new Boolean(false));
-      wsdlMainResource.load(inputSource.getByteStream(), resourceSet.getLoadOptions());
-    }
-    catch (IOException ioe)
-    {
-      throw new WSDLException(WSDLException.INVALID_WSDL, "", ioe);
-    }
-    
-    Definition definition = wsdlMainResource.getDefinition();
-    if (definition != null)
-      definition.setDocumentBaseURI(documentBaseURI);
-    
-    return definition;
-  }
-
-  /**
-   * Read a WSDL document into a WSDL definition.
-   *
-   * @param locator A WSDLLocator object used to provide InputSources
-   * pointing to the wsdl file.
-   * @return the definition described in the document
-   */
-  public Definition readWSDL(WSDLLocator locator) throws WSDLException
-  {
-    throw new WSDLException(WSDLException.OTHER_ERROR,"Not Implemented");
-  }
-
-  private URI createURI(String uriString)
-  {
-    if (hasProtocol(uriString))
-       return URI.createURI(uriString);
-    else
-       return URI.createFileURI(uriString);
-  } 
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/wsdl4j/WSDLWriterImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/wsdl4j/WSDLWriterImpl.java
deleted file mode 100644
index 9baf1525c..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/wsdl4j/WSDLWriterImpl.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl.wsdl4j;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.Writer;
-
-import javax.wsdl.Definition;
-import javax.wsdl.WSDLException;
-import javax.wsdl.xml.WSDLWriter;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.wst.wsdl.internal.impl.DefinitionImpl;
-import org.w3c.dom.Document;
-
-
-public final class WSDLWriterImpl implements WSDLWriter
-{
-  /**
-   * Sets the specified feature to the specified value.
-   * <p>
-   * There are no minimum features that must be supported.
-   * <p>
-   * All feature names must be fully-qualified, Java package style. All
-   * names starting with javax.wsdl. are reserved for features defined
-   * by the JWSDL specification. It is recommended that implementation-
-   * specific features be fully-qualified to match the package name
-   * of that implementation. For example: com.abc.featureName
-   *
-   * @param name the name of the feature to be set.
-   * @param value the value to set the feature to.
-   * @throws IllegalArgumentException if the feature name is not recognized.
-   * @see #getFeature(String)
-   */
-  public void setFeature(String name, boolean value) throws IllegalArgumentException
-  {
-    throw new IllegalArgumentException("Not Implemented");
-  }
-
-  /**
-   * Gets the value of the specified feature.
-   *
-   * @param name the name of the feature to get the value of.
-   * @throws IllegalArgumentException if the feature name is not recognized.
-   * @see #setFeature(String, boolean)
-   */
-  public boolean getFeature(String name) throws IllegalArgumentException
-  {
-    throw new IllegalArgumentException("Not Implemented");
-  }
-
-  /**
-   * Return a document generated from the specified WSDL model.
-   */
-  public Document getDocument(Definition wsdlDef) throws WSDLException
-  {
-    return ((DefinitionImpl)wsdlDef).getDocument();
-  }
-
-  /**
-   * Write the specified WSDL definition to the specified Writer.
-   *
-   * @param wsdlDef the WSDL definition to be written.
-   * @param sink the Writer to write the xml to.
-   */
-  public void writeWSDL(Definition wsdlDef, Writer sink) throws WSDLException
-  {
-    String encoding = null;
-    try
-    {
-      TransformerFactory transformerFactory = TransformerFactory.newInstance();
-      Transformer transformer = transformerFactory.newTransformer();
-
-      transformer.setOutputProperty(OutputKeys.INDENT, "yes");
-      transformer.setOutputProperty(OutputKeys.METHOD, "xml");
-      
-      // Unless a width is set, there will be only line breaks but no indentation.
-      // The IBM JDK and the Sun JDK don't agree on the property name,
-      // so we set them both.
-      //
-      transformer.setOutputProperty("{http://xml.apache.org/xalan}indent-amount", "2");
-      transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
-      if (encoding != null)
-      {
-        transformer.setOutputProperty(OutputKeys.ENCODING, encoding);
-      }
-      
-      Document document = ((DefinitionImpl)wsdlDef).getDocument();
-      if (document == null)
-      {
-        ((DefinitionImpl)wsdlDef).updateElement(true);
-        document = ((DefinitionImpl)wsdlDef).getDocument();
-      }
-      
-      transformer.transform(new DOMSource(document), new StreamResult(sink));
-    }
-    catch (TransformerException exception)
-    {
-      throw new WSDLException(WSDLException.OTHER_ERROR,"Failed to save Definitions.",exception);
-    }
-
-  }
-
-  /**
-   * Write the specified WSDL definition to the specified OutputStream.
-   *
-   * @param wsdlDef the WSDL definition to be written.
-   * @param sink the OutputStream to write the xml to.
-   */
-  public void writeWSDL(Definition wsdlDef, OutputStream sink) throws WSDLException
-  {
-
-    Resource resource = ((DefinitionImpl)wsdlDef).eResource();
-    try
-    {
-      resource.save(sink,null);
-    }
-    catch (IOException e)
-    {
-      throw new WSDLException(WSDLException.OTHER_ERROR,"Failed to save Definitions.",e);
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/Reconcilable.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/Reconcilable.java
deleted file mode 100644
index b9d2a9067..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/Reconcilable.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.util;
-
-import org.w3c.dom.Element;
-
-// TODO... why do we need this?
-// 
-public interface Reconcilable 
-{
-  public void setElement(Element element);
-  public Element getElement();
-  public void reconcileAttributes(Element changedElement);
-  public void reconcileReferences(boolean deep);
-}
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLAdapterFactory.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLAdapterFactory.java
deleted file mode 100644
index e7c620a89..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLAdapterFactory.java
+++ /dev/null
@@ -1,1039 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.util;
-
-import java.net.URL;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.wsdl.extensions.ExtensionRegistry;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.ExtensibleElement;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.MessageReference;
-import org.eclipse.wst.wsdl.Namespace;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.Types;
-import org.eclipse.wst.wsdl.UnknownExtensibilityElement;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.wsdl.WSDLPackage
- * @generated
- */
-public class WSDLAdapterFactory extends AdapterFactoryImpl
-{
-  /**
-   * The cached model package.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected static WSDLPackage modelPackage;
-
-  /**
-   * Creates an instance of the adapter factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public WSDLAdapterFactory()
-  {
-    if (modelPackage == null)
-    {
-      modelPackage = WSDLPackage.eINSTANCE;
-    }
-  }
-
-  /**
-   * Returns whether this factory is applicable for the type of the object.
-   * <!-- begin-user-doc -->
-   * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-   * <!-- end-user-doc -->
-   * @return whether this factory is applicable for the type of the object.
-   * @generated
-   */
-  public boolean isFactoryForType(Object object)
-  {
-    if (object == modelPackage)
-    {
-      return true;
-    }
-    if (object instanceof EObject)
-    {
-      return ((EObject)object).eClass().getEPackage() == modelPackage;
-    }
-    return false;
-  }
-
-  /**
-   * The switch the delegates to the <code>createXXX</code> methods.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected WSDLSwitch modelSwitch =
-    new WSDLSwitch()
-    {
-      public Object caseWSDLElement(WSDLElement object)
-      {
-        return createWSDLElementAdapter();
-      }
-      public Object casePortType(PortType object)
-      {
-        return createPortTypeAdapter();
-      }
-      public Object caseOperation(Operation object)
-      {
-        return createOperationAdapter();
-      }
-      public Object caseMessage(Message object)
-      {
-        return createMessageAdapter();
-      }
-      public Object casePart(Part object)
-      {
-        return createPartAdapter();
-      }
-      public Object caseBinding(Binding object)
-      {
-        return createBindingAdapter();
-      }
-      public Object caseBindingOperation(BindingOperation object)
-      {
-        return createBindingOperationAdapter();
-      }
-      public Object caseService(Service object)
-      {
-        return createServiceAdapter();
-      }
-      public Object casePort(Port object)
-      {
-        return createPortAdapter();
-      }
-      public Object caseExtensibilityElement(ExtensibilityElement object)
-      {
-        return createExtensibilityElementAdapter();
-      }
-      public Object caseDefinition(Definition object)
-      {
-        return createDefinitionAdapter();
-      }
-      public Object caseImport(Import object)
-      {
-        return createImportAdapter();
-      }
-      public Object caseExtensibleElement(ExtensibleElement object)
-      {
-        return createExtensibleElementAdapter();
-      }
-      public Object caseInput(Input object)
-      {
-        return createInputAdapter();
-      }
-      public Object caseOutput(Output object)
-      {
-        return createOutputAdapter();
-      }
-      public Object caseFault(Fault object)
-      {
-        return createFaultAdapter();
-      }
-      public Object caseBindingInput(BindingInput object)
-      {
-        return createBindingInputAdapter();
-      }
-      public Object caseBindingOutput(BindingOutput object)
-      {
-        return createBindingOutputAdapter();
-      }
-      public Object caseBindingFault(BindingFault object)
-      {
-        return createBindingFaultAdapter();
-      }
-      public Object caseNamespace(Namespace object)
-      {
-        return createNamespaceAdapter();
-      }
-      public Object caseIPortType(javax.wsdl.PortType object)
-      {
-        return createIPortTypeAdapter();
-      }
-      public Object caseIOperation(javax.wsdl.Operation object)
-      {
-        return createIOperationAdapter();
-      }
-      public Object caseIInput(javax.wsdl.Input object)
-      {
-        return createIInputAdapter();
-      }
-      public Object caseIOutput(javax.wsdl.Output object)
-      {
-        return createIOutputAdapter();
-      }
-      public Object caseIFault(javax.wsdl.Fault object)
-      {
-        return createIFaultAdapter();
-      }
-      public Object caseIMessage(javax.wsdl.Message object)
-      {
-        return createIMessageAdapter();
-      }
-      public Object caseIPart(javax.wsdl.Part object)
-      {
-        return createIPartAdapter();
-      }
-      public Object caseIService(javax.wsdl.Service object)
-      {
-        return createIServiceAdapter();
-      }
-      public Object caseIPort(javax.wsdl.Port object)
-      {
-        return createIPortAdapter();
-      }
-      public Object caseIBinding(javax.wsdl.Binding object)
-      {
-        return createIBindingAdapter();
-      }
-      public Object caseIBindingOperation(javax.wsdl.BindingOperation object)
-      {
-        return createIBindingOperationAdapter();
-      }
-      public Object caseIBindingInput(javax.wsdl.BindingInput object)
-      {
-        return createIBindingInputAdapter();
-      }
-      public Object caseIBindingOutput(javax.wsdl.BindingOutput object)
-      {
-        return createIBindingOutputAdapter();
-      }
-      public Object caseIBindingFault(javax.wsdl.BindingFault object)
-      {
-        return createIBindingFaultAdapter();
-      }
-      public Object caseIExtensibilityElement(javax.wsdl.extensions.ExtensibilityElement object)
-      {
-        return createIExtensibilityElementAdapter();
-      }
-      public Object caseIDefinition(javax.wsdl.Definition object)
-      {
-        return createIDefinitionAdapter();
-      }
-      public Object caseIImport(javax.wsdl.Import object)
-      {
-        return createIImportAdapter();
-      }
-      public Object caseIList(List object)
-      {
-        return createIListAdapter();
-      }
-      public Object caseIMap(Map object)
-      {
-        return createIMapAdapter();
-      }
-      public Object caseIURL(URL object)
-      {
-        return createIURLAdapter();
-      }
-      public Object caseIExtensionRegistry(ExtensionRegistry object)
-      {
-        return createIExtensionRegistryAdapter();
-      }
-      public Object caseTypes(Types object)
-      {
-        return createTypesAdapter();
-      }
-      public Object caseIIterator(Iterator object)
-      {
-        return createIIteratorAdapter();
-      }
-      public Object caseITypes(javax.wsdl.Types object)
-      {
-        return createITypesAdapter();
-      }
-      public Object caseUnknownExtensibilityElement(UnknownExtensibilityElement object)
-      {
-        return createUnknownExtensibilityElementAdapter();
-      }
-      public Object caseXSDSchemaExtensibilityElement(XSDSchemaExtensibilityElement object)
-      {
-        return createXSDSchemaExtensibilityElementAdapter();
-      }
-      public Object caseMessageReference(MessageReference object)
-      {
-        return createMessageReferenceAdapter();
-      }
-      public Object defaultCase(EObject object)
-      {
-        return createEObjectAdapter();
-      }
-    };
-
-  /**
-   * Creates an adapter for the <code>target</code>.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param target the object to adapt.
-   * @return the adapter for the <code>target</code>.
-   * @generated
-   */
-  public Adapter createAdapter(Notifier target)
-  {
-    return (Adapter)modelSwitch.doSwitch((EObject)target);
-  }
-
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wsdl.WSDLElement <em>Element</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.WSDLElement
-   * @generated
-   */
-  public Adapter createWSDLElementAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wsdl.PortType <em>Port Type</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.PortType
-   * @generated
-   */
-  public Adapter createPortTypeAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wsdl.Operation <em>Operation</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.Operation
-   * @generated
-   */
-  public Adapter createOperationAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wsdl.Message <em>Message</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.Message
-   * @generated
-   */
-  public Adapter createMessageAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wsdl.Part <em>Part</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.Part
-   * @generated
-   */
-  public Adapter createPartAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wsdl.Binding <em>Binding</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.Binding
-   * @generated
-   */
-  public Adapter createBindingAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wsdl.BindingOperation <em>Binding Operation</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.BindingOperation
-   * @generated
-   */
-  public Adapter createBindingOperationAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wsdl.Service <em>Service</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.Service
-   * @generated
-   */
-  public Adapter createServiceAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wsdl.Port <em>Port</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.Port
-   * @generated
-   */
-  public Adapter createPortAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wsdl.ExtensibilityElement <em>Extensibility Element</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.ExtensibilityElement
-   * @generated
-   */
-  public Adapter createExtensibilityElementAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wsdl.Definition <em>Definition</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.Definition
-   * @generated
-   */
-  public Adapter createDefinitionAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wsdl.Import <em>Import</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.Import
-   * @generated
-   */
-  public Adapter createImportAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wsdl.ExtensibleElement <em>Extensible Element</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.ExtensibleElement
-   * @generated
-   */
-  public Adapter createExtensibleElementAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wsdl.Input <em>Input</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.Input
-   * @generated
-   */
-  public Adapter createInputAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wsdl.Output <em>Output</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.Output
-   * @generated
-   */
-  public Adapter createOutputAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wsdl.Fault <em>Fault</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.Fault
-   * @generated
-   */
-  public Adapter createFaultAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wsdl.BindingInput <em>Binding Input</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.BindingInput
-   * @generated
-   */
-  public Adapter createBindingInputAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wsdl.BindingOutput <em>Binding Output</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.BindingOutput
-   * @generated
-   */
-  public Adapter createBindingOutputAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wsdl.BindingFault <em>Binding Fault</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.BindingFault
-   * @generated
-   */
-  public Adapter createBindingFaultAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wsdl.Namespace <em>Namespace</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.Namespace
-   * @generated
-   */
-  public Adapter createNamespaceAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link javax.wsdl.PortType <em>IPort Type</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see javax.wsdl.PortType
-   * @generated
-   */
-  public Adapter createIPortTypeAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link javax.wsdl.Operation <em>IOperation</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see javax.wsdl.Operation
-   * @generated
-   */
-  public Adapter createIOperationAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link javax.wsdl.Input <em>IInput</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see javax.wsdl.Input
-   * @generated
-   */
-  public Adapter createIInputAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link javax.wsdl.Output <em>IOutput</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see javax.wsdl.Output
-   * @generated
-   */
-  public Adapter createIOutputAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link javax.wsdl.Fault <em>IFault</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see javax.wsdl.Fault
-   * @generated
-   */
-  public Adapter createIFaultAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link javax.wsdl.Message <em>IMessage</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see javax.wsdl.Message
-   * @generated
-   */
-  public Adapter createIMessageAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link javax.wsdl.Part <em>IPart</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see javax.wsdl.Part
-   * @generated
-   */
-  public Adapter createIPartAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link javax.wsdl.Service <em>IService</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see javax.wsdl.Service
-   * @generated
-   */
-  public Adapter createIServiceAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link javax.wsdl.Port <em>IPort</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see javax.wsdl.Port
-   * @generated
-   */
-  public Adapter createIPortAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link javax.wsdl.Binding <em>IBinding</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see javax.wsdl.Binding
-   * @generated
-   */
-  public Adapter createIBindingAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link javax.wsdl.BindingOperation <em>IBinding Operation</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see javax.wsdl.BindingOperation
-   * @generated
-   */
-  public Adapter createIBindingOperationAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link javax.wsdl.BindingInput <em>IBinding Input</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see javax.wsdl.BindingInput
-   * @generated
-   */
-  public Adapter createIBindingInputAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link javax.wsdl.BindingOutput <em>IBinding Output</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see javax.wsdl.BindingOutput
-   * @generated
-   */
-  public Adapter createIBindingOutputAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link javax.wsdl.BindingFault <em>IBinding Fault</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see javax.wsdl.BindingFault
-   * @generated
-   */
-  public Adapter createIBindingFaultAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link javax.wsdl.extensions.ExtensibilityElement <em>IExtensibility Element</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see javax.wsdl.extensions.ExtensibilityElement
-   * @generated
-   */
-  public Adapter createIExtensibilityElementAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link javax.wsdl.Definition <em>IDefinition</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see javax.wsdl.Definition
-   * @generated
-   */
-  public Adapter createIDefinitionAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link javax.wsdl.Import <em>IImport</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see javax.wsdl.Import
-   * @generated
-   */
-  public Adapter createIImportAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link java.util.List <em>IList</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see java.util.List
-   * @generated
-   */
-  public Adapter createIListAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link java.util.Map <em>IMap</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see java.util.Map
-   * @generated
-   */
-  public Adapter createIMapAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link java.net.URL <em>IURL</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see java.net.URL
-   * @generated
-   */
-  public Adapter createIURLAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link javax.wsdl.extensions.ExtensionRegistry <em>IExtension Registry</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see javax.wsdl.extensions.ExtensionRegistry
-   * @generated
-   */
-  public Adapter createIExtensionRegistryAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wsdl.Types <em>Types</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.Types
-   * @generated
-   */
-  public Adapter createTypesAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link java.util.Iterator <em>IIterator</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see java.util.Iterator
-   * @generated
-   */
-  public Adapter createIIteratorAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link javax.wsdl.Types <em>ITypes</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see javax.wsdl.Types
-   * @generated
-   */
-  public Adapter createITypesAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wsdl.UnknownExtensibilityElement <em>Unknown Extensibility Element</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.UnknownExtensibilityElement
-   * @generated
-   */
-  public Adapter createUnknownExtensibilityElementAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wsdl.XSDSchemaExtensibilityElement <em>XSD Schema Extensibility Element</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement
-   * @generated
-   */
-  public Adapter createXSDSchemaExtensibilityElementAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wsdl.MessageReference <em>Message Reference</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.MessageReference
-   * @generated
-   */
-  public Adapter createMessageReferenceAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for the default case.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @generated
-   */
-  public Adapter createEObjectAdapter()
-  {
-    return null;
-  }
-
-} //WSDLAdapterFactory
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLDefinitionFactory.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLDefinitionFactory.java
deleted file mode 100644
index 09ef53220..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLDefinitionFactory.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.util;
-
-import javax.wsdl.WSDLException;
-import javax.wsdl.xml.WSDLReader;
-
-import org.eclipse.wst.wsdl.internal.impl.WSDLFactoryImpl;
-import org.eclipse.wst.wsdl.internal.impl.WSDLPackageImpl;
-
-import com.ibm.wsdl.xml.WSDLReaderImpl;
-
-public class WSDLDefinitionFactory extends com.ibm.wsdl.factory.WSDLFactoryImpl
-{
-
-  private static WSDLDefinitionFactory instance = null;
-
-  public WSDLDefinitionFactory()
-  {
-    // Make sure the WSDL package is initialized.
-    WSDLPackageImpl.init();
-  }
-
-  /**
-   * Create a new instance of Definition.
-   */
-  public javax.wsdl.Definition newDefinition()
-  {
-    javax.wsdl.Definition definition = WSDLFactoryImpl.eINSTANCE.createDefinition();
-    return definition;
-  }
-
-  /**
-   * Returns a singleton instance of this factory
-   */
-  public static javax.wsdl.factory.WSDLFactory getInstance() throws WSDLException
-  {
-    if (instance == null)
-      instance = new WSDLDefinitionFactory();
-    return instance;
-  }
-
-  /**
-   * Creates a WSDLReader.
-   */
-  public WSDLReader newWSDLReader()
-  {
-    WSDLReader reader = new WSDLReaderImpl();
-    reader.setFactoryImplName(getClass().getName());
-    return reader;
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLModelLocator.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLModelLocator.java
deleted file mode 100644
index c19b0c472..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLModelLocator.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.util;
-
-/**
- * An adapter interface used by {@link org.eclipse.wst.wsdl.ImportImpl to find referenced resources.
- * When the resource referenced by a wsdl import needs to be determined, 
- * the containing {@link org.eclipse.emf.ecore.resource.Resource}
- * will be {@link org.eclipse.emf.ecore.util.EcoreUtil#getRegisteredAdapter(org.eclipse.emf.ecore.resource.Resource,Object) inspected} 
- * for an adapter that implements this interface.
- * As such, you can register an adapter factory like this to tailor the algorithm used to locate the resource :
- *<pre>
- *  ResourceSet resourceSet = new ResourceSetImpl();
- *  resourceSet.getAdapterFactories().add
- *    (new AdapterFactoryImpl()
- *     {
- *       class CustomURIResolver extends AdapterImpl implements WSDLModelLocator
- *       {
- *         public String resolveURI(String baseLocation, String namespace, String location);
- *         {
- *           return null;  // Additional logic...
- *         }
- *
- *         public boolean isAdatperForType(Object type)
- *         {
- *           return type == WSDLModelLocator.class;
- *         }
- *       }
- *
- *       protected CustomURIResolver customURIResolver = new CustomURIResolver();
- *
- *       public boolean isFactoryForType(Object type)
- *       {
- *         return type == WSDLModelLocator.class;
- *       }
- *
- *       public Adapter adaptNew(Notifier target, Object type)
- *       {
- *         return customURIResolver;
- *       }
- *     });
- *</pre>
- * @see org.eclipse.emf.ecore.util.EcoreUtil#getRegisteredAdapter(org.eclipse.emf.ecore.resource.Resource,Object)
- */
-public interface WSDLModelLocator
-{
-	public String resolveURI(String baseLocation, String namespace, String location);
-}
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLResourceFactoryImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLResourceFactoryImpl.java
deleted file mode 100644
index c3986a6ca..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLResourceFactoryImpl.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.util;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource Factory</b> associated with the package.
- * <!-- end-user-doc -->
- * @see org.eclipse.wst.wsdl.util.WSDLResourceImpl
- * @generated
- */
-public class WSDLResourceFactoryImpl extends ResourceFactoryImpl
-{
-  /**
-   * Creates an instance of the resource factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public WSDLResourceFactoryImpl()
-  {
-    super();
-  }
-
-  /**
-   * Creates an instance of the resource.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Resource createResource(URI uri)
-  {
-    Resource result = new WSDLResourceImpl(uri);
-    return result;
-  }
-} //WSDLResourceFactoryImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLSwitch.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLSwitch.java
deleted file mode 100644
index f860668a4..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLSwitch.java
+++ /dev/null
@@ -1,1074 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.util;
-
-import java.net.URL;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.wsdl.extensions.ExtensionRegistry;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.ExtensibleElement;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.MessageReference;
-import org.eclipse.wst.wsdl.Namespace;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.Types;
-import org.eclipse.wst.wsdl.UnknownExtensibilityElement;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.wsdl.WSDLPackage
- * @generated
- */
-public class WSDLSwitch {
-  /**
-   * The cached model package
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected static WSDLPackage modelPackage;
-
-  /**
-   * Creates an instance of the switch.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public WSDLSwitch()
-  {
-    if (modelPackage == null)
-    {
-      modelPackage = WSDLPackage.eINSTANCE;
-    }
-  }
-
-  /**
-   * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the first non-null result returned by a <code>caseXXX</code> call.
-   * @generated
-   */
-  public Object doSwitch(EObject theEObject)
-  {
-    EClass theEClass = theEObject.eClass();
-    if (theEClass.eContainer() == modelPackage)
-    {
-      switch (theEClass.getClassifierID())
-      {
-        case WSDLPackage.PORT_TYPE:
-        {
-          PortType portType = (PortType)theEObject;
-          Object result = casePortType(portType);
-          if (result == null) result = caseWSDLElement(portType);
-          if (result == null) result = caseIPortType(portType);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case WSDLPackage.OPERATION:
-        {
-          Operation operation = (Operation)theEObject;
-          Object result = caseOperation(operation);
-          if (result == null) result = caseWSDLElement(operation);
-          if (result == null) result = caseIOperation(operation);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case WSDLPackage.MESSAGE:
-        {
-          Message message = (Message)theEObject;
-          Object result = caseMessage(message);
-          if (result == null) result = caseWSDLElement(message);
-          if (result == null) result = caseIMessage(message);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case WSDLPackage.PART:
-        {
-          Part part = (Part)theEObject;
-          Object result = casePart(part);
-          if (result == null) result = caseWSDLElement(part);
-          if (result == null) result = caseIPart(part);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case WSDLPackage.BINDING:
-        {
-          Binding binding = (Binding)theEObject;
-          Object result = caseBinding(binding);
-          if (result == null) result = caseExtensibleElement(binding);
-          if (result == null) result = caseIBinding(binding);
-          if (result == null) result = caseWSDLElement(binding);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case WSDLPackage.BINDING_OPERATION:
-        {
-          BindingOperation bindingOperation = (BindingOperation)theEObject;
-          Object result = caseBindingOperation(bindingOperation);
-          if (result == null) result = caseExtensibleElement(bindingOperation);
-          if (result == null) result = caseIBindingOperation(bindingOperation);
-          if (result == null) result = caseWSDLElement(bindingOperation);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case WSDLPackage.SERVICE:
-        {
-          Service service = (Service)theEObject;
-          Object result = caseService(service);
-          if (result == null) result = caseExtensibleElement(service);
-          if (result == null) result = caseIService(service);
-          if (result == null) result = caseWSDLElement(service);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case WSDLPackage.PORT:
-        {
-          Port port = (Port)theEObject;
-          Object result = casePort(port);
-          if (result == null) result = caseExtensibleElement(port);
-          if (result == null) result = caseIPort(port);
-          if (result == null) result = caseWSDLElement(port);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case WSDLPackage.EXTENSIBILITY_ELEMENT:
-        {
-          ExtensibilityElement extensibilityElement = (ExtensibilityElement)theEObject;
-          Object result = caseExtensibilityElement(extensibilityElement);
-          if (result == null) result = caseWSDLElement(extensibilityElement);
-          if (result == null) result = caseIExtensibilityElement(extensibilityElement);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case WSDLPackage.DEFINITION:
-        {
-          Definition definition = (Definition)theEObject;
-          Object result = caseDefinition(definition);
-          if (result == null) result = caseExtensibleElement(definition);
-          if (result == null) result = caseIDefinition(definition);
-          if (result == null) result = caseWSDLElement(definition);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case WSDLPackage.IMPORT:
-        {
-          Import import_ = (Import)theEObject;
-          Object result = caseImport(import_);
-          if (result == null) result = caseWSDLElement(import_);
-          if (result == null) result = caseIImport(import_);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case WSDLPackage.INPUT:
-        {
-          Input input = (Input)theEObject;
-          Object result = caseInput(input);
-          if (result == null) result = caseMessageReference(input);
-          if (result == null) result = caseWSDLElement(input);
-          if (result == null) result = caseIInput(input);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case WSDLPackage.OUTPUT:
-        {
-          Output output = (Output)theEObject;
-          Object result = caseOutput(output);
-          if (result == null) result = caseMessageReference(output);
-          if (result == null) result = caseWSDLElement(output);
-          if (result == null) result = caseIOutput(output);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case WSDLPackage.FAULT:
-        {
-          Fault fault = (Fault)theEObject;
-          Object result = caseFault(fault);
-          if (result == null) result = caseMessageReference(fault);
-          if (result == null) result = caseWSDLElement(fault);
-          if (result == null) result = caseIFault(fault);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case WSDLPackage.BINDING_INPUT:
-        {
-          BindingInput bindingInput = (BindingInput)theEObject;
-          Object result = caseBindingInput(bindingInput);
-          if (result == null) result = caseExtensibleElement(bindingInput);
-          if (result == null) result = caseIBindingInput(bindingInput);
-          if (result == null) result = caseWSDLElement(bindingInput);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case WSDLPackage.BINDING_OUTPUT:
-        {
-          BindingOutput bindingOutput = (BindingOutput)theEObject;
-          Object result = caseBindingOutput(bindingOutput);
-          if (result == null) result = caseExtensibleElement(bindingOutput);
-          if (result == null) result = caseIBindingOutput(bindingOutput);
-          if (result == null) result = caseWSDLElement(bindingOutput);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case WSDLPackage.BINDING_FAULT:
-        {
-          BindingFault bindingFault = (BindingFault)theEObject;
-          Object result = caseBindingFault(bindingFault);
-          if (result == null) result = caseExtensibleElement(bindingFault);
-          if (result == null) result = caseIBindingFault(bindingFault);
-          if (result == null) result = caseWSDLElement(bindingFault);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case WSDLPackage.NAMESPACE:
-        {
-          Namespace namespace = (Namespace)theEObject;
-          Object result = caseNamespace(namespace);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case WSDLPackage.TYPES:
-        {
-          Types types = (Types)theEObject;
-          Object result = caseTypes(types);
-          if (result == null) result = caseExtensibleElement(types);
-          if (result == null) result = caseITypes(types);
-          if (result == null) result = caseWSDLElement(types);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT:
-        {
-          UnknownExtensibilityElement unknownExtensibilityElement = (UnknownExtensibilityElement)theEObject;
-          Object result = caseUnknownExtensibilityElement(unknownExtensibilityElement);
-          if (result == null) result = caseExtensibilityElement(unknownExtensibilityElement);
-          if (result == null) result = caseWSDLElement(unknownExtensibilityElement);
-          if (result == null) result = caseIExtensibilityElement(unknownExtensibilityElement);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT:
-        {
-          XSDSchemaExtensibilityElement xsdSchemaExtensibilityElement = (XSDSchemaExtensibilityElement)theEObject;
-          Object result = caseXSDSchemaExtensibilityElement(xsdSchemaExtensibilityElement);
-          if (result == null) result = caseExtensibilityElement(xsdSchemaExtensibilityElement);
-          if (result == null) result = caseWSDLElement(xsdSchemaExtensibilityElement);
-          if (result == null) result = caseIExtensibilityElement(xsdSchemaExtensibilityElement);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        default: return defaultCase(theEObject);
-      }
-    }
-    return defaultCase(theEObject);
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Element</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Element</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseWSDLElement(WSDLElement object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Port Type</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Port Type</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object casePortType(PortType object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Operation</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Operation</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseOperation(Operation object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Message</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Message</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseMessage(Message object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Part</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Part</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object casePart(Part object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Binding</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Binding</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseBinding(Binding object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Binding Operation</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Binding Operation</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseBindingOperation(BindingOperation object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Service</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Service</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseService(Service object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Port</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Port</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object casePort(Port object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Extensibility Element</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Extensibility Element</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseExtensibilityElement(ExtensibilityElement object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Definition</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Definition</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseDefinition(Definition object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Import</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Import</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseImport(Import object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Extensible Element</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Extensible Element</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseExtensibleElement(ExtensibleElement object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Input</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Input</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseInput(Input object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Output</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Output</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseOutput(Output object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Fault</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Fault</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseFault(Fault object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Binding Input</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Binding Input</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseBindingInput(BindingInput object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Binding Output</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Binding Output</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseBindingOutput(BindingOutput object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Binding Fault</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Binding Fault</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseBindingFault(BindingFault object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Namespace</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Namespace</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseNamespace(Namespace object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>IPort Type</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>IPort Type</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseIPortType(javax.wsdl.PortType object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>IOperation</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>IOperation</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseIOperation(javax.wsdl.Operation object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>IInput</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>IInput</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseIInput(javax.wsdl.Input object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>IOutput</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>IOutput</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseIOutput(javax.wsdl.Output object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>IFault</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>IFault</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseIFault(javax.wsdl.Fault object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>IMessage</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>IMessage</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseIMessage(javax.wsdl.Message object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>IPart</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>IPart</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseIPart(javax.wsdl.Part object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>IService</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>IService</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseIService(javax.wsdl.Service object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>IPort</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>IPort</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseIPort(javax.wsdl.Port object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>IBinding</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>IBinding</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseIBinding(javax.wsdl.Binding object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>IBinding Operation</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>IBinding Operation</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseIBindingOperation(javax.wsdl.BindingOperation object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>IBinding Input</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>IBinding Input</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseIBindingInput(javax.wsdl.BindingInput object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>IBinding Output</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>IBinding Output</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseIBindingOutput(javax.wsdl.BindingOutput object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>IBinding Fault</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>IBinding Fault</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseIBindingFault(javax.wsdl.BindingFault object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>IExtensibility Element</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>IExtensibility Element</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseIExtensibilityElement(javax.wsdl.extensions.ExtensibilityElement object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>IDefinition</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>IDefinition</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseIDefinition(javax.wsdl.Definition object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>IImport</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>IImport</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseIImport(javax.wsdl.Import object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>IList</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>IList</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseIList(List object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>IMap</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>IMap</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseIMap(Map object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>IURL</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>IURL</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseIURL(URL object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>IExtension Registry</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>IExtension Registry</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseIExtensionRegistry(ExtensionRegistry object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Types</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Types</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseTypes(Types object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>IIterator</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>IIterator</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseIIterator(Iterator object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>ITypes</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>ITypes</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseITypes(javax.wsdl.Types object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Unknown Extensibility Element</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Unknown Extensibility Element</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseUnknownExtensibilityElement(UnknownExtensibilityElement object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>XSD Schema Extensibility Element</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>XSD Schema Extensibility Element</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseXSDSchemaExtensibilityElement(XSDSchemaExtensibilityElement object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Message Reference</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Message Reference</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseMessageReference(MessageReference object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch, but this is the last case anyway.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-   * @generated
-   */
-  public Object defaultCase(EObject object)
-  {
-    return null;
-  }
-
-} //WSDLSwitch
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLUtil.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLUtil.java
deleted file mode 100644
index da79b0421..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLUtil.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.util;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.ExtensibleElement;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-public class WSDLUtil extends WSDLConstants
-{
-  protected static WSDLUtil instance;
-  //  protected NodeAssociationManager nodeAssociationManager = new NodeAssociationManager();
-
-  protected HashMap elementNameToTypeMap = new HashMap();
-
-  public static WSDLUtil getInstance()
-  {
-    if (instance == null)
-    {
-      instance = new WSDLUtil();
-    }
-    return instance;
-  }
-
-  public WSDLUtil()
-  {
-    elementNameToTypeMap.put(BINDING_ELEMENT_TAG, new Integer(BINDING));
-    elementNameToTypeMap.put(DEFINITION_ELEMENT_TAG, new Integer(DEFINITION));
-    elementNameToTypeMap.put(DOCUMENTATION_ELEMENT_TAG, new Integer(DOCUMENTATION));
-    elementNameToTypeMap.put(FAULT_ELEMENT_TAG, new Integer(FAULT));
-    elementNameToTypeMap.put(IMPORT_ELEMENT_TAG, new Integer(IMPORT));
-    elementNameToTypeMap.put(INPUT_ELEMENT_TAG, new Integer(INPUT));
-    elementNameToTypeMap.put(MESSAGE_ELEMENT_TAG, new Integer(MESSAGE));
-    elementNameToTypeMap.put(OPERATION_ELEMENT_TAG, new Integer(OPERATION));
-    elementNameToTypeMap.put(OUTPUT_ELEMENT_TAG, new Integer(OUTPUT));
-    elementNameToTypeMap.put(PART_ELEMENT_TAG, new Integer(PART));
-    elementNameToTypeMap.put(PORT_ELEMENT_TAG, new Integer(PORT));
-    elementNameToTypeMap.put(PORT_TYPE_ELEMENT_TAG, new Integer(PORT_TYPE));
-    elementNameToTypeMap.put(SERVICE_ELEMENT_TAG, new Integer(SERVICE));
-    elementNameToTypeMap.put(TYPES_ELEMENT_TAG, new Integer(TYPES));
-  }
-
-  public int getWSDLType(Element element)
-  {
-    int result = -1;
-
-    Integer integer = (Integer) elementNameToTypeMap.get(element.getLocalName());
-    if (integer != null)
-    {
-      result = integer.intValue();
-    }
-    return result;
-  }
-
-  protected List getParentElementChain(Element element)
-  {
-    List list = new ArrayList();
-    while (element != null)
-    {
-      list.add(0, element);
-      Node node = element.getParentNode();
-      element = (node != null && node.getNodeType() == Node.ELEMENT_NODE) ? (Element) node : null;
-    }
-    return list;
-  }
-
-  /*
-    public Object findModelObjectForElement(Definition definition, Element targetElement)
-    {   
-      Object o = nodeAssociationManager.getModelObjectForNode(definition, targetElement);
-      return o;
-    }
-  
-              
-    public Element getElementForObject(Object o)
-    {      
-      Node node = nodeAssociationManager.getNode(o);  
-      return (node != null && node.getNodeType() == Node.ELEMENT_NODE) ? (Element)node : null;                  
-    }
-    
-    public Node getNodeForObject(Object o)
-    {      
-      return nodeAssociationManager.getNode(o);                      
-    }
-  
-    public ITypeSystemProvider getTypeSystemProvider(Definition definition)
-    {      
-      return WSDLToDOMElementUtil.getTypeSystemProvider(definition);                    
-    }
-  
-  
-    public void setTypeSystemProvider(Definition definition, ITypeSystemProvider typeSystemProvider)
-    {      
-      WSDLToDOMElementUtil.setTypeSystemProvider(definition, typeSystemProvider);                      
-    }   
-  */
-
-  public static QName createQName(Definition definition, String prefixedName)
-  {
-    QName qname = null;
-    if (prefixedName != null)
-    {
-      int index = prefixedName.indexOf(":");
-      String prefix = (index == -1) ? null : prefixedName.substring(0, index);
-      if (prefix != null)
-      {
-        String namespace = definition.getNamespace(prefix);
-        if (namespace != null)
-        {
-          String localPart = prefixedName.substring(index + 1);
-          qname = new QName(namespace, localPart);
-        }
-      }
-    }
-    return qname;
-  }
-
-  public List getExtensibilityElementNodes(ExtensibleElement extensibleElement)
-  {
-    List childList = new ArrayList();
-    for (Iterator i = extensibleElement.getEExtensibilityElements().iterator(); i.hasNext();)
-    {
-      ExtensibilityElement extensibilityElement = (ExtensibilityElement) i.next();
-      if (extensibilityElement != null)
-      {
-        Element element = extensibilityElement.getElement();
-        if (element != null)
-        {
-          childList.add(element);
-        }
-      }
-    }
-    return childList;
-    //return extensibleElement.getEExtensibilityElements();
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/XSDSchemaLocatorAdapterFactory.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/XSDSchemaLocatorAdapterFactory.java
deleted file mode 100644
index 8e4ee818b..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/XSDSchemaLocatorAdapterFactory.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.xsd.util.XSDSchemaLocator;
-
-public class XSDSchemaLocatorAdapterFactory extends AdapterFactoryImpl
-{
-    protected XSDSchemaLocatorImpl schemaLocator = new XSDSchemaLocatorImpl();
-
-    public boolean isFactoryForType(Object type)
-    {
-      return type == XSDSchemaLocator.class;
-    }
-
-    public Adapter adaptNew(Notifier target, Object type)
-    {
-      return schemaLocator;
-    }
-}
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/XSDSchemaLocatorImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/XSDSchemaLocatorImpl.java
deleted file mode 100644
index 155b44bc9..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/XSDSchemaLocatorImpl.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.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;
-
-      // Bugzilla 122624:  WSDL model does not resolve <import> of inline schema with no namespace.
-      // KB: We are not resolving <import>ed or <include>d schemas from the root inline schemas.
-      // In other words, since we are resolving only between multiple root inline schemas,
-      // do not attempt to resolve if "rawSchemaLocationURI" is not null. 
-      if (namespaceURI != null && rawSchemaLocationURI == null)
-      {
-        Definition definition = null;
-
-        for (EObject parent = xsdSchema.eContainer(); parent != null; parent = parent.eContainer())
-        {
-          if (parent instanceof Definition)
-          {
-            definition = (Definition) parent;
-            break;
-          }
-        }
-
-        if (definition != null && definition.getETypes() != null)
-        {
-          for (Iterator i = definition.getETypes().getEExtensibilityElements().iterator(); i.hasNext();)
-          {
-            Object o = i.next();
-            if (o instanceof XSDSchemaExtensibilityElement)
-            {
-              XSDSchema schema = ((XSDSchemaExtensibilityElement) o).getSchema();
-              if (schema != null && namespaceURI.equals(schema.getTargetNamespace()))
-              {
-                resolvedSchema = schema;
-                break;
-              }
-            }
-          }
-        }
-      }
-      return resolvedSchema;      
-    }
-
-    public boolean isAdatperForType(Object type)
-    {
-      return type == XSDSchemaLocator.class;
-    }  
-}
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/package.html b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/package.html
deleted file mode 100644
index 8522de03b..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/package.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<html>
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="../../../../../..//apistyles.css" type="text/css">
-<title>WSDL Model API Overview</title>
-</head>
-<body>
-<p>
-        The WSDL model API allows clients to work with the WSDL 1.1 documents.
-		</p>
-<table width="500">
-<tr>
-<td>
-<p>The WSDL model API allows clients to load, modify, and save WSDL 1.1 documents.
-		</p>
-</td>
-</tr>
-</table>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/package.xml b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/package.xml
deleted file mode 100644
index 6ba5ba957..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/package.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html>
-	<head>
-		<meta
-			name="root"
-	
-			content="../../../../../../" />
-		<title>WSDL Model API Overview</title>
-	</head>
-
-	<body>
-		<abstract>
-        The WSDL model API allows clients to work with the WSDL 1.1 documents.
-		</abstract>
-		<p>The WSDL model API allows clients to load, modify, and save WSDL 1.1 documents.
-		</p> 
-	</body>
-</html>
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/ExtensibilityElementFactory.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/ExtensibilityElementFactory.java
deleted file mode 100644
index 1b1358481..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/ExtensibilityElementFactory.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.util;
-
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-/**
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 1.0
-*/
-public interface ExtensibilityElementFactory
-{
-  ExtensibilityElement createExtensibilityElement(String namespace, String localName);
-}
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/ExtensibilityElementFactoryRegistry.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/ExtensibilityElementFactoryRegistry.java
deleted file mode 100644
index 98a83561f..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/ExtensibilityElementFactoryRegistry.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.util;
-/**
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 1.0
-*/
-public interface ExtensibilityElementFactoryRegistry
-{
-  public void registerFactory(String namespace, ExtensibilityElementFactory factory);
-}
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/WSDLConstants.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/WSDLConstants.java
deleted file mode 100644
index 60ab82248..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/WSDLConstants.java
+++ /dev/null
@@ -1,370 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.util;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * This class defines constants for WSDL element tags and relevant namespaces.
- * @since 1.0
- */
-public class WSDLConstants
-{
-  /**
-   * The element tag is <code>"binding"</code>.
-   * @see #getElementTag(int).
-   */
-  public static final int BINDING = 0;
-  
-  /**
-   * The element tag is <code>"definitions"</code>.
-   * @see #getElementTag(int).
-   */  
-  public static final int DEFINITION = 1;
-  
-  /**
-   * The element tag is <code>"documentation"</code>.
-   * @see #getElementTag(int).
-   */
-  public static final int DOCUMENTATION = 2;
-  
-  /**
-   * The element tag is <code>"fault"</code>.
-   * @see #getElementTag(int).
-   */
-  public static final int FAULT = 3;
-  
-  /**
-   * The element tag is <code>"import"</code>.
-   * @see #getElementTag(int).
-   */
-  public static final int IMPORT = 4;
-  
-  /**
-   * The element tag is <code>"input"</code>.
-   * @see #getElementTag(int).
-   */
-  public static final int INPUT = 5;
-  
-  /**
-   * The element tag is <code>"message"</code>.
-   * @see #getElementTag(int).
-   */
-  public static final int MESSAGE = 6;
-  
-  /**
-   * The element tag is <code>"operation"</code>.
-   * @see #getElementTag(int).
-   */
-  public static final int OPERATION = 7;
-  
-  /**
-   * The element tag is <code>"output"</code>.
-   * @see #getElementTag(int).
-   */
-  public static final int OUTPUT = 8;
-  
-  /**
-   * The element tag is <code>"part"</code>.
-   * @see #getElementTag(int).
-   */
-  public static final int PART = 9;
-  
-  /**
-   * The element tag is <code>"port"</code>.
-   * @see #getElementTag(int).
-   */
-  public static final int PORT = 10;
-  
-  /**
-   * The element tag is <code>"portType"</code>.
-   * @see #getElementTag(int).
-   */
-  public static final int PORT_TYPE = 11;
-  
-  /**
-   * The element tag is <code>"service"</code>.
-   * @see #getElementTag(int).
-   */
-  public static final int SERVICE = 12;
-  
-  /**
-   * The element tag is <code>"types"</code>.
-   * @see #getElementTag(int).
-   */
-  public static final int TYPES = 13;
-  
-  /**
-   * The element tag is <code>"binding"</code>.
-   * @see #nodeType(String localName).
-   */
-  public static final String BINDING_ELEMENT_TAG = "binding";
-  
-  /**
-   * The element tag is <code>"definitions"</code>.
-   * @see #nodeType(String localName).
-   */
-  public static final String DEFINITION_ELEMENT_TAG = "definitions";
-  
-  /**
-   * The element tag is <code>"documentation"</code>.
-   * @see #nodeType(String localName).
-   */
-  public static final String DOCUMENTATION_ELEMENT_TAG = "documentation";
-  
-  /**
-   * The element tag is <code>"fault"</code>.
-   * @see #nodeType(String localName).
-   */
-  public static final String FAULT_ELEMENT_TAG = "fault";
-  
-  /**
-   * The element tag is <code>"import"</code>.
-   * @see #nodeType(String localName).
-   */
-  public static final String IMPORT_ELEMENT_TAG = "import";
-  
-  /**
-   * The element tag is <code>"input"</code>.
-   * @see #nodeType(String localName).
-   */
-  public static final String INPUT_ELEMENT_TAG = "input";
-  
-  /**
-   * The element tag is <code>"message"</code>.
-   * @see #nodeType(String localName).
-   */
-  public static final String MESSAGE_ELEMENT_TAG = "message";
-  
-  /**
-   * The element tag is <code>"operation"</code>.
-   * @see #nodeType(String localName).
-   */
-  public static final String OPERATION_ELEMENT_TAG = "operation";
-  
-  /**
-   * The element tag is <code>"output"</code>.
-   * @see #nodeType(String localName).
-   */
-  public static final String OUTPUT_ELEMENT_TAG = "output";
-  
-  /**
-   * The element tag is <code>"part"</code>.
-   * @see #nodeType(String localName).
-   */
-  public static final String PART_ELEMENT_TAG = "part";
-  
-  /**
-   * The element tag is <code>"port"</code>.
-   * @see #nodeType(String localName).
-   */
-  public static final String PORT_ELEMENT_TAG = "port";
-  
-  /**
-   * The element tag is <code>"portType"</code>.
-   * @see #nodeType(String localName).
-   */
-  public static final String PORT_TYPE_ELEMENT_TAG = "portType";
-  
-  /**
-   * The element tag is <code>"service"</code>.
-   * @see #nodeType(String localName).
-   */
-  public static final String SERVICE_ELEMENT_TAG = "service";
-  
-  /**
-   * The element tag is <code>"types"</code>.
-   * @see #nodeType(String localName).
-   */
-  public static final String TYPES_ELEMENT_TAG = "types";
-
-  // common
-  
-  /**
-   * The attribute is <code>"name"</code>.
-   * @see #getAttribute(Element,String).
-   */
-  public static final String NAME_ATTRIBUTE = "name";
-  
-  /**
-   * The attribute is <code>"message"</code>.
-   * @see #getAttribute(Element,String).
-   */
-  public static final String MESSAGE_ATTRIBUTE = "message";
-  
-  /**
-   * The attribute is <code>"binding"</code>.
-   * @see #getAttribute(Element,String).
-   */
-  public static final String BINDING_ATTRIBUTE = "binding";
-  
-  /**
-   * The attribute is <code>"type"</code>.
-   * @see #getAttribute(Element,String).
-   */
-  public static final String TYPE_ATTRIBUTE = "type";
-
-  // definitions
-  
-  /**
-   * The attribute is <code>"encoding"</code>.
-   * @see #getAttribute(Element,String).
-   */
-  public final static String ENCODING_ATTRIBUTE = "encoding";
-  
-  /**
-   * The attribute is <code>"targetNamespace"</code>.
-   * @see #getAttribute(Element,String).
-   */
-  public final static String TARGETNAMESPACE_ATTRIBUTE = "targetNamespace";
-
-  // binding
-  
-  /**
-   * The attribute is <code>"resourceURI"</code>.
-   * @see #getAttribute(Element,String).
-   */
-  public final static String RESOURCE_URI_ATTRIBUTE = "resourceURI";
-
-  // part
-  
-  /**
-   * The attribute is <code>"element"</code>.
-   * @see #getAttribute(Element,String).
-   */
-  public final static String ELEMENT_ATTRIBUTE = "element";
-  
-  // import
-  
-  /**
-   * The attribute is <code>"location"</code>.
-   * @see #getAttribute(Element,String).
-   */
-  public final static String LOCATION_ATTRIBUTE = "location"; 
-  
-  /**
-   * The attribute is <code>"namespace"</code>.
-   * @see #getAttribute(Element,String).
-   */
-  public static final String NAMESPACE_ATTRIBUTE = "namespace";  
-
-  /**
-   * The value <code>"http://schemas.xmlsoap.org/wsdl/"</code>.
-   */
-  public static final String WSDL_NAMESPACE_URI = "http://schemas.xmlsoap.org/wsdl/";
-  
-  /**
-   * The value <code>"http://www.w3.org/2001/XMLSchema"</code>.
-   */  
-  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";
-
-  private 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 };
-
-  /**
-   * Returns a String name of element tag given the nodeType.
-   * @param nodeType a constant defined in WSDLConstants.
-   * @return element tag.
-   */
-  public static final String getElementTag(int nodeType)
-  {
-    return ELEMENT_TAGS[nodeType];
-  }
-
-  /**
-   * Returns a node type given the String name of element tag.
-   * @param localName the local name of element tag.
-   * @return a node type defined in WSDLConstants.
-   */
-  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;
-  }
-  
-  /**
-   * Returns a node type defined in WSDLConstants given the DOM node.
-   * @param node a DOM node.
-   * @return a node type defined in WSDLConstants.
-   */
-  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);
-  }
-
-  /**
-   * Returns true if namespace1 equals to namespace2.
-   * @param namespace1 a namespace.
-   * @param namespace2 a namespace.
-   * @return true if namespace1 equals to namespace2.
-   */
-  public static boolean isMatchingNamespace(String namespace1, String namespace2)
-  {
-    return (namespace1 == null ? namespace2 == null : namespace1.equals(namespace2));
-  }
-
-  /**
-   * Returns an attribute value given the attributeName in the element.
-   * @param element a DOM element to search for the attribute from.
-   * @param attributeName an attribute to find from the element.
-   * @return an attribute value.
-   */
-  public static String getAttribute(Element element, String attributeName)
-  {
-    return element.hasAttribute(attributeName) ? element.getAttribute(attributeName) : null;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/WSDLResourceFactoryRegistry.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/WSDLResourceFactoryRegistry.java
deleted file mode 100644
index 6c6e278ad..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/WSDLResourceFactoryRegistry.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.util;
-
-import java.util.Map;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.Resource.Factory;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.DefaultHandler;
-import org.xml.sax.helpers.XMLReaderFactory;
-
-/**
- * This class provides support for the loading of WSDL or XSD resource from
- * URI's that don't end with .xsd or .wsdl extensions.
- * 
- * These URI's foil EMF's standard resource loading mechanism wich assumes that
- * a resource type can always be deduced from the file extension.
- * 
- *  Code Example:
- *    ResourceSet resourceSet = new ResourceSetImpl();
- *    WSDLResourceFactoryRegistry registry = new WSDLResourceFactoryRegistry(Resource.Factory.Registry.INSTANCE);
- *    resourceSet.setResourceFactoryRegistry(registry);
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 1.0
- */
-public class WSDLResourceFactoryRegistry implements Resource.Factory.Registry
-{
-  protected Resource.Factory.Registry parent;
-
-  public WSDLResourceFactoryRegistry(Resource.Factory.Registry parent)
-  {
-    this.parent = parent;
-  }
-
-  public Map getExtensionToFactoryMap()
-  {
-    return parent.getExtensionToFactoryMap();
-  }
-
-  public Map getProtocolToFactoryMap()
-  {
-    return parent.getProtocolToFactoryMap();
-  }
-
-  public Factory getFactory(URI uri)
-  {
-    String uriString = uri.toString();
-
-    Factory factory = parent.getFactory(uri);
-    Factory defaultFactory = (Factory) INSTANCE.getFactory(URI.createURI(DEFAULT_EXTENSION));
-
-    // give the parent the first crack at getting the factory
-    // if the factory is null or the known 'default' factory then we'll
-    // try to compute the factory ourselves
-    if (factory == null || factory == defaultFactory)
-    {
-      if (uriString.endsWith("wsdl") || uriString.endsWith("WSDL"))
-      {
-        // handle cases like "http://xxx/Distance.jws?wsdl"
-        //          	
-        factory = parent.getFactory(URI.createURI("*.wsdl"));
-      }
-      else if (uriString.endsWith("xsd") || uriString.endsWith("XSD"))
-      {
-        // handle cases like "http://xxx/Distance.jws?xsd"
-        //        	
-        factory = parent.getFactory(URI.createURI("*.xsd"));
-      }
-      else //if (uri.fileExtension() == null)
-        {
-        // handle cases like "http://xxx/example?getQuote"
-        //              	
-        // finally we must resort to opening the uri's stream and
-        // peeking at the content to determine if its an xsd or wsdl
-        //         	
-        String rootElementName = getRootElementName(uriString);
-        if (rootElementName != null)
-        {
-          if (rootElementName.equals("schema"))
-          {
-            factory = parent.getFactory(URI.createURI("*.xsd"));
-          }
-          else if (rootElementName.equals("definitions"))
-          {
-            factory = parent.getFactory(URI.createURI("*.wsdl"));
-          }
-        }
-      }
-    }
-    return factory;
-  }
-
-  // this method uses a SAX Parser to parser a stream and determine the root element name
-  // of any xml content
-  private String getRootElementName(String uri)
-  {
-    RootElementNameContentHandler handler = new RootElementNameContentHandler();
-    try
-    {
-      XMLReader reader = XMLReaderFactory.createXMLReader();
-      reader.setContentHandler(handler);
-      reader.parse(uri);
-    }
-    catch (Exception e)
-    {
-    }
-
-    return handler.rootElementName;
-  }
-
-  protected static class RootElementNameContentHandler extends DefaultHandler
-  {
-    public String rootElementName;
-
-    public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException
-    {
-      rootElementName = localName;
-
-      // here I throw an exception to make the SAX Parser to stop parsing
-      throw new SAXException("SAXParser intentonally stopped");
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/WSDLResourceImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/WSDLResourceImpl.java
deleted file mode 100644
index c967624aa..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/WSDLResourceImpl.java
+++ /dev/null
@@ -1,452 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.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.
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 1.0
- * @ignore
- * <!-- 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);
-
-      try
-      {
-        // Using a deferred DOM document in the WSDL model may cause a
-        // performance problem in terms of memory consumption in particular.
-        // We're attempting to use the feature which instructs the Xerces parser
-        // to not use deferred DOM trees.
-        // TODO Convert to use setFeature when it becomes available. The Xerces
-        // versions < 2.7.1 do not fully support setFeature, so we have to use
-        // setAttribute.
-        documentBuilderFactory.setAttribute("http://apache.org/xml/features/dom/defer-node-expansion", Boolean.FALSE); //$NON-NLS-1$
-      }
-      catch (IllegalArgumentException e)
-      {
-        // Ignore, as the code will have to run with parsers other than Xerces.
-      }      
-
-      DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
-
-      // TBD - Revisit
-      //EntityResolver entityResolver = createEntityResolver();
-      //documentBuilder.setEntityResolver(entityResolver);
-
-      documentBuilder.setErrorHandler(errorHandler);
-
-      Document document = documentBuilder.parse(inputStream);
-      return document;
-    }
-    catch (ParserConfigurationException exception)
-    {
-      throw new IOWrappedException(exception);
-    }
-    catch (SAXException exception)
-    {
-      throw new IOWrappedException(exception);
-    }
-    finally
-    {
-      Thread.currentThread().setContextClassLoader(previousClassLoader);
-    }
-  }
-
-  private boolean findDefinition(Element element)
-  {
-    if (WSDLConstants.nodeType(element) == WSDLConstants.DEFINITION)
-    {
-      handleDefinitionElement(element);
-      return true;
-    }
-    else
-    {
-      boolean result = false;
-      /*
-      for (Node child = element.getFirstChild(); child != null; child = child.getNextSibling())
-      {
-        if (child instanceof Element)
-        {
-          if (findDefinition((Element) child))
-          {
-            result = true;
-          }
-        }
-      }
-      */
-      return result;
-    }
-  }
-
-  private void handleDefinitionElement(Element element)
-  {
-    Definition definition = null;
-    if (element == null)
-    {
-      definition = WSDLFactory.eINSTANCE.createDefinition();
-      ((DefinitionImpl)definition).setUseExtensionFactories(useExtensionFactories);
-    }
-    else
-    {
-      definition = DefinitionImpl.createDefinition
-	    (element,getURI().toString(),useExtensionFactories);
-    }
-    getContents().add(definition);
-    // Do we need the next line?
-    ((DefinitionImpl) definition).reconcileReferences(true);
-  }
-
-  public static void serialize(OutputStream outputStream, Document document)
-  {
-    serialize(outputStream, document, null);
-  }
-
-  public static void serialize(OutputStream outputStream, Document document, String encoding)
-  {
-    doSerialize(outputStream, document, encoding);
-  }
-
-  public static void serialize(OutputStream outputStream, Element element)
-  {
-    serialize(outputStream, element, null);
-  }
-
-  public static void serialize(OutputStream outputStream, Element element, String encoding)
-  {
-    try
-    {
-      doSerialize(outputStream, element, encoding);
-    }
-    catch (Exception exception)
-    {
-      exception.printStackTrace();
-    }
-  }
-
-  private static void doSerialize(OutputStream outputStream, Element element, String encoding) throws IOException
-  {
-    try
-    {
-      TransformerFactory transformerFactory = TransformerFactory.newInstance();
-      Transformer transformer = transformerFactory.newTransformer();
-
-      transformer.setOutputProperty(OutputKeys.INDENT, "yes");
-      transformer.setOutputProperty(OutputKeys.METHOD, "xml");
-      if (encoding != null)
-      {
-        transformer.setOutputProperty(OutputKeys.ENCODING, encoding);
-      }
-
-      transformer.transform(new DOMSource(element), new StreamResult(outputStream));
-    }
-    catch (TransformerException exception)
-    {
-      WSDLPlugin.INSTANCE.log(exception);
-    }
-  }
- 
-  private class InternalErrorHandler implements ErrorHandler
-  {
-    public void error(SAXParseException e)
-    {
-      System.out.println("WSDL PARSE ERROR: " + e);
-    }
-    
-    public void fatalError(SAXParseException e)
-    {
-      System.out.println("WSDL PARSE FATAL ERROR: " + e);
-    }
-    
-    public void warning(SAXParseException e)
-    {
-      System.out.println("WSDL PARSE WARNING: " + e);
-    }
-  } 
-  
-  
-  public void attached(EObject eObject)
-  {
-    super.attached(eObject);
-     
-    // we need to attach a XSDSchemaLocator in order to resolve inline schema locations
-    // if there's not already one attached
-    XSDSchemaLocator xsdSchemaLocator = (XSDSchemaLocator)EcoreUtil.getRegisteredAdapter(this, XSDSchemaLocator.class);
-    if (xsdSchemaLocator == null)
-    {
-      getResourceSet().getAdapterFactories().add(new XSDSchemaLocatorAdapterFactory());  
-    } 
-    
-    if (eObject instanceof DefinitionImpl)
-    {
-      DefinitionImpl definition = (DefinitionImpl) eObject;
-      definition.setInlineSchemaLocations(this);    
-    }
-  }
-  /*
-  public void setInlineSchemaLocations(Definition definition)
-  {
-    // Initialize the inline schemas location 
-    Types types = definition.getETypes();
-    if (types != null)
-    {
-      for (Iterator j = types.getEExtensibilityElements().iterator(); j.hasNext();)
-      {
-        XSDSchemaExtensibilityElement el = (XSDSchemaExtensibilityElement) j.next();
-        XSDSchema schema = el.getSchema();
-        if (schema != null)
-        {  
-          schema.setSchemaLocation(getURI().toString());
-        }  
-      }        
-    }      
-  }*/
-} //WSDLResourceFactoryImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/package.html b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/package.html
deleted file mode 100644
index 344eb768a..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/package.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<html>
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="../../../../../..//apistyles.css" type="text/css">
-<title>WSDL Model API Overview</title>
-</head>
-<body>
-<p>
-        The WSDL model API allows clients to work with the WSDL 1.1 documents.
-		</p>
-<table width="500">
-<tr>
-<td>
-<p>
-		The WSDL model API allows clients to load, modify, and save WSDL 1.1 documents.
-		</p>
-</td>
-</tr>
-</table>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/package.xml b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/package.xml
deleted file mode 100644
index f25a0e983..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/package.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html>
-	<head>
-		<meta
-			name="root"
-	
-			content="../../../../../../" />
-		<title>WSDL Model API Overview</title>
-	</head>
-
-	<body>
-		<abstract>
-        The WSDL model API allows clients to work with the WSDL 1.1 documents.
-		</abstract>
-		<p>
-		The WSDL model API allows clients to load, modify, and save WSDL 1.1 documents.
-		</p> 
-	</body>
-</html>
diff --git a/bundles/org.eclipse.wst.wsi.ui/.classpath b/bundles/org.eclipse.wst.wsi.ui/.classpath
deleted file mode 100644
index cb0105380..000000000
--- a/bundles/org.eclipse.wst.wsi.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.wst.wsi.ui/.cvsignore b/bundles/org.eclipse.wst.wsi.ui/.cvsignore
deleted file mode 100644
index de85cb807..000000000
--- a/bundles/org.eclipse.wst.wsi.ui/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-temp.folder
-wsiui.jar
-build.xml
-@dot
-src.zip
diff --git a/bundles/org.eclipse.wst.wsi.ui/.project b/bundles/org.eclipse.wst.wsi.ui/.project
deleted file mode 100644
index ce1110479..000000000
--- a/bundles/org.eclipse.wst.wsi.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.wsi.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.wst.wsi.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.wsi.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 1818f01fa..000000000
--- a/bundles/org.eclipse.wst.wsi.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,38 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %_PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.wst.wsi.ui; singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.wst.wsi.ui.internal.WSIUIPlugin
-Bundle-Vendor: %_PROVIDER_NAME
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.wsi.ui.internal,
- org.eclipse.wst.wsi.ui.internal.actions,
- org.eclipse.wst.wsi.ui.internal.actions.actionDelegates,
- org.eclipse.wst.wsi.ui.internal.wizards
-Require-Bundle: org.eclipse.jface.text,
- org.eclipse.core.resources,
- org.eclipse.ui,
- org.eclipse.ui.ide;resolution:=optional,
- org.eclipse.ui.views;resolution:=optional,
- org.eclipse.ui.editors;resolution:=optional,
- org.eclipse.jface.text;resolution:=optional,
- org.eclipse.ui.workbench.texteditor;resolution:=optional,
- org.eclipse.jface,
- org.eclipse.ui.ide,
- org.eclipse.ui.views,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.ui.editors,
- org.eclipse.core.resources,
- org.eclipse.debug.core,
- org.eclipse.wst.common.ui,
- org.eclipse.wst.validation,
- org.eclipse.wst.wsdl.validation,
- org.eclipse.wst.wsi,
- org.eclipse.wst.internet.monitor.core,
- org.eclipse.wst.internet.monitor.ui,
- org.wsdl4j,
- org.eclipse.core.runtime;bundle-version="2.1.0",
- org.eclipse.wst.xml.ui,
- org.eclipse.wst.xml.core
-Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.wst.wsi.ui/about.html b/bundles/org.eclipse.wst.wsi.ui/about.html
deleted file mode 100644
index 6f6b96c4c..000000000
--- a/bundles/org.eclipse.wst.wsi.ui/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsi.ui/build.properties b/bundles/org.eclipse.wst.wsi.ui/build.properties
deleted file mode 100644
index c8570f269..000000000
--- a/bundles/org.eclipse.wst.wsi.ui/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-bin.includes = .,\
-               plugin.properties,\
-               plugin.xml,\
-               icons/,\
-               META-INF/,\
-               about.html
-source.. = src/
-jars.compile.order = .
-output.. = bin/
-src.includes = build.properties
diff --git a/bundles/org.eclipse.wst.wsi.ui/icons/full/obj16/validate.gif b/bundles/org.eclipse.wst.wsi.ui/icons/full/obj16/validate.gif
deleted file mode 100644
index 90eb11561..000000000
--- a/bundles/org.eclipse.wst.wsi.ui/icons/full/obj16/validate.gif
+++ /dev/null
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 e8b1110e3..000000000
--- a/bundles/org.eclipse.wst.wsi.ui/icons/wsi_logfile_obj.gif
+++ /dev/null
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 1b442fd2b..000000000
--- a/bundles/org.eclipse.wst.wsi.ui/plugin.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# /*******************************************************************************
-#  * Copyright (c) 2002-2005 IBM Corporation and others.
-#  * All rights reserved.   This program and the accompanying materials
-#  * are made available under the terms of the Eclipse Public License 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_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_LOG_EDITOR                = XML Editor
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 c0ea41c71..000000000
--- a/bundles/org.eclipse.wst.wsi.ui/plugin.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
---> 
-
-<plugin>
-
-    
-<!-- ======================================================= -->
-<!-- Purpose: Add validator action to TCPIP monitor.         -->
-<!-- Extension point: org.eclipse.ui.viewActions             -->
-<!-- ======================================================= -->
-   <extension
-         point="org.eclipse.ui.viewActions">
-      <viewContribution
-            targetID="org.eclipse.wst.internet.monitor.view"
-            id="org.eclipse.ui.articles.action.contribution.view">
-         <action
-               label="WS-I Profile Validator"
-               icon="icons/full/obj16/validate.gif"
-               tooltip="%_UI_WIZARD_VALIDATE_LOG_TITLE"
-               class="org.eclipse.wst.wsi.ui.internal.actions.actionDelegates.ValidateWSIProfileActionDelegate"
-               toolbarPath="group1"
-               id="org.eclipse.wst.wsi.ui.internal.actions.actionDelegates.ValidateWSIProfileActionDelegate">
-         </action>
-      </viewContribution>
-   </extension>
-
-<!-- ======================================================= -->
-<!-- Purpose: To register WS-I message validator.            -->
-<!-- Extension point: org.eclipse.ui.viewActions             -->
-<!-- ======================================================= -->
-  <extension
-         id="wsiValidator"
-         name="%_UI_WSI_VALIDATOR"
-         point="org.eclipse.wst.validation.validator">
-      <validator>
-         <filter
-               objectClass="org.eclipse.core.resources.IFile"
-               caseSensitive="false"
-               nameFilter="*.wsimsg">
-         </filter>
-         <helper      
-               class="org.eclipse.wst.xml.core.internal.validation.core.Helper">
-         </helper>
-         <run
-               class="org.eclipse.wst.wsi.ui.internal.WSIMessageValidator">
-         </run>
-      </validator>
-   </extension>
-   
-<!-- ======================================================= -->
-<!-- Extension point: org.eclipse.ui.editors                 -->
-<!-- Purpose: Specify editor for file with extension wsimsg. -->
-<!-- ======================================================= -->
-   <extension
-         point="org.eclipse.ui.editors">
-      <editor
-            default="true"
-            name="%_UI_LOG_EDITOR"
-            extensions="wsimsg"
-            icon="icons/wsi_logfile_obj.gif"
-            class="org.eclipse.wst.xml.ui.internal.tabletree.XMLMultiPageEditorPart"
-            id="org.eclipse.wst.wsi.ui.internal.WSILogEditor">
-      </editor>
-   </extension>
-   
-   <!-- ======================================================= -->
-   <!-- Extension point: org.eclipse.core.runtime.contentTypes  --> 
-   <!-- Purpose: Specify file association for wsimsg.           -->
-   <!-- ======================================================= -->
-   <extension point="org.eclipse.core.runtime.contentTypes"> 
-      <file-association 
-       content-type="org.eclipse.core.runtime.xml"
-       file-extensions="wsimsg"/>
-   </extension>
-   
-<!-- ====================================================== -->
-<!-- Add validate action  to .wsimsg file                   -->
-<!-- ====================================================== -->
-   <extension
-         point="org.eclipse.ui.popupMenus">
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="*.wsimsg"
-            id="org.eclipse.soap.validate.wsi.action">
-         <action
-               label="%_UI_ACTION_VALIDATE"
-               class="org.eclipse.wst.wsi.ui.internal.actions.actionDelegates.ValidateWSILogFileActionDelegate"
-               enablesFor="1"
-               id="org.eclipse.wst.wsi.ui.internal.actions.actionDelegates.ValidateWSILogFileActionDelegate">
-         </action>
-      </objectContribution>
-   </extension>
-   
- </plugin>
diff --git a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/Messages.java b/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/Messages.java
deleted file mode 100644
index 8b20b3e66..000000000
--- a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/Messages.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.wst.wsi.ui.internal;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Translated messages.
- */
-public class Messages extends NLS 
-{
-    //--------------- Validation Wizard ---------------
-	public static String VALIDATION_WIZARD_TITLE;
-
-	//--------------- Validation Wizard (WSDL page) ---------------
-	public static String WSDL_PAGE_FILE_SHELL_TEXT;
-	public static String WSDL_PAGE_FILE_TITLE ;
-	public static String WSDL_PAGE_FILE_DESCRIPTION;
-	public static String WSDL_PAGE_SELECT_WSDL_FILENAME_HEADING;
-	public static String WSDL_PAGE_SELECT_WSDL_FILENAME_EXPL;
-	public static String WSDL_PAGE_INCLUDE_WSDL_BUTTON;
-	public static String WSDL_PAGE_INCLUDE_WSDL_LABEL;
-	public static String WSDL_PAGE_VALID_WSDL_LABEL;
-	public static String WSDL_PAGE_WORKBENCH_BUTTON;
-	public static String WSDL_PAGE_BROWSE_BUTTON;
-	public static String WSDL_PAGE_SEARCH_UDDI_BUTTON;
-
-	//--------------- Validation Wizard (WSDL content page) ---------------
-	public static String WSDL_CONTENT_PAGE_SELECT_HEADING;
-	public static String WSDL_CONTENT_PAGE_SELECT_EXPL;
-	public static String WSDL_CONTENT_PAGE_GROUP_TEXT_ELEMENT;
-	public static String WSDL_CONTENT_PAGE_GROUP_TEXT_TYPE;
-	public static String WSDL_CONTENT_PAGE_RADIO_PORT;
-	public static String WSDL_CONTENT_PAGE_RADIO_BINDING;
-	public static String WSDL_CONTENT_PAGE_RADIO_PORT_TYPE;
-	public static String WSDL_CONTENT_PAGE_RADIO_OPERATION;
-	public static String WSDL_CONTENT_PAGE_RADIO_MESSAGE;
-	public static String WSDL_CONTENT_PAGE_LABEL_NAME;
-	public static String WSDL_CONTENT_PAGE_LABEL_NAMESPACE;
-	public static String WSDL_CONTENT_PAGE_LABEL_PARENT;
-
-	//--------------- Validation Wizard (Log page) ---------------
-	public static String LOG_PAGE_SELECT_LOG_FILENAME_HEADING;
-	public static String LOG_PAGE_SELECT_LOG_FILENAME_EXPL;
-
-	// Actions
-	public static String ACTION_WSI_VALIDATOR;
-
-	//--------------- Errors ---------------
-	public static String ERROR_UNABLE_TO_VALIDATE;
-	public static String ERROR_VALIDATION_FAILED;
-	public static String ERROR_THE_WSIMSG_FILE_IS_NOT_VALID;
-	public static String ERROR_PROBLEMS_READING_WSIMSG_FILE;
-	public static String ERROR_INVALID_LOG_FILE_EXTENSION;
-	public static String WARNING_VALIDATION_WARNINGS_DETECTED;
-	public static String WARNING_FILE_ALREADY_EXISTS;
-
-	//--------------- Informational messages ---------------
-	public static String INFO_VALIDATION_SUCEEDED;
-	public static String INFO_THE_WSIMSG_FILE_IS_VALID;
-	public static String INFO_NO_MESSAGES_TO_VALIDATE;
-
-  static 
-  {
-	NLS.initializeMessages(WSIUIPlugin.PLUGIN_ID + ".internal.Messages", Messages.class);
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/Messages.properties b/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/Messages.properties
deleted file mode 100644
index 864b370c6..000000000
--- a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/Messages.properties
+++ /dev/null
@@ -1,61 +0,0 @@
-# /*******************************************************************************
-#  * Copyright (c) 2002-2005 IBM Corporation and others.
-#  * All rights reserved.   This program and the accompanying materials
-#  * are made available under the terms of the Eclipse Public License v1.0
-#  * which accompanies this distribution, and is available at
-#  * http://www.eclipse.org/legal/epl-v10.html
-#  * 
-#  * Contributors: 
-#  *   IBM - Initial API and implementation
-#  *******************************************************************************/
-
-# --------------- Validation Wizard ---------------
-VALIDATION_WIZARD_TITLE                = Validate WS-I Message Log File
-
-# --------------- Validation Wizard (WSDL page) ---------------
-WSDL_PAGE_FILE_SHELL_TEXT              = Select File
-WSDL_PAGE_FILE_TITLE                   = Select a File
-WSDL_PAGE_FILE_DESCRIPTION             = Select a file from the workbench.
-WSDL_PAGE_SELECT_WSDL_FILENAME_HEADING = Include WSDL File
-WSDL_PAGE_SELECT_WSDL_FILENAME_EXPL    = Optionally select a WSDL file for the Web service
-WSDL_PAGE_INCLUDE_WSDL_BUTTON          = Include WSDL document for Web service
-WSDL_PAGE_INCLUDE_WSDL_LABEL           = Enter the location of the WSDL document for the Web service
-WSDL_PAGE_VALID_WSDL_LABEL             = *Note: You can only select the Next button if the WSDL document is valid.
-WSDL_PAGE_WORKBENCH_BUTTON             = Workbench...
-WSDL_PAGE_BROWSE_BUTTON                = Browse...
-WSDL_PAGE_SEARCH_UDDI_BUTTON           = Search UDDI...
-
-# --------------- Validation Wizard (WSDL content page) ---------------
-WSDL_CONTENT_PAGE_SELECT_HEADING       = Specify the WSDL element to be Analyzed
-WSDL_CONTENT_PAGE_SELECT_EXPL          = Indicate the name, type, and namespace of the WSDL element to be analyzed
-WSDL_CONTENT_PAGE_GROUP_TEXT_ELEMENT   = The WSDL element
-WSDL_CONTENT_PAGE_GROUP_TEXT_TYPE      = type
-WSDL_CONTENT_PAGE_RADIO_PORT           = port
-WSDL_CONTENT_PAGE_RADIO_BINDING        = binding
-WSDL_CONTENT_PAGE_RADIO_PORT_TYPE      = portType
-WSDL_CONTENT_PAGE_RADIO_OPERATION      = operation
-WSDL_CONTENT_PAGE_RADIO_MESSAGE        = message
-WSDL_CONTENT_PAGE_LABEL_NAME           = name:
-WSDL_CONTENT_PAGE_LABEL_NAMESPACE      = namespace:
-WSDL_CONTENT_PAGE_LABEL_PARENT         = parent:
-
-# --------------- Validation Wizard (Log page) ---------------
-LOG_PAGE_SELECT_LOG_FILENAME_HEADING   = Specify the WS-I Message Log File Name
-LOG_PAGE_SELECT_LOG_FILENAME_EXPL      = Select a folder and specify a message log file name
-
-# Actions
-ACTION_WSI_VALIDATOR                   = WS-I Message Validator
-
-# --------------- Errors ---------------
-ERROR_UNABLE_TO_VALIDATE               = Unable to Validate
-ERROR_VALIDATION_FAILED                = Validation Failed
-ERROR_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.
-ERROR_PROBLEMS_READING_WSIMSG_FILE     = Problems reading the WS-I Message Log file.  See the Problems view for a list of errors.
-ERROR_INVALID_LOG_FILE_EXTENSION       = The file name extension can only be ".wsimsg".
-WARNING_VALIDATION_WARNINGS_DETECTED   = However warnings have been issued. See the Problems view for a list of the validation warnings.
-WARNING_FILE_ALREADY_EXISTS            = Warning: The file already exists and will be overwritten. 
-
-# --------------- Informational messages ---------------
-INFO_VALIDATION_SUCEEDED               = Validation Succeeded
-INFO_THE_WSIMSG_FILE_IS_VALID          = The WS-I Message Log file is valid.
-INFO_NO_MESSAGES_TO_VALIDATE           = No Messages to Validate
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 04b20ca9a..000000000
--- 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 be02256d1..000000000
--- a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/ResourceFilter.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.ui.internal;
-
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-
-import java.util.Collection;
-
-public class ResourceFilter extends ViewerFilter 
-{
-  protected String[] fExtensions;
-  protected IFile[] fExcludedFiles;
-  protected Collection fExcludes;
-	
-  public ResourceFilter(String[] extensions, Collection exclude) 
-  {
-    fExtensions= extensions;
-    fExcludes= exclude;
-    fExcludedFiles = null;
-  }
-
-  public ResourceFilter(String[] extensions, IFile[] excludedFiles, Collection exclude) 
-  {
-    fExtensions= extensions;
-    fExcludes= exclude;
-    fExcludedFiles = excludedFiles;
-  }
-	
-  public boolean isFilterProperty(Object element, Object property) 
-  {
-    return false;
-  }
-	
-  public boolean select(Viewer viewer, Object parent, Object element) 
-  {
-    if (element instanceof IFile) 
-    {
-      if (fExcludes != null && fExcludes.contains(element)) 
-      {
-	return false;
-      }
-      String name= ((IFile)element).getName();
-      if (fExcludedFiles != null) 
-      {
-        for (int j= 0; j < fExcludedFiles.length; j++) 
-        {
-          if ( ((IFile)element).getLocation().
-               toString().compareTo(((IFile)fExcludedFiles[j]).getLocation().toString()) == 0 )
-           return false;             
-        }            
-      }
-      if (fExtensions.length == 0) 
-      {
-        // assume that we don't want to filter any files based on 
-        // extension
-        return true;
-      }
-      for (int i= 0; i < fExtensions.length; i++) 
-      {
-        if (name.endsWith(fExtensions[i]))
-        {
-          return true;
-        }
-      } 
-      return false;
-    } 
-    else if (element instanceof IContainer) 
-    { // IProject, IFolder
-      try 
-      {
-      	IResource[] resources= ((IContainer)element).members();
-	for (int i= 0; i < resources.length; i++) 
-        {
-	  // recursive!
-	  if (select(viewer, parent, resources[i])) 
-          {
-	    return true;
-	  }
-	}
-      } 
-      catch (CoreException e) 
-      {
-      }				
-    }
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/WSIMessageValidator.java b/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/WSIMessageValidator.java
deleted file mode 100644
index c5ea44c07..000000000
--- a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/WSIMessageValidator.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.ui.internal;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-import org.eclipse.wst.wsi.ui.internal.actions.WSIValidateAction;
-//import org.eclipse.wst.wsi.internal.core.report.impl.DefaultReporter;
-
-/**
- * A Validator that performs validation on a WS-I Message Log file. 
- * 
- * @author David Lauzon, IBM
- */
-public class WSIMessageValidator implements IValidator
-{
-  protected IReporter reporter;
-  public static final String WSI_MESSAGE_VALIDATOR_ID = "wsimessagevalidator".intern();
-
-  /* (non-Javadoc)
-   * @see org.eclipse.validate.IValidator#validate(org.eclipse.core.resources.IFile)
-   */
-  public void validate(IFile file)
-  {  
-    WSIValidateAction validateAction = new WSIValidateAction(file, false);
-    validateAction.setValidator(this);
-    //validateAction.setReporter(getReporter());
-    validateAction.run();
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.validate.IValidator#setReporter(org.eclipse.validate.IReporter)
-   */
-  public void setReporter(IReporter reporter)
-  {
-  	this.reporter = reporter;
-  }
-
-public void cleanup(IReporter reporter) {
-	// TODO Auto-generated method stub
-	
-}
-
-public void validate(IValidationContext helper, IReporter reporter) throws ValidationException
- {
-	// TODO Auto-generated method stub
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/WSIUIPlugin.java b/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/WSIUIPlugin.java
deleted file mode 100644
index 6bac68f69..000000000
--- a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/WSIUIPlugin.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.ui.internal;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * WSIValidatePlugin is a plugin that integrates with the Eclipse platform UI. 
- * 
- * @author David Lauzon, IBM
- * @author Lawrence Mandel, IBM
- */
-
-public class WSIUIPlugin extends AbstractUIPlugin
-{
-  /**
-   * The singleton.
-   */
-  protected static WSIUIPlugin instance;                
-  public static final String PLUGIN_ID = "org.eclipse.wst.wsi.ui";
-  /**
-   * Constructor.
-   */
-  public WSIUIPlugin()
-  {
-    super();
-    instance = this;
-  }    
-
-  /**
-   * Returns the singleton. (Based on the Singleton Pattern).
-   */
-  public static WSIUIPlugin getInstance()
-  {
-    return instance;
-  }
-
-  protected ImageRegistry createImageRegistry() 
-  {
-		ImageRegistry registry = super.createImageRegistry();
-		registerImage(registry, Resource.VALIDATE_WSI_LOGFILE_WIZ);
-		return registry;
-  }
-
-	/**
-	 * Register an image with the registry.
-	 * 
-	 * @param key the key
-	 */
-	private void registerImage(ImageRegistry registry, String key)
-	{
-  	  try 
-  	  {
-		ImageDescriptor id = ImageDescriptor.createFromFile(WSIUIPlugin.class, key);
-		registry.put(key, id);
-	  } catch (Exception e) 
-	  {
-      }
-	}
-
-  /**
-   * Convience API.  
-   * Finds the specified image stored in this plug-in's image registry.
-   * @param iconName: the name of the image.
-   * @return the image associated with the given name.
-   */
-  public static Image getResourceImage(String iconName)
-  {
-    return instance.getImageRegistry().get(iconName);
-  }
-}
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 0db64458f..000000000
--- 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 07d04bf48..000000000
--- a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/actions/WSIValidateAction.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.ui.internal.actions;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.wst.validation.internal.core.IMessageAccess;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-import org.eclipse.wst.validation.internal.provisional.core.MessageLimitException;
-import org.eclipse.wst.wsi.internal.analyzer.MessageAnalyzer;
-import org.eclipse.wst.wsi.internal.analyzer.WSIAnalyzerException;
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.ui.internal.Messages;
-import org.eclipse.wst.wsi.internal.report.AssertionError;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage;
-import org.eclipse.wst.xml.ui.internal.validation.ValidateAction;
-import org.xml.sax.SAXParseException;
-
-/**
- * Action for running the validator.
- * 
- * @author David Lauzon, IBM
- * @author Lawrence Mandel, IBM
- */
-public class WSIValidateAction extends ValidateAction
-{
-  protected IValidator validator;
-  
-  protected String wsdlfile = null;
-  protected String elementname = null;
-  protected String namespace = null;
-  protected String parentname = null;
-  protected String type = null;
-  protected boolean wsdlspecified = false;
-  protected boolean exceptionCaught = false;
-
-  /**
-   * Constructor.
-   * 
-   * @param f The file to validate
-   * @param showDialog Whether or not to show a status dialog after validation.
-   */
-  public WSIValidateAction(IFile f, boolean showDialog)
-  {
-  	super(f, showDialog);
-  }
-  
-  /**
-   * Constructor with WSDL element specified.
-   * 
-   * @param f The file to validate.
-   * @param showDialog Whether or not to show a status dialog after validation.
-   * @param file The WSDL file to use for validation.
-   * @param elementname The name of the WSDL element to validate.
-   * @param namespace The namespace of the WSDL element to validate
-   * @param parentname The parent name of the WSDL element to validate.
-   * @param type The type of element to validate.
-   */
-  public WSIValidateAction(IFile f, boolean showDialog, String file, String elementname, String namespace, String parentname, String type)
-  {
-  	this(f, showDialog);
-  	if (file != null)
-  	{
-  	  wsdlfile = file.replace('\\', '/');
-  	  if ((!wsdlfile.startsWith(WSIConstants.FILE_PREFIX)) && 
-  		  (!wsdlfile.startsWith(WSIConstants.HTTP_PREFIX)))
-      {
-  	    wsdlfile = WSIConstants.FILE_PROTOCOL + wsdlfile;  
-  	  }
-  	}
-  	this.elementname = elementname;
-  	this.namespace = namespace;
-  	this.parentname = parentname;
-  	this.type = type;
-  	this.wsdlspecified = true;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.validate.ValidateAction#validate(org.eclipse.core.resources.IFile)
-   */
-  protected void validate(final IFile file1)
-  {
-  	final MessageAnalyzer messageanalyzer;
-  	
-  	if(wsdlspecified)
-  	{
-  	  messageanalyzer = new MessageAnalyzer(WSIConstants.FILE_PROTOCOL + file1.getLocation().toString(), wsdlfile, elementname, namespace, parentname, type);	
-  	}
-  	else
-  	{	
-  	  messageanalyzer = new MessageAnalyzer(WSIConstants.FILE_PROTOCOL + file1.getLocation().toString());
-  	}
-  	
-  	IWorkspaceRunnable op = new IWorkspaceRunnable() 
-    {
-      public void run(IProgressMonitor progressMonitor) throws CoreException 
-      {        
-        clearMarkers(file1);
-        try
-        {
-          messageanalyzer.validateConformance();
-        }
-        catch (WSIAnalyzerException ae)
-        {
-        	exceptionCaught = true;
-        	if (ae.getTargetException() instanceof SAXParseException)
-        	{
-        	  createMarkers(file1, new ValidationMessage[]{createValidationMessageForException((SAXParseException)ae.getTargetException(), ValidationMessage.SEV_NORMAL)});
-        	}
-        	else
-        	{
-         	  createMarkers(file1, new ValidationMessage[]{createValidationMessageForException(ae, ValidationMessage.SEV_NORMAL)});
-        	}
-        }
-        catch (Exception e)
-        {
-        }
-
-        createMarkers(file1, convertValidationMessages(messageanalyzer.getAssertionWarnings(), ValidationMessage.SEV_LOW));
-        createMarkers(file1, convertValidationMessages(messageanalyzer.getAssertionErrors(), ValidationMessage.SEV_NORMAL));
-        file.setSessionProperty(ValidationMessage.ERROR_MESSAGE_MAP_QUALIFIED_NAME, getOrCreateReporter().getMessages());
-		}
-    };
-   
-    
-     try
-    {
-      ResourcesPlugin.getWorkspace().run(op, null);
-     if (showDialog)
-      {
-        if (exceptionCaught)
-        {
-          MessageDialog.openError(Display.getDefault().getActiveShell(), 
-          		Messages.ERROR_UNABLE_TO_VALIDATE, 
-          		Messages.ERROR_PROBLEMS_READING_WSIMSG_FILE);
-        }
-        else if (messageanalyzer.getAssertionErrors().size() != 0)
-        {
-          MessageDialog.openError(Display.getDefault().getActiveShell(), 
-          		Messages.ERROR_VALIDATION_FAILED, 
-          		Messages.ERROR_THE_WSIMSG_FILE_IS_NOT_VALID);
-        }
-        else if (messageanalyzer.getAssertionWarnings().size() != 0)
-        {                                                           
-          String title = Messages.INFO_VALIDATION_SUCEEDED;
-          String message = Messages.WARNING_VALIDATION_WARNINGS_DETECTED;
-          MessageDialog.openInformation(Display.getDefault().getActiveShell(), title, message);
-        }
-        else
-        {
-          String title = Messages.INFO_VALIDATION_SUCEEDED;
-          String message = Messages.INFO_THE_WSIMSG_FILE_IS_VALID;
-          MessageDialog.openInformation(Display.getDefault().getActiveShell(), title, message);
-        }
-      }
-    }
-    catch(Exception e){}
-  }
-  
-  /**
-   * Create a validation message from the exception and severity.
-   * 
-   * @param error The error.
-   * @param severity The severity.
-   * @return An error message.
-   */
-  protected ValidationMessage createValidationMessageForException(SAXParseException error, int severity)
-  {
-    String uri = error.getSystemId();
-    if(uri == null)
-    {
-      uri = error.getPublicId();
-    }
-    ValidationMessage validationMessage = new ValidationMessage(error.getMessage(), error.getLineNumber(), error.getColumnNumber(), uri);
-    validationMessage.setSeverity(severity);
-    return validationMessage;
-  }
-
-
-  /**
-   * Create a validation message from the exception and severity.
-   * 
-   * @param error The error.
-   * @param severity The severity.
-   * @return An error message.
-   */
-  protected ValidationMessage createValidationMessageForException(WSIAnalyzerException error, int severity)
-  {
-    ValidationMessage validationMessage = new ValidationMessage(error.getMessage(), 0, 0);
-    validationMessage.setSeverity(severity);
-    return validationMessage;
-  }
- 
-  public ValidationMessage[]  convertValidationMessages(List list, int marker)
-  {
-	if (list != null)
-	{
-	  int size = list.size();
-	  ValidationMessage[] messages = new ValidationMessage[size];
-	 
-      for (int i = 0; i < size; i++)
-      {
-        AssertionError assertionError = (AssertionError) list.get(i);
-
-        int n = assertionError.getLine();
-        int c = assertionError.getColumn();
-        String m = WSIConstants.WSI_PREFIX + "(" + assertionError.getAssertionID()+ ") " + assertionError.getErrorMessage();
-      
-        ValidationMessage message = new ValidationMessage(m,n, c);
-        message.setSeverity(marker);
-        messages[i] = message;
-      }
-      return messages;
-    }
-	return new ValidationMessage[0];
-  }
-
- /**
-  protected IReporter getOrCreateReporter()
-  {
-    if (reporter == null)
-    { 
-      reporter = new Reporter();
-    }
-    return reporter;
-  }
-  */
-  // My Implementation of IReporter
-  class Reporter implements IReporter 
-  {
-	List list = new ArrayList();
-
-	public Reporter() {
-		super();
-	}
-
-	public IMessageAccess getMessageAccess() {
-		return null; // do not need to implement
-	}
-
-	public boolean isCancelled() {
-		return false; // do not need to implement
-	}
-
-	public void removeAllMessages(IValidator origin, Object object) { // do
-																		// not
-																		// need
-																		// to
-																		// implement
-	}
-
-	public void removeAllMessages(IValidator origin) {// do not need to
-														// implement
-	}
-
-	public void removeMessageSubset(IValidator validator, Object obj, String groupName) {// do
-																							// not
-																							// need
-																							// to
-																							// implement
-	}
-
-	public List getMessages() {
-		return list;
-	}
-
-	public void addMessage(IValidator origin, IMessage message) throws MessageLimitException 
-	{
-		list.add(message);
-	}
-
-	public void displaySubtask(IValidator validator, IMessage message) 
-	{
-		// TODO Auto-generated method stub
-		
-	}
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/actions/actionDelegates/RequestHandlerImpl.java b/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/actions/actionDelegates/RequestHandlerImpl.java
deleted file mode 100644
index 425f608fd..000000000
--- a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/actions/actionDelegates/RequestHandlerImpl.java
+++ /dev/null
@@ -1,226 +0,0 @@
-package org.eclipse.wst.wsi.ui.internal.actions.actionDelegates;
-
-import java.util.Date;
-
-import org.eclipse.wst.internet.monitor.core.internal.provisional.Request;
-import org.eclipse.wst.wsi.internal.core.log.RequestHandler;
-
-/**
- * Implements the RequestHandler interface which represents a TCP/IP
- * request made between the client and the server. Each request 
- * represents a request-response pair, where the request is from 
- * client -> server, and the response is from server -> client.
- * 
- * @author lauzond
- */
-public class RequestHandlerImpl implements RequestHandler 
-{
-	/**
-	 * The HTTP header of the request portion of this request.
-	 */
-	protected byte[] requestHeader;
-	
-	/**
-	 * The HTTP header of the response portion of this request.
-	 */
-	protected byte[] responseHeader;
-
-	/**
-	 * The HTTP body of the request portion of this request.
-	 */
-	protected byte[] requestContent;
-
-	/**
-	 * The HTTP body of the response portion of this request.
-	 */
-	protected byte[] responseContent;
-
-	/**
-	 * The time this request was made.
-	 */
-	protected Date date = null;
-	
-	/**
-	 * The local (client) port.
-	 */
-	protected int localPort = 0;
-
-	/**
-	 * The remote (server) port.
-	 */
-	protected int remotePort = 0;
-	
-	/**
-	 * The remote (server) host.
-	 */
-	protected String remoteHost = null;
-
-	/**
-	 * The server's response time in milliseconds. 
-	 */
-	protected long responseTime = 0;
-	
-	/**
-	 * Constructor.
-	 * @param request a TCP/IP request
-	 */
-	RequestHandlerImpl(Request request)
-	{
-	  if (request != null)
-	  {
-		this.requestHeader = request.getRequest(Request.TRANSPORT);
-		this.requestContent = request.getRequest(Request.CONTENT);
-		this.responseHeader = request.getResponse(Request.TRANSPORT);
-		this.responseContent = request.getResponse(Request.CONTENT);
-		this.date = request.getDate();
-		this.localPort = request.getLocalPort();
-		this.remotePort = request.getRemotePort();
-		this.remoteHost = request.getRemoteHost();
-		this.responseTime = request.getResponseTime();
-	  }
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.wsi.internal.core.log.RequestHandler#getRequestHeader()
-	 */
-	public byte[] getRequestHeader() 
-	{
-		return this.requestHeader;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.wsi.internal.core.log.RequestHandler#setRequestHeader(byte[])
-	 */
-	public void setRequestHeader(byte[] requestHeader) 
-	{
-		this.requestHeader = requestHeader;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.wsi.internal.core.log.RequestHandler#getResponseHeader()
-	 */
-	public byte[] getResponseHeader() 
-	{
-		return this.responseHeader;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.wsi.internal.core.log.RequestHandler#setResponseHeader(byte[])
-	 */
-	public void setResponseHeader(byte[] responseHeader) 
-	{
-		this.responseHeader = responseHeader;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.wsi.internal.core.log.RequestHandler#getRequestContent()
-	 */
-	public byte[] getRequestContent() 
-	{
-		return this.requestContent;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.wsi.internal.core.log.RequestHandler#setResponseContent(byte[])
-	 */
-	public void setResponseContent(byte[] responseContent) 
-	{
-		this.responseContent = responseContent;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.wsi.internal.core.log.RequestHandler#getResponseContent()
-	 */
-	public byte[] getResponseContent() 
-	{
-		return this.responseContent;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.wsi.internal.core.log.RequestHandler#setRequestContent(byte[])
-	 */
-	public void setRequestContent(byte[] requestContent) 
-	{
-		this.requestContent = requestContent;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.wsi.internal.core.log.RequestHandler#getDate()
-	 */
-	public Date getDate() 
-	{
-		return this.date;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.wsi.internal.core.log.RequestHandler#setDate(java.util.Date)
-	 */
-	public void setDate(Date date) 
-	{
-		this.date = date;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.wsi.internal.core.log.RequestHandler#getLocalPort()
-	 */
-	public int getLocalPort() 
-	{
-		return this.localPort;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.wsi.internal.core.log.RequestHandler#setLocalPort(int)
-	 */
-	public void setLocalPort(int localPort) 
-	{
-		this.localPort = localPort;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.wsi.internal.core.log.RequestHandler#getRemotePort()
-	 */
-	public int getRemotePort() 
-	{
-		return this.remotePort;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.wsi.internal.core.log.RequestHandler#setRemotePort(int)
-	 */
-	public void setRemotePort(int remotePort) 
-	{
-		this.remotePort = remotePort;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.wsi.internal.core.log.RequestHandler#getRemoteHost()
-	 */
-	public String getRemoteHost() 
-	{
-		return this.remoteHost;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.wsi.internal.core.log.RequestHandler#setRemoteHost(java.lang.String)
-	 */
-	public void setRemoteHost(String remoteHost) 
-	{
-		this.remoteHost = remoteHost;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.wsi.internal.core.log.RequestHandler#getResponseTime()
-	 */
-	public long getResponseTime() 
-	{
-		return this.responseTime;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.wsi.internal.core.log.RequestHandler#setResponseTime(long)
-	 */
-	public void setResponseTime(long responseTime) 
-	{
-		this.responseTime = responseTime;
-	}
-}
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 3c410e841..000000000
--- 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 31bae5be5..000000000
--- a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/actions/actionDelegates/ValidateWSIProfileActionDelegate.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.ArrayList;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.wst.internet.monitor.core.internal.provisional.Request;
-import org.eclipse.wst.internet.monitor.ui.internal.provisional.MonitorUICore;
-import org.eclipse.wst.wsi.internal.core.log.LogBuilder;
-import org.eclipse.wst.wsi.internal.core.log.RequestHandler;
-import org.eclipse.wst.wsi.ui.internal.Messages;
-import org.eclipse.wst.wsi.ui.internal.wizards.ValidationWizard;
-import org.eclipse.wst.wsi.ui.internal.WSIValidator;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IViewActionDelegate;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.dialogs.ContainerGenerator;
-import org.eclipse.wst.wsi.internal.core.log.Log;
-
-/**
- * Action delegate for the WS-I validator.
- * 
- * @author David Lauzon, IBM
- * @author Lawrence Mandel, IBM
- */
-public class ValidateWSIProfileActionDelegate implements IViewActionDelegate
-{
-  /**
-   * The default WS-I Message Log filename.
-   */
-  public static final String DEFAULT_LOG_FILENAME = "log.wsimsg";
-
-  /**
-   * The HTTP protocol.
-   */
-  private final String HTTP = "http://";
-  
-  
-  /**
-   * The default tag for WSDL locations.
-   */
-  private final String WSDL = "?WSDL";
-  
-  /**
-   * The current selection, or null if there is no selection.
-   */
-  ISelection selection;
-
-  /**
-   * The list of messages in the form of request-response pairs.
-   */
-  Request[] requestResponses;
-
-  /**
-   * The view that provides the context for this delegate.
-   */
-  IViewPart view;
-
-  /**
-   * Constructor.
-   */
-  public ValidateWSIProfileActionDelegate()
-  {
-  }
-
-  /**
-   * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart)
-   */
-  public void init(IViewPart view)
-  {
-    this.view = view;
-  }
-
-  /** 
-   * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-   */
-  public void run(IAction action)
-  {
-    WorkspaceModifyOperation operation = new WorkspaceModifyOperation()
-    {
-      protected void execute(IProgressMonitor progressMonitor)
-      throws CoreException
-      {
-        validate(progressMonitor);
-      }
-    };
-    
-    try
-    {
-      operation.run(null);
-    }
-    catch (Exception ex)
-    {
-      ex.printStackTrace();
-    }
-  }
-
-  /**
-   * The validate action.
-   * 
-   * @param progressMonitor
-   */
-  public void validate(IProgressMonitor progressMonitor)
-  {
-    try
-    {
-      requestResponses = MonitorUICore.getRequests();
-      Shell shell = Display.getCurrent().getActiveShell();
-      if ((requestResponses != null) && (requestResponses.length > 0))
-      {
-        ValidationWizard validateWizard = new ValidationWizard(DEFAULT_LOG_FILENAME);
-        List wsdllocs = new Vector();
-
-       	for (int i=0; i<requestResponses.length; i++)
-      	{
-      	  Request reqresp = requestResponses[i];
-      	  String remotehost = reqresp.getRemoteHost();
-      	  int remoteport = reqresp.getRemotePort();
-      	  String remotelabel = reqresp.getName();
-      	  String location = HTTP + remotehost + ":" + remoteport + remotelabel + WSDL;
-      	  if(!wsdllocs.contains(location))
-      	  {
-      	    wsdllocs.add(location);
-      	  }
-      	}
-      
-        validateWizard.setWSDLLocations((String[])wsdllocs.toArray(new String[wsdllocs.size()]));
-        WizardDialog wizardDialog = new WizardDialog(shell, validateWizard);
-        wizardDialog.create();
-
-        int result = wizardDialog.open();
-
-        if (validateWizard.isValid() && (result != org.eclipse.jface.window.Window.CANCEL))
-        {
-          // If the container doesn't exist, create it now
-          checkAndCreateContainer(validateWizard.getContainerFullPath());
-
-          IFile file = validateWizard.getFile();
-          LogBuilder builder = new LogBuilder(file);
-          Log log = builder.buildLog(getRequestHandlers(requestResponses));
-
-          builder.writeLog(log);
-          file.refreshLocal(1, progressMonitor);
-        
-          WSIValidator messageValidator = new WSIValidator();
-          if(validateWizard.includeWSDLFile())
-          {	
-        	String wsdlfile = validateWizard.getWSDLFile();
-        	String name = validateWizard.getElementName();
-        	String namespace = validateWizard.getNamespace();
-        	String parentname = validateWizard.getParentName();
-        	String type = validateWizard.getType();
-        	messageValidator.validate(file, wsdlfile, name, namespace, parentname, type);
-          }
-          else
-          {	
-        	messageValidator.validate(file);
-          }
-        }
-      }
-      else
-      {
-        // no available messages to validate
-    	  String title = Messages.ACTION_WSI_VALIDATOR;
-          String message = Messages.INFO_NO_MESSAGES_TO_VALIDATE;
-    	MessageDialog.openInformation(shell, title, message);
-      }
-    }
-    catch (Exception e)
-    {
-      e.printStackTrace();
-    }
-  }
-
-  private List getRequestHandlers(Request[] requestResponses) 
-  {
-	List requestHandlers = new ArrayList();
-	int size = requestResponses.length;
-	for (int i = 0; i<size; i++)
-	{
-	  Request request = requestResponses[i];
-	  RequestHandler handler = new RequestHandlerImpl(request);
-	  requestHandlers.add(handler);
-	}
-	return requestHandlers;
-  }
-
-  /**
-   * @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 0cc8d3f6e..000000000
--- a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/actions/icons/wsi_logfile_wiz.gif
+++ /dev/null
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 0b38b9ade..000000000
--- 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.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.Messages;
-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(Messages.VALIDATION_WIZARD_TITLE);
-    setDefaultPageImageDescriptor(
-      ImageDescriptor.createFromFile(WSIUIPlugin.class, Resource.VALIDATE_WSI_LOGFILE_WIZ));
-    setNeedsProgressMonitor(true);
-  }
-
-  /**
-   * @see org.eclipse.jface.wizard.IWizard#addPages()
-   */
-  public void addPages()
-  {
-    logPage = new ValidationWizardLogPage((IStructuredSelection) getResourceNavigatorSelection(), filename);
-    wsdlPage = new ValidationWizardWSDLPage((IStructuredSelection) getResourceNavigatorSelection());
-    wsdlContentPage = new ValidationWizardWSDLContentPage((IStructuredSelection) getResourceNavigatorSelection());
-    addPage(logPage);
-    addPage(wsdlPage);
-    addPage(wsdlContentPage);
-
-  }
-
-  /**
-   * @return True if a WSDL file is included, false otherwise.
-   */
-  public boolean includeWSDLFile()
-  {
-    if (!isValid)
-    {
-      return wsdlPage.includeWSDLFile();
-    }
-    return includewsdlfile;
-  }
-
-  /**
-   * Get the element name to validate.
-   * 
-   * @return The element name to validate.
-   */
-  public String getElementName()
-  {
-    return elementname;
-  }
-
-  /**
-   * Get the namespace for the element.
-   * 
-   * @return The namespace for the element.
-   */
-  public String getNamespace()
-  {
-    return namespace;
-  }
-
-  /**
-   * Get the name of the parent of the element.
-   * 
-   * @return The name of the parent of the element.
-   */
-  public String getParentName()
-  {
-    return parentname;
-  }
-
-  /**
-   * Get the type of the element.
-   * 
-   * @return The type of the element.
-   */
-  public String getType()
-  {
-    return type;
-  }
-
-  public String getWSDLFile()
-  {
-    if (!isValid)
-    {
-      return wsdlPage.getWSDLFile();
-    }
-    return wsdlfile;
-  }
-
-  /**
-   * @see org.eclipse.jface.wizard.IWizard#getNextPage(org.eclipse.jface.wizard.IWizardPage)
-   */
-  public IWizardPage getNextPage(IWizardPage currentPage)
-  {
-    if (currentPage == wsdlPage)
-    {
-      if (!wsdlPage.includeWSDLFile())
-      {
-        return null;
-      }
-      else
-      {
-        try
-        {
-          WSDLFactory factory = WSDLFactory.newInstance();
-          WSDLReader reader = factory.newWSDLReader();
-          reader.readWSDL(getWSDLFile());
-        }
-        catch (Exception e)
-        {
-          // If there is a problem with the WSDL file there is no next page.
-          return null;
-        }
-      }
-    }
-    return super.getNextPage(currentPage);
-  }
-
-  /**
-   * Returns true if the selected file is a valid WS-I Message Log filename.
-   * 
-   * @return True if the selected file is a valid WS-I Message Log filename.
-   */
-  public boolean isValid()
-  {
-    return isValid;
-  }
-
-  /**
-   * @see org.eclipse.jface.wizard.IWizard#performFinish()
-   */
-  public boolean performFinish()
-  {
-    file = logPage.getFile();
-    containerFullPath = logPage.getContainerFullPath();
-    includewsdlfile = wsdlPage.includeWSDLFile();
-    wsdlfile = wsdlPage.getWSDLFile();
-    elementname = wsdlContentPage.getElementName();
-    namespace = wsdlContentPage.getNamespace();
-    parentname = wsdlContentPage.getParentName();
-    type = wsdlContentPage.getType();
-    isValid = true;
-    return true;
-  }
-
-  /**
-   * Returns the file selected by the user in the choose page.
-   * 
-   * @return the file selectedby the user in the choose page.
-   */
-  public IFile getFile()
-  {
-    return file;
-  }
-
-  /**
-   * Returns the IPath containing the selected IFile.
-   * 
-   * @return the IPath containing the selected IFile.
-   */
-  public IPath getContainerFullPath()
-  {
-    return containerFullPath;
-  }
-
-  /**
-   * Returns the selection in the Resource Navigator view.
-   * 
-   * @return the selection in the Resource Navigator view.
-   */
-  public ISelection getResourceNavigatorSelection()
-  {
-    IViewReference viewParts[] =
-      PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getViewReferences();
-
-    for (int i = 0; i < viewParts.length; i++)
-    {
-      if (viewParts[i] instanceof ResourceNavigator)
-      {
-        return ((ResourceNavigator) viewParts[i]).getViewSite().getSelectionProvider().getSelection();
-      }
-    }
-    return StructuredSelection.EMPTY;
-  }
-
-  /**
-   * Set the list of WSDL locations to let the user choose from.
-   * 
-   * @param wsdllocations A list of WSDL document locations.
-   */
-  public void setWSDLLocations(String[] wsdllocations) 
-  {
-	this.wsdllocations = wsdllocations;
-	
-  }
-  
-  /**
-   * Get the list of WSDL locations the user can choose from.
-   * 
-   * @return The list of WSDL locations.
-   */
-  public String[] getWSDLLocations()
-  {
-  	return wsdllocations;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/wizards/ValidationWizardLogPage.java b/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/wizards/ValidationWizardLogPage.java
deleted file mode 100644
index 8f88caa2f..000000000
--- 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.Messages;
-
-/**
- * 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(Messages.LOG_PAGE_SELECT_LOG_FILENAME_HEADING);
-    this.setDescription(Messages.LOG_PAGE_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(Messages.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(Messages.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 6ca057107..000000000
--- 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.Messages;
-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(Messages.WSDL_CONTENT_PAGE_SELECT_HEADING);
-    this.setDescription(Messages.WSDL_CONTENT_PAGE_SELECT_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(Messages.WSDL_CONTENT_PAGE_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(Messages.WSDL_CONTENT_PAGE_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(Messages.WSDL_CONTENT_PAGE_RADIO_PORT);
-    wsdlPortButton.setData("wsdlPortButton");
-    wsdlPortButton.setSelection(true);
-    wsdlPortButton.addSelectionListener(new PortButtonSelectionListener());
-
-    wsdlBindingButton = new Button(wsdlTypeGroup, SWT.RADIO);
-    wsdlBindingButton.setData("wsdlBindingButton");
-    wsdlBindingButton.setText(Messages.WSDL_CONTENT_PAGE_RADIO_BINDING);
-    wsdlBindingButton.setSelection(false);
-    wsdlBindingButton.addSelectionListener(new BindingButtonSelectionListener());
-
-    wsdlPortTypeButton = new Button(wsdlTypeGroup, SWT.RADIO);
-    wsdlPortTypeButton.setData("wsdlPortTypeButton");
-    wsdlPortTypeButton.setText(Messages.WSDL_CONTENT_PAGE_RADIO_PORT_TYPE);
-    wsdlPortTypeButton.setSelection(false);
-    wsdlPortTypeButton.addSelectionListener(new PortTypeButtonSelectionListener());
-
-    wsdlOperationButton = new Button(wsdlTypeGroup, SWT.RADIO);
-    wsdlOperationButton.setData("wsdlOperationButton");
-    wsdlOperationButton.setText(Messages.WSDL_CONTENT_PAGE_RADIO_OPERATION);
-    wsdlOperationButton.setSelection(false);
-    wsdlOperationButton.addSelectionListener(new OperationButtonSelectionListener());
-
-    wsdlMessageButton = new Button(wsdlTypeGroup, SWT.RADIO);
-    wsdlMessageButton.setData("wsdlMessageButton");
-    wsdlMessageButton.setText(Messages.WSDL_CONTENT_PAGE_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(Messages.WSDL_CONTENT_PAGE_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(Messages.WSDL_CONTENT_PAGE_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(Messages.WSDL_CONTENT_PAGE_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 205931845..000000000
--- a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/wizards/ValidationWizardWSDLPage.java
+++ /dev/null
@@ -1,373 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.ui.internal.wizards;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.wst.common.ui.internal.dialogs.SelectSingleFileDialog;
-import org.eclipse.wst.wsi.ui.internal.Messages;
-import org.eclipse.wst.wsi.ui.internal.Resource;
-import org.eclipse.wst.wsi.ui.internal.WSIUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * Wizard page that allows the user to specify the location of the 
- * WSDL document for the Web service.
- * 
- * @author David Lauzon, IBM
- * @author Lawrence Mandel, IBM
- */
-
-public class ValidationWizardWSDLPage extends WizardPage implements SelectionListener
-{
-
-  IStructuredSelection selection;
-
-  protected boolean wsdlinvalid = false;
-  /**
-   * Access to the includeWSDL flag.  
-   */
-  protected Button includeWSDLButton;
-
-  /**
-   * Access to the wsdl document group.
-   */
-  protected Group documentGroup;
-  protected Text documentLocationText;
-  protected Combo fileField;
-  /**
-   * Constructor.
-   * 
-   * @param selection: selection in the Resource Navigator view.
-   */
-  public ValidationWizardWSDLPage(IStructuredSelection selection)
-  {
-    super("ValidationWizardWSDLPage");
-    this.selection = selection;
-    this.setTitle(Messages.WSDL_PAGE_SELECT_WSDL_FILENAME_HEADING);
-    this.setDescription(Messages.WSDL_PAGE_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(Messages.WSDL_PAGE_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(Messages.WSDL_PAGE_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(Messages.WSDL_PAGE_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(Messages.WSDL_PAGE_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(Messages.WSDL_PAGE_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(Messages.("_UI_WIZARD_V_SEARCH_UDDI_BUTTON"));
-    // data = new GridData();
-    // data.horizontalAlignment = GridData.FILL;
-    // searchUDDIButton.setLayoutData(data);
-    // searchUDDIButton.addSelectionListener(new SearchUDDIButtonListener());
-
-    return documentGroup;
-  }
-
-  public boolean includeWSDLFile()
-  {
-    return includeWSDLButton.getSelection();
-  }
-
-  public String getWSDLFile()
-  {
-    return fileField.getText();
-  }
-
-  /**
-   * Always return true.
-   */
-  public boolean performFinish()
-  {
-    return true;
-  }
-
-  /**
-   * Sent when default selection occurs in the control.
-   * 
-   * @param e -
-   *            an event containing information about the selection
-   */
-  public void widgetDefaultSelected(SelectionEvent e)
-  {}
-
-  /**
-   * Handles the includeWSDL checkbox. Sent when selection occurs in the
-   * control.
-   * 
-   * @param e -
-   *            an event containing information about the selection
-   */
-  public void widgetSelected(SelectionEvent e)
-  {
-    if (e.widget == includeWSDLButton)
-    {
-      if (includeWSDLButton.getSelection())
-      {
-        documentGroup.setVisible(true);
-      }
-      else
-      {
-        documentGroup.setVisible(false);
-      }
-      getContainer().updateButtons();
-    }
-  }
-
-  public void setWSDLInvalid()
-  {
-    wsdlinvalid = true;
-  }
-
-  /**
-   * Add value to the list box
-   */
-  class WorkspaceButtonListener implements SelectionListener
-  {
-    public void widgetDefaultSelected(SelectionEvent e)
-    {}
-
-    public void widgetSelected(SelectionEvent e)
-    {
-      SelectSingleFileDialog dialog = new SelectSingleFileDialog(getShell(), selection, false);
-      dialog.addFilterExtensions(new String[] { ".wsdl" });
-      dialog.create();
-      dialog.getShell().setText(Messages.WSDL_PAGE_FILE_SHELL_TEXT);
-      dialog.setTitle(Messages.WSDL_PAGE_FILE_TITLE);
-      dialog.setMessage(Messages.WSDL_PAGE_FILE_DESCRIPTION);
-      dialog.setTitleImage(WSIUIPlugin.getResourceImage(Resource.VALIDATE_WSI_LOGFILE_WIZ));
-      
-      int result = dialog.open();
-
-      if (result == Window.OK)
-      {
-        IFile currentIFile = dialog.getFile();
-        if (currentIFile != null)
-        {
-          fileField.add(currentIFile.getLocation().toString(), 0);
-          fileField.select(0);
-        }
-      }
-    }
-  }
-
-  /**
-   * Add value to the list box
-   */
-  class BrowseButtonListener implements SelectionListener
-  {
-    public void widgetDefaultSelected(SelectionEvent e)
-    {}
-
-    public void widgetSelected(SelectionEvent e)
-    {
-      FileDialog dialog = new FileDialog(getShell());
-      dialog.setFilterExtensions(new String[] { "*.wsdl" });
-      String selection = dialog.open();
-      if (selection != null)
-      {
-        fileField.add(selection, 0);
-        fileField.select(0);
-      }
-    }
-  }
-
-  /**
-   * Add value to the list box
-   */
-  // class SearchUDDIButtonListener implements SelectionListener
-  // {
-  //  public void widgetDefaultSelected(SelectionEvent e)
-  //  {}
-  //
-  //  public void widgetSelected(SelectionEvent e)
-  //  {
-  //    String title = "Information";
-  //    String message = "The chosen operation is not currently available.";
-  //    MessageDialog.openInformation(Display.getDefault().getActiveShell(), title, message);
-  //  }
-  //}
-
-  /**
-   * Add value to the file field.
-   */
-  class FileFieldListener implements ModifyListener
-  {
-
-    /*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent)
-	 */
-    public void modifyText(ModifyEvent e)
-    {
-      wsdlinvalid = false;
-      getContainer().updateButtons();
-
-    }
-
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.wsi/.classpath b/bundles/org.eclipse.wst.wsi/.classpath
deleted file mode 100644
index cb0105380..000000000
--- a/bundles/org.eclipse.wst.wsi/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.wst.wsi/.cvsignore b/bundles/org.eclipse.wst.wsi/.cvsignore
deleted file mode 100644
index ab6b2343a..000000000
--- a/bundles/org.eclipse.wst.wsi/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-temp.folder
-build.xml
-wsi.jar
-@dot
-src.zip
diff --git a/bundles/org.eclipse.wst.wsi/.project b/bundles/org.eclipse.wst.wsi/.project
deleted file mode 100644
index cc60c1f73..000000000
--- a/bundles/org.eclipse.wst.wsi/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.wsi</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.wst.wsi/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.wsi/META-INF/MANIFEST.MF
deleted file mode 100644
index 402a2ad71..000000000
--- a/bundles/org.eclipse.wst.wsi/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,27 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %_PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.wst.wsi; singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.wst.wsi.internal.WSITestToolsPlugin
-Bundle-Vendor: %_PROVIDER_NAME
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.wsi.internal,
- org.eclipse.wst.wsi.internal.analyzer,
- org.eclipse.wst.wsi.internal.core,
- org.eclipse.wst.wsi.internal.core.log,
- org.eclipse.wst.wsi.internal.core.wsdl,
- org.eclipse.wst.wsi.internal.core.xml,
- org.eclipse.wst.wsi.internal.report
-Require-Bundle: org.eclipse.wst.command.env,
- org.eclipse.wst.command.env.core,
- org.eclipse.wst.common.uriresolver,
- org.eclipse.core.resources,
- org.eclipse.wst.wsdl.validation,
- org.eclipse.wst.ws,
- org.wsdl4j,
- org.uddi4j,
- org.eclipse.core.runtime;bundle-version="2.1.0",
- org.apache.axis,
- com.ibm.icu
-Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.wst.wsi/about.html b/bundles/org.eclipse.wst.wsi/about.html
deleted file mode 100644
index 6f6b96c4c..000000000
--- a/bundles/org.eclipse.wst.wsi/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsi/build.properties b/bundles/org.eclipse.wst.wsi/build.properties
deleted file mode 100644
index 87f191fa0..000000000
--- a/bundles/org.eclipse.wst.wsi/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-bin.includes = .,\
-               plugin.properties,\
-               plugin.xml,\
-               META-INF/,\
-               about.html
-source.. = src/
-jars.compile.order = .
-output.. = bin/
-src.includes = component.xml,\
-               build.properties
diff --git a/bundles/org.eclipse.wst.wsi/component.xml b/bundles/org.eclipse.wst.wsi/component.xml
deleted file mode 100644
index 48a2cafe3..000000000
--- a/bundles/org.eclipse.wst.wsi/component.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><component  xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="org.eclipse.wst.wsi"><description url=""></description><component-depends unrestricted="true"></component-depends><plugin id="org.eclipse.wst.wsi" fragment="false"/><plugin id="org.eclipse.wst.wsi.ui" fragment="false"/></component>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsi/plugin.properties b/bundles/org.eclipse.wst.wsi/plugin.properties
deleted file mode 100644
index 2c65e29c7..000000000
--- 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 84a392841..000000000
--- a/bundles/org.eclipse.wst.wsi/plugin.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
---> 
-
-<plugin>
-
-     <extension
-         id="wsdlWSIValidator"
-         name="%_UI_WSDL_WSI_VALIDATOR"
-         point="org.eclipse.wst.wsdl.validation.extvalidator">
-      <extvalidator
-            namespace="http://schemas.xmlsoap.org/wsdl/"
-            class="org.eclipse.wst.wsi.internal.validate.wsdl.WSDLValidator"
-            resourcebundle="wsivalidate">
-      </extvalidator>
-   </extension>
-  
-</plugin>
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/WSIPreferences.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/WSIPreferences.java
deleted file mode 100644
index 84b8d2165..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/WSITestToolsEclipseProperties.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/WSITestToolsEclipseProperties.java
deleted file mode 100644
index b5e509c25..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/WSITestToolsEclipseProperties.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;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.ws.internal.plugin.WSPlugin;
-import org.eclipse.wst.ws.internal.preferences.PersistentWSIContext;
-
-/**
- * WS-I test tool properties specific for Eclipse.
- */
-public class WSITestToolsEclipseProperties extends WSITestToolsProperties
-{
- /**
-  * @see org.eclipse.wst.wsi.internal.WSITestToolsProperties#checkWSIPreferences(java.lang.String)
-  */
-  public static WSIPreferences checkWSIPreferences(String fileuri)
-  {
-    WSIPreferences preferences = new WSIPreferences();
-    
-    // Remove file: and any slashes from the fileuri. 
-    // Eclipse's resolution mechanism needs to start with the drive.
-    String uriStr = trimURI(fileuri);
-
-    PersistentWSIContext APcontext = WSPlugin.getInstance().getWSIAPContext();
-    PersistentWSIContext SSBPcontext = WSPlugin.getInstance().getWSISSBPContext();
-    
-    IFile[] files = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocation(new Path(uriStr));
-    if (files != null && files.length == 1)
-    {
-      //check project level conpliance
-      IProject project = files[0].getProject();
-      
-      if (APcontext.projectStopNonWSICompliances(project))
-      {
-        preferences.setTADFile(AP_ASSERTION_FILE);
-        preferences.setComplianceLevel(PersistentWSIContext.STOP_NON_WSI);
-      } 
-      else if (APcontext.projectWarnNonWSICompliances(project))
-      {
-        preferences.setTADFile(AP_ASSERTION_FILE);
-        preferences.setComplianceLevel(PersistentWSIContext.WARN_NON_WSI);
-      }
-      else if (SSBPcontext.projectStopNonWSICompliances(project))
-      {
-        preferences.setTADFile(SSBP_ASSERTION_FILE);
-        preferences.setComplianceLevel(PersistentWSIContext.STOP_NON_WSI);
-      }
-      else if (SSBPcontext.projectWarnNonWSICompliances(project))
-      {
-        preferences.setTADFile(SSBP_ASSERTION_FILE);
-        preferences.setComplianceLevel(PersistentWSIContext.WARN_NON_WSI);
-      }
-      else
-      {
-        preferences.setTADFile(DEFAULT_ASSERTION_FILE);
-        preferences.setComplianceLevel(PersistentWSIContext.IGNORE_NON_WSI);
-      }
-    }
-    else
-    {
-      // If we can't obtain the project preference use the global preference.
-      String APlevel = APcontext.getPersistentWSICompliance();
-      String SSBPlevel = SSBPcontext.getPersistentWSICompliance();
-      if(APlevel.equals(PersistentWSIContext.STOP_NON_WSI))
-      {
-        preferences.setTADFile(AP_ASSERTION_FILE);
-        preferences.setComplianceLevel(PersistentWSIContext.STOP_NON_WSI);
-      }
-      else if(APlevel.equals(PersistentWSIContext.WARN_NON_WSI))
-      {
-        preferences.setTADFile(AP_ASSERTION_FILE);
-        preferences.setComplianceLevel(PersistentWSIContext.WARN_NON_WSI);
-     }
-     if(SSBPlevel.equals(PersistentWSIContext.STOP_NON_WSI))
-     {
-       preferences.setTADFile(SSBP_ASSERTION_FILE);
-       preferences.setComplianceLevel(PersistentWSIContext.STOP_NON_WSI);
-     }
-     else if(SSBPlevel.equals(PersistentWSIContext.WARN_NON_WSI))
-     {
-      preferences.setTADFile(SSBP_ASSERTION_FILE);
-        preferences.setComplianceLevel(PersistentWSIContext.WARN_NON_WSI);
-     }
-     else
-     {
-        preferences.setTADFile(DEFAULT_ASSERTION_FILE);
-        preferences.setComplianceLevel(PersistentWSIContext.IGNORE_NON_WSI);
-      }
-    }
-    return preferences;
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/WSITestToolsPlugin.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/WSITestToolsPlugin.java
deleted file mode 100644
index 205df1748..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/WSITestToolsPlugin.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal;
-
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * The WS-I test tools plugin.
- * 
- * @author lauzond
- */
-
-public class WSITestToolsPlugin extends Plugin
-{
-  private static Plugin instance;
-  protected final String PLUGIN_PROPERTIES = "wsivalidate";
-  //protected ResourceBundle resourcebundle = null;
-  
-  /**
-   * Constructor for wsiTestToolsPlugin.
-   * @param descriptor an IPluginDescriptor object.
-   */
-  public WSITestToolsPlugin()
-  {
-    super();
-    instance = this;
-
-    // set the current directory
-   WSITestToolsProperties.setEclipseContext(true);
-   //resourcebundle = ResourceBundle.getBundle(PLUGIN_PROPERTIES);
-  }
-
-  /**
-   * Method getInstance.
-   * @return AbstractUIPlugin
-   */
-  public static Plugin getInstance()
-  {
-    return instance;
-  }
-
-   /**
-   * Method getPlugin.
-   * @return WSIToolsUtilPlugin
-   */
-  public static WSITestToolsPlugin getPlugin()
-  {
-    return (WSITestToolsPlugin) instance;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/WSITestToolsProperties.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/WSITestToolsProperties.java
deleted file mode 100644
index f18cf0427..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/WSITestToolsProperties.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;
-
-/**
- * WS-I test tools property.
- */
-public class WSITestToolsProperties
-{
-  protected static String installURL = "";
-  protected static String tadfile = "";
-
-  public final static String schemaDir = "common/schemas/";
-  public final static String SSBP_ASSERTION_FILE = "http://www.ws-i.org/Testing/Tools/2005/01/SSBP10_BP11_TAD_1-0.xml";
-  public final static String AP_ASSERTION_FILE = "http://www.ws-i.org/Testing/Tools/2004/12/AP10_BP11_SSBP10_TAD.xml";
-  public final static String DEFAULT_ASSERTION_FILE = AP_ASSERTION_FILE;
-  
-  public static final String STOP_NON_WSI = "0";
-  public static final String WARN_NON_WSI = "1";
-  public static final String IGNORE_NON_WSI = "2";
-  
-  protected static boolean eclipseContext = false;
-
-  /**
-   *  Constructor.
-   */
-  protected WSITestToolsProperties()
-  {
-    super();
-  }
-  
-  public static void setEclipseContext(boolean eclipseActive)
-  {
-    eclipseContext = eclipseActive;
-  }
-  
-  public static boolean getEclipseContext()
-  {
-    return eclipseContext;
-  }
-  
-  /**
-   * Checks the WS-I preferences for the given file and return them in a
-   * WSIPreferences object.
-   * 
-   * @param fileuri The file URI to check the WS-I preferences for.
-   * @return A WSIPreferences object containing the preference for this file URI.
-   */
-  public static WSIPreferences checkWSIPreferences(String fileuri)
-  {
-  	return new WSIPreferences();
-  }
-  
-  /**
-   * Remove file: and any slashes from the fileuri. 
-   * Eclipse's resolution mechanism needs to start with the drive.
-   */
-  protected static String trimURI(String fileuri)
-  {
-  	String uriStr = fileuri;
-  	
-    if(fileuri.startsWith("file:"))
-    {
-      uriStr = fileuri.substring(5);
-    }
-    while(uriStr.startsWith("/") || uriStr.startsWith("\\"))
-    {
-      uriStr = uriStr.substring(1);
-    }
-    return uriStr;
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/analyzer/MessageAnalyzer.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/analyzer/MessageAnalyzer.java
deleted file mode 100644
index 4c15681fa..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/analyzer/MessageAnalyzer.java
+++ /dev/null
@@ -1,314 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.analyzer;
-
-import java.io.UnsupportedEncodingException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import org.eclipse.wst.common.uriresolver.internal.util.URIEncoder;
-import org.eclipse.wst.wsi.internal.WSIPreferences;
-import org.eclipse.wst.wsi.internal.WSITestToolsEclipseProperties;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.AnalyzerConfig;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.AssertionResultType;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.AssertionResultsOption;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLElement;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLReference;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.impl.AssertionResultsOptionImpl;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.impl.WSDLElementImpl;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.impl.WSDLReferenceImpl;
-import org.eclipse.wst.wsi.internal.core.common.AddStyleSheet;
-import org.eclipse.wst.wsi.internal.core.common.impl.AddStyleSheetImpl;
-import org.eclipse.wst.wsi.internal.core.document.DocumentFactory;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.report.Entry;
-import org.eclipse.wst.wsi.internal.core.report.impl.FailureDetailImpl;
-import org.eclipse.wst.wsi.internal.core.report.impl.ReportImpl;
-import org.eclipse.wst.wsi.internal.core.xml.dom.ElementLocation;
-import org.eclipse.wst.wsi.internal.report.AssertionError;
-
-/**
- * MessageAnalyzer
- * 
- * A class that allows simple access to the WS-I Test Tools in order to analyze
- * messages in a log file.
- */
-
-public class MessageAnalyzer
-{
-  public final static String PLUGIN_ID = "org.wsi.test.tools";
-  
-  public final static String TYPE_PORT = "port";
-  public final static String TYPE_BINDING = "binding";
-  public final static String TYPE_PORTTYPE = "porttype";
-  public final static String TYPE_OPERATION = "operation";
-  public final static String TYPE_MESSAGE = "message";
-
-  // Test result Strings
-  protected final String NOTPASSED = "notPassed";
-  protected final String WARNING = "warning";
-  protected final String FAILED = "failed";
-  
-  protected String filename;
-  protected String wsdlfile = null;
-  protected String elementname = null;
-  protected String namespace = null;
-  protected String parentname = null;
-  protected boolean wsdlspecified = false;
-  protected String type  = null;
-  protected List assertionwarnings;
-  protected List assertionerrors;
-  protected WSIPreferences wsiPreferences = null;
-  
-  /**
-   * Constructor for MessageAnalyzer.
-   * @param filename log file name.
-   */
-  public MessageAnalyzer(String filename)
-  {
-    this.filename = filename.replace('\\', '/');
-
-    assertionwarnings = new Vector();
-    assertionerrors = new Vector();
-  	this.wsiPreferences = WSITestToolsEclipseProperties.checkWSIPreferences(filename);
-  }
-  
-  /**
-   * Constructor for MessageAnalyzer.
-   * @param filename log file name.
-   */
-  public MessageAnalyzer(String filename, WSIPreferences wsiPreferences)
-  {
-    this.filename = filename.replace('\\', '/');
-
-    assertionwarnings = new Vector();
-    assertionerrors = new Vector();
-  	this.wsiPreferences = wsiPreferences;
-  }
-
-  public MessageAnalyzer(String filename, String wsdlfile, String elementname, String namespace, String parentname, String type)
-  {
-  	this(filename.replace('\\', '/'));
-  	wsdlspecified = true;
-  	
-  	this.wsdlfile = wsdlfile.replace('\\', '/');
-  	this.elementname = elementname;
-  	this.namespace = namespace;
-  	this.parentname = parentname;
-  	this.type = type;
-  }
-
-  public MessageAnalyzer(String filename, String wsdlfile, String elementname, String namespace, String parentname, String type, WSIPreferences wsiPreferences)
-  {
-  	this(filename, wsiPreferences);
-  	wsdlspecified = true;
-  	
-  	this.wsdlfile = wsdlfile.replace('\\', '/');
-  	this.elementname = elementname;
-  	this.namespace = namespace;
-  	this.parentname = parentname;
-  	this.type = type;
-  }
-
-  /**
-   * Method validateConformance.
-   * 
-   * Checks the conformance of the given logfile against the WS-I Basic Profile.
-   * If there are conformance problems they can be obtained from getAssertionErrors.
-   * 
-   * @throws WSIAnalyzerException
-   */
-  public void validateConformance() throws WSIAnalyzerException
-  {
-    try
-    {
-	  if (wsiPreferences.getComplianceLevel() != WSITestToolsEclipseProperties.IGNORE_NON_WSI)
-	  {
-        DocumentFactory documentFactory = DocumentFactory.newInstance();
-        // Initialize the BasicProfileAnalyzer using an analyzerconfig object
-        AnalyzerConfig analyzerconfig = documentFactory.newAnalyzerConfig();
-        if(wsdlspecified)
-        {
-      	  WSDLReference wsdlref = new WSDLReferenceImpl();
-      	  wsdlref.setWSDLLocation(wsdlfile);
-      	
-      	  WSDLElement wsdlelem = new WSDLElementImpl();
-      	  wsdlelem.setName(elementname);
-      	  wsdlelem.setNamespace(namespace);
-      	  wsdlelem.setParentElementName(parentname);
-      	  wsdlelem.setType(type);
-      	
-      	  wsdlref.setWSDLElement(wsdlelem);
-      	
-      	  analyzerconfig.setWSDLReference(wsdlref);
-        }
-
-        AssertionResultsOption aro = new AssertionResultsOptionImpl();
-        aro.setAssertionResultType(AssertionResultType.newInstance(NOTPASSED));
-        aro.setShowAssertionDescription(false);
-        aro.setShowFailureDetail(false);
-        aro.setShowFailureMessage(false);
-        aro.setShowMessageEntry(false);
-
-        // although we don't use a stylesheet for our application it is required or the 
-        // WS-I tools will fail
-        AddStyleSheet addstylesheet = new AddStyleSheetImpl();
-
-        analyzerconfig.setAssertionResultsOption(aro);
-        analyzerconfig.setAddStyleSheet(addstylesheet);
-      
-        analyzerconfig.setCorrelationType("endpoint");
-  	    try
-		{
-		  analyzerconfig.setLogLocation(URIEncoder.encode(filename, "UTF8"));
-		  analyzerconfig.setTestAssertionsDocumentLocation(
-			   URIEncoder.encode(wsiPreferences.getTADFile(), "UTF8"));
-		}
-		catch (UnsupportedEncodingException uee)
-		{
-		  analyzerconfig.setLogLocation(URIEncoder.encode(filename, "UTF8"));
-	      analyzerconfig.setTestAssertionsDocumentLocation(URIEncoder.encode(wsiPreferences.getTADFile(), "UTF8"));
-		}
-        //analyzerconfig.setLogLocation(filename);
-        //analyzerconfig.setTestAssertionsDocumentLocation(getBasicProfileTestAssertionsFile());
-        analyzerconfig.setVerboseOption(false);
-      
-
-        List analyzerConfigs = new Vector();
-        analyzerConfigs.add(analyzerconfig);
-        // here's where the validation actually starts happening
-        WSIBasicProfileAnalyzer bpanalyzer = new WSIBasicProfileAnalyzer(analyzerConfigs);
-
-        bpanalyzer.validateAll();
-        ReportImpl report = (ReportImpl) bpanalyzer.getReport();
-
-        List entries = report.getEntries();
-
-        // if there are report entries we iterate through them and add all
-        // error and warning messages to the error list.
-        if (entries != null)
-        {
-          Iterator ientry = entries.iterator();
-          while (ientry.hasNext())
-          {
-            Entry entry = (Entry) ientry.next();
-            Map assertionResults = entry.getAssertionResultList();
-
-            if (assertionResults != null)
-            {
-              Iterator iassertionResults = assertionResults.values().iterator();
-
-              while (iassertionResults.hasNext())
-              {
-                AssertionResult ar = (AssertionResult) iassertionResults.next();
-
-                if (ar.getResult().equalsIgnoreCase(FAILED) && 
-                	wsiPreferences.getComplianceLevel().equals(WSITestToolsEclipseProperties.STOP_NON_WSI))
-                {
-                  TestAssertion ta = ar.getAssertion();
-                  if (ta.isEnabled())
-                  {
-                    Iterator errorMessages = ar.getFailureDetailList().iterator();
-                    while (errorMessages.hasNext())
-                    {
-                      FailureDetailImpl fdi = (FailureDetailImpl)errorMessages.next();
-                      int lineNumber = 0;
-                      int columnNumber = 0;
-                    
-                      ElementLocation el = fdi.getElementLocation();
-
-                      if (el != null)
-                      {
-                        lineNumber = el.getLineNumber();
-                        columnNumber = el.getColumnNumber();
-                      }
-
-                      //TODO: get assertion locations in the log file
-                      assertionerrors.add(
-                        new AssertionError(
-                        ta.getId(),
-                        "Message ID " + entry.getReferenceID() + ":" + ta.getFailureMessage(),
-                        lineNumber,
-                        columnNumber));
-                    }
-                  }
-                }
-                else if (ar.getResult().equalsIgnoreCase(FAILED) && 
-                         wsiPreferences.getComplianceLevel().equals(WSITestToolsEclipseProperties.WARN_NON_WSI))
-                {
-                  TestAssertion ta = ar.getAssertion();
-                  if (ta.isEnabled())
-                  {
-                    Iterator errorMessages = ar.getFailureDetailList().iterator();
-                    while (errorMessages.hasNext())
-                    {
-                      FailureDetailImpl fdi = (FailureDetailImpl)errorMessages.next();
-                      int lineNumber = 0;
-                      int columnNumber = 0;
-                    
-                      ElementLocation el = fdi.getElementLocation();
-
-                      if (el != null)
-                      {
-                        lineNumber = el.getLineNumber();
-                        columnNumber = el.getColumnNumber();
-                      }
-                      //TODO: get assertion locations in the log file
-                      assertionwarnings.add(
-                        new AssertionError(
-                        ta.getId(),
-                        "Message ID " + entry.getReferenceID() + ":" + ta.getFailureMessage(),
-                        lineNumber,
-                        columnNumber));
-                    }
-                  }
-                }
-              }
-            }
-          }
-        } 
-	  }
-    }
-    catch (WSIException e)
-    {
-      throw new WSIAnalyzerException("The MessageAnalyzer was unable to validate the given logfile.", e.getTargetException());
-    }
-    catch (Exception e)
-    {
-      throw new WSIAnalyzerException("The MessageAnalyzer was unable to validate the given logfile.");
-    }
-
-  }
-
-  /**
-   * Method getAssertionWarnings.
-   * Returns a list of any assertion warnings generated from validateConformance.
-   * @return List
-   */
-  public List getAssertionWarnings()
-  {
-    return assertionwarnings;
-  }
-
-  /**
-   * Method getAssertionFailures.
-   * Returns a list of any assertion errors generated from validateConformance.
-   * @return List
-   */
-  public List getAssertionErrors()
-  {
-    return assertionerrors;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/analyzer/WSDLAnalyzer.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/analyzer/WSDLAnalyzer.java
deleted file mode 100644
index aab7d5525..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/analyzer/WSDLAnalyzer.java
+++ /dev/null
@@ -1,393 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.analyzer;
-
-import java.io.UnsupportedEncodingException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import org.eclipse.wst.common.uriresolver.internal.util.URIEncoder;
-import org.eclipse.wst.wsi.internal.WSIPreferences;
-import org.eclipse.wst.wsi.internal.WSITestToolsEclipseProperties;
-import org.eclipse.wst.wsi.internal.WSITestToolsProperties;
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.AnalyzerConfig;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.AssertionResultType;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.AssertionResultsOption;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLElement;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLReference;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.impl.AssertionResultsOptionImpl;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.impl.WSDLElementImpl;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.impl.WSDLReferenceImpl;
-import org.eclipse.wst.wsi.internal.core.common.AddStyleSheet;
-import org.eclipse.wst.wsi.internal.core.common.impl.AddStyleSheetImpl;
-import org.eclipse.wst.wsi.internal.core.document.DocumentFactory;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.report.Entry;
-import org.eclipse.wst.wsi.internal.core.report.impl.FailureDetailImpl;
-import org.eclipse.wst.wsi.internal.core.report.impl.ReportImpl;
-import org.eclipse.wst.wsi.internal.core.xml.dom.ElementLocation;
-import org.eclipse.wst.wsi.internal.report.AssertionError;
-
-/**
- * WSDLAnalyzer
- * The interface to the WS-I Test Tools for analyzing a WSDL file.  Allows a WSDL file to be analyzed
- * at any of the following levels.
- *  port
- *  binding
- *  portType
- *  operation
- *  message
- */
-
-public class WSDLAnalyzer
-{
-  public final static String PLUGIN_ID = "org.wsi.test.tools";
-  
-  public static final String PORT = "port";
-  public static final String BINDING = "binding";
-  public static final String PORTTYPE = "portType";
-  public static final String OPERATION = "operation";
-  public static final String MESSAGE = "message";
-
-  protected final String NOTPASSED = "notPassed";
-  protected final String WARNING = "warning";
-  protected final String FAILED = "failed";
-  
-  protected List analyzerConfigs;
-  protected String wsdlURI;
-  // assertions to ignore - used for assertions that the tools have not implemented properly yet
-  //protected String[] ignoreAssertions = { /*"WSI2105" , "WSI2119"*/};
-  protected List assertionerrors;
-  protected List assertionwarnings;
-  protected WSIPreferences wsiPreferences = null;
-
-  /**
-   * Constructor.
-   * Given the file name, parent element name, the element to analyze and the type of element
-   * sets up the WSDLAnalyzer to analyze the file.
-   * @param fileName log file name.
-   * @param parentName parent element name.
-   * @param namespace  a namespace.
-   * @param elementName the element to analyze.
-   * @param elementType the type of the element.
-   * @param wsiPreferences the preferences.
-   * @throws WSIAnalyzerException if unable to add configuration information.
-   */
-  public WSDLAnalyzer(String fileName, String parentName, String namespace, String elementName, String elementType, WSIPreferences wsiPreferences) throws WSIAnalyzerException
-  {
-    this(fileName, wsiPreferences);
-    addConfigurationToTest(parentName, namespace, elementName, elementType);
-
-  }
-
-  /**
-   * Constructor.
-   * Given the file name, parent element name, the element to analyze and the type of element
-   * sets up the WSDLAnalyzer to analyze the file.
-   * @param fileName log file name.
-   * @param parentName parent element name.
-   * @param namespace  a namespace.
-   * @param elementName the element to analyze.
-   * @param elementType the type of the element.
-   * @throws WSIAnalyzerException if unable to add configuration information.
-   */
-  public WSDLAnalyzer(String fileName, String parentName, String namespace, String elementName, String elementType) throws WSIAnalyzerException
-  {
-    this(fileName);
-    addConfigurationToTest(parentName, namespace, elementName, elementType);
-
-  }
-
-  /**
-   * Constructor.
-   * @param fileName  log file name.
-   */
-  public WSDLAnalyzer(String fileName, WSIPreferences wsiPreferences)
-  {
-    reset(fileName);
-    this.wsiPreferences = wsiPreferences;
-  }
-
-  /**
-   * Constructor.
-   * @param fileName  log file name.
-   */
-  public WSDLAnalyzer(String fileName)
-  {
-    reset(fileName);
-    if(WSITestToolsProperties.getEclipseContext())
-    {
-      this.wsiPreferences = WSITestToolsEclipseProperties.checkWSIPreferences(fileName);
-    }
-    else
-    {
-  	  this.wsiPreferences = WSITestToolsProperties.checkWSIPreferences(fileName);
-    }
-  }
-
-  public WSIPreferences getWSIPreferences()
-  {
-	  return this.wsiPreferences;
-  }
-	  
-  /**
-   * validateConformance.
-   * Validate the WSDL file as setup in the constructor.
-   * @throws WSIAnalyzerException if unable to validate the given WSDL File.
-   */
-  public void validateConformance() throws WSIAnalyzerException
-  {
-    try
-    {
-	  if (wsiPreferences.getComplianceLevel() != WSITestToolsProperties.IGNORE_NON_WSI)
-	  {
-        // here's where the validation actually starts happening
-        WSIBasicProfileAnalyzer bpanalyzer = new WSIBasicProfileAnalyzer(analyzerConfigs,wsdlURI);
-        bpanalyzer.validateAll();
-        ReportImpl report = (ReportImpl) bpanalyzer.getReport();
-
-        List entries = report.getEntries();
-
-        // if there are report entries we iterate through them and add all
-        // error and warning messages to the error list. 
-        if (entries != null)
-        {
-          Iterator ientry = entries.iterator();
-          while (ientry.hasNext())
-          {
-            Entry entry = (Entry) ientry.next();
-            Map assertionResults = entry.getAssertionResultList();
-
-            if (assertionResults != null)
-            {
-              Iterator iassertionResults = assertionResults.values().iterator();
-
-              while (iassertionResults.hasNext())
-              {
-                AssertionResult ar = (AssertionResult) iassertionResults.next();
-                TestAssertion ta = ar.getAssertion();
-                // add in to skip errors for assertions that are reporting incorrect problems.
-                // This allows us to not report incorrect errors reported in the tools without disabling them
-                //              String assertionId = ta.getId();
-                //              boolean ignoreAssertion = false;
-                //              for(int i = ignoreAssertions.length-1; i >=0;i--)
-                //              {
-                //              	if(ignoreAssertions[i].equalsIgnoreCase(assertionId))
-                //              	{
-                //              		ignoreAssertion = true;
-                //              	}
-                //              }
-                //              if(ignoreAssertion)
-                //              {
-                //              	continue;
-                //              }
-                if (ar.getResult().equalsIgnoreCase(FAILED) && 
-                	wsiPreferences.getComplianceLevel().equals(WSITestToolsProperties.STOP_NON_WSI))
-                {
-                  if (ta.isEnabled())
-                  {
-                    List errorMessageList = ar.getFailureDetailList();
-                    if (errorMessageList != null)
-                    {
-                      Iterator errorMessages = errorMessageList.iterator();
-
-                      while (errorMessages.hasNext())
-                      {
-                        FailureDetailImpl fdi = (FailureDetailImpl) errorMessages.next();
-                        int lineNumber = 0;
-                        int columnNumber = 0;
-
-                        ElementLocation el = fdi.getElementLocation();
-
-                        if (el != null)
-                        {
-                          lineNumber = el.getLineNumber();
-                          columnNumber = el.getColumnNumber();
-                        }
-
-                        assertionerrors.add(
-                          new AssertionError(ta.getId(), ta.getFailureMessage(), lineNumber, columnNumber));
-                      }
-                    }
-                    // the errorMessageList is null but there is an error so assign it to line 0 for now
-                    else
-                    {
-                      assertionerrors.add(new AssertionError(ta.getId(), ta.getFailureMessage(), 0, 0));
-                    }
-                  }
-                }
-                else if (ar.getResult().equalsIgnoreCase(FAILED) && 
-                         wsiPreferences.getComplianceLevel().equals(WSITestToolsProperties.WARN_NON_WSI))
-                {
-                  if (ta.isEnabled())
-                  {
-                    List errorMessageList = ar.getFailureDetailList();
-                    if (errorMessageList != null)
-                    {
-                      Iterator errorMessages = errorMessageList.iterator();
-                      while (errorMessages.hasNext())
-                      {
-                        FailureDetailImpl fdi = (FailureDetailImpl) errorMessages.next();
-                        int lineNumber = 0;
-                        int columnNumber = 0;
-
-                        ElementLocation el = fdi.getElementLocation();
-
-                        if (el != null)
-                        {
-                          lineNumber = el.getLineNumber();
-                          columnNumber = el.getColumnNumber();
-                        }
-                        assertionwarnings.add(
-                          new AssertionError(ta.getId(), ta.getFailureMessage(), lineNumber, columnNumber));
-                      }
-                    }
-                    // the errorMessageList is null but there is an error so assign it to line 0 for now
-                    else
-                    {
-                      assertionwarnings.add(new AssertionError(ta.getId(), ta.getFailureMessage(), 0, 0));
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-	  }
-    }
-
-    catch (Exception e)
-    {
-      throw new WSIAnalyzerException(e + "The WSDLAnalyzer was unable to validate the given WSDL File.");
-    }
-
-  }
-
-  /**
-   * Add configuration information.
-   * @param parentName parent element name.
-   * @param namespace  a namespace.
-   * @param elementName the element to analyze.
-   * @param elementType the type of the element.
-   * @throws WSIAnalyzerException if unable to add configuration information.
-   */
-  public void addConfigurationToTest(
-    String parentName,
-    String namespace,
-    String elementName,
-    String elementType) throws WSIAnalyzerException
-  {
-  	try
-  	{
-      WSDLReference wsdlReference = new WSDLReferenceImpl();
-
-      WSDLElement wsdlElement = (WSDLElement) new WSDLElementImpl();
-      wsdlElement.setType(elementType);
-      if (parentName != null)
-      {
-        wsdlElement.setParentElementName(parentName);
-      }
-      wsdlElement.setNamespace(namespace);
-      wsdlElement.setName(elementName);
-      wsdlReference.setWSDLElement(wsdlElement);
-
-      wsdlReference.setWSDLLocation(wsdlURI);
-      DocumentFactory documentFactory = DocumentFactory.newInstance();
-      // Initialize the BasicProfileAnalyzer using an analyzerconfig object
-      AnalyzerConfig analyzerconfig = documentFactory.newAnalyzerConfig();
-
-      AssertionResultsOption aro = new AssertionResultsOptionImpl();
-      aro.setAssertionResultType(AssertionResultType.newInstance(NOTPASSED));
-      aro.setShowAssertionDescription(false);
-      aro.setShowFailureDetail(false);
-      aro.setShowFailureMessage(false);
-      aro.setShowMessageEntry(false);
-
-      // although we don't use a stylesheet for our application it is required or the 
-      // WS-I tools will fail
-      AddStyleSheet addstylesheet = new AddStyleSheetImpl();
-
-      analyzerconfig.setAssertionResultsOption(aro);
-      analyzerconfig.setAddStyleSheet(addstylesheet);
-      analyzerconfig.setReplaceReport(true);
-      //analyzerconfig.setLogLocation(filename);
-	  try
-	 {
-	   analyzerconfig.setTestAssertionsDocumentLocation(
-		 URIEncoder.encode(wsiPreferences.getTADFile(), "UTF8"));
-	 }
-	 catch (UnsupportedEncodingException uee)
-	 {
-	   analyzerconfig.setTestAssertionsDocumentLocation(URIEncoder.encode(wsiPreferences.getTADFile(), "UTF8"));
-
-	 }
-      analyzerconfig.setVerboseOption(false);
-
-      // set the wsdlReference
-      analyzerconfig.setWSDLReference(wsdlReference);
-      analyzerConfigs.add(analyzerconfig);
-    }
-    catch (Exception e)
-    {
-      throw new WSIAnalyzerException("Unable to add AnalyzerConfig to list. " + e);
-    }
-  }
-  /**
-   * Method getAssertionFailures.
-   * Return a list of the assertion failures.
-   * @return a list of the assertion failures.
-   */
-  public List getAssertionErrors()
-  {
-    return assertionerrors;
-  }
-
-  /**
-  	 * Method getAssertionWarnings.
-  	 * Returns a list of any assertion warnings generated from validateConformance.
-  	 * @return a list of any assertion warnings generated from validateConformance.
-  	 */
-  public List getAssertionWarnings()
-  {
-    return assertionwarnings;
-  }
-  
-  /**
-   * Reset.
-   * @param filename log file name.
-   */
-  public void reset(String filename)
-  {
-	if (filename != null)
-	{
-	  String tmp = filename.replace('\\', '/');
-	  if ((!tmp.startsWith(WSIConstants.HTTP_PREFIX)) &&
-          (!tmp.startsWith(WSIConstants.FILE_PREFIX)))
-	  {
-	    tmp = WSIConstants.FILE_PROTOCOL + tmp;
-	  }
-	  try
-	  {
-	    wsdlURI = URIEncoder.encode(tmp, "UTF8");
-	  }
-	  catch (UnsupportedEncodingException uee)
-	  {
-	  }
-	}
-  	analyzerConfigs = new Vector();
-  	assertionerrors = new Vector();
-  	assertionwarnings = new Vector();
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/analyzer/WSIAnalyzerException.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/analyzer/WSIAnalyzerException.java
deleted file mode 100644
index 57778532c..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/analyzer/WSIBasicProfileAnalyzer.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/analyzer/WSIBasicProfileAnalyzer.java
deleted file mode 100644
index fb9b92800..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/analyzer/WSIBasicProfileAnalyzer.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.analyzer;
-
-import java.util.List;
-
-import org.eclipse.wst.wsi.internal.core.ToolInfo;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.BasicProfileAnalyzer;
-import org.eclipse.wst.wsi.internal.core.profile.validator.ProfileValidatorFactory;
-import org.eclipse.wst.wsi.internal.core.report.Report;
-import org.eclipse.wst.wsi.internal.core.util.MessageList;
-import org.eclipse.wst.wsi.internal.document.DocumentFactoryImpl;
-
-/**
- * WSIBasicProfileAnalyzer
- * 
- * An extension of the BasicProfileAnalyzer from the WS-I Test Tools that
- * allows calling code to get the report generated from WS-I validation.
- */
-public class WSIBasicProfileAnalyzer extends BasicProfileAnalyzer
-{
-  /**
-   * Default document factory class name.
-   */
-  public static final String DEF_DOCUMENT_FACTORY = "org.eclipse.wsi.test.tools.util.document.DocumentFactoryImpl";
-
-  /**
-   * Constructor for WSIBasicProfileAnalyzer.
-   * @param analyzerConfig configuration information.
-   * @param wsdlURI the location of the WSDL document.
-   * @throws WSIException @throws WSIException if unable to create a Basic profile analyzer.
-   */
-  public WSIBasicProfileAnalyzer(List analyzerConfig, String wsdlURI) throws WSIException
-  {
-    super(analyzerConfig, wsdlURI);
-  }
-
-  /**
-   * Constructor for WSIBasicProfileAnalyzer.
-   * @param analyzerConfig configuration information.
-   * @throws WSIException @throws WSIException if unable to create a Basic profile analyzer.
-   */
-  public WSIBasicProfileAnalyzer(List analyzerConfig) throws WSIException
-  {
-    super(analyzerConfig);
-  }
-
-  /**
-   * Common initialization.
-   * @param toolInfo a ToolInfo object.
-   * @throws WSIException if problems during initialization.
-   */
-  protected void init(ToolInfo toolInfo) throws WSIException
-  {
-    this.toolInfo = toolInfo;
-    
-    // Create message list
-    messageList = new MessageList(RESOURCE_BUNDLE_NAME);
-
-    // Create profile validator factory
-    factory = ProfileValidatorFactory.newInstance();
-
-    // Create document factory
-    documentFactory = new DocumentFactoryImpl();
-  }
-
-  /**
-   * Method getReport.
-   * 
-   * Return the Report generated by the validation.
-   * @return the Report generated by the validation.
-   */
-  public Report getReport()
-  {
-    return reporter.getReport();
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/ToolEnvironment.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/ToolEnvironment.java
deleted file mode 100644
index 88bee3f5c..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/ToolInfo.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/ToolInfo.java
deleted file mode 100644
index eb97ef484..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/ToolInfo.java
+++ /dev/null
@@ -1,447 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core;
-
-import java.io.FileWriter;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.wst.wsi.internal.core.util.Utils;
-import org.eclipse.wst.wsi.internal.core.util.XMLInfo;
-
-/**
- * Information that describes a conformance tool.
- *
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public class ToolInfo
-{
-  /**
-   * Tool information property names.
-   */
-  public static final String PROP_TOOL_VERSION = "wsi.tool.version";
-  public static final String PROP_TOOL_RELEASE_DATE = "wsi.tool.release.date";
-  public static final String PROP_TOOL_IMPLEMENTER = "wsi.tool.implementer";
-  public static final String PROP_TOOL_LOCATION = "wsi.tool.location";
-
-  /**
-   * Default tool information property values.
-   */
-  private static final String DEF_TOOL_VERSION = "1.0.1";
-  private static final String DEF_TOOL_RELEASE_DATE = "2004-01-22";
-  private static final String DEF_TOOL_IMPLEMENTER = "Eclipse.org Organization";
-  private static final String DEF_TOOL_LOCATION = "http://www.eclipse.org/wsvt";
-
-  /**
-   * Tool information.
-   */
-  protected String name;
-  protected String version;
-  protected String releaseDate;
-  protected String implementer;
-  protected String location;
-
-  /**
-   * Tool environment.
-   */
-  protected ToolEnvironment toolEnvironment = null;
-
-  /**
-   * Tool info properties filename.
-   */
-  public static final String PROP_FILENAME = "org.wsi.test.toolinfo";
-
-  /**
-   * Create tool information.
-   */
-  public ToolInfo()
-  {
-    this.toolEnvironment = new ToolEnvironment();
-  }
-
-  /**
-   * Create tool information from information in the toolinfo.properties file.
-   * @param name  the tool name.
-   */
-  public ToolInfo(String name)
-  {
-    this.name = name;
-
-    getProperties();
-
-    this.toolEnvironment = new ToolEnvironment();
-  }
-
-  /**
-   * Create tool information.
-   * @param name         the tool name.
-   * @param version      the version of the tool.
-   * @param releaseDate  the release date of the tool.
-   * @param implementer  the implementer of the tool.
-   * @param location     the implementer location.
-   */
-  public ToolInfo(
-    String name,
-    String version,
-    String releaseDate,
-    String implementer,
-    String location)
-  {
-    this.name = name;
-    this.version = version;
-    this.releaseDate = releaseDate;
-    this.implementer = implementer;
-    this.location = location;
-
-    this.toolEnvironment = new ToolEnvironment();
-  }
-
-  /**
-   * Create tool information with tool unique environment information.
-   * @param name         the tool name.
-   * @param version      the version of the tool.
-   * @param releaseDate  the release date of the tool.
-   * @param implementer  the implementer of the tool.
-   * @param location     the implementer location.
-   * @param xmlInfo      additional tool environment information.
-   */
-  public ToolInfo(
-    String name,
-    String version,
-    String releaseDate,
-    String implementer,
-    String location,
-    XMLInfo xmlInfo)
-  {
-    this.name = name;
-    this.version = version;
-    this.releaseDate = releaseDate;
-    this.implementer = implementer;
-    this.location = location;
-
-    this.toolEnvironment = new ToolEnvironment(xmlInfo);
-  }
-
-  /**
-   * Get name.
-   * @return name.
-   * @see #setName
-   */
-  public String getName()
-  {
-    return name;
-  }
-
-  /**
-   * Get version.
-   * @return version.
-   * @see #setVersion
-   */
-  public String getVersion()
-  {
-    return version;
-  }
-
-  /**
-   * Get release date.
-   * @return release date.
-   * @see #setReleaseDate
-   */
-  public String getReleaseDate()
-  {
-    return releaseDate;
-  }
-
-  /**
-   * Get implementer.
-   * @return implementer.
-   * @see #setImplementer
-   */
-  public String getImplementer()
-  {
-    return implementer;
-  }
-
-  /**
-   * Get implementer location.
-   * @return implementer location.
-   * @see #setLocation
-   */
-  public String getLocation()
-  {
-    return location;
-  }
-
-  /**
-   * Returns the toolEnvironment.
-   * @return ToolEnvironment
-   * @see #setToolEnvironment
-   */
-  public ToolEnvironment getToolEnvironment()
-  {
-    return toolEnvironment;
-  }
-
-  /**
-   * Sets the implementer.
-   * @param implementer the implementer to set.
-   * @see #getImplementer
-   */
-  public void setImplementer(String implementer)
-  {
-    this.implementer = implementer;
-  }
-
-  /**
-   * Sets the location.
-   * @param location the location to set.
-   * @see #getLocation
-   */
-  public void setLocation(String location)
-  {
-    this.location = location;
-  }
-
-  /**
-   * Sets the name.
-   * @param name the name to set.
-   * @see #getName
-   */
-  public void setName(String name)
-  {
-    this.name = name;
-  }
-
-  /**
-   * Sets the releaseDate.
-   * @param releaseDate the releaseDate to set.
-   * @see #getReleaseDate
-   */
-  public void setReleaseDate(String releaseDate)
-  {
-    this.releaseDate = releaseDate;
-  }
-
-  /**
-   * Sets the toolEnvironment.
-   * @param toolEnvironment the toolEnvironment to set.
-   * @see #getToolEnvironment
-   */
-  public void setToolEnvironment(ToolEnvironment toolEnvironment)
-  {
-    this.toolEnvironment = toolEnvironment;
-  }
-
-  /**
-   * Sets the toolEnvironment.
-   * @param xmlInfo additional tool environment information.
-   */
-  public void setAdditionalToolEnvironment(XMLInfo xmlInfo)
-  {
-    this.toolEnvironment.setAdditionalToolEnvironment(xmlInfo);
-  }
-
-  /**
-   * Sets the version.
-   * @param version the version to set.
-   * @see #getVersion
-   */
-  public void setVersion(String version)
-  {
-    this.version = version;
-  }
-
-  /**
-   * Return start XML string representation of this object.
-   * @param namespaceName  the namespace prefix.
-   * @return the start XML string representation of this object. 
-   */
-  public String getStartXMLString(String namespaceName)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    String nsName = namespaceName;
-    if (!nsName.equals(""))
-      nsName += ":";
-
-    pw.print("  <" + nsName + getName().toLowerCase() + " ");
-    pw.print(WSIConstants.ATTR_VERSION + "=\"" + getVersion() + "\" ");
-    pw.println(
-      WSIConstants.ATTR_RELEASE_DATE + "=\"" + getReleaseDate() + "\">");
-
-    pw.print("    <" + nsName + WSIConstants.ELEM_IMPLEMENTER + " ");
-    pw.print(WSIConstants.ATTR_NAME + "=\"" + getImplementer() + "\" ");
-    pw.println(WSIConstants.ATTR_LOCATION + "=\"" + getLocation() + "\"/>");
-
-    // Environment
-    pw.print(toolEnvironment.toXMLString(namespaceName));
-
-    return sw.toString();
-  }
-
-  /**
-   * Return the end XML string representation of this object.
-   * @param namespaceName  the namespace prefix.
-   * @return the end XML string representation of this object. 
-   */
-  public String getEndXMLString(String namespaceName)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    String nsName = namespaceName;
-    if (!nsName.equals(""))
-      nsName += ":";
-
-    pw.println("  </" + nsName + getName().toLowerCase() + ">");
-
-    return sw.toString();
-  }
-
-  /**
-   * Get values from the tools.properties file.
-   */
-  protected void getProperties()
-  {
-    //Properties props = new Properties();
-    ResourceBundle resourceBundle;
-
-    try
-    {
-      // Try to load properties from wsi.properties
-      //InputStream is = Utils.getInputStream(PROP_FILENAME);
-
-      // Load properties from file
-      //props.load(is);
-
-      // Get resource
-      resourceBundle = ResourceBundle.getBundle(PROP_FILENAME);
-
-      // Get property values
-      this.version =
-        getProperty(resourceBundle, PROP_TOOL_VERSION, DEF_TOOL_VERSION);
-      this.releaseDate =
-        getProperty(
-          resourceBundle,
-          PROP_TOOL_RELEASE_DATE,
-          DEF_TOOL_RELEASE_DATE);
-      this.implementer =
-        getProperty(
-          resourceBundle,
-          PROP_TOOL_IMPLEMENTER,
-          DEF_TOOL_IMPLEMENTER);
-      this.location =
-        getProperty(resourceBundle, PROP_TOOL_LOCATION, DEF_TOOL_LOCATION);
-    }
-
-    catch (MissingResourceException mre)
-    {
-      // DEBUG:
-      //System.out.println("Exception loading properties:  " + e.toString());
-
-      // Set default property values
-      this.version = DEF_TOOL_VERSION;
-      this.releaseDate = DEF_TOOL_RELEASE_DATE;
-      this.implementer = DEF_TOOL_IMPLEMENTER;
-      this.location = DEF_TOOL_LOCATION;
-    }
-  }
-
-  /**
-   * Get property.
-   * @param resourceBundle  a resource bundle.
-   * @param key             a key.
-   * @param defaultValue    a default value.
-   * @return property. If not found return default value.
-   */
-  protected String getProperty(
-    ResourceBundle resourceBundle,
-    String key,
-    String defaultValue)
-  {
-    String value;
-
-    if ((value = resourceBundle.getString(key)) == null)
-      value = defaultValue;
-
-    return value;
-  }
-
-  /**
-   * Create the tools.properties file from the command line.
-   * The input arguements are:
-   * <ol>
-   * <li>Filename for the properties file to create
-   * <li>Version number
-   * <li>
-   * </ol>
-   * @param args  the arguments for main.
-   */
-  public static void main(String[] args)
-  {
-    int statusCode = 0;
-    String filename = PROP_FILENAME;
-    String version = DEF_TOOL_VERSION;
-    String implementer = DEF_TOOL_IMPLEMENTER;
-    String location = DEF_TOOL_LOCATION;
-
-    // Set the file name
-    if (args.length >= 1)
-      filename = args[0];
-
-    if (args.length >= 2)
-      version = args[1];
-
-    if (args.length >= 3)
-      implementer = args[2];
-
-    if (args.length >= 4)
-      location = args[3];
-
-    try
-    {
-      // Create file writer
-      FileWriter fileWriter = new FileWriter(filename);
-
-      // Create print writer
-      PrintWriter printWriter = new PrintWriter(fileWriter);
-
-      // Write out contents of properties file
-      printWriter.println(COMMENTS);
-      printWriter.println(PROP_TOOL_VERSION + "=" + version);
-      printWriter.println(PROP_TOOL_RELEASE_DATE + "=" + Utils.getDate());
-      printWriter.println(PROP_TOOL_IMPLEMENTER + "=" + implementer);
-      printWriter.println(PROP_TOOL_LOCATION + "=" + location);
-
-      // Close file writer
-      fileWriter.close();
-
-      // Done
-      System.out.println("File [" + filename + "] created.");
-    }
-
-    catch (java.io.IOException ioe)
-    {
-      statusCode = 1;
-      System.out.println("EXCEPTION: " + ioe.toString());
-      ioe.printStackTrace();
-    }
-
-    // Exit
-    System.exit(statusCode);
-  }
-
-  private static final String COMMENTS = "";
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/WSIConstants.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/WSIConstants.java
deleted file mode 100644
index 6db52dbf2..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/WSIConstants.java
+++ /dev/null
@@ -1,488 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2003 IBM Corporation, Parasoft and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM      - Initial API and implementation
- *   Parasoft - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core;
-
-/**
- * WS-I constants.
- * 
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- * @author Jim Clune
- * @author Graham Turrell (gturrell@uk.ibm.com)
- */
-public interface WSIConstants {
-	/**
-	 * Copyright notice.
-	 */
-	public static final String COPYRIGHT = "Copyright (C) 2002-2003 by The Web Services-Interoperability Organization and Certain "
-			+ "of its Members. All Rights Reserved.\nUse of this Material is governed by WS-I licenses included within the documentation.";
-
-	/**
-	 * XML declaration statement.
-	 */
-	public static final String XML_DECL = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
-
-	/**
-	 * XML namespace URI.
-	 */
-	public static final String NS_URI_XMLNS = "http://www.w3.org/2000/xmlns/";
-	public static final String NS_URI_XML =  "http://www.w3.org/XML/1998/namespace";
-	/**
-	 * XML schema namespace URI.
-	 */
-	public static final String NS_URI_XSD = "http://www.w3.org/2001/XMLSchema";
-
-	/**
-	 * XML schema location.
-	 */
-	public static final String XSD_SCHEMA_LOCATION = "http://www.w3.org/2001/XMLSchema.xsd";
-
-	/**
-	 * XML schema namespace name.
-	 */
-	public static final String NS_NAME_XSD = "xsd";
-
-	/**
-	 * XML schema instance namespace URI.
-	 */
-	public static final String NS_URI_XSI = "http://www.w3.org/2001/XMLSchema-instance";
-
-	/**
-	 * XML schema namespace name.
-	 */
-	public static final String NS_NAME_XSI = "xsi";
-
-
-	/**
-	 * WS-I message log namespace URI.
-	 */
-	public static final String NS_URI_WSI_LOG = "http://www.ws-i.org/testing/2004/07/log/";
-
-	public static final String NS_NAME_WSI_LOG = "wsi-log";
-
-	/**
-	 * WS-I conformance report namespace URI.
-	 */
-	public static final String NS_URI_WSI_REPORT = "http://www.ws-i.org/testing/2004/07/report/";
-	public static final String NS_NAME_WSI_REPORT = "wsi-report";
-
-	/**
-	 * WS-I profile test assertions namespace URI.
-	 */
-	public static final String NS_URI_WSI_ASSERTIONS_2003 = "http://www.ws-i.org/testing/2003/03/assertions/";
-	public static final String NS_URI_WSI_ASSERTIONS = "http://www.ws-i.org/testing/2004/07/assertions/";
-
-	public static final String NS_NAME_WSI_ASSERTIONS = "wsi-assertions";
-
-	/**
-	 * WS-I monitor configuration file namesapce URI.
-	 */
-	public static final String NS_URI_WSI_MONITOR_CONFIG_2003 = "http://www.ws-i.org/testing/2003/03/monitorConfig/";
-	public static final String NS_URI_WSI_MONITOR_CONFIG = "http://www.ws-i.org/testing/2004/07/monitorConfig/";
-	
-
-	public static final String NS_NAME_WSI_MONITOR_CONFIG = "wsi-monConfig";
-
-	/**
-	 * WS-I analyzer configuration file namesapce URI.
-	 */
-	public static final String NS_URI_WSI_ANALYZER_CONFIG_2003 = "http://www.ws-i.org/testing/2003/03/analyzerConfig/";
-	public static final String NS_URI_WSI_ANALYZER_CONFIG = "http://www.ws-i.org/testing/2004/07/analyzerConfig/";
-	
-	public static final String NS_NAME_WSI_ANALYZER_CONFIG = "wsi-analyzerConfig";
-
-	/**
-	 * WS-I common namesapce URI.
-	 */
-	public static final String NS_URI_WSI_COMMON_2003 = "http://www.ws-i.org/testing/2003/03/common/";
-	public static final String NS_URI_WSI_COMMON = "http://www.ws-i.org/testing/2004/07/common/";
-	public static final String NS_NAME_WSI_COMMON = "wsi-common";
-
-	/**
-	 * SOAP V1.1 namespace.
-	 */
-	public final static String NS_URI_SOAP = "http://schemas.xmlsoap.org/soap/envelope/";
-
-	/**
-	 * SOAP/1.1 encoding.
-	 */
-	public final static String NS_URI_SOAP_ENCODING = "http://schemas.xmlsoap.org/soap/encoding/";
-
-	public static final String NS_URI_SOAP_NEXT_ACTOR = "http://schemas.xmlsoap.org/soap/actor/next" ;
-	/**
-	 * HTTP transport.
-	 */
-	public final static String NS_URI_SOAP_HTTP = "http://schemas.xmlsoap.org/soap/http";
-
-	/**
-	 * WSDL V1.1 namespace.
-	 */
-	public final static String NS_URI_WSDL = "http://schemas.xmlsoap.org/wsdl/";
-
-	/**
-	 * WSDL SOAP binding namespace.
-	 */
-	public final static String NS_URI_WSDL_SOAP = "http://schemas.xmlsoap.org/wsdl/soap/";
-
-	public final static String NS_NAME_WSDL_SOAP = "soap";
-
-	/**
-	 * WSDL MIME binding namespace.
-	 */
-	public final static String NS_NAME_WSDL_MIME = "http://schemas.xmlsoap.org/wsdl/mime/";
-
-	/**
-	 * WSDL HTTP GET & POST binding namespace.
-	 */
-	public final static String NS_NAME_WSDL_HTTP = "http://schemas.xmlsoap.org/wsdl/http/";
-
-	/**
-	 * WSDL DIME binding namespace.
-	 */
-	public final static String NS_NAME_WSDL_DIME = "http://schemas.xmlsoap.org/ws/2002/04/dime/wsdl/";
-
-	/**
-	 * Conformance Claim namespace.
-	 */
-	public final static String NS_URI_CLAIM = "http://ws-i.org/schemas/conformanceClaim/";
-
-	/**
-	 * UDDI V2 namespace.
-	 */
-	public final static String NS_URI_UDDI_V2 = "urn:uddi-org:api_v2";
-
-	/**
-	 * The XML Schema for the type used to refer to attachments from the SOAP
-	 * envelope.
-	 */
-	public final static String NS_URI_SWA_REF = "http://ws-i.org/profiles/basic/1.1/xsd";
-
-	public final static String SCHEMA_TYPE_SWA_REF = "swaRef";
-
-	/**
-	 * Element names.
-	 */
-	public static final String ELEM_ADD_STYLE_SHEET = "addStyleSheet";
-
-	public static final String ELEM_ADDITIONAL_ENTRY_TYPE_LIST = "additionalEntryTypeList";
-
-	public static final String ELEM_ANALYZER_FAILURE = "analyzerFailure";
-
-	public static final String ELEM_ARTIFACT = "artifact";
-
-	public static final String ELEM_ARTIFACT_REFERENCE = "artifactReference";
-
-	public static final String ELEM_ASSERTION_COVERAGE = "assertionCoverage";
-
-	public static final String ELEM_ASSERTION_DESCRIPTION = "assertionDescription";
-
-	public static final String ELEM_ASSERTION_RESULT = "assertionResult";
-
-	public static final String ELEM_ASSERTION_RESULT_SUMMARY = "assertionResultSummary";
-
-	public static final String ELEM_ASSERTION_RESULTS = "assertionResults";
-
-	public static final String ELEM_CLEANUP_TIMEOUT_SECONDS = "cleanupTimeoutSeconds";
-
-	public static final String ELEM_CONFIG = "configuration";
-
-	public static final String ELEM_COMMENT = "comment";
-
-	public static final String ELEM_CONTEXT = "context";
-
-	public static final String ELEM_DETAIL = "detail";
-
-	public static final String ELEM_DETAIL_DESCRIPTION = "detailDescription";
-
-	public static final String ELEM_DESCRIPTION = "description";
-
-	public static final String ELEM_ENVIRONMENT = "environment";
-
-	public static final String ELEM_ENTRY = "entry";
-
-	public static final String ELEM_FAILURE_DETAIL = "failureDetail";
-
-	public static final String ELEM_FAILURE_DETAIL_DESCRIPTION = "failureDetailDescription";
-
-	public static final String ELEM_FAILURE_MESSAGE = "failureMessage";
-
-	public static final String ELEM_HTTP_HEADERS = "httpHeaders";
-
-	public static final String ELEM_IMPLEMENTER = "implementer";
-
-	public static final String ELEM_INQUIRY_URL = "inquiryURL";
-
-	public static final String ELEM_LISTEN_PORT = "listenPort";
-
-	public static final String ELEM_LOG = "log";
-
-	public static final String ELEM_LOG_DURATION = "logDuration";
-
-	public static final String ELEM_LOG_FILE = "logFile";
-
-	public static final String ELEM_MAN_IN_THE_MIDDLE = "manInTheMiddle";
-
-	public static final String ELEM_MAX_CONNECTIONS = "maxConnections";
-
-	public static final String ELEM_MESSAGE_CONTENT = "messageContent";
-	
-	public static final String ELEM_MESSAGE_CONTENT_WITH_ATTACHMENTS = "messageContentWithAttachments";
-	
-	public static final String ELEM_MESSAGE_ENTRY = "messageEntry";
-
-	public static final String ELEM_MESSAGE_INPUT = "messageInput";
-
-	public static final String ELEM_MONITOR = "monitor";
-
-	public static final String ELEM_OPERATING_SYSTEM = "operatingSystem";
-
-	public static final String ELEM_PREREQ_FAILED_LIST = "prereqFailedList";
-
-	public static final String ELEM_PREREQ_LIST = "prereqList";
-
-	public static final String ELEM_PROFILE = "profile";
-
-	public static final String ELEM_PROFILE_ASSERTIONS = "profileAssertions";
-
-	public static final String ELEM_READ_TIMEOUT_SECONDS = "readTimeoutSeconds";
-
-	public static final String ELEM_RECEIVER_HOST_AND_PORT = "receiverHostAndPort";
-
-	public static final String ELEM_REDIRECT = "redirect";
-
-	public static final String ELEM_REPORT = "report";
-
-	public static final String ELEM_REPORT_FILE = "reportFile";
-
-	public static final String ELEM_RUNTIME = "runtime";
-
-	public static final String ELEM_SCHEME_AND_HOSTPORT = "schemeAndHostPort";
-
-	public static final String ELEM_SENDER_HOST_AND_PORT = "senderHostAndPort";
-
-	public static final String ELEM_SERVICE_LOCATION = "serviceLocation";
-
-	public static final String ELEM_SUMMARY = "summary";
-
-	public static final String ELEM_TEST_ASSERTION = "testAssertion";
-
-	public static final String ELEM_TEST_ASSERTIONS_FILE = "testAssertionsFile";
-
-	public static final String ELEM_TEST_ASSERTION_ID = "testAssertionID";
-
-	public static final String ELEM_TEST_COVERAGE = "testCoverage";
-
-	public static final String ELEM_UDDI_ENTRY = "uddiEntry";
-
-	public static final String ELEM_UDDI_KEY = "uddiKey";
-
-	public static final String ELEM_UDDI_REFERENCE = "uddiReference";
-
-	public static final String ELEM_VERBOSE = "verbose";
-
-	public static final String ELEM_WSDL_ELEMENT = "wsdlElement";
-
-	public static final String ELEM_WSDL_INPUT = "wsdlInput";
-
-	public static final String ELEM_WSDL_REFERENCE = "wsdlReference";
-
-	public static final String ELEM_WSDL_URI = "wsdlURI";
-
-	public static final String ELEM_XML_PARSER = "xmlParser";
-	
-	public static final String ELEM_MIME_PART = "mimePart";
-
-	public static final String ELEM_MIME_HEADERS = "mimeHeaders";
-	
-	public static final String ELEM_MIME_CONTENT = "mimeContent";
-
-	public static final String ELEM_BOUNDARY_STRING = "boundaryString";
-
-	/**
-	 * Attribute names.
-	 */
-	public static final String ATTR_ALTERNATE = "alternate";
-
-	public static final String ATTR_ARRAY_TYPE = "arrayType";
-
-	public static final String ATTR_ASSERTION_DESCRIPTION = "assertionDescription";
-
-	public static final String ATTR_BOM = "BOM";
-
-	public static final String ATTR_CHARSET = "charset";
-
-	public static final String ATTR_CODE = "code";
-
-	public static final String ATTR_COLUMN_NUMBER = "columnNumber";
-
-	public static final String ATTR_CONVERSATION_ID = "conversationID";
-
-	public static final String ATTR_CORRELATION_TYPE = "correlationType";
-
-	public static final String ATTR_DATE = "date";
-
-	public static final String ATTR_ENABLED = "enabled";
-
-	public static final String ATTR_ENTRY_TYPE = "entryType";
-
-	public static final String ATTR_FAILURE_MESSAGE = "failureMessage";
-
-	public static final String ATTR_FAILURE_DETAIL = "failureDetail";
-
-	public static final String ATTR_HREF = "href";
-
-	public static final String ATTR_ID = "id";
-
-	public static final String ATTR_ID_UC = "ID";
-
-	public static final String ATTR_IMPLEMENTER = "implementer";
-
-	public static final String ATTR_LINE_NUMBER = "lineNumber";
-
-	public static final String ATTR_LOCATION = "location";
-
-	public static final String ATTR_MEDIA = "media";
-
-	public static final String ATTR_MESSAGE_ENTRY = "messageEntry";
-
-	public static final String ATTR_MESSAGES = "messages";
-
-	public static final String ATTR_NAME = "name";
-
-	public static final String ATTR_NAMESPACE = "namespace";
-
-	public static final String ATTR_PARENT_ELEMENT_NAME = "parentElementName";
-
-	public static final String ATTR_REFERENCE_ID = "referenceID";
-
-	public static final String ATTR_REFERENCE_TYPE = "referenceType";
-
-	public static final String ATTR_RELEASE_DATE = "releaseDate";
-
-	public static final String ATTR_REPLACE = "replace";
-
-	public static final String ATTR_RESULT = "result";
-
-	public static final String ATTR_SERVICE_NAME = "serviceName";
-
-	public static final String ATTR_SPECIFICATION = "specification";
-
-	public static final String ATTR_TIMESTAMP = "timestamp";
-
-	public static final String ATTR_TITLE = "title";
-
-	public static final String ATTR_TYPE = "type";
-
-	public static final String ATTR_VERSION = "version";
-
-	/**
-	 * Default values.
-	 */
-	public static final String DEFAULT_REPORT_URI = "report.xml";
-
-	// TEMP: Use the following report title for the draft release only.
-	//public static final String DEFAULT_REPORT_TITLE = "WS-I Profile
-	// Conformance Report";
-	public static final String DEFAULT_REPORT_TITLE = "WS-I Basic Profile Conformance Report.";
-
-	public static final String DEFAULT_TEST_ASSERTIONS_DOCUMENT_URI = "http://www.ws-i.org/Testing/Tools/2004/12/AP10_BP11_SSBP10_TAD.xml";
-
-	public static final String DEFAULT_LOG_XSL = "../common/xsl/log.xsl";
-
-	public static final String DEFAULT_REPORT_XSL = "../common/xsl/report.xsl";
-
-	public static final String DEFAULT_XSL_TYPE = "text/xsl";
-
-	public static final String DEFAULT_XML_ENCODING = "UTF-8";
-
-	/**
-	 * BOM constants.
-	 *  
-	 */
-	public static int BOM_UTF16 = 0xFFFE;
-
-	public static int BOM_UTF16_BIG_ENDIAN = 0xFEFF;
-
-	public static int BOM_UTF8 = 0xEFBBBF;
-
-	/**
-	 * Validation constants.
-	 *  
-	 */
-	public static final String ATTRVAL_SOAP_BODY_USE_LIT = "literal";
-
-	public static final String ATTRVAL_SOAP_BODY_USE_ENC = "encoded";
-
-	public static final String ATTRVAL_SOAP_BIND_STYLE_DOC = "document";
-
-	public static final String ATTRVAL_SOAP_BIND_STYLE_RPC = "rpc";
-
-	public static final String ATTRVAL_CORRELATION_TYPE_ENDPOINT = "endpoint";
-
-	public static final String ATTRVAL_CORRELATION_TYPE_NAMESPACE = "namespace";
-
-	public static final String ATTRVAL_CORRELATION_TYPE_OPERATION = "operation";
-
-	/**
-	 * WS-I constants - attributes for conformance claims (discovery).
-	 *  
-	 */
-
-	public static final String ATTRVAL_UDDI_CLAIM_KEYVALUE = "http://ws-i.org/profiles/basic/1.0";
-
-	public static final String ATTRVAL_UDDI_CLAIM_TMODELKEY = "uuid:65719168-72c6-3f29-8c20-62defb0961c0";
-
-	/**
-	 * WS-I names and versions of the profile test assertion document supported
-	 * in the current version of the test tools.
-	 */
-	public static final String BASIC_PROFILE_TAD_NAME = "Basic Profile Test Assertions";
-
-	public static final String BASIC_PROFILE_1_1_TAD_NAME = "Basic Profile 1.1 Test Assertions";
-
-	public static final String SIMPLE_SOAP_BINDINGS_PROFILE_TAD_NAME = "Simple Soap Binding Profile [1.0] (with Basic Profile [1.1]) Test Assertions";
-
-	public static final String ATTACHMENTS_PROFILE_TAD_NAME = "Attachments Profile [1.0] (with Basic Profile [1.1] and Simple Soap Binding Profile [1.0]) Test Assertions";
-
-	public static final String BASIC_PROFILE_TAD_VERSION = "1.1.0";
-
-	public static final String BASIC_PROFILE_1_1_TAD_VERSION = "1.1.0";
-
-	public static final String SIMPLE_SOAP_BINDINGS_PROFILE_TAD_VERSION = "1.0.0";
-
-	public static final String ATTACHMENTS_PROFILE_TAD_VERSION = "1.0.0";
-
-	/**
-	 * System dependent line separator character.
-	 */
-	public static final String LINE_SEPARATOR = System
-			.getProperty("line.separator");
-
-	/**
-	 * System dependent path separator character.
-	 */
-	public static final String PATH_SEPARATOR = System
-			.getProperty("path.separator");
-
-	/**
-	 * File which contains the copyright, license and feedback comments.
-	 */
-	public static final String COMMENTS_FILE = "comments.xml";
-	public static final String CONTENT_TYPE_TEXT_XML = "text/xml";
-	public static final String CONTENT_TYPE_MULTIPART = "multipart/related";
-
-	public static final String FILE_PREFIX = "file:";
-	public static final String HTTP_PREFIX = "http:";
-	public static final String FILE_PROTOCOL = "file:///";
-	public static final String WSI_PREFIX = "WS-I: ";
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/WSIException.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/WSIException.java
deleted file mode 100644
index e6e8db4b5..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/WSIException.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.MissingResourceException;
-
-/**
- * Primary WS-I exception.
- *
- * @version 1.0.1
- * @author Peter Brittenham
- */
-public class WSIException extends Exception
-{
-
-  /**
-   * Static needed for serializable class
-   */
-  private static final long serialVersionUID = 5446823222767299308L;
-
-  /**
-   * Throwable.
-   */
-  protected Throwable throwable = null;
-
-  /**
-   * Create an exception without a message.
-   */
-  public WSIException()
-  {
-    // Exception
-    super();
-  }
-
-  /**
-   * Create an exception with a message.
-   * 
-   * @param msg the exception message
-   */
-  public WSIException(String msg)
-  {
-    // Exception
-    super(msg);
-  }
-
-  /**
-   * Create an exception with a message and related exception.
-   * 
-   * @param msg        the exception message
-   * @param throwable  throwable that is related to this exception
-   */
-  public WSIException(String msg, Throwable throwable)
-  {
-    // Exception
-    super(msg);
-
-    // Save input reference
-    this.throwable = throwable;
-  }
-
-  /**
-   * Returns the String representation of this object's values.
-   *
-   * @return Returns the detail message of this throwable object.
-   */
-  public String getMessage()
-  {
-    return super.getMessage();
-  }
-
-  /**
-   * Returns the String representation of this object's values.
-   *
-   * @return Returns the detail message of this throwable object.
-   */
-  public String toString()
-  {
-    //StringWriter sw;
-    //PrintWriter pw;
-
-    // Always get message from super class
-    String msg = super.getMessage();
-
-    // If this exception contains a reference to another exception,
-    // then add it to the message
-    if (throwable != null)
-    {
-      msg += "\n"
-        + "------------------------------------------------------------------------------\n"
-        + "  Nested exception is: \n\n  "
-        + throwable.toString()
-        + "\n";
-
-      // If throwable is MissingResourceException, 
-      // then add class name and key to output
-      if (throwable instanceof MissingResourceException)
-      {
-        MissingResourceException mre = (MissingResourceException) throwable;
-
-        // Get class name and key
-        msg += " - "
-          + mre.getKey()
-          + "\n\t"
-          + "[Class Name: "
-          + mre.getClassName()
-          + "]";
-      }
-
-      // If throwable is InvocationTargetException, 
-      // then target of exception
-      else if (throwable instanceof InvocationTargetException)
-      {
-        InvocationTargetException ite = (InvocationTargetException) throwable;
-
-        // Get target
-        msg += " - " + ite.getTargetException().toString();
-      }
-
-      // ADD: Print stack trace
-      //sw = new StringWriter();
-      //pw = new PrintWriter(sw);
-      //throwable.printStackTrace(pw);
-
-      // Add it to the message
-      //msg += sw.toString();
-    }
-
-    // Return message
-    return msg;
-  }
-
-  /**
-   * Returns the exception that caused this exception to be created.
-   * 
-   * @return Returns the encapsulated throwable object.
-   */
-  public Throwable getTargetException()
-  {
-    // Return throwable
-    return throwable;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/WSIFileNotFoundException.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/WSIFileNotFoundException.java
deleted file mode 100644
index 5abf5dbb8..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/WSIFileNotFoundException.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core;
-
-/**
- * Signals that an attempt to open the file denoted by a specified 
- * pathname has failed.
- * 
- * @author Peter  Brittenham (peterbr@us.ibm.com)
- * @version 1.0.1
- */
-public class WSIFileNotFoundException extends WSIException
-{
-
-  /**
-   * Static needed for serializable class
-   */
-  private static final long serialVersionUID = -1916010444601666401L;
-
-/**
-   * Constructor for WSIFileNotFoundException.
-   */
-  public WSIFileNotFoundException()
-  {
-    super();
-  }
-
-  /**
-   * Constructor for WSIFileNotFoundException.
-   * @param msg  the detail message.
-  
-   */
-  public WSIFileNotFoundException(String msg)
-  {
-    super(msg);
-  }
-
-  /**
-   * Constructor for WSIFileNotFoundException.
-   * @param msg        the detail message.
-   * @param throwable  initial exception thrown.
-   */
-  public WSIFileNotFoundException(String msg, Throwable throwable)
-  {
-    super(msg, throwable);
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/WSIRuntimeException.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/WSIRuntimeException.java
deleted file mode 100644
index 6ae30b613..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/WSIRuntimeException.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core;
-
-/**
- * This class represents runtime exceptions that occur after processing the configuration files.
- * 
- * @author Peter  Brittenham (peterbr@us.ibm.com)
- * @version 1.0.1
- */
-public class WSIRuntimeException extends WSIException
-{
-
-  /**
-   * Static needed for serializable class
-   */
-  private static final long serialVersionUID = 4309320981515513171L;
-
-  /**
-   * Constructor for WSIRuntimeException.
-   */
-  public WSIRuntimeException()
-  {
-    super();
-  }
-
-  /**
-   * Constructor for WSIRuntimeException.
-   * @param msg  the detail message.
-   */
-  public WSIRuntimeException(String msg)
-  {
-    super(msg);
-  }
-
-  /**
-   * Constructor for WSIRuntimeException.
-   * @param msg        the detail message.
-   * @param throwable  the initial exception thrown.
-  
-   */
-  public WSIRuntimeException(String msg, Throwable throwable)
-  {
-    super(msg, throwable);
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/WSITag.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/WSITag.java
deleted file mode 100644
index 1fb343339..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/WSITag.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.xml.XMLTags;
-
-/**
- * WS-I constants.  
- *  
- * @author Kulik
- */
-public interface WSITag extends XMLTags
-{
-  /**
-   * Qualified names of WSDL elements.
-   */
-  public final static QName WSDL_IMPORT =
-    new QName(WSIConstants.NS_URI_WSDL, "import");
-  public final static QName WSDL_TYPES =
-    new QName(WSIConstants.NS_URI_WSDL, "types");
-  public final static QName WSDL_MESSAGE =
-    new QName(WSIConstants.NS_URI_WSDL, "message");
-  public final static QName WSDL_DOCUMENTATION =
-    new QName(WSIConstants.NS_URI_WSDL, "documentation");
-  public final static QName WSDL_DEFINITIONS =
-    new QName(WSIConstants.NS_URI_WSDL, "definitions");
-  public final static QName WSDL_BINDING =
-    new QName(WSIConstants.NS_URI_WSDL, "binding");
-  public final static QName WSDL_OPERATION =
-    new QName(WSIConstants.NS_URI_WSDL, "operation");
-  public final static QName WSDL_PART =
-    new QName(WSIConstants.NS_URI_WSDL, "part");
-  public final static QName WSDL_INPUT =
-    new QName(WSIConstants.NS_URI_WSDL, "input");
-  public final static QName WSDL_OUTPUT =
-    new QName(WSIConstants.NS_URI_WSDL, "output");
-  public final static QName WSDL_FAULT =
-    new QName(WSIConstants.NS_URI_WSDL, "fault");
-  public final static QName WSDL_SERVICE =
-    new QName(WSIConstants.NS_URI_WSDL, "service");
-  public final static QName WSDL_PORT =
-    new QName(WSIConstants.NS_URI_WSDL, "port");
-  public final static QName WSDL_PORTTYPE =
-    new QName(WSIConstants.NS_URI_WSDL, "portType");
-
-  public static final QName WSDL_SOAP_BINDING =
-    new QName(WSIConstants.NS_URI_WSDL_SOAP, "binding");
-  public static final QName WSDL_SOAP_BODY =
-    new QName(WSIConstants.NS_URI_WSDL_SOAP, "body");
-  public static final QName WSDL_SOAP_HEADER =
-    new QName(WSIConstants.NS_URI_WSDL_SOAP, "header");
-  public static final QName WSDL_SOAP_HEADERFAULT =
-    new QName(WSIConstants.NS_URI_WSDL_SOAP, "headerfault");
-  public static final QName WSDL_SOAP_FAULT =
-    new QName(WSIConstants.NS_URI_WSDL_SOAP, "fault");
-
-  public static final QName WSDL_MIME_CONTENT =
-    new QName(WSIConstants.NS_NAME_WSDL_MIME, "content");
-  public static final QName WSDL_MIME_XML =
-    new QName(WSIConstants.NS_NAME_WSDL_MIME, "mimeXml");
-  public static final QName WSDL_MIME_PART =
-    new QName(WSIConstants.NS_NAME_WSDL_MIME, "part");
-  public static final QName WSDL_MIME_MULTIPART =
-    new QName(WSIConstants.NS_NAME_WSDL_MIME, "multipartRelated");
-
-  public final static QName ATTR_WSDL_ARRAYTYPE =
-    new QName(WSIConstants.NS_URI_WSDL, "arrayType");
-  public final static QName ATTR_WSDL_NAMESPACE =
-    new QName(WSIConstants.NS_URI_WSDL, "namespace");
-  public final static QName ATTR_WSDL_LOCATION =
-    new QName(WSIConstants.NS_URI_WSDL, "location");
-
-  /**
-   * Namespaces.
-   */
-  public final static String NS_URI_CLAIM =
-    "http://ws-i.org/schemas/conformanceClaim/";
-  public final static String NS_URI_SOAP =
-    "http://schemas.xmlsoap.org/soap/envelope/";
-  public final static String NS_URI_SOAPENC =
-    "http://schemas.xmlsoap.org/soap/encoding/";
-  public final static String NS_URI_BASIC_PROFILE10 =
-    "http://wsi.org/profiles/basic1.0/";
-
-  public final static QName SOAPENC_ARRAY = new QName(NS_URI_SOAPENC, "Array");
-
-  /**
-   * Qualified names of WS-I claim elements.
-   */
-  public final static QName WSI_CLAIM = new QName(NS_URI_CLAIM, "Claim");
-  public final static QName ATTR_CLAIM_CONFORMSTO =
-    new QName(NS_URI_CLAIM, "conformsTo");
-  public final static QName ATTR_SOAP_MUSTUNDERSTAND =
-    new QName(NS_URI_SOAP, "mustUnderstand");
-
-  /**
-   * Qualified names of SOAP elements.
-   */
-  public final static QName ELEM_SOAP_ENVELOPE = new QName(NS_URI_SOAP, "Envelope");
-  public final static QName ELEM_SOAP_BODY = new QName(NS_URI_SOAP, "Body");
-  public final static QName ELEM_SOAP_FAULT = new QName(NS_URI_SOAP, "Fault");
-  public final static QName ELEM_SOAP_HEADER = new QName(NS_URI_SOAP, "Header");
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/Analyzer.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/Analyzer.java
deleted file mode 100644
index 3e00d4a23..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/Analyzer.java
+++ /dev/null
@@ -1,309 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.analyzer;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.wst.wsi.internal.core.ToolInfo;
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.AnalyzerConfig;
-import org.eclipse.wst.wsi.internal.core.document.DocumentFactory;
-import org.eclipse.wst.wsi.internal.core.log.Log;
-import org.eclipse.wst.wsi.internal.core.profile.ProfileAssertions;
-import org.eclipse.wst.wsi.internal.core.profile.validator.ProfileValidatorFactory;
-import org.eclipse.wst.wsi.internal.core.report.Reporter;
-import org.eclipse.wst.wsi.internal.core.util.MessageList;
-import org.eclipse.wst.wsi.internal.core.util.TestUtils;
-
-/**
- * The Analyzer will process all Profile conformance functions.
- * This class should be sub-classed for each profile.
- *
- * @version 1.0.1
- * @author Jim Clune
- * @author Peter Brittenham
- */
-public abstract class Analyzer
-{
-  /**
-   * Message list.
-   */
-  protected MessageList messageList = null;
-
-  protected final static String RESOURCE_BUNDLE_NAME =
-    "org.eclipse.wst.wsi.internal.core.analyzer.Analyzer";
-
-  public final static String USAGE_MESSAGE =
-    "Usage: Analyzer -config <configFilename>";
-
-  protected Reporter reporter = null;
-  protected AnalyzerContext analyzerContext = null;
-  protected CandidateInfo candidateInfo = null;
-
-  /**
-   * Analyzer tool information.
-   */
-  protected ToolInfo toolInfo = null;
-
-  /**
-   * Profile validator factory.
-   */
-  protected ProfileValidatorFactory factory = null;
-
-  /**
-   * Profile validator factory.
-   */
-  protected DocumentFactory documentFactory = null;
-
-  /**
-   * Analyzer config file list.
-   */
-  protected List analyzerConfigList = new Vector();
-  protected int analyzerConfigIndex = 0;
-
-  /**
-   * Profile assertions.
-   */
-  protected ProfileAssertions profileAssertions = null;
-
-  /**
-   * Log file.
-   */
-  protected Log log = null;
-
-  /**
-   * Create an instance of the analyzer tool.
-   * @param args      command line arguments.
-   * @param toolInfo  analyzer tool information.
-   * @throws WSIException if problems creating the instance of the analyzer tool.
-   */
-  public Analyzer(String[] args, ToolInfo toolInfo) throws WSIException
-  {
-    init(toolInfo);
-
-    // Get new config object   
-    this.analyzerConfigList.add(
-      analyzerConfigIndex,
-      documentFactory.newAnalyzerConfig());
-    getAnalyzerConfig().init(messageList);
-
-    // Parse command line arguments
-    getAnalyzerConfig().parseArgs(args, true);
-
-    // Display copyright and options that were specified
-    TestUtils.printToolInfo(toolInfo);
-    System.out.println(getAnalyzerConfig().toString());
-
-    // Display message
-    printMessage(
-      "progress01",
-      null,
-      "Please wait while the specified artifacts are analyzed...");
-  }
-
-  /**
-   * Create an instance of the analyzer tool.
-   * @param args      command line arguments.
-   * @param toolInfo  analyzer tool information.
-   * @param validate  flag for config options validation. 
-   * @throws WSIException if problems creating the instance of the analyzer tool.
-   */
-  public Analyzer(String[] args, ToolInfo toolInfo, boolean validate) throws WSIException
-  {
-    init(toolInfo);
-
-    // Get new config object   
-    this.analyzerConfigList.add(
-        analyzerConfigIndex,
-        documentFactory.newAnalyzerConfig());
-    getAnalyzerConfig().init(messageList);
-
-    // Parse command line arguments
-    getAnalyzerConfig().parseArgs(args, validate);
-
-    // Display copyright and options that were specified
-    TestUtils.printToolInfo(toolInfo);
-    System.out.println(getAnalyzerConfig().toString());
-
-    // Display message
-    printMessage(
-        "progress01",
-        null,
-    "Please wait while the specified artifacts are analyzed...");
-  }
-
-  /**
-   * Create an instance of the analyzer tool.
-   * @param analyzerConfigList  analyzer config file list.
-   * @param toolInfo            analyzer tool information.
-   * @throws WSIException if problems creating the instance of the analyzer tool.
-   */
-  public Analyzer(List analyzerConfigList, ToolInfo toolInfo)
-    throws WSIException
-  {
-    init(toolInfo);
-
-    this.analyzerConfigList = analyzerConfigList;
-  }
-
-  /**
-   * Common initialization.
-   * @param toolInfo  analyzer tool information.
-   * @throws WSIException if problems occur during common initialization.
-   */
-  protected void init(ToolInfo info) throws WSIException
-  {
-    this.toolInfo = info;
-
-    // Create message list
-    messageList = new MessageList(RESOURCE_BUNDLE_NAME);
-
-    // Create profile validator factory
-    factory = ProfileValidatorFactory.newInstance();
-
-    // Create document factory
-    documentFactory = DocumentFactory.newInstance();
-  }
-
-  /**
-   * Process all conformance validation functions.
-   * @return status code.
-   * @throws WSIException if problems occur during validation.
-   */
-  public int validateAll() throws WSIException
-  {
-    int statusCode = 0;
-    int tempStatusCode;
-
-    for (int index = 0; index < analyzerConfigList.size(); index++)
-    {
-      // DEBUG:
-      //System.out.println("index: " + index);
-
-      // Set current analyzer config index 
-      setAnalyzerConfig(index);
-
-      if ((tempStatusCode = validateConformance()) > statusCode)
-        statusCode = tempStatusCode;
-    }
-
-    return statusCode;
-  }
-
-  /**
-   * Process all conformance validation functions.
-   * @return status code.
-   * @throws WSIException if problems occur during conformance validation.
-   */
-  public abstract int validateConformance() throws WSIException;
-
-  /**
-   * Get tool information.
-   * @return the tool information.
-   */
-  public ToolInfo getToolInfo()
-  
-  {
-    return this.toolInfo;
-  }
-
-  /**
-   * Set current analyzer configuration.
-   * @param index  urrent analyzer configuration.
-   * @see #getAnalyzerConfig
-   */
-  protected void setAnalyzerConfig(int index)
-  {
-    this.analyzerConfigIndex = index;
-  }
-
-  /**
-   * Get analyzer configuration information.
-   * @return analyzer configuration information.
-   * @see #setAnalyzerConfig
-   */
-  public AnalyzerConfig getAnalyzerConfig()
-  {
-    return (AnalyzerConfig) this.analyzerConfigList.get(analyzerConfigIndex);
-  }
-
-  /**
-   * Print a message from the resource bundle.
-   * @param key             a key.
-   * @param messageData     message data.
-   * @param defaultMessage  a default message.
-   */
-  public void printMessage(
-    String key,
-    String messageData,
-    String defaultMessage)
-  {
-    messageList.printMessage(key, messageData, defaultMessage);
-  }
-
-  /**
-   * Print message.
-   * @param key             a key.
-   * @param messageData     message data.
-   * @param defaultMessage  a default message.
-   */
-  public static void staticPrintMessage(
-    String key,
-    String messageData,
-    String defaultMessage)
-  {
-    MessageList.printMessage(
-      RESOURCE_BUNDLE_NAME,
-      key,
-      messageData,
-      defaultMessage);
-  }
-
-  /**
-   * Return XML string representation of this object.
-   * @param namespaceName  a namespace prefix.
-   * @return XML string representation of this object.
-   */
-  public String toXMLString(String namespaceName)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    // Start     
-    pw.print(toolInfo.getStartXMLString(namespaceName));
-
-    // Config
-    pw.print(
-      getAnalyzerConfig().toXMLString(
-        WSIConstants.NS_NAME_WSI_ANALYZER_CONFIG));
-
-    // End
-    pw.println(toolInfo.getEndXMLString(namespaceName));
-
-    return sw.toString();
-  }
-
-  /**
-   * Print a message.
-   * @param message a message.
-   */
-  public void printMessage(String message)
-  {
-    if (getAnalyzerConfig().getVerboseOption())
-    {
-      System.err.println(message);
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/Analyzer.properties b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/Analyzer.properties
deleted file mode 100644
index d66cb7584..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/analyzer/AnalyzerContext.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/AnalyzerContext.java
deleted file mode 100644
index d2f53a6a8..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/AnalyzerContext.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.analyzer;
-
-/**
- * This class contains contextual information which is required by test assertions across all artifacts.
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public class AnalyzerContext
-{
-  protected ServiceReference serviceReference = null;
-  protected CandidateInfo candidateInfo = null;
-
-  /**
-   * Do not allow the usage of the null constructor.
-   */
-  private AnalyzerContext()
-  {
-  }
-
-  /**
-   * Create analyzer context with service reference.
-   * @param serviceReference a service reference.
-   */
-  public AnalyzerContext(ServiceReference serviceReference)
-  {
-    this.serviceReference = serviceReference;
-  }
-
-  /**
-   * Get service reference.
-   * @return service reference.
-   * @see #setServiceReference
-   */
-  public ServiceReference getServiceReference()
-  {
-    return this.serviceReference;
-  }
-
-  /**
-   * Set service reference.
-   * @param serviceReference a service reference.
-   * @see #getServiceReference
-   */
-  public void setServiceReference(ServiceReference serviceReference)
-  {
-    this.serviceReference = serviceReference;
-  }
-
-  /**
-   * Returns the candidateInfo.
-   * @return CandidateInfo.
-   * @see #setCandidateInfo
-   */
-  public CandidateInfo getCandidateInfo()
-  {
-    return candidateInfo;
-  }
-
-  /**
-   * Sets the candidateInfo.
-   * @param candidateInfo the candidateInfo to set.
-   * @see #getCandidateInfo
-   */
-  public void setCandidateInfo(CandidateInfo candidateInfo)
-  {
-    this.candidateInfo = candidateInfo;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/AssertionFailException.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/AssertionFailException.java
deleted file mode 100644
index 8df5a2b34..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/analyzer/AssertionNotApplicableException.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/AssertionNotApplicableException.java
deleted file mode 100644
index 6434a504d..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/analyzer/AssertionPassException.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/AssertionPassException.java
deleted file mode 100644
index 4957d665f..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/analyzer/AssertionResultException.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/AssertionResultException.java
deleted file mode 100644
index 4e05aec49..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/analyzer/BasicProfileAnalyzer.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/BasicProfileAnalyzer.java
deleted file mode 100644
index d1a936a78..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/BasicProfileAnalyzer.java
+++ /dev/null
@@ -1,659 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2003 IBM Corporation, Parasoft, Beacon Information Technology Inc. and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM      - Initial API and implementation
- *   Parasoft - Initial API and implementation
- *   BeaconIT - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.analyzer;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.List;
-
-import javax.wsdl.WSDLException;
-
-import org.eclipse.wst.wsi.internal.core.ToolInfo;
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSIFileNotFoundException;
-import org.eclipse.wst.wsi.internal.core.log.LogReader;
-import org.eclipse.wst.wsi.internal.core.log.MessageEntryHandler;
-import org.eclipse.wst.wsi.internal.core.profile.ProfileAssertionsReader;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EnvelopeValidator;
-import org.eclipse.wst.wsi.internal.core.profile.validator.MessageValidator;
-import org.eclipse.wst.wsi.internal.core.profile.validator.UDDIValidator;
-import org.eclipse.wst.wsi.internal.core.profile.validator.WSDLValidator;
-import org.eclipse.wst.wsi.internal.core.report.ArtifactReference;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.report.Report;
-import org.eclipse.wst.wsi.internal.core.report.ReportArtifact;
-import org.eclipse.wst.wsi.internal.core.report.ReportContext;
-import org.eclipse.wst.wsi.internal.core.report.ReportWriter;
-import org.eclipse.wst.wsi.internal.core.report.impl.DefaultReporter;
-import org.eclipse.wst.wsi.internal.core.util.ArtifactType;
-import org.eclipse.wst.wsi.internal.core.util.WSIProperties;
-import org.eclipse.wst.wsi.internal.core.wsdl.WSDLDocument;
-import org.eclipse.wst.wsi.internal.core.xml.XMLDocumentCache;
-import org.uddi4j.transport.TransportFactory;
-
-
-/**
- * Analyzes log files to confirm conformance to a profile.
- *
- * @version 1.0.1
- * @author Jim Clune
- * @author Peter Brittenham
- * @author Graham Turrell
- */
-public class BasicProfileAnalyzer extends Analyzer
-{
-  /**
-   * Tool information.
-   */
-  public static final String TOOL_NAME = "Analyzer";
-
-  /**
-   * WSDL document to analyze.
-   */
-  protected WSDLDocument wsdlDocument = null;
-
-  /**
-   * Basic profile analyzer.
-   * @param args command line arguments.
-   * @throws WSIException if unable to create a Basic profile analyzer.
-   */
-  public BasicProfileAnalyzer(String[] args) throws WSIException
-  {
-    super(args, new ToolInfo(TOOL_NAME));
-    new XMLDocumentCache();
-  }
-
-  /**
-   * Basic profile analyzer.
-   * @param args command line arguments.
-   * @param validate flag for command line argument validation.
-   * @throws WSIException if unable to create a Basic profile analyzer.
-   */
-  public BasicProfileAnalyzer(String[] args, boolean validate) throws WSIException
-  {
-    super(args, new ToolInfo(TOOL_NAME), validate);
-    new XMLDocumentCache();
-  }
-
-  /**
-   * Basic profile analyzer.
-   * @param analyzerConfigList a list of configurations for the analyzer.
-   * @throws WSIException if unable to create a Basic profile analyzer.
-   */
-  public BasicProfileAnalyzer(List analyzerConfigList) throws WSIException
-  {
-    super(analyzerConfigList, new ToolInfo(TOOL_NAME));
-    new XMLDocumentCache();
-  }
-
-  /**
-   * Basic profile analyzer.
-   * @param analyzerConfigList a list of configurations for the analyzer.
-   * @param wsdlURI a wsdl document location.
-   * @throws WSIException if unable to create a Basic profile analyzer.
-   */
-  public BasicProfileAnalyzer(List analyzerConfigList, String wsdlURI)
-    throws WSIException
-  {
-    super(analyzerConfigList, new ToolInfo(TOOL_NAME));
-    new XMLDocumentCache();
-    
-    try
-    {
-      // Get the WSDL document
-      if (wsdlURI != null)
-        this.wsdlDocument = new WSDLDocument(wsdlURI);
-    }
-
-    catch (WSDLException we)
-    {
-      throw new WSIException(we.getMessage(), we);
-    }
-
-  }
-
-  /**
-   * Process all conformance validation functions.
-   * @return status code.
-   * @throws WSIException if conformance validation process failed.
-   */
-  public int validateConformance() throws WSIException
-  {
-    int statusCode = 0;
-
-    Report report = null;
-    ReportArtifact reportArtifact = null;
-    String wsdlURI = null;
-    //WSDLDocument wsdlDocument = null;
-
-    // Set up initial analyzer context based on entries in the config file
-    this.analyzerContext =
-      new AnalyzerContext(new ServiceReference(getAnalyzerConfig()));
-
-    try
-    {
-      // Read profile assertions
-      ProfileAssertionsReader profileAssertionsReader =
-        documentFactory.newProfileAssertionsReader();
-      this.profileAssertions =
-        profileAssertionsReader.readProfileAssertions(
-          getAnalyzerConfig().getTestAssertionsDocumentLocation());
-
-      // Create report from document factory
-      report = documentFactory.newReport();
-      report.setLocation(getAnalyzerConfig().getReportLocation());
-
-      // Create report context
-      ReportContext reportContext =
-        new ReportContext(
-          WSIConstants.DEFAULT_REPORT_TITLE,
-          profileAssertions,
-          this);
-      report.setReportContext(reportContext);
-
-      // Create report writer
-      ReportWriter reportWriter = documentFactory.newReportWriter();
-      // I18N: 2003.02.26 modified by K.Nakagome@BeaconIT 
-      //reportWriter.setWriter(new FileWriter(analyzerConfig.getReportLocation()));
-      reportWriter.setWriter(getAnalyzerConfig().getReportLocation());
-
-      // Create reporter
-      this.reporter = new DefaultReporter(report, reportWriter);
-
-      // Start writing report
-      this.reporter.startReport();
-
-      // --------------------------------
-      // DISCOVERY ARTIFACT:
-      // --------------------------------
-
-      // Set current artifact
-      reportArtifact = setCurrentArtifact(ArtifactType.ARTIFACT_TYPE_DISCOVERY);
-
-      // If UDDI options specified, then process UDDI test assertions
-      if ((wsdlURI = validateUDDI(reportArtifact, factory.newUDDIValidator()))
-        == null)
-      {
-        if (getAnalyzerConfig().isWSDLReferenceSet())
-        {
-          // Otherwise use the WSDL options to get the WSDL location
-          wsdlURI = getAnalyzerConfig().getWSDLLocation();
-        }
-      }
-
-      // Indicate that we are done with this artifact
-      this.reporter.endCurrentArtifact();
-
-      // --------------------------------
-      // DESCRIPTION ARTIFACT:
-      // --------------------------------
-
-      // Set current artifact
-      reportArtifact =
-        setCurrentArtifact(ArtifactType.ARTIFACT_TYPE_DESCRIPTION);
-
-      // Call WSDLValidator 
-      wsdlDocument =
-        validateWSDL(
-          reportArtifact,
-          factory.newWSDLValidator(),
-          wsdlURI,
-          wsdlDocument);
-
-      // If WSDL document object is null, then throw exception
-      if ((wsdlDocument == null) && (getAnalyzerConfig().isWSDLReferenceSet()))
-      {
-        throw new WSIException(
-          messageList.getMessage(
-            "config05",
-            "WSDL document was either not found or could not be processed."));
-      }
-
-      // Indicate that we are done with this artifact
-      this.reporter.endCurrentArtifact();
-
-      // REMOVE:
-      // If processing log entries and there isn't a WSDL URI, 
-      // then throw an exception since it is required to process the log entries
-      //if ((wsdlURI == null) && (analyzerConfig.getLogLocation() != null)) {
-      //  throw new WSIException("Must specify the WSDL document location to validate message log.");
-      //}
-
-      // --------------------------------
-      // MESSAGE ARTIFACT:
-      // --------------------------------
-
-      // Set current artifact
-      reportArtifact = setCurrentArtifact(ArtifactType.ARTIFACT_TYPE_MESSAGE);
-
-      // Process test assertions for the messages
-      validateMessages(
-        reportArtifact,
-        factory.newMessageValidator(),
-        wsdlDocument);
-
-      // Indicate that we are done with this artifact
-      this.reporter.endCurrentArtifact();
-
-      // --------------------------------
-      // ENVELOPE ARTIFACT:
-      // --------------------------------
-
-      // If that is not the Basic Profile 1.0, then process
-      // the envelope artifact
-      if (!profileAssertions.getTADName()
-        .equals(WSIConstants.BASIC_PROFILE_TAD_NAME))
-      {
-
-        // Set current artifact
-        reportArtifact = setCurrentArtifact(ArtifactType.ARTIFACT_TYPE_ENVELOPE);
-
-        // Process test assertions for the envelopes
-        validateEnvelopes(
-          reportArtifact,
-          factory.newEnvelopeValidator(),
-          wsdlDocument);
-
-        // Indicate that we are done with this artifact
-        this.reporter.endCurrentArtifact();
-      }
-
-      // Finish the conformance report
-      reporter.finishReport();
-    }
-
-    catch (Exception e)
-    {
-      StringWriter sw = new StringWriter();
-      PrintWriter pw = new PrintWriter(sw);
-
-      String message =
-        messageList.getMessage(
-          "error03",
-          "The conformance validation process failed.");
-
-      // Finish report
-      if (reporter != null)
-      {
-        pw.println(message);
-        pw.println(
-          messageList.getMessage("exception01", "Exception: ")
-            + e.getClass().getName());
-        e.printStackTrace(pw);
-        reporter.finishReportWithError(sw.toString());
-      }
-
-      if (e instanceof WSIException)
-        throw (WSIException) e;
-      else
-        throw new WSIException(message, e);
-    }
-
-    if (report != null)
-    {
-      statusCode =
-        (report.getSummaryResult().equals(AssertionResult.RESULT_PASSED)
-          ? 0
-          : 1);
-    }
-
-    return statusCode;
-  }
-
-  /**
-   * Run UDDI test assertions.
-   */
-  private String validateUDDI(
-    ReportArtifact reportArtifact,
-    UDDIValidator uddiValidator)
-    throws WSIException
-  {
-    String wsdlURI = null;
-
-    // Init UDDIValidator
-    uddiValidator.init(
-      this.analyzerContext,
-      this.profileAssertions.getArtifact(ArtifactType.TYPE_DISCOVERY),
-      reportArtifact,
-      getAnalyzerConfig().getUDDIReference(),
-      this.reporter);
-
-    // Call UDDIValidator 
-    if (getAnalyzerConfig().isUDDIReferenceSet())
-    {
-      wsdlURI = uddiValidator.validate();
-
-      // Cleanup
-      uddiValidator.cleanup();
-    }
-
-    else
-    {
-      // Set all missingInput
-      uddiValidator.setAllMissingInput();
-    }
-
-    return wsdlURI;
-  }
-
-  /**
-   * Run WSDL test assertions.
-   */
-  private WSDLDocument validateWSDL(
-    ReportArtifact reportArtifact,
-    WSDLValidator wsdlValidator,
-    String wsdlURI,
-    WSDLDocument document)
-    throws WSIException
-  {
-    WSDLDocument returnWSDLDocument = null;
-
-    // Init WSDLValidator
-    wsdlValidator.init(
-      this.analyzerContext,
-      this.profileAssertions.getArtifact(ArtifactType.TYPE_DESCRIPTION),
-      reportArtifact,
-      wsdlURI,
-      document,
-      this.reporter);
-
-    // If a WSDL URI was specified or located in a UDDI registry, then process the WSDL tests
-    if (wsdlURI != null || document != null)
-    {
-      // Call WSDLValidator 
-      returnWSDLDocument = wsdlValidator.validate();
-
-      // Cleanup
-      wsdlValidator.cleanup();
-    }
-
-    else
-    {
-      // Set all missingInput
-      wsdlValidator.setAllMissingInput();
-    }
-
-    return returnWSDLDocument;
-  }
-
-  /**
-   * Run message test assertions.
-   */
-  private void validateMessages(
-    ReportArtifact reportArtifact,
-    MessageValidator messageValidator,
-    WSDLDocument document)
-    throws WSIException
-  {
-    //Log log = null;
-    //MessageEntry logEntry = null;
-
-    // Init MessageValidator
-    messageValidator.init(
-      this.analyzerContext,
-      this.profileAssertions.getArtifact(ArtifactType.TYPE_MESSAGE),
-      reportArtifact,
-      document,
-      this.reporter);
-
-    // If the log file location was specified, then process test assertions for the messages
-    if (getAnalyzerConfig().getLogLocation() != null)
-    {
-      // Get the log file reader
-      LogReader logReader = documentFactory.newLogReader();
-
-      // Create log reader callback
-      MessageProcessor messageProcessor =
-        new MessageProcessor(messageValidator);
-
-      // Start reading the log file
-      logReader.readLog(getAnalyzerConfig().getLogLocation(), messageProcessor);
-
-      // Cleanup
-      messageValidator.cleanup();
-    }
-
-    // Otherwise all are missingInput
-    else
-    {
-      // Set all missingInput
-      messageValidator.setAllMissingInput();
-    }
-  }
-
-  /**
-   * Run envelope test assertions.
-   */
-  private void validateEnvelopes(
-    ReportArtifact reportArtifact,
-    EnvelopeValidator envelopeValidator,
-    WSDLDocument document)
-    throws WSIException
-  {
-    // Init envelopeValidator
-    envelopeValidator.init(
-      this.analyzerContext,
-      this.profileAssertions.getArtifact(ArtifactType.TYPE_ENVELOPE),
-      reportArtifact,
-      document,
-      this.reporter);
-
-    // If the log file location was specified, then process test assertions for the messages
-    if (getAnalyzerConfig().getLogLocation() != null)
-    {
-      // Get the log file reader
-      LogReader logReader = documentFactory.newLogReader();
-
-      // Create log reader callback
-      EnvelopeProcessor envelopeProcessor =
-        new EnvelopeProcessor(envelopeValidator);
-
-      // Start reading the log file
-      logReader.readLog(getAnalyzerConfig().getLogLocation(), envelopeProcessor);
-
-      // Cleanup
-      envelopeValidator.cleanup();
-    }
-
-    // Otherwise all are missingInput
-    else
-    {
-      // Set all missingInput
-      envelopeValidator.setAllMissingInput();
-    }
-  }
-
-  /**
-   * Command line interface for the analyzer tool.
-   * @param args command line arguments.
-   * @throws IOException if IO problems occur.
-   */
-  public static void main(String[] args) throws IOException
-  {
-    int statusCode = 0;
-    Analyzer analyzer = null;
-
-    try
-    {
-      // Set document builder factory class
-      System.setProperty(
-        WSIProperties.PROP_JAXP_DOCUMENT_FACTORY,
-        WSIProperties.getProperty(WSIProperties.PROP_JAXP_DOCUMENT_FACTORY));
-
-      // Set the system property for UDDI4J transport
-      System.setProperty(
-        TransportFactory.PROPERTY_NAME,
-        WSIProperties.getProperty(TransportFactory.PROPERTY_NAME));
-
-      // Create the analyzer object
-      analyzer = new BasicProfileAnalyzer(args);
-
-      // Have it process the conformance validation functions
-      statusCode = analyzer.validateConformance();
-
-      // Display message
-      analyzer.printMessage(
-        "created01",
-        null,
-        "Conformance report has been created.");
-    }
-
-    catch (Exception e)
-    {
-      statusCode = 1;
-
-      String messageID;
-      String defaultMessage;
-      String messageData;
-
-      if ((e instanceof WSIFileNotFoundException)
-        || (e instanceof IllegalArgumentException))
-      {
-        //printStackTrace = false;
-        messageID = "error01";
-        defaultMessage = "Analyzer Error:";
-        messageData = e.getMessage();
-      }
-
-      else
-      {
-        //printStackTrace = true;
-        messageID = "error02";
-        defaultMessage = "Analyzer Stopped By Exception:";
-        messageData = e.toString();
-      }
-
-      if (analyzer != null)
-        analyzer.printMessage(messageID, messageData, defaultMessage);
-      else
-        Analyzer.staticPrintMessage(messageID, messageData, defaultMessage);
-
-      if (analyzer != null
-        && analyzer.getAnalyzerConfig() != null
-        && analyzer.getAnalyzerConfig().getVerboseOption())
-        dump(e);
-    }
-
-    // Exit
-    System.exit(statusCode);
-  }
-
-  /**
-   * Set current artifact.
-   * @param artifactType an ArtifactType object.
-   * @return a ReportArtifact object.
-   * @throws WSIException if problems creating report artifact.
-   */
-  protected ReportArtifact setCurrentArtifact(ArtifactType artifactType)
-    throws WSIException
-  {
-    // Create artifact
-    ReportArtifact reportArtifact = reporter.createArtifact();
-    reportArtifact.setType(artifactType);
-
-    // Add artifact to report
-    this.reporter.setCurrentArtifact(reportArtifact);
-
-    return reportArtifact;
-  }
-
-  /**
-   * Print exception.
-   * @param t a Throwable object.
-   */
-  public static void dump(Throwable t)
-  {
-    while (t instanceof WSIException)
-    {
-      Throwable nested = ((WSIException) t).getTargetException();
-      if (nested == null)
-        break;
-      else
-        t = nested;
-    }
-    t.printStackTrace();
-  }
-
-  /**
-   * Message processor class.
-   */
-  class MessageProcessor implements MessageEntryHandler
-  {
-    MessageValidator messageValidator = null;
-
-    /**
-     * Create message processor as a log reader callback function.
-     */
-    MessageProcessor(MessageValidator messageValidator)
-    {
-      this.messageValidator = messageValidator;
-    }
-
-    /**
-     * Process artifact reference.
-     */
-    public void processArtifactReference(ArtifactReference artifactReference)
-      throws WSIException
-    {
-      reporter.addArtifactReference(artifactReference);
-    }
-
-    /**
-     * Process a single log entry.
-     */
-    public void processLogEntry(EntryContext entryContext) throws WSIException
-    {
-      // Validate message
-      messageValidator.validate(entryContext);
-    }
-
-  }
-
-  /**
-   * Envelope processor class.
-   */
-  class EnvelopeProcessor implements MessageEntryHandler
-  {
-    EnvelopeValidator envelopeValidator = null;
-
-    /**
-     * Create envelope processor as a log reader callback function.
-     */
-    EnvelopeProcessor(EnvelopeValidator envelopeValidator)
-    {
-      this.envelopeValidator = envelopeValidator;
-    }
-
-    /**
-     * Process artifact reference.
-     */
-    public void processArtifactReference(ArtifactReference artifactReference)
-      throws WSIException
-    {
-      reporter.addArtifactReference(artifactReference);
-    }
-
-    /**
-     * Process a single log entry.
-     */
-    public void processLogEntry(EntryContext entryContext) throws WSIException
-    {
-      // Validate envelopes
-      envelopeValidator.validate(entryContext);
-    }
-
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/CandidateInfo.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/CandidateInfo.java
deleted file mode 100644
index 553cbee39..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/CandidateInfo.java
+++ /dev/null
@@ -1,918 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.analyzer;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import javax.wsdl.Binding;
-import javax.wsdl.Definition;
-import javax.wsdl.Fault;
-import javax.wsdl.Import;
-import javax.wsdl.Message;
-import javax.wsdl.Operation;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.Types;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import javax.xml.namespace.QName;
-
-import org.apache.xerces.util.URI;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLElement;
-import org.eclipse.wst.wsi.internal.core.wsdl.WSDLDocument;
-import org.eclipse.wst.wsi.internal.core.wsdl.WSDLUtils;
-
-/**
- * Provide a normalized set of data relating to the service under test.
- * For example, with endpoint correlation and wsdlElement of type "message" 
- * there could be multiple matches for most element types including WSDL Service.
- * (though the objective is to ensure filtering to a single service if at all possible). 
- * 
- * @author gturrell
- */
-
-// ADD:could be better as a singleton?
-
-public class CandidateInfo
-{
-
-  // Normalized fixed correlation data derived from the analyzer config and the wsdl,
-  // representing what we know about the service from these two sources.  
-  private Definition[] definitions = null;
-
-  private Import[] imports = null;
-  private Types[] types = null;
-
-  private Message[] messages = null;
-  private Operation[] operations = null;
-  private PortType[] portTypes = null;
-  private Binding[] bindings = null;
-  private Port[] ports = null;
-
-  private URI[] endPoints = null; // list obtainable from a port
-
-  private WSDLDocument wsdlDocument; // reference probably not desirable here
-
-  /**
-   * Constructor for CandidateInfo.
-   * Extract normalised entry data from wsdl, according to config wsdlElement & serviceLocation
-   * @param serviceReference a ServiceReference object.
-   * @param wsdlDocument a WSDL document.
-   * @throws WSIException if problems occur creating CandidateInfo object.
-   */
-  public CandidateInfo(
-    ServiceReference serviceReference,
-    WSDLDocument wsdlDocument)
-    throws WSIException
-  {
-
-    // ADD: check for null document?
-
-    WSDLElement wsdlElement = serviceReference.getWSDLElement();
-
-    this.wsdlDocument = wsdlDocument;
-
-    /*
-     * Generalised fields independent of wsdlElement:
-     */
-    // ADD: check whether these need to be either expanded or filtered down.
-    // Assume WSDL4J pulls int the full tree at the root document for now		
-    //this.imports = wsdlDocument.getImports();
-
-    // ... or if only down to first level....
-    this.imports =
-      (Import[]) getAllImports(
-        wsdlDocument.getDefinitions()).toArray(new Import[] {
-    });
-
-    /* Definitions. 
-     * Note that the the first array element is for the root doc
-     * which contains all WSDL elements in scope via <import> declarations,
-     * as well as the root document itself. Therefore the second definitions 
-     * array element and above are redundant, but *may* prove useful to the assertion
-     * code.
-     */
-
-    this.definitions = new Definition[imports.length + 1];
-    // allow room for root doc		
-
-    this.definitions[0] = wsdlDocument.getDefinitions(); // root document    
-
-    // Allocate array for types elements
-    Types[] tempTypes = new Types[definitions.length];
-
-    int typesCount = 0;
-
-    if (definitions[0].getTypes() != null)
-    {
-      tempTypes[0] = this.definitions[0].getTypes(); // root document	
-      typesCount++;
-    }
-
-    // Definitions from other (imported) wsdls correlating to the candidate
-    // Only one level down for now
-    for (int i = 0; i < imports.length; i++)
-    {
-      if (((definitions[i + 1] = imports[i].getDefinition()) != null)
-        && (definitions[i + 1].getTypes() != null))
-      {
-        tempTypes[typesCount] = definitions[i + 1].getTypes();
-        typesCount++;
-      }
-    }
-
-    if (typesCount > 0)
-    {
-      this.types = new Types[typesCount];
-
-      for (int i = 0; i < typesCount; i++)
-        this.types[i] = tempTypes[i];
-    }
-    /* 
-     * Populate element hierachy:
-     * Port
-     * Binding
-     * PortType
-     * operation(s)
-     * message(s)
-     */
-
-    if (wsdlElement.isPort())
-    {
-
-      Port port = null;
-
-      // Use parentElementName to qualify the port within a service.		
-      QName serviceName = wsdlElement.getParentElementQName();
-      Service[] s = wsdlDocument.getServices();
-      String portName = wsdlElement.getName();
-      for (int i = 0; i < s.length && port == null; i++)
-      {
-        if (s[i].getQName().equals(serviceName))
-        {
-          port = s[i].getPort(portName);
-        }
-      }
-
-      if (port == null)
-      {
-        throw new WSIException(
-          "WSDL Port \'"
-            + portName
-            + "\' for Service \'"
-            + serviceName
-            + "\' not found in service description");
-      }
-      else
-      {
-        this.ports = new Port[] { port };
-        // ADD: do serviceLocation check for soapbind:address?
-        descendents(port);
-      }
-
-      // ADD: the following could be instantiated here instead to refine context info
-      // definitions 
-      // imports 
-      // types
-
-    }
-
-    else if (wsdlElement.isBinding())
-    {
-      if (wsdlElement.getQName() != null
-        && wsdlElement.getQName().getLocalPart() != null
-        && wsdlElement.getQName().getLocalPart().length() > 0)
-      {
-        Binding binding =
-          wsdlDocument.getDefinitions().getBinding(wsdlElement.getQName());
-
-        if (binding == null)
-        {
-          throw new WSIException(
-            "WSDL Binding named \'"
-              + wsdlElement.getQName()
-              + "\' not found in service description");
-        }
-        else
-        {
-          this.bindings = new Binding[] { binding };
-
-          // the rest ... below binding:	
-          // portTypes from binding
-          // operations from portTypes
-          // messages from operations
-          descendents(binding);
-
-          // above binding:
-          // ports
-          // definitions, imports, types (future?)				
-          // ancestors(bindings);
-        }
-      }
-    }
-
-    else if (wsdlElement.isPortType())
-    {
-
-      PortType portType =
-        wsdlDocument.getDefinitions().getPortType(wsdlElement.getQName());
-      this.portTypes = new PortType[] { portType };
-
-      if (portType == null)
-      {
-        throw new WSIException(
-          "WSDL PortType named \'"
-            + wsdlElement.getQName()
-            + "\' not found in service description");
-      }
-      else
-      {
-        this.portTypes = new PortType[] { portType };
-        // the rest ... below portType:	
-        descendents(portType);
-
-        // above portType:
-        // ports
-        // definitions, imports, types (future) ?
-        //ancestors(portTypes);		
-      }
-    }
-    else if (wsdlElement.isOperation())
-    {
-
-      Operation operation = null;
-      String configOpName = wsdlElement.getName();
-
-      // Use parentElementName to qualify the operation within a portType.
-      QName portTypeName = wsdlElement.getParentElementQName();
-      PortType[] p = wsdlDocument.getPortTypes();
-      for (int i = 0; i < p.length && operation == null; i++)
-      {
-        if (p[i].getQName().equals(portTypeName))
-        {
-          // wsdl4j available method call below implies that only 
-          // name+inputname+outputname uniquely defines operation! 
-          // Since we do not have <input> & <output> name information
-          // available in the config, use this instead for now: - 
-          // Get the first operation we find:
-          Iterator opIt = p[i].getOperations().iterator();
-          Operation op = null;
-          while (opIt.hasNext() && operation == null)
-          {
-            op = (Operation) opIt.next();
-            if (configOpName.equals(op.getName()))
-            {
-              operation = op;
-            }
-          }
-        }
-      }
-
-      if (operation == null)
-      {
-        throw new WSIException(
-          "No WSDL Operation named \'"
-            + wsdlElement.getQName()
-            + "\' found in service description");
-      }
-      else
-      {
-        this.operations = new Operation[] { operation };
-
-        descendents(operation);
-        //ancestors(operations);
-      }
-    }
-
-    else if (wsdlElement.isMessage())
-    {
-
-      Message message =
-        wsdlDocument.getDefinitions().getMessage(wsdlElement.getQName());
-      if (message == null)
-      {
-        throw new WSIException(
-          "No WSDL Message named \'"
-            + wsdlElement.getQName()
-            + "\' found in service description");
-      }
-      else
-      {
-        this.messages = new Message[] { message };
-
-        //ancestors(messages); 
-      }
-    }
-
-    else
-    {
-      throw new WSIException(
-        "Unrecognised <WSDLElement type> in config: " + wsdlElement.getType());
-    }
-
-    // get info about the effective service location (s)
-    //this.endPoints = deriveEndpoints(analyzerConfig, this.ports, this.definitions);
-    this.endPoints =
-      deriveEndpoints(serviceReference, this.ports, this.definitions);
-  }
-
-  /** 
-     * ancestor code is not used at present.
-     * 
-     */
-  /*   
-     protected void ancestors(Port[] ports) {
-     	// no ancestors of Port required (for now)
-     } 	    
-     protected void ancestors(Binding[] bindings) {	    
-    		// Ports from Bindings  1-2-1
-     	
-     	// *** cheat for now - get ports from all services in the wsdl doc
-     	// ADD: find correct mapping based on the supplied bindings
-     	Service[] service = wsdlDocument.getServices();
-     	HashSet set = new HashSet();
-  		for (int i=0; i>service.length; i++) {
-  			set.add(service[i].getPorts());  
-  		}
-  			
-  		// assign the parent group and process the grandparents if any								
-  		ancestors(this.ports = (Port[])set.toArray(this.ports = new Port[0]));
-     }
-     protected void ancestors(PortType[] portTypes) {	    
-    		// Bindings from PortTypes  1-2-1
-     	
-     	// add have to start with all bindings in doc and search for those
-     	// with the portType  
-     	HashSet set = new HashSet();
-  		for (int i=0; i>portTypes.length; i++) {
-  		// set.add(portTypes[i].get());  
-  		}
-  			
-  		// assign the parent group and process the grandparents if any								
-  		ancestors(this.bindings = (Binding[])set.toArray(this.bindings = new Binding[0]));
-     }
-     protected void ancestors(Operation[] operations) {	    
-    		// PortTypes from Operations  1-2-1
-     	  
-     	HashSet set = new HashSet();
-  		for (int i=0; i>operations.length; i++) {
-  			// set.add(operations[i].get());  
-  		}
-  			
-  		// assign the parent group and process the grandparents if any								
-  		ancestors(this.portTypes = (PortType[])set.toArray(this.portTypes = new PortType[0]));
-     }
-     protected void ancestors(Message[] messages) {	    
-    		// Operations from Messages  1-2-1
-     	// ADD fix it!  
-     	HashSet set = new HashSet();
-  		for (int i=0; i>messages.length; i++) {
-  			// set.add(messages[i].get());  
-  		}
-  			
-  		// assign the parent group 	
-  		this.portTypes = (PortType[])set.toArray(this.portTypes = new PortType[0]);
-     }
-  */
-
-  /**
-   * Descendant method for completing candidate service context creation.
-   * @param port  a Port object
-   * @throws WSIException if port is null.
-   */
-  protected void descendents(Port port) throws WSIException
-  {
-    // Binding from Port  1-2-1
-
-    if (port == null)
-    {
-      throw new WSIException("Internal error: expected a Port value");
-    }
-    else
-    {
-      this.bindings = new Binding[] { port.getBinding()};
-      if (this.bindings[0] != null)
-      {
-        /* Assign the child group and process the grandchildren if any.
-        * Null argument value passed into the following method would 
-        * suggest a WSDL definition inconsistency
-        * which will be picked up during Description Artifact TA testing.
-        */
-        descendents(this.bindings[0]);
-      }
-    }
-  }
-
-  /**
-   * Descendant method for completing candidate service context creation.
-   * @param binding  a Binding object
-   * @throws WSIException if binding is null.
-   */
-  protected void descendents(Binding binding) throws WSIException
-  {
-    // portType from Binding 1-2-1
-
-    if (binding == null)
-    {
-      throw new WSIException("Internal error: expected a Binding value");
-    }
-    else
-    {
-      this.portTypes = new PortType[] { binding.getPortType()};
-      if (this.portTypes[0] != null)
-      {
-        /* Assign the child group and process the grandchildren if any.
-        	* Null argument value passed into the following method would 
-        	* suggest a WSDL definition inconsistency
-        	* which will be picked up during Description Artifact TA testing.
-        	*/
-        descendents(this.portTypes[0]);
-
-        // Get any messages that are referenced from headers and headerfaults
-
-        // Get reference to definition
-        Definition definition = definitions[0];
-
-        // If there are messages already, then get them as a collection
-        HashSet messageSet = new HashSet();
-        if (messages != null)
-        {
-          for (int i = 0; i < messages.length; i++)
-          {
-            messageSet.add(messages[i]);
-          }
-        }
-
-        // Get the messages that are referenced only by a binding 
-        HashSet bindingMessages = WSDLUtils.findMessages(definition, binding);
-
-        // Add these messages to the complete message list  
-        messageSet.addAll(bindingMessages);
-
-        // Create array from message set
-        this.messages =
-          (Message[]) messageSet.toArray(this.messages = new Message[0]);
-      }
-    }
-  }
-
-  /**
-   * Descendant method for completing candidate service context creation.
-   * @param portType  a PortType object
-   * @throws WSIException if portType is null.
-   */
-  protected void descendents(PortType portType) throws WSIException
-  {
-    // Operations from PortType 1-2-n
-
-    if (portType == null)
-    {
-      throw new WSIException("Internal error: expected a PortType value");
-    }
-    else
-    {
-      this.operations =
-        (Operation[]) (portType
-          .getOperations()
-          .toArray(this.operations = new Operation[0]));
-      if (this.operations.length > 0)
-      {
-        descendents(this.operations);
-      }
-    }
-  }
-
-  /**
-     * Descendant method for completing candidate service context creation.
-     * @param operation  a Operation object
-     * @throws WSIException if operation is null.
-     */
-  protected void descendents(Operation operation) throws WSIException
-  {
-    // Messages from Operation
-
-    if (operation == null)
-    {
-      throw new WSIException("Internal error: expected an Operation value");
-    }
-    else
-    {
-      descendents(new Operation[] { operation });
-    }
-  }
-
-  /**
-   * Descendant method for completing candidate service context creation.
-   * @param operations  an array of operations.
-   * @throws WSIException if operations is null.
-   */
-  protected void descendents(Operation[] operations) throws WSIException
-  {
-    // Messages from Operations 1-2-n
-
-    if (operations == null)
-    {
-      throw new WSIException("Internal error: expected an Operation[] value");
-    }
-
-    HashSet set = new HashSet();
-    for (int i = 0; i < operations.length; i++)
-    {
-      if (operations[i].getInput() != null)
-        set.add(operations[i].getInput().getMessage()); //1-2-1
-      if (operations[i].getOutput() != null)
-        set.add(operations[i].getOutput().getMessage()); //1-2-1
-
-      // get messages associated with faults for this operation 
-      // 1-2-n
-      Iterator it = operations[i].getFaults().values().iterator();
-      while (it.hasNext())
-      {
-        set.add(((Fault) it.next()).getMessage());
-      }
-    }
-    this.messages = (Message[]) set.toArray(this.messages = new Message[0]);
-    // no descendents of messages so stop.
-  }
-
-  /**
-   * Provide a recursive non-repeating list of imports for the specified
-   * WSDL document definition.
-   */
-  /*   private HashSet getAllImports(Definition rootDef) throws WSIException {
-     	
-     	HashSet importSet = new HashSet();
-     	
-     	Collection importList =  rootDef.getImports().values();
-     	Iterator i = importList.iterator();
-     	
-     	while (i.hasNext()) {
-     		Import nextImport = (Import)(i.next());
-     		if (nextImport != null) {
-     			// its a wsdl document
-     			importSet.addAll(getAllImports(nextImport.getDefinition()));
-     		}   			
-     	}
-     	
-     	return (importSet);
-     }
-   */
-  private HashSet getAllImports(Definition rootDef) throws WSIException
-  {
-
-    HashSet importSet = new HashSet();
-
-    Map importMap = rootDef.getImports();
-    Iterator i = importMap.values().iterator();
-
-    while (i.hasNext())
-    {
-      List nextImportList = (List) (i.next());
-      Iterator listIt = nextImportList.iterator();
-      while (listIt.hasNext())
-      {
-        Import nextImport = (Import) listIt.next();
-        if (nextImport != null)
-        {
-          // its a wsdl document
-          importSet.add(nextImport);
-          if (nextImport.getDefinition() != null)
-          {
-            HashSet subTreeImports = getAllImports(nextImport.getDefinition());
-            Iterator subIt = subTreeImports.iterator();
-            while (subIt.hasNext())
-            {
-              importSet.add((Import) (subIt.next()));
-            }
-          }
-        }
-      }
-    }
-
-    return (importSet);
-  }
-
-  /**
-   * get all service location endpoint values
-   * relevant to the service under test.
-   * 
-   * If the service location is specified in the config we use
-   * just that.
-   * Otherwise, if the port is specified, we get all endpoints
-   * associated with that port.
-   * If we have neither the service location value or the port,
-   * then all endpoints in the definition are used.
-   */
-  private URI[] deriveEndpoints(
-  //AnalyzerConfig analyzerConfig, 
-  ServiceReference serviceReference, Port[] ports, Definition[] definitions)
-  {
-
-    URI[] endp = null;
-    //Port port = null;	
-    try
-    {
-      String serviceLocation = null;
-      // try service location...
-      //if ((serviceLocation = analyzerConfig.getServiceLocation()) != null) {      
-      if ((serviceLocation = serviceReference.getServiceLocation()) != null)
-      {
-        endp = new URI[] { new URI(serviceLocation)};
-      }
-      //else if (analyzerConfig.getWSDLElement().isPort()) {
-      else if (serviceReference.getWSDLElement().isPort())
-      {
-        if (ports.length != 1)
-        {
-          throw new WSIException("Internal error - expected 1-element Port array");
-        }
-        //else {
-        //	port = ports[0]; // if Port was given in config, there is just one
-        //}
-        //QName soapAddress = new QName(WSIConstants.NS_URI_WSDL_SOAP, "address");
-        Iterator i = ports[0].getExtensibilityElements().iterator();
-        while (i.hasNext() && serviceLocation == null)
-        {
-          ExtensibilityElement extElem = (ExtensibilityElement) i.next();
-          if (extElem instanceof SOAPAddress)
-          {
-            //if (extEl.getElementType().equals(soapAddress) {
-            // this element is our SOAPAddress - get the location
-            serviceLocation = ((SOAPAddress) extElem).getLocationURI();
-            endp = new URI[] { new URI(serviceLocation)};
-          }
-        }
-      }
-      else
-      { // no port info from config, so supply all in document
-        // QName soapAddress = new QName(WSIConstants.NS_URI_WSDL_SOAP, "address");
-        HashSet endpointSet = new HashSet();
-        Iterator i = definitions[0].getExtensibilityElements().iterator();
-        while (i.hasNext())
-        {
-          ExtensibilityElement extElem = (ExtensibilityElement) i.next();
-          if (extElem instanceof SOAPAddress)
-          {
-            //if (extEl.getElementType().equals(soapAddress) {
-            // this element is our SOAPAddress - get the location
-            endpointSet.add(((SOAPAddress) extElem).getLocationURI());
-          }
-        }
-        // Convert the derived List to a URI array
-        endp = (URI[]) endpointSet.toArray(endp = new URI[0]);
-      }
-    }
-    catch (Exception e)
-    {
-    }
-    return endp;
-  }
-
-  /**
-   * Returns the binding.
-   * @return Binding
-   */
-  public Binding[] getBindings()
-  {
-    return bindings;
-  }
-
-  /**
-   * Returns the endPoints.
-   * @return URI[]
-   */
-  public URI[] getEndPoints()
-  {
-    // get list of matching endpoint(s) associated with service.
-    return endPoints;
-  }
-
-  /**
-  * Returns the endPoints matching the specified host and port.
-  * @param hostAndPort  host and port location.
-  * @return URI[] if matched, null otherwise.
-  */
-  public URI[] getEndPoints(String hostAndPort)
-  {
-    // get list of matching endpoints associated with service,
-    // having the specified host and port configuration
-    String port;
-
-    Vector matchedEndpoints = new Vector();
-    for (int i = 0; i < endPoints.length; i++)
-    {
-      // PB: If the endpoint does not contain a port number, then default it to "80"
-      port =
-        (endPoints[i].getPort() == -1)
-          ? "80"
-          : String.valueOf(endPoints[i].getPort());
-      if (hostAndPort.equals(endPoints[i].getHost() + ":" + port))
-      {
-        matchedEndpoints.add(endPoints[i]);
-      }
-    }
-    return (URI[]) matchedEndpoints.toArray(new URI[0]);
-  }
-
-  /**
-   * Returns the operation.
-   * @return Operation
-   */
-  public Operation[] getOperations()
-  {
-    return operations;
-  }
-
-  /**
-   * Returns the portType.
-   * @return PortType
-   */
-  public PortType[] getPortType()
-  {
-    return portTypes;
-  }
-
-  /**
-   * Returns true if the hostAndPort matches at least one context endpoint.
-   * @param hostAndPortString a host and port location.
-   * @return true if the hostAndPort matches at least one context endpoint.
-   * @throws WSIException if given hostandPort String does not convert to URI.
-   */
-  public boolean hasHostAndPort(String hostAndPortString) throws WSIException
-  {
-    URI hostAndPort;
-    try
-    {
-      hostAndPort = new URI(hostAndPortString);
-    }
-    catch (Exception e)
-    {
-      throw new WSIException(
-        "Could not convert string to URI: " + hostAndPortString);
-    }
-    String host = hostAndPort.getHost();
-    int port = hostAndPort.getPort();
-    for (int i = 0; i < this.endPoints.length; i++)
-    {
-      if (this.endPoints[i].getHost().equals(host)
-        && this.endPoints[i].getPort() == port)
-      {
-        return true;
-      }
-    }
-    return false; // for now
-  }
-
-  /**
-   * Returns the definitions.
-   * @return Definition[]
-   */
-  public Definition[] getDefinitions()
-  {
-    return definitions;
-  }
-
-  /**
-   * Returns the imports.
-   * @return Import[]
-   */
-  public Import[] getImports()
-  {
-    return imports;
-  }
-
-  /**
-   * Returns the messages.
-   * @return Message[]
-   */
-  public Message[] getMessages()
-  {
-    return messages;
-  }
-
-  /**
-   * Returns the ports.
-   * @return Port[]
-   */
-  public Port[] getPorts()
-  {
-    return ports;
-  }
-
-  /**
-   * Returns the portTypes.
-   * @return PortType[]
-   */
-  public PortType[] getPortTypes()
-  {
-    return portTypes;
-  }
-
-  /**
-   * Returns the types.
-   * @return Types[]
-   */
-  public Types[] getTypes()
-  {
-    return types;
-  }
-  /**
-   * Returns the wsdlDocument.
-   * @return WSDLDocument
-   */
-  public WSDLDocument getWsdlDocument()
-  {
-    return wsdlDocument;
-  }
-
-  /**
-   * Return the definition element that contains the types element.
-   * @param types a Types object.
-   * @return the definition element that contains the types element.
-   */
-  public Definition getDefinition(Types types)
-  {
-    Definition definition = null;
-    Types checkTypes;
-
-    for (int i = 0; i < definitions.length && definition == null; i++)
-    {
-      if (((checkTypes = definitions[i].getTypes()) != null)
-        && (checkTypes.equals(types)))
-      {
-        definition = definitions[i];
-      }
-    }
-
-    return definition;
-  }
-
-  /**
-   * Return the definition element that contains the binding element.
-   * @param binding a Binding object.
-   * @return the definition element that contains the binding element.
-   */
-  public Definition getDefinition(Binding binding)
-  {
-    Definition definition = null;
-
-    for (int i = 0; i < definitions.length && definition == null; i++)
-    {
-      if (definitions[i].getBinding(binding.getQName()) != null)
-        definition = definitions[i];
-    }
-
-    return definition;
-  }
-
-  /**
-   * Return the definition element that contains the portType element.
-   * @param portType a PortType object.
-   * @return the definition element that contains the portType element.
-   */
-  public Definition getDefinition(PortType portType)
-  {
-    Definition definition = null;
-
-    for (int i = 0; i < definitions.length && definition == null; i++)
-    {
-      if (definitions[i].getPortType(portType.getQName()) != null)
-        definition = definitions[i];
-    }
-
-    return definition;
-  }
-
-  /**
-   * Return the definition element that contains the message.
-   * @param message a Message object.
-   * @return the definition element that contains the message.
-   */
-  public Definition getDefinition(Message message)
-  {
-    Definition definition = null;
-
-    for (int i = 0; i < definitions.length && definition == null; i++)
-    {
-      if (definitions[i].getMessage(message.getQName()) != null)
-        definition = definitions[i];
-    }
-
-    return definition;
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/EnvironmentInfo.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/EnvironmentInfo.java
deleted file mode 100644
index 3f3eb4d1c..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/EnvironmentInfo.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.analyzer;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.util.XMLInfo;
-
-/**
- * This class maintains the Environment information.
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public class EnvironmentInfo implements XMLInfo
-{
-  /**
-   * Log timestamp.
-   */
-  protected String logTimestamp = null;
-
-  /**
-   * Monitor config comment.
-   */
-  protected String monitorConfigComment = null;
-
-  /**
-   * Create object.
-   * @param logTimestamp the log timestamp.
-   * @param monitorConfigComment the Monitor config comment.
-   */
-  public EnvironmentInfo(String logTimestamp, String monitorConfigComment)
-  {
-    this.logTimestamp = logTimestamp;
-    this.monitorConfigComment = monitorConfigComment;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.util.XMLInfo#toXMLString(String)
-   */
-  public String toXMLString(String namespaceName)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    String nsName = namespaceName;
-    if (!nsName.equals(""))
-      nsName += ":";
-
-    // Start element
-    pw.print("      <" + nsName + WSIConstants.ELEM_LOG + " ");
-    pw.println(
-      WSIConstants.ATTR_TIMESTAMP + "=\"" + this.logTimestamp + "\"/>");
-
-    pw.print(
-      "        <"
-        + WSIConstants.NS_NAME_WSI_LOG
-        + WSIConstants.ELEM_COMMENT
-        + ">");
-    pw.print(this.monitorConfigComment);
-    pw.println(
-      "        </"
-        + WSIConstants.NS_NAME_WSI_LOG
-        + WSIConstants.ELEM_COMMENT
-        + ">");
-
-    // End element
-    pw.println("    </" + nsName + WSIConstants.ELEM_LOG + ">");
-
-    return sw.toString();
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/ServiceReference.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/ServiceReference.java
deleted file mode 100644
index 773e484ff..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/analyzer/config/AnalyzerConfig.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/config/AnalyzerConfig.java
deleted file mode 100644
index 14a219943..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/analyzer/config/AnalyzerConfigReader.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/config/AnalyzerConfigReader.java
deleted file mode 100644
index 7c364fb4e..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/config/AnalyzerConfigReader.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.analyzer.config;
-
-import java.io.Reader;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.document.DocumentReader;
-import org.eclipse.wst.wsi.internal.core.util.MessageList;
-
-
-/**
- * Defines the interface used to read the analyzer config documents.
- * 
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public interface AnalyzerConfigReader extends DocumentReader {
-
-  /**
-   * Initialize analyzer config reader.
-   * @param messageList a MessageList object.
-   */
-  public void init(MessageList messageList);
-  
-  /**
-   * Read the analyzer config file.
-   * @param analyzerConfigURI the analyzer config file location.
-   * @return the AnalyzerConfig object.
-   * @throws WSIException if unable to read the analyzer config file.
-   */
-  public AnalyzerConfig readAnalyzerConfig(String analyzerConfigURI) throws WSIException;
-  
-  /**
-   * Read the analyzer config file.
-   * @param reader a Reader object.
-   * @return the AnalyzerConfig object.
-   * @throws WSIException if unable to parse the analyzer config file.
-   */
-  public AnalyzerConfig readAnalyzerConfig(Reader reader) throws WSIException;
-}
-
-
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/config/AssertionResultType.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/config/AssertionResultType.java
deleted file mode 100644
index 020c9d136..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/analyzer/config/AssertionResultsOption.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/config/AssertionResultsOption.java
deleted file mode 100644
index 34ed56f14..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/analyzer/config/UDDIReference.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/config/UDDIReference.java
deleted file mode 100644
index 2a3bcd215..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/config/UDDIReference.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.analyzer.config;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.document.DocumentElement;
-
-/**
- * The interface for a reference to a discovery artifact.  
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public interface UDDIReference extends DocumentElement
-{
-  /**
-   * Element name.
-   */
-  public static final String ELEM_NAME = WSIConstants.ELEM_UDDI_REFERENCE;
-
-  /**
-   * QName.
-   */
-  public static final QName QNAME =
-    new QName(WSIConstants.NS_URI_WSI_ANALYZER_CONFIG, ELEM_NAME);
-
-  /**
-   * UDDI key type: bindingKey.
-   */
-  public static final String BINDING_KEY = "bindingKey";
-
-  /**
-   * UDDI key type: tModelKey.
-   */
-  public static final String TMODEL_KEY = "tModelKey";
-
-  /**
-   * Get UDDI  key type.
-   * @return UDDI  key type.
-   * @see #setKeyType
-   */
-  public String getKeyType();
-
-  /**
-   * Set UDDI key type.
-   * @param keyType UDDI key type.
-   * @see #getKeyType
-   */
-  public void setKeyType(String keyType);
-
-  /**
-   * Get UDDI key.
-   * @return UDDI key.
-   * @see #setKey
-   */
-  public String getKey();
-
-  /**
-   * Set UDDI key.
-   * @param key UDDI key.
-   * @see #getKey
-   */
-  public void setKey(String key);
-
-  /**
-   * Get UDDI inquiry URL.
-   * @return UDDI inquiry URL.
-   * @see #setInquiryURL
-   */
-  public String getInquiryURL();
-
-  /**
-   * Set UDDI inquiryURL.
-   * @param inquiryURL UDDI inquiryURL.
-   * @see #getInquiryURL
-   */
-  public void setInquiryURL(String inquiryURL);
-
-  /**
-   * Get WSDL element.
-   * @return WSDL element.
-   * @see #setWSDLElement
-   */
-  public WSDLElement getWSDLElement();
-
-  /**
-   * Set WSDL element.
-   * @param wsdlElement WSDL element.
-   * @see #getWSDLElement
-   */
-  public void setWSDLElement(WSDLElement wsdlElement);
-
-  /**
-   * Get service location.
-   * @return service location.
-   * @see #setServiceLocation
-   */
-  public String getServiceLocation();
-
-  /**
-   * Set service location.
-   * @param serviceLocation service location.
-   * @see #getServiceLocation
-   */
-  public void setServiceLocation(String serviceLocation);
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/config/WSDLElement.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/config/WSDLElement.java
deleted file mode 100644
index 2be33e22c..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/config/WSDLElement.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.analyzer.config;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.document.DocumentElement;
-
-/**
- * The base interface for WSDL definitions. 
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public interface WSDLElement extends DocumentElement
-{
-  /**
-   * Element name.
-   */
-  public static final String ELEM_NAME = WSIConstants.ELEM_WSDL_ELEMENT;
-
-  /**
-   * QName.
-   */
-  public static final QName QNAME =
-    new QName(WSIConstants.NS_URI_WSI_ANALYZER_CONFIG, ELEM_NAME);
-
-  /**
-   * Get WSDL element type.
-   * @return WSDL element type.
-   * @see #setType
-   */
-  public String getType();
-
-  /**
-   * Set WSDL element type.
-   * @param type WSDL element type.
-   * @see #getType
-   */
-  public void setType(String type);
-
-  /**
-   * Get WSDL element namespace.
-   * @return WSDL element namespace.
-   * @see #setNamespace
-   */
-  public String getNamespace();
-
-  /**
-   * Set WSDL element namespace.
-   * @param namespace WSDL element namespace.
-   * @see #getNamespace
-   */
-  public void setNamespace(String namespace);
-
-  /**
-   * Get WSDL element name.
-   * @return WSDL element name.
-   * @see #setName
-   */
-  public String getName();
-
-  /**
-   * Set WSDL element name.
-   * @param name WSDL element name.
-   * @see #getName
-   */
-  public void setName(String name);
-
-  /**
-   * Get WSDL element qualified name.
-   * @return WSDL element qualified name.
-   */
-  public QName getQName();
-
-  /**
-   * Get WSDL parent element name.
-   * @return WSDL parent element name.
-   * @see #setParentElementName
-   * 
-   */
-  public String getParentElementName();
-
-  /**
-   * Set WSDL parent element name.
-   * @param parentElementName WSDL parent element name.
-   * @see #getParentElementName
-   */
-  public void setParentElementName(String parentElementName);
-
-  /**
-   * Get WSDL parent element QName.
-   * @return WSDL parent element QName.
-   */
-  public QName getParentElementQName();
-
-  /**
-   * Is port element.
-   * @return true if the element is a port.
-   */
-  public boolean isPort();
-
-  /**
-   * Is binding element.
-   * @return true if the lement is a binding.
-   */
-  public boolean isBinding();
-
-  /**
-   * Is portType element.
-   * @return true if element is a port type.
-   */
-  public boolean isPortType();
-
-  /**
-   * Is operation element.
-   * @return true if the element is an operation.
-   */
-  public boolean isOperation();
-
-  /**
-   * Is message element.
-   * @return true if element is a message.
-   */
-  public boolean isMessage();
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/config/WSDLReference.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/config/WSDLReference.java
deleted file mode 100644
index ec550c249..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/config/WSDLReference.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.analyzer.config;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.document.DocumentElement;
-
-/**
- * The interface for a reference to a description artifact.  
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public interface WSDLReference extends DocumentElement
-{
-  /**
-   * Element name.
-   */
-  public static final String ELEM_NAME = WSIConstants.ELEM_WSDL_REFERENCE;
-
-  /**
-   * QName.
-   */
-  public static final QName QNAME =
-    new QName(WSIConstants.NS_URI_WSI_ANALYZER_CONFIG, ELEM_NAME);
-
-  /**
-   * Get WSDL element.
-   * @return WSDL element.
-   * @see #setWSDLElement
-   */
-  public WSDLElement getWSDLElement();
-
-  /**
-   * Set WSDL element.
-   * @param wsdlElement WSDL element.
-   * @see #getWSDLElement
-   */
-  public void setWSDLElement(WSDLElement wsdlElement);
-
-  /**
-   * Get WSDL location.
-   * @return WSDL location.
-   * @see #setWSDLLocation
-   */
-  public String getWSDLLocation();
-
-  /**
-   * Set WSDL location.
-   * @param wsdlLocation WSDL location.
-   * @see #getWSDLLocation
-   */
-  public void setWSDLLocation(String wsdlLocation);
-
-  /**
-   * Get service location.
-   * @return service location.
-   * @see #setServiceLocation
-   */
-  public String getServiceLocation();
-
-  /**
-   * Set service location.
-   * @param serviceLocation service location.
-   * @see #getServiceLocation
-   */
-  public void setServiceLocation(String serviceLocation);
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/AnalyzerConfigImpl.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/AnalyzerConfigImpl.java
deleted file mode 100644
index 95ee74a0d..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/AnalyzerConfigImpl.java
+++ /dev/null
@@ -1,1060 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.analyzer.config.impl;
-
-import java.io.File;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.Analyzer;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.AnalyzerConfig;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.AnalyzerConfigReader;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.AssertionResultType;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.AssertionResultsOption;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.UDDIReference;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLElement;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLReference;
-import org.eclipse.wst.wsi.internal.core.common.AddStyleSheet;
-import org.eclipse.wst.wsi.internal.core.common.impl.AddStyleSheetImpl;
-import org.eclipse.wst.wsi.internal.core.util.MessageList;
-import org.eclipse.wst.wsi.internal.core.util.Utils;
-
-/**
- * This class is an implementation of the analyzer configuration file interface.
- * 
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public class AnalyzerConfigImpl implements AnalyzerConfig
-{
-  /**
-   * Message list reference.
-   */
-  protected MessageList messageList = null;
-
-  /**
-   * Analyzer configuration file URI.
-   */
-  protected String configURI = null;
-
-  /**
-   * Optional description.
-   */
-  protected String description = null;
-
-  /**
-   * Verbose option.
-   */
-  protected boolean verbose = false;
-
-  /**
-   * Assertion results option.
-   */
-  protected AssertionResultsOption assertionResultsOption =
-    new AssertionResultsOptionImpl();
-
-  /**
-   * Report location.
-   */
-  protected String reportURI = WSIConstants.DEFAULT_REPORT_URI;
-
-  /**
-   * Replace report indicator.
-   */
-  protected boolean replaceReport = false;
-
-  /**
-   * Add style sheet.
-   */
-  protected AddStyleSheet addStyleSheet;
-
-  /**
-   * Profile test assertions document location.
-   */
-  protected String testAssertionsDocumentURI =
-    WSIConstants.DEFAULT_TEST_ASSERTIONS_DOCUMENT_URI;
-
-  /**
-   * Message log location.
-   */
-  protected String logURI = null;
-
-  /**
-   * Message correlation type.
-   */
-  protected String correlationType =
-    WSIConstants.ATTRVAL_CORRELATION_TYPE_OPERATION;
-
-  /**
-   * WSDL reference.
-   */
-  protected WSDLReference wsdlReference = null;
-
-  /**
-   * UDDI reference.
-   */
-  protected UDDIReference uddiReference = null;
-
-  /**
-   * Default constructor.
-   */
-  public AnalyzerConfigImpl()
-  {
-  }
-
-  /**
-   * Constructor with all settings.
-   * @param description                an optional description.
-   * @param verbose                    the verbose option.
-   * @param assertionResultsOption     an assertion results option.
-   * @param reportURI                  report location.
-   * @param replaceReport              a replace report indicator.
-   * @param addStyleSheet              add style sheet.
-   * @param testAssertionsDocumentURI  profile test assertions document location.
-   * @param logURI                     message log location.
-   * @param correlationType            message correlation type.
-   * @param wsdlReference              a WSDL reference..
-   * @param uddiReference              a UUDDI reference.
-   */
-  public AnalyzerConfigImpl(
-    String description,
-    boolean verbose,
-    AssertionResultsOption assertionResultsOption,
-    String reportURI,
-    boolean replaceReport,
-    AddStyleSheet addStyleSheet,
-    String testAssertionsDocumentURI,
-    String logURI,
-    String correlationType,
-    WSDLReference wsdlReference,
-    UDDIReference uddiReference)
-  {
-    this.description = description;
-    this.verbose = verbose;
-    this.assertionResultsOption = assertionResultsOption;
-    this.reportURI = reportURI;
-    this.replaceReport = replaceReport;
-    this.addStyleSheet = addStyleSheet;
-    this.testAssertionsDocumentURI = testAssertionsDocumentURI;
-    this.logURI = logURI;
-    this.correlationType = correlationType;
-    this.wsdlReference = wsdlReference;
-    this.uddiReference = uddiReference;
-  }
-
-  /**
-   * Initialize analyzer config.
-   */
-  public void init(MessageList messageList)
-  {
-    this.messageList = messageList;
-  }
-
-  /**
-   * Get optional description.
-   * @see #setDescription
-   */
-  public String getDescription()
-  {
-    return this.description;
-  }
-
-  /**
-   * Set optional description.
-   * @see #getDescription
-   */
-  public void setDescription(String description)
-  {
-    this.description = description;
-  }
-
-  /**
-   * @see #setVerboseOption
-   */
-  public boolean getVerboseOption()
-  {
-    return this.verbose;
-  }
-
-  /**
-   * @see #getVerboseOption
-   */
-  public void setVerboseOption(boolean verbose)
-  {
-    this.verbose = verbose;
-  }
-
-  /**
-   * Get assertion results option.
-   * @see #setAssertionResultsOption
-   */
-  public AssertionResultsOption getAssertionResultsOption()
-  {
-    return this.assertionResultsOption;
-  }
-
-  /**
-   * Set assertion results option.
-   * @see #getAssertionResultsOption
-   */
-  public void setAssertionResultsOption(AssertionResultsOption assertionResultsOption)
-  {
-    this.assertionResultsOption = assertionResultsOption;
-  }
-
-  /**
-   * @see #setReportLocation
-   */
-  public String getReportLocation()
-  {
-    return this.reportURI;
-  }
-
-  /**
-   * @see #getReportLocation
-   */
-  public void setReportLocation(String reportURI)
-  {
-    this.reportURI = reportURI;
-  }
-
-  /**
-   * Get replace report file option.
-   * @see #setReplaceReport
-   */
-  public boolean getReplaceReport()
-  {
-    return this.replaceReport;
-  }
-
-  /**
-   * Set report file location.
-   * @see #getReplaceReport
-   */
-  public void setReplaceReport(boolean replaceReport)
-  {
-    this.replaceReport = replaceReport;
-  }
-
-  /**
-   * Get add style sheet.
-   * @see #setAddStyleSheet
-   */
-  public AddStyleSheet getAddStyleSheet()
-  {
-    return this.addStyleSheet;
-  }
-
-  /**
-   * Set replace report file option.
-   * @see #getAddStyleSheet
-   */
-  public void setAddStyleSheet(AddStyleSheet addStyleSheet)
-  {
-    this.addStyleSheet = addStyleSheet;
-  }
-
-  /**
-   * @see #setTestAssertionDocumentLocation
-   */
-  public String getTestAssertionsDocumentLocation()
-  {
-    return this.testAssertionsDocumentURI;
-  }
-
-  /**
-   * @see #getTestAssertionDocumentLocation
-   */
-  public void setTestAssertionsDocumentLocation(String testAssertionsDocumentURI)
-  {
-    this.testAssertionsDocumentURI = testAssertionsDocumentURI;
-  }
-
-  /**
-   * @see #setLogLocation
-   */
-  public String getLogLocation()
-  {
-    return logURI;
-  }
-
-  /**
-   * @see #getLogLocation
-   */
-  public void setLogLocation(String logURI)
-  {
-    this.logURI = logURI;
-  }
-
-  public boolean isLogSet()
-  {
-    return (logURI != null);
-  }
-
-  /**
-   * Get correlation type.
-   * @see #setCorrelationType
-   */
-  public String getCorrelationType()
-  {
-    return this.correlationType;
-  }
-
-  /**
-   * Set correlation type.
-   * @see #getCorrelationType
-   * 
-   */
-  public void setCorrelationType(String correlationType)
-  {
-    this.correlationType = correlationType;
-  }
-
-  /**
-   * Is WSDL reference set.
-   */
-  public boolean isWSDLReferenceSet()
-  {
-    return (this.wsdlReference == null ? false : true);
-  }
-
-  /**
-   * Get WSDL reference.
-   * @see #setWSDLReference
-   */
-  public WSDLReference getWSDLReference()
-  {
-    return this.wsdlReference;
-  }
-
-  /**
-   * Set WSDL reference.
-   * @see #getWSDLReference
-   */
-  public void setWSDLReference(WSDLReference wsdlReference)
-  {
-    this.wsdlReference = wsdlReference;
-  }
-
-  /**
-   * Get WSDL element.
-   * 
-   */
-  public WSDLElement getWSDLElement()
-  {
-    return (this.wsdlReference == null)
-      ? null
-      : this.wsdlReference.getWSDLElement();
-  }
-
-  /**
-   * Get service location.
-   */
-  public String getServiceLocation()
-  {
-    return (this.wsdlReference == null)
-      ? null
-      : this.wsdlReference.getServiceLocation();
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.analyzer.config.AnalyzerConfig#getWSDLLocation()
-   */
-  public String getWSDLLocation()
-  {
-    return (this.wsdlReference == null)
-      ? null
-      : this.wsdlReference.getWSDLLocation();
-  }
-
-  /**
-   * @see org.wsi.test.analyzer.config.AnalyzerConfig#isUddiReferenceSet)
-   */
-  public boolean isUDDIReferenceSet()
-  {
-    return (this.uddiReference == null ? false : true);
-  }
-
-  /**
-   * Get UDDI reference.
-   * @see #setUDDIReference
-   */
-  public UDDIReference getUDDIReference()
-  {
-    return this.uddiReference;
-  }
-
-  /**
-   * Set UDDI reference.
-   * @see #getUDDIReference
-   */
-  public void setUDDIReference(UDDIReference uddiReference)
-  {
-    this.uddiReference = uddiReference;
-  }
-
-  /**
-   * @see #setLocation
-   */
-  public String getLocation()
-  {
-    return configURI;
-  }
-
-  /**
-   * @see getLocation
-   */
-  public void setLocation(String configURI)
-  {
-    this.configURI = configURI;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.document.WSIDocument#toXMLString()
-   */
-  public String toXMLString(String namespaceName)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    String nsName = namespaceName;
-    if ((!nsName.equals("") && (!nsName.endsWith(":"))))
-      nsName += ":";
-
-    // Start element
-    pw.println("    <" + nsName + ELEM_NAME + ">");
-
-    // Verbose option
-    pw.print("      <" + nsName + WSIConstants.ELEM_VERBOSE + ">");
-    pw.print(getVerboseOption());
-    pw.println("</" + nsName + WSIConstants.ELEM_VERBOSE + ">");
-
-    // Get assertion results option
-    pw.print(assertionResultsOption.toXMLString(nsName));
-
-    // report file
-    pw.print("        <" + nsName + WSIConstants.ELEM_REPORT_FILE + " ");
-    pw.print(WSIConstants.ATTR_REPLACE + "=\"" + getReplaceReport() + "\" ");
-    pw.println(
-      WSIConstants.ATTR_LOCATION + "=\"" + getReportLocation() + "\">");
-    pw.print(getAddStyleSheet().toXMLString(namespaceName));
-    pw.println("        </" + nsName + WSIConstants.ELEM_REPORT_FILE + ">");
-
-    // test assertion file
-    pw.print(
-      "        <" + nsName + WSIConstants.ELEM_TEST_ASSERTIONS_FILE + ">");
-    pw.print(getTestAssertionsDocumentLocation());
-    pw.println("</" + nsName + WSIConstants.ELEM_TEST_ASSERTIONS_FILE + ">");
-
-    // log file
-    pw.print("        <" + nsName + WSIConstants.ELEM_LOG_FILE);
-    pw.print(
-      " "
-        + WSIConstants.ATTR_CORRELATION_TYPE
-        + "=\""
-        + this.correlationType
-        + "\">");
-    pw.print(getLogLocation());
-    pw.println("</" + nsName + WSIConstants.ELEM_LOG_FILE + ">");
-
-    // WSDL reference 
-    if (this.wsdlReference != null)
-    {
-      pw.print(getWSDLReference().toXMLString(nsName));
-    }
-
-    // UDDI Reference
-    if (this.uddiReference != null)
-    {
-      pw.print(getUDDIReference().toXMLString(nsName));
-    }
-
-    // End element
-    pw.println("    </" + nsName + ELEM_NAME + ">");
-
-    return sw.toString();
-  }
-
-  /**
-   * Get string representation of this object.
-   */
-  public String toString()
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    // verbose option
-    pw.println("  verbose .................... " + this.verbose);
-
-    // assertionResults options
-    pw.print(this.assertionResultsOption.toString());
-
-    // reportFile options
-    pw.println("  Report File:");
-    pw.println("    replace .................. " + this.replaceReport);
-    pw.println("    location ................. " + this.reportURI);
-    if (this.addStyleSheet != null)
-    {
-      pw.println("    Style Sheet:");
-      if (this.addStyleSheet.getHref() != null)
-        pw.println(
-          "      href ................... " + this.addStyleSheet.getHref());
-      if (this.addStyleSheet.getType() != null)
-        pw.println(
-          "      type ................... " + this.addStyleSheet.getType());
-      if (this.addStyleSheet.getTitle() != null)
-        pw.println(
-          "      title .................. " + this.addStyleSheet.getTitle());
-      if (this.addStyleSheet.getMedia() != null)
-        pw.println(
-          "      media .................. " + this.addStyleSheet.getMedia());
-      if (this.addStyleSheet.getCharset() != null)
-        pw.println(
-          "      charset ................ " + this.addStyleSheet.getCharset());
-      if (this.addStyleSheet.getAlternate() != null)
-        pw.println(
-          "      alternate .............. "
-            + this.addStyleSheet.getAlternate());
-    }
-
-    // testAssertionsFile parameter
-    pw.println(
-      "  testAssertionsFile ......... " + this.testAssertionsDocumentURI);
-
-    // logFile options
-    if (this.logURI != null)
-    {
-      pw.println("  Message Log File:");
-      pw.println("    location ................. " + this.logURI);
-      pw.println("    correlationType .......... " + this.correlationType);
-    }
-
-    // wsdlReference options   
-    if (this.isWSDLReferenceSet())
-    {
-      pw.print(this.wsdlReference.toString());
-    }
-
-    // uddiReference options
-    if (this.isUDDIReferenceSet())
-    {
-      pw.print(this.uddiReference.toString());
-    }
-
-    // description parameter
-    if (this.description != null)
-    {
-      pw.println("  description ................ " + this.description);
-    }
-
-    return sw.toString();
-  }
-
-  /**
-   * Set config values from another analyzer config object.
-   */
-  private void setConfig(AnalyzerConfig analyzerConfig)
-  {
-    this.configURI = analyzerConfig.getLocation();
-    this.description = analyzerConfig.getDescription();
-    this.verbose = analyzerConfig.getVerboseOption();
-    this.assertionResultsOption = analyzerConfig.getAssertionResultsOption();
-    this.reportURI = analyzerConfig.getReportLocation();
-    this.replaceReport = analyzerConfig.getReplaceReport();
-    this.logURI = analyzerConfig.getLogLocation();
-    this.correlationType = analyzerConfig.getCorrelationType();
-    this.testAssertionsDocumentURI =
-      analyzerConfig.getTestAssertionsDocumentLocation();
-    this.addStyleSheet = analyzerConfig.getAddStyleSheet();
-    this.wsdlReference = analyzerConfig.getWSDLReference();
-    this.uddiReference = analyzerConfig.getUDDIReference();
-  }
-
-  /**
-   * Parse command line arguments.
-   */
-  public void parseArgs(String[] args, boolean validate) throws WSIException
-  {
-    WSDLReference wsdlReference = null;
-    UDDIReference uddiReference = null;
-
-    // Get new config reader
-    AnalyzerConfigReader analyzerConfigReader = new AnalyzerConfigReaderImpl();
-    analyzerConfigReader.init(this.messageList);
-
-    // Analyzer config object which will be merged after all of the input parms are processed
-    AnalyzerConfig analyzerConfigFromArgs = null;
-
-    // Assertion results option
-    AssertionResultsOption assertionResultsOption = null;
-
-    // If no input arguments, then throw exception
-    if (args.length == 0)
-    {
-      // ADD: 
-      throw new IllegalArgumentException(
-        getMessage("usage01", Analyzer.USAGE_MESSAGE));
-    }
-
-    // Parse the command line arguments to locate the config file option (if it was specified)
-    for (int argCount = 0; argCount < args.length; argCount++)
-    {
-      // -config
-      if ((args[argCount].equalsIgnoreCase("-config"))
-        || (args[argCount].equals("-c")))
-      {
-        argCount++;
-        analyzerConfigFromArgs =
-          analyzerConfigReader.readAnalyzerConfig(
-            getOptionValue(args, argCount));
-      }
-    }
-
-    // If config file was not specified, then create analyzer config object
-    if (analyzerConfigFromArgs == null)
-    {
-      analyzerConfigFromArgs = new AnalyzerConfigImpl();
-      analyzerConfigFromArgs.init(this.messageList);
-    }
-
-    // Get assertion results option
-    if ((assertionResultsOption =
-      analyzerConfigFromArgs.getAssertionResultsOption())
-      == null)
-    {
-      assertionResultsOption = new AssertionResultsOptionImpl();
-      analyzerConfigFromArgs.setAssertionResultsOption(assertionResultsOption);
-    }
-
-    // Parse all of the command line arguments
-    for (int argCount = 0; argCount < args.length; argCount++)
-    {
-      // -config
-      if ((args[argCount].equalsIgnoreCase("-config"))
-        || (args[argCount].equals("-c")))
-      {
-        // Skip this option since it was already processed
-        argCount++;
-      }
-
-      // -verbose
-      else if (
-        (args[argCount].equalsIgnoreCase("-verbose"))
-          || (args[argCount].equals("-v")))
-      {
-        argCount++;
-        analyzerConfigFromArgs.setVerboseOption(
-          Boolean.valueOf(getOptionValue(args, argCount)).booleanValue());
-      }
-
-      // -assertionResults
-      else if (
-        (args[argCount].equalsIgnoreCase("-assertionResults"))
-          || (args[argCount].equals("-a")))
-      {
-        argCount++;
-        assertionResultsOption.setAssertionResultType(
-          AssertionResultType.newInstance(getOptionValue(args, argCount)));
-      }
-
-      // -messageEntry
-      else if (
-        (args[argCount].equalsIgnoreCase("-messageEntry"))
-          || (args[argCount].equals("-M")))
-      {
-        argCount++;
-        assertionResultsOption.setShowMessageEntry(
-          Boolean.valueOf(getOptionValue(args, argCount)).booleanValue());
-      }
-
-      // -assertionDescription
-      else if (
-        (args[argCount].equalsIgnoreCase("-assertionDescription"))
-          || (args[argCount].equals("-A")))
-      {
-        argCount++;
-        assertionResultsOption.setShowAssertionDescription(
-          Boolean.valueOf(args[argCount]).booleanValue());
-      }
-
-      // -failureMessage
-      else if (
-        (args[argCount].equalsIgnoreCase("-failureMessage"))
-          || (args[argCount].equals("-F")))
-      {
-        argCount++;
-        assertionResultsOption.setShowFailureMessage(
-          Boolean.valueOf(getOptionValue(args, argCount)).booleanValue());
-      }
-
-      // -failureDetail
-      else if (
-        (args[argCount].equalsIgnoreCase("-failureDetail"))
-          || (args[argCount].equals("-D")))
-      {
-        argCount++;
-        assertionResultsOption.setShowFailureDetail(
-          Boolean.valueOf(getOptionValue(args, argCount)).booleanValue());
-      }
-
-      // -logFile
-      else if (
-        (args[argCount].equalsIgnoreCase("-logFile"))
-          || (args[argCount].equals("-l")))
-      {
-        argCount++;
-        analyzerConfigFromArgs.setLogLocation(getOptionValue(args, argCount));
-      }
-
-      // -testAssertionFile
-      else if (
-        (args[argCount].equalsIgnoreCase("-testAssertionFile"))
-          || (args[argCount].equals("-t")))
-      {
-        argCount++;
-        analyzerConfigFromArgs.setTestAssertionsDocumentLocation(
-          getOptionValue(args, argCount));
-      }
-
-      // -reportFile
-      else if (
-        (args[argCount].equalsIgnoreCase("-reportFile"))
-          || (args[argCount].equals("-r")))
-      {
-        argCount++;
-        analyzerConfigFromArgs.setReportLocation(
-          getOptionValue(args, argCount));
-      }
-
-      // -replace
-      else if (
-        (args[argCount].equalsIgnoreCase("-replace"))
-          || (args[argCount].equals("-R")))
-      {
-        argCount++;
-        analyzerConfigFromArgs.setReplaceReport(
-          Boolean.valueOf(getOptionValue(args, argCount)).booleanValue());
-      }
-
-      // -correlationType
-      else if (
-        (args[argCount].equalsIgnoreCase("-correlationType"))
-          || (args[argCount].equals("-C")))
-      {
-        argCount++;
-        analyzerConfigFromArgs.setCorrelationType(
-          getOptionValue(args, argCount));
-      }
-
-      // -wsdlElement
-      else if (
-        (args[argCount].equalsIgnoreCase("-wsdlElement"))
-          || (args[argCount].equals("-W")))
-      {
-        String optionName = args[argCount];
-        argCount++;
-
-        WSDLElement wsdlElement = new WSDLElementImpl();
-        wsdlElement.setName(getOptionValue(args, argCount, optionName));
-        argCount++;
-        wsdlElement.setType(getOptionValue(args, argCount, optionName));
-        argCount++;
-        wsdlElement.setNamespace(getOptionValue(args, argCount, optionName));
-        if (!args[argCount].startsWith("-"))
-        {
-          argCount++;
-          wsdlElement.setParentElementName(
-            getOptionValue(args, argCount, optionName));
-        }
-
-        if (wsdlReference != null)
-        {
-          wsdlReference.setWSDLElement(wsdlElement);
-        }
-        else if (uddiReference != null)
-        {
-          uddiReference.setWSDLElement(wsdlElement);
-        }
-        else
-        {
-          throw new IllegalArgumentException(
-            getMessage(
-              "config10",
-              "The -wsdlElement option must appear after the -wsdlURI or -uddiKey options."));
-        }
-
-        analyzerConfigFromArgs.setWSDLReference(wsdlReference);
-      }
-
-      // -serviceLocation
-      else if (
-        (args[argCount].equalsIgnoreCase("-serviceLocation"))
-          || (args[argCount].equals("-S")))
-      {
-        argCount++;
-
-        if (wsdlReference != null)
-        {
-          wsdlReference.setServiceLocation(getOptionValue(args, argCount));
-        }
-        else if (uddiReference != null)
-        {
-          uddiReference.setServiceLocation(getOptionValue(args, argCount));
-        }
-        else
-        {
-          throw new IllegalArgumentException(
-            getMessage(
-              "config11",
-              "The -serviceLocation option must appear after the -wsdlURI or -uddiKey options."));
-        }
-      }
-
-      // -wsdlURI
-      else if (
-        (args[argCount].equalsIgnoreCase("-wsdlURI"))
-          || (args[argCount].equals("-W")))
-      {
-        argCount++;
-        if (wsdlReference == null)
-          wsdlReference = new WSDLReferenceImpl();
-        wsdlReference.setWSDLLocation(getOptionValue(args, argCount));
-        analyzerConfigFromArgs.setWSDLReference(wsdlReference);
-      }
-
-      // -uddiKeyType
-      else if (
-        (args[argCount].equalsIgnoreCase("-uddiKeyType"))
-          || (args[argCount].equals("-K")))
-      {
-        argCount++;
-        if (uddiReference == null)
-          uddiReference = new UDDIReferenceImpl();
-        uddiReference.setKeyType(getOptionValue(args, argCount));
-        analyzerConfigFromArgs.setUDDIReference(uddiReference);
-      }
-
-      // -uddiKey
-      else if (
-        (args[argCount].equalsIgnoreCase("-uddiKey"))
-          || (args[argCount].equals("-k")))
-      {
-        argCount++;
-        if (uddiReference == null)
-          uddiReference = new UDDIReferenceImpl();
-        uddiReference.setKey(getOptionValue(args, argCount));
-        analyzerConfigFromArgs.setUDDIReference(uddiReference);
-      }
-
-      // -inquiryURL
-      else if (
-        (args[argCount].equalsIgnoreCase("-inquiryURL"))
-          || (args[argCount].equals("-i")))
-      {
-        argCount++;
-        if (uddiReference == null)
-          uddiReference = new UDDIReferenceImpl();
-        uddiReference.setInquiryURL(getOptionValue(args, argCount));
-        analyzerConfigFromArgs.setUDDIReference(uddiReference);
-      }
-
-      // ADD: Need to add support for other options (-config, -binding, etc.)
-      else
-      {
-        throw new IllegalArgumentException(
-          getMessage(
-            "config12",
-            args[argCount],
-            "The specified option is not supported:"));
-      }
-    }
-
-    // If addStyleSheet was not specified, then create a comment version of it
-    if (analyzerConfigFromArgs.getAddStyleSheet() == null)
-    {
-      AddStyleSheet addStyleSheet = new AddStyleSheetImpl();
-      addStyleSheet.setHref(WSIConstants.DEFAULT_REPORT_XSL);
-      addStyleSheet.setType(WSIConstants.DEFAULT_XSL_TYPE);
-      addStyleSheet.setComment(true);
-      analyzerConfigFromArgs.setAddStyleSheet(addStyleSheet);
-    }
-
-    // Merge config info into this object
-    setConfig(analyzerConfigFromArgs);
-
-    if (validate)
-    {  
-      // Verify that all required options were specified and 
-      // that the specified ones were correct
-      checkConfigOptions();
-    }
-  }
-
-  /**
-   * Verify config options.
-   */
-  private void checkConfigOptions() throws WSIException
-  {
-    String fileLocation;
-
-    // If wsdlReference and uddiReference specified, then throw exception
-    if ((this.isWSDLReferenceSet()) && (this.isUDDIReferenceSet()))
-    {
-      throw new IllegalArgumentException(
-        getMessage(
-          "config04",
-          "Can not specify both the WSDL reference and UDDI reference options"));
-    }
-
-    // Check if test assertion file exists
-    if ((fileLocation = this.getTestAssertionsDocumentLocation()) == null)
-    {
-      throw new IllegalArgumentException(
-        getMessage(
-          "config16",
-          "Test assertion document location must be specified."));
-    }
-
-    else if (!Utils.fileExists(fileLocation))
-    {
-      throw new IllegalArgumentException(
-        getMessage(
-          "config14",
-          fileLocation,
-          "Could not find test assertion document.  Specified file location:"));
-    }
-
-    // Check if log file exists
-    if ((fileLocation = this.getLogLocation()) != null)
-    {
-      if (!Utils.fileExists(fileLocation))
-        throw new IllegalArgumentException(
-          messageList.getMessage(
-            "config02",
-            fileLocation,
-            "Could not find log file:"));
-    }
-
-    // Check if WSDL file exists
-    if ((this.getWSDLReference() != null)
-      && (fileLocation = this.getWSDLReference().getWSDLLocation()) != null)
-    {
-      if (!Utils.fileExists(fileLocation))
-        throw new IllegalArgumentException(
-          messageList.getMessage(
-            "config03",
-            fileLocation,
-            "Could not find WSDL file:"));
-    }
-
-    File file = null;
-    try
-    {
-      // Get file object for report file
-      file = new File(this.getReportLocation());
-    }
-
-    catch (Exception e)
-    {
-      throw new IllegalArgumentException(
-        messageList.getMessage(
-          "config17",
-          "Could not get report file location."));
-    }
-
-    // If replace flag is false and file exists, then throw exception
-    if (file.exists() && !this.getReplaceReport())
-    {
-      throw new IllegalArgumentException(
-        messageList.getMessage(
-          "config15",
-          "Report file already exists and replace option was not specified."));
-    }
-
-    if (correlationType != null
-      && !this.correlationType.equals(
-        WSIConstants.ATTRVAL_CORRELATION_TYPE_ENDPOINT)
-      && !this.correlationType.equals(
-        WSIConstants.ATTRVAL_CORRELATION_TYPE_NAMESPACE)
-      && !this.correlationType.equals(
-        WSIConstants.ATTRVAL_CORRELATION_TYPE_OPERATION))
-    {
-      throw new IllegalArgumentException(
-        messageList.getMessage(
-          "config18",
-          "Invalid correlation type specified."));
-    }
-  }
-
-  /**
-   * Get option value.
-   */
-  private String getOptionValue(String[] args, int index) throws WSIException
-  {
-    return getOptionValue(args, index, args[index - 1]);
-  }
-
-  /**
-   * Get option value.
-   */
-  private String getOptionValue(String[] args, int index, String optionName)
-    throws WSIException
-  {
-    // If index greater than array length, then throw exception
-    if (index >= args.length)
-    {
-      throw new IllegalArgumentException(
-        getMessage(
-          "config13",
-          optionName,
-          "Option did not contain a value.  Specified option:"));
-    }
-
-    // If the value is an option (i.e. starts with a "-"), then throw exception
-    if (args[index].startsWith("-"))
-    {
-      throw new IllegalArgumentException(
-        getMessage(
-          "config13",
-          optionName,
-          "Option did not contain a value.  Specified option:"));
-    }
-
-    return (args[index]);
-  }
-
-  /**
-   * Get message from resource bundle.
-   */
-  private String getMessage(String messageID, String defaultMessage)
-  {
-    return getMessage(messageID, null, defaultMessage);
-  }
-
-  /**
-   * Get message from resource bundle.
-   */
-  private String getMessage(
-    String messageID,
-    String messageData,
-    String defaultMessage)
-  {
-    String message = defaultMessage;
-    if (messageList != null)
-      message = messageList.getMessage(messageID, messageData, defaultMessage);
-    else if (messageData != null)
-      message += " " + messageData + ".";
-
-    return message;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/AnalyzerConfigReaderImpl.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/AnalyzerConfigReaderImpl.java
deleted file mode 100644
index 1a4de8679..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/AnalyzerConfigReaderImpl.java
+++ /dev/null
@@ -1,559 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.analyzer.config.impl;
-
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.Reader;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSIFileNotFoundException;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.AnalyzerConfig;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.AnalyzerConfigReader;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.AssertionResultType;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.AssertionResultsOption;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.UDDIReference;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLElement;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLReference;
-import org.eclipse.wst.wsi.internal.core.common.AddStyleSheet;
-import org.eclipse.wst.wsi.internal.core.common.impl.AddStyleSheetImpl;
-import org.eclipse.wst.wsi.internal.core.util.EntryType;
-import org.eclipse.wst.wsi.internal.core.util.MessageList;
-import org.eclipse.wst.wsi.internal.core.util.TestUtils;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-
-/**
- * This class is the implementation used to read the analyzer config documents.
- * 
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public class AnalyzerConfigReaderImpl implements AnalyzerConfigReader
-{
-  /**
-   * Message list.
-   */
-  protected MessageList messageList;
-
-  /**
-   * Document location.
-   */
-  protected String documentURI;
-
-  /**
-   * Initialize analyzer config reader.
-   */
-  public void init(MessageList messageList)
-  {
-    this.messageList = messageList;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.analyzer.config.AnalyzerConfigReader#readAnalyzerConfig(String)
-   */
-  public AnalyzerConfig readAnalyzerConfig(String analyzerConfigURI)
-    throws WSIException
-  {
-    FileReader fileReader = null;
-    try
-    {
-      fileReader = new FileReader(analyzerConfigURI);
-    }
-
-    catch (FileNotFoundException fnfe)
-    {
-      throw new WSIFileNotFoundException(
-        getMessage(
-          "config01",
-          analyzerConfigURI,
-          "Could not find analyzer config file: "),
-        fnfe);
-    }
-
-    catch (Exception e)
-    {
-      throw new WSIException(
-        getMessage(
-          "config08",
-          analyzerConfigURI,
-          "Could not read analyzer config file: "),
-        e);
-    }
-
-    return readAnalyzerConfig(fileReader);
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.analyzer.config.AnalyzerConfigReader#readAnalyzerConfig(Reader)
-   */
-  public AnalyzerConfig readAnalyzerConfig(Reader reader) throws WSIException
-  {
-    AnalyzerConfig analyzerConfig = new AnalyzerConfigImpl();
-
-    // Parse XML
-    Document doc = XMLUtils.parseXML(reader);
-
-    // Parse elements in the config document
-    parseConfigElement(analyzerConfig, doc.getDocumentElement());
-
-    return analyzerConfig;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.document.DocumentReader#getLocation()
-   */
-  public String getLocation()
-  {
-    return this.documentURI;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.document.DocumentReader#setLocation(String)
-   */
-  public void setLocation(String documentURI)
-  {
-    this.documentURI = documentURI;
-  }
-
-  /**
-   * Parse config element.
-   */
-  private void parseConfigElement(
-    AnalyzerConfig analyzerConfig,
-    Element element)
-    throws WSIException
-  {
-    // ADD: Get name and version
-
-    // ADD: Verify that this is the config element
-
-    // Get first child element
-    Element nextElement = XMLUtils.getFirstChild(element);
-
-    // DEBUG:
-    //System.out.println("Element name: " + nextElement.getClass().getName());
-
-    // Process each child element
-    while (nextElement != null)
-    {
-      // <description>
-      if (isElement(nextElement, WSIConstants.ELEM_DESCRIPTION))
-      {
-        analyzerConfig.setDescription(XMLUtils.getText(nextElement));
-      }
-
-      // <verbose>
-      else if (isElement(nextElement, WSIConstants.ELEM_VERBOSE))
-      {
-        analyzerConfig.setVerboseOption(
-          XMLUtils.getBooleanValue(nextElement, false));
-      }
-
-      // <assertionResults>
-      else if (isElement(nextElement, WSIConstants.ELEM_ASSERTION_RESULTS))
-      {
-        // Create assertion results option object
-        AssertionResultsOption assertionResultsOption =
-          new AssertionResultsOptionImpl();
-        analyzerConfig.setAssertionResultsOption(assertionResultsOption);
-
-        // Set result type
-        String resultType =
-          XMLUtils.getAttributeValue(nextElement, WSIConstants.ATTR_TYPE);
-        assertionResultsOption.setAssertionResultType(
-          AssertionResultType.newInstance(resultType));
-
-        // Set show log entry
-        assertionResultsOption.setShowMessageEntry(
-          XMLUtils.getBooleanValue(
-            nextElement,
-            WSIConstants.ATTR_MESSAGE_ENTRY,
-            assertionResultsOption.getShowMessageEntry()));
-
-        // Set show failure message
-        assertionResultsOption.setShowFailureMessage(
-          XMLUtils.getBooleanValue(
-            nextElement,
-            WSIConstants.ATTR_FAILURE_MESSAGE,
-            assertionResultsOption.getShowFailureMessage()));
-
-        // Set show failure detail
-        assertionResultsOption.setShowFailureDetail(
-          XMLUtils.getBooleanValue(
-            nextElement,
-            WSIConstants.ATTR_FAILURE_DETAIL,
-            assertionResultsOption.getShowFailureDetail()));
-
-        // REMOVE: Set show warning message
-        //assertionResultsOption.setShowWarningMessage(XMLUtils.getBooleanValue(nextElement, 
-        //      WSIConstants.ATTR_WARNING_MESSAGE, assertionResultsOption.getShowWarningMessage()));
-      }
-
-      // <reportFile>
-      else if (isElement(nextElement, WSIConstants.ELEM_REPORT_FILE))
-      {
-        parseReportFileElement(analyzerConfig, nextElement);
-      }
-
-      // <testAssertionFile>
-      else if (isElement(nextElement, WSIConstants.ELEM_TEST_ASSERTIONS_FILE))
-      {
-        analyzerConfig.setTestAssertionsDocumentLocation(
-          XMLUtils.getText(nextElement));
-      }
-
-      // <logFile>
-      else if (isElement(nextElement, WSIConstants.ELEM_LOG_FILE))
-      {
-        String correlationType =
-          XMLUtils.getAttributeValue(
-            nextElement,
-            WSIConstants.ATTR_CORRELATION_TYPE);
-        analyzerConfig.setCorrelationType(
-          correlationType == null ? "operation" : correlationType);
-        analyzerConfig.setLogLocation(XMLUtils.getText(nextElement));
-      }
-
-      // <wsdlReference>
-      else if (isElement(nextElement, WSIConstants.ELEM_WSDL_REFERENCE))
-      {
-        parseWsdlReference(analyzerConfig, nextElement);
-      }
-
-      // <uddiReference>
-      else if (isElement(nextElement, WSIConstants.ELEM_UDDI_REFERENCE))
-      {
-        parseUddiReference(analyzerConfig, nextElement);
-      }
-
-      else
-      {
-        // Throw exception
-        throw new IllegalArgumentException(
-          getMessage(
-            "config06",
-            nextElement.getLocalName(),
-            "Invalid analyzer config element:"));
-      }
-
-      // Get next element
-      nextElement = XMLUtils.getNextSibling(nextElement);
-    }
-  }
-
-  /**
-   * Parse reportFile element.
-   */
-  private void parseReportFileElement(
-    AnalyzerConfig analyzerConfig,
-    Element element)
-    throws WSIException
-  {
-    // Get report location and replace indicator
-    analyzerConfig.setReplaceReport(
-      XMLUtils.getBooleanValue(element, WSIConstants.ATTR_REPLACE, false));
-    analyzerConfig.setReportLocation(
-      XMLUtils.getAttributeValue(
-        element,
-        WSIConstants.ATTR_LOCATION,
-        WSIConstants.DEFAULT_REPORT_URI));
-
-    // ADD: If the report location wasn't specified, then throw an exception
-    //if (analyzerConfig.getReportLocation() == null)
-    //  throw new WSIException("The analyzer configuration file must contain the report file location.");
-
-    // Get first child element
-    Element nextElement = XMLUtils.getFirstChild(element);
-
-    // Process each child element
-    while (nextElement != null)
-    {
-      // <addStyleSheet>
-      if (isElement(nextElement, WSIConstants.ELEM_ADD_STYLE_SHEET))
-      {
-        AddStyleSheet addStyleSheet = new AddStyleSheetImpl();
-
-        // Parse the element  
-        TestUtils.parseAddStyleSheet(
-          nextElement,
-          addStyleSheet,
-          WSIConstants.DEFAULT_REPORT_XSL);
-
-        // Set add style sheet
-        analyzerConfig.setAddStyleSheet(addStyleSheet);
-      }
-
-      else
-      {
-        // Throw exception
-        throw new IllegalArgumentException(
-          getMessage(
-            "config06",
-            nextElement.getLocalName(),
-            "Invalid analyzer config element:"));
-      }
-
-      // Get next element
-      nextElement = XMLUtils.getNextSibling(nextElement);
-    }
-  }
-
-  /**
-   * Parse wsdl reference element.
-   */
-  private void parseWsdlReference(
-    AnalyzerConfig analyzerConfig,
-    Element element)
-    throws WSIException
-  {
-    // Create UDDI reference
-    WSDLReference wsdlReference = new WSDLReferenceImpl();
-
-    // Set WSDL reference
-    analyzerConfig.setWSDLReference(wsdlReference);
-
-    // Get first child element
-    Element nextElement = XMLUtils.getFirstChild(element);
-
-    // Process each child element
-    while (nextElement != null)
-    {
-      // <wsdlURI>
-      if (isElement(nextElement, WSIConstants.ELEM_WSDL_URI))
-      {
-        // Set WSDL location
-        wsdlReference.setWSDLLocation(XMLUtils.getText(nextElement));
-      }
-
-      // <serviceLocation>
-      else if (isElement(nextElement, WSIConstants.ELEM_SERVICE_LOCATION))
-      {
-        // Set service location
-        wsdlReference.setServiceLocation(XMLUtils.getText(nextElement));
-      }
-
-      // <wsdlElement>
-      else if (isElement(nextElement, WSIConstants.ELEM_WSDL_ELEMENT))
-      {
-        // Set WSDL element
-        wsdlReference.setWSDLElement(parseWsdlElement(nextElement));
-      }
-
-      else
-      {
-        // Throw exception
-        throw new IllegalArgumentException(
-          getMessage(
-            "config06",
-            nextElement.getLocalName(),
-            "Invalid analyzer config element:"));
-      }
-
-      // Get next element
-      nextElement = XMLUtils.getNextSibling(nextElement);
-    }
-
-    // If WSDL element or WSL URI not specified, then throw exception
-    if ((wsdlReference.getWSDLElement() == null)
-      || (wsdlReference.getWSDLLocation() == null))
-    {
-      throw new IllegalArgumentException(
-        getMessage(
-          "config07",
-          "Both the <wsdlElement> and <wsdlURI> elements must be specified."));
-    }
-
-    // If type is port or operation, then parent element name must be specified
-    if (((wsdlReference
-      .getWSDLElement()
-      .getType()
-      .equalsIgnoreCase(EntryType.TYPE_DESCRIPTION_PORT))
-      || (wsdlReference
-        .getWSDLElement()
-        .getType()
-        .equalsIgnoreCase(EntryType.TYPE_DESCRIPTION_OPERATION)))
-      && (wsdlReference.getWSDLElement().getParentElementName() == null))
-    {
-      throw new IllegalArgumentException(
-        getMessage(
-          "config09",
-          "The parentElementName attribute must be specified with a WSDL type of "
-            + EntryType.TYPE_DESCRIPTION_PORT
-            + " or "
-            + EntryType.TYPE_DESCRIPTION_OPERATION
-            + "."));
-    }
-  }
-
-  /**
-   * Parse uddi reference.
-   */
-  private void parseUddiReference(
-    AnalyzerConfig analyzerConfig,
-    Element element)
-    throws WSIException
-  {
-    // Create UDDI reference
-    UDDIReference uddiReference = new UDDIReferenceImpl();
-
-    // Set UDDI reference
-    analyzerConfig.setUDDIReference(uddiReference);
-
-    // Get first child element
-    Element nextElement = XMLUtils.getFirstChild(element);
-
-    // Process each child element
-    while (nextElement != null)
-    {
-      // <inquiryURL>
-      if (isElement(nextElement, WSIConstants.ELEM_INQUIRY_URL))
-      {
-        // Set inquiry URL
-        uddiReference.setInquiryURL(XMLUtils.getText(nextElement));
-      }
-
-      // <uddiKey>
-      else if (isElement(nextElement, WSIConstants.ELEM_UDDI_KEY))
-      {
-        // Set UDDI key and key type
-        uddiReference.setKey(XMLUtils.getText(nextElement));
-        uddiReference.setKeyType(
-          XMLUtils.getAttributeValue(nextElement, WSIConstants.ATTR_TYPE));
-      }
-
-      // <wsdlElement>
-      else if (isElement(nextElement, WSIConstants.ELEM_WSDL_ELEMENT))
-      {
-        // Set WSDL element
-        uddiReference.setWSDLElement(parseWsdlElement(nextElement));
-      }
-
-      // <serviceLocation>
-      else if (isElement(nextElement, WSIConstants.ELEM_SERVICE_LOCATION))
-      {
-        // Set service location
-        uddiReference.setServiceLocation(XMLUtils.getText(nextElement));
-      }
-
-      /* REMOVE:
-      // <wsdlElement>
-      else if (isElement(nextElement, WSIConstants.ELEM_WSDL_ELEMENT)) {
-        // Set service location
-        parseWsdlElement(analyzerConfig, nextElement);
-       }
-       */
-
-      else
-      {
-        // Throw exception
-        throw new IllegalArgumentException(
-          getMessage(
-            "config06",
-            nextElement.getLocalName(),
-            "Invalid analyzer config element:"));
-      }
-
-      // Get next element
-      nextElement = XMLUtils.getNextSibling(nextElement);
-    }
-  }
-
-  /**
-   * Parse WSDL element.
-   */
-  private WSDLElement parseWsdlElement(Element element) throws WSIException
-  {
-    WSDLElement wsdlElement = new WSDLElementImpl();
-
-    // Set type, namespace, parent element name and name
-    wsdlElement.setType(
-      XMLUtils.getAttributeValue(element, WSIConstants.ATTR_TYPE));
-    wsdlElement.setNamespace(
-      XMLUtils.getAttributeValue(element, WSIConstants.ATTR_NAMESPACE));
-    wsdlElement.setParentElementName(
-      XMLUtils.getAttributeValue(
-        element,
-        WSIConstants.ATTR_PARENT_ELEMENT_NAME));
-
-    String wsdlElementName = XMLUtils.getText(element);
-    if (wsdlElementName.equals(""))
-    {
-      // Throw exception
-      throw new IllegalArgumentException(
-        getMessage("config19", "The WSDL element name must be specified."));
-    }
-    wsdlElement.setName(wsdlElementName);
-
-    return wsdlElement;
-  }
-
-  /**
-   * Determine if this element matches specified local name in the analyzer config namespace.
-   */
-  private boolean isElement(Element element, String localName)
-  {
-    return isElement(
-      element,
-      getValidWSIAnalyzerConfigNamespaces(),
-      localName);
-  }
-
-  
-  static public List getValidWSIAnalyzerConfigNamespaces()
-  {
-  	ArrayList list = new ArrayList();
-  	list.add(WSIConstants.NS_URI_WSI_ANALYZER_CONFIG_2003);
-  	list.add(WSIConstants.NS_URI_WSI_ANALYZER_CONFIG);
-  	return list;
-  }
-  
-  /**
-   * Determine if this element matches specified local name in the analyzer config namespace.
-   */
-  private boolean isElement(
-    Element element,
-    List namespaces,
-    String localName)
-  {
-    return XMLUtils.isElement(element, namespaces, localName);
-  }
-
-  /**
-   * Get message from resource bundle.
-   */
-  private String getMessage(String messageID, String defaultMessage)
-  {
-    return getMessage(messageID, null, defaultMessage);
-  }
-
-  /**
-   * Get message from resource bundle.
-   */
-  private String getMessage(
-    String messageID,
-    String messageData,
-    String defaultMessage)
-  {
-    String message = defaultMessage;
-    if (messageList != null)
-      message = messageList.getMessage(messageID, messageData, defaultMessage);
-    else
-      message += " " + messageData + ".";
-
-    return message;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/AssertionResultsOptionImpl.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/AssertionResultsOptionImpl.java
deleted file mode 100644
index fbe3d0f74..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/AssertionResultsOptionImpl.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2003 IBM Corporation, Parasoft and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM      - Initial API and implementation
- *   Parasoft - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.analyzer.config.impl;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.AssertionResultType;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.AssertionResultsOption;
-
-/**
- * This class contains the assertion results option definition.
- * 
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public class AssertionResultsOptionImpl implements AssertionResultsOption
-{
-  /**
-   * Assertion result type.
-   */
-  protected AssertionResultType resultType = AssertionResultType.ALL;
-
-  /**
-   * Show message entry indicator.
-   */
-  protected boolean showMessageEntry = true;
-
-  /**
-   * Show assertion description indicator.
-   */
-  protected boolean showAssertionDescription = false;
-
-  /**
-   * Show failure message indicator.
-   */
-  protected boolean showFailureMessage = true;
-
-  /**
-   * Show failure detail indicator.
-   */
-  protected boolean showFailureDetail = true;
-
-  /**
-   * Get assertion result type.
-   * @see #setAssertionResultType
-   */
-  public AssertionResultType getAssertionResultType()
-  {
-    return resultType;
-  }
-
-  /**
-   * Set assertion result type.
-   * @see #getAssertionResultType
-   */
-  public void setAssertionResultType(AssertionResultType resultType)
-  {
-    this.resultType = resultType;
-  }
-
-  /**
-   * Get show message entry indicator.
-   * @see #setShowMessageEntry
-   */
-  public boolean getShowMessageEntry()
-  {
-    return this.showMessageEntry;
-  }
-
-  /**
-   * Set show message entry indictor.
-   * @see #getShowMessageEntry
-   */
-  public void setShowMessageEntry(boolean showMessageEntry)
-  {
-    this.showMessageEntry = showMessageEntry;
-  }
-
-  /**
-   * Get show assertion description indicator.
-   * @see #setShowAssertionDescription
-   */
-  public boolean getShowAssertionDescription()
-  {
-    return this.showAssertionDescription;
-  }
-
-  /**
-   * Set show assertion description indictor.
-   * @see #getShowAssertionDescription
-   */
-  public void setShowAssertionDescription(boolean showAssertionDescription)
-  {
-    this.showAssertionDescription = showAssertionDescription;
-  }
-
-  /**
-   * Get show failure message indicator.
-   * @see #setShowFailureMessage
-   */
-  public boolean getShowFailureMessage()
-  {
-    return this.showFailureMessage;
-  }
-
-  /**
-   * Set show failure mesage indicator.
-   * @see #getShowFailureMessage
-   */
-  public void setShowFailureMessage(boolean showFailureMessage)
-  {
-    this.showFailureMessage = showFailureMessage;
-  }
-
-  /**
-   * Get show failure detail indicator.
-   * @see #setShowFailureDetail
-   */
-  public boolean getShowFailureDetail()
-  {
-    return this.showFailureDetail;
-  }
-
-  /**
-   * Set show failure detail indicator.
-   * @see #getShowFailureDetail
-   */
-  public void setShowFailureDetail(boolean showFailureDetail)
-  {
-    this.showFailureDetail = showFailureDetail;
-  }
-
-  /**
-   * Get string representation of this object.
-   */
-  public String toString()
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    pw.println("  Assertion Results:");
-    pw.println("    type ..................... " + this.resultType);
-    pw.println("    messageEntry ............. " + this.showMessageEntry);
-    pw.println(
-      "    assertionDescription ..... " + this.showAssertionDescription);
-    pw.println("    failureMessage ........... " + this.showFailureMessage);
-    pw.println("    failureDetail ............ " + this.showFailureDetail);
-
-    return sw.toString();
-  }
-
-  /**
-   * Get representation of this object as an XML string.
-   */
-  public String toXMLString(String namespaceName)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    String nsName = namespaceName;
-    if ((!nsName.equals("") && (!nsName.endsWith(":"))))
-      nsName += ":";
-
-    // Config options
-    pw.print("      <" + nsName + WSIConstants.ELEM_ASSERTION_RESULTS + " ");
-    pw.print(WSIConstants.ATTR_TYPE + "=\"" + getAssertionResultType() + "\" ");
-    pw.print(
-      WSIConstants.ATTR_MESSAGE_ENTRY + "=\"" + getShowMessageEntry() + "\" ");
-    pw.print(
-      WSIConstants.ATTR_ASSERTION_DESCRIPTION
-        + "=\""
-        + getShowAssertionDescription()
-        + "\" ");
-    pw.print(
-      WSIConstants.ATTR_FAILURE_MESSAGE
-        + "=\""
-        + getShowFailureMessage()
-        + "\" ");
-    pw.println(
-      WSIConstants.ATTR_FAILURE_DETAIL
-        + "=\""
-        + getShowFailureDetail()
-        + "\"/>");
-    // REMOVE:
-    //pw.println(WSIConstants.ATTR_WARNING_MESSAGE + "=\"" + getShowWarningMessage() + "\"/>");
-
-    return sw.toString();
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/UDDIReferenceImpl.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/UDDIReferenceImpl.java
deleted file mode 100644
index 8dc7b6c72..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/WSDLElementImpl.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/WSDLElementImpl.java
deleted file mode 100644
index ff14b85d9..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/WSDLElementImpl.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.analyzer.config.impl;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLElement;
-import org.eclipse.wst.wsi.internal.core.util.EntryType;
-
-/**
- * The implementation for WSDL definitions. 
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public class WSDLElementImpl implements WSDLElement
-{
-  protected String type;
-  protected String namespace;
-  protected String name;
-  protected String parentElementName;
-
-  /**
-   * @see #setType
-   */
-  public String getType()
-  {
-    return this.type;
-  }
-
-  /**
-   * @see #getType
-   */
-  public void setType(String type)
-  {
-    this.type = type;
-  }
-
-  /**
-   * @see #setNamespace
-   */
-  public String getNamespace()
-  {
-    return this.namespace;
-  }
-
-  /**
-   * @see #getNamespace
-   */
-  public void setNamespace(String namespace)
-  {
-    this.namespace = namespace;
-  }
-
-  /**
-   * @see #setName
-   */
-  public String getName()
-  {
-    return this.name;
-  }
-
-  /**
-   * @see #getName
-   */
-  public void setName(String name)
-  {
-    this.name = name;
-  }
-
-  public QName getQName()
-  {
-    return new QName(this.namespace, this.name);
-  }
-
-  /**
-   * Get WSDL parent element name.
-   * @see #setParentElementName
-  
-   */
-  public String getParentElementName()
-  {
-    return this.parentElementName;
-  }
-
-  /**
-   * Set WSDL parent element name.
-   * @see #getParentElementName
-   */
-  public void setParentElementName(String parentElementName)
-  {
-    this.parentElementName = parentElementName;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.test.analyzer.config.WSDLElement#getParentElementQName()
-   */
-  public QName getParentElementQName()
-  {
-    return new QName(this.namespace, this.parentElementName);
-  }
-
-  /**
-   * Is port element.
-   */
-  public boolean isPort()
-  {
-    return type.equals(EntryType.TYPE_DESCRIPTION_PORT);
-  }
-
-  /**
-   * Is binding element.
-   */
-  public boolean isBinding()
-  {
-    return type.equals(EntryType.TYPE_DESCRIPTION_BINDING);
-  }
-
-  /**
-   * Is portType element.
-   */
-  public boolean isPortType()
-  {
-    return type.equals(EntryType.TYPE_DESCRIPTION_PORTTYPE);
-  }
-
-  /**
-   * Is operation element.
-   */
-  public boolean isOperation()
-  {
-    return type.equals(EntryType.TYPE_DESCRIPTION_OPERATION);
-  }
-
-  /**
-   * Is message element.
-   */
-  public boolean isMessage()
-  {
-    return type.equals(EntryType.TYPE_DESCRIPTION_MESSAGE);
-  }
-
-  /**
-   * Get string representation of this object.
-   */
-  public String toString()
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    pw.println("    WSDL Element: ");
-    pw.println("      type ................... " + this.type);
-    pw.println("      namespace .............. " + this.namespace);
-    pw.println("      name ................... " + this.name);
-
-    if (this.parentElementName != null)
-      pw.println("      parentElementName ...... " + this.parentElementName);
-
-    return sw.toString();
-  }
-
-  /**
-   * Get representation of this object as an XML string.
-   */
-  public String toXMLString(String namespaceName)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    String nsName = namespaceName;
-    if ((!nsName.equals("") && (!nsName.endsWith(":"))))
-      nsName += ":";
-
-    // Config options
-    pw.print("        <" + nsName + ELEM_NAME + " ");
-    pw.print(WSIConstants.ATTR_TYPE + "=\"" + getType() + "\" ");
-    pw.print(WSIConstants.ATTR_NAMESPACE + "=\"" + getNamespace() + "\" ");
-    if (this.parentElementName != null)
-      pw.print(
-        WSIConstants.ATTR_PARENT_ELEMENT_NAME
-          + "=\""
-          + getParentElementName()
-          + "\"");
-    pw.print(">");
-    pw.print(getName());
-    pw.println("</" + nsName + ELEM_NAME + ">");
-
-    return sw.toString();
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/WSDLReferenceImpl.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/WSDLReferenceImpl.java
deleted file mode 100644
index 64bff4363..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/WSDLReferenceImpl.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.analyzer.config.impl;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLElement;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLReference;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-
-/**
- * The implementation for a reference to a description artifact.  
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public class WSDLReferenceImpl implements WSDLReference
-{
-  /**
-   * WSDL element.
-   */
-  protected WSDLElement wsdlElement = null;
-
-  /**
-   * Service location.
-   */
-  protected String serviceLocation = null;
-
-  /**
-   * WSDL document location.
-   */
-  protected String wsdlLocation = null;
-
-  /**
-   * Default constructor.
-   */
-  public WSDLReferenceImpl()
-  {
-  }
-
-  /**
-   * Constructor with all settings.
-   * @param wsdlElement      a WSDL element.
-   * @param wsdlLocation     a WSDL document location.
-   * @param serviceLocation  a service location.
-   */
-  public WSDLReferenceImpl(
-    WSDLElement wsdlElement,
-    String wsdlLocation,
-    String serviceLocation)
-  {
-    this.wsdlElement = wsdlElement;
-    this.wsdlLocation = wsdlLocation;
-    this.serviceLocation = serviceLocation;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLReference#getWSDLElement()
-   */
-  public WSDLElement getWSDLElement()
-  {
-    return this.wsdlElement;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLReference#setWSDLElement(WSDLElement)
-   */
-  public void setWSDLElement(WSDLElement wsdlElement)
-  {
-    this.wsdlElement = wsdlElement;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLReference#getWSDLLocation()
-   */
-  public String getWSDLLocation()
-  {
-    return this.wsdlLocation;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLReference#setWSDLLocation()
-   */
-  public void setWSDLLocation(String wsdlLocation)
-  {
-    this.wsdlLocation = wsdlLocation;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLReference#getServiceLocation()
-   */
-  public String getServiceLocation()
-  {
-    return this.serviceLocation;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLReference#setServiceLocation()
-   */
-  public void setServiceLocation(String serviceLocation)
-  {
-    this.serviceLocation = serviceLocation;
-  }
-
-  /**
-   * Get string representation of this object.
-   */
-  public String toString()
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    pw.println("  WSDL Reference:");
-    pw.print(this.wsdlElement.toString());
-    pw.println("    wsdlURI .................. " + this.wsdlLocation);
-    if (this.serviceLocation != null)
-      pw.println("  serviceLocation .......... " + this.serviceLocation);
-
-    return sw.toString();
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.document.DocumentElement#toXMLString(String)
-   */
-  public String toXMLString(String namespaceName)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    String nsName = namespaceName;
-    if ((!nsName.equals("") && (!nsName.endsWith(":"))))
-      nsName += ":";
-
-    // Element
-    pw.println("      <" + nsName + ELEM_NAME + ">");
-    pw.print(getWSDLElement().toXMLString(nsName));
-    pw.print("        <" + nsName + WSIConstants.ELEM_WSDL_URI + ">");
-    pw.print(getWSDLLocation());
-    pw.println("</" + nsName + WSIConstants.ELEM_WSDL_URI + ">");
-
-    if (this.serviceLocation != null)
-    {
-      pw.print("        <" + nsName + WSIConstants.ELEM_SERVICE_LOCATION + ">");
-      pw.print(XMLUtils.xmlEscapedString(getServiceLocation()));
-      pw.println("</" + nsName + WSIConstants.ELEM_SERVICE_LOCATION + ">");
-    }
-
-    pw.println("      </" + nsName + ELEM_NAME + ">");
-
-    return sw.toString();
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/common/AddStyleSheet.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/common/AddStyleSheet.java
deleted file mode 100644
index 0fdf7f90c..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/common/impl/AddStyleSheetImpl.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/common/impl/AddStyleSheetImpl.java
deleted file mode 100644
index 9965d1696..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/common/impl/AddStyleSheetImpl.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.common.impl;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.TreeMap;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.common.AddStyleSheet;
-
-/**
- * The implementation for AddStyleSheet element. 
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public class AddStyleSheetImpl implements AddStyleSheet
-{
-  /**
-   * Attribute values.
-   */
-  protected TreeMap attributeValueList = new TreeMap();
-
-  /**
-   * List of attributes.
-   */
-  protected String[] attributeNameList =
-    {
-      WSIConstants.ATTR_HREF,
-      WSIConstants.ATTR_TYPE,
-      WSIConstants.ATTR_TITLE,
-      WSIConstants.ATTR_MEDIA,
-      WSIConstants.ATTR_CHARSET,
-      WSIConstants.ATTR_ALTERNATE };
-
-  /**
-   * Set if the style sheet declaration should be a comment.
-   */
-  protected boolean comment = false;
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.common.AddStyleSheet#getHref()
-   */
-  public String getHref()
-  {
-    return (String) this.attributeValueList.get(WSIConstants.ATTR_HREF);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.common.AddStyleSheet#setHref(String)
-   */
-  public void setHref(String href)
-  {
-    this.attributeValueList.put(WSIConstants.ATTR_HREF, href);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.common.AddStyleSheet#getType()
-   */
-  public String getType()
-  {
-    return (String) this.attributeValueList.get(WSIConstants.ATTR_TYPE);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.common.AddStyleSheet#setType(String)
-   */
-  public void setType(String type)
-  {
-    this.attributeValueList.put(WSIConstants.ATTR_TYPE, type);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.common.AddStyleSheet#getTitle()
-   */
-  public String getTitle()
-  {
-    return (String) this.attributeValueList.get(WSIConstants.ATTR_TITLE);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.common.AddStyleSheet#setTitle(String)
-   */
-  public void setTitle(String title)
-  {
-    this.attributeValueList.put(WSIConstants.ATTR_TITLE, title);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.common.AddStyleSheet#getMedia()
-   */
-  public String getMedia()
-  {
-    return (String) this.attributeValueList.get(WSIConstants.ATTR_MEDIA);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.common.AddStyleSheet#setMedia(String)
-   */
-  public void setMedia(String media)
-  {
-    this.attributeValueList.put(WSIConstants.ATTR_MEDIA, media);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.common.AddStyleSheet#getCharset()
-   */
-  public String getCharset()
-  {
-    return (String) this.attributeValueList.get(WSIConstants.ATTR_CHARSET);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.common.AddStyleSheet#setCharset(String)
-   */
-  public void setCharset(String charset)
-  {
-    this.attributeValueList.put(WSIConstants.ATTR_CHARSET, charset);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.common.AddStyleSheet#getAlternate()
-   */
-  public String getAlternate()
-  {
-    return (String) this.attributeValueList.get(WSIConstants.ATTR_ALTERNATE);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.common.AddStyleSheet#setAlternate(String)
-   */
-  public void setAlternate(String alternate)
-  {
-    this.attributeValueList.put(WSIConstants.ATTR_ALTERNATE, alternate);
-  }
-
-  /* (non-Javadoc)
-   * Set if the style sheet declaration should be a comment.
-   */
-  public void setComment(boolean comment)
-  {
-    this.comment = comment;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.common.AddStyleSheet#getStyleSheetString()
-   */
-  public String getStyleSheetString()
-  {
-    StringBuffer styleSheet = new StringBuffer();
-
-    if (comment)
-      styleSheet.append("<!-- ");
-
-    styleSheet.append("<?xml-stylesheet");
-
-    String value;
-    for (int i = 0; i < attributeNameList.length; i++)
-    {
-      if ((value = (String) attributeValueList.get(attributeNameList[i]))
-        != null)
-        styleSheet.append(" " + attributeNameList[i] + "=\"" + value + "\"");
-    }
-
-    // End element
-    styleSheet.append(" ?>");
-
-    if (comment)
-      styleSheet.append(" -->");
-
-    return styleSheet.toString();
-  }
-
-  /**
-   * Get string representation of this object.
-   */
-  public String toString()
-  {
-    return getStyleSheetString();
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.DocumentElement#toXMLString(String)
-   */
-  public String toXMLString(String namespaceName)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    String nsName = namespaceName;
-    if ((!nsName.equals("") && (!nsName.endsWith(":"))))
-      nsName += ":";
-
-    // Config options
-    pw.print("      <" + nsName + ELEM_NAME + " ");
-    pw.print(WSIConstants.ATTR_HREF + "=\"" + getHref() + "\" ");
-    pw.print(WSIConstants.ATTR_TYPE + "=\"" + getType() + "\" ");
-    if (getTitle() != null)
-      pw.print(WSIConstants.ATTR_TITLE + "=\"" + getTitle() + "\" ");
-    if (getMedia() != null)
-      pw.print(WSIConstants.ATTR_MEDIA + "=\"" + getMedia() + "\" ");
-    if (getCharset() != null)
-      pw.print(WSIConstants.ATTR_CHARSET + "=\"" + getCharset() + "\" ");
-    if (getAlternate() != null)
-      pw.print(WSIConstants.ATTR_ALTERNATE + "=\"" + getAlternate() + "\" ");
-    pw.println("/>");
-
-    return sw.toString();
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/document/DocumentElement.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/document/DocumentElement.java
deleted file mode 100644
index c96d27864..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/document/DocumentFactory.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/document/DocumentFactory.java
deleted file mode 100644
index 98e90cc3c..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/document/DocumentReader.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/document/DocumentReader.java
deleted file mode 100644
index 387ce5336..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/document/DocumentWriter.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/document/DocumentWriter.java
deleted file mode 100644
index 9c8892654..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/document/DocumentWriter.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.document;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.io.Writer;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.w3c.dom.Document;
-
-/**
- * Defines the interface used to write the Conformance XML documents.
- * 
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public interface DocumentWriter
-{
-  /**
-   * Get the Document object associated with this Conformance document.
-   * @return the Document object associated with this Conformance document.
-   * @throws UnsupportedOperationException if operation is not supported.
-   */
-  public Document getDocument() throws UnsupportedOperationException;
-
-  /**
-   * Set writer.
-   * @param documentLocation the location of the document.
-   * @throws IOException if failed or interrupted I/O operations. 
-   */
-  public void setWriter(String documentLocation) throws IOException;
-
-  /**
-   * Write out only a part of a document to the location
-   * that was previously set using the setLocation method.
-   * @param reader a Reader object.
-   * @throws WSIException if there is trouble writing out the document.
-   * @throws IllegalStateException if this operation has been invoked 
-   *         at an illegal or inappropriate time.
-   */
-  public void write(Reader reader) throws WSIException, IllegalStateException;
-
-  /**
-   * Write out only a part of a document.
-   * @param reader a Reader object.
-   * @param writer a Writer object.
-   * @throws WSIException if there is trouble writing out the document.
-   */
-  public void write(Reader reader, Writer writer) throws WSIException;
-
-  /**
-   * Close writer.
-   * @throws WSIException if there is trouble closing the writer.
-   * @throws IllegalStateException if this operation has been invoked 
-   *         at an illegal or inappropriate time.
-   */
-  public void close() throws WSIException, IllegalStateException;
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/document/WSIDocument.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/document/WSIDocument.java
deleted file mode 100644
index b8db0d700..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/document/impl/DocumentFactoryImpl.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/document/impl/DocumentFactoryImpl.java
deleted file mode 100644
index f18c74d6b..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/document/impl/DocumentFactoryImpl.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.document.impl;
-
-import org.eclipse.wst.wsi.internal.core.analyzer.config.AnalyzerConfig;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.AnalyzerConfigReader;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.impl.AnalyzerConfigImpl;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.impl.AnalyzerConfigReaderImpl;
-import org.eclipse.wst.wsi.internal.core.document.DocumentFactory;
-import org.eclipse.wst.wsi.internal.core.log.Log;
-import org.eclipse.wst.wsi.internal.core.log.LogReader;
-import org.eclipse.wst.wsi.internal.core.log.LogWriter;
-import org.eclipse.wst.wsi.internal.core.log.impl.LogImpl;
-import org.eclipse.wst.wsi.internal.core.log.impl.LogReaderImpl;
-import org.eclipse.wst.wsi.internal.core.log.impl.LogWriterImpl;
-import org.eclipse.wst.wsi.internal.core.monitor.config.MonitorConfig;
-import org.eclipse.wst.wsi.internal.core.monitor.config.MonitorConfigReader;
-import org.eclipse.wst.wsi.internal.core.monitor.config.impl.MonitorConfigImpl;
-import org.eclipse.wst.wsi.internal.core.monitor.config.impl.MonitorConfigReaderImpl;
-import org.eclipse.wst.wsi.internal.core.profile.ProfileAssertions;
-import org.eclipse.wst.wsi.internal.core.profile.ProfileAssertionsReader;
-import org.eclipse.wst.wsi.internal.core.profile.impl.ProfileAssertionsImpl;
-import org.eclipse.wst.wsi.internal.core.profile.impl.ProfileAssertionsReaderImpl;
-import org.eclipse.wst.wsi.internal.core.report.Report;
-import org.eclipse.wst.wsi.internal.core.report.ReportWriter;
-import org.eclipse.wst.wsi.internal.core.report.impl.ReportImpl;
-import org.eclipse.wst.wsi.internal.core.report.impl.ReportWriterImpl;
-
-/**
- * This is the implementation of the Conformance document factory which provides access to
- * implementations of the documents, readers and writers. 
- * 
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public class DocumentFactoryImpl extends DocumentFactory
-{
-  /**
-   * Document factory implementation.
-   */
-  public DocumentFactoryImpl()
-  {
-  }
-
-  /**
-   * Create log file.
-   */
-  public Log newLog()
-  {
-    return new LogImpl();
-  }
-
-  /**
-   * Create monitor config.
-   */
-  public MonitorConfig newMonitorConfig()
-  {
-    return new MonitorConfigImpl();
-  }
-
-  /**
-   * Create analyzer config.
-   */
-  public AnalyzerConfig newAnalyzerConfig()
-  {
-    return new AnalyzerConfigImpl();
-  }
-
-  /**
-   * Create profile assertions.
-   */
-  public ProfileAssertions newProfileAssertions()
-  {
-    return new ProfileAssertionsImpl();
-  }
-
-  /**
-   * Create report.
-   */
-  public Report newReport()
-  {
-    return new ReportImpl();
-  }
-
-  /**
-   * Create monitor config reader.
-   */
-  public MonitorConfigReader newMonitorConfigReader()
-  {
-    return new MonitorConfigReaderImpl();
-  }
-
-  /**
-   * Create analyzer config reader.
-   */
-  public AnalyzerConfigReader newAnalyzerConfigReader()
-  {
-    return new AnalyzerConfigReaderImpl();
-  }
-
-  /**
-   * Create profile assertions reader.
-   */
-  public ProfileAssertionsReader newProfileAssertionsReader()
-  {
-    // Return implementation
-    return new ProfileAssertionsReaderImpl();
-  }
-
-  /**
-   * Create log reader.
-   */
-  public LogReader newLogReader()
-  {
-    // Return implementation
-    return new LogReaderImpl();
-  }
-
-  // WRITERS
-
-  /**
-   * Create log writer.
-   */
-  public LogWriter newLogWriter()
-  {
-    return new LogWriterImpl();
-  }
-
-  /**
-   * Create a new instance of a DocumentReader.
-   */
-  public ReportWriter newReportWriter()
-  {
-    // Return implementation
-    return new ReportWriterImpl();
-  }
-
-  /**
-   * Find the factory class name which can be specified as a Java property.
-   */
-  //private static String getFactoryClassName()
-  //{
-  //  // Get property value
-  //  return WSIProperties.getProperty(
-  //    WSIProperties.PROP_DOCUMENT_FACTORY,
-  //    WSIProperties.DEF_DOCUMENT_FACTORY);
-  //}
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/document/impl/DocumentWriterImpl.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/document/impl/DocumentWriterImpl.java
deleted file mode 100644
index a61e6d1f0..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/document/impl/DocumentWriterImpl.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2003 IBM Corporation, Beacon Information Technology Inc. and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM      - Initial API and implementation
- *   BeaconIT - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.document.impl;
-
-import java.io.BufferedReader;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.io.Reader;
-import java.io.UnsupportedEncodingException;
-import java.io.Writer;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.document.DocumentWriter;
-import org.w3c.dom.Document;
-
-/**
- * Defines the implementation used to write the Conformance XML 
- * documents.
- * 
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public abstract class DocumentWriterImpl implements DocumentWriter
-{
-  /**
-   * Document writer.
-   */
-  protected Writer writer = null;
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.DocumentWriter#getDocument()
-   */
-  public Document getDocument() throws UnsupportedOperationException
-  {
-    // ADD:
-    return null;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.DocumentWriter#setWriter(String)
-   */
-  public void setWriter(String documentLocation)
-    throws UnsupportedEncodingException, FileNotFoundException
-  {
-    // I18N: 2003.02.26 modified by K.Nakagome@BeaconIT 
-    this.writer =
-      new PrintWriter(
-        new OutputStreamWriter(
-          new FileOutputStream(documentLocation),
-          "UTF-8"));
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.DocumentWriter#write(Reader)
-   */
-  public synchronized void write(Reader reader)
-    throws WSIException, IllegalStateException
-  {
-    // If the writer was not specified, then throw an exception
-    if (writer == null)
-      throw new IllegalStateException("Could not write document since writer was not set.");
-
-    write(reader, writer);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.DocumentWriter#write(Reader, Writer)
-   */
-  public synchronized void write(Reader reader, Writer writer)
-    throws WSIException
-  {
-    // Create buffered reader
-    BufferedReader bufReader = new BufferedReader(reader);
-
-    // Create print writer
-    PrintWriter printWriter = new PrintWriter(writer);
-
-    String nextLine = null;
-
-    try
-    {
-      // Read each line from the reader
-      while ((nextLine = bufReader.readLine()) != null)
-      {
-        // Write text and flush stream
-        printWriter.println(nextLine);
-      }
-    }
-
-    catch (Exception e)
-    {
-      throw new WSIException("Could not write document.", e);
-    }
-
-    // Flush and close the writer
-    printWriter.flush();
-    //printWriter.close();    
-  }
-
-  /**
-   * Close writer.
-   */
-  public void close() throws WSIException, IllegalStateException
-  {
-    // If the writer was not specified, then throw an exception
-    if (writer == null)
-      throw new IllegalStateException("Could not write log file since writer was not set.");
-
-    try
-    {
-      // Close the writer
-      writer.close();
-    }
-
-    catch (IOException ioe)
-    {
-      throw new WSIException(ioe.toString(), ioe);
-    }
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/log/Log.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/log/Log.java
deleted file mode 100644
index 4c586b7e9..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/log/Log.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.log;
-
-import java.util.Vector;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.document.WSIDocument;
-
-/**
- * The interface for the message log file.
- * 
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public interface Log extends WSIDocument
-{
-  /**
-   * Element name.
-   */
-  public static final String ELEM_NAME = WSIConstants.ELEM_LOG;
-
-  /**
-   * QName.
-   */
-  public static final QName QNAME =
-    new QName(WSIConstants.NS_URI_WSI_LOG, ELEM_NAME);
-
-  /**
-   * Add message to log file.  The message will contain both 
-   * transport and content information.
-   * @param logEntry message containing both transport and content information.
-   * @throws WSIException if problems occur adding the message to log file.
-   */
-  public void addLogEntry(MessageEntry logEntry) throws WSIException;
-
-  /**
-   * Get the number of log entries.
-   * @return the number of log entries. 
-   */
-  public int getEntryCount();
-
-  /**
-   * Get a specific log file entry. 
-   * @param index index into log entries.
-   * @return log file entry at specified index.
-   */
-  public MessageEntry getLogEntry(int index);
-
-  /**
-   * Get log entry list.
-   * @return list of log entries.
-   */
-  public Vector getLogEntryList();
-
-  /**
-   * Get last log entry.
-   * @return ast log entry.
-   */
-  public MessageEntry getLastLogEntry();
-
-  /**
-   * Create log entry object.
-   * @return newly created log entry.
-   */
-  public MessageEntry createLogEntry();
-
-  /**
-   * Set style sheet string.
-   * @param styleSheetString a style sheet string.
-   */
-  public void setStyleSheetString(String styleSheetString);
-
-  /**
-   * Get start element string.
-   * @param namespaceName a namespace prefix.
-   * @return start element string.
-   */
-  public String getStartXMLString(String namespaceName);
-
-  /**
-   * Get end element string.
-   * @param namespaceName a namespace prefix.
-   * @return end element string. 
-   */
-  public String getEndXMLString(String namespaceName);
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/log/LogBuilder.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/log/LogBuilder.java
deleted file mode 100644
index b4dfc80c3..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/log/LogBuilder.java
+++ /dev/null
@@ -1,425 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.log;
-
-import java.io.PrintWriter;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-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.common.impl.AddStyleSheetImpl;
-import org.eclipse.wst.wsi.internal.core.document.DocumentFactory;
-import org.eclipse.wst.wsi.internal.core.log.impl.LogImpl;
-import org.eclipse.wst.wsi.internal.core.log.impl.LogWriterImpl;
-import org.eclipse.wst.wsi.internal.core.log.impl.MessageEntryImpl;
-import org.eclipse.wst.wsi.internal.core.monitor.config.Comment;
-import org.eclipse.wst.wsi.internal.core.monitor.config.ManInTheMiddle;
-import org.eclipse.wst.wsi.internal.core.monitor.config.MonitorConfig;
-import org.eclipse.wst.wsi.internal.core.monitor.config.impl.CommentImpl;
-import org.eclipse.wst.wsi.internal.core.monitor.config.impl.ManInTheMiddleImpl;
-import org.eclipse.wst.wsi.internal.core.util.Utils;
-
-import com.ibm.icu.text.SimpleDateFormat;
-import com.ibm.icu.util.TimeZone;
-
-/**
- * Given a list of RequestHandlers, 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 actual log object.
-   */
-  protected Log log = null;
-
-  /**
-   * The log file.
-   */
-  protected IFile ifile;
-
-  /**
-   * Tool information property values.
-   */
-  private static final String TOOL_NAME = "Monitor";
-  private static final String TOOL_VERSION = "1.0";
-  private static final String TOOL_RELEASE_DATE = "2003-03-20";
-  private static final String TOOL_IMPLEMENTER = "IBM";
-  private static final String TOOL_LOCATION = "";
-
-  /**
-   * Common timestamp format.
-   */
-  public static final SimpleDateFormat timestampFormat = new SimpleDateFormat ("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
-
-  /**
-   * Constructor.
-   * @param ifile: the file handler for the log.
-   */
-  public LogBuilder(IFile ifile)
-  {
-    this.ifile = ifile;
-  }
-
-  /**
-   * This builds and then returns a log based on the list of request-response pairs.
-   * @param requestResponses: a list of messages in the form of request-response pairs.
-   * @return a log based on a list of request-response pairs.
-   */
-  public Log buildLog(List requestResponses)
-  {
-    log = new LogImpl();
-    logMonitorInformation();
-
-    // log the messages
-    for (Iterator i = requestResponses.iterator(); i.hasNext();)
-    {
-      RequestHandler rr = (RequestHandler)i.next();
-      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(RequestHandler rr)
-  {
-    if (rr != null)
-    {
-      String requestHeader = new String(rr.getRequestHeader());
-      String responseHeader = new String(rr.getResponseHeader());
-      
-      byte[] unchunkedRequestBody = rr.getRequestContent();
-      byte[] unchunkedResponseBody = rr.getResponseContent();
- 
-      long timestamp = rr.getDate().getTime();
-      String localHostAndPort = "localhost:" + rr.getLocalPort();
-      String remoteHostAndPort = rr.getRemoteHost() + ":" + rr.getRemotePort();
-
-      int requestId  = getNextAvailableId();
-      int responseId = getNextAvailableId();
-      int conversationId = getNextAvailableConversationId();
-
-      MessageEntry messageEntryRequest = createMessageEntry(requestId, conversationId, 
-                MessageEntry.TYPE_REQUEST, timestamp, localHostAndPort,
-                remoteHostAndPort, unchunkedRequestBody, requestHeader);
-
-      MessageEntry messageEntryResponse = createMessageEntry(responseId, conversationId, 
-                MessageEntry.TYPE_RESPONSE, timestamp + rr.getResponseTime(), remoteHostAndPort,
-                localHostAndPort, unchunkedResponseBody, responseHeader);
-      try
-      {
-        if ((messageEntryRequest != null) &&
-            (messageEntryResponse != null) &&
-            ((messageEntryRequest.isMimeContent()) ||
-			 (isMessageWithBrackets(messageEntryRequest.getMessage()))))
-        {
-                log.addLogEntry(messageEntryRequest);
-               log.addLogEntry(messageEntryResponse);
-        }
-      }
-      catch (Exception e)
-      {
-        // ignore the request response pair
-      }
-    }
-  }
-
-  /**
-   * Returns true if the content of the message has at least
-   * one left and one right bracket.
-   * @param message: a message content.
-   * @return true if the content of the message has at least
-   *         one left and one right bracket.
-   */
-  public boolean isMessageWithBrackets(String message)
-  {
-    return ((message != null) && 
-            (message.indexOf("<")!= -1) && 
-            (message.indexOf(">") != -1));
-  }
-  /**
-   * Returns the header of a message.
-   * @param requestOrResponse: a message.
-   * @param headerLength: the length of the header in the message.
-   * @return the header of a message.
-   */ 
-  protected String getHeader(byte[] requestOrResponse,  int headerLength)
-  {
-    String result = null;
-    
-    if ((requestOrResponse != null) && 
-        (headerLength > 0) && 
-        (requestOrResponse.length >= headerLength))
-    {
-      byte[] header = new byte[headerLength];
-      System.arraycopy(requestOrResponse, 0, header, 0, headerLength);
-      result = new String(header);
-    }
-    return result;
-  }
-
-  /**
-   * Returns the body of a message.
-   * @param requestOrResponse: a message.
-   * @param headerLength: the length of the header in the message.
-   * @return the body of a message.
-   */ 
-  protected String getBody(byte[] requestOrResponse,  int headerLength)
-  {
-    String result = null;
-    
-    if ((requestOrResponse != null) && 
-        (headerLength > 0) && 
-        (requestOrResponse.length > headerLength))
-    {
-      int bodyLength = requestOrResponse.length - headerLength;
-      byte[] body = new byte[bodyLength];
-      System.arraycopy(requestOrResponse, headerLength, body, 0, bodyLength);
-      result = new String(body);
-    }
-    return result;
-  }
-      
-  /**
-   * Create a log entry.
-   * @param id: unique message id within the log.
-   * @param conversationId: conversation id to identify request-response pairs.
-   * @param type: type indicating a request or response.
-   * @param timestamp: the date and time of the message.
-   * @param senderHostAndPort: the host and port of the sender.
-   * @param receiverHostAndPort: the host and port of the receiver.
-   * @param messageContent: the content or body of the message.
-   * @param header: the header of the message.
-   * @return a log entry.
-   */
-  protected MessageEntry createMessageEntry(int id, int conversationId, String type, long timestamp, 
-        String senderHostAndPort, String receiverHostAndPort, byte[] messageContent, String header) 
-  {
- 	// Create log entry
-    MessageEntry messageEntry = new MessageEntryImpl();
-    messageEntry.setId(String.valueOf(id));
-    messageEntry.setConversationId(String.valueOf(conversationId));
-    messageEntry.setType(type);
-    messageEntry.setTimestamp(getTimestamp(new Date(timestamp)));
-    messageEntry.setSenderHostAndPort(senderHostAndPort);
-    messageEntry.setReceiverHostAndPort(receiverHostAndPort);
-    messageEntry.setEncoding(WSIConstants.DEFAULT_XML_ENCODING);
-    
-    messageEntry.setHTTPHeaders(header);
-
-    if (Utils.isMultipartRelatedMessage(header))
-    {
-    	MimeParts mimeParts = Utils.parseMultipartRelatedMessage(messageContent, header, WSIConstants.DEFAULT_XML_ENCODING);
-    	if (mimeParts == null)
-    	{
-    	  // problem creating Mimeparts -- treat it as simple SOAP message
-    	  messageEntry.setMessage(new String(messageContent));
-    	  messageEntry.setMimeContent(false);
-    	}
-    	else
-    	{
-          messageEntry.setMimeParts(mimeParts);
-          messageEntry.setMimeContent(true);
-    	}
-    }
-    else
-    {
-      // Get the message content
-      messageEntry.setMessage(new String(messageContent));
-      messageEntry.setMimeContent(false);
-    }
-    return messageEntry;
-  }
-
-  /**
-   * Returns the next available id, then increments the id value.
-   * @return the next available id.
-   */
-  protected int getNextAvailableId()
-  {
-    return id++;
-  }
-
-  /**
-   * Returns the next available conversation id, then increments the conversation id value.
-   * A conversation id identfies a request and its corresponding response.
-   * @return the next available converasationid.
-   */
-  protected int getNextAvailableConversationId()
-  {
-    return conversationId++;
-  }
-
-  public int getHeaderLength(Integer obj)
-  {
-    int result = 0;
-    if (obj != null)
-    {
-      result = obj.intValue();
-    }
-    return result;
-  }
-
-  /**
-   * Check for HTTP messages that should not be logged.
-   * @param rr: a request-response pair.
-   * @return true if the request-response pair should be omitted from the log.
-   */
-  private boolean omitRequestResponse(RequestHandler rr) 
-  {
-    boolean omit = false;
-    if (rr != null)
-    {
-      String request = rr.getRequestHeader().toString();
-      if ((request != null) &&
-          ((request.startsWith("CONNECT")) ||
-           (request.startsWith("TRACE")) || 
-           (request.startsWith("DELETE")) || 
-           (request.startsWith("OPTIONS")) || 
-           (request.startsWith("HEAD"))))
-      { 
-        omit = true;
-      }
-    }
-    return omit;
-  }
-
-  /**
-   * Write log out to file.
-   * @param log: log to be written to file.
-   */
-
-  public void writeLog(Log log)
-  {
-    try
-    {
-      // Get log writer
-      LogWriter logWriter = new LogWriterImpl();
-    
-      logWriter.setWriter(ifile.getLocation().toString());
-      
-      // Write start of log file
-      logWriter.write(new StringReader(log.getStartXMLString("")));
-    
-      // Write monitor tool information
-      String monitorInfo = generateMonitorToolInfo();
-      logWriter.write(new StringReader(monitorInfo));
-
-      for (int i=0; i<log.getEntryCount(); i++)
-      {
-        MessageEntry me = log.getLogEntry(i);
-        logWriter.write(new StringReader(me.toXMLString("")));
-      }
-      logWriter.write(new StringReader(log.getEndXMLString("")));
-      logWriter.close();
-    }
-    catch (Exception e)
-    {
-      System.out.println("Exception thrown when printing log file.");
-    }
-  }
-
-
-  /**
-   * Returns XML string representation of the Monitor tool.
-   * @return XML string representation of the Monitor tool.
-   */
-  protected String generateMonitorToolInfo()
-  {
-
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw); 
-
-    try
-    {
-      // Tool information
-      ToolInfo toolInfo = new ToolInfo(TOOL_NAME, TOOL_VERSION, TOOL_RELEASE_DATE, TOOL_IMPLEMENTER, TOOL_LOCATION);
-
-      DocumentFactory documentFactory = DocumentFactory.newInstance();
-      MonitorConfig monitorConfig = documentFactory.newMonitorConfig();
-    
-      Comment comment = new CommentImpl();
-      comment.setText("Comment");
-      monitorConfig.setComment(comment);
-      monitorConfig.setLogLocation("URL");
-      monitorConfig.setReplaceLog(true);
-
-      AddStyleSheet addStyleSheet = new AddStyleSheetImpl();
-      monitorConfig.setAddStyleSheet(addStyleSheet);
-
-      monitorConfig.setLogDuration(600);
-      monitorConfig.setTimeout(3);
-     
-      ManInTheMiddle manInTheMiddle = new ManInTheMiddleImpl();
-      monitorConfig.setManInTheMiddle(manInTheMiddle);
-
-      monitorConfig.setLocation("documentURI");
-      monitorConfig.setVerboseOption(false);
-
-      // Start     
-      pw.print(toolInfo.getStartXMLString(""));
-    
-      // Config
-      pw.print(monitorConfig.toXMLString(WSIConstants.NS_NAME_WSI_MONITOR_CONFIG));
-
-      // End
-      pw.println(toolInfo.getEndXMLString(""));
-    }
-    catch (Exception e)
-    {
-    }
-    return sw.toString();
-  }
-
-  /**
-   * Get the given date and time as a timestamp.
-   * @param date: a date object.
-   * @return the given date and time as a timestamp.
-   */
-  public static String getTimestamp(Date date)
-  {
-    timestampFormat.setTimeZone(TimeZone.getDefault());
-    return timestampFormat.format(date);
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/log/LogReader.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/log/LogReader.java
deleted file mode 100644
index cd6012844..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/log/LogReader.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.log;
-
-import java.io.Reader;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.document.DocumentReader;
-
-/**
- * Defines the interface used to read the Log file.
- * 
- * @version 1.0.1
- * @author Neil Delima (nddelima@ca.ibm.com)
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public interface LogReader extends DocumentReader
-{
-  /**
-   * Start reading log entries from a specified URI location using the specified callback.
-   * 
-   * @param logURI the location of the log file.
-   * @param logEntryHandler the function that will be called to process each log entry.
-   * @throws WSIException if problem reading log.
-   */
-  public void readLog(String logURI, MessageEntryHandler logEntryHandler)
-    throws WSIException;
-
-  /**
-   * Start reading log entries from a reader using the specified callback.
-   * 
-   * @param reader the source for the log file.
-   * @param logEntryHandler the function that will be called to process each log entry.
-   * @throws WSIException if problem reading log.
-   */
-  public void readLog(Reader reader, MessageEntryHandler logEntryHandler)
-    throws WSIException;
-
-  // ADD: Do we need to add functions that will read the entire log file?
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/log/LogWriter.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/log/LogWriter.java
deleted file mode 100644
index e8e33e896..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/log/LogWriter.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.log;
-
-import java.io.Writer;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.document.DocumentWriter;
-
-/**
- * Defines the interface used to write the Log file.
- * 
- * @version 1.0.1
- * @author Neil Delima (nddelima@ca.ibm.com)
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public interface LogWriter extends DocumentWriter
-{
-  /**
-   * Write the entire contents of the document using the location
-   * that was previously set using the setLocation method.
-   * @param log the Log object.
-   * @throws IllegalStateException if this operation has been invoked 
-   *         at an illegal or inappropriate time
-   * @throws WSIException if problems occur during the writing of 
-   *         the log.
-   */
-  public void write(Log log) throws IllegalStateException, WSIException;
-
-  /**
-   * Write the entire contents of the document.
-   * @param log the Log object.
-   * @param writer a Writer object.
-   * @throws WSIException if problems occur during the writing of 
-   *         the log.
-   */
-  public void write(Log log, Writer writer) throws WSIException;
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/log/MessageEntry.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/log/MessageEntry.java
deleted file mode 100644
index 1b58ff311..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/log/MessageEntryHandler.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/log/MessageEntryHandler.java
deleted file mode 100644
index 0401e2ad7..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/log/MimePart.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/log/MimePart.java
deleted file mode 100644
index ee46dc519..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/log/MimePart.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.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/src/org/eclipse/wst/wsi/internal/core/log/MimeParts.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/log/MimeParts.java
deleted file mode 100644
index cce3f1c15..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/log/RequestHandler.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/log/RequestHandler.java
deleted file mode 100644
index 8a92df449..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/log/RequestHandler.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.log;
-
-import java.util.Date;
-
-/**
- * Represents a TCP/IP request made between the client and the server.
- * Each request represents a request-response pair, where the request
- * is from client -> server, and the response is from server -> client.
- * 
- * @author lauzond
- */
-
-public interface RequestHandler 
-{
-	/**
-	 * Returns just the HTTP header of the request portion of this request.
-	 * @return the content bytes
-	 */
-	byte[] getRequestHeader();
-
-	/**
-	 * Add the HTTP header of the request portion of this request.
-	 * @param requestHeader byte[]
-	 */
-	void setRequestHeader(byte[] requestHeader);
-
-	/**
-	 * Returns just the HTTP header of the response portion of this request.
-	 * @return the content bytes
-	 */
-	byte[] getResponseHeader();
-
-	/**
-	 * Add the HTTP header of the response portion of this request.
-	 * @param responseHeader byte[]
-	 */
-	void setResponseHeader(byte[] responseHeader);
-
-	/**
-	 * Returns just the HTTP body of the request portion of this request.
-	 * @return the content bytes
-	 */
-	byte[] getRequestContent();
-
-	/**
-	 * Add the HTTP body of the request portion of this request.
-	 * @param requestContent byte[]
-	 */
-	void setRequestContent(byte[] requestContent);
-
-	/**
-	 * Returns just the HTTP body of the response portion of this request.
-	 * @return the content bytes
-	 */
-	byte[] getResponseContent();
-
-	/**
-	 * Add the HTTP body of the response portion of this request.
-	 * @param responseContent byte[]
-	 */
-	void setResponseContent(byte[] responseContent);
-
-	/**
-	 * Returns the time this request was made.
-	 * @return the timestamp
-	 */
-	Date getDate();
-
-	/**
-	 * Add the time this request was made.
-	 * @param date the time
-	 */
-    void setDate(Date date);
-
-    /**
-	 * Returns the local (client) port.
-	 * @return the local port number
-	 */
-	int getLocalPort();
-
-	/**
-	 * Add the local (client) port.
-	 * @param localPort the local port
-	 */
-	void setLocalPort(int localPort);
-
-	/**
-	 * Returns the remote (server) port.
-	 * @return the remote port number
-	 */
-	int getRemotePort();
-
-	/**
-	 * Add the the remote (server) port.
-	 * @param remotePort the remote port
-	 */
-	void setRemotePort(int remotePort);
-
-	/**
-	 * Returns the remote (server) host.
-     * @return the remote host
-	 */
-	String getRemoteHost();
-
-	/**
-	 * Add the remote (server) host.
-	 * @param remoteHost the remote host
-	 */
-	void setRemoteHost(String remoteHost);
-
-	/**
-	 * Returns the server's response time in milliseconds. 
-	 * @return the server's response time
-	 */
-	long getResponseTime();
-
-	/**
-	 * Add the the server's response time in milliseconds. 
-	 * @param responseTime the response time
-	 */
-	void setResponseTime(long responseTime);
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/log/impl/LogImpl.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/log/impl/LogImpl.java
deleted file mode 100644
index 02d78ad98..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/log/impl/LogImpl.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.log.impl;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Vector;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.log.Log;
-import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
-import org.eclipse.wst.wsi.internal.core.util.TestUtils;
-import org.eclipse.wst.wsi.internal.core.util.Utils;
-
-/**
- * This class represents the message log file.
- * 
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public class LogImpl implements Log
-{
-  /**
-   * Log URI.
-   */
-  protected String logURI = null;
-
-  /**
-   * Start time stamp.
-   */
-  protected String startTimestamp = null;
-
-  /**
-   * Log entries.
-   */
-  protected Vector logEntryList = new Vector();
-
-  /**
-   * Last log entry.
-   */
-  protected MessageEntry lastLogEntry = null;
-
-  /**
-   * Log title.
-   */
-  // ADD: Should we provide a way to set the log title?
-  protected String logTitle = "Message Log File";
-
-  /**
-   * Style sheet string.
-   */
-  protected String styleSheetString = null;
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.log.Log#addLogEntry(LogEntry)
-   */
-  public void addLogEntry(MessageEntry logEntry) throws WSIException
-  {
-    // Save last log entry
-    lastLogEntry = logEntry;
-
-    // Add log entry
-    logEntryList.add(logEntry);
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.log.Log#getEntryCount()
-   */
-  public int getEntryCount()
-  {
-    return logEntryList.size();
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.log.Log#getLogEntry(int)
-   */
-  public MessageEntry getLogEntry(int index)
-  {
-    return (MessageEntry) logEntryList.elementAt(index);
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.log.Log#getLogEntryList()
-   */
-  public Vector getLogEntryList()
-  {
-    return logEntryList;
-  }
-
-  /**
-   * Get last log entry.
-   */
-  public MessageEntry getLastLogEntry()
-  {
-    return lastLogEntry;
-  }
-
-  /**
-   * Create log entry object.
-   */
-  public MessageEntry createLogEntry()
-  {
-    return new MessageEntryImpl();
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.document.WSIDocument#getLocation()
-   */
-  public String getLocation()
-  {
-    return this.logURI;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.document.WSIDocument#setLocation(String)
-   */
-  public void setLocation(String documentURI)
-  {
-    this.logURI = documentURI;
-  }
-
-  /**
-   * Set style sheet string.
-   */
-  public void setStyleSheetString(String styleSheetString)
-  {
-    this.styleSheetString = styleSheetString;
-  }
-
-  /**
-   * Get start element string. 
-   */
-  public String getStartXMLString(String namespaceName)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    String nsName = namespaceName;
-    if ((!nsName.equals("") && (!nsName.endsWith(":"))))
-      nsName += ":";
-
-    // Create report element 
-    pw.println(WSIConstants.XML_DECL);
-    if (this.styleSheetString != null)
-      pw.println(this.styleSheetString);
-
-    // Add XML comment
-    String comment;
-    if ((comment = TestUtils.getXMLComment()) != null)
-      pw.print(comment);
-
-    // Log
-    pw.print("<" + nsName + ELEM_NAME);
-
-    // REMOVED: No longer required by the monitor spec
-    //pw.print(" " + WSIConstants.ATTR_NAME + "=\"" + logTitle + "\"");
-    pw.println(
-      " " + WSIConstants.ATTR_TIMESTAMP + "=\"" + Utils.getTimestamp() + "\"");
-    pw.println("    xmlns=\"" + WSIConstants.NS_URI_WSI_LOG + "\"");
-    pw.println(
-      "    xmlns:"
-        + WSIConstants.NS_NAME_WSI_MONITOR_CONFIG
-        + "=\""
-        + WSIConstants.NS_URI_WSI_MONITOR_CONFIG
-        + "\"");
-    //pw.println("    xmlns:" + WSIConstants.NS_NAME_WSI_COMMON + "=\"" + 
-    //      WSIConstants.NS_URI_WSI_COMMON + "\"");
-    pw.println(
-      "    xmlns:"
-        + WSIConstants.NS_NAME_XSI
-        + "=\""
-        + WSIConstants.NS_URI_XSI
-        + "\">");
-
-    // Add  monitor tool info
-    //pw.println(monitor.toXMLString(nsName));
-
-    // Return XML string
-    return sw.toString();
-  }
-
-  /**
-   * Get end element string. 
-   */
-  public String getEndXMLString(String namespaceName)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    String nsName = namespaceName;
-    if ((!nsName.equals("") && (!nsName.endsWith(":"))))
-      nsName += ":";
-
-    // End log element 
-    pw.println("</" + nsName + ELEM_NAME + ">");
-
-    // Return XML string
-    return sw.toString();
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.document.DocumentElement#toXMLString(String)
-   */
-  public String toXMLString(String namespaceName)
-  {
-    // ADD:
-    return null;
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/log/impl/LogReaderImpl.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/log/impl/LogReaderImpl.java
deleted file mode 100644
index f92971deb..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/log/impl/LogReaderImpl.java
+++ /dev/null
@@ -1,784 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.log.impl;
-
-import java.io.Reader;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.wst.wsi.internal.core.ToolEnvironment;
-import org.eclipse.wst.wsi.internal.core.ToolInfo;
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.log.LogReader;
-import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
-import org.eclipse.wst.wsi.internal.core.log.MessageEntryHandler;
-import org.eclipse.wst.wsi.internal.core.log.MimePart;
-import org.eclipse.wst.wsi.internal.core.log.MimeParts;
-import org.eclipse.wst.wsi.internal.core.monitor.config.Comment;
-import org.eclipse.wst.wsi.internal.core.monitor.config.impl.CommentImpl;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.report.ArtifactReference;
-import org.eclipse.wst.wsi.internal.core.report.Entry;
-import org.eclipse.wst.wsi.internal.core.report.impl.ArtifactReferenceImpl;
-import org.eclipse.wst.wsi.internal.core.report.impl.EntryImpl;
-import org.eclipse.wst.wsi.internal.core.util.EntryType;
-import org.eclipse.wst.wsi.internal.core.util.Utils;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.eclipse.wst.wsi.internal.core.xml.dom.ElementLocation;
-import org.xml.sax.Attributes;
-import org.xml.sax.InputSource;
-import org.xml.sax.Locator;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * Defines the implementation used to read the Log file.
- * 
- * @version 1.0.1
- * @author Neil Delima (nddelima@ca.ibm.com)
- * @author Peter Brittenham (peterbr@us.ibm.com)
- * @author Graham Turrell (gturrell@uk.ibm.com)
- */
-public class LogReaderImpl implements LogReader
-{
-  /**
-   * Document location.
-   */
-  private String documentURI;
-
-  /** Used to ensure that the implementer is the first element after the log element **/
-  private int firstLogElement = 0;
-  private int elementCount = 0;
-  private boolean bMonitorFirst = false;
-
-  private WSIException wsiException = null;
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.log.LogReader#readLog(String, LogEntryHandler)
-   */
-  public void readLog(String logURI, MessageEntryHandler logReaderCallback)
-    throws WSIException
-  {
-    // Read the log file entries
-    readLog(new InputSource(logURI), logReaderCallback);
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.log.LogReader#readLog(Reader, LogEntryHandler)
-   */
-  public void readLog(Reader reader, MessageEntryHandler logReaderCallback)
-    throws WSIException
-  {
-    // Read the log file entries
-    readLog(new InputSource(reader), logReaderCallback);
-  }
-
-  /**
-   * Read and parse the log file.
-   * @param inputSource          an InputSource object
-   * @param messageEntryHandler  a MessageEntryHandler object
-   * @throws WSIException if a problem occurs while reading the log file.
-   */
-  protected void readLog(
-    InputSource inputSource,
-    MessageEntryHandler messageEntryHandler)
-    throws WSIException
-  {
-    try
-    {
-      // Get the XML reader
-      XMLReader xmlReader = XMLUtils.getXMLReader();
-
-      /** TO DO:  The LogFile must be valid wrt its schema.  The schemaLocation probably
-       * needs to be set in some properties file.
-       * These two are to turn on validation 
-      reader.setFeature(FEATURE_VALIDATION,true);
-      */
-
-      // Set the content handler
-      xmlReader.setContentHandler(new LogFileHandler(messageEntryHandler));
-
-      // Start parsing the file
-      xmlReader.parse(inputSource);
-
-      // ADD: Need to find a way to determine when this exception should be thrown, 
-      // since by the time we get here all of the test assertions have been processed.
-      // Also, only the last exception is propogated back.  Should all of the exceptions
-      // be captured and propogated back?
-      if (wsiException != null)
-      {
-        // TEMP: For now, don't throw the exception
-        //throw wsiException;
-      }
-
-      //Requirement, the monitor MUST be the first child of the log.
-      //Perhaps we need to preprocess the log if this is the first condition to be met.
-      if (!bMonitorFirst)
-        throw new WSIException(
-          "The Element \""
-            + WSIConstants.ELEM_MONITOR
-            + "\" is not the first child of the Element \"log\"");
-    }
-    catch (Exception e)
-    {
-      throw new WSIException(
-        "An error occurred while processing the message log file.",
-        e);
-    }
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.document.DocumentReader#getLocation()
-   */
-  public String getLocation()
-  {
-    return this.documentURI;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.document.DocumentReader#setLocation(String)
-   */
-  public void setLocation(String documentURI)
-  {
-    this.documentURI = documentURI;
-  }
-
-  /**
-  * Process and handles elements and attribute in the log file and invokes
-  * message validation assertions serially as the file is being processed,
-  * if a messagevalidator exists.
-  */
-  private class LogFileHandler extends DefaultHandler
-  {
-
-    /** private members that represent a MessageEntry.*/
-    private String id;
-    private String conversationID;
-    private String type;
-    private String timestamp;
-    private StringBuffer senderHostAndPort = null;
-    private StringBuffer receiverHostAndPort  = null;
-    private StringBuffer messageContent  = null;
-    private StringBuffer httpHeaders  = null;
-    private StringBuffer boundary  = null;
-    private StringBuffer mimeHeaders = null;
-    private StringBuffer mimeContent = null;
-    private MimeParts mimeParts = null;
-    private List boundaries = null;
-
-    private int bom = 0;
-
-    private String logTimestamp = null;
-    private StringBuffer monitorComment;
-    private boolean ignoreComment = false;
-
-    /** Other private members */
-    private String currentElement;
-
-    private ElementLocation entryElementLocation = null;
-
-    private ToolInfo toolInfo = null;
-
-    private Vector messageEntryList = new Vector();
-
-    private MessageEntryHandler logEntryHandler = null;
-
-    private Locator locator = null;
-
-    /**
-     * Log file handler. 
-     */
-    public LogFileHandler(MessageEntryHandler logEntryHandler)
-    {
-      this.logEntryHandler = logEntryHandler;
-
-      toolInfo = new ToolInfo();
-      toolInfo.setToolEnvironment(new ToolEnvironment());
-    }
-
-    /** 
-     * Start document. 
-     */
-    public void startDocument()
-    {
-    }
-
-    /** 
-     * Set document locato.
-     */
-    public void setDocumentLocator(Locator locator)
-    {
-      this.locator = locator;
-
-      // DEBUG:
-      //System.out.println("line: " + locator.getLineNumber() + ", column: " + locator.getColumnNumber());
-    }
-
-    /** 
-     * Start element. 
-     */
-    public void startElement(
-      String namespaceURI,
-      String localName,
-      String qName,
-      Attributes attributes)
-    {
-      // DEBUG:
-      //System.out.println("localName:" + localName + ", line: " + locator.getLineNumber() + ", column: " + locator.getColumnNumber());
-
-      //Requirement, the implementer MUST be the first child of the log       
-      if (elementCount == 2)
-        if (firstLogElement == 1)
-          bMonitorFirst = true;
-
-      elementCount++;
-
-      // <log>
-      if (localName == WSIConstants.ELEM_LOG)
-      {
-        // Save the timestamp value
-        this.logTimestamp = attributes.getValue(WSIConstants.ATTR_TIMESTAMP);
-      }
-
-      // <wsi-config:configuration>
-      else if (
-        (localName == WSIConstants.ELEM_CONFIG)
-          && (namespaceURI == WSIConstants.NS_URI_WSI_MONITOR_CONFIG))
-      {
-        // Save comment element if it exists
-        ignoreComment = false;
-      }
-
-      // <wsi-config:comment>
-      else if (
-        (localName == WSIConstants.ELEM_COMMENT)
-          && (namespaceURI == WSIConstants.NS_URI_WSI_MONITOR_CONFIG))
-      {
-        // If this is the comment element within the configuration element, then get its content
-        if (!ignoreComment)
-        {
-          currentElement = WSIConstants.ELEM_COMMENT;
-          monitorComment = new StringBuffer();
-        }
-      }
-
-      // <wsi-config:redirect>
-      else if (
-        (localName == WSIConstants.ELEM_REDIRECT)
-          && (namespaceURI == WSIConstants.NS_URI_WSI_MONITOR_CONFIG))
-      {
-        // After hitting the first redirect statement, ignore all comment elements
-        ignoreComment = true;
-        monitorComment = null;
-      }
-
-      // <monitor>
-      else if (localName == WSIConstants.ELEM_MONITOR)
-      {
-        firstLogElement++;
-        toolInfo.setName(WSIConstants.ELEM_MONITOR);
-
-        // Get the monitor version and release date
-        toolInfo.setVersion(attributes.getValue(WSIConstants.ATTR_VERSION));
-        toolInfo.setReleaseDate(
-          attributes.getValue(WSIConstants.ATTR_RELEASE_DATE));
-      }
-
-      // <implementer>
-      else if (localName == WSIConstants.ELEM_IMPLEMENTER)
-      {
-        currentElement = WSIConstants.ELEM_IMPLEMENTER;
-        toolInfo.setImplementer(attributes.getValue(WSIConstants.ATTR_NAME));
-        toolInfo.setLocation(attributes.getValue(WSIConstants.ATTR_LOCATION));
-      }
-
-      // <runtime>
-      else if (localName == WSIConstants.ELEM_RUNTIME)
-      {
-        currentElement = WSIConstants.ELEM_RUNTIME;
-        toolInfo.getToolEnvironment().setRuntimeName(
-          attributes.getValue(WSIConstants.ATTR_NAME));
-        toolInfo.getToolEnvironment().setRuntimeVersion(
-          attributes.getValue(WSIConstants.ATTR_VERSION));
-      }
-
-      // <operatingSystem>
-      else if (localName == WSIConstants.ELEM_OPERATING_SYSTEM)
-      {
-        currentElement = WSIConstants.ELEM_OPERATING_SYSTEM;
-        toolInfo.getToolEnvironment().setOSName(
-          attributes.getValue(WSIConstants.ATTR_NAME));
-        toolInfo.getToolEnvironment().setOSVersion(
-          attributes.getValue(WSIConstants.ATTR_VERSION));
-      }
-
-      // <xmlParser>
-      else if (localName == WSIConstants.ELEM_XML_PARSER)
-      {
-        currentElement = WSIConstants.ELEM_XML_PARSER;
-        toolInfo.getToolEnvironment().setXMLParserName(
-          attributes.getValue(WSIConstants.ATTR_NAME));
-        toolInfo.getToolEnvironment().setXMLParserVersion(
-          attributes.getValue(WSIConstants.ATTR_VERSION));
-      }
-
-      // <messageEntry>
-      else if (localName == WSIConstants.ELEM_MESSAGE_ENTRY)
-      {
-        currentElement = WSIConstants.ELEM_MESSAGE_ENTRY;
-        entryElementLocation = new ElementLocation(this.locator);
-        timestamp = attributes.getValue(WSIConstants.ATTR_TIMESTAMP);
-        conversationID = attributes.getValue(WSIConstants.ATTR_CONVERSATION_ID);
-        id = attributes.getValue(WSIConstants.ATTR_ID_UC);
-        type = attributes.getValue(WSIConstants.ATTR_TYPE);
-      }
-
-      // <httpHeaders>
-      else if (localName == WSIConstants.ELEM_HTTP_HEADERS)
-      {
-        //Note: Character data could be split up and returned 
-        //in more more than one characters call. 
-        httpHeaders = new StringBuffer();
-        currentElement = WSIConstants.ELEM_HTTP_HEADERS;
-      }
-
-      // <messageContent>
-      else if (localName == WSIConstants.ELEM_MESSAGE_CONTENT)
-      {
-        messageContent = new StringBuffer();
-        mimeParts = null;
-        currentElement = WSIConstants.ELEM_MESSAGE_CONTENT;
-        String bomString = attributes.getValue(WSIConstants.ATTR_BOM);
-        if (bomString != null)
-          bom = Integer.valueOf(bomString).intValue();
-        else
-          bom = 0;
-      }
-
-      // <messageContentWithAttachments>
-      else if (localName == WSIConstants.ELEM_MESSAGE_CONTENT_WITH_ATTACHMENTS)
-      {
-        messageContent = null;
-        mimeParts = new MimePartsImpl();
-
-        String bomString = attributes.getValue(WSIConstants.ATTR_BOM);
-        if (bomString != null)
-          bom = Integer.valueOf(bomString).intValue();
-        else
-          bom = 0;
-      }
-
-      // <mimePart>
-      else if (localName == WSIConstants.ELEM_MIME_PART)
-      {
-        if (boundaries == null)
-          boundaries = new ArrayList(2);
-        else
-          boundaries.clear();
-      }
-
-      // <boundaryString>
-      else if (localName == WSIConstants.ELEM_BOUNDARY_STRING)
-      {
-        boundary = new StringBuffer();
-        currentElement = WSIConstants.ELEM_BOUNDARY_STRING;
-      }
-
-      // <mimeHeaders>
-      else if (localName == WSIConstants.ELEM_MIME_HEADERS)
-      {
-        mimeHeaders = new StringBuffer();
-        currentElement = WSIConstants.ELEM_MIME_HEADERS;
-      }
-
-      // <mimeContent>
-      else if (localName == WSIConstants.ELEM_MIME_CONTENT)
-      {
-        mimeContent = new StringBuffer();
-        currentElement = WSIConstants.ELEM_MIME_CONTENT;
-      }
-
-      // <senderHostAndPort>
-      else if (localName == WSIConstants.ELEM_SENDER_HOST_AND_PORT)
-      {
-        senderHostAndPort = new StringBuffer();
-        currentElement = WSIConstants.ELEM_SENDER_HOST_AND_PORT;
-      }
-
-      // <receiverHostAndPort>
-      else if (localName == WSIConstants.ELEM_RECEIVER_HOST_AND_PORT)
-      {
-        receiverHostAndPort = new StringBuffer();
-        currentElement = WSIConstants.ELEM_RECEIVER_HOST_AND_PORT;
-      }
-    }
-
-    /** 
-    * Characters callback. 
-    */
-    public void characters(char ch[], int start, int length)
-    {
-      // Ignoring CRLF that appears in log elements
-      int altStart = start;
-      int altLength = length;
-      if (start > 0 && ch[start-1] == 13 && ch[start] == 10)
-      {
-        altStart++;
-        altLength--;
-      }
-
-      // <wsi-monConfig:comment>
-      if (monitorComment != null && currentElement == WSIConstants.ELEM_COMMENT)
-      {
-        monitorComment.append(ch, start, length);
-      }
-
-      // <messageContent>
-      else if (messageContent != null
-        && currentElement == WSIConstants.ELEM_MESSAGE_CONTENT)
-      {
-        messageContent.append(ch, start, length);
-      }
-
-      // <httpHeaders>
-      else if (httpHeaders != null
-        && currentElement == WSIConstants.ELEM_HTTP_HEADERS)
-      {
-        httpHeaders.append(ch, start, length);
-      }
-
-      // <boundaryString>
-      else if (boundary != null
-        && currentElement == WSIConstants.ELEM_BOUNDARY_STRING)
-      {
-        boundary.append(ch, altStart, altLength);
-      }
-
-      // <mimeHeaders>
-      else if (mimeHeaders != null
-        && currentElement == WSIConstants.ELEM_MIME_HEADERS)
-      {
-        mimeHeaders.append(ch, altStart, altLength);
-      }
-
-      // <mimeContent>
-      else if (mimeContent != null
-        && currentElement == WSIConstants.ELEM_MIME_CONTENT)
-      {
-        mimeContent.append(ch, altStart, altLength);
-      }
-
-      // <senderHostAndPort>
-      else if (senderHostAndPort != null
-        && currentElement == WSIConstants.ELEM_SENDER_HOST_AND_PORT)
-      {
-        senderHostAndPort.append(ch, start, length);
-      }
-
-      // <receiverHostAndPort>
-      else if (receiverHostAndPort != null
-        && currentElement == WSIConstants.ELEM_RECEIVER_HOST_AND_PORT)
-      {
-        receiverHostAndPort.append(ch, start, length);
-      }
-    }
-
-    /** 
-     * End Element. 
-     */
-    public void endElement(String namespaceURI, String localName, String qName)
-    {
-      // <wsi-config:comment>
-      if (
-        (localName == WSIConstants.ELEM_COMMENT)
-          && (namespaceURI == WSIConstants.NS_URI_WSI_MONITOR_CONFIG))
-      {
-        // If we saved the comment, then process it and the log timestamp
-        if (this.monitorComment != null)
-        {
-          ArtifactReference artifactReference = new ArtifactReferenceImpl();
-          artifactReference.setTimestamp(this.logTimestamp);
-          Comment comment = new CommentImpl();
-          comment.setText(monitorComment.toString());
-          artifactReference.setDocumentElement(
-            comment,
-            WSIConstants.NS_NAME_WSI_MONITOR_CONFIG);
-          processArtifactReference(artifactReference);
-        }
-      }
-
-      // <boundaryString>
-      else if (localName == WSIConstants.ELEM_BOUNDARY_STRING)
-      {
-        // Adding boundary string to a list
-        boundaries.add(boundary.toString());
-      }
-
-      // <mimePart>
-      else if (localName == WSIConstants.ELEM_MIME_PART)
-      {
-        // Creating a MessageMIMEPart instance
-        MimePart part = new MimePartImpl();
-        part.setHeaders(mimeHeaders.toString());
-        part.setContent(mimeContent.toString());
-        part.setBoundaryStrings((String[])boundaries.toArray(new String[0]));
-
-        mimeParts.addPart(part);
-      }
-
-      // <messageEntry>
-      else if (localName == WSIConstants.ELEM_MESSAGE_ENTRY)
-      {
-        // Assumption: Related messages are sequentially available in the message log.
-        if (MessageEntry.TYPE_REQUEST.equalsIgnoreCase(type))
-        {
-          // Create log entry
-          MessageEntry messageEntryRequest =
-            createMessageEntry(
-                id,
-                conversationID,
-                type,
-                timestamp,
-                senderHostAndPort.toString(),
-                receiverHostAndPort.toString(),
-                messageContent == null ? "" : messageContent.toString(),
-                httpHeaders.toString(),
-                mimeParts,
-                entryElementLocation);
-
-          // Add log entry to the list
-          messageEntryList.add(messageEntryRequest);
-
-          // Request is now processed only when the response is received.             
-        }
-
-        else if (MessageEntry.TYPE_RESPONSE.equalsIgnoreCase(type))
-        {
-          // Create log entry
-          MessageEntry messageEntryResponse =
-            createMessageEntry(
-                id,
-                conversationID,
-                type,
-                timestamp,
-                senderHostAndPort.toString(),
-                receiverHostAndPort.toString(),
-                messageContent == null ? "" : messageContent.toString(),
-                httpHeaders.toString(),
-                mimeParts,
-                entryElementLocation);
-
-          // Add log entry to the list
-          messageEntryList.add(messageEntryResponse);
-
-          if (logEntryHandler != null)
-          {
-            // look up the request message
-            // ISSUE : need to throw & catch a nullpointerexception in here...
-            MessageEntry messageEntryRequest = findRelatedRequest(messageEntryResponse);
-
-            if (messageEntryRequest != null)
-            {
-              // Create entry 
-              // ADD: Need to create entry from report
-              //Entry entry = this.reporter.getReport().createEntry();
-              Entry entry = new EntryImpl();
-              entry.setEntryType(
-                  EntryType.getEntryType(EntryType.TYPE_MESSAGE_REQUEST));
-              entry.setReferenceID(messageEntryRequest.getId());
-              entry.setEntryDetail(messageEntryRequest);
-
-              // Create the context for the request-response pair
-              EntryContext requestTargetContext =
-                new EntryContext(
-                    entry,
-                    messageEntryRequest,
-                    messageEntryResponse);
-              if (requestTargetContext != null)
-                processLogEntry(requestTargetContext);
-            }
-
-            // Create entry 
-            // ADD: Need to create entry from report
-            //Entry entry = this.reporter.getReport().createEntry();
-            Entry entry = new EntryImpl();
-            entry.setEntryType(
-                EntryType.getEntryType(EntryType.TYPE_MESSAGE_RESPONSE));
-            entry.setReferenceID(messageEntryResponse.getId());
-            entry.setEntryDetail(messageEntryResponse);
-
-            EntryContext responseTargetContext =
-              new EntryContext(
-                  entry,
-                  messageEntryRequest,
-                  messageEntryResponse);
-            if (responseTargetContext != null)
-              processLogEntry(responseTargetContext);
-          }
-        }
-      }
-
-      currentElement = null;
-    }
-
-    /** 
-    * End Document. 
-    */
-    public void endDocument()
-    {
-      //If we want to serially process the log file.  Invoke validateMessages with
-      //msgValidator!=null.  Here we have the option of clearing the logEntry vector
-      //once message validation is done.
-      //if (msgValidator!=null)
-      //logEntryList.clear();
-    }
-
-    /**
-     * Process the message in the log entry.
-     */
-    public void processLogEntry(EntryContext entryContext)
-    {
-      try
-      {
-        //Before validating any messages check if implementer is the first element.
-        logEntryHandler.processLogEntry(entryContext);
-      }
-      catch (Exception e)
-      {
-        wsiException =
-          new WSIException(
-            "An error occurred while validating"
-              + " the message logEntry: "
-              + entryContext.getMessageEntry().getId(),
-            e);
-      }
-    }
-
-    /**
-     * Process the artifact reference.
-     */
-    private void processArtifactReference(ArtifactReference artifactReference)
-    {
-      try
-      {
-        //Before validating any messages check if implementer is the first element.
-        logEntryHandler.processArtifactReference(artifactReference);
-      }
-
-      catch (Exception e)
-      {
-        wsiException =
-          new WSIException(
-            "An error occurred while processing"
-              + " the artifact reference: "
-              + artifactReference.toString(),
-            e);
-      }
-    }
-
-    /**
-       * Find the related Request LogEntry.  The current rule for related log entires is
-       * that a request will always precede its response.
-       * ISSUE: Sequence in log file is timestamp driven (monitor spec). 
-       * Assertion is that for a given conversationID, a second request is not sent 
-       * until its response is received (chronologically). 
-       * This method will have to be modified if the rule changes.
-       */
-    // could be made more efficient by keeping a much smaller list of unresponded requests...
-    public MessageEntry findRelatedRequest(MessageEntry logEntryResponse)
-    {
-      for (int entry = messageEntryList.size() - 1; entry >= 0; entry--)
-      {
-        // Get the log entry of the matching request
-        MessageEntry logEntry = (MessageEntry) messageEntryList.get(entry);
-        // Ignore own entry
-        if (!logEntryResponse.equals(logEntry))
-        {
-          if (logEntryResponse
-            .getConversationId()
-            .equals(logEntry.getConversationId()))
-          {
-            // found the most recently read message with the same conversationID.
-            // From above, this should be the corresponding request. Check as far as possible.
-            if (logEntry.getType().equals(MessageEntry.TYPE_REQUEST))
-            {
-              return logEntry;
-            }
-            else
-            {
-              return null; // expected a request. need to throw an exception!
-            }
-          }
-        }
-      }
-      return null;
-      // conversationID match not found anywhere. need to throw an exception!
-    }
-
-    /**
-     * Create log entry.
-     */
-    private MessageEntry createMessageEntry(
-      String id,
-      String conversationId,
-      String type,
-      String timestamp,
-      String senderIPPort,
-      String receiverIPPort,
-      String messageContent,
-      String httpHeaders,
-      MimeParts mimeParts,
-      ElementLocation elementLocation)
-    {
-      // Create log entry
-      MessageEntry messageEntry = new MessageEntryImpl();
-      messageEntry.setId(id);
-      messageEntry.setConversationId(conversationID);
-      messageEntry.setType(type);
-      messageEntry.setTimestamp(timestamp);
-      messageEntry.setSenderHostAndPort(senderIPPort);
-      messageEntry.setReceiverHostAndPort(receiverIPPort);
-      messageEntry.setHTTPHeaders(httpHeaders);
-      messageEntry.setBOM(bom);
-      messageEntry.setElementLocation(elementLocation);
-
-      String encoding = null;
-      if (mimeParts == null)
-      {
-        // Get the encoding for this message content
-        encoding = Utils.getXMLEncoding(messageContent);
-        messageEntry.setMessage(messageContent);
-       	messageEntry.setMimeContent(false);
-      }
-      else
-      {
-       	messageEntry.setMimeParts(mimeParts);
-       	MimePart root = Utils.findRootPart(httpHeaders, mimeParts.getParts());
-       	if (root != null)
-       	{
-          // Get the encoding for this message content
-          encoding = Utils.getXMLEncoding(root.getContent());
-          mimeParts.setRootPart(root);
-       	}
-   		// else empty body
-       	messageEntry.setMimeContent(true);
-      }
-      if ((encoding == null) || (encoding.equals("")))
-         encoding = WSIConstants.DEFAULT_XML_ENCODING;
-      messageEntry.setEncoding(encoding);
-
-      return messageEntry;
-    }
-
-  } //End ContentHandler
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/log/impl/LogWriterImpl.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/log/impl/LogWriterImpl.java
deleted file mode 100644
index 90ee98217..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/log/impl/MessageEntryImpl.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/log/impl/MessageEntryImpl.java
deleted file mode 100644
index afc7a3f3e..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/log/impl/MessageEntryImpl.java
+++ /dev/null
@@ -1,374 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.log.impl;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
-import org.eclipse.wst.wsi.internal.core.log.MimePart;
-import org.eclipse.wst.wsi.internal.core.log.MimeParts;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.eclipse.wst.wsi.internal.core.xml.dom.ElementLocation;
-
-/**
- * Message entry implementation.
- * 
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public class MessageEntryImpl implements MessageEntry
-{
-  /**
-   * Log entry id.
-   */
-  protected String id;
-
-  protected String conversationId;
-  protected String type;
-  protected String timestamp;
-  protected String senderHostAndPort;
-  protected String receiverHostAndPort;
-  protected String message = "";
-  protected String httpHeaders = "";
-  protected int bom;
-  protected String encoding = "";
-  protected boolean isMimeContent = false;
-  protected MimeParts mimeParts = new MimePartsImpl();
-
-  protected ElementLocation elementLocation = null;
-
-  /**
-   * Empty constructor.
-   */
-  public MessageEntryImpl()
-  {
-  }
-  
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.LogEntry#getId()
-   */
-  public String getId()
-  {
-    return this.id;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.LogEntry#setId(String)
-   */
-  public void setId(String id)
-  {
-    this.id = id;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.LogEntry#getConversationId()
-   */
-  public String getConversationId()
-  {
-    return this.conversationId;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.LogEntry#setConversationId(String)
-   */
-  public void setConversationId(String conversationId)
-  {
-    this.conversationId = conversationId;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.LogEntry#getTimestamp()
-   */
-  public String getTimestamp()
-  {
-    return this.timestamp;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.LogEntry#setTimestamp(String)
-   */
-  public void setTimestamp(String timestamp)
-  {
-    this.timestamp = timestamp;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.LogEntry#getType()
-   */
-  public String getType()
-  {
-    return this.type;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.LogEntry#setType(String)
-   */
-  public void setType(String type)
-  {
-    this.type = type;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.LogEntry#getSenderHostAndPort()
-   */
-  public String getSenderHostAndPort()
-  {
-    return this.senderHostAndPort;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.LogEntry#setSenderHostAndPort(String)
-   */
-  public void setSenderHostAndPort(String senderHostAndPort)
-  {
-    this.senderHostAndPort = senderHostAndPort;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.LogEntry#getReceiverHostAndPort()
-   */
-  public String getReceiverHostAndPort()
-  {
-    return this.receiverHostAndPort;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.LogEntry#setReceiverHostAndPort(String)
-   */
-  public void setReceiverHostAndPort(String receiverHostAndPort)
-  {
-    this.receiverHostAndPort = receiverHostAndPort;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.LogEntry#getMessage()
-   */
-  public String getMessage()
-  {
-  	if (!this.isMimeContent)
-       return this.message;
-  	else
-  	{
-  	   if (this.mimeParts.getRootPart() == null) return "";
-  	   else return this.mimeParts.getRootPart().getContent();
-  	}
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.LogEntry#setMessage(String)
-   */
-  public void setMessage(String message)
-  {
-    this.message = message;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.LogEntry#setEncoding(String)
-   */
-  public void setEncoding(String encoding)
-  {
-    this.encoding = encoding;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.MessageEntry#getBOM()
-   */
-  public int getBOM()
-  {
-    return bom;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.MessageEntry#setBOM(int)
-   */
-  public void setBOM(int bom)
-  {
-    this.bom = bom;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.LogEntry#getHTTPHeaders()
-   */
-  public String getHTTPHeaders()
-  {
-    return this.httpHeaders;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.LogEntry#setHTTPHeaders(String)
-   */
-  public void setHTTPHeaders(String httpHeaders)
-  {
-    this.httpHeaders = httpHeaders;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.MessageEntry#getElementLocation()
-   */
-  public ElementLocation getElementLocation()
-  {
-    return this.elementLocation;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.MessageEntry#setElementLocation(org.wsi.xml.dom.ElementLocation)
-   */
-  public void setElementLocation(ElementLocation elementLocation)
-  {
-    this.elementLocation = elementLocation;
-  }
-
-  /**
-   * Get string representation of this object.
-   */
-  public String toString()
-  {
-    return toXMLString(WSIConstants.NS_NAME_WSI_LOG);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.DocumentElement#toXMLString(String)
-   */
-  public String toXMLString(String namespaceName)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    String nsName = namespaceName;
-    if ((!nsName.equals("") && (!nsName.endsWith(":"))))
-      nsName += ":";
-
-    // ADD: Need to add way to indicate XML schema type for logEntry
-    // Add log entry
-    pw.print("<" + nsName + ELEM_NAME + " ");
-    pw.print(
-      "xsi:type=\"httpMessageEntry\" ");
-    pw.print(WSIConstants.ATTR_ID_UC + "=\"" + id + "\" ");
-    pw.print(
-      WSIConstants.ATTR_CONVERSATION_ID + "=\"" + conversationId + "\" ");
-    pw.print(WSIConstants.ATTR_TYPE + "=\"" + type + "\" ");
-    pw.println(WSIConstants.ATTR_TIMESTAMP + "=\"" + timestamp + "\">");
-
-    if (isMimeContent())
-    {
-        // Add message content with attachments element
-        pw.print("<" + nsName + WSIConstants.ELEM_MESSAGE_CONTENT_WITH_ATTACHMENTS);
-        if (bom != 0)
-          pw.print(" " + WSIConstants.ATTR_BOM + "=\"" + bom + "\"");
-        pw.print(">");
-
-        Collection partList = mimeParts.getParts();
-        if (!partList.isEmpty())
-        {
-         	Iterator iMimeParts = partList.iterator();
-        	while (iMimeParts.hasNext())
-            {
-        	  MimePart mimePart = (MimePart)iMimeParts.next();
-         	  pw.print(mimePart.toXMLString(namespaceName));
-            }
-        }
-
-        // Add end message element
-        pw.println("</" + nsName + WSIConstants.ELEM_MESSAGE_CONTENT_WITH_ATTACHMENTS + ">");
-    }
-    else
-    {
-      // Add message content element
-      pw.print("<" + nsName + WSIConstants.ELEM_MESSAGE_CONTENT);
-      if (bom != 0)
-        pw.print(" " + WSIConstants.ATTR_BOM + "=\"" + bom + "\"");
-      pw.print(">");
-
-      // Add encoded message
-      pw.print(XMLUtils.xmlEscapedString(message));
-      
-      // Add end message element
-      pw.println("</" + nsName + WSIConstants.ELEM_MESSAGE_CONTENT + ">");
-    }
-
-    // Add senderIPPort element
-    pw.println(
-      "<"
-        + nsName
-        + WSIConstants.ELEM_SENDER_HOST_AND_PORT
-        + ">"
-        + senderHostAndPort
-        + "</"
-        + nsName
-        + WSIConstants.ELEM_SENDER_HOST_AND_PORT
-        + ">");
-
-    // Add receiverIP element
-    pw.println(
-      "<"
-        + nsName
-        + WSIConstants.ELEM_RECEIVER_HOST_AND_PORT
-        + ">"
-        + receiverHostAndPort
-        + "</"
-        + nsName
-        + WSIConstants.ELEM_RECEIVER_HOST_AND_PORT
-        + ">");
-
-    // Add HTTPHeaders element
-    pw.print("<" + nsName + WSIConstants.ELEM_HTTP_HEADERS + ">");
-
-    // ADD: Does this string need to be XML encoded?
-    // Add HTTP headers
-    pw.print(XMLUtils.xmlEscapedString(httpHeaders));
-
-    // End HTTPHeaders element
-    pw.println("</" + nsName + WSIConstants.ELEM_HTTP_HEADERS + ">");
-
-    // End log entry
-    pw.println("</" + nsName + ELEM_NAME + ">");
-
-    // Return string
-    return sw.toString();
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.MessageEntry#isMimeContent()
-   */
-  public boolean isMimeContent()
-  {
-    return isMimeContent;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.MessageEntry#setMimeContent()
-   */
-  public void setMimeContent(boolean isMimeContent)
-  {
-    this.isMimeContent = isMimeContent;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.MessageEntry#getMIMEParts()
-   */
-  public MimeParts getMimeParts()
-  {
-    return mimeParts;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.MessageEntry#setMimeParts()
-   */
-  public void setMimeParts(MimeParts mimeParts)
-  {
-    this.mimeParts = mimeParts;
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/log/impl/MimePartImpl.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/log/impl/MimePartImpl.java
deleted file mode 100644
index c9e7dfe3a..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/log/impl/MimePartImpl.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.log.impl;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import 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/src/org/eclipse/wst/wsi/internal/core/log/impl/MimePartsImpl.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/log/impl/MimePartsImpl.java
deleted file mode 100644
index d3392c1a9..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/monitor/ChunkedData.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/ChunkedData.java
deleted file mode 100644
index c6b1a01a5..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/ChunkedData.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.monitor;
-
-/**
- * This class will process chunked data.
- * 
- * @author Peter  Brittenham (peterbr@us.ibm.com)
- * @version 1.0.1
- */
-public class ChunkedData
-{
-  protected boolean moreChunkedData = false;
-  protected String chunkedData = "";
-  protected SocketHandler socketHandler = null;
-
-  /**
-   * Constructs a ChunkedData object.
-   */
-  public ChunkedData()
-  {
-  }
-
-  /**
-   * Constructs a ChunkedData object.
-   * @param socketHandler socket handler.
-   * @param moreChunkedData chunked data.
-   */
-  public ChunkedData(SocketHandler socketHandler, boolean moreChunkedData)
-  {
-    this.socketHandler = socketHandler;
-    this.moreChunkedData = moreChunkedData;
-  }
-
-  /**
-   * Constructs a ChunkedData object.
-   * @param socketHandler socket handler.
-   * @param chunkedData chunked data.
-   */
-  public ChunkedData(SocketHandler socketHandler, String chunkedData)
-  {
-    this.socketHandler = socketHandler;
-    this.chunkedData = chunkedData;
-    this.moreChunkedData = checkData(chunkedData);
-  }
-
-  /**
-   * Add the chunked data to the buffer.
-   * @param chunkedData chunked data.
-   */
-  public void addData(String chunkedData)
-  {
-    this.chunkedData += chunkedData;
-    this.moreChunkedData = checkData(chunkedData);
-  }
-
-  /**
-   * Get data buffer.
-   * @return  data buffer.
-   */
-  public String getData()
-  {
-    return this.chunkedData;
-  }
-
-  /**
-   * Clear data buffer.
-   */
-  public void clearData()
-  {
-    this.chunkedData = "";
-  }
-
-  /**
-   * Returns true if there is more chunked data.
-   * @return true if there is more chunked data.
-   */
-  public boolean isMoreChunkedData()
-  {
-    return this.moreChunkedData;
-  }
-
-  /**
-   * Decode and add data to the buffer.
-   * @param messageBuffer a StringBuffer object.
-   * @return true if data is added to the buffer.
-   */
-  public boolean decodeAndAddDataToBuffer(StringBuffer messageBuffer)
-  {
-    boolean moreChunkedData = false;
-    if (!this.moreChunkedData)
-    {
-      // DEBUG:
-      debug("decodeAndAddDataToBuffer", "chunkedData: " + chunkedData);
-
-      moreChunkedData = decodeData(chunkedData, messageBuffer);
-    }
-
-    return moreChunkedData;
-  }
-
-  /**
-   * Check data.
-   */
-  private boolean checkData(String chunkedData)
-  {
-    boolean moreChunkedData = false;
-    // Look for [CRLF][0][CRLF] in the chunked data      
-    if (chunkedData.indexOf(SocketHandler.CRLF + "0" + SocketHandler.CRLF) != -1)
-    {
-      moreChunkedData = false;
-
-      // DEBUG:
-      debug(
-        "checkData",
-        "Chunk contains [CRLF][0][CRLF], so there is no more data.");
-    }
-
-    // Look for [0][CRLF] at start of chunked data      
-    else if (chunkedData.startsWith("0" + SocketHandler.CRLF))
-    {
-      moreChunkedData = false;
-
-      // DEBUG:
-      debug(
-        "checkData",
-        "Chunk data starts with [0][CRLF], so there is no more data.");
-    }
-
-    // Otherwise step through it to see if we have all of the data
-    else
-    {
-      moreChunkedData = true;
-    }
-
-    return moreChunkedData;
-  }
-
-  /**
-   * Decode chunked data.
-   * 
-   * Data format:
-   * <pre>
-   *   [Chunk Size][CRLF][Data Chunk][CRLF][Chunk Size][CRLF][Data Chunk][CRLF]...[0][CRLF][Optional Footer][CRLF]
-   * </pre>
-   * 
-   * @param chunkedData
-   * @param messageLoggingBuffer
-   */
-  private boolean decodeData(String chunkedData, StringBuffer messageBuffer)
-  {
-    boolean endOfData = false;
-    int nextIndex = 0;
-    int prevIndex = 0;
-    int chunkSize = 0;
-
-    String nextChunkData = null;
-
-    // Process each chunk of data
-    while (!(endOfData)
-      && (nextIndex < chunkedData.length())
-      && (nextIndex = chunkedData.indexOf(SocketHandler.CRLF, prevIndex)) != -1)
-    {
-      // Get the data length which is right after this
-      String hexChunkedSize = chunkedData.substring(prevIndex, nextIndex);
-
-      // Decode length
-      chunkSize = Integer.decode("0x" + hexChunkedSize).intValue();
-
-      // DEBUG:
-      debug("decodeData", "chunkedSize: " + chunkSize);
-
-      // If size is zero, then we have hit the end of the chunked data
-      if (chunkSize == 0)
-      {
-        endOfData = true;
-      }
-
-      // If we don't have all of the data then stop
-      else if (nextIndex + 2 + chunkSize > chunkedData.length())
-      {
-        break;
-      }
-
-      else
-      {
-        nextChunkData =
-          chunkedData.substring(nextIndex + 2, nextIndex + 2 + chunkSize);
-
-        // DEBUG:
-        debug("decodeData", "nextChunkData: " + nextChunkData);
-
-        // Get message based on length
-        if (messageBuffer != null)
-          messageBuffer.append(nextChunkData);
-      }
-
-      // Point at the next chunk size
-      prevIndex = nextIndex + 2 + chunkSize + 2;
-    }
-
-    return endOfData;
-  }
-
-  /**
-   * Debug.
-   */
-  private void debug(String method, String message)
-  {
-    this.socketHandler.debug("ChunkedData", method, message);
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/ConnectionListener.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/ConnectionListener.java
deleted file mode 100644
index f48ce9e48..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/monitor/MessageEntryQueue.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/MessageEntryQueue.java
deleted file mode 100644
index 49cc049f6..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/MessageEntryQueue.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.monitor;
-
-import java.io.StringReader;
-import java.util.Vector;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.log.Log;
-import org.eclipse.wst.wsi.internal.core.log.LogWriter;
-import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
-
-/**
- * This class is the queue that is used to write request and response messages
- * to the log file in the correct order.
- *
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public class MessageEntryQueue
-{
-  /**
-   * Request type message entry queue.
-   */
-  protected Vector requestList = new Vector();
-
-  /**
-   * Response type message entry queue.
-   */
-  protected Vector responseList = new Vector();
-
-  /**
-   * Monitor.
-   */
-  protected Monitor monitor = null;
-
-  /**
-   * Log file.
-   */
-  protected Log log = null;
-
-  /**
-   * Log writer.
-   */
-  protected LogWriter logWriter = null;
-
-  /**
-   * List lock.
-   */
-  protected String listLock = "listLock";
-
-  /**
-   * Message ID which is incremented when a new log entry is added to the log file.
-   */
-  protected int messageId = 1;
-
-  /**
-   * Create message entry queue.
-   * @param monitor a monitor.
-   * @param log the log.
-   * @param logWriter a log writer.
-   */
-  public MessageEntryQueue(Monitor monitor, Log log, LogWriter logWriter)
-  {
-    // Save input references
-    this.monitor = monitor;
-    this.log = log;
-    this.logWriter = logWriter;
-  }
-
-  /**
-   * Add log entry to queue.
-   * @param messageEntry a message entry.
-   * @throws WSIException is there is a problem adding the log 
-   *         entry to the queue.
-   */
-  public synchronized void addMessageEntry(MessageEntry messageEntry)
-    throws WSIException
-  {
-    synchronized (listLock)
-    {
-      // If this is a request type of message entry, then add to request list
-      if (messageEntry.getType().equals(MessageEntry.TYPE_REQUEST))
-      {
-        requestList.add(messageEntry);
-      }
-
-      // Otherwise this is a response type of message entry
-      else
-      {
-        responseList.add(messageEntry);
-      }
-    }
-
-    // Tell the log entry writer thread to run
-    writeFromQueue();
-  }
-
-  /**
-   * Determine if any log entries need to be written.
-   * @throws WSIException is there is a problem adding log entries.
-  
-   */
-  public synchronized void writeFromQueue() throws WSIException
-  {
-    MessageEntry requestMessageEntry = null;
-    MessageEntry responseMessageEntry = null;
-    boolean responseFound = false;
-
-    // Create array that will contain list of index to remove from request list
-    int[] requestIndexList = new int[requestList.size()];
-    int reqIndexCount = 0;
-
-    synchronized (listLock)
-    {
-      // If there are entries in the request queue,
-      // then try to match them with entries in the response queue
-      for (int reqIndex = 0; reqIndex < requestList.size(); reqIndex++)
-      {
-        // Get request log entry
-        requestMessageEntry = (MessageEntry) requestList.elementAt(reqIndex);
-
-        // Check each response log entry to see if the conversationId matches
-        responseFound = false;
-        for (int respIndex = 0;
-          respIndex < responseList.size() && !responseFound;
-          respIndex++)
-        {
-          // Get response log entry
-          responseMessageEntry =
-            (MessageEntry) responseList.elementAt(respIndex);
-
-          // If the request and response have the same conversationId,
-          // then write them out to the log file
-          if (requestMessageEntry
-            .getConversationId()
-            .equals(responseMessageEntry.getConversationId()))
-          {
-            responseFound = true;
-
-            // Set the id for the log entries
-            requestMessageEntry.setId(getNextMessageId());
-            responseMessageEntry.setId(getNextMessageId());
-
-            // Write out request and then response
-            //==== SS start : what this line is used for??? - causes memory leak, as no removeLogEntry is called ====
-            //            log.addLogEntry(requestMessageEntry);
-            //==== SS end ===
-            StringReader requestReader =
-              new StringReader(requestMessageEntry.toXMLString(""));
-            logWriter.write(requestReader);
-
-            // Display message
-            printMessage(requestMessageEntry);
-
-            // Write out response
-            //==== SS start : what this line is used for??? - causes memory leak, as no removeLogEntry is called ====
-            //            log.addLogEntry(responseMessageEntry);
-            //==== SS end ===
-            StringReader responseReader =
-              new StringReader(responseMessageEntry.toXMLString(""));
-            logWriter.write(responseReader);
-
-            // Display message
-            printMessage(responseMessageEntry);
-
-            // Add request to list so that it can be removed later
-            requestIndexList[reqIndexCount++] = reqIndex;
-
-            // Remove log entry from response list
-            responseList.remove(respIndex);
-          }
-        }
-      }
-
-      // Remove requests that were written out
-      for (int count = 0; count < reqIndexCount; count++)
-        requestList.remove(requestIndexList[count]);
-    }
-  }
-
-  /**
-   * Get the next message identifier.
-   * @return the next message identifier.
-   */
-  protected synchronized String getNextMessageId()
-  {
-    return String.valueOf(messageId++);
-  }
-
-  /**
-   * Display message.
-   * @param messageEntry a message entry.
-   */
-  protected void printMessage(MessageEntry messageEntry)
-  {
-    // Display message
-    monitor.printMessage(
-      "log01",
-      messageEntry.getId()
-        + ", "
-        + messageEntry.getType()
-        + ", "
-        + messageEntry.getSenderHostAndPort(),
-      "Log message entry -  ID: "
-        + messageEntry.getId()
-        + ", Type: "
-        + messageEntry.getType()
-        + ", Sender: "
-        + messageEntry.getSenderHostAndPort());
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/Monitor.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/Monitor.java
deleted file mode 100644
index 59e2fd67f..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/Monitor.java
+++ /dev/null
@@ -1,505 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.monitor;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.wst.wsi.internal.core.ToolInfo;
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSIFileNotFoundException;
-import org.eclipse.wst.wsi.internal.core.document.DocumentFactory;
-import org.eclipse.wst.wsi.internal.core.log.Log;
-import org.eclipse.wst.wsi.internal.core.log.LogWriter;
-import org.eclipse.wst.wsi.internal.core.monitor.config.ManInTheMiddle;
-import org.eclipse.wst.wsi.internal.core.monitor.config.MonitorConfig;
-import org.eclipse.wst.wsi.internal.core.monitor.config.Redirect;
-import org.eclipse.wst.wsi.internal.core.util.MessageList;
-import org.eclipse.wst.wsi.internal.core.util.TestUtils;
-
-/**
- * Message Monitor.
- *
- * @author Peter Brittenham (peterbr.us.ibm.com)
- */
-
-public class Monitor
-{
-  /**
-   * Message list.
-   */
-  protected MessageList messageList = null;
-
-  private final static String RESOURCE_BUNDLE_NAME =
-    "org.wsi.test.monitor.Monitor";
-
-  public final static String USAGE_MESSAGE =
-    "Usage: Monitor -config <configFilename>";
-
-  /**
-   * Converstation ID.
-   */
-  private int conversationId = 1;
-
-  private Log log = null;
-  private LogWriter logWriter = null;
-  private MonitorConfig monitorConfig = null;
-
-  /**
-  * Tool information.
-  */
-  public static final String TOOL_NAME = "Monitor";
-
-  protected ToolInfo toolInfo = null;
-
-  protected Vector listenerList = new Vector();
-
-  protected MessageEntryQueue messageEntryQueue = null;
-
-  /**
-   * Message monitor.
-   * @param args command line arguments.
-   * @throws WSIException if there is a problem creating a Monitor object.
-   */
-  public Monitor(String[] args) throws WSIException
-  {
-    // Create message list
-    this.messageList = new MessageList(RESOURCE_BUNDLE_NAME);
-
-    // Tool information
-    toolInfo = new ToolInfo(TOOL_NAME);
-
-    // Create document factory
-    DocumentFactory documentFactory = DocumentFactory.newInstance();
-
-    // Get new config object
-    monitorConfig = documentFactory.newMonitorConfig();
-    monitorConfig.init(this.messageList);
-
-    // Parse command line arguments
-    monitorConfig.parseArgs(args);
-
-    String logLocation = monitorConfig.getLogLocation();
-    if (logLocation.indexOf(WSIConstants.PATH_SEPARATOR) > -1)
-    {
-      throw new WSIException(
-        messageList.getMessage(
-          "config11",
-          monitorConfig.getLogLocation(),
-          "The log file location value cannot contain the pass separator character:"));
-    }
-
-    File file = null;
-    try
-    {
-      // Get file object for log file
-      file = new File(monitorConfig.getLogLocation());
-    }
-
-    catch (Exception e)
-    {
-      throw new WSIException(
-        messageList.getMessage("config07", "Could not get log file location."),
-        e);
-    }
-
-    // If replace flag is false and file exists, then throw exception
-    if (file.exists() && !monitorConfig.getReplaceLog())
-    {
-      throw new IllegalArgumentException(
-        messageList.getMessage(
-          "config08",
-          monitorConfig.getLogLocation(),
-          "Log file already exists:"));
-    }
-
-    try
-    {
-      // Create output file
-      log = documentFactory.newLog();
-
-      // Set style sheet string
-      log.setStyleSheetString(
-        monitorConfig.getAddStyleSheet().getStyleSheetString());
-
-      // Get log writer
-      logWriter = documentFactory.newLogWriter();
-      logWriter.setWriter(monitorConfig.getLogLocation());
-
-      // Write start of log file
-      logWriter.write(new StringReader(log.getStartXMLString("")));
-
-      // Write monitor tool information
-      logWriter.write(new StringReader(toXMLString("")));
-
-      // Create log entry queue
-      messageEntryQueue = new MessageEntryQueue(this, log, logWriter);
-    }
-
-    catch (Exception e)
-    {
-      throw new WSIException(
-        messageList.getMessage(
-          "error03",
-          "Could not create log or log writer."),
-        e);
-    }
-
-    // Get manInTheMiddle settings
-    ManInTheMiddle manInTheMiddle = monitorConfig.getManInTheMiddle();
-
-    // Get list of redirects
-    Iterator iterator = manInTheMiddle.getRedirectList().iterator();
-
-    // Process each redirect
-    Redirect redirect;
-    while (iterator.hasNext())
-    {
-      // Get next redirect
-      redirect = (Redirect) iterator.next();
-
-      // Create server socket socket listener
-      listenerList.add(new ServerSocketListener(this, redirect));
-    }
-
-    // Add shutdown hook
-    Runtime.getRuntime().addShutdownHook(new ShutdownHook());
-
-    // Create and start console
-    Console console = new Console();
-    console.start();
-  }
-
-  /**
-   * Get the monitor config file.
-   * @return the monitor config file.
-   */
-  public MonitorConfig getMonitorConfig()
-  {
-    return monitorConfig;
-  }
-
-  /**
-   * Get the log object.
-   * @return the log object.
-   */
-  public Log getLog()
-  {
-    return this.log;
-  }
-
-  /**
-   * Get the log entry queue object.
-   * @return the log entry queue object.
-   */
-  public MessageEntryQueue getMessageEntryQueue()
-  {
-    return this.messageEntryQueue;
-  }
-
-  /**
-   * Terminate the monitor.
-   */
-  void exitMonitor()
-  {
-    printMessage("stopping01", "Stopping the monitor...");
-    System.exit(0);
-  }
-
-  /**
-   * Stop the monitor because an exception occurred.
-   */
-  void exitMonitor(Exception e)
-  {
-    // Display error message
-    printMessage(
-      "stopping02",
-      "Stopping monitor because an exception occurred.");
-    System.err.println("EXCEPTION: " + e.toString());
-    if (this.monitorConfig.getVerboseOption())
-      e.printStackTrace();
-
-    // Exit monitor
-    exitMonitor();
-  }
-
-  /**
-   * Stop the monitor.
-   */
-  void stopMonitor()
-  {
-    try
-    {
-      // Get list of listeners to stop
-      Iterator iterator = listenerList.iterator();
-
-      while (iterator.hasNext())
-      {
-        ((ServerSocketListener) iterator.next()).shutdown();
-      }
-
-      // Wait for the cleanup timeout seconds
-      Thread.sleep(monitorConfig.getTimeout() * 1000);
-
-      // Write end of log file
-      if (logWriter != null)
-      {
-        logWriter.write(new StringReader(log.getEndXMLString("")));
-
-        logWriter.close();
-      }
-    }
-
-    catch (Exception e)
-    {
-      // ADD: How should this execption be handled?
-    }
-
-    printMessage("stopped01", "Monitor stopped.");
-  }
-
-  /**
-   * Command line interface.
-   * @param args command line arguments.
-   */
-  public static void main(String[] args)
-  {
-    Monitor monitor = null;
-
-    try
-    {
-      if (args.length < 2)
-      {
-        staticPrintMessage("usage01", USAGE_MESSAGE);
-        System.exit(1);
-      }
-
-      if (!args[0].equalsIgnoreCase("-config"))
-      {
-        staticPrintMessage("usage01", USAGE_MESSAGE);
-        System.exit(1);
-      }
-
-      // Run the monitor
-      monitor = new Monitor(args);
-    }
-
-    catch (Exception e)
-    {
-      boolean printStackTrace = true;
-      String messageID;
-      String defaultMessage;
-      String messageData;
-
-      if ((e instanceof WSIFileNotFoundException)
-        || (e instanceof IllegalArgumentException))
-      {
-        printStackTrace = false;
-        messageID = "error01";
-        defaultMessage = "Monitor Error:";
-        messageData = e.getMessage();
-      }
-
-      else
-      {
-        printStackTrace = true;
-        messageID = "error02";
-        defaultMessage = "Monitor Stopped By Exception:";
-        messageData = e.toString();
-      }
-
-      if (monitor != null)
-        monitor.printMessage(messageID, messageData, defaultMessage);
-      else
-        Monitor.staticPrintMessage(messageID, messageData, defaultMessage);
-
-      if (printStackTrace)
-        e.printStackTrace();
-
-      // Exit
-      if (monitor != null)
-        monitor.exitMonitor();
-      else
-        System.exit(2);
-    }
-  }
-
-  /**
-   * Print a message from the resource bundle.
-   * @param key a key.
-   * @param defaultMessage a default message.
-   */
-  public void printMessage(String key, String defaultMessage)
-  {
-    printMessage(key, null, defaultMessage);
-  }
-
-  /**
-   * Print a message from the resource bundle.
-   * @param key a key.
-   * @param messageData message data.
-   * @param defaultMessage a default message.
-   */
-  public void printMessage(
-    String key,
-    String messageData,
-    String defaultMessage)
-  {
-    messageList.printMessage(key, messageData, defaultMessage);
-  }
-
-  /**
-   * Print message.
-   * @param key a key.
-   * @param defaultMessage a default message.
-   */
-  public static void staticPrintMessage(String key, String defaultMessage)
-  {
-    staticPrintMessage(key, null, defaultMessage);
-  }
-
-  /**
-   * Print message.
-   * @param key a key.
-   * @param messageData message data.
-   * @param defaultMessage a default message.
-  
-   */
-  public static void staticPrintMessage(
-    String key,
-    String messageData,
-    String defaultMessage)
-  {
-    MessageList.printMessage(
-      RESOURCE_BUNDLE_NAME,
-      key,
-      messageData,
-      defaultMessage);
-  }
-
-  /**
-   * Get the next conversation identifier.
-   * @return the next conversation identifier.
-   */
-  synchronized int getNextConversationId()
-  {
-    return conversationId++;
-  }
-
-  /**
-   * Return XML string representation of this object.
-   * @param namespaceName namespace prefix.
-   * @return XML string representation of this object.
-   */
-  public String toXMLString(String namespaceName)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    // Start
-    pw.print(toolInfo.getStartXMLString(namespaceName));
-
-    // Config
-    pw.print(
-      monitorConfig.toXMLString(WSIConstants.NS_NAME_WSI_MONITOR_CONFIG));
-
-    // End
-    pw.println(toolInfo.getEndXMLString(namespaceName));
-
-    return sw.toString();
-  }
-
-  /**
-   * Shutdown hook.
-   */
-  class ShutdownHook extends Thread
-  {
-    /**
-     * Run shutdown procedure.
-     */
-    public void run()
-    {
-      stopMonitor();
-    }
-  }
-
-  /**
-   * Run command from console.
-   */
-  class Console extends Thread
-  {
-    /**
-     * Prompt user and wait for input.
-     */
-    public void run()
-    {
-      // Get the exit string
-      String exitString = messageList.getMessage("exit01", "exit");
-
-      // Display options and how to stop application
-      TestUtils.printToolInfo(toolInfo);
-      System.out.print(monitorConfig.toString());
-      System.out.println(" ");
-      printMessage(
-        "start01",
-        "The "
-          + toolInfo.getName()
-          + " tool is ready to intercept and log web service messages.");
-      printMessage(
-        "start02",
-        "Type \"exit\" to stop the " + toolInfo.getName() + ".");
-      System.out.println(" ");
-
-      // Get the time to stop accepting connections
-      long stopTime =
-        System.currentTimeMillis() + (monitorConfig.getLogDuration() * 1000);
-      // SS
-
-      try
-      {
-        // Get stdin as a buffered reader
-        BufferedReader reader =
-          new BufferedReader(new InputStreamReader(System.in));
-
-        // Process input from console
-        boolean exit = false;
-        while ((!exit) && (System.currentTimeMillis() < stopTime))
-        { // SS
-          // Sleep
-          Thread.sleep(500);
-
-          // Check for user input
-          if (reader.ready())
-          {
-            if (reader.readLine().equalsIgnoreCase(exitString))
-              exit = true;
-          }
-        }
-      }
-
-      catch (Exception e)
-      {
-        // ADD: How should this be handled?
-        System.err.println(e.toString());
-      }
-
-      // Exit
-      exitMonitor();
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/Monitor.properties b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/Monitor.properties
deleted file mode 100644
index d4d606cb5..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/monitor/ServerSocketListener.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/ServerSocketListener.java
deleted file mode 100644
index 7516c8c0b..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/ServerSocketListener.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.monitor;
-
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.wst.wsi.internal.core.monitor.config.Redirect;
-
-/**
- * A server socket listener.
- *
- * @author Peter  Brittenham (peterbr@us.ibm.com)
- * @version 1.0.1
- */
-public class ServerSocketListener
-  extends Thread
-  implements ConnectionListener // SS
-{
-  protected Monitor monitor = null;
-  protected Redirect redirect = null;
-
-  protected ServerSocket serverSocket = null;
-  protected boolean stopServerSocket = false;
-
-  protected Vector connectionList = new Vector();
-
-  /**
-   * Create server socket listener.
-   * @param monitor a Monitor object.
-   * @param redirect a Redirect object.
-   */
-  public ServerSocketListener(Monitor monitor, Redirect redirect)
-  {
-    this.monitor = monitor;
-    this.redirect = redirect;
-
-    // Start listening
-    start();
-  }
-
-  /**
-   * Run the thread and listen for a connection on the socket.
-   */
-  public void run()
-  {
-    try
-    {
-      // Create server socket
-      serverSocket =
-        new ServerSocket(
-          redirect.getListenPort(),
-          redirect.getMaxConnections());
-      // SS
-
-      // Set timeout so that server socket will continue to accept connections
-      serverSocket.setSoTimeout(0);
-
-      // Listen for connections until interrupted
-      while (!stopServerSocket)
-      {
-        // Accept connections
-        Socket socket = serverSocket.accept();
-
-        // If the server socket was NOT stopped, process connection
-        if (!stopServerSocket)
-        {
-          // Create new connection
-          SocketConnection socketConnection =
-            new SocketConnection(this.monitor, this.redirect, socket);
-
-          //register as a listener
-          socketConnection.addConnectionListener(this); // SS
-
-          // Add to connection list
-          connectionList.add(socketConnection);
-        }
-      }
-    }
-
-    catch (Exception e)
-    {
-      // If the exception was NOT caused by closing the socket, then stop monitor
-      if (!e.getMessage().equals("socket closed"))
-      {
-        monitor.exitMonitor(e);
-      }
-    }
-  }
-
-  /**
-   * Stop listening for a connection on the socket.
-   */
-  public void shutdown()
-  {
-    try
-    {
-      // Shutdown all active connections
-      Iterator iterator = connectionList.iterator();
-      while (iterator.hasNext())
-      {
-        ((SocketConnection) iterator.next()).shutdown();
-      }
-
-      // Tell the server socket listening thread to stop
-      this.stopServerSocket = true;
-
-      // Set the server socket timeout to 1 ms
-      serverSocket.setSoTimeout(1);
-
-      // Close the server socket
-      if (serverSocket != null)
-        serverSocket.close();
-    }
-
-    catch (Exception e)
-    {
-    }
-  }
-
-  // ==== SS start ====
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.ConnectionListener#connectionClosed()
-   */
-  public void connectionClosed(SocketConnection connection)
-  {
-    connectionList.remove(connection);
-  }
-  // ==== SS end ====
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/SocketConnection.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/SocketConnection.java
deleted file mode 100644
index fe2a0f4cf..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/SocketConnection.java
+++ /dev/null
@@ -1,306 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.monitor;
-
-import java.net.Socket;
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
-import org.eclipse.wst.wsi.internal.core.log.MimeParts;
-import org.eclipse.wst.wsi.internal.core.monitor.config.Redirect;
-import org.eclipse.wst.wsi.internal.core.util.Utils;
-
-/**
- * A socket connection.
- *
- * @author Peter  Brittenham (peterbr@us.ibm.com)
- * @version 1.0.1
- */
-public class SocketConnection extends Thread
-{
-  protected Monitor monitor;
-  protected Redirect redirect;
-  protected Socket inSocket;
-  protected Socket outSocket;
-
-  protected String httpProxyHost = null;
-  protected int httpProxyPort;
-
-  protected SocketHandler requestSocketHandler = null;
-  protected SocketHandler responseSocketHandler = null;
-
-  private Vector listeners = new Vector(); // SS
-
-  /**
-   * Create socket connection.
-   * @param monitor  a Monitor object.
-   * @param redirect a Redirect object.
-   * @param inSocket in socket.
-   */
-  public SocketConnection(Monitor monitor, Redirect redirect, Socket inSocket)
-  {
-    this.monitor = monitor;
-    this.redirect = redirect;
-    this.inSocket = inSocket;
-
-    // Start processing the connection
-    start();
-  }
-
-  /**
-   * Process the socket connection.
-   */
-  public void run()
-  {
-    // Get the HTTP proxy settings if there are any set (not used currently)
-    loadHttpProxySettings();
-
-    try
-    {
-      // Open the connection to the server
-      this.outSocket = new Socket(redirect.getToHost(), redirect.getToPort());
-
-      // Set the read timeout for the input socket
-      this.inSocket.setSoTimeout(redirect.getReadTimeoutSeconds() * 1000);
-
-      // Get the next conversation ID
-      int conversationId = monitor.getNextConversationId();
-
-      // Create the socket handlers which are used to send the data from
-      // the client to the server
-      requestSocketHandler =
-        new SocketHandler(
-          this,
-          MessageEntry.TYPE_REQUEST,
-          conversationId,
-          redirect.getToHost(),
-          this.inSocket,
-          this.outSocket,
-          redirect.getReadTimeoutSeconds());
-      responseSocketHandler =
-        new SocketHandler(
-          this,
-          MessageEntry.TYPE_RESPONSE,
-          conversationId,
-          redirect.getToHost(),
-          this.outSocket,
-          this.inSocket,
-          redirect.getReadTimeoutSeconds());
-
-      // Tell each socketHandler about the other one
-      requestSocketHandler.setPairedSocketHandler(responseSocketHandler);
-      responseSocketHandler.setPairedSocketHandler(requestSocketHandler);
-    }
-
-    catch (Exception e)
-    {
-      Monitor.staticPrintMessage(
-        "error04",
-        redirect.getToHost(),
-        "Monitor cannot connect to a redirect host:");
-
-      shutdown();
-
-      try
-      {
-        this.inSocket.close();
-      }
-      catch (Throwable t)
-      {
-      }
-    }
-  }
-
-  /**
-   * Log message.
-   * @param conversationID      the coversation id.
-   * @param connectionType      the connection type.
-   * @param timestamp           the timestamp.
-   * @param senderHostAndPort   the sender host and port.
-   * @param receiverHostAndPort the receiver host and port.
-   * @param messageBuffer       the message.
-   * @param bom                 the BOM.
-   * @param encoding            the encoding.
-   * @throws WSIException if  there is a problem logging message.
-  */
-  public void logMessage(
-    int conversationID,
-    String connectionType,
-    String timestamp,
-    String senderHostAndPort,
-    String receiverHostAndPort,
-    StringBuffer messageBuffer,
-    int bom,
-    String encoding)
-    throws WSIException
-  {
-    MessageEntry messageEntry = null;
-
-    // Create message entry
-    messageEntry =
-      createMessageEntry(
-        conversationID,
-        connectionType,
-        timestamp,
-        senderHostAndPort,
-        receiverHostAndPort,
-        messageBuffer.toString(),
-        bom,
-        encoding);
-
-    // DEBUG:
-    //debug("logMessage", " messageEntry: " + messageEntry);
-
-    // Add entry to the queue
-    monitor.getMessageEntryQueue().addMessageEntry(messageEntry);
-  }
-
-  /**
-   * Create a log entry from all of the data that was gathered.
-   */
-  private MessageEntry createMessageEntry(
-    int conversationID,
-    String messageType,
-    String timestamp,
-    String senderHostAndPort,
-    String receiverHostAndPort,
-    String message,
-    int bom,
-    String encoding)
-    throws WSIException
-  {
-    // Create log entry object
-    MessageEntry messageEntry = monitor.getLog().createLogEntry();
-
-    // Set input information in log entry
-    // NOTE:  The ID is set just before the log entry is written to the log file in LogEntryQueue
-    //logEntry.setId(id);
-    messageEntry.setConversationId(String.valueOf(conversationID));
-    messageEntry.setType(messageType);
-    messageEntry.setTimestamp(timestamp);
-    messageEntry.setSenderHostAndPort(senderHostAndPort);
-    messageEntry.setReceiverHostAndPort(receiverHostAndPort);
-    messageEntry.setEncoding(encoding);
-
-    // Get HTTP headers from full message
-    String httpHeaders = Utils.getHTTPHeaders(message);
-    messageEntry.setHTTPHeaders(httpHeaders);
-	
-   if (Utils.isMultipartRelatedMessage(httpHeaders))
-    {
-    	MimeParts mimeParts = Utils.parseMultipartRelatedMessage(message, httpHeaders, encoding);
-    	if (mimeParts == null)
-    	{
-    	  // problem creating Mimeparts -- treat it as simple SOAP message
-    	  String content = Utils.getContent(message);
-    	  messageEntry.setMessage(content);
-    	  messageEntry.setMimeContent(false);
-    	}
-    	else
-    	{
-          messageEntry.setMimeParts(mimeParts);
-          messageEntry.setMimeContent(true);
-    	}
-    }
-    else
-    {
-      // Get the message content
-      String content = Utils.getContent(message);
-      messageEntry.setMessage(content);
-      messageEntry.setMimeContent(false);
-    }
-
-    // Set the BOM, if there is one
-    if (bom != 0)
-      messageEntry.setBOM(bom);
-
-    return messageEntry;
-  }
-
-  /**
-   * Load HTTP proxy settings.
-   */
-  public void loadHttpProxySettings()
-  {
-    // Get the HTTP proxy host setting
-    this.httpProxyHost = System.getProperty("http.proxyHost");
-    if (this.httpProxyHost != null && httpProxyHost.equals(""))
-      this.httpProxyHost = null;
-
-    // If there was an HTTP proxy host setting, then get the port
-    if (this.httpProxyHost != null)
-    {
-      String portString = System.getProperty("http.proxyPort");
-
-      // Set default to 80
-      if (portString == null || portString.equals(""))
-        this.httpProxyPort = 80;
-      else
-        httpProxyPort = Integer.parseInt(portString);
-    }
-  }
-
-  Monitor getMonitor()
-  {
-    return this.monitor;
-  }
-
-  synchronized void wakeUp()
-  {
-    fireConnectionClosed(); // SS
-    notifyAll();
-  }
-
-  /**
-   * Shutdown.
-   */
-  public void shutdown()
-  {
-    if (this.requestSocketHandler != null)
-      this.requestSocketHandler.shutdown();
-    if (this.responseSocketHandler != null)
-      this.responseSocketHandler.shutdown();
-  }
-
-  // ==== SS start ====
-  /**
-   * Add connection event listener.
-   * @param listener event listener.
-   * @see #removeConnectionListener
-   */
-  public void addConnectionListener(ConnectionListener listener)
-  {
-    listeners.add(listener);
-  }
-  /**
-   * Remove connection event listener.
-   * @param listener event listener.
-   * @see #addConnectionListener
-   */
-  public void removeConnectionListener(ConnectionListener listener)
-  {
-    listeners.remove(listener);
-  }
-  /**
-   * Notify listeners on connection close.
-   */
-  private void fireConnectionClosed()
-  {
-    for (Iterator i = listeners.iterator(); i.hasNext();)
-    {
-      ConnectionListener listener = (ConnectionListener) i.next();
-      listener.connectionClosed(this);
-    }
-  }
-  // ==== SS end ====
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/SocketHandler.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/SocketHandler.java
deleted file mode 100644
index 8a38a2645..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/SocketHandler.java
+++ /dev/null
@@ -1,963 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2003 IBM Corporation, Beacon Information Technology Inc. and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM      - Initial API and implementation
- *   BeaconIT - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.monitor;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InterruptedIOException;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.Socket;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
-import org.eclipse.wst.wsi.internal.core.util.Utils;
-
-/**
- * Socket Handler.
- * 
- * @author Peter  Brittenham (peterbr@us.ibm.com)
- * @version 1.0.1
- */
-public class SocketHandler extends Thread
-{
-  protected SocketConnection socketConnection;
-  protected SocketHandler pairedSocketHandler;
-  protected String connectionType;
-  protected int conversationID;
-  protected String targetHost;
-  protected int readTimeoutSeconds;
-
-  protected Socket inSocket;
-  protected Socket outSocket;
-  protected InputStream inputStream = null;
-  protected OutputStream outputStream = null;
-
-  protected boolean verbose = false;
-
-  protected boolean readTimedOut = false;
-
-  // I18N: 2003.02.26 modified by K.Nakagome@BeaconIT
-  private String mimeCharset = null;
-  private String xmlEncoding = null;
-
-  protected static final String CRLF = "\r\n";
-
-  protected static final String HTTP_100_CONTINUE =
-    "100 Continue".toUpperCase();
-  protected static final String CHUNKED =
-    "Transfer-Encoding: chunked".toUpperCase();
-  protected static final String CHUNKED_WITH_QUOTES =
-    "Transfer-Encoding: \"chunked\"".toUpperCase();
-  protected static final String CONTENT_LENGTH =
-    "Content-Length:".toUpperCase();
-
-  /**
-   * Create socket handler.
-   * @param socketConnection   socket connection.
-   * @param connectionType     connection type.
-   * @param conversationID     conversation id.
-   * @param targetHost         target host.
-   * @param inSocket           in socket.
-   * @param outSocket          out socket.
-   * @param readTimeoutSeconds read timeout seconds.
-   */
-  public SocketHandler(
-    SocketConnection socketConnection,
-    String connectionType,
-    int conversationID,
-    String targetHost,
-    Socket inSocket,
-    Socket outSocket,
-    int readTimeoutSeconds)
-  {
-    this.socketConnection = socketConnection;
-    this.connectionType = connectionType;
-    this.conversationID = conversationID;
-    this.targetHost = targetHost;
-    this.inSocket = inSocket;
-    this.outSocket = outSocket;
-    this.readTimeoutSeconds = readTimeoutSeconds;
-
-    // ADD:
-    verbose =
-      socketConnection.getMonitor().getMonitorConfig().getVerboseOption();
-
-    start();
-  }
-
-  /**
-   * Set paired socket handler.
-   * @param pairedSocketHandler paired socket handler.
-   */
-  public void setPairedSocketHandler(SocketHandler pairedSocketHandler)
-  {
-    this.pairedSocketHandler = pairedSocketHandler;
-  }
-
-  /**
-   * Send the data from the input socket to the output socket.
-   */
-  public void run()
-  {
-    int readLen;
-    String readMsg;
-    MessageContext messageContext = null;
-
-    // Create read buffer      
-    byte[] readBuffer = new byte[4096];
-
-    try
-    {
-      // Get the input and output streams
-      this.inputStream = this.inSocket.getInputStream();
-      this.outputStream = this.outSocket.getOutputStream();
-
-      // Process while the connection is active 
-      // (NOTE: there might be more than 1 message per connection)
-      boolean connectionActive = true;
-      while (connectionActive)
-      {
-        // Reset all data
-        readLen = 0;
-        messageContext = new MessageContext();
-
-        // Read until message is complete
-        boolean messageComplete = false;
-        while (!messageComplete)
-        {
-          try
-          {
-            // DEBUG:
-            debug("run", "Read data from the input stream.");
-
-            // Read data from the input stream
-            readLen = inputStream.read(readBuffer, 0, readBuffer.length);
-
-            // Reset read timeout flag
-            readTimedOut = false;
-
-            // DEBUG:
-            debug("run", "readLen: " + readLen);
-
-            if (readLen == -1)
-            {
-              connectionActive = false;
-              messageComplete = true;
-            }
-
-            // If data was read, then check for 100 continue
-            else if (readLen > 0)
-            {
-              // If this is the first data that was read, then get the timestamp
-              if (messageContext.timestamp == null)
-                messageContext.timestamp = Utils.getTimestamp();
-
-              if (connectionType.equals(MessageEntry.TYPE_REQUEST))
-              {
-                byte[] toHost =
-                  new String(
-                    socketConnection.redirect.getToHost()
-                      + ":"
-                      + socketConnection.redirect.getToPort())
-                    .getBytes();
-
-                String message = new String(readBuffer, 0, readLen);
-
-                int index = message.indexOf(CRLF + "Host: ");
-                if (index > -1)
-                {
-                  index += 8;
-                  int secondPart = message.indexOf(CRLF, index);
-
-                  // Write the data to the output stream and then go format it
-                  write(this.outputStream, readBuffer, 0, index);
-                  write(this.outputStream, toHost, 0, toHost.length);
-                  write(
-                    this.outputStream,
-                    readBuffer,
-                    secondPart,
-                    readLen - secondPart);
-                }
-                else
-                {
-                  // Write the data to the output stream and then go format it
-                  write(this.outputStream, readBuffer, 0, readLen);
-                }
-              }
-              else
-              {
-                // Write the data to the output stream and then go format it
-                write(this.outputStream, readBuffer, 0, readLen);
-              }
-
-              // DEBUG:
-              if (verbose)
-              {
-                String bufferString = new String(readBuffer, 0, readLen);
-                debug("run", "buffer as string: [" + bufferString + "]");
-                if (bufferString.length() <= 50)
-                  debug(
-                    "run",
-                    "buffer as hexstring: ["
-                      + Utils.toHexString(bufferString)
-                      + "]");
-                else
-                  debug(
-                    "run",
-                    "buffer as hexstring: ["
-                      + Utils.toHexString(bufferString.substring(0, 50))
-                      + " ...]");
-              }
-
-              // See if this part of the buffer contains the BOM
-              if (messageContext.bom == 0)
-              {
-                messageContext.bom = getBOM(readBuffer);
-              }
-
-              // DEBUG
-              debug("run", "bom: " + messageContext.bom);
-
-              String encoding;
-
-              try
-              {
-                encoding = getEncoding();
-                readMsg =
-                  new String(
-                    readBuffer,
-                    0,
-                    readLen,
-                    Utils.getJavaEncoding(encoding));
-                setEncoding(readMsg);
-                if (!encoding.equals(getEncoding()))
-                {
-                  encoding = getEncoding();
-                  readMsg =
-                    new String(
-                      readBuffer,
-                      0,
-                      readLen,
-                      Utils.getJavaEncoding(encoding));
-                }
-              }
-
-              catch (UnsupportedEncodingException uee)
-              {
-                debug("run", "EXCEPTION (3): " + uee.toString());
-                throw new RuntimeException(uee.toString());
-              }
-
-              // Set encoding in the message context
-              messageContext.encoding = encoding;
-
-              // DEBUG
-              debug("run", "encoding: " + messageContext.encoding);
-
-              // Process message
-              messageContext = processMessage(readLen, readMsg, messageContext);
-            }
-
-            // If message is complete, then log it and reset buffer
-            if ((isMessageComplete(messageContext))
-              || ((readLen == -1) && (messageContext.messageBuffer.length() > 0)))
-            {
-              // Log message
-              logMessage(messageContext);
-
-              // Set message complete
-              messageComplete = true;
-            }
-          }
-
-          catch (InterruptedIOException ie)
-          {
-            // Set read timeout flag
-            readTimedOut = true;
-
-            debug("run", "InterruptedIOException: " + ie.toString());
-
-            // If the read is not done, then shutdown 
-            if (pairedSocketHandler != null
-              && pairedSocketHandler.isReadWaiting()
-              && pairedSocketHandler.isReadTimedOut())
-            {
-              // DEBUG:
-              debug("run", "read timed out on both sockets");
-
-              // If there is data in the message buffer and it is complete, then log it
-              if ((isMessageComplete(messageContext))
-                || (messageContext.messageBuffer.length() > 0))
-              {
-                // Log message
-                logMessage(messageContext);
-              }
-
-              // Set message complete
-              connectionActive = false;
-              messageComplete = true;
-            }
-          }
-
-          catch (Exception e2)
-          {
-            // DEBUG:
-            debug(
-              "run",
-              "EXCEPTION (2): "
-                + e2.toString()
-                + "\n"
-                + Utils.getExceptionDetails(e2));
-            //e2.printStackTrace();
-
-            // If there is data in the message buffer and it is complete, then log it
-            if ((isMessageComplete(messageContext))
-              || (messageContext.messageBuffer.length() > 0))
-            {
-              // Log message
-              logMessage(messageContext);
-            }
-
-            // Set message complete
-            connectionActive = false;
-            messageComplete = true;
-          }
-        }
-      }
-    }
-
-    catch (Exception e)
-    {
-      // DEBUG:
-      debug(
-        "run",
-        "EXCEPTION (1): "
-          + e.getMessage()
-          + "\n"
-          + Utils.getExceptionDetails(e));
-      //e.printStackTrace();
-    }
-
-    catch (Error err)
-    {
-      // DEBUG:
-      debug("run", "ERROR: " + err.getMessage());
-      //err.printStackTrace();
-    }
-
-    finally
-    {
-      shutdown();
-      socketConnection.wakeUp();
-    }
-  }
-
-  /**
-   * Process the message.
-   */
-  private MessageContext processMessage(
-    int readLen,
-    String readMsg,
-    MessageContext inMessageContext)
-    throws WSIException
-  {
-    boolean continueRead = false;
-
-    // Initialize message context                                       
-    MessageContext messageContext = inMessageContext;
-
-    // Get message buffer and chunked data from message context
-    StringBuffer messageBuffer = messageContext.messageBuffer;
-    ChunkedData chunkedData = messageContext.chunkedData;
-
-    // If all we received was the header with 100 continue, then ignore it
-    if ((readMsg.toUpperCase().indexOf(HTTP_100_CONTINUE) != -1)
-      && (readLen >= 25))
-    {
-      // DEBUG:
-      debug("processMessage", "Ignore HTTP 100 Continue.");
-
-      // Find the end of the HTTP 100 message
-      int index = Utils.getFirstCRLFCRLF(readMsg);
-
-      // If there is only the HTTP 100 message, then just ignore it
-      if (index == readMsg.length())
-        continueRead = true;
-
-      // Otherwise remove the HTTP 100 message and continue
-      else
-        readMsg = readMsg.substring(index);
-    }
-
-    // ADD: What if a bypassed message contains another message after it?
-    if (!continueRead && bypassMessage(readMsg))
-    {
-      // DEBUG:
-      debug(
-        "processMessage",
-        "Do not log message as defined in the monitor spec, but it will be sent.");
-
-      continueRead = true;
-    }
-
-    if (!continueRead)
-    {
-      int index = 0;
-
-      // If there is chunked data, then get the length
-      if ((readMsg.toUpperCase().indexOf(CHUNKED) != -1)
-        || (readMsg.toUpperCase().indexOf(CHUNKED_WITH_QUOTES) != -1))
-      {
-        // DEBUG:
-        debug("processMessage", "Processing chunked data...");
-
-        // Get the location of the first CFLF
-        if ((index = readMsg.indexOf(CRLF + CRLF)) == -1)
-        {
-          throw new WSIException("Could not locate end of HTTP header.");
-        }
-
-        // Include the CRLF+CRLF in the index
-        index += 4;
-
-        // DEBUG:
-        debug(
-          "processMessage",
-          "Add header before decoding chunked data: ["
-            + readMsg.substring(0, index)
-            + "]");
-
-        // Add HTTP header to buffer
-        messageBuffer.append(readMsg.substring(0, index));
-
-        // If there is no more data (i.e. header only), then just indicate that there is more chunked data
-        if (readMsg.length() == index)
-        {
-          chunkedData = new ChunkedData(this, true);
-
-          // DEBUG:
-          debug(
-            "processMessage",
-            "There is chunk data, but none in this part of the message.");
-        }
-
-        // Determine if the remainder of the data is complete (i.e. ends with [0][CRLF][Optional Footer][CRLF])
-        else
-        {
-          // Create chunked data object
-          chunkedData = new ChunkedData(this, readMsg.substring(index));
-
-          if (!chunkedData.isMoreChunkedData())
-          {
-            chunkedData.decodeAndAddDataToBuffer(messageBuffer);
-          }
-        }
-      }
-
-      else if (chunkedData != null && chunkedData.isMoreChunkedData())
-      {
-        // DEBUG:
-        debug("processMessage", "Processing MORE chunked data...");
-
-        // Add data
-        chunkedData.addData(readMsg);
-
-        // Decode data
-        if (!chunkedData.isMoreChunkedData())
-        {
-          chunkedData.decodeAndAddDataToBuffer(messageBuffer);
-        }
-      }
-
-      // Else just append the data to the buffer
-      else
-      {
-        // DEBUG:
-        debug(
-          "processMessage",
-          "Add data to message entry buffer: [" + readMsg + "]");
-
-        messageBuffer.append(readMsg);
-      }
-    }
-
-    // Set updated message buffer and chunked data in message context    
-    messageContext.messageBuffer = messageBuffer;
-    messageContext.chunkedData = chunkedData;
-
-    // Return message context 
-    return messageContext;
-  }
-
-  /**
-   * Shutdown input socket and close input stream.
-   * @param inSocket in socket.
-   * @param inputStream input stream.
-   */
-  protected void stopInput(Socket inSocket, InputStream inputStream)
-  {
-    try
-    {
-      // If there is a input socket, then shutdown the input
-      if (inSocket != null)
-      {
-        inSocket.shutdownInput();
-      }
-
-      // If there is an input stream then close it
-      if (inputStream != null)
-      {
-        inputStream.close();
-      }
-    }
-    catch (Exception e)
-    {
-      // Ignore since we are stopping everything
-    }
-
-    inputStream = null;
-  }
-
-  /**
-   * Shutdown output socket and close output stream.
-   * @param outSocket out socket.
-   * @param outputStream output stream.
-   */
-  protected void stopOutput(Socket outSocket, OutputStream outputStream)
-  {
-    try
-    {
-      // If there is an output stream, then flush it
-      if (outputStream != null)
-      {
-        outputStream.flush();
-      }
-
-      // If there is a input socket, then shutdown the input
-      if (outSocket != null)
-      {
-        outSocket.shutdownOutput();
-      }
-
-      // If there is an output stream then close it
-      if (outputStream != null)
-      {
-        outputStream.close();
-      }
-    }
-
-    catch (Exception e)
-    {
-      // Ignore since we are stopping everything
-    }
-
-    outputStream = null;
-  }
-
-  /**
-   * Shutdown handler.
-   */
-  public void shutdown()
-  {
-    // Stop both the input and output
-    stopInput(this.inSocket, this.inputStream);
-    stopOutput(this.outSocket, this.outputStream);
-  }
-
-  /**
-   * Display debug messages.
-   */
-  void debug(String method, String message)
-  {
-    debug("SocketHandler", method, message);
-  }
-
-  /**
-   * Display debug messages.
-   */
-  void debug(String className, String method, String message)
-  {
-    if (verbose)
-      print(className, method, message);
-  }
-
-  /**
-   * Display messages.
-   */
-  void print(String className, String method, String message)
-  {
-    System.out.println(
-      "["
-        + Thread.currentThread().getName()
-        + "] ["
-        + className
-        + "."
-        + method
-        + "] ["
-        + this.connectionType
-        + "] "
-        + message);
-  }
-
-  /** 
-   * Write data.
-   */
-  private void write(
-    OutputStream outputStream,
-    byte[] buffer,
-    int start,
-    int length)
-    throws IOException
-  {
-    if (outputStream == null)
-    {
-      // DEBUG:
-      debug("write", "Could not write buffer because output stream is null.");
-    }
-    else
-    {
-      // DEBUG:
-      debug("write", "buffer: [" + new String(buffer, start, length) + "]");
-
-      outputStream.write(buffer, start, length);
-    }
-  }
-
-  /** 
-   * Check if message is complete.
-   * 
-   * @param messageContext
-   */
-  private boolean isMessageComplete(MessageContext messageContext)
-    throws WSIException
-  {
-    int index, index2, contentLen;
-    boolean messageComplete = false;
-
-    boolean moreChunkedData = messageContext.chunkedData.isMoreChunkedData();
-
-    String message = messageContext.messageBuffer.toString();
-
-    // Find the first CRLF + CRLF which marks the end of the HTTP header
-    String httpHeader;
-    index = Utils.getFirstCRLFCRLF(message);
-    if (index == -1)
-      httpHeader = message;
-    else
-      httpHeader = message.substring(0, index);
-
-    // If chunked data, then complete only if there is no more data
-    if (((httpHeader.toUpperCase().indexOf(CHUNKED) != -1)
-      || (httpHeader.toUpperCase().indexOf(CHUNKED_WITH_QUOTES) != -1))
-      && (!moreChunkedData))
-    {
-      debug(
-        "isMessageComplete",
-        "HTTP header indicates chunked data and there is no more chunked data");
-      messageComplete = true;
-    }
-
-    // Check for content length
-    else if ((index = httpHeader.toUpperCase().indexOf(CONTENT_LENGTH)) == -1)
-    {
-      debug("isMessageComplete", "HTTP header does not contain content length");
-
-      // Should not have complete POST header without content length
-      if (httpHeader.startsWith("POST"))
-      {
-        if (httpHeader.endsWith(CRLF + CRLF))
-        {
-          throw new WSIException("Could not locate content-length in HTTP POST header.");
-        }
-
-        messageComplete = false;
-      }
-
-      // This could be a GET, so see if the the complete header has been received
-      else if (
-        httpHeader.startsWith("GET")
-          && (message.length() == httpHeader.length()
-            && message.endsWith(CRLF + CRLF)))
-      {
-        messageComplete = true;
-      }
-
-      else
-      {
-        messageComplete = false;
-      }
-    }
-
-    // If there is content length, then see if the entire message has been received
-    else if ((index = httpHeader.toUpperCase().indexOf(CONTENT_LENGTH)) != -1)
-    {
-      // Find end of content length value
-      index2 = httpHeader.indexOf(CRLF, index);
-
-      debug("isMessageComplete", "CRLF: " + Utils.toHexString(CRLF));
-      debug(
-        "isMessageComplete",
-        "httpHeader/index: " + Utils.toHexString(httpHeader.substring(index)));
-
-      // Get content length
-      contentLen =
-        Integer
-          .decode(
-            httpHeader.substring(index + CONTENT_LENGTH.length() + 1, index2))
-          .intValue();
-
-      // DEBUG:
-      debug("isMessageComplete", "contentLen: " + contentLen);
-
-      // Find the first CRLF + CRLF which marks the end of the HTTP header
-      index = Utils.getFirstCRLFCRLF(message);
-
-      // DEBUG:
-      debug(
-        "isMessageComplete",
-        "actual received message length: " + (message.length() - (index)));
-
-      // If content length is equal to actual message content length, then message is complete
-      if (contentLen == message.length() - index)
-      {
-        messageComplete = true;
-
-        // DEBUG:
-        debug(
-          "isMessageComplete",
-          "contentLen = actual received message length.");
-      }
-    }
-
-    // Message is not complete
-    else
-    {
-      messageComplete = false;
-    }
-
-    // DEBUG:
-    debug("isMessageComplete", "messageComplete: " + messageComplete);
-
-    return messageComplete;
-  }
-
-  /** 
-   * Log message.
-   * 
-   * @param messageBuffer
-   */
-  private void logMessage(MessageContext messageContext) throws WSIException
-  {
-    // Determine sender and receiver host/port
-    String senderHostAndPort, receiverHostAndPort;
-
-    // Request
-    if (connectionType.equals(MessageEntry.TYPE_REQUEST))
-    {
-      senderHostAndPort =
-        inSocket.getInetAddress().getHostAddress() + ":" + inSocket.getPort();
-      receiverHostAndPort = targetHost + ":" + outSocket.getPort();
-    }
-
-    // Response      
-    else
-    {
-      senderHostAndPort = targetHost + ":" + inSocket.getPort();
-      receiverHostAndPort =
-        outSocket.getInetAddress().getHostAddress() + ":" + outSocket.getPort();
-    }
-
-    // Create message entry
-    this.socketConnection.logMessage(
-      conversationID,
-      this.connectionType,
-      messageContext.timestamp,
-      senderHostAndPort,
-      receiverHostAndPort,
-      messageContext.messageBuffer,
-      messageContext.bom,
-      messageContext.encoding);
-  }
-
-  /**
-   * Check for HTTP messages that should not be logged.
-   */
-  private boolean bypassMessage(String message)
-  {
-    boolean bypass = false;
-    if ((message.startsWith("CONNECT"))
-      || (message.startsWith("TRACE"))
-      || (message.startsWith("DELETE"))
-      || (message.startsWith("OPTIONS"))
-      || (message.startsWith("HEAD")))
-    {
-      bypass = true;
-    }
-
-    return bypass;
-  }
-
-  // I18N: 2003.02.26 modified by K.Nakagome@BeaconIT
-  /**
-   * Set Encoding Parameters
-   * @param messageFragment String of a HTTP message fragment.
-   * @author K.Nakagome@BeaconIT Japan SIG 
-   */
-  private void setEncoding(String messageFragment)
-  {
-    if (mimeCharset == null || mimeCharset.length() == 0)
-    {
-      mimeCharset = Utils.getHTTPCharset(messageFragment);
-    }
-    if (xmlEncoding == null || xmlEncoding.length() == 0)
-    {
-      xmlEncoding = Utils.getXMLEncoding(messageFragment);
-    }
-    return;
-  }
-
-  // I18N: 2003.02.26 modified by K.Nakagome@BeaconIT
-  /**
-   * Get Encoding Parameter
-   * @return Character encoding of HTTP message.
-   * @author K.Nakagome@BeaconIT Japan SIG 
-   */
-  private String getEncoding()
-  {
-    String encoding = WSIConstants.DEFAULT_XML_ENCODING;
-    if (mimeCharset != null && mimeCharset.length() > 0)
-    {
-      encoding = mimeCharset;
-    }
-    if (xmlEncoding != null && xmlEncoding.length() > 0)
-    {
-      encoding = xmlEncoding;
-    }
-    return encoding;
-  }
-
-  /**
-   * Get the Byte Order Mark from the message (if there is one).
-   */
-  private int getBOM(byte[] message)
-  {
-    int bom = 0;
-
-    byte FF = (byte) 0xFF;
-    byte FE = (byte) 0xFE;
-    byte EF = (byte) 0xEF;
-    byte BB = (byte) 0xBB;
-    byte BF = (byte) 0xBF;
-
-    // Search through the byte array for CRLF+CRLF.  This will mark the end of the header.
-    int i = Utils.getFirstCRLFCRLF(message, 0);
-    if (i != -1)
-    {
-      // DEBUG:
-      debug(
-        "getBOM",
-        "message[i]: "
-          + message[i]
-          + ", message[i+1]: "
-          + message[i+1]);
-
-      // Check for UTF-8 BOM
-      if (((i + 2) < message.length)
-        && message[i] == EF
-        && message[i+1] == BB
-        && message[i+2] == BF)
-      {
-        bom = 0xEFBBBF;
-      }
-      // Check for UTF-16 big-endian BOM
-      else if (
-        ((i+1) < message.length)
-          && message[i] == FE
-          && message[i + 1] == FF)
-      {
-        bom = 0xFEFF;
-      }
-      // Check for UTF-16 little-endian BOM
-      else if (
-        ((i+1) < message.length)
-          && message[i] == FF
-          && message[i+1] == FE)
-      {
-        bom = 0xFFFE;
-      }
-      // ADD: Do we need to check for other BOMs
-    }
-    return bom;
-  }
-
-  /**
-   * Determine if the read is still waiting for data.
-   */
-  boolean isReadWaiting()
-  {
-    boolean readWaiting = false;
-
-    try
-    {
-      // DEBUG:
-      debug(
-        "isReadWaiting",
-        "inSocket.getInputStream().available(): "
-          + inSocket.getInputStream().available());
-
-      if (inSocket.getInputStream().available() == 0)
-      {
-        readWaiting = true;
-      }
-    }
-
-    catch (IOException ioe)
-    {
-    }
-
-    return readWaiting;
-  }
-
-  /**
-   * Get read timed out flag.
-   */
-  boolean isReadTimedOut()
-  {
-    return this.readTimedOut;
-  }
-
-  /**
-   * Message context contains information about the message that is being processed.
-   */
-  class MessageContext
-  {
-    StringBuffer messageBuffer;
-    ChunkedData chunkedData;
-    String timestamp;
-    int bom;
-    String encoding;
-
-    /**
-     * Create new message context.
-     */
-    MessageContext()
-    {
-      messageBuffer = new StringBuffer();
-      chunkedData = new ChunkedData();
-      timestamp = null;
-      bom = 0;
-      encoding = WSIConstants.DEFAULT_XML_ENCODING;
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/config/Comment.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/config/Comment.java
deleted file mode 100644
index bde4ad6fe..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/config/Comment.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.monitor.config;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.document.DocumentElement;
-
-/**
- * The interface for monitor config Comment element.  
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public interface Comment extends DocumentElement
-{
-  /**
-   * Element name.
-   */
-  public static final String ELEM_NAME = WSIConstants.ELEM_COMMENT;
-
-  /**
-   * QName.
-   */
-  public static final QName QNAME =
-    new QName(WSIConstants.NS_URI_WSI_MONITOR_CONFIG, ELEM_NAME);
-
-  /**
-   * Get comment text.
-   * @return comment text.
-   * @see #setText
-   */
-  public String getText();
-
-  /**
-   * Set comment text.
-   * @param text the comment text.
-   * @see #getText
-   */
-  public void setText(String text);
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/config/ManInTheMiddle.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/config/ManInTheMiddle.java
deleted file mode 100644
index 85c0aa2fb..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/monitor/config/MonitorConfig.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/config/MonitorConfig.java
deleted file mode 100644
index 11df1ed52..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/config/MonitorConfig.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.monitor.config;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.common.AddStyleSheet;
-import org.eclipse.wst.wsi.internal.core.document.WSIDocument;
-import org.eclipse.wst.wsi.internal.core.util.MessageList;
-
-/**
- * This is the interface for the monitor configuration file.
- * 
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public interface MonitorConfig extends WSIDocument
-{
-  /**
-   * Element name.
-   */
-  public static final String ELEM_NAME = WSIConstants.ELEM_CONFIG;
-
-  /**
-   * QName.
-   */
-  public static final QName QNAME =
-    new QName(WSIConstants.NS_URI_WSI_MONITOR_CONFIG, ELEM_NAME);
-
-  /**
-   * Initialize monitor config.
-   * @param messageList a lMessageList object.
-   */
-  public void init(MessageList messageList);
-
-  /**
-   * Get comment.
-   * @return comment.
-   * @see #setComment
-   */
-  public Comment getComment();
-
-  /**
-   * Set comment.
-   * @param comment a Comment object.
-   * @see #getComment
-   */
-  public void setComment(Comment comment);
-
-  /**
-   * Get log file location.
-   * @return log file location.
-   * @see #setLogLocation
-   */
-  public String getLogLocation();
-
-  /**
-   * Set log file location.
-   * @param logURI log file location.
-   * @see #getLogLocation
-   */
-  public void setLogLocation(String logURI);
-
-  /**
-   * Get replace log.
-   * @return replace log.
-   * @see #setReplaceLog
-   */
-  public boolean getReplaceLog();
-
-  /**
-   * Set replace log.
-   * @param replaceLog a replace log.
-   * @see #getReplaceLog
-   */
-  public void setReplaceLog(boolean replaceLog);
-
-  /**
-   * Get add style sheet.
-   * @return add style sheet.
-   * @see #setAddStyleSheet
-   */
-  public AddStyleSheet getAddStyleSheet();
-
-  /**
-   * Set add style sheet.
-   * @param addStyleSheet add style sheet.
-   * @see #getAddStyleSheet
-   */
-  public void setAddStyleSheet(AddStyleSheet addStyleSheet);
-
-  /**
-   * Get log duration.
-   * @return log duration.
-   * @see #setLogDuration
-   */
-  public int getLogDuration();
-
-  /**
-   * Set log duration.
-   * @param logDuration log duration.
-   * @see #getLogDuration
-   */
-  public void setLogDuration(int logDuration);
-
-  /**
-   * Get timeout.
-   * @return timeout.
-   * @see #setTimeout
-   */
-  public int getTimeout();
-
-  /**
-   * Set timeout.
-   * @param timeout timeout.
-   * @see #getTimeout
-   */
-  public void setTimeout(int timeout);
-
-  /**
-   * Get man-in-the-middle information.
-   * @return man-in-the-middle information.
-   * @see #setManInTheMiddle
-   */
-  public ManInTheMiddle getManInTheMiddle();
-
-  /**
-   * Set man-in-the-middle information.
-   * @param manInTheMiddle man-in-the-middle information.
-   * @see #getManInTheMiddle
-   */
-  public void setManInTheMiddle(ManInTheMiddle manInTheMiddle);
-
-  /**
-   * Get verbose option.
-   * @return verbose option.
-   * @see #setVerboseOption
-   */
-  public boolean getVerboseOption();
-
-  /**
-   * Set verbose option.
-   * @param verbose verbose option.
-   * @see #getVerboseOption
-   */
-  public void setVerboseOption(boolean verbose);
-
-  /**
-   * Parse the command line arguments.
-   * @param args the command line arguments.
-   * @throws WSIException if problems occur while parsing the 
-   *         command line arguments,
-   */
-  public void parseArgs(String[] args) throws WSIException;
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/config/MonitorConfigReader.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/config/MonitorConfigReader.java
deleted file mode 100644
index 38fbd0753..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/config/MonitorConfigReader.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.monitor.config;
-
-import java.io.Reader;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.document.DocumentReader;
-import org.eclipse.wst.wsi.internal.core.util.MessageList;
-
-/**
- * Defines the interface used to read the monitor config documents.
- * 
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public interface MonitorConfigReader extends DocumentReader
-{
-  /**
-   * Initialize monitor config.
-   * @param messageList a MessageList object.
-   */
-  public void init(MessageList messageList);
-
-  /**
-   * Read the monitor config file.
-   * @param monitorConfigURI the monitor config file location.
-   * @return a MonitorConfig object
-   * @throws WSIException if problems occur while reading monitor config file.
-   */
-  public MonitorConfig readMonitorConfig(String monitorConfigURI)
-    throws WSIException;
-
-  /**
-   * Read the monitor config file.
-   * @param reader a Reader object.
-   * @return a MonitorConfig object
-   * @throws WSIException if problems occur while reading monitor config file.
-   */
-  public MonitorConfig readMonitorConfig(Reader reader) throws WSIException;
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/config/Redirect.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/config/Redirect.java
deleted file mode 100644
index 6e3082d6d..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/monitor/config/impl/CommentImpl.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/config/impl/CommentImpl.java
deleted file mode 100644
index 61c09b5d7..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/monitor/config/impl/ManInTheMiddleImpl.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/config/impl/ManInTheMiddleImpl.java
deleted file mode 100644
index 858fa632b..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/monitor/config/impl/MonitorConfigImpl.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/config/impl/MonitorConfigImpl.java
deleted file mode 100644
index 586966d83..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/config/impl/MonitorConfigImpl.java
+++ /dev/null
@@ -1,561 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.monitor.config.impl;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.common.AddStyleSheet;
-import org.eclipse.wst.wsi.internal.core.common.impl.AddStyleSheetImpl;
-import org.eclipse.wst.wsi.internal.core.monitor.Monitor;
-import org.eclipse.wst.wsi.internal.core.monitor.config.Comment;
-import org.eclipse.wst.wsi.internal.core.monitor.config.ManInTheMiddle;
-import org.eclipse.wst.wsi.internal.core.monitor.config.MonitorConfig;
-import org.eclipse.wst.wsi.internal.core.monitor.config.MonitorConfigReader;
-import org.eclipse.wst.wsi.internal.core.monitor.config.Redirect;
-import org.eclipse.wst.wsi.internal.core.util.MessageList;
-
-/**
- * This is the implementation for the monitor configuration file.
- * 
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public class MonitorConfigImpl implements MonitorConfig
-{
-  /**
-   * Message list reference.
-   */
-  protected MessageList messageList = null;
-
-  /**
-   * Monitor configuration file URI.
-   */
-  protected String documentURI = null;
-
-  /**
-   * Comment.
-   */
-  protected Comment comment = null;
-
-  /**
-   * Log location.
-   */
-  protected String logURI;
-
-  /**
-   * Replace log indicator.
-   */
-  protected boolean replaceLog = false;
-
-  /**
-   * Style sheet declaration.
-   */
-  protected AddStyleSheet addStyleSheet;
-
-  /**
-   * Log duration.
-   */
-  protected int logDuration = 600;
-
-  /**
-   * Timeout.
-   */
-  protected int timeout = 3;
-
-  /**
-   * Man-in-the-middle settings.
-   */
-  protected ManInTheMiddle manInTheMiddle = null;
-
-  /**
-   * Verbose option.
-   */
-  protected boolean verbose = false;
-
-  /**
-   * Initialize monitor config.
-   */
-  public void init(MessageList messageList)
-  {
-    this.messageList = messageList;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.MonitorConfig#getComment()
-   */
-  public Comment getComment()
-  {
-    return this.comment;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.MonitorConfig#setComment(Comment)
-   */
-  public void setComment(Comment comment)
-  {
-    this.comment = comment;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.MonitorConfig#getLogLocation()
-   */
-  public String getLogLocation()
-  {
-    return this.logURI;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.MonitorConfig#setLogLocation(String)
-   */
-  public void setLogLocation(String logURI)
-  {
-    this.logURI = logURI;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.MonitorConfig#getReplaceLog()
-   */
-  public boolean getReplaceLog()
-  {
-    return this.replaceLog;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.MonitorConfig#setReplaceLog(boolean)
-   */
-  public void setReplaceLog(boolean replaceLog)
-  {
-    this.replaceLog = replaceLog;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.MonitorConfig#getAddStyleSheet()
-   */
-  public AddStyleSheet getAddStyleSheet()
-  {
-    return this.addStyleSheet;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.MonitorConfig#setAddStyleSheet(org.wsi.test.common.AddStyleSheet)
-   */
-  public void setAddStyleSheet(AddStyleSheet addStyleSheet)
-  {
-    this.addStyleSheet = addStyleSheet;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.MonitorConfig#getLogDuration()
-   */
-  public int getLogDuration()
-  {
-    return logDuration;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.MonitorConfig#setLogDuration(int)
-   */
-  public void setLogDuration(int logDuration)
-  {
-    this.logDuration = logDuration;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.MonitorConfig#getTimeout()
-   */
-  public int getTimeout()
-  {
-    return this.timeout;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.MonitorConfig#setTimeout(int)
-   */
-  public void setTimeout(int timeout)
-  {
-    this.timeout = timeout;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.MonitorConfig#getManInTheMiddle()
-   */
-  public ManInTheMiddle getManInTheMiddle()
-  {
-    return manInTheMiddle;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.MonitorConfig#setManInTheMiddle(ManInTheMiddle)
-   */
-  public void setManInTheMiddle(ManInTheMiddle manInTheMiddle)
-  {
-    this.manInTheMiddle = manInTheMiddle;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.WSIDocument#getLocation()
-   */
-  public String getLocation()
-  {
-    return this.documentURI;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.WSIDocument#setLocation(String)
-   */
-  public void setLocation(String documentURI)
-  {
-    this.documentURI = documentURI;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.MonitorConfig#getVerboseOption()
-   */
-  public boolean getVerboseOption()
-  {
-    return this.verbose;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.MonitorConfig#setVerboseOption(boolean)
-   */
-  public void setVerboseOption(boolean verbose)
-  {
-    this.verbose = verbose;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.DocumentElement#toXMLString(String)
-   */
-  public String toXMLString(String namespaceName)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    String nsName = namespaceName;
-    if ((!nsName.equals("") && (!nsName.endsWith(":"))))
-      nsName += ":";
-
-    // Config options
-    pw.println("    <" + nsName + ELEM_NAME + ">");
-
-    // Comment
-    if (this.comment != null)
-    {
-      pw.print(comment.toXMLString(nsName));
-    }
-
-    // Log file
-    pw.print("      <" + nsName + WSIConstants.ELEM_LOG_FILE + " ");
-    pw.print(WSIConstants.ATTR_REPLACE + "=\"" + this.replaceLog + "\" ");
-    pw.println(WSIConstants.ATTR_LOCATION + "=\"" + this.logURI + "\">");
-    pw.print(getAddStyleSheet().toXMLString(namespaceName));
-    pw.println("    </" + nsName + WSIConstants.ELEM_LOG_FILE + ">");
-
-    // Log duration
-    pw.print("      <" + nsName + WSIConstants.ELEM_LOG_DURATION + ">");
-    pw.print(this.logDuration);
-    pw.println("</" + nsName + WSIConstants.ELEM_LOG_DURATION + ">");
-
-    // Timeout
-    pw.print(
-      "      <" + nsName + WSIConstants.ELEM_CLEANUP_TIMEOUT_SECONDS + ">");
-    pw.print(this.timeout);
-    pw.println("</" + nsName + WSIConstants.ELEM_CLEANUP_TIMEOUT_SECONDS + ">");
-
-    // Man-in-the-middle
-    if (this.manInTheMiddle != null)
-    {
-      pw.print(manInTheMiddle.toXMLString(nsName));
-    }
-
-    // End element
-    pw.println("    </" + nsName + ELEM_NAME + ">");
-
-    return sw.toString();
-  }
-
-  /**
-   * Get string representation of this object.
-   */
-  public String toString()
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    pw.println("  comment ..................... " + this.comment);
-    pw.println("  logURI ...................... " + this.logURI);
-    pw.println("  replaceLog .................. " + this.replaceLog);
-    pw.println("  logDuration ................. " + this.logDuration);
-    pw.println("  timeout ..................... " + this.timeout);
-
-    // addStyleSheet
-    if (this.addStyleSheet != null)
-      pw.println(
-        "  addStyleSheet ............... " + this.addStyleSheet.toString());
-
-    // Man-in-the-middle
-    if (this.manInTheMiddle != null)
-    {
-      pw.print(this.manInTheMiddle.toString());
-    }
-
-    return sw.toString();
-  }
-
-  /**
-   * Set config values from another monitor config object.
-   */
-  private void setConfig(MonitorConfig monitorConfig)
-  {
-    // ADD: Should this be a clone operation?
-    this.comment = monitorConfig.getComment();
-    this.documentURI = monitorConfig.getLocation();
-    this.logURI = monitorConfig.getLogLocation();
-    this.replaceLog = monitorConfig.getReplaceLog();
-    this.logDuration = monitorConfig.getLogDuration();
-    this.timeout = monitorConfig.getTimeout();
-    this.manInTheMiddle = monitorConfig.getManInTheMiddle();
-    this.addStyleSheet = monitorConfig.getAddStyleSheet();
-    this.verbose = monitorConfig.getVerboseOption();
-  }
-
-  /**
-   * Verify config options.
-   */
-  private void verifyConfig() throws WSIException
-  {
-    // If no redirect statements, then exit
-    if ((this.manInTheMiddle == null)
-      || (this.manInTheMiddle.getRedirectList() == null)
-      || (this.manInTheMiddle.getRedirectList().size() == 0))
-    {
-      throw new IllegalArgumentException(
-        getMessage(
-          "config05",
-          "Monitor config file did not contain any redirect statements."));
-    }
-
-    if (this.logURI == null)
-    {
-      throw new IllegalArgumentException(
-        getMessage(
-          "config06",
-          "Monitor config file did not contain the log file URI."));
-    }
-  }
-
-  /**
-   * Parse the command line arguments.
-   */
-  public void parseArgs(String[] args) throws WSIException
-  {
-    // Get new config reader
-    MonitorConfigReader monitorConfigReader = new MonitorConfigReaderImpl();
-
-    // Monitor config object which will be merged after all of the input parms are processed
-    MonitorConfig monitorConfigFromArgs = null;
-
-    // If no input arguments, then throw exception
-    if (args.length == 0)
-    {
-      // ADD: 
-      throw new IllegalArgumentException(
-        getMessage("usage01", Monitor.USAGE_MESSAGE));
-    }
-
-    // Parse the command line arguments to locate the config file option (if it was specified)
-    for (int argCount = 0; argCount < args.length; argCount++)
-    {
-      // -configFile
-      if ((args[argCount].equalsIgnoreCase("-config"))
-        || (args[argCount].equals("-c")))
-      {
-        argCount++;
-        monitorConfigFromArgs =
-          monitorConfigReader.readMonitorConfig(args[argCount]);
-      }
-    }
-
-    // If config file was not specified, then create analyzer config object
-    if (monitorConfigFromArgs == null)
-    {
-      monitorConfigFromArgs = new MonitorConfigImpl();
-      monitorConfigFromArgs.init(this.messageList);
-    }
-
-    // Parse all of the command line arguments
-    for (int argCount = 0; argCount < args.length; argCount++)
-    {
-      // -configFile
-      if ((args[argCount].equalsIgnoreCase("-config"))
-        || (args[argCount].equals("-c")))
-      {
-        // Skip this option since it was already processed
-        argCount++;
-      }
-
-      // -comment
-      else if (
-        (args[argCount].equalsIgnoreCase("-comment"))
-          || (args[argCount].equals("-C")))
-      {
-        argCount++;
-        Comment comment = new CommentImpl();
-        comment.setText(args[argCount]);
-        monitorConfigFromArgs.setComment(comment);
-      }
-
-      // -logFile
-      else if (
-        (args[argCount].equalsIgnoreCase("-logFile"))
-          || (args[argCount].equals("-l")))
-      {
-        argCount++;
-        monitorConfigFromArgs.setLogLocation(args[argCount]);
-      }
-
-      // -replace
-      else if (
-        (args[argCount].equalsIgnoreCase("-replace"))
-          || (args[argCount].equals("-r")))
-      {
-        argCount++;
-        monitorConfigFromArgs.setReplaceLog(
-          Boolean.valueOf(args[argCount]).booleanValue());
-      }
-
-      // -logDuration
-      else if (
-        (args[argCount].equalsIgnoreCase("-logDuration"))
-          || (args[argCount].equals("-d")))
-      {
-        argCount++;
-        monitorConfigFromArgs.setLogDuration(
-          Integer.valueOf(args[argCount]).intValue());
-      }
-
-      // -timeout
-      else if (
-        (args[argCount].equalsIgnoreCase("-timeout"))
-          || (args[argCount].equals("-t")))
-      {
-        argCount++;
-        monitorConfigFromArgs.setTimeout(
-          Integer.valueOf(args[argCount]).intValue());
-      }
-
-      // -manInTheMiddle
-      else if (
-        (args[argCount].equalsIgnoreCase("-manInTheMiddle"))
-          || (args[argCount].equals("-m")))
-      {
-        ManInTheMiddle manInTheMiddle = null;
-
-        // Increment arg count
-        argCount++;
-
-        // Get the man-in-the-middle object
-        if ((manInTheMiddle = monitorConfigFromArgs.getManInTheMiddle())
-          == null)
-          manInTheMiddle = new ManInTheMiddleImpl();
-
-        // ADD: Check for correct number of remaining args
-
-        // Create redirect
-        Redirect redirect = new RedirectImpl();
-
-        // Get the redirect values 
-        redirect.setListenPort(Integer.valueOf(args[argCount++]).intValue());
-        redirect.setHost(args[argCount++]);
-        redirect.setMaxConnections(
-          Integer.valueOf(args[argCount++]).intValue());
-        redirect.setReadTimeoutSeconds(
-          Integer.valueOf(args[argCount++]).intValue());
-
-        // Add redirect
-        manInTheMiddle.addRedirect(redirect);
-
-        // Set the man-in-the-middle
-        monitorConfigFromArgs.setManInTheMiddle(manInTheMiddle);
-      }
-
-      // -verbose
-      else if (
-        (args[argCount].equalsIgnoreCase("-verbose"))
-          || (args[argCount].equals("-v")))
-      {
-        argCount++;
-        //monitorConfigFromArgs.setVerboseOption(Boolean.valueOf(args[argCount]).booleanValue());
-        monitorConfigFromArgs.setVerboseOption(true);
-      }
-
-      // -GUI
-      else if (args[argCount].equalsIgnoreCase("-GUI"))
-      {
-        // Ignore -GUI option
-      }
-
-      else
-      {
-        throw new IllegalArgumentException(
-          getMessage(
-            "config01",
-            args[argCount],
-            "The specified option is not supported."));
-      }
-    }
-
-    // If addStyleSheet was not specified, then create a comment version of it
-    if (monitorConfigFromArgs.getAddStyleSheet() == null)
-    {
-      AddStyleSheet addStyleSheet = new AddStyleSheetImpl();
-      addStyleSheet.setHref(WSIConstants.DEFAULT_LOG_XSL);
-      addStyleSheet.setType(WSIConstants.DEFAULT_XSL_TYPE);
-      addStyleSheet.setComment(true);
-      monitorConfigFromArgs.setAddStyleSheet(addStyleSheet);
-    }
-
-    // Merge config info into this object
-    setConfig(monitorConfigFromArgs);
-
-    // Verify config options
-    verifyConfig();
-  }
-
-  /**
-   * Get message from resource bundle.
-   */
-  private String getMessage(String messageID, String defaultMessage)
-  {
-    return getMessage(messageID, null, defaultMessage);
-  }
-
-  /**
-   * Get message from resource bundle.
-   */
-  private String getMessage(
-    String messageID,
-    String messageData,
-    String defaultMessage)
-  {
-    String message = defaultMessage;
-    if (messageList != null)
-      message = messageList.getMessage(messageID, messageData, defaultMessage);
-    else
-      message += " " + messageData + ".";
-
-    return message;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/config/impl/MonitorConfigReaderImpl.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/config/impl/MonitorConfigReaderImpl.java
deleted file mode 100644
index 004abca8e..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/config/impl/MonitorConfigReaderImpl.java
+++ /dev/null
@@ -1,479 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.monitor.config.impl;
-
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.Reader;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSIFileNotFoundException;
-import org.eclipse.wst.wsi.internal.core.common.AddStyleSheet;
-import org.eclipse.wst.wsi.internal.core.common.impl.AddStyleSheetImpl;
-import org.eclipse.wst.wsi.internal.core.monitor.config.Comment;
-import org.eclipse.wst.wsi.internal.core.monitor.config.ManInTheMiddle;
-import org.eclipse.wst.wsi.internal.core.monitor.config.MonitorConfig;
-import org.eclipse.wst.wsi.internal.core.monitor.config.MonitorConfigReader;
-import org.eclipse.wst.wsi.internal.core.monitor.config.Redirect;
-import org.eclipse.wst.wsi.internal.core.util.MessageList;
-import org.eclipse.wst.wsi.internal.core.util.TestUtils;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * Defines the implementation used to read the monitor config documents.
- * 
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public class MonitorConfigReaderImpl implements MonitorConfigReader
-{
-  /**
-   * Message list reference.
-   */
-  protected MessageList messageList = null;
-
-  /**
-   * Document location.
-   */
-  protected String documentURI;
-
-  /**
-   * Initialize monitor config.
-   */
-  public void init(MessageList messageList)
-  {
-    this.messageList = messageList;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.MonitorConfigReader#readMonitorConfig(String)
-   */
-  public MonitorConfig readMonitorConfig(String monitorConfigURI)
-    throws WSIException
-  {
-    FileReader fileReader = null;
-
-    try
-    {
-      fileReader = new FileReader(monitorConfigURI);
-    }
-
-    catch (FileNotFoundException fnfe)
-    {
-      throw new WSIFileNotFoundException(
-        getMessage("config02", monitorConfigURI, "Could not find file:"),
-        fnfe);
-    }
-
-    catch (Exception e)
-    {
-      throw new WSIException(
-        getMessage("config03", monitorConfigURI, "Could not read file:"),
-        e);
-    }
-
-    return readMonitorConfig(fileReader);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.MonitorConfigReader#readMonitorConfig(Reader)
-   */
-  public MonitorConfig readMonitorConfig(Reader reader) throws WSIException
-  {
-    MonitorConfig monitorConfig = new MonitorConfigImpl();
-
-    // Parse XML
-    Document doc = XMLUtils.parseXML(reader);
-
-    // Parse elements in the config document
-    parseConfigElement(monitorConfig, doc.getDocumentElement());
-
-    return monitorConfig;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.DocumentReader#getLocation()
-   */
-  public String getLocation()
-  {
-    return this.documentURI;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.DocumentReader#setLocation(String)
-   */
-  public void setLocation(String documentURI)
-  {
-    this.documentURI = documentURI;
-  }
-
-  /**
-   * Parse config element.
-   */
-  private void parseConfigElement(MonitorConfig monitorConfig, Element element)
-    throws WSIException
-  {
-    // ADD: Verify that this is the config element
-
-    // Get first child element
-    Element nextElement = XMLUtils.getFirstChild(element);
-
-    boolean isLogDurationDefine = false;
-    boolean isCleanupTimeoutSecondsDefine = false;
-
-    // Process each child element
-    while (nextElement != null)
-    {
-      // <logFile>
-      if (isElement(nextElement, WSIConstants.ELEM_LOG_FILE))
-      {
-        // Parse the log element
-        parseLogFileElement(monitorConfig, nextElement);
-      }
-
-      // <logDuration>
-      else if (isElement(nextElement, WSIConstants.ELEM_LOG_DURATION))
-      {
-        monitorConfig.setLogDuration(getIntValue(nextElement));
-        if (monitorConfig.getLogDuration() < 0)
-          throw new IllegalArgumentException(
-            getMessage(
-              "config09",
-              WSIConstants.ELEM_LOG_DURATION,
-              "Parameter value can't be negative. Element name:"));
-        isLogDurationDefine = true;
-      }
-
-      // <cleanupTimeoutSeconds>
-      else if (
-        isElement(nextElement, WSIConstants.ELEM_CLEANUP_TIMEOUT_SECONDS))
-      {
-        monitorConfig.setTimeout(getIntValue(nextElement));
-        if (monitorConfig.getTimeout() < 0)
-          throw new IllegalArgumentException(
-            getMessage(
-              "config09",
-              WSIConstants.ELEM_CLEANUP_TIMEOUT_SECONDS,
-              "Parameter value can't be negative. Element name:"));
-        isCleanupTimeoutSecondsDefine = true;
-      }
-
-      // <manInTheMiddle>
-      else if (isElement(nextElement, WSIConstants.ELEM_MAN_IN_THE_MIDDLE))
-      {
-        ManInTheMiddle manInTheMiddle = new ManInTheMiddleImpl();
-        monitorConfig.setManInTheMiddle(manInTheMiddle);
-        parseManInTheMiddleElement(manInTheMiddle, nextElement);
-      }
-
-      // <comment>
-      else if (isElement(nextElement, WSIConstants.ELEM_COMMENT))
-      {
-        Comment comment = new CommentImpl();
-        comment.setText(XMLUtils.getText(nextElement));
-        monitorConfig.setComment(comment);
-      }
-
-      else
-      {
-        // ADD: handle invalid elements
-      }
-
-      // Get next element
-      nextElement = XMLUtils.getNextSibling(nextElement);
-    }
-
-    if (!isLogDurationDefine)
-    {
-      throw new IllegalArgumentException(
-        getMessage(
-          "config10",
-          WSIConstants.ELEM_LOG_DURATION,
-          "Element is missing. Element name:"));
-    }
-    if (!isCleanupTimeoutSecondsDefine)
-    {
-      throw new IllegalArgumentException(
-        getMessage(
-          "config10",
-          WSIConstants.ELEM_CLEANUP_TIMEOUT_SECONDS,
-          "Element is missing. Element name:"));
-    }
-  }
-
-  /**
-   * Parse logFile element.
-   */
-  private void parseLogFileElement(
-    MonitorConfig monitorConfig,
-    Element element)
-    throws WSIException
-  {
-    // Get the location attribute
-    monitorConfig.setLogLocation(
-      XMLUtils.getAttributeValue(element, WSIConstants.ATTR_LOCATION));
-
-    // Get the replace attribute
-    monitorConfig.setReplaceLog(
-      XMLUtils.getBooleanValue(element, WSIConstants.ATTR_REPLACE, false));
-
-    // Get first child element
-    Element nextElement = XMLUtils.getFirstChild(element);
-
-    // Process each child element
-    while (nextElement != null)
-    {
-      // <addStyleSheet>
-      if (isElement(nextElement, WSIConstants.ELEM_ADD_STYLE_SHEET))
-      {
-        AddStyleSheet addStyleSheet = new AddStyleSheetImpl();
-
-        // Parse the element  
-        TestUtils.parseAddStyleSheet(
-          nextElement,
-          addStyleSheet,
-          WSIConstants.DEFAULT_LOG_XSL);
-
-        // Set add style sheet
-        monitorConfig.setAddStyleSheet(addStyleSheet);
-      }
-
-      else
-      {
-        // ADD: handle invalid elements
-      }
-
-      // Get next element
-      nextElement = XMLUtils.getNextSibling(nextElement);
-    }
-  }
-
-  /**
-   * Parse manIntheMiddle element.
-   */
-  private void parseManInTheMiddleElement(
-    ManInTheMiddle manInTheMiddle,
-    Element element)
-    throws WSIException
-  {
-    // Get first child element
-    Element nextElement = XMLUtils.getFirstChild(element);
-
-    // Process each child element
-    while (nextElement != null)
-    {
-      // <redirect>
-      if (isElement(nextElement, WSIConstants.ELEM_REDIRECT))
-      {
-        Redirect redirect = new RedirectImpl();
-        manInTheMiddle.addRedirect(redirect);
-        parseRedirectElement(redirect, nextElement);
-      }
-
-      // <comment>
-      else if (isElement(nextElement, WSIConstants.ELEM_COMMENT))
-      {
-        Comment comment = new CommentImpl();
-        comment.setText(XMLUtils.getText(nextElement));
-        manInTheMiddle.setComment(comment);
-      }
-
-      else
-      {
-        // ADD: handle invalid elements
-      }
-
-      // Get next element
-      nextElement = XMLUtils.getNextSibling(nextElement);
-    }
-  }
-
-  /**
-   * Parse redirect element.
-   */
-  private void parseRedirectElement(Redirect redirect, Element element)
-    throws WSIException
-  {
-    // Get first child element
-    Element nextElement = XMLUtils.getFirstChild(element);
-
-    boolean isListenPortDefine = false;
-    boolean isSchemeAndHostPortDefine = false;
-    boolean isMaxConnectionsDefine = false;
-    boolean isReadTimeoutSecondsDefine = false;
-
-    // Process each child element
-    while (nextElement != null)
-    {
-      // <listenPort>
-      if (isElement(nextElement, WSIConstants.ELEM_LISTEN_PORT))
-      {
-        redirect.setListenPort(getIntValue(nextElement));
-        isListenPortDefine = true;
-      }
-
-      // <schemeAndHostPort>
-      else if (isElement(nextElement, WSIConstants.ELEM_SCHEME_AND_HOSTPORT))
-      {
-        redirect.setHost(XMLUtils.getText(nextElement));
-        isSchemeAndHostPortDefine = true;
-      }
-
-      // <maxConnections>
-      else if (isElement(nextElement, WSIConstants.ELEM_MAX_CONNECTIONS))
-      {
-        redirect.setMaxConnections(getIntValue(nextElement));
-        isMaxConnectionsDefine = true;
-      }
-
-      // <readTimeoutSeconds>
-      else if (isElement(nextElement, WSIConstants.ELEM_READ_TIMEOUT_SECONDS))
-      {
-        redirect.setReadTimeoutSeconds(getIntValue(nextElement));
-        if (redirect.getReadTimeoutSeconds() < 0)
-        {
-          throw new IllegalArgumentException(
-            getMessage(
-              "config09",
-              WSIConstants.ELEM_READ_TIMEOUT_SECONDS,
-              "Parameter value can't be negative. Element name:"));
-        }
-        isReadTimeoutSecondsDefine = true;
-      }
-
-      // <comment>
-      else if (isElement(nextElement, WSIConstants.ELEM_COMMENT))
-      {
-        Comment comment = new CommentImpl();
-        comment.setText(XMLUtils.getText(nextElement));
-        redirect.setComment(comment);
-      }
-
-      else
-      {
-        // ADD: handle invalid elements
-      }
-
-      // Get next element
-      nextElement = XMLUtils.getNextSibling(nextElement);
-    }
-
-    if (!isListenPortDefine)
-    {
-      throw new IllegalArgumentException(
-        getMessage(
-          "config10",
-          WSIConstants.ELEM_LISTEN_PORT,
-          "Element is missing. Element name:"));
-    }
-    if (!isSchemeAndHostPortDefine)
-    {
-      throw new IllegalArgumentException(
-        getMessage(
-          "config10",
-          WSIConstants.ELEM_SCHEME_AND_HOSTPORT,
-          "Element is missing. Element name:"));
-
-    }
-    if (!isMaxConnectionsDefine)
-    {
-      throw new IllegalArgumentException(
-        getMessage(
-          "config10",
-          WSIConstants.ELEM_MAX_CONNECTIONS,
-          "Element is missing. Element name:"));
-    }
-    if (!isReadTimeoutSecondsDefine)
-    {
-      throw new IllegalArgumentException(
-        getMessage(
-          "config10",
-          WSIConstants.ELEM_READ_TIMEOUT_SECONDS,
-          "Element is missing. Element name:"));
-    }
-  }
-
-  /**
-   * Determine if this element matches specified local name in the analyzer config namespace.
-   */
-  private boolean isElement(Element element, String localName)
-  {
-    return isElement(
-      element,
-      WSIConstants.NS_URI_WSI_MONITOR_CONFIG,
-      localName);
-  }
-
-  /**
-   * Determine if this element matches specified local name in the analyzer config namespace.
-   */
-  private boolean isElement(
-    Element element,
-    String namespace,
-    String localName)
-  {
-    return XMLUtils.isElement(element, namespace, localName);
-  }
-
-  /**
-   * Get element text as an int.
-   */
-  private int getIntValue(Element element) throws WSIException
-  {
-    int returnValue;
-    String intValue = null;
-
-    // Get value as a string
-    if ((intValue = XMLUtils.getText(element)) == null)
-    {
-      throw new WSIException(
-        getMessage(
-          "config04",
-          element.getLocalName() + "Element must contain an integer value:"));
-    }
-
-    else
-    {
-      returnValue = Integer.valueOf(intValue).intValue();
-    }
-
-    // Return int
-    return returnValue;
-  }
-
-  /**
-   * Get message from resource bundle.
-   */
-  private String getMessage(String messageID, String defaultMessage)
-  {
-    return getMessage(messageID, null, defaultMessage);
-  }
-
-  /**
-   * Get message from resource bundle.
-   */
-  private String getMessage(
-    String messageID,
-    String messageData,
-    String defaultMessage)
-  {
-    String message = defaultMessage;
-    if (messageList != null)
-      message = messageList.getMessage(messageID, messageData, defaultMessage);
-    else
-      message += " " + messageData + ".";
-
-    return message;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/config/impl/RedirectImpl.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/config/impl/RedirectImpl.java
deleted file mode 100644
index a1d169ca2..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/config/impl/RedirectImpl.java
+++ /dev/null
@@ -1,299 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.monitor.config.impl;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.monitor.config.Comment;
-import org.eclipse.wst.wsi.internal.core.monitor.config.Redirect;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-
-/**
- *  The implementation for monitor config Redirect element.
- * 
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public class RedirectImpl implements Redirect
-{
-  /**
-   * Comment.
-   */
-  protected Comment comment;
-
-  /**
-   * Listen port.
-   */
-  protected int listenPort;
-
-  /**
-   * Host.
-   */
-  protected String host;
-
-  /**
-   * To protocol.
-   */
-  protected String toProtocol;
-
-  /**
-   * To port.
-   */
-  protected int toPort;
-
-  /**
-   * To host.
-   */
-  protected String toHost;
-
-  /**
-   * Maximum connections.
-   */
-  protected int maxConnections;
-
-  /**
-   * Read timeout seconds.
-   */
-  protected int readTimeoutSeconds;
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.Redirect#getComment()
-   */
-  public Comment getComment()
-  {
-    return this.comment;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.Redirect#setComment(comment)
-   */
-  public void setComment(Comment comment)
-  {
-    this.comment = comment;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.Redirect#getListenPort()
-   */
-  public int getListenPort()
-  {
-    return this.listenPort;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.Redirect#setListenPort(int)
-   */
-  public void setListenPort(int listenPort)
-  {
-    this.listenPort = listenPort;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.Redirect#getHost()
-   */
-  public String getHost()
-  {
-    return this.host;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.Redirect#setHost(String)
-   */
-  public void setHost(String host)
-  {
-    this.host = host;
-
-    // Parse location to get protocol, host and port
-    URL url;
-    try
-    {
-      url = new URL(host);
-      this.toProtocol = url.getProtocol();
-      this.toHost = url.getHost();
-      this.toPort = url.getPort();
-      if (this.toPort == -1)
-      {
-        if (this.toProtocol.equalsIgnoreCase("http"))
-          this.toPort = 80;
-        else
-          this.toPort = 80;
-      }
-    }
-
-    catch (MalformedURLException mue)
-    {
-      throw new IllegalArgumentException(
-        "The "
-          + WSIConstants.ELEM_SCHEME_AND_HOSTPORT
-          + " option contains an invalid value: "
-          + host);
-    }
-
-    if ((url.getPath() != null && !url.getPath().equals(""))
-      || (url.getQuery() != null && !url.getQuery().equals("")))
-      throw new IllegalArgumentException(
-        "The "
-          + WSIConstants.ELEM_SCHEME_AND_HOSTPORT
-          + " option must contain only a scheme, host and port: "
-          + host);
-  }
-
-  /**
-   * Get to port.
-   * @see org.eclipse.wst.wsi.monitor.config.Redirect#getToPort()
-   */
-  public int getToPort()
-  {
-    return this.toPort;
-  }
-
-  /**
-   * Get to host.
-   * @see org.eclipse.wst.wsi.monitor.config.Redirect#getToHost()
-   */
-  public String getToHost()
-  {
-    return this.toHost;
-  }
-
-  /**
-   * Get to protocol.
-   * @see org.eclipse.wst.wsi.monitor.config.Redirect#getToProtocol()
-   */
-  public String getToProtocol()
-  {
-    return this.toProtocol;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.Redirect#getMaxConnections()
-   */
-  public int getMaxConnections()
-  {
-    return this.maxConnections;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.Redirect#setMaxConnections(int)
-   */
-  public void setMaxConnections(int maxConnections)
-  {
-    this.maxConnections = maxConnections;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.Redirect#getReadTimeoutSeconds()
-   */
-  public int getReadTimeoutSeconds()
-  {
-    return this.readTimeoutSeconds;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.Redirect#setReadTimeoutSeconds(int)
-   */
-  public void setReadTimeoutSeconds(int readTimeoutSeconds)
-  {
-    this.readTimeoutSeconds = readTimeoutSeconds;
-  }
-
-  /**
-   * Get string representation of this object.
-   */
-  public String toString()
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    pw.println("    comment ................... " + this.comment);
-    pw.println("    listenPort ................ " + this.listenPort);
-    pw.println("    host ...................... " + cutHost(this.host));
-    pw.println("    maxConnections ............ " + this.maxConnections);
-    pw.println("    readTimeoutSeconds ........ " + this.readTimeoutSeconds);
-
-    return sw.toString();
-  }
-
-  /**
-   * Formats host name according to the specification (path is ommited).
-   * @param host
-   * @return
-   */
-  private String cutHost(String host)
-  {
-    try
-    {
-      URL url = new URL(host);
-      String port = url.getPort() > -1 ? String.valueOf(url.getPort()) : "80";
-      // REMOVED: This code only works on 1.4
-      // String.valueOf(url.getDefaultPort());
-      return url.getProtocol() + "://" + url.getHost() + ":" + port;
-    }
-    catch (Exception e)
-    {
-      return host;
-    }
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.DocumentElement#toXMLString(String)
-   */
-  public String toXMLString(String namespaceName)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    String nsName = namespaceName;
-    if ((!nsName.equals("") && (!nsName.endsWith(":"))))
-      nsName += ":";
-
-    // Start element
-    pw.println("        <" + nsName + WSIConstants.ELEM_REDIRECT + ">");
-
-    // Comment
-    if (this.comment != null)
-    {
-      pw.println(this.comment.toXMLString(nsName));
-    }
-
-    // listenPort
-    pw.print("          <" + nsName + WSIConstants.ELEM_LISTEN_PORT + ">");
-    pw.print(getListenPort());
-    pw.println("</" + nsName + WSIConstants.ELEM_LISTEN_PORT + ">");
-
-    // schemeAndHostPort
-    pw.print(
-      "          <" + nsName + WSIConstants.ELEM_SCHEME_AND_HOSTPORT + ">");
-    pw.print(XMLUtils.xmlEscapedString(getHost()));
-    pw.println("</" + nsName + WSIConstants.ELEM_SCHEME_AND_HOSTPORT + ">");
-
-    // maxConnections
-    pw.print("          <" + nsName + WSIConstants.ELEM_MAX_CONNECTIONS + ">");
-    pw.print(getMaxConnections());
-    pw.println("</" + nsName + WSIConstants.ELEM_MAX_CONNECTIONS + ">");
-
-    // readTimeoutSeconds
-    pw.print(
-      "          <" + nsName + WSIConstants.ELEM_READ_TIMEOUT_SECONDS + ">");
-    pw.print(getReadTimeoutSeconds());
-    pw.println("</" + nsName + WSIConstants.ELEM_READ_TIMEOUT_SECONDS + ">");
-
-    // End Element
-    pw.println("        </" + nsName + WSIConstants.ELEM_REDIRECT + ">");
-
-    return sw.toString();
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/EntryTypeList.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/EntryTypeList.java
deleted file mode 100644
index 6d8d13a57..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/Profile.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/Profile.java
deleted file mode 100644
index bc326c31b..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/ProfileArtifact.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/ProfileArtifact.java
deleted file mode 100644
index 1934f2a87..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/ProfileArtifact.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile;
-
-import java.util.LinkedList;
-import java.util.Vector;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.document.DocumentElement;
-import org.eclipse.wst.wsi.internal.core.util.ArtifactType;
-
-/**
- * An artifact contains a set of related test assertions.
- * 
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public interface ProfileArtifact extends DocumentElement
-{
-  /**
-   * Element name.
-   */
-  public static final String ELEM_NAME = WSIConstants.ELEM_ARTIFACT;
-
-  /**
-   * QName.
-   */
-  public static final QName QNAME =
-    new QName(WSIConstants.NS_URI_WSI_ASSERTIONS, ELEM_NAME);
-
-  /**
-   * Get type.
-   * @return artifact type.
-   * @see #setType
-   */
-  public ArtifactType getType();
-
-  /**
-   * Set type.
-   * @param type an artifact type.
-   * @see #getType
-   */
-  public void setType(ArtifactType type);
-
-  /**
-   * Get specification list.
-   * @return specification list.
-   * @see #setSpecificationList
-   */
-  public Vector getSpecificationList();
-
-  /**
-   * Set specification list.
-   * @param specificationList specification list.
-   * @see #getSpecificationList
-   */
-  public void setSpecificationList(Vector specificationList);
-
-  /**
-   * Get test assertion list.
-   * @return test assertion list.
-   */
-  public LinkedList getTestAssertionList();
-
-  /**
-   * Get test assertion.
-   * @param id test assertion id.
-   * @return test assertion.
-   */
-  public TestAssertion getTestAssertion(String id);
-
-  /**
-   * Add test assertion.
-   * @param testAssertion test assertion.
-   */
-  public void addTestAssertion(TestAssertion testAssertion);
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/ProfileAssertions.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/ProfileAssertions.java
deleted file mode 100644
index 3c6776166..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/ProfileAssertions.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile;
-
-import java.util.TreeMap;
-import java.util.Vector;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.document.WSIDocument;
-
-/**
- * This interface maintains profile assertions.
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public interface ProfileAssertions extends WSIDocument
-{
-  /**
-   * Element name.
-   */
-  public static final String ELEM_NAME = WSIConstants.ELEM_PROFILE_ASSERTIONS;
-
-  /**
-   * QName.
-   */
-  public static final QName QNAME =
-    new QName(WSIConstants.NS_URI_WSI_ASSERTIONS, ELEM_NAME);
-
-  /**
-   * Get list of profiles.
-   * @return list of profiles.
-   * @see #setProfileList
-   */
-  public Vector getProfileList();
-
-  /**
-   * Set list of profiles.
-   * @param profileList list of profiles.
-   * @see #getProfileList
-   */
-  public void setProfileList(Vector profileList);
-
-  /**
-   * Add profile.
-   * @param profile profile.
-   */
-  public void addProfile(Profile profile);
-
-  /**
-   * Get list of artifacts.
-   * @return list of artifacts.
-   * @see #setArtifactList
-   */
-  public TreeMap getArtifactList();
-
-  /**
-   * Get artifact.
-   * @param type an artifact type.
-   * @return a profile artifact based on the given type.
-   */
-  public ProfileArtifact getArtifact(String type);
-
-  /**
-   * Set list of artifacts.
-   * @param artifactList a list pf profile artifiacts.
-   * @see #getArtifactList
-   */
-  public void setArtifactList(TreeMap artifactList);
-
-  /**
-   * Add artifact.
-   * @param artifact profile artifact.
-   */
-  public void addArtifact(ProfileArtifact artifact);
-
-  /**
-   * Get test assertion.
-   * @param id test assertion id.
-   * @return test assertion.
-   */
-  public TestAssertion getTestAssertion(String id);
-
-  /**
-   * Create artifact.
-   * @return newly created profile artifact.
-   */
-  public ProfileArtifact createArtifact();
-
-  /**
-   * Returns the name of the profile test assertion document.
-   * @return the name of the document. 
-   */
-  public String getTADName();
-
-  /**
-   * Set the name of the profile test assertion document.
-   * @param documentName the name of the document.
-   */
-  public void setTADName(String documentName);
-
-  /**
-   * Returns the version of the profile test assertion document.
-   * @return the version of the document.
-   */
-  public String getTADVersion();
-
-  /**
-   * Set the version of the profile test assertion document.
-   * @param documentVersion the version of the document.
-   */
-  public void setTADVersion(String documentVersion);
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/ProfileAssertionsReader.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/ProfileAssertionsReader.java
deleted file mode 100644
index 00b0a3de8..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/ProfileAssertionsReader.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile;
-
-import java.io.Reader;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.document.DocumentReader;
-
-/**
- * Defines the interface used to read a profile assertions documents.
- * 
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public interface ProfileAssertionsReader extends DocumentReader
-{
-  /**
-   * Read the profile assertions file.
-   * @param assertionsURI he profile assertions file location.
-   * @return the ProfileAssertions object.
-   * @throws WSIException if problem occur while reading the file.
-   */
-  public ProfileAssertions readProfileAssertions(String assertionsURI)
-    throws WSIException;
-
-  /**
-   * Read the profile assertions  file.
-   * @param reader a Reader object.
-   * @return the ProfileAssertions object.
-   * @throws WSIException  if problem occur while reading the file.
-   */
-  public ProfileAssertions readProfileAssertions(Reader reader)
-    throws WSIException;
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/TestAssertion.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/TestAssertion.java
deleted file mode 100644
index ef5347554..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/TestAssertion.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile;
-
-import java.util.Vector;
-
-/**
- * A test assertion is one assertion in a profile definition.
- *
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public interface TestAssertion
-{
-  public static final String TYPE_INFORMATIONAL = "informational";
-  
-  /**
-   * Get test assertion id.
-   * @return test assertion id.
-   * @see #setId
-   */
-  public String getId();
-
-  /**
-   * Set test assertion id.
-   * @param id test assertion id.
-   * @see #getId
-   */
-  public void setId(String id);
-
-  /**
-   * Get test assertion type.
-   * @return test assertion type.
-   * @see #setType
-   */
-  public String getType();
-
-  /**
-   * Set test assertion type.
-   * @param  type test assertion type.
-   * @see #getType
-   */
-  public void setType(String type);
-
-  /**
-   * Get test assertion primary entry type name.
-   * @return test assertion primary entry type name.
-   * @see #setEntryTypeName
-   */
-  public String getEntryTypeName();
-
-  /**
-   * Set test assertion primary entry type name.
-   * @param entryTypeName test assertion primary entry type name.
-   * @see #getEntryTypeName
-   */
-  public void setEntryTypeName(String entryTypeName);
-
-  /**
-   * Get enabled indicator.
-   * @return enabled indicator.
-   * @see #setEnabled
-   */
-  public boolean isEnabled();
-
-  /**
-   * Set  enabled indicator.
-   * @param enabled enabled indicator.
-   * @see #isEnabled
-   */
-  public void setEnabled(boolean enabled);
-
-  /**
-   * Get context.
-   * @return context.
-   * @see #setContext
-   */
-  public String getContext();
-
-  /**
-   * Set context.
-   * @param context context.
-   * @see #getContext
-   */
-  public void setContext(String context);
-
-  /**
-   * Get assertion description.
-   * @return assertion description.
-   * @see #setAssertionDescription
-   */
-  public String getAssertionDescription();
-
-  /**
-   * Set assertion description.
-   * @param assertionDescription assertion description.
-   * @see #getAssertionDescription
-   */
-  public void setAssertionDescription(String assertionDescription);
-
-  /**
-   * Get failure message.
-   * @return failure message.
-   * @see #setFailureMessage
-   */
-  public String getFailureMessage();
-
-  /**
-   * Set failure message.
-   * @param failureMessage failure message.
-   * @see #getFailureMessage
-   */
-  public void setFailureMessage(String failureMessage);
-
-  /**
-   * Get failure detail description.
-   * @return failure detail description.
-   * @see #setFailureDetailDescription
-   */
-  public String getFailureDetailDescription();
-
-  /**
-   * Set failure detail description.
-   * @param failureDetailDescription failure detail description.
-   * @see #getFailureDetailDescription
-   */
-  public void setFailureDetailDescription(String failureDetailDescription);
-
-  /**
-   * Get detail description.
-   * @return detail description.
-   * @see #setDetailDescription
-   */
-  public String getDetailDescription();
-
-  /**
-   * Set detail description.
-   * @param detailDescription detail description.
-   * @see #getDetailDescription
-   */
-  public void setDetailDescription(String detailDescription);
-
-  /**
-   * Get additional entry type list.
-   * @return additional entry type list.
-   * @see #setAdditionalEntryTypeList
-   */
-  public EntryTypeList getAdditionalEntryTypeList();
-
-  /**
-   * Set additional entry type list.
-   * @param entryTypeList additional entry type list.
-   * @see #getAdditionalEntryTypeList
-   */
-  public void setAdditionalEntryTypeList(EntryTypeList entryTypeList);
-
-  /**
-   * Get list of prereq ids.
-   * @return list of prereq ids.
-   */
-  public Vector getPrereqIdList();
-
-  /**
-   * Add prereq test assertion id.
-   * @param  prereqId prereq test assertion id.
-   */
-  public void addPrereqId(String prereqId);
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/impl/EntryTypeListImpl.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/impl/EntryTypeListImpl.java
deleted file mode 100644
index 5d81f2d04..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileArtifactImpl.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileArtifactImpl.java
deleted file mode 100644
index b4ab3be23..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileArtifactImpl.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.impl;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.LinkedList;
-import java.util.TreeMap;
-import java.util.Vector;
-
-import org.eclipse.wst.wsi.internal.core.profile.ProfileArtifact;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.util.ArtifactType;
-
-/**
- * An artifact contains a set of related test assertions.
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public class ProfileArtifactImpl implements ProfileArtifact
-{
-  /**
-   * Artifact type.
-   */
-  protected ArtifactType type;
-
-  /**
-   * Test assertion map.
-   */
-  protected TreeMap testAssertionMap = new TreeMap();
-
-  /**
-   * Test assertion list.
-   */
-  protected LinkedList testAssertionList = new LinkedList();
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.ReportArtifact#getType()
-   */
-  public ArtifactType getType()
-  {
-    return this.type;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.ReportArtifact#setType(ArtifactType)
-   */
-  public void setType(ArtifactType type)
-  {
-    this.type = type;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.ReportArtifact#getSpecificationList()
-   */
-  public Vector getSpecificationList()
-  {
-    return null;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.ReportArtifact#setSpecificationList(Vector)
-   */
-  public void setSpecificationList(Vector specificationList)
-  {
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.ReportArtifact#getTestAssertionList()
-   */
-  public LinkedList getTestAssertionList()
-  {
-    return this.testAssertionList;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.ReportArtifact#getTestAssertion(String)
-   */
-  public TestAssertion getTestAssertion(String id)
-  {
-    return (TestAssertion) this.testAssertionMap.get(id);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.ReportArtifact#addTestAssertion(TestAssertion)
-   */
-  public void addTestAssertion(TestAssertion testAssertion)
-  {
-    // ADD: Need to merge the list and map
-    this.testAssertionMap.put(testAssertion.getId(), testAssertion);
-    this.testAssertionList.add(testAssertion);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.DocumentElement#toXMLString(String)
-   */
-  public String toXMLString(String namespaceName)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    String nsName = namespaceName;
-    if ((!nsName.equals("") && (!nsName.endsWith(":"))))
-      nsName += ":";
-
-    // ReportArtifact
-    pw.println("      <" + nsName + ELEM_NAME + ">");
-
-    pw.println("      </" + nsName + ELEM_NAME + ">");
-
-    return sw.toString();
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileAssertionsImpl.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileAssertionsImpl.java
deleted file mode 100644
index 2c81419eb..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileAssertionsImpl.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.impl;
-
-import java.util.Iterator;
-import java.util.TreeMap;
-import java.util.Vector;
-
-import org.eclipse.wst.wsi.internal.core.profile.Profile;
-import org.eclipse.wst.wsi.internal.core.profile.ProfileArtifact;
-import org.eclipse.wst.wsi.internal.core.profile.ProfileAssertions;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-
-/**
- * This class ...
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public class ProfileAssertionsImpl implements ProfileAssertions
-{
-  /**
-   * Location of the profile definition.
-   */
-  protected String documentURI;
-
-  /**
-   * Name of the profile test assertion document.
-   */
-  protected String documentName;
-
-  /**
-   * Version of the profile test assertion document.
-   */
-  protected String documentVersion;
-
-  // ADD: A profile definition should also have a description.
-
-  /**
-   * List of profiles.
-   */
-  Vector profileList = new Vector();
-
-  /**
-   * List of artifacts.
-   */
-  TreeMap artifactList = new TreeMap();
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.ProfileAssertions#getProfileList()
-   */
-  public Vector getProfileList()
-  {
-    return this.profileList;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.ProfileAssertions#setProfileList(Vector)
-   */
-  public void setProfileList(Vector profileList)
-  {
-    this.profileList = profileList;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.ProfileAssertions#addProfile(Profile)
-   */
-  public void addProfile(Profile profile)
-  {
-    this.profileList.add(profile);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.ProfileAssertions#getArtifactList()
-   */
-  public TreeMap getArtifactList()
-  {
-    return this.artifactList;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.ProfileAssertions#getArtifact(java.lang.String)
-   */
-  public ProfileArtifact getArtifact(String type)
-  {
-    return (ProfileArtifact) this.artifactList.get(type);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.ProfileAssertions#setArtifactList(TreeMap)
-   */
-  public void setArtifactList(TreeMap artifactList)
-  {
-    this.artifactList = artifactList;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.ProfileAssertions#addArtifact(ReportArtifact)
-   */
-  public void addArtifact(ProfileArtifact artifact)
-  {
-    this.artifactList.put(artifact.getType(), artifact);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.ProfileAssertions#getTestAssertion(String)
-   */
-  public TestAssertion getTestAssertion(String id)
-  {
-    TestAssertion testAssertion = null;
-
-    // Go through the list of artifacts and find the test assertion 
-    Iterator iterator = artifactList.values().iterator();
-    while ((iterator.hasNext()) && (testAssertion == null))
-    {
-      testAssertion = ((ProfileArtifact) iterator.next()).getTestAssertion(id);
-    }
-
-    return testAssertion;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.ProfileAssertions#createArtifact()
-   */
-  public ProfileArtifact createArtifact()
-  {
-    return new ProfileArtifactImpl();
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.WSIDocument#getLocation()
-   */
-  public String getLocation()
-  {
-    return this.documentURI;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.WSIDocument#setLocation(String)
-   */
-  public void setLocation(String documentURI)
-  {
-    this.documentURI = documentURI;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.profile.ProfileAssertions#getTADName()
-   */
-  public String getTADName()
-  {
-    return this.documentName;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.profile.ProfileAssertions#setTADName(String)
-   */
-  public void setTADName(String documentName)
-  {
-    this.documentName = documentName;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.profile.ProfileAssertions#getTADVersion()
-   */
-  public String getTADVersion()
-  {
-    return this.documentVersion;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.profile.ProfileAssertions#setTADVersion(String)
-   */
-  public void setTADVersion(String documentVersion)
-  {
-    this.documentVersion = documentVersion;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.DocumentElement#toXMLString(String)
-   */
-  public String toXMLString(String namespaceName)
-  {
-    return null;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileAssertionsReaderImpl.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileAssertionsReaderImpl.java
deleted file mode 100644
index 3b2a9d9e0..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileAssertionsReaderImpl.java
+++ /dev/null
@@ -1,543 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.impl;
-
-import java.io.Reader;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.TreeMap;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.EntryTypeList;
-import org.eclipse.wst.wsi.internal.core.profile.ProfileArtifact;
-import org.eclipse.wst.wsi.internal.core.profile.ProfileAssertions;
-import org.eclipse.wst.wsi.internal.core.profile.ProfileAssertionsReader;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.util.ArtifactType;
-import org.eclipse.wst.wsi.internal.core.util.Utils;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.xml.sax.Attributes;
-import org.xml.sax.InputSource;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * This class ...
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public class ProfileAssertionsReaderImpl implements ProfileAssertionsReader
-{
-  /**
-   * Profile assertions.
-   */
-  protected ProfileAssertions profileAssertions;
-
-  /**
-   * ReportArtifact list.
-   */
-  protected TreeMap artifactList = new TreeMap();
-
-  /**
-   * Create new reader.
-   */
-  public ProfileAssertionsReaderImpl()
-  {
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.ProfileAssertionsReader#readProfileAssertions(String)
-   */
-  public ProfileAssertions readProfileAssertions(String assertionsURI)
-    throws WSIException
-  {
-    return readProfileAssertions(new InputSource(assertionsURI));
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.ProfileAssertionsReader#readProfileAssertions(Reader)
-   */
-  public ProfileAssertions readProfileAssertions(Reader reader)
-    throws WSIException
-  {
-    return readProfileAssertions(new InputSource(reader));
-  }
-
-  /**
-   * Read profile assertions.
-   */
-  private ProfileAssertions readProfileAssertions(InputSource inputSource)
-    throws WSIException
-  {
-    // Create profile assertions
-    profileAssertions = new ProfileAssertionsImpl();
-
-    // Profile parts are put into a vector
-    artifactList = new TreeMap();
-
-    try
-    {
-      // Create xml reader
-      XMLReader reader = XMLUtils.getXMLReader();
-
-      // Set content handler to inner class
-      reader.setContentHandler(new ProfileAssertionsHandler());
-
-      // Parse profile definition file
-      reader.parse(inputSource);
-    }
-
-    catch (Exception e)
-    {
-      throw new WSIException("Could not read and parse profile definition.", e);
-    }
-    finally
-    {
-      //Check to see if the version of test asssertion document is supported
-      if (!Utils.isValidProfileTADVersion(profileAssertions))
-      {
-        throw new WSIException(
-          "\nVersion "
-            + profileAssertions.getTADVersion()
-            + " of the \""
-            + profileAssertions.getTADName()
-            + "\"\n"
-            + "document is not compatible with this version of"
-            + "\n"
-            + "the test tools.");
-      }
-    }
-
-    // The assertions from the TAD are reordered for purposes of processing. All
-    // assertions of an artifact are reordered such that prerequisites occur
-    // before the assertions they prereq. The assumption is that  prerequisites do
-    // not cross artifact types.
-    //
-    Iterator it = artifactList.keySet().iterator();
-    // for each artifact type do reordering assertion 
-    while (it.hasNext())
-    {
-      ProfileArtifact art = (ProfileArtifact) artifactList.get(it.next());
-      // result list of the reordering assertions 
-      LinkedList res = new LinkedList();
-      Iterator it2 = art.getTestAssertionList().iterator();
-      // sort the artifact assertions into result list 
-      while (it2.hasNext())
-      {
-        // call for each assertion , 
-        // if the assertion has the prereq, the prereq will added first into res list
-        sortTestAssertions(art, (TestAssertion) it2.next(), res);
-      }
-      // replace the original assertions list to the prereq reordering assertions list
-      art.getTestAssertionList().clear();
-      art.getTestAssertionList().addAll(res);
-    }
-    // Put the profile parts into the profile definition
-    profileAssertions.setArtifactList(artifactList);
-
-    return profileAssertions;
-  }
-  
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.DocumentReader#getLocation()
-   */
-  public String getLocation()
-  {
-    return null;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.DocumentReader#setLocation(String)
-   */
-  public void setLocation(String documentURI)
-  {
-  }
-
-  /**
-   * Recursive walk to order assertions so that assertions are 
-   * processed following the ones that prereq them.
-   * If assertion has prereq, then add it to the result list first.
-   *  
-   * @param art profile artifact for call @link ProfileArtifact#getTestAssertion(String)
-   * @param asrt test assertion
-   * @param list result list to sort
-   */
-  private void sortTestAssertions(ProfileArtifact art, TestAssertion asrt, List list)
-  {
-    // if assertion is null or does not exist, then exit
-    if((asrt == null) || list.contains(asrt)) 
-      return;
-    
-    // if it has not prereq, add the asertion and exit
-    if(asrt.getPrereqIdList().isEmpty()) 
-    {
-      list.add(asrt);
-      return;
-    }
-    // get list prereq assertion and reqursive call sortTestAssertions this each    
-    Iterator it = asrt.getPrereqIdList().iterator();
-    while(it.hasNext()) {
-      String id = (String) it.next();
-      sortTestAssertions(art, art.getTestAssertion(id), list);
-    }
-    list.add(asrt);
-  }
-
-  /**
-   * Inner class: ProfileAssertionsHandler
-   */
-  class ProfileAssertionsHandler extends DefaultHandler
-  {
-    private ProfileArtifact artifact = profileAssertions.createArtifact();
-    private StringBuffer context = null;
-    private StringBuffer assertionDescription = null;
-    private StringBuffer failureMessage = null;
-    private StringBuffer failureDetailDescription = null;
-    private StringBuffer detailDescription = null;
-    private StringBuffer testAssertionId = null;
-    private String currentElement = null;
-    private TestAssertion testAssertion = null;
-    private StringBuffer logInput = null;
-    private StringBuffer wsdlInput = null;
-    private EntryTypeList entryTypeList = null;
-
-    // Process start element event
-    public void startElement(
-      String namespaceURI,
-      String localName,
-      String qName,
-      Attributes atts)
-    {
-      if (namespaceURI != null
-        && (namespaceURI.equals(WSIConstants.NS_URI_WSI_ASSERTIONS_2003)
-        ||  namespaceURI.equals(WSIConstants.NS_URI_WSI_ASSERTIONS)))
-      {
-        // Save element name
-        currentElement = localName;
-
-        // <artifact>
-        if (localName.equals(WSIConstants.ELEM_ARTIFACT))
-        {
-          // Create a new profile artifact object
-          artifact = profileAssertions.createArtifact();
-
-          // Set type
-          artifact.setType(
-            ArtifactType.newArtifactType(
-              atts.getValue(WSIConstants.ATTR_TYPE)));
-
-          // ADD: Get specification list
-
-          // Add artifact to list of artifact list
-          artifactList.put(artifact.getType().getTypeName(), artifact);
-        }
-
-        // <testAssertion>
-        else if (localName.equals(WSIConstants.ELEM_TEST_ASSERTION))
-        {
-          // Create test assertion
-          testAssertion = new TestAssertionImpl();
-
-          // Get attribute values
-          String id = atts.getValue("", WSIConstants.ATTR_ID);
-          testAssertion.setId(id);
-          testAssertion.setType(atts.getValue("", WSIConstants.ATTR_TYPE));
-          testAssertion.setEntryTypeName(
-            atts.getValue("", WSIConstants.ATTR_ENTRY_TYPE));
-          
-          // if assertion already checked then disable it
-          if (alreadyChecked(id))
-        	  testAssertion.setEnabled(false);
-          else
-        	  testAssertion.setEnabled(Boolean.valueOf(atts.getValue("", WSIConstants.ATTR_ENABLED)).booleanValue());
-
-          // Add test assertion to artifact
-          artifact.addTestAssertion(testAssertion);
-        }
-
-        // <context>
-        else if (localName.equals(WSIConstants.ELEM_CONTEXT))
-        {
-          context = new StringBuffer();
-        }
-
-        // <assertionDescription>
-        else if (localName.equals(WSIConstants.ELEM_ASSERTION_DESCRIPTION))
-        {
-          assertionDescription = new StringBuffer();
-        }
-
-        // <failureMessage>
-        else if (localName.equals(WSIConstants.ELEM_FAILURE_MESSAGE))
-        {
-          failureMessage = new StringBuffer();
-        }
-
-        // <failureDetailDescription>
-        else if (localName.equals(WSIConstants.ELEM_FAILURE_DETAIL_DESCRIPTION))
-        {
-          failureDetailDescription = new StringBuffer();
-        }
-
-        // <detailDescription>
-        else if (localName.equals(WSIConstants.ELEM_DETAIL_DESCRIPTION))
-        {
-          detailDescription = new StringBuffer();
-        }
-
-        // <testAssertionID>
-        else if (localName.equals(WSIConstants.ELEM_TEST_ASSERTION_ID))
-        {
-          testAssertionId = new StringBuffer();
-        }
-
-        // <additionalEntryTypeList>
-        else if (
-          localName.equals(WSIConstants.ELEM_ADDITIONAL_ENTRY_TYPE_LIST))
-        {
-          // Create entry type list
-          entryTypeList = new EntryTypeListImpl();
-        }
-
-        // <messageInput>
-        else if (localName.equals(WSIConstants.ELEM_MESSAGE_INPUT))
-        {
-          logInput = new StringBuffer();
-        }
-
-        // <wsdlInput>
-        else if (localName.equals(WSIConstants.ELEM_WSDL_INPUT))
-        {
-          wsdlInput = new StringBuffer();
-        }
-        // <profileAssertions>
-        else if (localName.equals(WSIConstants.ELEM_PROFILE_ASSERTIONS))
-        {
-          profileAssertions.setTADName(
-            atts.getValue("", WSIConstants.ATTR_NAME));
-          profileAssertions.setTADVersion(
-            atts.getValue("", WSIConstants.ATTR_VERSION));
-        }
-
-        /* REMOVE:     
-        // <uddiInput>
-        else if (localName.equals(WSIConstants.ELEM_UDDI_INPUT)) {
-          uddiInput = new StringBuffer();
-        } 
-        */
-      }
-    } // END startElement
-
-    public void endElement(String namespaceURI, String localName, String qname)
-    {
-      // If this is the profile namespace, then check for and process selected elements
-      if (namespaceURI != null
-        && (namespaceURI.equals(WSIConstants.NS_URI_WSI_ASSERTIONS_2003)
-        || namespaceURI.equals(WSIConstants.NS_URI_WSI_ASSERTIONS)))
-      {
-        // <context>
-        if (localName.equals(WSIConstants.ELEM_CONTEXT))
-        {
-          // Set context in test assertion
-          testAssertion.setContext(context.toString());
-          context = null;
-        }
-
-        // <assertionDescription>
-        else if (localName.equals(WSIConstants.ELEM_ASSERTION_DESCRIPTION))
-        {
-          // Set assertion description in test assertion
-          testAssertion.setAssertionDescription(
-            assertionDescription.toString());
-          assertionDescription = null;
-        }
-
-        // <failureMessage>
-        else if (localName.equals(WSIConstants.ELEM_FAILURE_MESSAGE))
-        {
-          // Set failure message in test assertion
-          testAssertion.setFailureMessage(failureMessage.toString());
-          failureMessage = null;
-        }
-
-        // <failureDetailDescription>
-        else if (localName.equals(WSIConstants.ELEM_FAILURE_DETAIL_DESCRIPTION))
-        {
-          // Set failure detail description in test assertion
-          testAssertion.setFailureDetailDescription(
-            failureDetailDescription.toString());
-          failureDetailDescription = null;
-        }
-
-        // <detailDescription>
-        else if (localName.equals(WSIConstants.ELEM_DETAIL_DESCRIPTION))
-        {
-          // Set detail description in test assertion
-          testAssertion.setDetailDescription(detailDescription.toString());
-          detailDescription = null;
-        }
-
-        // <testAssertionID>
-        else if (localName.equals(WSIConstants.ELEM_TEST_ASSERTION_ID))
-        {
-          // Set test assertion id in prereq list
-          testAssertion.addPrereqId(testAssertionId.toString());
-          testAssertionId = null;
-        }
-
-        // <addtionalEntryTypeList>
-        else if (
-          localName.equals(WSIConstants.ELEM_ADDITIONAL_ENTRY_TYPE_LIST))
-        {
-          // Set target list
-          testAssertion.setAdditionalEntryTypeList(entryTypeList);
-          entryTypeList = null;
-        }
-
-        // <messageInput>
-        else if (localName.equals(WSIConstants.ELEM_MESSAGE_INPUT))
-        {
-          // Set test assertion id in prereq list
-          entryTypeList.setLogInput(logInput.toString());
-          logInput = null;
-        }
-
-        // <wsdlInput>
-        else if (localName.equals(WSIConstants.ELEM_WSDL_INPUT))
-        {
-          // Set test assertion id in prereq list
-          entryTypeList.setWSDLInput(wsdlInput.toString());
-          wsdlInput = null;
-        }
-
-        // <profileAssertions>
-        else if (localName.equals(WSIConstants.ELEM_PROFILE_ASSERTIONS))
-        {
-          // a no-op
-        }
-
-        /* REMOVE:
-        // <uddiInput>
-        else if (localName.equals(WSIConstants.ELEM_UDDI_INPUT)) {
-          // Set test assertion id in prereq list
-           entryTypeList.setUDDIInput(uddiInput.toString());         
-          uddiInput = null;
-        }
-        */
-      }
-    } // END endElement
-
-    public void characters(char[] ch, int start, int length)
-    {
-      // <context>
-      if ((context != null)
-        && (currentElement.equals(WSIConstants.ELEM_CONTEXT)))
-      {
-        context.append(ch, start, length);
-      }
-
-      // <assertionDescription>
-      else if (
-        (assertionDescription != null)
-          && (currentElement.equals(WSIConstants.ELEM_ASSERTION_DESCRIPTION)))
-      {
-        assertionDescription.append(ch, start, length);
-      }
-
-      // <failureMessage>
-      else if (
-        (failureMessage != null)
-          && (currentElement.equals(WSIConstants.ELEM_FAILURE_MESSAGE)))
-      {
-        failureMessage.append(ch, start, length);
-      }
-
-      // <failureDetailDescription>
-      else if (
-        (failureDetailDescription != null) && (
-          currentElement.equals(WSIConstants.ELEM_FAILURE_DETAIL_DESCRIPTION)))
-      {
-        failureDetailDescription.append(ch, start, length);
-      }
-
-      // <detailDescription>
-      else if (
-        (detailDescription != null)
-          && (currentElement.equals(WSIConstants.ELEM_DETAIL_DESCRIPTION)))
-      {
-        detailDescription.append(ch, start, length);
-      }
-
-      // <testAssertionID>
-      else if (
-        (testAssertionId != null)
-          && (currentElement.equals(WSIConstants.ELEM_TEST_ASSERTION_ID)))
-      {
-        testAssertionId.append(ch, start, length);
-      }
-
-      // <messageInput>
-      else if (
-        (logInput != null)
-          && (currentElement.equals(WSIConstants.ELEM_MESSAGE_INPUT)))
-      {
-        logInput.append(ch, start, length);
-      }
-
-      // <wsdlInput>
-      else if (
-        (wsdlInput != null)
-          && (currentElement.equals(WSIConstants.ELEM_WSDL_INPUT)))
-      {
-        wsdlInput.append(ch, start, length);
-      }
-
-      /* REMOVE:
-      // <uddiInput>
-      else if ((uddiInput != null) && (currentElement.equals(WSIConstants.ELEM_UDDI_INPUT))) {
-        uddiInput.append(ch, start, length);
-      }
-      */
-    }
-  }
-
-  /**
-   * NOTE that this api assumes that base wsdl validator has already validated
-   * the wsdl document and corresponding schemas against the wsdl 1.1 specification.
-   * Note also that there are a number of duplicate checks between the base validator
-   * and the ws-i validator. Since some of these checks are cpu intensive, we disable 
-   * those assertions here. 
-   *
-   * Returns true if the assertion has already been checked by the base validator. 
-   * @param testAssertion
-   * @return true if the assertion has already been checked by the base validator. 
-   */
-  protected boolean alreadyChecked(String id)
-  {
-	 boolean result = false;
-	 if (id != null)
-	 {
-       result = (id.equals("BP2110") ||
-    		   	 id.equals("BP2115") ||
-		         id.equals("BP2417") ||
-		         id.equals("BP2114") ||
-		         id.equals("BP2123") ||
-		         id.equals("SSBP2209") ||
-		         id.equals("AP2209"));
-	 }
-	 return result;
-}
-
-
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/impl/TestAssertionImpl.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/impl/TestAssertionImpl.java
deleted file mode 100644
index 769757a12..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/impl/TestAssertionImpl.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.impl;
-
-import java.util.Vector;
-
-import org.eclipse.wst.wsi.internal.core.profile.EntryTypeList;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-
-/**
- * This class ...
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public class TestAssertionImpl implements TestAssertion
-{
-  /**
-   * Test assertion id.
-   */
-  protected String id = null;
-
-  /**
-   * Test assertion type.
-   */
-  protected String type = null;
-
-  /**
-   * Test assertion primary entry type name.
-   */
-  protected String entryTypeName = null;
-
-  /**
-   * Test assertion enabled indicator.
-   */
-  protected boolean enabled = true;
-
-  /**
-   * Context.
-   */
-  protected String context = null;
-
-  /**
-   * Assertion description.
-   */
-  protected String assertionDescription = null;
-
-  /**
-   * Failure message.
-   */
-  protected String failureMessage = null;
-
-  /**
-   * Failure detail description.
-   */
-  protected String failureDetailDescription = null;
-
-  /**
-   * Detail description.
-   */
-  protected String detailDescription = null;
-
-  /**
-   * Addtional entry type list.
-   */
-  protected EntryTypeList entryTypeList = null;
-
-  /**
-   * Prereq ID list.
-   */
-  protected Vector prereqIdList = new Vector();
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.TestAssertion#getId()
-   */
-  public String getId()
-  {
-    return this.id;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.TestAssertion#setId(String)
-   */
-  public void setId(String id)
-  {
-    this.id = id;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.TestAssertion#getType()
-   */
-  public String getType()
-  {
-    return this.type;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.TestAssertion#setType(String)
-   */
-  public void setType(String type)
-  {
-    this.type = type;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.TestAssertion#getEntryTypeName()
-   */
-  public String getEntryTypeName()
-  {
-    return this.entryTypeName;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.TestAssertion#setEntryTypeName(String)
-   */
-  public void setEntryTypeName(String entryTypeName)
-  {
-    this.entryTypeName = entryTypeName;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.TestAssertion#isEnabled()
-   */
-  public boolean isEnabled()
-  {
-    return enabled;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.TestAssertion#setEnabled(boolean)
-   */
-  public void setEnabled(boolean enabled)
-  {
-    this.enabled = enabled;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.TestAssertion#getContext()
-   */
-  public String getContext()
-  {
-    return context;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.TestAssertion#setContext(String)
-   */
-  public void setContext(String context)
-  {
-    this.context = context;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.TestAssertion#getAssertionDescription()
-   */
-  public String getAssertionDescription()
-  {
-    return this.assertionDescription;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.TestAssertion#setAssertionDescription(String)
-   */
-  public void setAssertionDescription(String assertionDescription)
-  {
-    this.assertionDescription = assertionDescription;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.TestAssertion#getFailureMessage()
-   */
-  public String getFailureMessage()
-  {
-    return this.failureMessage;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.TestAssertion#setFailureMessage(String)
-   */
-  public void setFailureMessage(String failureMessage)
-  {
-    this.failureMessage = failureMessage;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.TestAssertion#getFailureDetailDescription()
-   */
-  public String getFailureDetailDescription()
-  {
-    return this.failureDetailDescription;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.TestAssertion#setFailureDetailDescription(String)
-   */
-  public void setFailureDetailDescription(String failureDetailDescription)
-  {
-    this.failureDetailDescription = failureDetailDescription;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.TestAssertion#getDetailDescription()
-   */
-  public String getDetailDescription()
-  {
-    return this.detailDescription;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.TestAssertion#setDetailDescription(String)
-   */
-  public void setDetailDescription(String detailDescription)
-  {
-    this.detailDescription = detailDescription;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.TestAssertion#getAdditionalEntryTypeList()
-   */
-  public EntryTypeList getAdditionalEntryTypeList()
-  {
-    return this.entryTypeList;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.TestAssertion#setAdditionalEntryTypeList(org.wsi.test.profile.EntryTypeList)
-   */
-  public void setAdditionalEntryTypeList(EntryTypeList entryTypeList)
-  {
-    this.entryTypeList = entryTypeList;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.TestAssertion#getPrereqIdList()
-   */
-  public Vector getPrereqIdList()
-  {
-    return prereqIdList;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.TestAssertion#addPrereqId(String)
-   */
-  public void addPrereqId(String prereqId)
-  {
-    this.prereqIdList.add(prereqId);
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/BaseValidator.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/BaseValidator.java
deleted file mode 100644
index 7289ed0ee..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/BaseValidator.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.w3c.dom.Document;
-
-/**
- * The base interface for the profile validator.
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public interface BaseValidator
-{
-  /**
-   * Set all test assertions for an artifact to missingInput.
-   * @throws WSIException if there is any problems while processing.
-   */
-  public void setAllMissingInput() throws WSIException;
-
-  /**
-   * Cleanup after processing all of the test assertions for an artifact.
-   * @throws WSIException if there is any problems during cleanup.
-   */
-  public void cleanup() throws WSIException;
-
-  /**
-     * Parse XML document and validate with a schema document.
-     * @param urlString XML document location.
-     * @param baseURI a base url to assist in locating the XML document.
-     * @param schema the related XML schema.
-     * @return XML document.
-     * @throws WSIException if there are any problems while parsing or 
-     *         validating the XML document.
-     */
-  public Document parseXMLDocumentURL(
-    String urlString,
-    String baseURI,
-    String schema)
-    throws WSIException;
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/EntryContext.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/EntryContext.java
deleted file mode 100644
index 08bb99adf..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/EntryContext.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AnalyzerContext;
-import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
-import org.eclipse.wst.wsi.internal.core.log.MimePart;
-import org.eclipse.wst.wsi.internal.core.report.Entry;
-import org.eclipse.wst.wsi.internal.core.util.EntryType;
-import org.eclipse.wst.wsi.internal.core.wsdl.WSDLDocument;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Document;
-
-/**
- * This class contains the target information needed by a test assertion.
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- * @author Graham Turrell (gturrell@uk.ibm.com)
- */
-public class EntryContext
-{
-  protected Entry entry = null;
-
-  protected MessageEntry request = null;
-  protected MessageEntry response = null;
-  protected MessageEntry messageEntry = null;
-
-  protected Document requestDocument = null;
-  protected Document responseDocument = null;
-  protected Document messageEntryDocument = null;
-
-  protected WSDLDocument wsdlDocument = null;
-
-  protected AnalyzerContext analyzerContext = null;
-
-  /**
-   * Create entry context.
-   * @param entry    a message entry.
-   * @param request  the request.
-   * @param response the response.
-   */
-  public EntryContext(Entry entry, MessageEntry request, MessageEntry response)
-  {
-    this(entry, request, response, null);
-  }
-
-  /**
-   * Create entry context.
-   * @param entry           a message entry.
-   * @param request         the request.
-   * @param response        the response.
-   * @param analyzerContext the analyzerContext.
-   */
-  public EntryContext(
-    Entry entry,
-    MessageEntry request,
-    MessageEntry response,
-    AnalyzerContext analyzerContext)
-  {
-    this.entry = entry;
-    this.request = request;
-    this.response = response;
-    this.analyzerContext = analyzerContext;
-
-    try
-    {
-      // Parse all documents
-      if(request.isMimeContent()) 
-      {
-      	MimePart part = request.getMimeParts().getRootPart();
-        if ((part != null) && (part.getContent().length() > 0))
-          requestDocument = XMLUtils.parseXML(part.getContent());
-      }
-      else 
-      {
-        if (request.getMessage().length() > 0)
-          requestDocument = XMLUtils.parseXML(request.getMessage());
-      }
-
-      if(response.isMimeContent()) 
-      {
-      	MimePart part = response.getMimeParts().getRootPart();
-      	if ((part != null) && (part.getContent().length() > 0))
-          responseDocument = XMLUtils.parseXML(part.getContent());
-      }
-      else 
-      {
-        if (response.getMessage().length() > 0)
-          responseDocument = XMLUtils.parseXML(response.getMessage());
-      }
-    }
-
-    catch (WSIException we)
-    {
-    }
-
-    // need some exception handling in here and more careful checking
-    if (entry.getEntryType().equals(EntryType.ENTRY_TYPE_REQUEST))
-    {
-      this.messageEntry = request;
-      this.messageEntryDocument = requestDocument;
-    }
-    else
-    {
-      this.messageEntry = response;
-      this.messageEntryDocument = responseDocument;
-    }
-  }
-
-  /**
-   * Create entry context.
-   * @param entry a message entry.
-   * @param wsdlDocument a WSDL document.
-   */
-  public EntryContext(Entry entry, WSDLDocument wsdlDocument)
-  {
-    this.entry = entry;
-    this.wsdlDocument = wsdlDocument;
-  }
-
-  /**
-   * Create entry context.
-   * @param entry a message entry.
-   * @param analyzerContext the analyzerContext.
-   */
-  public EntryContext(Entry entry, AnalyzerContext analyzerContext)
-  {
-    this.entry = entry;
-    this.analyzerContext = analyzerContext;
-  }
-
-  /**
-   * Returns the entry. 
-   * @return the entry. 
-   */
-  public Entry getEntry()
-  {
-    return this.entry;
-  }
-
-  /**
-   * Returns the request.
-   * @return the request.
-   */
-  public MessageEntry getRequest()
-  {
-    return request;
-  }
-
-  /**
-   * Returns the response.
-   * @return the response.
-   */
-  public MessageEntry getResponse()
-  {
-    return response;
-  }
-
-  /**
-   * Returns the log entry which is not null.
-   * @return the log entry.
-   */
-  public MessageEntry getMessageEntry()
-  {
-    return messageEntry;
-  }
-
-  /**
-   * Returns the request.
-   * @return MessageEntry
-   */
-  public Document getRequestDocument()
-  {
-    return requestDocument;
-  }
-
-  /**
-   * Returns the response.
-   * @return the response.
-   */
-  public Document getResponseDocument()
-  {
-    return responseDocument;
-  }
-
-  /**
-   * Returns the log entry which is not null.
-   * @return the log entry.
-   */
-  public Document getMessageEntryDocument()
-  {
-    return messageEntryDocument;
-  }
-
-  /**
-   * Returns the WSDL document.
-   * @return the WSDL document.
-   */
-  public WSDLDocument getWSDLDocument()
-  {
-    return wsdlDocument;
-  }
-
-  /**
-   * Returns analyzerContext.
-   * @return analyzerContext
-   */
-  public AnalyzerContext getAnalyzerContext()
-  {
-    return this.analyzerContext;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/EnvelopeValidator.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/EnvelopeValidator.java
deleted file mode 100644
index 4b1f3c984..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/MessageValidator.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/MessageValidator.java
deleted file mode 100644
index 13618a343..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/ProfileValidatorFactory.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/ProfileValidatorFactory.java
deleted file mode 100644
index 3a19394b7..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/UDDIValidator.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/UDDIValidator.java
deleted file mode 100644
index af1836390..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/WSDLValidator.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/WSDLValidator.java
deleted file mode 100644
index e42bd2c13..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/AssertionProcess.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/AssertionProcess.java
deleted file mode 100644
index 23a3d2c3a..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/AssertionProcessVisitor.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/AssertionProcessVisitor.java
deleted file mode 100644
index 4ccceed0b..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/AssertionProcessVisitor.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingFault;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.BindingOutput;
-import javax.wsdl.Definition;
-import javax.wsdl.Fault;
-import javax.wsdl.Import;
-import javax.wsdl.Input;
-import javax.wsdl.Message;
-import javax.wsdl.Operation;
-import javax.wsdl.Output;
-import javax.wsdl.Part;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.Types;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPBinding;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.wsdl.extensions.soap.SOAPFault;
-import javax.wsdl.extensions.soap.SOAPHeader;
-import javax.wsdl.extensions.soap.SOAPHeaderFault;
-import javax.wsdl.extensions.soap.SOAPOperation;
-
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversalContext;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLVisitor;
-import org.w3c.dom.Element;
-
-
-/**
- * Process assertion using WSDLVisitor interface.
- */
-public abstract class AssertionProcessVisitor
-  extends AssertionProcess
-  implements WSDLVisitor
-{
-  /**
-   * @param BaseValidatorImpl
-   */
-  public AssertionProcessVisitor(BaseValidatorImpl impl)
-  {
-    super(impl);
-  }
-  
-  public void visit(Part obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  public void visit(Service obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  public void visit(Types obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  public void visit(Operation obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  public void visit(Input obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  public void visit(Output obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  public void visit(Fault obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  public void visit(Binding obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  public void visit(
-    BindingOperation obj,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-  }
-  public void visit(
-    BindingInput obj,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-  }
-  public void visit(
-    BindingOutput obj,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-  }
-  public void visit(
-    BindingFault obj,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-  }
-  public void visit(Import obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  public void visit(Element obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  public void visit(Message obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  public void visit(Port obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  public void visit(PortType obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  public void visit(Definition obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  public void visit(
-    ExtensibilityElement obj,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-  }
-  public void visit(SOAPBinding obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  public void visit(SOAPBody obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  public void visit(SOAPHeader obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  public void visit(
-    SOAPHeaderFault obj,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-  }
-  public void visit(SOAPFault obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  public void visit(
-    SOAPOperation obj,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/BaseMessageValidator.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/BaseMessageValidator.java
deleted file mode 100644
index 7672745aa..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/BaseMessageValidator.java
+++ /dev/null
@@ -1,1837 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2003 IBM Corporation, Parasoft and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM      - Initial API and implementation
- *   Parasoft - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.StringTokenizer;
-import java.util.Vector;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.Definition;
-import javax.wsdl.Message;
-import javax.wsdl.Part;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.mime.MIMEMultipartRelated;
-import javax.wsdl.extensions.mime.MIMEPart;
-import javax.wsdl.extensions.soap.SOAPBinding;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.wsdl.extensions.soap.SOAPHeader;
-import javax.wsdl.extensions.soap.SOAPOperation;
-import javax.xml.namespace.QName;
-
-import org.apache.xerces.util.URI;
-import org.apache.xerces.xs.XSConstants;
-import org.apache.xerces.xs.XSModel;
-import org.apache.xerces.xs.XSTypeDefinition;
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.analyzer.AnalyzerContext;
-import org.eclipse.wst.wsi.internal.core.analyzer.CandidateInfo;
-import org.eclipse.wst.wsi.internal.core.analyzer.ServiceReference;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.AnalyzerConfig;
-import org.eclipse.wst.wsi.internal.core.log.Log;
-import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
-import org.eclipse.wst.wsi.internal.core.profile.ProfileArtifact;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl.WSDLValidatorImpl;
-import org.eclipse.wst.wsi.internal.core.report.FailureDetail;
-import org.eclipse.wst.wsi.internal.core.report.ReportArtifact;
-import org.eclipse.wst.wsi.internal.core.report.Reporter;
-import org.eclipse.wst.wsi.internal.core.util.EntryType;
-import org.eclipse.wst.wsi.internal.core.util.HTTPUtils;
-import org.eclipse.wst.wsi.internal.core.wsdl.WSDLDocument;
-import org.eclipse.wst.wsi.internal.core.wsdl.WSDLUtils;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-import com.ibm.wsdl.Constants;
-import com.ibm.wsdl.util.xml.DOM2Writer;
-import com.ibm.wsdl.util.xml.DOMUtils;
-
-/**
- * The WSDL validator will verify that the WSDL and associated XML schema definitions
- * are in conformance with the profile.
- *
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- * @author Jim Clune
- * @author Graham Turrell (gturrell@uk.ibm.com)
- * @author Neil Delima (nddelima@ca.ibm.com) 
- */
-public abstract class BaseMessageValidator
-  extends BaseValidatorImpl
-{
-  /**
-  * WSDL document.
-  */
-  private WSDLDocument wsdlDocument;
-
-  /**
-   * Log entry.
-   */
-  protected MessageEntry logEntry;
-  protected Log log;
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.validator.MessageValidator#init(org.eclipse.wst.wsi.internal.core.analyzer.AnalyzerContext, org.wsi.test.profile.ProfileArtifact, org.wsi.test.report.ReportArtifact, org.wsi.wsdl.WSDLDocument, org.wsi.test.report.Reporter)
-   */
-  public void init(
-    AnalyzerContext analyzerContext,
-    ProfileArtifact profileArtifact,
-    ReportArtifact reportArtifact,
-    WSDLDocument wsdlDocument,
-    Reporter reporter)
-    throws WSIException
-  {
-    // BaseValidatorImpl
-    super.init(analyzerContext, profileArtifact, reportArtifact, reporter);
-
-    // Save input references
-    this.wsdlDocument = wsdlDocument;
-  }
-
-  /**
-   * Returns wsdlDocument
-   * @return wsdlDocument
-   */
-  public WSDLDocument getWSDLDocument()
-  {
-    return wsdlDocument;
-  }
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.validator.MessageValidator#validate(org.wsi.test.profile.validator.EntryContext)
-   */
-  public void validate(EntryContext entryContext) throws WSIException
-  {
-    //Entry entry = null;
-
-    // Save log entry to be referenced by other methods
-    this.logEntry = entryContext.getMessageEntry();
-
-    // Get reference to the analyzer config object
-    AnalyzerConfig analyzerConfig =
-      reporter.getReport().getReportContext().getAnalyzer().getAnalyzerConfig();
-
-    /* If Service Description (WSDL/UDDI) NOT supplied in analyzer config OR
-     * Service Description IS supplied and the current message correlates to it...
-     */
-    if ((wsdlDocument == null)
-      || messageCorrelatesToService(
-        entryContext,
-        analyzerConfig.getCorrelationType()))
-    {
-      // now inner classes moved out from the validator
-      //String classPrefix = this.getClass().getName() + "$";
-      String classPrefix = this.getClass().getPackage().getName()+".";
-
-      // Process assertions for this artifact against the target context
-      processAssertions(classPrefix, entryContext);
-    }
-  }
-
-  /**
-   * Check whether the message correlates to the service under test.
-   * Use the request part of the request-response pair, from which the correlation of the response is implied.
-   * Entities from the Service under test are determined once for all.
-   * @param entryContext    an entry context.
-   * @param correlationType a correlation type.
-   * @return true if the message correlates to the service under test.
-   * @throws WSIException if correlation type is not appropriate.
-   */
-  private boolean messageCorrelatesToService(
-    EntryContext entryContext,
-    String correlationType)
-    throws WSIException
-  {
-
-    URI[] endpoints = null;
-    boolean correlation = false;
-
-    /* TEMP: Get it from analyzer config passed in on init method
-    CandidateInfo candidate = entryContext
-                              .getAnalyzerContext()
-                              .getCandidateInfo();
-    */
-    CandidateInfo candidate = analyzerContext.getCandidateInfo();
-
-    // Service reference 
-    ServiceReference serviceReference = analyzerContext.getServiceReference();
-
-    // Get the definition element
-    Definition definition = candidate.getWsdlDocument().getDefinitions();
-
-    Binding binding = null;
-    if (serviceReference.getWSDLElement().isPort())
-    {
-      // Get service
-      Service service =
-        definition.getService(
-          serviceReference.getWSDLElement().getParentElementQName());
-
-      // Get port
-      Port port = service.getPort(serviceReference.getWSDLElement().getName());
-
-      // Get binding
-      binding = port.getBinding();
-    }
-    else if (serviceReference.getWSDLElement().isBinding())
-    {
-      // Get binding
-      binding =
-        definition.getBinding(serviceReference.getWSDLElement().getQName());
-    }
-
-    if (binding == null)
-    {
-      return false;
-    }
-
-    if ((endpoints = hostAndPortCorrelation(entryContext)) != null
-      && urlPathCorrelation(entryContext, endpoints))
-    {
-
-      /* If correlation type is "endpoint", this is all the correlation that can be done.
-       * (Note - this is incomplete correlation since >1 service could be associated with the endpoint.
-       *  Therefore , if messages for different services on the same endpoint appear in the log file
-       *  and correlation type is "endpoint", all those messages will be analyzed).
-       */
-      if (correlationType
-        .equals(WSIConstants.ATTRVAL_CORRELATION_TYPE_ENDPOINT))
-      {
-        correlation = true;
-      }
-      else
-      {
-        // always allow GET requests right through if they've passed Endpoint Correlation
-        String requestType = getHttpRequestType(entryContext);
-        if ((requestType != null) && requestType.equalsIgnoreCase("GET"))
-        {
-          correlation = true;
-        }
-        else
-        {
-          // The correlationType is not "endpoint" so continue on to processing for at least 
-          // "namespace" correlation...
-
-          // get the operation signature (input & output) from request & response messages...	   
-          // and do a quick DOM parse 
-          Document requestMessage = entryContext.getRequestDocument();
-
-          // Check if namespace is found in request message only
-          if (namespaceCorrelation(binding, requestMessage))
-          {
-            // If namespace found and the correlation type is namespace, then process messages
-            if (correlationType
-              .equals(WSIConstants.ATTRVAL_CORRELATION_TYPE_NAMESPACE))
-            {
-              correlation = true;
-            }
-
-            // If operation is found and correlation type is operation, then process messages
-            else if (
-              (operationCorrelation(binding, requestMessage))
-                && (correlationType
-                  .equals(WSIConstants.ATTRVAL_CORRELATION_TYPE_OPERATION)))
-            {
-              correlation = true;
-            }
-            else
-            {
-              // this should never happen if config schema was followed correctly
-              throw new WSIException(
-                "Bad correlation type found in config: " + correlationType);
-            }
-          }
-        }
-      }
-    }
-
-    return correlation;
-  }
-
-  /** 
-   *  Correlation Check 1: Service Description endpoint vs HTTP Header (test 1)
-   *  Check if receiverHostAndPort from request message log matches host & port from WSDL SOAP binding for
-   *  the Service under test.
-   *  If it does not, stop processing this message pair.
-   * @param entryContext an entry context.
-   * @return if receiverHostAndPort from request message log matches 
-   *         host & port from WSDL SOAP binding for the Service.
-   * @throws WSIException if problem occurs during correlation check.
-   */
-  private URI[] hostAndPortCorrelation(EntryContext entryContext)
-    throws WSIException
-  {
-
-    // get <receiverHostAndPort> from request message
-    String httpHostAndPort = entryContext.getRequest().getReceiverHostAndPort();
-    // Search endpoint list for a match with <receiverHostAndPort>
-
-    /* TEMP: Get it from analyzer config passed in on init method
-    return entryContext.getAnalyzerContext()
-                       .getCandidateInfo()
-                       .getEndPoints(httpHostAndPort);
-    */
-    return analyzerContext.getCandidateInfo().getEndPoints(httpHostAndPort);
-  }
-
-  /** 
-   * Correlation Check 2: Service Description endpoint vs HTTP Header (test 2)
-   * 
-   * Use analyzer config host & port, plus URL path (from request message header HTTP POST)
-   * to look for the corresponding endpoint in the Service Definition.
-   * If it does not, stop processing this message pair.
-   * @param entryContext an entry context.
-   * @param endpoints an array of endpoints.
-   * @return true if corresponding endpoints are found in the Service Definition.
-   * @throws WSIException if problem occurs during correlation check.
-   */
-  private boolean urlPathCorrelation(
-    EntryContext entryContext,
-    URI[] endpoints)
-    throws WSIException
-  {
-
-    // compares: protocol (must be http for POST), host, port and path.
-
-    // get POST URI path from message using Tokenizer	
-    Vector requestLine =
-      getHttpRequest(entryContext.getRequest().getHTTPHeaders());
-    if (requestLine == null)
-    {
-      return false; // an unexpected HTTP request type !
-    }
-
-    String requestPath = (String) requestLine.get(1);
-    // Path immediately follows POST
-
-    // compare path with those in the previous generated URI list	
-    Vector filteredEndpoints = new Vector();
-    for (int i = 0; i < endpoints.length; i++)
-    {
-      if (endpoints[i].toString().endsWith(requestPath))
-      {
-        filteredEndpoints.add(endpoints[i]);
-      }
-    }
-
-    if (filteredEndpoints.size() == 0)
-      return false;
-
-    // this URI should be unique in the WSDL - there should be at most one match
-    // but if we have at least one, that's sufficient to accept the message
-
-    return true;
-  }
-
-  /** 
-   * Correlation Check 3: Service Description namespace.
-   * 
-   * Determine if the Service Description declares the namespace that appears in the (request?) message soap body.
-   * Location of relevent namespace :
-   * Operation type                    	- Message Namespace: (compare with)  Service Definition Namespace:
-   * (from message? endpoint? where?)
-   * rpc-literal                           &lt;soap:Body&gt; child namespace.        &lt;soapbind:body&gt; namespace.
-   * doc-literal			                 &lt;soap:Body&gt; child namespace.       targetNameSpace of schema that
-   *                                                                          defines  &lt;soap:body&gt; child.
-   * If it doesn't match, stop processing this message pair.
-   * @param binding a binding.
-   * @param request a request.
-   * @return true if description declared in the description are the 
-   *         same as those that appear in the message soap body.
-   * @throws WSIException if problem occurs during correlationcheck.                                                                       
-   */
-  private boolean namespaceCorrelation(Binding binding, Document request)
-    throws WSIException
-  {
-    boolean namespaceFound = false;
-    String bindingStyle = WSIConstants.ATTRVAL_SOAP_BIND_STYLE_DOC;
-
-    // Get operation namespace from the request soap message
-    String soapOpNS = getSoapBodyChild(request).getNamespaceURI();
-
-    // Get soapbind:binding
-    SOAPBinding soapBinding = null;
-    if ((soapBinding = WSDLUtils.getSoapBinding(binding)) != null)
-    {
-      bindingStyle = soapBinding.getStyle();
-    }
-
-    // Go through each operation in the binding and check for namespace match
-    Iterator operations = binding.getBindingOperations().iterator();
-    while (operations.hasNext() && !(namespaceFound))
-    {
-      BindingOperation bindingOperation = (BindingOperation) operations.next();
-
-      // If rpc-literal, then look at namespace attribute on soapbind:body
-      if (WSDLUtils.isRpcLiteral(bindingStyle, bindingOperation))
-      {
-        // Get soapbind:body element 
-        SOAPBody soapBody = WSDLUtils.getInputSoapBody(bindingOperation);
-
-        if ((soapBody.getNamespaceURI() != null)
-          && (soapBody.getNamespaceURI().equals(soapOpNS)))
-        {
-          namespaceFound = true;
-        }
-      }
-
-      // If doc-literal, then check namespace
-      else if (WSDLUtils.isDocLiteral(bindingStyle, bindingOperation))
-      {
-        int partCount;
-        Iterator partsIterator = null;
-
-        // Get first part name from soapbind:body element parts attribute
-        String partName = getFirstPartName(bindingOperation);
-
-        // Get the list of parts from the message           
-        Map partsMap = null;
-        if ((partsMap =
-          bindingOperation.getOperation().getInput().getMessage().getParts())
-          != null)
-        {
-          partsIterator = partsMap.values().iterator();
-
-          // If the part name wasn't specified on the soapbind:body element, then process just the first one
-          if (partName == null)
-            partCount = 1;
-          else
-            partCount = partsMap.size();
-
-          for (int i = 0; i < partCount && !namespaceFound; i++)
-          {
-            // Get next part
-            Part part = (Part) partsIterator.next();
-
-            // If part name matches or there is no part name, then check namespace
-            if ((partName == null)
-              || ((partName != null) && (part.getName().equals(partName))))
-            {
-              if ((part.getElementName().getNamespaceURI() != null)
-                && (part.getElementName().getNamespaceURI().equals(soapOpNS)))
-              {
-                namespaceFound = true;
-              }
-            }
-          }
-        }
-      }
-    }
-
-    return namespaceFound;
-  }
-
-  /** 
-  * Correlation Check 4 : Service Description "operation"
-  *
-  * Check if the message content matches any of the candidate operation definitions 
-  * for request and response in the Service Description.
-  *  
-  * For both request and response, look for the soap body child element name
-  * in the list of candidate operation names.
-  * @param binding        a binding.
-  * @param requestMessage a request message.
-  * @return true if the message content matches any of the candidate 
-  *         operation definitions for request and response in the 
-  *         Service Description.
-  * @throws WSIException if problem occurs during correlationcheck.
-  */
-  private boolean operationCorrelation(
-    Binding binding,
-    Document requestMessage)
-    throws WSIException
-  {
-    boolean operationFound = false;
-
-    String bindingStyle = WSIConstants.ATTRVAL_SOAP_BIND_STYLE_DOC;
-
-    // Get soapbind:binding
-    SOAPBinding soapBinding = null;
-    if ((soapBinding = WSDLUtils.getSoapBinding(binding)) != null)
-    {
-      bindingStyle = soapBinding.getStyle();
-    }
-
-    // Get the first child element from the soap body
-    Element soapBodyChild = getSoapBodyChild(requestMessage);
-
-    // If there is a child element, then check it
-    if (soapBodyChild != null)
-    {
-      // Get operation name from the soap:body
-      String operationName = soapBodyChild.getLocalName();
-
-      // Get operation QName
-      QName operationQName =
-        new QName(soapBodyChild.getNamespaceURI(), operationName);
-
-      // Go through each operation in the binding and check for namespace match
-      Iterator operations = binding.getBindingOperations().iterator();
-      while (operations.hasNext() && !(operationFound))
-      {
-        BindingOperation bindingOperation =
-          (BindingOperation) operations.next();
-
-        // If rpc-literal, then look at namespace attribute on soapbind:body
-        if (WSDLUtils.isRpcLiteral(bindingStyle, bindingOperation))
-        {
-          // Get soapbind:body element 
-          if (bindingOperation.getName().equals(operationName))
-            operationFound = true;
-        }
-
-        // If doc-literal, then check namespace
-        else if (WSDLUtils.isDocLiteral(bindingStyle, bindingOperation))
-        {
-          int partCount;
-          Iterator partsIterator = null;
-
-          // Get first part name from soapbind:body element parts attribute
-          String partName = getFirstPartName(bindingOperation);
-
-          // Get the list of parts from the message           
-          Map partsMap = null;
-          if ((partsMap =
-            bindingOperation.getOperation().getInput().getMessage().getParts())
-            != null)
-          {
-            partsIterator = partsMap.values().iterator();
-
-            // If the part name wasn't specified on the soapbind:body element, then process just the first one
-            if (partName == null)
-              partCount = 1;
-            else
-              partCount = partsMap.size();
-
-            for (int i = 0; i < partCount && !operationFound; i++)
-            {
-              // Get next part
-              Part part = (Part) partsIterator.next();
-
-              // If part name matches or there is no part name, then check namespace
-              if ((partName == null)
-                || ((partName != null) && (part.getName().equals(partName))))
-              {
-                if ((part.getElementName() != null)
-                  && (part.getElementName().equals(operationQName)))
-                {
-                  operationFound = true;
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-
-    // Go through each operation to find a match
-    return operationFound;
-  }
-
-  /**
-   * Create failure detail.
-   * @param message       a message.
-   * @param entryContext  an entry context.
-   * @return failure detail.
-   */
-  public FailureDetail createFailureDetail(
-    String message,
-    EntryContext entryContext)
-  {
-    FailureDetail failureDetail = reporter.createFailureDetail();
-    failureDetail.setFailureMessage(message);
-    failureDetail.setElementLocation(
-      entryContext.getMessageEntry().getElementLocation());
-    return failureDetail;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl#isNotApplicable(org.wsi.test.profile.TestAssertion)
-   */
-  protected boolean isNotApplicable(TestAssertion testAssertion)
-  {
-    boolean notApplicable = false;
-
-    // If the additional entry is not available, then set notApplicable
-    if (testAssertion.getAdditionalEntryTypeList().getWSDLInput() != null
-      && !testAssertion.getAdditionalEntryTypeList().getWSDLInput().equals("none")
-      && analyzerContext.getServiceReference().getWSDLLocation() == null)
-    {
-      notApplicable = true;
-    }
-
-    return notApplicable;
-  }
-
-
-  /**
-   * Get POST request.
-   * @param httpHeader an HTTP 
-   * @return POST request.
-   */
-  public Vector getPostRequest(String httpHeader)
-  {
-    //Request-Line   = Method SP Request-URI SP HTTP-Version CRLF
-    Vector requestLine = new Vector();
-    String startLine = null;
-
-    StringTokenizer httpMessageTokenizer =
-      new StringTokenizer(httpHeader, "\n\r\f");
-
-    if (httpMessageTokenizer.hasMoreTokens())
-    {
-      startLine = httpMessageTokenizer.nextToken();
-    }
-
-    if (startLine.startsWith("POST"))
-    {
-      StringTokenizer startLineTokenizer =
-        new StringTokenizer(startLine, "\u0020");
-      while (startLineTokenizer.hasMoreTokens())
-      {
-        requestLine.add(startLineTokenizer.nextToken());
-      }
-    }
-    return requestLine;
-  }
-
-  /**
-   * Get HTTP request.
-   * @param httpHeader an HTTP 
-   * @return HTTP request.
-  */
-  private Vector getHttpRequest(String httpHeader)
-  {
-    //Request-Line   = Method SP Request-URI SP HTTP-Version CRLF
-    Vector requestLine = new Vector();
-    String startLine = null;
-
-    StringTokenizer httpMessageTokenizer =
-      new StringTokenizer(httpHeader, "\n\r\f");
-
-    if (httpMessageTokenizer.hasMoreTokens())
-    {
-      startLine = httpMessageTokenizer.nextToken();
-    }
-
-    if (startLine.startsWith("POST") || startLine.startsWith("GET"))
-    {
-      StringTokenizer startLineTokenizer =
-        new StringTokenizer(startLine, "\u0020");
-      while (startLineTokenizer.hasMoreTokens())
-      {
-        requestLine.add(startLineTokenizer.nextToken());
-      }
-    }
-    else
-    {
-      requestLine = null; // signify not POST or GET
-    }
-
-    return requestLine;
-  }
-
-  /**
-   * Get HTTP request type.
-   * @param entryContext an entry context.
-   * @return HTTP request type.
-   */
-  private String getHttpRequestType(EntryContext entryContext)
-  {
-    //Request-Line   = Method SP Request-URI SP HTTP-Version CRLF
-
-    String httpHeader = entryContext.getRequest().getHTTPHeaders();
-    String httpRequestType = null;
-    String startLine = null;
-
-    StringTokenizer httpMessageTokenizer =
-      new StringTokenizer(httpHeader, "\n\r\f");
-
-    if (httpMessageTokenizer.hasMoreTokens())
-    {
-      startLine = httpMessageTokenizer.nextToken();
-      StringTokenizer startLineTokenizer =
-        new StringTokenizer(startLine, "\u0020");
-      if (startLineTokenizer.hasMoreTokens())
-      {
-        httpRequestType = startLineTokenizer.nextToken();
-      }
-    }
-    return httpRequestType;
-  }
-
-  /**
-   * Determine if the message is a response for a one-way operation.
-   * @param entryContext an entry context.
-   * @return true if the message is a response for a one-way operation.
-   */
-  public boolean isOneWayResponse(EntryContext entryContext)
-  {
-    boolean oneway = false;
-
-    // TEMP: If this is a response message and there is no content, then set one-way to true
-    // TEMP: Need to find a way to determine if the response is for a one-way message
-    if (entryContext
-      .getMessageEntry()
-      .getType()
-      .equalsIgnoreCase(MessageEntry.TYPE_RESPONSE)
-      && entryContext.getMessageEntry().getMessage().length() == 0)
-    {
-      oneway = true;
-    }
-
-    return oneway;
-  }
-
-  /**
-   * messageIsDocLitSchemaValid.
-   *
-   * Validates the doc-lit messages against the schema found in a candidate wsdl document.
-   *
-   * Identify (or be given) a reference in the wsdl to elements (found in &lt;wsdl:types&gt;&lt;schema&gt;...)
-   * that are immediate children elements in the soap body.
-   * @param entryContext an entry context.
-   * @return true if the document literal message is compliant to the 
-   *         schema found in a candidate WSDL document.
-   * @throws WSIException if there is a parsing problem during validation.
-   */
-  public boolean messageIsDocLitSchemaValid(EntryContext entryContext)
-    throws WSIException
-  {
-
-    // This method should use a validating parser that is capable of acceppting multiple schema references
-    // programmatically. Then, every schema in candidate wsdl can be passed in to the validator. This avoids the
-    // need to pinpoint a particular schema element from all candidate wsdl:types, corresponding to the 
-    // wsdl:operation being used. The pinpointing is an incomplete workaround for parsers not capable 
-    // of accepting arrays of scehma references 
-    // [ i.e. the DOM factory.setAttribute(JAXP_SCHEMA SOURCE, Object[] {...}) ]
-    // get all xs:schema from all candidate wsdl:types                    
-    // add each <schema> to an array and pass this array to the validating parser
-    // when validating the/each soap body child.
-
-    // use the referenced WSDL file and its imported files to find schemas
-    List schemaWSDLs = new ArrayList();
-    List inlineSchemas = new ArrayList();
-    List schemaStrings = new ArrayList();
-
-    Definition[] allDefs =
-      analyzerContext.getCandidateInfo().getDefinitions();
-    for (int thisDef = 0; thisDef < allDefs.length; thisDef++)
-    {
-      schemaWSDLs.add(allDefs[thisDef].getDocumentBaseURI());
-    }
-    Iterator fileIterator = schemaWSDLs.iterator();
-    while (fileIterator.hasNext())
-    {
-      // parse file if possible
-      Document wsdlDoc = null;
-      String wsdlURI = (String) fileIterator.next();
-      try
-      {
-        wsdlDoc = XMLUtils.parseXMLDocumentURL(wsdlURI, null);
-      }
-      catch (Exception e)
-      {
-        continue;
-      }
-      Element root = wsdlDoc.getDocumentElement();
-      // find the schema
-      NodeList schemaElements = root.getElementsByTagNameNS(
-        WSITag.ELEM_XSD_SCHEMA.getNamespaceURI(),
-        WSITag.ELEM_XSD_SCHEMA.getLocalPart());
-
-      for (int elem = 0; elem < schemaElements.getLength(); elem++)
-      {     
-        Element schema = (Element) schemaElements.item(elem);
-        // copying all the NS declarations from wsdl:definitions wsdl:types
-        copyNSDeclarations(root, schema);
-        copyNSDeclarations((Element) schema.getParentNode(), schema);
-        // Replacing all relative schemaLocation URIs with absolute ones
-        replaceRelativeURIs(schema, wsdlURI);
-        inlineSchemas.add(schema);
-      }
-    }
-
-    // Note that the Xerces parser ONLY accepts an array
-    // of schemas with unique namespaces.
-    if (!duplicateNamespacesDetected(inlineSchemas))
-    {
-      // Serialize the schema elements inside the Types, then use this as
-      // the schema string for the validation
-      Iterator i = inlineSchemas.iterator();
-      while (i.hasNext())
-      {
-    	Element schema = (Element)i.next(); 
-        String schemaString = DOM2Writer.nodeToString(schema);
-        schemaStrings.add(schemaString);
-      }
-
-      NodeList elementList = entryContext.getMessageEntryDocument()
-        .getElementsByTagNameNS(WSITag.ELEM_SOAP_BODY.getNamespaceURI(),
-            WSITag.ELEM_SOAP_BODY.getLocalPart());
-      if (elementList == null || elementList.getLength() != 1)
-      {
-        // should only be a single soap body !
-        return false; // probably an error condition though
-      }
-
-      NodeList soapBodyChildList = ((Element)elementList.item(0)).getChildNodes();
-      for (int child = 0; child < soapBodyChildList.getLength(); child++)
-      {
-        Node soapBodyChild = soapBodyChildList.item(child);
-        if (soapBodyChild.getNodeType() == Node.ELEMENT_NODE)
-        {
-          // do all for now
-          try
-          {
-            // Write out element tree to String
-            String messageContent = DOM2Writer.nodeToString(soapBodyChild);
-            // parse the child element, validating against the schema 
-            XMLUtils.parseXML(messageContent, schemaStrings);
-          }
-          catch (WSIException e)
-          {
-            if (e.getTargetException() instanceof SAXException)
-            {
-              // validation failed
-              throw new WSIException(e.getTargetException().getMessage());
-            }
-            throw e;
-          }
-          catch (Exception e)
-          {
-            throw new WSIException("Validating Parsing problem", e);
-            // Bad things have happened
-          }
-        }
-      }   
-    }
-    return true;
-  }
-
-  /**
-   * Copy the namespace declarations.
-   * @param parent a message.
-   * @param child a stripped message.
-   */
-  private void copyNSDeclarations(Element parent, Element child)
-  {
-    NamedNodeMap nodeMap = parent.getAttributes();
-    for (int nodeId = 0; nodeId < nodeMap.getLength(); nodeId++)
-    {
-      Node node = nodeMap.item(nodeId);
-
-      if ((node.getNodeType() == Node.ATTRIBUTE_NODE)
-        && (node.getNodeName().startsWith("xmlns:")))
-      {
-        String nodeName = node.getNodeName();
-        // If an NS being copied is not the same as the child element has, copy it
-        if (!child.getNodeName().startsWith(
-          nodeName.substring(nodeName.indexOf(":") + 1) + ":"))
-        {
-          child.setAttribute(nodeName, node.getNodeValue());
-        }
-      }
-    }
-  }
-
-  /**
-   * Replaces all relative URIs for schemaLocation attributes.
-   * @param schema an xsd:schema element.
-   * @param wsdlURI an URI of WSDL that contains xsd:schema being processed.
-   */
-  private void replaceRelativeURIs(Element schema, String wsdlURI)
-  {
-    // Retrieving all xsd:import elements
-    NodeList imports = schema.getElementsByTagNameNS(
-      WSITag.ELEM_XSD_IMPORT.getNamespaceURI(),
-      WSITag.ELEM_XSD_IMPORT.getLocalPart());
-    // Going through the elements
-    for (int i = 0; i < imports.getLength(); i++)
-    {
-      Element imp = (Element) imports.item(i);
-      // Getting the schemaLocation attribute
-      Attr schemaLocation =
-        XMLUtils.getAttribute(imp, WSITag.ATTR_XSD_SCHEMALOCATION);
-      // If the attribute is present
-      if (schemaLocation != null)
-      {
-        // Trying to create an URI object using attribute's value
-        URI uri = null;
-        try
-        {
-          uri = new URI(schemaLocation.getValue());
-        }
-        catch (Exception e) {}
-        // If the value is not an absolute URI (the URI constructor throws the
-        // MalformedURIException), creating the absolute URI using wsdlURI
-        if (uri == null)
-        {
-          String newURI = wsdlURI.substring(0, wsdlURI.lastIndexOf("/") + 1)
-            + schemaLocation.getValue();
-          try
-          {
-            uri = new URI(newURI);
-            // Setting a new URI as a value for the schemaLocation attribute
-            schemaLocation.setValue(uri.toString());
-          }
-          catch (Exception e) {}
-        }
-      }
-    }
-  }
-
-  /**
-   * Returns binding operation matched for SOAP message.
-   * @param entryType message entry type.
-   * @param doc a message.
-   * @return any binding operation matched, null if it is not found.
-   */
-  public BindingOperation getOperationMatch(EntryType entryType, Document doc) 
-  {
-    BindingOperation bindingOperation = null;
-    try
-    {
-      // Getting the name of the first SOAP Body child element
-      QName operation = getOperationFromMessage(doc);
-      if (operation != null)
-      {
-        // Retrieving all the RPC binding operations from wsdl:binding
-        BindingOperation[] rpcBindingOps = getMatchingBindingOps(
-          WSIConstants.ATTRVAL_SOAP_BIND_STYLE_RPC,
-          analyzerContext.getCandidateInfo().getBindings());
-        // Retrieving binding operation by the given operation name
-        bindingOperation = getOperationMatch(
-          entryType, operation, rpcBindingOps);
-        // If no one RPC operation matched
-        if(bindingOperation == null)
-        {
-          // Retrieving all the document binding operations from wsdl:binding
-          BindingOperation[] docBindingOperations = getMatchingBindingOps(
-            WSIConstants.ATTRVAL_SOAP_BIND_STYLE_DOC,
-            analyzerContext.getCandidateInfo().getBindings());
-          // Retrieving binding operation by given element name
-          BindingOperation[] potentialDocLitOps =
-            getDocLitOperations(entryType, operation, docBindingOperations);
-          // If there is exactly one operation matched
-          if (potentialDocLitOps.length == 1)
-            bindingOperation = potentialDocLitOps[0];
-        }
-      }
-    }
-    catch (Exception e) {}
-
-    return bindingOperation;
-  }
-
-  /**
-   * Match either Input or Output.
-   * @param messageEntryType message entry type.
-   * @param soapMessage soap message.
-   * @param op binding operations.
-   * @return matched operation.
-   */
-  public BindingOperation getOperationMatch(
-    EntryType messageEntryType,
-    Document soapMessage,
-    BindingOperation[] op)
-  {
-    // Get operation from message
-    QName operation = getOperationFromMessage(soapMessage);
-    // list of QNames
-
-    return getOperationMatch(messageEntryType, operation, op);
-  }
-
-  /**
-   * Match either Input or Output.
-   * @param messageEntryType message entry type.
-   * @param operation SOAP operation name.
-   * @param op binding operations.
-   * @return matched operation.
-   */
-  public BindingOperation getOperationMatch(
-    EntryType messageEntryType,
-    QName operation,
-    BindingOperation[] op)
-  {
-    QName checkOperation;
-
-    // Look for a candidate operation in the wsdl that matches this signature.
-    for (int k = 0; k < op.length; k++)
-    {
-      String name = null;
-      List extensibles = null;
-      BindingOperation bindingOp = op[k];
-
-      if (messageEntryType.isType(EntryType.TYPE_MESSAGE_REQUEST)
-        && (bindingOp.getOperation().getInput() != null))
-      {
-        name = bindingOp.getOperation().getName();
-        extensibles = bindingOp.getBindingInput().getExtensibilityElements();
-      }
-      else if (
-        messageEntryType.isType(EntryType.TYPE_MESSAGE_RESPONSE)
-          && (bindingOp.getOperation().getOutput() != null))
-      {
-        name = bindingOp.getOperation().getName() + "Response";
-        extensibles = bindingOp.getBindingOutput().getExtensibilityElements();
-      }
-
-      // Get soap:body
-      SOAPBody soapBody = getSoapBody(extensibles);
-      if (soapBody == null)
-        checkOperation = new QName(name);
-      else
-        checkOperation = new QName(soapBody.getNamespaceURI(), name);
-
-      if (operation != null && operation.equals(checkOperation))
-      {
-        return (bindingOp);
-      }
-    }
-    return null;
-  }
-
-  /**
-   * Match either Input or Output.
-   * @param messageEntryType a message entry type.
-   * @param soapMessage a soap message.
-   * @param op binsing operations.
-   * @return matched operation.
-   */
-  public BindingOperation getOperationPartsMatch(
-    EntryType messageEntryType,
-    Document soapMessage,
-    BindingOperation[] op)
-  {
-    Map parts = getPartListFromMessage(soapMessage); // list of QNames
-
-    // Look for a candidate operation in the wsdl that matches this signature.
-    for (int k = 0; k < op.length; k++)
-    {
-
-      Message wsdlMessage = null;
-      List extensibles = null;
-      BindingOperation bindingOp = op[k];
-
-      if (messageEntryType.isType(EntryType.TYPE_MESSAGE_REQUEST)
-        && (bindingOp.getOperation().getInput() != null))
-      {
-        wsdlMessage = bindingOp.getOperation().getInput().getMessage();
-        extensibles = bindingOp.getBindingInput().getExtensibilityElements();
-      }
-      else if (
-        messageEntryType.isType(EntryType.TYPE_MESSAGE_RESPONSE)
-          && (bindingOp.getOperation().getOutput() != null))
-      {
-        wsdlMessage = bindingOp.getOperation().getOutput().getMessage();
-        extensibles = bindingOp.getBindingOutput().getExtensibilityElements();
-      }
-      //wsdlFaultParts = op[k].getFaults();
-      // ADD: check for case when response message is a fault
-
-      if (sameParts(parts, wsdlMessage, getSoapHeader(extensibles)))
-      {
-        return (bindingOp);
-      }
-    }
-    return null;
-  }
-
-  /** 
-   * BindingOperation getOperationPartsMatch(..).
-   * 
-   * Find one or more matching binding operations from the WSDL corresponding to the
-   * given request-response signature.
-   * 
-   * This overloaded version is intended for possible Correlation only (not assertions),
-   * since it checks for an operation signature on a request-response pair.
-   * Assertions now check request & response messages independently. 
-   * @param requestMessage a request message.
-   * @param responseMessage a response message.
-   * @param op binding operations.
-   * @return matched operation.
-   */
-  //private BindingOperation getOperationPartsMatch(
-  //  Document requestMessage,
-  //  Document responseMessage,
-  //  BindingOperation[] op)
-  //{
-  //  Map inParts = getPartListFromMessage(requestMessage); // list of QNames
-  //  Map outParts = getPartListFromMessage(responseMessage);
-  //  // list of QNames
-  //
-  //  // Look for a candidate operation in the wsdl that matches this signature.
-  //  for (int k = 0; k < op.length; k++)
-  //  {
-  //
-  //    //Map wsdlFaultParts = null;
-  //    Message wsdlInMessage = null;
-  //    Message wsdlOutMessage = null;
-  //
-  //    BindingOperation bindingOp = op[k];
-  //    if (bindingOp.getOperation().getInput() != null)
-  //    {
-  //      wsdlInMessage = bindingOp.getOperation().getInput().getMessage();
-  //    }
-  //
-  //    if (bindingOp.getOperation().getOutput() != null)
-  //    {
-  //      wsdlOutMessage = bindingOp.getOperation().getOutput().getMessage();
-  //    }
-  //    //wsdlFaultParts = op[k].getFaults();
-  //    // ADD: check for case when response message is a fault
-  //
-  //    if (sameParts(inParts,
-  //      wsdlInMessage,
-  //      getSoapHeader(bindingOp.getBindingInput().getExtensibilityElements())))
-  //    {
-  //      // match on the request - now check response if its not a fault
-  //      if (responseMessage != null && isFault(responseMessage))
-  //      {
-  //        return (bindingOp);
-  //      }
-  //      else if (
-  //        sameParts(
-  //          outParts,
-  //          wsdlOutMessage,
-  //          getSoapHeader(
-  //            bindingOp.getBindingOutput().getExtensibilityElements())))
-  //      {
-  //        // It does match so treat this as a relevant message pair. 
-  //        // Let the message through for validation.
-  //        //ADD: could pass the operations list back to the entryContext for the message.
-  //        return (bindingOp);
-  //      }
-  //    }
-  //  }
-  //  return null;
-  //}
-
-  /**
-   * Get the soap:body from a List of extensibility elements.
-   * @param extElems a list of extensibility elements.
-   * @return the soap:body from a List of extensibility elements.
-   */
-  private SOAPBody getSoapBody(List extElems)
-  {
-    // Find the soap body
-    if (extElems != null)
-    {
-      for (int i = 0; i < extElems.size(); i++)
-      {
-        ExtensibilityElement extElem = (ExtensibilityElement) extElems.get(i);
-        if (extElem.getElementType().equals(WSITag.WSDL_SOAP_BODY))
-        {
-          return (SOAPBody) extElem;
-        }
-        // If the element is mime:multipartRelated
-        else if (extElem.getElementType().equals(WSITag.WSDL_MIME_MULTIPART))
-        {
-          // Getting the mime:part elements of the mime:multipartRelated
-          List mimeParts = ((MIMEMultipartRelated) extElem).getMIMEParts();
-          // Going through all the mime:part elements
-          for (int j = 0; j < mimeParts.size(); j++)
-          {
-            // Collecting all the mime:content elements of this mime:part
-            SOAPBody soapBody = getSoapBody(
-              ((MIMEPart) mimeParts.get(j)).getExtensibilityElements());
-            if (soapBody != null)
-              return soapBody;
-          }
-        }
-      }
-    }
-
-    return null;
-  }
-
-  /**
-   * Get the SOAPHeader from a List of extensibility elements.
-   * @param extensibles a list of extensibility elements.
-   * @return the SOAPHeader from a List of extensibility elements.
-   */
-  private SOAPHeader getSoapHeader(List extensibles)
-  {
-    SOAPHeader soapHeader = null;
-
-    // find the soap header
-    if (extensibles != null)
-    {
-      Iterator i = extensibles.iterator();
-      while (i.hasNext() && soapHeader == null)
-      {
-        try
-        {
-          soapHeader = (SOAPHeader) i.next();
-        }
-        catch (ClassCastException c)
-        {
-        }
-      }
-    }
-    return soapHeader;
-  }
-
-  /**
-   * Get first part name from soapbind:body element.
-   */
-  private String getFirstPartName(BindingOperation bindingOperation)
-  {
-    String partName = null;
-    List extList = null;
-    Iterator partsIterator = null;
-
-    // Determine if there is a list of parts by finding the soapbind:body element
-    if ((extList =
-      bindingOperation.getBindingInput().getExtensibilityElements())
-      != null)
-    {
-      List partsList = null;
-      Iterator extIterator = extList.iterator();
-      while (extIterator.hasNext() && (partName == null))
-      {
-        Object extElement = extIterator.next();
-        if (extElement instanceof SOAPBody)
-        {
-          if ((partsList = ((SOAPBody) extElement).getParts()) != null)
-          {
-            partsIterator = partsList.iterator();
-
-            // Since this is a doc literal binding there should be only one part name
-            if (partsIterator.hasNext())
-              partName = (String) partsIterator.next();
-          }
-        }
-      }
-    }
-
-    return partName;
-  }
-
-  public BindingOperation[] getDocLitOperations(
-    EntryType messageType,
-    QName partElementQName,
-    BindingOperation[] wsdlOperations)
-  {
-
-    if (messageType.isType(EntryType.ENTRY_TYPE_REQUEST))
-    {
-      return getInputDocLitOperations(partElementQName, wsdlOperations);
-    }
-    else if (messageType.isType(EntryType.ENTRY_TYPE_RESPONSE))
-    {
-      return getOutputDocLitOperations(partElementQName, wsdlOperations);
-    }
-    else
-    {
-      return null; // should be one or the other
-    }
-  }
-
-  private BindingOperation[] getInputDocLitOperations(
-    QName partElementQName,
-    BindingOperation[] wsdlOperations)
-  {
-
-    Vector potentialOps = new Vector();
-
-    for (int i = 0; i < wsdlOperations.length; i++)
-    {
-      if (wsdlOperations[i].getOperation().getInput() != null)
-      {
-        Message message = wsdlOperations[i].getOperation().getInput().getMessage();
-        // If SOAP Body child element is not present and wsdl:message does not have any wsdl:parts, that is the match 
-        if (partElementQName == null)
-        {
-          if (message.getParts().isEmpty())
-            potentialOps.add(wsdlOperations[i]);
-          continue;
-        }
-
-        Iterator partsIt = message.getParts().values().iterator();
-        while (partsIt.hasNext())
-        {
-          Part nextPart = (Part) partsIt.next();
-          if (partElementQName.equals(nextPart.getElementName()))
-          {
-            // matching part found (doc-lit) - add to list of possible operation matches
-            potentialOps.add(wsdlOperations[i]);
-            break;
-          }
-        }
-      }
-    }
-    return (BindingOperation[]) potentialOps.toArray(new BindingOperation[0]);
-  }
-
-  private BindingOperation[] getOutputDocLitOperations(
-    QName partElementQName,
-    BindingOperation[] wsdlOperations)
-  {
-
-    Vector potentialOps = new Vector();
-
-    for (int i = 0; i < wsdlOperations.length; i++)
-    {
-      if (wsdlOperations[i].getOperation().getOutput() != null)
-      {
-        Message message = wsdlOperations[i].getOperation().getOutput().getMessage();
-        // If SOAP Body child element is not present and wsdl:message does not have any wsdl:parts, that is the match
-        if (partElementQName == null)
-        {
-          if (message.getParts().isEmpty())
-            potentialOps.add(wsdlOperations[i]);
-          continue;
-        }
-
-        Iterator partsIt = message.getParts().values().iterator();
-        while (partsIt.hasNext())
-        {
-          Part nextPart = (Part) partsIt.next();
-          if (partElementQName.equals(nextPart.getElementName()))
-          {
-            // matching part found (doc-lit) - add to list of possible operation matches
-            potentialOps.add(wsdlOperations[i]);
-            break;
-          }
-        }
-      }
-    }
-    return (BindingOperation[]) potentialOps.toArray(new BindingOperation[0]);
-  }
-
-  /**
-   * Compare soap message element part names with Parts from specified wsdl Operation
-   */
-  //private boolean sameParts(HashSet messageParts, Map wsdlParts)
-  //{
-  //
-  //  // look for the soap-message operation signature
-  //  Iterator i = wsdlParts.values().iterator();
-  //  // build a set of Part names
-  //  HashSet h = new HashSet();
-  //  while (i.hasNext())
-  //  {
-  //    Part p = (Part) i.next();
-  //    h.add(p.getName());
-  //  }
-  //
-  //  // compare with the parts list from the message	(unordered)
-  //  return (h.equals(messageParts));
-  //}
-
-  /**
-   * Compare soap message element part names with Parts from specified wsdl Operation
-   */
-  private boolean sameParts(
-    Map messageParts,
-    Message wsdlMessage,
-    SOAPHeader soapHeader)
-  {
-
-    String soapHeaderPart = null;
-    if (soapHeader != null)
-      soapHeaderPart = soapHeader.getPart();
-
-    // check null conditions
-    if (messageParts == null && wsdlMessage == null)
-    {
-      return true; // simple equality test
-    }
-    else if (messageParts == null || wsdlMessage == null)
-    {
-      return false;
-    }
-
-    Vector v = new Vector();
-    //List wsdlParts = wsdlMessage.getOrderedParts(null);
-    Map wsdlParts = null;
-    if (wsdlMessage.getParts() != null)
-    {
-      wsdlParts = wsdlMessage.getParts();
-      // look for the soap-message operation signature
-      Iterator i = wsdlParts.values().iterator();
-      // build a set of Part names    
-      while (i.hasNext())
-      {
-        Part p = (Part) i.next();
-        // do not include the part for the soap:header (if any)
-        if (!p.getName().equals(soapHeaderPart))
-        {
-          // check that the part is associated with the soap:body
-          v.add(new QName(p.getName()));
-        }
-      }
-      // if one of the parts is associated with a soap:header in the binding
-      // (by <soap:header part="{partname}">), remove this from the set
-
-    }
-
-    // compare with the parts list from the message	(ordered)
-    if (v.isEmpty() && messageParts.isEmpty())
-    {
-      return true;
-    }
-
-    // PB: Changed to containsAll() since equals() fails when using JRE 1.4
-    if (v.containsAll(messageParts.keySet())
-      && (v.size() == messageParts.size()))
-    {
-      // Check for xsi:type mismatch
-      Iterator parts = messageParts.keySet().iterator();
-      QName partName, xsiType;
-      while (parts.hasNext())
-      {
-        partName = (QName) parts.next();
-
-        // Get xsi:type QName
-        if ((xsiType = (QName) messageParts.get(partName)) != null
-          && wsdlParts != null)
-        {
-          // Get the WSDL part definition
-          Part part = (Part) wsdlParts.get(partName.getLocalPart());
-
-          // If xsiType is NOT derived from the type of the corresponding WSDL part
-          if (!isDerivedType(xsiType, part.getTypeName()))
-          {
-            // return false
-            return false;
-          }
-        }
-      }
-
-      return true;
-    }
-    else
-      return false;
-    //return (v.equals(messageParts));
-  }
-
-  /**
-   * Checks whether one schema type is derived from another.
-   * @param extType an assumed derived type.
-   * @param type an assumed base type.
-   * @return true if extType is derived from type, false otherwise
-   */
-  public boolean isDerivedType(QName extType, QName type)
-  {
-    // If either of types is null, return false
-    if (extType == null || type == null)
-      return false;
-    // If the types are equal, return true
-    if (extType.equals(type))
-      return true;
-
-    // Going through all schemas 
-    Iterator i = wsdlDocument.getSchemas().values().iterator();
-    while (i.hasNext())
-    {
-      XSModel xsModel = (XSModel) i.next();
-      // Retrieving the derived type definition
-      XSTypeDefinition xsType = xsModel.getTypeDefinition(
-        extType.getLocalPart(), extType.getNamespaceURI());
-      // If it is found and derived from the base type, return true
-      if (xsType != null && xsType.derivedFrom(type.getNamespaceURI(),
-        type.getLocalPart(), XSConstants.DERIVATION_NONE))
-      {
-        return true;
-      }
-    }
-    // extType is not derived from type, return false
-    return false;
-  }
-
-  /**
-  	* Get a list of QNames of parts from the soap body of the specified message
-  	*/
-  public Element getSoapBodyChild(Document doc)
-  {
-
-    Element opElem = null;
-    if (doc != null)
-    {
-      Element root = doc.getDocumentElement();
-      NodeList bodies =
-        root.getElementsByTagNameNS(WSIConstants.NS_URI_SOAP, "Body");
-      // Get the list of soap:body child element names from the request message
-      if (bodies != null && bodies.getLength() > 0)
-      {
-        Element body = (Element) bodies.item(0);
-        NodeList children = body.getChildNodes();
-        for (int i = 0; i < children.getLength() && opElem == null; ++i)
-        {
-          Node n = children.item(i);
-          if (n instanceof Element)
-          {
-            opElem = (Element) n;
-          }
-        }
-      }
-    }
-    return opElem;
-  }
-
-  /** Check whether this message is a soap fault
-   */
-  public boolean isFault(Document doc)
-  {
-    boolean isFault = false;
-
-    if (doc != null)
-    {
-      Element root = doc.getDocumentElement();
-      isFault =
-        (root
-          .getElementsByTagNameNS(WSIConstants.NS_URI_SOAP, "Fault")
-          .getLength()
-          > 0);
-    }
-
-    return isFault;
-  }
-
-  /** 
-   * Check whether this message has a soap body with a child element.
-   */
-  public boolean containsSoapBodyWithChild(Document doc)
-  {
-    boolean contains = false;
-
-    if (doc != null)
-    {
-      contains = ((getSoapBodyChild(doc) == null) ? false : true);
-    }
-
-    return contains;
-  }
-
-  /**
-   * Get SOAPAction value from the HTTP headers.
-   * @param headers HTTP headers
-   * @return SOAPAction value
-   */
-  public String getSoapAction(String headers) throws WSIException
-  {
-    // get SOAPAction
-    String action = null;
-    if (headers != null)
-      action = (String) HTTPUtils.getHttpHeaderTokens(headers, ":").get("SOAPAction".toUpperCase());
-    return action;
-  }
-
-  /**
-   * Get a list of QNames of parts from the soap body of the specified message.
-   * This method assumes RPC style message content
-   */
-  private QName getOperationFromMessage(Document doc)
-  {
-    QName operation = null;
-    if (doc != null)
-    {
-      Element root = doc.getDocumentElement();
-      NodeList bodies =
-        root.getElementsByTagNameNS(WSIConstants.NS_URI_SOAP, "Body");
-      if (bodies != null && bodies.getLength() > 0)
-      {
-        Element body = (Element) bodies.item(0);
-        NodeList children = body.getChildNodes();
-        for (int i = 0; i < children.getLength(); ++i)
-        {
-          Node n = children.item(i);
-          // If element, then this is the operation name
-          if (n instanceof Element)
-          {
-            operation = new QName(n.getNamespaceURI(), n.getLocalName());
-          }
-        }
-      }
-    }
-
-    return operation;
-  }
-
-  /**
-   * Get a list of QNames of parts from the soap body of the specified message.
-   * This method assumes RPC style message content
-   */
-  private Map getPartListFromMessage(Document doc)
-  {
-    Map parts = new HashMap();
-    if (doc != null)
-    {
-      Element root = doc.getDocumentElement();
-      NodeList bodies =
-        root.getElementsByTagNameNS(WSIConstants.NS_URI_SOAP, "Body");
-      // Get the list of soap:body grand-child element names from the request message
-      // (immediate child is the message name)
-      if (bodies != null && bodies.getLength() > 0)
-      {
-        Element body = (Element) bodies.item(0);
-        NodeList children = body.getChildNodes();
-        for (int i = 0; i < children.getLength(); ++i)
-        {
-          Node n = children.item(i);
-          if (n instanceof Element)
-          {
-            // this is the operation name. Its children are the parts
-            NodeList grandChildren = n.getChildNodes();
-            for (int j = 0; j < grandChildren.getLength(); j++)
-            {
-              Node m = grandChildren.item(j);
-              if (m instanceof Element)
-              {
-                // Determine if the part has an xsi:type
-                Attr attr =
-                  XMLUtils.getAttribute(
-                    (Element) m,
-                    new QName(WSIConstants.NS_URI_XSI, "type"));
-
-                QName xsiType = null;
-
-                // If there is an xsi:type attribute, then get the value as a QName 
-                try
-                {
-                  if (attr != null)
-                    xsiType =
-                      DOMUtils.getQName(attr.getNodeValue(), (Element) m);
-                }
-                catch (javax.wsdl.WSDLException we)
-                {
-                }
-
-                // add to the child element list
-                parts.put(
-                  new QName(m.getNamespaceURI(), m.getLocalName()),
-                  xsiType);
-              }
-            }
-          }
-        }
-      }
-    }
-    return parts;
-  }
-
-  public BindingOperation[] getMatchingBindingOps(
-    String bindingStyle,
-    Binding[] bindings)
-    throws WSIException
-  {
-
-    HashSet bindingOperationsSet = new HashSet();
-
-    // whizz through the bindings, checking for a bindingOperation matching the message
-    for (int i = 0; i < bindings.length; i++)
-    {
-
-      Binding tryBinding = bindings[i];
-      List bindingOps = tryBinding.getBindingOperations();
-
-      if (bindingOps != null)
-      {
-
-        // search through binding Operations
-        Iterator bindingOpIt = tryBinding.getBindingOperations().iterator();
-        while (bindingOpIt.hasNext())
-        {
-
-          BindingOperation bindingOp = (BindingOperation) bindingOpIt.next();
-          // check depends on which binding style is declared in the wsdl
-          SOAPOperation soapOp = WSDLValidatorImpl.getSoapOperation(bindingOp);
-          //GT: move this method to utils
-
-          String style;
-          if ((soapOp == null) || (style = soapOp.getStyle()) == null)
-          {
-            // use the style of the parent bindingOp
-
-            SOAPBinding soapBind = WSDLValidatorImpl.getSoapBinding(tryBinding);
-            //GT: move this method to utils
-            if ((style = soapBind.getStyle()) == null)
-            {
-              style = WSIConstants.ATTRVAL_SOAP_BIND_STYLE_DOC;
-              //default
-            }
-          }
-          if (style.equals(bindingStyle))
-          {
-
-            bindingOperationsSet.add(bindingOp);
-
-          }
-        }
-      } // current binding has no bindingOperations, ignore
-    }
-    return (BindingOperation[]) bindingOperationsSet.toArray(
-      new BindingOperation[0]);
-  }
-
-  /**
-   * Checks whether soap:body element is literal.
-   * @param extElements extensibility elements of wsdl:input or wsdl:output
-   * of a binding
-   */
-  public boolean isLiteral(List extElems)
-  {
-    SOAPBody soapBody = getSOAPBody(extElems);
-    if (soapBody != null
-      && soapBody.getUse().equals(WSIConstants.ATTRVAL_SOAP_BODY_USE_LIT))
-      return true;
-    else
-      return false;
-  }
-
-  /**
-   * Orders wsdl:part names keeping in mind the "parts" attribute of WSDL soap:body
-   * @param messageParts a list of wsdl:partS
-   * @param extElems extensibility elements in the binding
-   * @return the ordered list of part names
-   */
-  public List orderPartNames(List messageParts, List extElems)
-  {
-    List orderedPartNames = new ArrayList();
-    List bodyParts = null;
-
-    SOAPBody soapBody = getSOAPBody(extElems);
-    if (soapBody != null)
-      bodyParts = soapBody.getParts();
-
-    Iterator i = messageParts.iterator();
-    while (i.hasNext())
-    {
-      String partName = ((Part) i.next()).getName();
-      // If the parts attribute is not specified or contains
-      // the wsdl:part name, then adding part name to the ordered list
-      if (bodyParts == null || bodyParts.contains(partName))
-        orderedPartNames.add(partName);
-    }
-
-    return orderedPartNames;
-  }
-
-  /**
-   * Retrieves the SOAPBody object from a list of extensibility elments in binding
-   * @param extElems extensibility elements
-   * @return the SOAPBody element
-   */
-  public SOAPBody getSOAPBody(List extElems)
-  {
-    if (extElems == null)
-      return null;
-    for (Iterator i = extElems.iterator(); i.hasNext();)
-    {
-      Object obj = i.next();
-      if (obj instanceof SOAPBody)
-        return (SOAPBody) obj;
-    }
-
-    return null;
-  }
- 
-  public List resolveSameNamespaces(List schemaElements)
-  {
-  	List namespaces = new ArrayList();
-  	List result = new ArrayList();
-  	Iterator i = schemaElements.iterator();
-    while (i.hasNext())
-    {
-      Element schema = (Element) i.next();
-      String targetNamespace = schema.getAttribute(Constants.ATTR_TARGET_NAMESPACE);
-      if (!namespaces.contains(targetNamespace))
-      {
-        namespaces.add(targetNamespace);
-    	List schemas = getSchemasWithSameNamespace(schemaElements, targetNamespace);
-    	if (schemas.size() == 1)
-      	{
-      	  result.add(schema);
-      	}
-    	else
-    	{
-    		// copying all the NS declarations from wsdl:definitions wsdl:types
-      //copyNSDeclarations(root, schema);
-      copyNSDeclarations((Element) schema.getParentNode(), schema);
-      // Replacing all relative schemaLocation URIs with absolute ones
-      //replaceRelativeURIs(schema, wsdlURI);
-      // Serialize the schema elements inside the Types, then use this as
-      // the schema string for the validation
-      //String schemaString =
-      //  DOM2Writer.nodeToString(schema);
-      // schemaStrings.add(schemaString);
-      	}
-      }
-    }
-  	return null;
-  }
-  	
-  public List getSchemasWithSameNamespace(List schemaElements, String targetNamespace)
-  { 
-  	List result = new ArrayList();
-    Iterator i = schemaElements.iterator();
-    while (i.hasNext())
-    {
-      Element schema = (Element)i.next();
-      String schemaTargetNamespace = schema.getAttribute(Constants.ATTR_TARGET_NAMESPACE);
-      if (schemaTargetNamespace == null)
-       	schemaTargetNamespace = "";
-        
-      if (schemaTargetNamespace.equals(targetNamespace))
-      {
-       	result.add(schema);
-      }
-    }
-    return result;
-  }
-
-  public boolean duplicateNamespacesDetected(List schemaElements)
-  { 
-  	boolean result = false;
-    List namespaces = new ArrayList();
-    Iterator i = schemaElements.iterator();
-    while (i.hasNext())
-    {
-    	Element schema = (Element)i.next();
-        String targetNamespace = schema.getAttribute(Constants.ATTR_TARGET_NAMESPACE);
-        if (targetNamespace == null)
-        	targetNamespace = "";
-        
-        if (namespaces.contains(targetNamespace))
-        {
-        	result = true;
-        	break;
-        }
-        else
-        {
-        	namespaces.add(targetNamespace);
-        }
-    }
-    return result;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/BaseValidatorImpl.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/BaseValidatorImpl.java
deleted file mode 100644
index b72ce34c3..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/BaseValidatorImpl.java
+++ /dev/null
@@ -1,705 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl;
-
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.TreeMap;
-import java.util.Vector;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AnalyzerContext;
-import org.eclipse.wst.wsi.internal.core.profile.ProfileArtifact;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.BaseValidator;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EnvelopeValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.report.Entry;
-import org.eclipse.wst.wsi.internal.core.report.FailureDetail;
-import org.eclipse.wst.wsi.internal.core.report.PrereqFailedList;
-import org.eclipse.wst.wsi.internal.core.report.ReportArtifact;
-import org.eclipse.wst.wsi.internal.core.report.Reporter;
-import org.eclipse.wst.wsi.internal.core.report.impl.PrereqFailedListImpl;
-import org.eclipse.wst.wsi.internal.core.util.EntryType;
-import org.eclipse.wst.wsi.internal.core.xml.XMLDocumentCacheUser;
-import org.eclipse.wst.wsi.internal.core.xml.dom.ElementLocation;
-
-/**
- * The WSDL validator will verify that the WSDL and associated XML schema definitions
- * are in conformance with the profile.
- *
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- * @author Graham Turrell   (gturrell@uk.ibm.com)
- */
-public abstract class BaseValidatorImpl
-  extends XMLDocumentCacheUser
-  implements BaseValidator
-{
-
-  /**
-   * A hashtable that maps assertion results to their priorities, 0 is lowest
-   */
-  private static final Hashtable resultPriority = new Hashtable(6);
-  static {
-    resultPriority.put(AssertionResult.RESULT_PASSED, new Integer(0));
-    resultPriority.put(AssertionResult.RESULT_NOT_APPLICABLE, new Integer(1));
-    resultPriority.put(AssertionResult.RESULT_MISSING_INPUT, new Integer(2));
-    resultPriority.put(AssertionResult.RESULT_WARNING, new Integer(3));
-    resultPriority.put(AssertionResult.RESULT_PREREQ_FAILED, new Integer(4));
-    resultPriority.put(AssertionResult.RESULT_FAILED, new Integer(5));
-  }
-
-  /**
-   * The highest priority value being passed when processing pre-requisites
-   */
-  private static final int MAX_VALID_PRIORITY = 1;
-
-  /**
-   * Analyzer context.
-   */
-  public AnalyzerContext analyzerContext;
-
-  /**
-   * Profile artifact.
-   */
-  protected ProfileArtifact profileArtifact;
-
-  /**
-   * Reporter.
-   */
-  protected Reporter reporter;
-
-  /**
-   * Entry.
-   */
-  // protected Entry entry;
-
-  /**
-   * Report artifact.
-   */
-  protected ReportArtifact reportArtifact;
-
-  /**
-   * Verbose option.
-   */
-  public boolean verboseOption = false;
-
-  /**
-   * Test assertion processed count.
-   */
-  protected int assertionCount = 0;
-
-  /**
-   * Constructor.
-   */
-  public BaseValidatorImpl()
-  {
-  }
-
-  /**
-   * Initiailize validation test procedure.
-   * @param analyzerContext the analyzerContext.
-   * @param profileArtifact the profile artifiact.
-   * @param reportArtifact  the report artifact.
-   * @param reporter        a Reporter object.
-   * @throws WSIException if validator could not be initialized.
-   */
-  public void init(
-    AnalyzerContext analyzerContext,
-    ProfileArtifact profileArtifact,
-    ReportArtifact reportArtifact,
-    Reporter reporter)
-    throws WSIException
-  {
-    // Save input references
-    this.analyzerContext = analyzerContext;
-    this.profileArtifact = profileArtifact;
-    this.reportArtifact = reportArtifact;
-    this.reporter = reporter;
-
-    // Get verbose option    
-    verboseOption =
-      reporter
-        .getReport()
-        .getReportContext()
-        .getAnalyzer()
-        .getAnalyzerConfig()
-        .getVerboseOption();
-  }
-
-  /**
-   * Process all of the test assertions for one entry.
-   * @param classPrefix a class prefix.
-   * @param entryContext an entry context.
-   * @throws WSIException if serious problems occur while processing 
-   *         all of the test assertions for an entry.
-   */
-  protected void processAssertions(
-    String classPrefix,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    long startTime = 0;
-
-    HashMap processList = new HashMap();
-    TestAssertion testAssertion = null;
-    AssertionProcess assertionProcess;
-    AssertionResult assertionResult;
-
-    TreeMap preReqResults;
-    PrereqFailedList prereqFailedList;
-    String preReqId;
-
-    Class[] paramTypes = new Class[1];
-    // If this is an instance of MessageValidator or EnvelopeValidator
-    // then use BaseMessageValidator as a param type of assertions constructor
-    paramTypes[0] = this instanceof BaseMessageValidator ?
-      BaseMessageValidator.class : this.getClass();
-
-    Object[] params = new Object[1];
-    params[0] = this;
-
-    // Get entry from context
-    Entry entry = entryContext.getEntry();
-
-    // Add entry to artifact
-    this.reportArtifact.addEntry(entry);
-
-    // Add entry to report
-    if (this instanceof EnvelopeValidator)
-     	this.reporter.setCurrentEnvelopeEntry(entry); 
-	else this.reporter.setCurrentEntry(entry);
-
-    try
-    {
-      // Go through the list of test assertions for the artifact
-      Iterator iterator = profileArtifact.getTestAssertionList().iterator();
-      while (iterator.hasNext())
-      {
-        // Get next test assertion
-        testAssertion = (TestAssertion) iterator.next();
-
-        // Reset variables
-        assertionResult = null;
-
-        // If the test assertion is enabled, then continue
-        //        if ((testAssertion.isEnabled()) && 
-        //            testAssertion.getEntryTypeName().equals(targetContext.getEntry().getEntryType().getTypeName())) { 
-        if (testAssertion.isEnabled()
-          && isPrimaryEntryTypeMatch(testAssertion, entryContext))
-        {
-          try
-          {
-            // Add 1 to assertion processed count
-            assertionCount++;
-
-            // If the assertion process hasn't been created yet, then create it
-            if ((assertionProcess =
-              (AssertionProcess) processList.get(testAssertion.getId()))
-              == null)
-            {
-
-              // Create a new assertion process
-              Class assertionClass =
-                Class.forName(classPrefix + testAssertion.getId());
-
-              assertionProcess =
-                (AssertionProcess) assertionClass.getConstructor(
-                  paramTypes).newInstance(
-                  params);
-
-              // Add it to the list
-              processList.put(testAssertion.getId(), assertionProcess);
-            }
-
-            // Check whether entry is null
-            if (entry.getEntryDetail() == null)
-            {
-              assertionResult =
-                createAssertionResult(
-                  testAssertion,
-                  AssertionResult.RESULT_MISSING_INPUT,
-                  (String) null);
-            }
-
-            // Check to see if the test assertion should be run
-            //if (isNotApplicable(testAssertion, entryContext)) {
-            else if (isNotApplicable(testAssertion))
-            {
-              assertionResult =
-                createAssertionResult(
-                  testAssertion,
-                  AssertionResult.RESULT_NOT_APPLICABLE,
-                  (String) null);
-            }
-            else
-            {
-              // Processing all the assertion pre-requisites
-
-              preReqResults = null;
-              prereqFailedList = null;
-              // Get list of pre-reqs for specified assertion
-              Iterator i = testAssertion.getPrereqIdList().iterator();
-              while (i.hasNext())
-              {
-                if (preReqResults == null)
-                  preReqResults = new TreeMap();
-                // Get next id
-                preReqId = (String) i.next();
-                // Get the prereq result
-                AssertionResult preReqResult = reporter.getAssertionResult(preReqId);
-
-                // Adding a result priority value to preReqResults
-                preReqResults.put(
-                  resultPriority.get(preReqResult.getResult()),
-                  preReqResult.getResult());
-
-                // If the prereq failed, then add it to the list
-                if (((Integer)resultPriority.get(preReqResult.getResult())).intValue()
-                  > MAX_VALID_PRIORITY)
-                {
-                  // Adding failed prereq ID to the list
-                  if (prereqFailedList == null)
-                    prereqFailedList = new PrereqFailedListImpl();
-                  prereqFailedList.addTestAssertionID(preReqId);
-                }
-              }
-
-              if (prereqFailedList != null) {
-                // Getting the highest pre-requisites' result
-                Integer maxRes = (Integer)preReqResults.lastKey();
-                String resString = (String)preReqResults.get(maxRes);
-                if (resString.equals(AssertionResult.RESULT_FAILED)
-                  ||resString.equals(AssertionResult.RESULT_WARNING)) {
-                  resString = AssertionResult.RESULT_PREREQ_FAILED;
-                }
-                // Create assertion result based on pre-requisites which are not passed
-                assertionResult = createAssertionResult(testAssertion, resString, prereqFailedList);
-              }
-
-              // Pre-requisites are passed, validate current assertion
-              else {
-
-                // Reset test assertion
-                assertionProcess.reset();
-
-                //  VERBOSE
-                if (verboseOption)
-                {
-                  System.err.println(
-                    "  Processing "
-                      + testAssertion.getId()
-                      + " for entry reference ID ["
-                      + entry.getReferenceID()
-                      + "] ...");
-                  startTime = System.currentTimeMillis();
-                }
-
-                // Validate the target
-                assertionResult =
-                  assertionProcess.validate(testAssertion, entryContext);
-
-                //  VERBOSE
-                if (verboseOption)
-                {
-                  System.err.println(
-                    "    Elapsed time: "
-                      + (System.currentTimeMillis() - startTime)
-                      + "ms");
-                }                
-              }
-            }
-
-            // Add result to the report
-            reporter.addAssertionResult(assertionResult);
-          }
-
-          catch (ClassNotFoundException cnfe)
-          {
-            // DEBUG:
-            if (testAssertion != null)
-            {
-              reporter
-                .getReport()
-                .getReportContext()
-                .getAnalyzer()
-                .printMessage(
-                "WARNING: "
-                  + testAssertion.getId()
-                  + " is not supported currently.");
-            }
-          }
-        }
-      }
-    }
-
-    catch (Exception e)
-    {
-      System.err.println("EXECEPTION: " + e.getMessage());
-      if (verboseOption)
-        e.printStackTrace();
-
-      if (e instanceof WSIException)
-        throw (WSIException) e;
-      else
-        throw new WSIException(e.getMessage(), e);
-    }
-
-    finally
-    {
-      // Indicate that we are done with this assertion target
-      this.reporter.endCurrentEntry();
-    }
-  }
-
-  /**
-   * Determine if the test assertion should be processed for the current entry.
-   * @param testAssertion a test assertion.
-   * @param entryContext  the entry context.
-   * @return true if the test assertion should be processed for the current entry.
-   */
-  protected abstract boolean isPrimaryEntryTypeMatch(
-    TestAssertion testAssertion,
-    EntryContext entryContext);
-
-  /**
-   * Determine if the test assertion should be processed for the current entry.
-   * @param testAssertion  a test assertion.
-   * @param entry          an Entry object
-   * @return true if the test assertion should be processed for the current entry.
-   */
-  protected boolean isPrimaryEntryTypeMatch(
-    TestAssertion testAssertion,
-    Entry entry)
-  {
-    boolean match = false;
-
-    // If the test assertion entry type matches the target context entry type, then contine
-    if (testAssertion
-      .getEntryTypeName()
-      .equals(entry.getEntryType().getTypeName()))
-    {
-      match = true;
-    }
-
-    return match;
-  }
-
-  /**
-   * Determine if the test assertion is not applicable.
-   * @param testAssertion a test assertion.
-   * @return true if the test assertion is not applicable.
-   */
-  protected abstract boolean isNotApplicable(TestAssertion testAssertion);
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.validator.BaseValidator#cleanup()
-   */
-  public void cleanup() throws WSIException
-  {
-    // If no assertions were processed, then set all missingInput
-    if (assertionCount == 0)
-      setAllMissingInput();
-  }
-
-  /**
-   * Create assertion result.
-   * @param testAssertion a test assertion.
-   * @param result        a String object.
-   * @param failureDetail a FailureDetail object.
-   * @return newly created test result.
-   */
-  public AssertionResult createAssertionResult(
-    TestAssertion testAssertion,
-    String result,
-    FailureDetail failureDetail)
-  {
-    Vector failureDetailList = null;
-
-    // Create failure detail list
-    if (failureDetail != null)
-    {
-      failureDetailList = new Vector();
-      failureDetailList.add(failureDetail);
-    }
-
-    return createAssertionResult(testAssertion, result, failureDetailList);
-  }
-
-  /**
-   * Create assertion result.
-   * @param testAssertion         a test assertion.
-   * @param result                a String object.
-   * @param failureDetailMessage  a failure detail message.
-   * @return newly created test result.
-   */
-  public AssertionResult createAssertionResult(
-    TestAssertion testAssertion,
-    String result,
-    String failureDetailMessage)
-  {
-    return createAssertionResult(
-      testAssertion,
-      result,
-      failureDetailMessage,
-      null);
-  }
-
-  /**
-   * Create assertion result.
-   * @param testAssertion         a test assertion.
-   * @param result                a String object.
-   * @param failureDetailMessage  a failure detail message.
-   * @param elementLocation       element location.
-   * @return newly created test result.
-   */
-  public AssertionResult createAssertionResult(
-    TestAssertion testAssertion,
-    String result,
-    String failureDetailMessage,
-    ElementLocation elementLocation)
-  {
-    // Create failure detail list
-    Vector failureDetailList = null;
-    if (failureDetailMessage != null)
-    {
-      failureDetailList = new Vector();
-      FailureDetail failureDetail = reporter.createFailureDetail();
-      failureDetail.setFailureMessage(failureDetailMessage);
-      failureDetail.setElementLocation(elementLocation);
-      failureDetailList.add(failureDetail);
-    }
-
-    return createAssertionResult(testAssertion, result, failureDetailList);
-  }
-
-  /**
-   * Create assertion result.
-   * @param testAssertion     a test assertion.
-   * @param result            a String object.
-   * @param failureDetailList a failure detail list.
-   * @return newly created test result.
-   */
-  public AssertionResult createAssertionResult(
-    TestAssertion testAssertion,
-    String result,
-    Vector failureDetailList)
-  {
-    // Create assertion result
-    AssertionResult assertionResult = reporter.createAssertionResult();
-
-    // Set values in assertion result
-    assertionResult.setAssertion(testAssertion);
-    assertionResult.setResult(result);
-    assertionResult.setEntry(reporter.getReport().getCurrentEntry());
-
-    // Set failure detail list
-    assertionResult.setFailureDetailList(failureDetailList);
-
-    return assertionResult;
-  }
-
-  /**
-   * Create assertion result.
-   * @param testAssertion     a test assertion.
-   * @param result            a String object.
-   * @param prereqFailedList  a list failed pre-requisite assertions.
-   * @return newly created test result.
-   */
-  public AssertionResult createAssertionResult(
-    TestAssertion testAssertion,
-    String result,
-    PrereqFailedList prereqFailedList)
-  {
-    // Create assertion result
-    AssertionResult assertionResult = reporter.createAssertionResult();
-
-    // Set values in assertion result
-    assertionResult.setAssertion(testAssertion);
-    assertionResult.setResult(result);
-    assertionResult.setEntry(reporter.getReport().getCurrentEntry());
-    assertionResult.setPrereqFailedList(prereqFailedList);
-
-    return assertionResult;
-  }
-
-  /**
-   * Add assertion result to report.
-   * @param assertionId  assertion id.
-   * @param result       assertion result.
-   * @throws WSIException if the assertion result cannot be added to the report.
-   */
-  protected void addAssertionResult(String assertionId, String result)
-    throws WSIException
-  {
-    // Create test assertion result
-    AssertionResult assertionResult = reporter.createAssertionResult();
-
-    // Set assertion, result and target
-    assertionResult.setAssertion(profileArtifact.getTestAssertion(assertionId));
-    assertionResult.setResult(result);
-    assertionResult.setEntry(reporter.getReport().getCurrentEntry());
-
-    // Add it to the report
-    reporter.addAssertionResult(assertionResult);
-  }
-
-  /**
-   * Add assertion result to report with an error detail message.
-   * @param assertionId          assertion id.
-   * @param result               assertion result.
-   * @param failureDetailMessage an error detail message.
-   * @throws WSIException if the assertion result cannot be added to the report.
-   */
-  protected void addAssertionResult(
-    String assertionId,
-    String result,
-    String failureDetailMessage)
-    throws WSIException
-  {
-    // Convert message to vector
-    Vector failureDetailList = null;
-    if (failureDetailMessage != null)
-    {
-      failureDetailList = new Vector();
-      FailureDetail failureDetail = reporter.createFailureDetail();
-      failureDetailList.add(failureDetail);
-    }
-
-    // Add assertion result
-    addAssertionResult(assertionId, result, failureDetailList);
-  }
-
-  /**
-   * Add assertion result to report.
-   * @param assertionId        assertion id.
-   * @param result             assertion result.
-   * @param failureDetailList  a list of error detail messages.
-   * @throws WSIException if the assertion result cannot be added to the report.
-   */
-  protected void addAssertionResult(
-    String assertionId,
-    String result,
-    Vector failureDetailList)
-    throws WSIException
-  {
-    // Create test assertion result
-    AssertionResult assertionResult = reporter.createAssertionResult();
-
-    // Set assertion, result and target
-    assertionResult.setAssertion(profileArtifact.getTestAssertion(assertionId));
-    assertionResult.setResult(result);
-    assertionResult.setEntry(reporter.getReport().getCurrentEntry());
-    assertionResult.setFailureDetailList(failureDetailList);
-
-    // Add it to the report
-    reporter.addAssertionResult(assertionResult);
-  }
-
-  /**
-   * Add missingInput assertion result to report.
-   * @param testAssertion a test assertion.
-   * @throws WSIException if there is any problem adding missingInput 
-   * 		 assertion result to report.
-   */
-  protected void addMissingInputResult(TestAssertion testAssertion)
-    throws WSIException
-  {
-    // Create test assertion result
-    AssertionResult assertionResult = reporter.createAssertionResult();
-
-    // Set assertion, result and target
-    assertionResult.setAssertion(testAssertion);
-    assertionResult.setResult(AssertionResult.RESULT_MISSING_INPUT);
-    assertionResult.setEntry(reporter.getReport().getCurrentEntry());
-
-    // Add it to the report
-    reporter.addAssertionResult(assertionResult);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.validator.BaseValidator#setAllMissingInput()
-   */
-  public void setAllMissingInput() throws WSIException
-  {
-    // If profile artifact is set
-    if (profileArtifact != null)
-    {
-      TestAssertion testAssertion;
-  
-      // Create entry
-      Entry entry = this.reporter.getReport().createEntry();
-      entry.setArtifactName(this.reportArtifact.getType().getTypeName());
-  
-      // Add entry to artifact
-      this.reportArtifact.addEntry(entry);
-  
-      // Add entry to report
-      this.reporter.setCurrentEntry(entry);
-  
-      // Go through the list of test assertions for the artifact
-      Iterator iterator = profileArtifact.getTestAssertionList().iterator();
-      while (iterator.hasNext())
-      {
-        // Get next test assertion
-        testAssertion = (TestAssertion) iterator.next();
-  
-        // Add missingInput result
-        if (testAssertion.isEnabled())
-          addMissingInputResult(testAssertion);
-      }
-  
-      // Indicate that we are done with this assertion target
-      this.reporter.endCurrentEntry();
-    }
-  }
-
-  /**
-   * Set all results for an entry type to missingInput.
-   * @param entryType an EntryType object.
-   * @throws WSIException if there is any problem while processing.
-   */
-  protected void setMissingInput(EntryType entryType) throws WSIException
-  {
-    TestAssertion testAssertion;
-
-    // Create entry 
-    Entry entry = this.reporter.getReport().createEntry();
-    entry.setEntryType(entryType);
-    entry.setReferenceID("[" + entryType.getTypeName() + "]");
-
-    // Add entry to artifact
-    this.reportArtifact.addEntry(entry);
-
-    // Add entry to report
-    this.reporter.setCurrentEntry(entry);
-
-    //try {
-    // Go through the list of test assertions for the artifact
-    Iterator iterator = profileArtifact.getTestAssertionList().iterator();
-    while (iterator.hasNext())
-    {
-      // Get next test assertion
-      testAssertion = (TestAssertion) iterator.next();
-      if (testAssertion.isEnabled()
-        && isPrimaryEntryTypeMatch(testAssertion, entry))
-      {
-        addMissingInputResult(testAssertion);
-      }
-    }
-
-    // Indicate that we are done with this entry
-    this.reporter.endCurrentEntry();
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/ProfileValidatorFactoryImpl.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/ProfileValidatorFactoryImpl.java
deleted file mode 100644
index 4add15518..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/AP1920.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/AP1920.java
deleted file mode 100644
index a7f2ebd07..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/AP1928.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/AP1928.java
deleted file mode 100644
index 5965fcfa4..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1005.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1005.java
deleted file mode 100644
index 7aa465d13..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1007.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1007.java
deleted file mode 100644
index 469486968..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1008.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1008.java
deleted file mode 100644
index 21202362e..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1009.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1009.java
deleted file mode 100644
index 32e401b07..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1009.java
+++ /dev/null
@@ -1,313 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.Definition;
-import javax.wsdl.Message;
-import javax.wsdl.OperationType;
-import javax.wsdl.Part;
-import javax.wsdl.extensions.soap.SOAPHeader;
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionNotApplicableException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionPassException;
-import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.HTTPUtils;
-import org.eclipse.wst.wsi.internal.core.util.OperationSignature;
-import org.eclipse.wst.wsi.internal.core.util.TypesRegistry;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-
-/**
- * BP1009.
- * Message includes all soapbind:headers specified in the wsdl:input 
- * (if request) or wsdl:output (if response) of the operation referred 
- * to by its wsdl:binding, and may also include headers that were not specified.
- */
-public class BP1009 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP1009(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(TestAssertion, EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    try
-    {
-      if (this.validator.isOneWayResponse(entryContext))
-      {
-        throw new AssertionNotApplicableException();
-      }
-
-      // Parse message
-      Document doc = entryContext.getMessageEntryDocument();
-
-      // Parse request message
-      Document docRequest = entryContext.getRequestDocument();
-
-      if (doc == null || docRequest == null)
-        throw new AssertionNotApplicableException();
-
-      // Check if there is a soap body element
-      if (!this.validator.containsSoapBodyWithChild(doc))
-      {
-        throw new AssertionNotApplicableException();
-      }
-
-      if (this.validator.isFault(doc))
-      {
-        throw new AssertionFailException(
-          AssertionResult.RESULT_NOT_APPLICABLE);
-      }
-
-      // get SOAPAction
-      String headers = entryContext.getRequest().getHTTPHeaders();
-      String action = null;
-      if (headers != null)
-        action = (String) HTTPUtils.getHttpHeaderTokens(headers, ":").get("SOAPAction".toUpperCase());
-
-      Binding binding = validator.analyzerContext.getCandidateInfo().getBindings()[0];
-      TypesRegistry registry =
-        new TypesRegistry(
-          this.validator.getWSDLDocument().getDefinitions(),
-          validator);
-      OperationSignature.OperationMatch match =
-        OperationSignature.matchOperation(
-          docRequest,
-          action,
-          binding,
-          registry);
-
-      if (match == null)
-      {
-        throw new AssertionNotApplicableException();
-      }
-
-      BindingOperation bindingOperation = match.getOperation();
-
-      // If this is a one-way operation and we are processing a response, then set result to notApplicable
-      if (bindingOperation
-        .getOperation()
-        .getStyle()
-        .equals(OperationType.ONE_WAY)
-        && (entryContext
-          .getMessageEntry()
-          .getType()
-          .equals(MessageEntry.TYPE_RESPONSE)))
-      {
-        throw new AssertionNotApplicableException();
-      }
-
-      // find body
-      NodeList soapBodyList =
-        doc.getElementsByTagNameNS(
-          WSIConstants.NS_URI_SOAP,
-          XMLUtils.SOAP_ELEM_BODY);
-      if (soapBodyList.getLength() == 0 || soapBodyList.getLength() > 1)
-      {
-        // There is not a body or more than one bodies in the envlope.
-        throw new AssertionPassException();
-      }
-      // find headers
-      NodeList soapHeaders =
-        doc.getElementsByTagNameNS(
-          WSITag.ELEM_SOAP_HEADER.getNamespaceURI(),
-          WSITag.ELEM_SOAP_HEADER.getLocalPart());
-
-      //find all operation
-      //Element soapOperation = XMLUtils.getFirstChild(soapBodyElem);
-
-      // gets soapbind:headers
-      List bindingHeaders = null;
-      if (entryContext
-        .getMessageEntry()
-        .getType()
-        .equals(MessageEntry.TYPE_REQUEST))
-      {
-        if (bindingOperation.getBindingInput() != null)
-          bindingHeaders =
-            bindingOperation.getBindingInput().getExtensibilityElements();
-        else
-          throw new AssertionFailException();
-
-      }
-      else
-      {
-        if (entryContext
-          .getMessageEntry()
-          .getType()
-          .equals(MessageEntry.TYPE_RESPONSE))
-        {
-          if (bindingOperation.getBindingOutput() != null)
-            bindingHeaders =
-              bindingOperation.getBindingOutput().getExtensibilityElements();
-          else
-            throw new AssertionFailException();
-        }
-      }
-      if (bindingHeaders == null || bindingHeaders.size() == 0)
-      {
-        throw new AssertionPassException();
-      }
-
-      Iterator iterator = bindingHeaders.iterator();
-      while (iterator.hasNext())
-      {
-        Object bindingHeader = iterator.next();
-        if (bindingHeader instanceof SOAPHeader)
-        {
-          // find soapbind:header in SOAP message
-          if (!isBindingHeaderInSOAPMessage(entryContext,
-            soapHeaders,
-            (SOAPHeader) bindingHeader))
-          {
-            throw new AssertionFailException();
-          }
-        }
-      }
-
-      result = AssertionResult.RESULT_PASSED;
-
-    }
-    catch (AssertionFailException e)
-    {
-      if (e.getMessage() != null && e.getMessage().length() > 0)
-        result = e.getMessage();
-      else
-        result = AssertionResult.RESULT_FAILED;
-    }
-    catch (AssertionPassException e)
-    {
-      result = AssertionResult.RESULT_PASSED;
-    }
-    catch (Exception e)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-
-    if (result == AssertionResult.RESULT_FAILED)
-    {
-      failureDetail = this.validator.createFailureDetail(null, entryContext);
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-
-  /**
-  * Checks whether specified SOAPHeader is in the SOAPMessage.
-  * @param soapHeaderList
-  * @param SOAPHeader
-  * @return boolean
-  */
-  private boolean isBindingHeaderInSOAPMessage(
-    EntryContext entryContext,
-    NodeList soapHeaders,
-    SOAPHeader bindingHeader)
-  {
-
-    Message msg = getMessageByQName(entryContext, bindingHeader.getMessage());
-    if (msg == null)
-      return false;
-
-    Part part = msg.getPart(bindingHeader.getPart());
-    if (part == null)
-      return false;
-
-    QName partElementName = part.getElementName();
-    QName partTypeName = part.getTypeName();
-
-    if (partTypeName == null && partElementName == null)
-      return false;
-
-    if (soapHeaders == null || soapHeaders.getLength() == 0)
-    {
-      return false;
-    }
-    Vector headersList =
-      XMLUtils.getChildElements((Element) soapHeaders.item(0));
-
-    for (int indexHeader = 0;
-      indexHeader < headersList.size();
-      indexHeader++)
-    {
-      Element soapHeaderPart = (Element) headersList.get(indexHeader);
-      if (soapHeaderPart != null)
-      {
-        QName soapHeaderPartQName =
-          new QName(
-            soapHeaderPart.getNamespaceURI(),
-            soapHeaderPart.getLocalName());
-        if ((partTypeName != null
-          && partTypeName.equals(soapHeaderPartQName))
-          || (partElementName != null
-            && partElementName.equals(soapHeaderPartQName)))
-        {
-          return true;
-        }
-      }
-    }
-
-    return false;
-  }
-
-  /**
-   * Gets message by QName.
-   * @param entryContext
-   * @param messageName
-   * @return Message
-   */
-  private Message getMessageByQName(
-    EntryContext entryContext,
-    QName messageName)
-  {
-    Definition[] defs = validator.analyzerContext.getCandidateInfo().getDefinitions();
-    for (int i = 0; i < defs.length; i++)
-    {
-      Message msg = defs[i].getMessage(messageName);
-      if (msg != null)
-        return msg;
-    }
-    return null;
-  }
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1011.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1011.java
deleted file mode 100644
index 3a37ab6c9..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1011.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingOperation;
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionNotApplicableException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionPassException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-
-/**
- * BP1011.
- */
-public class BP1011 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP1011(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    try
-    {
-      // TODO need to handle soap with attachments
-      if (entryContext.getMessageEntry().isMimeContent())
-      	 throw new AssertionNotApplicableException();
-         
-      Binding[] bindings = validator.analyzerContext.getCandidateInfo().getBindings();
-
-      // get soap message child name
-      // Get the DOM contents of the message soap:body (if non-empty)
-      Document messageDoc = null;
-
-      QName messagePartElementQName = null;
-
-      if (!entryContext.getMessageEntry().getMessage().equals(""))
-      {
-        messageDoc = entryContext.getMessageEntryDocument();
-        //messageDoc = XMLUtils.parseXML(entryContext.getMessageEntry().getMessage(), 
-        //	WSIProperties.DEF_SOAP_SCHEMA);
-        // get soap operation name from the soap:body
-
-        // NOTE: getSoapBodyChild() may return null, if the soap:body did not contain any child elements
-        Element soapMessageElement = validator.getSoapBodyChild(messageDoc);
-
-        // for doc-lit... find the wsdl:part from one of the specified operations that has 
-        // the soap element used in the message.      
-        // we are looking for a part with an element attrib val matching the soap message element
-        if (soapMessageElement != null)
-        {
-          messagePartElementQName =
-            new QName(
-              soapMessageElement.getNamespaceURI(),
-              soapMessageElement.getLocalName());
-        }
-      }
-
-      if ((messageDoc == null) || this.validator.isFault(messageDoc))
-      {
-        // empty messages and fault messages do not qualify for this TA
-        throw new AssertionNotApplicableException();
-      }
-
-      // look for match(s) in doc operations
-      // if found, we're done, else
-      // look for match(s) in rpc operations
-
-      /* Doc-lit 
-       * get list of operations (from candidates) for which the first soap:body child QName is the
-       * <part element="..."> value of that operation's <wsdl:input> or <wsdl:output> element (depending
-       * on whether message is a request or a response).
-       */
-
-      BindingOperation[] docBindingOperations =
-        validator.getMatchingBindingOps(
-          WSIConstants.ATTRVAL_SOAP_BIND_STYLE_DOC,
-          bindings);
-      // list of operations that match the <wsdl:input> or <wsdl:output> (depending on entryType)
-      // for part element="..."
-      // (ISSUE: what about part type="..."?)
-      BindingOperation[] potentialDocLitOps =
-        validator.getDocLitOperations(
-          entryContext.getEntry().getEntryType(),
-          messagePartElementQName,
-          docBindingOperations);
-      if (potentialDocLitOps.length != 0)
-      {
-        // found at least one doc lit match
-
-        // *** Now we know it's document-literal, schema-validate the SOAP payload accordingly            		
-        try
-        {
-          this.validator.messageIsDocLitSchemaValid(entryContext);
-        }
-        catch (Exception e)
-        {
-          throw new AssertionFailException(e.getMessage());
-        }
-        throw new AssertionPassException();
-      }
-
-      /* soap message is not doc-lit so try :
-       * Rpc-lit
-       */
-      BindingOperation[] rpcBindingOperations =
-        this.validator.getMatchingBindingOps(
-          WSIConstants.ATTRVAL_SOAP_BIND_STYLE_RPC,
-          bindings);
-
-      // Determine if there is an operation match
-      BindingOperation rcpOpMatch =
-        this.validator.getOperationMatch(
-          entryContext.getEntry().getEntryType(),
-          messageDoc,
-          rpcBindingOperations);
-      if (rcpOpMatch != null)
-      {
-        // Determine if the parts match
-        rcpOpMatch =
-          this.validator.getOperationPartsMatch(
-            entryContext.getEntry().getEntryType(),
-            messageDoc,
-            rpcBindingOperations);
-      }
-
-      if (rcpOpMatch == null)
-      {
-        //not matched with rpc either. Prepare assertion failure.
-        StringBuffer rpcOperationList = new StringBuffer();
-        for (int i = 0; i < rpcBindingOperations.length; i++)
-        {
-          rpcOperationList.append(rpcBindingOperations[i].toString() + "\n");
-        }
-
-        StringBuffer docOperationList = new StringBuffer();
-        for (int i = 0; i < docBindingOperations.length; i++)
-        {
-          docOperationList.append(docBindingOperations[i].toString() + "\n");
-        }
-
-        throw new AssertionFailException(
-          "--MESSAGE:\n"
-            + entryContext.getMessageEntry().getMessage()
-            + "\n--CANDIDATE RPC STYLE OPERATIONS ("
-            + (rpcBindingOperations.length != 0
-              ? (rpcBindingOperations.length + "):\n" + rpcOperationList)
-              : "NONE)")
-            + "\n--CANDIDATE DOCUMENT STYLE OPERATIONS ("
-            + (docBindingOperations.length != 0
-              ? (docBindingOperations.length + "):\n" + docOperationList)
-              : "NONE)"));
-
-      }
-    }
-    catch (AssertionPassException e)
-    {
-    }
-    catch (AssertionFailException e)
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = this.validator.createFailureDetail(e.getMessage(), entryContext);
-    }
-    catch (AssertionNotApplicableException e)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-
-    // Return assertion result
-
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1012.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1012.java
deleted file mode 100644
index 115d4efe4..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1013.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1013.java
deleted file mode 100644
index eb6f8eb54..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1031.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1031.java
deleted file mode 100644
index cfbdafbc0..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1032.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1032.java
deleted file mode 100644
index 47413072a..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1033.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1033.java
deleted file mode 100644
index 12ec8a11b..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1100.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1100.java
deleted file mode 100644
index 12bad72bf..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1107.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1107.java
deleted file mode 100644
index 11c86917d..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1201.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1201.java
deleted file mode 100644
index 7af6934b4..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1202.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1202.java
deleted file mode 100644
index a5abee105..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1203.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1203.java
deleted file mode 100644
index 8470acb61..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1204.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1204.java
deleted file mode 100644
index 5bf480deb..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1208.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1208.java
deleted file mode 100644
index a26af9236..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1211.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1211.java
deleted file mode 100644
index 69133b820..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1212.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1212.java
deleted file mode 100644
index 8c1f77280..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1213.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1213.java
deleted file mode 100644
index 555d8463c..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1214.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1214.java
deleted file mode 100644
index ada1346ee..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1301.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1301.java
deleted file mode 100644
index 92a20c735..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1302.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1302.java
deleted file mode 100644
index 63acd565a..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1305.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1305.java
deleted file mode 100644
index 1c7976f5a..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1306.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1306.java
deleted file mode 100644
index 13e40ed3d..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1307.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1307.java
deleted file mode 100644
index f66dd616c..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1308.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1308.java
deleted file mode 100644
index ecc0a6fce..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1309.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1309.java
deleted file mode 100644
index fb3b6a4ba..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1316.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1316.java
deleted file mode 100644
index f84182f1b..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1318.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1318.java
deleted file mode 100644
index a180801bd..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1600.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1600.java
deleted file mode 100644
index e28c5b84e..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1601.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1601.java
deleted file mode 100644
index 78e7c4545..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1701.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1701.java
deleted file mode 100644
index cca1c8958..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1701.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.TestUtils;
-import org.eclipse.wst.wsi.internal.core.util.Utils;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-import com.ibm.wsdl.util.xml.DOM2Writer;
-
-
-/**
- * BP1701.
- */
-public class BP1701 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP1701(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    if (this.validator.isOneWayResponse(entryContext))
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    else
-    {
-      try
-      {
-        // TEMP: Use local copy of schema for now
-        // Document doc = XMLUtils.parseXML(entryContext.getLogEntry().getMessage(), WSIConstants.NS_URI_SOAP);
-        // Document doc = XMLUtils.parseXML(entryContext.getLogEntry().getMessage(), "schemas/soapEnvelope.xsd");
-
-        // Get a non-validated but (well-formed) DOM tree of the message content
-        Document doc =
-          XMLUtils.parseXML(entryContext.getMessageEntry().getMessage());
-
-        // Remove any xsi:types attributes from the message (SOAP Header, Body and Envelope itself)
-
-        NodeList elementList = doc.getElementsByTagName("*");
-        if (elementList != null)
-        {
-          for (int i = 0; i < elementList.getLength(); i++)
-          {
-            Element element = (Element) elementList.item(i);
-            element.removeAttributeNS(WSIConstants.NS_URI_XSI, "type");
-          }
-        }
-
-        // Write out the (potentially) modified tree to String
-        String filteredMessage = DOM2Writer.nodeToString(doc);
-
-        // Parse the result with validation "on"
-        XMLUtils.parseXML(
-          filteredMessage,
-          TestUtils.getSOAPSchemaLocation());
-      }
-      catch (WSIException e)
-      {
-        if (e.getTargetException() instanceof SAXException)
-        {
-          result = AssertionResult.RESULT_FAILED;
-          failureDetail =
-            this.validator.createFailureDetail(
-              Utils.getExceptionDetails(e.getTargetException()),
-              entryContext);
-        }
-      }
-      catch (Exception e)
-      {
-        result = AssertionResult.RESULT_FAILED;
-        failureDetail =
-          this.validator.createFailureDetail(Utils.getExceptionDetails(e), entryContext);
-      }
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1755.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1755.java
deleted file mode 100644
index 7b83ee2dc..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP4100.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP4100.java
deleted file mode 100644
index fe09c0002..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP4101.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP4101.java
deleted file mode 100644
index afd93f3f4..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP4102.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP4102.java
deleted file mode 100644
index 1be179229..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP4109.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP4109.java
deleted file mode 100644
index 92f8d1d37..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/EnvelopeValidatorImpl.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/EnvelopeValidatorImpl.java
deleted file mode 100644
index be2014cb0..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/SSBP1601.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/SSBP1601.java
deleted file mode 100644
index 919d35aca..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/SSBP9704.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/SSBP9704.java
deleted file mode 100644
index ac5526f31..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1003.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1003.java
deleted file mode 100644
index 53ff37299..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1902.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1902.java
deleted file mode 100644
index bd900e6f9..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1915.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1915.java
deleted file mode 100644
index e85297608..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1917.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1917.java
deleted file mode 100644
index 012d0d6f7..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1925.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1925.java
deleted file mode 100644
index b01a2b855..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1925.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import java.util.List;
-
-import javax.wsdl.BindingOperation;
-import javax.wsdl.extensions.mime.MIMEMultipartRelated;
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionNotApplicableException;
-import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.HTTPConstants;
-import org.eclipse.wst.wsi.internal.core.util.HTTPUtils;
-
-/**
- * AP1925
- *
- * <context>For a candidate message</context>
- * <assertionDescription>If the WSDL description lists at least one non-root
- * MIME part, then the corresponding message has a Content-Type HTTP header
- * field-value with a media-type of "multipart/related.</assertionDescription>
- */
-public class AP1925 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public AP1925(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /* Validates the test assertion.
-  * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    try
-    {
-      BindingOperation bindingOperation = validator.getOperationMatch(
-          entryContext.getEntry().getEntryType(),
-          entryContext.getMessageEntryDocument());
-  
-      // If there is no matched operation, the assertion is not applicable
-      if (bindingOperation == null)
-        throw new AssertionNotApplicableException();
-  
-      // Finding operation extensibility elems
-      // in the binding depending on message type
-      List extElems = null;
-      if (entryContext.getMessageEntry().getType().equals(
-        MessageEntry.TYPE_REQUEST)
-        && bindingOperation.getBindingInput() != null)
-      {
-        extElems = bindingOperation
-          .getBindingInput().getExtensibilityElements();
-      }
-      else if (entryContext.getMessageEntry().getType().equals(
-        MessageEntry.TYPE_RESPONSE)
-        && bindingOperation.getBindingOutput() != null)
-      {
-        extElems = bindingOperation
-          .getBindingOutput().getExtensibilityElements();
-      }
-      // check list on first element
-      if((extElems == null) || (extElems.size() == 0) || 
-         !(extElems.get(0) instanceof MIMEMultipartRelated))
-        throw new AssertionNotApplicableException();
-      
-      // get list mime parts from definition
-      MIMEMultipartRelated mime = (MIMEMultipartRelated) extElems.get(0);
-      List parts = mime.getMIMEParts();
-      // if parts count is more than one, than assertion is notApplicable
-      if(parts.size() <= 1)
-        throw new AssertionNotApplicableException();
-      String contentType = HTTPUtils.getHttpHeaderAttribute(
-          entryContext.getMessageEntry().getHTTPHeaders(),
-          HTTPConstants.HEADER_CONTENT_TYPE); 
-      if((contentType == null) || 
-         !contentType.equalsIgnoreCase(WSIConstants.CONTENT_TYPE_MULTIPART))
-      {
-        throw new AssertionFailException("Incorrect Content-Type value \"" +
-            contentType + "\" in HTTP header");
-      }
-    }
-    catch (AssertionNotApplicableException e)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    catch (AssertionFailException e)
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = 
-        validator.createFailureDetail(e.getMessage(), entryContext);
-    }
-    // Return assertion result
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-
-  /**
-   * Returns the part value from MIMEContent element
-   * @param part MIMEPart element
-   * @return the part value from MIMEContent element
-   */
-  //private String getMIMEContentPart(MIMEPart part) {
-  //  List list = part.getExtensibilityElements();
-  //  if(list.size() == 0)
-  //    return null;
-  //  return ((MIMEContent) list.get(0)).getPart();
-  //}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1926.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1926.java
deleted file mode 100644
index a3f24ecd9..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1931.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1931.java
deleted file mode 100644
index 01cdfc9b9..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1932.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1932.java
deleted file mode 100644
index d9c0fc722..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1933.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1933.java
deleted file mode 100644
index a4491fbb7..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1934.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1934.java
deleted file mode 100644
index 1c060516d..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1935.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1935.java
deleted file mode 100644
index 4d8fce7fc..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1936.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1936.java
deleted file mode 100644
index db8ae713f..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1942.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1942.java
deleted file mode 100644
index 5fb7973ea..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1945.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1945.java
deleted file mode 100644
index 1dbf310cb..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1946.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1946.java
deleted file mode 100644
index aaf0f1cb2..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP5100.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP5100.java
deleted file mode 100644
index 850e66029..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP5101.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP5101.java
deleted file mode 100644
index 5ba2cb9e0..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1001.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1001.java
deleted file mode 100644
index 0abcbcc13..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1002.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1002.java
deleted file mode 100644
index 7564c1569..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1004.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1004.java
deleted file mode 100644
index 8b06ae766..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1006.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1006.java
deleted file mode 100644
index b067ce09b..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1010.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1010.java
deleted file mode 100644
index faac735e3..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1101.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1101.java
deleted file mode 100644
index baecac158..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1103.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1103.java
deleted file mode 100644
index 900938f1f..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1104.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1104.java
deleted file mode 100644
index 4fcdbd756..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1116.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1116.java
deleted file mode 100644
index 250f84f2b..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP4103.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP4103.java
deleted file mode 100644
index e63a5cf14..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP4104.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP4104.java
deleted file mode 100644
index 36d0cf961..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP4105.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP4105.java
deleted file mode 100644
index d14f77888..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP4106.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP4106.java
deleted file mode 100644
index a278633b0..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP4107.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP4107.java
deleted file mode 100644
index e699a3320..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/MessageValidatorImpl.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/MessageValidatorImpl.java
deleted file mode 100644
index 015bff2a2..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/SSBP1003.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/SSBP1003.java
deleted file mode 100644
index 461eae6c4..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/SSBP5100.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/SSBP5100.java
deleted file mode 100644
index f62152a45..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/SSBP5101.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/SSBP5101.java
deleted file mode 100644
index 82ae52074..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1001.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1001.java
deleted file mode 100644
index 53066b547..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1002.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1002.java
deleted file mode 100644
index cb4308bf4..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1003.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1003.java
deleted file mode 100644
index 7d041049f..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1004.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1004.java
deleted file mode 100644
index adfad8642..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1005.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1005.java
deleted file mode 100644
index f31c00676..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1006.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1006.java
deleted file mode 100644
index 72d6f8824..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1007.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1007.java
deleted file mode 100644
index 9385aaaa8..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1008.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1008.java
deleted file mode 100644
index 92cd0eeab..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1009.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1009.java
deleted file mode 100644
index 5b68ebe20..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1010.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1010.java
deleted file mode 100644
index 022d98692..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1011.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1011.java
deleted file mode 100644
index cadcdcb4a..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1012.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1012.java
deleted file mode 100644
index 57f571be1..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1013.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1013.java
deleted file mode 100644
index 587e597bf..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1031.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1031.java
deleted file mode 100644
index dcd391783..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1100.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1100.java
deleted file mode 100644
index 4c20a04cd..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1101.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1101.java
deleted file mode 100644
index cbb113c82..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1102.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1102.java
deleted file mode 100644
index f13832dca..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1103.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1103.java
deleted file mode 100644
index 624652944..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1104.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1104.java
deleted file mode 100644
index 422e46dda..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1105.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1105.java
deleted file mode 100644
index 4d1a3bc26..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1107.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1107.java
deleted file mode 100644
index f1913e586..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1108.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1108.java
deleted file mode 100644
index a5236e6d7..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1109.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1109.java
deleted file mode 100644
index 8bf44cf63..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1110.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1110.java
deleted file mode 100644
index 8b3b9e247..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1111.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1111.java
deleted file mode 100644
index b84e3fb79..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1116.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1116.java
deleted file mode 100644
index f289dd6c9..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1121.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1121.java
deleted file mode 100644
index 3b3ebae6b..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1201.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1201.java
deleted file mode 100644
index 0c6f087ce..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1202.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1202.java
deleted file mode 100644
index 7a31cd6cc..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1203.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1203.java
deleted file mode 100644
index 363bcbf52..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1204.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1204.java
deleted file mode 100644
index 16dda543b..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1208.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1208.java
deleted file mode 100644
index 7b9496314..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1211.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1211.java
deleted file mode 100644
index 63f57c5fd..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1301.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1301.java
deleted file mode 100644
index 9f0eb82b0..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1302.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1302.java
deleted file mode 100644
index 6e976fe35..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1305.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1305.java
deleted file mode 100644
index bb2e13acb..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1306.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1306.java
deleted file mode 100644
index b610628b7..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1307.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1307.java
deleted file mode 100644
index 8c705a85a..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1308.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1308.java
deleted file mode 100644
index e2271cf89..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1309.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1309.java
deleted file mode 100644
index ee6435731..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1311.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1311.java
deleted file mode 100644
index ea98faa07..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1316.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1316.java
deleted file mode 100644
index 3fd3168c8..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1318.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1318.java
deleted file mode 100644
index ea3cd9935..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1601.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1601.java
deleted file mode 100644
index f5920f7a6..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1701.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1701.java
deleted file mode 100644
index 8a7befb96..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4100.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4100.java
deleted file mode 100644
index 81c1a1071..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4101.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4101.java
deleted file mode 100644
index 950165aa2..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4102.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4102.java
deleted file mode 100644
index d25ffafbc..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4103.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4103.java
deleted file mode 100644
index 6a61d048c..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4104.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4104.java
deleted file mode 100644
index a6176d2b0..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4105.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4105.java
deleted file mode 100644
index c6ff8d0ea..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4106.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4106.java
deleted file mode 100644
index 97a44aef8..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4107.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4107.java
deleted file mode 100644
index 4ad524265..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/BP3001.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/BP3001.java
deleted file mode 100644
index b206cd03d..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/BP3002.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/BP3002.java
deleted file mode 100644
index 572cde4cd..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/BP3003.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/BP3003.java
deleted file mode 100644
index c0e04f04b..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/UDDIValidatorImpl.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/UDDIValidatorImpl.java
deleted file mode 100644
index 0ffdce883..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/UDDIValidatorImpl.java
+++ /dev/null
@@ -1,590 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.uddi;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.UnknownHostException;
-import java.util.Iterator;
-import java.util.Vector;
-
-import javax.wsdl.Binding;
-import javax.wsdl.WSDLException;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AnalyzerContext;
-import org.eclipse.wst.wsi.internal.core.analyzer.ServiceReference;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.UDDIReference;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLElement;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.impl.WSDLElementImpl;
-import org.eclipse.wst.wsi.internal.core.profile.ProfileArtifact;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.UDDIValidator;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseValidatorImpl;
-import org.eclipse.wst.wsi.internal.core.report.Entry;
-import org.eclipse.wst.wsi.internal.core.report.ReportArtifact;
-import org.eclipse.wst.wsi.internal.core.report.Reporter;
-import org.eclipse.wst.wsi.internal.core.util.EntryType;
-import org.eclipse.wst.wsi.internal.core.util.UDDIUtils;
-import org.eclipse.wst.wsi.internal.core.wsdl.WSDLDocument;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.binding.BindingTemplate;
-import org.uddi4j.datatype.binding.TModelInstanceInfo;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.response.BindingDetail;
-import org.uddi4j.response.TModelDetail;
-import org.uddi4j.util.CategoryBag;
-import org.uddi4j.util.KeyedReference;
-
-import com.ibm.wsdl.util.StringUtils;
-
-/**
- * The UDDI validator will verify that a web service description was published correctly in a UDDI registry.
- *
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public class UDDIValidatorImpl
-  extends BaseValidatorImpl
-  implements UDDIValidator
-{
-  /**
-   * UDDI reference.
-   */
-  protected UDDIReference uddiReference;
-  /**
-   * UDDI proxy.
-   */
-  protected UDDIProxy uddiProxy;
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.validator.UDDIValidator#init(org.eclipse.wst.wsi.internal.core.analyzer.AnalyzerContext, org.wsi.test.profile.ProfileArtifact, org.wsi.test.report.ReportArtifact, org.wsi.test.analyzer.config.UDDIReference, org.wsi.test.report.Reporter)
-   */
-  public void init(
-    AnalyzerContext analyzerContext,
-    ProfileArtifact profileArtifact,
-    ReportArtifact reportArtifact,
-    UDDIReference uddiReference,
-    Reporter reporter)
-    throws WSIException
-  {
-    // BaseValidatorImpl
-    super.init(analyzerContext, profileArtifact, reportArtifact, reporter);
-
-    // Save input references
-    this.uddiReference = uddiReference;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.validator.UDDIValidator#validate()
-   */
-  public String validate() throws WSIException
-  {
-    String wsdlURL = null;
-    Entry entry = null;
-
-    BindingTemplate bindingTemplate = null;
-    TModel tModel = null;
-
-    // it depricated after refactoring 
-    // now the inner classes moved out from validator
-    //String classPrefix = this.getClass().getName() + "$";
-    String classPrefix = this.getClass().getPackage().getName()+".";
-
-    try
-    {
-      // Set up a reference to the UDDI registry
-      uddiProxy = new UDDIProxy();
-
-      //new Socket(new InetAddress(uddiReference.getInquiryURL()));
-      uddiProxy.setInquiryURL(uddiReference.getInquiryURL());
-      boolean wasEx = false;
-      InputStream stream;
-      try
-      {
-        URL url = StringUtils.getURL(null, uddiReference.getInquiryURL());
-        stream = url.openStream();
-        stream.close();
-      }
-
-      catch (UnknownHostException ex)
-      {
-        wasEx = true;
-      }
-
-      catch (IOException ex)
-      {
-      }
-
-      if (!wasEx)
-      {
-
-        // If the UDDI reference is to a bindingTemplate then get it
-        if (uddiReference.getKeyType().equals(UDDIReference.BINDING_KEY))
-        {
-          // Get binding detail which will contain the bindingTemplate
-          BindingDetail bindingDetail =
-            uddiProxy.get_bindingDetail(uddiReference.getKey());
-
-          // Get bindingTemplate
-          bindingTemplate =
-            (BindingTemplate) bindingDetail
-              .getBindingTemplateVector()
-              .elementAt(
-              0);
-
-          if (verboseOption)
-          {
-            System.err.println(
-              "    BindingTemplate - "
-                + UDDIUtils.bindingTemplateToString(bindingTemplate));
-          }
-
-          // Get the wsdlSpec tModel
-          tModel = findTModel(uddiProxy, bindingTemplate);
-        }
-
-        // Else it has to be a tModel
-        else
-        {
-          TModelDetail tModelDetail =
-            uddiProxy.get_tModelDetail(uddiReference.getKey());
-          tModel = (TModel) tModelDetail.getTModelVector().elementAt(0);
-        }
-
-        if (verboseOption)
-        {
-          System.err.println(
-            "    TModel specified or found in bindingTemplate - "
-              + UDDIUtils.tModelToString(tModel));
-        }
-      }
-
-      if (bindingTemplate == null)
-      {
-        setMissingInput(
-          EntryType.getEntryType(EntryType.TYPE_DISCOVERY_BINDINGTEMPLATE));
-      }
-
-      // If there is a bindingTemplate, then process test assertions for it
-      else
-      {
-        // Create entry
-        entry = this.reporter.getReport().createEntry();
-        entry.setEntryType(
-          EntryType.getEntryType(EntryType.TYPE_DISCOVERY_BINDINGTEMPLATE));
-        entry.setReferenceID(bindingTemplate.getBindingKey());
-        entry.setEntryDetail(bindingTemplate);
-
-        // Process test assertions
-        processAssertions(
-          classPrefix,
-          new EntryContext(entry, this.analyzerContext));
-      }
-
-      // NOTE: From this point forward, if a bindingTemplate does NOT have a wsdlSpec tModel,
-      //       the tModel will be NULL.
-
-      //Parse WSDL document, and get WSDL document url, binding name and namespace
-      try
-      {
-        String overviewURL = getOverviewURL(tModel);
-        wsdlURL = getWSDLLocation(overviewURL);
-        WSDLDocument wsdlDocument = getWSDLDocument(wsdlURL);
-
-        // ADD: The WSDL binding is used in WSI3001 and should be moved to the entryContext
-        getBinding(overviewURL, wsdlDocument);
-      }
-
-      catch (Exception e)
-      {
-        // ADD:
-        if (verboseOption)
-        {
-          System.err.println("    EXCEPTION: " + e.toString());
-        }
-      }
-
-      // Create entry
-      entry = this.reporter.getReport().createEntry();
-      entry.setEntryType(
-        EntryType.getEntryType(EntryType.TYPE_DISCOVERY_TMODEL));
-      entry.setReferenceID(
-        (tModel == null ? "[tModel]" : tModel.getTModelKey()));
-      entry.setEntryDetail(tModel);
-
-      // Process test assertions
-      processAssertions(
-        classPrefix,
-        new EntryContext(entry, this.analyzerContext));
-    }
-
-    catch (Exception e)
-    {
-      // Throw WSIException
-      if (e instanceof WSIException)
-        throw (WSIException) e;
-      else
-        throw new WSIException(
-          "An exception occurred while processing the discovery test assertions.",
-          e);
-    }
-
-    // Cleanup
-    cleanup();
-
-    // Get WSDL location
-    wsdlURL = this.analyzerContext.getServiceReference().getWSDLLocation();
-
-    // Return WSDL URL
-    return wsdlURL;
-  }
-
-  /**
-   * Set WSDL binding in the service reference portion of the analyzer context.
-   */
-  protected void setWSDLBinding(Binding binding)
-  {
-    String bindingName =
-      binding == null ? null : binding.getQName().getLocalPart();
-    String namespace =
-      binding == null ? null : binding.getQName().getNamespaceURI();
-
-    // Set the WSDL document location in analyzerContext
-    ServiceReference serviceReference =
-      this.analyzerContext.getServiceReference();
-
-    // If the wsdlElement does not exist, then set it
-    WSDLElement wsdlElement;
-    if ((wsdlElement = serviceReference.getWSDLElement()) == null)
-    {
-      // Get the WSDL binding from the overviewURL and set in analyzerContext
-      wsdlElement = new WSDLElementImpl();
-      wsdlElement.setName(bindingName);
-      wsdlElement.setNamespace(namespace);
-      wsdlElement.setType(EntryType.TYPE_DESCRIPTION_BINDING);
-    }
-
-    // Set the wsdlElement in the service reference
-    serviceReference.setWSDLElement(wsdlElement);
-
-    // Set the service reference back into the analyzerContext
-    analyzerContext.setServiceReference(serviceReference);
-  }
-
-  /**
-   * Set the WSDL location in the service reference portion of the analyzer context.
-   */
-  protected void setWSDLLocation(String wsdlURL)
-  {
-    // Set the WSDL document location in analyzerContext
-    ServiceReference serviceReference =
-      this.analyzerContext.getServiceReference();
-    serviceReference.setWSDLLocation(wsdlURL);
-
-    // Set the service reference back into the analyzerContext
-    analyzerContext.setServiceReference(serviceReference);
-  }
-
-  /**
-   * Find the wsdlSpec tModel associated with a binding.
-   */
-  private TModel findTModel(
-    UDDIProxy uddiProxy,
-    BindingTemplate bindingTemplate)
-    throws WSIException
-  {
-    TModel tModel = null;
-
-    // Get the list of tModel references associated with this bindingTemplate
-    Iterator iterator =
-      bindingTemplate
-        .getTModelInstanceDetails()
-        .getTModelInstanceInfoVector()
-        .iterator();
-
-    // Process each tModel reference
-    Vector tModelKeyList = new Vector();
-    while (iterator.hasNext())
-    {
-      // Get tModelInstanceInfo
-      TModelInstanceInfo tModelInstanceInfo =
-        (TModelInstanceInfo) iterator.next();
-
-      // Add key to list
-      tModelKeyList.add(tModelInstanceInfo.getTModelKey());
-    }
-
-    // Get the tModels associated with the bindingTemplate
-    if (tModelKeyList.size() > 0)
-    {
-      try
-      {
-        // Get the tModel details
-        TModelDetail tModelDetail = uddiProxy.get_tModelDetail(tModelKeyList);
-
-        // Get the list of tModels
-        Iterator tModelIterator = tModelDetail.getTModelVector().iterator();
-
-        //boolean tModelFound = false;
-        TModel nextTModel = null;
-
-        // Go through the list of tModels
-        while ((tModelIterator.hasNext()) && (tModel == null))
-        {
-          // Get next tModel in list
-          nextTModel = (TModel) tModelIterator.next();
-
-          if (verboseOption)
-          {
-            System.err.println(
-              "      TModel referenced from bindingTemplate - "
-                + UDDIUtils.tModelToString(nextTModel));
-          }
-
-          // If this is a wsdlSpec tModel, then this is the tModel we want
-          if (isWsdlSpec(nextTModel))
-            tModel = nextTModel;
-        }
-      }
-
-      catch (Exception e)
-      {
-        // Throw WSIException
-        throw new WSIException("Could not get tModel details.", e);
-      }
-    }
-
-    else
-    {
-      // Throw exception
-      //throw new WSIException("UDDI bindingTemplate did not contain any tModel references.");
-    }
-
-    return tModel;
-  }
-
-  /**
-   * Determine if this is a wsdlSpec tModel.
-   */
-  protected boolean isWsdlSpec(TModel tModel)
-  {
-    boolean tModelFound = false;
-    CategoryBag categoryBag = null;
-    Iterator categoryBagIterator = null;
-
-    // Determine if the catetgoryBag contains wsdlSpec
-    if ((categoryBag = tModel.getCategoryBag()) != null)
-    {
-      // Get the list of keyed references
-      categoryBagIterator = categoryBag.getKeyedReferenceVector().iterator();
-
-      KeyedReference keyedReference = null;
-
-      // Go through the list of keyed references
-      while (categoryBagIterator.hasNext() && !(tModelFound))
-      {
-        // Get next keyed reference
-        keyedReference = (KeyedReference) categoryBagIterator.next();
-
-        // If this is a types taxonomy tModel and the value is wsdlSpec, then this is the tModel we want
-        // REMOVE: It is not necessary to check the key name
-        //if (keyedReference.getTModelKey().equalsIgnoreCase(TModel.TYPES_TMODEL_KEY) &&
-        //   "wsdlSpec".equals(keyedReference.getKeyValue()) &&
-        //   ("types".equals(keyedReference.getKeyName()) ||
-        //    "uddi-org:types".equals(keyedReference.getKeyName()))) {
-        //  tModelFound = true;
-        //}
-        if (keyedReference
-          .getTModelKey()
-          .equalsIgnoreCase(TModel.TYPES_TMODEL_KEY)
-          && "wsdlSpec".equals(keyedReference.getKeyValue()))
-        {
-          tModelFound = true;
-        }
-      }
-    }
-
-    return tModelFound;
-  }
-
-  /**
-   * Get an OverviewURL from tModel.
-   */
-  protected String getOverviewURL(TModel tModel)
-  {
-    if (tModel != null
-      && tModel.getOverviewDoc() != null
-      && tModel.getOverviewDoc().getOverviewURL() != null)
-    {
-      return tModel.getOverviewDoc().getOverviewURL().getText();
-    }
-    return null;
-  }
-
-  /**
-   * Get WSDL document.
-   */
-  protected String getWSDLLocation(String wsdlLocation)
-  {
-    int index;
-
-    // Check if the overviewURL contains a fragment identifier
-    if ((index = wsdlLocation.indexOf("#")) > -1)
-    {
-      wsdlLocation = wsdlLocation.substring(0, index);
-    }
-    return wsdlLocation;
-  }
-
-  /**
-   * Get WSDL document.
-   */
-  protected WSDLDocument getWSDLDocument(String wsdlLocation)
-    throws MalformedURLException, WSDLException
-  {
-    return new WSDLDocument(getWSDLLocation(wsdlLocation));
-  }
-
-  /**
-   * Get WSDL binding from the overviewURL in the tModel.
-   */
-  protected Binding getBinding(String overviewURL, WSDLDocument wsdlDocument)
-  {
-    int index;
-    int nameIndex;
-
-    Binding[] bindings = wsdlDocument.getBindings();
-    if (bindings == null || bindings.length == 0)
-      return null;
-
-    if (overviewURL != null)
-    {
-      // Check if the overviewURL contains a fragment identifier
-      if ((index = overviewURL.indexOf("#")) > -1)
-      {
-        // TEMP: Need to use a real XPath evaluator like Xalan
-        String nameAttribute = "@name=";
-
-        // Locate name reference
-        if ((nameIndex =
-          overviewURL.substring(index + 1).indexOf(nameAttribute))
-          > -1)
-        {
-          // Get the next character which should be a quote
-          int firstQuoteIndex = index + 1 + nameIndex + nameAttribute.length();
-          String quote =
-            overviewURL.substring(firstQuoteIndex, firstQuoteIndex + 1);
-
-          // Get the part of the URL which should contain the binding name
-          String urlPart = overviewURL.substring(firstQuoteIndex + 1);
-
-          // Find the next quote
-          int nextQuoteIndex;
-          if ((nextQuoteIndex = urlPart.indexOf(quote)) > -1)
-          {
-            String bindingName = urlPart.substring(0, nextQuoteIndex);
-            //look for binding with the specified name
-            for (int i = 0; i < bindings.length; i++)
-            {
-              if (bindingName.equals(bindings[i].getQName().getLocalPart()))
-                return bindings[i];
-            }
-          }
-        }
-      }
-    }
-
-    return bindings[0];
-  }
-
-  /**
-   * Get string representation of categoryBag.
-   * @param categoryBag a CategoryBag object.
-   * @return string representation of categoryBag.
-   */
-  protected String categoryBagToString(CategoryBag categoryBag)
-  {
-    String toString = "";
-
-    if (categoryBag != null)
-    {
-      Vector keyedReferenceList = null;
-      if (((keyedReferenceList = categoryBag.getKeyedReferenceVector())
-        == null)
-        || (keyedReferenceList.size() == 0))
-      {
-        toString += "No KeyedReferences";
-      }
-
-      else
-      {
-        int count = 1;
-        KeyedReference keyedReference;
-        Iterator iterator = keyedReferenceList.iterator();
-        while (iterator.hasNext())
-        {
-          keyedReference = (KeyedReference) iterator.next();
-          toString += "\n  ["
-            + count++
-            + "] tModelKey: "
-            + keyedReference.getTModelKey()
-            + ", keyName: "
-            + keyedReference.getKeyName()
-            + ", keyValue: "
-            + keyedReference.getKeyValue();
-        }
-      }
-    }
-    else
-    {
-      toString = "null";
-    }
-
-    return toString;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl#isPrimaryEntryTypeMatch(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-   */
-  protected boolean isPrimaryEntryTypeMatch(
-    TestAssertion testAssertion,
-    EntryContext targetContext)
-  {
-    boolean match = false;
-
-    // If the test assertion entry type matches the target context entry type, then contine
-    if (testAssertion
-      .getEntryTypeName()
-      .equals(targetContext.getEntry().getEntryType().getTypeName()))
-    {
-      match = true;
-    }
-
-    return match;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl#isNotApplicable(org.wsi.test.profile.TestAssertion)
-   */
-  protected boolean isNotApplicable(TestAssertion testAssertion)
-  {
-    boolean notApplicable = false;
-
-    // ADD:
-
-    return notApplicable;
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3001.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3001.java
deleted file mode 100644
index de684b032..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3002.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3002.java
deleted file mode 100644
index c08dd2e9c..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3003.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3003.java
deleted file mode 100644
index deb0176b3..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3004.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3004.java
deleted file mode 100644
index 065480e3d..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3005_OBSOLETE.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3005_OBSOLETE.java
deleted file mode 100644
index fc6f5a47b..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3006.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3006.java
deleted file mode 100644
index aa8c00318..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3007.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3007.java
deleted file mode 100644
index 06674dd9b..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3007.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.uddi;
-
-import java.util.Vector;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.UDDIUtils;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.binding.BindingTemplate;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.util.CategoryBag;
-import org.uddi4j.util.KeyedReference;
-
-
-/**
- * WSI3007 - A uddi:businessEntity or uddi:businessService associated
- * with this uddi:bindingTemplate is not categorized using
- * the ws-i-org:conformsTo:2002_12 taxonomy.
- */
-public class WSI3007 extends AssertionProcess
-{
-  private final UDDIValidatorImpl validator;
-
-  /**
-   * @param UDDIValidatorImpl
-   */
-  public WSI3007(UDDIValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /**
-   * Validates the test assertion.
-   * @see org.eclipse.wst.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    result = AssertionResult.RESULT_PASSED;
-
-    // Get the bindingTemplate from the entryContext
-    BindingTemplate bindingTemplate =
-      (BindingTemplate) entryContext.getEntry().getEntryDetail();
-
-    boolean validService = false;
-    boolean validBusiness = false;
-
-    String serviceKey = null;
-    String businessKey = null;
-    try
-    {
-      serviceKey = bindingTemplate.getServiceKey();
-      BusinessService service =
-        UDDIUtils.getBusinessServiceByKey(this.validator.uddiProxy, serviceKey);
-
-      businessKey = service.getBusinessKey();
-      BusinessEntity business =
-        UDDIUtils.getBusinessByKey(this.validator.uddiProxy, businessKey);
-
-      validService = checkCategoryBag(this.validator.uddiProxy, service.getCategoryBag());
-      validBusiness = checkCategoryBag(this.validator.uddiProxy, business.getCategoryBag());
-
-      if (!validBusiness || !validService)
-      {
-        result = AssertionResult.RESULT_FAILED;
-
-        if (!validBusiness)
-        {
-          failureDetailMessage =
-            "The businessEntity key is: [" + businessKey + "].";
-        }
-
-        if (!validService)
-        {
-          if (!validBusiness)
-            failureDetailMessage += " ";
-          else
-            failureDetailMessage = "";
-
-          failureDetailMessage += "The businessService key is: ["
-            + serviceKey
-            + "].";
-        }
-      }
-    }
-    catch (IllegalStateException e)
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetailMessage =
-        "The UDDI registry does not contain WSI conformance taxonomy"
-          + " tModel (\"ws-i-org:conformsTo:2002_12\").";
-    }
-    catch (Throwable e)
-    {
-      throw new WSIException(
-        "An exception occurred while processing the discovery test assertions.",
-        e);
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetailMessage);
-  }
-
-  /**
-   * Checks whether the category bag contains the conformance claim.
-   * Returns <b>true</b> if the bag does not contain the conformance claim.
-   * @param proxy
-   * @param bag
-   * @return boolean
-   */
-  private boolean checkCategoryBag(UDDIProxy proxy, CategoryBag bag)
-  {
-    String conformanceKey = null;
-    try
-    {
-      conformanceKey = UDDIUtils.getWSIConformanceTModelKey(proxy);
-    }
-    catch (IllegalStateException ex)
-    {
-      return false;
-    }
-
-    boolean result = true;
-
-    if (bag != null)
-    {
-      Vector references = bag.getKeyedReferenceVector();
-      for (int i = 0; i < references.size() && result; i++)
-      {
-        KeyedReference ref = (KeyedReference) references.get(i);
-
-        result = !ref.getTModelKey().equalsIgnoreCase(conformanceKey);
-      }
-    }
-
-    return result;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3021.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3021.java
deleted file mode 100644
index 085352d2f..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2901.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2901.java
deleted file mode 100644
index 42e561f7f..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2903.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2903.java
deleted file mode 100644
index 02bc31357..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2904.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2904.java
deleted file mode 100644
index c5a9716e3..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2904.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-
-/**
- * AP2904
- * <context>For a candidate wsdl:binding with at least one mime:content element</context>
- * <assertionDescription>The part attribute of each mime:content element in a wsdl:binding
- * does not reference a sub-component of a wsdl:part of the wsdl:message that is present in the
- * respective wsdl:input or wsdl:output of the corresponding wsdl:operation of the corresponding
- * wsdl:portType.</assertionDescription>
- */
-public class AP2904 extends AP2903
-{
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public AP2904(WSDLValidatorImpl impl)
-  {
-    super(impl);
-  }
-
-  /* Validates the test assertion.
-  * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    // Return assertion result
-    return super.validate(testAssertion, entryContext);
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2906.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2906.java
deleted file mode 100644
index 2c9c7cd72..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2907.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2907.java
deleted file mode 100644
index 494445f6c..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2908.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2908.java
deleted file mode 100644
index 5208c8af3..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2909.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2909.java
deleted file mode 100644
index 86681ba50..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2910.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2910.java
deleted file mode 100644
index a42d335d3..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2911.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2911.java
deleted file mode 100644
index 943383bea..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2930.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2930.java
deleted file mode 100644
index 01734f8ba..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2940.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2940.java
deleted file mode 100644
index 6392a1d40..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2941.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2941.java
deleted file mode 100644
index bb3a7a3ab..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2944.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2944.java
deleted file mode 100644
index ca93a7bfd..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2946.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2946.java
deleted file mode 100644
index 4555739d3..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2010.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2010.java
deleted file mode 100644
index e15193eb6..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2011.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2011.java
deleted file mode 100644
index 2d5fd1847..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2011.java
+++ /dev/null
@@ -1,341 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import java.io.FileInputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Types;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.UnknownExtensibilityElement;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.ErrorList;
-import org.eclipse.wst.wsi.internal.core.util.StringTokenizer;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-/**
- * BP2011.
- * The imported XML schema is a well-formed XML 1.0 document and if it contains an 
- * XML declaration, it is version 1.0. 
- *
- * @version 1.0.1 27.06.2003
- * @author Vitali Fedosenko
-**/
-public class BP2011 extends AssertionProcess implements WSITag
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2011(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  private ErrorList errors = new ErrorList();
-
-  private final char[] OMMITED_XML_DECLARATION_DELIMITERS =
-    new char[] { 0x20, 0x9, 0xD, 0xA, '\'', '\"' };
-  private final char[] XML_DECLARATION_DELIMITERS = new char[] { '=' };
-  private final String VERSION_TOKEN = "version";
-  private final String VERSION = "1.0";
-
-  /* Validates the test assertion.
-   * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    result = result = AssertionResult.RESULT_NOT_APPLICABLE;
-
-    //Definition def = (Definition) entryContext.getEntry().getEntryDetail();
-    Types types = (Types) entryContext.getEntry().getEntryDetail();
-
-    List exts = null;
-    //if (def.getTypes()!=null)
-    if (types != null)
-    {
-      exts = types.getExtensibilityElements();
-    }
-    if (exts != null)
-    {
-      Definition definition = null;
-      if ((definition =
-        validator.analyzerContext.getCandidateInfo().getDefinition(types))
-        == null)
-      {
-        throw new WSIException("Could not find types definition in any WSDL document.");
-      }
-
-      Iterator it = exts.iterator();
-      while (it.hasNext())
-      {
-        ExtensibilityElement el = (ExtensibilityElement) it.next();
-        if (el instanceof UnknownExtensibilityElement)
-          searchForSchema(((UnknownExtensibilityElement) el).getElement(),
-              definition.getDocumentBaseURI());
-      }
-    }
-
-    if (!errors.isEmpty())
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = this.validator.createFailureDetail(errors.toString(), entryContext);
-    } /*else
-         			result = AssertionResult.RESULT_PASSED;*/
-
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-
-  /* Search xsd schema or xsd import from node. If node is xsd import it's loading schema.
-   * @param n - UnknownExtencibilityElement
-  */
-  private void searchForSchema(Node n, String context)
-  {
-    while (n != null)
-    {
-      // searches for xsd:import element
-      if (Node.ELEMENT_NODE == n.getNodeType())
-      {
-        // if xsd:schema element is found -> process schema
-        if (XMLUtils.equals(n, ELEM_XSD_SCHEMA))
-          processSchema(n, context);
-        else
-          // if xsd:import element is found -> load schema and process schema
-          // FIXED: if xsd:import is found and parent element is xsd:schema
-          if (XMLUtils.equals(n, ELEM_XSD_IMPORT)
-            && XMLUtils.equals(n.getParentNode(), ELEM_XSD_SCHEMA))
-            loadSchema(n, context);
-          else
-            // else iterate element recursively
-            searchForSchema(n.getFirstChild(), context);
-      }
-      n = n.getNextSibling();
-    }
-  }
-
-  /*
-   * It loads xsd schema and then check the version 1.0 and looking for xsd:schema element for next process.
-   * @param importNode xsd schema
-  */
-  private void loadSchema(Node importNode, String context)
-  {
-    Element im = (Element) importNode;
-    Attr schemaLocation = XMLUtils.getAttribute(im, ATTR_XSD_SCHEMALOCATION);
-    // try to parse imported XSD
-    if (schemaLocation != null && schemaLocation.getValue() != null)
-    {
-      try
-      {
-        // if any error or root element is not XSD schema -> error
-        String decl =
-          readXMLDeclarationStatement(schemaLocation.getValue(), context);
-        if (!validVersion(decl))
-        {
-          Attr a = XMLUtils.getAttribute(im, ATTR_XSD_NAMESPACE);
-          errors.add((a != null) ? a.getValue() : "");
-        }
-        Document schema =
-          validator.parseXMLDocumentURL(schemaLocation.getValue(), context);
-        if (XMLUtils.equals(schema.getDocumentElement(), ELEM_XSD_SCHEMA))
-        {
-          processSchema(schema.getDocumentElement(),
-            XMLUtils.createURLString(schemaLocation.getValue(), context));
-        }
-        result = AssertionResult.RESULT_PASSED;
-      }
-      catch (Throwable t)
-      {
-      }
-    }
-    // else if there is only the namespace attribute, the import relates to inline schema
-    else if (XMLUtils.getAttribute(im, ATTR_XSD_NAMESPACE) != null)
-    {
-      result = AssertionResult.RESULT_PASSED;
-    }
-  }
-
-  /**
-  * Reads an XML declaration statement.
-  * @param location
-  * @return String
-  */
-  private String readXMLDeclarationStatement(String location, String baseURI)
-  {
-    String result = null;
-    try
-    {
-      new URL(location);
-    }
-    catch (Throwable t)
-    {
-      // nothing
-      int i = baseURI.lastIndexOf('/');
-      int j = baseURI.lastIndexOf('\\');
-      if (j > i)
-        i = j;
-      location = baseURI.substring(0, i + 1) + location;
-    }
-
-    if (location != null)
-    {
-      URL url = null;
-      Reader reader = null;
-
-      try
-      {
-        try
-        {
-          url = new URL(location);
-        }
-        catch (MalformedURLException e)
-        {
-          // we should try to access location as file
-        }
-
-        if (url != null)
-        {
-          reader = new InputStreamReader(url.openStream());
-        }
-        else
-        {
-          reader = new InputStreamReader(new FileInputStream(location));
-        }
-
-        int charCode;
-        boolean end = false;
-        if (reader.ready())
-        {
-          charCode = reader.read();
-
-          while (reader.ready() && !(charCode == '<'))
-          {
-            charCode = reader.read();
-          }
-
-          StringBuffer buf = new StringBuffer();
-          if (charCode == '<')
-          {
-            buf.append((char) charCode);
-            while (reader.ready() && !end)
-            {
-              charCode = reader.read();
-              buf.append((char) charCode);
-
-              end = charCode == '>';
-            }
-          }
-          else
-          {
-            // NOTE: This result does not get propogated back!
-            result = AssertionResult.RESULT_FAILED;
-            failureDetailMessage =
-              "Cannot read the XML declaration statement.";
-          }
-
-          result = buf.toString();
-        }
-      }
-      catch (Exception e)
-      {
-      }
-      finally
-      {
-        if (reader != null)
-        {
-          try
-          {
-            reader.close();
-          }
-          catch (Throwable e)
-          {
-          }
-        }
-      }
-    }
-
-    return result;
-  }
-
-  /*
-   * @param xmlDecl - xml declaration
-   * @return if xml declaration contains version="1.0" it retirns true. 
-  */
-  private boolean validVersion(String xmlDecl)
-  {
-    //boolean result = false;
-    boolean result = true;
-    if (xmlDecl != null)
-    {
-      StringTokenizer st =
-        new StringTokenizer(
-          OMMITED_XML_DECLARATION_DELIMITERS,
-          XML_DECLARATION_DELIMITERS);
-      Enumeration tokens = st.parse(xmlDecl);
-      boolean found = false;
-      while (tokens.hasMoreElements() && !found)
-      {
-        String token = (String) tokens.nextElement();
-
-        if (token.equalsIgnoreCase(VERSION_TOKEN))
-        {
-          found = true;
-
-          tokens.nextElement();
-          String ver = (String) tokens.nextElement();
-
-          result = VERSION.equals(ver);
-        }
-      }
-    }
-
-    return result;
-  }
-
-  /*
-   * It's loking for xsd import and load it if find.
-   * @param schema xsd schema
-  */
-  private void processSchema(Node schema, String context)
-  {
-    Node n = schema.getFirstChild();
-    while (n != null)
-    {
-      if (Node.ELEMENT_NODE == n.getNodeType()
-        && XMLUtils.equals(n, ELEM_XSD_IMPORT))
-        loadSchema(n, context);
-
-      n = n.getNextSibling();
-    }
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2012.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2012.java
deleted file mode 100644
index fa33c1be8..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2013.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2013.java
deleted file mode 100644
index b93a378db..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2014.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2014.java
deleted file mode 100644
index e31088981..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2017.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2017.java
deleted file mode 100644
index 64f4590dd..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2018.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2018.java
deleted file mode 100644
index dd467cd89..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2018.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import javax.wsdl.Definition;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.Utils;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-
-/**
- * BP2018. 
- * <context>For a candidate Web service definition</context>
- * <assertionDescription>The wsdl:types element occurs either as the first child in the WSDL namespace of the wsdl:definitions element if no wsdl:documentation or wsdl:import element is present; or immediately following the wsdl:documentation element(s) if they are present but wsdl:import(s) are not, or immediately following both the wsdl:documentation and wsdl:import elemen(s) if present.</assertionDescription>
- */
-public class BP2018 extends AssertionProcess implements WSITag
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2018(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /*
-   * @param el - xml element
-   * @return if element is extensibility element returns true.
-   */
-  private boolean isExtensibilityElement(Element el)
-  {
-    boolean isEx = true;
-    isEx = isEx && !XMLUtils.equals(el, WSDL_BINDING);
-    isEx = isEx && !XMLUtils.equals(el, WSDL_DEFINITIONS);
-    isEx = isEx && !XMLUtils.equals(el, WSDL_DOCUMENTATION);
-    isEx = isEx && !XMLUtils.equals(el, WSDL_FAULT);
-    isEx = isEx && !XMLUtils.equals(el, WSDL_IMPORT);
-    isEx = isEx && !XMLUtils.equals(el, WSDL_INPUT);
-    isEx = isEx && !XMLUtils.equals(el, WSDL_MESSAGE);
-    isEx = isEx && !XMLUtils.equals(el, WSDL_OPERATION);
-    isEx = isEx && !XMLUtils.equals(el, WSDL_OUTPUT);
-    isEx = isEx && !XMLUtils.equals(el, WSDL_PART);
-    isEx = isEx && !XMLUtils.equals(el, WSDL_PORT);
-    isEx = isEx && !XMLUtils.equals(el, WSDL_PORTTYPE);
-    isEx = isEx && !XMLUtils.equals(el, WSDL_SERVICE);
-    isEx = isEx && !XMLUtils.equals(el, WSDL_TYPES);
-
-    return isEx;
-  }
-
-  /**
-   * Validates the test assertion.
-   * @see org.eclipse.wst.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    result = AssertionResult.RESULT_PASSED;
-
-    // Get the location of the WSDL document
-    Definition definition =
-      (Definition) entryContext.getEntry().getEntryDetail();
-    try
-    {
-      // Parse the WSDL document as an XML file
-      Document doc =
-        validator.parseXMLDocumentURL(definition.getDocumentBaseURI(), null);
-
-      Element root = doc.getDocumentElement(); // get definition
-
-      Element types = XMLUtils.findChildElement((Element) root, WSDL_TYPES);
-
-      if (types != null)
-      {
-        Element el = XMLUtils.findPreviousSibling(types);
-        while (el != null)
-		{
-          if (!isExtensibilityElement(el) &&
-			   ((!XMLUtils.equals(el, WSDL_IMPORT)) &&
-			    (!XMLUtils.equals(el, WSDL_DOCUMENTATION))))
-		  {
-		    result = AssertionResult.RESULT_FAILED;
-			String message = "The " + el.getLocalName() + " element must not precede the types element.";
-		    failureDetail = this.validator.createFailureDetail(message, entryContext);
-  		    break;
-		  }
-          el = XMLUtils.findPreviousSibling(el);
-		}
-      }
-    }
-
-    catch (Throwable t)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-      failureDetail =
-        this.validator.createFailureDetail(
-          "An error occurred while processing the document at "
-            + definition.getDocumentBaseURI()
-            + ".\n\n"
-            + Utils.getExceptionDetails(t),
-          entryContext);
-    }
-
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2019.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2019.java
deleted file mode 100644
index 5a670bf88..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2019.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import java.util.Iterator;
-import java.util.Vector;
-
-import javax.wsdl.Binding;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPBinding;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.Utils;
-
-
-/**
- * BP2019.
- * <context>For a candidate wsdl:binding element, if the contained soap:binding element has a "style" attribute equal to "document" and soap:operations have "use" attribute equal to "literal":</context>
- * <assertionDescription>The "namespace" attribute is not specified in any contained soapbind:body, soapbind:header, soapbind::headerfault, soapbind:fault elements </assertionDescription>
- * @version 1.0.1 27.06.2003
- * @author Vitali Fedosenko
- */
-public class BP2019 extends AssertionProcess
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2019(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /* Validates the test assertion.
-   * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    boolean docLitFound = false;
-    String errantElements = new String("");
-    // Get the binding from the entry context
-    Binding binding = (Binding) entryContext.getEntry().getEntryDetail();
-
-    // Try to get the SOAP binding
-    SOAPBinding soapBinding = WSDLValidatorImpl.getSoapBinding(binding);
-
-    if (soapBinding != null)
-    {
-      String style =
-        (soapBinding.getStyle() == null)
-          ? WSIConstants.ATTRVAL_SOAP_BIND_STYLE_DOC
-          : soapBinding.getStyle();
-      if (style.equals(WSIConstants.ATTRVAL_SOAP_BIND_STYLE_DOC))
-      {
-        Vector soapElements = Utils.arrayToVector(this.validator.getSoapBodies(binding));
-        soapElements.addAll(Utils.arrayToVector(this.validator.getSoapFaults(binding)));
-        soapElements.addAll(Utils.arrayToVector(this.validator.getSoapHeaders(binding)));
-        soapElements.addAll(
-          Utils.arrayToVector(this.validator.getSoapHeaderFaults(binding)));
-
-        Iterator i = soapElements.iterator();
-        while (i.hasNext())
-        {
-          ExtensibilityElement soapElement =
-            (ExtensibilityElement) (i.next());
-          try
-          {
-            if (this.validator.isLiteral(soapElement))
-            {
-              docLitFound = true;
-              if (this.validator.namespaceFoundInSoapLiteral(soapElement))
-              {
-                errantElements += "\n--- " + (soapElement.toString());
-              }
-            }
-          }
-          catch (Exception e)
-          {
-          } // continue with clenched teeth
-        }
-      }
-    }
-
-    if (!docLitFound)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    else
-    {
-      // If a namespace was not found then test assertion passed
-      if (errantElements.length() != 0)
-      {
-        result = AssertionResult.RESULT_FAILED;
-        failureDetail =
-          this.validator.createFailureDetail(
-            "Failing elements:" + errantElements,
-            entryContext);
-      }
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2020.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2020.java
deleted file mode 100644
index 428bf927e..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2021.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2021.java
deleted file mode 100644
index 105086ee5..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2022.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2022.java
deleted file mode 100644
index 1145d7f84..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2023.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2023.java
deleted file mode 100644
index 20360aedd..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2032.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2032.java
deleted file mode 100644
index afd96dbbb..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2034.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2034.java
deleted file mode 100644
index c8e61e8d2..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2098.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2098.java
deleted file mode 100644
index 6db653ee8..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2101.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2101.java
deleted file mode 100644
index f9a73efee..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2101.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Import;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcessVisitor;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.ErrorList;
-import org.eclipse.wst.wsi.internal.core.util.TestUtils;
-import org.eclipse.wst.wsi.internal.core.util.Utils;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversal;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversalContext;
-
-
-/**
- * BP2101.
-   * <context>For a candidate wsdl:definition, if it contains wsdl:import statements</context>
-   * <assertionDescription>Each wsdl:import statement is only used to import another WSDL description.</assertionDescription>
- */
-public class BP2101 extends AssertionProcessVisitor implements WSITag
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2101(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  private ErrorList errors = new ErrorList();
-
-  boolean importFound = false;
-
-  /* Create falure report if import contains reference to non WSDL description. 
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.Import, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(Import im, Object parent, WSDLTraversalContext ctx)
-  {
-    importFound = true;
-
-    // by the way : WSDL4J throws Exception if imported WSDL is not resolved
-    // but documentation says that im.getDefinition() will be equal to null
-    if (im.getDefinition() == null)
-      errors.add(
-        im.getNamespaceURI()
-          + ":"
-          + im.getLocationURI()
-          + "\nImport element does not reference a WSDL definition.");
-    else
-      try
-      {
-        // try to parse WSDL according to the WSDL schema
-        validator.parseXMLDocumentURL(
-           im.getLocationURI(),
-           ((Definition)parent).getDocumentBaseURI(),
-           TestUtils.getWSDLSchemaLocation());
-      }
-      catch (Throwable t)
-      {
-        errors.add(
-          im.getNamespaceURI()
-            + ":"
-            + im.getLocationURI()
-            + "\n"
-            + Utils.getExceptionDetails(t));
-      }
-  }
-
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    result = AssertionResult.RESULT_FAILED;
-
-    WSDLTraversal traversal = new WSDLTraversal();
-    //VisitorAdaptor.adapt(this);
-    traversal.setVisitor(this);
-    traversal.visitImport(true);
-    traversal.ignoreReferences();
-    traversal.traverse((Definition) entryContext.getEntry().getEntryDetail());
-
-    if (!errors.isEmpty())
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = this.validator.createFailureDetail(errors.toString(), entryContext);
-    }
-
-    else if (!importFound)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-
-    else
-      result = AssertionResult.RESULT_PASSED;
-
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2102.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2102.java
deleted file mode 100644
index d272b9d75..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2103.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2103.java
deleted file mode 100644
index 4fda970fd..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2104.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2104.java
deleted file mode 100644
index 792f365c3..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2105.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2105.java
deleted file mode 100644
index b104c6d31..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2107.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2107.java
deleted file mode 100644
index 7fffb0212..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2107.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import java.util.Iterator;
-import java.util.List;
-
-import javax.wsdl.Types;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.UnknownExtensibilityElement;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.ErrorList;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-/**
- * BP2107.
- * <context>For a candidate wsdl:types element containing an xsd:schema element</context>
- * <assertionDescription>The xsd:schema element contains a targetNamespace attribute with a valid and non-null value unless the xsd:schema element has xsd:import and/or xsd:annotation as its only child element(s).</assertionDescription>
- */
-public class BP2107 extends AssertionProcess implements WSITag
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2107(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  private boolean schemaFound = false;
-  private ErrorList errors = new ErrorList();
-  //private String context;
-
-  /* 
-   * Validates the test assertion.
-   * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    result = AssertionResult.RESULT_FAILED;
-
-    Types t = (Types) entryContext.getEntry().getEntryDetail();
-    List exts = t.getExtensibilityElements();
-    if (exts != null)
-    {
-      //context = entryContext.getWSDLDocument().getDefinitions().getDocumentBaseURI();
-      Iterator it = exts.iterator();
-      while (it.hasNext())
-      {
-        ExtensibilityElement el = (ExtensibilityElement) it.next();
-        if (el instanceof UnknownExtensibilityElement)
-          searchForSchema(((UnknownExtensibilityElement) el).getElement());
-      }
-    }
-
-    //			  context = entryContext.getWSDLDocument().getDefinitions().getDocumentBaseURI();
-    //			  processWSDL(entryContext.getWSDLDocument().getFilename());
-
-    if (!errors.isEmpty())
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = this.validator.createFailureDetail(errors.toString(), entryContext);
-    }
-
-    else if (!schemaFound)
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-
-    else
-      result = AssertionResult.RESULT_PASSED;
-
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-
-  /*
-   * Check node schema or load schema from inmport if it exists and process it. 
-   * @param n - node
-  */
-  private void searchForSchema(Node n)
-  {
-    while (n != null)
-    {
-      // searches for xsd:import element
-      if (Node.ELEMENT_NODE == n.getNodeType())
-      {
-        // if xsd:schema element is found -> process schema
-        if (XMLUtils.equals(n, ELEM_XSD_SCHEMA))
-        {
-          schemaFound = true;
-          processSchema(n, null);
-        }
-
-        else
-        {
-          // if xsd:import element is found -> load schema and process schema
-          //if (XMLUtils.equals(n, ELEM_XSD_IMPORT))
-          //  loadSchema(n);
-          //else
-          // else iterate element recursively
-          searchForSchema(n.getFirstChild());
-        }
-      }
-
-      n = n.getNextSibling();
-    }
-  }
-
-  /*
-   * Load schema and process it.
-   * @param importNode - xsd:import element
-  */
-  //private void loadSchema(Node importNode)
-  //{
-  //  Element im = (Element) importNode;
-  //  Attr schemaLocation = XMLUtils.getAttribute(im, ATTR_XSD_SCHEMALOCATION);
-  //  // try to parse imported XSD
-  //  if (schemaLocation != null && schemaLocation.getValue() != null)
-  //    try
-  //    {
-  //      // if any error or root element is not XSD schema -> error
-  //      Document schema =
-  //        validator.parseXMLDocumentURL(schemaLocation.getValue(), context);
-  //      if (XMLUtils.equals(schema.getDocumentElement(), ELEM_XSD_SCHEMA))
-  //      {
-  //        Attr a = XMLUtils.getAttribute(im, ATTR_XSD_NAMESPACE);
-  //        String namespace = (a != null) ? a.getValue() : "";
-  //        processSchema(schema.getDocumentElement(), namespace);
-  //      }
-  //    }
-  //    catch (Throwable t)
-  //    {
-  //      // nothing. it's not a schema
-  //    }
-  //}
-
-  /*
-   * Create falure report if it's not correspons assertion description.
-   * @param schema - xsd:schema
-   * @param namespace - namespace of schema
-  */
-  private void processSchema(Node schema, String namespace)
-  {
-    Attr a =
-      XMLUtils.getAttribute((Element) schema, ATTR_XSD_TARGETNAMESPACE);
-    String targetNamespace = (a != null) ? a.getValue() : null;
-
-    Node n = schema.getFirstChild();
-    //	   !! we suppose that xsd:import element is occured only within xsd:schema element
-    boolean containsOnlyImportAndAnnotation = true;
-    while (n != null)
-    {
-      if (n.getNodeType() == Node.ELEMENT_NODE)
-      {
-        containsOnlyImportAndAnnotation
-          &= (XMLUtils.equals(n, ELEM_XSD_IMPORT)
-            || XMLUtils.equals(n, ELEM_XSD_ANNOTATION));
-      }
-
-      //if (Node.ELEMENT_NODE == n.getNodeType() && XMLUtils.equals(n, ELEM_XSD_IMPORT))
-      //	loadSchema(n);
-
-      n = n.getNextSibling();
-    }
-
-    // If the target namespace is not set and there are elements in addition to import and annotation, then error
-    if ((targetNamespace == null || targetNamespace.length() == 0)
-      && (!containsOnlyImportAndAnnotation))
-    {
-      errors.add(targetNamespace, XMLUtils.serialize((Element) schema));
-    }
-
-    if (namespace != null && !namespace.equals(targetNamespace))
-    {
-      errors.add(namespace, XMLUtils.serialize((Element) schema));
-    }
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2108.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2108.java
deleted file mode 100644
index bf733f5dc..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2110.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2110.java
deleted file mode 100644
index 519b6f0c6..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2111.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2111.java
deleted file mode 100644
index b9d942ddf..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2112.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2112.java
deleted file mode 100644
index 262bc9f34..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2112.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import java.util.Iterator;
-import java.util.List;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.BindingOutput;
-import javax.wsdl.Message;
-import javax.wsdl.Operation;
-import javax.wsdl.Part;
-import javax.wsdl.extensions.soap.SOAPBinding;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.wsdl.extensions.soap.SOAPOperation;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcessVisitor;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.ErrorList;
-import org.eclipse.wst.wsi.internal.core.util.WSDLUtil;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversal;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversalContext;
-
-
-/**
- * BP2112.
-   * <context>For a candidate wsdl:binding, with a style "rpc" attribute and containing at least a soapbind:body element</context>
-   * <assertionDescription>No wsdl:part referred by such a soapbind:body element is defined using the "element" attribute.</assertionDescription>
- */
-public class BP2112 extends AssertionProcessVisitor implements WSITag
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2112(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  private boolean rpcLiteralFound = false;
-  private ErrorList errors = new ErrorList();
-
-  /* 
-   * Put in context soap binding's style
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.extensions.soap.SOAPBinding, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-
-  public void visit(
-    SOAPBinding binding,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    String style =
-      (binding.getStyle() == null)
-        ? WSIConstants.ATTRVAL_SOAP_BIND_STYLE_DOC
-        : binding.getStyle();
-    ctx.addParameter("bindingStyle", style);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.BindingOperation, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(
-    BindingOperation op,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    ctx.removeParameter("operationStyle");
-  }
-
-  /* 
-   * Verify style of soap operation is "rpc" if not then it's canceled process. 
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.extensions.soap.SOAPOperation, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(
-    SOAPOperation operation,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    ctx.addParameter("operationStyle", operation.getStyle());
-  }
-
-  /* 
-   * If use of soap body is "literal" and if at least one part is define using "element" attribute it creates falure report.    
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.extensions.soap.SOAPBody, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(SOAPBody body, Object parent, WSDLTraversalContext ctx)
-  {
-    String opStyle = (String) ctx.getParameter("operationStyle");
-    String bStyle = (String) ctx.getParameter("bindingStyle");
-
-    if ((opStyle == null
-        && !WSIConstants.ATTRVAL_SOAP_BIND_STYLE_RPC.equals(bStyle))
-      || (opStyle != null 
-      	&& !WSIConstants.ATTRVAL_SOAP_BIND_STYLE_RPC.equals(opStyle)))
-    {
-      ctx.cancelBindingOperationProcessing();
-      return;
-    }
-    // assert use == "literal"
-    if (WSIConstants.ATTRVAL_SOAP_BODY_USE_LIT.equals(body.getUse()))
-    {
-      rpcLiteralFound = true;
-
-      // find corresponding message
-      Operation op = ctx.getBindingOperation().getOperation();
-      // if some links are broken, cancel processing
-      if (op == null
-        || (parent instanceof BindingInput && op.getInput() == null)
-        || (parent instanceof BindingOutput && op.getOutput() == null))
-        return;
-
-      Message m =
-        (parent instanceof BindingInput)
-          ? op.getInput().getMessage()
-          : op.getOutput().getMessage();
-      // REMOVE: current message should equals to message given as entry
-      //if (m == null || message != m)
-      if (m == null)
-        return;
-
-      List parts =
-        WSDLUtil.getParts(
-          op,
-          m,
-          body,
-          WSIConstants.ATTRVAL_SOAP_BIND_STYLE_RPC);
-      if (parts == null)
-        return;
-
-      /* check whether parts list contains a parts which uses
-       * element attribute. If so, part name will be added into
-       * errors set.
-       */
-      Iterator it = parts.iterator();
-      while (it.hasNext())
-      {
-        Part part = (Part) it.next();
-        if (part.getElementName() != null)
-          errors.add(part.getName());
-      }
-    }
-  }
-
-  /* 
-   * Validates the test assertion.
-   * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    result = AssertionResult.RESULT_FAILED;
-    // save message 
-    //message = (Message)entryContext.getEntry().getEntryDetail();
-
-    WSDLTraversal traversal = new WSDLTraversal();
-    //VisitorAdaptor.adapt(this);;
-    traversal.setVisitor(this);
-    traversal.visitSOAPBinding(true);
-    traversal.visitBindingOperation(true);
-    traversal.visitSOAPOperation(true);
-    traversal.visitSOAPBody(true);
-
-    traversal.ignoreReferences();
-    traversal.ignoreImport();
-
-    traversal.traverse((Binding) entryContext.getEntry().getEntryDetail());
-
-    if (!errors.isEmpty())
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = this.validator.createFailureDetail(errors.toString(), entryContext);
-    }
-
-    else if (!rpcLiteralFound)
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-
-    else
-      result = AssertionResult.RESULT_PASSED;
-
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2113.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2113.java
deleted file mode 100644
index bd31cdc0d..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2114.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2114.java
deleted file mode 100644
index 4b549d12c..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2115.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2115.java
deleted file mode 100644
index be98298b9..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2116.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2116.java
deleted file mode 100644
index f19ff0991..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2117.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2117.java
deleted file mode 100644
index 6709fa796..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2118.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2118.java
deleted file mode 100644
index 6a4a73385..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2119.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2119.java
deleted file mode 100644
index 3de1a8342..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2120.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2120.java
deleted file mode 100644
index 692728364..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2121.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2121.java
deleted file mode 100644
index 6ad594a36..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2122.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2122.java
deleted file mode 100644
index f6caf111f..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2122.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import java.util.List;
-
-import javax.wsdl.Types;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.UnknownExtensibilityElement;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.ErrorList;
-
-
-/**
- * BP2122. 
- *    <context>For a candidate wsdl:types element</context>
- *    <assertionDescription>The data type definition if any within the wsdl:types element is an XML schema definition defined in the XML Schema 1.0 Recommendation with the namespace URI "http://www.w3.org/2001/XMLSchema".</assertionDescription>
- */
-public class BP2122 extends AssertionProcess
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2122(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(TestAssertion, EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    result = AssertionResult.RESULT_PASSED;
-    ErrorList errorList = new ErrorList();
-
-    // Get the types from the entry context
-    Types types = (Types) entryContext.getEntry().getEntryDetail();
-
-    if (types != null)
-    {
-      ExtensibilityElement extElement;
-      List extElements = types.getExtensibilityElements();
-
-      // Process each ext. element
-      for (int i = 0; i < extElements.size(); i++)
-      {
-        // If it is an unknown ext. element and it is a schema, then check it
-        if ((extElement = (ExtensibilityElement) extElements.get(i))
-          instanceof UnknownExtensibilityElement)
-        {
-          if (!extElement.getElementType().equals(WSITag.ELEM_XSD_SCHEMA))
-          {
-            // If it is not a schema definition, then it is an error
-            errorList.add(
-              extElement.getElementType().toString()
-                + " can not be a child of the wsdl:types element.");
-          }
-        }
-      }
-    }
-
-    // If XMLSchemaValidator could not find any errors, check errors from the inline schema validator
-    if (errorList.isEmpty())
-      errorList.add(validator.wsdlDocument.getSchemasValidationErrors());
-
-    if (!errorList.isEmpty())
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = this.validator.createFailureDetail(errorList.toString(), entryContext);
-    }
-
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2123.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2123.java
deleted file mode 100644
index af5f833d2..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2201.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2201.java
deleted file mode 100644
index 324ddfc3e..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2202.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2202.java
deleted file mode 100644
index 64c793426..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2202.java
+++ /dev/null
@@ -1,420 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import java.io.FileInputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Types;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.UnknownExtensibilityElement;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.ErrorList;
-import org.eclipse.wst.wsi.internal.core.util.StringTokenizer;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-/**
- * BP2202.
- *  <context>For a candidate wsdl:types element within a WSDL document which imports an XML schema directly or indirectly.</context>
- * <assertionDescription>The imported schema uses UTF-8 or UTF-16 for the encoding.</assertionDescription>
- */
-public class BP2202 extends AssertionProcess implements WSITag
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2202(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  private ErrorList errors = new ErrorList();
-  private boolean importFound = false;
-
-  private final char[] OMMITED_XML_DECLARATION_DELIMITERS =
-    new char[] { 0x20, 0x9, 0xD, 0xA, '\'', '\"' };
-  private final char[] XML_DECLARATION_DELIMITERS = new char[] { '=' };
-  private final String UTF_8_ENCODING = "UTF-8";
-  private final String UTF_16_ENCODING = "UTF-16";
-
-  private final String ENCODING_TOKEN = "encoding";
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    result = result = AssertionResult.RESULT_NOT_APPLICABLE;
-
-    //Definition def = (Definition) entryContext.getEntry().getEntryDetail();
-    Types types = (Types) entryContext.getEntry().getEntryDetail();
-    List exts = null;
-    //if (def.getTypes() != null)
-    if (types != null)
-      //exts = def.getTypes().getExtensibilityElements();
-      exts = types.getExtensibilityElements();
-    if (exts != null)
-    {
-      Definition definition = null;
-      if ((definition =
-        validator.analyzerContext.getCandidateInfo().getDefinition(types))
-        == null)
-      {
-        throw new WSIException("Could not find types definition in any WSDL document.");
-      }
-
-      Iterator it = exts.iterator();
-      while (it.hasNext())
-      {
-        ExtensibilityElement el = (ExtensibilityElement) it.next();
-        if (el instanceof UnknownExtensibilityElement
-          && el.getElementType().equals(ELEM_XSD_SCHEMA))
-          searchForSchema(((UnknownExtensibilityElement) el).getElement(),
-              definition.getDocumentBaseURI());
-      }
-    }
-
-    if (!errors.isEmpty())
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = this.validator.createFailureDetail(errors.toString(), entryContext);
-    }
-
-    else if (!importFound)
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-
-    else
-      result = AssertionResult.RESULT_PASSED;
-
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-
-  /*
-   * Search xsd schema or xsd import from node. If node is xsd import it's loading schema.
-   * @param n - node
-  */
-  private void searchForSchema(Node n, String context)
-  {
-    while (n != null)
-    {
-      // searches for xsd:import element
-      if (Node.ELEMENT_NODE == n.getNodeType())
-      {
-        // if xsd:schema element is found -> process schema
-        if (XMLUtils.equals(n, ELEM_XSD_SCHEMA))
-        {
-          processSchema(n, context);
-        }
-        else
-        {
-          // if xsd:import element is found -> load schema and process schema
-          if (XMLUtils.equals(n, ELEM_XSD_IMPORT))
-          {
-            importFound = true;
-            loadSchema(n, context);
-          }
-          else
-            // else iterate element recursively
-            searchForSchema(n.getFirstChild(), context);
-        }
-      }
-      n = n.getNextSibling();
-    }
-  }
-
-  /*
-   * It loads xsd schema and then check valid encoding and looking for xsd:schema element for next process. 
-   * @param importNode - xsd schema
-  */
-  private void loadSchema(Node importNode, String context)
-  {
-    Element im = (Element) importNode;
-    Attr schemaLocation = XMLUtils.getAttribute(im, ATTR_XSD_SCHEMALOCATION);
-    // try to parse imported XSD
-    if (schemaLocation != null && schemaLocation.getValue() != null)
-      try
-      {
-        // if any error or root element is not XSD schema -> error
-        String decl =
-          readXMLDeclarationStatement(schemaLocation.getValue(), context);
-        if (!validDeclaration(decl,
-          ENCODING_TOKEN,
-          new String[] { UTF_8_ENCODING, UTF_16_ENCODING }))
-        {
-          Attr a = XMLUtils.getAttribute(im, ATTR_XSD_NAMESPACE);
-          errors.add((a != null) ? a.getValue() : "");
-        }
-
-        if (!validDeclaration(decl, "version", new String[] { "1.0" }))
-        {
-          errors.add(
-            "Version number in XML declaration is not 1.0.  XML schema file: "
-              + schemaLocation.getValue());
-        }
-
-        // DEBUG:
-        // System.out.println(schemaLocation.getValue() + ":" + context);
-
-        Document schema =
-          validator.parseXMLDocumentURL(schemaLocation.getValue(), context);
-
-        if (XMLUtils.equals(schema.getDocumentElement(), ELEM_XSD_SCHEMA))
-        {
-           processSchema(schema.getDocumentElement(),
-              XMLUtils.createURLString(schemaLocation.getValue(), context));
-        }
-        result = result = AssertionResult.RESULT_PASSED;
-      }
-      catch (Throwable t)
-      {
-      }
-  }
-
-  /**
-  * Reads an XML declaration statement.
-  * @param location
-  * @return String
-  */
-  private String readXMLDeclarationStatement(String location, String baseURI)
-  {
-    String result = null;
-    try
-    {
-      new URL(location);
-    }
-    catch (Throwable t)
-    {
-      // nothing
-      int i = baseURI.lastIndexOf('/');
-      int j = baseURI.lastIndexOf('\\');
-      if (j > i)
-        i = j;
-      location = baseURI.substring(0, i + 1) + location;
-    }
-
-    if (location != null)
-    {
-      URL url = null;
-      Reader reader = null;
-
-      try
-      {
-        try
-        {
-          url = new URL(location);
-        }
-        catch (MalformedURLException e)
-        {
-          // we should try to access location as file
-        }
-
-        if (url != null)
-        {
-          reader = new InputStreamReader(url.openStream());
-        }
-        else
-        {
-          reader = new InputStreamReader(new FileInputStream(location));
-        }
-
-        int charCode;
-        boolean end = false;
-        if (reader.ready())
-        {
-          charCode = reader.read();
-
-          while (reader.ready() && !(charCode == '<'))
-          {
-            charCode = reader.read();
-          }
-
-          StringBuffer buf = new StringBuffer();
-          if (charCode == '<')
-          {
-            buf.append((char) charCode);
-            while (reader.ready() && !end)
-            {
-              charCode = reader.read();
-              buf.append((char) charCode);
-
-              end = charCode == '>';
-            }
-          }
-          else
-          {
-            // NOTE: This result does not get propogated back!
-            result = AssertionResult.RESULT_FAILED;
-            failureDetailMessage =
-              "Cannot read the XML declaration statement.";
-          }
-
-          result = buf.toString();
-        }
-      }
-      catch (Exception e)
-      {
-        errors.add(e.getMessage());
-      }
-      finally
-      {
-        if (reader != null)
-        {
-          try
-          {
-            reader.close();
-          }
-          catch (Throwable e)
-          {
-          }
-        }
-      }
-    }
-
-    return result;
-  }
-
-  /*
-   * @param xmlDecl - xml declaration
-   * @return if xml declaration contains encoding="utf-16" or encoding="utf-8" it retirns true. 
-  */
-
-  //private boolean validEncoding(String xmlDecl)
-  //{
-  //  //boolean result = false;
-  //  boolean result = true;
-  //  if (xmlDecl != null)
-  //  {
-  //    StringTokenizer st =
-  //      new StringTokenizer(
-  //        OMMITED_XML_DECLARATION_DELIMITERS,
-  //        XML_DECLARATION_DELIMITERS);
-  //    Enumeration tokens = st.parse(xmlDecl);
-  //   boolean found = false;
-  //    while (tokens.hasMoreElements() && !found)
-  //    {
-  //      String token = (String) tokens.nextElement();
-  //
-  //      if (token.equals(ENCODING_TOKEN))
-  //      {
-  //        found = true;
-  //
-  //        tokens.nextElement();
-  //        String enc = (String) tokens.nextElement();
-  //
-  //        result =
-  //         UTF_8_ENCODING.equalsIgnoreCase(enc)
-  //            || UTF_16_ENCODING.equalsIgnoreCase(enc);
-  //      }
-  //    }
-  //  }
-  //
-  //  return result;
-  //}
-
-  /**
-   * @param xmlDecl - xml declaration
-   * @return if xml declaration contains valid version number then true is returned. 
-  */
-  private boolean validDeclaration(
-    String xmlDecl,
-    String tokenName,
-    String[] checkValueList)
-  {
-    //boolean result = false;
-    boolean result = true;
-    if (xmlDecl != null)
-    {
-      StringTokenizer st =
-        new StringTokenizer(
-          OMMITED_XML_DECLARATION_DELIMITERS,
-          XML_DECLARATION_DELIMITERS);
-      Enumeration tokens = st.parse(xmlDecl);
-
-      if (tokens.hasMoreElements())
-      {
-        boolean found = false;
-        while (tokens.hasMoreElements() && !found)
-        {
-          String token = (String) tokens.nextElement();
-
-          if (token.equals(tokenName))
-          {
-            found = true;
-            result = false;
-
-            tokens.nextElement();
-            String tokenValue = (String) tokens.nextElement();
-
-            for (int i = 0; i < checkValueList.length && !result; i++)
-            {
-              if (checkValueList[i].equalsIgnoreCase(tokenValue))
-                result = true;
-            }
-          }
-        }
-      }
-
-      // If there are no tokens then it is not a valid declaraction
-      else
-      {
-        result = false;
-      }
-    }
-
-    return result;
-  }
-
-  /*
-   * It's looking for xsd import and load it if find.
-   * @param schema - xsd schema
-   * @param namespace - namespace of schema
-   */
-  private void processSchema(Node schema, String context)
-  {
-    Node n = schema.getFirstChild();
-    while (n != null)
-    {
-      if (Node.ELEMENT_NODE == n.getNodeType()
-        && XMLUtils.equals(n, ELEM_XSD_IMPORT))
-      {
-        importFound = true;
-        loadSchema(n, context);
-      }
-
-      n = n.getNextSibling();
-    }
-  }
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2208.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2208.java
deleted file mode 100644
index c35963300..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2402.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2402.java
deleted file mode 100644
index 74f3da49e..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2404.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2404.java
deleted file mode 100644
index 688e8d506..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2406.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2406.java
deleted file mode 100644
index 9d5d8ed2a..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2416.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2416.java
deleted file mode 100644
index 1a1eba328..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2417.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2417.java
deleted file mode 100644
index 1743d4995..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2700.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2700.java
deleted file mode 100644
index bbf231226..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2701.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2701.java
deleted file mode 100644
index 124c1f99a..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2703.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2703.java
deleted file mode 100644
index e23a69c95..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2803.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2803.java
deleted file mode 100644
index a2602a2a8..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP4200.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP4200.java
deleted file mode 100644
index f2c73355b..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP4201.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP4201.java
deleted file mode 100644
index 21f131f16..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP4202.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP4202.java
deleted file mode 100644
index 63791e0f1..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP4202.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import javax.wsdl.Types;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.UnknownExtensibilityElement;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcessVisitor;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.ErrorList;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversal;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversalContext;
-import org.eclipse.wst.wsi.internal.core.xml.schema.XMLSchemaProcessor;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-/**
- * BP4202. 
- * <context>For an XML schema definition defined in the wsdl:types element, or imported directly or indirectly by a schema definition defined in the wsdl:types element, which contains any schema annotation elements.</context>
- * <assertionDescription>An XML schema definition defined in the wsdl:types element, or imported directly or indirectly by a schema definition defined in the wsdl:types element, may use schema annotation elements as an extensibility mechanism.</assertionDescription>
- */
- public class BP4202 extends AssertionProcessVisitor implements WSITag 
- {
-   private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP4202(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  private static final String ANNOTATION_KEY = "annotation";
-   
-   private ErrorList errorList = new ErrorList();
-   private AnnotationProcessor processor;
-
-   /** 
-    * (non-Javadoc)
-    * @see org.eclipse.wst.wsi.wsdl.traversal.WSDLVisitor#visit(Message, Object, WSDLTraversalContext)
-    */
-   public void visit(ExtensibilityElement obj, Object parent, WSDLTraversalContext ctx)
-   {
-     if((obj != null) && (obj instanceof UnknownExtensibilityElement))
-     {
-       UnknownExtensibilityElement el = (UnknownExtensibilityElement) obj;
-       try {
-         processor.processAllSchema(el.getElement());
-       } catch (WSIException e) {}
-     }
-   }
-
-   /**
-    *  (non-Javadoc)
-    *  @see org.eclipse.wst.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-    */
-   public AssertionResult validate(
-     TestAssertion testAssertion,
-     EntryContext entryContext)
-     throws WSIException
-   {
-     result = AssertionResult.RESULT_PASSED;
-
-     // Get the types from the entry context
-     Types types =
-       (Types) entryContext.getEntry().getEntryDetail();
-     
-     processor = new AnnotationProcessor(
-           entryContext.getWSDLDocument().getDefinitions().getDocumentBaseURI());
-     
-     WSDLTraversal traversal = new WSDLTraversal();
-     traversal.setVisitor(this);
-     traversal.visitExtensibilityElement(true);
-     traversal.ignoreReferences();
-     traversal.traverse(types);
-     
-     if (errorList.isEmpty()) 
-     {
-        return validator.createAssertionResult(testAssertion, 
-              AssertionResult.RESULT_NOT_APPLICABLE, (String) null);
-     }
-     
-     failureDetail = this.validator.createFailureDetail(testAssertion.getFailureMessage() + 
-         "\n\n" + errorList.toString(), entryContext);
-     // Return assertion result
-     return validator.createAssertionResult(testAssertion, result, failureDetail);
-   }
-   
-   /**
-    * Class for parse schema and search annotation elements 
-    */
-   class AnnotationProcessor extends XMLSchemaProcessor
-   {
-     public AnnotationProcessor(String context)
-     {
-       super(context, false);
-     }
-
-     protected void processSchema(Element element)
-     {
-       checkForAnnotation(element);
-     }
-     
-     private void checkForAnnotation(Node node) 
-     {
-       if((node.getLocalName() != null) && (node.getLocalName().equals(ANNOTATION_KEY))) {
-         errorList.add(node.toString());
-       }
-       for (int i = 0; i < node.getChildNodes().getLength(); i++)
-       {
-         checkForAnnotation(node.getChildNodes().item(i));
-       }
-     }
-   }
- }
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/SSBP2209.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/SSBP2209.java
deleted file mode 100644
index 4c4dd0f25..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/SSBP2402.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/SSBP2402.java
deleted file mode 100644
index 9291f3660..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/SSBP2403.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/SSBP2403.java
deleted file mode 100644
index 041320f33..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSDLValidatorImpl.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSDLValidatorImpl.java
deleted file mode 100644
index 0ecafd75f..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSDLValidatorImpl.java
+++ /dev/null
@@ -1,2314 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingFault;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.BindingOutput;
-import javax.wsdl.Definition;
-import javax.wsdl.Fault;
-import javax.wsdl.Import;
-import javax.wsdl.Message;
-import javax.wsdl.Operation;
-import javax.wsdl.Part;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.Types;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.UnknownExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPBinding;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.wsdl.extensions.soap.SOAPFault;
-import javax.wsdl.extensions.soap.SOAPHeader;
-import javax.wsdl.extensions.soap.SOAPHeaderFault;
-import javax.wsdl.extensions.soap.SOAPOperation;
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSIRuntimeException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AnalyzerContext;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.analyzer.CandidateInfo;
-import org.eclipse.wst.wsi.internal.core.analyzer.ServiceReference;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLElement;
-import org.eclipse.wst.wsi.internal.core.profile.ProfileArtifact;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.WSDLValidator;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseValidatorImpl;
-import org.eclipse.wst.wsi.internal.core.report.Entry;
-import org.eclipse.wst.wsi.internal.core.report.EntryContainer;
-import org.eclipse.wst.wsi.internal.core.report.FailureDetail;
-import org.eclipse.wst.wsi.internal.core.report.ReportArtifact;
-import org.eclipse.wst.wsi.internal.core.report.Reporter;
-import org.eclipse.wst.wsi.internal.core.util.EntryType;
-import org.eclipse.wst.wsi.internal.core.wsdl.WSDLDocument;
-import org.eclipse.wst.wsi.internal.core.wsdl.WSDLElementList;
-import org.eclipse.wst.wsi.internal.core.wsdl.WSDLUtils;
-import org.eclipse.wst.wsi.internal.core.xml.dom.ElementLocation;
-import org.eclipse.wst.wsi.internal.core.xml.schema.TargetNamespaceProcessor;
-import org.eclipse.wst.wsi.internal.core.xml.schema.XMLSchemaValidator;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-
-/**
- * The WSDL validator will verify that the WSDL and associated XML schema definitions
- * are in conformance with the profile.
- *
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- * @author Graham Turrell 	(gturrell@uk.ibm.com)
- */
-public class WSDLValidatorImpl
-  extends BaseValidatorImpl
-  implements WSDLValidator
-{
-  /**
-   * WSDL URL.
-   */
-  protected String wsdlURL;
-
-  /**
-   * WSDL document.
-   */
-  protected WSDLDocument wsdlDocument = null;
-
-  /**
-   * Entry container map.
-   */
-  protected HashMap containerMap = new HashMap();
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.validator.WSDLValidator#init(org.eclipse.wst.wsi.internal.core.analyzer.AnalyzerContext, org.wsi.test.profile.ProfileArtifact, org.wsi.test.report.ReportArtifact, java.lang.String, org.wsi.wsdl.WSDLDocument, org.wsi.test.report.Reporter)
-   */
-  public void init(
-    AnalyzerContext analyzerContext,
-    ProfileArtifact profileArtifact,
-    ReportArtifact reportArtifact,
-    String wsdlURL,
-    WSDLDocument wsdlDocument,
-    Reporter reporter)
-    throws WSIException
-  {
-    // BaseValidatorImpl
-    super.init(analyzerContext, profileArtifact, reportArtifact, reporter);
-    this.wsdlDocument = wsdlDocument;
-    if (wsdlDocument != null)
-      this.wsdlURL = wsdlDocument.getLocation();
-
-    if (wsdlURL != null)
-      this.wsdlURL = wsdlURL;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.validator.WSDLValidator#validate()
-   */
-  public WSDLDocument validate() throws WSIException
-  {
-    //WSDLDocument wsdlDocument = null;
-    Service service = null;
-    Port port = null;
-    Binding binding = null;
-    PortType portType = null;
-    Operation operation = null;
-    Message message = null;
-
-    // it depricated after refactoring 
-    // now the inner classes moved out from validator
-    //String classPrefix = this.getClass().getName() + "$";
-    String classPrefix = this.getClass().getPackage().getName()+".";
-
-    try
-    {
-      // Validate the WSDL service description
-      if (this.wsdlDocument == null)
-        this.wsdlDocument = new WSDLDocument(wsdlURL);
-    }
-
-    catch (Exception e)
-    {
-      // ADD: Certain exceptions should result in validation errors
-
-      throw new WSIException(e.getMessage(), e);
-    }
-
-    // Get the definition element
-    Definition definition = wsdlDocument.getDefinitions();
-
-    // Get service reference from analyzer context
-    ServiceReference serviceReference = analyzerContext.getServiceReference();
-
-    // Create normalized data about the service under test.
-    CandidateInfo candidate = new CandidateInfo(serviceReference, wsdlDocument);
-
-    analyzerContext.setCandidateInfo(candidate);
-
-    // Set prereq type to entry container
-    reporter.setPrereqType(Reporter.PREREQ_TYPE_ENTRY_CONTAINER);
-
-    // always process Import, Definitions & Types assertions 
-    // TEMP:
-    processDefinitionAssertions(classPrefix, candidate);
-    processTypesAssertions(classPrefix, candidate);
-    processImportAssertions(classPrefix, candidate);
-
-    // Process the element hierarchy in the WSDL document starting with the one that was specified  
-    // FIX: Element finding already completed by CandidateInfo constructor - so use that rather than retest here  
-
-    // ---------------------------
-    // wsdl:port
-    // ---------------------------
-    if (serviceReference.getWSDLElement().isPort())
-    {
-      // Find the service element
-      if ((service =
-        definition.getService(
-          serviceReference.getWSDLElement().getParentElementQName()))
-        == null)
-      {
-        throw new WSIRuntimeException(
-          "Could not locate WSDL service: "
-            + serviceReference.getWSDLElement().getParentElementName());
-      }
-
-      // Find the port element
-      if ((port = service.getPort(serviceReference.getWSDLElement().getName()))
-        == null)
-      {
-        throw new WSIRuntimeException(
-          "Could not locate WSDL port: "
-            + serviceReference.getWSDLElement().getName());
-      }
-
-      // TEMP: Remove until there are port test assertions      
-      //processPortAssertions(port, serviceReference, classPrefix, wsdlDocument);	     
-
-      // Next, process the binding
-      if (((binding = port.getBinding()) == null) || (binding.isUndefined()))
-      {
-        //throw new WSIRuntimeException("Could not locate WSDL binding for port: " + port.getName());  
-        // Set missingInput for all binding, portType, operation and message test assertions 
-        setMissingInput(
-          EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_BINDING));
-        setMissingInput(
-          EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_PORTTYPE));
-        setMissingInput(
-          EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_OPERATION));
-        setMissingInput(
-          EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_MESSAGE));
-      }
-
-      else
-      {
-        processBindingAssertions(
-          binding,
-          serviceReference,
-          classPrefix,
-          wsdlDocument);
-
-        // Next, process the portType
-        if (((portType = binding.getPortType()) == null)
-          || (portType.isUndefined()))
-        {
-          //throw new WSIRuntimeException("Could not locate WSDL portType for binding: " + binding.getQName().getLocalPart());
-          // Set missingInput for all portType, operation and message test assertions 
-          setMissingInput(
-            EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_PORTTYPE));
-          setMissingInput(
-            EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_OPERATION));
-          setMissingInput(
-            EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_MESSAGE));
-        }
-
-        else
-        {
-          processMessageAssertions(
-            binding,
-            serviceReference,
-            classPrefix,
-            wsdlDocument);
-          processPortTypeAssertions(
-            portType,
-            serviceReference,
-            classPrefix,
-            wsdlDocument);
-          processOperationAssertions(
-            portType,
-            serviceReference,
-            classPrefix,
-            wsdlDocument);
-          processMessageAssertions(
-            portType,
-            serviceReference,
-            classPrefix,
-            wsdlDocument);
-        }
-      }
-
-    }
-
-    // ---------------------------
-    // wsdl:binding
-    // ---------------------------
-    else if (serviceReference.getWSDLElement().isBinding())
-    {
-      WSDLElement wsdlElement = serviceReference.getWSDLElement();
-      // Find the binding element
-      if (wsdlElement.getQName() != null
-        && wsdlElement.getQName().getLocalPart() != null
-        && wsdlElement.getQName().getLocalPart().length() > 0)
-      {
-        if (((binding =
-          definition.getBinding(serviceReference.getWSDLElement().getQName()))
-          == null)
-          || (binding.isUndefined()))
-        {
-          throw new WSIRuntimeException(
-            "Could not locate WSDL binding: "
-              + serviceReference.getWSDLElement().getName());
-        }
-
-        processBindingAssertions(
-          binding,
-          serviceReference,
-          classPrefix,
-          wsdlDocument);
-        processMessageAssertions(
-          binding,
-          serviceReference,
-          classPrefix,
-          wsdlDocument);
-
-        // Next, process the portType
-        if (((portType = binding.getPortType()) == null)
-          || (portType.isUndefined()))
-        {
-          //throw new WSIRuntimeException("Could not locate WSDL PortType for Binding: " + binding.getQName().getLocalPart());
-
-          // Set missingInput for all portType, operation and message test assertions 
-          setMissingInput(
-            EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_PORTTYPE));
-          setMissingInput(
-            EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_OPERATION));
-          setMissingInput(
-            EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_MESSAGE));
-        }
-
-        else
-        {
-          processPortTypeAssertions(
-            portType,
-            serviceReference,
-            classPrefix,
-            wsdlDocument);
-          processOperationAssertions(
-            portType,
-            serviceReference,
-            classPrefix,
-            wsdlDocument);
-
-          // Process each message within each operation of the portType associated with the binding
-          processMessageAssertions(
-            portType,
-            serviceReference,
-            classPrefix,
-            wsdlDocument);
-        }
-      }
-
-      // There was a problem with the binding element specification.  This can 
-      // happen when a UDDI tModel did not have a valid binding reference.
-      else
-      {
-        // Set missingInput for all binding, portType, operation and message test assertions 
-        setMissingInput(
-          EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_BINDING));
-        setMissingInput(
-          EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_PORTTYPE));
-        setMissingInput(
-          EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_OPERATION));
-        setMissingInput(
-          EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_MESSAGE));
-      }
-    }
-
-    // ---------------------------
-    // wsdl:portType
-    // ---------------------------
-    else if (serviceReference.getWSDLElement().isPortType())
-    {
-      // Find the PortType element
-      if (((portType =
-        definition.getPortType(serviceReference.getWSDLElement().getQName()))
-        == null)
-        || (portType.isUndefined()))
-      {
-        throw new WSIRuntimeException(
-          "Could not locate WSDL PortType: "
-            + serviceReference.getWSDLElement().getName());
-      }
-
-      // Set missingInput for all binding test assertions 
-      setMissingInput(
-        EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_BINDING));
-
-      processPortTypeAssertions(
-        portType,
-        serviceReference,
-        classPrefix,
-        wsdlDocument);
-      processOperationAssertions(
-        portType,
-        serviceReference,
-        classPrefix,
-        wsdlDocument);
-
-      // Process each message within each operation of the portType
-      processMessageAssertions(
-        portType,
-        serviceReference,
-        classPrefix,
-        wsdlDocument);
-    }
-
-    // ---------------------------
-    // wsdl:operation
-    // ---------------------------
-    else if (serviceReference.getWSDLElement().isOperation())
-    {
-      // Find the operation
-      // get portType from config parent element
-      if (((portType =
-        definition.getPortType(
-          serviceReference.getWSDLElement().getParentElementQName()))
-        == null)
-        || (portType.isUndefined()))
-      {
-        throw new WSIRuntimeException(
-          "Could not locate WSDL portType: "
-            + serviceReference.getWSDLElement().getParentElementQName());
-      }
-
-      if (((operation =
-        getOperationFromPortType(
-          portType,
-          serviceReference.getWSDLElement().getName()))
-        == null)
-        || (operation.isUndefined()))
-      {
-        throw new WSIRuntimeException(
-          "Could not locate WSDL Operation: "
-            + serviceReference.getWSDLElement().getName()
-            + "in portType: "
-            + portType.getQName());
-      }
-
-      // Set missingInput for all binding and portType test assertions 
-      setMissingInput(
-        EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_BINDING));
-      setMissingInput(
-        EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_PORTTYPE));
-
-      processOperationAssertions(
-        operation,
-        portType,
-        serviceReference,
-        classPrefix,
-        wsdlDocument);
-      processMessageAssertions(
-        operation,
-        serviceReference,
-        classPrefix,
-        wsdlDocument);
-    }
-
-    // ---------------------------
-    // wsdl:message
-    // ---------------------------
-    else if (serviceReference.getWSDLElement().isMessage())
-    {
-      // Find the message
-      if (((message =
-        definition.getMessage(serviceReference.getWSDLElement().getQName()))
-        == null)
-        || (message.isUndefined()))
-      {
-        throw new WSIRuntimeException(
-          "Could not locate WSDL Message: "
-            + serviceReference.getWSDLElement().getName());
-      }
-
-      // Set missingInput for all binding, portType, and operation test assertions 
-      setMissingInput(
-        EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_BINDING));
-      setMissingInput(
-        EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_PORTTYPE));
-      setMissingInput(
-        EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_OPERATION));
-
-      processMessageAssertions(
-        message,
-        serviceReference,
-        classPrefix,
-        wsdlDocument);
-    }
-
-    else
-    {
-      throw new WSIRuntimeException(
-        "The following WSDL type is not supported: "
-          + serviceReference.getWSDLElement().getType());
-    }
-
-    // Cleanup
-    cleanup();
-
-    // Return WSDL document
-    return this.wsdlDocument;
-  }
-
-  /**
-   * Get entry container using the filename for WSDL document.
-   * @param filename a file name.
-   * @return entry container using the filename for WSDL document.
-   */
-  protected EntryContainer getEntryContainer(String filename)
-  {
-    EntryContainer entryContainer = null;
-
-    // If the entry container already exists, then use it
-    if ((entryContainer = (EntryContainer) containerMap.get(filename)) == null)
-    {
-      // Create new entry container
-      entryContainer = this.reporter.createEntryContainer();
-
-      // Set container id using the filename for the WSDL document
-      entryContainer.setId(filename);
-
-      // Put the new entry container into the container map
-      containerMap.put(filename, entryContainer);
-    }
-
-    return entryContainer;
-  }
-
-  /**
-   * Get operation from port type.
-   * @param portType port type.
-   * @param operationName operation name.
-   * @return operation from port type.
-   */
-  protected Operation getOperationFromPortType(
-    PortType portType,
-    String operationName)
-  {
-    // FIX: wsdl4j available method call below implies that only 
-    // name+inputname+outputname uniquely defines operation 
-    // Use this instead for now: - get the first operation we find...
-    Operation op = null;
-    if (portType.getOperations() != null)
-    {
-      Iterator opIt = portType.getOperations().iterator();
-
-      while (opIt.hasNext())
-      {
-        op = (Operation) opIt.next();
-        if (operationName.equals(op.getName()))
-        {
-          return op;
-        }
-      }
-    }
-
-    return null; // no matching operation found
-  }
-
-  /**
-   * Process definition assertions.
-   * @param classPrefix class prefix.
-   * @param candidate candidate.
-   * @throws WSIException if problems occur during processing.
-   */
-  protected void processDefinitionAssertions(
-    String classPrefix,
-    CandidateInfo candidate)
-    throws WSIException
-  {
-
-    Entry entry = null;
-
-    Definition[] wsdlDefinitions = candidate.getDefinitions();
-
-    for (int i = 0; i < wsdlDefinitions.length; i++)
-    {
-      Definition definition = wsdlDefinitions[i];
-      if (definition == null)
-        continue;
-      // Create entry 
-      entry = this.reporter.getReport().createEntry();
-      entry.setEntryType(
-        EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_DEFINITIONS));
-      entry.setReferenceID(definition.getDocumentBaseURI());
-      entry.setEntryDetail(definition);
-
-      // Set entry container
-      entry.setEntryContainer(
-        getEntryContainer(definition.getDocumentBaseURI()));
-
-      // Process all of the definition related test assertions
-      processAssertions(
-        classPrefix,
-        new EntryContext(entry, candidate.getWsdlDocument()));
-      // ADD: need to use here the specific document corresponding to the definition??
-
-    }
-  }
-
-  /**
-   * Process types assertions.
-   * @param classPrefix class prefix.
-   * @param candidate candidate.
-   * @throws WSIException if problem occurs during processing 
-   *         type assertions.
-   */
-  protected void processTypesAssertions(
-    String classPrefix,
-    CandidateInfo candidate)
-    throws WSIException
-  {
-    Entry entry = null;
-
-    Types[] wsdlTypes = candidate.getTypes();
-    Definition[] wsdlDefinitions = candidate.getDefinitions();
-
-    // If there are no types elements, then set all results to missingInput   
-    if (wsdlTypes == null || wsdlTypes.length == 0)
-    {
-      // Set missingInput for all test assertions with this entry type
-      setMissingInput(EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_TYPES));
-    }
-
-    else
-    {
-      for (int i = 0; i < wsdlTypes.length; i++)
-      {
-        Types types = wsdlTypes[i];
-        if (types == null)
-        {
-          // no Types element in i-th document
-          continue;
-        }
-
-        // Create entry 
-        entry = this.reporter.getReport().createEntry();
-        entry.setEntryType(
-          EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_TYPES));
-        entry.setReferenceID(
-          candidate.getDefinition(types).getDocumentBaseURI() + "-Types");
-        entry.setEntryDetail(types);
-
-        // Set entry container
-        entry.setEntryContainer(
-          getEntryContainer(wsdlDefinitions[i].getDocumentBaseURI()));
-
-        // Process all of the Types related test assertions
-        processAssertions(
-          classPrefix,
-          new EntryContext(entry, candidate.getWsdlDocument()));
-      }
-    }
-  }
-
-  /**
-   * Process import assertions. 
-   * @param classPrefix class prefix.
-   * @param candidate candidate.
-   * @throws WSIException if problem occurs during processing 
-   *         import assertions.
-   */
-  protected void processImportAssertions(
-    String classPrefix,
-    CandidateInfo candidate)
-    throws WSIException
-  {
-
-    Entry entry = null;
-
-    Import[] wsdlImports = candidate.getImports();
-
-    // If there are no import elements, then set all results to missingInput   
-    if (wsdlImports == null || wsdlImports.length == 0)
-    {
-      // Set missingInput for all test assertions with this entry type
-      setMissingInput(
-        EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_IMPORT));
-    }
-
-    else
-    {
-      for (int i = 0; i < wsdlImports.length; i++)
-      {
-        Import wsdlImport = wsdlImports[i];
-        // Create entry 
-        entry = this.reporter.getReport().createEntry();
-        entry.setEntryType(
-          EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_IMPORT));
-        entry.setReferenceID(wsdlImport.getNamespaceURI());
-        entry.setEntryDetail(wsdlImport);
-
-        // Set entry container
-        entry.setEntryContainer(getEntryContainer(wsdlImport.getLocationURI()));
-
-        // Process all of the import related test assertions
-        processAssertions(
-          classPrefix,
-          new EntryContext(entry, candidate.getWsdlDocument()));
-        // ADD: need to use here the specific document corresponding to the import!!
-      }
-    }
-  }
-
-  /**
-   * Process port assertions.
-   * @param port a port.
-   * @param serviceReference service reference.
-   * @param classPrefix class prefix.
-   * @param wsdlDocument WSDL document.
-   * @throws WSIException if problem occurs during processing 
-   *         port assertions.
-   */
-  protected void processPortAssertions(
-    Port port,
-    ServiceReference serviceReference,
-    String classPrefix,
-    WSDLDocument wsdlDocument)
-    throws WSIException
-  {
-    Entry entry = null;
-
-    // Create entry 	  
-    entry = this.reporter.getReport().createEntry();
-    entry.setEntryType(EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_PORT));
-    entry.setReferenceID(port.getName());
-    entry.setParentElementName(
-      serviceReference.getWSDLElement().getParentElementName());
-    entry.setEntryDetail(port);
-
-    // Process assertions for this artifact against the target context
-    processAssertions(classPrefix, new EntryContext(entry, wsdlDocument));
-  }
-
-  /**
-   * Process binding assertions.
-   * @param binding binding.
-   * @param serviceReference service reference.
-   * @param classPrefix class prefix.
-   * @param wsdlDocument WSDL document.
-   * @throws WSIException if problem occurs during processing 
-   *         binding assertions.
-   */
-  protected void processBindingAssertions(
-    Binding binding,
-    ServiceReference serviceReference,
-    String classPrefix,
-    WSDLDocument wsdlDocument)
-    throws WSIException
-  {
-    Entry entry = null;
-    QName bindingQName = binding.getQName();
-
-    // Create entry 
-    entry = this.reporter.getReport().createEntry();
-    entry.setEntryType(
-      EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_BINDING));
-    entry.setReferenceID(bindingQName.toString());
-    entry.setEntryDetail(binding);
-
-    // Set entry container
-    Definition definition =
-      analyzerContext.getCandidateInfo().getDefinition(binding);
-    entry.setEntryContainer(
-      getEntryContainer(
-        (definition == null ? null : definition.getDocumentBaseURI())));
-
-    // Process binding test assertions
-    processAssertions(classPrefix, new EntryContext(entry, wsdlDocument));
-  }
-
-  /**
-   * Process port type assertions.
-   * @param portType port type.
-   * @param serviceReference service reference.
-   * @param classPrefix class prefix.
-   * @param wsdlDocument WSDL document.
-   * @throws WSIException if problem occurs during processing 
-   *         port type assertions.
-  */
-  protected void processPortTypeAssertions(
-    PortType portType,
-    ServiceReference serviceReference,
-    String classPrefix,
-    WSDLDocument wsdlDocument)
-    throws WSIException
-  {
-
-    Entry entry = null;
-    QName portTypeQName = portType.getQName();
-
-    // Create entry 
-    entry = this.reporter.getReport().createEntry();
-    entry.setEntryType(
-      EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_PORTTYPE));
-    entry.setReferenceID(portTypeQName.toString());
-    entry.setEntryDetail(portType);
-
-    // Set entry container
-    Definition definition =
-      analyzerContext.getCandidateInfo().getDefinition(portType);
-    entry.setEntryContainer(
-      getEntryContainer(
-        (definition == null ? null : definition.getDocumentBaseURI())));
-
-    // Process test assertions
-    processAssertions(classPrefix, new EntryContext(entry, wsdlDocument));
-  }
-
-  /**
-   * Process operation assertions.
-   * @param operation an operation.
-   * @param portType port type.
-   * @param serviceReference service reference.
-   * @param classPrefix class prefix.
-   * @param wsdlDocument WSDL document.
-   * @throws WSIException if problem occurs during processing 
-   *         operation assertions.
-  */
-  protected void processOperationAssertions(
-    Operation operation,
-    PortType portType,
-    ServiceReference serviceReference,
-    String classPrefix,
-    WSDLDocument wsdlDocument)
-    throws WSIException
-  {
-    // qualify operation with service location from config.	
-    Entry entry = null;
-
-    // Create entry 
-    entry = this.reporter.getReport().createEntry();
-    entry.setEntryType(
-      EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_OPERATION));
-    entry.setReferenceID(operation.getName());
-    entry.setParentElementName(portType.getQName().getLocalPart());
-    entry.setEntryDetail(operation);
-
-    // Set entry container
-    Definition definition =
-      analyzerContext.getCandidateInfo().getDefinition(portType);
-    entry.setEntryContainer(
-      getEntryContainer(
-        (definition == null ? null : definition.getDocumentBaseURI())));
-
-    // Process test assertions
-    processAssertions(classPrefix, new EntryContext(entry, wsdlDocument));
-  }
-
-  /**
-   * Process operation assertions.
-   * @param portType port type.
-   * @param serviceReference service reference.
-   * @param classPrefix class prefix.
-   * @param wsdlDocument WSDL document.
-   * @throws WSIException if problem occurs during processing 
-   *         operation assertions.
-   */
-  protected void processOperationAssertions(
-    PortType portType,
-    ServiceReference serviceReference,
-    String classPrefix,
-    WSDLDocument wsdlDocument)
-    throws WSIException
-  {
-    // For each operation, 
-    if (portType.getOperations() == null)
-    {
-      setMissingInput(
-        EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_OPERATION));
-    }
-
-    else
-    {
-      Operation operation;
-      Iterator opIt = portType.getOperations().iterator();
-      while (opIt.hasNext())
-      {
-        operation = (Operation) opIt.next();
-        if (operation == null || operation.isUndefined())
-          setMissingInput(
-            EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_OPERATION));
-        else
-          processOperationAssertions(
-            operation,
-            portType,
-            serviceReference,
-            classPrefix,
-            wsdlDocument);
-      }
-    }
-  }
-
-  /**
-   * Process message assertions.
-   * @param message a message.
-   * @param serviceReference service reference.
-   * @param classPrefix class prefix.
-   * @param wsdlDocument WSDL document.
-   * @throws WSIException if problem occurs during processing 
-   *         message assertions.
-   */
-  protected void processMessageAssertions(
-    Message message,
-    ServiceReference serviceReference,
-    String classPrefix,
-    WSDLDocument wsdlDocument)
-    throws WSIException
-  {
-
-    Entry entry = null;
-    QName messageQName = message.getQName();
-
-    // Create entry 
-    entry = this.reporter.getReport().createEntry();
-    entry.setEntryType(
-      EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_MESSAGE));
-    entry.setReferenceID(messageQName.toString());
-    entry.setEntryDetail(message);
-
-    // Set entry container
-    Definition definition =
-      analyzerContext.getCandidateInfo().getDefinition(message);
-    entry.setEntryContainer(
-      getEntryContainer(
-        (definition == null ? null : definition.getDocumentBaseURI())));
-
-    // Process binding test assertions
-    processAssertions(classPrefix, new EntryContext(entry, wsdlDocument));
-  }
-
-  /**
-   * Process message assertions.
-   * @param binding a binding.
-   * @param serviceReference service reference.
-   * @param classPrefix class prefix.
-   * @param wsdlDocument WSDL document.
-   * @throws WSIException if problem occurs during processing 
-   *         message assertions.
-   */
-  protected void processMessageAssertions(
-    Binding binding,
-    ServiceReference serviceReference,
-    String classPrefix,
-    WSDLDocument wsdlDocument)
-    throws WSIException
-  {
-    HashSet messageSet;
-
-    if (binding.getBindingOperations() != null)
-    { // can do nothing if have no operations defined
-      messageSet =
-        WSDLUtils.findMessages(wsdlDocument.getDefinitions(), binding);
-
-      // Process any messages that were found    
-      if (messageSet.size() > 0)
-      {
-        Iterator messageIt = messageSet.iterator();
-        while (messageIt.hasNext())
-        {
-          Message message = (Message) messageIt.next();
-          if (!message.isUndefined())
-            processMessageAssertions(
-              message,
-              serviceReference,
-              classPrefix,
-              wsdlDocument);
-        }
-      }
-    }
-  }
-
-  /**
-   * Process message assertions.
-   * @param portType port type.
-   * @param serviceReference service reference.
-   * @param classPrefix class prefix.
-   * @param wsdlDocument WSDL document.
-   * @throws WSIException if problem occurs during processing 
-   *         message assertions.
-   */
-  protected void processMessageAssertions(
-    PortType portType,
-    ServiceReference serviceReference,
-    String classPrefix,
-    WSDLDocument wsdlDocument)
-    throws WSIException
-  {
-
-    HashSet messageSet = new HashSet();
-
-    if (portType.getOperations() != null)
-    {
-      // can do nothing if have no operations defined
-
-      Iterator opIt = portType.getOperations().iterator();
-
-      while (opIt.hasNext())
-      {
-        Operation op = (Operation) opIt.next();
-
-        // Since there is no guarantee that we have both and input and output message, 
-        // check for its existence before adding it
-        if (op.getInput() != null && !op.getInput().getMessage().isUndefined())
-          messageSet.add(op.getInput().getMessage());
-
-        if (op.getOutput() != null
-          && !op.getOutput().getMessage().isUndefined())
-          messageSet.add(op.getOutput().getMessage());
-
-        // also messages from any Faults defined within the operation
-        if (op.getFaults() != null)
-        {
-          Iterator faultIt = op.getFaults().values().iterator();
-          Message message;
-          while (faultIt.hasNext())
-          {
-            message = ((Fault) faultIt.next()).getMessage();
-            if (!message.isUndefined())
-              messageSet.add(message);
-          }
-        }
-      }
-
-      if (messageSet.size() == 0)
-      {
-        // Set all message test assertion results to missingInput
-        setMissingInput(
-          EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_MESSAGE));
-      }
-
-      else
-      {
-        // now step through each derived Message
-        Iterator messageIt = messageSet.iterator();
-        while (messageIt.hasNext())
-        {
-          processMessageAssertions(
-            (Message) (messageIt.next()),
-            serviceReference,
-            classPrefix,
-            wsdlDocument);
-        }
-      }
-    }
-  }
-
-  /**
-   * Process message assertions.
-   * @param op - operation.
-   * @param serviceReference service reference.
-   * @param classPrefix class prefix.
-   * @param wsdlDocument WSDL document.
-   * @throws WSIException if problem occurs during processing 
-   *         message assertions.
-   */
-  protected void processMessageAssertions(
-    Operation op,
-    ServiceReference serviceReference,
-    String classPrefix,
-    WSDLDocument wsdlDocument)
-    throws WSIException
-  {
-
-    HashSet messageSet = new HashSet();
-    if (op.getInput() != null && !op.getInput().getMessage().isUndefined())
-      messageSet.add(op.getInput().getMessage());
-
-    if (op.getOutput() != null && !op.getOutput().getMessage().isUndefined())
-      messageSet.add(op.getOutput().getMessage());
-
-    // also messages from any Faults defined within the operation
-    Iterator faultIt = op.getFaults().values().iterator();
-    Message message;
-    while (faultIt.hasNext())
-    {
-      message = ((Fault) faultIt.next()).getMessage();
-      if (!message.isUndefined())
-        messageSet.add(message);
-    }
-
-    if (messageSet.size() == 0)
-    {
-      // Set all message test assertion results to missingInput
-      setMissingInput(
-        EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_MESSAGE));
-    }
-
-    else
-    {
-      // now step through each derived Message
-      Iterator messageIt = messageSet.iterator();
-      while (messageIt.hasNext())
-      {
-        processMessageAssertions(
-          (Message) (messageIt.next()),
-          serviceReference,
-          classPrefix,
-          wsdlDocument);
-      }
-    }
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl#isPrimaryEntryTypeMatch(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-   */
-  protected boolean isPrimaryEntryTypeMatch(
-    TestAssertion testAssertion,
-    EntryContext targetContext)
-  {
-    boolean match = false;
-
-    // If the test assertion entry type matches the target context entry type, then contine
-    if (testAssertion
-      .getEntryTypeName()
-      .equals(targetContext.getEntry().getEntryType().getTypeName()))
-    {
-      match = true;
-    }
-
-    return match;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl#isNotApplicable(org.wsi.test.profile.TestAssertion)
-   */
-  protected boolean isNotApplicable(TestAssertion testAssertion)
-  {
-    boolean notApplicable = false;
-
-    // ADD:
-
-    return notApplicable;
-  }
-
-  /**
-   * Method getSoapFaults.
-   * 
-   * @param inBinding in binding.
-   * @return soap faults.
-   * @throws WSIException if problems occur while processing binding faults.
-   */
-  protected SOAPFault[] getSoapFaults(Binding inBinding) throws WSIException
-  {
-
-    Vector soapFaults = new Vector();
-
-    // Go through each bindingFault one at a time
-    BindingFault[] bindingFaults = getAllBindingFaults(inBinding);
-    for (int fault = 0; fault < bindingFaults.length; fault++)
-    {
-      SOAPFault soapFault = getSoapFault(bindingFaults[fault]);
-      if (soapFault != null)
-      {
-        soapFaults.add(soapFault);
-      }
-    }
-
-    SOAPFault[] soapFaultArray = new SOAPFault[soapFaults.size()];
-    soapFaults.copyInto(soapFaultArray);
-
-    return soapFaultArray;
-  }
-
-  /**
-  * Method getAllBindingFaults.
-  * 
-  * @param inBinding binding.
-  * @return all binding faults.
-  * @throws WSIException if problems occur during processing.
-  */
-  protected BindingFault[] getAllBindingFaults(Binding inBinding)
-    throws WSIException
-  {
-
-    Vector faults = new Vector();
-
-    try
-    {
-
-      Iterator bindingOperations = inBinding.getBindingOperations().iterator();
-
-      while (bindingOperations.hasNext())
-      {
-
-        try
-        {
-          BindingOperation bo = (BindingOperation) bindingOperations.next();
-          Iterator bindingFaults = bo.getBindingFaults().values().iterator();
-          while (bindingFaults.hasNext())
-          {
-
-            faults.add((BindingFault) bindingFaults.next());
-          }
-        }
-        catch (NullPointerException e)
-        {
-
-        }
-      }
-    }
-    catch (NullPointerException e)
-    {
-      // no binding operations in this binding - ignore & continue
-    }
-
-    BindingFault[] faultArray = new BindingFault[faults.size()];
-    faults.copyInto(faultArray);
-
-    return faultArray;
-  }
-
-  /**
-   * Method getWSDLFaults.
-   * 
-   * @param bindingFault a binding fault.
-   * @return WSDL faults.
-   * @throws WSIException if problems occur during processing.
-   */
-  protected SOAPFault getSoapFault(BindingFault bindingFault)
-    throws WSIException
-  {
-
-    SOAPFault soapFault = null;
-    try
-    {
-      Iterator faultExtensibles =
-        bindingFault.getExtensibilityElements().iterator();
-
-      while (faultExtensibles.hasNext() && soapFault == null)
-      {
-        try
-        {
-          soapFault = (SOAPFault) faultExtensibles.next();
-        }
-        catch (ClassCastException e)
-        { // ignore everything but SOAP Fault elements.
-        }
-      }
-    }
-    catch (NullPointerException e)
-    {
-    }
-
-    return soapFault;
-  }
-
-  /**
-   * Method getSoapHeader.
-   * 
-   * @param inBinding a binding.
-   * @return SOAP headers.
-   * @throws WSIException if problems occur during processing.
-   */
-  protected SOAPHeader[] getSoapHeaders(Binding inBinding) throws WSIException
-  {
-    // Get all bindings
-    Binding[] bindingList = new Binding[1];
-    bindingList[0] = inBinding;
-
-    Vector soapHeaderList = new Vector();
-
-    // Go through each binding one at a time
-    for (int binding = 0; binding < bindingList.length; binding++)
-    {
-      try
-      {
-        // get the list of binding Operations
-        BindingOperation[] bindingOperations =
-          (BindingOperation[]) bindingList[binding]
-            .getBindingOperations()
-            .toArray(
-            new BindingOperation[0]);
-
-        // get references to the extensible elements within the <input> and <output> elements of this binding <operation>. 
-        for (int bo = 0; bo < bindingOperations.length; bo++)
-        {
-
-          // Iterate over all input/output extensibles, looking for <SOAP:Body> elements.
-          try
-          {
-            BindingInput bindingInput = bindingOperations[bo].getBindingInput();
-            BindingOutput bindingOutput =
-              bindingOperations[bo].getBindingOutput();
-
-            Iterator extElements =
-              bindingInput.getExtensibilityElements().iterator();
-            while (extElements.hasNext())
-            {
-              try
-              {
-                soapHeaderList.add((SOAPHeader) extElements.next());
-              }
-              catch (ClassCastException e)
-              { // ignore everything but SOAP Header.
-              }
-            }
-
-            extElements = bindingOutput.getExtensibilityElements().iterator();
-            while (extElements.hasNext())
-            {
-              try
-              {
-                soapHeaderList.add((SOAPHeader) extElements.next());
-              }
-              catch (ClassCastException e)
-              { // ignore everything but SOAP Header.
-              }
-            }
-          }
-          catch (NullPointerException e)
-          { // no extensibility elements for <input> or <output> - ignore : not checking this here.
-          }
-        }
-      }
-      catch (NullPointerException e)
-      {
-        // no binding operations in this binding - ignore & continue
-      }
-    }
-
-    SOAPHeader[] soapHeaderArray = new SOAPHeader[soapHeaderList.size()];
-    soapHeaderList.copyInto(soapHeaderArray);
-
-    return soapHeaderArray;
-  }
-
-  /**
-   * Method getSoapHeaderFaults.
-   * 
-   * WSDLDocument getter method - maybe better off in class WSDLDocument...
-   * 
-   * @param inBinding a binding.
-   * @return SOAP header faults.
-   * @throws WSIException if problems occur during processing.
-   */
-  protected SOAPHeaderFault[] getSoapHeaderFaults(Binding inBinding)
-    throws WSIException
-  {
-    Vector soapHeaderFaultList = new Vector();
-
-    // Get the list of SOAP headers
-    SOAPHeader[] soapHeaderArray = getSoapHeaders(inBinding);
-
-    // Go through the list and get the header faults
-    List list = null;
-    for (int header = 0; header < soapHeaderArray.length; header++)
-    {
-      // Get list for this header
-      if ((list = soapHeaderArray[header].getSOAPHeaderFaults()) != null)
-      {
-        // Add to primary list      
-        soapHeaderFaultList.addAll(list);
-      }
-    }
-
-    SOAPHeaderFault[] soapHeaderFaultArray =
-      new SOAPHeaderFault[soapHeaderFaultList.size()];
-    soapHeaderFaultList.copyInto(soapHeaderFaultArray);
-
-    return soapHeaderFaultArray;
-  }
-
-  /**
-   * Method getSoapBodies.
-   * 
-   * WSDLDocument getter method - maybe better off in class WSDLDocument...
-   * 
-   * @param inBinding a binding.
-   * @return SOAP bodies.
-   * @throws WSIException if if problems occur during processing.
-   */
-  protected SOAPBody[] getSoapBodies(Binding inBinding) throws WSIException
-  {
-    // REMOVE: Get all bindings
-    //Binding[] bindingList = wsdlDocument.getBindings();
-    Binding[] bindingList = new Binding[1];
-    bindingList[0] = inBinding;
-
-    Vector soapBodies = new Vector();
-
-    // Go through each binding one at a time
-    for (int binding = 0; binding < bindingList.length; binding++)
-    {
-      // get the list of binding Operations
-      BindingOperation[] bindingOperations =
-        (BindingOperation[]) bindingList[binding]
-          .getBindingOperations()
-          .toArray(
-          new BindingOperation[0]);
-
-      // get references to the extensible elements within the <input> and <output> elements of this binding <operation>. 
-      for (int bo = 0; bo < bindingOperations.length; bo++)
-      {
-
-        // Iterate over all input/output extensibles, looking for <SOAP:Body> elements.
-        try
-        {
-          Iterator inputExtensibles =
-            bindingOperations[bo]
-              .getBindingInput()
-              .getExtensibilityElements()
-              .iterator();
-          while (inputExtensibles.hasNext())
-          {
-            try
-            {
-              soapBodies.add((SOAPBody) inputExtensibles.next());
-            }
-            catch (ClassCastException e)
-            { // ignore everything but SOAP Body elements.
-            }
-          }
-        }
-        catch (NullPointerException e)
-        { // no extensibility elements for <input> - ignore : not checking this here.
-        }
-
-        try
-        {
-          Iterator outputExtensibles =
-            bindingOperations[bo]
-              .getBindingOutput()
-              .getExtensibilityElements()
-              .iterator();
-          while (outputExtensibles.hasNext())
-          {
-            try
-            {
-              soapBodies.add((SOAPBody) outputExtensibles.next());
-            }
-            catch (ClassCastException e)
-            { // ignore everything but SOAP Body elements.
-            }
-          }
-        }
-        catch (NullPointerException e)
-        { // no extensibility elements for <output>.
-        }
-      }
-    }
-
-    SOAPBody[] soapBodyArray = new SOAPBody[soapBodies.size()];
-    soapBodies.copyInto(soapBodyArray);
-
-    return soapBodyArray;
-  }
-
-  /**
-   * Method getSoapBody.
-   * 
-   * @param bindingInput a BindingInput object.
-   * @return  body.
-   * @throws WSIException if problems occur during processing.
-   */
-  protected SOAPBody getSoapBody(BindingInput bindingInput) throws WSIException
-  {
-
-    SOAPBody soapBody = null;
-
-    Iterator extensibles = bindingInput.getExtensibilityElements().iterator();
-    while (extensibles.hasNext())
-    {
-      Object extensible = extensibles.next();
-      if (extensible instanceof SOAPBody)
-      {
-        soapBody = (SOAPBody) extensible;
-        break;
-      }
-    }
-    return soapBody;
-  }
-
-  /**
-   * Method getSoapBody.
-   * 
-   * @param bindingOutput a BindingOutput object.
-   * @return SOAP body.
-   * @throws WSIException if problems occur during processing.
-   */
-  protected SOAPBody getSoapBody(BindingOutput bindingOutput)
-    throws WSIException
-  {
-
-    SOAPBody soapBody = null;
-
-    Iterator extensibles = bindingOutput.getExtensibilityElements().iterator();
-    while (extensibles.hasNext())
-    {
-      Object extensible = extensibles.next();
-      if (extensible instanceof SOAPBody)
-      {
-        soapBody = (SOAPBody) extensible;
-        break;
-      }
-    }
-    return soapBody;
-  }
-
-  /**
-   * Get schema used.
-   * @param def definition.
-   * @return Schema used.
-   * @throws AssertionFailException if problem getting WSDL defintions 
-   *         namespace.
-   */
-  protected String getSchemaUsed(Definition def) throws AssertionFailException
-  {
-    String schemaUsed = "";
-
-    try
-    {
-      // Need to read the file directly, since WSDL4J always puts in the default WSDL namespace
-      Document document = parseXMLDocumentURL(def.getDocumentBaseURI(), null);
-
-      if (document != null)
-      {
-        // Get the root element
-        Element element = document.getDocumentElement();
-
-        // Get the namespace for this element
-        if (element != null)
-          schemaUsed = element.getNamespaceURI();
-      }
-    }
-
-    catch (WSIException we)
-    {
-      throw new AssertionFailException("problem getting WSDL defintions namespace");
-    }
-
-    /*
-    // Get the default namespace
-    String schemaUsed = def.getNamespace("");
-    
-    // If the default was set, then process it to get the namespace
-    if (schemaUsed == null) {
-      // do it the hard way (still better than another DOM parse)... 				
-      //WSDLWriter w = new WSDLWriterImpl();
-      try {
-        WSDLWriter w = WSDLFactory.newInstance().newWSDLWriter();
-      	Document doc = w.getDocument(def);
-      	Element e = doc.getDocumentElement();
-      	schemaUsed = e.getNamespaceURI();
-      } 
-      catch (NullPointerException e) {
-      	throw new AssertionFailException("problem getting WSDL defintions namespace");
-      } 
-      catch (WSDLException e) {
-      	throw new AssertionFailException("problem getting document defintion");
-      }      	
-    }
-    */
-
-    return schemaUsed;
-  }
-
-  /**
-   * Method getSoapBinding.
-   * 
-   * Get the SOAP binding for a Binding.
-    * 
-   * @param binding a binding.
-   * @return a SOAP binding.
-   * @throws WSIException if problems occur during processing.
-   */
-  public static SOAPBinding getSoapBinding(Binding binding) throws WSIException
-  {
-    SOAPBinding soapBinding = null;
-
-    // Get the list of extensibility elements
-    List exElements = binding.getExtensibilityElements();
-    if (exElements != null)
-    {
-      Iterator iterator = binding.getExtensibilityElements().iterator();
-
-      //  Check for <soap:binding> element
-      while ((iterator.hasNext()) && (soapBinding == null))
-      {
-        try
-        {
-          soapBinding = (SOAPBinding) iterator.next();
-        }
-        catch (ClassCastException e)
-        { // ignore everything but SOAP Binding element
-        }
-      }
-    }
-
-    return soapBinding;
-  }
-
-  /** 
-   * Create XML schema validator.  This is done here because some compilers do not allow
-   * the documentList field to be accessed from within an inner class.
-   * @param documentBaseURI the base URL.
-   * @return newly created XML schema validator.
-   */
-  protected XMLSchemaValidator createXMLSchemaValidator(String documentBaseURI)
-  {
-    // Create XML schema validator
-    return new XMLSchemaValidator(documentBaseURI);
-  }
-
-  /**
-   * Search xsd schema or xsd import from node. If node is xsd import it's loading schema.
-   * @param definition a Definition object.
-   * @return a list of schema target namespaces.
-   * @throws WSIException if problem during processing method.
-   */
-  protected List getSchemaTargetNamespaceList(Definition definition)
-    throws WSIException
-  {
-    List list = null, nextList = null;
-
-    // Get list of extension elements within the types element
-    Types types = null;
-    if ((types = definition.getTypes()) != null)
-    {
-      Iterator iterator = types.getExtensibilityElements().iterator();
-
-      ExtensibilityElement extElement = null;
-      while (iterator.hasNext())
-      {
-        // Get next ext. element
-        extElement = (ExtensibilityElement) iterator.next();
-        // If this is an unknown ext. element, then see if it is a schema element
-        TargetNamespaceProcessor tnsProcessor = null;
-        if (extElement instanceof UnknownExtensibilityElement)
-        {
-          tnsProcessor = new TargetNamespaceProcessor(definition.getDocumentBaseURI());
-
-
-          if ((nextList =
-            tnsProcessor.processAllSchema(
-              ((UnknownExtensibilityElement) extElement).getElement()))
-            != null)
-            if (list == null)
-              list = new Vector();
-          list.addAll(nextList);
-        }
-      }
-    }
-
-    return list;
-  }
- /**
-   * Search xsd schema or xsd import from node. If node is xsd import it's loading schema.
-   * @param definition a Definition object.
-   * @return a list of schema target namespaces.
-   * @throws WSIException if problem during processing method.
-   */
-  protected List getSchemaNamespaceList(Definition definition)
-    throws WSIException
-  {
-    List list = new Vector();
-    
-    // Always add current document targetNamespace
-    List targetNamespaceList = getSchemaTargetNamespaceList(definition);
-    
-    if ((targetNamespaceList != null) && !targetNamespaceList.isEmpty())
-      list.addAll(targetNamespaceList);
-    
-    // Get list of imported WSDL documents
-    Map importMap = definition.getImports();
-
-    Import imp;
-
-    // Add each imports targetNamespace to the list
-    if (importMap != null && !importMap.isEmpty())
-    {
-      Iterator values = importMap.values().iterator();
-      List importList;
-      while (values.hasNext())
-      {
-        importList = (List) values.next();
-        Iterator imports = importList.iterator();
-        while (imports.hasNext())
-        {
-          imp = (Import) imports.next();
-          if (imp != null && imp.getDefinition() != null)
-          	list.addAll(getSchemaNamespaceList(imp.getDefinition()));
-        }
-      }
-    }
-
-    return list;
-  }
-
-  /**
-   * Build list of WSDL targetNamespaces.
-   * @param definition a Definition object.
-   * @return list of WSDL targetNamespaces.
-   */
-  protected List getWSDLTargetNamespaceList(Definition definition)
-  {
-    List list = new Vector();
-
-    // Always add current document targetNamespace
-    if (definition.getTargetNamespace() != null)
-      list.add(definition.getTargetNamespace());
-
-    // Get list of imported WSDL documents
-    Map importMap = definition.getImports();
-
-    Import imp;
-
-    // Add each imports targetNamespace to the list
-    if (importMap != null && !importMap.isEmpty())
-    {
-      Iterator values = importMap.values().iterator();
-      List importList;
-      while (values.hasNext())
-      {
-        importList = (List) values.next();
-        Iterator imports = importList.iterator();
-        while (imports.hasNext())
-        {
-          imp = (Import) imports.next();
-          if (imp != null && imp.getDefinition() != null)
-          list.addAll(getWSDLTargetNamespaceList(imp.getDefinition()));
-            // list.add(imp.getDefinition().getTargetNamespace());
-        }
-      }
-    }
-
-    return list;
-  }
-
-  protected class BindingMatch
-  {
-    private Binding binding;
-    private BindingOperation bindingOperation;
-    private SOAPBinding soapBinding;
-    //private Vector bindingArgs; // set of BindingInputs and BindingOutputs
-    private BindingInput bindingInput;
-    private BindingOutput bindingOutput;
-
-    // ADD: need to include BindingFault support...
-    public BindingMatch(
-      Binding b,
-      BindingOperation bo,
-      SOAPBinding sb,
-      BindingInput bin,
-      BindingOutput bout)
-    {
-      binding = b;
-      bindingOperation = bo;
-      soapBinding = sb;
-      //bindingArgs = new Vector();
-      //if (bin  != null) { bindingArgs.add(bin);  }
-      //if (bout != null) { bindingArgs.add(bout); }
-      bindingInput = bin;
-      bindingOutput = bout;
-    }
-
-    public BindingMatch(
-      Binding b,
-      BindingOperation bo,
-      SOAPBinding sb,
-      BindingInput bin)
-    {
-      this(b, bo, sb, bin, null);
-    }
-
-    public BindingMatch(
-      Binding b,
-      BindingOperation bo,
-      SOAPBinding sb,
-      BindingOutput bout)
-    {
-      this(b, bo, sb, null, bout);
-    }
-
-    /**
-     * Returns the soapBinding.
-     * @return SOAPBinding
-     */
-    public SOAPBinding getSoapBinding()
-    {
-      return soapBinding;
-    }
-
-    /**
-     * Returns the bindingOperation.
-     * @return BindingOperation
-     */
-    public BindingOperation getBindingOperation()
-    {
-      return bindingOperation;
-    }
-
-    /**
-     * Returns the bindingInput.
-     * @return BindingInput
-     */
-    public BindingInput getBindingInput()
-    {
-      return bindingInput;
-    }
-
-    /**
-     * Returns the bindingOutput.
-     * @return BindingOutput
-     */
-    public BindingOutput getBindingOutput()
-    {
-      return bindingOutput;
-    }
-
-    public boolean hasBindingInput()
-    {
-      return (this.bindingInput != null);
-    }
-
-    public boolean hasBindingOutput()
-    {
-      return (this.bindingOutput != null);
-    }
-
-    /**
-     * Returns the binding.
-     * @return Binding
-     */
-    public Binding getBinding()
-    {
-      return binding;
-    }
-
-  }
-
-  /**
-   * Get binding matches.
-  * @param binding a binding.
-  * @param soapBindingStyle soap binding style.
-  * @param soapBodyUse soap body use.
-  * @return binding matches.
-  * @throws WSIException if problems occur during processing.
-  */
-  public BindingMatch[] getBindingMatches(
-    Binding binding,
-    String soapBindingStyle,
-    String soapBodyUse)
-    throws WSIException
-  {
-
-    Vector bindingMatches = new Vector();
-
-    // Check binding
-    SOAPBinding soapBinding = getSoapBinding(binding);
-
-    // check that the soap:binding for this WSDL binding is the specified style
-    // ADD: check for null pointer
-    if (soapBinding != null)
-    {
-      String defaultStyle = soapBinding.getStyle();
-
-      if (defaultStyle == null)
-      {
-        defaultStyle = WSIConstants.ATTRVAL_SOAP_BIND_STYLE_DOC;
-      }
-
-      // Get the set of operations for this WSDL binding
-      List bindingOpsList = binding.getBindingOperations();
-      if (bindingOpsList != null)
-      {
-        Iterator bindingOps = bindingOpsList.iterator();
-        // for each binding operation:
-        while (bindingOps.hasNext())
-        {
-          BindingOperation bindingOp = (BindingOperation) bindingOps.next();
-
-          SOAPOperation soapOp = getSoapOperation(bindingOp);
-
-          if ((soapOp == null && defaultStyle.equals(soapBindingStyle))
-            || (soapOp != null
-              && soapOp.getStyle() == null
-              && defaultStyle.equals(soapBindingStyle))
-            || (soapOp != null
-              && soapOp.getStyle() != null
-              && soapOp.getStyle().equals(soapBindingStyle)))
-          {
-            // check binding input & output
-            BindingInput bInput = bindingOp.getBindingInput();
-            if (bInput != null)
-            {
-              SOAPBody inputSoapBody = getSoapBody(bInput);
-              if (inputSoapBody == null
-                || (inputSoapBody.getUse() != null
-                  && !inputSoapBody.getUse().equals(soapBodyUse)))
-              {
-                bInput = null;
-              }
-            }
-
-            BindingOutput bOutput = bindingOp.getBindingOutput();
-            if (bOutput != null)
-            {
-              SOAPBody outputSoapBody = getSoapBody(bOutput);
-
-              if (outputSoapBody == null
-                || (outputSoapBody.getUse() != null
-                  && !outputSoapBody.getUse().equals(soapBodyUse)))
-              {
-                bOutput = null;
-              }
-            }
-
-            if ((bOutput != null) || (bInput != null))
-            {
-              // we have a match, add to the vector
-              bindingMatches.add(
-                new BindingMatch(
-                  binding,
-                  bindingOp,
-                  soapBinding,
-                  bInput,
-                  bOutput));
-            }
-          }
-        }
-      }
-    }
-
-    BindingMatch[] BindingMatchArray = new BindingMatch[bindingMatches.size()];
-    bindingMatches.copyInto(BindingMatchArray);
-    return BindingMatchArray;
-  }
-
-  /**
-   * Method getSoapOperation.
-   *
-   * @param bindingOperation a binding operation.
-   * @return a soap operation.
-   * @throws WSIException if problems while processing.
-   */
-  public static SOAPOperation getSoapOperation(BindingOperation bindingOperation)
-    throws WSIException
-  {
-
-    if (bindingOperation.getExtensibilityElements() == null)
-    {
-      return null;
-    }
-
-    Iterator extensibles =
-      bindingOperation.getExtensibilityElements().iterator();
-    while (extensibles.hasNext())
-    {
-      Object extensible = extensibles.next();
-      if (extensible instanceof SOAPOperation)
-      {
-        return (SOAPOperation) extensible;
-      }
-    }
-    return null;
-  }
-
-  /* 
-   * Returns an array of SOAPOperations corresponding to the wsdl:binding supplied.
-   */
-  protected HashMap getSoapOperations(Binding binding) throws WSIException
-  {
-    HashMap soapOperationList = new HashMap();
-
-    if (binding.getBindingOperations() == null)
-    {
-      return null;
-    }
-
-    //Vector soapOpVector = new Vector();
-
-    // Get the list of binding operations
-    Iterator operations = binding.getBindingOperations().iterator();
-
-    // Check each binding operation to see if it has a soap operation element
-    BindingOperation bindingOperation = null;
-    while (operations.hasNext())
-    {
-      bindingOperation = (BindingOperation) operations.next();
-      Iterator extensibles =
-        bindingOperation.getExtensibilityElements().iterator();
-      while (extensibles.hasNext())
-      {
-        Object extensible = extensibles.next();
-        if (extensible instanceof SOAPOperation)
-        {
-          soapOperationList.put(extensible, bindingOperation.getName());
-        }
-      }
-    }
-
-    //return (SOAPOperation[])soapOpVector.toArray(new SOAPOperation[] {});
-    return soapOperationList;
-  }
-
-  /**
-   * Check part attributes.
-   * @param bindingMatch an array of BindingMatch objects.
-   * @param inOrOut a String object.
-   * @param attrib attribute.
-   * @return a boolean.
-   * @throws AssertionFailException if the part is not compliant.
-   */
-  // GT - rework this method with a better way of parameterizing the getters required for the invocation.
-  protected boolean checkPartAttributes(
-    BindingMatch[] bindingMatch,
-    String inOrOut,
-    String attrib)
-    throws AssertionFailException
-  {
-
-    if (!(inOrOut.equals("useInput") || inOrOut.equals("useOutput"))
-      || !(attrib.equals("useType") || attrib.equals("useElement")))
-    {
-      // invalid argument value supplied by calling method - "internal error"
-      return false;
-    }
-
-    for (int i = 0; i < bindingMatch.length; i++)
-    {
-      BindingMatch nextMatch = bindingMatch[i];
-
-      // check the associated parts
-      Message msg;
-      Map parts;
-      Iterator partIteration;
-
-      BindingOperation bindingOp = nextMatch.getBindingOperation();
-      if (bindingOp == null)
-      {
-        continue; // no Binding Operation for some reason
-      }
-
-      Operation op = bindingOp.getOperation();
-
-      /*	ADD: handle soap:faults in similar way	   		
-      try {
-      // check faults - remarkably similar.... (need to retain operation id for failuredetail msg)
-      	if (nextMatch.hasBindingFault()) {
-      				
-      		msg = op.getFault().getMessage();
-      		parts = msg.getParts();
-      				    					     			
-      		//check that each part has an element attribute    			
-      		partIteration = parts.values().iterator();
-      		while (partIteration.hasNext()) {
-      			Part part = (Part)partIteration.next();
-      			if (part.getElementName() == null) {
-      				throw new AssertionFailException("OPERATION: " + op + "MESSAGE: " + msg);
-      			}
-      		}	 			
-      	}
-      }
-      catch (NullPointerException n) {
-      	// no parts found - this qualifies an assertion failure
-      	throw new AssertionFailException(n.getMessage());
-      }
-      */
-
-      try
-      {
-
-        QName attributeName;
-
-        //GT: Do we need to check BindingInput / Output here ??
-
-        if (inOrOut.equals("useInput"))
-        {
-          if (op.getInput() == null || !nextMatch.hasBindingInput())
-          {
-            // No Input so nothing to check
-            continue;
-          }
-
-          msg = op.getInput().getMessage();
-
-        }
-        else
-        { // Looking for Output
-          if (op.getOutput() == null || !nextMatch.hasBindingOutput())
-          {
-            // No Output so nothing to check
-            continue;
-          }
-
-          msg = op.getOutput().getMessage();
-        }
-
-        if (msg == null)
-        {
-          continue; // nothing to check from this Binding Match (?)
-        }
-
-        // Get the list of parts 
-        parts = msg.getParts();
-
-        // If there is a parts attribute, then only process those parts
-        List partsNameList = null;
-        if ((partsNameList = getPartsList(nextMatch, inOrOut)) != null)
-        {
-          Vector partsList = new Vector();
-          Iterator partsNameIterator = partsNameList.iterator();
-          while (partsNameIterator.hasNext())
-          {
-            partsList.add(parts.get((String) partsNameIterator.next()));
-          }
-          partIteration = partsList.iterator();
-        }
-
-        // Otherwise use the complete list of parts
-        else
-        {
-          partIteration = parts.values().iterator();
-        }
-
-        //check that each part has an element or type attribute    			
-        while (partIteration.hasNext())
-        {
-          Part part = (Part) partIteration.next();
-          if (attrib.equals("useElement"))
-          {
-            attributeName = part.getElementName();
-          }
-          else
-          { // "useType"
-            attributeName = part.getTypeName();
-          }
-
-          if (attributeName == null)
-          {
-            throw new AssertionFailException(
-              "Name of operation that failed: "
-                + op.getName()
-                + "\n"
-                + op.toString()
-                + "\n"
-                + "\nName of message that failed: "
-                + msg.getQName()
-                + "\n"
-                + msg.toString());
-          }
-        }
-      }
-      catch (NullPointerException n)
-      {
-        // no parts found - this qualifies an assertion failure
-        throw new AssertionFailException(n.toString());
-      }
-    }
-    return true; // tests successful
-  }
-
-  /**
-   * Get parts list from a soapbind:body element.
-   */
-  private List getPartsList(BindingMatch bindingMatch, String type)
-  {
-    List partsList = null;
-    Iterator iterator = null;
-
-    BindingOperation bindingOp;
-
-    try
-    {
-      // Get the binding operation
-      bindingOp = bindingMatch.getBindingOperation();
-
-      // Determine if the binding operation contains a soapbind:body with a parts attribute
-      if (type.equals("useInput"))
-      {
-        iterator =
-          bindingOp.getBindingInput().getExtensibilityElements().iterator();
-      }
-      else
-      {
-        iterator =
-          bindingOp.getBindingOutput().getExtensibilityElements().iterator();
-      }
-    }
-    catch (NullPointerException e)
-    {
-      return null;
-      // either no binding operation, binding input/output, or SOAP element
-    }
-
-    // Determine if the binding operation contains a soapbind:body with a parts attribute
-    while ((iterator.hasNext()) && (partsList == null))
-    {
-      try
-      {
-        SOAPBody soapBody = (SOAPBody) iterator.next();
-        partsList = soapBody.getParts();
-      }
-      catch (ClassCastException cce)
-      { // not a SOAPBody extensibility element so ignore
-      }
-    }
-
-    return partsList;
-  }
-
-  /**
-   * Get element location.
-   * @param wsdlDocument WSDL document.
-   * @param wsdlElement WSDL element.
-   * @return element location.
-   */
-  protected ElementLocation getElementLocation(
-    WSDLDocument wsdlDocument,
-    Object wsdlElement)
-  {
-    ElementLocation elementLocation = null;
-    WSDLElementList wsdlElementList;
-
-    if ((wsdlElementList = wsdlDocument.getElementList()) != null)
-    {
-      elementLocation = wsdlElementList.getElementLocation(wsdlElement);
-    }
-
-    return elementLocation;
-  }
-
-  /**
-   * Create failure detail.
-   * @param message a message.
-   * @param entryContext entry context.
-   * @return failure detail.
-   */
-  protected FailureDetail createFailureDetail(
-    String message,
-    EntryContext entryContext)
-  {
-    return createFailureDetail(
-      message,
-      entryContext,
-      entryContext.getEntry().getEntryDetail());
-  }
-
-  /**
-   * Create failure detail.
-   * @param message a message.
-   * @param entryContext entry context.
-   * @param wsdlElement WSDL element.
-   * @return failure detail.
-   */
-  protected FailureDetail createFailureDetail(
-    String message,
-    EntryContext entryContext,
-    Object wsdlElement)
-  {
-    FailureDetail failureDetail = reporter.createFailureDetail();
-    failureDetail.setFailureMessage(message);
-    failureDetail.setElementLocation(
-      getElementLocation(entryContext.getWSDLDocument(), wsdlElement));
-    return failureDetail;
-  }
-
-  /** 
-   * SOAPBody, SOAPFault, SOAPHeader and SOAPHeaderFault class 
-   * interfaces have compatible getUse() and getNamespaceURI() 
-   * methods, but wsdl4j does not declare them at the parent interface. 
-   * Therefore use reflection to access these common methods.
-   * 
-   * @param extElement extensibility element.
-   * @return true if namespace is found in SOAP literal.
-   * @throws NoSuchMethodException if this method cannot be found.
-   * @throws InvocationTargetException if problems occur in an invoked method or constructor
-   * @throws IllegalAccessException if there is am attempt to load a
-   *         class that it does not have access to.
-   */
-  protected boolean namespaceFoundInSoapLiteral(ExtensibilityElement extElement)
-    throws NoSuchMethodException, InvocationTargetException, IllegalAccessException
-  {
-    Class c = extElement.getClass();
-    Method getUseMethod = c.getMethod("getUse", new Class[0]);
-    Method getNamespaceURIMethod = c.getMethod("getNamespaceURI", new Class[0]);
-
-    // (use attribute is mandatory but the null case is checked for since a missing use is not
-    // checked with this TA. If its missing its invalid but we don't know whether we have doc-lit).     		
-    if (getUseMethod.invoke(extElement, null) == null
-      || !getUseMethod.invoke(extElement, null).equals(
-        WSIConstants.ATTRVAL_SOAP_BODY_USE_LIT))
-    {
-      return false;
-    }
-
-    // return true if namespace found
-    boolean namespaceFound =
-      (getNamespaceURIMethod.invoke(extElement, null) != null);
-
-    // return true if namespace found
-    return namespaceFound;
-
-  }
-
-  /**
-   * Verify extensibility element uses literal.
-   * @param extensible - extensibility element
-   * @return boolean
-   * @throws NoSuchMethodException if this method cannot be found.
-   * @throws InvocationTargetException if problems occur in an invoked method or constructor
-   * @throws IllegalAccessException if there is am attempt to load a
-   *         class that it does not have access to.
-   */
-  protected boolean isLiteral(ExtensibilityElement extensible)
-    throws NoSuchMethodException, InvocationTargetException, IllegalAccessException
-  {
-
-    Class c = extensible.getClass();
-    Method getUseMethod = c.getMethod("getUse", new Class[0]);
-
-    // (use attribute is mandatory but the null case is checked for since a missing use is not
-    // checked with this TA. If its missing its invalid but we don't know whether we have doc-lit).     		
-    if (getUseMethod.invoke(extensible, null) == null
-      || !getUseMethod.invoke(extensible, null).equals(
-        WSIConstants.ATTRVAL_SOAP_BODY_USE_LIT))
-    {
-      return false;
-    }
-
-    // return true if shown to have use="literal"
-    return true;
-
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2010.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2010.java
deleted file mode 100644
index 4b39b5d48..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2011.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2011.java
deleted file mode 100644
index 61d5da778..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2012.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2012.java
deleted file mode 100644
index 21d9ef231..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2013.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2013.java
deleted file mode 100644
index d4f01cf16..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2014.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2014.java
deleted file mode 100644
index fbb6a6ae2..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2017.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2017.java
deleted file mode 100644
index 93e9820b6..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2018.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2018.java
deleted file mode 100644
index 3845e3130..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2019.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2019.java
deleted file mode 100644
index fb197f277..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2020.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2020.java
deleted file mode 100644
index 25f0206d4..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2021.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2021.java
deleted file mode 100644
index 437f1bc35..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2022.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2022.java
deleted file mode 100644
index 826996572..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2032.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2032.java
deleted file mode 100644
index 6c07ac1a6..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2098.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2098.java
deleted file mode 100644
index 82a905c27..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2099.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2099.java
deleted file mode 100644
index 514b52c08..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2100.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2100.java
deleted file mode 100644
index da15585c4..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2101.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2101.java
deleted file mode 100644
index 68f09db6a..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2102.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2102.java
deleted file mode 100644
index 63627d05c..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2103.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2103.java
deleted file mode 100644
index bb75f197c..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2104.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2104.java
deleted file mode 100644
index b7427795e..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2105.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2105.java
deleted file mode 100644
index bbbddfeec..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2107.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2107.java
deleted file mode 100644
index dc5742fd8..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2108.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2108.java
deleted file mode 100644
index 746beaa3f..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2110.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2110.java
deleted file mode 100644
index e70cc4d30..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2111.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2111.java
deleted file mode 100644
index ef9286fb9..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2112.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2112.java
deleted file mode 100644
index ed40abe32..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2113.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2113.java
deleted file mode 100644
index 0c1189792..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2114.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2114.java
deleted file mode 100644
index ef55a24eb..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2115.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2115.java
deleted file mode 100644
index 916ef7a3d..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2116.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2116.java
deleted file mode 100644
index 03358e71d..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2117.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2117.java
deleted file mode 100644
index 87b377cb3..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2118.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2118.java
deleted file mode 100644
index d6d33076b..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2119.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2119.java
deleted file mode 100644
index 1416ce33a..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2120.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2120.java
deleted file mode 100644
index 4f2e205b7..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2122.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2122.java
deleted file mode 100644
index 22994ec84..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2123.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2123.java
deleted file mode 100644
index 44f05a6b4..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2201.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2201.java
deleted file mode 100644
index 696457c71..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2202.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2202.java
deleted file mode 100644
index ebb59f35f..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2208.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2208.java
deleted file mode 100644
index 4ed71303b..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2402.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2402.java
deleted file mode 100644
index 10c57852b..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2403.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2403.java
deleted file mode 100644
index 8facd42e0..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2404.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2404.java
deleted file mode 100644
index 9dfa8e9c8..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2406.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2406.java
deleted file mode 100644
index c6d420a79..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2416.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2416.java
deleted file mode 100644
index 770bf3f6b..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2417.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2417.java
deleted file mode 100644
index 7c2383641..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2700.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2700.java
deleted file mode 100644
index 39bbb363b..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2701.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2701.java
deleted file mode 100644
index 4337f53d3..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2703.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2703.java
deleted file mode 100644
index 54637088b..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI4200.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI4200.java
deleted file mode 100644
index ed43a7c31..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI4201.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI4201.java
deleted file mode 100644
index f7233d977..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI4202.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI4202.java
deleted file mode 100644
index 92d9baed5..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/report/ArtifactReference.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/ArtifactReference.java
deleted file mode 100644
index 89899de60..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/ArtifactReference.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.report;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.document.DocumentElement;
-
-/**
- * An artifact reference.
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public interface ArtifactReference extends DocumentElement
-{
-  /**
-   * Element name.
-   */
-  public static final String ELEM_NAME = WSIConstants.ELEM_ARTIFACT_REFERENCE;
-
-  /**
-   * QName.
-   */
-  public static final QName QNAME =
-    new QName(WSIConstants.NS_URI_WSI_REPORT, ELEM_NAME);
-
-  /**
-   * Get timestamp.
-   * @return timestamp.
-   * @see #setTimestamp
-   */
-  public String getTimestamp();
-
-  /**
-   * Set timestamp.
-   * @param timestamp a timestamp.
-   * @see #getTimestamp
-   */
-  public void setTimestamp(String timestamp);
-
-  /**
-   * Get document element.
-   * @return document element.
-   * @see #setDocumentElement
-   */
-  public DocumentElement getDocumentElement();
-
-  /**
-   * Set document element.
-   * @param documentElement document element.
-   * @param namespaceName   namespace prefix.
-   * @see #getDocumentElement
-   */
-  public void setDocumentElement(
-    DocumentElement documentElement,
-    String namespaceName);
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/AssertionResult.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/AssertionResult.java
deleted file mode 100644
index c5113e86f..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/report/BuildReport.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/BuildReport.java
deleted file mode 100644
index 09dbc2fe4..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/report/Entry.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/Entry.java
deleted file mode 100644
index e9cd89acb..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/report/EntryContainer.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/EntryContainer.java
deleted file mode 100644
index 9991e1591..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/report/EntryResult.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/EntryResult.java
deleted file mode 100644
index 77a4f576a..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/report/FailureDetail.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/FailureDetail.java
deleted file mode 100644
index 4c8acb3ad..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/FailureDetail.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.report;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.document.DocumentElement;
-import org.eclipse.wst.wsi.internal.core.xml.dom.ElementLocation;
-
-/**
- * Failure detail.
- * 
- * @author Peter  Brittenham (peterbr@us.ibm.com)
- * @version 1.0.1
- */
-public interface FailureDetail extends DocumentElement
-{
-  /**
-   * Element name.
-   */
-  public static final String ELEM_NAME = WSIConstants.ELEM_FAILURE_DETAIL;
-
-  /**
-   * QName.
-   */
-  public static final QName QNAME =
-    new QName(WSIConstants.NS_URI_WSI_REPORT, ELEM_NAME);
-
-  /**
-   * Get failure detail message.
-   * @return failure detail message.
-   * @see #setFailureMessage
-   */
-  public String getFailureMessage();
-
-  /**
-   * Set failure detail message.
-   * @param failureMessage failure detail message.
-   * @see #getFailureMessage
-   */
-  public void setFailureMessage(String failureMessage);
-
-  /**
-   * Get reference type.
-   * @return reference type.
-   * @see #setReferenceType
-   */
-  public String getReferenceType();
-
-  /**
-   * Set reference type.
-   * @param referenceType reference type.
-   * @see #getReferenceType
-   */
-  public void setReferenceType(String referenceType);
-
-  /**
-   * Get reference ID.
-   * @return reference ID.
-   * @see #setReferenceIDn
-   */
-  public String getReferenceID();
-
-  /**
-   * Set reference ID.
-   * @param referenceID reference ID.
-   * @see #getReferenceID
-   */
-  public void setReferenceIDn(String referenceID);
-
-  /**
-   * Get element location.
-   * @return element location.
-   * @see #setElementLocation
-   */
-  public ElementLocation getElementLocation();
-
-  /**
-   * Set element location.
-   * @param elementLocation element location.
-   * @see #getElementLocation
-   */
-  public void setElementLocation(ElementLocation elementLocation);
-
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/PrereqFailedList.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/PrereqFailedList.java
deleted file mode 100644
index 81059d363..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/PrereqFailedList.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.report;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.document.DocumentElement;
-
-/**
- * This interface is used to maintain and access the Prerequisite Failed List.
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public interface PrereqFailedList extends DocumentElement
-{
-  /**
-    * Element name.
-    */
-  public static final String ELEM_NAME = WSIConstants.ELEM_PREREQ_FAILED_LIST;
-
-  /**
-   * QName.
-   */
-  public static final QName QNAME =
-    new QName(WSIConstants.NS_URI_WSI_REPORT, ELEM_NAME);
-
-  /**
-   * Add test assertion ID.
-   * @param assertionID test assertion ID.
-   */
-  public void addTestAssertionID(String assertionID);
-
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/Report.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/Report.java
deleted file mode 100644
index 1f0ad51e7..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/report/ReportArtifact.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/ReportArtifact.java
deleted file mode 100644
index 4a1fb9ced..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/report/ReportContext.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/ReportContext.java
deleted file mode 100644
index 06507b095..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/report/ReportWriter.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/ReportWriter.java
deleted file mode 100644
index ae7fc6667..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/report/Reporter.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/Reporter.java
deleted file mode 100644
index 1ea784313..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/report/WriteReport.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/WriteReport.java
deleted file mode 100644
index 8c70d9ad3..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/report/impl/ArtifactReferenceImpl.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/impl/ArtifactReferenceImpl.java
deleted file mode 100644
index d4b46ba3a..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/impl/ArtifactReferenceImpl.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.report.impl;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.document.DocumentElement;
-import org.eclipse.wst.wsi.internal.core.report.ArtifactReference;
-
-/**
- * An artifact reference.
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public class ArtifactReferenceImpl implements ArtifactReference
-{
-  /**
-   * Timestamp.
-   */
-  protected String timestamp = null;
-
-  /**
-   * Optional document element.
-   */
-  protected DocumentElement documentElement = null;
-
-  /**
-   * Optional document element namespace name.
-   */
-  protected String elementNamespaceName = null;
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.ArtifactReference#getTimestamp()
-   */
-  public String getTimestamp()
-  {
-    return this.timestamp;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.ArtifactReference#setTimestamp(String)
-   */
-  public void setTimestamp(String timestamp)
-  {
-    this.timestamp = timestamp;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.ArtifactReference#getDocumentElement()
-   */
-  public DocumentElement getDocumentElement()
-  {
-    return this.documentElement;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.ArtifactReference#setDocumentElement(DocumentElement, String)
-   */
-  public void setDocumentElement(
-    DocumentElement documentElement,
-    String namespaceName)
-  {
-    this.documentElement = documentElement;
-    this.elementNamespaceName = namespaceName;
-  }
-
-  /* (non-Javadoc)
-   * Get string representation of this object.
-   */
-  public String toString()
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    pw.println("  Artifact Reference: ");
-    pw.println("    timestamp ........... " + this.timestamp);
-
-    if (this.documentElement != null)
-      pw.println(
-        "    documentElement ..... "
-          + this.documentElement.toXMLString(this.elementNamespaceName));
-
-    return sw.toString();
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.DocumentElement#toXMLString(String)
-   */
-  public String toXMLString(String namespaceName)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    String nsName = namespaceName;
-    if ((!nsName.equals("") && (!nsName.endsWith(":"))))
-      nsName += ":";
-
-    // Create element 
-    pw.print("    <" + nsName + ELEM_NAME + " ");
-    pw.println(WSIConstants.ATTR_TIMESTAMP + "=\"" + getTimestamp() + "\">");
-
-    // If there is a document element, then add it
-    if (this.documentElement != null)
-    {
-      pw.print(documentElement.toXMLString(this.elementNamespaceName));
-    }
-
-    // End element
-    pw.println("    </" + nsName + ELEM_NAME + ">");
-
-    return sw.toString();
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/impl/AssertionResultImpl.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/impl/AssertionResultImpl.java
deleted file mode 100644
index 5b2d8ce14..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/report/impl/DefaultReporter.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/impl/DefaultReporter.java
deleted file mode 100644
index bffdc339a..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/report/impl/EntryContainerImpl.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/impl/EntryContainerImpl.java
deleted file mode 100644
index 956d086db..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/report/impl/EntryImpl.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/impl/EntryImpl.java
deleted file mode 100644
index e91a1b7ef..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/report/impl/EntryResultImpl.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/impl/EntryResultImpl.java
deleted file mode 100644
index 61ffb72d9..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/impl/EntryResultImpl.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.report.impl;
-
-import java.util.TreeMap;
-
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.report.EntryResult;
-
-/**
- * Result for a specific test assertion.
- * 
- * @author Peter  Brittenham (peterbr@us.ibm.com)
- * @version 1.0.1
- */
-public abstract class EntryResultImpl implements EntryResult
-{
-  /**
-   * Assertion result list.
-   */
-  protected TreeMap assertionResultList = new TreeMap();
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.EntryResult#addAssertionResult(org.wsi.test.report.AssertionResult)
-   */
-  public void addAssertionResult(AssertionResult assertionResult)
-  {
-    this.assertionResultList.put(
-      assertionResult.getAssertion().getId(),
-      assertionResult);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.EntryResult#getAssertionResultList()
-   */
-  public TreeMap getAssertionResultList()
-  {
-    return assertionResultList;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.EntryResult#getAssertionResult(String)
-   */
-  public AssertionResult getAssertionResult(String assertionId)
-  {
-    return (AssertionResult) assertionResultList.get(assertionId);
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/impl/FailureDetailImpl.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/impl/FailureDetailImpl.java
deleted file mode 100644
index dc7dc5143..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/impl/FailureDetailImpl.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.report.impl;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.report.FailureDetail;
-import org.eclipse.wst.wsi.internal.core.xml.dom.ElementLocation;
-
-import com.ibm.wsdl.util.xml.DOMUtils;
-
-/**
- * This class will ...
- * 
- * @author Peter  Brittenham (peterbr@us.ibm.com)
- * @version 1.0.1
- */
-public class FailureDetailImpl implements FailureDetail
-{
-  protected String failureMessage = null;
-  protected String referenceType = null;
-  protected String referenceID = null;
-  protected ElementLocation elementLocation = null;
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.FailureDetail#getFailureMessage()
-   */
-  public String getFailureMessage()
-  {
-    return this.failureMessage;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.FailureDetail#setFailureMessage(String)
-   */
-  public void setFailureMessage(String failureMessage)
-  {
-    this.failureMessage = failureMessage;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.FailureDetail#getReferenceType()
-   */
-  public String getReferenceType()
-  {
-    return this.referenceType;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.FailureDetail#setReferenceType(String)
-   */
-  public void setReferenceType(String referenceType)
-  {
-    this.referenceType = referenceType;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.FailureDetail#getReferenceID()
-   */
-  public String getReferenceID()
-  {
-    return this.referenceID;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.FailureDetail#setReferenceIDn(String)
-   */
-  public void setReferenceIDn(String referenceID)
-  {
-    this.referenceID = referenceID;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.FailureDetail#getElementLocation()
-   */
-  public ElementLocation getElementLocation()
-  {
-    return this.elementLocation;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.FailureDetail#setElementLocation(ElementLocation)
-   */
-  public void setElementLocation(ElementLocation elementLocation)
-  {
-    this.elementLocation = elementLocation;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.DocumentElement#toXMLString(String)
-   */
-  public String toXMLString(String namespaceName)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    String nsName = namespaceName;
-    if ((!nsName.equals("") && (!nsName.endsWith(":"))))
-      nsName += ":";
-
-    // Create element 
-    pw.print("      <" + nsName + ELEM_NAME + " xml:lang=\"en\" ");
-
-    if (this.referenceType != null)
-      pw.print(
-        WSIConstants.ATTR_REFERENCE_TYPE + "=\"" + this.referenceType + "\" ");
-
-    if (this.referenceID != null)
-      pw.print(
-        WSIConstants.ATTR_REFERENCE_ID + "=\"" + this.referenceID + "\" ");
-
-    // ADD: Need to use a different namespace
-    /*
-    if (this.elementLocation != null) {
-      String nsNameExt = "reportext";
-      pw.print("xmlns:" + nsNameExt + "=\"" + WSIConstants.NS_URI_WSI_REPORT + "/ext/\"");
-      pw.print(nsNameExt + ":" + WSIConstants.ATTR_LINE_NUMBER + "=\"" + this.elementLocation.getLineNumber() + "\" ");
-      pw.print(nsNameExt + ":" + WSIConstants.ATTR_COLUMN_NUMBER + "=\"" + this.elementLocation.getColumnNumber() + "\" ");
-    }
-    */
-
-    // Close start element
-    pw.print(">");
-
-    if (this.failureMessage != null)
-      pw.println(DOMUtils.cleanString(this.failureMessage));
-
-    if (this.elementLocation != null)
-    {
-      pw.println(" ");
-      pw.print(this.elementLocation.toString());
-    }
-
-    // End the element
-    pw.println("      </" + nsName + ELEM_NAME + ">");
-
-    // Return string
-    return sw.toString();
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/impl/PrereqFailedListImpl.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/impl/PrereqFailedListImpl.java
deleted file mode 100644
index eb1de2051..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/impl/PrereqFailedListImpl.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.report.impl;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.report.PrereqFailedList;
-
-/**
- * This interface is used to maintain and access the Prerequisite Failed List.
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public class PrereqFailedListImpl implements PrereqFailedList
-{
-  /**
-   * List of test assertion IDs.
-   */
-  protected Vector idList = new Vector();
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.PrereqFailedList#addTestAssertionID(java.lang.String)
-   */
-  public void addTestAssertionID(String assertionID)
-  {
-    idList.add(assertionID);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.DocumentElement#toXMLString(String)
-   */
-  public String toXMLString(String namespaceName)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    String nsName = namespaceName;
-    if ((!nsName.equals("") && (!nsName.endsWith(":"))))
-      nsName += ":";
-
-    if (this.idList.size() > 0)
-    {
-      // Create element 
-      pw.println("        <" + nsName + ELEM_NAME + ">");
-
-      // Include each test assertion ID
-      Iterator iterator = idList.iterator();
-      while (iterator.hasNext())
-      {
-        pw.print(
-          "          <" + nsName + WSIConstants.ELEM_TEST_ASSERTION_ID + ">");
-        pw.print((String) iterator.next());
-        pw.println("</" + nsName + WSIConstants.ELEM_TEST_ASSERTION_ID + ">");
-      }
-
-      // End element
-      pw.println("        </" + nsName + ELEM_NAME + ">");
-    }
-
-    return sw.toString();
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/impl/ReportArtifactImpl.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/impl/ReportArtifactImpl.java
deleted file mode 100644
index 44299b8fc..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/report/impl/ReportImpl.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/impl/ReportImpl.java
deleted file mode 100644
index 7db12f01c..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/report/impl/ReportWriterImpl.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/impl/ReportWriterImpl.java
deleted file mode 100644
index 73eeb3525..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/impl/ReportWriterImpl.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.report.impl;
-
-import java.io.PrintWriter;
-import java.io.Writer;
-
-import org.eclipse.wst.wsi.internal.core.document.impl.DocumentWriterImpl;
-import org.eclipse.wst.wsi.internal.core.report.Report;
-import org.eclipse.wst.wsi.internal.core.report.ReportWriter;
-
-/**
- * Defines the interface used to write the Conformance XML documents.
- * 
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public class ReportWriterImpl
-  extends DocumentWriterImpl
-  implements ReportWriter
-{
-  /**
-   * Report writer.
-   */
-  public ReportWriterImpl()
-  {
-  }
-
-  /**
-   * Write the entire contents of the document using the writer
-   * that was previously set using the setWriter method.
-   */
-  public void write(Report report) throws IllegalStateException
-  {
-    // If writer was not set previously, then throw exception
-    if (writer == null)
-    {
-      throw new IllegalStateException("Report writer must be set before writing report.");
-    }
-
-    // Write report
-    write(report, this.writer);
-  }
-
-  /**
-   * Write the entire contents of the document.
-   */
-  public void write(Report report, Writer writer)
-  {
-    // Create print writer
-    new PrintWriter(writer);
-
-    // ADD: Write out complete report
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/toolinfo.properties b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/toolinfo.properties
deleted file mode 100644
index a1304c5b9..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/toolinfo.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# /**
-#  * <copyright>
-#  *
-#  * Copyright (c) 2002-2003  IBM Corporation and others.
-#  * All rights reserved.   This program and the accompanying materials
-#  * are made available under the terms of the Eclipse Public License v1.0
-#  * which accompanies this distribution, and is available at
-#  * http://www.eclipse.org/legal/epl-v10.html
-#  * 
-#  * Contributors: 
-#  *   IBM      - Initial API and implementation
-#  * </copyright>
-#  */
-
-wsi.tool.version=1.0.0
-wsi.tool.release.date=2005-04-15
-wsi.tool.implementer=Eclipse.org Organization
-wsi.tool.location=http://www.eclipse.org/wst
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/ArtifactType.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/ArtifactType.java
deleted file mode 100644
index 80bdd4c56..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/util/BasicRules.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/BasicRules.java
deleted file mode 100644
index d232b0e4b..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/BasicRules.java
+++ /dev/null
@@ -1,477 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.util;
-
-/**
- * This class validates basic constructs of RFC 2616.
- * 
- * @author Volodin
- */
-public class BasicRules
-{
-
-  public static final char CR = 13;
-  public static final char LF = 10;
-  public static final char SP = 32;
-  public static final char HT = 9;
-  public static final char DQ = 34;
-  public static final String CRLF = "" + CR + LF;
-
-  public static final char[] SEPARATORS =
-    {
-      '(',
-      ')',
-      '<',
-      '>',
-      '@',
-      ',',
-      ';',
-      ':',
-      '\\',
-      '\"',
-      '/',
-      '[',
-      ']',
-      '?',
-      '=',
-      '{',
-      '}',
-      SP,
-      HT };
-
-  /**
-   * Checking rule.
-   * 		OCTET = &lt;any 8-bit sequence of data&gt;
-   * @param ch character.
-   * @return boolean true if ch is conform to rule, false otherwise.
-   */
-  public static boolean isOCTET(char ch)
-  {
-    return true;
-  }
-
-  /**
-   * Checking rule:
-   * 		CHAR = &lt;any US-ASCII character (octets 0 - 127)&gt;.
-   * @param ch character.
-   * @return boolean true if ch is conform to rule, false otherwise.
-   */
-  public static boolean isCHAR(char ch)
-  {
-    return (ch >= 0 && ch <= 127) ? true : false;
-  }
-
-  /**
-   * Checking rule:
-   * 		UPALPHA = &lt;any US-ASCII uppercase letter "A".."Z"&gt;.
-   * @param ch character.
-   * @return boolean true if ch is conform to rule, false otherwise.
-   */
-  public static boolean isUPALPHA(char ch)
-  {
-    return (ch >= 'A' && ch <= 'Z') ? true : false;
-  }
-
-  /**
-   * Checking rule:
-   * 		LOALPHA = &lt;any US-ASCII lowercase letter "a".."z"&gt;.
-   * @param ch character.
-   * @return boolean true if ch is conform to rule, false otherwise.
-   */
-  public static boolean isLOALPHA(char ch)
-  {
-    return (ch >= 'a' && ch <= 'z') ? true : false;
-  }
-
-  /**
-   * Checking rule:
-   * 		ALPHA = UPALPHA | LOALPHA.
-   * @param ch character.
-   * @return boolean true if ch is conform to rule, false otherwise.
-   */
-  public static boolean isALPHA(char ch)
-  {
-    return (isLOALPHA(ch) || isUPALPHA(ch)) ? true : false;
-  }
-
-  /**
-   * Checking rule:
-   * 		DIGIT = &lt;any US-ASCII digit "0".."9"&gt;.
-   * @param ch character.
-   * @return boolean true if ch is conform to rule, false otherwise.
-   */
-  public static boolean isDIGIT(char ch)
-  {
-    return (ch >= '0' && ch <= '9') ? true : false;
-  }
-
-  /**
-   * Checking rule:
-   * 		CTL = &lt;any US-ASCII control character (octets 0 - 31) and DEL (127)&gt;.
-   * @param ch character.
-   * @return boolean true if ch is conform to rule, false otherwise.
-   */
-  public static boolean isCTL(char ch)
-  {
-    return ((ch >= 0 && ch <= 31) || ch == 127) ? true : false;
-  }
-
-  /**
-   * Checking rule:
-   * 		CR = &lt;US-ASCII CR, carriage return (13)&gt;.
-   * @param ch character.
-   * @return boolean true if ch is conform to rule, false otherwise.
-   */
-  public static boolean isCR(char ch)
-  {
-    return (ch == CR) ? true : false;
-  }
-
-  /**
-   * Checking rule:
-   * 		LF = &lt;US-ASCII LF, linefeed (10)&gt;.
-   * @param ch character
-   * @return boolean true if ch is conform to rule, false otherwise
-   */
-  public static boolean isLF(char ch)
-  {
-    return (ch == LF) ? true : false;
-  }
-
-  /**
-   * Checking rule:
-   * 		SP = &lt;US-ASCII SP, space (32)&gt;.
-   * @param ch character.
-   * @return boolean true if ch is conform to rule, false otherwise.
-   */
-  public static boolean isSP(char ch)
-  {
-    return (ch == SP) ? true : false;
-  }
-
-  /**
-   * Checking rule:
-   * 		HT = &lt;US-ASCII HT, horizontal-tab (9)&gt;.
-   * @param ch character
-   * @return boolean true if ch is conform to rule, false otherwise
-   */
-  public static boolean isHT(char ch)
-  {
-    return (ch == HT) ? true : false;
-  }
-
-  /**
-   * Checking rule:
-   * 		&lt;"&gt; = &lt;US-ASCII double-quote mark (34)&gt;.
-   * @param ch character.
-   * @return boolean true if ch is conform to rule, false otherwise.
-   */
-  public static boolean isDoubleQuote(char ch)
-  {
-    return (ch == DQ) ? true : false;
-  }
-
-  /**
-   * Checking rule:
-   * 		CRLF = CR LF.
-   * @param str string.
-   * @return boolean true if ch is conform to rule, false otherwise.
-   */
-  public static boolean isCRLF(String str)
-  {
-    return CRLF.equals(str);
-  }
-
-  /**
-   * Checking rule:
-   * 		LWS = [CRLF] 1*( SP | HT ).
-   * @param str string.
-   * @return boolean true if str is conform to rule, false otherwise.
-   */
-  public static boolean isLWS(String str)
-  {
-
-    int index = getLastIndexLWS(str, 0);
-    if (index == -1 || index != str.length())
-      return false;
-
-    return true;
-  }
-
-  /**
-   * Gets last index of the LWS string.
-   * @param str string.
-   * @param startIndex start index.
-   * @return int an index of the first symbol which isn't LWS.
-   */
-  public static int getLastIndexLWS(String str, int startIndex)
-  {
-    int index = str.indexOf(CRLF, startIndex);
-    if (index == -1)
-      index = startIndex;
-    else if (index == startIndex)
-      index += CRLF.length();
-    else
-      return -1;
-
-    if (!isSP(str.charAt(index)) && isHT(str.charAt(index)))
-      return -1;
-
-    index++;
-    for (; index < str.length(); index++)
-      if (!isSP(str.charAt(index)) && isHT(str.charAt(index)))
-        return index;
-    return index;
-  }
-
-  /**
-   * Gets last index of the TEXT string.
-   * TEXT = &lt;any OCTET except CTLs, but including LWS&gt;
-   * @param str string.
-   * @param startIndex start index.
-   * @return int an index of the first symbol which isn't TEXT.
-   */
-  public static int getLastTEXT(String str, int startIndex)
-  {
-    int index;
-    for (index = startIndex; index < str.length(); index++)
-    {
-      if (!isOCTET(str.charAt(index)))
-        return index;
-      if (isCTL(str.charAt(index)))
-      {
-        int lastLWS = getLastIndexLWS(str, index);
-        if (lastLWS == -1)
-          return index;
-        index = lastLWS - 1;
-      }
-    }
-    return index;
-  }
-
-  /**
-   * Checking rule:
-   * 		HEX = "A" | "B" | "C" | "D" | "E" | "F" | "a" | "b" | "c" | "d" | "e" | "f" | DIGIT.
-   * @param ch character.
-   * @return boolean true if ch is conform to rule, false otherwise.
-   */
-  public static boolean isHEX(char ch)
-  {
-    return (
-      (ch >= 'A' && ch <= 'F') || (ch >= 'a' && ch <= 'f') || isDIGIT(ch))
-      ? true
-      : false;
-  }
-
-  /**
-   * Checking rule:
-   * 		token = 1*&lt;any CHAR except CTLs or separators&gt;.
-   * @param str string.
-   * @return boolean true if str is conform to rule, false otherwise.
-   */
-  public static boolean isToken(String str)
-  {
-    if (str.length() == 0)
-      return false;
-
-    for (int index = 0; index < str.length(); index++)
-    {
-      char ch = str.charAt(index);
-      if (!isCHAR(ch) || isSEPARATOR(ch) || isCTL(ch))
-        return false;
-
-    }
-
-    return true;
-  }
-
-  /**
-   * Gets last index of the "token" string.
-   * @param str string.
-   * @param startIndex start index.
-   * @return int an index of the first symbol which isn't "token".
-   */
-  public static int getLastToken(String str, int startIndex)
-  {
-    int index = startIndex;
-    for (; index < str.length(); index++)
-    {
-      char ch = str.charAt(index);
-      if (!isCHAR(ch) || isSEPARATOR(ch) || isCTL(ch))
-        return index;
-
-    }
-    return index;
-  }
-
-  /**
-   * Checking rule:
-   * 		separators = "(" | ")" | "<" | ">" | "@"
-     *                 | "," | ";" | ":" | "\" | <">
-     *                 | "/" | "[" | "]" | "?" | "="
-     *                 | "{" | "}" | SP | HT.
-   * @param ch character.
-   * @return boolean true if ch is conform to rule, false otherwise.
-   */
-  public static boolean isSEPARATOR(char ch)
-  {
-    for (int index = 0; index < SEPARATORS.length; index++)
-    {
-      if (ch == SEPARATORS[index])
-        return true;
-    }
-    return false;
-  }
-
-  /**
-   * Gets last index of the "comment" string.
-   * 		comment = "(" *( ctext | quoted-pair | comment ) ")".
-   * @param str string.
-   * @param startIndex start index.
-   * @return int an index of the first symbol which isn't "comment".
-   */
-  public static int getLastComment(String str, int startIndex)
-  {
-
-    int index = startIndex;
-    if (str.length() <= startIndex)
-      return startIndex;
-    if (str.charAt(index) != '(')
-      return startIndex;
-
-    boolean bExit = false;
-    boolean bQuotedPair = false;
-    int idx = startIndex + 1;
-    while (bExit == false)
-    {
-      while (bQuotedPair == false)
-      {
-        idx = getLastCtext(str, idx);
-        if (idx == str.length())
-          return idx;
-        if (!isQuotedPair(str, idx - 1))
-          bQuotedPair = true;
-        else
-          idx++;
-      }
-      if (str.charAt(idx) == '(')
-      {
-        getLastComment(str, idx);
-      }
-      else if (str.charAt(idx) == ')')
-      {
-        return idx + 1;
-      }
-    }
-
-    return idx;
-  }
-
-  /**
-   * Gets last index of the "ctext" string.
-   * 		ctext = &lt;any TEXT excluding "(" and ")"&gt;
-   * @param str string.
-   * @param startIndex start index.
-   * @return int an index of the first symbol which isn't "ctext".
-   */
-  private static int getLastCtext(String str, int startIndex)
-  {
-    int idx = getLastTEXT(str, startIndex);
-    int iBracket = startIndex;
-    for (; iBracket < idx; iBracket++)
-    {
-      if (str.charAt(iBracket) == '(' || str.charAt(iBracket) == ')')
-        break;
-    }
-    if (iBracket < idx)
-      idx = iBracket;
-    return idx;
-  }
-
-  /**
-   * Gets last index of the "qdtext" string.
-   * 		qdtext = &lt;any TEXT except &lt;"&gt;&gt;
-   * @param str string.
-   * @param startIndex start index.
-   * @return int an index of the first symbol which isn't "qdtext".
-   */
-  private static int getLastQdtext(String str, int startIndex)
-  {
-    int idx = getLastTEXT(str, startIndex);
-    int iBracket = startIndex;
-    for (; iBracket < idx; iBracket++)
-    {
-      if (str.charAt(iBracket) == '\"')
-        break;
-    }
-    if (iBracket < idx)
-      idx = iBracket;
-    return idx;
-  }
-
-  /**
-   * Checking rule:
-   * 		quoted-pair = "\" CHAR.
-   * @param str string.
-   * @param startIndex start index.
-   * @return boolean true if str is conform to rule, false otherwise.
-   */
-  public static boolean isQuotedPair(String str, int startIndex)
-  {
-    if (str.length() >= startIndex + 2
-      && str.charAt(startIndex) == '\\'
-      && isCHAR(str.charAt(startIndex + 1)))
-      return true;
-    else
-      return false;
-  }
-
-  /**
-   * Gets last index of the "quoted-string" string.
-   * 		quoted-string  = ( &lt;"&gt; *(qdtext | quoted-pair ) &lt;"&gt; )
-   * @param str string.
-   * @param startIndex start index.
-   * @return int an index of the first symbol which isn't "quoted-string".
-   */
-  public static int getLastQuotedString(String str, int startIndex)
-  {
-    int index = startIndex;
-
-    // if end if the string
-    if (startIndex == str.length())
-      return startIndex;
-    // if the begin is not '"'
-    if (str.charAt(index) != DQ)
-      return startIndex;
-
-    index++;
-    while (true)
-    {
-      index = getLastQdtext(str, index);
-      if (index == str.length())
-        return startIndex;
-      if (isQuotedPair(str, index - 1))
-      {
-        index++;
-        if (index == str.length())
-          return startIndex;
-      }
-      else
-        break;
-    }
-    // if the end is not '"'
-    if (str.charAt(index) != DQ)
-      return startIndex;
-
-    index++;
-    return index;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/EntryType.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/EntryType.java
deleted file mode 100644
index 3b27731b0..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/util/ErrorList.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/ErrorList.java
deleted file mode 100644
index e9597f4ef..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/util/HTTPConstants.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/HTTPConstants.java
deleted file mode 100644
index 34b053339..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/util/HTTPUtils.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/HTTPUtils.java
deleted file mode 100644
index 735e435e5..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/util/HttpHeadersValidator.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/HttpHeadersValidator.java
deleted file mode 100644
index f74694fd5..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/HttpHeadersValidator.java
+++ /dev/null
@@ -1,1721 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.util.Locale;
-import java.util.StringTokenizer;
-
-import sun.net.www.MessageHeader;
-
-import com.ibm.icu.text.SimpleDateFormat;
-
-/**
- * This class checks HTTP request headers about RFC 2616.
- *
- * @author Volodin 
- */
-public class HttpHeadersValidator
-{
-
-  private static final String HEADER_ALLOW = "Allow";
-  private static final String HEADER_CONTENT_TYPE = "Content-Type";
-  private static final String HEADER_CONTENT_ENCODING = "Content-Encoding";
-  private static final String HEADER_CONTENT_LANGUAGE = "Content-Language";
-  private static final String HEADER_CONTENT_LENGHT = "Content-Length";
-  private static final String HEADER_CONTENT_LOCATION = "Content-Location";
-  private static final String HEADER_CONTENT_RANGE = "Content-Range";
-  private static final String HEADER_EXPIRES = "Expires";
-  private static final String HEADER_LAST_MODIFIED = "Last-Modified";
-  private static final String HEADER_CACHE_CONTROL = "Cache-Control";
-  private static final String HEADER_CONNECTION = "Connection";
-  private static final String HEADER_DATE = "Date";
-  private static final String HEADER_PRAGMA = "Pragma";
-  private static final String HEADER_TRAILER = "Trailer";
-  private static final String HEADER_TRANSFER_ENCODING = "Transfer-Encoding";
-
-  private static final String HEADER_UPGRADE = "Upgrade";
-  private static final String HEADER_VIA = "Via";
-  private static final String HEADER_WARNING = "Warning";
-
-  private static final String HEADER_ACCEPT = "Accept";
-  private static final String HEADER_ACCEPT_CHARSET = "Accept-Charset";
-  private static final String HEADER_ACCEPT_ENCODING = "Accept-Encoding";
-  private static final String HEADER_ACCEPT_LANGUAGE = "Accept-Language";
-  private static final String HEADER_AUTHORIZATION = "Authorization";
-  private static final String HEADER_EXPECT = "Expect";
-  private static final String HEADER_FROM = "From";
-  private static final String HEADER_HOST = "Host";
-  private static final String HEADER_IF_MATCH = "If-Match";
-  private static final String HEADER_IF_MODIFIED_SINCE = "If-Modified-Since";
-  private static final String HEADER_IF_NONE_MATCH = "If-None-Match";
-  private static final String HEADER_IF_RANGE = "If-Range";
-  private static final String HEADER_IF_UNMODIFIED_SINCE =
-    "If-Unmodified-Since";
-  private static final String HEADER_MAX_FORWARDS = "Max-Forwards";
-  private static final String HEADER_PROXY_AUTHORIZATION =
-    "Proxy-Authorization";
-  private static final String HEADER_RANGE = "Range";
-  private static final String HEADER_REFERER = "Referer";
-  private static final String HEADER_TE = "TE";
-  private static final String HEADER_USER_AGENT = "User-Agent";
-
-  /**
-   * This class checks e-mail string about RFC 822.
-   */
-  public static class MailboxValidator
-  {
-    private static final char[] SPECIAL =
-      { '(', ')', '<', '>', '@', ',', ';', ':', '\\', '\"', '.', '[', ']' };
-
-    /**
-    	* Validates e-mail string.
-    * @param mailbox e-mail string
-    * @return boolean  true if e-mail string is conform to RFC 822, false otherwise.
-    */
-
-    public static boolean validateMailbox(String mailbox)
-    {
-
-      if (!isFullAddr(mailbox) && !isShortAddr(mailbox))
-        return false;
-
-      return true;
-    }
-
-    /**
-     * Method isSimpleAddr.
-     * @param mailbox
-     * @return boolean
-     */
-    private static boolean isShortAddr(String mailbox)
-    {
-      int indexAt = mailbox.indexOf('@');
-      if (indexAt == -1)
-        return false;
-
-      if (!isLocalPart(mailbox.substring(0, indexAt))
-        || !isDomain(mailbox.substring(indexAt + 1)))
-        return false;
-
-      return true;
-    }
-
-    /**
-     * Method isDomaim.
-     * @param string
-     * return boolean
-     */
-    private static boolean isDomain(String string)
-    {
-      if (string.trim().length() == 0)
-        return false;
-      StringTokenizer st = new StringTokenizer(string, ".");
-      while (st.hasMoreTokens())
-      {
-        String subDomain = st.nextToken();
-        if (!isAtom(subDomain) && !isDomainLiteral(subDomain))
-          return false;
-
-      }
-      return true;
-    }
-
-    /**
-     * Method isDomainLiteral.
-     * @param subDomain
-     * @return boolean
-     */
-    private static boolean isDomainLiteral(String subDomain)
-    {
-      if (getLastDomainLiteral(subDomain, 0) == subDomain.length())
-      {
-        return true;
-      }
-      else
-      {
-        return false;
-      }
-    }
-
-    private static int getLastDomainLiteral(String str, int startIndex)
-    {
-
-      int index = startIndex;
-      //int newIndex = 0;
-
-      // if end if the string
-      if (startIndex == str.length())
-        return startIndex;
-      // if the begin is not '['
-      if (str.charAt(index) != '[')
-        return startIndex;
-
-      index++;
-      while (true)
-      {
-        index = getLastDtext(str, index);
-        if (index == str.length())
-          return startIndex;
-        if (BasicRules.isQuotedPair(str, index - 1))
-        {
-          index++;
-          if (index == str.length())
-            return startIndex;
-        }
-        else
-          break;
-      }
-      // if the end is not ']'
-      if (str.charAt(index) != ']')
-        return startIndex;
-
-      index++;
-      return index;
-    }
-
-    private static int getLastDtext(String str, int startIndex)
-    {
-      if (str.length() == startIndex)
-        return startIndex;
-      int i = 0;
-      for (; i < str.length(); i++)
-      {
-        char ch = str.charAt(i);
-        i = BasicRules.getLastIndexLWS(str, i);
-        if (!BasicRules.isCHAR(ch)
-          || str.charAt(i) == '['
-          || str.charAt(i) == ']'
-          || str.charAt(i) == '\\'
-          || str.charAt(i) == BasicRules.CR)
-        {
-          return i + 1;
-        }
-      }
-      return i + 1;
-    }
-
-    /**
-     * Method isLocalPart.
-     * @param string
-     * @return boolean
-     */
-    private static boolean isLocalPart(String string)
-    {
-      if (string.trim().length() == 0)
-        return false;
-      StringTokenizer st = new StringTokenizer(string, ".");
-      while (st.hasMoreTokens())
-      {
-        if (!isWord(st.nextToken()))
-          return false;
-      }
-      return true;
-    }
-
-    /**
-     * Method isWord.
-     * @param string
-     * @return boolean
-     */
-    private static boolean isWord(String string)
-    {
-      if (!isAtom(string) && !isQuotedString(string))
-        return false;
-      return true;
-    }
-
-    /**
-     * Method isAtom.
-     * @param string
-     * @return boolean
-     */
-    private static boolean isAtom(String string)
-    {
-      if (string.length() == 0)
-        return false;
-      for (int i = 0; i < string.length(); i++)
-      {
-        if (!BasicRules.isCHAR(string.charAt(i))
-          || isSpecial(string.charAt(i))
-          || string.charAt(i) == ' '
-          || BasicRules.isCTL(string.charAt(i)))
-        {
-          return false;
-        }
-      }
-      return true;
-    }
-
-    /**
-     * Method isSpecial.
-     * @param c
-     * @return boolean
-     */
-    private static boolean isSpecial(char ch)
-    {
-      for (int index = 0; index < SPECIAL.length; index++)
-      {
-        if (ch == SPECIAL[index])
-          return true;
-      }
-      return false;
-    }
-
-    /**
-     * Method isFullAddr.
-     * @param mailbox
-     * @return boolean
-     */
-    private static boolean isFullAddr(String mailbox)
-    {
-      if (mailbox.length() == 0)
-        return false;
-      int idxLT = mailbox.indexOf('<');
-      if (idxLT == -1)
-        return false;
-
-      //is phrase
-      String phrase = mailbox.substring(0, idxLT);
-      StringTokenizer st = new StringTokenizer(phrase, " ");
-      if (st.countTokens() == 0)
-        return false;
-      while (st.hasMoreTokens())
-      {
-        if (!isWord(st.nextToken()))
-          return false;
-      }
-      if (phrase.charAt(phrase.length() - 1) != BasicRules.SP)
-      {
-        return false;
-      }
-
-      //is route-addr
-      String routeAddr = mailbox.substring(idxLT + 1);
-      // is route
-      int idxTwoSpot = routeAddr.indexOf(':');
-      if (idxTwoSpot != -1)
-      {
-        StringTokenizer stRouteAddr =
-          new StringTokenizer(routeAddr.substring(0, idxTwoSpot), ",");
-        if (!stRouteAddr.hasMoreTokens())
-          return false;
-        while (stRouteAddr.hasMoreTokens())
-        {
-          if (!isDomain(stRouteAddr.nextToken()))
-            return false;
-        }
-      }
-
-      //is addr spec
-      int idxGT = routeAddr.indexOf('>');
-      if (idxGT == -1 || idxGT != (routeAddr.length() - 1))
-        return false;
-
-      if (!isShortAddr(routeAddr.substring(idxTwoSpot + 1, idxGT)))
-        return false;
-
-      return true;
-    }
-
-  }
-
-  /**
-   * Validates HTTP request headers.
-   * @param headers HTTP request headers
-   * @return boolean  true if all HTTP headers string is conform to RFC 2616, false otherwise.
-   */
-
-  public static boolean validateHttpRequestHeaders(String headers)
-  {
-
-    MessageHeader mh = new MessageHeader();
-    try
-    {
-      mh.parseHeader(new ByteArrayInputStream(headers.getBytes()));
-    }
-    catch (IOException e)
-    {
-      return false;
-    }
-
-    String header = null;
-    String value = null;
-
-    header = mh.getKey(0);
-    if (header != null)
-      return false;
-
-    value = mh.getValue(0);
-    if (value == null)
-      return false;
-
-    //method
-    StringTokenizer st = new StringTokenizer(value, " ");
-    if (!st.hasMoreElements())
-      return false;
-    String str = st.nextToken();
-    if (!isToken(str))
-      return false;
-
-    if (!st.hasMoreElements())
-      return false;
-    str = st.nextToken();
-    if (!isURI(str) && !str.equals("*"))
-      return false;
-
-    if (!st.hasMoreElements())
-      return false;
-    str = st.nextToken();
-    if (!isHTTPVersion(str))
-      return false;
-
-    int i = 1;
-    try
-    {
-      while ((header = mh.getKey(i)) != null)
-      {
-        value = mh.getValue(i);
-        i++;
-
-        // is message-header token
-        if (!isToken(header))
-          return false;
-
-        //---- entity-headers
-
-        if (header.equals(HEADER_ALLOW))
-        {
-          if (!isValidAllow(value))
-            return false;
-          else
-            continue;
-        }
-
-        if (header.equals(HEADER_CONTENT_TYPE))
-        {
-          if (!isMediaType(value))
-            return false;
-          else
-            continue;
-        }
-        if (header.equals(HEADER_CONTENT_ENCODING))
-        {
-          if (!isToken(value))
-            return false;
-          else
-            continue;
-        }
-        if (header.equals(HEADER_CONTENT_LANGUAGE))
-        {
-          if (!isLanguageTag(value))
-            return false;
-          else
-            continue;
-        }
-        if (header.equals(HEADER_CONTENT_LENGHT))
-        {
-          if (!isDidgit(value))
-            return false;
-          else
-            continue;
-        }
-        if (header.equals(HEADER_CONTENT_LOCATION))
-        {
-          if (!isURI(value))
-            return false;
-          else
-            continue;
-        }
-
-        if (header.equals(HEADER_CONTENT_RANGE))
-        {
-          if (!isValidContentRange(value))
-            return false;
-          else
-            continue;
-        }
-
-        if (header.equals(HEADER_EXPIRES)
-          || header.equals(HEADER_LAST_MODIFIED))
-        {
-          if (!isHTTPDate(value))
-            return false;
-          else
-            continue;
-        }
-
-        //---- general-headers
-        if (header.equals(HEADER_CACHE_CONTROL))
-        {
-          if (!isValidCacheControl(value))
-            return false;
-
-          continue;
-          //return true;
-        }
-
-        if (header.equals(HEADER_CONNECTION))
-        {
-          if (!isToken(value))
-            return false;
-          else
-            continue;
-        }
-
-        if (header.equals(HEADER_DATE))
-        {
-          if (!isHTTPDate(value))
-            return false;
-          else
-            continue;
-        }
-
-        if (header.equals(HEADER_PRAGMA))
-        {
-          if (!isPragmaDerective(value))
-            return false;
-          else
-            continue;
-        }
-
-        if (header.equals(HEADER_TRAILER))
-        {
-          if (!isToken(value))
-            return false;
-          else
-            continue;
-        }
-
-        if (header.equals(HEADER_TRANSFER_ENCODING))
-        {
-          if (!isTransferCoding(value))
-            return false;
-          else
-            continue;
-        }
-
-        if (header.equals(HEADER_UPGRADE))
-        {
-          if (!isValidUpgrade(value))
-            return false;
-          else
-            continue;
-        }
-
-        if (header.equals(HEADER_VIA))
-        {
-          if (!isValidVia(value))
-            return false;
-          else
-            continue;
-        }
-
-        if (header.equals(HEADER_WARNING))
-        {
-          if (!isValidWarning(value))
-            return false;
-          else
-            continue;
-        }
-
-        if (header.equals(HEADER_ACCEPT))
-        {
-          if (!isValidAccept(value))
-            return false;
-          else
-            continue;
-        }
-
-        if (header.equals(HEADER_ACCEPT_CHARSET))
-        {
-          if (!isValidAcceptCharSet(value))
-            return false;
-          else
-            continue;
-        }
-
-        if (header.equals(HEADER_ACCEPT_ENCODING))
-        {
-          if (!isValidAcceptEncoding(value))
-            return false;
-          else
-            continue;
-        }
-
-        if (header.equals(HEADER_ACCEPT_LANGUAGE))
-        {
-          if (!isValidAcceptLanguage(value))
-            return false;
-          else
-            continue;
-        }
-
-        if (header.equals(HEADER_AUTHORIZATION)
-          || header.equals(HEADER_PROXY_AUTHORIZATION))
-        {
-          if (!isCredentials(value))
-            return false;
-          else
-            continue;
-        }
-        if (header.equals(HEADER_EXPECT))
-        {
-          if (!isExpectation(value))
-            return false;
-          else
-            continue;
-        }
-
-        if (header.equals(HEADER_FROM))
-        {
-          if (!MailboxValidator.validateMailbox(value))
-            return false;
-          else
-            continue;
-        }
-
-        if (header.equals(HEADER_IF_MATCH)
-          || header.equals(HEADER_IF_NONE_MATCH))
-        {
-          if (!isValidIfMatch(value))
-            return false;
-          else
-            continue;
-        }
-        if (header.equals(HEADER_IF_RANGE))
-        {
-          if (!isEntityTag(value) && !isHTTPDate(value))
-            return false;
-          else
-            continue;
-        }
-
-        //---			
-        if (header.equals(HEADER_IF_MODIFIED_SINCE))
-        {
-          if (!isHTTPDate(value))
-            return false;
-          else
-            continue;
-        }
-        if (header.equals(HEADER_IF_UNMODIFIED_SINCE))
-        {
-          if (!isHTTPDate(value))
-            return false;
-          else
-            continue;
-        }
-        if (header.equals(HEADER_MAX_FORWARDS))
-        {
-          if (!isDidgit(value))
-            return false;
-          else
-            continue;
-        }
-
-        if (header.equals(HEADER_USER_AGENT))
-        {
-          if (!isValidUserAgent(value))
-            return false;
-          else
-            continue;
-        }
-
-        if (header.equals(HEADER_TE))
-        {
-          if (!isValidTE(value))
-            return false;
-          else
-            continue;
-        }
-
-        if (header.equals(HEADER_RANGE))
-        {
-          if (!isRange(value))
-            return false;
-          else
-            continue;
-        }
-        if (header.equals(HEADER_HOST))
-        {
-          if (!isHost(value))
-            return false;
-          else
-            continue;
-        }
-        if (header.equals(HEADER_REFERER))
-        {
-          if (!isURI(value))
-            return false;
-          else
-            continue;
-        }
-
-      }
-    }
-    catch (Exception e)
-    {
-      return false;
-    }
-    return true;
-  }
-
-  /**
-   * Method isValidIfMatch.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isValidIfMatch(String value)
-  {
-    if (value.trim().length() == 0)
-      return true;
-    if ("*".equals(value.trim()))
-      return true;
-
-    StringTokenizer st = new StringTokenizer(value, ",");
-    while (st.hasMoreElements())
-    {
-      String str = st.nextToken().trim();
-      if (!isEntityTag(str))
-        return false;
-
-    }
-
-    return true;
-  }
-
-  /**
-   * Method isValidUpgrade.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isValidUpgrade(String value)
-  {
-    if (value.trim().length() == 0)
-      return false;
-    StringTokenizer st = new StringTokenizer(value, ",");
-    while (st.hasMoreElements())
-    {
-      String str = st.nextToken().trim();
-      if (!isProduct(str))
-        return false;
-
-    }
-    return true;
-  }
-
-  /**
-   * Method isValidCacheControl.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isValidCacheControl(String value)
-  {
-
-    if (value.trim().length() == 0)
-      return false;
-
-    StringTokenizer st = new StringTokenizer(value, ",");
-    while (st.hasMoreElements())
-    {
-      String str = st.nextToken().trim();
-      int index = str.indexOf('=');
-      if (index == -1)
-      {
-
-      }
-      else
-      {
-        if (!isToken(str.substring(0, index)))
-          return false;
-        String strAfterEq = str.substring(index + 1);
-        if (!isToken(strAfterEq) && !isQuotedString(strAfterEq))
-        {
-          return false;
-        }
-      }
-    }
-
-    return true;
-  }
-
-  /**
-   * Method isHTTPVersion.
-   * @param str
-   * @return boolean
-   */
-  private static boolean isHTTPVersion(String str)
-  {
-    if (!str.startsWith("HTTP/"))
-      return false;
-    int idx = "HTTP/".length();
-
-    int idx2 = str.indexOf(".");
-
-    // 1*DIGIT
-    String s = str.substring(idx, idx2);
-    if (!isDidgit(s))
-      return false;
-
-    s = str.substring(idx2 + 1);
-    if (!isDidgit(s))
-      return false;
-
-    return true;
-  }
-
-  /**
-   * Method isValidWarning.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isValidWarning(String value)
-  {
-    if (value.length() == 0)
-      return false;
-    value = value.trim();
-    StringTokenizer st = new StringTokenizer(value, " ");
-    String str = st.nextToken();
-
-    if (str.length() > 3 || !isDidgit(str))
-      return false;
-
-    if (!st.hasMoreTokens())
-      return false;
-    str = st.nextToken();
-    if (!isHost(str) && !isToken(str))
-      return false;
-
-    //if(!st.hasMoreTokens()) return false;
-    str = st.nextToken("").trim();
-    //???
-
-    int lastQuotedString = BasicRules.getLastQuotedString(str, 0);
-    if (lastQuotedString == str.length())
-    {
-      return true;
-    }
-    else
-    {
-      String data = str.substring(lastQuotedString);
-      if (data.charAt(data.length()) != '\"')
-        return false;
-      if (str.charAt(0) != '\"')
-        return false;
-      if (!isHTTPDate(str.substring(1, data.length() - 1)))
-        return false;
-    }
-
-    return true;
-  }
-
-  /**
-   * Method isValidVia.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isValidVia(String value)
-  {
-    if (value.trim().length() == 0)
-      return false;
-
-    StringTokenizer st = new StringTokenizer(value, ",");
-    while (st.hasMoreElements())
-    {
-
-      String str = st.nextToken().trim();
-
-      StringTokenizer st2 = new StringTokenizer(str, " ");
-
-      // protocol/version
-      str = st2.nextToken();
-      int idx = str.indexOf("/");
-      if (idx == -1)
-      {
-        if (!isToken(str))
-          return false;
-      }
-      else
-      {
-        if (!isToken(str.substring(0, idx))
-          || !isToken(str.substring(idx + 1)))
-          return false;
-      }
-
-      //host
-      str = st2.nextToken();
-      if (!isHost(str) && !isToken(str))
-        return false;
-
-      //comment
-      if (st2.hasMoreTokens())
-      {
-        str = st2.nextToken("");
-        if (!isComment(str.trim()))
-          return false;
-      }
-    }
-    return true;
-  }
-
-  /**
-   * Method isHost.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isHost(String value)
-  {
-
-    try
-    {
-      new URL("http://" + value);
-    }
-    catch (MalformedURLException e)
-    {
-      return false;
-    }
-    return true;
-  }
-
-  /**
-   * Method isValidAllow.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isValidAllow(String value)
-  {
-    if (value.trim().length() == 0)
-      return true;
-
-    StringTokenizer st = new StringTokenizer(value, ",");
-    while (st.hasMoreElements())
-    {
-      String str = st.nextToken().trim();
-      if (!isToken(str))
-        return false;
-    }
-    return true;
-  }
-
-  /**
-   * Method isValidContentRange.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isValidContentRange(String value)
-  {
-    if (value.length() == 0)
-      return false;
-    if (!value.startsWith("bytes"))
-      return false;
-    String str = value.substring("bytes".length()).trim();
-
-    int idx = str.indexOf("/");
-    if (idx == -1)
-      return false;
-
-    String byteRange = str.substring(0, idx);
-    int idx2 = byteRange.indexOf("-");
-    if (idx2 == -1)
-    {
-      if (!byteRange.equals("*"))
-        return false;
-    }
-    else
-    {
-      if (!isDidgit(byteRange.substring(0, idx2))
-        || !isDidgit(byteRange.substring(idx2 + 1)))
-        return false;
-    }
-
-    if (!isDidgit(str.substring(idx + 1))
-      && !str.substring(idx + 1).equals("*"))
-      return false;
-
-    return true;
-  }
-
-  /**
-   * Method isRange.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isRange(String value)
-  {
-    if (value.length() == 0)
-      return false;
-    if (!value.startsWith("bytes="))
-      return false;
-    String strByteRange = value.substring("bytes=".length());
-
-    StringTokenizer st = new StringTokenizer(strByteRange, ",");
-    while (st.hasMoreElements())
-    {
-      String str = st.nextToken();
-      int idx = str.indexOf("-");
-      if (idx == -1)
-        return false;
-      if (idx == 0)
-      {
-        if (!isDidgit(str.substring(1)))
-          return false;
-      }
-      else
-      {
-        if (idx == (str.length() - 1))
-        {
-          if (!isDidgit(str.substring(0, str.length() - 1)))
-            return false;
-        }
-        else
-        {
-          if (!isDidgit(str.substring(0, idx))
-            || !isDidgit(str.substring(idx + 1)))
-            return false;
-        }
-
-      }
-
-    }
-    return true;
-  }
-
-  /**
-   * Method isValidTE.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isValidTE(String value)
-  {
-    if (value.trim().length() == 0)
-      return true;
-
-    StringTokenizer st = new StringTokenizer(value, ",");
-    while (st.hasMoreElements())
-    {
-      String str = st.nextToken().trim();
-      if (st.equals("trailers"))
-        return true;
-
-      int idx = str.indexOf(";");
-      if (idx == -1)
-      {
-        if (!isLanguageRange(str))
-          return false;
-      }
-      else
-      {
-        String _1 = str.substring(0, idx).trim();
-        String _2 = str.substring(idx + 1).trim();
-        if (!isLanguageRange(_1))
-          return false;
-        if (!isQAndQValue(_2))
-          return false;
-      }
-
-    }
-
-    return true;
-  }
-
-  /**
-   * Method isValidUserAgent.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isValidUserAgent(String value)
-  {
-    if (value.length() == 0)
-      return false;
-    StringTokenizer st = new StringTokenizer(value, " ");
-    while (st.hasMoreElements())
-    {
-      String str = st.nextToken();
-      if (!isProduct(str) && !isComment(str))
-        return false;
-
-    }
-
-    return true;
-  }
-
-  /**
-   * Method isComment.
-   * @param str
-   * @return boolean
-   */
-  private static boolean isComment(String str)
-  {
-    if (BasicRules.getLastComment(str, 0) != str.length())
-      return false;
-    return true;
-  }
-
-  /**
-   * Method isValidAcceptLanguage.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isValidAcceptLanguage(String value)
-  {
-    if (value.trim().length() == 0)
-      return false;
-
-    StringTokenizer st = new StringTokenizer(value, ",");
-    while (st.hasMoreElements())
-    {
-      String str = st.nextToken().trim();
-      int idx = str.indexOf(";");
-      if (idx == -1)
-      {
-        if (!isToken(str))
-          return false;
-      }
-      else
-      {
-        String _1 = str.substring(0, idx).trim();
-        String _2 = str.substring(idx + 1).trim();
-        if (!isToken(_1))
-          return false;
-        if (!isAcceptParams(_2))
-          return false;
-      }
-
-    }
-
-    return true;
-  }
-
-  /**
-   * Method isLanguageRange.
-   * @param str
-   * @return boolean
-   */
-  private static boolean isLanguageRange(String str)
-  {
-    if (str.trim().equals("*"))
-      return true;
-    StringTokenizer st = new StringTokenizer(str, "-");
-    while (st.hasMoreElements())
-    {
-      if (!is8ALPHA(st.nextToken()))
-        return false;
-    }
-    return true;
-  }
-
-  /**
-   * Method isValidAcceptEncoding.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isValidAcceptEncoding(String value)
-  {
-    if (value.trim().length() == 0)
-      return false;
-
-    StringTokenizer st = new StringTokenizer(value, ",");
-    while (st.hasMoreElements())
-    {
-      String str = st.nextToken().trim();
-      int idx = str.indexOf(";");
-      if (idx == -1)
-      {
-        if (!isToken(str) && !str.equals("*"))
-          return false;
-      }
-      else
-      {
-        String _1 = str.substring(0, idx).trim();
-        String _2 = str.substring(idx + 1).trim();
-
-        if ((!isToken(_1) && !_1.equals("*")))
-          return false;
-        if (!isQAndQValue(_2))
-          return false;
-      }
-
-    }
-
-    return true;
-  }
-
-  /**
-   * Method isValidAcceptCharSet.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isValidAcceptCharSet(String value)
-  {
-    if (value.trim().length() == 0)
-      return false;
-
-    StringTokenizer st = new StringTokenizer(value, ",");
-    while (st.hasMoreElements())
-    {
-      String str = st.nextToken().trim();
-      int idx = str.indexOf(";");
-      if (idx == -1)
-      {
-        if (!isToken(str) && !str.equals("*"))
-          return false;
-      }
-      else
-      {
-        String _1 = str.substring(0, idx).trim();
-        String _2 = str.substring(idx + 1).trim();
-
-        if ((!isToken(_1) && !_1.equals("*")))
-          return false;
-        if (!isQAndQValue(_2))
-          return false;
-      }
-
-    }
-
-    return true;
-  }
-
-  /**
-   * Method isValidAccept.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isValidAccept(String value)
-  {
-    if (value.trim().length() == 0)
-      return true;
-
-    StringTokenizer st = new StringTokenizer(value, ",");
-    while (st.hasMoreElements())
-    {
-      String str = st.nextToken().trim();
-      int idx = str.indexOf(";");
-      if (idx == -1)
-      {
-        if (!isMediaRange(str))
-          return false;
-      }
-      else
-      {
-        if (!isMediaRange(str.substring(0, idx).trim())
-          || !isAcceptParams(str.substring(idx + 1).trim()))
-          return false;
-
-      }
-
-    }
-    return true;
-  }
-
-  /**
-   * Method isAcceptParams.
-   * @param string
-   * @return boolean
-   */
-  private static boolean isAcceptParams(String string)
-  {
-    if (string.trim().length() == 0)
-      return false;
-
-    StringTokenizer st = new StringTokenizer(string, ";");
-    String str = st.nextToken();
-
-    int idx = str.indexOf("=");
-    if (idx == -1)
-    {
-      if (str.equals("q") || !isToken(str))
-        return false;
-    }
-    else
-    {
-      if (str.substring(0, idx).equals("q"))
-      {
-        if (!isQValue(str.substring(idx + 1)))
-          return false;
-      }
-      else
-      {
-        if (!isParameterWithoutValue(str))
-          return false;
-      }
-    }
-
-    while (st.hasMoreElements())
-    {
-      str = st.nextToken();
-      if (!isParameterWithoutValue(str))
-        return false;
-    }
-    return true;
-  }
-
-  /**
-   * Method isQAndQValue.
-   * @param str
-   * @return boolean
-   */
-  private static boolean isQAndQValue(String str)
-  {
-    str = str.trim();
-    if (!str.trim().startsWith("q="))
-      return false;
-    if (!isQValue(str.substring("q=".length())))
-      return false;
-    return true;
-  }
-
-  /**
-   * Method isQValue.
-   * @param string
-   * @return boolean
-   */
-  private static boolean isQValue(String string)
-  {
-    if (string.trim().length() == 0)
-      return false;
-
-    int idx = string.indexOf(".");
-    if (idx == -1)
-    {
-      if (!"0".equals(string) && !"1".equals(string))
-        return false;
-    }
-    else
-    {
-      String strDig = string.substring(idx + 1);
-      if (strDig.length() > 3)
-        return false;
-
-      if (string.substring(0, idx).equals("0"))
-      {
-        if (!isDidgit(strDig))
-          return false;
-
-      }
-      else
-      {
-        if (!string.substring(0, idx).equals("1"))
-          return false;
-
-        for (int i = 0; i < strDig.length(); i++)
-        {
-          if (strDig.charAt(i) != '0')
-            return false;
-        }
-      }
-
-    }
-    return true;
-  }
-
-  /**
-   * Method isMediaRange.
-   * @param str
-   * @return boolean
-   */
-  private static boolean isMediaRange(String str)
-  {
-    if (str.trim().length() == 0)
-      return false;
-
-    int idx = str.indexOf("/");
-    if (idx == -1)
-      return false;
-
-    if (!isToken(str.substring(0, idx)) && !str.substring(0, idx).equals("*"))
-      return false;
-    if (!isToken(str.substring(idx + 1))
-      && !str.substring(idx + 1).equals("*"))
-      return false;
-
-    return true;
-  }
-
-  /**
-   * Method isEntityTag.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isEntityTag(String value)
-  {
-
-    int idx = 0;
-    if (value.startsWith("W/"))
-      idx = 2;
-    if (!isQuotedString(value.substring(idx)))
-      return false;
-    return true;
-  }
-
-  /**
-   * Method isExpectation.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isExpectation(String value)
-  {
-    if (value.equals("100-continue"))
-      return true;
-
-    StringTokenizer st = new StringTokenizer(value, ";");
-    while (st.hasMoreElements())
-    {
-      if (!isParameterWithoutValue(st.nextToken()))
-        return false;
-    }
-
-    return true;
-  }
-
-  /**
-   * Method isCredentials.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isCredentials(String value)
-  {
-    StringTokenizer st = new StringTokenizer(value, " ");
-    if (!isToken(st.nextToken()))
-      return false;
-
-    while (st.hasMoreElements())
-    {
-      String param = st.nextToken(",");
-      if (!isParameter(param))
-        return false;
-    }
-    return true;
-  }
-
-  /**
-   * Method isProduct.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isProduct(String value)
-  {
-    int idx = value.indexOf("/");
-    if (idx == -1)
-    {
-      if (!isToken(value))
-        return false;
-    }
-    else
-    {
-      if (!isToken(value.substring(0, idx))
-        || !isToken(value.substring(idx + 1)))
-        return false;
-    }
-    return true;
-  }
-
-  /**
-   * Method isTransferCoding.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isTransferCoding(String value)
-  {
-    if (value.equals("chunked"))
-    {
-      return true;
-    }
-    else
-    {
-      StringTokenizer st = new StringTokenizer(value, ";");
-      if (!isToken(st.nextToken()))
-        return false;
-
-      while (st.hasMoreElements())
-      {
-        if (!isParameter(st.nextToken()))
-          return false;
-      }
-
-    }
-
-    return true;
-  }
-
-  /**
-   * Method isParameter.
-   * @param string
-   * @return boolean
-   */
-  private static boolean isParameter(String string)
-  {
-
-    // check parameter	
-    int idx = string.indexOf("=");
-    if (!isToken(string.substring(0, idx)))
-      return false;
-
-    String parValue = string.substring(idx + 1);
-    if (!isToken(parValue) && !isQuotedString(parValue))
-      return false;
-
-    return true;
-  }
-
-  /**
-   * Method isParameterWithoutValue.
-   * @param string
-   * @return boolean
-   */
-  private static boolean isParameterWithoutValue(String string)
-  {
-
-    // check parameter	
-    int idx = string.indexOf("=");
-    if (idx != -1)
-    {
-      if (!isToken(string.substring(0, idx)))
-        return false;
-      String parValue = string.substring(idx + 1);
-      if (!isToken(parValue) && !isQuotedString(parValue))
-        return false;
-
-    }
-    else
-    {
-      if (!isToken(string))
-        return false;
-    }
-
-    return true;
-  }
-
-  /**
-   * Method isPragmaDerective.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isPragmaDerective(String value)
-  {
-    if (value.equals("no-cache"))
-      return true;
-    else
-    {
-      int idx = value.indexOf("=");
-      if (idx == -1)
-      {
-        if (isToken(value))
-          return true;
-      }
-      else
-      {
-        String str = value.substring(idx + 1);
-        if (isToken(value.substring(0, idx))
-          && (isToken(str) || isQuotedString(str)))
-          return true;
-      }
-    }
-    return true;
-  }
-
-  /**
-   * Method isHTTPDate.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isHTTPDate(String value)
-  {
-
-    String rfc1123_date = "EEE, dd MMM yyyy hh:mm:ss 'GMT'";
-    String rfc850_date = "EEEE, dd-MMM-yy hh:mm:ss 'GMT'";
-    String asctime_date = "EEE MMM d hh:mm:ss yyyy";
-
-    try
-    {
-      SimpleDateFormat sdf = new SimpleDateFormat(rfc1123_date, Locale.US);
-      if (sdf.parse(value) != null)
-        return true;
-    }
-    catch (ParseException e)
-    {
-    }
-
-    try
-    {
-      SimpleDateFormat sdf = new SimpleDateFormat(rfc850_date, Locale.US);
-      if (sdf.parse(value) != null)
-        return true;
-    }
-    catch (ParseException e)
-    {
-    }
-
-    try
-    {
-      SimpleDateFormat sdf = new SimpleDateFormat(asctime_date, Locale.US);
-      if (sdf.parse(value) != null)
-        return true;
-    }
-    catch (ParseException e)
-    {
-    }
-
-    return false;
-
-  }
-
-  /**
-   * Method isURI.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isURI(String value)
-  {
-    try
-    {
-      new URL(value);
-    }
-    catch (MalformedURLException e)
-    {
-      try
-      {
-        new URL("http://localhost" + value);
-      }
-      catch (MalformedURLException e2)
-      {
-        return false;
-      }
-    }
-
-    return true;
-  }
-
-  /**
-   * Method isLanguageTag.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isLanguageTag(String value)
-  {
-    int idx = value.indexOf("-");
-    if (idx == -1)
-    {
-      return is8ALPHA(value);
-    }
-    else
-    {
-      if (!is8ALPHA(value.substring(0, idx))
-        || !is8ALPHA(value.substring(idx + 1)))
-        return false;
-      else
-        return true;
-
-    }
-  }
-
-  /**
-   * Method is8ALPHA.
-   * @param string
-   * @return boolean
-   */
-  private static boolean is8ALPHA(String string)
-  {
-    if (string.length() > 8 || !isALPHA(string))
-      return false;
-    else
-      return true;
-  }
-
-  /**
-   * Method isALPHA.
-   * @param string
-   * @return boolean
-   */
-  private static boolean isALPHA(String string)
-  {
-    for (int i = 0; i < string.length(); i++)
-    {
-      if (!BasicRules.isCHAR(string.charAt(i)))
-        return false;
-    }
-
-    return true;
-  }
-
-  /**
-   * Method isDidgit.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isDidgit(String value)
-  {
-    if (value.length() == 0)
-      return false;
-    char[] chs = value.toCharArray();
-    for (int i = 0; i < chs.length; i++)
-    {
-      if (chs[i] < '0' || chs[i] > '9')
-        return false;
-    }
-
-    return true;
-  }
-
-  /**
-   * Method isMediaType.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isMediaType(String value)
-  {
-    StringTokenizer st = new StringTokenizer(value, ";");
-    String mediaType = st.nextToken();
-
-    int idx = mediaType.indexOf("/");
-    if (!isToken(mediaType.substring(0, idx))
-      || !isToken(mediaType.substring(idx + 1)))
-    {
-      return false;
-    }
-
-    while (st.hasMoreElements())
-    {
-      if (!isParameter(st.nextToken(";").trim()))
-        return false;
-    }
-    return true;
-  }
-
-  /**
-   * Method isQuotedString.
-   * @param parValue
-   * @return boolean
-   */
-  private static boolean isQuotedString(String parValue)
-  {
-    if (BasicRules.getLastQuotedString(parValue, 0) != parValue.length())
-    {
-      return false;
-    }
-    return true;
-  }
-
-  /**
-   * Method isToken.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isToken(String value)
-  {
-    return BasicRules.isToken(value);
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/JavaEncoding.properties b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/JavaEncoding.properties
deleted file mode 100644
index 42935366a..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/util/MIMEConstants.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/MIMEConstants.java
deleted file mode 100644
index e94b4b4ac..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/util/MIMEUtils.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/MIMEUtils.java
deleted file mode 100644
index 76fd947f7..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/util/MessageList.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/MessageList.java
deleted file mode 100644
index c04f091e4..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/util/NullUtil.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/NullUtil.java
deleted file mode 100644
index 487cca321..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/util/OperationSignature.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/OperationSignature.java
deleted file mode 100644
index 639a3f209..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/OperationSignature.java
+++ /dev/null
@@ -1,788 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.util;
-
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingFault;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.BindingOutput;
-import javax.wsdl.Definition;
-import javax.wsdl.Fault;
-import javax.wsdl.Import;
-import javax.wsdl.Input;
-import javax.wsdl.Message;
-import javax.wsdl.Operation;
-import javax.wsdl.Output;
-import javax.wsdl.Part;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.Types;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPBinding;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.wsdl.extensions.soap.SOAPFault;
-import javax.wsdl.extensions.soap.SOAPHeader;
-import javax.wsdl.extensions.soap.SOAPHeaderFault;
-import javax.wsdl.extensions.soap.SOAPOperation;
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversal;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversalContext;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLVisitor;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * The class implements mechanism for creating unique signature of operation.
- * 
- * @author Kulik
- */
-public final class OperationSignature
-{
-  // the flag indicates whether the messages is represented as document style
-  // vice versa is not generally true
-  private boolean isDocumentStyle = false;
-  private boolean isCreated = false;
-  private boolean isFault = false;
-
-  protected List signature = new LinkedList();
-  private Element firstBody = null;
-
-  /**
-   * Class operates as container for matched operation.
-  * @author Kulik
-   */
-  public final static class OperationMatch
-  {
-    final private String style;
-    final private BindingOperation operation;
-    final private List signature;
-
-    /**
-     * Constructor.
-     * @param style operation style.
-     * @param signature a signature.
-     * @param operation a binding operation.
-     */
-    protected OperationMatch(
-      String style,
-      List signature,
-      BindingOperation operation)
-    {
-      this.style = style;
-      this.signature = signature;
-      this.operation = operation;
-    }
-    /**
-     * Gets operation style.
-     * @return operation style.
-     */
-    public String getOperationStyle()
-    {
-      return style;
-    }
-    /**
-     * Gets WSDL binding operation object.
-     * @return WSDL binding operation object.
-     */
-    public BindingOperation getOperation()
-    {
-      return operation;
-    }
-
-    /**
-     * Gets operation signature as list.
-     * @return operation signature as list.
-     */
-    public List getSignature()
-    {
-      return signature;
-    }
-  }
-
-  /**
-   * The class searches BindingOperation by the given OperationSigbnature. 
-  * @author Kulik
-   */
-  public final class Visitor implements WSDLVisitor
-  {
-    /* (non-Javadoc)
-     * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.Part, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-     */
-    public void visit(Part obj, Object parent, WSDLTraversalContext ctx)
-    {
-    }
-
-    /* (non-Javadoc)
-     * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.Service, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-     */
-    public void visit(Service obj, Object parent, WSDLTraversalContext ctx)
-    {
-    }
-
-    /* (non-Javadoc)
-     * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.Types, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-     */
-    public void visit(Types obj, Object parent, WSDLTraversalContext ctx)
-    {
-    }
-
-    /* (non-Javadoc)
-     * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.Operation, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-     */
-    public void visit(Operation obj, Object parent, WSDLTraversalContext ctx)
-    {
-    }
-
-    /* (non-Javadoc)
-     * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.Input, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-     */
-    public void visit(Input obj, Object parent, WSDLTraversalContext ctx)
-    {
-    }
-
-    /* (non-Javadoc)
-     * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.Output, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-     */
-    public void visit(Output obj, Object parent, WSDLTraversalContext ctx)
-    {
-    }
-
-    /* (non-Javadoc)
-     * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.Fault, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-     */
-    public void visit(Fault obj, Object parent, WSDLTraversalContext ctx)
-    {
-    }
-
-    /* (non-Javadoc)
-     * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.Binding, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-     */
-    public void visit(Binding obj, Object parent, WSDLTraversalContext ctx)
-    {
-    }
-
-    /* (non-Javadoc)
-     * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.BindingOperation, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-     */
-    public void visit(
-      BindingOperation obj,
-      Object parent,
-      WSDLTraversalContext ctx)
-    {
-    }
-
-    /* (non-Javadoc)
-     * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.BindingInput, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-     */
-    public void visit(
-      BindingInput obj,
-      Object parent,
-      WSDLTraversalContext ctx)
-    {
-    }
-
-    /* (non-Javadoc)
-     * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.BindingOutput, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-     */
-    public void visit(
-      BindingOutput obj,
-      Object parent,
-      WSDLTraversalContext ctx)
-    {
-    }
-
-    /* (non-Javadoc)
-     * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(BindingFault, Object, WSDLTraversalContext)
-     */
-    public void visit(
-      BindingFault obj,
-      Object parent,
-      WSDLTraversalContext ctx)
-    {
-    }
-
-    /* (non-Javadoc) 
-     * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(Import, Object, WSDLTraversalContext)
-     */
-    public void visit(Import obj, Object parent, WSDLTraversalContext ctx)
-    {
-    }
-
-    /* (non-Javadoc) 
-     * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(Element, Object, WSDLTraversalContext)
-     */
-    public void visit(Element obj, Object parent, WSDLTraversalContext ctx)
-    {
-    }
-
-    /* (non-Javadoc)
-     * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(Message, Object, WSDLTraversalContext)
-     */
-    public void visit(Message obj, Object parent, WSDLTraversalContext ctx)
-    {
-    }
-
-    /* (non-Javadoc)
-     * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(Port, Object, WSDLTraversalContext)
-     */
-    public void visit(Port obj, Object parent, WSDLTraversalContext ctx)
-    {
-    }
-
-    /* (non-Javadoc)
-     * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(PortType, Object, WSDLTraversalContext)
-     */
-    public void visit(PortType obj, Object parent, WSDLTraversalContext ctx)
-    {
-    }
-
-    /* (non-Javadoc)
-     * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(Definition, Object, WSDLTraversalContext)
-     */
-    public void visit(Definition obj, Object parent, WSDLTraversalContext ctx)
-    {
-    }
-
-    /* (non-Javadoc) 
-     * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(ExtensibilityElement, Object, WSDLTraversalContext)
-     */
-    public void visit(
-      ExtensibilityElement obj,
-      Object parent,
-      WSDLTraversalContext ctx)
-    {
-    }
-
-    /* (non-Javadoc) 
-     * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(SOAPHeader, Object, WSDLTraversalContext)
-     */
-    public void visit(SOAPHeader obj, Object parent, WSDLTraversalContext ctx)
-    {
-    }
-
-    /* (non-Javadoc) 
-     * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(SOAPHeaderFault, Object, WSDLTraversalContext)
-     */
-    public void visit(
-      SOAPHeaderFault obj,
-      Object parent,
-      WSDLTraversalContext ctx)
-    {
-    }
-
-    /* (non-Javadoc) 
-     * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(SOAPFault, Object, WSDLTraversalContext)
-     */
-    public void visit(SOAPFault obj, Object parent, WSDLTraversalContext ctx)
-    {
-    }
-
-    private String requiredStyle = null;
-    private String soapAction = null;
-    private BindingOperation operation = null;
-    private TypesRegistry registry = null;
-    private boolean isSOAPActionRequired = false;
-
-    /**
-    * Constructor.
-    */
-    public Visitor()
-    {
-      super();
-      // TODO Auto-generated constructor stub
-    }
-
-    /**
-     * Constructor.
-     * @param requiredStyle required style.
-     * @param registry types registry.
-     */
-    public Visitor(String requiredStyle, TypesRegistry registry)
-    {
-      this.requiredStyle = requiredStyle;
-      this.registry = registry;
-    }
-
-    /**
-     * The method returns matched binding operation.
-     * @return BindingOperation
-     */
-    public BindingOperation getMatchedOperation()
-    {
-      return operation;
-    }
-
-    /**
-     * The method sets up required operation to be found.
-     * The possible values is rpc and document.
-     * @param requiredStyle operation style.
-     */
-    public void setRequiredStyle(String requiredStyle)
-    {
-      this.requiredStyle = requiredStyle;
-    }
-
-    /**
-     * The method indicates whether SOAP Action be included into operation.
-     * signature.
-     * @return true if SOAP Action isd required.
-     */
-    public boolean isSOAPActionRequired()
-    {
-      return isSOAPActionRequired;
-    }
-
-    /**
-     * Sets SOAP action to be included into signature.
-     */
-    public void setSOAPActionRequired()
-    {
-      isSOAPActionRequired = true;
-    }
-
-    /**
-     * internal method.
-     */
-    public void visit(
-      SOAPBinding binding,
-      Object parent,
-      WSDLTraversalContext ctx)
-    {
-      String style =
-        (binding.getStyle() == null)
-          ? WSIConstants.ATTRVAL_SOAP_BIND_STYLE_DOC
-          : binding.getStyle();
-      ctx.addParameter("style", style);
-    }
-
-    /**
-     * internal method.
-     */
-    public void visit(
-      SOAPOperation operation,
-      Object parent,
-      WSDLTraversalContext ctx)
-    {
-      soapAction = null;
-      String style = operation.getStyle();
-      if (style == null)
-        style = (String) ctx.getParameter("style");
-      if (!requiredStyle.equals(style))
-        ctx.cancelBindingOperationProcessing();
-      else
-        //if (isSOAPActionRequired)
-        soapAction = operation.getSoapActionURI();
-    }
-
-    /**
-     * internal method.
-     */
-    public void visit(SOAPBody body, Object parent, WSDLTraversalContext ctx)
-    {
-      // assert parent instanceof BindingInput
-      BindingOperation bop = ctx.getBindingOperation();
-      if (bop.getOperation() == null
-        || bop.getOperation().getInput() == null
-        || bop.getOperation().getInput().getMessage() == null)
-        return;
-
-      Message msg = bop.getOperation().getInput().getMessage();
-      List parts =
-        WSDLUtil.getParts(bop.getOperation(), msg, body, requiredStyle);
-
-      QName additionalName = null;
-      // if operation is rpc, add to parts qname qith function name
-      if (WSIConstants.ATTRVAL_SOAP_BIND_STYLE_RPC.equals(requiredStyle))
-      {
-        // found out target namespace
-        String namespace = body.getNamespaceURI();
-        if (namespace == null || namespace.length() == 0)
-          // !! ATTENTION
-          // namespace should be retrieved from service target nameapce            
-          namespace = ctx.getBinding().getQName().getNamespaceURI();
-
-        // insert operation name as first signature part
-        additionalName =
-          new QName(namespace, ctx.getBindingOperation().getName());
-      }
-
-      OperationSignature op =
-        new OperationSignature(parts, null, registry, false);
-
-      if (additionalName != null)
-        op.getSignature().add(0, additionalName);
-      //if (isSOAPActionRequired)
-      //if (soapAction != null)
-      if (isSOAPActionRequired && soapAction != null)
-        op.getSignature().add(0, soapAction);
-      if (op.getSignature().equals(signature))
-      {
-        // required operation is found
-        operation = ctx.getBindingOperation();
-        ctx.cancelBindingOperationProcessing();
-        ctx.cancelBindingProcessing();
-      }
-
-      else
-      {
-        op = new OperationSignature(parts, null, registry, true);
-        if (additionalName != null)
-          op.getSignature().add(0, additionalName);
-
-        //if (isSOAPActionRequired)
-        //if (soapAction != null)
-        if (isSOAPActionRequired && soapAction != null)
-          op.getSignature().add(0, soapAction);
-
-        if (op.getSignature().equals(signature))
-        {
-          // required operation is found
-          operation = ctx.getBindingOperation();
-          ctx.cancelBindingOperationProcessing();
-          ctx.cancelBindingProcessing();
-        }
-      }
-    }
-  }
-
-  /**
-   * The constructor creates OperationSignature for SOAP message.
-   * @param doc a Document object.
-   */
-  public OperationSignature(Document doc)
-  {
-    Element body =
-      XMLUtils.findChildElement(
-        doc.getDocumentElement(),
-        WSITag.ELEM_SOAP_BODY);
-    processParts(body, false);
-    isDocumentStyle |= (signature.size() > 1);
-  }
-
-  /**
-   * The constructor creates OperationSIgnature for 
-   * list of <code>Part</code> objects and given WSDL document within these
-   * parts are defined.
-   * 
-   * @param parts a list of Part objects.
-   * @param wsdlDocument a WSDL document.
-   * @param registry a types registry.
-   * @param partial a partial status.
-   */
-  public OperationSignature(
-    List parts,
-    Document wsdlDocument,
-    TypesRegistry registry,
-    boolean partial)
-  {
-    if (parts != null)
-    {
-      Iterator it = parts.iterator();
-
-      while (it.hasNext())
-      {
-        Part part = (Part) it.next();
-        String localName = (partial) ? part.getName() : null;
-        QName typeName = part.getTypeName();
-        QName elementName = part.getElementName();
-
-        String namespace = "";
-
-        // If type name is not null, then a type element was used so it should be an RPC style signature 
-        if (typeName != null)
-        {
-          // Part wrappers do not have namespaces 
-          namespace = "";
-
-          if (localName == null)
-            localName = typeName.getLocalPart();
-        }
-
-        // If element name is not null, then it should be a document style signature
-        else if (elementName != null)
-        {
-          namespace = elementName.getNamespaceURI();
-
-          if (localName == null)
-            localName = elementName.getLocalPart();
-        }
-
-        signature.add(new QName(namespace, localName));
-      }
-    }
-
-    isCreated = true;
-  }
-
-  /**
-   * The method recreates OperationSignature with assumption that operation is
-   * RPC.
-   */
-  public void createRPCSignature()
-  {
-    isCreated = false;
-    if (firstBody == null)
-      return;
-    processParts(firstBody, true);
-    isDocumentStyle = false;
-  }
-
-  /**
-   * Internal method processes WSDL parts and creates operation signature.
-   * @param parent
-   */
-  private void processParts(Node parent, boolean processWrapper)
-  {
-    if (parent != null)
-    {
-      Node n = parent.getFirstChild();
-
-      // variable indicates that first tag is processed
-      boolean isFirst = true;
-      // iterate all bodies
-      while (n != null)
-      {
-        if (Node.ELEMENT_NODE == n.getNodeType())
-        {
-          if (isFirst && firstBody == null)
-          {
-            isFirst = false;
-            firstBody = (Element) n;
-            // check soapenv:fault
-            if (XMLUtils.equals(n, WSITag.ELEM_SOAP_FAULT))
-            {
-              isFault = true;
-              isCreated = false;
-              return;
-            }
-          }
-
-          String namespace = n.getNamespaceURI();
-          String localName = n.getLocalName();
-
-          /*I have no idea why this code is in here since it makes no sense at all, so I am commenting it out
-          // try to get xsi:tag
-          if (XMLUtils.getAttribute((Element) n, WSITag.ATTR_XSI_TYPE) != null) {
-              // we suppose that RPC style does not use xsi:type attribute
-              isDocumentStyle = true;
-              Attr xsiType = XMLUtils.getAttribute((Element) n, WSITag.ATTR_XSI_TYPE);
-              
-              String xsiValue = xsiType.getNodeValue();
-              int i = xsiValue.indexOf(':');
-              if (i != -1)
-              {
-                  namespace = XMLUtils.findNamespaceURI(n, xsiValue.substring(0, i));
-                  localName = xsiValue.substring(i+1);
-              } 
-          }
-          */
-
-          // If this is rpc-literal and processing a part (not the wrapper), then the part should not have a namespace
-          // And if it does, then one of the test assertions will detect it
-          if (!isDocumentStyle && processWrapper)
-          {
-            namespace = "";
-          }
-
-          if (namespace == null || namespace.length() == 0)
-          {
-            if (isDocumentStyle)
-            {
-              //Element firstChild  = null;
-              Node it = n.getFirstChild();
-              while (it != null && !(it instanceof Element))
-                it = it.getNextSibling();
-              if (it != null)
-                namespace = it.getNamespaceURI();
-            }
-          }
-
-          // normalize namespaces. All empty namespaces -> null 
-          if (namespace != null && namespace.length() == 0)
-            namespace = null;
-
-          // put part into signature
-          signature.add(new QName(namespace, localName));
-        }
-
-        n = n.getNextSibling();
-      }
-    }
-    else
-    {
-      isCreated = false; // not found ?
-      return;
-    }
-
-    isCreated = true;
-  }
-
-  /**
-   * Indicates whether operation has document style or RPC. 
-   * @return true if operation has document style.
-   */
-  public boolean isDocumentStyle()
-  {
-    return isDocumentStyle;
-  }
-
-  /**
-   * Indicates whether WSDL fault parts should be included into signature or
-   * not.
-   * @return true if WSDL fault parts should be included into signature.
-   */
-  public boolean isFault()
-  {
-    return isFault;
-  }
-
-  /**
-   * Indicates that operation signature was created.
-   * @return true if operation signature was created.
-   */
-  public boolean isCreated()
-  {
-    return isCreated;
-  }
-
-  /**
-   * Gets operation signature created for SOAP message.
-   * @return operation signature created for SOAP message.
-   */
-  public List getSignature()
-  {
-    return signature;
-  }
-
-  /**
-   * @see java.lang.Object#hashCode()
-   */
-  public int hashCode()
-  {
-    return signature.hashCode();
-  }
-
-  /**
-   * @see java.lang.Object#equals(Object)
-   */
-  public boolean equals(Object o)
-  {
-    if (o instanceof OperationSignature)
-      return signature.equals(((OperationSignature) o).getSignature());
-    return false;
-  }
-
-  /**
-   * The method matches operation based on the given SOAP message request,
-   * WSDL binding, and soapAction.
-   * 
-   * @param inputMessage an SOAP message request.
-   * @param soapAction a soap action.
-   * @param binding a WSDL binding.
-   * @param registry a types registry.
-   * @return OperationMatch object.
-   */
-  public static OperationMatch matchOperation(
-    Document inputMessage,
-    String soapAction,
-    Binding binding,
-    TypesRegistry registry)
-  {
-    return matchOperation(inputMessage, soapAction, binding, registry, true);
-  }
-
-  /**
-     * The method matches operation based on the given SOAP message request,
-     * WSDL binding, and soapAction.
-     * 
-     * @param inputMessage SOAP message request.
-     * @param soapAction a soap action.
-     * @param binding a WSDL binding.
-     * @param registry a types registry.
-     * @param soapActionRequired must process the soapAction value even if it is null 
-     * @return OperationMatch object.
-     */
-  public static OperationMatch matchOperation(
-    Document inputMessage,
-    String soapAction,
-    Binding binding,
-    TypesRegistry registry,
-    boolean soapActionRequired)
-  {
-    // Parse request message
-    OperationSignature signature = new OperationSignature(inputMessage);
-    if (!signature.isCreated())
-      return null;
-
-    // first of all looking for document style
-    // because rpc style is subset of document style  
-    OperationSignature.Visitor resolver =
-      signature.new Visitor(WSIConstants.ATTRVAL_SOAP_BIND_STYLE_DOC, registry);
-
-    // normalize SOAPAction
-    if (soapAction != null
-      && soapAction.length() > 1
-      && soapAction.charAt(0) == '"'
-      && soapAction.charAt(soapAction.length() - 1) == '"')
-      soapAction = soapAction.substring(1, soapAction.length() - 1);
-
-    //      if soap action URI processing required
-    // if soap action URI processing required 
-    // analyze SOAPAction after parts being processed
-    // put SOAPAction into signature
-    //if (soapAction != null && soapAction.length() > 0) {
-    if (soapAction != null)
-    {
-      signature.getSignature().add(0, soapAction);
-    }
-
-    if (soapActionRequired)
-      resolver.setSOAPActionRequired();
-
-    WSDLTraversal traversal = new WSDLTraversal();
-    //VisitorAdaptor.adapt(resolver);
-    traversal.setVisitor(resolver);
-    traversal.visitSOAPBinding(true);
-    traversal.visitSOAPBody(true);
-    traversal.visitSOAPOperation(true);
-
-    traversal.ignoreReferences();
-    traversal.ignoreBindingOutput();
-    traversal.traverse(binding);
-
-    BindingOperation operation = resolver.getMatchedOperation();
-    if (operation == null && !signature.isDocumentStyle())
-    {
-      resolver.setRequiredStyle(WSIConstants.ATTRVAL_SOAP_BIND_STYLE_RPC);
-      signature.createRPCSignature();
-      traversal.traverse(binding);
-      operation = resolver.getMatchedOperation();
-      if (operation == null)
-        return null;
-    }
-
-    return new OperationMatch(
-      resolver.requiredStyle,
-      signature.getSignature(),
-      resolver.getMatchedOperation());
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/Pair.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/Pair.java
deleted file mode 100644
index 471a192d0..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/util/SetCookie2Validator.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/SetCookie2Validator.java
deleted file mode 100644
index 5982e3a85..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/SetCookie2Validator.java
+++ /dev/null
@@ -1,629 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.util;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Vector;
-
-/**
- * This class checks the cookies conform to RFC2965.
- * 
- * @author Baltak
- */
-public class SetCookie2Validator
-{
-
-  private Vector commentVect = new Vector();
-  private Vector commentURLVect = new Vector();
-  private Vector domainVect = new Vector();
-  private Vector max_AgeVect = new Vector();
-  private Vector pathVect = new Vector();
-  private Vector portVect = new Vector();
-  private Vector versionVect = new Vector();
-
-  private boolean path = false;
-
-  /**
-   * Method resetFlags.
-   */
-  private void resetPath()
-  {
-    path = false;
-  }
-
-  /**
-   * Check if the string satisfy the "Set-Cookie2" header value.
-   * @param str String 
-   * @return boolean
-   */
-  public boolean isSetCookie2(String str)
-  {
-
-    try
-    {
-      int index = 0;
-      int newIndex = 0;
-      while (true)
-      {
-        newIndex = getLastCookie(str, index);
-        if (index == newIndex)
-          return false;
-        // skip spaces
-        index = newIndex;
-        index = skipSpaces(str, index);
-        if (index == str.length())
-        {
-          return true;
-        }
-        else
-        {
-          if (str.charAt(index) != ',')
-            return false;
-          index++;
-          // skip spaces
-          index = skipSpaces(str, index);
-        }
-
-      }
-    }
-    catch (Throwable th)
-    {
-      return false;
-    }
-
-  }
-
-  /**
-   * Method getLastCookie.
-   * @param str
-   * @param startIndex
-   * @return int
-   */
-  private int getLastCookie(String str, int startIndex)
-  {
-
-    resetPath();
-
-    int index = startIndex;
-    // find token
-    int newIndex = BasicRules.getLastToken(str, index);
-    if (index == newIndex)
-      return startIndex;
-
-    index = newIndex;
-    if (index == str.length())
-      return startIndex;
-
-    // if not '=' - error
-    if (str.charAt(index) != '=')
-      return startIndex;
-
-    index++;
-    if (index == str.length())
-      return startIndex;
-
-    // get value
-    newIndex = getLastValue(str, index);
-    if (index == newIndex)
-      return startIndex;
-
-    while (true)
-    {
-      index = newIndex;
-      if (index == str.length())
-        return index;
-
-      if (str.charAt(index) != ';')
-        return index;
-      index++;
-      // skip spaces
-      index = skipSpaces(str, index);
-
-      if (index == str.length())
-        return startIndex;
-      newIndex = getLastSetCookieAv(str, index);
-      if (index == newIndex)
-        return startIndex;
-    }
-  }
-
-  /**
-   * Method getLastValue.
-   * @param str
-   * @param startIndex
-   * @return int
-   */
-  private int getLastValue(String str, int startIndex)
-  {
-
-    int index = BasicRules.getLastToken(str, startIndex);
-    if (index != startIndex)
-      return index;
-    index = BasicRules.getLastQuotedString(str, startIndex);
-    if (index != startIndex)
-      return index;
-
-    return startIndex;
-  }
-
-  /**
-   * Method getLastSetCookieAv.
-   * @param str
-   * @param startIndex
-   * @return int
-   */
-  private int getLastSetCookieAv(String str, int startIndex)
-  {
-
-    int index = startIndex;
-    int newIndex = 0;
-
-    if (str.startsWith("Comment=", index))
-    {
-      index += "Comment=".length();
-      newIndex = getLastValue(str, index);
-      if (index == newIndex)
-        return startIndex;
-      // debug ->
-      String qqq = getValue(str, index, newIndex);
-      commentVect.add(qqq);
-      // debug <-
-      return newIndex;
-    }
-    else if (str.startsWith("CommentURL=", index))
-    {
-      index += "CommentURL=".length();
-
-      if (str.charAt(index) != '\"')
-        return startIndex;
-
-      newIndex = str.indexOf('\"', index + 1);
-      if (newIndex == -1)
-        return startIndex;
-      try
-      {
-        new URL(str.substring(index + 1, newIndex));
-      }
-      catch (MalformedURLException mue)
-      {
-        return startIndex;
-      }
-      // debug ->
-      String qqq = getValue(str, index + 1, newIndex);
-      commentURLVect.add(qqq);
-      // debug <-
-      newIndex++;
-      return newIndex;
-    }
-    else if (str.startsWith("Discard", index))
-    {
-      return startIndex + "Discard".length();
-    }
-    else if (str.startsWith("Domain=", index))
-    {
-      index += "Domain=".length();
-
-      newIndex = getLastValue(str, index);
-      if (index == newIndex)
-        return startIndex;
-
-      // debug ->
-      String qqq = getValue(str, index, newIndex);
-      domainVect.add(qqq);
-      // debug <-
-      return newIndex;
-    }
-    else if (str.startsWith("Max-Age=", index))
-    {
-      index += "Max-Age=".length();
-
-      newIndex = getLastValue(str, index);
-      if (index == newIndex)
-        return startIndex;
-
-      String qqq = getValue(str, index, newIndex);
-      try
-      {
-        Integer.parseInt(qqq);
-      }
-      catch (NumberFormatException nfe)
-      {
-        return startIndex;
-      }
-      // debug ->
-      max_AgeVect.add(qqq);
-      // debug <-
-      return newIndex;
-    }
-    else if (str.startsWith("Path=", index))
-    {
-      index += "Path=".length();
-
-      newIndex = getLastValue(str, index);
-      if (index == newIndex)
-        return startIndex;
-
-      String qqq = getValue(str, index, newIndex);
-      if (path == false)
-        pathVect.add(qqq);
-      path = true;
-      return newIndex;
-    }
-    else if (str.startsWith("Port", index))
-    {
-      index += "Port".length();
-      if (str.charAt(index) != '=')
-        return index;
-
-      index++;
-      if (str.charAt(index) != '\"')
-        return startIndex;
-
-      index++;
-      newIndex = getLastPortList(str, index);
-      if (index == newIndex)
-        return startIndex;
-
-      // debug ->
-      String qqq = getValue(str, index, newIndex);
-      portVect.add(qqq);
-      // debug <-
-
-      index = newIndex;
-      if (str.charAt(index) != '\"')
-        return startIndex;
-      index++;
-      return index;
-
-    }
-    else if (str.startsWith("Secure", index))
-    {
-      return startIndex + "Secure".length();
-    }
-    else if (str.startsWith("Version=", index))
-    {
-      index += "Version=".length();
-
-      newIndex = getLastDIGIT(str, index);
-      if (index == newIndex)
-        return startIndex;
-
-      // debug ->
-      String qqq = getValue(str, index, newIndex);
-      versionVect.add(qqq);
-      // debug <-
-      return newIndex;
-    }
-    else
-    {
-      return startIndex;
-    }
-  }
-
-  /**
-   * Method getLastPortList.
-   * @param str
-   * @param startIndex
-   * @return int
-   */
-  private int getLastPortList(String str, int startIndex)
-  {
-    int index = startIndex;
-    int newIndex = 0;
-
-    while (true)
-    {
-      newIndex = getLastDIGIT(str, index);
-      if (index == newIndex)
-        return startIndex;
-
-      index = newIndex;
-      if (str.charAt(index) != ',')
-        return index;
-      index++;
-    }
-  }
-
-  /**
-   * Method getLastDIGIT.
-   * @param str
-   * @param startIndex
-   * @return int
-   */
-  private int getLastDIGIT(String str, int startIndex)
-  {
-    int index = startIndex;
-    for (; index < str.length(); index++)
-    {
-      if (!BasicRules.isDIGIT(str.charAt(index)))
-        return index;
-    }
-    return index;
-  }
-
-  /**
-   * Check if the string satisfy the "Cookie" header value.
-   * @param str String
-   * @return boolean
-   */
-  public boolean isCookie(String str)
-  {
-    int index = 0;
-    int newIndex = 0;
-
-    try
-    {
-      newIndex = getLastVersion(str, index);
-      if (index == newIndex)
-        return false;
-
-      index = newIndex;
-      index = skipSpaces(str, index);
-      if (str.charAt(index) != ';' && str.charAt(index) != ',')
-        return false;
-
-      index++;
-      index = skipSpaces(str, index);
-
-      while (true)
-      {
-        newIndex = getLastCookiesValue(str, index);
-        if (index == newIndex)
-          return false;
-
-        index = newIndex;
-        if (index == str.length())
-          return true;
-
-        if (str.charAt(index) != ';' && str.charAt(index) != ',')
-          return false;
-        index++;
-        index = skipSpaces(str, index);
-      }
-    }
-    catch (Throwable th)
-    {
-      return false;
-    }
-  }
-
-  /**
-   * Method getLastVersion.
-   * @param str
-   * @param startIndex
-   * @return int
-   */
-  private int getLastVersion(String str, int startIndex)
-  {
-    int index = startIndex;
-    int newIndex = 0;
-    if (!str.startsWith("$Version="))
-      return startIndex;
-    index += "$Version=".length();
-    newIndex = getLastValue(str, index);
-    if (index == newIndex)
-      return startIndex;
-
-    return newIndex;
-  }
-
-  /**
-   * Method getLastCookiesValue.
-   * @param str
-   * @param startIndex
-   * @return int
-   */
-  private int getLastCookiesValue(String str, int startIndex)
-  {
-    int index = startIndex;
-    int newIndex = 0;
-    int oldIndex = 0;
-
-    // find token
-    newIndex = BasicRules.getLastToken(str, index);
-    if (index == newIndex)
-      return startIndex;
-
-    index = newIndex;
-    if (index == str.length())
-      return startIndex;
-
-    // if not '=' - error
-    if (str.charAt(index) != '=')
-      return startIndex;
-
-    index++;
-    if (index == str.length())
-      return startIndex;
-
-    // get value
-    newIndex = getLastValue(str, index);
-    if (index == newIndex)
-      return startIndex;
-
-    index = newIndex;
-    if (index == str.length())
-      return index;
-
-    if (str.charAt(index) != ';')
-      return index;
-
-    // process [";" path] [";" domain] [";" port] 
-    oldIndex = index;
-    index++;
-    if (index == str.length())
-      return startIndex;
-
-    index = skipSpaces(str, index);
-    if (index == str.length())
-      return startIndex;
-
-    // process path
-    newIndex = getLastPath(str, index);
-    if (index != newIndex)
-    {
-      index = newIndex;
-      if (index == str.length())
-        return index;
-
-      if (str.charAt(index) != ';')
-        return index;
-
-      oldIndex = index;
-      index++;
-      if (index == str.length())
-        return startIndex;
-
-      index = skipSpaces(str, index);
-      if (index == str.length())
-        return startIndex;
-
-    }
-
-    // process domain
-    newIndex = getLastDomain(str, index);
-    if (index != newIndex)
-    {
-      index = newIndex;
-      if (index == str.length())
-        return index;
-
-      if (str.charAt(index) != ';')
-        return index;
-
-      oldIndex = index;
-      index++;
-      if (index == str.length())
-        return startIndex;
-
-      index = skipSpaces(str, index);
-      if (index == str.length())
-        return startIndex;
-
-    }
-
-    // process port
-    newIndex = getLastPort(str, index);
-    if (index != newIndex)
-      return newIndex;
-    else
-      return oldIndex;
-  }
-
-  /**
-   * Method getLastPath.
-   * @param str
-   * @param startIndex
-   * @return int
-   */
-  private int getLastPath(String str, int startIndex)
-  {
-    int index = startIndex;
-    int newIndex = 0;
-
-    if (!str.startsWith("$Path=", index))
-      return startIndex;
-    index += "$Path=".length();
-    newIndex = getLastValue(str, index);
-    if (index == newIndex)
-      return startIndex;
-
-    return newIndex;
-  }
-
-  /**
-   * Method getLastDomain.
-   * @param str
-   * @param startIndex
-   * @return int
-   */
-  private int getLastDomain(String str, int startIndex)
-  {
-    int index = startIndex;
-    int newIndex = 0;
-
-    if (!str.startsWith("$Domain=", index))
-      return startIndex;
-    index += "$Domain=".length();
-    newIndex = getLastValue(str, index);
-    if (index == newIndex)
-      return startIndex;
-
-    return newIndex;
-  }
-
-  /**
-   * Method getLastPort.
-   * @param str
-   * @param startIndex
-   * @return int
-   */
-  private int getLastPort(String str, int startIndex)
-  {
-    int index = startIndex;
-    int newIndex = 0;
-
-    if (!str.startsWith("$Port", index))
-      return startIndex;
-
-    index += "$Port".length();
-    if (str.charAt(index) != '=')
-      return index;
-
-    index++;
-    if (str.charAt(index) != '\"')
-      return startIndex;
-
-    index++;
-    newIndex = getLastPortList(str, index);
-    if (index == newIndex)
-      return startIndex;
-
-    index = newIndex;
-    if (str.charAt(index) != '\"')
-      return startIndex;
-    index++;
-    return index;
-  }
-
-  /**
-   * Method skipSpaces.
-   * @param str
-   * @param index
-   * @return int
-   */
-  private int skipSpaces(String str, int index)
-  {
-    for (; index < str.length(); index++)
-      if (!BasicRules.isSP(str.charAt(index)))
-        break;
-    return index;
-  }
-
-  /**
-   * Method getValue.
-   * @param str
-   * @param beg
-   * @param end
-   * @return String
-   */
-  private String getValue(String str, int beg, int end)
-  {
-    String qqq = null;
-    if (str.charAt(beg) == '\"')
-      qqq = str.substring(beg + 1, end - 1);
-    else
-      qqq = str.substring(beg, end);
-    return qqq;
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/StringTokenizer.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/StringTokenizer.java
deleted file mode 100644
index 5c9539814..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/StringTokenizer.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- ********************************************************************************/
-package org.eclipse.wst.wsi.internal.core.util;
-
-/**
- * String tokenizer.
- * 
- * @author: Kulik
- */
-final public class StringTokenizer
-{
-  private char[] spaceDel;
-  private char[] del;
-  private char[] allDel;
-
-  /**
-   * Enumeration of strings.
-  * @author Kulik
-   */
-  private class StringTokenizerEnumeration implements java.util.Enumeration
-  {
-    private final char[] str;
-    private final int size;
-    private int index;
-
-    /**
-     * Constructor.
-     * @param s
-     */
-    StringTokenizerEnumeration(char[] s)
-    {
-      str = s;
-      size = str.length;
-      index = 0;
-
-      // skip space delimiters
-      while (index < size && contain(str[index], spaceDel))
-        index++;
-    }
-
-    /**
-     * @see java.util.Enumeration#hasMoreElements()
-     */
-    public boolean hasMoreElements()
-    {
-      return (index < size);
-    }
-
-    /**
-     * @see java.util.Enumeration#nextElement()
-     */
-    public Object nextElement()
-    {
-      if (index >= size)
-        throw new java.util.NoSuchElementException(
-          "StringTokenizer enumeration");
-
-      // skip delimiters
-      int begStr = index;
-      if (index < size && contain(str[index], del))
-        index++;
-
-      // skip word
-      if (begStr == index)
-        while (index < size && !contain(str[index], allDel))
-          index++;
-
-      int endStr = index;
-
-      // skip space delimiters
-      while (index < size && contain(str[index], spaceDel))
-        index++;
-
-      return String.copyValueOf(str, begStr, endStr - begStr);
-    }
-
-    /**
-     * @see java.lang.Object#toString()
-     */
-    public String toString()
-    {
-      int i = index;
-      String s = (String) nextElement();
-      index = i;
-      return s;
-    }
-  }
-
-  /**
-   * StringTokenizer constructor.
-     * @param spaceDelimiters the set of delimiters to be ignored
-     * @param delimiters the set of delimiters to be remained.
-   */
-  public StringTokenizer(char[] spaceDelimiters, char[] delimiters)
-  {
-    super();
-
-    if (spaceDelimiters != null)
-    {
-      spaceDel = new char[spaceDelimiters.length];
-      System.arraycopy(spaceDelimiters, 0, spaceDel, 0, spaceDelimiters.length);
-      sort(spaceDel);
-    }
-    else
-      spaceDel = null;
-
-    if (delimiters != null)
-    {
-      del = new char[delimiters.length];
-      System.arraycopy(delimiters, 0, del, 0, delimiters.length);
-      sort(del);
-    }
-    else
-      del = null;
-
-    if (del != null && spaceDel != null)
-    {
-      allDel = new char[del.length + spaceDel.length];
-      System.arraycopy(del, 0, allDel, 0, del.length);
-      System.arraycopy(spaceDel, 0, allDel, del.length, spaceDel.length);
-    }
-    else if (del != null)
-      allDel = del;
-    else
-      allDel = spaceDel;
-
-    sort(allDel);
-  }
-  /**
-   * Parses string.
-   * @return java.util.Enumeration
-   * @param s java.lang.String
-   */
-  public java.util.Enumeration parse(String s)
-  {
-    if (s == null)
-      throw new IllegalArgumentException("StringTokenizer : String cannot be NULL");
-
-    return new StringTokenizerEnumeration(s.toCharArray());
-  }
-
-  /**
-   * Binary search.
-   * @return boolean
-   * @param c char
-   */
-  private static boolean contain(char c, char[] a)
-  {
-    if (a == null)
-      return false;
-
-    int l = 0, r = a.length - 1, center;
-    while (l < r)
-    {
-      center = (l + r) / 2;
-      if (c > a[center])
-        l = center + 1;
-      else
-        r = center;
-    }
-
-    return a[l] == c;
-  }
-  /**
-   * Heap sort
-   * @param c char[]
-   */
-  static private void sort(char[] c)
-  {
-    if (c != null)
-    {
-      int j, k;
-      char ci;
-
-      // push heap
-      for (int i = 1; i < c.length; i++)
-      {
-        j = ((k = i) - 1) / 2;
-        ci = c[i];
-        while (k > 0 && c[j] < ci)
-        {
-          c[k] = c[j];
-          j = ((k = j) - 1) / 2;
-        }
-        c[k] = ci;
-      }
-
-      // pop heap
-      for (int i = c.length - 1; i > 0; i--)
-      {
-        j = 2;
-        k = 0;
-        ci = c[0];
-        while (j <= i)
-        {
-          c[k] = (c[j - 1] > c[j]) ? c[--j] : c[j];
-          j = ((k = j) + 1) * 2;
-        }
-        c[k] = c[i];
-        c[i] = ci;
-      }
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/TestUtils.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/TestUtils.java
deleted file mode 100644
index c0ae9459e..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/TestUtils.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.util;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-
-import org.eclipse.wst.wsi.internal.core.ToolInfo;
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.common.AddStyleSheet;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Element;
-
-/**
- * Test Utility class.
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public final class TestUtils
-{
-  /**
-   * Format a style sheet declaration from the addStyleSheet element.
-   * @param element an Element object.
-   * @param addStyleSheet an addStyleSheet element.
-   * @param defaultHref default href.
-   */
-  public static final void parseAddStyleSheet(
-    Element element,
-    AddStyleSheet addStyleSheet,
-    String defaultHref)
-  {
-    addStyleSheet.setHref(
-      XMLUtils.getAttributeValue(element, WSIConstants.ATTR_HREF, defaultHref));
-    addStyleSheet.setType(
-      XMLUtils.getAttributeValue(
-        element,
-        WSIConstants.ATTR_TYPE,
-        WSIConstants.DEFAULT_XSL_TYPE));
-    addStyleSheet.setTitle(
-      XMLUtils.getAttributeValue(element, WSIConstants.ATTR_TITLE));
-    addStyleSheet.setMedia(
-      XMLUtils.getAttributeValue(element, WSIConstants.ATTR_MEDIA));
-    addStyleSheet.setCharset(
-      XMLUtils.getAttributeValue(element, WSIConstants.ATTR_CHARSET));
-    addStyleSheet.setAlternate(
-      XMLUtils.getAttributeValue(element, WSIConstants.ATTR_ALTERNATE));
-  }
-
-  /**
-   * Display tool name and copyright notice.
-   * @param toolInfo a ToolInfo object.
-   */
-  public static void printToolInfo(ToolInfo toolInfo)
-  {
-    System.out.println(
-      "Conformance "
-        + toolInfo.getName()
-        + " Tool"
-        + ", Version: "
-        + toolInfo.getVersion()
-        + ", Release Date: "
-        + toolInfo.getReleaseDate());
-    System.out.println(WSIConstants.COPYRIGHT);
-    System.out.println(" ");
-  }
-
-  /** 
-   * Get XML comment used in log and report file.
-   * @return XML comment used in log and report file.
-   */
-  public static String getXMLComment()
-  {
-    String comment = null;
-    String readLine = null;
-
-    try
-    {
-      // Add required comments (copyright, etc.)
-      BufferedReader bufferedReader =
-        new BufferedReader(
-          new InputStreamReader(
-            Utils.getInputStream(WSIConstants.COMMENTS_FILE)));
-
-      // Initialize string to empty string
-      comment = "";
-
-      while (bufferedReader.ready())
-      {
-        if ((readLine = bufferedReader.readLine()) != null)
-          comment += readLine + WSIConstants.LINE_SEPARATOR;
-      }
-    }
-
-    catch (Exception e)
-    {
-      // Ignore exception and just return null
-    }
-
-    return comment;
-  }
-
-  /**
-   * Get schema location for XML schema.
-   * @return schema location for XML schema.
-   */
-  public static String getXMLSchemaLocation()
-  {
-    return getSchemaLocation(
-      WSIProperties.PROP_XML_SCHEMA,
-      WSIProperties.DEF_XML_SCHEMA);
-  }
-
-  /**
-   * Get SOAP schema location.
-   * @return SOAP schema location.
-   */
-  public static String getSOAPSchemaLocation()
-  {
-    return getSchemaLocation(
-      WSIProperties.PROP_SOAP_SCHEMA,
-      WSIProperties.DEF_SOAP_SCHEMA);
-  }
-
-  /**
-   * Get WSDL schema location.
-   * @return WSDL schema location.
-   */
-  public static String getWSDLSchemaLocation()
-  {
-    return getSchemaLocation(
-      WSIProperties.PROP_WSDL_SCHEMA,
-      WSIProperties.DEF_WSDL_SCHEMA);
-  }
-
-  /**
-  * Get WSDL SOAP schema location.
-  * @return WSDL SOAP schema location.
-  */
-  public static String getWSDLSOAPSchemaLocation()
-  {
-    return getSchemaLocation(
-      WSIProperties.PROP_WSDL_SOAP_SCHEMA,
-      WSIProperties.DEF_WSDL_SOAP_SCHEMA);
-  }
-  /**
-   * Get WSDL schema location.
-   * @return WSDL schema location.
-   */
-  private static String getSchemaLocation(
-    String propertyName,
-    String defaultValue)
-  {
-    //String schemaLocation = null;
-
-    // Get the wsi.home system property
-    //String wsiHome = System.getProperty(WSIProperties.PROP_WSI_HOME);
-    //String fileLocation = WSIProperties.getProperty(propertyName, defaultValue);
-    //
-    // If the file location is specified in the wsi.properties file then build location
-    //if (fileLocation != null)
-    //{
-    // If wsi.home is set, then use it
-    //  if (wsiHome != null)
-    //  {
-    //     schemaLocation = wsiHome;
-    //   }
-    //   if (schemaLocation == null)
-    //   {
-    //    schemaLocation = fileLocation;
-    //  }
-    //  else
-    //  {
-    //   if (!schemaLocation.endsWith("/"))
-    //    {
-    //     schemaLocation += "/";
-    //   }
-    //
-    //    schemaLocation += fileLocation;
-    //  }
-    // }
-    return defaultValue;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/TypesRegistry.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/TypesRegistry.java
deleted file mode 100644
index 6c12b28f9..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/TypesRegistry.java
+++ /dev/null
@@ -1,577 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.util;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingFault;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.BindingOutput;
-import javax.wsdl.Definition;
-import javax.wsdl.Fault;
-import javax.wsdl.Import;
-import javax.wsdl.Input;
-import javax.wsdl.Message;
-import javax.wsdl.Operation;
-import javax.wsdl.Output;
-import javax.wsdl.Part;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.Types;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.UnknownExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPBinding;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.wsdl.extensions.soap.SOAPFault;
-import javax.wsdl.extensions.soap.SOAPHeader;
-import javax.wsdl.extensions.soap.SOAPHeaderFault;
-import javax.wsdl.extensions.soap.SOAPOperation;
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.profile.validator.BaseValidator;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversal;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversalContext;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLVisitor;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-/**
- * The class extracts XSD schema information from the given WSDL.
- * 
- * @author Kulik
- */
-public final class TypesRegistry implements WSITag, WSDLVisitor
-{
-  List schemaProcessedList = new ArrayList();
-  
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.Part, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(Part obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.Service, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(Service obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(Types, Object,
-   * WSDLTraversalContext)
-   */
-  public void visit(Types obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(Operation, Object,
-   * WSDLTraversalContext)
-   */
-  public void visit(Operation obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(Input, Object,
-   * WSDLTraversalContext)
-   */
-  public void visit(Input obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(Output, Object,
-   * WSDLTraversalContext)
-   */
-  public void visit(Output obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(Fault, Object,
-   * WSDLTraversalContext)
-   */
-  public void visit(Fault obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(Binding, Object,
-   * WSDLTraversalContext)
-   */
-  public void visit(Binding obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(BindingOperation, Object,
-   * WSDLTraversalContext)
-   */
-  public void visit(
-    BindingOperation obj,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-  }
-  
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(BindingInput, Object,
-   * WSDLTraversalContext)
-   */
-  public void visit(BindingInput obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(BindingOutput, Object,
-   * WSDLTraversalContext)
-   */
-  public void visit(BindingOutput obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(BindingFault, Object,
-   * WSDLTraversalContext)
-   */
-  public void visit(BindingFault obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(Element, Object,
-   * WSDLTraversalContext)
-   */
-  public void visit(Element obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(Message, Object,
-   * WSDLTraversalContext)
-   */
-  public void visit(Message obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(Port, Object,
-   * WSDLTraversalContext)
-   */
-  public void visit(Port obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(PortType, Object,
-   * WSDLTraversalContext)
-   */
-  public void visit(PortType obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(Definition, Object,
-   * WSDLTraversalContext)
-   */
-  public void visit(Definition obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(ExtensibilityElement,
-   * Object, WSDLTraversalContext)
-   */
-  public void visit(
-    ExtensibilityElement obj,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-  }
-  
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(SOAPBinding, Object,
-   * WSDLTraversalContext)
-   */
-  public void visit(SOAPBinding obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(SOAPBody, Object,
-   * WSDLTraversalContext)
-   */
-  public void visit(SOAPBody obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(SOAPHeader, Object,
-   * WSDLTraversalContext)
-   */
-  public void visit(SOAPHeader obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(SOAPHeaderFault, Object,
-   * WSDLTraversalContext)
-   */
-  public void visit(
-    SOAPHeaderFault obj,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-  }
-  
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(SOAPFault, Object,
-   * WSDLTraversalContext)
-   */
-  public void visit(SOAPFault obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(SOAPOperation, Object,
-   * WSDLTraversalContext)
-   */
-  public void visit(SOAPOperation obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-
-  private Map element2Type = new HashMap();
-  private Set extendsArray = new HashSet();
-  private Set usesWsdlArrayType = new HashSet();
-
-  protected BaseValidator baseValidator = null;
- 
-  /**
-   * Constructor creates the types registry. by the given WSDL definition
-   * object.
-   * 
-   * @param def a WSDL definition.
-   * @param baseValidator a base validator.
-   */
-  public TypesRegistry(Definition def, BaseValidator baseValidator)
-  {
-    this.baseValidator = baseValidator;
-    if (def == null)
-      throw new IllegalArgumentException("Definition can not be null");
-
-    WSDLTraversal traversal = new WSDLTraversal();
-    //VisitorAdaptor.adapt(this);
-    traversal.setVisitor(this);
-    traversal.visitImport(true);
-    
-    processTypes(def.getTypes(), def.getDocumentBaseURI());
-    traversal.traverse(def);
-  }
-
-  /**
-   * Constructor creates the types registry by given WSDL types object and
-   * location context URI.
-   * @param types WSDL types object.
-   * @param context location context URI.
-   * @param baseValidator a base validator.
-   */
-  public TypesRegistry(
-    Types types,
-    String context,
-    BaseValidator baseValidator)
-  {
-    this.baseValidator = baseValidator;
-    processTypes(types, context);
-  }
-
-  /**
-   * The method returns type's qname by given element's qname.
-   * @param elementName a qualified element name.
-   * @return type's qname by given element's qname.
-   */
-  public QName getType(QName elementName)
-  {
-    return (QName) element2Type.get(elementName);
-  }
-
-  /**
-   * The method returns set of types which is array attribute.
-   * @return set of types which is array attribute.
-   */
-  public Set getArrayTypes()
-  {
-    Set s = new HashSet();
-    s.addAll((Collection) usesWsdlArrayType);
-    s.addAll((Collection) extendsArray);
-    return s;
-  }
-
-  /**
-   * The method returns set of elements defined in types element.
-   * @return set of elements defined in types element.
-   */
-  public Set getElementList()
-  {
-    return this.element2Type.keySet();
-  }
-
-  /**
-   * The method returns true if the given type declares wsdl:arrayType
-   * attribute within declaration.
-   * @param type a type.
-   * @return true if the given type declares wsdl:arrayType
-   * attribute within declaration.
-   */
-  public boolean isUsesWSDLArrayType(QName type)
-  {
-    return usesWsdlArrayType.contains(type);
-  }
-
-  /**
-   * The method returns true if given type extends soapenc:Array type.
-   * @param type a type.
-   * @return true if given type extends soapenc:Array type.
-   */
-  public boolean isExtendsArray(QName type)
-  {
-    return extendsArray.contains(type);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.Import, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(Import im, Object parent, WSDLTraversalContext ctx)
-  {
-    if (im.getDefinition() != null)
-      processWSDL(im.getDefinition());
-  }
-
-  /**
-   * Internal method processes WSDL definition.
-   * @param def a WSDL definition.
-   */
-  private void processWSDL(Definition def)
-  {
-    if (def.getTypes() != null)
-      processTypes(def.getTypes(), def.getDocumentBaseURI());
-  }
-
-  /**
-   * Internal method processes WSDL types.
-   * @param types WSDL types.
-   * @param context a context.
-   */
-  private void processTypes(Types types, String context)
-  {
-    if (types == null)
-      return;
-    List exts = types.getExtensibilityElements();
-    if (exts != null)
-    {
-      Iterator it = exts.iterator();
-      while (it.hasNext())
-      {
-        ExtensibilityElement el = (ExtensibilityElement) it.next();
-        if (el instanceof UnknownExtensibilityElement)
-          searchForSchema(
-            ((UnknownExtensibilityElement) el).getElement(),
-            context);
-      }
-    }
-  }
-
-  /**
-   * Internal method searches XSD schema declaration and XSD import
-   * statements.
-   * @param n
-   * @param context
-   */
-  private void searchForSchema(Node n, String context)
-  {
-    while (n != null)
-    {
-      // searches for xsd:import element
-      if (Node.ELEMENT_NODE == n.getNodeType())
-      {
-        // if xsd:schema element is found -> process schema
-        if (XMLUtils.equals(n, ELEM_XSD_SCHEMA))
-          processSchema(n, context);
-      }
-      n = n.getNextSibling();
-    }
-  }
-
-  /**
-   * Internal method loads XSD schema by using schema location and
-   * location context.
-   * @param importNode
-   * @param context
-   */
-  private void loadSchema(Node importNode, String context)
-  {
-    Element im = (Element) importNode;
-    Attr schemaLocation = XMLUtils.getAttribute(im, ATTR_XSD_SCHEMALOCATION);
-	
-    // try to parse imported XSD
-    if (schemaLocation != null && schemaLocation.getValue() != null)
-      try
-      {
-    	String urlString = XMLUtils.createURLString(schemaLocation.getValue(), context);
-    	if (!schemaProcessedList.contains(urlString))
-    	{
-          // if any error or root element is not XSD schema -> error
-          Document schema =
-            baseValidator.parseXMLDocumentURL(
-              schemaLocation.getValue(),
-              context,
-              null);
-          schemaProcessedList.add(urlString);
-          if (XMLUtils.equals(schema.getDocumentElement(), ELEM_XSD_SCHEMA))
-            processSchema(
-              schema.getDocumentElement(),
-              urlString);
-    	}
-      }
-      catch (Throwable t)
-      {
-        //t.printStackTrace();
-        // nothing. it's not a schema
-      }
-  }
-
-  /**
-   * Internal method processes XSD schema and retrieves types declaration from
-   * it.
-   * @param schema
-   * @param context
-   */
-  private void processSchema(Node schema, String context)
-  {
-    Attr a = XMLUtils.getAttribute((Element) schema, ATTR_XSD_TARGETNAMESPACE);
-    String targetNamespace = (a != null) ? a.getValue() : "";
-    // iterate schema
-    Node n = schema.getFirstChild();
-    // !! we suppose that xsd:import element is occured only within xsd:schema element        
-    while (n != null)
-    {
-      if (Node.ELEMENT_NODE == n.getNodeType())
-      {
-        if (XMLUtils.equals(n, ELEM_XSD_ELEMENT))
-        {
-          Element el = (Element) n;
-          a = XMLUtils.getAttribute(el, ATTR_XSD_NAME);
-          QName element =
-            new QName(targetNamespace, (a != null) ? a.getValue() : "");
-
-          a = XMLUtils.getAttribute(el, ATTR_XSD_TYPE);
-          QName type = null;
-          if (a != null)
-          {
-            String t = a.getValue();
-            // if type contains ':', it means that it contains qname
-            int i = t.indexOf(':');
-            if (i != -1)
-            {
-              String prefix = t.substring(0, i);
-              String nsURI = XMLUtils.findNamespaceURI(n, prefix);
-              type = new QName(nsURI, t.substring(i + 1));
-            }
-            else
-              type = new QName(targetNamespace, t);
-          }
-          else
-          {
-            // suppose that element directly contains type declaration
-            type = element;
-            checkType(n, type);
-          }
-
-          element2Type.put(element, type);
-        }
-        else if (XMLUtils.equals(n, ELEM_XSD_IMPORT))
-          loadSchema(n, context);
-        else if (XMLUtils.equals(n, ELEM_XSD_INCLUDE))
-            loadSchema(n, context);
-        else if (XMLUtils.equals(n, ELEM_XSD_COMPLEXTYPE))
-        {
-          Element el = (Element) n;
-          a = XMLUtils.getAttribute(el, ATTR_XSD_NAME);
-          QName type =
-            new QName(targetNamespace, (a != null) ? a.getValue() : "");
-          checkType(n, type);
-        }
-
-      }
-
-      n = n.getNextSibling();
-    }
-  }
-
-  /**
-   * Internal method checks whether specified type has WSDL array type
-   * attribute in the XSD declaration.
-   * @param n
-   * @param name
-   */
-  private void checkType(Node n, QName name)
-  {
-    while (n != null)
-    {
-      if (Node.ELEMENT_NODE == n.getNodeType())
-      {
-        // check such sentence
-        //              xsd:attribute ref="soapenc:arrayType" wsdl:arrayType="tns:MyArray2Type[]"/>
-        if (XMLUtils.equals(n, ELEM_XSD_ATTRIBUTE))
-        {
-          Attr a = XMLUtils.getAttribute((Element) n, ATTR_WSDL_ARRAYTYPE);
-          if (a != null)
-            usesWsdlArrayType.add(name);
-        }
-
-        // retrieve base attribute may be from restriction or extension
-        Attr a = XMLUtils.getAttribute((Element) n, ATTR_XSD_BASE);
-        if (a != null)
-        {
-          String base = a.getValue();
-          int i = base.indexOf(":");
-          if (i != -1)
-          {
-            String prefix = base.substring(0, i);
-            String local = base.substring(i + 1);
-            String namespace = XMLUtils.findNamespaceURI(n, prefix);
-            if (SOAPENC_ARRAY.equals(new QName(namespace, local)))
-              extendsArray.add(name);
-          }
-        }
-        checkType(n.getFirstChild(), name);
-      }
-      n = n.getNextSibling();
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/UDDIUtils.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/UDDIUtils.java
deleted file mode 100644
index c572363a8..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/util/Utils.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/Utils.java
deleted file mode 100644
index 85882d297..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/Utils.java
+++ /dev/null
@@ -1,1416 +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.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.ResourceBundle;
-import java.util.StringTokenizer;
-import java.util.Vector;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.log.MimePart;
-import org.eclipse.wst.wsi.internal.core.log.MimeParts;
-import org.eclipse.wst.wsi.internal.core.log.impl.MimePartImpl;
-import org.eclipse.wst.wsi.internal.core.log.impl.MimePartsImpl;
-import org.eclipse.wst.wsi.internal.core.profile.ProfileAssertions;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-
-import com.ibm.icu.text.SimpleDateFormat;
-import com.ibm.icu.util.TimeZone;
-
-/**
- * General set of utilities.
- */
-public final class Utils
-{
-  public static final byte CR = (byte) '\r';
-  public static final byte LF = (byte) '\n';
-
-  /**
-   * Common timestamp format.
-   */
-  //	public static final SimpleDateFormat timestampFormat = new SimpleDateFormat ("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
-  public static final SimpleDateFormat timestampFormat =
-    new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS");
-
-  /**
-   * Basic date format.
-   */
-  public static final SimpleDateFormat dateFormat =
-    new SimpleDateFormat("yyyy-MM-dd");
-
-  /**
-   * Wrapper method for error logging;
-   * for now it just goes to stderr.
-   * @param inError  an error message.
-   */
-  public final static void logError(String inError)
-  {
-    System.err.println("Error: " + inError);
-  }
-
-  /** 
-   * Get exception information as a string.
-   * @param throwable  a Throwable object.
-   * @return exception information as a string.
-   */
-  public final static String getExceptionDetails(Throwable throwable)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    pw.println("Exception: ");
-    throwable.printStackTrace(pw);
-
-    return sw.toString();
-  }
-
-  /**
-   * Get current date and time as a timestamp.
-   * @return urrent date and time as a timestamp.
-   */
-  public static String getTimestamp()
-  {
-    // Use GMT timezone
-    //timestampFormat.setTimeZone(TimeZone.getTimeZone("GMT"));
-    timestampFormat.setTimeZone(TimeZone.getDefault());
-
-    // Return timestamp
-    return timestampFormat.format(new Date());
-  }
-
-  /**
-   * Get current date for default time zone.
-   * @return current date for default time zone.
-   */
-  public static String getDate()
-  {
-    // Use GMT timezone
-    dateFormat.setTimeZone(TimeZone.getDefault());
-
-    // Return date
-    return dateFormat.format(new Date());
-  }
-
-  /**
-   * Get HTTP status code.
-   * @param httpHeaders  HTTP headers.
-   * @return HTTP status code.
-   * @throws WSIException if the status code in http headers was not found.
-   */
-  public static String getHTTPStatusCode(String httpHeaders)
-    throws WSIException
-  {
-    String statusCode = null;
-
-    if (httpHeaders.startsWith("HTTP"))
-    {
-      // Get location of status code
-      int index = httpHeaders.indexOf(" ");
-      int index2 = httpHeaders.indexOf(" ", index + 1);
-
-      if ((index == -1) || (index2 == -1))
-      {
-        throw new WSIException(
-          "Could not find status code in http headers: [" + httpHeaders + "].");
-      }
-
-      else
-      {
-        statusCode = httpHeaders.substring(index + 1, index2);
-      }
-    }
-
-    else
-    {
-      throw new WSIException(
-        "Could not find status code in http headers: [" + httpHeaders + "].");
-    }
-
-    // Return status code
-    return statusCode;
-  }
-
-  /**
-   * Get HTTP headers from a full message.
-   * @param fullMessage  a message.
-   * @return HTTP headers from a full message.
-   */
-  public static String getHTTPHeaders(String fullMessage)
-  {
-    //String httpHeaders = null;
-
-    // Try looking for the double newline
-    int index = fullMessage.indexOf("\r\n\r\n");
-    if (index != -1)
-    {
-      index += 4;
-    }
-    else
-    {
-      // check for case "\r\r...\r\n\r\r...\n"
-      // Note the index that is returned points to the first character 
-      // immediatedly following the first occurence of the CRLFCRLF. 
-      index = getFirstCRLFCRLF(fullMessage);
-      if (index == -1)
-      {
-        logError(
-          "Unable to parse HTTP message to find headers.  Full message: "
-          + fullMessage);
-        return "x-WSI-Test-Tool-Error: Couldn't find headers.  Full message: ["
-          + fullMessage
-          + "].";
-      }
-    }
-
-    // Return HTTP headers
-    return fullMessage.substring(0, index);
-  }
-
-  /**
-   * Get SOAP message from a full message.
-   * @param fullMessage  a message.
-   * @return SOAP message from a full message.
-   */
-  public static String getContent(String fullMessage)
-  {
-    String message = "";
-
-    // Find start of message
-    int index = fullMessage.indexOf("\r\n\r\n");
-    if (index != -1)
-    {
-      index += 4;
-    }
-    else
-    {
-      // check for case "\r\r...\r\n\r\r...\n"
-      // Note the index that is returned points to the first character 
-      // immediatedly following the first occurence of the CRLFCRLF. 
-      index = getFirstCRLFCRLF(fullMessage);
-    }    	
-
-    if (index < 0)
-    {
-    	// If we couldn't find the end of the HTTP headers or the start of the message, then show error
-      logError(
-        "Unable to parse message to get content.  Full message: "
-          + fullMessage);
-      message =
-        "x-WSI-Test-Tool-Error: Couldn't find message content.  Full message: ["
-          + fullMessage
-          + "].";
-    }
-    // If the index is greater than the length, then there is no message content
-    else if (index >= fullMessage.length())
-    {
-      message = "";
-    }
-
-    // Else get the message content
-    else
-    {
-      message = fullMessage.substring(index);
-    }
-
-    // Return SOAP message
-    return message;
-  }
- 
-  /**
-   * Get HTTP headers from a full message.
-   * @param fullMessage  a message.
-   * @return HTTP headers from a full message.
-   */
-  public static byte[] getHTTPHeaders(byte[] fullMessage)
-  {
-    //String httpHeaders = null;
-    int index = getFirstCRLFCRLF(fullMessage, 0);
-    if (index == -1)
-    {
-      logError(
-        "Unable to parse HTTP message to find headers.  Full message: "
-          + fullMessage);
-      return ("x-WSI-Test-Tool-Error: Couldn't find headers.  Full message: ["
-        + fullMessage + "].").getBytes();
-    }
-
-    // Return HTTP headers
-	byte[] b = new byte[index];
-	System.arraycopy(fullMessage, 0, b, 0, index);
-
-    return b;
-  }
-
-  /**
-   * Get HTTP headers from a full message.
-   * @param fullMessage  a message.
-   * @return HTTP headers from a full message.
-   */
-  public static String getHTTPHeadersAsString(byte[] fullMessage, String encoding)
-  {
-    //String httpHeaders = null;
-    int index = getFirstCRLFCRLF(fullMessage, 0);
-    if (index == -1)
-    {
-      logError(
-        "Unable to parse HTTP message to find headers.  Full message: "
-          + fullMessage);
-      return "x-WSI-Test-Tool-Error: Couldn't find headers.  Full message: ["
-        + fullMessage + "].";
-    }
-
-    // Return HTTP headers
-    try
-    {
-      return new String(fullMessage, 0, index, encoding);
-    }
-    catch (UnsupportedEncodingException e)
-    {
-        logError(
-                "Unsupported Encoding: " + encoding + ".  Full message: "
-                  + fullMessage);
-              return "x-WSI-Test-Tool-Error: Unsupported Encoding \"" + encoding + "\".  Full message: ["
-                + fullMessage + "].";
-    }
-  }
-
-  /**
-   * Get SOAP message from a full message.
-   * @param fullMessage  a message.
-   * @return SOAP message from a full message.
-   */
-  public static String getContentAsString(byte[] message)
-  {
-  	String content = "";
-    //String httpHeaders = null;
-    int index = getFirstCRLFCRLF(message, 0);
-
-    // If we couldn't find the end of the HTTP headers or the start of the message, then show error
-    if (index < 0)
-    {
-      logError(
-        "Unable to parse message to get content.  Full message: "
-          + message);
-      content =
-        "x-WSI-Test-Tool-Error: Couldn't find message content.  Full message: ["
-          + message.toString()
-          + "].";
-    }
-
-    // Else get the message content
-    else if (index < message.length)
-    {
-      try
-      {
-        content = new String(message, index, message.length - index);
-       }
-      catch (Exception e)
-      {
-      	logError(
-      	        "Unable to parse message to get content.  Full message: "
-      	          + message);
-      	content =
-      	        "x-WSI-Test-Tool-Error: Couldn't find message content.  Full message: ["
-      	          + message.toString()
-      	          + "].";
-      }
-    }
-
-    // Return SOAP message
-    return content;
-  }
-
-  /**
-   * Get SOAP message from a full message.
-   * @param fullMessage  a message.
-   * @return SOAP message from a full message.
-   */
-  public static byte[] getContent(byte[] message)
-  {
-    byte[] content = new byte [0];
-
-    //String httpHeaders = null;
-    int index = getFirstCRLFCRLF(message, 0);
- 
-    // If we couldn't find the end of the HTTP headers or the start of the message, then show error
-    if (index < 0)
-    {
-      logError(
-        "Unable to parse message to get content.  Full message: "
-          + message);
-      message =
-        ("x-WSI-Test-Tool-Error: Couldn't find message content.  Full message: ["
-          + message.toString()
-          + "].").getBytes();
-    }
-
-    // If the index is greater than the length, then there is no message content
-    //else if (index >= fullMessage.length())
-    //{
-    //  message = "";
-    //}
-
-    // Else get the message content
-    else if (index < message.length)
-    {
-    	byte[] b = new byte[message.length - index];
-    	System.arraycopy(message, index, b, 0, message.length - index);
-
-        content = b;
-    }
-
-    // Return SOAP message
-    return content;
-  }
-
-  
-  /**
-	 * Returns the first location of a CRLF.
-	 *
-	 * @return int
-	 */
-	public static int getFirstCRLF(byte[] buffer, int index) 
-	{
-		int size = buffer.length;
-		int i = index;
-		while (i < size - 1) {
-			if (buffer[i] == CR && buffer[i+1] == LF)
-				return i;
-			i++;
-		}
-		return -1;
-	}
-
-	/**
-	 * Returns the first location of a CRLF followed imediately by another CRLF.
-	 *
-	 * @return int
-	 */
-	public static int getFirstCRLFCRLF(byte[] buffer, int index) 
-	{
-		int size = buffer.length;
-		int i = index;
-		while (i < size - 3) 
-		{
-		  if (buffer[i] == CR && buffer[i+1] == LF && buffer[i+2] == CR)
-		  {
-			if (buffer[i+3] == LF)
-			{
-			  return i+4;
-			}
-			else
-			{
-			  int j = i + 3;
-			  while (j < buffer.length && buffer[j] == CR)
-			  {
-				j++;
-			  }
-			  if (j < buffer.length && buffer[j] == LF)
-			  {
-			  	return j + 1;
-			  }
-			}
-		  }
-		  i++;
-		}
-		return -1;
-	}
-
-	/**
-	 * Returns the first location of a CRLF followed imediately by another CRLF.
-	 *
-	 * @return int
-	 */
-	public static int getFirstCRLFCRLF(String buffer) 
-	{
-		int index = buffer.indexOf("\r\n\r");
-		if (index != -1)
-		{
-		  int i = index +3;
-		  while (i < buffer.length() && buffer.startsWith("\r", i))
-		     i++;
-		
-		  if (i < buffer.length() && buffer.startsWith("\n", i))
-			return i+1;
-		  else
-			return getFirstCRLFCRLF(buffer.substring(index + 3));
-		}
-		else
-		{
-		  return -1;
-		}
-	}
-
-	/**
-     * Returns the list of indices which marks the separation of parts.
-     */
-	public static int[] getBoundaryIndices(byte[] message, String boundaryStr)
-	{
-	  int[] indices = new int[256];
-	  int indicesIndex = 0;
-	  try
-	  {
-	    byte[] boundary = ("\r\n--" + boundaryStr).getBytes("US-ASCII");
-
-	    int index = 0;
-	    int start = 0;
-	    while (index != -1)
-	    {
-	      index = indexOf(message, boundary, start);
-	      
-	      if (index != -1) 
-	      {
-		    start = index + boundary.length;
-	    	indices[indicesIndex] = index;
-	    	indicesIndex++;
-	      }
-	    }
-      	int[] b = new int[indicesIndex];
-    	System.arraycopy(indices, 0, b, 0, indicesIndex);
-    	indices = b;
-	  }
-	  catch (Exception e)
-	  {}
-	  return indices;
-	}
- 
-    /**
-     * Returns the index of the first occurrence of key in the buffer.
-     */
-	public static int indexOf(byte[] buffer, byte[] key, int start)
-	{
-		int bufferLen = buffer.length;
-		int keyLen = key.length;
-		int i,j,k = 0;
-		
-		if (keyLen > bufferLen - start)
-		{
-			return -1;
-		}
-	
-		for (k = start + keyLen - 1; k < bufferLen; k++)
-		{
-           for (j = keyLen - 1, i = k; (j >= 0) && (buffer[i] == key[j]); j--) 
-           {
-               i--;
-           }
-
-           if (j == (-1)) {
-               return i + 1;
-           }
-		}
-
-		return -1;
-	}
-	/**
-   * Get contents of a resource and return as a input stream.
-   *
-   * @param resourceName the name of the resource to get and return as
-   *                      an input stream.
-   * @return contents of a resource as an input stream.
-   * @throws IOException if the resource could not be located.
-   */
-  public static InputStream getInputStream(String resourceName)
-    throws IOException
-  {
-    InputStream is = null;
-
-    // If resource reference is a URL, then input stream from URL
-    try
-    {
-      // Try to create URL
-      URL urlResource = new URL(resourceName);
-
-      // If successful, then get URL input stream
-      is = getInputStream(urlResource);
-    }
-
-    // Else try to read resource directly
-    catch (MalformedURLException mue)
-    {
-      boolean bTryClassLoader = false;
-
-      try
-      {
-        // Open file input stream
-        is = new BufferedInputStream(new FileInputStream(resourceName));
-      }
-      catch (FileNotFoundException fnfe)
-      {
-        // Set try class loader flag
-        bTryClassLoader = true;
-      }
-      catch (SecurityException se)
-      {
-        // Set try class loader flag
-        bTryClassLoader = true;
-      }
-      catch (Exception e)
-      {
-        // DEBUG:
-        System.out.println("Exception in getInputStream :" + e.toString());
-      }
-
-      // If try class loader, then use it to get input stream
-      if (bTryClassLoader)
-      {
-        // Use class loader to load resource
-        is = ClassLoader.getSystemResourceAsStream(resourceName);
-      }
-    }
-
-    // If the input stream is null, then throw FileNotFoundException
-    if (is == null)
-    {
-      //try this
-      is =
-        Thread.currentThread().getContextClassLoader().getResourceAsStream(
-          resourceName);
-    }
-
-    // If the input stream is null, then throw FileNotFoundException
-    if (is == null)
-    {
-      //try this
-      URL aURL =
-        Thread.currentThread().getContextClassLoader().getResource(
-          resourceName);
-      if (aURL != null)
-        is = getInputStream(aURL);
-    }
-
-    if (is == null)
-      // Throw execption
-      throw new FileNotFoundException(
-        "Could not locate resource file: " + resourceName);
-
-    // Return input stream
-    return is;
-  }
-
-  /**
-   * Get the input stream from a URL.
-   * @param urlFile the URL to get the input stream from.
-   * @return the input stream corresponding to the given URL.
-   * @throws IOException if attempt to open the file denoted by URL has failed.
-   * @throws ConnectException if trouble connecting to URL.
-   */
-  public static InputStream getInputStream(URL urlFile)
-    throws IOException, ConnectException
-  {
-    InputStream is = null;
-
-    // ADD: how are URLs that are password protected handled????
-
-    try
-    {
-      // Open file input stream
-      is = new BufferedInputStream(urlFile.openStream());
-    }
-
-    catch (ConnectException e)
-    {
-      // Re-throw this excpetion with additional information
-      throw new java.net.ConnectException(
-        "Could not connect to URL: " + urlFile.toExternalForm() + ".");
-    }
-
-    // Return input stream
-    return is;
-  }
-
-  /**
-   * Get contents of a resource and return as a input stream.
-   * @param fileLocation the location of the file.
-   * @return contents of a resource as a input stream.
-   */
-  public static boolean fileExists(String fileLocation)
-  {
-    boolean fileExists = false;
-
-    // If resource reference is a URL, then input stream from URL
-    try
-    {
-      // Try to create URL
-      URL url = new URL(fileLocation);
-
-      // If successful, then try to open connection
-      url.openStream();
-      fileExists = true;
-    }
-
-    // Else try to read resource directly
-    catch (MalformedURLException mue)
-    {
-      try
-      {
-        File file = new File(fileLocation);
-
-        fileExists = file.exists();
-      }
-
-      catch (Exception e2)
-      {
-        fileExists = false;
-      }
-    }
-
-    catch (FileNotFoundException fnfe)
-    {
-      fileExists = false;
-    }
-
-    catch (Exception e)
-    {
-      fileExists = false;
-    }
-
-    // Return file exists indicator
-    return fileExists;
-  }
-
-  /**
-   * Get local host name.
-   * @return the local host name.
-   */
-  public static String getLocalHostName()
-  {
-    String sLocalHostName;
-
-    try
-    {
-      // Get local host name
-      sLocalHostName = InetAddress.getLocalHost().getHostName();
-    }
-    catch (Exception e)
-    {
-      // Set default local host name
-      sLocalHostName = "127.0.0.1";
-    }
-
-    // Return local host name
-    return sLocalHostName;
-  }
-
-  /**
-   * Build a URL string from hostname, port and URN.
-   *
-   * @param hostname the hostname.
-   * @param port the port.
-   * @param urn the URN.
-   * @return formatted URL string.
-   */
-  public static String formatURL(String hostname, String port, String urn)
-  {
-    // Build URN
-    String formatURN = urn;
-
-    // If URN doesn't start with "/", then add it
-    if (!(formatURN.startsWith("/")))
-    {
-      // Add "/" to beginning of the string
-      formatURN = "/" + urn;
-    }
-
-    // Return URL string
-    return "http://" + hostname + ":" + port + formatURN;
-  }
-
-  /**
-   * This method will replace all of the occurances of a string
-   * with a substitution string.
-   *
-   * @param sText String to udpate.
-   * @param sFind String to find.
-   * @param sReplace String to use for substitution.
-   * @return updated string.
-   */
-  public static String replaceString(
-    String sText,
-    String sFind,
-    String sReplace)
-  {
-    int iPrevIndex = 0;
-
-    int iFindLen = sFind.length();
-    int iReplaceLen = sReplace.length();
-
-    String sUpdatedText = sText;
-
-    // Replace all occurances of the find string
-    for (int iIndex = sUpdatedText.indexOf(sFind);
-      iIndex < (sUpdatedText.length() - 1) && iIndex != -1;
-      iIndex = sUpdatedText.indexOf(sFind, iPrevIndex + iReplaceLen))
-    {
-      // Set updated text from the front portion + replacement text + back portion
-      sUpdatedText =
-        sUpdatedText.substring(0, iIndex)
-          + sReplace
-          + sUpdatedText.substring(iIndex + iFindLen);
-
-      // Set the previous index field
-      iPrevIndex = iIndex;
-    }
-
-    // Return updated text string
-    return sUpdatedText;
-  }
-
-  /**
-   * Convert string to hex string.
-   * @param data  a String object.
-   * @return hex string.
-   */
-  public static String toHexString(String data)
-  {
-    char[] HEX_CHARS =
-      {
-        '0',
-        '1',
-        '2',
-        '3',
-        '4',
-        '5',
-        '6',
-        '7',
-        '8',
-        '9',
-        'A',
-        'B',
-        'C',
-        'D',
-        'E',
-        'F' };
-
-    // Get string as byte array
-    byte[] byteData = data.getBytes();
-
-    // Get length
-    int length = byteData.length;
-
-    // Create Char buffer
-    char[] charBuffer = new char[length * 2];
-
-    int next;
-    for (int byteCnt = 0, charCnt = 0; byteCnt < length;)
-    {
-      next = byteData[byteCnt++];
-      charBuffer[charCnt++] = HEX_CHARS[(next >>> 4) & 0x0F];
-      charBuffer[charCnt++] = HEX_CHARS[next & 0x0F];
-    }
-
-    return new String(charBuffer);
-  }
-
-  /**
-   * Convert byte buffer to hex string.
-   * @param data  a byte array.
-   * @return hex string.
-   */
-  public static String toHexString(byte[] byteData)
-  {
-    char[] HEX_CHARS =
-      {
-        '0',
-        '1',
-        '2',
-        '3',
-        '4',
-        '5',
-        '6',
-        '7',
-        '8',
-        '9',
-        'A',
-        'B',
-        'C',
-        'D',
-        'E',
-        'F' };
-
-
-    // Get length
-    int length = byteData.length;
-
-    // Create Char buffer
-    char[] charBuffer = new char[length * 2];
-
-    int next;
-    for (int byteCnt = 0, charCnt = 0; byteCnt < length;)
-    {
-      next = byteData[byteCnt++];
-      charBuffer[charCnt++] = HEX_CHARS[(next >>> 4) & 0x0F];
-      charBuffer[charCnt++] = HEX_CHARS[next & 0x0F];
-    }
-
-    return new String(charBuffer);
-  }
-
-  // I18N: 2003.02.26 modified by K.Nakagome@BeaconIT
-  /**
-   * Get MIME charset from a HTTP headers.
-   * @param httpHeaders String of HTTP header.
-   * @return the MIME charset string.
-   * @author K.Nakagome@BeaconIT Japan SIG 
-   */
-  public static String getHTTPCharset(String httpHeaders)
-  {
-    String mimeCharset = null;
-
-    mimeCharset = httpHeaders.toUpperCase();
-    int[] index = { -1, -1, -1 };
-    int indexS = mimeCharset.indexOf("CHARSET");
-    int indexE = Integer.MAX_VALUE;
-    if (indexS < 17)
-    {
-      return "";
-    }
-    indexS = mimeCharset.indexOf("=", indexS + 7);
-    if (indexS == -1)
-    {
-      return "";
-    }
-    indexS++;
-    index[0] = mimeCharset.indexOf("'", indexS);
-    index[1] = mimeCharset.indexOf("\r\n", indexS);
-    index[2] = mimeCharset.indexOf("\"", indexS);
-    for (int i = 0; i < 3; i++)
-    {
-      if (index[i] != -1 & indexE > index[i])
-      {
-        indexE = index[i];
-      }
-    }
-
-    if (indexE != Integer.MAX_VALUE)
-    {
-      mimeCharset = httpHeaders.substring(indexS, indexE);
-      mimeCharset.trim();
-    }
-    else
-    {
-      mimeCharset = "";
-    }
-    return mimeCharset;
-  }
-
-  /**
-   * Checks to see if the message is a simple SOAP message or whether it is a SOAP messagwe with attachments.
-   */
-  public static boolean isMultipartRelatedMessage(String httpHeaders)
-  {
-  	boolean result = false;
-    try 
-    {
-      // check header for mime version and boundary
-      String contentType = HTTPUtils.getHttpHeaderAttribute(httpHeaders, HTTPConstants.HEADER_CONTENT_TYPE);
-      if (contentType == null)
-      {
-        // there is no contentType, check if there is a boundary attribute
-        String boundary = Utils.getHttpHeaderSubAttribute(httpHeaders, HTTPConstants.HEADER_CONTENT_TYPE, "boundary");
-        if ((boundary != null) && (!boundary.equals("")))
-           result = true;
-      }
-      else
-      {
-        result = contentType.equalsIgnoreCase("multipart/related");
-      }
-    } 
-    catch (WSIException e)
-	{ 
-    	result = false; 
-    }
-    return result;
-  }
-
-  public static String getHttpHeaderAttribute(String httpHeaders, String attributeName)
-  { String result = null;
-  	try
-  	{
-     result = HTTPUtils.getHttpHeaderAttribute(httpHeaders, attributeName);
-  	}
-    catch (WSIException e)
-	{ 
-    	result = null; 
-    }
-    return result;
- }
-
-  public static String getHttpHeaderSubAttribute(String httpHeaders, String attributeName, String subAttributeName)
-  { String result = null;
-  	try
-  	{
-     result = HTTPUtils.getHttpHeaderSubAttribute(httpHeaders, attributeName, subAttributeName);
-  	}
-    catch (WSIException e)
-	{ 
-    	result = null; 
-    }
-    return result;
- }
-
-  public static String getMimeHeaderAttribute(String mimeHeaders, String attributeName)
-  { String result = null;
-  	try
-  	{
-     result = MIMEUtils.getMimeHeaderAttribute(mimeHeaders, attributeName);
-  	}
-    catch (WSIException e)
-	{ 
-    	result = null; 
-    }
-    return result;
- }
-
-  public static String getMimeHeaderSubAttribute(String mimeHeaders, String attributeName, String subAttributeName)
-  { String result = null;
-  	try
-  	{
-     result = MIMEUtils.getMimeHeaderSubAttribute(mimeHeaders, attributeName, subAttributeName);
-  	}
-    catch (WSIException e)
-	{ 
-    	result = null; 
-    }
-    return result;
- }
-  // I18N: 2003.02.26 modified by K.Nakagome@BeaconIT
-  /**
-   * Get XML encoding from a SOAP Messages.
-   * @param message  SOAP Message String. 
-   * @return character encoding of XML.
-   * @author K.Nakagome@BeaconIT Japan SIG 
-   */
-  public static String getXMLEncoding(String message)
-  {
-    String xmlDef = null;
-
-    int indexS = message.indexOf("<?xml");
-    int indexE = -1;
-    if (indexS != -1)
-    {
-      indexE = message.indexOf("?>", indexS);
-      if (indexE > indexS)
-      {
-        xmlDef = message.substring(indexS, indexE);
-      }
-    }
-
-    if (xmlDef != null)
-    {
-      indexS = xmlDef.indexOf("encoding");
-      if (indexS == -1)
-      {
-        xmlDef = "";
-      }
-      else
-      {
-        xmlDef = xmlDef.substring(indexS + 8);
-        xmlDef = xmlDef.trim();
-      }
-    }
-    else
-    {
-      return "";
-    }
-
-    if (xmlDef.length() > 3)
-    {
-      indexS = xmlDef.indexOf("=");
-      if (indexS == 0)
-      {
-        xmlDef = xmlDef.substring(1);
-      }
-      else
-      {
-        return "";
-      }
-    }
-
-    if (xmlDef.length() > 3)
-    {
-      String end = "\"";
-      indexS = xmlDef.indexOf(end);
-      if (indexS != 0)
-      {
-        indexS = xmlDef.indexOf((end = "'"));
-      }
-      if (indexS == 0)
-      {
-        indexE = xmlDef.indexOf(end, 3);
-        if (indexE != -1)
-        {
-          xmlDef = xmlDef.substring(1, indexE);
-        }
-        else
-        {
-          xmlDef = "";
-        }
-      }
-      else
-      {
-        xmlDef = "";
-      }
-    }
-    return xmlDef;
-  }
-
-  // I18N: 2003.02.26 modified by K.Nakagome@BeaconIT
-  private static ResourceBundle javaEncodingResource = null;
-  private static final String JAVA_ENCODING_RESOURCE =
-    "org.wsi.test.util.JavaEncoding";
-  private static final String JAVA_ENCODING_DEFAULT = "UTF-8";
-
-  // I18N: 2003.02.26 modified by K.Nakagome@BeaconIT
-  /**
-   * Get Java VM supported character encoding.
-   * 
-   * @param mimeEncoding  string of MIME(IANA) character encoding. 
-   * @return string of character encoding supported by Java VM.
-   * @author K.Nakagome@BeaconIT Japan SIG 
-   */
-  public static String getJavaEncoding(String mimeEncoding)
-  {
-    if (mimeEncoding == null || mimeEncoding.length() == 0)
-    {
-      return JAVA_ENCODING_DEFAULT;
-    }
-    try
-    {
-      if (javaEncodingResource == null)
-      {
-        javaEncodingResource = ResourceBundle.getBundle(JAVA_ENCODING_RESOURCE);
-      }
-      return javaEncodingResource.getString(mimeEncoding);
-    }
-    catch (Throwable t)
-    {
-      return mimeEncoding;
-    }
-  }
-
-  /**
-   * Convert an array to a Vector.
-   * 
-   * @param array  the array to be converted .
-   * @return converted Vector (null if array is null, empty if empty).
-   * @author Graham Turrell IBM
-   */
-  public static Vector arrayToVector(Object[] array)
-  {
-    if (array == null)
-      return null;
-    Vector v = new Vector(array.length);
-    for (int i = 0; i < array.length; i++)
-      v.add(array[i]);
-    return v;
-  }
-  /**
-   * Checks to ensure that version of the profile test assertion 
-   * document is supported in this version of the test tools.
-   * @param profileAssertions - a profile TAD.
-   * @return true if the version of the profile test assertion
-   *         docuement is supported in this version of the test tools.
-   */
-  public static boolean isValidProfileTADVersion(ProfileAssertions profileAssertions)
-  {
-    boolean result = false;
-
-    String name = profileAssertions.getTADName();
-    String version = profileAssertions.getTADVersion();
-
-    if (WSIConstants.BASIC_PROFILE_TAD_NAME.equals(name))
-    {
-      result =
-        checkVersionNumber(WSIConstants.BASIC_PROFILE_TAD_VERSION, version);
-    } else if (WSIConstants.BASIC_PROFILE_1_1_TAD_NAME.equals(name))
-    {  
-      result =
-        checkVersionNumber(WSIConstants.BASIC_PROFILE_1_1_TAD_VERSION, version);
-    } else if (WSIConstants.SIMPLE_SOAP_BINDINGS_PROFILE_TAD_NAME.equals(name))
-    {
-      result =
-        checkVersionNumber(WSIConstants.SIMPLE_SOAP_BINDINGS_PROFILE_TAD_VERSION, version);
-    } else if (WSIConstants.ATTACHMENTS_PROFILE_TAD_NAME.equals(name))
-    {
-      result =
-        checkVersionNumber(WSIConstants.ATTACHMENTS_PROFILE_TAD_VERSION, version);
-    }
-    return result;
-  }
-
-  /**
-   * Checks to ensure that version number of the actual profile test assertion 
-   * document is supported in this version of the test tools.
-   * @param supportedVersion - supported version number of profile TAD.
-   * @param actualVersion    - actual version number of profile TAD. 
-   * @return true if the version number of the actual profile test assertion
-   *         document is supported in this version of the test tools.
-   */
-  private static boolean checkVersionNumber(
-    String supportedVersion,
-    String actualVersion)
-  {
-    boolean validVersion = true;
-
-    try
-    {
-      StringTokenizer supportedVersionTokenizer =
-        new StringTokenizer(supportedVersion, ".");
-      StringTokenizer actualVersionTokenizer =
-        new StringTokenizer(actualVersion, ".");
-
-      while (supportedVersionTokenizer.hasMoreTokens() && validVersion)
-      {
-        int supportedVersionToken =
-          Integer.parseInt(supportedVersionTokenizer.nextToken());
-        if (actualVersionTokenizer.hasMoreTokens())
-        {
-          int actualVersionToken =
-            Integer.parseInt(actualVersionTokenizer.nextToken());
-          if (supportedVersionToken > actualVersionToken) break;
-          else validVersion = (supportedVersionToken >= actualVersionToken);
-        }
-      }
-    }
-    catch (Exception e)
-    {
-      validVersion = false;
-    }
-    return validVersion;
-  }
-  
-  /**
-   * Identifies the root part in the list using the "start" attribute.
-   * If the "start" attribute does not exist then the first part is designated the root.
-   */
-  public static MimePart findRootPart(String httpHeaders, Collection parts)
-  {
-  	MimePart root = null;
-    String start = Utils.getHttpHeaderSubAttribute(httpHeaders, HTTPConstants.HEADER_CONTENT_TYPE, "start");
-    if (!parts.isEmpty())
-    {
-      // default to the first part in the collection
-      root = (MimePart)parts.iterator().next();
-    	
-      if ((start != null) && (!start.equals("")))
-      {
-    	Iterator i = parts.iterator();
-    	boolean rootNotFound = true;
-    	while (i.hasNext() && rootNotFound)
-    	{
-    	  MimePart part = (MimePart)i.next();
-    	  String headers = part.getHeaders();
-    	  if (headers != null)
-    	  {
-            String contentId = Utils.getMimeHeaderAttribute(headers, MIMEConstants.HEADER_CONTENT_ID);
-            if (start.equals(contentId))
-            {
-              root = part;
-			  rootNotFound = false;
-            }
-    	  }
-    	}
-      }
-    }
-  	return root;
-  }
-  
-  /**
-   * Decodes the given encoded string.
-   */
-  public static byte[] decodeBase64(String str)
-  {
-  	try
-  	{
-    	sun.misc.BASE64Decoder decoder =  new sun.misc.BASE64Decoder();
-  	    return decoder.decodeBuffer(str);
-  	}
-  	catch (Exception e)
-  	{
-  		return new byte[0];
-  	}
-  }
-
-  /**
-   * Encodes the given byte array.
-   */
-  public static String encodeBase64(byte[] buffer)
-  {    
-  	sun.misc.BASE64Encoder encoder =  new sun.misc.BASE64Encoder();
-  	return encoder.encodeBuffer(buffer);  
-  }
-
-  public static MimeParts parseMultipartRelatedMessage(String message, String httpHeaders, String encoding)
-  {
-  	byte[] buffer = null;
-  	try
-	{ 
-  	  buffer = message.getBytes(encoding);
-	}
-  	catch (Exception e)
-	{
-  		return null;
-	}
-  	return parseMultipartRelatedMessage(buffer, httpHeaders, encoding);
-  }
-  public static MimeParts parseMultipartRelatedMessage(byte[] message, String httpHeaders, String encoding)
-  {
-    MimeParts mimeParts = new MimePartsImpl();
-    String boundary = Utils.getHttpHeaderSubAttribute(httpHeaders, HTTPConstants.HEADER_CONTENT_TYPE, "boundary");
-    ArrayList parts = new ArrayList();
-    
-    if (boundary == null)
-    {
-    	// assume it is a simple SOAP message
-    	return null;
-    }
-    else
-    {
-      String start = Utils.getHttpHeaderSubAttribute(httpHeaders, HTTPConstants.HEADER_CONTENT_TYPE, "start");
-      int[] indices = Utils.getBoundaryIndices(message, boundary);
-      boolean rootNotFound = true;
-      
-      for (int i= indices.length - 2; i>=0; i--)
-      {
-        try
-    	{
-          MimePart part = new MimePartImpl();
-          int index = Utils.getFirstCRLFCRLF(message, indices[i]);
-          if ((index > indices[i]) && (index < indices[i+1]))
-          {
-            // the boundary string & mime headers (include the trailing CRLF CRLF)
-        	String str = new String(message, indices[i], (index - indices[i]), "US-ASCII");
-        	String delimiter = str.substring(0, str.indexOf("\r\n", 2) + 2);
-
-        	if (i == indices.length -2)
-        	{
-        	  String endDelimiter = new String(message, indices[i + 1], message.length - indices[i + 1], "US-ASCII");
-        	  int j = str.indexOf("\r\n", 2);
-        	  if (j != -1)
-        	    endDelimiter = str.substring(0, str.indexOf("\r\n", 2) + 2);
-              part.setBoundaryStrings(new String[]{delimiter, endDelimiter});
-            }
-        	else
-        	  part.setBoundaryStrings(new String[]{delimiter});
-       
-        	// the headers
-        	String headers = str.substring(delimiter.length());
-            if (headers.startsWith("\r\n"))
-            {
-          	  // no headers present
-          	  part.setHeaders("");
-            }
-            else
-            {
-          	  part.setHeaders(headers);
-            }
-            
-            // the content
-            String contentId = Utils.getMimeHeaderAttribute(headers, MIMEConstants.HEADER_CONTENT_ID);
-            int size = indices[i+1] - (index);
-         	byte[] content = new byte[size];
-      	    System.arraycopy(message, index, content, 0, size);
-      	  
-            if ((rootNotFound && (i == 0)) ||
-            	((start != null) && (!start.equals("")) && (start.equals(contentId))))
-            {
-              // root part -- do not encode
-              part.setContent(new String(content, encoding));
-              mimeParts.setRootPart(part);
-            }
-            else
-            {
-              String transferEncoding =  Utils.getMimeHeaderAttribute(headers, MIMEConstants.HEADER_CONTENT_TRANSFER_ENCODING);
-   
-              if ((transferEncoding != null) && transferEncoding.equalsIgnoreCase("base64"))
-              	part.setContent(new String(content, encoding));
-              else
-                part.setContent(Utils.encodeBase64(content));
-            }
-           parts.add(part);
-         }
-    	}
-    	catch (Exception e)
-    	{
-    	  return null;
-    	}
-      }
-      int size = parts.size();
-      for (int i = size-1; i>=0; i--)
-         mimeParts.addPart((MimePart)parts.get(i));
-    }
-    return mimeParts;
-  }
-
-  public static String toXMLString(MimeParts mimeParts)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    // Add message content with attachments element
-    pw.print("<" + WSIConstants.ELEM_MESSAGE_CONTENT_WITH_ATTACHMENTS);
-    pw.print(">");
-
-    Collection partList = mimeParts.getParts();
-    if (!partList.isEmpty())
-        {
-         	Iterator iMimeParts = partList.iterator();
-        	while (iMimeParts.hasNext())
-            {
-        	  MimePart mimePart = (MimePart)iMimeParts.next();
-         	  pw.print(mimePart.toXMLString(""));
-            }
-        }
-
-        // Add end message element
-        pw.println("</" + WSIConstants.ELEM_MESSAGE_CONTENT_WITH_ATTACHMENTS + ">");
-    // Return string
-    return sw.toString();
-  }
-
-  public static void main (String[] args)
-  {
-  	try
-	{
-  	  FileInputStream inputStream = new FileInputStream("d:\\b.xml");
-  	  int i = inputStream.available();
-  	  byte[] buffer = new byte[i];
-  	  inputStream.read(buffer);
-  	  String message = new String(buffer);
-  	  message = XMLUtils.xmlRemoveEscapedString(message);
-  	  String headers = Utils.getHTTPHeaders(message);
-  	  MimeParts parts = Utils.parseMultipartRelatedMessage(message, headers, Utils.JAVA_ENCODING_DEFAULT);
-  	  System.out.println(Utils.toXMLString(parts));
-	}
-  	catch (Exception e){}
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/WSDLUtil.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/WSDLUtil.java
deleted file mode 100644
index 1adcf00b7..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/util/WSIProperties.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/WSIProperties.java
deleted file mode 100644
index ba1403362..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/WSIProperties.java
+++ /dev/null
@@ -1,347 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.util;
-
-import java.util.Enumeration;
-import java.util.MissingResourceException;
-import java.util.Properties;
-import java.util.ResourceBundle;
-
-import org.uddi4j.transport.TransportFactory;
-
-/**
- * The WSI properties can be defined in one of three locations.  
- *
- *   1. The wsi.properties file which can be located anywhere in the classpath.
- *   2. The system property settings.
- *   3. The thread local property settings.
- * 
- * The properties are set based on this ordering.  For example, the properties 
- * from the wsi.properties file will be replaced by properties from the system 
- * property settings, which will be replaced by the thread local property settings.
- *
- * The properties that are used to define the implementation classes can be
- * specified as system properties or as properties that are set in a thread 
- * local variable.  System properties should be used if only one implementation
- * is needed per JVM.  If two or more implementations are needed per JVM, then
- * the properties should be set using the thread local variable.
- *
- * @version 1.0.1
- * @author: Peter Brittenham
- */
-public final class WSIProperties
-{
-  /**
-   * Properties object.
-   */
-  protected static Properties wsiProperties = new Properties();
-
-  /**
-   * Default ProfileValidatorFactory class name.
-   */
-  public static final String DEF_VALIDATOR_FACTORY =
-    "org.eclipse.wst.wsi.internal.core.profile.validator.impl.ProfileValidatorFactoryImpl";
-
-  /**
-   * Property that contains ProfileValidatorFactory class name.
-   */
-  public static final String PROP_VALIDATOR_FACTORY =
-    "wsi.profile.validator.factory";
-
-  /**
-   * Default document factory class name.
-   */
-  public static final String DEF_DOCUMENT_FACTORY =
-    "org.eclipse.wst.wsi.internal.core.document.impl.DocumentFactoryImpl";
-
-  /**
-   * Property that contains document factory class name.
-   */
-  public static final String PROP_DOCUMENT_FACTORY = "wsi.document.factory";
-
-  /**
-   * Default JAXP XML parser document factory builder.
-   */
-  public static final String DEF_JAXP_DOCUMENT_FACTORY =
-    "org.apache.xerces.jaxp.DocumentBuilderFactoryImpl";
-
-  /**
-   * Property that contains JAXP XML parser document factory builder.
-   */
-  public static final String PROP_JAXP_DOCUMENT_FACTORY =
-    "javax.xml.parsers.DocumentBuilderFactory";
-
-  /**
-   * Default WSDL schema location.
-   */
-  public static final String DEF_WSDL_SCHEMA = "http://schemas.xmlsoap.org/wsdl/";
-
-  /**
-   * Property that contains WSDL schema location.
-   */
-  public static final String PROP_WSDL_SCHEMA = "wsi.analyzer.wsdl.schema";
-
-  /**
-   * Default WSDL SOAP schema location.
-   */
-  public static final String DEF_WSDL_SOAP_SCHEMA =
-    "http://schemas.xmlsoap.org/wsdl/soap/";
-
-  /**
-   * Property that contains WSDL SOAP schema location.
-   */
-  public static final String PROP_WSDL_SOAP_SCHEMA =
-    "wsi.analyzer.wsdlsoap.schema";
-
-  /**
-   * Default WSDL MIME schema location.
-   */
-  public static final String DEF_WSDL_MIME_SCHEMA =
-    "http://schemas.xmlsoap.org/wsdl/mime/";
-
-  /**
-   * Property that contains WSDL SOAP schema location.
-   */
-  public static final String PROP_WSDL_MIME_SCHEMA =
-    "wsi.analyzer.wsdlmime.schema";
-
-  /**
-   * Default SOAP schema location.
-   */
-  public static final String DEF_SOAP_SCHEMA =
-    "http://schemas.xmlsoap.org/soap/envelope/";
-
-  /**
-   * Property that contains SOAP schema location.
-   */
-  public static final String PROP_SOAP_SCHEMA = "wsi.analyzer.soap.schema";
-
-  /**
-   * Default SOAP schema location.
-   */
-  public static final String DEF_XML_SCHEMA = "http://www.w3.org/2001/XMLSchema.xsd";
-
-  /**
-   * Property that contains SOAP schema location.
-   */
-  public static final String PROP_XML_SCHEMA = "wsi.analyzer.xmlschema.schema";
-
-  /**
-   * Property which contains WSI_HOME value.
-   */
-  public static final String PROP_WSI_HOME = "wsi.home";
-
-  /**
-   * Property file name.
-   */
-  protected static final String PROP_FILENAME = "org.eclipse.wst.wsi.internal.core.util.wsi";
-
-  /**
-  * Thread local variable.
-  */
-  private static ThreadLocal threadLocal = new ThreadLocal();
-
-  // Load profiles file
-  static {
-    loadPropertiesFile();
-  }
-
-  /**
-   * Load properties from wsi.properties file.
-   */
-  private static void loadPropertiesFile()
-  {
-    try
-    {
-      // Try to load properties from wsi.properties
-      //InputStream is = Utils.getInputStream(PROP_FILENAME);
-
-      // Load properties from file
-      //wsiPropertiesFile.load(is);
-
-      ResourceBundle resourceBundle = ResourceBundle.getBundle(PROP_FILENAME);
-
-      String nextKey;
-      Enumeration enumeration = resourceBundle.getKeys();
-      while (enumeration.hasMoreElements())
-      {
-        nextKey = (String) enumeration.nextElement();
-        wsiProperties.put(nextKey, resourceBundle.getString(nextKey));
-      }
-    }
-
-    catch (MissingResourceException mre)
-    {
-      // DEBUG:
-      System.err.println(
-        "WARNING:  Could not read "
-          + PROP_FILENAME
-          + ".  "
-          + "Verify that it is in the CLASSPATH.");
-
-      // Set up default values
-      wsiProperties.put(PROP_VALIDATOR_FACTORY, DEF_VALIDATOR_FACTORY);
-      wsiProperties.put(PROP_DOCUMENT_FACTORY, DEF_DOCUMENT_FACTORY);
-      wsiProperties.put(PROP_JAXP_DOCUMENT_FACTORY, DEF_JAXP_DOCUMENT_FACTORY);
-      wsiProperties.put(
-        TransportFactory.PROPERTY_NAME,
-        "org.uddi4j.transport.ApacheAxisTransport");
-    }
-  }
-
-  /** 
-   * Do not allow this object to be instantiated.
-   */
-  private WSIProperties()
-  {
-  }
-
-  /** 
-    * Get properties that were set for this thread only.
-    * @return the properties that were set for this thread only.
-    *
-    * @see #setThreadLocalProperties
-    */
-  public static Properties getThreadLocalProperties()
-  {
-    // Return properties
-    return (Properties) threadLocal.get();
-  }
-
-  /** 
-   * Set properties for this thread only.
-   * @param props  a Properties object.
-   *
-   * @see #getThreadLocalProperties
-   */
-  public static void setThreadLocalProperties(Properties props)
-  {
-    // Save the properties as thread local variables
-    threadLocal.set(props);
-  }
-
-  /** 
-   * Get the property value given the property name.
-   * @param propertyName  a property name.
-   * @return the corresponding property value. If not found return null.
-   */
-  public static String getProperty(String propertyName)
-  {
-    String propertyValue = null;
-    Properties threadLocalProps = null;
-
-    // 1. Look in thread local properties first
-    if ((threadLocalProps = getThreadLocalProperties()) != null)
-    {
-      propertyValue = threadLocalProps.getProperty(propertyName);
-    }
-
-    // 2. Next look in system properties 
-    if (propertyValue == null)
-    {
-      propertyValue = System.getProperty(propertyName);
-    }
-
-    // 3. Last look in the properties file
-    if (propertyValue == null)
-    {
-      propertyValue = wsiProperties.getProperty(propertyName);
-    }
-
-    // Return property value
-    return propertyValue;
-  }
-
-  /** 
-   * Get the property value given the property name.
-   * @param propertyName  a property name.
-   * @param defaultValue  a default value for the property.
-   * @return the corresponding property value. If not found return the default value.
-   */
-  public static String getProperty(String propertyName, String defaultValue)
-  {
-    String propertyValue = null;
-
-    // If the propertyValue was not found, then return default value
-    if ((propertyValue = getProperty(propertyName)) == null)
-    {
-      propertyValue = defaultValue;
-    }
-
-    // Return property value
-    return propertyValue;
-  }
-
-  /**
-   * This method is used to unit test this class.
-   * @param args  the arguments for main.
-   */
-  public static void main(String[] args)
-  {
-    try
-    {
-      // Set property for this thread
-      Properties props = new Properties();
-      props.setProperty(PROP_VALIDATOR_FACTORY, "main");
-      WSIProperties.setThreadLocalProperties(props);
-
-      // Start four threads to verify that the multithreaded use of tread local vars works
-      for (int i = 0; i < 5; i++)
-      {
-        // Create new thread
-         (new Thread(new ThreadTest("test" + i))).start();
-
-        try
-        {
-          // Sleep
-          Thread.sleep(200);
-
-          // Display properties, which should be main
-          System.out.println(
-            "PROP_VALIDATOR_FACTORY:  "
-              + WSIProperties.getProperty(PROP_VALIDATOR_FACTORY));
-        }
-
-        catch (Exception e)
-        {
-        }
-      }
-    }
-
-    catch (Exception e)
-    {
-      // e.printStackTrace();
-    }
-  }
-
-  /**
-   * Inner class used for unit test.
-   */
-  static private class ThreadTest extends Thread
-  {
-    String name;
-
-    ThreadTest(String name)
-    {
-      this.name = name;
-    }
-
-    public void run()
-    {
-      Properties props = new Properties();
-      props.setProperty(PROP_VALIDATOR_FACTORY, name);
-      WSIProperties.setThreadLocalProperties(props);
-      System.out.println(
-        "PROP_VALIDATOR_FACTORY:  "
-          + WSIProperties.getProperty(PROP_VALIDATOR_FACTORY));
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/XMLInfo.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/XMLInfo.java
deleted file mode 100644
index b92119912..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/util/wsi.properties b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/wsi.properties
deleted file mode 100644
index bfe48da10..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/wsi.properties
+++ /dev/null
@@ -1,46 +0,0 @@
-# /**
-#  * <copyright>
-#  *
-#  * Copyright (c) 2002-2003  IBM Corporation and others.
-#  * All rights reserved.   This program and the accompanying materials
-#  * are made available under the terms of the Eclipse Public License v1.0
-#  * which accompanies this distribution, and is available at
-#  * http://www.eclipse.org/legal/epl-v10.html
-#  * 
-#  * Contributors: 
-#  *   IBM      - Initial API and implementation
-#  * </copyright>
-#  */
-#
-# Property file used to set parameters for Conformance Tools
-
-# -----------------------------------------------------------------------
-# Document factory.
-# -----------------------------------------------------------------------
-wsi.document.factory=org.eclipse.wst.wsi.internal.core.document.impl.DocumentFactoryImpl
-
-# -----------------------------------------------------------------------
-# Profile validation factory.
-# -----------------------------------------------------------------------
-wsi.profile.validator.factory=org.eclipse.wst.wsi.internal.core.profile.validator.impl.ProfileValidatorFactoryImpl
-
-# -----------------------------------------------------------------------
-# Reference to JAXP document builder
-# -----------------------------------------------------------------------
-javax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl
-#javax.xml.parsers.DocumentBuilderFactory=org.eclipe.wst.wsi.internal.core.xml.jaxp.DocumentBuilderFactoryImpl
-
-# -----------------------------------------------------------------------
-# Transport class used by UDDI4J
-# -----------------------------------------------------------------------
-org.uddi4j.TransportClassName=org.uddi4j.transport.ApacheAxisTransport
-
-
-# -----------------------------------------------------------------------
-# Location of XML schema documents relative to the plugin directory
-# -----------------------------------------------------------------------
-wsi.analyzer.xmlschema.schema=http://www.w3.org/2001/XMLSchema.xsd
-wsi.analyzer.soap.schema=http://schemas.xmlsoap.org/soap/envelope/
-wsi.analyzer.wsdl.schema=http://schemas.xmlsoap.org/wsdl/
-wsi.analyzer.wsdlsoap.schema=wsi.analyzer.wsdlsoap.schema
-wsi.analyzer.wsdlmime.schema=http://schemas.xmlsoap.org/wsdl/mime/
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/WSDLDocument.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/WSDLDocument.java
deleted file mode 100644
index 507f983d3..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/WSDLDocument.java
+++ /dev/null
@@ -1,293 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.wsdl;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.wsdl.Binding;
-import javax.wsdl.Definition;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.WSDLException;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.xml.WSDLReader;
-
-import org.eclipse.wst.wsi.internal.core.wsdl.xsd.InlineSchemaValidator;
-import org.eclipse.wst.wsi.internal.core.xml.XMLTags;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Document;
-
-/**
- * This class provides a interface to a single WSDL document.
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public class WSDLDocument
-{
-  /**
-   * WSDL document location.
-   */
-  protected String fileName = null;
-
-  /**
-   * Definition element.
-   */
-  protected Definition definitions = null;
-
-  /**
-   * WSDL element list with line and column numbers.
-   */
-  protected WSDLElementList wsdlElementList = null;
-
-  /**
-   * Map of targetNamespaces to the corresponding org.apache.xerces.xs.XSModel of schema elements.
-   */
-  private Map schemas = new HashMap();
-
-  /**
-   * List of schemas validation errors.
-   */
-  private List schemasValidationErrors = new ArrayList();
-
-  /**
-   * Read WSDL document from the specified file.
-   * @param fileName WSDL document location.
-   * @throws WSDLException if problem reading WSDL document.
-   */
-  public WSDLDocument(String fileName) throws WSDLException
-  {
-    this.fileName = fileName;
-    ClassLoader currentLoader = Thread.currentThread().getContextClassLoader();   
-
-    try
-    {                         
-      Thread.currentThread().setContextClassLoader(WSDLDocument.class.getClassLoader());    
-
-      // Get the WSDLReader
-      WSDLReader wsdlReader = new WSDLReaderImpl();
-
-      // Set features
-      wsdlReader.setFeature(com.ibm.wsdl.Constants.FEATURE_VERBOSE, false);
-      // DEBUG:
-      //wsdlReader.setFeature(com.ibm.wsdl.Constants.FEATURE_VERBOSE, true);
-      wsdlReader.setFeature(
-        com.ibm.wsdl.Constants.FEATURE_IMPORT_DOCUMENTS,
-        true);
-      // DEBUG:
-      //wsdlReader.setFeature(com.ibm.wsdl.Constants.FEATURE_IMPORT_DOCUMENTS,true);
-
-      // Parse the WSDL document
-      Document document = XMLUtils.parseXMLDocument(fileName);
-      this.definitions = wsdlReader.readWSDL(fileName, document);
-
-      // Since inline schema validator is used by several assertions, validate all
-      // schemas right after WSDL validation
-      validateSchemas();
-
-      // Get the line and column number references
-      this.wsdlElementList = ((WSDLReaderImpl) wsdlReader).getElementList();
-
-      // DEBUG:
-      //System.err.println(wsdlElementList.toString());
-    }
-    catch (Exception cce)
-    {
-      // Set element list to null
-      this.wsdlElementList = null;
-    }
-    finally
-    { 
-      Thread.currentThread().setContextClassLoader(currentLoader);
-    }    
-  }
-
-  /**
-   * Create WSDL document from existing Definition object.
-   * 
-   * @param fileName WSDL document location.
-   * @param definitions Definition object.
-   */
-  public WSDLDocument(String fileName, Definition definitions)
-  {
-    this.fileName = fileName;
-    this.definitions = definitions;
-    schemas.clear();
-    schemasValidationErrors.clear();
-  }
-
-  /**
-   * Get the WSDL document location.
-   * @return he WSDL document location.
-   */
-  public String getLocation()
-  {
-    // Return the document location
-    return this.fileName;
-  }
-
-  /**
-   * Get the definition element of the WSDL document.
-   * @return the definition element
-   */
-  public Definition getDefinitions()
-  {
-    // Return the definition element
-    return definitions;
-  }
-
-  /**
-   * Get all the portType elements from the WSDL document.
-   * @return the list of portType elements.
-   */
-  public PortType[] getPortTypes()
-  {
-    // Generate an array of PortTypes from the PortType map for this Definition
-    return (PortType[]) definitions.getPortTypes().values().toArray(
-      new PortType[0]);
-  }
-
-  /**
-   * Get all the binding elements from the WSDL document.
-   * @return the list of binding elements.
-   */
-  public Binding[] getBindings()
-  {
-    // Generate an array of Bindings from the Binding map for this Definition
-    return (Binding[]) definitions.getBindings().values().toArray(
-      new Binding[0]);
-  }
-
-  /**
-   * Get all the service elements from the WSDL document.
-   * @return the list of service elements.
-   */
-  public Service[] getServices()
-  {
-    // Generate an array of Services from the Service map for this Definition
-    return (Service[]) definitions.getServices().values().toArray(
-      new Service[0]);
-  }
-
-  /* Return string representation of this object.
-   * @see java.lang.Object#toString()
-   */
-  public String toString()
-  {
-    // Return string
-    return (definitions == null)
-      ? "WSDL definition element not found."
-      : definitions.toString();
-  }
-
-  /**
-   * Get the element list.
-   * @return the element list.
-   */
-  public WSDLElementList getElementList()
-  {
-    return this.wsdlElementList;
-  }
-
-  /**
-   * Returns a schemas map.
-   * @return a map of targetNamespace attribute values of the schema elements
-   * to the corresponding org.apache.xerces.xs.XSModel object of that schema.
-   */
-  public Map getSchemas()
-  {
-    return schemas;
-  }
-
-  /**
-   * Returns a list of schemas validation errors caused by the validateSchemas() procedure.
-   * @return a list of schemas validation errors.
-   */
-  public List getSchemasValidationErrors()
-  {
-    return schemasValidationErrors; 
-  }
-
-  /**
-   * The method invokes the inline schema validator which validates every schema element of the WSDL.
-   */
-  private void validateSchemas()
-  {
-    schemas.clear();
-    schemasValidationErrors.clear();
-
-    /* INLINE SCHEMA VALIDATOR */
-    if (definitions != null
-      && definitions.getTypes() != null
-      && definitions.getTypes().getExtensibilityElements() != null)
-    {
-      InlineSchemaValidator schemaValidator = new InlineSchemaValidator();
-
-      // Collecting schema's parent elements
-      List parents = new ArrayList(2);
-      parents.add(definitions.getTypes());
-      parents.add(definitions);
-      // Going through all the ExtensibilityElementS of wsdl:types
-      // since they are potential schemas
-      // See Java APIs for WSDL V1.0 (JSR110), section 4
-      Iterator i = this.definitions.getTypes().getExtensibilityElements().iterator();
-      while (i.hasNext())
-      {
-        ExtensibilityElement extEl = (ExtensibilityElement) i.next();
-        if (extEl.getElementType().equals(XMLTags.ELEM_XSD_SCHEMA))
-        {
-          Map map = null;
-          try
-          {
-            // Validating schema element
-            map = schemaValidator.validate(extEl, parents, fileName);
-          }
-          catch (Exception e)
-          {
-            // Adding an exception to the errors list
-            schemasValidationErrors.add(e.getMessage());
-          }
-
-          if (map != null)
-          {
-            // Adding returned XSModel to schemas map
-            schemas.putAll(map);
-          }
-        }
-      }
-    }    
-  }
-
-  /**
-   * Command line interface.
-   * @param args from command line.
-   */
-  public static void main(String[] args)
-  {
-    try
-    {
-      WSDLDocument wsdlDocument = new WSDLDocument(args[0]);
-      System.out.println(wsdlDocument.toString());
-    }
-
-    catch (Exception e)
-    {
-      e.toString();
-      e.printStackTrace();
-    }
-
-    System.exit(0);
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/WSDLElementList.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/WSDLElementList.java
deleted file mode 100644
index 75a77d895..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/WSDLElementList.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.wsdl;
-
-import java.util.HashMap;
-import java.util.Iterator;
-
-import org.eclipse.wst.wsi.internal.core.xml.dom.ElementLocation;
-
-/**
- * This class maintains a WSDL element list.
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public class WSDLElementList
-{
-  /**
-   * List of WSDL elements with their location.
-   */
-  HashMap wsdlElementList = new HashMap();
-
-  /**
-   * WSDL element locator.
-   */
-  public WSDLElementList()
-  {
-  }
-
-  /**
-   * Add element with location information.
-   * @param wsdlElement      a WSDL element artifact.
-   * @param elementLocation  the location information for the element.
-   */
-  public void addElement(Object wsdlElement, ElementLocation elementLocation)
-  {
-    this.wsdlElementList.put(wsdlElement, elementLocation);
-  }
-
-  /**
-   * Get element location.
-   * @param wsdlElement  a WSDL element artifact.
-   * @return the location information for the element.
-   */
-  public ElementLocation getElementLocation(Object wsdlElement)
-  {
-    return (ElementLocation) this.wsdlElementList.get(wsdlElement);
-  }
-
-  /* Return string representation of this object.
-   * @see java.lang.Object#toString()
-   */
-  public String toString()
-  {
-    String string = "WSDLElementList: \n";
-
-    // Get list entries (values?)
-    Iterator iterator = this.wsdlElementList.keySet().iterator();
-
-    // Add each entry in the list to the string
-    ElementLocation wsdlElementLocation;
-    while (iterator.hasNext())
-    {
-      Object wsdlElement = iterator.next();
-
-      if (wsdlElement != null)
-      {
-        string += "  " + wsdlElement.getClass().getName() + ": ";
-        if ((wsdlElementLocation =
-          (ElementLocation) wsdlElementList.get(wsdlElement))
-          == null)
-        {
-          string += "null\n";
-        }
-
-        else
-        {
-          string += "  "
-            + wsdlElement.getClass().getName()
-            + ": "
-            + wsdlElementLocation.getLineNumber()
-            + ", "
-            + wsdlElementLocation.getColumnNumber()
-            + "\n";
-        }
-      }
-    }
-
-    return string;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/WSDLReaderImpl.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/WSDLReaderImpl.java
deleted file mode 100644
index a9f65efdf..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/WSDLReaderImpl.java
+++ /dev/null
@@ -1,801 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.wsdl;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingFault;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.BindingOutput;
-import javax.wsdl.Definition;
-import javax.wsdl.Fault;
-import javax.wsdl.Import;
-import javax.wsdl.Input;
-import javax.wsdl.Message;
-import javax.wsdl.Operation;
-import javax.wsdl.Output;
-import javax.wsdl.Part;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.Types;
-import javax.wsdl.WSDLException;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.factory.WSDLFactory;
-import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.apache.xerces.dom.ElementImpl;
-import org.eclipse.wst.wsi.internal.core.xml.dom.ElementLocation;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.InputSource;
-
-import com.ibm.wsdl.Constants;
-import com.ibm.wsdl.util.StringUtils;
-import com.ibm.wsdl.util.xml.DOMUtils;
-import com.ibm.wsdl.util.xml.QNameUtils;
-import com.ibm.wsdl.util.xml.XPathUtils;
-
-/**
- * This class is a specialization of com.ibm.wsdl.xml.WSDLReaderImpl in WSDL4J.
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public class WSDLReaderImpl extends com.ibm.wsdl.xml.WSDLReaderImpl
-{
-  // WSDL element list.
-  protected WSDLElementList wsdlElementList = new WSDLElementList();
-
-  /* (non-Javadoc)
-   * @see com.ibm.wsdl.xml.WSDLReaderImpl#parseDefinitions(java.lang.String, org.w3c.dom.Element, java.util.Map)
-   */
-  protected Definition parseDefinitions(
-    String documentBaseURI,
-    Element defEl,
-    Map importedDefs)
-    throws WSDLException
-  {
-	  Definition def = null;
-	ClassLoader currentLoader = Thread.currentThread().getContextClassLoader();   
-	try
-	{
-   	  Thread.currentThread().setContextClassLoader(WSDLReaderImpl.class.getClassLoader());   
-	
-      def =
-      super.parseDefinitions(documentBaseURI, defEl, importedDefs);
-
-    // Try to add element to list
-    addElementToList(defEl, def);
-
-
-	}
-catch (Exception e)
-	{
-	}
-    finally
-    { 
-      Thread.currentThread().setContextClassLoader(currentLoader);
-    }  
-    return def;
-  }
-
-  /* (non-Javadoc)
-   * @see com.ibm.wsdl.xml.WSDLReaderImpl#parseImport(org.w3c.dom.Element, javax.wsdl.Definition, java.util.Map)
-   */
-  protected Import parseImport(Element element, Definition definition, Map map)
-    throws WSDLException
-  {
-    /*boolean wasEx = false;
-    if (def.getDocumentBaseURI()!=null){
-    	File f = new File(def.getDocumentBaseURI());
-    	if (f.getParent()!=null && importEl.getAttribute("location")!=null){		
-    	   f = new File(f.getParent()+"/"+importEl.getAttribute("location"));
-    	   
-    	}
-    } else wasEx = false;
-      
-    Import importDef = super.parseImport(importEl, def, importedDefs);
-    
-    // Try to add element to list
-    addElementToList(importEl, importDef);
-    
-    return importDef;*/
-
-    /*Import import1 = definition.createImport();
-    String s = DOMUtils.getAttribute(element, "namespace");
-    String s1 = DOMUtils.getAttribute(element, "location");
-    if (s != null)
-    	import1.setNamespaceURI(s);
-    if (s1 != null) {
-    	if (importDocuments) {
-    		String s2 = definition.getDocumentBaseURI();
-    		try {
-    
-    			URL url1 = s2 == null ? null : StringUtils.getURL(null, s2);
-    			URL url = StringUtils.getURL(url1, s1);
-    			InputStream inputstream =
-    				StringUtils.getContentAsInputStream(url);
-    			inputstream.close();
-    		} catch (IOException ex) {
-    			//import1.setLocationURI(null);
-    			addElementToList(element, import1);
-    			return import1;
-    		} catch (Throwable ex) {
-    			throw new WSDLException(
-    				"OTHER_ERROR",
-    				"Unable to resolve imported document at '" + s1 + "'.",
-    				ex);
-    		}
-    
-    	}
-    }
-    Import importDef = super.parseImport(element, definition, map);
-    addElementToList(element, importDef);*/
-    Import import1 = definition.createImport();
-    String s = DOMUtils.getAttribute(element, "namespace");
-    String s1 = DOMUtils.getAttribute(element, "location");
-    if (s != null)
-      import1.setNamespaceURI(s);
-    // ADD: check "location" attribute for empty 
-    // string to prevent self-defenition assigning
-    if ((s1 != null) && (s1.length() > 0))
-    {
-      import1.setLocationURI(s1);
-      if (importDocuments)
-        try
-        {
-          String s2 = definition.getDocumentBaseURI();
-          Definition definition1 = null;
-          InputStream inputstream = null;
-          InputSource inputsource = null;
-          URL url = null;
-          if (loc != null)
-          {
-            inputsource = loc.getImportInputSource(s2, s1);
-            String s3 = loc.getLatestImportURI();
-            definition1 = (Definition) map.get(s3);
-          }
-          else
-          {
-            URL url1 = s2 == null ? null : StringUtils.getURL(null, s2);
-            url = StringUtils.getURL(url1, s1);
-            definition1 = (Definition) map.get(url.toString());
-            if (definition1 == null)
-            {
-              try
-              {
-
-                inputstream = url.openStream();
-              }
-              catch (IOException ex)
-              {
-                //import1.setLocationURI(null);
-                addElementToList(element, import1);
-                return import1;
-              }
-              if (inputstream != null)
-                inputsource = new InputSource(inputstream);
-            }
-          }
-          if (definition1 == null)
-          {
-            if (inputsource == null)
-              throw new WSDLException(
-                "OTHER_ERROR",
-                "Unable to locate imported document at '"
-                  + s1
-                  + "'"
-                  + (s2 != null ? ", relative to '" + s2 + "'." : "."));
-            Document document = null;
-            try
-            {
-              document = getDocument(inputsource, s1);
-            }
-            catch (WSDLException ex)
-            {
-              addElementToList(element, import1);
-              return import1;
-            }
-            if (inputstream != null)
-              inputstream.close();
-            Element element2 = document.getDocumentElement();
-            if (QNameUtils.matches(Constants.Q_ELEM_DEFINITIONS, element2))
-            {
-              //if (verbose)
-              //  System.out.println(
-              //    "Retrieving document at '"
-              //      + s1
-              //      + "'"
-              //      + (s2 != null ? ", relative to '" + s2 + "'." : "."));
-              String s4 =
-                loc == null
-                  ? url == null
-                  ? s1
-                  : url.toString() : loc.getLatestImportURI();
-              definition1 = readWSDL(s4, element2, map);
-            }
-            else
-            {
-              QName qname = QNameUtils.newQName(element2);
-              if (Constants.XSD_QNAME_LIST.contains(qname))
-              {
-                WSDLFactory wsdlfactory =
-                  factoryImplName == null
-                    ? WSDLFactory.newInstance()
-                    : WSDLFactory.newInstance(factoryImplName);
-                definition1 = wsdlfactory.newDefinition();
-                if (extReg != null)
-                  definition1.setExtensionRegistry(extReg);
-                String s5 =
-                  loc == null
-                    ? url == null
-                    ? s1
-                    : url.toString() : loc.getLatestImportURI();
-                definition1.setDocumentBaseURI(s5);
-                /* Don't add types element since it doesn't exist.  Adding it causes problems
-                 * since it will add a types element for processing that does not exist.
-                Types types = definition1.createTypes();
-                UnknownExtensibilityElement unknownextensibilityelement =
-                	new UnknownExtensibilityElement();
-                unknownextensibilityelement.setElement(element2);
-                types.addExtensibilityElement(
-                	unknownextensibilityelement);
-                definition1.setTypes(types);
-                */
-              }
-            }
-          }
-          if (definition1 != null)
-            import1.setDefinition(definition1);
-        }
-        catch (WSDLException wsdlexception)
-        {
-          wsdlexception.setLocation(XPathUtils.getXPathExprFromNode(element));
-          throw wsdlexception;
-        }
-        catch (Throwable throwable)
-        {
-          throw new WSDLException(
-            "OTHER_ERROR",
-            "Unable to resolve imported document at '" + s1 + "'.",
-            throwable);
-        }
-    }
-    for (Element element1 = DOMUtils.getFirstChildElement(element);
-      element1 != null;
-      element1 = DOMUtils.getNextSiblingElement(element1))
-      if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, element1))
-        import1.setDocumentationElement(element1);
-      else
-        DOMUtils.throwWSDLException(element1);
-
-    return import1;
-
-  }
-
-  /* (non-Javadoc)
-   * @see com.ibm.wsdl.xml.WSDLReaderImpl#parseTypes(org.w3c.dom.Element, javax.wsdl.Definition)
-   */
-  protected Types parseTypes(Element typesEl, Definition def)
-    throws WSDLException
-  {
-    Types types = super.parseTypes(typesEl, def);
-
-    // Try to add element to list
-    addElementToList(typesEl, types);
-
-    return types;
-  }
-
-  /* (non-Javadoc)
-   * @see com.ibm.wsdl.xml.WSDLReaderImpl#parseBinding(org.w3c.dom.Element, javax.wsdl.Definition)
-   */
-  protected Binding parseBinding(Element bindingEl, Definition def)
-    throws WSDLException
-  {
-    Binding binding = super.parseBinding(bindingEl, def);
-
-    // Try to add element to list
-    addElementToList(bindingEl, binding);
-
-    return binding;
-  }
-
-  /* (non-Javadoc)
-   * @see com.ibm.wsdl.xml.WSDLReaderImpl#parseBindingOperation(org.w3c.dom.Element, javax.wsdl.PortType, javax.wsdl.Definition)
-   */
-  protected BindingOperation parseBindingOperation(
-    Element bindingOperationEl,
-    PortType portType,
-    Definition def)
-    throws WSDLException
-  {
-    BindingOperation bindingOperation = null;
-
-    // The follow try-catch was added to detect when a duplicate operation name was detected
-    try
-    {
-      bindingOperation =
-        super.parseBindingOperation(bindingOperationEl, portType, def);
-    }
-
-    catch (IllegalArgumentException iae)
-    {
-      if (iae.getMessage().startsWith("Duplicate"))
-      {
-        bindingOperation =
-          parseBindingOperationWithDuplicateNames(
-            bindingOperationEl,
-            portType,
-            def);
-      }
-
-      else
-      {
-        throw iae;
-      }
-    }
-
-    // Try to add element to list
-    if (bindingOperation != null)
-    {
-      addElementToList(bindingOperationEl, bindingOperation);
-    }
-
-    return bindingOperation;
-  }
-
-  /* (non-Javadoc)
-   * @see com.ibm.wsdl.xml.WSDLReaderImpl#parseBindingInput(org.w3c.dom.Element, javax.wsdl.Definition)
-   */
-  protected BindingInput parseBindingInput(
-    Element bindingInputEl,
-    Definition def)
-    throws WSDLException
-  {
-    BindingInput bindingInput = super.parseBindingInput(bindingInputEl, def);
-
-    // Try to add element to list
-    addElementToList(bindingInputEl, bindingInput);
-
-    return bindingInput;
-  }
-
-  /* (non-Javadoc)
-   * @see com.ibm.wsdl.xml.WSDLReaderImpl#parseBindingOutput(org.w3c.dom.Element, javax.wsdl.Definition)
-   */
-  protected BindingOutput parseBindingOutput(
-    Element bindingOutputEl,
-    Definition def)
-    throws WSDLException
-  {
-    BindingOutput bindingOutput =
-      super.parseBindingOutput(bindingOutputEl, def);
-
-    // Try to add element to list
-    addElementToList(bindingOutputEl, bindingOutput);
-
-    return bindingOutput;
-  }
-
-  /* (non-Javadoc)
-   * @see com.ibm.wsdl.xml.WSDLReaderImpl#parseBindingFault(org.w3c.dom.Element, javax.wsdl.Definition)
-   */
-  protected BindingFault parseBindingFault(
-    Element bindingFaultEl,
-    Definition def)
-    throws WSDLException
-  {
-    BindingFault bindingFault = super.parseBindingFault(bindingFaultEl, def);
-
-    // Try to add element to list
-    addElementToList(bindingFaultEl, bindingFault);
-
-    return bindingFault;
-  }
-
-  /* (non-Javadoc)
-   * @see com.ibm.wsdl.xml.WSDLReaderImpl#parseMessage(org.w3c.dom.Element, javax.wsdl.Definition)
-   */
-  protected Message parseMessage(Element msgEl, Definition def)
-    throws WSDLException
-  {
-    Message msg = super.parseMessage(msgEl, def);
-
-    // Try to add element to list
-    addElementToList(msgEl, msg);
-
-    return msg;
-  }
-
-  /* (non-Javadoc)
-   * @see com.ibm.wsdl.xml.WSDLReaderImpl#parsePart(org.w3c.dom.Element, javax.wsdl.Definition)
-   */
-  protected Part parsePart(Element partEl, Definition def) throws WSDLException
-  {
-    //Part part = super.parsePart(partEl, def);
-
-    Part part = def.createPart();
-    String name = DOMUtils.getAttribute(partEl, Constants.ATTR_NAME);
-
-    // WS-I: The try-catch was added for WSI2416
-    QName elementName;
-
-    try
-    {
-      elementName =
-        DOMUtils.getQualifiedAttributeValue(
-          partEl,
-          Constants.ATTR_ELEMENT,
-          Constants.ELEM_MESSAGE,
-          false);
-    }
-
-    catch (WSDLException we)
-    {
-      String prefixedValue =
-        DOMUtils.getAttribute(partEl, Constants.ATTR_ELEMENT);
-      int index = prefixedValue.indexOf(':');
-      String localPart = prefixedValue.substring(index + 1);
-
-      elementName = new QName(localPart);
-    }
-
-    QName typeName =
-      DOMUtils.getQualifiedAttributeValue(
-        partEl,
-        Constants.ATTR_TYPE,
-        Constants.ELEM_MESSAGE,
-        false);
-
-    if (name != null)
-    {
-      part.setName(name);
-    }
-
-    if (elementName != null)
-    {
-      part.setElementName(elementName);
-    }
-
-    if (typeName != null)
-    {
-      part.setTypeName(typeName);
-    }
-
-    Element tempEl = DOMUtils.getFirstChildElement(partEl);
-
-    while (tempEl != null)
-    {
-      if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
-      {
-        part.setDocumentationElement(tempEl);
-      }
-      else
-      {
-        DOMUtils.throwWSDLException(tempEl);
-      }
-
-      tempEl = DOMUtils.getNextSiblingElement(tempEl);
-    }
-
-    Map extensionAttributes = part.getExtensionAttributes();
-
-    extensionAttributes.putAll(getPartAttributes(partEl, def));
-
-    // Need to do something here to locate part definition.
-
-    // Try to add element to list
-    addElementToList(partEl, part);
-
-    return part;
-  }
-
-  /* (non-Javadoc)
-   * @see com.ibm.wsdl.xml.WSDLReaderImpl#parsePortType(org.w3c.dom.Element, javax.wsdl.Definition)
-   */
-  protected PortType parsePortType(Element portTypeEl, Definition def)
-    throws WSDLException
-  {
-    PortType portType = super.parsePortType(portTypeEl, def);
-
-    // Try to add element to list
-    addElementToList(portTypeEl, portType);
-
-    return portType;
-  }
-
-  /* (non-Javadoc)
-   * @see com.ibm.wsdl.xml.WSDLReaderImpl#parseOperation(org.w3c.dom.Element, javax.wsdl.PortType, javax.wsdl.Definition)
-   */
-  protected Operation parseOperation(
-    Element opEl,
-    PortType portType,
-    Definition def)
-    throws WSDLException
-  {
-    Operation op = super.parseOperation(opEl, portType, def);
-
-    // Try to add element to list
-    addElementToList(opEl, op);
-
-    return op;
-  }
-
-  /* (non-Javadoc)
-   * @see com.ibm.wsdl.xml.WSDLReaderImpl#parseService(org.w3c.dom.Element, javax.wsdl.Definition)
-   */
-  protected Service parseService(Element serviceEl, Definition def)
-    throws WSDLException
-  {
-    Service service = super.parseService(serviceEl, def);
-
-    // Try to add element to list
-    addElementToList(serviceEl, service);
-
-    return service;
-  }
-
-  /* (non-Javadoc)
-   * @see com.ibm.wsdl.xml.WSDLReaderImpl#parsePort(org.w3c.dom.Element, javax.wsdl.Definition)
-   */
-  protected Port parsePort(Element portEl, Definition def) throws WSDLException
-  {
-    Port port = super.parsePort(portEl, def);
-
-    // Try to add element to list
-    addElementToList(portEl, port);
-
-    return port;
-  }
-
-  /* (non-Javadoc)
-   * @see com.ibm.wsdl.xml.WSDLReaderImpl#parseExtensibilityElement(java.lang.Class, org.w3c.dom.Element, javax.wsdl.Definition)
-   */
-  protected ExtensibilityElement parseExtensibilityElement(
-    Class parentType,
-    Element el,
-    Definition def)
-    throws WSDLException
-  {
-    ExtensibilityElement extElement =
-      super.parseExtensibilityElement(parentType, el, def);
-
-    // Try to add element to list
-    addElementToList(el, extElement);
-
-    return extElement;
-  }
-
-  /* (non-Javadoc)
-   * @see com.ibm.wsdl.xml.WSDLReaderImpl#parseInput(org.w3c.dom.Element, javax.wsdl.Definition)
-   */
-  protected Input parseInput(Element inputEl, Definition def)
-    throws WSDLException
-  {
-    Input input = super.parseInput(inputEl, def);
-
-    // Try to add element to list
-    addElementToList(inputEl, input);
-
-    return input;
-  }
-
-  /* (non-Javadoc)
-   * @see com.ibm.wsdl.xml.WSDLReaderImpl#parseOutput(org.w3c.dom.Element, javax.wsdl.Definition)
-   */
-  protected Output parseOutput(Element outputEl, Definition def)
-    throws WSDLException
-  {
-    Output output = super.parseOutput(outputEl, def);
-
-    // Try to add element to list
-    addElementToList(outputEl, output);
-
-    return output;
-  }
-
-  /* (non-Javadoc)
-   * @see com.ibm.wsdl.xml.WSDLReaderImpl#parseFault(org.w3c.dom.Element, javax.wsdl.Definition)
-   */
-  protected Fault parseFault(Element faultEl, Definition def)
-    throws WSDLException
-  {
-    Fault fault = super.parseFault(faultEl, def);
-
-    // Try to add element to list
-    addElementToList(faultEl, fault);
-
-    return fault;
-  }
-
-  /* (non-Javadoc)
-   * @see com.ibm.wsdl.xml.WSDLReaderImpl#getDocument(org.xml.sax.InputSource, java.lang.String)
-   */
-  protected Document getDocument(InputSource inputSource, String desc)
-    throws WSDLException
-  {
-    ClassLoader currentLoader = Thread.currentThread().getContextClassLoader();
-    try
-	{
-      Thread.currentThread().setContextClassLoader(WSDLReaderImpl.class.getClassLoader());   	
-	
-  	  //DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-      DocumentBuilderFactory factory =
-        new org.eclipse.wst.wsi.internal.core.xml.jaxp.DocumentBuilderFactoryImpl();
-
-      factory.setNamespaceAware(true);
-      factory.setValidating(false);
-
-      DocumentBuilder builder = factory.newDocumentBuilder();
-      Document doc = builder.parse(inputSource);
-
-      return doc;
-    }
-    catch (Throwable t)
-    {
-      throw new WSDLException(
-        WSDLException.PARSER_ERROR,
-        "Problem parsing '" + desc + "'.",
-        t);
-    }
-    finally
-    { 
-      Thread.currentThread().setContextClassLoader(currentLoader);
-    }    
-  }
-
-  /**
-   * Get element list.
-   * @return the element list.
-   */
-  public WSDLElementList getElementList()
-  {
-    return this.wsdlElementList;
-  }
-
-  /** 
-   * Add WSDL element to element list.
-   */
-  private void addElementToList(Element element, Object wsdlElement)
-  {
-    ElementLocation elementLocation = null;
-
-    try
-    {
-      // See if the element object is an instanceof org.apache.xerces.dom.ElementImpl
-      ElementImpl elementImpl = (ElementImpl) element;
-
-      // If it is, then get the element location information
-      elementLocation =
-        (ElementLocation) elementImpl.getUserData();
-
-      // Add it to the list
-      this.wsdlElementList.addElement(wsdlElement, elementLocation);
-    }
-
-    catch (ClassCastException cce)
-    {
-      // ADD: Should we add the element with a null or zero location?
-    }
-  }
-
-  /**
-   * This method is used when a WSDL document contains duplicate operation names.
-   * It is the same as the original parseBindingOperation method, except that it will
-   * just find the first operation that matches instead of throwing an exception.
-   */
-  private BindingOperation parseBindingOperationWithDuplicateNames(
-    Element bindingOperationEl,
-    PortType portType,
-    Definition def)
-    throws WSDLException
-  {
-    BindingOperation bindingOperation = def.createBindingOperation();
-    String name =
-      DOMUtils.getAttribute(bindingOperationEl, Constants.ATTR_NAME);
-
-    if (name != null)
-    {
-      bindingOperation.setName(name);
-    }
-
-    Element tempEl = DOMUtils.getFirstChildElement(bindingOperationEl);
-
-    while (tempEl != null)
-    {
-      if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
-      {
-        bindingOperation.setDocumentationElement(tempEl);
-      }
-      else if (QNameUtils.matches(Constants.Q_ELEM_INPUT, tempEl))
-      {
-        bindingOperation.setBindingInput(parseBindingInput(tempEl, def));
-      }
-      else if (QNameUtils.matches(Constants.Q_ELEM_OUTPUT, tempEl))
-      {
-        bindingOperation.setBindingOutput(parseBindingOutput(tempEl, def));
-      }
-      else if (QNameUtils.matches(Constants.Q_ELEM_FAULT, tempEl))
-      {
-        bindingOperation.addBindingFault(parseBindingFault(tempEl, def));
-      }
-      else
-      {
-        bindingOperation.addExtensibilityElement(
-          parseExtensibilityElement(BindingOperation.class, tempEl, def));
-      }
-
-      tempEl = DOMUtils.getNextSiblingElement(tempEl);
-    }
-
-    if (portType != null)
-    {
-      BindingInput bindingInput = bindingOperation.getBindingInput();
-      BindingOutput bindingOutput = bindingOperation.getBindingOutput();
-      String inputName = (bindingInput != null ? bindingInput.getName() : null);
-      String outputName =
-        (bindingOutput != null ? bindingOutput.getName() : null);
-
-      //Operation op = portType.getOperation(name, inputName, outputName);
-      // Get all operations, and then find the first one that matches
-      Operation op = null, checkOperation;
-      Iterator iterator = portType.getOperations().iterator();
-      while (iterator.hasNext() && op == null)
-      {
-        // Get the next operation
-        checkOperation = (Operation) iterator.next();
-
-        // Get the operation name, input name, and output name
-        String checkName = checkOperation.getName();
-        String checkInputName =
-          (checkOperation.getInput() == null
-            ? null
-            : checkOperation.getInput().getName());
-        String checkOutputName =
-          (checkOperation.getOutput() == null
-            ? null
-            : checkOperation.getOutput().getName());
-
-        // If the names match, then that operation
-        if ((checkName != null && checkName.equals(name))
-          && ((checkInputName != null && checkInputName.equals(inputName))
-            || (checkInputName == null && inputName == null))
-          && ((checkOutputName != null && checkOutputName.equals(outputName))
-            || (checkOutputName == null && outputName == null)))
-        {
-          op = checkOperation;
-        }
-      }
-
-      if (op == null)
-      {
-        op = def.createOperation();
-        op.setName(name);
-        portType.addOperation(op);
-      }
-
-      bindingOperation.setOperation(op);
-    }
-
-    return bindingOperation;
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/WSDLUtils.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/WSDLUtils.java
deleted file mode 100644
index f175be340..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/WSDLUtils.java
+++ /dev/null
@@ -1,384 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.wsdl;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.Definition;
-import javax.wsdl.Fault;
-import javax.wsdl.Message;
-import javax.wsdl.Operation;
-import javax.wsdl.PortType;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPBinding;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.wsdl.extensions.soap.SOAPHeader;
-import javax.wsdl.extensions.soap.SOAPHeaderFault;
-import javax.wsdl.extensions.soap.SOAPOperation;
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-
-/**
- * Set of XML related utilities.
- * 
- * @author Peter  Brittenham (peterbr@us.ibm.com)
- * @version 1.0.1
- */
-public final class WSDLUtils
-{
-
-  /**
-   * Method isRpcLiteral.
-   * @param bindingStyle a binding style.
-   * @param operation a WSDL binding operation artifact.
-   * @return true if binding is rpc literal.
-   */
-  public static boolean isRpcLiteral(
-    String bindingStyle,
-    BindingOperation operation)
-  {
-    return checkStyleAndUse(
-      WSIConstants.ATTRVAL_SOAP_BIND_STYLE_RPC,
-      WSIConstants.ATTRVAL_SOAP_BODY_USE_LIT,
-      bindingStyle,
-      operation);
-  }
-
-  /**
-   * Method isDocLiteral.
-   * @param bindingStyle  the binding style.
-   * @param operation a WSDL binding operation.
-   * @return true if binding is document literal. 
-   */
-  public static boolean isDocLiteral(
-    String bindingStyle,
-    BindingOperation operation)
-  {
-    return checkStyleAndUse(
-      WSIConstants.ATTRVAL_SOAP_BIND_STYLE_DOC,
-      WSIConstants.ATTRVAL_SOAP_BODY_USE_LIT,
-      bindingStyle,
-      operation);
-  }
-
-  /**
-   * Method checkStyleAndUse.
-   */
-  private static boolean checkStyleAndUse(
-    String checkStyle,
-    String checkUse,
-    String bindingStyle,
-    BindingOperation bindingOperation)
-  {
-    boolean styleFound = false;
-    boolean styleAndUseFound = false;
-
-    // Find the soapbind:operation element
-    SOAPOperation soapOperation = getSoapOperation(bindingOperation);
-
-    // If there are no ext elements, then check against binding style
-    if ((soapOperation == null) || (soapOperation.getStyle() == null))
-    {
-      if (checkStyle.equals(bindingStyle))
-        styleFound = true;
-    }
-
-    else
-    {
-      if (checkStyle.equals(soapOperation.getStyle()))
-        styleFound = true;
-    }
-
-    // If style found then check use
-    if (styleFound)
-    {
-      // Find the soapbind:body element
-      SOAPBody soapBody = getInputSoapBody(bindingOperation);
-
-      // If there are no soapbind:body, then check against default use value
-      if ((soapBody == null) || (soapBody.getUse() == null))
-      {
-        if (checkUse.equals(WSIConstants.ATTRVAL_SOAP_BODY_USE_LIT))
-          styleAndUseFound = true;
-      }
-
-      else
-      {
-        if (checkUse.equals(soapBody.getUse()))
-          styleAndUseFound = true;
-      }
-    }
-
-    return styleAndUseFound;
-  }
-
-  /**
-   * Get soapbind:binding.
-   * @param binding  a Binding object.
-   * @return soapbind:binding.
-   */
-  public static SOAPBinding getSoapBinding(Binding binding)
-  {
-    SOAPBinding soapBinding = null;
-
-    List extElements = null;
-
-    // Find the soapbind:operation element
-    if ((extElements = binding.getExtensibilityElements()) != null)
-    {
-      for (Iterator iterator = extElements.iterator();
-        iterator.hasNext() && (soapBinding == null);
-        )
-      {
-        Object obj = iterator.next();
-
-        if (obj instanceof SOAPBinding)
-        {
-          soapBinding = (SOAPBinding) obj;
-        }
-      }
-    }
-
-    return soapBinding;
-  }
-
-  /**
-   * Get soapbind:operation.
-   * @param bindingOperation  a BindingOperation object.
-   * @return soapbind:operation.
-   */
-  public static SOAPOperation getSoapOperation(BindingOperation bindingOperation)
-  {
-    SOAPOperation soapOperation = null;
-
-    List extElements = null;
-
-    // Find the soapbind:operation element
-    if ((extElements = bindingOperation.getExtensibilityElements()) != null)
-    {
-      for (Iterator iterator = extElements.iterator();
-        iterator.hasNext() && (soapOperation == null);
-        )
-      {
-        Object obj = iterator.next();
-
-        if (obj instanceof SOAPOperation)
-        {
-          soapOperation = (SOAPOperation) obj;
-        }
-      }
-    }
-
-    return soapOperation;
-  }
-
-  /**
-   * Get soapbind:body from input element.
-   * @param bindingOperation  the BindingOperation object.
-   * @return soapbind:body from input element.
-   */
-  public static SOAPBody getInputSoapBody(BindingOperation bindingOperation)
-  {
-    SOAPBody soapBody = null;
-
-    List extElements = null;
-
-    // Find the soapbind:body element
-    if ((extElements =
-      bindingOperation.getBindingInput().getExtensibilityElements())
-      != null)
-    {
-      for (Iterator iterator = extElements.iterator();
-        iterator.hasNext() && (soapBody == null);
-        )
-      {
-        Object obj = iterator.next();
-
-        if (obj instanceof SOAPBody)
-        {
-          soapBody = (SOAPBody) obj;
-        }
-      }
-    }
-
-    return soapBody;
-  }
-
-  /**
-   * Find messages referenced by a header or headerfault.
-   * @param definition  a Definition object.
-   * @param binding  a Binding object.
-   * @return messages referenced by a header or headerfault.
-   */
-  public static HashSet findMessages(Definition definition, Binding binding)
-  {
-    BindingOperation bindingOperation;
-
-    HashSet tempMessages, bindingMessages = new HashSet();
-
-    HashSet portTypeMessages = findMessages(binding.getPortType());
-
-    // Process each operation
-    Iterator iterator = binding.getBindingOperations().iterator();
-    while (iterator.hasNext())
-    {
-      bindingOperation = (BindingOperation) iterator.next();
-
-      // Process the input and then the output
-      if (bindingOperation.getBindingInput() != null)
-      {
-        tempMessages =
-          findMessages(
-            bindingOperation
-              .getBindingInput()
-              .getExtensibilityElements()
-              .iterator(),
-            portTypeMessages,
-            definition);
-
-        // Add messages to binding message set
-        bindingMessages.addAll(tempMessages);
-      }
-
-      // Process output
-      if (bindingOperation.getBindingOutput() != null)
-      {
-        tempMessages =
-          findMessages(
-            bindingOperation
-              .getBindingOutput()
-              .getExtensibilityElements()
-              .iterator(),
-            portTypeMessages,
-            definition);
-
-        // Add messages to binding message set
-        bindingMessages.addAll(tempMessages);
-      }
-    }
-
-    return bindingMessages;
-  }
-
-  /**
-   * Find the messages that are referenced by a header or headerfault.
-   * @param portType a PortType object.
-   * @return he messages that are referenced by a header or headerfault.
-   */
-  public static HashSet findMessages(PortType portType)
-  {
-    HashSet messageSet = new HashSet();
-    Operation operation;
-
-    Iterator iterator = portType.getOperations().iterator();
-    while (iterator.hasNext())
-    {
-      // Get next operation to process
-      operation = (Operation) iterator.next();
-
-      // Get input and output message
-      if (operation.getInput() != null)
-        messageSet.add(operation.getInput().getMessage());
-      if (operation.getOutput() != null)
-        messageSet.add(operation.getOutput().getMessage());
-
-      // Process any faults
-      Iterator faults = operation.getFaults().values().iterator();
-      while (faults.hasNext())
-      {
-        messageSet.add(((Fault) faults.next()).getMessage());
-      }
-    }
-
-    return messageSet;
-  }
-
-  /**
-   * Find the messages that are referenced by a header or headerfault.
-   * @param extElementList a list of external elements.
-   * @param messageSet a set of messages.
-   * @param definition a Definition object.
-   * @return the messages that are referenced by a header or headerfault.
-   */
-  protected static HashSet findMessages(
-    Iterator extElementList,
-    HashSet messageSet,
-    Definition definition)
-  {
-    HashSet returnSet = new HashSet();
-    ExtensibilityElement extElement;
-    Message saveMessage = null;
-
-    while (extElementList.hasNext())
-    {
-      // Get ext. element
-      extElement = (ExtensibilityElement) extElementList.next();
-
-      QName messageQName;
-      Message message;
-
-      // If this is a soap:header element, then check for message reference
-      if (extElement instanceof SOAPHeader)
-      {
-        SOAPHeader soapHeader = (SOAPHeader) extElement;
-        if ((messageQName = soapHeader.getMessage()) != null)
-        {
-          // If message not found, then create a dummy message element
-          if ((message = definition.getMessage(messageQName)) == null)
-          {
-            message = definition.createMessage();
-            message.setQName(messageQName);
-            message.setUndefined(true);
-          }
-
-          if (!messageSet.contains(message))
-          {
-            returnSet.add(message);
-            saveMessage = message;
-          }
-        }
-
-        // Process any header faults within this header
-        Iterator headerFaultList = soapHeader.getSOAPHeaderFaults().iterator();
-        while (headerFaultList.hasNext())
-        {
-          // Get soap header fault
-          SOAPHeaderFault soapHeaderFault =
-            (SOAPHeaderFault) headerFaultList.next();
-          if ((messageQName = soapHeaderFault.getMessage()) != null)
-          {
-            // If message not found, then create a dummy message element
-            if ((message = definition.getMessage(messageQName)) == null)
-            {
-              message = definition.createMessage();
-              message.setQName(messageQName);
-              message.setUndefined(true);
-            }
-
-            // If message not in message set and return set, then add it  
-            if (!messageSet.contains(message)
-              && ((saveMessage == null)
-                || (saveMessage != null
-                  && !saveMessage.getQName().equals(message.getQName()))))
-              returnSet.add(message);
-          }
-        }
-      }
-    }
-
-    return returnSet;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/traversal/VisitorAdaptor.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/traversal/VisitorAdaptor.java
deleted file mode 100644
index 8b909382a..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/traversal/VisitorAdaptor.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.wsdl.traversal;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingFault;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.BindingOutput;
-import javax.wsdl.Definition;
-import javax.wsdl.Fault;
-import javax.wsdl.Import;
-import javax.wsdl.Input;
-import javax.wsdl.Message;
-import javax.wsdl.Operation;
-import javax.wsdl.Output;
-import javax.wsdl.Part;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.Types;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPBinding;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.wsdl.extensions.soap.SOAPFault;
-import javax.wsdl.extensions.soap.SOAPHeader;
-import javax.wsdl.extensions.soap.SOAPHeaderFault;
-import javax.wsdl.extensions.soap.SOAPOperation;
-
-import org.w3c.dom.Element;
-
-/**
- * The class adapts the given object with the implemented
- * <code>WSDLVisitor</code> methods.
- * 
- * @author Kulik
- */
-public class VisitorAdaptor implements InvocationHandler
-{
-
-  // optimization hint
-  static final private Class[] visitorClass = new Class[] { WSDLVisitor.class };
-
-  /**
-   * The array is used for determination of actual javax.wsdl class
-   */
-  private static Class[] wsdl =
-    new Class[] {
-      Part.class,
-      Service.class,
-      Types.class,
-      Operation.class,
-      Input.class,
-      Output.class,
-      Fault.class,
-      Binding.class,
-      BindingOperation.class,
-      BindingInput.class,
-      BindingOutput.class,
-      BindingFault.class,
-      Import.class,
-      Element.class,
-      Message.class,
-      Port.class,
-      PortType.class,
-      Definition.class,
-      ExtensibilityElement.class,
-      SOAPBinding.class,
-      SOAPBody.class,
-      SOAPHeader.class,
-      SOAPHeaderFault.class,
-      SOAPFault.class,
-      SOAPOperation.class };
-
-  final private Object visitor;
-
-  private Map methods = new HashMap();
-
-  /**
-   * Constructor.
-   * @param o  a visitor object.
-   */
-  private VisitorAdaptor(Object o)
-  {
-    this.visitor = o;
-  }
-
-  /**
-   * Adds method to method binding.
-   * @param wsdlMethod    a WSDL method.
-   * @param targetMethod  a  target method.
-   */
-  private void addMethodBinding(Method wsdlMethod, Method targetMethod)
-  {
-    methods.put(wsdlMethod, targetMethod);
-  }
-
-  /**
-   * The method proxies all "visit(XXX)" methods to the corresponding
-   * "visit(XXX)" methods of the target visitor object. 
-   * @see java.lang.reflect.InvocationHandler#invoke(Object, Method, Object[])
-   */
-  public Object invoke(Object proxy, Method m, Object[] params)
-  {
-    try
-    {
-      Method target = (Method) methods.get(m);
-      // assert target != null
-      return target.invoke(visitor, params);
-    }
-    catch (Throwable t)
-    {
-      t.printStackTrace();
-    }
-    return null;
-  }
-
-  /**
-   * The method extract the short class name. 
-   * @param c  a class.
-   * @return the short class name.
-   */
-  static private String getName(Class c)
-  {
-    if (c != null)
-    {
-      String name = c.getName();
-      return name.substring(name.lastIndexOf(".") + 1);
-    }
-    return null;
-  }
-
-  /**
-   * The method generates proxy for the given visitor.
-   * Proxy redirects all visit(XXX) callback to the implemented in visitor
-   * object.
-   * @param visitor  a vistor object.
-   * @return a proxy for the given visitor.
-   */
-  public static WSDLTraversal adapt(Object visitor)
-  {
-    WSDLTraversal traversal = new WSDLTraversal();
-
-    if (visitor == null)
-      throw new IllegalArgumentException("Visitor object can not be NULL");
-
-    VisitorAdaptor adaptor = new VisitorAdaptor(visitor);
-
-    // check whether methods are implemented
-    // get real class of the object
-    Class c = visitor.getClass();
-    // iterates through wsdl artifacts and looking for
-    // void visit(XXX) implemented methods.  
-    for (int i = 0; i < wsdl.length; i++)
-      try
-      {
-        // if method is not found the exception will be thrown
-        Method m =
-          c.getMethod(
-            "visit",
-            new Class[] { wsdl[i], Object.class, WSDLTraversalContext.class });
-        // register binding WSDLVisitor method -> target visitor method
-        adaptor.addMethodBinding(
-          WSDLVisitor.class.getMethod(
-            "visit",
-            new Class[] { wsdl[i], Object.class, WSDLTraversalContext.class }),
-          m);
-        // register visitXXX in WSDLTraversalBuilder
-        m =
-          WSDLTraversal.class.getMethod(
-            "visit" + getName(wsdl[i]),
-            new Class[] { boolean.class });
-        m.invoke(traversal, new Object[] { Boolean.TRUE });
-      }
-      catch (Exception e)
-      {
-      }
-
-    // construct the WSDLVisitor by using java.lang.reflect.Proxy
-    ClassLoader loader = Thread.currentThread().getContextClassLoader();
-    WSDLVisitor wsdlVisitor =
-      (WSDLVisitor) Proxy.newProxyInstance(loader, visitorClass, adaptor);
-    // traverse WSDL document
-    traversal.setVisitor(wsdlVisitor);
-    return traversal;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLTraversal.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLTraversal.java
deleted file mode 100644
index 4a3569a77..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLTraversal.java
+++ /dev/null
@@ -1,3271 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.wsdl.traversal;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Vector;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingFault;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.BindingOutput;
-import javax.wsdl.Definition;
-import javax.wsdl.Fault;
-import javax.wsdl.Import;
-import javax.wsdl.Input;
-import javax.wsdl.Message;
-import javax.wsdl.Operation;
-import javax.wsdl.Output;
-import javax.wsdl.Part;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.Types;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPBinding;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.wsdl.extensions.soap.SOAPFault;
-import javax.wsdl.extensions.soap.SOAPHeader;
-import javax.wsdl.extensions.soap.SOAPHeaderFault;
-import javax.wsdl.extensions.soap.SOAPOperation;
-
-import org.w3c.dom.Element;
-
-/**
- * The class implements plain traverse over WSDL artifacts.
- * WSDLTraversal is context-driven traversal. 
- * 
- * @author Andrey Kulik
- */
-public class WSDLTraversal
-{
-
-  /**
-   * Current WSDL visitor (callback).
-   */
-  private WSDLVisitor visitor;
-
-  /**
-   * Flags which specify whether traversal will travers from one WSDL artifact
-   * to another.
-   */
-  private boolean traverseBinding2BindingOperation = true;
-  private boolean traverseBinding2Element = true;
-  private boolean traverseBinding2ExtensibilityElement = true;
-  private boolean traverseBinding2PortType = true; // reference
-  private boolean traverseBindingFault2Element = true;
-  private boolean traverseBindingFault2ExtensibilityElement = true;
-  private boolean traverseBindingInput2Element = true;
-  private boolean traverseBindingInput2ExtensibilityElement = true;
-  private boolean traverseBindingOperation2BindingFault = true;
-  private boolean traverseBindingOperation2BindingInput = true;
-  private boolean traverseBindingOperation2BindingOutput = true;
-  private boolean traverseBindingOperation2Element = true;
-  private boolean traverseBindingOperation2ExtensibilityElement = true;
-  private boolean traverseBindingOperation2Operation = true; // reference  
-  private boolean traverseBindingOutput2Element = true;
-  private boolean traverseBindingOutput2ExtensibilityElement = true;
-  private boolean traverseDefinition2Binding = true;
-  private boolean traverseDefinition2Element = true;
-  private boolean traverseDefinition2ExtensibilityElement = true;
-  private boolean traverseDefinition2Import = true;
-  private boolean traverseDefinition2Message = true;
-  private boolean traverseDefinition2PortType = true;
-  private boolean traverseDefinition2Service = true;
-  private boolean traverseDefinition2Types = true;
-  private boolean traverseFault2Element = true;
-  private boolean traverseFault2Message = true; // reference 
-  private boolean traverseImport2Definition = true;
-  private boolean traverseImport2Element = true;
-  private boolean traverseInput2Element = true;
-  private boolean traverseInput2Message = true; // reference 
-  private boolean traverseMessage2Element = true;
-  private boolean traverseMessage2Part = true;
-  private boolean traverseOperation2Element = true;
-  private boolean traverseOperation2Fault = true;
-  private boolean traverseOperation2Input = true;
-  private boolean traverseOperation2Output = true;
-  private boolean traverseOutput2Element = true;
-  private boolean traverseOutput2Message = true; // reference 
-  private boolean traversePart2Element = true;
-  private boolean traversePort2Binding = true; // reference 
-  private boolean traversePort2Element = true;
-  private boolean traversePort2ExtensibilityElement = true;
-  private boolean traversePortType2Element = true;
-  private boolean traversePortType2Operation = true;
-  private boolean traverseService2Element = true;
-  private boolean traverseService2ExtensibilityElement = true;
-  private boolean traverseService2Port = true;
-  private boolean traverseTypes2Element = true;
-  private boolean traverseTypes2ExtensibilityElement = true;
-  //private boolean traverseSOAPBody2Part = true;
-  private boolean traverseSOAPHeader2SOAPHeaderFault = true;
-  private boolean traverseBinding2SOAPBinding = true;
-  private boolean traverseBindingOperation2SOAPOperation = true;
-  private boolean traverseBindingInput2SOAPHeader = true;
-  private boolean traverseBindingInput2SOAPBody = true;
-  private boolean traverseBindingOutput2SOAPHeader = true;
-  private boolean traverseBindingOutput2SOAPBody = true;
-  private boolean traverseBindingFault2SOAPFault = true;
-
-  /**
-   * Flags which specify whether traversal will visit corresponding WSDL
-   * artifact.
-   */
-  private boolean visitBinding = false;
-  private boolean visitBindingFault = false;
-  private boolean visitBindingInput = false;
-  private boolean visitBindingOperation = false;
-  private boolean visitBindingOutput = false;
-  private boolean visitDefinition = false;
-  private boolean visitElement = false;
-  private boolean visitExtensibilityElement = false;
-  private boolean visitFault = false;
-  private boolean visitImport = false;
-  private boolean visitInput = false;
-  private boolean visitMessage = false;
-  private boolean visitOperation = false;
-  private boolean visitOutput = false;
-  private boolean visitPart = false;
-  private boolean visitPort = false;
-  private boolean visitPortType = false;
-  private boolean visitService = false;
-  private boolean visitTypes = false;
-  private boolean visitSOAPBinding = false;
-  private boolean visitSOAPBody = false;
-  private boolean visitSOAPFault = false;
-  private boolean visitSOAPHeader = false;
-  private boolean visitSOAPHeaderFault = false;
-  private boolean visitSOAPOperation = false;
-
-  /**
-   * Default constructor.
-   * @see java.lang.Object#Object()
-   */
-  public WSDLTraversal()
-  {
-  }
-
-  /**
-   * The method specifies that traversal will ignore indirect references between
-   * WSDL artifacts. For example:
-   * <ol>
-   *   <li>binding to port type</li>
-   *   <li>binding operation to operation</li>
-   *   <li>fault to message</li>
-   *   <li>input to message</li>
-   *   <li>output to message</li>
-   *   <li>port to binding</li>
-   * </ol>
-   */
-  public void ignoreReferences()
-  {
-    ignoreBinding2PortType();
-    ignoreBindingOperation2Operation();
-    ignoreFault2Message();
-    ignoreInput2Message();
-    ignoreOutput2Message();
-    ignorePort2Binding();
-    //ignoreSOAPBody2Part();
-  }
-
-  /**
-   * The method sets visitor.
-   * @param visitor  a WSDL visitor.
-   */
-  public void setVisitor(WSDLVisitor visitor)
-  {
-    this.visitor = visitor;
-  }
-
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return the traversal.
-   */
-  public WSDLTraversal ignoreBinding2SOAPBinding()
-  {
-    traverseBinding2SOAPBinding = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBindingOperation2SOAPOperation()
-  {
-    traverseBindingOperation2SOAPOperation = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBindingInput2SOAPHeader()
-  {
-    traverseBindingInput2SOAPHeader = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBindingInput2SOAPBody()
-  {
-    traverseBindingInput2SOAPBody = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBindingOutput2SOAPHeader()
-  {
-    traverseBindingOutput2SOAPHeader = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBindingOutput2SOAPBody()
-  {
-    traverseBindingOutput2SOAPBody = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBindingFault2SOAPFault()
-  {
-    traverseBindingFault2SOAPFault = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreSOAPHeader2SOAPHeaderFault()
-  {
-    traverseSOAPHeader2SOAPHeaderFault = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBinding2BindingOperation()
-  {
-    traverseBinding2BindingOperation = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBinding2Element()
-  {
-    traverseBinding2Element = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBinding2ExtensibilityElement()
-  {
-    traverseBinding2ExtensibilityElement = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBinding2PortType()
-  {
-    traverseBinding2PortType = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBindingFault2Element()
-  {
-    traverseBindingFault2Element = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBindingFault2ExtensibilityElement()
-  {
-    traverseBindingFault2ExtensibilityElement = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBindingInput2Element()
-  {
-    traverseBindingInput2Element = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBindingInput2ExtensibilityElement()
-  {
-    traverseBindingInput2ExtensibilityElement = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBindingOperation2BindingFault()
-  {
-    traverseBindingOperation2BindingFault = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBindingOperation2BindingInput()
-  {
-    traverseBindingOperation2BindingInput = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBindingOperation2BindingOutput()
-  {
-    traverseBindingOperation2BindingOutput = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBindingOperation2Element()
-  {
-    traverseBindingOperation2Element = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBindingOperation2ExtensibilityElement()
-  {
-    traverseBindingOperation2ExtensibilityElement = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBindingOperation2Operation()
-  {
-    traverseBindingOperation2Operation = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBindingOutput2Element()
-  {
-    traverseBindingOutput2Element = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBindingOutput2ExtensibilityElement()
-  {
-    traverseBindingOutput2ExtensibilityElement = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreDefinition2Binding()
-  {
-    traverseDefinition2Binding = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreDefinition2Element()
-  {
-    traverseDefinition2Element = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreDefinition2ExtensibilityElement()
-  {
-    traverseDefinition2ExtensibilityElement = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreDefinition2Import()
-  {
-    traverseDefinition2Import = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreDefinition2Message()
-  {
-    traverseDefinition2Message = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreDefinition2PortType()
-  {
-    traverseDefinition2PortType = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreDefinition2Service()
-  {
-    traverseDefinition2Service = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreDefinition2Types()
-  {
-    traverseDefinition2Types = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreFault2Element()
-  {
-    traverseFault2Element = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreFault2Message()
-  {
-    traverseFault2Message = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreImport2Definition()
-  {
-    traverseImport2Definition = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreImport2Element()
-  {
-    traverseImport2Element = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreInput2Element()
-  {
-    traverseInput2Element = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreInput2Message()
-  {
-    traverseInput2Message = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreMessage2Element()
-  {
-    traverseMessage2Element = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreMessage2Part()
-  {
-    traverseMessage2Part = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreOperation2Element()
-  {
-    traverseOperation2Element = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreOperation2Fault()
-  {
-    traverseOperation2Fault = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreOperation2Input()
-  {
-    traverseOperation2Input = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreOperation2Output()
-  {
-    traverseOperation2Output = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreOutput2Element()
-  {
-    traverseOutput2Element = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreOutput2Message()
-  {
-    traverseOutput2Message = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignorePart2Element()
-  {
-    traversePart2Element = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignorePort2Binding()
-  {
-    traversePort2Binding = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignorePort2Element()
-  {
-    traversePort2Element = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignorePort2ExtensibilityElement()
-  {
-    traversePort2ExtensibilityElement = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignorePortType2Element()
-  {
-    traversePortType2Element = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignorePortType2Operation()
-  {
-    traversePortType2Operation = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreService2Element()
-  {
-    traverseService2Element = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreService2ExtensibilityElement()
-  {
-    traverseService2ExtensibilityElement = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreService2Port()
-  {
-    traverseService2Port = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreTypes2Element()
-  {
-    traverseTypes2Element = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements...
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreTypes2ExtensibilityElement()
-  {
-    traverseTypes2ExtensibilityElement = false;
-    return this;
-  }
-
-  /**
-   * Instructs traversal to visit or not the corresponding WSDL element.
-   * @param value true if the WSDL element should be visited, otherwise - false.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal visitSOAPBinding(boolean value)
-  {
-    visitSOAPBinding = value;
-    return this;
-  }
-  /**
-   * Instructs traversal to visit or not the corresponding WSDL element.
-   * @param value true if the WSDL element should be visited, otherwise - false.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal visitSOAPBody(boolean value)
-  {
-    visitSOAPBody = value;
-    return this;
-  }
-  /**
-   * Instructs traversal to visit or not the corresponding WSDL element.
-   * @param value true if the WSDL element should be visited, otherwise - false.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal visitSOAPFault(boolean value)
-  {
-    visitSOAPFault = value;
-    return this;
-  }
-  /**
-   * Instructs traversal to visit or not the corresponding WSDL element.
-   * @param value true if the WSDL element should be visited, otherwise - false.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal visitSOAPHeader(boolean value)
-  {
-    visitSOAPHeader = value;
-    return this;
-  }
-  /**
-   * Instructs traversal to visit or not the corresponding WSDL element.
-   * @param value true if the WSDL element should be visited, otherwise - false.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal visitSOAPHeaderFault(boolean value)
-  {
-    visitSOAPHeaderFault = value;
-    return this;
-  }
-  /**
-   * Instructs traversal to visit or not the corresponding WSDL element.
-   * @param value true if the WSDL element should be visited, otherwise - false.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal visitSOAPOperation(boolean value)
-  {
-    visitSOAPOperation = value;
-    return this;
-  }
-  /**
-   * Instructs traversal to visit or not the corresponding WSDL element.
-   * @param value true if the WSDL element should be visited, otherwise - false.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal visitBinding(boolean value)
-  {
-    visitBinding = value;
-    return this;
-  }
-  /**
-   * Instructs traversal to visit or not the corresponding WSDL element.
-   * @param value true if the WSDL element should be visited, otherwise - false.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal visitBindingFault(boolean value)
-  {
-    visitBindingFault = value;
-    return this;
-  }
-  /**
-   * Instructs traversal to visit or not the corresponding WSDL element.
-   * @param value true if the WSDL element should be visited, otherwise - false.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal visitBindingInput(boolean value)
-  {
-    visitBindingInput = value;
-    return this;
-  }
-  /**
-   * Instructs traversal to visit or not the corresponding WSDL element.
-   * @param value true if the WSDL element should be visited, otherwise - false.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal visitBindingOperation(boolean value)
-  {
-    visitBindingOperation = value;
-    return this;
-  }
-  /**
-   * Instructs traversal to visit or not the corresponding WSDL element.
-   * @param value true if the WSDL element should be visited, otherwise - false.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal visitBindingOutput(boolean value)
-  {
-    visitBindingOutput = value;
-    return this;
-  }
-  /**
-   * Instructs traversal to visit or not the corresponding WSDL element.
-   * @param value true if the WSDL element should be visited, otherwise - false.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal visitDefinition(boolean value)
-  {
-    visitDefinition = value;
-    return this;
-  }
-  /**
-   * Instructs traversal to visit or not the corresponding WSDL element.
-   * @param value true if the WSDL element should be visited, otherwise - false.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal visitElement(boolean value)
-  {
-    visitElement = value;
-    return this;
-  }
-  /**
-   * Instructs traversal to visit or not the corresponding WSDL element.
-   * @param value true if the WSDL element should be visited, otherwise - false.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal visitExtensibilityElement(boolean value)
-  {
-    visitExtensibilityElement = value;
-    return this;
-  }
-  /**
-   * Instructs traversal to visit or not the corresponding WSDL element.
-   * @param value true if the WSDL element should be visited, otherwise - false.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal visitFault(boolean value)
-  {
-    visitFault = value;
-    return this;
-  }
-  /**
-   * Instructs traversal to visit or not the corresponding WSDL element.
-   * @param value true if the WSDL element should be visited, otherwise - false.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal visitImport(boolean value)
-  {
-    visitImport = value;
-    return this;
-  }
-  /**
-   * Instructs traversal to visit or not the corresponding WSDL element.
-   * @param value true if the WSDL element should be visited, otherwise - false.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal visitInput(boolean value)
-  {
-    visitInput = value;
-    return this;
-  }
-  /**
-   * Instructs traversal to visit or not the corresponding WSDL element.
-   * @param value true if the WSDL element should be visited, otherwise - false.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal visitMessage(boolean value)
-  {
-    visitMessage = value;
-    return this;
-  }
-  /**
-   * Instructs traversal to visit or not the corresponding WSDL element.
-   * @param value true if the WSDL element should be visited, otherwise - false.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal visitOperation(boolean value)
-  {
-    visitOperation = value;
-    return this;
-  }
-  /**
-   * Instructs traversal to visit or not the corresponding WSDL element.
-   * @param value true if the WSDL element should be visited, otherwise - false.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal visitOutput(boolean value)
-  {
-    visitOutput = value;
-    return this;
-  }
-  /**
-   * Instructs traversal to visit or not the corresponding WSDL element.
-   * @param value true if the WSDL element should be visited, otherwise - false.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal visitPart(boolean value)
-  {
-    visitPart = value;
-    return this;
-  }
-  /**
-   * Instructs traversal to visit or not the corresponding WSDL element.
-   * @param value true if the WSDL element should be visited, otherwise - false.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal visitPort(boolean value)
-  {
-    visitPort = value;
-    return this;
-  }
-  /**
-   * Instructs traversal to visit or not the corresponding WSDL element.
-   * @param value true if the WSDL element should be visited, otherwise - false.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal visitPortType(boolean value)
-  {
-    visitPortType = value;
-    return this;
-  }
-  /**
-   * Instructs traversal to visit or not the corresponding WSDL element.
-   * @param value true if the WSDL element should be visited, otherwise - false.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal visitService(boolean value)
-  {
-    visitService = value;
-    return this;
-  }
-  /**
-   * Instructs traversal to visit or not the corresponding WSDL element.
-   * @param value true if the WSDL element should be visited, otherwise - false.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal visitTypes(boolean value)
-  {
-    visitTypes = value;
-    return this;
-  }
-
-  /**
-   * Instructs traversal to ignore all references to the corresponding WSDL
-   * element.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBinding()
-  {
-    traverseDefinition2Binding = false;
-    traversePort2Binding = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore all references to the corresponding WSDL
-   * element.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBindingFault()
-  {
-    traverseBindingOperation2BindingFault = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore all references to the corresponding WSDL
-   * element.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBindingInput()
-  {
-    traverseBindingOperation2BindingInput = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore all references to the corresponding WSDL
-   * element.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBindingOperation()
-  {
-    traverseBinding2BindingOperation = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore all references to the corresponding WSDL
-   * element.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBindingOutput()
-  {
-    traverseBindingOperation2BindingOutput = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore all references to the corresponding WSDL
-   * element.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreDefinition()
-  {
-    traverseImport2Definition = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore all references to the corresponding WSDL
-   * element.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreElement()
-  {
-    traverseBinding2Element = false;
-    traverseBindingFault2Element = false;
-    traverseBindingInput2Element = false;
-    traverseBindingOperation2Element = false;
-    traverseBindingOutput2Element = false;
-    traverseDefinition2Element = false;
-    traversePort2Element = false;
-    traverseService2Element = false;
-    traverseFault2Element = false;
-    traverseOutput2Element = false;
-    traverseImport2Element = false;
-    traverseInput2Element = false;
-    traverseOperation2Element = false;
-    traverseMessage2Element = false;
-    traversePart2Element = false;
-    traversePortType2Element = false;
-    traverseTypes2Element = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore all references to the corresponding WSDL
-   * element.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreExtensibilityElement()
-  {
-    traverseService2ExtensibilityElement = false;
-    traversePort2ExtensibilityElement = false;
-    traverseDefinition2ExtensibilityElement = false;
-    traverseBindingOutput2ExtensibilityElement = false;
-    traverseBinding2ExtensibilityElement = false;
-    traverseBindingFault2ExtensibilityElement = false;
-    traverseBindingInput2ExtensibilityElement = false;
-    traverseBindingOperation2ExtensibilityElement = false;
-    traverseTypes2ExtensibilityElement = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore all references to the corresponding WSDL
-   * element.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreSOAPBinding()
-  {
-    traverseBinding2SOAPBinding = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore all references to the corresponding WSDL
-   * element.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreSOAPOperation()
-  {
-    traverseBindingOperation2SOAPOperation = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore all references to the corresponding WSDL
-   * element.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreSOAPBody()
-  {
-    traverseBindingInput2SOAPBody = false;
-    traverseBindingOutput2SOAPBody = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore all references to the corresponding WSDL
-   * element.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreSOAPHeader()
-  {
-    traverseBindingInput2SOAPHeader = false;
-    traverseBindingOutput2SOAPHeader = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore all references to the corresponding WSDL
-   * element.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreSOAPHeaderFault()
-  {
-    traverseSOAPHeader2SOAPHeaderFault = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore all references to the corresponding WSDL
-   * element.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreSOAPFault()
-  {
-    traverseBindingFault2SOAPFault = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore all references to the corresponding WSDL
-   * element.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreFault()
-  {
-    traverseOperation2Fault = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore all references to the corresponding WSDL
-   * element.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreImport()
-  {
-    traverseImport2Definition = false; // fix
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore all references to the corresponding WSDL
-   * element.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreInput()
-  {
-    traverseOperation2Input = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore all references to the corresponding WSDL
-   * element.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreMessage()
-  {
-    traverseFault2Message = false;
-    traverseDefinition2Message = false;
-    traverseInput2Message = false;
-    traverseOutput2Message = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore all references to the corresponding WSDL
-   * element.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreOperation()
-  {
-    traverseBindingOperation2Operation = false;
-    traversePortType2Operation = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore all references to the corresponding WSDL
-   * element.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreOutput()
-  {
-    traverseOperation2Output = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore all references to the corresponding WSDL
-   * element.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignorePart()
-  {
-    traverseMessage2Part = false;
-    //traverseSOAPBody2Part = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore all references to the corresponding WSDL
-   * element.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignorePort()
-  {
-    traverseService2Port = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore all references to the corresponding WSDL
-   * element.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignorePortType()
-  {
-    traverseBinding2PortType = false;
-    traverseDefinition2PortType = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore all references to the corresponding WSDL
-   * element.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreService()
-  {
-    traverseDefinition2Service = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore all references to the corresponding WSDL
-   * element.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreTypes()
-  {
-    traverseDefinition2Types = false;
-    return this;
-  }
-
-  /**
-   * The method adjusts traveseXXX variables according to the visitXXX variables
-   */
-  private void adjust()
-  {
-    adjustPart();
-    adjustService();
-    adjustTypes();
-    adjustOperation();
-    adjustInput();
-    adjustOutput();
-    adjustFault();
-    adjustBinding();
-    adjustBindingOperation();
-    adjustBindingInput();
-    adjustBindingOutput();
-    adjustBindingFault();
-    adjustImport();
-    adjustElement();
-    adjustMessage();
-    adjustPort();
-    adjustPortType();
-    adjustDefinition();
-    adjustExtensibilityElement();
-    adjustSOAPBinding();
-    adjustSOAPBody();
-    adjustSOAPHeader();
-    adjustSOAPHeaderFault();
-    adjustSOAPFault();
-    adjustSOAPOperation();
-  }
-
-  /**
-   * The method adjusts traversal ignore flags according to the
-   * corresponding visit flags.
-   * @return boolean 
-   */
-  private boolean adjustExtensibilityElement()
-  {
-    boolean value = visitExtensibilityElement;
-    if (!value)
-      ignoreExtensibilityElement();
-    return value;
-  }
-  /**
-   * The method adjusts traversal ignore flags according to the
-   * corresponding visit flags.
-   * @return boolean 
-   */
-  private boolean adjustPart()
-  {
-    boolean value = visitPart || (traversePart2Element && adjustElement());
-    if (!value)
-      ignorePart();
-    return value;
-  }
-  /**
-   * The method adjusts traversal ignore flags according to the
-   * corresponding visit flags.
-   * @return boolean 
-   */
-  private boolean adjustSOAPHeader()
-  {
-    boolean value =
-      visitSOAPHeader
-        || (traverseSOAPHeader2SOAPHeaderFault && adjustSOAPHeaderFault());
-    if (!value)
-      ignoreSOAPHeader();
-    return value;
-  }
-  /**
-   * The method adjusts traversal ignore flags according to the
-   * corresponding visit flags.
-   * @return boolean 
-   */
-  private boolean adjustBindingOutput()
-  {
-    boolean value =
-      visitBindingOutput
-        || (traverseBindingOutput2Element && adjustElement())
-        || (traverseBindingOutput2ExtensibilityElement
-          && adjustExtensibilityElement())
-        || (traverseBindingOutput2SOAPBody
-          && adjustSOAPBody()
-          || (traverseBindingOutput2SOAPHeader && adjustSOAPHeader()));
-    if (!value)
-      ignoreBindingOutput();
-    return value;
-  }
-  /**
-   * The method adjusts traversal ignore flags according to the
-   * corresponding visit flags.
-   * @return boolean 
-   */
-  private boolean adjustElement()
-  {
-    boolean value = visitElement;
-    if (!value)
-      ignoreElement();
-    return value;
-  }
-  /**
-   * The method adjusts traversal ignore flags according to the
-   * corresponding visit flags.
-   * @return boolean 
-   */
-  private boolean adjustTypes()
-  {
-    boolean value =
-      visitTypes
-        || (traverseTypes2Element && adjustElement())
-        || (traverseTypes2ExtensibilityElement && adjustExtensibilityElement());
-    if (!value)
-      ignoreTypes();
-    return value;
-  }
-  /**
-   * The method adjusts traversal ignore flags according to the
-   * corresponding visit flags.
-   * @return boolean 
-   */
-  private boolean adjustSOAPBinding()
-  {
-    boolean value = visitSOAPBinding;
-    if (!value)
-      ignoreSOAPBinding();
-    return value;
-  }
-  /**
-   * The method adjusts traversal ignore flags according to the
-   * corresponding visit flags.
-   * @return boolean 
-   */
-  private boolean adjustPort()
-  {
-    boolean value =
-      visitPort
-        || (traversePort2Element && adjustElement())
-        || (traversePort2ExtensibilityElement && adjustExtensibilityElement())
-        || (traversePort2Binding && adjustBinding());
-    if (!value)
-      ignorePort();
-    return value;
-  }
-  /**
-   * The method adjusts traversal ignore flags according to the
-   * corresponding visit flags.
-   * @return boolean 
-   */
-  private boolean adjustOperation()
-  {
-    boolean value =
-      visitOperation
-        || (traverseOperation2Element && adjustElement())
-        || (traverseOperation2Input && adjustInput())
-        || (traverseOperation2Output && adjustOutput())
-        || (traverseOperation2Fault && adjustFault());
-    if (!value)
-      ignoreOperation();
-    return value;
-  }
-  /**
-   * The method adjusts traversal ignore flags according to the
-   * corresponding visit flags.
-   * @return boolean 
-   */
-  private boolean adjustBindingOperation()
-  {
-    boolean value =
-      visitBindingOperation
-        || (traverseBindingOperation2Element && adjustElement())
-        || (traverseBindingOperation2BindingFault && adjustBindingFault())
-        || (traverseBindingOperation2BindingOutput && adjustBindingOutput())
-        || (traverseBindingOperation2Operation && adjustOperation())
-        || (traverseBindingOperation2BindingInput && adjustBindingInput())
-        || (traverseBindingOperation2ExtensibilityElement
-          && adjustExtensibilityElement())
-        || (traverseBindingOperation2SOAPOperation && adjustSOAPOperation());
-    if (!value)
-      ignoreBindingOperation();
-    return value;
-  }
-  /**
-   * The method adjusts traversal ignore flags according to the
-   * corresponding visit flags.
-   * @return boolean 
-   */
-  private boolean adjustInput()
-  {
-    boolean value =
-      visitInput
-        || (traverseInput2Element && adjustElement())
-        || (traverseInput2Message && adjustMessage());
-    if (!value)
-      ignoreInput();
-    return value;
-  }
-  /**
-   * The method adjusts traversal ignore flags according to the
-   * corresponding visit flags.
-   * @return boolean 
-   */
-  private boolean adjustBinding()
-  {
-    boolean value =
-      visitBinding
-        || (traverseBinding2Element && adjustElement())
-        || (traverseBinding2BindingOperation && adjustBindingOperation())
-        || (traverseBinding2ExtensibilityElement && adjustExtensibilityElement())
-        || (traverseBinding2PortType && adjustPortType())
-        || (traverseBinding2SOAPBinding && adjustSOAPBinding());
-    if (!value)
-      ignoreBinding();
-    return value;
-  }
-  /**
-   * The method adjusts traversal ignore flags according to the
-   * corresponding visit flags.
-   * @return boolean 
-   */
-  private boolean adjustSOAPBody()
-  {
-    boolean value = visitSOAPBody;
-    /* || 
-    		(traverseSOAPBody2Part && adjustPart());*/
-    if (!value)
-      ignoreSOAPBody();
-    return value;
-  }
-  /**
-   * The method adjusts traversal ignore flags according to the
-   * corresponding visit flags.
-   * @return boolean 
-   */
-  private boolean adjustSOAPHeaderFault()
-  {
-    boolean value = visitSOAPHeaderFault;
-    if (!value)
-      ignoreSOAPHeaderFault();
-    return value;
-  }
-  /**
-   * The method adjusts traversal ignore flags according to the
-   * corresponding visit flags.
-   * @return boolean 
-   */
-  private boolean adjustBindingInput()
-  {
-    boolean value =
-      visitBindingInput
-        || (traverseBindingInput2Element && adjustElement())
-        || (traverseBindingInput2ExtensibilityElement
-          && adjustExtensibilityElement())
-        || (traverseBindingInput2SOAPBody
-          && adjustSOAPBody()
-          || (traverseBindingInput2SOAPHeader && adjustSOAPHeader()));
-    if (!value)
-      ignoreBindingInput();
-    return value;
-  }
-  /**
-   * The method adjusts traversal ignore flags according to the
-   * corresponding visit flags.
-   * @return boolean 
-   */
-  private boolean adjustOutput()
-  {
-    boolean value =
-      visitOutput
-        || (traverseOutput2Element && adjustElement())
-        || (traverseOutput2Message && adjustMessage());
-    if (!value)
-      ignoreOutput();
-    return value;
-  }
-  /**
-   * The method adjusts traversal ignore flags according to the
-   * corresponding visit flags.
-   * @return boolean 
-   */
-  private boolean adjustBindingFault()
-  {
-    boolean value =
-      visitBindingFault
-        || (traverseBindingFault2Element && adjustElement())
-        || (traverseBindingFault2ExtensibilityElement
-          && adjustExtensibilityElement())
-        || (traverseBindingFault2SOAPFault && adjustSOAPFault());
-    if (!value)
-      ignoreBindingFault();
-    return value;
-  }
-  /**
-   * The method adjusts traversal ignore flags according to the
-   * corresponding visit flags.
-   * @return boolean 
-   */
-  private boolean adjustSOAPOperation()
-  {
-    boolean value = visitSOAPOperation;
-    if (!value)
-      ignoreSOAPOperation();
-    return value;
-  }
-  /**
-   * The method adjusts traversal ignore flags according to the
-   * corresponding visit flags.
-   * @return boolean 
-   */
-  private boolean adjustDefinition()
-  {
-    boolean value =
-      visitDefinition
-        || (traverseDefinition2Element && adjustElement())
-        || (traverseDefinition2Import && adjustImport())
-        || (traverseDefinition2Types && adjustTypes())
-        || (traverseDefinition2Message && adjustMessage())
-        || (traverseDefinition2ExtensibilityElement
-          && adjustExtensibilityElement())
-        || (traverseDefinition2PortType && adjustPortType())
-        || (traverseDefinition2Binding && adjustBinding())
-        || (traverseDefinition2Service && adjustService());
-    if (!value)
-      ignoreDefinition();
-    return value;
-  }
-  /**
-   * The method adjusts traversal ignore flags according to the
-   * corresponding visit flags.
-   * @return boolean 
-   */
-  private boolean adjustSOAPFault()
-  {
-    boolean value = visitSOAPFault;
-    if (!value)
-      ignoreSOAPFault();
-    return value;
-  }
-  /**
-   * The method adjusts traversal ignore flags according to the
-   * corresponding visit flags.
-   * @return boolean 
-   */
-  private boolean adjustImport()
-  {
-    boolean value = visitImport || (traverseImport2Definition
-    /* && adjustDefinition()*/
-      )
-    || // avoid cycling problem. Thus, you should call ignoreImport manually  
-   (traverseImport2Element && adjustElement());
-    if (!value)
-      ignoreImport();
-    return value;
-  }
-  /**
-   * The method adjusts traversal ignore flags according to the
-   * corresponding visit flags.
-   * @return boolean 
-   */
-  private boolean adjustFault()
-  {
-    boolean value =
-      visitFault
-        || (traverseFault2Element && adjustElement())
-        || (traverseFault2Message && adjustMessage());
-    if (!value)
-      ignoreFault();
-    return value;
-  }
-  /**
-   * The method adjusts traversal ignore flags according to the
-   * corresponding visit flags.
-   * @return boolean 
-   */
-  private boolean adjustPortType()
-  {
-    boolean value =
-      visitPortType
-        || (traversePortType2Element && adjustElement())
-        || (traversePortType2Operation && adjustOperation());
-    if (!value)
-      ignorePortType();
-    return value;
-  }
-  /**
-   * The method adjusts traversal ignore flags according to the
-   * corresponding visit flags.
-   * @return boolean 
-   */
-  private boolean adjustService()
-  {
-    boolean value =
-      visitService
-        || (traverseService2Element && adjustElement())
-        || (traverseService2ExtensibilityElement && adjustExtensibilityElement())
-        || (traverseService2Port && adjustPort());
-    if (!value)
-      ignoreService();
-    return value;
-  }
-  /**
-   * The method adjusts traversal ignore flags according to the
-   * corresponding visit flags.
-   * @return boolean 
-   */
-  private boolean adjustMessage()
-  {
-    boolean value =
-      visitMessage
-        || (traverseMessage2Element && adjustElement())
-        || (traverseMessage2Part && adjustPart());
-    if (!value)
-      ignoreMessage();
-    return value;
-  }
-
-  /**
-   * The method traverses given WSDL extensibility element according to the 
-   * settings in the traversal context.
-   * 
-   * @param objExtensibilityElement  a WSDL extensibility element artifact.
-   * @param parent                   parent of the WSDL extensibility element artifact.
-   * @param ctx                      the traversal contex.
-   */
-  private void traverse(
-    ExtensibilityElement objExtensibilityElement,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    ctx.resumeExtensibilityElementProcessing();
-    ctx.setExtensibilityElement(objExtensibilityElement);
-    if (visitExtensibilityElement)
-      visitor.visit(objExtensibilityElement, parent, ctx);
-  }
-
-  /**
-   * The method traverses given WSDL part artifact according to the settings in
-   * the traversal context.
-   * 
-   * @param objPart  the WSDL part artifact.
-   * @param parent   parent of the WSDL part artifact.
-   * @param ctx      the traversal contex.
-   */
-  private void traverse(Part objPart, Object parent, WSDLTraversalContext ctx)
-  {
-    ctx.resumePartProcessing();
-    ctx.setPart(objPart);
-    if (visitPart)
-    {
-      visitor.visit(objPart, parent, ctx);
-      if (!ctx.processPart())
-        return;
-    }
-    if (objPart == null)
-      return;
-    if (traversePart2Element)
-      traverse(objPart.getDocumentationElement(), objPart, ctx);
-  }
-
-  /**
-   * The method traverses given WSDL SOAP header artifact according to the 
-   * settings in the traversal context.
-   * 
-   * @param objSOAPHeader  a WSDL SOAP header artifact.
-   * @param parent         parent of the WSDL SOAP header artifact.
-   * @param ctx            the traversal contex.
-   */
-  private void traverse(
-    SOAPHeader objSOAPHeader,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    ctx.resumeSOAPHeaderProcessing();
-    ctx.setSOAPHeader(objSOAPHeader);
-    if (visitSOAPHeader)
-    {
-      visitor.visit(objSOAPHeader, parent, ctx);
-      if (!ctx.processSOAPHeader())
-        return;
-    }
-    if (objSOAPHeader == null)
-      return;
-    if (traverseSOAPHeader2SOAPHeaderFault
-      && objSOAPHeader.getSOAPHeaderFaults() != null)
-    {
-      Iterator it = objSOAPHeader.getSOAPHeaderFaults().iterator();
-      while (it.hasNext())
-      {
-        traverse((SOAPHeaderFault) it.next(), objSOAPHeader, ctx);
-        if (!ctx.processSOAPHeader())
-          return;
-      }
-    }
-  }
-
-  /**
-   * The method traverses given WSDL element artifact according to the settings in
-   * the traversal context.
-   * 
-   * @param objElement  a WSDL element artifact.
-   * @param parent   parent of the WSDL element artifact.
-   * @param ctx      the traversal contex.
-   */
-  private void traverse(
-    Element objElement,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    ctx.setElement(objElement);
-    if (visitElement)
-      visitor.visit(objElement, parent, ctx);
-  }
-
-  /**
-   * The method traverses given WSDL types artifact according to the settings in
-   * the traversal context.
-   * 
-   * @param objTypes  a WSDL types artifact.
-   * @param parent    parent of the WSDL types artifact.
-   * @param ctx       the traversal contex.
-   */
-  private void traverse(
-    Types objTypes,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    ctx.resumeTypesProcessing();
-    ctx.setTypes(objTypes);
-    if (visitTypes)
-    {
-      visitor.visit(objTypes, parent, ctx);
-      if (!ctx.processTypes())
-        return;
-    }
-    if (objTypes == null)
-      return;
-    if (traverseTypes2Element)
-    {
-      traverse(objTypes.getDocumentationElement(), objTypes, ctx);
-      if (!ctx.processTypes())
-        return;
-    }
-    if (traverseTypes2ExtensibilityElement
-      && objTypes.getExtensibilityElements() != null)
-    {
-      Iterator it = objTypes.getExtensibilityElements().iterator();
-      while (it.hasNext())
-      {
-        traverse((ExtensibilityElement) it.next(), objTypes, ctx);
-        if (!ctx.processTypes())
-          return;
-      }
-    }
-  }
-
-  /**
-   * The method traverses given WSDL SOAP binding artifact according to the 
-   * settings in the traversal context.
-   * 
-   * @param objSOAPBinding  a WSDL SOAP binding artifact.
-   * @param parent          parent of the WSDL SOAP binding artifact.
-   * @param ctx             the traversal contex.
-   */
-  private void traverse(
-    SOAPBinding objSOAPBinding,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    ctx.setSOAPBinding(objSOAPBinding);
-    if (visitSOAPBinding)
-      visitor.visit(objSOAPBinding, parent, ctx);
-  }
-
-  /**
-   * The method traverses given WSDL definition artifact according to the 
-   * settings in the traversal context.
-   * 
-   * @param objDefinition  a WSDL definition artifact.
-   * @param parent         parent of the WSDL definition artifact.
-   * @param ctx            the traversal contex.
-   */
-  private void traverse(
-    Definition objDefinition,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    ctx.resumeDefinitionProcessing();
-    ctx.setDefinition(objDefinition);
-    if (visitDefinition)
-    {
-      visitor.visit(objDefinition, parent, ctx);
-      if (!ctx.processDefinition())
-        return;
-    }
-    if (objDefinition == null)
-      return;
-    if (traverseDefinition2Import && objDefinition.getImports() != null)
-    {
-      Iterator it = objDefinition.getImports().values().iterator();
-      while (it.hasNext())
-      {
-        Vector v = (Vector) it.next();
-        if (v != null)
-        {
-          Iterator it2 = v.iterator();
-          while (it2.hasNext())
-          {
-            traverse((Import) it2.next(), objDefinition, ctx);
-            if (!ctx.processDefinition())
-              return;
-          }
-        }
-      }
-    }
-    if (traverseDefinition2Element)
-    {
-      traverse(objDefinition.getDocumentationElement(), objDefinition, ctx);
-      if (!ctx.processDefinition())
-        return;
-    }
-    if (traverseDefinition2Types)
-    {
-      traverse(objDefinition.getTypes(), objDefinition, ctx);
-      if (!ctx.processDefinition())
-        return;
-    }
-    if (traverseDefinition2Message && objDefinition.getMessages() != null)
-    {
-      Iterator it = objDefinition.getMessages().values().iterator();
-      while (it.hasNext())
-      {
-        traverse((Message) it.next(), objDefinition, ctx);
-        if (!ctx.processDefinition())
-          return;
-      }
-    }
-    if (traverseDefinition2PortType && objDefinition.getPortTypes() != null)
-    {
-      Iterator it = objDefinition.getPortTypes().values().iterator();
-      while (it.hasNext())
-      {
-        traverse((PortType) it.next(), objDefinition, ctx);
-        if (!ctx.processDefinition())
-          return;
-      }
-    }
-    if (traverseDefinition2Binding && objDefinition.getBindings() != null)
-    {
-      Iterator it = objDefinition.getBindings().values().iterator();
-      while (it.hasNext())
-      {
-        traverse((Binding) it.next(), objDefinition, ctx);
-        if (!ctx.processDefinition())
-          return;
-      }
-    }
-    if (traverseDefinition2Service && objDefinition.getServices() != null)
-    {
-      Iterator it = objDefinition.getServices().values().iterator();
-      while (it.hasNext())
-      {
-        traverse((Service) it.next(), objDefinition, ctx);
-        if (!ctx.processDefinition())
-          return;
-      }
-    }
-    if (traverseDefinition2ExtensibilityElement
-      && objDefinition.getExtensibilityElements() != null)
-    {
-      Iterator it = objDefinition.getExtensibilityElements().iterator();
-      while (it.hasNext())
-      {
-        traverse((ExtensibilityElement) it.next(), objDefinition, ctx);
-        if (!ctx.processDefinition())
-          return;
-      }
-    }
-  }
-
-  /**
-   * The method traverses given WSDL port artifact according to the settings in
-   * the traversal context.
-   * 
-   * @param objPort  a WSDL port artifact.
-   * @param parent   parent of the WSDL port artifact.
-   * @param ctx      the traversal contex.
-   */
-  private void traverse(Port objPort, Object parent, WSDLTraversalContext ctx)
-  {
-    ctx.resumePortProcessing();
-    ctx.setPort(objPort);
-    if (visitPort)
-    {
-      visitor.visit(objPort, parent, ctx);
-      if (!ctx.processPort())
-        return;
-    }
-    if (objPort == null)
-      return;
-    if (traversePort2Element)
-    {
-      traverse(objPort.getDocumentationElement(), objPort, ctx);
-      if (!ctx.processPort())
-        return;
-    }
-    if (traversePort2Binding)
-    {
-      traverse(objPort.getBinding(), objPort, ctx);
-      if (!ctx.processPort())
-        return;
-    }
-    if (traversePort2ExtensibilityElement
-      && objPort.getExtensibilityElements() != null)
-    {
-      Iterator it = objPort.getExtensibilityElements().iterator();
-      while (it.hasNext())
-      {
-        traverse((ExtensibilityElement) it.next(), objPort, ctx);
-        if (!ctx.processPort())
-          return;
-      }
-    }
-  }
-
-  /**
-   * The method traverses given WSDL operation artifact according to the settings in
-   * the traversal context.
-   * 
-   * @param objOperation  a WSDL operation artifact.
-   * @param parent        parent of the WSDL operation artifactt.
-   * @param ctx           the traversal contex.
-   */
-  private void traverse(
-    Operation objOperation,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    ctx.resumeOperationProcessing();
-    ctx.setOperation(objOperation);
-    if (visitOperation)
-    {
-      visitor.visit(objOperation, parent, ctx);
-      if (!ctx.processOperation())
-        return;
-    }
-    if (objOperation == null)
-      return;
-    if (traverseOperation2Element)
-    {
-      traverse(objOperation.getDocumentationElement(), objOperation, ctx);
-      if (!ctx.processOperation())
-        return;
-    }
-    if (traverseOperation2Input)
-    {
-      traverse(objOperation.getInput(), objOperation, ctx);
-      if (!ctx.processOperation())
-        return;
-    }
-    if (traverseOperation2Output)
-    {
-      traverse(objOperation.getOutput(), objOperation, ctx);
-      if (!ctx.processOperation())
-        return;
-    }
-    if (traverseOperation2Fault && objOperation.getFaults() != null)
-    {
-      Iterator it = objOperation.getFaults().values().iterator();
-      while (it.hasNext())
-      {
-        traverse((Fault) it.next(), objOperation, ctx);
-        if (!ctx.processOperation())
-          return;
-      }
-    }
-  }
-
-  /**
-   * The method traverses given WSDL input artifact according to the settings in
-   * the traversal context.
-   * 
-   * @param objInput  a WSDL input artifact.
-   * @param parent    parent of the WSDL input artifact.
-   * @param ctx       the traversal contex.
-   */
-  private void traverse(
-    Input objInput,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    ctx.resumeInputProcessing();
-    ctx.setInput(objInput);
-    if (visitInput)
-    {
-      visitor.visit(objInput, parent, ctx);
-      if (!ctx.processInput())
-        return;
-    }
-    if (objInput == null)
-      return;
-    if (traverseInput2Element)
-    {
-      traverse(objInput.getDocumentationElement(), objInput, ctx);
-      if (!ctx.processInput())
-        return;
-    }
-    if (traverseInput2Message)
-      traverse(objInput.getMessage(), objInput, ctx);
-  }
-
-  /**
-   * The method traverses given WSDL SOAP body artifact according to the 
-   * settings in the traversal context.
-   * 
-   * @param objSOAPBody  a WSDL SOAP body artifact.
-   * @param parent       parent of the WSDL SOAP body artifact.
-   * @param ctx          the traversal contex.
-   */
-  private void traverse(
-    SOAPBody objSOAPBody,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    //  	ctx.resumeSOAPBodyProcessing();
-    ctx.setSOAPBody(objSOAPBody);
-    if (visitSOAPBody)
-      //	{
-      visitor.visit(objSOAPBody, parent, ctx);
-    /*	  if (!ctx.processSOAPBody())
-    		return;
-    	}
-    	if (objSOAPBody == null)
-    		return;
-    	if (traverseSOAPBody2Part && objSOAPBody.getParts() != null) {
-    	  if (ctx)
-    	  Iterator it = objSOAPBody.getParts().iterator();
-    	  while (it.hasNext()) {
-    	  	
-    		traverse((Part)it.next(), objSOAPBody, ctx);
-    		if (!ctx.processSOAPBody())
-    		  return;
-    	  }
-    	}
-    */
-  }
-
-  /**
-   * The method traverses given WSDL SOAP header fault artifact according to 
-   * the settings in the traversal context.
-   * 
-   * @param objSOAPHeaderFault  a WSDL SOAP header fault artifact.
-   * @param parent              parent of the WSDL SOAP header fault artifact.
-   * @param ctx                 the traversal contex.
-   */
-  private void traverse(
-    SOAPHeaderFault objSOAPHeaderFault,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    ctx.setSOAPHeaderFault(objSOAPHeaderFault);
-    if (visitSOAPHeaderFault)
-      visitor.visit(objSOAPHeaderFault, parent, ctx);
-  }
-
-  /**
-   * The method traverses given WSDL output artifact according to the settings in
-   * the traversal context.
-   * 
-   * @param objOutput  a WSDL output artifact.
-   * @param parent   parent of the WSDL output artifact.
-   * @param ctx      the traversal contex.
-   * @param parent
-   * @param ctx
-   */
-  private void traverse(
-    Output objOutput,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    ctx.resumeOutputProcessing();
-    ctx.setOutput(objOutput);
-    if (visitOutput)
-    {
-      visitor.visit(objOutput, parent, ctx);
-      if (!ctx.processOutput())
-        return;
-    }
-    if (objOutput == null)
-      return;
-    if (traverseOutput2Element)
-    {
-      traverse(objOutput.getDocumentationElement(), objOutput, ctx);
-      if (!ctx.processOutput())
-        return;
-    }
-    if (traverseOutput2Message)
-      traverse(objOutput.getMessage(), objOutput, ctx);
-  }
-
-  /**
-   * The method traverses given WSDL binding fault artifact according to the 
-   * settings in the traversal context.
-   * 
-   * @param objBindingFault  a WSDL binding fault artifact.
-   * @param parent           parent of the WSDL binding fault artifact.
-   * @param ctx              the traversal contex.
-   */
-  private void traverse(
-    BindingFault objBindingFault,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    ctx.resumeBindingFaultProcessing();
-    ctx.setBindingFault(objBindingFault);
-    if (visitBindingFault)
-    {
-      visitor.visit(objBindingFault, parent, ctx);
-      if (!ctx.processBindingFault())
-        return;
-    }
-    if (objBindingFault == null)
-      return;
-    if (traverseBindingFault2Element)
-    {
-      traverse(objBindingFault.getDocumentationElement(), objBindingFault, ctx);
-      if (!ctx.processBindingFault())
-        return;
-    }
-    if (traverseBindingFault2SOAPFault
-      && objBindingFault.getExtensibilityElements() != null)
-    {
-      Iterator it = objBindingFault.getExtensibilityElements().iterator();
-      while (it.hasNext())
-      {
-        Object o = it.next();
-        if (o instanceof SOAPFault)
-          traverse((SOAPFault) o, objBindingFault, ctx);
-        if (!ctx.processBindingFault())
-          return;
-      }
-    }
-    if (traverseBindingFault2ExtensibilityElement
-      && objBindingFault.getExtensibilityElements() != null)
-    {
-      Iterator it = objBindingFault.getExtensibilityElements().iterator();
-      while (it.hasNext())
-      {
-        traverse((ExtensibilityElement) it.next(), objBindingFault, ctx);
-        if (!ctx.processBindingFault())
-          return;
-      }
-    }
-  }
-
-  /**
-   * The method traverses given WSDL SOAP operation artifact according to 
-   * the settings in the traversal context.
-   * 
-   * @param objSOAPOperation  a WSDL SOAP operation artifact.
-   * @param parent            parent of the WSDL SOAP operation artifact.
-   * @param ctx               the traversal contex.
-   */
-  private void traverse(
-    SOAPOperation objSOAPOperation,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    ctx.setSOAPOperation(objSOAPOperation);
-    if (visitSOAPOperation)
-      visitor.visit(objSOAPOperation, parent, ctx);
-  }
-
-  /**
-   * The method traverses given WSDL binding input artifact according to 
-   * the settings in the traversal context.
-   * 
-   * @param objBindingInput  a WSDL binding input artifact.
-   * @param parent           parent of the WSDL binding input artifact.
-   * @param ctx              the traversal contex.
-   */
-  private void traverse(
-    BindingInput objBindingInput,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    ctx.resumeBindingInputProcessing();
-    ctx.setBindingInput(objBindingInput);
-    if (visitBindingInput)
-    {
-      visitor.visit(objBindingInput, parent, ctx);
-      if (!ctx.processBindingInput())
-        return;
-    }
-    if (objBindingInput == null)
-      return;
-    if (traverseBindingInput2Element)
-    {
-      traverse(objBindingInput.getDocumentationElement(), objBindingInput, ctx);
-      if (!ctx.processBindingInput())
-        return;
-    }
-    if ((traverseBindingInput2SOAPBody || traverseBindingInput2SOAPHeader)
-      && objBindingInput.getExtensibilityElements() != null)
-    {
-      Iterator it = objBindingInput.getExtensibilityElements().iterator();
-      while (it.hasNext())
-      {
-        Object o = it.next();
-        if (traverseBindingInput2SOAPBody && (o instanceof SOAPBody))
-          traverse((SOAPBody) o, objBindingInput, ctx);
-        else if (traverseBindingInput2SOAPHeader && (o instanceof SOAPHeader))
-          traverse((SOAPHeader) o, objBindingInput, ctx);
-        if (!ctx.processBindingInput())
-          return;
-      }
-    }
-    if (traverseBindingInput2ExtensibilityElement
-      && objBindingInput.getExtensibilityElements() != null)
-    {
-      Iterator it = objBindingInput.getExtensibilityElements().iterator();
-      while (it.hasNext())
-      {
-        traverse((ExtensibilityElement) it.next(), objBindingInput, ctx);
-        if (!ctx.processBindingInput())
-          return;
-      }
-    }
-  }
-
-  /**
-   * The method traverses given WSDL binding operation artifact according to 
-   * the settings in the traversal context.
-   * 
-   * @param objBindingOperation  a WSDL binding operation artifact.
-   * @param parent               parent of the WSDL binding operation artifact.
-   * @param ctx                  the traversal contex.
-   */
-  private void traverse(
-    BindingOperation objBindingOperation,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    ctx.resumeBindingOperationProcessing();
-    ctx.setBindingOperation(objBindingOperation);
-    if (visitBindingOperation)
-    {
-      visitor.visit(objBindingOperation, parent, ctx);
-      if (!ctx.processBindingOperation())
-        return;
-    }
-    if (objBindingOperation == null)
-      return;
-    if (traverseBindingOperation2Element)
-    {
-      traverse(
-        objBindingOperation.getDocumentationElement(),
-        objBindingOperation,
-        ctx);
-      if (!ctx.processBindingOperation())
-        return;
-    }
-    if (traverseBindingOperation2SOAPOperation
-      && objBindingOperation.getExtensibilityElements() != null)
-    {
-      Iterator it = objBindingOperation.getExtensibilityElements().iterator();
-      while (it.hasNext())
-      {
-        Object o = it.next();
-        if (o instanceof SOAPOperation)
-          traverse((SOAPOperation) o, objBindingOperation, ctx);
-        if (!ctx.processBindingOperation())
-          return;
-      }
-    }
-    if (traverseBindingOperation2ExtensibilityElement
-      && objBindingOperation.getExtensibilityElements() != null)
-    {
-      Iterator it = objBindingOperation.getExtensibilityElements().iterator();
-      while (it.hasNext())
-      {
-        traverse((ExtensibilityElement) it.next(), objBindingOperation, ctx);
-        if (!ctx.processBindingOperation())
-          return;
-      }
-    }
-    if (traverseBindingOperation2Operation)
-    {
-      traverse(objBindingOperation.getOperation(), objBindingOperation, ctx);
-      if (!ctx.processBindingOperation())
-        return;
-    }
-    if (traverseBindingOperation2BindingInput)
-    {
-      traverse(objBindingOperation.getBindingInput(), objBindingOperation, ctx);
-      if (!ctx.processBindingOperation())
-        return;
-    }
-    if (traverseBindingOperation2BindingOutput)
-    {
-      traverse(
-        objBindingOperation.getBindingOutput(),
-        objBindingOperation,
-        ctx);
-      if (!ctx.processBindingOperation())
-        return;
-    }
-    if (traverseBindingOperation2BindingFault
-      && objBindingOperation.getBindingFaults() != null)
-    {
-      Iterator it = objBindingOperation.getBindingFaults().values().iterator();
-      while (it.hasNext())
-      {
-        traverse((BindingFault) it.next(), objBindingOperation, ctx);
-        if (!ctx.processBindingOperation())
-          return;
-      }
-    }
-  }
-
-  /**
-   * The method traverses given WSDL SOAP fault artifact according to the 
-   * settings in the traversal context.
-   * 
-   * @param objSOAPFault  a WSDL SOAP fault artifact.
-   * @param parent        parent of the WSDL SOAP fault artifact.
-   * @param ctx           the traversal contex.
-   */
-  private void traverse(
-    SOAPFault objSOAPFault,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    ctx.setSOAPFault(objSOAPFault);
-    if (visitSOAPFault)
-      visitor.visit(objSOAPFault, parent, ctx);
-  }
-
-  /**
-   * The method traverses given WSDL binding artifact according to the settings in
-   * the traversal context.
-   * 
-   * @param objBinding  a WSDL binding artifact.
-   * @param parent      parent of the WSDL binding artifact.
-   * @param ctx         the traversal contex.
-   */
-  private void traverse(
-    Binding objBinding,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    ctx.resumeBindingProcessing();
-    ctx.setBinding(objBinding);
-    if (visitBinding)
-    {
-      visitor.visit(objBinding, parent, ctx);
-      if (!ctx.processBinding())
-        return;
-    }
-    if (objBinding == null)
-      return;
-    if (traverseBinding2Element)
-    {
-      traverse(objBinding.getDocumentationElement(), objBinding, ctx);
-      if (!ctx.processBinding())
-        return;
-    }
-    if (traverseBinding2SOAPBinding
-      && objBinding.getExtensibilityElements() != null)
-    {
-      Iterator it = objBinding.getExtensibilityElements().iterator();
-      while (it.hasNext())
-      {
-        Object o = it.next();
-        if (o instanceof SOAPBinding)
-          traverse((SOAPBinding) o, objBinding, ctx);
-        if (!ctx.processBinding())
-          return;
-      }
-    }
-    if (traverseBinding2PortType)
-    {
-      traverse(objBinding.getPortType(), objBinding, ctx);
-      if (!ctx.processBinding())
-        return;
-    }
-    if (traverseBinding2BindingOperation
-      && objBinding.getBindingOperations() != null)
-    {
-      Iterator it = objBinding.getBindingOperations().iterator();
-      while (it.hasNext())
-      {
-        traverse((BindingOperation) it.next(), objBinding, ctx);
-        if (!ctx.processBinding())
-          return;
-      }
-    }
-    if (traverseBinding2ExtensibilityElement
-      && objBinding.getExtensibilityElements() != null)
-    {
-      Iterator it = objBinding.getExtensibilityElements().iterator();
-      while (it.hasNext())
-      {
-        traverse((ExtensibilityElement) it.next(), objBinding, ctx);
-        if (!ctx.processBinding())
-          return;
-      }
-    }
-  }
-
-  /**
-   * The method traverses given WSDL fault artifact according to the settings in
-   * the traversal context.
-   * 
-   * @param objFault  a WSDL fault artifact.
-   * @param parent    parent of the WSDL fault artifact.
-   * @param ctx       the traversal contex.
-   */
-  private void traverse(
-    Fault objFault,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    ctx.resumeFaultProcessing();
-    ctx.setFault(objFault);
-    if (visitFault)
-    {
-      visitor.visit(objFault, parent, ctx);
-      if (!ctx.processFault())
-        return;
-    }
-    if (objFault == null)
-      return;
-    if (traverseFault2Element)
-    {
-      traverse(objFault.getDocumentationElement(), objFault, ctx);
-      if (!ctx.processFault())
-        return;
-    }
-    if (traverseFault2Message)
-      traverse(objFault.getMessage(), objFault, ctx);
-  }
-
-  /**
-   * The method traverses given WSDL service artifact according to the settings in
-   * the traversal context.
-   * 
-   * @param objService  a WSDL service artifact.
-   * @param parent      parent of the WSDL service artifact.
-   * @param ctx         the traversal contex.
-   */
-  private void traverse(
-    Service objService,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    ctx.resumeServiceProcessing();
-    ctx.setService(objService);
-    if (visitService)
-    {
-      visitor.visit(objService, parent, ctx);
-      if (!ctx.processService())
-        return;
-    }
-    if (objService == null)
-      return;
-    if (traverseService2Element)
-    {
-      traverse(objService.getDocumentationElement(), objService, ctx);
-      if (!ctx.processService())
-        return;
-    }
-    if (traverseService2ExtensibilityElement
-      && objService.getExtensibilityElements() != null)
-    {
-      Iterator it = objService.getExtensibilityElements().iterator();
-      while (it.hasNext())
-      {
-        traverse((ExtensibilityElement) it.next(), objService, ctx);
-        if (!ctx.processService())
-          return;
-      }
-    }
-    if (traverseService2Port && objService.getPorts() != null)
-    {
-      Iterator it = objService.getPorts().values().iterator();
-      while (it.hasNext())
-      {
-        traverse((Port) it.next(), objService, ctx);
-        if (!ctx.processService())
-          return;
-      }
-    }
-  }
-
-  /**
-   * The method traverses given WSDL import artifact according to the settings in
-   * the traversal context.
-   * 
-   * @param objImport  a WSDL import artifact.
-   * @param parent     parent of the WSDL import artifact.
-   * @param ctx        the traversal contex.
-   */
-  private void traverse(
-    Import objImport,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    ctx.resumeImportProcessing();
-    ctx.setImport(objImport);
-    if (visitImport)
-    {
-      visitor.visit(objImport, parent, ctx);
-      if (!ctx.processImport())
-        return;
-    }
-    if (objImport == null)
-      return;
-    if (traverseImport2Element)
-    {
-      traverse(objImport.getDocumentationElement(), objImport, ctx);
-      if (!ctx.processImport())
-        return;
-    }
-    if (traverseImport2Definition)
-      traverse(objImport.getDefinition(), objImport, ctx);
-  }
-
-  /**
-   * The method traverses given WSDL binding output artifact according to the 
-   * settings in the traversal context.
-   * 
-   * @param objBindingOutput  a WSDL binding output artifact.
-   * @param parent            parent of the WSDL binding output artifact.
-   * @param ctx               the traversal contex.
-   */
-  private void traverse(
-    BindingOutput objBindingOutput,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    ctx.resumeBindingOutputProcessing();
-    ctx.setBindingOutput(objBindingOutput);
-    if (visitBindingOutput)
-    {
-      visitor.visit(objBindingOutput, parent, ctx);
-      if (!ctx.processBindingOutput())
-        return;
-    }
-    if (objBindingOutput == null)
-      return;
-    if (traverseBindingOutput2Element)
-    {
-      traverse(
-        objBindingOutput.getDocumentationElement(),
-        objBindingOutput,
-        ctx);
-      if (!ctx.processBindingOutput())
-        return;
-    }
-    if ((traverseBindingOutput2SOAPBody || traverseBindingOutput2SOAPHeader)
-      && objBindingOutput.getExtensibilityElements() != null)
-    {
-      Iterator it = objBindingOutput.getExtensibilityElements().iterator();
-      while (it.hasNext())
-      {
-        Object o = it.next();
-        if (traverseBindingOutput2SOAPBody && (o instanceof SOAPBody))
-          traverse((SOAPBody) o, objBindingOutput, ctx);
-        else if (traverseBindingOutput2SOAPHeader && (o instanceof SOAPHeader))
-          traverse((SOAPHeader) o, objBindingOutput, ctx);
-        if (!ctx.processBindingOutput())
-          return;
-      }
-    }
-    if (traverseBindingOutput2ExtensibilityElement
-      && objBindingOutput.getExtensibilityElements() != null)
-    {
-      Iterator it = objBindingOutput.getExtensibilityElements().iterator();
-      while (it.hasNext())
-      {
-        traverse((ExtensibilityElement) it.next(), objBindingOutput, ctx);
-        if (!ctx.processBindingOutput())
-          return;
-      }
-    }
-  }
-
-  /**
-   * The method traverses given WSDL port type artifact according to the settings in
-   * the traversal context.
-   * 
-   * @param objPortType  a WSDL port type artifact.
-   * @param parent       parent of the WSDL port type.
-   * @param ctx          the traversal contex.
-   */
-  private void traverse(
-    PortType objPortType,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    ctx.resumePortTypeProcessing();
-    ctx.setPortType(objPortType);
-    if (visitPortType)
-    {
-      visitor.visit(objPortType, parent, ctx);
-      if (!ctx.processPortType())
-        return;
-    }
-    if (objPortType == null)
-      return;
-    if (traversePortType2Element)
-    {
-      traverse(objPortType.getDocumentationElement(), objPortType, ctx);
-      if (!ctx.processPortType())
-        return;
-    }
-    if (traversePortType2Operation && objPortType.getOperations() != null)
-    {
-      Iterator it = objPortType.getOperations().iterator();
-      while (it.hasNext())
-      {
-        traverse((Operation) it.next(), objPortType, ctx);
-        if (!ctx.processPortType())
-          return;
-      }
-    }
-  }
-
-  /**
-   * The method traverses given WSDL message artifact according to the settings in
-   * the traversal context.
-   * 
-   * @param objMessage  a WSDL message.
-   * @param parent      parent of the WSDL message.
-   * @param ctx         the traversal contex.
-   */
-  private void traverse(
-    Message objMessage,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    ctx.resumeMessageProcessing();
-    ctx.setMessage(objMessage);
-    if (visitMessage)
-    {
-      visitor.visit(objMessage, parent, ctx);
-      if (!ctx.processMessage())
-        return;
-    }
-    if (objMessage == null)
-      return;
-    if (traverseMessage2Element)
-    {
-      traverse(objMessage.getDocumentationElement(), objMessage, ctx);
-      if (!ctx.processMessage())
-        return;
-    }
-    if (traverseMessage2Part && objMessage.getParts() != null)
-    {
-      Iterator it = objMessage.getParts().values().iterator();
-      while (it.hasNext())
-      {
-        traverse((Part) it.next(), objMessage, ctx);
-        if (!ctx.processMessage())
-          return;
-      }
-    }
-  }
-
-  /**
-   * The method traverses given WSDL part artifact according to the settings.
-   * @param a  a WSDL part artifact.
-   */
-  public void traverse(Part a)
-  {
-    adjust();
-    traverse(a, null, new WSDLTraversalContext(this));
-  }
-  /**
-   * The method traverses given WSDL service artifact according to the settings.
-   * @param a  a WSDL service artifact.
-   */
-  public void traverse(Service a)
-  {
-    adjust();
-    traverse(a, null, new WSDLTraversalContext(this));
-  }
-  /**
-   * The method traverses given WSDL types artifact according to the settings.
-   * @param a WSDL types artifact.
-   */
-  public void traverse(Types a)
-  {
-    adjust();
-    traverse(a, null, new WSDLTraversalContext(this));
-  }
-  /**
-   * The method traverses given WSDL operation artifact according to the settings.
-   * @param a  a WSDL operation artifact.
-   */
-  public void traverse(Operation a)
-  {
-    adjust();
-    traverse(a, null, new WSDLTraversalContext(this));
-  }
-  /**
-   * The method traverses given WSDL input artifact according to the settings.
-   * @param a  a WSDL input artifact.
-   */
-  public void traverse(Input a)
-  {
-    adjust();
-    traverse(a, null, new WSDLTraversalContext(this));
-  }
-  /**
-   * The method traverses given WSDL output artifact according to the settings.
-   * @param a  a WSDL output artifact.
-   */
-  public void traverse(Output a)
-  {
-    adjust();
-    traverse(a, null, new WSDLTraversalContext(this));
-  }
-  /**
-   * The method traverses given WSDL fault artifact according to the settings.
-   * @param a  a WSDL fault artifact.
-   */
-  public void traverse(Fault a)
-  {
-    adjust();
-    traverse(a, null, new WSDLTraversalContext(this));
-  }
-  /**
-   * The method traverses given WSDL binding artifact according to the settings.
-   * @param a  a WSDL binding artifact.
-   */
-  public void traverse(Binding a)
-  {
-    adjust();
-    traverse(a, null, new WSDLTraversalContext(this));
-  }
-  /**
-   * The method traverses given WSDL binding operation artifact according to the 
-   * settings.
-   * @param a  a WSDL binding operation artifact.
-   */
-  public void traverse(BindingOperation a)
-  {
-    adjust();
-    traverse(a, null, new WSDLTraversalContext(this));
-  }
-  /**
-   * The method traverses given WSDL binding input artifact according to 
-   * the settings.
-   * @param a  a WSDL binding input artifact.
-   */
-  public void traverse(BindingInput a)
-  {
-    adjust();
-    traverse(a, null, new WSDLTraversalContext(this));
-  }
-  /**
-   * The method traverses given WSDL binding output artifact according to 
-   * the settings.
-   * @param a  a WSDL binding output artifact.
-   */
-  public void traverse(BindingOutput a)
-  {
-    adjust();
-    traverse(a, null, new WSDLTraversalContext(this));
-  }
-  /**
-   * The method traverses given WSDL binding fault artifact according to 
-   * the settings.
-   * @param a   a WSDL binding fault artifact.
-   */
-  public void traverse(BindingFault a)
-  {
-    adjust();
-    traverse(a, null, new WSDLTraversalContext(this));
-  }
-  /**
-   * The method traverses given WSDL import artifact according to the settings.
-   * @param a  a WSDL import artifact.
-   */
-  public void traverse(Import a)
-  {
-    adjust();
-    traverse(a, null, new WSDLTraversalContext(this));
-  }
-  /**
-   * The method traverses given WSDL element artifact according to the settings.
-   * @param a  a WSDL element artifact.
-   */
-  public void traverse(Element a)
-  {
-    adjust();
-    traverse(a, null, new WSDLTraversalContext(this));
-  }
-  /**
-   * The method traverses given WSDL message artifact according to the settings.
-   * @param a  a WSDL message artifact.
-   */
-  public void traverse(Message a)
-  {
-    adjust();
-    traverse(a, null, new WSDLTraversalContext(this));
-  }
-  /**
-   * The method traverses given WSDL port artifact according to the settings.
-   * @param a  a WSDL port artifact.
-   */
-  public void traverse(Port a)
-  {
-    adjust();
-    traverse(a, null, new WSDLTraversalContext(this));
-  }
-  /**
-   * The method traverses given WSDL port type artifact according to the settings.
-   * @param a  a WSDL port type artifact.
-   */
-  public void traverse(PortType a)
-  {
-    adjust();
-    traverse(a, null, new WSDLTraversalContext(this));
-  }
-  /**
-   * The method traverses given WSDL definition artifact according to the settings.
-   * @param a  a WSDL definition artifact.
-   */
-  public void traverse(Definition a)
-  {
-    adjust();
-    traverse(a, null, new WSDLTraversalContext(this));
-  }
-  /**
-   * The method traverses given WSDL extensibility elment artifact according 
-   * to the settings.
-   * @param a  a WSDL extensibility element artifact.
-   */
-  public void traverse(ExtensibilityElement a)
-  {
-    adjust();
-    traverse(a, null, new WSDLTraversalContext(this));
-  }
-  /**
-   * The method traverses given WSDL SOAP binding artifact according to 
-   * the settings.
-   * @param a  a WSDL SOAP binding artifact.
-   */
-  public void traverse(SOAPBinding a)
-  {
-    adjust();
-    traverse(a, null, new WSDLTraversalContext(this));
-  }
-  /**
-   * The method traverses given WSDL SOAP body artifact according to the settings.
-   * @param a  a WSDL SOAP body artifact.
-   */
-  public void traverse(SOAPBody a)
-  {
-    adjust();
-    traverse(a, null, new WSDLTraversalContext(this));
-  }
-  /**
-   * The method traverses given WSDL SOAP header artifact according to the settings.
-   * @param a  a WSDL SOAP header artifact.
-   */
-  public void traverse(SOAPHeader a)
-  {
-    adjust();
-    traverse(a, null, new WSDLTraversalContext(this));
-  }
-  /**
-   * The method traverses given WSDL SOAP header fault artifact according to 
-   * the settings.
-   * @param a  a WSDL SOAP header fault artifact.
-   */
-  public void traverse(SOAPHeaderFault a)
-  {
-    adjust();
-    traverse(a, null, new WSDLTraversalContext(this));
-  }
-  /**
-   * The method traverses given WSDL SOAP fault artifact according to the settings.
-   * @param a  a WSDL SOAP fault artifact.
-   */
-  public void traverse(SOAPFault a)
-  {
-    adjust();
-    traverse(a, null, new WSDLTraversalContext(this));
-  }
-  /**
-   * The method traverses given WSDL SOAP operation artifact according to 
-   * the settings.
-   * @param a  a WSDL SOAP operation artifact.
-   */
-  public void traverse(SOAPOperation a)
-  {
-    adjust();
-    traverse(a, null, new WSDLTraversalContext(this));
-  }
-
-  /**
-   * The method traverses given WSDL part artifact according to the settings.
-   * @param a       a WSDL part artifact.
-   * @param params  a Map object representing settings.  
-   */
-  public void traverse(Part a, Map params)
-  {
-    adjust();
-    WSDLTraversalContext ctx = new WSDLTraversalContext(this);
-    if (params != null)
-      ctx.params.putAll(params);
-    traverse(a, null, ctx);
-  }
-  /**
-   * The method traverses given WSDL service artifact according to the settings.
-   * @param a       a WSDL service artifact.
-   * @param params  a Map object representing settings.  
-   */
-  public void traverse(Service a, Map params)
-  {
-    adjust();
-    WSDLTraversalContext ctx = new WSDLTraversalContext(this);
-    if (params != null)
-      ctx.params.putAll(params);
-    traverse(a, null, ctx);
-  }
-  /**
-   * The method traverses given WSDL types artifact according to the settings.
-   * @param a       a WSDL types artifact.
-   * @param params  a Map object representing settings.  
-   */
-  public void traverse(Types a, Map params)
-  {
-    adjust();
-    WSDLTraversalContext ctx = new WSDLTraversalContext(this);
-    if (params != null)
-      ctx.params.putAll(params);
-    traverse(a, null, ctx);
-  }
-  /**
-   * The method traverses given WSDL operation artifact according to the settings.
-   * @param a       a WSDL operation artifact.
-   * @param params  a Map object representing settings.  
-   */
-  public void traverse(Operation a, Map params)
-  {
-    adjust();
-    WSDLTraversalContext ctx = new WSDLTraversalContext(this);
-    if (params != null)
-      ctx.params.putAll(params);
-    traverse(a, null, ctx);
-  }
-  /**
-   * The method traverses given WSDL input artifact according to the settings.
-   * @param a       a WSDL input artifact.
-   * @param params  a Map object representing settings.  
-   */
-  public void traverse(Input a, Map params)
-  {
-    adjust();
-    WSDLTraversalContext ctx = new WSDLTraversalContext(this);
-    if (params != null)
-      ctx.params.putAll(params);
-    traverse(a, null, ctx);
-  }
-  /**
-   * The method traverses given WSDL output artifact according to the settings.
-   * @param a       a WSDL output artifact.
-   * @param params  a Map object representing settings.  
-   */
-  public void traverse(Output a, Map params)
-  {
-    adjust();
-    WSDLTraversalContext ctx = new WSDLTraversalContext(this);
-    if (params != null)
-      ctx.params.putAll(params);
-    traverse(a, null, ctx);
-  }
-  /**
-   * The method traverses given WSDL fault artifact according to the settings.
-   * @param a       a WSDL fault artifact.
-   * @param params  a Map object representing settings.  
-   */
-  public void traverse(Fault a, Map params)
-  {
-    adjust();
-    WSDLTraversalContext ctx = new WSDLTraversalContext(this);
-    if (params != null)
-      ctx.params.putAll(params);
-    traverse(a, null, ctx);
-  }
-  /**
-   * The method traverses given WSDL binding artifact according to the settings.
-   * @param a       a WSDL binding artifact.
-   * @param params  a Map object representing settings.  
-   */
-  public void traverse(Binding a, Map params)
-  {
-    adjust();
-    WSDLTraversalContext ctx = new WSDLTraversalContext(this);
-    if (params != null)
-      ctx.params.putAll(params);
-    traverse(a, null, ctx);
-  }
-  /**
-   * The method traverses given WSDL binding operation artifact according 
-   * to the settings.
-   * @param a       a WSDL binding operation artifact.
-   * @param params  a Map object representing settings.  
-   */
-  public void traverse(BindingOperation a, Map params)
-  {
-    adjust();
-    WSDLTraversalContext ctx = new WSDLTraversalContext(this);
-    if (params != null)
-      ctx.params.putAll(params);
-    traverse(a, null, ctx);
-  }
-  /**
-   * The method traverses given WSDL binding input artifact according 
-   * to the settings.
-   * @param a       a WSDL binding input artifact.
-   * @param params  a Map object representing settings.  
-   */
-  public void traverse(BindingInput a, Map params)
-  {
-    adjust();
-    WSDLTraversalContext ctx = new WSDLTraversalContext(this);
-    if (params != null)
-      ctx.params.putAll(params);
-    traverse(a, null, ctx);
-  }
-  /**
-   * The method traverses given WSDL binding output artifact according to 
-   * the settings.
-   * @param a       a WSDL binding output artifact.
-   * @param params  a Map object representing settings.  
-   */
-  public void traverse(BindingOutput a, Map params)
-  {
-    adjust();
-    WSDLTraversalContext ctx = new WSDLTraversalContext(this);
-    if (params != null)
-      ctx.params.putAll(params);
-    traverse(a, null, ctx);
-  }
-  /**
-   * The method traverses given WSDL binding fault artifact according to 
-   * the settings.
-   * @param a       a WSDL binding fault artifact.
-   * @param params  a Map object representing settings.   
-   */
-  public void traverse(BindingFault a, Map params)
-  {
-    adjust();
-    WSDLTraversalContext ctx = new WSDLTraversalContext(this);
-    if (params != null)
-      ctx.params.putAll(params);
-    traverse(a, null, ctx);
-  }
-  /**
-   * The method traverses given WSDL import artifact according to the settings.
-   * @param a       a WSDL import artifact.
-   * @param params  a Map object representing settings.   
-   */
-  public void traverse(Import a, Map params)
-  {
-    adjust();
-    WSDLTraversalContext ctx = new WSDLTraversalContext(this);
-    if (params != null)
-      ctx.params.putAll(params);
-    traverse(a, null, ctx);
-  }
-  /**
-   * The method traverses given WSDL element artifact according to the settings.
-   * @param a       a WSDL element artifact.
-   * @param params  a Map object representing settings.   
-   */
-  public void traverse(Element a, Map params)
-  {
-    adjust();
-    WSDLTraversalContext ctx = new WSDLTraversalContext(this);
-    if (params != null)
-      ctx.params.putAll(params);
-    traverse(a, null, ctx);
-  }
-  /**
-   * The method traverses given WSDL message artifact according to the settings.
-   * @param a       a WSDL message.
-   * @param params  a Map object representing settings.   
-   */
-  public void traverse(Message a, Map params)
-  {
-    adjust();
-    WSDLTraversalContext ctx = new WSDLTraversalContext(this);
-    if (params != null)
-      ctx.params.putAll(params);
-    traverse(a, null, ctx);
-  }
-  /**
-   * The method traverses given WSDL port artifact according to the settings.
-   * @param a       a WSDL port.
-   * @param params  a Map object representing settings.   
-   */
-  public void traverse(Port a, Map params)
-  {
-    adjust();
-    WSDLTraversalContext ctx = new WSDLTraversalContext(this);
-    if (params != null)
-      ctx.params.putAll(params);
-    traverse(a, null, ctx);
-  }
-  /**
-   * The method traverses given WSDL port type artifact according to the settings.
-   * @param a       a WSDL port type artifact.
-   * @param params  a Map object representing settings.   
-   */
-  public void traverse(PortType a, Map params)
-  {
-    adjust();
-    WSDLTraversalContext ctx = new WSDLTraversalContext(this);
-    if (params != null)
-      ctx.params.putAll(params);
-    traverse(a, null, ctx);
-  }
-  /**
-   * The method traverses given WSDL definition artifact according to the settings.
-   * @param a       a WSDL definition artifact.
-   * @param params  a Map object representing settings.   
-   */
-  public void traverse(Definition a, Map params)
-  {
-    adjust();
-    WSDLTraversalContext ctx = new WSDLTraversalContext(this);
-    if (params != null)
-      ctx.params.putAll(params);
-    traverse(a, null, ctx);
-  }
-  /**
-   * The method traverses given WSDL extensibility element artifact according to the settings.
-   * @param a       a WSDL extensibility element artifact.
-   * @param params  a Map object representing settings.   
-   */
-  public void traverse(ExtensibilityElement a, Map params)
-  {
-    adjust();
-    WSDLTraversalContext ctx = new WSDLTraversalContext(this);
-    if (params != null)
-      ctx.params.putAll(params);
-    traverse(a, null, ctx);
-  }
-  /**
-   * The method traverses given WSDL SOAP binding artifact according to the settings.
-   * @param a       a WSDL SOAP binding artifact.
-   * @param params  a Map object representing settings.   
-   */
-  public void traverse(SOAPBinding a, Map params)
-  {
-    adjust();
-    WSDLTraversalContext ctx = new WSDLTraversalContext(this);
-    if (params != null)
-      ctx.params.putAll(params);
-    traverse(a, null, ctx);
-  }
-  /**
-   * The method traverses given WSDL SOAP body artifact according to the settings.
-   * @param a       a WSDL SOAP body artifact.
-   * @param params  a Map object representing settings.   
-   */
-  public void traverse(SOAPBody a, Map params)
-  {
-    adjust();
-    WSDLTraversalContext ctx = new WSDLTraversalContext(this);
-    if (params != null)
-      ctx.params.putAll(params);
-    traverse(a, null, ctx);
-  }
-  /**
-   * The method traverses given WSDL SOAP header artifact according to the settings.
-   * @param a       a WSDL SOAP header artifact.
-   * @param params  a Map object representing settings.   
-   */
-  public void traverse(SOAPHeader a, Map params)
-  {
-    adjust();
-    WSDLTraversalContext ctx = new WSDLTraversalContext(this);
-    if (params != null)
-      ctx.params.putAll(params);
-    traverse(a, null, ctx);
-  }
-  /**
-   * The method traverses given WSDL hearder fault artifact according to the settings.
-   * @param a       a WSDL SOAP header fault artifact.
-   * @param params  a Map object representing settings.   
-   */
-  public void traverse(SOAPHeaderFault a, Map params)
-  {
-    adjust();
-    WSDLTraversalContext ctx = new WSDLTraversalContext(this);
-    if (params != null)
-      ctx.params.putAll(params);
-    traverse(a, null, ctx);
-  }
-  /**
-   * The method traverses given WSDL SOAP fault artifact according to the settings.
-   * @param a       a WSDL SOAP fault artifact.
-   * @param params  a Map object representing settings.   
-   */
-  public void traverse(SOAPFault a, Map params)
-  {
-    adjust();
-    WSDLTraversalContext ctx = new WSDLTraversalContext(this);
-    if (params != null)
-      ctx.params.putAll(params);
-    traverse(a, null, ctx);
-  }
-  /**
-   * The method traverses given WSDL SOAP operation artifact according to the settings.
-   * @param a       a WSDL SOAP operation artifact.
-   * @param params  a Map object representing settings.
-   */
-  public void traverse(SOAPOperation a, Map params)
-  {
-    adjust();
-    WSDLTraversalContext ctx = new WSDLTraversalContext(this);
-    if (params != null)
-      ctx.params.putAll(params);
-    traverse(a, null, ctx);
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLTraversalContext.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLTraversalContext.java
deleted file mode 100644
index cd4dbe78f..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLTraversalContext.java
+++ /dev/null
@@ -1,1126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.wsdl.traversal;
-
-import java.util.Map;
-import java.util.TreeMap;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingFault;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.BindingOutput;
-import javax.wsdl.Definition;
-import javax.wsdl.Fault;
-import javax.wsdl.Import;
-import javax.wsdl.Input;
-import javax.wsdl.Message;
-import javax.wsdl.Operation;
-import javax.wsdl.Output;
-import javax.wsdl.Part;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.Types;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPBinding;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.wsdl.extensions.soap.SOAPFault;
-import javax.wsdl.extensions.soap.SOAPHeader;
-import javax.wsdl.extensions.soap.SOAPHeaderFault;
-import javax.wsdl.extensions.soap.SOAPOperation;
-
-import org.w3c.dom.Element;
-
-/**
- * The class represents runtime context for the traversal process.
- * Context stores artifacts being processed.
- * 
- * @author Andrey Kulik
- */
-public class WSDLTraversalContext
-{
-  /**
-   * Flags which indicate whether corresponding WSDL element should be processed
-   * or not.
-   */
-  private boolean processPart = true;
-  private boolean processService = true;
-  private boolean processTypes = true;
-  private boolean processOperation = true;
-  private boolean processInput = true;
-  private boolean processOutput = true;
-  private boolean processFault = true;
-  private boolean processBinding = true;
-  private boolean processBindingOperation = true;
-  private boolean processBindingInput = true;
-  private boolean processBindingOutput = true;
-  private boolean processBindingFault = true;
-  private boolean processImport = true;
-  private boolean processElement = true;
-  private boolean processMessage = true;
-  private boolean processPort = true;
-  private boolean processPortType = true;
-  private boolean processDefinition = true;
-  private boolean processExtensibilityElement = true;
-  private boolean processSOAPBinding = true;
-  private boolean processSOAPHeader = true;
-  private boolean processSOAPHeaderFault = true;
-  private boolean processSOAPFault = true;
-  private boolean processSOAPOperation = true;
-
-  /**
-   * Last processed WSDL elements. 
-   */
-  private Part activePart = null;
-  private Service activeService = null;
-  private Types activeTypes = null;
-  private Operation activeOperation = null;
-  private Input activeInput = null;
-  private Output activeOutput = null;
-  private Fault activeFault = null;
-  private Binding activeBinding = null;
-  private BindingOperation activeBindingOperation = null;
-  private BindingInput activeBindingInput = null;
-  private BindingOutput activeBindingOutput = null;
-  private BindingFault activeBindingFault = null;
-  private Import activeImport = null;
-  private Element activeElement = null;
-  private Message activeMessage = null;
-  private Port activePort = null;
-  private PortType activePortType = null;
-  private Definition activeDefinition = null;
-  private ExtensibilityElement activeExtensibilityElement = null;
-  private SOAPBinding activeSOAPBinding = null;
-  private SOAPBody activeSOAPBody = null;
-  private SOAPHeader activeSOAPHeader = null;
-  private SOAPHeaderFault activeSOAPHeaderFault = null;
-  private SOAPFault activeSOAPFault = null;
-  private SOAPOperation activeSOAPOperation = null;
-
-  /**
-   * Parameters map
-   */
-  Map params = new TreeMap();
-
-  /**
-   * Active traversal.
-   */
-  final private WSDLTraversal traversal;
-
-  /**
-   * The default constructor.
-   * @param traversal
-   */
-  WSDLTraversalContext(WSDLTraversal traversal)
-  {
-    this.traversal = traversal;
-  }
-
-  /**
-   * Gets the active traversal.
-   * @return tha active traversal.
-   */
-  public WSDLTraversal getTraversal()
-  {
-    return traversal;
-  }
-
-  /**
-   * Gets parameter from context by the given key. 
-   * @param key  a key value.
-   * @return a parameter corresponding to the given key.
-   */
-  public Object getParameter(Object key)
-  {
-    return params.get(key);
-  }
-
-  /**
-   * Adds parameter into context with the given key.
-   * @param key    the key.
-   * @param value  the value.
-   */
-  public void addParameter(Object key, Object value)
-  {
-    params.put(key, value);
-  }
-
-  /**
-   * Removes the parameter from context by the given key.
-   * @param key  a key value.
-   */
-  public void removeParameter(Object key)
-  {
-    params.remove(key);
-  }
-
-  /**
-   * Cancels processing of the corresponding WSDL part. 
-   */
-  public void cancelPartProcessing()
-  {
-    processPart = false;
-  }
-  /**
-   * Cancels processing of the corresponding WSDL service. 
-   */
-  public void cancelServiceProcessing()
-  {
-    processService = false;
-  }
-  /**
-   * Cancels processing of the corresponding WSDL types. 
-   */
-  public void cancelTypesProcessing()
-  {
-    processTypes = false;
-  }
-  /**
-   * Cancels processing of the corresponding WSDL operation. 
-   */
-  public void cancelOperationProcessing()
-  {
-    processOperation = false;
-  }
-  /**
-   * Cancels processing of the corresponding WSDL input. 
-   */
-  public void cancelInputProcessing()
-  {
-    processInput = false;
-  }
-  /**
-   * Cancels processing of the corresponding WSDL output. 
-   */
-  public void cancelOutputProcessing()
-  {
-    processOutput = false;
-  }
-  /**
-   * Cancels processing of the corresponding WSDL fault. 
-   */
-  public void cancelFaultProcessing()
-  {
-    processFault = false;
-  }
-  /**
-   * Cancels processing of the corresponding WSDL binding. 
-   */
-  public void cancelBindingProcessing()
-  {
-    processBinding = false;
-  }
-  /**
-   * Cancels processing of the corresponding WSDL binding operation. 
-   */
-  public void cancelBindingOperationProcessing()
-  {
-    processBindingOperation = false;
-  }
-  /**
-   * Cancels processing of the corresponding WSDL binding input. 
-   */
-  public void cancelBindingInputProcessing()
-  {
-    processBindingInput = false;
-  }
-  /**
-   * Cancels processing of the corresponding WSDL binding output. 
-   */
-  public void cancelBindingOutputProcessing()
-  {
-    processBindingOutput = false;
-  }
-  /**
-   * Cancels processing of the corresponding WSDL binding fault. 
-   */
-  public void cancelBindingFaultProcessing()
-  {
-    processBindingFault = false;
-  }
-  /**
-   * Cancels processing of the corresponding WSDL import. 
-   */
-  public void cancelImportProcessing()
-  {
-    processImport = false;
-  }
-  /**
-   * Cancels processing of the corresponding WSDL element. 
-   */
-  public void cancelElementProcessing()
-  {
-    processElement = false;
-  }
-  /**
-   * Cancels processing of the corresponding WSDL message. 
-   */
-  public void cancelMessageProcessing()
-  {
-    processMessage = false;
-  }
-  /**
-   * Cancels processing of the corresponding WSDL port. 
-   */
-  public void cancelPortProcessing()
-  {
-    processPort = false;
-  }
-  /**
-   * Cancels processing of the corresponding WSDL port type. 
-   */
-  public void cancelPortTypeProcessing()
-  {
-    processPortType = false;
-  }
-  /**
-   * Cancels processing of the corresponding WSDL definition. 
-   */
-  public void cancelDefinitionProcessing()
-  {
-    processDefinition = false;
-  }
-  /**
-   * Cancels processing of the corresponding WSDL extensibility element. 
-   */
-  public void cancelExtensibilityElementProcessing()
-  {
-    processExtensibilityElement = false;
-  }
-  /**
-   * Cancels processing of the corresponding WSDL SOAP binding. 
-   */
-  public void cancelSOAPBindingProcessing()
-  {
-    processSOAPBinding = false;
-  }
-  /**
-   * Cancels processing of the corresponding WSDL SOAP header. 
-   */
-  public void cancelSOAPHeaderProcessing()
-  {
-    processSOAPHeader = false;
-  }
-  /**
-   * Cancels processing of the corresponding WSDL SOAP header fault. 
-   */
-  public void cancelSOAPHeaderFaultProcessing()
-  {
-    processSOAPHeaderFault = false;
-  }
-  /**
-   * Cancels processing of the corresponding WSDL SOAP fault. 
-   */
-  public void cancelSOAPFaultProcessing()
-  {
-    processSOAPFault = false;
-  }
-  /**
-   * Cancels processing of the corresponding WSDL operation. 
-   */
-  public void cancelSOAPOperationProcessing()
-  {
-    processSOAPOperation = false;
-  }
-
-  /**
-   * Cancels WSDL elements processing. 
-   */
-  public void cancelProcessing()
-  {
-    cancelPartProcessing();
-    cancelServiceProcessing();
-    cancelTypesProcessing();
-    cancelOperationProcessing();
-    cancelInputProcessing();
-    cancelOutputProcessing();
-    cancelFaultProcessing();
-    cancelBindingProcessing();
-    cancelBindingOperationProcessing();
-    cancelBindingInputProcessing();
-    cancelBindingOutputProcessing();
-    cancelBindingFaultProcessing();
-    cancelImportProcessing();
-    cancelElementProcessing();
-    cancelMessageProcessing();
-    cancelPortProcessing();
-    cancelPortTypeProcessing();
-    cancelDefinitionProcessing();
-    cancelExtensibilityElementProcessing();
-    cancelSOAPBindingProcessing();
-    cancelSOAPHeaderProcessing();
-    cancelSOAPHeaderFaultProcessing();
-    cancelSOAPFaultProcessing();
-    cancelSOAPOperationProcessing();
-  }
-
-  /**
-   * Resumes processing of the corresponding WSDL part. 
-   */
-  public void resumePartProcessing()
-  {
-    processPart = true;
-  }
-  /**
-   * Resumes processing of the corresponding WSDL service. 
-   */
-  public void resumeServiceProcessing()
-  {
-    processService = true;
-  }
-  /**
-   * Resumes processing of the corresponding WSDL types. 
-   */
-  public void resumeTypesProcessing()
-  {
-    processTypes = true;
-  }
-  /**
-   * Resumes processing of the corresponding WSDL operation. 
-   */
-  public void resumeOperationProcessing()
-  {
-    processOperation = true;
-  }
-  /**
-   * Resumes processing of the corresponding WSDL input. 
-   */
-  public void resumeInputProcessing()
-  {
-    processInput = true;
-  }
-  /**
-   * Resumes processing of the corresponding WSDL output. 
-   */
-  public void resumeOutputProcessing()
-  {
-    processOutput = true;
-  }
-  /**
-   * Resumes processing of the corresponding WSDL fault. 
-   */
-  public void resumeFaultProcessing()
-  {
-    processFault = true;
-  }
-  /**
-   * Resumes processing of the corresponding WSDL binding. 
-   */
-  public void resumeBindingProcessing()
-  {
-    processBinding = true;
-  }
-  /**
-   * Resumes processing of the corresponding WSDL binding operation. 
-   */
-  public void resumeBindingOperationProcessing()
-  {
-    processBindingOperation = true;
-  }
-  /**
-   * Resumes processing of the corresponding WSDL binding input. 
-   */
-  public void resumeBindingInputProcessing()
-  {
-    processBindingInput = true;
-  }
-  /**
-   * Resumes processing of the corresponding WSDL binding output. 
-   */
-  public void resumeBindingOutputProcessing()
-  {
-    processBindingOutput = true;
-  }
-  /**
-   * Resumes processing of the corresponding WSDL binding fault. 
-   */
-  public void resumeBindingFaultProcessing()
-  {
-    processBindingFault = true;
-  }
-  /**
-   * Resumes processing of the corresponding WSDL import. 
-   */
-  public void resumeImportProcessing()
-  {
-    processImport = true;
-  }
-  /**
-   * Resumes processing of the corresponding WSDL element. 
-   */
-  public void resumeElementProcessing()
-  {
-    processElement = true;
-  }
-  /**
-   * Resumes processing of the corresponding WSDL message. 
-   */
-  public void resumeMessageProcessing()
-  {
-    processMessage = true;
-  }
-  /**
-   * Resumes processing of the corresponding WSDL port. 
-   */
-  public void resumePortProcessing()
-  {
-    processPort = true;
-  }
-  /**
-   * Resumes processing of the corresponding WSDL port type. 
-   */
-  public void resumePortTypeProcessing()
-  {
-    processPortType = true;
-  }
-  /**
-   * Resumes processing of the corresponding WSDL definition. 
-   */
-  public void resumeDefinitionProcessing()
-  {
-    processDefinition = true;
-  }
-  /**
-   * Resumes processing of the corresponding WSDL extensibility element. 
-   */
-  public void resumeExtensibilityElementProcessing()
-  {
-    processExtensibilityElement = true;
-  }
-  /**
-   * Resumes processing of the corresponding WSDL SOAP binding. 
-   */
-  public void resumeSOAPBindingProcessing()
-  {
-    processSOAPBinding = true;
-  }
-  /**
-   * Resumes processing of the corresponding WSDL SOAP header. 
-   */
-  public void resumeSOAPHeaderProcessing()
-  {
-    processSOAPHeader = true;
-  }
-  /**
-   * Resumes processing of the corresponding WSDL SOAP header fault. 
-   */
-  public void resumeSOAPHeaderFaultProcessing()
-  {
-    processSOAPHeaderFault = true;
-  }
-  /**
-   * Resumes processing of the corresponding WSDL SOAP fault. 
-   */
-  public void resumeSOAPFaultProcessing()
-  {
-    processSOAPFault = true;
-  }
-  /**
-   * Resumes processing of the corresponding WSDL SOAP operation. 
-   */
-  public void resumeSOAPOperationProcessing()
-  {
-    processSOAPOperation = true;
-  }
-  /**
-   * Indicates whether the corresponding WSDL part should be processed.
-   * @return true if the corresponding WSDL part should be processed.
-   */
-  public boolean processPart()
-  {
-    return processPart;
-  }
-  /**
-   * Indicates whether the corresponding WSDL service should be processed.
-   * @return true if the corresponding WSDL service should be processed.
-   */
-  public boolean processService()
-  {
-    return processService;
-  }
-  /**
-   * Indicates whether the corresponding WSDL types should be processed.
-   * @return true if the corresponding WSDL types should be processed.
-   */
-  public boolean processTypes()
-  {
-    return processTypes;
-  }
-  /**
-   * Indicates whether the corresponding WSDL operation should be processed.
-   * @return true if the corresponding WSDL operation should be processed.
-   */
-  public boolean processOperation()
-  {
-    return processOperation;
-  }
-  /**
-   * Indicates whether the corresponding WSDL input should be processed.
-   * @return true if the corresponding WSDL input should be processed.
-   */
-  public boolean processInput()
-  {
-    return processInput;
-  }
-  /**
-   * Indicates whether the corresponding WSDL output should be processed.
-   * @return true if the corresponding WSDL output should be processed.
-   */
-  public boolean processOutput()
-  {
-    return processOutput;
-  }
-  /**
-   * Indicates whether the corresponding WSDL fault should be processed.
-   * @return true if the corresponding WSDL fault should be processed.
-   */
-  public boolean processFault()
-  {
-    return processFault;
-  }
-  /**
-   * Indicates whether the corresponding WSDL binding should be processed.
-   * @return true if the corresponding WSDL binding should be processed.
-   */
-  public boolean processBinding()
-  {
-    return processBinding;
-  }
-  /**
-   * Indicates whether the corresponding WSDL binding operation should be processed.
-   * @return true if the corresponding WSDL binding operation should be processed.
-   */
-  public boolean processBindingOperation()
-  {
-    return processBindingOperation;
-  }
-  /**
-   * Indicates whether the corresponding WSDL binding input should be processed.
-   * @return true if the corresponding WSDL binding input should be processed.
-   */
-  public boolean processBindingInput()
-  {
-    return processBindingInput;
-  }
-  /**
-   * Indicates whether the corresponding WSDL binding output should be processed.
-   * @return true if the corresponding WSDL binding output should be processed.
-   */
-  public boolean processBindingOutput()
-  {
-    return processBindingOutput;
-  }
-  /**
-   * Indicates whether the corresponding WSDL binding fault should be processed.
-   * @return true if the corresponding WSDL binding fault should be processed.
-   */
-  public boolean processBindingFault()
-  {
-    return processBindingFault;
-  }
-  /**
-   * Indicates whether the corresponding WSDL import should be processed.
-   * @return true if the corresponding WSDL import should be processed.
-   */
-  public boolean processImport()
-  {
-    return processImport;
-  }
-  /**
-   * Indicates whether the corresponding WSDL element should be processed.
-   * @return true if the corresponding WSDL element should be processed.
-   */
-  public boolean processElement()
-  {
-    return processElement;
-  }
-  /**
-   * Indicates whether the corresponding WSDL message should be processed.
-   * @return true if the corresponding WSDL message should be processed.
-   */
-  public boolean processMessage()
-  {
-    return processMessage;
-  }
-  /**
-   * Indicates whether the corresponding WSDL port should be processed.
-   * @return true if the corresponding WSDL port should be processed.
-   */
-  public boolean processPort()
-  {
-    return processPort;
-  }
-  /**
-   * Indicates whether the corresponding WSDL port type should be processed.
-   * @return true if the corresponding WSDL port type should be processed.
-   */
-  public boolean processPortType()
-  {
-    return processPortType;
-  }
-  /**
-   * Indicates whether the corresponding WSDL definition should be processed.
-   * @return true if the corresponding WSDL definition should be processed.
-   */
-  public boolean processDefinition()
-  {
-    return processDefinition;
-  }
-  /**
-   * Indicates whether the corresponding WSDL extensibility element should be processed.
-   * @return true if the corresponding WSDL extensibility element should be processed.
-   */
-  public boolean processExtensibilityElement()
-  {
-    return processExtensibilityElement;
-  }
-  /**
-   * Indicates whether the corresponding WSDL SOAP binding should be processed.
-   * @return true if the corresponding WSDL SOAP binding should be processed.
-   */
-  public boolean processSOAPBinding()
-  {
-    return processSOAPBinding;
-  }
-  /**
-   * Indicates whether the corresponding WSDL SOAP header should be processed.
-   * @return true if the corresponding WSDL SOAP header should be processed.n
-   */
-  public boolean processSOAPHeader()
-  {
-    return processSOAPHeader;
-  }
-  /**
-   * Indicates whether the corresponding WSDL SOAP header fault should be processed.
-   * @return true if the corresponding WSDL SOA header fault should be processed.
-   */
-  public boolean processSOAPHeaderFault()
-  {
-    return processSOAPHeaderFault;
-  }
-  /**
-   * Indicates whether the corresponding WSDL SOAP fault should be processed.
-   * @return true if the corresponding WSDL SOAP fault should be processed.
-   */
-  public boolean processSOAPFault()
-  {
-    return processSOAPFault;
-  }
-  /**
-   * Indicates whether the corresponding WSDL operation should be processed.
-   * @return true if the corresponding WSDL operation should be processed.
-   */
-  public boolean processSOAPOperation()
-  {
-    return processSOAPOperation;
-  }
-  /**
-   * Sets WSDL part to be processed.
-   * @param value  the WSDL part to be processed.
-   */
-  void setPart(Part value)
-  {
-    activePart = value;
-  }
-  /**
-   * Gets last processed WSDL part.
-   * @return the last processed WSDL part.
-   */
-  public Part getPart()
-  {
-    return activePart;
-  }
-  /**
-   * Sets WSDL service to be processed.
-   * @param value  the WSDL service to be processed.
-   */
-  void setService(Service value)
-  {
-    activeService = value;
-  }
-  /**
-   * Gets last processed WSDL service.
-   * @return the last processed WSDL service.
-   */
-  public Service getService()
-  {
-    return activeService;
-  }
-  /**
-   * Sets WSDL types to be processed.
-   * @param value  the WSDL types to be processed.
-   */
-  void setTypes(Types value)
-  {
-    activeTypes = value;
-  }
-  /**
-   * Gets last processed WSDL types.
-   * @return the last processed WSDL types.
-   */
-  public Types getTypes()
-  {
-    return activeTypes;
-  }
-  /**
-   * Sets WSDL operation to be processed.
-   * @param value  the WSDL operation to be processed.
-   */
-  void setOperation(Operation value)
-  {
-    activeOperation = value;
-  }
-  /**
-   * Gets last processed WSDL operation.
-   * @return the last processed WSDL operation.
-   */
-  public Operation getOperation()
-  {
-    return activeOperation;
-  }
-  /**
-   * Sets WSDL input to be processed
-   * @param the WSDL input to be processed.
-   */
-  void setInput(Input value)
-  {
-    activeInput = value;
-  }
-  /**
-   * Gets last processed WSDL input.
-   * @return last processed WSDL input.
-   */
-  public Input getInput()
-  {
-    return activeInput;
-  }
-  /**
-   * Sets WSDL output to be processed.
-   * @param value  the WSDL output to be processed.
-   */
-  void setOutput(Output value)
-  {
-    activeOutput = value;
-  }
-  /**
-   * Gets last processed WSDL output.
-   * @return the last processed WSDL output.
-   */
-  public Output getOutput()
-  {
-    return activeOutput;
-  }
-  /**
-   * Sets WSDL fault to be processed.
-   * @param value  the WSDL fault to be processed.
-   */
-  void setFault(Fault value)
-  {
-    activeFault = value;
-  }
-  /**
-   * Gets last processed WSDL fault.
-   * @return the last processed WSDL fault.
-   */
-  public Fault getFault()
-  {
-    return activeFault;
-  }
-  /**
-   * Sets WSDL binding to be processed.
-   * @param value  the WSDL binding to be processed.
-   */
-  void setBinding(Binding value)
-  {
-    activeBinding = value;
-  }
-  /**
-   * Gets last processed WSDL binding.
-   * @return the last processed WSDL binding.
-   */
-  public Binding getBinding()
-  {
-    return activeBinding;
-  }
-  /**
-   * Sets WSDL binding operation to be processed.
-   * @param value  the SDL binding operation to be processed.
-   */
-  void setBindingOperation(BindingOperation value)
-  {
-    activeBindingOperation = value;
-  }
-  /**
-   * Gets last processed WSDL binding operation.
-   * @return the last processed WSDL binding operation.
-   */
-  public BindingOperation getBindingOperation()
-  {
-    return activeBindingOperation;
-  }
-  /**
-   * Sets WSDL binding input to be processed.
-   * @param value  the WSDL binding input to be processed.
-   */
-  void setBindingInput(BindingInput value)
-  {
-    activeBindingInput = value;
-  }
-  /**
-   * Gets last processed WSDL binding input.
-   * @return the last processed WSDL binding input.
-   */
-  public BindingInput getBindingInput()
-  {
-    return activeBindingInput;
-  }
-  /**
-   * Sets WSDL binding output to be processed.
-   * @param value  the WSDL binding output to be processed.
-   */
-  void setBindingOutput(BindingOutput value)
-  {
-    activeBindingOutput = value;
-  }
-  /**
-   * Gets last processed WSDL binding output.
-   * @return the last processed WSDL binding output.
-   */
-  public BindingOutput getBindingOutput()
-  {
-    return activeBindingOutput;
-  }
-  /**
-   * Sets WSDL binding fault to be processed.
-   * @param value  the WSDL binding fault to be processed.
-   */
-  void setBindingFault(BindingFault value)
-  {
-    activeBindingFault = value;
-  }
-  /**
-   * Gets last processed WSDL binding fault.
-   * @return the last processed WSDL binding fault.
-   */
-  public BindingFault getBindingFault()
-  {
-    return activeBindingFault;
-  }
-  /**
-   * Sets WSDL import to be processed.
-   * @param value  the WSDL import to be processed.
-   */
-  void setImport(Import value)
-  {
-    activeImport = value;
-  }
-  /**
-   * Gets last processed WSDL import.
-   * @return the last processed WSDL import.
-   */
-  public Import getImport()
-  {
-    return activeImport;
-  }
-  /**
-   * Sets WSDL element to be processed.
-   * @param value  the WSDL element to be processed.
-   */
-  void setElement(Element value)
-  {
-    activeElement = value;
-  }
-  /**
-   * Gets last processed WSDL element.
-   * @return the last processed WSDL element.
-   */
-  public Element getElement()
-  {
-    return activeElement;
-  }
-  /**
-   * Sets WSDL message to be processed.
-   * @param value  the WSDL message to be processed.
-   */
-  void setMessage(Message value)
-  {
-    activeMessage = value;
-  }
-  /**
-   * Gets last processed WSDL message.
-   * @return the last processed WSDL message.
-   */
-  public Message getMessage()
-  {
-    return activeMessage;
-  }
-  /**
-   * Sets WSDL port to be processed.
-   * @param value  the WSDL port to be processed.
-   */
-  void setPort(Port value)
-  {
-    activePort = value;
-  }
-  /**
-   * Gets last processed WSDL port.
-   * @return the last processed WSDL port.
-   */
-  public Port getPort()
-  {
-    return activePort;
-  }
-  /**
-   * Sets WSDL port type to be processed.
-   * @param value  the WSDL port type to be processed.
-   */
-  void setPortType(PortType value)
-  {
-    activePortType = value;
-  }
-  /**
-   * Gets last processed WSDL port type.
-   * @return the last processed WSDL port type.
-   */
-  public PortType getPortType()
-  {
-    return activePortType;
-  }
-  /**
-   * Sets WSDL definition to be processed.
-   * @param value  the WSDL definition to be processed.
-   */
-  void setDefinition(Definition value)
-  {
-    activeDefinition = value;
-  }
-  /**
-   * Gets last processed WSDL definition.
-   * @return the last processed WSDL definition.
-   */
-  public Definition getDefinition()
-  {
-    return activeDefinition;
-  }
-  /**
-   * Sets WSDL extensibility element to be processed.
-   * @param value  the WSDL extensibility element to be processed.
-   */
-  void setExtensibilityElement(ExtensibilityElement value)
-  {
-    activeExtensibilityElement = value;
-  }
-  /**
-   * Gets last processed WSDL extensibility element.
-   * @return the last processed WSDL extensibility element.
-   */
-  public ExtensibilityElement getExtensibilityElement()
-  {
-    return activeExtensibilityElement;
-  }
-  /**
-   * Sets WSDL element to be processed.
-   * @param value  the WSDL element to be processed.
-   */
-  void setSOAPBinding(SOAPBinding value)
-  {
-    activeSOAPBinding = value;
-  }
-  /**
-   * Gets last processed WSDL SOAP binding.
-   * @return the last processed WSDL SOAP binding.
-   */
-  public SOAPBinding getSOAPBinding()
-  {
-    return activeSOAPBinding;
-  }
-  /**
-   * Sets WSDL element to be processed.
-   * @param value  WSDL element to be processed.
-   */
-  void setSOAPBody(SOAPBody value)
-  {
-    activeSOAPBody = value;
-  }
-  /**
-   * Gets last processed WSDL SOAP body.
-   * @return the last processed WSDL SOAP body.
-   */
-  public SOAPBody getSOAPBody()
-  {
-    return activeSOAPBody;
-  }
-  /**
-   * Sets WSDL element to be processed.
-   * @param value  the WSDL element to be processed.
-   */
-  void setSOAPHeader(SOAPHeader value)
-  {
-    activeSOAPHeader = value;
-  }
-  /**
-   * Gets last processed WSDL SOAP header.
-   * @return the last processed WSDL SOAP header.
-   */
-  public SOAPHeader getSOAPHeader()
-  {
-    return activeSOAPHeader;
-  }
-  /**
-   * Sets WSDL element to be processed.
-   * @param value  the WSDL element to be processed.
-   */
-  void setSOAPHeaderFault(SOAPHeaderFault value)
-  {
-    activeSOAPHeaderFault = value;
-  }
-  /**
-   * Gets last processed WSDL SOAP header fault.
-   * @return the last processed WSDL SOAP header fault.
-   */
-  public SOAPHeaderFault getSOAPHeaderFault()
-  {
-    return activeSOAPHeaderFault;
-  }
-  /**
-   * Sets WSDL element to be processed.
-   * @param value  the WSDL element to be processed.
-   */
-  void setSOAPFault(SOAPFault value)
-  {
-    activeSOAPFault = value;
-  }
-  /**
-   * Gets last processed WSDL SOAP fault.
-   * @return the last processed WSDL SOAP fault.
-   */
-  public SOAPFault getSOAPFault()
-  {
-    return activeSOAPFault;
-  }
-  /**
-   * Sets WSDL element to be processed.
-   * @param value  theWSDL element to be processed
-   */
-  void setSOAPOperation(SOAPOperation value)
-  {
-    activeSOAPOperation = value;
-  }
-  /**
-   * Gets last processed WSDL SOAP operation.
-   * @return the last processed WSDL SOAP operation.
-   */
-  public SOAPOperation getSOAPOperation()
-  {
-    return activeSOAPOperation;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLVisitor.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLVisitor.java
deleted file mode 100644
index ab95d7ad7..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLVisitor.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.wsdl.traversal;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingFault;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.BindingOutput;
-import javax.wsdl.Definition;
-import javax.wsdl.Fault;
-import javax.wsdl.Import;
-import javax.wsdl.Input;
-import javax.wsdl.Message;
-import javax.wsdl.Operation;
-import javax.wsdl.Output;
-import javax.wsdl.Part;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.Types;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPBinding;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.wsdl.extensions.soap.SOAPFault;
-import javax.wsdl.extensions.soap.SOAPHeader;
-import javax.wsdl.extensions.soap.SOAPHeaderFault;
-import javax.wsdl.extensions.soap.SOAPOperation;
-
-import org.w3c.dom.Element;
-
-/**
- * The interface defines callback methods during traverse WSDL.
- * WSDLVisitor could cancel artifact processing by using traversal context
- * <code>cancelXXXProcessing</code> methods.
- * 
- * @author Kulik
- */
-public interface WSDLVisitor
-{
-  /**
-   * Method visits WSDL part object.
-   * @param obj WSDL element to be visited.
-   * @param parent WSDL element.
-   * @param ctx current traversal context.
-   */
-  public void visit(Part obj, Object parent, WSDLTraversalContext ctx);
-  /**
-   * Method visits WSDL service object.
-   * @param obj WSDL element to be visited.
-   * @param parent WSDL element.
-   * @param ctx current traversal context.
-   */
-  public void visit(Service obj, Object parent, WSDLTraversalContext ctx);
-  /**
-   * Method visits WSDL types object.
-   * @param obj WSDL element to be visited.
-   * @param parent WSDL element.
-   * @param ctx current traversal context.
-   */
-  public void visit(Types obj, Object parent, WSDLTraversalContext ctx);
-  /**
-   * Method visits WSDL operation object.
-   * @param obj WSDL element to be visited.
-   * @param parent WSDL element.
-   * @param ctx current traversal context.
-   */
-  public void visit(Operation obj, Object parent, WSDLTraversalContext ctx);
-  /**
-   * Method visits WSDL input object.
-   * @param obj WSDL element to be visited.
-   * @param parent WSDL element.
-   * @param ctx current traversal context.
-   */
-  public void visit(Input obj, Object parent, WSDLTraversalContext ctx);
-  /**
-   * Method visits WSDL output object.
-   * @param obj WSDL element to be visited.
-   * @param parent WSDL element.
-   * @param ctx current traversal context.
-   */
-  public void visit(Output obj, Object parent, WSDLTraversalContext ctx);
-  /**
-   * Method visits WSDL fault object.
-   * @param obj WSDL element to be visited.
-   * @param parent WSDL element.
-   * @param ctx current traversal context.
-   */
-  public void visit(Fault obj, Object parent, WSDLTraversalContext ctx);
-  /**
-   * Method visits WSDL binding object.
-     * @param obj WSDL element to be visited.
-     * @param parent WSDL element.
-     * @param ctx current traversal context.
-   */
-  public void visit(Binding obj, Object parent, WSDLTraversalContext ctx);
-  /**
-   * Method visits WSDL binding operation object.
-   * @param obj WSDL element to be visited.
-   * @param parent WSDL element.
-   * @param ctx current traversal context.
-   */
-  public void visit(
-    BindingOperation obj,
-    Object parent,
-    WSDLTraversalContext ctx);
-  /**
-   * Method visits WSDL binding input object.
-   * @param obj WSDL element to be visited.
-   * @param parent WSDL element.
-   * @param ctx current traversal context.
-   */
-  public void visit(BindingInput obj, Object parent, WSDLTraversalContext ctx);
-  /**
-   * Method visits WSDL binding output object.
-   * @param obj WSDL element to be visited.
-   * @param parent WSDL element.
-   * @param ctx current traversal context.
-   */
-  public void visit(BindingOutput obj, Object parent, WSDLTraversalContext ctx);
-  /**
-   * Method visits WSDL binding fault object.
-   * @param obj WSDL element to be visited.
-   * @param parent WSDL element.
-   * @param ctx current traversal context.
-   */
-  public void visit(BindingFault obj, Object parent, WSDLTraversalContext ctx);
-  /**
-   * Method visits WSDL import object.
-   * @param obj WSDL element to be visited.
-   * @param parent WSDL element.
-   * @param ctx current traversal context.
-   */
-  public void visit(Import obj, Object parent, WSDLTraversalContext ctx);
-  /**
-   * Method visits WSDL element object.
-   * @param obj WSDL element to be visited.
-   * @param parent WSDL element.
-   * @param ctx current traversal context.
-   */
-  public void visit(Element obj, Object parent, WSDLTraversalContext ctx);
-  /**
-   * Method visits WSDL message object.
-   * @param obj WSDL element to be visited.
-   * @param parent WSDL element.
-   * @param ctx current traversal context.
-   */
-  public void visit(Message obj, Object parent, WSDLTraversalContext ctx);
-  /**
-   * Method visits WSDL port object.
-   * @param obj WSDL element to be visited.
-   * @param parent WSDL element.
-   * @param ctx current traversal context.
-   */
-  public void visit(Port obj, Object parent, WSDLTraversalContext ctx);
-  /**
-   * Method visits WSDL port type object.
-   * @param obj WSDL element to be visited.
-   * @param parent WSDL element.
-   * @param ctx current traversal context.
-   */
-  public void visit(PortType obj, Object parent, WSDLTraversalContext ctx);
-  /**
-   * Method visits WSDL definition object.
-   * @param obj WSDL element to be visited.
-   * @param parent WSDL element.
-   * @param ctx current traversal context.
-   */
-  public void visit(Definition obj, Object parent, WSDLTraversalContext ctx);
-  /**
-   * Method visits WSDL extensibility element object.
-   * @param obj WSDL element to be visited.
-   * @param parent WSDL element.
-   * @param ctx current traversal context.
-   */
-  public void visit(
-    ExtensibilityElement obj,
-    Object parent,
-    WSDLTraversalContext ctx);
-  /**
-   * Method visits WSDL SOAP binding object.
-   * @param obj WSDL element to be visited.
-   * @param parent WSDL element.
-   * @param ctx current traversal context.
-   */
-  public void visit(SOAPBinding obj, Object parent, WSDLTraversalContext ctx);
-  /**
-   * Method visits WSDL SOAP body object.
-   * @param obj WSDL element to be visited.
-   * @param parent WSDL element.
-   * @param ctx current traversal context.
-   */
-  public void visit(SOAPBody obj, Object parent, WSDLTraversalContext ctx);
-  /**
-   * Method visits WSDL SOAP header object.
-   * @param obj WSDL element to be visited.
-   * @param parent WSDL element.
-   * @param ctx current traversal context.
-   */
-  public void visit(SOAPHeader obj, Object parent, WSDLTraversalContext ctx);
-  /**
-   * Method visits WSDL SOAP header fault object.
-   * @param obj WSDL element to be visited.
-   * @param parent WSDL element.
-   * @param ctx current traversal context.
-   */
-  public void visit(
-    SOAPHeaderFault obj,
-    Object parent,
-    WSDLTraversalContext ctx);
-  /**
-   * Method visits WSDL SOAP fault object.
-   * @param obj WSDL element to be visited.
-   * @param parent WSDL element.
-   * @param ctx current traversal context.
-   */
-  public void visit(SOAPFault obj, Object parent, WSDLTraversalContext ctx);
-  /**
-   * Method visits WSDL SOAP operation object.
-   * @param obj WSDL element to be visited.
-   * @param parent WSDL element..
-   * @param ctx current traversal context.
-   */
-  public void visit(SOAPOperation obj, Object parent, WSDLTraversalContext ctx);
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/xsd/FileEntityResolver.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/xsd/FileEntityResolver.java
deleted file mode 100644
index bdafbd9b5..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/xsd/FileEntityResolver.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.wsdl.xsd;
-
-import java.io.IOException;
-import java.io.InputStream;
-import org.apache.xerces.xni.XMLResourceIdentifier;
-import org.apache.xerces.xni.XNIException;
-import org.apache.xerces.xni.parser.XMLEntityResolver;
-import org.apache.xerces.xni.parser.XMLInputSource;
-
-/**
- * Entity resolve to resolve file entities.
- */
-public class FileEntityResolver implements XMLEntityResolver
-{
-
-  /**
-   * @see org.apache.xerces.xni.parser.XMLEntityResolver#resolveEntity(org.apache.xerces.xni.XMLResourceIdentifier)
-   */
-  public XMLInputSource resolveEntity(XMLResourceIdentifier resource) throws XNIException, IOException
-  {
-    String publicId = resource.getPublicId();
-    String systemId = resource.getExpandedSystemId();
-    String url = systemId;
-    if(url == null)
-    {
-      url = publicId;
-    }
-    if(url == null)
-    {
-      url = resource.getNamespace();
-    }
-    if(url != null)
-    {
-      InputStream is = new LazyURLInputStream(url);
-      return new XMLInputSource(publicId, systemId, systemId, is, null);
-    }
-    return null;
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/xsd/InlineSchemaGenerator.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/xsd/InlineSchemaGenerator.java
deleted file mode 100644
index 92e2d4f37..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/xsd/InlineSchemaGenerator.java
+++ /dev/null
@@ -1,590 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.wsdl.xsd;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-import com.ibm.wsdl.Constants;
-
-/**
- * Generate a String representation of a schema for an inline schema. Will add imports for unresolved
- * namespaces.
- * 
- * @author Lawrence Mandel, IBM
- */
-public class InlineSchemaGenerator
-{
-  protected final String SOAP_ENCODING_URI = "http://schemas.xmlsoap.org/soap/encoding/";
-  protected final String XMLNS = "xmlns";
-  protected final String TARGETNAMESPACE = "targetNamespace";
-  protected final String NAMESPACE = "namespace";
-  protected final String IMPORT = "import";
-  protected final String INCLUDE = "include";
-  protected final String SCHEMA = "schema";
-  protected final String SCHEMALOCATION = "schemaLocation";
-  protected final String TYPE = "type";
-  protected final String NAME = "name";
-  protected final String[] ignoreNamespaces =
-    { Constants.NS_URI_XSD_1999, Constants.NS_URI_XSD_2000, Constants.NS_URI_XSD_2001 };
-
-  protected static InlineSchemaGenerator instance = null;
-
-  /**
-   * Constructor.
-   */
-  protected InlineSchemaGenerator()
-  {
-  }
-
-  /**
-   * Get the instance of the InlineSchemaGenerator.
-   * 
-   * @return The instance of the inline schema generator.
-   */
-  protected static InlineSchemaGenerator getInstance()
-  {
-    if (instance == null)
-    {
-      instance = new InlineSchemaGenerator();
-    }
-    return instance;
-  }
-  
-  /**
-   * Create a string representation of a schema from the element provided.
-   * 
-   * @param element The root element of the schema.
-   * @param elements A list of the elements in the schema in order.
-   * @param filelocation The URI of the file that contains the schema.
-   * @return A string representation of a schema.
-   */
-  public static String createXSDString(Element element, List elements, String filelocation)
-  {
-    return InlineSchemaGenerator.createXSDString(element, elements, filelocation, new Hashtable());
-  }
-  
-  /**
-  	* Creates a String representing the schema model with the root element of
-  	* extElem. Calls createXSDStringRecursively to take care of building the String
-  	* after it obtains the Element from the UnknownExtensibilityElement.
-  	* 
-  	* @param element The root element of the schema.
-  	* @param elements A list to contain the elements in the schema in order.
-  	* @param filelocation The location of the file the schema is located in.
-  	* @param parentNSs A hashtable of parent namespaces to used to resolve prefixes.
-  	* @return A string representation of the schema with the root element 'element'.
-  	*/
-  public static String createXSDString(Element element, List elements, String filelocation, Hashtable parentNSs)
-  {
-    InlineSchemaGenerator schemaGenerator = InlineSchemaGenerator.getInstance();
-    Hashtable nsResolver = schemaGenerator.getNSResolver(element);
-    List reqns = schemaGenerator.getRequiredNamespaces(element);
-    Hashtable reqNSDecl = schemaGenerator.resolveNamespaces(reqns, nsResolver, parentNSs);
-    //Hashtable reqNSDecl = schemaGenerator.getRequiredNSDeclarations(reqns, nsResolver, parentNSs);
-    List importNS = schemaGenerator.getImportNamespaces(element);
-    reqns = schemaGenerator.removeImports(reqns, importNS);
-    reqns = schemaGenerator.removeLocalNamespaces(reqns, element);
-    return schemaGenerator.createXSDStringRecursively(element, elements, reqns, reqNSDecl, filelocation);
-  }
-  /**
-   * Returns true if the SOAP encoding namespace is required but not imported.
-   * 
-   * @param element The root element of the schema.
-   * @param filelocation The location of the file containing the schema.
-   * @param parentNSs A hashtable of the parent namespaces.
-   * @return True if the soap encoding namespace is required but not imported, false otherwise.
-   */
-  public static boolean soapEncodingRequiredNotImported(Element element, String filelocation, Hashtable parentNSs)
-  {
-    InlineSchemaGenerator schemaGenerator = InlineSchemaGenerator.getInstance();
-    Hashtable nsResolver = schemaGenerator.getNSResolver(element);
-    List reqns = null;
-
-    reqns = schemaGenerator.getRequiredNamespaces(element);
-    schemaGenerator.resolveNamespaces(reqns, nsResolver, parentNSs);
-    //schemaGenerator.resolveUndeclaredNamespaces(reqns, parentNSs);
-    List importNS = schemaGenerator.getImportNamespaces(element);
-    reqns = schemaGenerator.removeImports(reqns, importNS);
-    reqns = schemaGenerator.removeLocalNamespaces(reqns, element);
-
-    return schemaGenerator.checkSOAPEncodingRequired(reqns);
-  }
-
-  /**
-   * This recursive method creates the schema String from the root Element.
-   * 
-   * @param elem The root element of the schema.
-   * @param elements A list to be created of the elements in the schema in order.
-   * @param requiredNamespaces A list of required namespaces.
-   * @param reqNSDecl A hashtable of required namespace declarations.
-   * @param filelocation The uri of the file that contains this schema.
-   * @return A string representation of this schema.
-   */
-  protected String createXSDStringRecursively(
-    Element elem,
-    List elements,
-    List requiredNamespaces,
-    Hashtable reqNSDecl,
-    String filelocation)
-  {
-    if (elem == null)
-      return ""; // just in case
-
-    elements.add(elem);
-
-    StringBuffer xsdString = new StringBuffer();
-    String elementName = elem.getTagName();
-    xsdString.append("<").append(elementName);
-
-    boolean foundSchemaLocation = false; // flag if schemalocation is defined
-    String namespace = ""; // the namespace if we're checking an import or include
-    String namePrefix = ""; // the xmlns prefix used for the elements
-    // Get all of the attributes for this element and append them to the xsdString
-    NamedNodeMap atts = elem.getAttributes();
-    for (int i = 0; i < atts.getLength(); i++)
-    {
-      Node n = atts.item(i);
-      xsdString.append(" ").append(n.getNodeName()).append("=\"");
-      String nodeName = n.getNodeName();
-      if (nodeName.equalsIgnoreCase(SCHEMALOCATION) && filelocation != null)
-      {
-        foundSchemaLocation = true;
-        String relativePath = n.getNodeValue();
-        xsdString.append(relativePath).append("\"");   
-      }
-      else
-      {
-        String nodeValue = n.getNodeValue();
-        if (nodeName.equalsIgnoreCase(NAMESPACE))
-        {
-          namespace = nodeValue;
-        }
-        // get the name prefix for this schema to use in generating import statements
-        else if (nodeName.indexOf(XMLNS) != -1)
-        {
-
-          if (nodeValue.equalsIgnoreCase(elem.getNamespaceURI()))
-          {
-            namePrefix = nodeName;
-            if (namePrefix.equalsIgnoreCase(XMLNS))
-            {
-              namePrefix = "";
-            }
-            else
-            {
-              namePrefix = namePrefix.substring(6) + ":";
-            }
-          }
-        }
-        // Replace old schema namespaces with the new schema namespace.
-        if(nodeValue.equals(Constants.NS_URI_XSD_1999) || nodeValue.equals(Constants.NS_URI_XSD_2000))
-         {
-          nodeValue = Constants.NS_URI_XSD_2001;
-        }
-        xsdString.append(nodeValue).append("\"");
-      }
-    }
-    if (elementName.equalsIgnoreCase("import") && !foundSchemaLocation)
-    {
-      xsdString.append(" ").append(SCHEMALOCATION).append("=\"").append(namespace).append("\"");
-    }
-    // add in any required NS declarations from parent elements
-    if (reqNSDecl != null)
-    {
-      Enumeration keys = reqNSDecl.keys();
-      while (keys.hasMoreElements())
-      {
-        String key = (String)keys.nextElement();
-        String declNS = (String)reqNSDecl.get(key);
-        if(declNS.equals(Constants.NS_URI_XSD_1999) || declNS.equals(Constants.NS_URI_XSD_2000))
-         {
-          declNS = Constants.NS_URI_XSD_2001;
-        }
-        xsdString.append(" ").append(key).append("=\"").append(declNS).append("\"");
-      }
-
-    }
-    xsdString.append(">");
-    if (requiredNamespaces != null)
-    {
-      Iterator iRequiredNamespaces = requiredNamespaces.iterator();
-      while (iRequiredNamespaces.hasNext())
-      {
-        String ns = (String)iRequiredNamespaces.next();
-
-        xsdString
-          .append("<")
-          .append(namePrefix)
-          .append(IMPORT)
-          .append(" ")
-          .append(NAMESPACE)
-          .append("=\"")
-          .append(ns)
-          .append("\" ")
-          .append(SCHEMALOCATION)
-          .append("=\"")
-          .append(ns)
-          .append("\"/>");
-      }
-
-    }
-    xsdString.append("\n");
-
-    // call the method recursively for each child element
-    NodeList childNodes = elem.getChildNodes();
-
-    for (int i = 0; i < childNodes.getLength() || i < 5; i++)
-    {
-      Node n = childNodes.item(i);
-      // we only want nodes that are Elements
-      if (n instanceof Element)
-      {
-        Element child = (Element)n;
-        xsdString.append(createXSDStringRecursively(child, elements, null, null, filelocation));
-      }
-    }
-
-    xsdString.append("</").append(elem.getTagName()).append(">");
-
-    return xsdString.toString();
-
-  }
-  /**
-   * Get a list of all the namespaces that are used for elements or types in the schema.
-   * These are the required namespaces in order to ensure that all the elments are valid.
-   * 
-   * @param elem The element to check for required namespaces.
-   * @return A list of required namespaces for the element and all its children.
-   */
-  protected List getRequiredNamespaces(Element elem)
-  {
-    List namespace = new Vector();
-
-    // call the method recursively for each child element
-    // register all the child types first
-    NodeList childNodes = elem.getChildNodes();
-    int numChildren = childNodes.getLength();
-    // TODO: why is there a < 5 condition?
-    for (int i = 0; i < numChildren /*|| i < 5*/; i++)
-    {
-      Node n = childNodes.item(i);
-      // we only want nodes that are Elements
-      if (n instanceof Element)
-      {
-        Element child = (Element)n;
-        List childns = getRequiredNamespaces(child);
-        for (int j = childns.size() - 1; j >= 0; j--)
-        {
-          String ns = (String)childns.get(j);
-          
-          if (!namespace.contains(ns))
-          {
-            namespace.add(ns);
-          }
-        }
-      }
-    }
-    // Add the namespace of the current element
-    String elemNS = elem.getPrefix();
-    // if there is no namespace prefix set it to the empty prefix.
-    if(elemNS == null)
-    {
-      elemNS = "";
-    }
-    if (!namespace.contains(elemNS.intern()))
-     {
-      namespace.add(elemNS.intern());
-    }
-    // now add all of the current element's namespaces
-    // don't include import and schema elements
-    String localname = elem.getLocalName();
-    if (!localname.equals(IMPORT) && !localname.equals(INCLUDE) && !localname.equals(SCHEMA))
-    {
-      NamedNodeMap atts = elem.getAttributes();
-      for (int i = 0; i < atts.getLength(); i++)
-      {
-        Node n = atts.item(i);
-
-        String nodeName = n.getNodeName();
-        // removed restriction that we're only looking at types
-        //		if (nodeName.equalsIgnoreCase(TYPE))
-        //		{
-        // don't take namespace info from attributes defining namespaces.
-        // that includes xmlns, targetNamespace
-        // don't take namespace info from name attributes
-        if (nodeName.indexOf(XMLNS) != -1 || nodeName.equals(TARGETNAMESPACE) || nodeName.equals(NAME))
-        {
-          continue;
-        }
-        String nodeValue = n.getNodeValue();
-        
-        
-        int colonIndex = nodeValue.indexOf(":");
-        // Don't take namespace info from attributes with the default namespace, that is attributes
-        // that are not prefixed. (colonIndex == -1)
-        // If the colonIndex is followed by a / then it is a URI and not
-        // namespace qualified.
-        if (colonIndex == -1 || nodeValue.charAt(colonIndex + 1) == '/')
-        {
-          continue;
-        }
-        // here we have found a colon delimiter so we need the namespace defined here
-        else
-        {
-          nodeValue = nodeValue.substring(0, colonIndex);
-        }
-        if (!namespace.contains(nodeValue.intern()))
-        {
-
-          namespace.add(nodeValue.intern());
-        }
-        //		}
-      }
-    }
-
-    return namespace;
-
-  }
-
-  /**
-   * Get a list of all the namespaces that have an import statement.
-   * 
-   * @param elem The root element of the schema.
-   * @return A list of all the namespaces that are imported.
-   */
-  protected List getImportNamespaces(Element elem)
-  {
-    List namespace = new Vector();
-
-    // call the method recursively for each child element
-    // register all the child types first
-    NodeList childNodes = elem.getChildNodes();
-
-    for (int i = 0; i < childNodes.getLength() || i < 5; i++)
-    {
-      Node n = childNodes.item(i);
-      // we only want nodes that are Elements
-      if (n instanceof Element)
-      {
-        Element child = (Element)n;
-        List childns = getImportNamespaces(child);
-        for (int j = childns.size() - 1; j >= 0; j--)
-        {
-          String ns = (String)childns.get(j);
-          if (!namespace.contains(ns))
-          {
-            namespace.add(ns);
-          }
-        }
-      }
-    }
-    // if this is an import element get the namespace and add it to the list
-    if (elem.getLocalName().equalsIgnoreCase(IMPORT))
-    {
-      NamedNodeMap atts = elem.getAttributes();
-      for (int i = 0; i < atts.getLength(); i++)
-      {
-        Node n = atts.item(i);
-
-        String nodeName = n.getNodeName();
-        if (nodeName.equalsIgnoreCase(NAMESPACE))
-        {
-          String nodeValue = n.getNodeValue();
-          if (!namespace.contains(nodeValue.intern()))
-          {
-
-            namespace.add(nodeValue.intern());
-          }
-        }
-      }
-    }
-
-    return namespace;
-
-  }
-
-  /**
-   * Return a Hashtable with namespace prefixes as keys from the given element.
-   * 
-   * @param elem The root element of the schema.
-   * @return A hashtable with namespace prefixes mapped to namespaces.
-   */
-  protected Hashtable getNSResolver(Element elem)
-  {
-    Hashtable nsResolver = new Hashtable();
-
-    NamedNodeMap atts = elem.getAttributes();
-    for (int i = 0; i < atts.getLength(); i++)
-    {
-      Node n = atts.item(i);
-
-      String nodeName = n.getNodeName();
-      if (nodeName.indexOf(XMLNS) != -1)
-      {
-        String nodeValue = n.getNodeValue();
-        String namePrefix = nodeName;
-
-        if (namePrefix.equalsIgnoreCase(XMLNS))
-        {
-          namePrefix = "";
-        }
-        else
-        {
-          namePrefix = namePrefix.substring(6);
-        }
-        nsResolver.put(namePrefix, nodeValue);
-
-      }
-    }
-    return nsResolver;
-
-  }
-
-  /**
-   * Resolve the namespaces in the given namespaces list with the two namespace
-   * resolver hashtables provided. Return a list of all the namespace that need
-   * to be declared.
-   * First resolve against the local namespaces with nsResolver.
-   * Next resolve against the parent namespace with parentNSResolver.
-   * A side affect of this method is the namespaces list is left with only those 
-   * namespaces that are resolved and the resolved entities are placed in the 
-   * list instead of the original entries.
-   * For ex. If you provide a list such as {xsd, intf} and only xsd can be resolved
-   * you will end up with the list {http://www.w3.org/2001/XMLSchema}
-   * 
-   * @param namespaces The list of namespaces to resolve.
-   * @param nsResolver The hashtable to be used as the local resolver.
-   * @param parentNSResolver The hashtable to be used as the parent namespace resolver.
-   * @return A Hashtable of namespaces that must be declared.
-   */
-  protected Hashtable resolveNamespaces(List namespaces, Hashtable nsResolver, Hashtable parentNSResolver)
-  {
-  	Hashtable reqNSDecl = new Hashtable();
-    if (namespaces != null && !namespaces.isEmpty() && nsResolver != null)
-    {
-      for (int i = namespaces.size() - 1; i >= 0; i--)
-      {
-        String ns = (String)namespaces.get(i);
-        // Remove the namespace from the list.
-        namespaces.remove(i);
-        // First try to resolve against the local namespace resolver.
-        if (nsResolver.containsKey(ns))
-        {
-          Object resolvedNS = nsResolver.get(ns);
-          // Only add the namespace if it's not already in the list.
-          if(!namespaces.contains(resolvedNS))
-          {
-            namespaces.add(i, nsResolver.get(ns));
-          }
-        }
-        // Next try to resolve against the parent namespace resolver.
-        else
-        {
-        	if (ns.equals(""))
-            {
-              ns = XMLNS;
-            }
-            else
-            {
-              ns = XMLNS + ":" + ns;
-            }
-            if (parentNSResolver.containsKey(ns))
-            {
-              Object resolvedNS = parentNSResolver.get(ns);
-              // Only add the namespace if it's not already in the list.
-              if(!namespaces.contains(resolvedNS))
-              {
-                namespaces.add(i, resolvedNS);
-              }
-              // Still need to declare the namespace though.
-              reqNSDecl.put(ns, resolvedNS);
-            }
-        }
-
-      }
-    }
-    return reqNSDecl;
-  }
-
-  /**
-   * Remove any namespace from the namespaces list if it is in the import list.
-   * 
-   * @param namespaces The namespaces list.
-   * @param importedNamespaces A list of imported namespaces.
-   * @return The list of namespaces without the imported namespaces.
-   */
-  protected List removeImports(List namespaces, List importedNamespaces)
-  {
-    if (namespaces != null && importedNamespaces != null && !importedNamespaces.isEmpty())
-    {
-      Iterator iImportedNS = importedNamespaces.iterator();
-      while (iImportedNS.hasNext())
-      {
-        String iNS = (String)iImportedNS.next();
-
-        namespaces.remove(iNS);
-      }
-    }
-    return namespaces;
-  }
-
-  /**
-   * Remove the local namespace for the schema and the namespaces listed in the ignoreNamespaces
-   * list from the namespaces list provided.
-   * 
-   * @param namespaces The list of local namespaces.
-   * @param elem The root element of the schema.
-   * @return The list of namespaces with the local namespaces removed.
-   */
-  protected List removeLocalNamespaces(List namespaces, Element elem)
-  {
-    if (namespaces != null && elem != null)
-    {
-      String ns = elem.getAttribute(TARGETNAMESPACE);
-      namespaces.remove(ns);
-
-      for (int i = ignoreNamespaces.length - 1; i >= 0; i--)
-      {
-        // keep removing the namespace until it is not in the list
-        if (namespaces.remove(ignoreNamespaces[i]))
-        {
-          i++;
-        }
-      }
-    }
-    return namespaces;
-  }
-  
-  /**
-   * Returns true if the SOAP encoding namespace is in the list of required namespaces,
-   * false otherwise.
-   * 
-   * @param reqns The list of namespaces to check for the SOAP encoding namespace.
-   * @return True if the SOAP encoding namespaces is in the list, false otherwise.
-   */
-  protected boolean checkSOAPEncodingRequired(List reqns)
-  {
-    if (reqns.contains(SOAP_ENCODING_URI))
-    {
-      return true;
-    }
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/xsd/InlineSchemaValidator.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/xsd/InlineSchemaValidator.java
deleted file mode 100644
index aec05ba01..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/xsd/InlineSchemaValidator.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.wsdl.xsd;
-
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Types;
-import javax.wsdl.extensions.UnknownExtensibilityElement;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-import com.ibm.wsdl.Constants;
-
-/**
- * Plugin validator for the WSDL Validation framework. Validates inline schema found in a WSDL document.
- * 
- * @author Lawrence Mandel (lmandel@ca.ibm.com)
- */
-public class InlineSchemaValidator
-{
-  List elements = null;
-
-
-  public Map validate(Object element, List parents, String filename) throws Exception
-  {
-  	elements = new Vector();
-    UnknownExtensibilityElement elem = (UnknownExtensibilityElement) element;
-    Definition wsdlDefinition = (Definition) parents.get(parents.size() - 1);
-    // Add in the namespaces defined in the doc already that aren't defined locally in this schema.
-    // There is no need to check for namespaces other then in the defintions and types elements as
-    // inline schema can not have any other parents and must have there two parents.
-    // First take care of the definitions element
-
-    // create the inline schema string
-	Element w3celement = elem.getElement();
-	Hashtable parentnamespaces = getNamespaceDeclarationsFromParents(wsdlDefinition,w3celement);
-	String targetNamespace = w3celement.getAttribute(Constants.ATTR_TARGET_NAMESPACE);
-	// if the targetNamespace hasn't been defined for the schema use the 
-	// targetNamespace of the definitions element
-	/*if(targetNamespace == null || targetNamespace.equals(""))
-	 {
-	  targetNamespace = wsdlDefinition.getTargetNamespace();
-	  w3celement.setAttribute(Constants.ATTR_TARGET_NAMESPACE,targetNamespace);
-	}*/
-
-	String xsd = InlineSchemaGenerator.createXSDString(w3celement, elements, filename, parentnamespaces);
-
-    // If the namespace given is one of the old schema namespaces produce a warning.
-    String namespace = w3celement.getNamespaceURI();
-    if(namespace.equals(Constants.NS_URI_XSD_1999) || namespace.equals(Constants.NS_URI_XSD_2000))
-    {
-      throw new Exception("An old version of the schema namespace is specified.");
-    }
-
-    // now create and call the validator for the inline schema
-    XSDValidator schemav = new XSDValidator();
-
-    //String fileLocation = new URL(validatormanager.getFilename()).getPath();
-    InlineXSDResolver inlineEntityResolver =
-      getEntityResolver(wsdlDefinition, (Types) parents.get(0), filename, targetNamespace);
-    //	add in the external XSD Catalog to resolve schemas offline
-    XMLEntityResolverChain entityResolverChain = new XMLEntityResolverChain();
-    entityResolverChain.addEntityResolver(inlineEntityResolver);
-    entityResolverChain.addEntityResolver(new FileEntityResolver());
-    entityResolverChain.addEntityResolver(XMLCatalogResolver.getInstance());
-    schemav.validateInlineSchema(xsd, targetNamespace, filename, entityResolverChain, inlineEntityResolver);
-
-    // check if the SOAP Encoding namespace is required but not imported
-    if (InlineSchemaGenerator.soapEncodingRequiredNotImported(elem.getElement(), filename,parentnamespaces))
-    {
-      throw new Exception("The inline schema uses an element or type from "
-        + "the SOAP encoding namespace but the namespace has not been imported. "
-        + "The SOAP encoding namespace should be imported with an import "
-        + "statement before it is used.");
-    }
-
-    // If the schema isn't valid
-    if (!schemav.isValid())
-    {
-      // Gathering all the errors
-      StringBuffer exception = new StringBuffer();
-      Iterator i = schemav.getErrors().iterator();
-      while (i.hasNext())
-      {
-        exception.append(i.next()).append('\n');
-      }
-      // throw an exception
-      throw new Exception(exception.toString());
-    }
-    // if the schema is valid
-    else
-    {
-      Map map = new HashMap(1);
-      map.put(targetNamespace, schemav.getXSModel());
-      return map;
-    }
-  }
-
-  /**
-   * Get an entity resolver that will resolve inline schemas.  Every inline schema is preregistered with
-   * the resolver.
-   * 
-   * @param wsdlDefinition The WSDL definitions element.
-   * @param types The types element.
-   * @param referenceLocation The location of the file that contains this schema.
-   * @param targetNamespace The targetNamespace of the schema.
-   * @return An entity resolver that can resolve inline schemas.
-   */
-  protected InlineXSDResolver getEntityResolver(Definition wsdlDefinition, Types types, String referenceLocation, String targetNamespace)
-  {
-    InlineXSDResolver entityResolver = new InlineXSDResolver();
-//    entityResolver.setReferenceLocation(referenceLocation);
-    List schemas = types.getExtensibilityElements();
-    if (schemas != null)
-    {
-      Iterator iSchemas = schemas.iterator();
-      while (iSchemas.hasNext())
-      {
-        UnknownExtensibilityElement extElem = (UnknownExtensibilityElement) iSchemas.next();
-        String thisNamespace = extElem.getElement().getAttribute(Constants.ATTR_TARGET_NAMESPACE);
-        if (thisNamespace != null && !thisNamespace.equalsIgnoreCase(targetNamespace))
-        {
-
-        	Element element = extElem.getElement();
-			
-//			create the inline schema string
-			 //Element w3celement = elem.getElement();
-			 Hashtable parentnamespaces = getNamespaceDeclarationsFromParents(wsdlDefinition,element);
-			 String xsd = InlineSchemaGenerator.createXSDString(element, elements, referenceLocation, parentnamespaces);
-        	//addNamespaceDeclarationsFromParents(wsdlDefinition,element);
-          entityResolver.add(thisNamespace, xsd);
-        }
-
-      }
-    }
-    return entityResolver;
-  }
-  
-  /**
-   * Get the namespace declarations as in the form 
-   * xmlns="somenamespace"
-   * from the definitions and types elements and add them to the schema element so the schema 
-   * validator will have access to them.
-   * 
-   * @param wsdlDefinition The WSDL definitions element.
-   * @param element The types element.
-   * @return A hashtable with the namespace elements from the elements provided.
-   */
-  protected Hashtable getNamespaceDeclarationsFromParents(Definition wsdlDefinition, Element element)
-  {
-  	Hashtable nss = new Hashtable();
-    Iterator nameSpaces = wsdlDefinition.getNamespaces().keySet().iterator();
-
-    String XMLNS = Constants.ATTR_XMLNS;
-    
-    while (nameSpaces.hasNext())
-    {
-      String nsprefix = XMLNS;
-      String ns = (String) nameSpaces.next();
-      if (!ns.equalsIgnoreCase(""))
-      {
-        nsprefix += ":";
-      }
-      if (!element.hasAttribute(nsprefix + ns))
-      {
-      	nss.put(nsprefix + ns, wsdlDefinition.getNamespace(ns));
-//        element.setAttribute(nsprefix + ns, wsdlDefinition.getNamespace(ns));
-      }
-
-    }
-    // Next handle the parent types element
-    NamedNodeMap atts = element.getParentNode().getAttributes();
-    int attslength = atts.getLength();
-    for (int i = 0; i < attslength; i++)
-    {
-      Node tempnode = atts.item(i);
-      String nodename = tempnode.getNodeName();
-      // if this is a namespace attribute
-      if (nodename.indexOf(XMLNS) != -1)
-      {
-		nss.put(nodename,  tempnode.getNodeValue());
-        //element.setAttribute(nodename, tempnode.getNodeValue());
-      }
-    }
-    return nss;
-  }
-  
-  /**
-   * Given a line number for the schema returns the element found on that line. 
-   * Useful for obtaining elements from schema Strings.
-   * 
-   * @param line The line number for the schema.
-   * @return The object located at the line or at line 0 if the line is invalid.
-   */
-   public Object getObjectAtLine(int line)
-   {
-   	if(line < 0 || line >= elements.size())
-   	{
-   	  line = 0;
-   	}
-	return elements.get(line);
-   }
-   
-  /**
-   * Replace any instance of the 2001 schema namespace in the given message with
-   * the given namespace.
-   * 
-   * @param message The message to replace the namespace in.
-   * @param namespace The namespace used for replacement.
-   * @return The message with the 2001 schema namespace replaced by the given namespace.
-   */
- // private String replaceNamespace(String message, String namespace)
- //  {
- //    String xsd2001 = Constants.NS_URI_XSD_2001;
- //    int start = message.indexOf(xsd2001);
- //    int end = start + xsd2001.length();
- //    if(start < 0)
- //    {
- //      return message;
- //    }
- //    String startString = message.substring(0,start);
- //    String endString = message.substring(end,message.length());
- //    return startString + namespace + endString;
- //  }
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/xsd/InlineXSDResolver.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/xsd/InlineXSDResolver.java
deleted file mode 100644
index a9d5a7999..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/xsd/InlineXSDResolver.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.wsdl.xsd;
-
-import java.io.IOException;
-import java.io.StringReader;
-import java.util.Hashtable;
-
-import org.apache.xerces.xni.XMLResourceIdentifier;
-import org.apache.xerces.xni.XNIException;
-import org.apache.xerces.xni.parser.XMLEntityResolver;
-import org.apache.xerces.xni.parser.XMLInputSource;
-
-/**
- * An XMLEntityResolver that allows inline schemas to resolve each other through imports.
- * 
- * @author Lawrence Mandel (lmandel@ca.ibm.com)
- */
-public class InlineXSDResolver implements XMLEntityResolver
-{
-  protected Hashtable entities = new Hashtable();
-  protected XMLInputSource referringSchemaInputSource = null;
-  protected String referringSchemaNamespace = null;
-
-  /**
-   * Constuctor.
-   */
-  public InlineXSDResolver()
-  {
-  }
-
-  /* (non-Javadoc)
-   * @see org.apache.xerces.xni.parser.XMLEntityResolver#resolveEntity(org.apache.xerces.xni.XMLResourceIdentifier)
-   */
-  public XMLInputSource resolveEntity(XMLResourceIdentifier resourceIdentifier)
-		 throws XNIException, IOException {
-	String systemId = resourceIdentifier.getExpandedSystemId();
-	String publicId = resourceIdentifier.getPublicId();
-	String namespace = resourceIdentifier.getNamespace();
-	XMLInputSource is = null;
-	String schema = null;
-	if (systemId == null)
-	{
-	  if(publicId == null)
-	  {
-	  	if(namespace == null)
-	  	{	
-	      return null;
-	  	}
-	  	else
-	  	{
-	  		systemId = namespace;
-	  	}
-	  }
-	  else
-	  {	
-	    systemId = publicId;
-	  }
-	}
-	  
-	if(referringSchemaNamespace != null && referringSchemaNamespace.equals(systemId))
-	{
-		if(referringSchemaInputSource!=null)
-		{
-			return referringSchemaInputSource;
-		}
-	}
-	else if ((schema = (String) entities.get(systemId)) != null && !schema.equals(""))
-	{
-		is = new XMLInputSource(publicId, systemId, systemId,new StringReader(schema),null);
-	}
-	
-    //if(is == null)
-    //{
-    //	throw new IOException();
-    //}
-	return is;
-  }
-
-  /**
-   * Add an inline schema.
-   * 
-   * @param targetNamespace - the target namespace of the schema
-   * @param schema - a string representation of the schema
-   */
-  public void add(String targetNamespace, String schema)
-  {
-    entities.put(targetNamespace, schema);
-  }
-  
-  /**
-   * Add the referring inline schema. 
-   * 
-   * @param inputSource - a representation of the inline schema
-   * @param namespace - the namespace of the inline schema
-   */
-  public void addReferringSchema(XMLInputSource inputSource, String namespace)
-  {
-    referringSchemaInputSource = inputSource;
-    referringSchemaNamespace = namespace;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/xsd/LazyURLInputStream.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/xsd/LazyURLInputStream.java
deleted file mode 100644
index 86e2a91f2..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/xsd/LazyURLInputStream.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsi.internal.core.wsdl.xsd;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-
-
-/**
- * This class allows InputStreams to be created and returned to xerces without
- * actually opening file handles or network connections until it is absolutely
- * neccessary.
- */
-public class LazyURLInputStream extends InputStream
-{  
-  private static int debugTotalOpenStreamCount = 0; 
-  protected InputStream inner;
-  protected String url;
-  protected boolean error;
-  boolean hasMarks;
-  boolean pretendFileIsStillOpen;
-
-  public LazyURLInputStream(String url)
-  {
-    this.url = url;
-	inner = null;
-	pretendFileIsStillOpen = false;
-  }
-
-  private void createInnerStreamIfRequired() throws IOException
-  {
-    if (inner == null && !error)
-    {
-      debugTotalOpenStreamCount++;
-      //System.out.println("Creating stream (" + debugTotalOpenStreamCount + ")-- " + url);
-      try
-      {
-        inner = new URL(url).openStream();
-		pretendFileIsStillOpen = false;
-		hasMarks = false;
-      }
-      finally 
-      {
-        if (inner == null)
-        {  
-          error = true;
-        }
-      }
-    }
-  }
-
-	protected void closeStream() throws IOException {
-		if (inner != null && !pretendFileIsStillOpen) {
-			inner.close();
-			pretendFileIsStillOpen = true;
-		}
-  	}
-
-  public int available() throws IOException
-  {
-	if (pretendFileIsStillOpen) return 0;
-	createInnerStreamIfRequired();
-	if (inner == null) throw new IOException("Stream not available");
-	return inner.available();
-  }
-
-  public void close() throws IOException
-  {
-	if (pretendFileIsStillOpen) {
-		// Stop behaving as if the stream were still open.
-		pretendFileIsStillOpen = false;
-	} else {
-		if (inner != null) {
-			debugTotalOpenStreamCount--;
-		      //System.out.println("Closing stream (" + debugTotalOpenStreamCount + ") -- " + url);
-			inner.close();
-		}
-	}
-  }
-
-  public void mark(int readlimit)
-  {
-	if (pretendFileIsStillOpen) return;
-	hasMarks = true;
-	try {
-		createInnerStreamIfRequired();
-		inner.mark(readlimit);
-	} catch (IOException e) {
-		// TODO Auto-generated catch block
-		e.printStackTrace();
-	}
-  }
-
-  public boolean markSupported()
-  {
-	if (pretendFileIsStillOpen) return false;
-	try {
-		createInnerStreamIfRequired();
-		if (inner == null) return false;
-		return inner.markSupported();
-	} catch (IOException e) {
-		// TODO Auto-generated catch block
-		e.printStackTrace();
-	}
-	return false;
-  }
-
-  public int read() throws IOException
-  {
-	if (pretendFileIsStillOpen) return -1;
-	createInnerStreamIfRequired();
-	if (inner == null) throw new IOException("Stream not available");
-	int bytesRead = inner.read();
-	if (bytesRead == -1 && !hasMarks) closeStream();
-	return bytesRead;
-  }
-
-
-	public int read(byte[] b) throws IOException {
-		if (pretendFileIsStillOpen) return -1;
-		createInnerStreamIfRequired();
-		if (inner == null) throw new IOException("Stream not available");
-		int bytesRead = inner.read(b);
-		if (bytesRead == -1 && !hasMarks) closeStream();
-		return bytesRead;
-	}
-
-  public int read(byte[] b, int off, int len) throws IOException
-  {    
-	if (pretendFileIsStillOpen) return -1;
-	createInnerStreamIfRequired();
-	if (inner == null) throw new IOException("Stream not available");
-	int bytesRead = inner.read(b, off, len);
-	if (bytesRead == -1 && !hasMarks) closeStream();
-	return bytesRead;
-  }
-
-  public void reset() throws IOException
-  {
-	if (pretendFileIsStillOpen) return;
-	createInnerStreamIfRequired();
-	if (inner == null) throw new IOException("Stream not available");
-	inner.reset();
-  }
-
-  public long skip(long n) throws IOException
-  {   
-	if (pretendFileIsStillOpen) return 0;
-	createInnerStreamIfRequired();
-	if (inner == null) throw new IOException("Stream not available");
-	return inner.skip(n);
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/xsd/SchemaAttributeTable.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/xsd/SchemaAttributeTable.java
deleted file mode 100644
index 449762fd4..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/wsdl/xsd/ValidateErrorHandler.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/xsd/ValidateErrorHandler.java
deleted file mode 100644
index 33a73fa3d..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/wsdl/xsd/XMLCatalog.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/xsd/XMLCatalog.java
deleted file mode 100644
index e4afb55a8..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/wsdl/xsd/XMLCatalogImpl.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/xsd/XMLCatalogImpl.java
deleted file mode 100644
index f7c40e7ff..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/wsdl/xsd/XMLCatalogResolver.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/xsd/XMLCatalogResolver.java
deleted file mode 100644
index 33efdc274..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/wsdl/xsd/XMLEntityResolverChain.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/xsd/XMLEntityResolverChain.java
deleted file mode 100644
index f71f8031f..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/wsdl/xsd/XSDValidator.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/xsd/XSDValidator.java
deleted file mode 100644
index bad3c7157..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/xsd/XSDValidator.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.wsdl.xsd;
-
-import java.io.Reader;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.xerces.parsers.XMLGrammarPreparser;
-import org.apache.xerces.util.XMLGrammarPoolImpl;
-import org.apache.xerces.xni.grammars.XMLGrammarDescription;
-import org.apache.xerces.xni.grammars.XMLGrammarPool;
-import org.apache.xerces.xni.grammars.XSGrammar;
-import org.apache.xerces.xni.parser.XMLEntityResolver;
-import org.apache.xerces.xni.parser.XMLInputSource;
-import org.apache.xerces.xs.XSModel;
-
-
-/**
- * Validate schemas from files or String.
- * 
- * @author Lawrence Mandel (lmandel@ca.ibm.com)
- */
-public class XSDValidator
-{
-  private XSModel xsModel;
-  private boolean isValidXSD;
-  private List errors;
-  private String filelocation;
-
-  /**
-   * Constructor.
-   */
-  public XSDValidator()
-  {
-    xsModel = null;
-    isValidXSD = false;
-    errors = new ArrayList();
-  }
-  /**
-   * Validate an inline schema.
-   * 
-   * @param schema A schema represented as a string.
-   * @param targetNamespace The target namespace of the schema.
-   * @param fileloc The uri of the file that contains the schema.
-   */
-  public void validateInlineSchema(String schema, String targetNamespace, String fileloc)
-  {
-    validateInlineSchema(schema, targetNamespace, fileloc, null, null);
-  }
-
-  /**
-   * Validate an inline schema and specify an entity resolver.
-   * 
-   * @param schema This schema represented as a string.
-   * @param targetNamespace The target namespace of the schema.
-   * @param fileloc The uri of the file that contains this schema.
-   * @param entityResolverChain The entity resolver chain.
-   * @param inlineSchemaEntityResolver An inline schema resolver for this schema.
-   */
-  public void validateInlineSchema(
-    String schema,
-    String targetNamespace,
-    String fileloc,
-    XMLEntityResolver entityResolverChain,
-    XMLEntityResolver inlineSchemaEntityResolver)
-  {
-    filelocation = fileloc;
-
-    validateXSD(schema, true, entityResolverChain,targetNamespace, inlineSchemaEntityResolver);
-  }
-
-  /**
-   * Validate the file located at the uri specified with the given entity resolver.
-   * 
-   * @param uri An absolute uri for the schema location.
-   * @param entityResolver An entity resolver to be used.
-   */
-  public void validate(String uri, XMLEntityResolver entityResolver)
-  {
-    validateXSD(uri, false, entityResolver, null, null);
-  }
-
-  /**
-   * Validate the schema.
-   * 
-   * @param schema The schema or it's location.
-   * @param inlineXSD True if an inline schema, false otherwise.
-   * @param entityResolver An entity resolver to use.
-   * @param targetNamespace The target namespace of the schema being validated.
-   * @param inlineSchemaEntityResolver An inline schema entity resolver.
-   */
-  protected void validateXSD(String schema, boolean inlineXSD, XMLEntityResolver entityResolver, String targetNamespace, XMLEntityResolver inlineSchemaEntityResolver)
-  {
-    ValidateErrorHandler errorHandler = new ValidateErrorHandler();
-    errorHandler.getErrorMessages().clear();
-    try
-    {
-		XMLGrammarPreparser grammarPreparser = new XMLGrammarPreparser();
-		XMLGrammarPool grammarPool = new XMLGrammarPoolImpl();
-		grammarPreparser.setGrammarPool(grammarPool);
-	 
-      grammarPreparser.setErrorHandler(errorHandler);
-      if (entityResolver != null)
-      {
-		grammarPreparser.setEntityResolver(entityResolver);
-      }
-
-      try
-      {
-		XMLInputSource is = null;
-        // this allows support for the inline schema in WSDL documents
-        if (inlineXSD)
-        {
-        	
-        	Reader reader = new StringReader(schema);
-			is = new XMLInputSource(null,filelocation,filelocation,reader,null);
-			
-			((InlineXSDResolver)inlineSchemaEntityResolver).addReferringSchema(is,targetNamespace);
-
-        }
-        // get the input source for an external schema file
-        else
-        {
-          is = new XMLInputSource(null,schema,schema);
-        }
-        
-        grammarPreparser.registerPreparser(XMLGrammarDescription.XML_SCHEMA,null/*schemaLoader*/);
-        grammarPreparser.getLoader(XMLGrammarDescription.XML_SCHEMA);
-
-		XSGrammar grammar = (XSGrammar)grammarPreparser.preparseGrammar(XMLGrammarDescription.XML_SCHEMA,is);
-		xsModel = grammar.toXSModel();
-      }
-      catch (Exception e)
-      {
-        //parser will return null pointer exception if the document is structurally invalid
-        errors.add("Schema is structurally invalid.");
-      }
-
-      errors.addAll(errorHandler.getErrorMessages());
-    }
-    catch (Exception e)
-    {
-    	System.out.println(e);
-    }
-    if (errors.isEmpty())
-    {
-      isValidXSD = true;
-    }
-  }
-
-  /**
-   * Returns the XSModel created.
-   * 
-   * @return The XSModel created.
-   */
-
-  public XSModel getXSModel()
-  {
-  	return xsModel;
-  }
-  /**
-   * Returns true if the schema is valid, false otherwise.
-   * 
-   * @return True if the schema is valid, false otherwise.
-   */
-  public boolean isValid()
-  {
-    return isValidXSD;
-  }
-
-  /**
-   * Return the error list.
-   * 
-   * @return A list of error from the schema.
-   */
-  public List getErrors()
-  {
-    return errors;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/XMLConvertor.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/XMLConvertor.java
deleted file mode 100644
index 82b134cbc..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/xml/XMLDocumentCache.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/XMLDocumentCache.java
deleted file mode 100644
index 41087524a..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/XMLDocumentCache.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.xml;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * This class creates a HashMap to cache XML documents.
- * @author Peter  Brittenham (peterbr@us.ibm.com)
- * @version 1.0.1
- */
-public class XMLDocumentCache extends HashMap
-{
-	static XMLDocumentCache instance;
-
-  /**
-	 * Comment for <code>serialVersionUID</code>
-	 */
-	private static final long serialVersionUID = 3834028043709657401L;
-
-	/**
-   * Constructor for XMLDocumentCache.
-   * @param initialCapacity  the initial capacity.
-   * @param loadFactor       the load factor. 
-   */
-  public XMLDocumentCache(int initialCapacity, float loadFactor)
-  {
-    super(initialCapacity, loadFactor);
-    instance = this;
-  }
-
-  /**
-   * Constructor for XMLDocumentCache.
-   * @param initialCapacity  the initial capacity.
-   */
-  public XMLDocumentCache(int initialCapacity)
-  {
-    super(initialCapacity);
-    instance = this;
-  }
-
-  /**
-   * Constructor for XMLDocumentCache.
-   */
-  public XMLDocumentCache()
-  {
-    super();
-    instance = this;
-  }
-
-  /**
-   * Constructor for XMLDocumentCache.
-   * @param t  the map whose mappings are to be placed in this map.
-   */
-  public XMLDocumentCache(Map t)
-  {
-    super(t);
-    instance = this;
-  }
-
-  public static XMLDocumentCache instance()
-  {
-	  if (instance == null) 
-		  instance = new XMLDocumentCache();
-	  
-	  return instance;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/XMLDocumentCacheUser.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/XMLDocumentCacheUser.java
deleted file mode 100644
index a50f07e31..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/XMLDocumentCacheUser.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.xml;
-
-import java.net.URL;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.w3c.dom.Document;
-
-/**
- * This is an abstract class that takes advantage of cached XML documents.
- * @author Peter  Brittenham (peterbr@us.ibm.com)
- * @version 1.0.1
- */
-
-public abstract class XMLDocumentCacheUser
-{
-  /**
-   * Get document from cache.
-   * @see #setDocument
-   *
-   * @param key  a String. 
-   * @return a Document object corresponding to the key.
-   */
-  protected Document getDocument(String key)
-  {
-    return (Document) XMLDocumentCache.instance().get(key);
-  }
-
-  /**
-   * Put document with corresponding key in cache.
-   * @see #getDocument
-   *
-   * @param key       a String used as a key to identify specified document.
-   * @param document  a document.
-   */
-  protected void setDocument(String key, Object document)
-  {
-	  XMLDocumentCache.instance().put(key, document);
-  }
-
-  /**
-   * Get document list.
-   * @return a XMLDocumentCache object representing the document list value.
-   */
-  public XMLDocumentCache getDocumentList()
-  {
-    return XMLDocumentCache.instance();
-  }
-
-  /**
-   * Parse XML document.
-   * @param urlString  a String locating the XML document.
-   * @param baseURI    a base url to assist in locating the XML document.
-   * @return a Document object.
-   * @throws WSIException if document cannot be parsed.
-   */
-  public Document parseXMLDocumentURL(String urlString, String baseURI)
-    throws WSIException
-  {
-    return parseXMLDocumentURL(urlString, baseURI, null);
-  }
-
-  /**
-   * Parse XML document and validate with a schema document.
-   * @param urlString  a String locating the XML document.
-   * @param baseURI    a base url to assist in locating the XML document.
-   * @param schema     a String identifying related schema document.
-   * @return a Document object.
-   * @throws WSIException if document cannot be parsed.
-   */
-  public Document parseXMLDocumentURL(
-    String urlString,
-    String baseURI,
-    String schema)
-    throws WSIException
-  {
-    Document document = null;
-
-    try
-    {
-      // Create URL reference to document
-      URL url = XMLUtils.createURL(urlString, baseURI);
-               
-      // TODO: Add schema to the xml document cache, so that you can detect when it has already 
-      //  been parsed using a specific schema definition 
-
-      // If the document is not in the cache, then read and parse it
-   	  if ((document = getDocument(urlString)) == null)
-      {
-        document = XMLUtils.parseXMLDocumentURL(url, schema);
-        // Add document to cache
-        setDocument(urlString, document);
-      }
-    }
-
-    catch (WSIException e)
-    {
-      throw e;
-    }
-
-    catch (Exception e)
-    {
-      throw new WSIException(e.getMessage(), e);
-    }
-
-    return document;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/XMLTags.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/XMLTags.java
deleted file mode 100644
index e12d04f0c..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/xml/XMLTraversal.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/XMLTraversal.java
deleted file mode 100644
index f6233f0db..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/core/xml/XMLUtils.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/XMLUtils.java
deleted file mode 100644
index 137833d93..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/XMLUtils.java
+++ /dev/null
@@ -1,1528 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.xml;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.apache.xml.serialize.OutputFormat;
-import org.apache.xml.serialize.XMLSerializer;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.util.NullUtil;
-import org.w3c.dom.Attr;
-import org.w3c.dom.CharacterData;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.XMLReader;
-
-import com.ibm.wsdl.util.StringUtils;
-
-/**
- * Set of XML related utilities.
- * 
- * @version 1.0.1
- * @author Peter Brittenham
- */
-public final class XMLUtils
-{
-	/**
-	 * Some sax features that need to be set.
-	 */
-	public static final String FEATURE_NAMESPACE_PREFIXES = "http://xml.org/sax/features/namespace-prefixes";
-	public static final String FEATURE_NAMESPACES = "http://xml.org/sax/features/namespaces";
-	public static final String FEATURE_VALIDATION_SCHEMA = "http://apache.org/xml/features/validation/schema";
-	public static final String JAXP_SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
-	public static final String W3C_XML_SCHEMA = "http://www.w3.org/2001/XMLSchema";
-	public static final String W3C_SOAP_12_SCHEMA = "http://schemas.xmlsoap.org/soap/envelope/";
-	public static final String JAXP_SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource";
-	public static final String PROPERTY_EXTERNAL_SCHEMA_LOCATION = "http://apache.org/xml/properties/schema/external-schemaLocation";
-
-	public static final String SOAP_ELEM_ENVELOPE = "Envelope";
-	public static final String SOAP_ELEM_HEADER = "Header";
-	public static final String SOAP_ELEM_BODY = "Body";
-	public static final String SOAP_ELEM_FAULT = "Fault";
-	public static final String SOAP_ELEM_FAULT_CODE = "faultcode";
-	public static final String SOAP_ELEM_FAULT_STRING = "faultstring";
-	public static final String SOAP_ELEM_FAULT_DETAIL = "detail";
-	public static final String SOAP_ELEM_FAULT_ACTOR = "faultactor";
-	public static final String SOAP_ATTR_MUST_UNDERSTAND = "mustUnderstand";
-	public static final String SOAP_ATTR_ACTOR = "actor";
-
-	/**
-	 * Get XMLReader.
-	 * 
-	 * @return the XMLReader value
-	 * @throws WSIException if there are problems getting the XMLReader
-	 *           implementation.
-	 */
-	public static XMLReader getXMLReader() throws WSIException {
-		XMLReader xmlReader = null;
-
-		try
-		{
-			xmlReader = (new org.apache.xerces.jaxp.SAXParserFactoryImpl())
-					.newSAXParser().getXMLReader();
-
-			// Set namespace aware
-			xmlReader.setFeature(FEATURE_NAMESPACE_PREFIXES, true);
-			xmlReader.setFeature(FEATURE_NAMESPACES, true);
-		}
-
-		catch (Exception e)
-		{
-			throw new WSIException("Could not get XMLReader implementation.", e);
-		}
-
-		return xmlReader;
-	}
-
-	/**
-	 * Parse text string as an XML document and return the document element.
-	 * 
-	 * @param text XML document text.
-	 * @param validate true if the document will be validate, false otherwise
-	 * @return a Document object.
-	 * @throws WSIException if there is a problem parsing the XML document.
-	 */
-	public static Document parseXML(String text, boolean validate)
-			throws WSIException {
-		return parseXML(new StringReader(text), validate);
-	}
-
-	/**
-	 * Parse text string as an XML document and return the document element.
-	 * 
-	 * @param text XML document text.
-	 * @return a Document object.
-	 * @throws WSIException if there is a problem parsing the XML document.
-	 */
-	public static Document parseXML(String text) throws WSIException {
-		return parseXML(new StringReader(text));
-	}
-
-	/**
-	 * Parse the XML document and return the document element.
-	 * 
-	 * @param uri the location of the XML document.
-	 * @return a Document object.
-	 * @throws WSIException if there is a problem parsing the XML document.
-	 * @throws IOException if an I/O exception of some sort has occurred.
-	 */
-	public static Document parseXMLDocument(String uri) 
-	throws WSIException, IOException 
-	{
-		return parseXMLDocument(uri, null);
-	}
-
-	/**
-	 * Parse the XML document and return the document element.
-	 * 
-	 * @param uri the location of the XML document.
-	 * @param schema a String identifying related schema document.
-	 * @return a Document object.
-	 * @throws WSIException if there is a problem parsing the XML document.
-	 * @throws IOException if an I/O exception of some sort has occurred.
-	 */
-	public static Document parseXMLDocument(String uri, String schema)
-	throws WSIException, IOException 
-	{
-	      URL url = StringUtils.getURL(null, uri);
-	      InputStream inputStream = (InputStream)url.getContent();
-	      InputSource inputSource = new InputSource(inputStream);
-	      inputSource.setSystemId(url.toString());
-	      
-	      if (schema == null)
-	      	return parseXML(inputSource, false);
-	      else
-            return parseXML(inputSource, schema);
-	}
-
-	/**
-	 * Parses an XML document from a reader and returns the document object.
-	 * 
-	 * @param url a String locating the XML document.
-	 * @param schema a String identifying related schema document.
-	 * @param baseURI a base url to assist in locating the XML document.
-	 * @return Document.
-	 * @throws WSIException if there is a problem parsing the XML document.
-	 */
-	public static Document parseXMLDocumentURL(String url, String schema,
-			String baseURI) throws WSIException {
-		try
-		{
-		  parseXMLDocumentURL(createURL(url, baseURI), schema);
-		}
-
-		catch (Exception e)
-		{
-			throw new WSIException(e.getMessage(), e);
-		}
-
-		return parseXMLDocumentURL(url, schema);
-	}
-
-	/**
-	 * Parses an XML document from a reader and returns the document object.
-	 * 
-	 * @param url a URL object identifying the XML document.
-	 * @param schema a String identifying related schema document.
-	 * @return Document.
-	 * @throws WSIException if there is a problem parsing the XML document.
-	 */
-	public static Document parseXMLDocumentURL(URL url, String schema)
-			throws WSIException {
-		try
-		{
-	      InputStream inputStream = (InputStream)url.getContent();
-	      InputSource inputSource = new InputSource(inputStream);
-	      inputSource.setSystemId(url.toString());
-
-			Document doc = null;
-
-			if (schema == null)
-				doc = parseXML(inputSource);
-			else
-				doc = parseXML(inputSource, schema);
-
-			inputStream.close();
-			return doc;
-		}
-
-		catch (WSIException e)
-		{
-			throw e;
-		}
-
-		catch (Throwable t)
-		{
-			throw new WSIException(t.getMessage());
-		}
-	}
-
-	/**
-	 * Parses an XML document from a reader and returns the document object.
-	 * 
-	 * @param urlString a String locating the XML document.
-	 * @param baseURI a base url to assist in locating the XML document.
-	 * @return Document object.
-	 * @throws WSIException if there is a problem parsing the XML document.
-	 */
-	public static Document parseXMLDocumentURL(String urlString, String baseURI)
-			throws WSIException {
-		Document document = null;
-
-		try
-		{
-			URL url = createURL(urlString, baseURI);
-
-			document = parseXMLDocumentURL(url);
-		}
-
-		catch (WSIException we)
-		{
-			throw we;
-		}
-
-		catch (Exception e)
-		{
-			throw new WSIException(e.getMessage(), e);
-		}
-
-		return document;
-	}
-
-	/**
-	 * Parses an XML document from a reader and returns the document object.
-	 * 
-	 * @param url a URL object identifying the XML document.
-	 * @return Document.
-	 * @throws WSIException if there is a problem parsing the XML document.
-	 */
-	public static Document parseXMLDocumentURL(URL url) throws WSIException {
-		Document document = null;
-
-		try
-		{
-			Reader reader = new InputStreamReader(url.openStream());
-			InputSource source = new InputSource(reader);
-			source.setSystemId(url.toString());
-			document = parseXML(source);
-
-			reader.close();
-		}
-
-		catch (Exception e)
-		{
-			throw new WSIException(e.getMessage(), e);
-		}
-
-		return document;
-	}
-
-	/**
-	 * Parse an XML document from a reader and return the document object.
-	 * 
-	 * @param reader a Reader object.
-	 * @param validate true if the document will be validate, false otherwise
-	 * @return a Document object.
-	 * @throws WSIException if there is a problem parsing the XML document.
-	 */
-	public static Document parseXML(InputSource source, boolean validate)
-			throws WSIException {
-		Document doc = null;
-		ClassLoader currentLoader = Thread.currentThread().getContextClassLoader();   
-		try
-		{
-    	  Thread.currentThread().setContextClassLoader(XMLUtils.class.getClassLoader());   
-
-  		  // Get the document factory
-		  DocumentBuilderFactory factory = new org.eclipse.wst.wsi.internal.core.xml.jaxp.DocumentBuilderFactoryImpl();
-
-		  // Set namespace aware, but for now do not validate
-		  factory.setNamespaceAware(true);
-		  factory.setIgnoringElementContentWhitespace(true);
-
-		  // ADD: This should be set to true when we have access to the schema
-		  // document
-		  factory.setValidating(false);
-
- 		  // Parse the document
-		  DocumentBuilder builder = factory.newDocumentBuilder();
-		  doc = builder.parse(source);
-		  // workaround for compatibility Xerces 2.2.1 with Xerces 2.6.2,
-		  // Xerces 2.6.2 supported XML 1.1 but WSI-tool and Xerces 2.2.1
-		  // supported only XML 1.0
-		  if (doc instanceof org.apache.xerces.dom.DocumentImpl)
-		  {
-			if (((org.apache.xerces.dom.DocumentImpl) doc).getXmlVersion().equals(
-						"1.1"))
-			{
-				throw new WSIException("Fatal Error: XML version &quot;1.1&quot; "
-						+ "is not supported, only XML 1.0 is supported.");
-			}
-		  }
-		}
-		catch (Exception e)
-		{
-			throw new WSIException("Could not parse XML document.", e);
-		}
-	    finally
-	    { 
-	      Thread.currentThread().setContextClassLoader(currentLoader);
-	    }    
-
-		// Return document
-		return doc;
-	}
-
-	/**
-	 * Parse an XML document from a reader and return the document object.
-	 * 
-	 * @param reader a Reader object.
-	 * @param validate true if the document will be validate, false otherwise
-	 * @return a Document object.
-	 * @throws WSIException if there is a problem parsing the XML document.
-	 */
-	public static Document parseXML(Reader reader, boolean validate)
-			throws WSIException {
-		Document doc = null;
-		ClassLoader currentLoader = Thread.currentThread().getContextClassLoader();   
-		try
-		{
-		  Thread.currentThread().setContextClassLoader(XMLUtils.class.getClassLoader());   
-		
-		  // Create input source
-		  InputSource inputSource = new InputSource(reader);
-
-		  // Get the document factory
-		  DocumentBuilderFactory factory = new org.eclipse.wst.wsi.internal.core.xml.jaxp.DocumentBuilderFactoryImpl();
-
-		  // Set namespace aware, but for now do not validate
-		  factory.setNamespaceAware(true);
-		  factory.setIgnoringElementContentWhitespace(true);
-
-		  // ADD: This should be set to true when we have access to the schema
-		  // document
-		  factory.setValidating(false);
-
-		  // Parse the document
-		  DocumentBuilder builder = factory.newDocumentBuilder();
-		  doc = builder.parse(inputSource);
-	   	  // workaround for compatibility Xerces 2.2.1 with Xerces 2.6.2,
-		  // Xerces 2.6.2 supported XML 1.1 but WSI-tool and Xerces 2.2.1
-		  // supported only XML 1.0
-		  if (doc instanceof org.apache.xerces.dom.DocumentImpl)
-		  {
-			if (((org.apache.xerces.dom.DocumentImpl) doc).getXmlVersion().equals(
-						"1.1"))
-			{
-			  throw new WSIException("Fatal Error: XML version &quot;1.1&quot; "
-							+ "is not supported, only XML 1.0 is supported.");
-			}
-	      }
-		}
-		catch (Exception e)
-		{
-			throw new WSIException("Could not parse XML document.", e);
-		}
-	    finally
-	    { 
-	      Thread.currentThread().setContextClassLoader(currentLoader);
-	    }    
-
-		// Return document
-		return doc;
-	}
-
-	/**
-	 * Parse an XML document from a input source and return the document object.
-	 * 
-	 * @param source a InputSource object.
-	 * @return a Document object.
-	 * @throws WSIException if there is a problem parsing the XML document.
-	 */
-	public static Document parseXML(Reader reader) throws WSIException {
-		return parseXML(reader, false);
-	}
-
-	/**
-	 * Parse an XML document from a input source and return the document object.
-	 * 
-	 * @param source a InputSource object.
-	 * @return a Document object.
-	 * @throws WSIException if there is a problem parsing the XML document.
-	 */
-	public static Document parseXML(InputSource source) throws WSIException {
-		return parseXML(source, false);
-	}
-
-	/**
-	 * Parse text string as an XML document and return the document element.
-	 * 
-	 * @param text XML document text.
-	 * @param schema a String identifying related schema document.
-	 * @return a Document object.
-	 * @throws WSIException if there is a problem parsing the XML document.
-	 */
-	public static Document parseXML(String text, String schema)
-			throws WSIException {
-		return parseXML(new StringReader(text), schema);
-	}
-
-	/**
-	 * Parse text string as an XML document and return the document element.
-	 * 
-	 * @param text XML document text.
-	 * @param schemas a collection of related schema documents.
-	 * @return a Document object.
-	 * @throws WSIException if there is a problem parsing the XML document.
-	 */
-	public static Document parseXML(String text, Collection schemas)
-			throws WSIException {
-		return parseXML(new StringReader(text), schemas);
-	}
-
-
-	/**
-	 * Parse the XML document and return the document element.
-	 * 
-	 * @param text XML document text.
-	 * @param schemaString a StringReader object.
-	 * @return a Document object.
-	 * @throws WSIException if there is a problem parsing the XML document.
-	 * @throws IOException if an I/O exception of some sort has occurred.
-	 */
-	public static Document parseXML(String text, StringReader schemaString)
-			throws WSIException, IOException {
-		return parseXML(new StringReader(text), schemaString);
-	}
-
-	/**
-	 * Parse the XML document and return the document element.
-	 * 
-	 * @param reader a Reader object.
-	 * @param schema a String identifying related schema document.
-	 * @return a Document object.
-	 * @throws WSIException if there is a problem parsing the XML document.
-	 */
-	public static Document parseXML(Reader reader, String schema)
-			throws WSIException {
-		Document doc = null;
-		ClassLoader currentLoader = Thread.currentThread().getContextClassLoader();   
-		try
-		{
-    	  Thread.currentThread().setContextClassLoader(XMLUtils.class.getClassLoader());   
-		  // Create input source
-		  InputSource inputSource = new InputSource(reader);
-
-		  // Get the document factory
-		  DocumentBuilderFactory factory = new org.eclipse.wst.wsi.internal.core.xml.jaxp.DocumentBuilderFactoryImpl();
-
-		  // Set namespace aware, but for now do not validate
-		  factory.setNamespaceAware(true);
-		  factory.setIgnoringElementContentWhitespace(true);
-
-		  try
-		  {
-		    factory.setValidating(false);
-			factory.setAttribute(JAXP_SCHEMA_LANGUAGE, W3C_XML_SCHEMA);
- 		  }
-   		  catch (IllegalArgumentException e)
-		  {
-			String errMessage = "Error: JAXP DocumentBuilderFactory attribute not recognized: "
-					+ JAXP_SCHEMA_LANGUAGE
-					+ "\n"
-					+ "Check to see if parser conforms to JAXP 1.2 spec.";
-			throw new WSIException(errMessage, e);
-		  }
-		  factory.setAttribute(JAXP_SCHEMA_SOURCE, new InputSource(schema));
-
-		  // Parse the document
-		  DocumentBuilder builder = factory.newDocumentBuilder();
-		  builder.setErrorHandler(new ErrHandler());
-		  doc = builder.parse(inputSource);
-
-		  // workaround for compatibility Xerces 2.2.1 with Xerces 2.6.2,
-		  // Xerces 2.6.2 supported XML 1.1 but WSI-tool and Xerces 2.2.1
-		  // supported only XML 1.0
-		  if (doc instanceof org.apache.xerces.dom.DocumentImpl)
-		  {
-			if (((org.apache.xerces.dom.DocumentImpl) doc).getXmlVersion().equals("1.1"))
-			{
-		 	  throw new WSIException("Fatal Error: XML version &quot;1.1&quot; "
-							+ "is not supported, only XML 1.0 is supported.");
-			}
-		  }
-	    }
-		catch (Exception e)
-		{
-			throw new WSIException("Could not parse XML document.", e);
-		}
-	    finally
-	    { 
-	      Thread.currentThread().setContextClassLoader(currentLoader);
-	    }    
-		// Return document
-    	return doc;
-	}
-
-	/**
-	 * Parse the XML document and return the document element.
-	 * 
-	 * @param reader a Reader object.
-	 * @param schema a String identifying related schema document.
-	 * @return a Document object.
-	 * @throws WSIException if there is a problem parsing the XML document.
-	 */
-	public static Document parseXML(InputSource source, String schema)
-			throws WSIException {
-		Document doc = null;
-		ClassLoader currentLoader = Thread.currentThread().getContextClassLoader();   
-		try
-		{
-    	  Thread.currentThread().setContextClassLoader(XMLUtils.class.getClassLoader());   
- 		  // Get the document factory
-		  DocumentBuilderFactory factory = new org.eclipse.wst.wsi.internal.core.xml.jaxp.DocumentBuilderFactoryImpl();
-
-		  // Set namespace aware, but for now do not validate
-		  factory.setNamespaceAware(true);
-		  factory.setIgnoringElementContentWhitespace(true);
-
-		  factory.setValidating(false);
-		  try
-		  {
-			factory.setAttribute(JAXP_SCHEMA_LANGUAGE, W3C_XML_SCHEMA);
-		  }
-
-		  catch (IllegalArgumentException e)
-		  {
-			String errMessage = "Error: JAXP DocumentBuilderFactory attribute not recognized: "
-					+ JAXP_SCHEMA_LANGUAGE
-					+ "\n"
-					+ "Check to see if parser conforms to JAXP 1.2 spec.";
-			throw new WSIException(errMessage, e);
-		  }
-		  factory.setAttribute(JAXP_SCHEMA_SOURCE, new InputSource(schema));
-
-          // Parse the document
-		  DocumentBuilder builder = factory.newDocumentBuilder();
-		  builder.setErrorHandler(new ErrHandler());
-		  doc = builder.parse(source);
-
-		  // workaround for compatibility Xerces 2.2.1 with Xerces 2.6.2,
-		  // Xerces 2.6.2 supported XML 1.1 but WSI-tool and Xerces 2.2.1
-		  // supported only XML 1.0
-		  if (doc instanceof org.apache.xerces.dom.DocumentImpl)
-		  {
-			if (((org.apache.xerces.dom.DocumentImpl) doc).getXmlVersion().equals(
-						"1.1"))
-			{
-				throw new WSIException("Fatal Error: XML version &quot;1.1&quot; "
-						+ "is not supported, only XML 1.0 is supported.");
-			}
-		  }
-		}
-		catch (Exception e)
-		{
-			throw new WSIException("Could not parse XML document.", e);
-		}
-	    finally
-	    { 
-	      Thread.currentThread().setContextClassLoader(currentLoader);
-	    }    
-
-		// Return document
-		return doc;
-
-	}
-
-	/**
-	 * Parse the XML document and return the document element.
-	 * 
-	 * @param filename a Reader object.
-	 * @param schemaString a StringReader object.
-	 * @return a Document object.
-	 * @throws WSIException if there is a problem parsing the XML document.
-	 */
-	public static Document parseXML(Reader filename, StringReader schemaString)
-			throws WSIException {
-
-		Document doc = null;
-		ClassLoader currentLoader = Thread.currentThread().getContextClassLoader();   
-		try
-		{
-    	  Thread.currentThread().setContextClassLoader(XMLUtils.class.getClassLoader());   
-
-		  // Create input source
-		  InputSource inputSource = new InputSource(filename);
-
-		  // Get the document factory
-		  DocumentBuilderFactory factory = new org.eclipse.wst.wsi.internal.core.xml.jaxp.DocumentBuilderFactoryImpl();
-
-		  // Set namespace aware, but for now do not validate
-		  factory.setNamespaceAware(true);
-		  factory.setIgnoringElementContentWhitespace(true);
-
-		  factory.setValidating(false);
-		  try
-		  {
-			factory.setAttribute(JAXP_SCHEMA_LANGUAGE, W3C_XML_SCHEMA);
-		  } catch (IllegalArgumentException e)
-		  {
-			String errMessage = "Error: JAXP DocumentBuilderFactory attribute not recognized: "
-					+ JAXP_SCHEMA_LANGUAGE
-					+ "\n"
-					+ "Check to see if parser conforms to JAXP 1.2 spec.";
-			throw new WSIException(errMessage, e);
-		  }
-		  factory.setAttribute(JAXP_SCHEMA_SOURCE, new InputSource(schemaString));
-
-		  // Parse the document
-		  DocumentBuilder builder = factory.newDocumentBuilder();
-		  builder.setErrorHandler(new ErrHandler());
-		  doc = builder.parse(inputSource);
-		}
-		catch (Exception e)
-		{
-			throw new WSIException("Could not parse XML document.", e);
-		}
-	    finally
-	    { 
-	      Thread.currentThread().setContextClassLoader(currentLoader);
-	    }    
-
-		// Return document
-		return doc;
-
-	}
-
-	/**
-	 * Parse the XML document and return the document element.
-	 * 
-	 * @param filename a Reader object
-	 * @param schemaStrings a collection of related schema documents.
-	 * @return a Document object.
-	 * @throws WSIException if there is a problem parsing the XML document.
-	 */
-	public static Document parseXML(Reader filename, Collection schemaStrings)
-			throws WSIException {
-
-		Document doc = null;
-		ClassLoader currentLoader = Thread.currentThread().getContextClassLoader();   
-		try
-		{
-    	  Thread.currentThread().setContextClassLoader(XMLUtils.class.getClassLoader());   
-
-		  // Create input source
-		  InputSource inputSource = new InputSource(filename);
-
-		  // Get the document factory
-		  DocumentBuilderFactory factory = new org.eclipse.wst.wsi.internal.core.xml.jaxp.DocumentBuilderFactoryImpl();
-
-		  // Set namespace aware, but for now do not validate
-		  factory.setNamespaceAware(true);
-		  factory.setIgnoringElementContentWhitespace(true);
-
-		  factory.setValidating(false);
-		  try
-		  {
-			factory.setAttribute(JAXP_SCHEMA_LANGUAGE, W3C_XML_SCHEMA);
-		  } catch (IllegalArgumentException e)
-		  {
-		    String errMessage = "Error: JAXP DocumentBuilderFactory attribute not recognized: "
-					+ JAXP_SCHEMA_LANGUAGE
-					+ "\n"
-					+ "Check to see if parser conforms to JAXP 1.2 spec.";
-			throw new WSIException(errMessage, e);
-		  }
-		  // convert schema strings to array of InputSources
-		  Iterator i = schemaStrings.iterator();
-		  Vector readers = new Vector();
-		  while (i.hasNext())
-		  {
-			String nextSchema = (String) i.next();
-			readers.add(new InputSource(new StringReader(nextSchema)));
-		  }
-		  InputSource[] inputSources = (InputSource[]) readers
-				.toArray(new InputSource[]{});
-		  // pass an array of schema strings (each of which contains a schema)
-		  factory.setAttribute(JAXP_SCHEMA_SOURCE, inputSources);
-
-		  // Parse the document
-		  DocumentBuilder builder = factory.newDocumentBuilder();
-		  builder.setErrorHandler(new ErrHandler());
-		  doc = builder.parse(inputSource);
-		}
-		catch (Exception e)
-		{
-			throw new WSIException("Could not parse XML document.", e);
-		}
-	    finally
-	    { 
-	      Thread.currentThread().setContextClassLoader(currentLoader);
-	    }    
-
-		// Return document
-		return doc;
-
-	}
-
-	/**
-	 * Get attribute value with the given name defined for the specified element.
-	 * 
-	 * @param element an Element object.
-	 * @param attrName a name of an attribute
-	 * @return the attribute value.
-	 */
-	public static String getAttributeValue(Element element, String attrName) {
-		String attrValue = null;
-		Attr attr = null;
-
-		// Get the attribute using its name
-		if ((attr = element.getAttributeNode(attrName)) != null)
-		{
-			attrValue = attr.getValue().trim();
-		}
-
-		// Return attribute value
-		return attrValue;
-	}
-
-	/**
-	 * Get attribute value.
-	 * 
-	 * @param element an Element object.
-	 * @param attrName a name of an attribute
-	 * @param defaultValue a default value for the specified attribute.
-	 * @return the attribute value if found. Otherwise the specified default
-	 *         value.
-	 */
-	public static String getAttributeValue(Element element, String attrName,
-			String defaultValue) {
-		String returnValue = defaultValue;
-		String attrValue = null;
-
-		if ((attrValue = getAttributeValue(element, attrName)) != null)
-			returnValue = attrValue;
-
-		return returnValue;
-	}
-
-	/**
-	 * Get attribute value.
-	 * 
-	 * @param element an Element object.
-	 * @param namespace a namespace.
-	 * @param attrName a name of an attribute
-	 * @return the attribute value.
-	 */
-	public static String getAttributeValueNS(Element element, String namespace,
-			String attrName) {
-		String attrValue = null;
-		Attr attr = null;
-
-		// Get the attribute using its name
-		if ((attr = element.getAttributeNodeNS(namespace, attrName)) != null)
-		{
-			attrValue = attr.getValue().trim();
-		}
-
-		// Return attribute value
-		return attrValue;
-	}
-
-	/**
-	 * Get the first child element from the input elment.
-	 * 
-	 * @param element an Element object.
-	 * @return the firstchild element.
-	 */
-	public static Element getFirstChild(Element element) {
-		// Return the first child element
-		return findNextSibling(element.getFirstChild());
-	}
-
-	/**
-	 * Get the next sibling element.
-	 * 
-	 * @param element - an Element object.
-	 * @return the next sibling element.
-	 */
-	public static Element getNextSibling(Element element) {
-		// Return next sibling element
-		return findNextSibling(element.getNextSibling());
-	}
-
-	/**
-	 * Find the next sibling element.
-	 * 
-	 * @param startNode XML start node.
-	 * @return the next sibling element.
-	 */
-	protected static Element findNextSibling(Node startNode) {
-		Node node = null;
-		Element returnElement = null;
-
-		// Find the next sibling element
-		for (node = startNode; node != null && returnElement == null; node = node
-				.getNextSibling())
-		{
-			// If this node is an element node, then return it
-			if (node.getNodeType() == Node.ELEMENT_NODE)
-			{
-				returnElement = (Element) node;
-			}
-		}
-
-		// Return next sibling element
-		return (Element) returnElement;
-	}
-
-	/**
-	 * Find the previous sibling element.
-	 * 
-	 * @param startNode XML start node.
-	 * @return the previous sibling element.
-	 */
-	public static Element findPreviousSibling(Node startNode) {
-		if (startNode == null)
-			return null;
-
-		while (startNode != null)
-		{
-			startNode = startNode.getPreviousSibling();
-			if (startNode == null)
-				return null;
-			if (startNode.getNodeType() == Node.ELEMENT_NODE)
-				return (Element) startNode;
-		}
-
-		return null;
-	}
-
-	/**
-	 * Get the text that is associated with this element.
-	 * 
-	 * @param element an Element object.
-	 * @return the text that is associated with this element.
-	 */
-	public static String getText(Element element) {
-		String text = null;
-
-		// Get first child element
-		Node node = element.getFirstChild();
-
-		// NodeList nodeList = element.getChildNodes();
-
-		// int length = nodeList.getLength();
-
-		// Process while there are nodes and the text hasn't been found
-		while ((node != null) && (text == null))
-		{
-			// If a text node or cdata section is found, then get text
-			if ((node.getNodeType() == Node.TEXT_NODE)
-					|| (node.getNodeType() == Node.CDATA_SECTION_NODE))
-			{
-				text = ((CharacterData) node).getData();
-			}
-
-			// Get next sibling
-			node = node.getNextSibling();
-		}
-
-		if (text != null)
-			text = text.trim();
-
-		return text;
-	}
-
-	/**
-	 * Determine if an element is represented by the QName.
-	 * 
-	 * @param qname a QName object.
-	 * @param element an Element object.
-	 * @return true if an element is represented by the QName.
-	 */
-	public static boolean equals(QName qname, Element element) {
-		boolean equals = false;
-
-		// If both the namespace URI and local name are the same, then they are
-		// equal
-		if ((qname.getNamespaceURI().equals(element.getNamespaceURI()))
-				&& (qname.getLocalPart().equals(element.getLocalName())))
-		{
-			equals = true;
-		}
-
-		return equals;
-	}
-
-	/**
-	 * XML encode a text string.
-	 * 
-	 * @param text - a String.
-	 * @return an XML encoded text string.
-	 */
-	public static String xmlEscapedString(String text) 
-	{
-	  if (text == null) return text;
-	  else
-	  {
-	    StringBuffer sb = new StringBuffer(text.length()*2);
-	    int size = text.length();
-	    for (int i=0; i<size; i++)
-	    {
-	      char c = text.charAt(i);
-	      switch (c)
-		  {
-             case '<': 
-               sb.append("&lt;");
-               break;
-             case '>': 
-             	sb.append("&gt;");
-                break;
-             case '&': 
-             	sb.append("&amp;");
-                break;
-             case '"': 
-             	sb.append("&quot;");
-                break;
-             case '\'': 
-             	sb.append("&apos;");
-                break;
-             case '\r': 
-             	sb.append("&#xd;");
-                break;
-             default:
-             	sb.append(c);
-		  }
-		}
-	    return  sb.toString();
-	  }
-	}
-
-	/**
-	 * XML encode a text string.
-	 * 
-	 * @param text - a String.
-	 * @return an XML encoded text string.
-	 */
-	public static String xmlRemoveEscapedString(String text) 
-	{
-	  if (text == null) return text;
-	  else
-	  {
-        StringBuffer sb = new StringBuffer(text);
-      
-	    int i = sb.indexOf("&#xd;");
-	    while(i != -1)
-	    {
-	      sb.replace(i, i+5, "\r");
-	      i = sb.indexOf("&#xd;");
-	    }
-	    
-	    i = sb.indexOf("&lt;");
-	    while(i != -1)
-	    {
-	      sb.replace(i, i+4, "<");
-	      i = sb.indexOf("&lt;");
-	    }
-
-	    i = sb.indexOf("&gt;");
-	    while(i != -1)
-	    {
-	      sb.replace(i, i+4, ">");
-	      i = sb.indexOf("&gt;");
-	    }
-
-	    i = sb.indexOf("&quot;");
-	    while(i != -1)
-	    {
-	      sb.replace(i, i+6, "\"");
-	      i = sb.indexOf("&quot;");
-	    }
-
-	    i = sb.indexOf("&apos;");
-	    while(i != -1)
-	    {
-	      sb.replace(i, i+6, "\'");
-	      i = sb.indexOf("&apos;");
-	    }
-
-	    i = sb.indexOf("&amp;");
-	    while(i != -1)
-	    {
-	      sb.replace(i, i+5, "&");
-	      i = sb.indexOf("&amp;");
-	    }
- 	    return  sb.toString();
-	  }
-	}
-	/**
-	 * Get the specified element from a parent element.
-	 * 
-	 * @param elementName the element tag to serach for.
-	 * @param parentElement the parent element.
-	 * @return an element given the name and the parent element.
-	 */
-	public static Element getElement(String elementName, Element parentElement) {
-		Element returnElement = null;
-		NodeList nl;
-
-		// Get the list of elements
-		if ((nl = parentElement.getElementsByTagName(elementName)) != null)
-		{
-			// Return first element found
-			returnElement = (Element) nl.item(0);
-		}
-
-		// Return element
-		return returnElement;
-	}
-
-	/**
-	 * Determine if this element matches specified local name in the specified
-	 * namespace.
-	 * 
-	 * @param element an Element object.
-	 * @param namespaceURI a namespace.
-	 * @param localName a local name.
-	 * @return true if this element matches specified local name in the specified
-	 *         namespace.
-	 */
-	public static boolean isElement(Element element, String namespaceURI,
-			String localName) {
-		boolean isElement = false;
-
-		if (element != null)
-		{
-			// Check is
-			if (element.getNamespaceURI().equals(namespaceURI)
-					&& element.getLocalName().equals(localName))
-			{
-				isElement = true;
-			}
-		}
-
-		return isElement;
-	}
-
-	/**
-	 * Determine if this element matches specified local name in the specified
-	 * namespace.
-	 * 
-	 * @param element an Element object.
-	 * @param namespaceURIs a list of valid namespaces.
-	 * @param localName a local name.
-	 * @return true if this element matches specified local name in the specified
-	 *         namespace.
-	 */
-	public static boolean isElement(Element element, List namespaceURIs,
-			String localName) {
-		boolean isElement = false;
-
-		if (element != null)
-		{
-			// Check is
-			if (namespaceURIs.contains(element.getNamespaceURI())
-					&& element.getLocalName().equals(localName))
-			{
-				isElement = true;
-			}
-		}
-
-		return isElement;
-	}
-
-	/**
-	 * Get element text as a boolean.
-	 * 
-	 * @param element an Element object.
-	 * @param defaultValue a boolean to be used as a default value.
-	 * @return element text as a boolean value.
-	 */
-	public static boolean getBooleanValue(Element element, boolean defaultValue) {
-		boolean returnValue = defaultValue;
-		String booleanValue = null;
-
-		// Get value as a string
-		if ((booleanValue = XMLUtils.getText(element)) != null)
-		{
-			returnValue = Boolean.valueOf(booleanValue).booleanValue();
-		}
-
-		// Return boolean
-		return returnValue;
-	}
-
-	/**
-	 * Get attribute value as a boolean.
-	 * 
-	 * @param element an Element object.
-	 * @param attrName a name of an attribute.
-	 * @param defaultValue a boolean to be used as a default value.
-	 * @return attribute value as a boolean.
-	 */
-	public static boolean getBooleanValue(Element element, String attrName,
-			boolean defaultValue) {
-		boolean returnValue = defaultValue;
-		String booleanValue = null;
-
-		// Get value as a string
-		if ((booleanValue = XMLUtils.getAttributeValue(element, attrName)) != null)
-		{
-			returnValue = Boolean.valueOf(booleanValue).booleanValue();
-		}
-
-		// Return boolean
-		return returnValue;
-	}
-
-	/**
-	 * Create QName.
-	 * 
-	 * @param qnameString a qualified name.
-	 * @return a QName object.
-	 */
-	public static QName createQName(String qnameString) {
-		QName qname = null;
-
-		// Locate local part
-		int index = qnameString.lastIndexOf(":");
-
-		// Create new QName
-		if (index != -1)
-		{
-			qname = new QName(qnameString.substring(0, index), qnameString
-					.substring(index + 1));
-		}
-
-		else
-		{
-			qname = new QName(qnameString);
-		}
-
-		return qname;
-	}
-
-	/**
-	 * Error Handler
-	 */
-	private static class ErrHandler implements ErrorHandler
-	{
-		/**
-		 * Warning
-		 */
-		public void warning(SAXParseException spe) throws SAXException {
-			String message = "Warning: " + spe.getMessage();
-			throw new SAXException(message);
-		}
-
-		/**
-		 * Error
-		 */
-		public void error(SAXParseException spe) throws SAXException {
-			String message = "Error: " + spe.getMessage();
-			throw new SAXException(message);
-		}
-
-		/**
-		 * Fatal Error
-		 */
-		public void fatalError(SAXParseException spe) throws SAXException {
-			String message = "Fatal Error: " + spe.getMessage();
-			throw new SAXException(message);
-		}
-	}
-
-	/**
-	 * Determine if the string is a NMTOKEN data type.
-	 * 
-	 * @param text a string value.
-	 * @return true if the string is a NMTOKEN data type.
-	 */
-	public static boolean isNmtoken(String text) {
-		boolean nmtoken = true;
-
-		// ADD: Need to find a utility function that does this or write it from
-		// scratch
-
-		return nmtoken;
-	}
-
-	/**
-	 * The method searches the first direct descendant element with the given
-	 * qname.
-	 * 
-	 * @param parent parent DOM element.
-	 * @param elementName QName of the element to be searched.
-	 * @return DOM element if the required element found, and null otherwise.
-	 */
-	static public Element findChildElement(Element parent, QName elementName) {
-		if (parent == null)
-			throw new IllegalArgumentException("Parent element can not be NULL");
-		if (elementName == null)
-			throw new IllegalArgumentException("Element name can not be NULL");
-		if (elementName.getLocalPart() == null)
-			throw new IllegalArgumentException(
-					"Local part of the element name can not be NULL");
-
-		Node n = parent.getFirstChild();
-		String local = elementName.getLocalPart();
-		String ns = elementName.getNamespaceURI();
-		while (n != null)
-		{
-			if (Node.ELEMENT_NODE == n.getNodeType()
-					&& local.equals(n.getLocalName())
-					&& NullUtil.equals(ns, n.getNamespaceURI()))
-				return (Element) n;
-			n = n.getNextSibling();
-		}
-
-		return null;
-	}
-
-	/**
-	 * The method searches the first sibling element with the given qname.
-	 * 
-	 * @param active DOM element.
-	 * @param elementName QName of the element to be searched.
-	 * @return DOM element if the required element found, and null otherwise.
-	 */
-	static public Element findElement(Element active, QName elementName) {
-		if (active == null)
-			throw new IllegalArgumentException("Active element can not be NULL");
-		if (elementName == null)
-			throw new IllegalArgumentException("Element name can not be NULL");
-		if (elementName.getLocalPart() == null)
-			throw new IllegalArgumentException(
-					"Local part of the element name can not be NULL");
-
-		Node n = active.getNextSibling();
-		String local = elementName.getLocalPart();
-		String ns = elementName.getNamespaceURI();
-		while (n != null)
-		{
-			if (Node.ELEMENT_NODE == n.getNodeType()
-					&& local.equals(n.getLocalName())
-					&& NullUtil.equals(ns, n.getNamespaceURI()))
-				return (Element) n;
-			n = n.getNextSibling();
-		}
-
-		return null;
-	}
-
-	/**
-	 * The method returns attribute node by the given qname.
-	 * 
-	 * @param el owner element.
-	 * @param attributeName QName of the attribute node to be searched.
-	 * @return attribute node by the given qname.
-	 */
-	static public Attr getAttribute(Element el, QName attributeName) {
-		if (el == null)
-			throw new IllegalArgumentException("Element can not be NULL");
-		if (attributeName == null)
-			throw new IllegalArgumentException("Attribute name can not be NULL");
-		if (attributeName.getLocalPart() == null)
-			throw new IllegalArgumentException(
-					"Local part of the attribute name can not be NULL");
-
-		attributeName.getNamespaceURI();
-		attributeName.getLocalPart();
-		Attr a = el.getAttributeNodeNS(attributeName.getNamespaceURI(),
-				attributeName.getLocalPart());
-		if (a == null)
-			// try to get with null namespace
-			a = el.getAttributeNodeNS(null, attributeName.getLocalPart());
-		return a;
-	}
-
-	/**
-	 * The method compares node's name to the given qname.
-	 * 
-	 * @param n a node.
-	 * @param name a QName object.
-	 * @return true if the node's name is the same as the given qname.
-	 */
-	static public boolean equals(Node n, QName name) {
-		if (n == null || name == null)
-			return false;
-		return (NullUtil.equals(name.getLocalPart(), n.getLocalName()) && NullUtil
-				.equals(name.getNamespaceURI(), n.getNamespaceURI()));
-	}
-
-	/**
-	 * The method searches namespace URI for the given prefix. The searching
-	 * mechanism is implemented according to the "XML Namespaces resolution"
-	 * algorithm ('http://www.w3.org/TR/2003/WD-DOM-Level-3-
-	 * Core-20030226/namespaces-algorithms.html').
-	 * 
-	 * @param n a node.
-	 * @param prefix a prefix.
-	 * @return the namespace URI for the given prefix.
-	 */
-	static public String findNamespaceURI(Node n, String prefix) {
-		if (prefix == null)
-			return null;
-
-		while (n != null)
-		{
-			if (prefix.equals(n.getPrefix()))
-				return n.getNamespaceURI();
-
-			if (Node.ELEMENT_NODE == n.getNodeType())
-			{
-				NamedNodeMap m = n.getAttributes();
-				if (m != null)
-					for (int i = 0; i < m.getLength(); i++)
-					{
-						Node a = m.item(i);
-						if (WSITag.NS_URI_XMLNS.equals(a.getNamespaceURI())
-								&& prefix.equals(a.getLocalName()))
-							return a.getNodeValue();
-					}
-			}
-
-			n = n.getParentNode();
-		}
-
-		return null;
-	}
-
-	/**
-	 * Serializes element.
-	 * 
-	 * @param n a DOM element.
-	 * @return the serialized element.
-	 */
-	public static String serialize(Element n) {
-		String value = null;
-		try
-		{
-			StringWriter writer = new StringWriter();
-			XMLSerializer s = new XMLSerializer(writer, new OutputFormat("xml",
-					"UTF-8", true));
-			s.serialize(n);
-			value = writer.toString();
-			writer.close();
-		} catch (Throwable t)
-		{
-			// nothing
-			value = "EXCEPTION : " + t.getMessage();
-		}
-
-		return value;
-	}
-
-	/**
-	 * The method return list of child elements.
-	 * 
-	 * @param parent an org.w3c.dom.Element object.
-	 * @return list of child elements.
-	 */
-	static public Vector getChildElements(Element parent) {
-		if (parent == null)
-			throw new IllegalArgumentException("Element can not be NULL");
-
-		Vector vect = new Vector();
-		Element elem = getFirstChild(parent);
-		while (elem != null)
-		{
-			vect.add(elem);
-			elem = getNextSibling(elem);
-		}
-		return vect;
-	}
-
-	/**
-	 * Serializes document.
-	 * 
-	 * @param doc an org.w3c.dom.Document object.
-	 * @param writer a java.io.Writer object.
-	 * @throws Exception if unable to serialize the document.
-	 */
-	public static void serializeDoc(Document doc, Writer writer)
-			throws java.lang.Exception {
-		XMLSerializer s = new XMLSerializer(writer, new OutputFormat("xml",
-				"UTF-8", true));
-		s.serialize(doc);
-	}
-
-	/**
-	 * Serealizes element.
-	 * 
-	 * @param elem an org.w3c.dom.Element object.
-	 * @param writer a java.io.Writer object.
-	 * @throws Exception if unable to serialize the DOM element.
-	 */
-	public static void serializeElement(Element elem, Writer writer)
-			throws java.lang.Exception {
-		XMLSerializer s = new XMLSerializer(writer, new OutputFormat("xml",
-				"UTF-8", true));
-		s.serialize(elem);
-	}
-
-	/**
-	 * Remove all elements from list without namespace.
-	 * 
-	 * @param vect a list of elements.
-	 */
-	public static void removeAllElementsWithoutNS(Vector vect) {
-		for (int i = 0; i < vect.size();)
-		{
-			if (((Element) vect.get(i)).getNamespaceURI() == null
-					|| ((Element) vect.get(i)).getNamespaceURI().equals(""))
-				vect.remove(i);
-			else
-				i++;
-		}
-	}
-
-	/**
-	 * Create URL using base URI.
-	 * 
-	 * @param url a URL string.
-	 * @param baseURI a base url string to assist in creating a URL.
-	 * @return newly created URL.
-	 * @throws MalformedURLException if a malformed URL has occurred.
-	 */
-	public static URL createURL(String url, String baseURI)
-			throws MalformedURLException {
-		URL returnURL = null;
-		URI uri = null;
-		try
-		{
-            returnURL = new URL(url);
-			uri = new URI(url);
-			uri = uri.normalize();
-			returnURL =  new URL(uri.toString());
-		}
-
-		catch (Exception mue)
-		{
-			int i = baseURI.lastIndexOf('/');
-			int j = baseURI.lastIndexOf('\\');
-			if (j > i)
-				i = j;
-			try
-			{
-			  uri = new URI(baseURI.substring(0, i + 1) + url);
-			  uri = uri.normalize();
-			  returnURL = uri.toURL();
-			}
-			catch (Exception e)
-			{
-			  return new URL(baseURI.substring(0, i + 1) + url);
-			}
-		}
-		return returnURL;
-	}
-
-	/**
-	 * Create URL using base URI.
-	 * 
-	 * @param url a URL string.
-	 * @param baseURI a base url string to assist in creating a URL.
-	 * @return newly created URL string.
-	 * @throws MalformedURLException if a malformed URL has occurred.
-	 */
-	public static String createURLString(String url, String baseURI)
-			throws MalformedURLException {
-		return createURL(url, baseURI).toExternalForm();
-	}
-
-	/**
-	 * This method is used only for unit testing.
-	 * 
-	 * @param args arguments for main.
-	 */
-	public static void main(String[] args) {
-		try
-		{
-		  System.out.println("Filename: " + args[0] + ", schema: " + args[1]);
-		  parseXMLDocument(args[0], args[1]);
-		  System.out.println("Done.");
-		}
-
-		catch (Exception e)
-		{
-			System.err.println(e.toString());
-		}
-
-		System.exit(0);
-	}
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/XMLVisitor.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/XMLVisitor.java
deleted file mode 100644
index fc9ea3653..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/XMLVisitor.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.xml;
-
-import org.w3c.dom.Attr;
-import org.w3c.dom.CDATASection;
-import org.w3c.dom.Comment;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentType;
-import org.w3c.dom.Element;
-import org.w3c.dom.Entity;
-import org.w3c.dom.EntityReference;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Notation;
-import org.w3c.dom.ProcessingInstruction;
-import org.w3c.dom.Text;
-
-/**
- * We don't have access to the node source code, so this does
- * our double-dispatch the hard way.
- */
-public class XMLVisitor
-{
-  /**
-  * Visit XML CDATASection node.
-  * @param s  an XML CDATASection node.
-  */
-  public void visit(CDATASection s)
-  {
-  }
-
-  /**
-  * Visit XML Document node.
-  * @param e  an XML Document node.
-  */
-  public void visit(Document e)
-  {
-  }
-
-  /**
-  * Visit XML DocumentType node.
-  * @param e  an ML DocumentType node.
-  */
-  public void visit(DocumentType e)
-  {
-  }
-
-  /**
-  * Visit XML Attribute node.
-  * @param e  an XML Atrribute node.
-  */
-  public void visit(Attr e)
-  {
-  }
-
-  /**
-  * Visit XML Element node.
-  * @param e  an XML Element node.
-  */
-  public void visit(Element e)
-  {
-  }
-
-  /**
-  * Visit XML Comment node.
-  * @param e  an XML Comment node.
-  */
-  public void visit(Comment e)
-  {
-  }
-
-  /**
-   * Visit XML Text node.
-  * @param e  an XML Text node.
-  */
-  public void visit(Text e)
-  {
-  }
-
-  /**
-   * Visit XML EntityReference node. 
-  * @param e  an XML EntityReference node.
-  */
-  public void visit(EntityReference e)
-  {
-  }
-
-  /**
-   * Visit XML Entity node. 
-  * @param e  an XML Entity node.
-  */
-  public void visit(Entity e)
-  {
-  }
-
-  /**
-   * Visit XML Notation node. 
-  * @param n  an XML Notation node.
-  */
-  public void visit(Notation n)
-  {
-  }
-
-  /**
-   * Visit XML ProcessingInstruction node. 
-  * @param i  an XML ProcessingInstruction node.
-  */
-  public void visit(ProcessingInstruction i)
-  {
-  }
-
-  /**
-   * Visit XML NamedNodeMap node. 
-  * @param i  an XML NamedNodeMap node.
-  */
-  public void visit(NamedNodeMap i)
-  {
-  }
-
-  /**
-   * Visit XML node. 
-  * @param node  an XML node.
-  */
-  public void doVisit(Object node)
-  {
-    if (node instanceof Element)
-    {
-      visit((Element) node);
-    }
-    else if (node instanceof Comment)
-    {
-      visit((Comment) node);
-    }
-    else if (node instanceof CDATASection)
-    {
-      // CDATASection extends Text, so it must come first
-      visit((CDATASection) node);
-    }
-    else if (node instanceof Text)
-    {
-      visit((Text) node);
-    }
-    else if (node instanceof Attr)
-    {
-      visit((Attr) node);
-    }
-    else if (node instanceof Document)
-    {
-      visit((Document) node);
-    }
-    else if (node instanceof EntityReference)
-    {
-      visit((EntityReference) node);
-    }
-    else if (node instanceof Entity)
-    {
-      visit((Entity) node);
-    }
-    else if (node instanceof DocumentType)
-    {
-      visit((DocumentType) node);
-    }
-    else if (node instanceof Notation)
-    {
-      visit((Notation) node);
-    }
-    else if (node instanceof ProcessingInstruction)
-    {
-      visit((ProcessingInstruction) node);
-    }
-    else if (node instanceof NamedNodeMap)
-    {
-      visit((NamedNodeMap) node);
-    }
-  }
-}
-
-// END OF FILE
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/dom/DOMParser.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/dom/DOMParser.java
deleted file mode 100644
index 2ee0361d3..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/dom/DOMParser.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.xml.dom;
-
-import org.apache.xerces.dom.ElementImpl;
-import org.apache.xerces.xni.Augmentations;
-import org.apache.xerces.xni.NamespaceContext;
-import org.apache.xerces.xni.QName;
-import org.apache.xerces.xni.XMLAttributes;
-import org.apache.xerces.xni.XMLLocator;
-import org.apache.xerces.xni.XNIException;
-import org.w3c.dom.Element;
-import org.xml.sax.SAXNotRecognizedException;
-import org.xml.sax.SAXNotSupportedException;
-
-/**
- * This class specializes org.apache.xerces.parsers.DOMParser.
- * 
- * @author Peter  Brittenham (peterbr@us.ibm.com)
- * @version 1.0.1
- */
-public class DOMParser extends org.apache.xerces.parsers.DOMParser
-{
-  /**
-   * Locator.
-   */
-  XMLLocator locator = null;
-
-  /* (non-Javadoc)
-   * @see org.apache.xerces.xni.XMLDocumentHandler#startDocument(org.apache.xerces.xni.XMLLocator, java.lang.String, org.apache.xerces.xni.NamespaceContext, org.apache.xerces.xni.Augmentations)
-   */
-  public void startDocument(
-    XMLLocator locator,
-    String encoding,
-    NamespaceContext context,
-    Augmentations augs)
-    throws XNIException
-  {
-    this.locator = locator;
-    super.startDocument(locator, encoding, context, augs);
-  }
-
-  /* (non-Javadoc)
-   * @see org.apache.xerces.xni.XMLDocumentHandler#startElement(org.apache.xerces.xni.QName, org.apache.xerces.xni.XMLAttributes, org.apache.xerces.xni.Augmentations)
-   */
-  public void startElement(
-    QName qname,
-    XMLAttributes attributes,
-    Augmentations augs)
-    throws XNIException
-  {
-    Element element;
-    ElementImpl elementImpl;
-
-    // DEBUG:
-    //System.err.println("1-line: " + locator.getLineNumber() + ", column: " + locator.getColumnNumber());
-
-    super.startElement(qname, attributes, augs);
-
-    // DEBUG:
-    //System.err.println("2-line: " + locator.getLineNumber() + ", column: " + locator.getColumnNumber());    
-
-    try
-    {
-      element = (Element) getProperty(CURRENT_ELEMENT_NODE);
-
-      elementImpl = (ElementImpl) element;
-      // Setting the user data with an identifier such as ElementLocation.KEY_NAME
-      // may be a long term good idea. The setUserData method with no id is used 
-      // to support JVMs with alternate versions of Xerces.
-      elementImpl.setUserData(new ElementLocation(locator.getLineNumber(), locator.getColumnNumber()));
-    }
-    catch (ClassCastException cce)
-    {
-    }
-    catch (SAXNotSupportedException snse)
-    {
-      // DEBUG:
-      //System.err.println(snse.toString());
-    }
-    catch (SAXNotRecognizedException snre)
-    {
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/dom/ElementLocation.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/dom/ElementLocation.java
deleted file mode 100644
index fa9053363..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/dom/ElementLocation.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.xml.dom;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.xml.sax.Locator;
-
-/**
- * This class provides line and column information for a node within an XML document.
- *  
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public class ElementLocation
-{
-  /**
-   * Line number.
-   */
-  public static final String KEY_NAME = ElementLocation.class.getName();
-
-  /**
-   * Line number.
-   */
-  protected int lineNumber = 0;
-
-  /**
-   * Column number.
-   */
-  protected int columnNumber = 0;
-
-  /**
-   * Element location.
-   * @param lineNumber    a line number.
-   * @param columnNumber  a column number.
-   */
-  public ElementLocation(int lineNumber, int columnNumber)
-  {
-    this.lineNumber = lineNumber;
-    this.columnNumber = columnNumber;
-  }
-
-  /**
-   * Element location.
-   * @param locator  a Locator object.
-   */
-  public ElementLocation(Locator locator)
-  {
-    this.lineNumber = locator.getLineNumber();
-    this.columnNumber = locator.getColumnNumber();
-  }
-
-  /**
-   * Get the line number.
-   * @return an int representing the line number value.
-   */
-  public int getLineNumber()
-  {
-    return this.lineNumber;
-  }
-
-  /**
-   * Get the column number.
-   * @return an int representing the column number value.
-   */
-  public int getColumnNumber()
-  {
-    return this.columnNumber;
-  }
-
-  /**
-   * Get string representation of this object.
-   */
-  public String toString()
-  {
-    return "Element Location:\n"
-      + "  "
-      + WSIConstants.ATTR_LINE_NUMBER
-      + "="
-      + this.lineNumber
-      + "\n";
-    //+ "  " + WSIConstants.ATTR_COLUMN_NUMBER + "=" + this.columnNumber + "\n";
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/jaxp/DocumentBuilderFactoryImpl.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/jaxp/DocumentBuilderFactoryImpl.java
deleted file mode 100644
index 4bec5cdfe..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/jaxp/DocumentBuilderFactoryImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.xml.jaxp;
-
-import java.util.Hashtable;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-/**
- * This class defines a factory API that enables us to obtain a parser that
- * produces DOM object trees from XML documents. Note this class specializes 
- * javax.xml.parsers.DocumentBuilderFactory.
- * 
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public class DocumentBuilderFactoryImpl extends DocumentBuilderFactory
-{
-
-  protected Hashtable attributes = new Hashtable();
-
-  /**
-   * Creates a new instance of a DocumentBuilder using the currently 
-   * configured parameters.
-   * 
-   * @return a new instance of a DocumentBuilder. 
-   * @throws ParserConfigurationException if a DocumentBuilder cannot
-   *         be created which satisfies the configuration requested.
-   */
-  public DocumentBuilder newDocumentBuilder()
-    throws ParserConfigurationException
-  {
-    DocumentBuilder documentBuilder = null;
-
-    try
-    {
-      documentBuilder = new DocumentBuilderImpl(this, attributes);
-    }
-
-    catch (Exception e)
-    {
-      throw new ParserConfigurationException(e.getMessage());
-    }
-
-    return documentBuilder;
-  }
-
-  /**
-   * Allows the user to retrieve specific attributes on the underlying 
-   * implementation.
-   * 
-   * @param name  the name of the attribute.
-   * @return the value of the attribute. 
-   * @throws IllegalArgumentException if the underlying implementation 
-   *         doesn't recognize the attribute.
-   */
-  public Object getAttribute(String name) throws IllegalArgumentException
-  {
-    return attributes.get(name);
-  }
-
-  /**
-   * Allows the user to set specific attributes on the underlying 
-   * implementation. 
-   * 
-   * @param name   the name of the attribute.
-   * @param value  the value of the attribute.
-   * @throws IllegalArgumentException if the underlying implementation 
-   *         doesn't recognize the attribute.
-   */
-  public void setAttribute(String name, Object value)
-    throws IllegalArgumentException
-  {
-    attributes.put(name, value);
-  }
-  
-  public void setFeature(String arg0, boolean arg1) 
-    throws ParserConfigurationException
-  {
-    // currently we do not support setting any feature
-	// as per spec, we should throw an exception
-	throw new ParserConfigurationException(arg0 + " Not supported");
-  }
-
-  public boolean getFeature(String arg0) 
-    throws ParserConfigurationException
-  {
-	// as per spec, we should throw an exception
-	throw new ParserConfigurationException(arg0 + " is not supported");
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/jaxp/DocumentBuilderImpl.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/jaxp/DocumentBuilderImpl.java
deleted file mode 100644
index 2858dd7cd..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/jaxp/DocumentBuilderImpl.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.xml.jaxp;
-
-
-import java.io.IOException;
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.apache.xerces.dom.DOMImplementationImpl;
-import org.apache.xerces.dom.DocumentImpl;
-import org.apache.xerces.impl.Constants;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.eclipse.wst.wsi.internal.core.xml.dom.DOMParser;
-import org.w3c.dom.DOMImplementation;
-import org.w3c.dom.Document;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * Using this class, we can obtain a Document from XML. This class is a 
- * specialization of javax.xml.parsers.DocumentBuilder.
- * 
- * An instance of this class can be obtained from the 
- * DocumentBuilderFactory.newDocumentBuilder method. Once an instance 
- * of this class is obtained, XML can be parsed from a variety of input 
- * sources. These input sources are InputStreams, Files, URLs, and SAX 
- * InputSources.
-
-This class will javax.xml.parsers.DocumentBuilderFactory...
- * 
- * @author Peter  Brittenham (peterbr@us.ibm.com)
- * @version 1.0.1
- */
-public class DocumentBuilderImpl extends DocumentBuilder
-{
-  protected DOMParser domParser = null;
-
-  protected EntityResolver entityResolver = null;
-  protected ErrorHandler errorHandler = new DefaultHandler();
-
-  protected static final String NAMESPACES_FEATURE =
-    Constants.SAX_FEATURE_PREFIX + Constants.NAMESPACES_FEATURE;
-  protected static final String VALIDATION_FEATURE =
-    Constants.SAX_FEATURE_PREFIX + Constants.VALIDATION_FEATURE;
-
-  /**
-   * Constructor for DocumentBuilderImpl2.
-   *
-   * @param dbFactory  a DocumentBuilderFactory object.
-   * @throws SAXException if any parse errors occur. 
-   */
-  public DocumentBuilderImpl(DocumentBuilderFactory dbFactory, Hashtable attributes)
-    throws SAXException
-  {
-    // Create parser
-    domParser = new DOMParser();
-
-    // Set namespace aware
-    domParser.setFeature(NAMESPACES_FEATURE, dbFactory.isNamespaceAware());
-
-    // Set validating
-    domParser.setFeature(VALIDATION_FEATURE, dbFactory.isValidating());
-    if (dbFactory.isValidating()) domParser.setFeature(XMLUtils.FEATURE_VALIDATION_SCHEMA, true);
-
-    // Do not defer node expansion
-    domParser.setFeature(
-      Constants.XERCES_FEATURE_PREFIX + Constants.DEFER_NODE_EXPANSION_FEATURE,
-      false);
-
-    // Set other features from the document factory builder
-    domParser.setFeature(
-      Constants.XERCES_FEATURE_PREFIX + Constants.INCLUDE_IGNORABLE_WHITESPACE,
-      !dbFactory.isIgnoringElementContentWhitespace());
-    domParser.setFeature(
-      Constants.XERCES_FEATURE_PREFIX
-        + Constants.CREATE_ENTITY_REF_NODES_FEATURE,
-      !dbFactory.isExpandEntityReferences());
-    domParser.setFeature(
-      Constants.XERCES_FEATURE_PREFIX + Constants.INCLUDE_COMMENTS_FEATURE,
-      !dbFactory.isIgnoringComments());
-    domParser.setFeature(
-      Constants.XERCES_FEATURE_PREFIX + Constants.CREATE_CDATA_NODES_FEATURE,
-      !dbFactory.isCoalescing());
-   
-    // set features and properties specified at factory level
-    if (attributes != null)
-    {
-      for (Enumeration i=attributes.keys(); i.hasMoreElements();)
-      {
-        String attribute = (String)i.nextElement();
-        if (attribute.equals(XMLUtils.JAXP_SCHEMA_SOURCE))
-        {
-          // for multiple schema validation may be array of InputSource 
-          if(attributes.get(attribute) instanceof InputSource[])
-            domParser.setProperty(attribute, (InputSource[])attributes.get(attribute));
-          else
-            domParser.setProperty(attribute, (InputSource)attributes.get(attribute));
-        }
-        else
-        {
-          domParser.setProperty(attribute, attributes.get(attribute));
-        }
-      }
-    }
-  }
-
-  /**
-   * Parse the content of the given input source as an XML document and return a new DOM.
-   * @param is  InputStream containing the content to be parsed. 
-   * @throws SAXException if any parse errors occur. 
-   * @throws IOException if any IO errors occur. 
-   */
-  public Document parse(InputSource is) throws SAXException, IOException
-  {
-	ClassLoader currentLoader = Thread.currentThread().getContextClassLoader();   
-	try
-	{
-	  Thread.currentThread().setContextClassLoader(XMLUtils.class.getClassLoader());   
- 	
-      // Set entity resolver
-      if (this.entityResolver != null)
-        domParser.setEntityResolver(this.entityResolver);
-
-      // Set error handler    
-      if (this.errorHandler != null)
-        domParser.setErrorHandler(this.errorHandler);
-
-      // Parse input source
-      domParser.parse(is);
-
-      // Return the document that was created
-      return domParser.getDocument();
-	}
-    finally
-    { 
-      Thread.currentThread().setContextClassLoader(currentLoader);
-    }    
-  }
-
-  /**
-   * Indicates whether or not this parser is configured to understand namespaces.
-   * @return true if this parser is configured to understand namespaces; false otherwise.
-   */
-  public boolean isNamespaceAware()
-  {
-    boolean namespaceAware = false;
-
-    try
-    {
-      namespaceAware = domParser.getFeature(NAMESPACES_FEATURE);
-    }
-
-    catch (SAXException se)
-    {
-      throw new RuntimeException(se.toString());
-    }
-
-    return namespaceAware;
-  }
-
-  /**
-   * Indicates whether or not this parser is configured to validate XML documents.
-   * @return true if this parser is configured to validate XML documents; false otherwise.
-   */
-  public boolean isValidating()
-  {
-    boolean validating = false;
-
-    try
-    {
-      validating = domParser.getFeature(VALIDATION_FEATURE);
-    }
-
-    catch (SAXException se)
-    {
-      throw new RuntimeException(se.toString());
-    }
-
-    return validating;
-  }
-
-  /**
-   * Specify the EntityResolver to be used to resolve entities present 
-   * in the XML document to be parsed. Setting this to null will result 
-   * in the underlying implementation using it's own default 
-   * implementation and behavior.
-   * 
-   * @param er  the EntityResolver to be used to resolve entities 
-   *            present in the XML document to be parsed.
-   */
-  public void setEntityResolver(EntityResolver entityResolver)
-  {
-    this.entityResolver = entityResolver;
-  }
-
-  /**
-   * Specify the ErrorHandler to be used to report errors present in 
-   * the XML document to be parsed. Setting this to null will result 
-   * in the underlying implementation using it's own default 
-   * implementation and behavior. 
-   * 
-   * param eh  the ErrorHandler to be used to report errors present in 
-   *           the XML document to be parsed.
-   */
-  public void setErrorHandler(ErrorHandler errorHandler)
-  {
-    this.errorHandler = errorHandler;
-  }
-
-  /**
-   * Obtain a new instance of a DOM Document object to build a DOM 
-   * tree with. An alternative way to create a DOM Document object 
-   * is to use the getDOMImplementation method to get a DOM Level 2 
-   * DOMImplementation object and then use DOM Level 2 methods on 
-   * that object to create a DOM Document object.
-   * 
-   * @return a new instance of a DOM Document object.
-   */
-  public Document newDocument()
-  {
-    return new DocumentImpl();
-  }
-
-  /**
-   * Obtain an instance of a DOMImplementation object. 
-   * @return a new instance of a DOMImplementation.
-   */
-  public DOMImplementation getDOMImplementation()
-  {
-    return new DOMImplementationImpl();
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/schema/TargetNamespaceProcessor.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/schema/TargetNamespaceProcessor.java
deleted file mode 100644
index 6dc2435df..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/schema/TargetNamespaceProcessor.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.xml.schema;
-
-import java.util.List;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.util.TestUtils;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * This class processes target namespaces. Note this class is a specialization
- * of org.wsi.xml.schema.XMLSchemaProcessor.
- * 
- * @author Peter Brittenham (peterbr@us.ibm.com)
- * @version 1.0.1
- */
-public class TargetNamespaceProcessor extends XMLSchemaProcessor
-{
-
-  /**
-   * Constructor for TargetNamespaceProcess.
-   * 
-   * @param context
-   *            document context
-   * @param documentList
-   *            cache of previously parsed documents
-   */
-  public TargetNamespaceProcessor(String context)
-  {
-    super(context, false);
-  }
-
-  protected void processSchema(Element element)
-  {
-    String tns = null;
-    Attr attr = XMLUtils.getAttribute(element, ATTR_XSD_TARGETNAMESPACE);
-
-    // If the attribute was found and value is not null, then add it to the list
-    if ((attr != null) && ((tns = attr.getValue()) != null))
-    {
-      // Add the targetNamespace to the return list
-      returnList.add(tns);
-    }
-  }
-
-  /**
-   * Search for all schema elements, load the xsd documents, and then process
-   * them.
-   * 
-   * @param node
-   *            node.
-   * @return a list.
-   * @throws WSIException
-   *             if the XML schema file is not found or if it is not formatted
-   *             correctly.
-   */
-  public List processAllSchema(Node node) throws WSIException
-  {
-    return processAllSchema(node, context);
-  }
-
-  /**
-   * Search for all schema elements, load the xsd documents, and then process
-   * them.
-   * 
-   * @param node
-   *            node.
-   * @return a list.
-   * @throws WSIException
-   *             if the XML schema file is not found or if it is not formatted
-   *             correctly.
-   */
-  private List processAllSchema(Node node, String ctx) throws WSIException
-  {
-	ClassLoader currentLoader = Thread.currentThread().getContextClassLoader();   
-	try
-	{
-   	  Thread.currentThread().setContextClassLoader(XMLUtils.class.getClassLoader());   
-	
-      // if xsd:schema element is found -> process schema
-      if (XMLUtils.equals(node, ELEM_XSD_SCHEMA))
-      {
-        processSchema((Element) node);
-
-        Node n = node.getFirstChild();
-        while (n != null)
-        {
-          if (Node.ELEMENT_NODE == n.getNodeType()&& XMLUtils.equals(n, ELEM_XSD_IMPORT))
-          {
-            Attr schemaLocation = XMLUtils.getAttribute((Element) n, ATTR_XSD_SCHEMALOCATION);
-
-            // Try to parse imported XSD
-            if (schemaLocation != null && schemaLocation.getValue() != null)
-            {
-         	  if (!schemaLocations.contains(schemaLocation.getValue()))
-          	  {
-                schemaLocations.add(schemaLocation.getValue());
-                try
-                {
-                  // Read and pParse the XML schema document
-                  Document document = parseXMLDocumentURL(schemaLocation.getValue(), ctx, TestUtils.getXMLSchemaLocation());
-                  processAllSchema(document.getDocumentElement(), XMLUtils.createURLString(schemaLocation.getValue(), ctx));
-                }
-                catch (WSIException e)
-                {
-                  if (throwException) throw e;
-                }
-                catch (Throwable t)
-               {
-                 // NOTE: An exception will occur if the XML schema file is not
-  			     // found or if it is not formatted correctly
-                 if (throwException) throw new WSIException(t.getMessage(), t);
-               }
-             }
-           }
-         }
-         n = n.getNextSibling();
-       }
-     }
-
-     // Return list created by the class that extends this class
-     return returnList;
-    }
-    finally
-    { 
-      Thread.currentThread().setContextClassLoader(currentLoader);
-    }    
-}
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/schema/XMLSchemaProcessor.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/schema/XMLSchemaProcessor.java
deleted file mode 100644
index e6e52e15a..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/schema/XMLSchemaProcessor.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.xml.schema;
-
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.util.TestUtils;
-import org.eclipse.wst.wsi.internal.core.xml.XMLDocumentCacheUser;
-import org.eclipse.wst.wsi.internal.core.xml.XMLTags;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * This abstract class is used to process an XML Schema.
- * 
- * @author Peter  Brittenham (peterbr@us.ibm.com)
- * @version 1.0.1
- */
-public abstract class XMLSchemaProcessor
-  extends XMLDocumentCacheUser
-  implements XMLTags
-{
-  protected List returnList = new Vector();
-  protected String context;
-  protected boolean throwException = true;
-  protected List schemaLocations = new Vector();
-
-  /**
-   * Constructor for XMLSchemaProcessor.
-   * @param context       document context. 
-   * @param documentList  cache of previously parsed documents.
-   */
-  public XMLSchemaProcessor(String context)
-  {
-    this(context, true);
-  }
-
-  /**
-   * Constructor for XMLSchemaProcessor.
-   * @param context        document context. 
-   * @param documentList   cache of previously parsed documents.
-   * @param throwException indicates if an exception should be thrown if there is a parsing problem.
-   */
-  public XMLSchemaProcessor(
-    String context,
-    boolean throwException)
-  {
-    super();
-
-    this.context = context;
-    this.throwException = throwException;
-  }
-
-  /**
-   * Search for all schema elements, load the xsd documents, and then process them.
-   * @param node  node.
-   * @return a list.
-   * @throws WSIException if the XML schema file is not found or if it is not formatted correctly.
-   */
-  public List processAllSchema(Node node) throws WSIException
-  {
-    return processAllSchema(node, context);
-  }
-
-  /**
-   * Search for all schema elements, load the xsd documents, and then process them.
-   * @param node  node.
-   * @return a list.
-   * @throws WSIException if the XML schema file is not found or if it is not formatted correctly.
-   */
-  private List processAllSchema(Node node, String ctx) throws WSIException
-  {
-	ClassLoader currentLoader = Thread.currentThread().getContextClassLoader();   
-	try
-	{
-   	  Thread.currentThread().setContextClassLoader(XMLSchemaProcessor.class.getClassLoader());   
-      // Process all nodes
-      while (node != null)
-      {
-        // If this is an element node, then continue
-        if (Node.ELEMENT_NODE == node.getNodeType())
-        {
-          // if xsd:schema element is found -> process schema
-          if (XMLUtils.equals(node, ELEM_XSD_SCHEMA))
-          {
-            processSchema((Element) node);
-
-            // Process all children of the schema element
-            processAllSchema(node.getFirstChild(), ctx);
-          }
-
-          // if xsd:import element is found -> load schema and process schema
-          else if (XMLUtils.equals(node, ELEM_XSD_IMPORT))
-          {
-
-            Attr schemaLocation =
-              XMLUtils.getAttribute((Element) node, ATTR_XSD_SCHEMALOCATION);
-
-            // Try to parse imported XSD
-            if (schemaLocation != null && schemaLocation.getValue() != null)
-            {
-          	  if (!schemaLocations.contains(schemaLocation.getValue()))
-          	  {
-          		schemaLocations.add(schemaLocation.getValue());
-                try
-                {
-                  // Read and pParse the XML schema document
-                  Document document =
-                    parseXMLDocumentURL(
-                      schemaLocation.getValue(),
-                      ctx,
-                      TestUtils.getXMLSchemaLocation());
-
-                  processAllSchema(document.getDocumentElement(),
-                      XMLUtils.createURLString(schemaLocation.getValue(), ctx));
-                }
-                catch (WSIException e)
-                {
-                  if (throwException)
-                    throw e;
-                }
-
-                catch (Throwable t)
-                {
-                  // NOTE: An exception will occur if the XML schema file is not found or if it is not formatted correctly
-                  if (throwException)
-                    throw new WSIException(t.getMessage(), t);
-                }
-              }
-            }
-          }
-
-          else
-          {
-            // else iterate element recursively
-            processAllSchema(node.getFirstChild(), ctx);
-          }
-        }
-
-        // Get next sibiling
-        node = node.getNextSibling();
-      }
-
-    }
-    finally
-    { 
-      Thread.currentThread().setContextClassLoader(currentLoader);
-    }    
-
-
-    // Return list created by the class that extends this class
-    return returnList;
-  }
-
-  protected abstract void processSchema(Element element);
-
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/schema/XMLSchemaValidator.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/schema/XMLSchemaValidator.java
deleted file mode 100644
index 36ca130aa..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/schema/XMLSchemaValidator.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.xml.schema;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.util.TestUtils;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-import com.ibm.wsdl.util.xml.DOM2Writer;
-
-/**
- * This class is used to validate an XML Schema.
- * 
- * @author Peter  Brittenham (peterbr@us.ibm.com)
- * @version 1.0.1
- */
-public class XMLSchemaValidator extends XMLSchemaProcessor
-{
-  private static final String XMLNS_PREFIX = "xmlns:";
-
-  /**
-   * Constructor for XMLSchemaValidator.
-   * @param context       document context. 
-   * @param documentList  cache of previously parsed documents.
-   */
-  public XMLSchemaValidator(String context)
-  {
-    super(context);
-  }
-
-  protected void processSchema(Element element)
-  {
-    NamedNodeMap attrList;
-
-    HashMap elementMap = new HashMap();
-    HashMap nsMap = new HashMap();
-
-    try
-    {
-      // Get schema content as a string
-      String schema = DOM2Writer.nodeToString(element);
-
-      // Get list of element namespaces
-      if ((attrList = element.getAttributes()) != null)
-      {
-        addNamespaces(attrList, elementMap, null);
-      }
-
-      // If elementMap does not contain entry for it's own namespace, then add it
-      if (elementMap.get(XMLNS_PREFIX + element.getPrefix()) == null)
-      {
-        elementMap.put(
-          XMLNS_PREFIX + element.getPrefix(),
-          element.getNamespaceURI());
-      }
-
-      // Get first parent node and then process all of them until you hit the top of the document
-      Node parentNode = element.getParentNode();
-      while (parentNode != null)
-      {
-        // Only process Element nodes
-        if (parentNode.getNodeType() == Node.ELEMENT_NODE)
-        {
-          // Get the list of attributes for the parent node
-          attrList = parentNode.getAttributes();
-
-          // If there are attributes, look for the xmlns: attributes
-          if (attrList != null)
-          {
-            addNamespaces(attrList, nsMap, elementMap);
-          }
-        }
-
-        parentNode = parentNode.getParentNode();
-      }
-
-      // Build namespace list
-      if (nsMap.size() > 0)
-      {
-        String attr;
-        String namespaceList = "";
-        Iterator iterator = nsMap.keySet().iterator();
-        while (iterator.hasNext())
-        {
-          attr = (String) iterator.next();
-          namespaceList += " " + attr + "=\"" + nsMap.get(attr) + "\"";
-        }
-
-        // Add namespace settings, since the DOM2Writer will miss any that are used as attribute values
-        int index = schema.indexOf(">");
-        if (index > 0)
-        {
-          String start = schema.substring(0, index);
-          String end = schema.substring(index);
-
-          schema = start + namespaceList + end;
-        }
-      }
-
-      // Schema validate the XML schema document
-      XMLUtils.parseXML(schema, TestUtils.getXMLSchemaLocation());
-    }
-
-    catch (WSIException we)
-    {
-      Throwable t = we.getTargetException();
-      if (t != null)
-      {
-        returnList.add(t.getMessage());
-      }
-    }
-  }
-
-  private void addNamespaces(NamedNodeMap attrList, Map nsMap, Map elementMap)
-  {
-    Node attr;
-    String nodeName;
-
-    for (int i = 0; i < attrList.getLength(); i++)
-    {
-      attr = attrList.item(i);
-
-      // Get the attribute node name
-      nodeName = attr.getNodeName();
-
-      // If it starts with xmlns:, then determine if it should be added to the list of namespaces 
-      if (nodeName.startsWith(XMLNS_PREFIX)
-        && ((elementMap == null
-          || (elementMap != null && elementMap.get(nodeName) == null))))
-      {
-        if (nsMap.get(nodeName) == null)
-          nsMap.put(nodeName, attr.getNodeValue());
-      }
-    }
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/document/DocumentFactoryImpl.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/document/DocumentFactoryImpl.java
deleted file mode 100644
index c29eaf0e1..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/report/AssertionError.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/report/AssertionError.java
deleted file mode 100644
index 3e0ec824e..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/report/ReportNoWriterImpl.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/report/ReportNoWriterImpl.java
deleted file mode 100644
index 7f3725cf5..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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/src/org/eclipse/wst/wsi/internal/validate/wsdl/WSDLValidator.java b/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/validate/wsdl/WSDLValidator.java
deleted file mode 100644
index 0c834b26e..000000000
--- a/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/validate/wsdl/WSDLValidator.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.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.WSITestToolsEclipseProperties;
-import org.eclipse.wst.wsi.internal.WSITestToolsProperties;
-import org.eclipse.wst.wsi.internal.analyzer.WSDLAnalyzer;
-import org.eclipse.wst.wsi.internal.analyzer.WSIAnalyzerException;
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.report.AssertionError;
-import org.w3c.dom.Document;
-
-/**
- * The WSI validator plugs into the WSDL validator to provide
- * validation for a WSDL document with respect to the WS-I Basic Profile (currently 1.0).
- * This class acts as an bridge between the WS-I tools and the WSDL Validator.
- * 
- * @author Lawrence Mandel (lmandel@ca.ibm.com)
- * @author Wajiha Rehman
- */
-public class WSDLValidator implements IWSDLValidator
-{
-  protected final String _EXC_UNABLE_TO_VALIDATE_WSI = "_EXC_UNABLE_TO_VALIDATE_WSI";
-
-  // indications for types of errors
-  protected final int ERROR = 2;
-  protected final int WARNING = 1;
-  
-  protected MessageGenerator messagegenerator = null;
-  protected boolean wsiValid = false;
-
-  /**
-   * Constructor.
-   */
-  public WSDLValidator()
-  {
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wsdl.validate.IWSDLValidator#validate(org.w3c.dom.Document, org.eclipse.wsdl.validate.ValidationInfo)
-   */
-  public void validate(Document domModel, IValidationInfo valInfo) throws ValidateWSDLException
-  {
-	boolean withAttachments = false;
-	boolean withBasic = false;
-	Object attValue = valInfo.getAttribute("http://ws-i.org/profiles/BasicWithAttachments/ComplianceLevel");
-	if(attValue == null)
-	{
-	  attValue = valInfo.getAttribute("http://ws-i.org/profiles/Basic/ComplianceLevel");
-   	  if(attValue != null)
-	  {
-	    withBasic = true;
-	  }
-	}
-	else
-	{
-	  withAttachments = true;
-	}
-	String wsiLevel = WSITestToolsProperties.WARN_NON_WSI;
-	if(attValue != null)
-	{
-	  String value = (String)attValue;
-	  if(value.equals("IGNORE"))
-	  {
-	  	wsiLevel = WSITestToolsProperties.IGNORE_NON_WSI;
-	  }
-	  else if(value.equals("REQUIRE"))
-	  {
-	   	wsiLevel = WSITestToolsProperties.STOP_NON_WSI;
-	  }
-	}
-	else 
-	{
-	  if(WSITestToolsProperties.getEclipseContext())
-	  {
-		wsiLevel = WSITestToolsEclipseProperties.checkWSIPreferences(valInfo.getFileURI()).getComplianceLevel();
-	  }
-	  else
-	  {
-		wsiLevel = WSITestToolsProperties.checkWSIPreferences(valInfo.getFileURI()).getComplianceLevel();
-	  }
-	}
-	// If we are ignoring WS-I then don't run the tests.
-	if(wsiLevel.equals(WSITestToolsProperties.IGNORE_NON_WSI))
-	{
-	  return;
-	}
-	    
-  	wsiValid = true;
-  	Definition definition = null;
-	boolean hasAnalyzerConfig = false;
-	String uri = valInfo.getFileURI();
-  	try
-  	{
-      //WSDLFactory factory = WSDLFactory.newInstance();
- 	  ValidationInfoImpl vali = new ValidationInfoImpl(valInfo.getFileURI(), messagegenerator);
-  	  vali.setURIResolver((URIResolver)valInfo.getURIResolver());
-      WSDLReaderImpl reader = new WSDLReaderImpl(new WSDL11ValidationInfoImpl(vali));
-      WSDLDocument[] docs = reader.readWSDL(uri, domModel);
-      int numdocs = docs.length;
-      for(int i = 0; i < numdocs; i++)
-      {
-        WSDLDocument tempDoc = docs[i];
-		if(tempDoc.getDefinition().getDocumentBaseURI().equals(valInfo.getFileURI()))
-        {
-          definition = tempDoc.getDefinition();  
-          break;
-        }
-      }
-  	}
-  	catch(WSDLException e)
-  	{
-  	  throw new ValidateWSDLException(messagegenerator.getString(_EXC_UNABLE_TO_VALIDATE_WSI,uri));
-  	}
-	    
-    if (definition != null && valInfo != null)
-    {
-      String namespace = definition.getTargetNamespace();
-
-      // get all the collections we may need to validate
-      Collection services = definition.getServices().values();
-      Collection bindings = definition.getBindings().values();
-      Collection portTypes = definition.getPortTypes().values();
-      Collection messages = definition.getMessages().values();
-
-      WSDLAnalyzer wsdlAnalyzer;
-	  if(withAttachments)
-	  {
-	  	WSIPreferences preferences = new WSIPreferences();
-   	    preferences.setComplianceLevel(wsiLevel);
-	    preferences.setTADFile(WSITestToolsProperties.AP_ASSERTION_FILE);
-	    wsdlAnalyzer = new WSDLAnalyzer(uri, preferences);
-	  }
-	  else if(withBasic)
-	  {
-	  	WSIPreferences preferences = new WSIPreferences();
-		preferences.setComplianceLevel(wsiLevel);	
-	    preferences.setTADFile(WSITestToolsProperties.SSBP_ASSERTION_FILE);
-	    wsdlAnalyzer = new WSDLAnalyzer(uri, preferences);
-	  }
-	  else
-	  {
-		// default preference setting
-	  	wsdlAnalyzer = new WSDLAnalyzer(uri);
-	  }
-
-	  // The WS-I conformance tools require that each service be analyzed separately.
-	  // Get all the services and analyze them.
-	  if (services != null && !services.isEmpty())
-	  {
-	    Iterator serviceIterator = services.iterator();
-
-	    while (serviceIterator.hasNext())
-        {
-          Service service = (Service) serviceIterator.next();
-
-          String servicename = service.getQName().getLocalPart();
-
-          Collection ports = service.getPorts().values();
-          if (ports != null && !ports.isEmpty())
-          {
-            // The WS-I tools must be called once for each port within each service.
-            Iterator portIterator = ports.iterator();
-            while (portIterator.hasNext())
-            {
-              Port port = (Port) portIterator.next();
-
-              try
-              {
-                wsdlAnalyzer.addConfigurationToTest(servicename, namespace, port.getName(), WSDLAnalyzer.PORT);
-				hasAnalyzerConfig = true;
-              }
-              catch (WSIAnalyzerException e)
-              {
-                // TODO: Add code to log error 
-                //System.out.println("exception " + e);
-              }
-
-            }
-          }
-        }
-      }
-      // validate at the binding level - check for every binding
-      else if (bindings != null && !bindings.isEmpty())
-      {
-        Iterator bindingIterator = bindings.iterator();
-
-        while (bindingIterator.hasNext())
-        {
-          Binding binding = (Binding) bindingIterator.next();
-
-          String bindingname = binding.getQName().getLocalPart();
-          try
-          {
-            wsdlAnalyzer.addConfigurationToTest(null, namespace, bindingname, WSDLAnalyzer.BINDING);
-			hasAnalyzerConfig = true;
-          }
-          catch (WSIAnalyzerException e)
-          {
-            // TODO: Add code to log error 
-            //System.out.println("exception " + e);
-          }
-        }
-      }
-      // validate at the portType level - check for every portType
-      else if (portTypes != null && !portTypes.isEmpty())
-      {
-        Iterator portTypeIterator = portTypes.iterator();
-        while (portTypeIterator.hasNext())
-        {
-          PortType portType = (PortType) portTypeIterator.next();
-          String portTypename = portType.getQName().getLocalPart();
-          try
-          {
-            wsdlAnalyzer.addConfigurationToTest(null, namespace, portTypename, WSDLAnalyzer.PORTTYPE);
-			hasAnalyzerConfig = true;
-          }
-          catch (WSIAnalyzerException e)
-          {
-            // TODO: Add code to log error 
-            //System.out.println("exception " + e);
-          }
-        }
-      }
-      // validate at the message level - check for every message
-      else if (messages != null && !messages.isEmpty())
-      {
-        Iterator messageIterator = messages.iterator();
-
-        while (messageIterator.hasNext())
-        {
-          Message message = (Message) messageIterator.next();
-          String messagename = message.getQName().getLocalPart();
-          try
-          {
-            wsdlAnalyzer.addConfigurationToTest(null, namespace, messagename, WSDLAnalyzer.MESSAGE);
-			hasAnalyzerConfig = true;
-          }
-          catch (WSIAnalyzerException e)
-          {
-            // TODO: Add code to log error 
-            //System.out.println("exception " + e);
-          }
-        }
-      }
-      try
-      {
-        // only run the analyzer if there is something to check
-		if(hasAnalyzerConfig)
-		{
-		  // run the conformance check and add errors and warnings as needed
-		  wsdlAnalyzer.validateConformance();
-			  
-		  // If the level is suggest all errors should be reported as warnings.
-		  if(wsdlAnalyzer.getWSIPreferences().getComplianceLevel().equals(WSITestToolsProperties.WARN_NON_WSI))
-		  {
-		    addWarnings(wsdlAnalyzer.getAssertionErrors(), valInfo);
-		  }
-		  else
-		  {
-		    addErrors(wsdlAnalyzer.getAssertionErrors(), valInfo);
-		  }
-		  addWarnings(wsdlAnalyzer.getAssertionWarnings(), valInfo);
-		}
-      }
-	  catch (WSIAnalyzerException e)
-	  {
-		// TODO: Add code to log error 
-		System.out.println("Unable to run WS-I WSDL conformance check.\n" + e);
-	  }
-    }
-  }
-
-  /**
-   * Add error messages to the validationcontroller.
-   * 
-   * @param errors The list of errors to add.
-   * @param valInfo The object that contains the validation information.
-   */
-  protected void addErrors(List errors, IValidationInfo valInfo)
-  {
-    reportProblems(errors, valInfo, ERROR);
-  }
-
-  /**
-   * Add warning messages to the validationcontroller.
-   * 
-   * @param warnings The list of warnings to add.
-   * @param valInfo The object that contains the validation information.
-   */
-  protected void addWarnings(List warnings, IValidationInfo valInfo)
-  {
-    reportProblems(warnings, valInfo, WARNING);
-  }
-
-  /**
-   * Report the problems specified for the given type to the validationcontroller.
-   * 
-   * @param problems The problems to report.
-   * @param valInfo The object to report the problems to.
-   * @param type The type of messages to add.
-   */
-  protected void reportProblems(List problems, IValidationInfo valInfo, int type)
-  {
-    // if there were no problems just return
-    if (problems == null)
-      return;
-
-    
-    Iterator problemsIterator = problems.iterator();
-    while (problemsIterator.hasNext())
-    {
-      AssertionError assertionerror = (AssertionError) problemsIterator.next();
-      if (type == ERROR)
-      {
-		wsiValid = false;
-        valInfo.addError(
-        		WSIConstants.WSI_PREFIX + "(" + assertionerror.getAssertionID()+ ") " + assertionerror.getErrorMessage(),
-          assertionerror.getLine(),
-          assertionerror.getColumn(),
-          valInfo.getFileURI());
-
-      }
-      else if (type == WARNING)
-      {
-        valInfo.addWarning(
-        		WSIConstants.WSI_PREFIX + "(" + assertionerror.getAssertionID()+ ") " + assertionerror.getErrorMessage(),
-          assertionerror.getLine(),
-          assertionerror.getColumn(),
-          valInfo.getFileURI());
-      }
-    }
-  }
-
-  /**
-   * @see org.eclipse.wsdl.validate.controller.IWSDLValidator#setResourceBundle(java.util.ResourceBundle)
-   */
-  public void setResourceBundle(ResourceBundle rb)
-  {
-    messagegenerator = new MessageGenerator(rb);
-  }
-
-  /**
-   * @see org.eclipse.wsdl.validate.controller.IWSDLValidator#isValid()
-   */
-  public boolean isValid()
-  {
-    return wsiValid;
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.wsi/src/wsivalidate.properties b/bundles/org.eclipse.wst.wsi/src/wsivalidate.properties
deleted file mode 100644
index 8a906b409..000000000
--- a/bundles/org.eclipse.wst.wsi/src/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